Index: src/OFHTTPResponse.m
==================================================================
--- src/OFHTTPResponse.m
+++ src/OFHTTPResponse.m
@@ -242,16 +242,16 @@
 	indentedHeaders = [[_headers description]
 	    stringByReplacingOccurrencesOfString: @"\n"
 				      withString: @"\n\t"];
 
 	ret = [[OFString alloc] initWithFormat:
-	    @"<%@: %p\n"
+	    @"<%@:\n"
 	    @"\tStatus code = %d\n"
 	    @"\tHeaders = %@\n"
 	    @">",
-	    [self class], self, _statusCode, indentedHeaders];
+	    [self class], _statusCode, indentedHeaders];
 
 	objc_autoreleasePoolPop(pool);
 
 	return [ret autorelease];
 }
 @end

Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -820,11 +820,11 @@
 
 - (OFString*)description
 {
 	/* Classes containing data should reimplement this! */
 
-	return [OFString stringWithFormat: @"<%@: %p>", [self className], self];
+	return [OFString stringWithFormat: @"<%@>", [self className]];
 }
 
 - (void*)allocMemoryWithSize: (size_t)size
 {
 	void *pointer;

Index: src/OFTarArchiveEntry.m
==================================================================
--- src/OFTarArchiveEntry.m
+++ src/OFTarArchiveEntry.m
@@ -182,11 +182,11 @@
 }
 
 - (OFString*)description
 {
 	void *pool = objc_autoreleasePoolPush();
-	OFString *ret = [OFString stringWithFormat: @"<%@: %p\n"
+	OFString *ret = [OFString stringWithFormat: @"<%@:\n"
 	     @"\tFile name = %@\n"
 	     @"\tMode = %06o\n"
 	     @"\tSize = %" PRIu64 @"\n"
 	     @"\tModification date = %@\n"
 	     @"\tType = %u\n"
@@ -194,15 +194,15 @@
 	     @"\tOwner = %@\n"
 	     @"\tGroup = %@\n"
 	     @"\tDevice major = %" PRIu32 @"\n"
 	     @"\tDevice minor = %" PRIu32 @"\n"
 	     @">",
-	    [self class], self, _fileName, _mode, _size, _modificationDate,
-	    _type, _targetFileName, _owner, _group, _deviceMajor, _deviceMinor];
+	    [self class], _fileName, _mode, _size, _modificationDate, _type,
+	    _targetFileName, _owner, _group, _deviceMajor, _deviceMinor];
 
 	[ret retain];
 
 	objc_autoreleasePoolPop(pool);
 
 	return [ret autorelease];
 }
 @end

Index: src/OFZIPArchiveEntry.m
==================================================================
--- src/OFZIPArchiveEntry.m
+++ src/OFZIPArchiveEntry.m
@@ -267,11 +267,11 @@
 }
 
 - (OFString*)description
 {
 	void *pool = objc_autoreleasePoolPush();
-	OFString *ret = [OFString stringWithFormat: @"<%@: %p\n"
+	OFString *ret = [OFString stringWithFormat: @"<%@:\n"
 	    @"\tFile name = %@\n"
 	    @"\tFile comment = %@\n"
 	    @"\tGeneral purpose bit flag = %u\n"
 	    @"\tCompression method = %u\n"
 	    @"\tCompressed size = %ju\n"
@@ -278,11 +278,11 @@
 	    @"\tUncompressed size = %ju\n"
 	    @"\tModification date = %@\n"
 	    @"\tCRC32 = %" @PRIu32 @"\n"
 	    @"\tExtra field = %@\n"
 	    @">",
-	    [self class], self, _fileName, _fileComment, _generalPurposeBitFlag,
+	    [self class], _fileName, _fileComment, _generalPurposeBitFlag,
 	    _compressionMethod, (intmax_t)_compressedSize,
 	    (intmax_t)_uncompressedSize, [self modificationDate], _CRC32,
 	    _extraField];
 
 	[ret retain];

Index: src/exceptions/OFMemoryNotPartOfObjectException.m
==================================================================
--- src/exceptions/OFMemoryNotPartOfObjectException.m
+++ src/exceptions/OFMemoryNotPartOfObjectException.m
@@ -53,11 +53,11 @@
 }
 
 - (OFString*)description
 {
 	return [OFString stringWithFormat:
-	    @"Memory at %p was not allocated as part of object of type %@, "
-	    @"thus the memory allocation was not changed! It is also possible "
-	    @"that there was an attempt to free the same memory twice.",
-	    _pointer, [_object class]];
+	    @"Deallocation or reallocation of memory not allocated as part of "
+	    @"object of type %@ was attempted! It is also possible that there "
+	    @"was an attempt to free the same memory twice.",
+	    [_object class]];
 }
 @end

Index: tests/OFObjectTests.m
==================================================================
--- tests/OFObjectTests.m
+++ tests/OFObjectTests.m
@@ -145,14 +145,12 @@
 
 	o = [[[OFObject alloc] init] autorelease];
 	m = [[[MyObj alloc] init] autorelease];
 
 	TEST(@"-[description]",
-	    [[o description] isEqual:
-	    [OFString stringWithFormat: @"<OFObject: %p>", o]] &&
-	    [[m description] isEqual:
-	    [OFString stringWithFormat: @"<MyObj: %p>", m]])
+	    [[o description] isEqual: @"<OFObject>"] &&
+	    [[m description] isEqual: @"<MyObj>"])
 
 	[m setObjectValue: @"Hello"];
 	[m setClassValue: [m class]];
 	TEST(@"-[valueForKey:]",
 	    [[m valueForKey: @"objectValue"] isEqual: @"Hello"] &&