Eo: Partial implementation to remove eo_dodevs/felipealmeida/eo_optimisations

215 files changed, 3413 insertions, 2783 deletions

diff --git a/doc/previews/preview_text_filter.c b/doc/previews/preview_text_filter.c
index fa3b26e461..74f0ecdee7 100644
--- a/doc/previews/preview_text_filter.c
+++ b/doc/previews/preview_text_filter.c
@@ -108,7 +108,7 @@ main(int argc, char **argv)
    evas_object_color_set(o, 255, 255, 255, 255);
    evas_object_show(o);
 
-   eo_do(o, efl_gfx_filter_program_set(filter, wpd.file));
+   eo_do(o, efl_gfx_filter_program_set(o, filter, wpd.file));
 
    ecore_evas_manual_render(wpd.ee);
    evas_object_geometry_get(o, NULL, NULL, &w, &h);
diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c
index 0a57e285fa..a4482726c3 100644
--- a/src/benchmarks/eo/class_simple.c
+++ b/src/benchmarks/eo/class_simple.c
@@ -15,7 +15,7 @@ _other_call(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, Eo *other, int ti
 {
    if (times > 0)
      {
-        eo_do(other, simple_other_call(obj, times-1));
+        simple_other_call(other, obj, times-1);
      }
 }
 
diff --git a/src/benchmarks/eo/eo_bench_callbacks.c b/src/benchmarks/eo/eo_bench_callbacks.c
index fde611eea1..eac192572b 100644
--- a/src/benchmarks/eo/eo_bench_callbacks.c
+++ b/src/benchmarks/eo/eo_bench_callbacks.c
@@ -17,11 +17,12 @@ static void
 bench_eo_callbacks_add(int request)
 {
    int i;
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj;
+   eo_add(obj, SIMPLE_CLASS, NULL);
 
    for (i = 0 ; i < request ; i++)
      {
-        eo_do(obj, eo_event_callback_priority_add(SIMPLE_FOO, (short) i, _cb, NULL));
+        eo_event_callback_priority_add(obj, SIMPLE_FOO, (short) i, _cb, NULL);
      }
 
    eo_unref(obj);
@@ -50,14 +51,15 @@ bench_eo_callbacks_call(int request)
 
    const int len = EINA_C_ARRAY_LENGTH(distribution);
    int i, j;
-   Eo *obj[len] = { 0 };
+   Eo *obj[len];
    for (i = 0 ; i < len ; i++)
      {
-        obj[i] = eo_add(SIMPLE_CLASS, NULL);
+       ///obj[i];
+        eo_add(obj[i], SIMPLE_CLASS, NULL);
 
         for (j = 0 ; j < i ; j++)
           {
-             eo_do(obj[i], eo_event_callback_priority_add(SIMPLE_FOO, (short) j, _cb, NULL));
+             eo_event_callback_priority_add(obj[i], SIMPLE_FOO, (short) j, _cb, NULL);
           }
      }
 
@@ -66,7 +68,7 @@ bench_eo_callbacks_call(int request)
         for (j = 0 ; j < (int) (distribution[i] * request) ; j++)
           {
              /* Miss finding the callbacks on purpose, so we measure worst case scenario. */
-             eo_do(obj[i], eo_event_callback_call(SIMPLE_BAR, NULL));
+             eo_event_callback_call(obj[i], SIMPLE_BAR, NULL);
           }
      }
 
diff --git a/src/benchmarks/eo/eo_bench_eo_add.c b/src/benchmarks/eo/eo_bench_eo_add.c
index 462f3b9c56..6f25ce9efd 100644
--- a/src/benchmarks/eo/eo_bench_eo_add.c
+++ b/src/benchmarks/eo/eo_bench_eo_add.c
@@ -12,7 +12,7 @@ bench_eo_add_linear(int request)
    int i;
    Eo **objs = calloc(request, sizeof(Eo *));
    for (i = 0 ; i < request ; i++)
-      objs[i] = eo_add(SIMPLE_CLASS, NULL);
+      eo_add(objs[i], SIMPLE_CLASS, NULL);
 
    for (i = 0 ; i < request ; i++)
       eo_unref(objs[i]);
@@ -25,13 +25,13 @@ bench_eo_add_jump_by_2(int request)
    int i;
    Eo **objs = calloc(request, sizeof(Eo *));
    for (i = 0 ; i < request ; i++)
-      objs[i] = eo_add(SIMPLE_CLASS, NULL);
+      eo_add(objs[i], SIMPLE_CLASS, NULL);
 
    for (i = 0 ; i < request ; i += 2)
       eo_unref(objs[i]);
 
    for (i = 0 ; i < request ; i += 2)
-      objs[i] = eo_add(SIMPLE_CLASS, NULL);
+      eo_add(objs[i], SIMPLE_CLASS, NULL);
 
    for (i = 0 ; i < request ; i++)
       eo_unref(objs[i]);
diff --git a/src/benchmarks/eo/eo_bench_eo_do.c b/src/benchmarks/eo/eo_bench_eo_do.c
index 2bcdc4246e..adb6851f32 100644
--- a/src/benchmarks/eo/eo_bench_eo_do.c
+++ b/src/benchmarks/eo/eo_bench_eo_do.c
@@ -10,10 +10,11 @@ static void
 bench_eo_do_simple(int request)
 {
    int i;
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj;
+   eo_add(obj, SIMPLE_CLASS, NULL);
    for (i = 0 ; i < request ; i++)
      {
-        eo_do(obj, simple_a_set(i));
+        simple_a_set(obj, i);
      }
 
    eo_unref(obj);
@@ -23,12 +24,14 @@ static void
 bench_eo_do_two_objs(int request)
 {
    int i;
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
-   Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj;
+   eo_add(obj, SIMPLE_CLASS, NULL);
+   Eo *obj2;
+   eo_add(obj2, SIMPLE_CLASS, NULL);
    for (i = 0 ; i < request ; i++)
      {
-        eo_do(obj, simple_a_set(i));
-        eo_do(obj2, simple_a_set(i));
+        simple_a_set(obj, i);
+        simple_a_set(obj2, i);
      }
 
    eo_unref(obj);
@@ -39,11 +42,13 @@ static void
 bench_eo_do_two_objs_growing_stack(int request)
 {
    int i;
-   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
-   Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
+   Eo *obj;
+   eo_add(obj, SIMPLE_CLASS, NULL);
+   Eo *obj2;
+   eo_add(obj2, SIMPLE_CLASS, NULL);
    for (i = 0 ; i < request ; i++)
      {
-        eo_do(obj, simple_other_call(obj2, 20));
+        simple_other_call(obj, obj2, 20);
      }
 
    eo_unref(obj);
@@ -55,7 +60,7 @@ static const Eo_Class *cur_klass;
 static void
 _a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
 {
-   eo_do_super(obj, cur_klass, simple_a_set(a));
+   eo_super_simple_a_set(cur_klass, obj, a);
 }
 
 static Eo_Op_Description op_desc[] = {
@@ -78,10 +83,11 @@ bench_eo_do_super(int request)
    cur_klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL);
 
    int i;
-   Eo *obj = eo_add(cur_klass, NULL);
+   Eo *obj;
+   eo_add(obj, cur_klass, NULL);
    for (i = 0 ; i < request ; i++)
      {
-        eo_do(obj, simple_a_set(i));
+        simple_a_set(obj, i);
      }
 
    eo_unref(obj);
diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index 2e4f545391..3232ebb8c7 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -98,7 +98,23 @@ eo_fundef_generate(const Eolian_Class *class, const Eolian_Function *func, Eolia
         eina_strbuf_append_char(str_func, '\n');
         eina_strbuf_free(dbuf);
      }
-   eina_strbuf_append_printf(str_func, "EOAPI @#rettype %s(@#full_params);\n", func_env.lower_eo_func);
+   Eina_Bool has_params = EINA_FALSE;
+
+   itr = eolian_property_keys_get(func, ftype);
+   has_params |= (eina_iterator_next(itr, &data));
+   eina_iterator_free(itr);
+
+   if (!has_params && !var_as_ret)
+     {
+        itr = is_prop ? eolian_property_values_get(func, ftype) : eolian_function_parameters_get(func);
+        has_params |= (eina_iterator_next(itr, &data));
+        eina_iterator_free(itr);
+     }
+
+   eina_strbuf_append_printf(str_func, "EOAPI @#rettype %s(Eo const* ___object%s@#full_params);\n", func_env.lower_eo_func
+                             , has_params?", ":"");
+   eina_strbuf_append_printf(str_func, "EOAPI @#rettype eo_super_%s(Eo const* ___klass, Eo const* ___object%s@#full_params);\n", func_env.lower_eo_func
+                             , has_params?", ":"");
 
    if (scope == EOLIAN_SCOPE_PROTECTED)
       eina_strbuf_append_printf(str_func, "#endif\n");
@@ -518,13 +534,13 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
           }
         Eina_Bool ret_is_void = (!rettype || !strcmp(rettype, "void"));
         _class_func_env_create(class, eolian_function_name_get(funcid), ftype, &func_env);
-        eina_strbuf_append_printf(eo_func_decl,
-              "EOAPI EO_%sFUNC_BODY%s(%s",
-              ret_is_void?"VOID_":"", has_params?"V":"",
-              func_env.lower_eo_func);
-        if (!ret_is_void)
+        /* eina_strbuf_append_printf(eo_func_decl, */
+        /*       "EOAPI EO_%sFUNC_BODY%s(%s", */
+        /*       ret_is_void?"VOID_":"", has_params?"V":"", */
+        /*       func_env.lower_eo_func); */
+       const char *val_str = NULL; 
+       if (!ret_is_void)
           {
-             const char *val_str = NULL;
              if (default_ret_val)
                {
                   Eolian_Value val = eolian_expression_eval
@@ -532,25 +548,109 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
                   if (val.type)
                     val_str = eolian_expression_value_to_literal(&val);
                }
-             eina_strbuf_append_printf(eo_func_decl, ", %s, %s",
-                   rettype, val_str?val_str:"0");
-             if (val_str && eolian_expression_type_get(default_ret_val) == EOLIAN_EXPR_NAME)
-               {
-                  Eina_Stringshare *string = eolian_expression_serialize(default_ret_val);
-                  eina_strbuf_append_printf(eo_func_decl, " /* %s */", string);
-                  eina_stringshare_del(string);
-               }
-          }
-        if (has_params)
-          {
-             eina_strbuf_replace_all(full_params, " EINA_UNUSED", "");
-             eina_strbuf_append_printf(eo_func_decl, ", EO_FUNC_CALL(%s)%s",
-                   eina_strbuf_string_get(params),
-                   eina_strbuf_string_get(full_params));
+
+             /* eina_strbuf_append_printf(eo_func_decl, ", %s, %s", */
+             /*       rettype, val_str?val_str:"0"); */
+             /* if (val_str && eolian_expression_type_get(default_ret_val) == EOLIAN_EXPR_NAME) */
+             /*   { */
+             /*      Eina_Stringshare *string = eolian_expression_serialize(default_ret_val); */
+             /*      eina_strbuf_append_printf(eo_func_decl, " /\* %s *\/", string); */
+             /*      eina_stringshare_del(string); */
+             /*   } */
           }
-        eina_strbuf_append_printf(eo_func_decl, ");");
+        /* if (has_params) */
+        /*   { */
+        /*      eina_strbuf_replace_all(full_params, " EINA_UNUSED", ""); */
+        /*      eina_strbuf_append_printf(eo_func_decl, ", EO_FUNC_CALL(%s)%s", */
+        /*            eina_strbuf_string_get(params), */
+        /*            eina_strbuf_string_get(full_params)); */
+        /*   } */
+        /* eina_strbuf_append_printf(eo_func_decl, ");"); */
+
+        eina_strbuf_append_printf(eo_func_decl,
+               "EOAPI %s %s(Eo const* _object%s);\n", ret_is_void?"void":rettype, func_env.lower_eo_func,
+               eina_strbuf_string_get(full_params));
+
+        eina_strbuf_append_printf(eo_func_decl,
+               "static %s _eo_impl_%s(_Eo_Class const* ___klass, Eo const* ___oid, _Eo_Object const* ___object%s)\n{\n"
+                                  , ret_is_void?"void":rettype, func_env.lower_eo_func,
+                                  eina_strbuf_string_get(full_params));
+        eina_strbuf_append_printf(eo_func_decl,
+                                  "   typedef %s (*_Eo_func)(Eo*, void *obj_data%s);\n"
+                                  "   static Eo_Op ___op = EO_NOOP;\n"
+                                  "   fprintf(stderr, \"%%s %%s:%%d\\n\", __func__, __FILE__, __LINE__); fflush(stderr);\n"
+                                  "   if (EINA_UNLIKELY(___op == EO_NOOP))\n"
+                                  "     {\n"
+                                  "        fprintf(stderr, \"%%s %%s:%%d\\n\", __func__, __FILE__, __LINE__); fflush(stderr);\n"
+                                  "        ___op = _eo_api_op_id_get(EO_FUNC_COMMON_OP_FUNC(%s));\n"
+                                  "        fprintf(stderr, \"%%s %%s:%%d\\n\", __func__, __FILE__, __LINE__); fflush(stderr);\n"
+                                  "        if (___op == EO_NOOP) return %s;\n"
+                                  "     }\n"
+                                  "   fprintf(stderr, \"%%s %%s:%%d\\n\", __func__, __FILE__, __LINE__); fflush(stderr);\n"
+                                  "   const op_type_funcs *___func = _dich_func_get(___klass, ___op);\n"
+                                  "   fprintf(stderr, \"%%s %%s:%%d\\n\", __func__, __FILE__, __LINE__); fflush(stderr);\n"
+                                  "   fprintf(stderr, \"___func %%p\\n\", ___func); fflush(stderr);\n"
+                                  "   //assert(!!___func);\n"
+                                  "   fprintf(stderr, \"___func->func %%p\\n\", ___func->func);fflush(stderr);\n"
+                                  "   fprintf(stderr, \"___func->src %%p\\n\", ___func->src);fflush(stderr);\n"
+                                  "   _Eo_func ___func_ = (_Eo_func) ___func->func;\n"
+                                  "   void* ___data = _eo_data_scope_get(___object, ___func->src);\n"
+                                  "   %s%s\n"
+                                  "   %s ___func_((Eo*)___oid, ___data%s%s);\n"
+                                  "   %s\n}\n"
+                                  , ret_is_void?"void":rettype
+                                  /* , func_env.lower_eo_func */
+                                  , eina_strbuf_string_get(full_params)
+                                  , func_env.lower_eo_func
+                                  , ret_is_void?"":val_str?val_str:"0"
+                                  , ret_is_void?"":rettype
+                                  , ret_is_void?"":" _ret;"
+                                  /* , func_env.lower_eo_func */
+                                  /* , ret_is_void?"":val_str?val_str:"0" */
+                                  , ret_is_void?"":"_ret = "
+                                  , has_params?", ":""
+                                  , eina_strbuf_string_get(params)
+                                  , ret_is_void?"":"return _ret;"
+                                  );
+
+        eina_strbuf_append_printf(eo_func_decl,
+               "EOAPI %s %s(Eo const* ___object%s)\n{\n", ret_is_void?"void":rettype, func_env.lower_eo_func,
+               eina_strbuf_string_get(full_params));
+        eina_strbuf_append_printf(eo_func_decl,
+                                  "   fprintf(stderr, \"%%s %%s:%%d\\n\", __func__, __FILE__, __LINE__); fflush(stderr);\n"
+                                  "   _Eo_Object* ___obj = (_Eo_Object*)_eo_obj_pointer_get((Eo_Id)___object);\n"
+                                  "   if(___obj) {\n"
+                                  "     fprintf(stderr, \"%%s %%s:%%d\\n\", __func__, __FILE__, __LINE__); fflush(stderr);\n"
+                                  "     return _eo_impl_%s(___obj->klass, ___object, ___obj%s%s);\n"
+                                  "   }\n"
+                                  "}\n"
+                                  , func_env.lower_eo_func
+                                  , has_params?", ":""
+                                  , eina_strbuf_string_get(params)
+                                  );
+
+        eina_strbuf_append_printf(eo_func_decl,
+               "EOAPI %s eo_super_%s(Eo_Class const* ___klass, Eo const* ___object%s)\n{\n"
+                                  , ret_is_void?"void":rettype, func_env.lower_eo_func
+                                  , eina_strbuf_string_get(full_params));
+        eina_strbuf_append_printf(eo_func_decl,
+                                  "   fprintf(stderr, \"%%s %%s:%%d\\n\", __func__, __FILE__, __LINE__); fflush(stderr);\n"
+                                  "   _Eo_Object* ___obj = (_Eo_Object*)_eo_obj_pointer_get((Eo_Id)___object);\n"
+                                  "   if(___obj) {\n"
+                                  "      fprintf(stderr, \"%%s %%s:%%d\\n\", __func__, __FILE__, __LINE__); fflush(stderr);\n"
+                                  "      _Eo_Class* ___kls = (_Eo_Class*)_eo_class_pointer_get((Eo_Id)___klass);\n"
+                                  "      fprintf(stderr, \"%%s %%s:%%d\\n\", __func__, __FILE__, __LINE__); fflush(stderr);\n"
+                                  "      if(___kls)\n"
+                                  "        return _eo_impl_%s(___kls->parent, ___object, ___obj%s%s);\n"
+                                  "   }\n"
+                                  "}\n"
+                                  , func_env.lower_eo_func
+                                  , has_params?", ":""
+                                  , eina_strbuf_string_get(params)
+                                  );
+        
         eina_strbuf_append_printf(fbody, "%s\n", eina_strbuf_string_get(eo_func_decl));
-        eina_strbuf_free(eo_func_decl);
+        /* eina_strbuf_free(eo_func_decl); */
      }
 
    if (need_implementation)
diff --git a/src/bin/eolian/impl_generator.c b/src/bin/eolian/impl_generator.c
index 4103a2110d..c4f74f1ff6 100644
--- a/src/bin/eolian/impl_generator.c
+++ b/src/bin/eolian/impl_generator.c
@@ -172,9 +172,9 @@ _prototype_generate(const Eolian_Function *foo, Eolian_Function_Type ftype, Eina
                {
                   eina_strbuf_append_printf
                   (super_invok,
-                   "   eo_do_super(obj, %s_%s, %s_%s(%s));\n",
-                   class_env.upper_eo_prefix, class_env.upper_classtype,
+                   "   eo_super_%s_%s(%s_%s, obj, %s);\n",
                    impl_env.lower_eo_prefix, eolian_function_name_get(foo),
+                   class_env.upper_eo_prefix, class_env.upper_classtype,
                    eina_strbuf_string_get(short_params));
                }
           }
diff --git a/src/bin/eolian/legacy_generator.c b/src/bin/eolian/legacy_generator.c
index 18b4506ab2..d05122e546 100644
--- a/src/bin/eolian/legacy_generator.c
+++ b/src/bin/eolian/legacy_generator.c
@@ -24,7 +24,7 @@ EAPI @#ret_type\n\
 @#eapi_func(@#full_params)\n\
 {\n\
    @#ret_type ret;\n\
-   eo_do(@#eo_obj, ret = @#eo_func(@#eo_params));\n\
+   eo_do(@#eo_obj, ret = @#eo_func(@#eo_obj%s@#eo_params));\n\
    return ret;\n\
 }\n\
 ";
@@ -34,7 +34,7 @@ tmpl_eapi_body_void[] ="\
 EAPI void\n\
 @#eapi_func(@#full_params)\n\
 {\n\
-   eo_do(@#eo_obj, @#eo_func(@#eo_params));\n\
+   eo_do(@#eo_obj, @#eo_func(@#eo_obj%s@#eo_params));\n\
 }\n\
 ";
 
@@ -229,10 +229,23 @@ _eapi_func_generate(const Eolian_Class *class, const Eolian_Function *funcid, Eo
 
    if (!rettype && rettypet) rettype = eolian_type_c_type_get(rettypet);
 
+   Eina_Bool has_params = EINA_FALSE;
+
+   itr = eolian_property_keys_get(funcid, ftype);
+   has_params |= (eina_iterator_next(itr, &data));
+   eina_iterator_free(itr);
+
+   if (!has_params && !var_as_ret)
+     {
+        itr = is_prop ? eolian_property_values_get(funcid, ftype) : eolian_function_parameters_get(funcid);
+        has_params |= (eina_iterator_next(itr, &data));
+        eina_iterator_free(itr);
+     }
+
    if (rettype && (!ret_is_void))
-     eina_strbuf_append(fbody, tmpl_eapi_body);
+     eina_strbuf_append_printf(fbody, tmpl_eapi_body, has_params?", ":"");
    else
-     eina_strbuf_append(fbody, tmpl_eapi_body_void);
+     eina_strbuf_append_printf(fbody, tmpl_eapi_body_void, has_params?", ":"");
 
    if (!eolian_function_is_class(funcid))
      {
diff --git a/src/bindings/eo_cxx/eo_inherit.hh b/src/bindings/eo_cxx/eo_inherit.hh
index 3138d1e9a9..7bab9db0b6 100644
--- a/src/bindings/eo_cxx/eo_inherit.hh
+++ b/src/bindings/eo_cxx/eo_inherit.hh
@@ -78,7 +78,7 @@ struct inherit
    inherit(efl::eo::parent_type _p, Args&& ... args)
    {
       _eo_cls = detail::create_class<D, E...> (eina::make_index_sequence<sizeof...(E)>());
-      _eo_raw = eo_add_ref(_eo_cls, _p._eo_raw, detail::inherit_constructor(this), ::efl::eolian::call_ctors(args...));
+      eo_add_ref(_eo_raw, _eo_cls, _p._eo_raw, detail::inherit_constructor(this), ::efl::eolian::call_ctors(args...));
       ::efl::eolian::register_ev_del_free_callback(_eo_raw, args...);
   }
 
diff --git a/src/examples/ecore/ecore_audio_custom.c b/src/examples/ecore/ecore_audio_custom.c
index 735533517a..fba4698d7c 100644
--- a/src/examples/ecore/ecore_audio_custom.c
+++ b/src/examples/ecore/ecore_audio_custom.c
@@ -25,7 +25,7 @@ int read_cb(void *data EINA_UNUSED, Eo *eo_obj, void *buf, int len)
   float *val = buf;
   int i;
 
-  eo_do(eo_obj, ecore_audio_obj_volume_get(&volume));
+  eo_do(eo_obj, ecore_audio_obj_volume_get(eo_obj, &volume));
 
   for(i=0; i<len/4; i++, phase1++)
     {
@@ -56,9 +56,9 @@ main(int argc, const char *argv[])
 
    ecore_app_args_set(argc, argv);
 
-   out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
+   eo_add(out, ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
 
-   in = eo_add(ECORE_AUDIO_OBJ_IN_CLASS, NULL);
+   eo_add(in, ECORE_AUDIO_OBJ_IN_CLASS, NULL);
    if (!in)
      {
         printf("error when creating ecore audio source.\n");
diff --git a/src/examples/ecore/ecore_audio_playback.c b/src/examples/ecore/ecore_audio_playback.c
index 78c98a366a..1572ef5e7b 100644
--- a/src/examples/ecore/ecore_audio_playback.c
+++ b/src/examples/ecore/ecore_audio_playback.c
@@ -252,7 +252,7 @@ main(int argc, const char *argv[])
      {
        if (!strncmp(argv[i], "tone:", 5))
          {
-            in = eo_add(ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL);
+            eo_add(in, ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL);
             if (!in)
               {
                  printf("error when creating ecore audio source.\n");
@@ -276,7 +276,7 @@ main(int argc, const char *argv[])
          }
        else
          {
-            in = eo_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
+            eo_add(in, ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
             if (!in)
               {
                  printf("error when creating ecore audio source.\n");
@@ -307,7 +307,7 @@ main(int argc, const char *argv[])
 
    printf("Start: %s (%0.2fs)\n", name, length);
 
-   out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
+   eo_add(out, ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
    eo_do(out, ret = ecore_audio_obj_out_input_attach(in));
    if (!ret)
      printf("Could not attach input %s\n", name);
diff --git a/src/examples/ecore/ecore_audio_to_ogg.c b/src/examples/ecore/ecore_audio_to_ogg.c
index 7048ed56c2..be2c565555 100644
--- a/src/examples/ecore/ecore_audio_to_ogg.c
+++ b/src/examples/ecore/ecore_audio_to_ogg.c
@@ -49,7 +49,7 @@ main(int argc, char *argv[])
    ecore_audio_init();
 
 
-   in = eo_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
+   eo_add(in, ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
    eo_do(in, ecore_audio_obj_name_set(basename(argv[1])));
    eo_do(in, ret = ecore_audio_obj_source_set(argv[1]));
    if (!ret) {
@@ -60,7 +60,7 @@ main(int argc, char *argv[])
 
    eo_do(in, eo_event_callback_add(ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL));
 
-   out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL);
+   eo_add(out, ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL);
    eo_do(out, ret = ecore_audio_obj_source_set(argv[2]));
    if (!ret) {
      printf("Could not set %s as output\n", argv[2]);
diff --git a/src/examples/eo/evas/evas_elw_box.c b/src/examples/eo/evas/evas_elw_box.c
index 96df326e99..efd3c79668 100644
--- a/src/examples/eo/evas/evas_elw_box.c
+++ b/src/examples/eo/evas/evas_elw_box.c
@@ -30,7 +30,7 @@ _pack_end(Eo *obj EINA_UNUSED, void *class_data, va_list *list)
 static void
 _constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   eo_super_eo_constructor(MY_CLASS);
 
    Widget_Data *wd = class_data;
 
diff --git a/src/examples/eo/evas/evas_elw_boxedbutton.c b/src/examples/eo/evas/evas_elw_boxedbutton.c
index 44fc2605c8..e33db1ad68 100644
--- a/src/examples/eo/evas/evas_elw_boxedbutton.c
+++ b/src/examples/eo/evas/evas_elw_boxedbutton.c
@@ -20,9 +20,10 @@ typedef struct
 static void
 _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   eo_super_eo_constructor(MY_CLASS);
 
-   Eo *bt = eo_add(ELW_BUTTON_CLASS, obj);
+   Eo *bt;
+   eo_add(bt, ELW_BUTTON_CLASS, obj);
    eo_do(obj, eo_composite_attach(bt));
    eo_do(bt, eo_event_callback_forwarder_add(EV_CLICKED, obj));
    eo_do(bt, exevas_obj_visibility_set(EINA_TRUE));
diff --git a/src/examples/eo/evas/evas_elw_button.c b/src/examples/eo/evas/evas_elw_button.c
index 7067171dc4..ab9c8474ca 100644
--- a/src/examples/eo/evas/evas_elw_button.c
+++ b/src/examples/eo/evas/evas_elw_button.c
@@ -28,7 +28,7 @@ _position_set(Eo *obj, void *class_data EINA_UNUSED, va_list *list)
    x = va_arg(*list, Evas_Coord);
    y = va_arg(*list, Evas_Coord);
    printf("But set position %d,%d\n", x, y);
-   eo_do_super(obj, MY_CLASS, exevas_obj_position_set(x, y));
+   eo_super_exevas_obj_position_set(MY_CLASS x, y);
 }
 
 static void
@@ -52,7 +52,7 @@ _btn_clicked(void *data, Evas_Object *evas_obj, void *event_info)
 static void
 _constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   eo_super_eo_constructor(MY_CLASS);
 
    Widget_Data *wd = class_data;
 
@@ -68,7 +68,7 @@ _constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
 static void
 _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_destructor());
+   eo_super_eo_destructor(MY_CLASS);
 
    //Widget_Data *wd = class_data;
    /* FIXME: Commented out because it's automatically done because our tree
diff --git a/src/examples/eo/evas/evas_elw_win.c b/src/examples/eo/evas/evas_elw_win.c
index e5a917d781..746c960d50 100644
--- a/src/examples/eo/evas/evas_elw_win.c
+++ b/src/examples/eo/evas/evas_elw_win.c
@@ -29,7 +29,7 @@ my_win_del(void *data, Evas_Object *obj, void *event_info)
 static void
 _constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   eo_super_eo_constructor(MY_CLASS);
 
    Widget_Data *wd = class_data;
 
diff --git a/src/examples/eo/evas/evas_evas_obj.c b/src/examples/eo/evas/evas_evas_obj.c
index 768d3d4ea6..d4249d5f33 100644
--- a/src/examples/eo/evas/evas_evas_obj.c
+++ b/src/examples/eo/evas/evas_evas_obj.c
@@ -82,7 +82,7 @@ _child_add(Eo *obj, void *class_data, va_list *list)
 static void
 _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   eo_super_eo_constructor(MY_CLASS);
 
    /* Add type check. */
    Eo *parent = eo_parent_get(obj);
@@ -93,7 +93,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
 static void
 _destructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
 {
-   eo_do_super(obj, MY_CLASS, eo_destructor());
+   eo_super_eo_destructor(MY_CLASS);
 
    Widget_Data *wd = class_data;
 
diff --git a/src/examples/eo/evas/evas_test.c b/src/examples/eo/evas/evas_test.c
index 1502e31dd1..6fc5037667 100644
--- a/src/examples/eo/evas/evas_test.c
+++ b/src/examples/eo/evas/evas_test.c
@@ -33,10 +33,12 @@ main(int argc, char *argv[])
    elm_init(argc, argv);
    eo_init();
 
-   Eo *win = eo_add(ELW_WIN_CLASS, NULL);
+   Eo *win;
+   eo_add(win, ELW_WIN_CLASS, NULL);
    eo_do(win, exevas_obj_size_set(winw, winh), exevas_obj_visibility_set(EINA_TRUE));
 
-   Eo *bt = eo_add(ELW_BUTTON_CLASS, win);
+   Eo *bt;
+   eo_add(bt, ELW_BUTTON_CLASS, win);
    eo_do(bt, exevas_obj_position_set(25, 25),
          exevas_obj_size_set(50, 50),
          exevas_obj_color_set(255, 0, 0, 255),
@@ -48,7 +50,8 @@ main(int argc, char *argv[])
    eo_do(bt, exevas_obj_color_get(&r, &g, &b, &a));
    printf("RGBa(%d, %d, %d, %d)\n", r, g, b, a);
 
-   Eo *bx = eo_add(ELW_BOXEDBUTTON_CLASS, win);
+   Eo *bx;
+   eo_add(bx, ELW_BOXEDBUTTON_CLASS, win);
    eo_do(bx, exevas_obj_position_set(100, 100),
          exevas_obj_size_set(70, 70),
          exevas_obj_color_set(0, 0, 255, 255),
diff --git a/src/examples/eo/isa/eo_isa_main.c b/src/examples/eo/isa/eo_isa_main.c
index 567ef32542..5cfbe5ded1 100644
--- a/src/examples/eo/isa/eo_isa_main.c
+++ b/src/examples/eo/isa/eo_isa_main.c
@@ -13,8 +13,10 @@ main(int argc, char *argv[])
    (void) argv;
    eo_init();
 
-   Eo *simpleobj = eo_add(SIMPLE_CLASS, NULL);
-   Eo *complexobj = eo_add(COMPLEX_CLASS, NULL);
+   Eo *simpleobj;
+   eo_add(simpleobj, SIMPLE_CLASS, NULL);
+   Eo *complexobj;
+   eo_add(complexobj, COMPLEX_CLASS, NULL);
 
    printf("Simple: isa-simple:%d isa-complex:%d isa-mixin:%d isa-interface:%d\n",
          eo_isa(simpleobj, SIMPLE_CLASS),
diff --git a/src/examples/eolian_cxx/colourable.c b/src/examples/eolian_cxx/colourable.c
index 655d63c5c2..75fc1857fa 100644
--- a/src/examples/eolian_cxx/colourable.c
+++ b/src/examples/eolian_cxx/colourable.c
@@ -35,7 +35,7 @@ _colourable_eo_base_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
           = eina_log_domain_register("colourable", EINA_COLOR_BLUE);
      }
    DBG("_colourable_constructor(%p, %p)\n", obj, MY_CLASS);
-   return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   return eo_constructor(MY_CLASS, obj);
 }
 
 void
diff --git a/src/examples/eolian_cxx/colourablesquare.c b/src/examples/eolian_cxx/colourablesquare.c
index 87bc419816..4b9ad65e9d 100644
--- a/src/examples/eolian_cxx/colourablesquare.c
+++ b/src/examples/eolian_cxx/colourablesquare.c
@@ -35,7 +35,7 @@ _colourablesquare_size_constructor(Eo *obj, ColourableSquare_Data *self, int siz
      }
    self->size = size;
    DBG("_colourablesquare_constructor(%d)\n", size);
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   eo_super_eo_constructor(MY_CLASS);
 }
 
 static int
diff --git a/src/examples/eolian_cxx/colourablesquare_cxx.cc b/src/examples/eolian_cxx/colourablesquare_cxx.cc
index 906183a2aa..36cde3e136 100644
--- a/src/examples/eolian_cxx/colourablesquare_cxx.cc
+++ b/src/examples/eolian_cxx/colourablesquare_cxx.cc
@@ -25,7 +25,7 @@ _colourablesquare_size_constructor(Eo *obj, ColourableSquare_Data *self, int siz
 {
    self->size = size;
    EINA_CXX_DOM_LOG_DBG(domain) << __func__ << " [ size = " << size << " ]" << std::endl;
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   eo_super_eo_constructor(MY_CLASS);
 }
 
 int
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index c8d906c881..59c9a8b703 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -142,17 +142,16 @@ main(void)
 
    evas = ecore_evas_get(ecore_evas);
 
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
 
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                              evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
-   camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
    eo_do(camera,
          evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0));
 
-   camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(camera_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    eo_do(camera_node,
          evas_canvas3d_node_camera_set(camera));
@@ -162,15 +161,14 @@ main(void)
          evas_canvas3d_node_position_set(100.0, 50.0, 20.0),
          evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0,
                                   EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0));
-   light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   eo_add(light, EVAS_CANVAS3D_LIGHT_CLASS, evas);
    eo_do(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_directional_set(EINA_TRUE));
 
-   light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(light_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    eo_do(light_node,
          evas_canvas3d_node_light_set(light),
@@ -180,15 +178,15 @@ main(void)
    eo_do(root_node,
          evas_canvas3d_node_member_add(light_node));
 
-   mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    eo_do(mesh,
          efl_file_set(model_path, NULL),
          evas_canvas3d_mesh_frame_material_set(0, material),
          evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
 
-   texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(texture, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    eo_do(texture,
          evas_canvas3d_texture_file_set(image_path, NULL),
          evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
@@ -209,19 +207,19 @@ main(void)
                                     1.0, 1.0, 1.0, 1.0),
          evas_canvas3d_material_shininess_set(50.0));
 
-   mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(mesh_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                              evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
-   mesh_box_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(mesh_box_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                                  evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
 
-   material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(material_box, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
    eo_do(material_box, evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE));
 
-   cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(cube, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(cube,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE));
 
-   mesh_box = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(mesh_box, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(mesh_box,
          evas_canvas3d_mesh_from_primitive_set(0, cube),
          evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES),
@@ -244,7 +242,7 @@ main(void)
          evas_canvas3d_scene_camera_node_set(camera_node),
          evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
 
-   background = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   eo_add(background, EVAS_RECTANGLE_CLASS, evas);
    eo_do(background,
          efl_gfx_color_set(0, 0, 0, 255),
          efl_gfx_size_set(WIDTH, HEIGHT),
diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c
index 98bd74afb5..589e78fdaf 100644
--- a/src/examples/evas/evas-3d-blending.c
+++ b/src/examples/evas/evas-3d-blending.c
@@ -144,13 +144,12 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(data->camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
 
    eo_do(data->camera,
          evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0));
 
-  data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->camera_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
 
   eo_do(data->camera_node,
@@ -165,14 +164,13 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   eo_add(data->light, 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));
 
-   data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->light_node, 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),
@@ -194,7 +192,7 @@ _set_ball(Eo *mesh, Eo *sphere, Evas_Canvas3D_Material *material)
 static void
 _mesh_setup(Scene_Data *data)
 {
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(data->material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    eo_do(data->material,
          evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
@@ -206,7 +204,7 @@ _mesh_setup(Scene_Data *data)
          evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2),
          evas_canvas3d_material_shininess_set(100.0));
 
-   data->material1 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(data->material1, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    eo_do(data->material1,
          evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
@@ -218,26 +216,24 @@ _mesh_setup(Scene_Data *data)
          evas_canvas3d_material_color_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 1.0, 1.0, 1.0, 0.2),
          evas_canvas3d_material_shininess_set(100.0));
 
-   data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(data->sphere, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(data->sphere,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE),
          evas_canvas3d_primitive_precision_set(50));
 
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   data->mesh1 = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(data->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(data->mesh1, EVAS_CANVAS3D_MESH_CLASS, evas);
 
    _set_ball(data->mesh, data->sphere, data->material);
    _set_ball(data->mesh1, data->sphere, data->material1);
 
-   data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->mesh_node, 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));
 
-   data->mesh_node1 =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->mesh_node1, 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_node1));
@@ -256,14 +252,13 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(data->scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    eo_do(data->scene,
          evas_canvas3d_scene_size_set(WIDTH, HEIGHT);
          evas_canvas3d_scene_background_color_set(0.5, 0.5, 0.5, 1));
 
-   data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c
index f0a6444d77..5845a5f857 100644
--- a/src/examples/evas/evas-3d-colorpick.c
+++ b/src/examples/evas/evas-3d-colorpick.c
@@ -242,9 +242,9 @@ Eina_Bool
 _init_sphere(void *this, const char *texture)
 {
    Test_object *sphere  = (Test_object *)this;
-   sphere->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
-   sphere->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   sphere->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(sphere->primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(sphere->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(sphere->material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
    eo_do(sphere->primitive,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE),
          evas_canvas3d_primitive_precision_set(50));
@@ -255,7 +255,7 @@ _init_sphere(void *this, const char *texture)
 
    eo_do(sphere->mesh,  evas_canvas3d_mesh_color_pick_enable_set(EINA_TRUE));
 
-   sphere->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(sphere->texture, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    eo_do(sphere->texture,
          evas_canvas3d_texture_file_set(texture, NULL),
          evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
@@ -286,17 +286,16 @@ _init_scene(const char *texture)
    Evas_Real tmp;
    Test_object *m;
 
-   globalscene.scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(globalscene.scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
 
-   globalscene.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(globalscene.root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                              evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
-   globalscene.camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(globalscene.camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
    eo_do(globalscene.camera,
          evas_canvas3d_camera_projection_perspective_set(30.0, 1.0, 1.0, 1000.0));
 
-   globalscene.camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(globalscene.camera_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    eo_do(globalscene.camera_node,
          evas_canvas3d_node_camera_set(globalscene.camera));
@@ -306,15 +305,14 @@ _init_scene(const char *texture)
          evas_canvas3d_node_position_set(0.0, 30.0, 800.0),
          evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, -1000.0,
                                   EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
-   globalscene.light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   eo_add(globalscene.light, EVAS_CANVAS3D_LIGHT_CLASS, evas);
    eo_do(globalscene.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_directional_set(EINA_TRUE));
 
-   globalscene.light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(globalscene.light_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    eo_do(globalscene.light_node,
          evas_canvas3d_node_light_set(globalscene.light),
@@ -339,7 +337,7 @@ _init_scene(const char *texture)
              m->material = spheretmp->material;
              m->texture = spheretmp->texture;
           }
-        m->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+        eo_add(m->node, EVAS_CANVAS3D_NODE_CLASS, evas,
                          evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
         m->speed = tmp;
         m->sphere_animate = _animate_sphere;
diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c
index eec0234960..2a38c94c3b 100644
--- a/src/examples/evas/evas-3d-cube-rotate.c
+++ b/src/examples/evas/evas-3d-cube-rotate.c
@@ -148,11 +148,11 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(data->camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
    eo_do(data->camera,
          evas_canvas3d_camera_projection_perspective_set(20.0, 1.0, 2.0, 50.0));
 
-   data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->camera_node, 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),
@@ -165,14 +165,14 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS,evas);
+   eo_add(data->light, 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));
 
-   data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->light_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
 
    eo_do(data->light_node,
@@ -188,7 +188,7 @@ static void
 _mesh_setup(Scene_Data *data)
 {
    /* Setup material. */
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(data->material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    eo_do(data->material,
          evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
@@ -200,18 +200,18 @@ _mesh_setup(Scene_Data *data)
          evas_canvas3d_material_shininess_set(100.0));
 
    /* Setup primitive */
-   data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(data->cube, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(data->cube,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE));
 
    /* Setup mesh. */
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(data->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(data->mesh,
          evas_canvas3d_mesh_from_primitive_set(0, data->cube),
          evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG),
          evas_canvas3d_mesh_frame_material_set(0, data->material));
 
-   data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
+   eo_add(data->mesh_node, 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));
@@ -220,8 +220,8 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
-   data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(data->root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                                    evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    eo_do(scene,
diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c
index d3bcbbe6b5..b4712184e3 100644
--- a/src/examples/evas/evas-3d-cube.c
+++ b/src/examples/evas/evas-3d-cube.c
@@ -134,13 +134,12 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(data->camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
 
    eo_do(data->camera,
          evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0));
 
-   data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->camera_node, 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),
@@ -153,14 +152,13 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   eo_add(data->light, 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));
 
-   data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->light_node, 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),
@@ -173,7 +171,7 @@ static void
 _mesh_setup(Scene_Data *data)
 {
    /* Setup material. */
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(data->material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    eo_do(data->material,
          evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
@@ -186,7 +184,7 @@ _mesh_setup(Scene_Data *data)
          evas_canvas3d_material_shininess_set(100.0));
 
    /* Setup mesh. */
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(data->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(data->mesh,
          evas_canvas3d_mesh_vertex_count_set(24),
          evas_canvas3d_mesh_frame_add(0),
@@ -208,8 +206,7 @@ _mesh_setup(Scene_Data *data)
 
          evas_canvas3d_mesh_frame_material_set(0, data->material));
 
-   data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->mesh_node, 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));
@@ -218,13 +215,12 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(data->scene, 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));
 
-   data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
@@ -258,7 +254,7 @@ main(void)
    _scene_setup(&data);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   eo_add(background, EVAS_RECTANGLE_CLASS, evas);
    eo_do(background,
          efl_gfx_color_set(0, 0, 0, 255),
          efl_gfx_size_set(WIDTH, HEIGHT),
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index a2dd1febf5..9f811e1500 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -112,12 +112,11 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(data->camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
    eo_do(data->camera,
          evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0));
 
-   data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->camera_node, 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),
@@ -131,14 +130,13 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   eo_add(data->light, 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));
 
-   data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->light_node, 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),
@@ -152,8 +150,8 @@ static void
 _mesh_setup(Scene_Data *data)
 {
    /* Setup material. */
-   data->material0 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   data->material1 = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(data->material0, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(data->material1, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    eo_do(data->material0,
          evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
@@ -177,9 +175,9 @@ _mesh_setup(Scene_Data *data)
          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));
 
-   data->texture0 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
-   data->texture1 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
-   data->texture_normal = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(data->texture0, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(data->texture1, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(data->texture_normal, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
 
    eo_do(data->texture0,
          evas_canvas3d_texture_data_set(EVAS_COLORSPACE_ARGB8888, 4, 4, &pixels0[0]));
@@ -196,12 +194,12 @@ _mesh_setup(Scene_Data *data)
          evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_NORMAL, data->texture_normal));
 
    /* Set data of primitive */
-   data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(data->cube, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(data->cube,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE));
 
    /* Setup mesh. */
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(data->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(data->mesh,
          evas_canvas3d_mesh_from_primitive_set(0, data->cube),
          evas_canvas3d_mesh_frame_material_set(0, data->material0),
@@ -209,8 +207,8 @@ _mesh_setup(Scene_Data *data)
          evas_canvas3d_mesh_frame_material_set(20, data->material1),
          evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP));
 
-   data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(data->mesh_node, 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));
@@ -219,13 +217,13 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(data->scene, 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));
 
-   data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(data->root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
@@ -260,7 +258,7 @@ main(void)
    _scene_setup(&data);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   eo_add(background, EVAS_RECTANGLE_CLASS, evas);
    eo_do(background,
          efl_gfx_color_set(0, 0, 0, 255),
          efl_gfx_size_set(WIDTH, HEIGHT),
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index 9067825e00..18d994cd58 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -116,18 +116,18 @@ main(void)
    evas = ecore_evas_get(ecore_evas);
 
    /* Add a scene object .*/
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add the root node for the scene. */
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                       evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    /* Add the camera. */
-   camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
    eo_do(camera,
          evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0));
 
-   camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(camera_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                         evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    eo_do(camera_node,
          evas_canvas3d_node_camera_set(camera));
@@ -138,14 +138,14 @@ main(void)
          evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0,
                                   EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0));
    /* Add the light. */
-   light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   eo_add(light, EVAS_CANVAS3D_LIGHT_CLASS, evas);
    eo_do(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_directional_set(EINA_TRUE));
 
-   light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(light_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                        evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    eo_do(light_node,
          evas_canvas3d_node_light_set(light),
@@ -156,9 +156,9 @@ main(void)
          evas_canvas3d_node_member_add(light_node));
 
    /* Add the meshes. */
-   mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   mesh2 = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(mesh2, EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    eo_do(mesh,
          efl_file_set(input_model_path, NULL),
@@ -188,7 +188,7 @@ main(void)
          efl_file_set(output_model_path, NULL),
          evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
 
-   mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(mesh_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                       evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
 
    eo_do(root_node,
@@ -197,7 +197,7 @@ main(void)
          evas_canvas3d_node_mesh_add(mesh),
          evas_canvas3d_node_position_set(0.0, -40.0, 0.0));
 
-   mesh_node2 = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(mesh_node2, EVAS_CANVAS3D_NODE_CLASS, evas,
                        evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
    eo_do(root_node,
          evas_canvas3d_node_member_add(mesh_node2));
@@ -212,7 +212,7 @@ main(void)
          evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
 
    /* Add a background rectangle objects. */
-   background = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   eo_add(background, EVAS_RECTANGLE_CLASS, evas);
    eo_do(background,
          efl_gfx_color_set(0, 0, 0, 255),
          efl_gfx_size_set(WIDTH, HEIGHT),
diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c
index 5d191e800f..8d9a0c68ab 100644
--- a/src/examples/evas/evas-3d-fog.c
+++ b/src/examples/evas/evas-3d-fog.c
@@ -82,13 +82,13 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(data->camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
 
    eo_do(data->camera,
          evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 2.0, 50.0));
 
-  data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+  
+   eo_add(data->camera_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
 
   eo_do(data->camera_node,
@@ -103,14 +103,14 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   eo_add(data->light, 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));
 
-   data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(data->light_node, 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),
@@ -133,7 +133,7 @@ _set_ball(Eo *mesh, Eo *sphere, Evas_Canvas3D_Material *material)
 static void
 _mesh_setup(Scene_Data *data)
 {
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(data->material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    eo_do(data->material,
          evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
@@ -145,23 +145,23 @@ _mesh_setup(Scene_Data *data)
          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));
 
-   data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(data->sphere, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(data->sphere,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE),
          evas_canvas3d_primitive_precision_set(50));
 
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   data->mesh1 = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(data->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(data->mesh1, EVAS_CANVAS3D_MESH_CLASS, evas);
 
    _set_ball(data->mesh, data->sphere, data->material);
    _set_ball(data->mesh1, data->sphere, data->material);
 
-   data->animation_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(data->animation_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
-   data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(data->mesh_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
 
    eo_do(data->animation_node, evas_canvas3d_node_member_add(data->mesh_node));
@@ -169,8 +169,8 @@ _mesh_setup(Scene_Data *data)
    eo_do(data->mesh_node, evas_canvas3d_node_mesh_add(data->mesh),
                           evas_canvas3d_node_position_set(0.0, 0.0, 3.0));
 
-   data->mesh_node1 =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(data->mesh_node1, 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_node1));
@@ -184,14 +184,14 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(data->scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    eo_do(data->scene,
          evas_canvas3d_scene_size_set(WIDTH, HEIGHT);
          evas_canvas3d_scene_background_color_set(FOG_COLOR, 1));
 
-   data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(data->root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
@@ -226,7 +226,7 @@ main(void)
    _scene_setup(&data);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   eo_add(background, EVAS_RECTANGLE_CLASS, evas);
    eo_do(background,
          efl_gfx_color_set(0, 0, 0, 255),
          efl_gfx_size_set(WIDTH, HEIGHT),
diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c
index 465160bae7..a89c407ddf 100644
--- a/src/examples/evas/evas-3d-frustum.c
+++ b/src/examples/evas/evas-3d-frustum.c
@@ -296,8 +296,8 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *eo EINA_UNUSED, void
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
-   data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(data->camera_node, 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),
@@ -312,13 +312,13 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   eo_add(data->light, 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));
 
-   data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS,evas,
+   eo_add(data->light_node, 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),
@@ -331,7 +331,7 @@ _light_setup(Scene_Data *data)
 static void
 _mesh_setup(Scene_Data *data)
 {
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(data->material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    eo_do(data->material,
          evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
@@ -343,31 +343,30 @@ _mesh_setup(Scene_Data *data)
          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));
 
-   data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(data->cube, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(data->cube,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE));
 
-   data->sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(data->sphere, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(data->sphere,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE),
          evas_canvas3d_primitive_precision_set(20));
 
-   data->mesh_aabb = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(data->mesh_aabb, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(data->mesh_aabb,
          evas_canvas3d_mesh_from_primitive_set(0, data->cube),
          evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES),
          evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE),
          evas_canvas3d_mesh_frame_material_set(0, data->material));
 
-   data->mesh_sphere = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(data->mesh_sphere, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(data->mesh_sphere,
          evas_canvas3d_mesh_from_primitive_set(0, data->sphere),
          evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_LINES),
          evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_DIFFUSE),
          evas_canvas3d_mesh_frame_material_set(0, data->material));
 
-   data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
+   eo_add(data->mesh_node, 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_aabb));
 }
@@ -375,9 +374,9 @@ _mesh_setup(Scene_Data *data)
 static void
 _mesh_setup_model(Scene_Data *data)
 {
-   data->mesh_model = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   data->material_model = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   data->texture_model = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(data->mesh_model, EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(data->material_model, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(data->texture_model, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
 
    eo_do(data->texture_model,
          evas_canvas3d_texture_file_set(texture_path, NULL),
@@ -405,16 +404,16 @@ _mesh_setup_model(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(data->scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
 
-   data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                                    evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _light_setup(data);
    _mesh_setup_model(data);
    _camera_setup(data);
 
-   data->mesh_node_model = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->mesh_node_model, EVAS_CANVAS3D_NODE_CLASS, evas,
                                       evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
    eo_do(data->mesh_node_model,
          evas_canvas3d_node_position_set(obj_x, obj_y, obj_z),
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index 9409efc5b7..95ec7fbbc1 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -91,19 +91,19 @@ main(void)
    evas = ecore_evas_get(ecore_evas);
 
    /* Add a scene object .*/
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add the root node for the scene. */
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_addE(root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                              evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    /* Add the camera. */
-   camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
    eo_do(camera,
          evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0));
 
-   camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(camera_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    eo_do(camera_node,
          evas_canvas3d_node_camera_set(camera));
@@ -114,15 +114,15 @@ main(void)
          evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 20.0,
                                   EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0));
    /* Add the light. */
-   light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   eo_add(light, EVAS_CANVAS3D_LIGHT_CLASS, evas);
    eo_do(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_directional_set(EINA_TRUE));
 
-   light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(light_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    eo_do(light_node,
          evas_canvas3d_node_light_set(light),
@@ -133,15 +133,15 @@ main(void)
          evas_canvas3d_node_member_add(light_node));
 
    /* Add the mesh. */
-   mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    eo_do(mesh,
          efl_file_set(model_path, NULL),
          evas_canvas3d_mesh_frame_material_set(0, material),
          evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
 
-   texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(texture, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    eo_do(texture,
          evas_canvas3d_texture_file_set(image_path, NULL),
          evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
@@ -162,7 +162,7 @@ main(void)
                                     1.0, 1.0, 1.0, 1.0),
          evas_canvas3d_material_shininess_set(50.0));
 
-   mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(mesh_node, 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));
@@ -176,7 +176,7 @@ main(void)
          evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
 
    /* Add a background rectangle objects. */
-   background = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   eo_add(background, EVAS_RECTANGLE_CLASS, evas);
    eo_do(background,
          efl_gfx_color_set(0, 0, 0, 255),
          efl_gfx_size_set(WIDTH, HEIGHT),
diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c
index 39f6d34a6b..fde77481d9 100644
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -32,12 +32,12 @@
 #define LOAD_AND_ADD_MESH(extention, number)                                          \
    snprintf(buffer, PATH_MAX, "%s%s", template_path, #extention);                     \
    extention##_file = eina_file_open(buffer , 0);                                     \
-   mesh_##extention = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);                               \
+   eo_add(mesh_##extention, EVAS_CANVAS3D_MESH_CLASS, evas);             \
    eo_do(mesh_##extention,                                                            \
          efl_file_mmap_set(extention##_file, NULL),                                   \
          evas_canvas3d_mesh_frame_material_set(0, material),                                \
          evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));                      \
-   node_##extention = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,                                \
+   eo_add(node_##extention, EVAS_CANVAS3D_NODE_CLASS, evas,              \
                           evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));          \
    eo_do(root_node, evas_canvas3d_node_member_add(node_##extention));                       \
    eo_do(node_##extention, evas_canvas3d_node_mesh_add(mesh_##extention),                   \
@@ -187,19 +187,19 @@ main(void)
    evas = ecore_evas_get(ecore_evas);
 
    /* Add a scene object .*/
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add the root node for the scene. */
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                              evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    /* Add the camera. */
-   camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
    eo_do(camera,
          evas_canvas3d_camera_projection_perspective_set(10.0, 1.0, 1.0, 500.0));
 
-   camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(camera_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    eo_do(camera_node,
          evas_canvas3d_node_camera_set(camera));
@@ -210,15 +210,15 @@ main(void)
          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));
    /* Add the light. */
-   light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   eo_add(light, EVAS_CANVAS3D_LIGHT_CLASS, evas);
    eo_do(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_directional_set(EINA_TRUE));
 
-   light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(light_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    eo_do(light_node,
          evas_canvas3d_node_light_set(light),
@@ -228,7 +228,7 @@ main(void)
    eo_do(root_node,
          evas_canvas3d_node_member_add(light_node));
 
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    eo_do(material,
          evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
@@ -256,7 +256,7 @@ main(void)
          evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
 
    /* Add a background rectangle objects. */
-   background = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   eo_add(background, EVAS_RECTANGLE_CLASS, evas);
    eo_do(background,
          efl_gfx_color_set(20, 20, 200, 255),
          efl_gfx_size_set(WIDTH, HEIGHT),
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index 0d40a4125a..f6d65dfba2 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -44,13 +44,13 @@
 #define NUMBER_OF_MESHES 8
 
 #define ADD_OBJ_MESH(path, Y, Z, num, shade_mode, name_of_material)               \
-   mesh[num] = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);                                  \
+   eo_add(mesh[num], EVAS_CANVAS3D_MESH_CLASS, evas);                     \
    snprintf(full_file_path, PATH_MAX, "%s%s", path, ".obj");                      \
    eo_do(mesh[num],                                                               \
          efl_file_set(full_file_path, NULL),                                      \
          evas_canvas3d_mesh_frame_material_set(0, name_of_material),                    \
          evas_canvas3d_mesh_shade_mode_set(shade_mode));                                \
-   mesh_node[num] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,                              \
+   eo_add(mesh_node[num], 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[num]));                                \
@@ -67,7 +67,7 @@
    ADD_OBJ_MESH(buffer, Y + COPY_OFFSET, Z, num + 4, shade_mode, name_of_material)
 
 #define ADD_TEXTURE(name, path)                                       \
-   name = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);                        \
+   eo_add(name, EVAS_CANVAS3D_TEXTURE_CLASS, evas);                     \
    eo_do(name,                                                        \
          evas_canvas3d_texture_file_set(path, NULL),                        \
          evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,   \
@@ -76,7 +76,7 @@
                                   EVAS_CANVAS3D_WRAP_MODE_REPEAT));
 
 #define ADD_MATERIAL(name)                                                 \
-   name = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);                            \
+   eo_add(name, EVAS_CANVAS3D_MATERIAL_CLASS, evas);                      \
    eo_do(name,                                                             \
          evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE), \
          evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE), \
@@ -164,19 +164,19 @@ main(void)
    evas = ecore_evas_get(ecore_evas);
 
    /* Add a scene object .*/
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add the root node for the scene. */
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                       evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    /* Add the camera. */
-   camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
    eo_do(camera,
          evas_canvas3d_camera_projection_perspective_set(20.0, 1.0, 1.0, 500.0));
 
-   camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(camera_node, EVAS_CANVAS3D_NODE_CLASS, evas,
              evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    eo_do(camera_node,
          evas_canvas3d_node_camera_set(camera));
@@ -187,15 +187,15 @@ main(void)
          evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
                                   EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0));
    /* Add the light. */
-   light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   eo_add(light, EVAS_CANVAS3D_LIGHT_CLASS, evas);
    eo_do(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_directional_set(EINA_TRUE));
 
-   light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(light_node, EVAS_CANVAS3D_NODE_CLASS, evas,
              evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    eo_do(light_node,
          evas_canvas3d_node_light_set(light),
@@ -233,7 +233,7 @@ main(void)
          evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
 
    /* Add a background rectangle MESHES. */
-   background = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   eo_add(background, EVAS_RECTANGLE_CLASS, evas);
    eo_do(background,
          efl_gfx_color_set(0, 0, 0, 255),
          efl_gfx_size_set(WIDTH, HEIGHT),
diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c
index fd1e8ce18b..eb35237420 100644
--- a/src/examples/evas/evas-3d-parallax-occlusion.c
+++ b/src/examples/evas/evas-3d-parallax-occlusion.c
@@ -105,12 +105,12 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(data->camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
 
    eo_do(data->camera,
          evas_canvas3d_camera_projection_perspective_set(30.0, 1.0, 2.0, 50.0));
 
-   data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->camera_node, 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),
@@ -123,13 +123,13 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   eo_add(data->light, 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));
 
-   data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->light_node, 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),
@@ -143,10 +143,10 @@ static void
 _mesh_setup(Scene_Data *data)
 {
    /* Setup material. */
-   data->material_rocks = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(data->material_rocks, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
-   data->texture_rocks = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
-   data->texture_rocks_n = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(data->texture_rocks, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(data->texture_rocks_n, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    eo_do(data->texture_rocks, evas_canvas3d_texture_file_set(rock_diffuse, NULL),
          evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
                                   EVAS_CANVAS3D_WRAP_MODE_REPEAT));
@@ -169,10 +169,10 @@ _mesh_setup(Scene_Data *data)
          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));
 
-   data->material_wood = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(data->material_wood, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
-   data->texture_wood = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
-   data->texture_four_n = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(data->texture_wood, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(data->texture_four_n, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    eo_do(data->texture_wood, evas_canvas3d_texture_file_set(wood_diffuse, NULL),
          evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
                                   EVAS_CANVAS3D_WRAP_MODE_REPEAT));
@@ -196,12 +196,12 @@ _mesh_setup(Scene_Data *data)
          evas_canvas3d_material_shininess_set(100.0));
 
    /* Set data of primitive */
-   data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(data->cube, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(data->cube,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE));
 
    /* Setup mesh. */
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(data->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(data->mesh,
          evas_canvas3d_mesh_from_primitive_set(0, data->cube),
          evas_canvas3d_mesh_from_primitive_set(100, data->cube),
@@ -211,7 +211,7 @@ _mesh_setup(Scene_Data *data)
    eo_do(data->mesh,
          evas_canvas3d_mesh_frame_material_set(100, data->material_wood));
 
-   data->mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->mesh_node, 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),
@@ -221,12 +221,12 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(data->scene, 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));
 
-   data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                             evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
@@ -261,7 +261,7 @@ main(void)
    _scene_setup(&data);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   eo_add(background, EVAS_RECTANGLE_CLASS, evas);
    eo_do(background,
          efl_gfx_color_set(0, 0, 0, 255),
          efl_gfx_size_set(WIDTH, HEIGHT),
diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index db8389ae36..9836100037 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -133,19 +133,19 @@ main(void)
    evas = ecore_evas_get(ecore_evas);
 
    /* Add a scene object .*/
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add the root node for the scene. */
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                              evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    /* Add the camera. */
-   camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
    eo_do(camera,
          evas_canvas3d_camera_projection_perspective_set(30.0, 1.0, 1.0, 100.0));
 
-   camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(camera_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    eo_do(camera_node,
          evas_canvas3d_node_camera_set(camera),
@@ -154,17 +154,17 @@ main(void)
                                   EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0));
    eo_do(root_node, evas_canvas3d_node_member_add(camera_node));
 
-   sphere = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(sphere, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(sphere,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE),
          evas_canvas3d_primitive_precision_set(50));
 
-   mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(mesh, evas_canvas3d_mesh_from_primitive_set(0, sphere));
 
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
-   texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(texture_diffuse, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    eo_do(texture_diffuse,
          evas_canvas3d_texture_file_set(image_path, NULL),
          evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR,
@@ -184,7 +184,7 @@ main(void)
                                     1.0),
          evas_canvas3d_material_shininess_set(50.0));
 
-   mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(mesh_node, 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));
@@ -199,7 +199,7 @@ main(void)
          evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
 
    /* Add evas objects. */
-   background = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   eo_add(background, EVAS_RECTANGLE_CLASS, evas);
    eo_do(background,
          efl_gfx_color_set(0, 0, 0, 255),
          efl_gfx_size_set(WIDTH, HEIGHT),
diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index 10881aa731..6781c9af66 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -123,18 +123,18 @@ main(void)
    evas = ecore_evas_get(ecore_evas);
 
    /* Add a scene object .*/
-   scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    /* Add the root node for the scene. */
-   root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                       evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    /* Add the camera. */
-   camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
    eo_do(camera,
          evas_canvas3d_camera_projection_perspective_set(60.0, 1.0, 1.0, 500.0));
 
-   camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(camera_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                         evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
    eo_do(camera_node,
          evas_canvas3d_node_camera_set(camera));
@@ -145,14 +145,14 @@ main(void)
          evas_canvas3d_node_look_at_set(EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0,
                                   EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 1.0));
    /* Add the light. */
-   light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   eo_add(light, EVAS_CANVAS3D_LIGHT_CLASS, evas);
    eo_do(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_directional_set(EINA_TRUE));
 
-   light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(light_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                        evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_LIGHT));
    eo_do(light_node,
          evas_canvas3d_node_light_set(light),
@@ -162,8 +162,8 @@ main(void)
    eo_do(root_node,
          evas_canvas3d_node_member_add(light_node));
 
-   material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(texture, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    eo_do(texture,
          evas_canvas3d_texture_file_set(image_path, NULL),
          evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
@@ -191,7 +191,7 @@ main(void)
    /* Add the meshes. */
    for (i = 0; i < NUMBER_OF_MESHES; i++)
      {
-        mesh[i] = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+        eo_add(mesh[i], EVAS_CANVAS3D_MESH_CLASS, evas);
 
         snprintf(buffer, PATH_MAX, "%s%s", input_template, file_name[i % 8]);
         eo_do(mesh[i],
@@ -210,7 +210,7 @@ main(void)
                    evas_canvas3d_mesh_shade_mode_set(draw_mode[(i % 16) / 8]));
           }
 
-        mesh_node[i] = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+        eo_add(mesh_node[i], 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[i]));
         eo_do(mesh_node[i],
@@ -225,7 +225,7 @@ main(void)
          evas_canvas3d_scene_size_set(WIDTH, HEIGHT));
 
    /* Add a background rectangle objects. */
-   background = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   eo_add(background, EVAS_RECTANGLE_CLASS, evas);
    eo_do(background,
          efl_gfx_color_set(100, 100, 100, 255),
          efl_gfx_size_set(WIDTH, HEIGHT),
diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c
index 48d85e474d..f2e380c8a0 100644
--- a/src/examples/evas/evas-3d-proxy.c
+++ b/src/examples/evas/evas-3d-proxy.c
@@ -100,12 +100,12 @@ _animate_scene(void *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(data->camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
    eo_do(data->camera,
          evas_canvas3d_camera_projection_perspective_set(30.0, 1.0, 2.0, 50.0));
 
-   data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(data->camera_node, 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),
@@ -119,14 +119,14 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   eo_add(data->light, 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));
 
-   data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(data->light_node, 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),
@@ -140,8 +140,8 @@ static void
 _mesh_setup(Scene_Data *data)
 {
    /* Setup material. */
-   data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
-   data->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(data->material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(data->texture, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
 
    eo_do(data->texture,
          evas_canvas3d_texture_source_set(source),
@@ -160,19 +160,19 @@ _mesh_setup(Scene_Data *data)
          evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, data->texture));
 
    /* Set data of primitive */
-   data->cube = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(data->cube, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(data->cube,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE));
 
    /* Setup mesh. */
-   data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(data->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(data->mesh,
          evas_canvas3d_mesh_from_primitive_set(0, data->cube),
          evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_FLAT),
          evas_canvas3d_mesh_frame_material_set(0, data->material));
 
-   data->mesh_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(data->mesh_node, 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));
@@ -182,13 +182,13 @@ _mesh_setup(Scene_Data *data)
 static void
 _scene_setup(Scene_Data *data)
 {
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(data->scene, 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));
 
-   data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(data->root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    _camera_setup(data);
@@ -221,7 +221,7 @@ main(void)
    evas = ecore_evas_get(ecore_evas);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   eo_add(background, EVAS_RECTANGLE_CLASS, evas);
    eo_do(background,
          efl_gfx_color_set(0, 0, 0, 255),
          efl_gfx_size_set(WIDTH, HEIGHT),
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index 179d1825cd..f0da2f2039 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -179,7 +179,7 @@ _on_canvas_resize(Ecore_Evas *ee)
 static void
 _body_material_set(Body_3D *body, float r, float g, float b)
 {
-   body->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(body->material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    eo_do(body->material,
          evas_canvas3d_material_enable_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE),
@@ -199,18 +199,18 @@ _body_material_set(Body_3D *body, float r, float g, float b)
 static void
 _sphere_setup(Body_3D *sphere)
 {
-   sphere->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(sphere->primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(sphere->primitive,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SPHERE),
          evas_canvas3d_primitive_precision_set(50));
 
-   sphere->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(sphere->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(sphere->mesh,
          evas_canvas3d_mesh_from_primitive_set(0, sphere->primitive));
 
    _body_material_set(sphere, 1, 0.0, 0.0);
 
-   sphere->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(sphere->node, EVAS_CANVAS3D_NODE_CLASS, evas,
                          evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH),
                          evas_canvas3d_node_position_set(3.0, 3.0, 0.0));
    eo_do(sphere->node, evas_canvas3d_node_mesh_add(sphere->mesh));
@@ -219,19 +219,19 @@ _sphere_setup(Body_3D *sphere)
 static void
 _cone_setup(Body_3D *cone)
 {
-   cone->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(cone->primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(cone->primitive,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CONE),
          evas_canvas3d_primitive_precision_set(50));
 
-   cone->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(cone->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(cone->mesh,
          evas_canvas3d_mesh_from_primitive_set(0, cone->primitive));
 
    _body_material_set(cone, 0.8, 0.5, 0.5);
 
-   cone->node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(cone->node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
    eo_do(cone->node, evas_canvas3d_node_mesh_add(cone->mesh),
          evas_canvas3d_node_orientation_angle_axis_set(-90.0, 1.0, 0.0, 0.0),
@@ -241,19 +241,19 @@ _cone_setup(Body_3D *cone)
 static void
 _cylinder_setup(Body_3D *cylinder)
 {
-   cylinder->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(cylinder->primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(cylinder->primitive,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CYLINDER),
          evas_canvas3d_primitive_precision_set(50));
 
-   cylinder->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(cylinder->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(cylinder->mesh,
          evas_canvas3d_mesh_from_primitive_set(0, cylinder->primitive));
 
    _body_material_set(cylinder, 0.0, 0.0, 1.0);
 
-   cylinder->node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(cylinder->node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
    eo_do(cylinder->node, evas_canvas3d_node_mesh_add(cylinder->mesh),
          evas_canvas3d_node_orientation_angle_axis_set(-90.0, 1.0, 0.0, 0.0),
@@ -264,7 +264,8 @@ static void
 _fence_setup(Body_3D *fence)
 {
 
-   Eo *texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   Eo *texture;
+   eo_add(texture, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    eo_do(texture, evas_canvas3d_texture_atlas_enable_set(EINA_FALSE));
    eo_do(texture,
          evas_canvas3d_texture_file_set(PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/grid.png", NULL),
@@ -272,7 +273,8 @@ _fence_setup(Body_3D *fence)
                                     EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST),
          evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
                                   EVAS_CANVAS3D_WRAP_MODE_REPEAT));
-   Eo *texture1 = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   Eo *texture1;
+   eo_add(texture1, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    eo_do(texture1, evas_canvas3d_texture_atlas_enable_set(EINA_FALSE));
    eo_do(texture1,
          evas_canvas3d_texture_file_set(PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/grid_n.png", NULL),
@@ -280,7 +282,7 @@ _fence_setup(Body_3D *fence)
                                     EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST),
          evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
                                   EVAS_CANVAS3D_WRAP_MODE_REPEAT));
-   fence->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(fence->material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    eo_do(fence->material,
          evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, texture),
@@ -295,14 +297,14 @@ _fence_setup(Body_3D *fence)
          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));
 
-   fence->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(fence->primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(fence->primitive,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CYLINDER),
          evas_canvas3d_primitive_mode_set(EVAS_CANVAS3D_PRIMITIVE_MODE_WITHOUT_BASE),
          evas_canvas3d_primitive_tex_scale_set(160.0, 12.0),
          evas_canvas3d_primitive_precision_set(50));
 
-   fence->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(fence->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(fence->mesh,
          evas_canvas3d_mesh_from_primitive_set(0, fence->primitive));
 
@@ -311,8 +313,8 @@ _fence_setup(Body_3D *fence)
          evas_canvas3d_mesh_alpha_func_set(EVAS_CANVAS3D_COMPARISON_GREATER, 0),
          evas_canvas3d_mesh_alpha_test_enable_set(EINA_TRUE),
          evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP));
-   fence->node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(fence->node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
    eo_do(fence->node, evas_canvas3d_node_mesh_add(fence->mesh),
           evas_canvas3d_node_orientation_angle_axis_set(-90.0, 1.0, 0.0, 0.0),
@@ -323,18 +325,18 @@ _fence_setup(Body_3D *fence)
 static void
 _square_setup(Body_3D *square)
 {
-   square->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(square->primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(square->primitive,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SQUARE));
 
-   square->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(square->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(square->mesh,
          evas_canvas3d_mesh_from_primitive_set(0, square->primitive));
 
    _body_material_set(square, 0.4, 0.4, 0.4);
 
-   square->node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(square->node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
    eo_do(square->node, evas_canvas3d_node_mesh_add(square->mesh),
          evas_canvas3d_node_position_set(0.0, -1.0, 0.0),
@@ -345,17 +347,17 @@ _square_setup(Body_3D *square)
 static void
 _box_setup(Body_3D *box)
 {
-   box->primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(box->primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(box->primitive,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_CUBE));
 
-   box->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(box->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(box->mesh,
          evas_canvas3d_mesh_from_primitive_set(0, box->primitive));
 
    _body_material_set(box, 0, 1, 0);
 
-   box->node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(box->node, EVAS_CANVAS3D_NODE_CLASS, evas,
                       evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
    eo_do(box->node, evas_canvas3d_node_mesh_add(box->mesh),
          evas_canvas3d_node_position_set(3.0, 0.0, -3.0));
@@ -364,14 +366,14 @@ _box_setup(Body_3D *box)
 static void
 _model_setup(Body_3D *model)
 {
-   model->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(model->texture, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    eo_do(model->texture,
          evas_canvas3d_texture_file_set(image_path, NULL),
          evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
                                     EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST),
          evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
                                   EVAS_CANVAS3D_WRAP_MODE_REPEAT));
-   model->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+   eo_add(model->material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
 
    eo_do(model->material,
          evas_canvas3d_material_texture_set(EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, model->texture),
@@ -382,14 +384,14 @@ _model_setup(Body_3D *model)
          evas_canvas3d_material_shininess_set(100.0));
 
 
-   model->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(model->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(model->mesh,
          efl_file_set(model_path, NULL),
          evas_canvas3d_mesh_frame_material_set(0, model->material),
          evas_canvas3d_mesh_shade_mode_set(EVAS_CANVAS3D_SHADE_MODE_PHONG));
 
-   model->node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(model->node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
    eo_do(model->node, evas_canvas3d_node_mesh_add(model->mesh),
          evas_canvas3d_node_scale_set(0.1, 0.1, 0.1),
@@ -399,7 +401,7 @@ _model_setup(Body_3D *model)
 static void
 _billboard_setup(Scene_Data *data)
 {
-   data->billboard.texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+   eo_add(data->billboard.texture, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
    eo_do(data->billboard.texture,
          evas_canvas3d_texture_file_set(b_image_path, NULL),
          evas_canvas3d_texture_filter_set(EVAS_CANVAS3D_TEXTURE_FILTER_NEAREST,
@@ -407,11 +409,11 @@ _billboard_setup(Scene_Data *data)
          evas_canvas3d_texture_wrap_set(EVAS_CANVAS3D_WRAP_MODE_REPEAT,
                                   EVAS_CANVAS3D_WRAP_MODE_REPEAT));
 
-   data->billboard.primitive = eo_add(EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
+   eo_add(data->billboard.primitive, EVAS_CANVAS3D_PRIMITIVE_CLASS, evas);
    eo_do(data->billboard.primitive,
          evas_canvas3d_primitive_form_set(EVAS_CANVAS3D_MESH_PRIMITIVE_SQUARE));
 
-   data->billboard.mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+   eo_add(data->billboard.mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
    eo_do(data->billboard.mesh,
          evas_canvas3d_mesh_from_primitive_set(0, data->billboard.primitive));
 
@@ -429,7 +431,7 @@ _billboard_setup(Scene_Data *data)
          evas_canvas3d_mesh_blending_func_set(EVAS_CANVAS3D_BLEND_FUNC_SRC_ALPHA,
                                         EVAS_CANVAS3D_BLEND_FUNC_ONE_MINUS_SRC_ALPHA));
 
-   data->billboard.node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->billboard.node, EVAS_CANVAS3D_NODE_CLASS, evas,
                                  evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_MESH));
    eo_do(data->billboard.node,
          evas_canvas3d_node_mesh_add(data->billboard.mesh),
@@ -443,15 +445,15 @@ _billboard_setup(Scene_Data *data)
 static void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
-   data->mediator = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(data->mediator, EVAS_CANVAS3D_NODE_CLASS, evas,
                            evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
    eo_do(data->camera,
          evas_canvas3d_camera_projection_perspective_set(50.0, 1.0, 2.0, 100.0));
 
-  data->camera_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+  
+   eo_add(data->camera_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_CAMERA));
 
   eo_do(data->camera_node,
@@ -470,7 +472,7 @@ _camera_setup(Scene_Data *data)
 static void
 _light_setup(Scene_Data *data)
 {
-   data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
+   eo_add(data->light, EVAS_CANVAS3D_LIGHT_CLASS, evas);
    eo_do(data->light,
          evas_canvas3d_light_ambient_set(AMBIENT_LIGHT, 1.0),
          evas_canvas3d_light_diffuse_set(DIFFUSE_LIGHT, 1.0),
@@ -478,8 +480,8 @@ _light_setup(Scene_Data *data)
          evas_canvas3d_light_spot_cutoff_set(20),
          evas_canvas3d_light_projection_perspective_set(40.0, 1.0, 2.0, 1000.0));
 
-   data->light_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(data->light_node, 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),
@@ -494,14 +496,14 @@ _scene_setup(Scene_Data *data)
 {
    data->init = EINA_FALSE;
 
-   data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
+   eo_add(data->scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
 
    eo_do(data->scene,
          evas_canvas3d_scene_size_set(WIDTH, HEIGHT);
          evas_canvas3d_scene_background_color_set(BG_COLOR, 1));
 
-   data->root_node =
-      eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   
+   eo_add(data->root_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                     evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));
 
 
@@ -676,7 +678,7 @@ main(void)
    _scene_setup(&data);
 
    /* Add a background rectangle objects. */
-   background = eo_add(EVAS_RECTANGLE_CLASS, evas);
+   eo_add(background, EVAS_RECTANGLE_CLASS, evas);
    eo_do(background,
          efl_gfx_color_set(0, 0, 0, 255),
          efl_gfx_size_set(WIDTH, HEIGHT),
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index 9f17ee8313..a2ad39f9ee 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -174,7 +174,7 @@ main(void)
 
    /* Creating object with Eo.
     * Object must be deleted explixitly at the end of program.*/
-   d.bg = eo_add(EVAS_RECTANGLE_CLASS, d.canvas);
+   eo_add(d.bg, EVAS_RECTANGLE_CLASS, d.canvas);
 
    /* Eo-styled way to perform actions on an object*/
    eo_do(d.bg, evas_obj_name_set("background rectangle"),
@@ -187,7 +187,7 @@ main(void)
    evas_object_event_callback_add(
      d.bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, NULL);
 
-   d.img = eo_add(EVAS_IMAGE_CLASS, d.canvas);
+   eo_add(d.img, EVAS_IMAGE_CLASS, d.canvas);
 
    /* As soon as 'canvas' object is a parent for 'image' object,
     * 'canvas' keeps reference to 'image'.
@@ -214,7 +214,7 @@ main(void)
      }
 
    /* border on the image's clipper, here just to emphasize its position */
-   d.clipper_border = eo_add(EVAS_IMAGE_CLASS, d.canvas);
+   eo_add(d.clipper_border, EVAS_IMAGE_CLASS, d.canvas);
    eo_do(d.clipper_border, evas_obj_image_filled_set(EINA_TRUE),
                            efl_file_set(border_img_path, NULL),
                            err = evas_obj_image_load_error_get());
@@ -235,7 +235,7 @@ main(void)
    /* solid white clipper (note that it's the default color for a
     * rectangle) - it won't change clippees' colors, then (multiplying
     * by 255) */
-   d.clipper = eo_add(EVAS_RECTANGLE_CLASS, d.canvas);
+   eo_add(d.clipper, EVAS_RECTANGLE_CLASS, d.canvas);
 
    eo_do(d.clipper,
          efl_gfx_position_set( WIDTH / 4, HEIGHT / 4),
diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c
index 5e0b0e4017..3d5a716a09 100644
--- a/src/examples/evas/evas-vg-simple.c
+++ b/src/examples/evas/evas-vg-simple.c
@@ -449,18 +449,22 @@ vector_set(int x, int y, int w, int h)
    root = evas_object_vg_root_node_get(d.vg);
    //eo_do(root, evas_vg_node_transformation_set(&matrix));
 
-   Efl_VG *bg = eo_add(EFL_VG_SHAPE_CLASS, root,
+   Efl_VG *bg;
+   eo_add(bg, EFL_VG_SHAPE_CLASS, root,
                        efl_vg_name_set("bg"));
    _rect_add(bg, 0, 0 , vg_w, vg_h);
    evas_vg_node_origin_set(bg, 0,0);
    evas_vg_shape_stroke_width_set(bg, 1.0);
    evas_vg_node_color_set(bg, 80, 80, 80, 80);
 
-   Efl_VG *shape = eo_add(EFL_VG_SHAPE_CLASS, root,
+   Efl_VG *shape;
+   eo_add(shape, EFL_VG_SHAPE_CLASS, root,
                           efl_vg_name_set("shape"));
-   Efl_VG *rgradient = eo_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL,
+   Efl_VG *rgradient;
+   eo_add(rgradient, EFL_VG_GRADIENT_RADIAL_CLASS, NULL,
                               efl_vg_name_set("rgradient"));
-   Efl_VG *lgradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL,
+   Efl_VG *lgradient;
+   eo_add(lgradient, EFL_VG_GRADIENT_LINEAR_CLASS, NULL,
                               efl_vg_name_set("lgradient"));
 
    _arcto(shape, 0, 0, 100, 100, 25, 330);
@@ -502,7 +506,8 @@ vector_set(int x, int y, int w, int h)
    evas_vg_node_color_set(shape, 0, 0, 255, 255);
    evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 128);
 
-   Efl_VG *rect = eo_add(EFL_VG_SHAPE_CLASS, root,
+   Efl_VG *rect;
+   eo_add(rect, EFL_VG_SHAPE_CLASS, root,
                          efl_vg_name_set("rect"));
    _rect_add(rect, 0, 0, 100, 100);
    evas_vg_node_origin_set(rect, 100, 100);
@@ -511,7 +516,8 @@ vector_set(int x, int y, int w, int h)
    evas_vg_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND);
    evas_vg_shape_stroke_color_set(rect, 255, 255, 255, 255);
 
-   Efl_VG *rect1 = eo_add(EFL_VG_SHAPE_CLASS, root,
+   Efl_VG *rect1;
+   eo_add(rect1, EFL_VG_SHAPE_CLASS, root,
                           efl_vg_name_set("rect1"));
    _rect_add(rect1, 0, 0, 70, 70);
    evas_vg_node_origin_set(rect1, 50, 70);
@@ -520,7 +526,8 @@ vector_set(int x, int y, int w, int h)
    evas_vg_shape_stroke_join_set(rect1, EFL_GFX_JOIN_ROUND);
    evas_vg_shape_stroke_color_set(rect1, 0, 100, 80, 100);
 
-   Efl_VG *circle = eo_add(EFL_VG_SHAPE_CLASS, root,
+   Efl_VG *circle;
+   eo_add(circle, EFL_VG_SHAPE_CLASS, root,
                            efl_vg_name_set("circle"));
    _arcto(circle, 0, 0, 250, 100, 30, 300);
    evas_vg_shape_fill_set(circle, lgradient);
@@ -529,7 +536,8 @@ vector_set(int x, int y, int w, int h)
    evas_vg_node_color_set(circle, 50, 0, 0, 50);
 
    // Foreground
-   Efl_VG *fg = eo_add(EFL_VG_SHAPE_CLASS, root,
+   Efl_VG *fg;
+   eo_add(fg, EFL_VG_SHAPE_CLASS, root,
                        efl_vg_name_set("fg"));
    _rect_add(fg, 0, 0, vg_w, vg_h);
    evas_vg_node_origin_set(fg, 0, 0);
@@ -537,23 +545,25 @@ vector_set(int x, int y, int w, int h)
    evas_vg_shape_stroke_join_set(fg, EFL_GFX_JOIN_ROUND);
    evas_vg_shape_stroke_color_set(fg, 70, 70, 0, 70);
 
-   Efl_VG *tst = eo_add(EFL_VG_SHAPE_CLASS, root,
+   Efl_VG *tst;
+   eo_add(tst, EFL_VG_SHAPE_CLASS, root,
                         efl_vg_name_set("tst"));
    evas_vg_shape_shape_append_rect(tst, 50, 25, 200, 200, 3, 5);
    evas_vg_node_color_set(tst, 0, 0, 200, 200);
    evas_vg_shape_stroke_width_set(tst, 2);
    evas_vg_shape_stroke_color_set(tst, 255, 0, 0, 255);
 
-   Efl_VG *vc = eo_add(EFL_VG_SHAPE_CLASS, root,
+   Efl_VG *vc;
+   eo_add(vc, EFL_VG_SHAPE_CLASS, root,
                          efl_vg_name_set("vc"));
    evas_vg_shape_shape_append_circle(vc, 100, 100, 23);
    evas_vg_node_color_set(vc, 0, 200, 0, 255);
    evas_vg_shape_stroke_width_set(vc, 4);
    evas_vg_shape_stroke_color_set(vc, 255, 0, 0, 255);
 
-   beginning = eo_add(EFL_VG_CONTAINER_CLASS, NULL,
+   eo_add(beginning, EFL_VG_CONTAINER_CLASS, NULL,
                       efl_vg_dup(root));
-   end = eo_add(EFL_VG_CONTAINER_CLASS, NULL,
+   eo_add(end, EFL_VG_CONTAINER_CLASS, NULL,
                 efl_vg_dup(root));
 
    eo_do(end, circle = efl_vg_container_child_get("circle"));
diff --git a/src/examples/evas/shooter/evas-3d-shooter-header.c b/src/examples/evas/shooter/evas-3d-shooter-header.c
index 894df546f0..c55be83338 100644
--- a/src/examples/evas/shooter/evas-3d-shooter-header.c
+++ b/src/examples/evas/shooter/evas-3d-shooter-header.c
@@ -26,13 +26,13 @@ _distance(float x1, float z1, float x2, float z2)
 void
 _camera_setup(Scene_Data *data)
 {
-   data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
+   eo_add(data->camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
    eo_do(data->camera,
          evas_canvas3d_camera_projection_perspective_set(65.0, 1.0, 1.0, 300.0));
 
-   data->mediator_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas,
+   eo_add(data->mediator_node, EVAS_CANVAS3D_NODE_CLASS, evas,
                                        evas_canvas3d_node_constructor(EVAS_CANVAS3D_NODE_TYPE_NODE));