Heh… I had been carrying this in my tree for quite some time, so I opened up a pull request. Let's see how it goes…