fix for llvm trunk

Are these still in 3.5?