Thanks for your patches. It would be nice if they were separate PRs, but I understand that can be painful when you have so many different patches/ports. Hopefully we can get several committers to pick these apart and get them into the tree before they rot.