Compiler-IR: #visitOrAlias: instead of #alias: in a few places

src/Helios-Announcements.js

@@ -14,9 +14,7 @@ selector: "actionBlock",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@actionBlock"];
-return $1;
+return self["@actionBlock"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -83,9 +81,7 @@ selector: "code",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@code"];
-return $1;
+return self["@code"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -126,12 +122,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._code_(aCodeModel);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._code_(aCodeModel);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{aCodeModel:aCodeModel},$globals.HLCodeHandled.klass)});
 //>>excludeEnd("ctx");
@@ -162,9 +156,7 @@ selector: "context",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@context"];
-return $1;
+return self["@context"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -207,9 +199,7 @@ selector: "context",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@context"];
-return $1;
+return self["@context"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -264,9 +254,7 @@ selector: "error",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@error"];
-return $1;
+return self["@error"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -309,9 +297,7 @@ selector: "column",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@column"];
-return $1;
+return self["@column"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -348,9 +334,7 @@ selector: "line",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@line"];
-return $1;
+return self["@line"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -387,9 +371,7 @@ selector: "message",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@message"];
-return $1;
+return self["@message"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -453,9 +435,7 @@ selector: "theClass",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@theClass"];
-return $1;
+return self["@theClass"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -492,9 +472,7 @@ selector: "variableName",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@variableName"];
-return $1;
+return self["@variableName"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -534,9 +512,7 @@ selector: "item",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@item"];
-return $1;
+return self["@item"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -577,12 +553,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._item_(anItem);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._item_(anItem);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{anItem:anItem},$globals.HLItemSelected.klass)});
 //>>excludeEnd("ctx");
@@ -619,9 +593,7 @@ selector: "item",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@item"];
-return $1;
+return self["@item"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -662,12 +634,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._item_(anItem);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._item_(anItem);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{anItem:anItem},$globals.HLItemUnselected.klass)});
 //>>excludeEnd("ctx");
@@ -695,9 +665,7 @@ selector: "testSuiteRunner",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@testSuiteRunner"];
-return $1;
+return self["@testSuiteRunner"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -738,12 +706,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._testSuiteRunner_(aTestSuiteRunner);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._testSuiteRunner_(aTestSuiteRunner);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{aTestSuiteRunner:aTestSuiteRunner},$globals.HLRunTests.klass)});
 //>>excludeEnd("ctx");
@@ -768,9 +734,7 @@ selector: "searchString",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@searchString"];
-return $1;
+return self["@searchString"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -816,9 +780,7 @@ selector: "template",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@template"];
-return $1;
+return self["@template"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -861,9 +823,7 @@ selector: "label",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@label"];
-return $1;
+return self["@label"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -900,9 +860,7 @@ selector: "widget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@widget"];
-return $1;
+return self["@widget"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);

src/Helios-Commands-Browser.js

@@ -15,9 +15,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(aModel)._isBrowserModel();
-return $1;
+return $recv(aModel)._isBrowserModel();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isValidFor:",{aModel:aModel},$globals.HLBrowserCommand.klass)});
 //>>excludeEnd("ctx");
@@ -43,9 +41,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(aModel)._isBrowserModel();
-return $1;
+return $recv(aModel)._isBrowserModel();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isValidFor:",{aModel:aModel},$globals.HLBrowserGoToCommand.klass)});
 //>>excludeEnd("ctx");
@@ -508,13 +504,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $3,$2,$1;
-$3=self._model();
+var $2,$1;
+$2=self._model();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["model"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($3)._showComment();
-$1=$recv($2)._and_((function(){
+$1=$recv($2)._showComment();
+return $recv($1)._and_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -523,7 +519,6 @@ return $recv($recv(self._model())._selectedClass())._notNil();
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isActive",{},$globals.HLEditCommentCommand)});
 //>>excludeEnd("ctx");
@@ -710,7 +705,7 @@ function $HLInitializeGenerator(){return $globals.HLInitializeGenerator||(typeof
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4,$5;
+var $1,$2,$3;
 $1=self._model();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["model"]=1;
@@ -719,14 +714,13 @@ targetClass=$recv($1)._selectedClass();
 $2=$recv($HLInitializeGenerator())._new();
 $recv($2)._class_(targetClass);
 $recv($2)._generate();
-$3=$recv($2)._output();
-output=$3;
+output=$recv($2)._output();
 $recv(output)._compile();
 first=$recv($recv(output)._sourceCodes())._first();
-$4=self._model();
-$recv($4)._selectedProtocol_($recv(output)._protocol());
-$recv($4)._selectedMethod_($recv(targetClass).__gt_gt($recv(first)._selector()));
-$5=$recv($4)._focusOnSourceCode();
+$3=self._model();
+$recv($3)._selectedProtocol_($recv(output)._protocol());
+$recv($3)._selectedMethod_($recv(targetClass).__gt_gt($recv(first)._selector()));
+$recv($3)._focusOnSourceCode();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"execute",{targetClass:targetClass,output:output,first:first},$globals.HLGenerateAccessorsCommand)});
@@ -794,7 +788,7 @@ function $HLAccessorsGenerator(){return $globals.HLAccessorsGenerator||(typeof H
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3;
+var $1,$2;
 $1=self._model();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["model"]=1;
@@ -803,8 +797,7 @@ targetClass=$recv($1)._selectedClass();
 $2=$recv($HLAccessorsGenerator())._new();
 $recv($2)._class_(targetClass);
 $recv($2)._generate();
-$3=$recv($2)._output();
-output=$3;
+output=$recv($2)._output();
 $recv(output)._compile();
 $recv(self._model())._selectedProtocol_($recv(output)._protocol());
 return self;

src/Helios-Commands-Core.js

@@ -15,12 +15,10 @@ function $HLBindingAction(){return $globals.HLBindingAction||(typeof HLBindingAc
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=$recv($HLBindingAction())._on_labelled_(self._keyCode(),self._label());
-$recv($2)._command_(self);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=$recv($HLBindingAction())._on_labelled_(self._keyCode(),self._label());
+$recv($1)._command_(self);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"asActionBinding",{},$globals.HLCommand)});
 //>>excludeEnd("ctx");
@@ -43,14 +41,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=self._isBindingGroup();
-if($core.assert($2)){
-$1=self._asGroupBinding();
+var $1;
+$1=self._isBindingGroup();
+if($core.assert($1)){
+return self._asGroupBinding();
 } else {
-$1=self._asActionBinding();
+return self._asActionBinding();
 };
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"asBinding",{},$globals.HLCommand)});
 //>>excludeEnd("ctx");
@@ -74,9 +71,7 @@ function $HLBindingGroup(){return $globals.HLBindingGroup||(typeof HLBindingGrou
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($HLBindingGroup())._on_labelled_(self._keyCode(),self._label());
-return $1;
+return $recv($HLBindingGroup())._on_labelled_(self._keyCode(),self._label());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"asGroupBinding",{},$globals.HLCommand)});
 //>>excludeEnd("ctx");
@@ -141,9 +136,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._class())._documentation();
-return $1;
+return $recv(self._class())._documentation();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"documentation",{},$globals.HLCommand)});
 //>>excludeEnd("ctx");
@@ -181,9 +174,7 @@ selector: "input",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@input"];
-return $1;
+return self["@input"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -222,9 +213,7 @@ selector: "inputCompletion",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=[];
-return $1;
+return [];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -245,9 +234,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._label();
-return $1;
+return self._label();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inputLabel",{},$globals.HLCommand)});
 //>>excludeEnd("ctx");
@@ -270,9 +257,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._isBindingGroup())._not();
-return $1;
+return $recv(self._isBindingGroup())._not();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isAction",{},$globals.HLCommand)});
 //>>excludeEnd("ctx");
@@ -313,9 +298,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv($recv(self._class())._methodDictionary())._includesKey_("execute"))._not();
-return $1;
+return $recv($recv($recv(self._class())._methodDictionary())._includesKey_("execute"))._not();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isBindingGroup",{},$globals.HLCommand)});
 //>>excludeEnd("ctx");
@@ -356,9 +339,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._class())._key();
-return $1;
+return $recv(self._class())._key();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"key",{},$globals.HLCommand)});
 //>>excludeEnd("ctx");
@@ -381,9 +362,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._key())._asUppercase())._charCodeAt_((1));
-return $1;
+return $recv($recv(self._key())._asUppercase())._charCodeAt_((1));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"keyCode",{},$globals.HLCommand)});
 //>>excludeEnd("ctx");
@@ -406,9 +385,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._class())._label();
-return $1;
+return $recv(self._class())._label();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"label",{},$globals.HLCommand)});
 //>>excludeEnd("ctx");
@@ -431,9 +408,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._class())._menuLabel();
-return $1;
+return $recv(self._class())._menuLabel();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"menuLabel",{},$globals.HLCommand)});
 //>>excludeEnd("ctx");
@@ -456,9 +431,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(aBinding)._add_(self._asBinding());
-return $1;
+return $recv(aBinding)._add_(self._asBinding());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"registerOn:",{aBinding:aBinding},$globals.HLCommand)});
 //>>excludeEnd("ctx");
@@ -484,7 +457,7 @@ function $OrderedCollection(){return $globals.OrderedCollection||(typeof Ordered
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 classes=$recv($OrderedCollection())._new();
 $1=self._isConcrete();
 if($core.assert($1)){
@@ -499,8 +472,7 @@ return $recv(classes)._addAll_($recv(each)._concreteClasses());
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)});
 //>>excludeEnd("ctx");
 }));
-$2=classes;
-return $2;
+return classes;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"concreteClasses",{classes:classes},$globals.HLCommand.klass)});
 //>>excludeEnd("ctx");
@@ -541,9 +513,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._key())._notNil();
-return $1;
+return $recv(self._key())._notNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isConcrete",{},$globals.HLCommand.klass)});
 //>>excludeEnd("ctx");
@@ -620,9 +590,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._label();
-return $1;
+return self._label();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"menuLabel",{},$globals.HLCommand.klass)});
 //>>excludeEnd("ctx");
@@ -687,9 +655,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._new())._registerOn_(aBinding);
-return $1;
+return $recv(self._new())._registerOn_(aBinding);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"registerOn:",{aBinding:aBinding},$globals.HLCommand.klass)});
 //>>excludeEnd("ctx");
@@ -775,9 +741,7 @@ selector: "model",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@model"];
-return $1;
+return self["@model"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -818,9 +782,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._new();
-return $1;
+return self._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"for:",{aModel:aModel},$globals.HLModelCommand.klass)});
 //>>excludeEnd("ctx");
@@ -893,9 +855,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._for_(aModel))._registerOn_(aBinding);
-return $1;
+return $recv(self._for_(aModel))._registerOn_(aBinding);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"registerOn:for:",{aBinding:aBinding,aModel:aModel},$globals.HLModelCommand.klass)});
 //>>excludeEnd("ctx");
@@ -960,9 +920,7 @@ function $HLBrowser(){return $globals.HLBrowser||(typeof HLBrowser=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($HLBrowser())._openAsTab();
-return $1;
+return $recv($HLBrowser())._openAsTab();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"execute",{},$globals.HLOpenBrowserCommand)});
 //>>excludeEnd("ctx");
@@ -1025,9 +983,7 @@ function $HLSUnit(){return $globals.HLSUnit||(typeof HLSUnit=="undefined"?nil:HL
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($HLSUnit())._openAsTab();
-return $1;
+return $recv($HLSUnit())._openAsTab();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"execute",{},$globals.HLOpenSUnitCommand)});
 //>>excludeEnd("ctx");
@@ -1090,9 +1046,7 @@ function $HLWorkspace(){return $globals.HLWorkspace||(typeof HLWorkspace=="undef
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($HLWorkspace())._openAsTab();
-return $1;
+return $recv($HLWorkspace())._openAsTab();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"execute",{},$globals.HLOpenWorkspaceCommand)});
 //>>excludeEnd("ctx");
@@ -1156,15 +1110,15 @@ function $HLTabSelectionWidget(){return $globals.HLTabSelectionWidget||(typeof H
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
+var $1;
 activeTab=self._selectedTab();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["selectedTab"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($HLTabSelectionWidget())._new();
-$recv($2)._tabs_(self._tabs());
-$recv($2)._selectedTab_(self._selectedTab());
-$recv($2)._selectCallback_((function(tab){
+$1=$recv($HLTabSelectionWidget())._new();
+$recv($1)._tabs_(self._tabs());
+$recv($1)._selectedTab_(self._selectedTab());
+$recv($1)._selectCallback_((function(tab){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1176,7 +1130,7 @@ $ctx2.sendIdx["activate"]=1;
 }, function($ctx2) {$ctx2.fillBlock({tab:tab},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-$recv($2)._confirmCallback_((function(tab){
+$recv($1)._confirmCallback_((function(tab){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1185,7 +1139,7 @@ return $recv(tab)._focus();
 }, function($ctx2) {$ctx2.fillBlock({tab:tab},$ctx1,2)});
 //>>excludeEnd("ctx");
 }));
-$recv($2)._cancelCallback_((function(){
+$recv($1)._cancelCallback_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1194,9 +1148,7 @@ return $recv(activeTab)._activate();
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,3)});
 //>>excludeEnd("ctx");
 }));
-$3=$recv($2)._show();
-$1=$3;
-return $1;
+return $recv($1)._show();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"execute",{activeTab:activeTab},$globals.HLSwitchTabCommand)});
 //>>excludeEnd("ctx");
@@ -1220,9 +1172,7 @@ function $HLManager(){return $globals.HLManager||(typeof HLManager=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv($HLManager())._current())._activeTab();
-return $1;
+return $recv($recv($HLManager())._current())._activeTab();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectedTab",{},$globals.HLSwitchTabCommand)});
 //>>excludeEnd("ctx");
@@ -1246,9 +1196,7 @@ function $HLManager(){return $globals.HLManager||(typeof HLManager=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv($HLManager())._current())._tabs();
-return $1;
+return $recv($recv($HLManager())._current())._tabs();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"tabs",{},$globals.HLSwitchTabCommand)});
 //>>excludeEnd("ctx");

src/Helios-Commands-SUnit.js

@@ -19,9 +19,7 @@ function $HLSUnitModel(){return $globals.HLSUnitModel||(typeof HLSUnitModel=="un
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(aModel)._isKindOf_($HLSUnitModel());
-return $1;
+return $recv(aModel)._isKindOf_($HLSUnitModel());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isValidFor:",{aModel:aModel},$globals.HLSUnitCommand.klass)});
 //>>excludeEnd("ctx");
@@ -133,9 +131,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self["@model"])._selectedPackages())._notEmpty();
-return $1;
+return $recv($recv(self["@model"])._selectedPackages())._notEmpty();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isActive",{},$globals.HLSUnitInvertSelectedClassesCommand)});
 //>>excludeEnd("ctx");
@@ -470,9 +466,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self["@model"])._selectedPackages())._notEmpty();
-return $1;
+return $recv($recv(self["@model"])._selectedPackages())._notEmpty();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isActive",{},$globals.HLSUnitSelectAllClassesCommand)});
 //>>excludeEnd("ctx");

src/Helios-Commands-Tools.js

@@ -33,12 +33,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._model_(aToolModel);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._model_(aToolModel);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"for:",{aToolModel:aToolModel},$globals.HLToolCommand.klass)});
 //>>excludeEnd("ctx");
