--- a/SmallInteger.st	Fri Apr 13 09:37:08 2018 +0100
+++ b/SmallInteger.st	Tue Apr 24 12:23:14 2018 +0100
@@ -3290,22 +3290,7 @@
                  && (! ((INT)(__BlockInstPtr(aBlock)->b_flags) & __MASKSMALLINT(F_DYNAMIC)))
 # endif
                 ) {
-
-# ifdef NEW_BLOCK_CALL
-
 #                   define BLOCK_ARG  aBlock
-
-# else
-
-#                   define BLOCK_ARG  rHome
-                    REGISTER OBJ rHome;
-
-                    /*
-                     * home on stack - no need to refetch
-                     */
-                    rHome = __BlockInstPtr(aBlock)->b_home;
-                    if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE))
-# endif
                     {
 # ifdef __UNROLL_LOOPS__
 
@@ -3375,13 +3360,8 @@
 
 #           undef BLOCK_ARG
 
-# ifdef NEW_BLOCK_CALL
 #           define BLOCK_ARG  aBlock
 #           define IBLOCK_ARG nil
-# else
-#           define BLOCK_ARG  (__BlockInstPtr(aBlock)->b_home)
-#           define IBLOCK_ARG (__BlockInstPtr(aBlock)->b_home)
-# endif
 
             /*
              * sorry - must check for the blocks code within the loops;
@@ -3478,18 +3458,7 @@
 # endif
                 ) {
 
-# ifdef NEW_BLOCK_CALL
-
 #                   define BLOCK_ARG  aBlock
-
-# else
-
-#                   define BLOCK_ARG  rHome
-                    REGISTER OBJ rHome;
-                    rHome = __BlockInstPtr(aBlock)->b_home;
-                    if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE))
-
-# endif
                     {
                         if (step < 0) {
                             if (step == -1) {
@@ -3532,13 +3501,8 @@
 
 #           undef BLOCK_ARG
 
-# ifdef NEW_BLOCK_CALL
 #           define BLOCK_ARG  aBlock
 #           define IBLOCK_ARG nil
-# else
-#           define BLOCK_ARG  (__BlockInstPtr(aBlock)->b_home)
-#           define IBLOCK_ARG (__BlockInstPtr(aBlock)->b_home)
-# endif
 
             if (step < 0) {
                 while (tmp >= final) {
@@ -3688,17 +3652,7 @@
 
                 if ((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil) {
 
-# ifdef NEW_BLOCK_CALL
-
 #                   define BLOCK_ARG  aBlock
-
-# else
-
-#                   define BLOCK_ARG  rHome
-                    REGISTER OBJ rHome;
-                    rHome = __BlockInstPtr(aBlock)->b_home;
-                    if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE))
-# endif
                     {
 
 # ifdef PARANOIA
@@ -3865,13 +3819,8 @@
 
 #           undef BLOCK_ARG
 
-# ifdef NEW_BLOCK_CALL
 #           define BLOCK_ARG  aBlock
 #           define IBLOCK_ARG nil
-# else
-#           define BLOCK_ARG  (__BlockInstPtr(aBlock)->b_home)
-#           define IBLOCK_ARG (__BlockInstPtr(aBlock)->b_home)
-# endif
 
             /*
              * sorry - must check for the blocks code within the loops;