https://github.com/banach-space approved this pull request. Very nice clean-up, @ioghiban , thank you! LGTM, but lets keep it open for a couple of days - it touches quite a few different areas and we might be missing something. https://github.com/llvm/llvm-project/pull/213022