More work to make it someday compile with LLVM < 3