@@ -34,12 +34,12 @@
 + dictionaryWithDictionary: (OFDictionary*)dict
 {
 	return [[[self alloc] initWithDictionary: dict] autorelease];
 }
 
-+ dictionaryWithObject: (OFObject*)obj
-		forKey: (OFObject <OFCopying>*)key
++ dictionaryWithObject: (id)obj
+		forKey: (id <OFCopying>)key
 {
 	return [[[self alloc] initWithObject: obj
 				      forKey: key] autorelease];
 }
 
@@ -48,11 +48,11 @@
 {
 	return [[[self alloc] initWithObjects: objs
 				      forKeys: keys] autorelease];
 }
 
-+ dictionaryWithKeysAndObjects: (OFObject <OFCopying>*)first, ...
++ dictionaryWithKeysAndObjects: (id <OFCopying>)first, ...
 {
 	id ret;
 	va_list args;
 
 	va_start(args, first);
@@ -117,11 +117,11 @@
 
 	size = dict->size;
 	count = dict->count;
 
 	for (i = 0; i < size; i++) {
-		OFObject <OFCopying> *key;
+		id <OFCopying> key;
 		BUCKET *b;
 
 		if (dict->data[i] == NULL || dict->data[i] == DELETED)
 			continue;
 
@@ -134,11 +134,11 @@
 		}
 
 		@try {
 			[dict->data[i]->object retain];
 		} @catch (OFException *e) {
-			[key release];
+			[(id)key release];
 			[self dealloc];
 			@throw e;
 		}
 
 		b->key = key;
@@ -148,12 +148,12 @@
 	}
 
 	return self;
 }
 
-- initWithObject: (OFObject*)obj
-	  forKey: (OFObject <OFCopying>*)key
+- initWithObject: (id)obj
+	  forKey: (id <OFCopying>)key
 {
 	uint32_t i;
 	BUCKET *b;
 
 	self = [self init];
@@ -173,11 +173,11 @@
 		 */
 		[self dealloc];
 		@throw e;
 	}
 
-	i = [key hash] & 1;
+	i = [(id)key hash] & 1;
 
 	@try {
 		b = [self allocMemoryWithSize: sizeof(BUCKET)];
 		key = [key copy];
 	} @catch (OFException *e) {
@@ -186,18 +186,18 @@
 	}
 
 	@try {
 		[obj retain];
 	} @catch (OFException *e) {
-		[key release];
+		[(id)key release];
 		[self dealloc];
 		@throw e;
 	}
 
 	b->key = key;
 	b->object = obj;
-	b->hash = [key hash];
+	b->hash = [(id)key hash];
 	data[i] = b;
 	count = 1;
 
 	return self;
 }
@@ -245,27 +245,27 @@
 
 		hash = [keys_carray[i] hash];
 		last = size;
 
 		for (j = hash & (size - 1); j < last && data[j] != NULL; j++)
-			if ([data[j]->key isEqual: keys_carray[i]])
+			if ([(id)data[j]->key isEqual: keys_carray[i]])
 				break;
 
 		/* In case the last bucket is already used */
 		if (j >= last) {
 			last = hash & (size - 1);
 
 			for (j = 0; j < last && data[j] != NULL; j++)
-				if ([data[j]->key isEqual: keys_carray[i]])
+				if ([(id)data[j]->key isEqual: keys_carray[i]])
 					break;
 		}
 
 		/* Key not in dictionary */
 		if (j >= last || data[j] == NULL ||
-		    ![data[j]->key isEqual: keys_carray[i]]) {
+		    ![(id)data[j]->key isEqual: keys_carray[i]]) {
 			BUCKET *b;
-			OFObject <OFCopying> *key;
+			id <OFCopying> key;
 
 			last = size;
 
 			j = hash & (size - 1);
 			for (; j < last && data[j] != NULL; j++);
@@ -292,11 +292,11 @@
 			}
 
 			@try {
 				[objs_carray[i] retain];
 			} @catch (OFException *e) {
-				[key release];
+				[(id)key release];
 				[self dealloc];
 				@throw e;
 			}
 
 			b->key = key;
@@ -331,11 +331,11 @@
 	}
 
 	return self;
 }
 
-- initWithKeysAndObjects: (OFObject <OFCopying>*)first, ...
+- initWithKeysAndObjects: (id <OFCopying>)first, ...
 {
 	id ret;
 	va_list args;
 
 	va_start(args, first);
@@ -344,23 +344,23 @@
 	va_end(args);
 
 	return ret;
 }
 
