Adjust usage of eo_constructor() according to recent changes.

72 files changed, 354 insertions, 192 deletions

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index f84cc0f4d..f5e674054 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -1180,14 +1180,16 @@ elm_ctxpopup_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_ctxpopup_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
@@ -1259,11 +1261,13 @@ _item_wrap_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UN
    item->wcb.org_func_cb((void *)item->wcb.org_data, item->wcb.cobj, EO_OBJ(item));
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_ctxpopup_item_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Item_Data *it)
 {
-   eo_do_super(obj, ELM_CTXPOPUP_ITEM_CLASS, eo_constructor());
+   obj = eo_do_super_ret(obj, ELM_CTXPOPUP_ITEM_CLASS, obj, eo_constructor());
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
+
+   return obj;
 }
 
 EOLIAN static Elm_Object_Item*
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 1ea2c01b9..7cb27800a 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -1613,15 +1613,17 @@ elm_fileselector_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+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());
    sd->obj = obj;
-   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),
          elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILE_CHOOSER));
+
+   return obj;
 }
 
 EAPI void
diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c
index daf193765..fb64c68de 100644
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -213,16 +213,18 @@ elm_fileselector_button_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+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());
    sd->obj = obj;
 
-   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),
          elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PUSH_BUTTON));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index 3983750aa..f091f9191 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -343,14 +343,16 @@ elm_fileselector_entry_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_fileselector_entry_eo_base_constructor(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EINA_DEPRECATED EAPI void
diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index 869580497..379c4af03 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -356,14 +356,16 @@ elm_hoversel_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_hoversel_eo_base_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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_GLASS_PANE));
+
+   return obj;
 }
 
 EOLIAN static void
