--- a/dstep/foundation/NSPortCoder.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSPortCoder.d	Sun Jan 03 22:06:11 2010 +0100
@@ -11,11 +11,37 @@
 import dstep.foundation.NSConnection;
 import dstep.foundation.NSPort;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
+
+const TNSDistributedObjects = `
+
+	Class classForPortCoder ()
+	{
+		return invokeObjcSelf!(Class, "classForPortCoder");
+	}
+	
+	Object replacementObjectForPortCoder (NSPortCoder coder)
+	{
+		return invokeObjcSelf!(Object, "replacementObjectForPortCoder:", NSPortCoder)(coder);
+	}
+	
+	//mixin ObjcBindMethod!(classForPortCoder, "classForPortCoder");
+	//mixin ObjcBindMethod!(replacementObjectForPortCoder, "replacementObjectForPortCoder:");
+`;
 
 class NSPortCoder : NSCoder
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	bool isBycopy ()
 	{
@@ -44,7 +70,7 @@
 
 	static Object portCoderWithReceivePort (NSPort rcvPort, NSPort sndPort, NSArray comps)
 	{
-		return invokeObjcSelfClass!(Object, "portCoderWithReceivePort:sendPort:components:", NSPort, NSPort, NSArray)(rcvPort, sndPort, comps);
+		return invokeObjcSuperClass!(Object, "portCoderWithReceivePort:sendPort:components:", NSPort, NSPort, NSArray)(rcvPort, sndPort, comps);
 	}
 
 	Object initWithReceivePort (NSPort rcvPort, NSPort sndPort, NSArray comps)
@@ -54,24 +80,11 @@
 
 	this (NSPort rcvPort, NSPort sndPort, NSArray comps)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithReceivePort:sendPort:components:", NSPort, NSPort, NSArray)(objcObject, rcvPort, sndPort, comps);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithReceivePort(rcvPort, sndPort, comps);
 	}
 
 	void dispatch ()
 	{
 		return invokeObjcSelf!(void, "dispatch");
 	}
-}
-
-template TNSDistributedObjects ()
-{
-	Class classForPortCoder ();
-	Object replacementObjectForPortCoder (NSPortCoder coder);
-}
-
+}
\ No newline at end of file