@@ -61,9 +59,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(aModel)._isToolModel();
-return $1;
+return $recv(aModel)._isToolModel();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isValidFor:",{aModel:aModel},$globals.HLToolCommand.klass)});
 //>>excludeEnd("ctx");
@@ -131,9 +127,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(aModel)._isReferencesModel();
-return $1;
+return $recv(aModel)._isReferencesModel();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isValidFor:",{aModel:aModel},$globals.HLBrowseMethodCommand.klass)});
 //>>excludeEnd("ctx");
@@ -277,10 +271,10 @@ function $HLInformationWidget(){return $globals.HLInformationWidget||(typeof HLI
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv($HLInformationWidget())._new();
 $recv($1)._informationString_("Commit successful!");
-$2=$recv($1)._show();
+$recv($1)._show();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"informSuccess",{},$globals.HLCommitPackageCommand)});
@@ -443,9 +437,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv($recv(self._model())._selectedClass())._theNonMetaClass())._name();
-return $1;
+return $recv($recv($recv(self._model())._selectedClass())._theNonMetaClass())._name();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"defaultInput",{},$globals.HLCopyClassCommand)});
 //>>excludeEnd("ctx");
@@ -510,9 +502,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._model())._selectedClass())._notNil();
-return $1;
+return $recv($recv(self._model())._selectedClass())._notNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isActive",{},$globals.HLCopyClassCommand)});
 //>>excludeEnd("ctx");
@@ -691,9 +681,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._model())._availableClassNames();
-return $1;
+return $recv(self._model())._availableClassNames();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inputCompletion",{},$globals.HLFindClassCommand)});
 //>>excludeEnd("ctx");
@@ -853,10 +841,10 @@ function $HLReferences(){return $globals.HLReferences||(typeof HLReferences=="un
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv($HLReferences())._new();
 $recv($1)._openAsTab();
-$2=$recv($1)._search_(self._input());
+$recv($1)._search_(self._input());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"execute",{},$globals.HLFindReferencesCommand)});
@@ -880,14 +868,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $3,$2,$1;
-$3=self._model();
+var $2,$1;
+$2=self._model();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["model"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($3)._availableClassNames();
-$1=$recv($2).__comma($recv(self._model())._allSelectors());
-return $1;
+$1=$recv($2)._availableClassNames();
+return $recv($1).__comma($recv(self._model())._allSelectors());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inputCompletion",{},$globals.HLFindReferencesCommand)});
 //>>excludeEnd("ctx");
@@ -1024,9 +1011,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._model())._selectedClass())._notNil();
-return $1;
+return $recv($recv(self._model())._selectedClass())._notNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isActive",{},$globals.HLMoveClassToCommand)});
 //>>excludeEnd("ctx");
@@ -1148,9 +1133,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._model())._availablePackageNames();
-return $1;
+return $recv(self._model())._availablePackageNames();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inputCompletion",{},$globals.HLMoveClassToPackageCommand)});
 //>>excludeEnd("ctx");
@@ -1284,9 +1267,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._model())._selectedMethod())._notNil();
-return $1;
+return $recv($recv(self._model())._selectedMethod())._notNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isActive",{},$globals.HLMoveMethodToCommand)});
 //>>excludeEnd("ctx");
@@ -1390,9 +1371,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._model())._availableClassNames();
-return $1;
+return $recv(self._model())._availableClassNames();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inputCompletion",{},$globals.HLMoveMethodToClassCommand)});
 //>>excludeEnd("ctx");
@@ -1550,9 +1529,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._model())._availableProtocols();
-return $1;
+return $recv(self._model())._availableProtocols();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inputCompletion",{},$globals.HLMoveMethodToProtocolCommand)});
 //>>excludeEnd("ctx");
@@ -1749,9 +1726,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._model())._selectedClass())._notNil();
-return $1;
+return $recv($recv(self._model())._selectedClass())._notNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isActive",{},$globals.HLRemoveClassCommand)});
 //>>excludeEnd("ctx");
@@ -1873,9 +1848,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._model())._selectedMethod())._notNil();
-return $1;
+return $recv($recv(self._model())._selectedMethod())._notNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isActive",{},$globals.HLRemoveMethodCommand)});
 //>>excludeEnd("ctx");
@@ -1997,9 +1970,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._model())._selectedProtocol())._notNil();
-return $1;
+return $recv($recv(self._model())._selectedProtocol())._notNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isActive",{},$globals.HLRemoveProtocolCommand)});
 //>>excludeEnd("ctx");
@@ -2136,9 +2107,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv($recv(self._model())._selectedClass())._theNonMetaClass())._name();
-return $1;
+return $recv($recv($recv(self._model())._selectedClass())._theNonMetaClass())._name();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"defaultInput",{},$globals.HLRenameClassCommand)});
 //>>excludeEnd("ctx");
@@ -2203,9 +2172,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._model())._selectedClass())._notNil();
-return $1;
+return $recv($recv(self._model())._selectedClass())._notNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isActive",{},$globals.HLRenameClassCommand)});
 //>>excludeEnd("ctx");
@@ -2321,9 +2288,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._model())._selectedPackage())._name();
-return $1;
+return $recv($recv(self._model())._selectedPackage())._name();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"defaultInput",{},$globals.HLRenamePackageCommand)});
 //>>excludeEnd("ctx");
@@ -2388,9 +2353,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._model())._selectedPackage())._notNil();
-return $1;
+return $recv($recv(self._model())._selectedPackage())._notNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isActive",{},$globals.HLRenamePackageCommand)});
 //>>excludeEnd("ctx");
@@ -2506,9 +2469,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._model())._selectedProtocol();
-return $1;
+return $recv(self._model())._selectedProtocol();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"defaultInput",{},$globals.HLRenameProtocolCommand)});
 //>>excludeEnd("ctx");
@@ -2573,9 +2534,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._model())._selectedProtocol())._notNil();
-return $1;
+return $recv($recv(self._model())._selectedProtocol())._notNil();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isActive",{},$globals.HLRenameProtocolCommand)});
 //>>excludeEnd("ctx");

src/Helios-Debugger.js

@@ -20,9 +20,7 @@ selector: "context",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@context"];
-return $1;
+return self["@context"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -43,9 +41,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._context())._evaluate_on_(aString,anEvaluator);
-return $1;
+return $recv(self._context())._evaluate_on_(aString,anEvaluator);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"evaluate:on:",{aString:aString,anEvaluator:anEvaluator},$globals.HLContextInspectorDecorator)});
 //>>excludeEnd("ctx");
@@ -89,7 +85,7 @@ function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4,$receiver;
+var $1,$2,$3,$receiver;
 variables=$recv($Dictionary())._new();
 inspectedContext=self._context();
 $1=variables;
@@ -134,7 +130,7 @@ return $recv(variables)._addAll_($recv(inspectedContext)._locals());
 //>>excludeEnd("ctx");
 }));
 $recv(anInspector)._setLabel_("Context");
-$4=$recv(anInspector)._setVariables_(variables);
+$recv(anInspector)._setVariables_(variables);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inspectOn:",{anInspector:anInspector,variables:variables,inspectedContext:inspectedContext},$globals.HLContextInspectorDecorator)});
@@ -159,12 +155,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._initializeFromContext_(aContext);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._initializeFromContext_(aContext);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{aContext:aContext},$globals.HLContextInspectorDecorator.klass)});
 //>>excludeEnd("ctx");
@@ -194,35 +188,33 @@ function $HLDebuggerCodeModel(){return $globals.HLDebuggerCodeModel||(typeof HLD
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$4,$6,$7,$8,$9,$5,$10,$1,$receiver;
-$2=self["@codeWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
-$3=$recv($HLDebuggerCodeWidget())._new();
+var $1,$2,$3,$5,$6,$7,$8,$4,$receiver;
+$1=self["@codeWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
+$2=$recv($HLDebuggerCodeWidget())._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
-$4=$3;
-$6=$recv($HLDebuggerCodeModel())._new();
-$7=$6;
-$8=self._model();
+$3=$2;
+$5=$recv($HLDebuggerCodeModel())._new();
+$6=$5;
+$7=self._model();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["model"]=1;
 //>>excludeEnd("ctx");
-$recv($7)._debuggerModel_($8);
-$9=$recv($6)._yourself();
+$recv($6)._debuggerModel_($7);
+$8=$recv($5)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["yourself"]=1;
 //>>excludeEnd("ctx");
-$5=$9;
-$recv($4)._model_($5);
-$recv($3)._browserModel_(self._model());
-$10=$recv($3)._yourself();
-self["@codeWidget"]=$10;
-$1=self["@codeWidget"];
+$4=$8;
+$recv($3)._model_($4);
+$recv($2)._browserModel_(self._model());
+self["@codeWidget"]=$recv($2)._yourself();
+return self["@codeWidget"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"codeWidget",{},$globals.HLDebugger)});
 //>>excludeEnd("ctx");
@@ -245,8 +237,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=(
+var $1;
+$1=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
@@ -254,8 +246,7 @@ $globals.HLDebugger.superclass.fn.prototype._cssClass.apply($recv(self), []));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$1=$recv($2).__comma(" hl_debugger");
-return $1;
+return $recv($1).__comma(" hl_debugger");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"cssClass",{},$globals.HLDebugger)});
 //>>excludeEnd("ctx");
@@ -329,15 +320,14 @@ function $HLInspectorWidget(){return $globals.HLInspectorWidget||(typeof HLInspe
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@inspectorWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@inspectorWidget"]=$recv($HLInspectorWidget())._new();
+var $1,$receiver;
 $1=self["@inspectorWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@inspectorWidget"]=$recv($HLInspectorWidget())._new();
+return self["@inspectorWidget"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inspectorWidget",{},$globals.HLDebugger)});
 //>>excludeEnd("ctx");
@@ -361,15 +351,14 @@ function $HLDebuggerModel(){return $globals.HLDebuggerModel||(typeof HLDebuggerM
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@model"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@model"]=$recv($HLDebuggerModel())._new();
+var $1,$receiver;
 $1=self["@model"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@model"]=$recv($HLDebuggerModel())._new();
+return self["@model"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"model",{},$globals.HLDebugger)});
 //>>excludeEnd("ctx");
@@ -395,7 +384,7 @@ function $HLDebuggerProceeded(){return $globals.HLDebuggerProceeded||(typeof HLD
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv(self._model())._announcer();
 $recv($1)._on_send_to_($HLDebuggerContextSelected(),"onContextSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -405,7 +394,7 @@ $recv($1)._on_send_to_($HLDebuggerStepped(),"onDebuggerStepped:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=2;
 //>>excludeEnd("ctx");
-$2=$recv($1)._on_send_to_($HLDebuggerProceeded(),"onDebuggerProceeded",self);
+$recv($1)._on_send_to_($HLDebuggerProceeded(),"onDebuggerProceeded",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLDebugger)});
@@ -610,18 +599,16 @@ function $HLStackListWidget(){return $globals.HLStackListWidget||(typeof HLStack
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$4,$1,$receiver;
-$2=self["@stackListWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
-$3=$recv($HLStackListWidget())._on_(self._model());
-$recv($3)._next_(self._codeWidget());
-$4=$recv($3)._yourself();
-self["@stackListWidget"]=$4;
+var $1,$2,$receiver;
 $1=self["@stackListWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
+$2=$recv($HLStackListWidget())._on_(self._model());
+$recv($2)._next_(self._codeWidget());
+self["@stackListWidget"]=$recv($2)._yourself();
+return self["@stackListWidget"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"stackListWidget",{},$globals.HLDebugger)});
 //>>excludeEnd("ctx");
@@ -680,12 +667,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._initializeFromError_(anError);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._initializeFromError_(anError);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{anError:anError},$globals.HLDebugger.klass)});
 //>>excludeEnd("ctx");
@@ -743,9 +728,7 @@ selector: "debuggerModel",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@debuggerModel"];
-return $1;
+return self["@debuggerModel"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -786,8 +769,7 @@ function $ErrorHandler(){return $globals.ErrorHandler||(typeof ErrorHandler=="un
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv((function(){
+return $recv((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -805,7 +787,6 @@ return nil;
 }, function($ctx2) {$ctx2.fillBlock({e:e},$ctx1,2)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"doIt:",{aString:aString},$globals.HLDebuggerCodeModel)});
 //>>excludeEnd("ctx");
@@ -911,8 +892,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=(
+var $1;
+$1=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
@@ -920,10 +901,8 @@ $globals.HLDebuggerCodeWidget.superclass.fn.prototype._editorOptions.apply($recv
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$recv($2)._at_put_("gutters",["CodeMirror-linenumbers", "stops"]);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+$recv($1)._at_put_("gutters",["CodeMirror-linenumbers", "stops"]);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"editorOptions",{},$globals.HLDebuggerCodeWidget)});
 //>>excludeEnd("ctx");
@@ -979,55 +958,54 @@ var token;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $4,$3,$2,$1,$5,$9,$8,$7,$11,$10,$6,$15,$14,$13,$12,$receiver;
+var $3,$2,$1,$4,$8,$7,$6,$10,$9,$5,$14,$13,$12,$11,$receiver;
 if(($receiver = aNode) == null || $receiver.isNil){
 aNode;
 } else {
 self._clearHighlight();
-$4=$recv(aNode)._positionStart();
+$3=$recv(aNode)._positionStart();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["positionStart"]=1;
 //>>excludeEnd("ctx");
-$3=$recv($4)._x();
+$2=$recv($3)._x();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["x"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($3).__minus((1));
+$1=$recv($2).__minus((1));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["-"]=1;
 //>>excludeEnd("ctx");
-$1=self._addStopAt_($2);
-$1;
-$5=self._editor();
-$9=$recv(aNode)._positionStart();
+self._addStopAt_($1);
+$4=self._editor();
+$8=$recv(aNode)._positionStart();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["positionStart"]=2;
 //>>excludeEnd("ctx");
-$8=$recv($9)._x();
+$7=$recv($8)._x();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["x"]=2;
 //>>excludeEnd("ctx");
-$7=$recv($8).__minus((1));
+$6=$recv($7).__minus((1));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["-"]=2;
 //>>excludeEnd("ctx");
-$11=$recv($recv(aNode)._positionStart())._y();
+$10=$recv($recv(aNode)._positionStart())._y();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["y"]=1;
 //>>excludeEnd("ctx");
-$10=$recv($11).__minus((1));
+$9=$recv($10).__minus((1));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["-"]=3;
 //>>excludeEnd("ctx");
-$6=$globals.HashedCollection._newFromPairs_(["line",$7,"ch",$10]);
-$15=$recv(aNode)._positionEnd();
+$5=$globals.HashedCollection._newFromPairs_(["line",$6,"ch",$9]);
+$14=$recv(aNode)._positionEnd();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["positionEnd"]=1;
 //>>excludeEnd("ctx");
-$14=$recv($15)._x();
-$13=$recv($14).__minus((1));
-$12=$globals.HashedCollection._newFromPairs_(["line",$13,"ch",$recv($recv(aNode)._positionEnd())._y()]);
-$recv($5)._setSelection_to_($6,$12);
+$13=$recv($14)._x();
+$12=$recv($13).__minus((1));
+$11=$globals.HashedCollection._newFromPairs_(["line",$12,"ch",$recv($recv(aNode)._positionEnd())._y()]);
+$recv($4)._setSelection_to_($5,$11);
 };
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1174,9 +1152,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._debugger())._atEnd();
-return $1;
+return $recv(self._debugger())._atEnd();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"atEnd",{},$globals.HLDebuggerModel)});
 //>>excludeEnd("ctx");
@@ -1201,7 +1177,6 @@ function $OrderedCollection(){return $globals.OrderedCollection||(typeof Ordered
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 contexts=$recv($OrderedCollection())._new();
 context=self._rootContext();
 $recv((function(){
@@ -1223,8 +1198,7 @@ return context;
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)});
 //>>excludeEnd("ctx");
 }));
-$1=contexts;
-return $1;
+return contexts;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"contexts",{contexts:contexts,context:context},$globals.HLDebuggerModel)});
 //>>excludeEnd("ctx");
