jscrewit 2.40.0 → 3.0.0

package/lib/jscrewit.js

@@ -1,4 +1,4 @@
-// JScrewIt 2.40.0 – https://jscrew.it
+// JScrewIt 3.0.0 – https://jscrew.it
 
 (function () {
     'use strict';
@@ -22,7 +22,6 @@
     var _Math_abs                        = Math.abs;
     var _Math_max                        = Math.max;
     var _Math_min                        = Math.min;
-    var _Math_pow                        = Math.pow;
 
     var _Object                          = Object;
     var _Object_create$1                   = _Object.create;
@@ -85,10 +84,7 @@
         try
         {
             var regExp = _RegExp(pattern, flags);
-            // In Android Browser 4.0, the RegExp constructor ignores unrecognized flags instead of
-            // throwing a SyntaxError.
-            if (regExp.flags === flags)
-                return regExp;
+            return regExp;
         }
         catch (error)
         { }
@@ -281,35 +277,21 @@
     // ~feature-hub – https://github.com/fasttime/JScrewIt/tree/master/packages/~feature-hub
 
 
-    var LO_INDEX = 0;
-    var HI_INDEX = 1;
-    var freezeMask = function (_LoHi) { return Object.freeze(_LoHi); };
     /** An empty mask. */
-    var MASK_EMPTY = freezeMask([0, 0]);
+    var MASK_EMPTY = 0;
     /** Determines whether two specified masks are equal. */
     function maskAreEqual(mask1, mask2) {
-        var _LoHi1 = mask1;
-        var _LoHi2 = mask2;
-        return _LoHi1[LO_INDEX] === _LoHi2[LO_INDEX] && _LoHi1[HI_INDEX] === _LoHi2[HI_INDEX];
+        return mask1 === mask2;
     }
     /** Determines whether a specified mask includes another one. */
     function maskIncludes(includingMask, includedMask) {
-        var includingLoHi = includingMask;
-        var includedLoHi = includedMask;
-        var includedLoValue;
-        var includedHiValue;
-        var returnValue = (includedLoValue = includedLoHi[LO_INDEX]) === (includedLoValue & includingLoHi[LO_INDEX]) &&
-            (includedHiValue = includedLoHi[HI_INDEX]) === (includedHiValue & includingLoHi[HI_INDEX]);
+        var returnValue = (includingMask & includedMask) === includedMask;
         return returnValue;
     }
     /** Returns a new mask that is the intersection of two specified masks. */
     function maskIntersection(mask1, mask2) {
-        var _LoHi1 = mask1;
-        var _LoHi2 = mask2;
-        var intersectionLo = _LoHi1[LO_INDEX] & _LoHi2[LO_INDEX];
-        var intersectionHi = _LoHi1[HI_INDEX] & _LoHi2[HI_INDEX];
-        var intersectionLoHi = [intersectionLo, intersectionHi];
-        return freezeMask(intersectionLoHi);
+        var intersectionMask = (mask1 & mask2);
+        return intersectionMask;
     }
     /**
      * Returns a new non-empty mask that does not intersect the specified mask.
@@ -317,27 +299,18 @@
      * @throws If the specified mask is full, a `RangeError` is thrown.
      */
     function maskNext(mask) {
-        var _LoHi = mask;
-        var bitIndex = 0;
-        for (; _LoHi[bitIndex >> 5] & 1 << (bitIndex & 0x1F); bitIndex++) {
-            if (bitIndex === 63)
-                throw RangeError('Mask full');
-        }
-        var nextLoHi = [0, 0];
-        nextLoHi[bitIndex >> 5] = 1 << (bitIndex & 0x1F);
-        return freezeMask(nextLoHi);
+        var nextValue = mask + 1 & ~mask;
+        if (!nextValue)
+            throw RangeError('Mask full');
+        return nextValue;
     }
     /** Returns a new mask that is the union of two specified masks. */
     function maskUnion(mask1, mask2) {
-        var _LoHi1 = mask1;
-        var _LoHi2 = mask2;
-        var unionLo = _LoHi1[LO_INDEX] | _LoHi2[LO_INDEX];
-        var unionHi = _LoHi1[HI_INDEX] | _LoHi2[HI_INDEX];
-        var unionLoHi = [unionLo, unionHi];
-        return freezeMask(unionLoHi);
+        var unionMask = (mask1 | mask2);
+        return unionMask;
     }
 
-    var keyFor = function (mask) { return "_".concat(mask); };
+    var keyFor = function (mask) { return mask; };
     var MaskIndex = /** @class */ (function () {
         function MaskIndex() {
             this._index = Object.create(null);
@@ -467,11 +440,11 @@
             return mask;
         }
         function areCompatible() {
-            var arg0;
-            var features = arguments.length === 1 &&
-                _Array_isArray(arg0 = arguments[0]) ?
-                arg0 : arguments;
-            var mask = featureArrayLikeToMask(features);
+            var features = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                features[_i] = arguments[_i];
+            }
+            var mask = featureArrayToMask(features);
             var compatible = isMaskCompatible(mask);
             return compatible;
         }
@@ -532,11 +505,10 @@
             var description = DESCRIPTION_MAP[name];
             return description;
         }
-        function featureArrayLikeToMask(features) {
+        function featureArrayToMask(features) {
             var mask = MASK_EMPTY;
-            var length = features.length;
-            for (var index = 0; index < length; ++index) {
-                var feature = features[index];
+            for (var _i = 0, features_3 = features; _i < features_3.length; _i++) {
+                var feature = features_3[_i];
                 var otherMask = maskFromStringOrFeature(feature);
                 mask = maskUnion(mask, otherMask);
             }
@@ -549,18 +521,15 @@
         }
         /**
          * Node.js custom inspection function.
-         * Set on `Feature.prototype` with name `"inspect"` for Node.js ≤ 8.6.x and with symbol
-         * `Symbol.for("nodejs.util.inspect.custom")` for Node.js ≥ 6.6.x.
          *
          * @see
          * {@link https://nodejs.org/api/util.html#util_custom_inspection_functions_on_objects} for
          * further information.
          */
-        // opts can be undefined in Node.js 0.10.0.
         function inspect(depth, opts) {
             var _a, _b, _c;
-            var breakLength = (_a = opts === null || opts === void 0 ? void 0 : opts.breakLength) !== null && _a !== void 0 ? _a : 80;
-            var compact = (_b = opts === null || opts === void 0 ? void 0 : opts.compact) !== null && _b !== void 0 ? _b : true;
+            var breakLength = (_a = opts.breakLength) !== null && _a !== void 0 ? _a : 80;
+            var compact = (_b = opts.compact) !== null && _b !== void 0 ? _b : true;
             var name = (_c = this.name) !== null && _c !== void 0 ? _c : joinParts(compact, '<', '', this.canonicalNames, ',', '>', breakLength - 3);
             var parts = [name];
             if (this.elementary)
@@ -597,7 +566,7 @@
         function validMaskFromArrayOrStringOrFeature(feature) {
             var mask;
             if (_Array_isArray(feature)) {
-                mask = featureArrayLikeToMask(feature);
+                mask = featureArrayToMask(feature);
                 if (feature.length > 1)
                     validateMask(mask);
             }
@@ -666,8 +635,6 @@
                     return str;
                 },
             };
-            if (utilInspect)
-                protoSource.inspect = inspect;
             assignNoEnum(FEATURE_PROTOTYPE, protoSource);
         }
         (function () {
@@ -838,10 +805,7 @@
                 assignNoEnum(Feature, constructorSource);
             }
             if (utilInspect) {
-                var inspectKey = utilInspect.custom;
-                if (inspectKey) {
-                    _Object_defineProperty(FEATURE_PROTOTYPE, inspectKey, { configurable: true, value: inspect, writable: true });
-                }
+                _Object_defineProperty(FEATURE_PROTOTYPE, utilInspect.custom, { configurable: true, value: inspect, writable: true });
             }
             var featureNames = _Object_keys(featureInfos);
             var includeSetMap = createMap();
@@ -949,16 +913,7 @@
     {
         function check()
         {
-            // self + '' throws an error inside a web worker in Safari 8 and 9.
-            try
-            {
-                var str = self + '';
-            }
-            catch (error)
-            {
-                return false;
-            }
-            var available = regExp.test(str);
+            var available = typeof self !== 'undefined' && regExp.test(self + '');
             return available;
         }
 
@@ -997,55 +952,19 @@
 
     var featureInfos =
     {
-        ANY_DOCUMENT:
-        {
-            description:
-            'Existence of the global object document whose string representation starts with ' +
-            '"[object " and ends with "Document]".',
-            check:
-            function ()
-            {
-                var available =
-                typeof document === 'object' && /^\[object [\S\s]*Document]$/.test(document + '');
-                return available;
-            },
-            attributes: { 'web-worker': 'web-worker-restriction' },
-        },
-        ANY_WINDOW:
-        {
-            description:
-            'Existence of the global object self whose string representation starts with "[object " ' +
-            'and ends with "Window]".',
-            check:      makeSelfFeatureCheck(/^\[object [\S\s]*Window]$/),
-            includes:   ['SELF_OBJ'],
-            attributes: { 'web-worker': 'web-worker-restriction' },
-        },
         ARRAY_ITERATOR:
         {
             description:
-            'The property that the string representation of Array.prototype.entries() starts with ' +
-            '"[object Array" and ends with "]" at index 21 or 22.',
-            check:
-            function ()
-            {
-                var available =
-                Array.prototype.entries && /^\[object Array[\S\s]{8,9}]$/.test([].entries());
-                return available;
-            },
-        },
-        ASYNC_FUNCTION:
-        {
-            description: 'Support for async functions, which return Promise object.',
+            'The property that the string representation of Array.prototype.entries() evaluates to ' +
+            '"[object Array Iterator]".',
             check:
             function ()
             {
-                try
+                if (Array.prototype.entries)
                 {
-                    Function('return async function(){}');
-                    return true;
+                    var available = [].entries() + '' === '[object Array Iterator]';
+                    return available;
                 }
-                catch (error)
-                { }
             },
         },
         ARROW:
@@ -1065,24 +984,14 @@
         },
         AT:
         {
-            description: 'Existence of the native function Array.prototype.at.',
-            check:
-            function ()
-            {
-                var available = Array.prototype.at;
-                return available;
-            },
-        },
-        ATOB:
-        {
-            description:    'Existence of the global functions atob and btoa.',
+            description:
+            'Existence of the native functions Array.prototype.at and String.prototype.at.',
             check:
             function ()
             {
-                var available = typeof atob === 'function' && typeof btoa === 'function';
+                var available = Array.prototype.at && String.prototype.at;
                 return available;
             },
-            attributes:     { 'web-worker': 'old-safari-restriction' },
         },
         BARPROP:
         {
@@ -1097,23 +1006,6 @@
             },
             attributes: { 'web-worker': 'web-worker-restriction' },
         },
-        CALL_ON_GLOBAL:
-        {
-            description:
-            'The ability to call a function on the global object when invoking ' +
-            'Function.prototype.call without binding.',
-            check:
-            function ()
-            {
-                try
-                {
-                    if ([].concat.call()[0])
-                        return true;
-                }
-                catch (error)
-                { }
-            },
-        },
         CAPITAL_HTML:
         {
             description:
@@ -1147,51 +1039,21 @@
                 var available = typeof console === 'object' && console + '' === '[object Console]';
                 return available;
             },
-            attributes: { 'web-worker': 'no-console-in-web-worker' },
-        },
-        CREATE_ELEMENT:
-        {
-            description:    'Existence of the function document.createElement.',
-            aliasFor:       'ANY_DOCUMENT',
         },
         DOCUMENT:
         {
             description:
-            'Existence of the global object document having the string representation "[object ' +
-            'Document]".',
+            'Existence of the global object document whose string representation starts with ' +
+            '"[object " and ends with "Document]".',
             check:
             function ()
             {
-                var available = typeof document === 'object' && document + '' === '[object Document]';
+                var available =
+                typeof document === 'object' && /^\[object [\S\s]*Document]$/.test(document + '');
                 return available;
             },
-            includes:   ['ANY_DOCUMENT'],
             attributes: { 'web-worker': 'web-worker-restriction' },
         },
-        DOMWINDOW:
-        {
-            description:
-            'Existence of the global object self having the string representation "[object ' +
-            'DOMWindow]".',
-            check:      makeSelfFeatureCheck(/^\[object DOMWindow]$/),
-            includes:   ['ANY_WINDOW'],
-            excludes:   ['OBJECT_W_SELF'],
-            attributes: { 'web-worker': 'web-worker-restriction' },
-        },
-        ESC_HTML_ALL:
-        {
-            description:
-            'The property that double quotation mark, less than and greater than characters in the ' +
-            'argument of String.prototype.fontcolor are escaped into their respective HTML entities.',
-            check:
-            function ()
-            {
-                var available = ~''.fontcolor('"<>').indexOf('&quot;&lt;&gt;');
-                return available;
-            },
-            includes: ['ESC_HTML_QUOT'],
-            excludes: ['ESC_HTML_QUOT_ONLY'],
-        },
         ESC_HTML_QUOT:
         {
             description:
@@ -1204,45 +1066,6 @@
                 return available;
             },
         },
-        ESC_HTML_QUOT_ONLY:
-        {
-            description:
-            'The property that only double quotation marks and no other characters in the argument ' +
-            'of String.prototype.fontcolor are escaped into HTML entities.',
-            check:
-            function ()
-            {
-                var available = ~''.fontcolor('"<>').indexOf('&quot;<>');
-                return available;
-            },
-            includes: ['ESC_HTML_QUOT'],
-            excludes: ['ESC_HTML_ALL'],
-        },
-        ESC_REGEXP_LF:
-        {
-            description:
-            'Having regular expressions created with the RegExp constructor use escape sequences ' +
-            'starting with a backslash to format line feed characters ("\\n") in their string ' +
-            'representation.',
-            check:
-            function ()
-            {
-                var available = (RegExp('\n') + '')[1] === '\\';
-                return available;
-            },
-        },
-        ESC_REGEXP_SLASH:
-        {
-            description:
-            'Having regular expressions created with the RegExp constructor use escape sequences ' +
-            'starting with a backslash to format slashes ("/") in their string representation.',
-            check:
-            function ()
-            {
-                var available = (RegExp('/') + '')[1] === '\\';
-                return available;
-            },
-        },
         FF_SRC:
         {
             description:
@@ -1273,13 +1096,6 @@
                 return available;
             },
         },
-        FORMS:
-        {
-            description:
-            'Existence of the object document.forms with string representation "[object ' +
-            'HTMLCollection]".',
-            aliasFor: 'ANY_DOCUMENT',
-        },
         FROM_CODE_POINT:
         {
             description: 'Existence of the function String.fromCodePoint.',
@@ -1314,78 +1130,6 @@
                 return available;
             },
         },
-        GENERIC_ARRAY_TO_STRING:
-        {
-            description: 'Ability to call Array.prototype.toString with a non-array binding.',
-            check:
-            function ()
-            {
-                try
-                {
-                    Array.prototype.toString.call({ });
-                    return true;
-                }
-                catch (error)
-                { }
-            },
-        },
-        GLOBAL_UNDEFINED:
-        {
-            description:
-            'Having the global function toString return the string "[object Undefined]" when invoked ' +
-            'without a binding.',
-            check:
-            function ()
-            {
-                var getToString = Function('return toString');
-                var available = getToString()() === '[object Undefined]';
-                return available;
-            },
-            includes: ['OBJECT_UNDEFINED'],
-        },
-        GMT:
-        {
-            description:
-            'Presence of the text "GMT" after the first 25 characters in the string returned by ' +
-            'Date().\n' +
-            'The string representation of dates is implementation dependent, but most engines use a ' +
-            'similar format, making this feature available in all supported engines except Internet ' +
-            'Explorer 9 and 10.',
-            check:
-            function ()
-            {
-                var available = /^.{25}GMT/.test(Date());
-                return available;
-            },
-        },
-        HISTORY:
-        {
-            description:
-            'Existence of the global object history having the string representation "[object ' +
-            'History]".',
-            check:
-            function ()
-            {
-                var available = typeof history === 'object' && history + '' === '[object History]';
-                return available;
-            },
-            attributes: { 'web-worker': 'web-worker-restriction' },
-        },
-        HTMLAUDIOELEMENT:
-        {
-            description:
-            'Existence of the global object Audio whose string representation starts with ' +
-            '"function HTMLAudioElement".',
-            check:
-            function ()
-            {
-                var available =
-                typeof Audio !== 'undefined' && /^function HTMLAudioElement/.test(Audio);
-                return available;
-            },
-            includes:   ['NO_IE_SRC'],
-            attributes: { 'web-worker': 'web-worker-restriction' },
-        },
         IE_SRC:
         {
             description:
@@ -1409,16 +1153,6 @@
             },
             attributes: { 'forced-strict-mode': 'char-increment-restriction' },
         },
