Got rid of dependency on delete-during.diff.