diff --git a/gx/frontend/main.c b/gx/frontend/main.c
index ad87c9314c..fe9cec471d 100644
--- a/gx/frontend/main.c
+++ b/gx/frontend/main.c
@@ -572,17 +572,13 @@ int main(int argc, char *argv[])
 begin_loop:
    if(g_extern.console.rmenu.mode == MODE_EMULATION)
    {
-      bool repeat = false;
-
       input_gx.poll(NULL);
 
       video_set_aspect_ratio_func(g_settings.video.aspect_ratio_idx);
 
       audio_start_func();
 
-      do{
-         repeat = rarch_main_iterate();
-      }while(repeat);
+      while(rarch_main_iterate());
 
       audio_stop_func();
    }
diff --git a/ps3/frontend/main.c b/ps3/frontend/main.c
index f30fbb49bb..ba7b2209fe 100644
--- a/ps3/frontend/main.c
+++ b/ps3/frontend/main.c
@@ -229,8 +229,6 @@ static void get_environment_settings(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-   bool repeat = false;
-
 #ifdef HAVE_SYSUTILS
    RARCH_LOG("Registering system utility callback...\n");
    cellSysutilRegisterCallback(0, callback_sysutil_exit, NULL);
@@ -352,15 +350,11 @@ begin_loop:
 
       driver.video->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
 
-      do{
-         repeat = rarch_main_iterate();
-      }while(repeat);
+      while(rarch_main_iterate());
    }
    else if(g_extern.console.rmenu.mode == MODE_MENU)
    {
-      do{
-         repeat = rmenu_iterate();
-      }while(repeat);
+      while(rmenu_iterate());
 
       if (g_extern.console.rmenu.mode != MODE_EXIT)
          rarch_startup(default_paths.config_file);
diff --git a/psp/frontend/main.c b/psp/frontend/main.c
index 527e6a3d39..259badc38d 100644
--- a/psp/frontend/main.c
+++ b/psp/frontend/main.c
@@ -158,7 +158,6 @@ int main(int argc, char *argv[])
    menu_init();
 
 begin_loop:
-   bool repeat = false;
    if(g_extern.console.rmenu.mode == MODE_EMULATION)
    {
 
@@ -174,16 +173,14 @@ begin_loop:
 
       int count = 0;
 
-      do{
-         repeat = rarch_main_iterate();
+      while(rarch_main_iterate())
+      {
          RARCH_LOG("Iterate: %d\n", count++);
-      }while(repeat);
+      }
    }
    else if(g_extern.console.rmenu.mode == MODE_MENU)
    {
-      do{
-         repeat = rmenu_iterate();
-      }while(repeat);
+      while(rmenu_iterate());
 
       if (g_extern.console.rmenu.mode != MODE_EXIT)
          rarch_startup(default_paths.config_file);
diff --git a/xdk/frontend/main.c b/xdk/frontend/main.c
index 4202252b59..97a0746e4c 100644
--- a/xdk/frontend/main.c
+++ b/xdk/frontend/main.c
@@ -182,7 +182,6 @@ int main(int argc, char *argv[])
    menu_init();
 
 begin_loop:
-   bool repeat = false;
    if(g_extern.console.rmenu.mode == MODE_EMULATION)
    {
 
@@ -190,15 +189,11 @@ begin_loop:
 
       driver.video->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
 
-      do{
-         repeat = rarch_main_iterate();
-      }while(repeat);
+      while(rarch_main_iterate());
    }
    else if(g_extern.console.rmenu.mode == MODE_MENU)
    {
-      do{
-         repeat = rmenu_iterate();
-      }while(repeat);
+      while(rmenu_iterate());
 
       if (g_extern.console.rmenu.mode != MODE_EXIT)
          rarch_startup(default_paths.config_file);