Make some things forwards-compatible with newer LLVM revisions