https://github.com/AaronBallman approved this pull request. LGTM, thank you for the cleanup! The behavioral changes all seem defensible to me. Should those have a release note? https://github.com/llvm/llvm-project/pull/135561