diff --git a/harbour/source/rtl/classes.c b/harbour/source/rtl/classes.c
index c8fe02cac1..5e01043e26 100644
--- a/harbour/source/rtl/classes.c
+++ b/harbour/source/rtl/classes.c
@@ -68,9 +68,9 @@ HARBOUR CLASSCREATE() /* cClassName, nDatas --> hClass */
    pClasses[ wClasses ].aInlines.wType = IT_NIL;
    pClasses[ wClasses ].aInitValues.wType = IT_NIL;
 
-   hb_arrayNew( &pClasses[ wClasses ].aClassDatas, 0 );
-   hb_arrayNew( &pClasses[ wClasses ].aInlines,    0 );
-   /* hb_arrayNew( &pClasses[ wClasses ].aInitValues,    0 ); */
+   Array( &pClasses[ wClasses ].aClassDatas, 0 );
+   Array( &pClasses[ wClasses ].aInlines,    0 );
+   /* Array( &pClasses[ wClasses ].aInitValues,    0 ); */
 
    memset( pClasses[ wClasses ].pMethods, 0, 100 * sizeof( METHOD ) );
 
@@ -140,9 +140,9 @@ static HARBOUR GetData( void )
    PITEM pObject = stack.pBase + 1;
    WORD  wIndex  = pMethod->wData;
 
-   if( wIndex > hb_arrayLen ( pObject ) )          /* Resize needed            */
-      hb_arraySize( pObject, wIndex );             /* Make large enough        */
-   hb_arrayGet( pObject, wIndex, &stack.Return );
+   if( wIndex > ArrayLen ( pObject ) )          /* Resize needed            */
+      ArraySize( pObject, wIndex );             /* Make large enough        */
+   ArrayGet( pObject, wIndex, &stack.Return );
 }
 
 static HARBOUR SetData( void )
@@ -150,9 +150,9 @@ static HARBOUR SetData( void )
    PITEM pObject = stack.pBase + 1;
    WORD  wIndex  = pMethod->wData;
 
-   if( wIndex > hb_arrayLen( pObject ) )           /* Resize needed            */
-      hb_arraySize( pObject, wIndex );             /* Make large enough        */
-   hb_arraySet( pObject, wIndex, stack.pBase + 2 );
+   if( wIndex > ArrayLen( pObject ) )           /* Resize needed            */
+      ArraySize( pObject, wIndex );             /* Make large enough        */
+   ArraySet( pObject, wIndex, stack.pBase + 2 );
 }
 
 static HARBOUR GetClassData( void )
@@ -160,7 +160,7 @@ static HARBOUR GetClassData( void )
    WORD wClass = ( ( PBASEARRAY ) ( stack.pBase + 1 )->value.pBaseArray )->wClass;
 
    if( wClass && wClass <= wClasses )
-      hb_arrayGet( &pClasses[ wClass - 1 ].aClassDatas, pMethod->wData, &stack.Return );
+      ArrayGet( &pClasses[ wClass - 1 ].aClassDatas, pMethod->wData, &stack.Return );
 }
 
 static HARBOUR SetClassData( void )
@@ -168,7 +168,7 @@ static HARBOUR SetClassData( void )
    WORD wClass = ( ( PBASEARRAY ) ( stack.pBase + 1 )->value.pBaseArray )->wClass;
 
    if( wClass && wClass <= wClasses )
-      hb_arraySet( &pClasses[ wClass - 1 ].aClassDatas, pMethod->wData, stack.pBase + 2 );
+      ArraySet( &pClasses[ wClass - 1 ].aClassDatas, pMethod->wData, stack.pBase + 2 );
 }
 
 static HARBOUR EvalInline( void )
@@ -177,7 +177,7 @@ static HARBOUR EvalInline( void )
    WORD wClass = ( ( PBASEARRAY ) ( stack.pBase + 1 )->value.pBaseArray )->wClass;
    WORD w;
 
-   hb_arrayGet( &pClasses[ wClass - 1 ].aInlines, pMethod->wData, &block );
+   ArrayGet( &pClasses[ wClass - 1 ].aInlines, pMethod->wData, &block );
 
    PushSymbol( &symEval );
    Push( &block );
@@ -185,8 +185,6 @@ static HARBOUR EvalInline( void )
    for( w = 1; w <= _pcount(); w++ )
       Push( _param( w, IT_ANY ) );
    Do( _pcount() + 1 );                         /* Self is also an argument */
-
-   ItemRelease( &block );
 }
 
 static HARBOUR Virtual( void )
@@ -347,8 +345,8 @@ HARBOUR CLASSADD() /* hClass, cMessage, pFunction, nType */
 
             case MET_CLASSDATA:
                  pClass->pMethods[ wAt ].wData = _parnl( 3 );
