diff --git a/src/eval-apply.c b/src/eval-apply.c
index 45a5b4bb..c8ffb08a 100644
--- a/src/eval-apply.c
+++ b/src/eval-apply.c
@@ -884,6 +884,7 @@ begin_expand:
   x = cell_unspecified;
   while (R1 != cell_nil)
     {
+    begin_expand_while:
       gc_check ();
 
       if (TYPE (R1) == TPAIR)
@@ -921,7 +922,8 @@ begin_expand:
               R1 = cons (cell_symbol_begin, R1);
               CAR (R2) = R1;
               R1 = R2;
-              continue;
+              goto begin_expand_while;
+              continue; /* FIXME: M2-PLanet */
             }
         }
 
@@ -932,7 +934,8 @@ begin_expand:
         {
           CAR (R2) = R1;
           R1 = R2;
-          continue;
+          goto begin_expand_while;
+          continue; /* FIXME: M2-PLanet */
         }
       R1 = R2;
       expand_variable (CAR (R1), cell_nil);