-        INTL:
-        {
-            description: 'Existence of the global object Intl.',
-            check:
-            function ()
-            {
-                var available = typeof Intl === 'object';
-                return available;
-            },
-        },
         ITERATOR_HELPER:
         {
             description: 'Availability of iterator helpers.',
@@ -1429,16 +1163,6 @@
                 return available;
             },
         },
-        JAPANESE_INFINITY:
-        {
-            description: 'Japanese string representation of Infinity ending with "∞".',
-            check:
-            function ()
-            {
-                var available = /∞$/.test(Infinity.toLocaleString('ja'));
-                return available;
-            },
-        },
         LOCALE_INFINITY:
         {
             description: 'Language sensitive string representation of Infinity as "∞".',
@@ -1449,23 +1173,6 @@
                 return available;
             },
         },
-        LOCALE_NUMERALS:
-        {
-            description:
-            'Features shared by all engines capable of localized number formatting, including output ' +
-            'of Arabic digits, the Arabic decimal separator "٫", the letters in the first word of ' +
-            'the Arabic string representation of NaN ("ليس"), Persian digits and the Persian digit ' +
-            'group separator "٬".',
-            check:
-            function ()
-            {
-                var available =
-                checkLocaleNumeral('ar', NaN, /^ليس/) &&
-                checkLocaleNumeral('ar-td', 234567890.1, /^٢٣٤٬?٥٦٧٬?٨٩٠٫١/) &&
-                checkLocaleNumeral('fa', 1234567890, /^۱٬۲۳۴٬۵۶۷٬۸۹۰/);
-                return available;
-            },
-        },
         LOCALE_NUMERALS_BN:
         {
             description: 'Localized number formatting for Bengali.',
@@ -1480,51 +1187,19 @@
         {
             description:
             'Extended localized number formatting.\n' +
-            'This includes all features of LOCALE_NUMERALS plus the output of the first three ' +
-            'letters in the second word of the Arabic string representation of NaN ("رقم"), the ' +
-            'letters in the Russian string representation of NaN ("не\xa0число") and the letters in ' +
-            'the Persian string representation of NaN ("ناعدد").',
+            'Localized number formatting including the output of the first three letters in the ' +
+            'second word of the Arabic string representation of NaN ("رقم"), the letters in the ' +
+            'Russian string representation of NaN ("не\xa0число") and the letters in the Persian ' +
+            'string representation of NaN ("ناعدد").',
             check:
             function ()
             {
                 var available =
                 checkLocaleNumeral('ar', NaN, /^ليس.رقم/) &&
-                checkLocaleNumeral('ar-td', 234567890.1, /^٢٣٤٬?٥٦٧٬?٨٩٠٫١/) &&
-                checkLocaleNumeral('fa', 1234567890, /^۱٬۲۳۴٬۵۶۷٬۸۹۰/) &&
                 checkLocaleNumeral('fa', NaN, /^ناعد/) &&
                 checkLocaleNumeral('ru', NaN, /^не.число/);
                 return available;
             },
-            includes:   ['LOCALE_NUMERALS'],
-            attributes: { 'web-worker': 'locale-numerals-ext-restriction' },
-        },
-
-        LOCATION:
-        {
-            description:
-            'Existence of the global object location with the property that ' +
-            'Object.prototype.toString.call(location) evaluates to a string that starts with ' +
-            '"[object " and ends with "Location]".',
-            check:
-            function ()
-            {
-                var available =
-                typeof location === 'object' &&
-                /^\[object [\S\s]*Location]$/.test(Object.prototype.toString.call(location));
-                return available;
-            },
-        },
-        MOZILLA:
-        {
-            description:
-            'Existence of user agent string navigator.userAgent that starts with "Mozilla".',
-            check:
-            function ()
-            {
-                var available =
-                typeof navigator === 'object' && /^Mozilla/.test(navigator.userAgent);
-                return available;
-            },
         },
         NAME:
         {
@@ -1536,25 +1211,6 @@
                 return available;
             },
         },
-        NODECONSTRUCTOR:
-        {
-            description:
-            'Existence of the global object Node having the string representation "[object ' +
-            'NodeConstructor]".',
-            check:
-            function ()
-            {
-                var available = typeof Node !== 'undefined' && Node + '' === '[object NodeConstructor]';
-                return available;
-            },
-            attributes: { 'web-worker': 'web-worker-restriction' },
-        },
-        NODE_NAME:
-        {
-            description:
-            'Existence of the string document.nodeName that starts with a number sign ("#").',
-            aliasFor: 'ANY_DOCUMENT',
-        },
         NO_FF_SRC:
         {
             description:
@@ -1583,22 +1239,6 @@
             },
             excludes: ['IE_SRC'],
         },
-        NO_OLD_SAFARI_ARRAY_ITERATOR:
-        {
-            description:
-            'The property that the string representation of Array.prototype.entries() evaluates to ' +
-            '"[object Array Iterator]".',
-            check:
-            function ()
-            {
-                if (Array.prototype.entries)
-                {
-                    var available = [].entries() + '' === '[object Array Iterator]';
-                    return available;
-                }
-            },
-            includes: ['ARRAY_ITERATOR'],
-        },
         NO_V8_SRC:
         {
             description:
@@ -1625,58 +1265,15 @@
                 return available;
             },
         },
-        OBJECT_L_LOCATION_CTOR:
-        {
-            description:
-            'Existence of the global function location.constructor whose string representation ' +
-            'starts with "[object L".',
-            check:
-            function ()
-            {
-                var available =
-                typeof location === 'object' && /^\[object L/.test(location.constructor);
-                return available;
-            },
-            attributes: { 'web-worker': 'web-worker-restriction' },
-        },
-        OBJECT_UNDEFINED:
-        {
-            description:
-            'Having the function Object.prototype.toString return the string "[object Undefined]" ' +
-            'when invoked without a binding.',
-            check:
-            function ()
-            {
-                var toString = Object.prototype.toString;
-                var available = toString() === '[object Undefined]';
-                return available;
-            },
-            includes: ['UNDEFINED'],
-        },
         OBJECT_W_SELF:
         {
             description:
             'The property that the string representation of the global object self starts ' +
             'with "[object W".',
             check:      makeSelfFeatureCheck(/^\[object W/),
-            includes:   ['SELF_OBJ'],
-            excludes:   ['DOMWINDOW'],
+            includes:   ['SELF'],
             attributes: { 'web-worker': 'non-ie-restriction' },
         },
-        OLD_SAFARI_LOCATION_CTOR:
-        {
-            description:
-            'Existence of the global object location.constructor whose string representation starts ' +
-            'with "[object " and ends with "LocationConstructor]".',
-            check:
-            function ()
-            {
-                var available =
-                typeof location === 'object' &&
-                /^\[object [\S\s]*LocationConstructor]$/.test(location.constructor);
-                return available;
-            },
-        },
         PLAIN_INTL:
         {
             description:
@@ -1687,7 +1284,6 @@
                 var available = typeof Intl === 'object' && Intl + '' === '[object Object]';
                 return available;
             },
-            includes: ['INTL'],
         },
         REGEXP_STRING_ITERATOR:
         {
@@ -1703,13 +1299,10 @@
             },
         },
         SELF:
-        { aliasFor: 'ANY_WINDOW' },
-        SELF_OBJ:
         {
             description:
             'Existence of the global object self whose string representation starts with "[object ".',
-            check:      makeSelfFeatureCheck(/^\[object /),
-            attributes: { 'web-worker': 'safari-bug-21820506' },
+            check: makeSelfFeatureCheck(/^\[object /),
         },
         SHORT_LOCALES:
         {
@@ -1726,7 +1319,6 @@
                 localizedNumeral !== NUMBER.toLocaleString('en');
                 return available;
             },
-            includes: ['LOCALE_NUMERALS'],
         },
         STATUS:
         {
@@ -1739,19 +1331,6 @@
             },
             attributes:     { 'web-worker': 'web-worker-restriction' },
         },
-        UNDEFINED:
-        {
-            description:
-            'The property that Object.prototype.toString.call() evaluates to "[object Undefined]".\n' +
-            'This behavior is specified by ECMAScript, and is enforced by all engines except Android ' +
-            'Browser versions prior to 4.1.2, where this feature is not available.',
-            check:
-            function ()
-            {
-                var available = Object.prototype.toString.call() === '[object Undefined]';
-                return available;
-            },
-        },
         V8_SRC:
         {
             description:
@@ -1767,7 +1346,7 @@
             description:
             'Existence of the global object self having the string representation "[object Window]".',
             check:      makeSelfFeatureCheck(/^\[object Window]$/),
-            includes:   ['ANY_WINDOW', 'OBJECT_W_SELF'],
+            includes:   ['OBJECT_W_SELF'],
             attributes: { 'web-worker': 'web-worker-restriction' },
         },
 
@@ -1781,11 +1360,11 @@
             description:
             'Features available in all browsers.\n' +
             'No support for Node.js.',
-            includes: ['ANY_DOCUMENT', 'ANY_WINDOW', 'HISTORY', 'INCR_CHAR', 'MOZILLA', 'STATUS'],
+            includes: ['DOCUMENT', 'INCR_CHAR', 'STATUS', 'WINDOW'],
             attributes:
             {
                 'char-increment-restriction':   null,
-                'safari-bug-21820506':          null,
+                'non-ie-restriction':           null,
                 'web-worker-restriction':       null,
             },
         },
@@ -1793,101 +1372,34 @@
         {
             description:
             'All new browsers\' features.\n' +
-            'No support for Node.js and older browsers like Internet Explorer, Safari 17.3 or ' +
-            'Android Browser.',
+            'Not compatible with Node.js, Internet Explorer, and old versions of supported browsers.',
             includes:
             [
-                'ANY_DOCUMENT',
+                'ARRAY_ITERATOR',
                 'ARROW',
-                'ASYNC_FUNCTION',
                 'AT',
-                'ATOB',
                 'BARPROP',
-                'ESC_HTML_QUOT_ONLY',
-                'ESC_REGEXP_LF',
-                'ESC_REGEXP_SLASH',
+                'DOCUMENT',
+                'ESC_HTML_QUOT',
                 'FILL',
                 'FLAT',
                 'FROM_CODE_POINT',
                 'FUNCTION_19_LF',
-                'GENERIC_ARRAY_TO_STRING',
-                'GLOBAL_UNDEFINED',
-                'GMT',
-                'HISTORY',
                 'INCR_CHAR',
-                'INTL',
                 'ITERATOR_HELPER',
-                'JAPANESE_INFINITY',
                 'LOCALE_INFINITY',
                 'LOCALE_NUMERALS_EXT',
-                'LOCATION',
-                'MOZILLA',
                 'NAME',
                 'NO_IE_SRC',
-                'NO_OLD_SAFARI_ARRAY_ITERATOR',
                 'REGEXP_STRING_ITERATOR',
                 'STATUS',
                 'WINDOW',
             ],
             attributes:
             {
-                'char-increment-restriction':       null,
-                'locale-numerals-ext-restriction':  null,
-                'non-ie-restriction':               null,
-                'web-worker-restriction':           null,
-            },
-        },
-        ANDRO_4_0:
-        {
-            families: ['Android Browser'],
-            versions: ['4.0'],
-            includes:
-            [
-                'ANY_DOCUMENT',
-                'ATOB',
-                'CALL_ON_GLOBAL',
-                'CONSOLE',
-                'DOMWINDOW',
-                'ESC_HTML_ALL',
-                'FUNCTION_22_LF',
-                'GMT',
-                'HISTORY',
-                'INCR_CHAR',
-                'LOCATION',
-                'MOZILLA',
-                'NAME',
-                'STATUS',
-                'V8_SRC',
-            ],
-        },
-        ANDRO_4_1:
-        {
-            inherits: 'ANDRO_4_0',
-            versions: ['4.1-4.3'],
-            includes: { CALL_ON_GLOBAL: false, GENERIC_ARRAY_TO_STRING: true, OBJECT_UNDEFINED: true },
-        },
-        ANDRO_4_4:
-        {
-            inherits:   'ANDRO_4_1',
-            versions:   ['4.4'],
-            includes:
-            {
-                BARPROP:                true,
-                DOMWINDOW:              false,
-                HTMLAUDIOELEMENT:       true,
-                JAPANESE_INFINITY:      true,
-                LOCALE_INFINITY:        true,
-                LOCALE_NUMERALS_BN:     true,
-                LOCALE_NUMERALS_EXT:    true,
-                PLAIN_INTL:             true,
-                SHORT_LOCALES:          true,
-                WINDOW:                 true,
-            },
-            attributes:
-            {
-                'no-console-in-web-worker': null,
-                'non-ie-restriction':       null,
-                'web-worker-restriction':   null,
+                'char-increment-restriction':   null,
+                'non-ie-restriction':           null,
+                'web-worker-restriction':       null,
             },
         },
         CHROME_PREV:
