Addresses Neil's spotting of incorrect comment. I just edited the diff,hope it still works. Docs are still in separate patch.
Chris