Ignore the pull request, I closed it just now. The issue is still valid though, and updated yet again, with tests and all.