@@ -1906,34 +1418,22 @@
             versions: ['122-', '122-', '108-'],
             includes:
             [
-                'ANY_DOCUMENT',
+                'ARRAY_ITERATOR',
                 'ARROW',
-                'ASYNC_FUNCTION',
                 'AT',
-                'ATOB',
                 'BARPROP',
-                'ESC_HTML_QUOT_ONLY',
-                'ESC_REGEXP_LF',
-                'ESC_REGEXP_SLASH',
+                'DOCUMENT',
+                'ESC_HTML_QUOT',
                 'FILL',
                 'FLAT',
                 'FROM_CODE_POINT',
                 'FUNCTION_19_LF',
-                'GENERIC_ARRAY_TO_STRING',
-                'GLOBAL_UNDEFINED',
-                'GMT',
-                'HISTORY',
                 'INCR_CHAR',
-                'INTL',
                 'ITERATOR_HELPER',
-                'JAPANESE_INFINITY',
                 'LOCALE_INFINITY',
                 'LOCALE_NUMERALS_BN',
                 'LOCALE_NUMERALS_EXT',
-                'LOCATION',
-                'MOZILLA',
                 'NAME',
-                'NO_OLD_SAFARI_ARRAY_ITERATOR',
                 'REGEXP_STRING_ITERATOR',
                 'STATUS',
                 'V8_SRC',
@@ -1968,34 +1468,22 @@
             versions: ['90-130'],
             includes:
             [
-                'ANY_DOCUMENT',
+                'ARRAY_ITERATOR',
                 'ARROW',
-                'ASYNC_FUNCTION',
                 'AT',
-                'ATOB',
                 'BARPROP',
-                'ESC_HTML_QUOT_ONLY',
-                'ESC_REGEXP_LF',
-                'ESC_REGEXP_SLASH',
+                'DOCUMENT',
+                'ESC_HTML_QUOT',
                 'FF_SRC',
                 'FILL',
                 'FLAT',
                 'FROM_CODE_POINT',
                 'FUNCTION_19_LF',
-                'GENERIC_ARRAY_TO_STRING',
-                'GLOBAL_UNDEFINED',
-                'GMT',
-                'HISTORY',
                 'INCR_CHAR',
-                'INTL',
-                'JAPANESE_INFINITY',
                 'LOCALE_INFINITY',
                 'LOCALE_NUMERALS_BN',
                 'LOCALE_NUMERALS_EXT',
-                'LOCATION',
-                'MOZILLA',
                 'NAME',
-                'NO_OLD_SAFARI_ARRAY_ITERATOR',
                 'OBJECT_ARRAY_ENTRIES_CTOR',
                 'REGEXP_STRING_ITERATOR',
                 'SHORT_LOCALES',
@@ -2022,50 +1510,25 @@
             versions:   ['134-'],
             includes:   { SHORT_LOCALES: false },
         },
-        IE_9:
+        IE_11:
         {
-            families: ['Internet Explorer'],
-            versions: ['9'],
+            families:   ['Internet Explorer'],
+            versions:   ['11'],
             includes:
             [
                 'CAPITAL_HTML',
+                'CONSOLE',
                 'DOCUMENT',
-                'ESC_REGEXP_LF',
-                'ESC_REGEXP_SLASH',
                 'FUNCTION_22_LF',
-                'GENERIC_ARRAY_TO_STRING',
-                'HISTORY',
                 'IE_SRC',
                 'INCR_CHAR',
-                'MOZILLA',
-                'OBJECT_L_LOCATION_CTOR',
+                'PLAIN_INTL',
+                'SHORT_LOCALES',
                 'STATUS',
-                'UNDEFINED',
                 'WINDOW',
             ],
-        },
-        IE_10:
-        {
-            inherits:   'IE_9',
-            versions:   ['10'],
-            includes:   { ATOB: true, CONSOLE: true, OBJECT_UNDEFINED: true, UNDEFINED: false },
             attributes: { 'char-increment-restriction': null, 'web-worker-restriction': null },
         },
-        IE_11:
-        {
-            inherits: 'IE_10',
-            versions: ['11'],
-            includes:
-            {
-                ANY_DOCUMENT:       true,
-                DOCUMENT:           false,
-                GMT:                true,
-                JAPANESE_INFINITY:  true,
-                LOCALE_NUMERALS:    true,
-                PLAIN_INTL:         true,
-                SHORT_LOCALES:      true,
-            },
-        },
         IE_11_WIN_10:
         {
             inherits:               'IE_11',
@@ -2075,105 +1538,39 @@
             includes:
             {
                 LOCALE_INFINITY:        true,
-                LOCALE_NUMERALS:        false,
                 LOCALE_NUMERALS_BN:     true,
                 LOCALE_NUMERALS_EXT:    true,
             },
         },
-        NODE_0_10:
+        NODE_20:
         {
-            families: ['Node.js'],
-            versions: ['0.10'],
+            families:   ['Node.js'],
+            versions:   ['20-21'],
             includes:
             [
-                'ESC_HTML_ALL',
-                'FUNCTION_22_LF',
-                'GENERIC_ARRAY_TO_STRING',
-                'GLOBAL_UNDEFINED',
-                'GMT',
+                'ARRAY_ITERATOR',
+                'ARROW',
+                'AT',
+                'ESC_HTML_QUOT',
+                'FILL',
+                'FLAT',
+                'FROM_CODE_POINT',
+                'FUNCTION_19_LF',
                 'INCR_CHAR',
+                'LOCALE_INFINITY',
+                'LOCALE_NUMERALS_BN',
+                'LOCALE_NUMERALS_EXT',
                 'NAME',
+                'OBJECT_ARRAY_ENTRIES_CTOR',
+                'REGEXP_STRING_ITERATOR',
+                'SHORT_LOCALES',
                 'V8_SRC',
             ],
-        },
-        NODE_0_12:
-        {
-            inherits: 'NODE_0_10',
-            versions: ['0.12'],
-            includes:
-            {
-                ESC_HTML_ALL:                   false,
-                ESC_HTML_QUOT_ONLY:             true,
-                JAPANESE_INFINITY:              true,
-                LOCALE_INFINITY:                true,
-                NO_OLD_SAFARI_ARRAY_ITERATOR:   true,
-                OBJECT_ARRAY_ENTRIES_CTOR:      true,
-                PLAIN_INTL:                     true,
-            },
-        },
-        NODE_4:
-        {
-            inherits: 'NODE_0_12',
-            versions: ['4'],
-            includes: { ARROW: true, ESC_REGEXP_SLASH: true, FILL: true, FROM_CODE_POINT: true },
-        },
-        NODE_5:
-        {
-            inherits:   'NODE_4',
-            versions:   ['5-7.5'],
             attributes: { 'char-increment-restriction': null },
         },
-        NODE_7_6:
-        {
-            inherits: 'NODE_5',
-            versions: ['7.6-9'],
-            includes: { ASYNC_FUNCTION: true },
-        },
-        NODE_10:
-        {
-            inherits: 'NODE_7_6',
-            versions: ['10'],
-            includes: { FUNCTION_19_LF: true, FUNCTION_22_LF: false },
-        },
-        NODE_11:
-        {
-            inherits: 'NODE_10',
-            versions: ['11'],
-            includes: { FLAT: true },
-        },
-        NODE_12:
-        {
-            inherits: 'NODE_11',
-            versions: ['12'],
-            includes: { ESC_REGEXP_LF: true, REGEXP_STRING_ITERATOR: true },
-        },
-        NODE_13:
-        {
-            inherits: 'NODE_12',
-            versions: ['13|14'],
-            includes: { LOCALE_NUMERALS_BN: true, LOCALE_NUMERALS_EXT: true, SHORT_LOCALES: true },
-        },
-        NODE_15:
-        {
-            inherits: 'NODE_13',
-            versions: ['15'],
-            includes: { INTL: true, PLAIN_INTL: false },
-        },
-        NODE_16_0:
-        {
-            inherits: 'NODE_15',
-            versions: ['16.0-16.5'],
-            includes: { ATOB: true },
-        },
-        NODE_16_6:
-        {
-            inherits: 'NODE_16_0',
-            versions: ['16.6-21'],
-            includes: { AT: true },
-        },
         NODE_22:
         {
-            inherits: 'NODE_16_6',
+            inherits: 'NODE_20',
             versions: ['22.0-22.11|23.0-23.2'],
             includes: { ITERATOR_HELPER: true, OBJECT_ARRAY_ENTRIES_CTOR: false },
         },
@@ -2183,123 +1580,46 @@
             versions: ['22.12-22.14|23.3-'],
             includes: { SHORT_LOCALES: false },
         },
-        SAFARI_7_0:
+        SAFARI_PRE_PREV:
+        {
+            description:    describeEngine('the previous to previous version of Safari'),
+            aliasFor:       'SAFARI_17_4',
+        },
+        SAFARI_17_4:
         {
             families: ['Safari'],
-            versions: ['7.0'],
+            versions: ['17.4-17.6'],
             includes:
             [
-                'ANY_DOCUMENT',
-                'ATOB',
+                'ARRAY_ITERATOR',
+                'ARROW',
+                'AT',
                 'BARPROP',
-                'CONSOLE',
-                'ESC_HTML_QUOT_ONLY',
-                'ESC_REGEXP_LF',
-                'ESC_REGEXP_SLASH',
+                'DOCUMENT',
+                'ESC_HTML_QUOT',
                 'FF_SRC',
-                'GENERIC_ARRAY_TO_STRING',
-                'GLOBAL_UNDEFINED',
-                'GMT',
-                'HISTORY',
+                'FILL',
+                'FLAT',
+                'FROM_CODE_POINT',
+                'FUNCTION_19_LF',
                 'INCR_CHAR',
-                'LOCATION',
-                'MOZILLA',
+                'LOCALE_INFINITY',
+                'LOCALE_NUMERALS_BN',
+                'LOCALE_NUMERALS_EXT',
                 'NAME',
-                'NODECONSTRUCTOR',
-                'OBJECT_L_LOCATION_CTOR',
-                'OLD_SAFARI_LOCATION_CTOR',
+                'OBJECT_ARRAY_ENTRIES_CTOR',
+                'REGEXP_STRING_ITERATOR',
+                'SHORT_LOCALES',
                 'STATUS',
                 'WINDOW',
             ],
             attributes:
             {
-                'char-increment-restriction':   null,
-                'no-console-in-web-worker':     null,
-                'non-ie-restriction':           null,
-                'old-safari-restriction':       null,
-                'web-worker-restriction':       null,
-            },
-        },
-        SAFARI_7_1:
-        {
-            inherits:   'SAFARI_7_0',
-            versions:   ['7.1|8'],
-            includes:   { ARRAY_ITERATOR: true, FILL: true },
-            attributes: { 'no-console-in-web-worker': undefined, 'safari-bug-21820506': null },
-        },
-        SAFARI_9:
-        {
-            inherits: 'SAFARI_7_1',
-            versions: ['9'],
-            includes:
-            {
-                ARRAY_ITERATOR:                 false,
-                FROM_CODE_POINT:                true,
-                FUNCTION_22_LF:                 true,
-                NO_OLD_SAFARI_ARRAY_ITERATOR:   true,
-                OBJECT_ARRAY_ENTRIES_CTOR:      true,
-            },
-        },
-        SAFARI_10_0:
-        {
-            inherits:   'SAFARI_9',
-            versions:   ['10.0'],
-            includes:
-            {
-                ARROW:                      true,
-                JAPANESE_INFINITY:          true,
-                LOCALE_INFINITY:            true,
-                LOCALE_NUMERALS_BN:         true,
-                LOCALE_NUMERALS_EXT:        true,
-                NODECONSTRUCTOR:            false,
-                OBJECT_L_LOCATION_CTOR:     false,
-                OLD_SAFARI_LOCATION_CTOR:   false,
-                PLAIN_INTL:                 true,
-                SHORT_LOCALES:              true,
+                'char-increment-restriction':       null,
+                'non-ie-restriction':               null,
+                'unstable':                         null,
+                'web-worker-restriction':           null,
             },
-            attributes: { 'old-safari-restriction': undefined, 'safari-bug-21820506': undefined },
-        },
-        SAFARI_10_1:
-        {
-            inherits: 'SAFARI_10_0',
-            versions: ['10.1|11'],
-            includes: { ASYNC_FUNCTION: true },
-        },
-        SAFARI_12:
-        {
-            inherits: 'SAFARI_10_1',
-            versions: ['12'],
-            includes: { FLAT: true },
-        },
-        SAFARI_13:
-        {
-            inherits: 'SAFARI_12',
-            versions: ['13|14.0.0'],
-            includes: { REGEXP_STRING_ITERATOR: true },
-        },
-        SAFARI_14_0_1:
-        {
-            inherits: 'SAFARI_13',
-            versions: ['14.0.1-14.0.3'],
-            includes: { INTL: true, PLAIN_INTL: false },
-        },
-        SAFARI_14_1:
-        {
-            inherits: 'SAFARI_14_0_1',
-            versions: ['14.1-15.3'],
-            includes: { CONSOLE: false },
-        },
-        SAFARI_15_4:
-        {
-            inherits: 'SAFARI_14_1',
-            versions: ['15.4-17.3'],
-            includes: { AT: true },
-        },
-        SAFARI_17_4:
-        {
-            inherits: 'SAFARI_15_4',
-            versions: ['17.4-17.6'],
-            includes: { FUNCTION_19_LF: true, FUNCTION_22_LF: false },
         },
         SAFARI_18_0:
         {
@@ -2307,6 +1627,11 @@
             versions: ['18.0-18.3'],
             includes: { SHORT_LOCALES: false },
         },
