--- a/BlockContext.st	Tue Apr 30 10:54:00 2013 +0100
+++ b/BlockContext.st	Tue May 21 21:58:09 2013 +0100
@@ -127,15 +127,13 @@
 
     |con h|
 
-    home isNil ifTrue:[^ nil]. "XXX will change soon"
     home isContext ifFalse:[^ nil]. "copying blocks have no method home"
 
-    con := self.
     h := home.
-    [h notNil] whileTrue:[
-	con := h.
-	h := con home
-    ].
+    [
+        con := h.
+        h := con home
+    ] doWhile:[h notNil].
     ^ con
 !
 
@@ -169,7 +167,7 @@
 
     |cls who mHome m className sel homeSel|
 
-    (home isNil or:[home isContext not]) ifTrue:[
+    home isContext ifFalse:[
         "
          mhmh - an optimized blocks context
          should get the block here, and get the method from
@@ -254,9 +252,10 @@
 !BlockContext class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/BlockContext.st,v 1.35 2012-07-19 09:24:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/BlockContext.st,v 1.36 2013-05-07 13:23:42 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/BlockContext.st,v 1.35 2012-07-19 09:24:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/BlockContext.st,v 1.36 2013-05-07 13:23:42 stefan Exp $'
 ! !
+