Cleanup some compiler warnings seen with clang on OS X.