Index: src/OFCountedSet_hashtable.m
==================================================================
--- src/OFCountedSet_hashtable.m
+++ src/OFCountedSet_hashtable.m
@@ -147,12 +147,11 @@
 			    [objectElement attributeForName: @"count"];
 
 			if (object == nil || countAttribute == nil)
 				@throw [OFInvalidFormatException exception];
 
-			signedCount =
-			    countAttribute.stringValue.decimalValue;
+			signedCount = countAttribute.decimalValue;
 			if (signedCount < 0)
 			       @throw [OFOutOfRangeException exception];
 
 			count = signedCount;
 			if (count > SIZE_MAX || count > UINTPTR_MAX)

Index: src/OFLHAArchive.m
==================================================================
--- src/OFLHAArchive.m
+++ src/OFLHAArchive.m
@@ -38,12 +38,11 @@
 #import "OFTruncatedDataException.h"
 #import "OFWriteFailedException.h"
 
 @interface OFLHAArchive_FileReadStream: OFStream <OFReadyForReadingObserving>
 {
-	OFStream *_stream;
-	OFStream *_decompressedStream;
+	OFStream *_stream, *_decompressedStream;
 	OFLHAArchiveEntry *_entry;
 	uint32_t _toRead, _bytesConsumed;
 	uint16_t _CRC16;
 	bool _atEndOfStream, _skipped;
 }

Index: src/OFLHAArchive_LHStream.m
==================================================================
--- src/OFLHAArchive_LHStream.m
+++ src/OFLHAArchive_LHStream.m
@@ -18,10 +18,11 @@
 #include "config.h"
 
 #include <assert.h>
 
 #import "OFLHAArchive_LHStream.h"
+#import "OFKernelEventObserver.h"
 
 #import "huffman_tree.h"
 
 #import "OFInvalidFormatException.h"
 #import "OFNotOpenException.h"

Index: src/OFProcess.m
==================================================================
--- src/OFProcess.m
+++ src/OFProcess.m
@@ -427,11 +427,11 @@
 			count: 1];
 	}
 	[env addItems: zero
 		count: 2];
 
