RemoveStageBarrier: refine how we get the stage to pre-start