Modified evaluation procedure.
Modified grammar to return tokens rather than try to evaluate in the parser itself.