cleanup, remove warning, useless if and tab .

92 files changed, 801 insertions, 890 deletions

diff --git a/src/bin/about.c b/src/bin/about.c
index a6a7b5d..10f6949 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -9,10 +9,9 @@ _setup(void)
    Evas_Textblock_Style *st;
 
    o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
-   if (o)
-        eo_do(o, evas_obj_position_set(10, 40),
-            evas_obj_size_set(win_w - 20, win_h - 50),
-            evas_obj_visibility_set(EINA_TRUE));
+   eo_do(o, evas_obj_position_set(10, 40),
+         evas_obj_size_set(win_w - 20, win_h - 50),
+         evas_obj_visibility_set(EINA_TRUE));
    st = evas_textblock_style_new();
    evas_textblock_style_set
      (st,
@@ -22,10 +21,9 @@ _setup(void)
       "p='+ font=Vera font_size=10 align=left'"
       "/p='- \n \n'"
       );
-   if (o)
-        eo_do(o, evas_obj_textblock_style_set(st),
-            evas_obj_textblock_clear(),
-            evas_obj_textblock_text_markup_set
+   eo_do(o, evas_obj_textblock_style_set(st),
+         evas_obj_textblock_clear(),
+         evas_obj_textblock_text_markup_set
      ("<center>"
       "Enlightenment used to be a window manager project, but "
       "since has changed a lot to become a miniature desktop and mobile "
@@ -57,7 +55,8 @@ _cleanup(void)
 }
 
 static void
-_loop(double t __UNUSED__, int f __UNUSED__)
+_loop(double t EINA_UNUSED,
+      int f EINA_UNUSED)
 {
 }
 
@@ -66,8 +65,8 @@ _key(char *key)
 {
    if ((!strcmp(key, "Escape")) || (!strcmp(key, "q")) || (!strcmp(key, "Q")))
      {
-        _cleanup();
-        ui_menu();
+        _cleanup();
+        ui_menu();
      }
 }
 
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index ff2dfee..d8d1361 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -25,10 +25,10 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL),
-                 evas_obj_image_border_set(6, 6, 6, 6),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("bar.png"), NULL),
+              evas_obj_image_border_set(6, 6, 6, 6),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h),
-                           evas_obj_image_fill_set(0, 0, w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index 54527f8..5079bb7 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -25,11 +25,11 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("pan.png"), NULL),
-                 evas_obj_color_set(64, 64, 64, 255),
-                 evas_obj_image_border_set(3, 3, 3, 3),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("pan.png"), NULL),
+              evas_obj_color_set(64, 64, 64, 255),
+              evas_obj_image_border_set(3, 3, 3, 3),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -56,10 +56,10 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h),
-                           evas_obj_image_fill_set(0, 0, w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index 3aab91d..8b2f9a4 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -27,15 +27,15 @@ static void _setup(void)
 
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160));
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
-        if (o)
-        eo_do(o, evas_obj_color_set(a, a, a, a),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_color_set(a, a, a, a),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -60,8 +60,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index 06e4980..6796b16 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -26,14 +26,13 @@ static void _setup(void)
         int a;
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160));
         a = rnd()&0xff;
-        if (o)
-        eo_do(o, evas_obj_color_set(a, a, a, a),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_color_set(a, a, a, a),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -58,8 +57,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index eb29468..380e7ac 100644
--- a/src/bin/image_blend_many_smooth_same_scaled.c
+++ b/src/bin/image_blend_many_smooth_same_scaled.c
@@ -30,8 +30,7 @@ static void _setup(void)
         n = rnd() % 100;
         w = 3 + ((n * (60 - 3)) / 100);
         h = 4 + ((n * (80 - 4)) / 100);
-        if (o)
-        eo_do(o,
+        eo_do(o,
               evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_smooth_scale_set(1),
               evas_obj_size_set(w, h),
@@ -60,8 +59,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2);
-        if (o_images[i])
-          eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 9567181..52b0b09 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h),
-                           evas_obj_image_fill_set(0, 0, w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index ad84c44..0b32d37 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h),
-                           evas_obj_image_fill_set(0, 0, w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index 048b77f..2751315 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h),
-                           evas_obj_image_fill_set(0, 0, w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index 1dc759a..9aa06de 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h),
-                           evas_obj_image_fill_set(0, 0, w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index 8428973..e62e520 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -28,24 +28,22 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
-               eo_do(o, evas_obj_position_set(x, y));
+             eo_do(o,
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-                   evas_obj_size_set(120, 160),
-                   evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -72,8 +70,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+             eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }
    FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index 02a1c02..b36830e 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -31,24 +31,22 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             if (o)
-               eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
+             eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
-               eo_do(o, evas_obj_position_set(x, y));
+             eo_do(o,
+                   evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-                   evas_obj_size_set(120, 160),
-                   evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+             eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }
    FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index d39b169..6ac4388 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -31,24 +31,22 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
-               eo_do(o, evas_obj_position_set(x, y));
+             eo_do(o,
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-                   evas_obj_size_set(120, 160),
-                   evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+             eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }
    FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index 15013f8..09feea6 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -31,24 +31,22 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
-               eo_do(o, evas_obj_position_set(x, y));
+             eo_do(o,
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-                   evas_obj_size_set(120, 160),
-                   evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+             eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }
    FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 9463c00..9dea32d 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -28,24 +28,22 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
-               eo_do(o, evas_obj_position_set(x, y));
+             eo_do(o,
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-                   evas_obj_size_set(120, 160),
-                   evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -72,8 +70,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+             eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }
    FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 247784d..245a5b3 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -31,24 +31,22 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
-               eo_do(o, evas_obj_position_set(x, y));
+             eo_do(o,
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-                   evas_obj_size_set(120, 160),
-                   evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+             eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }
    FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index 3fb7126..9bde567 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -31,24 +31,22 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
-               eo_do(o, evas_obj_position_set(x, y));
+             eo_do(o,
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-                   evas_obj_size_set(120, 160),
-                   evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+             eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }
    FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index 204d418..ee25519 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -31,24 +31,22 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
-               eo_do(o, evas_obj_position_set(x, y));
+             eo_do(o,
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-                   evas_obj_size_set(120, 160),
-                   evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+             eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }
    FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index 629fbcb..5820130 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -28,24 +28,22 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
-               eo_do(o, evas_obj_position_set(x, y));
+             eo_do(o,
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-                   evas_obj_size_set(120, 160),
-                   evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -72,8 +70,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+             eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }
    FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index 25dc0f2..784f0db 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -31,24 +31,22 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
-               eo_do(o, evas_obj_position_set(x, y));
+             eo_do(o,
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-                   evas_obj_size_set(120, 160),
-                   evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+             eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }
    FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index 96c873b..0119a72 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -31,24 +31,22 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
-               eo_do(o, evas_obj_position_set(x, y));
+             eo_do(o,
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-                   evas_obj_size_set(120, 160),
-                   evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+             eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }
    FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index 097d20b..25bed57 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -31,24 +31,22 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+             eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
-               eo_do(o, evas_obj_position_set(x, y));
+             eo_do(o,
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
-                   evas_obj_size_set(120, 160),
-                   evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -75,8 +73,7 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+             eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }
    FPS_STD(NAME);
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index 7fe2287..ff0bdd5 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-                 evas_obj_image_smooth_scale_set(1),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_smooth_scale_set(1),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h),
-                           evas_obj_image_fill_set(0, 0, w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index 0c302a8..6247db1 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-                 evas_obj_image_smooth_scale_set(1),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_smooth_scale_set(1),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h),
-                           evas_obj_image_fill_set(0, 0, w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index df61030..1f24762 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-                 evas_obj_image_smooth_scale_set(1),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_smooth_scale_set(1),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h),
-                           evas_obj_image_fill_set(0, 0, w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index 2ea4525..d7da8cf 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -25,10 +25,10 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-                 evas_obj_image_smooth_scale_set(1),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_smooth_scale_set(1),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h),
-                           evas_obj_image_fill_set(0, 0, w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index 62ab251..752bbe5 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -25,10 +25,10 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("frame.png"), NULL),
-                 evas_obj_image_border_set(8, 8, 8, 8),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("frame.png"), NULL),
+              evas_obj_image_border_set(8, 8, 8, 8),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -55,10 +55,10 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h),
-                           evas_obj_image_fill_set(0, 0, w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 54b4f0f..4d33565 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -27,15 +27,15 @@ static void _setup(void)
 
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160));
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
-        if (o)
-        eo_do(o, evas_obj_color_set(a, a, a, a),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_color_set(a, a, a, a),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -60,8 +60,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index f2cf861..5331f39 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -27,14 +27,14 @@ static void _setup(void)
 
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160));
         a = rnd()&0xff;
