Cleaned up debugging macros