@@ -292,12 +292,11 @@
 		@throw [OFInvalidArgumentException exception];
 
 	return [self initWithKeysAndObjects: key, object, nil];
 }
 
-- (instancetype)initWithObjects: (OFArray *)objects_
-			forKeys: (OFArray *)keys_
+- (instancetype)initWithObjects: (OFArray *)objects_ forKeys: (OFArray *)keys_
 {
 	id const *objects, *keys;
 	size_t count;
 
 	@try {
@@ -336,12 +335,11 @@
 	va_end(arguments);
 
 	return ret;
 }
 
-- (instancetype)initWithKey: (id)firstKey
-		  arguments: (va_list)arguments
+- (instancetype)initWithKey: (id)firstKey arguments: (va_list)arguments
 {
 	OF_INVALID_INIT_METHOD
 }
 
 - (instancetype)initWithSerialization: (OFXMLElement *)element
@@ -365,20 +363,18 @@
 		return [super valueForKey: @"count"];
 
 	return [self objectForKey: key];
 }
 
-- (void)setValue: (id)value
-	  forKey: (OFString *)key
+- (void)setValue: (id)value forKey: (OFString *)key
 {
 	if (![self isKindOfClass: [OFMutableDictionary class]])
 		@throw [OFUndefinedKeyException exceptionWithObject: self
 								key: key
 							      value: value];
 
-	[(OFMutableDictionary *)self setObject: value
-					forKey: key];
+	[(OFMutableDictionary *)self setObject: value forKey: key];
 }
 
 - (size_t)count
 {
 	OF_UNRECOGNIZED_SELECTOR
@@ -566,12 +562,11 @@
 {
 	OFMutableDictionary *new = [OFMutableDictionary dictionary];
 
 	[self enumerateKeysAndObjectsUsingBlock: ^ (id key, id object,
 	    bool *stop) {
-		[new setObject: block(key, object)
-			forKey: key];
+		[new setObject: block(key, object) forKey: key];
 	}];
 
 	[new makeImmutable];
 
 	return new;
@@ -583,12 +578,11 @@
 	OFMutableDictionary *new = [OFMutableDictionary dictionary];
 
 	[self enumerateKeysAndObjectsUsingBlock: ^ (id key, id object,
 	    bool *stop) {
 		if (block(key, object))
-			[new setObject: object
-				forKey: key];
+			[new setObject: object forKey: key];
 	}];
 
 	[new makeImmutable];
 
 	return new;
@@ -642,12 +636,11 @@
 		if (++i < count)
 			[ret appendString: @";\n"];
 
 		objc_autoreleasePoolPop(pool2);
 	}
-	[ret replaceOccurrencesOfString: @"\n"
-			     withString: @"\n\t"];
+	[ret replaceOccurrencesOfString: @"\n" withString: @"\n\t"];
 	[ret appendString: @";\n}"];
 
 	[ret makeImmutable];
 
 	objc_autoreleasePoolPop(pool);
@@ -731,18 +724,16 @@
 	return [element autorelease];
 }
 
 - (OFString *)JSONRepresentation
 {
-	return [self of_JSONRepresentationWithOptions: 0
-						depth: 0];
+	return [self of_JSONRepresentationWithOptions: 0 depth: 0];
 }
 
 - (OFString *)JSONRepresentationWithOptions: (int)options
 {
-	return [self of_JSONRepresentationWithOptions: options
-						depth: 0];
+	return [self of_JSONRepresentationWithOptions: options depth: 0];
 }
 
 - (OFString *)of_JSONRepresentationWithOptions: (int)options
 					 depth: (size_t)depth
 {
@@ -866,16 +857,14 @@
 		OFData *child;
 
 		i++;
 
 		child = key.messagePackRepresentation;
-		[data addItems: child.items
-			 count: child.count];
+		[data addItems: child.items count: child.count];
 
 		child = object.messagePackRepresentation;
-		[data addItems: child.items
-			 count: child.count];
+		[data addItems: child.items count: child.count];
 
 		objc_autoreleasePoolPop(pool2);
 	}
 
 	assert(i == count);