Grammar stuff.

Applies to #278