Rework config hierarchy.