-        if (o)
-        eo_do(o, evas_obj_color_set(a, a, a, a),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_color_set(a, a, a, a),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -59,8 +59,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index 8e5c7de..72e8850 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -25,11 +25,11 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL),
-                 evas_obj_image_border_set(6, 6, 6, 6),
-                 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("bar.png"), NULL),
+              evas_obj_image_border_set(6, 6, 6, 6),
+              evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -56,10 +56,10 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h),
-                           evas_obj_image_fill_set(0, 0, w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index 7163a1b..d5c8a19 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -25,13 +25,13 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160),
-                 evas_obj_image_border_set(43, 48, 48, 83),
-                 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_image_border_set(43, 48, 48, 83),
+              evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -56,8 +56,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index bec8612..fbe7fb3 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -25,11 +25,11 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -54,8 +54,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index 5652e60..fdd56d1 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -25,11 +25,11 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -54,8 +54,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index 787e27c..c0f6e2d 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -24,19 +24,19 @@ static void _setup(void)
 
    o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_images[0] = o;
-   if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("im1.png"), NULL),
-            evas_obj_image_fill_set(0, 0, 720, 420),
-            evas_obj_size_set(720, 420),
-            evas_obj_visibility_set(EINA_TRUE));
+   eo_do(o,
+         evas_obj_image_file_set(build_path("im1.png"), NULL),
+         evas_obj_image_fill_set(0, 0, 720, 420),
+         evas_obj_size_set(720, 420),
+         evas_obj_visibility_set(EINA_TRUE));
 
    o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_images[1] = o;
-   if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("im2.png"), NULL),
-            evas_obj_image_fill_set(0, 0, 720, 420),
-            evas_obj_size_set(720, 420),
-            evas_obj_visibility_set(EINA_TRUE));
+   eo_do(o,
+         evas_obj_image_file_set(build_path("im2.png"), NULL),
+         evas_obj_image_fill_set(0, 0, 720, 420),
+         evas_obj_size_set(720, 420),
+         evas_obj_visibility_set(EINA_TRUE));
 
    done = 0;
 }
@@ -55,8 +55,7 @@ static void _loop(double t, int f)
 
    a = f & 0x1f;
    a = ((a << 3) | (a >> 2)) & 0xff;
-   if (o_images[1])
-        eo_do(o_images[1], evas_obj_color_set(a, a, a, a));
+   eo_do(o_images[1], evas_obj_color_set(a, a, a, a));
    FPS_STD(NAME);
 }
 
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index 4383c9d..d868867 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -26,14 +26,14 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
-                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
-                 evas_obj_image_size_set(640, 480),
-                 evas_obj_image_alpha_set(0),
-                 evas_obj_image_fill_set(0, 0, 640, 480),
-                 evas_obj_size_set(640, 480),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+              evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
+              evas_obj_image_size_set(640, 480),
+              evas_obj_image_alpha_set(0),
+              evas_obj_image_fill_set(0, 0, 640, 480),
+              evas_obj_size_set(640, 480),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -58,12 +58,12 @@ static void _loop(double t, int f)
         h = 480;
         x = (win_w / 2) - (w / 2);
         y = (win_h / 2) - (h / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h),
-                           evas_obj_image_fill_set(0, 0, w, h),
-                           data = evas_obj_image_data_get(1),
-                           st = evas_obj_image_stride_get());
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h),
+              data = evas_obj_image_data_get(1),
+              st = evas_obj_image_stride_get());
         st = st >> 2;
         p = data;
         for (y = 0; y < h; y++)
@@ -75,9 +75,9 @@ static void _loop(double t, int f)
                }
              p += (st - w);
           }
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_image_data_set(data),
-                           evas_obj_image_data_update_add( 0, 0, w, h));
+        eo_do(o_images[i],
+              evas_obj_image_data_set(data),
+              evas_obj_image_data_update_add( 0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index d0604ca..541eb1b 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -26,14 +26,14 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
-                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
-                 evas_obj_image_size_set(640, 480),
-                 evas_obj_image_alpha_set(1),
-                 evas_obj_image_fill_set(0, 0, 640, 480),
-                 evas_obj_size_set(640, 480),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+              evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
+              evas_obj_image_size_set(640, 480),
+              evas_obj_image_alpha_set(1),
+              evas_obj_image_fill_set(0, 0, 640, 480),
+              evas_obj_size_set(640, 480),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -58,12 +58,12 @@ static void _loop(double t, int f)
         h = 480;
         x = (win_w / 2) - (w / 2);
         y = (win_h / 2) - (h / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h),
-                           evas_obj_image_fill_set(0, 0, w, h),
-                           data = evas_obj_image_data_get(1),
-                           st = evas_obj_image_stride_get());
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h),
+              data = evas_obj_image_data_get(1),
+              st = evas_obj_image_stride_get());
         st = st >> 2;
         p = data;
         for (y = 0; y < h; y++)
