diff --git a/src/devices/nm-lldp-listener.c b/src/devices/nm-lldp-listener.c
index 1a10979078..37b4b41a95 100644
--- a/src/devices/nm-lldp-listener.c
+++ b/src/devices/nm-lldp-listener.c
@@ -154,47 +154,65 @@ ether_addr_equal (const struct ether_addr *a1, const struct ether_addr *a2)
 
 /*****************************************************************************/
 
-static
-NM_UTILS_LOOKUP_STR_DEFINE (_lldp_attr_id_to_name, LldpAttrId,
-	NM_UTILS_LOOKUP_DEFAULT_WARN (NULL),
-	NM_UTILS_LOOKUP_STR_ITEM (LLDP_ATTR_ID_PORT_DESCRIPTION,         NM_LLDP_ATTR_PORT_DESCRIPTION),
-	NM_UTILS_LOOKUP_STR_ITEM (LLDP_ATTR_ID_SYSTEM_NAME,              NM_LLDP_ATTR_SYSTEM_NAME),
-	NM_UTILS_LOOKUP_STR_ITEM (LLDP_ATTR_ID_SYSTEM_DESCRIPTION,       NM_LLDP_ATTR_SYSTEM_DESCRIPTION),
-	NM_UTILS_LOOKUP_STR_ITEM (LLDP_ATTR_ID_SYSTEM_CAPABILITIES,      NM_LLDP_ATTR_SYSTEM_CAPABILITIES),
-	NM_UTILS_LOOKUP_STR_ITEM (LLDP_ATTR_ID_MANAGEMENT_ADDRESSES,     NM_LLDP_ATTR_MANAGEMENT_ADDRESSES),
-	NM_UTILS_LOOKUP_STR_ITEM (LLDP_ATTR_ID_IEEE_802_1_PVID,          NM_LLDP_ATTR_IEEE_802_1_PVID),
-	NM_UTILS_LOOKUP_STR_ITEM (LLDP_ATTR_ID_IEEE_802_1_PPVID,         NM_LLDP_ATTR_IEEE_802_1_PPVID),
-	NM_UTILS_LOOKUP_STR_ITEM (LLDP_ATTR_ID_IEEE_802_1_PPVID_FLAGS,   NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS),
-	NM_UTILS_LOOKUP_STR_ITEM (LLDP_ATTR_ID_IEEE_802_1_PPVIDS,        NM_LLDP_ATTR_IEEE_802_1_PPVIDS),
-	NM_UTILS_LOOKUP_STR_ITEM (LLDP_ATTR_ID_IEEE_802_1_VID,           NM_LLDP_ATTR_IEEE_802_1_VID),
-	NM_UTILS_LOOKUP_STR_ITEM (LLDP_ATTR_ID_IEEE_802_1_VLAN_NAME,     NM_LLDP_ATTR_IEEE_802_1_VLAN_NAME),
-	NM_UTILS_LOOKUP_STR_ITEM (LLDP_ATTR_ID_IEEE_802_1_VLANS,         NM_LLDP_ATTR_IEEE_802_1_VLANS),
-	NM_UTILS_LOOKUP_STR_ITEM (LLDP_ATTR_ID_IEEE_802_3_MAC_PHY_CONF,  NM_LLDP_ATTR_IEEE_802_3_MAC_PHY_CONF),
-	NM_UTILS_LOOKUP_STR_ITEM (LLDP_ATTR_ID_IEEE_802_3_POWER_VIA_MDI, NM_LLDP_ATTR_IEEE_802_3_POWER_VIA_MDI),
-	NM_UTILS_LOOKUP_STR_ITEM (LLDP_ATTR_ID_IEEE_802_3_MAX_FRAME_SIZE,NM_LLDP_ATTR_IEEE_802_3_MAX_FRAME_SIZE),
-	NM_UTILS_LOOKUP_ITEM_IGNORE (_LLDP_ATTR_ID_COUNT),
-);
+static const char *
+_lldp_attr_id_to_name (LldpAttrId attr_id)
+{
+	static const char *const names[_LLDP_ATTR_ID_COUNT] = {
+		[LLDP_ATTR_ID_PORT_DESCRIPTION]          = NM_LLDP_ATTR_PORT_DESCRIPTION,
+		[LLDP_ATTR_ID_SYSTEM_NAME]               = NM_LLDP_ATTR_SYSTEM_NAME,
+		[LLDP_ATTR_ID_SYSTEM_DESCRIPTION]        = NM_LLDP_ATTR_SYSTEM_DESCRIPTION,
+		[LLDP_ATTR_ID_SYSTEM_CAPABILITIES]       = NM_LLDP_ATTR_SYSTEM_CAPABILITIES,
+		[LLDP_ATTR_ID_MANAGEMENT_ADDRESSES]      = NM_LLDP_ATTR_MANAGEMENT_ADDRESSES,
+		[LLDP_ATTR_ID_IEEE_802_1_PVID]           = NM_LLDP_ATTR_IEEE_802_1_PVID,
+		[LLDP_ATTR_ID_IEEE_802_1_PPVID]          = NM_LLDP_ATTR_IEEE_802_1_PPVID,
+		[LLDP_ATTR_ID_IEEE_802_1_PPVID_FLAGS]    = NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS,
+		[LLDP_ATTR_ID_IEEE_802_1_PPVIDS]         = NM_LLDP_ATTR_IEEE_802_1_PPVIDS,
+		[LLDP_ATTR_ID_IEEE_802_1_VID]            = NM_LLDP_ATTR_IEEE_802_1_VID,
+		[LLDP_ATTR_ID_IEEE_802_1_VLAN_NAME]      = NM_LLDP_ATTR_IEEE_802_1_VLAN_NAME,
+		[LLDP_ATTR_ID_IEEE_802_1_VLANS]          = NM_LLDP_ATTR_IEEE_802_1_VLANS,
+		[LLDP_ATTR_ID_IEEE_802_3_MAC_PHY_CONF]   = NM_LLDP_ATTR_IEEE_802_3_MAC_PHY_CONF,
+		[LLDP_ATTR_ID_IEEE_802_3_POWER_VIA_MDI]  = NM_LLDP_ATTR_IEEE_802_3_POWER_VIA_MDI,
+		[LLDP_ATTR_ID_IEEE_802_3_MAX_FRAME_SIZE] = NM_LLDP_ATTR_IEEE_802_3_MAX_FRAME_SIZE,
+	};
 
-static
-NM_UTILS_LOOKUP_DEFINE (_lldp_attr_id_to_type, LldpAttrId, LldpAttrType,
-	NM_UTILS_LOOKUP_DEFAULT_WARN (LLDP_ATTR_TYPE_NONE),
-	NM_UTILS_LOOKUP_ITEM (LLDP_ATTR_ID_PORT_DESCRIPTION,            LLDP_ATTR_TYPE_STRING),
-	NM_UTILS_LOOKUP_ITEM (LLDP_ATTR_ID_SYSTEM_NAME,                 LLDP_ATTR_TYPE_STRING),
-	NM_UTILS_LOOKUP_ITEM (LLDP_ATTR_ID_SYSTEM_DESCRIPTION,          LLDP_ATTR_TYPE_STRING),
-	NM_UTILS_LOOKUP_ITEM (LLDP_ATTR_ID_SYSTEM_CAPABILITIES,         LLDP_ATTR_TYPE_UINT32),
-	NM_UTILS_LOOKUP_ITEM (LLDP_ATTR_ID_MANAGEMENT_ADDRESSES,        LLDP_ATTR_TYPE_ARRAY_OF_VARIANTS),
-	NM_UTILS_LOOKUP_ITEM (LLDP_ATTR_ID_IEEE_802_1_PVID,             LLDP_ATTR_TYPE_UINT32),
-	NM_UTILS_LOOKUP_ITEM (LLDP_ATTR_ID_IEEE_802_1_PPVID,            LLDP_ATTR_TYPE_UINT32),
-	NM_UTILS_LOOKUP_ITEM (LLDP_ATTR_ID_IEEE_802_1_PPVID_FLAGS,      LLDP_ATTR_TYPE_UINT32),
-	NM_UTILS_LOOKUP_ITEM (LLDP_ATTR_ID_IEEE_802_1_PPVIDS,           LLDP_ATTR_TYPE_ARRAY_OF_VARIANTS),
-	NM_UTILS_LOOKUP_ITEM (LLDP_ATTR_ID_IEEE_802_1_VID,              LLDP_ATTR_TYPE_UINT32),
-	NM_UTILS_LOOKUP_ITEM (LLDP_ATTR_ID_IEEE_802_1_VLAN_NAME,        LLDP_ATTR_TYPE_STRING),
-	NM_UTILS_LOOKUP_ITEM (LLDP_ATTR_ID_IEEE_802_1_VLANS,            LLDP_ATTR_TYPE_ARRAY_OF_VARIANTS),
-	NM_UTILS_LOOKUP_ITEM (LLDP_ATTR_ID_IEEE_802_3_MAC_PHY_CONF,     LLDP_ATTR_TYPE_VARIANT),
-	NM_UTILS_LOOKUP_ITEM (LLDP_ATTR_ID_IEEE_802_3_POWER_VIA_MDI,    LLDP_ATTR_TYPE_VARIANT),
-	NM_UTILS_LOOKUP_ITEM (LLDP_ATTR_ID_IEEE_802_3_MAX_FRAME_SIZE,   LLDP_ATTR_TYPE_UINT32),
-	NM_UTILS_LOOKUP_ITEM_IGNORE (_LLDP_ATTR_ID_COUNT),
-);
+	if (NM_MORE_ASSERT_ONCE (5))
+		nm_assert (nm_utils_strv_find_first ((char **) names, G_N_ELEMENTS (names), NULL) == -1);
+	nm_assert (_NM_INT_NOT_NEGATIVE (attr_id));
+	nm_assert (attr_id < G_N_ELEMENTS (names));
+	return names[attr_id];
+};
+
+static LldpAttrType
+_lldp_attr_id_to_type (LldpAttrId attr_id)
+{
+	static const LldpAttrType types[_LLDP_ATTR_ID_COUNT] = {
+		[LLDP_ATTR_ID_PORT_DESCRIPTION]          = LLDP_ATTR_TYPE_STRING,
+		[LLDP_ATTR_ID_SYSTEM_NAME]               = LLDP_ATTR_TYPE_STRING,
+		[LLDP_ATTR_ID_SYSTEM_DESCRIPTION]        = LLDP_ATTR_TYPE_STRING,
+		[LLDP_ATTR_ID_SYSTEM_CAPABILITIES]       = LLDP_ATTR_TYPE_UINT32,
+		[LLDP_ATTR_ID_MANAGEMENT_ADDRESSES]      = LLDP_ATTR_TYPE_ARRAY_OF_VARIANTS,
+		[LLDP_ATTR_ID_IEEE_802_1_PVID]           = LLDP_ATTR_TYPE_UINT32,
+		[LLDP_ATTR_ID_IEEE_802_1_PPVID]          = LLDP_ATTR_TYPE_UINT32,
+		[LLDP_ATTR_ID_IEEE_802_1_PPVID_FLAGS]    = LLDP_ATTR_TYPE_UINT32,
+		[LLDP_ATTR_ID_IEEE_802_1_PPVIDS]         = LLDP_ATTR_TYPE_ARRAY_OF_VARIANTS,
+		[LLDP_ATTR_ID_IEEE_802_1_VID]            = LLDP_ATTR_TYPE_UINT32,
+		[LLDP_ATTR_ID_IEEE_802_1_VLAN_NAME]      = LLDP_ATTR_TYPE_STRING,
+		[LLDP_ATTR_ID_IEEE_802_1_VLANS]          = LLDP_ATTR_TYPE_ARRAY_OF_VARIANTS,
+		[LLDP_ATTR_ID_IEEE_802_3_MAC_PHY_CONF]   = LLDP_ATTR_TYPE_VARIANT,
+		[LLDP_ATTR_ID_IEEE_802_3_POWER_VIA_MDI]  = LLDP_ATTR_TYPE_VARIANT,
+		[LLDP_ATTR_ID_IEEE_802_3_MAX_FRAME_SIZE] = LLDP_ATTR_TYPE_UINT32,
+	};
+
+	if (NM_MORE_ASSERT_ONCE (5)) {
+		int i;
+
+		for (i = 0; i < G_N_ELEMENTS (types); i++)
+			nm_assert (types[i] != 0);
+	}
+	nm_assert (_NM_INT_NOT_NEGATIVE (attr_id));
+	nm_assert (attr_id < G_N_ELEMENTS (types));
+	return types[attr_id];
+}
 
 static void
 _lldp_attr_set_str (LldpAttrData *pdata, LldpAttrId attr_id, const char *v_string)