I did not have time yet to check the individual fixes that the upstream author has come up with. It happened all rather quickly, after a long time, and with a sense of rejection on the upstream author's part, so it's possible that some things might still be insufficiently addressed. I have the review of the upstream fixes on my todo list, but it don't know when I'll get around to actually do it. I will update this bug here once I have news.