I've submitted a patch, which was completely re-written by sun (and I admit his is far better than mine!). Reviewed, tested and re-rolled the patch after making a couple of minor amendments.