Grammar optimisations
Merge pull request #1 from kbighorse/optimisations

Grammar optimisations