+        SAFARI_PREV:
+        {
+            description:    describeEngine('the previous to current version of Safari'),
+            aliasFor:       'SAFARI_18_4',
+        },
         SAFARI:
         {
             description:    describeEngine('the current stable version of Safari'),
@@ -2318,7 +1643,6 @@
             versions:   ['18.4-'],
             includes:
             { ITERATOR_HELPER: true, LOCALE_NUMERALS_BN: false, OBJECT_ARRAY_ENTRIES_CTOR: false },
-            attributes: { 'locale-numerals-ext-restriction': null },
         },
     };
     (function ()
@@ -2950,13 +2274,6 @@
     var FB_R_PADDING_SHIFTS;
     var FH_R_PADDING_SHIFTS;
 
-    function backslashDefinition()
-    {
-        var replacement = this._replaceCharByUnescape(0x5C);
-        var solution = new SimpleSolution(undefined, replacement, SolutionType.STRING);
-        return solution;
-    }
-
     function chooseOtherArgName(argName)
     {
         var otherArgName = argName !== 'undefined' ? 'undefined' : 'falsefalse';
@@ -3244,98 +2561,49 @@
 
     (function ()
     {
-        var ANY_DOCUMENT                    = Feature.ANY_DOCUMENT;
-        var ANY_WINDOW                      = Feature.ANY_WINDOW;
         var ARRAY_ITERATOR                  = Feature.ARRAY_ITERATOR;
         var ARROW                           = Feature.ARROW;
-        var ASYNC_FUNCTION                  = Feature.ASYNC_FUNCTION;
         var AT                              = Feature.AT;
-        var ATOB                            = Feature.ATOB;
         var BARPROP                         = Feature.BARPROP;
-        var CALL_ON_GLOBAL                  = Feature.CALL_ON_GLOBAL;
         var CAPITAL_HTML                    = Feature.CAPITAL_HTML;
         var CONSOLE                         = Feature.CONSOLE;
-        var CREATE_ELEMENT                  = Feature.CREATE_ELEMENT;
         var DOCUMENT                        = Feature.DOCUMENT;
-        var DOMWINDOW                       = Feature.DOMWINDOW;
-        var ESC_HTML_ALL                    = Feature.ESC_HTML_ALL;
         var ESC_HTML_QUOT                   = Feature.ESC_HTML_QUOT;
-        var ESC_HTML_QUOT_ONLY              = Feature.ESC_HTML_QUOT_ONLY;
-        var ESC_REGEXP_LF                   = Feature.ESC_REGEXP_LF;
-        var ESC_REGEXP_SLASH                = Feature.ESC_REGEXP_SLASH;
         var FF_SRC                          = Feature.FF_SRC;
         var FILL                            = Feature.FILL;
         var FLAT                            = Feature.FLAT;
-        var FORMS                           = Feature.FORMS;
         var FROM_CODE_POINT                 = Feature.FROM_CODE_POINT;
         var FUNCTION_19_LF                  = Feature.FUNCTION_19_LF;
         var FUNCTION_22_LF                  = Feature.FUNCTION_22_LF;
-        var GENERIC_ARRAY_TO_STRING         = Feature.GENERIC_ARRAY_TO_STRING;
-        var GLOBAL_UNDEFINED                = Feature.GLOBAL_UNDEFINED;
-        var GMT                             = Feature.GMT;
-        var HISTORY                         = Feature.HISTORY;
-        var HTMLAUDIOELEMENT                = Feature.HTMLAUDIOELEMENT;
         var IE_SRC                          = Feature.IE_SRC;
         var INCR_CHAR                       = Feature.INCR_CHAR;
-        var INTL                            = Feature.INTL;
         var ITERATOR_HELPER                 = Feature.ITERATOR_HELPER;
-        var JAPANESE_INFINITY               = Feature.JAPANESE_INFINITY;
         var LOCALE_INFINITY                 = Feature.LOCALE_INFINITY;
-        var LOCALE_NUMERALS                 = Feature.LOCALE_NUMERALS;
         var LOCALE_NUMERALS_BN              = Feature.LOCALE_NUMERALS_BN;
         var LOCALE_NUMERALS_EXT             = Feature.LOCALE_NUMERALS_EXT;
-        var LOCATION                        = Feature.LOCATION;
-        var MOZILLA                         = Feature.MOZILLA;
         var NAME                            = Feature.NAME;
-        var NODECONSTRUCTOR                 = Feature.NODECONSTRUCTOR;
-        var NODE_NAME                       = Feature.NODE_NAME;
         var NO_FF_SRC                       = Feature.NO_FF_SRC;
         var NO_IE_SRC                       = Feature.NO_IE_SRC;
-        var NO_OLD_SAFARI_ARRAY_ITERATOR    = Feature.NO_OLD_SAFARI_ARRAY_ITERATOR;
         var NO_V8_SRC                       = Feature.NO_V8_SRC;
         var OBJECT_ARRAY_ENTRIES_CTOR       = Feature.OBJECT_ARRAY_ENTRIES_CTOR;
-        var OBJECT_L_LOCATION_CTOR          = Feature.OBJECT_L_LOCATION_CTOR;
-        var OBJECT_UNDEFINED                = Feature.OBJECT_UNDEFINED;
         var OBJECT_W_SELF                   = Feature.OBJECT_W_SELF;
-        var OLD_SAFARI_LOCATION_CTOR        = Feature.OLD_SAFARI_LOCATION_CTOR;
         var PLAIN_INTL                      = Feature.PLAIN_INTL;
         var REGEXP_STRING_ITERATOR          = Feature.REGEXP_STRING_ITERATOR;
-        var SELF_OBJ                        = Feature.SELF_OBJ;
+        var SELF                            = Feature.SELF;
         var SHORT_LOCALES                   = Feature.SHORT_LOCALES;
         var STATUS                          = Feature.STATUS;
-        var UNDEFINED                       = Feature.UNDEFINED;
         var V8_SRC                          = Feature.V8_SRC;
         var WINDOW                          = Feature.WINDOW;
 
-        function createCharDefaultDefinition
-        (atobOpt, charCodeOpt, escSeqOpt, unescapeOpt)
+        function charDefaultDefinition(char)
         {
-            function charDefaultDefinition(char)
-            {
-                var charCode = char.charCodeAt();
-                var solution =
-                this._createCharDefaultSolution
-                (char, charCode, atobOpt && charCode < 0x100, charCodeOpt, escSeqOpt, unescapeOpt);
-                return solution;
-            }
-
-            return charDefaultDefinition;
+            var solution = this._defaultResolveCharacter(char);
+            return solution;
         }
 
-        function defineCharDefault(opts)
+        function defineCharDefault()
         {
-            function checkOpt(optName)
-            {
-                var opt = !(opts && optName in opts) || opts[optName];
-                return opt;
-            }
-
-            var atobOpt     = checkOpt('atob');
-            var charCodeOpt = checkOpt('charCode');
-            var escSeqOpt   = checkOpt('escSeq');
-            var unescapeOpt = checkOpt('unescape');
-            var definition = createCharDefaultDefinition(atobOpt, charCodeOpt, escSeqOpt, unescapeOpt);
-            var entry = define(definition);
+            var entry = define(charDefaultDefinition);
             return entry;
         }
 
@@ -3428,7 +2696,7 @@
                 else
                     expr += '[' + index + ']';
             }
-            var entry = define._callWithFeatures(expr, LOCALE_NUMERALS, arguments, 3);
+            var entry = define._callWithFeatures(expr, arguments, 3);
             return entry;
         }
 
@@ -3478,13 +2746,7 @@
 
         BASE64_ALPHABET_HI_4 =
         [
-            [
-                define('A'),
-                define('D', CALL_ON_GLOBAL, DOMWINDOW),
-                define('C', CAPITAL_HTML),
-                define('A', ARRAY_ITERATOR, CAPITAL_HTML),
-                define('A', ARRAY_ITERATOR, CALL_ON_GLOBAL, DOMWINDOW),
-            ],
+            [define('A'), define('C', CAPITAL_HTML), define('A', ARRAY_ITERATOR)],
             [
                 define('F'),
                 define('H', ITERATOR_HELPER),
@@ -3494,13 +2756,7 @@
             'Infinity',
             'NaNfalse',
             [define('S'), define('R', CAPITAL_HTML), define('S', ARRAY_ITERATOR)],
-            [
-                define('W'),
-                define('U', CAPITAL_HTML),
-                define('W', CALL_ON_GLOBAL, DOMWINDOW),
-                define('W', CALL_ON_GLOBAL, OBJECT_W_SELF),
-                define('U', ARRAY_ITERATOR, CAPITAL_HTML),
-            ],
+            [define('W'), define('U', CAPITAL_HTML)],
             'a',
             'false',
             'i',
@@ -3608,17 +2864,7 @@
         CHARACTERS =
         noProto
         ({
-            // '\0'…'\x07'
-            '\b':
-            [
-                define('Function("return\\"" + ESCAPING_BACKSLASH + "b\\"")()[0]'),
-                defineCharDefault({ escSeq: false }),
-            ],
-            '\t':
-            [
-                define('Function("return\\"" + ESCAPING_BACKSLASH + "true\\"")()[0]'),
-                defineCharDefault({ escSeq: false }),
-            ],
+            // '\0'…'\x09'
             '\n':
             [
                 define('(RP_0_S + Function())[23]'),
@@ -3627,25 +2873,10 @@
                 define('(RP_0_S + ANY_FUNCTION)[0]', IE_SRC),
                 defineCharInFnHead(13, NO_V8_SRC),
             ],
-            '\v':
-            [
-                define('Function("return\\"" + ESCAPING_BACKSLASH + "v\\"")()[0]'),
-                defineCharDefault({ escSeq: false }),
-            ],
-            '\f':
-            [
-                define('Function("return\\"" + ESCAPING_BACKSLASH + "false\\"")()[0]'),
-                defineCharDefault({ escSeq: false }),
-            ],
-            '\r':
-            [
-                define('Function("return\\"" + ESCAPING_BACKSLASH + "r\\"")()'),
-                defineCharDefault({ escSeq: false }),
-            ],
-            // '\x0e'…'\x1d'
+            // '\x0b'…'\x1d'
             '\x1e':
             [
-                define('(RP_5_A + atob("NaNfalse"))[10]', ATOB),
+                define('(RP_5_A + atob("NaNfalse"))[10]'),
             ],
             // '\x1f'
             ' ':
@@ -3672,7 +2903,6 @@
             ],
             '#':
             [
-                define('document.nodeName[0]', NODE_NAME),
                 defineCharDefault(),
             ],
             // '$'
@@ -3680,17 +2910,14 @@
             [
                 define('escape(FILTER)[20]'),
                 define('escape(0 + AT)[20]', AT),
-                define('atob("000l")[2]', ATOB),
                 define('escape(FILL)[21]', FILL),
                 define('escape(FLAT)[21]', FLAT),
                 define('escape(ANY_FUNCTION)[0]', IE_SRC),
+                defineCharDefault(),
             ],
             '&':
             [
-                define('"".fontcolor("".italics())[22]', ESC_HTML_ALL),
-                define('"".fontcolor("".sub())[20]', ESC_HTML_ALL),
-                define('"".fontcolor("\\"")[13]', ESC_HTML_QUOT),
-                define('"".fontcolor("".fontcolor([]))[31]', ESC_HTML_QUOT_ONLY),
+                define('"".fontcolor("".fontcolor([]))[31]', ESC_HTML_QUOT),
                 defineCharDefault(),
             ],
             // '\''
@@ -3717,18 +2944,10 @@
                 define('"true".sub()[10]'),
             ],
             // '0'…'9'
-            ':':
-            [
-                define('(RP_0_S + RegExp())[3]'),
-                defineCharDefault(),
-            ],
+            // ':'
             ';':
             [
-                define('"".fontcolor("".italics())[21]', ESC_HTML_ALL),
-                define('"".fontcolor(true + "".sub())[20]', ESC_HTML_ALL),
-                define('"".fontcolor("NaN\\"")[21]', ESC_HTML_QUOT),
-                define('"".fontcolor("".fontcolor())[30]', ESC_HTML_QUOT_ONLY),
-                defineCharDefault(),
+                define('"".fontcolor("".fontcolor())[30]', ESC_HTML_QUOT),
             ],
             '<':
             [
@@ -3763,45 +2982,31 @@
             'C':
             [
                 define('escape("".italics())[2]'),
-                define('escape("".sub())[2]'),
                 define('escape(F_A_L_S_E)[11]'),
-                define('atob("00NaNfalse")[1]', ATOB),
                 define('(RP_4_A + "".fontcolor())[10]', CAPITAL_HTML),
                 define('(RP_3_WA + Function("return console")())[11]', CONSOLE),
-                define('(RP_0_S + Node)[12]', NODECONSTRUCTOR),
+                defineCharDefault(),
             ],
             'D':
             [
+                define('btoa("00")[1]'),
                 // * The escaped character may be either "]" or "}".
                 define('escape((+("1000" + (RP_5_A + FILTER + 0)[40] + 0) + FILTER)[40])[2]'), // *
                 define('escape("]")[2]'),
                 define('escape("}")[2]'),
-                define('(document + RP_0_S)[SLICE_OR_SUBSTR]("-10")[1]', ANY_DOCUMENT),
                 define('escape((RP_4_A + [+("1000" + (AT + 0)[31] + 0)] + AT)[40])[2]', AT), // *
-                define('btoa("00")[1]', ATOB),
-                define('(RP_3_WA + document)[11]', DOCUMENT),
-                define('(RP_3_WA + self)[11]', DOMWINDOW),
                 define // *
                 ('escape((NaN + [+("10" + [(RP_6_S + FILL)[40]] + "000")] + FILL)[40])[2]', FILL),
                 define // *
                 ('escape((NaN + [+("10" + [(RP_6_S + FLAT)[40]] + "000")] + FLAT)[40])[2]', FLAT),
-                define('escape(ARRAY_ITERATOR)[30]', NO_OLD_SAFARI_ARRAY_ITERATOR),
                 define('escape(FILTER)[50]', V8_SRC),
-                define('(document + [RP_1_WA]).at("-10")', ANY_DOCUMENT, AT),
-                define('escape(AT)[61]', AT, IE_SRC),
                 define('escape([[]][+(RP_0_S + AT)[0]] + AT)[61]', AT, NO_FF_SRC), // *
-                define('escape([NaN][+(RP_1_WA + AT)[20]] + AT)[61]', AT, NO_IE_SRC), // *
-                define('escape(true + AT)[50]', AT, V8_SRC),
                 define('escape(FILL)[60]', FF_SRC, FILL),
-                define('escape(FLAT)[60]', FF_SRC, FLAT),
             ],
             'E':
             [
-                defineCharInFn('RegExp', 12),
-                define('btoa("0NaN")[1]', ATOB),
+                define('btoa("0NaN")[1]'),
                 define('(RP_5_A + "".link())[10]', CAPITAL_HTML),
-                define('(RP_3_WA + Audio)[21]', HTMLAUDIOELEMENT),
-                define('(RP_0_S + REGEXP_STRING_ITERATOR)[11]', REGEXP_STRING_ITERATOR),
             ],
             'F':
             [
@@ -3810,27 +3015,19 @@
             ],
             'G':
             [
-                define('btoa("0false")[1]', ATOB),
+                define('btoa("0false")[1]'),
                 define('"0".big()[10]', CAPITAL_HTML),
-                define('(RP_5_A + Date())[30]', GMT),
             ],
             'H':
             [
-                define('btoa(true)[1]', ATOB),
+                define('btoa(true)[1]'),
                 define('"".link()[3]', CAPITAL_HTML),
-                define('(RP_3_WA + document.forms)[11]', FORMS),
-                define
-                ({ expr: '(RP_3_WA + Function("return history")())[11]', optimize: true }, HISTORY),
-                define('(RP_1_WA + Audio)[10]', HTMLAUDIOELEMENT),
                 define('(RP_4_A + [].entries().filter(ANY_FUNCTION))[21]', ITERATOR_HELPER),
-                define({ expr: '(RP_3_WA + self.history)[11]', optimize: true }, HISTORY, SELF_OBJ),
             ],
             'I': '"Infinity"[0]',
             'J':
             [
-                define('"j"[TO_UPPER_CASE]()'),
-                define('btoa(true)[2]', ATOB),
-                defineCharDefault({ atob: false }),
+                define('btoa(true)[2]'),
             ],
             'K':
             [
@@ -3839,96 +3036,38 @@
             ],
             'L':
             [
-                define('btoa(".")[0]', ATOB),
+                define('btoa(".")[0]'),
                 define('(RP_3_WA + "".fontcolor())[11]', CAPITAL_HTML),
-                define('(RP_0_S + document.forms)[11]', FORMS),
-                define('(RP_0_S + Audio)[12]', HTMLAUDIOELEMENT),
-                define
-                (
-                    {
-                        expr:
-                        'Function("return toString.call(location)")()[SLICE_OR_SUBSTR]("-10")[1]',
-                        optimize: true,
-                    },
-                    LOCATION
-                ),
-                define('(RP_3_WA + LOCATION_CONSTRUCTOR)[11]', OBJECT_L_LOCATION_CTOR),
-                define
-                (
-                    '(LOCATION_CONSTRUCTOR + RP_0_S)[SLICE_OR_SUBSTR]("-20")[0]',
-                    OLD_SAFARI_LOCATION_CTOR
-                ),
-                define
-                (
-                    {
-                        expr:
-                        '(Function("return toString.call(location)")() + RP_1_WA).at("-10")',
-                        optimize: true,
-                    },
-                    AT,
-                    LOCATION
-                ),
-                define('(LOCATION_CONSTRUCTOR + RP_0_S).at("-20")', AT, OLD_SAFARI_LOCATION_CTOR),
-                define
-                (
-                    '[][TO_STRING].call(location)[SLICE_OR_SUBSTR]("-10")[1]',
-                    GENERIC_ARRAY_TO_STRING,
-                    LOCATION
-                ),
-                define
-                ('self[TO_STRING].call(location)[SLICE_OR_SUBSTR]("-10")[1]', LOCATION, SELF_OBJ),
-                define
-                (
-                    '([][TO_STRING].call(location) + RP_1_WA).at("-10")',
-                    AT,
-                    GENERIC_ARRAY_TO_STRING,
-                    LOCATION
-                ),
-                define('(self[TO_STRING].call(location) + RP_1_WA).at("-10")', AT, LOCATION, SELF_OBJ),
             ],
             'M':
             [
-                define('btoa(0)[0]', ATOB),
+                define('btoa(0)[0]'),
                 define('"".small()[2]', CAPITAL_HTML),
-                define('(RP_0_S + self)[10]', DOMWINDOW),
-                define('(RP_0_S + document.forms)[10]', FORMS),
-                define('(RP_4_A + Date())[30]', GMT),
-                define('(RP_0_S + Audio)[11]', HTMLAUDIOELEMENT),
-                define('USER_AGENT[0]', MOZILLA),
             ],
             'N': '"NaN"[0]',
             'O':
             [
                 defineCharInFn('Object', 9),
+                define('btoa(NaN)[3]'),
                 define('(RP_3_WA + PLAIN_OBJECT)[11]'),
-                define('btoa(NaN)[3]', ATOB),
                 define('"".fontcolor()[2]', CAPITAL_HTML),
-                define('(RP_1_WA + self)[10]', DOMWINDOW),
                 define('(RP_3_WA + Intl)[11]', PLAIN_INTL),
             ],
             'P':
             [
-                define('String.fromCharCode("80")'),
-                define('(RP_3_WA + Function("return async function(){}")()())[11]', ASYNC_FUNCTION),
-                define('atob("01A")[1]', ATOB),
-                define('btoa("".italics())[0]', ATOB),
+                define('btoa("".italics())[0]'),
                 define('(RP_0_S + Function("return statusbar")())[11]', BARPROP),
                 define('"0".sup()[10]', CAPITAL_HTML),
-                define('(RP_0_S + self.statusbar)[11]', BARPROP, SELF_OBJ),
-                defineCharDefault({ atob: false, charCode: false }),
+                defineCharDefault(),
             ],
             'Q':
             [
-                define('"q"[TO_UPPER_CASE]()'),
-                define('btoa(1)[1]', ATOB),
-                defineCharDefault({ atob: false }),
+                define('btoa(1)[1]'),
             ],
             'R':
             [
-                defineCharInFn('RegExp', 9),
-                define('btoa("0true")[2]', ATOB),
+                define('btoa("0true")[2]'),
                 define('"".fontcolor()[10]', CAPITAL_HTML),
-                define('(RP_3_WA + REGEXP_STRING_ITERATOR)[11]', REGEXP_STRING_ITERATOR),
             ],
             'S':
             [
@@ -3937,98 +3076,49 @@
             ],
             'T':
             [
-                define
-                (
-                    {
-                        expr:
-                        '(RP_0_S + ' +
-                        'Function("try{undefined.false}catch(undefined){return undefined}")())[0]',
-                        optimize: true,
-                    }
-                ),
-                define('btoa(NaN)[0]', ATOB),
+                define('btoa(NaN)[0]'),
                 define('"".fontcolor([])[20]', CAPITAL_HTML),
-                define('(RP_1_WA + document.forms)[10]', FORMS),
-                define('(RP_3_WA + Date())[30]', GMT),
-                define('(RP_0_S + Audio)[10]', HTMLAUDIOELEMENT),
-                defineCharDefault({ atob: false }),
             ],
             'U':
             [
-                define('btoa("1NaN")[1]', ATOB),
+                define('btoa("1NaN")[1]'),
                 define('"".sub()[2]', CAPITAL_HTML),
-                define
-                (
-                    { expr: '(RP_3_WA + Function("return toString")()())[11]', optimize: true },
-                    GLOBAL_UNDEFINED
-                ),
-                define
-                (
-                    { expr: '(RP_3_WA + Function("return{}.toString")()())[11]', optimize: true },
-                    OBJECT_UNDEFINED
-                ),
-                define('(RP_3_WA + PLAIN_OBJECT[TO_STRING].call())[11]', UNDEFINED),
-                define('(RP_3_WA + ARRAY_ITERATOR[TO_STRING].call())[11]', ARRAY_ITERATOR, UNDEFINED),
-                define
-                (
-                    { expr: '(RP_3_WA + Function("return Intl.toString")()())[11]', optimize: true },
-                    INTL,
-                    OBJECT_UNDEFINED
-                ),
-                define('(RP_3_WA + Intl[TO_STRING].call())[11]', INTL, UNDEFINED),
             ],
             'V':
             [
-                define('"v"[TO_UPPER_CASE]()'),
-                define('btoa(undefined)[10]', ATOB),
-                define('(RP_0_S + document.createElement("video"))[12]', CREATE_ELEMENT),
-                defineCharDefault({ atob: false }),
+                define('btoa(undefined)[10]'),
             ],
             'W':
             [
-                define('"w"[TO_UPPER_CASE]()'),
-                define('(self + RP_4_A)[SLICE_OR_SUBSTR]("-11")[0]', ANY_WINDOW),
-                define('btoa(undefined)[1]', ATOB),
-                define('(RP_0_S + self)[11]', DOMWINDOW),
+                define('btoa(undefined)[1]'),
                 define('(RP_3_WA + self)[11]', OBJECT_W_SELF),
-                define('(self + RP_4_A).at("-11")', ANY_WINDOW, AT),
-                defineCharDefault({ atob: false }),
             ],
             'X':
             [
-                define('"x"[TO_UPPER_CASE]()'),
-                define('btoa("1true")[1]', ATOB),
-                defineCharDefault({ atob: false }),
+                define('btoa("1true")[1]'),
             ],
             'Y':
             [
-                define('"y"[TO_UPPER_CASE]()'),
-                define('btoa("a")[0]', ATOB),
-                defineCharDefault({ atob: false }),
+                define('btoa("a")[0]'),
             ],
             'Z':
             [
-                define('btoa(false)[0]', ATOB),
-                define('(RP_3_WA + "".fontsize())[11]', CAPITAL_HTML),
+                define('btoa(false)[0]'),
             ],
             '[':
             [
                 defineCharInFnBody(14),
                 define('(RP_0_S + ARRAY_ITERATOR)[0]', ARRAY_ITERATOR),
             ],
-            '\\':
-            [
-                define('ESCAPING_BACKSLASH'),
-                defineCharDefault({ atob: false, escSeq: false, unescape: false }),
-            ],
+            // '\\'
             ']':
             [
                 defineCharInFnBody(26),
-                define('(RP_0_S + ARRAY_ITERATOR)[22]', NO_OLD_SAFARI_ARRAY_ITERATOR),
+                define('(RP_0_S + ARRAY_ITERATOR)[22]', ARRAY_ITERATOR),
             ],
             '^':
             [
-                define('atob("undefined0")[2]', ATOB),
+                define('atob("undefined0")[2]'),
             ],
             // '_'
             // '`'
@@ -4052,18 +3142,17 @@
             ],
             'h':
             [
+                define('btoa("0false")[3]'),
                 define('101[TO_STRING]("21")[1]'),
-                define('btoa("0false")[3]', ATOB),
             ],
             'i': '([RP_5_A] + undefined)[10]',
             'j':
             [
+                define('(RP_0_S + Intl)[3]'),
                 define('(RP_0_S + PLAIN_OBJECT)[10]'),
                 define('(RP_0_S + ARRAY_ITERATOR)[3]', ARRAY_ITERATOR),
-                define('(RP_0_S + Intl)[3]', INTL),
-                define('(RP_0_S + Node)[3]', NODECONSTRUCTOR),
                 define('(RP_0_S + Intl)[10]', PLAIN_INTL),
-                define('(RP_0_S + self)[3]', SELF_OBJ),
+                define('(RP_0_S + self)[3]', SELF),
             ],
             'k':
             [
@@ -4085,15 +3174,13 @@
             'p':
             [
                 define('211[TO_STRING]("31")[1]'),
-                define('(RP_3_WA + btoa(undefined))[10]', ATOB),
+                define('(RP_3_WA + btoa(undefined))[10]'),
                 define('(RP_0_S + [].entries().filter(ANY_FUNCTION))[20]', ITERATOR_HELPER),
             ],
             'q':
             [
                 define('212[TO_STRING]("31")[1]'),
-                define('"".fontcolor(0 + "".fontcolor())[30]', ESC_HTML_ALL),
-                define('"".fontcolor("0false\\"")[20]', ESC_HTML_QUOT),
-                define('"".fontcolor(true + "".fontcolor())[30]', ESC_HTML_QUOT_ONLY),
+                define('"".fontcolor(true + "".fontcolor())[30]', ESC_HTML_QUOT),
                 defineCharDefault(),
             ],
             'r': '"true"[1]',
@@ -4107,22 +3194,19 @@
             'w':
             [
                 define('32[TO_STRING]("33")'),
-                define('(self + RP_0_S)[SLICE_OR_SUBSTR]("-2")[0]', ANY_WINDOW),
-                define('atob("undefined0")[1]', ATOB),
-                define('(RP_4_A + self)[20]', DOMWINDOW),
+                define('atob("undefined0")[1]'),
                 define('(RP_0_S + self)[13]', WINDOW),
-                define('(self + RP_0_S).at("-2")', ANY_WINDOW, AT),
             ],
             'x':
             [
+                define('btoa("falsefalse")[10]'),
                 define('101[TO_STRING]("34")[1]'),
-                define('btoa("falsefalse")[10]', ATOB),
             ],
             'y': '(RP_3_WA + [Infinity])[10]',
             'z':
             [
                 define('35[TO_STRING]("36")'),
-                define('btoa("falsefalse")[11]', ATOB),
+                define('btoa("falsefalse")[11]'),
             ],
             '{':
             [
@@ -4138,89 +3222,89 @@
 
             '\x8a':
             [
-                define('(RP_4_A + atob("NaNundefined"))[10]', ATOB),
+                define('(RP_4_A + atob("NaNundefined"))[10]'),
             ],
             '\x8d':
             [
-                define('atob("0NaN")[2]', ATOB),
+                define('atob("0NaN")[2]'),
             ],
             '\x96':
             [
-                define('atob("00false")[3]', ATOB),
+                define('atob("00false")[3]'),
             ],
             '\x9e':
             [
-                define('atob(true)[2]', ATOB),
+                define('atob(true)[2]'),
             ],
             '£':
             [
-                define('atob(NaN)[1]', ATOB),
+                define('atob(NaN)[1]'),
             ],
             '¥':
             [
-                define('atob("0false")[2]', ATOB),
+                define('atob("0false")[2]'),
             ],
             '§':
             [
-                define('atob("00undefined")[2]', ATOB),
+                define('atob("00undefined")[2]'),
             ],
             '©':
             [
-                define('atob("false0")[1]', ATOB),
+                define('atob("false0")[1]'),
             ],
             '±':
             [
-                define('atob("0false")[3]', ATOB),
+                define('atob("0false")[3]'),
             ],
             '¶':
             [
-                define('atob(true)[0]', ATOB),
+                define('atob(true)[0]'),
             ],
             'º':
             [
-                define('atob("undefined0")[0]', ATOB),
+                define('atob("undefined0")[0]'),
             ],
             '»':
             [
-                define('atob(true)[1]', ATOB),
+                define('atob(true)[1]'),
             ],
             'Ç':
             [
-                define('atob("falsefalsefalse")[10]', ATOB),
+                define('atob("falsefalsefalse")[10]'),
             ],
             'Ú':
             [
-                define('atob("0truefalse")[1]', ATOB),
+                define('atob("0truefalse")[1]'),
             ],
             'Ý':
             [
-                define('atob("0undefined")[2]', ATOB),
+                define('atob("0undefined")[2]'),
             ],
             'â':
             [
-                define('atob("falsefalseundefined")[11]', ATOB),
+                define('atob("falsefalseundefined")[11]'),
             ],
             'é':
             [
-                define('atob("0undefined")[1]', ATOB),
+                define('atob("0undefined")[1]'),
             ],
             'î':
             [
-                define('atob("0truefalse")[2]', ATOB),
+                define('atob("0truefalse")[2]'),
             ],
             'ö':
             [
-                define('atob("0false")[1]', ATOB),
+                define('atob("0false")[1]'),
             ],
             'ø':
             [
-                define('atob("undefinedundefined")[10]', ATOB),
+                define('atob("undefinedundefined")[10]'),
             ],
             '∞':
             [
+                define('Infinity[TO_LOCALE_STRING]("ja")[SLICE_OR_SUBSTR]("-1")'),
+                define('Infinity[TO_LOCALE_STRING]("ja").at("-1")', AT),
                 define('Infinity[TO_LOCALE_STRING]()', LOCALE_INFINITY),
-                define('Infinity[TO_LOCALE_STRING]("ja")[SLICE_OR_SUBSTR]("-1")', JAPANESE_INFINITY),
-                define('Infinity[TO_LOCALE_STRING]("ja").at("-1")', JAPANESE_INFINITY, AT),
                 defineCharDefault(),
             ],
         });
@@ -4234,7 +3318,7 @@
             String:         define('String.name', NAME),
             fromCharCo:
             define({ expr: '"from3har3o".split(3).join("C")', optimize: { complexOpt: false } }),
-            mCh:            define('atob("bUNo")', Feature.ATOB),
+            mCh:            define('atob("bUNo")'),
         });
 
         CONSTANTS =
@@ -4246,33 +3330,18 @@
             [
                 define('[].constructor'),
             ],
-            Audio:
-            [
-                define('Function("return Audio")()', HTMLAUDIOELEMENT),
-                define('self.Audio', HTMLAUDIOELEMENT, SELF_OBJ),
-            ],
             Boolean:
             [
                 define('false.constructor'),
             ],
-            Date:
-            [
-                define('Function("return Date")()'),
-                define('self.Date', SELF_OBJ),
-            ],
             Function:
             [
                 define('ANY_FUNCTION.constructor'),
             ],
             Intl:
             [
-                define('Function("return Intl")()', INTL),
-                define('self.Intl', INTL, SELF_OBJ),
-            ],
-            Node:
-            [
-                define('Function("return Node")()', NODECONSTRUCTOR),
-                define('self.Node', NODECONSTRUCTOR, SELF_OBJ),
+                define('Function("return Intl")()'),
+                define('self.Intl', SELF),
             ],
             Number:
             [
@@ -4280,8 +3349,8 @@
             ],
             Object:
             [
+                define('Intl.constructor'),
                 define('PLAIN_OBJECT.constructor'),
-                define('Intl.constructor', INTL),
                 define('[].entries().constructor', OBJECT_ARRAY_ENTRIES_CTOR),
             ],
             RegExp:
@@ -4294,160 +3363,50 @@
             ],
             atob:
             [
-                define('Function("return atob")()', ATOB),
-                define('self.atob', ATOB, SELF_OBJ),
+                define('Function("return atob")()'),
+                define('self.atob', SELF),
             ],
             btoa:
             [
-                define('Function("return btoa")()', ATOB),
-                define('self.btoa', ATOB, SELF_OBJ),
+                define('Function("return btoa")()'),
+                define('self.btoa', SELF),
             ],
             document:
             [
-                define({ expr: 'Function("return document")()', optimize: true }, ANY_DOCUMENT),
-                define({ expr: 'self.document', optimize: true }, ANY_DOCUMENT, SELF_OBJ),
-            ],
-            escape:
-            [
-                define({ expr: 'Function("return escape")()', optimize: true }),
-                define({ expr: 'self.escape', optimize: true }, SELF_OBJ),
-            ],
-            location:
-            [
-                define('Function("return location")()', LOCATION),
-                define('self.location', LOCATION, SELF_OBJ),
-            ],
-            self:
-            [
-                define('Function("return self")()', SELF_OBJ),
-                define('[].concat.call()[0]', CALL_ON_GLOBAL, SELF_OBJ),
-            ],
-            unescape:
-            [
-                define({ expr: 'Function("return unescape")()', optimize: true }),
-                define({ expr: 'self.unescape', optimize: true }, SELF_OBJ),
-            ],
-
-            // Custom definitions
-
-            ANY_FUNCTION:
-            [
-                define('FILTER'),
-                define('AT', AT),
-                define('FILL', FILL),
-                define('FLAT', FLAT),
-            ],
-            ARRAY_ITERATOR:
-            [
-                define('[].entries()', ARRAY_ITERATOR),
-            ],
-            AT:
-            [
-                define('[].at', AT),
-            ],
-            ESCAPING_BACKSLASH:
-            [
-                define(backslashDefinition),
-                define({ expr: 'atob("01y")[1]', solutionType: SolutionType.STRING }, ATOB),
-                define
-                (
-                    { expr: '(RP_0_S + RegExp("\\n"))[1]', solutionType: SolutionType.STRING },
-                    ESC_REGEXP_LF
-                ),
-                define
-                (
-                    { expr: '(RP_5_A + RegExp("".italics()))[10]', solutionType: SolutionType.STRING },
-                    ESC_REGEXP_SLASH
-                ),
-                define
-                (
-                    { expr: '(RP_3_WA + RegExp("".sub()))[10]', solutionType: SolutionType.STRING },
-                    ESC_REGEXP_SLASH
-                ),
-                define
-                (
-                    { expr: '(RP_0_S + RegExp(FILTER))[20]', solutionType: SolutionType.STRING },
-                    ESC_REGEXP_LF,
-                    FF_SRC
-                ),
-                define
-                (
-                    { expr: '(RP_0_S + RegExp(Function()))[20]', solutionType: SolutionType.STRING },
-                    ESC_REGEXP_LF,
-                    FUNCTION_19_LF
-                ),
-                define
-                (
-                    { expr: '(RP_5_A + RegExp(Function()))[30]', solutionType: SolutionType.STRING },
-                    ESC_REGEXP_LF,
-                    FUNCTION_22_LF
-                ),
-                define
-                (
-                    { expr: '(RP_0_S + RegExp(ANY_FUNCTION))[1]', solutionType: SolutionType.STRING },
-                    ESC_REGEXP_LF,
-                    IE_SRC
-                ),
-                define
-                (
-                    {
-                        expr:           '(+(RP_0_S + FILTER)[0] + RegExp(FILTER))[23]',
-                        solutionType:   SolutionType.STRING,
-                    },
-                    ESC_REGEXP_LF,
-                    NO_V8_SRC
-                ),
-                define
-                (
-                    { expr: '(RP_4_A + RegExp(AT))[20]', solutionType: SolutionType.STRING },
-                    AT,
-                    ESC_REGEXP_LF,
-                    FF_SRC
-                ),
-                define
-                (
-                    {
-                        expr:           '(RP_1_WA + [+(RP_0_S + AT)[0]] + RegExp(AT))[20]',
-                        solutionType:   SolutionType.STRING,
-                    },
-                    AT,
-                    ESC_REGEXP_LF,
-                    NO_V8_SRC
-                ),
-                define
-                (
-                    { expr: '(RP_3_WA + RegExp(FILL))[21]', solutionType: SolutionType.STRING },
-                    ESC_REGEXP_LF,
-                    FF_SRC,
-                    FILL
-                ),
-                define
-                (
-                    { expr: '(RP_3_WA + RegExp(FLAT))[21]', solutionType: SolutionType.STRING },
-                    ESC_REGEXP_LF,
-                    FF_SRC,
-                    FLAT
-                ),
-                define
-                (
-                    {
-                        expr:           '(+(RP_0_S + FILL)[0] + RegExp(FILL))[21]',
-                        solutionType:   SolutionType.STRING,
-                    },
-                    ESC_REGEXP_LF,
-                    FILL,
-                    NO_V8_SRC
-                ),
-                define
-                (
-                    {
-                        expr:           '(+(RP_0_S + FLAT)[0] + RegExp(FLAT))[21]',
-                        solutionType:   SolutionType.STRING,
-                    },
-                    ESC_REGEXP_LF,
-                    FLAT,
-                    NO_V8_SRC
-                ),
+                define({ expr: 'Function("return document")()', optimize: true }, DOCUMENT),
+                define({ expr: 'self.document', optimize: true }, DOCUMENT, SELF),
+            ],
+            escape:
+            [
+                define({ expr: 'Function("return escape")()', optimize: true }),
+                define({ expr: 'self.escape', optimize: true }, SELF),
+            ],
+            self:
+            [
+                define('Function("return self")()', SELF),
+            ],
+            unescape:
+            [
+                define({ expr: 'Function("return unescape")()', optimize: true }),
+                define({ expr: 'self.unescape', optimize: true }, SELF),
+            ],
+
+            // Custom definitions
+
+            ANY_FUNCTION:
+            [
+                define('FILTER'),
+                define('AT', AT),
+                define('FILL', FILL),
+                define('FLAT', FLAT),
+            ],
+            ARRAY_ITERATOR:
+            [
+                define('[].entries()', ARRAY_ITERATOR),
+            ],
+            AT:
+            [
+                define('[].at', AT),
             ],
             FILL:
             [
@@ -4470,13 +3429,6 @@
                 define({ expr: '"ar-td"', solutionType: SolutionType.COMBINED_STRING }),
                 define({ expr: '"ar"', solutionType: SolutionType.COMBINED_STRING }, SHORT_LOCALES),
             ],
-            LOCATION_CONSTRUCTOR:
-            [
-                define('Function("return location")().constructor', OBJECT_L_LOCATION_CTOR),
-                define('Function("return location")().constructor', OLD_SAFARI_LOCATION_CTOR),
-                define('self.location.constructor', OBJECT_L_LOCATION_CTOR, SELF_OBJ),
-                define('self.location.constructor', OLD_SAFARI_LOCATION_CTOR, SELF_OBJ),
-            ],
             PLAIN_OBJECT:
             [
                 define('Function("return{}")()'),
@@ -4522,23 +3474,6 @@
                 define
                 ({ expr: '"toUpperCase"', optimize: true, solutionType: SolutionType.COMBINED_STRING }),
             ],
-            USER_AGENT:
-            [
-                define
-                (
-                    {
-                        expr:           'Function("return navigator")().userAgent',
-                        solutionType:   SolutionType.STRING,
-                    },
-                    MOZILLA
-                ),
-                define
-                (
-                    { expr: 'self.navigator.userAgent', solutionType: SolutionType.STRING },
-                    MOZILLA,
-                    SELF_OBJ
-                ),
-            ],
 
             // Function body extra padding blocks: prepended to a function to align the function's body
             // at the same position in different engines, assuming that the function header is aligned.
@@ -4763,558 +3698,32 @@
             [define('fromCharCode'), define('fromCodePoint', FROM_CODE_POINT)],
             [
                 define(0),
-                define(1, ASYNC_FUNCTION),
-                define(1, ATOB),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FROM_CODE_POINT,
-                    INCR_CHAR,
-                    NAME,
-                    NODECONSTRUCTOR,
-                    SELF_OBJ
-                ),
-                define(1, ASYNC_FUNCTION, NO_FF_SRC),
-                define(1, ASYNC_FUNCTION, NO_V8_SRC),
-                define(0, ARRAY_ITERATOR, ASYNC_FUNCTION, FROM_CODE_POINT, NAME),
-                define(1, ARRAY_ITERATOR, ASYNC_FUNCTION, AT, NAME),
-                define(1, ARRAY_ITERATOR, ASYNC_FUNCTION, FILL, NAME),
-                define(1, ARRAY_ITERATOR, ASYNC_FUNCTION, FLAT, NAME),
-                define(1, ARRAY_ITERATOR, ASYNC_FUNCTION, NAME, NO_IE_SRC),
-                define(1, ARRAY_ITERATOR, ASYNC_FUNCTION, NAME, NO_V8_SRC),
-                define(0, ARRAY_ITERATOR, ATOB, FROM_CODE_POINT, IE_SRC, ITERATOR_HELPER),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    AT,
-                    CALL_ON_GLOBAL,
-                    FROM_CODE_POINT,
-                    NAME,
-                    NODECONSTRUCTOR,
-                    SELF_OBJ
-                ),
-                define(1, ARRAY_ITERATOR, AT, ATOB, IE_SRC, ITERATOR_HELPER),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FLAT,
-                    FROM_CODE_POINT,
-                    NAME,
-                    NODECONSTRUCTOR,
-                    SELF_OBJ
-                ),
-                define
-                (1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, NAME, NODECONSTRUCTOR, NO_FF_SRC, SELF_OBJ),
-                define
-                (1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, NAME, NODECONSTRUCTOR, NO_V8_SRC, SELF_OBJ),
-                define
-                (1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FLAT, NAME, NODECONSTRUCTOR, NO_FF_SRC, SELF_OBJ),
-                define
-                (1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FLAT, NAME, NODECONSTRUCTOR, NO_V8_SRC, SELF_OBJ),
-                define(0, ATOB, FROM_CODE_POINT, INTL, ITERATOR_HELPER),
-                define(1, ATOB, FILL, INTL, ITERATOR_HELPER),
-                define(1, ATOB, IE_SRC, INTL, ITERATOR_HELPER),
-                define(1, ATOB, INTL, ITERATOR_HELPER, NO_IE_SRC),
-                define
-                (0, ASYNC_FUNCTION, CALL_ON_GLOBAL, FROM_CODE_POINT, IE_SRC, NODECONSTRUCTOR, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, IE_SRC, NODECONSTRUCTOR, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FILL, IE_SRC, NODECONSTRUCTOR, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FLAT, IE_SRC, NODECONSTRUCTOR, SELF_OBJ),
-                define(0, ARRAY_ITERATOR, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, NO_IE_SRC),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FLAT,
-                    FROM_CODE_POINT,
-                    IE_SRC,
-                    NAME,
-                    NODECONSTRUCTOR,
-                    SELF_OBJ
-                ),
-                define(1, ARRAY_ITERATOR, AT, ATOB, ITERATOR_HELPER, NO_IE_SRC),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FILL,
-                    FROM_CODE_POINT,
-                    NAME,
-                    NODECONSTRUCTOR,
-                    SELF_OBJ
-                ),
-                define
-                (1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FILL, NAME, NODECONSTRUCTOR, NO_FF_SRC, SELF_OBJ),
-                define
-                (1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FILL, NAME, NODECONSTRUCTOR, NO_V8_SRC, SELF_OBJ),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FILL,
-                    FROM_CODE_POINT,
-                    IE_SRC,
-                    NAME,
-                    NODECONSTRUCTOR,
-                    SELF_OBJ
-                ),
-                define(1, AT, ATOB, INTL, ITERATOR_HELPER),
-                define(0, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, SELF_OBJ),
-                define(1, ARRAY_ITERATOR, ATOB, ITERATOR_HELPER, SELF_OBJ),
-                define(1, ATOB, FILL, ITERATOR_HELPER, SELF_OBJ),
-                define(1, ATOB, FLAT, INTL, ITERATOR_HELPER),
-                define(1, ATOB, FLAT, ITERATOR_HELPER, SELF_OBJ),
-                define
-                (
-                    0,
-                    ARRAY_ITERATOR,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FROM_CODE_POINT,
-                    NODECONSTRUCTOR,
-                    SELF_OBJ
-                ),
-                define
-                (1, ARRAY_ITERATOR, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, NODECONSTRUCTOR, SELF_OBJ),
-                define
-                (1, ARRAY_ITERATOR, ASYNC_FUNCTION, CALL_ON_GLOBAL, FLAT, NODECONSTRUCTOR, SELF_OBJ),
-                define
-                (
-                    1,
-                    ARRAY_ITERATOR,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FILL,
-                    INCR_CHAR,
-                    NODECONSTRUCTOR,
-                    SELF_OBJ
-                ),
-                define
-                (
-                    1,
-                    ARRAY_ITERATOR,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FILL,
-                    NODECONSTRUCTOR,
-                    NO_FF_SRC,
-                    SELF_OBJ
-                ),
-                define
-                (
-                    0,
-                    ARRAY_ITERATOR,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FROM_CODE_POINT,
-                    NAME,
-                    NODECONSTRUCTOR,
-                    SELF_OBJ
-                ),
-                define
-                (
-                    1,
-                    ARRAY_ITERATOR,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FLAT,
-                    NAME,
-                    NODECONSTRUCTOR,
-                    NO_FF_SRC,
-                    SELF_OBJ
-                ),
-                define
-                (
-                    1,
-                    ARRAY_ITERATOR,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FLAT,
-                    NAME,
-                    NODECONSTRUCTOR,
-                    NO_V8_SRC,
-                    SELF_OBJ
-                ),
-                define
-                (
-                    0,
-                    ARRAY_ITERATOR,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FLAT,
-                    FROM_CODE_POINT,
-                    IE_SRC,
-                    NAME,
-                    NODECONSTRUCTOR,
-                    SELF_OBJ
-                ),
-                define
-                (
-                    1,
-                    ARRAY_ITERATOR,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FILL,
-                    NODECONSTRUCTOR,
-                    NO_V8_SRC,
-                    SELF_OBJ
-                ),
-                define
-                (
-                    0,
-                    ARRAY_ITERATOR,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FILL,
-                    FROM_CODE_POINT,
-                    IE_SRC,
-                    NAME,
-                    NODECONSTRUCTOR,
-                    SELF_OBJ
-                ),
-                define
-                (
-                    1,
-                    ARRAY_ITERATOR,
-                    ASYNC_FUNCTION,
-                    AT,
-                    CALL_ON_GLOBAL,
-                    NAME,
-                    NODECONSTRUCTOR,
-                    NO_FF_SRC,
-                    SELF_OBJ
-                ),
-                define
-                (
-                    1,
-                    ARRAY_ITERATOR,
-                    ASYNC_FUNCTION,
-                    AT,
-                    CALL_ON_GLOBAL,
-                    NAME,
-                    NODECONSTRUCTOR,
-                    NO_V8_SRC,
-                    SELF_OBJ
-                ),
-                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER),
-                define(1, ASYNC_FUNCTION, FLAT, ITERATOR_HELPER),
-                define(1, ASYNC_FUNCTION, ITERATOR_HELPER, NO_V8_SRC),
-                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, INTL, ITERATOR_HELPER),
-                define(1, ASYNC_FUNCTION, IE_SRC, INTL, ITERATOR_HELPER),
-                define(1, ASYNC_FUNCTION, FLAT, INTL, ITERATOR_HELPER, NO_V8_SRC),
-                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER, NODECONSTRUCTOR, NO_V8_SRC),
-                define(1, ASYNC_FUNCTION, FILL, ITERATOR_HELPER, NODECONSTRUCTOR, NO_V8_SRC),
-                define
-                (0, ASYNC_FUNCTION, FROM_CODE_POINT, INTL, ITERATOR_HELPER, NODECONSTRUCTOR, NO_V8_SRC),
-                define(1, ASYNC_FUNCTION, IE_SRC, ITERATOR_HELPER, NODECONSTRUCTOR),
-                define(1, ASYNC_FUNCTION, FLAT, ITERATOR_HELPER, NODECONSTRUCTOR, NO_V8_SRC),
-                define(0, ASYNC_FUNCTION, FLAT, FROM_CODE_POINT, ITERATOR_HELPER, SELF_OBJ),
-                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER, NO_V8_SRC, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, IE_SRC, ITERATOR_HELPER, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, FLAT, ITERATOR_HELPER, NO_V8_SRC, SELF_OBJ),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FROM_CODE_POINT,
-                    ITERATOR_HELPER,
-                    NO_V8_SRC,
-                    SELF_OBJ
-                ),
-                define(1, ASYNC_FUNCTION, ITERATOR_HELPER, NO_IE_SRC),
-                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, INTL, ITERATOR_HELPER, NO_IE_SRC),
-                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER, NO_IE_SRC, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, ITERATOR_HELPER, V8_SRC),
-                define(1, ASYNC_FUNCTION, FF_SRC, INTL, ITERATOR_HELPER),
-                define(1, ASYNC_FUNCTION, FILL, INTL, ITERATOR_HELPER, NO_IE_SRC),
-                define(1, ASYNC_FUNCTION, FLAT, INTL, ITERATOR_HELPER, NO_IE_SRC),
-                define
-                (0, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NODECONSTRUCTOR, NO_IE_SRC),
-                define(1, ASYNC_FUNCTION, FF_SRC, ITERATOR_HELPER, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, FILL, ITERATOR_HELPER, NO_IE_SRC, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, FLAT, ITERATOR_HELPER, NO_IE_SRC, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, ITERATOR_HELPER, NAME, NODECONSTRUCTOR, V8_SRC),
-                define(1, ASYNC_FUNCTION, FILL, ITERATOR_HELPER, NAME, NODECONSTRUCTOR, NO_IE_SRC),
-                define(0, ASYNC_FUNCTION, FLAT, FROM_CODE_POINT, ITERATOR_HELPER, NAME),
-                define
-                (0, ASYNC_FUNCTION, CALL_ON_GLOBAL, FF_SRC, FROM_CODE_POINT, ITERATOR_HELPER, SELF_OBJ),
-                define
-                (0, ASYNC_FUNCTION, CALL_ON_GLOBAL, FROM_CODE_POINT, ITERATOR_HELPER, SELF_OBJ, V8_SRC),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FILL,
-                    FROM_CODE_POINT,
-                    ITERATOR_HELPER,
-                    NO_IE_SRC,
-                    SELF_OBJ
-                ),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FLAT,
-                    FROM_CODE_POINT,
-                    ITERATOR_HELPER,
-                    NO_IE_SRC,
-                    SELF_OBJ
-                ),
-                define(1, ASYNC_FUNCTION, FLAT, ITERATOR_HELPER, NAME, NO_IE_SRC),
-                define(0, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, NAME),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FLAT,
-                    FROM_CODE_POINT,
-                    ITERATOR_HELPER,
-                    NAME,
-                    SELF_OBJ
-                ),
-                define(1, ATOB, ITERATOR_HELPER, NAME, NO_V8_SRC),
-                define(0, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NODECONSTRUCTOR),
-                define(1, ATOB, INCR_CHAR, ITERATOR_HELPER, NAME),
-                define(0, ATOB, FROM_CODE_POINT, INCR_CHAR, INTL, ITERATOR_HELPER, NAME),
-                define(0, ATOB, FROM_CODE_POINT, INCR_CHAR, ITERATOR_HELPER, NAME, NODECONSTRUCTOR),
-                define(0, ATOB, FROM_CODE_POINT, INCR_CHAR, ITERATOR_HELPER, NAME, NO_FF_SRC),
-                define(0, ATOB, FROM_CODE_POINT, INCR_CHAR, ITERATOR_HELPER, NAME, SELF_OBJ),
-                define(0, ATOB, FROM_CODE_POINT, INTL, ITERATOR_HELPER, NAME, NO_V8_SRC),
-                define(1, ATOB, FILL, ITERATOR_HELPER, NAME),
-                define(1, ATOB, IE_SRC, INTL, ITERATOR_HELPER, NAME),
-                define(0, ATOB, FILL, FROM_CODE_POINT, INTL, ITERATOR_HELPER, NAME),
-                define(1, ATOB, FILL, IE_SRC, ITERATOR_HELPER, NAME),
-                define(0, ARRAY_ITERATOR, ATOB, FROM_CODE_POINT, INCR_CHAR, ITERATOR_HELPER, NAME),
-                define(0, ATOB, FILL, FROM_CODE_POINT, ITERATOR_HELPER, NAME, SELF_OBJ),
-                define(0, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NO_V8_SRC, SELF_OBJ),
-                define(1, ATOB, IE_SRC, ITERATOR_HELPER, NAME, NODECONSTRUCTOR),
-                define(0, ARRAY_ITERATOR, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NO_V8_SRC),
-                define(1, ATOB, FLAT, ITERATOR_HELPER, NAME),
-                define(0, ARRAY_ITERATOR, ATOB, FILL, FROM_CODE_POINT, ITERATOR_HELPER),
-                define(1, ARRAY_ITERATOR, ATOB, FILL, ITERATOR_HELPER, NO_V8_SRC),
-                define(1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, FILL, ITERATOR_HELPER, SELF_OBJ),
-                define
-                (0, ARRAY_ITERATOR, ATOB, FILL, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NO_V8_SRC),
-                define(1, ARRAY_ITERATOR, ATOB, FILL, IE_SRC, ITERATOR_HELPER),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FROM_CODE_POINT,
-                    NODECONSTRUCTOR,
-                    NO_IE_SRC,
-                    SELF_OBJ
-                ),
-                define(1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FF_SRC, FLAT, NODECONSTRUCTOR, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, CALL_ON_GLOBAL, FLAT, NODECONSTRUCTOR, SELF_OBJ, V8_SRC),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FROM_CODE_POINT,
-                    ITERATOR_HELPER,
-                    NODECONSTRUCTOR,
-                    NO_IE_SRC,
-                    SELF_OBJ
-                ),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FROM_CODE_POINT,
-                    NAME,
-                    NODECONSTRUCTOR,
-                    NO_IE_SRC,
-                    SELF_OBJ
-                ),
-                define(1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, FF_SRC, NODECONSTRUCTOR, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, NODECONSTRUCTOR, SELF_OBJ, V8_SRC),
-                define(0, ARRAY_ITERATOR, ASYNC_FUNCTION, FLAT, FROM_CODE_POINT, ITERATOR_HELPER),
-                define(0, ATOB, CALL_ON_GLOBAL, FLAT, FROM_CODE_POINT, ITERATOR_HELPER, NAME, SELF_OBJ),
-                define(1, ATOB, IE_SRC, ITERATOR_HELPER, SELF_OBJ),
-                define(0, ARRAY_ITERATOR, ATOB, FROM_CODE_POINT, IE_SRC, ITERATOR_HELPER, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, AT, ITERATOR_HELPER),
-                define(1, ARRAY_ITERATOR, AT, ATOB, FILL, ITERATOR_HELPER),
-                define(1, ARRAY_ITERATOR, ATOB, FILL, ITERATOR_HELPER, NO_IE_SRC),
-                define(1, ATOB, CALL_ON_GLOBAL, IE_SRC, ITERATOR_HELPER, SELF_OBJ),
-                define(1, ATOB, FILL, IE_SRC, ITERATOR_HELPER, SELF_OBJ),
-                define
-                (0, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, FROM_CODE_POINT, ITERATOR_HELPER, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, AT, IE_SRC, ITERATOR_HELPER),
-                define(1, ASYNC_FUNCTION, AT, ITERATOR_HELPER, NO_IE_SRC),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    AT,
-                    CALL_ON_GLOBAL,
-                    FROM_CODE_POINT,
-                    ITERATOR_HELPER,
-                    NODECONSTRUCTOR,
-                    NO_IE_SRC,
-                    SELF_OBJ
-                ),
-                define(1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, FF_SRC, ITERATOR_HELPER, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, ITERATOR_HELPER, SELF_OBJ, V8_SRC),
-                define(0, ARRAY_ITERATOR, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER, NO_IE_SRC),
-                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NO_V8_SRC),
-                define(1, ASYNC_FUNCTION, FILL, INCR_CHAR, ITERATOR_HELPER, NAME, NO_V8_SRC),
-                define(0, ASYNC_FUNCTION, FROM_CODE_POINT, INTL, ITERATOR_HELPER, NAME, NO_V8_SRC),
-                define(1, ASYNC_FUNCTION, FLAT, ITERATOR_HELPER, NAME, NO_V8_SRC),
-                define
-                (0, ASYNC_FUNCTION, FLAT, FROM_CODE_POINT, INTL, ITERATOR_HELPER, NAME, NO_V8_SRC),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    FILL,
-                    FROM_CODE_POINT,
-                    INCR_CHAR,
-                    ITERATOR_HELPER,
-                    NAME,
-                    NODECONSTRUCTOR,
-                    NO_V8_SRC
-                ),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    FILL,
-                    FROM_CODE_POINT,
-                    INCR_CHAR,
-                    ITERATOR_HELPER,
-                    NAME,
-                    NO_V8_SRC,
-                    SELF_OBJ
-                ),
-                define(1, ASYNC_FUNCTION, IE_SRC, ITERATOR_HELPER, NAME),
-                define(1, ASYNC_FUNCTION, AT, ITERATOR_HELPER, NAME, NO_V8_SRC),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FROM_CODE_POINT,
-                    IE_SRC,
-                    ITERATOR_HELPER,
-                    NAME,
-                    SELF_OBJ
-                ),
-                define(1, ASYNC_FUNCTION, FF_SRC, ITERATOR_HELPER, NAME),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FF_SRC,
-                    FROM_CODE_POINT,
-                    ITERATOR_HELPER,
-                    NAME,
-                    SELF_OBJ
-                ),
-                define
-                (0, ASYNC_FUNCTION, FLAT, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NO_V8_SRC, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, FLAT, IE_SRC, ITERATOR_HELPER, NAME, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, AT, FLAT, ITERATOR_HELPER, NAME, NO_V8_SRC, SELF_OBJ),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FLAT,
-                    FROM_CODE_POINT,
-                    IE_SRC,
-                    ITERATOR_HELPER,
-                    NAME,
-                    SELF_OBJ
-                ),
-                define(1, ASYNC_FUNCTION, FF_SRC, FLAT, ITERATOR_HELPER, NAME, SELF_OBJ),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    AT,
-                    CALL_ON_GLOBAL,
-                    FROM_CODE_POINT,
-                    ITERATOR_HELPER,
-                    NAME,
-                    NO_V8_SRC,
-                    SELF_OBJ
-                ),
-                define
-                (
-                    0,
-                    ASYNC_FUNCTION,
-                    CALL_ON_GLOBAL,
-                    FF_SRC,
-                    FLAT,
-                    FROM_CODE_POINT,
-                    ITERATOR_HELPER,
-                    NAME,
-                    SELF_OBJ
-                ),
-                define(1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, FF_SRC, ITERATOR_HELPER, NAME, SELF_OBJ),
-                define(1, ASYNC_FUNCTION, AT, CALL_ON_GLOBAL, IE_SRC, ITERATOR_HELPER, NAME, SELF_OBJ),
-                define(0, ARRAY_ITERATOR, ATOB, FLAT, FROM_CODE_POINT, ITERATOR_HELPER),
-                define(1, ARRAY_ITERATOR, ATOB, FLAT, ITERATOR_HELPER, NO_V8_SRC),
-                define
-                (1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, FLAT, INCR_CHAR, ITERATOR_HELPER, SELF_OBJ),
-                define
-                (0, ARRAY_ITERATOR, ATOB, FLAT, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NO_V8_SRC),
-                define(1, ATOB, ITERATOR_HELPER, NO_IE_SRC, SELF_OBJ),
-                define(1, ARRAY_ITERATOR, AT, ATOB, FLAT, ITERATOR_HELPER),
-                define(1, ARRAY_ITERATOR, ATOB, FLAT, IE_SRC, ITERATOR_HELPER),
-                define(0, ARRAY_ITERATOR, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, NO_IE_SRC, SELF_OBJ),
-                define(1, ARRAY_ITERATOR, ATOB, FLAT, ITERATOR_HELPER, NO_IE_SRC),
-                define(1, ATOB, CALL_ON_GLOBAL, ITERATOR_HELPER, NO_IE_SRC, SELF_OBJ),
-                define(1, ATOB, FILL, ITERATOR_HELPER, NO_IE_SRC, SELF_OBJ),
-                define(0, ARRAY_ITERATOR, ASYNC_FUNCTION, AT, FROM_CODE_POINT, ITERATOR_HELPER),
-                define(1, ATOB, ITERATOR_HELPER, NAME, NO_IE_SRC),
-                define(0, ARRAY_ITERATOR, ATOB, FROM_CODE_POINT, ITERATOR_HELPER, NAME, NO_IE_SRC),
-                define(1, ATOB, FILL, ITERATOR_HELPER, NAME, NO_IE_SRC),
-                define(1, ATOB, FLAT, ITERATOR_HELPER, NAME, NO_IE_SRC),
-                define(1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, ITERATOR_HELPER, NAME, SELF_OBJ),
-                define
-                (
-                    0,
-                    ARRAY_ITERATOR,
-                    ATOB,
-                    CALL_ON_GLOBAL,
-                    FLAT,
-                    FROM_CODE_POINT,
-                    ITERATOR_HELPER,
-                    NAME,
-                    SELF_OBJ
-                ),
-                define
-                (1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, IE_SRC, ITERATOR_HELPER, NAME, SELF_OBJ),
-                define
-                (1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, INCR_CHAR, ITERATOR_HELPER, NAME, SELF_OBJ),
-                define
-                (1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, ITERATOR_HELPER, NAME, NO_IE_SRC, SELF_OBJ),
-                define(0, ARRAY_ITERATOR, ASYNC_FUNCTION, FROM_CODE_POINT, ITERATOR_HELPER, NO_V8_SRC),
-                define(1, CAPITAL_HTML),
-                define(1, AT, ATOB, ITERATOR_HELPER, SELF_OBJ),
-                define(0, ARRAY_ITERATOR, ATOB, CAPITAL_HTML, FROM_CODE_POINT),
-                define(1, BARPROP),
+                define(1),
+                define(0, ITERATOR_HELPER),
+                define(1, FILL),
+                define(0, ARRAY_ITERATOR, CAPITAL_HTML, FROM_CODE_POINT),
+                define(1, FLAT, ITERATOR_HELPER),
+                define(0, FILL, FROM_CODE_POINT, ITERATOR_HELPER, NAME),
+                define(1, ARRAY_ITERATOR, ITERATOR_HELPER),
+                define(1, IE_SRC, ITERATOR_HELPER),
+                define(1, ITERATOR_HELPER, NO_IE_SRC),
+                define(1, FILL, FLAT, ITERATOR_HELPER, NAME),
+                define(0, ARRAY_ITERATOR, FILL, FROM_CODE_POINT, ITERATOR_HELPER),
+                define(0, ARRAY_ITERATOR, FLAT, FROM_CODE_POINT, ITERATOR_HELPER),
+                define(0, ARRAY_ITERATOR, FROM_CODE_POINT, IE_SRC, ITERATOR_HELPER),
+                define(0, ARRAY_ITERATOR, FROM_CODE_POINT, ITERATOR_HELPER, NO_IE_SRC),
+                define(1, ARRAY_ITERATOR, FILL, ITERATOR_HELPER, NO_IE_SRC),
+                define(1, ARRAY_ITERATOR, FILL, ITERATOR_HELPER, NO_V8_SRC),
+                define(1, ARRAY_ITERATOR, FLAT, ITERATOR_HELPER, NO_IE_SRC),
+                define(1, ARRAY_ITERATOR, FLAT, ITERATOR_HELPER, NO_V8_SRC),
+                define(0, ARRAY_ITERATOR, FROM_CODE_POINT, ITERATOR_HELPER, NAME),
+                define(1, AT, ITERATOR_HELPER),
+                define(1, BARPROP, ITERATOR_HELPER),
                 define(1, CAPITAL_HTML, ITERATOR_HELPER),
