Better whitespace cleanup in tokenizer