Updated for latest LLVM layout