Would you like me to send you a patch, and run with it for a couple of
weeks, in case there are some unintended consequences?

Sure, it would be great, thanks!