Add logic to allow for complete re-aggregation of an address.