recovered changes to the error model grammar that had been committed
before but seemed to have gotten lost in a merge.