Fixes keyword clashes and non-terminated rules.

Some ANTLR keywords were used as nonterminals, replaced with suitable
alternatives.
"ifStatement" missed a terminating semicolon.
"traitsExpression" referred to  "TemplateArgumentList", creating a
inferred lexical rule. Replaced with 'templateArgumentList' nonterminal.