r23100: Implement the delete on close semantics I've just tested for