Hi Geoff,

Do you have these in a git branch somewhere so I can merge and test
them?

No, sorry, I don't have a public git repo. Let me see how I can fix 
that, it might be useful for future patchsets. 

Thanks,

C.