--- a/dstep/foundation/NSScriptCommand.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSScriptCommand.d	Sun Jan 03 22:06:11 2010 +0100
@@ -7,14 +7,14 @@
 module dstep.foundation.NSScriptCommand;
 
 import dstep.foundation.NSAppleEventDescriptor;
+import dstep.foundation.NSCoder;
 import dstep.foundation.NSDictionary;
-import dstep.foundation.NSMutableDictionary;
 import dstep.foundation.NSObject;
 import dstep.foundation.NSScriptCommandDescription;
-import dstep.foundation.NSScriptObjectSpecifier;
+import dstep.foundation.NSScriptObjectSpecifiers;
 import dstep.foundation.NSString;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
 
 enum
 {
@@ -33,7 +33,17 @@
 
 class NSScriptCommand : NSObject, INSCoding
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	Object initWithCommandDescription (NSScriptCommandDescription commandDef)
 	{
@@ -42,13 +52,7 @@
 
 	this (NSScriptCommandDescription commandDef)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithCommandDescription:", NSScriptCommandDescription)(objcObject, commandDef);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithCommandDescription(commandDef);
 	}
 
 	NSScriptCommandDescription commandDescription ()
@@ -153,7 +157,7 @@
 
 	static NSScriptCommand currentCommand ()
 	{
-		return invokeObjcSelfClass!(NSScriptCommand, "currentCommand");
+		return invokeObjcSuperClass!(NSScriptCommand, "currentCommand");
 	}
 
 	NSAppleEventDescriptor appleEvent ()
@@ -183,13 +187,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);
 	}
 }