Initial refactoring of metadata logging.