@@ -458,11 +460,13 @@ _elm_hoversel_items_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd)
    return sd->items;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_hoversel_item_eo_base_constructor(Eo *obj, Elm_Hoversel_Item_Data *it)
 {
-   eo_do_super(obj, ELM_HOVERSEL_ITEM_CLASS, eo_constructor());
+   obj = eo_do_super_ret(obj, ELM_HOVERSEL_ITEM_CLASS, obj, eo_constructor());
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
+
+   return obj;
 }
 
 EOLIAN static Elm_Object_Item*
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 33fdb9fa9..52aad4dbc 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -660,11 +660,13 @@ _access_multibuttonentry_item_register(Evas_Object *obj,
    evas_object_propagate_events_set(VIEW(item), !is_access);
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_multibuttonentry_item_eo_base_constructor(Eo *eo_item, Elm_Multibuttonentry_Item_Data *item)
 {
-   eo_do_super(eo_item, ELM_MULTIBUTTONENTRY_ITEM_CLASS, eo_constructor());
+   eo_item = eo_do_super_ret(eo_item, ELM_MULTIBUTTONENTRY_ITEM_CLASS, eo_item, eo_constructor());
    item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
+
+   return eo_item;
 }
 
 static Elm_Object_Item *
@@ -1627,14 +1629,16 @@ elm_multibuttonentry_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_multibuttonentry_eo_base_constructor(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static Evas_Object*
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 3fe928fa2..42e02351e 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1164,11 +1164,13 @@ _access_prev_btn_info_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED)
    return strdup(E_("Back"));
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_naviframe_item_eo_base_constructor(Eo *eo_item, Elm_Naviframe_Item_Data *it)
 {
-   eo_do_super(eo_item, ELM_NAVIFRAME_ITEM_CLASS, eo_constructor());
+   eo_item = eo_do_super_ret(eo_item, ELM_NAVIFRAME_ITEM_CLASS, eo_item, eo_constructor());
    it->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
+
+   return eo_item;
 }
 
 static Elm_Object_Item *
@@ -1550,14 +1552,16 @@ elm_naviframe_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_naviframe_eo_base_constructor(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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_PAGE_TAB_LIST));
+
+   return obj;
 }
 
 EOLIAN static Elm_Object_Item*
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index a2f1a8e83..1818e1f29 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -704,14 +704,16 @@ elm_player_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_player_eo_base_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index d5d8bd025..a274591ae 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -785,11 +785,13 @@ _item_unfocused_cb(void *data,
    evas_object_smart_callback_call(WIDGET(it), SIG_ITEM_UNFOCUSED, EO_OBJ(it));
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_popup_item_eo_base_constructor(Eo *eo_it, Elm_Popup_Item_Data *it)
 {
-   eo_do_super(eo_it, ELM_POPUP_ITEM_CLASS, eo_constructor());
+   eo_it = eo_do_super_ret(eo_it, ELM_POPUP_ITEM_CLASS, eo_it, eo_constructor());
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
+
+   return eo_it;
 }
 
 static void
@@ -1503,14 +1505,16 @@ elm_popup_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_popup_eo_base_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c
index 3ca73c9db..f8df21fe7 100644
--- a/src/lib/elm_access.c
+++ b/src/lib/elm_access.c
@@ -1238,12 +1238,14 @@ _elm_access_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_access_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
    eo_do(obj,
          evas_obj_type_set(MY_CLASS_NAME_LEGACY));
+
+   return obj;
 }
 
 EAPI Evas_Object *
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 98ca1fe64..8b8be7f67 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -521,14 +521,16 @@ elm_actionslider_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_actionslider_eo_base_constructor(Eo *obj, Elm_Actionslider_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_app_client_view.c b/src/lib/elm_app_client_view.c
index 9f759bcff..2cc8c4f8b 100644
--- a/src/lib/elm_app_client_view.c
+++ b/src/lib/elm_app_client_view.c
@@ -308,11 +308,13 @@ _elm_app_client_view_eo_base_destructor(Eo *eo, Elm_App_Client_View_Data *data)
    eo_do_super(eo, MY_CLASS, eo_destructor());
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_app_client_view_eo_base_constructor(Eo *obj, Elm_App_Client_View_Data *_pd EINA_UNUSED)
 {
    eo_error_set(obj);
    ERR("Only custom constructor can be used with '%s' class", MY_CLASS_NAME);
+
+   return NULL;
 }
 
 #include "elm_app_client_view.eo.c"
diff --git a/src/lib/elm_app_server_view.c b/src/lib/elm_app_server_view.c
index a02de5f68..36694c477 100644
--- a/src/lib/elm_app_server_view.c
+++ b/src/lib/elm_app_server_view.c
@@ -370,11 +370,13 @@ _elm_app_server_view_eo_base_destructor(Eo *obj, Elm_App_Server_View_Data *data)
    eo_do_super(obj, MY_CLASS, eo_destructor());
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_app_server_view_eo_base_constructor(Eo *obj, Elm_App_Server_View_Data *_pd EINA_UNUSED)
 {
    eo_error_set(obj);
    ERR("Only custom constructor can be used with '%s' class", MY_CLASS_NAME);
+
+   return NULL;
 }
 
 #include "elm_app_server_view.eo.c"
diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c
index 94e5f360c..90e0119bb 100644
--- a/src/lib/elm_bg.c
+++ b/src/lib/elm_bg.c
@@ -117,13 +117,15 @@ elm_bg_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_bg_eo_base_constructor(Eo *obj, Elm_Bg_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
index 41d536bfa..42a6f33e2 100644
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -432,14 +432,16 @@ elm_box_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_box_eo_base_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index 54e4d7d60..1c81c7be4 100644
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -223,14 +223,16 @@ elm_bubble_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_bubble_eo_base_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 1bba57d14..7a2be46a7 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -323,14 +323,16 @@ elm_button_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_button_eo_base_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 681079067..0fc78f338 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -1177,16 +1177,18 @@ elm_calendar_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+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());
    sd->obj = obj;
 
-   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),
          elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_CALENDAR));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index 27f38d05a..be376a65e 100644
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -365,14 +365,16 @@ elm_check_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_check_eo_base_constructor(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_clipper.c b/src/lib/elm_clipper.c
index 16d7077fe..5b869e8d8 100644
--- a/src/lib/elm_clipper.c
+++ b/src/lib/elm_clipper.c
@@ -211,11 +211,13 @@ elm_clipper_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_clipper_eo_base_constructor(Eo *obj, Elm_Clipper_Data *sd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
    eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY));
