@@ -147,14 +147,15 @@
 #if defined(OF_IOS) || defined(OF_MACOS)
 # ifdef OF_HAVE_FILES
 	void *pool = objc_autoreleasePoolPush();
 
 	@try {
-		OFString *propertyList = [OFString stringWithContentsOfFile:
-		    @"/System/Library/CoreServices/SystemVersion.plist"];
+		OFDictionary *propertyList = [OFString stringWithContentsOfFile:
+		    @"/System/Library/CoreServices/SystemVersion.plist"]
+		    .propertyListValue;
 
-		operatingSystemVersion = [[[propertyList propertyListValue]
+		operatingSystemVersion = [[propertyList
 		    objectForKey: @"ProductVersion"] copy];
 	} @finally {
 		objc_autoreleasePoolPop(pool);
 	}
 # endif
@@ -175,12 +176,12 @@
 			return;
 
 		systemDirString = [OFString
 		    stringWithUTF16String: systemDir
 				   length: systemDirLen];
-		path = [[systemDirString stringByAppendingPathComponent:
-		    @"kernel32.dll"] UTF16String];
+		path = [systemDirString stringByAppendingPathComponent:
+		    @"kernel32.dll"].UTF16String;
 
 		if ((bufferLen = GetFileVersionInfoSizeW(path, NULL)) == 0)
 			return;
 		if ((buffer = malloc(bufferLen)) == 0)
 			return;
@@ -435,11 +436,11 @@
 	OFDictionary *env = [OFApplication environment];
 	OFString *var;
 	void *pool;
 
 	if ((var = [env objectForKey: @"XDG_DATA_HOME"]) != nil &&
-	    [var length] > 0)
+	    var.length > 0)
 		return var;
 
 	if ((var = [env objectForKey: @"HOME"]) == nil)
 		@throw [OFNotImplementedException exceptionWithSelector: _cmd
 								 object: self];
@@ -528,11 +529,11 @@
 # else
 	OFDictionary *env = [OFApplication environment];
 	OFString *var;
 
 	if ((var = [env objectForKey: @"XDG_CONFIG_HOME"]) != nil &&
-	    [var length] > 0)
+	    var.length > 0)
 		return var;
 
 	if ((var = [env objectForKey: @"HOME"]) == nil)
 		@throw [OFNotImplementedException exceptionWithSelector: _cmd
 								 object: self];