Updates for compatibility with LLVM 3.3.