Small updates for LLVM changes.