Index: tol/btol/bgrammar/oprimp.cpp
===================================================================
--- tol/btol/bgrammar/oprimp.cpp	(revision 0a84c2bdfaff30b825b1688fa699d69b252b813e)
+++ tol/btol/bgrammar/oprimp.cpp	(revision dbf6f72253a6f5ca05f1bd9936514b448d45a132)
@@ -1644,8 +1644,4 @@
     const BNameBlock* oldNameBlock = BNameBlock::Current();
     const BNameBlock* funNameBlock = NameBlock();
-    if(funNameBlock && funNameBlock->Class() && !IsMethod()) 
-    { 
-      funNameBlock = NULL; 
-    }
     if(funNameBlock && !funNameBlock->EnsureIsAssigned())
     {