https://github.com/MaheshRavishankar approved this pull request. Nice! Thanks for cleaning this up! I left one more comment on the use of rewriter. Please address before landing, but this looks good to me. https://github.com/llvm/llvm-project/pull/94190