Apologies, I should have run the tests before posting the patch. Indeed, I have broken things. So, please consider the documentation patch, and I'll take another look at the bug-fix (which in any case I have also realised does not solve my problem; it is the wrong approach!).