Updates for new llvm-base version.