Tweaks to allow building with MacPort's gcc-4.7 on OS X 10.9