--- a/dstep/foundation/NSExpression.d	Mon Aug 03 15:23:15 2009 +0200
+++ b/dstep/foundation/NSExpression.d	Mon Aug 03 15:31:48 2009 +0200
@@ -36,47 +36,58 @@
 
 	static NSExpression expressionForConstantValue (Object obj)
 	{
-		return invokeObjcSelfClass!(NSExpression, "expressionForConstantValue:", Object)(objreturn result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);	}
+		return invokeObjcSelfClass!(NSExpression, "expressionForConstantValue:", Object)(obj);
+	}
 
 	static NSExpression expressionForEvaluatedObject ()
 	{
-		return invokeObjcSelfClass!(NSExpression, "expressionForEvaluatedObject"return result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);	}
+		return invokeObjcSelfClass!(NSExpression, "expressionForEvaluatedObject");
+	}
 
 	static NSExpression expressionForVariable (NSString string)
 	{
-		return invokeObjcSelfClass!(NSExpression, "expressionForVariable:", NSString)(stringreturn result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);	}
+		return invokeObjcSelfClass!(NSExpression, "expressionForVariable:", NSString)(string);
+	}
 
 	static NSExpression expressionForKeyPath (NSString keyPath)
 	{
-		return invokeObjcSelfClass!(NSExpression, "expressionForKeyPath:", NSString)(keyPathreturn result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);	}
+		return invokeObjcSelfClass!(NSExpression, "expressionForKeyPath:", NSString)(keyPath);
+	}
 
 	static NSExpression expressionForFunction (NSString name, NSArray parameters)
 	{
-		return invokeObjcSelfClass!(NSExpression, "expressionForFunction:arguments:", NSString, NSArray)(name, parametersreturn result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);	}
+		return invokeObjcSelfClass!(NSExpression, "expressionForFunction:arguments:", NSString, NSArray)(name, parameters);
+	}
 
 	static NSExpression expressionForAggregate (NSArray subexpressions)
 	{
-		return invokeObjcSelfClass!(NSExpression, "expressionForAggregate:", NSArray)(subexpressionsreturn result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);	}
+		return invokeObjcSelfClass!(NSExpression, "expressionForAggregate:", NSArray)(subexpressions);
+	}
 
 	static NSExpression expressionForUnionSet (NSExpression left, NSExpression right)
 	{
-		return invokeObjcSelfClass!(NSExpression, "expressionForUnionSet:with:", NSExpression, NSExpression)(left, rightreturn result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);	}
+		return invokeObjcSelfClass!(NSExpression, "expressionForUnionSet:with:", NSExpression, NSExpression)(left, right);
+	}
 
 	static NSExpression expressionForIntersectSet (NSExpression left, NSExpression right)
 	{
-		return invokeObjcSelfClass!(NSExpression, "expressionForIntersectSet:with:", NSExpression, NSExpression)(left, rightreturn result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);	}
+		return invokeObjcSelfClass!(NSExpression, "expressionForIntersectSet:with:", NSExpression, NSExpression)(left, right);
+	}
 
 	static NSExpression expressionForMinusSet (NSExpression left, NSExpression right)
 	{
-		return invokeObjcSelfClass!(NSExpression, "expressionForMinusSet:with:", NSExpression, NSExpression)(left, rightreturn result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);	}
+		return invokeObjcSelfClass!(NSExpression, "expressionForMinusSet:with:", NSExpression, NSExpression)(left, right);
+	}
 
 	static NSExpression expressionForSubquery (NSExpression expression, NSString variable, Object predicate)
 	{
-		return invokeObjcSelfClass!(NSExpression, "expressionForSubquery:usingIteratorVariable:predicate:", NSExpression, NSString, Object)(expression, variable, predicatereturn result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);	}
+		return invokeObjcSelfClass!(NSExpression, "expressionForSubquery:usingIteratorVariable:predicate:", NSExpression, NSString, Object)(expression, variable, predicate);
+	}
 
 	static NSExpression expressionForFunction (NSExpression target, NSString name, NSArray parameters)
 	{
-		return invokeObjcSelfClass!(NSExpression, "expressionForFunction:selectorName:arguments:", NSExpression, NSString, NSArray)(target, name, parametersreturn result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);	}
+		return invokeObjcSelfClass!(NSExpression, "expressionForFunction:selectorName:arguments:", NSExpression, NSString, NSArray)(target, name, parameters);
+	}
 
 	Object initWithExpressionType (uint type)
 	{
@@ -121,7 +132,9 @@
 
 	NSExpression operand ()
 	{
-		id result = invokeObjcSelf!(id, "operand"return result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);	}
+		id result = invokeObjcSelf!(id, "operand");
+		return result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);
+	}
 
 	NSArray arguments ()
 	{
@@ -140,11 +153,15 @@
 
 	NSExpression leftExpression ()
 	{
-		id result = invokeObjcSelf!(id, "leftExpression"return result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);	}
+		id result = invokeObjcSelf!(id, "leftExpression");
+		return result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);
+	}
 
 	NSExpression rightExpression ()
 	{
-		id result = invokeObjcSelf!(id, "rightExpression"return result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);	}
+		id result = invokeObjcSelf!(id, "rightExpression");
+		return result is this.objcObject ? this : (result !is null ? new NSExpression(result) : null);
+	}
 
 	Object expressionValueWithObject (Object object, NSMutableDictionary context)
 	{