follows recent pghackers discussion.  This commit includes all the
relevant fixes from Greg Mullane's patch of 24-June.