Box the saved_finish_op so that it is obvious no one else uses it
Merge complete