Realign some macros.