Add improved ANTLR lexer adapter
Use the new lexer adapter implementation, greatly simplifying code