@@ -86,9 +86,9 @@ static void _loop(double t, int f)
                }
              p += (st - w);
           }
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_image_data_set(data),
-                           evas_obj_image_data_update_add( 0, 0, w, h));
+        eo_do(o_images[i],
+              evas_obj_image_data_set(data),
+              evas_obj_image_data_update_add( 0, 0, w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index de5232b..d06689a 100644
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@@ -23,30 +23,29 @@ static void _setup(void)
 {
    int i, y;
    FILE *f;
-   size_t r;
    unsigned char **data, **lp;
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
-                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
-                 evas_obj_image_size_set(640, 480),
-                 evas_obj_image_alpha_set(0),
-                 evas_obj_image_fill_set(0, 0, 640, 480),
-                 evas_obj_size_set(640, 480),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+              evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
+              evas_obj_image_size_set(640, 480),
+              evas_obj_image_alpha_set(0),
+              evas_obj_image_fill_set(0, 0, 640, 480),
+              evas_obj_size_set(640, 480),
+              evas_obj_visibility_set(EINA_TRUE));
         yp = malloc(640 * 480);
         up = malloc(320 * 240);
         vp = malloc(320 * 240);
         f = fopen(build_path("tp.yuv"), "rb");
         if (f)
           {
-             r = fread(yp, 640 * 480, 1, f);
-             r = fread(up, 320 * 240, 1, f);
-             r = fread(vp, 320 * 240, 1, f);
+             fread(yp, 640 * 480, 1, f);
+             fread(up, 320 * 240, 1, f);
+             fread(vp, 320 * 240, 1, f);
              fclose(f);
           }
         data = evas_object_image_data_get(o_images[i], 1);
@@ -66,8 +65,7 @@ static void _setup(void)
              *lp = vp + (y * 320);
              lp++;
           }
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_image_data_set(data));
+        eo_do(o_images[i], evas_obj_image_data_set(data));
      }
    done = 0;
 }
@@ -93,11 +91,11 @@ static void _loop(double t, int f)
         h = 480;
         x = (win_w / 2) - (w / 2);
         y = (win_h / 2) - (h / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h),
-                           evas_obj_image_fill_set(0, 0, w, h),
-                           evas_obj_image_data_update_add( 0, 0, 640, 480));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h),
+              evas_obj_image_data_update_add( 0, 0, 640, 480));
      }
    FPS_STD(NAME);
 }
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 b018637..dc02971 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -24,30 +24,29 @@ static void _setup(void)
    int i, y;
    FILE *f;
    unsigned char **data, **lp;
-   size_t r;
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
-                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
-                 evas_obj_image_size_set(640, 480),
-                 evas_obj_image_alpha_set(0),
-                 evas_obj_image_fill_set(0, 0, 640, 480),
-                 evas_obj_size_set(640, 480),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+              evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
+              evas_obj_image_size_set(640, 480),
+              evas_obj_image_alpha_set(0),
+              evas_obj_image_fill_set(0, 0, 640, 480),
+              evas_obj_size_set(640, 480),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
         yp = malloc(640 * 480);
         up = malloc(320 * 240);
         vp = malloc(320 * 240);
         f = fopen(build_path("tp.yuv"), "rb");
         if (f)
           {
-             r = fread(yp, 640 * 480, 1, f);
-             r = fread(up, 320 * 240, 1, f);
-             r = fread(vp, 320 * 240, 1, f);
+             fread(yp, 640 * 480, 1, f);
+             fread(up, 320 * 240, 1, f);
+             fread(vp, 320 * 240, 1, f);
              fclose(f);
           }
         data = evas_object_image_data_get(o_images[i], 1);
@@ -67,8 +66,7 @@ static void _setup(void)
              *lp = vp + (y * 320);
              lp++;
           }
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_image_data_set(data));
+        eo_do(o_images[i], evas_obj_image_data_set(data));
      }
    done = 0;
 }
@@ -102,9 +100,9 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_map_enable_set(1),
-                           evas_obj_map_set(m));
+        eo_do(o_images[i],
+              evas_obj_map_enable_set(1),
+              evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index 7ecb470..26a00a1 100644
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -24,29 +24,28 @@ static void _setup(void)
    int i, y;
    FILE *f;
    unsigned char **data, **lp;
-   size_t r;
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
-                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
-                 evas_obj_image_size_set(640, 480),
-                 evas_obj_image_alpha_set(0),
-                 evas_obj_image_fill_set(0, 0, 640, 480),
-                 evas_obj_size_set(640, 480),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+              evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
+              evas_obj_image_size_set(640, 480),
+              evas_obj_image_alpha_set(0),
+              evas_obj_image_fill_set(0, 0, 640, 480),
+              evas_obj_size_set(640, 480),
+              evas_obj_visibility_set(EINA_TRUE));
         yp = malloc(640 * 480);
         up = malloc(320 * 240);
         vp = malloc(320 * 240);
         f = fopen(build_path("tp.yuv"), "rb");
         if (f)
           {
-             r = fread(yp, 640 * 480, 1, f);
-             r = fread(up, 320 * 240, 1, f);
-             r = fread(vp, 320 * 240, 1, f);
+             fread(yp, 640 * 480, 1, f);
+             fread(up, 320 * 240, 1, f);
+             fread(vp, 320 * 240, 1, f);
              fclose(f);
           }
         data = evas_object_image_data_get(o_images[i], 1);
@@ -66,8 +65,7 @@ static void _setup(void)
              *lp = vp + (y * 320);
              lp++;
           }
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_image_data_set(data));
+        eo_do(o_images[i], evas_obj_image_data_set(data));
      }
    done = 0;
 }
@@ -100,9 +98,9 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_map_enable_set(1),
-                           evas_obj_map_set(m));
+        eo_do(o_images[i],
+              evas_obj_map_enable_set(1),
+              evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index b01d894..1025622 100644
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@@ -23,30 +23,29 @@ static void _setup(void)
 {
    int i, y;
    FILE *f;
-   size_t r;
    unsigned char **data, **lp;
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
-                 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
-                 evas_obj_image_size_set(320, 480),
-                 evas_obj_image_alpha_set(0),
-                 evas_obj_image_fill_set(0, 0, 640, 480),
-                 evas_obj_size_set(640, 480),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+              evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
+              evas_obj_image_size_set(320, 480),
+              evas_obj_image_alpha_set(0),
+              evas_obj_image_fill_set(0, 0, 640, 480),
+              evas_obj_size_set(640, 480),
+              evas_obj_visibility_set(EINA_TRUE));
         yp = malloc(640 * 480);
         up = malloc(320 * 240);
         vp = malloc(320 * 240);
         f = fopen(build_path("tp.yuv"), "rb");
         if (f)
           {
-             r = fread(yp, 640 * 480, 1, f);
-             r = fread(up, 320 * 240, 1, f);
-             r = fread(vp, 320 * 240, 1, f);
+             fread(yp, 640 * 480, 1, f);
+             fread(up, 320 * 240, 1, f);
+             fread(vp, 320 * 240, 1, f);
              fclose(f);
           }
         data = evas_object_image_data_get(o_images[i], 1);
@@ -68,9 +67,9 @@ static void _setup(void)
                   *lp = vp + (y * 320);
                   lp++;
                }
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_image_data_set(data),
-                                evas_obj_image_data_update_add( 0, 0, 320, 480));
+             eo_do(o_images[i],
+                   evas_obj_image_data_set(data),
+                   evas_obj_image_data_update_add( 0, 0, 320, 480));
           }
      }
    done = 0;
@@ -99,12 +98,10 @@ static void _loop(double t, int f)
         h = 480;
         x = (win_w / 2) - (w / 2);
         y = (win_h / 2) - (h / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_size_set(w, h));
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_image_fill_set(0, 0, w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h));
 
         w = 320 - 16 + f;
         if (w < 1) w = 1;
@@ -112,7 +109,6 @@ static void _loop(double t, int f)
 
         w &= ~0x1;
 
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_image_size_set(w, 480));
         data = evas_object_image_data_get(o_images[i], 1);
         if (data)
