Finish porting to the Grammar2 API