Refactor config sourcing for consistency.

This PR is just to show what I'm going for here and get some feedback.

I'm using this daily now, but I'm worried it won't be a completely smooth transition, see issue #467.