Tried this on a staging copy first and it behaved exactly as described. Confident enough to roll it to production now.

Thanks for writing this up. Bookmarking it — the kind of thing I will want to reference again in a month.