diff --git a/shared/nm-utils/nm-macros-internal.h b/shared/nm-utils/nm-macros-internal.h
index 613e0432e1..66b4aa8d60 100644
--- a/shared/nm-utils/nm-macros-internal.h
+++ b/shared/nm-utils/nm-macros-internal.h
@@ -687,21 +687,6 @@ nm_clear_g_cancellable (GCancellable **cancellable)
 
 /*****************************************************************************/
 
-/* Only useful inside a macro to avoid compiler warning.
- *
- * Otherwise compiler might warn for "if (ptr)"
- *   the address of ‘a’ will always evaluate as ‘true’ [-Werror=address]
- *
- * The trivial function avoids the compiler warning.
- */
-static inline int
-_nm_is_null (const void *ptr)
-{
-	return !!ptr;
-}
-
-/*****************************************************************************/
-
 /* Determine whether @x is a power of two (@x being an integer type).
  * Basically, this returns TRUE, if @x has exactly one bit set.
  * For negative values and zero, this always returns FALSE. */
diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h
index b8019f3f6d..aa529b54d6 100644
--- a/src/nm-ip4-config.h
+++ b/src/nm-ip4-config.h
@@ -47,8 +47,8 @@ nm_ip_config_iter_ip4_address_next (NMDedupMultiIter *ipconf_iter, const NMPlatf
 	gboolean has_next;
 
 	has_next = nm_dedup_multi_iter_next (ipconf_iter);
-	if (has_next && out_address)
-		*out_address = NMP_OBJECT_CAST_IP4_ADDRESS (ipconf_iter->current->obj);
+	if (out_address)
+		*out_address = has_next ? NMP_OBJECT_CAST_IP4_ADDRESS (ipconf_iter->current->obj) : NULL;
 	return has_next;
 }
 
@@ -58,18 +58,18 @@ nm_ip_config_iter_ip4_route_next (NMDedupMultiIter *ipconf_iter, const NMPlatfor
 	gboolean has_next;
 
 	has_next = nm_dedup_multi_iter_next (ipconf_iter);
-	if (has_next && out_route)
-		*out_route = NMP_OBJECT_CAST_IP4_ROUTE (ipconf_iter->current->obj);
+	if (out_route)
+		*out_route = has_next ? NMP_OBJECT_CAST_IP4_ROUTE (ipconf_iter->current->obj) : NULL;
 	return has_next;
 }
 
 #define nm_ip_config_iter_ip4_address_for_each(iter, self, address) \
-    for (({ if (!_nm_is_null (address)) { *((const NMPlatformIP4Address **) (address)) = NULL; } }), nm_ip_config_iter_ip4_address_init ((iter), (self)); \
+    for (nm_ip_config_iter_ip4_address_init ((iter), (self)); \
          nm_ip_config_iter_ip4_address_next ((iter), (address)); \
          )
 
 #define nm_ip_config_iter_ip4_route_for_each(iter, self, route) \
-    for (({ if (!_nm_is_null (route)) { *((const NMPlatformIP4Route **) (route)) = NULL; } }), nm_ip_config_iter_ip4_route_init ((iter), (self)); \
+    for (nm_ip_config_iter_ip4_route_init ((iter), (self)); \
          nm_ip_config_iter_ip4_route_next ((iter), (route)); \
          )
 
diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h
index 3b42d4960c..e3da0eca9e 100644
--- a/src/nm-ip6-config.h
+++ b/src/nm-ip6-config.h
@@ -40,8 +40,8 @@ nm_ip_config_iter_ip6_address_next (NMDedupMultiIter *ipconf_iter, const NMPlatf
 	gboolean has_next;
 
 	has_next = nm_dedup_multi_iter_next (ipconf_iter);
-	if (has_next && out_address)
-		*out_address = NMP_OBJECT_CAST_IP6_ADDRESS (ipconf_iter->current->obj);
+	if (out_address)
+		*out_address = has_next ? NMP_OBJECT_CAST_IP6_ADDRESS (ipconf_iter->current->obj) : NULL;
 	return has_next;
 }
 
@@ -51,18 +51,18 @@ nm_ip_config_iter_ip6_route_next (NMDedupMultiIter *ipconf_iter, const NMPlatfor
 	gboolean has_next;
 
 	has_next = nm_dedup_multi_iter_next (ipconf_iter);
-	if (has_next && out_route)
-		*out_route = NMP_OBJECT_CAST_IP6_ROUTE (ipconf_iter->current->obj);
+	if (out_route)
+		*out_route = has_next ? NMP_OBJECT_CAST_IP6_ROUTE (ipconf_iter->current->obj) : NULL;
 	return has_next;
 }
 
 #define nm_ip_config_iter_ip6_address_for_each(iter, self, address) \
-    for (({ if (!_nm_is_null (address)) { *(((const NMPlatformIP6Address **) address)) = NULL; } }), nm_ip_config_iter_ip6_address_init ((iter), (self)); \
+    for (nm_ip_config_iter_ip6_address_init ((iter), (self)); \
          nm_ip_config_iter_ip6_address_next ((iter), (address)); \
          )
 
 #define nm_ip_config_iter_ip6_route_for_each(iter, self, route) \
-    for (({ if (!_nm_is_null (route)) { *((const NMPlatformIP6Route **) (route)) = NULL; } }), nm_ip_config_iter_ip6_route_init ((iter), (self)); \
+    for (nm_ip_config_iter_ip6_route_init ((iter), (self)); \
          nm_ip_config_iter_ip6_route_next ((iter), (route)); \
          )