Updated to use the new lexer code.