diff --git a/Foundation/NSAddressCheckingResult.ml b/Foundation/NSAddressCheckingResult.ml
index 22b7ccce..d38704b5 100644
--- a/Foundation/NSAddressCheckingResult.ml
+++ b/Foundation/NSAddressCheckingResult.ml
@@ -17,7 +17,7 @@ let encodeWithCoder x self = msg_send ~self ~cmd:(selector "encodeWithCoder:") ~
 let initWithCoder x self = msg_send ~self ~cmd:(selector "initWithCoder:") ~typ:(id @-> returning id) x
 let initWithRange x ~components self = msg_send ~self ~cmd:(selector "initWithRange:components:") ~typ:(NSRange.t @-> id @-> returning id) x components
 let initWithRange' x ~components ~underlyingResult self = msg_send ~self ~cmd:(selector "initWithRange:components:underlyingResult:") ~typ:(NSRange.t @-> id @-> (ptr void) @-> returning id) x components underlyingResult
-let range self = msg_send ~self ~cmd:(selector "range") ~typ:(returning NSRange.t)
+let range self = msg_send_stret ~self ~cmd:(selector "range") ~typ:(returning NSRange.t) ~return_type:NSRange.t
 let resultByAdjustingRangesWithOffset x self = msg_send ~self ~cmd:(selector "resultByAdjustingRangesWithOffset:") ~typ:(llong @-> returning id) (LLong.of_int x)
 let resultType self = msg_send ~self ~cmd:(selector "resultType") ~typ:(returning ullong)
 let underlyingResult self = msg_send ~self ~cmd:(selector "underlyingResult") ~typ:(returning (ptr void))
\ No newline at end of file
diff --git a/Foundation/NSAffineTransform.ml b/Foundation/NSAffineTransform.ml
index ae1f071f..1c7b5d0f 100644
--- a/Foundation/NSAffineTransform.ml
+++ b/Foundation/NSAffineTransform.ml
@@ -27,7 +27,7 @@ let rotateByRadians x self = msg_send ~self ~cmd:(selector "rotateByRadians:") ~
 let scaleBy x self = msg_send ~self ~cmd:(selector "scaleBy:") ~typ:(double @-> returning void) x
 let scaleXBy x ~yBy self = msg_send ~self ~cmd:(selector "scaleXBy:yBy:") ~typ:(double @-> double @-> returning void) x yBy
 let setTransformStruct x self = msg_send ~self ~cmd:(selector "setTransformStruct:") ~typ:(void @-> returning void) x
-let transformPoint x self = msg_send ~self ~cmd:(selector "transformPoint:") ~typ:(CGPoint.t @-> returning CGPoint.t) x
-let transformSize x self = msg_send ~self ~cmd:(selector "transformSize:") ~typ:(CGSize.t @-> returning CGSize.t) x
+let transformPoint x self = msg_send_stret ~self ~cmd:(selector "transformPoint:") ~typ:(CGPoint.t @-> returning CGPoint.t) ~return_type:CGPoint.t x
+let transformSize x self = msg_send_stret ~self ~cmd:(selector "transformSize:") ~typ:(CGSize.t @-> returning CGSize.t) ~return_type:CGSize.t x
 let transformStruct self = msg_send ~self ~cmd:(selector "transformStruct") ~typ:(returning void)
 let translateXBy x ~yBy self = msg_send ~self ~cmd:(selector "translateXBy:yBy:") ~typ:(double @-> double @-> returning void) x yBy
\ No newline at end of file
diff --git a/Foundation/NSAttributedStringMarkdownSourcePosition.ml b/Foundation/NSAttributedStringMarkdownSourcePosition.ml
index bab285ec..efae0488 100644
--- a/Foundation/NSAttributedStringMarkdownSourcePosition.ml
+++ b/Foundation/NSAttributedStringMarkdownSourcePosition.ml
@@ -22,7 +22,7 @@ let hash self = msg_send ~self ~cmd:(selector "hash") ~typ:(returning ullong)
 let initWithCoder x self = msg_send ~self ~cmd:(selector "initWithCoder:") ~typ:(id @-> returning id) x
 let initWithStart x ~end_ self = msg_send ~self ~cmd:(selector "initWithStart:end:") ~typ:(void @-> void @-> returning id) x end_
 let initWithStartLine x ~startColumn ~endLine ~endColumn self = msg_send ~self ~cmd:(selector "initWithStartLine:startColumn:endLine:endColumn:") ~typ:(llong @-> llong @-> llong @-> llong @-> returning id) (LLong.of_int x) (LLong.of_int startColumn) (LLong.of_int endLine) (LLong.of_int endColumn)
-let rangeInString x self = msg_send ~self ~cmd:(selector "rangeInString:") ~typ:(id @-> returning NSRange.t) x
+let rangeInString x self = msg_send_stret ~self ~cmd:(selector "rangeInString:") ~typ:(id @-> returning NSRange.t) ~return_type:NSRange.t x
 let setOffsetsFromUTF8 x ~usingCache self = msg_send ~self ~cmd:(selector "setOffsetsFromUTF8:usingCache:") ~typ:(string @-> (ptr void) @-> returning void) x usingCache
 let startColumn self = msg_send ~self ~cmd:(selector "startColumn") ~typ:(returning llong)
 let startLine self = msg_send ~self ~cmd:(selector "startLine") ~typ:(returning llong)
