Move more internal code out of the config classes
Merge branch 'no-internal'