diff --git a/src/bin/about.c b/src/bin/about.c
index 57882de..f225b4a 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -8,7 +8,7 @@ _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   eo_add(&o, EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
    efl_gfx_position_set(o, 10, 40);
    efl_gfx_size_set(o, win_w - 20, win_h - 50);
    efl_gfx_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index 5f04033..9cff6df 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("bar.png"), NULL);
         evas_obj_image_border_set(o, 6, 6, 6, 6);
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index ed172e1..806cab7 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("pan.png"), NULL);
         efl_gfx_color_set(o, 64, 64, 64, 255);
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index 8c0445d..48964bf 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
      {
         int a;
 
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index eaff498..479e133 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -24,7 +24,7 @@ static void _setup(void)
    for (i = 0; i < OBNUM; i++)
      {
         int a;
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         a = rnd()&0xff;
         efl_file_set(o, build_path("logo.png"), NULL);
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index 956db17..7fb6d5e 100644
--- a/src/bin/image_blend_many_smooth_same_scaled.c
+++ b/src/bin/image_blend_many_smooth_same_scaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < MANYNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         n = rnd() % 100;
         w = 3 + ((n * (60 - 3)) / 100);
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 7033dbb..46dc638 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index d6e9d96..43b0fa1 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index 90a6e89..99fad1c 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index a36df6c..561c52d 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index 6c3cd41..1a7c59d 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -24,7 +24,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index d03c7d4..bec28f5 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index b71adcc..00c988b 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index 5bed1ce..65f7b77 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 9d2d064..7853fcd 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -24,7 +24,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index a7d0a56..4d5668d 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index 351d2e6..b5e643a 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index 26e9a23..3db2b7f 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i & 0x1)
           {
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index dbf9093..6c60261 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -24,7 +24,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index 3be0e3d..daf4e68 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index 2b48835..9485048 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index 06b7c87..2b1423f 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index 27f4d86..a71d5dc 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_image_smooth_scale_set(o, 1);
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index e1ef394..f6ccf32 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_image_smooth_scale_set(o, 1);
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index 185e144..54512d1 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_image_smooth_scale_set(o, 1);
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index 6e87219..6e3078a 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_image_smooth_scale_set(o, 1);
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index 4f92278..15430dc 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("frame.png"), NULL);
         evas_obj_image_border_set(o, 8, 8, 8, 8);
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 624c8ee..74cf9ba 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
      {
         int a;
 
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index 37c016b..a0f35d4 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
      {
         int a;
 
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index c105a45..bf5636f 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("bar.png"), NULL);
         evas_obj_image_border_set(o, 6, 6, 6, 6);
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index 06bac88..d607b25 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index 0970294..7ad5f02 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index 2b7628b..139f565 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index 30a0880..2345130 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -22,14 +22,14 @@ static void _setup(void)
 {
    Evas_Object *o;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_images[0] = o;
    efl_file_set(o, build_path("im1.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
    efl_gfx_size_set(o, 720, 420);
    efl_gfx_visible_set(o, EINA_TRUE);
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_images[1] = o;
    efl_file_set(o, build_path("im2.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index e849490..9d1bca5 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888);
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index 95f9b37..714e092 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888);
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index a6e59e1..42a20a5 100644
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
index 7dc61f9..bc9840c 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index 4e293d5..c6e60bc 100644
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index cb2ad71..f6690b9 100644
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@@ -27,7 +27,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         evas_obj_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
         evas_obj_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index f92a2d2..03f0986 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         efl_file_set(o, build_path(buf), NULL);
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index 1f27e45..e925987 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         efl_file_set(o, build_path(buf), NULL);
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index 785292c..c7acb0f 100644
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         efl_file_set(o, build_path(buf), NULL);
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index c6b03f0..3ccf903 100644
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
         efl_file_set(o, build_path(buf), NULL);
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index 6a0bacb..529104c 100644
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
         efl_file_set(o, build_path(buf), NULL);
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index 2f8298d..a6c84cf 100644
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
      {
         Evas_Object *o;
         char buf[256];
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
         efl_file_set(o, build_path(buf), NULL);
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index 6c726c2..6f60976 100644
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -29,7 +29,7 @@ static void _setup(void)
      {
         char buf[256];
 
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
         efl_file_set(o, build_path(buf), NULL);
@@ -38,7 +38,7 @@ static void _setup(void)
         efl_image_smooth_scale_set(o, 0);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_reflec[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
         efl_file_set(o, build_path(buf), NULL);
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index 3b50c7d..c59442b 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_map_color_alpha_nearest_solid_rotate.c b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
index 52e522c..230bf90 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index a9d40a8..7483e2e 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index 67a801a..075a10a 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index addac92..e1b0038 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index 48415a0..c776155 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index 35a6741..2f5053c 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index 075c044..ad7690e 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index b959fdc..ead9e9b 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index d058361..08f4db2 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index 7a05604..2289781 100644
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
 	efl_file_set(o, build_path("logo.png"), NULL);
 	efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index 796c8c1..38302b2 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < (OBNUM / 2); i++)
      {
-	eo_add(&o, EVAS_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_mask.c b/src/bin/image_mask.c
index 48595f7..b757324 100644
--- a/src/bin/image_mask.c
+++ b/src/bin/image_mask.c
@@ -23,14 +23,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i+= 2)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
         efl_gfx_size_set(o, 120, 160);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i + 1] = o;
         efl_file_set(o, build_path("e-logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_mask_10.c b/src/bin/image_mask_10.c
index b17db12..03862d8 100644
--- a/src/bin/image_mask_10.c
+++ b/src/bin/image_mask_10.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < 1; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("texture.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, win_w * 4, win_h * 4);
diff --git a/src/bin/image_mask_11.c b/src/bin/image_mask_11.c
index 8f75b18..eadacb4 100644
--- a/src/bin/image_mask_11.c
+++ b/src/bin/image_mask_11.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_mask_12.c b/src/bin/image_mask_12.c
index 041e564..bba8768 100644
--- a/src/bin/image_mask_12.c
+++ b/src/bin/image_mask_12.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_mask_13.c b/src/bin/image_mask_13.c
index 0bebd5c..979b0a0 100644
--- a/src/bin/image_mask_13.c
+++ b/src/bin/image_mask_13.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_mask_2.c b/src/bin/image_mask_2.c
index eff5101..db87b90 100644
--- a/src/bin/image_mask_2.c
+++ b/src/bin/image_mask_2.c
@@ -23,14 +23,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i+= 2)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("image.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
         efl_gfx_size_set(o, 120, 160);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i + 1] = o;
         efl_file_set(o, build_path("e-logo-2.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_mask_3.c b/src/bin/image_mask_3.c
index 3af97ba..a3075af 100644
--- a/src/bin/image_mask_3.c
+++ b/src/bin/image_mask_3.c
@@ -23,14 +23,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i+= 2)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("e-logo-2.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
         efl_gfx_size_set(o, 120, 160);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i + 1] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_mask_4.c b/src/bin/image_mask_4.c
index 74359f3..90ab4b5 100644
--- a/src/bin/image_mask_4.c
+++ b/src/bin/image_mask_4.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_mask_5.c b/src/bin/image_mask_5.c
index bbb5e13..53fa584 100644
--- a/src/bin/image_mask_5.c
+++ b/src/bin/image_mask_5.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-2.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_mask_6.c b/src/bin/image_mask_6.c
index 324087c..8e5684d 100644
--- a/src/bin/image_mask_6.c
+++ b/src/bin/image_mask_6.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120 / 2, 160 / 2);
diff --git a/src/bin/image_mask_7.c b/src/bin/image_mask_7.c
index 5a9a3c1..13c8d76 100644
--- a/src/bin/image_mask_7.c
+++ b/src/bin/image_mask_7.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-2.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("logo.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 120, 160);
diff --git a/src/bin/image_mask_8.c b/src/bin/image_mask_8.c
index bdb4556..b31c624 100644
--- a/src/bin/image_mask_8.c
+++ b/src/bin/image_mask_8.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < 1; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("texture.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 500, 444);
diff --git a/src/bin/image_mask_9.c b/src/bin/image_mask_9.c
index 4d8062c..9289952 100644
--- a/src/bin/image_mask_9.c
+++ b/src/bin/image_mask_9.c
@@ -23,7 +23,7 @@ static void _setup(void)
    int i;
    Evas_Object *o;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_mask = o;
    efl_file_set(o, build_path("e-logo-mask.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
 
    for (i = 0; i < 1; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path("texture.png"), NULL);
         efl_gfx_fill_set(o, 0, 0, 500, 444);
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index 965357d..34f61fc 100644
--- a/src/bin/image_quality_scale.c
+++ b/src/bin/image_quality_scale.c
@@ -24,7 +24,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
-	eo_add(&o, EVAS_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_images[i] = o;
 	efl_file_set(o, build_path("tp.png"), NULL);
 	efl_gfx_fill_set(o, 0, 0, 640, 480);
diff --git a/src/bin/line_blend.c b/src/bin/line_blend.c
index 289b81d..9deeb18 100644
--- a/src/bin/line_blend.c
+++ b/src/bin/line_blend.c
@@ -26,7 +26,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-        eo_add(&o, EVAS_LINE_CLASS, evas);
+        o = eo_add(EVAS_LINE_CLASS, evas);
 	o_images[i] = o;
 	a = (rnd()&0xff) / 2;
 	r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/poly_blend.c b/src/bin/poly_blend.c
index 92f5970..54b6951 100644
--- a/src/bin/poly_blend.c
+++ b/src/bin/poly_blend.c
@@ -73,7 +73,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-        eo_add(&o, EVAS_POLYGON_CLASS, evas);
+        o = eo_add(EVAS_POLYGON_CLASS, evas);
 	o_images[i] = o;
 	a = (rnd()&0xff) / 2;
 	r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index 69c0c10..df2b4ab 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -22,7 +22,7 @@ static void _setup(void)
    int i;
    Evas_Object *o,*src;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    efl_file_set(o, build_path("logo.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 120, 160);
    efl_gfx_size_set(o, 120, 160);
@@ -32,7 +32,7 @@ static void _setup(void)
 
    for (i = 1; i < OBNUM; i++)
      {
-	eo_add(&o, EVAS_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_images[i] = o;
         evas_obj_image_source_set(o, src);
         efl_gfx_size_set(o, 120, 160);
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index 05f8d3f..5e4fb80 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -26,7 +26,7 @@ static void _setup(void)
    int i;
    Evas_Object *o,*src;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    efl_file_set(o, build_path("logo.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 120, 160);
    efl_gfx_size_set(o, 120, 160);
@@ -35,7 +35,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM / 2; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         evas_obj_image_source_set(o, src, NULL);
         efl_gfx_size_set(o, 120, 160);
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 7171f3c..0d8ec83 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -27,7 +27,7 @@ static void _setup(void)
    st = EVAS_TEXT_STYLE_SHADOW;
    for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++)
      {
-	eo_add(&o, EVAS_TEXT_CLASS, evas);
+	o = eo_add(EVAS_TEXT_CLASS, evas);
 	o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 20);
         efl_text_set(o, "This is a test string");
@@ -45,7 +45,7 @@ static void _setup(void)
    for (  ; i < OBNUM ; i ++)
      {
 	s = o_texts[i % st];
-	eo_add(&o, EVAS_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_texts[i] = o;
         evas_obj_image_source_set(o, s);
         /* FIXME s == NULL*/
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index 490b059..eed870c 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -30,7 +30,7 @@ static void _setup(void)
 	"Fiddly", "Family", "Lair", "Monkeys", "Magazine"
    };
    srnd();
-   eo_add(&o, EVAS_TEXT_CLASS, evas);
+   o = eo_add(EVAS_TEXT_CLASS, evas);
    o_texts[0] = o;
    snprintf(buf, sizeof(buf), "%s %s %s %s.",
             strs[rnd() % (sizeof(strs) / sizeof(char *))],
@@ -50,7 +50,7 @@ static void _setup(void)
    efl_gfx_visible_set(o, EINA_TRUE);
    for (i = 1  ; i < OBNUM ; i ++)
      {
-	eo_add(&o, EVAS_IMAGE_CLASS, evas);
+	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_texts[i] = o;
 	evas_obj_image_source_set(o, o_texts[0]);
 	efl_gfx_size_get(o_texts[0], &w, &h);
diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c
index 312efb6..51dcaf6 100644
--- a/src/bin/rect_blend.c
+++ b/src/bin/rect_blend.c
@@ -26,7 +26,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	eo_add(&o, EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = rnd()&0xff;
 	r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c
index c29fa88..fac3244 100644
--- a/src/bin/rect_blend_few.c
+++ b/src/bin/rect_blend_few.c
@@ -29,7 +29,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	eo_add(&o, EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = rnd()&0xff;
 	r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c
index 7a9bd01..31fef38 100644
--- a/src/bin/rect_blend_pow2.c
+++ b/src/bin/rect_blend_pow2.c
@@ -26,7 +26,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	eo_add(&o, EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c
index f0b7510..214602b 100644
--- a/src/bin/rect_blend_pow2_few.c
+++ b/src/bin/rect_blend_pow2_few.c
@@ -29,7 +29,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	eo_add(&o, EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c
index 45f7303..fbd2d46 100644
--- a/src/bin/rect_solid.c
+++ b/src/bin/rect_solid.c
@@ -26,7 +26,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	eo_add(&o, EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = 0xff;
 	r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c
index 1577a18..568c011 100644
--- a/src/bin/rect_solid_few.c
+++ b/src/bin/rect_solid_few.c
@@ -29,7 +29,7 @@ static void _setup(void)
      {
 	int r, g, b, a;
 
-	eo_add(&o, EVAS_RECTANGLE_CLASS, evas);
+	o = eo_add(EVAS_RECTANGLE_CLASS, evas);
 	o_images[i] = o;
 	a = 0xff;
 	r = ((rnd()&0xff) * a) / 255;
diff --git a/src/bin/snapshot_widgets_file_icons.c b/src/bin/snapshot_widgets_file_icons.c
index 0cbaa29..328073a 100644
--- a/src/bin/snapshot_widgets_file_icons.c
+++ b/src/bin/snapshot_widgets_file_icons.c
@@ -54,7 +54,7 @@ static void _setup(void)
      {
         Evas_Coord tw, th, cent;
 
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -62,7 +62,7 @@ static void _setup(void)
         efl_gfx_position_set(o, x + 8, y);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, icons[i % 13]);
@@ -85,7 +85,7 @@ static void _setup(void)
       "blur { 5, dst = a, color = '#ff0' }"
      ;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_snap = o;
    efl_gfx_visible_set(o, EINA_TRUE);
    efl_gfx_position_set(o, 50, 50);
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index 6c79552..31fa0d5 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -25,7 +25,7 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 20);
         efl_text_set(o, "This is a test string");
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index 0504a8c..aa7b594 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -32,7 +32,7 @@ static void _setup(void)
    srnd();
    for (i = 0; i < OBNUM; i++)
      {
-	eo_add(&o, EVAS_TEXT_CLASS, evas);
+	o = eo_add(EVAS_TEXT_CLASS, evas);
 	o_texts[i] = o;
 	efl_text_properties_font_set(o, "Vera-Bold", 20);
         snprintf(buf, sizeof(buf), "%s %s %s %s.",
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index 7b925af..44c6576 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -27,7 +27,7 @@ static void _setup(void)
    st = EVAS_TEXT_STYLE_SHADOW;
    for (i = 0; i < OBNUM; i++)
      {
-	eo_add(&o, EVAS_TEXT_CLASS, evas);
+	o = eo_add(EVAS_TEXT_CLASS, evas);
 	o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 20);
         efl_text_set(o, "This is a test string");
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index b49101f..48e4fd4 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -34,7 +34,7 @@ static void _setup(void)
    st = EVAS_TEXT_STYLE_SHADOW;
    for (i = 0; i < OBNUM; i++)
      {
-	eo_add(&o, EVAS_TEXT_CLASS, evas);
+	o = eo_add(EVAS_TEXT_CLASS, evas);
 	o_texts[i] = o;
 	efl_text_properties_font_set(o, "Vera-Bold", 20);
 	snprintf(buf, sizeof(buf), "%s %s %s %s.",
diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c
index d2e0048..d5d6dac 100644
--- a/src/bin/textblock_auto_align.c
+++ b/src/bin/textblock_auto_align.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   eo_add(&o, EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
    o_text = o;
    st = evas_textblock_style_new();
    evas_textblock_style_set
diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c
index d9451fd..3b7bb50 100644
--- a/src/bin/textblock_basic.c
+++ b/src/bin/textblock_basic.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   eo_add(&o, EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
    o_text = o;
    st = evas_textblock_style_new();
    evas_textblock_style_set
diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c
index 285113d..1768c86 100644
--- a/src/bin/textblock_intl.c
+++ b/src/bin/textblock_intl.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   eo_add(&o, EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
    o_text = o;
    st = evas_textblock_style_new();
    evas_textblock_style_set
diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c
index ddc8ad7..3168b76 100644
--- a/src/bin/textblock_text_append.c
+++ b/src/bin/textblock_text_append.c
@@ -23,7 +23,7 @@ static void _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   eo_add(&o, EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
    o_text = o;
    st = evas_textblock_style_new();
    evas_textblock_style_set
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 7caf36f..75c6ec0 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -356,7 +356,7 @@ _ui_menu_item_full_add(Eina_Bool test,
    Menu_Item *mi;
 
    mi = malloc(sizeof(Menu_Item));
-   eo_add(&mi->o_icon, EVAS_IMAGE_CLASS, evas);
+   mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas);
    efl_file_set(mi->o_icon, build_path(icon), NULL);
    efl_gfx_size_set(mi->o_icon, 32, 32);
    efl_gfx_fill_set(mi->o_icon, 0, 0, 32, 32);
@@ -385,7 +385,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    win_w = ui_w;
    win_h = ui_h;
 
-   eo_add(&o, EVAS_RECTANGLE_CLASS, evas);
+   o = eo_add(EVAS_RECTANGLE_CLASS, evas);
    efl_gfx_position_set(o, 0, 0);
    efl_gfx_size_set(o, win_w, win_h);
    efl_gfx_color_set(o, 0, 0, 0, 0);
@@ -395,7 +395,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    eo_event_callback_array_add(o, ui_callbacks(), NULL);
    o_bg = o;
 
-   eo_add(&o, EVAS_RECTANGLE_CLASS, evas);
+   o = eo_add(EVAS_RECTANGLE_CLASS, evas);
    efl_gfx_position_set(o, 0, 0);
    efl_gfx_size_set(o, win_w, win_h);
    efl_gfx_color_set(o, 255, 255, 255, 255);
@@ -403,7 +403,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    efl_gfx_visible_set(o, EINA_TRUE);
    o_wallpaper = o;
 
-   eo_add(&o, EVAS_TEXT_CLASS, evas);
+   o = eo_add(EVAS_TEXT_CLASS, evas);
    efl_text_properties_font_set(o, "Vera-Bold", 10);
    efl_text_set(o, "EXPEDITE");
    efl_gfx_stack_layer_set(o, 100);
@@ -416,7 +416,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    efl_gfx_visible_set(o, EINA_TRUE);
    o_title = o;
 
-   eo_add(&o, EVAS_TEXT_CLASS, evas);
+   o = eo_add(EVAS_TEXT_CLASS, evas);
    efl_text_properties_font_set(o, "Vera", 9);
    efl_text_set(o, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.");
    efl_gfx_stack_layer_set(o, 100);
@@ -429,7 +429,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    efl_gfx_visible_set(o, EINA_TRUE);
    o_byline = o;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    efl_gfx_position_set(o, (win_w - 120) / 2, ((win_h - 160) / 2));
    efl_file_set(o, build_path("e-logo.png"), NULL);
    efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -439,21 +439,21 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    efl_gfx_visible_set(o, EINA_TRUE);
    o_menu_logo = o;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    efl_gfx_position_set(o, win_w - 128, - 128);
    efl_gfx_fill_set(o, 0, 0, 256, 256);
    efl_gfx_size_set(o, 256, 256);
    efl_gfx_visible_set(o, EINA_TRUE);
    o_menu_icon = o;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    efl_gfx_position_set(o, 0, 0);
    efl_file_set(o, build_path("icon_sel.png"), NULL);
    efl_gfx_size_set(o, 48, 48);
    efl_gfx_fill_set(o, 0, 0, 48, 48);
    o_menu_icon_sel = o;
 
-   eo_add(&o, EVAS_IMAGE_CLASS, evas);
+   o = eo_add(EVAS_IMAGE_CLASS, evas);
    efl_gfx_position_set(o, 0, 0);
    efl_file_set(o, build_path("text_sel.png"), NULL);
    efl_gfx_size_set(o, 96, 32);
@@ -461,7 +461,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    evas_obj_image_border_set(o, 7, 7, 7, 7);
    o_menu_text_sel = o;
 
-   eo_add(&o, EVAS_TEXT_CLASS, evas);
+   o = eo_add(EVAS_TEXT_CLASS, evas);
    efl_text_properties_font_set(o, "Vera", 10);
    efl_text_set(o, "");
    efl_gfx_color_set(o, 0, 0, 0, 100);
diff --git a/src/bin/vg_basic_circle.c b/src/bin/vg_basic_circle.c
index fe15b64..a06e4ff 100644
--- a/src/bin/vg_basic_circle.c
+++ b/src/bin/vg_basic_circle.c
@@ -30,7 +30,7 @@ static void _setup(void)
         Eo *vector;
         double r = 35, stroke_w = 3;
 
-        eo_add(&vector, EVAS_VG_CLASS, evas);
+        vector = eo_add(EVAS_VG_CLASS, evas);
         o_shapes[i] = vector;
         efl_gfx_size_set(vector, r * 2 + stroke_w * 2, r * 2 + stroke_w * 2);
         efl_gfx_position_set(vector, 0, 0);
@@ -38,7 +38,7 @@ static void _setup(void)
 
         root = evas_obj_vg_root_node_get(vector);
 
-        eo_add(&circle, EFL_VG_SHAPE_CLASS, root);
+        circle = eo_add(EFL_VG_SHAPE_CLASS, root);
         efl_gfx_shape_append_circle(circle, r + stroke_w, r + stroke_w, r);
         efl_gfx_shape_stroke_width_set(circle, stroke_w);
         efl_gfx_shape_stroke_color_set(circle, 128, 0, 128, 128);
diff --git a/src/bin/vg_basic_gradient.c b/src/bin/vg_basic_gradient.c
index b3a4a5a..1a0a0e9 100644
--- a/src/bin/vg_basic_gradient.c
+++ b/src/bin/vg_basic_gradient.c
@@ -36,7 +36,7 @@ static void _setup(void)
         Eo *vector;
         double w = 70, h = 70, stroke_w = 3;
 
-        eo_add(&vector, EVAS_VG_CLASS, evas);
+        vector = eo_add(EVAS_VG_CLASS, evas);
         o_shapes[i] = vector;
         efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2);
         efl_gfx_position_set(vector, 0, 0);
@@ -44,13 +44,13 @@ static void _setup(void)
 
         root = evas_obj_vg_root_node_get(vector);
 
-        eo_add(&gradient, EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
+        gradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
         efl_gfx_gradient_stop_set(gradient, stops, 3);
         efl_gfx_gradient_spread_set(gradient, EFL_GFX_GRADIENT_SPREAD_REFLECT);
         efl_gfx_gradient_linear_start_set(gradient, 10, 10);
         efl_gfx_gradient_linear_end_set(gradient, 50, 50);
 
-        eo_add(&rect, EFL_VG_SHAPE_CLASS, root);
+        rect = eo_add(EFL_VG_SHAPE_CLASS, root);
         efl_gfx_shape_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
         efl_vg_shape_fill_set(rect, gradient);
         efl_gfx_shape_stroke_width_set(rect, stroke_w);
diff --git a/src/bin/vg_basic_rect.c b/src/bin/vg_basic_rect.c
index 15eb735..fa8a21e 100644
--- a/src/bin/vg_basic_rect.c
+++ b/src/bin/vg_basic_rect.c
@@ -30,7 +30,7 @@ static void _setup(void)
         Eo *vector;
         double w = 70, h = 70, stroke_w = 3;
 
-        eo_add(&vector, EVAS_VG_CLASS, evas);
+        vector = eo_add(EVAS_VG_CLASS, evas);
         o_shapes[i] = vector;
         efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2);
         efl_gfx_position_set(vector, 0, 0);
@@ -38,7 +38,7 @@ static void _setup(void)
 
         root = evas_obj_vg_root_node_get(vector);
 
-        eo_add(&rect, EFL_VG_SHAPE_CLASS, root);
+        rect = eo_add(EFL_VG_SHAPE_CLASS, root);
         efl_gfx_shape_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
         efl_gfx_shape_stroke_width_set(rect, stroke_w);
         efl_gfx_shape_stroke_color_set(rect, 128, 0, 128, 128);
diff --git a/src/bin/vg_scaled.c b/src/bin/vg_scaled.c
index eda7213..6ac272e 100644
--- a/src/bin/vg_scaled.c
+++ b/src/bin/vg_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
         Eo *vector;
         double w = 70, h = 70, stroke_w = 3;
 
-        eo_add(&vector, EVAS_VG_CLASS, evas);
+        vector = eo_add(EVAS_VG_CLASS, evas);
         o_objects[i] = vector;
         efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2);
         efl_gfx_position_set(vector, 0, 0);
@@ -44,13 +44,13 @@ static void _setup(void)
 
         root = evas_obj_vg_root_node_get(vector);
 
-        o_gradient[i] = gradient = eo_add(&gradient, EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
+        o_gradient[i] = gradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
         efl_gfx_gradient_stop_set(gradient, stops, 3);
         efl_gfx_gradient_spread_set(gradient, EFL_GFX_GRADIENT_SPREAD_REFLECT);
         efl_gfx_gradient_linear_start_set(gradient, 10, 10);
         efl_gfx_gradient_linear_end_set(gradient, 50, 50);
 
-        o_shapes[i] = rect = eo_add(&rect, EFL_VG_SHAPE_CLASS, root);
+        o_shapes[i] = rect = eo_add(EFL_VG_SHAPE_CLASS, root);
         efl_gfx_shape_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
         efl_vg_shape_fill_set(rect, gradient);
         efl_gfx_shape_stroke_width_set(rect, stroke_w);
diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c
index 5e7c788..25a5dd3 100644
--- a/src/bin/widgets_file_icons.c
+++ b/src/bin/widgets_file_icons.c
@@ -46,14 +46,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
         efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, icons[i % 13]);
diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c
index b7589c1..03e715b 100644
--- a/src/bin/widgets_file_icons_2.c
+++ b/src/bin/widgets_file_icons_2.c
@@ -46,14 +46,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
         efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, icons[i % 13]);
diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c
index 45e73c0..7f14482 100644
--- a/src/bin/widgets_file_icons_2_grouped.c
+++ b/src/bin/widgets_file_icons_2_grouped.c
@@ -46,14 +46,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
         efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, icons[i % 13]);
diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
index 2d7d9c3..113cc5b 100644
--- a/src/bin/widgets_file_icons_2_same.c
+++ b/src/bin/widgets_file_icons_2_same.c
@@ -31,14 +31,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 1]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
         efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, icons[i % 1]);
diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c
index 91b81df..5b631b9 100644
--- a/src/bin/widgets_file_icons_2_same_grouped.c
+++ b/src/bin/widgets_file_icons_2_same_grouped.c
@@ -31,14 +31,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 1]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
         efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, icons[i % 1]);
diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c
index c76b270..be9f393 100644
--- a/src/bin/widgets_file_icons_3.c
+++ b/src/bin/widgets_file_icons_3.c
@@ -46,14 +46,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
         efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, icons[i % 13]);
diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c
index 9dcbe53..a23ce7b 100644
--- a/src/bin/widgets_file_icons_4.c
+++ b/src/bin/widgets_file_icons_4.c
@@ -46,14 +46,14 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         efl_file_set(o, build_path(icons[i % 13]), NULL);
         efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
         efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, icons[i % 13]);
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index 9d2f86e..b0e9085 100644
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@@ -62,7 +62,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         evas_obj_image_filled_set(o, 1);
         evas_obj_image_border_set(o, 2, 2, 2, 2);
@@ -70,7 +70,7 @@ static void _setup(void)
         efl_gfx_size_set(o, win_w, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, labels[i % 26]);
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index 66c992f..07c9d87 100644
--- a/src/bin/widgets_list_1_grouped.c
+++ b/src/bin/widgets_list_1_grouped.c
@@ -62,7 +62,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         evas_obj_image_filled_set(o, 1);
         evas_obj_image_border_set(o, 2, 2, 2, 2);
@@ -70,7 +70,7 @@ static void _setup(void)
         efl_gfx_size_set(o, win_w, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, labels[i % 26]);
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index 21a5a4d..e232d7d 100644
--- a/src/bin/widgets_list_2.c
+++ b/src/bin/widgets_list_2.c
@@ -62,7 +62,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         evas_obj_image_filled_set(o, 1);
         evas_obj_image_border_set(o, 2, 2, 2, 2);
@@ -70,7 +70,7 @@ static void _setup(void)
         efl_gfx_size_set(o, win_w, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, labels[i % 26]);
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index ab20674..c3da64a 100644
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@@ -62,7 +62,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         evas_obj_image_filled_set(o, 1);
         evas_obj_image_border_set(o, 2, 2, 2, 2);
@@ -70,7 +70,7 @@ static void _setup(void)
         efl_gfx_size_set(o, win_w, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, labels[i % 26]);
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index f197e60..8e6af2c 100644
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@@ -83,7 +83,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         evas_obj_image_filled_set(o, 1);
         evas_obj_image_border_set(o, 2, 2, 2, 2);
@@ -91,7 +91,7 @@ static void _setup(void)
         efl_gfx_size_set(o, win_w, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         evas_obj_image_filled_set(o, 1);
         evas_obj_image_border_set(o, 2, 2, 2, 2);
@@ -99,7 +99,7 @@ static void _setup(void)
         efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, labels[i % 26]);
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index b6f3bcc..dda2692 100644
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@@ -83,7 +83,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         evas_obj_image_filled_set(o, 1);
         evas_obj_image_border_set(o, 2, 2, 2, 2);
@@ -91,7 +91,7 @@ static void _setup(void)
         efl_gfx_size_set(o, win_w, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         evas_obj_image_filled_set(o, 1);
         evas_obj_image_border_set(o, 2, 2, 2, 2);
@@ -99,7 +99,7 @@ static void _setup(void)
         efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, labels[i % 26]);
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index cb65a59..2779b63 100644
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@@ -83,7 +83,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         evas_obj_image_filled_set(o, 1);
         evas_obj_image_border_set(o, 2, 2, 2, 2);
@@ -91,7 +91,7 @@ static void _setup(void)
         efl_gfx_size_set(o, win_w, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         evas_obj_image_filled_set(o, 1);
         evas_obj_image_border_set(o, 2, 2, 2, 2);
@@ -99,7 +99,7 @@ static void _setup(void)
         efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, labels[i % 26]);
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
index 56face9..8283151 100644
--- a/src/bin/widgets_list_4_grouped.c
+++ b/src/bin/widgets_list_4_grouped.c
@@ -83,7 +83,7 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         evas_obj_image_filled_set(o, 1);
         evas_obj_image_border_set(o, 2, 2, 2, 2);
@@ -91,7 +91,7 @@ static void _setup(void)
         efl_gfx_size_set(o, win_w, ICON_SIZE);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_IMAGE_CLASS, evas);
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_icons[i] = o;
         evas_obj_image_filled_set(o, 1);
         evas_obj_image_border_set(o, 2, 2, 2, 2);
@@ -99,7 +99,7 @@ static void _setup(void)
         efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8);
         efl_gfx_visible_set(o, EINA_TRUE);
 
-        eo_add(&o, EVAS_TEXT_CLASS, evas);
+        o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
         efl_text_properties_font_set(o, "Vera-Bold", 10);
         efl_text_set(o, labels[i % 26]);