After looking at the text more carefully, I thought it could usea deal more help than Robert has given it. I propose the attached.
regards, tom lane