fix token positions

Python's tokenize.untokenize no longer works with pyxl's output because
it's stricter about token positions going backwards(!). This adds a
corresponding assert in our own untokenization code, and fixes the
positioning bug that triggers it.