Alignment speedup refactoring.