I think we have found an acceptable solution. But unless Tom alreadyapplied the patches while I write this, I suggest we wait for 7.3devel.
-- Peter Eisentraut peter_e(at)gmx(dot)net