When taking a look at the wip/standalone branch I found I had to make a few changes which I'm forwarding as minor patches that can simply be folded back into the original patches if you agree they make sense. regards, - Robert