JAL-1270 tweaks to AlignmentGenerator / client class