@@ -23,10 +23,11 @@
 #import "OFURL.h"
 #import "OFTCPSocket.h"
 #import "OFDictionary.h"
 #import "OFAutoreleasePool.h"
 #import "OFExceptions.h"
+#import "macros.h"
 
 Class of_http_request_tls_socket_class = Nil;
 
 @implementation OFHTTPRequest
 + request
@@ -56,18 +57,16 @@
 	[super dealloc];
 }
 
 - (void)setURL: (OFURL*)url
 {
-	OFURL *old = URL;
-	URL = [url copy];
-	[old release];
+	OF_SETTER(URL, url, YES, YES)
 }
 
 - (OFURL*)URL
 {
-	return [[URL copy] autorelease];
+	OF_GETTER(URL, YES)
 }
 
 - (void)setRequestType: (of_http_request_type_t)type
 {
 	requestType = type;
@@ -78,30 +77,26 @@
 	return requestType;
 }
 
 - (void)setQueryString: (OFString*)qs
 {
-	OFString *old = queryString;
-	queryString = [qs copy];
-	[old release];
+	OF_SETTER(queryString, qs, YES, YES)
 }
 
 - (OFString*)queryString
 {
-	return [[queryString copy] autorelease];
+	OF_GETTER(queryString, YES)
 }
 
 - (void)setHeaders: (OFDictionary*)headers_
 {
-	OFDictionary *old = headers;
-	headers = [headers_ copy];
-	[old release];
+	OF_SETTER(headers, headers_, YES, YES)
 }
 
 - (OFDictionary*)headers
 {
-	return [[headers copy] autorelease];
+	OF_GETTER(headers, YES)
 }
 
 - (OFHTTPRequestResult*)perform
 {
 	return [self performWithRedirects: 10];