Grammar cleanup

Closes #206