--- a/dstep/foundation/NSGeometry.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSGeometry.d	Sun Jan 03 22:06:11 2010 +0100
@@ -6,24 +6,25 @@
  */
 module dstep.foundation.NSGeometry;
 
-import dstep.AvailabilityMacros;
 import dstep.applicationservices.coregraphics.CGBase;
 import dstep.applicationservices.coregraphics.CGGeometry;
 import dstep.foundation.NSCoder;
+import dstep.foundation.NSObjCRuntime;
 import dstep.foundation.NSString;
 import dstep.foundation.NSValue;
+import dstep.internal.Version;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
 
 import bindings = dstep.foundation.NSGeometry_bindings;
 
-alias CGPoint NSPoint;
+alias dstep.applicationservices.coregraphics.CGGeometry.CGPoint NSPoint;
 alias NSPoint* NSPointPointer;
 alias NSPoint* NSPointArray;
-alias CGSize NSSize;
+alias dstep.applicationservices.coregraphics.CGGeometry.CGSize NSSize;
 alias NSSize* NSSizePointer;
 alias NSSize* NSSizeArray;
-alias CGRect NSRect;
+alias dstep.applicationservices.coregraphics.CGGeometry.CGRect NSRect;
 alias NSRect* NSRectPointer;
 alias NSRect* NSRectArray;
 alias NSUInteger NSRectEdge;
@@ -38,8 +39,8 @@
 	}
 }
 
-template TNSGeometryCoding ()
-{
+const TNSGeometryCoding = `
+
 	void encodePoint (NSPoint point)
 	{
 		return invokeObjcSelf!(void, "encodePoint:", NSPoint)(point);
@@ -69,23 +70,23 @@
 	{
 		return invokeObjcSelf!(NSRect, "decodeRect");
 	}
-}
+`;
 
-template TNSValueGeometryExtensions ()
-{
+const TNSValueGeometryExtensions = `
+
 	static NSValue valueWithPoint (NSPoint point)
 	{
-		return invokeObjcSelfClass!(NSValue, "valueWithPoint:", NSPoint)(point);
+		return invokeObjcSuperClass!(NSValue, "valueWithPoint:", NSPoint)(point);
 	}
 
 	static NSValue valueWithSize (NSSize size)
 	{
-		return invokeObjcSelfClass!(NSValue, "valueWithSize:", NSSize)(size);
+		return invokeObjcSuperClass!(NSValue, "valueWithSize:", NSSize)(size);
 	}
 
 	static NSValue valueWithRect (NSRect rect)
 	{
-		return invokeObjcSelfClass!(NSValue, "valueWithRect:", NSRect)(rect);
+		return invokeObjcSuperClass!(NSValue, "valueWithRect:", NSRect)(rect);
 	}
 
 	NSPoint pointValue ()
@@ -102,7 +103,7 @@
 	{
 		return invokeObjcSelf!(NSRect, "rectValue");
 	}
-}
+`;
 
 NSString NSStringFromPoint (NSPoint aPoint)
 {