lex changeTerminalsMap and other changes.
Merge CommonLexer into lexResult. Lots of lexing changes.