chg: simplified grammar.y