@@ -79,34 +79,35 @@
 	of_tcp_socket_async_connect_block_t _block;
 # endif
 	id _exception;
 }
 
-- initWithSourceThread: (OFThread *)sourceThread
-		socket: (OFTCPSocket *)socket
-		  host: (OFString *)host
-		  port: (uint16_t)port
-		target: (id)target
-	      selector: (SEL)selector
-	       context: (id)context;
+- (instancetype)initWithSourceThread: (OFThread *)sourceThread
+			      socket: (OFTCPSocket *)socket
+				host: (OFString *)host
+				port: (uint16_t)port
+			      target: (id)target
+			    selector: (SEL)selector
+			     context: (id)context;
 # ifdef OF_HAVE_BLOCKS
-- initWithSourceThread: (OFThread *)sourceThread
-		socket: (OFTCPSocket *)socket
-		  host: (OFString *)host
-		  port: (uint16_t)port
-		 block: (of_tcp_socket_async_connect_block_t)block;
+- (instancetype)initWithSourceThread: (OFThread *)sourceThread
+			      socket: (OFTCPSocket *)socket
+				host: (OFString *)host
+				port: (uint16_t)port
+			       block: (of_tcp_socket_async_connect_block_t)
+					  block;
 # endif
 @end
 
 @implementation OFTCPSocket_ConnectThread
-- initWithSourceThread: (OFThread *)sourceThread
-		socket: (OFTCPSocket *)socket
-		  host: (OFString *)host
-		  port: (uint16_t)port
-		target: (id)target
-	      selector: (SEL)selector
-	       context: (id)context
+- (instancetype)initWithSourceThread: (OFThread *)sourceThread
+			      socket: (OFTCPSocket *)socket
+				host: (OFString *)host
+				port: (uint16_t)port
+			      target: (id)target
+			    selector: (SEL)selector
+			     context: (id)context
 {
 	self = [super init];
 
 	@try {
 		_sourceThread = [sourceThread retain];
@@ -123,15 +124,15 @@
 
 	return self;
 }
 
 # ifdef OF_HAVE_BLOCKS
-- initWithSourceThread: (OFThread *)sourceThread
-		socket: (OFTCPSocket *)socket
-		  host: (OFString *)host
-		  port: (uint16_t)port
-		 block: (of_tcp_socket_async_connect_block_t)block
+- (instancetype)initWithSourceThread: (OFThread *)sourceThread
+			      socket: (OFTCPSocket *)socket
+				host: (OFString *)host
+				port: (uint16_t)port
+			       block: (of_tcp_socket_async_connect_block_t)block
 {
 	self = [super init];
 
 	@try {
 		_sourceThread = [sourceThread retain];
@@ -227,11 +228,11 @@
 + (uint16_t)SOCKS5Port
 {
 	return defaultSOCKS5Port;
 }
 
-- init
+- (instancetype)init
 {
 	self = [super init];
 
 	@try {
 		_socket = INVALID_SOCKET;