Now compiles on OS X (10.8 at least)