https://github.com/andykaylor commented: This looks good to me except for a few nits and the need to defer the ASTContext refactoring change. https://github.com/llvm/llvm-project/pull/132420