Improved the consistency of NuGet packages Take 2.