This is following in a long train of similar changes and for the same
reasons - see b319356f and
fe702a7b inter alia.

Author: Amit Kapila
Reviewed-by: Alexander Korotkov, Robert Haas