Rearrange some macros in preparation for upcoming changes.