--- a/dstep/foundation/NSHTTPCookieStorage.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSHTTPCookieStorage.d	Sun Jan 03 22:06:11 2010 +0100
@@ -6,21 +6,24 @@
  */
 module dstep.foundation.NSHTTPCookieStorage;
 
-import dstep.AvailabilityMacros;
 import dstep.foundation.NSArray;
 import dstep.foundation.NSHTTPCookie;
-import dstep.foundation.NSHTTPCookieStorageInternal;
+import dstep.foundation.NSObjCRuntime;
 import dstep.foundation.NSObject;
+import dstep.foundation.NSString;
 import dstep.foundation.NSURL;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
 
 import bindings = dstep.foundation.NSHTTPCookieStorage_bindings;
 
 alias NSUInteger NSHTTPCookieAcceptPolicy;
 
-const NSString NSHTTPCookieManagerAcceptPolicyChangedNotification;
-const NSString NSHTTPCookieManagerCookiesChangedNotification;
+private
+{
+	NSString NSHTTPCookieManagerAcceptPolicyChangedNotification_;
+	NSString NSHTTPCookieManagerCookiesChangedNotification_;
+}
 
 enum
 {
@@ -29,19 +32,39 @@
 	NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain
 }
 
-static this ()
+NSString NSHTTPCookieManagerAcceptPolicyChangedNotification ()
 {
-	NSHTTPCookieManagerAcceptPolicyChangedNotification = new NSString(bindings.NSHTTPCookieManagerAcceptPolicyChangedNotification);
-	NSHTTPCookieManagerCookiesChangedNotification = new NSString(bindings.NSHTTPCookieManagerCookiesChangedNotification);
+	if (NSHTTPCookieManagerAcceptPolicyChangedNotification_)
+		return NSHTTPCookieManagerAcceptPolicyChangedNotification_;
+		
+	return NSHTTPCookieManagerAcceptPolicyChangedNotification_ = new NSString(bindings.NSHTTPCookieManagerAcceptPolicyChangedNotification);
+}
+
+NSString NSHTTPCookieManagerCookiesChangedNotification ()
+{
+	if (NSHTTPCookieManagerCookiesChangedNotification_)
+		return NSHTTPCookieManagerCookiesChangedNotification_;
+		
+	return NSHTTPCookieManagerCookiesChangedNotification_ = new NSString(bindings.NSHTTPCookieManagerCookiesChangedNotification);
 }
 
 class NSHTTPCookieStorage : NSObject
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	static NSHTTPCookieStorage sharedHTTPCookieStorage ()
 	{
-		return invokeObjcSelfClass!(NSHTTPCookieStorage, "sharedHTTPCookieStorage");
+		return invokeObjcSuperClass!(NSHTTPCookieStorage, "sharedHTTPCookieStorage");
 	}
 
 	NSArray cookies ()