Small improvements to grammar based on rule profiling
Merge pull request #1141 from cleishm/cypher_opt

Small improvements to grammar based on rule profiling