+
+   return obj;
 }
 
 static void
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index 82b7f319b..30765b9e3 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -794,14 +794,16 @@ elm_clock_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_clock_eo_base_constructor(Eo *obj, Elm_Clock_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 static void
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 7ffbf68c0..3d99d63c1 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1454,10 +1454,10 @@ _elm_color_item_elm_widget_item_signal_emit(Eo *eo_it EINA_UNUSED, Elm_Color_Ite
    elm_object_signal_emit(VIEW(it), emission, source);
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_color_item_eo_base_constructor(Eo *eo_item, Elm_Color_Item_Data *item)
 {
-   eo_do_super(eo_item, ELM_COLOR_ITEM_CLASS, eo_constructor());
+   eo_item = eo_do_super_ret(eo_item, ELM_COLOR_ITEM_CLASS, eo_item, eo_constructor());
    item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
 
    Evas_Object *obj;
@@ -1493,6 +1493,8 @@ _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());
+
+   return eo_item;
 }
 
 EOLIAN static void
@@ -1972,14 +1974,16 @@ elm_colorselector_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_colorselector_eo_base_constructor(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index ce13f070e..af37a51d0 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -944,12 +944,12 @@ elm_conformant_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
 {
    Evas_Object *top;
 
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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),
@@ -968,6 +968,8 @@ _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
      (top, "indicator,prop,changed", _on_indicator_mode_changed, obj);
    evas_object_smart_callback_add
      (top, "rotation,changed", _on_rotation_changed, obj);
+
+   return obj;
 }
 
 static void
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index 74fb9f774..e12005b9d 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -888,14 +888,16 @@ elm_datetime_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_datetime_eo_base_constructor(Eo *obj, Elm_Datetime_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static const char*
diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index 1d834f827..1dbbd75ec 100644
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -287,11 +287,13 @@ _elm_dayselector_elm_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, co
    return EINA_TRUE;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_dayselector_item_eo_base_constructor(Eo *eo_item, Elm_Dayselector_Item_Data *item)
 {
-   eo_do_super(eo_item, ELM_DAYSELECTOR_ITEM_CLASS, eo_constructor());
+   eo_item = eo_do_super_ret(eo_item, ELM_DAYSELECTOR_ITEM_CLASS, eo_item, eo_constructor());
    item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
+
+   return eo_item;
 }
 
 EOLIAN static Evas_Object*
@@ -452,14 +454,16 @@ elm_dayselector_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_dayselector_eo_base_constructor(Eo *obj, Elm_Dayselector_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index d8598ade5..8433a88b9 100644
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -647,11 +647,13 @@ _access_on_highlight_cb(void *data)
    eo_do(WIDGET(it), elm_interface_scrollable_region_bring_in(x, y, w, h));
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_diskselector_item_eo_base_constructor(Eo *eo_it, Elm_Diskselector_Item_Data *it)
 {
-   eo_do_super(eo_it, ELM_DISKSELECTOR_ITEM_CLASS, eo_constructor());
+   eo_it = eo_do_super_ret(eo_it, ELM_DISKSELECTOR_ITEM_CLASS, eo_it, eo_constructor());
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
+
+   return eo_it;
 }
 
 static Elm_Diskselector_Item_Data *
@@ -1449,14 +1451,16 @@ elm_diskselector_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_diskselector_eo_base_constructor(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 23ce54590..5ab7fd1c7 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -3727,16 +3727,18 @@ _cb_deled(void *data EINA_UNUSED,
 
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_entry_eo_base_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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),
          eo_event_callback_add(EO_EV_CALLBACK_ADD, _cb_added, NULL),
          eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, NULL));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index 99f7458c5..8776a5d22 100644
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -1859,16 +1859,18 @@ elm_flip_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+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());
    sd->obj = obj;
 
-   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),
          elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PAGE_TAB_LIST));