-	return env.items;
+	return env.mutableItems;
 }
 #endif
 
 - (bool)lowlevelIsAtEndOfStream
 {

Index: src/OFStdIOStream_Win32Console.m
==================================================================
--- src/OFStdIOStream_Win32Console.m
+++ src/OFStdIOStream_Win32Console.m
@@ -166,11 +166,11 @@
 
 				if (UTF16Len <= i + 1) {
 					_incompleteUTF16Surrogate = c;
 
 					if (rest != nil) {
-						char *items = rest.items;
+						const char *items = rest.items;
 						size_t count = rest.count;
 
 						[self unreadFromBuffer: items
 								length: count];
 					}

Index: src/OFString+PropertyListValue.m
==================================================================
--- src/OFString+PropertyListValue.m
+++ src/OFString+PropertyListValue.m
@@ -117,17 +117,17 @@
 }
 
 static OFNumber *
 parseRealElement(OFXMLElement *element)
 {
-	return [OFNumber numberWithDouble: element.stringValue.doubleValue];
+	return [OFNumber numberWithDouble: element.doubleValue];
 }
 
 static OFNumber *
 parseIntegerElement(OFXMLElement *element)
 {
-	return [OFNumber numberWithIntMax: element.stringValue.decimalValue];
+	return [OFNumber numberWithIntMax: element.decimalValue];
 }
 
 static id
 parseElement(OFXMLElement *element)
 {

Index: src/OFTarArchive.m
==================================================================
--- src/OFTarArchive.m
+++ src/OFTarArchive.m
@@ -107,13 +107,13 @@
 			bool empty = true;
 
 			if (![_stream isKindOfClass: [OFSeekableStream class]])
 				@throw [OFInvalidArgumentException exception];
 
-			[(OFSeekableStream *)stream seekToOffset: -1024
-							  whence: SEEK_END];
-			[stream readIntoBuffer: buffer.c
+			[(OFSeekableStream *)_stream seekToOffset: -1024
+							   whence: SEEK_END];
+			[_stream readIntoBuffer: buffer.c
 				    exactLength: 1024];
 
 			for (size_t i = 0; i < 1024 / sizeof(uint32_t); i++)
 				if (buffer.u32[i] != 0)
 					empty = false;

Index: src/OFWindowsRegistryKey.m
==================================================================
--- src/OFWindowsRegistryKey.m
+++ src/OFWindowsRegistryKey.m
@@ -206,11 +206,11 @@
 			objc_autoreleasePoolPop(pool);
 			pool = objc_autoreleasePoolPush();
 
 			ret = [OFMutableData dataWithCapacity: length];
 			[ret increaseCountBy: length];
-			buffer = ret.items;
+			buffer = ret.mutableItems;
 
 			continue;
 		default:
 			@throw [OFGetWindowsRegistryValueFailedException
 			    exceptionWithRegistryKey: self

Index: src/OFXMLElement.m
==================================================================
--- src/OFXMLElement.m
+++ src/OFXMLElement.m
@@ -534,13 +534,12 @@
 		    attribute->_namespace]) == nil)
 			@throw [OFUnboundNamespaceException
 			    exceptionWithNamespace: [attribute namespace]
 					   element: self];
 
-		length += attributeNameLength +
-		    (attributePrefix != nil ?
-		    attributePrefix.UTF8StringLength + 1 : 0) +
+		length += attributeNameLength + (attributePrefix != nil
+		    ? attributePrefix.UTF8StringLength + 1 : 0) +
 		    tmp.UTF8StringLength + 4;
 
 		@try {
 			cString = [self resizeMemory: cString
 						size: length];

Index: src/OFZIPArchive.m
==================================================================
--- src/OFZIPArchive.m
+++ src/OFZIPArchive.m
@@ -74,12 +74,11 @@
 - (bool)matchesEntry: (OFZIPArchiveEntry *)entry;
 @end
 
 @interface OFZIPArchive_FileReadStream: OFStream
 {
-	OFStream *_stream;
-	OFStream *_decompressedStream;
+	OFStream *_stream, *_decompressedStream;
 	OFZIPArchiveEntry *_entry;
 	uint64_t _toRead;
 	uint32_t _CRC32;
 	bool _atEndOfStream;
 }

Index: src/bridge/NSBridging.h
==================================================================
--- src/bridge/NSBridging.h
+++ src/bridge/NSBridging.h
@@ -33,16 +33,14 @@
  * @brief A protocol implemented by classes supporting bridging Foundation
  *	  objects to ObjFW objects.
  */
 @protocol NSBridging
 /*!
- * @brief Returns an instance of an ObjFW object corresponding to the receiver.
+ * @brief An instance of an ObjFW object corresponding to the object.
  *
  * If possible, the original object is wrapped. If this is not possible, an
  * autoreleased copy is created.
- *
- * @return The receiver as an ObjFW object
  */
 @property (readonly, nonatomic) id OFObject;
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/bridge/OFBridging.h
==================================================================
--- src/bridge/OFBridging.h
+++ src/bridge/OFBridging.h
@@ -33,17 +33,14 @@
  * @brief A protocol implemented by classes supporting bridging ObjFW objects
  *	  to Foundation objects.
  */
 @protocol OFBridging
 /*!
- * @brief Returns an instance of a Foundation object corresponding to the
- *	  receiver.
+ * @brief An instance of a Foundation object corresponding to the object.
  *
  * If possible, the original object is wrapped. If this is not possible, an
  * autoreleased copy is created.
- *
- * @return The receiver as Foundation object
  */
 @property (readonly, nonatomic) id NSObject;
 @end
 
 OF_ASSUME_NONNULL_END