-- initWithKey: (OFObject <OFCopying>*)key
+- initWithKey: (id <OFCopying>)key
       argList: (va_list)args
 {
 	BUCKET *b;
-	OFObject *obj;
+	id obj;
 	size_t i;
 	uint32_t j, hash;
 	va_list args2;
 
 	self = [super init];
 
 	count = 1;
-	for (va_copy(args2, args); va_arg(args2, OFObject*) != nil; count++);
+	for (va_copy(args2, args); va_arg(args2, id) != nil; count++);
 	count >>= 1;
 
 	if (count > UINT32_MAX) {
 		Class c = isa;
 		[self dealloc];
@@ -397,19 +397,19 @@
 		[self dealloc];
 		@throw [OFInvalidArgumentException newWithClass: c
 						       selector: _cmd];
 	}
 
-	if ((obj = va_arg(args, OFObject*)) == nil) {
+	if ((obj = va_arg(args, id)) == nil) {
 		Class c = isa;
 		[self dealloc];
 		@throw [OFInvalidArgumentException newWithClass: c
 						       selector: _cmd];
 	}
 
 	/* Add first key / object pair */
-	hash = [key hash];
+	hash = [(id)key hash];
 	j = hash & (size - 1);
 
 	@try {
 		b = [self allocMemoryWithSize: sizeof(BUCKET)];
 		key = [key copy];
@@ -419,11 +419,11 @@
 	}
 
 	@try {
 		[obj retain];
 	} @catch (OFException *e) {
-		[key release];
+		[(id)key release];
 		[self dealloc];
 		@throw e;
 	}
 
 	b->key = key;
@@ -432,39 +432,39 @@
 	data[j] = b;
 
 	for (i = 1; i < count; i++) {
 		uint32_t last;
 
-		key = va_arg(args, OFObject <OFCopying>*);
-		obj = va_arg(args, OFObject*);
+		key = va_arg(args, id <OFCopying>);
+		obj = va_arg(args, id);
 
 		if (key == nil || obj == nil) {
 			Class c = isa;
 			[self dealloc];
 			@throw [OFInvalidArgumentException newWithClass: c
 							       selector: _cmd];
 		}
 
-		hash = [key hash];
+		hash = [(id)key hash];
 		last = size;
 
 		for (j = hash & (size - 1); j < last && data[j] != NULL; j++)
-			if ([data[j]->key isEqual: key])
+			if ([(id)data[j]->key isEqual: key])
 				break;
 
 		/* In case the last bucket is already used */
 		if (j >= last) {
 			last = hash & (size - 1);
 
 			for (j = 0; j < last && data[j] != NULL; j++)
-				if ([data[j]->key isEqual: key])
+				if ([(id)data[j]->key isEqual: key])
 					break;
 		}
 
 		/* Key not in dictionary */
 		if (j >= last || data[j] == NULL ||
-		    ![data[j]->key isEqual: key]) {
+		    ![(id)data[j]->key isEqual: key]) {
 			last = size;
 
 			j = hash & (size - 1);
 			for (; j < last && data[j] != NULL; j++);
 
@@ -490,11 +490,11 @@
 			}
 
 			@try {
 				[obj retain];
 			} @catch (OFException *e) {
-				[key release];
+				[(id)key release];
 				[self dealloc];
 				@throw e;
 			}
 
 			b->key = key;
@@ -529,11 +529,11 @@
 	}
 
 	return self;
 }
 
-- (id)objectForKey: (OFObject <OFCopying>*)key
+- (id)objectForKey: (id)key
 {
 	uint32_t i, hash, last;
 
 	if (key == nil)
 		@throw [OFInvalidArgumentException newWithClass: isa
@@ -544,11 +544,11 @@
 
 	for (i = hash & (size - 1); i < last && data[i] != NULL; i++) {
 		if (data[i] == DELETED)
 			continue;
 
-		if ([data[i]->key isEqual: key])
+		if ([(id)data[i]->key isEqual: key])
 			return data[i]->object;
 	}
 
 	if (i < last)
 		return nil;
@@ -558,11 +558,11 @@
 
 	for (i = 0; i < last && data[i] != NULL; i++) {
 		if (data[i] == DELETED)
 			continue;
 
-		if ([data[i]->key isEqual: key])
+		if ([(id)data[i]->key isEqual: key])
 			return data[i]->object;
 	}
 
 	return nil;
 }
@@ -654,11 +654,11 @@
 {
 	uint32_t i;
 
 	for (i = 0; i < size; i++) {
 		if (data[i] != NULL && data[i] != DELETED) {
-			[data[i]->key release];
+			[(id)data[i]->key release];
 			[data[i]->object release];
 		}
 	}
 
 	[super dealloc];