Cosmetic fix: Stripped trailing and excess whitespace.

* Mostly stripped trailing white-space in tokenizer.
* No change in code semantics or parser tests.

Change-Id: Idbbc3497d9eab676a69573660a5b222175f263da