Fix the Mac build.

A file moved upstream and various fatal clang warnings.