MSINM-101: Another stab at fixing expiry vs. cancellation of legacy firing exercises.