--- a/dstep/foundation/NSUserDefaults.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSUserDefaults.d	Sun Jan 03 22:06:11 2010 +0100
@@ -9,55 +9,78 @@
 import dstep.foundation.NSArray;
 import dstep.foundation.NSData;
 import dstep.foundation.NSDictionary;
-import dstep.foundation.NSMutableDictionary;
+import dstep.foundation.NSObjCRuntime;
 import dstep.foundation.NSObject;
 import dstep.foundation.NSString;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
+
+
 
 import bindings = dstep.foundation.NSUserDefaults_bindings;
 
-const NSString NSGlobalDomain;
-const NSString NSArgumentDomain;
-const NSString NSRegistrationDomain;
-const NSString NSUserDefaultsDidChangeNotification;
+private
+{
+	NSString NSGlobalDomain_;
+	NSString NSArgumentDomain_;
+	NSString NSRegistrationDomain_;
+	NSString NSUserDefaultsDidChangeNotification_;
+}
+
+NSString NSGlobalDomain ()
+{
+	if (NSGlobalDomain_)
+		return NSGlobalDomain_;
+		
+	return NSGlobalDomain_ = new NSString(bindings.NSGlobalDomain);
+}
 
-static this ()
+NSString NSArgumentDomain ()
+{
+	if (NSArgumentDomain_)
+		return NSArgumentDomain_;
+		
+	return NSArgumentDomain_ = new NSString(bindings.NSArgumentDomain);
+}
+
+NSString NSRegistrationDomain ()
 {
-	NSGlobalDomain = new NSString(bindings.NSGlobalDomain);
-	NSArgumentDomain = new NSString(bindings.NSArgumentDomain);
-	NSRegistrationDomain = new NSString(bindings.NSRegistrationDomain);
-	NSUserDefaultsDidChangeNotification = new NSString(bindings.NSUserDefaultsDidChangeNotification);
+	if (NSRegistrationDomain_)
+		return NSRegistrationDomain_;
+		
+	return NSRegistrationDomain_ = new NSString(bindings.NSRegistrationDomain);
+}
+
+NSString NSUserDefaultsDidChangeNotification ()
+{
+	if (NSUserDefaultsDidChangeNotification_)
+		return NSUserDefaultsDidChangeNotification_;
+		
+	return NSUserDefaultsDidChangeNotification_ = new NSString(bindings.NSUserDefaultsDidChangeNotification);
 }
 
 class NSUserDefaults : NSObject
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	static NSUserDefaults standardUserDefaults ()
 	{
-		return invokeObjcSelfClass!(NSUserDefaults, "standardUserDefaults");
+		return invokeObjcSuperClass!(NSUserDefaults, "standardUserDefaults");
 	}
 
 	static void resetStandardUserDefaults ()
 	{
-		return invokeObjcSelfClass!(void, "resetStandardUserDefaults");
-	}
-
-	Object init ()
-	{
-		return invokeObjcSelf!(Object, "init");
-	}
-
-	this ()
-	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "init")(objcObject);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		return invokeObjcSuperClass!(void, "resetStandardUserDefaults");
 	}
 
 	Object initWithUser (NSString username)
@@ -67,13 +90,7 @@
 
 	this (NSString username)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithUser:", NSString)(objcObject, username);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithUser(username);
 	}
 
 	Object objectForKey (NSString defaultName)