Minor: Remove trailing ws in the tokenizer

Change-Id: Id5c22b3267f23aff68c31f5e4efe77ce55032651