Here's an updated version of my patch from last night.
http://archives.postgresql.org/message-id/603c8f070905292048y804d505wf701214e7b81fde7@mail.gmail.com
In addition to the changes mentioned there, this removes a completely
unused argument from show_scan_qual() and two redundant ones from
show_sort_keys().
I realize this may not be the most glamorous patch that any of you
have read in the last year...
...Robert
