@@ -29,15 +29,13 @@
 {
 	if (self == [OFMutableMapTableDictionary class])
 		[self inheritMethodsFromClass: [OFMapTableDictionary class]];
 }
 
-- (void)setObject: (id)object
-	   forKey: (id)key
+- (void)setObject: (id)object forKey: (id)key
 {
-	[_mapTable setObject: object
-		      forKey: key];
+	[_mapTable setObject: object forKey: key];
 }
 
 - (void)removeObjectForKey: (id)key
 {
 	[_mapTable removeObjectForKey: key];
@@ -47,11 +45,11 @@
 {
 	[_mapTable removeAllObjects];
 }
 
 #ifdef OF_HAVE_BLOCKS
-- (void)replaceObjectsUsingBlock: (of_dictionary_replace_block_t)block
+- (void)replaceObjectsUsingBlock: (OFDictionaryReplaceBlock)block
 {
 	@try {
 		[_mapTable replaceObjectsUsingBlock:
 		    ^ void *(void *key, void *object) {
 			return block(key, object);