@@ -1247,9 +1221,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._debugger())._context();
-return $1;
+return $recv(self._debugger())._context();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"currentContext",{},$globals.HLDebuggerModel)});
 //>>excludeEnd("ctx");
@@ -1273,7 +1245,7 @@ function $HLDebuggerContextSelected(){return $globals.HLDebuggerContextSelected|
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 self._withChangesDo_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
@@ -1285,8 +1257,7 @@ $ctx2.sendIdx["context:"]=1;
 //>>excludeEnd("ctx");
 $1=$recv($HLDebuggerContextSelected())._new();
 $recv($1)._context_(aContext);
-$2=$recv($1)._yourself();
-return $recv(self._announcer())._announce_($2);
+return $recv(self._announcer())._announce_($recv($1)._yourself());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
@@ -1315,15 +1286,14 @@ function $ASTDebugger(){return $globals.ASTDebugger||(typeof ASTDebugger=="undef
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@debugger"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@debugger"]=$recv($ASTDebugger())._new();
+var $1,$receiver;
 $1=self["@debugger"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@debugger"]=$recv($ASTDebugger())._new();
+return self["@debugger"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"debugger",{},$globals.HLDebuggerModel)});
 //>>excludeEnd("ctx");
@@ -1343,9 +1313,7 @@ selector: "error",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@error"];
-return $1;
+return self["@error"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1366,9 +1334,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._environment())._evaluate_for_(aString,self._currentContext());
-return $1;
+return $recv(self._environment())._evaluate_for_(aString,self._currentContext());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"evaluate:",{aString:aString},$globals.HLDebuggerModel)});
 //>>excludeEnd("ctx");
@@ -1451,9 +1417,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._debugger())._node();
-return $1;
+return $recv(self._debugger())._node();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"nextNode",{},$globals.HLDebuggerModel)});
 //>>excludeEnd("ctx");
@@ -1477,7 +1441,7 @@ function $HLDebuggerContextSelected(){return $globals.HLDebuggerContextSelected|
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$3,$4;
+var $2,$1,$3;
 self["@rootContext"]=self._currentContext();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["currentContext"]=1;
@@ -1490,8 +1454,7 @@ $1=$recv($2)._method();
 self._selectedMethod_($1);
 $3=$recv($HLDebuggerContextSelected())._new();
 $recv($3)._context_(self._currentContext());
-$4=$recv($3)._yourself();
-$recv(self._announcer())._announce_($4);
+$recv(self._announcer())._announce_($recv($3)._yourself());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"onStep",{},$globals.HLDebuggerModel)});
@@ -1542,13 +1505,12 @@ function $HLDebuggerStepped(){return $globals.HLDebuggerStepped||(typeof HLDebug
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $recv(self._debugger())._restart();
 self._onStep();
 $1=$recv($HLDebuggerStepped())._new();
 $recv($1)._context_(self._currentContext());
-$2=$recv($1)._yourself();
-$recv(self._announcer())._announce_($2);
+$recv(self._announcer())._announce_($recv($1)._yourself());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"restart",{},$globals.HLDebuggerModel)});
@@ -1569,9 +1531,7 @@ selector: "rootContext",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@rootContext"];
-return $1;
+return self["@rootContext"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1593,13 +1553,12 @@ function $HLDebuggerStepped(){return $globals.HLDebuggerStepped||(typeof HLDebug
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $recv(self._debugger())._stepOver();
 self._onStep();
 $1=$recv($HLDebuggerStepped())._new();
 $recv($1)._context_(self._currentContext());
-$2=$recv($1)._yourself();
-$recv(self._announcer())._announce_($2);
+$recv(self._announcer())._announce_($recv($1)._yourself());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"stepOver",{},$globals.HLDebuggerModel)});
@@ -1649,12 +1608,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._initializeFromError_(anError);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._initializeFromError_(anError);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{anError:anError},$globals.HLDebuggerModel.klass)});
 //>>excludeEnd("ctx");
@@ -1680,7 +1637,7 @@ function $HLConfirmationWidget(){return $globals.HLConfirmationWidget||(typeof H
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv($HLConfirmationWidget())._new();
 $recv($1)._confirmationString_($recv(anError)._messageText());
 $recv($1)._actionBlock_((function(){
@@ -1694,7 +1651,7 @@ return self._debugError_(anError);
 }));
 $recv($1)._cancelButtonLabel_("Abandon");
 $recv($1)._confirmButtonLabel_("Debug");
-$2=$recv($1)._show();
+$recv($1)._show();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"confirmDebugError:",{anError:anError},$globals.HLErrorHandler)});
@@ -1786,10 +1743,10 @@ function $HLProgressWidget(){return $globals.HLProgressWidget||(typeof HLProgres
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv($HLProgressWidget())._default();
 $recv($1)._flush();
-$2=$recv($1)._remove();
+$recv($1)._remove();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"onErrorHandled",{},$globals.HLErrorHandler)});
@@ -1816,9 +1773,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._model())._contexts();
-return $1;
+return $recv(self._model())._contexts();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"items",{},$globals.HLStackListWidget)});
 //>>excludeEnd("ctx");
@@ -1941,7 +1896,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$4,$5,$6,$7,$8,$9,$10,$2;
+var $1,$3,$4,$5,$6,$7,$8,$9,$2;
 $1=$recv(html)._div();
 $recv($1)._class_("debugger_bar");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2029,7 +1984,7 @@ $8;
 $9=$recv(html)._button();
 $recv($9)._class_("btn btn-default proceed");
 $recv($9)._with_("Proceed");
-$10=$recv($9)._onClick_((function(){
+return $recv($9)._onClick_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
@@ -2038,7 +1993,6 @@ return self._proceed();
 }, function($ctx3) {$ctx3.fillBlock({},$ctx2,5)});
 //>>excludeEnd("ctx");
 }));
-return $10;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
@@ -2125,9 +2079,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._model())._currentContext();
-return $1;
+return $recv(self._model())._currentContext();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectedItem",{},$globals.HLStackListWidget)});
 //>>excludeEnd("ctx");

src/Helios-Helpers.js

@@ -17,7 +17,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$2,$receiver;
+var $1,$2,$receiver;
 $1=self._next();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["next"]=1;
@@ -27,13 +27,12 @@ return false;
 } else {
 $1;
 };
-$3=self._doClassify();
-if($core.assert($3)){
-$2=true;
+$2=self._doClassify();
+if($core.assert($2)){
+return true;
 } else {
-$2=$recv(self._next())._classify();
+return $recv(self._next())._classify();
 };
-return $2;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"classify",{},$globals.HLClassifier)});
 //>>excludeEnd("ctx");
@@ -77,9 +76,7 @@ selector: "method",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@method"];
-return $1;
+return self["@method"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -130,9 +127,7 @@ selector: "next",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@next"];
-return $1;
+return self["@next"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -290,7 +285,7 @@ function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 self["@prefixMapping"]=$recv($Dictionary())._new();
 $1=self["@prefixMapping"];
 $recv($1)._at_put_("test","tests");
@@ -337,7 +332,7 @@ $recv($1)._at_put_("as","converting");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["at:put:"]=11;
 //>>excludeEnd("ctx");
-$2=$recv($1)._at_put_("new","instance creation");
+$recv($1)._at_put_("new","instance creation");
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"buildPrefixDictionary",{},$globals.HLPrefixClassifier)});
@@ -645,9 +640,7 @@ selector: "protocol",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@protocol"];
-return $1;
+return self["@protocol"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -684,9 +677,7 @@ selector: "sourceCodes",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@sourceCodes"];
-return $1;
+return self["@sourceCodes"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -723,9 +714,7 @@ selector: "targetClass",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@targetClass"];
-return $1;
+return self["@targetClass"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -796,10 +785,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=self["@firstClassifier"];
 $recv($1)._method_(aMethod);
-$2=$recv($1)._classify();
+$recv($1)._classify();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"classify:",{aMethod:aMethod},$globals.HLMethodClassifier)});
@@ -1030,9 +1019,7 @@ selector: "output",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@output"];
-return $1;
+return self["@output"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1085,7 +1072,7 @@ function $OrderedCollection(){return $globals.OrderedCollection||(typeof Ordered
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 sources=$recv($OrderedCollection())._new();
 $recv($recv($recv($recv(self["@output"])._targetClass())._instanceVariableNames())._sorted())._do_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1096,8 +1083,7 @@ $recv($1)._add_(self._getterFor_(each));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["add:"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($1)._add_(self._setterFor_(each));
-return $2;
+return $recv($1)._add_(self._setterFor_(each));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
@@ -1126,7 +1112,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 (
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
@@ -1137,7 +1123,7 @@ $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
 $1=$recv(self["@output"])._targetClass();
 $recv($1)._accessorsSourceCodesWith_(self);
-$2=$recv($1)._accessorProtocolWith_(self);
+$recv($1)._accessorProtocolWith_(self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"generate",{},$globals.HLAccessorsGenerator)});
@@ -1163,10 +1149,10 @@ function $String(){return $globals.String||(typeof String=="undefined"?nil:Strin
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=$recv($HLMethodSourceCode())._new();
-$recv($2)._selector_(anInstanceVariable);
-$3=$recv($2)._sourceCode_($recv($String())._streamContents_((function(stream){
+var $1;
+$1=$recv($HLMethodSourceCode())._new();
+$recv($1)._selector_(anInstanceVariable);
+return $recv($1)._sourceCode_($recv($String())._streamContents_((function(stream){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1183,8 +1169,6 @@ $ctx2.sendIdx["<<"]=2;
 }, function($ctx2) {$ctx2.fillBlock({stream:stream},$ctx1,1)});
 //>>excludeEnd("ctx");
 })));
-$1=$3;
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"getterFor:",{anInstanceVariable:anInstanceVariable},$globals.HLAccessorsGenerator)});
 //>>excludeEnd("ctx");
@@ -1209,18 +1193,18 @@ function $String(){return $globals.String||(typeof String=="undefined"?nil:Strin
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$4,$3,$1;
-$2=$recv($HLMethodSourceCode())._new();
-$recv($2)._selector_($recv(anInstanceVariable).__comma(":"));
-$3=$recv($2)._sourceCode_($recv($String())._streamContents_((function(stream){
+var $1,$2;
+$1=$recv($HLMethodSourceCode())._new();
+$recv($1)._selector_($recv(anInstanceVariable).__comma(":"));
+return $recv($1)._sourceCode_($recv($String())._streamContents_((function(stream){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$4=$recv(stream).__lt_lt(anInstanceVariable);
+$2=$recv(stream).__lt_lt(anInstanceVariable);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["<<"]=2;
 //>>excludeEnd("ctx");
-$recv($4).__lt_lt(": anObject");
+$recv($2).__lt_lt(": anObject");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["<<"]=1;
 //>>excludeEnd("ctx");
@@ -1233,8 +1217,6 @@ $ctx2.sendIdx["<<"]=3;
 }, function($ctx2) {$ctx2.fillBlock({stream:stream},$ctx1,1)});
 //>>excludeEnd("ctx");
 })));
-$1=$3;
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"setterFor:",{anInstanceVariable:anInstanceVariable},$globals.HLAccessorsGenerator)});
 //>>excludeEnd("ctx");
@@ -1263,7 +1245,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 (
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
@@ -1274,7 +1256,7 @@ $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
 $1=$recv(self["@output"])._targetClass();
 $recv($1)._initializeSourceCodesWith_(self);
-$2=$recv($1)._initializeProtocolWith_(self);
+$recv($1)._initializeProtocolWith_(self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"generate",{},$globals.HLInitializeGenerator)});
@@ -1299,8 +1281,8 @@ function $String(){return $globals.String||(typeof String=="undefined"?nil:Strin
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $3,$2,$4,$5,$6,$7,$8,$1;
-$1=$recv($String())._streamContents_((function(str){
+var $2,$1,$3,$4,$5,$6,$7;
+return $recv($String())._streamContents_((function(str){
 var instVars,size;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
@@ -1313,28 +1295,28 @@ $recv(str).__lt_lt("initialize");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["<<"]=1;
 //>>excludeEnd("ctx");
-$3=$recv(str)._cr();
+$2=$recv(str)._cr();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["cr"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($3)._tab();
+$1=$recv($2)._tab();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["tab"]=1;
 //>>excludeEnd("ctx");
-$recv($2).__lt_lt("super initialize.");
+$recv($1).__lt_lt("super initialize.");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["<<"]=2;
 //>>excludeEnd("ctx");
-$4=$recv($2)._cr();
+$3=$recv($1)._cr();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["cr"]=2;
 //>>excludeEnd("ctx");
-$4;
-$5=$recv(str)._cr();
+$3;
+$4=$recv(str)._cr();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["cr"]=3;
 //>>excludeEnd("ctx");
-$recv($5)._tab();
+$recv($4)._tab();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["tab"]=2;
 //>>excludeEnd("ctx");
@@ -1342,23 +1324,23 @@ return $recv(instVars)._withIndexDo_((function(name,index){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
-$6=$recv(index).__tild_eq((1));
+$5=$recv(index).__tild_eq((1));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx3.sendIdx["~="]=1;
 //>>excludeEnd("ctx");
-if($core.assert($6)){
+if($core.assert($5)){
 $recv($recv(str)._cr())._tab();
 };
-$7=$recv(str).__lt_lt(name);
+$6=$recv(str).__lt_lt(name);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx3.sendIdx["<<"]=4;
 //>>excludeEnd("ctx");
-$recv($7).__lt_lt(" := nil");
+$recv($6).__lt_lt(" := nil");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx3.sendIdx["<<"]=3;
 //>>excludeEnd("ctx");
-$8=$recv(index).__tild_eq(size);
-if($core.assert($8)){
+$7=$recv(index).__tild_eq(size);
+if($core.assert($7)){
 return $recv(str).__lt_lt(".");
 };
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1369,7 +1351,6 @@ return $recv(str).__lt_lt(".");
 }, function($ctx2) {$ctx2.fillBlock({str:str,instVars:instVars,size:size},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"generateInitializeCodeForObject",{},$globals.HLInitializeGenerator)});
 //>>excludeEnd("ctx");
@@ -1417,13 +1398,11 @@ function $HLMethodSourceCode(){return $globals.HLMethodSourceCode||(typeof HLMet
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=$recv($HLMethodSourceCode())._new();
-$recv($2)._selector_("initialize");
-$recv($2)._sourceCode_(self._generateInitializeCodeForObject());
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=$recv($HLMethodSourceCode())._new();
+$recv($1)._selector_("initialize");
+$recv($1)._sourceCode_(self._generateInitializeCodeForObject());
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"initializeMethodForObject",{},$globals.HLInitializeGenerator)});
 //>>excludeEnd("ctx");
@@ -1473,9 +1452,7 @@ selector: "selector",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@selector"];
-return $1;
+return self["@selector"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1512,9 +1489,7 @@ selector: "sourceCode",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@sourceCode"];
-return $1;
+return self["@sourceCode"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1604,9 +1579,7 @@ selector: "model",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@model"];
-return $1;
+return self["@model"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1646,9 +1619,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._model())._packageToCommit();
-return $1;
+return $recv(self._model())._packageToCommit();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"package",{},$globals.HLPackageCommitErrorHelper)});
 //>>excludeEnd("ctx");
@@ -1672,7 +1643,7 @@ function $HLConfirmationWidget(){return $globals.HLConfirmationWidget||(typeof H
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4;
+var $1,$2,$3;
 $1=$recv($HLConfirmationWidget())._new();
 $2=$1;
 $3=$recv("Commit failed for namespace \x22".__comma($recv($recv(self._package())._transport())._namespace())).__comma("\x22. Do you want to commit to another path?");
@@ -1691,7 +1662,7 @@ return self._showNewCommitPath();
 }));
 $recv($1)._cancelButtonLabel_("Abandon");
 $recv($1)._confirmButtonLabel_("Set path");
-$4=$recv($1)._show();
+$recv($1)._show();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"showHelp",{},$globals.HLPackageCommitErrorHelper)});
@@ -1716,7 +1687,7 @@ function $HLRequestWidget(){return $globals.HLRequestWidget||(typeof HLRequestWi
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv($HLRequestWidget())._new();
 $recv($1)._beSingleline();
 $recv($1)._confirmationString_("Set commit path");
@@ -1731,7 +1702,7 @@ return self._commitToPath_(url);
 }));
 $recv($1)._confirmButtonLabel_("Commit with new path");
 $recv($1)._value_("/src");
-$2=$recv($1)._show();
+$recv($1)._show();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"showNewCommitPath",{},$globals.HLPackageCommitErrorHelper)});
@@ -1756,12 +1727,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._model_(aToolModel);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._model_(aToolModel);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{aToolModel:aToolModel},$globals.HLPackageCommitErrorHelper.klass)});
 //>>excludeEnd("ctx");

src/Helios-Inspector.js

@@ -11,9 +11,7 @@ selector: "inspector",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@inspector"];
-return $1;
+return self["@inspector"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -53,9 +51,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._inspector())._model();
-return $1;
+return $recv(self._inspector())._model();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"model",{},$globals.HLInspectorDisplayWidget)});
 //>>excludeEnd("ctx");
