--- xnu/xnu-201/libkern/c++/OSArray.cpp
+++ xnu/xnu-517.7.21/libkern/c++/OSArray.cpp
@@ -72,7 +72,7 @@
 
 bool OSArray::initWithObjects(const OSObject *objects[],
                               unsigned int theCount,
-                              unsigned int theCapacity = 0)
+                              unsigned int theCapacity)
 {
     unsigned int capacity;
 
@@ -93,14 +93,14 @@
             return false;
 
         array[count++] = newObject;
-        newObject->retain();
+        newObject->taggedRetain(OSTypeID(OSCollection));
     }
 
     return true;	
 }
 
 bool OSArray::initWithArray(const OSArray *anArray,
-                            unsigned int theCapacity = 0)
+                            unsigned int theCapacity)
 {
     if ( !anArray )
         return false;
@@ -114,7 +114,7 @@
     OSArray *me = new OSArray;
 
     if (me && !me->initWithCapacity(capacity)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -123,12 +123,12 @@
 
 OSArray *OSArray::withObjects(const OSObject *objects[],
                               unsigned int count,
-                              unsigned int capacity = 0)
+                              unsigned int capacity)
 {
     OSArray *me = new OSArray;
 
     if (me && !me->initWithObjects(objects, count, capacity)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -136,12 +136,12 @@
 }
 
 OSArray *OSArray::withArray(const OSArray *array,
-                            unsigned int capacity = 0)
+                            unsigned int capacity)
 {
     OSArray *me = new OSArray;
 
     if (me && !me->initWithArray(array, capacity)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -206,7 +206,7 @@
 
     haveUpdated();
     for (i = 0; i < count; i++)
-        array[i]->release();
+        array[i]->taggedRelease(OSTypeID(OSCollection));
     count = 0;
 }
 
@@ -233,7 +233,7 @@
             array[i] = array[i-1];
     }
     array[index] = anObject;
-    anObject->retain();
+    anObject->taggedRetain(OSTypeID(OSCollection));
     count++;
 
     return true;
@@ -256,7 +256,7 @@
         const OSMetaClassBase *newObject = otherArray->getObject(i);
 
         array[count++] = newObject;
-        newObject->retain();
+        newObject->taggedRetain(OSTypeID(OSCollection));
     }
 
     return true;
@@ -273,9 +273,9 @@
     haveUpdated();
     oldObject = array[index];
     array[index] = anObject;
-    anObject->retain();
-
-    oldObject->release();
+    anObject->taggedRetain(OSTypeID(OSCollection));
+
+    oldObject->taggedRelease(OSTypeID(OSCollection));
 }
 
 void OSArray::removeObject(unsigned int index)
@@ -293,7 +293,7 @@
     for (i = index; i < count; i++)
         array[i] = array[i+1];
 
-    oldObject->release();
+    oldObject->taggedRelease(OSTypeID(OSCollection));
 }
 
 bool OSArray::isEqualTo(const OSArray *anArray) const