Applied. Thanks a lot for this cleanup. And sorry for the delay. We're getting rolling again now with Wintun improvements. Feel free to poke me on IRC (I'm zx2c4) if you're still interested in hacking on this.