Looks like we missed some feedback from Viktor on this PR: https://github.com/dotnet/runtime/pull/51327#pullrequestreview-651576417 We should address it.