Here's a sequence of six short patches that clean up various private usages in the server to make the devPrivates API change smaller. They're all fairly separable, so feel free to review just those that interest you.