@@ -103,24 +99,23 @@ var selection;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$5,$4,$3,$2;
+var $1,$4,$3,$2;
 $1=self._model();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["model"]=1;
 //>>excludeEnd("ctx");
 selection=$recv($1)._selection();
-$5=self._model();
+$4=self._model();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["model"]=2;
 //>>excludeEnd("ctx");
-$4=$recv($5)._variables();
-$3=$recv($4)._includesKey_(selection);
-if($core.assert($3)){
-$2=$recv($recv(self._model())._instVarObjectAt_(selection))._printString();
+$3=$recv($4)._variables();
+$2=$recv($3)._includesKey_(selection);
+if($core.assert($2)){
+return $recv($recv(self._model())._instVarObjectAt_(selection))._printString();
 } else {
-$2="";
+return "";
 };
-return $2;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectionDisplayString",{selection:selection},$globals.HLInspectorDisplayWidget)});
 //>>excludeEnd("ctx");
@@ -150,15 +145,14 @@ function $HLCodeModel(){return $globals.HLCodeModel||(typeof HLCodeModel=="undef
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@code"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@code"]=$recv($HLCodeModel())._on_(self._environment());
+var $1,$receiver;
 $1=self["@code"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@code"]=$recv($HLCodeModel())._on_(self._environment());
+return self["@code"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"code",{},$globals.HLInspectorModel)});
 //>>excludeEnd("ctx");
@@ -204,9 +198,7 @@ selector: "inspectee",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@inspectee"];
-return $1;
+return self["@inspectee"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -246,9 +238,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._variables())._at_(anInstVarName);
-return $1;
+return $recv(self._variables())._at_(anInstVarName);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"instVarObjectAt:",{anInstVarName:anInstVarName},$globals.HLInspectorModel)});
 //>>excludeEnd("ctx");
@@ -271,14 +261,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@label"];
-if(($receiver = $2) == null || $receiver.isNil){
-$1=$recv(self._inspectee())._printString();
+var $1,$receiver;
+$1=self["@label"];
+if(($receiver = $1) == null || $receiver.isNil){
+return $recv(self._inspectee())._printString();
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"label",{},$globals.HLInspectorModel)});
 //>>excludeEnd("ctx");
@@ -344,9 +333,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._instVarObjectAt_(self._selection());
-return $1;
+return self._instVarObjectAt_(self._selection());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectedInstVarObject",{},$globals.HLInspectorModel)});
 //>>excludeEnd("ctx");
@@ -369,14 +356,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@selection"];
-if(($receiver = $2) == null || $receiver.isNil){
-$1="";
+var $1,$receiver;
+$1=self["@selection"];
+if(($receiver = $1) == null || $receiver.isNil){
+return "";
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selection",{},$globals.HLInspectorModel)});
 //>>excludeEnd("ctx");
@@ -450,14 +436,13 @@ function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@variables"];
-if(($receiver = $2) == null || $receiver.isNil){
-$1=$recv($Dictionary())._new();
+var $1,$receiver;
+$1=self["@variables"];
+if(($receiver = $1) == null || $receiver.isNil){
+return $recv($Dictionary())._new();
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"variables",{},$globals.HLInspectorModel)});
 //>>excludeEnd("ctx");
@@ -500,12 +485,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._environment_(anEnvironment);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._environment_(anEnvironment);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{anEnvironment:anEnvironment},$globals.HLInspectorModel.klass)});
 //>>excludeEnd("ctx");
@@ -531,15 +514,14 @@ function $Announcer(){return $globals.Announcer||(typeof Announcer=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@announcer"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@announcer"]=$recv($Announcer())._new();
+var $1,$receiver;
 $1=self["@announcer"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@announcer"]=$recv($Announcer())._new();
+return self["@announcer"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"announcer",{},$globals.HLInspectorVariablesWidget)});
 //>>excludeEnd("ctx");
@@ -562,9 +544,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._variables();
-return $1;
+return self._variables();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"defaultItems",{},$globals.HLInspectorVariablesWidget)});
 //>>excludeEnd("ctx");
@@ -609,9 +589,7 @@ selector: "inspector",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@inspector"];
-return $1;
+return self["@inspector"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -651,9 +629,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._model())._label();
-return $1;
+return $recv(self._model())._label();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"label",{},$globals.HLInspectorVariablesWidget)});
 //>>excludeEnd("ctx");
@@ -676,9 +652,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._inspector())._model();
-return $1;
+return $recv(self._inspector())._model();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"model",{},$globals.HLInspectorVariablesWidget)});
 //>>excludeEnd("ctx");
@@ -737,11 +711,11 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv(html)._button();
 $recv($1)._class_("btn btn-default");
 $recv($1)._with_("Dive");
-$2=$recv($1)._onClick_((function(){
+self["@diveButton"]=$recv($1)._onClick_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -750,7 +724,6 @@ return self._dive();
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-self["@diveButton"]=$2;
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"renderButtonsOn:",{html:html},$globals.HLInspectorVariablesWidget)});
@@ -815,10 +788,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv(html)._div();
 $recv($1)._class_("list-label");
-$2=$recv($1)._with_(self._label());
+$recv($1)._with_(self._label());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"renderHeadOn:",{html:html},$globals.HLInspectorVariablesWidget)});
@@ -893,9 +866,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._model())._selection();
-return $1;
+return $recv(self._model())._selection();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selection",{},$globals.HLInspectorVariablesWidget)});
 //>>excludeEnd("ctx");
@@ -918,9 +889,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._model())._variables())._keys();
-return $1;
+return $recv($recv(self._model())._variables())._keys();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"variables",{},$globals.HLInspectorVariablesWidget)});
 //>>excludeEnd("ctx");
@@ -946,15 +915,14 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@codeWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@codeWidget"]=self._defaultCodeWidget();
+var $1,$receiver;
 $1=self["@codeWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@codeWidget"]=self._defaultCodeWidget();
+return self["@codeWidget"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"codeWidget",{},$globals.HLInspectorWidget)});
 //>>excludeEnd("ctx");
@@ -997,19 +965,17 @@ function $HLCodeWidget(){return $globals.HLCodeWidget||(typeof HLCodeWidget=="un
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$5,$4,$6,$1;
-$2=$recv($HLCodeWidget())._new();
-$3=$2;
-$5=self._model();
+var $1,$2,$4,$3;
+$1=$recv($HLCodeWidget())._new();
+$2=$1;
+$4=self._model();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["model"]=1;
 //>>excludeEnd("ctx");
-$4=$recv($5)._code();
-$recv($3)._model_($4);
-$recv($2)._receiver_($recv(self._model())._inspectee());
-$6=$recv($2)._yourself();
-$1=$6;
-return $1;
+$3=$recv($4)._code();
+$recv($2)._model_($3);
+$recv($1)._receiver_($recv(self._model())._inspectee());
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"defaultCodeWidget",{},$globals.HLInspectorWidget)});
 //>>excludeEnd("ctx");
@@ -1033,18 +999,16 @@ function $HLInspectorDisplayWidget(){return $globals.HLInspectorDisplayWidget||(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$4,$1,$receiver;
-$2=self["@displayWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
-$3=$recv($HLInspectorDisplayWidget())._new();
-$recv($3)._inspector_(self);
-$4=$recv($3)._yourself();
-self["@displayWidget"]=$4;
+var $1,$2,$receiver;
 $1=self["@displayWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
+$2=$recv($HLInspectorDisplayWidget())._new();
+$recv($2)._inspector_(self);
+self["@displayWidget"]=$recv($2)._yourself();
+return self["@displayWidget"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"displayWidget",{},$globals.HLInspectorWidget)});
 //>>excludeEnd("ctx");
@@ -1099,11 +1063,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 $recv(self._model())._inspect_on_(anObject,self);
 $recv(self._codeWidget())._receiver_(anObject);
 self._refreshVariablesWidget();
-$1=self._refreshDisplayWidget();
+self._refreshDisplayWidget();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inspect:",{anObject:anObject},$globals.HLInspectorWidget)});
@@ -1127,9 +1090,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._model())._inspectee();
-return $1;
+return $recv(self._model())._inspectee();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inspectee",{},$globals.HLInspectorWidget)});
 //>>excludeEnd("ctx");
@@ -1176,9 +1137,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._model())._label();
-return $1;
+return $recv(self._model())._label();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"label",{},$globals.HLInspectorWidget)});
 //>>excludeEnd("ctx");
@@ -1202,15 +1161,14 @@ function $HLInspectorModel(){return $globals.HLInspectorModel||(typeof HLInspect
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@model"];
-if(($receiver = $2) == null || $receiver.isNil){
-self._model_($recv($HLInspectorModel())._new());
+var $1,$receiver;
 $1=self["@model"];
+if(($receiver = $1) == null || $receiver.isNil){
+self._model_($recv($HLInspectorModel())._new());
+return self["@model"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"model",{},$globals.HLInspectorWidget)});
 //>>excludeEnd("ctx");
@@ -1233,12 +1191,11 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self["@model"]=aModel;
 $recv(self._codeWidget())._model_($recv(aModel)._code());
 self._observeCodeWidget();
 self._observeVariablesWidget();
-$1=self._observeModel();
+self._observeModel();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"model:",{aModel:aModel},$globals.HLInspectorWidget)});
@@ -1346,10 +1303,10 @@ function $HLInspector(){return $globals.HLInspector||(typeof HLInspector=="undef
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv($HLInspector())._new();
 $recv($1)._inspect_($recv(self._model())._selectedInstVarObject());
-$2=$recv($1)._openAsTab();
+$recv($1)._openAsTab();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"onDive",{},$globals.HLInspectorWidget)});
@@ -1685,18 +1642,16 @@ function $HLInspectorVariablesWidget(){return $globals.HLInspectorVariablesWidge
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$4,$1,$receiver;
-$2=self["@variablesWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
-$3=$recv($HLInspectorVariablesWidget())._new();
-$recv($3)._inspector_(self);
-$4=$recv($3)._yourself();
-self["@variablesWidget"]=$4;
+var $1,$2,$receiver;
 $1=self["@variablesWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
+$2=$recv($HLInspectorVariablesWidget())._new();
+$recv($2)._inspector_(self);
+self["@variablesWidget"]=$recv($2)._yourself();
+return self["@variablesWidget"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"variablesWidget",{},$globals.HLInspectorWidget)});
 //>>excludeEnd("ctx");
@@ -1848,10 +1803,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=self._new();
 $recv($1)._openAsTab();
-$2=$recv($1)._inspect_(anObject);
+$recv($1)._inspect_(anObject);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inspect:",{anObject:anObject},$globals.HLInspector.klass)});
@@ -1876,15 +1831,14 @@ function $OrderedCollection(){return $globals.OrderedCollection||(typeof Ordered
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@inspectors"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@inspectors"]=$recv($OrderedCollection())._new();
+var $1,$receiver;
 $1=self["@inspectors"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@inspectors"]=$recv($OrderedCollection())._new();
+return self["@inspectors"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"inspectors",{},$globals.HLInspector.klass)});
 //>>excludeEnd("ctx");

src/Helios-Layout.js

@@ -14,10 +14,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv(html)._div();
 $recv($1)._class_("tool_container");
-$2=$recv($1)._with_(self._splitter());
+$recv($1)._with_(self._splitter());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"renderOn:",{html:html},$globals.HLContainer)});
@@ -38,9 +38,7 @@ selector: "splitter",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@splitter"];
-return $1;
+return self["@splitter"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -81,12 +79,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._splitter_(aSplitter);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._splitter_(aSplitter);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"with:",{aSplitter:aSplitter},$globals.HLContainer.klass)});
 //>>excludeEnd("ctx");
