Index: src/OFArray_subarray.m
==================================================================
--- src/OFArray_subarray.m
+++ src/OFArray_subarray.m
@@ -72,12 +72,12 @@
 	    range.location + range.length > _range.length)
 		@throw [OFOutOfRangeException exception];
 
 	range.location += _range.location;
 
-	return [_array getObjects: buffer
-			  inRange: range];
+	[_array getObjects: buffer
+		   inRange: range];
 }
 
 - (size_t)indexOfObject: (id)object
 {
 	size_t index = [_array indexOfObject: object];

Index: src/OFConstantString.m
==================================================================
--- src/OFConstantString.m
+++ src/OFConstantString.m
@@ -346,12 +346,12 @@
 - (void)getCharacters: (of_unichar_t*)buffer
 	      inRange: (of_range_t)range
 {
 	[self finishInitialization];
 
-	return [self getCharacters: buffer
-			   inRange: range];
+	[self getCharacters: buffer
+		    inRange: range];
 }
 
 - (of_range_t)rangeOfString: (OFString*)string
 {
 	[self finishInitialization];
@@ -610,26 +610,26 @@
 
 - (void)writeToFile: (OFString*)path
 {
 	[self finishInitialization];
 
-	return [self writeToFile: path];
+	[self writeToFile: path];
 }
 
 - (void)writeToFile: (OFString*)path
 	   encoding: (of_string_encoding_t)encoding
 {
 	[self finishInitialization];
 
-	return [self writeToFile: path
-			encoding: encoding];
+	[self writeToFile: path
+		 encoding: encoding];
 }
 
 #ifdef OF_HAVE_BLOCKS
 - (void)enumerateLinesUsingBlock: (of_string_line_enumeration_block_t)block
 {
 	[self finishInitialization];
 
-	return [self enumerateLinesUsingBlock: block];
+	[self enumerateLinesUsingBlock: block];
 }
 #endif
 @end

Index: src/OFMutableString.m
==================================================================
--- src/OFMutableString.m
+++ src/OFMutableString.m
@@ -301,12 +301,12 @@
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)appendString: (OFString*)string
 {
-	return [self insertString: string
-			  atIndex: [self length]];
+	[self insertString: string
+		   atIndex: [self length]];
 }
 
 - (void)appendCharacters: (of_unichar_t*)characters
 		  length: (size_t)length
 {
@@ -393,12 +393,12 @@
 	}
 }
 
 - (void)prependString: (OFString*)string
 {
-	return [self insertString: string
-			  atIndex: 0];
+	[self insertString: string
+		   atIndex: 0];
 }
 
 - (void)reverse
 {
 	size_t i, j, length = [self length];

Index: src/OFMutableString_UTF8.m
==================================================================
--- src/OFMutableString_UTF8.m
+++ src/OFMutableString_UTF8.m
@@ -332,13 +332,13 @@
 }
 
 - (void)appendCString: (const char*)cString
 	     encoding: (of_string_encoding_t)encoding
 {
-	return [self appendCString: cString
-			  encoding: encoding
-			    length: strlen(cString)];
+	[self appendCString: cString
+		   encoding: encoding
+		     length: strlen(cString)];
 }
 
 - (void)appendCString: (const char*)cString
 	     encoding: (of_string_encoding_t)encoding
 	       length: (size_t)cStringLength

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -2420,12 +2420,12 @@
 }
 
 #ifdef OF_HAVE_FILES
 - (void)writeToFile: (OFString*)path
 {
-	return [self writeToFile: path
-			encoding: OF_STRING_ENCODING_UTF_8];
+	[self writeToFile: path
+		 encoding: OF_STRING_ENCODING_UTF_8];
 }
 
 - (void)writeToFile: (OFString*)path
 	   encoding: (of_string_encoding_t)encoding
 {

Index: src/OFXMLElement.m
==================================================================
--- src/OFXMLElement.m
+++ src/OFXMLElement.m
@@ -873,12 +873,14 @@
 		     namespace: (OFString*)attributeNS
 {
 	OFXMLAttribute **objects;
 	size_t i, count;
 
-	if (attributeNS == nil)
-		return [self removeAttributeForName: attributeName];
+	if (attributeNS == nil) {
+		[self removeAttributeForName: attributeName];
+		return;
+	}
 
 	objects = [_attributes objects];
 	count = [_attributes count];
 
 	for (i = 0; i < count; i++) {