Tidy up some of the DIC config, in prep for adding logging.