@@ -56,11 +56,11 @@
 }
 
 - (void*)item: (size_t)item
 {
 	if (item >= items)
-		@throw [OFOutOfRangeException newWithObject: self];
+		@throw [OFOutOfRangeException newWithClass: [self class]];
 
 	return data + item * itemsize;
 }
 
 - (void*)last
@@ -69,11 +69,11 @@
 }
 
 - add: (void*)item
 {
 	if (SIZE_MAX - items < 1)
-		@throw [OFOutOfRangeException newWithObject: self];
+		@throw [OFOutOfRangeException newWithClass: [self class]];
 
 	data = [self resizeMem: data
 		      toNItems: items + 1
 			ofSize: itemsize];
 
@@ -84,11 +84,11 @@
 
 - addNItems: (size_t)nitems
  fromCArray: (void*)carray
 {
 	if (nitems > SIZE_MAX - items)
-		@throw [OFOutOfRangeException newWithObject: self];
+		@throw [OFOutOfRangeException newWithClass: [self class]];
 
 	data = [self resizeMem: data
 		      toNItems: items + nitems
 			ofSize: itemsize];
 
@@ -99,11 +99,11 @@
 }
 
 - removeNItems: (size_t)nitems
 {
 	if (nitems > items)
-		@throw [OFOutOfRangeException newWithObject: self];
+		@throw [OFOutOfRangeException newWithClass: [self class]];
 
 	data = [self resizeMem: data
 		      toNItems: items - nitems
 			ofSize: itemsize];
 
@@ -128,11 +128,11 @@
 - add: (void*)item
 {
 	size_t nsize;
 
 	if (SIZE_MAX - items < 1 || items + 1 > SIZE_MAX / itemsize)
-		@throw [OFOutOfRangeException newWithObject: self];
+		@throw [OFOutOfRangeException newWithClass: [self class]];
 
 	nsize = ((items + 1) * itemsize + lastpagebyte) & ~lastpagebyte;
 
 	if (size != nsize)
 		data = [self resizeMem: data
@@ -148,11 +148,11 @@
  fromCArray: (void*)carray
 {
 	size_t nsize;
 
 	if (nitems > SIZE_MAX - items || items + nitems > SIZE_MAX / itemsize)
-		@throw [OFOutOfRangeException newWithObject: self];
+		@throw [OFOutOfRangeException newWithClass: [self class]];
 
 	nsize = ((items + nitems) * itemsize + lastpagebyte) & ~lastpagebyte;
 
 	if (size != nsize)
 		data = [self resizeMem: data
@@ -168,11 +168,11 @@
 - removeNItems: (size_t)nitems
 {
 	size_t nsize;
 
 	if (nitems > items)
-		@throw [OFOutOfRangeException newWithObject: self];
+		@throw [OFOutOfRangeException newWithClass: [self class]];
 
 	nsize = ((items - nitems) * itemsize + lastpagebyte) & ~lastpagebyte;
 
 	if (size != nsize)
 		data = [self resizeMem: data