@@ -65,11 +65,11 @@
 	OFMutableString *_string;
 }
 @end
 
 @implementation SimpleString
-- init
+- (instancetype)init
 {
 	self = [super init];
 
 	@try {
 		_string = [[OFMutableString alloc] init];
@@ -79,11 +79,11 @@
 	}
 
 	return self;
 }
 
-- initWithString: (OFString *)string
+- (instancetype)initWithString: (OFString *)string
 {
 	self = [super init];
 
 	@try {
 		_string = [string mutableCopy];
@@ -93,13 +93,13 @@
 	}
 
 	return self;
 }
 
-- initWithCString: (const char *)cString
-	 encoding: (of_string_encoding_t)encoding
-	   length: (size_t)length
+- (instancetype)initWithCString: (const char *)cString
+		       encoding: (of_string_encoding_t)encoding
+			 length: (size_t)length
 {
 	self = [super init];
 
 	@try {
 		_string = [[OFMutableString alloc] initWithCString: cString
@@ -111,13 +111,13 @@
 	}
 
 	return self;
 }
 
-- initWithUTF16String: (const char16_t *)UTF16String
-	       length: (size_t)length
-	    byteOrder: (of_byte_order_t)byteOrder
+- (instancetype)initWithUTF16String: (const char16_t *)UTF16String
+			     length: (size_t)length
+			  byteOrder: (of_byte_order_t)byteOrder
 {
 	self = [super init];
 
 	@try {
 		_string = [[OFMutableString alloc]
@@ -130,13 +130,13 @@
 	}
 
 	return self;
 }
 
-- initWithUTF32String: (const char32_t *)UTF32String
-	       length: (size_t)length
-	    byteOrder: (of_byte_order_t)byteOrder
+- (instancetype)initWithUTF32String: (const char32_t *)UTF32String
+			     length: (size_t)length
+			  byteOrder: (of_byte_order_t)byteOrder
 {
 	self = [super init];
 
 	@try {
 		_string = [[OFMutableString alloc]
@@ -149,12 +149,12 @@
 	}
 
 	return self;
 }
 
-- initWithFormat: (OFConstantString *)format
-       arguments: (va_list)arguments
+- (instancetype)initWithFormat: (OFConstantString *)format
+		     arguments: (va_list)arguments
 {
 	self = [super init];
 
 	@try {
 		_string = [[OFMutableString alloc] initWithFormat: format