Make recent changes work with older LLVM versions