--- a/dstep/foundation/NSAppleEventDescriptor.d	Mon Aug 03 15:23:15 2009 +0200
+++ b/dstep/foundation/NSAppleEventDescriptor.d	Mon Aug 03 15:31:48 2009 +0200
@@ -18,47 +18,58 @@
 
 	static NSAppleEventDescriptor nullDescriptor ()
 	{
-		return invokeObjcSelfClass!(NSAppleEventDescriptor, "nullDescriptor"return result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		return invokeObjcSelfClass!(NSAppleEventDescriptor, "nullDescriptor");
+	}
 
 	static NSAppleEventDescriptor descriptorWithDescriptorType (uint descriptorType, void* bytes, NSUInteger byteCount)
 	{
-		return invokeObjcSelfClass!(NSAppleEventDescriptor, "descriptorWithDescriptorType:bytes:length:", uint, void*, NSUInteger)(descriptorType, bytes, byteCountreturn result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		return invokeObjcSelfClass!(NSAppleEventDescriptor, "descriptorWithDescriptorType:bytes:length:", uint, void*, NSUInteger)(descriptorType, bytes, byteCount);
+	}
 
 	static NSAppleEventDescriptor descriptorWithDescriptorType (uint descriptorType, NSData data)
 	{
-		return invokeObjcSelfClass!(NSAppleEventDescriptor, "descriptorWithDescriptorType:data:", uint, NSData)(descriptorType, datareturn result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		return invokeObjcSelfClass!(NSAppleEventDescriptor, "descriptorWithDescriptorType:data:", uint, NSData)(descriptorType, data);
+	}
 
 	static NSAppleEventDescriptor descriptorWithBoolean (ubyte boolean)
 	{
-		return invokeObjcSelfClass!(NSAppleEventDescriptor, "descriptorWithBoolean:", ubyte)(booleanreturn result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		return invokeObjcSelfClass!(NSAppleEventDescriptor, "descriptorWithBoolean:", ubyte)(boolean);
+	}
 
 	static NSAppleEventDescriptor descriptorWithEnumCode (uint enumerator)
 	{
-		return invokeObjcSelfClass!(NSAppleEventDescriptor, "descriptorWithEnumCode:", uint)(enumeratorreturn result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		return invokeObjcSelfClass!(NSAppleEventDescriptor, "descriptorWithEnumCode:", uint)(enumerator);
+	}
 
 	static NSAppleEventDescriptor descriptorWithInt32 (int signedInt)
 	{
-		return invokeObjcSelfClass!(NSAppleEventDescriptor, "descriptorWithInt32:", int)(signedIntreturn result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		return invokeObjcSelfClass!(NSAppleEventDescriptor, "descriptorWithInt32:", int)(signedInt);
+	}
 
 	static NSAppleEventDescriptor descriptorWithTypeCode (uint typeCode)
 	{
-		return invokeObjcSelfClass!(NSAppleEventDescriptor, "descriptorWithTypeCode:", uint)(typeCodereturn result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		return invokeObjcSelfClass!(NSAppleEventDescriptor, "descriptorWithTypeCode:", uint)(typeCode);
+	}
 
 	static NSAppleEventDescriptor descriptorWithString (NSString string)
 	{
-		return invokeObjcSelfClass!(NSAppleEventDescriptor, "descriptorWithString:", NSString)(stringreturn result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		return invokeObjcSelfClass!(NSAppleEventDescriptor, "descriptorWithString:", NSString)(string);
+	}
 
 	static NSAppleEventDescriptor appleEventWithEventClass (uint eventClass, uint eventID, NSAppleEventDescriptor targetDescriptor, short returnID, int transactionID)
 	{
-		return invokeObjcSelfClass!(NSAppleEventDescriptor, "appleEventWithEventClass:eventID:targetDescriptor:returnID:transactionID:", uint, uint, NSAppleEventDescriptor, short, int)(eventClass, eventID, targetDescriptor, returnID, transactionIDreturn result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		return invokeObjcSelfClass!(NSAppleEventDescriptor, "appleEventWithEventClass:eventID:targetDescriptor:returnID:transactionID:", uint, uint, NSAppleEventDescriptor, short, int)(eventClass, eventID, targetDescriptor, returnID, transactionID);
+	}
 
 	static NSAppleEventDescriptor listDescriptor ()
 	{
-		return invokeObjcSelfClass!(NSAppleEventDescriptor, "listDescriptor"return result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		return invokeObjcSelfClass!(NSAppleEventDescriptor, "listDescriptor");
+	}
 
 	static NSAppleEventDescriptor recordDescriptor ()
 	{
-		return invokeObjcSelfClass!(NSAppleEventDescriptor, "recordDescriptor"return result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		return invokeObjcSelfClass!(NSAppleEventDescriptor, "recordDescriptor");
+	}
 
 	Object initWithAEDescNoCopy (AEDesc* aeDesc)
 	{
@@ -223,7 +234,9 @@
 
 	NSAppleEventDescriptor paramDescriptorForKeyword (uint keyword)
 	{
-		id result = invokeObjcSelf!(id, "paramDescriptorForKeyword:", uint)(keywordreturn result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		id result = invokeObjcSelf!(id, "paramDescriptorForKeyword:", uint)(keyword);
+		return result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);
+	}
 
 	void removeParamDescriptorWithKeyword (uint keyword)
 	{
@@ -237,7 +250,9 @@
 
 	NSAppleEventDescriptor attributeDescriptorForKeyword (uint keyword)
 	{
-		id result = invokeObjcSelf!(id, "attributeDescriptorForKeyword:", uint)(keywordreturn result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		id result = invokeObjcSelf!(id, "attributeDescriptorForKeyword:", uint)(keyword);
+		return result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);
+	}
 
 	NSInteger numberOfItems ()
 	{
@@ -251,7 +266,9 @@
 
 	NSAppleEventDescriptor descriptorAtIndex (NSInteger index)
 	{
-		id result = invokeObjcSelf!(id, "descriptorAtIndex:", NSInteger)(indexreturn result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		id result = invokeObjcSelf!(id, "descriptorAtIndex:", NSInteger)(index);
+		return result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);
+	}
 
 	void removeDescriptorAtIndex (NSInteger index)
 	{
@@ -265,7 +282,9 @@
 
 	NSAppleEventDescriptor descriptorForKeyword (uint keyword)
 	{
-		id result = invokeObjcSelf!(id, "descriptorForKeyword:", uint)(keywordreturn result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		id result = invokeObjcSelf!(id, "descriptorForKeyword:", uint)(keyword);
+		return result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);
+	}
 
 	void removeDescriptorWithKeyword (uint keyword)
 	{
@@ -279,7 +298,9 @@
 
 	NSAppleEventDescriptor coerceToDescriptorType (uint descriptorType)
 	{
-		id result = invokeObjcSelf!(id, "coerceToDescriptorType:", uint)(descriptorTypereturn result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);	}
+		id result = invokeObjcSelf!(id, "coerceToDescriptorType:", uint)(descriptorType);
+		return result is this.objcObject ? this : (result !is null ? new NSAppleEventDescriptor(result) : null);
+	}
 
 	Object copyWithZone (NSZone* zone)
 	{