-                 if( hb_arrayLen( &pClass->aClassDatas ) < _parnl( 3 ) )
-                    hb_arraySize( &pClass->aClassDatas, _parnl( 3 ) );
+                 if( ArrayLen( &pClass->aClassDatas ) < _parnl( 3 ) )
+                    ArraySize( &pClass->aClassDatas, _parnl( 3 ) );
 
                  if( pMessage->pSymbol->szName[ 0 ] == '_' )
                     pClass->pMethods[ wAt ].pFunction = SetClassData;
@@ -357,9 +355,9 @@ HARBOUR CLASSADD() /* hClass, cMessage, pFunction, nType */
                  break;
 
             case MET_INLINE:
-                 pClass->pMethods[ wAt ].wData = hb_arrayLen( &pClass->aInlines ) + 1;
-                 hb_arraySize( &pClass->aInlines, pClass->pMethods[ wAt ].wData );
-                 hb_arraySet( &pClass->aInlines, pClass->pMethods[ wAt ].wData,
+                 pClass->pMethods[ wAt ].wData = ArrayLen( &pClass->aInlines ) + 1;
+                 ArraySize( &pClass->aInlines, pClass->pMethods[ wAt ].wData );
+                 ArraySet( &pClass->aInlines, pClass->pMethods[ wAt ].wData,
                            _param( 3, IT_BLOCK ) );
                  pClass->pMethods[ wAt ].pFunction = EvalInline;
                  break;
@@ -405,7 +403,7 @@ HARBOUR CLASSINSTANCE() /* hClass --> oNewObject */
 
    if( wClass <= wClasses )
    {
-      hb_arrayNew( &stack.Return, pClasses[ wClass - 1 ].wDatas );
+      Array( &stack.Return, pClasses[ wClass - 1 ].wDatas );
       ( ( PBASEARRAY ) stack.Return.value.pBaseArray )->wClass = wClass;
    }
    else
@@ -461,17 +459,25 @@ HARBOURFUNC GetMethod( PITEM pObject, PSYMBOL pMessage )
    return 0;
 }
 
+ULONG hb_isMessage( PITEM pObject, char *szString )
+{
+   PSYMBOL pMessage = GetDynSym( szString )->pSymbol;
+   return( (ULONG) GetMethod( pObject, pMessage ) );
+                                                /* Get function pointer of  */
+                                                /* message                  */
+}
+
 HARBOUR ISMESSAGE()     /* Is the message valid for the class               */
                         /* <lRet> := IsMessage( <oObj>, <cSymbol> )         */
 {
    PITEM   pObject  = _param( 1, IT_OBJECT );
    PITEM   pString  = _param( 2, IT_STRING );
-   PSYMBOL pMessage = GetDynSym( pString->value.szText )->pSymbol;
-                        /* QUESTION: Warning when using HARBOURFUNC ?  */
-   ULONG   pFunc    = (ULONG) GetMethod( pObject, pMessage );
-                                                /* Get function pointer of  */
-                                                /* message                  */
-   _retl( pFunc != 0 );
+
+   if( pObject && pString )
+      _retl( hb_isMessage( pObject, pString->value.szText ) != 0 );
+   else
+   {                            /* TODO: Crash code */
+   }
 }
 
 void ReleaseClass( PCLASS pClass )
@@ -479,8 +485,8 @@ void ReleaseClass( PCLASS pClass )
    _xfree( pClass->szName );
    _xfree( pClass->pMethods );
 
-   hb_arrayRelease( &pClass->aClassDatas );
-   hb_arrayRelease( &pClass->aInlines );
+   ArrayRelease( &pClass->aClassDatas );
+   ArrayRelease( &pClass->aInlines );
    /* ArrayRelease( &pClass->aInitValues ); */
 }
 
@@ -565,7 +571,7 @@ HARBOUR CLASSMOD()      /* Modify message (only for INLINE and METHOD)      */
          pFunc = pClass->pMethods[ wAt ].pFunction;
          if( pFunc == EvalInline )              /* INLINE method changed    */
          {
-            hb_arraySet(  &pClass->aInlines, pClass->pMethods[ wAt ].wData,
+            ArraySet(  &pClass->aInlines, pClass->pMethods[ wAt ].wData,
                        _param( 3, IT_BLOCK ) );
          }
          else if( ( pFunc == SetData ) || ( pFunc == GetData ) )
@@ -611,7 +617,7 @@ HARBOUR CLASSDEL()      /* Delete message (only for INLINE and METHOD)      */
          pFunc = pClass->pMethods[ wAt ].pFunction;
          if( pFunc == EvalInline )              /* INLINE method deleted    */
          {
-            hb_arrayDel(  &pClass->aInlines, pClass->pMethods[ wAt ].wData );
+            ArrayDel(  &pClass->aInlines, pClass->pMethods[ wAt ].wData );
                                                 /* Delete INLINE block      */
          }                                      /* Move messages            */
          for( ; pClass->pMethods[ wAt ].pMessage && wAt < wLimit; wAt ++ )