Rearrange some macros in preparation for upcoming changes.

Trivial change that I don't want to be part of one of the more interesting refactoring patches.