Improved portability wrt LLVM 2.8.  Compilable.