Sorry about the delay, I've been triaging more urgent vs. less urgent emails...
A few more issues with the patch, which I've fixed: Committed, thanks!