Per observation from Tom Lane that the previous patch to these files was
not consistent with what is done elsewhere in the docs.