--- a/Tools__CodeNavigationService.st	Fri Apr 15 06:50:52 2016 +0200
+++ b/Tools__CodeNavigationService.st	Mon Apr 18 07:01:29 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
               All Rights Reserved
@@ -583,7 +581,7 @@
 !
 
 elementAtCursor
-    ^self elementAtLine: textView cursorLine col: textView cursorCol - 1
+    ^self elementAtLine: textView cursorLine col: textView cursorCol "- 1"
 
     "Created: / 25-06-2010 / 14:39:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -871,14 +869,14 @@
 !CodeNavigationService class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.51 2015-02-28 02:02:08 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.51 2015-02-28 02:02:08 cg Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
-    ^ '$Id: Tools__CodeNavigationService.st,v 1.51 2015-02-28 02:02:08 cg Exp $'
+    ^ '$Id$'
 ! !
 

--- a/extensions.st	Fri Apr 15 06:50:52 2016 +0200
+++ b/extensions.st	Mon Apr 18 07:01:29 2016 +0200
@@ -42,16 +42,18 @@
 !ApplicationModel methodsFor:'debugging'!
 
 inspectorExtraAttributes
-    |atts|
+    |atts dict|
 
     atts := super inspectorExtraAttributes.
     builder notNil ifTrue:[
-        builder namedComponents keysAndValuesDo:[:eachName :eachWidget |
-            atts add:('-[: ',eachName,' :]') -> [ builder namedComponents at:eachName ].
+        (dict := builder namedComponents) notNil ifTrue:[
+            dict keysAndValuesDo:[:eachName :eachWidget |
+                atts add:('-[: ',eachName,' :]') -> [ dict at:eachName ].
+            ].
         ].
-        builder bindings notNil ifTrue:[
-            builder bindings keysAndValuesDo:[:eachName :eachAspect |
-                atts add:('-~> ',eachName) -> [ builder bindings at:eachName ].
+        (dict := builder bindings) notNil ifTrue:[
+            dict keysAndValuesDo:[:eachName :eachAspect |
+                atts add:('-~> ',eachName) -> [ dict at:eachName ].
             ].
         ].
     ].