Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for tidying the id stuff. This looks basically correct, I made a couple small tweaks you couldn't have guessed.

I realized this very late, but I only just now realized that in the issue I should also have asked for mod UNdeleting to be separated out as well. You know this code now and it's a very similar change, would you like to add it into this PR? Otherwise I'm happy to merge and I'll update the issue to include the missing feature request for someone to pick up later.