--- a/WeakArray.st	Fri Apr 13 09:37:08 2018 +0100
+++ b/WeakArray.st	Tue Apr 24 12:23:14 2018 +0100
@@ -1,5 +1,6 @@
 "
  COPYRIGHT (c) 1991 by Claus Gittinger
+ COPYRIGHT (c) 2018-now Jan Vrany
 	      All Rights Reserved
 
  This software is furnished under a license and may be used
@@ -25,6 +26,7 @@
 copyright
 "
  COPYRIGHT (c) 1991 by Claus Gittinger
+ COPYRIGHT (c) 2018-now Jan Vrany
 	      All Rights Reserved
 
  This software is furnished under a license and may be used
@@ -533,15 +535,7 @@
             if (((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
              && (! ((INT)(__BlockInstPtr(aBlock)->b_flags) & __MASKSMALLINT(F_DYNAMIC)))) {
 
-#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
                 {
                     for (; index < nIndex; index++) {
                         if (InterruptPending != nil) __interruptL(@line);
@@ -569,14 +563,8 @@
          * it could be recompiled or flushed
          */
 #       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
-
         for (; index < nIndex; index++) {
             REGISTER OBJFUNC codeVal;
 
@@ -716,15 +704,8 @@
             if (((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
              && (! ((INT)(__BlockInstPtr(aBlock)->b_flags) & __MASKSMALLINT(F_DYNAMIC)))) {
 
-#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
                 {
                     for (; index < nIndex; index++) {
                         element = __InstPtr(self)->i_instvars[index];
@@ -759,14 +740,8 @@
          * it could be recompiled or flushed
          */
 #       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
-
         for (; index < nIndex; index++) {
             REGISTER OBJFUNC codeVal;
 
@@ -873,15 +848,8 @@
             if (((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
              && (! ((INT)(__BlockInstPtr(aBlock)->b_flags) & __MASKSMALLINT(F_DYNAMIC)))) {
 
-#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
                 {
                     for (; index < nIndex; index++) {
                         element = __InstPtr(self)->i_instvars[index];
@@ -916,14 +884,8 @@
          * it could be recompiled or flushed
          */
 #       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
-
         for (; index < nIndex; index++) {
             REGISTER OBJFUNC codeVal;