-                define(1, AT, ATOB, ITERATOR_HELPER, NAME),
-                define(0, ARRAY_ITERATOR, ATOB, BARPROP, CAPITAL_HTML, FROM_CODE_POINT),
+                define(1, ARRAY_ITERATOR, FILL, IE_SRC, ITERATOR_HELPER, NAME),
+                define(1, ARRAY_ITERATOR, FILL, ITERATOR_HELPER, NAME, NO_IE_SRC),
+                define(1, ARRAY_ITERATOR, FLAT, IE_SRC, ITERATOR_HELPER, NAME),
+                define(1, ARRAY_ITERATOR, FLAT, ITERATOR_HELPER, NAME, NO_IE_SRC),
             ]
         );
 
@@ -5441,28 +3850,15 @@
             ],
             [
                 define(0),
-                define(1, ARRAY_ITERATOR, ATOB),
+                define(1, ARRAY_ITERATOR),
                 define(0, NO_FF_SRC),
                 define(0, NO_V8_SRC),
                 define(1, ARRAY_ITERATOR, CAPITAL_HTML),
-                define(1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, SELF_OBJ),
-                define(0, ARRAY_ITERATOR, ATOB, FILL),
-                define(0, ARRAY_ITERATOR, CAPITAL_HTML, FILL),
+                define(0, ARRAY_ITERATOR, AT),
+                define(0, ARRAY_ITERATOR, FILL),
+                define(0, ARRAY_ITERATOR, FLAT),
+                define(0, ARRAY_ITERATOR, NO_IE_SRC),
                 define(0, ARRAY_ITERATOR, CAPITAL_HTML, IE_SRC),
-                define(0, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, IE_SRC, SELF_OBJ),
-                define(1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, FILL, SELF_OBJ),
-                define(0, ARRAY_ITERATOR, ATOB, NO_IE_SRC),
-                define(0, ARRAY_ITERATOR, CAPITAL_HTML, NO_IE_SRC),
-                define(0, ARRAY_ITERATOR, ATOB, FILL, IE_SRC),
-                define(0, ARRAY_ITERATOR, ATOB, FILL, INCR_CHAR, NO_V8_SRC),
-                define(1, ARRAY_ITERATOR, ATOB, CALL_ON_GLOBAL, NO_IE_SRC, SELF_OBJ),
-                define(0, ARRAY_ITERATOR, AT, ATOB),
-                define(0, ARRAY_ITERATOR, AT, CAPITAL_HTML),
-                define(0, ARRAY_ITERATOR, ATOB, FF_SRC),
-                define(0, ARRAY_ITERATOR, ATOB, FLAT),
-                define(0, ARRAY_ITERATOR, ATOB, V8_SRC),
-                define(0, ARRAY_ITERATOR, CAPITAL_HTML, FLAT),
-                define(0, ARRAY_ITERATOR, ATOB, FILL, NO_IE_SRC),
                 define(2),
             ]
         );
