Fix some shift/reduce conflicts in the grammar.