--- a/Association.st	Tue Feb 04 21:09:59 2014 +0100
+++ b/Association.st	Wed Apr 01 10:20:10 2015 +0100
@@ -113,12 +113,8 @@
      Notice, that this compares both key AND value.
      Time will show if this is ok."
 
-    self species == anAssociation species ifTrue:[
-	(anAssociation key = key) ifTrue:[
-	    ^ anAssociation value = value
-	]
-    ].
-    ^ false
+    ^ self species == anAssociation species 
+        and:[anAssociation key = key and:[anAssociation value = value]]
 !
 
 hash
@@ -140,7 +136,7 @@
 
     "/ what a kludge - Dolphin and Squeak mean: printOn: a stream;
     "/ ST/X (and some old ST80's) mean: draw-yourself on a GC.
-    (aGCOrStream isStream and:[aGCOrStream ~~ Transcript]) ifFalse:[
+    (aGCOrStream isStream) ifFalse:[
         ^ super displayOn:aGCOrStream
     ].
 
@@ -184,9 +180,10 @@
 !Association class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Association.st,v 1.24 2012-04-24 12:00:50 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Association.st,v 1.26 2014-07-11 09:55:51 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Association.st,v 1.24 2012-04-24 12:00:50 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Association.st,v 1.26 2014-07-11 09:55:51 stefan Exp $'
 ! !
+