Fix token offset updating.