refactor code which previously depended on loggers looking up keys by themselves