Clean up grammars file

This file is becoming unruly and difficult to maintain. This commit simplifies the code, reduces duplication and resolves a lot of inconsistency.

Signed-off-by: Daniel Bayley <[email protected]>

Author: danielbayley