Finally fix LLVM 3.1 compilation.