@@ -133,10 +129,9 @@ static void _loop(double t, int f)
                   *lp = vp + (y * 320);
                   lp++;
                }
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_image_data_set(data));
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_image_data_update_add( 0, 0, w, 480));
+             eo_do(o_images[i],
+                   evas_obj_image_data_set(data),
+                   evas_obj_image_data_update_add( 0, 0, w, 480));
           }
      }
    FPS_STD(NAME);
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index 58207f0..f6aed3a 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -57,12 +57,12 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-                 evas_obj_image_fill_set(0, 0, 256, 256),
-                 evas_obj_size_set(256, 256),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_fill_set(0, 0, 256, 256),
+              evas_obj_size_set(256, 256),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
    POINT(0, 1,  w, -h, -d, 256,   0);
@@ -131,14 +131,15 @@ _cube_pos(Cube *c,
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
         if (evas_map_util_clockwise_get(m))
           {
-             if (c->side[i].o)
-        eo_do(c->side[i].o, evas_obj_map_enable_set(1),
-                                 evas_obj_map_set(m),
-                                 evas_obj_visibility_set(EINA_TRUE));
+             eo_do(c->side[i].o,
+                   evas_obj_map_enable_set(1),
+                   evas_obj_map_set(m),
+                   evas_obj_visibility_set(EINA_TRUE));
           }
         else
-          if (c->side[i].o)
-        eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+          {
+             eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+          }
 
         order[i] = i;
         for (j = 0; j < 4; j++)
@@ -162,11 +163,9 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   if (c->side[order[0]].o)
-        eo_do(c->side[order[0]].o, evas_obj_raise());
+   eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     if (c->side[order[i]].o)
-        eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
+     eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 
 static void
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index 75ccdb9..b1e0efe 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -57,11 +57,11 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-                 evas_obj_image_fill_set(0, 0, 256, 256),
-                 evas_obj_size_set(256, 256),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_fill_set(0, 0, 256, 256),
+              evas_obj_size_set(256, 256),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
    POINT(0, 1,  w, -h, -d, 256,   0);
@@ -129,14 +129,15 @@ _cube_pos(Cube *c,
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
         if (evas_map_util_clockwise_get(m))
           {
-             if (c->side[i].o)
-        eo_do(c->side[i].o, evas_obj_map_enable_set(1),
-                                 evas_obj_map_set(m),
-                                 evas_obj_visibility_set(EINA_TRUE));
+             eo_do(c->side[i].o,
+                   evas_obj_map_enable_set(1),
+                   evas_obj_map_set(m),
+                   evas_obj_visibility_set(EINA_TRUE));
           }
         else
-          if (c->side[i].o)
-        eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+          {
+             eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+          }
 
         order[i] = i;
         for (j = 0; j < 4; j++)
@@ -160,11 +161,9 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   if (c->side[order[0]].o)
-        eo_do(c->side[order[0]].o, evas_obj_raise());
+   eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     if (c->side[order[i]].o)
-        eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
+     eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 
 static void
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index bc20ad8..c296818 100644
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -57,12 +57,12 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-                 evas_obj_image_fill_set(0, 0, 256, 256),
-                 evas_obj_size_set(256, 256),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_fill_set(0, 0, 256, 256),
+              evas_obj_size_set(256, 256),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
    POINT(0, 1,  w, -h, -d, 256,   0);
@@ -129,9 +129,9 @@ _cube_pos(Cube *c,
                                   255, 255, 255,
                                   20, 20, 20);
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
-        if (c->side[i].o)
-        eo_do(c->side[i].o, evas_obj_map_enable_set(1),
-                            evas_obj_map_set(m));
+        eo_do(c->side[i].o,
+              evas_obj_map_enable_set(1),
+              evas_obj_map_set(m));
 
         order[i] = i;
         for (j = 0; j < 4; j++)
@@ -155,11 +155,9 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   if (c->side[order[0]].o)
-        eo_do(c->side[order[0]].o, evas_obj_raise());
+   eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     if (c->side[order[i]].o)
-        eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
+     eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 
 static void
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index ecce9c2..13547bb 100644
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -57,11 +57,11 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-                 evas_obj_image_fill_set(0, 0, 256, 256),
-                 evas_obj_size_set(256, 256),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_fill_set(0, 0, 256, 256),
+              evas_obj_size_set(256, 256),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
    POINT(0, 1,  w, -h, -d, 256,   0);
@@ -127,8 +127,8 @@ _cube_pos(Cube *c,
                                   255, 255, 255,
                                   20, 20, 20);
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
-        if (c->side[i].o)
-        eo_do(c->side[i].o, evas_obj_map_enable_set(1),
+        eo_do(c->side[i].o,
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
 
         order[i] = i;
@@ -153,11 +153,9 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   if (c->side[order[0]].o)
-        eo_do(c->side[order[0]].o, evas_obj_raise());
+   eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     if (c->side[order[i]].o)
-        eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
+     eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 
 static void
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index 0107588..606eb18 100644
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -57,12 +57,12 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-                 evas_obj_image_fill_set(0, 0, 720, 420),
-                 evas_obj_size_set(720, 420),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_fill_set(0, 0, 720, 420),
+              evas_obj_size_set(720, 420),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
    POINT(0, 1,  w, -h, -d, 720,   0);
@@ -131,14 +131,15 @@ _cube_pos(Cube *c,
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
         if (evas_map_util_clockwise_get(m))
           {
-             if (c->side[i].o)
-        eo_do(c->side[i].o, evas_obj_map_enable_set(1),
-                                 evas_obj_map_set(m),
-                                 evas_obj_visibility_set(EINA_TRUE));
+             eo_do(c->side[i].o,
+                   evas_obj_map_enable_set(1),
+                   evas_obj_map_set(m),
+                   evas_obj_visibility_set(EINA_TRUE));
           }
         else
-          if (c->side[i].o)
-        eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+          {
+             eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+          }
 
         order[i] = i;
         for (j = 0; j < 4; j++)
@@ -162,11 +163,9 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   if (c->side[order[0]].o)
-        eo_do(c->side[order[0]].o, evas_obj_raise());
+   eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     if (c->side[order[i]].o)
-        eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
+     eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 
 static void
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index e8b6968..ec4693b 100644
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -57,12 +57,12 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-                 evas_obj_image_fill_set(0, 0, 720, 420),
-                 evas_obj_size_set(720, 420),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_fill_set(0, 0, 720, 420),
+              evas_obj_size_set(720, 420),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    POINT(0, 0, -w, -h, -d,   0,   0);
    POINT(0, 1,  w, -h, -d, 720,   0);
@@ -128,14 +128,15 @@ _cube_pos(Cube *c,
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
         if (evas_map_util_clockwise_get(m))
           {
-             if (c->side[i].o)
-        eo_do(c->side[i].o, evas_obj_map_enable_set(1),
-                                 evas_obj_map_set(m),
-                                 evas_obj_visibility_set(EINA_TRUE));
+             eo_do(c->side[i].o,
+                   evas_obj_map_enable_set(1),
+                   evas_obj_map_set(m),
+                   evas_obj_visibility_set(EINA_TRUE));
           }
         else
-          if (c->side[i].o)
-        eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+          {
+             eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+          }
 
         order[i] = i;
         for (j = 0; j < 4; j++)
@@ -159,11 +160,9 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   if (c->side[order[0]].o)
-        eo_do(c->side[order[0]].o, evas_obj_raise());
+   eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     if (c->side[order[i]].o)
-        eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
+     eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 
 static void
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index ff7ac4b..2f373f4 100644
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -32,22 +32,22 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-                 evas_obj_image_fill_set(0, 0, 256, 256),
-                 evas_obj_size_set(256, 256),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_fill_set(0, 0, 256, 256),
+              evas_obj_size_set(256, 256),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
 
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_reflec[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
-                 evas_obj_image_fill_set(0, 0, 256, 256),
-                 evas_obj_size_set(256, 256),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_fill_set(0, 0, 256, 256),
+              evas_obj_size_set(256, 256),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -56,8 +56,11 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < CNUM; i++) eo_del(o_images[i]);
-   for (i = 0; i < CNUM; i++) eo_del(o_reflec[i]);
+   for (i = 0; i < CNUM; i++)
+     {
+        eo_del(o_images[i]);
+        eo_del(o_reflec[i]);
+     }
 }
 
 /* loop - do things */
@@ -127,17 +130,13 @@ static void _loop(double t, int f)
 
         if (c <= 0)
           {
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_raise());
-             if (o_reflec[i])
-        eo_do(o_reflec[i], evas_obj_raise());
+             eo_do(o_images[i], evas_obj_raise());
+             eo_do(o_reflec[i], evas_obj_raise());
           }
         else
           {
-             if (o_images[i])
-        eo_do(o_images[i], evas_obj_lower());
-             if (o_reflec[i])
-        eo_do(o_reflec[i], evas_obj_lower());
+             eo_do(o_images[i], evas_obj_lower());
+             eo_do(o_reflec[i], evas_obj_lower());
           }
 
         evas_map_point_coord_set   (m, 0, x, y, -z);
@@ -160,9 +159,9 @@ static void _loop(double t, int f)
                                 x + (w / 2), y + (h / 2), 0);
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
 
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_map_enable_set(1),
-                           evas_obj_map_set(m));
+        eo_do(o_images[i],
+              evas_obj_map_enable_set(1),
+              evas_obj_map_set(m));
 
         evas_map_point_coord_set   (m, 0, x, yy, -z);
         evas_map_point_image_uv_set(m, 0, 0, 256);
@@ -184,8 +183,8 @@ static void _loop(double t, int f)
                                 x + (w / 2), y + (h / 2), 0);
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
 
-        if (o_reflec[i])
-        eo_do(o_reflec[i], evas_obj_map_enable_set(1),
+        eo_do(o_reflec[i],
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
      }
 
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index 94641fc..c9dfafb 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -26,12 +26,12 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -69,9 +69,9 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_map_enable_set(1),
-                           evas_obj_map_set(m));
+        eo_do(o_images[i],
+              evas_obj_map_enable_set(1),
+              evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }
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 7f2a0b0..e44b31d 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -26,12 +26,12 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -69,9 +69,9 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_map_enable_set(1),
-                           evas_obj_map_set(m));
+        eo_do(o_images[i],
+              evas_obj_map_enable_set(1),
+              evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index 585063d..20677f2 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -26,11 +26,11 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -67,9 +67,9 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_map_enable_set(1),
-                           evas_obj_map_set(m));
+        eo_do(o_images[i],
+              evas_obj_map_enable_set(1),
+              evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index b273b5e..107e663 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -26,11 +26,11 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -66,9 +66,9 @@ static void _loop(double t, int f)
         evas_map_point_color_set(m, 3, 0, 0, 0, 0);
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_map_enable_set(1),
-                           evas_obj_map_set(m));
+        eo_do(o_images[i],
+              evas_obj_map_enable_set(1),
+              evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index fe62719..e9dfdcd 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -26,12 +26,12 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -69,9 +69,9 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_map_enable_set(1),
-                           evas_obj_map_set(m));
+        eo_do(o_images[i],
+              evas_obj_map_enable_set(1),
+              evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index 4811672..0037a9b 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -26,12 +26,12 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -69,9 +69,9 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_map_enable_set(1),
-                           evas_obj_map_set(m));
+        eo_do(o_images[i],
+              evas_obj_map_enable_set(1),
+              evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index e5a872f..81ff4ab 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -26,11 +26,11 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -67,9 +67,9 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_map_enable_set(1),
-                           evas_obj_map_set(m));
+        eo_do(o_images[i],
+              evas_obj_map_enable_set(1),
+              evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index 17ddd33..45e2ed3 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -26,11 +26,11 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -67,9 +67,9 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_map_enable_set(1),
-                           evas_obj_map_set(m));
+        eo_do(o_images[i],
+              evas_obj_map_enable_set(1),
+              evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index bc0ec5a..a71fc62 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -26,12 +26,12 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160),
-                 evas_obj_image_smooth_scale_set(0),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_image_smooth_scale_set(0),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -64,9 +64,9 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_map_enable_set(1),
-                           evas_obj_map_set(m));
+        eo_do(o_images[i],
+              evas_obj_map_enable_set(1),
+              evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index 3cb1eb0..e94f84d 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -26,8 +26,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+        eo_do(o,
+              evas_obj_image_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_image_smooth_scale_set(0),
@@ -64,9 +64,9 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_map_enable_set(1),
-                           evas_obj_map_set(m));
+        eo_do(o_images[i],
+              evas_obj_map_enable_set(1),
+              evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index 7deead8..921522e 100644
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -26,7 +26,6 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
         eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
@@ -62,7 +61,6 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_map_enable_set(1),
                            evas_obj_map_set(m));
      }
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index 4ac2552..d9b61bb 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -26,11 +26,11 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -62,9 +62,9 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_map_enable_set(1),
-                           evas_obj_map_set(m));
+        eo_do(o_images[i],
+              evas_obj_map_enable_set(1),
+              evas_obj_map_set(m));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index f5dadce..ba21f73 100644
--- a/src/bin/image_quality_scale.c
+++ b/src/bin/image_quality_scale.c
@@ -26,7 +26,6 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
         eo_do(o, evas_obj_image_file_set(build_path("tp.png"), NULL),
                  evas_obj_image_fill_set(0, 0, 640, 480),
                  evas_obj_size_set(640, 480),
@@ -55,7 +54,6 @@ static void _loop(double t, int f)
         h *= (f / 100.0) * 4.0;
         x = (win_w / 2) - (w / 2);
         y = (win_h / 2) - (h / 2);
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_position_set(x, y),
                            evas_obj_size_set(w, h),
                            evas_obj_image_fill_set(0, 0, w, h));
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index 600a5d4..e61d721 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o,*src;
 
    o = eo_add(EVAS_IMAGE_CLASS, evas);
