Upgraded to NuGet 2.8.1. Tweaked output based on more testing.