@@ -342,12 +342,11 @@
 	OFArray *ret;
 	id *keys;
 	size_t count;
 
 	count = _mapTable.count;
-	keys = [self allocMemoryWithSize: sizeof(*keys)
-				   count: count];
+	keys = of_malloc(count, sizeof(*keys));
 
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 		OFMapTableEnumerator *enumerator;
 		void **keyPtr;
@@ -364,11 +363,11 @@
 		objc_autoreleasePoolPop(pool);
 
 		ret = [OFArray arrayWithObjects: keys
 					  count: count];
 	} @finally {
-		[self freeMemory: keys];
+		free(keys);
 	}
 
 	return ret;
 }
 
@@ -377,12 +376,11 @@
 	OFArray *ret;
 	id *objects;
 	size_t count;
 
 	count = _mapTable.count;
-	objects = [self allocMemoryWithSize: sizeof(*objects)
-				      count: count];
+	objects = of_malloc(count, sizeof(*objects));
 
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 		OFMapTableEnumerator *enumerator;
 		void **objectPtr;
@@ -399,11 +397,11 @@
 		objc_autoreleasePoolPop(pool);
 
 		ret = [OFArray arrayWithObjects: objects
 					  count: count];
 	} @finally {
-		[self freeMemory: objects];
+		free(objects);
 	}
 
 	return ret;
 }