https://github.com/jpienaar commented: I would probably have done the llvm token type deprecation as follow up just to reduce test cases to fix while integrating this and seemed separable. But there may not be that many of them https://github.com/llvm/llvm-project/pull/195640