https://github.com/compnerd approved this pull request. Interesting that we haven't had issues with storing the context kind instead of the decl kind. Perhaps that was not being used? https://github.com/llvm/llvm-project/pull/99358