-   if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-            evas_obj_image_fill_set(0, 0, 120, 160),
-            evas_obj_size_set(120, 160),
-            evas_obj_visibility_set(EINA_TRUE));
+   eo_do(o,
+         evas_obj_image_file_set(build_path("logo.png"), NULL),
+         evas_obj_image_fill_set(0, 0, 120, 160),
+         evas_obj_size_set(120, 160),
+         evas_obj_visibility_set(EINA_TRUE));
    src = o;
    o_images[0] = src;
 
@@ -35,11 +35,11 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_source_set(src),
-                 evas_obj_size_set(120, 160),
-                 evas_obj_image_fill_set(0,0,120,160),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_image_source_set(src),
+              evas_obj_size_set(120, 160),
+              evas_obj_image_fill_set(0,0,120,160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -64,8 +64,7 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index ee53d8e..0585c06 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -27,22 +27,20 @@ static void _setup(void)
    Evas_Object *o,*src;
 
    o = eo_add(EVAS_IMAGE_CLASS, evas);
-   if (o)
-        eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-            evas_obj_image_fill_set(0, 0, 120, 160),
-            evas_obj_size_set(120, 160),
-            evas_obj_position_set(-400, -300));
+   eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+         evas_obj_image_fill_set(0, 0, 120, 160),
+         evas_obj_size_set(120, 160),
+         evas_obj_position_set(-400, -300));
    src = o;
 
    for (i = 0; i < OBNUM / 2; i++)
      {
-        o = eo_add(EVAS_IMAGE_CLASS, evas);
-        o_images[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_source_set(src, NULL),
-                 evas_obj_size_set(120, 160),
-                 evas_obj_image_fill_set(0,0,120,160),
-                 evas_obj_visibility_set(EINA_TRUE));
+        o = eo_add(EVAS_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        eo_do(o, evas_obj_image_source_set(src, NULL),
+              evas_obj_size_set(120, 160),
+              evas_obj_image_fill_set(0,0,120,160),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -67,7 +65,6 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 7da5711..073202d 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -29,16 +29,16 @@ static void _setup(void)
      {
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        if (o)
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
-                 evas_obj_text_set("This is a test string"),
-                 evas_obj_text_style_set(st),
-                 evas_obj_color_set(255, 255, 255, 255),
-                 evas_obj_text_shadow_color_set(0, 0, 0, 24),
-                 evas_obj_text_glow_color_set(100, 80, 40, 100),
-                 evas_obj_text_glow2_color_set(50, 10, 5, 50),
-                 evas_obj_text_outline_color_set(0, 0, 0, 255),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_text_font_set("Vera-Bold", 20),
+              evas_obj_text_set("This is a test string"),
+              evas_obj_text_style_set(st),
+              evas_obj_color_set(255, 255, 255, 255),
+              evas_obj_text_shadow_color_set(0, 0, 0, 24),
+              evas_obj_text_glow_color_set(100, 80, 40, 100),
+              evas_obj_text_glow2_color_set(50, 10, 5, 50),
+              evas_obj_text_outline_color_set(0, 0, 0, 255),
+              evas_obj_visibility_set(EINA_TRUE));
         st++;
      }
    st = i;
@@ -48,15 +48,13 @@ static void _setup(void)
         s = o_texts[i % st];
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_texts[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_source_set(s));
+        eo_do(o, evas_obj_image_source_set(s));
         /* FIXME s == NULL*/
-        if (s)
-        eo_do(s, evas_obj_size_get(&w, &h));
-        if (o)
-        eo_do(o, evas_obj_size_set(w, h),
-                 evas_obj_image_fill_set(0, 0, w, h),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(s, evas_obj_size_get(&w, &h));
+        eo_do(o,
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h),
+              evas_obj_visibility_set(EINA_TRUE));
      }
 
    done = 0;
@@ -76,13 +74,11 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (o_texts[i])
         eo_do(o_texts[i], evas_obj_size_get(&w, &h));
         x = (win_w / 2) - (w / 2);
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
-        if (o_texts[i])
         eo_do(o_texts[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index 2dde775..6822963 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -32,43 +32,37 @@ static void _setup(void)
    srnd();
    o = eo_add(EVAS_TEXT_CLASS, evas);
    o_texts[0] = o;
-   if (o)
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
    snprintf(buf, sizeof(buf), "%s %s %s %s.",
-                   strs[rnd() % (sizeof(strs) / sizeof(char *))],
-                   strs[rnd() % (sizeof(strs) / sizeof(char *))],
-                   strs[rnd() % (sizeof(strs) / sizeof(char *))],
-                   strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-   if (o)
-        eo_do(o, evas_obj_text_set(buf));
-   if (o)
-        eo_do(o, evas_obj_color_set(0, 0, 0, 255));
-   if (o)
-        eo_do(o, evas_obj_size_get(&w, &h));
+            strs[rnd() % (sizeof(strs) / sizeof(char *))],
+            strs[rnd() % (sizeof(strs) / sizeof(char *))],
+            strs[rnd() % (sizeof(strs) / sizeof(char *))],
+            strs[rnd() % (sizeof(strs) / sizeof(char *))]);
+
+   eo_do(o,
+         evas_obj_text_font_set("Vera-Bold", 20),
+         evas_obj_text_set(buf),
+         evas_obj_color_set(0, 0, 0, 255),
+         evas_obj_size_get(&w, &h));
    x = (win_w / 2) - (w / 2);
    x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
    y = (win_h / 2) - (h / 2);
    y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
-   if (o)
-        eo_do(o, evas_obj_position_set(x, y));
-   if (o)
-        eo_do(o, evas_obj_visibility_set(EINA_TRUE));
+   eo_do(o,
+         evas_obj_position_set(x, y),
+         evas_obj_visibility_set(EINA_TRUE));
    for (i = 1  ; i < OBNUM ; i ++)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_texts[i] = o;
-        if (o)
-        eo_do(o, evas_obj_image_source_set(o_texts[0]));
-        if (o_texts[0])
+        eo_do(o,
+              evas_obj_image_source_set(o_texts[0]));
         eo_do(o_texts[0], evas_obj_size_get(&w, &h));
-        if (o)
         eo_do(o, evas_obj_size_set(w, h),
                  evas_obj_image_fill_set(0, 0, w, h));
         x = (win_w / 2) - (w / 2);
         x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
-        if (o)
         eo_do(o, evas_obj_position_set(x, y),
                  evas_obj_visibility_set(EINA_TRUE));
      }
@@ -90,24 +84,22 @@ static void _loop(double t, int f)
    char buf[1024];
    const char *strs[] = {
       "Big", "Smelly", "Fish", "Pants", "Octopus", "Garden", "There", "I",
-        "Am", "You", "Are", "Erogenous", "We", "Stick", "Wet", "Fishy",
-        "Fiddly", "Family", "Lair", "Monkeys", "Magazine"
+      "Am", "You", "Are", "Erogenous", "We", "Stick", "Wet", "Fishy",
+      "Fiddly", "Family", "Lair", "Monkeys", "Magazine"
    };
    snprintf(buf, sizeof(buf), "%s %s %s %s.",
-                   strs[rnd() % (sizeof(strs) / sizeof(char *))],
-                   strs[rnd() % (sizeof(strs) / sizeof(char *))],
-                   strs[rnd() % (sizeof(strs) / sizeof(char *))],
-                   strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-   if (o_texts[0])
-        eo_do(o_texts[0], evas_obj_text_set(buf));
-   if (o_texts[0])
-        eo_do(o_texts[0], evas_obj_size_get(&w, &h));
+            strs[rnd() % (sizeof(strs) / sizeof(char *))],
+            strs[rnd() % (sizeof(strs) / sizeof(char *))],
+            strs[rnd() % (sizeof(strs) / sizeof(char *))],
+            strs[rnd() % (sizeof(strs) / sizeof(char *))]);
+   eo_do(o_texts[0],
+         evas_obj_text_set(buf),
+         evas_obj_size_get(&w, &h));
    for (i = 1; i < OBNUM; i++)
      {
-        if (o_texts[i])
-        eo_do(o_texts[i], evas_obj_size_set(w,h));
-        if (o_texts[i])
-        eo_do(o_texts[i], evas_obj_image_fill_set(0,0,w,h));
+        eo_do(o_texts[i],
+              evas_obj_size_set(w,h),
+              evas_obj_image_fill_set(0,0,w,h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c
index d7cc901..2a24694 100644
--- a/src/bin/rect_blend.c
+++ b/src/bin/rect_blend.c
@@ -32,9 +32,9 @@ static void _setup(void)
         r = ((rnd()&0xff) * a) / 255;
         g = ((rnd()&0xff) * a) / 255;
         b = ((rnd()&0xff) * a) / 255;
-        if (o)
-        eo_do(o, evas_obj_color_set(r, g, b, a),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_color_set(r, g, b, a),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -61,9 +61,9 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c
index 11b4281..15985b4 100644
--- a/src/bin/rect_blend_few.c
+++ b/src/bin/rect_blend_few.c
@@ -35,7 +35,6 @@ static void _setup(void)
         r = ((rnd()&0xff) * a) / 255;
         g = ((rnd()&0xff) * a) / 255;
         b = ((rnd()&0xff) * a) / 255;
-        if (o)
         eo_do(o, evas_obj_color_set(r, g, b, a),
                  evas_obj_visibility_set(EINA_TRUE));
      }
@@ -64,7 +63,6 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_position_set(x, y),
                            evas_obj_size_set(w, h));
      }
diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c
index 325f717..f4df639 100644
--- a/src/bin/rect_blend_pow2.c
+++ b/src/bin/rect_blend_pow2.c
@@ -33,9 +33,9 @@ static void _setup(void)
         r = ((rnd()&0xff) * a) / 255;
         g = ((rnd()&0xff) * a) / 255;
         b = ((rnd()&0xff) * a) / 255;
-        if (o)
-        eo_do(o, evas_obj_color_set(r, g, b, a),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_color_set(r, g, b, a),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -62,9 +62,9 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c
index db23e26..465bd82 100644
--- a/src/bin/rect_blend_pow2_few.c
+++ b/src/bin/rect_blend_pow2_few.c
@@ -36,7 +36,6 @@ static void _setup(void)
         r = ((rnd()&0xff) * a) / 255;
         g = ((rnd()&0xff) * a) / 255;
         b = ((rnd()&0xff) * a) / 255;
-        if (o)
         eo_do(o, evas_obj_color_set(r, g, b, a),
                  evas_obj_visibility_set(EINA_TRUE));
      }
@@ -65,7 +64,6 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_position_set(x, y),
                            evas_obj_size_set(w, h));
      }
diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c
index aa1305d..071bdf4 100644
--- a/src/bin/rect_solid.c
+++ b/src/bin/rect_solid.c
@@ -32,9 +32,9 @@ static void _setup(void)
         r = ((rnd()&0xff) * a) / 255;
         g = ((rnd()&0xff) * a) / 255;
         b = ((rnd()&0xff) * a) / 255;
-        if (o)
-        eo_do(o, evas_obj_color_set(r, g, b, a),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_color_set(r, g, b, a),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -61,9 +61,9 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
-        eo_do(o_images[i], evas_obj_position_set(x, y),
-                           evas_obj_size_set(w, h));
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c
index 8e4227d..917a96c 100644
--- a/src/bin/rect_solid_few.c
+++ b/src/bin/rect_solid_few.c
@@ -35,7 +35,6 @@ static void _setup(void)
         r = ((rnd()&0xff) * a) / 255;
         g = ((rnd()&0xff) * a) / 255;
         b = ((rnd()&0xff) * a) / 255;
-        if (o)
         eo_do(o, evas_obj_color_set(r, g, b, a),
                  evas_obj_visibility_set(EINA_TRUE));
      }
@@ -64,7 +63,6 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_position_set(x, y),
                            evas_obj_size_set(w, h));
      }
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index c7ecb97..b331d6f 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -25,13 +25,12 @@ static void _setup(void)
 
    for (i = 0; i < OBNUM; i++)
      {
-        o = eo_add(EVAS_TEXT_CLASS, evas);
-        o_texts[i] = o;
-        if (o)
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
-                 evas_obj_text_set("This is a test string"),
-                 evas_obj_color_set(0, 0, 0, 255),
-                 evas_obj_visibility_set(EINA_TRUE));
+        o = eo_add(EVAS_TEXT_CLASS, evas);
+        o_texts[i] = o;
+        eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
+              evas_obj_text_set("This is a test string"),
+              evas_obj_color_set(0, 0, 0, 255),
+              evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
 }
