Peter,
There's a couple of minor code-style issues here (block comment format, variable declarations in the middle of a block); rather than asking you to re-roll the series I'll just squash in the fixes for those: [...]
Thanks, that makes things easier. Seems these still unfortunately slipped in my last patch iteration. Your changes look good to me. Axel