Rearrange some macros in preparation for upcoming changes.
Start centralizing process state changes.