--- a/ResourcePack.st	Wed Nov 08 12:18:05 2006 +0100
+++ b/ResourcePack.st	Thu Nov 09 13:24:45 2006 +0100
@@ -555,16 +555,18 @@
             hasError := true.
             printError value:('bad (nil-valued) macro: ' , macroName).
         ].
-        value isBlock ifTrue:[
-            value := value value
-        ].
-        value := Compiler evaluate:('self ' , rest)
-                          receiver:value
-                          notifying:nil
-                          compile:false.
-        (value == #Error) ifTrue:[
-            hasError := true.
-            printError value:('error in: "self ' , rest , '"').
+"/        value isBlock ifTrue:[
+"/            value := value value
+"/        ].
+        rest isBlank ifFalse:[
+            value := Compiler evaluate:('self ' , rest)
+                              receiver:value
+                              notifying:nil
+                              compile:false.
+            (value == #Error) ifTrue:[
+                hasError := true.
+                printError value:('error in: "self ' , rest , '"').
+            ]
         ]
     ] ifFalse:[
         lineStream peek == $' ifTrue:[
@@ -619,7 +621,7 @@
         ]
     ]
 
-    "Modified: / 23-10-2006 / 23:11:22 / cg"
+    "Modified: / 09-11-2006 / 13:17:48 / cg"
 ! !
 
 !ResourcePack methodsFor:'accessing'!
@@ -720,7 +722,9 @@
     |val alternativeKey rest usedKey idx|
 
     val := super at:aKey ifAbsent:nil.
-    val notNil ifTrue:[^ val].
+    val notNil ifTrue:[
+        ^ val value
+    ].
 
     (aKey isString and:[aKey size > 0]) ifTrue:[
         "/ try with case-first swapped...
@@ -793,7 +797,7 @@
     ^ nil.
 
     "Created: / 18-09-2006 / 17:33:27 / cg"
-    "Modified: / 07-10-2006 / 15:38:35 / cg"
+    "Modified: / 09-11-2006 / 13:19:26 / cg"
 !
 
 name:aKey default:default
@@ -1279,7 +1283,7 @@
 !ResourcePack class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.121 2006-10-27 17:24:17 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.122 2006-11-09 12:24:45 cg Exp $'
 ! !
 
 ResourcePack initialize!