Dave, please *do not* apply this patch as I think it breaks the default pgsql checks. Give me a chance to test it first.
ahp