Task to address feedback from https://github.com/dotnet/runtime/pull/89823#pullrequestreview-1559404295. Self-assigning but happy to take a community contribution.