Cleanup lexer to use cleaner accessors to scanner