Clean up parser macros more