Clean issues which some LLVM configurations don't like