--- a/dstep/foundation/NSDebug.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSDebug.d	Sun Jan 03 22:06:11 2010 +0100
@@ -8,10 +8,11 @@
 
 import dstep.foundation.NSAutoreleasePool;
 import dstep.foundation.NSDate;
+import dstep.foundation.NSObjCRuntime;
 import dstep.foundation.NSObject;
 import dstep.foundation.NSPort;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
 
 import bindings = dstep.foundation.NSDebug_bindings;
 
@@ -27,63 +28,63 @@
 	}
 }
 
-template TNSAutoreleasePoolDebugging ()
-{
+const TNSAutoreleasePoolDebugging = `
+
 	static void enableRelease (bool enable)
 	{
-		return invokeObjcSelfClass!(void, "enableRelease:", bool)(enable);
+		return invokeObjcSuperClass!(void, "enableRelease:", bool)(enable);
 	}
 
 	static void showPools ()
 	{
-		return invokeObjcSelfClass!(void, "showPools");
+		return invokeObjcSuperClass!(void, "showPools");
 	}
 
 	static void resetTotalAutoreleasedObjects ()
 	{
-		return invokeObjcSelfClass!(void, "resetTotalAutoreleasedObjects");
+		return invokeObjcSuperClass!(void, "resetTotalAutoreleasedObjects");
 	}
 
 	static NSUInteger totalAutoreleasedObjects ()
 	{
-		return invokeObjcSelfClass!(NSUInteger, "totalAutoreleasedObjects");
+		return invokeObjcSuperClass!(NSUInteger, "totalAutoreleasedObjects");
 	}
 
 	static void enableFreedObjectCheck (bool enable)
 	{
-		return invokeObjcSelfClass!(void, "enableFreedObjectCheck:", bool)(enable);
+		return invokeObjcSuperClass!(void, "enableFreedObjectCheck:", bool)(enable);
 	}
 
 	static NSUInteger autoreleasedObjectCount ()
 	{
-		return invokeObjcSelfClass!(NSUInteger, "autoreleasedObjectCount");
+		return invokeObjcSuperClass!(NSUInteger, "autoreleasedObjectCount");
 	}
 
 	static NSUInteger topAutoreleasePoolCount ()
 	{
-		return invokeObjcSelfClass!(NSUInteger, "topAutoreleasePoolCount");
+		return invokeObjcSuperClass!(NSUInteger, "topAutoreleasePoolCount");
 	}
 
 	static NSUInteger poolCountHighWaterMark ()
 	{
-		return invokeObjcSelfClass!(NSUInteger, "poolCountHighWaterMark");
+		return invokeObjcSuperClass!(NSUInteger, "poolCountHighWaterMark");
 	}
 
 	static void setPoolCountHighWaterMark (NSUInteger count)
 	{
-		return invokeObjcSelfClass!(void, "setPoolCountHighWaterMark:", NSUInteger)(count);
+		return invokeObjcSuperClass!(void, "setPoolCountHighWaterMark:", NSUInteger)(count);
 	}
 
 	static NSUInteger poolCountHighWaterResolution ()
 	{
-		return invokeObjcSelfClass!(NSUInteger, "poolCountHighWaterResolution");
+		return invokeObjcSuperClass!(NSUInteger, "poolCountHighWaterResolution");
 	}
 
 	static void setPoolCountHighWaterResolution (NSUInteger res)
 	{
-		return invokeObjcSelfClass!(void, "setPoolCountHighWaterResolution:", NSUInteger)(res);
+		return invokeObjcSuperClass!(void, "setPoolCountHighWaterResolution:", NSUInteger)(res);
 	}
-}
+`;
 
 bool NSIsFreedObject (Object anObject)
 {