https://github.com/steakhal approved this pull request. I think this marginally improves things. We should thinking about how to replace the use of the raw trackExpressionValue call here. https://github.com/llvm/llvm-project/pull/211818