In the end, I think this is OK.  We'll test it when we go live, and file another bug if I'm wrong.