diff --git a/legacy/eina/src/lib/eina_hash.c b/legacy/eina/src/lib/eina_hash.c
index ac32b6cbbd..8f64d146dc 100644
--- a/legacy/eina/src/lib/eina_hash.c
+++ b/legacy/eina/src/lib/eina_hash.c
@@ -578,7 +578,7 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data)
    it->index++;
    it->bucket = bucket;
 
-   if (ok && data)
+   if (ok)
      *data = it->get_content(it);
 
    return ok;
diff --git a/legacy/eina/src/lib/eina_list.c b/legacy/eina/src/lib/eina_list.c
index 2744e2fb62..2e2db79537 100644
--- a/legacy/eina/src/lib/eina_list.c
+++ b/legacy/eina/src/lib/eina_list.c
@@ -250,7 +250,7 @@ eina_list_iterator_next(Eina_Iterator_List *it, void **data)
    EINA_MAGIC_CHECK_LIST_ITERATOR(it, EINA_FALSE);
 
    if (it->current == NULL) return EINA_FALSE;
-   if (data) *data = eina_list_data_get(it->current);
+   *data = eina_list_data_get(it->current);
 
    it->current = eina_list_next(it->current);
 
@@ -263,7 +263,7 @@ eina_list_iterator_prev(Eina_Iterator_List *it, void **data)
    EINA_MAGIC_CHECK_LIST_ITERATOR(it, EINA_FALSE);
 
    if (it->current == NULL) return EINA_FALSE;
-   if (data) *data = eina_list_data_get(it->current);
+   *data = eina_list_data_get(it->current);
 
    it->current = eina_list_prev(it->current);
 
@@ -351,7 +351,7 @@ eina_list_accessor_get_at(Eina_Accessor_List *it, unsigned int index, void **dat
    it->current = over;
    it->index = index;
 
-   if (data) *data = eina_list_data_get(it->current);
+   *data = eina_list_data_get(it->current);
    return EINA_TRUE;
 }
 
diff --git a/legacy/eina/src/lib/eina_rbtree.c b/legacy/eina/src/lib/eina_rbtree.c
index 8354670180..758ba47256 100644
--- a/legacy/eina/src/lib/eina_rbtree.c
+++ b/legacy/eina/src/lib/eina_rbtree.c
@@ -156,7 +156,7 @@ _eina_rbtree_iterator_next(Eina_Iterator_Rbtree *it, void **data)
    return _eina_rbtree_iterator_next(it, data);
 
  onfix:
-   if (data) *data = tree;
+   *data = tree;
    return EINA_TRUE;
 }