unrolling changes to tokenstream