Adjust for llvm-3.3 release