grammar is now clause-based
Docs generator uses grammar builder
GrammarBuilder consolidates rules better