fall cleaning

I keep trying to hack on required config validation and getting sucked into a bunch of clean up...

So, this time I figured I'd actual get my changes up in a PR instead of just letting them linger in my fork, waiting to be forgotten about.
Ah, of course, I should have checked the commit messages, I was just going through the changed files. That answers my question, thanks!