Automatic migration to Eo4.

I just ran my script (email to follow) to migrate all of the EFL
automatically. This commit is *only* the automatic conversion, so it can
be easily reverted and re-run.

173 files changed, 3637 insertions, 4142 deletions

diff --git a/src/bin/test_anim.c b/src/bin/test_anim.c
index 8f2428155..a688a1961 100644
--- a/src/bin/test_anim.c
+++ b/src/bin/test_anim.c
@@ -93,5 +93,5 @@ test_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info
    evas_object_resize(win, 480, 800);
    evas_object_show(win);
 
-   eo_do(win, eo_event_callback_add(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _anim_tick, NULL));
+   eo_event_callback_add(win, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _anim_tick, NULL);
 }
diff --git a/src/bin/test_application_server.c b/src/bin/test_application_server.c
index 0d7874e6b..1272ff619 100644
--- a/src/bin/test_application_server.c
+++ b/src/bin/test_application_server.c
@@ -66,7 +66,7 @@ _resume_cb(void *data, const Eo_Event *event)
    if (!ctx->win)
      {
         _window_create(ctx);
-        eo_do(event->obj, elm_app_server_view_window_set(ctx->win));
+        elm_app_server_view_window_set(event->obj, ctx->win);
      }
 
    _text_update(ctx, "alive");
@@ -80,7 +80,7 @@ _view_del_cb(void *data, const Eo_Event *event)
 
    if (ctx->win)
      evas_object_del(ctx->win);
-   eo_do(event->obj, elm_app_server_view_window_set(NULL));
+   elm_app_server_view_window_set(event->obj, NULL);
    eina_stringshare_del(ctx->view_name);
    free(ctx);
    return EINA_TRUE;
@@ -100,23 +100,22 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED,
         return NULL;
      }
 
-   view = eo_add(ELM_APP_SERVER_VIEW_CLASS, app_server,
-                        elm_app_server_view_id_set(NULL));
+   view = eo_add(ELM_APP_SERVER_VIEW_CLASS, app_server, elm_app_server_view_id_set(eoid, NULL));
 
-   eo_do(view, id = elm_app_server_view_id_get());
-   eo_do(app_server, pkg = elm_app_server_package_get());
+   id = elm_app_server_view_id_get(view);
+   pkg = elm_app_server_package_get(app_server);
    ctx->view_name = eina_stringshare_printf("%s %s", pkg, id);
 
    _window_create(ctx);
 
-   eo_do(view, elm_app_server_view_title_set(ctx->view_name),
-         elm_app_server_view_new_events_set(5),
-         elm_app_server_view_window_set(ctx->win),
-         elm_app_server_view_resume(),
-         eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx),
-         eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx),
-         eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx),
-         eo_event_callback_add(EO_BASE_EVENT_DEL, _view_del_cb, ctx));
+   elm_app_server_view_title_set(view, ctx->view_name);
+   elm_app_server_view_new_events_set(view, 5);
+   elm_app_server_view_window_set(view, ctx->win);
+   elm_app_server_view_resume(view);
+   eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx);
+   eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx);
+   eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx);
+   eo_event_callback_add(view, EO_BASE_EVENT_DEL, _view_del_cb, ctx);
 
    return view;
 }
@@ -127,8 +126,8 @@ _terminate_cb(void *data EINA_UNUSED, const Eo_Event *event)
    const char *title = NULL;
 
    printf("terminate cb\n");
-   eo_do(event->obj, elm_app_server_save(),
-         title = elm_app_server_title_get());
+   elm_app_server_save(event->obj);
+   title = elm_app_server_title_get(event->obj);
 
    printf("Closing: %s\n", title);
    eo_unref(event->obj);
@@ -142,11 +141,10 @@ test_application_server_common(const char *pkg)
    Elm_App_Server_View *view;
    Elm_App_Server *server;
 
-   server = eo_add(ELM_APP_SERVER_CLASS, NULL,
-                          elm_app_server_constructor(pkg, _create_view_cb));
-   eo_do(server, elm_app_server_title_set(pkg),
-         views_iter = elm_app_server_views_get(),
-         eo_event_callback_add(ELM_APP_SERVER_EVENT_TERMINATE, _terminate_cb, NULL));
+   server = eo_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(eoid, pkg, _create_view_cb));
+   elm_app_server_title_set(server, pkg);
+   views_iter = elm_app_server_views_get(server);
+   eo_event_callback_add(server, ELM_APP_SERVER_EVENT_TERMINATE, _terminate_cb, NULL);
 
    //views create in shallow state
    EINA_ITERATOR_FOREACH(views_iter, view)
@@ -156,14 +154,13 @@ test_application_server_common(const char *pkg)
 
         ctx = calloc(1, sizeof(App_View_Context));
 
-        eo_do(view, id = elm_app_server_view_id_get());
+        id = elm_app_server_view_id_get(view);
         ctx->view_name = eina_stringshare_printf("%s %s", pkg, id);
 
-        eo_do(view,
-              eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx),
-              eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx),
-              eo_event_callback_add(ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx),
-              eo_event_callback_add(EO_BASE_EVENT_DEL, _view_del_cb, ctx));
+        eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_CLOSED, _close_cb, ctx);
+        eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_PAUSED, _pause_cb, ctx);
+        eo_event_callback_add(view, ELM_APP_SERVER_VIEW_EVENT_RESUMED, _resume_cb, ctx);
+        eo_event_callback_add(view, EO_BASE_EVENT_DEL, _view_del_cb, ctx);
      }
    eina_iterator_free(views_iter);
 
@@ -190,7 +187,7 @@ test_application_server_phone(void *data EINA_UNUSED,
      }
    printf("Starting phone\n");
    phone_server = test_application_server_common("org.enlightenment.phone");
-   eo_do(phone_server, eo_event_callback_add(EO_BASE_EVENT_DEL, _server_del_cb, &phone_server));
+   eo_event_callback_add(phone_server, EO_BASE_EVENT_DEL, _server_del_cb, &phone_server);
 }
 
 void
@@ -205,5 +202,5 @@ test_application_server_message(void *data EINA_UNUSED,
      }
    printf("Starting message\n");
    msg_server = test_application_server_common( "org.enlightenment.message");
-   eo_do(msg_server, eo_event_callback_add(EO_BASE_EVENT_DEL, _server_del_cb, &msg_server));
+   eo_event_callback_add(msg_server, EO_BASE_EVENT_DEL, _server_del_cb, &msg_server);
 }
diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c
index b92f933df..1a56d000e 100644
--- a/src/bin/test_entry.c
+++ b/src/bin/test_entry.c
@@ -573,7 +573,7 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
    evas_object_smart_callback_add(en, "anchor,clicked", scrolled_anchor_test, en);
    evas_object_show(en);
    elm_box_pack_end(bx, en);
-   eo_do(en, eo_event_callback_add(ELM_ENTRY_EVENT_CONTEXT_OPEN, _context_menu_show_cb, NULL));
+   eo_event_callback_add(en, ELM_ENTRY_EVENT_CONTEXT_OPEN, _context_menu_show_cb, NULL);
 
    bx2 = elm_box_add(win);
    elm_box_horizontal_set(bx2, EINA_TRUE);
@@ -2438,8 +2438,8 @@ _test_regex_bt_cb(void *data,
 
    if (test_data->re)
      {
-        eo_do(test_data->en_single, eo_event_callback_del(ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re));
-        eo_do(test_data->en_multi, eo_event_callback_del(ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re));
+        eo_event_callback_del(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
+        eo_event_callback_del(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
         elm_validator_regexp_free(test_data->re);
      }
    test_data->re = elm_validator_regexp_new(elm_entry_entry_get(test_data->en_regex), NULL);
@@ -2463,8 +2463,8 @@ _test_regex_bt_cb(void *data,
      }
    if (!status)
      {
-        eo_do(test_data->en_single, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re));
-        eo_do(test_data->en_multi, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re));
+        eo_event_callback_add(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
+        eo_event_callback_add(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
      }
 
    elm_object_text_set(test_data->lb_regex, eina_strbuf_string_get(tmp));
@@ -2563,8 +2563,8 @@ test_entry_regex(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
 
    test_data->re = elm_validator_regexp_new(REGEX, NULL);
    elm_entry_entry_set(test_data->en_regex, REGEX);
-   eo_do(test_data->en_single, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re));
-   eo_do(test_data->en_multi, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re));
+   eo_event_callback_add(test_data->en_single, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
+   eo_event_callback_add(test_data->en_multi, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, test_data->re);
 
    evas_object_resize(win, 400, 400);
    evas_object_show(win);
diff --git a/src/bin/test_systray.c b/src/bin/test_systray.c
index 4efe8d685..1271242d5 100644
--- a/src/bin/test_systray.c
+++ b/src/bin/test_systray.c
@@ -20,7 +20,7 @@ _ev_handler(void *data EINA_UNUSED,
 
    printf("systray ready event\n");
 
-   eo_do(item, ret = elm_obj_systray_register());
+   ret = elm_obj_systray_register(item);
 
    printf("Item Registration: ");
    if (ret)
@@ -36,8 +36,8 @@ _bt_clicked(void *data EINA_UNUSED,
             Evas_Object *obj EINA_UNUSED,
             void *event_info EINA_UNUSED)
 {
-   eo_do(item, elm_obj_systray_icon_name_set(elm_entry_entry_get(i)));
-   eo_do(item, elm_obj_systray_att_icon_name_set(elm_entry_entry_get(ai)));
+   elm_obj_systray_icon_name_set(item, elm_entry_entry_get(i));
+   elm_obj_systray_att_icon_name_set(item, elm_entry_entry_get(ai));
 }
 
 static void
@@ -45,7 +45,7 @@ static void
             Evas_Object *obj EINA_UNUSED,
             void *event_info EINA_UNUSED)
 {
-   eo_do(item, elm_obj_systray_status_set(elm_radio_value_get(r)));
+   elm_obj_systray_status_set(item, elm_radio_value_get(r));
 }
 
 static void
@@ -83,9 +83,9 @@ test_systray(void *data EINA_UNUSED,
 
    // Status Notifier Item Handler
    item = eo_add(ELM_SYSTRAY_CLASS, win);
-   eo_do(item, elm_obj_systray_icon_name_set("elementary"));
-   eo_do(item, elm_obj_systray_att_icon_name_set("elementary"));
-   eo_do(item, elm_obj_systray_menu_set(it));
+   elm_obj_systray_icon_name_set(item, "elementary");
+   elm_obj_systray_att_icon_name_set(item, "elementary");
+   elm_obj_systray_menu_set(item, it);
 
    it = elm_bg_add(win);
    elm_win_resize_object_add(win, it);
diff --git a/src/bin/test_task_switcher.c b/src/bin/test_task_switcher.c
index 535e88e09..1c2b441dd 100644
--- a/src/bin/test_task_switcher.c
+++ b/src/bin/test_task_switcher.c
@@ -18,19 +18,19 @@ static void _apps_list_update(void);
 static void _btn_close_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Elm_App_Client_View *view = data;
-   eo_do(view, elm_app_client_view_close(NULL, NULL));
+   elm_app_client_view_close(view, NULL, NULL);
 }
 
 static void _btn_pause_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Elm_App_Client_View *view = data;
-   eo_do(view, elm_app_client_view_pause(NULL, NULL));
+   elm_app_client_view_pause(view, NULL, NULL);
 }
 
 static void _btn_resume_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Elm_App_Client_View *view = data;
-   eo_do(view, elm_app_client_view_resume(NULL, NULL));
+   elm_app_client_view_resume(view, NULL, NULL);
 }
 
 static Eina_Bool
@@ -38,7 +38,7 @@ _app_view_prop_changed_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
    Elm_App_View_State state = ELM_APP_VIEW_STATE_UNKNOWN;
 
-   eo_do(event->obj, state = elm_app_client_view_state_get());
+   state = elm_app_client_view_state_get(event->obj);
 
    if (state == ELM_APP_VIEW_STATE_CLOSED)
      {
@@ -69,9 +69,7 @@ _app_view_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EIN
         Elm_App_Client_View *old_view;
 
         old_view = evas_object_data_del(view_props, "view");
-        eo_do(old_view,
-              eo_event_callback_del(ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED,
-                                    _app_view_prop_changed_cb, table));
+        eo_event_callback_del(old_view, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, _app_view_prop_changed_cb, table);
         elm_list_clear(view_props);
      }
    else
@@ -85,13 +83,12 @@ _app_view_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EIN
 
    evas_object_data_set(view_props, "view", view);
 
-   eo_do(view, title = elm_app_client_view_title_get(),
-         icon = elm_app_client_view_icon_get(),
-         progress = elm_app_client_view_progress_get(),
-         new_events = elm_app_client_view_new_events_get(),
-         window = elm_app_client_view_window_get(),
-         eo_event_callback_add(ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED,
-                               _app_view_prop_changed_cb, table));
+   title = elm_app_client_view_title_get(view);
+   icon = elm_app_client_view_icon_get(view);
+   progress = elm_app_client_view_progress_get(view);
+   new_events = elm_app_client_view_new_events_get(view);
+   window = elm_app_client_view_window_get(view);
+   eo_event_callback_add(view, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, _app_view_prop_changed_cb, table);
 
    snprintf(buffer, sizeof(buffer), "Title=%s", title);
    elm_list_item_append(view_props, buffer, NULL, NULL, NULL, NULL);
@@ -108,7 +105,7 @@ _app_view_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EIN
    snprintf(buffer, sizeof(buffer), "WindowID=%d", window);
    elm_list_item_append(view_props, buffer, NULL, NULL, NULL, NULL);
 
-   eo_do(view, state = elm_app_client_view_state_get());
+   state = elm_app_client_view_state_get(view);
    if (state == ELM_APP_VIEW_STATE_LIVE)
      snprintf(buffer, sizeof(buffer), "State=alive");
    else if (state == ELM_APP_VIEW_STATE_PAUSED)
@@ -176,7 +173,7 @@ static void _popup_btn_open_view_cb(void *data, Evas_Object *obj EINA_UNUSED, vo
    Eina_Value *args = NULL;//TODO fill with args of popup
    Elm_App_Client *app = evas_object_data_get(popup, "app");
 
-   eo_do(app, elm_app_client_view_open(args, app_client_view_open_cb, NULL));
+   elm_app_client_view_open(app, args, app_client_view_open_cb, NULL);
 
    evas_object_del(popup);
 }
@@ -214,14 +211,14 @@ _app_view_open(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_U
 static void _app_close_all_views_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Elm_App_Client *app = data;
-   eo_do(app, elm_app_client_view_all_close());
+   elm_app_client_view_all_close(app);
 }
 
 static void
 _app_terminate_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Elm_App_Client *app = data;
-   eo_do(app, elm_app_client_terminate());
+   elm_app_client_terminate(app);
 }
 
 static void
@@ -250,12 +247,12 @@ _app_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
    evas_object_smart_callback_add(btn_open_view, "clicked", _app_view_open, app);
    elm_list_item_append(views, NULL, btn_open_view, NULL, NULL, NULL);
 
-   eo_do(app, views_iter = elm_app_client_views_get());
+   views_iter = elm_app_client_views_get(app);
    EINA_ITERATOR_FOREACH(views_iter, client_view)
      {
         const char *path = NULL;
 
-        eo_do(client_view, path = elm_app_client_view_path_get());
+        path = elm_app_client_view_path_get(client_view);
         elm_list_item_append(views, path, NULL, NULL, _app_view_clicked, client_view);
      }
    eina_iterator_free(views_iter);
@@ -299,22 +296,17 @@ _app_open(const char *package)
      {
         const char *app_package = NULL;
 
-        eo_do(app, app_package = elm_app_client_package_get());
+        app_package = elm_app_client_package_get(app);
         if (!app_package)
           return;
         if (!strcmp(package, app_package))
           return;
      }
 
-   app = eo_add(ELM_APP_CLIENT_CLASS, NULL,
-                       elm_app_client_constructor(package));
-   eo_do(app,
-         eo_event_callback_add(ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED,
-                               _view_list_update_cb, table),
-         eo_event_callback_add(ELM_APP_CLIENT_EVENT_VIEW_CREATED,
-                               _view_list_update_cb, table),
-         eo_event_callback_add(ELM_APP_CLIENT_EVENT_VIEW_DELETED,
-                               _view_list_update_cb, table));
+   app = eo_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(eoid, package));
+   eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, _view_list_update_cb, table);
+   eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_CREATED, _view_list_update_cb, table);
+   eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_DELETED, _view_list_update_cb, table);
    apps_list = eina_list_append(apps_list, app);
 }
 
@@ -351,7 +343,7 @@ _apps_list_update(void)
    EINA_LIST_FOREACH(apps_list, l, app)
      {
         const char *app_package = NULL;
-        eo_do(app, app_package = elm_app_client_package_get());
+        app_package = elm_app_client_package_get(app);
         elm_list_item_append(apps, app_package, NULL, NULL, _app_clicked, app);
      }
 
diff --git a/src/bin/test_win_plug.c b/src/bin/test_win_plug.c
index 25fad1899..3e4226d47 100644
--- a/src/bin/test_win_plug.c
+++ b/src/bin/test_win_plug.c
@@ -161,7 +161,7 @@ _notify_error(Evas_Object *parent, const char *msg)
    evas_object_size_hint_weight_set(notif, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_notify_align_set(notif, 0.5, 1.0);
    elm_notify_timeout_set(notif, 3.0);
-   eo_do(notif, eo_event_callback_add(ELM_NOTIFY_EVENT_DISMISSED, _notify_end, NULL));
+   eo_event_callback_add(notif, ELM_NOTIFY_EVENT_DISMISSED, _notify_end, NULL);
 
    txt = elm_label_add(notif);
    elm_object_text_set(txt, msg);
diff --git a/src/examples/evas3d_map_example.c b/src/examples/evas3d_map_example.c
index eead4d743..ca584527a 100644
--- a/src/examples/evas3d_map_example.c
+++ b/src/examples/evas3d_map_example.c
@@ -225,8 +225,7 @@ animate_scene(void *data)
 
    angle += 0.05;
 
-   eo_do((Evas_Canvas3D_Node *)data,
-         evas_canvas3d_node_orientation_angle_axis_set(angle, 0.0, 1.0, 0.0));
+   evas_canvas3d_node_orientation_angle_axis_set((Evas_Canvas3D_Node *)data, angle, 0.0, 1.0, 0.0);
 
    /* Rotate */
    if (angle > 360.0)
@@ -382,7 +381,7 @@ change_to_2d_map(void)
    elm_map_zoom_mode_set(map, ELM_MAP_ZOOM_MODE_MANUAL);
    elm_map_paused_set(map, EINA_TRUE);
 
-   eo_do(texture_diffuse, evas_canvas3d_texture_source_visible_set(EINA_TRUE));
+   evas_canvas3d_texture_source_visible_set(texture_diffuse, EINA_TRUE);
 
    evas_object_hide(image);
 
@@ -433,8 +432,7 @@ zoom_factor_set(double new_zoom_factor)
         if (cur_zoom_factor < MIN_2D_ZOOM_FACTOR)
           {
              zoom_factor = MIN_2D_ZOOM_FACTOR;
-             eo_do(scene, evas_canvas3d_scene_pick(IMG_SIZE / 2, IMG_SIZE / 2,
-                                             &n, &m, &s, &t));
+             evas_canvas3d_scene_pick(scene, IMG_SIZE / 2, IMG_SIZE / 2, &n, &m, &s, &t);
              src_size = IMG_SIZE * cur_zoom_factor;
              src_x = (Evas_Coord)(src_size * s);
              src_y = (Evas_Coord)(src_size * t);
@@ -466,12 +464,10 @@ zoom_factor_set(double new_zoom_factor)
 
         /* Apply updated texture source. */
         texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
-        eo_do(texture_diffuse,
-              evas_canvas3d_texture_source_set(map),
-              evas_canvas3d_texture_source_visible_set(EINA_FALSE));
+        evas_canvas3d_texture_source_set(texture_diffuse, map);
+        evas_canvas3d_texture_source_visible_set(texture_diffuse, EINA_FALSE);
 
-        eo_do(material,
-              evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture_diffuse));
+        evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture_diffuse);
 
         /* Update camera position. */
         vec3_normalize(&camera_pos_unit_vec, &camera_pos);
@@ -479,8 +475,7 @@ zoom_factor_set(double new_zoom_factor)
         camera_pos.y = (camera_pos_unit_vec.y * MAX_CAMERA_DISTANCE) / zoom_factor;
         camera_pos.z = (camera_pos_unit_vec.z * MAX_CAMERA_DISTANCE) / zoom_factor;
 
-        eo_do(camera_node,
-              evas_canvas3d_node_position_set(camera_pos.x, camera_pos.y, camera_pos.z));
+        evas_canvas3d_node_position_set(camera_node, camera_pos.x, camera_pos.y, camera_pos.z);
      }
 
    /* Update zoom slider. */
@@ -517,7 +512,7 @@ zoom_to_2d_map_cb(void *data,
 
    if (map_dimension_state == MAP_DIMENSION_STATE_2D) return;
 
-   eo_do(scene, evas_canvas3d_scene_pick(mouse_down_pos.x, mouse_down_pos.y, &n, &m, &s, &t));
+   evas_canvas3d_scene_pick(scene, mouse_down_pos.x, mouse_down_pos.y, &n, &m, &s, &t);
    src_size = (Evas_Coord)(IMG_SIZE * zoom_factor);
    src_x = (Evas_Coord)(src_size * s);
    src_y = (Evas_Coord)(src_size * t);
@@ -564,7 +559,7 @@ submenu_info_add(Elm_Object_Item *parent)
 
    if (map_dimension_state == MAP_DIMENSION_STATE_3D)
      {
-        eo_do(scene, evas_canvas3d_scene_pick(mouse_down_pos.x, mouse_down_pos.y, &n, &m, &s, &t));
+        evas_canvas3d_scene_pick(scene, mouse_down_pos.x, mouse_down_pos.y, &n, &m, &s, &t);
         src_size = (Evas_Coord) (IMG_SIZE * zoom_factor);
         src_x = (Evas_Coord)(src_size * s);
         src_y = (Evas_Coord)(src_size * t);
@@ -623,12 +618,12 @@ map_mouse_down_cb(void *data,
    obj_x = ev->canvas.x - x;
    obj_y = ev->canvas.y - y;
 
-   eo_do(scene, evas_canvas3d_scene_size_get(&scene_w, &scene_h));
+   evas_canvas3d_scene_size_get(scene, &scene_w, &scene_h);
 
    scene_x = obj_x * scene_w / (double)w;
    scene_y = obj_y * scene_h / (double)h;
 
-   eo_do(scene, pick = evas_canvas3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t));
+   pick = evas_canvas3d_scene_pick(scene, scene_x, scene_y, &n, &m, &s, &t);
    if (pick)
      printf("Picked     : ");
    else
@@ -693,12 +688,12 @@ mouse_down_cb(void *data,
    obj_x = ev->canvas.x - x;
    obj_y = ev->canvas.y - y;
 
-   eo_do(scene, evas_canvas3d_scene_size_get(&scene_w, &scene_h));
+   evas_canvas3d_scene_size_get(scene, &scene_w, &scene_h);
 
    scene_x = obj_x * scene_w / (double)w;
    scene_y = obj_y * scene_h / (double)h;
 
-   eo_do(scene, pick = evas_canvas3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t));
+   pick = evas_canvas3d_scene_pick(scene, scene_x, scene_y, &n, &m, &s, &t);
    if (pick)
      printf("Picked     : ");
    else
@@ -763,18 +758,14 @@ mouse_move_cb(void *data,
         vec3_normalize(&camera_pos_unit_vec, &camera_pos);
         vec3_scale(&camera_pos, &camera_pos_unit_vec, distance_to_origin);
 
-        eo_do(camera_node,
-              evas_canvas3d_node_position_set(camera_pos.x, camera_pos.y, camera_pos.z),
-              evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
-                                       EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z));
+        evas_canvas3d_node_position_set(camera_node, camera_pos.x, camera_pos.y, camera_pos.z);
+        evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z);
 
         if (elm_check_state_get(light_toggle))
           {
              /* Update light position as the same as camera position. */
-             eo_do(light_node,
-                   evas_canvas3d_node_position_set(camera_pos.x, camera_pos.y, camera_pos.z),
-                   evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
-                                            EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z));
+             evas_canvas3d_node_position_set(light_node, camera_pos.x, camera_pos.y, camera_pos.z);
+             evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z);
           }
      }
 }
@@ -800,12 +791,12 @@ mouse_up_cb(void *data,
    obj_x = ev->canvas.x - x;
    obj_y = ev->canvas.y - y;
 
-   eo_do(scene, evas_canvas3d_scene_size_get(&scene_w, &scene_h));
+   evas_canvas3d_scene_size_get(scene, &scene_w, &scene_h);
 
    scene_x = obj_x * scene_w / (double)w;
    scene_y = obj_y * scene_h / (double)h;
 
-   eo_do(scene, pick = evas_canvas3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t));
+   pick = evas_canvas3d_scene_pick(scene, scene_x, scene_y, &n, &m, &s, &t);
    if (pick)
      printf("Picked     : ");
    else
@@ -856,21 +847,14 @@ skybox_setup(void)
    char              buf[PATH_MAX];
 
    skybox_mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   eo_do(skybox_mesh,
-         evas_canvas3d_mesh_vertex_count_set(24),
-         evas_canvas3d_mesh_frame_add(0),
-
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
-                                            12 * sizeof(float), &skybox_vertices[0]),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
-                                            12 * sizeof(float), &skybox_vertices[3]),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
-                                            12 * sizeof(float), &skybox_vertices[6]),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
-                                            12 * sizeof(float), &skybox_vertices[10]),
-
-         evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &skybox_indices[0]),
-         evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES));
+   evas_canvas3d_mesh_vertex_count_set(skybox_mesh, 24);
+   evas_canvas3d_mesh_frame_add(skybox_mesh, 0);
+   evas_canvas3d_mesh_frame_vertex_data_set(skybox_mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &skybox_vertices[0]);
+   evas_canvas3d_mesh_frame_vertex_data_set(skybox_mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 12 * sizeof(float), &skybox_vertices[3]);
+   evas_canvas3d_mesh_frame_vertex_data_set(skybox_mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, 12 * sizeof(float), &skybox_vertices[6]);
+   evas_canvas3d_mesh_frame_vertex_data_set(skybox_mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &skybox_vertices[10]);
+   evas_canvas3d_mesh_index_data_set(skybox_mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &skybox_indices[0]);
+   evas_canvas3d_mesh_vertex_assembly_set(skybox_mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
 
    /* Set skybox texture source image. */
    skybox_image = elm_image_add(win);
@@ -881,31 +865,26 @@ skybox_setup(void)
 
    /* Set skybox texture material. */
    skybox_material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   eo_do(skybox_mesh, evas_canvas3d_mesh_frame_material_set(0, skybox_material));
+   evas_canvas3d_mesh_frame_material_set(skybox_mesh, 0, skybox_material);
 
    skybox_texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
 
-   eo_do(skybox_texture_diffuse,
-         evas_canvas3d_texture_source_set(skybox_image),
-         evas_canvas3d_texture_source_visible_set(EINA_FALSE));
-
-   eo_do(skybox_material,
-         evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, skybox_texture_diffuse),
-
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
-
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.1, 0.1, 0.1, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0),
-         evas_canvas3d_material_shininess_set(50.0));
-
-   skybox_mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                                    evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
-   eo_do(root_node, evas_canvas3d_node_member_add(skybox_mesh_node));
-   eo_do(skybox_mesh_node, evas_canvas3d_node_mesh_add(skybox_mesh));
-   eo_do(skybox_mesh, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE));
+   evas_canvas3d_texture_source_set(skybox_texture_diffuse, skybox_image);
+   evas_canvas3d_texture_source_visible_set(skybox_texture_diffuse, EINA_FALSE);
+
+   evas_canvas3d_material_texture_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, skybox_texture_diffuse);
+   evas_canvas3d_material_enable_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
+   evas_canvas3d_material_enable_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
+   evas_canvas3d_material_enable_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
+   evas_canvas3d_material_color_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.1, 0.1, 0.1, 1.0);
+   evas_canvas3d_material_color_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_material_color_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0);
+   evas_canvas3d_material_shininess_set(skybox_material, 50.0);
+
+   skybox_mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   evas_canvas3d_node_member_add(root_node, skybox_mesh_node);
+   evas_canvas3d_node_mesh_add(skybox_mesh_node, skybox_mesh);
+   evas_canvas3d_mesh_shade_mode_set(skybox_mesh, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
 }
 
 static void
@@ -944,7 +923,7 @@ camera_setup(void)
 {
    /* Add the camera. */
    camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
-   eo_do(camera, evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 100.0));
+   evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 100.0);
 
    /* Set camera position. */
    camera_pos.x = 0.0;
@@ -961,33 +940,26 @@ camera_setup(void)
    camera_right_vec.y = 0.0;
    camera_right_vec.z = 0.0;
 
-   camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                               evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
-   eo_do(camera_node,
-         evas_canvas3d_node_camera_set(camera),
-         evas_canvas3d_node_position_set(camera_pos.x, camera_pos.y, camera_pos.z),
-         evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
-                                  EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z));
-   eo_do(root_node, evas_canvas3d_node_member_add(camera_node));
+   camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+   evas_canvas3d_node_camera_set(camera_node, camera);
+   evas_canvas3d_node_position_set(camera_node, camera_pos.x, camera_pos.y, camera_pos.z);
+   evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z);
+   evas_canvas3d_node_member_add(root_node, camera_node);
 }
 
 static void
 light_setup(void)
 {
    light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
-   eo_do(light,
-         evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0),
-         evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_light_specular_set(0.2, 0.2, 0.2, 1.0));
-
-   light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                              evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
-   eo_do(light_node,
-         evas_canvas3d_node_light_set(light),
-         evas_canvas3d_node_position_set(0.0, 0.0, MAX_CAMERA_DISTANCE),
-         evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
-                                  EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
-   eo_do(root_node, evas_canvas3d_node_member_add(light_node));
+   evas_canvas3d_light_ambient_set(light, 0.2, 0.2, 0.2, 1.0);
+   evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_light_specular_set(light, 0.2, 0.2, 0.2, 1.0);
+
+   light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+   evas_canvas3d_node_light_set(light_node, light);
+   evas_canvas3d_node_position_set(light_node, 0.0, 0.0, MAX_CAMERA_DISTANCE);
+   evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
+   evas_canvas3d_node_member_add(root_node, light_node);
 }
 
 static void
@@ -997,56 +969,42 @@ mesh_setup(void)
    sphere_init(50);
 
    mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   eo_do(mesh,
-         evas_canvas3d_mesh_vertex_count_set(vertex_count),
-         evas_canvas3d_mesh_frame_add(0),
-
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
-                                            sizeof(vertex), &vertices[0].position),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
-                                            sizeof(vertex), &vertices[0].normal),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT,
-                                            sizeof(vertex), &vertices[0].tangent),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
-                                            sizeof(vertex), &vertices[0].color),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
-                                            sizeof(vertex), &vertices[0].texcoord),
-
-         evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]),
-         evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES));
+   evas_canvas3d_mesh_vertex_count_set(mesh, vertex_count);
+   evas_canvas3d_mesh_frame_add(mesh, 0);
+   evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, sizeof(vertex), &vertices[0].position);
+   evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, sizeof(vertex), &vertices[0].normal);
+   evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT, sizeof(vertex), &vertices[0].tangent);
+   evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, sizeof(vertex), &vertices[0].color);
+   evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, sizeof(vertex), &vertices[0].texcoord);
+   evas_canvas3d_mesh_index_data_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]);
+   evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
 
    material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   eo_do(mesh, evas_canvas3d_mesh_frame_material_set(0, material));
+   evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
 
    texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
-   eo_do(texture_diffuse,
-         evas_canvas3d_texture_source_set(map),
-         evas_canvas3d_texture_source_visible_set(EINA_FALSE));
+   evas_canvas3d_texture_source_set(texture_diffuse, map);
+   evas_canvas3d_texture_source_visible_set(texture_diffuse, EINA_FALSE);
 
    texture_normal = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
-   eo_do(texture_normal,
-         evas_canvas3d_texture_source_set(normal_map),
-         evas_canvas3d_texture_source_visible_set(EINA_FALSE));
-
-   eo_do(material,
-         evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture_diffuse),
-         evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, texture_normal),
-
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
-
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.1, 0.1, 0.1, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0),
-         evas_canvas3d_material_shininess_set(50.0));
-
-   mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                             evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
-   eo_do(root_node, evas_canvas3d_node_member_add(mesh_node));
-   eo_do(mesh_node, evas_canvas3d_node_mesh_add(mesh));
-   eo_do(mesh, evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP));
+   evas_canvas3d_texture_source_set(texture_normal, normal_map);
+   evas_canvas3d_texture_source_visible_set(texture_normal, EINA_FALSE);
+
+   evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture_diffuse);
+   evas_canvas3d_material_texture_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, texture_normal);
+   evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
+   evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
+   evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
+   evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE);
+   evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.1, 0.1, 0.1, 1.0);
+   evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0);
+   evas_canvas3d_material_shininess_set(material, 50.0);
+
+   mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   evas_canvas3d_node_member_add(root_node, mesh_node);
+   evas_canvas3d_node_mesh_add(mesh_node, mesh);
+   evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP);
 }
 
 static void
@@ -1116,18 +1074,14 @@ light_toggle_changed_cb(void *data,
    if (elm_check_state_get(obj))
      {
         /* Set light position as the same as camera position. */
-        eo_do(light_node,
-              evas_canvas3d_node_position_set(camera_pos.x, camera_pos.y, camera_pos.z),
-              evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
-                                       EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z));
+        evas_canvas3d_node_position_set(light_node, camera_pos.x, camera_pos.y, camera_pos.z);
+        evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z);
      }
    else
      {
         /* Set light position to default position. */
-        eo_do(light_node,
-              evas_canvas3d_node_position_set(0.0, 0.0, MAX_CAMERA_DISTANCE),
-              evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
-                                       EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
+        evas_canvas3d_node_position_set(light_node, 0.0, 0.0, MAX_CAMERA_DISTANCE);
+        evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
      }
 }
 
@@ -1215,8 +1169,7 @@ elm_main(int argc, char **argv)
    scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add a root node for the scene. */
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                             evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
+   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    skybox_setup();
    texture_source_setup();
@@ -1225,11 +1178,10 @@ elm_main(int argc, char **argv)
    mesh_setup();
 
    /* Set up scene. */
-   eo_do(scene,
-         evas_canvas3d_scene_root_node_set(root_node),
-         evas_canvas3d_scene_camera_node_set(camera_node),
-         evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
-   eo_do(image, evas_obj_image_scene_set(scene));
+   evas_canvas3d_scene_root_node_set(scene, root_node);
+   evas_canvas3d_scene_camera_node_set(scene, camera_node);
+   evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
+   evas_obj_image_scene_set(image, scene);
 
    /* Add a layout for controlers. */
    control_layout = elm_layout_add(win);
diff --git a/src/examples/evas3d_object_on_button_example.c b/src/examples/evas3d_object_on_button_example.c
index 97a90c36b..eb06dc01a 100644
--- a/src/examples/evas3d_object_on_button_example.c
+++ b/src/examples/evas3d_object_on_button_example.c
@@ -115,14 +115,13 @@ _stop_scene(void *data,
      {
         Eina_Bool ret;
 
-        eo_do(d->scene, evas_canvas3d_scene_color_pick_enable_set(EINA_TRUE));
-        eo_do(d->scene,
-              ret = evas_canvas3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, &s, &t));
+        evas_canvas3d_scene_color_pick_enable_set(d->scene, EINA_TRUE);
+        ret = evas_canvas3d_scene_pick(d->scene, ev->canvas.x, ev->canvas.y, &n, &m, &s, &t);
         if (ret)
           {
              d_angle = 0.0;
              elm_object_signal_emit(btn, "mouse,down,1", "event");
-             eo_do(d->mesh_node, evas_canvas3d_node_position_set(0.0, 0.0, -0.2));
+             evas_canvas3d_node_position_set(d->mesh_node, 0.0, 0.0, -0.2);
           }
      }
 }
@@ -137,7 +136,7 @@ _play_scene(void *data,
 
    d_angle = 0.5;
    elm_object_signal_emit(btn, "mouse,up,1", "event");
-   eo_do(d->mesh_node, evas_canvas3d_node_position_set(0.0, 0.0, 0.0));
+   evas_canvas3d_node_position_set(d->mesh_node, 0.0, 0.0, 0.0);
 }
 
 
@@ -149,8 +148,7 @@ _animate_scene(void *data)
 
    angle += d_angle;
 
-   eo_do(scene->mesh_node,
-         evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0));
+   evas_canvas3d_node_orientation_angle_axis_set(scene->mesh_node, angle, 1.0, 1.0, 1.0);
 
    /* Rotate */
    if (angle > 360.0) angle -= 360.0f;
@@ -163,38 +161,30 @@ _camera_setup(Scene_Data *data)
 {
    data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
 
-   eo_do(data->camera,
-         evas_canvas3d_camera_projection_perspective_set(20.0, 1.0, 2.0, 50.0));
+   evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0);
 
    data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                    evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
-   eo_do(data->camera_node,
-         evas_canvas3d_node_camera_set(data->camera),
-         evas_canvas3d_node_position_set(0.0, 0.0, 15.0),
-         evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
-                                  EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1.0, 0.0));
-   eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node));
+      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+   evas_canvas3d_node_camera_set(data->camera_node, data->camera);
+   evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 15.0);
+   evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1.0, 0.0);
+   evas_canvas3d_node_member_add(data->root_node, data->camera_node);
 }
 
 static void
 _light_setup(Scene_Data *data)
 {
    data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
-   eo_do(data->light,
-         evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0),
-         evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
+   evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
+   evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
 
    data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                    evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
-   eo_do(data->light_node,
-         evas_canvas3d_node_light_set(data->light),
-         evas_canvas3d_node_position_set(0.0, 0.0, 10.0),
-         evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
-                                  EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
-   eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node));
+      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+   evas_canvas3d_node_light_set(data->light_node, data->light);
+   evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
+   evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
+   evas_canvas3d_node_member_add(data->root_node, data->light_node);
 }
 static void
 _mesh_setup(Scene_Data *data)
@@ -203,72 +193,54 @@ _mesh_setup(Scene_Data *data)
    data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
    data->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
 
-   eo_do(data->texture,
-         evas_canvas3d_texture_source_set(btn),
-         evas_canvas3d_texture_source_visible_set(EINA_FALSE));
+   evas_canvas3d_texture_source_set(data->texture, btn);
+   evas_canvas3d_texture_source_visible_set(data->texture, EINA_FALSE);
 
-   eo_do(data->material,
-         evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture),
-
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
-
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_material_shininess_set(100.0));
+   evas_canvas3d_material_texture_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture);
+   evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
+   evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
+   evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
+   evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0);
+   evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0);
+   evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_material_shininess_set(data->material, 100.0);
 
    /* Setup mesh. */
    data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   eo_do(data->mesh,
-         evas_canvas3d_mesh_vertex_count_set(24),
-         evas_canvas3d_mesh_frame_add(0),
-
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
-                                            12 * sizeof(float), &cube_vertices[ 0]),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
-                                            12 * sizeof(float), &cube_vertices[ 3]),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
-                                            12 * sizeof(float), &cube_vertices[ 6]),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
-                                            12 * sizeof(float), &cube_vertices[10]),
-
-         evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
-                                     36, &cube_indices[0]),
-         evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
-
-         evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
-
-         evas_canvas3d_mesh_frame_material_set(0, data->material),
-         evas_canvas3d_mesh_color_pick_enable_set(EINA_TRUE));
+   evas_canvas3d_mesh_vertex_count_set(data->mesh, 24);
+   evas_canvas3d_mesh_frame_add(data->mesh, 0);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 12 * sizeof(float), &cube_vertices[ 3]);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, 12 * sizeof(float), &cube_vertices[ 6]);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
+   evas_canvas3d_mesh_index_data_set(data->mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
+   evas_canvas3d_mesh_vertex_assembly_set(data->mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
+   evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
+   evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE);
 
    data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                    evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
-   eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node));
-   eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh));
+      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
+   evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
 }
 
 static void
 _scene_setup(Scene_Data *data)
 {
    data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
-   eo_do(data->scene,
-         evas_canvas3d_scene_size_set(WIDTH, HEIGHT);
-         evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
+   evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
+   evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
 
    data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                    evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
+      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
    _light_setup(data);
    _mesh_setup(data);
 
-   eo_do(data->scene,
-         evas_canvas3d_scene_root_node_set(data->root_node),
-         evas_canvas3d_scene_camera_node_set(data->camera_node));
+   evas_canvas3d_scene_root_node_set(data->scene, data->root_node);
+   evas_canvas3d_scene_camera_node_set(data->scene, data->camera_node);
 }
 
 int
@@ -286,9 +258,8 @@ elm_main(int argc, char **argv)
 
    /* Add an image object for 3D scene rendering. */
    image = evas_object_image_filled_add(evas);
-   eo_do(image,
-         efl_gfx_size_set(WIDTH, HEIGHT),
-         efl_gfx_visible_set(EINA_TRUE));
+   efl_gfx_size_set(image, WIDTH, HEIGHT);
+   efl_gfx_visible_set(image, EINA_TRUE);
 
    btn = elm_button_add(win);
    evas_object_resize(btn, (WIDTH * 2) / 3, (HEIGHT * 2) / 3);
@@ -299,7 +270,7 @@ elm_main(int argc, char **argv)
    /* Set the image object as render target for 3D scene. */
    _scene_setup(&data);
    evas_object_focus_set(image, EINA_TRUE);
-   eo_do(image, evas_obj_image_scene_set(data.scene));
+   evas_obj_image_scene_set(image, data.scene);
 
    evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN, _stop_scene, &data);
    evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_UP, _play_scene, &data);
diff --git a/src/examples/evas3d_scene_on_button_example.c b/src/examples/evas3d_scene_on_button_example.c
index 50115c195..c7cf82c32 100644
--- a/src/examples/evas3d_scene_on_button_example.c
+++ b/src/examples/evas3d_scene_on_button_example.c
@@ -109,8 +109,7 @@ _animate_scene(void *data)
 
    angle += d_angle;
 
-   eo_do(scene->mesh_node,
-         evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0));
+   evas_canvas3d_node_orientation_angle_axis_set(scene->mesh_node, angle, 1.0, 1.0, 1.0);
 
    /* Rotate */
    if (angle > 360.0) angle -= 360.0f;
@@ -123,38 +122,30 @@ _camera_setup(Scene_Data *data)
 {
    data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
 
-   eo_do(data->camera,
-         evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0));
+   evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
 
    data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                    evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
-   eo_do(data->camera_node,
-         evas_canvas3d_node_camera_set(data->camera),
-         evas_canvas3d_node_position_set(0.0, 0.0, 10.0),
-         evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
-                                  EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
-   eo_do(data->root_node, evas_canvas3d_node_member_add(data->camera_node));
+      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+   evas_canvas3d_node_camera_set(data->camera_node, data->camera);
+   evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
+   evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
+   evas_canvas3d_node_member_add(data->root_node, data->camera_node);
 }
 
 static void
 _light_setup(Scene_Data *data)
 {
    data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
-   eo_do(data->light,
-         evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0),
-         evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0));
+   evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
+   evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
 
    data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                    evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
-   eo_do(data->light_node,
-         evas_canvas3d_node_light_set(data->light),
-         evas_canvas3d_node_position_set(0.0, 0.0, 10.0),
-         evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
-                                  EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
-   eo_do(data->root_node, evas_canvas3d_node_member_add(data->light_node));
+      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+   evas_canvas3d_node_light_set(data->light_node, data->light);
+   evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
+   evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
+   evas_canvas3d_node_member_add(data->root_node, data->light_node);
 }
 static void
 _mesh_setup(Scene_Data *data)
@@ -162,70 +153,49 @@ _mesh_setup(Scene_Data *data)
    /* Setup material. */
    data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
-   eo_do(data->material,
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
-
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT,
-                                    0.2, 0.2, 0.2, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE,
-                                    0.8, 0.8, 0.8, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR,
-                                    1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_material_shininess_set(100.0));
+   evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
+   evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
+   evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
+   evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0);
+   evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0);
+   evas_canvas3d_material_color_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_material_shininess_set(data->material, 100.0);
 
    /* Setup mesh. */
    data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   eo_do(data->mesh,
-         evas_canvas3d_mesh_vertex_count_set(24),
-         evas_canvas3d_mesh_frame_add(0),
-
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
-                                            12 * sizeof(float),
-                                            &cube_vertices[ 0]),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
-                                            12 * sizeof(float),
-                                            &cube_vertices[ 3]),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
-                                            12 * sizeof(float),
-                                            &cube_vertices[ 6]),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
-                                            12 * sizeof(float),
-                                            &cube_vertices[10]),
-
-         evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
-                                     36, &cube_indices[0]),
-         evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
-         evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
-         evas_canvas3d_mesh_frame_material_set(0, data->material));
+   evas_canvas3d_mesh_vertex_count_set(data->mesh, 24);
+   evas_canvas3d_mesh_frame_add(data->mesh, 0);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 12 * sizeof(float), &cube_vertices[ 3]);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, 12 * sizeof(float), &cube_vertices[ 6]);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
+   evas_canvas3d_mesh_index_data_set(data->mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
+   evas_canvas3d_mesh_vertex_assembly_set(data->mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
+   evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
 
    data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                    evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
-   eo_do(data->root_node, evas_canvas3d_node_member_add(data->mesh_node));
-   eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh));
+      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
+   evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
+   evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
 }
 
 static void
 _scene_setup(Scene_Data *data)
 {
    data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
-   eo_do(data->scene,
-         evas_canvas3d_scene_size_set(WIDTH - d_w, HEIGHT - d_h);
-         evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
+   evas_canvas3d_scene_size_set(data->scene, WIDTH - d_w, HEIGHT - d_h);
+   evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
 
    data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                    evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
+      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
    _light_setup(data);
    _mesh_setup(data);
 
-   eo_do(data->scene,
-         evas_canvas3d_scene_root_node_set(data->root_node),
-         evas_canvas3d_scene_camera_node_set(data->camera_node));
+   evas_canvas3d_scene_root_node_set(data->scene, data->root_node);
+   evas_canvas3d_scene_camera_node_set(data->scene, data->camera_node);
 }
 
 static void
@@ -237,17 +207,13 @@ _stop_scene(void *data,
    Evas_Event_Mouse_Down *ev = event_info;
    Scene_Data *d = (Scene_Data *)data;
 
-   eo_do(d->mesh_node,
-         evas_canvas3d_node_scale_set(0.97, 0.97, 0.97));
+   evas_canvas3d_node_scale_set(d->mesh_node, 0.97, 0.97, 0.97);
 
    if (ev->button == 1)
      {
         Evas_Canvas3D_Node *ret;
 
-        if (eo_do_ret(d->scene, ret,
-                      evas_canvas3d_scene_exist((ev->canvas.x - (d_w / 2)),
-                                          (ev->canvas.y - (d_h / 2)),
-                                          d->mesh_node)))
+        if (evas_canvas3d_scene_exist(d->scene, (ev->canvas.x - (d_w / 2)), (ev->canvas.y - (d_h / 2)), d->mesh_node))
           {
              d_angle = 0;
           }
@@ -264,8 +230,7 @@ _play_scene(void *data,
 
    d_angle = 0.5;
 
-   eo_do(d->mesh_node,
-         evas_canvas3d_node_scale_set(1.0, 1.0, 1.0));
+   evas_canvas3d_node_scale_set(d->mesh_node, 1.0, 1.0, 1.0);
 }
 
 int
@@ -286,11 +251,10 @@ elm_main(int argc, char **argv)
    _scene_setup(&data);
 
    image = evas_object_image_filled_add(evas);
-   eo_do(image,
-         efl_gfx_visible_set(EINA_TRUE));
+   efl_gfx_visible_set(image, EINA_TRUE);
 
    /* Set the image object as render target for 3D scene. */
-   eo_do(image, evas_obj_image_scene_set(data.scene));
+   evas_obj_image_scene_set(image, data.scene);
 
    /* Setup scene to the widget button. */
    btn = elm_button_add(win);
diff --git a/src/examples/filemvc.c b/src/examples/filemvc.c
index 00f4f8634..6ef183e44 100644
--- a/src/examples/filemvc.c
+++ b/src/examples/filemvc.c
@@ -54,7 +54,7 @@ _list_selected_cb(void *data EINA_UNUSED, const Eo_Event *event)
    ethumb_client_file_free(elm_thumb_ethumb_client_get());
 
    printf("LIST selected model\n");
-   eo_do(priv->formview, elm_view_form_model_set(child));
+   elm_view_form_model_set(priv->formview, child);
    return EINA_TRUE;
 }
 
@@ -69,11 +69,11 @@ _tree_selected_cb(void *data, const Eo_Event *event)
 
    printf("TREE selected model\n");
 
-   eo_do(child, efl_model_property_get("path", &vpath));
+   efl_model_property_get(child, "path", &vpath);
    eina_value_get(vpath, &path);
-   model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(path));
-   eo_do(model, efl_model_load());
-   eo_do(priv->fileview, elm_view_list_model_set(model));
+   model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eoid, path));
+   efl_model_load(model);
+   elm_view_list_model_set(priv->fileview, model);
    return EINA_TRUE;
 }
 
@@ -137,35 +137,35 @@ elm_main(int argc, char **argv)
    else dirname = EFL_MODEL_TEST_FILENAME_PATH;
 
    //treemodel
-   priv.treemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(dirname));
-   eo_do(priv.treemodel, eio_model_children_filter_set(_filter_cb, NULL));
-   eo_do(priv.treemodel, efl_model_load());
+   priv.treemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eoid, dirname));
+   eio_model_children_filter_set(priv.treemodel, _filter_cb, NULL);
+   efl_model_load(priv.treemodel);
 
    //treeview
    genlist = elm_genlist_add(win);
-   priv.treeview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(genlist, ELM_GENLIST_ITEM_TREE, NULL));
-   eo_do(priv.treeview, elm_view_list_property_connect("filename", "elm.text"),
-                   elm_view_list_property_connect("icon", "elm.swallow.icon"),
-                   elm_view_list_model_set(priv.treemodel));
+   priv.treeview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eoid, genlist, ELM_GENLIST_ITEM_TREE, NULL));
+   elm_view_list_property_connect(priv.treeview, "filename", "elm.text");
+   elm_view_list_property_connect(priv.treeview, "icon", "elm.swallow.icon");
+   elm_view_list_model_set(priv.treeview, priv.treemodel);
    _widget_init(genlist);
    elm_object_part_content_set(panes, "left", genlist);
-   eo_do(panes, elm_obj_panes_content_left_size_set(0.3));
+   elm_obj_panes_content_left_size_set(panes, 0.3);
 
    vpanes = elm_panes_add(win);
    _widget_init(vpanes);
    elm_object_part_content_set(panes, "right", vpanes);
-   eo_do(priv.treeview, eo_event_callback_add(ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _tree_selected_cb, &priv));
+   eo_event_callback_add(priv.treeview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _tree_selected_cb, &priv);
    //listview
    genlist = elm_genlist_add(win);
-   priv.fileview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(genlist, ELM_GENLIST_ITEM_NONE, "double_label"));
-   eo_do(priv.fileview, elm_view_list_property_connect("filename", "elm.text"),
-                   elm_view_list_property_connect("size", "elm.text.sub"));
+   priv.fileview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eoid, genlist, ELM_GENLIST_ITEM_NONE, "double_label"));
+   elm_view_list_property_connect(priv.fileview, "filename", "elm.text");
+   elm_view_list_property_connect(priv.fileview, "size", "elm.text.sub");
 
    evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, &priv);
    _widget_init(genlist);
    elm_object_part_content_set(vpanes, "left", genlist);
 
-   eo_do(priv.fileview, eo_event_callback_add(ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _list_selected_cb, &priv));
+   eo_event_callback_add(priv.fileview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _list_selected_cb, &priv);
 
    //formview
    bxr = elm_box_add(win);
@@ -174,13 +174,13 @@ elm_main(int argc, char **argv)
    priv.formview = eo_add(ELM_VIEW_FORM_CLASS, NULL);
 
    /*Label widget */
-   eo_do(priv.formview, elm_view_form_widget_add("filename", _label_init(win, bxr, "File Name")));
+   elm_view_form_widget_add(priv.formview, "filename", _label_init(win, bxr, "File Name"));
 
     _label_init(win, bxr, "Size:");
-   eo_do(priv.formview, elm_view_form_widget_add("size", _label_init(win, bxr, "")));
+   elm_view_form_widget_add(priv.formview, "size", _label_init(win, bxr, ""));
 
     _label_init(win, bxr, "Modified:");
-   eo_do(priv.formview, elm_view_form_widget_add("mtime", _label_init(win, bxr, "")));
+   elm_view_form_widget_add(priv.formview, "mtime", _label_init(win, bxr, ""));
 
    /* Entry widget */
    entry = elm_entry_add(win);
@@ -188,7 +188,7 @@ elm_main(int argc, char **argv)
    evas_object_size_hint_weight_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(bxr, entry);
    evas_object_show(entry);
-   eo_do(priv.formview, elm_view_form_widget_add("path", entry));
+   elm_view_form_widget_add(priv.formview, "path", entry);
 
    /* Thumb widget */
    elm_need_ethumb();
@@ -196,7 +196,7 @@ elm_main(int argc, char **argv)
    _widget_init(priv.thumb);
    elm_box_pack_end(bxr, priv.thumb);
    elm_thumb_editable_set(priv.thumb, EINA_FALSE);
-   eo_do(priv.formview, elm_view_form_widget_add("path", priv.thumb));
+   elm_view_form_widget_add(priv.formview, "path", priv.thumb);
    evas_object_smart_callback_add(priv.thumb, "generate,error", _thumb_error_cb, &priv);
    evas_object_smart_callback_add(priv.thumb, "load,error", _thumb_error_cb, &priv);
 
diff --git a/src/examples/fileviewlist.c b/src/examples/fileviewlist.c
index e50789333..d91efdb23 100644
--- a/src/examples/fileviewlist.c
+++ b/src/examples/fileviewlist.c
@@ -55,15 +55,14 @@ elm_main(int argc, char **argv)
    evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_show(genlist);
 
-   priv.filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(dirname));
-   priv.fileview = eo_add(ELM_VIEW_LIST_CLASS, NULL,
-                   elm_view_list_genlist_set(genlist, ELM_GENLIST_ITEM_TREE, "double_label"));
-   eo_do(priv.fileview, elm_view_list_model_set(priv.filemodel));
-   eo_do(priv.filemodel, efl_model_load());
+   priv.filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eoid, dirname));
+   priv.fileview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eoid, genlist, ELM_GENLIST_ITEM_TREE, "double_label"));
+   elm_view_list_model_set(priv.fileview, priv.filemodel);
+   efl_model_load(priv.filemodel);
    evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, &priv);
 
-   eo_do(priv.fileview, elm_view_list_property_connect("filename", "elm.text"),
-                   elm_view_list_property_connect("mtime", "elm.text.sub"));
+   elm_view_list_property_connect(priv.fileview, "filename", "elm.text");
+   elm_view_list_property_connect(priv.fileview, "mtime", "elm.text.sub");
 
    evas_object_resize(win, 320, 520);
    elm_win_resize_object_add(win, genlist);
diff --git a/src/examples/performance/camera_light.c b/src/examples/performance/camera_light.c
index 2d4a28c31..45992ba87 100644
--- a/src/examples/performance/camera_light.c
+++ b/src/examples/performance/camera_light.c
@@ -104,7 +104,7 @@ init_panel_camera_light(Evas_Object *win, Eo *camera_node, Eo *light_node, doubl
    evas_object_show(spZ);
    evas_object_smart_callback_add(spZ, "changed", _camera_light_changeZ_cb, camera_node);
 
-   eo_do(camera_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &px, &py, &pz));
+   evas_canvas3d_node_position_get(camera_node, EVAS_CANVAS3D_SPACE_PARENT, &px, &py, &pz);
    elm_spinner_value_set(spX, px);
    elm_spinner_value_set(spY, py);
    elm_spinner_value_set(spZ, pz);
@@ -176,7 +176,7 @@ init_panel_camera_light(Evas_Object *win, Eo *camera_node, Eo *light_node, doubl
    evas_object_show(splZ);
    evas_object_smart_callback_add(splZ, "changed", _camera_light_changeZ_cb, light_node);
 
-   eo_do(light_node, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &px, &py, &pz));
+   evas_canvas3d_node_position_get(light_node, EVAS_CANVAS3D_SPACE_PARENT, &px, &py, &pz);
    elm_spinner_value_set(splX, px);
    elm_spinner_value_set(splY, py);
    elm_spinner_value_set(splZ, pz);
@@ -232,9 +232,9 @@ _camera_light_changeX_cb(void *data, Evas_Object *obj, void *event_info)
 
    if ((Eo*)data)
      {
-        eo_do((Eo*)data, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, NULL, &y, &z));
+        evas_canvas3d_node_position_get((Eo*)data, EVAS_CANVAS3D_SPACE_PARENT, NULL, &y, &z);
         x = elm_spinner_value_get(obj);
-        eo_do((Eo*)data, evas_canvas3d_node_position_set(x, y, z));
+        evas_canvas3d_node_position_set((Eo*)data, x, y, z);
      }
 }
 static void
@@ -244,9 +244,9 @@ _camera_light_changeY_cb(void *data, Evas_Object *obj, void *event_info)
 
    if ((Eo*)data)
      {
-        eo_do((Eo*)data, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, NULL, &z));
+        evas_canvas3d_node_position_get((Eo*)data, EVAS_CANVAS3D_SPACE_PARENT, &x, NULL, &z);
         y = elm_spinner_value_get(obj);
-        eo_do((Eo*)data, evas_canvas3d_node_position_set(x, y, z));
+        evas_canvas3d_node_position_set((Eo*)data, x, y, z);
      }
 }
 static void
@@ -256,9 +256,9 @@ _camera_light_changeZ_cb(void *data, Evas_Object *obj, void *event_info)
 
    if ((Eo*)data)
      {
-        eo_do((Eo*)data, evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, NULL));
+        evas_canvas3d_node_position_get((Eo*)data, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, NULL);
         z = elm_spinner_value_get(obj);
-        eo_do((Eo*)data, evas_canvas3d_node_position_set(x, y, z));
+        evas_canvas3d_node_position_set((Eo*)data, x, y, z);
      }
 }
 static void
@@ -270,7 +270,7 @@ _camera_light_angle_change_cb(void *data, Evas_Object *obj, void *event_info)
      {
        aw = elm_spinner_value_get(obj);
        aw = cos(aw * M_PI / 360.0);
-       eo_do(((Eo*)data), evas_canvas3d_node_orientation_set(key->x, key->y, key->z, aw));
+       evas_canvas3d_node_orientation_set(((Eo*)data), key->x, key->y, key->z, aw);
      }
 }
 static void
diff --git a/src/examples/performance/graphical.c b/src/examples/performance/graphical.c
index 1390ac73d..788459195 100644
--- a/src/examples/performance/graphical.c
+++ b/src/examples/performance/graphical.c
@@ -250,45 +250,31 @@ void _init_bounding()
 
    globalGraphical.material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
 
-   eo_do(globalGraphical.material_box,
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
-
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_material_shininess_set(100.0));
+   evas_canvas3d_material_enable_set(globalGraphical.material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
+   evas_canvas3d_material_enable_set(globalGraphical.material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
+   evas_canvas3d_material_enable_set(globalGraphical.material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
+   evas_canvas3d_material_color_set(globalGraphical.material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0);
+   evas_canvas3d_material_color_set(globalGraphical.material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0);
+   evas_canvas3d_material_color_set(globalGraphical.material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_material_shininess_set(globalGraphical.material_box, 100.0);
 
    /* Setup mesh. */
    globalGraphical.mesh_box = eo_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
-   eo_do(globalGraphical.mesh_box,
-         evas_canvas3d_mesh_vertex_count_set(24),
-         evas_canvas3d_mesh_frame_add(0),
-
-         evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
-                                            12 * sizeof(float), &cube_vertices[ 0]),
-         evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
-                                            12 * sizeof(float), &cube_vertices[ 3]),
-         evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
-                                            12 * sizeof(float), &cube_vertices[ 6]),
-         evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
-                                            12 * sizeof(float), &cube_vertices[10]),
-
-         evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
-                                     36, &cube_indices[0]),
-         evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
-
-         evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
-
-         evas_canvas3d_mesh_frame_material_set(0, globalGraphical.material_box));
+   evas_canvas3d_mesh_vertex_count_set(globalGraphical.mesh_box, 24);
+   evas_canvas3d_mesh_frame_add(globalGraphical.mesh_box, 0);
+   evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh_box, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
+   evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh_box, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 12 * sizeof(float), &cube_vertices[ 3]);
+   evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh_box, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, 12 * sizeof(float), &cube_vertices[ 6]);
+   evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh_box, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
+   evas_canvas3d_mesh_index_data_copy_set(globalGraphical.mesh_box, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
+   evas_canvas3d_mesh_vertex_assembly_set(globalGraphical.mesh_box, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
+   evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh_box, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh_box, 0, globalGraphical.material_box);
 
    globalGraphical.mesh_nodebox =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas,
-                    evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH),
-                    evas_canvas3d_node_position_set(0, -30.0, 0.0));
-   eo_do(globalGraphical.root_node, evas_canvas3d_node_member_add(globalGraphical.mesh_nodebox));
-   eo_do(globalGraphical.mesh_nodebox, evas_canvas3d_node_mesh_add(globalGraphical.mesh_box));
+      eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eoid, 0, -30.0, 0.0));
+   evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_nodebox);
+   evas_canvas3d_node_mesh_add(globalGraphical.mesh_nodebox, globalGraphical.mesh_box);
 }
 static void
 _change_scene_setup()
@@ -297,12 +283,11 @@ _change_scene_setup()
    Eina_List *l = NULL;
    int i = 0;
    int quantity = (globalGraphical.count + 1) * (globalGraphical.count + 1);
-   eo_do(globalGraphical.camera,
-         evas_canvas3d_camera_projection_perspective_set(globalGraphical.angle, 1.0, 2.0, 1000));
+   evas_canvas3d_camera_projection_perspective_set(globalGraphical.camera, globalGraphical.angle, 1.0, 2.0, 1000);
 
    EINA_LIST_FOREACH (globalGraphical.list_nodes, l, node)
      {
-        eo_do(globalGraphical.root_node, evas_canvas3d_node_member_del(node));
+        evas_canvas3d_node_member_del(globalGraphical.root_node, node);
         globalGraphical.list_nodes = eina_list_remove(globalGraphical.list_nodes, node);
         /*eo_del(node);Unless evas_canvas3d_destructors work properly*/
      }
@@ -325,59 +310,47 @@ _change_scene_setup()
         globalGraphical.mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
         if (!globalGraphical.model_path)
           {
-              eo_do(globalGraphical.mesh,
-                   evas_canvas3d_mesh_vertex_count_set(globalGraphical.vertex_count),
-                   evas_canvas3d_mesh_frame_add(0),
-                   evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
-                                                      sizeof(vertex),
-                                                      &globalGraphical.vertices[0].position),
-                   evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
-                                                      sizeof(vertex),
-                                                      &globalGraphical.vertices[0].normal),
-                   evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT,
-                                                      sizeof(vertex),
-                                                      &globalGraphical.vertices[0].tangent),
-                   evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
-                                                      sizeof(vertex), &globalGraphical.vertices[0].color),
-                   evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
-                                                      sizeof(vertex),
-                                                      &globalGraphical.vertices[0].texcoord),
-
-                   evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
-                                               globalGraphical.index_count, &globalGraphical.indices[0]),
-                   evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
-                   evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
+              evas_canvas3d_mesh_vertex_count_set(globalGraphical.mesh, globalGraphical.vertex_count);
+              evas_canvas3d_mesh_frame_add(globalGraphical.mesh, 0);
+              evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, sizeof(vertex), &globalGraphical.vertices[0].position);
+              evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, sizeof(vertex), &globalGraphical.vertices[0].normal);
+              evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT, sizeof(vertex), &globalGraphical.vertices[0].tangent);
+              evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, sizeof(vertex), &globalGraphical.vertices[0].color);
+              evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, sizeof(vertex), &globalGraphical.vertices[0].texcoord);
+              evas_canvas3d_mesh_index_data_copy_set(globalGraphical.mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, globalGraphical.index_count, &globalGraphical.indices[0]);
+              evas_canvas3d_mesh_vertex_assembly_set(globalGraphical.mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
+              evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
            }
          else
            {
-              eo_do(globalGraphical.mesh,
-                    efl_file_set(globalGraphical.model_path, NULL),
-                    evas_canvas3d_mesh_frame_material_set(0, globalGraphical.material),
-                    evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
+              efl_file_set(globalGraphical.mesh, globalGraphical.model_path, NULL);
+              evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh, 0, globalGraphical.material);
+              evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
            }
 
          if (globalGraphical.flags.fog_enable)
            {
-              eo_do(globalGraphical.mesh, evas_canvas3d_mesh_fog_enable_set(EINA_TRUE), evas_canvas3d_mesh_fog_color_set(FOG_COLOR, FOG_FACTOR));
+              evas_canvas3d_mesh_fog_enable_set(globalGraphical.mesh, EINA_TRUE);
+              evas_canvas3d_mesh_fog_color_set(globalGraphical.mesh, FOG_COLOR, FOG_FACTOR);
            }
          else
            {
-              eo_do(globalGraphical.mesh, evas_canvas3d_mesh_fog_enable_set(EINA_FALSE));
+              evas_canvas3d_mesh_fog_enable_set(globalGraphical.mesh, EINA_FALSE);
            }
          if (globalGraphical.flags.colorpick_enable)
-           eo_do(globalGraphical.mesh, evas_canvas3d_mesh_color_pick_enable_set(EINA_TRUE));
+           evas_canvas3d_mesh_color_pick_enable_set(globalGraphical.mesh, EINA_TRUE);
          else
-           eo_do(globalGraphical.mesh, evas_canvas3d_mesh_color_pick_enable_set(EINA_FALSE));
+           evas_canvas3d_mesh_color_pick_enable_set(globalGraphical.mesh, EINA_FALSE);
 
          if (globalGraphical.flags.blend_enable)
            {
-              eo_do(globalGraphical.mesh, evas_canvas3d_mesh_blending_enable_set(EINA_TRUE),
-                    evas_canvas3d_mesh_blending_func_set(EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA));
+              evas_canvas3d_mesh_blending_enable_set(globalGraphical.mesh, EINA_TRUE);
+              evas_canvas3d_mesh_blending_func_set(globalGraphical.mesh, EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA, EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA);
            }
          else
-           eo_do(globalGraphical.mesh, evas_canvas3d_mesh_blending_enable_set(EINA_FALSE));
+           evas_canvas3d_mesh_blending_enable_set(globalGraphical.mesh, EINA_FALSE);
 
-         eo_do(globalGraphical.mesh, evas_canvas3d_mesh_frame_material_set(0, globalGraphical.material));
+         evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh, 0, globalGraphical.material);
          globalGraphical.list_meshes = eina_list_append(globalGraphical.list_meshes, globalGraphical.mesh);
       }
 
@@ -386,15 +359,11 @@ _change_scene_setup()
    for (i = 0; i < quantity; i++)
      {
         globalGraphical.mesh_node =
-           eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas,
-                         evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH),
-                         evas_canvas3d_node_position_set(globalGraphical.places[i].position.x * 20,
-                                                   globalGraphical.places[i].position.y * 20,
-                                                   globalGraphical.places[i].position.z * 20));
+           eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eoid, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20));
         if (globalGraphical.model_path)
-          eo_do(globalGraphical.mesh_node, evas_canvas3d_node_scale_set(0.2, 0.2, 0.2));
-        eo_do(globalGraphical.root_node, evas_canvas3d_node_member_add(globalGraphical.mesh_node));
-        eo_do(globalGraphical.mesh_node, evas_canvas3d_node_mesh_add((Eo*)eina_list_nth(globalGraphical.list_meshes, i)));
+          evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2);
+        evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node);
+        evas_canvas3d_node_mesh_add(globalGraphical.mesh_node, (Eo*)eina_list_nth(globalGraphical.list_meshes, i));
         globalGraphical.list_nodes = eina_list_append(globalGraphical.list_nodes, globalGraphical.mesh_node);
      }
 
@@ -405,16 +374,16 @@ _change_scene_setup()
      ecore_animator_frametime_set(0.0001);
 
    if (globalGraphical.flags.shadow_enable)
-     eo_do(globalGraphical.scene, evas_canvas3d_scene_shadows_enable_set(EINA_TRUE));
+     evas_canvas3d_scene_shadows_enable_set(globalGraphical.scene, EINA_TRUE);
    else
-     eo_do(globalGraphical.scene, evas_canvas3d_scene_shadows_enable_set(EINA_FALSE));
+     evas_canvas3d_scene_shadows_enable_set(globalGraphical.scene, EINA_FALSE);
 
    if (globalGraphical.flags.colorpick_enable)
      {
-        eo_do(globalGraphical.scene, evas_canvas3d_scene_color_pick_enable_set(EINA_TRUE));
+        evas_canvas3d_scene_color_pick_enable_set(globalGraphical.scene, EINA_TRUE);
      }
    else
-     eo_do(globalGraphical.scene, evas_canvas3d_scene_color_pick_enable_set(EINA_FALSE));
+     evas_canvas3d_scene_color_pick_enable_set(globalGraphical.scene, EINA_FALSE);
 }
 
 static void
@@ -428,61 +397,48 @@ _init_scene(Evas_Object *img)
    globalGraphical.scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, globalGraphical.evas);
 
    /* Add the root node for the scene. */
-   globalGraphical.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas,
-                      evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
+   globalGraphical.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    /* Add the camera. */
    globalGraphical.camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, globalGraphical.evas);
-   eo_do(globalGraphical.camera,
-         evas_canvas3d_camera_projection_perspective_set(globalGraphical.angle, 1.0, 2.0, 1000.0));
+   evas_canvas3d_camera_projection_perspective_set(globalGraphical.camera, globalGraphical.angle, 1.0, 2.0, 1000.0);
 
    globalGraphical.camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas,
-             evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
-   eo_do(globalGraphical.camera_node,
-         evas_canvas3d_node_camera_set(globalGraphical.camera),
-         evas_canvas3d_node_position_set(0.0, 0.0, 25.0),
-         evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
-                                  EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
-   eo_do(globalGraphical.root_node, evas_canvas3d_node_member_add(globalGraphical.camera_node));
+      eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+   evas_canvas3d_node_camera_set(globalGraphical.camera_node, globalGraphical.camera);
+   evas_canvas3d_node_position_set(globalGraphical.camera_node, 0.0, 0.0, 25.0);
+   evas_canvas3d_node_look_at_set(globalGraphical.camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
+   evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.camera_node);
 
    globalGraphical.light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, globalGraphical.evas);
-   eo_do(globalGraphical.light,
-         evas_canvas3d_light_ambient_set(1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_light_projection_perspective_set(globalGraphical.angle / 5, 1.0, 1.0, 1000.0),
-         evas_canvas3d_light_spot_cutoff_set(globalGraphical.angle / 15));
+   evas_canvas3d_light_ambient_set(globalGraphical.light, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_light_diffuse_set(globalGraphical.light, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_light_specular_set(globalGraphical.light, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_light_projection_perspective_set(globalGraphical.light, globalGraphical.angle / 5, 1.0, 1.0, 1000.0);
+   evas_canvas3d_light_spot_cutoff_set(globalGraphical.light, globalGraphical.angle / 15);
 
    globalGraphical.light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas,
-                    evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
-   eo_do(globalGraphical.light_node,
-         evas_canvas3d_node_light_set(globalGraphical.light),
-         evas_canvas3d_node_position_set(0.0, 100.0, 1.0),
-         evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
-                                  EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
-   eo_do(globalGraphical.root_node, evas_canvas3d_node_member_add(globalGraphical.light_node));
+      eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+   evas_canvas3d_node_light_set(globalGraphical.light_node, globalGraphical.light);
+   evas_canvas3d_node_position_set(globalGraphical.light_node, 0.0, 100.0, 1.0);
+   evas_canvas3d_node_look_at_set(globalGraphical.light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
+   evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.light_node);
 
 
    globalGraphical.material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
    globalGraphical.texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, globalGraphical.evas);
-   eo_do(globalGraphical.texture,
-         evas_canvas3d_texture_file_set("target_texture.png", NULL),
-         evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR,
-                                    EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR),
-         evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
-                                  EVAS_CANVAS3D_WRAP_MODE_REPEAT));
-   eo_do(globalGraphical.material,
-         evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, globalGraphical.texture),
-         evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, globalGraphical.texture),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 1.0, 0.2, 0.2, 0.2),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 0.0, 0.0, 0.2),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2));
+   evas_canvas3d_texture_file_set(globalGraphical.texture, "target_texture.png", NULL);
+   evas_canvas3d_texture_filter_set(globalGraphical.texture, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR);
+   evas_canvas3d_texture_wrap_set(globalGraphical.texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
+   evas_canvas3d_material_texture_set(globalGraphical.material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, globalGraphical.texture);
+   evas_canvas3d_material_texture_set(globalGraphical.material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, globalGraphical.texture);
+   evas_canvas3d_material_enable_set(globalGraphical.material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
+   evas_canvas3d_material_enable_set(globalGraphical.material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
+   evas_canvas3d_material_enable_set(globalGraphical.material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
+   evas_canvas3d_material_enable_set(globalGraphical.material, EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, EINA_TRUE);
+   evas_canvas3d_material_color_set(globalGraphical.material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 1.0, 0.2, 0.2, 0.2);
+   evas_canvas3d_material_color_set(globalGraphical.material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 1.0, 0.0, 0.0, 0.2);
+   evas_canvas3d_material_color_set(globalGraphical.material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2);
    /* Add the mesh with target precision */
    _sphere_init(globalGraphical.precision);
 
@@ -491,37 +447,24 @@ _init_scene(Evas_Object *img)
         globalGraphical.mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
         if (!globalGraphical.model_path)
           {
-              eo_do(globalGraphical.mesh,
-                   evas_canvas3d_mesh_vertex_count_set(globalGraphical.vertex_count),
-                   evas_canvas3d_mesh_frame_add(0),
-                   evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
-                                                      sizeof(vertex),
-                                                      &globalGraphical.vertices[0].position),
-                   evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
-                                                      sizeof(vertex),
-                                                      &globalGraphical.vertices[0].normal),
-                   evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT,
-                                                      sizeof(vertex),
-                                                      &globalGraphical.vertices[0].tangent),
-                   evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
-                                                      sizeof(vertex), &globalGraphical.vertices[0].color),
-                   evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
-                                                      sizeof(vertex),
-                                                      &globalGraphical.vertices[0].texcoord),
-
-                   evas_canvas3d_mesh_index_data_copy_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
-                                               globalGraphical.index_count, &globalGraphical.indices[0]),
-                   evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
-                   evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
+              evas_canvas3d_mesh_vertex_count_set(globalGraphical.mesh, globalGraphical.vertex_count);
+              evas_canvas3d_mesh_frame_add(globalGraphical.mesh, 0);
+              evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, sizeof(vertex), &globalGraphical.vertices[0].position);
+              evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, sizeof(vertex), &globalGraphical.vertices[0].normal);
+              evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT, sizeof(vertex), &globalGraphical.vertices[0].tangent);
+              evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, sizeof(vertex), &globalGraphical.vertices[0].color);
+              evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, sizeof(vertex), &globalGraphical.vertices[0].texcoord);
+              evas_canvas3d_mesh_index_data_copy_set(globalGraphical.mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, globalGraphical.index_count, &globalGraphical.indices[0]);
+              evas_canvas3d_mesh_vertex_assembly_set(globalGraphical.mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
+              evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
            }
          else
            {
-              eo_do(globalGraphical.mesh,
-                    efl_file_set(globalGraphical.model_path, NULL),
-                    evas_canvas3d_mesh_frame_material_set(0, globalGraphical.material),
-                    evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
+              efl_file_set(globalGraphical.mesh, globalGraphical.model_path, NULL);
+              evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh, 0, globalGraphical.material);
+              evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
            }
-         eo_do(globalGraphical.mesh, evas_canvas3d_mesh_frame_material_set(0, globalGraphical.material));
+         evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh, 0, globalGraphical.material);
          globalGraphical.list_meshes = eina_list_append(globalGraphical.list_meshes, globalGraphical.mesh);
       }
 
@@ -531,24 +474,19 @@ _init_scene(Evas_Object *img)
    for (i = 0; i < quantity; i++)
      {
         globalGraphical.mesh_node =
-           eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas,
-                  evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH),
-                  evas_canvas3d_node_position_set(globalGraphical.places[i].position.x * 20,
-                                            globalGraphical.places[i].position.y * 20,
-                                            globalGraphical.places[i].position.z * 20));
+           eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eoid, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20));
         if (globalGraphical.model_path)
-          eo_do(globalGraphical.mesh_node, evas_canvas3d_node_scale_set(0.2, 0.2, 0.2));
-        eo_do(globalGraphical.root_node, evas_canvas3d_node_member_add(globalGraphical.mesh_node));
-        eo_do(globalGraphical.mesh_node, evas_canvas3d_node_mesh_add((Eo*)eina_list_nth(globalGraphical.list_meshes, i)));
+          evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2);
+        evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node);
+        evas_canvas3d_node_mesh_add(globalGraphical.mesh_node, (Eo*)eina_list_nth(globalGraphical.list_meshes, i));
         globalGraphical.list_nodes = eina_list_append(globalGraphical.list_nodes, globalGraphical.mesh_node);
      }
 
   _init_bounding();
    evas_object_geometry_get(img, &x, &y, &w, &h);
-   eo_do(globalGraphical.scene,
-         evas_canvas3d_scene_root_node_set(globalGraphical.root_node),
-         evas_canvas3d_scene_camera_node_set(globalGraphical.camera_node),
-         evas_canvas3d_scene_size_set(w, h));
+   evas_canvas3d_scene_root_node_set(globalGraphical.scene, globalGraphical.root_node);
+   evas_canvas3d_scene_camera_node_set(globalGraphical.scene, globalGraphical.camera_node);
+   evas_canvas3d_scene_size_set(globalGraphical.scene, w, h);
 
    ecore_animator_frametime_set(1.0 / (globalGraphical.speed));
 }
@@ -671,7 +609,7 @@ init_graphical_window(Evas_Object *img)
    _init_graphical();
    globalGraphical.evas = evas_object_evas_get(img);
    _init_scene(img);
-   eo_do(img, evas_obj_image_scene_set(globalGraphical.scene));
+   evas_obj_image_scene_set(img, globalGraphical.scene);
 
    return img;
 }
diff --git a/src/examples/performance/performance.c b/src/examples/performance/performance.c
index e3c7f014f..c1d0ef87d 100644
--- a/src/examples/performance/performance.c
+++ b/src/examples/performance/performance.c
@@ -85,13 +85,11 @@ _animate_scene(void *data)
    static float angle = 0.0f;
    angle += 0.03;
 
-   eo_do((Evas_Canvas3D_Node *)data,
-          evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 8 * sin(angle), 0.0, 8 * cos(angle),
-                                   EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
+   evas_canvas3d_node_look_at_set((Evas_Canvas3D_Node *)data, EVAS_CANVAS3D_SPACE_PARENT, 8 * sin(angle), 0.0, 8 * cos(angle), EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
 
    EINA_LIST_FOREACH (globalGraphical.list_nodes, l, node)
      {
-        eo_do(node, evas_canvas3d_node_orientation_angle_axis_set(10 * angle, 1.0, 1.0, 0.0));
+        evas_canvas3d_node_orientation_angle_axis_set(node, 10 * angle, 1.0, 1.0, 0.0);
      }
 
    /* Rotate */
@@ -132,7 +130,7 @@ _on_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
         obj_x = ev->canvas.x - x;
         obj_y = ev->canvas.y - y;
 
-        eo_do(globalGraphical.scene, evas_canvas3d_scene_size_get(&scene_w, &scene_h));
+        evas_canvas3d_scene_size_get(globalGraphical.scene, &scene_w, &scene_h);
 
         scene_x = obj_x * scene_w / (Evas_Real)w;
         scene_y = obj_y * scene_h / (Evas_Real)h;
@@ -140,29 +138,28 @@ _on_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
         time = clock();
         if (globalGraphical.flags.colorpick_enable)
           {
-             eo_do(globalGraphical.scene, pick = evas_canvas3d_scene_color_pick_enable_set(EINA_TRUE));
-             eo_do(globalGraphical.scene,
-                   pick = evas_canvas3d_scene_pick(ev->canvas.x, ev->canvas.y, &n, &m, NULL, NULL));
+             pick = evas_canvas3d_scene_color_pick_enable_set(globalGraphical.scene, EINA_TRUE);
+             pick = evas_canvas3d_scene_pick(globalGraphical.scene, ev->canvas.x, ev->canvas.y, &n, &m, NULL, NULL);
              time = clock() - time;
              diff_sec = ((float)time) / CLOCKS_PER_SEC / 10;
              if (pick)
                {
                   fprintf(stdout, "Boom! Color pick time expended for pick: %2.7f \n", diff_sec);
                   if (n != globalGraphical.mesh_nodebox)
-                    eo_do(n, evas_canvas3d_node_scale_set(0.5, 0.5, 0.5));
+                    evas_canvas3d_node_scale_set(n, 0.5, 0.5, 0.5);
                }
           }
         else
           {
-             eo_do(globalGraphical.scene, pick = evas_canvas3d_scene_color_pick_enable_set(EINA_FALSE));
-             eo_do(globalGraphical.scene, pick = evas_canvas3d_scene_pick(scene_x, scene_y, &n, &m, &s, &t));
+             pick = evas_canvas3d_scene_color_pick_enable_set(globalGraphical.scene, EINA_FALSE);
+             pick = evas_canvas3d_scene_pick(globalGraphical.scene, scene_x, scene_y, &n, &m, &s, &t);
              time = clock() - time;
              diff_sec = ((float)time) / CLOCKS_PER_SEC / 10;
              if (pick)
                {
                   fprintf(stdout, "Boom! Geometry pick time expended for pick: %2.7f, TexCoord (%f, %f)\n", diff_sec, s, t);
                   if (n != globalGraphical.mesh_nodebox)
-                     eo_do(n, evas_canvas3d_node_scale_set(0.5, 0.5, 0.5));
+                     evas_canvas3d_node_scale_set(n, 0.5, 0.5, 0.5);
                }
           }
      }
@@ -204,12 +201,12 @@ _node_orientation_change_cb(void *data, Evas_Object *obj, void *event_info)
    it = elm_flipselector_selected_item_get((Evas_Object*)data);
    const char *str = elm_object_item_text_get(it);
    if (str && !strcmp(str, "root node"))
-     eo_do(globalGraphical.root_node, evas_canvas3d_node_orientation_angle_axis_set(15, 1.0, 1.0, 1.0));
+     evas_canvas3d_node_orientation_angle_axis_set(globalGraphical.root_node, 15, 1.0, 1.0, 1.0);
    else
      {
         EINA_LIST_FOREACH (globalGraphical.list_nodes, l, node)
           {
-             eo_do((Eo*)node, evas_canvas3d_node_orientation_angle_axis_set(15, 1.0, 1.0, 1.0));
+             evas_canvas3d_node_orientation_angle_axis_set((Eo*)node, 15, 1.0, 1.0, 1.0);
           }
      }
 }
@@ -222,12 +219,12 @@ _node_position_change_cb(void *data, Evas_Object *obj, void *event_info)
    it = elm_flipselector_selected_item_get((Evas_Object*)data);
    const char *str = elm_object_item_text_get(it);
    if (str && !strcmp(str, "root node"))
-     eo_do(globalGraphical.root_node, evas_canvas3d_node_position_set(10.0, 1.0, 1.0));
+     evas_canvas3d_node_position_set(globalGraphical.root_node, 10.0, 1.0, 1.0);
    else
      {
         EINA_LIST_FOREACH (globalGraphical.list_nodes, l, node)
           {
-             eo_do((Eo*)node, evas_canvas3d_node_position_set(1.0, 1.0, 1.0));
+             evas_canvas3d_node_position_set((Eo*)node, 1.0, 1.0, 1.0);
           }
      }
 }
@@ -240,12 +237,12 @@ _node_scale_change_cb(void *data, Evas_Object *obj, void *event_info)
    it = elm_flipselector_selected_item_get((Evas_Object*)data);
    const char *str = elm_object_item_text_get(it);
    if (str && !strcmp(str, "root node"))
-     eo_do(globalGraphical.root_node, evas_canvas3d_node_scale_set(1.0, 1.0, 1.0));
+     evas_canvas3d_node_scale_set(globalGraphical.root_node, 1.0, 1.0, 1.0);
    else
      {
         EINA_LIST_FOREACH (globalGraphical.list_nodes, l, node)
           {
-             eo_do((Eo*)node, evas_canvas3d_node_scale_set(1.0, 1.0, 1.0));
+             evas_canvas3d_node_scale_set((Eo*)node, 1.0, 1.0, 1.0);
           }
      }
 }
diff --git a/src/examples/sphere_hunter/evas_3d_sphere_hunter.c b/src/examples/sphere_hunter/evas_3d_sphere_hunter.c
index fe1712e9e..6de714d17 100644
--- a/src/examples/sphere_hunter/evas_3d_sphere_hunter.c
+++ b/src/examples/sphere_hunter/evas_3d_sphere_hunter.c
@@ -332,8 +332,7 @@ _restart_level(void *data, Evas_Object *btn, void *ev)
 
    EINA_LIST_FOREACH(scene->items, l, item)
      {
-        eo_do(scene->root_node,
-              evas_canvas3d_node_member_del(item));
+        evas_canvas3d_node_member_del(scene->root_node, item);
         scene->items = eina_list_remove_list(scene->items, l);
      }
 
@@ -341,8 +340,7 @@ _restart_level(void *data, Evas_Object *btn, void *ev)
      scene->items = eina_list_append(scene->items, item);
 
    EINA_LIST_FOREACH(scene->items, l, item)
-     eo_do(scene->root_node,
-           evas_canvas3d_node_member_add(item));
+     evas_canvas3d_node_member_add(scene->root_node, item);
 
    ball_position_x    = 0.0;
    ball_position_y    = -1.0;
@@ -438,18 +436,14 @@ static void
 _camera_setup(Scene_Data *data)
 {
    data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
-   eo_do(data->camera,
-         evas_canvas3d_camera_projection_perspective_set(50.0, 1.0, 1.0, 1000.0));
-
-   data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                              evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
-   eo_do(data->camera_node,
-         evas_canvas3d_node_camera_set(data->camera),
-         evas_canvas3d_node_position_set(0.0, 40, 70),
-         evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
-
-   eo_do(data->root_node,
-         evas_canvas3d_node_member_add(data->camera_node));
+   evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 1.0, 1000.0);
+
+   data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+   evas_canvas3d_node_camera_set(data->camera_node, data->camera);
+   evas_canvas3d_node_position_set(data->camera_node, 0.0, 40, 70);
+   evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
+
+   evas_canvas3d_node_member_add(data->root_node, data->camera_node);
 }
 
 static Eina_Bool
@@ -457,8 +451,7 @@ _animate_camera(void *data)
 {
    Scene_Data *scene = (Scene_Data *)data;
 
-   eo_do(scene->camera_node,
-         evas_canvas3d_node_position_set(0.0, camera_y, camera_z));
+   evas_canvas3d_node_position_set(scene->camera_node, 0.0, camera_y, camera_z);
 
    return EINA_TRUE;
 }
@@ -468,21 +461,17 @@ _light_setup(Scene_Data *data)
 {
    data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
 
-   eo_do(data->light,
-         evas_canvas3d_light_ambient_set(0.2, 0.2, 0.2, 1.0),
-         evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_light_projection_perspective_set(100.0, 1.0, 1.0, 1000.0));
-
-   data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                             evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
-   eo_do(data->light_node,
-         evas_canvas3d_node_light_set(data->light),
-         evas_canvas3d_node_position_set(0.1, 25.0, 0.1),
-         evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
-
-   eo_do(data->root_node,
-         evas_canvas3d_node_member_add(data->light_node));
+   evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
+   evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 1000.0);
+
+   data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+   evas_canvas3d_node_light_set(data->light_node, data->light);
+   evas_canvas3d_node_position_set(data->light_node, 0.1, 25.0, 0.1);
+   evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
+
+   evas_canvas3d_node_member_add(data->root_node, data->light_node);
 }
 
 static void
@@ -490,31 +479,24 @@ _mesh_cube_setup(Scene_Data *data)
 {
    data->mesh_cube = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    data->material_cube = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   eo_do(data->material_cube,
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_material_shininess_set(50.0));
-
-   eo_do(data->mesh_cube,
-         evas_canvas3d_mesh_vertex_count_set(24),
-         evas_canvas3d_mesh_frame_add(0),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
-                              12 * sizeof(float), &cube_vertices[ 0]),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
-                              12 * sizeof(float), &cube_vertices[ 3]),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
-                              12 * sizeof(float), &cube_vertices[ 6]),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
-                              12 * sizeof(float), &cube_vertices[10]),
-         evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
-                              36, &cube_indices[0]),
-         evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
-         evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
-         evas_canvas3d_mesh_frame_material_set(0, data->material_cube));
+   evas_canvas3d_material_enable_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
+   evas_canvas3d_material_enable_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
+   evas_canvas3d_material_enable_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
+   evas_canvas3d_material_color_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0);
+   evas_canvas3d_material_color_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0);
+   evas_canvas3d_material_color_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_material_shininess_set(data->material_cube, 50.0);
+
+   evas_canvas3d_mesh_vertex_count_set(data->mesh_cube, 24);
+   evas_canvas3d_mesh_frame_add(data->mesh_cube, 0);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_cube, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_cube, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 12 * sizeof(float), &cube_vertices[ 3]);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_cube, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, 12 * sizeof(float), &cube_vertices[ 6]);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_cube, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
+   evas_canvas3d_mesh_index_data_set(data->mesh_cube, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
+   evas_canvas3d_mesh_vertex_assembly_set(data->mesh_cube, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
+   evas_canvas3d_mesh_shade_mode_set(data->mesh_cube, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_frame_material_set(data->mesh_cube, 0, data->material_cube);
 
 }
 static void
@@ -526,49 +508,37 @@ _create_bondar(Scene_Data *data, Evas_Real scale_x, Evas_Real scale_y, Evas_Real
 
    mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
-
-   eo_do(material,
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_material_shininess_set(50.0));
+   node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
+
+   evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
+   evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
+   evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
+   evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0);
+   evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_material_shininess_set(material, 50.0);
 
    if (color)
-     eo_do(material,
-           evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.0, 0.7, 1.0, 1.0));
+     evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.0, 0.7, 1.0, 1.0);
    else
-     eo_do(material,
-           evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.0, 1.0, 1.0, 1.0));
-
-   eo_do(mesh,
-         evas_canvas3d_mesh_vertex_count_set(24),
-         evas_canvas3d_mesh_frame_add(0),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
-                                 12 * sizeof(float), &cube_vertices[ 0]),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
-                                 12 * sizeof(float), &cube_vertices[ 3]),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
-                                 12 * sizeof(float), &cube_vertices[ 6]),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
-                                 12 * sizeof(float), &cube_vertices[10]),
-         evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT,
-                                 36, &cube_indices[0]),
-         evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
-         evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
-         evas_canvas3d_mesh_frame_material_set(0, material));
-
-   eo_do(data->root_node,
-         evas_canvas3d_node_member_add(node));
-
-   eo_do(node,
-         evas_canvas3d_node_mesh_add(mesh),
-         evas_canvas3d_node_position_set(x, y, z);
-         evas_canvas3d_node_scale_set(scale_x, scale_y, scale_z));
+     evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.0, 1.0, 1.0, 1.0);
+
+   evas_canvas3d_mesh_vertex_count_set(mesh, 24);
+   evas_canvas3d_mesh_frame_add(mesh, 0);
+   evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
+   evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 12 * sizeof(float), &cube_vertices[ 3]);
+   evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, 12 * sizeof(float), &cube_vertices[ 6]);
+   evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 12 * sizeof(float), &cube_vertices[10]);
+   evas_canvas3d_mesh_index_data_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, 36, &cube_indices[0]);
+   evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
+   evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
+
+   evas_canvas3d_node_member_add(data->root_node, node);
+
+   evas_canvas3d_node_mesh_add(node, mesh);
+   evas_canvas3d_node_position_set(node, x, y, z);
+   evas_canvas3d_node_scale_set(node, scale_x, scale_y, scale_z);
 
 }
 static void
@@ -586,16 +556,13 @@ _create_cubes(Scene_Data *data, Evas_Real r, int count)
         Eo *node = NULL;
 
         alpha = d_alpha * i * M_PI / 180;
-        node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                      evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
+        node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
-        eo_do(node,
-              evas_canvas3d_node_mesh_add(data->mesh_cube),
-              evas_canvas3d_node_position_set(r * sin(alpha), 2.0 + (r / 4 * sin(alpha)), r * cos(alpha));
-              evas_canvas3d_node_scale_set(1.0, 1.0, 1.0));
+        evas_canvas3d_node_mesh_add(node, data->mesh_cube);
+        evas_canvas3d_node_position_set(node, r * sin(alpha), 2.0 + (r / 4 * sin(alpha)), r * cos(alpha));
+        evas_canvas3d_node_scale_set(node, 1.0, 1.0, 1.0);
 
-        eo_do(data->root_node,
-              evas_canvas3d_node_member_add(node));
+        evas_canvas3d_node_member_add(data->root_node, node);
 
         data->items = eina_list_append(data->items, node);
      }
@@ -608,43 +575,33 @@ _mesh_ball_setup(Scene_Data *data)
 
    data->mesh_ball = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
    data->material_ball = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   data->mesh_node_ball = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                                 evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
+   data->mesh_node_ball = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_MESH));
 
    /* Setup material for ball. */
-   eo_do(data->material_ball,
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE),
-         evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0),
-         evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0),
-         evas_canvas3d_material_shininess_set(50.0));
+   evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
+   evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
+   evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
+   evas_canvas3d_material_color_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, 0.2, 0.2, 0.2, 1.0);
+   evas_canvas3d_material_color_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, 0.8, 0.8, 0.8, 1.0);
+   evas_canvas3d_material_color_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 1.0);
+   evas_canvas3d_material_shininess_set(data->material_ball, 50.0);
 
    /* Setup mesh for ball. */
-   eo_do(data->mesh_ball,
-         evas_canvas3d_mesh_vertex_count_set(vertex_count),
-         evas_canvas3d_mesh_frame_add(0),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION,
-                  sizeof(vertex), &vertices[0].position),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL,
-                  sizeof(vertex), &vertices[0].normal),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT,
-                  sizeof(vertex), &vertices[0].tangent),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR,
-                  sizeof(vertex), &vertices[0].color),
-         evas_canvas3d_mesh_frame_vertex_data_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD,
-                  sizeof(vertex), &vertices[0].texcoord),
-         evas_canvas3d_mesh_index_data_set(EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]),
-         evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES),
-         evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
-         evas_canvas3d_mesh_frame_material_set(0, data->material_ball));
-
-   eo_do(data->root_node,
-         evas_canvas3d_node_member_add(data->mesh_node_ball));
-
-   eo_do(data->mesh_node_ball,
-         evas_canvas3d_node_mesh_add(data->mesh_ball));
+   evas_canvas3d_mesh_vertex_count_set(data->mesh_ball, vertex_count);
+   evas_canvas3d_mesh_frame_add(data->mesh_ball, 0);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_ball, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, sizeof(vertex), &vertices[0].position);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_ball, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, sizeof(vertex), &vertices[0].normal);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_ball, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TANGENT, sizeof(vertex), &vertices[0].tangent);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_ball, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_COLOR, sizeof(vertex), &vertices[0].color);
+   evas_canvas3d_mesh_frame_vertex_data_set(data->mesh_ball, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, sizeof(vertex), &vertices[0].texcoord);
+   evas_canvas3d_mesh_index_data_set(data->mesh_ball, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]);
+   evas_canvas3d_mesh_vertex_assembly_set(data->mesh_ball, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
+   evas_canvas3d_mesh_shade_mode_set(data->mesh_ball, EVAS_CANVAS3D_SHADE_MODE_PHONG);
+   evas_canvas3d_mesh_frame_material_set(data->mesh_ball, 0, data->material_ball);
+
+   evas_canvas3d_node_member_add(data->root_node, data->mesh_node_ball);
+
+   evas_canvas3d_node_mesh_add(data->mesh_node_ball, data->mesh_ball);
 }
 
 static void
@@ -655,13 +612,11 @@ _scene_setup(Scene_Data *data, Evas_Real r, int count)
    data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add the root node for the scene. */
-   data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
-                            evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
+   data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eoid, EVAS_CANVAS3D_NODE_TYPE_NODE));
 
-   eo_do(data->scene,
-         evas_canvas3d_scene_size_set(WIDTH, HEIGHT),
-         evas_canvas3d_scene_shadows_enable_set(EINA_TRUE),
-         evas_canvas3d_scene_background_color_set(0.0, 0.0, 0.0, 0.0));
+   evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
+   evas_canvas3d_scene_shadows_enable_set(data->scene, EINA_TRUE);
+   evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
 
    _camera_setup(data);
    _light_setup(data);
@@ -678,9 +633,8 @@ _scene_setup(Scene_Data *data, Evas_Real r, int count)
    EINA_LIST_FOREACH(data->items, l, item)
      nodes = eina_list_append(nodes, item);
 
-   eo_do(data->scene,
-         evas_canvas3d_scene_root_node_set(data->root_node),
-         evas_canvas3d_scene_camera_node_set(data->camera_node));
+   evas_canvas3d_scene_root_node_set(data->scene, data->root_node);
+   evas_canvas3d_scene_camera_node_set(data->scene, data->camera_node);
 }
 
 char score_buffer[32];
@@ -718,8 +672,7 @@ _animate_ball(void *data)
    if (reload == EINA_TRUE)
      elm_object_signal_emit(layout, "play", "efl_game");
 
-   eo_do(scene->mesh_node_ball,
-         evas_canvas3d_node_position_set(ball_position_x, ball_position_y, ball_position_z));
+   evas_canvas3d_node_position_set(scene->mesh_node_ball, ball_position_x, ball_position_y, ball_position_z);
 
    if ((ball_position_x < -21.0) || (ball_position_x > 21.0) || (ball_position_z < -21.0) || (ball_position_z > 21.0))
      {
@@ -772,13 +725,11 @@ _animate_ball(void *data)
           }
      }
 
-   eo_do(scene->mesh_node_ball,
-         evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z));
+   evas_canvas3d_node_position_get(scene->mesh_node_ball, EVAS_CANVAS3D_SPACE_PARENT, &x, &y, &z);
 
    EINA_LIST_FOREACH(scene->items, l, node)
      {
-        eo_do(node,
-              evas_canvas3d_node_position_get(EVAS_CANVAS3D_SPACE_PARENT, &xx, &yy, &zz));
+        evas_canvas3d_node_position_get(node, EVAS_CANVAS3D_SPACE_PARENT, &xx, &yy, &zz);
 
         d_x = xx - x;
         d_y = yy - y;
@@ -786,8 +737,7 @@ _animate_ball(void *data)
 
         if (d_x < 2.0 && d_x > -2.0 && d_y < 2.0 && d_y > -2.0 && d_z < 2.0 && d_z > -2.0)
           {
-             eo_do(scene->root_node,
-                   evas_canvas3d_node_member_del(node));
+             evas_canvas3d_node_member_del(scene->root_node, node);
              scene->items = eina_list_remove_list(scene->items, l);
 
              i--;
@@ -819,8 +769,7 @@ _animate_cubes(void *data)
    angle += 0.5;
 
    EINA_LIST_FOREACH(scene->items, l, cube)
-     eo_do(cube,
-           evas_canvas3d_node_orientation_angle_axis_set(angle, 1.0, 1.0, 1.0));
+     evas_canvas3d_node_orientation_angle_axis_set(cube, angle, 1.0, 1.0, 1.0);
 
    /* Rotate */
    if (angle > 360.0)
@@ -866,9 +815,8 @@ elm_main(int argc, char **argv)
    _scene_setup(&data, 10.0, 10);
 
    image = evas_object_image_filled_add(evas);
-   eo_do(image,
-         efl_gfx_visible_set(EINA_TRUE),
-         evas_obj_image_scene_set(data.scene));
+   efl_gfx_visible_set(image, EINA_TRUE);
+   evas_obj_image_scene_set(image, data.scene);
 
    evas_object_size_hint_weight_set(image, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(image, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/lib/elc_combobox.c b/src/lib/elc_combobox.c
index cd8e32cbe..408b59050 100644
--- a/src/lib/elc_combobox.c
+++ b/src/lib/elc_combobox.c
@@ -45,12 +45,12 @@ static const Elm_Action key_actions[] = {
 EOLIAN static Eina_Bool
 _elm_combobox_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Combobox_Data *sd)
 {
-   eo_do_super(obj, MY_CLASS, elm_obj_widget_translate());
-   eo_do(sd->genlist, elm_obj_widget_translate());
-   eo_do(sd->entry, elm_obj_widget_translate());
+   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
+   elm_obj_widget_translate(sd->genlist);
+   elm_obj_widget_translate(sd->entry);
 
    if (sd->hover)
-     eo_do(sd->hover, elm_obj_widget_translate());
+     elm_obj_widget_translate(sd->hover);
 
    return EINA_TRUE;
 }
@@ -72,7 +72,7 @@ _elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
    /* combobox's style has no extra bit for orientation but could have... */
    eina_stringshare_replace(&(wd->style), buf);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    eina_stringshare_replace(&(wd->style), style);
@@ -117,7 +117,7 @@ _hover_end_finished(void *data,
      {
         sd->expanded = EINA_FALSE;
         evas_object_hide(sd->hover);
-        eo_do(data, eo_event_callback_call(ELM_COMBOBOX_EVENT_DISMISSED, NULL));
+        eo_event_callback_call(data, ELM_COMBOBOX_EVENT_DISMISSED, NULL);
      }
 }
 
@@ -190,7 +190,7 @@ _activate(Evas_Object *obj)
    evas_object_show(sd->genlist);
    elm_genlist_item_selected_set(sd->item, EINA_TRUE);
    evas_object_show(sd->hover);
-   eo_do(obj, eo_event_callback_call(ELM_COMBOBOX_EVENT_EXPANDED, NULL));
+   eo_event_callback_call(obj, ELM_COMBOBOX_EVENT_EXPANDED, NULL);
 }
 
 static void
@@ -198,13 +198,13 @@ _on_item_selected(void *data , Evas_Object *obj EINA_UNUSED, void *event)
 {
    ELM_COMBOBOX_DATA_GET(data, sd);
    elm_object_focus_set(sd->entry, EINA_TRUE);
-   eo_do(data, eo_event_callback_call(ELM_COMBOBOX_EVENT_ITEM_SELECTED, event));
+   eo_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_SELECTED, event);
 }
 
 static void
 _on_item_pressed(void *data , Evas_Object *obj EINA_UNUSED, void *event)
 {
-   eo_do(data, eo_event_callback_call(ELM_COMBOBOX_EVENT_ITEM_PRESSED, event));
+   eo_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_PRESSED, event);
 }
 
 static Eina_Bool
@@ -221,7 +221,7 @@ _gl_filter_finished_cb(void *data, const Eo_Event *event)
         return EINA_TRUE;
      }
 
-   eo_do(data, eo_event_callback_call(ELM_COMBOBOX_EVENT_FILTER_DONE, event->event_info));
+   eo_event_callback_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->event_info);
 
    if (sd->count > 0)
      {
@@ -252,7 +252,7 @@ _on_aborted(void *data, const Eo_Event *event EINA_UNUSED)
 static Eina_Bool
 _on_changed(void *data, const Eo_Event *event EINA_UNUSED)
 {
-   eo_do(data, eo_event_callback_call(ELM_ENTRY_EVENT_CHANGED, NULL));
+   eo_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED, NULL);
    return EINA_TRUE;
 }
 
@@ -266,36 +266,35 @@ _on_clicked(void *data, const Eo_Event *event EINA_UNUSED)
 EOLIAN static void
 _elm_combobox_evas_object_smart_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    elm_widget_mirrored_automatic_set(obj, EINA_FALSE);
 
-   eo_do(obj, eo_event_callback_add(
-         EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_clicked, obj));
+   eo_event_callback_add(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_clicked, obj);
 
    //What are you doing here?
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 }
 
 EOLIAN static void
 _elm_combobox_evas_object_smart_del(Eo *obj, Elm_Combobox_Data *sd)
 {
    sd->hover_parent = NULL;
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_combobox_evas_object_smart_show(Eo *obj, Elm_Combobox_Data *sd)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
+   evas_obj_smart_show(eo_super(obj, MY_CLASS));
    if (sd->expanded) evas_object_show(sd->hover);
 }
 
 EOLIAN static void
 _elm_combobox_evas_object_smart_hide(Eo *obj, Elm_Combobox_Data *sd)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
+   evas_obj_smart_hide(eo_super(obj, MY_CLASS));
    if (sd->hover) evas_object_hide(sd->hover);
 }
 
@@ -321,14 +320,13 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
    Evas_Object *entry;
    char buf[128];
 
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   eo_constructor(eo_super(obj, MY_CLASS));
 
    sd->first_filter = EINA_TRUE;
 
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_GLASS_PANE));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE);
 
    //hover-parent
    sd->hover_parent = elm_object_parent_widget_get(obj);
@@ -342,8 +340,8 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
               elm_widget_style_get(obj));
    elm_object_style_set(sd->hover, buf);
 
-   eo_do(sd->hover, eo_event_callback_add
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_hover_clicked, obj));
+   eo_event_callback_add
+     (sd->hover, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_hover_clicked, obj);
    elm_layout_signal_callback_add
      (sd->hover, "elm,action,hide,finished", "elm", _hover_end_finished, obj);
 
@@ -368,8 +366,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
    evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_smart_callback_add(gl, "selected", _on_item_selected, obj);
    evas_object_smart_callback_add(gl, "pressed", _on_item_pressed, obj);
-   eo_do(gl, eo_event_callback_add(ELM_GENLIST_EVENT_FILTER_DONE,
-         _gl_filter_finished_cb, obj));
+   eo_event_callback_add(gl, ELM_GENLIST_EVENT_FILTER_DONE, _gl_filter_finished_cb, obj);
    elm_genlist_homogeneous_set(gl, EINA_TRUE);
    elm_genlist_mode_set(gl, ELM_LIST_COMPRESS);
    elm_table_pack(sd->tbl, gl, 0, 0, 1, 1);
@@ -382,15 +379,12 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
                            ELM_SCROLLER_POLICY_OFF);
    elm_entry_scrollable_set(entry, EINA_TRUE);
    elm_entry_single_line_set(entry, EINA_TRUE);
-   eo_do(entry, eo_event_callback_add(ELM_ENTRY_EVENT_CHANGED_USER,
-         _on_changed, obj));
-   eo_do(entry, eo_event_callback_add(ELM_ENTRY_EVENT_ABORTED,
-         _on_aborted, obj));
+   eo_event_callback_add(entry, ELM_ENTRY_EVENT_CHANGED_USER, _on_changed, obj);
+   eo_event_callback_add(entry, ELM_ENTRY_EVENT_ABORTED, _on_aborted, obj);
    evas_object_show(entry);
 
-   eo_do(obj,
-         eo_composite_attach(gl),
-         eo_composite_attach(entry));
+   eo_composite_attach(obj, gl);
+   eo_composite_attach(obj, entry);
 
    elm_object_part_content_set(obj, "elm.swallow.content", entry);
    return obj;
@@ -417,7 +411,7 @@ _elm_combobox_hover_end(Eo *obj, Elm_Combobox_Data *sd)
      {
         sd->expanded = EINA_FALSE;
         evas_object_hide(sd->hover);
-        eo_do(obj, eo_event_callback_call(ELM_COMBOBOX_EVENT_DISMISSED, NULL));
+        eo_event_callback_call(obj, ELM_COMBOBOX_EVENT_DISMISSED, NULL);
      } // for backward compatibility
 }
 
@@ -463,8 +457,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
      elm_combobox_hover_begin(obj);
    else
      {
-        eo_do(sd->genlist, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED,
-                                                  sd->item));
+        eo_event_callback_call(sd->genlist, EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, sd->item);
         elm_entry_cursor_end_set(sd->entry);
      }
    return EINA_TRUE;
@@ -511,7 +504,7 @@ _elm_combobox_elm_genlist_filter_set(Eo *obj EINA_UNUSED, Elm_Combobox_Data *pd,
 {
    pd->first_filter = EINA_FALSE;
 
-   eo_do(pd->genlist, elm_obj_genlist_filter_set(key));
+   elm_obj_genlist_filter_set(pd->genlist, key);
 }
 
 EOLIAN void
@@ -532,7 +525,7 @@ EOLIAN static void
 _elm_combobox_evas_object_smart_resize(Eo *obj, Elm_Combobox_Data *pd,
                                        Evas_Coord w, Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
    if (pd->count > 0) _table_resize(obj);
 }
 #include "elm_combobox.eo.c"
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index e1ce44116..27f24f48f 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -53,9 +53,9 @@ _elm_ctxpopup_elm_widget_translate(Eo *obj, Elm_Ctxpopup_Data *sd)
    if (sd->auto_hide) evas_object_hide(obj);
 
    EINA_LIST_FOREACH(sd->items, l, it)
-     eo_do(it, elm_wdg_item_translate());
+     elm_wdg_item_translate(it);
 
-   eo_do_super(obj, MY_CLASS, elm_obj_widget_translate());
+   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -622,7 +622,7 @@ _elm_ctxpopup_elm_widget_sub_object_add(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNU
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_add(sobj));
+   int_ret = elm_obj_widget_sub_object_add(eo_super(obj, MY_CLASS), sobj);
 
    return int_ret;
 }
@@ -675,7 +675,7 @@ _elm_ctxpopup_elm_layout_sizing_eval(Eo *obj, Elm_Ctxpopup_Data *sd)
 
    _show_signals_emit(obj, sd->dir);
 
-   eo_do(obj, eo_event_callback_call(ELM_CTXPOPUP_EVENT_GEOMETRY_UPDATE, &rect));
+   eo_event_callback_call(obj, ELM_CTXPOPUP_EVENT_GEOMETRY_UPDATE, &rect);
 }
 
 static void
@@ -713,7 +713,7 @@ _on_parent_resize(void *data,
         sd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN;
 
         evas_object_hide(data);
-        eo_do(data, eo_event_callback_call(ELM_CTXPOPUP_EVENT_DISMISSED, NULL));
+        eo_event_callback_call(data, ELM_CTXPOPUP_EVENT_DISMISSED, NULL);
      }
    else
      {
@@ -755,7 +755,7 @@ _elm_ctxpopup_elm_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    elm_widget_theme_object_set
@@ -787,7 +787,7 @@ _elm_ctxpopup_elm_container_content_set(Eo *obj, Elm_Ctxpopup_Data *sd, const ch
 
    if ((part) && (strcmp(part, "default")))
      {
-        eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_set(part, content));
+        int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
         return int_ret;
      }
 
@@ -821,7 +821,7 @@ _elm_ctxpopup_elm_container_content_get(Eo *obj, Elm_Ctxpopup_Data *sd, const ch
    if ((part) && (strcmp(part, "default")))
      {
         Evas_Object *ret = NULL;
-        eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_get(part));
+        ret = elm_obj_container_content_get(eo_super(obj, MY_CLASS), part);
         return ret;
      }
 
@@ -835,7 +835,7 @@ _elm_ctxpopup_elm_container_content_unset(Eo *obj, Elm_Ctxpopup_Data *sd, const
 
    if ((part) && (strcmp(part, "default")))
      {
-        eo_do_super(obj, MY_CLASS, content = elm_obj_container_content_unset(part));
+        content = elm_obj_container_content_unset(eo_super(obj, MY_CLASS), part);
         return content;
      }
 
@@ -920,7 +920,7 @@ _elm_ctxpopup_item_elm_widget_item_disable(Eo *eo_ctxpopup_it,
 {
    Eina_Bool tmp;
    elm_object_item_disabled_set
-     (ctxpopup_it->list_item, eo_do_ret(eo_ctxpopup_it, tmp, elm_wdg_item_disabled_get()));
+     (ctxpopup_it->list_item, elm_wdg_item_disabled_get(eo_ctxpopup_it));
 }
 
 EOLIAN static void
@@ -1027,7 +1027,7 @@ _hide_finished_cb(void *data,
                   const char *source EINA_UNUSED)
 {
    evas_object_hide(data);
-   eo_do(data, eo_event_callback_call(ELM_CTXPOPUP_EVENT_DISMISSED, NULL));
+   eo_event_callback_call(data, ELM_CTXPOPUP_EVENT_DISMISSED, NULL);
 }
 
 static void
@@ -1076,7 +1076,7 @@ _elm_ctxpopup_item_eo_base_destructor(Eo *eo_ctxpopup_it,
         if (sd->list_visible) elm_layout_sizing_eval(WIDGET(ctxpopup_it));
      }
 
-   eo_do_super(eo_ctxpopup_it, ELM_CTXPOPUP_ITEM_CLASS, eo_destructor());
+   eo_destructor(eo_super(eo_ctxpopup_it, ELM_CTXPOPUP_ITEM_CLASS));
 }
 
 EOLIAN static Eina_Bool
@@ -1084,7 +1084,7 @@ _elm_ctxpopup_elm_widget_disable(Eo *obj, Elm_Ctxpopup_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_disable());
+   int_ret = elm_obj_widget_disable(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
    if (sd->list)
      elm_object_disabled_set(sd->list, elm_widget_disabled_get(obj));
@@ -1099,7 +1099,7 @@ _elm_ctxpopup_evas_object_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set
@@ -1138,7 +1138,7 @@ _elm_ctxpopup_evas_object_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv)
      (priv->box, EVAS_CALLBACK_RESIZE, _on_content_resized, obj);
 
    /* box will be our content placeholder, thus the parent's version call */
-   eo_do_super(obj, MY_CLASS, elm_obj_container_content_set("elm.swallow.content", priv->box));
+   elm_obj_container_content_set(eo_super(obj, MY_CLASS), "elm.swallow.content", priv->box);
 
    evas_object_event_callback_add(obj, EVAS_CALLBACK_SHOW, _on_show, NULL);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_HIDE, _on_hide, NULL);
@@ -1163,7 +1163,7 @@ _elm_ctxpopup_evas_object_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd)
    EINA_LIST_FREE(sd->items, it)
      eo_del(it);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -1190,11 +1190,10 @@ elm_ctxpopup_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_ctxpopup_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_POPUP_MENU));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU);
 
    return obj;
 }
@@ -1271,7 +1270,7 @@ _item_wrap_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UN
 EOLIAN static Eo *
 _elm_ctxpopup_item_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Item_Data *it)
 {
-   obj = eo_do_super_ret(obj, ELM_CTXPOPUP_ITEM_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, ELM_CTXPOPUP_ITEM_CLASS));
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    return obj;
@@ -1282,7 +1281,7 @@ _elm_ctxpopup_item_append(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Eva
 {
    Eo *eo_item;
 
-   eo_item = eo_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(func, data));
+   eo_item = eo_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(eoid, func, data));
    if (!eo_item) return NULL;
 
    ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item);
@@ -1376,7 +1375,7 @@ _elm_ctxpopup_item_prepend(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Ev
 {
    Eo *eo_item;
 
-   eo_item = eo_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(func, data));
+   eo_item = eo_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(eoid, func, data));
    if (!eo_item) return NULL;
 
    ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item);
@@ -1428,7 +1427,7 @@ _elm_ctxpopup_item_init(Eo *eo_item,
           const void *data)
 {
    Eo *obj;
-   eo_do(eo_item, obj = eo_parent_get());
+   obj = eo_parent_get(eo_item);
    Elm_Ctxpopup_Data *sd = eo_data_scope_get(obj, ELM_CTXPOPUP_CLASS);
    if (!sd->list)
      {
@@ -1470,7 +1469,7 @@ EOLIAN static Elm_Atspi_State_Set
 _elm_ctxpopup_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED)
 {
    Elm_Atspi_State_Set ret;
-   eo_do_super(obj, MY_CLASS, ret = elm_interface_atspi_accessible_state_set_get());
+   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, MY_CLASS));
 
    STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MODAL);
 
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 6922594c1..3ead81682 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -66,7 +66,7 @@ _elm_fileselector_smart_del_do(Elm_Fileselector_Data *sd)
    free(ecore_idler_del(sd->populate_idler));
    ecore_idler_del(sd->path_entry_idler);
 
-   eo_do_super(sd->obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(sd->obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -104,7 +104,7 @@ _elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    style = elm_widget_style_get(obj);
@@ -544,8 +544,8 @@ _signal_first(Listing_Request *lreq)
         EINA_LIST_FREE(sd->paths, path) free(path);
      }
 
-   eo_do(lreq->obj, eo_event_callback_call
-     (ELM_FILESELECTOR_EVENT_DIRECTORY_OPEN, (void *)lreq->path));
+   eo_event_callback_call
+     (lreq->obj, ELM_FILESELECTOR_EVENT_DIRECTORY_OPEN, (void *)lreq->path);
 
    if (!lreq->parent_it)
      {
@@ -801,8 +801,8 @@ _on_item_activated(void *data, const Eo_Event *event)
    is_dir = ecore_file_is_dir(path);
    if (!is_dir)
      {
-        eo_do(data, eo_event_callback_call
-          (ELM_FILESELECTOR_EVENT_ACTIVATED, (void *)path));
+        eo_event_callback_call
+          (data, ELM_FILESELECTOR_EVENT_ACTIVATED, (void *)path);
         return EINA_TRUE;
      }
 
@@ -890,8 +890,8 @@ _on_item_selected(void *data, const Eo_Event *event)
         else
           elm_object_text_set(sd->name_entry, ecore_file_file_get(path));
 
-        eo_do(data, eo_event_callback_call
-          (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)path));
+        eo_event_callback_call
+          (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)path);
      }
    else if (sd->multi && is_dir && sd->double_tap_navigation)
      {
@@ -1021,7 +1021,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
 
    if (!sd->path)
      {
-        eo_do(fs, eo_event_callback_call(ELM_FILESELECTOR_EVENT_DONE, NULL));
+        eo_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
          return EINA_TRUE;
      }
 
@@ -1037,8 +1037,8 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
    else
      selection = eina_stringshare_add(elm_fileselector_selected_get(fs));
 
-   eo_do(fs, eo_event_callback_call
-     (ELM_FILESELECTOR_EVENT_DONE, (void *)selection));
+   eo_event_callback_call
+     (fs, ELM_FILESELECTOR_EVENT_DONE, (void *)selection);
    eina_stringshare_del(selection);
 
    return EINA_TRUE;
@@ -1049,7 +1049,7 @@ _canc(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Evas_Object *fs = data;
 
-   eo_do(fs, eo_event_callback_call(ELM_FILESELECTOR_EVENT_DONE, NULL));
+   eo_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
 
    return EINA_TRUE;
 }
@@ -1067,10 +1067,10 @@ _on_text_activated(void *data, const Eo_Event *event)
 
    if (!ecore_file_exists(path))
      {
-        eo_do(fs, eo_event_callback_call
-          (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)path));
-        eo_do(fs, eo_event_callback_call
-          (ELM_FILESELECTOR_EVENT_SELECTED_INVALID, (void *)path));
+        eo_event_callback_call
+          (fs, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)path);
+        eo_event_callback_call
+          (fs, ELM_FILESELECTOR_EVENT_SELECTED_INVALID, (void *)path);
         goto end;
      }
 
@@ -1082,8 +1082,8 @@ _on_text_activated(void *data, const Eo_Event *event)
         eina_stringshare_del(p);
 
         if (sd->only_folder)
-          eo_do(fs, eo_event_callback_call
-            (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)path));
+          eo_event_callback_call
+            (fs, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)path);
 
         goto end;
      }
@@ -1096,8 +1096,8 @@ _on_text_activated(void *data, const Eo_Event *event)
         _populate(fs, dir, NULL, path);
 
         if (sd->only_folder)
-          eo_do(fs, eo_event_callback_call
-            (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)path));
+          eo_event_callback_call
+            (fs, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)path);
      }
    else
      {
@@ -1248,22 +1248,22 @@ _files_list_add(Evas_Object *obj)
    evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_min_set(li, 100, 100);
 
-   eo_do(li, eo_event_callback_add
-     (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _on_item_selected, obj));
-   eo_do(li, eo_event_callback_add
-     (EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, _on_item_unselected, obj));
-   eo_do(li, eo_event_callback_add
-     (ELM_GENLIST_EVENT_ACTIVATED, _on_item_activated, obj));
-   eo_do(li, eo_event_callback_add
-     (ELM_GENLIST_EVENT_EXPAND_REQUEST, _on_list_expand_req, obj));
-   eo_do(li, eo_event_callback_add
-     (ELM_GENLIST_EVENT_CONTRACT_REQUEST, _on_list_contract_req, obj));
-   eo_do(li, eo_event_callback_add
-     (ELM_GENLIST_EVENT_EXPANDED, _on_list_expanded, obj));
-   eo_do(li, eo_event_callback_add
-     (ELM_GENLIST_EVENT_CONTRACTED, _on_list_contracted, obj));
-   eo_do(li, eo_event_callback_add
-     (EVAS_OBJECT_EVENT_KEY_DOWN, _files_key_down, obj));
+   eo_event_callback_add
+     (li, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _on_item_selected, obj);
+   eo_event_callback_add
+     (li, EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, _on_item_unselected, obj);
+   eo_event_callback_add
+     (li, ELM_GENLIST_EVENT_ACTIVATED, _on_item_activated, obj);
+   eo_event_callback_add
+     (li, ELM_GENLIST_EVENT_EXPAND_REQUEST, _on_list_expand_req, obj);
+   eo_event_callback_add
+     (li, ELM_GENLIST_EVENT_CONTRACT_REQUEST, _on_list_contract_req, obj);
+   eo_event_callback_add
+     (li, ELM_GENLIST_EVENT_EXPANDED, _on_list_expanded, obj);
+   eo_event_callback_add
+     (li, ELM_GENLIST_EVENT_CONTRACTED, _on_list_contracted, obj);
+   eo_event_callback_add
+     (li, EVAS_OBJECT_EVENT_KEY_DOWN, _files_key_down, obj);
 
    elm_widget_sub_object_add(obj, li);
 
@@ -1287,14 +1287,14 @@ _files_grid_add(Evas_Object *obj)
 
    elm_gengrid_align_set(grid, 0.0, 0.0);
 
-   eo_do(grid, eo_event_callback_add
-     (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _on_item_selected, obj));
-   eo_do(grid, eo_event_callback_add
-     (EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, _on_item_unselected, obj));
-   eo_do(grid, eo_event_callback_add
-     (ELM_GENGRID_EVENT_ACTIVATED, _on_item_activated, obj));
-   eo_do(grid, eo_event_callback_add
-     (EVAS_OBJECT_EVENT_KEY_DOWN, _files_key_down, obj));
+   eo_event_callback_add
+     (grid, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _on_item_selected, obj);
+   eo_event_callback_add
+     (grid, EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, _on_item_unselected, obj);
+   eo_event_callback_add
+     (grid, ELM_GENGRID_EVENT_ACTIVATED, _on_item_activated, obj);
+   eo_event_callback_add
+     (grid, EVAS_OBJECT_EVENT_KEY_DOWN, _files_key_down, obj);
 
    elm_widget_sub_object_add(obj, grid);
 
@@ -1392,7 +1392,7 @@ _resource_deleted(void *data, int type EINA_UNUSED, void *ev)
           }
      }
 
-   if (it) eo_do(it, elm_wdg_item_del());
+   if (it) elm_wdg_item_del(it);
 
    if (selected)
      {
@@ -1452,7 +1452,7 @@ _elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
 
    EINA_REFCOUNT_INIT(priv);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
@@ -1472,8 +1472,8 @@ _elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
    elm_object_part_content_set(bt, "icon", ic);
    elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Up"));
    evas_object_size_hint_align_set(bt, 0.0, 0.0);
-   eo_do(bt, eo_event_callback_add
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_dir_up, obj));
+   eo_event_callback_add
+     (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_dir_up, obj);
 
    elm_widget_sub_object_add(obj, bt);
 
@@ -1488,8 +1488,8 @@ _elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
    elm_object_part_content_set(bt, "icon", ic);
    elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Home"));
    evas_object_size_hint_align_set(bt, 0.0, 0.0);
-   eo_do(bt, eo_event_callback_add
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _home, obj));
+   eo_event_callback_add
+     (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _home, obj);
 
    priv->home_button = bt;
 
@@ -1517,14 +1517,14 @@ _elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-   eo_do(en, eo_event_callback_add
-     (ELM_ENTRY_EVENT_ANCHOR_CLICKED, _anchor_clicked, obj));
-   eo_do(en, eo_event_callback_add
-     (ELM_WIDGET_EVENT_FOCUSED, _on_text_focused, obj));
-   eo_do(en, eo_event_callback_add
-     (ELM_WIDGET_EVENT_UNFOCUSED, _on_text_unfocused, obj));
-   eo_do(en, eo_event_callback_add
-     (ELM_ENTRY_EVENT_ACTIVATED, _on_text_activated, obj));
+   eo_event_callback_add
+     (en, ELM_ENTRY_EVENT_ANCHOR_CLICKED, _anchor_clicked, obj);
+   eo_event_callback_add
+     (en, ELM_WIDGET_EVENT_FOCUSED, _on_text_focused, obj);
+   eo_event_callback_add
+     (en, ELM_WIDGET_EVENT_UNFOCUSED, _on_text_unfocused, obj);
+   eo_event_callback_add
+     (en, ELM_ENTRY_EVENT_ACTIVATED, _on_text_activated, obj);
 
    elm_widget_sub_object_add(obj, en);
    priv->path_entry = en;
@@ -1558,8 +1558,8 @@ _elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
    elm_entry_icon_visible_set(en, EINA_TRUE);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   eo_do(en, eo_event_callback_add
-     (ELM_ENTRY_EVENT_CHANGED, _preedit_cb, obj));
+   eo_event_callback_add
+     (en, ELM_ENTRY_EVENT_CHANGED, _preedit_cb, obj);
    evas_object_data_set(obj, "search", en);
 
    elm_widget_sub_object_add(obj, en);
@@ -1579,7 +1579,7 @@ _elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
    HANDLER_ADD(EIO_MONITOR_DIRECTORY_DELETED, _resource_deleted);
 #undef HANDLER_ADD
 
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 }
 
 EOLIAN static void
@@ -1634,12 +1634,11 @@ elm_fileselector_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_fileselector_eo_base_constructor(Eo *obj, Elm_Fileselector_Data *sd)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILE_CHOOSER));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILE_CHOOSER);
 
    return obj;
 }
@@ -1649,7 +1648,7 @@ elm_fileselector_is_save_set(Evas_Object *obj,
                              Eina_Bool is_save)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_is_save_set(is_save));
+   elm_interface_fileselector_is_save_set(obj, is_save);
 }
 
 EOLIAN static void
@@ -1666,7 +1665,7 @@ elm_fileselector_is_save_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
    Eina_Bool ret = EINA_FALSE;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_is_save_get());
+   ret = elm_interface_fileselector_is_save_get((Eo *) obj);
    return ret;
 }
 
@@ -1681,7 +1680,7 @@ elm_fileselector_folder_only_set(Evas_Object *obj,
                                  Eina_Bool only)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_folder_only_set(only));
+   elm_interface_fileselector_folder_only_set(obj, only);
 }
 
 EOLIAN static void
@@ -1702,7 +1701,7 @@ elm_fileselector_folder_only_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
    Eina_Bool ret = EINA_FALSE;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_folder_only_get());
+   ret = elm_interface_fileselector_folder_only_get((Eo *) obj);
    return ret;
 }
 
@@ -1724,8 +1723,8 @@ _elm_fileselector_buttons_ok_cancel_set(Eo *obj, Elm_Fileselector_Data *sd, Eina
         elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
         elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Cancel"));
 
-        eo_do(bt, eo_event_callback_add
-          (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _canc, obj));
+        eo_event_callback_add
+          (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _canc, obj);
 
         sd->cancel_button = bt;
 
@@ -1734,12 +1733,12 @@ _elm_fileselector_buttons_ok_cancel_set(Eo *obj, Elm_Fileselector_Data *sd, Eina
         elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
         elm_object_domain_translatable_text_set(bt, PACKAGE, N_("OK"));
 
-        eo_do(bt, eo_event_callback_add
-          (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _ok, obj));
+        eo_event_callback_add
+          (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _ok, obj);
 
         sd->ok_button = bt;
 
-        eo_do(obj, elm_obj_widget_theme_apply());
+        elm_obj_widget_theme_apply(obj);
      }
    else if (!visible)
      {
@@ -1759,7 +1758,7 @@ elm_fileselector_expandable_set(Evas_Object *obj,
                                 Eina_Bool expand)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_expandable_set(expand));
+   elm_interface_fileselector_expandable_set(obj, expand);
 }
 
 EOLIAN static void
@@ -1779,7 +1778,7 @@ elm_fileselector_expandable_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
    Eina_Bool ret = EINA_FALSE;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_expandable_get());
+   ret = elm_interface_fileselector_expandable_get((Eo *) obj);
    return ret;
 }
 
@@ -1794,7 +1793,7 @@ elm_fileselector_path_set(Evas_Object *obj,
                           const char *_path)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_path_set(_path));
+   elm_interface_fileselector_path_set(obj, _path);
 }
 
 EOLIAN static void
@@ -1812,7 +1811,7 @@ elm_fileselector_path_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
    const char *ret = NULL;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_path_get());
+   ret = elm_interface_fileselector_path_get((Eo *) obj);
    return ret;
 }
 
@@ -1827,7 +1826,7 @@ elm_fileselector_mode_set(Evas_Object *obj,
                           Elm_Fileselector_Mode mode)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_mode_set(mode));
+   elm_interface_fileselector_mode_set(obj, mode);
 }
 
 EOLIAN static void
@@ -1870,7 +1869,7 @@ elm_fileselector_mode_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, ELM_FILESELECTOR_LAST);
    Elm_Fileselector_Mode ret = ELM_FILESELECTOR_LAST;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_mode_get());
+   ret = elm_interface_fileselector_mode_get((Eo *) obj);
    return ret;
 }
 
@@ -1884,7 +1883,7 @@ EAPI void
 elm_fileselector_multi_select_set(Evas_Object *obj, Eina_Bool multi)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_multi_select_set(multi));
+   elm_interface_fileselector_multi_select_set(obj, multi);
 }
 
 EOLIAN static void
@@ -1931,7 +1930,7 @@ elm_fileselector_multi_select_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
    Eina_Bool ret = EINA_FALSE;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_multi_select_get());
+   ret = elm_interface_fileselector_multi_select_get((Eo *) obj);
    return ret;
 }
 
@@ -1946,7 +1945,7 @@ elm_fileselector_selected_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
    const char *ret = NULL;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_selected_get());
+   ret = elm_interface_fileselector_selected_get((Eo *) obj);
    return ret;
 }
 
@@ -1987,7 +1986,7 @@ elm_fileselector_selected_set(Evas_Object *obj,
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
    Eina_Bool ret = EINA_FALSE;
-   eo_do(obj, ret = elm_interface_fileselector_selected_set(_path));
+   ret = elm_interface_fileselector_selected_set(obj, _path);
    return ret;
 }
 
@@ -2028,7 +2027,7 @@ elm_fileselector_selected_paths_get(const Evas_Object* obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
    const Eina_List *ret = NULL;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_selected_paths_get());
+   ret = elm_interface_fileselector_selected_paths_get((Eo *) obj);
    return ret;
 }
 
@@ -2046,7 +2045,7 @@ elm_fileselector_current_name_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
    const char *ret = NULL;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_current_name_get());
+   ret = elm_interface_fileselector_current_name_get((Eo *) obj);
    return ret;
 }
 
@@ -2061,7 +2060,7 @@ elm_fileselector_current_name_set(Evas_Object *obj,
                                   const char *name)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do((Eo *) obj, elm_interface_fileselector_current_name_set(name));
+   elm_interface_fileselector_current_name_set((Eo *) obj, name);
 }
 
 EOLIAN static void
@@ -2088,7 +2087,7 @@ elm_fileselector_mime_types_filter_append(Evas_Object *obj, const char *mime_typ
 {
    ELM_FILESELECTOR_CHECK(obj) EINA_FALSE;
    Eina_Bool ret = EINA_FALSE;
-   eo_do(obj, ret = elm_interface_fileselector_mime_types_filter_append(mime_type, filter_name));
+   ret = elm_interface_fileselector_mime_types_filter_append(obj, mime_type, filter_name);
    return ret;
 }
 
@@ -2125,7 +2124,7 @@ _elm_fileselector_elm_interface_fileselector_mime_types_filter_append(Eo *obj, E
      }
 
    if (need_theme)
-     eo_do(obj, elm_obj_widget_theme_apply());
+     elm_obj_widget_theme_apply(obj);
 
    return EINA_TRUE;
 }
@@ -2135,7 +2134,7 @@ elm_fileselector_custom_filter_append(Evas_Object *obj, Elm_Fileselector_Filter_
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
    Eina_Bool ret = EINA_FALSE;
-   eo_do(obj, ret = elm_interface_fileselector_custom_filter_append(func, data, filter_name));
+   ret = elm_interface_fileselector_custom_filter_append(obj, func, data, filter_name);
    return ret;
 }
 
@@ -2181,7 +2180,7 @@ _elm_fileselector_elm_interface_fileselector_custom_filter_append(Eo *obj, Elm_F
      }
 
    if (need_theme)
-     eo_do(obj, elm_obj_widget_theme_apply());
+     elm_obj_widget_theme_apply(obj);
 
    return EINA_TRUE;
 }
@@ -2190,7 +2189,7 @@ EAPI void
 elm_fileselector_filters_clear(Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_filters_clear());
+   elm_interface_fileselector_filters_clear(obj);
 }
 
 EOLIAN static void
@@ -2226,7 +2225,7 @@ EAPI void
 elm_fileselector_hidden_visible_set(Evas_Object *obj, Eina_Bool visible)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_hidden_visible_set(visible));
+   elm_interface_fileselector_hidden_visible_set(obj, visible);
 }
 
 EOLIAN static void
@@ -2250,7 +2249,7 @@ elm_fileselector_hidden_visible_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
    Eina_Bool ret = EINA_FALSE;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_hidden_visible_get());
+   ret = elm_interface_fileselector_hidden_visible_get((Eo *) obj);
    return ret;
 }
 
@@ -2266,7 +2265,7 @@ elm_fileselector_thumbnail_size_set(Evas_Object *obj,
                                     Evas_Coord h)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_thumbnail_size_set(w, h));
+   elm_interface_fileselector_thumbnail_size_set(obj, w, h);
 }
 
 EOLIAN static void
@@ -2296,7 +2295,7 @@ elm_fileselector_thumbnail_size_get(const Evas_Object *obj,
                                     Evas_Coord *h)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do((Eo *) obj, elm_interface_fileselector_thumbnail_size_get(w, h));
+   elm_interface_fileselector_thumbnail_size_get((Eo *) obj, w, h);
 }
 
 EOLIAN static void
@@ -2310,7 +2309,7 @@ EAPI void
 elm_fileselector_sort_method_set(Evas_Object *obj, Elm_Fileselector_Sort sort)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_sort_method_set(sort));
+   elm_interface_fileselector_sort_method_set(obj, sort);
 }
 
 EOLIAN static void
@@ -2362,7 +2361,7 @@ elm_fileselector_sort_method_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, ELM_FILESELECTOR_SORT_LAST);
    Elm_Fileselector_Sort ret = ELM_FILESELECTOR_SORT_LAST;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_sort_method_get());
+   ret = elm_interface_fileselector_sort_method_get((Eo *) obj);
 
    return ret;
 }
@@ -2448,7 +2447,7 @@ _elm_fileselector_elm_layout_text_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Data
    else
      {
         Eina_Bool int_ret = EINA_FALSE;
-        eo_do_super(obj, MY_CLASS, int_ret = elm_obj_layout_text_set(part, label));
+        int_ret = elm_obj_layout_text_set(eo_super(obj, MY_CLASS), part, label);
         return int_ret;
      }
 
diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c
index eb7e35bdb..412aefdc6 100644
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -51,7 +51,7 @@ _elm_fileselector_button_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Button
    /* file selector button's style has an extra bit */
    eina_stringshare_replace(&(wd->style), buf);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    eina_stringshare_replace(&(wd->style), style);
@@ -75,8 +75,8 @@ _selection_done(void *data, const Eo_Event *event)
    sd->fsw = NULL;
    evas_object_del(del);
 
-   eo_do(sd->obj, eo_event_callback_call
-     (ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN, (void *)file));
+   eo_event_callback_call
+     (sd->obj, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN, (void *)file);
 
    return EINA_TRUE;
 }
@@ -89,8 +89,8 @@ _new_window_add(Elm_Fileselector_Button_Data *sd)
    win = elm_win_add(NULL, "fileselector_button", ELM_WIN_DIALOG_BASIC);
    elm_win_title_set(win, sd->window_title);
    elm_win_autodel_set(win, EINA_TRUE);
-   eo_do(win, eo_event_callback_add
-         (ELM_WIN_EVENT_DELETE_REQUEST, _selection_done, sd));
+   eo_event_callback_add
+         (win, ELM_WIN_EVENT_DELETE_REQUEST, _selection_done, sd);
 
    bg = elm_bg_add(win);
    evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -143,8 +143,8 @@ _activate(Elm_Fileselector_Button_Data *sd)
    evas_object_size_hint_weight_set
      (sd->fs, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(sd->fs, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   eo_do(sd->fs, eo_event_callback_add
-         (ELM_FILESELECTOR_EVENT_DONE, _selection_done, sd));
+   eo_event_callback_add
+         (sd->fs, ELM_FILESELECTOR_EVENT_DONE, _selection_done, sd);
    evas_object_show(sd->fs);
 
    if (is_inwin)
@@ -172,7 +172,7 @@ _elm_fileselector_button_evas_object_smart_add(Eo *obj, Elm_Fileselector_Button_
 {
    const char *path;
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->window_title = eina_stringshare_add(DEFAULT_WINDOW_TITLE);
@@ -187,10 +187,10 @@ _elm_fileselector_button_evas_object_smart_add(Eo *obj, Elm_Fileselector_Button_
 
    elm_widget_mirrored_automatic_set(obj, EINA_FALSE);
 
-   eo_do(obj, eo_event_callback_add
-         (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _button_clicked, priv));
+   eo_event_callback_add
+         (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _button_clicked, priv);
 
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
    elm_widget_can_focus_set(obj, EINA_TRUE);
 }
 
@@ -202,7 +202,7 @@ _elm_fileselector_button_evas_object_smart_del(Eo *obj, Elm_Fileselector_Button_
    eina_stringshare_del(sd->fsd.selection);
    evas_object_del(sd->fsw);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static Eina_Bool
@@ -222,13 +222,12 @@ elm_fileselector_button_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_fileselector_button_eo_base_constructor(Eo *obj, Elm_Fileselector_Button_Data *sd)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
 
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PUSH_BUTTON));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);
 
    return obj;
 }
@@ -268,7 +267,7 @@ elm_fileselector_button_path_set(Evas_Object *obj,
                                  const char *path)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_path_set(path));
+   elm_interface_fileselector_path_set(obj, path);
 }
 
 EOLIAN static void
@@ -284,7 +283,7 @@ elm_fileselector_button_path_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
    const char *ret = NULL;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_path_get());
+   ret = elm_interface_fileselector_path_get((Eo *) obj);
    return ret;
 }
 
@@ -299,7 +298,7 @@ elm_fileselector_button_expandable_set(Evas_Object *obj,
                                        Eina_Bool value)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_expandable_set(value));
+   elm_interface_fileselector_expandable_set(obj, value);
 }
 
 EOLIAN static void
@@ -315,7 +314,7 @@ elm_fileselector_button_expandable_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
    Eina_Bool ret = EINA_FALSE;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_expandable_get());
+   ret = elm_interface_fileselector_expandable_get((Eo *) obj);
    return ret;
 }
 
@@ -330,7 +329,7 @@ elm_fileselector_button_folder_only_set(Evas_Object *obj,
                                         Eina_Bool value)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_folder_only_set(value));
+   elm_interface_fileselector_folder_only_set(obj, value);
 }
 
 EOLIAN static void
@@ -346,7 +345,7 @@ elm_fileselector_button_folder_only_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
    Eina_Bool ret = EINA_FALSE;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_folder_only_get());
+   ret = elm_interface_fileselector_folder_only_get((Eo *) obj);
    return ret;
 }
 
@@ -361,7 +360,7 @@ elm_fileselector_button_is_save_set(Evas_Object *obj,
                                     Eina_Bool value)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_is_save_set(value));
+   elm_interface_fileselector_is_save_set(obj, value);
 }
 
 EOLIAN static void
@@ -377,7 +376,7 @@ elm_fileselector_button_is_save_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
    Eina_Bool ret = EINA_FALSE;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_is_save_get());
+   ret = elm_interface_fileselector_is_save_get((Eo *) obj);
    return ret;
 }
 
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index 4a2c335e8..85bb72ea4 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -47,7 +47,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
   static Eina_Bool                                                               \
   _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED)                                          \
   {                                                                         \
-     eo_do(data, eo_event_callback_call(event, ev->event_info));          \
+     eo_event_callback_call(data, event, ev->event_info);          \
                                                                       \
      return EINA_TRUE;                                                \
   }
@@ -76,8 +76,8 @@ _FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
    s = elm_entry_utf8_to_markup(file);
    elm_object_text_set(sd->entry, s);
    free(s);
-   eo_do(data, eo_event_callback_call
-     (ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->event_info));
+   eo_event_callback_call
+     (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->event_info);
 
    return EINA_TRUE;
 }
@@ -91,8 +91,8 @@ _ACTIVATED_fwd(void *data, const Eo_Event *event)
 
    file = elm_object_text_get(sd->entry);
    elm_fileselector_path_set(sd->button, file);
-   eo_do(data, eo_event_callback_call
-     (ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->event_info));
+   eo_event_callback_call
+     (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->event_info);
 
    return EINA_TRUE;
 }
@@ -166,7 +166,7 @@ _elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_D
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    style = elm_widget_style_get(obj);
@@ -194,7 +194,7 @@ _elm_fileselector_entry_elm_widget_disable(Eo *obj, Elm_Fileselector_Entry_Data
    Eina_Bool val;
 
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_disable());
+   int_ret = elm_obj_widget_disable(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    val = elm_widget_disabled_get(obj);
@@ -211,8 +211,7 @@ _elm_fileselector_entry_elm_layout_text_set(Eo *obj, Elm_Fileselector_Entry_Data
    if (part && strcmp(part, "default"))
      {
         Eina_Bool int_ret = EINA_FALSE;
-        eo_do_super(obj, MY_CLASS,
-                    int_ret = elm_obj_layout_text_set(part, label));
+        int_ret = elm_obj_layout_text_set(eo_super(obj, MY_CLASS), part, label);
         return int_ret;
      }
 
@@ -226,7 +225,7 @@ _elm_fileselector_entry_elm_layout_text_get(Eo *obj, Elm_Fileselector_Entry_Data
    if (part && strcmp(part, "default"))
      {
         const char *text = NULL;
-        eo_do_super(obj, MY_CLASS, text = elm_obj_layout_text_get(part));
+        text = elm_obj_layout_text_get(eo_super(obj, MY_CLASS), part);
         return text;
      }
 
@@ -239,7 +238,7 @@ _elm_fileselector_entry_elm_container_content_set(Eo *obj, Elm_Fileselector_Entr
    if (part && strcmp(part, "button icon"))
      {
         Eina_Bool int_ret = EINA_FALSE;
-        eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_set(part, content));
+        int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
         return int_ret;
      }
 
@@ -254,7 +253,7 @@ _elm_fileselector_entry_elm_container_content_get(Eo *obj, Elm_Fileselector_Entr
    if (part && strcmp(part, "button icon"))
      {
         Evas_Object *ret = NULL;
-        eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_get(part));
+        ret = elm_obj_container_content_get(eo_super(obj, MY_CLASS), part);
         return ret;
      }
 
@@ -267,7 +266,7 @@ _elm_fileselector_entry_elm_container_content_unset(Eo *obj, Elm_Fileselector_En
    if (part && strcmp(part, "button icon"))
      {
         Evas_Object *ret = NULL;
-        eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_unset(part));
+        ret = elm_obj_container_content_unset(eo_super(obj, MY_CLASS), part);
         return ret;
      }
 
@@ -277,7 +276,7 @@ _elm_fileselector_entry_elm_container_content_unset(Eo *obj, Elm_Fileselector_En
 EOLIAN static void
 _elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *priv)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->button = elm_fileselector_button_add(obj);
@@ -289,7 +288,7 @@ _elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Da
      (priv->button, _elm_config->fileselector_expand_enable);
 
 #define SIG_FWD(name, event) \
-  eo_do(priv->button, eo_event_callback_add(event, _##name##_fwd, obj))
+  eo_event_callback_add(priv->button, event, _##name##_fwd, obj)
    SIG_FWD(CLICKED, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED);
    SIG_FWD(UNPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED);
    SIG_FWD(FILE_CHOSEN, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN);
@@ -303,7 +302,7 @@ _elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Da
    elm_entry_editable_set(priv->entry, EINA_TRUE);
 
 #define SIG_FWD(name, event) \
-  eo_do(priv->entry, eo_event_callback_add(event, _##name##_fwd, obj))
+  eo_event_callback_add(priv->entry, event, _##name##_fwd, obj)
    SIG_FWD(CHANGED, ELM_ENTRY_EVENT_CHANGED);
    SIG_FWD(ACTIVATED, ELM_ENTRY_EVENT_ACTIVATED);
    SIG_FWD(PRESS, ELM_ENTRY_EVENT_PRESS);
@@ -336,7 +335,7 @@ _elm_fileselector_entry_evas_object_smart_del(Eo *obj, Elm_Fileselector_Entry_Da
 {
    free(sd->path);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -350,11 +349,10 @@ elm_fileselector_entry_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_fileselector_entry_eo_base_constructor(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_GROUPING));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GROUPING);
 
    return obj;
 }
@@ -364,7 +362,7 @@ elm_fileselector_entry_selected_set(Evas_Object *obj,
                                     const char *path)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_selected_set(path));
+   elm_interface_fileselector_selected_set(obj, path);
 }
 
 EOLIAN static Eina_Bool
@@ -379,7 +377,7 @@ elm_fileselector_entry_selected_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
    const char *ret = NULL;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_selected_get());
+   ret = elm_interface_fileselector_selected_get((Eo *) obj);
    return ret;
 }
 
@@ -418,7 +416,7 @@ elm_fileselector_entry_path_set(Evas_Object *obj,
                                 const char *path)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_path_set(path));
+   elm_interface_fileselector_path_set(obj, path);
 }
 
 EOLIAN static void
@@ -440,7 +438,7 @@ elm_fileselector_entry_path_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
    const char *ret = NULL;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_path_get());
+   ret = elm_interface_fileselector_path_get((Eo *) obj);
    return ret;
 }
 
@@ -457,7 +455,7 @@ elm_fileselector_entry_expandable_set(Evas_Object *obj,
                                       Eina_Bool value)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_expandable_set(value));
+   elm_interface_fileselector_expandable_set(obj, value);
 }
 
 EOLIAN static void
@@ -471,7 +469,7 @@ elm_fileselector_entry_expandable_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
    Eina_Bool ret = EINA_FALSE;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_expandable_get());
+   ret = elm_interface_fileselector_expandable_get((Eo *) obj);
    return ret;
 }
 
@@ -486,7 +484,7 @@ elm_fileselector_entry_folder_only_set(Evas_Object *obj,
                                        Eina_Bool value)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_folder_only_set(value));
+   elm_interface_fileselector_folder_only_set(obj, value);
 }
 
 EOLIAN static void
@@ -500,7 +498,7 @@ elm_fileselector_entry_folder_only_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
    Eina_Bool ret = EINA_FALSE;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_folder_only_get());
+   ret = elm_interface_fileselector_folder_only_get((Eo *) obj);
    return ret;
 }
 
@@ -515,7 +513,7 @@ elm_fileselector_entry_is_save_set(Evas_Object *obj,
                                    Eina_Bool value)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj);
-   eo_do(obj, elm_interface_fileselector_is_save_set(value));
+   elm_interface_fileselector_is_save_set(obj, value);
 }
 
 EOLIAN static void
@@ -529,7 +527,7 @@ elm_fileselector_entry_is_save_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
    Eina_Bool ret = EINA_FALSE;
-   eo_do((Eo *) obj, ret = elm_interface_fileselector_is_save_get());
+   ret = elm_interface_fileselector_is_save_get((Eo *) obj);
    return ret;
 }
 
diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index 3613e36b4..76816d006 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -51,9 +51,9 @@ _elm_hoversel_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd)
    Eina_List *l;
 
    EINA_LIST_FOREACH(sd->items, l, it)
-     eo_do(it, elm_wdg_item_translate());
+     elm_wdg_item_translate(it);
 
-   eo_do_super(obj, MY_CLASS, elm_obj_widget_translate());
+   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -80,7 +80,7 @@ _elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
    /* hoversel's style has an extra bit: orientation */
    eina_stringshare_replace(&(wd->style), buf);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    eina_stringshare_replace(&(wd->style), style);
@@ -99,7 +99,7 @@ _elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
         elm_object_style_set(VIEW(item), buf);
         elm_object_text_set(VIEW(item), item->label);
         elm_widget_disabled_set
-          (VIEW(item), eo_do_ret(eo_item, int_ret, elm_wdg_item_disabled_get()));
+          (VIEW(item), elm_wdg_item_disabled_get(eo_item));
      }
 
    eina_stringshare_del(style);
@@ -162,7 +162,7 @@ _on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
    ELM_HOVERSEL_DATA_GET(obj2, sd);
 
    if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2, eo_it);
-   eo_do(obj2, eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it));
+   eo_event_callback_call(obj2, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it);
 
    evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item);
 
@@ -176,7 +176,7 @@ _item_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
 {
    Elm_Hoversel_Item_Data *it = data;
 
-   eo_do(WIDGET(it), eo_event_callback_call(ELM_HOVERSEL_EVENT_ITEM_FOCUSED, EO_OBJ(it)));
+   eo_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_FOCUSED, EO_OBJ(it));
 
    return EINA_TRUE;
 }
@@ -186,7 +186,7 @@ _item_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
 {
    Elm_Hoversel_Item_Data *it = data;
 
-   eo_do(WIDGET(it), eo_event_callback_call(ELM_HOVERSEL_EVENT_ITEM_UNFOCUSED, EO_OBJ(it)));
+   eo_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_UNFOCUSED, EO_OBJ(it));
 
    return EINA_TRUE;
 }
@@ -356,7 +356,7 @@ _hover_del(Evas_Object *obj)
    sd->scr = NULL;
    sd->last_location = NULL;
 
-   eo_do(obj, eo_event_callback_call(ELM_HOVERSEL_EVENT_DISMISSED, NULL));
+   eo_event_callback_call(obj, ELM_HOVERSEL_EVENT_DISMISSED, NULL);
 }
 
 static void
@@ -409,8 +409,8 @@ _activate(Evas_Object *obj)
 
    elm_object_style_set(sd->hover, buf);
 
-   eo_do(sd->hover, eo_event_callback_add
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_hover_clicked, obj));
+   eo_event_callback_add
+     (sd->hover, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_hover_clicked, obj);
    elm_layout_signal_callback_add
      (sd->hover, "elm,action,hide,finished", "elm", _hover_end_finished, obj);
    elm_hover_target_set(sd->hover, obj);
@@ -435,7 +435,7 @@ _activate(Evas_Object *obj)
    _resizing_eval(obj, sd);
    elm_object_part_content_set(sd->hover, sd->last_location, sd->tbl);
 
-   eo_do(obj, eo_event_callback_call(ELM_HOVERSEL_EVENT_EXPANDED, NULL));
+   eo_event_callback_call(obj, ELM_HOVERSEL_EVENT_EXPANDED, NULL);
    evas_object_show(sd->hover);
 }
 
@@ -462,7 +462,7 @@ _elm_hoversel_item_elm_widget_item_disable(Eo *eo_hoversel_it,
 {
    Eina_Bool tmp;
    elm_widget_disabled_set
-     (VIEW(hoversel_it), eo_do_ret(eo_hoversel_it, tmp, elm_wdg_item_disabled_get()));
+     (VIEW(hoversel_it), elm_wdg_item_disabled_get(eo_hoversel_it));
 }
 
 static void
@@ -537,7 +537,7 @@ _elm_hoversel_item_eo_base_destructor(Eo *eo_item, Elm_Hoversel_Item_Data *item)
    eina_stringshare_del(item->icon_file);
    eina_stringshare_del(item->icon_group);
 
-   eo_do_super(eo_item, ELM_HOVERSEL_ITEM_CLASS, eo_destructor());
+   eo_destructor(eo_super(eo_item, ELM_HOVERSEL_ITEM_CLASS));
 }
 
 static void
@@ -554,14 +554,13 @@ _on_move_resize(void * data,
 EOLIAN static void
 _elm_hoversel_evas_object_smart_add(Eo *obj, Elm_Hoversel_Data *priv)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
-   eo_do(obj, eo_event_callback_add(
-         EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_clicked, obj));
+   eo_event_callback_add(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_clicked, obj);
 
    //What are you doing here?
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 
    evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _on_move_resize, priv);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _on_move_resize, priv);
@@ -580,20 +579,20 @@ _elm_hoversel_evas_object_smart_del(Eo *obj, Elm_Hoversel_Data *sd)
      }
    elm_hoversel_hover_parent_set(obj, NULL);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_hoversel_evas_object_smart_show(Eo *obj, Elm_Hoversel_Data *sd)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
+   evas_obj_smart_show(eo_super(obj, MY_CLASS));
    evas_object_show(sd->hover);
 }
 
 EOLIAN static void
 _elm_hoversel_evas_object_smart_hide(Eo *obj, Elm_Hoversel_Data *sd)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
+   evas_obj_smart_hide(eo_super(obj, MY_CLASS));
    evas_object_hide(sd->hover);
 }
 
@@ -620,11 +619,10 @@ elm_hoversel_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_hoversel_eo_base_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PUSH_BUTTON));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);
 
    return obj;
 }
@@ -632,8 +630,8 @@ _elm_hoversel_eo_base_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
 EOLIAN static void
 _elm_hoversel_eo_base_destructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
 {
-   eo_do(obj, elm_obj_hoversel_clear());
-   eo_do_super(obj, MY_CLASS, eo_destructor());
+   elm_obj_hoversel_clear(obj);
+   eo_destructor(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -676,7 +674,7 @@ _elm_hoversel_horizontal_set(Eo *obj, Elm_Hoversel_Data *sd, Eina_Bool horizonta
           }
      }
 
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 }
 
 EOLIAN static Eina_Bool
@@ -726,7 +724,7 @@ _elm_hoversel_clear(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd)
 
    EINA_LIST_FOREACH_SAFE(sd->items, l, ll, it)
      {
-        eo_do(it, elm_wdg_item_del());
+        elm_wdg_item_del(it);
      }
 }
 
@@ -739,7 +737,7 @@ _elm_hoversel_items_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd)
 EOLIAN static Eo *
 _elm_hoversel_item_eo_base_constructor(Eo *obj, Elm_Hoversel_Item_Data *it)
 {
-   obj = eo_do_super_ret(obj, ELM_HOVERSEL_ITEM_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, ELM_HOVERSEL_ITEM_CLASS));
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    return obj;
@@ -787,11 +785,9 @@ _elm_hoversel_item_add(Eo *obj, Elm_Hoversel_Data *sd, const char *label, const
 
     evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
     evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    eo_do(bt,
-          eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_clicked, item));
-    eo_do(bt,
-          eo_event_callback_add(ELM_WIDGET_EVENT_FOCUSED, _item_focused_cb, item),
-          eo_event_callback_add(ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, item));
+    eo_event_callback_add(bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_clicked, item);
+    eo_event_callback_add(bt, ELM_WIDGET_EVENT_FOCUSED, _item_focused_cb, item);
+    eo_event_callback_add(bt, ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, item);
 
    sd->items = eina_list_append(sd->items, eo_item);
 
@@ -925,7 +921,7 @@ _elm_hoversel_elm_widget_event(Eo *obj, Elm_Hoversel_Data *sd, Evas_Object *src,
    Eina_Bool int_ret = EINA_FALSE;
    Evas_Event_Key_Down *ev = event_info;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_event(src, type, event_info));
+   int_ret = elm_obj_widget_event(eo_super(obj, MY_CLASS), src, type, event_info);
    if (int_ret) return EINA_FALSE;
 
    if (!sd || !sd->hover) return EINA_FALSE;
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index e62843cf5..3b6ab39b2 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -68,9 +68,9 @@ _elm_multibuttonentry_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Multibuttone
    Eina_List *l;
 
    EINA_LIST_FOREACH(sd->items, l, it)
-     eo_do(it, elm_wdg_item_translate());
+     elm_wdg_item_translate(it);
 
-   eo_do_super(obj, MY_CLASS, elm_obj_widget_translate());
+   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -94,7 +94,7 @@ _elm_multibuttonentry_elm_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data
    double pad_scale;
 
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    str = elm_layout_data_get(obj, "horizontal_pad");
@@ -268,8 +268,8 @@ _shrink_mode_set(Evas_Object *obj,
                   evas_object_show(sd->end);
 
                   sd->view_state = MULTIBUTTONENTRY_VIEW_SHRINK;
-                  eo_do(obj, eo_event_callback_call
-                    (ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)1));
+                  eo_event_callback_call
+                    (obj, ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)1);
                   break;
                }
           }
@@ -301,9 +301,8 @@ _shrink_mode_set(Evas_Object *obj,
           }
 
         sd->view_state = MULTIBUTTONENTRY_VIEW_NONE;
-        eo_do(obj, eo_event_callback_call
-          (ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED,
-          (void *)(uintptr_t)sd->shrink));
+        eo_event_callback_call
+          (obj, ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)(uintptr_t)sd->shrink);
      }
 
    if (sd->view_state != MULTIBUTTONENTRY_VIEW_SHRINK)
@@ -358,8 +357,8 @@ _elm_multibuttonentry_elm_widget_on_focus(Eo *obj, Elm_Multibuttonentry_Data *sd
                   elm_entry_input_panel_show(sd->entry);
                }
           }
-        eo_do(obj, eo_event_callback_call
-          (ELM_WIDGET_EVENT_FOCUSED, NULL));
+        eo_event_callback_call
+          (obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
      }
    else
      {
@@ -368,8 +367,8 @@ _elm_multibuttonentry_elm_widget_on_focus(Eo *obj, Elm_Multibuttonentry_Data *sd
              _view_update(sd);
              elm_entry_input_panel_hide(sd->entry);
           }
-        eo_do(obj, eo_event_callback_call
-          (ELM_WIDGET_EVENT_UNFOCUSED, NULL));
+        eo_event_callback_call
+          (obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
      }
 
 end:
@@ -385,8 +384,8 @@ _item_del(Elm_Multibuttonentry_Item_Data *item)
 
    elm_box_unpack(sd->box, VIEW(item));
 
-   eo_do(obj, eo_event_callback_call
-     (ELM_MULTIBUTTONENTRY_EVENT_ITEM_DELETED, EO_OBJ(item)));
+   eo_event_callback_call
+     (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_DELETED, EO_OBJ(item));
 
    if (sd->selected_it == item)
      sd->selected_it = NULL;
@@ -414,8 +413,8 @@ _current_item_state_change(Evas_Object *obj,
      {
       case MULTIBUTTONENTRY_BUTTON_STATE_SELECTED:
         elm_layout_signal_emit(VIEW(item), "elm,state,focused", "elm");
-        eo_do(obj, eo_event_callback_call
-          (ELM_MULTIBUTTONENTRY_EVENT_ITEM_SELECTED, EO_OBJ(item)));
+        eo_event_callback_call
+          (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_SELECTED, EO_OBJ(item));
         break;
       case MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT:
       default:
@@ -513,8 +512,8 @@ _on_item_clicked(void *data,
    _item_select(WIDGET(it), it);
 
    if (sd->selected_it)
-     eo_do(WIDGET(it), eo_event_callback_call
-       (ELM_MULTIBUTTONENTRY_EVENT_ITEM_CLICKED, eo_it));
+     eo_event_callback_call
+       (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_CLICKED, eo_it);
 }
 
 static void
@@ -535,7 +534,7 @@ _on_item_deleted(void *data,
         ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_temp_it, temp_it);
         if (VIEW(temp_it) == obj)
           {
-             eo_do(eo_temp_it, elm_wdg_item_del());
+             elm_wdg_item_del(eo_temp_it);
              sd->items = eina_list_remove(sd->items, eo_temp_it);
              break;
           }
@@ -562,8 +561,8 @@ _long_press_cb(void *data)
 
    sd->longpress_timer = NULL;
 
-   eo_do(WIDGET(it), eo_event_callback_call
-     (ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, EO_OBJ(it)));
+   eo_event_callback_call
+     (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, EO_OBJ(it));
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -661,7 +660,7 @@ _elm_multibuttonentry_item_eo_base_destructor(Eo *eo_it,
      elm_interface_atspi_accessible_children_changed_del_signal_emit(WIDGET(it), eo_it);
    _item_del(it);
 
-   eo_do_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS, eo_destructor());
+   eo_destructor(eo_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
 }
 
 static void
@@ -714,7 +713,7 @@ _access_multibuttonentry_item_register(Evas_Object *obj,
 EOLIAN static Eo *
 _elm_multibuttonentry_item_eo_base_constructor(Eo *eo_item, Elm_Multibuttonentry_Item_Data *item)
 {
-   eo_item = eo_do_super_ret(eo_item, ELM_MULTIBUTTONENTRY_ITEM_CLASS, eo_item, eo_constructor());
+   eo_item = eo_constructor(eo_super(eo_item, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
    item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    return eo_item;
@@ -752,12 +751,12 @@ _item_new(Elm_Multibuttonentry_Data *sd,
      return NULL;
    WIDGET_ITEM_DATA_SET(eo_item, data);
 
-   eo_do(eo_item, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PUSH_BUTTON));
+   elm_interface_atspi_accessible_role_set(eo_item, ELM_ATSPI_ROLE_PUSH_BUTTON);
 
    ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_item, item);
    VIEW(item) = elm_layout_add(obj);
 
-   eo_do(VIEW(item), elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_DISABLED));
+   elm_interface_atspi_accessible_type_set(VIEW(item), ELM_ATSPI_TYPE_DISABLED);
 
    if (!elm_layout_theme_set
        (VIEW(item), "multibuttonentry", "btn", elm_widget_style_get(obj)))
@@ -922,8 +921,8 @@ _item_new(Elm_Multibuttonentry_Data *sd,
         break;
      }
 
-   eo_do(obj, eo_event_callback_call
-     (ELM_MULTIBUTTONENTRY_EVENT_ITEM_ADDED, eo_item));
+   eo_event_callback_call
+     (obj, ELM_MULTIBUTTONENTRY_EVENT_ITEM_ADDED, eo_item);
 
    if (_elm_config->atspi_mode)
      {
@@ -970,7 +969,7 @@ _mouse_clicked_signal_cb(void *data EINA_UNUSED,
                          const char *emission EINA_UNUSED,
                          const char *source EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+   eo_event_callback_call(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
 }
 
 static void
@@ -990,11 +989,11 @@ _box_resize_cb(void *data,
    elm_box_padding_get(obj, &hpad, NULL);
 
    if (sd->h_box < h)
-     eo_do(sd->parent, eo_event_callback_call
-       (ELM_MULTIBUTTONENTRY_EVENT_EXPANDED, NULL));
+     eo_event_callback_call
+       (sd->parent, ELM_MULTIBUTTONENTRY_EVENT_EXPANDED, NULL);
    else if (sd->h_box > h)
-     eo_do(sd->parent, eo_event_callback_call
-       (ELM_MULTIBUTTONENTRY_EVENT_CONTRACTED, NULL));
+     eo_event_callback_call
+       (sd->parent, ELM_MULTIBUTTONENTRY_EVENT_CONTRACTED, NULL);
 
    if (sd->items && sd->w_box != w)
      {
@@ -1113,7 +1112,7 @@ _layout_key_down_cb(void *data,
              if (item && sd->editable)
                {
                   sd->items = eina_list_remove(sd->items, EO_OBJ(item));
-                  eo_do(EO_OBJ(item), elm_wdg_item_del());
+                  elm_wdg_item_del(EO_OBJ(item));
                   elm_object_focus_set(sd->entry, EINA_TRUE);
                }
           }
@@ -1191,7 +1190,7 @@ _callbacks_register(Evas_Object *obj)
      (sd->entry, EVAS_CALLBACK_KEY_DOWN, _entry_key_down_cb, obj);
    evas_object_event_callback_add
      (sd->entry, EVAS_CALLBACK_RESIZE, _entry_resize_cb, obj);
-   eo_do(sd->entry, eo_event_callback_array_add(_multi_buttonentry_cb(), obj));
+   eo_event_callback_array_add(sd->entry, _multi_buttonentry_cb(), obj);
 }
 
 static void
@@ -1495,7 +1494,7 @@ _elm_multibuttonentry_elm_layout_text_set(Eo *obj, Elm_Multibuttonentry_Data *sd
         int_ret = EINA_TRUE;
      }
    else
-     eo_do_super(obj, MY_CLASS, int_ret = elm_obj_layout_text_set(part, label));
+     int_ret = elm_obj_layout_text_set(eo_super(obj, MY_CLASS), part, label);
 
    return int_ret;
 }
@@ -1514,7 +1513,7 @@ _elm_multibuttonentry_elm_layout_text_get(Eo *obj, Elm_Multibuttonentry_Data *sd
         text = sd->guide_text_str;
      }
    else
-     eo_do_super(obj, MY_CLASS, text = elm_obj_layout_text_get(part));
+     text = elm_obj_layout_text_get(eo_super(obj, MY_CLASS), part);
 
    return text;
 }
@@ -1563,7 +1562,7 @@ _elm_multibuttonentry_evas_object_smart_add(Eo *obj, Elm_Multibuttonentry_Data *
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set
@@ -1612,7 +1611,7 @@ _elm_multibuttonentry_evas_object_smart_del(Eo *obj, Elm_Multibuttonentry_Data *
    EINA_LIST_FREE(sd->filter_list, _item_filter)
      _filter_free(_item_filter);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 static Eina_Bool _elm_multibuttonentry_smart_focus_next_enable = EINA_FALSE;
@@ -1714,11 +1713,10 @@ elm_multibuttonentry_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_multibuttonentry_eo_base_constructor(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ENTRY));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
 
    return obj;
 }
@@ -1855,7 +1853,7 @@ EOLIAN static void
 _elm_multibuttonentry_clear(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd)
 {
    while (sd->items)
-     eo_do(eina_list_data_get(sd->items), elm_wdg_item_del());
+     elm_wdg_item_del(eina_list_data_get(sd->items));
 
    sd->selected_it = NULL;
    _view_update(sd);
@@ -1908,7 +1906,7 @@ _elm_multibuttonentry_item_elm_widget_item_disable(Eo *eo_it, Elm_Multibuttonent
 {
    const char* emission;
    Eina_Bool tmp;
-   if (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get()))
+   if (elm_wdg_item_disabled_get(eo_it))
      emission = "elm,state,disabled";
    else
      emission = "elm,state,enabled";
@@ -2011,7 +2009,7 @@ EOLIAN static Eina_List*
 _elm_multibuttonentry_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Multibuttonentry_Data *sd)
 {
    Eina_List *ret;
-   eo_do_super(obj, ELM_MULTIBUTTONENTRY_CLASS, ret = elm_interface_atspi_accessible_children_get());
+   ret = elm_interface_atspi_accessible_children_get(eo_super(obj, ELM_MULTIBUTTONENTRY_CLASS));
    return eina_list_merge(eina_list_clone(sd->items), ret);
 }
 
@@ -2019,7 +2017,7 @@ EOLIAN static char*
 _elm_multibuttonentry_item_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Multibuttonentry_Item_Data *item)
 {
    char *ret;
-   eo_do_super(obj, ELM_MULTIBUTTONENTRY_ITEM_CLASS, ret = elm_interface_atspi_accessible_name_get());
+   ret = elm_interface_atspi_accessible_name_get(eo_super(obj, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
    if (ret) return ret;
 
    const char *txt = elm_object_part_text_get(VIEW(item), "elm.btn.text");
@@ -2046,8 +2044,8 @@ static Eina_Bool
 _key_action_longpress(Eo *obj, const char *params EINA_UNUSED)
 {
    ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(obj, it);
-   eo_do(WIDGET(it), eo_event_callback_call
-     (ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, obj));
+   eo_event_callback_call
+     (WIDGET(it), ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, obj);
    return EINA_TRUE;
 }
 
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index cbf67e2ab..717916468 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -82,9 +82,9 @@ _elm_naviframe_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd)
    Elm_Naviframe_Item_Data *it;
 
    EINA_INLIST_FOREACH(sd->stack, it)
-     eo_do(EO_OBJ(it), elm_wdg_item_translate());
+     elm_wdg_item_translate(EO_OBJ(it));
 
-   eo_do_super(obj, MY_CLASS, elm_obj_widget_translate());
+   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -340,8 +340,8 @@ _on_item_title_transition_finished(void *data,
 {
    Elm_Naviframe_Item_Data *it = data;
 
-   eo_do(WIDGET(it), eo_event_callback_call
-         (ELM_NAVIFRAME_EVENT_TITLE_TRANSITION_FINISHED, EO_OBJ(it)));
+   eo_event_callback_call
+         (WIDGET(it), ELM_NAVIFRAME_EVENT_TITLE_TRANSITION_FINISHED, EO_OBJ(it));
 }
 
 static void
@@ -370,11 +370,11 @@ _elm_naviframe_elm_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd)
    Elm_Naviframe_Item_Data *it;
    const char *style = NULL, *sstyle = NULL;
 
-   eo_do(obj, style = elm_obj_widget_style_get());
+   style = elm_obj_widget_style_get(obj);
 
    EINA_INLIST_FOREACH(sd->stack, it)
      {
-        eo_do(VIEW(it), sstyle = elm_obj_widget_style_get());
+        sstyle = elm_obj_widget_style_get(VIEW(it));
         if ((style && sstyle) && strcmp(style, sstyle))
           _item_style_set(it, it->style);
         _item_signals_emit(it);
@@ -515,7 +515,7 @@ _elm_naviframe_item_elm_widget_item_part_text_set(Eo *eo_it EINA_UNUSED,
         if (nit->title_label) strncat(buf, " ", 1);
         strncat(buf, nit->subtitle_label, sizeof(buf) - strlen(buf) - 2);
      }
-   eo_do(VIEW(it), elm_interface_atspi_accessible_name_set(buf));
+   elm_interface_atspi_accessible_name_set(VIEW(it), buf);
 
    elm_layout_sizing_eval(WIDGET(nit));
 }
@@ -590,7 +590,7 @@ end:
 
    _item_free(nit);
 
-   eo_do_super(eo_item, ELM_NAVIFRAME_ITEM_CLASS, eo_destructor());
+   eo_destructor(eo_super(eo_item, ELM_NAVIFRAME_ITEM_CLASS));
 }
 
 static void
@@ -691,10 +691,8 @@ _item_title_prev_btn_unset(Elm_Naviframe_Item_Data *it)
 
    evas_object_event_callback_del
      (content, EVAS_CALLBACK_DEL, _item_title_prev_btn_del_cb);
-   Eo* parent = eo_do_ret(content, parent, eo_parent_get());
-   eo_do(content, eo_event_callback_del(
-            EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked,
-            parent));
+   Eo* parent = eo_parent_get(content);
+   eo_event_callback_del(content, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, parent);
    it->title_prev_btn = NULL;
    if (it->auto_pushed_btn) it->auto_pushed_btn = NULL;
    return content;
@@ -958,9 +956,7 @@ _on_item_back_btn_clicked(void *data, const Eo_Event *event)
       multiple times on some heavy environment. This callback del will
       prevent those scenario and guarantee only one clicked for it's own
       page. */
-   eo_do(event->obj, eo_event_callback_del(
-            EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,  _on_item_back_btn_clicked,
-            data));
+   eo_event_callback_del(event->obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, data);
    elm_naviframe_item_pop(data);
 
    return EINA_TRUE;
@@ -975,8 +971,8 @@ _back_btn_new(Evas_Object *obj, const char *title_label)
    btn = elm_button_add(obj);
 
    if (!btn) return NULL;
-   eo_do(btn, eo_event_callback_add
-         (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, obj));
+   eo_event_callback_add
+         (btn, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, obj);
    snprintf
      (buf, sizeof(buf), "naviframe/back_btn/%s", elm_widget_style_get(obj));
    elm_object_style_set(btn, buf);
@@ -1015,7 +1011,7 @@ _elm_naviframe_elm_layout_signal_emit(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSE
    if (!eo_top_it) return;
    ELM_NAVIFRAME_ITEM_DATA_GET(eo_top_it, top_it);
 
-   eo_do(VIEW(top_it), elm_obj_layout_signal_emit(emission, source));
+   elm_obj_layout_signal_emit(VIEW(top_it), emission, source);
 }
 
 /* content/text smart functions proxying things to the top item, which
@@ -1091,7 +1087,7 @@ _on_item_title_clicked(void *data,
 {
    Elm_Naviframe_Item_Data *it = data;
 
-   eo_do(WIDGET(it), eo_event_callback_call(ELM_NAVIFRAME_EVENT_TITLE_CLICKED,  EO_OBJ(it)));
+   eo_event_callback_call(WIDGET(it), ELM_NAVIFRAME_EVENT_TITLE_CLICKED, EO_OBJ(it));
 }
 
 /* "elm,state,cur,pushed"
@@ -1132,7 +1128,7 @@ _on_item_pop_finished(void *data,
      elm_widget_tree_unfocusable_set(VIEW(it), EINA_FALSE);
    sd->popping = eina_list_remove(sd->popping, it);
 
-   eo_do(EO_OBJ(it), elm_wdg_item_del());
+   elm_wdg_item_del(EO_OBJ(it));
 }
 
 /* "elm,state,new,pushed",
@@ -1157,7 +1153,7 @@ _on_item_show_finished(void *data,
 
    it->pushing = EINA_FALSE;
 
-   eo_do(WIDGET(it), eo_event_callback_call(ELM_NAVIFRAME_EVENT_TRANSITION_FINISHED, EO_OBJ(it)));
+   eo_event_callback_call(WIDGET(it), ELM_NAVIFRAME_EVENT_TRANSITION_FINISHED, EO_OBJ(it));
 }
 
 static void
@@ -1194,7 +1190,7 @@ _access_prev_btn_info_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED)
 EOLIAN static Eo *
 _elm_naviframe_item_eo_base_constructor(Eo *eo_item, Elm_Naviframe_Item_Data *it)
 {
-   eo_item = eo_do_super_ret(eo_item, ELM_NAVIFRAME_ITEM_CLASS, eo_item, eo_constructor());
+   eo_item = eo_constructor(eo_super(eo_item, ELM_NAVIFRAME_ITEM_CLASS));
    it->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    return eo_item;
@@ -1230,9 +1226,8 @@ _item_new(Evas_Object *obj,
    if (!elm_widget_sub_object_add(obj, VIEW(it)))
      ERR("could not add %p as sub object of %p", VIEW(it), obj);
 
-   eo_do(VIEW(it),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PAGE_TAB),
-         elm_interface_atspi_accessible_name_set((char*)title_label));
+   elm_interface_atspi_accessible_role_set(VIEW(it), ELM_ATSPI_ROLE_PAGE_TAB);
+   elm_interface_atspi_accessible_name_set(VIEW(it), (char*)title_label);
 
    evas_object_event_callback_add
      (VIEW(it), EVAS_CALLBACK_CHANGED_SIZE_HINTS,
@@ -1252,7 +1247,7 @@ _item_new(Evas_Object *obj,
    _item_style_set(it, item_style);
 
    if (title_label)
-     eo_do(eo_item, elm_wdg_item_part_text_set(TITLE_PART, title_label));
+     elm_wdg_item_part_text_set(eo_item, TITLE_PART, title_label);
 
    //title buttons
    if ((!prev_btn) && sd->auto_pushed && eo_prev_it)
@@ -1265,7 +1260,7 @@ _item_new(Evas_Object *obj,
 
    if (prev_btn)
      {
-        eo_do(eo_item, elm_wdg_item_part_content_set(PREV_BTN_PART, prev_btn));
+        elm_wdg_item_part_content_set(eo_item, PREV_BTN_PART, prev_btn);
         if (!elm_layout_text_get(prev_btn, NULL))
           {
              if (!_access_info_has(prev_btn, ELM_ACCESS_INFO))
@@ -1280,7 +1275,7 @@ _item_new(Evas_Object *obj,
 
    if (next_btn)
      {
-        eo_do(eo_item, elm_wdg_item_part_content_set(NEXT_BTN_PART, next_btn));
+        elm_wdg_item_part_content_set(eo_item, NEXT_BTN_PART, next_btn);
 
         if (!elm_layout_text_get(next_btn, NULL))
           {
@@ -1394,7 +1389,7 @@ _elm_naviframe_evas_object_smart_add(Eo *obj, Elm_Naviframe_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->dummy_edje = wd->resize_obj;
@@ -1442,8 +1437,7 @@ _deferred(void *data, const Eo_Event *event EINA_UNUSED)
         free(nfo);
      }
 
-   eo_do(nfd->obj,
-         eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, nfd));
+   eo_event_callback_del(nfd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, nfd);
    return EO_CALLBACK_CONTINUE;
 }
 
@@ -1458,18 +1452,18 @@ _elm_naviframe_evas_object_smart_del(Eo *obj, Elm_Naviframe_Data *sd)
    while (sd->stack)
      {
         it = EINA_INLIST_CONTAINER_GET(sd->stack, Elm_Naviframe_Item_Data);
-        eo_do(EO_OBJ(it), elm_wdg_item_del());
+        elm_wdg_item_del(EO_OBJ(it));
      }
 
    // No need to cleanup animator as it is an event on myself
    EINA_LIST_FREE(sd->ops, nfo)
      free(nfo);
    EINA_LIST_FREE(sd->popping, it)
-     eo_do(EO_OBJ(it), elm_wdg_item_del());
+     elm_wdg_item_del(EO_OBJ(it));
 
    evas_object_del(sd->dummy_edje);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 //Show only the top item view
@@ -1489,14 +1483,14 @@ static Eina_Bool
 _key_action_top_item_get(Evas_Object *obj, const char *params EINA_UNUSED)
 {
    Elm_Object_Item *eo_item = NULL;
-   eo_do(obj, eo_item = elm_obj_naviframe_top_item_get());
+   eo_item = elm_obj_naviframe_top_item_get(obj);
    if (!eo_item) return EINA_FALSE;
 
    //FIXME: Replace this below code to elm_naviframe_item_pop() at elm 2.0.
    ///Leave for compatibility.
    ELM_NAVIFRAME_ITEM_DATA_GET(eo_item, it);
    if (it->title_prev_btn)
-     eo_do(it->title_prev_btn, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+     eo_event_callback_call(it->title_prev_btn, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
 
    return EINA_TRUE;
 }
@@ -1528,8 +1522,7 @@ static void
 _schedule_deferred(Elm_Naviframe_Op *nfo, Elm_Naviframe_Data *sd)
 {
    if (!sd->ops)
-     eo_do(sd->obj,
-           eo_event_callback_add(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, sd));
+     eo_event_callback_add(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, sd);
 
    sd->ops = eina_list_append(sd->ops, nfo);
 }
@@ -1597,12 +1590,11 @@ elm_naviframe_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_naviframe_eo_base_constructor(Eo *obj, Elm_Naviframe_Data *sd)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PAGE_TAB_LIST));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST);
 
    return obj;
 }
@@ -1725,7 +1717,7 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd)
           {
              eo_unref(eo_item);
              if (it->delete_me)
-               eo_do(eo_item, elm_wdg_item_del());
+               elm_wdg_item_del(eo_item);
              else
                {
                   /* To avoid multiple item pops, the auto pushed button deletes
@@ -1733,9 +1725,8 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd)
                      Since the item is not popped or deleted here, the deleted
                      callback of the auto pushed button should be restored. */
                   if (it->auto_pushed_btn)
-                    eo_do(it->auto_pushed_btn, eo_event_callback_add
-                          (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
-                           _on_item_back_btn_clicked, obj));
+                    eo_event_callback_add
+                          (it->auto_pushed_btn, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked, obj);
                   it->popping = EINA_FALSE;
                }
              evas_object_unref(obj);
@@ -1790,7 +1781,7 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd)
         _schedule_deferred(nfo, sd);
      }
    else
-     eo_do(eo_item, elm_wdg_item_del());
+     elm_wdg_item_del(eo_item);
 
  on_error:
    return content;
@@ -1818,7 +1809,7 @@ _elm_naviframe_item_pop_to(Eo *eo_it, Elm_Naviframe_Item_Data *it)
 
         l = l->prev;
 
-        eo_do(EO_OBJ(iit), elm_wdg_item_del());
+        elm_wdg_item_del(EO_OBJ(iit));
      }
 
    sd->on_deletion = EINA_FALSE;
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index 79acdd9c2..7c1e2a7cb 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -207,7 +207,7 @@ EOLIAN static Eina_Bool
 _elm_player_elm_widget_theme_apply(Eo *obj, Elm_Player_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _update_theme_button(obj, sd->forward, "forward");
@@ -331,7 +331,7 @@ _forward(void *data, const Eo_Event *event EINA_UNUSED)
    elm_video_play_position_set(sd->video, pos);
 
    elm_layout_signal_emit(data, "elm,button,forward", "elm");
-   eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_FORWARD_CLICKED, NULL));
+   eo_event_callback_call(data, ELM_PLAYER_EVENT_FORWARD_CLICKED, NULL);
 
    return EINA_TRUE;
 }
@@ -340,7 +340,7 @@ static Eina_Bool
 _info(void *data, const Eo_Event *event EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,info", "elm");
-   eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_INFO_CLICKED, NULL));
+   eo_event_callback_call(data, ELM_PLAYER_EVENT_INFO_CLICKED, NULL);
 
    return EINA_TRUE;
 }
@@ -349,7 +349,7 @@ static Eina_Bool
 _next(void *data, const Eo_Event *event EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,next", "elm");
-   eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_NEXT_CLICKED, NULL));
+   eo_event_callback_call(data, ELM_PLAYER_EVENT_NEXT_CLICKED, NULL);
 
    return EINA_TRUE;
 }
@@ -361,7 +361,7 @@ _pause(void *data, const Eo_Event *event EINA_UNUSED)
 
    elm_layout_signal_emit(data, "elm,player,pause", "elm");
    elm_video_pause(sd->video);
-   eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_PAUSE_CLICKED, NULL));
+   eo_event_callback_call(data, ELM_PLAYER_EVENT_PAUSE_CLICKED, NULL);
 
    return EINA_TRUE;
 }
@@ -373,7 +373,7 @@ _play(void *data, const Eo_Event *event EINA_UNUSED)
 
    elm_layout_signal_emit(data, "elm,player,play", "elm");
    elm_video_play(sd->video);
-   eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_PLAY_CLICKED, NULL));
+   eo_event_callback_call(data, ELM_PLAYER_EVENT_PLAY_CLICKED, NULL);
 
    return EINA_TRUE;
 }
@@ -381,7 +381,7 @@ _play(void *data, const Eo_Event *event EINA_UNUSED)
 static Eina_Bool
 _prev(void *data, const Eo_Event *event EINA_UNUSED)
 {
-   eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_PREV_CLICKED, NULL));
+   eo_event_callback_call(data, ELM_PLAYER_EVENT_PREV_CLICKED, NULL);
    elm_layout_signal_emit(data, "elm,button,prev", "elm");
 
    return EINA_TRUE;
@@ -399,7 +399,7 @@ _rewind(void *data, const Eo_Event *event EINA_UNUSED)
    elm_video_play_position_set(sd->video, pos);
 
    elm_layout_signal_emit(data, "elm,button,rewind", "elm");
-   eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_REWIND_CLICKED, NULL));
+   eo_event_callback_call(data, ELM_PLAYER_EVENT_REWIND_CLICKED, NULL);
 
    return EINA_TRUE;
 }
@@ -408,7 +408,7 @@ static Eina_Bool
 _stop(void *data, const Eo_Event *event EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,stop", "elm");
-   eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL));
+   eo_event_callback_call(data, ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL);
 
    return EINA_TRUE;
 }
@@ -420,7 +420,7 @@ _eject(void *data, const Eo_Event *event EINA_UNUSED)
 
    elm_layout_signal_emit(data, "elm,button,eject", "elm");
    emotion_object_eject(elm_video_emotion_get(sd->video));
-   eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_EJECT_CLICKED, NULL));
+   eo_event_callback_call(data, ELM_PLAYER_EVENT_EJECT_CLICKED, NULL);
 
    return EINA_TRUE;
 }
@@ -447,7 +447,7 @@ _volume(void *data, const Eo_Event *event EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,volume", "elm");
    _mute_toggle(data);
-   eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_VOLUME_CLICKED, NULL));
+   eo_event_callback_call(data, ELM_PLAYER_EVENT_VOLUME_CLICKED, NULL);
 
    return EINA_TRUE;
 }
@@ -457,7 +457,7 @@ _mute(void *data, const Eo_Event *event EINA_UNUSED)
 {
    elm_layout_signal_emit(data, "elm,button,mute", "elm");
    _mute_toggle(data);
-   eo_do(data, eo_event_callback_call(ELM_PLAYER_EVENT_MUTE_CLICKED, NULL));
+   eo_event_callback_call(data, ELM_PLAYER_EVENT_MUTE_CLICKED, NULL);
 
    return EINA_TRUE;
 }
@@ -531,8 +531,8 @@ _player_button_add(Evas_Object *obj,
    snprintf(buf, sizeof(buf), "media_player/%s/%s", name,
             elm_widget_style_get(obj));
    elm_object_style_set(bt, buf);
-   eo_do(bt, eo_event_callback_add
-            (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,func, obj));
+   eo_event_callback_add
+            (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, func, obj);
    snprintf(buf, sizeof(buf), "elm.swallow.media_player.%s", name);
    if (!elm_layout_content_set(obj, buf, bt))
      {
@@ -585,13 +585,11 @@ _elm_player_elm_container_content_set(Eo *obj, Elm_Player_Data *sd, const char *
 
    if (part && strcmp(part, "video"))
      {
-        eo_do_super(obj, MY_CLASS,
-                    int_ret = elm_obj_container_content_set(part, content));
+        int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
         return int_ret;
      }
    if ((!part) || (!strcmp(part, "video"))) part = "elm.swallow.content";
-   eo_do_super(obj, MY_CLASS,
-               int_ret = elm_obj_container_content_set(part, content));
+   int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
 
    if (!_elm_video_check(content)) return EINA_FALSE;
    if (sd->video == content) goto end;
@@ -636,8 +634,7 @@ _elm_player_elm_container_content_set(Eo *obj, Elm_Player_Data *sd, const char *
      elm_layout_signal_emit(obj, "elm,player,play", "elm");
    else elm_layout_signal_emit(obj, "elm,player,pause", "elm");
 
-   eo_do(sd->emotion,
-         eo_event_callback_array_add(_emotion_cb(), obj));
+   eo_event_callback_array_add(sd->emotion, _emotion_cb(), obj);
 
    /* FIXME: track info from video */
 end:
@@ -649,7 +646,7 @@ _elm_player_evas_object_smart_add(Eo *obj, Elm_Player_Data *priv)
 {
    char buf[256];
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj)))
@@ -684,8 +681,7 @@ _elm_player_evas_object_smart_add(Eo *obj, Elm_Player_Data *priv)
      (priv->slider, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_layout_content_set(obj, "elm.swallow.media_player.positionslider",
                           priv->slider);
-   eo_do(priv->slider,
-         eo_event_callback_array_add(_slider_cb(), obj));
+   eo_event_callback_array_add(priv->slider, _slider_cb(), obj);
 
    priv->vslider = elm_slider_add(obj);
    elm_slider_indicator_show_set(priv->vslider, EINA_FALSE);
@@ -701,8 +697,8 @@ _elm_player_evas_object_smart_add(Eo *obj, Elm_Player_Data *priv)
      (priv->vslider, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_layout_content_set(obj, "elm.swallow.media_player.volumeslider",
                           priv->vslider);
-   eo_do(priv->vslider, eo_event_callback_add
-     (ELM_SLIDER_EVENT_CHANGED,_update_volume, obj));
+   eo_event_callback_add
+     (priv->vslider, ELM_SLIDER_EVENT_CHANGED, _update_volume, obj);
 
    elm_layout_sizing_eval(obj);
    elm_widget_can_focus_set(obj, EINA_TRUE);
@@ -711,7 +707,7 @@ _elm_player_evas_object_smart_add(Eo *obj, Elm_Player_Data *priv)
 EOLIAN static void
 _elm_player_evas_object_smart_del(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -725,11 +721,10 @@ elm_player_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_player_eo_base_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ANIMATION));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);
 
    return obj;
 }
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index 25805ff69..e2fd3cd1b 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -72,10 +72,10 @@ _elm_popup_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd)
    Eina_List *l;
 
    EINA_LIST_FOREACH(sd->items, l, it)
-      eo_do(EO_OBJ(it), elm_wdg_item_translate());
+      elm_wdg_item_translate(EO_OBJ(it));
 
-   eo_do_super(obj, MY_CLASS, elm_obj_widget_translate());
-   eo_do(sd->main_layout, elm_obj_widget_translate());
+   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
+   elm_obj_widget_translate(sd->main_layout);
 
    return EINA_TRUE;
 }
@@ -99,7 +99,7 @@ _visuals_set(Evas_Object *obj)
 static Eina_Bool
 _block_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
-   eo_do(data, eo_event_callback_call(ELM_POPUP_EVENT_BLOCK_CLICKED, NULL));
+   eo_event_callback_call(data, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL);
 
    return EINA_TRUE;
 }
@@ -108,7 +108,7 @@ static Eina_Bool
 _timeout_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
    evas_object_hide(data);
-   eo_do(data, eo_event_callback_call(ELM_POPUP_EVENT_TIMEOUT, NULL));
+   eo_event_callback_call(data, ELM_POPUP_EVENT_TIMEOUT, NULL);
 
    return EINA_TRUE;
 }
@@ -116,7 +116,7 @@ _timeout_cb(void *data, const Eo_Event *event EINA_UNUSED)
 static Eina_Bool
 _hide_effect_finished_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
-   eo_do(data, eo_event_callback_call(ELM_POPUP_EVENT_DISMISSED, NULL));
+   eo_event_callback_call(data, ELM_POPUP_EVENT_DISMISSED, NULL);
 
    return EINA_TRUE;
 }
@@ -206,7 +206,7 @@ _items_remove(Elm_Popup_Data *sd)
    if (!sd->items) return;
 
    EINA_LIST_FREE(sd->items, it)
-     eo_do(EO_OBJ(it), elm_wdg_item_del());
+     elm_wdg_item_del(EO_OBJ(it));
 
    sd->items = NULL;
 }
@@ -219,8 +219,7 @@ _elm_popup_evas_object_smart_del(Eo *obj, Elm_Popup_Data *sd)
    evas_object_event_callback_del_full(sd->parent, EVAS_CALLBACK_RESIZE, _parent_geom_cb, obj);
    evas_object_event_callback_del_full(sd->parent, EVAS_CALLBACK_MOVE, _parent_geom_cb, obj);
 
-   eo_do(sd->notify,
-         eo_event_callback_array_del(_notify_cb(), obj));
+   eo_event_callback_array_del(sd->notify, _notify_cb(), obj);
    evas_object_event_callback_del
      (sd->content, EVAS_CALLBACK_DEL, _on_content_del);
    evas_object_event_callback_del(obj, EVAS_CALLBACK_SHOW, _on_show);
@@ -255,7 +254,7 @@ _elm_popup_evas_object_smart_del(Eo *obj, Elm_Popup_Data *sd)
    ELM_SAFE_FREE(sd->content, evas_object_del);
    ELM_SAFE_FREE(sd->title_text, eina_stringshare_del);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 static void
@@ -489,7 +488,7 @@ _elm_popup_elm_widget_sub_object_del(Eo *obj, Elm_Popup_Data *sd, Evas_Object *s
    Elm_Popup_Item_Data *it;
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(sobj));
+   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if (sobj == sd->title_icon)
@@ -501,7 +500,7 @@ _elm_popup_elm_widget_sub_object_del(Eo *obj, Elm_Popup_Data *sd, Evas_Object *s
      {
         if (sobj == it->icon)
           {
-             eo_do(VIEW(it), elm_obj_container_content_unset(CONTENT_PART));
+             elm_obj_container_content_unset(VIEW(it), CONTENT_PART);
              elm_layout_signal_emit(VIEW(it),
                                     "elm,state,item,icon,hidden", "elm");
              it->icon = NULL;
@@ -646,8 +645,8 @@ _create_scroller(Evas_Object *obj)
                                   _on_table_del, obj);
    if (!sd->scroll)
      {
-        eo_do(sd->content_area, elm_obj_container_content_set(CONTENT_PART, sd->tbl));
-        eo_do(sd->main_layout, elm_obj_container_content_set(CONTENT_PART, sd->content_area));
+        elm_obj_container_content_set(sd->content_area, CONTENT_PART, sd->tbl);
+        elm_obj_container_content_set(sd->main_layout, CONTENT_PART, sd->content_area);
      }
 
    //spacer
@@ -763,7 +762,7 @@ _item_icon_set(Elm_Popup_Item_Data *it,
      {
         elm_widget_sub_object_add(WIDGET(it), it->icon);
         evas_object_data_set(it->icon, "_popup_icon_parent_item", it);
-        eo_do(VIEW(it), elm_obj_container_content_set(CONTENT_PART, it->icon));
+        elm_obj_container_content_set(VIEW(it), CONTENT_PART, it->icon);
         elm_layout_signal_emit(VIEW(it), "elm,state,item,icon,visible", "elm");
      }
    else
@@ -807,7 +806,7 @@ _item_icon_unset(Elm_Popup_Item_Data *it)
    if (!it->icon) return NULL;
    elm_widget_sub_object_del(WIDGET(it), icon);
    evas_object_data_del(icon, "_popup_icon_parent_item");
-   eo_do(VIEW(it), elm_obj_container_content_unset(CONTENT_PART));
+   elm_obj_container_content_unset(VIEW(it), CONTENT_PART);
    elm_layout_signal_emit(VIEW(it), "elm,state,item,icon,hidden", "elm");
    it->icon = NULL;
 
@@ -836,7 +835,7 @@ _elm_popup_item_elm_widget_item_disable(Eo *eo_it, Elm_Popup_Item_Data *it)
    Eina_Bool tmp;
    ELM_POPUP_ITEM_CHECK_OR_RETURN(it);
 
-   if (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get()))
+   if (elm_wdg_item_disabled_get(eo_it))
      elm_layout_signal_emit(VIEW(it), "elm,state,item,disabled", "elm");
    else
      elm_layout_signal_emit(VIEW(it), "elm,state,item,enabled", "elm");
@@ -856,7 +855,7 @@ _elm_popup_item_eo_base_destructor(Eo *eo_it, Elm_Popup_Item_Data *it)
         sd->items = NULL;
         _list_del(sd);
      }
-   eo_do_super(eo_it, ELM_POPUP_ITEM_CLASS, eo_destructor());
+   eo_destructor(eo_super(eo_it, ELM_POPUP_ITEM_CLASS));
 }
 
 EOLIAN static void
@@ -872,7 +871,7 @@ _item_focused_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Elm_Popup_Item_Data *it = data;
 
-   eo_do(WIDGET(it), eo_event_callback_call(ELM_POPUP_EVENT_ITEM_FOCUSED, EO_OBJ(it)));
+   eo_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_FOCUSED, EO_OBJ(it));
 
    return EINA_TRUE;
 }
@@ -882,7 +881,7 @@ _item_unfocused_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Elm_Popup_Item_Data *it = data;
 
-   eo_do(WIDGET(it), eo_event_callback_call(ELM_POPUP_EVENT_ITEM_UNFOCUSED, EO_OBJ(it)));
+   eo_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_UNFOCUSED, EO_OBJ(it));
 
    return EINA_TRUE;
 }
@@ -890,7 +889,7 @@ _item_unfocused_cb(void *data, const Eo_Event *event EINA_UNUSED)
 EOLIAN static Eo *
 _elm_popup_item_eo_base_constructor(Eo *eo_it, Elm_Popup_Item_Data *it)
 {
-   eo_it = eo_do_super_ret(eo_it, ELM_POPUP_ITEM_CLASS, eo_it, eo_constructor());
+   eo_it = eo_constructor(eo_super(eo_it, ELM_POPUP_ITEM_CLASS));
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
 
    return eo_it;
@@ -912,10 +911,10 @@ _item_new(Elm_Popup_Item_Data *it)
         elm_layout_signal_callback_add(VIEW(it), "elm,action,click", "*",
                                        _item_select_cb, it);
         evas_object_size_hint_align_set(VIEW(it), EVAS_HINT_FILL, EVAS_HINT_FILL);
-        eo_do(VIEW(it), eo_event_callback_add
-              (ELM_WIDGET_EVENT_FOCUSED, _item_focused_cb, it));
-        eo_do(VIEW(it), eo_event_callback_add
-              (ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, it));
+        eo_event_callback_add
+              (VIEW(it), ELM_WIDGET_EVENT_FOCUSED, _item_focused_cb, it);
+        eo_event_callback_add
+              (VIEW(it), ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, it);
         evas_object_show(VIEW(it));
      }
 }
@@ -980,7 +979,7 @@ _content_text_set(Evas_Object *obj,
    else
      {
         if (!sd->scroll)
-          eo_do(sd->main_layout, elm_obj_container_content_set(CONTENT_PART, sd->content_area));
+          elm_obj_container_content_set(sd->main_layout, CONTENT_PART, sd->content_area);
         else
           elm_object_content_set(sd->scr, sd->content_area);
      }
@@ -988,7 +987,7 @@ _content_text_set(Evas_Object *obj,
 
    if (sd->text_content_obj)
      {
-        eo_do(sd->content_area, sd->text_content_obj = elm_obj_container_content_unset(CONTENT_PART));
+        sd->text_content_obj = elm_obj_container_content_unset(sd->content_area, CONTENT_PART);
         evas_object_del(sd->text_content_obj);
         sd->text_content_obj = NULL;
      }
@@ -1006,8 +1005,8 @@ _content_text_set(Evas_Object *obj,
      (sd->text_content_obj, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set
      (sd->text_content_obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   eo_do(sd->content_area, elm_obj_container_content_set
-     (CONTENT_PART, sd->text_content_obj));
+   elm_obj_container_content_set
+     (sd->content_area, CONTENT_PART, sd->text_content_obj);
 
    /* access */
    if (_elm_config->access_mode)
@@ -1095,8 +1094,8 @@ _title_icon_set(Evas_Object *obj,
    sd->title_icon = icon;
    title_visibility_current = (sd->title_text) || (sd->title_icon);
 
-   eo_do(sd->main_layout, elm_obj_container_content_set
-      ("elm.swallow.title.icon", sd->title_icon));
+   elm_obj_container_content_set
+      (sd->main_layout, "elm.swallow.title.icon", sd->title_icon);
 
    if (sd->title_icon)
      elm_layout_signal_emit(sd->main_layout, "elm,state,title,icon,visible", "elm");
@@ -1122,13 +1121,13 @@ _content_set(Evas_Object *obj,
    if (content)
      {
         if (!sd->scroll)
-          eo_do(sd->main_layout, elm_obj_container_content_set
-                (CONTENT_PART, sd->content_area));
+          elm_obj_container_content_set
+                (sd->main_layout, CONTENT_PART, sd->content_area);
         else
           elm_object_content_set(sd->scr, sd->content_area);
 
-        eo_do(sd->content_area, elm_obj_container_content_set
-          (CONTENT_PART, content));
+        elm_obj_container_content_set
+          (sd->content_area, CONTENT_PART, content);
 
         evas_object_event_callback_add
           (content, EVAS_CALLBACK_DEL, _on_content_del, obj);
@@ -1184,8 +1183,8 @@ _action_button_set(Evas_Object *obj,
         evas_object_event_callback_add
           (sd->action_area, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
            _size_hints_changed_cb, sd->main_layout);
-        eo_do(sd->main_layout, elm_obj_container_content_set
-          ("elm.swallow.action_area", sd->action_area));
+        elm_obj_container_content_set
+          (sd->main_layout, "elm.swallow.action_area", sd->action_area);
 
         _visuals_set(obj);
      }
@@ -1223,7 +1222,7 @@ _elm_popup_elm_container_content_set(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, c
         _action_button_set(obj, content, i);
      }
    else
-     ret = eo_do_ret(_pd->main_layout, tmp, elm_obj_container_content_set(part, content));
+     ret = elm_obj_container_content_set(_pd->main_layout, part, content);
 
    _scroller_size_calc(obj);
    elm_layout_sizing_eval(obj);
@@ -1278,7 +1277,7 @@ _elm_popup_elm_container_content_get(Eo *obj, Elm_Popup_Data *_pd, const char *p
         content = _action_button_get(obj, i);
      }
    else
-      eo_do(_pd->main_layout, content = elm_obj_container_content_get(part));
+      content = elm_obj_container_content_get(_pd->main_layout, part);
 
    if (!content)
      goto err;
@@ -1302,7 +1301,7 @@ _content_unset(Evas_Object *obj)
    evas_object_event_callback_del
      (sd->content, EVAS_CALLBACK_DEL, _on_content_del);
 
-   eo_do(sd->content_area, content = elm_obj_container_content_unset(CONTENT_PART));
+   content = elm_obj_container_content_unset(sd->content_area, CONTENT_PART);
    sd->content = NULL;
 
    elm_layout_sizing_eval(obj);
@@ -1320,7 +1319,7 @@ _title_icon_unset(Evas_Object *obj)
    if (!sd->title_icon) return NULL;
 
    icon = sd->title_icon;
-   eo_do(sd->main_layout, elm_obj_container_content_unset("elm.swallow.title.icon"));
+   elm_obj_container_content_unset(sd->main_layout, "elm.swallow.title.icon");
    sd->title_icon = NULL;
 
    return icon;
@@ -1382,7 +1381,7 @@ _elm_popup_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, Elm_Fo
         if (ao) items = eina_list_append(items, ao);
      }
 
-   eo_do(sd->main_layout, base_items = elm_obj_container_content_swallow_list_get());
+   base_items = elm_obj_container_content_swallow_list_get(sd->main_layout);
 
    items = eina_list_merge(items, base_items);
 
@@ -1419,7 +1418,7 @@ _elm_popup_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, c
         if (ao) items = eina_list_append(items, ao);
      }
 
-   eo_do(sd->main_layout, base_items = elm_obj_container_content_swallow_list_get());
+   base_items = elm_obj_container_content_swallow_list_get(sd->main_layout);
 
    items = eina_list_merge(items, base_items);
 
@@ -1475,7 +1474,7 @@ _elm_popup_evas_object_smart_add(Eo *obj, Elm_Popup_Data *priv)
 {
    char style[1024];
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj));
@@ -1520,8 +1519,7 @@ _elm_popup_evas_object_smart_add(Eo *obj, Elm_Popup_Data *priv)
          _size_hints_changed_cb, priv->main_layout);
 
    priv->content_text_wrap_type = ELM_WRAP_MIXED;
-   eo_do(priv->notify,
-         eo_event_callback_array_add(_notify_cb(), obj));
+   eo_event_callback_array_add(priv->notify, _notify_cb(), obj);
 
    elm_widget_can_focus_set(obj, EINA_TRUE);
    elm_widget_can_focus_set(priv->main_layout, EINA_TRUE);
@@ -1589,11 +1587,10 @@ elm_popup_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_popup_eo_base_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_NOTIFICATION));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION);
 
    return obj;
 }
@@ -1762,8 +1759,8 @@ _elm_popup_item_append(Eo *obj, Elm_Popup_Data *sd, const char *label, Evas_Obje
    ELM_POPUP_ITEM_DATA_GET(eo_it, it);
    if (sd->content || sd->text_content_obj)
      {
-        eo_do(sd->content_area, prev_content =
-                             elm_obj_container_content_get(CONTENT_PART));
+        prev_content =
+                             elm_obj_container_content_get(sd->content_area, CONTENT_PART);
         evas_object_del(prev_content);
      }
 
@@ -1805,14 +1802,14 @@ _elm_popup_scrollable_set(Eo *obj, Elm_Popup_Data *pd, Eina_Bool scroll)
 
    if (!pd->scroll)
      {
-        eo_do(pd->content_area, elm_obj_container_content_set(CONTENT_PART, pd->tbl));
-        eo_do(pd->main_layout, elm_obj_container_content_set(CONTENT_PART, pd->content_area));
+        elm_obj_container_content_set(pd->content_area, CONTENT_PART, pd->tbl);
+        elm_obj_container_content_set(pd->main_layout, CONTENT_PART, pd->content_area);
         if (pd->theme_scroll)
           elm_layout_signal_emit(pd->content_area, "elm,scroll,disable", "elm");
      }
    else
      {
-        eo_do(pd->main_layout, elm_obj_container_content_set(CONTENT_PART, pd->tbl));
+        elm_obj_container_content_set(pd->main_layout, CONTENT_PART, pd->tbl);
         if (pd->theme_scroll)
           elm_layout_signal_emit(pd->content_area, "elm,scroll,enable", "elm");
      }
@@ -1843,7 +1840,7 @@ _elm_popup_class_constructor(Eo_Class *klass)
 static Eina_Bool
 _action_dismiss(Evas_Object *obj, const char *params EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_POPUP_EVENT_BLOCK_CLICKED, NULL));
+   eo_event_callback_call(obj, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL);
    return EINA_TRUE;
 }
 
@@ -1861,7 +1858,7 @@ EOLIAN static Elm_Atspi_State_Set
 _elm_popup_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Popup_Data *sd EINA_UNUSED)
 {
    Elm_Atspi_State_Set ret;
-   eo_do_super(obj, MY_CLASS, ret = elm_interface_atspi_accessible_state_set_get());
+   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, MY_CLASS));
 
    STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MODAL);
 
diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c
index 47f87b6fd..b23853710 100644
--- a/src/lib/elm_access.c
+++ b/src/lib/elm_access.c
@@ -37,7 +37,7 @@ static void _access_object_unregister(Evas_Object *obj);
 EOLIAN static void
 _elm_access_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 }
 
@@ -1241,9 +1241,8 @@ _elm_access_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_access_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
 
    return obj;
 }
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 3f1dbc19c..7e609e6c9 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -115,7 +115,7 @@ _elm_actionslider_elm_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA
 
    mirrored = elm_object_mirrored_get(obj);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    if (elm_object_mirrored_get(obj) != mirrored)
@@ -154,16 +154,14 @@ _drag_button_move_cb(void *data,
    edje_object_part_drag_value_get
      (wd->resize_obj, "elm.drag_button_base", &pos, NULL);
    if (pos == 0.0)
-     eo_do(obj, eo_event_callback_call
-       (ELM_ACTIONSLIDER_EVENT_POS_CHANGED,
-       !elm_widget_mirrored_get(obj) ? "left" : "right"));
+     eo_event_callback_call
+       (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, !elm_widget_mirrored_get(obj) ? "left" : "right");
    else if (pos == 1.0)
-     eo_do(obj, eo_event_callback_call
-       (ELM_ACTIONSLIDER_EVENT_POS_CHANGED,
-      !elm_widget_mirrored_get(obj) ? "right" : "left"));
+     eo_event_callback_call
+       (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, !elm_widget_mirrored_get(obj) ? "right" : "left");
    else if (pos >= 0.45 && pos <= 0.55)
-     eo_do(obj, eo_event_callback_call
-       (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center"));
+     eo_event_callback_call
+       (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center");
 }
 
 static void
@@ -233,16 +231,16 @@ _button_animator(void *data)
 
         if ((!sd->final_position) &&
             (sd->enabled_position & ELM_ACTIONSLIDER_LEFT))
-          eo_do(obj, eo_event_callback_call
-            (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)left));
+          eo_event_callback_call
+            (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)left);
         else if ((sd->final_position == 0.5) &&
                  (sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
-          eo_do(obj, eo_event_callback_call
-            (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)center));
+          eo_event_callback_call
+            (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)center);
         else if ((sd->final_position == 1) &&
                  (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
-          eo_do(obj, eo_event_callback_call
-            (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)right));
+          eo_event_callback_call
+            (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)right);
 
         sd->button_animator = NULL;
 
@@ -279,8 +277,8 @@ _drag_button_up_cb(void *data,
         (elm_widget_mirrored_get(obj) && position == 1.0)))
      {
         sd->final_position = 0;
-        eo_do(obj, eo_event_callback_call
-          (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)left));
+        eo_event_callback_call
+          (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)left);
 
         return;
      }
@@ -289,8 +287,8 @@ _drag_button_up_cb(void *data,
        (sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
      {
         sd->final_position = 0.5;
-        eo_do(obj, eo_event_callback_call
-          (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)center));
+        eo_event_callback_call
+          (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)center);
 
         ecore_animator_del(sd->button_animator);
         sd->button_animator = ecore_animator_add(_button_animator, obj);
@@ -303,8 +301,8 @@ _drag_button_up_cb(void *data,
         (elm_widget_mirrored_get(obj) && position == 0.0)))
      {
         sd->final_position = 1;
-        eo_do(obj, eo_event_callback_call
-          (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)right));
+        eo_event_callback_call
+          (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)right);
         return;
      }
 
@@ -373,22 +371,22 @@ _track_move_cb(void *data,
           {
              if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)
                {
-                  eo_do(obj, eo_event_callback_call
-                    (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center"));
+                  eo_event_callback_call
+                    (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center");
                   sd->final_position = 0.5;
                }
              else if (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT)
                {
-                  eo_do(obj, eo_event_callback_call
-                    (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "right"));
+                  eo_event_callback_call
+                    (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "right");
                   sd->final_position = 1.0;
                }
           }
         else if ((sd->final_position == 0.5) &&
                  (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
           {
-             eo_do(obj, eo_event_callback_call
-               (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "right"));
+             eo_event_callback_call
+               (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "right");
              sd->final_position = 1.0;
           }
      }
@@ -396,8 +394,8 @@ _track_move_cb(void *data,
      {
         if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)
           {
-             eo_do(obj, eo_event_callback_call
-               (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center"));
+             eo_event_callback_call
+               (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center");
              sd->final_position = 0.5;
           }
      }
@@ -407,22 +405,22 @@ _track_move_cb(void *data,
           {
              if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)
                {
-                  eo_do(obj, eo_event_callback_call
-                    (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center"));
+                  eo_event_callback_call
+                    (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center");
                   sd->final_position = 0.5;
                }
              else if (sd->enabled_position & ELM_ACTIONSLIDER_LEFT)
                {
-                  eo_do(obj, eo_event_callback_call
-                    (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "left"));
+                  eo_event_callback_call
+                    (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "left");
                   sd->final_position = 0.0;
                }
           }
         else if (sd->final_position == 0.5 &&
                 (sd->enabled_position & ELM_ACTIONSLIDER_LEFT))
           {
-             eo_do(obj, eo_event_callback_call
-               (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "left"));
+             eo_event_callback_call
+               (obj, ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "left");
              sd->final_position = 0.0;
           }
      }
@@ -453,7 +451,7 @@ _elm_actionslider_elm_layout_text_set(Eo *obj, Elm_Actionslider_Data *_pd EINA_U
    Eina_Bool int_ret = EINA_FALSE;
 
    _mirrored_part_fix(obj, &part);
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_layout_text_set(part, text));
+   int_ret = elm_obj_layout_text_set(eo_super(obj, MY_CLASS), part, text);
 
    return int_ret;
 }
@@ -465,7 +463,7 @@ _elm_actionslider_elm_layout_text_get(Eo *obj, Elm_Actionslider_Data *_pd EINA_U
 
    _mirrored_part_fix(obj, &part);
 
-   eo_do_super(obj, MY_CLASS, text = elm_obj_layout_text_get(part));
+   text = elm_obj_layout_text_get(eo_super(obj, MY_CLASS), part);
 
    return text;
 }
@@ -475,7 +473,7 @@ _elm_actionslider_evas_object_smart_add(Eo *obj, Elm_Actionslider_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->enabled_position = ELM_ACTIONSLIDER_ALL;
@@ -540,11 +538,10 @@ elm_actionslider_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_actionslider_eo_base_constructor(Eo *obj, Elm_Actionslider_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SLIDER));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER);
 
    return obj;
 }
diff --git a/src/lib/elm_app_client.c b/src/lib/elm_app_client.c
index 5c4bd31ca..ba6513d6d 100644
--- a/src/lib/elm_app_client.c
+++ b/src/lib/elm_app_client.c
@@ -37,11 +37,10 @@ _sub_path_process(Elm_App_Client *eo, Eldbus_Message_Iter *obj_iter, Elm_App_Cli
         if (view)
           continue;
 
-        view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo,
-                             elm_app_client_view_path_set(obj_path));
+        view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(eoid, obj_path));
         eina_hash_add(data->views, obj_path, view);
         if (!loading_list)
-          eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_EVENT_VIEW_CREATED, view));
+          eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
      }
 }
 
@@ -60,8 +59,7 @@ _objects_get(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA
    while (eldbus_message_iter_get_and_next(array_path, '{', &path))
      _sub_path_process(eo, path, cdata, EINA_TRUE);
 
-   eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED,
-                                    NULL));
+   eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, NULL);
 }
 
 static void _iface_add(void *data, const Eldbus_Message *msg)
@@ -96,7 +94,7 @@ _iface_del(void *data, const Eldbus_Message *msg)
         if (!view)
           continue;
 
-        eo_do(view, view_state = elm_app_client_view_state_get());
+        view_state = elm_app_client_view_state_get(view);
         if (view_state != ELM_APP_VIEW_STATE_CLOSED)
           {
              elm_app_client_view_internal_state_set(view,
@@ -105,8 +103,7 @@ _iface_del(void *data, const Eldbus_Message *msg)
           }
 
         eina_hash_del(cdata->views, path, NULL);
-        eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_EVENT_VIEW_DELETED,
-                                         view));
+        eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_DELETED, view);
         eo_del(view);
      }
 }
@@ -137,8 +134,8 @@ _pkg_name_owner_changed_cb(void *data, const char *bus EINA_UNUSED, const char *
         Elm_App_View_State view_state = ELM_APP_VIEW_STATE_UNKNOWN;
         const char *path = NULL;
 
-        eo_do(view, view_state = elm_app_client_view_state_get(),
-              path = elm_app_client_view_path_get());
+        view_state = elm_app_client_view_state_get(view);
+        path = elm_app_client_view_path_get(view);
         if (view_state != ELM_APP_VIEW_STATE_CLOSED)
           {
              elm_app_client_view_internal_state_set(view,
@@ -147,8 +144,7 @@ _pkg_name_owner_changed_cb(void *data, const char *bus EINA_UNUSED, const char *
           }
 
         eina_hash_del(cdata->views, path, NULL);
-        eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_EVENT_VIEW_DELETED,
-                                         view));
+        eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_DELETED, view);
         eo_del(view);
      }
 }
@@ -215,11 +211,9 @@ _create_view_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
    view = eina_hash_find(cdata->views, view_path);
    if (!view)
      {
-        view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo,
-                             elm_app_client_view_path_set(view_path));
+        view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(eoid, view_path));
         eina_hash_add(cdata->views, view_path, view);
-        eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_EVENT_VIEW_CREATED,
-                                         view));
+        eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
      }
 
    if (!view)
@@ -306,7 +300,7 @@ _elm_app_client_eo_base_finalize(Eo *obj, Elm_App_Client_Data *data)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(data->views, NULL);
 
-   return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+   return eo_finalize(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -332,7 +326,7 @@ _elm_app_client_eo_base_destructor(Eo *eo, Elm_App_Client_Data *data)
    eldbus_connection_unref(conn);
    eldbus_shutdown();
 
-   eo_do_super(eo, MY_CLASS, eo_destructor());
+   eo_destructor(eo_super(eo, MY_CLASS));
 }
 
 #include "elm_app_client.eo.c"
diff --git a/src/lib/elm_app_server.c b/src/lib/elm_app_server.c
index 99aecc1b6..a7483f938 100644
--- a/src/lib/elm_app_server.c
+++ b/src/lib/elm_app_server.c
@@ -41,7 +41,7 @@ _view_append(Elm_App_Server_Data *data, Elm_App_Server_View *view)
 {
    Eina_Stringshare *view_id = NULL;
 
-   eo_do(view, view_id = elm_app_server_view_id_get());
+   view_id = elm_app_server_view_id_get(view);
 
    if (eina_hash_find(data->views, view_id))
      {
@@ -51,7 +51,7 @@ _view_append(Elm_App_Server_Data *data, Elm_App_Server_View *view)
      }
 
    eina_hash_add(data->views, view_id, view);
-   eo_do(view, eo_event_callback_add(EO_BASE_EVENT_DEL, _view_del_cb, data));
+   eo_event_callback_add(view, EO_BASE_EVENT_DEL, _view_del_cb, data);
    return EINA_TRUE;
 }
 
@@ -87,7 +87,7 @@ _method_create_view(const Eldbus_Service_Interface *iface, const Eldbus_Message
                                          NULL);
         return reply;
      }
-   eo_do(view, view_path = elm_app_server_view_path_get());
+   view_path = elm_app_server_view_path_get(view);
 
    reply = eldbus_message_method_return_new(message);
    eldbus_message_arguments_append(reply, "o", view_path);
@@ -112,7 +112,7 @@ _close_all_views(Elm_App_Server_Data *data)
    eina_iterator_free(iter);
 
    EINA_LIST_FREE(view_list, view)
-     eo_do(view, elm_app_server_view_close());
+     elm_app_server_view_close(view);
 }
 
 static Eldbus_Message *
@@ -131,7 +131,7 @@ _method_terminate(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbu
 {
    Eo *eo = eldbus_service_object_data_get(iface, MY_CLASS_NAME);
 
-   eo_do(eo, eo_event_callback_call(ELM_APP_SERVER_EVENT_TERMINATE, NULL));
+   eo_event_callback_call(eo, ELM_APP_SERVER_EVENT_TERMINATE, NULL);
 
    return eldbus_message_method_return_new(message);
 }
@@ -255,17 +255,16 @@ _elm_app_server_constructor(Eo *obj, Elm_App_Server_Data *data, const char *pkg,
              new_events = elm_app_server_view_props_new_events_get(view_eet_props);
              progress = elm_app_server_view_props_progress_get(view_eet_props);
 
-             view = eo_add(ELM_APP_SERVER_VIEW_CLASS, obj,
-                                  elm_app_server_view_id_set(view_id));
+             view = eo_add(ELM_APP_SERVER_VIEW_CLASS, obj, elm_app_server_view_id_set(eoid, view_id));
              if (!view)
                continue;
 
-             eo_do(view, elm_app_server_view_title_set(title),
-                   elm_app_server_view_icon_set(icon_name),
-                   elm_app_server_view_progress_set(progress),
-                   elm_app_server_view_new_events_set(new_events),
-                   eo_event_callback_add(EO_BASE_EVENT_DEL, _view_del_cb, data),
-                   elm_app_server_view_shallow());
+             elm_app_server_view_title_set(view, title);
+             elm_app_server_view_icon_set(view, icon_name);
+             elm_app_server_view_progress_set(view, progress);
+             elm_app_server_view_new_events_set(view, new_events);
+             eo_event_callback_add(view, EO_BASE_EVENT_DEL, _view_del_cb, data);
+             elm_app_server_view_shallow(view);
 
              eina_hash_add(data->views, view_id, view);
           }
@@ -301,12 +300,12 @@ _elm_app_server_save(Eo *obj EINA_UNUSED, Elm_App_Server_Data *data)
         int new_events = 0;
         short progress = 0;
 
-        eo_do(view, id = elm_app_server_view_id_get(),
-              title = elm_app_server_view_title_get(),
-              icon_name = elm_app_server_view_icon_get(),
-              new_events = elm_app_server_view_new_events_get(),
-              progress = elm_app_server_view_progress_get(),
-              eo_event_callback_call(ELM_APP_SERVER_VIEW_EVENT_SAVE, NULL));
+        id = elm_app_server_view_id_get(view);
+        title = elm_app_server_view_title_get(view);
+        icon_name = elm_app_server_view_icon_get(view);
+        new_events = elm_app_server_view_new_events_get(view);
+        progress = elm_app_server_view_progress_get(view);
+        eo_event_callback_call(view, ELM_APP_SERVER_VIEW_EVENT_SAVE, NULL);
 
         view_props = elm_app_server_view_props_new(id, title, icon_name,
                                                    new_events, progress);
@@ -421,7 +420,7 @@ _elm_app_server_eo_base_finalize(Eo *obj, Elm_App_Server_Data *data)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(data->pkg, NULL);
 
-   return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+   return eo_finalize(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -434,7 +433,7 @@ _elm_app_server_eo_base_destructor(Eo *obj, Elm_App_Server_Data *data)
    EINA_ITERATOR_FOREACH(iter, view)
      {
         //do not modify hash when iterating
-        eo_do(view, eo_event_callback_del(EO_BASE_EVENT_DEL, _view_del_cb, data));
+        eo_event_callback_del(view, EO_BASE_EVENT_DEL, _view_del_cb, data);
         eo_del(view);
      }
    eina_iterator_free(iter);
@@ -448,7 +447,7 @@ _elm_app_server_eo_base_destructor(Eo *obj, Elm_App_Server_Data *data)
    eldbus_service_interface_unregister(data->iface);
    eldbus_connection_unref(data->conn);
    eldbus_shutdown();
-   eo_do_super(obj, MY_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, MY_CLASS));
 }
 
 #include "elm_app_server.eo.c"
diff --git a/src/lib/elm_atspi_app_object.c b/src/lib/elm_atspi_app_object.c
index 11d5bb2f5..33abe5f47 100644
--- a/src/lib/elm_atspi_app_object.c
+++ b/src/lib/elm_atspi_app_object.c
@@ -22,7 +22,7 @@ _elm_atspi_app_object_eo_base_destructor(Eo *obj EINA_UNUSED, Elm_Atspi_App_Obje
 {
    if (_pd->descr) eina_stringshare_del(_pd->descr);
 
-   eo_do_super(obj, ELM_ATSPI_APP_OBJECT_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, ELM_ATSPI_APP_OBJECT_CLASS));
 }
 
 EOLIAN static Eina_List*
@@ -36,7 +36,7 @@ _elm_atspi_app_object_elm_interface_atspi_accessible_children_get(Eo *obj EINA_U
         Elm_Atspi_Type type;
         if (!eo_isa(win, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
           continue;
-        eo_do(win, type = elm_interface_atspi_accessible_type_get());
+        type = elm_interface_atspi_accessible_type_get(win);
         if (type == ELM_ATSPI_TYPE_REGULAR)
           accs = eina_list_append(accs, win);
      }
diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c
index 7a5267de5..3709b9c26 100644
--- a/src/lib/elm_atspi_bridge.c
+++ b/src/lib/elm_atspi_bridge.c
@@ -485,7 +485,7 @@ _accessible_get_role(const Eldbus_Service_Interface *iface, const Eldbus_Message
 
    ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg);
 
-   eo_do(obj, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(obj);
 
    Eldbus_Message *ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -504,7 +504,7 @@ _accessible_get_role_name(const Eldbus_Service_Interface *iface, const Eldbus_Me
 
    ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg);
 
-   eo_do(obj, role_name = elm_interface_atspi_accessible_role_name_get());
+   role_name = elm_interface_atspi_accessible_role_name_get(obj);
 
    Eldbus_Message *ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -522,7 +522,7 @@ _accessible_get_localized_role_name(const Eldbus_Service_Interface *iface, const
 
    ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg);
 
-   eo_do(obj, l_role_name = elm_interface_atspi_accessible_localized_role_name_get());
+   l_role_name = elm_interface_atspi_accessible_localized_role_name_get(obj);
    EINA_SAFETY_ON_NULL_RETURN_VAL(l_role_name, NULL);
 
    Eldbus_Message *ret = eldbus_message_method_return_new(msg);
@@ -545,7 +545,7 @@ _accessible_get_children(const Eldbus_Service_Interface *iface, const Eldbus_Mes
 
    ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg);
 
-   eo_do(obj, children_list = elm_interface_atspi_accessible_children_get());
+   children_list = elm_interface_atspi_accessible_children_get(obj);
 
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -584,7 +584,7 @@ _accessible_get_application(const Eldbus_Service_Interface *iface, const Eldbus_
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
    Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret);
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, root = elm_interface_atspi_accessible_root_get());
+   root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN);
    _bridge_iter_object_reference_append(bridge, iter, root);
 
    return ret;
@@ -607,7 +607,7 @@ _accessible_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_M
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, attrs = elm_interface_atspi_accessible_attributes_get());
+   attrs = elm_interface_atspi_accessible_attributes_get(obj);
 
    iter = eldbus_message_iter_get(ret);
    iter_dict = eldbus_message_iter_container_new(iter, 'a', "{ss}");
@@ -715,7 +715,7 @@ _accessible_get_state(const Eldbus_Service_Interface *iface, const Eldbus_Messag
    iter_array = eldbus_message_iter_container_new(iter, 'a', "u");
    EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
 
-   eo_do(obj, states = elm_interface_atspi_accessible_state_set_get());
+   states = elm_interface_atspi_accessible_state_set_get(obj);
 
    atspi_states = _elm_atspi_state_set_to_atspi_state_set(states);
 
@@ -747,7 +747,7 @@ _accessible_get_index_in_parent(const Eldbus_Service_Interface *iface EINA_UNUSE
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, idx = elm_interface_atspi_accessible_index_in_parent_get());
+   idx = elm_interface_atspi_accessible_index_in_parent_get(obj);
 
    eldbus_message_arguments_append(ret, "i", idx);
 
@@ -775,7 +775,7 @@ _accessible_child_at_index(const Eldbus_Service_Interface *iface EINA_UNUSED, co
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
    iter = eldbus_message_iter_get(ret);
-   eo_do(obj, children = elm_interface_atspi_accessible_children_get());
+   children = elm_interface_atspi_accessible_children_get(obj);
 
    child = eina_list_nth(children, idx);
    _bridge_iter_object_reference_append(bridge, iter, child);
@@ -806,7 +806,7 @@ _accessible_get_relation_set(const Eldbus_Service_Interface *iface EINA_UNUSED,
    iter_array = eldbus_message_iter_container_new(iter, 'a', "(ua(so))");
    EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
 
-   eo_do(obj, rels = elm_interface_atspi_accessible_relation_set_get());
+   rels = elm_interface_atspi_accessible_relation_set_get(obj);
 
    EINA_LIST_FOREACH(rels, l, rel)
      {
@@ -867,7 +867,7 @@ _selection_selected_child_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
    iter = eldbus_message_iter_get(ret);
-   eo_do(obj, child = elm_interface_atspi_selection_selected_child_get(idx));
+   child = elm_interface_atspi_selection_selected_child_get(obj, idx);
 
    _bridge_iter_object_reference_append(bridge, iter, child);
    _bridge_object_register(bridge, child);
@@ -893,7 +893,7 @@ _selection_child_select(const Eldbus_Service_Interface *iface, const Eldbus_Mess
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, result = elm_interface_atspi_selection_child_select(idx));
+   result = elm_interface_atspi_selection_child_select(obj, idx);
    eldbus_message_arguments_append(ret, "b", result);
 
    return ret;
@@ -917,7 +917,7 @@ _selection_selected_child_deselect(const Eldbus_Service_Interface *iface, const
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, result = elm_interface_atspi_selection_selected_child_deselect(idx));
+   result = elm_interface_atspi_selection_selected_child_deselect(obj, idx);
    eldbus_message_arguments_append(ret, "b", result);
 
    return ret;
@@ -941,7 +941,7 @@ _selection_is_child_selected(const Eldbus_Service_Interface *iface, const Eldbus
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, result = elm_interface_atspi_selection_is_child_selected(idx));
+   result = elm_interface_atspi_selection_is_child_selected(obj, idx);
    eldbus_message_arguments_append(ret, "b", result);
 
    return ret;
@@ -961,7 +961,7 @@ _selection_all_children_select(const Eldbus_Service_Interface *iface, const Eldb
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, result = elm_interface_atspi_selection_all_children_select());
+   result = elm_interface_atspi_selection_all_children_select(obj);
    eldbus_message_arguments_append(ret, "b", result);
 
    return ret;
@@ -981,7 +981,7 @@ _selection_clear(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, result = elm_interface_atspi_selection_clear());
+   result = elm_interface_atspi_selection_clear(obj);
    eldbus_message_arguments_append(ret, "b", result);
 
    return ret;
@@ -1005,7 +1005,7 @@ _selection_child_deselect(const Eldbus_Service_Interface *iface, const Eldbus_Me
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, result = elm_interface_atspi_selection_child_deselect(idx));
+   result = elm_interface_atspi_selection_child_deselect(obj, idx);
    eldbus_message_arguments_append(ret, "b", result);
 
    return ret;
@@ -1039,7 +1039,7 @@ _action_description_get(const Eldbus_Service_Interface *iface, const Eldbus_Mess
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, description = elm_interface_atspi_action_description_get(idx));
+   description = elm_interface_atspi_action_description_get(obj, idx);
    description = description ? description : "";
    eldbus_message_arguments_append(ret, "s", description);
 
@@ -1063,7 +1063,7 @@ _action_name_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, name = elm_interface_atspi_action_name_get(idx));
+   name = elm_interface_atspi_action_name_get(obj, idx);
    name = name ? name : "";
    eldbus_message_arguments_append(ret, "s", name);
 
@@ -1087,7 +1087,7 @@ _action_localized_name_get(const Eldbus_Service_Interface *iface, const Eldbus_M
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, name = elm_interface_atspi_action_localized_name_get(idx));
+   name = elm_interface_atspi_action_localized_name_get(obj, idx);
    name = name ? name : "";
    eldbus_message_arguments_append(ret, "s", name);
 
@@ -1112,7 +1112,7 @@ _action_key_binding_get(const Eldbus_Service_Interface *iface, const Eldbus_Mess
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, key = elm_interface_atspi_action_keybinding_get(idx));
+   key = elm_interface_atspi_action_keybinding_get(obj, idx);
    eldbus_message_arguments_append(ret, "s", key ? key : "");
    if (key) free(key);
 
@@ -1140,15 +1140,15 @@ _action_actions_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
    iter_array = eldbus_message_iter_container_new(iter, 'a', "sss");
    EINA_SAFETY_ON_NULL_RETURN_VAL(iter_array, NULL);
 
-   eo_do(obj, actions = elm_interface_atspi_action_actions_get());
+   actions = elm_interface_atspi_action_actions_get(obj);
 
    int id = 0;
    EINA_LIST_FREE(actions, action)
      {
         const char *descr;
         char *key;
-        eo_do(obj, key = elm_interface_atspi_action_keybinding_get(id));
-        eo_do(obj, descr = elm_interface_atspi_action_description_get(id));
+        key = elm_interface_atspi_action_keybinding_get(obj, id);
+        descr = elm_interface_atspi_action_description_get(obj, id);
         descr = descr ? descr : "";
         eldbus_message_iter_arguments_append(iter_array, "sss", action, descr, key ? key : "");
         if (key) free(key);
@@ -1178,7 +1178,7 @@ _action_action_do(const Eldbus_Service_Interface *iface, const Eldbus_Message *m
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, result = elm_interface_atspi_action_do(idx));
+   result = elm_interface_atspi_action_do(obj, idx);
    eldbus_message_arguments_append(ret, "b", result);
 
    return ret;
@@ -1216,7 +1216,7 @@ _image_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
    screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
-   eo_do(obj, elm_interface_atspi_image_extents_get(screen_coords, &x, &y, &w, &h));
+   elm_interface_atspi_image_extents_get(obj, screen_coords, &x, &y, &w, &h);
    eldbus_message_arguments_append(ret, "iiii", x, y, w, h);
 
    return ret;
@@ -1242,7 +1242,7 @@ _image_position_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
    screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
-   eo_do(obj, elm_interface_atspi_image_extents_get(screen_coords, &x, &y, NULL, NULL));
+   elm_interface_atspi_image_extents_get(obj, screen_coords, &x, &y, NULL, NULL);
    eldbus_message_arguments_append(ret, "i", x);
    eldbus_message_arguments_append(ret, "i", y);
 
@@ -1263,7 +1263,7 @@ _image_size_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, elm_interface_atspi_image_extents_get(EINA_FALSE, NULL, NULL, &w, &h));
+   elm_interface_atspi_image_extents_get(obj, EINA_FALSE, NULL, NULL, &w, &h);
    eldbus_message_arguments_append(ret, "i", w);
    eldbus_message_arguments_append(ret, "i", h);
 
@@ -1296,7 +1296,7 @@ _text_string_at_offset_get(const Eldbus_Service_Interface *iface, const Eldbus_M
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, str = elm_interface_atspi_text_string_get(gran, &start, &end));
+   str = elm_interface_atspi_text_string_get(obj, gran, &start, &end);
    str = str ? str : strdup("");
 
    eldbus_message_arguments_append(ret, "sii", str, start, end);
@@ -1322,7 +1322,7 @@ _text_text_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
    Eldbus_Message *ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, str = elm_interface_atspi_text_get(start, end));
+   str = elm_interface_atspi_text_get(obj, start, end);
    str = str ? str : strdup("");
 
    eldbus_message_arguments_append(ret, "s", str);
@@ -1349,7 +1349,7 @@ _text_caret_offset_set(const Eldbus_Service_Interface *iface, const Eldbus_Messa
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, res = elm_interface_atspi_text_caret_offset_set(offset));
+   res = elm_interface_atspi_text_caret_offset_set(obj, offset);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1374,7 +1374,7 @@ _text_character_at_offset_get(const Eldbus_Service_Interface *iface, const Eldbu
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, res = elm_interface_atspi_text_character_get(offset));
+   res = elm_interface_atspi_text_character_get(obj, offset);
 
    eldbus_message_arguments_append(ret, "i", res);
 
@@ -1400,7 +1400,7 @@ _text_attribute_value_get(const Eldbus_Service_Interface *iface, const Eldbus_Me
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, res = elm_interface_atspi_text_attribute_get(name, &start, &end, &value));
+   res = elm_interface_atspi_text_attribute_get(obj, name, &start, &end, &value);
    eldbus_message_arguments_append(ret, "siib", value ? value : "", start, end, res);
 
    if (value) free(value);
@@ -1431,7 +1431,7 @@ _text_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
    iter_array = eldbus_message_iter_container_new(iter, 'a', "{ss}");
    EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
 
-   eo_do(obj, attrs = elm_interface_atspi_text_attributes_get(&start, &end));
+   attrs = elm_interface_atspi_text_attributes_get(obj, &start, &end);
 
    EINA_LIST_FREE(attrs, attr)
     {
@@ -1469,7 +1469,7 @@ _text_default_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus
    iter_array = eldbus_message_iter_container_new(iter, 'a', "{ss}");
    EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
 
-   eo_do(obj, attrs = elm_interface_atspi_text_default_attributes_get());
+   attrs = elm_interface_atspi_text_default_attributes_get(obj);
 
    EINA_LIST_FREE(attrs, attr)
     {
@@ -1508,7 +1508,7 @@ _text_character_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_
 
    screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
 
-   eo_do(obj, res = elm_interface_atspi_text_character_extents_get(offset, screen_coords, &rect));
+   res = elm_interface_atspi_text_character_extents_get(obj, offset, screen_coords, &rect);
 
    if (!res)
      {
@@ -1542,7 +1542,7 @@ _text_offset_at_point_get(const Eldbus_Service_Interface *iface, const Eldbus_Me
    x = y = -1;
    screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
 
-   eo_do(obj, offset = elm_interface_atspi_text_offset_at_point_get(screen_coords, x, y));
+   offset = elm_interface_atspi_text_offset_at_point_get(obj, screen_coords, x, y);
 
    eldbus_message_arguments_append(ret, "i", offset);
 
@@ -1563,7 +1563,7 @@ _text_n_selections_get(const Eldbus_Service_Interface *iface, const Eldbus_Messa
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, n = elm_interface_atspi_text_selections_count_get());
+   n = elm_interface_atspi_text_selections_count_get(obj);
 
    eldbus_message_arguments_append(ret, "i", n);
 
@@ -1587,7 +1587,7 @@ _text_selection_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, elm_interface_atspi_text_selection_get(sel_num, &start, &end));
+   elm_interface_atspi_text_selection_get(obj, sel_num, &start, &end);
 
    eldbus_message_arguments_append(ret, "ii", start, end);
 
@@ -1612,7 +1612,7 @@ _text_selection_add(const Eldbus_Service_Interface *iface, const Eldbus_Message
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, res = elm_interface_atspi_text_selection_add(start, end));
+   res = elm_interface_atspi_text_selection_add(obj, start, end);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1637,7 +1637,7 @@ _text_selection_remove(const Eldbus_Service_Interface *iface, const Eldbus_Messa
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, res = elm_interface_atspi_text_selection_remove(sel_num));
+   res = elm_interface_atspi_text_selection_remove(obj, sel_num);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1662,7 +1662,7 @@ _text_selection_set(const Eldbus_Service_Interface *iface, const Eldbus_Message
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, res = elm_interface_atspi_text_selection_set(sel_num, start, end));
+   res = elm_interface_atspi_text_selection_set(obj, sel_num, start, end);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1690,7 +1690,7 @@ _text_range_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_Mess
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
    screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
-   eo_do(obj, res = elm_interface_atspi_text_range_extents_get(screen_coords, start, end, &rect));
+   res = elm_interface_atspi_text_range_extents_get(obj, screen_coords, start, end, &rect);
    if (!res)
      {
         eldbus_message_unref(ret);
@@ -1730,7 +1730,7 @@ _text_bounded_ranges_get(const Eldbus_Service_Interface *iface, const Eldbus_Mes
    EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
 
    screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
-   eo_do(obj, ranges = elm_interface_atspi_text_bounded_ranges_get(screen_coords, rect, xclip, yclip));
+   ranges = elm_interface_atspi_text_bounded_ranges_get(obj, screen_coords, rect, xclip, yclip);
 
    EINA_LIST_FREE(ranges, range)
      {
@@ -1790,11 +1790,11 @@ _text_run_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_Mes
    iter_array = eldbus_message_iter_container_new(iter, 'a', "{ss}");
    EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
 
-   eo_do(obj, attrs = elm_interface_atspi_text_attributes_get(&start, &end));
+   attrs = elm_interface_atspi_text_attributes_get(obj, &start, &end);
 
    if (incl_def)
      {
-        eo_do(obj, defaults = elm_interface_atspi_text_default_attributes_get());
+        defaults = elm_interface_atspi_text_default_attributes_get(obj);
         attrs = eina_list_merge(attrs, defaults);
      }
 
@@ -1853,7 +1853,7 @@ _editable_text_text_content_set(const Eldbus_Service_Interface *iface, const Eld
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, res = elm_interface_atspi_editable_text_content_set(content));
+   res = elm_interface_atspi_editable_text_content_set(obj, content);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1879,7 +1879,7 @@ _editable_text_text_insert(const Eldbus_Service_Interface *iface, const Eldbus_M
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, res = elm_interface_atspi_editable_text_insert(text, pos));
+   res = elm_interface_atspi_editable_text_insert(obj, text, pos);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1904,7 +1904,7 @@ _editable_text_text_copy(const Eldbus_Service_Interface *iface, const Eldbus_Mes
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, res = elm_interface_atspi_editable_text_copy(start, end));
+   res = elm_interface_atspi_editable_text_copy(obj, start, end);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1929,7 +1929,7 @@ _editable_text_text_cut(const Eldbus_Service_Interface *iface, const Eldbus_Mess
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, res = elm_interface_atspi_editable_text_cut(start, end));
+   res = elm_interface_atspi_editable_text_cut(obj, start, end);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1954,7 +1954,7 @@ _editable_text_text_delete(const Eldbus_Service_Interface *iface, const Eldbus_M
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, res = elm_interface_atspi_editable_text_delete(start, end));
+   res = elm_interface_atspi_editable_text_delete(obj, start, end);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -1979,7 +1979,7 @@ _editable_text_text_paste(const Eldbus_Service_Interface *iface, const Eldbus_Me
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
 
-   eo_do(obj, res = elm_interface_atspi_editable_text_paste(pos));
+   res = elm_interface_atspi_editable_text_paste(obj, pos);
 
    eldbus_message_arguments_append(ret, "b", res);
 
@@ -2012,7 +2012,7 @@ _bridge_object_from_path(Eo *bridge, const char *path)
    tmp = path + len; /* Skip over the prefix */
    if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp))
      {
-        eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, root = elm_interface_atspi_accessible_root_get());
+        root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN);
         return root;
      }
 
@@ -2039,7 +2039,7 @@ _path_from_object(const Eo *eo)
 
    if (!eo)
      return ATSPI_DBUS_PATH_NULL;
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, root = elm_interface_atspi_accessible_root_get());
+   root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN);
 
    if (eo == root)
      snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT);
@@ -2062,7 +2062,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
    if (!strcmp(property, "Name"))
      {
         char *ret2;
-        eo_do(obj, ret2 = elm_interface_atspi_accessible_name_get());
+        ret2 = elm_interface_atspi_accessible_name_get(obj);
         if (!ret2)
           ret2 = strdup("");
         eldbus_message_iter_basic_append(iter, 's', ret2);
@@ -2071,7 +2071,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
      }
    else if (!strcmp(property, "Description"))
      {
-        eo_do(obj, ret = elm_interface_atspi_accessible_description_get());
+        ret = elm_interface_atspi_accessible_description_get(obj);
         if (!ret)
           ret = "";
         eldbus_message_iter_basic_append(iter, 's', ret);
@@ -2079,9 +2079,9 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
      }
    else if (!strcmp(property, "Parent"))
      {
-       eo_do(obj, ret_obj = elm_interface_atspi_accessible_parent_get());
+       ret_obj = elm_interface_atspi_accessible_parent_get(obj);
        Elm_Atspi_Role role = ELM_ATSPI_ROLE_INVALID;
-       eo_do(obj, role = elm_interface_atspi_accessible_role_get());
+       role = elm_interface_atspi_accessible_role_get(obj);
        if ((!ret_obj) && (ELM_ATSPI_ROLE_APPLICATION == role))
          _object_desktop_reference_append(iter);
        else
@@ -2091,7 +2091,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
    else if (!strcmp(property, "ChildCount"))
      {
         Eina_List *l = NULL;
-        eo_do(obj, l = elm_interface_atspi_accessible_children_get());
+        l = elm_interface_atspi_accessible_children_get(obj);
         eldbus_message_iter_basic_append(iter, 'i', eina_list_count(l));
         eina_list_free(l);
         return EINA_TRUE;
@@ -2113,7 +2113,7 @@ _selection_property_get(const Eldbus_Service_Interface *interface, const char *p
 
    if (!strcmp(property, "NSelectedChildren"))
      {
-        eo_do(obj, n = elm_interface_atspi_selection_selected_children_count_get());
+        n = elm_interface_atspi_selection_selected_children_count_get(obj);
         eldbus_message_iter_basic_append(iter, 'i', n);
         return EINA_TRUE;
      }
@@ -2134,7 +2134,7 @@ _action_property_get(const Eldbus_Service_Interface *interface, const char *prop
 
    if (!strcmp(property, "NActions"))
      {
-        eo_do(obj, actions = elm_interface_atspi_action_actions_get());
+        actions = elm_interface_atspi_action_actions_get(obj);
         eldbus_message_iter_basic_append(iter, 'i', eina_list_count(actions));
         eina_list_free(actions);
         return EINA_TRUE;
@@ -2161,7 +2161,7 @@ _value_properties_set(const Eldbus_Service_Interface *interface, const char *pro
 
    if (!strcmp(property, "CurrentValue"))
      {
-        eo_do(obj, ret = elm_interface_atspi_value_and_text_set(value, NULL));
+        ret = elm_interface_atspi_value_and_text_set(obj, value, NULL);
         Eldbus_Message *answer = eldbus_message_method_return_new(request_msg);
         eldbus_message_arguments_append(answer, "b", ret);
         return answer;
@@ -2184,25 +2184,25 @@ _value_properties_get(const Eldbus_Service_Interface *interface, const char *pro
 
    if (!strcmp(property, "CurrentValue"))
      {
-        eo_do(obj, elm_interface_atspi_value_and_text_get(&value, NULL));
+        elm_interface_atspi_value_and_text_get(obj, &value, NULL);
         eldbus_message_iter_basic_append(iter, 'd', value);
         return EINA_TRUE;
      }
    if (!strcmp(property, "MinimumValue"))
      {
-        eo_do(obj, elm_interface_atspi_value_range_get(&value, NULL, NULL));
+        elm_interface_atspi_value_range_get(obj, &value, NULL, NULL);
         eldbus_message_iter_basic_append(iter, 'd', value);
         return EINA_TRUE;
      }
    if (!strcmp(property, "MaximumValue"))
      {
-        eo_do(obj, elm_interface_atspi_value_range_get(NULL, &value, NULL));
+        elm_interface_atspi_value_range_get(obj, NULL, &value, NULL);
         eldbus_message_iter_basic_append(iter, 'd', value);
         return EINA_TRUE;
      }
    if (!strcmp(property, "MinimumIncrement"))
      {
-        eo_do(obj, value = elm_interface_atspi_value_increment_get());
+        value = elm_interface_atspi_value_increment_get(obj);
         eldbus_message_iter_basic_append(iter, 'd', value);
         return EINA_TRUE;
      }
@@ -2223,14 +2223,14 @@ _image_properties_get(const Eldbus_Service_Interface *interface, const char *pro
 
    if (!strcmp(property, "ImageDescription"))
      {
-        eo_do(obj, value = elm_interface_atspi_image_description_get());
+        value = elm_interface_atspi_image_description_get(obj);
         value = value ? value : "";
         eldbus_message_iter_basic_append(iter, 's', value);
         return EINA_TRUE;
      }
    if (!strcmp(property, "ImageLocale"))
      {
-        eo_do(obj, value = elm_interface_atspi_image_locale_get());
+        value = elm_interface_atspi_image_locale_get(obj);
         value = value ? value : "";
         eldbus_message_iter_basic_append(iter, 's', value);
         return EINA_TRUE;
@@ -2252,13 +2252,13 @@ _text_properties_get(const Eldbus_Service_Interface *interface, const char *prop
 
    if (!strcmp(property, "CharacterCount"))
      {
-        eo_do(obj, val = elm_interface_atspi_text_character_count_get());
+        val = elm_interface_atspi_text_character_count_get(obj);
         eldbus_message_iter_basic_append(iter, 'i', val);
         return EINA_TRUE;
      }
    if (!strcmp(property, "CaretOffset"))
      {
-        eo_do(obj, val = elm_interface_atspi_text_caret_offset_get());
+        val = elm_interface_atspi_text_caret_offset_get(obj);
         eldbus_message_iter_basic_append(iter, 'i', val);
         return EINA_TRUE;
      }
@@ -2560,7 +2560,7 @@ _collection_match_states_lookup(Eo *obj, struct collection_match_rule *rule)
    Eina_Bool ret = EINA_FALSE;
    Elm_Atspi_State_Set ss;
 
-   eo_do(obj, ss = elm_interface_atspi_accessible_state_set_get());
+   ss = elm_interface_atspi_accessible_state_set_get(obj);
 
    switch (rule->statematchtype)
      {
@@ -2590,7 +2590,7 @@ _collection_match_roles_lookup(Eo *obj, struct collection_match_rule *rule)
    Elm_Atspi_Role role;
    int64_t role_set;
 
-   eo_do(obj, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(obj);
 
    if (role >= 64)
      {
@@ -2654,7 +2654,7 @@ _collection_match_attributes_lookup(Eo *obj, struct collection_match_rule *rule)
    Eina_Bool ret = EINA_FALSE;
    Eina_List *obj_attribs;
 
-   eo_do(obj, obj_attribs = elm_interface_atspi_accessible_attributes_get());
+   obj_attribs = elm_interface_atspi_accessible_attributes_get(obj);
 
    switch (rule->attributematchtype)
      {
@@ -2690,7 +2690,7 @@ _collection_sort_order_canonical(struct collection_match_rule *rule, Eina_List *
 {
    int i = index;
    Eina_List *children;
-   eo_do(obj, children = elm_interface_atspi_accessible_children_get());
+   children = elm_interface_atspi_accessible_children_get(obj);
    long acount = eina_list_count(children);
    Eina_Bool prev = pobj ? EINA_TRUE : EINA_FALSE;
 
@@ -2754,22 +2754,21 @@ _collection_sort_order_reverse_canonical(struct collection_match_rule *rule, Ein
     flag = EINA_TRUE;
 
   /* Get the current nodes index in it's parent and the parent object. */
-  eo_do(obj,
-        indexinparent = elm_interface_atspi_accessible_index_in_parent_get(),
-        parent = elm_interface_atspi_accessible_parent_get());
+  indexinparent = elm_interface_atspi_accessible_index_in_parent_get(obj);
+  parent = elm_interface_atspi_accessible_parent_get(obj);
 
   if ((indexinparent > 0) && ((max == 0) || (count < max)))
     {
        /* there are still some siblings to visit so get the previous sibling
           and get it's last descendant.
           First, get the previous sibling */
-       eo_do(parent, children = elm_interface_atspi_accessible_children_get());
+       children = elm_interface_atspi_accessible_children_get(parent);
        nextobj = eina_list_nth(children, indexinparent - 1);
        eina_list_free(children);
 
        /* Now, drill down the right side to the last descendant */
        do {
-            eo_do(nextobj, children = elm_interface_atspi_accessible_children_get());
+            children = elm_interface_atspi_accessible_children_get(nextobj);
             if (children) nextobj = eina_list_last_data_get(children);
             eina_list_free(children);
        } while (children);
@@ -2812,9 +2811,8 @@ _collection_inorder(Eo *collection, struct collection_match_rule *rule, Eina_Lis
   while ((max == 0 || count < max) && obj && obj != collection)
     {
        Eo *parent;
-       eo_do(obj,
-             parent = elm_interface_atspi_accessible_parent_get(),
-             idx = elm_interface_atspi_accessible_index_in_parent_get());
+       parent = elm_interface_atspi_accessible_parent_get(obj);
+       idx = elm_interface_atspi_accessible_index_in_parent_get(obj);
        count = _collection_sort_order_canonical(rule, list, count, max, parent,
                                      idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse);
        obj = parent;
@@ -2890,9 +2888,8 @@ _collection_get_matches_from_handle(Eo *collection, Eo *current, struct collecti
            result = eina_list_reverse(result);
          break;
       case ATSPI_Collection_TREE_RESTRICT_CHILDREN:
-         eo_do(current,
-               idx = elm_interface_atspi_accessible_index_in_parent_get(),
-               parent = elm_interface_atspi_accessible_parent_get());
+         idx = elm_interface_atspi_accessible_index_in_parent_get(current);
+         parent = elm_interface_atspi_accessible_parent_get(current);
          _collection_query(rule, sortby, &result, 0, max, parent, idx, EINA_FALSE, NULL, EINA_TRUE, traverse);
          break;
       case ATSPI_Collection_TREE_RESTRICT_SIBLING:
@@ -2953,7 +2950,7 @@ _collection_get_matches_to_handle(Eo *obj, Eo *current, struct collection_match_
    Eo *collection = obj;
 
    if (limit)
-     eo_do(obj, collection = elm_interface_atspi_accessible_parent_get());
+     collection = elm_interface_atspi_accessible_parent_get(obj);
 
    switch (tree)
      {
@@ -3141,9 +3138,9 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
   Elm_Atspi_State_Set states;
   Elm_Atspi_Role role;
   Eo *root;
-  eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, root = elm_interface_atspi_accessible_root_get());
+  root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN);
 
-  eo_do(data, role = elm_interface_atspi_accessible_role_get());
+  role = elm_interface_atspi_accessible_role_get(data);
 
   iter_struct = eldbus_message_iter_container_new(iter_array, 'r', NULL);
   EINA_SAFETY_ON_NULL_RETURN_VAL(iter_struct, EINA_TRUE);
@@ -3155,7 +3152,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
   _bridge_iter_object_reference_append(bridge, iter_struct, root);
 
   Eo *parent = NULL;
-  eo_do(data, parent = elm_interface_atspi_accessible_parent_get());
+  parent = elm_interface_atspi_accessible_parent_get(data);
   /* Marshall parent */
   if ((!parent) && (ELM_ATSPI_ROLE_APPLICATION == role))
     _object_desktop_reference_append(iter_struct);
@@ -3166,7 +3163,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
   Eina_List *children_list = NULL, *l;
   Eo *child;
 
-  eo_do(data, children_list = elm_interface_atspi_accessible_children_get());
+  children_list = elm_interface_atspi_accessible_children_get(data);
   iter_sub_array = eldbus_message_iter_container_new(iter_struct, 'a', "(so)");
   EINA_SAFETY_ON_NULL_GOTO(iter_sub_array, fail);
 
@@ -3181,7 +3178,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
 
   /* Marshall name */
   char *name = NULL;
-  eo_do(data, name = elm_interface_atspi_accessible_name_get());
+  name = elm_interface_atspi_accessible_name_get(data);
   if (!name)
     name = strdup("");
 
@@ -3193,7 +3190,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
 
   /* Marshall description */
   const char* descritpion = NULL;
-  eo_do(data, descritpion = elm_interface_atspi_accessible_description_get());
+  descritpion = elm_interface_atspi_accessible_description_get(data);
   if (!descritpion)
     descritpion = "";
   eldbus_message_iter_basic_append(iter_struct, 's', descritpion);
@@ -3202,7 +3199,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
   iter_sub_array = eldbus_message_iter_container_new(iter_struct, 'a', "u");
   EINA_SAFETY_ON_NULL_GOTO(iter_sub_array, fail);
 
-  eo_do(data, states = elm_interface_atspi_accessible_state_set_get());
+  states = elm_interface_atspi_accessible_state_set_get(data);
 
   unsigned int s1 = states & 0xFFFFFFFF;
   unsigned int s2 = (states >> 32) & 0xFFFFFFFF;
@@ -3239,7 +3236,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
    iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE);
    EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
 
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, root = elm_interface_atspi_accessible_root_get());
+   root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN);
    to_process = eina_list_append(NULL, root);
 
    while (to_process)
@@ -3250,7 +3247,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
         _bridge_object_register(bridge, obj);
 
         Eina_List *children;
-        eo_do(obj, children = elm_interface_atspi_accessible_children_get());
+        children = elm_interface_atspi_accessible_children_get(obj);
         to_process = eina_list_merge(to_process, children);
      }
 
@@ -3295,7 +3292,7 @@ _component_contains(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eld
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
 
    Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
-   eo_do(obj, contains = elm_interface_atspi_component_contains(type, x, y));
+   contains = elm_interface_atspi_component_contains(obj, type, x, y);
 
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3327,7 +3324,7 @@ _component_get_accessible_at_point(const Eldbus_Service_Interface *iface EINA_UN
 
    iter = eldbus_message_iter_get(ret);
    Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
-   eo_do(obj, accessible = elm_interface_atspi_component_accessible_at_point_get(type, x, y));
+   accessible = elm_interface_atspi_component_accessible_at_point_get(obj, type, x, y);
    _bridge_iter_object_reference_append(bridge, iter, accessible);
    _bridge_object_register(bridge, accessible);
 
@@ -3356,7 +3353,7 @@ _component_get_extents(const Eldbus_Service_Interface *iface EINA_UNUSED, const
    iter = eldbus_message_iter_get(ret);
 
    Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
-   eo_do(obj, elm_interface_atspi_component_extents_get(type, &x, &y, &w, &h));
+   elm_interface_atspi_component_extents_get(obj, type, &x, &y, &w, &h);
    iter_struct = eldbus_message_iter_container_new(iter, 'r', NULL);
    EINA_SAFETY_ON_NULL_GOTO(iter_struct, fail);
 
@@ -3389,7 +3386,7 @@ _component_get_position(const Eldbus_Service_Interface *iface EINA_UNUSED, const
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
 
    Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
-   eo_do(obj, elm_interface_atspi_component_position_get(type, &x, &y));
+   elm_interface_atspi_component_position_get(obj, type, &x, &y);
 
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3411,7 +3408,7 @@ _component_get_size(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eld
 
    ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg);
 
-   eo_do(obj, elm_interface_atspi_component_size_get(&x, &y));
+   elm_interface_atspi_component_size_get(obj, &x, &y);
 
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3444,7 +3441,7 @@ _component_get_layer(const Eldbus_Service_Interface *iface EINA_UNUSED, const El
 
    ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg);
 
-   eo_do(obj, layer = elm_interface_atspi_component_layer_get());
+   layer = elm_interface_atspi_component_layer_get(obj);
 
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3467,7 +3464,7 @@ _component_grab_focus(const Eldbus_Service_Interface *iface EINA_UNUSED, const E
    if (!obj)
      return _dbus_invalid_ref_error_new(msg);
 
-   eo_do(obj, focus = elm_interface_atspi_component_focus_grab());
+   focus = elm_interface_atspi_component_focus_grab(obj);
 
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3489,7 +3486,7 @@ _component_get_alpha(const Eldbus_Service_Interface *iface EINA_UNUSED, const El
    if (!obj)
      return _dbus_invalid_ref_error_new(msg);
 
-   eo_do(obj, alpha = elm_interface_atspi_component_alpha_get());
+   alpha = elm_interface_atspi_component_alpha_get(obj);
 
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3516,7 +3513,7 @@ _component_set_extends(const Eldbus_Service_Interface *iface EINA_UNUSED, const
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
 
    Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
-   eo_do(obj, result = elm_interface_atspi_component_extents_set(type, x, y, w, h));
+   result = elm_interface_atspi_component_extents_set(obj, type, x, y, w, h);
 
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3543,7 +3540,7 @@ _component_set_position(const Eldbus_Service_Interface *iface EINA_UNUSED, const
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
 
    Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
-   eo_do(obj, result = elm_interface_atspi_component_position_set(type, x, y));
+   result = elm_interface_atspi_component_position_set(obj, type, x, y);
 
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3568,7 +3565,7 @@ _component_set_size(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eld
    if (!eldbus_message_arguments_get(msg, "ii", &w, &h))
      return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
 
-   eo_do(obj, result = elm_interface_atspi_component_size_set(w, h));
+   result = elm_interface_atspi_component_size_set(obj, w, h);
 
    ret = eldbus_message_method_return_new(msg);
    EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3623,7 +3620,7 @@ _elm_atspi_bridge_app_register(Eo *bridge)
                                     "Embed");
    Eldbus_Message_Iter *iter = eldbus_message_iter_get(message);
 
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, root = elm_interface_atspi_accessible_root_get());
+   root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN);
    _bridge_iter_object_reference_append(bridge, iter, root);
    eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1);
 
@@ -3636,7 +3633,7 @@ _elm_atspi_bridge_app_unregister(Eo *bridge)
    Eo *root;
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE);
 
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, root = elm_interface_atspi_accessible_root_get());
+   root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN);
 
    Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY,
                                     ATSPI_DBUS_PATH_ROOT,
@@ -3779,7 +3776,7 @@ _registered_listeners_get(void *data, const Eldbus_Message *msg, Eldbus_Pending
      }
 
    if (!pd->connected)
-      eo_do(data, eo_event_callback_call(ELM_ATSPI_BRIDGE_EVENT_CONNECTED, NULL));
+      eo_event_callback_call(data, ELM_ATSPI_BRIDGE_EVENT_CONNECTED, NULL);
    pd->connected = EINA_TRUE;
 }
 
@@ -3898,7 +3895,7 @@ _active_descendant_changed_signal_send(void *data, const Eo_Event *event)
    if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED))
      return EINA_FALSE;
 
-   eo_do(child, idx = elm_interface_atspi_accessible_index_in_parent_get());
+   idx = elm_interface_atspi_accessible_index_in_parent_get(child);
 
    _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
                        &_event_obj_signals[ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED], "",
@@ -3925,11 +3922,11 @@ _children_changed_signal_send(void *data, const Eo_Event *event)
     {
      case ATSPI_OBJECT_CHILD_ADDED:
         atspi_desc = "add";
-        eo_do(ev_data->child, idx = elm_interface_atspi_accessible_index_in_parent_get());
+        idx = elm_interface_atspi_accessible_index_in_parent_get(ev_data->child);
         break;
      case ATSPI_OBJECT_CHILD_REMOVED:
         atspi_desc = "remove";
-        eo_do(ev_data->child, idx = elm_interface_atspi_accessible_index_in_parent_get());
+        idx = elm_interface_atspi_accessible_index_in_parent_get(ev_data->child);
         break;
     }
 
@@ -4009,7 +4006,7 @@ static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eld
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
 
    path = _path_from_object(obj);
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, root = elm_interface_atspi_accessible_root_get());
+   root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN);
 
    msg = eldbus_message_signal_new(path, infc, signal->name);
    if (!msg) return;
@@ -4086,7 +4083,7 @@ _text_caret_moved_send(void *data, const Eo_Event *event)
    if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED))
      return EINA_TRUE;
 
-   eo_do(event->obj, cursor_pos = elm_interface_atspi_text_caret_offset_get());
+   cursor_pos = elm_interface_atspi_text_caret_offset_get(event->obj);
 
    _bridge_signal_send(data, event->obj, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
                        &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED], "", cursor_pos, 0, NULL, NULL);
@@ -4259,10 +4256,10 @@ _a11y_connection_shutdown(Eo *bridge)
    if (pd->event_hash) eina_hash_free(pd->event_hash);
    pd->event_hash = NULL;
 
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_handler_del(pd->event_hdlr));
+   elm_interface_atspi_accessible_event_handler_del(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, pd->event_hdlr);
    pd->event_hdlr = NULL;
 
-   eo_do(bridge, eo_event_callback_call(ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL));
+   eo_event_callback_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL);
    pd->connected = EINA_FALSE;
 }
 
@@ -4351,7 +4348,7 @@ _a11y_bus_initialize(Eo *obj, const char *socket_addr)
    _elm_atspi_bridge_app_register(obj);
 
    // register accesible object event listener
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, pd->event_hdlr = elm_interface_atspi_accessible_event_handler_add(_bridge_accessible_event_dispatch, obj));
+   pd->event_hdlr = elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _bridge_accessible_event_dispatch, obj);
 }
 
 static void
@@ -4382,7 +4379,7 @@ static void _a11y_connection_init(Eo *bridge)
    ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
    Eina_Bool is_connected;
 
-   eo_do(bridge, is_connected = elm_obj_atspi_bridge_connected_get());
+   is_connected = elm_obj_atspi_bridge_connected_get(bridge);
 
    if (is_connected) return;
 
@@ -4650,7 +4647,7 @@ _elm_atspi_bridge_eo_base_constructor(Eo *obj, Elm_Atspi_Bridge_Data *pd)
    Eldbus_Proxy *proxy;
    Eldbus_Pending *req;
 
-   eo_do_super(obj, ELM_ATSPI_BRIDGE_CLASS, eo_constructor());
+   eo_constructor(eo_super(obj, ELM_ATSPI_BRIDGE_CLASS));
 
    elm_need_eldbus();
 
@@ -4699,7 +4696,7 @@ _elm_atspi_bridge_eo_base_destructor(Eo *obj, Elm_Atspi_Bridge_Data *pd)
    if (pd->bus_obj) eldbus_object_unref(pd->bus_obj);
    if (pd->session_bus) eldbus_connection_unref(pd->session_bus);
 
-   eo_do_super(obj, ELM_ATSPI_BRIDGE_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, ELM_ATSPI_BRIDGE_CLASS));
 }
 
 #include "elm_atspi_bridge.eo.c"
diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c
index 158415682..d711748b5 100644
--- a/src/lib/elm_bg.c
+++ b/src/lib/elm_bg.c
@@ -91,7 +91,7 @@ EOLIAN static void
 _elm_bg_evas_object_smart_add(Eo *obj, Elm_Bg_Data *priv)
 {
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
@@ -120,10 +120,9 @@ elm_bg_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_bg_eo_base_constructor(Eo *obj, Elm_Bg_Data *_pd EINA_UNUSED)
 {
-   eo_do(obj, elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_DISABLED));
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY));
+   elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_DISABLED);
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
 
    return obj;
 }
@@ -210,7 +209,7 @@ elm_bg_color_set(Evas_Object *obj,
                  int b)
 {
    ELM_BG_CHECK(obj);
-   eo_do(obj, elm_obj_bg_color_set(r, g, b, 255));
+   elm_obj_bg_color_set(obj, r, g, b, 255);
 }
 
 EOLIAN static void
@@ -245,7 +244,7 @@ elm_bg_color_get(const Evas_Object *obj,
                  int *b)
 {
    ELM_BG_CHECK(obj);
-   eo_do((Eo *) obj, elm_obj_bg_color_get(r, g, b, NULL));
+   elm_obj_bg_color_get((Eo *) obj, r, g, b, NULL);
 }
 
 EOLIAN static void
@@ -277,13 +276,13 @@ EAPI Eina_Bool
 elm_bg_file_set(Eo *obj, const char *file, const char *group)
 {
    Eina_Bool ret;
-   return eo_do_ret((Eo *) obj, ret, efl_file_set(file, group));
+   return efl_file_set((Eo *) obj, file, group);
 }
 
 EAPI void
 elm_bg_file_get(const Eo *obj, const char **file, const char **group)
 {
-   eo_do((Eo *) obj, efl_file_get(file, group));
+   efl_file_get((Eo *) obj, file, group);
 }
 
 #include "elm_bg.eo.c"
diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
index 5bfe9998b..f3fbd6fe7 100644
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -33,7 +33,7 @@ _child_added_cb_proxy(void *data, const Eo_Event *event)
 {
    Evas_Object *box = data;
    Evas_Object_Box_Option *opt = event->event_info;
-   eo_do(box, eo_event_callback_call(ELM_BOX_EVENT_CHILD_ADDED, opt->obj));
+   eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_ADDED, opt->obj);
 
    return EINA_TRUE;
 }
@@ -43,7 +43,7 @@ _child_removed_cb_proxy(void *data, const Eo_Event *event)
 {
    Evas_Object *box = data;
    Evas_Object *child = event->event_info;
-   eo_do(box, eo_event_callback_call(ELM_BOX_EVENT_CHILD_REMOVED, child));
+   eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child);
 
    return EINA_TRUE;
 }
@@ -113,7 +113,7 @@ _elm_box_elm_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -165,7 +165,7 @@ _elm_box_elm_widget_sub_object_del(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED, Evas_
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(child));
+   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), child);
    if (!int_ret) return EINA_FALSE;
 
    _sizing_eval(obj);
@@ -319,10 +319,10 @@ _transition_layout_animation_start(Evas_Object *obj,
    evas_object_event_callback_add
      (obj, EVAS_CALLBACK_RESIZE, _transition_layout_obj_resize_cb,
      layout_data);
-   eo_do(obj, eo_event_callback_add
-     (ELM_BOX_EVENT_CHILD_ADDED, _transition_layout_child_added, layout_data));
-   eo_do(obj, eo_event_callback_add
-     (ELM_BOX_EVENT_CHILD_REMOVED, _transition_layout_child_removed, layout_data));
+   eo_event_callback_add
+     (obj, ELM_BOX_EVENT_CHILD_ADDED, _transition_layout_child_added, layout_data);
+   eo_event_callback_add
+     (obj, ELM_BOX_EVENT_CHILD_REMOVED, _transition_layout_child_removed, layout_data);
 
    if (!layout_data->animator)
      layout_data->animator = ecore_animator_add(transition_animation_cb, obj);
@@ -392,13 +392,13 @@ _elm_box_evas_object_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
                                   EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                   _on_size_hints_changed, obj);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
-   eo_do(wd->resize_obj, eo_event_callback_add
-      (ELM_BOX_EVENT_CHILD_ADDED, _child_added_cb_proxy, obj));
-   eo_do(wd->resize_obj, eo_event_callback_add
-     (ELM_BOX_EVENT_CHILD_REMOVED, _child_removed_cb_proxy, obj));
+   eo_event_callback_add
+      (wd->resize_obj, ELM_BOX_EVENT_CHILD_ADDED, _child_added_cb_proxy, obj);
+   eo_event_callback_add
+     (wd->resize_obj, ELM_BOX_EVENT_CHILD_REMOVED, _child_removed_cb_proxy, obj);
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
    elm_widget_highlight_ignore_set(obj, EINA_TRUE);
@@ -429,7 +429,7 @@ _elm_box_evas_object_smart_del(Eo *obj, Elm_Box_Data *sd)
           }
      }
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -443,12 +443,11 @@ elm_box_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_box_eo_base_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
 {
-   eo_do(obj, elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_SKIPPED));
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER));
+   elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED);
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
 
    return obj;
 }
@@ -657,10 +656,8 @@ elm_box_transition_free(void *data)
 
    evas_object_event_callback_del
      (box_data->box, EVAS_CALLBACK_RESIZE, _transition_layout_obj_resize_cb);
-   eo_do(box_data->box, eo_event_callback_del(
-      ELM_BOX_EVENT_CHILD_ADDED, _transition_layout_child_added, box_data));
-   eo_do(box_data->box, eo_event_callback_del(
-      ELM_BOX_EVENT_CHILD_REMOVED, _transition_layout_child_removed, box_data));
+   eo_event_callback_del(box_data->box, ELM_BOX_EVENT_CHILD_ADDED, _transition_layout_child_added, box_data);
+   eo_event_callback_del(box_data->box, ELM_BOX_EVENT_CHILD_REMOVED, _transition_layout_child_removed, box_data);
    ecore_animator_del(box_data->animator);
 
    free(data);
diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index fb869aefe..ba83049c4 100644
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -70,7 +70,7 @@ _on_mouse_up(void *data,
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
      return;
 
-   eo_do(data, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+   eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
 }
 
 /* overriding layout's focus_next() in order to just cycle through the
@@ -116,7 +116,7 @@ _elm_bubble_elm_layout_text_set(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED, const
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_layout_text_set(part, label));
+   int_ret = elm_obj_layout_text_set(eo_super(obj, MY_CLASS), part, label);
    if (!int_ret) return EINA_FALSE;
 
    if (part && (!strcmp(part, "info") || !strcmp(part, "elm.info")))
@@ -177,7 +177,7 @@ _elm_bubble_evas_object_smart_add(Eo *obj, Elm_Bubble_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->pos = ELM_BUBBLE_POS_TOP_LEFT; //default
@@ -226,11 +226,10 @@ elm_bubble_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_bubble_eo_base_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
 
    return obj;
 }
@@ -248,7 +247,7 @@ _elm_bubble_pos_set(Eo *obj, Elm_Bubble_Data *sd, Elm_Bubble_Pos pos)
    eina_stringshare_replace
      (&ld->group, corner_string[sd->pos]);
 
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 }
 
 EOLIAN static Elm_Bubble_Pos
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 43fb45b71..9de31b744 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -66,8 +66,8 @@ _activate(Evas_Object *obj)
           _elm_access_say(E_("Clicked"));
         if (!elm_widget_disabled_get(obj) &&
             !evas_object_freeze_events_get(obj))
-          eo_do(obj, eo_event_callback_call
-            (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+          eo_event_callback_call
+            (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
      }
 }
 
@@ -90,8 +90,8 @@ _elm_button_elm_widget_activate(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Elm_A
    if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE;
    if (evas_object_freeze_events_get(obj)) return EINA_FALSE;
 
-   eo_do(obj, eo_event_callback_call
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+   eo_event_callback_call
+     (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
    elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
 
    return EINA_TRUE;
@@ -110,7 +110,7 @@ _icon_signal_emit(Evas_Object *obj)
 
    elm_layout_signal_emit(obj, buf, "elm");
    edje_object_message_signal_process(elm_layout_edje_get(obj));
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 }
 
 /* FIXME: replicated from elm_layout just because button's icon spot
@@ -121,7 +121,7 @@ _elm_button_elm_widget_theme_apply(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
    _icon_signal_emit(obj);
 
@@ -136,7 +136,7 @@ _elm_button_elm_widget_sub_object_del(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED,
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(sobj));
+   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    _icon_signal_emit(obj);
@@ -152,7 +152,7 @@ _elm_button_elm_container_content_set(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED,
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_set(part, content));
+   int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
    if (!int_ret) return EINA_FALSE;
 
    _icon_signal_emit(obj);
@@ -198,8 +198,8 @@ _autorepeat_send(void *data)
 {
    ELM_BUTTON_DATA_GET_OR_RETURN_VAL(data, sd, ECORE_CALLBACK_CANCEL);
 
-   eo_do(data, eo_event_callback_call
-     (EVAS_CLICKABLE_INTERFACE_EVENT_REPEATED, NULL));
+   eo_event_callback_call
+     (data, EVAS_CLICKABLE_INTERFACE_EVENT_REPEATED, NULL);
    if (!sd->repeating)
      {
         sd->timer = NULL;
@@ -239,8 +239,8 @@ _on_pressed_signal(void *data,
               (sd->ar_initial_timeout, _autorepeat_initial_send, data);
      }
 
-   eo_do(data, eo_event_callback_call
-     (EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, NULL));
+   eo_event_callback_call
+     (data, EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, NULL);
 }
 
 static void
@@ -253,8 +253,8 @@ _on_unpressed_signal(void *data,
 
    ELM_SAFE_FREE(sd->timer, ecore_timer_del);
    sd->repeating = EINA_FALSE;
-   eo_do(data, eo_event_callback_call
-     (EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED, NULL));
+   eo_event_callback_call
+     (data, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED, NULL);
 }
 
 static char *
@@ -282,7 +282,7 @@ _elm_button_evas_object_smart_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    edje_object_signal_callback_add
@@ -331,11 +331,10 @@ elm_button_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_button_eo_base_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PUSH_BUTTON));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);
 
    return obj;
 }
@@ -355,7 +354,7 @@ static Eina_Bool
 _internal_elm_button_admits_autorepeat_get(const Evas_Object *obj)
 {
    Eina_Bool ret = EINA_FALSE;
-   eo_do((Eo *) obj, ret = elm_obj_button_admits_autorepeat_get());
+   ret = elm_obj_button_admits_autorepeat_get((Eo *) obj);
    return ret;
 }
 
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 6d65290c0..af20e6f5c 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -855,7 +855,7 @@ _elm_calendar_elm_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _spinner_buttons_add(obj, sd);
@@ -935,9 +935,9 @@ _update_data(Evas_Object *obj, Eina_Bool month,
           sd->selected_time.tm_mday = maxdays;
 
         _fix_selected_time(sd);
-        eo_do(obj, eo_event_callback_call(ELM_CALENDAR_EVENT_CHANGED, NULL));
+        eo_event_callback_call(obj, ELM_CALENDAR_EVENT_CHANGED, NULL);
      }
-   eo_do(obj, eo_event_callback_call(ELM_CALENDAR_EVENT_DISPLAY_CHANGED, NULL));
+   eo_event_callback_call(obj, ELM_CALENDAR_EVENT_DISPLAY_CHANGED, NULL);
 
    return EINA_TRUE;
 }
@@ -1221,7 +1221,7 @@ _update_sel_it(Evas_Object *obj,
    sd->selected_time.tm_mday = day;
    _fix_selected_time(sd);
    _select(obj, sel_it);
-   eo_do(obj, eo_event_callback_call(ELM_CALENDAR_EVENT_CHANGED, NULL));
+   eo_event_callback_call(obj, ELM_CALENDAR_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -1377,7 +1377,7 @@ _elm_calendar_evas_object_smart_add(Eo *obj, Elm_Calendar_Data *priv)
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->first_interval = 0.85;
@@ -1457,7 +1457,7 @@ _elm_calendar_evas_object_smart_del(Eo *obj, Elm_Calendar_Data *sd)
    for (i = 0; i < ELM_DAY_LAST; i++)
      eina_stringshare_del(sd->weekdays[i]);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 static Eina_Bool _elm_calendar_smart_focus_next_enable = EINA_FALSE;
@@ -1590,13 +1590,12 @@ elm_calendar_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_calendar_eo_base_constructor(Eo *obj, Elm_Calendar_Data *sd)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
 
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_CALENDAR));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CALENDAR);
 
    return obj;
 }
diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index 78e790651..024e3dacb 100644
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -78,7 +78,7 @@ _activate(Evas_Object *obj)
              _elm_access_say(E_("State: Off"));
      }
 
-   eo_do(obj, eo_event_callback_call(ELM_CHECK_EVENT_CHANGED, NULL));
+   eo_event_callback_call(obj, ELM_CHECK_EVENT_CHANGED, NULL);
 
    if (_elm_config->atspi_mode)
        elm_interface_atspi_accessible_state_changed_signal_emit(obj,
@@ -107,7 +107,7 @@ _elm_check_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Check_Data
 {
    Elm_Atspi_State_Set states = 0;
 
-   eo_do_super(obj, ELM_CHECK_CLASS, states = elm_interface_atspi_accessible_state_set_get());
+   states = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_CHECK_CLASS));
 
    if (elm_check_state_get(obj))
        STATE_TYPE_SET(states, ELM_ATSPI_STATE_CHECKED);
@@ -123,12 +123,12 @@ _elm_check_elm_widget_sub_object_del(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED, E
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(sobj));
+   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    _icon_signal_emit(obj);
 
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 
    return EINA_TRUE;
 }
@@ -152,12 +152,12 @@ _elm_check_elm_container_content_set(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED, c
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_set(part, content));
+   int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
    if (!int_ret) return EINA_FALSE;
 
    _icon_signal_emit(obj);
 
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 
    return EINA_TRUE;
 }
@@ -205,7 +205,7 @@ _elm_check_elm_widget_theme_apply(Eo *obj, Elm_Check_Data *sd)
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    if (!sd->state) elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
@@ -218,7 +218,7 @@ _elm_check_elm_widget_theme_apply(Eo *obj, Elm_Check_Data *sd)
     * we can changed the theme API */
    _icon_signal_emit(obj);
 
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 
    return EINA_TRUE;
 }
@@ -283,7 +283,7 @@ _on_check_off(void *data,
    if (sd->statep) *sd->statep = sd->state;
 
    elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
-   eo_do(obj, eo_event_callback_call(ELM_CHECK_EVENT_CHANGED, NULL));
+   eo_event_callback_call(obj, ELM_CHECK_EVENT_CHANGED, NULL);
 
    if (_elm_config->atspi_mode)
        elm_interface_atspi_accessible_state_changed_signal_emit(data,
@@ -304,7 +304,7 @@ _on_check_on(void *data,
    sd->state = EINA_TRUE;
    if (sd->statep) *sd->statep = sd->state;
    elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
-   eo_do(obj, eo_event_callback_call(ELM_CHECK_EVENT_CHANGED, NULL));
+   eo_event_callback_call(obj, ELM_CHECK_EVENT_CHANGED, NULL);
 
    if (_elm_config->atspi_mode)
        elm_interface_atspi_accessible_state_changed_signal_emit(data,
@@ -326,7 +326,7 @@ _elm_check_evas_object_smart_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    edje_object_signal_callback_add
@@ -378,11 +378,10 @@ elm_check_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_check_eo_base_constructor(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_CHECK_BOX));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CHECK_BOX);
 
    return obj;
 }
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index 31f84f9b9..a5f8a0b9e 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -73,7 +73,7 @@ _on_clock_val_up(void *data)
    sd->interval = sd->interval / 1.05;
    ecore_timer_interval_set(sd->spin, sd->interval);
    _time_update(data, EINA_FALSE);
-   eo_do(data, eo_event_callback_call(ELM_CLOCK_EVENT_CHANGED, NULL));
+   eo_event_callback_call(data, ELM_CLOCK_EVENT_CHANGED, NULL);
    return ECORE_CALLBACK_RENEW;
 
 clock_val_up_cancel:
@@ -128,7 +128,7 @@ _on_clock_val_down(void *data)
    sd->interval = sd->interval / 1.05;
    ecore_timer_interval_set(sd->spin, sd->interval);
    _time_update(data, EINA_FALSE);
-   eo_do(data, eo_event_callback_call(ELM_CLOCK_EVENT_CHANGED, NULL));
+   eo_event_callback_call(data, ELM_CLOCK_EVENT_CHANGED, NULL);
    return ECORE_CALLBACK_RENEW;
 
 clock_val_down_cancel:
@@ -565,7 +565,7 @@ _elm_clock_elm_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _time_update(obj, EINA_TRUE);
@@ -654,7 +654,7 @@ _elm_clock_evas_object_smart_add(Eo *obj, Elm_Clock_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->cur.ampm = -1;
@@ -696,7 +696,7 @@ _elm_clock_evas_object_smart_del(Eo *obj, Elm_Clock_Data *sd)
 
    /* NB: digits are killed for being sub objects, automatically */
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 static Eina_Bool _elm_clock_smart_focus_next_enable = EINA_FALSE;
@@ -797,11 +797,10 @@ elm_clock_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_clock_eo_base_constructor(Eo *obj, Elm_Clock_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_TEXT));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TEXT);
 
    return obj;
 }
diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index 0bb7ff5bd..06fa1f006 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -291,7 +291,7 @@ _dropable_list_geom_find(Evas *evas, Evas_Coord px, Evas_Coord py)
          */
         while (object)
           {
-             eo_do(object, dropable = eo_key_data_get("__elm_dropable"));
+             dropable = eo_key_data_get(object, "__elm_dropable");
              if (dropable)
                {
                   Eina_Bool exist = EINA_FALSE;
@@ -414,7 +414,7 @@ static void
 _all_drop_targets_cbs_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *info EINA_UNUSED)
 {
    Dropable *dropable = NULL;
-   eo_do(obj, dropable = eo_key_data_get("__elm_dropable"));
+   dropable = eo_key_data_get(obj, "__elm_dropable");
    if (dropable)
      {
         Dropable_Cbs *cbs;
@@ -426,7 +426,7 @@ _all_drop_targets_cbs_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Obje
                                  cbs->poscb, cbs->posdata, cbs->dropcb, cbs->dropdata);
              // If elm_drop_target_del() happened to delete dropabale, then
              // re-fetch it each loop to make sure it didn't
-             eo_do(obj, dropable = eo_key_data_get("__elm_dropable"));
+             dropable = eo_key_data_get(obj, "__elm_dropable");
              if (!dropable) break;
           }
      }
@@ -1752,9 +1752,7 @@ _x11_drag_mouse_up(void *data, int etype EINA_UNUSED, void *event)
                     {
                        Evas_Object *win = elm_widget_top_get(dragwidget);
                        if (win && eo_isa(win, ELM_WIN_CLASS))
-                         eo_do(win, eo_event_callback_del(
-                                  ELM_WIN_EVENT_ROTATION_CHANGED,
-                                  _x11_win_rotation_changed_cb, dragwin));
+                         eo_event_callback_del(win, ELM_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
                     }
                }
 
@@ -2025,7 +2023,7 @@ _x11_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format,
    cbs->dropdata = dropdata;
    cbs->types = format;
 
-   eo_do(obj, dropable = eo_key_data_get("__elm_dropable"));
+   dropable = eo_key_data_get(obj, "__elm_dropable");
    if (!dropable)
      {
         /* Create new drop */
@@ -2035,7 +2033,7 @@ _x11_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format,
         drops = eina_list_append(drops, dropable);
         if (!drops) goto error;
         dropable->obj = obj;
-        eo_do(obj, eo_key_data_set("__elm_dropable", dropable));
+        eo_key_data_set(obj, "__elm_dropable", dropable);
      }
    dropable->cbs_list = eina_inlist_append(dropable->cbs_list, EINA_INLIST_GET(cbs));
 
@@ -2210,9 +2208,7 @@ _x11_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
         if (win && eo_isa(win, ELM_WIN_CLASS))
           {
              elm_win_rotation_set(dragwin, elm_win_rotation_get(win));
-             eo_do(win, eo_event_callback_add(
-                      ELM_WIN_EVENT_ROTATION_CHANGED,
-                      _x11_win_rotation_changed_cb, dragwin));
+             eo_event_callback_add(win, ELM_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
           }
      }
 
@@ -2751,7 +2747,7 @@ _wl_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State
    cbs->dropdata = dropdata;
    cbs->types = format;
 
-   eo_do(obj, dropable = eo_key_data_get("__elm_dropable"));
+   dropable = eo_key_data_get(obj, "__elm_dropable");
    if (!dropable)
      {
         /* Create new drop */
@@ -2760,7 +2756,7 @@ _wl_elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State
         drops = eina_list_append(drops, dropable);
         if (!drops) goto error;
         dropable->obj = obj;
-        eo_do(obj, eo_key_data_set("__elm_dropable", dropable));
+        eo_key_data_set(obj, "__elm_dropable", dropable);
      }
    dropable->cbs_list = eina_inlist_append(dropable->cbs_list, EINA_INLIST_GET(cbs));
 
@@ -3268,7 +3264,7 @@ _wl_dropable_data_handle(Wl_Cnp_Selection *sel, char *data, size_t size)
 
    win = _wl_elm_widget_window_get(sel->requestwidget);
 
-   eo_do(sel->requestwidget, drop = eo_key_data_get("__elm_dropable"));
+   drop = eo_key_data_get(sel->requestwidget, "__elm_dropable");
    if (drop)
      {
         Eina_Inlist *itr;
@@ -3896,7 +3892,7 @@ _local_elm_drop_target_del(Evas_Object *obj, Elm_Sel_Format format,
 
    _local_elm_cnp_init();
 
-   eo_do(obj, dropable = eo_key_data_get("__elm_dropable"));
+   dropable = eo_key_data_get(obj, "__elm_dropable");
    if (dropable)
      {
         Eina_Inlist *itr;
@@ -3917,7 +3913,7 @@ _local_elm_drop_target_del(Evas_Object *obj, Elm_Sel_Format format,
         if (!dropable->cbs_list)
           {
              drops = eina_list_remove(drops, dropable);
-             eo_do(obj, eo_key_data_del("__elm_dropable"));
+             eo_key_data_del(obj, "__elm_dropable");
              free(dropable);
              dropable = NULL;
              evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL,
@@ -5117,9 +5113,7 @@ elm_drag_cancel(Evas_Object *obj)
                {
                   Evas_Object *win = elm_widget_top_get(dragwidget);
                   if (win && eo_isa(win, ELM_WIN_CLASS))
-                     eo_do(win, eo_event_callback_del(
-                              ELM_WIN_EVENT_ROTATION_CHANGED,
-                              _x11_win_rotation_changed_cb, dragwin));
+                     eo_event_callback_del(win, ELM_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
                }
           }
         goto end;
diff --git a/src/lib/elm_color_class.c b/src/lib/elm_color_class.c
index fd9bb0e06..c2ea17cc0 100644
--- a/src/lib/elm_color_class.c
+++ b/src/lib/elm_color_class.c
@@ -735,22 +735,22 @@ elm_color_class_editor_add(Evas_Object *obj)
    elm_scroller_policy_set(gl, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
    elm_genlist_mode_set(gl, ELM_LIST_COMPRESS);
    elm_object_part_content_set(ly, "elm.swallow.list", gl);
-   eo_do(gl, eo_event_callback_add
-     (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _colorclass_activate, cc));
+   eo_event_callback_add
+     (gl, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _colorclass_activate, cc);
 
    cc->reset = bt = elm_button_add(ly);
    elm_object_style_set(bt, "colorclass");
    /* FIXME: translate */
    elm_object_text_set(bt, "Reset");
    elm_object_part_content_set(ly, "elm.swallow.reset", bt);
-   eo_do(bt, eo_event_callback_add
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _colorclass_reset, cc));
+   eo_event_callback_add
+     (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _colorclass_reset, cc);
 
    cc->cs = cs = elm_colorselector_add(ly);
    elm_colorselector_mode_set(cs, ELM_COLORSELECTOR_COMPONENTS);
    elm_object_part_content_set(ly, "elm.swallow.colors", cs);
-   eo_do(cs, eo_event_callback_add
-     (ELM_COLORSELECTOR_EVENT_CHANGED_USER, _colorclass_changed, cc));
+   eo_event_callback_add
+     (cs, ELM_COLORSELECTOR_EVENT_CHANGED_USER, _colorclass_changed, cc);
 
    EINA_LIST_FREE(ccs, ecc)
      elm_genlist_item_append(gl, &itc, ecc, NULL, 0, NULL, NULL);
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index bc3c2b481..09c3f4e76 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -575,8 +575,8 @@ _update_hsla_from_colorbar(Evas_Object *obj, Color_Type type, double x)
    _update_colorbars(sd);
    if ((sd->mode == ELM_COLORSELECTOR_ALL) || (sd->mode == ELM_COLORSELECTOR_PICKER))
      _color_picker_init(sd);
-   eo_do(obj, eo_event_callback_call(ELM_COLORSELECTOR_EVENT_CHANGED, NULL));
-   eo_do(obj, eo_event_callback_call(ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL));
+   eo_event_callback_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED, NULL);
+   eo_event_callback_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
 }
 
 static void
@@ -631,7 +631,7 @@ _colors_set(Evas_Object *obj,
      }
    if ((sd->mode == ELM_COLORSELECTOR_ALL) || (sd->mode == ELM_COLORSELECTOR_PICKER))
      _color_picker_init(sd);
-   eo_do(obj, eo_event_callback_call(ELM_COLORSELECTOR_EVENT_CHANGED, NULL));
+   eo_event_callback_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED, NULL);
 }
 
 static Eina_Bool
@@ -663,7 +663,7 @@ _spinner_changed_cb(void *data, const Eo_Event *event)
          break;
      }
    evas_object_data_del(event->obj, "_changed");
-   eo_do(parent, eo_event_callback_call(ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL));
+   eo_event_callback_call(parent, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
 
    return EINA_TRUE;
 }
@@ -754,7 +754,7 @@ _mouse_up_cb(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
    b = pixels[17 * 8 + 8] & 0xFF;
 
    _colors_set(o, r, g, b, 0xFF);
-   eo_do(o, eo_event_callback_call(ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL));
+   eo_event_callback_call(o, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
 
    return EINA_TRUE;
 }
@@ -896,8 +896,8 @@ _create_colorpicker(Evas_Object *obj)
         sd->button = elm_button_add(sd->picker);
         elm_object_style_set(sd->button, style);
         elm_object_text_set(sd->button, E_("Pick a color"));
-        eo_do(sd->button, eo_event_callback_add
-              (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _start_grab_pick_cb, obj));
+        eo_event_callback_add
+              (sd->button, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _start_grab_pick_cb, obj);
         elm_box_pack_end(bx, sd->button);
         evas_object_show(sd->button);
      }
@@ -920,8 +920,8 @@ _create_colorpicker(Evas_Object *obj)
         spinner = elm_spinner_add(sd->picker);
         elm_object_style_set(spinner, style);
         evas_object_data_set(spinner, "parent", obj);
-        eo_do(spinner, eo_event_callback_add
-              (ELM_SPINNER_EVENT_CHANGED, _spinner_changed_cb, sd));
+        eo_event_callback_add
+              (spinner, ELM_SPINNER_EVENT_CHANGED, _spinner_changed_cb, sd);
         elm_spinner_editable_set(spinner, EINA_TRUE);
         elm_spinner_interval_set(spinner, 0.1);
         elm_spinner_min_max_set(spinner, 0, 255);
@@ -1246,15 +1246,15 @@ _color_bars_add(Evas_Object *obj)
         elm_widget_sub_object_add(obj, sd->cb_data[i]->lbt);
         edje_object_part_swallow
           (sd->cb_data[i]->colorbar, "elm.l_button", sd->cb_data[i]->lbt);
-        eo_do(sd->cb_data[i]->lbt, eo_event_callback_add
-          (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]));
+        eo_event_callback_add
+          (sd->cb_data[i]->lbt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
         elm_button_autorepeat_set(sd->cb_data[i]->lbt, EINA_TRUE);
         elm_button_autorepeat_initial_timeout_set
           (sd->cb_data[i]->lbt, _elm_config->longpress_timeout);
         elm_button_autorepeat_gap_timeout_set
           (sd->cb_data[i]->lbt, (1.0 / _elm_config->fps));
-        eo_do(sd->cb_data[i]->lbt, eo_event_callback_add
-          (EVAS_CLICKABLE_INTERFACE_EVENT_REPEATED, _button_repeat_cb, sd->cb_data[i]));
+        eo_event_callback_add
+          (sd->cb_data[i]->lbt, EVAS_CLICKABLE_INTERFACE_EVENT_REPEATED, _button_repeat_cb, sd->cb_data[i]);
 
         /* load right button */
         if (!sd->cb_data[i]->rbt) sd->cb_data[i]->rbt = elm_button_add(obj);
@@ -1264,15 +1264,15 @@ _color_bars_add(Evas_Object *obj)
         elm_widget_sub_object_add(obj, sd->cb_data[i]->rbt);
         edje_object_part_swallow
           (sd->cb_data[i]->colorbar, "elm.r_button", sd->cb_data[i]->rbt);
-        eo_do(sd->cb_data[i]->rbt, eo_event_callback_add
-          (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]));
+        eo_event_callback_add
+          (sd->cb_data[i]->rbt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
         elm_button_autorepeat_set(sd->cb_data[i]->rbt, EINA_TRUE);
         elm_button_autorepeat_initial_timeout_set
           (sd->cb_data[i]->rbt, _elm_config->longpress_timeout);
         elm_button_autorepeat_gap_timeout_set
           (sd->cb_data[i]->rbt, (1.0 / _elm_config->fps));
-        eo_do(sd->cb_data[i]->rbt, eo_event_callback_add
-          (EVAS_CLICKABLE_INTERFACE_EVENT_REPEATED, _button_repeat_cb, sd->cb_data[i]));
+        eo_event_callback_add
+          (sd->cb_data[i]->rbt, EVAS_CLICKABLE_INTERFACE_EVENT_REPEATED, _button_repeat_cb, sd->cb_data[i]);
      }
 }
 
@@ -1290,7 +1290,7 @@ _elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    if ((sd->mode == ELM_COLORSELECTOR_PALETTE) ||
@@ -1526,8 +1526,8 @@ _on_color_long_press(void *data)
 
    sd->longpress_timer = NULL;
 
-   eo_do(WIDGET(item), eo_event_callback_call
-     (ELM_COLORSELECTOR_EVENT_COLOR_ITEM_LONGPRESSED, EO_OBJ(item)));
+   eo_event_callback_call
+     (WIDGET(item), ELM_COLORSELECTOR_EVENT_COLOR_ITEM_LONGPRESSED, EO_OBJ(item));
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -1601,8 +1601,8 @@ _on_color_released(void *data,
    elm_object_signal_emit(VIEW(item), "elm,state,selected", "elm");
    elm_colorselector_color_set(WIDGET(item), item->color->r, item->color->g,
                                item->color->b, item->color->a);
-   eo_do(WIDGET(item), eo_event_callback_call
-     (ELM_COLORSELECTOR_EVENT_COLOR_ITEM_SELECTED, EO_OBJ(item)));
+   eo_event_callback_call
+     (WIDGET(item), ELM_COLORSELECTOR_EVENT_COLOR_ITEM_SELECTED, EO_OBJ(item));
 
    eo_temp_item = eina_list_data_get(sd->selected);
    if (eo_temp_item && (eo_temp_item != EO_OBJ(item)))
@@ -1659,7 +1659,7 @@ _elm_color_item_elm_widget_item_access_register(Eo *eo_it, Elm_Color_Item_Data *
    Elm_Access_Info *ai;
 
    Evas_Object *res;
-   eo_do_super(eo_it, ELM_COLOR_ITEM_CLASS, res = elm_wdg_item_access_register());
+   res = elm_wdg_item_access_register(eo_super(eo_it, ELM_COLOR_ITEM_CLASS));
 
    ai = _elm_access_info_get(it->base->access_obj);
 
@@ -1691,11 +1691,11 @@ _elm_color_item_elm_widget_item_signal_emit(Eo *eo_it EINA_UNUSED,
 EOLIAN static Eo *
 _elm_color_item_eo_base_constructor(Eo *eo_item, Elm_Color_Item_Data *item)
 {
-   eo_item = eo_do_super_ret(eo_item, ELM_COLOR_ITEM_CLASS, eo_item, eo_constructor());
+   eo_item = eo_constructor(eo_super(eo_item, ELM_COLOR_ITEM_CLASS));
    item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    Evas_Object *obj;
-   eo_do (eo_item, obj = eo_parent_get());
+   obj = eo_parent_get(eo_item);
 
    VIEW(item) = elm_layout_add(obj);
    if (!elm_layout_theme_set
@@ -1728,7 +1728,7 @@ _elm_color_item_eo_base_constructor(Eo *eo_item, Elm_Color_Item_Data *item)
 
    // ACCESS
    if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
-     eo_do(eo_item, elm_wdg_item_access_register());
+     elm_wdg_item_access_register(eo_item);
 
    return eo_item;
 }
@@ -1737,7 +1737,7 @@ EOLIAN static void
 _elm_color_item_eo_base_destructor(Eo *obj, Elm_Color_Item_Data *item)
 {
    free(item->color);
-   eo_do_super(obj, ELM_COLOR_ITEM_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, ELM_COLOR_ITEM_CLASS));
 }
 
 static void
@@ -1866,7 +1866,7 @@ _elm_colorselector_evas_object_smart_add(Eo *obj, Elm_Colorselector_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set
@@ -1923,7 +1923,7 @@ _elm_colorselector_evas_object_smart_del(Eo *obj, Elm_Colorselector_Data *sd)
    /* This cb_data are used during the destruction process of base.del */
    for (i = 0; i < 4; i++)
      tmp[i] = sd->cb_data[i];
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
    for (i = 0; i < 4; i++)
      free(tmp[i]);
 }
@@ -2087,8 +2087,8 @@ _key_action_move(Evas_Object *obj, const char *params)
         elm_colorselector_color_set
           (WIDGET(item), item->color->r, item->color->g, item->color->b,
           item->color->a);
-        eo_do(WIDGET(item), eo_event_callback_call
-          (ELM_COLORSELECTOR_EVENT_COLOR_ITEM_SELECTED, eo_item));
+        eo_event_callback_call
+          (WIDGET(item), ELM_COLORSELECTOR_EVENT_COLOR_ITEM_SELECTED, eo_item);
         sd->selected = cl;
      }
    else if (!cl && sd->focused == ELM_COLORSELECTOR_PALETTE)
@@ -2182,12 +2182,12 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
         if (is_access)
           {
              EINA_LIST_FOREACH(sd->items, l, eo_it)
-               eo_do(eo_it, elm_wdg_item_access_register());
+               elm_wdg_item_access_register(eo_it);
           }
         else
           {
              EINA_LIST_FOREACH(sd->items, l, eo_it)
-               eo_do(eo_it, elm_wdg_item_access_unregister());
+               elm_wdg_item_access_unregister(eo_it);
           }
      }
    if ((sd->mode == ELM_COLORSELECTOR_COMPONENTS) ||
@@ -2224,11 +2224,10 @@ elm_colorselector_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_colorselector_eo_base_constructor(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_COLOR_CHOOSER));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_COLOR_CHOOSER);
 
    return obj;
 }
@@ -2340,7 +2339,7 @@ elm_colorselector_palette_item_color_get(const Elm_Object_Item *it,
                                          int *b,
                                          int *a)
 {
-   eo_do( it, elm_obj_color_item_color_get(r, g, b, a));
+   elm_obj_color_item_color_get(it, r, g, b, a);
 }
 
 EOLIAN static void
@@ -2364,7 +2363,7 @@ elm_colorselector_palette_item_color_set(Elm_Object_Item *it,
                                          int b,
                                          int a)
 {
-   eo_do( it, elm_obj_color_item_color_set(r, g, b, a));
+   elm_obj_color_item_color_set(it, r, g, b, a);
 }
 
 EOLIAN static void
@@ -2442,7 +2441,7 @@ EAPI void
 elm_colorselector_palette_item_selected_set(Elm_Object_Item *it,
                               Eina_Bool selected)
 {
-   eo_do( it, elm_obj_color_item_selected_set(selected));
+   elm_obj_color_item_selected_set(it, selected);
 }
 
 EOLIAN static void
@@ -2482,7 +2481,7 @@ EAPI Eina_Bool
 elm_colorselector_palette_item_selected_get(const Elm_Object_Item *it)
 {
    Eina_Bool ret;
-   return eo_do_ret(it, ret, elm_obj_color_item_selected_get());
+   return elm_obj_color_item_selected_get(it);
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 4f4c37308..7021c5cce 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -406,8 +406,8 @@ _create_portrait_indicator(Evas_Object *obj)
      }
 
    elm_widget_sub_object_add(obj, port_indicator);
-   eo_do(port_indicator, eo_event_callback_add
-     (ELM_PLUG_EVENT_IMAGE_DELETED, _port_indicator_disconnected, NULL));
+   eo_event_callback_add
+     (port_indicator, ELM_PLUG_EVENT_IMAGE_DELETED, _port_indicator_disconnected, NULL);
    evas_object_size_hint_min_set(port_indicator, -1, 0);
    evas_object_size_hint_max_set(port_indicator, -1, 0);
 
@@ -448,8 +448,8 @@ _create_landscape_indicator(Evas_Object *obj)
      }
 
    elm_widget_sub_object_add(obj, land_indicator);
-   eo_do(land_indicator, eo_event_callback_add
-     (ELM_PLUG_EVENT_IMAGE_DELETED, _land_indicator_disconnected, NULL));
+   eo_event_callback_add
+     (land_indicator, ELM_PLUG_EVENT_IMAGE_DELETED, _land_indicator_disconnected, NULL);
    evas_object_size_hint_min_set(land_indicator, -1, 0);
    evas_object_size_hint_max_set(land_indicator, -1, 0);
    return land_indicator;
@@ -576,7 +576,7 @@ _elm_conformant_elm_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UN
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _conformant_parts_swallow(obj);
@@ -760,8 +760,7 @@ _virtualkeypad_state_change(Evas_Object *obj, Ecore_X_Event_Window_Property *ev)
         _conformant_part_sizing_eval(obj, ELM_CONFORMANT_VIRTUAL_KEYPAD_PART);
         if (!sd->clipboard_state)
           elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE);
-        eo_do(obj, eo_event_callback_call(
-                 ELM_CONFORMANT_EVENT_VIRTUALKEYPAD_STATE_OFF, NULL));
+        eo_event_callback_call(obj, ELM_CONFORMANT_EVENT_VIRTUALKEYPAD_STATE_OFF, NULL);
      }
    else if (state == ECORE_X_VIRTUAL_KEYBOARD_STATE_ON)
      {
@@ -769,8 +768,7 @@ _virtualkeypad_state_change(Evas_Object *obj, Ecore_X_Event_Window_Property *ev)
         _conformant_part_sizing_eval(obj, ELM_CONFORMANT_VIRTUAL_KEYPAD_PART);
         elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_COMPRESS);
         _autoscroll_objects_update(obj);
-        eo_do(obj, eo_event_callback_call(
-                 ELM_CONFORMANT_EVENT_VIRTUALKEYPAD_STATE_ON, NULL));
+        eo_event_callback_call(obj, ELM_CONFORMANT_EVENT_VIRTUALKEYPAD_STATE_ON, NULL);
      }
 }
 
@@ -800,15 +798,13 @@ _clipboard_state_change(Evas_Object *obj, Ecore_X_Event_Window_Property *ev)
         evas_object_size_hint_max_set(sd->clipboard, -1, 0);
         if (!sd->vkb_state)
           elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE);
-        eo_do(obj, eo_event_callback_call(
-                 ELM_CONFORMANT_EVENT_CLIPBOARD_STATE_OFF, NULL));
+        eo_event_callback_call(obj, ELM_CONFORMANT_EVENT_CLIPBOARD_STATE_OFF, NULL);
      }
    else if (state == ECORE_X_ILLUME_CLIPBOARD_STATE_ON)
      {
         elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_COMPRESS);
         _autoscroll_objects_update(obj);
-        eo_do(obj, eo_event_callback_call(
-                 ELM_CONFORMANT_EVENT_CLIPBOARD_STATE_ON, NULL));
+        eo_event_callback_call(obj, ELM_CONFORMANT_EVENT_CLIPBOARD_STATE_ON, NULL);
      }
 }
 
@@ -918,7 +914,7 @@ _on_prop_change(void *data,
 EOLIAN static void
 _elm_conformant_evas_object_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
@@ -951,13 +947,10 @@ _elm_conformant_evas_object_smart_del(Eo *obj, Elm_Conformant_Data *sd)
 
    evas_object_data_set(sd->win, "\377 elm,conformant", NULL);
 
-   eo_do(sd->win,
-         eo_event_callback_del(ELM_WIN_EVENT_INDICATOR_PROP_CHANGED,
-            _on_indicator_mode_changed, obj),
-         eo_event_callback_del(ELM_WIN_EVENT_ROTATION_CHANGED,
-            _on_rotation_changed, obj));
+   eo_event_callback_del(sd->win, ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, _on_indicator_mode_changed, obj);
+   eo_event_callback_del(sd->win, ELM_WIN_EVENT_ROTATION_CHANGED, _on_rotation_changed, obj);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -996,11 +989,10 @@ elm_conformant_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
 
    Eo_Event event = {0};
    event.obj = sd->win;
@@ -1013,11 +1005,8 @@ _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
    sd->rot = elm_win_rotation_get(sd->win);
    evas_object_data_set(sd->win, "\377 elm,conformant", obj);
 
-   eo_do(sd->win,
-         eo_event_callback_add(ELM_WIN_EVENT_INDICATOR_PROP_CHANGED,
-            _on_indicator_mode_changed, obj),
-         eo_event_callback_add(ELM_WIN_EVENT_ROTATION_CHANGED,
-            _on_rotation_changed, obj));
+   eo_event_callback_add(sd->win, ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, _on_indicator_mode_changed, obj);
+   eo_event_callback_add(sd->win, ELM_WIN_EVENT_ROTATION_CHANGED, _on_rotation_changed, obj);
 
    return obj;
 }
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index 9d1d2f4f2..88fe79dd2 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -387,7 +387,7 @@ _elm_datetime_elm_widget_translate(Eo *obj, Elm_Datetime_Data *sd)
    if (!sd->user_format) _reload_format(obj);
    else _field_list_display(obj);
 
-   eo_do_super(obj, MY_CLASS, elm_obj_widget_translate());
+   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -461,7 +461,7 @@ _elm_datetime_elm_widget_on_focus(Eo *obj, Elm_Datetime_Data *sd, Elm_Object_Ite
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus(NULL));
+   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (!elm_widget_focus_get(obj))
@@ -480,7 +480,7 @@ _elm_datetime_elm_widget_disable(Eo *obj, Elm_Datetime_Data *sd)
    unsigned int idx = 0;
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_disable());
+   int_ret = elm_obj_widget_disable(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    for (idx = 0; idx < ELM_DATETIME_TYPE_COUNT; idx++)
@@ -520,7 +520,7 @@ _elm_datetime_elm_widget_theme_apply(Eo *obj, Elm_Datetime_Data *sd)
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    if ((!dt_mod) || (!dt_mod->field_value_display)) return EINA_TRUE;
@@ -801,7 +801,7 @@ _elm_datetime_evas_object_smart_add(Eo *obj, Elm_Datetime_Data *priv)
    Datetime_Field *field;
    int idx;
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    // module - initialise module for datetime
@@ -877,7 +877,7 @@ _elm_datetime_evas_object_smart_del(Eo *obj, Elm_Datetime_Data *sd)
    if ((dt_mod) && (dt_mod->obj_unhook))
      dt_mod->obj_unhook(sd->mod_data);  // module - unhook
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -891,11 +891,10 @@ elm_datetime_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_datetime_eo_base_constructor(Eo *obj, Elm_Datetime_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_DATE_EDITOR));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DATE_EDITOR);
 
    return obj;
 }
@@ -1026,7 +1025,7 @@ _elm_datetime_field_limit_set(Eo *obj, Elm_Datetime_Data *sd, Elm_Datetime_Field
    _apply_field_limits(obj);
 
    if (!_field_cmp(fieldtype, &old_time, &sd->curr_time))
-     eo_do(obj, eo_event_callback_call(ELM_DATETIME_EVENT_CHANGED, NULL));
+     eo_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
 
 }
 
@@ -1053,7 +1052,7 @@ _elm_datetime_value_set(Eo *obj, Elm_Datetime_Data *sd, const struct tm *newtime
    _validate_datetime_limits(&sd->max_limit, &sd->curr_time, EINA_TRUE);
    _apply_field_limits(obj);
 
-   eo_do(obj, eo_event_callback_call(ELM_DATETIME_EVENT_CHANGED, NULL));
+   eo_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
 
    return EINA_TRUE;
 }
@@ -1085,7 +1084,7 @@ _elm_datetime_value_min_set(Eo *obj, Elm_Datetime_Data *sd, const struct tm *min
    _apply_field_limits(obj);
 
    if (!_date_cmp(&old_time, &sd->curr_time))
-     eo_do(obj, eo_event_callback_call(ELM_DATETIME_EVENT_CHANGED, NULL));
+     eo_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
 
    return EINA_TRUE;
 }
@@ -1117,7 +1116,7 @@ _elm_datetime_value_max_set(Eo *obj, Elm_Datetime_Data *sd, const struct tm *max
    _apply_field_limits(obj);
 
    if (!_date_cmp(&old_time, &sd->curr_time))
-     eo_do(obj, eo_event_callback_call(ELM_DATETIME_EVENT_CHANGED, NULL));
+     eo_event_callback_call(obj, ELM_DATETIME_EVENT_CHANGED, NULL);
 
    return EINA_TRUE;
 }
diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index 4b245efe4..3f1b20910 100644
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -73,7 +73,7 @@ _elm_dayselector_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Dayselector_Data
         elm_object_text_set(VIEW(it), buf);
      }
 
-   eo_do_super(obj, MY_CLASS, elm_obj_widget_translate());
+   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -129,7 +129,7 @@ _elm_dayselector_elm_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd)
    char buf[1024];
    Elm_Dayselector_Item_Data *it;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    EINA_LIST_FOREACH(sd->items, l, it)
@@ -196,7 +196,7 @@ _item_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
    Elm_Dayselector_Item_Data *it = data;
 
-   eo_do(WIDGET(it), eo_event_callback_call(ELM_CHECK_EVENT_CHANGED, (void *)it->day));
+   eo_event_callback_call(WIDGET(it), ELM_CHECK_EVENT_CHANGED, (void *)it->day);
 
    return EINA_TRUE;
 }
@@ -239,7 +239,7 @@ _elm_dayselector_elm_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, co
      {
         snprintf(buf, sizeof(buf), "day%d", _item_location_get(sd, it));
 
-        eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_set(buf, content));
+        int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), buf, content);
         if (!int_ret) return EINA_FALSE;
 
         if (!content) return EINA_TRUE; /* item deletion already handled */
@@ -255,7 +255,7 @@ _elm_dayselector_elm_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, co
 
         snprintf(buf, sizeof(buf), "day%d", _item_location_get(sd, it));
 
-        eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_set(buf, content));
+        int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), buf, content);
         if (!int_ret)
           {
              eo_del(eo_it);
@@ -269,8 +269,8 @@ _elm_dayselector_elm_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, co
    snprintf(buf, sizeof(buf), "day%d,visible", _item_location_get(sd, it));
    elm_layout_signal_emit(obj, buf, "elm");
 
-   eo_do(VIEW(it), eo_event_callback_add
-     (ELM_CHECK_EVENT_CHANGED, _item_clicked_cb, it));
+   eo_event_callback_add
+     (VIEW(it), ELM_CHECK_EVENT_CHANGED, _item_clicked_cb, it);
    evas_object_event_callback_add
      (VIEW(it), EVAS_CALLBACK_DEL, _item_del_cb, obj);
 
@@ -292,7 +292,7 @@ _elm_dayselector_elm_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, co
 EOLIAN static Eo *
 _elm_dayselector_item_eo_base_constructor(Eo *eo_item, Elm_Dayselector_Item_Data *item)
 {
-   eo_item = eo_do_super_ret(eo_item, ELM_DAYSELECTOR_ITEM_CLASS, eo_item, eo_constructor());
+   eo_item = eo_constructor(eo_super(eo_item, ELM_DAYSELECTOR_ITEM_CLASS));
    item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    return eo_item;
@@ -314,12 +314,11 @@ _elm_dayselector_elm_container_content_unset(Eo *obj, Elm_Dayselector_Data *sd,
 
    content = VIEW(it);
 
-   eo_do_super(obj, MY_CLASS, content = elm_obj_container_content_unset(buf));
+   content = elm_obj_container_content_unset(eo_super(obj, MY_CLASS), buf);
    if (!content) return NULL;
 
    sd->items = eina_list_remove(sd->items, it);
-   eo_do(content, eo_event_callback_del(
-      ELM_CHECK_EVENT_CHANGED, _item_clicked_cb, it));
+   eo_event_callback_del(content, ELM_CHECK_EVENT_CHANGED, _item_clicked_cb, it);
    evas_object_event_callback_del(content, EVAS_CALLBACK_DEL, _item_del_cb);
 
    elm_object_signal_callback_del
@@ -415,7 +414,7 @@ _items_create(Evas_Object *obj)
 EOLIAN static void
 _elm_dayselector_evas_object_smart_add(Eo *obj, Elm_Dayselector_Data *priv)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set(obj, "dayselector", "base",
@@ -446,7 +445,7 @@ _elm_dayselector_evas_object_smart_del(Eo *obj, Elm_Dayselector_Data *sd)
      }
 
    /* handles freeing sd */
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -460,11 +459,10 @@ elm_dayselector_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_dayselector_eo_base_constructor(Eo *obj, Elm_Dayselector_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PANEL));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL);
 
    return obj;
 }
diff --git a/src/lib/elm_dbus_menu.c b/src/lib/elm_dbus_menu.c
index 43f270dcd..31078bf92 100644
--- a/src/lib/elm_dbus_menu.c
+++ b/src/lib/elm_dbus_menu.c
@@ -360,7 +360,7 @@ _root_layout_build(Elm_DBus_Menu *dbus_menu, Eina_List *property_list,
 
    if (recursion_depth > 0)
      {
-        eo_do(dbus_menu->menu, ret = elm_obj_menu_items_get());
+        ret = elm_obj_menu_items_get(dbus_menu->menu);
         items = (Eina_List *)ret;
         EINA_LIST_FOREACH (items, l, obj_item)
           {
@@ -443,7 +443,7 @@ _elm_dbus_menu_add(Eo *menu)
 
    dbus_menu->menu = menu;
 
-   eo_do(menu, ret = elm_obj_menu_items_get());
+   ret = elm_obj_menu_items_get(menu);
    items = (Eina_List *)ret;
    EINA_LIST_FOREACH (items, l, obj_item)
      {
diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index f0d5586b0..249a26e8a 100644
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -53,7 +53,7 @@ _elm_diskselector_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Diskselector_Dat
    Eina_List *l;
 
    EINA_LIST_FOREACH(sd->items, l, it)
-     eo_do(EO_OBJ(it), elm_wdg_item_translate());
+     elm_wdg_item_translate(EO_OBJ(it));
 
    return EINA_TRUE;
 }
@@ -89,8 +89,8 @@ _item_select(Elm_Diskselector_Item_Data *it)
    _selected_item_indicate(sd->selected_item);
 
    if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
-   eo_do(WIDGET(it), eo_event_callback_call
-     (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it));
+   eo_event_callback_call
+     (WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it);
 }
 
 static int
@@ -276,7 +276,7 @@ _scroller_move(void *data)
      }
 
    evas_object_geometry_get(obj, NULL, &y, &w, &h);
-   eo_do(obj, elm_interface_scrollable_content_region_show(w / sd->display_item_num * i, y, w, h));
+   elm_interface_scrollable_content_region_show(obj, w / sd->display_item_num * i, y, w, h);
    _item_select(dit);
 
    sd->init = EINA_TRUE;
@@ -300,8 +300,8 @@ _resize_cb(void *data EINA_UNUSED,
    if ((sd->minw == -1) && (sd->minh == -1))
      elm_coords_finger_size_adjust(6, &sd->minw, 1, &sd->minh);
 
-   eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &vw, &vh));
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, &vw, &vh);
    if (sd->items)
      {
         Elm_Diskselector_Item_Data *it = sd->items->data;
@@ -325,7 +325,7 @@ _resize_cb(void *data EINA_UNUSED,
                         * (sd->item_count + eina_list_count(sd->left_blanks)
                            + eina_list_count(sd->right_blanks)), h);
 
-   eo_do(obj, elm_interface_scrollable_paging_set(0, 0, (int)(w / sd->display_item_num), 0));
+   elm_interface_scrollable_paging_set(obj, 0, 0, (int)(w / sd->display_item_num), 0);
 
    if (!sd->scroller_move_idle_enterer)
      sd->scroller_move_idle_enterer = ecore_idle_enterer_before_add(_scroller_move, obj);
@@ -473,7 +473,7 @@ _elm_diskselector_item_eo_base_destructor(Eo *eo_it, Elm_Diskselector_Item_Data
 
    _sizing_eval(obj);
 
-   eo_do_super(eo_it, ELM_DISKSELECTOR_ITEM_CLASS, eo_destructor());
+   eo_destructor(eo_super(eo_it, ELM_DISKSELECTOR_ITEM_CLASS));
 }
 
 EOLIAN static void
@@ -611,8 +611,8 @@ _item_click_cb(void *data,
      }
 
    if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
-   eo_do(WIDGET(it), eo_event_callback_call
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, eo_it));
+   eo_event_callback_call
+     (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, eo_it);
 }
 
 static char *
@@ -646,13 +646,13 @@ _access_on_highlight_cb(void *data)
    x -= bx;
    y -= by;
 
-   eo_do(WIDGET(it), elm_interface_scrollable_region_bring_in(x, y, w, h));
+   elm_interface_scrollable_region_bring_in(WIDGET(it), x, y, w, h);
 }
 
 EOLIAN static Eo *
 _elm_diskselector_item_eo_base_constructor(Eo *eo_it, Elm_Diskselector_Item_Data *it)
 {
-   eo_it = eo_do_super_ret(eo_it, ELM_DISKSELECTOR_ITEM_CLASS, eo_it, eo_constructor());
+   eo_it = eo_constructor(eo_super(eo_it, ELM_DISKSELECTOR_ITEM_CLASS));
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
 
    return eo_it;
@@ -682,11 +682,11 @@ _item_new(Evas_Object *obj,
    evas_object_show(VIEW(it));
 
    if (icon)
-     eo_do(eo_it, elm_wdg_item_part_content_set("icon", icon));
+     elm_wdg_item_part_content_set(eo_it, "icon", icon);
 
    if (it->label)
      {
-        eo_do(eo_it, elm_wdg_item_part_text_set("default", it->label));
+        elm_wdg_item_part_text_set(eo_it, "default", it->label);
         edje_object_signal_callback_add
           (VIEW(it), "elm,action,click", "*", _item_click_cb, it);
      }
@@ -820,7 +820,7 @@ _elm_diskselector_elm_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd)
    Evas *evas;
    const char *style = elm_widget_style_get(obj);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    evas = evas_object_evas_get(obj);
@@ -878,7 +878,7 @@ _elm_diskselector_elm_widget_sub_object_del(Eo *obj, Elm_Diskselector_Data *sd,
    Elm_Diskselector_Item_Data *it;
    const Eina_List *l;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(sobj));
+   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    EINA_LIST_FOREACH(sd->items, l, it)
@@ -901,7 +901,7 @@ _elm_diskselector_elm_widget_on_focus(Eo *obj, Elm_Diskselector_Data *_pd EINA_U
    Eina_Bool int_ret = EINA_FALSE;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus(NULL));
+   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj))
@@ -1028,10 +1028,9 @@ _scroll_cb(Evas_Object *obj,
    ELM_DISKSELECTOR_DATA_GET(obj, sd);
 
    _string_check(obj);
-   eo_do(obj,
-         elm_interface_scrollable_content_pos_get(&x, &y),
-         elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &w, &h));
+   elm_interface_scrollable_content_pos_get(obj, &x, &y);
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, &w, &h);
    if (sd->round)
      {
         evas_object_geometry_get(sd->main_box, NULL, NULL, &bw, NULL);
@@ -1042,13 +1041,13 @@ _scroll_cb(Evas_Object *obj,
               if (sd->left_boundary_reached) return;
 
               sd->right_boundary_reached = EINA_TRUE;
-              eo_do(obj, elm_interface_scrollable_bounce_allow_get(&h_bounce, NULL));
+              elm_interface_scrollable_bounce_allow_get(obj, &h_bounce, NULL);
               /* If scroller's bounce effect is disabled, add 1 pixel
                *  to provide circular effect */
               adjust_pixels = (_elm_config->thumbscroll_bounce_enable
                                && h_bounce) ? 0 : 1;
-              eo_do(obj, elm_interface_scrollable_content_region_show
-                 (x - x_boundary + adjust_pixels, y, w, h));
+              elm_interface_scrollable_content_region_show
+                 (obj, x - x_boundary + adjust_pixels, y, w, h);
               sd->left_boundary_reached = EINA_FALSE;
           }
         else if (x <= 0)
@@ -1056,13 +1055,13 @@ _scroll_cb(Evas_Object *obj,
               if (sd->right_boundary_reached) return;
 
               sd->left_boundary_reached = EINA_TRUE;
-              eo_do(obj, elm_interface_scrollable_bounce_allow_get(&h_bounce, NULL));
+              elm_interface_scrollable_bounce_allow_get(obj, &h_bounce, NULL);
               /* If scroller's bounce effect is disabled, subtract 1 pixel
                *  to provide circular effect */
               adjust_pixels = (_elm_config->thumbscroll_bounce_enable
                                && h_bounce) ? 0 : 1;
-              eo_do(obj, elm_interface_scrollable_content_region_show
-                 (x + x_boundary - adjust_pixels, y, w, h));
+              elm_interface_scrollable_content_region_show
+                 (obj, x + x_boundary - adjust_pixels, y, w, h);
               sd->right_boundary_reached = EINA_FALSE;
           }
         else
@@ -1099,35 +1098,32 @@ _scroll_animate_stop_cb(Evas_Object *obj,
 
    if (!it) return;
    _item_select(it);
-   eo_do(data, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, EO_OBJ(it)));
+   eo_event_callback_call
+     (data, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, EO_OBJ(it));
 }
 
 static void
 _scroll_animate_start_cb(Evas_Object *obj,
                          void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START,
-     elm_diskselector_selected_item_get(obj)));
+   eo_event_callback_call
+     (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, elm_diskselector_selected_item_get(obj));
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START,
-     elm_diskselector_selected_item_get(obj)));
+   eo_event_callback_call
+     (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, elm_diskselector_selected_item_get(obj));
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP,
-     elm_diskselector_selected_item_get(obj)));
+   eo_event_callback_call
+     (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, elm_diskselector_selected_item_get(obj));
 }
 
 static void
@@ -1286,7 +1282,7 @@ _elm_diskselector_evas_object_smart_add(Eo *obj, Elm_Diskselector_Data *priv)
    edje = edje_object_add(evas);
    elm_widget_resize_object_set(obj, edje, EINA_TRUE);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
 
    elm_widget_theme_object_set
      (obj, edje, "diskselector", "base", elm_widget_style_get(obj));
@@ -1304,16 +1300,15 @@ _elm_diskselector_evas_object_smart_add(Eo *obj, Elm_Diskselector_Data *priv)
 
    priv->len_side = 3;
 
-   eo_do(obj,
-         elm_interface_scrollable_objects_set(edje, priv->hit_rect),
-         elm_obj_widget_theme_apply(),
-         elm_interface_scrollable_policy_set(ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF),
-         elm_interface_scrollable_bounce_allow_set(EINA_TRUE, EINA_FALSE),
-         elm_interface_scrollable_animate_start_cb_set(_scroll_animate_start_cb),
-         elm_interface_scrollable_animate_stop_cb_set(_scroll_animate_stop_cb),
-         elm_interface_scrollable_drag_start_cb_set(_scroll_drag_start_cb),
-         elm_interface_scrollable_drag_stop_cb_set(_scroll_drag_stop_cb),
-         elm_interface_scrollable_scroll_cb_set(_scroll_cb));
+   elm_interface_scrollable_objects_set(obj, edje, priv->hit_rect);
+   elm_obj_widget_theme_apply(obj);
+   elm_interface_scrollable_policy_set(obj, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   elm_interface_scrollable_bounce_allow_set(obj, EINA_TRUE, EINA_FALSE);
+   elm_interface_scrollable_animate_start_cb_set(obj, _scroll_animate_start_cb);
+   elm_interface_scrollable_animate_stop_cb_set(obj, _scroll_animate_stop_cb);
+   elm_interface_scrollable_drag_start_cb_set(obj, _scroll_drag_start_cb);
+   elm_interface_scrollable_drag_stop_cb_set(obj, _scroll_drag_stop_cb);
+   elm_interface_scrollable_scroll_cb_set(obj, _scroll_cb);
 
    evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize_cb, NULL);
 
@@ -1328,7 +1323,7 @@ _elm_diskselector_evas_object_smart_add(Eo *obj, Elm_Diskselector_Data *priv)
 
    elm_widget_sub_object_add(obj, priv->main_box);
 
-   eo_do(obj, elm_interface_scrollable_content_set(priv->main_box));
+   elm_interface_scrollable_content_set(obj, priv->main_box);
 
    /* left blank */
    blank = _blank_add(obj);
@@ -1422,13 +1417,13 @@ _elm_diskselector_evas_object_smart_del(Eo *obj, Elm_Diskselector_Data *sd)
    ELM_SAFE_FREE(sd->scroller_move_idle_enterer, ecore_idle_enterer_del);
    ELM_SAFE_FREE(sd->string_check_idle_enterer, ecore_idle_enterer_del);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_diskselector_evas_object_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
+   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -1436,7 +1431,7 @@ _elm_diskselector_evas_object_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Eva
 EOLIAN static void
 _elm_diskselector_evas_object_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
 }
@@ -1444,7 +1439,7 @@ _elm_diskselector_evas_object_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, E
 EOLIAN static void
 _elm_diskselector_evas_object_smart_member_add(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *member)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
+   evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -1467,11 +1462,10 @@ elm_diskselector_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_diskselector_eo_base_constructor(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
 
    return obj;
 }
@@ -1581,7 +1575,7 @@ elm_diskselector_bounce_set(Evas_Object *obj,
 {
    ELM_DISKSELECTOR_CHECK(obj);
 
-   eo_do(obj, elm_interface_scrollable_bounce_allow_set(h_bounce, v_bounce));
+   elm_interface_scrollable_bounce_allow_set(obj, h_bounce, v_bounce);
 }
 
 EAPI void
@@ -1591,7 +1585,7 @@ elm_diskselector_bounce_get(const Evas_Object *obj,
 {
    ELM_DISKSELECTOR_CHECK(obj);
 
-   eo_do((Eo *) obj, elm_interface_scrollable_bounce_allow_get(h_bounce, v_bounce));
+   elm_interface_scrollable_bounce_allow_get((Eo *) obj, h_bounce, v_bounce);
 }
 
 EAPI void
@@ -1600,7 +1594,7 @@ elm_diskselector_scroller_policy_get(const Evas_Object *obj,
                                      Elm_Scroller_Policy *policy_v)
 {
    ELM_DISKSELECTOR_CHECK(obj);
-   eo_do((Eo *) obj, elm_interface_scrollable_policy_get(policy_h, policy_v));
+   elm_interface_scrollable_policy_get((Eo *) obj, policy_h, policy_v);
 }
 
 EOLIAN static void
@@ -1608,7 +1602,7 @@ _elm_diskselector_elm_interface_scrollable_policy_get(Eo *obj, Elm_Diskselector_
 {
    Elm_Scroller_Policy s_policy_h, s_policy_v;
 
-   eo_do_super((Eo *)obj, MY_CLASS, elm_interface_scrollable_policy_get(&s_policy_h, &s_policy_v));
+   elm_interface_scrollable_policy_get(eo_super((Eo *)obj, MY_CLASS), &s_policy_h, &s_policy_v);
    if (policy_h) *policy_h = (Elm_Scroller_Policy)s_policy_h;
    if (policy_v) *policy_v = (Elm_Scroller_Policy)s_policy_v;
 }
@@ -1619,7 +1613,7 @@ elm_diskselector_scroller_policy_set(Evas_Object *obj,
                                      Elm_Scroller_Policy policy_v)
 {
    ELM_DISKSELECTOR_CHECK(obj);
-   eo_do(obj, elm_interface_scrollable_policy_set(policy_h, policy_v));
+   elm_interface_scrollable_policy_set(obj, policy_h, policy_v);
 }
 
 EOLIAN static void
@@ -1629,7 +1623,7 @@ _elm_diskselector_elm_interface_scrollable_policy_set(Eo *obj, Elm_Diskselector_
        (policy_v >= ELM_SCROLLER_POLICY_LAST))
      return;
 
-   eo_do_super(obj, MY_CLASS, elm_interface_scrollable_policy_set(policy_h, policy_v));
+   elm_interface_scrollable_policy_set(eo_super(obj, MY_CLASS), policy_h, policy_v);
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index 820a822a6..89456902b 100644
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -97,7 +97,7 @@ EOLIAN static Eina_Bool
 _elm_flip_elm_widget_theme_apply(Eo *obj, Elm_Flip_Data *sd EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _sizing_eval(obj);
@@ -171,7 +171,7 @@ _elm_flip_elm_widget_sub_object_add(Eo *obj, Elm_Flip_Data *_pd EINA_UNUSED, Eva
    if (evas_object_data_get(sobj, "elm-parent") == obj)
      return EINA_TRUE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_add(sobj));
+   int_ret = elm_obj_widget_sub_object_add(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    evas_object_data_set(sobj, "_elm_leaveme", sobj);
@@ -188,7 +188,7 @@ _elm_flip_elm_widget_sub_object_del(Eo *obj, Elm_Flip_Data *sd, Evas_Object *sob
    Eina_Bool int_ret = EINA_FALSE;
 
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(sobj));
+   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if (sobj == sd->front.content)
@@ -1332,7 +1332,7 @@ _flip(Evas_Object *obj)
           sd->state = sd->next_state;
         _configure(obj);
         _flip_show_hide(obj);
-        eo_do(obj, eo_event_callback_call(ELM_FLIP_EVENT_ANIMATE_DONE, NULL));
+        eo_event_callback_call(obj, ELM_FLIP_EVENT_ANIMATE_DONE, NULL);
 
         return ECORE_CALLBACK_CANCEL;
      }
@@ -1513,8 +1513,8 @@ _event_anim(void *data,
    _flip_show_hide(sd->obj);
    _configure(sd->obj);
    sd->animator = NULL;
-   eo_do(sd->obj, eo_event_callback_call
-     (ELM_FLIP_EVENT_ANIMATE_DONE, NULL));
+   eo_event_callback_call
+     (sd->obj, ELM_FLIP_EVENT_ANIMATE_DONE, NULL);
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -1700,7 +1700,7 @@ _move_cb(void *data,
              evas_smart_objects_calculate(evas_object_evas_get(data));
              _configure(fl);
              // FIXME: end hack
-             eo_do(fl, eo_event_callback_call(ELM_FLIP_EVENT_ANIMATE_BEGIN, NULL));
+             eo_event_callback_call(fl, ELM_FLIP_EVENT_ANIMATE_BEGIN, NULL);
           }
         else return;
      }
@@ -1803,7 +1803,7 @@ _elm_flip_elm_container_content_unset(Eo *obj EINA_UNUSED, Elm_Flip_Data *_pd EI
 EOLIAN static void
 _elm_flip_evas_object_smart_add(Eo *obj, Elm_Flip_Data *priv)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
@@ -1849,7 +1849,7 @@ _elm_flip_evas_object_smart_del(Eo *obj, Elm_Flip_Data *sd)
    ecore_animator_del(sd->animator);
    _state_slices_clear(sd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -1863,13 +1863,12 @@ elm_flip_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_flip_eo_base_constructor(Eo *obj, Elm_Flip_Data *sd)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
 
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PAGE_TAB_LIST));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST);
 
    return obj;
 }
@@ -1921,7 +1920,7 @@ _internal_elm_flip_go_to(Evas_Object *obj,
    evas_smart_objects_calculate(evas_object_evas_get(obj));
    _configure(obj);
    // FIXME: end hack
-   eo_do(obj, eo_event_callback_call(ELM_FLIP_EVENT_ANIMATE_BEGIN, NULL));
+   eo_event_callback_call(obj, ELM_FLIP_EVENT_ANIMATE_BEGIN, NULL);
 
    // set focus to the content object when flip go to is called
    if (elm_object_focus_get(obj))
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index 4a4f1b7e7..2e789e7ba 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -230,8 +230,8 @@ _on_item_changed(Elm_Flipselector_Data *sd)
 
    if (item->func)
      item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item);
-   eo_do(sd->obj, eo_event_callback_call
-     (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_item));
+   eo_event_callback_call
+     (sd->obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_item);
 }
 
 static void
@@ -290,13 +290,13 @@ _elm_flipselector_item_eo_base_destructor(Eo *eo_item, Elm_Flipselector_Item_Dat
    _sentinel_eval(sd);
    _update_view(sd->obj);
 
-   eo_do_super(eo_item, ELM_FLIPSELECTOR_ITEM_CLASS, eo_destructor());
+   eo_destructor(eo_super(eo_item, ELM_FLIPSELECTOR_ITEM_CLASS));
 }
 
 EOLIAN static Eo *
 _elm_flipselector_item_eo_base_constructor(Eo *obj, Elm_Flipselector_Item_Data *it)
 {
-   obj = eo_do_super_ret(obj, ELM_FLIPSELECTOR_ITEM_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, ELM_FLIPSELECTOR_ITEM_CLASS));
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    return obj;
@@ -338,7 +338,7 @@ _elm_flipselector_elm_widget_theme_apply(Eo *obj, Elm_Flipselector_Data *sd)
    Eina_Bool int_ret = EINA_FALSE;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    max_len = edje_object_data_get(wd->resize_obj, "max_len");
@@ -367,8 +367,8 @@ _flip_up(Elm_Flipselector_Data *sd)
    if (sd->current == sd->items)
      {
         sd->current = eina_list_last(sd->items);
-        eo_do(sd->obj, eo_event_callback_call
-          (ELM_FLIPSELECTOR_EVENT_UNDERFLOWED, NULL));
+        eo_event_callback_call
+          (sd->obj, ELM_FLIPSELECTOR_EVENT_UNDERFLOWED, NULL);
      }
    else
      sd->current = eina_list_prev(sd->current);
@@ -392,8 +392,8 @@ _flip_down(Elm_Flipselector_Data *sd)
    if (!sd->current)
      {
         sd->current = sd->items;
-        eo_do(sd->obj, eo_event_callback_call
-          (ELM_FLIPSELECTOR_EVENT_OVERFLOWED, NULL));
+        eo_event_callback_call
+          (sd->obj, ELM_FLIPSELECTOR_EVENT_OVERFLOWED, NULL);
      }
 
    eo_item = DATA_GET(sd->current);
@@ -520,7 +520,7 @@ _signal_val_change_stop(void *data,
 EOLIAN static void
 _elm_flipselector_evas_object_smart_add(Eo *obj, Elm_Flipselector_Data *priv)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set
@@ -540,7 +540,7 @@ _elm_flipselector_evas_object_smart_add(Eo *obj, Elm_Flipselector_Data *priv)
 
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 }
 
 EOLIAN static void
@@ -551,11 +551,11 @@ _elm_flipselector_evas_object_smart_del(Eo *obj, Elm_Flipselector_Data *sd)
    if (sd->walking) ERR("flipselector deleted while walking.\n");
 
    while (sd->items)
-     eo_do(DATA_GET(sd->items), elm_wdg_item_del());
+     elm_wdg_item_del(DATA_GET(sd->items));
 
    ecore_timer_del(sd->spin);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -569,12 +569,11 @@ elm_flipselector_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_flipselector_eo_base_constructor(Eo *obj, Elm_Flipselector_Data *sd)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
 
    return obj;
 }
diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index f08ad6e18..8b7226386 100644
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -113,8 +113,8 @@ _on_recalc_done(void *data,
    ELM_FRAME_DATA_GET(data, sd);
    ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
 
-   eo_do(wd->resize_obj, eo_event_callback_del
-     (EDJE_OBJECT_EVENT_RECALC, _recalc, data));
+   eo_event_callback_del
+     (wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, _recalc, data);
    sd->anim = EINA_FALSE;
 
    elm_layout_sizing_eval(data);
@@ -133,14 +133,13 @@ _on_frame_clicked(void *data,
 
    if (sd->collapsible)
      {
-        eo_do(wd->resize_obj, eo_event_callback_add(
-          EDJE_OBJECT_EVENT_RECALC, _recalc, data));
+        eo_event_callback_add(wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, _recalc, data);
         elm_layout_signal_emit(data, "elm,action,toggle", "elm");
         sd->collapsed++;
         sd->anim = EINA_TRUE;
      }
-   eo_do(data, eo_event_callback_call
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+   eo_event_callback_call
+     (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
 }
 
 /* using deferred sizing evaluation, just like the parent */
@@ -162,7 +161,7 @@ _elm_frame_evas_object_smart_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    edje_object_signal_callback_add
@@ -203,11 +202,10 @@ elm_frame_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_frame_eo_base_constructor(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FRAME));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FRAME);
 
    return obj;
 }
@@ -250,8 +248,8 @@ _elm_frame_collapse_go(Eo *obj, Elm_Frame_Data *sd, Eina_Bool collapse)
    if (sd->collapsed == collapse) return;
 
    elm_layout_signal_emit(obj, "elm,action,toggle", "elm");
-   eo_do(wd->resize_obj, eo_event_callback_call
-     (EDJE_OBJECT_EVENT_RECALC, obj));
+   eo_event_callback_call
+     (wd->resize_obj, EDJE_OBJECT_EVENT_RECALC, obj);
    sd->collapsed = collapse;
    sd->anim = EINA_TRUE;
 }
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index bf9b1f849..baec9c8a1 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -207,7 +207,7 @@ _item_cache_add(Elm_Gen_Item *it)
         Eina_Bool tmp;
         if (it->selected)
           edje_object_signal_emit(itc->base_view, "elm,state,unselected", "elm");
-        if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
+        if (elm_wdg_item_disabled_get(EO_OBJ(it)))
           edje_object_signal_emit(itc->base_view, "elm,state,enabled", "elm");
         if ((EO_OBJ(it) == sd->focused_item) &&
             (elm_widget_focus_highlight_enabled_get(obj) || _elm_config->win_auto_focus_enable))
@@ -343,7 +343,7 @@ _item_show_region(void *data)
           if (!eo_it) return;
           ELM_GENGRID_ITEM_DATA_GET(eo_it, it);
 
-          eo_do(sd->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
+          elm_obj_pan_pos_min_get(sd->pan_obj, &minx, &miny);
           if (sd->horizontal && (sd->item_height > 0))
             {
                if (it->x >= 1)
@@ -366,18 +366,18 @@ _item_show_region(void *data)
           switch (sd->scroll_to_type)
             {
                case ELM_GENGRID_ITEM_SCROLLTO_TOP:
-                  eo_do(WIDGET(it), elm_interface_scrollable_content_viewport_geometry_get
-                        (NULL, NULL, &vw, &vh));
+                  elm_interface_scrollable_content_viewport_geometry_get
+                        (WIDGET(it), NULL, NULL, &vw, &vh);
                   break;
                case ELM_GENGRID_ITEM_SCROLLTO_MIDDLE:
-                  eo_do(WIDGET(it), elm_interface_scrollable_content_viewport_geometry_get
-                        (NULL, NULL, &vw, &vh));
+                  elm_interface_scrollable_content_viewport_geometry_get
+                        (WIDGET(it), NULL, NULL, &vw, &vh);
                   it_xpos = it_xpos - ((vw - sd->item_width) / 2);
                   it_ypos = it_ypos - ((vh - sd->item_height) / 2);
                   break;
                case ELM_GENGRID_ITEM_SCROLLTO_BOTTOM:
-                  eo_do(WIDGET(it), elm_interface_scrollable_content_viewport_geometry_get
-                        (NULL, NULL, &vw, &vh));
+                  elm_interface_scrollable_content_viewport_geometry_get
+                        (WIDGET(it), NULL, NULL, &vw, &vh);
                   it_xpos = it_xpos - vw + sd->item_width;
                   it_ypos = it_ypos - vh + sd->item_height;
                   break;
@@ -389,14 +389,12 @@ _item_show_region(void *data)
 
           if (sd->show_region)
             {
-               eo_do(WIDGET(it), elm_interface_scrollable_content_region_show(
-                                                     it_xpos, it_ypos, vw, vh));
+               elm_interface_scrollable_content_region_show(WIDGET(it), it_xpos, it_ypos, vw, vh);
                sd->show_region = EINA_FALSE;
             }
           if (sd->bring_in)
             {
-               eo_do(WIDGET(it), elm_interface_scrollable_region_bring_in(
-                                                 it_xpos, it_ypos, vw, vh));
+               elm_interface_scrollable_region_bring_in(WIDGET(it), it_xpos, it_ypos, vw, vh);
                sd->bring_in = EINA_FALSE;
             }
        }
@@ -463,8 +461,8 @@ _calc_job(void *data)
           {
              sd->minh = minh;
              sd->minw = minw;
-             eo_do(sd->pan_obj, eo_event_callback_call
-                   (ELM_PAN_EVENT_CHANGED, NULL));
+             eo_event_callback_call
+                   (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
           }
 
         sd->nmax = nmax;
@@ -480,7 +478,7 @@ EOLIAN static void
 _elm_gengrid_pan_eo_base_destructor(Eo *obj, Elm_Gengrid_Pan_Data *psd)
 {
    eo_data_unref(psd->wobj, psd->wsd);
-   eo_do_super(obj, MY_PAN_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, MY_PAN_CLASS));
 }
 
 EOLIAN static void
@@ -515,8 +513,8 @@ _item_unselect(Elm_Gen_Item *it)
      {
         it->selected = EINA_FALSE;
         sd->selected = eina_list_remove(sd->selected, eo_it);
-        eo_do(WIDGET(it), eo_event_callback_call
-          (EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, eo_it));
+        eo_event_callback_call
+          (WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, eo_it);
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
      }
@@ -575,7 +573,7 @@ _item_mouse_move_cb(void *data,
    if ((it->dragging) && (it->down))
      {
         ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
-        eo_do(WIDGET(it), eo_event_callback_call(EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG, eo_it));
+        eo_event_callback_call(WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG, eo_it);
         return;
      }
 
@@ -648,25 +646,25 @@ _item_mouse_move_cb(void *data,
         if (dy < 0)
           {
              if (ady > adx)
-               eo_do(WIDGET(it), eo_event_callback_call
-                     (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_UP, eo_it));
+               eo_event_callback_call
+                     (WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_UP, eo_it);
              else
                {
                   if (dx < 0)
-                    eo_do(WIDGET(it), eo_event_callback_call(left_drag, eo_it));
+                    eo_event_callback_call(WIDGET(it), left_drag, eo_it);
                }
           }
         else
           {
              if (ady > adx)
-               eo_do(WIDGET(it), eo_event_callback_call
-                 (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_DOWN, eo_it));
+               eo_event_callback_call
+                 (WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_DOWN, eo_it);
              else
                {
                   if (dx < 0)
-                    eo_do(WIDGET(it), eo_event_callback_call(left_drag, eo_it));
+                    eo_event_callback_call(WIDGET(it), left_drag, eo_it);
                   else
-                    eo_do(WIDGET(it), eo_event_callback_call(right_drag, eo_it));
+                    eo_event_callback_call(WIDGET(it), right_drag, eo_it);
                }
           }
      }
@@ -680,22 +678,20 @@ _long_press_cb(void *data)
    ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
 
    it->long_timer = NULL;
-   if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) || (it->dragging))
+   if (elm_wdg_item_disabled_get(EO_OBJ(it)) || (it->dragging))
      return ECORE_CALLBACK_CANCEL;
    sd->longpressed = EINA_TRUE;
-   eo_do(WIDGET(it), eo_event_callback_call
-     (EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it)));
+   eo_event_callback_call
+     (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it));
 
    if (sd->reorder_mode)
      {
         sd->reorder_it = it;
         evas_object_raise(VIEW(it));
-        eo_do(WIDGET(it), elm_interface_scrollable_hold_set(EINA_TRUE));
-        eo_do(WIDGET(it), elm_interface_scrollable_bounce_allow_get(
-          &(sd->old_h_bounce),
-          &(sd->old_v_bounce)));
+        elm_interface_scrollable_hold_set(WIDGET(it), EINA_TRUE);
+        elm_interface_scrollable_bounce_allow_get(WIDGET(it), &(sd->old_h_bounce), &(sd->old_v_bounce));
 
-        eo_do(WIDGET(it), elm_interface_scrollable_bounce_allow_set(EINA_FALSE, EINA_FALSE));
+        elm_interface_scrollable_bounce_allow_set(WIDGET(it), EINA_FALSE, EINA_FALSE);
         edje_object_signal_emit(VIEW(it), "elm,state,reorder,enabled", "elm");
      }
 
@@ -714,8 +710,8 @@ _item_highlight(Elm_Gen_Item *it)
      return;
 
    edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
-   eo_do(WIDGET(it), eo_event_callback_call
-     (ELM_GENGRID_EVENT_HIGHLIGHTED, EO_OBJ(it)));
+   eo_event_callback_call
+     (WIDGET(it), ELM_GENGRID_EVENT_HIGHLIGHTED, EO_OBJ(it));
 
    selectraise = edje_object_data_get(VIEW(it), "selectraise");
    if ((selectraise) && (!strcmp(selectraise, "on")))
@@ -735,8 +731,7 @@ _item_unhighlight(Elm_Gen_Item *it)
      return;
 
    edje_object_signal_emit(VIEW(it), "elm,state,unselected", "elm");
-   eo_do(WIDGET(it), eo_event_callback_call(
-            ELM_GENGRID_EVENT_UNHIGHLIGHTED, eo_it));
+   eo_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_UNHIGHLIGHTED, eo_it);
 
    evas_object_stack_below(VIEW(it), sd->stack);
 
@@ -783,12 +778,11 @@ _item_mouse_down_cb(void *data,
    it->highlight_cb(it);
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      {
-        eo_do(WIDGET(it),
-              eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it)),
-              eo_event_callback_call(ELM_GENGRID_EVENT_ACTIVATED, EO_OBJ(it)));
+        eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
+        eo_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_ACTIVATED, EO_OBJ(it));
      }
 
-   eo_do(WIDGET(it), eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, EO_OBJ(it)));
+   eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, EO_OBJ(it));
    ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
    if (it->realized)
      it->long_timer = ecore_timer_add
@@ -879,7 +873,7 @@ _item_content_realize(Elm_Gen_Item *it,
                   continue;
                }
              elm_widget_sub_object_add(WIDGET(it), content);
-             if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
+             if (elm_wdg_item_disabled_get(EO_OBJ(it)))
                elm_widget_disabled_set(content, EINA_TRUE);
           }
      }
@@ -1011,13 +1005,13 @@ _elm_gengrid_item_unrealize(Elm_Gen_Item *it,
 
    evas_event_freeze(evas_object_evas_get(WIDGET(it)));
    if (!calc)
-     eo_do(WIDGET(it), eo_event_callback_call(ELM_GENGRID_EVENT_UNREALIZED, EO_OBJ(it)));
+     eo_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_UNREALIZED, EO_OBJ(it));
    ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
 
    _view_clear(VIEW(it), &(it->texts), &(it->contents));
 
    ELM_SAFE_FREE(it->states, elm_widget_stringlist_free);
-   eo_do(EO_OBJ(it), elm_wdg_item_track_cancel());
+   elm_wdg_item_track_cancel(EO_OBJ(it));
 
    it->unrealize_cb(it);
 
@@ -1050,8 +1044,8 @@ _item_mouse_up_cb(void *data,
         if (dx < 0) dx = -dx;
         if (dy < 0) dy = -dy;
         if ((dx < 5) && (dy < 5))
-          eo_do(WIDGET(it), eo_event_callback_call
-            (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_RIGHT, EO_OBJ(it)));
+          eo_event_callback_call
+            (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_RIGHT, EO_OBJ(it));
         return;
      }
 
@@ -1063,31 +1057,30 @@ _item_mouse_up_cb(void *data,
      sd->on_hold = EINA_TRUE;
    else sd->on_hold = EINA_FALSE;
 
-   eo_do(WIDGET(it), eo_event_callback_call
-     (ELM_GENGRID_EVENT_RELEASED, eo_it));
+   eo_event_callback_call
+     (WIDGET(it), ELM_GENGRID_EVENT_RELEASED, eo_it);
    ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
    if (it->dragging)
      {
         it->dragging = EINA_FALSE;
-        eo_do(WIDGET(it), eo_event_callback_call
-          (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_STOP, eo_it));
+        eo_event_callback_call
+          (WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_STOP, eo_it);
         dragged = EINA_TRUE;
      }
 
    if ((sd->reorder_mode) &&
        (sd->reorder_it))
      {
-        eo_do (WIDGET(it), eo_event_callback_call
-          (ELM_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder_it)));
+        eo_event_callback_call
+          (WIDGET(it), ELM_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder_it));
         sd->reorder_it = NULL;
         sd->move_effect_enabled = EINA_FALSE;
         ecore_job_del(sd->calc_job);
         sd->calc_job =
           ecore_job_add(_calc_job, sd->obj);
 
-        eo_do(WIDGET(it), elm_interface_scrollable_hold_set(EINA_FALSE));
-        eo_do(WIDGET(it), elm_interface_scrollable_bounce_allow_set(
-              sd->old_h_bounce, sd->old_v_bounce));
+        elm_interface_scrollable_hold_set(WIDGET(it), EINA_FALSE);
+        elm_interface_scrollable_bounce_allow_set(WIDGET(it), sd->old_h_bounce, sd->old_v_bounce);
 
         edje_object_signal_emit(VIEW(it), "elm,state,reorder,disabled", "elm");
      }
@@ -1108,7 +1101,7 @@ _item_mouse_up_cb(void *data,
           _elm_gengrid_item_unrealize(it, EINA_FALSE);
      }
 
-   if (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get())) return;
+   if (elm_wdg_item_disabled_get(eo_it)) return;
 
    if (sd->on_hold || !it->base->still_in)
      {
@@ -1202,8 +1195,8 @@ _elm_gengrid_item_index_update(Elm_Gen_Item *it)
 {
    if (it->position_update)
      {
-        eo_do(WIDGET(it), eo_event_callback_call
-          (ELM_GENGRID_EVENT_INDEX_UPDATE, EO_OBJ(it)));
+        eo_event_callback_call
+          (WIDGET(it), ELM_GENGRID_EVENT_INDEX_UPDATE, EO_OBJ(it));
         it->position_update = EINA_FALSE;
      }
 }
@@ -1380,7 +1373,7 @@ _item_realize(Elm_Gen_Item *it)
 
         if (it->selected)
           edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
-        if (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get()))
+        if (elm_wdg_item_disabled_get(eo_it))
           edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
      }
    edje_object_message_signal_process(VIEW(it));
@@ -1388,18 +1381,16 @@ _item_realize(Elm_Gen_Item *it)
 
    if (it->tooltip.content_cb)
      {
-        eo_do(eo_it,
-              elm_wdg_item_tooltip_content_cb_set(
-                 it->tooltip.content_cb, it->tooltip.data, NULL),
-              elm_wdg_item_tooltip_style_set(it->tooltip.style),
-              elm_wdg_item_tooltip_window_mode_set(it->tooltip.free_size));
+        elm_wdg_item_tooltip_content_cb_set(eo_it, it->tooltip.content_cb, it->tooltip.data, NULL);
+        elm_wdg_item_tooltip_style_set(eo_it, it->tooltip.style);
+        elm_wdg_item_tooltip_window_mode_set(eo_it, it->tooltip.free_size);
      }
 
    if (it->mouse_cursor)
-     eo_do(eo_it, elm_wdg_item_cursor_set(it->mouse_cursor));
+     elm_wdg_item_cursor_set(eo_it, it->mouse_cursor);
 
    if (it->cursor_engine_only)
-     eo_do(eo_it, elm_wdg_item_cursor_engine_only_set(it->cursor_engine_only));
+     elm_wdg_item_cursor_engine_only_set(eo_it, it->cursor_engine_only);
 
    if (eo_it == sd->focused_item)
      {
@@ -1638,8 +1629,8 @@ _item_place(Elm_Gen_Item *it,
         if (!was_realized)
           {
              _elm_gengrid_item_index_update(it);
-             eo_do(WIDGET(it), eo_event_callback_call
-               (ELM_GENGRID_EVENT_REALIZED, EO_OBJ(it)));
+             eo_event_callback_call
+               (WIDGET(it), ELM_GENGRID_EVENT_REALIZED, EO_OBJ(it));
           }
         if (it->parent)
           {
@@ -1837,8 +1828,8 @@ _group_item_place(Elm_Gengrid_Pan_Data *psd)
              if (!was_realized)
                {
                   _elm_gengrid_item_index_update(it);
-                  eo_do(WIDGET(it), eo_event_callback_call
-                    (ELM_GENGRID_EVENT_REALIZED, EO_OBJ(it)));
+                  eo_event_callback_call
+                    (WIDGET(it), ELM_GENGRID_EVENT_REALIZED, EO_OBJ(it));
                }
              evas_object_move
                (VIEW(it), GG_IT(it)->gx,
@@ -1926,8 +1917,8 @@ _elm_gengrid_pan_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Elm_Gengrid_Pa
         sd->move_effect_enabled = EINA_FALSE;
      }
 
-   eo_do(psd->wobj, eo_event_callback_call
-     (ELM_INTERFACE_SCROLLABLE_EVENT_CHANGED, NULL));
+   eo_event_callback_call
+     (psd->wobj, ELM_INTERFACE_SCROLLABLE_EVENT_CHANGED, NULL);
 
    if (sd->focused_item)
      _elm_widget_focus_highlight_start(psd->wobj);
@@ -1974,7 +1965,7 @@ _elm_gengrid_pan_elm_pan_pos_min_get(Eo *obj, Elm_Gengrid_Pan_Data *psd, Evas_Co
    Evas_Coord mx = 0, my = 0;
    Eina_Bool mirrored = elm_widget_mirrored_get(psd->wsd->obj);
 
-   eo_do(obj, elm_obj_pan_pos_max_get(&mx, &my));
+   elm_obj_pan_pos_max_get(obj, &mx, &my);
    if (x)
      *x = -mx * (mirrored ? 1 - psd->wsd->align_x : psd->wsd->align_x);
    if (y)
@@ -2002,7 +1993,7 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it)
 
    if (_is_no_select(it) ||
        (eo_it == sd->focused_item) ||
-       (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get())))
+       (elm_wdg_item_disabled_get(eo_it)))
      return;
 
    switch (_elm_config->focus_autoscroll_mode)
@@ -2030,7 +2021,7 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it)
         _elm_widget_focus_highlight_start(obj);
      }
 
-   eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_ITEM_FOCUSED, eo_it));
+   eo_event_callback_call(obj, ELM_GENGRID_EVENT_ITEM_FOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
 }
@@ -2060,7 +2051,7 @@ _elm_gengrid_item_unfocused(Elm_Object_Item *eo_it)
      }
 
    sd->focused_item = NULL;
-   eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_ITEM_UNFOCUSED, eo_it));
+   eo_event_callback_call(obj, ELM_GENGRID_EVENT_ITEM_UNFOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 }
@@ -2821,10 +2812,10 @@ _item_move_cb(void *data, double pos)
           _free_reorder_normal_data(sd->reorder.data);
         elm_gengrid_item_show(EO_OBJ(sd->reorder.it1),
                               ELM_GENGRID_ITEM_SCROLLTO_IN);
-        eo_do(sd->obj, eo_event_callback_call
-          (ELM_GENGRID_EVENT_ITEM_REORDER_ANIM_STOP, EO_OBJ(sd->reorder.it1)));
-        eo_do(sd->obj, eo_event_callback_call
-          (ELM_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder.it1)));
+        eo_event_callback_call
+          (sd->obj, ELM_GENGRID_EVENT_ITEM_REORDER_ANIM_STOP, EO_OBJ(sd->reorder.it1));
+        eo_event_callback_call
+          (sd->obj, ELM_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder.it1));
         sd->reorder.running = EINA_FALSE;
      }
    _elm_widget_focus_highlight_start(sd->obj);
@@ -2951,8 +2942,8 @@ _swap_items(Elm_Object_Item *eo_it1, Elm_Object_Item *eo_it2, Elm_Focus_Directio
           evas_object_raise(VIEW(rnd->corner_item));
      }
    evas_object_raise(VIEW(it1));
-   eo_do(sd->obj, eo_event_callback_call
-     (ELM_GENGRID_EVENT_ITEM_REORDER_ANIM_START, EO_OBJ(sd->reorder.it1)));
+   eo_event_callback_call
+     (sd->obj, ELM_GENGRID_EVENT_ITEM_REORDER_ANIM_START, EO_OBJ(sd->reorder.it1));
    //TODO: Add elm config for time
    ecore_animator_timeline_add(0.3, _item_move_cb, sd);
 }
@@ -3054,12 +3045,11 @@ _key_action_move(Evas_Object *obj, const char *params)
    Elm_Object_Item *it = NULL;
    Eina_Bool mirrored = elm_widget_mirrored_get(obj);
 
-   eo_do(obj,
-         elm_interface_scrollable_content_pos_get(&x, &y),
-         elm_interface_scrollable_step_size_get(&step_x, &step_y),
-         elm_interface_scrollable_page_size_get(&page_x, &page_y),
-         elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &v_w, &v_h));
+   elm_interface_scrollable_content_pos_get(obj, &x, &y);
+   elm_interface_scrollable_step_size_get(obj, &step_x, &step_y);
+   elm_interface_scrollable_page_size_get(obj, &page_x, &page_y);
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, &v_w, &v_h);
 
    if (sd->reorder_mode && sd->reorder.running) return EINA_TRUE;
    _elm_widget_focus_auto_show(obj);
@@ -3463,7 +3453,7 @@ _key_action_move(Evas_Object *obj, const char *params)
      }
    else return EINA_FALSE;
 
-   eo_do(obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+   elm_interface_scrollable_content_pos_set(obj, x, y, EINA_TRUE);
    return EINA_TRUE;
 }
 
@@ -3513,7 +3503,7 @@ _key_action_select(Evas_Object *obj, const char *params)
      }
 
    if (!sd->multi)
-     eo_do(WIDGET(it), eo_event_callback_call(ELM_GENGRID_EVENT_ACTIVATED, eo_it));
+     eo_event_callback_call(WIDGET(it), ELM_GENGRID_EVENT_ACTIVATED, eo_it);
 
    return EINA_TRUE;
 }
@@ -3616,7 +3606,7 @@ _elm_gengrid_elm_widget_on_focus(Eo *obj, Elm_Gengrid_Data *sd, Elm_Object_Item
    Eina_Bool int_ret = EINA_FALSE;
    Elm_Object_Item *eo_it = NULL;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus(NULL));
+   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj) && (sd->selected) &&
@@ -3758,7 +3748,7 @@ _mirrored_set(Evas_Object *obj,
    ELM_GENGRID_DATA_GET(obj, sd);
 
    _item_cache_zero(sd);
-   eo_do_super(obj, MY_CLASS, elm_interface_scrollable_mirrored_set(rtl));
+   elm_interface_scrollable_mirrored_set(eo_super(obj, MY_CLASS), rtl);
 
    if (!sd->items) return;
    it = ELM_GEN_ITEM_FROM_INLIST(sd->items);
@@ -3775,7 +3765,7 @@ EOLIAN static Eina_Bool
 _elm_gengrid_elm_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -3802,7 +3792,7 @@ _elm_gengrid_item_del_not_serious(Elm_Gen_Item *it)
    ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
    Elm_Object_Item *eo_it = EO_OBJ(it);
 
-   eo_do(eo_it, elm_wdg_item_pre_notify_del());
+   elm_wdg_item_pre_notify_del(eo_it);
    it->generation = sd->generation - 1; /* This means that the item is deleted */
 
    if (it->walking > 0) return;
@@ -3872,70 +3862,70 @@ static void
 _scroll_animate_start_cb(Evas_Object *obj,
                          void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL));
+   eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL);
 }
 
 static void
 _scroll_animate_stop_cb(Evas_Object *obj,
                         void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL));
+   eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL));
+   eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL));
+   eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL);
 }
 
 static void
 _edge_left_cb(Evas_Object *obj,
               void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_EDGE_LEFT, NULL));
+   eo_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_LEFT, NULL);
 }
 
 static void
 _edge_right_cb(Evas_Object *obj,
                void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_EDGE_RIGHT, NULL));
+   eo_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_RIGHT, NULL);
 }
 
 static void
 _edge_top_cb(Evas_Object *obj,
              void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_EDGE_TOP, NULL));
+   eo_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_TOP, NULL);
 }
 
 static void
 _edge_bottom_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_EDGE_BOTTOM, NULL));
+   eo_event_callback_call(obj, ELM_GENGRID_EVENT_EDGE_BOTTOM, NULL);
 }
 
 static void
 _scroll_page_change_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_SCROLL_PAGE_CHANGED, NULL));
+   eo_event_callback_call(obj, ELM_GENGRID_EVENT_SCROLL_PAGE_CHANGED, NULL);
 }
 
 static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL));
+   eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL);
 }
 
 static int
@@ -3967,7 +3957,7 @@ _elm_gengrid_item_elm_widget_item_disable(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *i
 
    if (it->realized)
      {
-        if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
+        if (elm_wdg_item_disabled_get(EO_OBJ(it)))
           edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
         else
           edje_object_signal_emit(VIEW(it), "elm,state,enabled", "elm");
@@ -4100,10 +4090,10 @@ _internal_elm_gengrid_clear(Evas_Object *obj,
    if (sd->pan_obj)
      {
         evas_object_size_hint_min_set(sd->pan_obj, sd->minw, sd->minh);
-        eo_do(sd->pan_obj, eo_event_callback_call
-          (ELM_PAN_EVENT_CHANGED, NULL));
+        eo_event_callback_call
+          (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
      }
-   eo_do(obj, elm_interface_scrollable_content_region_show(0, 0, 0, 0));
+   elm_interface_scrollable_content_region_show(obj, 0, 0, 0, 0);
    evas_event_thaw(evas_object_evas_get(obj));
    evas_event_thaw_eval(evas_object_evas_get(obj));
 
@@ -4141,7 +4131,7 @@ _item_select(Elm_Gen_Item *it)
    if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
    if (it->generation == sd->generation)
      {
-        eo_do(WIDGET(it), eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it));
+        eo_event_callback_call(WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it);
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
      }
@@ -4165,9 +4155,9 @@ _item_select(Elm_Gen_Item *it)
 EOLIAN static Eo *
 _elm_gengrid_item_eo_base_constructor(Eo *eo_it, Elm_Gen_Item *it)
 {
-   eo_it = eo_do_super_ret(eo_it, ELM_GENGRID_ITEM_CLASS, eo_it, eo_constructor());
+   eo_it = eo_constructor(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS));
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
-   eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST_ITEM));
+   elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_LIST_ITEM);
 
    return eo_it;
 }
@@ -4225,7 +4215,7 @@ _elm_gengrid_evas_object_smart_add(Eo *obj, Elm_Gengrid_Data *priv)
    Elm_Gengrid_Pan_Data *pan_data;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
@@ -4247,25 +4237,24 @@ _elm_gengrid_evas_object_smart_add(Eo *obj, Elm_Gengrid_Data *priv)
                              elm_widget_style_get(obj)))
      CRI("Failed to set layout!");
 
-   eo_do(obj, elm_interface_scrollable_objects_set(wd->resize_obj, priv->hit_rect));
+   elm_interface_scrollable_objects_set(obj, wd->resize_obj, priv->hit_rect);
 
    priv->old_h_bounce = bounce;
    priv->old_v_bounce = bounce;
 
-   eo_do(obj, elm_interface_scrollable_bounce_allow_set(bounce, bounce));
-
-   eo_do(obj,
-         elm_interface_scrollable_animate_start_cb_set
-         (_scroll_animate_start_cb),
-         elm_interface_scrollable_animate_stop_cb_set(_scroll_animate_stop_cb),
-         elm_interface_scrollable_drag_start_cb_set(_scroll_drag_start_cb),
-         elm_interface_scrollable_drag_stop_cb_set(_scroll_drag_stop_cb),
-         elm_interface_scrollable_edge_left_cb_set(_edge_left_cb),
-         elm_interface_scrollable_edge_right_cb_set(_edge_right_cb),
-         elm_interface_scrollable_edge_top_cb_set(_edge_top_cb),
-         elm_interface_scrollable_edge_bottom_cb_set(_edge_bottom_cb),
-         elm_interface_scrollable_scroll_cb_set(_scroll_cb),
-         elm_interface_scrollable_page_change_cb_set(_scroll_page_change_cb));
+   elm_interface_scrollable_bounce_allow_set(obj, bounce, bounce);
+
+   elm_interface_scrollable_animate_start_cb_set
+         (obj, _scroll_animate_start_cb);
+   elm_interface_scrollable_animate_stop_cb_set(obj, _scroll_animate_stop_cb);
+   elm_interface_scrollable_drag_start_cb_set(obj, _scroll_drag_start_cb);
+   elm_interface_scrollable_drag_stop_cb_set(obj, _scroll_drag_stop_cb);
+   elm_interface_scrollable_edge_left_cb_set(obj, _edge_left_cb);
+   elm_interface_scrollable_edge_right_cb_set(obj, _edge_right_cb);
+   elm_interface_scrollable_edge_top_cb_set(obj, _edge_top_cb);
+   elm_interface_scrollable_edge_bottom_cb_set(obj, _edge_bottom_cb);
+   elm_interface_scrollable_scroll_cb_set(obj, _scroll_cb);
+   elm_interface_scrollable_page_change_cb_set(obj, _scroll_page_change_cb);
 
    priv->align_x = 0.5;
    priv->align_y = 0.5;
@@ -4282,7 +4271,7 @@ _elm_gengrid_evas_object_smart_add(Eo *obj, Elm_Gengrid_Data *priv)
    evas_object_smart_member_add(priv->stack, priv->pan_obj);
    evas_object_raise(priv->stack);
 
-   eo_do(obj, elm_interface_scrollable_extern_pan_set(priv->pan_obj));
+   elm_interface_scrollable_extern_pan_set(obj, priv->pan_obj);
 }
 
 EOLIAN static void
@@ -4295,13 +4284,13 @@ _elm_gengrid_evas_object_smart_del(Eo *obj, Elm_Gengrid_Data *sd)
    _item_cache_zero(sd);
    ecore_job_del(sd->calc_job);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_gengrid_evas_object_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
+   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -4309,7 +4298,7 @@ _elm_gengrid_evas_object_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x,
 EOLIAN static void
 _elm_gengrid_evas_object_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
 }
@@ -4317,7 +4306,7 @@ _elm_gengrid_evas_object_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord
 EOLIAN static void
 _elm_gengrid_evas_object_smart_member_add(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *member)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
+   evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -4356,13 +4345,12 @@ elm_gengrid_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_gengrid_eo_base_constructor(Eo *obj, Elm_Gengrid_Data *sd)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
 
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_TREE_TABLE));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TREE_TABLE);
 
    return obj;
 }
@@ -4712,7 +4700,7 @@ _elm_gengrid_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it,
 {
    Eina_Bool tmp;
    ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
-   if ((it->generation < sd->generation) || eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
+   if ((it->generation < sd->generation) || elm_wdg_item_disabled_get(EO_OBJ(it)))
      return;
    selected = !!selected;
    if (it->selected == selected) return;
@@ -4804,7 +4792,7 @@ EAPI void
 elm_gengrid_item_tooltip_text_set(Elm_Object_Item *it,
                                   const char *text)
 {
-   eo_do(it, elm_wdg_item_tooltip_text_set(text));
+   elm_wdg_item_tooltip_text_set(it, text);
 }
 
 EOLIAN static void
@@ -4822,7 +4810,7 @@ elm_gengrid_item_tooltip_content_cb_set(Elm_Object_Item *item,
                                         const void *data,
                                         Evas_Smart_Cb del_cb)
 {
-   eo_do(item, elm_wdg_item_tooltip_content_cb_set(func, data, del_cb));
+   elm_wdg_item_tooltip_content_cb_set(item, func, data, del_cb);
 }
 
 EOLIAN static void
@@ -4843,12 +4831,10 @@ _elm_gengrid_item_elm_widget_item_tooltip_content_cb_set(Eo *eo_it, Elm_Gen_Item
      }
    if (VIEW(it))
      {
-        eo_do_super(eo_it, ELM_GENGRID_ITEM_CLASS,
-              elm_wdg_item_tooltip_content_cb_set
-              (it->tooltip.content_cb, it->tooltip.data, NULL));
-        eo_do(eo_it,
-              elm_wdg_item_tooltip_style_set(it->tooltip.style),
-              elm_wdg_item_tooltip_window_mode_set(it->tooltip.free_size));
+        elm_wdg_item_tooltip_content_cb_set
+              (eo_super(eo_it, ELM_GENGRID_ITEM_CLASS), it->tooltip.content_cb, it->tooltip.data, NULL);
+        elm_wdg_item_tooltip_style_set(eo_it, it->tooltip.style);
+        elm_wdg_item_tooltip_window_mode_set(eo_it, it->tooltip.free_size);
      }
 
    return;
@@ -4860,7 +4846,7 @@ error:
 EAPI void
 elm_gengrid_item_tooltip_unset(Elm_Object_Item *item)
 {
-   eo_do(item, elm_wdg_item_tooltip_unset());
+   elm_wdg_item_tooltip_unset(item);
 }
 
 EOLIAN static void
@@ -4869,8 +4855,7 @@ _elm_gengrid_item_elm_widget_item_tooltip_unset(Eo *eo_it, Elm_Gen_Item *it)
    ELM_GENGRID_ITEM_CHECK_OR_RETURN(it);
 
    if ((VIEW(it)) && (it->tooltip.content_cb))
-     eo_do_super(eo_it, ELM_GENGRID_ITEM_CLASS,
-           elm_wdg_item_tooltip_unset());
+     elm_wdg_item_tooltip_unset(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS));
 
    if (it->tooltip.del_cb)
      it->tooltip.del_cb((void *)it->tooltip.data, WIDGET(it), it);
@@ -4879,14 +4864,14 @@ _elm_gengrid_item_elm_widget_item_tooltip_unset(Eo *eo_it, Elm_Gen_Item *it)
    it->tooltip.data = NULL;
    it->tooltip.free_size = EINA_FALSE;
    if (it->tooltip.style)
-     eo_do(eo_it, elm_wdg_item_tooltip_style_set(NULL));
+     elm_wdg_item_tooltip_style_set(eo_it, NULL);
 }
 
 EAPI void
 elm_gengrid_item_tooltip_style_set(Elm_Object_Item *it,
                                    const char *style)
 {
-   eo_do(it, elm_wdg_item_tooltip_style_set(style));
+   elm_wdg_item_tooltip_style_set(it, style);
 }
 
 EOLIAN static void
@@ -4894,15 +4879,14 @@ _elm_gengrid_item_elm_widget_item_tooltip_style_set(Eo *eo_it, Elm_Gen_Item *it,
                                    const char *style)
 {
    eina_stringshare_replace(&it->tooltip.style, style);
-   if (VIEW(it)) eo_do_super(eo_it, ELM_GENGRID_ITEM_CLASS,
-         elm_wdg_item_tooltip_style_set(style));
+   if (VIEW(it)) elm_wdg_item_tooltip_style_set(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS), style);
 }
 
 EAPI const char *
 elm_gengrid_item_tooltip_style_get(const Elm_Object_Item *it)
 {
    const char *ret;
-   return eo_do_ret(it, ret, elm_wdg_item_tooltip_style_get());
+   return elm_wdg_item_tooltip_style_get(it);
 }
 
 EOLIAN static const char *
@@ -4916,7 +4900,7 @@ elm_gengrid_item_tooltip_window_mode_set(Elm_Object_Item *it,
                                          Eina_Bool disable)
 {
    Eina_Bool ret;
-   return eo_do_ret(it, ret, elm_wdg_item_tooltip_window_mode_set(disable));
+   return elm_wdg_item_tooltip_window_mode_set(it, disable);
 }
 
 EOLIAN static Eina_Bool
@@ -4927,8 +4911,7 @@ _elm_gengrid_item_elm_widget_item_tooltip_window_mode_set(Eo *eo_it, Elm_Gen_Ite
    if (VIEW(it))
      {
         Eina_Bool ret;
-        eo_do_super(eo_it, ELM_GENGRID_ITEM_CLASS,
-            ret = elm_wdg_item_tooltip_window_mode_set(disable));
+        ret = elm_wdg_item_tooltip_window_mode_set(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS), disable);
         return ret;
      }
 
@@ -4939,7 +4922,7 @@ EAPI Eina_Bool
 elm_gengrid_item_tooltip_window_mode_get(const Elm_Object_Item *it)
 {
    Eina_Bool ret;
-   return eo_do_ret(it, ret, elm_wdg_item_tooltip_window_mode_get());
+   return elm_wdg_item_tooltip_window_mode_get(it);
 }
 
 EOLIAN static Eina_Bool
@@ -4954,7 +4937,7 @@ EAPI void
 elm_gengrid_item_cursor_set(Elm_Object_Item *it,
                             const char *cursor)
 {
-   eo_do(it, elm_wdg_item_cursor_set(cursor));
+   elm_wdg_item_cursor_set(it, cursor);
 }
 
 EOLIAN static void
@@ -4964,21 +4947,20 @@ _elm_gengrid_item_elm_widget_item_cursor_set(Eo *eo_it, Elm_Gen_Item *it,
    ELM_GENGRID_ITEM_CHECK_OR_RETURN(it);
 
    eina_stringshare_replace(&it->mouse_cursor, cursor);
-   if (VIEW(it)) eo_do_super(eo_it, ELM_GENGRID_ITEM_CLASS,
-         elm_wdg_item_cursor_set(cursor));
+   if (VIEW(it)) elm_wdg_item_cursor_set(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS), cursor);
 }
 
 EAPI const char *
 elm_gengrid_item_cursor_get(const Elm_Object_Item *it)
 {
    const char *ret;
-   return eo_do_ret(it, ret, elm_wdg_item_cursor_get());
+   return elm_wdg_item_cursor_get(it);
 }
 
 EAPI void
 elm_gengrid_item_cursor_unset(Elm_Object_Item *item)
 {
-   eo_do(item, elm_wdg_item_cursor_unset());
+   elm_wdg_item_cursor_unset(item);
 }
 
 EOLIAN static void
@@ -4988,8 +4970,7 @@ _elm_gengrid_item_elm_widget_item_cursor_unset(Eo *eo_it, Elm_Gen_Item *it)
    if (!it->mouse_cursor)
      return;
 
-   if (VIEW(it)) eo_do_super(eo_it, ELM_GENGRID_ITEM_CLASS,
-         elm_wdg_item_cursor_unset());
+   if (VIEW(it)) elm_wdg_item_cursor_unset(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS));
 
    ELM_SAFE_FREE(it->mouse_cursor, eina_stringshare_del);
 }
@@ -4998,14 +4979,14 @@ EAPI void
 elm_gengrid_item_cursor_style_set(Elm_Object_Item *it,
                                   const char *style)
 {
-   eo_do(it, elm_wdg_item_cursor_style_set(style));
+   elm_wdg_item_cursor_style_set(it, style);
 }
 
 EAPI const char *
 elm_gengrid_item_cursor_style_get(const Elm_Object_Item *it)
 {
    const char *ret;
-   return eo_do_ret(it, ret, elm_wdg_item_cursor_style_get());
+   return elm_wdg_item_cursor_style_get(it);
 }
 
 EAPI void
@@ -5015,7 +4996,7 @@ elm_gengrid_item_cursor_engine_only_set(Elm_Object_Item *eo_it,
    ELM_GENGRID_ITEM_DATA_GET(eo_it, it);
    it->cursor_engine_only = engine_only;
    if (it->realized)
-     eo_do(eo_it, elm_wdg_item_cursor_engine_only_set(engine_only));
+     elm_wdg_item_cursor_engine_only_set(eo_it, engine_only);
 }
 
 EAPI Eina_Bool
@@ -5024,7 +5005,7 @@ elm_gengrid_item_cursor_engine_only_get(const Elm_Object_Item *eo_it)
    ELM_GENGRID_ITEM_DATA_GET(eo_it, it);
    Eina_Bool ret;
    if (it->realized)
-     return eo_do_ret(eo_it, ret, elm_wdg_item_cursor_engine_only_get());
+     return elm_wdg_item_cursor_engine_only_get(eo_it);
    else return it->cursor_engine_only;
 }
 
@@ -5067,13 +5048,13 @@ elm_gengrid_bounce_set(Evas_Object *obj,
                        Eina_Bool v_bounce)
 {
    ELM_GENGRID_CHECK(obj);
-   eo_do(obj, elm_interface_scrollable_bounce_allow_set(h_bounce, v_bounce));
+   elm_interface_scrollable_bounce_allow_set(obj, h_bounce, v_bounce);
 }
 
 EOLIAN static void
 _elm_gengrid_elm_interface_scrollable_bounce_allow_set(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED, Eina_Bool h_bounce, Eina_Bool v_bounce)
 {
-   eo_do_super(obj, MY_CLASS, elm_interface_scrollable_bounce_allow_set(!!h_bounce, !!v_bounce));
+   elm_interface_scrollable_bounce_allow_set(eo_super(obj, MY_CLASS), !!h_bounce, !!v_bounce);
 }
 
 EAPI void
@@ -5082,7 +5063,7 @@ elm_gengrid_bounce_get(const Evas_Object *obj,
                        Eina_Bool *v_bounce)
 {
    ELM_GENGRID_CHECK(obj);
-   eo_do( obj, elm_interface_scrollable_bounce_allow_get(h_bounce, v_bounce));
+   elm_interface_scrollable_bounce_allow_get(obj, h_bounce, v_bounce);
 }
 
 EOLIAN static void
@@ -5091,15 +5072,15 @@ _elm_gengrid_page_relative_set(Eo *obj, Elm_Gengrid_Data *_pd EINA_UNUSED, doubl
    Evas_Coord pagesize_h;
    Evas_Coord pagesize_v;
 
-   eo_do( obj, elm_interface_scrollable_paging_get(NULL, NULL, &pagesize_h, &pagesize_v));
-   eo_do( obj, elm_interface_scrollable_paging_set
-     (h_pagerel, v_pagerel, pagesize_h, pagesize_v));
+   elm_interface_scrollable_paging_get(obj, NULL, NULL, &pagesize_h, &pagesize_v);
+   elm_interface_scrollable_paging_set
+     (obj, h_pagerel, v_pagerel, pagesize_h, pagesize_v);
 }
 
 EOLIAN static void
 _elm_gengrid_page_relative_get(Eo *obj, Elm_Gengrid_Data *_pd EINA_UNUSED, double *h_pagerel, double *v_pagerel)
 {
-   eo_do( obj, elm_interface_scrollable_paging_get(h_pagerel, v_pagerel, NULL, NULL));
+   elm_interface_scrollable_paging_get(obj, h_pagerel, v_pagerel, NULL, NULL);
 }
 
 EOLIAN static void
@@ -5108,9 +5089,9 @@ _elm_gengrid_page_size_set(Eo *obj, Elm_Gengrid_Data *_pd EINA_UNUSED, Evas_Coor
    double pagerel_h;
    double pagerel_v;
 
-   eo_do( obj, elm_interface_scrollable_paging_get(&pagerel_h, &pagerel_v, NULL, NULL));
-   eo_do( obj, elm_interface_scrollable_paging_set
-     (pagerel_h, pagerel_v, h_pagesize, v_pagesize));
+   elm_interface_scrollable_paging_get(obj, &pagerel_h, &pagerel_v, NULL, NULL);
+   elm_interface_scrollable_paging_set
+     (obj, pagerel_h, pagerel_v, h_pagesize, v_pagesize);
 }
 
 EAPI void
@@ -5119,7 +5100,7 @@ elm_gengrid_current_page_get(const Evas_Object *obj,
                              int *v_pagenumber)
 {
    ELM_GENGRID_CHECK(obj);
-   eo_do( obj, elm_interface_scrollable_current_page_get(h_pagenumber, v_pagenumber));
+   elm_interface_scrollable_current_page_get(obj, h_pagenumber, v_pagenumber);
 }
 
 EAPI void
@@ -5128,7 +5109,7 @@ elm_gengrid_last_page_get(const Evas_Object *obj,
                           int *v_pagenumber)
 {
    ELM_GENGRID_CHECK(obj);
-   eo_do( obj, elm_interface_scrollable_last_page_get(h_pagenumber, v_pagenumber));
+   elm_interface_scrollable_last_page_get(obj, h_pagenumber, v_pagenumber);
 }
 
 EINA_DEPRECATED EAPI void
@@ -5137,7 +5118,7 @@ elm_gengrid_page_show(const Evas_Object *obj,
                       int v_pagenumber)
 {
    ELM_GENGRID_CHECK(obj);
-   eo_do( obj, elm_interface_scrollable_page_show(h_pagenumber, v_pagenumber));
+   elm_interface_scrollable_page_show(obj, h_pagenumber, v_pagenumber);
 }
 
 EINA_DEPRECATED EAPI void
@@ -5146,7 +5127,7 @@ elm_gengrid_page_bring_in(const Evas_Object *obj,
                           int v_pagenumber)
 {
    ELM_GENGRID_CHECK(obj);
-   eo_do( obj, elm_interface_scrollable_page_bring_in(h_pagenumber, v_pagenumber));
+   elm_interface_scrollable_page_bring_in(obj, h_pagenumber, v_pagenumber);
 }
 
 EAPI void
@@ -5155,7 +5136,7 @@ elm_gengrid_scroller_policy_set(Evas_Object *obj,
                                 Elm_Scroller_Policy policy_v)
 {
    ELM_GENGRID_CHECK(obj);
-   eo_do(obj, elm_interface_scrollable_policy_set(policy_h, policy_v));
+   elm_interface_scrollable_policy_set(obj, policy_h, policy_v);
 }
 
 EOLIAN static void
@@ -5165,7 +5146,7 @@ _elm_gengrid_elm_interface_scrollable_policy_set(Eo *obj, Elm_Gengrid_Data *sd E
        (policy_v >= ELM_SCROLLER_POLICY_LAST))
      return;
 
-   eo_do_super(obj, MY_CLASS, elm_interface_scrollable_policy_set(policy_h, policy_v));
+   elm_interface_scrollable_policy_set(eo_super(obj, MY_CLASS), policy_h, policy_v);
 }
 
 EAPI void
@@ -5174,7 +5155,7 @@ elm_gengrid_scroller_policy_get(const Evas_Object *obj,
                                 Elm_Scroller_Policy *policy_v)
 {
    ELM_GENGRID_CHECK(obj);
-   eo_do( obj, elm_interface_scrollable_policy_get(policy_h, policy_v));
+   elm_interface_scrollable_policy_get(obj, policy_h, policy_v);
 }
 
 EOLIAN static void
@@ -5182,7 +5163,7 @@ _elm_gengrid_elm_interface_scrollable_policy_get(Eo *obj, Elm_Gengrid_Data *sd E
 {
    Elm_Scroller_Policy s_policy_h, s_policy_v;
 
-   eo_do_super(obj, MY_CLASS, elm_interface_scrollable_policy_get(&s_policy_h, &s_policy_v));
+   elm_interface_scrollable_policy_get(eo_super(obj, MY_CLASS), &s_policy_h, &s_policy_v);
    if (policy_h) *policy_h = (Elm_Scroller_Policy)s_policy_h;
    if (policy_v) *policy_v = (Elm_Scroller_Policy)s_policy_v;
 }
@@ -5491,9 +5472,9 @@ _elm_gengrid_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_Ge
    Elm_Atspi_State_Set ret;
    Eina_Bool sel;
 
-   eo_do_super(eo_it, ELM_GENGRID_ITEM_CLASS, ret = elm_interface_atspi_accessible_state_set_get());
+   ret = elm_interface_atspi_accessible_state_set_get(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS));
 
-   eo_do(eo_it, sel = elm_obj_gengrid_item_selected_get());
+   sel = elm_obj_gengrid_item_selected_get(eo_it);
 
    STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTABLE);
 
@@ -5509,7 +5490,7 @@ _elm_gengrid_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Gen_Ite
    char *ret;
    Eina_Strbuf *buf;
 
-   eo_do_super(eo_it, ELM_GENGRID_ITEM_CLASS, ret = elm_interface_atspi_accessible_name_get());
+   ret = elm_interface_atspi_accessible_name_get(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS));
    if (ret) return ret;
 
    buf = eina_strbuf_new();
@@ -5637,8 +5618,7 @@ _elm_gengrid_wheel_disabled_set(Eo *obj, Elm_Gengrid_Data *sd, Eina_Bool disable
 {
    disabled = !!disabled;
    if (sd->wheel_disabled != disabled)
-     eo_do(obj,
-           elm_interface_scrollable_wheel_disabled_set(disabled));
+     elm_interface_scrollable_wheel_disabled_set(obj, disabled);
 
    sd->wheel_disabled = disabled;
 }
@@ -5691,7 +5671,7 @@ _elm_gengrid_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Gengrid_Da
    EINA_INLIST_FOREACH(sd->items, it)
       ret = eina_list_append(ret, EO_OBJ(it));
 
-   eo_do_super(obj, ELM_GENGRID_CLASS, ret2 = elm_interface_atspi_accessible_children_get());
+   ret2 = elm_interface_atspi_accessible_children_get(eo_super(obj, ELM_GENGRID_CLASS));
 
    return eina_list_merge(ret, ret2);
 }
@@ -5701,7 +5681,7 @@ _elm_gengrid_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Gengrid_D
 {
    Elm_Atspi_State_Set ret;
 
-   eo_do_super(obj, ELM_GENGRID_CLASS, ret = elm_interface_atspi_accessible_state_set_get());
+   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_GENGRID_CLASS));
 
    STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MANAGES_DESCENDANTS);
 
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 89130a93a..d57fecbf6 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -262,7 +262,7 @@ _elm_genlist_pan_evas_object_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd)
 {
    ecore_job_del(psd->resize_job);
 
-   eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_PAN_CLASS));
 }
 
 EOLIAN static void
@@ -422,7 +422,7 @@ _item_content_realize(Elm_Gen_Item *it,
                   elm_widget_sub_object_add(WIDGET(it), content);
                }
 
-             if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
+             if (elm_wdg_item_disabled_get(EO_OBJ(it)))
                elm_widget_disabled_set(content, EINA_TRUE);
 
              snprintf(buf, sizeof(buf), "elm,state,%s,visible", key);
@@ -618,10 +618,10 @@ _item_scroll(Elm_Genlist_Data *sd)
         break;
      }
    if (sd->bring_in)
-      eo_do(sd->obj, elm_interface_scrollable_region_bring_in(dx, dy, dw, dh));
+      elm_interface_scrollable_region_bring_in(sd->obj, dx, dy, dw, dh);
    else
-      eo_do(sd->obj, elm_interface_scrollable_content_region_show
-            (dx, dy, dw, dh));
+      elm_interface_scrollable_content_region_show
+            (sd->obj, dx, dy, dw, dh);
 
    it->item->show_me = EINA_FALSE;
    sd->show_item = NULL;
@@ -642,13 +642,13 @@ _elm_genlist_item_unrealize(Elm_Gen_Item *it,
 
    evas_event_freeze(evas_object_evas_get(WIDGET(it)));
    if (!calc)
-     eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_UNREALIZED, EO_OBJ(it)));
+     eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_UNREALIZED, EO_OBJ(it));
    ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
 
    _view_clear(VIEW(it), &(it->texts), NULL);
    ELM_SAFE_FREE(it->item_focus_chain, eina_list_free);
 
-   eo_do(EO_OBJ(it), elm_wdg_item_track_cancel());
+   elm_wdg_item_track_cancel(EO_OBJ(it));
 
    _item_unrealize(it);
 
@@ -717,8 +717,8 @@ _calc_job(void *data)
 
    evas_object_geometry_get(sd->pan_obj, NULL, NULL, &ow, &sd->h);
    if (sd->mode == ELM_LIST_COMPRESS)
-      eo_do(sd->obj, elm_interface_scrollable_content_viewport_geometry_get
-            (NULL, NULL, &vw, NULL));
+      elm_interface_scrollable_content_viewport_geometry_get
+            (sd->obj, NULL, NULL, &vw, NULL);
 
    if (sd->w != ow) sd->w = ow;
 
@@ -793,8 +793,8 @@ _calc_job(void *data)
      {
         sd->minw = minw;
         sd->minh = minh;
-        eo_do(sd->pan_obj, eo_event_callback_call
-          (ELM_PAN_EVENT_CHANGED, NULL));
+        eo_event_callback_call
+          (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
         elm_layout_sizing_eval(sd->obj);
         if (sd->reorder_it)
           {
@@ -810,9 +810,9 @@ _calc_job(void *data)
 
              it = sd->anchor_item;
              it_y = sd->anchor_y;
-             eo_do(sd->obj, elm_interface_scrollable_content_pos_set
-               (sd->pan_x, it->item->block->y
-               + it->y + it_y, EINA_TRUE));
+             elm_interface_scrollable_content_pos_set
+               (sd->obj, sd->pan_x, it->item->block->y
+               + it->y + it_y, EINA_TRUE);
              sd->anchor_item = it;
              sd->anchor_y = it_y;
           }
@@ -824,7 +824,7 @@ _calc_job(void *data)
      }
    if (sd->check_scroll)
      {
-        eo_do(sd->pan_obj, elm_obj_pan_content_size_get(&pan_w, &pan_h));
+        elm_obj_pan_content_size_get(sd->pan_obj, &pan_w, &pan_h);
         if (EINA_INLIST_GET(sd->show_item) == sd->items->last)
           sd->scroll_to_type = ELM_GENLIST_ITEM_SCROLLTO_IN;
 
@@ -879,8 +879,8 @@ _elm_genlist_elm_layout_sizing_eval(Eo *obj, Elm_Genlist_Data *sd)
      {
         Evas_Coord vw = 0, vh = 0;
 
-        eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get
-              (NULL, NULL, &vw, &vh));
+        elm_interface_scrollable_content_viewport_geometry_get
+              (obj, NULL, NULL, &vw, &vh);
         if ((vw != 0) && (vw != sd->prev_viewport_w))
           {
              Item_Block *itb;
@@ -1081,7 +1081,7 @@ _item_sub_items_clear(Elm_Gen_Item *it)
    EINA_LIST_FOREACH(it->item->items, l, eo_it2)
      tl = eina_list_append(tl, eo_it2);
    EINA_LIST_FREE(tl, eo_it2)
-     eo_do(eo_it2, elm_wdg_item_del());
+     elm_wdg_item_del(eo_it2);
 }
 
 static void
@@ -1159,9 +1159,9 @@ _item_tree_effect_finish(Elm_Genlist_Data *sd)
    sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_NONE;
    sd->move_items = eina_list_free(sd->move_items);
 
-   eo_do(sd->pan_obj, eo_event_callback_call(ELM_PAN_EVENT_CHANGED, NULL));
-   eo_do(sd->obj, eo_event_callback_call
-         (ELM_GENLIST_EVENT_TREE_EFFECT_FINISHED, NULL));
+   eo_event_callback_call(sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
+   eo_event_callback_call
+         (sd->obj, ELM_GENLIST_EVENT_TREE_EFFECT_FINISHED, NULL);
    evas_object_smart_changed(sd->pan_obj);
 
    _elm_genlist_tree_effect_stop(sd);
@@ -1305,7 +1305,7 @@ _elm_genlist_item_state_update(Elm_Gen_Item *it)
           edje_object_signal_emit
              (it->deco_all_view, SIGNAL_SELECTED, "elm");
      }
-   if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
+   if (elm_wdg_item_disabled_get(EO_OBJ(it)))
      {
         edje_object_signal_emit(VIEW(it), SIGNAL_DISABLED, "elm");
         if (it->deco_all_view)
@@ -1338,8 +1338,8 @@ _elm_genlist_item_index_update(Elm_Gen_Item *it)
 {
    if (it->position_update || GL_IT(it)->block->position_update)
      {
-        eo_do(WIDGET(it), eo_event_callback_call
-              (ELM_GENLIST_EVENT_INDEX_UPDATE, EO_OBJ(it)));
+        eo_event_callback_call
+              (WIDGET(it), ELM_GENLIST_EVENT_INDEX_UPDATE, EO_OBJ(it));
         it->position_update = EINA_FALSE;
      }
 }
@@ -1442,9 +1442,9 @@ _expand_toggle_signal_cb(void *data,
    Elm_Gen_Item *it = data;
 
    if (it->item->expanded)
-     eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it)));
+     eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it));
    else
-     eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it)));
+     eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it));
 }
 
 static void
@@ -1456,7 +1456,7 @@ _expand_signal_cb(void *data,
    Elm_Gen_Item *it = data;
 
    if (!it->item->expanded)
-     eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it)));
+     eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_EXPAND_REQUEST, EO_OBJ(it));
 }
 
 static void
@@ -1468,7 +1468,7 @@ _contract_signal_cb(void *data,
    Elm_Gen_Item *it = data;
 
    if (it->item->expanded)
-     eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it)));
+     eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_CONTRACT_REQUEST, EO_OBJ(it));
 }
 
 //-- item cache handle routine --//
@@ -1583,7 +1583,7 @@ _item_cache_add(Elm_Gen_Item *it, Eina_List *contents)
 
    if (it->selected)
      edje_object_signal_emit(itc->base_view, SIGNAL_UNSELECTED, "elm");
-   if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
+   if (elm_wdg_item_disabled_get(EO_OBJ(it)))
      edje_object_signal_emit(itc->base_view, SIGNAL_ENABLED, "elm");
    if ((EO_OBJ(it) == sd->focused_item) &&
        (elm_widget_focus_highlight_enabled_get(obj) || _elm_config->win_auto_focus_enable))
@@ -1936,16 +1936,13 @@ _item_realize(Elm_Gen_Item *it,
 
    if (it->tooltip.content_cb)
      {
-        eo_do(EO_OBJ(it),
-              elm_wdg_item_tooltip_content_cb_set(
-                 it->tooltip.content_cb, it->tooltip.data, NULL),
-              elm_wdg_item_tooltip_style_set(it->tooltip.style),
-              elm_wdg_item_tooltip_window_mode_set(it->tooltip.free_size));
+        elm_wdg_item_tooltip_content_cb_set(EO_OBJ(it), it->tooltip.content_cb, it->tooltip.data, NULL);
+        elm_wdg_item_tooltip_style_set(EO_OBJ(it), it->tooltip.style);
+        elm_wdg_item_tooltip_window_mode_set(EO_OBJ(it), it->tooltip.free_size);
      }
 
    if (it->mouse_cursor)
-     eo_do(EO_OBJ(it),
-            elm_wdg_item_cursor_set(it->mouse_cursor));
+     elm_wdg_item_cursor_set(EO_OBJ(it), it->mouse_cursor);
 
    it->realized = EINA_TRUE;
    it->want_unrealize = EINA_FALSE;
@@ -1986,7 +1983,7 @@ _item_realize(Elm_Gen_Item *it,
 
           }
 
-        eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_REALIZED, EO_OBJ(it)));
+        eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_REALIZED, EO_OBJ(it));
      }
 
    //Send a signal so that an item changes its style according to its expand depth
@@ -2437,8 +2434,7 @@ _elm_genlist_tree_effect_setup(Elm_Genlist_Data *sd)
         evas_object_stack_below(sd->event_block_rect, sd->stack[1]);
         evas_object_show(sd->event_block_rect);
         sd->start_time = ecore_time_get();
-        eo_do(sd->obj,
-              eo_event_callback_add(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj));
+        eo_event_callback_add(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj);
         sd->tree_effect_animator = 1;
         return EINA_TRUE;
      }
@@ -2451,8 +2447,7 @@ _elm_genlist_tree_effect_stop(Elm_Genlist_Data *sd)
    if (sd->tree_effect_animator)
      {
         sd->tree_effect_animator = 0;
-        eo_do(sd->obj,
-              eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj));
+        eo_event_callback_del(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj);
      }
 }
 
@@ -2523,15 +2518,14 @@ _elm_genlist_pan_evas_object_smart_calculate(Eo *obj, Elm_Genlist_Pan_Data *psd)
        (sd->move_effect_mode == ELM_GENLIST_TREE_EFFECT_NONE))
      _item_auto_scroll(sd);
 
-   eo_do((sd)->obj,
-         elm_interface_scrollable_content_pos_get(&vx, &vy),
-         elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &vw, &vh));
+   elm_interface_scrollable_content_pos_get((sd)->obj, &vx, &vy);
+   elm_interface_scrollable_content_viewport_geometry_get
+         ((sd)->obj, NULL, NULL, &vw, &vh);
 
    if (sd->reorder_fast == 1)
-      eo_do((sd)->obj, elm_interface_scrollable_content_region_show(vx, vy - 10, vw, vh));
+      elm_interface_scrollable_content_region_show((sd)->obj, vx, vy - 10, vw, vh);
    else if (sd->reorder_fast == -1)
-      eo_do((sd)->obj, elm_interface_scrollable_content_region_show(vx, vy + 10, vw, vh));
+      elm_interface_scrollable_content_region_show((sd)->obj, vx, vy + 10, vw, vh);
 
    if (sd->focused_item && !sd->item_loop_enable)
      _elm_widget_focus_highlight_start(psd->wobj);
@@ -2545,15 +2539,15 @@ _elm_genlist_pan_evas_object_smart_calculate(Eo *obj, Elm_Genlist_Pan_Data *psd)
    evas_event_thaw(evas_object_evas_get(obj));
    evas_event_thaw_eval(evas_object_evas_get(obj));
 
-   eo_do(psd->wobj, eo_event_callback_call
-         (ELM_INTERFACE_SCROLLABLE_EVENT_CHANGED, NULL));
+   eo_event_callback_call
+         (psd->wobj, ELM_INTERFACE_SCROLLABLE_EVENT_CHANGED, NULL);
 }
 
 EOLIAN static void
 _elm_genlist_pan_eo_base_destructor(Eo *obj, Elm_Genlist_Pan_Data *psd)
 {
    eo_data_unref(psd->wobj, psd->wsd);
-   eo_do_super(obj, MY_PAN_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, MY_PAN_CLASS));
 }
 
 EOLIAN static void
@@ -2715,7 +2709,7 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it)
 
    if (_is_no_select(it) ||
        (eo_it == sd->focused_item) ||
-       (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get())))
+       (elm_wdg_item_disabled_get(eo_it)))
      return;
 
    switch (_elm_config->focus_autoscroll_mode)
@@ -2736,7 +2730,7 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it)
 
    if (it->realized)
      _elm_genlist_item_focus_update(it);
-   eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_ITEM_FOCUSED, eo_it));
+   eo_event_callback_call(obj, ELM_GENLIST_EVENT_ITEM_FOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
 }
@@ -2764,7 +2758,7 @@ _elm_genlist_item_unfocused(Elm_Object_Item *eo_it)
      }
 
    sd->focused_item = NULL;
-   eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_ITEM_UNFOCUSED, eo_it));
+   eo_event_callback_call(obj, ELM_GENLIST_EVENT_ITEM_UNFOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 }
@@ -2789,7 +2783,7 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir)
           return EINA_FALSE;
 
         while ((next) &&
-               ((eo_do_ret(EO_OBJ(next), tmp, elm_wdg_item_disabled_get())) ||
+               ((elm_wdg_item_disabled_get(EO_OBJ(next))) ||
                (_is_no_select(next))))
           if (!next->hide) next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
      }
@@ -2804,7 +2798,7 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir)
              next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
 
              while ((next) &&
-                    ((eo_do_ret(eo_next, tmp, elm_wdg_item_disabled_get())) ||
+                    ((elm_wdg_item_disabled_get(eo_next)) ||
                     (_is_no_select(next))))
                {
                   eo_next = elm_genlist_item_prev_get(eo_next);
@@ -2819,7 +2813,7 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir)
              next = eo_data_scope_get(eo_next, ELM_GENLIST_ITEM_CLASS);
 
              while ((next) &&
-                    ((eo_do_ret(eo_next, tmp, elm_wdg_item_disabled_get())) ||
+                    ((elm_wdg_item_disabled_get(eo_next)) ||
                     (_is_no_select(next))))
                {
                   eo_next = elm_genlist_item_next_get(eo_next);
@@ -2896,10 +2890,9 @@ _key_action_move_dir(Evas_Object *obj, Elm_Focus_Direction dir, Eina_Bool multi)
    Eina_Bool focus_only = EINA_FALSE;
 
    // get content size and viewport size
-   eo_do(obj,
-         elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, NULL, &v),
-         elm_interface_scrollable_content_size_get(NULL, &min));
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, NULL, &v);
+   elm_interface_scrollable_content_size_get(obj, NULL, &min);
 
    if (_elm_config->item_select_on_focus_disable)
      {
@@ -2979,12 +2972,11 @@ _key_action_move(Evas_Object *obj, const char *params)
    Elm_Object_Item *it = NULL;
    Evas_Coord pan_max_x = 0, pan_max_y = 0;
 
-   eo_do(obj,
-         elm_interface_scrollable_content_pos_get(&x, &y),
-         elm_interface_scrollable_step_size_get(&step_x, &step_y),
-         elm_interface_scrollable_page_size_get(&page_x, &page_y),
-         elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &v_w, &v_h));
+   elm_interface_scrollable_content_pos_get(obj, &x, &y);
+   elm_interface_scrollable_step_size_get(obj, &step_x, &step_y);
+   elm_interface_scrollable_page_size_get(obj, &page_x, &page_y);
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, &v_w, &v_h);
 
    _elm_widget_focus_auto_show(obj);
    if (!strcmp(dir, "left"))
@@ -3063,13 +3055,13 @@ _key_action_move(Evas_Object *obj, const char *params)
      }
    else return EINA_FALSE;
 
-   eo_do(sd->pan_obj, elm_obj_pan_pos_max_get(&pan_max_x, &pan_max_y));
+   elm_obj_pan_pos_max_get(sd->pan_obj, &pan_max_x, &pan_max_y);
    if (x < 0) x = 0;
    if (x > pan_max_x) x = pan_max_x;
    if (y < 0) y = 0;
    if (y > pan_max_y) y = pan_max_y;
 
-   eo_do(obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+   elm_interface_scrollable_content_pos_set(obj, x, y, EINA_TRUE);
 
    return EINA_TRUE;
 }
@@ -3124,7 +3116,7 @@ _key_action_select(Evas_Object *obj, const char *params)
         if (_item_select(it)) goto deleted;
      }
 
-   eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_ACTIVATED, EO_OBJ(it)));
+   eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_ACTIVATED, EO_OBJ(it));
 
    return EINA_TRUE;
 
@@ -3178,7 +3170,7 @@ _elm_genlist_elm_widget_sub_object_add(Eo *obj, Elm_Genlist_Data *_pd EINA_UNUSE
     * creation, thus issuing TOO MANY sizing_eval()'s here. they are
     * not needed at here anyway, so let's skip listening to those
     * hints changes */
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_add(sobj));
+   int_ret = elm_obj_widget_sub_object_add(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    return EINA_TRUE;
@@ -3196,7 +3188,7 @@ _elm_genlist_elm_widget_sub_object_del(Eo *obj, Elm_Genlist_Data *sd, Evas_Objec
     * about too many recalculations */
    sd->on_sub_del = EINA_TRUE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(sobj));
+   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    sd->on_sub_del = EINA_FALSE;
@@ -3277,7 +3269,7 @@ _elm_genlist_elm_widget_on_focus(Eo *obj, Elm_Genlist_Data *sd, Elm_Object_Item
    Elm_Object_Item *eo_it = NULL;
    Eina_Bool is_sel = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus(NULL));
+   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj) && (sd->items) && (sd->selected) &&
@@ -3399,7 +3391,7 @@ _mirrored_set(Evas_Object *obj,
    ELM_GENLIST_DATA_GET(obj, sd);
 
    _item_cache_zero(sd);
-   eo_do(obj, elm_interface_scrollable_mirrored_set(rtl));
+   elm_interface_scrollable_mirrored_set(obj, rtl);
 }
 
 EOLIAN static Eina_Bool
@@ -3410,7 +3402,7 @@ _elm_genlist_elm_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd)
    Eina_List *l;
    Elm_Gen_Item *it;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    evas_event_freeze(evas_object_evas_get(obj));
@@ -3451,7 +3443,7 @@ _show_region_hook(void *data EINA_UNUSED,
    //x & y are screen coordinates, Add with pan coordinates
    x += sd->pan_x;
    y += sd->pan_y;
-   eo_do(obj, elm_interface_scrollable_content_region_show(x, y, w, h));
+   elm_interface_scrollable_content_region_show(obj, x, y, w, h);
 }
 
 static void
@@ -3463,14 +3455,14 @@ _item_highlight(Elm_Gen_Item *it)
 
    if (_is_no_select(it) ||
        (!sd->highlight) ||
-       (it->highlighted) || eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) ||
+       (it->highlighted) || elm_wdg_item_disabled_get(EO_OBJ(it)) ||
        (it->item->deco_it_view))
      return;
 
    edje_object_signal_emit(VIEW(it), SIGNAL_SELECTED, "elm");
    if (it->deco_all_view)
      edje_object_signal_emit(it->deco_all_view, SIGNAL_SELECTED, "elm");
-   eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_HIGHLIGHTED, EO_OBJ(it)));
+   eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_HIGHLIGHTED, EO_OBJ(it));
 
    selectraise = edje_object_data_get(VIEW(it), "selectraise");
    if ((selectraise) && (!strcmp(selectraise, "on")))
@@ -3491,7 +3483,7 @@ _item_unhighlight(Elm_Gen_Item *it)
    if (!it->highlighted) return;
 
    edje_object_signal_emit(VIEW(it), SIGNAL_UNSELECTED, "elm");
-   eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_UNHIGHLIGHTED, EO_OBJ(it)));
+   eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_UNHIGHLIGHTED, EO_OBJ(it));
    if (it->deco_all_view)
      edje_object_signal_emit
        (it->deco_all_view, SIGNAL_UNSELECTED, "elm");
@@ -3674,7 +3666,7 @@ _elm_genlist_item_del_not_serious(Elm_Gen_Item *it)
    ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
    Elm_Object_Item *eo_it = EO_OBJ(it);
 
-   eo_do(eo_it, elm_wdg_item_pre_notify_del());
+   elm_wdg_item_pre_notify_del(eo_it);
 
    if (it->selected)
      {
@@ -3792,8 +3784,8 @@ _item_unselect(Elm_Gen_Item *it)
 
    it->selected = EINA_FALSE;
    sd->selected = eina_list_remove(sd->selected, EO_OBJ(it));
-   eo_do(WIDGET(it), eo_event_callback_call
-     (EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(it)));
+   eo_event_callback_call
+     (WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(it));
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
 }
@@ -3863,8 +3855,8 @@ _item_mouse_move_cb(void *data,
                sd->movements++;
           }
         ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
-        eo_do(WIDGET(it), eo_event_callback_call
-          (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG, eo_it));
+        eo_event_callback_call
+          (WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG, eo_it);
         return;
      }
    if ((!it->down) || (sd->longpressed))
@@ -3940,31 +3932,31 @@ _item_mouse_move_cb(void *data,
         if (dy < 0)
           {
              if (ady > adx)
-               eo_do(WIDGET(it), eo_event_callback_call
-                 (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_UP, eo_it));
+               eo_event_callback_call
+                 (WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_UP, eo_it);
              else
                {
                   if (dx < 0)
-                    eo_do(WIDGET(it), eo_event_callback_call
-                      (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_LEFT, eo_it));
+                    eo_event_callback_call
+                      (WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_LEFT, eo_it);
                   else
-                    eo_do(WIDGET(it), eo_event_callback_call
-                      (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_RIGHT, eo_it));
+                    eo_event_callback_call
+                      (WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_RIGHT, eo_it);
                }
           }
         else
           {
              if (ady > adx)
-               eo_do(WIDGET(it), eo_event_callback_call
-                 (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_DOWN, eo_it));
+               eo_event_callback_call
+                 (WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_DOWN, eo_it);
              else
                {
                   if (dx < 0)
-                    eo_do(WIDGET(it), eo_event_callback_call
-                      (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_LEFT, eo_it));
+                    eo_event_callback_call
+                      (WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_LEFT, eo_it);
                   else
-                    eo_do(WIDGET(it), eo_event_callback_call
-                      (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_RIGHT, eo_it));
+                    eo_event_callback_call
+                      (WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START_RIGHT, eo_it);
                }
           }
      }
@@ -3980,12 +3972,12 @@ _long_press_cb(void *data)
    ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
 
    if (_is_no_select(it) ||
-       eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) || (it->dragging))
+       elm_wdg_item_disabled_get(EO_OBJ(it)) || (it->dragging))
      goto end;
 
    sd->longpressed = EINA_TRUE;
-   eo_do(WIDGET(it), eo_event_callback_call
-         (EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it)));
+   eo_event_callback_call
+         (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it));
    if ((sd->reorder_mode) && !(GL_IT(it)->type & ELM_GENLIST_ITEM_GROUP))
      {
         sd->reorder_it = it;
@@ -3995,9 +3987,9 @@ _long_press_cb(void *data)
         else
           evas_object_stack_below(VIEW(it), sd->stack[1]);
 
-        eo_do(sd->obj, elm_interface_scrollable_hold_set(EINA_TRUE));
-        eo_do(sd->obj, elm_interface_scrollable_bounce_allow_set
-              (EINA_FALSE, EINA_FALSE));
+        elm_interface_scrollable_hold_set(sd->obj, EINA_TRUE);
+        elm_interface_scrollable_bounce_allow_set
+              (sd->obj, EINA_FALSE, EINA_FALSE);
 
         list = elm_genlist_realized_items_get
             ((sd)->obj);
@@ -4030,7 +4022,7 @@ _swipe_do(Elm_Gen_Item *it)
    ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
 
    if (_is_no_select(it) ||
-       eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get())) return;
+       elm_wdg_item_disabled_get(EO_OBJ(it))) return;
 
    sd->swipe = EINA_FALSE;
    for (i = 0; i < sd->movements; i++)
@@ -4042,8 +4034,8 @@ _swipe_do(Elm_Gen_Item *it)
 
    sum /= sd->movements;
    if (abs(sum - sd->history[0].x) <= 10) return;
-   eo_do(WIDGET(it), eo_event_callback_call
-         (ELM_GENLIST_EVENT_SWIPE, EO_OBJ(it)));
+   eo_event_callback_call
+         (WIDGET(it), ELM_GENLIST_EVENT_SWIPE, EO_OBJ(it));
 }
 
 static Eina_Bool
@@ -4098,34 +4090,34 @@ _multi_touch_gesture_eval(Elm_Gen_Item *it)
         if ((off_x + off_mx) > (off_y + off_my))
           {
              if ((sd->cur_x > sd->prev_x) && (sd->cur_mx > sd->prev_mx))
-               eo_do(WIDGET(it), eo_event_callback_call
-                     (ELM_GENLIST_EVENT_MULTI_SWIPE_RIGHT, eo_it));
+               eo_event_callback_call
+                     (WIDGET(it), ELM_GENLIST_EVENT_MULTI_SWIPE_RIGHT, eo_it);
              else if ((sd->cur_x < sd->prev_x) && (sd->cur_mx < sd->prev_mx))
-               eo_do(WIDGET(it), eo_event_callback_call
-                     (ELM_GENLIST_EVENT_MULTI_SWIPE_LEFT, eo_it));
+               eo_event_callback_call
+                     (WIDGET(it), ELM_GENLIST_EVENT_MULTI_SWIPE_LEFT, eo_it);
              else if (abs(sd->cur_x - sd->cur_mx) >
                       abs(sd->prev_x - sd->prev_mx))
-               eo_do(WIDGET(it), eo_event_callback_call
-                     (ELM_GENLIST_EVENT_MULTI_PINCH_OUT, eo_it));
+               eo_event_callback_call
+                     (WIDGET(it), ELM_GENLIST_EVENT_MULTI_PINCH_OUT, eo_it);
              else
-               eo_do(WIDGET(it), eo_event_callback_call
-                     (ELM_GENLIST_EVENT_MULTI_PINCH_IN, eo_it));
+               eo_event_callback_call
+                     (WIDGET(it), ELM_GENLIST_EVENT_MULTI_PINCH_IN, eo_it);
           }
         else
           {
              if ((sd->cur_y > sd->prev_y) && (sd->cur_my > sd->prev_my))
-               eo_do(WIDGET(it), eo_event_callback_call
-                     (ELM_GENLIST_EVENT_MULTI_SWIPE_DOWN, eo_it));
+               eo_event_callback_call
+                     (WIDGET(it), ELM_GENLIST_EVENT_MULTI_SWIPE_DOWN, eo_it);
              else if ((sd->cur_y < sd->prev_y) && (sd->cur_my < sd->prev_my))
-               eo_do(WIDGET(it), eo_event_callback_call
-                     (ELM_GENLIST_EVENT_MULTI_SWIPE_UP, eo_it));
+               eo_event_callback_call
+                     (WIDGET(it), ELM_GENLIST_EVENT_MULTI_SWIPE_UP, eo_it);
              else if (abs(sd->cur_y - sd->cur_my) >
                       abs(sd->prev_y - sd->prev_my))
-               eo_do(WIDGET(it), eo_event_callback_call
-                     (ELM_GENLIST_EVENT_MULTI_PINCH_OUT, eo_it));
+               eo_event_callback_call
+                     (WIDGET(it), ELM_GENLIST_EVENT_MULTI_PINCH_OUT, eo_it);
              else
-               eo_do(WIDGET(it), eo_event_callback_call
-                     (ELM_GENLIST_EVENT_MULTI_PINCH_IN, eo_it));
+               eo_event_callback_call
+                     (WIDGET(it), ELM_GENLIST_EVENT_MULTI_PINCH_IN, eo_it);
           }
      }
 
@@ -4158,8 +4150,8 @@ _item_multi_down_cb(void *data,
    if (it->dragging)
      {
         it->dragging = EINA_FALSE;
-        eo_do(WIDGET(it), eo_event_callback_call
-              (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_STOP, EO_OBJ(it)));
+        eo_event_callback_call
+              (WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_STOP, EO_OBJ(it));
      }
    ELM_SAFE_FREE(it->item->swipe_timer, ecore_timer_del);
    if (sd->on_hold)
@@ -4261,7 +4253,7 @@ _item_mouse_down_cb(void *data,
    it->base->still_in = EINA_TRUE;
 
    if (_is_no_select(it) ||
-        eo_do_ret((Eo *)eo_it, tmp, elm_wdg_item_disabled_get()))
+        elm_wdg_item_disabled_get((Eo *)eo_it))
      return;
 
    // and finally call the user callbacks.
@@ -4270,13 +4262,13 @@ _item_mouse_down_cb(void *data,
    _item_highlight(it);
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      {
-        eo_do(WIDGET(it), eo_event_callback_call
-              (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, eo_it));
-        eo_do(WIDGET(it), eo_event_callback_call
-              (ELM_GENLIST_EVENT_ACTIVATED, eo_it));
+        eo_event_callback_call
+              (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, eo_it);
+        eo_event_callback_call
+              (WIDGET(it), ELM_GENLIST_EVENT_ACTIVATED, eo_it);
      }
-   eo_do(WIDGET(it), eo_event_callback_call
-         (EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, eo_it));
+   eo_event_callback_call
+         (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, eo_it);
 }
 
 static Item_Block *
@@ -4609,18 +4601,16 @@ _item_process_post(Elm_Genlist_Data *sd,
         eo_it2 = sd->selected->data;
         ELM_GENLIST_ITEM_DATA_GET(eo_it2, it2);
         if (!it2->item->block) return;
-        eo_do(sd->obj, elm_interface_scrollable_content_pos_get(NULL, &y));
+        elm_interface_scrollable_content_pos_get(sd->obj, NULL, &y);
         evas_object_geometry_get(sd->pan_obj, NULL, NULL, NULL, &h);
         if ((it->y + it->item->block->y > y + h) ||
             (it->y + it->item->block->y + it->item->h < y))
           /* offscreen, just update */
-           eo_do(sd->obj, elm_interface_scrollable_content_region_show
-            (it2->x + it2->item->block->x, y,
-            it2->item->block->w, h));
+           elm_interface_scrollable_content_region_show
+            (sd->obj, it2->x + it2->item->block->x, y, it2->item->block->w, h);
         else
-           eo_do(sd->obj, elm_interface_scrollable_content_region_show
-            (it->x + it->item->block->x,
-            y + it->item->h, it->item->block->w, h));
+           elm_interface_scrollable_content_region_show
+            (sd->obj, it->x + it->item->block->x, y + it->item->h, it->item->block->w, h);
      }
 }
 
@@ -4756,7 +4746,7 @@ _item_move_after(Elm_Gen_Item *it,
    if (after->item->group_item) it->item->group_item = after->item->group_item;
    _item_queue(sd, it, NULL);
 
-   eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_MOVED_AFTER, EO_OBJ(it)));
+   eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_MOVED_AFTER, EO_OBJ(it));
 }
 
 static void
@@ -4834,7 +4824,7 @@ _item_move_before(Elm_Gen_Item *it,
      it->item->group_item = before->item->group_item;
    _item_queue(sd, it, NULL);
 
-   eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_MOVED_BEFORE, EO_OBJ(it)));
+   eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_MOVED_BEFORE, EO_OBJ(it));
 }
 
 static void
@@ -4857,8 +4847,8 @@ _item_mouse_up_cb(void *data,
         if (dx < 0) dx = -dx;
         if (dy < 0) dy = -dy;
         if ((dx < 5) && (dy < 5))
-          eo_do(WIDGET(it), eo_event_callback_call
-                (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_RIGHT, EO_OBJ(it)));
+          eo_event_callback_call
+                (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_RIGHT, EO_OBJ(it));
         return;
      }
 
@@ -4867,7 +4857,7 @@ _item_mouse_up_cb(void *data,
    ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
 
    sd->mouse_down = EINA_FALSE;
-   eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_RELEASED, EO_OBJ(it)));
+   eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_RELEASED, EO_OBJ(it));
    if (sd->multi_touched)
      {
         if ((!sd->multi) && (!it->selected) && (it->highlighted))
@@ -4883,8 +4873,8 @@ _item_mouse_up_cb(void *data,
    if (it->dragging)
      {
         it->dragging = EINA_FALSE;
-        eo_do(WIDGET(it), eo_event_callback_call
-              (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_STOP, EO_OBJ(it)));
+        eo_event_callback_call
+              (WIDGET(it), EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_STOP, EO_OBJ(it));
         dragged = 1;
      }
    ELM_SAFE_FREE(it->item->swipe_timer, ecore_timer_del);
@@ -4914,7 +4904,7 @@ _item_mouse_up_cb(void *data,
                _item_move_before(sd->reorder_it, sd->reorder_rel);
              else
                _item_move_after(sd->reorder_it, sd->reorder_rel);
-             eo_do(WIDGET(it), eo_event_callback_call(ELM_GENLIST_EVENT_MOVED, EO_OBJ(it)));
+             eo_event_callback_call(WIDGET(it), ELM_GENLIST_EVENT_MOVED, EO_OBJ(it));
           }
         else
           {
@@ -4923,9 +4913,9 @@ _item_mouse_up_cb(void *data,
           }
         edje_object_signal_emit(VIEW(it), SIGNAL_REORDER_DISABLED, "elm");
         sd->reorder_it = sd->reorder_rel = NULL;
-        eo_do(sd->obj, elm_interface_scrollable_hold_set(EINA_FALSE));
-        eo_do(sd->obj, elm_interface_scrollable_bounce_allow_set
-              (sd->h_bounce, sd->v_bounce));
+        elm_interface_scrollable_hold_set(sd->obj, EINA_FALSE);
+        elm_interface_scrollable_bounce_allow_set
+              (sd->obj, sd->h_bounce, sd->v_bounce);
      }
    if (sd->longpressed)
      {
@@ -4948,7 +4938,7 @@ _item_mouse_up_cb(void *data,
        (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) ||
        !it->base->still_in ||
        _is_no_select(it) ||
-       (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get())))
+       (elm_wdg_item_disabled_get(EO_OBJ(it))))
      return;
 
    evas_object_ref(sd->obj);
@@ -5046,7 +5036,7 @@ _scroll_hold_timer_cb(void *data)
 
    if (!data) return ECORE_CALLBACK_CANCEL;
 
-   eo_do(sd->obj, elm_interface_scrollable_hold_set(EINA_FALSE));
+   elm_interface_scrollable_hold_set(sd->obj, EINA_FALSE);
    sd->scr_hold_timer = NULL;
 
    return ECORE_CALLBACK_CANCEL;
@@ -5295,105 +5285,105 @@ static void
 _scroll_animate_start_cb(Evas_Object *obj,
                          void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL));
+   eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL);
 }
 
 static void
 _scroll_animate_stop_cb(Evas_Object *obj,
                         void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL));
+   eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL));
+   eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL);
 }
 
 static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL));
+   eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL));
+   eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL);
 }
 
 static void
 _edge_left_cb(Evas_Object *obj,
               void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_EDGE_LEFT, NULL));
+   eo_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_LEFT, NULL);
 }
 
 static void
 _edge_right_cb(Evas_Object *obj,
                void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_EDGE_RIGHT, NULL));
+   eo_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_RIGHT, NULL);
 }
 
 static void
 _edge_top_cb(Evas_Object *obj,
              void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_EDGE_TOP, NULL));
+   eo_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_TOP, NULL);
 }
 
 static void
 _edge_bottom_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_EDGE_BOTTOM, NULL));
+   eo_event_callback_call(obj, ELM_GENLIST_EVENT_EDGE_BOTTOM, NULL);
 }
 
 static void
 _vbar_drag_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_VBAR_DRAG, NULL));
+   eo_event_callback_call(obj, ELM_GENLIST_EVENT_VBAR_DRAG, NULL);
 }
 
 static void
 _vbar_press_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_VBAR_PRESS, NULL));
+   eo_event_callback_call(obj, ELM_GENLIST_EVENT_VBAR_PRESS, NULL);
 }
 
 static void
 _vbar_unpress_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_VBAR_UNPRESS, NULL));
+   eo_event_callback_call(obj, ELM_GENLIST_EVENT_VBAR_UNPRESS, NULL);
 }
 
 static void
 _hbar_drag_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_HBAR_DRAG, NULL));
+   eo_event_callback_call(obj, ELM_GENLIST_EVENT_HBAR_DRAG, NULL);
 }
 
 static void
 _hbar_press_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_HBAR_PRESS, NULL));
+   eo_event_callback_call(obj, ELM_GENLIST_EVENT_HBAR_PRESS, NULL);
 }
 
 static void
 _hbar_unpress_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_HBAR_UNPRESS, NULL));
+   eo_event_callback_call(obj, ELM_GENLIST_EVENT_HBAR_UNPRESS, NULL);
 }
 
 static void
@@ -5444,7 +5434,7 @@ _decorate_item_set(Elm_Gen_Item *it)
    it->item->nocache_once = EINA_TRUE;
 
    ELM_SAFE_FREE(sd->scr_hold_timer, ecore_timer_del);
-   eo_do(sd->obj, elm_interface_scrollable_hold_set(EINA_TRUE));
+   elm_interface_scrollable_hold_set(sd->obj, EINA_TRUE);
    sd->scr_hold_timer = ecore_timer_add(SCR_HOLD_TIME, _scroll_hold_timer_cb, sd->obj);
 
    evas_event_freeze(evas_object_evas_get(sd->obj));
@@ -5538,7 +5528,7 @@ _elm_genlist_evas_object_smart_add(Eo *obj, Elm_Genlist_Data *priv)
    Evas_Coord minw, minh;
    int i;
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->size_caches = eina_hash_pointer_new(_size_cache_free);
@@ -5558,29 +5548,28 @@ _elm_genlist_evas_object_smart_add(Eo *obj, Elm_Genlist_Data *priv)
        (obj, "genlist", "base", elm_widget_style_get(obj)))
      CRI("Failed to set layout!");
 
-   eo_do(obj, elm_interface_scrollable_objects_set(wd->resize_obj, priv->hit_rect));
+   elm_interface_scrollable_objects_set(obj, wd->resize_obj, priv->hit_rect);
 
-   eo_do(obj, elm_interface_scrollable_bounce_allow_set
-         (EINA_FALSE, _elm_config->thumbscroll_bounce_enable));
+   elm_interface_scrollable_bounce_allow_set
+         (obj, EINA_FALSE, _elm_config->thumbscroll_bounce_enable);
    priv->v_bounce = _elm_config->thumbscroll_bounce_enable;
 
-   eo_do(obj,
-         elm_interface_scrollable_animate_start_cb_set(_scroll_animate_start_cb),
-         elm_interface_scrollable_animate_stop_cb_set(_scroll_animate_stop_cb),
-         elm_interface_scrollable_scroll_cb_set(_scroll_cb),
-         elm_interface_scrollable_drag_start_cb_set(_scroll_drag_start_cb),
-         elm_interface_scrollable_drag_stop_cb_set(_scroll_drag_stop_cb),
-         elm_interface_scrollable_edge_left_cb_set(_edge_left_cb),
-         elm_interface_scrollable_edge_right_cb_set(_edge_right_cb),
-         elm_interface_scrollable_edge_top_cb_set(_edge_top_cb),
-         elm_interface_scrollable_edge_bottom_cb_set(_edge_bottom_cb),
-         elm_interface_scrollable_vbar_drag_cb_set(_vbar_drag_cb),
-         elm_interface_scrollable_vbar_press_cb_set(_vbar_press_cb),
-         elm_interface_scrollable_vbar_unpress_cb_set(_vbar_unpress_cb),
-         elm_interface_scrollable_hbar_drag_cb_set(_hbar_drag_cb),
-         elm_interface_scrollable_hbar_press_cb_set(_hbar_press_cb),
-         elm_interface_scrollable_hbar_unpress_cb_set(_hbar_unpress_cb),
-         elm_interface_scrollable_content_min_limit_cb_set(_content_min_limit_cb));
+   elm_interface_scrollable_animate_start_cb_set(obj, _scroll_animate_start_cb);
+   elm_interface_scrollable_animate_stop_cb_set(obj, _scroll_animate_stop_cb);
+   elm_interface_scrollable_scroll_cb_set(obj, _scroll_cb);
+   elm_interface_scrollable_drag_start_cb_set(obj, _scroll_drag_start_cb);
+   elm_interface_scrollable_drag_stop_cb_set(obj, _scroll_drag_stop_cb);
+   elm_interface_scrollable_edge_left_cb_set(obj, _edge_left_cb);
+   elm_interface_scrollable_edge_right_cb_set(obj, _edge_right_cb);
+   elm_interface_scrollable_edge_top_cb_set(obj, _edge_top_cb);
+   elm_interface_scrollable_edge_bottom_cb_set(obj, _edge_bottom_cb);
+   elm_interface_scrollable_vbar_drag_cb_set(obj, _vbar_drag_cb);
+   elm_interface_scrollable_vbar_press_cb_set(obj, _vbar_press_cb);
+   elm_interface_scrollable_vbar_unpress_cb_set(obj, _vbar_unpress_cb);
+   elm_interface_scrollable_hbar_drag_cb_set(obj, _hbar_drag_cb);
+   elm_interface_scrollable_hbar_press_cb_set(obj, _hbar_press_cb);
+   elm_interface_scrollable_hbar_unpress_cb_set(obj, _hbar_unpress_cb);
+   elm_interface_scrollable_content_min_limit_cb_set(obj, _content_min_limit_cb);
 
    priv->mode = ELM_LIST_SCROLL;
    priv->max_items_per_block = MAX_ITEMS_PER_BLOCK;
@@ -5600,7 +5589,7 @@ _elm_genlist_evas_object_smart_add(Eo *obj, Elm_Genlist_Data *priv)
         evas_object_smart_member_add(priv->stack[i], priv->pan_obj);
      }
 
-   eo_do(obj, elm_interface_scrollable_extern_pan_set(priv->pan_obj));
+   elm_interface_scrollable_extern_pan_set(obj, priv->pan_obj);
 
    edje_object_size_min_calc(wd->resize_obj, &minw, &minh);
    evas_object_size_hint_min_set(obj, minw, minh);
@@ -5640,13 +5629,13 @@ _elm_genlist_evas_object_smart_del(Eo *obj, Elm_Genlist_Data *sd)
 
    _elm_genlist_tree_effect_stop(sd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_genlist_evas_object_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
+   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -5654,7 +5643,7 @@ _elm_genlist_evas_object_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x,
 EOLIAN static void
 _elm_genlist_evas_object_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
    if ((sd->queue) && (!sd->queue_idle_enterer) && (w > 0))
@@ -5664,7 +5653,7 @@ _elm_genlist_evas_object_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord
 EOLIAN static void
 _elm_genlist_evas_object_smart_member_add(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *member)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
+   evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -5714,13 +5703,12 @@ elm_genlist_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_genlist_eo_base_constructor(Eo *obj, Elm_Genlist_Data *sd)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
 
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
 
    return obj;
 }
@@ -5749,7 +5737,7 @@ _internal_elm_genlist_clear(Evas_Object *obj)
    while (sd->items)
      {
         it = EINA_INLIST_CONTAINER_GET(sd->items->last, Elm_Gen_Item);
-        eo_do(EO_OBJ(it), elm_wdg_item_del());
+        elm_wdg_item_del(EO_OBJ(it));
      }
 
    sd->pan_changed = EINA_TRUE;
@@ -5775,11 +5763,11 @@ _internal_elm_genlist_clear(Evas_Object *obj)
    if (sd->pan_obj)
      {
         evas_object_size_hint_min_set(sd->pan_obj, sd->minw, sd->minh);
-        eo_do(sd->pan_obj, eo_event_callback_call
-              (ELM_PAN_EVENT_CHANGED, NULL));
+        eo_event_callback_call
+              (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
      }
    elm_layout_sizing_eval(sd->obj);
-   eo_do(obj, elm_interface_scrollable_content_region_show(0, 0, 0, 0));
+   elm_interface_scrollable_content_region_show(obj, 0, 0, 0, 0);
 
    _elm_genlist_tree_effect_stop(sd);
 
@@ -5806,7 +5794,7 @@ _item_select(Elm_Gen_Item *it)
    ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
    Elm_Object_Item *eo_it = EO_OBJ(it);
 
-   if (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get())) return EINA_FALSE;
+   if (elm_wdg_item_disabled_get(eo_it)) return EINA_FALSE;
    if (_is_no_select(it) || (it->decorate_it_set)) return EINA_FALSE;
    if ((sd->select_mode != ELM_OBJECT_SELECT_MODE_ALWAYS) &&
        (it->select_mode != ELM_OBJECT_SELECT_MODE_ALWAYS) && it->selected)
@@ -5842,7 +5830,7 @@ _item_select(Elm_Gen_Item *it)
    if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
    // delete item if it's requested deletion in the above callbacks.
    if ((it->base)->on_deletion) goto item_deleted;
-   eo_do(WIDGET(it), eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it));
+   eo_event_callback_call(WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
    // delete item if it's requested deletion in the above callbacks.
@@ -5926,7 +5914,7 @@ _elm_genlist_item_elm_widget_item_disable(Eo *eo_it, Elm_Gen_Item *it)
 
    if (it->realized)
      {
-        if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
+        if (elm_wdg_item_disabled_get(EO_OBJ(it)))
           {
              edje_object_signal_emit(VIEW(it), SIGNAL_DISABLED, "elm");
              if (it->deco_all_view)
@@ -5941,7 +5929,7 @@ _elm_genlist_item_elm_widget_item_disable(Eo *eo_it, Elm_Gen_Item *it)
                  (it->deco_all_view, SIGNAL_ENABLED, "elm");
           }
         EINA_LIST_FOREACH(it->contents, l, obj)
-          elm_widget_disabled_set(obj, eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()));
+          elm_widget_disabled_set(obj, elm_wdg_item_disabled_get(EO_OBJ(it)));
      }
 }
 
@@ -6032,10 +6020,10 @@ _elm_genlist_item_elm_widget_item_focus_get(Eo *eo_it, Elm_Gen_Item *it)
 EOLIAN static Eo *
 _elm_genlist_item_eo_base_constructor(Eo *eo_it, Elm_Gen_Item *it)
 {
-   eo_it = eo_do_super_ret(eo_it, ELM_GENLIST_ITEM_CLASS, eo_it, eo_constructor());
+   eo_it = eo_constructor(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS));
 
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
-   eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST_ITEM));
+   elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_LIST_ITEM);
 
    return eo_it;
 }
@@ -6726,7 +6714,7 @@ _elm_genlist_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it,
    Eina_Bool tmp;
    ELM_GENLIST_ITEM_CHECK_OR_RETURN(it);
 
-   if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get())) return;
+   if (elm_wdg_item_disabled_get(EO_OBJ(it))) return;
 
    selected = !!selected;
    if (it->selected == selected) return;
@@ -6853,8 +6841,8 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B
         sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_EXPAND;
         if (it->realized)
           edje_object_signal_emit(VIEW(it), SIGNAL_EXPANDED, "elm");
-        eo_do(WIDGET(it), eo_event_callback_call
-              (ELM_GENLIST_EVENT_EXPANDED, EO_OBJ(it)));
+        eo_event_callback_call
+              (WIDGET(it), ELM_GENLIST_EVENT_EXPANDED, EO_OBJ(it));
         sd->auto_scroll_enabled = EINA_TRUE;
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(eo_item, ELM_ATSPI_STATE_EXPANDED, EINA_TRUE);
@@ -6864,8 +6852,8 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B
         sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_CONTRACT;
         if (it->realized)
           edje_object_signal_emit(VIEW(it), SIGNAL_CONTRACTED, "elm");
-        eo_do(WIDGET(it), eo_event_callback_call
-              (ELM_GENLIST_EVENT_CONTRACTED, EO_OBJ(it)));
+        eo_event_callback_call
+              (WIDGET(it), ELM_GENLIST_EVENT_CONTRACTED, EO_OBJ(it));
         sd->auto_scroll_enabled = EINA_FALSE;
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(eo_item, ELM_ATSPI_STATE_EXPANDED, EINA_FALSE);
@@ -6981,8 +6969,8 @@ _elm_genlist_item_show(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *item, Elm_Genlist_
 
    if (_elm_genlist_item_coordinates_calc
          (item, type, EINA_FALSE, &x, &y, &w, &h))
-      eo_do(WIDGET(item), elm_interface_scrollable_content_region_show
-            (x, y, w, h));
+      elm_interface_scrollable_content_region_show
+            (WIDGET(item), x, y, w, h);
 }
 
 EOLIAN static void
@@ -6994,7 +6982,7 @@ _elm_genlist_item_bring_in(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *item, Elm_Genl
 
    if (_elm_genlist_item_coordinates_calc
          (item, type, EINA_TRUE, &x, &y, &w, &h))
-      eo_do(WIDGET(item), elm_interface_scrollable_region_bring_in(x, y, w, h));
+      elm_interface_scrollable_region_bring_in(WIDGET(item), x, y, w, h);
 }
 
 EOLIAN static void
@@ -7141,7 +7129,7 @@ EAPI void
 elm_genlist_item_tooltip_text_set(Elm_Object_Item *it,
                                   const char *text)
 {
-   eo_do(it, elm_wdg_item_tooltip_text_set(text));
+   elm_wdg_item_tooltip_text_set(it, text);
 }
 
 EOLIAN static void
@@ -7161,7 +7149,7 @@ elm_genlist_item_tooltip_content_cb_set(Elm_Object_Item *item,
                                         const void *data,
                                         Evas_Smart_Cb del_cb)
 {
-   eo_do(item, elm_wdg_item_tooltip_content_cb_set(func, data, del_cb));
+   elm_wdg_item_tooltip_content_cb_set(item, func, data, del_cb);
 }
 
 EOLIAN static void
@@ -7184,12 +7172,10 @@ _elm_genlist_item_elm_widget_item_tooltip_content_cb_set(Eo *eo_it, Elm_Gen_Item
 
    if (VIEW(it))
      {
-        eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS,
-              elm_wdg_item_tooltip_content_cb_set
-              (it->tooltip.content_cb, it->tooltip.data, NULL));
-        eo_do(eo_it,
-              elm_wdg_item_tooltip_style_set(it->tooltip.style),
-              elm_wdg_item_tooltip_window_mode_set(it->tooltip.free_size));
+        elm_wdg_item_tooltip_content_cb_set
+              (eo_super(eo_it, ELM_GENLIST_ITEM_CLASS), it->tooltip.content_cb, it->tooltip.data, NULL);
+        elm_wdg_item_tooltip_style_set(eo_it, it->tooltip.style);
+        elm_wdg_item_tooltip_window_mode_set(eo_it, it->tooltip.free_size);
      }
 
    return;
@@ -7201,7 +7187,7 @@ error:
 EAPI void
 elm_genlist_item_tooltip_unset(Elm_Object_Item *item)
 {
-   eo_do(item, elm_wdg_item_tooltip_unset());
+   elm_wdg_item_tooltip_unset(item);
 }
 
 EOLIAN static void
@@ -7210,8 +7196,7 @@ _elm_genlist_item_elm_widget_item_tooltip_unset(Eo *eo_it, Elm_Gen_Item *it)
    ELM_GENLIST_ITEM_CHECK_OR_RETURN(it);
 
    if ((VIEW(it)) && (it->tooltip.content_cb))
-     eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS,
-           elm_wdg_item_tooltip_unset());
+     elm_wdg_item_tooltip_unset(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS));
 
    if (it->tooltip.del_cb)
      it->tooltip.del_cb((void *)it->tooltip.data, WIDGET(it), it);
@@ -7220,14 +7205,14 @@ _elm_genlist_item_elm_widget_item_tooltip_unset(Eo *eo_it, Elm_Gen_Item *it)
    it->tooltip.data = NULL;
    it->tooltip.free_size = EINA_FALSE;
    if (it->tooltip.style)
-     eo_do(eo_it, elm_wdg_item_tooltip_style_set(NULL));
+     elm_wdg_item_tooltip_style_set(eo_it, NULL);
 }
 
 EAPI void
 elm_genlist_item_tooltip_style_set(Elm_Object_Item *item,
                                    const char *style)
 {
-   eo_do(item, elm_wdg_item_tooltip_style_set(style));
+   elm_wdg_item_tooltip_style_set(item, style);
 }
 
 EOLIAN static void
@@ -7237,15 +7222,14 @@ _elm_genlist_item_elm_widget_item_tooltip_style_set(Eo *eo_it, Elm_Gen_Item *it,
    ELM_GENLIST_ITEM_CHECK_OR_RETURN(it);
 
    eina_stringshare_replace(&it->tooltip.style, style);
-   if (VIEW(it)) eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS,
-         elm_wdg_item_tooltip_style_set(style));
+   if (VIEW(it)) elm_wdg_item_tooltip_style_set(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS), style);
 }
 
 EAPI const char *
 elm_genlist_item_tooltip_style_get(const Elm_Object_Item *it)
 {
    const char *ret;
-   return eo_do_ret(it, ret, elm_wdg_item_tooltip_style_get());
+   return elm_wdg_item_tooltip_style_get(it);
 }
 
 EOLIAN static const char *
@@ -7259,7 +7243,7 @@ elm_genlist_item_tooltip_window_mode_set(Elm_Object_Item *item,
                                          Eina_Bool disable)
 {
    Eina_Bool ret;
-   return eo_do_ret(item, ret, elm_wdg_item_tooltip_window_mode_set(disable));
+   return elm_wdg_item_tooltip_window_mode_set(item, disable);
 }
 
 EOLIAN static Eina_Bool
@@ -7272,8 +7256,7 @@ _elm_genlist_item_elm_widget_item_tooltip_window_mode_set(Eo *eo_it, Elm_Gen_Ite
    if (VIEW(it))
      {
         Eina_Bool ret;
-        eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS,
-              ret = elm_wdg_item_tooltip_window_mode_set(disable));
+        ret = elm_wdg_item_tooltip_window_mode_set(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS), disable);
         return ret;
      }
 
@@ -7284,7 +7267,7 @@ EAPI Eina_Bool
 elm_genlist_item_tooltip_window_mode_get(const Elm_Object_Item *eo_it)
 {
    Eina_Bool ret;
-   return eo_do_ret(eo_it, ret, elm_wdg_item_tooltip_window_mode_get());
+   return elm_wdg_item_tooltip_window_mode_get(eo_it);
 }
 
 EOLIAN static Eina_Bool
@@ -7297,7 +7280,7 @@ EAPI void
 elm_genlist_item_cursor_set(Elm_Object_Item *item,
                             const char *cursor)
 {
-   eo_do(item, elm_wdg_item_cursor_set(cursor));
+   elm_wdg_item_cursor_set(item, cursor);
 }
 
 EOLIAN static void
@@ -7306,21 +7289,20 @@ _elm_genlist_item_elm_widget_item_cursor_set(Eo *eo_it, Elm_Gen_Item *it,
 {
    ELM_GENLIST_ITEM_CHECK_OR_RETURN(it);
    eina_stringshare_replace(&it->mouse_cursor, cursor);
-   if (VIEW(it)) eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS,
-         elm_wdg_item_cursor_set(cursor));
+   if (VIEW(it)) elm_wdg_item_cursor_set(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS), cursor);
 }
 
 EAPI const char *
 elm_genlist_item_cursor_get(const Elm_Object_Item *eo_it)
 {
    const char *ret;
-   return eo_do_ret(eo_it, ret, elm_wdg_item_cursor_get());
+   return elm_wdg_item_cursor_get(eo_it);
 }
 
 EAPI void
 elm_genlist_item_cursor_unset(Elm_Object_Item *item)
 {
-   eo_do(item, elm_wdg_item_cursor_unset());
+   elm_wdg_item_cursor_unset(item);
 }
 
 EOLIAN static void
@@ -7330,8 +7312,7 @@ _elm_genlist_item_elm_widget_item_cursor_unset(Eo *eo_it, Elm_Gen_Item *it)
 
    if (!it->mouse_cursor) return;
 
-   if (VIEW(it)) eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS,
-         elm_wdg_item_cursor_unset());
+   if (VIEW(it)) elm_wdg_item_cursor_unset(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS));
 
    ELM_SAFE_FREE(it->mouse_cursor, eina_stringshare_del);
 }
@@ -7340,28 +7321,28 @@ EAPI void
 elm_genlist_item_cursor_style_set(Elm_Object_Item *eo_it,
                                   const char *style)
 {
-   eo_do(eo_it, elm_wdg_item_cursor_style_set(style));
+   elm_wdg_item_cursor_style_set(eo_it, style);
 }
 
 EAPI const char *
 elm_genlist_item_cursor_style_get(const Elm_Object_Item *eo_it)
 {
    const char *ret;
-   return eo_do_ret(eo_it, ret, elm_wdg_item_cursor_style_get());
+   return elm_wdg_item_cursor_style_get(eo_it);
 }
 
 EAPI void
 elm_genlist_item_cursor_engine_only_set(Elm_Object_Item *eo_it,
                                         Eina_Bool engine_only)
 {
-   eo_do(eo_it, elm_wdg_item_cursor_engine_only_set(engine_only));
+   elm_wdg_item_cursor_engine_only_set(eo_it, engine_only);
 }
 
 EAPI Eina_Bool
 elm_genlist_item_cursor_engine_only_get(const Elm_Object_Item *eo_it)
 {
    Eina_Bool ret;
-   return eo_do_ret(eo_it, ret, elm_wdg_item_cursor_engine_only_get());
+   return elm_wdg_item_cursor_engine_only_get(eo_it);
 }
 
 EOLIAN static int
@@ -7416,7 +7397,7 @@ elm_genlist_bounce_set(Evas_Object *obj,
                        Eina_Bool v_bounce)
 {
    ELM_GENLIST_CHECK(obj);
-   eo_do(obj, elm_interface_scrollable_bounce_allow_set(h_bounce, v_bounce));
+   elm_interface_scrollable_bounce_allow_set(obj, h_bounce, v_bounce);
 }
 
 EOLIAN static void
@@ -7424,8 +7405,8 @@ _elm_genlist_elm_interface_scrollable_bounce_allow_set(Eo *obj, Elm_Genlist_Data
 {
    sd->h_bounce = !!h_bounce;
    sd->v_bounce = !!v_bounce;
-   eo_do_super(obj, MY_CLASS, elm_interface_scrollable_bounce_allow_set
-         (sd->h_bounce, sd->v_bounce));
+   elm_interface_scrollable_bounce_allow_set
+         (eo_super(obj, MY_CLASS), sd->h_bounce, sd->v_bounce);
 }
 
 EAPI void
@@ -7434,8 +7415,8 @@ elm_genlist_bounce_get(const Evas_Object *obj,
                        Eina_Bool *v_bounce)
 {
    ELM_GENLIST_CHECK(obj);
-   eo_do( obj, elm_interface_scrollable_bounce_allow_get
-         (h_bounce, v_bounce));
+   elm_interface_scrollable_bounce_allow_get
+         (obj, h_bounce, v_bounce);
 }
 
 EOLIAN static void
@@ -7582,7 +7563,7 @@ _item_filter_enterer(void *data)
    if (ok == ECORE_CALLBACK_CANCEL)
      {
         sd->queue_filter_enterer = NULL;
-        eo_do(sd->obj, eo_event_callback_call(ELM_GENLIST_EVENT_FILTER_DONE, NULL));
+        eo_event_callback_call(sd->obj, ELM_GENLIST_EVENT_FILTER_DONE, NULL);
      }
 
    return ok;
@@ -7708,7 +7689,7 @@ elm_genlist_scroller_policy_set(Evas_Object *obj,
                                 Elm_Scroller_Policy policy_v)
 {
    ELM_GENLIST_CHECK(obj);
-   eo_do(obj, elm_interface_scrollable_policy_set(policy_h, policy_v));
+   elm_interface_scrollable_policy_set(obj, policy_h, policy_v);
 }
 
 EOLIAN static void
@@ -7718,7 +7699,7 @@ _elm_genlist_elm_interface_scrollable_policy_set(Eo *obj, Elm_Genlist_Data *sd E
        (policy_v >= ELM_SCROLLER_POLICY_LAST))
      return;
 
-   eo_do_super(obj, MY_CLASS, elm_interface_scrollable_policy_set(policy_h, policy_v));
+   elm_interface_scrollable_policy_set(eo_super(obj, MY_CLASS), policy_h, policy_v);
 }
 
 EAPI void
@@ -7727,7 +7708,7 @@ elm_genlist_scroller_policy_get(const Evas_Object *obj,
                                 Elm_Scroller_Policy *policy_v)
 {
    ELM_GENLIST_CHECK(obj);
-   eo_do( obj, elm_interface_scrollable_policy_get(policy_h, policy_v));
+   elm_interface_scrollable_policy_get(obj, policy_h, policy_v);
 }
 
 EOLIAN static void
@@ -7735,8 +7716,8 @@ _elm_genlist_elm_interface_scrollable_policy_get(Eo *obj, Elm_Genlist_Data *sd E
 {
    Elm_Scroller_Policy s_policy_h, s_policy_v;
 
-   eo_do_super(obj, MY_CLASS, elm_interface_scrollable_policy_get
-         (&s_policy_h, &s_policy_v));
+   elm_interface_scrollable_policy_get
+         (eo_super(obj, MY_CLASS), &s_policy_h, &s_policy_v);
    if (policy_h) *policy_h = (Elm_Scroller_Policy)s_policy_h;
    if (policy_v) *policy_v = (Elm_Scroller_Policy)s_policy_v;
 }
@@ -7772,7 +7753,7 @@ _elm_genlist_item_decorate_mode_set(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it,
    sd = GL_IT(it)->wsd;
 
    if (!decorate_it_type) return;
-   if (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get())) return;
+   if (elm_wdg_item_disabled_get(eo_it)) return;
    if (sd->decorate_all_mode) return;
 
    if ((sd->mode_item == it) &&
@@ -8116,9 +8097,9 @@ _elm_genlist_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_Ge
    Elm_Atspi_State_Set ret;
    Eina_Bool sel;
 
-   eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS, ret = elm_interface_atspi_accessible_state_set_get());
+   ret = elm_interface_atspi_accessible_state_set_get(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS));
 
-   eo_do(eo_it, sel = elm_obj_genlist_item_selected_get());
+   sel = elm_obj_genlist_item_selected_get(eo_it);
 
    STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTABLE);
 
@@ -8141,7 +8122,7 @@ _elm_genlist_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Gen_Ite
    char *ret;
    Eina_Strbuf *buf;
 
-   eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS, ret = elm_interface_atspi_accessible_name_get());
+   ret = elm_interface_atspi_accessible_name_get(eo_super(eo_it, ELM_GENLIST_ITEM_CLASS));
    if (ret) return ret;
 
    buf = eina_strbuf_new();
@@ -8362,7 +8343,7 @@ _elm_genlist_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Genlist_Da
    EINA_INLIST_FOREACH(sd->items, it)
       ret = eina_list_append(ret, EO_OBJ(it));
 
-   eo_do_super(obj, ELM_GENLIST_CLASS, ret2 = elm_interface_atspi_accessible_children_get());
+   ret2 = elm_interface_atspi_accessible_children_get(eo_super(obj, ELM_GENLIST_CLASS));
 
    return eina_list_merge(ret, ret2);
 }
@@ -8372,7 +8353,7 @@ _elm_genlist_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Genlist_D
 {
    Elm_Atspi_State_Set ret;
 
-   eo_do_super(obj, ELM_GENLIST_CLASS, ret = elm_interface_atspi_accessible_state_set_get());
+   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_GENLIST_CLASS));
 
    STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MANAGES_DESCENDANTS);
 
diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c
index 476e682fb..27d60b72c 100644
--- a/src/lib/elm_gesture_layer.c
+++ b/src/lib/elm_gesture_layer.c
@@ -3736,7 +3736,7 @@ _elm_gesture_layer_elm_widget_disable(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_
 EOLIAN static void
 _elm_gesture_layer_evas_object_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->line_min_length =
@@ -3810,7 +3810,7 @@ _elm_gesture_layer_evas_object_smart_del(Eo *obj, Elm_Gesture_Layer_Data *sd)
    if (!elm_widget_disabled_get(obj))
      _callbacks_unregister(obj);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -3824,8 +3824,8 @@ elm_gesture_layer_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_gesture_layer_eo_base_constructor(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
 
    return obj;
 }
@@ -3910,7 +3910,7 @@ _elm_gesture_layer_cb_set(Eo *obj, Elm_Gesture_Layer_Data *sd, Elm_Gesture_Type
      _glayer_tests_array[idx].reset(sd->gesture[idx]);
 
    _cbs_clean(sd, idx, cb_type); // for ABI compat.
-   eo_do(obj, elm_obj_gesture_layer_cb_add(idx, cb_type, cb, data));
+   elm_obj_gesture_layer_cb_add(obj, idx, cb_type, cb, data);
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index 1cc4174e8..43d08d534 100644
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -32,7 +32,7 @@ _elm_glview_elm_widget_on_focus(Eo *obj, Elm_Glview_Data *_pd EINA_UNUSED, Elm_O
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus(NULL));
+   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj))
@@ -88,7 +88,7 @@ _glview_update_surface(Evas_Object *obj)
 EOLIAN static void
 _elm_glview_evas_object_smart_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
 
    sd->resized = EINA_TRUE;
 
@@ -210,7 +210,7 @@ _elm_glview_evas_object_smart_add(Eo *obj, Elm_Glview_Data *priv EINA_UNUSED)
    elm_widget_resize_object_set(obj, img, EINA_TRUE);
    evas_object_image_size_set(img, 1, 1);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
 }
 
 static void
@@ -289,15 +289,14 @@ _elm_glview_evas_object_smart_del(Eo *obj, Elm_Glview_Data *sd)
    if (sd->config) evas_gl_config_free(sd->config);
    if (sd->evasgl) evas_gl_free(sd->evasgl);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
 elm_glview_add(Evas_Object *parent)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent,
-                             elm_obj_glview_version_constructor(EVAS_GL_GLES_2_X));
+   Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_glview_version_constructor(eoid, EVAS_GL_GLES_2_X));
    return obj;
 }
 
@@ -305,8 +304,7 @@ EAPI Evas_Object *
 elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Version version)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
-   Evas_Object *obj = eo_add(MY_CLASS, parent,
-                             elm_obj_glview_version_constructor(version));
+   Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_glview_version_constructor(eoid, version));
    return obj;
 }
 
@@ -318,10 +316,9 @@ _elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd,
      ((version > 0) && (version <= 3)) ? version : EVAS_GL_GLES_2_X;
    _elm_glview_constructor(obj, sd);
 
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ANIMATION));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);
 }
 
 EOLIAN static Eo *
@@ -333,7 +330,7 @@ _elm_glview_eo_base_finalize(Eo *obj, Elm_Glview_Data *sd)
         return NULL;
      }
 
-   return eo_do_super_ret(obj, MY_CLASS, obj, eo_finalize());
+   return eo_finalize(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static Evas_GL_API*
diff --git a/src/lib/elm_grid.c b/src/lib/elm_grid.c
index 2999faacf..957823c7b 100644
--- a/src/lib/elm_grid.c
+++ b/src/lib/elm_grid.c
@@ -107,7 +107,7 @@ _elm_grid_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -127,11 +127,11 @@ _elm_grid_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED)
    elm_widget_resize_object_set(obj, grid, EINA_TRUE);
    evas_object_grid_size_set(wd->resize_obj, 100, 100);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 }
 
 EOLIAN static void
@@ -154,7 +154,7 @@ _elm_grid_evas_object_smart_del(Eo *obj, void *_pd EINA_UNUSED)
           }
      }
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -168,10 +168,9 @@ elm_grid_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_grid_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
 
    return obj;
 }
diff --git a/src/lib/elm_helper.h b/src/lib/elm_helper.h
index 9d0d60bfa..415faebd4 100644
--- a/src/lib/elm_helper.h
+++ b/src/lib/elm_helper.h
@@ -91,10 +91,10 @@ elm_validator_regexp_status_get(Elm_Validator_Regexp *validator) EINA_ARG_NONNUL
  * //add validator
  * entry = elm_entry_add(parent);
  * re = elm_validator_regexp_add("^[0-9]*$");
- * eo_do(entry, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, re));
+ * eo_event_callback_add(entry, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, re);
  *
  * //delete validator
- * eo_do(entry, eo_event_callback_del(ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, re));
+ * eo_event_callback_del(entry, ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, re);
  * @endcode
  *
  * @see elm_validator_regexp_add()
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 030aa73e3..22b7e3d52 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -241,8 +241,8 @@ _elm_hover_smt_sub_re_eval(Evas_Object *obj)
    sd->smt_sub->obj = sub;
 
    if (sd->smt_sub != prev)
-     eo_do(obj, eo_event_callback_call
-       (ELM_HOVER_EVENT_SMART_CHANGED, (void *)sd->smt_sub->swallow));
+     eo_event_callback_call
+       (obj, ELM_HOVER_EVENT_SMART_CHANGED, (void *)sd->smt_sub->swallow);
 
    if (elm_widget_mirrored_get(obj))
      {
@@ -289,7 +289,7 @@ EOLIAN static Eina_Bool
 _elm_hover_elm_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    if (sd->smt_sub) _elm_hover_smt_sub_re_eval(obj);
@@ -347,7 +347,7 @@ _elm_hover_elm_widget_sub_object_add(Eo *obj, Elm_Hover_Data *sd, Evas_Object *s
 
    if (evas_object_data_get(sobj, "elm-parent") == obj) return EINA_TRUE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_add(sobj));
+   int_ret = elm_obj_widget_sub_object_add(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if (sd->smt_sub && sd->smt_sub->obj == sobj)
@@ -362,7 +362,7 @@ _elm_hover_elm_widget_sub_object_del(Eo *obj, Elm_Hover_Data *sd, Evas_Object *s
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(sobj));
+   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if (sd->smt_sub && sd->smt_sub->obj == sobj)
@@ -433,7 +433,7 @@ _elm_hover_elm_container_content_set(Eo *obj, Elm_Hover_Data *sd, const char *sw
           }
      }
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_set(swallow, content));
+   int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), swallow, content);
    if (!int_ret) return EINA_FALSE;
 
    if (strstr(swallow, "elm.swallow.slot."))
@@ -462,9 +462,9 @@ _elm_hover_elm_container_content_get(Eo *obj, Elm_Hover_Data *sd, const char *sw
    if (!swallow) return ret;
 
    if (!strcmp(swallow, "smart"))
-      eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_get(sd->smt_sub->swallow));
+      ret = elm_obj_container_content_get(eo_super(obj, MY_CLASS), sd->smt_sub->swallow);
    else
-      eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_get(swallow));
+      ret = elm_obj_container_content_get(eo_super(obj, MY_CLASS), swallow);
 
    return ret;
 }
@@ -477,11 +477,11 @@ _elm_hover_elm_container_content_unset(Eo *obj, Elm_Hover_Data *sd, const char *
    if (!swallow) return NULL;
 
    if (!strcmp(swallow, "smart"))
-      eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_unset
-            (sd->smt_sub->swallow));
+      ret = elm_obj_container_content_unset
+            (eo_super(obj, MY_CLASS), sd->smt_sub->swallow);
    else
-      eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_unset
-            (swallow));
+      ret = elm_obj_container_content_unset
+            (eo_super(obj, MY_CLASS), swallow);
    return ret;
 }
 
@@ -539,7 +539,7 @@ _hov_hide_cb(void *data,
    if (dismissstr && !strcmp(dismissstr, "on"))
      {
         evas_object_hide(data);
-        eo_do(data, eo_event_callback_call(ELM_HOVER_EVENT_DISMISSED, NULL));
+        eo_event_callback_call(data, ELM_HOVER_EVENT_DISMISSED, NULL);
      }
 }
 
@@ -556,15 +556,15 @@ _hov_dismiss_cb(void *data,
    if (dismissstr && !strcmp(dismissstr, "on"))
      {
         _hide_signals_emit(data);
-        eo_do(data, eo_event_callback_call
-          (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+        eo_event_callback_call
+          (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
      }
    else
      {
         evas_object_hide(data);
-        eo_do(data, eo_event_callback_call
-          (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
-        eo_do(data, eo_event_callback_call(ELM_HOVER_EVENT_DISMISSED, NULL));
+        eo_event_callback_call
+          (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+        eo_event_callback_call(data, ELM_HOVER_EVENT_DISMISSED, NULL);
      } // for backward compatibility
 }
 
@@ -573,7 +573,7 @@ _elm_hover_evas_object_smart_add(Eo *obj, Elm_Hover_Data *priv)
 {
    unsigned int i;
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    for (i = 0; i < sizeof(priv->subs) / sizeof(priv->subs[0]); i++)
@@ -609,9 +609,9 @@ _elm_hover_evas_object_smart_del(Eo *obj, Elm_Hover_Data *sd)
 
    if (evas_object_visible_get(obj))
      {
-        eo_do(obj, eo_event_callback_call
-          (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
-        eo_do(obj, eo_event_callback_call(ELM_HOVER_EVENT_DISMISSED, NULL));
+        eo_event_callback_call
+          (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+        eo_event_callback_call(obj, ELM_HOVER_EVENT_DISMISSED, NULL);
      }
 
    elm_hover_target_set(obj, NULL);
@@ -619,13 +619,13 @@ _elm_hover_evas_object_smart_del(Eo *obj, Elm_Hover_Data *sd)
    _elm_hover_parent_detach(obj);
    sd->parent = NULL;
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_hover_evas_object_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
+   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
 
    elm_layout_sizing_eval(obj);
 }
@@ -633,7 +633,7 @@ _elm_hover_evas_object_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas
 EOLIAN static void
 _elm_hover_evas_object_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
 
    elm_layout_sizing_eval(obj);
 }
@@ -641,7 +641,7 @@ _elm_hover_evas_object_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Ev
 EOLIAN static void
 _elm_hover_evas_object_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
+   evas_obj_smart_show(eo_super(obj, MY_CLASS));
 
    _hov_show_do(obj);
 }
@@ -651,7 +651,7 @@ _elm_hover_evas_object_smart_hide(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
 {
    const char *dismissstr;
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
+   evas_obj_smart_hide(eo_super(obj, MY_CLASS));
 
    // for backward compatibility
    dismissstr = elm_layout_data_get(obj, "dismiss");
@@ -677,11 +677,10 @@ elm_hover_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_hover_eo_base_constructor(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_POPUP_MENU));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU);
 
    return obj;
 }
@@ -716,7 +715,7 @@ elm_hover_parent_set(Evas_Object *obj,
                      Evas_Object *parent)
 {
    ELM_HOVER_CHECK(obj);
-   eo_do(obj, elm_obj_widget_parent_set(parent));
+   elm_obj_widget_parent_set(obj, parent);
 }
 
 EOLIAN static void
@@ -753,7 +752,7 @@ elm_hover_parent_get(const Evas_Object *obj)
 {
    ELM_HOVER_CHECK(obj) NULL;
    Evas_Object *ret = NULL;
-   eo_do((Eo *) obj, ret = elm_obj_widget_parent_get());
+   ret = elm_obj_widget_parent_get((Eo *) obj);
    return ret;
 }
 
@@ -835,7 +834,7 @@ _elm_hover_class_constructor(Eo_Class *klass)
 static Eina_Bool
 _action_dismiss(Evas_Object *obj, const char *params EINA_UNUSED)
 {
-   eo_do(obj, elm_obj_hover_dismiss());
+   elm_obj_hover_dismiss(obj);
    return EINA_TRUE;
 }
 
diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c
index 8e8877d76..e2ec1614c 100644
--- a/src/lib/elm_icon.c
+++ b/src/lib/elm_icon.c
@@ -113,11 +113,11 @@ _icon_thumb_display(Elm_Icon_Data *sd)
          (sd->obj, sd->thumb.thumb.path, sd->thumb.thumb.key);
 
    if (ret)
-     eo_do(sd->obj, eo_event_callback_call
-       (ELM_ICON_EVENT_THUMB_DONE, NULL));
+     eo_event_callback_call
+       (sd->obj, ELM_ICON_EVENT_THUMB_DONE, NULL);
    else
-     eo_do(sd->obj, eo_event_callback_call
-       (ELM_ICON_EVENT_THUMB_ERROR, NULL));
+     eo_event_callback_call
+       (sd->obj, ELM_ICON_EVENT_THUMB_ERROR, NULL);
 
    return ret;
 }
@@ -219,7 +219,7 @@ _icon_thumb_error(Ethumb_Client *client,
    ERR("could not generate thumbnail for %s (key: %s)",
        sd->thumb.file.path, sd->thumb.file.key);
 
-   eo_do(sd->obj, eo_event_callback_call(ELM_ICON_EVENT_THUMB_ERROR, NULL));
+   eo_event_callback_call(sd->obj, ELM_ICON_EVENT_THUMB_ERROR, NULL);
 
    _icon_thumb_cleanup(client);
 }
@@ -354,7 +354,7 @@ _elm_icon_efl_file_file_set(Eo *obj, Elm_Icon_Data *sd, const char *file, const
    if (!sd->is_video)
      {
         Eina_Bool int_ret = EINA_FALSE;
-        eo_do_super(obj, MY_CLASS, int_ret = efl_file_set(file, key));
+        int_ret = efl_file_set(eo_super(obj, MY_CLASS), file, key);
         return int_ret;
      }
 
@@ -403,7 +403,7 @@ _elm_icon_elm_image_memfile_set(Eo *obj, Elm_Icon_Data *sd, const void *img, siz
 
    _edje_signals_free(sd);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_image_memfile_set(img, size, format, key));
+   int_ret = elm_obj_image_memfile_set(eo_super(obj, MY_CLASS), img, size, format, key);
    return int_ret;
 }
 
@@ -415,7 +415,7 @@ _elm_icon_elm_widget_theme_apply(Eo *obj, Elm_Icon_Data *sd)
    if (sd->stdicon)
      _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj));
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    return EINA_TRUE;
@@ -495,7 +495,7 @@ _internal_elm_icon_standard_set(Evas_Object *obj,
    if (ret)
      {
         eina_stringshare_replace(&sd->stdicon, name);
-        eo_do(obj, elm_obj_image_sizing_eval());
+        elm_obj_image_sizing_eval(obj);
         return EINA_TRUE;
      }
 
@@ -542,7 +542,7 @@ _elm_icon_thumb_resize_cb(void *data,
 EOLIAN static void
 _elm_icon_evas_object_smart_add(Eo *obj, Elm_Icon_Data *priv)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->lookup_order = ELM_ICON_LOOKUP_THEME_FDO;
@@ -569,7 +569,7 @@ _elm_icon_evas_object_smart_del(Eo *obj, Elm_Icon_Data *sd)
 
    _edje_signals_free(sd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 /* WARNING: to be deprecated */
@@ -666,13 +666,12 @@ elm_icon_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_icon_eo_base_constructor(Eo *obj, Elm_Icon_Data *sd)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
 
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
 
    return obj;
 }
@@ -687,7 +686,7 @@ elm_icon_memfile_set(Evas_Object *obj,
    ELM_ICON_CHECK(obj) EINA_FALSE;
 
    Eina_Bool ret = EINA_FALSE;
-   eo_do(obj, ret = elm_obj_image_memfile_set(img, size, format, key));
+   ret = elm_obj_image_memfile_set(obj, img, size, format, key);
    return ret;
 }
 
@@ -700,7 +699,7 @@ elm_icon_file_set(Evas_Object *obj,
    EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE);
 
    Eina_Bool ret = EINA_FALSE;
-   eo_do(obj, ret = efl_file_set(file, group));
+   ret = efl_file_set(obj, file, group);
    return ret;
 }
 
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index 3989acb40..411900414 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -75,7 +75,7 @@ _on_mouse_up(void *data,
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if (!wd->still_in) return;
 
-   eo_do(data, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+   eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
 }
 
 static Eina_Bool
@@ -359,7 +359,7 @@ _elm_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
         ERR("Async open failed for an unknown reason.");
         sd->async_failed = EINA_TRUE;
         eina_spinlock_release(&sd->async.lck);
-        eo_do(obj, eo_event_callback_call(EFL_FILE_EVENT_ASYNC_ERROR, NULL));
+        eo_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_ERROR, NULL);
         return;
      }
 
@@ -400,7 +400,7 @@ _elm_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
         sd->async_failed = EINA_FALSE;
         ELM_SAFE_FREE(sd->async.file, eina_stringshare_del);
         ELM_SAFE_FREE(sd->async.key, eina_stringshare_del);
-        eo_do(obj, eo_event_callback_call(EFL_FILE_EVENT_ASYNC_OPENED, NULL));
+        eo_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_OPENED, NULL);
         _elm_image_internal_sizing_eval(obj, sd);
      }
    else
@@ -408,7 +408,7 @@ _elm_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
         // TODO: Implement Efl.File async,error event_info type
         sd->async_failed = EINA_TRUE;
         // keep file,key around for file_get
-        eo_do(obj, eo_event_callback_call(EFL_FILE_EVENT_ASYNC_ERROR, NULL));
+        eo_event_callback_call(obj, EFL_FILE_EVENT_ASYNC_ERROR, NULL);
      }
 
    // close f, map and free strings
@@ -606,13 +606,13 @@ _elm_image_drag_n_drop_cb(void *elm_obj,
       Elm_Selection_Data *drop)
 {
    Eina_Bool ret = EINA_FALSE;
-   eo_do(obj, ret = efl_file_set(drop->data, NULL));
+   ret = efl_file_set(obj, drop->data, NULL);
    if (ret)
      {
         DBG("dnd: %s, %s, %s", elm_widget_type_get(elm_obj),
               SIG_DND, (char *)drop->data);
 
-        eo_do(elm_obj, eo_event_callback_call(ELM_IMAGE_EVENT_DROP, drop->data));
+        eo_event_callback_call(elm_obj, ELM_IMAGE_EVENT_DROP, drop->data);
         return EINA_TRUE;
      }
 
@@ -622,7 +622,7 @@ _elm_image_drag_n_drop_cb(void *elm_obj,
 EOLIAN static void
 _elm_image_evas_object_smart_add(Eo *obj, Elm_Image_Data *priv)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
@@ -651,7 +651,7 @@ _elm_image_evas_object_smart_add(Eo *obj, Elm_Image_Data *priv)
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
-   eo_do(obj, elm_obj_image_sizing_eval());
+   elm_obj_image_sizing_eval(obj);
 }
 
 EOLIAN static void
@@ -671,7 +671,7 @@ _elm_image_evas_object_smart_del(Eo *obj, Elm_Image_Data *sd)
           {
              ERR("Async open thread timed out during cancellation.");
              // skipping all other data free to avoid crashes (this leaks)
-             eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+             evas_obj_smart_del(eo_super(obj, MY_CLASS));
              return;
           }
         sd->async.th = NULL;
@@ -682,13 +682,13 @@ _elm_image_evas_object_smart_del(Eo *obj, Elm_Image_Data *sd)
    eina_stringshare_del(sd->async.file);
    eina_stringshare_del(sd->async.key);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_image_evas_object_smart_move(Eo *obj, Elm_Image_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
+   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
 
    if ((sd->img_x == x) && (sd->img_y == y)) return;
    sd->img_x = x;
@@ -701,7 +701,7 @@ _elm_image_evas_object_smart_move(Eo *obj, Elm_Image_Data *sd, Evas_Coord x, Eva
 EOLIAN static void
 _elm_image_evas_object_smart_resize(Eo *obj, Elm_Image_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
 
    if ((sd->img_w == w) && (sd->img_h == h)) return;
 
@@ -718,7 +718,7 @@ _elm_image_evas_object_smart_show(Eo *obj, Elm_Image_Data *sd)
    sd->show = EINA_TRUE;
    if (sd->preload_status == ELM_IMAGE_PRELOADING) return;
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
+   evas_obj_smart_show(eo_super(obj, MY_CLASS));
 
    evas_object_show(sd->img);
 
@@ -728,7 +728,7 @@ _elm_image_evas_object_smart_show(Eo *obj, Elm_Image_Data *sd)
 EOLIAN static void
 _elm_image_evas_object_smart_hide(Eo *obj, Elm_Image_Data *sd)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
+   evas_obj_smart_hide(eo_super(obj, MY_CLASS));
 
    sd->show = EINA_FALSE;
    evas_object_hide(sd->img);
@@ -739,7 +739,7 @@ _elm_image_evas_object_smart_hide(Eo *obj, Elm_Image_Data *sd)
 EOLIAN static void
 _elm_image_evas_object_smart_member_add(Eo *obj, Elm_Image_Data *sd, Evas_Object *member)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
+   evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -748,7 +748,7 @@ _elm_image_evas_object_smart_member_add(Eo *obj, Elm_Image_Data *sd, Evas_Object
 EOLIAN static void
 _elm_image_evas_object_smart_color_set(Eo *obj, Elm_Image_Data *sd, int r, int g, int b, int a)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_color_set(r, g, b, a));
+   evas_obj_smart_color_set(eo_super(obj, MY_CLASS), r, g, b, a);
 
    evas_object_color_set(sd->hit_rect, 0, 0, 0, 0);
    evas_object_color_set(sd->img, r, g, b, a);
@@ -758,7 +758,7 @@ _elm_image_evas_object_smart_color_set(Eo *obj, Elm_Image_Data *sd, int r, int g
 EOLIAN static void
 _elm_image_evas_object_smart_clip_set(Eo *obj, Elm_Image_Data *sd, Evas_Object *clip)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_clip_set(clip));
+   evas_obj_smart_clip_set(eo_super(obj, MY_CLASS), clip);
 
    evas_object_clip_set(sd->img, clip);
    if (sd->prev_img) evas_object_clip_set(sd->prev_img, clip);
@@ -767,7 +767,7 @@ _elm_image_evas_object_smart_clip_set(Eo *obj, Elm_Image_Data *sd, Evas_Object *
 EOLIAN static void
 _elm_image_evas_object_smart_clip_unset(Eo *obj, Elm_Image_Data *sd)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_clip_unset());
+   evas_obj_smart_clip_unset(eo_super(obj, MY_CLASS));
 
    evas_object_clip_unset(sd->img);
    if (sd->prev_img) evas_object_clip_unset(sd->prev_img);
@@ -777,10 +777,10 @@ EOLIAN static Eina_Bool
 _elm_image_elm_widget_theme_apply(Eo *obj, Elm_Image_Data *sd EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
-   eo_do(obj, elm_obj_image_sizing_eval());
+   elm_obj_image_sizing_eval(obj);
 
    return EINA_TRUE;
 }
@@ -788,7 +788,7 @@ _elm_image_elm_widget_theme_apply(Eo *obj, Elm_Image_Data *sd EINA_UNUSED)
 static Eina_Bool
 _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+   eo_event_callback_call(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
    return EINA_TRUE;
 }
 
@@ -817,16 +817,16 @@ _elm_image_sizing_eval(Eo *obj, Elm_Image_Data *sd)
 
    _elm_image_internal_sizing_eval(obj, sd);
 
-   eo_do(obj, efl_image_smooth_scale_set(sd->smooth));
+   efl_image_smooth_scale_set(obj, sd->smooth);
 
    if (sd->no_scale)
-     eo_do(obj, elm_obj_image_scale_set(1.0));
+     elm_obj_image_scale_set(obj, 1.0);
    else
-     eo_do(obj, elm_obj_image_scale_set(elm_widget_scale_get(obj) * elm_config_scale_get()));
+     elm_obj_image_scale_set(obj, elm_widget_scale_get(obj) * elm_config_scale_get());
 
    ts = sd->scale;
    sd->scale = 1.0;
-   eo_do(obj, elm_obj_image_object_size_get(&w, &h));
+   elm_obj_image_object_size_get(obj, &w, &h);
 
    sd->scale = ts;
    evas_object_size_hint_min_get(obj, &minw, &minh);
@@ -891,7 +891,7 @@ _elm_image_file_set_do(Evas_Object *obj)
      evas_object_image_load_size_set(sd->img, sd->load_size, sd->load_size);
    else
      {
-        eo_do((Eo *) obj, elm_obj_image_object_size_get(&w, &h));
+        elm_obj_image_object_size_get((Eo *) obj, &w, &h);
         evas_object_image_load_size_set(sd->img, w, h);
      }
 }
@@ -947,11 +947,10 @@ elm_image_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_image_eo_base_constructor(Eo *obj, Elm_Image_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
 
    return obj;
 }
@@ -964,16 +963,15 @@ elm_image_file_set(Evas_Object *obj,
    Eina_Bool ret = EINA_FALSE;
 
    ELM_IMAGE_CHECK(obj) EINA_FALSE;
-   eo_do(obj,
-         ret = efl_file_set(file, group);
-         elm_obj_image_sizing_eval());
+   ret = efl_file_set(obj, file, group);
+   elm_obj_image_sizing_eval(obj);
    return ret;
 }
 
 EAPI void
 elm_image_file_get(const Eo *obj, const char **file, const char **group)
 {
-   eo_do((Eo *) obj, efl_file_get(file, group));
+   efl_file_get((Eo *) obj, file, group);
 }
 
 EAPI Eina_Bool
@@ -984,7 +982,7 @@ elm_image_mmap_set(Evas_Object *obj,
    Eina_Bool ret = EINA_FALSE;
 
    ELM_IMAGE_CHECK(obj) EINA_FALSE;
-   eo_do(obj, ret = efl_file_mmap_set(file, group));
+   ret = efl_file_mmap_set(obj, file, group);
    return ret;
 }
 
@@ -994,9 +992,8 @@ _elm_image_efl_file_mmap_set(Eo *obj, Elm_Image_Data *pd EINA_UNUSED,
 {
    Eina_Bool ret = EINA_FALSE;
 
-   eo_do(obj,
-         ret = elm_obj_image_mmap_set(file, key),
-         elm_obj_image_sizing_eval());
+   ret = elm_obj_image_mmap_set(obj, file, key);
+   elm_obj_image_sizing_eval(obj);
 
    return ret;
 }
@@ -1066,7 +1063,7 @@ _elm_image_smart_download_done(void *data, Elm_Url *url EINA_UNUSED, Eina_Binbuf
 
         free(sd->remote_data);
         sd->remote_data = NULL;
-        eo_do(obj, eo_event_callback_call(ELM_IMAGE_EVENT_DOWNLOAD_ERROR, &err));
+        eo_event_callback_call(obj, ELM_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
      }
    else
      {
@@ -1076,7 +1073,7 @@ _elm_image_smart_download_done(void *data, Elm_Url *url EINA_UNUSED, Eina_Binbuf
              evas_object_image_preload(sd->img, EINA_FALSE);
           }
 
-        eo_do(obj, eo_event_callback_call(ELM_IMAGE_EVENT_DOWNLOAD_DONE, NULL));
+        eo_event_callback_call(obj, ELM_IMAGE_EVENT_DOWNLOAD_DONE, NULL);
      }
 
    ELM_SAFE_FREE(sd->key, eina_stringshare_del);
@@ -1089,7 +1086,7 @@ _elm_image_smart_download_cancel(void *data, Elm_Url *url EINA_UNUSED, int error
    Elm_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
    Elm_Image_Error err = { error, EINA_FALSE };
 
-   eo_do(obj, eo_event_callback_call(ELM_IMAGE_EVENT_DOWNLOAD_ERROR, &err));
+   eo_event_callback_call(obj, ELM_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
 
    sd->remote = NULL;
    ELM_SAFE_FREE(sd->key, eina_stringshare_del);
@@ -1103,7 +1100,7 @@ _elm_image_smart_download_progress(void *data, Elm_Url *url EINA_UNUSED, double
 
    progress.now = now;
    progress.total = total;
-   eo_do(obj, eo_event_callback_call(ELM_IMAGE_EVENT_DOWNLOAD_PROGRESS, &progress));
+   eo_event_callback_call(obj, ELM_IMAGE_EVENT_DOWNLOAD_PROGRESS, &progress);
 }
 
 static const char *remote_uri[] = {
@@ -1138,8 +1135,8 @@ _elm_image_efl_file_file_set(Eo *obj, Elm_Image_Data *sd, const char *file, cons
                                         obj);
           if (sd->remote)
             {
-               eo_do(obj, eo_event_callback_call
-                     (ELM_IMAGE_EVENT_DOWNLOAD_START, NULL));
+               eo_event_callback_call
+                     (obj, ELM_IMAGE_EVENT_DOWNLOAD_START, NULL);
                eina_stringshare_replace(&sd->key, key);
                return EINA_TRUE;
             }
@@ -1225,7 +1222,7 @@ _elm_image_efl_file_file_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, const char
         return;
      }
 
-   eo_do(sd->img, efl_file_get(file, key));
+   efl_file_get(sd->img, file, key);
 }
 
 EOLIAN static void
@@ -1233,7 +1230,7 @@ _elm_image_smooth_set(Eo *obj, Elm_Image_Data *sd, Eina_Bool smooth)
 {
    sd->smooth = smooth;
 
-   eo_do(obj, elm_obj_image_sizing_eval());
+   elm_obj_image_sizing_eval(obj);
 }
 
 EOLIAN static Eina_Bool
@@ -1303,7 +1300,7 @@ _elm_image_no_scale_set(Eo *obj, Elm_Image_Data *sd, Eina_Bool no_scale)
 {
    sd->no_scale = no_scale;
 
-   eo_do(obj, elm_obj_image_sizing_eval());
+   elm_obj_image_sizing_eval(obj);
 }
 
 EOLIAN static Eina_Bool
@@ -1318,7 +1315,7 @@ _elm_image_resizable_set(Eo *obj, Elm_Image_Data *sd, Eina_Bool up, Eina_Bool do
    sd->resize_up = !!up;
    sd->resize_down = !!down;
 
-   eo_do(obj, elm_obj_image_sizing_eval());
+   elm_obj_image_sizing_eval(obj);
 }
 
 EOLIAN static void
@@ -1333,7 +1330,7 @@ _elm_image_fill_outside_set(Eo *obj, Elm_Image_Data *sd, Eina_Bool fill_outside)
 {
    sd->fill_inside = !fill_outside;
 
-   eo_do(obj, elm_obj_image_sizing_eval());
+   elm_obj_image_sizing_eval(obj);
 }
 
 EOLIAN static Eina_Bool
@@ -1369,7 +1366,7 @@ elm_image_prescale_set(Evas_Object *obj,
                        int size)
 {
    ELM_IMAGE_CHECK(obj);
-   eo_do(obj, efl_image_load_size_set(size, size));
+   efl_image_load_size_set(obj, size, size);
 }
 
 EOLIAN static void
@@ -1387,7 +1384,7 @@ elm_image_prescale_get(const Evas_Object *obj)
    ELM_IMAGE_CHECK(obj) 0;
 
    int w = 0;
-   eo_do((Eo *)obj, efl_image_load_size_get(&w, NULL));
+   efl_image_load_size_get((Eo *)obj, &w, NULL);
    return w;
 }
 
@@ -1482,7 +1479,7 @@ EAPI Eina_Bool
 elm_image_animated_available_get(const Evas_Object *obj)
 {
    Eina_Bool ret;
-   eo_do(obj, ret = efl_player_playable_get());
+   ret = efl_player_playable_get(obj);
    return ret;
 }
 
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 17f844a3b..c6cf6b3ad 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -117,7 +117,7 @@ _elm_index_item_elm_widget_item_access_register(Eo *eo_item, Elm_Index_Item_Data
    Elm_Access_Info *ai;
 
    Evas_Object *ret = NULL;
-   eo_do_super(eo_item, ELM_INDEX_ITEM_CLASS, ret = elm_wdg_item_access_register());
+   ret = elm_wdg_item_access_register(eo_super(eo_item, ELM_INDEX_ITEM_CLASS));
 
    ai = _elm_access_info_get(it->base->access_obj);
 
@@ -368,7 +368,7 @@ _index_box_auto_fill(Evas_Object *obj,
         // ACCESS
         if ((it->level == 0) &&
             (_elm_config->access_mode == ELM_ACCESS_MODE_ON))
-          eo_do(eo_item, elm_wdg_item_access_register());
+          elm_wdg_item_access_register(eo_item);
 
         last_it = it;
      }
@@ -438,7 +438,7 @@ _elm_index_elm_widget_theme_apply(Eo *obj, Elm_Index_Data *sd)
    else
      eina_stringshare_replace(&ld->group, "base/vertical");
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    elm_coords_finger_size_adjust(1, &minw, 1, &minh);
@@ -523,15 +523,15 @@ _elm_index_item_eo_base_destructor(Eo *eo_item EINA_UNUSED, Elm_Index_Item_Data
    _item_free(it);
    _index_box_clear(WIDGET(it), sd->level);
 
-   eo_do_super(eo_item, ELM_INDEX_ITEM_CLASS, eo_destructor());
+   eo_destructor(eo_super(eo_item, ELM_INDEX_ITEM_CLASS));
 }
 
 EOLIAN static Eo *
 _elm_index_item_eo_base_constructor(Eo *obj, Elm_Index_Item_Data *it)
 {
-   obj = eo_do_super_ret(obj, ELM_INDEX_ITEM_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, ELM_INDEX_ITEM_CLASS));
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
-   eo_do(obj, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PUSH_BUTTON));
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);
 
    return obj;
 }
@@ -546,7 +546,7 @@ _item_new(Evas_Object *obj,
 
    ELM_INDEX_DATA_GET(obj, sd);
 
-   eo_item = eo_add (ELM_INDEX_ITEM_CLASS, obj);
+   eo_item = eo_add(ELM_INDEX_ITEM_CLASS, obj);
    if (!eo_item) return NULL;
 
    ELM_INDEX_ITEM_DATA_GET(eo_item, it);
@@ -589,8 +589,8 @@ _delay_change_cb(void *data)
 
    if (item)
      {
-        eo_do(data, eo_event_callback_call
-              (ELM_INDEX_EVENT_DELAY_CHANGED, item));
+        eo_event_callback_call
+              (data, ELM_INDEX_EVENT_DELAY_CHANGED, item);
         ELM_INDEX_ITEM_DATA_GET(item, it);
         _index_priority_change(data, it);
      }
@@ -751,11 +751,11 @@ _sel_eval(Evas_Object *obj,
                     }
 
                   if (om_closest) 
-                    eo_do(obj, eo_event_callback_call
-                      (ELM_INDEX_EVENT_CHANGED, EO_OBJ(om_closest)));
+                    eo_event_callback_call
+                      (obj, ELM_INDEX_EVENT_CHANGED, EO_OBJ(om_closest));
                   else
-                    eo_do(obj, eo_event_callback_call
-                      (ELM_INDEX_EVENT_CHANGED, EO_OBJ(it)));
+                    eo_event_callback_call
+                      (obj, ELM_INDEX_EVENT_CHANGED, EO_OBJ(it));
                   ecore_timer_del(sd->delay);
                   sd->delay = ecore_timer_add(sd->delay_change_time,
                                               _delay_change_cb, obj);
@@ -849,8 +849,8 @@ _on_mouse_up(void *data,
    eo_item = elm_index_selected_item_get(data, sd->level);
    if (eo_item)
      {
-        eo_do(data, eo_event_callback_call
-          (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, eo_item));
+        eo_event_callback_call
+          (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, eo_item);
         eo_id_item = eo_item;
         ELM_INDEX_ITEM_DATA_GET(eo_id_item, id_item);
         if (id_item->func)
@@ -898,8 +898,8 @@ _on_mouse_move(void *data,
                   sd->level = 1;
                   snprintf(buf, sizeof(buf), "elm,state,level,%i", sd->level);
                   elm_layout_signal_emit(data, buf, "elm");
-                  eo_do(data, eo_event_callback_call
-                    (ELM_INDEX_EVENT_LEVEL_UP, NULL));
+                  eo_event_callback_call
+                    (data, ELM_INDEX_EVENT_LEVEL_UP, NULL);
                }
           }
         else
@@ -909,8 +909,8 @@ _on_mouse_move(void *data,
                   sd->level = 0;
                   snprintf(buf, sizeof(buf), "elm,state,level,%i", sd->level);
                   elm_layout_signal_emit(data, buf, "elm");
-                  eo_do(data, eo_event_callback_call
-                    (ELM_INDEX_EVENT_LEVEL_DOWN, NULL));
+                  eo_event_callback_call
+                    (data, ELM_INDEX_EVENT_LEVEL_DOWN, NULL);
                }
           }
      }
@@ -1031,7 +1031,7 @@ _elm_index_evas_object_smart_add(Eo *obj, Elm_Index_Data *priv)
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set
@@ -1107,14 +1107,14 @@ _elm_index_evas_object_smart_del(Eo *obj, Elm_Index_Data *sd)
    Elm_Index_Omit *o;
 
    while (sd->items)
-     eo_do (sd->items->data, elm_wdg_item_del());
+     elm_wdg_item_del(sd->items->data);
 
    EINA_LIST_FREE(sd->omit, o)
      free(o);
 
    ecore_timer_del(sd->delay);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 static Eina_Bool _elm_index_smart_focus_next_enable = EINA_FALSE;
@@ -1179,8 +1179,8 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
      {
         ELM_INDEX_ITEM_DATA_GET(eo_item, it);
         if (it->level != 0) continue;
-        if (is_access) eo_do(eo_item, elm_wdg_item_access_register());
-        else eo_do(eo_item, elm_wdg_item_access_unregister());
+        if (is_access) elm_wdg_item_access_register(eo_item);
+        else elm_wdg_item_access_unregister(eo_item);
      }
 
    if (is_access)
@@ -1228,11 +1228,10 @@ elm_index_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_index_eo_base_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SCROLL_BAR));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_BAR);
 
    return obj;
 }
@@ -1317,10 +1316,10 @@ _elm_index_item_selected_set(Eo *eo_it,
         edje_object_signal_emit(VIEW(it_active), "elm,state,active", "elm");
         edje_object_message_signal_process(VIEW(it_active));
 
-        eo_do(obj, eo_event_callback_call
-          (ELM_INDEX_EVENT_CHANGED, eo_it));
-        eo_do(obj, eo_event_callback_call
-          (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it));
+        eo_event_callback_call
+          (obj, ELM_INDEX_EVENT_CHANGED, eo_it);
+        eo_event_callback_call
+          (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it);
         ecore_timer_del(sd->delay);
         sd->delay = ecore_timer_add(sd->delay_change_time,
                                     _delay_change_cb, obj);
@@ -1490,7 +1489,7 @@ _elm_index_item_sorted_insert(Eo *obj, Elm_Index_Data *sd, const char *letter, E
              const void *item_data = WIDGET_ITEM_DATA_GET(eo_item);
              if (cmp_data_func(WIDGET_ITEM_DATA_GET(eo_p_it), item_data) >= 0)
                WIDGET_ITEM_DATA_SET(eo_p_it, item_data);
-             eo_do(eo_item, elm_wdg_item_del());
+             elm_wdg_item_del(eo_item);
              eo_item = NULL;
           }
      }
@@ -1528,7 +1527,7 @@ _elm_index_item_clear(Eo *obj, Elm_Index_Data *sd)
         clear = eina_list_append(clear, eo_item);
      }
    EINA_LIST_FREE(clear, eo_item)
-     eo_do(eo_item, elm_wdg_item_del());
+     elm_wdg_item_del(eo_item);
 }
 
 EOLIAN static void
@@ -1600,7 +1599,7 @@ _elm_index_horizontal_set(Eo *obj, Elm_Index_Data *sd, Eina_Bool horizontal)
    if (horizontal == sd->horizontal) return;
 
    sd->horizontal = horizontal;
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 }
 
 EOLIAN static Eina_Bool
@@ -1698,7 +1697,7 @@ EOLIAN static Eina_List*
 _elm_index_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Index_Data *data)
 {
    Eina_List *ret;
-   eo_do_super(obj, ELM_INDEX_CLASS, ret = elm_interface_atspi_accessible_children_get());
+   ret = elm_interface_atspi_accessible_children_get(eo_super(obj, ELM_INDEX_CLASS));
    return eina_list_merge(eina_list_clone(data->items), ret);
 }
 
@@ -1706,7 +1705,7 @@ EOLIAN static char*
 _elm_index_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Index_Item_Data *data)
 {
    char *name;
-   eo_do_super(eo_it, ELM_INDEX_ITEM_CLASS, name = elm_interface_atspi_accessible_name_get());
+   name = elm_interface_atspi_accessible_name_get(eo_super(eo_it, ELM_INDEX_ITEM_CLASS));
    if (name) return name;
 
    return data->letter ? strdup(data->letter) : NULL;
diff --git a/src/lib/elm_interface_atspi_accessible.c b/src/lib/elm_interface_atspi_accessible.c
index 19b198533..700f18d4b 100644
--- a/src/lib/elm_interface_atspi_accessible.c
+++ b/src/lib/elm_interface_atspi_accessible.c
@@ -144,10 +144,10 @@ _elm_interface_atspi_accessible_index_in_parent_get(Eo *obj, Elm_Interface_Atspi
    Eo *chld, *parent = NULL;
    int ret = 0;
 
-   eo_do(obj, parent = elm_interface_atspi_accessible_parent_get());
+   parent = elm_interface_atspi_accessible_parent_get(obj);
    if (!parent) return -1;
 
-   eo_do(parent, children = elm_interface_atspi_accessible_children_get());
+   children = elm_interface_atspi_accessible_children_get(parent);
    if (!children) return -1;
 
    EINA_LIST_FOREACH(children, l, chld)
@@ -172,10 +172,10 @@ _elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Elm_Interface_At
    Eo *parent = obj;
 
    do {
-      eo_do(obj, parent = eo_parent_get());
+      parent = eo_parent_get(obj);
       if (eo_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
         {
-           eo_do(parent, type = elm_interface_atspi_accessible_type_get());
+           type = elm_interface_atspi_accessible_type_get(parent);
            if (type != ELM_ATSPI_TYPE_SKIPPED) break;
         }
    } while (parent);
@@ -219,7 +219,7 @@ _elm_interface_atspi_accessible_role_name_get(Eo *obj EINA_UNUSED, Elm_Interface
 {
    Elm_Atspi_Role role;
 
-   eo_do(obj, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(obj);
 
    return role > ELM_ATSPI_ROLE_LAST_DEFINED ? "" : Atspi_Name[role];
 }
@@ -267,7 +267,7 @@ EOLIAN static const char *
 _elm_interface_atspi_accessible_localized_role_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED)
 {
    const char *ret = NULL;
-   eo_do(obj, ret = elm_interface_atspi_accessible_role_name_get());
+   ret = elm_interface_atspi_accessible_role_name_get(obj);
 #ifdef ENABLE_NLS
    ret = gettext(ret);
 #endif
@@ -282,7 +282,7 @@ _elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Interface_
    Eo *chld;
 
    // By default use Eo_Base object hierarchy
-   eo_do(obj, iter = eo_children_iterator_new());
+   iter = eo_children_iterator_new(obj);
    if (!iter) return NULL;
 
    EINA_ITERATOR_FOREACH(iter, chld)
@@ -331,14 +331,14 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
         return;
      }
 
-   eo_do(accessible, type = elm_interface_atspi_accessible_type_get());
+   type = elm_interface_atspi_accessible_type_get(accessible);
    if (type != ELM_ATSPI_TYPE_REGULAR)
      return;
 
    if (event == ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED)
      {
         Elm_Atspi_Event_Children_Changed_Data *atspi_data = event_info;
-        eo_do(atspi_data->child, type = elm_interface_atspi_accessible_type_get());
+        type = elm_interface_atspi_accessible_type_get(atspi_data->child);
         if (type != ELM_ATSPI_TYPE_REGULAR)
           return;
      }
@@ -454,7 +454,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
              if (!eina_list_data_find(rel->objects, rel_obj))
                {
                   rel->objects = eina_list_append(rel->objects, rel_obj);
-                  eo_do(rel_obj, eo_event_callback_add(EO_BASE_EVENT_DEL, _on_rel_obj_del, set));
+                  eo_event_callback_add(rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
                }
              return EINA_TRUE;
           }
@@ -467,7 +467,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
    rel->objects = eina_list_append(rel->objects, rel_obj);
    *set = eina_list_append(*set, rel);
 
-   eo_do(rel_obj, eo_event_callback_add(EO_BASE_EVENT_DEL, _on_rel_obj_del, set));
+   eo_event_callback_add(rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
    return EINA_TRUE;
 }
 
@@ -483,7 +483,7 @@ elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
           {
              if (eina_list_data_find(rel->objects, rel_obj))
                {
-                  eo_do(rel_obj, eo_event_callback_del(EO_BASE_EVENT_DEL, _on_rel_obj_del, set));
+                  eo_event_callback_del(rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
                   rel->objects = eina_list_remove(rel->objects, rel_obj);
                }
              if (!rel->objects)
@@ -508,7 +508,7 @@ elm_atspi_relation_set_relation_type_remove(Elm_Atspi_Relation_Set *set, Elm_Ats
         if (rel->type == type)
           {
              EINA_LIST_FOREACH(rel->objects, l, obj)
-                eo_do(obj, eo_event_callback_del(EO_BASE_EVENT_DEL, _on_rel_obj_del, set));
+                eo_event_callback_del(obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
              *set = eina_list_remove(*set, rel);
              elm_atspi_relation_free(rel);
              return;
@@ -526,7 +526,7 @@ elm_atspi_relation_set_free(Elm_Atspi_Relation_Set set)
    EINA_LIST_FREE(set, rel)
      {
         EINA_LIST_FOREACH(rel->objects, l, obj)
-           eo_do(obj, eo_event_callback_del(EO_BASE_EVENT_DEL, _on_rel_obj_del, set));
+           eo_event_callback_del(obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
         elm_atspi_relation_free(rel);
      }
 }
@@ -591,7 +591,7 @@ _elm_interface_atspi_accessible_type_set(Eo *obj, Elm_Interface_Atspi_Accessible
    if (val == pd->type)
      return;
 
-   eo_do(obj, parent = elm_interface_atspi_accessible_parent_get());
+   parent = elm_interface_atspi_accessible_parent_get(obj);
 
    switch (val)
      {
diff --git a/src/lib/elm_interface_atspi_accessible.h b/src/lib/elm_interface_atspi_accessible.h
index 5784ca207..51f03e240 100644
--- a/src/lib/elm_interface_atspi_accessible.h
+++ b/src/lib/elm_interface_atspi_accessible.h
@@ -75,38 +75,38 @@ EAPI Elm_Atspi_Relation_Set elm_atspi_relation_set_clone(const Elm_Atspi_Relatio
       Elm_Atspi_Event_State_Changed_Data evinfo; \
       evinfo.type = (tp); \
       evinfo.new_value = (nvl); \
-      eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_STATE_CHANGED, (void*)&evinfo)); \
+      elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_STATE_CHANGED, (void*)&evinfo); \
    } while(0); }
 
 /**
  * Emits ATSPI 'PropertyChanged' dbus signal for 'Name' property.
  */
 #define elm_interface_atspi_accessible_name_changed_signal_emit(obj) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, "name"));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, "name");
 
 /**
  * Emits ATSPI 'PropertyChanged' dbus signal for 'Description' property.
  */
 #define elm_interface_atspi_accessible_description_changed_signal_emit(obj) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, "description"));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, "description");
 
 /**
  * Emits ATSPI 'PropertyChanged' dbus signal for 'Parent' property.
  */
 #define elm_interface_atspi_accessible_parent_changed_signal_emit(obj) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, "parent"));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, "parent");
 
 /**
  * Emits ATSPI 'PropertyChanged' dbus signal for 'Role' property.
  */
 #define elm_interface_atspi_accessible_role_changed_signal_emit(obj) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, "role"));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, "role");
 
 /**
  * Emits ATSPI 'PropertyChanged' dbus signal for 'Value' property.
  */
 #define elm_interface_atspi_accessible_value_changed_signal_emit(obj) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, "value"));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, "value");
 
 /**
  * Emits ATSPI 'ChildrenChanged' dbus signal with added child as argument.
@@ -114,7 +114,7 @@ EAPI Elm_Atspi_Relation_Set elm_atspi_relation_set_clone(const Elm_Atspi_Relatio
 #define elm_interface_atspi_accessible_children_changed_added_signal_emit(obj, child) \
    do { \
       Elm_Atspi_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED, &atspi_data)); \
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED, &atspi_data); \
    } while(0);
 
 /**
@@ -123,32 +123,32 @@ EAPI Elm_Atspi_Relation_Set elm_atspi_relation_set_clone(const Elm_Atspi_Relatio
 #define elm_interface_atspi_accessible_children_changed_del_signal_emit(obj, child) \
    do { \
       Elm_Atspi_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \
-      eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED, &atspi_data)); \
+      elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED, &atspi_data); \
    } while(0);
 
 /**
  * Emits ATSPI 'ActiveDescendantChanged' dbus signal.
  */
 #define elm_interface_atspi_accessible_active_descendant_changed_signal_emit(obj, child) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, child));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, child);
 
 /**
  * Emits ATSPI 'VisibleDataChanged' dbus signal.
  */
 #define elm_interface_atspi_accessible_visible_data_changed_signal_emit(obj) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_VISIBLE_DATA_CHANGED, NULL));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_VISIBLE_DATA_CHANGED, NULL);
 
 /**
  * Emits ATSPI 'AddAccessible' dbus signal.
  */
 #define elm_interface_atspi_accessible_added(obj) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ADDED, NULL));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ADDED, NULL);
 
 /**
  * Emits ATSPI 'RemoveAccessible' dbus signal.
  */
 #define elm_interface_atspi_accessible_removed(obj) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_REMOVED, NULL));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_REMOVED, NULL);
 
 #endif
 
diff --git a/src/lib/elm_interface_atspi_action.c b/src/lib/elm_interface_atspi_action.c
index 14e3808fd..551f1cadb 100644
--- a/src/lib/elm_interface_atspi_action.c
+++ b/src/lib/elm_interface_atspi_action.c
@@ -13,7 +13,7 @@ _elm_interface_atspi_action_localized_name_get(Eo *obj, void *pd EINA_UNUSED, in
 {
    const char *ret = NULL;
 
-   eo_do(obj, ret = elm_interface_atspi_action_name_get(id));
+   ret = elm_interface_atspi_action_name_get(obj, id);
 #ifdef ENABLE_NLS
    ret = gettext(ret);
 #endif
diff --git a/src/lib/elm_interface_atspi_component.c b/src/lib/elm_interface_atspi_component.c
index 5d3eb728a..2d917d270 100644
--- a/src/lib/elm_interface_atspi_component.c
+++ b/src/lib/elm_interface_atspi_component.c
@@ -13,7 +13,7 @@
 EOLIAN static void
 _elm_interface_atspi_component_position_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Eina_Bool type, int *x, int *y)
 {
-   eo_do(obj, elm_interface_atspi_component_extents_get(type, x, y, NULL, NULL));
+   elm_interface_atspi_component_extents_get(obj, type, x, y, NULL, NULL);
 }
 
 EOLIAN static Eina_Bool
@@ -22,8 +22,8 @@ _elm_interface_atspi_component_position_set(Eo *obj EINA_UNUSED, void *_pd EINA_
    Eina_Bool ret = EINA_FALSE;
    int c_w, c_h;
 
-   eo_do(obj, elm_interface_atspi_component_extents_get(type, NULL, NULL, &c_w, &c_h));
-   eo_do(obj, ret = elm_interface_atspi_component_extents_set(type, x, y, c_w, c_h));
+   elm_interface_atspi_component_extents_get(obj, type, NULL, NULL, &c_w, &c_h);
+   ret = elm_interface_atspi_component_extents_set(obj, type, x, y, c_w, c_h);
 
    return ret;
 }
@@ -34,15 +34,15 @@ _elm_interface_atspi_component_size_set(Eo *obj EINA_UNUSED, void *_pd EINA_UNUS
    Eina_Bool ret;
    int c_x = 0, c_y = 0;
 
-   eo_do(obj, elm_interface_atspi_component_extents_get(EINA_FALSE, &c_x, &c_y, NULL, NULL));
-   eo_do(obj, ret = elm_interface_atspi_component_extents_set(EINA_FALSE, c_x, c_y, w, h));
+   elm_interface_atspi_component_extents_get(obj, EINA_FALSE, &c_x, &c_y, NULL, NULL);
+   ret = elm_interface_atspi_component_extents_set(obj, EINA_FALSE, c_x, c_y, w, h);
    return ret;
 }
 
 EOLIAN static void
 _elm_interface_atspi_component_size_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, int *w, int *h)
 {
-   eo_do(obj, elm_interface_atspi_component_extents_get(EINA_FALSE, NULL,  NULL, w, h));
+   elm_interface_atspi_component_extents_get(obj, EINA_FALSE, NULL, NULL, w, h);
 }
 
 EOLIAN static Eina_Bool
@@ -50,7 +50,7 @@ _elm_interface_atspi_component_contains(Eo *obj EINA_UNUSED, void *_pd EINA_UNUS
 {
    int w_x = 0, w_y = 0, w_w = 0, w_h = 0;
 
-   eo_do(obj, elm_interface_atspi_component_extents_get(type, &w_x, &w_y, &w_w, &w_h));
+   elm_interface_atspi_component_extents_get(obj, type, &w_x, &w_y, &w_w, &w_h);
 
    if ((x >= w_x) && (x <= w_x + w_w) && (y >= w_y) && (y <= w_y + w_h))
      return EINA_TRUE;
@@ -72,14 +72,14 @@ _elm_interface_atspi_component_accessible_at_point_get(Eo *obj, void *_pd EINA_U
    Eina_List *l, *children;
    Eo *ret = NULL, *child;
 
-   eo_do(obj, children = elm_interface_atspi_accessible_children_get());
+   children = elm_interface_atspi_accessible_children_get(obj);
 
    EINA_LIST_FOREACH(children, l, child)
      {
         Eina_Bool contains;
         if (eo_isa(child, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN))
           {
-              eo_do(child, contains = elm_interface_atspi_component_contains(screen_coords, x, y));
+              contains = elm_interface_atspi_component_contains(child, screen_coords, x, y);
               if (contains)
                 {
                    ret = child;
diff --git a/src/lib/elm_interface_atspi_image.c b/src/lib/elm_interface_atspi_image.c
index 70492d0ba..a9a253db0 100644
--- a/src/lib/elm_interface_atspi_image.c
+++ b/src/lib/elm_interface_atspi_image.c
@@ -21,7 +21,7 @@ _elm_interface_atspi_image_description_get(Eo *obj, void *sd EINA_UNUSED)
 {
    const char *descr = NULL;
 
-   eo_do(obj, descr = eo_key_data_get("atspi_image_description"));
+   descr = eo_key_data_get(obj, "atspi_image_description");
    return descr;
 }
 
@@ -31,16 +31,16 @@ _elm_interface_atspi_image_description_set(Eo *obj, void *sd EINA_UNUSED, const
    const char *key = "atspi_image_description";
    const char *descr = eina_stringshare_add(description);
    char *old_descr;
-   if (eo_do_ret(obj, old_descr, eo_key_data_get(key)))
+   if (eo_key_data_get(obj, key))
      {
         eina_stringshare_del(old_descr);
-        eo_do(obj, eo_event_callback_del(EO_BASE_EVENT_DEL, _free_desc_cb, old_descr));
+        eo_event_callback_del(obj, EO_BASE_EVENT_DEL, _free_desc_cb, old_descr);
      }
 
    if (descr)
      {
-        eo_do(obj, eo_key_data_set(key, descr),
-              eo_event_callback_add(EO_BASE_EVENT_DEL, _free_desc_cb, descr));
+        eo_key_data_set(obj, key, descr);
+        eo_event_callback_add(obj, EO_BASE_EVENT_DEL, _free_desc_cb, descr);
      }
 }
 
diff --git a/src/lib/elm_interface_atspi_widget_action.c b/src/lib/elm_interface_atspi_widget_action.c
index 1cc2b5805..2061e35e6 100644
--- a/src/lib/elm_interface_atspi_widget_action.c
+++ b/src/lib/elm_interface_atspi_widget_action.c
@@ -19,7 +19,7 @@ _elm_interface_atspi_widget_action_elm_interface_atspi_action_action_do(Eo *obj,
    Eina_Bool (*func)(Eo *eo, const char *params) = NULL;
    int tmp = 0;
 
-   eo_do(obj, actions = elm_interface_atspi_widget_action_elm_actions_get());
+   actions = elm_interface_atspi_widget_action_elm_actions_get(obj);
    if (!actions) return EINA_FALSE;
 
    while (actions[tmp].name)
@@ -51,7 +51,7 @@ _elm_interface_atspi_widget_action_elm_interface_atspi_action_keybinding_get(Eo
    if (!eo_isa(obj, ELM_WIDGET_CLASS))
       return NULL;
 
-   eo_do(obj, actions = elm_interface_atspi_widget_action_elm_actions_get());
+   actions = elm_interface_atspi_widget_action_elm_actions_get(obj);
    if (!actions) return NULL;
 
    while (actions[tmp].name)
@@ -98,7 +98,7 @@ _elm_interface_atspi_widget_action_elm_interface_atspi_action_name_get(Eo *obj,
    const Elm_Atspi_Action *actions = NULL;
    int tmp = 0;
 
-   eo_do(obj, actions = elm_interface_atspi_widget_action_elm_actions_get());
+   actions = elm_interface_atspi_widget_action_elm_actions_get(obj);
    if (!actions) return NULL;
 
    while (actions[tmp].name)
@@ -128,7 +128,7 @@ _elm_interface_atspi_widget_action_elm_interface_atspi_action_actions_get(Eo *ob
    Eina_List *ret = NULL;
    int tmp = 0;
 
-   eo_do(obj, actions = elm_interface_atspi_widget_action_elm_actions_get());
+   actions = elm_interface_atspi_widget_action_elm_actions_get(obj);
    if (!actions) return NULL;
 
    while (actions[tmp].name)
diff --git a/src/lib/elm_interface_atspi_window.h b/src/lib/elm_interface_atspi_window.h
index 0b148b382..a6e9b4e65 100644
--- a/src/lib/elm_interface_atspi_window.h
+++ b/src/lib/elm_interface_atspi_window.h
@@ -8,43 +8,43 @@
  * Emits ATSPI 'Window:Activated' dbus signal.
  */
 #define elm_interface_atspi_window_activated_signal_emit(obj) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_ACTIVATED, NULL));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_ACTIVATED, NULL);
 
 /**
  * Emits ATSPI 'Window:Deactivated' dbus signal.
  */
 #define elm_interface_atspi_window_deactivated_signal_emit(obj) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL);
 
 /**
  * Emits ATSPI 'Window:Created' dbus signal.
  */
 #define elm_interface_atspi_window_created_signal_emit(obj) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_CREATED, NULL));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_CREATED, NULL);
 
 /**
  * Emits ATSPI 'Window:Destroyed' dbus signal.
  */
 #define elm_interface_atspi_window_destroyed_signal_emit(obj) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DESTROYED, NULL));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DESTROYED, NULL);
 
 /**
  * Emits ATSPI 'Window:Maximized' dbus signal.
  */
 #define elm_interface_atspi_window_maximized_signal_emit(obj) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL);
 
 /**
  * Emits ATSPI 'Window:Minimized' dbus signal.
  */
 #define elm_interface_atspi_window_minimized_signal_emit(obj) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MINIMIZED, NULL));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_MINIMIZED, NULL);
 
 /**
  * Emits ATSPI 'Window:Restored' dbus signal.
  */
 #define elm_interface_atspi_window_restored_signal_emit(obj) \
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_RESTORED, NULL));
+   elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_RESTORED, NULL);
 
 #include "elm_interface_atspi_window.eo.h"
 #endif
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index 1a1aca96f..75445a714 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -31,14 +31,12 @@
     }
 
 #define ELM_ANIMATOR_CONNECT(Obj, Bool, Callback, Data)                 \
-  eo_do(Obj,                                                            \
-        eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data), \
-        eo_event_callback_add(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data)); \
+  eo_event_callback_del(Obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \
+  eo_event_callback_add(Obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \
   Bool = 1;
 
 #define ELM_ANIMATOR_DISCONNECT(Obj, Bool, Callback, Data)              \
-  eo_do(Obj,                                                            \
-        eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data)); \
+  eo_event_callback_del(Obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \
   Bool = 0;
 
 static const char SIG_CHANGED[] = "changed";
@@ -108,7 +106,7 @@ _elm_pan_update(Elm_Pan_Smart_Data *psd)
 EOLIAN static void
 _elm_pan_evas_object_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv)
 {
-   eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_PAN_CLASS));
 
    priv->self = obj;
 }
@@ -118,7 +116,7 @@ _elm_pan_evas_object_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
 {
    _elm_pan_content_set(obj, NULL);
 
-   eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_PAN_CLASS));
 }
 
 EOLIAN static void
@@ -137,13 +135,13 @@ _elm_pan_evas_object_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd,
    psd->h = h;
 
    _elm_pan_update(psd);
-   eo_do(psd->self, eo_event_callback_call(ELM_PAN_EVENT_CHANGED, NULL));
+   eo_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
 }
 
 EOLIAN static void
 _elm_pan_evas_object_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd)
 {
-   eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_show());
+   evas_obj_smart_show(eo_super(obj, MY_PAN_CLASS));
 
    if (psd->content)
      evas_object_show(psd->content);
@@ -152,7 +150,7 @@ _elm_pan_evas_object_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd)
 EOLIAN static void
 _elm_pan_evas_object_smart_hide(Eo *obj, Elm_Pan_Smart_Data *psd)
 {
-   eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_hide());
+   evas_obj_smart_hide(eo_super(obj, MY_PAN_CLASS));
 
    if (psd->content)
      evas_object_hide(psd->content);
@@ -166,7 +164,7 @@ _elm_pan_pos_set(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord x, Eva
    psd->py = y;
 
    _elm_pan_update(psd);
-   eo_do(psd->self, eo_event_callback_call(ELM_PAN_EVENT_CHANGED, NULL));
+   eo_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
 }
 
 EOLIAN static void
@@ -235,10 +233,9 @@ _elm_pan_add(Evas *evas)
 EOLIAN static Eo *
 _elm_pan_eo_base_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_PAN_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_PAN_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks));
+   obj = eo_constructor(eo_super(obj, MY_PAN_CLASS));
+   evas_obj_type_set(obj, MY_PAN_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
 
    return obj;
 }
@@ -255,7 +252,7 @@ _elm_pan_content_del_cb(void *data,
    psd->content = NULL;
    psd->content_w = psd->content_h = psd->px = psd->py =
            psd->prev_cw = psd->prev_ch = psd->delta_posx = psd->delta_posy = 0;
-   eo_do(psd->self, eo_event_callback_call(ELM_PAN_EVENT_CHANGED, NULL));
+   eo_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -275,7 +272,7 @@ _elm_pan_content_resize_cb(void *data,
         psd->content_h = h;
         _elm_pan_update(psd);
      }
-   eo_do(psd->self, eo_event_callback_call(ELM_PAN_EVENT_CHANGED, NULL));
+   eo_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
 }
 
 static void
@@ -317,7 +314,7 @@ _elm_pan_content_set(Evas_Object *obj,
    _elm_pan_update(psd);
 
 end:
-   eo_do(psd->self, eo_event_callback_call(ELM_PAN_EVENT_CHANGED, NULL));
+   eo_event_callback_call(psd->self, ELM_PAN_EVENT_CHANGED, NULL);
 }
 
 EOLIAN static void
@@ -488,9 +485,9 @@ _elm_direction_arrows_eval(Elm_Scrollable_Smart_Interface_Data *sid)
 
    if (!sid->edje_obj || !sid->pan_obj) return;
 
-   eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_get(&x, &y));
+   elm_obj_pan_pos_max_get(sid->pan_obj, &mx, &my);
+   elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
+   elm_obj_pan_pos_get(sid->pan_obj, &x, &y);
 
    if (x == minx) go_left = EINA_FALSE;
    if (x == (mx + minx)) go_right = EINA_FALSE;
@@ -836,8 +833,8 @@ _elm_scroll_scroll_bar_size_adjust(Elm_Scrollable_Smart_Interface_Data *sid)
         edje_object_part_drag_value_get
           (sid->edje_obj, "elm.dragable.vbar", NULL, &vy);
 
-        eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my));
-        eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
+        elm_obj_pan_pos_max_get(sid->pan_obj, &mx, &my);
+        elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
         x = vx * mx + minx;
         y = vy * my + miny;
 
@@ -864,10 +861,10 @@ _elm_scroll_scroll_bar_size_adjust(Elm_Scrollable_Smart_Interface_Data *sid)
             (sid->edje_obj, "elm.dragable.vbar", 0.0,
             -((double)sid->page.y * ((double)vh / (double)h)) / 100.0);
 
-        eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py));
+        elm_obj_pan_pos_get(sid->pan_obj, &px, &py);
         if (vx != mx) x = px;
         if (vy != my) y = py;
-        eo_do(sid->pan_obj, elm_obj_pan_pos_set(x, y));
+        elm_obj_pan_pos_set(sid->pan_obj, x, y);
 
         if (mx > 0) vx = (double)(x - minx) / (double)mx;
         else vx = 0.0;
@@ -896,9 +893,9 @@ _elm_scroll_scroll_bar_size_adjust(Elm_Scrollable_Smart_Interface_Data *sid)
           (sid->edje_obj, "elm.dragable.vbar", 1.0, 1.0);
         edje_object_part_drag_size_set
           (sid->edje_obj, "elm.dragable.hbar", 1.0, 1.0);
-        eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
-        eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py));
-        eo_do(sid->pan_obj, elm_obj_pan_pos_set(minx, miny));
+        elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
+        elm_obj_pan_pos_get(sid->pan_obj, &px, &py);
+        elm_obj_pan_pos_set(sid->pan_obj, minx, miny);
         if ((px != minx) || (py != miny))
           edje_object_signal_emit(sid->edje_obj, "elm,action,scroll", "elm");
      }
@@ -928,11 +925,11 @@ _elm_scroll_scroll_bar_read_and_update(
      (sid->edje_obj, "elm.dragable.vbar", NULL, &vy);
    edje_object_part_drag_value_get
      (sid->edje_obj, "elm.dragable.hbar", &vx, NULL);
-   eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
+   elm_obj_pan_pos_max_get(sid->pan_obj, &mx, &my);
+   elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
    x = _round(vx * (double)mx + minx, 1);
    y = _round(vy * (double)my + miny, 1);
-   eo_do(sid->obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+   elm_interface_scrollable_content_pos_set(sid->obj, x, y, EINA_TRUE);
    _elm_scroll_wanted_coordinates_update(sid, x, y);
 }
 
@@ -1186,7 +1183,7 @@ _elm_scroll_edje_drag_h_cb(void *data,
 EOLIAN static void
 _elm_interface_scrollable_content_size_get(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *sid, Evas_Coord *w, Evas_Coord *h)
 {
-   eo_do(sid->pan_obj, elm_obj_pan_content_size_get(w, h));
+   elm_obj_pan_content_size_get(sid->pan_obj, w, h);
 }
 
 EOLIAN static void
@@ -1230,10 +1227,10 @@ _elm_scroll_x_mirrored_get(const Evas_Object *obj,
 
    if (!sid->pan_obj) return 0;
 
-   eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&min, NULL));
-   eo_do((Eo *)obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &w, NULL));
-   eo_do(sid->pan_obj, elm_obj_pan_content_size_get(&cw, NULL));
+   elm_obj_pan_pos_min_get(sid->pan_obj, &min, NULL);
+   elm_interface_scrollable_content_viewport_geometry_get
+         ((Eo *)obj, NULL, NULL, &w, NULL);
+   elm_obj_pan_content_size_get(sid->pan_obj, &cw, NULL);
    ret = cw - w - x + min + min;
 
    return (ret >= min) ? ret : min;
@@ -1250,13 +1247,13 @@ _elm_scroll_wanted_coordinates_update(Elm_Scrollable_Smart_Interface_Data *sid,
 
    if (!sid->pan_obj) return;
 
-   eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
+   elm_obj_pan_pos_max_get(sid->pan_obj, &mx, &my);
+   elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
 
    /* Update wx/y/w/h - and if the requested positions aren't legal
     * adjust a bit. */
-   eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &sid->ww, &sid->wh));
+   elm_interface_scrollable_content_viewport_geometry_get
+         (sid->obj, NULL, NULL, &sid->ww, &sid->wh);
 
    if (x < minx && !sid->is_mirrored)
      {
@@ -1286,7 +1283,7 @@ _elm_scroll_momentum_end(Elm_Scrollable_Smart_Interface_Data *sid)
    if (sid->down.momentum_animator)
      {
         Evas_Coord px = 0, py = 0;
-        eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&px, &py));
+        elm_interface_scrollable_content_pos_get(sid->obj, &px, &py);
         _elm_scroll_wanted_coordinates_update(sid, px, py);
 
         ELM_ANIMATOR_DISCONNECT(sid->obj, sid->down.momentum_animator, _elm_scroll_momentum_animator, sid);
@@ -1316,8 +1313,8 @@ _elm_scroll_bounce_x_animator(void *data, const Eo_Event *event EINA_UNUSED)
      {
         dt = dt / _elm_config->thumbscroll_bounce_friction;
         odx = sid->down.b2x - sid->down.bx;
-        eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
-              (NULL, NULL, &w, NULL));
+        elm_interface_scrollable_content_viewport_geometry_get
+              (sid->obj, NULL, NULL, &w, NULL);
         if (!sid->down.momentum_animator && (w > abs(odx)))
           {
              pd = (double)odx / (double)w;
@@ -1327,7 +1324,7 @@ _elm_scroll_bounce_x_animator(void *data, const Eo_Event *event EINA_UNUSED)
           }
         if (dt > 1.0) dt = 1.0;
         p = 1.0 - ((1.0 - dt) * (1.0 - dt));
-        eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&x, &y));
+        elm_interface_scrollable_content_pos_get(sid->obj, &x, &y);
         dx = (odx * p);
         r = 1.0;
         if (sid->down.momentum_animator)
@@ -1339,7 +1336,7 @@ _elm_scroll_bounce_x_animator(void *data, const Eo_Event *event EINA_UNUSED)
           }
         x = sid->down.b2x + (int)((double)(dx - odx) * r);
         if (!sid->down.cancelled)
-          eo_do(sid->obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+          elm_interface_scrollable_content_pos_set(sid->obj, x, y, EINA_TRUE);
         if (dt >= 1.0)
           {
              if (sid->down.momentum_animator)
@@ -1371,8 +1368,8 @@ _elm_scroll_bounce_y_animator(void *data, const Eo_Event *event EINA_UNUSED)
      {
         dt = dt / _elm_config->thumbscroll_bounce_friction;
         ody = sid->down.b2y - sid->down.by;
-        eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
-              (NULL, NULL, NULL, &h));
+        elm_interface_scrollable_content_viewport_geometry_get
+              (sid->obj, NULL, NULL, NULL, &h);
         if (!sid->down.momentum_animator && (h > abs(ody)))
           {
              pd = (double)ody / (double)h;
@@ -1382,7 +1379,7 @@ _elm_scroll_bounce_y_animator(void *data, const Eo_Event *event EINA_UNUSED)
           }
         if (dt > 1.0) dt = 1.0;
         p = 1.0 - ((1.0 - dt) * (1.0 - dt));
-        eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&x, &y));
+        elm_interface_scrollable_content_pos_get(sid->obj, &x, &y);
         dy = (ody * p);
         r = 1.0;
         if (sid->down.momentum_animator)
@@ -1394,7 +1391,7 @@ _elm_scroll_bounce_y_animator(void *data, const Eo_Event *event EINA_UNUSED)
           }
         y = sid->down.b2y + (int)((double)(dy - ody) * r);
         if (!sid->down.cancelled)
-          eo_do(sid->obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+          elm_interface_scrollable_content_pos_set(sid->obj, x, y, EINA_TRUE);
         if (dt >= 1.0)
           {
              if (sid->down.momentum_animator)
@@ -1438,9 +1435,9 @@ _elm_scroll_bounce_eval(Elm_Scrollable_Smart_Interface_Data *sid)
      }
    ELM_SAFE_FREE(sid->down.hold_enterer, ecore_idle_enterer_del);
 
-   eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py));
+   elm_obj_pan_pos_max_get(sid->pan_obj, &mx, &my);
+   elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
+   elm_obj_pan_pos_get(sid->pan_obj, &px, &py);
    bx = px;
    by = py;
    if (px < minx) px = minx;
@@ -1494,7 +1491,7 @@ _elm_interface_scrollable_content_pos_get(Eo *obj EINA_UNUSED, Elm_Scrollable_Sm
 {
    if (!sid->pan_obj) return;
 
-   eo_do(sid->pan_obj, elm_obj_pan_pos_get(x, y));
+   elm_obj_pan_pos_get(sid->pan_obj, x, y);
 }
 
 EOLIAN static void
@@ -1508,10 +1505,10 @@ _elm_interface_scrollable_content_pos_set(Eo *obj, Elm_Scrollable_Smart_Interfac
    if (!sid->edje_obj || !sid->pan_obj) return;
 
    // FIXME: allow for bounce outside of range
-   eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
-   eo_do(sid->pan_obj, elm_obj_pan_content_size_get(&cw, &ch));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py));
+   elm_obj_pan_pos_max_get(sid->pan_obj, &mx, &my);
+   elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
+   elm_obj_pan_content_size_get(sid->pan_obj, &cw, &ch);
+   elm_obj_pan_pos_get(sid->pan_obj, &px, &py);
    evas_object_geometry_get(sid->pan_obj, NULL, NULL, &pw, &ph);
 
    if (_paging_is_enabled(sid))
@@ -1567,8 +1564,8 @@ _elm_interface_scrollable_content_pos_set(Eo *obj, Elm_Scrollable_Smart_Interfac
         if (!sid->loop_v && (y - miny) > my) y = my + miny;
      }
 
-   eo_do(sid->pan_obj, elm_obj_pan_pos_set(x, y));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_get(&spx, &spy));
+   elm_obj_pan_pos_set(sid->pan_obj, x, y);
+   elm_obj_pan_pos_get(sid->pan_obj, &spx, &spy);
 
    if (mx > 0) vx = (double)(spx - minx) / (double)mx;
    else vx = 0.0;
@@ -1699,7 +1696,7 @@ _elm_interface_scrollable_mirrored_set(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart
    else
      wx = sid->wx;
 
-   eo_do(sid->obj, elm_interface_scrollable_content_pos_set(wx, sid->wy, EINA_FALSE));
+   elm_interface_scrollable_content_pos_set(sid->obj, wx, sid->wy, EINA_FALSE);
 }
 
 /* returns TRUE when we need to move the scroller, FALSE otherwise.
@@ -1718,10 +1715,10 @@ _elm_scroll_content_region_show_internal(Evas_Object *obj,
 
    if (!sid->pan_obj) return EINA_FALSE;
 
-   eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
-   eo_do(sid->pan_obj, elm_obj_pan_content_size_get(&cw, &ch));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py));
+   elm_obj_pan_pos_max_get(sid->pan_obj, &mx, &my);
+   elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
+   elm_obj_pan_content_size_get(sid->pan_obj, &cw, &ch);
+   elm_obj_pan_pos_get(sid->pan_obj, &px, &py);
    evas_object_geometry_get(sid->pan_obj, NULL, NULL, &pw, &ph);
 
    nx = px;
@@ -1806,9 +1803,9 @@ _elm_scroll_content_region_show_internal(Evas_Object *obj,
 EOLIAN static void
 _elm_interface_scrollable_content_region_get(Eo *obj, Elm_Scrollable_Smart_Interface_Data *_pd EINA_UNUSED, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
 {
-   eo_do(obj, elm_interface_scrollable_content_pos_get(x, y));
-   eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, w, h));
+   elm_interface_scrollable_content_pos_get(obj, x, y);
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, w, h);
 }
 
 /* Set should be used for calculated positions, for example, when we move
@@ -1819,7 +1816,7 @@ _elm_interface_scrollable_content_region_set(Eo *obj, Elm_Scrollable_Smart_Inter
 {
    if (_elm_scroll_content_region_show_internal(obj, &x, &y, w, h))
      {
-        eo_do(obj, elm_interface_scrollable_content_pos_set(x, y, EINA_FALSE));
+        elm_interface_scrollable_content_pos_set(obj, x, y, EINA_FALSE);
         sid->down.sx = x;
         sid->down.sy = y;
         sid->down.x = sid->down.history[0].x;
@@ -1838,7 +1835,7 @@ _elm_interface_scrollable_content_region_show(Eo *obj, Elm_Scrollable_Smart_Inte
    sid->wh = h;
    if (_elm_scroll_content_region_show_internal(obj, &x, &y, w, h))
      {
-        eo_do(obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+        elm_interface_scrollable_content_pos_set(obj, x, y, EINA_TRUE);
         sid->down.sx = x;
         sid->down.sy = y;
         sid->down.x = sid->down.history[0].x;
@@ -1869,8 +1866,8 @@ _elm_scroll_wanted_region_set(Evas_Object *obj)
 
    if (sid->ww == -1)
      {
-        eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get
-              (NULL, NULL, &ww, &wh));
+        elm_interface_scrollable_content_viewport_geometry_get
+              (obj, NULL, NULL, &ww, &wh);
      }
    else
      {
@@ -1878,7 +1875,7 @@ _elm_scroll_wanted_region_set(Evas_Object *obj)
         wh = sid->wh;
      }
 
-   eo_do(obj, elm_interface_scrollable_content_region_set(wx, sid->wy, ww, wh));
+   elm_interface_scrollable_content_region_set(obj, wx, sid->wy, ww, wh);
 }
 
 
@@ -1904,11 +1901,11 @@ _scroll_wheel_post_event_cb(void *data, Evas *e EINA_UNUSED)
    if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
      direction = !direction;
 
-   eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&x, &y));
+   elm_interface_scrollable_content_pos_get(sid->obj, &x, &y);
    if (sid->scrollto.x.animator) x = sid->scrollto.x.end;
    if (sid->scrollto.y.animator) y = sid->scrollto.y.end;
-   eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
+   elm_obj_pan_pos_max_get(sid->pan_obj, &mx, &my);
+   elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
    if (x < minx) x = minx;
    if (x > mx) x = mx;
    if (y < miny) y = miny;
@@ -1937,10 +1934,10 @@ _scroll_wheel_post_event_cb(void *data, Evas *e EINA_UNUSED)
         if (sid->content_info.resized)
           _elm_scroll_wanted_region_set(sid->obj);
      }
-   eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &vw, &vh));
+   elm_interface_scrollable_content_viewport_geometry_get
+         (sid->obj, NULL, NULL, &vw, &vh);
    if (sid->pan_obj)
-     eo_do(sid->pan_obj, elm_obj_pan_content_size_get(&cw, &ch));
+     elm_obj_pan_content_size_get(sid->pan_obj, &cw, &ch);
    if (!_paging_is_enabled(sid))
      {
         int d = ev->z;
@@ -1965,7 +1962,7 @@ _scroll_wheel_post_event_cb(void *data, Evas *e EINA_UNUSED)
           {
              _elm_scroll_wanted_coordinates_update(sid, x, y);
              if (_elm_config->scroll_animation_disable)
-               eo_do(sid->obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+               elm_interface_scrollable_content_pos_set(sid->obj, x, y, EINA_TRUE);
              else
                {
                   _elm_scroll_scroll_to_x(sid, _elm_config->bring_in_scroll_friction, x);
@@ -1975,7 +1972,7 @@ _scroll_wheel_post_event_cb(void *data, Evas *e EINA_UNUSED)
      }
    else
      {
-        eo_do(sid->obj, elm_interface_scrollable_current_page_get(&pagenumber_h, &pagenumber_v));
+        elm_interface_scrollable_current_page_get(sid->obj, &pagenumber_h, &pagenumber_v);
         if (!direction)
           {
              if (ch > vh || cw <= vw)
@@ -2123,7 +2120,7 @@ _elm_scroll_momentum_animator(void *data, const Eo_Event *event EINA_UNUSED)
         sid->down.ay = dy;
         x = sid->down.sx - dx;
         y = sid->down.sy - dy;
-        eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&px, &py));
+        elm_interface_scrollable_content_pos_get(sid->obj, &px, &py);
         if ((sid->down.bounce_x_animator) ||
             (sid->down.bounce_x_hold))
           {
@@ -2136,10 +2133,10 @@ _elm_scroll_momentum_animator(void *data, const Eo_Event *event EINA_UNUSED)
              sid->down.by = sid->down.by0 - dy + sid->down.b0y;
              y = py;
           }
-        eo_do(sid->obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+        elm_interface_scrollable_content_pos_set(sid->obj, x, y, EINA_TRUE);
         _elm_scroll_wanted_coordinates_update(sid, x, y);
-        eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&maxx, &maxy));
-        eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
+        elm_obj_pan_pos_max_get(sid->pan_obj, &maxx, &maxy);
+        elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
 
         if (!_elm_config->thumbscroll_bounce_enable || !sid->bounce_horiz)
           {
@@ -2180,11 +2177,11 @@ _elm_scroll_page_x_get(Elm_Scrollable_Smart_Interface_Data *sid,
 
    if (!sid->pan_obj) return 0;
 
-   eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&x, &y));
-   eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &w, &h));
-   eo_do(sid->pan_obj, elm_obj_pan_content_size_get(&cw, &ch));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, NULL));
+   elm_interface_scrollable_content_pos_get(sid->obj, &x, &y);
+   elm_interface_scrollable_content_viewport_geometry_get
+         (sid->obj, NULL, NULL, &w, &h);
+   elm_obj_pan_content_size_get(sid->pan_obj, &cw, &ch);
+   elm_obj_pan_pos_min_get(sid->pan_obj, &minx, NULL);
 
    if (sid->pagerel_h > 0.0)
      sid->pagesize_h = w * sid->pagerel_h;
@@ -2227,11 +2224,11 @@ _elm_scroll_page_y_get(Elm_Scrollable_Smart_Interface_Data *sid,
 
    if (!sid->pan_obj) return 0;
 
-   eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&x, &y));
-   eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &w, &h));
-   eo_do(sid->pan_obj, elm_obj_pan_content_size_get(&cw, &ch));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(NULL, &miny));
+   elm_interface_scrollable_content_pos_get(sid->obj, &x, &y);
+   elm_interface_scrollable_content_viewport_geometry_get
+         (sid->obj, NULL, NULL, &w, &h);
+   elm_obj_pan_content_size_get(sid->pan_obj, &cw, &ch);
+   elm_obj_pan_pos_min_get(sid->pan_obj, NULL, &miny);
 
    if (sid->pagerel_v > 0.0)
      sid->pagesize_v = h * sid->pagerel_v;
@@ -2280,13 +2277,13 @@ _elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event EINA_UNUSED)
      (sid->scrollto.x.t_end - sid->scrollto.x.t_start);
    tt = 1.0 - tt;
    tt = 1.0 - (tt * tt);
-   eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py));
+   elm_obj_pan_pos_get(sid->pan_obj, &px, &py);
    px = (sid->scrollto.x.start * (1.0 - tt)) +
      (sid->scrollto.x.end * tt);
    if (t >= sid->scrollto.x.t_end)
      {
         px = sid->scrollto.x.end;
-        eo_do(sid->obj, elm_interface_scrollable_content_pos_set(px, py, EINA_TRUE));
+        elm_interface_scrollable_content_pos_set(sid->obj, px, py, EINA_TRUE);
         sid->down.sx = px;
         sid->down.x = sid->down.history[0].x;
         sid->down.pdx = 0;
@@ -2295,7 +2292,7 @@ _elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event EINA_UNUSED)
           _elm_scroll_anim_stop(sid);
         goto on_end;
      }
-   eo_do(sid->obj, elm_interface_scrollable_content_pos_set(px, py, EINA_TRUE));
+   elm_interface_scrollable_content_pos_set(sid->obj, px, py, EINA_TRUE);
    _elm_scroll_wanted_coordinates_update(sid, px, py);
    return EO_CALLBACK_CONTINUE;
 
@@ -2318,13 +2315,13 @@ _elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event EINA_UNUSED)
      (sid->scrollto.y.t_end - sid->scrollto.y.t_start);
    tt = 1.0 - tt;
    tt = 1.0 - (tt * tt);
-   eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py));
+   elm_obj_pan_pos_get(sid->pan_obj, &px, &py);
    py = (sid->scrollto.y.start * (1.0 - tt)) +
      (sid->scrollto.y.end * tt);
    if (t >= sid->scrollto.y.t_end)
      {
         py = sid->scrollto.y.end;
-        eo_do(sid->obj, elm_interface_scrollable_content_pos_set(px, py, EINA_TRUE));
+        elm_interface_scrollable_content_pos_set(sid->obj, px, py, EINA_TRUE);
         sid->down.sy = py;
         sid->down.y = sid->down.history[0].y;
         sid->down.pdy = 0;
@@ -2333,7 +2330,7 @@ _elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event EINA_UNUSED)
           _elm_scroll_anim_stop(sid);
         goto on_end;
      }
-   eo_do(sid->obj, elm_interface_scrollable_content_pos_set(px, py, EINA_TRUE));
+   elm_interface_scrollable_content_pos_set(sid->obj, px, py, EINA_TRUE);
    _elm_scroll_wanted_coordinates_update(sid, px, py);
 
    return EO_CALLBACK_CONTINUE;
@@ -2356,15 +2353,15 @@ _elm_scroll_scroll_to_y(Elm_Scrollable_Smart_Interface_Data *sid,
    if (sid->freeze) return;
    if (t_in <= 0.0)
      {
-        eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&x, &y));
-        eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
-              (NULL, NULL, &w, &h));
+        elm_interface_scrollable_content_pos_get(sid->obj, &x, &y);
+        elm_interface_scrollable_content_viewport_geometry_get
+              (sid->obj, NULL, NULL, &w, &h);
         y = pos_y;
-        eo_do(sid->obj, elm_interface_scrollable_content_region_set(x, y, w, h));
+        elm_interface_scrollable_content_region_set(sid->obj, x, y, w, h);
         return;
      }
    t = ecore_loop_time_get();
-   eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py));
+   elm_obj_pan_pos_get(sid->pan_obj, &px, &py);
    sid->scrollto.y.start = py;
    sid->scrollto.y.end = pos_y;
    sid->scrollto.y.t_start = t;
@@ -2398,16 +2395,16 @@ _elm_scroll_scroll_to_x(Elm_Scrollable_Smart_Interface_Data *sid,
    if (sid->freeze) return;
    if (t_in <= 0.0)
      {
-        eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&x, &y));
-        eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
-              (NULL, NULL, &w, &h));
+        elm_interface_scrollable_content_pos_get(sid->obj, &x, &y);
+        elm_interface_scrollable_content_viewport_geometry_get
+              (sid->obj, NULL, NULL, &w, &h);
         x = pos_x;
-        eo_do(sid->obj, elm_interface_scrollable_content_region_set
-              (x, y, w, h));
+        elm_interface_scrollable_content_region_set
+              (sid->obj, x, y, w, h);
         return;
      }
    t = ecore_loop_time_get();
-   eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py));
+   elm_obj_pan_pos_get(sid->pan_obj, &px, &py);
    sid->scrollto.x.start = px;
    sid->scrollto.x.end = pos_x;
    sid->scrollto.x.t_start = t;
@@ -2518,11 +2515,11 @@ _elm_scroll_mouse_up_event_cb(void *data,
                             int minx, miny, mx, my, px, py;
                             double tt = 0.0, dtt = 0.0;
 
-                            eo_do(sid->pan_obj, elm_obj_pan_pos_min_get
-                                  (&minx, &miny));
-                            eo_do(sid->pan_obj, elm_obj_pan_pos_max_get
-                                  (&mx, &my));
-                            eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py));
+                            elm_obj_pan_pos_min_get
+                                  (sid->pan_obj, &minx, &miny);
+                            elm_obj_pan_pos_max_get
+                                  (sid->pan_obj, &mx, &my);
+                            elm_obj_pan_pos_get(sid->pan_obj, &px, &py);
                             max_d = _elm_config->thumbscroll_flick_distance_tolerance;
                             if (dx > 0)
                               {
@@ -2598,8 +2595,7 @@ _elm_scroll_mouse_up_event_cb(void *data,
                                       _elm_scroll_anim_start(sid);
                                    }
                                  sid->down.anim_start = ecore_loop_time_get();
-                                 eo_do(sid->obj,
-                                       elm_interface_scrollable_content_pos_get(&x, &y));
+                                 elm_interface_scrollable_content_pos_get(sid->obj, &x, &y);
                                  sid->down.sx = x;
                                  sid->down.sy = y;
                                  sid->down.b0x = 0;
@@ -2618,8 +2614,8 @@ _elm_scroll_mouse_up_event_cb(void *data,
                {
                   Evas_Coord pgx, pgy;
 
-                  eo_do(sid->obj, elm_interface_scrollable_content_pos_get
-                        (&x, &y));
+                  elm_interface_scrollable_content_pos_get
+                        (sid->obj, &x, &y);
                   if ((!sid->obj) ||
                       (!elm_widget_drag_child_locked_x_get
                          (sid->obj)))
@@ -2658,8 +2654,8 @@ _elm_scroll_mouse_up_event_cb(void *data,
                {
                   Evas_Coord pgx, pgy;
 
-                  eo_do(sid->obj, elm_interface_scrollable_content_pos_get
-                        (&x, &y));
+                  elm_interface_scrollable_content_pos_get
+                        (sid->obj, &x, &y);
                   if ((!sid->obj) ||
                       (!elm_widget_drag_child_locked_x_get
                          (sid->obj)))
@@ -2703,8 +2699,8 @@ _elm_scroll_mouse_up_event_cb(void *data,
         sid->down.want_dragged = EINA_FALSE;
         sid->down.dragged = EINA_FALSE;
         sid->down.now = EINA_FALSE;
-        eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&x, &y));
-        eo_do(sid->obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+        elm_interface_scrollable_content_pos_get(sid->obj, &x, &y);
+        elm_interface_scrollable_content_pos_set(sid->obj, x, y, EINA_TRUE);
         _elm_scroll_wanted_coordinates_update(sid, x, y);
 
         if (sid->content_info.resized)
@@ -2797,7 +2793,7 @@ _elm_scroll_mouse_down_event_cb(void *data,
         sid->down.dir_y = EINA_FALSE;
         sid->down.x = ev->canvas.x;
         sid->down.y = ev->canvas.y;
-        eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&x, &y));
+        elm_interface_scrollable_content_pos_get(sid->obj, &x, &y);
         sid->down.sx = x;
         sid->down.sy = y;
         sid->down.locked = EINA_FALSE;
@@ -2830,9 +2826,9 @@ _elm_scroll_can_scroll(Elm_Scrollable_Smart_Interface_Data *sid,
 
    if (!sid->pan_obj) return EINA_FALSE;
 
-   eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
-   eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py));
+   elm_obj_pan_pos_max_get(sid->pan_obj, &mx, &my);
+   elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
+   elm_obj_pan_pos_get(sid->pan_obj, &px, &py);
    switch (dir)
      {
       case LEFT:
@@ -2959,7 +2955,7 @@ _elm_scroll_down_coord_eval(Elm_Scrollable_Smart_Interface_Data *sid,
           }
      }
 
-   eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
+   elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
 
    if (!sid->loop_h && *x < minx)
      *x += (minx - *x) * _elm_config->thumbscroll_border_friction;
@@ -3076,7 +3072,7 @@ _elm_scroll_hold_enterer(void *data)
 //          ecore_loop_time_get() - sid->down.dragged_began_timestamp,
 //          fy, fy2);
 
-   eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&ox, &oy));
+   elm_interface_scrollable_content_pos_get(sid->obj, &ox, &oy);
    if (sid->down.dir_x)
      {
         if ((!sid->obj) ||
@@ -3095,7 +3091,7 @@ _elm_scroll_hold_enterer(void *data)
      _elm_scroll_smooth_debug_movetime_add(ox, oy);
 #endif
 
-   eo_do(sid->obj, elm_interface_scrollable_content_pos_set(ox, oy, EINA_TRUE));
+   elm_interface_scrollable_content_pos_set(sid->obj, ox, oy, EINA_TRUE);
 
    return EINA_FALSE;
 }
@@ -3128,7 +3124,7 @@ _elm_scroll_on_hold_animator(void *data, const Eo_Event *event EINA_UNUSED)
           (double)_elm_config->thumbscroll_hold_threshold * 2.0;
         vy = sid->down.onhold_vy * td *
           (double)_elm_config->thumbscroll_hold_threshold * 2.0;
-        eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&ox, &oy));
+        elm_interface_scrollable_content_pos_get(sid->obj, &ox, &oy);
         x = ox;
         y = oy;
 
@@ -3154,7 +3150,7 @@ _elm_scroll_on_hold_animator(void *data, const Eo_Event *event EINA_UNUSED)
                }
           }
 
-        eo_do(sid->obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+        elm_interface_scrollable_content_pos_set(sid->obj, x, y, EINA_TRUE);
      }
    sid->down.onhold_tlast = t;
 
@@ -3193,7 +3189,7 @@ _elm_scroll_mouse_move_event_cb(void *data,
      {
         Evas_Coord px = 0;
         ELM_ANIMATOR_DISCONNECT(sid->obj, sid->scrollto.x.animator, _elm_scroll_scroll_to_x_animator, sid);
-        eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, NULL));
+        elm_obj_pan_pos_get(sid->pan_obj, &px, NULL);
         sid->down.sx = px;
         sid->down.x = sid->down.history[0].x;
      }
@@ -3203,7 +3199,7 @@ _elm_scroll_mouse_move_event_cb(void *data,
      {
         Evas_Coord py = 0;
         ELM_ANIMATOR_DISCONNECT(sid->obj, sid->scrollto.y.animator, _elm_scroll_scroll_to_y_animator, sid);
-        eo_do(sid->pan_obj, elm_obj_pan_pos_get(NULL, &py));
+        elm_obj_pan_pos_get(sid->pan_obj, NULL, &py);
         sid->down.sy = py;
         sid->down.y = sid->down.history[0].y;
      }
@@ -3387,8 +3383,8 @@ _elm_scroll_mouse_move_event_cb(void *data,
              {
                 Evas_Coord minx = 0, miny = 0, mx, my;
 
-                eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
-                eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my));
+                elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
+                elm_obj_pan_pos_max_get(sid->pan_obj, &mx, &my);
                 if (!sid->loop_v && y < miny)
                   y += (miny - y) *
                     _elm_config->thumbscroll_border_friction;
@@ -3503,13 +3499,13 @@ _elm_scroll_page_adjust(Elm_Scrollable_Smart_Interface_Data *sid)
 
    if (!_paging_is_enabled(sid)) return;
 
-   eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &w, &h));
+   elm_interface_scrollable_content_viewport_geometry_get
+         (sid->obj, NULL, NULL, &w, &h);
 
    x = _elm_scroll_page_x_get(sid, 0, EINA_TRUE);
    y = _elm_scroll_page_y_get(sid, 0, EINA_TRUE);
 
-   eo_do(sid->obj, elm_interface_scrollable_content_region_set(x, y, w, h));
+   elm_interface_scrollable_content_region_set(sid->obj, x, y, w, h);
 }
 
 static void
@@ -3793,9 +3789,9 @@ _elm_scroll_scroll_bar_reset(Elm_Scrollable_Smart_Interface_Data *sid)
      }
    if (sid->pan_obj)
      {
-        eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
-        eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py));
-        eo_do(sid->pan_obj, elm_obj_pan_pos_set(minx, miny));
+        elm_obj_pan_pos_min_get(sid->pan_obj, &minx, &miny);
+        elm_obj_pan_pos_get(sid->pan_obj, &px, &py);
+        elm_obj_pan_pos_set(sid->pan_obj, minx, miny);
      }
    if ((px != minx) || (py != miny))
      edje_object_signal_emit(sid->edje_obj, "elm,action,scroll", "elm");
@@ -3813,8 +3809,8 @@ _elm_scroll_pan_resized_cb(void *data,
 
    if (sid->cb_func.content_viewport_resize)
      {
-        eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
-              (NULL, NULL, &w, &h));
+        elm_interface_scrollable_content_viewport_geometry_get
+              (sid->obj, NULL, NULL, &w, &h);
         sid->cb_func.content_viewport_resize(sid->obj, w, h);
      }
 }
@@ -3828,7 +3824,7 @@ _elm_scroll_pan_changed_cb(void *data, const Eo_Event *event EINA_UNUSED)
 
    if (!sid->pan_obj) return EINA_TRUE;
 
-   eo_do(sid->pan_obj, elm_obj_pan_content_size_get(&w, &h));
+   elm_obj_pan_content_size_get(sid->pan_obj, &w, &h);
    if ((w != sid->content_info.w) || (h != sid->content_info.h))
      {
         sid->content_info.w = w;
@@ -3883,8 +3879,8 @@ _elm_interface_scrollable_content_set(Eo *obj, Elm_Scrollable_Smart_Interface_Da
      {
         o = _elm_pan_add(evas_object_evas_get(obj));
         sid->pan_obj = o;
-        eo_do(o, eo_event_callback_add
-          (ELM_PAN_EVENT_CHANGED, _elm_scroll_pan_changed_cb, sid));
+        eo_event_callback_add
+          (o, ELM_PAN_EVENT_CHANGED, _elm_scroll_pan_changed_cb, sid);
         evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE,
                                        _elm_scroll_pan_resized_cb, sid);
         edje_object_part_swallow(sid->edje_obj, "elm.swallow.content", o);
@@ -3894,7 +3890,7 @@ _elm_interface_scrollable_content_set(Eo *obj, Elm_Scrollable_Smart_Interface_Da
      (content, EVAS_CALLBACK_DEL, _elm_scroll_content_del_cb, sid);
 
    _elm_pan_content_set(sid->pan_obj, content);
-   eo_do(sid->pan_obj, elm_obj_pan_content_size_get(&w, &h));
+   elm_obj_pan_content_size_get(sid->pan_obj, &w, &h);
    sid->content_info.w = w;
    sid->content_info.h = h;
 
@@ -3907,12 +3903,11 @@ _elm_interface_scrollable_extern_pan_set(Eo *obj, Elm_Scrollable_Smart_Interface
 {
    if (!sid->edje_obj) return;
 
-   eo_do(obj, elm_interface_scrollable_content_set(NULL));
+   elm_interface_scrollable_content_set(obj, NULL);
 
    if (sid->pan_obj)
      {
-        eo_do(sid->pan_obj, eo_event_callback_del(
-           ELM_PAN_EVENT_CHANGED, _elm_scroll_pan_changed_cb, sid));
+        eo_event_callback_del(sid->pan_obj, ELM_PAN_EVENT_CHANGED, _elm_scroll_pan_changed_cb, sid);
         evas_object_event_callback_del(sid->pan_obj, EVAS_CALLBACK_RESIZE,
                                        _elm_scroll_pan_resized_cb);
      }
@@ -3939,8 +3934,8 @@ _elm_interface_scrollable_extern_pan_set(Eo *obj, Elm_Scrollable_Smart_Interface
    sid->pan_obj = pan;
 
    sid->extern_pan = EINA_TRUE;
-   eo_do(sid->pan_obj, eo_event_callback_add
-     (ELM_PAN_EVENT_CHANGED, _elm_scroll_pan_changed_cb, sid));
+   eo_event_callback_add
+     (sid->pan_obj, ELM_PAN_EVENT_CHANGED, _elm_scroll_pan_changed_cb, sid);
    evas_object_event_callback_add(sid->pan_obj, EVAS_CALLBACK_RESIZE,
                                   _elm_scroll_pan_resized_cb, sid);
    edje_object_part_swallow
@@ -4299,9 +4294,9 @@ _elm_interface_scrollable_page_relative_set(Eo *obj, Elm_Scrollable_Smart_Interf
 {
    Evas_Coord pagesize_h, pagesize_v;
 
-   eo_do(obj, elm_interface_scrollable_paging_get(NULL, NULL, &pagesize_h, &pagesize_v));
+   elm_interface_scrollable_paging_get(obj, NULL, NULL, &pagesize_h, &pagesize_v);
 
-   eo_do(obj, elm_interface_scrollable_paging_set(h_pagerel, v_pagerel, pagesize_h, pagesize_v));
+   elm_interface_scrollable_paging_set(obj, h_pagerel, v_pagerel, pagesize_h, pagesize_v);
 }
 
 EOLIAN static void
@@ -4323,7 +4318,7 @@ _elm_interface_scrollable_current_page_get(Eo *obj EINA_UNUSED, Elm_Scrollable_S
 {
    Evas_Coord x, y;
 
-   eo_do(sid->obj, elm_interface_scrollable_content_pos_get(&x, &y));
+   elm_interface_scrollable_content_pos_get(sid->obj, &x, &y);
    if (pagenumber_h)
      {
         if (sid->pagesize_h > 0)
@@ -4361,7 +4356,7 @@ _elm_interface_scrollable_last_page_get(Eo *obj EINA_UNUSED, Elm_Scrollable_Smar
 
    if (!sid->pan_obj) return;
 
-   eo_do(sid->pan_obj, elm_obj_pan_content_size_get(&cw, &ch));
+   elm_obj_pan_content_size_get(sid->pan_obj, &cw, &ch);
    if (pagenumber_h)
      {
         if ((sid->pagesize_h > 0) && (cw > sid->pagesize_h))
@@ -4388,8 +4383,8 @@ _elm_interface_scrollable_page_show(Eo *obj, Elm_Scrollable_Smart_Interface_Data
    sid->current_page.x = _elm_scroll_page_x_get(sid, 0, EINA_FALSE);
    sid->current_page.y = _elm_scroll_page_y_get(sid, 0, EINA_FALSE);
 
-   eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &w, &h));
+   elm_interface_scrollable_content_viewport_geometry_get
+         (sid->obj, NULL, NULL, &w, &h);
    x = sid->pagesize_h * pagenumber_h;
    y = sid->pagesize_v * pagenumber_v;
 
@@ -4399,7 +4394,7 @@ _elm_interface_scrollable_page_show(Eo *obj, Elm_Scrollable_Smart_Interface_Data
    sid->wh = h;
 
    if (_elm_scroll_content_region_show_internal(obj, &x, &y, w, h))
-     eo_do(obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+     elm_interface_scrollable_content_pos_set(obj, x, y, EINA_TRUE);
 
    if ((sid->current_page.x != x) || (sid->current_page.y != y))
      {
@@ -4415,8 +4410,8 @@ _elm_interface_scrollable_page_bring_in(Eo *obj, Elm_Scrollable_Smart_Interface_
    Evas_Coord x = 0;
    Evas_Coord y = 0;
 
-   eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &w, &h));
+   elm_interface_scrollable_content_viewport_geometry_get
+         (sid->obj, NULL, NULL, &w, &h);
    x = sid->pagesize_h * pagenumber_h;
    y = sid->pagesize_v * pagenumber_v;
    if (_elm_scroll_content_region_show_internal(obj, &x, &y, w, h))
@@ -4441,7 +4436,7 @@ _elm_interface_scrollable_gravity_set(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_
 {
    if (!sid->pan_obj) return;
 
-   eo_do(sid->pan_obj, elm_obj_pan_gravity_set(x, y));
+   elm_obj_pan_gravity_set(sid->pan_obj, x, y);
 }
 
 EOLIAN static void
@@ -4449,7 +4444,7 @@ _elm_interface_scrollable_gravity_get(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_
 {
    if (!sid->pan_obj) return;
 
-   eo_do(sid->pan_obj, elm_obj_pan_gravity_get(x, y));
+   elm_obj_pan_gravity_get(sid->pan_obj, x, y);
 }
 
 EOLIAN static void
@@ -4524,16 +4519,16 @@ _elm_interface_scrollable_evas_object_smart_add(Eo *obj, Elm_Scrollable_Smart_In
 
    _elm_scroll_scroll_bar_reset(sid);
 
-   eo_do_super(obj, MY_SCROLLABLE_INTERFACE, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_SCROLLABLE_INTERFACE));
 }
 
 EOLIAN static void
 _elm_interface_scrollable_evas_object_smart_del(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid)
 {
 
-   eo_do_super(obj, MY_SCROLLABLE_INTERFACE, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_SCROLLABLE_INTERFACE));
 
-   eo_do(obj, elm_interface_scrollable_content_set(NULL));
+   elm_interface_scrollable_content_set(obj, NULL);
    if (!sid->extern_pan) evas_object_del(sid->pan_obj);
 
    ecore_idle_enterer_del(sid->down.hold_enterer);
diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index f56cfb762..1c673b779 100644
--- a/src/lib/elm_inwin.c
+++ b/src/lib/elm_inwin.c
@@ -66,7 +66,7 @@ _elm_inwin_elm_widget_focus_next(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Elm
 EOLIAN static void
 _elm_inwin_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
@@ -105,7 +105,7 @@ _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
    Evas_Object *parent = NULL;
 
-   eo_do(obj, parent = eo_parent_get());
+   parent = eo_parent_get(obj);
 
    if (parent && !eo_isa(parent, ELM_WIN_CLASS))
      {
@@ -113,10 +113,9 @@ _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
         return NULL;
      }
 
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_GLASS_PANE));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE);
 
    return obj;
 }
@@ -140,7 +139,7 @@ elm_win_inwin_content_set(Evas_Object *obj,
                           Evas_Object *content)
 {
    ELM_INWIN_CHECK(obj);
-   eo_do(obj, elm_obj_container_content_set(NULL, content));
+   elm_obj_container_content_set(obj, NULL, content);
 }
 
 EAPI Evas_Object *
@@ -148,7 +147,7 @@ elm_win_inwin_content_get(const Evas_Object *obj)
 {
    ELM_INWIN_CHECK(obj) NULL;
    Evas_Object *ret = NULL;
-   eo_do((Eo *)obj, ret = elm_obj_container_content_get(NULL));
+   ret = elm_obj_container_content_get((Eo *)obj, NULL);
    return ret;
 }
 
@@ -157,7 +156,7 @@ elm_win_inwin_content_unset(Evas_Object *obj)
 {
    ELM_INWIN_CHECK(obj) NULL;
    Evas_Object *ret = NULL;
-   eo_do(obj, ret = elm_obj_container_content_unset(NULL));
+   ret = elm_obj_container_content_unset(obj, NULL);
    return ret;
 }
 
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index c9d7fda6f..6887a5f8e 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -181,7 +181,7 @@ _elm_label_elm_widget_theme_apply(Eo *obj, Elm_Label_Data *sd)
 
    evas_event_freeze(evas_object_evas_get(obj));
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _label_format_set(wd->resize_obj, sd->format);
@@ -331,11 +331,11 @@ _elm_label_elm_layout_text_set(Eo *obj, Elm_Label_Data *sd, const char *part, co
    if (!label) label = "";
    _label_format_set(wd->resize_obj, sd->format);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_layout_text_set(part, label));
+   int_ret = elm_obj_layout_text_set(eo_super(obj, MY_CLASS), part, label);
    if (int_ret)
      {
         sd->lastw = -1;
-        eo_do(obj, elm_obj_layout_sizing_eval());
+        elm_obj_layout_sizing_eval(obj);
      }
    return int_ret;
 }
@@ -357,9 +357,9 @@ _on_slide_end(void *data, Evas_Object *obj EINA_UNUSED,
    ELM_LABEL_DATA_GET(data, sd);
 
    if (sd->slide_ellipsis)
-     eo_do(data, elm_obj_label_ellipsis_set(EINA_TRUE));
+     elm_obj_label_ellipsis_set(data, EINA_TRUE);
 
-   eo_do(data, eo_event_callback_call(ELM_LABEL_EVENT_SLIDE_END, NULL));
+   eo_event_callback_call(data, ELM_LABEL_EVENT_SLIDE_END, NULL);
 }
 
 EOLIAN static void
@@ -367,7 +367,7 @@ _elm_label_evas_object_smart_add(Eo *obj, Elm_Label_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
 
    elm_widget_sub_object_parent_add(obj);
 
@@ -411,11 +411,10 @@ elm_label_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_label_eo_base_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LABEL));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LABEL);
 
    return obj;
 }
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index 86d020c17..a3d8bcb9f 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -100,7 +100,7 @@ _on_sub_object_size_hint_change(void *data,
                                 void *event_info EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
-   eo_do(data, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(data);
 }
 
 static void
@@ -339,9 +339,9 @@ _visuals_refresh(Evas_Object *obj,
 
    _elm_layout_highlight_in_theme(obj);
 
-   eo_do(obj, ret = elm_obj_widget_disable());
+   ret = elm_obj_widget_disable(obj);
 
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 
    return ret;
 }
@@ -377,7 +377,7 @@ _elm_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data *sd)
      }
 
    if (ret)
-     eo_do(obj, eo_event_callback_call(ELM_LAYOUT_EVENT_THEME_CHANGED, NULL));
+     eo_event_callback_call(obj, ELM_LAYOUT_EVENT_THEME_CHANGED, NULL);
 
    ret = _visuals_refresh(obj, sd) && ret;
 
@@ -389,12 +389,12 @@ _elm_layout_elm_widget_theme_apply(Eo *obj, Elm_Layout_Smart_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
    /* The following lines are here to support entry design; the _theme function
     * of entry needs to call directly the widget _theme function */
    Eina_Bool enable = EINA_TRUE;
-   eo_do(obj, enable = elm_obj_layout_theme_enable());
+   enable = elm_obj_layout_theme_enable(obj);
    if (!enable) return EINA_TRUE;
 
    return _elm_layout_theme_internal(obj, sd);
@@ -419,7 +419,7 @@ _elm_layout_elm_widget_on_focus(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED,
      {
         elm_layout_signal_emit(obj, "elm,action,focus", "elm");
         evas_object_focus_set(wd->resize_obj, EINA_TRUE);
-        eo_do(obj, eo_event_callback_call(ELM_WIDGET_EVENT_FOCUSED, NULL));
+        eo_event_callback_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
         if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
           elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
      }
@@ -427,7 +427,7 @@ _elm_layout_elm_widget_on_focus(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED,
      {
         elm_layout_signal_emit(obj, "elm,action,unfocus", "elm");
         evas_object_focus_set(wd->resize_obj, EINA_FALSE);
-        eo_do(obj, eo_event_callback_call(ELM_WIDGET_EVENT_UNFOCUSED, NULL));
+        eo_event_callback_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
         if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
           elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
      }
@@ -511,11 +511,11 @@ _elm_layout_elm_widget_sub_object_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_U
 
    if (evas_object_data_get(sobj, "elm-parent") == obj) return EINA_TRUE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_add(sobj));
+   int_ret = elm_obj_widget_sub_object_add(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    Eina_Bool enable = EINA_TRUE;
-   eo_do(obj, enable = elm_obj_layout_sub_object_add_enable());
+   enable = elm_obj_layout_sub_object_add_enable(obj);
 
    if (EINA_TRUE == enable)
      evas_object_event_callback_add
@@ -539,7 +539,7 @@ _elm_layout_elm_widget_sub_object_del(Eo *obj, Elm_Layout_Smart_Data *sd, Evas_O
      (sobj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
      _on_sub_object_size_hint_change, obj);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(sobj));
+   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
    if (sd->destructed_is) return EINA_TRUE;
 
@@ -557,7 +557,7 @@ _elm_layout_elm_widget_sub_object_del(Eo *obj, Elm_Layout_Smart_Data *sd, Evas_O
         break;
      }
 
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 
    return EINA_TRUE;
 }
@@ -638,9 +638,9 @@ _elm_layout_part_aliasing_eval(const Evas_Object *obj EINA_UNUSED,
    const Elm_Layout_Part_Alias_Description *aliases = NULL;
 
    if (is_text)
-     eo_do(sd->obj, aliases = elm_obj_layout_text_aliases_get());
+     aliases = elm_obj_layout_text_aliases_get(sd->obj);
    else
-     eo_do(sd->obj, aliases =  elm_obj_layout_content_aliases_get());
+     aliases =  elm_obj_layout_content_aliases_get(sd->obj);
 
    while (aliases && aliases->alias && aliases->real_part)
      {
@@ -746,7 +746,7 @@ _on_size_evaluate_signal(void *data,
                          const char *emission EINA_UNUSED,
                          const char *source EINA_UNUSED)
 {
-   eo_do(data, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(data);
 }
 
 EOLIAN static void
@@ -760,14 +760,14 @@ _elm_layout_evas_object_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSE
    edje = edje_object_add(evas_object_evas_get(obj));
    elm_widget_resize_object_set(obj, edje, EINA_TRUE);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
    edje_object_signal_callback_add
      (edje, "size,eval", "elm", _on_size_evaluate_signal, obj);
 
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 }
 
 EOLIAN static void
@@ -823,7 +823,7 @@ _elm_layout_evas_object_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd)
 
    sd->destructed_is = EINA_TRUE;
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 /* rewrite or extend this one on your derived class as to suit your
@@ -971,7 +971,7 @@ elm_layout_content_set(Evas_Object *obj,
 {
    ELM_LAYOUT_CHECK(obj) EINA_FALSE;
    Eina_Bool ret = EINA_FALSE;
-   eo_do(obj, ret = elm_obj_container_content_set(swallow, content));
+   ret = elm_obj_container_content_set(obj, swallow, content);
    return ret;
 }
 
@@ -1035,7 +1035,7 @@ _elm_layout_elm_container_content_set(Eo *obj, Elm_Layout_Smart_Data *sd, const
         _icon_signal_emit(sd, sub_d, EINA_TRUE);
      }
 
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 
 end:
    return EINA_TRUE;
@@ -1047,7 +1047,7 @@ elm_layout_content_get(const Evas_Object *obj,
 {
    ELM_LAYOUT_CHECK(obj) NULL;
    Evas_Object *ret = NULL;
-   eo_do((Eo *) obj, ret = elm_obj_container_content_get(swallow));
+   ret = elm_obj_container_content_get((Eo *) obj, swallow);
    return ret;
 }
 
@@ -1074,7 +1074,7 @@ elm_layout_content_unset(Evas_Object *obj,
 {
    ELM_LAYOUT_CHECK(obj) NULL;
    Evas_Object *ret = NULL;
-   eo_do(obj, ret = elm_obj_container_content_unset(swallow));
+   ret = elm_obj_container_content_unset(obj, swallow);
    return ret;
 }
 
@@ -1120,7 +1120,7 @@ elm_layout_content_swallow_list_get(const Evas_Object *obj)
 {
    ELM_LAYOUT_CHECK(obj) NULL;
    Eina_List *ret = NULL;
-   eo_do(obj, ret = elm_obj_container_content_swallow_list_get());
+   ret = elm_obj_container_content_swallow_list_get(obj);
    return ret;
 }
 
@@ -1189,7 +1189,7 @@ _elm_layout_text_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, const
 
    _text_signal_emit(sd, sub_d, !!text);
 
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 
    if (_elm_config->access_mode == ELM_ACCESS_MODE_ON &&
        sd->can_access && !(sub_d->obj))
@@ -1244,7 +1244,7 @@ _elm_layout_box_append(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eva
    sub_d->obj = child;
    sd->subs = eina_list_append(sd->subs, sub_d);
 
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 
    return EINA_TRUE;
 }
@@ -1283,7 +1283,7 @@ _elm_layout_box_prepend(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Ev
    sub_d->obj = child;
    sd->subs = eina_list_prepend(sd->subs, sub_d);
 
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 
    return EINA_TRUE;
 }
@@ -1327,7 +1327,7 @@ _elm_layout_box_insert_before(Eo *obj, Elm_Layout_Smart_Data *sd, const char *pa
    evas_object_event_callback_add
      ((Evas_Object *)reference, EVAS_CALLBACK_DEL, _box_reference_del, sub_d);
 
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 
    return EINA_TRUE;
 }
@@ -1367,7 +1367,7 @@ _elm_layout_box_insert_at(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part,
    sub_d->p.box.pos = pos;
    sd->subs = eina_list_append(sd->subs, sub_d);
 
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 
    return EINA_TRUE;
 }
@@ -1464,7 +1464,7 @@ _elm_layout_table_pack(Eo *obj, Elm_Layout_Smart_Data *sd, const char *part, Eva
    sub_d->p.table.rowspan = rowspan;
    sd->subs = eina_list_append(sd->subs, sub_d);
 
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 
    return EINA_TRUE;
 }
@@ -1582,7 +1582,7 @@ _elm_layout_thaw(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
 
    edje_object_thaw(wd->resize_obj);
 
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 
    return 0;
 }
@@ -1744,7 +1744,7 @@ _elm_layout_edje_object_can_access_get(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Dat
 EOLIAN static void
 _elm_layout_eo_base_dbg_info_get(Eo *eo_obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED, Eo_Dbg_Info *root)
 {
-   eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root));
+   eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
    ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd);
 
    if (wd->resize_obj && eo_isa(wd->resize_obj, EDJE_OBJECT_CLASS))
@@ -1753,12 +1753,12 @@ _elm_layout_eo_base_dbg_info_get(Eo *eo_obj, Elm_Layout_Smart_Data *_pd EINA_UNU
         const char *file, *edje_group;
         Evas_Object *edje_obj = wd->resize_obj;
 
-        eo_do(edje_obj, efl_file_get(&file, &edje_group));
+        efl_file_get(edje_obj, &file, &edje_group);
         EO_DBG_INFO_APPEND(group, "File", EINA_VALUE_TYPE_STRING, file);
         EO_DBG_INFO_APPEND(group, "Group", EINA_VALUE_TYPE_STRING, edje_group);
 
         Edje_Load_Error error = EDJE_LOAD_ERROR_GENERIC;
-        eo_do(edje_obj, error = edje_obj_load_error_get());
+        error = edje_obj_load_error_get(edje_obj);
         if (error != EDJE_LOAD_ERROR_NONE)
           {
              EO_DBG_INFO_APPEND(group, "Error", EINA_VALUE_TYPE_STRING,
@@ -1779,11 +1779,10 @@ EOLIAN static Eo *
 _elm_layout_eo_base_constructor(Eo *obj, Elm_Layout_Smart_Data *sd)
 {
    sd->obj = obj;
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
 
    return obj;
 }
@@ -1797,13 +1796,13 @@ EAPI Eina_Bool
 elm_layout_file_set(Eo *obj, const char *file, const char *group)
 {
    Eina_Bool ret;
-   return eo_do_ret((Eo *) obj, ret, efl_file_set(file, group));
+   return efl_file_set((Eo *) obj, file, group);
 }
 
 EAPI void
 elm_layout_file_get(Eo *obj, const char **file, const char **group)
 {
-   eo_do((Eo *) obj, efl_file_get(file, group));
+   efl_file_get((Eo *) obj, file, group);
 }
 
 #include "elm_layout.eo.c"
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 9a0a33808..27180774b 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -373,17 +373,15 @@ _elm_list_elm_widget_event_direction(Evas_Object *obj, Elm_Focus_Direction dir,
    // get content size and viewport size
    if ((dir == ELM_FOCUS_LEFT) || (dir == ELM_FOCUS_RIGHT))
      {
-        eo_do(obj,
-              elm_interface_scrollable_content_viewport_geometry_get
-              (NULL, NULL, &v, NULL),
-              elm_interface_scrollable_content_size_get(&min, NULL));
+        elm_interface_scrollable_content_viewport_geometry_get
+              (obj, NULL, NULL, &v, NULL);
+        elm_interface_scrollable_content_size_get(obj, &min, NULL);
      }
    else
      {
-        eo_do(obj,
-              elm_interface_scrollable_content_viewport_geometry_get
-              (NULL, NULL, NULL, &v),
-              elm_interface_scrollable_content_size_get(NULL, &min));
+        elm_interface_scrollable_content_viewport_geometry_get
+              (obj, NULL, NULL, NULL, &v);
+        elm_interface_scrollable_content_size_get(obj, NULL, &min);
      }
 
    // move focus or selection according to the configuration
@@ -471,12 +469,11 @@ static Eina_Bool _key_action_move(Evas_Object *obj, const char *params)
    Evas_Coord page_y = 0;
    Elm_Object_Item *it = NULL;
 
-   eo_do(obj,
-         elm_interface_scrollable_content_pos_get(&x, &y),
-         elm_interface_scrollable_step_size_get(&step_x, &step_y),
-         elm_interface_scrollable_page_size_get(&page_x, &page_y),
-         elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &v_w, &v_h));
+   elm_interface_scrollable_content_pos_get(obj, &x, &y);
+   elm_interface_scrollable_step_size_get(obj, &step_x, &step_y);
+   elm_interface_scrollable_page_size_get(obj, &page_x, &page_y);
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, &v_w, &v_h);
 
    _elm_widget_focus_auto_show(obj);
    /* TODO: fix logic for horizontal mode */
@@ -594,7 +591,7 @@ static Eina_Bool _key_action_move(Evas_Object *obj, const char *params)
      }
    else return EINA_FALSE;
 
-   eo_do(obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+   elm_interface_scrollable_content_pos_set(obj, x, y, EINA_TRUE);
    return EINA_TRUE;
 }
 
@@ -612,8 +609,8 @@ static Eina_Bool _key_action_select(Evas_Object *obj, const char *params EINA_UN
    if (eo_it)
      {
         ELM_LIST_ITEM_DATA_GET(eo_it, it);
-        eo_do(WIDGET(it), eo_event_callback_call
-          (ELM_LIST_EVENT_ACTIVATED, eo_it));
+        eo_event_callback_call
+          (WIDGET(it), ELM_LIST_EVENT_ACTIVATED, eo_it);
      }
 
    return EINA_TRUE;
@@ -651,9 +648,9 @@ _elm_list_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_List_Data *sd)
    Eina_List *l;
 
    EINA_LIST_FOREACH(sd->items, l, it)
-     eo_do(it, elm_wdg_item_translate());
+     elm_wdg_item_translate(it);
 
-   eo_do_super(obj, MY_CLASS, elm_obj_widget_translate());
+   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -690,8 +687,8 @@ _elm_list_elm_layout_sizing_eval(Eo *obj, Elm_List_Data *sd)
    evas_object_size_hint_max_get(sd->box, &maxw, &maxh);
    evas_object_size_hint_weight_get(sd->box, &xw, &yw);
 
-   eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &vw, &vh));
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, &vw, &vh);
    if (xw > 0.0)
      {
         if ((minw > 0) && (vw < minw)) vw = minw;
@@ -916,7 +913,7 @@ _items_fix(Evas_Object *obj)
                {
                   edje_object_part_text_escaped_set
                      (VIEW(it), "elm.text", it->label);
-                  eo_do(EO_OBJ(it), elm_wdg_item_part_text_custom_update());
+                  elm_wdg_item_part_text_custom_update(EO_OBJ(it));
 
                   if ((!it->icon) && (minh[0] > 0))
                     {
@@ -1049,14 +1046,14 @@ _show_region_hook(void *data EINA_UNUSED,
    Evas_Coord x, y, w, h;
 
    elm_widget_show_region_get(obj, &x, &y, &w, &h);
-   eo_do(obj, elm_interface_scrollable_content_region_set(x, y, w, h));
+   elm_interface_scrollable_content_region_set(obj, x, y, w, h);
 }
 
 EOLIAN static Eina_Bool
 _elm_list_elm_widget_disable(Eo *obj, Elm_List_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_disable());
+   int_ret = elm_obj_widget_disable(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_disabled_get(obj))
@@ -1085,7 +1082,7 @@ _mirrored_set(Evas_Object *obj,
 
    ELM_LIST_DATA_GET(obj, sd);
 
-   eo_do(obj, elm_interface_scrollable_mirrored_set(rtl));
+   elm_interface_scrollable_mirrored_set(obj, rtl);
 
    EINA_LIST_FOREACH(sd->items, n, eo_it)
      {
@@ -1101,7 +1098,7 @@ _elm_list_elm_widget_theme_apply(Eo *obj, Elm_List_Data *sd)
    Eina_List *n;
 
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -1157,8 +1154,8 @@ _elm_list_item_focused(Elm_Object_Item *eo_it)
    focus_raise = edje_object_data_get(VIEW(it), "focusraise");
    if ((focus_raise) && (!strcmp(focus_raise, "on")))
      evas_object_raise(VIEW(it));
-   eo_do(WIDGET(it), eo_event_callback_call
-     (ELM_LIST_EVENT_ITEM_FOCUSED, eo_it));
+   eo_event_callback_call
+     (WIDGET(it), ELM_LIST_EVENT_ITEM_FOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
 }
@@ -1185,7 +1182,7 @@ _elm_list_item_unfocused(Elm_Object_Item *eo_it)
      }
 
    sd->focused_item = NULL;
-   eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_ITEM_UNFOCUSED, eo_it));
+   eo_event_callback_call(obj, ELM_LIST_EVENT_ITEM_UNFOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 }
@@ -1263,7 +1260,7 @@ _elm_list_elm_widget_on_focus(Eo *obj, Elm_List_Data *sd, Elm_Object_Item *item
    Elm_Object_Item *eo_it = NULL;
    Eina_Bool is_sel = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus(NULL));
+   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj) && sd->selected && !sd->last_selected_item)
@@ -1315,7 +1312,7 @@ _elm_list_elm_widget_sub_object_del(Eo *obj, Elm_List_Data *sd, Evas_Object *sob
    Elm_Object_Item *eo_it;
 
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(sobj));
+   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if ((sobj == sd->box) || (sobj == obj)) goto end;
@@ -1363,7 +1360,7 @@ _item_highlight(Elm_List_Item_Data *it)
    _elm_list_walk(sd);
 
    edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
-   eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_HIGHLIGHTED, EO_OBJ(it)));
+   eo_event_callback_call(obj, ELM_LIST_EVENT_HIGHLIGHTED, EO_OBJ(it));
    select_raise = edje_object_data_get(VIEW(it), "selectraise");
    if ((select_raise) && (!strcmp(select_raise, "on")))
      evas_object_raise(VIEW(it));
@@ -1415,7 +1412,7 @@ call:
    _elm_list_walk(sd);
 
    if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
-   eo_do(obj, eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it));
+   eo_event_callback_call(obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it);
      if (_elm_config->atspi_mode)
        elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
    sd->last_selected_item = eo_it;
@@ -1442,8 +1439,8 @@ _item_unhighlight(Elm_List_Item_Data *it)
    _elm_list_walk(sd);
 
    edje_object_signal_emit(VIEW(it), "elm,state,unselected", "elm");
-   eo_do(obj, eo_event_callback_call
-     (ELM_LIST_EVENT_UNHIGHLIGHTED, EO_OBJ(it)));
+   eo_event_callback_call
+     (obj, ELM_LIST_EVENT_UNHIGHLIGHTED, EO_OBJ(it));
    stacking = edje_object_data_get(VIEW(it), "stacking");
    select_raise = edje_object_data_get(VIEW(it), "selectraise");
    if ((select_raise) && (!strcmp(select_raise, "on")))
@@ -1484,8 +1481,8 @@ _item_unselect(Elm_List_Item_Data *it)
         sd->selected = eina_list_remove(sd->selected, EO_OBJ(it));
         if (!(it->base->disabled ||
               (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE)))
-          eo_do(WIDGET(it), eo_event_callback_call
-            (EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(it)));
+          eo_event_callback_call
+            (WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(it));
         if (_elm_config->atspi_mode)
           elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
      }
@@ -1512,28 +1509,28 @@ static void
 _edge_left_cb(Evas_Object *obj,
               void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_LEFT, NULL));
+   eo_event_callback_call(obj, ELM_LIST_EVENT_EDGE_LEFT, NULL);
 }
 
 static void
 _edge_right_cb(Evas_Object *obj,
                void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_RIGHT, NULL));
+   eo_event_callback_call(obj, ELM_LIST_EVENT_EDGE_RIGHT, NULL);
 }
 
 static void
 _edge_top_cb(Evas_Object *obj,
              void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_TOP, NULL));
+   eo_event_callback_call(obj, ELM_LIST_EVENT_EDGE_TOP, NULL);
 }
 
 static void
 _edge_bottom_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_BOTTOM, NULL));
+   eo_event_callback_call(obj, ELM_LIST_EVENT_EDGE_BOTTOM, NULL);
 }
 
 static Eina_Bool
@@ -1550,8 +1547,8 @@ _long_press_cb(void *data)
    if (it->base->disabled) goto end;
 
    sd->longpressed = EINA_TRUE;
-   eo_do(WIDGET(it), eo_event_callback_call
-     (EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it)));
+   eo_event_callback_call
+     (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it));
 
 end:
    return ECORE_CALLBACK_CANCEL;
@@ -1575,8 +1572,8 @@ _swipe_do(Elm_List_Item_Data *it)
    sum /= sd->movements;
    if (abs(sum - sd->history[0].x) <= 10) return;
 
-   eo_do(WIDGET(it), eo_event_callback_call
-     (ELM_LIST_EVENT_SWIPE, EO_OBJ(it)));
+   eo_event_callback_call
+     (WIDGET(it), ELM_LIST_EVENT_SWIPE, EO_OBJ(it));
 }
 
 static void
@@ -1701,10 +1698,10 @@ _mouse_down_cb(void *data,
    /* Always call the callbacks last - the user may delete our context! */
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      {
-        eo_do(WIDGET(it), eo_event_callback_call
-          (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it)));
-        eo_do(WIDGET(it), eo_event_callback_call
-          (ELM_LIST_EVENT_ACTIVATED, EO_OBJ(it)));
+        eo_event_callback_call
+          (WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
+        eo_event_callback_call
+          (WIDGET(it), ELM_LIST_EVENT_ACTIVATED, EO_OBJ(it));
      }
    sd->swipe = EINA_FALSE;
    sd->movements = 0;
@@ -1737,8 +1734,8 @@ _mouse_up_cb(void *data,
         if (dx < 0) dx = -dx;
         if (dy < 0) dy = -dy;
         if ((dx < 5) && (dy < 5))
-          eo_do(obj, eo_event_callback_call
-            (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_RIGHT, EO_OBJ(it)));
+          eo_event_callback_call
+            (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_RIGHT, EO_OBJ(it));
         return;
      }
 
@@ -1994,13 +1991,13 @@ _elm_list_item_elm_widget_item_part_content_unset(Eo *eo_it EINA_UNUSED, Elm_Lis
    if ((!part) || (!strcmp(part, "start")))
      {
         Evas_Object *obj = item->icon;
-        eo_do(eo_it, elm_wdg_item_part_content_set(part, NULL));
+        elm_wdg_item_part_content_set(eo_it, part, NULL);
         return obj;
      }
    else if (!strcmp(part, "end"))
      {
         Evas_Object *obj = item->end;
-        eo_do(eo_it, elm_wdg_item_part_content_set(part, NULL));
+        elm_wdg_item_part_content_set(eo_it, part, NULL);
         return obj;
      }
 
@@ -2014,7 +2011,7 @@ _elm_list_item_elm_widget_item_part_text_set(Eo *eo_list_it, Elm_List_Item_Data
 {
    if (part && strcmp(part, "default"))
      {
-        eo_do(eo_list_it, elm_wdg_item_part_text_custom_set(part, text));
+        elm_wdg_item_part_text_custom_set(eo_list_it, part, text);
         edje_object_part_text_escaped_set(VIEW(list_it), part, text);
         return;
      }
@@ -2029,7 +2026,7 @@ _elm_list_item_elm_widget_item_part_text_get(Eo *eo_it, Elm_List_Item_Data *it,
 {
    const char *ret;
    if (part && strcmp(part, "default"))
-     return eo_do_ret(eo_it, ret, elm_wdg_item_part_text_custom_get(part));
+     return elm_wdg_item_part_text_custom_get(eo_it, part);
    return it->label;
 }
 
@@ -2131,14 +2128,14 @@ _elm_list_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_List_
    Elm_Atspi_State_Set ret;
    Eina_Bool sel;
 
-   eo_do_super(eo_it, ELM_LIST_ITEM_CLASS, ret = elm_interface_atspi_accessible_state_set_get());
+   ret = elm_interface_atspi_accessible_state_set_get(eo_super(eo_it, ELM_LIST_ITEM_CLASS));
 
    if (elm_object_item_disabled_get(eo_it))
      return ret;
 
    STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTABLE);
 
-   eo_do(eo_it, sel = elm_obj_list_item_selected_get());
+   sel = elm_obj_list_item_selected_get(eo_it);
    if (sel)
      STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTED);
    else
@@ -2151,7 +2148,7 @@ EOLIAN static char*
 _elm_list_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_List_Item_Data *data)
 {
    char *ret;
-   eo_do_super(eo_it, ELM_LIST_ITEM_CLASS, ret = elm_interface_atspi_accessible_name_get());
+   ret = elm_interface_atspi_accessible_name_get(eo_super(eo_it, ELM_LIST_ITEM_CLASS));
    if (ret) return ret;
    return data->label ? strdup(data->label) : NULL;
 }
@@ -2276,9 +2273,9 @@ _access_widget_item_register(Elm_List_Item_Data *it, Eina_Bool is_access)
 EOLIAN static Eo *
 _elm_list_item_eo_base_constructor(Eo *eo_it, Elm_List_Item_Data *it)
 {
-   eo_it = eo_do_super_ret(eo_it, ELM_LIST_ITEM_CLASS, eo_it, eo_constructor());
+   eo_it = eo_constructor(eo_super(eo_it, ELM_LIST_ITEM_CLASS));
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
-   eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST_ITEM));
+   elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_LIST_ITEM);
 
    return eo_it;
 }
@@ -2328,7 +2325,7 @@ _item_new(Evas_Object *obj,
         evas_object_event_callback_add
           (it->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb,
           obj);
-        eo_do(it->icon, elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_DISABLED));
+        elm_interface_atspi_accessible_type_set(it->icon, ELM_ATSPI_TYPE_DISABLED);
      }
    if (it->end)
      {
@@ -2336,7 +2333,7 @@ _item_new(Evas_Object *obj,
         evas_object_event_callback_add
           (it->end, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb,
           obj);
-        eo_do(it->end, elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_DISABLED));
+        elm_interface_atspi_accessible_type_set(it->end, ELM_ATSPI_TYPE_DISABLED);
      }
 
    if (_elm_config->atspi_mode)
@@ -2396,7 +2393,7 @@ _elm_list_evas_object_smart_add(Eo *obj, Elm_List_Data *priv)
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    elm_widget_can_focus_set(obj, EINA_TRUE);
@@ -2416,13 +2413,12 @@ _elm_list_evas_object_smart_add(Eo *obj, Elm_List_Data *priv)
    evas_object_show(priv->hit_rect);
    evas_object_repeat_events_set(priv->hit_rect, EINA_TRUE);
 
-   eo_do(obj,
-         elm_interface_scrollable_edge_left_cb_set(_edge_left_cb),
-         elm_interface_scrollable_edge_right_cb_set(_edge_right_cb),
-         elm_interface_scrollable_edge_top_cb_set(_edge_top_cb),
-         elm_interface_scrollable_edge_bottom_cb_set(_edge_bottom_cb),
-         elm_interface_scrollable_content_min_limit_cb_set(_elm_list_content_min_limit_cb),
-         elm_interface_scrollable_objects_set(wd->resize_obj, priv->hit_rect));
+   elm_interface_scrollable_edge_left_cb_set(obj, _edge_left_cb);
+   elm_interface_scrollable_edge_right_cb_set(obj, _edge_right_cb);
+   elm_interface_scrollable_edge_top_cb_set(obj, _edge_top_cb);
+   elm_interface_scrollable_edge_bottom_cb_set(obj, _edge_bottom_cb);
+   elm_interface_scrollable_content_min_limit_cb_set(obj, _elm_list_content_min_limit_cb);
+   elm_interface_scrollable_objects_set(obj, wd->resize_obj, priv->hit_rect);
 
    /* the scrollable interface may set this */
    evas_object_event_callback_add
@@ -2434,18 +2430,18 @@ _elm_list_evas_object_smart_add(Eo *obj, Elm_List_Data *priv)
    evas_object_size_hint_min_set(obj, minw, minh);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize_cb, obj);
 
-   eo_do(obj, elm_interface_scrollable_bounce_allow_set(EINA_FALSE, _elm_config->thumbscroll_bounce_enable));
+   elm_interface_scrollable_bounce_allow_set(obj, EINA_FALSE, _elm_config->thumbscroll_bounce_enable);
 
    priv->box = elm_box_add(obj);
    evas_object_size_hint_weight_set(priv->box, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(priv->box, EVAS_HINT_FILL, 0.0);
-   eo_do(priv->box, elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_DISABLED));
+   elm_interface_atspi_accessible_type_set(priv->box, ELM_ATSPI_TYPE_DISABLED);
 
    /* FIXME: change this ugly code path later */
    elm_widget_on_show_region_hook_set(priv->box, _show_region_hook, obj);
    elm_widget_sub_object_add(obj, priv->box);
 
-   eo_do(obj, elm_interface_scrollable_content_set(priv->box));
+   elm_interface_scrollable_content_set(obj, priv->box);
    evas_object_event_callback_add
      (priv->box, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
      _size_hints_changed_cb, obj);
@@ -2503,13 +2499,13 @@ _elm_list_evas_object_smart_del(Eo *obj, Elm_List_Data *sd)
 
    sd->selected = eina_list_free(sd->selected);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_list_evas_object_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
+   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -2517,7 +2513,7 @@ _elm_list_evas_object_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_
 EOLIAN static void
 _elm_list_evas_object_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
 }
@@ -2525,7 +2521,7 @@ _elm_list_evas_object_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Eva
 EOLIAN static void
 _elm_list_evas_object_smart_member_add(Eo *obj, Elm_List_Data *sd, Evas_Object *member)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
+   evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -2556,11 +2552,10 @@ elm_list_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_list_eo_base_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
 
    return obj;
 }
@@ -2643,13 +2638,13 @@ _elm_list_horizontal_set(Eo *obj, Elm_List_Data *sd, Eina_Bool horizontal)
      {
         evas_object_size_hint_weight_set(sd->box, 0.0, EVAS_HINT_EXPAND);
         evas_object_size_hint_align_set(sd->box, 0.0, EVAS_HINT_FILL);
-        eo_do(obj, elm_interface_scrollable_bounce_allow_set(bounce, EINA_FALSE));
+        elm_interface_scrollable_bounce_allow_set(obj, bounce, EINA_FALSE);
      }
    else
      {
         evas_object_size_hint_weight_set(sd->box, EVAS_HINT_EXPAND, 0.0);
         evas_object_size_hint_align_set(sd->box, EVAS_HINT_FILL, 0.0);
-        eo_do(obj, elm_interface_scrollable_bounce_allow_set(EINA_FALSE, bounce));
+        elm_interface_scrollable_bounce_allow_set(obj, EINA_FALSE, bounce);
      }
 }
 
@@ -2682,7 +2677,7 @@ elm_list_bounce_set(Evas_Object *obj,
 {
    ELM_LIST_CHECK(obj);
 
-   eo_do(obj, elm_interface_scrollable_bounce_allow_set(h_bounce, v_bounce));
+   elm_interface_scrollable_bounce_allow_set(obj, h_bounce, v_bounce);
 }
 
 EAPI void
@@ -2692,7 +2687,7 @@ elm_list_bounce_get(const Evas_Object *obj,
 {
    ELM_LIST_CHECK(obj);
 
-   eo_do((Eo *) obj, elm_interface_scrollable_bounce_allow_get(h_bounce, v_bounce));
+   elm_interface_scrollable_bounce_allow_get((Eo *) obj, h_bounce, v_bounce);
 }
 
 EAPI void
@@ -2701,7 +2696,7 @@ elm_list_scroller_policy_set(Evas_Object *obj,
                              Elm_Scroller_Policy policy_v)
 {
    ELM_LIST_CHECK(obj);
-   eo_do(obj, elm_interface_scrollable_policy_set(policy_h, policy_v));
+   elm_interface_scrollable_policy_set(obj, policy_h, policy_v);
 }
 
 EOLIAN static void
@@ -2711,7 +2706,7 @@ _elm_list_elm_interface_scrollable_policy_set(Eo *obj, Elm_List_Data *sd EINA_UN
        (policy_v >= ELM_SCROLLER_POLICY_LAST))
      return;
 
-   eo_do_super(obj, MY_CLASS, elm_interface_scrollable_policy_set(policy_h, policy_v));
+   elm_interface_scrollable_policy_set(eo_super(obj, MY_CLASS), policy_h, policy_v);
 }
 
 EAPI void
@@ -2720,7 +2715,7 @@ elm_list_scroller_policy_get(const Evas_Object *obj,
                              Elm_Scroller_Policy *policy_v)
 {
    ELM_LIST_CHECK(obj);
-   eo_do((Eo *) obj, elm_interface_scrollable_policy_get(policy_h, policy_v));
+   elm_interface_scrollable_policy_get((Eo *) obj, policy_h, policy_v);
 }
 
 EOLIAN static void
@@ -2902,9 +2897,9 @@ _elm_list_item_separator_set(Eo *eo_item, Elm_List_Item_Data *it, Eina_Bool sett
    it->is_separator = !!setting;
 
    if (it->is_separator)
-      eo_do(eo_item, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SEPARATOR));
+      elm_interface_atspi_accessible_role_set(eo_item, ELM_ATSPI_ROLE_SEPARATOR);
    else
-      eo_do(eo_item, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST_ITEM));
+      elm_interface_atspi_accessible_role_set(eo_item, ELM_ATSPI_ROLE_LIST_ITEM);
 }
 
 EOLIAN static Eina_Bool
@@ -2980,7 +2975,7 @@ _elm_list_item_show(Eo *eo_it EINA_UNUSED, Elm_List_Item_Data *it)
    x -= bx;
    y -= by;
 
-   eo_do(WIDGET(it), elm_interface_scrollable_content_region_show(x, y, w, h));
+   elm_interface_scrollable_content_region_show(WIDGET(it), x, y, w, h);
 }
 
 EOLIAN static void
@@ -2998,7 +2993,7 @@ _elm_list_item_bring_in(Eo *eo_it EINA_UNUSED, Elm_List_Item_Data *it)
    x -= bx;
    y -= by;
 
-   eo_do(WIDGET(it), elm_interface_scrollable_region_bring_in(x, y, w, h));
+   elm_interface_scrollable_region_bring_in(WIDGET(it), x, y, w, h);
 }
 
 EOLIAN static Evas_Object *
@@ -3197,7 +3192,7 @@ EOLIAN Eina_List*
 _elm_list_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_List_Data *pd)
 {
    Eina_List *ret;
-   eo_do_super(obj, ELM_LIST_CLASS, ret = elm_interface_atspi_accessible_children_get());
+   ret = elm_interface_atspi_accessible_children_get(eo_super(obj, ELM_LIST_CLASS));
    return eina_list_merge(eina_list_clone(pd->items), ret);
 }
 
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 3b10cc579..120b9d1b9 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -498,9 +498,9 @@ _viewport_coord_get(Elm_Map_Data *sd,
 
    EINA_SAFETY_ON_NULL_RETURN(sd);
 
-   eo_do(sd->obj, elm_interface_scrollable_content_pos_get(&x, &y));
-   eo_do(sd->obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &w, &h));
+   elm_interface_scrollable_content_pos_get(sd->obj, &x, &y);
+   elm_interface_scrollable_content_viewport_geometry_get
+         (sd->obj, NULL, NULL, &w, &h);
 
    if (w > sd->size.w) x -= ((w - sd->size.w) / 2);
    if (h > sd->size.h) y -= ((h - sd->size.h) / 2);
@@ -596,8 +596,8 @@ _loaded_timeout_cb(void *data)
 
    sd->loaded_timer = NULL;
    if (!(sd->download_num) && !(sd->download_idler))
-      eo_do(sd->obj, eo_event_callback_call
-        (ELM_MAP_EVENT_LOADED, NULL));
+      eo_event_callback_call
+        (sd->obj, ELM_MAP_EVENT_LOADED, NULL);
    return ECORE_CALLBACK_CANCEL;
 }
 
@@ -748,8 +748,8 @@ _downloaded_cb(void *data,
 
         _grid_item_update(gi);
         gi->wsd->finish_num++;
-        eo_do((gi->wsd)->obj, eo_event_callback_call
-          (ELM_MAP_EVENT_TILE_LOADED, NULL));
+        eo_event_callback_call
+          ((gi->wsd)->obj, ELM_MAP_EVENT_TILE_LOADED, NULL);
      }
    else
      {
@@ -757,8 +757,8 @@ _downloaded_cb(void *data,
 
         ecore_file_remove(gi->file);
         gi->file_have = EINA_FALSE;
-        eo_do((gi->wsd)->obj, eo_event_callback_call
-          (ELM_MAP_EVENT_TILE_LOADED_FAIL, NULL));
+        eo_event_callback_call
+          ((gi->wsd)->obj, ELM_MAP_EVENT_TILE_LOADED_FAIL, NULL);
      }
 
    ELM_WIDGET_DATA_GET_OR_RETURN(gi->wsd->obj, wd);
@@ -806,8 +806,8 @@ _download_job(void *data)
            sd->download_list = eina_list_remove(sd->download_list, gi);
            sd->try_num++;
            sd->download_num++;
-           eo_do(obj, eo_event_callback_call
-             (ELM_MAP_EVENT_TILE_LOAD, NULL));
+           eo_event_callback_call
+             (obj, ELM_MAP_EVENT_TILE_LOAD, NULL);
            if (sd->download_num == 1)
              edje_object_signal_emit(wd->resize_obj,
                                      "elm,state,busy,start", "elm");
@@ -1067,8 +1067,8 @@ _zoom_timeout_cb(void *data)
 
    _smooth_update(sd);
    sd->zoom_timer = NULL;
-   eo_do(sd->obj, eo_event_callback_call
-     (EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL));
+   eo_event_callback_call
+     (sd->obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL);
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -1119,8 +1119,8 @@ _zoom_do(Elm_Map_Data *sd,
         if (y < 0) y = 0;
         else if (y > (sd->size.h - vh))
           y = sd->size.h - vh;
-        eo_do(sd->obj, elm_interface_scrollable_content_region_show
-              (x, y, vw, vh));
+        elm_interface_scrollable_content_region_show
+              (sd->obj, x, y, vw, vh);
      }
 
    if (sd->zoom_timer)
@@ -1129,16 +1129,16 @@ _zoom_do(Elm_Map_Data *sd,
         sd->zoom_timer = NULL;
      }
    else
-      eo_do(sd->obj, eo_event_callback_call
-        (EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_START, NULL));
+      eo_event_callback_call
+        (sd->obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_START, NULL);
 
    if (sd->obj)
      sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj);
-   eo_do(sd->obj, eo_event_callback_call
-     (ELM_MAP_EVENT_ZOOM_CHANGE, NULL));
+   eo_event_callback_call
+     (sd->obj, ELM_MAP_EVENT_ZOOM_CHANGE, NULL);
 
-   eo_do(sd->pan_obj, eo_event_callback_call
-     (ELM_PAN_EVENT_CHANGED, NULL));
+   eo_event_callback_call
+     (sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
    evas_object_smart_changed(sd->pan_obj);
 }
 
@@ -1192,7 +1192,7 @@ _zoom_bring_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
              _viewport_coord_get(sd, NULL, NULL, &w, &h);
              x = x - (w / 2);
              y = y - (h / 2);
-             eo_do(sd->obj, elm_interface_scrollable_content_region_show(x, y, w, h));
+             elm_interface_scrollable_content_region_show(sd->obj, x, y, w, h);
              sd->ani.region_cnt--;
           }
      }
@@ -1207,10 +1207,9 @@ _zoom_animator_set(Elm_Map_Data *sd,
    Eina_Bool r = EINA_FALSE;
 
    sd->zoom_animator = !!callback;
-   eo_do(sd->obj,
-         r = eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, sd->obj);
-         r |= eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_bring_anim_cb, sd->obj);
-         if (callback) eo_event_callback_add(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, callback, sd->obj));
+   r = eo_event_callback_del(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, sd->obj);
+   r |= eo_event_callback_del(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_bring_anim_cb, sd->obj);
+   if (sd->obj, callback);
 
    return r;
 }
@@ -1281,8 +1280,8 @@ _scr_timeout_cb(void *data)
 
    _smooth_update(sd);
    sd->scr_timer = NULL;
-   eo_do(sd->obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL));
+   eo_event_callback_call
+     (sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL);
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -1295,12 +1294,12 @@ _scroll_cb(Evas_Object *obj,
 
    if (sd->scr_timer) ecore_timer_del(sd->scr_timer);
    else
-      eo_do(sd->obj, eo_event_callback_call
-        (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL));
+      eo_event_callback_call
+        (sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL);
    ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
    sd->scr_timer = ecore_timer_add(0.25, _scr_timeout_cb, obj);
-   eo_do(sd->obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL));
+   eo_event_callback_call
+     (sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL);
 }
 
 static void
@@ -1309,8 +1308,8 @@ _scroll_animate_start_cb(Evas_Object *obj,
 {
    ELM_MAP_DATA_GET(obj, sd);
 
-   eo_do(sd->obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL));
+   eo_event_callback_call
+     (sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL);
 }
 
 static void
@@ -1319,8 +1318,8 @@ _scroll_animate_stop_cb(Evas_Object *obj,
 {
    ELM_MAP_DATA_GET(obj, sd);
 
-   eo_do(sd->obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL));
+   eo_event_callback_call
+     (sd->obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
 static Eina_Bool
@@ -1329,8 +1328,8 @@ _long_press_cb(void *data)
    ELM_MAP_DATA_GET(data, sd);
 
    sd->long_timer = NULL;
-   eo_do(sd->obj, eo_event_callback_call
-     (EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, &sd->ev));
+   eo_event_callback_call
+     (sd->obj, EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, &sd->ev);
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -1349,11 +1348,11 @@ _mouse_down_cb(void *data,
    else sd->on_hold = EINA_FALSE;
 
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     eo_do(sd->obj, eo_event_callback_call
-       (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, ev));
+     eo_event_callback_call
+       (sd->obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, ev);
    else
-     eo_do(sd->obj, eo_event_callback_call
-       (ELM_MAP_EVENT_PRESS, ev));
+     eo_event_callback_call
+       (sd->obj, ELM_MAP_EVENT_PRESS, ev);
 
    ecore_timer_del(sd->long_timer);
    sd->ev = *ev;
@@ -1380,8 +1379,8 @@ _mouse_up_cb(void *data,
    ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
 
    if (!sd->on_hold)
-   eo_do(sd->obj, eo_event_callback_call
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, ev));
+   eo_event_callback_call
+     (sd->obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, ev);
    sd->on_hold = EINA_FALSE;
 }
 
@@ -1492,8 +1491,8 @@ _overlay_clicked_cb(void *data,
 
    EINA_SAFETY_ON_NULL_RETURN(data);
 
-   eo_do((overlay->wsd)->obj, eo_event_callback_call
-     (ELM_MAP_EVENT_OVERLAY_CLICKED, overlay));
+   eo_event_callback_call
+     ((overlay->wsd)->obj, ELM_MAP_EVENT_OVERLAY_CLICKED, overlay);
    if (overlay->cb)
      overlay->cb(overlay->cb_data, (overlay->wsd)->obj, overlay);
 }
@@ -3074,15 +3073,15 @@ _route_cb(void *data,
         INF("Route request success from (%lf, %lf) to (%lf, %lf)",
             route->flon, route->flat, route->tlon, route->tlat);
         if (route->cb) route->cb(route->data, sd->obj, route);
-        eo_do(sd->obj, eo_event_callback_call
-          (ELM_MAP_EVENT_ROUTE_LOADED, NULL));
+        eo_event_callback_call
+          (sd->obj, ELM_MAP_EVENT_ROUTE_LOADED, NULL);
      }
    else
      {
         ERR("Route request failed: %d", status);
         if (route->cb) route->cb(route->data, sd->obj, NULL);
-        eo_do(sd->obj, eo_event_callback_call
-          (ELM_MAP_EVENT_ROUTE_LOADED_FAIL, NULL));
+        eo_event_callback_call
+          (sd->obj, ELM_MAP_EVENT_ROUTE_LOADED_FAIL, NULL);
      }
 
    edje_object_signal_emit(wd->resize_obj,
@@ -3111,15 +3110,15 @@ _name_cb(void *data,
         INF("Name request success address:%s, lon:%lf, lat:%lf",
             name->address, name->lon, name->lat);
         if (name->cb) name->cb(name->data, sd->obj, name);
-        eo_do(sd->obj, eo_event_callback_call
-          (ELM_MAP_EVENT_NAME_LOADED, NULL));
+        eo_event_callback_call
+          (sd->obj, ELM_MAP_EVENT_NAME_LOADED, NULL);
      }
    else
      {
         ERR("Name request failed: %d", status);
         if (name->cb) name->cb(name->data, sd->obj, NULL);
-        eo_do(sd->obj, eo_event_callback_call
-          (ELM_MAP_EVENT_NAME_LOADED_FAIL, NULL));
+        eo_event_callback_call
+          (sd->obj, ELM_MAP_EVENT_NAME_LOADED_FAIL, NULL);
      }
    edje_object_signal_emit(wd->resize_obj,
                            "elm,state,busy,stop", "elm");
@@ -3148,16 +3147,16 @@ _name_list_cb(void *data,
         if (name_list->cb)
           name_list->cb(name_list->data, wd->obj,
                         name_list->names);
-        eo_do(wd->obj, eo_event_callback_call
-          (ELM_MAP_EVENT_NAME_LOADED, NULL));
+        eo_event_callback_call
+          (wd->obj, ELM_MAP_EVENT_NAME_LOADED, NULL);
      }
    else
      {
         ERR("Name List request failed: %d", status);
         if (name_list->cb)
           name_list->cb(name_list->data, wd->obj, NULL);
-        eo_do(wd->obj, eo_event_callback_call
-          (ELM_MAP_EVENT_NAME_LOADED_FAIL, NULL));
+        eo_event_callback_call
+          (wd->obj, ELM_MAP_EVENT_NAME_LOADED_FAIL, NULL);
      }
 
    edje_object_signal_emit(wd->resize_obj,
@@ -3234,8 +3233,8 @@ _name_request(const Evas_Object *obj,
    free(fname);
 
    sd->names = eina_list_append(sd->names, name);
-   eo_do(sd->obj, eo_event_callback_call
-     (ELM_MAP_EVENT_NAME_LOAD, name));
+   eo_event_callback_call
+     (sd->obj, ELM_MAP_EVENT_NAME_LOAD, name);
    edje_object_signal_emit(wd->resize_obj,
                            "elm,state,busy,start", "elm");
    return name;
@@ -3288,8 +3287,8 @@ _name_list_request(const Evas_Object *obj,
    free(url);
    free(fname);
 
-   eo_do(wd->obj, eo_event_callback_call
-     (ELM_MAP_EVENT_NAME_LOAD, name_list->names));
+   eo_event_callback_call
+     (wd->obj, ELM_MAP_EVENT_NAME_LOAD, name_list->names);
    edje_object_signal_emit(wd->resize_obj,
                            "elm,state,busy,start", "elm");
    return name_list->names;
@@ -3759,8 +3758,8 @@ _region_show_bring_in(Elm_Map_Data *wsd, double lon, double lat, Eina_Bool bring
    x = x - (w / 2);
    y = y - (h / 2);
 
-   if (bring_in) eo_do(wsd->obj, elm_interface_scrollable_region_bring_in(x, y, w, h));
-   else eo_do(wsd->obj, elm_interface_scrollable_content_region_show(x, y, w, h));
+   if (bring_in) elm_interface_scrollable_region_bring_in(wsd->obj, x, y, w, h);
+   else elm_interface_scrollable_content_region_show(wsd->obj, x, y, w, h);
 }
 
 static void
@@ -3881,7 +3880,7 @@ _elm_map_elm_widget_on_focus(Eo *obj, Elm_Map_Data *_pd EINA_UNUSED, Elm_Object_
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus(NULL));
+   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj))
@@ -3904,7 +3903,7 @@ EOLIAN static void
 _elm_map_pan_eo_base_destructor(Eo *obj, Elm_Map_Pan_Data *psd)
 {
    eo_data_unref(psd->wobj, psd->wsd);
-   eo_do_super(obj, MY_PAN_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, MY_PAN_CLASS));
 }
 
 static void
@@ -3920,7 +3919,7 @@ _elm_map_elm_widget_theme_apply(Eo *obj, Elm_Map_Data *sd EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
 
@@ -3941,12 +3940,11 @@ _key_action_move(Evas_Object *obj, const char *params)
    Evas_Coord x, y;
    Evas_Coord step_x, step_y, page_x, page_y;
 
-   eo_do(obj,
-         elm_interface_scrollable_content_pos_get(&x, &y),
-         elm_interface_scrollable_step_size_get(&step_x, &step_y),
-         elm_interface_scrollable_page_size_get(&page_x, &page_y),
-         elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, NULL, &vh));
+   elm_interface_scrollable_content_pos_get(obj, &x, &y);
+   elm_interface_scrollable_step_size_get(obj, &step_x, &step_y);
+   elm_interface_scrollable_page_size_get(obj, &page_x, &page_y);
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, NULL, &vh);
 
    if (!strcmp(dir, "left"))
      {
@@ -3980,7 +3978,7 @@ _key_action_move(Evas_Object *obj, const char *params)
      }
    else return EINA_FALSE;
 
-   eo_do(obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+   elm_interface_scrollable_content_pos_set(obj, x, y, EINA_TRUE);
    return EINA_TRUE;
 }
 
@@ -4031,7 +4029,7 @@ _elm_map_evas_object_smart_add(Eo *obj, Elm_Map_Data *priv)
    edje = edje_object_add(evas_object_evas_get(obj));
    elm_widget_resize_object_set(obj, edje, EINA_TRUE);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
 
    elm_widget_theme_object_set
      (obj, edje, "map", "base", elm_widget_style_get(obj));
@@ -4054,20 +4052,16 @@ _elm_map_evas_object_smart_add(Eo *obj, Elm_Map_Data *priv)
    evas_object_event_callback_add
      (obj, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel_cb, obj);
 
-   eo_do(obj,
-         elm_interface_scrollable_objects_set(edje, priv->hit_rect),
-         elm_interface_scrollable_wheel_disabled_set(EINA_TRUE),
-         elm_interface_scrollable_bounce_allow_set(
-            _elm_config->thumbscroll_bounce_enable,
-            _elm_config->thumbscroll_bounce_enable));
+   elm_interface_scrollable_objects_set(obj, edje, priv->hit_rect);
+   elm_interface_scrollable_wheel_disabled_set(obj, EINA_TRUE);
+   elm_interface_scrollable_bounce_allow_set(obj, _elm_config->thumbscroll_bounce_enable, _elm_config->thumbscroll_bounce_enable);
 
    evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                   _changed_size_hints_cb, obj);
 
-   eo_do(obj,
-         elm_interface_scrollable_animate_start_cb_set(_scroll_animate_start_cb),
-         elm_interface_scrollable_animate_stop_cb_set(_scroll_animate_stop_cb),
-         elm_interface_scrollable_scroll_cb_set(_scroll_cb));
+   elm_interface_scrollable_animate_start_cb_set(obj, _scroll_animate_start_cb);
+   elm_interface_scrollable_animate_stop_cb_set(obj, _scroll_animate_stop_cb);
+   elm_interface_scrollable_scroll_cb_set(obj, _scroll_cb);
 
    priv->pan_obj = eo_add(MY_PAN_CLASS, evas_object_evas_get(obj));
    pan_data = eo_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
@@ -4075,7 +4069,7 @@ _elm_map_evas_object_smart_add(Eo *obj, Elm_Map_Data *priv)
    pan_data->wobj = obj;
    pan_data->wsd = priv;
 
-   eo_do(obj, elm_interface_scrollable_extern_pan_set(priv->pan_obj));
+   elm_interface_scrollable_extern_pan_set(obj, priv->pan_obj);
 
    edje_object_size_min_calc(edje, &minw, &minh);
    evas_object_size_hint_min_set(obj, minw, minh);
@@ -4188,13 +4182,13 @@ _elm_map_evas_object_smart_del(Eo *obj, Elm_Map_Data *sd)
    evas_object_del(sd->pan_obj);
    sd->pan_obj = NULL;
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_map_evas_object_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
+   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -4202,7 +4196,7 @@ _elm_map_evas_object_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Co
 EOLIAN static void
 _elm_map_evas_object_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
 }
@@ -4210,7 +4204,7 @@ _elm_map_evas_object_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_
 EOLIAN static void
 _elm_map_evas_object_smart_member_add(Eo *obj, Elm_Map_Data *sd, Evas_Object *member)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
+   evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -4227,13 +4221,12 @@ elm_map_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_map_eo_base_constructor(Eo *obj, Elm_Map_Data *sd)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
 
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE_MAP));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP);
 
    return obj;
 }
@@ -4568,8 +4561,8 @@ _elm_map_route_add(Eo *obj, Elm_Map_Data *sd, Elm_Map_Route_Type type, Elm_Map_R
    free(url);
 
    sd->routes = eina_list_append(sd->routes, route);
-   eo_do(sd->obj, eo_event_callback_call
-     (ELM_MAP_EVENT_ROUTE_LOAD, route));
+   eo_event_callback_call
+     (sd->obj, ELM_MAP_EVENT_ROUTE_LOAD, route);
    edje_object_signal_emit(wd->resize_obj,
                            "elm,state,busy,start", "elm");
    ret = route;
@@ -4737,8 +4730,8 @@ elm_map_overlay_del(Elm_Map_Overlay *overlay)
    EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
    ELM_MAP_CHECK((overlay->wsd)->obj);
 
-   eo_do((overlay->wsd)->obj, eo_event_callback_call
-     (ELM_MAP_EVENT_OVERLAY_DEL, overlay));
+   eo_event_callback_call
+     ((overlay->wsd)->obj, ELM_MAP_EVENT_OVERLAY_DEL, overlay);
    if (overlay->del_cb)
      overlay->del_cb
        (overlay->del_cb_data, (overlay->wsd)->obj, overlay);
diff --git a/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c
index 3d7ef6a7d..b06dd3f2d 100644
--- a/src/lib/elm_mapbuf.c
+++ b/src/lib/elm_mapbuf.c
@@ -35,7 +35,7 @@ EOLIAN static Eina_Bool
 _elm_mapbuf_elm_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _sizing_eval(obj);
@@ -74,7 +74,7 @@ EOLIAN static Eina_Bool
 _elm_mapbuf_elm_widget_sub_object_del(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Object *sobj)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(sobj));
+   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if (sobj == sd->content)
@@ -154,7 +154,7 @@ _mapbuf_auto_smooth(Evas_Object *obj EINA_UNUSED, Elm_Mapbuf_Data *sd)
 EOLIAN static void
 _elm_mapbuf_evas_object_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
+   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
 
    _mapbuf_auto_eval(obj, sd);
    _mapbuf_auto_smooth(obj, sd);
@@ -164,7 +164,7 @@ _elm_mapbuf_evas_object_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, E
 EOLIAN static void
 _elm_mapbuf_evas_object_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
 
    if (sd->content) evas_object_resize(sd->content, w, h);
    _mapbuf_auto_eval(obj, sd);
@@ -174,7 +174,7 @@ _elm_mapbuf_evas_object_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w,
 EOLIAN static void
 _elm_mapbuf_evas_object_smart_show(Eo *obj, Elm_Mapbuf_Data *sd)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
+   evas_obj_smart_show(eo_super(obj, MY_CLASS));
 
    _mapbuf_auto_eval(obj, sd);
    _configure(obj);
@@ -183,7 +183,7 @@ _elm_mapbuf_evas_object_smart_show(Eo *obj, Elm_Mapbuf_Data *sd)
 EOLIAN static void
 _elm_mapbuf_evas_object_smart_hide(Eo *obj, Elm_Mapbuf_Data *sd)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
+   evas_obj_smart_hide(eo_super(obj, MY_CLASS));
 
    _mapbuf_auto_eval(obj, sd);
    _configure(obj);
@@ -247,7 +247,7 @@ _elm_mapbuf_evas_object_smart_del(Eo *obj, Elm_Mapbuf_Data *priv)
    ELM_SAFE_FREE(priv->idler, ecore_idler_del);
    ELM_SAFE_FREE(priv->map, evas_map_free);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
@@ -258,7 +258,7 @@ _elm_mapbuf_evas_object_smart_add(Eo *obj, Elm_Mapbuf_Data *priv)
 
    elm_widget_resize_object_set(obj, rect, EINA_TRUE);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    evas_object_static_clip_set(rect, EINA_TRUE);
@@ -293,10 +293,9 @@ elm_mapbuf_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_mapbuf_eo_base_constructor(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE_MAP));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP);
 
    return obj;
 }
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index 3b6e22a6f..77f0b7b2c 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -37,7 +37,7 @@ _elm_menu_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd)
    Eina_List *l;
 
    EINA_LIST_FOREACH(sd->items, l, it)
-     eo_do (EO_OBJ(it), elm_wdg_item_translate());
+     elm_wdg_item_translate(EO_OBJ(it));
 
    return EINA_TRUE;
 }
@@ -230,7 +230,7 @@ _elm_menu_elm_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd)
    const char *s;
    char style[1024];
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    if (sd->menu_bar)
@@ -281,7 +281,7 @@ _elm_menu_elm_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd)
                     elm_menu_item_icon_name_set(eo_item,
                                                 item->icon_str);
                }
-             eo_do(eo_item, elm_wdg_item_disable());
+             elm_wdg_item_disable(eo_item);
              /* SEOZ
              edje_object_scale_set
                (VIEW(item), elm_widget_scale_get(obj) *
@@ -426,9 +426,9 @@ static Eina_Bool
 _hover_dismissed_cb(void *data, const Eo_Event *event)
 {
    _menu_hide(data, event->obj, event->event_info);
-   eo_do(data, eo_event_callback_call
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
-   eo_do(data, eo_event_callback_call(ELM_MENU_EVENT_DISMISSED, NULL));
+   eo_event_callback_call
+     (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
+   eo_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL);
 
    return EINA_TRUE;
 }
@@ -489,7 +489,7 @@ _menu_item_activate_cb(void *data,
              if (eo_item2 != EO_OBJ(item))
                elm_menu_item_selected_set(eo_item2, 0);
           }
-        eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(EO_OBJ(item->parent), ELM_INTERFACE_ATSPI_SELECTION_EVENT_SELECTION_CHANGED, NULL));
+        elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, EO_OBJ(item->parent), ELM_INTERFACE_ATSPI_SELECTION_EVENT_SELECTION_CHANGED, NULL);
      }
    else
      {
@@ -499,7 +499,7 @@ _menu_item_activate_cb(void *data,
              if (eo_item2 != EO_OBJ(item))
                elm_menu_item_selected_set(eo_item2, 0);
           }
-        eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(WIDGET(item), ELM_INTERFACE_ATSPI_SELECTION_EVENT_SELECTION_CHANGED, NULL));
+        elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, WIDGET(item), ELM_INTERFACE_ATSPI_SELECTION_EVENT_SELECTION_CHANGED, NULL);
      }
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(item), ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
@@ -530,7 +530,7 @@ _block_menu(void *_sd, const Eo_Event *event EINA_UNUSED)
      {
         Eina_Bool tmp;
         ELM_MENU_ITEM_DATA_GET(eo_current, current);
-        if (!current->blocked) current->was_enabled = !eo_do_ret(eo_current, tmp, elm_wdg_item_disabled_get());
+        if (!current->blocked) current->was_enabled = !elm_wdg_item_disabled_get(eo_current);
         current->blocked = EINA_TRUE;
         elm_object_item_disabled_set(eo_current, EINA_TRUE);
      }
@@ -565,7 +565,7 @@ static void
 _item_obj_create(Elm_Menu_Item_Data *item)
 {
    VIEW(item) = elm_layout_add(WIDGET(item));
-   eo_do(VIEW(item), elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_SKIPPED));
+   elm_interface_atspi_accessible_type_set(VIEW(item), ELM_ATSPI_TYPE_SKIPPED);
    evas_object_size_hint_weight_set
      (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -589,7 +589,7 @@ static void
 _item_separator_obj_create(Elm_Menu_Item_Data *item)
 {
    VIEW(item) = elm_layout_add(WIDGET(item));
-   eo_do(VIEW(item), elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_SKIPPED));
+   elm_interface_atspi_accessible_type_set(VIEW(item), ELM_ATSPI_TYPE_SKIPPED);
    evas_object_size_hint_weight_set
      (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -612,9 +612,9 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item)
    char style[1024];
 
    item->submenu.location = elm_icon_add(sd->bx);
-   eo_do(item->submenu.location, elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_DISABLED));
+   elm_interface_atspi_accessible_type_set(item->submenu.location, ELM_ATSPI_TYPE_DISABLED);
    item->submenu.hv = hv = elm_hover_add(sd->bx);
-   eo_do(item->submenu.hv, elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_SKIPPED));
+   elm_interface_atspi_accessible_type_set(item->submenu.hv, ELM_ATSPI_TYPE_SKIPPED);
    elm_widget_mirrored_set(hv, EINA_FALSE);
    elm_hover_target_set(hv, item->submenu.location);
    elm_hover_parent_set(hv, sd->parent);
@@ -623,8 +623,8 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item)
      {
         snprintf(style, sizeof(style), "main_menu_submenu/%s", elm_widget_style_get(WIDGET(item)));
         elm_object_style_set(hv, style);
-        eo_do(hv, eo_event_callback_add
-          (ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, WIDGET(item)));
+        eo_event_callback_add
+          (hv, ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, WIDGET(item));
      }
    else
      {
@@ -674,24 +674,24 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item)
 EOLIAN static void
 _elm_menu_evas_object_smart_add(Eo *obj, Elm_Menu_Data *priv)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
    priv->location = elm_icon_add(obj);
-   eo_do(priv->location, elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_DISABLED));
+   elm_interface_atspi_accessible_type_set(priv->location, ELM_ATSPI_TYPE_DISABLED);
 
    priv->hv = elm_hover_add(obj);
-   eo_do(priv->hv, elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_SKIPPED));
+   elm_interface_atspi_accessible_type_set(priv->hv, ELM_ATSPI_TYPE_SKIPPED);
    elm_widget_mirrored_set(priv->hv, EINA_FALSE);
 
    elm_object_style_set(priv->hv, "menu/default");
-   eo_do(priv->hv, eo_event_callback_add
-     (ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, obj));
+   eo_event_callback_add
+     (priv->hv, ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, obj);
 
    priv->bx = elm_box_add(obj);
-   eo_do(priv->bx, elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_SKIPPED));
+   elm_interface_atspi_accessible_type_set(priv->bx, ELM_ATSPI_TYPE_SKIPPED);
    elm_widget_mirrored_set(priv->bx, EINA_FALSE);
    evas_object_size_hint_weight_set
      (priv->bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -721,7 +721,7 @@ _elm_menu_evas_object_smart_del(Eo *obj, Elm_Menu_Data *sd)
    evas_object_del(sd->hv);
    evas_object_del(sd->location);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 void
@@ -762,23 +762,20 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar)
 
         if (menu_bar)
           {
-             eo_do(item->submenu.hv, eo_event_callback_add
-               (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
-                _hover_dismissed_cb, WIDGET(item)));
+             eo_event_callback_add
+               (item->submenu.hv, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
              snprintf(style, sizeof(style), "main_menu_submenu//%s", elm_widget_style_get(obj));
              elm_object_style_set(item->submenu.hv, style);
           }
         else
           {
-             eo_do(item->submenu.hv, eo_event_callback_del(
-               EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
-               _hover_dismissed_cb, WIDGET(item)));
+             eo_event_callback_del(item->submenu.hv, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
              snprintf(style, sizeof(style), "submenu/%s", elm_widget_style_get(obj));
              elm_object_style_set(item->submenu.hv, style);
           }
      }
 
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 }
 
 EAPI Evas_Object *
@@ -794,12 +791,11 @@ _elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd)
 {
    Eo *parent = NULL;
 
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         parent = eo_parent_get(),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_MENU));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   parent = eo_parent_get(obj);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_MENU);
 
    elm_menu_parent_set(obj, parent);
    elm_hover_target_set(sd->hv, sd->location);
@@ -808,10 +804,10 @@ _elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd)
        (sd->hv, ELM_HOVER_AXIS_VERTICAL), sd->bx);
 
    _sizing_eval(obj);
-   eo_do(obj, eo_event_callback_add
-     (ELM_MENU_EVENT_ELM_ACTION_BLOCK_MENU, _block_menu, sd));
-   eo_do(obj, eo_event_callback_add
-     (ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, _unblock_menu, sd));
+   eo_event_callback_add
+     (obj, ELM_MENU_EVENT_ELM_ACTION_BLOCK_MENU, _block_menu, sd);
+   eo_event_callback_add
+     (obj, ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, _unblock_menu, sd);
 
    return obj;
 }
@@ -822,9 +818,9 @@ _elm_menu_eo_base_destructor(Eo *obj, Elm_Menu_Data *sd)
    Eina_List *itr, *itr2;
    Elm_Object_Item *eo_item;
    EINA_LIST_FOREACH_SAFE(sd->items, itr, itr2, eo_item)
-     eo_do(eo_item, elm_wdg_item_del());
+     elm_wdg_item_del(eo_item);
 
-   eo_do_super(obj, MY_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, MY_CLASS));
 }
 
 EAPI void
@@ -832,7 +828,7 @@ elm_menu_parent_set(Evas_Object *obj,
                     Evas_Object *parent)
 {
    ELM_MENU_CHECK(obj);
-   eo_do(obj, elm_obj_widget_parent_set(parent));
+   elm_obj_widget_parent_set(obj, parent);
 }
 
 EOLIAN static void
@@ -883,7 +879,7 @@ elm_menu_parent_get(const Evas_Object *obj)
 {
    ELM_MENU_CHECK(obj) NULL;
    Evas_Object *ret = NULL;
-   eo_do( obj, ret = elm_obj_widget_parent_get());
+   ret = elm_obj_widget_parent_get(obj);
    return ret;
 }
 
@@ -934,8 +930,8 @@ _item_clone(Evas_Object *obj,
                                   WIDGET_ITEM_DATA_GET(EO_OBJ(item)));
 
    Eina_Bool disabled;
-   eo_do(eo_item, disabled = elm_wdg_item_disabled_get());
-   eo_do(new_item, elm_wdg_item_disabled_set(disabled));
+   disabled = elm_wdg_item_disabled_get(eo_item);
+   elm_wdg_item_disabled_set(new_item, disabled);
 
    EINA_LIST_FOREACH(item->submenu.items, iter, subitem)
      _item_clone(obj, new_item, subitem);
@@ -1003,13 +999,13 @@ _elm_menu_item_eo_base_destructor(Eo *eo_item, Elm_Menu_Item_Data *item)
    if (sd->dbus_menu)
      _elm_dbus_menu_item_delete(sd->dbus_menu, item->dbus_idx);
 
-   eo_do_super(eo_item, ELM_MENU_ITEM_CLASS, eo_destructor());
+   eo_destructor(eo_super(eo_item, ELM_MENU_ITEM_CLASS));
 }
 
 EOLIAN static Eo *
 _elm_menu_item_eo_base_constructor(Eo *eo_item, Elm_Menu_Item_Data *item)
 {
-   eo_item = eo_do_super_ret(eo_item, ELM_MENU_ITEM_CLASS, eo_item, eo_constructor());
+   eo_item = eo_constructor(eo_super(eo_item, ELM_MENU_ITEM_CLASS));
    item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    return eo_item;
@@ -1022,7 +1018,7 @@ _elm_menu_item_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *parent, const ch
    Evas_Object *icon_obj;
 
    icon_obj = elm_icon_add(obj);
-   eo_do(icon_obj, elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_DISABLED));
+   elm_interface_atspi_accessible_type_set(icon_obj, ELM_ATSPI_TYPE_DISABLED);
    if (!icon_obj) return NULL;
 
    eo_item = eo_add(ELM_MENU_ITEM_CLASS, obj);
@@ -1167,7 +1163,7 @@ _elm_menu_item_subitems_clear(Eo *eo_item EINA_UNUSED, Elm_Menu_Item_Data *it)
 
    EINA_LIST_FOREACH_SAFE(it->submenu.items,
                           l, l_next, sub_it)
-     eo_do(sub_it, elm_wdg_item_del());
+     elm_wdg_item_del(sub_it);
 }
 
 EOLIAN static const Eina_List*
@@ -1288,7 +1284,7 @@ EOLIAN static Eina_List*
 _elm_menu_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Menu_Data *sd)
 {
    Eina_List *ret;
-   eo_do_super(obj, ELM_MENU_CLASS, ret = elm_interface_atspi_accessible_children_get());
+   ret = elm_interface_atspi_accessible_children_get(eo_super(obj, ELM_MENU_CLASS));
    return eina_list_merge(eina_list_clone(sd->items), ret);
 }
 
@@ -1314,7 +1310,7 @@ EOLIAN static char*
 _elm_menu_item_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Menu_Item_Data *sd)
 {
    char *ret;
-   eo_do_super(obj, ELM_MENU_ITEM_CLASS, ret = elm_interface_atspi_accessible_name_get());
+   ret = elm_interface_atspi_accessible_name_get(eo_super(obj, ELM_MENU_ITEM_CLASS));
    if (ret) return ret;
    return sd->label ? strdup(sd->label) : NULL;
 }
@@ -1323,7 +1319,7 @@ EOLIAN static Elm_Atspi_State_Set
 _elm_menu_item_elm_interface_atspi_accessible_state_set_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd)
 {
    Elm_Atspi_State_Set ret;
-   eo_do_super(obj, ELM_MENU_ITEM_CLASS, ret = elm_interface_atspi_accessible_state_set_get());
+   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_MENU_ITEM_CLASS));
 
    STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTABLE);
 
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 021ab6d19..6c4c3ad99 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -138,7 +138,7 @@ EOLIAN static Eina_Bool
 _elm_notify_elm_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -204,7 +204,7 @@ EOLIAN static Eina_Bool
 _elm_notify_elm_widget_sub_object_del(Eo *obj, Elm_Notify_Data *sd, Evas_Object *sobj)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(sobj));
+   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if (sobj == sd->content)
@@ -224,13 +224,13 @@ _block_area_clicked_cb(void *data,
                        const char *emission EINA_UNUSED,
                        const char *source EINA_UNUSED)
 {
-   eo_do(data, eo_event_callback_call(ELM_NOTIFY_EVENT_BLOCK_CLICKED, NULL));
+   eo_event_callback_call(data, ELM_NOTIFY_EVENT_BLOCK_CLICKED, NULL);
 }
 
 EOLIAN static void
 _elm_notify_evas_object_smart_resize(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
 
    _calc(obj);
 }
@@ -238,7 +238,7 @@ _elm_notify_evas_object_smart_resize(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, E
 EOLIAN static void
 _elm_notify_evas_object_smart_move(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
+   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
 
    _calc(obj);
 }
@@ -254,7 +254,7 @@ _timer_cb(void *data)
    if (!evas_object_visible_get(obj)) goto end;
 
    evas_object_hide(obj);
-   eo_do(obj, eo_event_callback_call(ELM_NOTIFY_EVENT_TIMEOUT, NULL));
+   eo_event_callback_call(obj, ELM_NOTIFY_EVENT_TIMEOUT, NULL);
 
 end:
    return ECORE_CALLBACK_CANCEL;
@@ -276,7 +276,7 @@ _elm_notify_evas_object_smart_show(Eo *obj, Elm_Notify_Data *sd)
 {
    sd->had_hidden = EINA_FALSE;
    sd->in_timeout = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
+   evas_obj_smart_show(eo_super(obj, MY_CLASS));
 
    evas_object_show(sd->notify);
    if (!sd->allow_events) evas_object_show(sd->block_events);
@@ -300,7 +300,7 @@ _elm_notify_evas_object_smart_hide(Eo *obj, Elm_Notify_Data *sd)
      }
    else //for backport supporting: edc without emitting hide finished signal
      {
-        eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
+        evas_obj_smart_hide(eo_super(obj, MY_CLASS));
         evas_object_hide(sd->notify);
         if (sd->allow_events) evas_object_hide(sd->block_events);
      }
@@ -419,14 +419,14 @@ _hide_finished_cb(void *data,
    sd->had_hidden = EINA_TRUE;
    evas_object_hide(sd->notify);
    if (!sd->allow_events) evas_object_hide(sd->block_events);
-   eo_do_super(data, MY_CLASS, evas_obj_smart_hide());
-   eo_do(data, eo_event_callback_call(ELM_NOTIFY_EVENT_DISMISSED, NULL));
+   evas_obj_smart_hide(eo_super(data, MY_CLASS));
+   eo_event_callback_call(data, ELM_NOTIFY_EVENT_DISMISSED, NULL);
 }
 
 EOLIAN static void
 _elm_notify_evas_object_smart_add(Eo *obj, Elm_Notify_Data *priv)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->allow_events = EINA_TRUE;
@@ -451,7 +451,7 @@ _elm_notify_evas_object_smart_del(Eo *obj, Elm_Notify_Data *sd)
    ecore_timer_del(sd->timer);
 
    ELM_SAFE_FREE(sd->notify, evas_object_del);
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -465,10 +465,9 @@ elm_notify_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_notify_eo_base_constructor(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_NOTIFICATION));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION);
 
    return obj;
 }
@@ -478,7 +477,7 @@ elm_notify_parent_set(Evas_Object *obj,
                       Evas_Object *parent)
 {
    ELM_NOTIFY_CHECK(obj);
-   eo_do(obj, elm_obj_widget_parent_set(parent));
+   elm_obj_widget_parent_set(obj, parent);
 }
 
 EOLIAN static void
@@ -524,7 +523,7 @@ elm_notify_parent_get(const Evas_Object *obj)
 {
    ELM_NOTIFY_CHECK(obj) NULL;
    Evas_Object *ret = NULL;
-   eo_do((Eo *) obj, ret = elm_obj_widget_parent_get());
+   ret = elm_obj_widget_parent_get((Eo *) obj);
    return ret;
 }
 
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 46777924c..ba2aa5914 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -212,7 +212,7 @@ _elm_panel_elm_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd)
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -247,7 +247,7 @@ _elm_panel_elm_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd)
 
         if (edje_object_part_exists
             (wd->resize_obj, "elm.swallow.event"))
-          eo_do_super(obj, MY_CLASS, elm_obj_container_content_set("elm.swallow.event", sd->event));
+          elm_obj_container_content_set(eo_super(obj, MY_CLASS), "elm.swallow.event", sd->event);
      }
 
    elm_layout_sizing_eval(obj);
@@ -330,20 +330,20 @@ _handler_open(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
    switch (sd->orient)
      {
       case ELM_PANEL_ORIENT_TOP:
-         eo_do(obj, elm_interface_scrollable_region_bring_in
-               (0, (h * sd->content_size_ratio) - sd->handler_size, w, h));
+         elm_interface_scrollable_region_bring_in
+               (obj, 0, (h * sd->content_size_ratio) - sd->handler_size, w, h);
          break;
       case ELM_PANEL_ORIENT_BOTTOM:
-         eo_do(obj, elm_interface_scrollable_region_bring_in
-               (0, sd->handler_size, w, h));
+         elm_interface_scrollable_region_bring_in
+               (obj, 0, sd->handler_size, w, h);
          break;
       case ELM_PANEL_ORIENT_LEFT:
-         eo_do(obj, elm_interface_scrollable_region_bring_in
-               ((w * sd->content_size_ratio) - sd->handler_size, 0, w, h));
+         elm_interface_scrollable_region_bring_in
+               (obj, (w * sd->content_size_ratio) - sd->handler_size, 0, w, h);
          break;
       case ELM_PANEL_ORIENT_RIGHT:
-         eo_do(obj, elm_interface_scrollable_region_bring_in
-               (sd->handler_size, 0, w, h));
+         elm_interface_scrollable_region_bring_in
+               (obj, sd->handler_size, 0, w, h);
          break;
      }
 }
@@ -356,8 +356,8 @@ _drawer_open(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
 
    if (sd->freeze)
      {
-        eo_do(obj, elm_interface_scrollable_movement_block_set
-              (ELM_SCROLLER_MOVEMENT_NO_BLOCK));
+        elm_interface_scrollable_movement_block_set
+              (obj, ELM_SCROLLER_MOVEMENT_NO_BLOCK);
         sd->freeze = EINA_FALSE;
         elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
      }
@@ -382,11 +382,11 @@ _drawer_open(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
      }
 
    if (anim)
-     eo_do(obj, elm_interface_scrollable_region_bring_in
-           (x, y, w, h));
+     elm_interface_scrollable_region_bring_in
+           (obj, x, y, w, h);
    else
-     eo_do(obj, elm_interface_scrollable_content_region_show
-           (x, y, w, h));
+     elm_interface_scrollable_content_region_show
+           (obj, x, y, w, h);
 }
 
 static void
@@ -422,24 +422,24 @@ _drawer_close(Evas_Object *obj, Evas_Coord w, Evas_Coord h, Eina_Bool anim)
      {
         if (sd->freeze)
           {
-             eo_do(obj, elm_interface_scrollable_movement_block_set
-                   (ELM_SCROLLER_MOVEMENT_NO_BLOCK));
+             elm_interface_scrollable_movement_block_set
+                   (obj, ELM_SCROLLER_MOVEMENT_NO_BLOCK);
              sd->freeze = EINA_FALSE;
              elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
           }
-        eo_do(obj, elm_interface_scrollable_region_bring_in(x, y, w, h));
+        elm_interface_scrollable_region_bring_in(obj, x, y, w, h);
      }
    else
      {
-        eo_do(obj, elm_interface_scrollable_content_region_show(x, y, w, h));
+        elm_interface_scrollable_content_region_show(obj, x, y, w, h);
         if (!sd->freeze)
           {
              if (horizontal)
-               eo_do(obj, elm_interface_scrollable_movement_block_set
-                     (ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL));
+               elm_interface_scrollable_movement_block_set
+                     (obj, ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL);
              else
-               eo_do(obj, elm_interface_scrollable_movement_block_set
-                     (ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL));
+               elm_interface_scrollable_movement_block_set
+                     (obj, ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL);
              sd->freeze = EINA_TRUE;
              elm_layout_signal_emit(sd->scr_ly, "elm,state,content,hidden", "elm");
           }
@@ -509,7 +509,7 @@ _state_sync(Evas_Object *obj)
      {
       case ELM_PANEL_ORIENT_TOP:
          panel_size = h * sd->content_size_ratio;
-         eo_do(obj, elm_interface_scrollable_content_pos_get(NULL, &pos));
+         elm_interface_scrollable_content_pos_get(obj, NULL, &pos);
 
          if (pos == 0) open = EINA_TRUE;
          else if (pos == panel_size) open = EINA_FALSE;
@@ -518,7 +518,7 @@ _state_sync(Evas_Object *obj)
 
       case ELM_PANEL_ORIENT_BOTTOM:
          panel_size = h * sd->content_size_ratio;
-         eo_do(obj, elm_interface_scrollable_content_pos_get(NULL, &pos));
+         elm_interface_scrollable_content_pos_get(obj, NULL, &pos);
 
          if (pos == panel_size) open = EINA_TRUE;
          else if (pos == 0) open = EINA_FALSE;
@@ -527,7 +527,7 @@ _state_sync(Evas_Object *obj)
 
       case ELM_PANEL_ORIENT_LEFT:
          panel_size = w * sd->content_size_ratio;
-         eo_do(obj, elm_interface_scrollable_content_pos_get(&pos, NULL));
+         elm_interface_scrollable_content_pos_get(obj, &pos, NULL);
          horizontal = EINA_TRUE;
 
          if (!elm_widget_mirrored_get(obj))
@@ -546,7 +546,7 @@ _state_sync(Evas_Object *obj)
 
       case ELM_PANEL_ORIENT_RIGHT:
          panel_size = w * sd->content_size_ratio;
-         eo_do(obj, elm_interface_scrollable_content_pos_get(&pos, NULL));
+         elm_interface_scrollable_content_pos_get(obj, &pos, NULL);
          horizontal = EINA_TRUE;
 
          if (!elm_widget_mirrored_get(obj))
@@ -567,8 +567,8 @@ _state_sync(Evas_Object *obj)
    if (open)
      {
         if (sd->hidden) sd->hidden = EINA_FALSE;
-        eo_do(obj, elm_interface_scrollable_single_direction_set
-              (ELM_SCROLLER_SINGLE_DIRECTION_HARD));
+        elm_interface_scrollable_single_direction_set
+              (obj, ELM_SCROLLER_SINGLE_DIRECTION_HARD);
 
         //focus & access
         elm_object_tree_focus_allow_set(obj, EINA_TRUE);
@@ -586,16 +586,16 @@ _state_sync(Evas_Object *obj)
         if (!sd->hidden) sd->hidden = EINA_TRUE;
 
         if (horizontal)
-          eo_do(obj, elm_interface_scrollable_movement_block_set
-                (ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL));
+          elm_interface_scrollable_movement_block_set
+                (obj, ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL);
         else
-          eo_do(obj, elm_interface_scrollable_movement_block_set
-                (ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL));
+          elm_interface_scrollable_movement_block_set
+                (obj, ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL);
         sd->freeze = EINA_TRUE;
         elm_layout_signal_emit(sd->scr_ly, "elm,state,content,hidden", "elm");
 
-        eo_do(obj, elm_interface_scrollable_single_direction_set
-              (ELM_SCROLLER_SINGLE_DIRECTION_NONE));
+        elm_interface_scrollable_single_direction_set
+              (obj, ELM_SCROLLER_SINGLE_DIRECTION_NONE);
 
         //focus & access
         elm_object_tree_focus_allow_set(obj, EINA_FALSE);
@@ -620,8 +620,8 @@ _timer_cb(void *data)
 
    if (sd->freeze)
      {
-        eo_do(obj, elm_interface_scrollable_movement_block_set
-              (ELM_SCROLLER_MOVEMENT_NO_BLOCK));
+        elm_interface_scrollable_movement_block_set
+              (obj, ELM_SCROLLER_MOVEMENT_NO_BLOCK);
         sd->freeze = EINA_FALSE;
         elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
         evas_object_geometry_get(obj, NULL, NULL, &w, &h);
@@ -728,7 +728,7 @@ _on_mouse_move(void *data,
       case ELM_PANEL_ORIENT_TOP:
          if (sd->timer && ((cur_y - sd->down_y) > finger_size))
            {
-              eo_do(obj, elm_interface_scrollable_freeze_set(EINA_FALSE));
+              elm_interface_scrollable_freeze_set(obj, EINA_FALSE);
               sd->freeze = EINA_FALSE;
               elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
            }
@@ -736,7 +736,7 @@ _on_mouse_move(void *data,
       case ELM_PANEL_ORIENT_BOTTOM:
          if (sd->timer && ((sd->down_y - cur_y) > finger_size))
            {
-              eo_do(obj, elm_interface_scrollable_freeze_set(EINA_FALSE));
+              elm_interface_scrollable_freeze_set(obj, EINA_FALSE);
               sd->freeze = EINA_FALSE;
               elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
            }
@@ -745,7 +745,7 @@ _on_mouse_move(void *data,
          if ((!is_mirrored && (sd->timer) && ((cur_x - sd->down_x) > finger_size)) ||
               ((is_mirrored) && (sd->timer) && ((sd->down_x - cur_x) > finger_size)))
            {
-              eo_do(obj, elm_interface_scrollable_freeze_set(EINA_FALSE));
+              elm_interface_scrollable_freeze_set(obj, EINA_FALSE);
               sd->freeze = EINA_FALSE;
               elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
            }
@@ -754,7 +754,7 @@ _on_mouse_move(void *data,
          if ((is_mirrored && (sd->timer) && ((cur_x - sd->down_x) > finger_size)) ||
               (!is_mirrored && (sd->timer) && ((sd->down_x - cur_x) > finger_size)))
            {
-              eo_do(obj, elm_interface_scrollable_freeze_set(EINA_FALSE));
+              elm_interface_scrollable_freeze_set(obj, EINA_FALSE);
               sd->freeze = EINA_FALSE;
               elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
            }
@@ -786,7 +786,7 @@ _on_mouse_up(void *data,
       case ELM_PANEL_ORIENT_TOP:
          panel_size = h * sd->content_size_ratio;
          threshold = panel_size / 4;
-         eo_do(obj, elm_interface_scrollable_content_pos_get(NULL, &pos));
+         elm_interface_scrollable_content_pos_get(obj, NULL, &pos);
 
          if (sd->hidden)
            {
@@ -803,7 +803,7 @@ _on_mouse_up(void *data,
       case ELM_PANEL_ORIENT_BOTTOM:
          panel_size = h * sd->content_size_ratio;
          threshold = panel_size / 4;
-         eo_do(obj, elm_interface_scrollable_content_pos_get(NULL, &pos));
+         elm_interface_scrollable_content_pos_get(obj, NULL, &pos);
 
          if (sd->hidden)
            {
@@ -820,7 +820,7 @@ _on_mouse_up(void *data,
       case ELM_PANEL_ORIENT_LEFT:
          panel_size = w * sd->content_size_ratio;
          threshold = panel_size / 4;
-         eo_do(obj, elm_interface_scrollable_content_pos_get(&pos, NULL));
+         elm_interface_scrollable_content_pos_get(obj, &pos, NULL);
 
          if (elm_widget_mirrored_get(obj))
            {
@@ -853,7 +853,7 @@ _on_mouse_up(void *data,
       case ELM_PANEL_ORIENT_RIGHT:
          panel_size = w * sd->content_size_ratio;
          threshold = panel_size / 4;
-         eo_do(obj, elm_interface_scrollable_content_pos_get(&pos, NULL));
+         elm_interface_scrollable_content_pos_get(obj, &pos, NULL);
 
          if (!elm_widget_mirrored_get(obj))
            {
@@ -923,8 +923,7 @@ _elm_panel_elm_container_content_set(Eo *obj, Elm_Panel_Data *sd, const char *pa
         if (strcmp(part, "default"))
           {
              Eina_Bool int_ret = EINA_TRUE;
-             eo_do_super(obj, MY_CLASS,
-                         int_ret = elm_obj_container_content_set(part, content));
+             int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
              return int_ret;
           }
      }
@@ -960,7 +959,7 @@ _elm_panel_elm_container_content_get(Eo *obj, Elm_Panel_Data *sd, const char *pa
         if (strcmp(part, "default"))
           {
              Evas_Object *ret = NULL;
-             eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_get(part));
+             ret = elm_obj_container_content_get(eo_super(obj, MY_CLASS), part);
              return ret;
           }
      }
@@ -983,8 +982,7 @@ _elm_panel_elm_container_content_unset(Eo *obj, Elm_Panel_Data *sd, const char *
           }
         if (strcmp(part, "default"))
           {
-             eo_do_super(obj, MY_CLASS,
-                         ret = elm_obj_container_content_unset(part));
+             ret = elm_obj_container_content_unset(eo_super(obj, MY_CLASS), part);
              return ret;
           }
      }
@@ -1005,13 +1003,13 @@ _elm_panel_evas_object_smart_add(Eo *obj, Elm_Panel_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
    priv->panel_edje = wd->resize_obj;
 
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 
    priv->bx = evas_object_box_add(evas_object_evas_get(obj));
    evas_object_box_layout_set(priv->bx, _box_layout_cb, priv, NULL);
@@ -1041,7 +1039,7 @@ _elm_panel_evas_object_smart_add(Eo *obj, Elm_Panel_Data *priv)
 
              elm_coords_finger_size_adjust(1, &minw, 1, &minh);
              evas_object_size_hint_min_set(priv->event, minw, minh);
-             eo_do_super(obj, MY_CLASS, elm_obj_container_content_set("elm.swallow.event", priv->event));
+             elm_obj_container_content_set(eo_super(obj, MY_CLASS), "elm.swallow.event", priv->event);
           }
      }
 
@@ -1072,13 +1070,13 @@ _elm_panel_evas_object_smart_del(Eo *obj, Elm_Panel_Data *sd)
           }
      }
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_panel_evas_object_smart_move(Eo *obj, Elm_Panel_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
+   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -1103,7 +1101,7 @@ _elm_panel_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
 EOLIAN static void
 _elm_panel_evas_object_smart_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
 
    if (!sd->scrollable) return;
 
@@ -1127,14 +1125,13 @@ _elm_panel_evas_object_smart_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord w, E
          break;
      }
 
-   eo_do(obj,
-         eo_event_callback_add(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj));
+   eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj);
 }
 
 EOLIAN static void
 _elm_panel_evas_object_smart_member_add(Eo *obj, Elm_Panel_Data *sd, Evas_Object *member)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
+   evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect) evas_object_raise(sd->hit_rect);
 }
@@ -1174,11 +1171,10 @@ elm_panel_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_panel_eo_base_constructor(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PANEL));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL);
 
    return obj;
 }
@@ -1238,7 +1234,7 @@ _elm_panel_elm_widget_on_focus_region(Eo *obj,
                                       Evas_Coord *w,
                                       Evas_Coord *h)
 {
-   eo_do(obj, elm_interface_scrollable_content_pos_get(x, y));
+   elm_interface_scrollable_content_pos_get(obj, x, y);
    evas_object_geometry_get(obj, NULL, NULL, w, h);
    switch (sd->orient)
      {
@@ -1273,13 +1269,13 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
    // freeze_set(FALSE) -> mouse_up -> freeze_set(TRUE) -> scroll
    if (sd->freeze)
      {
-        eo_do(obj, elm_interface_scrollable_movement_block_set
-              (ELM_SCROLLER_MOVEMENT_NO_BLOCK));
+        elm_interface_scrollable_movement_block_set
+              (obj, ELM_SCROLLER_MOVEMENT_NO_BLOCK);
         sd->freeze = EINA_FALSE;
         elm_layout_signal_emit(sd->scr_ly, "elm,state,content,visible", "elm");
      }
 
-   eo_do(obj, elm_interface_scrollable_content_pos_get(&x, &y));
+   elm_interface_scrollable_content_pos_get(obj, &x, &y);
    evas_object_geometry_get(obj, NULL, NULL, &w, &h);
 
    switch (sd->orient)
@@ -1317,15 +1313,15 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
           }
         break;
      }
-   eo_do(obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, (void *) &event));
+   eo_event_callback_call
+     (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, (void *) &event);
 }
 
 EOLIAN static Eina_Bool
 _elm_panel_elm_widget_disable(Eo *obj, Elm_Panel_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_disable());
+   int_ret = elm_obj_widget_disable(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    if (sd->scrollable)
@@ -1382,8 +1378,7 @@ _elm_panel_scrollable_content_size_set(Eo *obj, Elm_Panel_Data *sd, double ratio
          break;
      }
 
-   eo_do(obj,
-         eo_event_callback_add(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj));
+   eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj);
 }
 
 EOLIAN static Eina_Bool
@@ -1434,10 +1429,9 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable)
              evas_object_show(sd->hit_rect);
              evas_object_repeat_events_set(sd->hit_rect, EINA_TRUE);
 
-             eo_do(obj,
-                   elm_interface_scrollable_objects_set(sd->scr_edje, sd->hit_rect),
-                   elm_interface_scrollable_animate_stop_cb_set(_anim_stop_cb),
-                   elm_interface_scrollable_scroll_cb_set(_scroll_cb));
+             elm_interface_scrollable_objects_set(obj, sd->scr_edje, sd->hit_rect);
+             elm_interface_scrollable_animate_stop_cb_set(obj, _anim_stop_cb);
+             elm_interface_scrollable_scroll_cb_set(obj, _scroll_cb);
           }
 
         if (!sd->scr_ly)
@@ -1458,8 +1452,7 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable)
              elm_layout_content_set(sd->scr_ly, "event_area", sd->scr_event);
           }
 
-        eo_do(obj,
-              elm_interface_scrollable_content_set(sd->scr_ly));
+        elm_interface_scrollable_content_set(obj, sd->scr_ly);
         sd->freeze = EINA_TRUE;
         elm_layout_content_set(sd->scr_ly, "elm.swallow.content", sd->bx);
         if (sd->content) elm_widget_sub_object_add(sd->scr_ly, sd->content);
@@ -1468,18 +1461,18 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable)
           {
            case ELM_PANEL_ORIENT_TOP:
            case ELM_PANEL_ORIENT_BOTTOM:
-              eo_do(obj, elm_interface_scrollable_movement_block_set
-                    (ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL));
+              elm_interface_scrollable_movement_block_set
+                    (obj, ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL);
               break;
            case ELM_PANEL_ORIENT_LEFT:
            case ELM_PANEL_ORIENT_RIGHT:
-              eo_do(obj, elm_interface_scrollable_movement_block_set
-                    (ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL));
+              elm_interface_scrollable_movement_block_set
+                    (obj, ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL);
               break;
           }
 
-        eo_do(obj, elm_interface_scrollable_single_direction_set
-              (ELM_SCROLLER_SINGLE_DIRECTION_NONE));
+        elm_interface_scrollable_single_direction_set
+              (obj, ELM_SCROLLER_SINGLE_DIRECTION_NONE);
 
         if (!elm_widget_disabled_get(obj))
           {
@@ -1496,7 +1489,7 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable)
      }
    else
      {
-        eo_do(obj, elm_interface_scrollable_content_set(NULL));
+        elm_interface_scrollable_content_set(obj, NULL);
 
         evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_DOWN, _on_mouse_down);
         evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move);
diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index 87dd4a7ab..2e249e067 100644
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -60,7 +60,7 @@ _elm_panes_elm_widget_theme_apply(Eo *obj, Elm_Panes_Data *sd)
    elm_coords_finger_size_adjust(1, &minw, 1, &minh);
    evas_object_size_hint_min_set(sd->event, minw, minh);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    size = elm_panes_content_left_size_get(obj);
@@ -139,7 +139,7 @@ _on_clicked(void *data,
             const char *emission EINA_UNUSED,
             const char *source EINA_UNUSED)
 {
-   eo_do(data, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+   eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
 }
 
 static void
@@ -159,7 +159,7 @@ _on_pressed(void *data,
             const char *emission EINA_UNUSED,
             const char *source EINA_UNUSED)
 {
-   eo_do(data, eo_event_callback_call(ELM_PANES_EVENT_PRESS, NULL));
+   eo_event_callback_call(data, ELM_PANES_EVENT_PRESS, NULL);
 }
 
 static void
@@ -169,11 +169,11 @@ _on_unpressed(void *data,
               const char *source EINA_UNUSED)
 {
    ELM_PANES_DATA_GET(data, sd);
-   eo_do(data, eo_event_callback_call(ELM_PANES_EVENT_UNPRESS, NULL));
+   eo_event_callback_call(data, ELM_PANES_EVENT_UNPRESS, NULL);
 
    if (sd->double_clicked)
      {
-        eo_do(data, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL));
+        eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL);
         sd->double_clicked = EINA_FALSE;
      }
 }
@@ -265,7 +265,7 @@ _elm_panes_evas_object_smart_add(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
    ELM_PANES_DATA_GET(obj, sd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set
@@ -328,11 +328,10 @@ elm_panes_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_panes_eo_base_constructor(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SPLIT_PANE));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPLIT_PANE);
 
    return obj;
 }
@@ -421,7 +420,7 @@ EOLIAN static void
 _elm_panes_horizontal_set(Eo *obj, Elm_Panes_Data *sd, Eina_Bool horizontal)
 {
    sd->horizontal = horizontal;
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
    _update_fixed_sides(obj);
 
    elm_panes_content_left_size_set(obj, 0.5);
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index 60fce2e6c..3223e1491 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -53,7 +53,7 @@ _elm_photo_elm_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd)
    Eina_Bool int_ret = EINA_FALSE;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    edje_object_mirrored_set
@@ -109,7 +109,7 @@ _drag_done_cb(void *unused EINA_UNUSED,
    ELM_PHOTO_DATA_GET(obj, sd);
 
    elm_object_scroll_freeze_pop(obj);
-   eo_do(obj, eo_event_callback_call(EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_END, NULL));
+   eo_event_callback_call(obj, EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_END, NULL);
    sd->drag_started = EINA_FALSE;
 }
 
@@ -171,8 +171,8 @@ _long_press_cb(void *obj)
                   _drag_done_cb, NULL))
           {
              elm_object_scroll_freeze_push(obj);
-             eo_do(obj, eo_event_callback_call
-               (EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START, NULL));
+             eo_event_callback_call
+               (obj, EVAS_DRAGGABLE_INTERFACE_EVENT_DRAG_START, NULL);
              sd->drag_started = EINA_TRUE;
           }
      }
@@ -214,7 +214,7 @@ _mouse_up(void *data,
    ELM_SAFE_FREE(sd->long_press_timer, ecore_timer_del);
 
    if (!sd->drag_started)
-     eo_do(data, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+     eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
 }
 
 static void
@@ -245,7 +245,7 @@ _elm_photo_evas_object_smart_add(Eo *obj, Elm_Photo_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
@@ -265,8 +265,8 @@ _elm_photo_evas_object_smart_add(Eo *obj, Elm_Photo_Data *priv)
    evas_object_event_callback_add
      (priv->icon, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, obj);
 
-   eo_do(priv->icon, eo_event_callback_add
-     (ELM_ICON_EVENT_THUMB_DONE, _on_thumb_done, obj));
+   eo_event_callback_add
+     (priv->icon, ELM_ICON_EVENT_THUMB_DONE, _on_thumb_done, obj);
 
    _elm_photo_internal_image_follow(obj);
 
@@ -289,7 +289,7 @@ _elm_photo_evas_object_smart_del(Eo *obj, Elm_Photo_Data *sd)
 {
    ecore_timer_del(sd->long_press_timer);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -303,11 +303,10 @@ elm_photo_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_photo_eo_base_constructor(Eo *obj, Elm_Photo_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
 
    return obj;
 }
@@ -403,7 +402,7 @@ EAPI Eina_Bool
 elm_photo_file_set(Eo *obj, const char *file)
 {
    Eina_Bool ret;
-   return eo_do_ret((Eo *) obj, ret, efl_file_set(file, NULL));
+   return efl_file_set((Eo *) obj, file, NULL);
 }
 
 #include "elm_photo.eo.c"
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index 8c4b38b2c..1a8dda545 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -137,7 +137,7 @@ _calc_job_cb(void *data)
         sd->minw = minw;
         sd->minh = minh;
 
-        eo_do(sd->pan_obj, eo_event_callback_call(ELM_PAN_EVENT_CHANGED, NULL));
+        eo_event_callback_call(sd->pan_obj, ELM_PAN_EVENT_CHANGED, NULL);
         _sizing_eval(obj);
      }
    sd->calc_job = NULL;
@@ -192,8 +192,8 @@ _image_place(Evas_Object *obj,
    if (sd->show.show)
      {
         sd->show.show = EINA_FALSE;
-        eo_do(obj, elm_interface_scrollable_content_region_show
-              (sd->show.x, sd->show.y, sd->show.w, sd->show.h));
+        elm_interface_scrollable_content_region_show
+              (obj, sd->show.x, sd->show.y, sd->show.w, sd->show.h);
      }
 }
 
@@ -258,8 +258,8 @@ _grid_load(Evas_Object *obj,
                        edje_object_signal_emit
                          (wd->resize_obj,
                          "elm,state,busy,start", "elm");
-                       eo_do(obj, eo_event_callback_call
-                        (ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL));
+                       eo_event_callback_call
+                        (obj, ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL);
                     }
                }
              else if ((g->grid[tn].want) && (!visible))
@@ -270,8 +270,8 @@ _grid_load(Evas_Object *obj,
                        edje_object_signal_emit
                          (wd->resize_obj,
                          "elm,state,busy,stop", "elm");
-                       eo_do(obj, eo_event_callback_call
-                        (ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL));
+                       eo_event_callback_call
+                        (obj, ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL);
                     }
                   g->grid[tn].want = 0;
                   evas_object_hide(g->grid[tn].img);
@@ -417,7 +417,7 @@ EOLIAN static void
 _elm_photocam_pan_eo_base_destructor(Eo *obj, Elm_Photocam_Pan_Data *psd)
 {
    eo_data_unref(psd->wobj, psd->wsd);
-   eo_do_super(obj, MY_PAN_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, MY_PAN_CLASS));
 }
 
 static void
@@ -468,8 +468,8 @@ _grid_clear(Evas_Object *obj,
                        edje_object_signal_emit
                          (wd->resize_obj,
                          "elm,state,busy,stop", "elm");
-                       eo_do(obj, eo_event_callback_call
-                         (ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL));
+                       eo_event_callback_call
+                         (obj, ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL);
                     }
                }
           }
@@ -501,8 +501,8 @@ _tile_preloaded_cb(void *data,
              edje_object_signal_emit
                (wd->resize_obj, "elm,state,busy,stop",
                "elm");
-             eo_do(wd->obj, eo_event_callback_call
-               (ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL));
+             eo_event_callback_call
+               (wd->obj, ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL);
           }
      }
 }
@@ -698,14 +698,14 @@ _main_img_preloaded_cb(void *data,
      }
    ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job_cb, data);
-   eo_do(data, eo_event_callback_call(ELM_PHOTOCAM_EVENT_LOADED, NULL));
+   eo_event_callback_call(data, ELM_PHOTOCAM_EVENT_LOADED, NULL);
    sd->preload_num--;
    if (!sd->preload_num)
      {
         edje_object_signal_emit
           (wd->resize_obj, "elm,state,busy,stop", "elm");
-        eo_do(obj, eo_event_callback_call
-          (ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL));
+        eo_event_callback_call
+          (obj, ELM_PHOTOCAM_EVENT_LOADED_DETAIL, NULL);
      }
 }
 
@@ -719,8 +719,8 @@ _zoom_do(Evas_Object *obj,
 
    sd->size.w = (sd->size.ow * (1.0 - t)) + (sd->size.nw * t);
    sd->size.h = (sd->size.oh * (1.0 - t)) + (sd->size.nh * t);
-   eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &ow, &oh));
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, &ow, &oh);
    xx = (sd->size.spos.x * sd->size.w) - (ow / 2);
    yy = (sd->size.spos.y * sd->size.h) - (oh / 2);
    if (xx < 0) xx = 0;
@@ -786,9 +786,8 @@ _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
      {
         sd->no_smooth--;
         if (!sd->no_smooth) _smooth_update(data);
-        eo_do(obj,
-              eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj));
-        eo_do(obj, eo_event_callback_call(EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL));
+        eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
+        eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL);
      }
 
    return EO_CALLBACK_CONTINUE;
@@ -801,8 +800,8 @@ _long_press_cb(void *data)
 
    sd->long_timer = NULL;
    sd->longpressed = EINA_TRUE;
-   eo_do(data, eo_event_callback_call
-     (EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, NULL));
+   eo_event_callback_call
+     (data, EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, NULL);
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -821,10 +820,10 @@ _mouse_down_cb(void *data,
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->on_hold = EINA_TRUE;
    else sd->on_hold = EINA_FALSE;
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     eo_do(data, eo_event_callback_call
-       (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL));
+     eo_event_callback_call
+       (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL);
    else
-     eo_do(data, eo_event_callback_call(ELM_PHOTOCAM_EVENT_PRESS, NULL));
+     eo_event_callback_call(data, ELM_PHOTOCAM_EVENT_PRESS, NULL);
    sd->longpressed = EINA_FALSE;
    ecore_timer_del(sd->long_timer);
    sd->long_timer = ecore_timer_add
@@ -846,8 +845,8 @@ _mouse_up_cb(void *data,
    else sd->on_hold = EINA_FALSE;
    ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
    if (!sd->on_hold)
-     eo_do(data, eo_event_callback_call
-       (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+     eo_event_callback_call
+       (data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
    sd->on_hold = EINA_FALSE;
 }
 
@@ -857,7 +856,7 @@ _elm_photocam_elm_widget_on_focus(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED, E
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus(NULL));
+   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj))
@@ -880,7 +879,7 @@ EOLIAN static Eina_Bool
 _elm_photocam_elm_widget_theme_apply(Eo *obj, Elm_Photocam_Data *sd EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _sizing_eval(obj);
@@ -892,32 +891,32 @@ static void
 _scroll_animate_start_cb(Evas_Object *obj,
                          void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL));
+   eo_event_callback_call
+     (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL);
 }
 
 static void
 _scroll_animate_stop_cb(Evas_Object *obj,
                         void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL));
+   eo_event_callback_call
+     (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL));
+   eo_event_callback_call
+     (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL));
+   eo_event_callback_call
+     (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL);
 }
 
 static void
@@ -935,8 +934,8 @@ _scroll_cb(Evas_Object *obj,
    ecore_timer_del(sd->scr_timer);
    sd->scr_timer = ecore_timer_add(0.5, _scroll_timeout_cb, obj);
 
-   eo_do(obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL));
+   eo_event_callback_call
+     (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL);
 }
 
 static Eina_Bool
@@ -952,12 +951,11 @@ _key_action_move(Evas_Object *obj, const char *params)
    Evas_Coord page_x = 0;
    Evas_Coord page_y = 0;
 
-   eo_do(obj,
-         elm_interface_scrollable_content_pos_get(&x, &y),
-         elm_interface_scrollable_step_size_get(&step_x, &step_y),
-         elm_interface_scrollable_page_size_get(&page_x, &page_y),
-         elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, NULL, &v_h));
+   elm_interface_scrollable_content_pos_get(obj, &x, &y);
+   elm_interface_scrollable_step_size_get(obj, &step_x, &step_y);
+   elm_interface_scrollable_page_size_get(obj, &page_x, &page_y);
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, NULL, &v_h);
 
    if (!strcmp(dir, "left"))
      {
@@ -991,7 +989,7 @@ _key_action_move(Evas_Object *obj, const char *params)
      }
    else return EINA_FALSE;
 
-   eo_do(obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+   elm_interface_scrollable_content_pos_set(obj, x, y, EINA_TRUE);
    return EINA_TRUE;
 }
 
@@ -1079,10 +1077,9 @@ _bounce_eval(void *data, const Eo_Event *event EINA_UNUSED)
    sd->g_layer_zoom.imy = 0;
    sd->zoom_g_layer = EINA_FALSE;
 
-   eo_do(obj, elm_interface_scrollable_freeze_set(EINA_FALSE));
+   elm_interface_scrollable_freeze_set(obj, EINA_FALSE);
 
-   eo_do(obj,
-         eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj));
+   eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
    return EO_CALLBACK_CONTINUE;
 }
 
@@ -1091,8 +1088,7 @@ _elm_photocam_bounce_reset(Eo *obj, Elm_Photocam_Data *sd EINA_UNUSED)
 {
    Eina_Bool r;
 
-   eo_do(obj,
-         r = eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj));
+   r = eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
    if (r) _zoom_do(obj, 1.0);
 }
 
@@ -1101,14 +1097,13 @@ _elm_photocam_zoom_reset(Eo *obj, Elm_Photocam_Data *sd)
 {
    Eina_Bool r;
 
-   eo_do(obj,
-         r = eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj));
+   r = eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
    if (r)
      {
         sd->no_smooth--;
         if (!sd->no_smooth) _smooth_update(obj);
         _zoom_do(obj, 1.0);
-        eo_do(obj, eo_event_callback_call(EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL));
+        eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL);
      }
 }
 
@@ -1127,9 +1122,9 @@ _g_layer_zoom_do(Evas_Object *obj,
    sd->zoom = sd->g_layer_start / g_layer->zoom;
    sd->size.ow = sd->size.w;
    sd->size.oh = sd->size.h;
-   eo_do(obj, elm_interface_scrollable_content_pos_get(&rx, &ry));
-   eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &rw, &rh));
+   elm_interface_scrollable_content_pos_get(obj, &rx, &ry);
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, &rw, &rh);
    if ((rw <= 0) || (rh <= 0)) return;
 
    sd->size.nw = (double)sd->size.imw / sd->zoom;
@@ -1188,11 +1183,11 @@ _g_layer_zoom_start_cb(void *data,
    _elm_photocam_bounce_reset(obj, sd);
    sd->zoom_g_layer = EINA_TRUE;
 
-   eo_do(obj, elm_interface_scrollable_freeze_set(EINA_TRUE));
+   elm_interface_scrollable_freeze_set(obj, EINA_TRUE);
 
    elm_photocam_image_region_get(obj, &x, &y, &w, &h);
-   eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &rw, &rh));
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, &rw, &rh);
 
    if (rw > sd->size.nw)
      marginx = (rw - sd->size.nw) / 2;
@@ -1229,8 +1224,8 @@ _g_layer_zoom_end_cb(void *data,
    ELM_PHOTOCAM_DATA_GET(obj, sd);
    Evas_Coord rw, rh;
 
-   eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &rw, &rh));
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, &rw, &rh);
    sd->g_layer_start = 1.0;
 
    if (sd->g_layer_zoom.imx || sd->g_layer_zoom.imy)
@@ -1307,12 +1302,11 @@ _g_layer_zoom_end_cb(void *data,
         sd->g_layer_zoom.bounce.t_end = t +
           _elm_config->page_scroll_friction;
 
-        eo_do(obj,
-              eo_event_callback_add(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj));
+        eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
      }
    else
      {
-        eo_do(obj, elm_interface_scrollable_freeze_set(EINA_FALSE));
+        elm_interface_scrollable_freeze_set(obj, EINA_FALSE);
         sd->zoom_g_layer = EINA_FALSE;
      }
 
@@ -1394,7 +1388,7 @@ _elm_photocam_evas_object_smart_add(Eo *obj, Elm_Photocam_Data *priv)
    edje = edje_object_add(evas_object_evas_get(obj));
    elm_widget_resize_object_set(obj, edje, EINA_TRUE);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
 
    elm_widget_theme_object_set
       (obj, edje, "photocam", "base", elm_widget_style_get(obj));
@@ -1410,16 +1404,15 @@ _elm_photocam_evas_object_smart_add(Eo *obj, Elm_Photocam_Data *priv)
 
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
-   eo_do(obj, elm_interface_scrollable_objects_set(edje, priv->hit_rect));
+   elm_interface_scrollable_objects_set(obj, edje, priv->hit_rect);
 
-   eo_do(obj,
-         elm_interface_scrollable_animate_start_cb_set(_scroll_animate_start_cb),
-         elm_interface_scrollable_animate_stop_cb_set(_scroll_animate_stop_cb),
-         elm_interface_scrollable_drag_start_cb_set(_scroll_drag_start_cb),
-         elm_interface_scrollable_drag_stop_cb_set(_scroll_drag_stop_cb),
-         elm_interface_scrollable_scroll_cb_set(_scroll_cb));
+   elm_interface_scrollable_animate_start_cb_set(obj, _scroll_animate_start_cb);
+   elm_interface_scrollable_animate_stop_cb_set(obj, _scroll_animate_stop_cb);
+   elm_interface_scrollable_drag_start_cb_set(obj, _scroll_drag_start_cb);
+   elm_interface_scrollable_drag_stop_cb_set(obj, _scroll_drag_stop_cb);
+   elm_interface_scrollable_scroll_cb_set(obj, _scroll_cb);
 
-   eo_do(obj, elm_interface_scrollable_bounce_allow_set(bounce, bounce));
+   elm_interface_scrollable_bounce_allow_set(obj, bounce, bounce);
 
    priv->pan_obj = eo_add(MY_PAN_CLASS, evas_object_evas_get(obj));
    pan_data = eo_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
@@ -1427,7 +1420,7 @@ _elm_photocam_evas_object_smart_add(Eo *obj, Elm_Photocam_Data *priv)
    pan_data->wobj = obj;
    pan_data->wsd = priv;
 
-   eo_do(obj, elm_interface_scrollable_extern_pan_set(priv->pan_obj));
+   elm_interface_scrollable_extern_pan_set(obj, priv->pan_obj);
 
    priv->g_layer_start = 1.0;
    priv->zoom = 1;
@@ -1477,17 +1470,16 @@ _elm_photocam_evas_object_smart_del(Eo *obj, Elm_Photocam_Data *sd)
    ecore_job_del(sd->calc_job);
    ecore_timer_del(sd->scr_timer);
    ecore_timer_del(sd->long_timer);
-   eo_do(obj,
-         eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj),
-         eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj));
+   eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
+   eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_photocam_evas_object_smart_move(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
+   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -1495,7 +1487,7 @@ _elm_photocam_evas_object_smart_move(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord
 EOLIAN static void
 _elm_photocam_evas_object_smart_resize(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
 }
@@ -1504,7 +1496,7 @@ EOLIAN static void
 _elm_photocam_evas_object_smart_member_add(Eo *obj, Elm_Photocam_Data *sd, Evas_Object *member)
 {
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
+   evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -1521,11 +1513,10 @@ elm_photocam_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_photocam_eo_base_constructor(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
 
    return obj;
 }
@@ -1577,13 +1568,13 @@ _internal_file_set(Eo *obj, Elm_Photocam_Data *sd, const char *file, Eina_File *
    sd->main_load_pending = EINA_TRUE;
 
    sd->calc_job = ecore_job_add(_calc_job_cb, obj);
-   eo_do(obj, eo_event_callback_call(ELM_PHOTOCAM_EVENT_LOAD, NULL));
+   eo_event_callback_call(obj, ELM_PHOTOCAM_EVENT_LOAD, NULL);
    sd->preload_num++;
    if (sd->preload_num == 1)
      {
         edje_object_signal_emit
           (wd->resize_obj, "elm,state,busy,start", "elm");
-        eo_do(obj, eo_event_callback_call(ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL));
+        eo_event_callback_call(obj, ELM_PHOTOCAM_EVENT_LOAD_DETAIL, NULL);
      }
 
    tz = sd->zoom;
@@ -1619,13 +1610,13 @@ _elm_photocam_download_done(void *data, Elm_Url *url EINA_UNUSED, Eina_Binbuf *d
 
         free(sd->remote_data);
         sd->remote_data = NULL;
-        eo_do(obj, eo_event_callback_call
-          (ELM_PHOTOCAM_EVENT_DOWNLOAD_ERROR, &err));
+        eo_event_callback_call
+          (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_ERROR, &err);
      }
    else
      {
-        eo_do(obj, eo_event_callback_call
-          (ELM_PHOTOCAM_EVENT_DOWNLOAD_DONE, NULL));
+        eo_event_callback_call
+          (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_DONE, NULL);
      }
 
    sd->remote = NULL;
@@ -1638,7 +1629,7 @@ _elm_photocam_download_cancel(void *data, Elm_Url *url EINA_UNUSED, int error)
    Elm_Photocam_Data *sd = eo_data_scope_get(obj, MY_CLASS);
    Elm_Photocam_Error err = { error, EINA_FALSE };
 
-   eo_do(obj, eo_event_callback_call(ELM_PHOTOCAM_EVENT_DOWNLOAD_ERROR, &err));
+   eo_event_callback_call(obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_ERROR, &err);
 
    sd->remote = NULL;
 }
@@ -1651,8 +1642,8 @@ _elm_photocam_download_progress(void *data, Elm_Url *url EINA_UNUSED, double now
 
    progress.now = now;
    progress.total = total;
-   eo_do(obj, eo_event_callback_call
-     (ELM_PHOTOCAM_EVENT_DOWNLOAD_PROGRESS, &progress));
+   eo_event_callback_call
+     (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_PROGRESS, &progress);
 }
 
 static const char *remote_uri[] = {
@@ -1692,8 +1683,8 @@ _elm_photocam_file_set_internal(Eo *obj, Elm_Photocam_Data *sd, const char *file
                                         obj);
           if (sd->remote)
             {
-               eo_do(obj, eo_event_callback_call
-                 (ELM_PHOTOCAM_EVENT_DOWNLOAD_START, NULL));
+               eo_event_callback_call
+                 (obj, ELM_PHOTOCAM_EVENT_DOWNLOAD_START, NULL);
                return ret;
             }
           break;
@@ -1729,7 +1720,7 @@ elm_photocam_file_set(Elm_Photocam *obj, const char *file)
 
    ELM_PHOTOCAM_CHECK(obj) EVAS_LOAD_ERROR_NONE;
    EINA_SAFETY_ON_NULL_RETURN_VAL(file, EVAS_LOAD_ERROR_NONE);
-   if (eo_do_ret(obj, ret, efl_file_set(file, NULL))) return EVAS_LOAD_ERROR_NONE;
+   if (efl_file_set(obj, file, NULL)) return EVAS_LOAD_ERROR_NONE;
 
    Eina_Error err = eina_error_get();
    return err == PHOTO_FILE_LOAD_ERROR_DOES_NOT_EXIST ?
@@ -1756,7 +1747,7 @@ EAPI const char*
 elm_photocam_file_get(const Elm_Photocam *obj)
 {
    const char *ret = NULL;
-   eo_do(obj, efl_file_get(&ret, NULL));
+   efl_file_get(obj, &ret, NULL);
    return ret;
 }
 
@@ -1776,9 +1767,9 @@ _elm_photocam_zoom_set(Eo *obj, Elm_Photocam_Data *sd, double zoom)
    sd->zoom = zoom;
    sd->size.ow = sd->size.w;
    sd->size.oh = sd->size.h;
-   eo_do(obj, elm_interface_scrollable_content_pos_get(&rx, &ry));
-   eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &rw, &rh));
+   elm_interface_scrollable_content_pos_get(obj, &rx, &ry);
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, &rw, &rh);
    if ((rw <= 0) || (rh <= 0)) return;
 
    if (sd->mode == ELM_PHOTOCAM_ZOOM_MODE_MANUAL)
@@ -1950,9 +1941,8 @@ done:
      }
    else
      {
-        eo_do(obj,
-              an = eo_event_callback_del(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj),
-              eo_event_callback_add(EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj));
+        an = eo_event_callback_del(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
+        eo_event_callback_add(obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
         if (!an)
           {
              sd->no_smooth++;
@@ -1978,12 +1968,12 @@ done:
    if (!sd->paused)
      {
         if (started)
-          eo_do(obj, eo_event_callback_call(EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_START, NULL));
+          eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_START, NULL);
         if (!an)
-          eo_do(obj, eo_event_callback_call(EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL));
+          eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL);
      }
    if (zoom_changed)
-     eo_do(obj, eo_event_callback_call(EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_CHANGE, NULL));
+     eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_CHANGE, NULL);
 }
 
 EOLIAN static double
@@ -2022,9 +2012,9 @@ _elm_photocam_image_region_get(Eo *obj, Elm_Photocam_Data *sd, int *x, int *y, i
 {
    Evas_Coord sx, sy, sw, sh;
 
-   eo_do((Eo *)obj, elm_interface_scrollable_content_pos_get(&sx, &sy));
-   eo_do((Eo *)obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &sw, &sh));
+   elm_interface_scrollable_content_pos_get((Eo *)obj, &sx, &sy);
+   elm_interface_scrollable_content_viewport_geometry_get
+         ((Eo *)obj, NULL, NULL, &sw, &sh);
    if (sd->size.w > 0)
      {
         if (x)
@@ -2086,7 +2076,7 @@ _elm_photocam_image_region_show(Eo *obj, Elm_Photocam_Data *sd, int x, int y, in
    _elm_photocam_bounce_reset(obj, sd);
    _elm_photocam_zoom_reset(obj, sd);
 
-   eo_do(obj, elm_interface_scrollable_content_region_show(rx, ry, rw, rh));
+   elm_interface_scrollable_content_region_show(obj, rx, ry, rw, rh);
 }
 
 EAPI void
@@ -2097,7 +2087,7 @@ elm_photocam_image_region_bring_in(Evas_Object *obj,
                                    int h EINA_UNUSED)
 {
    ELM_PHOTOCAM_CHECK(obj);
-   eo_do(obj, elm_interface_scrollable_region_bring_in(x, y, w, h));
+   elm_interface_scrollable_region_bring_in(obj, x, y, w, h);
 }
 
 EOLIAN static void
@@ -2118,7 +2108,7 @@ _elm_photocam_elm_interface_scrollable_region_bring_in(Eo *obj, Elm_Photocam_Dat
    _elm_photocam_bounce_reset(obj, sd);
    _elm_photocam_zoom_reset(obj, sd);
 
-   eo_do_super(obj, MY_CLASS, elm_interface_scrollable_region_bring_in(rx, ry, rw, rh));
+   elm_interface_scrollable_region_bring_in(eo_super(obj, MY_CLASS), rx, ry, rw, rh);
 }
 
 EOLIAN static void
@@ -2153,7 +2143,7 @@ elm_photocam_bounce_set(Evas_Object *obj,
 {
    ELM_PHOTOCAM_CHECK(obj);
 
-   eo_do(obj, elm_interface_scrollable_bounce_allow_set(h_bounce, v_bounce));
+   elm_interface_scrollable_bounce_allow_set(obj, h_bounce, v_bounce);
 }
 
 EAPI void
@@ -2163,7 +2153,7 @@ elm_photocam_bounce_get(const Evas_Object *obj,
 {
    ELM_PHOTOCAM_CHECK(obj);
 
-   eo_do((Eo *)obj, elm_interface_scrollable_bounce_allow_get(h_bounce, v_bounce));
+   elm_interface_scrollable_bounce_allow_get((Eo *)obj, h_bounce, v_bounce);
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_plug.c b/src/lib/elm_plug.c
index 3b132f239..a567d6350 100644
--- a/src/lib/elm_plug.c
+++ b/src/lib/elm_plug.c
@@ -42,7 +42,7 @@ _elm_plug_disconnected(Ecore_Evas *ee)
 {
    Evas_Object *plug = ecore_evas_data_get(ee, PLUG_KEY);
    EINA_SAFETY_ON_NULL_RETURN(plug);
-   eo_do(plug, eo_event_callback_call(ELM_PLUG_EVENT_IMAGE_DELETED, NULL));
+   eo_event_callback_call(plug, ELM_PLUG_EVENT_IMAGE_DELETED, NULL);
    /* TODO: was a typo. Deprecated, remove in future releases: */
    evas_object_smart_callback_call(plug, "image.deleted", NULL);
 }
@@ -55,7 +55,7 @@ _elm_plug_resized(Ecore_Evas *ee)
    EINA_SAFETY_ON_NULL_RETURN(plug);
 
    ecore_evas_geometry_get(ee, NULL, NULL, &(size.w), &(size.h));
-   eo_do(plug, eo_event_callback_call(ELM_PLUG_EVENT_IMAGE_RESIZED, &size));
+   eo_event_callback_call(plug, ELM_PLUG_EVENT_IMAGE_RESIZED, &size);
 }
 
 EOLIAN static Eina_Bool
@@ -65,7 +65,7 @@ _elm_plug_elm_widget_on_focus(Eo *obj, void *sd EINA_UNUSED, Elm_Object_Item *it
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus(NULL));
+   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (elm_widget_focus_get(obj))
@@ -84,7 +84,7 @@ EOLIAN static Eina_Bool
 _elm_plug_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _sizing_eval(obj);
@@ -103,7 +103,7 @@ _on_mouse_up(void *data,
    if (ev->button != 1) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
-   eo_do(data, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+   eo_event_callback_call(data, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
 }
 
 EOLIAN static void
@@ -113,7 +113,7 @@ _elm_plug_evas_object_smart_add(Eo *obj, void *sd EINA_UNUSED)
    Ecore_Evas *ee;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
@@ -143,11 +143,10 @@ elm_plug_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_plug_eo_base_constructor(Eo *obj, void *sd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
 
    return obj;
 }
diff --git a/src/lib/elm_prefs.c b/src/lib/elm_prefs.c
index 068678ad5..508c7b8d3 100644
--- a/src/lib/elm_prefs.c
+++ b/src/lib/elm_prefs.c
@@ -48,7 +48,7 @@ static Eina_Bool _prefs_item_widget_value_from_self(Elm_Prefs_Item_Node *,
 EOLIAN static void
 _elm_prefs_evas_object_smart_add(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 }
 
@@ -136,8 +136,8 @@ _elm_prefs_save(void *data)
      {
         elm_prefs_data_save(sd->prefs_data, NULL, NULL);
 
-        eo_do(wd->obj, eo_event_callback_call
-          (ELM_PREFS_EVENT_PAGE_SAVED, (char *)sd->root->name));
+        eo_event_callback_call
+          (wd->obj, ELM_PREFS_EVENT_PAGE_SAVED, (char *)sd->root->name);
      }
 
    sd->dirty = EINA_FALSE;
@@ -300,8 +300,8 @@ _elm_prefs_item_changed_report(Eo *obj,
 
    snprintf(buf, sizeof(buf), "%s:%s", it->page->name, it->name);
 
-   eo_do(wd->obj, eo_event_callback_call
-     (ELM_PREFS_EVENT_ITEM_CHANGED, buf));
+   eo_event_callback_call
+     (wd->obj, ELM_PREFS_EVENT_ITEM_CHANGED, buf);
 }
 
 static Elm_Prefs_Item_Node *
@@ -400,8 +400,8 @@ _prefs_data_autosaved_cb(void *cb_data,
    ELM_PREFS_DATA_GET(cb_data, sd);
    ELM_WIDGET_DATA_GET_OR_RETURN(cb_data, wd);
 
-   eo_do(wd->obj, eo_event_callback_call
-     (ELM_PREFS_EVENT_PAGE_SAVED, event_info));
+   eo_event_callback_call
+     (wd->obj, ELM_PREFS_EVENT_PAGE_SAVED, event_info);
 
    sd->dirty = EINA_FALSE;
 }
@@ -469,7 +469,7 @@ _elm_prefs_evas_object_smart_del(Eo *obj, Elm_Prefs_Data *sd)
    eina_stringshare_del(sd->file);
    eina_stringshare_del(sd->page);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static Eina_Bool
@@ -515,11 +515,10 @@ elm_prefs_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_prefs_eo_base_constructor(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_elm_prefs_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_REDUNDANT_OBJECT));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _elm_prefs_smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_REDUNDANT_OBJECT);
 
    return obj;
 }
@@ -556,8 +555,8 @@ _item_changed_cb(Evas_Object *it_obj)
    /* we use the changed cb on ACTION/RESET/SAVE items specially */
    if (it->type == ELM_PREFS_TYPE_ACTION)
      {
-        eo_do(wd->obj, eo_event_callback_call
-          (ELM_PREFS_EVENT_ACTION, buf));
+        eo_event_callback_call
+          (wd->obj, ELM_PREFS_EVENT_ACTION, buf);
 
         return;
      }
@@ -1175,8 +1174,8 @@ _elm_prefs_efl_file_file_set(Eo *obj, Elm_Prefs_Data *sd, const char *file, cons
 
    _elm_prefs_values_get_default(sd->root, EINA_FALSE);
 
-   eo_do(obj, eo_event_callback_call
-     (ELM_PREFS_EVENT_PAGE_LOADED, (char *)sd->root->name));
+   eo_event_callback_call
+     (obj, ELM_PREFS_EVENT_PAGE_LOADED, (char *)sd->root->name);
 
    return EINA_TRUE;
 }
@@ -1220,8 +1219,8 @@ _elm_prefs_data_set(Eo *obj, Elm_Prefs_Data *sd, Elm_Prefs_Data *prefs_data)
    sd->values_fetching = EINA_FALSE;
 
 end:
-   eo_do(obj, eo_event_callback_call
-     (ELM_PREFS_EVENT_PAGE_CHANGED, (char *)sd->root->name));
+   eo_event_callback_call
+     (obj, ELM_PREFS_EVENT_PAGE_CHANGED, (char *)sd->root->name);
 
    return EINA_TRUE;
 }
@@ -1879,13 +1878,13 @@ EAPI Eina_Bool
 elm_prefs_file_set(Eo *obj, const char *file, const char *page)
 {
    Eina_Bool ret;
-   return eo_do_ret((Eo *) obj, ret, efl_file_set(file, page));
+   return efl_file_set((Eo *) obj, file, page);
 }
 
 EAPI Eina_Bool
 elm_prefs_file_get(const Eo *obj, const char **file, const char **page)
 {
-   eo_do((Eo *) obj, efl_file_get(file, page));
+   efl_file_get((Eo *) obj, file, page);
 
    return EINA_TRUE;
 }
diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c
index aa34ec02f..a001fac1e 100644
--- a/src/lib/elm_progressbar.c
+++ b/src/lib/elm_progressbar.c
@@ -141,7 +141,7 @@ EOLIAN static Eina_Bool
 _elm_progressbar_elm_widget_sub_object_del(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED, Evas_Object *sobj)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(sobj));
+   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    _icon_signal_emit(obj);
@@ -156,7 +156,7 @@ EOLIAN static Eina_Bool
 _elm_progressbar_elm_container_content_set(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_set(part, content));
+   int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
    if (!int_ret) return EINA_FALSE;
 
    _icon_signal_emit(obj);
@@ -175,7 +175,7 @@ _elm_progressbar_elm_widget_theme_apply(Eo *obj, Elm_Progressbar_Data *sd)
      eina_stringshare_replace(&ld->group, "horizontal");
    else eina_stringshare_replace(&ld->group, "vertical");
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    if (sd->pulse)
@@ -256,7 +256,7 @@ _elm_progressbar_evas_object_smart_add(Eo *obj, Elm_Progressbar_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->horizontal = EINA_TRUE;
@@ -305,7 +305,7 @@ _elm_progressbar_evas_object_smart_del(Eo *obj, Elm_Progressbar_Data *sd)
            }
       }
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static const Elm_Layout_Part_Alias_Description*
@@ -331,11 +331,10 @@ elm_progressbar_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_progressbar_eo_base_constructor(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PROGRESS_BAR));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PROGRESS_BAR);
 
    return obj;
 }
@@ -348,7 +347,7 @@ _elm_progressbar_pulse_set(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd, Eina_B
 
    sd->pulse = pulse;
 
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 }
 
 EOLIAN static Eina_Bool
@@ -403,8 +402,8 @@ _elm_progressbar_part_value_set(Eo *obj EINA_UNUSED, Elm_Progressbar_Data *sd, c
 
    _val_set(obj);
    _units_set(obj);
-   eo_do(obj, eo_event_callback_call
-     (ELM_PROGRESSBAR_EVENT_CHANGED, NULL));
+   eo_event_callback_call
+     (obj, ELM_PROGRESSBAR_EVENT_CHANGED, NULL);
 }
 
 EOLIAN static double
@@ -504,7 +503,7 @@ _elm_progressbar_horizontal_set(Eo *obj, Elm_Progressbar_Data *sd, Eina_Bool hor
    if (sd->horizontal == horizontal) return;
 
    sd->horizontal = horizontal;
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index 3d4099064..39576cf33 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -117,8 +117,8 @@ _activate(Evas_Object *obj)
 
         if (_elm_config->access_mode)
           _elm_access_say(E_("State: On"));
-        eo_do(obj, eo_event_callback_call
-          (ELM_RADIO_EVENT_CHANGED, NULL));
+        eo_event_callback_call
+          (obj, ELM_RADIO_EVENT_CHANGED, NULL);
 
      }
 }
@@ -167,7 +167,7 @@ _elm_radio_elm_widget_theme_apply(Eo *obj, Elm_Radio_Data *sd)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, ELM_CHECK_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, ELM_CHECK_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
@@ -182,7 +182,7 @@ _elm_radio_elm_widget_theme_apply(Eo *obj, Elm_Radio_Data *sd)
     * whenever we can changed the theme API */
    _icon_signal_emit(obj);
 
-   eo_do(obj, elm_obj_layout_sizing_eval());
+   elm_obj_layout_sizing_eval(obj);
 
    return EINA_TRUE;
 }
@@ -223,7 +223,7 @@ _elm_radio_evas_object_smart_add(Eo *obj, Elm_Radio_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, ELM_CHECK_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, ELM_CHECK_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set(obj, "radio", "base", elm_widget_style_get(obj)))
@@ -254,7 +254,7 @@ _elm_radio_evas_object_smart_del(Eo *obj, Elm_Radio_Data *sd)
    sd->group->radios = eina_list_remove(sd->group->radios, obj);
    if (!sd->group->radios) free(sd->group);
 
-   eo_do_super(obj, ELM_CHECK_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, ELM_CHECK_CLASS));
 }
 
 EOLIAN static const Elm_Layout_Part_Alias_Description*
@@ -274,11 +274,10 @@ elm_radio_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_radio_eo_base_constructor(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_RADIO_BUTTON));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_RADIO_BUTTON);
 
    return obj;
 }
@@ -400,7 +399,7 @@ _elm_radio_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Radio_Data
 {
    Elm_Atspi_State_Set ret;
 
-   eo_do_super(obj, ELM_RADIO_CLASS, ret = elm_interface_atspi_accessible_state_set_get());
+   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_RADIO_CLASS));
    if (obj == elm_radio_selected_object_get(obj))
      STATE_TYPE_SET(ret, ELM_ATSPI_STATE_CHECKED);
 
diff --git a/src/lib/elm_route.c b/src/lib/elm_route.c
index 716c5724d..d5117beb7 100644
--- a/src/lib/elm_route.c
+++ b/src/lib/elm_route.c
@@ -90,7 +90,7 @@ EOLIAN static Eina_Bool
 _elm_route_elm_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    //TODO
@@ -137,7 +137,7 @@ EOLIAN static void
 _elm_route_evas_object_smart_add(Eo *obj, Elm_Route_Data *priv)
 {
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
@@ -163,7 +163,7 @@ _elm_route_evas_object_smart_del(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED)
 {
    _clear_route(obj);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 /**
@@ -185,9 +185,8 @@ elm_route_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_route_eo_base_constructor(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
 
    return obj;
 }
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 29edd3556..e2eb4bbbd 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -65,8 +65,8 @@ _elm_scroller_proxy_set(Evas_Object *obj, Elm_Scroller_Data *sd, Evas_Object *pr
 
    if (!content) return;
 
-   eo_do(obj, elm_interface_scrollable_paging_get(NULL, NULL, &h_pagesize, &v_pagesize));
-   eo_do(obj, elm_interface_scrollable_content_size_get(&cw, &ch));
+   elm_interface_scrollable_paging_get(obj, NULL, NULL, &h_pagesize, &v_pagesize);
+   elm_interface_scrollable_content_size_get(obj, &cw, &ch);
    /* Since Proxy has the texture size limitation problem, we set a key value
       for evas works in some hackish way to avoid this problem. This hackish
       code should be removed once evas supports a mechanism like a virtual
@@ -106,12 +106,11 @@ _key_action_move(Evas_Object *obj, const char *params)
    Evas_Coord f_w = 0;
    Evas_Coord f_h = 0;
 
-   eo_do(obj,
-         elm_interface_scrollable_content_pos_get(&x, &y),
-         elm_interface_scrollable_step_size_get(&step_x, &step_y),
-         elm_interface_scrollable_page_size_get(&page_x, &page_y),
-         elm_interface_scrollable_content_viewport_geometry_get
-         (&v_x, &v_y, &v_w, &v_h));
+   elm_interface_scrollable_content_pos_get(obj, &x, &y);
+   elm_interface_scrollable_step_size_get(obj, &step_x, &step_y);
+   elm_interface_scrollable_page_size_get(obj, &page_x, &page_y);
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, &v_x, &v_y, &v_w, &v_h);
    evas_object_geometry_get(sd->content, &c_x, &c_y, &max_x, &max_y);
 
    _elm_widget_focus_auto_show(obj);
@@ -232,7 +231,7 @@ _key_action_move(Evas_Object *obj, const char *params)
      }
    else return EINA_FALSE;
 
-   eo_do(obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+   elm_interface_scrollable_content_pos_set(obj, x, y, EINA_TRUE);
    return EINA_TRUE;
 }
 
@@ -265,11 +264,10 @@ _elm_scroller_elm_widget_activate(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED, E
    if (elm_widget_disabled_get(obj)) return EINA_FALSE;
    if (act == ELM_ACTIVATE_DEFAULT) return EINA_FALSE;
 
-   eo_do(obj,
-         elm_interface_scrollable_content_pos_get(&x, &y),
-         elm_interface_scrollable_page_size_get(&page_x, &page_y),
-         elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &v_w, &v_h));
+   elm_interface_scrollable_content_pos_get(obj, &x, &y);
+   elm_interface_scrollable_page_size_get(obj, &page_x, &page_y);
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, &v_w, &v_h);
 
    if (act == ELM_ACTIVATE_UP)
      {
@@ -300,7 +298,7 @@ _elm_scroller_elm_widget_activate(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED, E
           x += page_x;
      }
 
-   eo_do(obj, elm_interface_scrollable_content_pos_set(x, y, EINA_TRUE));
+   elm_interface_scrollable_content_pos_set(obj, x, y, EINA_TRUE);
 
    return EINA_TRUE;
 }
@@ -323,8 +321,8 @@ _elm_scroller_elm_layout_sizing_eval(Eo *obj, Elm_Scroller_Data *sd)
         evas_object_size_hint_weight_get(sd->content, &xw, &yw);
      }
 
-   eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &vw, &vh));
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, &vw, &vh);
    if (xw > 0.0)
      {
         if ((minw > 0) && (vw < minw))
@@ -351,7 +349,7 @@ _elm_scroller_elm_layout_sizing_eval(Eo *obj, Elm_Scroller_Data *sd)
    for (i = 0 ; i < 3 ; i++)
      {
         if (!sd->proxy_content[i]) continue;
-        eo_do((Eo *)obj, elm_interface_scrollable_paging_get(NULL, NULL, &h_pagesize, &v_pagesize));
+        elm_interface_scrollable_paging_get((Eo *)obj, NULL, NULL, &h_pagesize, &v_pagesize);
         evas_object_image_fill_set(sd->proxy_content[i], 0, 0, vw, vh);
         evas_object_size_hint_min_set(sd->proxy_content[i],
                                       h_pagesize, v_pagesize);
@@ -376,14 +374,14 @@ static void
 _mirrored_set(Evas_Object *obj,
               Eina_Bool mirrored)
 {
-   eo_do(obj, elm_interface_scrollable_mirrored_set(mirrored));
+   elm_interface_scrollable_mirrored_set(obj, mirrored);
 }
 
 EOLIAN static Eina_Bool
 _elm_scroller_elm_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -434,11 +432,10 @@ _elm_scroller_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elm_Scroller_Data *sd,
 
         ret =  elm_widget_focus_next_get(cur, dir, next, next_item);
 
-        eo_do(obj,
-              elm_interface_scrollable_content_pos_get(&x, &y),
-              elm_interface_scrollable_step_size_get(&step_x, &step_y),
-              elm_interface_scrollable_content_viewport_geometry_get
-              (NULL, NULL, &v_w, &v_h));
+        elm_interface_scrollable_content_pos_get(obj, &x, &y);
+        elm_interface_scrollable_step_size_get(obj, &step_x, &step_y);
+        elm_interface_scrollable_content_viewport_geometry_get
+              (obj, NULL, NULL, &v_w, &v_h);
         evas_object_geometry_get(sd->content, &c_x, &c_y, NULL, NULL);
         evas_object_geometry_get(*next, &f_x, &f_y, &f_w, &f_h);
         l_x = f_x - c_x - step_x;
@@ -497,11 +494,10 @@ _elm_scroller_elm_widget_focus_direction(Eo *obj, Elm_Scroller_Data *sd, const E
 
         ret = elm_widget_focus_direction_get(cur, base, degree, direction, direction_item, weight);
 
-        eo_do(obj,
-              elm_interface_scrollable_content_pos_get(&x, &y),
-              elm_interface_scrollable_step_size_get(&step_x, &step_y),
-              elm_interface_scrollable_content_viewport_geometry_get
-              (NULL, NULL, &v_w, &v_h));
+        elm_interface_scrollable_content_pos_get(obj, &x, &y);
+        elm_interface_scrollable_step_size_get(obj, &step_x, &step_y);
+        elm_interface_scrollable_content_viewport_geometry_get
+              (obj, NULL, NULL, &v_w, &v_h);
         evas_object_geometry_get(sd->content, &c_x, &c_y, NULL, NULL);
         evas_object_geometry_get(*direction, &f_x, &f_y, &f_w, &f_h);
         l_x = f_x - c_x - step_x;
@@ -526,7 +522,7 @@ _show_region_hook(void *data,
    Evas_Coord x, y, w, h;
 
    elm_widget_show_region_get(content_obj, &x, &y, &w, &h);
-   eo_do(data, elm_interface_scrollable_content_region_show(x, y, w, h));
+   elm_interface_scrollable_content_region_show(data, x, y, w, h);
 }
 
 static void
@@ -542,7 +538,7 @@ EOLIAN static Eina_Bool
 _elm_scroller_elm_widget_sub_object_del(Eo *obj, Elm_Scroller_Data *sd, Evas_Object *sobj)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(sobj));
+   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj);
    if (!int_ret) return EINA_FALSE;
 
    if (sobj == sd->content)
@@ -569,146 +565,146 @@ static void
 _edge_left_cb(Evas_Object *obj,
               void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_EDGE_LEFT, NULL));
+   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_LEFT, NULL);
 }
 
 static void
 _edge_right_cb(Evas_Object *obj,
                void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_EDGE_RIGHT, NULL));
+   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_RIGHT, NULL);
 }
 
 static void
 _edge_top_cb(Evas_Object *obj,
              void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_EDGE_TOP, NULL));
+   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_TOP, NULL);
 }
 
 static void
 _edge_bottom_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_EDGE_BOTTOM, NULL));
+   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_EDGE_BOTTOM, NULL);
 }
 
 static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL));
+   eo_event_callback_call
+     (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL);
 }
 
 static void
 _scroll_left_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_SCROLL_LEFT, NULL));
+   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_LEFT, NULL);
 }
 
 static void
 _scroll_right_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_SCROLL_RIGHT, NULL));
+   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_RIGHT, NULL);
 }
 
 static void
 _scroll_up_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_SCROLL_UP, NULL));
+   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_UP, NULL);
 }
 
 static void
 _scroll_down_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_SCROLL_DOWN, NULL));
+   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_SCROLL_DOWN, NULL);
 }
 
 static void
 _scroll_anim_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL));
+   eo_event_callback_call
+     (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL);
 }
 
 static void
 _scroll_anim_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL));
+   eo_event_callback_call
+     (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
 static void
 _scroll_drag_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL));
+   eo_event_callback_call
+     (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call
-     (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL));
+   eo_event_callback_call
+     (obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL);
 }
 
 static void
 _vbar_drag_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_VBAR_DRAG, NULL));
+   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_VBAR_DRAG, NULL);
 }
 
 static void
 _vbar_press_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_VBAR_PRESS, NULL));
+   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_VBAR_PRESS, NULL);
 }
 
 static void
 _vbar_unpress_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_VBAR_UNPRESS, NULL));
+   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_VBAR_UNPRESS, NULL);
 }
 
 static void
 _hbar_drag_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_HBAR_DRAG, NULL));
+   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_HBAR_DRAG, NULL);
 }
 
 static void
 _hbar_press_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_HBAR_PRESS, NULL));
+   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_HBAR_PRESS, NULL);
 }
 
 static void
 _hbar_unpress_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_HBAR_UNPRESS, NULL));
+   eo_event_callback_call(obj, ELM_SCROLLER_EVENT_HBAR_UNPRESS, NULL);
 }
 
 static void
 _page_change_cb(Evas_Object *obj,
                 void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call
-     (ELM_SCROLLER_EVENT_SCROLL_PAGE_CHANGED, NULL));
+   eo_event_callback_call
+     (obj, ELM_SCROLLER_EVENT_SCROLL_PAGE_CHANGED, NULL);
 }
 
 static void
@@ -767,7 +763,7 @@ _elm_scroller_elm_container_content_set(Eo *obj, Elm_Scroller_Data *sd, const ch
    if (part && strcmp(part, "default"))
      {
         Eina_Bool int_ret = EINA_FALSE;
-        eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_set(part, content));
+        int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), part, content);
         return int_ret;
      }
 
@@ -788,7 +784,7 @@ _elm_scroller_elm_container_content_set(Eo *obj, Elm_Scroller_Data *sd, const ch
              if(sd->contents)
                content = sd->contents;
           }
-        eo_do(obj, elm_interface_scrollable_content_set(content));
+        elm_interface_scrollable_content_set(obj, content);
      }
    else
      {
@@ -812,7 +808,7 @@ _elm_scroller_elm_container_content_get(Eo *obj, Elm_Scroller_Data *sd, const ch
    if (part && strcmp(part, "default"))
      {
         Evas_Object *ret = NULL;
-        eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_get(part));
+        ret = elm_obj_container_content_get(eo_super(obj, MY_CLASS), part);
         return ret;
      }
 
@@ -825,7 +821,7 @@ _elm_scroller_elm_container_content_unset(Eo *obj, Elm_Scroller_Data *sd, const
    Evas_Object *ret = NULL;
    if (part && strcmp(part, "default"))
      {
-        eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_unset(part));
+        ret = elm_obj_container_content_unset(eo_super(obj, MY_CLASS), part);
         return ret;
      }
 
@@ -836,7 +832,7 @@ _elm_scroller_elm_container_content_unset(Eo *obj, Elm_Scroller_Data *sd, const
      elm_widget_sub_object_del(obj, sd->contents);
    else
      elm_widget_sub_object_del(obj, sd->content);
-   eo_do(obj, elm_interface_scrollable_content_set(NULL));
+   elm_interface_scrollable_content_set(obj, NULL);
    sd->content = NULL;
 
    return ret;
@@ -869,7 +865,7 @@ _elm_scroller_evas_object_smart_add(Eo *obj, Elm_Scroller_Data *priv)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
    Evas_Coord minw, minh;
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
@@ -885,7 +881,7 @@ _elm_scroller_evas_object_smart_add(Eo *obj, Elm_Scroller_Data *priv)
    evas_object_show(priv->hit_rect);
    evas_object_repeat_events_set(priv->hit_rect, EINA_TRUE);
 
-   eo_do(obj, elm_interface_scrollable_objects_set(wd->resize_obj, priv->hit_rect));
+   elm_interface_scrollable_objects_set(obj, wd->resize_obj, priv->hit_rect);
 
    evas_object_event_callback_add
      (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints_cb, obj);
@@ -894,37 +890,36 @@ _elm_scroller_evas_object_smart_add(Eo *obj, Elm_Scroller_Data *priv)
    evas_object_size_hint_min_set(obj, minw, minh);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize_cb, obj);
 
-   eo_do(obj,
-         elm_interface_scrollable_edge_left_cb_set(_edge_left_cb),
-         elm_interface_scrollable_edge_right_cb_set(_edge_right_cb),
-         elm_interface_scrollable_edge_top_cb_set(_edge_top_cb),
-         elm_interface_scrollable_edge_bottom_cb_set(_edge_bottom_cb),
-         elm_interface_scrollable_scroll_cb_set(_scroll_cb),
-         elm_interface_scrollable_scroll_left_cb_set(_scroll_left_cb),
-         elm_interface_scrollable_scroll_right_cb_set(_scroll_right_cb),
-         elm_interface_scrollable_scroll_up_cb_set(_scroll_up_cb),
-         elm_interface_scrollable_scroll_down_cb_set(_scroll_down_cb),
-         elm_interface_scrollable_animate_start_cb_set(_scroll_anim_start_cb),
-         elm_interface_scrollable_animate_stop_cb_set(_scroll_anim_stop_cb),
-         elm_interface_scrollable_drag_start_cb_set(_scroll_drag_start_cb),
-         elm_interface_scrollable_drag_stop_cb_set(_scroll_drag_stop_cb),
-         elm_interface_scrollable_vbar_drag_cb_set(_vbar_drag_cb),
-         elm_interface_scrollable_vbar_press_cb_set(_vbar_press_cb),
-         elm_interface_scrollable_vbar_unpress_cb_set(_vbar_unpress_cb),
-         elm_interface_scrollable_hbar_drag_cb_set(_hbar_drag_cb),
-         elm_interface_scrollable_hbar_press_cb_set(_hbar_press_cb),
-         elm_interface_scrollable_hbar_unpress_cb_set(_hbar_unpress_cb),
-         elm_interface_scrollable_page_change_cb_set(_page_change_cb),
-         elm_interface_scrollable_content_min_limit_cb_set
-         (_elm_scroller_content_min_limit_cb),
-         elm_interface_scrollable_content_viewport_resize_cb_set
-         (_elm_scroller_content_viewport_resize_cb));
+   elm_interface_scrollable_edge_left_cb_set(obj, _edge_left_cb);
+   elm_interface_scrollable_edge_right_cb_set(obj, _edge_right_cb);
+   elm_interface_scrollable_edge_top_cb_set(obj, _edge_top_cb);
+   elm_interface_scrollable_edge_bottom_cb_set(obj, _edge_bottom_cb);
+   elm_interface_scrollable_scroll_cb_set(obj, _scroll_cb);
+   elm_interface_scrollable_scroll_left_cb_set(obj, _scroll_left_cb);
+   elm_interface_scrollable_scroll_right_cb_set(obj, _scroll_right_cb);
+   elm_interface_scrollable_scroll_up_cb_set(obj, _scroll_up_cb);
+   elm_interface_scrollable_scroll_down_cb_set(obj, _scroll_down_cb);
+   elm_interface_scrollable_animate_start_cb_set(obj, _scroll_anim_start_cb);
+   elm_interface_scrollable_animate_stop_cb_set(obj, _scroll_anim_stop_cb);
+   elm_interface_scrollable_drag_start_cb_set(obj, _scroll_drag_start_cb);
+   elm_interface_scrollable_drag_stop_cb_set(obj, _scroll_drag_stop_cb);
+   elm_interface_scrollable_vbar_drag_cb_set(obj, _vbar_drag_cb);
+   elm_interface_scrollable_vbar_press_cb_set(obj, _vbar_press_cb);
+   elm_interface_scrollable_vbar_unpress_cb_set(obj, _vbar_unpress_cb);
+   elm_interface_scrollable_hbar_drag_cb_set(obj, _hbar_drag_cb);
+   elm_interface_scrollable_hbar_press_cb_set(obj, _hbar_press_cb);
+   elm_interface_scrollable_hbar_unpress_cb_set(obj, _hbar_unpress_cb);
+   elm_interface_scrollable_page_change_cb_set(obj, _page_change_cb);
+   elm_interface_scrollable_content_min_limit_cb_set
+         (obj, _elm_scroller_content_min_limit_cb);
+   elm_interface_scrollable_content_viewport_resize_cb_set
+         (obj, _elm_scroller_content_viewport_resize_cb);
 }
 
 EOLIAN static void
 _elm_scroller_evas_object_smart_move(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
+   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -932,7 +927,7 @@ _elm_scroller_evas_object_smart_move(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord
 EOLIAN static void
 _elm_scroller_evas_object_smart_resize(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
 }
@@ -940,7 +935,7 @@ _elm_scroller_evas_object_smart_resize(Eo *obj, Elm_Scroller_Data *sd, Evas_Coor
 EOLIAN static void
 _elm_scroller_evas_object_smart_member_add(Eo *obj, Elm_Scroller_Data *sd, Evas_Object *member)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
+   evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -957,11 +952,10 @@ elm_scroller_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_scroller_eo_base_constructor(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SCROLL_PANE));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_PANE);
 
    return obj;
 }
@@ -977,7 +971,7 @@ _elm_scroller_custom_widget_base_theme_set(Eo *obj, Elm_Scroller_Data *_pd EINA_
 
    if (eina_stringshare_replace(&(ld->klass), klass) ||
        eina_stringshare_replace(&(ld->group), group))
-      eo_do(obj, elm_obj_widget_theme_apply());
+      elm_obj_widget_theme_apply(obj);
 }
 
 EAPI void
@@ -987,7 +981,7 @@ elm_scroller_content_min_limit(Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do(obj, elm_interface_scrollable_content_min_limit(w, h));
+   elm_interface_scrollable_content_min_limit(obj, w, h);
 }
 
 EAPI void
@@ -999,7 +993,7 @@ elm_scroller_region_show(Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do(obj, elm_interface_scrollable_content_region_show(x, y, w, h));
+   elm_interface_scrollable_content_region_show(obj, x, y, w, h);
 }
 
 EAPI void
@@ -1008,7 +1002,7 @@ elm_scroller_policy_set(Evas_Object *obj,
                         Elm_Scroller_Policy policy_v)
 {
    ELM_SCROLLABLE_CHECK(obj);
-   eo_do(obj, elm_interface_scrollable_policy_set(policy_h, policy_v));
+   elm_interface_scrollable_policy_set(obj, policy_h, policy_v);
 }
 
 EOLIAN static void
@@ -1018,7 +1012,7 @@ _elm_scroller_elm_interface_scrollable_policy_set(Eo *obj, Elm_Scroller_Data *sd
        (policy_v >= ELM_SCROLLER_POLICY_LAST))
      return;
 
-   eo_do_super(obj, MY_CLASS, elm_interface_scrollable_policy_set(policy_h, policy_v));
+   elm_interface_scrollable_policy_set(eo_super(obj, MY_CLASS), policy_h, policy_v);
 }
 
 EAPI void
@@ -1028,7 +1022,7 @@ elm_scroller_policy_get(const Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do((Eo *) obj, elm_interface_scrollable_policy_get(policy_h, policy_v));
+   elm_interface_scrollable_policy_get((Eo *) obj, policy_h, policy_v);
 }
 
 EAPI void
@@ -1036,7 +1030,7 @@ elm_scroller_single_direction_set(Evas_Object *obj,
                                   Elm_Scroller_Single_Direction single_dir)
 {
    ELM_SCROLLABLE_CHECK(obj);
-   eo_do(obj, elm_interface_scrollable_single_direction_set(single_dir));
+   elm_interface_scrollable_single_direction_set(obj, single_dir);
 }
 
 EOLIAN static void
@@ -1045,8 +1039,7 @@ _elm_scroller_elm_interface_scrollable_single_direction_set(Eo *obj, Elm_Scrolle
    if (single_dir >= ELM_SCROLLER_SINGLE_DIRECTION_LAST)
      return;
 
-   eo_do_super(obj, MY_CLASS,
-               elm_interface_scrollable_single_direction_set(single_dir));
+   elm_interface_scrollable_single_direction_set(eo_super(obj, MY_CLASS), single_dir);
 }
 
 EAPI Elm_Scroller_Single_Direction
@@ -1055,7 +1048,7 @@ elm_scroller_single_direction_get(const Evas_Object *obj)
    ELM_SCROLLABLE_CHECK(obj, ELM_SCROLLER_SINGLE_DIRECTION_NONE);
    Elm_Scroller_Single_Direction single_dir = ELM_SCROLLER_SINGLE_DIRECTION_NONE;
 
-   eo_do((Eo *) obj, single_dir = elm_interface_scrollable_single_direction_get());
+   single_dir = elm_interface_scrollable_single_direction_get((Eo *) obj);
    return single_dir;
 }
 
@@ -1063,8 +1056,7 @@ EOLIAN static Elm_Scroller_Single_Direction
 _elm_scroller_elm_interface_scrollable_single_direction_get(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED)
 {
    Elm_Scroller_Single_Direction ret = ELM_SCROLLER_SINGLE_DIRECTION_NONE;
-   eo_do_super(obj, MY_CLASS,
-               ret = elm_interface_scrollable_single_direction_get());
+   ret = elm_interface_scrollable_single_direction_get(eo_super(obj, MY_CLASS));
    return ret;
 }
 
@@ -1076,7 +1068,7 @@ elm_scroller_region_get(const Evas_Object *obj,
                         Evas_Coord *h)
 {
    ELM_SCROLLABLE_CHECK(obj);
-   eo_do((Eo *) obj, elm_interface_scrollable_content_region_get(x, y, w, h));
+   elm_interface_scrollable_content_region_get((Eo *) obj, x, y, w, h);
 }
 
 EAPI void
@@ -1086,7 +1078,7 @@ elm_scroller_child_size_get(const Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do((Eo *) obj, elm_interface_scrollable_content_size_get(w, h));
+   elm_interface_scrollable_content_size_get((Eo *) obj, w, h);
 }
 
 EAPI void
@@ -1096,8 +1088,8 @@ elm_scroller_page_snap_set(Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do(obj, elm_interface_scrollable_page_snap_allow_set
-         (page_snap_h, page_snap_v));
+   elm_interface_scrollable_page_snap_allow_set
+         (obj, page_snap_h, page_snap_v);
 }
 
 EAPI void
@@ -1107,8 +1099,8 @@ elm_scroller_page_snap_get(const Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do((Eo *) obj, elm_interface_scrollable_page_snap_allow_get
-         (page_snap_h, page_snap_v));
+   elm_interface_scrollable_page_snap_allow_get
+         ((Eo *) obj, page_snap_h, page_snap_v);
 }
 
 EAPI void
@@ -1118,7 +1110,7 @@ elm_scroller_bounce_set(Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do(obj, elm_interface_scrollable_bounce_allow_set(h_bounce, v_bounce));
+   elm_interface_scrollable_bounce_allow_set(obj, h_bounce, v_bounce);
 }
 
 EAPI void
@@ -1128,7 +1120,7 @@ elm_scroller_bounce_get(const Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do((Eo *) obj, elm_interface_scrollable_bounce_allow_get(h_bounce, v_bounce));
+   elm_interface_scrollable_bounce_allow_get((Eo *) obj, h_bounce, v_bounce);
 }
 
 EAPI void
@@ -1138,7 +1130,7 @@ elm_scroller_page_relative_set(Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do((Eo *)obj, elm_interface_scrollable_page_relative_set(h_pagerel, v_pagerel));
+   elm_interface_scrollable_page_relative_set((Eo *)obj, h_pagerel, v_pagerel);
 }
 
 EAPI void
@@ -1148,7 +1140,7 @@ elm_scroller_page_relative_get(const Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do((Eo *)obj, elm_interface_scrollable_paging_get(h_pagerel, v_pagerel, NULL, NULL));
+   elm_interface_scrollable_paging_get((Eo *)obj, h_pagerel, v_pagerel, NULL, NULL);
 }
 
 EAPI void
@@ -1157,7 +1149,7 @@ elm_scroller_page_size_set(Evas_Object *obj,
                            Evas_Coord v_pagesize)
 {
    ELM_SCROLLABLE_CHECK(obj);
-   eo_do(obj, elm_interface_scrollable_page_size_set(h_pagesize, v_pagesize));
+   elm_interface_scrollable_page_size_set(obj, h_pagesize, v_pagesize);
 }
 
 EOLIAN static void
@@ -1165,9 +1157,9 @@ _elm_scroller_elm_interface_scrollable_page_size_set(Eo *obj, Elm_Scroller_Data
 {
    double pagerel_h = 0.0, pagerel_v = 0.0;
 
-   eo_do(obj, elm_interface_scrollable_paging_get(&pagerel_h, &pagerel_v, NULL, NULL));
+   elm_interface_scrollable_paging_get(obj, &pagerel_h, &pagerel_v, NULL, NULL);
 
-   eo_do(obj, elm_interface_scrollable_paging_set(pagerel_h, pagerel_v, h_pagesize, v_pagesize));
+   elm_interface_scrollable_paging_set(obj, pagerel_h, pagerel_v, h_pagesize, v_pagesize);
 }
 
 EAPI void
@@ -1177,7 +1169,7 @@ elm_scroller_page_size_get(const Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do((Eo *)obj, elm_interface_scrollable_paging_get(NULL, NULL, h_pagesize, v_pagesize));
+   elm_interface_scrollable_paging_get((Eo *)obj, NULL, NULL, h_pagesize, v_pagesize);
 }
 
 EOLIAN static void
@@ -1188,15 +1180,15 @@ _elm_scroller_page_scroll_limit_set(const Eo *obj, Elm_Scroller_Data *_pd EINA_U
    if (page_limit_v < 1)
      page_limit_v = 9999;
 
-   eo_do(obj, elm_interface_scrollable_page_scroll_limit_set
-         (page_limit_h, page_limit_v));
+   elm_interface_scrollable_page_scroll_limit_set
+         (obj, page_limit_h, page_limit_v);
 }
 
 EOLIAN static void
 _elm_scroller_page_scroll_limit_get(const Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED, int *page_limit_h, int *page_limit_v)
 {
-   eo_do(obj, elm_interface_scrollable_page_scroll_limit_get
-         (page_limit_h, page_limit_v));
+   elm_interface_scrollable_page_scroll_limit_get
+         (obj, page_limit_h, page_limit_v);
 }
 
 EAPI void
@@ -1206,7 +1198,7 @@ elm_scroller_current_page_get(const Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do((Eo *) obj, elm_interface_scrollable_current_page_get(h_pagenumber, v_pagenumber));
+   elm_interface_scrollable_current_page_get((Eo *) obj, h_pagenumber, v_pagenumber);
 }
 
 EAPI void
@@ -1216,7 +1208,7 @@ elm_scroller_last_page_get(const Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do((Eo *) obj, elm_interface_scrollable_last_page_get(h_pagenumber, v_pagenumber));
+   elm_interface_scrollable_last_page_get((Eo *) obj, h_pagenumber, v_pagenumber);
 }
 
 EAPI void
@@ -1226,7 +1218,7 @@ elm_scroller_page_show(Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do(obj, elm_interface_scrollable_page_show(h_pagenumber, v_pagenumber));
+   elm_interface_scrollable_page_show(obj, h_pagenumber, v_pagenumber);
 }
 
 EAPI void
@@ -1236,7 +1228,7 @@ elm_scroller_page_bring_in(Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do(obj, elm_interface_scrollable_page_bring_in(h_pagenumber, v_pagenumber));
+   elm_interface_scrollable_page_bring_in(obj, h_pagenumber, v_pagenumber);
 }
 
 EAPI void
@@ -1248,7 +1240,7 @@ elm_scroller_region_bring_in(Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do(obj, elm_interface_scrollable_region_bring_in(x, y, w, h));
+   elm_interface_scrollable_region_bring_in(obj, x, y, w, h);
 }
 
 EAPI void
@@ -1258,7 +1250,7 @@ elm_scroller_gravity_set(Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do(obj, elm_interface_scrollable_gravity_set(x, y));
+   elm_interface_scrollable_gravity_set(obj, x, y);
 }
 
 EAPI void
@@ -1268,7 +1260,7 @@ elm_scroller_gravity_get(const Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do((Eo *) obj, elm_interface_scrollable_gravity_get(x, y));
+   elm_interface_scrollable_gravity_get((Eo *) obj, x, y);
 }
 
 EAPI void
@@ -1277,7 +1269,7 @@ elm_scroller_movement_block_set(Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do(obj, elm_interface_scrollable_movement_block_set(block));
+   elm_interface_scrollable_movement_block_set(obj, block);
 }
 
 EAPI Elm_Scroller_Movement_Block
@@ -1287,7 +1279,7 @@ elm_scroller_movement_block_get(const Evas_Object *obj)
 
    ELM_SCROLLABLE_CHECK(obj, ELM_SCROLLER_MOVEMENT_NO_BLOCK);
 
-   eo_do((Eo *) obj, block = elm_interface_scrollable_movement_block_get());
+   block = elm_interface_scrollable_movement_block_get((Eo *) obj);
 
    return block;
 }
@@ -1299,7 +1291,7 @@ elm_scroller_step_size_set(Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do(obj, elm_interface_scrollable_step_size_set(x, y));
+   elm_interface_scrollable_step_size_set(obj, x, y);
 }
 
 EAPI void
@@ -1309,7 +1301,7 @@ elm_scroller_step_size_get(const Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do((Eo *) obj, elm_interface_scrollable_step_size_get(x, y));
+   elm_interface_scrollable_step_size_get((Eo *) obj, x, y);
 }
 
 EAPI void
@@ -1327,18 +1319,18 @@ elm_scroller_loop_set(Evas_Object *obj,
    sd->loop_h = loop_h;
    sd->loop_v = loop_v;
 
-   eo_do(obj, elm_interface_scrollable_loop_set(loop_h, loop_v));
+   elm_interface_scrollable_loop_set(obj, loop_h, loop_v);
 
    if (sd->content)
      {
         if (sd->loop_h || sd->loop_v)
           {
-             eo_do(obj, elm_interface_scrollable_content_set(NULL));
+             elm_interface_scrollable_content_set(obj, NULL);
              _loop_content_set(obj, sd, sd->content);
 
              if (sd->contents)
                {
-                  eo_do(obj, elm_interface_scrollable_content_set(sd->contents));
+                  elm_interface_scrollable_content_set(obj, sd->contents);
                   elm_widget_sub_object_add(obj, sd->contents);
                   elm_widget_on_show_region_hook_set(sd->contents, _show_region_hook, obj);
                }
@@ -1365,7 +1357,7 @@ elm_scroller_loop_get(const Evas_Object *obj,
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do(obj, elm_interface_scrollable_loop_get(loop_h, loop_v));
+   elm_interface_scrollable_loop_get(obj, loop_h, loop_v);
 }
 
 EAPI void
@@ -1373,7 +1365,7 @@ elm_scroller_wheel_disabled_set(Evas_Object *obj, Eina_Bool disabled)
 {
    ELM_SCROLLABLE_CHECK(obj);
 
-   eo_do((Eo *)obj, elm_interface_scrollable_wheel_disabled_set(disabled));
+   elm_interface_scrollable_wheel_disabled_set((Eo *)obj, disabled);
 }
 
 EAPI Eina_Bool
@@ -1383,7 +1375,7 @@ elm_scroller_wheel_disabled_get(const Evas_Object *obj)
 
    Eina_Bool ret;
 
-   return eo_do_ret((Eo *) obj, ret, elm_interface_scrollable_wheel_disabled_get());
+   return elm_interface_scrollable_wheel_disabled_get((Eo *) obj);
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index 2b6452aff..d77b93227 100644
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -30,9 +30,9 @@ _elm_segment_control_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Segment_Contr
    Eina_List *l;
 
    EINA_LIST_FOREACH(sd->items, l, it)
-     eo_do(it, elm_wdg_item_translate());
+     elm_wdg_item_translate(it);
 
-   eo_do_super(obj, MY_CLASS, elm_obj_widget_translate());
+   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -221,7 +221,7 @@ _elm_segment_control_elm_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *s
    Elm_Object_Item *eo_item;
 
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    rtl = elm_widget_mirrored_get(obj);
@@ -246,7 +246,7 @@ EOLIAN static Eina_Bool
 _elm_segment_control_elm_widget_disable(Eo *obj, Elm_Segment_Control_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_disable());
+   int_ret = elm_obj_widget_disable(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _update_list(sd);
@@ -317,7 +317,7 @@ _segment_on(Elm_Segment_Control_Item_Data *it)
    edje_object_signal_emit(VIEW(it), "elm,state,segment,selected", "elm");
 
    sd->selected_item = it;
-   eo_do(sd->obj, eo_event_callback_call(ELM_SEGMENT_CONTROL_EVENT_CHANGED, EO_OBJ(it)));
+   eo_event_callback_call(sd->obj, ELM_SEGMENT_CONTROL_EVENT_CHANGED, EO_OBJ(it));
 }
 
 static void
@@ -499,7 +499,7 @@ _elm_segment_control_item_eo_base_destructor(Eo *eo_item, Elm_Segment_Control_It
    _item_free(item);
    _update_list(sd);
 
-   eo_do_super(eo_item, ELM_SEGMENT_CONTROL_ITEM_CLASS, eo_destructor());
+   eo_destructor(eo_super(eo_item, ELM_SEGMENT_CONTROL_ITEM_CLASS));
 }
 
 static char *
@@ -539,7 +539,7 @@ _elm_segment_control_item_elm_widget_item_access_register(Eo *eo_it EINA_UNUSED,
    Elm_Access_Info *ai;
    Evas_Object *ret;
 
-   eo_do_super(eo_it, ELM_SEGMENT_CONTROL_ITEM_CLASS, ret = elm_wdg_item_access_register());
+   ret = elm_wdg_item_access_register(eo_super(eo_it, ELM_SEGMENT_CONTROL_ITEM_CLASS));
 
    ai = _elm_access_info_get(it->base->access_obj);
 
@@ -580,7 +580,7 @@ _item_new(Evas_Object *obj,
 
    // ACCESS
    if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
-     eo_do(eo_item, elm_wdg_item_access_register());
+     elm_wdg_item_access_register(eo_item);
 
    return eo_item;
 }
@@ -588,11 +588,11 @@ _item_new(Evas_Object *obj,
 EOLIAN static Eo *
 _elm_segment_control_item_eo_base_constructor(Eo *obj, Elm_Segment_Control_Item_Data *it)
 {
-   obj = eo_do_super_ret(obj, ELM_SEGMENT_CONTROL_ITEM_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, ELM_SEGMENT_CONTROL_ITEM_CLASS));
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    Evas_Object *parent;
-   eo_do (obj, parent = eo_parent_get());
+   parent = eo_parent_get(obj);
 
    VIEW(it) = edje_object_add(evas_object_evas_get(parent));
    edje_object_scale_set(VIEW(it),elm_widget_scale_get(WIDGET(it)) *
@@ -611,7 +611,7 @@ EOLIAN static void
 _elm_segment_control_evas_object_smart_add(Eo *obj, Elm_Segment_Control_Data *sd)
 {
    sd->obj = obj;
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set
@@ -636,7 +636,7 @@ _elm_segment_control_evas_object_smart_del(Eo *obj, Elm_Segment_Control_Data *sd
         eo_del(eo_it);
      }
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 static Eina_Bool _elm_segment_control_smart_focus_next_enable = EINA_FALSE;
@@ -680,9 +680,9 @@ _access_obj_process(Elm_Segment_Control_Data *sd, Eina_Bool is_access)
 
    EINA_LIST_FOREACH(sd->items, l, eo_item)
      {
-        if (is_access) eo_do(eo_item, elm_wdg_item_access_register());
+        if (is_access) elm_wdg_item_access_register(eo_item);
         else
-          eo_do(eo_item, elm_wdg_item_access_unregister());
+          elm_wdg_item_access_unregister(eo_item);
      }
 }
 
@@ -704,12 +704,11 @@ elm_segment_control_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_segment_control_eo_base_constructor(Eo *obj, Elm_Segment_Control_Data *sd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
 
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
 
    return obj;
 }
@@ -757,7 +756,7 @@ _elm_segment_control_item_del_at(Eo *obj, Elm_Segment_Control_Data *_pd EINA_UNU
    it = _item_find(obj, idx);
    if (!it) return;
 
-   eo_do(EO_OBJ(it), elm_wdg_item_del());
+   elm_wdg_item_del(EO_OBJ(it));
 }
 
 EOLIAN static const char*
diff --git a/src/lib/elm_separator.c b/src/lib/elm_separator.c
index a1d98cb32..2e940d978 100644
--- a/src/lib/elm_separator.c
+++ b/src/lib/elm_separator.c
@@ -26,7 +26,7 @@ _elm_separator_elm_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSE
    else
      eina_stringshare_replace(&ld->group, "vertical");
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    return EINA_TRUE;
@@ -47,7 +47,7 @@ _elm_separator_elm_layout_sizing_eval(Eo *obj, Elm_Separator_Data *sd EINA_UNUSE
 EOLIAN static void
 _elm_separator_evas_object_smart_add(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
@@ -69,10 +69,9 @@ elm_separator_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_separator_eo_base_constructor(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SEPARATOR));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SEPARATOR);
 
    return obj;
 }
@@ -85,7 +84,7 @@ _elm_separator_horizontal_set(Eo *obj, Elm_Separator_Data *sd, Eina_Bool horizon
 
    sd->horizontal = horizontal;
 
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index b445b5f55..37ea643e6 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -63,7 +63,7 @@ _delay_change(void *data)
    ELM_SLIDER_DATA_GET(data, sd);
 
    sd->delay = NULL;
-   eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_DELAY_CHANGED, NULL));
+   eo_event_callback_call(data, ELM_SLIDER_EVENT_DELAY_CHANGED, NULL);
 
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_value_changed_signal_emit(data);
@@ -97,7 +97,7 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
         sd->val = val;
         if (user_event)
           {
-             eo_do(obj, eo_event_callback_call(ELM_SLIDER_EVENT_CHANGED, NULL));
+             eo_event_callback_call(obj, ELM_SLIDER_EVENT_CHANGED, NULL);
              ecore_timer_del(sd->delay);
              sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj);
           }
@@ -249,7 +249,7 @@ _drag_start(void *data,
    if (!elm_widget_focus_get(data))
      elm_object_focus_set(data, EINA_TRUE);
    _slider_update(data, EINA_TRUE);
-   eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL));
+   eo_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
    elm_widget_scroll_freeze_push(data);
 }
 
@@ -260,7 +260,7 @@ _drag_stop(void *data,
            const char *source EINA_UNUSED)
 {
    _slider_update(data, EINA_TRUE);
-   eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL));
+   eo_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
    elm_widget_scroll_freeze_pop(data);
 }
 
@@ -578,7 +578,7 @@ _elm_slider_elm_widget_theme_apply(Eo *obj, Elm_Slider_Data *sd)
                          elm_widget_style_get(obj));
      }
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    if (sd->popup)
@@ -672,7 +672,7 @@ _spacer_down_cb(void *data,
    if (!elm_widget_focus_get(data))
      elm_object_focus_set(data, EINA_TRUE);
    _slider_update(data, EINA_TRUE);
-   eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL));
+   eo_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
    elm_layout_signal_emit(data, "elm,state,indicator,show", "elm");
 }
 
@@ -709,8 +709,8 @@ _spacer_move_cb(void *data,
           {
              if (sd->spacer_down) sd->spacer_down = EINA_FALSE;
              _slider_update(data, EINA_TRUE);
-             eo_do(data, eo_event_callback_call
-               (ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL));
+             eo_event_callback_call
+               (data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
              if (sd->frozen)
                {
                   elm_widget_scroll_freeze_pop(data);
@@ -753,7 +753,7 @@ _spacer_up_cb(void *data,
    if (sd->spacer_down) sd->spacer_down = EINA_FALSE;
 
    _slider_update(data, EINA_TRUE);
-   eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL));
+   eo_event_callback_call(data, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
 
    if (sd->frozen)
      {
@@ -867,7 +867,7 @@ _elm_slider_evas_object_smart_add(Eo *obj, Elm_Slider_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->horizontal = EINA_TRUE;
@@ -933,7 +933,7 @@ _elm_slider_evas_object_smart_del(Eo *obj, Elm_Slider_Data *sd)
    ecore_timer_del(sd->wheel_indicator_timer);
    evas_object_del(sd->popup);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static const Elm_Layout_Part_Alias_Description*
@@ -959,11 +959,10 @@ elm_slider_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_slider_eo_base_constructor(Eo *obj, Elm_Slider_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SLIDER));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER);
 
    return obj;
 }
@@ -1045,7 +1044,7 @@ _elm_slider_horizontal_set(Eo *obj, Elm_Slider_Data *sd, Eina_Bool horizontal)
    if (sd->horizontal == horizontal) return;
    sd->horizontal = horizontal;
 
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 }
 
 EOLIAN static Eina_Bool
@@ -1230,7 +1229,7 @@ _elm_slider_elm_widget_on_focus(Eo *obj, Elm_Slider_Data *sd EINA_UNUSED, Elm_Ob
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus(NULL));
+   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
 
    if ((sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS) && elm_widget_focus_get(obj))
      _popup_show(obj, NULL, NULL, NULL);
@@ -1263,12 +1262,12 @@ _elm_slider_elm_interface_atspi_value_value_and_text_set(Eo *obj, Elm_Slider_Dat
    if (sd->val_min > value) return EINA_FALSE;
    if (sd->val_max < value) return EINA_FALSE;
 
-   eo_do(obj, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL));
+   eo_event_callback_call(obj, ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL);
    sd->val = value;
    _visuals_refresh(obj);
    sd->val = oldval;
    _slider_update(obj, EINA_TRUE);
-   eo_do(obj, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL));
+   eo_event_callback_call(obj, ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL);
 
    return EINA_TRUE;
 }
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 7c20b8f28..c3d5879ab 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -272,8 +272,8 @@ _on_slideshow_end(void *data,
    elm_layout_signal_emit(data, "anim,end", "slideshow");
 
    if (emission != NULL)
-     eo_do(data, eo_event_callback_call
-       (ELM_SLIDESHOW_EVENT_TRANSITION_END, EO_OBJ(sd->current)));
+     eo_event_callback_call
+       (data, ELM_SLIDESHOW_EVENT_TRANSITION_END, EO_OBJ(sd->current));
 }
 
 static Eina_Bool
@@ -315,7 +315,7 @@ _elm_slideshow_item_eo_base_destructor(Eo *eo_item, Elm_Slideshow_Item_Data *ite
    if ((VIEW(item)) && (item->itc->func.del))
      item->itc->func.del(elm_object_item_data_get(eo_item), VIEW(item));
 
-   eo_do_super(eo_item, ELM_SLIDESHOW_ITEM_CLASS, eo_destructor());
+   eo_destructor(eo_super(eo_item, ELM_SLIDESHOW_ITEM_CLASS));
 }
 
 EOLIAN static void
@@ -323,7 +323,7 @@ _elm_slideshow_evas_object_smart_add(Eo *obj, Elm_Slideshow_Data *priv)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->count_item_pre_before = 2;
@@ -374,7 +374,7 @@ _elm_slideshow_evas_object_smart_del(Eo *obj, Elm_Slideshow_Data *sd)
    EINA_LIST_FREE(sd->layout.list, layout)
      eina_stringshare_del(layout);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -388,11 +388,10 @@ elm_slideshow_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_slideshow_eo_base_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION);
 
    return obj;
 }
@@ -400,7 +399,7 @@ _elm_slideshow_eo_base_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUSED)
 EOLIAN static Eo *
 _elm_slideshow_item_eo_base_constructor(Eo *obj, Elm_Slideshow_Item_Data *it)
 {
-   obj = eo_do_super_ret(obj, ELM_SLIDESHOW_ITEM_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, ELM_SLIDESHOW_ITEM_CLASS));
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    return obj;
@@ -482,8 +481,8 @@ _elm_slideshow_item_show(Eo *eo_item EINA_UNUSED, Elm_Slideshow_Item_Data *item)
 
    sd->previous = sd->current;
    sd->current = next;
-   eo_do(WIDGET(item), eo_event_callback_call
-     (ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current)));
+   eo_event_callback_call
+     (WIDGET(item), ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current));
 }
 
 EOLIAN static void
@@ -520,8 +519,8 @@ _elm_slideshow_next(Eo *obj, Elm_Slideshow_Data *sd)
 
    sd->previous = sd->current;
    sd->current = next;
-   eo_do(obj, eo_event_callback_call
-     (ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current)));
+   eo_event_callback_call
+     (obj, ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current));
 }
 
 EOLIAN static void
@@ -558,8 +557,8 @@ _elm_slideshow_previous(Eo *obj, Elm_Slideshow_Data *sd)
 
    sd->previous = sd->current;
    sd->current = prev;
-   eo_do(obj, eo_event_callback_call
-     (ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current)));
+   eo_event_callback_call
+     (obj, ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd->current));
 }
 
 EOLIAN static const Eina_List*
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index cb7318cb1..b621476eb 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -233,7 +233,7 @@ _delay_change_timer_cb(void *data)
    ELM_SPINNER_DATA_GET(data, sd);
 
    sd->delay_change_timer = NULL;
-   eo_do(data, eo_event_callback_call(ELM_SPINNER_EVENT_DELAY_CHANGED, NULL));
+   eo_event_callback_call(data, ELM_SPINNER_EVENT_DELAY_CHANGED, NULL);
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -266,7 +266,7 @@ _value_set(Evas_Object *obj,
    if (new_val == sd->val) return EINA_FALSE;
    sd->val = new_val;
 
-   eo_do(obj, eo_event_callback_call(ELM_SPINNER_EVENT_CHANGED, NULL));
+   eo_event_callback_call(obj, ELM_SPINNER_EVENT_CHANGED, NULL);
    elm_interface_atspi_accessible_value_changed_signal_emit(obj);
    ecore_timer_del(sd->delay_change_timer);
    sd->delay_change_timer = ecore_timer_add(ELM_SPINNER_DELAY_CHANGE_TIME,
@@ -313,15 +313,12 @@ _drag_cb(void *data,
    if (sd->button_layout)
      {
         if (!strncmp(style, "vertical", 8))
-          eo_do((Eo *)wd->resize_obj,
-                edje_obj_part_drag_value_get("elm.dragable.slider", NULL, &pos));
+          edje_obj_part_drag_value_get((Eo *)wd->resize_obj, "elm.dragable.slider", NULL, &pos);
         else
-          eo_do((Eo *)wd->resize_obj,
-                edje_obj_part_drag_value_get("elm.dragable.slider", &pos, NULL));
+          edje_obj_part_drag_value_get((Eo *)wd->resize_obj, "elm.dragable.slider", &pos, NULL);
      }
    else
-     eo_do((Eo *)wd->resize_obj,
-           edje_obj_part_drag_value_get("elm.dragable.slider", &pos, NULL));
+     edje_obj_part_drag_value_get((Eo *)wd->resize_obj, "elm.dragable.slider", &pos, NULL);
 
    if (sd->drag_prev_pos != 0)
      sd->drag_val_step = pow((pos - sd->drag_prev_pos), 2);
@@ -352,8 +349,8 @@ _drag_start_cb(void *data,
    sd->drag_prev_pos = 0;
    sd->drag_val_step = 1;
 
-   eo_do(obj, eo_event_callback_call
-     (ELM_SPINNER_EVENT_SPINNER_DRAG_START, NULL));
+   eo_event_callback_call
+     (obj, ELM_SPINNER_EVENT_SPINNER_DRAG_START, NULL);
 }
 
 static void
@@ -370,8 +367,8 @@ _drag_stop_cb(void *data,
    edje_object_part_drag_value_set
      (wd->resize_obj, "elm.dragable.slider", 0.0, 0.0);
 
-   eo_do(obj, eo_event_callback_call
-     (ELM_SPINNER_EVENT_SPINNER_DRAG_STOP, NULL));
+   eo_event_callback_call
+     (obj, ELM_SPINNER_EVENT_SPINNER_DRAG_STOP, NULL);
 }
 
 static void
@@ -409,7 +406,7 @@ _entry_value_apply(Evas_Object *obj)
    if (((*end != '\0') && (!isspace(*end))) || (fabs(val - sd->val) < DBL_EPSILON)) return;
    elm_spinner_value_set(obj, val);
 
-   eo_do(obj, eo_event_callback_call(ELM_SPINNER_EVENT_CHANGED, NULL));
+   eo_event_callback_call(obj, ELM_SPINNER_EVENT_CHANGED, NULL);
    ecore_timer_del(sd->delay_change_timer);
    sd->delay_change_timer = ecore_timer_add(ELM_SPINNER_DELAY_CHANGE_TIME,
                                             _delay_change_timer_cb, obj);
@@ -608,8 +605,8 @@ _toggle_entry(Evas_Object *obj)
                     (sd->ent, EVAS_CALLBACK_SHOW, _entry_show_cb, obj);
                }
              elm_entry_single_line_set(sd->ent, EINA_TRUE);
-             eo_do(sd->ent, eo_event_callback_add
-               (ELM_ENTRY_EVENT_ACTIVATED, _entry_activated_cb, obj));
+             eo_event_callback_add
+               (sd->ent, ELM_ENTRY_EVENT_ACTIVATED, _entry_activated_cb, obj);
              elm_layout_content_set(obj, "elm.swallow.entry", sd->ent);
              _entry_accept_filter_add(obj);
              elm_entry_markup_filter_append(sd->ent, _invalid_input_validity_filter, NULL);
@@ -923,7 +920,7 @@ _elm_spinner_elm_widget_on_focus(Eo *obj, Elm_Spinner_Data *sd, Elm_Object_Item
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus(NULL));
+   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
 
    if (!elm_widget_focus_get(obj))
@@ -1158,7 +1155,7 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
    ELM_SPINNER_DATA_GET(obj, sd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    priv->val_max = 100.0;
@@ -1185,8 +1182,7 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv)
         priv->inc_button = elm_button_add(obj);
         elm_object_style_set(priv->inc_button, "spinner/increase/default");
 
-        eo_do(priv->inc_button,
-              eo_event_callback_array_add(_inc_dec_button_cb(), obj));
+        eo_event_callback_array_add(priv->inc_button, _inc_dec_button_cb(), obj);
 
         elm_layout_content_set(obj, "elm.swallow.inc_button", priv->inc_button);
         elm_widget_sub_object_add(obj, priv->inc_button);
@@ -1194,8 +1190,8 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv)
         priv->text_button = elm_button_add(obj);
         elm_object_style_set(priv->text_button, "spinner/default");
 
-        eo_do(priv->text_button, eo_event_callback_add
-          (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _text_button_clicked_cb, obj));
+        eo_event_callback_add
+          (priv->text_button, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _text_button_clicked_cb, obj);
 
         elm_layout_content_set(obj, "elm.swallow.text_button", priv->text_button);
         elm_widget_sub_object_add(obj, priv->text_button);
@@ -1203,8 +1199,7 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv)
         priv->dec_button = elm_button_add(obj);
         elm_object_style_set(priv->dec_button, "spinner/decrease/default");
 
-        eo_do(priv->dec_button,
-              eo_event_callback_array_add(_inc_dec_button_cb(), obj));
+        eo_event_callback_array_add(priv->dec_button, _inc_dec_button_cb(), obj);
 
         elm_layout_content_set(obj, "elm.swallow.dec_button", priv->dec_button);
         elm_widget_sub_object_add(obj, priv->dec_button);
@@ -1256,7 +1251,7 @@ _elm_spinner_evas_object_smart_del(Eo *obj, Elm_Spinner_Data *sd)
           }
      }
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static Eina_Bool
@@ -1415,11 +1410,10 @@ elm_spinner_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_spinner_eo_base_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_SPIN_BUTTON));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPIN_BUTTON);
 
    return obj;
 }
@@ -1707,7 +1701,7 @@ EOLIAN static char*
 _elm_spinner_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED)
 {
    char *name;
-   eo_do_super(obj, ELM_SPINNER_CLASS, name = elm_interface_atspi_accessible_name_get());
+   name = elm_interface_atspi_accessible_name_get(eo_super(obj, ELM_SPINNER_CLASS));
    if (name) return name;
    const char *ret = elm_layout_text_get(obj, "elm.text");
    return ret ? strdup(ret) : NULL;
diff --git a/src/lib/elm_store.c b/src/lib/elm_store.c
index 129ac6525..422718dba 100644
--- a/src/lib/elm_store.c
+++ b/src/lib/elm_store.c
@@ -557,9 +557,8 @@ elm_store_free(Elm_Store *st)
    if (st->genlist)
      {
         evas_object_event_callback_del_full(st->genlist, EVAS_CALLBACK_DEL, _store_genlist_del, st);
-        eo_do(st->genlist,
-              eo_event_callback_del(ELM_GENLIST_EVENT_REALIZED, _store_genlist_item_realized, st),
-              eo_event_callback_del(ELM_GENLIST_EVENT_UNREALIZED, _store_genlist_item_unrealized, st));
+        eo_event_callback_del(st->genlist, ELM_GENLIST_EVENT_REALIZED, _store_genlist_item_realized, st);
+        eo_event_callback_del(st->genlist, ELM_GENLIST_EVENT_UNREALIZED, _store_genlist_item_unrealized, st);
         elm_genlist_clear(st->genlist);
         st->genlist = NULL;
      }
@@ -575,16 +574,14 @@ elm_store_target_genlist_set(Elm_Store *st, Evas_Object *obj)
    if (st->genlist)
      {
         evas_object_event_callback_del_full(st->genlist, EVAS_CALLBACK_DEL, _store_genlist_del, st);
-        eo_do(st->genlist,
-              eo_event_callback_del(ELM_GENLIST_EVENT_REALIZED, _store_genlist_item_realized, st),
-              eo_event_callback_del(ELM_GENLIST_EVENT_UNREALIZED, _store_genlist_item_unrealized, st));
+        eo_event_callback_del(st->genlist, ELM_GENLIST_EVENT_REALIZED, _store_genlist_item_realized, st);
+        eo_event_callback_del(st->genlist, ELM_GENLIST_EVENT_UNREALIZED, _store_genlist_item_unrealized, st);
         elm_genlist_clear(st->genlist);
      }
    st->genlist = obj;
    if (!st->genlist) return;
-   eo_do(st->genlist,
-         eo_event_callback_add(ELM_GENLIST_EVENT_REALIZED, _store_genlist_item_realized, st),
-         eo_event_callback_add(ELM_GENLIST_EVENT_UNREALIZED, _store_genlist_item_unrealized, st));
+   eo_event_callback_add(st->genlist, ELM_GENLIST_EVENT_REALIZED, _store_genlist_item_realized, st);
+   eo_event_callback_add(st->genlist, ELM_GENLIST_EVENT_UNREALIZED, _store_genlist_item_unrealized, st);
    evas_object_event_callback_add(st->genlist, EVAS_CALLBACK_DEL, _store_genlist_del, st);
    elm_genlist_clear(st->genlist);
 }
diff --git a/src/lib/elm_sys_notify.c b/src/lib/elm_sys_notify.c
index 958dd0996..c58659a1a 100644
--- a/src/lib/elm_sys_notify.c
+++ b/src/lib/elm_sys_notify.c
@@ -68,7 +68,7 @@ _elm_sys_notify_eo_base_constructor(Eo                  *obj,
         return NULL;
      }
 
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
    _singleton = obj;
 
    return obj;
@@ -78,7 +78,7 @@ EOLIAN static void
 _elm_sys_notify_eo_base_destructor(Eo                  *obj,
                                    Elm_Sys_Notify_Data *sd  EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, MY_CLASS));
    _singleton = NULL;
 }
 
@@ -104,11 +104,7 @@ _elm_sys_notify_elm_sys_notify_interface_send(const Eo *obj EINA_UNUSED,
    /* Propagate to all registered servers */
    for (i = SRV_DBUS; i < __SRV_LAST; ++i)
      if (sd->servers[i])
-       eo_do(sd->servers[i],
-             elm_obj_sys_notify_interface_send(replaces_id,
-                                               icon, summary, body,
-                                               urgency, timeout,
-                                               cb, cb_data));
+       elm_obj_sys_notify_interface_send(sd->servers[i], replaces_id, icon, summary, body, urgency, timeout, cb, cb_data);
 }
 
 EOLIAN static void
@@ -123,8 +119,7 @@ _elm_sys_notify_elm_sys_notify_interface_simple_send(const Eo *obj EINA_UNUSED,
    /* Propagate to all registered servers */
    for (i = SRV_DBUS; i < __SRV_LAST; ++i)
      if (sd->servers[i])
-       eo_do(sd->servers[i],
-             elm_obj_sys_notify_interface_simple_send(icon, summary, body));
+       elm_obj_sys_notify_interface_simple_send(sd->servers[i], icon, summary, body);
 }
 
 EOLIAN static void
@@ -137,8 +132,7 @@ _elm_sys_notify_elm_sys_notify_interface_close(const Eo *obj EINA_UNUSED,
    /* Propagate to all registered servers */
    for (i = SRV_DBUS; i < __SRV_LAST; ++i)
      if (sd->servers[i])
-       eo_do(sd->servers[i],
-             elm_obj_sys_notify_interface_close(id));
+       elm_obj_sys_notify_interface_close(sd->servers[i], id);
 }
 
 
@@ -228,8 +222,7 @@ _elm_unneed_sys_notify(void)
    Elm_Sys_Notify *manager = elm_sys_notify_singleton_get();
    if (manager)
      {
-        eo_do(manager,
-              elm_obj_sys_notify_servers_set(ELM_SYS_NOTIFY_SERVER_NONE));
+        elm_obj_sys_notify_servers_set(manager, ELM_SYS_NOTIFY_SERVER_NONE);
         eo_del(manager);
      }
 }
@@ -282,18 +275,13 @@ elm_sys_notify_send(unsigned int            replaces_id,
                     Elm_Sys_Notify_Send_Cb  cb,
                     const void             *cb_data)
 {
-   eo_do(_singleton,
-         elm_obj_sys_notify_interface_send(replaces_id,
-                                           icon, summary, body,
-                                           urgency, timeout,
-                                           cb, cb_data));
+   elm_obj_sys_notify_interface_send(_singleton, replaces_id, icon, summary, body, urgency, timeout, cb, cb_data);
 }
 
 EAPI void
 elm_sys_notify_close(unsigned int id)
 {
-   eo_do(_singleton,
-         elm_obj_sys_notify_interface_close(id));
+   elm_obj_sys_notify_interface_close(_singleton, id);
 }
 
 #include "elm_sys_notify.eo.c"
diff --git a/src/lib/elm_sys_notify_dbus.c b/src/lib/elm_sys_notify_dbus.c
index bd0fa1e05..0878ba24e 100644
--- a/src/lib/elm_sys_notify_dbus.c
+++ b/src/lib/elm_sys_notify_dbus.c
@@ -374,7 +374,7 @@ _elm_sys_notify_dbus_eo_base_constructor(Eo   *obj,
 
         eldbus_name_owner_get(_elm_sysnotif_conn, BUS, _name_owner_get_cb, NULL);
 
-        obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+        obj = eo_constructor(eo_super(obj, MY_CLASS));
         return obj;
      }
 
@@ -390,7 +390,7 @@ _elm_sys_notify_dbus_eo_base_destructor(Eo   *obj,
 
    eldbus_connection_unref(_elm_sysnotif_conn);
    _elm_sysnotif_conn = NULL;
-   eo_do_super(obj, MY_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, MY_CLASS));
 }
 
 
diff --git a/src/lib/elm_table.c b/src/lib/elm_table.c
index c86ed36ea..93099d79e 100644
--- a/src/lib/elm_table.c
+++ b/src/lib/elm_table.c
@@ -110,7 +110,7 @@ EOLIAN static Eina_Bool
 _elm_table_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -154,7 +154,7 @@ _elm_table_elm_widget_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, Evas_Object
 {
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_sub_object_del(child));
+   int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), child);
    if (!int_ret) return EINA_FALSE;
 
    _sizing_eval(obj);
@@ -175,12 +175,12 @@ _elm_table_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED)
    evas_object_event_callback_add
      (table, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, obj);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
    elm_widget_highlight_ignore_set(obj, EINA_FALSE);
 
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 }
 
 EOLIAN static void
@@ -207,7 +207,7 @@ _elm_table_evas_object_smart_del(Eo *obj, void *_pd EINA_UNUSED)
           }
      }
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -221,10 +221,9 @@ elm_table_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_table_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
 
    return obj;
 }
@@ -348,7 +347,7 @@ elm_table_pack_set(Evas_Object *subobj,
    Evas_Object *obj = elm_widget_parent_widget_get(subobj);
 
    ELM_TABLE_CHECK(obj);
-   eo_do(obj, elm_obj_table_pack_set(subobj, col, row, colspan, rowspan));
+   elm_obj_table_pack_set(obj, subobj, col, row, colspan, rowspan);
 }
 
 EOLIAN static void
@@ -368,7 +367,7 @@ elm_table_pack_get(Evas_Object *subobj,
 {
    Evas_Object *obj = elm_widget_parent_widget_get(subobj);
    ELM_TABLE_CHECK(obj);
-   eo_do(obj, elm_obj_table_pack_get(subobj, col, row, colspan, rowspan));
+   elm_obj_table_pack_get(obj, subobj, col, row, colspan, rowspan);
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index 51d389bea..6b33e43b6 100644
--- a/src/lib/elm_thumb.c
+++ b/src/lib/elm_thumb.c
@@ -62,9 +62,9 @@ _mouse_down_cb(void *data,
    else sd->on_hold = EINA_FALSE;
 
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     eo_do(obj, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL));
+     eo_event_callback_call(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL);
    else
-     eo_do(obj, eo_event_callback_call(ELM_THUMB_EVENT_PRESS, NULL));
+     eo_event_callback_call(obj, ELM_THUMB_EVENT_PRESS, NULL);
 }
 
 static void
@@ -81,7 +81,7 @@ _mouse_up_cb(void *data,
    else sd->on_hold = EINA_FALSE;
 
    if (!sd->on_hold)
-     eo_do(obj, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+     eo_event_callback_call(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL);
 
    sd->on_hold = EINA_FALSE;
 }
@@ -115,8 +115,8 @@ _thumb_ready_inform(Elm_Thumb_Data *sd,
    edje_object_signal_emit
      (wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm");
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm");
-   eo_do(sd->obj, eo_event_callback_call
-     (ELM_THUMB_EVENT_GENERATE_STOP, NULL));
+   eo_event_callback_call
+     (sd->obj, ELM_THUMB_EVENT_GENERATE_STOP, NULL);
 }
 
 static void
@@ -293,16 +293,16 @@ _thumb_finish(Elm_Thumb_Data *sd,
           wd = eo_data_scope_get(sd->obj, ELM_WIDGET_CLASS);
           edje_object_signal_emit
              (wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm");
-          eo_do(sd->obj, eo_event_callback_call
-            (ELM_THUMB_EVENT_LOAD_ERROR, NULL));
+          eo_event_callback_call
+            (sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL);
        }
 
    return;
 
 err:
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm");
-   eo_do(sd->obj, eo_event_callback_call
-     (ELM_THUMB_EVENT_LOAD_ERROR, NULL));
+   eo_event_callback_call
+     (sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL);
 }
 
 static void
@@ -349,8 +349,8 @@ _on_ethumb_thumb_error(Ethumb_Client *client EINA_UNUSED,
    ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_ERROR, "elm");
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm");
-   eo_do(sd->obj, eo_event_callback_call
-     (ELM_THUMB_EVENT_GENERATE_ERROR, NULL));
+   eo_event_callback_call
+     (sd->obj, ELM_THUMB_EVENT_GENERATE_ERROR, NULL);
 }
 
 static void
@@ -389,8 +389,8 @@ _thumb_start(Elm_Thumb_Data *sd)
    ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd);
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_START, "elm");
    edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_START, "elm");
-   eo_do(sd->obj, eo_event_callback_call
-     (ELM_THUMB_EVENT_GENERATE_START, NULL));
+   eo_event_callback_call
+     (sd->obj, ELM_THUMB_EVENT_GENERATE_START, NULL);
 
    pending_request++;
    ethumb_client_file_set(_elm_ethumb_client, sd->file, sd->key);
@@ -463,7 +463,7 @@ _thumb_show(Elm_Thumb_Data *sd)
 EOLIAN static void
 _elm_thumb_evas_object_smart_show(Eo *obj, Elm_Thumb_Data *sd)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
+   evas_obj_smart_show(eo_super(obj, MY_CLASS));
 
    _thumb_show(sd);
 }
@@ -473,7 +473,7 @@ _elm_thumb_evas_object_smart_hide(Eo *obj, Elm_Thumb_Data *sd)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
+   evas_obj_smart_hide(eo_super(obj, MY_CLASS));
 
    if (sd->thumb.request)
      {
@@ -482,8 +482,8 @@ _elm_thumb_evas_object_smart_hide(Eo *obj, Elm_Thumb_Data *sd)
 
         edje_object_signal_emit
            (wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm");
-        eo_do(sd->obj, eo_event_callback_call
-          (ELM_THUMB_EVENT_GENERATE_STOP, NULL));
+        eo_event_callback_call
+          (sd->obj, ELM_THUMB_EVENT_GENERATE_STOP, NULL);
      }
 
    if (sd->thumb.retry)
@@ -538,7 +538,7 @@ _elm_thumb_evas_object_smart_add(Eo *obj, Elm_Thumb_Data *_pd EINA_UNUSED)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set(obj, "thumb", "base", elm_widget_style_get(obj)))
@@ -579,7 +579,7 @@ _elm_thumb_evas_object_smart_del(Eo *obj, Elm_Thumb_Data *sd)
 
    ecore_event_handler_del(sd->eeh);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -593,11 +593,10 @@ elm_thumb_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_thumb_eo_base_constructor(Eo *obj, Elm_Thumb_Data *sd)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set("Elm_Thumb"),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, "Elm_Thumb");
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
 
    sd->obj = obj;
 
@@ -853,13 +852,13 @@ _elm_thumb_class_constructor(Eo_Class *klass)
 EAPI void
 elm_thumb_file_set(Eo *obj, const char *file, const char *key)
 {
-   eo_do((Eo *) obj, efl_file_set(file, key));
+   efl_file_set((Eo *) obj, file, key);
 }
 
 EAPI void
 elm_thumb_file_get(const Eo *obj, const char **file, const char **key)
 {
-   eo_do((Eo *) obj, efl_file_get(file, key));
+   efl_file_get((Eo *) obj, file, key);
 }
 
 
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 067e47133..1546a7530 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -159,7 +159,7 @@ _item_unselect(Elm_Toolbar_Item_Data *item)
    elm_layout_signal_emit(VIEW(item), "elm,state,unselected", "elm");
    if (item->icon)
      elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm");
-   eo_do(WIDGET(item), eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(item)));
+   eo_event_callback_call(WIDGET(item), EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(item));
    if (_elm_config->atspi_mode)
     elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(item), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
 }
@@ -224,8 +224,8 @@ _item_show(Elm_Toolbar_Item_Data *it)
 
    evas_object_geometry_get(sd->bx, &bx, &by, NULL, NULL);
    evas_object_geometry_get(VIEW(it), &x, &y, &w, &h);
-   eo_do(WIDGET(it), elm_interface_scrollable_content_region_show
-         (x - bx, y - by, w, h));
+   elm_interface_scrollable_content_region_show
+         (WIDGET(it), x - bx, y - by, w, h);
 }
 
 static void
@@ -313,9 +313,8 @@ _elm_toolbar_item_coordinates_calc(Elm_Toolbar_Item_Data *item,
 
    ELM_TOOLBAR_DATA_GET(WIDGET(item), sd);
 
-   eo_do(WIDGET(item),
-         elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &vw, &vh));
+   elm_interface_scrollable_content_viewport_geometry_get
+         (WIDGET(item), NULL, NULL, &vw, &vh);
    evas_object_geometry_get(sd->bx, &bx, &by, NULL, NULL);
    evas_object_geometry_get(VIEW(item), &ix, &iy, &iw, &ih);
 
@@ -368,8 +367,8 @@ _resize_job(void *data)
    ELM_TOOLBAR_DATA_GET(obj, sd);
 
    sd->resize_job = NULL;
-   eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &vw, &vh));
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, &vw, &vh);
    evas_object_size_hint_min_get(sd->bx, &mw, &mh);
    evas_object_geometry_get(sd->bx, NULL, NULL, &w, &h);
 
@@ -426,8 +425,8 @@ _resize_job(void *data)
                             menu_it = elm_menu_item_add
                                 (menu, NULL, it->icon_str, it->label,
                                 _elm_toolbar_item_menu_cb, it);
-                            Eina_Bool disabled = eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get());
-                            eo_do(menu_it, elm_wdg_item_disabled_set(disabled));
+                            Eina_Bool disabled = elm_wdg_item_disabled_get(EO_OBJ(it));
+                            elm_wdg_item_disabled_set(menu_it, disabled);
                             if (it->o_menu)
                               elm_menu_clone(it->o_menu, menu, menu_it);
                          }
@@ -531,15 +530,15 @@ _resize_job(void *data)
           {
              if (h > vh) _items_size_fit(obj, &h, vh);
              if (sd->item_count - sd->separator_count > 0)
-               eo_do(obj, elm_interface_scrollable_paging_set
-                     (0.0, 0.0, 0, (h / (sd->item_count - sd->separator_count))));
+               elm_interface_scrollable_paging_set
+                     (obj, 0.0, 0.0, 0, (h / (sd->item_count - sd->separator_count)));
           }
         else
           {
              if (w > vw) _items_size_fit(obj, &w, vw);
              if (sd->item_count - sd->separator_count > 0)
-               eo_do(obj, elm_interface_scrollable_paging_set
-                     (0.0, 0.0, (w / (sd->item_count - sd->separator_count)), 0));
+               elm_interface_scrollable_paging_set
+                     (obj, 0.0, 0.0, (w / (sd->item_count - sd->separator_count)), 0);
           }
      }
    else
@@ -634,8 +633,8 @@ _elm_toolbar_item_focused(Elm_Object_Item *eo_it)
    focus_raise = elm_layout_data_get(VIEW(it), "focusraise");
    if ((focus_raise) && (!strcmp(focus_raise, "on")))
      evas_object_raise(VIEW(it));
-   eo_do(obj, eo_event_callback_call
-     (ELM_TOOLBAR_EVENT_ITEM_FOCUSED, EO_OBJ(it)));
+   eo_event_callback_call
+     (obj, ELM_TOOLBAR_EVENT_ITEM_FOCUSED, EO_OBJ(it));
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
 }
@@ -661,8 +660,8 @@ _elm_toolbar_item_unfocused(Elm_Object_Item *eo_it)
    elm_layout_signal_emit
       (VIEW(it), "elm,highlight,off", "elm");
    sd->focused_item = NULL;
-   eo_do(obj, eo_event_callback_call
-     (ELM_TOOLBAR_EVENT_ITEM_UNFOCUSED, eo_it));
+   eo_event_callback_call
+     (obj, ELM_TOOLBAR_EVENT_ITEM_UNFOCUSED, eo_it);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
 }
@@ -750,7 +749,7 @@ _elm_toolbar_elm_widget_on_focus(Eo *obj, Elm_Toolbar_Data *sd, Elm_Object_Item
    Eina_Bool int_ret = EINA_FALSE;
    Elm_Object_Item *eo_it = NULL;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus(NULL));
+   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_FALSE;
    if (!sd->items) return EINA_FALSE;
 
@@ -1005,7 +1004,7 @@ _elm_toolbar_item_elm_widget_item_disable(Eo *eo_toolbar, Elm_Toolbar_Item_Data
    Eina_Bool tmp;
    const char* emission;
 
-   if (eo_do_ret(eo_toolbar, tmp, elm_wdg_item_disabled_get()))
+   if (elm_wdg_item_disabled_get(eo_toolbar))
      emission = "elm,state,disabled";
    else
      emission = "elm,state,enabled";
@@ -1086,7 +1085,7 @@ _item_select(Elm_Toolbar_Item_Data *it)
 
    ELM_TOOLBAR_DATA_GET(WIDGET(it), sd);
 
-   if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) || (it->separator) || (it->object))
+   if (elm_wdg_item_disabled_get(EO_OBJ(it)) || (it->separator) || (it->object))
      return;
    if ((sd->shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND) && (!sd->more_item))
      return;
@@ -1177,8 +1176,8 @@ _item_select(Elm_Toolbar_Item_Data *it)
      {
         if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it));
      }
-   eo_do(obj, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, EO_OBJ(it)));
-   eo_do(obj, eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, EO_OBJ(it)));
+   eo_event_callback_call(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, EO_OBJ(it));
+   eo_event_callback_call(obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, EO_OBJ(it));
    if (_elm_config->atspi_mode)
     elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
 }
@@ -1276,7 +1275,7 @@ _item_theme_hook(Evas_Object *obj,
              if (it->icon)
                elm_widget_signal_emit(it->icon, "elm,state,selected", "elm");
           }
-        if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
+        if (elm_wdg_item_disabled_get(EO_OBJ(it)))
           {
              elm_layout_signal_emit(view, "elm,state,disabled", "elm");
              if (it->icon)
@@ -1405,8 +1404,8 @@ _sizing_eval(Evas_Object *obj)
    evas_object_resize(wd->resize_obj, w, h);
 
    evas_object_size_hint_min_get(sd->bx, &minw_bx, &minh_bx);
-   eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get
-         (NULL, NULL, &vw, &vh));
+   elm_interface_scrollable_content_viewport_geometry_get
+         (obj, NULL, NULL, &vw, &vh);
 
    if (sd->shrink_mode == ELM_TOOLBAR_SHRINK_NONE)
      {
@@ -1482,7 +1481,7 @@ _elm_toolbar_elm_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
    if (sd->delete_me) return EINA_TRUE;
 
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    elm_widget_theme_object_set
@@ -1624,7 +1623,7 @@ _elm_toolbar_item_elm_widget_item_part_content_set(Eo *eo_item EINA_UNUSED, Elm_
 
    if (part && strcmp(part, "object") && strcmp(part, "elm.swallow.object"))
      {
-        eo_do(VIEW(item), elm_obj_container_content_set(part, content));
+        elm_obj_container_content_set(VIEW(item), part, content);
         return;
      }
    if (item->object == content) return;
@@ -1647,7 +1646,7 @@ _elm_toolbar_item_elm_widget_item_part_content_get(Eo *eo_it EINA_UNUSED, Elm_To
 
    if (part && strcmp(part, "object") && strcmp(part, "elm.swallow.object"))
      {
-        eo_do(VIEW(it), content = elm_obj_container_content_get(part));
+        content = elm_obj_container_content_get(VIEW(it), part);
         if (content) return content;
         else return NULL;
      }
@@ -1666,7 +1665,7 @@ _elm_toolbar_item_elm_widget_item_part_content_unset(Eo *eo_item EINA_UNUSED, El
 
    if (part && strcmp(part, "object") && strcmp(part, "elm.swallow.object"))
      {
-        eo_do(VIEW(item), o = elm_obj_container_content_unset(part));
+        o = elm_obj_container_content_unset(VIEW(item), part);
         return o;
      }
 
@@ -1686,9 +1685,9 @@ _elm_toolbar_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd)
    Elm_Toolbar_Item_Data *it;
 
    EINA_INLIST_FOREACH(sd->items, it)
-     eo_do(EO_OBJ(it), elm_wdg_item_translate());
+     elm_wdg_item_translate(EO_OBJ(it));
 
-   eo_do_super(obj, MY_CLASS, elm_obj_widget_translate());
+   elm_obj_widget_translate(eo_super(obj, MY_CLASS));
 
    return EINA_TRUE;
 }
@@ -2053,7 +2052,7 @@ _mouse_up_reorder(Elm_Toolbar_Item_Data *it,
         ELM_SAFE_FREE(it->proxy, evas_object_del);
      }
 
-   eo_do(obj, elm_interface_scrollable_hold_set(EINA_FALSE));
+   elm_interface_scrollable_hold_set(obj, EINA_FALSE);
 }
 
 static void
@@ -2101,7 +2100,7 @@ _item_reorder_start(Elm_Toolbar_Item_Data *item)
    evas_object_move(item->proxy, x, y);
    evas_object_show(item->proxy);
 
-   eo_do(WIDGET(item), elm_interface_scrollable_hold_set(EINA_TRUE));
+   elm_interface_scrollable_hold_set(WIDGET(item), EINA_TRUE);
 }
 
 static Eina_Bool
@@ -2116,7 +2115,7 @@ _long_press_cb(void *data)
    if (sd->reorder_mode)
      _item_reorder_start(it);
 
-   eo_do(WIDGET(it), eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it)));
+   eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it));
 
    return ECORE_CALLBACK_CANCEL;
 }
@@ -2149,7 +2148,7 @@ _mouse_down_cb(Elm_Toolbar_Item_Data *it,
 
    if (ev->button != 1) return;
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     eo_do(WIDGET(it), eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it)));
+     eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
    sd->mouse_down = EINA_TRUE;
    sd->long_press = EINA_FALSE;
    if (sd->long_timer)
@@ -2216,21 +2215,21 @@ static void
 _scroll_cb(Evas_Object *obj,
            void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL));
+   eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL);
 }
 
 static void
 _scroll_anim_start_cb(Evas_Object *obj,
                       void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL));
+   eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL);
 }
 
 static void
 _scroll_anim_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL));
+   eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL);
 }
 
 static void
@@ -2240,14 +2239,14 @@ _scroll_drag_start_cb(Evas_Object *obj,
    ELM_TOOLBAR_DATA_GET(obj, sd);
    ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
 
-   eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL));
+   eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL);
 }
 
 static void
 _scroll_drag_stop_cb(Evas_Object *obj,
                      void *data EINA_UNUSED)
 {
-   eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL));
+   eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL);
 }
 
 static void
@@ -2282,7 +2281,7 @@ _access_state_cb(void *data, Evas_Object *obj EINA_UNUSED)
 
    if (it->separator)
      return strdup(E_("Separator"));
-   else if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()))
+   else if (elm_wdg_item_disabled_get(EO_OBJ(it)))
      return strdup(E_("State: Disabled"));
    else if (it->selected)
      return strdup(E_("State: Selected"));
@@ -2319,9 +2318,9 @@ _elm_toolbar_item_eo_base_destructor(Eo *eo_item, Elm_Toolbar_Item_Data *item)
    _item_del(item);
 
    if (item != sd->more_item)
-      eo_do(obj, elm_obj_widget_theme_apply());
+      elm_obj_widget_theme_apply(obj);
 
-   eo_do_super(eo_item, ELM_TOOLBAR_ITEM_CLASS, eo_destructor());
+   eo_destructor(eo_super(eo_item, ELM_TOOLBAR_ITEM_CLASS));
 }
 
 static void
@@ -2333,7 +2332,7 @@ _access_activate_cb(void *data EINA_UNUSED,
    ELM_TOOLBAR_DATA_GET(WIDGET(it), sd);
    Eina_Bool tmp;
 
-   if (eo_do_ret(item, tmp, elm_wdg_item_disabled_get())) return;
+   if (elm_wdg_item_disabled_get(item)) return;
 
    if (it->selected && (sd->select_mode != ELM_OBJECT_SELECT_MODE_ALWAYS))
      {
@@ -2363,9 +2362,9 @@ _access_widget_item_register(Elm_Toolbar_Item_Data *it)
 EOLIAN static Eo *
 _elm_toolbar_item_eo_base_constructor(Eo *eo_it, Elm_Toolbar_Item_Data *it)
 {
-   eo_it = eo_do_super_ret(eo_it, ELM_TOOLBAR_ITEM_CLASS, eo_it, eo_constructor());
+   eo_it = eo_constructor(eo_super(eo_it, ELM_TOOLBAR_ITEM_CLASS));
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
-   eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_MENU_ITEM));
+   elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_MENU_ITEM);
 
    return eo_it;
 }
@@ -2397,7 +2396,7 @@ _item_new(Evas_Object *obj,
 
    VIEW(it) = elm_layout_add(obj);
    evas_object_data_set(VIEW(it), "item", it);
-   eo_do(VIEW(it), elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_DISABLED));
+   elm_interface_atspi_accessible_type_set(VIEW(it), ELM_ATSPI_TYPE_DISABLED);
 
    icon_obj = elm_icon_add(VIEW(it));
    elm_icon_order_lookup_set(icon_obj, sd->lookup_order);
@@ -2726,7 +2725,7 @@ _elm_toolbar_evas_object_smart_add(Eo *obj, Elm_Toolbar_Data *priv)
    edje = edje_object_add(evas_object_evas_get(obj));
    elm_widget_resize_object_set(obj, edje, EINA_TRUE);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
 
    elm_widget_theme_object_set
      (obj, edje, "toolbar", "base", elm_widget_style_get(obj));
@@ -2742,20 +2741,19 @@ _elm_toolbar_evas_object_smart_add(Eo *obj, Elm_Toolbar_Data *priv)
 
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
-   eo_do(obj, elm_interface_scrollable_objects_set(edje, priv->hit_rect));
+   elm_interface_scrollable_objects_set(obj, edje, priv->hit_rect);
 
    priv->standard_priority = -99999;
 
-   eo_do(obj,
-         elm_interface_scrollable_bounce_allow_set
-         (_elm_config->thumbscroll_bounce_enable, EINA_FALSE),
-         elm_interface_scrollable_policy_set
-         (ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF),
-         elm_interface_scrollable_scroll_cb_set(_scroll_cb),
-         elm_interface_scrollable_animate_start_cb_set(_scroll_anim_start_cb),
-         elm_interface_scrollable_animate_stop_cb_set(_scroll_anim_stop_cb),
-         elm_interface_scrollable_drag_start_cb_set(_scroll_drag_start_cb),
-         elm_interface_scrollable_drag_stop_cb_set(_scroll_drag_stop_cb));
+   elm_interface_scrollable_bounce_allow_set
+         (obj, _elm_config->thumbscroll_bounce_enable, EINA_FALSE);
+   elm_interface_scrollable_policy_set
+         (obj, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF);
+   elm_interface_scrollable_scroll_cb_set(obj, _scroll_cb);
+   elm_interface_scrollable_animate_start_cb_set(obj, _scroll_anim_start_cb);
+   elm_interface_scrollable_animate_stop_cb_set(obj, _scroll_anim_stop_cb);
+   elm_interface_scrollable_drag_start_cb_set(obj, _scroll_drag_start_cb);
+   elm_interface_scrollable_drag_stop_cb_set(obj, _scroll_drag_stop_cb);
 
    edje_object_signal_callback_add
      (edje, "elm,action,left", "elm", _elm_toolbar_action_left_cb, obj);
@@ -2777,7 +2775,7 @@ _elm_toolbar_evas_object_smart_add(Eo *obj, Elm_Toolbar_Data *priv)
    evas_object_box_align_set(priv->bx, priv->align, 0.5);
    evas_object_box_layout_set(priv->bx, _layout, obj, NULL);
    elm_widget_sub_object_add(obj, priv->bx);
-   eo_do(obj, elm_interface_scrollable_content_set(priv->bx));
+   elm_interface_scrollable_content_set(obj, priv->bx);
    evas_object_show(priv->bx);
 
    priv->more = elm_layout_add(obj);
@@ -2788,7 +2786,7 @@ _elm_toolbar_evas_object_smart_add(Eo *obj, Elm_Toolbar_Data *priv)
    else
      elm_object_signal_emit(priv->more, "elm,orient,horizontal", "elm");
 
-   eo_do(priv->more, elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_DISABLED));
+   elm_interface_atspi_accessible_type_set(priv->more, ELM_ATSPI_TYPE_DISABLED);
    elm_widget_sub_object_add(obj, priv->more);
    evas_object_show(priv->more);
 
@@ -2833,19 +2831,19 @@ _elm_toolbar_evas_object_smart_del(Eo *obj, Elm_Toolbar_Data *sd)
    while (it)
      {
         next = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
-        eo_do(EO_OBJ(it), elm_wdg_item_del());
+        elm_wdg_item_del(EO_OBJ(it));
         it = next;
      }
-   if (sd->more_item) eo_do(EO_OBJ(sd->more_item), elm_wdg_item_del());
+   if (sd->more_item) elm_wdg_item_del(EO_OBJ(sd->more_item));
    ecore_timer_del(sd->long_timer);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EOLIAN static void
 _elm_toolbar_evas_object_smart_move(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord x, Evas_Coord y)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
+   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
 
    evas_object_move(sd->hit_rect, x, y);
 }
@@ -2853,7 +2851,7 @@ _elm_toolbar_evas_object_smart_move(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord x,
 EOLIAN static void
 _elm_toolbar_evas_object_smart_resize(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord w, Evas_Coord h)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
 
    evas_object_resize(sd->hit_rect, w, h);
 }
@@ -2861,7 +2859,7 @@ _elm_toolbar_evas_object_smart_resize(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord
 EOLIAN static void
 _elm_toolbar_evas_object_smart_member_add(Eo *obj, Elm_Toolbar_Data *sd, Evas_Object *member)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
+   evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
 
    if (sd->hit_rect)
      evas_object_raise(sd->hit_rect);
@@ -3004,11 +3002,10 @@ elm_toolbar_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_toolbar_eo_base_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_TOOL_BAR));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TOOL_BAR);
 
    return obj;
 }
@@ -3022,7 +3019,7 @@ _elm_toolbar_icon_size_set(Eo *obj, Elm_Toolbar_Data *sd, int icon_size)
    if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size;
    else sd->icon_size = sd->theme_icon_size;
 
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 }
 
 EOLIAN static int
@@ -3365,39 +3362,39 @@ _elm_toolbar_shrink_mode_set(Eo *obj, Elm_Toolbar_Data *sd, Elm_Toolbar_Shrink_M
    sd->shrink_mode = shrink_mode;
    bounce = (_elm_config->thumbscroll_bounce_enable) &&
      (shrink_mode == ELM_TOOLBAR_SHRINK_SCROLL);
-   eo_do(obj, elm_interface_scrollable_bounce_allow_set(bounce, EINA_FALSE));
+   elm_interface_scrollable_bounce_allow_set(obj, bounce, EINA_FALSE);
 
    if (sd->more_item)
      {
-        eo_do(EO_OBJ(sd->more_item), elm_wdg_item_del());
+        elm_wdg_item_del(EO_OBJ(sd->more_item));
         sd->more_item = NULL;
      }
 
    if (shrink_mode == ELM_TOOLBAR_SHRINK_MENU)
      {
         elm_toolbar_homogeneous_set(obj, EINA_FALSE);
-        eo_do(obj, elm_interface_scrollable_policy_set
-              (ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF));
+        elm_interface_scrollable_policy_set
+              (obj, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
         sd->more_item = _item_new(obj, "more_menu", "More", NULL, NULL);
         _resizing_eval_item(sd->more_item);
      }
    else if (shrink_mode == ELM_TOOLBAR_SHRINK_HIDE)
      {
         elm_toolbar_homogeneous_set(obj, EINA_FALSE);
-        eo_do(obj, elm_interface_scrollable_policy_set
-              (ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF));
+        elm_interface_scrollable_policy_set
+              (obj, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
      }
    else if (shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND)
      {
         elm_toolbar_homogeneous_set(obj, EINA_FALSE);
-        eo_do(obj, elm_interface_scrollable_policy_set
-              (ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF));
+        elm_interface_scrollable_policy_set
+              (obj, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF);
         sd->more_item = _item_new(obj, "more_menu", "More", NULL, NULL);
         _resizing_eval_item(sd->more_item);
      }
    else
-      eo_do(obj, elm_interface_scrollable_policy_set
-            (ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF));
+      elm_interface_scrollable_policy_set
+            (obj, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF);
 
    EINA_INLIST_FOREACH(sd->items, it)
       _item_shrink_signal_emit(VIEW(it), sd->shrink_mode);
@@ -3647,7 +3644,7 @@ _elm_toolbar_item_state_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item
    if (item->icon)
      {
         Eina_Bool tmp;
-        if (eo_do_ret(EO_OBJ(item), tmp, elm_wdg_item_disabled_get()))
+        if (elm_wdg_item_disabled_get(EO_OBJ(item)))
           elm_widget_signal_emit(item->icon, "elm,state,disabled", "elm");
         else
           elm_widget_signal_emit(item->icon, "elm,state,enabled", "elm");
@@ -3661,7 +3658,7 @@ _elm_toolbar_item_state_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item
 EAPI void
 elm_toolbar_item_state_unset(Elm_Object_Item *it)
 {
-   eo_do(it, elm_obj_toolbar_item_state_set(NULL));
+   elm_obj_toolbar_item_state_set(it, NULL);
 }
 
 EOLIAN static Elm_Toolbar_Item_State *
@@ -3815,8 +3812,8 @@ _elm_toolbar_item_show(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item,
    ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
 
    if (_elm_toolbar_item_coordinates_calc(item, type, &x, &y, &w, &h))
-     eo_do(WIDGET(item), elm_interface_scrollable_content_region_show
-     (x, y, w, h));
+     elm_interface_scrollable_content_region_show
+     (WIDGET(item), x, y, w, h);
 }
 
 EOLIAN static void
@@ -3828,15 +3825,15 @@ _elm_toolbar_item_bring_in(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item,
    ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
 
    if (_elm_toolbar_item_coordinates_calc(item, type, &x, &y, &w, &h))
-     eo_do(WIDGET(item), elm_interface_scrollable_region_bring_in
-     (x, y, w, h));
+     elm_interface_scrollable_region_bring_in
+     (WIDGET(item), x, y, w, h);
 }
 
 EOLIAN static char*
 _elm_toolbar_item_elm_interface_atspi_accessible_name_get(Eo *eo_item, Elm_Toolbar_Item_Data *item)
 {
    char *ret;
-   eo_do_super(eo_item, ELM_TOOLBAR_ITEM_CLASS, ret = elm_interface_atspi_accessible_name_get());
+   ret = elm_interface_atspi_accessible_name_get(eo_super(eo_item, ELM_TOOLBAR_ITEM_CLASS));
    if (ret) return ret;
    return item->label ? strdup(item->label) : NULL;
 }
@@ -3847,9 +3844,9 @@ _elm_toolbar_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_To
    Elm_Atspi_State_Set ret;
    Eina_Bool sel;
 
-   eo_do_super(eo_it, ELM_TOOLBAR_ITEM_CLASS, ret = elm_interface_atspi_accessible_state_set_get());
+   ret = elm_interface_atspi_accessible_state_set_get(eo_super(eo_it, ELM_TOOLBAR_ITEM_CLASS));
 
-   eo_do(eo_it, sel = elm_obj_toolbar_item_selected_get());
+   sel = elm_obj_toolbar_item_selected_get(eo_it);
 
    STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTABLE);
 
@@ -3890,7 +3887,7 @@ _elm_toolbar_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, El
 {
    Eina_List *ret = NULL, *ret2 = NULL;
    Elm_Toolbar_Item_Data *it;
-   eo_do_super(obj, ELM_TOOLBAR_CLASS, ret2 = elm_interface_atspi_accessible_children_get());
+   ret2 = elm_interface_atspi_accessible_children_get(eo_super(obj, ELM_TOOLBAR_CLASS));
 
    EINA_INLIST_FOREACH(sd->items, it)
       ret = eina_list_append(ret, EO_OBJ(it));
@@ -3902,7 +3899,7 @@ EOLIAN static Elm_Atspi_State_Set
 _elm_toolbar_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Toolbar_Data *sd EINA_UNUSED)
 {
    Elm_Atspi_State_Set ret;
-   eo_do_super(obj, ELM_TOOLBAR_CLASS, ret = elm_interface_atspi_accessible_state_set_get());
+   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_TOOLBAR_CLASS));
 
    return ret;
 }
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index d5b2a0a91..209ab06eb 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -251,7 +251,7 @@ _elm_video_evas_object_smart_add(Eo *obj, Elm_Video_Data *priv)
 {
    _elm_emotion_init();
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
@@ -263,7 +263,7 @@ _elm_video_evas_object_smart_add(Eo *obj, Elm_Video_Data *priv)
 
    elm_layout_content_set(obj, "elm.swallow.video", priv->emotion);
 
-   eo_do(priv->emotion, eo_event_callback_array_add(_video_cb(), obj));
+   eo_event_callback_array_add(priv->emotion, _video_cb(), obj);
 
    evas_object_event_callback_add
      (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, NULL);
@@ -277,7 +277,7 @@ _elm_video_evas_object_smart_del(Eo *obj, Elm_Video_Data *sd)
    ecore_timer_del(sd->timer);
    if (sd->remember) emotion_object_last_position_save(sd->emotion);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -291,11 +291,10 @@ elm_video_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_video_eo_base_constructor(Eo *obj, Elm_Video_Data *_pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ANIMATION));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);
 
    return obj;
 }
@@ -473,13 +472,13 @@ EAPI Eina_Bool
 elm_video_file_set(Eo *obj, const char *filename)
 {
    Eina_Bool ret;
-   return eo_do_ret((Eo *) obj, ret, efl_file_set(filename, NULL));
+   return efl_file_set((Eo *) obj, filename, NULL);
 }
 
 EAPI void
 elm_video_file_get(Eo *obj, const char **filename)
 {
-   eo_do((Eo *) obj, efl_file_get(filename, NULL));
+   efl_file_get((Eo *) obj, filename, NULL);
 }
 
 
diff --git a/src/lib/elm_view_form.c b/src/lib/elm_view_form.c
index 6a6dab912..26c437e88 100644
--- a/src/lib/elm_view_form.c
+++ b/src/lib/elm_view_form.c
@@ -63,7 +63,7 @@ _efl_model_properties_change_cb(void *data, const Eo_Event *event)
           {
             if (!strcmp(w->widget_propname, prop))
               {
-                 eo_do(priv->model_obj, efl_model_property_get(prop, &value));
+                 efl_model_property_get(priv->model_obj, prop, &value);
                  w->widget_obj_set_cb(priv->model_obj, w->widget_obj, value, w->widget_propname);
               }
           }
@@ -81,7 +81,7 @@ _update_model_properties(Elm_View_Form_Data *priv)
    //update all widgets property
    EINA_LIST_FOREACH(priv->l, l, w)
      {
-        eo_do(priv->model_obj, efl_model_property_get(w->widget_propname, &value));
+        efl_model_property_get(priv->model_obj, w->widget_propname, &value);
         w->widget_obj_set_cb(priv->model_obj, w->widget_obj, value, w->widget_propname);
      }
 }
@@ -150,7 +150,7 @@ _elm_evas_object_text_changed_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *o
    EINA_SAFETY_ON_NULL_RETURN(w);
    eina_value_setup(&value, EINA_VALUE_TYPE_STRING);
    eina_value_set(&value, elm_object_text_get(obj));
-   eo_do(priv->model_obj, efl_model_property_set(w->widget_propname, &value));
+   efl_model_property_set(priv->model_obj, w->widget_propname, &value);
    eina_value_flush(&value);
 }
 /**
@@ -188,7 +188,7 @@ _elm_view_widget_add(Elm_View_Form_Data *priv, const char *propname, Evas_Object
         EINA_SAFETY_ON_NULL_RETURN_VAL(NULL, EINA_FALSE);
      }
 
-   eo_do(priv->model_obj, efl_model_property_get(propname, &value));
+   efl_model_property_get(priv->model_obj, propname, &value);
    if (value)
      {
          w->widget_obj_set_cb(priv->model_obj, w->widget_obj, value, w->widget_propname);
@@ -210,7 +210,7 @@ _elm_view_form_eo_base_constructor(Eo *obj EINA_UNUSED, Elm_View_Form_Data *_pd)
    Elm_View_Form_Data *priv = (Elm_View_Form_Data *)_pd;
    priv->model_obj = NULL;
 
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   eo_constructor(eo_super(obj, MY_CLASS));
    
    return obj;
 }
@@ -228,7 +228,7 @@ _elm_view_form_eo_base_destructor(Eo *obj, Elm_View_Form_Data *priv)
         free(w);
      }
 
-   eo_do_super(obj, MY_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, MY_CLASS));
 }
 
 
@@ -237,7 +237,7 @@ _elm_view_form_model_set(Eo *obj EINA_UNUSED, Elm_View_Form_Data *priv, Eo *mode
 {
    if (priv->model_obj != NULL)
      {
-        eo_do(priv->model_obj, eo_event_callback_del(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv));
+        eo_event_callback_del(priv->model_obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv);
         eo_unref(priv->model_obj);
      }
 
@@ -246,7 +246,7 @@ _elm_view_form_model_set(Eo *obj EINA_UNUSED, Elm_View_Form_Data *priv, Eo *mode
    if (priv->model_obj != NULL)
      {
         eo_ref(priv->model_obj);
-        eo_do(priv->model_obj, eo_event_callback_add(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv));
+        eo_event_callback_add(priv->model_obj, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, priv);
         _update_model_properties(priv);
      }
 }
diff --git a/src/lib/elm_view_list.c b/src/lib/elm_view_list.c
index bb0d2534e..dc03f2bd2 100644
--- a/src/lib/elm_view_list.c
+++ b/src/lib/elm_view_list.c
@@ -62,7 +62,7 @@ _item_sel_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
 
    EINA_SAFETY_ON_NULL_RETURN(data);
 
-   eo_do(idata->priv->view, eo_event_callback_call(ELM_VIEW_LIST_EVENT_MODEL_SELECTED, idata->model));
+   eo_event_callback_call(idata->priv->view, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, idata->model);
 }
 
 static void
@@ -72,9 +72,8 @@ _item_del(void *data, Evas_Object *obj EINA_UNUSED)
    if (!idata)
       return;
 
-   eo_do(idata->model,
-         eo_event_callback_array_del(model_callbacks(), idata),
-         eo_event_callback_del(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, idata));
+   eo_event_callback_array_del(idata->model, model_callbacks(), idata);
+   eo_event_callback_del(idata->model, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, idata);
 
    eo_unref(idata->model);
    idata->model = NULL;
@@ -99,7 +98,7 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part)
    const char *prop = eina_hash_find(priv->prop_con, part);
    if (prop == NULL) prop = part;
 
-   eo_do(idata->model, efl_model_property_get(prop, &value));
+   efl_model_property_get(idata->model, prop, &value);
    if (value == NULL)
      return content;
 
@@ -151,7 +150,7 @@ _item_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part)
    const char *prop = eina_hash_find(priv->prop_con, part);
    if (prop == NULL) prop = part;
 
-   eo_do(idata->model, efl_model_property_get(prop, &value));
+   efl_model_property_get(idata->model, prop, &value);
    if (value)
      text = eina_value_to_string(value);
 
@@ -167,8 +166,8 @@ _expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(idata, EINA_TRUE);
 
-   eo_do(idata->model, st = efl_model_load_status_get());
-   eo_do(idata->model, eo_event_callback_array_add(model_callbacks(), idata));
+   st = efl_model_load_status_get(idata->model);
+   eo_event_callback_array_add(idata->model, model_callbacks(), idata);
 
    if (st & EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN)
      {
@@ -176,7 +175,7 @@ _expand_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
      }
    else
      {
-        eo_do(idata->model, efl_model_children_load());
+        efl_model_children_load(idata->model);
      }
    return EINA_TRUE;
 }
@@ -187,7 +186,7 @@ _contract_request_cb(void *data EINA_UNUSED, const Eo_Event *event)
    Elm_Object_Item *item = event->event_info;
    View_List_ItemData *idata = elm_object_item_data_get(item);
 
-   eo_do(idata->model, eo_event_callback_array_del(model_callbacks(), idata));
+   eo_event_callback_array_del(idata->model, model_callbacks(), idata);
    elm_genlist_item_expanded_set(item, EINA_FALSE);
    return EINA_TRUE;
 }
@@ -207,8 +206,7 @@ _genlist_deleted(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_
 
    if (priv && priv->genlist && priv->genlist == obj)
      {
-        eo_do(priv->genlist,
-              eo_event_callback_array_del(genlist_callbacks(), priv));
+        eo_event_callback_array_del(priv->genlist, genlist_callbacks(), priv);
         eo_unref(priv->genlist);
         priv->genlist = NULL;
      }
@@ -241,11 +239,11 @@ _efl_model_load_children(View_List_ItemData *pdata)
    Elm_View_List_Data *priv = pdata->priv;
    unsigned int i, total = 0;
 
-   eo_do(pdata->model, efl_model_children_count_get(&total));
+   efl_model_children_count_get(pdata->model, &total);
    if (total == 0)
      return;
 
-   eo_do(pdata->model, efl_model_children_slice_get(0 ,0 ,(Eina_Accessor **)&accessor));
+   efl_model_children_slice_get(pdata->model, 0, 0, (Eina_Accessor **)&accessor);
 
    EINA_SAFETY_ON_NULL_RETURN(accessor);
 
@@ -258,10 +256,8 @@ _efl_model_load_children(View_List_ItemData *pdata)
         idata->parent = pdata;
         idata->model = child;
         eo_ref(child);
-        eo_do(child,
-              eo_event_callback_add(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED,
-                                    _efl_model_properties_change_cb, idata));
-        eo_do(child, efl_model_properties_load());
+        eo_event_callback_add(child, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, _efl_model_properties_change_cb, idata);
+        efl_model_properties_load(child);
         idata->item = elm_genlist_item_append(priv->genlist, priv->itc, idata, pdata->item,
                                                        priv->itype, _item_sel_cb, idata);
      }
@@ -308,9 +304,8 @@ _priv_model_set(Elm_View_List_Data *priv, Eo *model)
 
    if (priv->model != NULL)
      {
-         eo_do(priv->model,
-               eo_event_callback_array_del(model_callbacks(), priv->rootdata));
-         eo_do(priv->genlist, elm_obj_genlist_clear());
+         eo_event_callback_array_del(priv->model, model_callbacks(), priv->rootdata);
+         elm_obj_genlist_clear(priv->genlist);
          eo_unref(priv->model);
          priv->model = NULL;
      }
@@ -322,9 +317,8 @@ _priv_model_set(Elm_View_List_Data *priv, Eo *model)
    priv->rootdata->model = priv->model;
    eo_ref(priv->model);
 
-   eo_do(priv->model,
-         eo_event_callback_array_add(model_callbacks(), priv->rootdata),
-         load_st = efl_model_load_status_get());
+   eo_event_callback_array_add(priv->model, model_callbacks(), priv->rootdata);
+   load_st = efl_model_load_status_get(priv->model);
    if (load_st & EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN)
      {
          _efl_model_load_children(priv->rootdata);
@@ -356,8 +350,7 @@ _elm_view_list_genlist_set(Eo *obj, Elm_View_List_Data *priv, Evas_Object *genli
    priv->itc->func.del = _item_del;
    priv->prop_con = eina_hash_string_superfast_new(free);
 
-   eo_do(priv->genlist,
-         eo_event_callback_array_add(genlist_callbacks(), priv));
+   eo_event_callback_array_add(priv->genlist, genlist_callbacks(), priv);
    evas_object_event_callback_add(priv->genlist, EVAS_CALLBACK_DEL, _genlist_deleted, priv);
 }
 
@@ -368,10 +361,9 @@ _elm_view_list_eo_base_destructor(Eo *obj, Elm_View_List_Data *priv)
    EINA_SAFETY_ON_NULL_RETURN(priv);
    EINA_SAFETY_ON_NULL_RETURN(obj);
 
-   eo_do(priv->model,
-         eo_event_callback_array_del(model_callbacks(), priv->rootdata));
+   eo_event_callback_array_del(priv->model, model_callbacks(), priv->rootdata);
 
-   eo_do(priv->genlist, elm_obj_genlist_clear());
+   elm_obj_genlist_clear(priv->genlist);
    free((void *)priv->itc->item_style);
    elm_genlist_item_class_free(priv->itc);
 
@@ -380,14 +372,13 @@ _elm_view_list_eo_base_destructor(Eo *obj, Elm_View_List_Data *priv)
    priv->rootdata = NULL;
    if (priv->genlist) {
      evas_object_event_callback_del(priv->genlist, EVAS_CALLBACK_DEL, _genlist_deleted);
-     eo_do(priv->genlist,
-           eo_event_callback_array_del(genlist_callbacks(), priv));
+     eo_event_callback_array_del(priv->genlist, genlist_callbacks(), priv);
      eo_unref(priv->genlist);
    }
 
    eo_unref(priv->model);
 
-   eo_do_super(obj, MY_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, MY_CLASS));
 }
 
 static void
diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c
index e3e9bfb94..64e1c7fb5 100644
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -78,7 +78,7 @@ _view_smart_window_close(Ewk_View_Smart_Data *sd)
 
    ELM_WEB_CHECK(obj);
 
-   eo_do(obj, eo_event_callback_call(ELM_WEB_EVENT_WINDOWS_CLOSE_REQUEST, NULL));
+   eo_event_callback_call(obj, ELM_WEB_EVENT_WINDOWS_CLOSE_REQUEST, NULL);
 }
 
 static void
@@ -196,8 +196,8 @@ _view_smart_popup_menu_show(Ewk_View_Smart_Data *sd,
 
    evas_object_data_set(sd->self, "_select_popup", notify);
 
-   eo_do(notify, eo_event_callback_add
-     (ELM_NOTIFY_EVENT_BLOCK_CLICKED, _popup_dismiss_cb, menu));
+   eo_event_callback_add
+     (notify, ELM_NOTIFY_EVENT_BLOCK_CLICKED, _popup_dismiss_cb, menu);
 
    return EINA_TRUE;
 }
@@ -260,14 +260,14 @@ _view_smart_fullscreen_enter(Ewk_View_Smart_Data *sd, Ewk_Security_Origin *origi
    btn = elm_button_add(popup);
    elm_object_text_set(btn, "Accept");
    elm_object_part_content_set(popup, "button1", btn);
-   eo_do(btn, eo_event_callback_add
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _fullscreen_accept, sd->self));
+   eo_event_callback_add
+     (btn, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _fullscreen_accept, sd->self);
 
    btn = elm_button_add(popup);
    elm_object_text_set(btn, "Deny");
    elm_object_part_content_set(popup, "button2", btn);
-   eo_do(btn, eo_event_callback_add
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _fullscreen_deny, sd->self));
+   eo_event_callback_add
+     (btn, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _fullscreen_deny, sd->self);
 
    evas_object_data_set(sd->self, "_fullscreen_permission_popup", popup);
    evas_object_show(popup);
@@ -322,8 +322,8 @@ _dialog_new(Evas_Object *web, Eina_Bool inwin_mode)
         Evas_Object *bg;
 
         d->dialog = elm_win_add(NULL, "elm-web-popup", ELM_WIN_DIALOG_BASIC);
-        eo_do(d->dialog, eo_event_callback_add
-          (ELM_WIN_EVENT_DELETE_REQUEST, _bt_close, d));
+        eo_event_callback_add
+          (d->dialog, ELM_WIN_EVENT_DELETE_REQUEST, _bt_close, d);
 
         bg = elm_bg_add(d->dialog);
         evas_object_size_hint_weight_set
@@ -372,8 +372,8 @@ _dialog_ok_cancel_buttons_add(Dialog_Data *dialog_data)
    elm_box_pack_end(bx, bt);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   eo_do(bt, eo_event_callback_add
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _bt_close, dialog_data));
+   eo_event_callback_add
+     (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _bt_close, dialog_data);
    evas_object_show(bt);
 
    dialog_data->bt_ok = bt = elm_button_add(bx);
@@ -381,8 +381,8 @@ _dialog_ok_cancel_buttons_add(Dialog_Data *dialog_data)
    elm_box_pack_end(bx, bt);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   eo_do(bt, eo_event_callback_add
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _bt_close, dialog_data));
+   eo_event_callback_add
+     (bt, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _bt_close, dialog_data);
    evas_object_show(bt);
 }
 
@@ -430,8 +430,8 @@ _view_smart_run_javascript_alert(Ewk_View_Smart_Data *vsd, const char *message)
         elm_box_pack_end(dialog_data->box, dialog_data->bt_ok);
         evas_object_size_hint_align_set
           (dialog_data->bt_ok, EVAS_HINT_FILL, EVAS_HINT_FILL);
-        eo_do(dialog_data->bt_ok, eo_event_callback_add
-          (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _bt_close, dialog_data));
+        eo_event_callback_add
+          (dialog_data->bt_ok, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _bt_close, dialog_data);
         evas_object_show(dialog_data->bt_ok);
 
         evas_object_show(dialog);
@@ -586,8 +586,8 @@ static Eina_Bool
 _view_smart_url_changed_cb(void *data,
       Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-   eo_do(data, eo_event_callback_call(ELM_WEB_EVENT_URI_CHANGED, event_info));
-   eo_do(data, eo_event_callback_call(ELM_WEB_EVENT_URL_CHANGED, event_info));
+   eo_event_callback_call(data, ELM_WEB_EVENT_URI_CHANGED, event_info);
+   eo_event_callback_call(data, ELM_WEB_EVENT_URL_CHANGED, event_info);
 
    return EINA_TRUE;
 }
@@ -595,8 +595,8 @@ _view_smart_url_changed_cb(void *data,
 static void
 _view_smart_callback_proxy(Evas_Object *view, Evas_Object *parent)
 {
-   eo_do(view, eo_event_callback_add
-     (ELM_WEB_EVENT_URL_CHANGED, _view_smart_url_changed_cb, parent));
+   eo_event_callback_add
+     (view, ELM_WEB_EVENT_URL_CHANGED, _view_smart_url_changed_cb, parent);
 }
 
 static Eina_Bool _elm_need_web = EINA_FALSE;
@@ -641,7 +641,7 @@ _elm_web_elm_widget_on_focus(Eo *obj, Elm_Web_Data *sd, Elm_Object_Item *item EI
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_TRUE);
    Eina_Bool int_ret = EINA_FALSE;
 
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus(NULL));
+   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_TRUE;
 
    top = elm_widget_top_get(obj);
@@ -705,7 +705,7 @@ _elm_web_evas_object_smart_add(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED)
    resize_obj = _view_add(obj);
    elm_widget_resize_object_set(obj, resize_obj, EINA_TRUE);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
    //TODO: need a way to change theme
@@ -718,7 +718,7 @@ _elm_web_evas_object_smart_add(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED)
    elm_object_text_set(resize_obj, "WebKit not supported!");
    elm_widget_resize_object_set(obj, resize_obj, EINA_TRUE);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 #endif
 }
@@ -726,7 +726,7 @@ _elm_web_evas_object_smart_add(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED)
 EOLIAN static void
 _elm_web_evas_object_smart_del(Eo *obj, Elm_Web_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 }
 
 EAPI Evas_Object *
@@ -740,12 +740,11 @@ elm_web_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_web_eo_base_constructor(Eo *obj, Elm_Web_Data *sd)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
    sd->obj = obj;
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_elm_web_smart_callbacks),
-         elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_HTML_CONTAINER));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _elm_web_smart_callbacks);
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_HTML_CONTAINER);
 
    return obj;
 }
@@ -874,7 +873,7 @@ elm_web_uri_set(Evas_Object *obj, const char *url)
 {
    ELM_WEB_CHECK(obj) EINA_FALSE;
    Eina_Bool ret = EINA_FALSE;
-   eo_do(obj, ret = elm_obj_web_url_set(url));
+   ret = elm_obj_web_url_set(obj, url);
    return ret;
 }
 
@@ -882,7 +881,7 @@ EAPI const char *
 elm_web_uri_get(const Evas_Object *obj)
 {
    const char *ret = NULL;
-   eo_do((Eo *) obj, ret = elm_obj_web_url_get());
+   ret = elm_obj_web_url_get((Eo *) obj);
    return ret;
 }
 
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 53d4a8a37..ac7aeb3e7 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -107,13 +107,11 @@ _callbacks_add(Eo *widget, void *data)
 {
    if (_elm_widget_is(widget))
      {
-        eo_do(widget,
-              eo_event_callback_array_add(elm_widget_subitems_callbacks(), data));
+        eo_event_callback_array_add(widget, elm_widget_subitems_callbacks(), data);
      }
    else
      {
-        eo_do(widget,
-              eo_event_callback_array_add(efl_subitems_callbacks(), data));
+        eo_event_callback_array_add(widget, efl_subitems_callbacks(), data);
      }
 }
 
@@ -122,13 +120,11 @@ _callbacks_del(Eo *widget, void *data)
 {
    if (_elm_widget_is(widget))
      {
-        eo_do(widget,
-              eo_event_callback_array_del(elm_widget_subitems_callbacks(), data));
+        eo_event_callback_array_del(widget, elm_widget_subitems_callbacks(), data);
      }
    else
      {
-        eo_do(widget,
-              eo_event_callback_array_del(efl_subitems_callbacks(), data));
+        eo_event_callback_array_del(widget, efl_subitems_callbacks(), data);
      }
 }
 
@@ -598,7 +594,7 @@ EOLIAN static void
 _elm_widget_evas_object_smart_member_add(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child)
 {
    int r, g, b, a;
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(child));
+   evas_obj_smart_member_add(eo_super(obj, MY_CLASS), child);
 
    if (evas_object_data_get(child, "_elm_leaveme")) return;
 
@@ -618,7 +614,7 @@ _elm_widget_evas_object_smart_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_D
 {
    if (!evas_object_data_get(child, "_elm_leaveme"))
       evas_object_clip_unset(child);
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_member_del(child));
+   evas_obj_smart_member_del(eo_super(obj, MY_CLASS), child);
 }
 
 // internal funcs
@@ -637,7 +633,7 @@ _elm_widget_focus_chain_manager_is(const Evas_Object *obj)
    ELM_WIDGET_CHECK(obj) EINA_FALSE;
 
    Eina_Bool manager_is = EINA_FALSE;
-   eo_do((Eo *)obj, manager_is = elm_obj_widget_focus_next_manager_is());
+   manager_is = elm_obj_widget_focus_next_manager_is((Eo *)obj);
    return manager_is;
 }
 
@@ -647,7 +643,7 @@ _internal_elm_widget_focus_direction_manager_is(const Evas_Object *obj)
    ELM_WIDGET_CHECK(obj) EINA_FALSE;
 
    Eina_Bool manager_is = EINA_FALSE;
-   eo_do((Eo *)obj, manager_is = elm_obj_widget_focus_direction_manager_is());
+   manager_is = elm_obj_widget_focus_direction_manager_is((Eo *)obj);
    return manager_is;
 }
 
@@ -745,7 +741,7 @@ _elm_widget_focus_region_show(const Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNU
         if (_elm_scrollable_is(o) && !elm_widget_disabled_get(o))
           {
              Evas_Coord sx, sy;
-             eo_do(o, elm_interface_scrollable_content_region_get(&sx, &sy, NULL, NULL));
+             elm_interface_scrollable_content_region_get(o, &sx, &sy, NULL, NULL);
 
              // Get the object's on_focus_region position relative to the scroller. 
              Evas_Coord rx, ry;
@@ -755,10 +751,10 @@ _elm_widget_focus_region_show(const Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNU
              switch (_elm_config->focus_autoscroll_mode)
                {
                 case ELM_FOCUS_AUTOSCROLL_MODE_SHOW:
-                   eo_do(o, elm_interface_scrollable_content_region_show(rx, ry, w, h));
+                   elm_interface_scrollable_content_region_show(o, rx, ry, w, h);
                    break;
                 case ELM_FOCUS_AUTOSCROLL_MODE_BRING_IN:
-                   eo_do(o, elm_interface_scrollable_region_bring_in(rx, ry, w, h));
+                   elm_interface_scrollable_region_bring_in(o, rx, ry, w, h);
                    break;
                 default:
                    break;
@@ -817,7 +813,7 @@ _parent_focus(Evas_Object *obj, Elm_Object_Item *item)
    if (sd->top_win_focused)
      {
         sd->focused = EINA_TRUE;
-        eo_do(obj, elm_obj_widget_on_focus(item));
+        elm_obj_widget_on_focus(obj, item);
      }
    sd->focus_order_on_calc = EINA_FALSE;
 
@@ -867,8 +863,8 @@ elm_widget_access(Evas_Object *obj,
           ret &= elm_widget_access(child, is_access);
      }
 
-   eo_do(obj, elm_obj_widget_access(is_access));
-   eo_do(obj, eo_event_callback_call(ELM_WIDGET_EVENT_ACCESS_CHANGED, NULL));
+   elm_obj_widget_access(obj, is_access);
+   eo_event_callback_call(obj, ELM_WIDGET_EVENT_ACCESS_CHANGED, NULL);
 
    return ret;
 }
@@ -901,7 +897,7 @@ elm_widget_theme(Evas_Object *obj)
      elm_cursor_theme(cur);
 
    Eina_Bool ret2 = EINA_FALSE;
-   eo_do(obj, ret2 = elm_obj_widget_theme_apply());
+   ret2 = elm_obj_widget_theme_apply(obj);
    ret &= ret2;
 
    return ret;
@@ -949,7 +945,7 @@ elm_widget_theme_specific(Evas_Object *obj,
      elm_tooltip_theme(tt);
    EINA_LIST_FOREACH(sd->cursors, l, cur)
      elm_cursor_theme(cur);
-   eo_do(obj, elm_obj_widget_theme_apply());
+   elm_obj_widget_theme_apply(obj);
 }
 
 EOLIAN static Eina_Bool
@@ -1052,7 +1048,7 @@ elm_widget_sub_object_parent_add(Evas_Object *sobj)
    Eina_Bool ret = EINA_FALSE;
    Eo *parent = NULL;
 
-   eo_do(sobj, parent = eo_parent_get());
+   parent = eo_parent_get(sobj);
    if (!eo_isa(parent, ELM_WIDGET_CLASS))
      {
         ERR("You passed a wrong parent parameter (%p %s). "
@@ -1060,7 +1056,7 @@ elm_widget_sub_object_parent_add(Evas_Object *sobj)
         return ret;
      }
 
-   eo_do(parent, ret = elm_obj_widget_sub_object_add(sobj));
+   ret = elm_obj_widget_sub_object_add(parent, sobj);
 
    return ret;
 }
@@ -1109,7 +1105,7 @@ _elm_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj
         sdc->parent_obj = obj;
 
         if (!sdc->on_create)
-          eo_do(sobj, elm_obj_widget_orientation_set(sd->orient_mode));
+          elm_obj_widget_orientation_set(sobj, sd->orient_mode);
         else
           sdc->orient_mode = sd->orient_mode;
 
@@ -1118,7 +1114,7 @@ _elm_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj
              if (!sdc->disabled && (elm_widget_disabled_get(obj)))
                {
                   elm_widget_focus_disabled_handle(sobj);
-                  eo_do(sobj, elm_obj_widget_disable());
+                  elm_obj_widget_disable(sobj);
                }
           }
 
@@ -1188,7 +1184,7 @@ _elm_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj
         if (_elm_config->atspi_mode && !sd->on_create)
           {
              Elm_Interface_Atspi_Accessible *aparent;
-             eo_do(sobj, aparent = elm_interface_atspi_accessible_parent_get());
+             aparent = elm_interface_atspi_accessible_parent_get(sobj);
              if (aparent)
                 elm_interface_atspi_accessible_children_changed_added_signal_emit(aparent, sobj);
           }
@@ -1266,7 +1262,7 @@ _elm_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj
         if (_elm_config->atspi_mode && !sd->on_destroy)
           {
              Elm_Interface_Atspi_Accessible *aparent;
-             eo_do(sobj, aparent = elm_interface_atspi_accessible_parent_get());
+             aparent = elm_interface_atspi_accessible_parent_get(sobj);
              if (aparent)
                 elm_interface_atspi_accessible_children_changed_del_signal_emit(aparent, sobj);
           }
@@ -1382,7 +1378,7 @@ _elm_widget_can_focus_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool can_focu
              sd->child_can_focus = EINA_TRUE;
           }
 
-        eo_do(obj, eo_event_callback_array_add(focus_callbacks(), NULL));
+        eo_event_callback_array_add(obj, focus_callbacks(), NULL);
      }
    else
      {
@@ -1409,7 +1405,7 @@ _elm_widget_can_focus_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool can_focu
              if (sdp->child_can_focus) break;
              parent = sdp->parent_obj;
           }
-        eo_do(obj, eo_event_callback_array_del(focus_callbacks(), NULL));
+        eo_event_callback_array_del(obj, focus_callbacks(), NULL);
      }
 }
 
@@ -1588,7 +1584,7 @@ _elm_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd)
      {
         Evas_Object *ret = NULL;
         if (!eo_isa(sd->parent_obj, ELM_WIDGET_CLASS)) return NULL;
-        eo_do((Eo *) sd->parent_obj, ret = elm_obj_widget_top_get());
+        ret = elm_obj_widget_top_get((Eo *) sd->parent_obj);
         return ret;
      }
    return (Evas_Object *)obj;
@@ -1694,7 +1690,7 @@ _elm_widget_event_propagate(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eva
              continue;
           }
 
-        eo_do(parent, int_ret = elm_obj_widget_event(obj, type, event_info));
+        int_ret = elm_obj_widget_event(parent, obj, type, event_info);
         if (int_ret) return EINA_TRUE;
 
         EINA_LIST_FOREACH_SAFE(sd->event_cb, l, l_prev, ecd)
@@ -2283,7 +2279,7 @@ _elm_widget_focus_direction_get(const Eo *obj, Elm_Widget_Smart_Data *sd, const
    if (_internal_elm_widget_focus_direction_manager_is(obj))
      {
         Eina_Bool int_ret = EINA_FALSE;
-        eo_do((Eo *)obj, int_ret = elm_obj_widget_focus_direction(base, degree, direction, direction_item, weight));
+        int_ret = elm_obj_widget_focus_direction((Eo *)obj, base, degree, direction, direction_item, weight);
         return int_ret;
      }
 
@@ -2402,7 +2398,7 @@ _elm_widget_focus_next_get(const Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Focus_D
    if (_elm_widget_focus_chain_manager_is(obj))
      {
         Eina_Bool int_ret = EINA_FALSE;
-        eo_do((Eo *)obj, int_ret = elm_obj_widget_focus_next(dir, next, next_item));
+        int_ret = elm_obj_widget_focus_next((Eo *)obj, dir, next, next_item);
         if (!int_ret && elm_widget_focus_get(obj))
           {
              Evas_Object *o = NULL;
@@ -2849,7 +2845,7 @@ _elm_widget_focus_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool focus)
         focus_order++;
         sd->focus_order = focus_order;
         sd->focused = EINA_TRUE;
-        eo_do(obj, elm_obj_widget_on_focus(NULL));
+        elm_obj_widget_on_focus(obj, NULL);
      }
 
    if (focus)
@@ -2906,7 +2902,7 @@ _focused_object_clear(Elm_Widget_Smart_Data *sd)
    if (sd->resize_obj && elm_widget_is(sd->resize_obj) &&
          elm_widget_focus_get(sd->resize_obj))
      {
-        eo_do(sd->resize_obj, elm_obj_widget_focused_object_clear());
+        elm_obj_widget_focused_object_clear(sd->resize_obj);
      }
    else
      {
@@ -2916,7 +2912,7 @@ _focused_object_clear(Elm_Widget_Smart_Data *sd)
           {
              if (_elm_widget_is(child) && elm_widget_focus_get(child))
                {
-                  eo_do(child, elm_obj_widget_focused_object_clear());
+                  elm_obj_widget_focused_object_clear(child);
                   break;
                }
           }
@@ -2929,7 +2925,7 @@ _elm_widget_focused_object_clear(Eo *obj, Elm_Widget_Smart_Data *sd)
    if (!sd->focused) return;
    _focused_object_clear(sd);
    sd->focused = EINA_FALSE;
-   eo_do(obj, elm_obj_widget_on_focus(NULL));
+   elm_obj_widget_on_focus(obj, NULL);
 }
 
 EOLIAN static void
@@ -2953,7 +2949,7 @@ _elm_widget_focus_steal(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item *ite
      }
    if ((!elm_widget_parent_get(parent)) &&
        (!elm_widget_parent2_get(parent)))
-     eo_do(parent, elm_obj_widget_focused_object_clear());
+     elm_obj_widget_focused_object_clear(parent);
    else
      {
         parent2 = elm_widget_parent_get(parent);
@@ -3026,7 +3022,7 @@ _elm_widget_disabled_eval(const Evas_Object *obj, Eina_Bool disabled)
               if (elm_widget_is(child))
                 {
                    elm_widget_focus_disabled_handle(child);
-                   eo_do(child, elm_obj_widget_disable());
+                   elm_obj_widget_disable(child);
                    _elm_widget_disabled_eval(child, EINA_TRUE);
                 }
           }
@@ -3039,7 +3035,7 @@ _elm_widget_disabled_eval(const Evas_Object *obj, Eina_Bool disabled)
              if (elm_widget_is(child) && !sdc->disabled)
                {
                   elm_widget_focus_disabled_handle(child);
-                  eo_do(child, elm_obj_widget_disable());
+                  elm_obj_widget_disable(child);
                   _elm_widget_disabled_eval(child, EINA_FALSE);
                }
           }
@@ -3056,7 +3052,7 @@ _elm_widget_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled)
    if (disabled)
      {
         elm_widget_focus_disabled_handle(obj);
-        eo_do(obj, elm_obj_widget_disable());
+        elm_obj_widget_disable(obj);
         _elm_widget_disabled_eval(obj, EINA_TRUE);
      }
    else
@@ -3064,7 +3060,7 @@ _elm_widget_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled)
         parent_state = elm_widget_disabled_get(elm_widget_parent_get(obj));
         if (parent_state) return;
         elm_widget_focus_disabled_handle(obj);
-        eo_do(obj, elm_obj_widget_disable());
+        elm_obj_widget_disable(obj);
         _elm_widget_disabled_eval(obj, EINA_FALSE);
      }
 }
@@ -3103,7 +3099,7 @@ _elm_widget_show_region_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Coord x, Ev
 
         if (_elm_scrollable_is(obj))
           {
-             eo_do(obj, elm_interface_scrollable_content_pos_get(&nx, &ny));
+             elm_interface_scrollable_content_pos_get(obj, &nx, &ny);
              x -= nx;
              y -= ny;
           }
@@ -3170,7 +3166,7 @@ EOLIAN static Eina_Bool
 _elm_widget_focus_region_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do((Eo *)obj, int_ret = elm_obj_widget_on_focus_region(x, y, w, h));
+   int_ret = elm_obj_widget_on_focus_region((Eo *)obj, x, y, w, h);
    if (!int_ret)
      {
         evas_object_geometry_get(obj, NULL, NULL, w, h);
@@ -3197,7 +3193,7 @@ _elm_widget_parents_bounce_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED,
 
         if (_elm_scrollable_is(parent_obj))
           {
-             eo_do(parent_obj, elm_interface_scrollable_bounce_allow_get(&h, &v));
+             elm_interface_scrollable_bounce_allow_get(parent_obj, &h, &v);
              if (h) *horiz = EINA_TRUE;
              if (v) *vert = EINA_TRUE;
           }
@@ -3231,7 +3227,7 @@ _elm_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd)
    if (sd->scroll_hold == 1)
      {
         if (_elm_scrollable_is(obj))
-           eo_do(obj, elm_interface_scrollable_hold_set(EINA_TRUE));
+           elm_interface_scrollable_hold_set(obj, EINA_TRUE);
         else
           {
              Eina_List *scr_children, *l;
@@ -3240,12 +3236,12 @@ _elm_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd)
              scr_children = elm_widget_scrollable_children_get(obj);
              EINA_LIST_FOREACH(scr_children, l, child)
                {
-                  eo_do(child, elm_interface_scrollable_hold_set(EINA_TRUE));
+                  elm_interface_scrollable_hold_set(child, EINA_TRUE);
                }
              eina_list_free(scr_children);
           }
      }
-   if (sd->parent_obj) eo_do(sd->parent_obj, elm_obj_widget_scroll_hold_push());
+   if (sd->parent_obj) elm_obj_widget_scroll_hold_push(sd->parent_obj);
    // FIXME: on delete/reparent hold pop
 }
 
@@ -3256,7 +3252,7 @@ _elm_widget_scroll_hold_pop(Eo *obj, Elm_Widget_Smart_Data *sd)
    if (!sd->scroll_hold)
      {
         if (_elm_scrollable_is(obj))
-           eo_do(obj, elm_interface_scrollable_hold_set(EINA_FALSE));
+           elm_interface_scrollable_hold_set(obj, EINA_FALSE);
         else
           {
              Eina_List *scr_children, *l;
@@ -3265,12 +3261,12 @@ _elm_widget_scroll_hold_pop(Eo *obj, Elm_Widget_Smart_Data *sd)
              scr_children = elm_widget_scrollable_children_get(obj);
              EINA_LIST_FOREACH(scr_children, l, child)
                {
-                  eo_do(child, elm_interface_scrollable_hold_set(EINA_FALSE));
+                  elm_interface_scrollable_hold_set(child, EINA_FALSE);
                }
              eina_list_free(scr_children);
           }
      }
-   if (sd->parent_obj) eo_do(sd->parent_obj, elm_obj_widget_scroll_hold_pop());
+   if (sd->parent_obj) elm_obj_widget_scroll_hold_pop(sd->parent_obj);
    if (sd->scroll_hold < 0) sd->scroll_hold = 0;
 }
 
@@ -3287,7 +3283,7 @@ _elm_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd)
    if (sd->scroll_freeze == 1)
      {
         if (_elm_scrollable_is(obj))
-           eo_do(obj, elm_interface_scrollable_freeze_set(EINA_TRUE));
+           elm_interface_scrollable_freeze_set(obj, EINA_TRUE);
         else
           {
              Eina_List *scr_children, *l;
@@ -3296,12 +3292,12 @@ _elm_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd)
              scr_children = elm_widget_scrollable_children_get(obj);
              EINA_LIST_FOREACH(scr_children, l, child)
                {
-                  eo_do(child, elm_interface_scrollable_freeze_set(EINA_TRUE));
+                  elm_interface_scrollable_freeze_set(child, EINA_TRUE);
                }
              eina_list_free(scr_children);
           }
      }
-   if (sd->parent_obj) eo_do(sd->parent_obj, elm_obj_widget_scroll_freeze_push());
+   if (sd->parent_obj) elm_obj_widget_scroll_freeze_push(sd->parent_obj);
    // FIXME: on delete/reparent freeze pop
 }
 
@@ -3312,7 +3308,7 @@ _elm_widget_scroll_freeze_pop(Eo *obj, Elm_Widget_Smart_Data *sd)
    if (!sd->scroll_freeze)
      {
         if (_elm_scrollable_is(obj))
-           eo_do(obj, elm_interface_scrollable_freeze_set(EINA_FALSE));
+           elm_interface_scrollable_freeze_set(obj, EINA_FALSE);
         else
           {
              Eina_List *scr_children, *l;
@@ -3321,12 +3317,12 @@ _elm_widget_scroll_freeze_pop(Eo *obj, Elm_Widget_Smart_Data *sd)
              scr_children = elm_widget_scrollable_children_get(obj);
              EINA_LIST_FOREACH(scr_children, l, child)
                {
-                  eo_do(child, elm_interface_scrollable_freeze_set(EINA_FALSE));
+                  elm_interface_scrollable_freeze_set(child, EINA_FALSE);
                }
              eina_list_free(scr_children);
           }
      }
-   if (sd->parent_obj) eo_do(sd->parent_obj, elm_obj_widget_scroll_freeze_pop());
+   if (sd->parent_obj) elm_obj_widget_scroll_freeze_pop(sd->parent_obj);
    if (sd->scroll_freeze < 0) sd->scroll_freeze = 0;
 }
 
@@ -3476,7 +3472,7 @@ _elm_widget_domain_translatable_part_text_set(Eo *obj, Elm_Widget_Smart_Data *sd
      }
 
    sd->on_translate = EINA_TRUE;
-   eo_do(obj, elm_obj_widget_part_text_set(part, label));
+   elm_obj_widget_part_text_set(obj, part, label);
    sd->on_translate = EINA_FALSE;
 }
 
@@ -3502,7 +3498,7 @@ _elm_widget_domain_part_text_translatable_set(Eo *obj, Elm_Widget_Smart_Data *sd
    if (!ts->domain) ts->domain = eina_stringshare_add(domain);
    else eina_stringshare_replace(&ts->domain, domain);
 
-   eo_do(obj, text = elm_obj_widget_part_text_get(part));
+   text = elm_obj_widget_part_text_get(obj, part);
    if (!text || !text[0]) return;
 
    if (!ts->string) ts->string = eina_stringshare_add(text);
@@ -3512,7 +3508,7 @@ _elm_widget_domain_part_text_translatable_set(Eo *obj, Elm_Widget_Smart_Data *sd
    text = dgettext(domain, text);
 #endif
    sd->on_translate = EINA_TRUE;
-   eo_do(obj, elm_obj_widget_part_text_set(part, text));
+   elm_obj_widget_part_text_set(obj, part, text);
    sd->on_translate = EINA_FALSE;
 }
 
@@ -3520,7 +3516,7 @@ EAPI void
 elm_widget_translate(Evas_Object *obj)
 {
    ELM_WIDGET_CHECK(obj);
-   eo_do(obj, elm_obj_widget_translate());
+   elm_obj_widget_translate(obj);
 }
 
 static const char*
@@ -3572,11 +3568,11 @@ _elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSE
         if (!ts->string) continue;
         const char *s = dgettext(ts->domain, ts->string);
         sd->on_translate = EINA_TRUE;
-        eo_do(obj, elm_obj_widget_part_text_set(ts->id, s));
+        elm_obj_widget_part_text_set(obj, ts->id, s);
         sd->on_translate = EINA_FALSE;
      }
 #endif
-   eo_do(obj, eo_event_callback_call(ELM_WIDGET_EVENT_LANGUAGE_CHANGED, NULL));
+   eo_event_callback_call(obj, ELM_WIDGET_EVENT_LANGUAGE_CHANGED, NULL);
    return EINA_TRUE;
 }
 
@@ -3586,7 +3582,7 @@ elm_widget_content_part_set(Evas_Object *obj,
                             Evas_Object *content)
 {
    ELM_WIDGET_CHECK(obj);
-   eo_do(obj, elm_obj_container_content_set(part, content));
+   elm_obj_container_content_set(obj, part, content);
 }
 
 EAPI Evas_Object *
@@ -3595,7 +3591,7 @@ elm_widget_content_part_get(const Evas_Object *obj,
 {
    ELM_WIDGET_CHECK(obj) NULL;
    Evas_Object *ret = NULL;
-   eo_do((Eo *) obj, ret = elm_obj_container_content_get(part));
+   ret = elm_obj_container_content_get((Eo *) obj, part);
    return ret;
 }
 
@@ -3605,7 +3601,7 @@ elm_widget_content_part_unset(Evas_Object *obj,
 {
    ELM_WIDGET_CHECK(obj) NULL;
    Evas_Object *ret = NULL;
-   eo_do(obj, ret = elm_obj_container_content_unset(part));
+   ret = elm_obj_container_content_unset(obj, part);
    return ret;
 }
 
@@ -3744,7 +3740,7 @@ _elm_widget_theme_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *ed
      {
         char buf[128];
         snprintf(buf, sizeof(buf), "elm,state,orient,%d", sd->orient_mode);
-        eo_do(obj, elm_obj_widget_signal_emit(buf, "elm"));
+        elm_obj_widget_signal_emit(obj, buf, "elm");
      }
 
    return EINA_TRUE;
@@ -3753,7 +3749,7 @@ _elm_widget_theme_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *ed
 EOLIAN static void
 _elm_widget_eo_base_dbg_info_get(Eo *eo_obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eo_Dbg_Info *root)
 {
-   eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root));
+   eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
    Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
 
    EO_DBG_INFO_APPEND(group, "Wid-Type", EINA_VALUE_TYPE_STRING, elm_widget_type_get(eo_obj));
@@ -3926,7 +3922,7 @@ elm_widget_focus_mouse_up_handle(Evas_Object *obj)
      }
    while (o);
 
-   eo_do(o, elm_obj_widget_focus_mouse_up_handle());
+   elm_obj_widget_focus_mouse_up_handle(o);
 }
 
 EOLIAN static void
@@ -4082,8 +4078,7 @@ _elm_widget_focus_highlight_geometry_get(const Eo *obj, Elm_Widget_Smart_Data *s
      {
         if (_elm_scrollable_is(scroller))
           {
-             eo_do(scroller,
-                   elm_interface_scrollable_content_viewport_geometry_get(&ox, &oy, &ow, &oh));
+             elm_interface_scrollable_content_viewport_geometry_get(scroller, &ox, &oy, &ow, &oh);
 
              if (*y < oy)
                *y = oy;
@@ -4128,7 +4123,7 @@ elm_widget_activate(Evas_Object *obj, Elm_Activate act)
 
    ret = EINA_FALSE;
 
-   eo_do(obj, ret = elm_obj_widget_activate(act));
+   ret = elm_obj_widget_activate(obj, act);
 
    if (ret) return;
 
@@ -4187,7 +4182,7 @@ _elm_widget_orientation_mode_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Ei
         if (!sd_parent) orient_mode = 0;
         else orient_mode = sd_parent->orient_mode;
      }
-   eo_do(obj, elm_obj_widget_orientation_set(orient_mode));
+   elm_obj_widget_orientation_set(obj, orient_mode);
 }
 
 EOLIAN static Eina_Bool
@@ -4208,14 +4203,14 @@ _elm_widget_orientation_set(Eo *obj, Elm_Widget_Smart_Data *sd, int orient_mode)
    EINA_LIST_FOREACH (sd->subobjs, l, child)
      {
         if (elm_widget_is(child))
-          eo_do(child, elm_obj_widget_orientation_set(orient_mode));
+          elm_obj_widget_orientation_set(child, orient_mode);
      }
 
    if (orient_mode != -1)
      {
         char buf[128];
         snprintf(buf, sizeof(buf), "elm,state,orient,%d", orient_mode);
-        eo_do(obj, elm_obj_widget_signal_emit(buf, "elm"));
+        elm_obj_widget_signal_emit(obj, buf, "elm");
      }
 }
 
@@ -4309,7 +4304,7 @@ _track_obj_del(void *data, Evas *e EINA_UNUSED,
 
    if (!item->view) return;
 
-   eo_do(item->view, eo_event_callback_array_del(tracker_callbacks(), item));
+   eo_event_callback_array_del(item->view, tracker_callbacks(), item);
 }
 
 static void
@@ -4380,7 +4375,7 @@ EOLIAN static Eo *
 _elm_widget_item_eo_base_constructor(Eo *eo_item, Elm_Widget_Item_Data *item)
 {
    Evas_Object *widget;
-   eo_do (eo_item, widget = eo_parent_get());
+   widget = eo_parent_get(eo_item);
 
    if (!_elm_widget_is(widget))
      {
@@ -4388,13 +4383,13 @@ _elm_widget_item_eo_base_constructor(Eo *eo_item, Elm_Widget_Item_Data *item)
         return NULL;
      }
 
-   eo_item = eo_do_super_ret(eo_item, ELM_WIDGET_ITEM_CLASS, eo_item, eo_constructor());
+   eo_item = eo_constructor(eo_super(eo_item, ELM_WIDGET_ITEM_CLASS));
 
    EINA_MAGIC_SET(item, ELM_WIDGET_ITEM_MAGIC);
 
    item->widget = widget;
    item->eo_obj = eo_item;
-   eo_do(eo_item, eo_event_callback_add(EO_BASE_EVENT_DEL, _eo_del_cb, NULL));
+   eo_event_callback_add(eo_item, EO_BASE_EVENT_DEL, _eo_del_cb, NULL);
 
    return eo_item;
 }
@@ -4426,18 +4421,16 @@ _elm_widget_item_eo_base_destructor(Eo *eo_item, Elm_Widget_Item_Data *item)
      }
    eina_hash_free(item->labels);
 
-   eo_do(eo_item,
-         elm_interface_atspi_accessible_description_set(NULL),
-         elm_interface_atspi_accessible_name_set(NULL),
-         elm_interface_atspi_accessible_translation_domain_set(NULL),
-         elm_interface_atspi_accessible_relationships_clear()
-         );
+   elm_interface_atspi_accessible_description_set(eo_item, NULL);
+   elm_interface_atspi_accessible_name_set(eo_item, NULL);
+   elm_interface_atspi_accessible_translation_domain_set(eo_item, NULL);
+   elm_interface_atspi_accessible_relationships_clear(eo_item);
 
    elm_interface_atspi_accessible_removed(eo_item);
 
    EINA_MAGIC_SET(item, EINA_MAGIC_NONE);
 
-   eo_do_super(eo_item, ELM_WIDGET_ITEM_CLASS, eo_destructor());
+   eo_destructor(eo_super(eo_item, ELM_WIDGET_ITEM_CLASS));
 }
 
 /**
@@ -4472,7 +4465,7 @@ _elm_widget_item_del(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item)
 
    //Widget item delete callback
    Eina_Bool del_ok;
-   eo_do(item->eo_obj, del_ok = elm_wdg_item_del_pre());
+   del_ok = elm_wdg_item_del_pre(item->eo_obj);
    if (del_ok)
       eo_del(item->eo_obj);
    return;
@@ -4656,7 +4649,7 @@ _elm_widget_item_disabled_set(Eo *eo_item EINA_UNUSED,
 
    if (item->disabled == disabled) return;
    item->disabled = !!disabled;
-   eo_do(item->eo_obj, elm_wdg_item_disable());
+   elm_wdg_item_disable(item->eo_obj);
 }
 
 EOLIAN static Eina_Bool
@@ -4727,7 +4720,7 @@ _elm_widget_item_domain_translatable_part_text_set(Eo *eo_item EINA_UNUSED,
 #endif
      }
    item->on_translate = EINA_TRUE;
-   eo_do(item->eo_obj, elm_wdg_item_part_text_set(part, label));
+   elm_wdg_item_part_text_set(item->eo_obj, part, label);
    item->on_translate = EINA_FALSE;
 }
 
@@ -4763,7 +4756,7 @@ _elm_widget_item_domain_part_text_translatable_set(Eo *eo_item EINA_UNUSED,
    if (!ts->domain) ts->domain = eina_stringshare_add(domain);
    else eina_stringshare_replace(&ts->domain, domain);
 
-   eo_do(item->eo_obj, text = elm_wdg_item_part_text_get(part));
+   text = elm_wdg_item_part_text_get(item->eo_obj, part);
 
    if (!text || !text[0]) return;
 
@@ -4774,7 +4767,7 @@ _elm_widget_item_domain_part_text_translatable_set(Eo *eo_item EINA_UNUSED,
    text = dgettext(domain, text);
 #endif
    item->on_translate = EINA_TRUE;
-   eo_do (item->eo_obj, elm_wdg_item_part_text_set(part, text));
+   elm_wdg_item_part_text_set(item->eo_obj, part, text);
    item->on_translate = EINA_FALSE;
 }
 
@@ -4818,8 +4811,7 @@ _elm_widget_item_track(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item)
    evas_object_event_callback_add(track, EVAS_CALLBACK_DEL, _track_obj_del,
                                   item);
 
-   eo_do(item->view,
-         eo_event_callback_array_add(tracker_callbacks(), item));
+   eo_event_callback_array_add(item->view, tracker_callbacks(), item);
 
    evas_object_ref(track);
 
@@ -4920,10 +4912,7 @@ _elm_widget_item_tooltip_text_set(Eo *eo_item EINA_UNUSED,
    EINA_SAFETY_ON_NULL_RETURN(text);
 
    text = eina_stringshare_add(text);
-   eo_do(item->eo_obj, elm_wdg_item_tooltip_content_cb_set(
-            _elm_widget_item_tooltip_label_create,
-            text,
-            _elm_widget_item_tooltip_label_del_cb));
+   elm_wdg_item_tooltip_content_cb_set(item->eo_obj, _elm_widget_item_tooltip_label_create, text, _elm_widget_item_tooltip_label_del_cb);
 }
 
 EOLIAN static void
@@ -4936,10 +4925,7 @@ _elm_widget_item_tooltip_translatable_text_set(Eo *eo_item EINA_UNUSED,
    EINA_SAFETY_ON_NULL_RETURN(text);
 
    text = eina_stringshare_add(text);
-   eo_do(item->eo_obj, elm_wdg_item_tooltip_content_cb_set(
-            _elm_widget_item_tooltip_trans_label_create,
-            text,
-            _elm_widget_item_tooltip_label_del_cb));
+   elm_wdg_item_tooltip_content_cb_set(item->eo_obj, _elm_widget_item_tooltip_trans_label_create, text, _elm_widget_item_tooltip_label_del_cb);
 }
 
 static Evas_Object *
@@ -4997,7 +4983,7 @@ _elm_widget_item_tooltip_content_cb_set(Eo *eo_item EINA_UNUSED,
 
    if (!func)
      {
-        eo_do(item->eo_obj, elm_wdg_item_tooltip_unset());
+        elm_wdg_item_tooltip_unset(item->eo_obj);
         return;
      }
 
@@ -5332,7 +5318,7 @@ _elm_widget_item_part_text_custom_foreach(const Eina_Hash *labels EINA_UNUSED,
    label = data;
    item = func_data;
 
-   eo_do(item->eo_obj, elm_wdg_item_part_text_set(label->part, label->text));
+   elm_wdg_item_part_text_set(item->eo_obj, label->part, label->text);
 
    return EINA_TRUE;
 }
@@ -5445,7 +5431,7 @@ _elm_widget_item_translate(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item)
         if (!ts->string) continue;
         const char *s = dgettext(ts->domain, ts->string);
         item->on_translate = EINA_TRUE;
-        eo_do(item->eo_obj, elm_wdg_item_part_text_set(ts->id, s));
+        elm_wdg_item_part_text_set(item->eo_obj, ts->id, s);
         item->on_translate = EINA_FALSE;
      }
 #endif
@@ -5678,15 +5664,14 @@ _elm_widget_eo_base_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
    Eo *parent = NULL;
 
    sd->on_create = EINA_TRUE;
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
-         parent = eo_parent_get());
-   eo_do(obj, elm_obj_widget_parent_set(parent));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   parent = eo_parent_get(obj);
+   elm_obj_widget_parent_set(obj, parent);
    sd->on_create = EINA_FALSE;
 
-   eo_do(obj, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_UNKNOWN));
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_UNKNOWN);
    return obj;
 }
 
@@ -5694,13 +5679,11 @@ EOLIAN static void
 _elm_widget_eo_base_destructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
 {
    sd->on_destroy = EINA_TRUE;
-   eo_do(obj,
-         elm_interface_atspi_accessible_description_set(NULL),
-         elm_interface_atspi_accessible_name_set(NULL),
-         elm_interface_atspi_accessible_translation_domain_set(NULL),
-         elm_interface_atspi_accessible_relationships_clear()
-         );
-   eo_do_super(obj, ELM_WIDGET_CLASS, eo_destructor());
+   elm_interface_atspi_accessible_description_set(obj, NULL);
+   elm_interface_atspi_accessible_name_set(obj, NULL);
+   elm_interface_atspi_accessible_translation_domain_set(obj, NULL);
+   elm_interface_atspi_accessible_relationships_clear(obj);
+   eo_destructor(eo_super(obj, ELM_WIDGET_CLASS));
    sd->on_destroy = EINA_FALSE;
 
    elm_interface_atspi_accessible_removed(obj);
@@ -5720,7 +5703,7 @@ _elm_widget_on_focus(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item *item E
 
    if (!sd->resize_obj)
      evas_object_focus_set(obj, focused);
-   eo_do(obj, eo_event_callback_call(desc, NULL));
+   eo_event_callback_call(obj, desc, NULL);
 
    if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
      elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, focused);
@@ -5789,7 +5772,7 @@ _elm_widget_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Wid
 {
    const char *ret;
    char *name;
-   eo_do_super(obj, ELM_WIDGET_CLASS, name = elm_interface_atspi_accessible_name_get());
+   name = elm_interface_atspi_accessible_name_get(eo_super(obj, ELM_WIDGET_CLASS));
 
    if (name) return name;
 
@@ -5810,12 +5793,12 @@ _elm_widget_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm
      {
         if (!elm_object_widget_check(widget)) continue;
         if (!eo_isa(widget, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) continue;
-        eo_do(widget, type = elm_interface_atspi_accessible_type_get());
+        type = elm_interface_atspi_accessible_type_get(widget);
         if (type == ELM_ATSPI_TYPE_DISABLED) continue;
         if (type == ELM_ATSPI_TYPE_SKIPPED)
           {
              Eina_List *children;
-             eo_do(widget, children = elm_interface_atspi_accessible_children_get());
+             children = elm_interface_atspi_accessible_children_get(widget);
              accs = eina_list_merge(accs, children);
              continue;
           }
@@ -5833,7 +5816,7 @@ _elm_widget_elm_interface_atspi_accessible_parent_get(Eo *obj, Elm_Widget_Smart_
    do {
         ELM_WIDGET_DATA_GET_OR_RETURN(parent, wd, NULL);
         parent = wd->parent_obj;
-        eo_do(parent, type = elm_interface_atspi_accessible_type_get());
+        type = elm_interface_atspi_accessible_type_get(parent);
    } while (parent && (type == ELM_ATSPI_TYPE_SKIPPED));
 
    return eo_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? parent : NULL;
@@ -5844,7 +5827,7 @@ _elm_widget_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Widget_Sma
 {
    Elm_Atspi_State_Set states = 0;
 
-   eo_do_super(obj, ELM_WIDGET_CLASS, states = elm_interface_atspi_accessible_state_set_get());
+   states = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_WIDGET_CLASS));
 
    if (evas_object_visible_get(obj))
      {
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 0a82540db..6d13e3ac3 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -571,12 +571,12 @@ struct _Elm_Widget_Item_Signal_Data
 #define WIDGET_ITEM_DATA_GET(eo_obj) \
    ({ \
     void *_data; \
-    eo_do_ret(eo_obj, _data, eo_key_data_get("__elm_widget_item_data")); \
+    eo_key_data_get(eo_obj, "__elm_widget_item_data"); \
     })
 
 #define WIDGET_ITEM_DATA_SET(eo_obj, data) \
 { \
-    eo_do(eo_obj, eo_key_data_set("__elm_widget_item_data", data)); \
+    eo_key_data_set(eo_obj, "__elm_widget_item_data", data); \
 }
 
 struct _Elm_Widget_Item_Data
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index f3806af63..5d76f59b3 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -804,7 +804,7 @@ _elm_win_move(Ecore_Evas *ee)
    ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
    sd->screen.x = x;
    sd->screen.y = y;
-   eo_do(sd->obj, eo_event_callback_call(ELM_WIN_EVENT_MOVED, NULL));
+   eo_event_callback_call(sd->obj, ELM_WIN_EVENT_MOVED, NULL);
    evas_nochange_push(evas_object_evas_get(sd->obj));
    evas_object_move(sd->obj, x, y);
    evas_nochange_pop(evas_object_evas_get(sd->obj));
@@ -1114,7 +1114,7 @@ _elm_win_focus_in(Ecore_Evas *ee)
    // FIXME: the event is deprecated but still in use.
    // Has to be removed in EFL2.0
    evas_object_smart_callback_call(obj, SIG_FOCUS_IN, NULL);
-   eo_do(obj, eo_event_callback_call(ELM_WIDGET_EVENT_FOCUSED, NULL));
+   eo_event_callback_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
    sd->focus_highlight.cur.visible = EINA_TRUE;
    _elm_win_focus_highlight_reconfigure_job_start(sd);
    if (sd->frame_obj)
@@ -1149,7 +1149,7 @@ _elm_win_focus_out(Ecore_Evas *ee)
    // FIXME: the event is deprecated but still in use.
    // Has to be removed in EFL2.0
    evas_object_smart_callback_call(obj, SIG_FOCUS_OUT, NULL);
-   eo_do(obj, eo_event_callback_call(ELM_WIDGET_EVENT_UNFOCUSED, NULL));
+   eo_event_callback_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
    sd->focus_highlight.cur.visible = EINA_FALSE;
    _elm_win_focus_highlight_reconfigure_job_start(sd);
    if (sd->frame_obj)
@@ -1256,7 +1256,7 @@ _elm_win_profile_update(Elm_Win_Data *sd)
    EINA_LIST_FOREACH(sub, l, ee2)
      ecore_evas_window_profile_set(ee2, sd->profile.name);
 
-   eo_do(sd->obj, eo_event_callback_call(ELM_WIN_EVENT_PROFILE_CHANGED, NULL));
+   eo_event_callback_call(sd->obj, ELM_WIN_EVENT_PROFILE_CHANGED, NULL);
 }
 
 #ifdef HAVE_ELEMENTARY_WL2
@@ -1382,16 +1382,16 @@ _elm_win_state_change(Ecore_Evas *ee)
    if ((ch_withdrawn) || (ch_iconified))
      {
         if (sd->withdrawn)
-          eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_WITHDRAWN, NULL));
+          eo_event_callback_call(obj, ELM_WIN_EVENT_WITHDRAWN, NULL);
         else if (sd->iconified)
           {
-             eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_ICONIFIED, NULL));
+             eo_event_callback_call(obj, ELM_WIN_EVENT_ICONIFIED, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_minimized_signal_emit(obj);
           }
         else
           {
-             eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_NORMAL, NULL));
+             eo_event_callback_call(obj, ELM_WIN_EVENT_NORMAL, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_restored_signal_emit(obj);
           }
@@ -1399,9 +1399,9 @@ _elm_win_state_change(Ecore_Evas *ee)
    if (ch_sticky)
      {
         if (sd->sticky)
-          eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_STICK, NULL));
+          eo_event_callback_call(obj, ELM_WIN_EVENT_STICK, NULL);
         else
-          eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_UNSTICK, NULL));
+          eo_event_callback_call(obj, ELM_WIN_EVENT_UNSTICK, NULL);
      }
    if (ch_fullscreen)
      {
@@ -1410,8 +1410,8 @@ _elm_win_state_change(Ecore_Evas *ee)
           {
              int w, h;
 
-             eo_do(obj, eo_event_callback_call
-               (ELM_WIN_EVENT_FULLSCREEN, NULL));
+             eo_event_callback_call
+               (obj, ELM_WIN_EVENT_FULLSCREEN, NULL);
              if (sd->frame_obj)
                evas_object_hide(sd->frame_obj);
              ecore_evas_geometry_get(sd->ee, NULL, NULL, &w, &h);
@@ -1419,8 +1419,8 @@ _elm_win_state_change(Ecore_Evas *ee)
           }
         else
           {
-             eo_do(obj, eo_event_callback_call
-               (ELM_WIN_EVENT_UNFULLSCREEN, NULL));
+             eo_event_callback_call
+               (obj, ELM_WIN_EVENT_UNFULLSCREEN, NULL);
              if (sd->frame_obj)
                evas_object_show(sd->frame_obj);
           }
@@ -1429,13 +1429,13 @@ _elm_win_state_change(Ecore_Evas *ee)
      {
         if (sd->maximized)
           {
-             eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_MAXIMIZED, NULL));
+             eo_event_callback_call(obj, ELM_WIN_EVENT_MAXIMIZED, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_maximized_signal_emit(obj);
           }
         else
           {
-             eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_UNMAXIMIZED, NULL));
+             eo_event_callback_call(obj, ELM_WIN_EVENT_UNMAXIMIZED, NULL);
              if (_elm_config->atspi_mode)
                elm_interface_atspi_window_restored_signal_emit(obj);
           }
@@ -1453,10 +1453,10 @@ _elm_win_state_change(Ecore_Evas *ee)
         _elm_win_xwin_update(sd);
 #endif
         elm_widget_orientation_set(obj, sd->rot);
-        eo_do(obj, eo_event_callback_call
-          (ELM_WIN_EVENT_ROTATION_CHANGED, NULL));
-        eo_do(obj, eo_event_callback_call
-          (ELM_WIN_EVENT_WM_ROTATION_CHANGED, NULL));
+        eo_event_callback_call
+          (obj, ELM_WIN_EVENT_ROTATION_CHANGED, NULL);
+        eo_event_callback_call
+          (obj, ELM_WIN_EVENT_WM_ROTATION_CHANGED, NULL);
      }
 }
 
@@ -1526,7 +1526,7 @@ EOLIAN static Eina_Bool
 _elm_win_elm_widget_on_focus(Eo *obj, Elm_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus(NULL));
+   int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
    if (!int_ret) return EINA_TRUE;
 
    if (sd->img_obj)
@@ -1597,7 +1597,7 @@ _elm_win_evas_object_smart_show(Eo *obj, Elm_Win_Data *sd)
    Eina_Bool do_eval = EINA_FALSE;
 
    if (!evas_object_visible_get(obj)) do_eval = EINA_TRUE;
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
+   evas_obj_smart_show(eo_super(obj, MY_CLASS));
 
    if ((sd->modal) && (!evas_object_visible_get(obj)))
      {
@@ -1612,7 +1612,7 @@ _elm_win_evas_object_smart_show(Eo *obj, Elm_Win_Data *sd)
      {
         Eo *root;
         elm_interface_atspi_window_created_signal_emit(obj);
-        eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, root = elm_interface_atspi_accessible_root_get());
+        root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN);
         if (root)
            elm_interface_atspi_accessible_children_changed_added_signal_emit(root, obj);
      }
@@ -1638,7 +1638,7 @@ _elm_win_evas_object_smart_hide(Eo *obj, Elm_Win_Data *sd)
 
    if (evas_object_visible_get(obj))
      _elm_win_state_eval_queue();
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
+   evas_obj_smart_hide(eo_super(obj, MY_CLASS));
 
    if ((sd->modal) && (evas_object_visible_get(obj)))
      {
@@ -1665,7 +1665,7 @@ _elm_win_evas_object_smart_hide(Eo *obj, Elm_Win_Data *sd)
    if (_elm_config->atspi_mode)
      {
         Eo *root;
-        eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, root = elm_interface_atspi_accessible_root_get());
+        root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN);
         elm_interface_atspi_window_destroyed_signal_emit(obj);
         if (root)
            elm_interface_atspi_accessible_children_changed_del_signal_emit(root, obj);
@@ -2004,7 +2004,7 @@ _elm_win_evas_object_smart_del(Eo *obj, Elm_Win_Data *sd)
    ecore_evas_callback_state_change_set(sd->ee, NULL);
    ecore_evas_callback_pre_render_set(sd->ee, NULL);
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
+   evas_obj_smart_del(eo_super(obj, MY_CLASS));
 
    if (_elm_win_policy_quit_triggered(obj))
      {
@@ -2053,7 +2053,7 @@ _elm_win_evas_object_smart_move(Eo *obj, Elm_Win_Data *sd, Evas_Coord x, Evas_Co
           {
              sd->screen.x = x;
              sd->screen.y = y;
-             eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_MOVED, NULL));
+             eo_event_callback_call(obj, ELM_WIN_EVENT_MOVED, NULL);
           }
         return;
      }
@@ -2063,13 +2063,13 @@ _elm_win_evas_object_smart_move(Eo *obj, Elm_Win_Data *sd, Evas_Coord x, Evas_Co
         if (!ecore_evas_override_get(sd->ee))  return;
      }
 
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
+   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
 
    if (ecore_evas_override_get(sd->ee))
      {
         sd->screen.x = x;
         sd->screen.y = y;
-        eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_MOVED, NULL));
+        eo_event_callback_call(obj, ELM_WIN_EVENT_MOVED, NULL);
      }
    if (sd->frame_obj)
      {
@@ -2092,7 +2092,7 @@ _elm_win_evas_object_smart_resize(Eo *obj, Elm_Win_Data *sd, Evas_Coord w, Evas_
 {
    if (sd->img_obj)
      {
-        eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
+        evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
         if (sd->constrain)
           {
              int sw, sh;
@@ -2123,7 +2123,7 @@ _elm_win_delete_request(Ecore_Evas *ee)
    int autodel = sd->autodel;
    sd->autodel_clear = &autodel;
    evas_object_ref(obj);
-   eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_DELETE_REQUEST, NULL));
+   eo_event_callback_call(obj, ELM_WIN_EVENT_DELETE_REQUEST, NULL);
    if (sd->autohide)
      evas_object_hide(obj);
    // FIXME: if above callback deletes - then the below will be invalid
@@ -2662,8 +2662,8 @@ _elm_win_property_change(void *data,
         if (e->win == sd->x.xwin)
           {
              sd->indmode = (Elm_Win_Indicator_Mode)ecore_x_e_illume_indicator_state_get(e->win);
-             eo_do(sd->obj, eo_event_callback_call
-               (ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL));
+             eo_event_callback_call
+               (sd->obj, ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
           }
      }
    return ECORE_CALLBACK_PASS_ON;
@@ -2985,7 +2985,7 @@ _elm_win_frame_cb_close(void *data,
    int autodel = sd->autodel;
    sd->autodel_clear = &autodel;
    evas_object_ref(win);
-   eo_do(win, eo_event_callback_call(ELM_WIN_EVENT_DELETE_REQUEST, NULL));
+   eo_event_callback_call(win, ELM_WIN_EVENT_DELETE_REQUEST, NULL);
    if (sd->autohide)
      evas_object_hide(win);
    // FIXME: if above callback deletes - then the below will be invalid
@@ -3203,7 +3203,7 @@ _elm_win_on_icon_del(void *data,
 EOLIAN static void
 _elm_win_evas_object_smart_add(Eo *obj, Elm_Win_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
 
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
@@ -3218,7 +3218,7 @@ _elm_x_io_err(void *data EINA_UNUSED)
    Evas_Object *obj;
 
    EINA_LIST_FOREACH(_elm_win_list, l, obj)
-     eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_IOERR, NULL));
+     eo_event_callback_call(obj, ELM_WIN_EVENT_IOERR, NULL);
    elm_exit();
 }
 #endif
@@ -3228,19 +3228,14 @@ elm_win_add(Evas_Object *parent,
             const char *name,
             Elm_Win_Type type)
 {
-   Evas_Object *obj = eo_add(MY_CLASS, parent,
-                             elm_obj_win_name_set(name),
-                             elm_obj_win_type_set(type));
+   Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_win_name_set(eoid, name), elm_obj_win_type_set(eoid, type));
    return obj;
 }
 
 EAPI Evas_Object *
 elm_win_fake_add(Ecore_Evas *ee)
 {
-   return eo_add(MY_CLASS, NULL,
-         elm_obj_win_fake_canvas_set(ee),
-         elm_obj_win_name_set(NULL),
-         elm_obj_win_type_set(ELM_WIN_FAKE));
+   return eo_add(MY_CLASS, NULL, elm_obj_win_fake_canvas_set(eoid, ee), elm_obj_win_name_set(eoid, NULL), elm_obj_win_type_set(eoid, ELM_WIN_FAKE));
 }
 
 static void
@@ -3351,7 +3346,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
 
    Elm_Win_Data tmp_sd;
 
-   eo_do(obj, parent = eo_parent_get());
+   parent = eo_parent_get(obj);
 
    /* just to store some data while trying out to create a canvas */
    memset(&tmp_sd, 0, sizeof(Elm_Win_Data));
@@ -3688,12 +3683,11 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
         return NULL;
      }
 
-   eo_do(obj, eo_parent_set(ecore_evas_get(tmp_sd.ee)));
+   eo_parent_set(obj, ecore_evas_get(tmp_sd.ee));
 
-   eo_do_super(obj, MY_CLASS, eo_constructor());
-   eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
-         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks));
+   eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
 
    if (getenv("ELM_FIRST_FRAME"))
      evas_event_callback_add(ecore_evas_get(tmp_sd.ee), EVAS_CALLBACK_RENDER_POST,
@@ -3929,7 +3923,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
                                        _elm_win_on_resize_obj_changed_size_hints, obj);
      }
 
-   eo_do(obj, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_WINDOW));
+   elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_WINDOW);
    if (_elm_config->atspi_mode)
      elm_interface_atspi_window_created_signal_emit(obj);
 
@@ -3949,7 +3943,7 @@ _elm_win_eo_base_finalize(Eo *obj, Elm_Win_Data *_pd)
    obj = _elm_win_finalize_internal(obj, _pd, _pd->name, _pd->type);
    if (obj)
      {
-        eo_do_super(obj, MY_CLASS, obj = eo_finalize());
+        obj = eo_finalize(eo_super(obj, MY_CLASS));
      }
    return obj;
 }
@@ -3974,7 +3968,7 @@ EOLIAN static void
 _elm_win_type_set(Eo *obj, Elm_Win_Data *sd, Elm_Win_Type type)
 {
    Eina_Bool finalized;
-   if (eo_do_ret(obj, finalized, eo_finalized_get()))
+   if (eo_finalized_get(obj))
      {
         ERR("This function is only allowed during construction.");
         return;
@@ -3992,7 +3986,7 @@ EOLIAN static void
 _elm_win_name_set(Eo *obj, Elm_Win_Data *sd, const char *name)
 {
    Eina_Bool finalized;
-   if (eo_do_ret(obj, finalized, eo_finalized_get()))
+   if (eo_finalized_get(obj))
      {
         ERR("This function is only allowed during construction.");
         return;
@@ -4772,8 +4766,8 @@ _win_rotate(Evas_Object *obj, Elm_Win_Data *sd, int rotation, Eina_Bool resize)
 #endif
    _elm_win_frame_obj_update(sd);
    elm_widget_orientation_set(obj, rotation);
-   eo_do(obj, eo_event_callback_call
-     (ELM_WIN_EVENT_ROTATION_CHANGED, NULL));
+   eo_event_callback_call
+     (obj, ELM_WIN_EVENT_ROTATION_CHANGED, NULL);
 }
 
 EOLIAN static void
@@ -4811,7 +4805,7 @@ elm_win_wm_rotation_preferred_rotation_set(const Evas_Object *obj,
                                            int rotation)
 {
    ELM_WIN_CHECK(obj);
-   eo_do((Eo *) obj, elm_obj_win_wm_preferred_rotation_set(rotation));
+   elm_obj_win_wm_preferred_rotation_set((Eo *) obj, rotation);
 }
 
 EOLIAN static void
@@ -4992,8 +4986,8 @@ _elm_win_indicator_mode_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Elm_Win_Indic
             (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_STATE_OFF);
      }
 #endif
-   eo_do(obj, eo_event_callback_call
-     (ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL));
+   eo_event_callback_call
+     (obj, ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
 }
 
 EOLIAN static Elm_Win_Indicator_Mode
@@ -5022,8 +5016,8 @@ _elm_win_indicator_opacity_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Elm_Win_In
             (sd->x.xwin, ECORE_X_ILLUME_INDICATOR_TRANSPARENT);
      }
 #endif
-   eo_do(obj, eo_event_callback_call
-     (ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL));
+   eo_event_callback_call
+     (obj, ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, NULL);
 }
 
 EOLIAN static Elm_Win_Indicator_Opacity_Mode
@@ -5328,8 +5322,8 @@ _elm_win_theme_internal(Eo *obj, Elm_Win_Data *sd)
    edje_object_scale_set(sd->edje,
                          elm_widget_scale_get(obj) * elm_config_scale_get());
 
-   eo_do(obj, eo_event_callback_call(ELM_WIN_EVENT_THEME_CHANGED, NULL));
-   eo_do(obj, ret = elm_obj_widget_disable());
+   eo_event_callback_call(obj, ELM_WIN_EVENT_THEME_CHANGED, NULL);
+   ret = elm_obj_widget_disable(obj);
 
    if (!sd->theme_alpha && !sd->application_alpha)
      {
@@ -5352,7 +5346,7 @@ EOLIAN static Eina_Bool
 _elm_win_elm_widget_theme_apply(Eo *obj, Elm_Win_Data *sd)
 {
    Eina_Bool int_ret = EINA_FALSE;
-   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
+   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
    if (!int_ret) return EINA_FALSE;
 
    sd->focus_highlight.theme_changed = EINA_TRUE;
@@ -5437,7 +5431,7 @@ elm_win_wl_window_get(const Evas_Object *obj)
      }
 
    Ecore_Wl2_Window *ret = NULL;
-   eo_do((Eo *) obj, ret = elm_obj_win_wl_window_get());
+   ret = elm_obj_win_wl_window_get((Eo *) obj);
    return ret;
 }
 
@@ -5486,7 +5480,7 @@ elm_win_win32_window_get(const Evas_Object *obj)
      }
 
    Ecore_Win32_Window *ret = NULL;
-   eo_do((Eo *) obj, ret = elm_obj_win_win32_window_get());
+   ret = elm_obj_win_win32_window_get((Eo *) obj);
    return ret;
 }
 
@@ -5592,7 +5586,7 @@ _elm_win_window_id_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
         if (sd->parent)
           {
              Ecore_Cocoa_Window *pwin;
-             eo_do(sd->parent, pwin = elm_obj_win_cocoa_window_get());
+             pwin = elm_obj_win_cocoa_window_get(sd->parent);
              return (Ecore_Window)pwin;
           }
 #endif
@@ -5670,7 +5664,7 @@ elm_win_window_id_get(const Evas_Object *obj)
 
    ELM_WIN_CHECK(obj) 0;
    Ecore_Window ret = 0;
-   eo_do((Eo *) obj, ret = elm_obj_win_window_id_get());
+   ret = elm_obj_win_window_id_get((Eo *) obj);
    return ret;
 }
 
@@ -5696,7 +5690,7 @@ _on_atspi_bus_connected(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSE
               * focused object **/
              unsigned int order = 0;
              Evas_Object *target;
-             eo_do(win, target = elm_obj_widget_newest_focus_order_get(&order, EINA_TRUE));
+             target = elm_obj_widget_newest_focus_order_get(win, &order, EINA_TRUE);
              if (target)
                elm_interface_atspi_accessible_state_changed_signal_emit(target, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
           }
@@ -5715,7 +5709,7 @@ _elm_win_class_constructor(Eo_Class *klass)
      {
         Eo *bridge = _elm_atspi_bridge_get();
         if (bridge)
-           eo_do(bridge, eo_event_callback_add(ELM_ATSPI_BRIDGE_EVENT_CONNECTED, _on_atspi_bus_connected, NULL));
+           eo_event_callback_add(bridge, ELM_ATSPI_BRIDGE_EVENT_CONNECTED, _on_atspi_bus_connected, NULL);
      }
 }
 
@@ -5724,7 +5718,7 @@ _elm_win_elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Elm_Win_
 {
    // attach all kinds of windows directly to ATSPI application root object
    Eo *root;
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, root = elm_interface_atspi_accessible_root_get());
+   root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN);
    return root;
 }
 
@@ -5747,7 +5741,7 @@ EOLIAN static Elm_Atspi_State_Set
 _elm_win_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Win_Data *sd EINA_UNUSED)
 {
    Elm_Atspi_State_Set ret;
-   eo_do_super(obj, MY_CLASS, ret = elm_interface_atspi_accessible_state_set_get());
+   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, MY_CLASS));
 
    if (elm_win_focus_get(obj))
      STATE_TYPE_SET(ret, ELM_ATSPI_STATE_ACTIVE);
@@ -5759,7 +5753,7 @@ EOLIAN static char*
 _elm_win_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Win_Data *sd EINA_UNUSED)
 {
    char *ret;
-   eo_do_super(obj, ELM_WIN_CLASS, ret = elm_interface_atspi_accessible_name_get());
+   ret = elm_interface_atspi_accessible_name_get(eo_super(obj, ELM_WIN_CLASS));
    if (ret) return ret;
    const char *name = elm_win_title_get(obj);
    return name ? strdup(name) : NULL;
diff --git a/src/lib/elm_win_standard.c b/src/lib/elm_win_standard.c
index 23fddce4c..c54e3b052 100644
--- a/src/lib/elm_win_standard.c
+++ b/src/lib/elm_win_standard.c
@@ -15,7 +15,7 @@
 EOLIAN static Eo *
 _elm_win_standard_eo_base_finalize(Eo *obj, void *pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, obj = eo_finalize());
+   obj = eo_finalize(eo_super(obj, MY_CLASS));
    if (!obj)
      return NULL;
 
@@ -26,9 +26,9 @@ _elm_win_standard_eo_base_finalize(Eo *obj, void *pd EINA_UNUSED)
         evas_object_del(obj);
         return NULL;
      }
-   eo_do(bg, evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND));
-   eo_do(obj, elm_obj_win_resize_object_add(bg));
-   eo_do(bg, efl_gfx_visible_set(EINA_TRUE));
+   evas_obj_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_obj_win_resize_object_add(obj, bg);
+   efl_gfx_visible_set(bg, EINA_TRUE);
 
    return obj;
 }
diff --git a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index d62dfb169..b8dc56cff 100644
--- a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -151,13 +151,13 @@ _field_clicked_cb(void *data, const Eo_Event *event)
    evas_object_size_hint_weight_set(ctx_mod->ctxpopup, EVAS_HINT_EXPAND,
                                     EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ctx_mod->ctxpopup, EVAS_HINT_FILL, 0.5);
-   eo_do(ctx_mod->ctxpopup, eo_event_callback_add
-     (ELM_CTXPOPUP_EVENT_DISMISSED, _ctxpopup_dismissed_cb, ctx_mod));
+   eo_event_callback_add
+     (ctx_mod->ctxpopup, ELM_CTXPOPUP_EVENT_DISMISSED, _ctxpopup_dismissed_cb, ctx_mod);
    elm_ctxpopup_hover_parent_set(ctx_mod->ctxpopup, elm_widget_top_get(event->obj));
 
    diskselector = elm_diskselector_add(elm_widget_top_get(ctx_mod->mod_data.base));
-   eo_do(diskselector, eo_event_callback_add
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _diskselector_cb, NULL));
+   eo_event_callback_add
+     (diskselector, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _diskselector_cb, NULL);
    elm_object_style_set(diskselector, buf);
    elm_object_content_set(ctx_mod->ctxpopup, diskselector);
 
@@ -307,8 +307,8 @@ field_create(Elm_Datetime_Module_Data *module_data, Elm_Datetime_Field_Type  fie
    if (field_type == ELM_DATETIME_AMPM)
      {
         field_obj = elm_button_add(ctx_mod->mod_data.base);
-        eo_do(field_obj, eo_event_callback_add
-          (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _ampm_clicked_cb, ctx_mod));
+        eo_event_callback_add
+          (field_obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _ampm_clicked_cb, ctx_mod);
      }
    else
      {
@@ -317,8 +317,8 @@ field_create(Elm_Datetime_Module_Data *module_data, Elm_Datetime_Field_Type  fie
         elm_entry_editable_set(field_obj, EINA_FALSE);
         elm_entry_input_panel_enabled_set(field_obj, EINA_FALSE);
         elm_entry_context_menu_disabled_set(field_obj, EINA_TRUE);
-        eo_do(field_obj, eo_event_callback_add
-          (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _field_clicked_cb, ctx_mod));
+        eo_event_callback_add
+          (field_obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _field_clicked_cb, ctx_mod);
      }
    evas_object_data_set(field_obj, "_field_type", (void *)field_type);
 
diff --git a/src/modules/prefs/elm_button.c b/src/modules/prefs/elm_button.c
index 25e97599c..4cccfb181 100644
--- a/src/modules/prefs/elm_button.c
+++ b/src/modules/prefs/elm_button.c
@@ -26,8 +26,8 @@ elm_prefs_button_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
 {
    Evas_Object *obj = elm_button_add(prefs);
 
-   eo_do(obj, eo_event_callback_add
-     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _item_changed_cb, cb));
+   eo_event_callback_add
+     (obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _item_changed_cb, cb);
 
    return obj;
 }
diff --git a/src/modules/prefs/elm_check.c b/src/modules/prefs/elm_check.c
index c5da5527e..2b02d0dde 100644
--- a/src/modules/prefs/elm_check.c
+++ b/src/modules/prefs/elm_check.c
@@ -24,8 +24,8 @@ elm_prefs_check_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
 {
    Evas_Object *obj = elm_check_add(prefs);
 
-   eo_do(obj, eo_event_callback_add
-     (ELM_CHECK_EVENT_CHANGED, _item_changed_cb, cb));
+   eo_event_callback_add
+     (obj, ELM_CHECK_EVENT_CHANGED, _item_changed_cb, cb);
    elm_check_state_set(obj, spec.b.def);
 
    return obj;
diff --git a/src/modules/prefs/elm_datetime.c b/src/modules/prefs/elm_datetime.c
index cf076d5b6..86b4729d6 100644
--- a/src/modules/prefs/elm_datetime.c
+++ b/src/modules/prefs/elm_datetime.c
@@ -31,8 +31,8 @@ elm_prefs_datetime_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
    elm_datetime_field_visible_set(obj, ELM_DATETIME_MINUTE, EINA_FALSE);
    elm_datetime_field_visible_set(obj, ELM_DATETIME_AMPM, EINA_FALSE);
 
-   eo_do(obj, eo_event_callback_add
-     (ELM_DATETIME_EVENT_CHANGED, _item_changed_cb, cb));
+   eo_event_callback_add
+     (obj, ELM_DATETIME_EVENT_CHANGED, _item_changed_cb, cb);
 
    t.tm_year = spec.d.min.y - 1900;
    t.tm_mon = spec.d.min.m - 1;
diff --git a/src/modules/prefs/elm_entry.c b/src/modules/prefs/elm_entry.c
index 3c15451e2..9bd0dcc57 100644
--- a/src/modules/prefs/elm_entry.c
+++ b/src/modules/prefs/elm_entry.c
@@ -149,10 +149,10 @@ elm_prefs_entry_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
 
    /* FIXME: is it worth to ERR with the item's name, too, here? */
 
-   eo_do(obj, eo_event_callback_add
-     (ELM_ENTRY_EVENT_ACTIVATED, _item_changed_cb, cb));
-   eo_do(obj, eo_event_callback_add
-     (ELM_WIDGET_EVENT_UNFOCUSED, _item_changed_cb, cb));
+   eo_event_callback_add
+     (obj, ELM_ENTRY_EVENT_ACTIVATED, _item_changed_cb, cb);
+   eo_event_callback_add
+     (obj, ELM_WIDGET_EVENT_UNFOCUSED, _item_changed_cb, cb);
    if (spec.s.accept)
      {
         int ret;
diff --git a/src/modules/prefs/elm_slider.c b/src/modules/prefs/elm_slider.c
index 84bc41841..e03a1e164 100644
--- a/src/modules/prefs/elm_slider.c
+++ b/src/modules/prefs/elm_slider.c
@@ -27,8 +27,8 @@ elm_prefs_slider_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
 
    evas_object_data_set(obj, "prefs_type", (void *)type);
 
-   eo_do(obj, eo_event_callback_add
-     (ELM_SLIDER_EVENT_CHANGED, _item_changed_cb, cb));
+   eo_event_callback_add
+     (obj, ELM_SLIDER_EVENT_CHANGED, _item_changed_cb, cb);
    if (type == ELM_PREFS_TYPE_INT)
      {
         elm_slider_unit_format_set(obj, "%1.0f");
diff --git a/src/modules/prefs/elm_spinner.c b/src/modules/prefs/elm_spinner.c
index 45bfd85bc..51903fed9 100644
--- a/src/modules/prefs/elm_spinner.c
+++ b/src/modules/prefs/elm_spinner.c
@@ -27,8 +27,8 @@ elm_prefs_spinner_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
 
    evas_object_data_set(obj, "prefs_type", (void *)type);
 
-   eo_do(obj, eo_event_callback_add
-     (ELM_SPINNER_EVENT_CHANGED, _item_changed_cb, cb));
+   eo_event_callback_add
+     (obj, ELM_SPINNER_EVENT_CHANGED, _item_changed_cb, cb);
 
    if (type == ELM_PREFS_TYPE_INT)
      {
diff --git a/src/tests/elm_test_actionslider.c b/src/tests/elm_test_actionslider.c
index 83c7bfcb4..a6d7137fb 100644
--- a/src/tests/elm_test_actionslider.c
+++ b/src/tests/elm_test_actionslider.c
@@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC);
 
    actionslider = elm_actionslider_add(win);
-   eo_do(actionslider, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(actionslider);
 
    ck_assert(role == ELM_ATSPI_ROLE_SLIDER);
 
diff --git a/src/tests/elm_test_atspi.c b/src/tests/elm_test_atspi.c
index 7faae94db..82c1564e3 100644
--- a/src/tests/elm_test_atspi.c
+++ b/src/tests/elm_test_atspi.c
@@ -37,7 +37,7 @@ START_TEST (elm_atspi_app_obj_name_get)
 
    elm_app_name_set("Test name");
 
-   eo_do(root, ret = elm_interface_atspi_accessible_name_get());
+   ret = elm_interface_atspi_accessible_name_get(root);
 
    ck_assert_str_eq(ret, "Test name");
 
@@ -53,7 +53,7 @@ START_TEST (elm_atspi_name_get)
 
    char *name;
 
-   eo_do(g_btn, name = elm_interface_atspi_accessible_name_get());
+   name = elm_interface_atspi_accessible_name_get(g_btn);
 
    if (name && name[0]) {
       ck_assert(0);
@@ -64,7 +64,7 @@ START_TEST (elm_atspi_name_get)
    // Set name with additional text tags
    elm_object_text_set(g_btn, "Some<br>text");
 
-   eo_do(g_btn, name = elm_interface_atspi_accessible_name_get());
+   name = elm_interface_atspi_accessible_name_get(g_btn);
 
    // Accessible name should have cleared tags
    ck_assert(name != NULL);
@@ -83,17 +83,17 @@ START_TEST (elm_atspi_name_set)
    char *name;
 
    elm_object_text_set(g_btn, "Other text");
-   eo_do(g_btn, elm_interface_atspi_accessible_name_set("Test name"));
+   elm_interface_atspi_accessible_name_set(g_btn, "Test name");
 
-   eo_do(g_btn, name = elm_interface_atspi_accessible_name_get());
+   name = elm_interface_atspi_accessible_name_get(g_btn);
 
    ck_assert(name != NULL);
    ck_assert_str_eq(name, "Test name");
 
    free(name);
 
-   eo_do(g_btn, elm_interface_atspi_accessible_name_set(NULL));
-   eo_do(g_btn, name = elm_interface_atspi_accessible_name_get());
+   elm_interface_atspi_accessible_name_set(g_btn, NULL);
+   name = elm_interface_atspi_accessible_name_get(g_btn);
 
    ck_assert(name != NULL);
    ck_assert_str_eq(name, "Other text");
@@ -112,7 +112,7 @@ START_TEST (elm_atspi_role_get)
 
    Elm_Atspi_Role role;
 
-   eo_do(root, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(root);
 
    ck_assert(role == ELM_ATSPI_ROLE_APPLICATION);
 
@@ -127,14 +127,14 @@ START_TEST (elm_atspi_role_set)
    generate_app();
    Elm_Atspi_Role role;
 
-   eo_do(g_btn, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ACCELERATOR_LABEL));
-   eo_do(g_btn, role = elm_interface_atspi_accessible_role_get());
+   elm_interface_atspi_accessible_role_set(g_btn, ELM_ATSPI_ROLE_ACCELERATOR_LABEL);
+   role = elm_interface_atspi_accessible_role_get(g_btn);
 
    if (role != ELM_ATSPI_ROLE_ACCELERATOR_LABEL)
       ck_assert(0);
 
-   eo_do(g_btn, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ENTRY));
-   eo_do(g_btn, role = elm_interface_atspi_accessible_role_get());
+   elm_interface_atspi_accessible_role_set(g_btn, ELM_ATSPI_ROLE_ENTRY);
+   role = elm_interface_atspi_accessible_role_get(g_btn);
 
    if (role != ELM_ATSPI_ROLE_ENTRY)
       ck_assert(0);
@@ -153,7 +153,7 @@ START_TEST (elm_atspi_role_name_get)
 
    const char *ret = NULL;
 
-   eo_do(root, ret = elm_interface_atspi_accessible_role_name_get());
+   ret = elm_interface_atspi_accessible_role_name_get(root);
 
    ck_assert(ret != NULL);
 
@@ -170,7 +170,7 @@ START_TEST (elm_atspi_localized_role_name_get)
 
    const char *ret = NULL;
 
-   eo_do(root, ret = elm_interface_atspi_accessible_localized_role_name_get());
+   ret = elm_interface_atspi_accessible_localized_role_name_get(root);
 
    ck_assert(ret != NULL);
 
@@ -189,18 +189,18 @@ START_TEST (elm_atspi_description_set)
 
    const char *desc = "Test description";
 
-   eo_do(root, ret = elm_interface_atspi_accessible_description_get());
+   ret = elm_interface_atspi_accessible_description_get(root);
 
    ck_assert(ret == NULL);
 
-   eo_do(root, elm_interface_atspi_accessible_description_set(desc));
-   eo_do(root, ret = elm_interface_atspi_accessible_description_get());
+   elm_interface_atspi_accessible_description_set(root, desc);
+   ret = elm_interface_atspi_accessible_description_get(root);
 
    ck_assert(ret != NULL);
    ck_assert_str_eq(ret, "Test description");
 
-   eo_do(root, elm_interface_atspi_accessible_description_set(NULL));
-   eo_do(root, ret = elm_interface_atspi_accessible_description_get());
+   elm_interface_atspi_accessible_description_set(root, NULL);
+   ret = elm_interface_atspi_accessible_description_get(root);
 
    ck_assert(ret == NULL);
 
@@ -216,7 +216,7 @@ START_TEST (elm_atspi_description_get)
    generate_app();
 
    const char *descr;
-   eo_do(g_bg, descr = elm_interface_atspi_accessible_description_get());
+   descr = elm_interface_atspi_accessible_description_get(g_bg);
 
    ck_assert(descr == NULL);
 
@@ -233,9 +233,9 @@ START_TEST (elm_atspi_children_and_parent)
 
    Eina_List *child_list = NULL;
 
-   eo_do(root, child_list = elm_interface_atspi_accessible_children_get());
+   child_list = elm_interface_atspi_accessible_children_get(root);
 
-   //eo_do(eina_list_nth(child_list, 0), bg_child_list = elm_interface_atspi_accessible_children_get());
+   //bg_child_list = elm_interface_atspi_accessible_children_get(eina_list_nth(child_list, 0));
 
    ck_assert(eina_list_count(child_list) == 1);
 
@@ -261,11 +261,11 @@ START_TEST (elm_atspi_children_and_parent2)
    Eo *win = NULL;
 
    Eina_List *root_children;
-   eo_do(root, root_children = elm_interface_atspi_accessible_children_get());
+   root_children = elm_interface_atspi_accessible_children_get(root);
    win = eina_list_nth(root_children, 0);
 
    Eina_List *win_children;
-   eo_do(win, win_children = elm_interface_atspi_accessible_children_get());
+   win_children = elm_interface_atspi_accessible_children_get(win);
 
    ck_assert(eina_list_count(win_children) == 1);
 
@@ -288,7 +288,7 @@ START_TEST (elm_atspi_translation_domain_get)
 
    const char *domain;
 
-   eo_do(g_btn, domain = elm_interface_atspi_accessible_translation_domain_get());
+   domain = elm_interface_atspi_accessible_translation_domain_get(g_btn);
 
    ck_assert(domain == NULL);
 
@@ -303,14 +303,14 @@ START_TEST (elm_atspi_translation_domain_set)
 
    const char *domain;
 
-   eo_do(g_btn, elm_interface_atspi_accessible_translation_domain_set("Test translation_domain"));
-   eo_do(g_btn, domain = elm_interface_atspi_accessible_translation_domain_get());
+   elm_interface_atspi_accessible_translation_domain_set(g_btn, "Test translation_domain");
+   domain = elm_interface_atspi_accessible_translation_domain_get(g_btn);
 
    ck_assert(domain != NULL);
    ck_assert_str_eq(domain, "Test translation_domain");
 
-   eo_do(g_btn, elm_interface_atspi_accessible_translation_domain_set(NULL));
-   eo_do(g_btn, domain = elm_interface_atspi_accessible_translation_domain_get());
+   elm_interface_atspi_accessible_translation_domain_set(g_btn, NULL);
+   domain = elm_interface_atspi_accessible_translation_domain_get(g_btn);
 
    ck_assert(domain == NULL);
 
@@ -327,9 +327,9 @@ START_TEST (elm_atspi_relationship_append)
    Elm_Atspi_Relation *rel, *rel_to, *rel_from;
    Eina_List *l;
 
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_bg));
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_FROM, g_win));
-   eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get());
+   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
+   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win);
+   set = elm_interface_atspi_accessible_relation_set_get(g_btn);
 
    ck_assert(set != NULL);
    ck_assert(eina_list_count(set) >= 2);
@@ -352,9 +352,9 @@ START_TEST (elm_atspi_relationship_append)
    elm_atspi_relation_set_free(set);
 
    /* Check if append do not procude duplicated relations */
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_bg));
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_FROM, g_win));
-   eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get());
+   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
+   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win);
+   set = elm_interface_atspi_accessible_relation_set_get(g_btn);
 
    rel_to = rel_from = NULL;
    EINA_LIST_FOREACH(set, l, rel)
@@ -391,10 +391,10 @@ START_TEST (elm_atspi_relationship_remove)
    Eina_List *l;
 
    /* Test if removal of single relationship works */
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_bg));
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_FROM, g_win));
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_remove(ELM_ATSPI_RELATION_FLOWS_TO, g_bg));
-   eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get());
+   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
+   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win);
+   elm_interface_atspi_accessible_relationship_remove(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
+   set = elm_interface_atspi_accessible_relation_set_get(g_btn);
 
    ck_assert(set != NULL);
    ck_assert(eina_list_count(set) >= 1);
@@ -415,10 +415,10 @@ START_TEST (elm_atspi_relationship_remove)
    elm_atspi_relation_set_free(set);
 
    /* Test if removal of type relationship works */
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_bg));
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_win));
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_remove(ELM_ATSPI_RELATION_FLOWS_TO, NULL));
-   eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get());
+   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
+   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_win);
+   elm_interface_atspi_accessible_relationship_remove(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, NULL);
+   set = elm_interface_atspi_accessible_relation_set_get(g_btn);
 
    rel_to = rel_from = NULL;
    EINA_LIST_FOREACH(set, l, rel)
@@ -436,10 +436,10 @@ START_TEST (elm_atspi_relationship_remove)
    elm_atspi_relation_set_free(set);
 
    /* Test if relationship is implicity removed when object is deleted */
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_bg));
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_FROM, g_bg));
+   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
+   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_bg);
    eo_del(g_bg);
-   eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get());
+   set = elm_interface_atspi_accessible_relation_set_get(g_btn);
 
    rel_to = rel_from = NULL;
    EINA_LIST_FOREACH(set, l, rel)
@@ -467,14 +467,14 @@ START_TEST (elm_atspi_relationships_clear)
    elm_init(0, NULL);
    generate_app();
 
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_bg));
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_FROM, g_bg));
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_win));
-   eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_FROM, g_win));
+   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
+   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_bg);
+   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_win);
+   elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win);
 
-   eo_do(g_btn, elm_interface_atspi_accessible_relationships_clear());
+   elm_interface_atspi_accessible_relationships_clear(g_btn);
 
-   eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get());
+   set = elm_interface_atspi_accessible_relation_set_get(g_btn);
    EINA_LIST_FOREACH(set, l, rel)
    {
       ck_assert(!((rel->type == ELM_ATSPI_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg)));
diff --git a/src/tests/elm_test_box.c b/src/tests/elm_test_box.c
index 3f2808ca3..eb14a53aa 100644
--- a/src/tests/elm_test_box.c
+++ b/src/tests/elm_test_box.c
@@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "box", ELM_WIN_BASIC);
 
    box = elm_box_add(win);
-   eo_do(box, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(box);
 
    ck_assert(role == ELM_ATSPI_ROLE_FILLER);
 
diff --git a/src/tests/elm_test_bubble.c b/src/tests/elm_test_bubble.c
index f7bf36015..bbae3ce1d 100644
--- a/src/tests/elm_test_bubble.c
+++ b/src/tests/elm_test_bubble.c
@@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC);
 
    bubble = elm_bubble_add(win);
-   eo_do(bubble, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(bubble);
 
    ck_assert(role == ELM_ATSPI_ROLE_FILLER);
 
diff --git a/src/tests/elm_test_button.c b/src/tests/elm_test_button.c
index cef40908e..afa1cadd4 100644
--- a/src/tests/elm_test_button.c
+++ b/src/tests/elm_test_button.c
@@ -17,7 +17,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "button", ELM_WIN_BASIC);
 
    button = elm_button_add(win);
-   eo_do(button, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(button);
 
    ck_assert(role == ELM_ATSPI_ROLE_PUSH_BUTTON);
 
diff --git a/src/tests/elm_test_calendar.c b/src/tests/elm_test_calendar.c
index 714b3708a..433b5d14b 100644
--- a/src/tests/elm_test_calendar.c
+++ b/src/tests/elm_test_calendar.c
@@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
 
    calendar = elm_calendar_add(win);
-   eo_do(calendar, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(calendar);
 
    ck_assert(role == ELM_ATSPI_ROLE_CALENDAR);
 
diff --git a/src/tests/elm_test_check.c b/src/tests/elm_test_check.c
index 8ff9caba2..8abfe3a05 100644
--- a/src/tests/elm_test_check.c
+++ b/src/tests/elm_test_check.c
@@ -59,7 +59,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
 
    check = elm_check_add(win);
-   eo_do(check, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(check);
 
    ck_assert(role == ELM_ATSPI_ROLE_CHECK_BOX);
 
diff --git a/src/tests/elm_test_clock.c b/src/tests/elm_test_clock.c
index fdccab92e..713858d71 100644
--- a/src/tests/elm_test_clock.c
+++ b/src/tests/elm_test_clock.c
@@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "clock", ELM_WIN_BASIC);
 
    clk = elm_clock_add(win);
-   eo_do(clk, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(clk);
 
    ck_assert(role == ELM_ATSPI_ROLE_TEXT);
 
diff --git a/src/tests/elm_test_colorselector.c b/src/tests/elm_test_colorselector.c
index 78c3abd03..321f3df03 100644
--- a/src/tests/elm_test_colorselector.c
+++ b/src/tests/elm_test_colorselector.c
@@ -42,7 +42,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC);
 
    c = elm_colorselector_add(win);
-   eo_do(c, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(c);
 
    ck_assert(role == ELM_ATSPI_ROLE_COLOR_CHOOSER);
 
diff --git a/src/tests/elm_test_conformant.c b/src/tests/elm_test_conformant.c
index 1c96c138b..a646e5ecb 100644
--- a/src/tests/elm_test_conformant.c
+++ b/src/tests/elm_test_conformant.c
@@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC);
 
    conformant = elm_conformant_add(win);
-   eo_do(conformant, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(conformant);
 
    ck_assert(role == ELM_ATSPI_ROLE_FILLER);
 
diff --git a/src/tests/elm_test_ctxpopup.c b/src/tests/elm_test_ctxpopup.c
index 905530edd..5c5ed6f9c 100644
--- a/src/tests/elm_test_ctxpopup.c
+++ b/src/tests/elm_test_ctxpopup.c
@@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
 
    ctxpopup = elm_ctxpopup_add(win);
-   eo_do(ctxpopup, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(ctxpopup);
 
    ck_assert(role == ELM_ATSPI_ROLE_POPUP_MENU);
 
diff --git a/src/tests/elm_test_datetime.c b/src/tests/elm_test_datetime.c
index ce3ad1d9d..0935f8866 100644
--- a/src/tests/elm_test_datetime.c
+++ b/src/tests/elm_test_datetime.c
@@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC);
 
    datetime = elm_datetime_add(win);
-   eo_do(datetime, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(datetime);
 
    ck_assert(role == ELM_ATSPI_ROLE_DATE_EDITOR);
 
diff --git a/src/tests/elm_test_dayselector.c b/src/tests/elm_test_dayselector.c
index c3e0fda47..d4f028878 100644
--- a/src/tests/elm_test_dayselector.c
+++ b/src/tests/elm_test_dayselector.c
@@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC);
 
    dayselector = elm_dayselector_add(win);
-   eo_do(dayselector, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(dayselector);
 
    ck_assert(role == ELM_ATSPI_ROLE_PANEL);
 
diff --git a/src/tests/elm_test_diskselector.c b/src/tests/elm_test_diskselector.c
index 34fba2312..e902939d5 100644
--- a/src/tests/elm_test_diskselector.c
+++ b/src/tests/elm_test_diskselector.c
@@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC);
 
    diskselector = elm_diskselector_add(win);
-   eo_do(diskselector, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(diskselector);
 
    ck_assert(role == ELM_ATSPI_ROLE_LIST);
 
diff --git a/src/tests/elm_test_entry.c b/src/tests/elm_test_entry.c
index f8c614b1a..ea898572e 100644
--- a/src/tests/elm_test_entry.c
+++ b/src/tests/elm_test_entry.c
@@ -38,22 +38,22 @@ START_TEST (elm_entry_atspi_text_char_get)
 
    expected = eina_unicode_utf8_to_unicode(txt, NULL);
 
-   eo_do(entry, val = elm_interface_atspi_text_character_get(-1));
+   val = elm_interface_atspi_text_character_get(entry, -1);
    ck_assert(val == 0);
 
-   eo_do(entry, val = elm_interface_atspi_text_character_get(0));
+   val = elm_interface_atspi_text_character_get(entry, 0);
    ck_assert(val == expected[0]);
 
-   eo_do(entry, val = elm_interface_atspi_text_character_get(1));
+   val = elm_interface_atspi_text_character_get(entry, 1);
    ck_assert(val == expected[1]);
 
-   eo_do(entry, val = elm_interface_atspi_text_character_get(2));
+   val = elm_interface_atspi_text_character_get(entry, 2);
    ck_assert(val == expected[2]);
 
-   eo_do(entry, val = elm_interface_atspi_text_character_get(6));
+   val = elm_interface_atspi_text_character_get(entry, 6);
    ck_assert(val == expected[6]);
 
-   eo_do(entry, val = elm_interface_atspi_text_character_get(26));
+   val = elm_interface_atspi_text_character_get(entry, 26);
    ck_assert(val == 0);
 
    free(expected);
@@ -74,7 +74,7 @@ START_TEST (elm_entry_atspi_text_char_count)
    entry = elm_entry_add(win);
    elm_object_text_set(entry, mtxt);
 
-   eo_do(entry, val = elm_interface_atspi_text_character_count_get());
+   val = elm_interface_atspi_text_character_count_get(entry);
    ck_assert(val == 12);
 
    elm_shutdown();
@@ -96,28 +96,28 @@ START_TEST (elm_entry_atspi_text_string_get_char)
    elm_object_text_set(entry, txt);
 
    start = 1;
-   eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end));
+   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end);
    ck_assert_str_eq(val, "o");
    ck_assert(start == 1);
    ck_assert(end == 2);
    if (val) free(val);
 
    start = 8;
-   eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end));
+   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end);
    ck_assert_str_eq(val, "ś");
    ck_assert(start == 8);
    ck_assert(end == 9);
    if (val) free(val);
 
    start = 11;
-   eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end));
+   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end);
    ck_assert_str_eq(val, " ");
    ck_assert(start == 11);
    ck_assert(end == 12);
    if (val) free(val);
 
    start = 111;
-   eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end));
+   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end);
    ck_assert(start == -1);
    ck_assert(end == -1);
    ck_assert(val == NULL);
@@ -141,28 +141,28 @@ START_TEST (elm_entry_atspi_text_string_get_word)
    elm_object_text_set(entry, txt);
 
    start = 1;
-   eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end));
+   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end);
    ck_assert_str_eq(val, "Lorem");
    ck_assert(start == 0);
    ck_assert(end == 5);
    if (val) free(val);
 
    start = 6;
-   eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end));
+   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end);
    ck_assert_str_eq(val, "ipśum");
    ck_assert(start == 6);
    ck_assert(end == 11);
    if (val) free(val);
 
    start = 19;
-   eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end));
+   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end);
    ck_assert_str_eq(val, "dolor");
    ck_assert(start == 14);
    ck_assert(end == 19);
    if (val) free(val);
 
    start = 111;
-   eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end));
+   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end);
    ck_assert(start == -1);
    ck_assert(end == -1);
    ck_assert(val == NULL);
@@ -187,28 +187,28 @@ START_TEST (elm_entry_atspi_text_string_get_paragraph)
    elm_object_text_set(entry, txt);
 
    start = 1;
-   eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH, &start, &end));
+   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH, &start, &end);
    ck_assert_str_eq(val, "Lorem ipśum");
    ck_assert(start == 0);
    ck_assert(end == 11);
    if (val) free(val);
 
    start = 20;
-   eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH, &start, &end));
+   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH, &start, &end);
    ck_assert_str_eq(val, "   dolor sit");
    ck_assert(start == 12);
    ck_assert(end == 24);
    if (val) free(val);
 
    start = 25;
-   eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH, &start, &end));
+   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH, &start, &end);
    ck_assert_str_eq(val, " amęt");
    ck_assert(start == 25);
    ck_assert(end == 30);
    if (val) free(val);
 
    start = 111;
-   eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end));
+   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end);
    ck_assert(start == -1);
    ck_assert(end == -1);
    ck_assert(val == NULL);
@@ -235,7 +235,7 @@ START_TEST (elm_entry_atspi_text_string_get_line)
    elm_object_text_set(entry, txt);
 
    start = 1;
-   eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_LINE, &start, &end));
+   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_LINE, &start, &end);
 
    ck_assert_str_eq(val, "Lorem ipśum");
    ck_assert(start == 0);
@@ -243,7 +243,7 @@ START_TEST (elm_entry_atspi_text_string_get_line)
    if (val) free(val);
 
    start = 13;
-   eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_LINE, &start, &end));
+   val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_LINE, &start, &end);
    ck_assert_str_eq(val, "   dolor sit amęt");
    ck_assert(start == 12);
    ck_assert(end == 29);
@@ -266,17 +266,17 @@ START_TEST (elm_entry_atspi_text_text_get)
    elm_object_text_set(entry, txt);
 
    // invalid ranges
-   eo_do(entry, val = elm_interface_atspi_text_get(6, 100));
+   val = elm_interface_atspi_text_get(entry, 6, 100);
    ck_assert(val == NULL);
-   eo_do(entry, val = elm_interface_atspi_text_get(-6, 10));
+   val = elm_interface_atspi_text_get(entry, -6, 10);
    ck_assert(val == NULL);
-   eo_do(entry, val = elm_interface_atspi_text_get(-6, -10));
+   val = elm_interface_atspi_text_get(entry, -6, -10);
    ck_assert(val == NULL);
-   eo_do(entry, val = elm_interface_atspi_text_get(60, 100));
+   val = elm_interface_atspi_text_get(entry, 60, 100);
    ck_assert(val == NULL);
 
    // proper range
-   eo_do(entry, val = elm_interface_atspi_text_get(6, 17));
+   val = elm_interface_atspi_text_get(entry, 6, 17);
    ck_assert_str_eq(val, "Xpśum dolor");
 
    if (val) free(val);
@@ -298,30 +298,30 @@ START_TEST (elm_entry_atspi_text_selections)
    entry = elm_entry_add(win);
    elm_object_text_set(entry, txt);
 
-   eo_do(entry, val = elm_interface_atspi_text_selections_count_get());
+   val = elm_interface_atspi_text_selections_count_get(entry);
    ck_assert(val == 0);
 
    elm_entry_select_region_set(entry, 2, 4);
-   eo_do(entry, val = elm_interface_atspi_text_selections_count_get());
+   val = elm_interface_atspi_text_selections_count_get(entry);
    ck_assert(val == 1);
-   eo_do(entry, elm_interface_atspi_text_selection_get(0, &start, &end));
+   elm_interface_atspi_text_selection_get(entry, 0, &start, &end);
    ck_assert(start == 2);
    ck_assert(end == 4);
 
    elm_entry_select_region_set(entry, 6, 10);
-   eo_do(entry, val = elm_interface_atspi_text_selections_count_get());
+   val = elm_interface_atspi_text_selections_count_get(entry);
    ck_assert(val == 1);
-   eo_do(entry, elm_interface_atspi_text_selection_get(0, &start, &end));
+   elm_interface_atspi_text_selection_get(entry, 0, &start, &end);
    ck_assert(start == 6);
    ck_assert(end == 10);
 
    elm_entry_select_none(entry);
-   eo_do(entry, ret = elm_interface_atspi_text_selection_add(2, 5));
+   ret = elm_interface_atspi_text_selection_add(entry, 2, 5);
    ck_assert(ret == EINA_TRUE);
    str = elm_entry_selection_get(entry);
    ck_assert_str_eq(str, "rem");
 
-   eo_do(entry, ret = elm_interface_atspi_text_selection_remove(0));
+   ret = elm_interface_atspi_text_selection_remove(entry, 0);
    ck_assert(ret == EINA_TRUE);
    str = elm_entry_selection_get(entry);
    ck_assert(str == NULL);
@@ -339,7 +339,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
 
    entry = elm_entry_add(win);
-   eo_do(entry, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(entry);
 
    ck_assert(role == ELM_ATSPI_ROLE_ENTRY);
 
diff --git a/src/tests/elm_test_fileselector.c b/src/tests/elm_test_fileselector.c
index cda9ed0f1..4a86d999a 100644
--- a/src/tests/elm_test_fileselector.c
+++ b/src/tests/elm_test_fileselector.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC);
 
    fileselector = elm_fileselector_add(win);
-   eo_do(fileselector, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(fileselector);
 
    ck_assert(role == ELM_ATSPI_ROLE_FILE_CHOOSER);
 
diff --git a/src/tests/elm_test_fileselector_button.c b/src/tests/elm_test_fileselector_button.c
index fab98ef9b..653678d9d 100644
--- a/src/tests/elm_test_fileselector_button.c
+++ b/src/tests/elm_test_fileselector_button.c
@@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC);
 
    fs_button = elm_fileselector_button_add(win);
-   eo_do(fs_button, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(fs_button);
 
    ck_assert(role == ELM_ATSPI_ROLE_PUSH_BUTTON);
 
diff --git a/src/tests/elm_test_fileselector_entry.c b/src/tests/elm_test_fileselector_entry.c
index 5dedd8987..d78cf1b23 100644
--- a/src/tests/elm_test_fileselector_entry.c
+++ b/src/tests/elm_test_fileselector_entry.c
@@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "fileselectorentry", ELM_WIN_BASIC);
 
    fs_entry = elm_fileselector_entry_add(win);
-   eo_do(fs_entry, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(fs_entry);
 
    ck_assert(role == ELM_ATSPI_ROLE_GROUPING);
 
diff --git a/src/tests/elm_test_flip.c b/src/tests/elm_test_flip.c
index bd7d16f31..947c020dd 100644
--- a/src/tests/elm_test_flip.c
+++ b/src/tests/elm_test_flip.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "flip", ELM_WIN_BASIC);
 
    flip = elm_flip_add(win);
-   eo_do(flip, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(flip);
 
    ck_assert(role == ELM_ATSPI_ROLE_PAGE_TAB_LIST);
 
diff --git a/src/tests/elm_test_flipselector.c b/src/tests/elm_test_flipselector.c
index c14039f81..2ede134a0 100644
--- a/src/tests/elm_test_flipselector.c
+++ b/src/tests/elm_test_flipselector.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC);
 
    flipselector = elm_flipselector_add(win);
-   eo_do(flipselector, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(flipselector);
 
    ck_assert(role == ELM_ATSPI_ROLE_LIST);
 
diff --git a/src/tests/elm_test_frame.c b/src/tests/elm_test_frame.c
index 2744e97aa..2527544a3 100644
--- a/src/tests/elm_test_frame.c
+++ b/src/tests/elm_test_frame.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "frame", ELM_WIN_BASIC);
 
    frame = elm_frame_add(win);
-   eo_do(frame, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(frame);
 
    ck_assert(role == ELM_ATSPI_ROLE_FRAME);
 
diff --git a/src/tests/elm_test_gengrid.c b/src/tests/elm_test_gengrid.c
index f0b3c2a29..54e37e20c 100644
--- a/src/tests/elm_test_gengrid.c
+++ b/src/tests/elm_test_gengrid.c
@@ -17,7 +17,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC);
 
    gengrid = elm_gengrid_add(win);
-   eo_do(gengrid, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(gengrid);
 
    ck_assert(role == ELM_ATSPI_ROLE_TREE_TABLE);
 
@@ -66,7 +66,7 @@ START_TEST(elm_atspi_children_parent)
    elm_gengrid_item_fields_update(it, "*.", ELM_GENGRID_ITEM_FIELD_CONTENT);
 
    ck_assert(content != NULL);
-   eo_do(content, parent = elm_interface_atspi_accessible_parent_get());
+   parent = elm_interface_atspi_accessible_parent_get(content);
    ck_assert(it == parent);
 
    elm_shutdown();
diff --git a/src/tests/elm_test_genlist.c b/src/tests/elm_test_genlist.c
index a2008156f..5d23930f2 100644
--- a/src/tests/elm_test_genlist.c
+++ b/src/tests/elm_test_genlist.c
@@ -28,7 +28,7 @@ START_TEST (elm_atspi_role_get)
 
    Elm_Atspi_Role role;
 
-   eo_do(genlist, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(genlist);
 
    ck_assert(role == ELM_ATSPI_ROLE_LIST);
 
@@ -42,14 +42,14 @@ START_TEST(elm_atspi_children_get1)
    Eina_List *children;
    Elm_Object_Item *it[3];
 
-   eo_do(genlist, children = elm_interface_atspi_accessible_children_get());
+   children = elm_interface_atspi_accessible_children_get(genlist);
    ck_assert(children == NULL);
 
    it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
    it[1] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
    it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
 
-   eo_do(genlist, children = elm_interface_atspi_accessible_children_get());
+   children = elm_interface_atspi_accessible_children_get(genlist);
    ck_assert(eina_list_count(children) == 3);
    ck_assert(eina_list_nth(children, 0) == it[0]);
    ck_assert(eina_list_nth(children, 1) == it[1]);
@@ -71,7 +71,7 @@ START_TEST(elm_atspi_children_get2)
    it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL);
    it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL);
 
-   eo_do(genlist, children = elm_interface_atspi_accessible_children_get());
+   children = elm_interface_atspi_accessible_children_get(genlist);
    ck_assert(eina_list_nth(children, 1) == it[0]);
    ck_assert(eina_list_nth(children, 0) == it[1]);
    ck_assert(eina_list_nth(children, 2) == it[2]);
@@ -103,7 +103,7 @@ START_TEST(elm_atspi_children_events_add)
 
    Elm_Object_Item *it[3];
 
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_handler_add(_children_changed_cb, NULL));
+   elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _children_changed_cb, NULL);
 
    it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
    ck_assert(genlist == current);
@@ -140,7 +140,7 @@ START_TEST(elm_atspi_children_events_del1)
    it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
    it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL);
 
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_handler_add(_children_changed_cb, NULL));
+   elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _children_changed_cb, NULL);
 
    elm_object_item_del(it[0]);
    ck_assert(genlist == current);
@@ -168,7 +168,7 @@ START_TEST(elm_atspi_children_events_del2)
 
    it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
 
-   eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_handler_add(_children_changed_cb, NULL));
+   elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _children_changed_cb, NULL);
    elm_genlist_clear(genlist);
 
    ck_assert(genlist == current);
diff --git a/src/tests/elm_test_glview.c b/src/tests/elm_test_glview.c
index 1ad462c5d..556c22f6e 100644
--- a/src/tests/elm_test_glview.c
+++ b/src/tests/elm_test_glview.c
@@ -20,7 +20,7 @@ START_TEST (elm_atspi_role_get)
    // if no gl backend skip test
    if (glview)
      {
-        eo_do(glview, role = elm_interface_atspi_accessible_role_get());
+        role = elm_interface_atspi_accessible_role_get(glview);
         ck_assert(role == ELM_ATSPI_ROLE_ANIMATION);
      }
 
diff --git a/src/tests/elm_test_grid.c b/src/tests/elm_test_grid.c
index 9f0526154..f1350d49e 100644
--- a/src/tests/elm_test_grid.c
+++ b/src/tests/elm_test_grid.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "grid", ELM_WIN_BASIC);
 
    grid = elm_grid_add(win);
-   eo_do(grid, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(grid);
 
    ck_assert(role == ELM_ATSPI_ROLE_FILLER);
 
diff --git a/src/tests/elm_test_hover.c b/src/tests/elm_test_hover.c
index 5eedb19ed..b23f89211 100644
--- a/src/tests/elm_test_hover.c
+++ b/src/tests/elm_test_hover.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "hover", ELM_WIN_BASIC);
 
    hover = elm_hover_add(win);
-   eo_do(hover, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(hover);
 
    ck_assert(role == ELM_ATSPI_ROLE_POPUP_MENU);
 
diff --git a/src/tests/elm_test_hoversel.c b/src/tests/elm_test_hoversel.c
index dedccf652..14f1148b5 100644
--- a/src/tests/elm_test_hoversel.c
+++ b/src/tests/elm_test_hoversel.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC);
 
    hoversel = elm_hoversel_add(win);
-   eo_do(hoversel, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(hoversel);
 
    ck_assert(role == ELM_ATSPI_ROLE_PUSH_BUTTON);
 
diff --git a/src/tests/elm_test_icon.c b/src/tests/elm_test_icon.c
index 757e00d26..7cc9469d8 100644
--- a/src/tests/elm_test_icon.c
+++ b/src/tests/elm_test_icon.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
 
    icon = elm_icon_add(win);
-   eo_do(icon, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(icon);
 
    ck_assert(role == ELM_ATSPI_ROLE_IMAGE);
 
diff --git a/src/tests/elm_test_image.c b/src/tests/elm_test_image.c
index 2d075f79e..fcc728c8f 100644
--- a/src/tests/elm_test_image.c
+++ b/src/tests/elm_test_image.c
@@ -26,7 +26,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
 
    image = elm_image_add(win);
-   eo_do(image, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(image);
 
    ck_assert(role == ELM_ATSPI_ROLE_IMAGE);
 
@@ -42,7 +42,7 @@ _async_error_cb(void *data, Eo *obj,
    Test_Data *td = data;
    char path[PATH_MAX];
    sprintf(path, pathfmt, td->image_id);
-   eo_do(obj, efl_file_set(path, NULL));
+   efl_file_set(obj, path, NULL);
    return EO_CALLBACK_CONTINUE;
 }
 
@@ -56,7 +56,7 @@ _async_opened_cb(void *data, Eo *obj,
    char path[PATH_MAX];
 
    sprintf(path, pathfmt, td->image_id);
-   eo_do(obj, efl_file_get(&ff, &kk));
+   efl_file_get(obj, &ff, &kk);
    r1 = strrchr(ff, '/');
    r2 = strrchr(path, '/');
    ck_assert(!strcmp(r1, r2));
@@ -66,7 +66,7 @@ _async_opened_cb(void *data, Eo *obj,
      {
         td->image_id++;
         sprintf(path, pathfmt, td->image_id);
-        eo_do(obj, efl_file_set(path, NULL));
+        efl_file_set(obj, path, NULL);
         return EO_CALLBACK_CONTINUE;
      }
    else if (td->image_id < MAX_IMAGE_ID)
@@ -75,7 +75,7 @@ _async_opened_cb(void *data, Eo *obj,
         for (; td->image_id < MAX_IMAGE_ID;)
           {
              sprintf(path, pathfmt, ++td->image_id);
-             eo_do(obj, efl_file_set(path, NULL));
+             efl_file_set(obj, path, NULL);
           }
         return EO_CALLBACK_CONTINUE;
      }
@@ -110,13 +110,12 @@ START_TEST (elm_image_async_path)
    td.image_id = 0;
 
    image = elm_image_add(win);
-   eo_do(image,
-         one = efl_file_async_get();
-         efl_file_async_set(1);
-         eo_event_callback_add(EFL_FILE_EVENT_ASYNC_ERROR, _async_error_cb, &td);
-         eo_event_callback_add(EFL_FILE_EVENT_ASYNC_OPENED, _async_opened_cb, &td);
-         ok = efl_file_set(invalid, NULL);
-         two = efl_file_async_get());
+   one = efl_file_async_get(image);
+   efl_file_async_set(image, 1);
+   eo_event_callback_add(image, EFL_FILE_EVENT_ASYNC_ERROR, _async_error_cb, &td);
+   eo_event_callback_add(image, EFL_FILE_EVENT_ASYNC_OPENED, _async_opened_cb, &td);
+   ok = efl_file_set(image, invalid, NULL);
+   two = efl_file_async_get(image);
    ck_assert(!one && two);
    ck_assert(ok);
 
@@ -148,12 +147,10 @@ START_TEST (elm_image_async_mmap)
    ck_assert(f);
 
    image = elm_image_add(win);
-   eo_do(image,
-         efl_file_async_set(1);
-         eo_event_callback_add(EFL_FILE_EVENT_ASYNC_ERROR, _async_error_cb, &td);
-         eo_event_callback_add(EFL_FILE_EVENT_ASYNC_OPENED, _async_opened_cb, &td);
-         ok = efl_file_mmap_set(f, NULL);
-         );
+   efl_file_async_set(image, 1);
+   eo_event_callback_add(image, EFL_FILE_EVENT_ASYNC_ERROR, _async_error_cb, &td);
+   eo_event_callback_add(image, EFL_FILE_EVENT_ASYNC_OPENED, _async_opened_cb, &td);
+   ok = efl_file_mmap_set(image, f, NULL);
    ck_assert(ok);
 
    ecore_timer_add(10.0, _timeout_cb, &td);
diff --git a/src/tests/elm_test_index.c b/src/tests/elm_test_index.c
index 6b9fdc132..1a34933cc 100644
--- a/src/tests/elm_test_index.c
+++ b/src/tests/elm_test_index.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "index", ELM_WIN_BASIC);
 
    idx = elm_index_add(win);
-   eo_do(idx, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(idx);
 
    ck_assert(role == ELM_ATSPI_ROLE_SCROLL_BAR);
 
diff --git a/src/tests/elm_test_inwin.c b/src/tests/elm_test_inwin.c
index a5bcfc7d2..942945dff 100644
--- a/src/tests/elm_test_inwin.c
+++ b/src/tests/elm_test_inwin.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
 
    inwin = elm_win_inwin_add(win);
-   eo_do(inwin, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(inwin);
 
    ck_assert(role == ELM_ATSPI_ROLE_GLASS_PANE);
 
diff --git a/src/tests/elm_test_label.c b/src/tests/elm_test_label.c
index 813ef2f7d..a81fdf441 100644
--- a/src/tests/elm_test_label.c
+++ b/src/tests/elm_test_label.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "label", ELM_WIN_BASIC);
 
    label = elm_label_add(win);
-   eo_do(label, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(label);
 
    ck_assert(role == ELM_ATSPI_ROLE_LABEL);
 
diff --git a/src/tests/elm_test_layout.c b/src/tests/elm_test_layout.c
index f1d45719e..5ccfb50f8 100644
--- a/src/tests/elm_test_layout.c
+++ b/src/tests/elm_test_layout.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
 
    layout = elm_layout_add(win);
-   eo_do(layout, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(layout);
 
    ck_assert(role == ELM_ATSPI_ROLE_FILLER);
 
diff --git a/src/tests/elm_test_list.c b/src/tests/elm_test_list.c
index 54665f41f..3afd06249 100644
--- a/src/tests/elm_test_list.c
+++ b/src/tests/elm_test_list.c
@@ -23,15 +23,15 @@ START_TEST (elm_list_atspi_selection_selected_children_count_get)
  list = elm_list_add(win);
  item = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL);
 
- eo_do(list, val = elm_interface_atspi_selection_selected_children_count_get());
+ val = elm_interface_atspi_selection_selected_children_count_get(list);
  ck_assert(val == 0);
 
  elm_list_item_selected_set(item, EINA_TRUE);
- eo_do(list, val = elm_interface_atspi_selection_selected_children_count_get());
+ val = elm_interface_atspi_selection_selected_children_count_get(list);
  ck_assert(val == 1);
 
  elm_list_item_selected_set(item, EINA_FALSE);
- eo_do(list, val = elm_interface_atspi_selection_selected_children_count_get());
+ val = elm_interface_atspi_selection_selected_children_count_get(list);
  ck_assert(val == 0);
 
  elm_shutdown();
@@ -50,7 +50,7 @@ START_TEST (elm_list_atspi_selection_child_select)
  list = elm_list_add(win);
  item = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL);
 
- eo_do(list, val = elm_interface_atspi_selection_child_select(0));
+ val = elm_interface_atspi_selection_child_select(list, 0);
  ck_assert(val == EINA_TRUE);
  ck_assert(EINA_TRUE == elm_list_item_selected_get(item));
 
@@ -73,7 +73,7 @@ START_TEST (elm_list_atspi_selection_selected_child_deselect)
  item = elm_list_item_append(list, "Second Element", NULL, NULL, NULL, NULL);
 
  elm_list_item_selected_set(item, EINA_TRUE);
- eo_do(list, val = elm_interface_atspi_selection_selected_child_deselect(0));
+ val = elm_interface_atspi_selection_selected_child_deselect(list, 0);
  ck_assert(val == EINA_TRUE);
  ck_assert(EINA_FALSE == elm_list_item_selected_get(item));
 
@@ -93,11 +93,11 @@ START_TEST (elm_list_atspi_selection_is_child_selected)
  list = elm_list_add(win);
  item = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL);
 
- eo_do(list, val = elm_interface_atspi_selection_is_child_selected(0));
+ val = elm_interface_atspi_selection_is_child_selected(list, 0);
  ck_assert(val == EINA_FALSE);
 
  elm_list_item_selected_set(item, EINA_TRUE);
- eo_do(list, val = elm_interface_atspi_selection_is_child_selected(0));
+ val = elm_interface_atspi_selection_is_child_selected(list, 0);
  ck_assert(val == EINA_TRUE);
 
  elm_shutdown();
@@ -118,11 +118,11 @@ START_TEST (elm_list_atspi_selection_all_children_select)
  item1 = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL);
  item2 = elm_list_item_append(list, "Second Element", NULL, NULL, NULL, NULL);
 
- eo_do(list, val = elm_interface_atspi_selection_all_children_select());
+ val = elm_interface_atspi_selection_all_children_select(list);
  ck_assert(val == EINA_FALSE);
 
  elm_list_multi_select_set(list, EINA_TRUE);
- eo_do(list, val = elm_interface_atspi_selection_all_children_select());
+ val = elm_interface_atspi_selection_all_children_select(list);
  ck_assert(val == EINA_TRUE);
  ck_assert(EINA_TRUE == elm_list_item_selected_get(item1));
  ck_assert(EINA_TRUE == elm_list_item_selected_get(item2));
@@ -149,7 +149,7 @@ START_TEST (elm_list_atspi_selection_clear)
  elm_list_item_selected_set(item2, EINA_TRUE);
 
 
- eo_do(list, val = elm_interface_atspi_selection_clear());
+ val = elm_interface_atspi_selection_clear(list);
  ck_assert(val == EINA_TRUE);
  ck_assert(EINA_FALSE == elm_list_item_selected_get(item1));
  ck_assert(EINA_FALSE == elm_list_item_selected_get(item2));
@@ -173,7 +173,7 @@ START_TEST (elm_list_atspi_selection_child_deselect)
  item = elm_list_item_append(list, "Second Element", NULL, NULL, NULL, NULL);
 
  elm_list_item_selected_set(item, EINA_TRUE);
- eo_do(list, val = elm_interface_atspi_selection_selected_child_deselect(1));
+ val = elm_interface_atspi_selection_selected_child_deselect(list, 1);
  ck_assert(val == EINA_TRUE);
  ck_assert(EINA_FALSE == elm_list_item_selected_get(item));
 
@@ -192,7 +192,7 @@ START_TEST (elm_atspi_role_get)
  win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
 
  list = elm_list_add(win);
- eo_do(list, role = elm_interface_atspi_accessible_role_get());
+ role = elm_interface_atspi_accessible_role_get(list);
 
  ck_assert(role == ELM_ATSPI_ROLE_LIST);
 
@@ -220,10 +220,10 @@ START_TEST(elm_atspi_children_parent)
 
    evas_object_show(list);
 
-   eo_do(icon, parent = elm_interface_atspi_accessible_parent_get());
+   parent = elm_interface_atspi_accessible_parent_get(icon);
    ck_assert(list == parent);
 
-   eo_do(end, parent = elm_interface_atspi_accessible_parent_get());
+   parent = elm_interface_atspi_accessible_parent_get(end);
    ck_assert(list == parent);
 
    elm_shutdown();
diff --git a/src/tests/elm_test_map.c b/src/tests/elm_test_map.c
index 81935d505..efaaa8f7f 100644
--- a/src/tests/elm_test_map.c
+++ b/src/tests/elm_test_map.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "map", ELM_WIN_BASIC);
 
    map = elm_map_add(win);
-   eo_do(map, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(map);
 
    ck_assert(role == ELM_ATSPI_ROLE_IMAGE_MAP);
 
diff --git a/src/tests/elm_test_mapbuf.c b/src/tests/elm_test_mapbuf.c
index e9d571ac5..570d37f4c 100644
--- a/src/tests/elm_test_mapbuf.c
+++ b/src/tests/elm_test_mapbuf.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC);
 
    mapbuf = elm_mapbuf_add(win);
-   eo_do(mapbuf, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(mapbuf);
 
    ck_assert(role == ELM_ATSPI_ROLE_IMAGE_MAP);
 
diff --git a/src/tests/elm_test_menu.c b/src/tests/elm_test_menu.c
index 1975db1ea..015bc8985 100644
--- a/src/tests/elm_test_menu.c
+++ b/src/tests/elm_test_menu.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "menu", ELM_WIN_BASIC);
 
    menu = elm_menu_add(win);
-   eo_do(menu, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(menu);
 
    ck_assert(role == ELM_ATSPI_ROLE_MENU);
 
diff --git a/src/tests/elm_test_multibuttonentry.c b/src/tests/elm_test_multibuttonentry.c
index 3c29ee374..9a8a34a26 100644
--- a/src/tests/elm_test_multibuttonentry.c
+++ b/src/tests/elm_test_multibuttonentry.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC);
 
    multibuttonentry = elm_multibuttonentry_add(win);
-   eo_do(multibuttonentry, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(multibuttonentry);
 
    ck_assert(role == ELM_ATSPI_ROLE_ENTRY);
 
diff --git a/src/tests/elm_test_naviframe.c b/src/tests/elm_test_naviframe.c
index 7e6844743..a34ce3e6e 100644
--- a/src/tests/elm_test_naviframe.c
+++ b/src/tests/elm_test_naviframe.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC);
 
    naviframe = elm_naviframe_add(win);
-   eo_do(naviframe, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(naviframe);
 
    ck_assert(role == ELM_ATSPI_ROLE_PAGE_TAB_LIST);
 
diff --git a/src/tests/elm_test_notify.c b/src/tests/elm_test_notify.c
index a213fa2de..9fe99cf01 100644
--- a/src/tests/elm_test_notify.c
+++ b/src/tests/elm_test_notify.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "notify", ELM_WIN_BASIC);
 
    notify = elm_notify_add(win);
-   eo_do(notify, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(notify);
 
    ck_assert(role == ELM_ATSPI_ROLE_NOTIFICATION);
 
diff --git a/src/tests/elm_test_panel.c b/src/tests/elm_test_panel.c
index 2e34739f4..e98792ee6 100644
--- a/src/tests/elm_test_panel.c
+++ b/src/tests/elm_test_panel.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "panel", ELM_WIN_BASIC);
 
    panel = elm_panel_add(win);
-   eo_do(panel, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(panel);
 
    ck_assert(role == ELM_ATSPI_ROLE_PANEL);
 
diff --git a/src/tests/elm_test_panes.c b/src/tests/elm_test_panes.c
index fc286914f..fea0a02e2 100644
--- a/src/tests/elm_test_panes.c
+++ b/src/tests/elm_test_panes.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "panes", ELM_WIN_BASIC);
 
    panes = elm_panes_add(win);
-   eo_do(panes, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(panes);
 
    ck_assert(role == ELM_ATSPI_ROLE_SPLIT_PANE);
 
diff --git a/src/tests/elm_test_photo.c b/src/tests/elm_test_photo.c
index 322c363cb..3d8bc5fc4 100644
--- a/src/tests/elm_test_photo.c
+++ b/src/tests/elm_test_photo.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "photo", ELM_WIN_BASIC);
 
    photo = elm_photo_add(win);
-   eo_do(photo, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(photo);
 
    ck_assert(role == ELM_ATSPI_ROLE_IMAGE);
 
diff --git a/src/tests/elm_test_photocam.c b/src/tests/elm_test_photocam.c
index f60604f34..e8d1f78c5 100644
--- a/src/tests/elm_test_photocam.c
+++ b/src/tests/elm_test_photocam.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC);
 
    photocam = elm_photocam_add(win);
-   eo_do(photocam, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(photocam);
 
    ck_assert(role == ELM_ATSPI_ROLE_IMAGE);
 
diff --git a/src/tests/elm_test_player.c b/src/tests/elm_test_player.c
index be62d89a6..863bfba00 100644
--- a/src/tests/elm_test_player.c
+++ b/src/tests/elm_test_player.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "player", ELM_WIN_BASIC);
 
    player = elm_player_add(win);
-   eo_do(player, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(player);
 
    ck_assert(role == ELM_ATSPI_ROLE_ANIMATION);
 
diff --git a/src/tests/elm_test_plug.c b/src/tests/elm_test_plug.c
index c8ad28931..8139ae538 100644
--- a/src/tests/elm_test_plug.c
+++ b/src/tests/elm_test_plug.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "plug", ELM_WIN_BASIC);
 
    plug = elm_plug_add(win);
-   eo_do(plug, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(plug);
 
    ck_assert(role == ELM_ATSPI_ROLE_IMAGE);
 
diff --git a/src/tests/elm_test_popup.c b/src/tests/elm_test_popup.c
index f98adf146..b28447544 100644
--- a/src/tests/elm_test_popup.c
+++ b/src/tests/elm_test_popup.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "popup", ELM_WIN_BASIC);
 
    popup = elm_popup_add(win);
-   eo_do(popup, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(popup);
 
    ck_assert(role == ELM_ATSPI_ROLE_NOTIFICATION);
 
diff --git a/src/tests/elm_test_prefs.c b/src/tests/elm_test_prefs.c
index a4418450c..b27d5705e 100644
--- a/src/tests/elm_test_prefs.c
+++ b/src/tests/elm_test_prefs.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC);
 
    prefs = elm_prefs_add(win);
-   eo_do(prefs, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(prefs);
 
    ck_assert(role == ELM_ATSPI_ROLE_REDUNDANT_OBJECT);
 
diff --git a/src/tests/elm_test_progressbar.c b/src/tests/elm_test_progressbar.c
index fe6900a67..53319d7ff 100644
--- a/src/tests/elm_test_progressbar.c
+++ b/src/tests/elm_test_progressbar.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC);
 
    progressbar = elm_progressbar_add(win);
-   eo_do(progressbar, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(progressbar);
 
    ck_assert(role == ELM_ATSPI_ROLE_PROGRESS_BAR);
 
diff --git a/src/tests/elm_test_radio.c b/src/tests/elm_test_radio.c
index c0a92a2d1..874dbe7d4 100644
--- a/src/tests/elm_test_radio.c
+++ b/src/tests/elm_test_radio.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "radio", ELM_WIN_BASIC);
 
    radio = elm_radio_add(win);
-   eo_do(radio, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(radio);
 
    ck_assert(role == ELM_ATSPI_ROLE_RADIO_BUTTON);
 
diff --git a/src/tests/elm_test_scroller.c b/src/tests/elm_test_scroller.c
index 9ccbc41a4..537710f4d 100644
--- a/src/tests/elm_test_scroller.c
+++ b/src/tests/elm_test_scroller.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC);
 
    scroller = elm_scroller_add(win);
-   eo_do(scroller, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(scroller);
 
    ck_assert(role == ELM_ATSPI_ROLE_SCROLL_PANE);
 
diff --git a/src/tests/elm_test_segmentcontrol.c b/src/tests/elm_test_segmentcontrol.c
index 5c60feb3a..31812e6fe 100644
--- a/src/tests/elm_test_segmentcontrol.c
+++ b/src/tests/elm_test_segmentcontrol.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC);
 
    segmentcontrol = elm_segment_control_add(win);
-   eo_do(segmentcontrol, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(segmentcontrol);
 
    ck_assert(role == ELM_ATSPI_ROLE_LIST);
 
diff --git a/src/tests/elm_test_separator.c b/src/tests/elm_test_separator.c
index 869b8eee8..a786cd367 100644
--- a/src/tests/elm_test_separator.c
+++ b/src/tests/elm_test_separator.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
 
    separator = elm_separator_add(win);
-   eo_do(separator, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(separator);
 
    ck_assert(role == ELM_ATSPI_ROLE_SEPARATOR);
 
diff --git a/src/tests/elm_test_slider.c b/src/tests/elm_test_slider.c
index 99874b9a4..59e359de5 100644
--- a/src/tests/elm_test_slider.c
+++ b/src/tests/elm_test_slider.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "slider", ELM_WIN_BASIC);
 
    slider = elm_slider_add(win);
-   eo_do(slider, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(slider);
 
    ck_assert(role == ELM_ATSPI_ROLE_SLIDER);
 
diff --git a/src/tests/elm_test_slideshow.c b/src/tests/elm_test_slideshow.c
index fb2828f5c..8edacc5e9 100644
--- a/src/tests/elm_test_slideshow.c
+++ b/src/tests/elm_test_slideshow.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC);
 
    slideshow = elm_slideshow_add(win);
-   eo_do(slideshow, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(slideshow);
 
    ck_assert(role == ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION);
 
diff --git a/src/tests/elm_test_spinner.c b/src/tests/elm_test_spinner.c
index 41049d2ed..bc77c9738 100644
--- a/src/tests/elm_test_spinner.c
+++ b/src/tests/elm_test_spinner.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC);
 
    spinner = elm_spinner_add(win);
-   eo_do(spinner, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(spinner);
 
    ck_assert(role == ELM_ATSPI_ROLE_SPIN_BUTTON);
 
diff --git a/src/tests/elm_test_table.c b/src/tests/elm_test_table.c
index ad0d80590..bb7edc5b1 100644
--- a/src/tests/elm_test_table.c
+++ b/src/tests/elm_test_table.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "table", ELM_WIN_BASIC);
 
    table = elm_table_add(win);
-   eo_do(table, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(table);
 
    ck_assert(role == ELM_ATSPI_ROLE_FILLER);
 
diff --git a/src/tests/elm_test_thumb.c b/src/tests/elm_test_thumb.c
index 68db163d0..3a06b0cd7 100644
--- a/src/tests/elm_test_thumb.c
+++ b/src/tests/elm_test_thumb.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC);
 
    thumb = elm_thumb_add(win);
-   eo_do(thumb, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(thumb);
 
    ck_assert(role == ELM_ATSPI_ROLE_IMAGE);
 
diff --git a/src/tests/elm_test_toolbar.c b/src/tests/elm_test_toolbar.c
index 7e4a6b5c7..d50f50b45 100644
--- a/src/tests/elm_test_toolbar.c
+++ b/src/tests/elm_test_toolbar.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
 
    toolbar = elm_toolbar_add(win);
-   eo_do(toolbar, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(toolbar);
 
    ck_assert(role == ELM_ATSPI_ROLE_TOOL_BAR);
 
diff --git a/src/tests/elm_test_video.c b/src/tests/elm_test_video.c
index 100feaa42..f3b7fea2d 100644
--- a/src/tests/elm_test_video.c
+++ b/src/tests/elm_test_video.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "video", ELM_WIN_BASIC);
 
    video = elm_video_add(win);
-   eo_do(video, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(video);
 
    ck_assert(role == ELM_ATSPI_ROLE_ANIMATION);
 
diff --git a/src/tests/elm_test_web.c b/src/tests/elm_test_web.c
index d1b8ea765..5efa8f067 100644
--- a/src/tests/elm_test_web.c
+++ b/src/tests/elm_test_web.c
@@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get)
    win = elm_win_add(NULL, "web", ELM_WIN_BASIC);
 
    web = elm_web_add(win);
-   eo_do(web, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(web);
 
    ck_assert(role == ELM_ATSPI_ROLE_HTML_CONTAINER);
 
diff --git a/src/tests/elm_test_win.c b/src/tests/elm_test_win.c
index 6fc07ef81..b10d5610a 100644
--- a/src/tests/elm_test_win.c
+++ b/src/tests/elm_test_win.c
@@ -17,7 +17,7 @@ _do_delete_request(Eo *win)
 {
 #ifdef HAVE_ELEMENTARY_X
    Ecore_X_Window xwin;
-   eo_do(win, xwin = elm_obj_win_xwindow_get());
+   xwin = elm_obj_win_xwindow_get(win);
    ecore_x_window_delete_request_send(xwin);
 #endif
 
@@ -37,7 +37,7 @@ static Eina_Bool
 _timer_hide_window_cb(void *data)
 {
    Eo *win = (Eo*) data;
-   eo_do(win, efl_gfx_visible_set(EINA_FALSE));
+   efl_gfx_visible_set(win, EINA_FALSE);
    return ECORE_CALLBACK_PASS_ON;
 }
 
@@ -66,7 +66,7 @@ START_TEST (elm_atspi_role_get)
    elm_init(1, NULL);
    win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
 
-   eo_do(win, role = elm_interface_atspi_accessible_role_get());
+   role = elm_interface_atspi_accessible_role_get(win);
 
    ck_assert(role == ELM_ATSPI_ROLE_WINDOW);
 
@@ -83,7 +83,7 @@ START_TEST (elm_atspi_component_position)
 
    Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
 
-   eo_do(win, ret = elm_interface_atspi_component_position_set(EINA_TRUE, 45, 45));
+   ret = elm_interface_atspi_component_position_set(win, EINA_TRUE, 45, 45);
    ck_assert(ret == EINA_TRUE);
 
    Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(win));
@@ -106,7 +106,7 @@ START_TEST (elm_atspi_component_size)
    Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
    evas_object_resize(win, 50, 50);
 
-   eo_do(win, ret = elm_interface_atspi_component_size_set(100, 100));
+   ret = elm_interface_atspi_component_size_set(win, 100, 100);
    ck_assert(ret == EINA_TRUE);
 
    evas_object_geometry_get(win, NULL, NULL, &w, &h);
@@ -121,8 +121,8 @@ START_TEST (elm_win_autohide)
    elm_init(0, NULL);
 
    Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
-   eo_do(win, elm_obj_win_autohide_set(EINA_TRUE));
-   eo_do(win, efl_gfx_visible_set(EINA_TRUE));
+   elm_obj_win_autohide_set(win, EINA_TRUE);
+   efl_gfx_visible_set(win, EINA_TRUE);
 
    Eina_Bool fail_flag = EINA_FALSE;
    ecore_timer_add(_timeout1, _timer_delete_request_cb, win);
@@ -131,7 +131,7 @@ START_TEST (elm_win_autohide)
    elm_run();
 
    Eina_Bool visible;
-   eo_do(win, visible = efl_gfx_visible_get());
+   visible = efl_gfx_visible_get(win);
 
    ck_assert(visible == EINA_FALSE);
 
@@ -146,7 +146,7 @@ START_TEST (elm_win_policy_quit_last_window_hidden)
    elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
 
    Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
-   eo_do(win, efl_gfx_visible_set(EINA_TRUE));
+   efl_gfx_visible_set(win, EINA_TRUE);
 
    Eina_Bool fail_flag = EINA_FALSE;
    ecore_timer_add(_timeout1, _timer_hide_window_cb, win);
@@ -155,7 +155,7 @@ START_TEST (elm_win_policy_quit_last_window_hidden)
    elm_run();
 
    Eina_Bool visible;
-   eo_do(win, visible = efl_gfx_visible_get());
+   visible = efl_gfx_visible_get(win);
 
    ck_assert(fail_flag == EINA_FALSE);
    ck_assert(eo_ref_get(win) >= 1);
@@ -172,8 +172,8 @@ START_TEST (elm_win_autohide_and_policy_quit_last_window_hidden)
    elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
 
    Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
-   eo_do(win, elm_obj_win_autohide_set(EINA_TRUE));
-   eo_do(win, efl_gfx_visible_set(EINA_TRUE));
+   elm_obj_win_autohide_set(win, EINA_TRUE);
+   efl_gfx_visible_set(win, EINA_TRUE);
 
    Eina_Bool fail_flag = EINA_FALSE;
    ecore_timer_add(_timeout1, _timer_delete_request_cb, win);
@@ -182,7 +182,7 @@ START_TEST (elm_win_autohide_and_policy_quit_last_window_hidden)
    elm_run();
 
    Eina_Bool visible;
-   eo_do(win, visible = efl_gfx_visible_get());
+   visible = efl_gfx_visible_get(win);
 
    ck_assert(fail_flag == EINA_FALSE);
    ck_assert(eo_ref_get(win) >= 1);