DeltaCmd: reduce scope of lastTokenId