Merge "Work around clang/llvm compilation problems."