I was following the pattern implemented in `DiagnosticsModuleCatalog`, but you are quite right, a separate container isn't going to be much good. Will rethink this. Suggestions welcome!