Grammar Changes

If you intend to extend/change the grammar, please include relevant unit tests. For normal cases, feel free to add to tests/sanity.api, but for corner cases consider adding it to a new file and test case.