Patch attached.

I think this is probably pretty safe, but I'll leave it a couple of
days in case someone finds a problem with it.
-- 
Alan Third