@@ -440,11 +440,11 @@
 	OFDataArray *da;
 	char *tmp;
 
 	da = [OFDataArray dataArrayWithItemSize: itemSize];
 	tmp = [self allocMemoryForNItems: nItems
-				withSize: itemSize];
+				  ofSize: itemSize];
 
 	@try {
 		[self readExactlyNBytes: nItems * itemSize
 			     intoBuffer: tmp];
 
@@ -937,11 +937,11 @@
 	       fromBuffer: buffer];
 #else
 	uint16_t *tmp;
 
 	tmp = [self allocMemoryForNItems: nInt16s
-				withSize: sizeof(uint16_t)];
+				  ofSize: sizeof(uint16_t)];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt16s; i++)
@@ -967,11 +967,11 @@
 	       fromBuffer: buffer];
 #else
 	uint32_t *tmp;
 
 	tmp = [self allocMemoryForNItems: nInt32s
-				withSize: sizeof(uint32_t)];
+				  ofSize: sizeof(uint32_t)];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt32s; i++)
@@ -997,11 +997,11 @@
 	       fromBuffer: buffer];
 #else
 	uint64_t *tmp;
 
 	tmp = [self allocMemoryForNItems: nInt64s
-				withSize: sizeof(uint64_t)];
+				  ofSize: sizeof(uint64_t)];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt64s; i++)
@@ -1027,11 +1027,11 @@
 	       fromBuffer: buffer];
 #else
 	float *tmp;
 
 	tmp = [self allocMemoryForNItems: nFloats
-				withSize: sizeof(float)];
+				  ofSize: sizeof(float)];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nFloats; i++)
@@ -1057,11 +1057,11 @@
 	       fromBuffer: buffer];
 #else
 	double *tmp;
 
 	tmp = [self allocMemoryForNItems: nDoubles
-				withSize: sizeof(double)];
+				  ofSize: sizeof(double)];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nDoubles; i++)
@@ -1127,11 +1127,11 @@
 	       fromBuffer: buffer];
 #else
 	uint16_t *tmp;
 
 	tmp = [self allocMemoryForNItems: nInt16s
-				withSize: sizeof(uint16_t)];
+				  ofSize: sizeof(uint16_t)];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt16s; i++)
@@ -1157,11 +1157,11 @@
 	       fromBuffer: buffer];
 #else
 	uint32_t *tmp;
 
 	tmp = [self allocMemoryForNItems: nInt32s
-				withSize: sizeof(uint32_t)];
+				  ofSize: sizeof(uint32_t)];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt32s; i++)
@@ -1187,11 +1187,11 @@
 	       fromBuffer: buffer];
 #else
 	uint64_t *tmp;
 
 	tmp = [self allocMemoryForNItems: nInt64s
-				withSize: sizeof(uint64_t)];
+				  ofSize: sizeof(uint64_t)];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nInt64s; i++)
@@ -1217,11 +1217,11 @@
 	       fromBuffer: buffer];
 #else
 	float *tmp;
 
 	tmp = [self allocMemoryForNItems: nFloats
-				withSize: sizeof(float)];
+				  ofSize: sizeof(float)];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nFloats; i++)
@@ -1247,11 +1247,11 @@
 	       fromBuffer: buffer];
 #else
 	double *tmp;
 
 	tmp = [self allocMemoryForNItems: nDoubles
-				withSize: sizeof(double)];
+				  ofSize: sizeof(double)];
 
 	@try {
 		size_t i;
 
 		for (i = 0; i < nDoubles; i++)