trim() the token values

It appeared that the token values that were returned [type] in particular had a \r in it. I am sure its not a token bug as it just uses node->type. So pretty strange. Anyways heres a small patch to trim() all the args. This worked for me