Final fixes to grammar and benchmarks.