Fix the grammar to be LALR safe