The goal of the refactoring was to clean up the dependencies of
IncomingBatchConnection and OutgoingBatchConnection.