+
+   return obj;
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index a9e874739..a74acf7b9 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -293,11 +293,13 @@ _elm_flipselector_item_eo_base_destructor(Eo *eo_item, Elm_Flipselector_Item_Dat
    eo_do_super(eo_item, ELM_FLIPSELECTOR_ITEM_CLASS, eo_destructor());
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_flipselector_item_eo_base_constructor(Eo *obj, Elm_Flipselector_Item_Data *it)
 {
-   eo_do_super(obj, ELM_FLIPSELECTOR_ITEM_CLASS, eo_constructor());
+   obj = eo_do_super_ret(obj, ELM_FLIPSELECTOR_ITEM_CLASS, obj, eo_constructor());
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
+
+   return obj;
 }
 
 static Elm_Object_Item *
@@ -564,15 +566,17 @@ elm_flipselector_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+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());
    sd->obj = obj;
-   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),
          elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index 7720656cc..04f7402c1 100644
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -199,14 +199,16 @@ elm_frame_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_frame_eo_base_constructor(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 696292cf5..af7cec941 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -3633,12 +3633,14 @@ _item_select(Elm_Gen_Item *it)
    evas_object_unref(obj);
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_gengrid_item_eo_base_constructor(Eo *eo_it, Elm_Gen_Item *it)
 {
-   eo_do_super(eo_it, ELM_GENGRID_ITEM_CLASS, eo_constructor());
+   eo_it = eo_do_super_ret(eo_it, ELM_GENGRID_ITEM_CLASS, eo_it, eo_constructor());
    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));
+
+   return eo_it;
 }
 
 static Elm_Gen_Item *
@@ -3819,16 +3821,18 @@ elm_gengrid_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+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());
    sd->obj = obj;
 
-   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),
          elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_TREE_TABLE));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 6d824cca3..45a3dfdcf 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -5587,16 +5587,18 @@ elm_genlist_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+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());
    sd->obj = obj;
 
-   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),
          elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST));
+
+   return obj;
 }
 
 static void
@@ -5883,13 +5885,15 @@ _elm_genlist_item_elm_widget_item_focus_get(Eo *eo_it, Elm_Gen_Item *it)
    return EINA_FALSE;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_genlist_item_eo_base_constructor(Eo *eo_it, Elm_Gen_Item *it)
 {
-   eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS, eo_constructor());
+   eo_it = eo_do_super_ret(eo_it, ELM_GENLIST_ITEM_CLASS, eo_it, eo_constructor());
 
    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));
+
+   return eo_it;
 }
 
 static Elm_Gen_Item *
diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c
index c126bbfc9..48f528553 100644
--- a/src/lib/elm_gesture_layer.c
+++ b/src/lib/elm_gesture_layer.c
@@ -3816,11 +3816,13 @@ elm_gesture_layer_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_gesture_layer_eo_base_constructor(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
    eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY));
+
+   return obj;
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index 0792cc99f..8799f0013 100644
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -305,12 +305,6 @@ elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Version version)
 }
 
 EOLIAN static void
-_elm_glview_eo_base_constructor(Eo *obj, Elm_Glview_Data *sd EINA_UNUSED)
-{
-   eo_do_super(obj, MY_CLASS, eo_constructor());
-}
-
-EOLIAN static void
 _elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd,
                                 Evas_GL_Context_Version version)
 {
diff --git a/src/lib/elm_glview.eo b/src/lib/elm_glview.eo
index d2a319d25..6ce08a191 100644
--- a/src/lib/elm_glview.eo
+++ b/src/lib/elm_glview.eo
@@ -209,7 +209,6 @@ class Elm.Glview (Elm.Widget)
    }
    implements {
       class.constructor;
-      Eo.Base.constructor;
       Evas.Object_Smart.add;
       Evas.Object_Smart.del;
       Evas.Object_Smart.resize;
diff --git a/src/lib/elm_grid.c b/src/lib/elm_grid.c
index 7c703519e..ba712f63e 100644
--- a/src/lib/elm_grid.c
+++ b/src/lib/elm_grid.c
@@ -165,13 +165,15 @@ elm_grid_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_grid_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 66b6f612e..e9431b28f 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -630,14 +630,16 @@ elm_hover_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_hover_eo_base_constructor(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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_GLASS_PANE));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c
index efbdc5d58..8ca0bde45 100644
--- a/src/lib/elm_icon.c
+++ b/src/lib/elm_icon.c
@@ -663,16 +663,18 @@ elm_icon_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+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());
    sd->obj = obj;
 
