Tweak configuration options for consistency with command line
This will make combining configuration sources easier