Refactorings to support customizable peer expire timeouts