Various changes. Towards a config-model based generator.