@@ -40,10 +40,12 @@
 #import "OFAutoreleasePool.h"
 
 #import "OFInitializationFailedException.h"
 #import "OFOutOfRangeException.h"
 
+#import "macros.h"
+
 #ifdef _WIN32
 # define close(sock) closesocket(sock)
 #endif
 
 enum {
@@ -153,18 +155,16 @@
 	[super dealloc];
 }
 
 - (id <OFStreamObserverDelegate>)delegate
 {
-	return [[(id)delegate retain] autorelease];
+	OF_GETTER(delegate, YES)
 }
 
 - (void)setDelegate: (id <OFStreamObserverDelegate>)delegate_
 {
-	[(id)delegate_ retain];
-	[(id)delegate release];
-	delegate = delegate_;
+	OF_SETTER(delegate, delegate_, YES, NO)
 }
 
 #ifdef OF_HAVE_POLL
 - (void)_addStream: (OFStream*)stream
 	withEvents: (short)events