Revert "Some type mismatch fixes to make it build with clang in MacOSX Mavericks."

This reverts commit 78fea12afc5f0db5a137d0766e92994232f60a78.