Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -805,18 +805,15 @@
 #endif
 }
 
 - (BOOL)isEqual: (id)object
 {
-	/* Classes containing data should reimplement this! */
 	return (self == object);
 }
 
 - (uint32_t)hash
 {
-	/* Classes containing data should reimplement this! */
-
 	uintptr_t ptr = (uintptr_t)self;
 	uint32_t hash;
 
 	OF_HASH_INIT(hash);
 

Index: src/OFStream.h
==================================================================
--- src/OFStream.h
+++ src/OFStream.h
@@ -64,10 +64,11 @@
 	BOOL   blocking;
 	BOOL   waitingForDelimiter;
 }
 
 #ifdef OF_HAVE_PROPERTIES
+@property (getter=isWriteBufferEnabled) BOOL writeBufferEnabled;
 @property (getter=isBlocking) BOOL blocking;
 @property (readonly, getter=isAtEndOfStream) BOOL atEndOfStream;
 #endif
 
 /*!
@@ -691,11 +692,11 @@
 /*!
  * @brief Returns a boolen whether writes are buffered.
  *
  * @return A boolean whether writes are buffered
  */
-- (BOOL)writeBufferEnabled;
+- (BOOL)isWriteBufferEnabled;
 
 /*!
  * @brief Enables or disables the write buffer.
  *
  * @param enable Whether the write buffer should be enabled or disabled

Index: src/OFStream.m
==================================================================
--- src/OFStream.m
+++ src/OFStream.m
@@ -934,11 +934,11 @@
 {
 	return [self tryReadTillDelimiter: delimiter
 				 encoding: OF_STRING_ENCODING_UTF_8];
 }
 
-- (BOOL)writeBufferEnabled
+- (BOOL)isWriteBufferEnabled
 {
 	return writeBufferEnabled;
 }
 
 - (void)setWriteBufferEnabled: (BOOL)enable

Index: src/OFTCPSocket+SOCKS5.m
==================================================================
--- src/OFTCPSocket+SOCKS5.m
+++ src/OFTCPSocket+SOCKS5.m
@@ -27,11 +27,11 @@
 - (void)OF_SOCKS5ConnectToHost: (OFString*)host
 			  port: (uint16_t)port
 {
 	const char request[] = { 5, 1, 0, 3 };
 	char reply[256];
-	BOOL oldWriteBufferEnabled;
+	BOOL wasWriteBufferEnabled;
 
 	/* 5 1 0 -> no authentication */
 	[self writeBuffer: request
 		   length: 3];
 
@@ -45,11 +45,11 @@
 				socket: self
 				  host: host
 				  port: port];
 	}
 
-	oldWriteBufferEnabled = [self writeBufferEnabled];
+	wasWriteBufferEnabled = [self isWriteBufferEnabled];
 	[self setWriteBufferEnabled: YES];
 
 	/* CONNECT request */
 	[self writeBuffer: request
 		   length: 4];
@@ -57,11 +57,11 @@
 	[self writeBuffer: [host UTF8String]
 		   length: [host UTF8StringLength]];
 	[self writeBigEndianInt16: port];
 
 	[self flushWriteBuffer];
-	[self setWriteBufferEnabled: oldWriteBufferEnabled];
+	[self setWriteBufferEnabled: wasWriteBufferEnabled];
 
 	[self readIntoBuffer: reply
 		 exactLength: 4];
 
 	if (reply[0] != 5 || reply[1] != 0 || reply[2] != 0) {