Clean up macros some more