Safer config defaults.

Previously if the real config key was quoted in the config file, the default key might not be
overridden.