-   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),
          elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE));
+
+   return obj;
 }
 
 EAPI Eina_Bool
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index cd769a6a1..3926f40e0 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -938,14 +938,16 @@ elm_image_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_image_eo_base_constructor(Eo *obj, Elm_Image_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EAPI Eina_Bool
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 139a90369..3ac9a4626 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -435,11 +435,13 @@ _elm_index_item_eo_base_destructor(Eo *eo_item EINA_UNUSED, Elm_Index_Item_Data
    eo_do_super(eo_item, ELM_INDEX_ITEM_CLASS, eo_destructor());
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_index_item_eo_base_constructor(Eo *obj, Elm_Index_Item_Data *it)
 {
-   eo_do_super(obj, ELM_INDEX_ITEM_CLASS, eo_constructor());
+   obj = eo_do_super_ret(obj, ELM_INDEX_ITEM_CLASS, obj, eo_constructor());
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
+
+   return obj;
 }
 
 static Elm_Object_Item *
@@ -1106,14 +1108,16 @@ elm_index_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_index_eo_base_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index acb302138..b63ae8303 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -212,13 +212,15 @@ _elm_pan_add(Evas *evas)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_pan_eo_base_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_PAN_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 static void
@@ -4432,12 +4434,6 @@ _elm_interface_scrollable_evas_object_smart_del(Eo *obj, Elm_Scrollable_Smart_In
 }
 
 EOLIAN static void
-_elm_interface_scrollable_eo_base_constructor(Eo *obj, Elm_Scrollable_Smart_Interface_Data *class_data EINA_UNUSED)
-{
-   eo_do_super(obj, MY_SCROLLABLE_INTERFACE, eo_constructor());
-}
-
-EOLIAN static void
 _elm_interface_scrollable_class_constructor(Eo_Class *klass)
 {
    evas_smart_legacy_type_register(MY_SCROLLABLE_INTERFACE_NAME_LEGACY, klass);
diff --git a/src/lib/elm_interface_scrollable.eo b/src/lib/elm_interface_scrollable.eo
index 3570a836f..35d9631de 100644
--- a/src/lib/elm_interface_scrollable.eo
+++ b/src/lib/elm_interface_scrollable.eo
@@ -813,7 +813,6 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
       }
    }
    implements {
-      Eo.Base.constructor;
       class.constructor;
       Evas.Object_Smart.add;
       Evas.Object_Smart.del;
diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index f6abc2cc9..760d988cc 100644
--- a/src/lib/elm_inwin.c
+++ b/src/lib/elm_inwin.c
@@ -101,7 +101,7 @@ elm_win_inwin_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
    Evas_Object *parent = NULL;
@@ -111,13 +111,15 @@ _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
    if (parent && !eo_isa(parent, ELM_WIN_CLASS))
      {
         eo_error_set(obj);  /* *has* to have a parent window */
-        return;
+        return NULL;
      }
 
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 9a2b7070b..4ef320a39 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -408,14 +408,16 @@ elm_label_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_label_eo_base_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index 4cc30c3d3..991112b1f 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -1707,15 +1707,17 @@ elm_layout_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_layout_eo_base_constructor(Eo *obj, Elm_Layout_Smart_Data *sd)
 {
    sd->obj = obj;
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void _elm_layout_class_constructor(Eo_Class *klass)
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index d7db7da9c..54a86048d 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -2315,12 +2315,14 @@ _access_widget_item_register(Elm_List_Item_Data *it, Eina_Bool is_access)
      }
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_list_item_eo_base_constructor(Eo *eo_it, Elm_List_Item_Data *it)
 {
-   eo_do_super(eo_it, ELM_LIST_ITEM_CLASS, eo_constructor());
+   eo_it = eo_do_super_ret(eo_it, ELM_LIST_ITEM_CLASS, eo_it, eo_constructor());
    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));
+
+   return eo_it;
 }
 
 static Elm_List_Item_Data *
