Fixes #114: track token offsets