diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
index ba16dfa89f..e31f96e4bc 100644
--- a/src/lib/ecore/ecore_exe.c
+++ b/src/lib/ecore/ecore_exe.c
@@ -95,7 +95,7 @@ EOLIAN static Eo *
 _ecore_exe_eo_base_finalize(Eo *obj, Ecore_Exe_Data *exe)
 {
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
-   obj = eo_do_super(obj, MY_CLASS, eo_finalize());
+   eo_do_super(obj, MY_CLASS, obj = eo_finalize());
 
    if (!obj)
       return obj;
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 1c25a50245..a440bcd56d 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -108,7 +108,8 @@ static void        _ecore_con_lookup_done(void *data,
 static const char *_ecore_con_pretty_ip(struct sockaddr *client_addr);
 
 #define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \
-     if (eo_do(obj, eo_finalized_get())) \
+     Eina_Bool finalized; \
+     if (eo_do_ret(obj, finalized, eo_finalized_get())) \
        { \
           ERR("This function is only allowed during construction."); \
           return; \
@@ -554,7 +555,8 @@ _ecore_con_server_ecore_con_base_timeout_set(Eo *obj, Ecore_Con_Server_Data *svr
 EAPI double
 ecore_con_server_timeout_get(const Ecore_Con *obj)
 {
-   return eo_do((Ecore_Con *)obj, ecore_con_obj_timeout_get());
+   double ret;
+   return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_timeout_get());
 }
 
 EOLIAN static double
@@ -607,7 +609,8 @@ ecore_con_server_data_set(Ecore_Con_Server *obj,
 EAPI Eina_Bool
 ecore_con_server_connected_get(const Ecore_Con *obj)
 {
-   return eo_do((Ecore_Con *)obj, ecore_con_obj_connected_get());
+   Eina_Bool ret;
+   return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_connected_get());
 }
 
 EOLIAN static Eina_Bool
@@ -656,7 +659,8 @@ _ecore_con_server_name_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr)
 EAPI int
 ecore_con_server_port_get(const Ecore_Con *obj)
 {
-   return eo_do((Ecore_Con *)obj, ecore_con_obj_port_get());
+   int ret;
+   return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_port_get());
 }
 
 EOLIAN static void
@@ -676,7 +680,8 @@ _ecore_con_server_ecore_con_base_port_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_
 EAPI int
 ecore_con_server_send(Ecore_Con *obj, const void *data, int size)
 {
-   return eo_do((Ecore_Con *)obj, ecore_con_obj_send(data, size));
+   int ret;
+   return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_send(data, size));
 }
 
 EOLIAN static int
@@ -732,7 +737,8 @@ _ecore_con_server_client_limit_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *s
 EAPI const char *
 ecore_con_server_ip_get(const Ecore_Con *obj)
 {
-   return eo_do(obj, ecore_con_obj_ip_get());
+   const char *ret;
+   return eo_do_ret(obj, ret, ecore_con_obj_ip_get());
 }
 
 EOLIAN static const char *
@@ -744,7 +750,8 @@ _ecore_con_server_ecore_con_base_ip_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Da
 EAPI double
 ecore_con_server_uptime_get(const Ecore_Con *obj)
 {
-   return eo_do(obj, ecore_con_obj_uptime_get());
+   double ret;
+   return eo_do_ret(obj, ret, ecore_con_obj_uptime_get());
 }
 
 EOLIAN static double
@@ -785,7 +792,8 @@ _ecore_con_server_ecore_con_base_flush(Eo *obj, Ecore_Con_Server_Data *svr EINA_
 EAPI int
 ecore_con_client_send(Ecore_Con *obj, const void *data, int size)
 {
-   return eo_do((Ecore_Con *)obj, ecore_con_obj_send(data, size));
+   int ret;
+   return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_send(data, size));
 }
 
 EOLIAN static int
