Clean up macros in parser.h