@@ -23,10 +23,12 @@
 #import "OFXMLParser.h"
 #import "OFMutableArray.h"
 #import "OFAutoreleasePool.h"
 
 #import "OFMalformedXMLException.h"
+
+#import "macros.h"
 
 @implementation OFXMLElementBuilder
 + elementBuilder
 {
 	return [[[self alloc] init] autorelease];
@@ -54,18 +56,16 @@
 	[super dealloc];
 }
 
 - (id <OFXMLElementBuilderDelegate>)delegate
 {
-	return [[(id)delegate retain] autorelease];
+	OF_GETTER(delegate, YES)
 }
 
 - (void)setDelegate: (id <OFXMLElementBuilderDelegate>)delegate_
 {
-	[(id)delegate_ retain];
-	[(id)delegate release];
-	delegate = delegate_;
+	OF_SETTER(delegate, delegate_, YES, NO)
 }
 
 -    (void)parser: (OFXMLParser*)parser
   didStartElement: (OFString*)name
        withPrefix: (OFString*)prefix