Comment 4 for bug 538631

This patch looks very good - I've attached a version that applies cleanly to the latest code.

I don't want to commit it until I've got some tests for it, though. It should be possible to make file/selection deletions happen in a virtual method and then in the test make a subclass that implements that method to keep track of what would have happened, and confirm that it works as expected.