@@ -258,13 +258,11 @@
 					continue;
 				}
 
 				key = [tmp substringToIndex: pos];
 				value = [tmp substringFromIndex: pos + 1];
-
-				[_environment setObject: value
-						 forKey: key];
+				[_environment setObject: value forKey: key];
 
 				objc_autoreleasePoolPop(pool);
 			}
 
 			FreeEnvironmentStringsW(env0);
@@ -302,13 +300,11 @@
 					continue;
 				}
 
 				key = [tmp substringToIndex: pos];
 				value = [tmp substringFromIndex: pos + 1];
-
-				[_environment setObject: value
-						 forKey: key];
+				[_environment setObject: value forKey: key];
 
 				objc_autoreleasePoolPop(pool);
 			}
 
 			FreeEnvironmentStringsA(env0);
@@ -338,12 +334,11 @@
 			file = [OFFile fileWithPath: path
 					       mode: @"r"];
 
 			value = [file readLineWithEncoding: encoding];
 			if (value != nil)
-				[_environment setObject: value
-						 forKey: name];
+				[_environment setObject: value forKey: name];
 
 			objc_autoreleasePoolPop(pool2);
 		}
 
 		/* Local variables override global variables */
@@ -372,13 +367,11 @@
 						 encoding: encoding];
 			value = [OFString
 			    stringWithCString: (const char *)iter->lv_Value
 				     encoding: encoding
 				       length: length];
-
-			[_environment setObject: value
-					 forKey: key];
+			[_environment setObject: value forKey: key];
 		}
 
 		objc_autoreleasePoolPop(pool);
 #elif !defined(OF_IOS)
 # ifndef OF_MACOS
@@ -407,13 +400,11 @@
 					     encoding: encoding
 					       length: sep - *env];
 				value = [OFString
 				    stringWithCString: sep + 1
 					     encoding: encoding];
-
-				[_environment setObject: value
-						 forKey: key];
+				[_environment setObject: value forKey: key];
 
 				objc_autoreleasePoolPop(pool);
 			}
 		}
 #else
@@ -429,40 +420,35 @@
 
 		if ((env = getenv("HOME")) != NULL) {
 			OFString *home = [[[OFString alloc]
 			    initWithUTF8StringNoCopy: env
 					freeWhenDone: false] autorelease];
-			[_environment setObject: home
-					 forKey: @"HOME"];
+			[_environment setObject: home forKey: @"HOME"];
 		}
 		if ((env = getenv("PATH")) != NULL) {
 			OFString *path = [[[OFString alloc]
 			    initWithUTF8StringNoCopy: env
 					freeWhenDone: false] autorelease];
-			[_environment setObject: path
-					 forKey: @"PATH"];
+			[_environment setObject: path forKey: @"PATH"];
 		}
 		if ((env = getenv("SHELL")) != NULL) {
 			OFString *shell = [[[OFString alloc]
 			    initWithUTF8StringNoCopy: env
 					freeWhenDone: false] autorelease];
-			[_environment setObject: shell
-					 forKey: @"SHELL"];
+			[_environment setObject: shell forKey: @"SHELL"];
 		}
 		if ((env = getenv("TMPDIR")) != NULL) {
 			OFString *tmpdir = [[[OFString alloc]
 			    initWithUTF8StringNoCopy: env
 					freeWhenDone: false] autorelease];
-			[_environment setObject: tmpdir
-					 forKey: @"TMPDIR"];
+			[_environment setObject: tmpdir forKey: @"TMPDIR"];
 		}
 		if ((env = getenv("USER")) != NULL) {
 			OFString *user = [[[OFString alloc]
 			    initWithUTF8StringNoCopy: env
 					freeWhenDone: false] autorelease];
-			[_environment setObject: user
-					 forKey: @"USER"];
+			[_environment setObject: user forKey: @"USER"];
 		}
 
 		objc_autoreleasePoolPop(pool);
 #endif