Namespace out some macros for less ugliness