@@ -50,14 +49,12 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (o_texts[i])
-        eo_do(o_texts[i], evas_obj_size_get(&w, &h));
-        x = (win_w / 2) - (w / 2);
-        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
-        y = (win_h / 2) - (h / 2);
-        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
-        if (o_texts[i])
-        eo_do(o_texts[i], evas_obj_position_set(x, y));
+        eo_do(o_texts[i], evas_obj_size_get(&w, &h));
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
+        eo_do(o_texts[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index 3114931..fe725a7 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -34,14 +34,12 @@ static void _setup(void)
      {
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        if (o)
         eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
         snprintf(buf, sizeof(buf), "%s %s %s %s.",
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-        if (o)
         eo_do(o, evas_obj_text_set(buf),
                  evas_obj_color_set(0, 0, 0, 255),
                  evas_obj_size_get(&w, &h));
@@ -49,7 +47,6 @@ static void _setup(void)
         x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
-        if (o)
         eo_do(o, evas_obj_position_set(x, y),
                  evas_obj_visibility_set(EINA_TRUE));
      }
@@ -80,7 +77,6 @@ static void _loop(double t, int f)
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-        if (o_texts[i])
         eo_do(o_texts[i], evas_obj_text_set(buf));
      }
    FPS_STD(NAME);
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index 5833efd..ad893fc 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -29,16 +29,16 @@ static void _setup(void)
      {
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        if (o)
-        eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
-                 evas_obj_text_set("This is a test string"),
-                 evas_obj_text_style_set(st),
-                 evas_obj_color_set(255, 255, 255, 255),
-                 evas_obj_text_shadow_color_set(0, 0, 0, 24),
-                 evas_obj_text_glow_color_set(100, 80, 40, 100),
-                 evas_obj_text_glow2_color_set(50, 10, 5, 50),
-                 evas_obj_text_outline_color_set(0, 0, 0, 255),
-                 evas_obj_visibility_set(EINA_TRUE));
+        eo_do(o,
+              evas_obj_text_font_set("Vera-Bold", 20),
+              evas_obj_text_set("This is a test string"),
+              evas_obj_text_style_set(st),
+              evas_obj_color_set(255, 255, 255, 255),
+              evas_obj_text_shadow_color_set(0, 0, 0, 24),
+              evas_obj_text_glow_color_set(100, 80, 40, 100),
+              evas_obj_text_glow2_color_set(50, 10, 5, 50),
+              evas_obj_text_outline_color_set(0, 0, 0, 255),
+              evas_obj_visibility_set(EINA_TRUE));
         st++;
         if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
      }
@@ -59,14 +59,12 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (o_texts[i])
-        eo_do(o_texts[i], evas_obj_size_get(&w, &h));
+        eo_do(o_texts[i], evas_obj_size_get(&w, &h));
         x = (win_w / 2) - (w / 2);
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
-        if (o_texts[i])
-        eo_do(o_texts[i], evas_obj_position_set(x, y));
+        eo_do(o_texts[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
 }
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index 0ccf9bc..6eb16ca 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -36,14 +36,12 @@ static void _setup(void)
      {
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-        if (o)
         eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
         snprintf(buf, sizeof(buf), "%s %s %s %s.",
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))],
                  strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-        if (o)
         eo_do(o, evas_obj_text_set(buf),
                  evas_obj_text_style_set(st),
                  evas_obj_color_set(255, 255, 255, 255),
@@ -72,13 +70,11 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-        if (o_texts[i])
         eo_do(o_texts[i], evas_obj_size_get(&w, &h));
         x = (win_w / 2) - (w / 2);
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
-        if (o_texts[i])
         eo_do(o_texts[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);
diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c
index 0824f2a..c0ec4ce 100644
--- a/src/bin/textblock_auto_align.c
+++ b/src/bin/textblock_auto_align.c
@@ -30,14 +30,10 @@ static void _setup(void)
      (st,
       "DEFAULT='font=Sans font_size=10 color=#000000 wrap=word'"
       );
-   if (o)
-        eo_do(o, evas_obj_textblock_style_set(st));
-   evas_textblock_style_free(st);
-   if (o)
-        eo_do(o, evas_obj_textblock_clear());
-
-   if (o)
-        eo_do(o, evas_obj_textblock_text_markup_set(
+   eo_do(o,
+         evas_obj_textblock_style_set(st),
+         evas_obj_textblock_clear(),
+         evas_obj_textblock_text_markup_set(
       "This is a test of auto alignment in Evas<ps/>"
       "<br/>"
       "This text should be left aligned<ps/>"
@@ -55,10 +51,9 @@ static void _setup(void)
       "words should appear in the following order: 'דוגמה' first, 'of' second,<br/>"
       "‎'טקסט' third, 'english' fourth and 'in' fifth, counting from right to left<ps/>"
       "דוגמה of טקסט in english."
-      ));
-
-   if (o)
-        eo_do(o, evas_obj_visibility_set(EINA_TRUE));
+      ),
+         evas_obj_visibility_set(EINA_TRUE));
+   evas_textblock_style_free(st);
 
    done = 0;
 }
@@ -75,17 +70,15 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h, w0, h0;
    int i = 0;
 
-   if (o_text)
-        eo_do(o_text, evas_obj_textblock_size_native_get(&w0, &h0));
+   eo_do(o_text, evas_obj_textblock_size_native_get(&w0, &h0));
    w = w0;
    h = h0;
    w += fabs(sin((double)(f + (i * 13)) / (31.1 * SLOW))) * (w0);
    x = (win_w / 2) - (w / 2);
    y = (win_h / 2) - (h0 / 2);
-   if (o_text)
-        eo_do(o_text, evas_obj_position_set(x, y));
-   if (o_text)
-        eo_do(o_text, evas_obj_size_set(w, h));
+   eo_do(o_text,
+         evas_obj_position_set(x, y),
+         evas_obj_size_set(w, h));
 
    FPS_STD(NAME);
 }
diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c
index 29b964c..c3841c8 100644
--- a/src/bin/textblock_basic.c
+++ b/src/bin/textblock_basic.c
@@ -39,14 +39,10 @@ static void _setup(void)
       "p='+ font=Vera,Kochi font_size=10 align=left'"
       "/p='- \n'"
       );
