Updated to use the new lexer package.