Use the new lexer adapter implementation, greatly simplifying code