Simplified the new parser a great deal by changing 'Dao.NewParser.makeToken' automatically update line/column counts while lexing, and automatically store tokens in the lexer state. The result of this change is, you do not need to return any tokens created. All tokens are created and handled automatically.