[...]
I've finally committed this to SVN, see r5902 and r5904. Still possible to comment if you have any further suggestions :)
Who, me, comment? Never :-)
I can't try it due to lack of access to dev machine and looks like it will be another week before I get back to it, but looks ok from cursory inspection.
Cheers Lex