Move grammar checking: declare keyword in checkGrammarModifier; there are still erros from incomplete grammar migration