@@ -6050,9 +4446,8 @@
         HexIntegerLiteral:      '0[Xx]#HexDigit+',
         NumericLiteral:         '#HexIntegerLiteral|#DecimalLiteral',
         Separator:              '#SeparatorChar|//.*(?!.)|/\\*[\\s\\S]*?\\*/',
-        // U+180E is recognized as a separator in older browsers.
-        // U+FEFF is missed by /\s/ in Android Browser < 4.1.x.
-        SeparatorChar:          '(?!\u180E)[\\s\uFEFF]',
+        // U+180E is recognized as a separator in Internet Explorer.
+        SeparatorChar:          '(?!\u180E)\\s',
         SingleQuotedString:     '\'(?:#EscapeSequence|(?![\'\\\\]).)*\'',
         UnicodeEscapeSequence:  '\\\\u#HexDigit{4}',
     };
@@ -6162,17 +4557,6 @@
     var SCREW_AS_STRING          = 1;
     var SCREW_AS_BONDED_STRING   = 2;
 
-    function gather(buffer, offset, count, groupBond, groupForceString)
-    {
-        var end = offset + count;
-        var groupSolutions = buffer._solutions.slice(offset, end);
-        var optimizerList = buffer._optimizerList;
-        if (optimizerList.length)
-            optimizeSolutions(optimizerList, groupSolutions, groupBond, groupForceString);
-        var str = gatherGroup(groupSolutions, groupBond, groupForceString);
-        return str;
-    }
-
     function gatherGroup(solutions, bond, forceString)
     {
         var solution = new DynamicSolution();
@@ -6197,14 +4581,12 @@
         return str;
     }
 
