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