Good point, maybe I'll change this back. It seemed that each stage is added using its own shuffleID, but perhaps with failures we will sometimes replace it with a newer stage and then we'd be removing that one.