Bruce Momjian <bruce@momjian.us> writes:
> OK, this wording is obviously harder than I thought.  Updated patch
> attached.

That one works for me.