Cool, it's clean now. It builds nicely on OSX as well.