Refactor AddrList.