@@ -31,10 +31,12 @@
 #import "OFDictionary.h"
 #import "OFAutoreleasePool.h"
 
 #import "OFNotImplementedException.h"
 
+#import "macros.h"
+
 #ifndef __MACH__
 extern char **environ;
 #endif
 
 static OFApplication *app = nil;
@@ -187,33 +189,31 @@
 	*argv_ = argv;
 }
 
 - (OFString*)programName
 {
-	return [[programName copy] autorelease];
+	OF_GETTER(programName, YES)
 }
 
 - (OFArray*)arguments
 {
-	return [[arguments copy] autorelease];
+	OF_GETTER(arguments, YES)
 }
 
 - (OFDictionary*)environment
 {
-	return [[environment copy] autorelease];
+	OF_GETTER(environment, YES)
 }
 
 - (id <OFApplicationDelegate>)delegate
 {
-	return [[(id)delegate retain] autorelease];
+	OF_GETTER(delegate, YES)
 }
 
 - (void)setDelegate: (id <OFApplicationDelegate>)delegate_
 {
-	[(id)delegate_ retain];
-	[(id)delegate release];
-	delegate = delegate_;
+	OF_SETTER(delegate, delegate_, YES, NO)
 }
 
 - (void)run
 {
 	[delegate applicationDidFinishLaunching];