Config file PR cleanups.

Was in the wrong place, I'll resurrect it.