--- a/dstep/foundation/NSDistantObject.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSDistantObject.d	Sun Jan 03 22:06:11 2010 +0100
@@ -8,18 +8,29 @@
 
 import dstep.foundation.NSCoder;
 import dstep.foundation.NSConnection;
+import dstep.foundation.NSObject;
 import dstep.foundation.NSProxy;
-import dstep.foundation.Protocol;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
+import dstep.objc.runtime;
 
 class NSDistantObject : NSProxy, INSCoding
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	static NSDistantObject proxyWithTarget (Object target, NSConnection connection)
 	{
-		return invokeObjcSelfClass!(NSDistantObject, "proxyWithTarget:connection:", Object, NSConnection)(target, connection);
+		return invokeObjcSuperClass!(NSDistantObject, "proxyWithTarget:connection:", Object, NSConnection)(target, connection);
 	}
 
 	Object initWithTarget (Object target, NSConnection connection)
@@ -29,36 +40,19 @@
 
 	this (Object target, NSConnection connection)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithTarget:connection:", Object, NSConnection)(objcObject, target, connection);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithTarget(target, connection);
 	}
 
 	static NSDistantObject proxyWithLocal (Object target, NSConnection connection)
 	{
-		return invokeObjcSelfClass!(NSDistantObject, "proxyWithLocal:connection:", Object, NSConnection)(target, connection);
+		return invokeObjcSuperClass!(NSDistantObject, "proxyWithLocal:connection:", Object, NSConnection)(target, connection);
 	}
 
 	Object initWithLocal (Object target, NSConnection connection)
 	{
 		return invokeObjcSelf!(Object, "initWithLocal:connection:", Object, NSConnection)(target, connection);
 	}
-
-	this (Object target, NSConnection connection)
-	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithLocal:connection:", Object, NSConnection)(objcObject, target, connection);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
-	}
-
+	
 	void setProtocolForProxy (Protocol proto)
 	{
 		return invokeObjcSelf!(void, "setProtocolForProxy:", Protocol)(proto);
@@ -81,13 +75,7 @@
 
 	this (NSCoder aDecoder)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithCoder:", NSCoder)(objcObject, aDecoder);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithCoder(aDecoder);		
 	}
 }