@@ -147,26 +147,26 @@
 	return currentLocale;
 }
 
 + (OFString *)language
 {
-	return [currentLocale language];
+	return currentLocale.language;
 }
 
 + (OFString *)territory
 {
-	return [currentLocale territory];
+	return currentLocale.territory;
 }
 
 + (of_string_encoding_t)encoding
 {
-	return [currentLocale encoding];
+	return currentLocale.encoding;
 }
 
 + (OFString *)decimalPoint
 {
-	return [currentLocale decimalPoint];
+	return currentLocale.decimalPoint;
 }
 
 #ifdef OF_HAVE_FILES
 + (void)addLanguageDirectory: (OFString *)path
 {
@@ -182,11 +182,11 @@
 #ifndef OF_AMIGAOS
 		char *locale, *messagesLocale = NULL;
 
 		if (currentLocale != nil)
 			@throw [OFInitializationFailedException
-			    exceptionWithClass: [self class]];
+			    exceptionWithClass: self.class];
 
 		_encoding = OF_STRING_ENCODING_UTF_8;
 		_decimalPoint = @".";
 		_localizedStrings = [[OFMutableArray alloc] init];
 
@@ -321,20 +321,19 @@
 	} @catch (OFOpenItemFailedException *e) {
 		objc_autoreleasePoolPop(pool);
 		return;
 	}
 
-	language = [_language lowercaseString];
-	territory = [_territory lowercaseString];
+	language = _language.lowercaseString;
+	territory = _territory.lowercaseString;
 
 	if (territory == nil)
 		territory = @"";
 
 	languageFile = [[map objectForKey: language] objectForKey: territory];
 	if (languageFile == nil)
-		languageFile = [[map objectForKey: language]
-		    objectForKey: @""];
+		languageFile = [[map objectForKey: language] objectForKey: @""];
 
 	if (languageFile == nil) {
 		objc_autoreleasePoolPop(pool);
 		return;
 	}
@@ -387,12 +386,12 @@
 		UTF8StringLength = [string UTF8StringLength];
 		break;
 	}
 
 	if (UTF8String == NULL) {
-		UTF8String = [fallback UTF8String];
-		UTF8StringLength = [fallback UTF8StringLength];
+		UTF8String = fallback.UTF8String;
+		UTF8StringLength = fallback.UTF8StringLength;
 	}
 
 	state = 0;
 	last = 0;
 	for (size_t i = 0; i < UTF8StringLength; i++) {