GearSwap: Refine status guards to be sure we get a valid new status.