--- a/Parser.st	Fri Dec 02 14:22:47 2016 +0100
+++ b/Parser.st	Wed Dec 07 17:43:52 2016 +0100
@@ -7883,10 +7883,10 @@
     autoDefineVariables isNil ifTrue:[
         autoDefineVariables := false.    
         requestor notNil ifTrue:[
-            autoDefineVariables := requestor perform:#autoDefineVariables ifNotUnderstood:false.
+            autoDefineVariables := (requestor perform:#autoDefineVariables ifNotUnderstood:false) ? false.
         ]
     ].    
-    (autoDefineVariables ~~ false) ifTrue:[
+    autoDefineVariables ~~ false ifTrue:[
         var := self variableOrError:varName.
         self nextToken.
         
@@ -7897,9 +7897,11 @@
                     holder := self addDoItTemporary:varName.
                     var := VariableNode type:#DoItTemporary holder:holder name:varName.
                 ] ifFalse:[
-                    "/ as workspace var (only within doIts)    
-                    holder := Workspace addWorkspaceVariable:varName.
-                    var := VariableNode type:#WorkspaceVariable holder:holder name:varName.
+                    autoDefineVariables == #workspace ifTrue:[
+                        "/ as workspace var (only within doIts)    
+                        holder := Workspace addWorkspaceVariable:varName.
+                        var := VariableNode type:#WorkspaceVariable holder:holder name:varName.
+                    ].
                 ].
             ] ifFalse:[
                 var := self correctVariable:varName atPosition:pos1 to:pos2.
@@ -9096,7 +9098,7 @@
     autoDefineVariables isNil ifTrue:[
         autoDefineVariables := false.    
         (requestor notNil and:[requestor isStream not]) ifTrue:[
-            autoDefineVariables := requestor perform:#autoDefineVariables ifNotUnderstood:false.
+            autoDefineVariables := (requestor perform:#autoDefineVariables ifNotUnderstood:false) ? false.
         ]
     ].    
     (autoDefineVariables ~~ false) ifTrue:[