@@ -126,9 +122,7 @@ selector: "firstWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@firstWidget"];
-return $1;
+return self["@firstWidget"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -204,7 +198,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$4,$5,$6,$7,$2;
+var $1,$3,$4,$5,$6,$2;
 $1=$recv(html)._div();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["div"]=1;
@@ -242,8 +236,7 @@ $ctx2.sendIdx["class:"]=3;
 self["@splitter"];
 $6=$recv(html)._div();
 $recv($6)._class_("pane");
-$7=$recv($6)._with_(self._secondWidget());
-self["@secondPane"]=$7;
+self["@secondPane"]=$recv($6)._with_(self._secondWidget());
 return self["@secondPane"];
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
@@ -291,9 +284,7 @@ selector: "secondWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@secondWidget"];
-return $1;
+return self["@secondWidget"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -352,13 +343,11 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._firstWidget_(aWidget);
-$recv($2)._secondWidget_(anotherWidget);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._firstWidget_(aWidget);
+$recv($1)._secondWidget_(anotherWidget);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"with:with:",{aWidget:aWidget,anotherWidget:anotherWidget},$globals.HLSplitter.klass)});
 //>>excludeEnd("ctx");
@@ -383,8 +372,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=(
+var $1;
+$1=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
@@ -392,8 +381,7 @@ $globals.HLHorizontalSplitter.superclass.fn.prototype._cssClass.apply($recv(self
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$1=$recv($2).__comma(" horizontal");
-return $1;
+return $recv($1).__comma(" horizontal");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"cssClass",{},$globals.HLHorizontalSplitter)});
 //>>excludeEnd("ctx");
@@ -416,8 +404,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=(
+var $1;
+$1=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
@@ -425,8 +413,7 @@ $globals.HLHorizontalSplitter.superclass.fn.prototype._panesCssClass.apply($recv
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$1=$recv($2).__comma(" horizontal");
-return $1;
+return $recv($1).__comma(" horizontal");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"panesCssClass",{},$globals.HLHorizontalSplitter)});
 //>>excludeEnd("ctx");
@@ -631,8 +618,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=(
+var $1;
+$1=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
@@ -640,8 +627,7 @@ $globals.HLVerticalSplitter.superclass.fn.prototype._cssClass.apply($recv(self),
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$1=$recv($2).__comma(" vertical");
-return $1;
+return $recv($1).__comma(" vertical");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"cssClass",{},$globals.HLVerticalSplitter)});
 //>>excludeEnd("ctx");
@@ -664,8 +650,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=(
+var $1;
+$1=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
@@ -673,8 +659,7 @@ $globals.HLVerticalSplitter.superclass.fn.prototype._panesCssClass.apply($recv(s
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$1=$recv($2).__comma(" vertical");
-return $1;
+return $recv($1).__comma(" vertical");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"panesCssClass",{},$globals.HLVerticalSplitter)});
 //>>excludeEnd("ctx");

src/Helios-References.js

@@ -14,9 +14,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self._selector_($recv(aCompiledMethod)._selector());
-$1=self._methodClass_($recv(aCompiledMethod)._methodClass());
+self._methodClass_($recv(aCompiledMethod)._methodClass());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"initializeFromMethod:",{aCompiledMethod:aCompiledMethod},$globals.HLMethodReference)});
@@ -40,9 +39,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._methodClass())._methodAt_(self._selector());
-return $1;
+return $recv(self._methodClass())._methodAt_(self._selector());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"method",{},$globals.HLMethodReference)});
 //>>excludeEnd("ctx");
@@ -62,9 +59,7 @@ selector: "methodClass",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@methodClass"];
-return $1;
+return self["@methodClass"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -101,9 +96,7 @@ selector: "selector",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@selector"];
-return $1;
+return self["@selector"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -143,9 +136,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._method())._source();
-return $1;
+return $recv(self._method())._source();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"source",{},$globals.HLMethodReference)});
 //>>excludeEnd("ctx");
@@ -169,12 +160,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._initializeFromMethod_(aCompiledMethod);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._initializeFromMethod_(aCompiledMethod);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{aCompiledMethod:aCompiledMethod},$globals.HLMethodReference.klass)});
 //>>excludeEnd("ctx");
@@ -200,16 +189,15 @@ function $HLClassReferencesListWidget(){return $globals.HLClassReferencesListWid
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@classReferencesListWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
+var $1,$receiver;
+$1=self["@classReferencesListWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
 self["@classReferencesListWidget"]=$recv($HLClassReferencesListWidget())._on_(self._model());
 self["@classReferencesListWidget"];
-$1=$recv(self["@classReferencesListWidget"])._next_(self._regexpListWidget());
+return $recv(self["@classReferencesListWidget"])._next_(self._regexpListWidget());
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"classReferencesListWidget",{},$globals.HLReferences)});
 //>>excludeEnd("ctx");
@@ -233,16 +221,15 @@ function $HLImplementorsListWidget(){return $globals.HLImplementorsListWidget||(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@implementorsListWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
+var $1,$receiver;
+$1=self["@implementorsListWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
 self["@implementorsListWidget"]=$recv($HLImplementorsListWidget())._on_(self._model());
 self["@implementorsListWidget"];
-$1=$recv(self["@implementorsListWidget"])._next_(self._classReferencesListWidget());
+return $recv(self["@implementorsListWidget"])._next_(self._classReferencesListWidget());
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"implementorsListWidget",{},$globals.HLReferences)});
 //>>excludeEnd("ctx");
@@ -266,18 +253,16 @@ function $HLReferencesModel(){return $globals.HLReferencesModel||(typeof HLRefer
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$4,$1,$receiver;
-$2=self["@model"];
-if(($receiver = $2) == null || $receiver.isNil){
-$3=$recv($HLReferencesModel())._new();
-$recv($3)._environment_($recv(self._manager())._environment());
-$4=$recv($3)._yourself();
-self["@model"]=$4;
+var $1,$2,$receiver;
 $1=self["@model"];
+if(($receiver = $1) == null || $receiver.isNil){
+$2=$recv($HLReferencesModel())._new();
+$recv($2)._environment_($recv(self._manager())._environment());
+self["@model"]=$recv($2)._yourself();
+return self["@model"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"model",{},$globals.HLReferences)});
 //>>excludeEnd("ctx");
@@ -320,16 +305,15 @@ function $HLRegexpListWidget(){return $globals.HLRegexpListWidget||(typeof HLReg
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@regexpListWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
+var $1,$receiver;
+$1=self["@regexpListWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
 self["@regexpListWidget"]=$recv($HLRegexpListWidget())._on_(self._model());
 self["@regexpListWidget"];
-$1=$recv(self["@regexpListWidget"])._next_(self._sourceCodeWidget());
+return $recv(self["@regexpListWidget"])._next_(self._sourceCodeWidget());
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"regexpListWidget",{},$globals.HLReferences)});
 //>>excludeEnd("ctx");
@@ -452,16 +436,15 @@ function $HLSendersListWidget(){return $globals.HLSendersListWidget||(typeof HLS
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@sendersListWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
+var $1,$receiver;
+$1=self["@sendersListWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
 self["@sendersListWidget"]=$recv($HLSendersListWidget())._on_(self._model());
 self["@sendersListWidget"];
-$1=$recv(self["@sendersListWidget"])._next_(self._implementorsListWidget());
+return $recv(self["@sendersListWidget"])._next_(self._implementorsListWidget());
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"sendersListWidget",{},$globals.HLReferences)});
 //>>excludeEnd("ctx");
@@ -485,18 +468,16 @@ function $HLBrowserCodeWidget(){return $globals.HLBrowserCodeWidget||(typeof HLB
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$4,$1,$receiver;
-$2=self["@sourceCodeWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
-$3=$recv($HLBrowserCodeWidget())._new();
-$recv($3)._browserModel_(self._model());
-$4=$recv($3)._yourself();
-self["@sourceCodeWidget"]=$4;
+var $1,$2,$receiver;
 $1=self["@sourceCodeWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
+$2=$recv($HLBrowserCodeWidget())._new();
+$recv($2)._browserModel_(self._model());
+self["@sourceCodeWidget"]=$recv($2)._yourself();
+return self["@sourceCodeWidget"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"sourceCodeWidget",{},$globals.HLReferences)});
 //>>excludeEnd("ctx");
@@ -671,7 +652,7 @@ function $HLMethodSelected(){return $globals.HLMethodSelected||(typeof HLMethodS
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv(self._model())._announcer();
 $recv($1)._on_do_($HLSearchReferences(),(function(ann){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -685,7 +666,7 @@ return self._onSearchReferences_($recv(ann)._searchString());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:do:"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($1)._on_do_($HLMethodSelected(),(function(ann){
+$recv($1)._on_do_($HLMethodSelected(),(function(ann){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -717,7 +698,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$receiver;
+var $1,$2,$receiver;
 var $early={};
 try {
 if(($receiver = aMethod) == null || $receiver.isNil){
@@ -746,7 +727,7 @@ $2=$recv(aMethod)._selector();
 $ctx1.sendIdx["selector"]=2;
 //>>excludeEnd("ctx");
 self._selectedItem_($2);
-$3=self._activateItem_($recv(aMethod)._selector());
+self._activateItem_($recv(aMethod)._selector());
 return self;
 }
 catch(e) {if(e===$early)return e[0]; throw e}
@@ -858,12 +839,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._model_(aModel);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._model_(aModel);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{aModel:aModel},$globals.HLReferencesListWidget.klass)});
 //>>excludeEnd("ctx");
@@ -1076,9 +1055,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._methodsCache();
-return $1;
+return self._methodsCache();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"allMethods",{},$globals.HLReferencesModel)});
 //>>excludeEnd("ctx");
@@ -1101,8 +1078,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._allMethods())._select_((function(each){
+return $recv(self._allMethods())._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1111,7 +1087,6 @@ return $recv($recv(each)._referencedClasses())._includes_(aString);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"classReferencesOf:",{aString:aString},$globals.HLReferencesModel)});
 //>>excludeEnd("ctx");
@@ -1134,9 +1109,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=self._classesAndMetaclassesCache();
-return $1;
+return self._classesAndMetaclassesCache();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"classesAndMetaclasses",{},$globals.HLReferencesModel)});
 //>>excludeEnd("ctx");
@@ -1159,15 +1132,14 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$receiver;
+var $1,$receiver;
 $1=self["@classesAndMetaclassesCache"];
 if(($receiver = $1) == null || $receiver.isNil){
 self._updateClassesAndMetaclassesCache();
 } else {
 $1;
 };
-$2=self["@classesAndMetaclassesCache"];
-return $2;
+return self["@classesAndMetaclassesCache"];
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"classesAndMetaclassesCache",{},$globals.HLReferencesModel)});
 //>>excludeEnd("ctx");
@@ -1190,8 +1162,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._allMethods())._select_((function(each){
+return $recv($recv(self._allMethods())._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1208,7 +1179,6 @@ return self._methodReferenceOn_(each);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"implementorsOf:",{aString:aString},$globals.HLReferencesModel)});
 //>>excludeEnd("ctx");
@@ -1250,9 +1220,7 @@ function $HLMethodReference(){return $globals.HLMethodReference||(typeof HLMetho
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($HLMethodReference())._on_(aCompiledMethod);
-return $1;
+return $recv($HLMethodReference())._on_(aCompiledMethod);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"methodReferenceOn:",{aCompiledMethod:aCompiledMethod},$globals.HLReferencesModel)});
 //>>excludeEnd("ctx");
@@ -1275,15 +1243,14 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$receiver;
+var $1,$receiver;
 $1=self["@methodsCache"];
 if(($receiver = $1) == null || $receiver.isNil){
 self._updateMethodsCache();
 } else {
 $1;
 };
-$2=self["@methodsCache"];
-return $2;
+return self["@methodsCache"];
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"methodsCache",{},$globals.HLReferencesModel)});
 //>>excludeEnd("ctx");
@@ -1388,8 +1355,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._allMethods())._select_((function(each){
+return $recv($recv(self._allMethods())._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1406,7 +1372,6 @@ return self._methodReferenceOn_(each);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"regexpReferencesOf:",{aString:aString},$globals.HLReferencesModel)});
 //>>excludeEnd("ctx");
@@ -1430,12 +1395,11 @@ function $HLSearchReferences(){return $globals.HLSearchReferences||(typeof HLSea
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 self._updateCaches();
 $1=$recv($HLSearchReferences())._new();
 $recv($1)._searchString_(aString);
-$2=$recv($1)._yourself();
-$recv(self._announcer())._announce_($2);
+$recv(self._announcer())._announce_($recv($1)._yourself());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"search:",{aString:aString},$globals.HLReferencesModel)});
@@ -1459,8 +1423,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._allMethods())._select_((function(each){
+return $recv($recv(self._allMethods())._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1477,7 +1440,6 @@ return self._methodReferenceOn_(each);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"sendersOf:",{aString:aString},$globals.HLReferencesModel)});
 //>>excludeEnd("ctx");
@@ -1500,9 +1462,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self._updateClassesAndMetaclassesCache();
-$1=self._updateMethodsCache();
+self._updateMethodsCache();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"updateCaches",{},$globals.HLReferencesModel)});
@@ -1527,7 +1488,7 @@ function $OrderedCollection(){return $globals.OrderedCollection||(typeof Ordered
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 self["@classesAndMetaclassesCache"]=$recv($OrderedCollection())._new();
 $recv($recv(self._environment())._classes())._do_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1538,8 +1499,7 @@ $recv($1)._add_(each);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["add:"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($1)._add_($recv(each)._class());
-return $2;
+return $recv($1)._add_($recv(each)._class());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");

src/Helios-SUnit-Tests.js

@@ -614,9 +614,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._class())._package();
-return $1;
+return $recv(self._class())._package();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"thisPackage",{},$globals.HLSUnitModelTest)});
 //>>excludeEnd("ctx");

