Minor config re-organization.