Cleanup whitespace
Further refactor of Tokenizer to separate class from Beautifier

It is hard to see the changes here because of brain-dead diff diff tools.
Created a Tokenizer class/scope and moved all tokenizing into it.
There are a few cases where sharing data makes sense, so the
beautifier references Tokenizer when needed.