JAL-1622 fix bug computing superposition + associated refactorings