Here's a few cleanups I made while trying to test the current server bits. Please comment today if you like, otherwise I'll plan on pushing these to master in a few hours.