I feel we shouldn't wrap the tokens returned by Parser. The code would be faster and a bit more transparent otherwise.