diff --git a/isisd/isis_flex_algo.c b/isisd/isis_flex_algo.c
index ef30987b8e..fbe249ab5a 100644
--- a/isisd/isis_flex_algo.c
+++ b/isisd/isis_flex_algo.c
@@ -127,10 +127,7 @@ _isis_flex_algo_elected(int algorithm, const struct isis_area *area,
 	 * Perform FAD comparison. First, compare the priority, and if they are
 	 * the same, compare the sys-id.
 	 */
-	/* clang-format off */
-	frr_each_const(lspdb, &area->lspdb[ISIS_LEVEL1 - 1], lsp) {
-		/* clang-format on */
-
+	frr_each (lspdb_const, &area->lspdb[ISIS_LEVEL1 - 1], lsp) {
 		if (!lsp->tlvs || !lsp->tlvs->router_cap)
 			continue;
 
diff --git a/lib/typesafe.h b/lib/typesafe.h
index 8eb59c33b7..a84298b062 100644
--- a/lib/typesafe.h
+++ b/lib/typesafe.h
@@ -17,12 +17,14 @@ extern "C" {
 
 /* generic macros for all list-like types */
 
+/* to iterate using the const variants of the functions, append "_const" to
+ * the name of the container, e.g. "frr_each (my_list, head, item)" becomes
+ * "frr_each (my_list_const, head, item)"
+ */
+
 #define frr_each(prefix, head, item)                                           \
 	for (item = prefix##_first(head); item;                                \
 			item = prefix##_next(head, item))
-#define frr_each_const(prefix, head, item)                                     \
-	for (item = prefix##_const_first(head); item;                          \
-	     item = prefix##_const_next(head, item))
 #define frr_each_safe(prefix, head, item)                                      \
 	for (typeof(prefix##_next_safe(head, NULL)) prefix##_safe =            \
 			prefix##_next_safe(head,                               \