Some refactoring of the log aggregators.