Address comments that were target for a follow up PR in https://github.com/NuGet/NuGet.Client/pull/6138