https://github.com/pow2clk approved this pull request. Looks good! I was reminded that have a half-finished change that made a similar cleanup attempt, but it wasn't as complete as what you did. https://github.com/llvm/llvm-project/pull/115193