src/Helios-SUnit.js

@@ -77,8 +77,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$4,$3,$1;
-$2=(
+var $1,$3,$2;
+$1=(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
 //>>excludeEnd("ctx");
@@ -86,14 +86,13 @@ $globals.HLMultiSelectToolListWidget.superclass.fn.prototype._listCssClassForIte
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$4=self._isSelected_(anObject);
-if($core.assert($4)){
-$3=" active";
+$3=self._isSelected_(anObject);
+if($core.assert($3)){
+$2=" active";
 } else {
-$3="";
+$2="";
 };
-$1=$recv($2).__comma($3);
-return $1;
+return $recv($1).__comma($2);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"listCssClassForItem:",{anObject:anObject},$globals.HLMultiSelectToolListWidget)});
 //>>excludeEnd("ctx");
@@ -282,15 +281,13 @@ var nonMeta;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3;
+var $1;
 nonMeta=$recv(aClass)._theNonMetaClass();
 $1=$recv(nonMeta)._respondsTo_("classTag");
 if($core.assert($1)){
-$2=$recv(nonMeta)._classTag();
-return $2;
+return $recv(nonMeta)._classTag();
 } else {
-$3=$recv(nonMeta)._heliosClass();
-return $3;
+return $recv(nonMeta)._heliosClass();
 };
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -341,9 +338,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self["@model"])._selectedClasses())._includes_(anObject);
-return $1;
+return $recv($recv(self["@model"])._selectedClasses())._includes_(anObject);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isSelected:",{anObject:anObject},$globals.HLSUnitClassesListWidget)});
 //>>excludeEnd("ctx");
@@ -366,14 +361,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@items"];
-if(($receiver = $2) == null || $receiver.isNil){
-$1=self._initializeItems();
+var $1,$receiver;
+$1=self["@items"];
+if(($receiver = $1) == null || $receiver.isNil){
+return self._initializeItems();
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"items",{},$globals.HLSUnitClassesListWidget)});
 //>>excludeEnd("ctx");
@@ -418,7 +412,7 @@ function $HLClassUnselected(){return $globals.HLClassUnselected||(typeof HLClass
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv(self._model())._announcer();
 $recv($1)._on_send_to_($HLPackageSelected(),"onPackageSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -432,7 +426,7 @@ $recv($1)._on_send_to_($HLClassSelected(),"onClassSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=3;
 //>>excludeEnd("ctx");
-$2=$recv($1)._on_send_to_($HLClassUnselected(),"onClassUnselected:",self);
+$recv($1)._on_send_to_($HLClassUnselected(),"onClassUnselected:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLSUnitClassesListWidget)});
@@ -481,12 +475,11 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv($recv(self._model())._selectedPackages())._includes_($recv($recv(anAnnouncement)._theClass())._package());
 if($core.assert($1)){
 self._initializeItems();
-$2=self._refresh();
-$2;
+self._refresh();
 };
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -563,9 +556,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self._initializeItems();
-$1=self._refresh();
+self._refresh();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"onPackageSelected:",{anAnnouncement:anAnnouncement},$globals.HLSUnitClassesListWidget)});
@@ -589,9 +581,8 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self._initializeItems();
-$1=self._refresh();
+self._refresh();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"onPackageUnselected:",{anAnnouncement:anAnnouncement},$globals.HLSUnitClassesListWidget)});
@@ -615,11 +606,11 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv(html)._button();
 $recv($1)._class_("button");
 $recv($1)._with_("Select all");
-$2=$recv($1)._onClick_((function(){
+$recv($1)._onClick_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -747,14 +738,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=$recv(anItem)._isDirty();
-if($core.assert($2)){
-$1="package_dirty";
+var $1;
+$1=$recv(anItem)._isDirty();
+if($core.assert($1)){
+return "package_dirty";
 } else {
-$1="package";
+return "package";
 };
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"cssClassForItem:",{anItem:anItem},$globals.HLSUnitPackagesListWidget)});
 //>>excludeEnd("ctx");
@@ -815,9 +805,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self["@model"])._selectedPackages())._includes_(anObject);
-return $1;
+return $recv($recv(self["@model"])._selectedPackages())._includes_(anObject);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isSelected:",{anObject:anObject},$globals.HLSUnitPackagesListWidget)});
 //>>excludeEnd("ctx");
@@ -840,14 +828,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@items"];
-if(($receiver = $2) == null || $receiver.isNil){
-$1=self._initializeItems();
+var $1,$receiver;
+$1=self["@items"];
+if(($receiver = $1) == null || $receiver.isNil){
+return self._initializeItems();
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"items",{},$globals.HLSUnitPackagesListWidget)});
 //>>excludeEnd("ctx");
@@ -890,13 +877,13 @@ function $HLPackageUnselected(){return $globals.HLPackageUnselected||(typeof HLP
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv(self._model())._announcer();
 $recv($1)._on_send_to_($HLPackageSelected(),"onPackageSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($1)._on_send_to_($HLPackageUnselected(),"onPackageUnselected:",self);
+$recv($1)._on_send_to_($HLPackageUnselected(),"onPackageUnselected:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLSUnitPackagesListWidget)});
@@ -945,7 +932,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $4,$6,$5,$3,$2,$1,$7;
+var $4,$6,$5,$3,$2,$1;
 $4=self._items();
 $6=$recv(anAnnouncement)._theClass();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -968,8 +955,7 @@ return $recv($recv($recv(anAnnouncement)._theClass())._package())._isTestPackage
 }));
 if($core.assert($1)){
 self._initializeItems();
-$7=self._refresh();
-$7;
+self._refresh();
 };
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1046,7 +1032,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$2,$4,$5;
+var $1,$3,$2,$4;
 $1=$recv(html)._button();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["button"]=1;
@@ -1078,7 +1064,7 @@ $ctx1.sendIdx["onClick:"]=1;
 $4=$recv(html)._button();
 $recv($4)._class_("button");
 $recv($4)._with_("Select all");
-$5=$recv($4)._onClick_((function(){
+$recv($4)._onClick_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1189,16 +1175,15 @@ function $HLSUnitClassesListWidget(){return $globals.HLSUnitClassesListWidget||(
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@classesListWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
+var $1,$receiver;
+$1=self["@classesListWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
 self["@classesListWidget"]=$recv($HLSUnitClassesListWidget())._on_(self._model());
 self["@classesListWidget"];
-$1=$recv(self["@classesListWidget"])._next_(self._failuresWidget());
+return $recv(self["@classesListWidget"])._next_(self._failuresWidget());
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"classesListWidget",{},$globals.HLSUnit)});
 //>>excludeEnd("ctx");
@@ -1222,15 +1207,14 @@ function $HLSUnitErrorsListWidget(){return $globals.HLSUnitErrorsListWidget||(ty
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@errorsWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@errorsWidget"]=$recv($HLSUnitErrorsListWidget())._on_(self._model());
+var $1,$receiver;
 $1=self["@errorsWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@errorsWidget"]=$recv($HLSUnitErrorsListWidget())._on_(self._model());
+return self["@errorsWidget"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"errorsWidget",{},$globals.HLSUnit)});
 //>>excludeEnd("ctx");
@@ -1254,16 +1238,15 @@ function $HLSUnitFailuresListWidget(){return $globals.HLSUnitFailuresListWidget|
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@failuresWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
+var $1,$receiver;
+$1=self["@failuresWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
 self["@failuresWidget"]=$recv($HLSUnitFailuresListWidget())._on_(self._model());
 self["@failuresWidget"];
-$1=$recv(self["@failuresWidget"])._next_(self._errorsWidget());
+return $recv(self["@failuresWidget"])._next_(self._errorsWidget());
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"failuresWidget",{},$globals.HLSUnit)});
 //>>excludeEnd("ctx");
@@ -1287,15 +1270,14 @@ function $HLSUnitModel(){return $globals.HLSUnitModel||(typeof HLSUnitModel=="un
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@model"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@model"]=$recv($HLSUnitModel())._new();
+var $1,$receiver;
 $1=self["@model"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@model"]=$recv($HLSUnitModel())._new();
+return self["@model"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"model",{},$globals.HLSUnit)});
 //>>excludeEnd("ctx");
@@ -1319,16 +1301,15 @@ function $HLSUnitPackagesListWidget(){return $globals.HLSUnitPackagesListWidget|
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@packagesListWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
+var $1,$receiver;
+$1=self["@packagesListWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
 self["@packagesListWidget"]=$recv($HLSUnitPackagesListWidget())._on_(self._model());
 self["@packagesListWidget"];
-$1=$recv(self["@packagesListWidget"])._next_(self._classesListWidget());
+return $recv(self["@packagesListWidget"])._next_(self._classesListWidget());
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"packagesListWidget",{},$globals.HLSUnit)});
 //>>excludeEnd("ctx");
@@ -1459,18 +1440,16 @@ function $HLSUnitResults(){return $globals.HLSUnitResults||(typeof HLSUnitResult
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$4,$1,$receiver;
-$2=self["@resultWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
-$3=$recv($HLSUnitResults())._new();
-$recv($3)._model_(self._model());
-$4=$recv($3)._yourself();
-self["@resultWidget"]=$4;
+var $1,$2,$receiver;
 $1=self["@resultWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
+$2=$recv($HLSUnitResults())._new();
+$recv($2)._model_(self._model());
+self["@resultWidget"]=$recv($2)._yourself();
+return self["@resultWidget"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"resultWidget",{},$globals.HLSUnit)});
 //>>excludeEnd("ctx");
@@ -1611,9 +1590,7 @@ selector: "currentSuite",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@currentSuite"];
-return $1;
+return self["@currentSuite"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1884,8 +1861,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._unfilteredSelectedClasses())._select_((function(each){
+return $recv(self._unfilteredSelectedClasses())._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1894,7 +1870,6 @@ return $recv(self._selectedPackages())._includes_($recv(each)._package());
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectedClasses",{},$globals.HLSUnitModel)});
 //>>excludeEnd("ctx");
@@ -1918,15 +1893,14 @@ function $Set(){return $globals.Set||(typeof Set=="undefined"?nil:Set)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@selectedPackages"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@selectedPackages"]=$recv($Set())._new();
+var $1,$receiver;
 $1=self["@selectedPackages"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@selectedPackages"]=$recv($Set())._new();
+return self["@selectedPackages"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectedPackages",{},$globals.HLSUnitModel)});
 //>>excludeEnd("ctx");
@@ -1987,7 +1961,6 @@ var testCases;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 testCases=[];
 $recv(self._selectedClasses())._do_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1998,8 +1971,7 @@ return $recv(testCases)._addAll_($recv(each)._buildSuite());
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-$1=testCases;
-return $1;
+return testCases;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testCases",{testCases:testCases},$globals.HLSUnitModel)});
 //>>excludeEnd("ctx");
@@ -2024,7 +1996,6 @@ function $Array(){return $globals.Array||(typeof Array=="undefined"?nil:Array)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 stream=$recv($recv($Array())._new())._writeStream();
 $recv(self._selectedPackages())._do_((function(package_){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2043,8 +2014,7 @@ return $recv(each)._isTestClass();
 }, function($ctx2) {$ctx2.fillBlock({package_:package_},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-$1=$recv(stream)._contents();
-return $1;
+return $recv(stream)._contents();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testClasses",{stream:stream},$globals.HLSUnitModel)});
 //>>excludeEnd("ctx");
@@ -2067,8 +2037,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._environment())._packages())._select_((function(each){
+return $recv($recv(self._environment())._packages())._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -2077,7 +2046,6 @@ return $recv(each)._isTestPackage();
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testPackages",{},$globals.HLSUnitModel)});
 //>>excludeEnd("ctx");
@@ -2101,15 +2069,14 @@ function $TestResult(){return $globals.TestResult||(typeof TestResult=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@testResult"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@testResult"]=$recv($TestResult())._new();
+var $1,$receiver;
 $1=self["@testResult"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@testResult"]=$recv($TestResult())._new();
+return self["@testResult"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testResult",{},$globals.HLSUnitModel)});
 //>>excludeEnd("ctx");
@@ -2133,15 +2100,14 @@ function $Set(){return $globals.Set||(typeof Set=="undefined"?nil:Set)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@selectedClasses"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@selectedClasses"]=$recv($Set())._new();
+var $1,$receiver;
 $1=self["@selectedClasses"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@selectedClasses"]=$recv($Set())._new();
+return self["@selectedClasses"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"unfilteredSelectedClasses",{},$globals.HLSUnitModel)});
 //>>excludeEnd("ctx");
@@ -2368,9 +2334,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._model())._testResult())._errors();
-return $1;
+return $recv($recv(self._model())._testResult())._errors();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"items",{},$globals.HLSUnitErrorsListWidget)});
 //>>excludeEnd("ctx");
@@ -2417,9 +2381,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._model())._testResult())._failures();
-return $1;
+return $recv($recv(self._model())._testResult())._failures();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"items",{},$globals.HLSUnitFailuresListWidget)});
 //>>excludeEnd("ctx");
@@ -2467,15 +2429,14 @@ function $TestResult(){return $globals.TestResult||(typeof TestResult=="undefine
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@model"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@model"]=$recv($TestResult())._new();
+var $1,$receiver;
 $1=self["@model"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@model"]=$recv($TestResult())._new();
+return self["@model"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"model",{},$globals.HLSUnitResultStatus)});
 //>>excludeEnd("ctx");
@@ -2572,9 +2533,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv($recv($recv(self._result())._errors())._size())._asString()).__comma(" errors, ");
-return $1;
+return $recv($recv($recv($recv(self._result())._errors())._size())._asString()).__comma(" errors, ");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"printErrors",{},$globals.HLSUnitResultStatus)});
 //>>excludeEnd("ctx");
@@ -2597,9 +2556,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv($recv($recv(self._result())._failures())._size())._asString()).__comma(" failures");
-return $1;
+return $recv($recv($recv($recv(self._result())._failures())._size())._asString()).__comma(" failures");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"printFailures",{},$globals.HLSUnitResultStatus)});
 //>>excludeEnd("ctx");
