generic: use adaptive deletion of addresses

Signed-off-by: Steven Barth <steven@midlink.org>