WIP: step 14 - minor renaming for the sake of clarity, plus additional defensive postcondition checking for the merge-via-remove case.