Make llvm/clang 3.1 work