--- a/String.st	Sat May 16 06:48:37 2015 +0200
+++ b/String.st	Mon May 18 07:10:20 2015 +0100
@@ -1511,7 +1511,13 @@
 
 %{  /* NOCONTEXT */
 #ifdef __SCHTEAM__
-    return context._RETURN( self.stringEqualP(aString) );
+    if (aString == self) {
+	return __c__._RETURN_true();
+    }
+    if (aString.isStringLike()) {
+	return __c__._RETURN( self.stringEqual(aString) ? STObject.True : STObject.False );
+    }
+    return __c__._RETURN_false();
     /* NOTREACHED */
 #else
     int l1, l2;
@@ -2053,7 +2059,7 @@
 
 %{  /* NOCONTEXT */
 #ifdef __SCHTEAM__
-    return context._RETURN( self.stringEqualP( aString.not()) );
+    return context._RETURN( self.stringEqual( aString ) ? STObject.False : STObject.True);
     /* NOTREACHED */
 #else
     int l1, l2;
@@ -4351,9 +4357,9 @@
 !String class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.338 2015-05-15 06:54:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.340 2015-05-18 00:16:20 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.338 2015-05-15 06:54:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.340 2015-05-18 00:16:20 cg Exp $'
 ! !