--- a/JavaArray.st	Wed May 15 02:07:18 2013 +0100
+++ b/JavaArray.st	Fri May 17 14:14:55 2013 +0100
@@ -325,16 +325,10 @@
 _CHECKCAST: cls
     JavaVM _CHECKCAST: self _: cls.
 %{
-    OBJ objCls = __Class(self);
-    if ( ( __ILC_FLAGS(__pilc) & 0x0F) != I_PERF )  {
-        if ( __qSpace(objCls) < NEWSPACE ) {   
-            void ___ilcBindPrimitive();            
-            /* printf("CHECKCAST: __pilc == 0x%x\n", __pilc); */
-            OBJ ___checkcast_f();
-            __ilcBindPrimitive(__pilc, objCls, &___checkcast_f, 2, __selector);
-        }
-    }
-%}.  
+    void ___checkcast_bind();
+    ___checkcast_bind(__pilc, __Class(self));
+
+%}.    
     ^self  
 
     "Created: / 14-05-2013 / 10:09:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -345,21 +339,9 @@
     
     r := JavaVM _INSTANCEOF: self _: cls.
 %{
-    OBJ objCls = __Class(self);
-    OBJ ___instanceof_f0();
-    OBJ ___instanceof_f1();
-    OBJFUNC f;
-
-    f = (r == __MKSMALLINT(0)) ? &___instanceof_f0 : &___instanceof_f1;
+    void ___instanceof_bind();
+    ___instanceof_bind(__pilc, __Class(self), r);
 
-    if ( ( __ILC_FLAGS(__pilc) & 0x0F) != I_PERF )  {
-        if ( __qSpace(objCls) < NEWSPACE ) {   
-            void ___ilcBindPrimitive();            
-            /* printf("CHECKCAST: __pilc == 0x%x\n", __pilc); */
-            OBJ ___checkcast_f();
-            __ilcBindPrimitive(__pilc, objCls, f, 1, __selector);
-        }
-    }
 %}. 
     ^r