Some more grammar things

* Applies to #116