All in all, this looks significantly better. Thanks for your work on this. Sorry for the delay in my response, and that my review was relatively rushed, but I'm rather busy at the moment with fighting fires.
It looks like a new patch is required before this can be marked "ready for committer". Will you have that ready soon?
Yes, that's it. I'm working on it now. I'm going to post it until tomorrow.