@@ -2622,29 +2579,28 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $6,$5,$9,$8,$7,$4,$3,$2,$1;
-$6=self._result();
+var $5,$4,$8,$7,$6,$3,$2,$1;
+$5=self._result();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["result"]=1;
 //>>excludeEnd("ctx");
-$5=$recv($6)._runs();
-$9=self._result();
+$4=$recv($5)._runs();
+$8=self._result();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["result"]=2;
 //>>excludeEnd("ctx");
-$8=$recv($9)._errors();
-$7=$recv($8)._size();
+$7=$recv($8)._errors();
+$6=$recv($7)._size();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["size"]=1;
 //>>excludeEnd("ctx");
-$4=$recv($5).__minus($7);
-$3=$recv($4).__minus($recv($recv(self._result())._failures())._size());
+$3=$recv($4).__minus($6);
+$2=$recv($3).__minus($recv($recv(self._result())._failures())._size());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["-"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($3)._asString();
-$1=$recv($2).__comma(" passes, ");
-return $1;
+$1=$recv($2)._asString();
+return $recv($1).__comma(" passes, ");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"printPasses",{},$globals.HLSUnitResultStatus)});
 //>>excludeEnd("ctx");
@@ -2667,9 +2623,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv($recv(self._result())._total())._asString()).__comma(" runs, ");
-return $1;
+return $recv($recv($recv(self._result())._total())._asString()).__comma(" runs, ");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"printTotal",{},$globals.HLSUnitResultStatus)});
 //>>excludeEnd("ctx");
@@ -2730,9 +2684,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._model())._testResult();
-return $1;
+return $recv(self._model())._testResult();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"result",{},$globals.HLSUnitResultStatus)});
 //>>excludeEnd("ctx");
@@ -2755,9 +2707,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1="sunit status ".__comma($recv(self._result())._status());
-return $1;
+return "sunit status ".__comma($recv(self._result())._status());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"statusCssClass",{},$globals.HLSUnitResultStatus)});
 //>>excludeEnd("ctx");
@@ -2847,9 +2797,7 @@ selector: "model",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@model"];
-return $1;
+return self["@model"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -2897,13 +2845,13 @@ function $ResultAnnouncement(){return $globals.ResultAnnouncement||(typeof Resul
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv(self._model())._announcer();
 $recv($1)._on_send_to_($HLRunTests(),"onRunTests:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($1)._on_send_to_($ResultAnnouncement(),"onResultAnnouncement:",self);
+$recv($1)._on_send_to_($ResultAnnouncement(),"onResultAnnouncement:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLSUnitResults)});
@@ -2973,10 +2921,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=self._progressBarWidget();
 $recv($1)._updateProgress_((0));
-$2=$recv($1)._refresh();
+$recv($1)._refresh();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"onRunTests:",{announcement:announcement},$globals.HLSUnitResults)});
@@ -3001,18 +2949,16 @@ function $HLProgressBarWidget(){return $globals.HLProgressBarWidget||(typeof HLP
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$4,$1,$receiver;
-$2=self["@progressBarWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
-$3=$recv($HLProgressBarWidget())._new();
-$recv($3)._label_("");
-$4=$recv($3)._yourself();
-self["@progressBarWidget"]=$4;
+var $1,$2,$receiver;
 $1=self["@progressBarWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
+$2=$recv($HLProgressBarWidget())._new();
+$recv($2)._label_("");
+self["@progressBarWidget"]=$recv($2)._yourself();
+return self["@progressBarWidget"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"progressBarWidget",{},$globals.HLSUnitResults)});
 //>>excludeEnd("ctx");
@@ -3035,12 +2981,11 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 $recv(html)._with_(self._resultStatusWidget());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:"]=1;
 //>>excludeEnd("ctx");
-$1=$recv(html)._with_(self._progressBarWidget());
+$recv(html)._with_(self._progressBarWidget());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"renderContentOn:",{html:html},$globals.HLSUnitResults)});
@@ -3065,18 +3010,16 @@ function $HLSUnitResultStatus(){return $globals.HLSUnitResultStatus||(typeof HLS
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$4,$1,$receiver;
-$2=self["@resultStatusWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
-$3=$recv($HLSUnitResultStatus())._new();
-$recv($3)._model_(self._model());
-$4=$recv($3)._yourself();
-self["@resultStatusWidget"]=$4;
+var $1,$2,$receiver;
 $1=self["@resultStatusWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
+$2=$recv($HLSUnitResultStatus())._new();
+$recv($2)._model_(self._model());
+self["@resultStatusWidget"]=$recv($2)._yourself();
+return self["@resultStatusWidget"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"resultStatusWidget",{},$globals.HLSUnitResults)});
 //>>excludeEnd("ctx");

src/Helios-Transcript.js

@@ -98,10 +98,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv(html)._div();
 $recv($1)._class_("transcript");
-$2=$recv($1)._with_((function(){
+$recv($1)._with_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -326,15 +326,14 @@ function $OrderedCollection(){return $globals.OrderedCollection||(typeof Ordered
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@transcripts"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@transcripts"]=$recv($OrderedCollection())._new();
+var $1,$receiver;
 $1=self["@transcripts"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@transcripts"]=$recv($OrderedCollection())._new();
+return self["@transcripts"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"transcripts",{},$globals.HLTranscriptHandler.klass)});
 //>>excludeEnd("ctx");

src/Helios-Workspace.js

@@ -15,15 +15,14 @@ function $Announcer(){return $globals.Announcer||(typeof Announcer=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@announcer"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@announcer"]=$recv($Announcer())._new();
+var $1,$receiver;
 $1=self["@announcer"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@announcer"]=$recv($Announcer())._new();
+return self["@announcer"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"announcer",{},$globals.HLCodeModel)});
 //>>excludeEnd("ctx");
@@ -70,9 +69,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._environment())._doItReceiver();
-return $1;
+return $recv(self._environment())._doItReceiver();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"defaultReceiver",{},$globals.HLCodeModel)});
 //>>excludeEnd("ctx");
@@ -96,8 +93,7 @@ function $ErrorHandler(){return $globals.ErrorHandler||(typeof ErrorHandler=="un
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv((function(){
+return $recv((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -115,7 +111,6 @@ return nil;
 }, function($ctx2) {$ctx2.fillBlock({e:e},$ctx1,2)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"doIt:",{aString:aString},$globals.HLCodeModel)});
 //>>excludeEnd("ctx");
@@ -139,14 +134,13 @@ function $HLManager(){return $globals.HLManager||(typeof HLManager=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@environment"];
-if(($receiver = $2) == null || $receiver.isNil){
-$1=$recv($recv($HLManager())._current())._environment();
+var $1,$receiver;
+$1=self["@environment"];
+if(($receiver = $1) == null || $receiver.isNil){
+return $recv($recv($HLManager())._current())._environment();
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"environment",{},$globals.HLCodeModel)});
 //>>excludeEnd("ctx");
@@ -212,15 +206,14 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@receiver"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@receiver"]=self._defaultReceiver();
+var $1,$receiver;
 $1=self["@receiver"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@receiver"]=self._defaultReceiver();
+return self["@receiver"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"receiver",{},$globals.HLCodeModel)});
 //>>excludeEnd("ctx");
@@ -263,12 +256,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._environment_(anEnvironment);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._environment_(anEnvironment);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{anEnvironment:anEnvironment},$globals.HLCodeModel.klass)});
 //>>excludeEnd("ctx");
@@ -293,9 +284,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._model())._announcer();
-return $1;
+return $recv(self._model())._announcer();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"announcer",{},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
@@ -321,7 +310,6 @@ function $ErrorHandler(){return $globals.ErrorHandler||(typeof ErrorHandler=="un
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 var $early={};
 try {
 result=$recv((function(){
@@ -336,8 +324,7 @@ return self._doIt();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$1=$recv($ErrorHandler())._handleError_(exception);
-throw $early=[$1];
+throw $early=[$recv($ErrorHandler())._handleError_(exception)];
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({exception:exception},$ctx1,2)});
 //>>excludeEnd("ctx");
@@ -468,9 +455,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self["@editor"])._getValue();
-return $1;
+return $recv(self["@editor"])._getValue();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"contents",{},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
@@ -524,9 +509,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self["@editor"])._getLine_($recv($recv(self["@editor"])._getCursor())._line());
-return $1;
+return $recv(self["@editor"])._getLine_($recv($recv(self["@editor"])._getCursor())._line());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"currentLine",{},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
@@ -549,14 +532,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=$recv(self["@editor"])._somethingSelected();
-if($core.assert($2)){
-$1=self._selection();
+var $1;
+$1=$recv(self["@editor"])._somethingSelected();
+if($core.assert($1)){
+return self._selection();
 } else {
-$1=self._currentLine();
+return self._currentLine();
 };
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"currentLineOrSelection",{},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
@@ -581,15 +563,14 @@ function $HLDoItExecuted(){return $globals.HLDoItExecuted||(typeof HLDoItExecute
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=self._model();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["model"]=1;
 //>>excludeEnd("ctx");
 result=$recv($1)._doIt_(self._currentLineOrSelection());
 $recv($recv(self._model())._announcer())._announce_($recv($HLDoItExecuted())._on_(self["@model"]));
-$2=result;
-return $2;
+return result;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"doIt",{result:result},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
@@ -609,9 +590,7 @@ selector: "editor",
 protocol: 'actions',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@editor"];
-return $1;
+return self["@editor"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -633,13 +612,12 @@ function $HashedCollection(){return $globals.HashedCollection||(typeof HashedCol
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2="helios.editorTheme"._settingValueIfAbsent_("default");
+var $1;
+$1="helios.editorTheme"._settingValueIfAbsent_("default");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["settingValueIfAbsent:"]=1;
 //>>excludeEnd("ctx");
-$1=$globals.HashedCollection._newFromPairs_(["theme",$2,"mode","text/x-stsrc","lineNumbers",true,"enterMode","flat","indentWithTabs",true,"indentUnit",(4),"matchBrackets",true,"electricChars",false,"keyMap","Amber","extraKeys",$recv($HashedCollection())._with_($recv("helios.completionKey"._settingValueIfAbsent_("Shift-Space")).__minus_gt("autocomplete"))]);
-return $1;
+return $globals.HashedCollection._newFromPairs_(["theme",$1,"mode","text/x-stsrc","lineNumbers",true,"enterMode","flat","indentWithTabs",true,"indentUnit",(4),"matchBrackets",true,"electricChars",false,"keyMap","Amber","extraKeys",$recv($HashedCollection())._with_($recv("helios.completionKey"._settingValueIfAbsent_("Shift-Space")).__minus_gt("autocomplete"))]);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"editorOptions",{},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
@@ -686,9 +664,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self["@code"])._asJQuery())._is_(":active");
-return $1;
+return $recv($recv(self["@code"])._asJQuery())._is_(":active");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"hasFocus",{},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
@@ -754,16 +730,16 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$1=$recv($recv($recv($recv($recv($Smalltalk())._core())._allSelectors())._asArray())._select_((function(each){
+var $1;
+return $recv($recv($recv($recv($recv($Smalltalk())._core())._allSelectors())._asArray())._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$2=$recv(aToken)._string();
+$1=$recv(aToken)._string();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["string"]=1;
 //>>excludeEnd("ctx");
-return $recv(each)._includesSubString_($2);
+return $recv(each)._includesSubString_($1);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)});
 //>>excludeEnd("ctx");
@@ -776,7 +752,6 @@ return $recv(each).__eq($recv(aToken)._string());
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)});
 //>>excludeEnd("ctx");
 }));
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"messageHintFor:token:",{anEditor:anEditor,aToken:aToken},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
@@ -800,15 +775,14 @@ function $HLCodeModel(){return $globals.HLCodeModel||(typeof HLCodeModel=="undef
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@model"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@model"]=$recv($HLCodeModel())._new();
+var $1,$receiver;
 $1=self["@model"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@model"]=$recv($HLCodeModel())._new();
+return self["@model"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"model",{},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
@@ -1158,9 +1132,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._model())._receiver();
-return $1;
+return $recv(self._model())._receiver();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"receiver",{},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
@@ -1207,7 +1179,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4,$5,$6,$7,$8;
+var $1,$2,$3,$4,$5,$6,$7;
 $1=$recv(html)._button();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["button"]=1;
@@ -1283,7 +1255,7 @@ $ctx1.sendIdx["onClick:"]=3;
 $7=$recv(html)._button();
 $recv($7)._class_("button");
 $recv($7)._with_("BrowseIt");
-$8=$recv($7)._onClick_((function(){
+$recv($7)._onClick_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1315,7 +1287,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4,$5,$6;
+var $1,$2,$3,$4;
 $1=$recv(html)._div();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["div"]=1;
@@ -1347,7 +1319,7 @@ $ctx1.sendIdx["class:"]=2;
 //>>excludeEnd("ctx");
 $4=$recv(html)._div();
 $recv($4)._class_("buttons_bar");
-$5=$recv($4)._with_((function(){
+$recv($4)._with_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1358,7 +1330,7 @@ return self._renderButtonsOn_(html);
 }));
 self._setEditorOn_($recv(self["@code"])._element());
 self._configureEditor();
-$6=self._updateState();
+self._updateState();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"renderContentOn:",{html:html},$globals.HLCodeWidget)});
@@ -1400,9 +1372,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self["@editor"])._getSelection();
-return $1;
+return $recv(self["@editor"])._getSelection();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selection",{},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
@@ -1425,9 +1395,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self["@code"])._element())._selectionEnd();
-return $1;
+return $recv($recv(self["@code"])._element())._selectionEnd();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectionEnd",{},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
@@ -1474,9 +1442,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self["@code"])._element())._selectionStart();
-return $1;
+return $recv($recv(self["@code"])._element())._selectionStart();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectionStart",{},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
@@ -1583,7 +1549,7 @@ function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $3,$2,$1,$9,$8,$7,$6,$10,$5,$4;
+var $3,$2,$1,$8,$7,$6,$5,$9,$4;
 $3=$recv($recv($recv(anEditor)._display())._wrapper())._asJQuery();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["asJQuery"]=1;
@@ -1612,27 +1578,27 @@ return $recv(each)._name();
 //>>excludeEnd("ctx");
 }));
 pseudoVariables=$recv($Smalltalk())._pseudoVariableNames();
-$9=$recv($recv(variables).__comma(classNames)).__comma(pseudoVariables);
+$8=$recv($recv(variables).__comma(classNames)).__comma(pseudoVariables);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx[","]=1;
 //>>excludeEnd("ctx");
