@@ -34,12 +34,10 @@
 
 #import "OFInitializationFailedException.h"
 #import "OFMalformedXMLException.h"
 #import "OFUnboundNamespaceException.h"
 
-#import "macros.h"
-
 typedef void (*state_function)(id, SEL, const char*, size_t*, size_t*);
 static SEL selectors[OF_XMLPARSER_NUM_STATES];
 static state_function lookupTable[OF_XMLPARSER_NUM_STATES];
 
 static OF_INLINE void
@@ -211,12 +209,10 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	[(id)delegate release];
-
 	[cache release];
 	[name release];
 	[prefix release];
 	[namespaces release];
 	[attributes release];
@@ -227,16 +223,16 @@
 	[super dealloc];
 }
 
 - (id <OFXMLParserDelegate>)delegate
 {
-	OF_GETTER(delegate, YES)
+	return delegate;
 }
 
 - (void)setDelegate: (id <OFXMLParserDelegate>)delegate_
 {
-	OF_SETTER(delegate, delegate_, YES, NO)
+	delegate = delegate_;
 }
 
 - (void)parseBuffer: (const char*)buffer
 	 withLength: (size_t)length
 {