More fixes to "cancel holds" logic.