Remove some grammar ambiguities