diff --git a/Foundation/NSCoder.ml b/Foundation/NSCoder.ml
index c5b9c504..d07027f1 100644
--- a/Foundation/NSCoder.ml
+++ b/Foundation/NSCoder.ml
@@ -38,14 +38,14 @@ let decodeObjectOfClass x ~forKey self = msg_send ~self ~cmd:(selector "decodeOb
 let decodeObjectOfClass' x ~forKey ~error self = msg_send ~self ~cmd:(selector "decodeObjectOfClass:forKey:error:") ~typ:(_Class @-> id @-> (ptr id) @-> returning id) x forKey error
 let decodeObjectOfClasses x ~forKey self = msg_send ~self ~cmd:(selector "decodeObjectOfClasses:forKey:") ~typ:(id @-> id @-> returning id) x forKey
 let decodeObjectOfClasses' x ~forKey ~error self = msg_send ~self ~cmd:(selector "decodeObjectOfClasses:forKey:error:") ~typ:(id @-> id @-> (ptr id) @-> returning id) x forKey error
-let decodePoint self = msg_send ~self ~cmd:(selector "decodePoint") ~typ:(returning CGPoint.t)
-let decodePointForKey x self = msg_send ~self ~cmd:(selector "decodePointForKey:") ~typ:(id @-> returning CGPoint.t) x
+let decodePoint self = msg_send_stret ~self ~cmd:(selector "decodePoint") ~typ:(returning CGPoint.t) ~return_type:CGPoint.t
+let decodePointForKey x self = msg_send_stret ~self ~cmd:(selector "decodePointForKey:") ~typ:(id @-> returning CGPoint.t) ~return_type:CGPoint.t x
 let decodePropertyList self = msg_send ~self ~cmd:(selector "decodePropertyList") ~typ:(returning id)
 let decodePropertyListForKey x self = msg_send ~self ~cmd:(selector "decodePropertyListForKey:") ~typ:(id @-> returning id) x
-let decodeRect self = msg_send ~self ~cmd:(selector "decodeRect") ~typ:(returning CGRect.t)
-let decodeRectForKey x self = msg_send ~self ~cmd:(selector "decodeRectForKey:") ~typ:(id @-> returning CGRect.t) x
-let decodeSize self = msg_send ~self ~cmd:(selector "decodeSize") ~typ:(returning CGSize.t)
-let decodeSizeForKey x self = msg_send ~self ~cmd:(selector "decodeSizeForKey:") ~typ:(id @-> returning CGSize.t) x
+let decodeRect self = msg_send_stret ~self ~cmd:(selector "decodeRect") ~typ:(returning CGRect.t) ~return_type:CGRect.t
+let decodeRectForKey x self = msg_send_stret ~self ~cmd:(selector "decodeRectForKey:") ~typ:(id @-> returning CGRect.t) ~return_type:CGRect.t x
+let decodeSize self = msg_send_stret ~self ~cmd:(selector "decodeSize") ~typ:(returning CGSize.t) ~return_type:CGSize.t
+let decodeSizeForKey x self = msg_send_stret ~self ~cmd:(selector "decodeSizeForKey:") ~typ:(id @-> returning CGSize.t) ~return_type:CGSize.t x
 let decodeTopLevelObjectAndReturnError x self = msg_send ~self ~cmd:(selector "decodeTopLevelObjectAndReturnError:") ~typ:((ptr id) @-> returning id) x
 let decodeTopLevelObjectForKey x ~error self = msg_send ~self ~cmd:(selector "decodeTopLevelObjectForKey:error:") ~typ:(id @-> (ptr id) @-> returning id) x error
 let decodeTopLevelObjectOfClass x ~forKey ~error self = msg_send ~self ~cmd:(selector "decodeTopLevelObjectOfClass:forKey:error:") ~typ:(_Class @-> id @-> (ptr id) @-> returning id) x forKey error
diff --git a/Foundation/NSComplexRegularExpressionCheckingResult.ml b/Foundation/NSComplexRegularExpressionCheckingResult.ml
index 314b463d..7c287eae 100644
--- a/Foundation/NSComplexRegularExpressionCheckingResult.ml
+++ b/Foundation/NSComplexRegularExpressionCheckingResult.ml
@@ -15,7 +15,7 @@ let dealloc self = msg_send ~self ~cmd:(selector "dealloc") ~typ:(returning void
 let initWithRangeArray x ~regularExpression self = msg_send ~self ~cmd:(selector "initWithRangeArray:regularExpression:") ~typ:(id @-> id @-> returning id) x regularExpression
 let initWithRanges x ~count ~regularExpression self = msg_send ~self ~cmd:(selector "initWithRanges:count:regularExpression:") ~typ:((ptr NSRange.t) @-> ullong @-> id @-> returning id) x (ULLong.of_int count) regularExpression
 let numberOfRanges self = msg_send ~self ~cmd:(selector "numberOfRanges") ~typ:(returning ullong)
-let range self = msg_send ~self ~cmd:(selector "range") ~typ:(returning NSRange.t)
+let range self = msg_send_stret ~self ~cmd:(selector "range") ~typ:(returning NSRange.t) ~return_type:NSRange.t
 let rangeArray self = msg_send ~self ~cmd:(selector "rangeArray") ~typ:(returning id)
-let rangeAtIndex x self = msg_send ~self ~cmd:(selector "rangeAtIndex:") ~typ:(ullong @-> returning NSRange.t) (ULLong.of_int x)
+let rangeAtIndex x self = msg_send_stret ~self ~cmd:(selector "rangeAtIndex:") ~typ:(ullong @-> returning NSRange.t) ~return_type:NSRange.t (ULLong.of_int x)
 let regularExpression self = msg_send ~self ~cmd:(selector "regularExpression") ~typ:(returning id)
\ No newline at end of file
diff --git a/Foundation/NSDateCheckingResult.ml b/Foundation/NSDateCheckingResult.ml
index 5d7a2dd2..0ef0d9a3 100644
--- a/Foundation/NSDateCheckingResult.ml
+++ b/Foundation/NSDateCheckingResult.ml
@@ -25,7 +25,7 @@ let initWithRange4 x ~date ~timeZone ~duration ~referenceDate ~underlyingResult
 let initWithRange5 x ~date ~timeZone ~duration ~referenceDate ~underlyingResult ~timeIsSignificant ~timeIsApproximate ~timeIsPast self = msg_send ~self ~cmd:(selector "initWithRange:date:timeZone:duration:referenceDate:underlyingResult:timeIsSignificant:timeIsApproximate:timeIsPast:") ~typ:(NSRange.t @-> id @-> id @-> double @-> id @-> (ptr void) @-> bool @-> bool @-> bool @-> returning id) x date timeZone duration referenceDate underlyingResult timeIsSignificant timeIsApproximate timeIsPast
 let initWithRange6 x ~date ~timeZone ~duration ~referenceDate ~underlyingResult ~timeIsSignificant ~timeIsApproximate ~timeIsPast ~leadingText ~trailingText self = msg_send ~self ~cmd:(selector "initWithRange:date:timeZone:duration:referenceDate:underlyingResult:timeIsSignificant:timeIsApproximate:timeIsPast:leadingText:trailingText:") ~typ:(NSRange.t @-> id @-> id @-> double @-> id @-> (ptr void) @-> bool @-> bool @-> bool @-> id @-> id @-> returning id) x date timeZone duration referenceDate underlyingResult timeIsSignificant timeIsApproximate timeIsPast leadingText trailingText
 let leadingText self = msg_send ~self ~cmd:(selector "leadingText") ~typ:(returning id)
-let range self = msg_send ~self ~cmd:(selector "range") ~typ:(returning NSRange.t)
+let range self = msg_send_stret ~self ~cmd:(selector "range") ~typ:(returning NSRange.t) ~return_type:NSRange.t
 let referenceDate self = msg_send ~self ~cmd:(selector "referenceDate") ~typ:(returning id)
 let resultByAdjustingRangesWithOffset x self = msg_send ~self ~cmd:(selector "resultByAdjustingRangesWithOffset:") ~typ:(llong @-> returning id) (LLong.of_int x)
 let resultType self = msg_send ~self ~cmd:(selector "resultType") ~typ:(returning ullong)
diff --git a/Foundation/NSExtendedRegularExpressionCheckingResult.ml b/Foundation/NSExtendedRegularExpressionCheckingResult.ml
index abaef2ef..f7f5a48f 100644
--- a/Foundation/NSExtendedRegularExpressionCheckingResult.ml
+++ b/Foundation/NSExtendedRegularExpressionCheckingResult.ml
@@ -15,7 +15,7 @@ let dealloc self = msg_send ~self ~cmd:(selector "dealloc") ~typ:(returning void
 let initWithRangeArray x ~regularExpression self = msg_send ~self ~cmd:(selector "initWithRangeArray:regularExpression:") ~typ:(id @-> id @-> returning id) x regularExpression
 let initWithRanges x ~count ~regularExpression self = msg_send ~self ~cmd:(selector "initWithRanges:count:regularExpression:") ~typ:((ptr NSRange.t) @-> ullong @-> id @-> returning id) x (ULLong.of_int count) regularExpression
 let numberOfRanges self = msg_send ~self ~cmd:(selector "numberOfRanges") ~typ:(returning ullong)
-let range self = msg_send ~self ~cmd:(selector "range") ~typ:(returning NSRange.t)
+let range self = msg_send_stret ~self ~cmd:(selector "range") ~typ:(returning NSRange.t) ~return_type:NSRange.t
 let rangeArray self = msg_send ~self ~cmd:(selector "rangeArray") ~typ:(returning id)
-let rangeAtIndex x self = msg_send ~self ~cmd:(selector "rangeAtIndex:") ~typ:(ullong @-> returning NSRange.t) (ULLong.of_int x)
+let rangeAtIndex x self = msg_send_stret ~self ~cmd:(selector "rangeAtIndex:") ~typ:(ullong @-> returning NSRange.t) ~return_type:NSRange.t (ULLong.of_int x)
 let regularExpression self = msg_send ~self ~cmd:(selector "regularExpression") ~typ:(returning id)
\ No newline at end of file
diff --git a/Foundation/NSGrammarCheckingResult.ml b/Foundation/NSGrammarCheckingResult.ml
index d53df62b..f9f46c87 100644
--- a/Foundation/NSGrammarCheckingResult.ml
+++ b/Foundation/NSGrammarCheckingResult.ml
@@ -16,6 +16,6 @@ let encodeWithCoder x self = msg_send ~self ~cmd:(selector "encodeWithCoder:") ~
 let grammarDetails self = msg_send ~self ~cmd:(selector "grammarDetails") ~typ:(returning id)
 let initWithCoder x self = msg_send ~self ~cmd:(selector "initWithCoder:") ~typ:(id @-> returning id) x
 let initWithRange x ~details self = msg_send ~self ~cmd:(selector "initWithRange:details:") ~typ:(NSRange.t @-> id @-> returning id) x details
-let range self = msg_send ~self ~cmd:(selector "range") ~typ:(returning NSRange.t)
+let range self = msg_send_stret ~self ~cmd:(selector "range") ~typ:(returning NSRange.t) ~return_type:NSRange.t
 let resultByAdjustingRangesWithOffset x self = msg_send ~self ~cmd:(selector "resultByAdjustingRangesWithOffset:") ~typ:(llong @-> returning id) (LLong.of_int x)
 let resultType self = msg_send ~self ~cmd:(selector "resultType") ~typ:(returning ullong)
\ No newline at end of file
diff --git a/Foundation/NSIndexSet.ml b/Foundation/NSIndexSet.ml
index 47101db1..a29dc592 100644
--- a/Foundation/NSIndexSet.ml
+++ b/Foundation/NSIndexSet.ml
@@ -51,6 +51,6 @@ let isEqual x self = msg_send ~self ~cmd:(selector "isEqual:") ~typ:(id @-> retu
 let isEqualToIndexSet x self = msg_send ~self ~cmd:(selector "isEqualToIndexSet:") ~typ:(id @-> returning bool) x
 let lastIndex self = msg_send ~self ~cmd:(selector "lastIndex") ~typ:(returning ullong)
 let mutableCopyWithZone x self = msg_send ~self ~cmd:(selector "mutableCopyWithZone:") ~typ:((ptr void) @-> returning id) x
-let rangeAtIndex x self = msg_send ~self ~cmd:(selector "rangeAtIndex:") ~typ:(ullong @-> returning NSRange.t) (ULLong.of_int x)
+let rangeAtIndex x self = msg_send_stret ~self ~cmd:(selector "rangeAtIndex:") ~typ:(ullong @-> returning NSRange.t) ~return_type:NSRange.t (ULLong.of_int x)
 let rangeCount self = msg_send ~self ~cmd:(selector "rangeCount") ~typ:(returning ullong)
 let replacementObjectForPortCoder x self = msg_send ~self ~cmd:(selector "replacementObjectForPortCoder:") ~typ:(id @-> returning id) x
\ No newline at end of file
diff --git a/Foundation/NSLinguisticTagger.ml b/Foundation/NSLinguisticTagger.ml
index 9040dce4..cb0275dd 100644
--- a/Foundation/NSLinguisticTagger.ml
+++ b/Foundation/NSLinguisticTagger.ml
@@ -19,7 +19,7 @@ let enumerateTagsInRange' x ~unit ~scheme ~options ~usingBlock self = msg_send ~
 let initWithTagSchemes x ~options self = msg_send ~self ~cmd:(selector "initWithTagSchemes:options:") ~typ:(id @-> ullong @-> returning id) x (ULLong.of_int options)
 let orthographyAtIndex x ~effectiveRange self = msg_send ~self ~cmd:(selector "orthographyAtIndex:effectiveRange:") ~typ:(ullong @-> (ptr NSRange.t) @-> returning id) (ULLong.of_int x) effectiveRange
 let possibleTagsAtIndex x ~scheme ~tokenRange ~sentenceRange ~scores self = msg_send ~self ~cmd:(selector "possibleTagsAtIndex:scheme:tokenRange:sentenceRange:scores:") ~typ:(ullong @-> id @-> (ptr NSRange.t) @-> (ptr NSRange.t) @-> (ptr id) @-> returning id) (ULLong.of_int x) scheme tokenRange sentenceRange scores
-let sentenceRangeForRange x self = msg_send ~self ~cmd:(selector "sentenceRangeForRange:") ~typ:(NSRange.t @-> returning NSRange.t) x
+let sentenceRangeForRange x self = msg_send_stret ~self ~cmd:(selector "sentenceRangeForRange:") ~typ:(NSRange.t @-> returning NSRange.t) ~return_type:NSRange.t x
 let setOrthography x ~range self = msg_send ~self ~cmd:(selector "setOrthography:range:") ~typ:(id @-> NSRange.t @-> returning void) x range
 let setString x self = msg_send ~self ~cmd:(selector "setString:") ~typ:(id @-> returning void) x
 let string_ self = msg_send ~self ~cmd:(selector "string") ~typ:(returning id)
@@ -29,4 +29,4 @@ let tagAtIndex' x ~unit ~scheme ~tokenRange self = msg_send ~self ~cmd:(selector
 let tagSchemes self = msg_send ~self ~cmd:(selector "tagSchemes") ~typ:(returning id)
 let tagsInRange x ~scheme ~options ~tokenRanges self = msg_send ~self ~cmd:(selector "tagsInRange:scheme:options:tokenRanges:") ~typ:(NSRange.t @-> id @-> ullong @-> (ptr id) @-> returning id) x scheme (ULLong.of_int options) tokenRanges
 let tagsInRange' x ~unit ~scheme ~options ~tokenRanges self = msg_send ~self ~cmd:(selector "tagsInRange:unit:scheme:options:tokenRanges:") ~typ:(NSRange.t @-> llong @-> id @-> ullong @-> (ptr id) @-> returning id) x (LLong.of_int unit) scheme (ULLong.of_int options) tokenRanges
-let tokenRangeAtIndex x ~unit self = msg_send ~self ~cmd:(selector "tokenRangeAtIndex:unit:") ~typ:(ullong @-> llong @-> returning NSRange.t) (ULLong.of_int x) (LLong.of_int unit)
\ No newline at end of file
+let tokenRangeAtIndex x ~unit self = msg_send_stret ~self ~cmd:(selector "tokenRangeAtIndex:unit:") ~typ:(ullong @-> llong @-> returning NSRange.t) ~return_type:NSRange.t (ULLong.of_int x) (LLong.of_int unit)
\ No newline at end of file
diff --git a/Foundation/NSLinkCheckingResult.ml b/Foundation/NSLinkCheckingResult.ml
index 4d38698e..d4d772fe 100644
--- a/Foundation/NSLinkCheckingResult.ml
+++ b/Foundation/NSLinkCheckingResult.ml
@@ -17,6 +17,6 @@ let description self = msg_send ~self ~cmd:(selector "description") ~typ:(return
 let encodeWithCoder x self = msg_send ~self ~cmd:(selector "encodeWithCoder:") ~typ:(id @-> returning void) x
 let initWithCoder x self = msg_send ~self ~cmd:(selector "initWithCoder:") ~typ:(id @-> returning id) x
 let initWithRange x ~_URL self = msg_send ~self ~cmd:(selector "initWithRange:URL:") ~typ:(NSRange.t @-> id @-> returning id) x _URL
-let range self = msg_send ~self ~cmd:(selector "range") ~typ:(returning NSRange.t)
+let range self = msg_send_stret ~self ~cmd:(selector "range") ~typ:(returning NSRange.t) ~return_type:NSRange.t
 let resultByAdjustingRangesWithOffset x self = msg_send ~self ~cmd:(selector "resultByAdjustingRangesWithOffset:") ~typ:(llong @-> returning id) (LLong.of_int x)
 let resultType self = msg_send ~self ~cmd:(selector "resultType") ~typ:(returning ullong)
\ No newline at end of file
diff --git a/Foundation/NSLookupMatch.ml b/Foundation/NSLookupMatch.ml
index cecb7d1f..3ea03088 100644
--- a/Foundation/NSLookupMatch.ml
+++ b/Foundation/NSLookupMatch.ml
@@ -17,7 +17,7 @@ let description self = msg_send ~self ~cmd:(selector "description") ~typ:(return
 let initWithType x ~range ~score self = msg_send ~self ~cmd:(selector "initWithType:range:score:") ~typ:(ullong @-> NSRange.t @-> double @-> returning id) (ULLong.of_int x) range score
 let languageIdentifier self = msg_send ~self ~cmd:(selector "languageIdentifier") ~typ:(returning id)
 let matchType self = msg_send ~self ~cmd:(selector "matchType") ~typ:(returning ullong)
-let range self = msg_send ~self ~cmd:(selector "range") ~typ:(returning NSRange.t)
+let range self = msg_send_stret ~self ~cmd:(selector "range") ~typ:(returning NSRange.t) ~return_type:NSRange.t
 let score self = msg_send ~self ~cmd:(selector "score") ~typ:(returning double)
 let setDataDetectorResult x self = msg_send ~self ~cmd:(selector "setDataDetectorResult:") ~typ:(id @-> returning void) x
 let setLanguageIdentifier x self = msg_send ~self ~cmd:(selector "setLanguageIdentifier:") ~typ:(id @-> returning void) x
\ No newline at end of file
diff --git a/Foundation/NSOrthographyCheckingResult.ml b/Foundation/NSOrthographyCheckingResult.ml
index d298438a..1e70f10a 100644
--- a/Foundation/NSOrthographyCheckingResult.ml
+++ b/Foundation/NSOrthographyCheckingResult.ml
@@ -17,6 +17,6 @@ let encodeWithCoder x self = msg_send ~self ~cmd:(selector "encodeWithCoder:") ~
 let initWithCoder x self = msg_send ~self ~cmd:(selector "initWithCoder:") ~typ:(id @-> returning id) x
 let initWithRange x ~orthography self = msg_send ~self ~cmd:(selector "initWithRange:orthography:") ~typ:(NSRange.t @-> id @-> returning id) x orthography
 let orthography self = msg_send ~self ~cmd:(selector "orthography") ~typ:(returning id)
-let range self = msg_send ~self ~cmd:(selector "range") ~typ:(returning NSRange.t)
+let range self = msg_send_stret ~self ~cmd:(selector "range") ~typ:(returning NSRange.t) ~return_type:NSRange.t
 let resultByAdjustingRangesWithOffset x self = msg_send ~self ~cmd:(selector "resultByAdjustingRangesWithOffset:") ~typ:(llong @-> returning id) (LLong.of_int x)
 let resultType self = msg_send ~self ~cmd:(selector "resultType") ~typ:(returning ullong)
\ No newline at end of file
diff --git a/Foundation/NSPhoneNumberCheckingResult.ml b/Foundation/NSPhoneNumberCheckingResult.ml
index 98e624b5..7c9c9e0e 100644
--- a/Foundation/NSPhoneNumberCheckingResult.ml
+++ b/Foundation/NSPhoneNumberCheckingResult.ml
@@ -18,7 +18,7 @@ let initWithCoder x self = msg_send ~self ~cmd:(selector "initWithCoder:") ~typ:
 let initWithRange x ~phoneNumber self = msg_send ~self ~cmd:(selector "initWithRange:phoneNumber:") ~typ:(NSRange.t @-> id @-> returning id) x phoneNumber
 let initWithRange' x ~phoneNumber ~underlyingResult self = msg_send ~self ~cmd:(selector "initWithRange:phoneNumber:underlyingResult:") ~typ:(NSRange.t @-> id @-> (ptr void) @-> returning id) x phoneNumber underlyingResult
 let phoneNumber self = msg_send ~self ~cmd:(selector "phoneNumber") ~typ:(returning id)
-let range self = msg_send ~self ~cmd:(selector "range") ~typ:(returning NSRange.t)
+let range self = msg_send_stret ~self ~cmd:(selector "range") ~typ:(returning NSRange.t) ~return_type:NSRange.t
 let resultByAdjustingRangesWithOffset x self = msg_send ~self ~cmd:(selector "resultByAdjustingRangesWithOffset:") ~typ:(llong @-> returning id) (LLong.of_int x)
 let resultType self = msg_send ~self ~cmd:(selector "resultType") ~typ:(returning ullong)
 let underlyingResult self = msg_send ~self ~cmd:(selector "underlyingResult") ~typ:(returning (ptr void))
\ No newline at end of file
diff --git a/Foundation/NSPinyinString.ml b/Foundation/NSPinyinString.ml
index 3d4a40fb..a3079952 100644
--- a/Foundation/NSPinyinString.ml
+++ b/Foundation/NSPinyinString.ml
@@ -25,7 +25,7 @@ let isEqual x self = msg_send ~self ~cmd:(selector "isEqual:") ~typ:(id @-> retu
 let lastSyllableIsPartial self = msg_send ~self ~cmd:(selector "lastSyllableIsPartial") ~typ:(returning bool)
 let length self = msg_send ~self ~cmd:(selector "length") ~typ:(returning ullong)
 let nonPinyinIndexSet self = msg_send ~self ~cmd:(selector "nonPinyinIndexSet") ~typ:(returning id)
-let nonPinyinRangeAtIndex x self = msg_send ~self ~cmd:(selector "nonPinyinRangeAtIndex:") ~typ:(ullong @-> returning NSRange.t) (ULLong.of_int x)
+let nonPinyinRangeAtIndex x self = msg_send_stret ~self ~cmd:(selector "nonPinyinRangeAtIndex:") ~typ:(ullong @-> returning NSRange.t) ~return_type:NSRange.t (ULLong.of_int x)
 let numberOfDeletions self = msg_send ~self ~cmd:(selector "numberOfDeletions") ~typ:(returning ullong)
 let numberOfInsertions self = msg_send ~self ~cmd:(selector "numberOfInsertions") ~typ:(returning ullong)
 let numberOfNonPinyinRanges self = msg_send ~self ~cmd:(selector "numberOfNonPinyinRanges") ~typ:(returning ullong)
diff --git a/Foundation/NSProgressValues.ml b/Foundation/NSProgressValues.ml
index ceb086d2..0597d0f8 100644
--- a/Foundation/NSProgressValues.ml
+++ b/Foundation/NSProgressValues.ml
@@ -21,7 +21,7 @@ let init self = msg_send ~self ~cmd:(selector "init") ~typ:(returning id)
 let initWithCoder x self = msg_send ~self ~cmd:(selector "initWithCoder:") ~typ:(id @-> returning id) x
 let isFinished self = msg_send ~self ~cmd:(selector "isFinished") ~typ:(returning bool)
 let isIndeterminate self = msg_send ~self ~cmd:(selector "isIndeterminate") ~typ:(returning bool)
-let overallFraction self = msg_send ~self ~cmd:(selector "overallFraction") ~typ:(returning void)
+let overallFraction self = msg_send_stret ~self ~cmd:(selector "overallFraction") ~typ:(returning void) ~return_type:void
 let setCompletedUnitCount x self = msg_send ~self ~cmd:(selector "setCompletedUnitCount:") ~typ:(llong @-> returning void) (LLong.of_int x)
 let setFinished x self = msg_send ~self ~cmd:(selector "setFinished:") ~typ:(bool @-> returning void) x
 let setFractionCompleted x self = msg_send ~self ~cmd:(selector "setFractionCompleted:") ~typ:(double @-> returning void) x
diff --git a/Foundation/NSRegularExpression.ml b/Foundation/NSRegularExpression.ml
index 5f7e5561..a8e31429 100644
--- a/Foundation/NSRegularExpression.ml
+++ b/Foundation/NSRegularExpression.ml
@@ -26,7 +26,7 @@ let numberOfCaptureGroups self = msg_send ~self ~cmd:(selector "numberOfCaptureG
 let numberOfMatchesInString x ~options ~range self = msg_send ~self ~cmd:(selector "numberOfMatchesInString:options:range:") ~typ:(id @-> ullong @-> NSRange.t @-> returning ullong) x (ULLong.of_int options) range
 let options self = msg_send ~self ~cmd:(selector "options") ~typ:(returning ullong)
 let pattern self = msg_send ~self ~cmd:(selector "pattern") ~typ:(returning id)
-let rangeOfFirstMatchInString x ~options ~range self = msg_send ~self ~cmd:(selector "rangeOfFirstMatchInString:options:range:") ~typ:(id @-> ullong @-> NSRange.t @-> returning NSRange.t) x (ULLong.of_int options) range
+let rangeOfFirstMatchInString x ~options ~range self = msg_send_stret ~self ~cmd:(selector "rangeOfFirstMatchInString:options:range:") ~typ:(id @-> ullong @-> NSRange.t @-> returning NSRange.t) ~return_type:NSRange.t x (ULLong.of_int options) range
 let replaceMatchesInString x ~options ~range ~withTemplate self = msg_send ~self ~cmd:(selector "replaceMatchesInString:options:range:withTemplate:") ~typ:(id @-> ullong @-> NSRange.t @-> id @-> returning ullong) x (ULLong.of_int options) range withTemplate
 let replacementStringForResult x ~inString ~offset ~template self = msg_send ~self ~cmd:(selector "replacementStringForResult:inString:offset:template:") ~typ:(id @-> id @-> llong @-> id @-> returning id) x inString (LLong.of_int offset) template
 let stringByReplacingMatchesInString x ~options ~range ~withTemplate self = msg_send ~self ~cmd:(selector "stringByReplacingMatchesInString:options:range:withTemplate:") ~typ:(id @-> ullong @-> NSRange.t @-> id @-> returning id) x (ULLong.of_int options) range withTemplate
\ No newline at end of file
diff --git a/Foundation/NSRegularExpressionCheckingResult.ml b/Foundation/NSRegularExpressionCheckingResult.ml
index f1e9a230..bdb819d0 100644
--- a/Foundation/NSRegularExpressionCheckingResult.ml
+++ b/Foundation/NSRegularExpressionCheckingResult.ml
@@ -17,7 +17,7 @@ let initWithCoder x self = msg_send ~self ~cmd:(selector "initWithCoder:") ~typ:
 let initWithRangeArray x ~regularExpression self = msg_send ~self ~cmd:(selector "initWithRangeArray:regularExpression:") ~typ:(id @-> id @-> returning id) x regularExpression
 let initWithRanges x ~count ~regularExpression self = msg_send ~self ~cmd:(selector "initWithRanges:count:regularExpression:") ~typ:((ptr NSRange.t) @-> ullong @-> id @-> returning id) x (ULLong.of_int count) regularExpression
 let rangeArray self = msg_send ~self ~cmd:(selector "rangeArray") ~typ:(returning id)
-let rangeWithName x self = msg_send ~self ~cmd:(selector "rangeWithName:") ~typ:(id @-> returning NSRange.t) x
+let rangeWithName x self = msg_send_stret ~self ~cmd:(selector "rangeWithName:") ~typ:(id @-> returning NSRange.t) ~return_type:NSRange.t x
 let regularExpression self = msg_send ~self ~cmd:(selector "regularExpression") ~typ:(returning id)
 let resultByAdjustingRangesWithOffset x self = msg_send ~self ~cmd:(selector "resultByAdjustingRangesWithOffset:") ~typ:(llong @-> returning id) (LLong.of_int x)
 let resultType self = msg_send ~self ~cmd:(selector "resultType") ~typ:(returning ullong)
\ No newline at end of file
diff --git a/Foundation/NSSimpleRegularExpressionCheckingResult.ml b/Foundation/NSSimpleRegularExpressionCheckingResult.ml
index de78029e..a5ff2aea 100644
--- a/Foundation/NSSimpleRegularExpressionCheckingResult.ml
+++ b/Foundation/NSSimpleRegularExpressionCheckingResult.ml
@@ -15,7 +15,7 @@ let dealloc self = msg_send ~self ~cmd:(selector "dealloc") ~typ:(returning void
 let initWithRangeArray x ~regularExpression self = msg_send ~self ~cmd:(selector "initWithRangeArray:regularExpression:") ~typ:(id @-> id @-> returning id) x regularExpression
 let initWithRanges x ~count ~regularExpression self = msg_send ~self ~cmd:(selector "initWithRanges:count:regularExpression:") ~typ:((ptr NSRange.t) @-> ullong @-> id @-> returning id) x (ULLong.of_int count) regularExpression
 let numberOfRanges self = msg_send ~self ~cmd:(selector "numberOfRanges") ~typ:(returning ullong)
-let range self = msg_send ~self ~cmd:(selector "range") ~typ:(returning NSRange.t)
+let range self = msg_send_stret ~self ~cmd:(selector "range") ~typ:(returning NSRange.t) ~return_type:NSRange.t
 let rangeArray self = msg_send ~self ~cmd:(selector "rangeArray") ~typ:(returning id)
-let rangeAtIndex x self = msg_send ~self ~cmd:(selector "rangeAtIndex:") ~typ:(ullong @-> returning NSRange.t) (ULLong.of_int x)
+let rangeAtIndex x self = msg_send_stret ~self ~cmd:(selector "rangeAtIndex:") ~typ:(ullong @-> returning NSRange.t) ~return_type:NSRange.t (ULLong.of_int x)
 let regularExpression self = msg_send ~self ~cmd:(selector "regularExpression") ~typ:(returning id)
\ No newline at end of file
diff --git a/Foundation/NSSpellCheckingResult.ml b/Foundation/NSSpellCheckingResult.ml
index d7c85cfb..46f89fa8 100644
--- a/Foundation/NSSpellCheckingResult.ml
+++ b/Foundation/NSSpellCheckingResult.ml
@@ -14,6 +14,6 @@ let self = get_class "NSSpellCheckingResult"
 let encodeWithCoder x self = msg_send ~self ~cmd:(selector "encodeWithCoder:") ~typ:(id @-> returning void) x
 let initWithCoder x self = msg_send ~self ~cmd:(selector "initWithCoder:") ~typ:(id @-> returning id) x
 let initWithRange x self = msg_send ~self ~cmd:(selector "initWithRange:") ~typ:(NSRange.t @-> returning id) x
-let range self = msg_send ~self ~cmd:(selector "range") ~typ:(returning NSRange.t)
+let range self = msg_send_stret ~self ~cmd:(selector "range") ~typ:(returning NSRange.t) ~return_type:NSRange.t
 let resultByAdjustingRangesWithOffset x self = msg_send ~self ~cmd:(selector "resultByAdjustingRangesWithOffset:") ~typ:(llong @-> returning id) (LLong.of_int x)
 let resultType self = msg_send ~self ~cmd:(selector "resultType") ~typ:(returning ullong)
\ No newline at end of file
diff --git a/Foundation/NSString.ml b/Foundation/NSString.ml
index b1bb1afa..2092206f 100644
--- a/Foundation/NSString.ml
+++ b/Foundation/NSString.ml
@@ -101,7 +101,7 @@ let isLike x self = msg_send ~self ~cmd:(selector "isLike:") ~typ:(id @-> return
 let lastPathComponent self = msg_send ~self ~cmd:(selector "lastPathComponent") ~typ:(returning id)
 let length self = msg_send ~self ~cmd:(selector "length") ~typ:(returning ullong)
 let lengthOfBytesUsingEncoding x self = msg_send ~self ~cmd:(selector "lengthOfBytesUsingEncoding:") ~typ:(ullong @-> returning ullong) (ULLong.of_int x)
-let lineRangeForRange x self = msg_send ~self ~cmd:(selector "lineRangeForRange:") ~typ:(NSRange.t @-> returning NSRange.t) x
+let lineRangeForRange x self = msg_send_stret ~self ~cmd:(selector "lineRangeForRange:") ~typ:(NSRange.t @-> returning NSRange.t) ~return_type:NSRange.t x
 let linguisticTagsInRange x ~scheme ~options ~orthography ~tokenRanges self = msg_send ~self ~cmd:(selector "linguisticTagsInRange:scheme:options:orthography:tokenRanges:") ~typ:(NSRange.t @-> id @-> ullong @-> id @-> (ptr id) @-> returning id) x scheme (ULLong.of_int options) orthography tokenRanges
 let loadDataWithTypeIdentifier x ~forItemProviderCompletionHandler self = msg_send ~self ~cmd:(selector "loadDataWithTypeIdentifier:forItemProviderCompletionHandler:") ~typ:(id @-> (ptr void) @-> returning id) x forItemProviderCompletionHandler
 let localizedCapitalizedString self = msg_send ~self ~cmd:(selector "localizedCapitalizedString") ~typ:(returning id)
@@ -113,7 +113,7 @@ let localizedHasSuffix x self = msg_send ~self ~cmd:(selector "localizedHasSuffi
 let localizedLowercaseString self = msg_send ~self ~cmd:(selector "localizedLowercaseString") ~typ:(returning id)
 let localizedStandardCompare x self = msg_send ~self ~cmd:(selector "localizedStandardCompare:") ~typ:(id @-> returning llong) x
 let localizedStandardContainsString x self = msg_send ~self ~cmd:(selector "localizedStandardContainsString:") ~typ:(id @-> returning bool) x
-let localizedStandardRangeOfString x self = msg_send ~self ~cmd:(selector "localizedStandardRangeOfString:") ~typ:(id @-> returning NSRange.t) x
+let localizedStandardRangeOfString x self = msg_send_stret ~self ~cmd:(selector "localizedStandardRangeOfString:") ~typ:(id @-> returning NSRange.t) ~return_type:NSRange.t x
 let localizedUppercaseString self = msg_send ~self ~cmd:(selector "localizedUppercaseString") ~typ:(returning id)
 let longLongValue self = msg_send ~self ~cmd:(selector "longLongValue") ~typ:(returning llong)
 let lossyCString self = msg_send ~self ~cmd:(selector "lossyCString") ~typ:(returning string)
@@ -123,7 +123,7 @@ let matchesPattern x self = msg_send ~self ~cmd:(selector "matchesPattern:") ~ty
 let matchesPattern' x ~caseInsensitive self = msg_send ~self ~cmd:(selector "matchesPattern:caseInsensitive:") ~typ:(id @-> bool @-> returning bool) x caseInsensitive
 let maximumLengthOfBytesUsingEncoding x self = msg_send ~self ~cmd:(selector "maximumLengthOfBytesUsingEncoding:") ~typ:(ullong @-> returning ullong) (ULLong.of_int x)
 let mutableCopyWithZone x self = msg_send ~self ~cmd:(selector "mutableCopyWithZone:") ~typ:((ptr void) @-> returning id) x
-let paragraphRangeForRange x self = msg_send ~self ~cmd:(selector "paragraphRangeForRange:") ~typ:(NSRange.t @-> returning NSRange.t) x
+let paragraphRangeForRange x self = msg_send_stret ~self ~cmd:(selector "paragraphRangeForRange:") ~typ:(NSRange.t @-> returning NSRange.t) ~return_type:NSRange.t x
 let pathComponents self = msg_send ~self ~cmd:(selector "pathComponents") ~typ:(returning id)
 let pathExtension self = msg_send ~self ~cmd:(selector "pathExtension") ~typ:(returning id)
 let pinyinStringFromPinyinWithToneNumber self = msg_send ~self ~cmd:(selector "pinyinStringFromPinyinWithToneNumber") ~typ:(returning id)
@@ -132,15 +132,15 @@ let precomposedStringWithCompatibilityMapping self = msg_send ~self ~cmd:(select
 let propertyList self = msg_send ~self ~cmd:(selector "propertyList") ~typ:(returning id)
 let propertyListFromStringsFileFormat self = msg_send ~self ~cmd:(selector "propertyListFromStringsFileFormat") ~typ:(returning id)
 let quotedStringRepresentation self = msg_send ~self ~cmd:(selector "quotedStringRepresentation") ~typ:(returning id)
-let rangeOfCharacterFromSet x self = msg_send ~self ~cmd:(selector "rangeOfCharacterFromSet:") ~typ:(id @-> returning NSRange.t) x
-let rangeOfCharacterFromSet1 x ~options self = msg_send ~self ~cmd:(selector "rangeOfCharacterFromSet:options:") ~typ:(id @-> ullong @-> returning NSRange.t) x (ULLong.of_int options)
-let rangeOfCharacterFromSet2 x ~options ~range self = msg_send ~self ~cmd:(selector "rangeOfCharacterFromSet:options:range:") ~typ:(id @-> ullong @-> NSRange.t @-> returning NSRange.t) x (ULLong.of_int options) range
-let rangeOfComposedCharacterSequenceAtIndex x self = msg_send ~self ~cmd:(selector "rangeOfComposedCharacterSequenceAtIndex:") ~typ:(ullong @-> returning NSRange.t) (ULLong.of_int x)
-let rangeOfComposedCharacterSequencesForRange x self = msg_send ~self ~cmd:(selector "rangeOfComposedCharacterSequencesForRange:") ~typ:(NSRange.t @-> returning NSRange.t) x
-let rangeOfString x self = msg_send ~self ~cmd:(selector "rangeOfString:") ~typ:(id @-> returning NSRange.t) x
-let rangeOfString1 x ~options self = msg_send ~self ~cmd:(selector "rangeOfString:options:") ~typ:(id @-> ullong @-> returning NSRange.t) x (ULLong.of_int options)
-let rangeOfString2 x ~options ~range self = msg_send ~self ~cmd:(selector "rangeOfString:options:range:") ~typ:(id @-> ullong @-> NSRange.t @-> returning NSRange.t) x (ULLong.of_int options) range
-let rangeOfString3 x ~options ~range ~locale self = msg_send ~self ~cmd:(selector "rangeOfString:options:range:locale:") ~typ:(id @-> ullong @-> NSRange.t @-> id @-> returning NSRange.t) x (ULLong.of_int options) range locale
+let rangeOfCharacterFromSet x self = msg_send_stret ~self ~cmd:(selector "rangeOfCharacterFromSet:") ~typ:(id @-> returning NSRange.t) ~return_type:NSRange.t x
+let rangeOfCharacterFromSet1 x ~options self = msg_send_stret ~self ~cmd:(selector "rangeOfCharacterFromSet:options:") ~typ:(id @-> ullong @-> returning NSRange.t) ~return_type:NSRange.t x (ULLong.of_int options)
+let rangeOfCharacterFromSet2 x ~options ~range self = msg_send_stret ~self ~cmd:(selector "rangeOfCharacterFromSet:options:range:") ~typ:(id @-> ullong @-> NSRange.t @-> returning NSRange.t) ~return_type:NSRange.t x (ULLong.of_int options) range
+let rangeOfComposedCharacterSequenceAtIndex x self = msg_send_stret ~self ~cmd:(selector "rangeOfComposedCharacterSequenceAtIndex:") ~typ:(ullong @-> returning NSRange.t) ~return_type:NSRange.t (ULLong.of_int x)
+let rangeOfComposedCharacterSequencesForRange x self = msg_send_stret ~self ~cmd:(selector "rangeOfComposedCharacterSequencesForRange:") ~typ:(NSRange.t @-> returning NSRange.t) ~return_type:NSRange.t x
+let rangeOfString x self = msg_send_stret ~self ~cmd:(selector "rangeOfString:") ~typ:(id @-> returning NSRange.t) ~return_type:NSRange.t x
+let rangeOfString1 x ~options self = msg_send_stret ~self ~cmd:(selector "rangeOfString:options:") ~typ:(id @-> ullong @-> returning NSRange.t) ~return_type:NSRange.t x (ULLong.of_int options)
+let rangeOfString2 x ~options ~range self = msg_send_stret ~self ~cmd:(selector "rangeOfString:options:range:") ~typ:(id @-> ullong @-> NSRange.t @-> returning NSRange.t) ~return_type:NSRange.t x (ULLong.of_int options) range
+let rangeOfString3 x ~options ~range ~locale self = msg_send_stret ~self ~cmd:(selector "rangeOfString:options:range:locale:") ~typ:(id @-> ullong @-> NSRange.t @-> id @-> returning NSRange.t) ~return_type:NSRange.t x (ULLong.of_int options) range locale
 let replacementObjectForPortCoder x self = msg_send ~self ~cmd:(selector "replacementObjectForPortCoder:") ~typ:(id @-> returning id) x
 let scriptingBeginsWith x self = msg_send ~self ~cmd:(selector "scriptingBeginsWith:") ~typ:(id @-> returning bool) x
 let scriptingContains x self = msg_send ~self ~cmd:(selector "scriptingContains:") ~typ:(id @-> returning bool) x
@@ -150,7 +150,7 @@ let scriptingIsGreaterThan x self = msg_send ~self ~cmd:(selector "scriptingIsGr
 let scriptingIsGreaterThanOrEqualTo x self = msg_send ~self ~cmd:(selector "scriptingIsGreaterThanOrEqualTo:") ~typ:(id @-> returning bool) x
 let scriptingIsLessThan x self = msg_send ~self ~cmd:(selector "scriptingIsLessThan:") ~typ:(id @-> returning bool) x
 let scriptingIsLessThanOrEqualTo x self = msg_send ~self ~cmd:(selector "scriptingIsLessThanOrEqualTo:") ~typ:(id @-> returning bool) x
-let significantText self = msg_send ~self ~cmd:(selector "significantText") ~typ:(returning NSRange.t)
+let significantText self = msg_send_stret ~self ~cmd:(selector "significantText") ~typ:(returning NSRange.t) ~return_type:NSRange.t
 let simplifiedChineseCompare x self = msg_send ~self ~cmd:(selector "simplifiedChineseCompare:") ~typ:(id @-> returning llong) x
 let smallestEncoding self = msg_send ~self ~cmd:(selector "smallestEncoding") ~typ:(returning ullong)
 let standardizedURLPath self = msg_send ~self ~cmd:(selector "standardizedURLPath") ~typ:(returning id)
diff --git a/Foundation/NSSubstitutionCheckingResult.ml b/Foundation/NSSubstitutionCheckingResult.ml
index 287a015f..cb8f2035 100644
--- a/Foundation/NSSubstitutionCheckingResult.ml
+++ b/Foundation/NSSubstitutionCheckingResult.ml
@@ -16,6 +16,6 @@ let description self = msg_send ~self ~cmd:(selector "description") ~typ:(return
 let encodeWithCoder x self = msg_send ~self ~cmd:(selector "encodeWithCoder:") ~typ:(id @-> returning void) x
 let initWithCoder x self = msg_send ~self ~cmd:(selector "initWithCoder:") ~typ:(id @-> returning id) x
 let initWithRange x ~replacementString self = msg_send ~self ~cmd:(selector "initWithRange:replacementString:") ~typ:(NSRange.t @-> id @-> returning id) x replacementString
-let range self = msg_send ~self ~cmd:(selector "range") ~typ:(returning NSRange.t)
+let range self = msg_send_stret ~self ~cmd:(selector "range") ~typ:(returning NSRange.t) ~return_type:NSRange.t
 let replacementString self = msg_send ~self ~cmd:(selector "replacementString") ~typ:(returning id)
 let resultByAdjustingRangesWithOffset x self = msg_send ~self ~cmd:(selector "resultByAdjustingRangesWithOffset:") ~typ:(llong @-> returning id) (LLong.of_int x)
\ No newline at end of file
diff --git a/Foundation/NSTextCheckingResult.ml b/Foundation/NSTextCheckingResult.ml
index b4133cbc..2bf84523 100644
--- a/Foundation/NSTextCheckingResult.ml
+++ b/Foundation/NSTextCheckingResult.ml
@@ -17,7 +17,7 @@ let alternativeStrings self = msg_send ~self ~cmd:(selector "alternativeStrings"
 let components self = msg_send ~self ~cmd:(selector "components") ~typ:(returning id)
 let copyWithZone x self = msg_send ~self ~cmd:(selector "copyWithZone:") ~typ:((ptr void) @-> returning id) x
 let date self = msg_send ~self ~cmd:(selector "date") ~typ:(returning id)
-let decodeRangeWithCoder x self = msg_send ~self ~cmd:(selector "decodeRangeWithCoder:") ~typ:(id @-> returning NSRange.t) x
+let decodeRangeWithCoder x self = msg_send_stret ~self ~cmd:(selector "decodeRangeWithCoder:") ~typ:(id @-> returning NSRange.t) ~return_type:NSRange.t x
 let description self = msg_send ~self ~cmd:(selector "description") ~typ:(returning id)
 let duration self = msg_send ~self ~cmd:(selector "duration") ~typ:(returning double)
 let encodeRangeWithCoder x self = msg_send ~self ~cmd:(selector "encodeRangeWithCoder:") ~typ:(id @-> returning void) x
@@ -28,9 +28,9 @@ let leadingText self = msg_send ~self ~cmd:(selector "leadingText") ~typ:(return
 let numberOfRanges self = msg_send ~self ~cmd:(selector "numberOfRanges") ~typ:(returning ullong)
 let orthography self = msg_send ~self ~cmd:(selector "orthography") ~typ:(returning id)
 let phoneNumber self = msg_send ~self ~cmd:(selector "phoneNumber") ~typ:(returning id)
-let range self = msg_send ~self ~cmd:(selector "range") ~typ:(returning NSRange.t)
-let rangeAtIndex x self = msg_send ~self ~cmd:(selector "rangeAtIndex:") ~typ:(ullong @-> returning NSRange.t) (ULLong.of_int x)
-let rangeWithName x self = msg_send ~self ~cmd:(selector "rangeWithName:") ~typ:(id @-> returning NSRange.t) x
+let range self = msg_send_stret ~self ~cmd:(selector "range") ~typ:(returning NSRange.t) ~return_type:NSRange.t
+let rangeAtIndex x self = msg_send_stret ~self ~cmd:(selector "rangeAtIndex:") ~typ:(ullong @-> returning NSRange.t) ~return_type:NSRange.t (ULLong.of_int x)
+let rangeWithName x self = msg_send_stret ~self ~cmd:(selector "rangeWithName:") ~typ:(id @-> returning NSRange.t) ~return_type:NSRange.t x
 let referenceDate self = msg_send ~self ~cmd:(selector "referenceDate") ~typ:(returning id)
 let regularExpression self = msg_send ~self ~cmd:(selector "regularExpression") ~typ:(returning id)
 let replacementString self = msg_send ~self ~cmd:(selector "replacementString") ~typ:(returning id)
diff --git a/Foundation/NSTransitInformationCheckingResult.ml b/Foundation/NSTransitInformationCheckingResult.ml
index d30cf28e..cdca32b4 100644
--- a/Foundation/NSTransitInformationCheckingResult.ml
+++ b/Foundation/NSTransitInformationCheckingResult.ml
@@ -17,7 +17,7 @@ let encodeWithCoder x self = msg_send ~self ~cmd:(selector "encodeWithCoder:") ~
 let initWithCoder x self = msg_send ~self ~cmd:(selector "initWithCoder:") ~typ:(id @-> returning id) x
 let initWithRange x ~components self = msg_send ~self ~cmd:(selector "initWithRange:components:") ~typ:(NSRange.t @-> id @-> returning id) x components
 let initWithRange' x ~components ~underlyingResult self = msg_send ~self ~cmd:(selector "initWithRange:components:underlyingResult:") ~typ:(NSRange.t @-> id @-> (ptr void) @-> returning id) x components underlyingResult
-let range self = msg_send ~self ~cmd:(selector "range") ~typ:(returning NSRange.t)
+let range self = msg_send_stret ~self ~cmd:(selector "range") ~typ:(returning NSRange.t) ~return_type:NSRange.t
 let resultByAdjustingRangesWithOffset x self = msg_send ~self ~cmd:(selector "resultByAdjustingRangesWithOffset:") ~typ:(llong @-> returning id) (LLong.of_int x)
 let resultType self = msg_send ~self ~cmd:(selector "resultType") ~typ:(returning ullong)
 let underlyingResult self = msg_send ~self ~cmd:(selector "underlyingResult") ~typ:(returning (ptr void))
\ No newline at end of file
diff --git a/Foundation/NSURLComponents.ml b/Foundation/NSURLComponents.ml
index eb25e4f8..5028fdcf 100644
--- a/Foundation/NSURLComponents.ml
+++ b/Foundation/NSURLComponents.ml
@@ -31,14 +31,14 @@ let percentEncodedUser self = msg_send ~self ~cmd:(selector "percentEncodedUser"
 let port self = msg_send ~self ~cmd:(selector "port") ~typ:(returning id)
 let query self = msg_send ~self ~cmd:(selector "query") ~typ:(returning id)
 let queryItems self = msg_send ~self ~cmd:(selector "queryItems") ~typ:(returning id)
-let rangeOfFragment self = msg_send ~self ~cmd:(selector "rangeOfFragment") ~typ:(returning NSRange.t)
-let rangeOfHost self = msg_send ~self ~cmd:(selector "rangeOfHost") ~typ:(returning NSRange.t)
-let rangeOfPassword self = msg_send ~self ~cmd:(selector "rangeOfPassword") ~typ:(returning NSRange.t)
-let rangeOfPath self = msg_send ~self ~cmd:(selector "rangeOfPath") ~typ:(returning NSRange.t)
-let rangeOfPort self = msg_send ~self ~cmd:(selector "rangeOfPort") ~typ:(returning NSRange.t)
-let rangeOfQuery self = msg_send ~self ~cmd:(selector "rangeOfQuery") ~typ:(returning NSRange.t)
-let rangeOfScheme self = msg_send ~self ~cmd:(selector "rangeOfScheme") ~typ:(returning NSRange.t)
-let rangeOfUser self = msg_send ~self ~cmd:(selector "rangeOfUser") ~typ:(returning NSRange.t)
+let rangeOfFragment self = msg_send_stret ~self ~cmd:(selector "rangeOfFragment") ~typ:(returning NSRange.t) ~return_type:NSRange.t
+let rangeOfHost self = msg_send_stret ~self ~cmd:(selector "rangeOfHost") ~typ:(returning NSRange.t) ~return_type:NSRange.t
+let rangeOfPassword self = msg_send_stret ~self ~cmd:(selector "rangeOfPassword") ~typ:(returning NSRange.t) ~return_type:NSRange.t
+let rangeOfPath self = msg_send_stret ~self ~cmd:(selector "rangeOfPath") ~typ:(returning NSRange.t) ~return_type:NSRange.t
+let rangeOfPort self = msg_send_stret ~self ~cmd:(selector "rangeOfPort") ~typ:(returning NSRange.t) ~return_type:NSRange.t
+let rangeOfQuery self = msg_send_stret ~self ~cmd:(selector "rangeOfQuery") ~typ:(returning NSRange.t) ~return_type:NSRange.t
+let rangeOfScheme self = msg_send_stret ~self ~cmd:(selector "rangeOfScheme") ~typ:(returning NSRange.t) ~return_type:NSRange.t
+let rangeOfUser self = msg_send_stret ~self ~cmd:(selector "rangeOfUser") ~typ:(returning NSRange.t) ~return_type:NSRange.t
 let scheme self = msg_send ~self ~cmd:(selector "scheme") ~typ:(returning id)
 let setFragment x self = msg_send ~self ~cmd:(selector "setFragment:") ~typ:(id @-> returning void) x
 let setHost x self = msg_send ~self ~cmd:(selector "setHost:") ~typ:(id @-> returning void) x
diff --git a/Foundation/NSValue.ml b/Foundation/NSValue.ml
index 351a9985..0e3e239f 100644
--- a/Foundation/NSValue.ml
+++ b/Foundation/NSValue.ml
@@ -14,7 +14,7 @@ let self = get_class "NSValue"
 let classForCoder self = msg_send ~self ~cmd:(selector "classForCoder") ~typ:(returning _Class)
 let copyWithZone x self = msg_send ~self ~cmd:(selector "copyWithZone:") ~typ:((ptr void) @-> returning id) x
 let description self = msg_send ~self ~cmd:(selector "description") ~typ:(returning id)
-let edgeInsetsValue self = msg_send ~self ~cmd:(selector "edgeInsetsValue") ~typ:(returning NSEdgeInsets.t)
+let edgeInsetsValue self = msg_send_stret ~self ~cmd:(selector "edgeInsetsValue") ~typ:(returning NSEdgeInsets.t) ~return_type:NSEdgeInsets.t
 let encodeWithCoder x self = msg_send ~self ~cmd:(selector "encodeWithCoder:") ~typ:(id @-> returning void) x
 let getValue x self = msg_send ~self ~cmd:(selector "getValue:") ~typ:((ptr void) @-> returning void) x
 let getValue' x ~size self = msg_send ~self ~cmd:(selector "getValue:size:") ~typ:((ptr void) @-> ullong @-> returning void) x (ULLong.of_int size)
@@ -26,10 +26,10 @@ let isEqual x self = msg_send ~self ~cmd:(selector "isEqual:") ~typ:(id @-> retu
 let isEqualToValue x self = msg_send ~self ~cmd:(selector "isEqualToValue:") ~typ:(id @-> returning bool) x
 let nonretainedObjectValue self = msg_send ~self ~cmd:(selector "nonretainedObjectValue") ~typ:(returning id)
 let objCType self = msg_send ~self ~cmd:(selector "objCType") ~typ:(returning string)
-let pointValue self = msg_send ~self ~cmd:(selector "pointValue") ~typ:(returning CGPoint.t)
+let pointValue self = msg_send_stret ~self ~cmd:(selector "pointValue") ~typ:(returning CGPoint.t) ~return_type:CGPoint.t
 let pointerValue self = msg_send ~self ~cmd:(selector "pointerValue") ~typ:(returning (ptr void))
-let rangeValue self = msg_send ~self ~cmd:(selector "rangeValue") ~typ:(returning NSRange.t)
-let rectValue self = msg_send ~self ~cmd:(selector "rectValue") ~typ:(returning CGRect.t)
+let rangeValue self = msg_send_stret ~self ~cmd:(selector "rangeValue") ~typ:(returning NSRange.t) ~return_type:NSRange.t
+let rectValue self = msg_send_stret ~self ~cmd:(selector "rectValue") ~typ:(returning CGRect.t) ~return_type:CGRect.t
 let replacementObjectForPortCoder x self = msg_send ~self ~cmd:(selector "replacementObjectForPortCoder:") ~typ:(id @-> returning id) x
-let sizeValue self = msg_send ~self ~cmd:(selector "sizeValue") ~typ:(returning CGSize.t)
+let sizeValue self = msg_send_stret ~self ~cmd:(selector "sizeValue") ~typ:(returning CGSize.t) ~return_type:CGSize.t
 let weakObjectValue self = msg_send ~self ~cmd:(selector "weakObjectValue") ~typ:(returning id)
\ No newline at end of file