--- a/Tools__VisualProfilerCanvas.st	Fri Nov 18 15:05:10 2011 +0100
+++ b/Tools__VisualProfilerCanvas.st	Fri Nov 18 15:05:12 2011 +0100
@@ -630,10 +630,11 @@
 
 methodListAspect
 
-    methodList ifNil:[methodList := List new].
+    methodList isNil ifTrue:[methodList := List new].
     ^methodList
 
     "Created: / 01-12-2007 / 23:38:16 / janfrog"
+    "Modified: / 18-11-2011 / 15:01:52 / cg"
 !
 
 notesAspect
@@ -793,11 +794,13 @@
 !
 
 selectedCallTreeItemChanged
+    |selectedCallTreeItem|
 
-    self selectedCallTreeItemHolder value ifNil:[^self].
-    self switchToMethod: self selectedCallTreeItemHolder value method
+    (selectedCallTreeItem := self selectedCallTreeItemHolder value) isNil ifTrue:[^self].
+    self switchToMethod: selectedCallTreeItem method
 
     "Created: / 10-10-2007 / 08:52:33 / janfrog"
+    "Modified: / 18-11-2011 / 15:02:20 / cg"
 !
 
 update: aspect with: value from: sender
@@ -822,8 +825,9 @@
 updateCallTreeRoot
 
     |  callTree callTreeRootItem |
+
     callTree := self callTreeHolder.
-    profilerStatistics value ifNil:[^callTree root: nil].
+    profilerStatistics value isNil ifTrue:[^callTree root: nil].
     callTreeRootItem := CallTreeItem 
                             subject: profilerStatistics value tree
                             parent: callTree.
@@ -831,13 +835,14 @@
     callTree showRoot: true.
 
     "Created: / 10-10-2007 / 12:59:07 / janfrog"
+    "Modified (format): / 18-11-2011 / 15:02:32 / cg"
 !
 
 updateMethodList
+    | items |
 
-    | items |
     self methodListAspect removeAll.
-    self profilerStatistics value ifNil:[^self].
+    self profilerStatistics value isNil ifTrue:[^self].
     items := ProfilerInfoBuilder::MethodList new 
                 packages: self packageFilter value;
                 build: self profilerStatistics value tree;
@@ -846,6 +851,7 @@
     self methodListAspect addAll: items
 
     "Created: / 01-12-2007 / 23:39:15 / janfrog"
+    "Modified: / 18-11-2011 / 15:02:49 / cg"
 ! !
 
 !VisualProfilerCanvas methodsFor:'hooks'!
@@ -904,7 +910,7 @@
 !VisualProfilerCanvas::CallTreeItem class methodsFor:'documentation'!
 
 version
-    ^'$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.4 2011-11-08 15:45:00 cg Exp $'
+    ^'$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.5 2011-11-18 14:05:12 cg Exp $'
 ! !
 
 !VisualProfilerCanvas::CallTreeItem class methodsFor:'instance creation'!
@@ -923,17 +929,18 @@
 
 children
 
-    children ifNil:[children := self createChildren].
+    children isNil ifTrue:[children := self createChildren].
     ^children
 
     "Created: / 10-10-2007 / 08:38:28 / janfrog"
     "Modified: / 10-10-2007 / 13:24:06 / janfrog"
+    "Modified: / 18-11-2011 / 15:03:00 / cg"
 !
 
 createChildren
     |childrenTmp childrenStream|
 
-    self subject ifNil:[ ^ children := #() ].
+    self subject isNil ifTrue:[ ^ children := #() ].
     childrenStream := (OrderedCollection new:self subject called size) 
                 writeStream.
     self createChildrenOn:childrenStream.
@@ -944,6 +951,7 @@
 
     "Created: / 10-10-2007 / 13:17:04 / janfrog"
     "Modified: / 24-11-2007 / 09:43:30 / janfrog"
+    "Modified: / 18-11-2011 / 15:03:03 / cg"
 !
 
 createChildrenOn:aStream 
@@ -959,12 +967,15 @@
 !
 
 directChildren
-    self subject called ifNil:[ ^ #() ].
-    ^ self subject called 
+    |called|
+
+    (called := self subject called) isNil ifTrue:[ ^ #() ].
+    ^ called 
         collect:[:childSubject | self class subject:childSubject parent:self ]
 
     "Created: / 10-10-2007 / 13:07:24 / janfrog"
     "Modified: / 24-11-2007 / 09:18:56 / janfrog"
+    "Modified: / 18-11-2011 / 15:03:31 / cg"
 !
 
 label
@@ -984,21 +995,25 @@
 !
 
 method
-    self subject methodClass ifNil:[ ^ nil ].
-    ^ self subject methodClass >> self subject selector asSymbol
+    |methodClass|
+
+    (methodClass := self subject methodClass) isNil ifTrue:[ ^ nil ].
+    ^ methodClass >> self subject selector asSymbol
 
     "Created: / 10-10-2007 / 08:49:58 / janfrog"
     "Modified: / 24-11-2007 / 09:18:56 / janfrog"
+    "Modified: / 18-11-2011 / 15:03:56 / cg"
 !
 
 methodPackage
+    | mth |
 
-    | mth |
     mth := self method.
-    mth ifNil:[^#__NoProject__].
-    ^self method package
+    mth isNil ifTrue:[^#__NoProject__].
+    ^ mth package
 
     "Created: / 10-10-2007 / 13:03:21 / janfrog"
+    "Modified (format): / 18-11-2011 / 15:04:15 / cg"
 !
 
 subject
@@ -1091,7 +1106,7 @@
 !VisualProfilerCanvas class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.4 2011-11-08 15:45:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__VisualProfilerCanvas.st,v 1.5 2011-11-18 14:05:12 cg Exp $'
 !
 
 version_SVN