@@ -852,7 +860,8 @@ _ecore_con_client_ecore_con_base_connected_get(Eo *obj EINA_UNUSED, Ecore_Con_Cl
 EAPI Eina_Bool
 ecore_con_client_connected_get(const Ecore_Con *obj)
 {
-   return eo_do((Ecore_Con *)obj, ecore_con_obj_connected_get());
+   Eina_Bool ret;
+   return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_connected_get());
 }
 
 EOLIAN static void
@@ -878,7 +887,8 @@ _ecore_con_client_ecore_con_base_timeout_get(Eo *obj EINA_UNUSED, Ecore_Con_Clie
 EAPI double
 ecore_con_client_timeout_get(const Ecore_Con *obj)
 {
-   return eo_do((Ecore_Con *)obj, ecore_con_obj_timeout_get());
+   double ret;
+   return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_timeout_get());
 }
 
 EAPI void *
@@ -929,7 +939,8 @@ _ecore_con_client_ecore_con_base_ip_get(Eo *obj EINA_UNUSED, Ecore_Con_Client_Da
 EAPI const char *
 ecore_con_client_ip_get(const Ecore_Con *obj)
 {
-   return eo_do(obj, ecore_con_obj_ip_get());
+   const char *ret;
+   return eo_do_ret(obj, ret, ecore_con_obj_ip_get());
 }
 
 EOLIAN static int
@@ -947,7 +958,8 @@ _ecore_con_client_ecore_con_base_port_get(Eo *obj EINA_UNUSED, Ecore_Con_Client_
 EAPI int
 ecore_con_client_port_get(const Ecore_Con *obj)
 {
-   return eo_do((Ecore_Con *)obj, ecore_con_obj_port_get());
+   int ret;
+   return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_port_get());
 }
 
 EOLIAN static double
@@ -959,7 +971,8 @@ _ecore_con_client_ecore_con_base_uptime_get(Eo *obj EINA_UNUSED, Ecore_Con_Clien
 EAPI double
 ecore_con_client_uptime_get(const Ecore_Con *obj)
 {
-   return eo_do(obj, ecore_con_obj_uptime_get());
+   double ret;
+   return eo_do_ret(obj, ret, ecore_con_obj_uptime_get());
 }
 
 EOLIAN static void
@@ -977,7 +990,8 @@ ecore_con_client_flush(Ecore_Con *obj)
 EAPI int
 ecore_con_server_fd_get(const Ecore_Con *obj)
 {
-   return eo_do((Ecore_Con *)obj, ecore_con_obj_fd_get());
+   int ret;
+   return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_fd_get());
 }
 
 EOLIAN static int
@@ -997,7 +1011,8 @@ _ecore_con_client_ecore_con_base_fd_get(Eo *obj EINA_UNUSED, Ecore_Con_Client_Da
 EAPI int
 ecore_con_client_fd_get(const Ecore_Con *obj)
 {
-   return eo_do((Ecore_Con *)obj, ecore_con_obj_fd_get());
+   int ret;
+   return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_fd_get());
 }
 
 /**
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index fe02a8f8ac..4d8b4df720 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -370,7 +370,8 @@ _emotion_object_engine_set(Eo *obj, Emotion_Object_Data *pd, const char *engine)
 EAPI Eina_Bool
 emotion_object_file_set(Evas_Object *obj, const char *file)
 {
-   return eo_do(obj, efl_file_set(file, NULL));
+   Eina_Bool ret;
+   return eo_do_ret(obj, ret, efl_file_set(file, NULL));
 }
 
 EOLIAN static Eina_Bool
@@ -668,7 +669,8 @@ _emotion_object_efl_player_play_set(Eo *obj, Emotion_Object_Data *sd, Eina_Bool
 EAPI Eina_Bool
 emotion_object_play_get(const Evas_Object *obj)
 {
-   return eo_do(obj, efl_player_play_get());
+   Eina_Bool ret;
+   return eo_do_ret(obj, ret, efl_player_play_get());
 }
 
 EOLIAN static Eina_Bool
@@ -706,7 +708,8 @@ _emotion_object_efl_player_position_set(Eo *obj, Emotion_Object_Data *sd, double
 EAPI double
 emotion_object_position_get(const Evas_Object *obj)
 {
-   return eo_do(obj, efl_player_position_get());
+   double ret;
+   return eo_do_ret(obj, ret, efl_player_position_get());
 }
 
 EOLIAN static double
@@ -799,7 +802,8 @@ _emotion_object_efl_image_smooth_scale_set(Eo *obj EINA_UNUSED, Emotion_Object_D
 EAPI Eina_Bool
 emotion_object_smooth_scale_get(const Evas_Object *obj)
 {
-   return eo_do(obj, efl_image_smooth_scale_get());
+   Eina_Bool ret;
+   return eo_do_ret(obj, ret, efl_image_smooth_scale_get());
 }
 
 EOLIAN static Eina_Bool
@@ -811,7 +815,8 @@ _emotion_object_efl_image_smooth_scale_get(Eo *obj EINA_UNUSED, Emotion_Object_D
 EAPI double
 emotion_object_ratio_get(const Evas_Object *obj)
 {
-   return eo_do(obj, efl_image_ratio_get());
+   double ret;
+   return eo_do_ret(obj, ret, efl_image_ratio_get());
 }
 
 EOLIAN static double
@@ -851,7 +856,8 @@ _emotion_object_efl_player_audio_volume_set(Eo *obj EINA_UNUSED, Emotion_Object_
 EAPI double
 emotion_object_audio_volume_get(const Evas_Object *obj)
 {
-   return eo_do(obj, efl_player_audio_volume_get());
+   double ret;
+   return eo_do_ret(obj, ret, efl_player_audio_volume_get());
 }
 
 EOLIAN static double
@@ -878,7 +884,8 @@ _emotion_object_efl_player_audio_mute_set(Eo *obj EINA_UNUSED, Emotion_Object_Da
 EAPI Eina_Bool
 emotion_object_audio_mute_get(const Evas_Object *obj)
 {
-   return eo_do(obj, efl_player_audio_mute_get());
+   Eina_Bool ret;
+   return eo_do_ret(obj, ret, efl_player_audio_mute_get());
 }
 
 EOLIAN static Eina_Bool
@@ -1168,7 +1175,8 @@ emotion_object_progress_info_get(const Evas_Object *obj)
 EAPI double
 emotion_object_progress_status_get(const Evas_Object *obj)
 {
-   return eo_do(obj, efl_player_progress_get());
+   double ret;
+   return eo_do_ret(obj, ret, efl_player_progress_get());
 }
 
 EOLIAN static double
diff --git a/src/lib/evas/canvas/evas_3d_node.c b/src/lib/evas/canvas/evas_3d_node.c
index af9188635b..09bffc860b 100644
--- a/src/lib/evas/canvas/evas_3d_node.c
+++ b/src/lib/evas/canvas/evas_3d_node.c
@@ -965,7 +965,8 @@ evas_3d_node_color_node_mesh_collect(Evas_3D_Node *node, void *data)
              eo_do (node, list_meshes = (Eina_List *)evas_3d_node_mesh_list_get());
              EINA_LIST_FOREACH(list_meshes, l, mesh)
                {
-                 if (eo_do(mesh, evas_3d_mesh_color_pick_enable_get()))
+                 Eina_Bool tmp;
+                 if (eo_do_ret(mesh, tmp, evas_3d_mesh_color_pick_enable_get()))
                    {
                       color = calloc(1, sizeof(Evas_Color));
 
diff --git a/src/lib/evas/canvas/evas_3d_scene.c b/src/lib/evas/canvas/evas_3d_scene.c
index aac1cafa31..0bc0fb3b63 100644
--- a/src/lib/evas/canvas/evas_3d_scene.c
+++ b/src/lib/evas/canvas/evas_3d_scene.c
@@ -664,7 +664,7 @@ _evas_3d_scene_pick(Eo *obj, Evas_3D_Scene_Data *pd, Evas_Real x, Evas_Real y,
         scene_data.shadows_enabled = pd->shadows_enabled;
         scene_data.camera_node = pd->camera_node;
         scene_data.color_pick_enabled = pd->color_pick_enabled;
-        update_scene = eo_do(obj, evas_3d_object_dirty_get(EVAS_3D_STATE_SCENE_UPDATED));
+        eo_do(obj, update_scene = evas_3d_object_dirty_get(EVAS_3D_STATE_SCENE_UPDATED));
         if (update_scene)
           {
              if (pd->node_mesh_colors)
@@ -792,17 +792,18 @@ _evas_3d_scene_pick_member_list_get(Eo *obj, Evas_3D_Scene_Data *pd, Evas_Real x
    Eina_Bool pick = EINA_FALSE;
 
    /* Check pick for given scene. */
-   pick = eo_do(obj, evas_3d_scene_pick(x, y, NULL, NULL, NULL, NULL));
+   eo_do(obj, pick = evas_3d_scene_pick(x, y, NULL, NULL, NULL, NULL));
 
    if (!pick)
      return NULL;
 
    /* Get all members from root node. */
-   list = eo_do(pd->root_node, evas_3d_node_member_list_get());
+   eo_do(pd->root_node, list = evas_3d_node_member_list_get());
 
    EINA_LIST_FOREACH(list, l, node)
      {
-        if (eo_do(obj, evas_3d_scene_exist(x, y, node)))
+        Evas_3D_Node *exists;
+        if (eo_do_ret(obj, exists, evas_3d_scene_exist(x, y, node)))
           picked_nodes = eina_list_append(picked_nodes, l);
      }
 
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 4c9a87b528..e06eba8107 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -4894,13 +4894,15 @@ evas_object_image_file_get(const Eo *obj, const char **file, const char **key)
 EAPI Eina_Bool
 evas_object_image_save(const Eo *obj, const char *file, const char *key, const char *flags)
 {
-   return eo_do((Eo *) obj, efl_file_save(file, key, flags));
+   Eina_Bool ret;
+   return eo_do_ret((Eo *) obj, ret, efl_file_save(file, key, flags));
 }
 
 EAPI Eina_Bool
 evas_object_image_animated_get(const Eo *obj)
 {
-   return eo_do((Eo *) obj, efl_image_animated_get());
+   Eina_Bool ret;
+   return eo_do_ret((Eo *) obj, ret, efl_image_animated_get());
 }
 
 EAPI void
@@ -4924,7 +4926,8 @@ evas_object_image_smooth_scale_set(Eo *obj, Eina_Bool smooth_scale)
 EAPI Eina_Bool
 evas_object_image_smooth_scale_get(const Eo *obj)
 {
-   return eo_do((Eo *) obj, efl_image_smooth_scale_get());
+   Eina_Bool ret;
+   return eo_do_ret((Eo *) obj, ret, efl_image_smooth_scale_get());
 }
 
 #include "canvas/evas_image.eo.c"
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 8d286fd23b..d5a8a478bf 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -776,7 +776,8 @@ _evas_object_position_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coor
 
    if ((obj->cur->geometry.x == x) && (obj->cur->geometry.y == y)) return;
 
-   Evas_Map *map = (Evas_Map *)eo_do(eo_obj, evas_obj_map_get());
+   Evas_Map *map;
+   eo_do(eo_obj, map = (Evas_Map *) evas_obj_map_get());
    if (map && map->move_sync.enabled)
      {
         Evas_Coord diff_x = x - obj->cur->geometry.x;
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 004001fb34..f59bbd8669 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -2573,7 +2573,8 @@ evas_object_text_text_set(Eo *obj, const char *text)
 EAPI const char *
 evas_object_text_text_get(const Eo *obj)
 {
-   return eo_do((Eo *) obj, efl_text_get());
+   const char *ret;
+   return eo_do_ret((Eo *) obj, ret, efl_text_get());
 }
 
 #include "canvas/evas_text.eo.c"