@@ -2586,14 +2588,16 @@ elm_list_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_list_eo_base_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 8e47a9289..90060ce86 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -4193,16 +4193,18 @@ elm_map_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+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());
    sd->obj = obj;
 
-   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),
          elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_IMAGE_MAP));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c
index cf2f7fcbb..12dfb7968 100644
--- a/src/lib/elm_mapbuf.c
+++ b/src/lib/elm_mapbuf.c
@@ -290,13 +290,15 @@ elm_mapbuf_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_mapbuf_eo_base_constructor(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 static void
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index bdee1472b..2f16c54e6 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -767,12 +767,12 @@ elm_menu_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd)
 {
    Eo *parent = NULL;
 
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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),
@@ -790,6 +790,8 @@ _elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd)
                                   _block_menu, sd);
    evas_object_smart_callback_add(obj, "elm,action,unblock_menu",
                                   _unblock_menu, sd);
+
+   return obj;
 }
 
 EOLIAN static void
@@ -982,11 +984,13 @@ _elm_menu_item_eo_base_destructor(Eo *eo_item, Elm_Menu_Item_Data *item)
    eo_do_super(eo_item, ELM_MENU_ITEM_CLASS, eo_destructor());
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_menu_item_eo_base_constructor(Eo *eo_item, Elm_Menu_Item_Data *item)
 {
-   eo_do_super(eo_item, ELM_MENU_ITEM_CLASS, eo_constructor());
+   eo_item = eo_do_super_ret(eo_item, ELM_MENU_ITEM_CLASS, eo_item, eo_constructor());
    item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
+
+   return eo_item;
 }
 
 EOLIAN static Elm_Object_Item*
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 4c44fb6b5..53305bdea 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -480,13 +480,15 @@ elm_notify_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_notify_eo_base_constructor(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EAPI void
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 4847f2efd..94d767a4f 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -1168,14 +1168,16 @@ elm_panel_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_panel_eo_base_constructor(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index 0f8d2a422..716f233ba 100644
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -323,14 +323,16 @@ elm_panes_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_panes_eo_base_constructor(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EINA_DEPRECATED EAPI void
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index 478b5252c..2d1f2b8ae 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -309,14 +309,16 @@ elm_photo_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_photo_eo_base_constructor(Eo *obj, Elm_Photo_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index c4ae9b640..7d2723049 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -1488,14 +1488,16 @@ elm_photocam_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_photocam_eo_base_constructor(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 static void
diff --git a/src/lib/elm_plug.c b/src/lib/elm_plug.c
index 68bcd8b04..d7f4448ef 100644
--- a/src/lib/elm_plug.c
+++ b/src/lib/elm_plug.c
@@ -140,14 +140,16 @@ elm_plug_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_plug_eo_base_constructor(Eo *obj, void *sd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static Evas_Object*
diff --git a/src/lib/elm_prefs.c b/src/lib/elm_prefs.c
index 4cf5d15b6..b84a456ca 100644
--- a/src/lib/elm_prefs.c
+++ b/src/lib/elm_prefs.c
@@ -512,14 +512,16 @@ elm_prefs_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_prefs_eo_base_constructor(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 static Eina_Bool
diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c
index 1988fda43..a034dcd5c 100644
--- a/src/lib/elm_progressbar.c
+++ b/src/lib/elm_progressbar.c
@@ -328,14 +328,16 @@ elm_progressbar_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_progressbar_eo_base_constructor(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index 6efeb01e5..efa57cbde 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -326,14 +326,16 @@ elm_radio_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_radio_eo_base_constructor(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_route.c b/src/lib/elm_route.c
index 605eed84e..716c5724d 100644
--- a/src/lib/elm_route.c
+++ b/src/lib/elm_route.c
@@ -182,12 +182,14 @@ elm_route_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_route_eo_base_constructor(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
    eo_do(obj,
          evas_obj_type_set(MY_CLASS_NAME_LEGACY));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index a2cd799ff..2e174c9c7 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -870,14 +870,16 @@ elm_scroller_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_scroller_eo_base_constructor(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 /* deprecated */
diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index 3d0810d8e..4f5d4e2e4 100644
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -582,10 +582,10 @@ _item_new(Evas_Object *obj,
    return eo_item;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_segment_control_item_eo_base_constructor(Eo *obj, Elm_Segment_Control_Item_Data *it)
 {
-   eo_do_super(obj, ELM_SEGMENT_CONTROL_ITEM_CLASS, eo_constructor());
+   obj = eo_do_super_ret(obj, ELM_SEGMENT_CONTROL_ITEM_CLASS, obj, eo_constructor());
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
 
    Evas_Object *parent;
@@ -600,6 +600,8 @@ _elm_segment_control_item_eo_base_constructor(Eo *obj, Elm_Segment_Control_Item_
    elm_widget_theme_object_set
      (parent, VIEW(it), "segment_control", "item", elm_object_style_get(parent));
    edje_object_mirrored_set(VIEW(it), elm_widget_mirrored_get(WIDGET(it)));
+
+   return obj;
 }
 
 EOLIAN static void
@@ -695,16 +697,18 @@ elm_segment_control_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_segment_control_eo_base_constructor(Eo *obj, Elm_Segment_Control_Data *sd)
 {
+   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
    sd->obj = obj;
 
-   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),
          elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST));
+
+   return obj;
 }
 
 EOLIAN static Elm_Object_Item*
diff --git a/src/lib/elm_separator.c b/src/lib/elm_separator.c
index 55d9a9b2a..a1d98cb32 100644
--- a/src/lib/elm_separator.c
+++ b/src/lib/elm_separator.c
@@ -66,13 +66,15 @@ elm_separator_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_separator_eo_base_constructor(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 361b807b7..f9113c1be 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -925,14 +925,16 @@ elm_slider_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_slider_eo_base_constructor(Eo *obj, Elm_Slider_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 08fd69901..7c836639e 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -383,21 +383,25 @@ elm_slideshow_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_slideshow_eo_base_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_slideshow_item_eo_base_constructor(Eo *obj, Elm_Slideshow_Item_Data *it)
 {
-   eo_do_super(obj, ELM_SLIDESHOW_ITEM_CLASS, eo_constructor());
+   obj = eo_do_super_ret(obj, ELM_SLIDESHOW_ITEM_CLASS, obj, eo_constructor());
    it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
+
+   return obj;
 }
 
 EOLIAN static Elm_Object_Item*
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 2262e7770..9624380a6 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -1193,14 +1193,16 @@ elm_spinner_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_spinner_eo_base_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_table.c b/src/lib/elm_table.c
index 33e69abe6..6a31cc801 100644
--- a/src/lib/elm_table.c
+++ b/src/lib/elm_table.c
@@ -218,13 +218,15 @@ elm_table_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_table_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index d041b7d5d..cdcfeed93 100644
--- a/src/lib/elm_thumb.c
+++ b/src/lib/elm_thumb.c
@@ -590,16 +590,18 @@ elm_thumb_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_thumb_eo_base_constructor(Eo *obj, Elm_Thumb_Data *sd)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
 
    sd->obj = obj;
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 0087a0a43..609878d23 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -2300,12 +2300,14 @@ _access_widget_item_register(Elm_Toolbar_Item_Data *it)
    _elm_access_activate_callback_set(ai, _access_activate_cb, NULL);
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_toolbar_item_eo_base_constructor(Eo *eo_it, Elm_Toolbar_Item_Data *it)
 {
-   eo_do_super(eo_it, ELM_TOOLBAR_ITEM_CLASS, eo_constructor());
+   eo_it = eo_do_super_ret(eo_it, ELM_TOOLBAR_ITEM_CLASS, eo_it, eo_constructor());
    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));
+
+   return eo_it;
 }
 
 static Elm_Toolbar_Item_Data *
@@ -2921,14 +2923,16 @@ elm_toolbar_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_toolbar_eo_base_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index 56f8ad075..09bb4ce8a 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -274,14 +274,16 @@ elm_video_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_video_eo_base_constructor(Eo *obj, Elm_Video_Data *_pd EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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));
+
+   return obj;
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c
index 4106693ff..40a00a6ba 100644
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -722,15 +722,17 @@ elm_web_add(Evas_Object *parent)
    return obj;
 }
 
-EOLIAN static void
+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());
    sd->obj = obj;
-   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(_elm_web_smart_callbacks),
          elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_HTML_CONTAINER));
+
+   return obj;
 }
 
 EOLIAN static Evas_Object*
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index b9a6a0ec0..3b1cda01f 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -4241,7 +4241,7 @@ _eo_del_cb(void *data EINA_UNUSED, Eo *eo_item, const Eo_Event_Description *desc
  * @see elm_widget_item_del() to release memory.
  * @ingroup Widget
  */
-EOLIAN static void
+EOLIAN static Eo *
 _elm_widget_item_eo_base_constructor(Eo *eo_item, Elm_Widget_Item_Data *item)
 {
    Evas_Object *widget;
@@ -4250,16 +4250,18 @@ _elm_widget_item_eo_base_constructor(Eo *eo_item, Elm_Widget_Item_Data *item)
    if (!_elm_widget_is(widget))
      {
         eo_error_set(eo_item);
-        return;
+        return NULL;
      }
 
-   eo_do_super(eo_item, ELM_WIDGET_ITEM_CLASS, eo_constructor());
+   eo_item = eo_do_super_ret(eo_item, ELM_WIDGET_ITEM_CLASS, eo_item, eo_constructor());
 
    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));
+
+   return eo_item;
 }
 
 EOLIAN static void
@@ -5484,13 +5486,13 @@ elm_widget_tree_dot_dump(const Evas_Object *top,
 #endif
 }
 
-EOLIAN static void
+EOLIAN static Eo *
 _elm_widget_eo_base_constructor(Eo *obj, Elm_Widget_Smart_Data *sd)
 {
    Eo *parent = NULL;
 
    sd->on_create = EINA_TRUE;
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   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),
@@ -5499,6 +5501,8 @@ _elm_widget_eo_base_constructor(Eo *obj, Elm_Widget_Smart_Data *sd)
    sd->on_create = EINA_FALSE;
 
    sd->role = ELM_ATSPI_ROLE_UNKNOWN;
+
+   return obj;
 }
 
 EOLIAN static void
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 2c8ace3a5..1bd208d33 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -3741,12 +3741,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
          eo_event_callback_add(EO_EV_CALLBACK_DEL, _cb_deled, sd));
 }
 
-EOLIAN static void
-_elm_win_eo_base_constructor(Eo *obj EINA_UNUSED, Elm_Win_Data *_pd EINA_UNUSED)
-{
-   /* Do nothing. */
-}
-
 EOLIAN static Eo *
 _elm_win_eo_base_finalize(Eo *obj, Elm_Win_Data *_pd)
 {
@@ -3755,6 +3749,16 @@ _elm_win_eo_base_finalize(Eo *obj, Elm_Win_Data *_pd)
    return obj;
 }
 
+EOLIAN static Eo *
+_elm_win_eo_base_constructor(Eo *obj, Elm_Win_Data *_pd EINA_UNUSED)
+{
+   /* Do nothing. */
+   /* XXX: We are calling the constructor chain from the finalizer. It's
+    * really bad and hacky. Needs fixing. */
+
+   return obj;
+}
+
 EOLIAN static void
 _elm_win_fake_canvas_set(Eo *obj EINA_UNUSED, Elm_Win_Data *pd, Ecore_Evas *oee)
 {