--- a/dstep/foundation/NSCharacterSet.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSCharacterSet.d	Sun Jan 03 22:06:11 2010 +0100
@@ -7,12 +7,14 @@
 module dstep.foundation.NSCharacterSet;
 
 import dstep.corefoundation.CFCharacterSet;
+import dstep.foundation.NSCoder;
 import dstep.foundation.NSData;
 import dstep.foundation.NSObject;
 import dstep.foundation.NSRange;
 import dstep.foundation.NSString;
+import dstep.foundation.NSZone;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
 
 enum
 {
@@ -21,101 +23,111 @@
 
 class NSCharacterSet : NSObject, INSCopying, INSMutableCopying, INSCoding
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	static Object controlCharacterSet ()
 	{
-		return invokeObjcSelfClass!(Object, "controlCharacterSet");
+		return invokeObjcSuperClass!(Object, "controlCharacterSet");
 	}
 
 	static Object whitespaceCharacterSet ()
 	{
-		return invokeObjcSelfClass!(Object, "whitespaceCharacterSet");
+		return invokeObjcSuperClass!(Object, "whitespaceCharacterSet");
 	}
 
 	static Object whitespaceAndNewlineCharacterSet ()
 	{
-		return invokeObjcSelfClass!(Object, "whitespaceAndNewlineCharacterSet");
+		return invokeObjcSuperClass!(Object, "whitespaceAndNewlineCharacterSet");
 	}
 
 	static Object decimalDigitCharacterSet ()
 	{
-		return invokeObjcSelfClass!(Object, "decimalDigitCharacterSet");
+		return invokeObjcSuperClass!(Object, "decimalDigitCharacterSet");
 	}
 
 	static Object letterCharacterSet ()
 	{
-		return invokeObjcSelfClass!(Object, "letterCharacterSet");
+		return invokeObjcSuperClass!(Object, "letterCharacterSet");
 	}
 
 	static Object lowercaseLetterCharacterSet ()
 	{
-		return invokeObjcSelfClass!(Object, "lowercaseLetterCharacterSet");
+		return invokeObjcSuperClass!(Object, "lowercaseLetterCharacterSet");
 	}
 
 	static Object uppercaseLetterCharacterSet ()
 	{
-		return invokeObjcSelfClass!(Object, "uppercaseLetterCharacterSet");
+		return invokeObjcSuperClass!(Object, "uppercaseLetterCharacterSet");
 	}
 
 	static Object nonBaseCharacterSet ()
 	{
-		return invokeObjcSelfClass!(Object, "nonBaseCharacterSet");
+		return invokeObjcSuperClass!(Object, "nonBaseCharacterSet");
 	}
 
 	static Object alphanumericCharacterSet ()
 	{
-		return invokeObjcSelfClass!(Object, "alphanumericCharacterSet");
+		return invokeObjcSuperClass!(Object, "alphanumericCharacterSet");
 	}
 
 	static Object decomposableCharacterSet ()
 	{
-		return invokeObjcSelfClass!(Object, "decomposableCharacterSet");
+		return invokeObjcSuperClass!(Object, "decomposableCharacterSet");
 	}
 
 	static Object illegalCharacterSet ()
 	{
-		return invokeObjcSelfClass!(Object, "illegalCharacterSet");
+		return invokeObjcSuperClass!(Object, "illegalCharacterSet");
 	}
 
 	static Object punctuationCharacterSet ()
 	{
-		return invokeObjcSelfClass!(Object, "punctuationCharacterSet");
+		return invokeObjcSuperClass!(Object, "punctuationCharacterSet");
 	}
 
 	static Object capitalizedLetterCharacterSet ()
 	{
-		return invokeObjcSelfClass!(Object, "capitalizedLetterCharacterSet");
+		return invokeObjcSuperClass!(Object, "capitalizedLetterCharacterSet");
 	}
 
 	static Object symbolCharacterSet ()
 	{
-		return invokeObjcSelfClass!(Object, "symbolCharacterSet");
+		return invokeObjcSuperClass!(Object, "symbolCharacterSet");
 	}
 
 	static Object newlineCharacterSet ()
 	{
-		return invokeObjcSelfClass!(Object, "newlineCharacterSet");
+		return invokeObjcSuperClass!(Object, "newlineCharacterSet");
 	}
 
 	static Object characterSetWithRange (NSRange aRange)
 	{
-		return invokeObjcSelfClass!(Object, "characterSetWithRange:", NSRange)(aRange);
+		return invokeObjcSuperClass!(Object, "characterSetWithRange:", NSRange)(aRange);
 	}
 
 	static Object characterSetWithCharactersInString (NSString aString)
 	{
-		return invokeObjcSelfClass!(Object, "characterSetWithCharactersInString:", NSString)(aString);
+		return invokeObjcSuperClass!(Object, "characterSetWithCharactersInString:", NSString)(aString);
 	}
 
 	static Object characterSetWithBitmapRepresentation (NSData data)
 	{
-		return invokeObjcSelfClass!(Object, "characterSetWithBitmapRepresentation:", NSData)(data);
+		return invokeObjcSuperClass!(Object, "characterSetWithBitmapRepresentation:", NSData)(data);
 	}
 
 	static Object characterSetWithContentsOfFile (NSString fName)
 	{
-		return invokeObjcSelfClass!(Object, "characterSetWithContentsOfFile:", NSString)(fName);
+		return invokeObjcSuperClass!(Object, "characterSetWithContentsOfFile:", NSString)(fName);
 	}
 
 	bool characterIsMember (ushort aCharacter)
@@ -171,19 +183,23 @@
 
 	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);
 	}
 }
 
 class NSMutableCharacterSet : NSCharacterSet, INSCopying, INSMutableCopying
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	void addCharactersInRange (NSRange aRange)
 	{