Cleanup whitespace in the tokenizer
Factor out common bits of operator regexes with helper function
Rebootstrap