Cleaning up config.

Not actually sure if all these changes *are* cleaning it up, but oh well.