Revert entire tokenizer file to pre-resharper suggestions