Simplifying tokenizer code.
Merge branch 'master' of https://github.com/martinmajer/cutter