@@ -170,11 +170,11 @@
 
 	return index;
 }
 
 @implementation OFString_UTF8
-- init
+- (instancetype)init
 {
 	self = [super init];
 
 	@try {
 		_s = &_storage;
@@ -224,13 +224,13 @@
 	}
 
 	return self;
 }
 
-- initWithCString: (const char *)cString
-	 encoding: (of_string_encoding_t)encoding
-	   length: (size_t)cStringLength
+- (instancetype)initWithCString: (const char *)cString
+		       encoding: (of_string_encoding_t)encoding
+			 length: (size_t)cStringLength
 {
 	self = [super init];
 
 	@try {
 		const char16_t *table;
@@ -388,12 +388,12 @@
 	}
 
 	return self;
 }
 
-- initWithUTF8StringNoCopy: (char *)UTF8String
-	      freeWhenDone: (bool)freeWhenDone
+- (instancetype)initWithUTF8StringNoCopy: (char *)UTF8String
+			    freeWhenDone: (bool)freeWhenDone
 {
 	self = [super init];
 
 	@try {
 		size_t UTF8StringLength = strlen(UTF8String);
@@ -426,11 +426,11 @@
 	}
 
 	return self;
 }
 
-- initWithString: (OFString *)string
+- (instancetype)initWithString: (OFString *)string
 {
 	self = [super init];
 
 	@try {
 		_s = &_storage;
@@ -453,12 +453,12 @@
 	}
 
 	return self;
 }
 
-- initWithCharacters: (const of_unichar_t *)characters
-	      length: (size_t)length
+- (instancetype)initWithCharacters: (const of_unichar_t *)characters
+			    length: (size_t)length
 {
 	self = [super init];
 
 	@try {
 		size_t j;
@@ -497,13 +497,13 @@
 	}
 
 	return self;
 }
 
-- initWithUTF16String: (const char16_t *)string
-	       length: (size_t)length
-	    byteOrder: (of_byte_order_t)byteOrder
+- (instancetype)initWithUTF16String: (const char16_t *)string
+			     length: (size_t)length
+			  byteOrder: (of_byte_order_t)byteOrder
 {
 	self = [super init];
 
 	@try {
 		size_t j;
@@ -582,13 +582,13 @@
 	}
 
 	return self;
 }
 
-- initWithUTF32String: (const char32_t *)characters
-	       length: (size_t)length
-	    byteOrder: (of_byte_order_t)byteOrder
+- (instancetype)initWithUTF32String: (const char32_t *)characters
+			     length: (size_t)length
+			  byteOrder: (of_byte_order_t)byteOrder
 {
 	self = [super init];
 
 	@try {
 		size_t j;
@@ -649,12 +649,12 @@
 	}
 
 	return self;
 }
 
-- initWithFormat: (OFConstantString *)format
-       arguments: (va_list)arguments
+- (instancetype)initWithFormat: (OFConstantString *)format
+		     arguments: (va_list)arguments
 {
 	self = [super init];
 
 	@try {
 		char *tmp;