Upgraded to antlr 4.3, cleaned up lexer