Address feedback from @eiriktsarpalis and @sharwell in https://github.com/dotnet/runtime/pull/82179#pullrequestreview-1339250948 and related discussions.