MAP-964: more refinements of grammar check