-    function ScrewBuffer(screwMode, groupThreshold, optimizerList)
+    function ScrewBuffer(screwMode, optimizerList)
     {
-        this._groupThreshold = groupThreshold;
-        this._maxSolutionCount = _Math_pow(2, groupThreshold - 1);
         this._optimizerList = optimizerList;
         this._screwMode = screwMode;
         this._solutions = [];
-        this._length = -3;
+        this._length = -APPEND_LENGTH_OF_EMPTY;
     }
 
     assignNoEnum$1
@@ -6219,8 +4601,6 @@
             function (solution)
             {
                 var solutions = this._solutions;
-                if (solutions.length >= this._maxSolutionCount)
-                    return false;
                 solutions.push(solution);
                 var appendLength = solution.appendLength;
                 this._optimizerList.forEach
@@ -6233,62 +4613,18 @@
                     }
                 );
                 this._length += appendLength;
-                return true;
             },
             toString:
             function ()
             {
-                function collectOut(offset, count, maxGroupCount, groupBond)
-                {
-                    var str;
-                    if (count <= groupSize + 1)
-                        str = gather(buffer, offset, count, groupBond);
-                    else
-                    {
-                        maxGroupCount /= 2;
-                        var halfCount = groupSize * maxGroupCount;
-                        var capacity = 2 * halfCount - count;
-                        var leftEndCount =
-                        _Math_max
-                        (
-                            halfCount - capacity + capacity % (groupSize - 1),
-                            (maxGroupCount / 2 ^ 0) * (groupSize + 1)
-                        );
-                        str =
-                        collectOut(offset, leftEndCount, maxGroupCount) +
-                        '+' +
-                        collectOut(offset + leftEndCount, count - leftEndCount, maxGroupCount, true);
-                        if (groupBond)
-                            str = '(' + str + ')';
-                    }
-                    return str;
-                }
-
-                var str;
-                var solutionCount = this._solutions.length;
-                var groupThreshold = this._groupThreshold;
                 var screwMode = this._screwMode;
                 var bond = screwMode === SCREW_AS_BONDED_STRING;
-                if (solutionCount <= groupThreshold)
-                {
-                    var forceString = screwMode !== SCREW_NORMAL;
-                    str = gather(this, 0, solutionCount, bond, forceString);
-                }
-                else
-                {
-                    var groupSize = groupThreshold;
-                    var maxGroupCount = 2;
-                    for (;;)
-                    {
-                        --groupSize;
-                        var maxSolutionCountForDepth = groupSize * maxGroupCount;
-                        if (solutionCount <= maxSolutionCountForDepth)
-                            break;
-                        maxGroupCount *= 2;
-                    }
-                    var buffer = this;
-                    str = collectOut(0, solutionCount, maxGroupCount, bond);
-                }
+                var forceString = screwMode !== SCREW_NORMAL;
+                var groupSolutions = this._solutions.slice();
+                var optimizerList = this._optimizerList;
+                if (optimizerList.length)
+                    optimizeSolutions(optimizerList, groupSolutions, bond, forceString);
+                var str = gatherGroup(groupSolutions, bond, forceString);
                 return str;
             },
         }
