Re-integrate grammar and transformer specs.