-   if (o)
-        eo_do(o, evas_obj_textblock_style_set(st));
-   evas_textblock_style_free(st);
-   if (o)
-        eo_do(o, evas_obj_textblock_clear());
-
-   if (o)
-        eo_do(o, evas_obj_textblock_text_markup_set(
+   eo_do(o,
+         evas_obj_textblock_style_set(st),
+         evas_obj_textblock_clear(),
+         evas_obj_textblock_text_markup_set(
       "<center><h1>Title</h1></center><br/>"
       "<p><tab>A pragraph here <red>red text</red> and stuff.</p>"
       "<p>And escaping &lt; and &gt; as well as &amp; as <h1>normal.</h1></p>"
@@ -115,10 +111,10 @@ static void _setup(void)
       "Heizölrückstoßabdämpfung fløde pingüino kilómetros cœur déçu l'âme "
       "plutôt naïve Louÿs rêva crapaüter Íosa Úrmhac Óighe pór Éava Ádhaim"
       "</blockquote>"
-      ));
+      ),
+         evas_obj_visibility_set(EINA_TRUE));
 
-   if (o)
-        eo_do(o, evas_obj_visibility_set(EINA_TRUE));
+   evas_textblock_style_free(st);
 
    done = 0;
 }
@@ -143,10 +139,9 @@ static void _loop(double t, int f)
    x += sin((double)(f + (i * 13)) / (86.7 * SLOW)) * (w0 / 2);
    y = (win_h / 2) - (h / 2);
    y += cos((double)(f + (i * 28)) / (93.8 * SLOW)) * (h0 / 2);