@@ -6555,7 +4891,7 @@
             appendIndexer = false;
             toStringOpt = false;
         }
-        var expr = 'Function("return\\"" + ESCAPING_BACKSLASH + "' + escCode + '\\"")()';
+        var expr = 'Function("return\\"\\\\' + escCode + '\\"")()';
         if (appendIndexer)
             expr += '[0]';
         var replacement = this.replaceExpr(expr, { default: false, toStringOpt: toStringOpt });
@@ -6600,8 +4936,6 @@
         return replacement;
     }
 
-    var ATOB_MASK = Feature.ATOB.mask;
-
     var STATIC_CHAR_CACHE   = createEmpty();
     var STATIC_CONST_CACHE  = createEmpty();
     var STATIC_ENCODER      = new Encoder(MASK_EMPTY);
@@ -6648,14 +4982,6 @@
         }
     }
 
-    function defaultResolveCharacter(encoder, char)
-    {
-        var charCode = char.charCodeAt();
-        var atobOpt = charCode < 0x100;
-        var solution = encoder._createCharDefaultSolution(char, charCode, atobOpt, true, true, true);
-        return solution;
-    }
-
     function findOptimalSolution(encoder, source, entries, defaultSolutionType)
     {
         var optimalSolution;
@@ -6878,8 +5204,6 @@
             function (str, index)
             {
                 regExp.lastIndex = index;
-                // String.prototype.match doesn't work well with sticky regular expressions in Node.js <
-                // 6.5.
                 var match = regExp.exec(str);
                 if (match)
                     return match[0];
@@ -6910,37 +5234,44 @@
             function (char, charCode, atobOpt, charCodeOpt, escSeqOpt, unescapeOpt)
             {
                 var solution;
-                if (atobOpt && this.hasFeatures(ATOB_MASK))
+                var solutions = [];
+                if (atobOpt)
                 {
                     solution =
                     resolveCharByDefaultMethod(this, char, charCode, replaceCharByAtob, 'atob');
+                    solutions.push(solution);
                 }
-                else
+                if (charCodeOpt)
                 {
-                    var solutions = [];
-                    if (charCodeOpt)
-                    {
-                        solution =
-                        resolveCharByDefaultMethod
-                        (this, char, charCode, replaceCharByCharCode, 'char-code');
-                        solutions.push(solution);
-                    }
-                    if (escSeqOpt)
-                    {
-                        solution =
-                        resolveCharByDefaultMethod
-                        (this, char, charCode, replaceCharByEscSeq, 'esc-seq');
-                        solutions.push(solution);
-                    }
-                    if (unescapeOpt)
-                    {
-                        solution =
-                        resolveCharByDefaultMethod
-                        (this, char, charCode, replaceCharByUnescape, 'unescape');
-                        solutions.push(solution);
-                    }
-                    solution = shortestOf.apply(null, solutions);
+                    solution =
+                    resolveCharByDefaultMethod
+                    (this, char, charCode, replaceCharByCharCode, 'char-code');
+                    solutions.push(solution);
+                }
+                if (escSeqOpt)
+                {
+                    solution =
+                    resolveCharByDefaultMethod(this, char, charCode, replaceCharByEscSeq, 'esc-seq');
+                    solutions.push(solution);
+                }
+                if (unescapeOpt)
+                {
+                    solution =
+                    resolveCharByDefaultMethod(this, char, charCode, replaceCharByUnescape, 'unescape');
+                    solutions.push(solution);
                 }
+                solution = shortestOf.apply(null, solutions);
+                return solution;
+            },
+
+            _defaultResolveCharacter:
+            function (char)
+            {
+                var charCode = char.charCodeAt();
+                var atobOpt = charCode < 0x100;
+                var stdOpt = !atobOpt;
+                var solution =
+                this._createCharDefaultSolution(char, charCode, atobOpt, stdOpt, stdOpt, stdOpt);
                 return solution;
             },
 
@@ -7074,18 +5405,6 @@
                 return included;
             },
 
-            // The maximum value that can be safely used as the first group threshold of a ScrewBuffer.
-            // "Safely" means such that the extreme decoding test is passed in all engines.
-            // This value is typically limited by the free memory available on the stack, and since the
-            // memory layout of the stack changes at runtime in an unstable way, the maximum safe value
-            // cannot be determined exactly.
-            // The lowest recorded value so far is 1844, measured in an Android Browser 4.2.2 running on
-            // an Intel Atom emulator.
-            // Internet Explorer on Windows Phone occasionally failed the extreme decoding test in a
-            // non-reproducible manner, although the issue seems to be related to the output size rather
-            // than the grouping threshold setting.
-            maxGroupThreshold:      1800,
-
             replaceExpr:
             function (expr, optimize)
             {
@@ -7169,7 +5488,7 @@
                 options = options || { };
                 var optimizerList = this._getOptimizerList(str, options.optimize);
                 var screwMode = options.screwMode || SCREW_NORMAL;
-                var buffer = new ScrewBuffer(screwMode, this.maxGroupThreshold, optimizerList);
+                var buffer = new ScrewBuffer(screwMode, optimizerList);
                 var firstSolution = options.firstSolution;
                 var maxLength = options.maxLength;
                 if (firstSolution)
@@ -7193,7 +5512,8 @@
                         var char = str[index++];
                         solution = this.resolveCharacter(char);
                     }
-                    if (!buffer.append(solution) || buffer.length > maxLength)
+                    buffer.append(solution);
+                    if (buffer.length > maxLength)
                         return;
                 }
                 var replacement = _String$1(buffer);
@@ -7251,7 +5571,7 @@
                                 if (entries)
                                     solution = findOptimalSolution(this, char, entries);
                                 if (!solution)
-                                    solution = defaultResolveCharacter(this, char);
+                                    solution = this._defaultResolveCharacter(char);
                             }
                             else
                             {
@@ -7423,6 +5743,10 @@
         return figurator;
     }
 
+    var ENCODING_TYPE_COMBINED      = 'combined';
+    var ENCODING_TYPE_EXPRESSION    = 'expression';
+    var ENCODING_TYPE_TEXT          = 'text';
+
     var FALSE_FREE_DELIMITER = { joiner: 'false', separator: 'false' };
     var FALSE_TRUE_DELIMITER = { joiner: '', separator: 'Function("return/(?=false|true)/")()' };
 
@@ -7752,29 +6076,7 @@
     function encodeText(encoder, input, screwMode, unitPath, maxLength)
     {
         var output =
-        callStrategies
-        (
-            encoder,
-            input,
-            { screwMode: screwMode },
-            [
-                'byDenseFigures',
-                'bySparseFigures',
-                'byDictRadix5AmendedBy3',
-                'byDictRadix4AmendedBy2',
-                'byDictRadix4AmendedBy1',
-                'byDictRadix5',
-                'byDictRadix3AmendedBy1',
-                'byDictRadix4',
-                'byDict',
-                'byCodePointsRadix4',
-                'byCharCodesRadix4',
-                'byCodePoints',
-                'byCharCodes',
-                'plain',
-            ],
-            unitPath
-        );
+        callStrategies(encoder, input, { screwMode: screwMode }, TEXT_STRATEGY_NAMES, unitPath);
         if (output != null && !(output.length > maxLength))
             return output;
     }
@@ -7912,12 +6214,10 @@
 
     (function ()
     {
-        function defineStrategy(strategy, minInputLength, expressionMode, featureObj)
+        function defineStrategy(strategy, encodingType, minInputLength, featureObj)
         {
+            strategy.encodingType = encodingType;
             strategy.minInputLength = minInputLength;
-            if (expressionMode === undefined)
-                expressionMode = false;
-            strategy.expressionMode = expressionMode;
             if (featureObj === undefined)
                 featureObj = Feature.DEFAULT;
             strategy.mask = featureObj.mask;
@@ -7951,6 +6251,7 @@
                     var output = this._encodeByCharCodes(inputData, undefined, maxLength);
                     return output;
                 },
+                ENCODING_TYPE_TEXT,
                 2
             ),
 
@@ -7971,6 +6272,7 @@
                     var output = this._encodeByCharCodes(inputData, 4, maxLength);
                     return output;
                 },
+                ENCODING_TYPE_TEXT,
                 25
             ),
 
@@ -7990,8 +6292,8 @@
                     var output = this._encodeByCodePoints(inputData, undefined, maxLength);
                     return output;
                 },
+                ENCODING_TYPE_TEXT,
                 3,
-                undefined,
                 Feature.FROM_CODE_POINT
             ),
 
@@ -8011,8 +6313,8 @@
                     var output = this._encodeByCodePoints(inputData, 4, maxLength);
                     return output;
                 },
-                30,
-                undefined,
+                ENCODING_TYPE_TEXT,
+                29,
                 Feature.FROM_CODE_POINT
             ),
 
@@ -8034,7 +6336,8 @@
                     var output = this._encodeByDenseFigures(inputData, maxLength);
                     return output;
                 },
-                1888
+                ENCODING_TYPE_TEXT,
+                1881
             ),
 
             /* -------------------------------------------------------------------------------------- *\
@@ -8061,7 +6364,8 @@
                     var output = this._encodeByDict(inputData, undefined, undefined, maxLength);
                     return output;
                 },
-                2
+                ENCODING_TYPE_TEXT,
+                3
             ),
 
             /* -------------------------------------------------------------------------------------- *\
@@ -8090,7 +6394,8 @@
                     var output = this._encodeByDict(inputData, 3, 1, maxLength);
                     return output;
                 },
-                136
+                ENCODING_TYPE_TEXT,
+                134
             ),
 
             /* -------------------------------------------------------------------------------------- *\
@@ -8126,7 +6431,8 @@
                     var output = this._encodeByDict(inputData, 4, 0, maxLength);
                     return output;
                 },
-                160
+                ENCODING_TYPE_TEXT,
+                112
             ),
 
             /* -------------------------------------------------------------------------------------- *\
@@ -8155,7 +6461,8 @@
                     var output = this._encodeByDict(inputData, 4, 1, maxLength);
                     return output;
                 },
-                218
+                ENCODING_TYPE_TEXT,
+                118
             ),
 
             /* -------------------------------------------------------------------------------------- *\
@@ -8186,7 +6493,8 @@
                     var output = this._encodeByDict(inputData, 4, 2, maxLength);
                     return output;
                 },
-                263
+                ENCODING_TYPE_TEXT,
+                178
             ),
 
             /* -------------------------------------------------------------------------------------- *\
@@ -8223,7 +6531,41 @@
                     var output = this._encodeByDict(inputData, 5, 0, maxLength);
                     return output;
                 },
-                223
+                ENCODING_TYPE_TEXT,
+                172
+            ),
+
+            /* -------------------------------------------------------------------------------------- *\
+
+            Encodes "SIXTEEN" as:
+
+            "1false0false10false2falsetruefalsetruefalseundefined".split(true).join(3).split("undefined"
+            ).join(4).split(false).map(Function(
+            "return function(undefined){return this[parseInt(undefined,5)]}")().bind("ISTENX")).join([])
+
+            (simple)
+
+            Or:
+
+            "1falsetruefalse10false2falsefalsefalseundefined".split(true).join(3).split("undefined").
+            join(4).split(false).map(Function(
+            "return function(undefined){return this[parseInt(+undefined,5)]}")().bind("ESTINX")).join([]
+            )
+
+            (with coercion)
+
+            \* -------------------------------------------------------------------------------------- */
+
+            byDictRadix5AmendedBy2:
+            defineStrategy
+            (
+                function (inputData, maxLength)
+                {
+                    var output = this._encodeByDict(inputData, 5, 2, maxLength);
+                    return output;
+                },
+                ENCODING_TYPE_TEXT,
+                193
             ),
 
             /* -------------------------------------------------------------------------------------- *\
@@ -8255,7 +6597,8 @@
                     var output = this._encodeByDict(inputData, 5, 3, maxLength);
                     return output;
                 },
-                570
+                ENCODING_TYPE_TEXT,
+                506
             ),
 
             /* -------------------------------------------------------------------------------------- *\
@@ -8276,6 +6619,7 @@
                     var output = this._encodeBySparseFigures(inputData, maxLength);
                     return output;
                 },
+                ENCODING_TYPE_TEXT,
                 347
             ),
 
@@ -8294,8 +6638,8 @@
                     var output = this._encodeExpress(input, maxLength);
                     return output;
                 },
-                undefined,
-                true
+                ENCODING_TYPE_EXPRESSION,
+                0
             ),
 
             /* -------------------------------------------------------------------------------------- *\
@@ -8314,7 +6658,9 @@
                     { maxLength: maxLength, optimize: true, screwMode: inputData.screwMode };
                     var output = this.replaceString(input, options);
                     return output;
-                }
+                },
+                ENCODING_TYPE_TEXT,
+                0
             ),
 
             /* -------------------------------------------------------------------------------------- *\
@@ -8332,12 +6678,34 @@
                     var wrapper = inputData.wrapper;
                     var output = encodeAndWrapText(this, input, wrapper, undefined, maxLength);
                     return output;
-                }
+                },
+                ENCODING_TYPE_COMBINED,
+                0
             ),
         };
     }
     )();
 
+    var TEXT_STRATEGY_NAMES =
+    _Object_keys$1(STRATEGIES).filter
+    (
+        function (strategyName)
+        {
+            var returnValue = STRATEGIES[strategyName].encodingType === ENCODING_TYPE_TEXT;
+            return returnValue;
+        }
+    )
+    .sort
+    (
+        function (strategyName1, strategyName2)
+        {
+            var minInputLength1 = STRATEGIES[strategyName1].minInputLength;
+            var minInputLength2 = STRATEGIES[strategyName2].minInputLength;
+            var diff = minInputLength2 - minInputLength1;
+            return diff;
+        }
+    );
+
     assignNoEnum$1
     (
         Encoder.prototype,
@@ -9633,9 +8001,9 @@
                 return entry;
             }
 
-            function createScrewBuffer(screwMode, groupThreshold, optimizerList)
+            function createScrewBuffer(screwMode, optimizerList)
             {
-                var buffer = new ScrewBuffer(screwMode, groupThreshold, optimizerList);
+                var buffer = new ScrewBuffer(screwMode, optimizerList);
                 return buffer;
             }