Added support for 64bit *and* 32bit/universal OSX.