diff --git a/Frameworks/Foundation/ObjJ.environment/Foundation.sj b/Frameworks/Foundation/ObjJ.environment/Foundation.sj
index 0f5b505da..f135b947d 100644
--- a/Frameworks/Foundation/ObjJ.environment/Foundation.sj
+++ b/Frameworks/Foundation/ObjJ.environment/Foundation.sj
@@ -7127,7 +7127,7 @@ if (CFError.prototype.isa !== CPError)
 {
     Object.defineProperties(CFError.prototype, {isa: {value: CPError, enumerable: false, writable: true}});
 }
-p;13;CPException.jt;8970;@STATIC;1.0;i;10;CPObject.ji;10;CPString.jt;8921;objj_executeFile("CPObject.j", YES);objj_executeFile("CPString.j", YES);CPInvalidArgumentException = "CPInvalidArgumentException";
+p;13;CPException.jt;8908;@STATIC;1.0;i;10;CPObject.ji;10;CPString.jt;8859;objj_executeFile("CPObject.j", YES);objj_executeFile("CPString.j", YES);CPInvalidArgumentException = "CPInvalidArgumentException";
 CPUnsupportedMethodException = "CPUnsupportedMethodException";
 CPRangeException = "CPRangeException";
 CPInternalInconsistencyException = "CPInternalInconsistencyException";
@@ -7257,17 +7257,22 @@ if (Error.prototype._userInfo !== null)
     Object.defineProperties(Error.prototype, {_userInfo: {value: null, enumerable: false, writable: true}});
 }
 (CPException.isa.method_msgSend["initialize"] || _objj_forward)(CPException, "initialize");
