@@ -45,12 +45,10 @@
 
 #import "OFInitializationFailedException.h"
 #import "OFNotImplementedException.h"
 #import "OFOutOfRangeException.h"
 
-#import "macros.h"
-
 enum {
 	QUEUE_ADD = 0,
 	QUEUE_REMOVE = 1,
 	QUEUE_READ = 0,
 	QUEUE_WRITE = 2
@@ -159,11 +157,10 @@
 - (void)dealloc
 {
 	close(cancelFD[0]);
 	close(cancelFD[1]);
 
-	[(id)delegate release];
 	[readStreams release];
 	[writeStreams release];
 	[queue release];
 	[queueInfo release];
 	[queueFDs release];
@@ -174,16 +171,16 @@
 	[super dealloc];
 }
 
 - (id <OFStreamObserverDelegate>)delegate
 {
-	OF_GETTER(delegate, YES)
+	return delegate;
 }
 
 - (void)setDelegate: (id <OFStreamObserverDelegate>)delegate_
 {
-	OF_SETTER(delegate, delegate_, YES, NO)
+	delegate = delegate_;
 }
 
 - (void)addStreamForReading: (OFStream*)stream
 {
 	[mutex lock];