More work on Multi-config-file support, mostly stable now.