Clean up some internal macros