Clean up cutting macros in lexer.c