Grammar now accepts multiple generators.
Rough layout for dynamically doing this.
Grammatical fixes, deps update, comps semi-work with more than one.