Unbreak voltron (and cleanups)

Your last refactor broke voltron again.

I fixed that bug, and then deduped a bunch of stuff in the config loader.