Updates for llvm-base.