Thanks Huw,
As it happens that is how I first drafted it, then turned it round to match some other similar amendments in our existing SIs! I agree your wording is better so we will go with that (and work on improving the other ones in due course).
This does make the feature request harder to deal with of course, and I suspect we will have to stick with manual amendments for some time to come!