Minor internal refactoring; snk placed out of csproj(s).