-   if (o_text)
-        eo_do(o_text, evas_obj_position_set(x, y));
-   if (o_text)
-        eo_do(o_text, evas_obj_size_set(w, 5000));
+   eo_do(o_text,
+         evas_obj_position_set(x, y),
+         evas_obj_size_set(w, 5000));
 
    FPS_STD(NAME);
 }
diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c
index 63301ed..7559599 100644
--- a/src/bin/textblock_intl.c
+++ b/src/bin/textblock_intl.c
@@ -30,14 +30,10 @@ static void _setup(void)
      (st,
       "DEFAULT='font=Sans font_size=10 align=left color=#000000 wrap=word'"
       );
-   if (o)
-        eo_do(o, evas_obj_textblock_style_set(st));
-   evas_textblock_style_free(st);
-   if (o)
-        eo_do(o, evas_obj_textblock_clear());
-
-   if (o)
-        eo_do(o, evas_obj_textblock_text_markup_set(
+   eo_do(o,
+         evas_obj_textblock_style_set(st),
+         evas_obj_textblock_clear(),
+         evas_obj_textblock_text_markup_set(
       "This is a test of International test rendering in Evas<br/>"
       "<br/>"
       "Danish: 'Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen'<br/>"
@@ -86,10 +82,10 @@ static void _setup(void)
       "Thai: 'ยูนืโคด'<br/>"
       "Tibetan: 'ཨུ་ནི་ཀོཌྲ།'<br/>"
       "Yiddish: 'יוניקאָד'<br/>"
-      ));
+      ),
+         evas_obj_visibility_set(EINA_TRUE));
 
-   if (o)
+   evas_textblock_style_free(st);