Set configuration files to use key expansion for widely used common settings.
A little bit of cleanup behind commit r5f88ceab2269
A little more cleaning of config files.