Commit 3d1b8bc introduces conflicting changes in definition and usage of yylex macro in ./elkhound/grampar.tab.cc