@@ -44,11 +44,11 @@
 	return (id)[[OFDictionary_hashtable alloc]
 	    initWithDictionary: dictionary];
 }
 
 - initWithObject: (id)object
-	  forKey: (id <OFCopying>)key
+	  forKey: (id)key
 {
 	return (id)[[OFDictionary_hashtable alloc] initWithObject: object
 							   forKey: key];
 }
 
@@ -131,11 +131,11 @@
 {
 	return [[[self alloc] initWithDictionary: dictionary] autorelease];
 }
 
 + dictionaryWithObject: (id)object
-		forKey: (id <OFCopying>)key
+		forKey: (id)key
 {
 	return [[[self alloc] initWithObject: object
 				      forKey: key] autorelease];
 }
 
@@ -144,11 +144,11 @@
 {
 	return [[[self alloc] initWithObjects: objects
 				      forKeys: keys] autorelease];
 }
 
-+ dictionaryWithKeysAndObjects: (id <OFCopying>)firstKey, ...
++ dictionaryWithKeysAndObjects: (id)firstKey, ...
 {
 	id ret;
 	va_list arguments;
 
 	va_start(arguments, firstKey);
@@ -179,11 +179,11 @@
 	@throw [OFNotImplementedException newWithClass: c
 					      selector: _cmd];
 }
 
 - initWithObject: (id)object
-	  forKey: (id <OFCopying>)key
+	  forKey: (id)key
 {
 	return [self initWithKeysAndObjects: key, object, nil];
 }
 
 - initWithObjects: (OFArray*)objects
@@ -193,11 +193,11 @@
 	[self release];
 	@throw [OFNotImplementedException newWithClass: c
 					      selector: _cmd];
 }
 
-- initWithKeysAndObjects: (id <OFCopying>)firstKey, ...
+- initWithKeysAndObjects: (id)firstKey, ...
 {
 	id ret;
 	va_list arguments;
 
 	va_start(arguments, firstKey);
@@ -206,11 +206,11 @@
 	va_end(arguments);
 
 	return ret;
 }
 
-- initWithKey: (id <OFCopying>)firstKey
+- initWithKey: (id)firstKey
     arguments: (va_list)arguments
 {
 	Class c = isa;
 	[self release];
 	@throw [OFNotImplementedException newWithClass: c
@@ -223,11 +223,11 @@
 	[self release];
 	@throw [OFNotImplementedException newWithClass: c
 					      selector: _cmd];
 }
 
-- (id)objectForKey: (id <OFCopying>)key
+- (id)objectForKey: (id)key
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }
 
@@ -249,11 +249,11 @@
 
 - (BOOL)isEqual: (id)dictionary
 {
 	OFAutoreleasePool *pool;
 	OFEnumerator *enumerator;
-	id <OFCopying> key;
+	id key;
 
 	if ([dictionary count] != [self count])
 		return NO;
 
 	pool = [[OFAutoreleasePool alloc] init];
@@ -313,13 +313,13 @@
 - (OFArray*)allKeys
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	id *cArray = [self allocMemoryForNItems: [self count]
 				       withSize: sizeof(id)];
+	OFArray *ret;
 	OFEnumerator *enumerator;
-	id <OFCopying> key;
-	OFArray *ret;
+	id key;
 	size_t i = 0;
 
 	pool = [[OFAutoreleasePool alloc] init];
 	enumerator = [self keyEnumerator];
 
@@ -343,13 +343,13 @@
 - (OFArray*)allObjects
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	id *cArray = [self allocMemoryForNItems: [self count]
 				       withSize: sizeof(id)];
+	OFArray *ret;
 	OFEnumerator *enumerator;
 	id object;
-	OFArray *ret;
 	size_t i = 0;
 
 	pool = [[OFAutoreleasePool alloc] init];
 	enumerator = [self objectEnumerator];
 
@@ -394,11 +394,11 @@
 - (void)enumerateKeysAndObjectsUsingBlock:
     (of_dictionary_enumeration_block_t)block
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFEnumerator *enumerator = [self keyEnumerator];
-	id <OFCopying> key;
+	id key;
 	BOOL stop = NO;
 
 	while (!stop && (key = [enumerator nextObject]) != nil)
 		block(key, [self objectForKey: key], &stop);
 
@@ -440,11 +440,11 @@
 
 - (uint32_t)hash
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFEnumerator *enumerator = [self keyEnumerator];
-	id <OFCopying> key;
+	id key;
 	uint32_t hash = 0;
 
 	while ((key = [enumerator nextObject]) != nil) {
 		hash += [key hash];
 		hash += [[self objectForKey: key] hash];
@@ -500,11 +500,11 @@
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFAutoreleasePool *pool2;
 	OFXMLElement *element;
 	OFEnumerator *keyEnumerator, *objectEnumerator;
-	id <OFSerialization> key, object;
+	id key, object;
 
 	if ([self isKindOfClass: [OFMutableDictionary class]])
 		element = [OFXMLElement elementWithName: @"OFMutableDictionary"
 					      namespace: OF_SERIALIZATION_NS];
 	else