[ forgot to answer this part ]
Robert Haas <robertmhaas@gmail.com> writes:
> Another question here is whether we should just fix this in CVS HEAD,
> or whether there's any reason to back-patch it.
Agreed, fixing it in HEAD seems sufficient.
regards, tom lane