Styling changes.
Use the new enhanced tokenizer.