Merge "Simplify _ALIGN_TEXT."