@@ -61,11 +61,11 @@
 }
 
 - (void*)item: (size_t)item
 {
 	if (item >= items)
-		@throw [OFOutOfRangeException newWithClass: [self class]];
+		@throw [OFOutOfRangeException newWithClass: isa];
 
 	return data + item * itemsize;
 }
 
 - (void*)last
@@ -74,11 +74,11 @@
 }
 
 - add: (void*)item
 {
 	if (SIZE_MAX - items < 1 || items + 1 > SIZE_MAX / itemsize)
-		@throw [OFOutOfRangeException newWithClass: [self class]];
+		@throw [OFOutOfRangeException newWithClass: isa];
 
 	data = [self resizeMem: data
 		      toNItems: items + 1
 			ofSize: itemsize];
 
@@ -89,11 +89,11 @@
 
 - addNItems: (size_t)nitems
  fromCArray: (void*)carray
 {
 	if (nitems > SIZE_MAX - items || items + nitems > SIZE_MAX / itemsize)
-		@throw [OFOutOfRangeException newWithClass: [self class]];
+		@throw [OFOutOfRangeException newWithClass: isa];
 
 	data = [self resizeMem: data
 		      toNItems: items + nitems
 			ofSize: itemsize];
 
@@ -104,11 +104,11 @@
 }
 
 - removeNItems: (size_t)nitems
 {
 	if (nitems > items)
-		@throw [OFOutOfRangeException newWithClass: [self class]];
+		@throw [OFOutOfRangeException newWithClass: isa];
 
 	data = [self resizeMem: data
 		      toNItems: items - nitems
 			ofSize: itemsize];
 
@@ -142,14 +142,14 @@
 - (int)compare: (id)obj
 {
 	int ret;
 
 	if (![obj isKindOf: [OFArray class]])
-		@throw [OFInvalidArgumentException newWithClass: [self class]
+		@throw [OFInvalidArgumentException newWithClass: isa
 						    andSelector: _cmd];
 	if ([obj itemsize] != itemsize)
-		@throw [OFInvalidArgumentException newWithClass: [self class]
+		@throw [OFInvalidArgumentException newWithClass: isa
 						    andSelector: _cmd];
 
 	if ([obj items] == items)
 		return memcmp(data, [obj data], items * itemsize);
 
@@ -195,11 +195,11 @@
 - add: (void*)item
 {
 	size_t nsize;
 
 	if (SIZE_MAX - items < 1 || items + 1 > SIZE_MAX / itemsize)
-		@throw [OFOutOfRangeException newWithClass: [self class]];
+		@throw [OFOutOfRangeException newWithClass: isa];
 
 	nsize = ((items + 1) * itemsize + lastpagebyte) & ~lastpagebyte;
 
 	if (size != nsize)
 		data = [self resizeMem: data
@@ -215,11 +215,11 @@
  fromCArray: (void*)carray
 {
 	size_t nsize;
 
 	if (nitems > SIZE_MAX - items || items + nitems > SIZE_MAX / itemsize)
-		@throw [OFOutOfRangeException newWithClass: [self class]];
+		@throw [OFOutOfRangeException newWithClass: isa];
 
 	nsize = ((items + nitems) * itemsize + lastpagebyte) & ~lastpagebyte;
 
 	if (size != nsize)
 		data = [self resizeMem: data
@@ -235,11 +235,11 @@
 - removeNItems: (size_t)nitems
 {
 	size_t nsize;
 
 	if (nitems > items)
-		@throw [OFOutOfRangeException newWithClass: [self class]];
+		@throw [OFOutOfRangeException newWithClass: isa];
 
 	nsize = ((items - nitems) * itemsize + lastpagebyte) & ~lastpagebyte;
 
 	if (size != nsize)
 		data = [self resizeMem: data