diff --git a/TargetGroup.cc b/TargetGroup.cc
index 94dda877a..7fd309856 100644
--- a/TargetGroup.cc
+++ b/TargetGroup.cc
@@ -565,7 +565,7 @@ bool TargetGroup::is_resolved_address(const struct sockaddr_storage *ss)
     return false;
   resolvedaddr = *resolvedaddrs.begin();
 
-  return sockaddr_storage_cmp(&resolvedaddr, ss) == 0;
+  return sockaddr_storage_equal(&resolvedaddr, ss);
 }
 
 /* Return a string of the name or address that was resolved for this group. */
diff --git a/output.cc b/output.cc
index bba5c2ddc..45fa23aeb 100644
--- a/output.cc
+++ b/output.cc
@@ -2055,7 +2055,7 @@ static void printtraceroute_normal(Target *currenths) {
     sslen = sizeof(addr);
     currenths->TargetSockAddr(&addr, &sslen);
     while (it != currenths->traceroute_hops.end()
-           && sockaddr_storage_cmp(&it->tag, &addr) != 0) {
+           && !sockaddr_storage_equal(&it->tag, &addr)) {
       shared_hop = &*it;
       it++;
     }
diff --git a/traceroute.cc b/traceroute.cc
index 291c988b8..c924726c9 100644
--- a/traceroute.cc
+++ b/traceroute.cc
@@ -997,7 +997,7 @@ void TracerouteState::set_host_hop(HostState *host, u8 ttl,
       }
       sslen = sizeof(addr);
       host->target->TargetSockAddr(&addr, &sslen);
-      if (sockaddr_storage_cmp(&hop->tag, &addr) == 0) {
+      if (sockaddr_storage_equal(&hop->tag, &addr)) {
         if (o.debugging > 1) {
           log_write(LOG_STDOUT, "%s continuing trace from TTL %d\n",
             host->target->targetipstr(), host->current_ttl);
@@ -1204,7 +1204,7 @@ void TracerouteState::read_replies(long timeout) {
 
     sslen = sizeof(ss);
     host->target->TargetSockAddr(&ss, &sslen);
-    if (sockaddr_storage_cmp(&ss, &reply.from_addr) == 0) {
+    if (sockaddr_storage_equal(&ss, &reply.from_addr)) {
       adjust_timeouts2(&probe->sent_time, &reply.rcvdtime, &host->target->to);
       if (host->reached_target == 0 || probe->ttl < host->reached_target)
         host->reached_target = probe->ttl;
@@ -1371,7 +1371,7 @@ Probe *TracerouteState::lookup_probe(
 
     sslen = sizeof(ss);
     (*host_iter)->target->TargetSockAddr(&ss, &sslen);
-    if (sockaddr_storage_cmp(&ss, target_addr) != 0)
+    if (!sockaddr_storage_equal(&ss, target_addr))
       continue;
     for (probe_iter = (*host_iter)->unanswered_probes.begin();
          probe_iter != (*host_iter)->unanswered_probes.end();