--- a/dstep/foundation/NSOperation.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSOperation.d	Sun Jan 03 22:06:11 2010 +0100
@@ -7,17 +7,41 @@
 module dstep.foundation.NSOperation;
 
 import dstep.foundation.NSArray;
+import dstep.foundation.NSInvocation;
+import dstep.foundation.NSObjCRuntime;
 import dstep.foundation.NSObject;
 import dstep.foundation.NSSet;
+import dstep.foundation.NSString;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
+
+
 
 import bindings = dstep.foundation.NSOperation_bindings;
 
 alias NSInteger NSOperationQueuePriority;
 
-const NSString NSInvocationOperationVoidResultException;
-const NSString NSInvocationOperationCancelledException;
+private
+{
+	NSString NSInvocationOperationVoidResultException_;
+	NSString NSInvocationOperationCancelledException_;
+}
+
+NSString NSInvocationOperationVoidResultException ()
+{
+	if (NSInvocationOperationVoidResultException_)
+		return NSInvocationOperationVoidResultException_;
+		
+	return NSInvocationOperationVoidResultException_ = new NSString(bindings.NSInvocationOperationVoidResultException);
+}
+
+NSString NSInvocationOperationCancelledException ()
+{
+	if (NSInvocationOperationCancelledException_)
+		return NSInvocationOperationCancelledException_;
+		
+	return NSInvocationOperationCancelledException_ = new NSString(bindings.NSInvocationOperationCancelledException);
+}
 
 enum
 {
@@ -33,30 +57,18 @@
 	NSOperationQueueDefaultMaxConcurrentOperationCount = -1
 }
 
-static this ()
-{
-	NSInvocationOperationVoidResultException = new NSString(bindings.NSInvocationOperationVoidResultException);
-	NSInvocationOperationCancelledException = new NSString(bindings.NSInvocationOperationCancelledException);
-}
-
 class NSOperation : NSObject
 {
-	mixin ObjcWrap;
-
-	Object init ()
-	{
-		return invokeObjcSelf!(Object, "init");
-	}
-
+	mixin (ObjcWrap);
+	
 	this ()
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "init")(objcObject);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
 	}
 
 	void start ()
@@ -127,7 +139,17 @@
 
 class NSOperationQueue : NSObject
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	void addOperation (NSOperation op)
 	{
@@ -172,7 +194,17 @@
 
 class NSInvocationOperation : NSOperation
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	Object initWithTarget (Object target, SEL sel, Object arg)
 	{
@@ -181,13 +213,7 @@
 
 	this (Object target, SEL sel, Object arg)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithTarget:selector:object:", Object, SEL, Object)(objcObject, target, sel, arg);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithTarget(target, sel, arg);
 	}
 
 	Object initWithInvocation (NSInvocation inv)
@@ -197,13 +223,7 @@
 
 	this (NSInvocation inv)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithInvocation:", NSInvocation)(objcObject, inv);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithInvocation(inv);
 	}
 
 	NSInvocation invocation ()