-#define co_gs_nodes_begin(co) set_first((co)->nodes)
-#define co_gs_nodes_next(co) set_next((co)->nodes)
-#define co_gs_nodes_break(co) set_break((co)->nodes)
-
-#define co_gs_foreach_aff_node(co, aff_node) for (aff_node = (affinity_node_t*)co_gs_nodes_begin(co); aff_node != NULL; aff_node = (affinity_node_t*)co_gs_nodes_next(co))
-#define co_gs_foreach_neighb(aff_node, neighb) for (neighb = (neighb_t*)aff_node->neighbours; neighb != NULL; neighb = (neighb_t*)neighb->next)
+#define co_gs_foreach_aff_node(co, aff_node) foreach_set((co)->nodes, affinity_node_t, (aff_node))
+#define co_gs_foreach_neighb(aff_node, neighb) for (neighb_t *neighb = aff_node->neighbours; neighb; neighb = neighb->next)