Partial fix to building for LLVM 3.5.
Still broken with LLVM 208752.