Minor cosmetic cleanups in the calculation of alignments for