Improve ratchet safety stuff
Hopefully fix Conditional's self-cancelling bug
Separate out ResetCatapult, map it for testing