-$8=$recv($9)._asSet();
-$7=$recv($8)._asArray();
-$6=$recv($7)._sort();
-$5=$recv($6)._select_((function(each){
+$7=$recv($8)._asSet();
+$6=$recv($7)._asArray();
+$5=$recv($6)._sort();
+$4=$recv($5)._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$10=$recv(aToken)._string();
+$9=$recv(aToken)._string();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["string"]=1;
 //>>excludeEnd("ctx");
-return $recv(each)._includesSubString_($10);
+return $recv(each)._includesSubString_($9);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,3)});
 //>>excludeEnd("ctx");
 }));
-$4=$recv($5)._reject_((function(each){
+return $recv($4)._reject_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1641,7 +1607,6 @@ return $recv(each).__eq($recv(aToken)._string());
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,4)});
 //>>excludeEnd("ctx");
 }));
-return $4;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"variableHintFor:token:",{anEditor:anEditor,aToken:aToken,variables:variables,classNames:classNames,pseudoVariables:pseudoVariables},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
@@ -1665,9 +1630,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(require)._value_("codemirror/lib/codemirror");
-return $1;
+return $recv(require)._value_("codemirror/lib/codemirror");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"codeMirror",{},$globals.HLCodeWidget.klass)});
 //>>excludeEnd("ctx");
@@ -1692,7 +1655,7 @@ function $HLCodeWidget(){return $globals.HLCodeWidget||(typeof HLCodeWidget=="un
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$4,$3,$2,$5,$7,$9,$10,$8,$6;
+var $1,$4,$3,$2,$5,$6,$8,$9,$7;
 codeMirror=self._codeMirror();
 cursor=$recv(anEditor)._getCursor();
 token=$recv(anEditor)._getTokenAt_(cursor);
@@ -1713,21 +1676,20 @@ completions=$recv($HLCodeWidget())._variableHintFor_token_(anEditor,token);
 } else {
 completions=$recv($HLCodeWidget())._messageHintFor_token_(anEditor,token);
 };
-$7=completions;
-$9=$recv(codeMirror)._basicAt_("Pos");
+$6=completions;
+$8=$recv(codeMirror)._basicAt_("Pos");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["basicAt:"]=2;
 //>>excludeEnd("ctx");
-$10=$recv(cursor)._line();
+$9=$recv(cursor)._line();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["line"]=1;
 //>>excludeEnd("ctx");
-$8=$recv($9)._value_value_($10,$recv(token)._end());
+$7=$recv($8)._value_value_($9,$recv(token)._end());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["value:value:"]=2;
 //>>excludeEnd("ctx");
-$6=$globals.HashedCollection._newFromPairs_(["list",$7,"from",$8,"to",$recv($recv(codeMirror)._basicAt_("Pos"))._value_value_($recv(cursor)._line(),$recv(token)._start())]);
-return $6;
+return $globals.HashedCollection._newFromPairs_(["list",$6,"from",$7,"to",$recv($recv(codeMirror)._basicAt_("Pos"))._value_value_($recv(cursor)._line(),$recv(token)._start())]);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"hintFor:options:",{anEditor:anEditor,options:options,cursor:cursor,token:token,completions:completions,codeMirror:codeMirror},$globals.HLCodeWidget.klass)});
 //>>excludeEnd("ctx");
@@ -1750,7 +1712,6 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 (
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = true, 
@@ -1761,7 +1722,7 @@ $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
 self._setupCodeMirror();
 self._setupCommands();
-$1=self._setupKeyMaps();
+self._setupKeyMaps();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"initialize",{},$globals.HLCodeWidget.klass)});
@@ -1786,14 +1747,13 @@ function $HLManager(){return $globals.HLManager||(typeof HLManager=="undefined"?
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1;
-$2=$recv($recv($recv($HLManager())._current())._keyBinder())._systemIsMac();
-if($core.assert($2)){
-$1=self._macKeyMap();
+var $1;
+$1=$recv($recv($recv($HLManager())._current())._keyBinder())._systemIsMac();
+if($core.assert($1)){
+return self._macKeyMap();
 } else {
-$1=self._pcKeyMap();
+return self._pcKeyMap();
 };
-return $1;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"keyMap",{},$globals.HLCodeWidget.klass)});
 //>>excludeEnd("ctx");
@@ -1813,9 +1773,7 @@ selector: "macKeyMap",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=$globals.HashedCollection._newFromPairs_(["Alt-Backspace","delWordBefore","Alt-Delete","delWordAfter","Alt-Left","goWordLeft","Alt-Right","goWordRight","Cmd-A","selectAll","Cmd-Alt-F","replace","Cmd-D","doIt","Cmd-B","browseIt","Cmd-Down","goDocEnd","Cmd-End","goDocEnd","Cmd-F","find","Cmd-G","findNext","Cmd-I","inspectIt","Cmd-Left","goLineStart","Cmd-P","printIt","Cmd-Right","goLineEnd","Cmd-S","saveIt","Cmd-Up","goDocStart","Cmd-Y","redo","Cmd-Z","undo","Cmd-[","indentLess","Cmd-]","indentMore","Ctrl-Alt-Backspace","delWordAfter","Shift-Cmd-Alt-F","replaceAll","Shift-Cmd-G","findPrev","Shift-Cmd-Z","redo","fallthrough",["basic","emacsy"]]);
-return $1;
+return $globals.HashedCollection._newFromPairs_(["Alt-Backspace","delWordBefore","Alt-Delete","delWordAfter","Alt-Left","goWordLeft","Alt-Right","goWordRight","Cmd-A","selectAll","Cmd-Alt-F","replace","Cmd-D","doIt","Cmd-B","browseIt","Cmd-Down","goDocEnd","Cmd-End","goDocEnd","Cmd-F","find","Cmd-G","findNext","Cmd-I","inspectIt","Cmd-Left","goLineStart","Cmd-P","printIt","Cmd-Right","goLineEnd","Cmd-S","saveIt","Cmd-Up","goDocStart","Cmd-Y","redo","Cmd-Z","undo","Cmd-[","indentLess","Cmd-]","indentMore","Ctrl-Alt-Backspace","delWordAfter","Shift-Cmd-Alt-F","replaceAll","Shift-Cmd-G","findPrev","Shift-Cmd-Z","redo","fallthrough",["basic","emacsy"]]);
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1836,9 +1794,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(anEditor)._at_("amberCodeWidget"))._messageHintFor_token_(anEditor,aToken);
-return $1;
+return $recv($recv(anEditor)._at_("amberCodeWidget"))._messageHintFor_token_(anEditor,aToken);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"messageHintFor:token:",{anEditor:anEditor,aToken:aToken},$globals.HLCodeWidget.klass)});
 //>>excludeEnd("ctx");
@@ -1858,9 +1814,7 @@ selector: "pcKeyMap",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=$globals.HashedCollection._newFromPairs_(["Alt-Left","goLineStart","Alt-Right","goLineEnd","Alt-Up","goDocStart","Ctrl-A","selectAll","Ctrl-Backspace","delWordBefore","Ctrl-D","doIt","Ctrl-B","browseIt","Ctrl-Delete","delWordAfter","Ctrl-Down","goDocEnd","Ctrl-End","goDocEnd","Ctrl-F","find","Ctrl-G","findNext","Ctrl-I","inspectIt","Ctrl-Home","goDocStart","Ctrl-Left","goWordLeft","Ctrl-P","printIt","Ctrl-Right","goWordRight","Ctrl-S","saveIt","Ctrl-Y","redo","Ctrl-Z","undo","Ctrl-[","indentLess","Ctrl-]","indentMore","Shift-Ctrl-F","replace","Shift-Ctrl-G","findPrev","Shift-Ctrl-R","replaceAll","Shift-Ctrl-Z","redo","fallthrough",["basic"]]);
-return $1;
+return $globals.HashedCollection._newFromPairs_(["Alt-Left","goLineStart","Alt-Right","goLineEnd","Alt-Up","goDocStart","Ctrl-A","selectAll","Ctrl-Backspace","delWordBefore","Ctrl-D","doIt","Ctrl-B","browseIt","Ctrl-Delete","delWordAfter","Ctrl-Down","goDocEnd","Ctrl-End","goDocEnd","Ctrl-F","find","Ctrl-G","findNext","Ctrl-I","inspectIt","Ctrl-Home","goDocStart","Ctrl-Left","goWordLeft","Ctrl-P","printIt","Ctrl-Right","goWordRight","Ctrl-S","saveIt","Ctrl-Y","redo","Ctrl-Z","undo","Ctrl-[","indentLess","Ctrl-]","indentMore","Shift-Ctrl-F","replace","Shift-Ctrl-G","findPrev","Shift-Ctrl-R","replaceAll","Shift-Ctrl-Z","redo","fallthrough",["basic"]]);
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -1911,7 +1865,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2,$3,$4,$5,$6;
+var $1,$2,$3,$4,$5;
 $1=$recv(self._codeMirror())._basicAt_("commands");
 $recv($1)._at_put_("doIt",(function(cm){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1977,7 +1931,7 @@ return $recv($5)._saveIt();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["at:put:"]=4;
 //>>excludeEnd("ctx");
-$6=$recv($1)._at_put_("browseIt",(function(cm){
+$recv($1)._at_put_("browseIt",(function(cm){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -2033,9 +1987,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(anEditor)._at_("amberCodeWidget"))._variableHintFor_token_(anEditor,aToken);
-return $1;
+return $recv($recv(anEditor)._at_("amberCodeWidget"))._variableHintFor_token_(anEditor,aToken);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"variableHintFor:token:",{anEditor:anEditor,aToken:aToken},$globals.HLCodeWidget.klass)});
 //>>excludeEnd("ctx");
@@ -2124,9 +2076,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv($recv(self._methodContents()).__eq(self._contents()))._not();
-return $1;
+return $recv($recv(self._methodContents()).__eq(self._contents()))._not();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"hasModification",{},$globals.HLNavigationCodeWidget)});
 //>>excludeEnd("ctx");
@@ -2149,14 +2099,13 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@methodContents"];
-if(($receiver = $2) == null || $receiver.isNil){
-$1="";
+var $1,$receiver;
+$1=self["@methodContents"];
+if(($receiver = $1) == null || $receiver.isNil){
+return "";
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"methodContents",{},$globals.HLNavigationCodeWidget)});
 //>>excludeEnd("ctx");
@@ -2255,12 +2204,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._browserModel_(aBrowserModel);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._browserModel_(aBrowserModel);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{aBrowserModel:aBrowserModel},$globals.HLNavigationCodeWidget.klass)});
 //>>excludeEnd("ctx");
@@ -2282,9 +2229,7 @@ selector: "browserModel",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-var $1;
-$1=self["@browserModel"];
-return $1;
+return self["@browserModel"];
 
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
@@ -2305,10 +2250,9 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 self["@browserModel"]=aBrowserModel;
 self._observeSystem();
-$1=self._observeBrowserModel();
+self._observeBrowserModel();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"browserModel:",{aBrowserModel:aBrowserModel},$globals.HLBrowserCodeWidget)});
@@ -2346,7 +2290,7 @@ function $HLShowTemplate(){return $globals.HLShowTemplate||(typeof HLShowTemplat
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv(self._browserModel())._announcer();
 $recv($1)._on_send_to_($HLSaveSourceCode(),"onSaveIt",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2400,7 +2344,7 @@ $recv($1)._on_send_to_($HLSourceCodeFocusRequested(),"onSourceCodeFocusRequested
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=13;
 //>>excludeEnd("ctx");
-$2=$recv($1)._on_send_to_($HLShowTemplate(),"onShowTemplate:",self);
+$recv($1)._on_send_to_($HLShowTemplate(),"onShowTemplate:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeBrowserModel",{},$globals.HLBrowserCodeWidget)});
@@ -2980,7 +2924,6 @@ function $String(){return $globals.String||(typeof String=="undefined"?nil:Strin
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
 error=$recv(anAnnouncement)._error();
 self._confirm_ifTrue_($recv($String())._streamContents_((function(stream){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2994,8 +2937,7 @@ $recv(stream)._nextPutAll_($recv($String())._cr());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["nextPutAll:"]=2;
 //>>excludeEnd("ctx");
-$1=$recv(stream)._nextPutAll_("Would you like to define an instance variable?");
-return $1;
+return $recv(stream)._nextPutAll_("Would you like to define an instance variable?");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({stream:stream},$ctx1,1)});
 //>>excludeEnd("ctx");
@@ -3064,11 +3006,11 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$2;
+var $1;
 $1=$recv(html)._button();
 $recv($1)._class_("button");
 $recv($1)._with_("SaveIt");
-$2=$recv($1)._onClick_((function(){
+$recv($1)._onClick_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -3193,12 +3135,10 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$3,$1;
-$2=self._new();
-$recv($2)._browserModel_(aBrowserModel);
-$3=$recv($2)._yourself();
-$1=$3;
-return $1;
+var $1;
+$1=self._new();
+$recv($1)._browserModel_(aBrowserModel);
+return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"on:",{aBrowserModel:aBrowserModel},$globals.HLBrowserCodeWidget.klass)});
 //>>excludeEnd("ctx");
@@ -3242,15 +3182,14 @@ function $HLCodeWidget(){return $globals.HLCodeWidget||(typeof HLCodeWidget=="un
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@codeWidget"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@codeWidget"]=$recv($HLCodeWidget())._new();
+var $1,$receiver;
 $1=self["@codeWidget"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@codeWidget"]=$recv($HLCodeWidget())._new();
+return self["@codeWidget"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"codeWidget",{},$globals.HLWorkspace)});
 //>>excludeEnd("ctx");
@@ -3273,9 +3212,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1;
-$1=$recv(self._codeWidget())._focus();
-return $1;
+return $recv(self._codeWidget())._focus();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"focus",{},$globals.HLWorkspace)});
 //>>excludeEnd("ctx");
@@ -3335,7 +3272,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $1,$3,$4,$2;
+var $1,$3,$2;
 $1=$recv(html)._div();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["div"]=1;
@@ -3350,8 +3287,7 @@ return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
 $3=$recv(html)._div();
 $recv($3)._class_("list-label");
-$4=$recv($3)._with_("Transcript");
-$4;
+$recv($3)._with_("Transcript");
 return $recv(self._transcript())._renderOn_(html);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
@@ -3384,15 +3320,14 @@ function $HLTranscript(){return $globals.HLTranscript||(typeof HLTranscript=="un
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-var $2,$1,$receiver;
-$2=self["@transcript"];
-if(($receiver = $2) == null || $receiver.isNil){
-self["@transcript"]=$recv($HLTranscript())._new();
+var $1,$receiver;
 $1=self["@transcript"];
+if(($receiver = $1) == null || $receiver.isNil){
+self["@transcript"]=$recv($HLTranscript())._new();
+return self["@transcript"];
 } else {
-$1=$2;
-};
 return $1;
+};
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"transcript",{},$globals.HLWorkspace)});
 //>>excludeEnd("ctx");