Moved the handling of multiple addresses from connectivity to peer layer.