Applies on top of my previous LLVM patch.