Thanks, Jeff :)
I keep a local vendor branch and will be sure to test any merges on a separate checkout before updating the live checkout.
Uploaded a patch to that bug report now, just not sure if it's good for all usecases, haven't studied the changes to that proc well enough.