--- a/SmallInteger.st	Tue Apr 21 21:40:51 2015 +0200
+++ b/SmallInteger.st	Tue Apr 21 21:41:11 2015 +0200
@@ -4141,8 +4141,15 @@
      and can therefore speed things up by not going through LargeIntegers."
 
 %{  /* NOCONTEXT */
-#ifndef __SCHTEAM__
-
+#ifdef __SCHTEAM__
+    {
+	long myValue = self.longValue();
+	long otherValue = aNumber.longValue();
+	long sum = myValue + otherValue;
+	return context._RETURN( STInteger._new(sum) );
+    }
+    /* NOT REACHED */
+#else
     if (__isSmallInteger(aNumber)) {
 	INT sum;
 
@@ -4175,7 +4182,15 @@
      and can therefore speed things up by not going through LargeIntegers."
 
 %{  /* NOCONTEXT */
-#ifndef __SCHTEAM__
+#ifdef __SCHTEAM__
+    {
+	long myValue = self.longValue();
+	long otherValue = aNumber.longValue();
+	long diference = myValue - otherValue;
+	return context._RETURN( STInteger._new(diference) );
+    }
+    /* NOT REACHED */
+#else
 
     if (__isSmallInteger(aNumber)) {
 	INT diff;
@@ -4209,8 +4224,15 @@
      and can therefore speed things up by not going through LargeIntegers."
 
 %{  /* NOCONTEXT */
-#ifndef __SCHTEAM__
-
+#ifdef __SCHTEAM__
+    {
+	long myValue = self.longValue();
+	long otherValue = aNumber.longValue();
+	long product = myValue * otherValue;
+	return context._RETURN( STInteger._new(product) );
+    }
+    /* NOT REACHED */
+#else
     INT myValue, otherValue;
     unsigned INT productLow, productHi;
     int negative;
@@ -4813,11 +4835,11 @@
 !SmallInteger class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.232 2015-04-20 10:48:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.233 2015-04-21 19:41:11 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.232 2015-04-20 10:48:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/SmallInteger.st,v 1.233 2015-04-21 19:41:11 cg Exp $'
 ! !