Clean up lexing macro use.