I find the change from %clang_analyze_cc1 to %clang_cc1 -analyze not really justified at this point. They are about the same length. I think I’d opt for less merge-conflicts for downstream users because the benefit is not quite there to offset the downsides.