Grammar cleanup. Use new |error| grammar.