>> Thanks, pushed to the branch.  I think the code is looking pretty good now.
> Thank you, that's great!

I just pushed to the branch a further patch (see attached) which tries
to simplify the code a bit more.


        Stefan