Some namespace changes, some adjustments to make the output higher-quality. Prep for NuGet.