--- a/dstep/foundation/NSURLCredential.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSURLCredential.d	Sun Jan 03 22:06:11 2010 +0100
@@ -6,12 +6,12 @@
  */
 module dstep.foundation.NSURLCredential;
 
-import dstep.AvailabilityMacros;
 import dstep.foundation.NSObject;
+import dstep.foundation.NSObjCRuntime;
 import dstep.foundation.NSString;
-import dstep.foundation.NSURLCredentialInternal;
+import dstep.foundation.NSZone;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
 
 alias NSUInteger NSURLCredentialPersistence;
 
@@ -24,7 +24,17 @@
 
 class NSURLCredential : NSObject, INSCopying
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	Object initWithUser (NSString user, NSString password, uint persistence)
 	{
@@ -33,18 +43,12 @@
 
 	this (NSString user, NSString password, uint persistence)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithUser:password:persistence:", NSString, NSString, uint)(objcObject, user, password, persistence);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithUser(user, password, persistence);
 	}
 
 	static NSURLCredential credentialWithUser (NSString user, NSString password, uint persistence)
 	{
-		return invokeObjcSelfClass!(NSURLCredential, "credentialWithUser:password:persistence:", NSString, NSString, uint)(user, password, persistence);
+		return invokeObjcSuperClass!(NSURLCredential, "credentialWithUser:password:persistence:", NSString, NSString, uint)(user, password, persistence);
 	}
 
 	NSString user ()