@@ -333,11 +333,11 @@
 	OFArray *ret;
 	id *keys;
 	size_t count;
 
 	count = _mapTable.count;
-	keys = of_alloc(count, sizeof(*keys));
+	keys = OFAllocMemory(count, sizeof(*keys));
 
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 		OFMapTableEnumerator *enumerator;
 		void **keyPtr;
@@ -353,11 +353,11 @@
 
 		objc_autoreleasePoolPop(pool);
 
 		ret = [OFArray arrayWithObjects: keys count: count];
 	} @finally {
-		free(keys);
+		OFFreeMemory(keys);
 	}
 
 	return ret;
 }
 
@@ -366,11 +366,11 @@
 	OFArray *ret;
 	id *objects;
 	size_t count;
 
 	count = _mapTable.count;
-	objects = of_alloc(count, sizeof(*objects));
+	objects = OFAllocMemory(count, sizeof(*objects));
 
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 		OFMapTableEnumerator *enumerator;
 		void **objectPtr;
@@ -386,11 +386,11 @@
 
 		objc_autoreleasePoolPop(pool);
 
 		ret = [OFArray arrayWithObjects: objects count: count];
 	} @finally {
-		free(objects);
+		OFFreeMemory(objects);
 	}
 
 	return ret;
 }