@@ -82,10 +82,11 @@
 
 #if defined(HAVE_STRTOF_L) || defined(HAVE_STRTOD_L)
 static locale_t cLocale;
 #endif
 
+OF_DIRECT_MEMBERS
 @interface OFString ()
 - (size_t)of_getCString: (char *)cString
 	      maxLength: (size_t)maxLength
 	       encoding: (of_string_encoding_t)encoding
 		  lossy: (bool)lossy;
@@ -374,11 +375,11 @@
 	return (id)[[OFUTF8String alloc] init];
 }
 
 - (instancetype)initWithUTF8String: (const char *)UTF8String
 {
-	id string;
+	OFUTF8String *string;
 	size_t length;
 	void *storage;
 
 	length = strlen(UTF8String);
 	string = of_alloc_object([OFUTF8String class], length + 1, 1, &storage);
@@ -389,11 +390,11 @@
 }
 
 - (instancetype)initWithUTF8String: (const char *)UTF8String
 			    length: (size_t)UTF8StringLength
 {
-	id string;
+	OFUTF8String *string;
 	void *storage;
 
 	string = of_alloc_object([OFUTF8String class], UTF8StringLength + 1, 1,
 	    &storage);
 
@@ -422,11 +423,11 @@
 
 - (instancetype)initWithCString: (const char *)cString
 		       encoding: (of_string_encoding_t)encoding
 {
 	if (encoding == OF_STRING_ENCODING_UTF_8) {
-		id string;
+		OFUTF8String *string;
 		size_t length;
 		void *storage;
 
 		length = strlen(cString);
 		string = of_alloc_object([OFUTF8String class], length + 1, 1,
@@ -444,11 +445,11 @@
 - (instancetype)initWithCString: (const char *)cString
 		       encoding: (of_string_encoding_t)encoding
 			 length: (size_t)cStringLength
 {
 	if (encoding == OF_STRING_ENCODING_UTF_8) {
-		id string;
+		OFUTF8String *string;
 		void *storage;
 
 		string = of_alloc_object([OFUTF8String class],
 		    cStringLength + 1, 1, &storage);