Improved token skipping