issue #18406: Incremental progress on delete support.