I can minimize the churn on the other patches by making the "undo" of the obsolete patch into a null change (so that the others stay at the same index).  What's your preference?