... BTW, I went ahead and pushed the changes in help.c,since that part seemed uncontroversial.
regards, tom lane