--- a/dstep/foundation/NSScriptCommandDescription.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSScriptCommandDescription.d	Sun Jan 03 22:06:11 2010 +0100
@@ -7,17 +7,29 @@
 module dstep.foundation.NSScriptCommandDescription;
 
 import dstep.foundation.NSArray;
+import dstep.foundation.NSCoder;
 import dstep.foundation.NSDictionary;
 import dstep.foundation.NSObject;
 import dstep.foundation.NSScriptCommand;
 import dstep.foundation.NSString;
+import dstep.foundation.NSZone;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
 
 class NSScriptCommandDescription : NSObject, INSCoding
 {
-	mixin ObjcWrap;
-
+	mixin (ObjcWrap);	
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
+	
 	Object initWithSuiteName (NSString suiteName, NSString commandName, NSDictionary commandDeclaration)
 	{
 		return invokeObjcSelf!(Object, "initWithSuiteName:commandName:dictionary:", NSString, NSString, NSDictionary)(suiteName, commandName, commandDeclaration);
@@ -25,13 +37,7 @@
 
 	this (NSString suiteName, NSString commandName, NSDictionary commandDeclaration)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithSuiteName:commandName:dictionary:", NSString, NSString, NSDictionary)(objcObject, suiteName, commandName, commandDeclaration);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithSuiteName(suiteName, commandName, commandDeclaration);
 	}
 
 	NSString suiteName ()
@@ -111,13 +117,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);
 	}
 }