Commit 138184ad plugged some but not
all of the leaks from commit 2a0c81a1.
This tightens things up some more.

Amit Kapila, per an observation by Tom Lane