Refactor loading from defaults to use SettingsConsolidator.  Also use the source expression attribute for string values.