Merge up clang fixes.