+_CPMethodCallString = function(anObject, aSelector)
+{
+    var prefix = class_isMetaClass(anObject.isa) ? "+" : "-";
+    return prefix + "[" + (anObject == null ? anObject : (anObject.isa.method_msgSend["className"] || _objj_forward)(anObject, "className")) + " " + aSelector + "]: ";
+}
 _CPRaiseInvalidAbstractInvocation = function(anObject, aSelector)
 {
     (CPException.isa.method_msgSend["raise:reason:"] || _objj_forward)(CPException, "raise:reason:", CPInvalidArgumentException, "*** -" + sel_getName(aSelector) + " cannot be sent to an abstract object of class " + (anObject == null ? anObject : (anObject.isa.method_msgSend["className"] || _objj_forward)(anObject, "className")) + ": Create a concrete instance!");
 }
 _CPRaiseInvalidArgumentException = function(anObject, aSelector, aMessage)
 {
-    (CPException.isa.method_msgSend["raise:reason:"] || _objj_forward)(CPException, "raise:reason:", CPInvalidArgumentException, (class_isMetaClass(anObject.isa) ? "+" : "-") + "[" + (anObject == null ? anObject : (anObject.isa.method_msgSend["className"] || _objj_forward)(anObject, "className")) + " " + aSelector + "]: " + aMessage);
+    (CPException.isa.method_msgSend["raise:reason:"] || _objj_forward)(CPException, "raise:reason:", CPInvalidArgumentException, METHOD_CALL_STRING() + aMessage);
 }
 _CPRaiseRangeException = function(anObject, aSelector, anIndex, aCount)
 {
-    (CPException.isa.method_msgSend["raise:reason:"] || _objj_forward)(CPException, "raise:reason:", CPRangeException, (class_isMetaClass(anObject.isa) ? "+" : "-") + "[" + (anObject == null ? anObject : (anObject.isa.method_msgSend["className"] || _objj_forward)(anObject, "className")) + " " + aSelector + "]: " + "index (" + anIndex + ") beyond bounds (" + aCount + ")");
+    (CPException.isa.method_msgSend["raise:reason:"] || _objj_forward)(CPException, "raise:reason:", CPRangeException, METHOD_CALL_STRING() + "index (" + anIndex + ") beyond bounds (" + aCount + ")");
 }
 _CPReportLenientDeprecation = function(aClass, oldSelector, newSelector)
 {
diff --git a/Resources/recipes.txt b/Resources/recipes.txt
index d8e1396ec..de35321cb 100644
--- a/Resources/recipes.txt
+++ b/Resources/recipes.txt
@@ -1,147 +1,147 @@
-1785883961377|ArrayController1|
-1785883961390|ArrayControllerInitialSelectionTest|
-1785883961403|ArrayControllerRemovingFirstTest|
-1785883961415|AttachedSheet|
-1785883961428|AttachedSheet2|
-1785883961440|Bindings|
-1785883961452|CGCanvasContext|
-1785883961465|CGPath|
-1785883961477|CPAlertTest|
-1785883961490|CPAnimatablePropertyContainerTest|
-1785883961502|CPAnimationContextTest|
-1785883961514|CPAnimationTest|
-1785883961527|CPBinder-echo-bug|
-1785883961539|CPBoxCibTest|
-1785883961551|CPBoxTest|
-1785883961564|CPBrowserTest|
-1785883961577|CPButtonBarTest|
-1785883961589|CPButtonKeyEquivalentDefaultTest|
-1785883961602|CPButtonTest|
-1785883961615|CPByteCountFormatter|
-1785883961627|CPCollectionViewNibTest|
-1785883961640|CPColor-CPImage-description|
-1785883961652|CPColorWellBindings|
-1785883961665|CPComboBoxTest|
-1785883961677|CPControlPerformClickExceptionTest|
-1785883961689|CPControlSize|
-1785883961702|CPCursor|
-1785883961714|CPDateFormatterTest|
-1785883961726|CPDatePickerTest|
-1785883961739|CPDictionaryControllerTest|
-1785883961751|CPDocumentControllerTest|
-1785883961764|CPFormatterTest|
-1785883961776|CPGraphicsTest|
-1785883961788|CPImageAndTextViewImageScaling|
-1785883961801|CPImageViewAlignmentScaling|
-1785883961813|CPImageViewTest|
-1785883961825|CPImageViewbindingsTest|
-1785883961838|CPLevelIndicator|
-1785883961850|CPLocalizationTest|
-1785883961863|CPLogTest|
-1785883961875|CPMarkdownParser|
-1785883961887|CPMenuCALayerTest|
-1785883961900|CPMenuEnabledBindingsTest|
-1785883961912|CPMenuKeyEquivalents|
-1785883961924|CPMenuRemoveAllTest|
-1785883961937|CPMenuSubmenuPlacementConstraints|
-1785883961949|CPMenuTest|
-1785883961961|CPOutlineViewCibTest|
-1785883961973|CPOutlineViewTest|
-1785883961986|CPOutlineViewViewBasedCibTest|
-1785883961998|CPPanelTest|
-1785883962010|CPPlatformWindow|
-1785883962023|CPPlattformWindowMinSize|
-1785883962035|CPPopUpButtonBindings|
-1785883962047|CPPopUpButtonTest|
-1785883962060|CPPopover|
-1785883962072|CPPredicateEditorCibTest|
-1785883962084|CPProgressIndicator|
-1785883962097|CPPropertyListSerializationTest|
-1785883962109|CPRadioBindings|
-1785883962121|CPRuleEditorCibTest|
-1785883962134|CPRuleEditorTestI8N|
-1785883962146|CPScrollView|
-1785883962158|CPScrollView2|
-1785883962171|CPSearchField|
-1785883962183|CPSearchFieldPredicateBinding|
-1785883962195|CPSegmentedControlBindings|
-1785883962208|CPSegmentedControlTest|
-1785883962220|CPSoundTest|
-1785883962232|CPSplitViewDivider|
-1785883962245|CPSplitViewTest|
-1785883962257|CPStackViewTest|
-1785883962270|CPStepperBindings|
-1785883962282|CPStepperNibTest|
-1785883962295|CPTabView2|
-1785883962307|CPTabViewBindings|
-1785883962319|CPTabViewNib|
-1785883962332|CPTableViewGroupRows|
-1785883962344|CPTextField|
-1785883962356|CPTextFieldEditingStyleTest|
-1785883962369|CPTextFieldHeightTest|
-1785883962381|CPTextFieldMovementsTest|
-1785883962393|CPTextFieldMultiline|
-1785883962405|CPTextView|
-1785883962418|CPTextViewCibTest|
-1785883962430|CPTextViewDelegateAndNotifications|
-1785883962443|CPTimeZone|
-1785883962455|CPTokenFieldTest|
-1785883962468|CPToolTip|
-1785883962480|CPToolbarTest|
-1785883962492|CPTreeControllerTest|
-1785883962505|CPURLConnectionAsyncTest|
-1785883962517|CPURLConnectionSynchronousTest|
-1785883962529|CPUserDefaults|
-1785883962541|CPUserDefaultsControllerTest|
-1785883962554|CPUserNotificationTest|
-1785883962566|CPViewController|
-1785883962578|CPVisualEffectViewTest|
-1785883962590|CPWebViewTest|
-1785883962603|CPWebViewTest2|
-1785883962615|CPWindowLiveResizeTest|
-1785883962627|CPWindowMovableTest|
-1785883962640|CPWindowResizeStyle|
-1785883962652|ChildWindows|
-1785883962665|CompilationTests|
-1785883962677|ContinuouslyUpdatesValueBinding|
-1785883962689|CopyAndPaste|
-1785883962702|CrossOriginTest|
-1785883962714|FF4096Test|
-1785883962726|FontEnhancementTest|
-1785883962739|FontMetricsExplorer|
-1785883962751|KeyEquivalents|
-1785883962763|KeyViewLoopTest|
-1785883962776|KeyWindowInTheBackgroundActivation|
-1785883962788|LayoutTest|
-1785883962801|LoadTimeTest|
-1785883962813|LongBindings|
-1785883962826|MobileTest|
-1785883962838|MultipleValueBindings|
-1785883962850|NSBoxTest|
-1785883962863|NSBrowserTest|
-1785883962875|NewTextFieldBezel|
-1785883962888|Nib2CibAlignment|
-1785883962900|Nib2CibBaselineAlignementTest|
-1785883962912|Nib2CibSubviewsOrderTest|
-1785883962925|NibAppRemixed|
-1785883962937|PatternFillTest|
-1785883962949|PlatformWindows|
-1785883962962|PopUpButtonEscTest|
-1785883962974|ScalingTest|
-1785883962987|ScalingTest2|
-1785883962999|ScrollviewTheming|
-1785883963011|SheetWindowOrderFrontIssue|
-1785883963024|SimpleBindings2|
-1785883963037|SmartFoldersDemo|
-1785883963049|TableTest|
-1785883963062|ThemeBrowser|
-1785883963074|ThemeKitchenSink|
-1785883963086|TrackingArea|
-1785883963099|UndoRedoWithMenuUpdate|
-1785883963111|UserlandNSTest|
-1785883963123|layoutEphemeralSubviewTest|
-1785883963136|loadDynamicFrameworks|
-1785883963148|performKeyEquivalentTest|
-1785883963160|predicateWithFormat|
-1785883963173|resignFirstResponder-CPControlTextDidEndEditing|
-1785883963185|sizeToFitFix|
+1785887607914|ArrayController1|
+1785887607928|ArrayControllerInitialSelectionTest|
+1785887607941|ArrayControllerRemovingFirstTest|
+1785887607955|AttachedSheet|
+1785887607968|AttachedSheet2|
+1785887607981|Bindings|
+1785887607995|CGCanvasContext|
+1785887608008|CGPath|
+1785887608022|CPAlertTest|
+1785887608035|CPAnimatablePropertyContainerTest|
+1785887608048|CPAnimationContextTest|
+1785887608062|CPAnimationTest|
+1785887608075|CPBinder-echo-bug|
+1785887608088|CPBoxCibTest|
+1785887608102|CPBoxTest|
+1785887608115|CPBrowserTest|
+1785887608128|CPButtonBarTest|
+1785887608142|CPButtonKeyEquivalentDefaultTest|
+1785887608155|CPButtonTest|
+1785887608169|CPByteCountFormatter|
+1785887608182|CPCollectionViewNibTest|
+1785887608196|CPColor-CPImage-description|
+1785887608209|CPColorWellBindings|
+1785887608222|CPComboBoxTest|
+1785887608236|CPControlPerformClickExceptionTest|
+1785887608249|CPControlSize|
+1785887608263|CPCursor|
+1785887608276|CPDateFormatterTest|
+1785887608289|CPDatePickerTest|
+1785887608303|CPDictionaryControllerTest|
+1785887608316|CPDocumentControllerTest|
+1785887608330|CPFormatterTest|
+1785887608343|CPGraphicsTest|
+1785887608357|CPImageAndTextViewImageScaling|
+1785887608370|CPImageViewAlignmentScaling|
+1785887608384|CPImageViewTest|
+1785887608398|CPImageViewbindingsTest|
+1785887608412|CPLevelIndicator|
+1785887608425|CPLocalizationTest|
+1785887608439|CPLogTest|
+1785887608452|CPMarkdownParser|
+1785887608466|CPMenuCALayerTest|
+1785887608479|CPMenuEnabledBindingsTest|
+1785887608493|CPMenuKeyEquivalents|
+1785887608507|CPMenuRemoveAllTest|
+1785887608520|CPMenuSubmenuPlacementConstraints|
+1785887608533|CPMenuTest|
+1785887608547|CPOutlineViewCibTest|
+1785887608560|CPOutlineViewTest|
+1785887608574|CPOutlineViewViewBasedCibTest|
+1785887608587|CPPanelTest|
+1785887608600|CPPlatformWindow|
+1785887608614|CPPlattformWindowMinSize|
+1785887608627|CPPopUpButtonBindings|
+1785887608641|CPPopUpButtonTest|
+1785887608654|CPPopover|
+1785887608668|CPPredicateEditorCibTest|
+1785887608681|CPProgressIndicator|
+1785887608694|CPPropertyListSerializationTest|
+1785887608708|CPRadioBindings|
+1785887608721|CPRuleEditorCibTest|
+1785887608734|CPRuleEditorTestI8N|
+1785887608748|CPScrollView|
+1785887608761|CPScrollView2|
+1785887608774|CPSearchField|
+1785887608788|CPSearchFieldPredicateBinding|
+1785887608801|CPSegmentedControlBindings|
+1785887608814|CPSegmentedControlTest|
+1785887608828|CPSoundTest|
+1785887608841|CPSplitViewDivider|
+1785887608854|CPSplitViewTest|
+1785887608868|CPStackViewTest|
+1785887608881|CPStepperBindings|
+1785887608894|CPStepperNibTest|
+1785887608908|CPTabView2|
+1785887608921|CPTabViewBindings|
+1785887608935|CPTabViewNib|
+1785887608949|CPTableViewGroupRows|
+1785887608962|CPTextField|
+1785887608975|CPTextFieldEditingStyleTest|
+1785887608989|CPTextFieldHeightTest|
+1785887609002|CPTextFieldMovementsTest|
+1785887609016|CPTextFieldMultiline|
+1785887609029|CPTextView|
+1785887609042|CPTextViewCibTest|
+1785887609056|CPTextViewDelegateAndNotifications|
+1785887609069|CPTimeZone|
+1785887609083|CPTokenFieldTest|
+1785887609096|CPToolTip|
+1785887609109|CPToolbarTest|
+1785887609123|CPTreeControllerTest|
+1785887609136|CPURLConnectionAsyncTest|
+1785887609149|CPURLConnectionSynchronousTest|
+1785887609163|CPUserDefaults|
+1785887609176|CPUserDefaultsControllerTest|
+1785887609189|CPUserNotificationTest|
+1785887609203|CPViewController|
+1785887609216|CPVisualEffectViewTest|
+1785887609230|CPWebViewTest|
+1785887609243|CPWebViewTest2|
+1785887609256|CPWindowLiveResizeTest|
+1785887609270|CPWindowMovableTest|
+1785887609283|CPWindowResizeStyle|
+1785887609297|ChildWindows|
+1785887609310|CompilationTests|
+1785887609323|ContinuouslyUpdatesValueBinding|
+1785887609337|CopyAndPaste|
+1785887609350|CrossOriginTest|
+1785887609364|FF4096Test|
+1785887609377|FontEnhancementTest|
+1785887609390|FontMetricsExplorer|
+1785887609404|KeyEquivalents|
+1785887609417|KeyViewLoopTest|
+1785887609431|KeyWindowInTheBackgroundActivation|
+1785887609444|LayoutTest|
+1785887609458|LoadTimeTest|
+1785887609471|LongBindings|
+1785887609485|MobileTest|
+1785887609498|MultipleValueBindings|
+1785887609512|NSBoxTest|
+1785887609525|NSBrowserTest|
+1785887609539|NewTextFieldBezel|
+1785887609552|Nib2CibAlignment|
+1785887609566|Nib2CibBaselineAlignementTest|
+1785887609579|Nib2CibSubviewsOrderTest|
+1785887609593|NibAppRemixed|
+1785887609606|PatternFillTest|
+1785887609620|PlatformWindows|
+1785887609633|PopUpButtonEscTest|
+1785887609646|ScalingTest|
+1785887609660|ScalingTest2|
+1785887609673|ScrollviewTheming|
+1785887609687|SheetWindowOrderFrontIssue|
+1785887609700|SimpleBindings2|
+1785887609714|SmartFoldersDemo|
+1785887609727|TableTest|
+1785887609741|ThemeBrowser|
+1785887609754|ThemeKitchenSink|
+1785887609768|TrackingArea|
+1785887609781|UndoRedoWithMenuUpdate|
+1785887609794|UserlandNSTest|
+1785887609808|layoutEphemeralSubviewTest|
+1785887609821|loadDynamicFrameworks|
+1785887609835|performKeyEquivalentTest|
+1785887609848|predicateWithFormat|
+1785887609862|resignFirstResponder-CPControlTextDidEndEditing|
+1785887609875|sizeToFitFix|