Increment index instead of changing slice.

Probably cheaper.
Better feedback in tests.
Simplify tokenizer a little.