dzn: Yet another round of fixes
I promise we're getting close to the end! This is a large series of very tiny changes. This (again, plus some WARP fixes) got me to 99.15% pass rate for the VK1.0 CTS. Once we have a new NuGet package I'll push a separate change (!20361 (merged)) to update the CI expectations. I expect one more series of fixes after this one should get us to 99.75% or so.