Improved dependency-less support for OS X