Cleanup code by annotating generic align methods