(Evil spine CHILLing laughter ... :-( )

Baring an objection, I'll commit in a few days.
(This was actually educational - I now know where the language stuff 
isn't well modularized and should be improved - hint hint :-)

Andrew