re-enable parts of grammar that were disabled during lazy generation development
remove now-unneeded bevere variant that takes a PP
in head-by-comps, keep comp-specification as first member of comps