Improved change alignment. Align "->" when possible, otherwise split across two lines.