Move ipaddr_match and a_ntop in preparation for upcoming commits.  No semantic changes.