Nuitka-winsvc 1.8__cp311-cp311-win_amd64.whl → 2.5.1__cp311-cp311-win_amd64.whl

nuitka/build/static_src/HelpersComparisonLe.c

@@ -1,20 +1,5 @@
-//     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-//
-//     Part of "Nuitka", an optimizing Python compiler that is compatible and
-//     integrates with CPython, but also works on its own.
-//
-//     Licensed under the Apache License, Version 2.0 (the "License");
-//     you may not use this file except in compliance with the License.
-//     You may obtain a copy of the License at
-//
-//        http://www.apache.org/licenses/LICENSE-2.0
-//
-//     Unless required by applicable law or agreed to in writing, software
-//     distributed under the License is distributed on an "AS IS" BASIS,
-//     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//     See the License for the specific language governing permissions and
-//     limitations under the License.
-//
+//     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
 /* WARNING, this code is GENERATED. Modify the template HelperOperationComparison.c.j2 instead! */
 
 /* This file is included from another C file, help IDEs to still parse it on its own. */
@@ -38,7 +23,7 @@ static PyObject *COMPARE_LE_OBJECT_INT_INT(PyObject *operand1, PyObject *operand
 
     // Convert to target type.
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 }
 #endif
@@ -73,7 +58,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
     if (operand1 == operand2 && IS_SANE_TYPE(Py_TYPE(operand1))) {
         bool r = true;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
 
@@ -94,7 +79,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
     // If the types are equal, we may get away immediately except for instances.
     if (type1 == type2 && !PyInstance_Check(operand1)) {
 
-        richcmpfunc frich = RICHCOMPARE(type1);
+        richcmpfunc frich = TP_RICHCOMPARE(type1);
 
         if (frich != NULL) {
             PyObject *result = (*frich)(operand1, operand2, Py_LE);
@@ -105,7 +90,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -146,7 +131,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -155,7 +140,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
     richcmpfunc f;
 
     if (type1 != type2 && Nuitka_Type_IsSubtype(type2, type1)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -166,11 +151,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -180,10 +165,10 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -193,7 +178,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -281,14 +266,14 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
     richcmpfunc f;
 
     if (type1 != type2 && Nuitka_Type_IsSubtype(type2, type1)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -301,11 +286,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -316,11 +301,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -331,7 +316,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -343,13 +328,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_OBJECT(PyObject *operand1, PyObject *ope
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -398,7 +383,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
     // If the types are equal, we may get away immediately except for instances.
     if (type1 == type2 && !PyInstance_Check(operand1)) {
 
-        richcmpfunc frich = RICHCOMPARE(type1);
+        richcmpfunc frich = TP_RICHCOMPARE(type1);
 
         if (frich != NULL) {
             PyObject *result = (*frich)(operand1, operand2, Py_LE);
@@ -417,7 +402,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -467,7 +452,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
     richcmpfunc f;
 
     if (type1 != type2 && Nuitka_Type_IsSubtype(type2, type1)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -486,11 +471,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -508,10 +493,10 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -529,7 +514,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -624,7 +609,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
     richcmpfunc f;
 
     if (type1 != type2 && Nuitka_Type_IsSubtype(type2, type1)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -645,11 +630,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -668,11 +653,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -691,7 +676,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_OBJECT(PyObject *operand1, PyObject *op
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -740,7 +725,7 @@ static PyObject *COMPARE_LE_OBJECT_STR_STR(PyObject *operand1, PyObject *operand
 
         // Convert to target type.
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
 
@@ -768,9 +753,11 @@ static PyObject *COMPARE_LE_OBJECT_STR_STR(PyObject *operand1, PyObject *operand
 
     // Convert to target type.
     PyObject *result = BOOL_FROM(c != 0);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 }
+#endif
+#if PYTHON_VERSION < 0x300
 /* Code referring to "OBJECT" corresponds to any Python object and "STR" to Python2 'str'. */
 PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_STR(PyObject *operand1, PyObject *operand2) {
 
@@ -805,7 +792,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_STR(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -846,7 +833,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_STR(PyObject *operand1, PyObject *operan
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -866,11 +853,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_STR(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -880,7 +867,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_STR(PyObject *operand1, PyObject *operan
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = PyString_Type.tp_richcompare;
@@ -893,7 +880,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_STR(PyObject *operand1, PyObject *operan
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -981,7 +968,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_STR(PyObject *operand1, PyObject *operan
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
@@ -1001,11 +988,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_STR(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -1016,7 +1003,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_STR(PyObject *operand1, PyObject *operan
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -1031,7 +1018,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_STR(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -1043,13 +1030,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_STR(PyObject *operand1, PyObject *operan
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -1099,7 +1086,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_STR_OBJECT(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -1140,7 +1127,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_STR_OBJECT(PyObject *operand1, PyObject *operan
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -1149,7 +1136,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_STR_OBJECT(PyObject *operand1, PyObject *operan
     richcmpfunc f;
 
     if (&PyString_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyString_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -1160,7 +1147,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_STR_OBJECT(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -1174,10 +1161,10 @@ PyObject *RICH_COMPARE_LE_OBJECT_STR_OBJECT(PyObject *operand1, PyObject *operan
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -1187,7 +1174,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_STR_OBJECT(PyObject *operand1, PyObject *operan
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -1275,14 +1262,14 @@ PyObject *RICH_COMPARE_LE_OBJECT_STR_OBJECT(PyObject *operand1, PyObject *operan
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
     richcmpfunc f;
 
     if (&PyString_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyString_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -1295,7 +1282,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_STR_OBJECT(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -1310,11 +1297,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_STR_OBJECT(PyObject *operand1, PyObject *operan
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -1325,7 +1312,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_STR_OBJECT(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -1337,13 +1324,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_STR_OBJECT(PyObject *operand1, PyObject *operan
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -1413,6 +1400,8 @@ static bool COMPARE_LE_CBOOL_STR_STR(PyObject *operand1, PyObject *operand2) {
 
     return result;
 }
+#endif
+#if PYTHON_VERSION < 0x300
 /* Code referring to "STR" corresponds to Python2 'str' and "STR" to Python2 'str'. */
 bool RICH_COMPARE_LE_CBOOL_STR_STR(PyObject *operand1, PyObject *operand2) {
 
@@ -1463,7 +1452,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_STR(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -1532,11 +1521,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_STR(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -1554,7 +1543,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_STR(PyObject *operand1, PyObject *opera
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = PyString_Type.tp_richcompare;
@@ -1575,7 +1564,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_STR(PyObject *operand1, PyObject *opera
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -1691,11 +1680,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_STR(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -1714,7 +1703,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_STR(PyObject *operand1, PyObject *opera
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -1737,7 +1726,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_STR(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -1813,7 +1802,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_STR_OBJECT(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -1863,7 +1852,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_STR_OBJECT(PyObject *operand1, PyObject *opera
     richcmpfunc f;
 
     if (&PyString_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyString_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -1882,7 +1871,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_STR_OBJECT(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -1904,10 +1893,10 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_STR_OBJECT(PyObject *operand1, PyObject *opera
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -1925,7 +1914,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_STR_OBJECT(PyObject *operand1, PyObject *opera
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -2020,7 +2009,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_STR_OBJECT(PyObject *operand1, PyObject *opera
     richcmpfunc f;
 
     if (&PyString_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyString_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -2041,7 +2030,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_STR_OBJECT(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -2064,11 +2053,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_STR_OBJECT(PyObject *operand1, PyObject *opera
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -2087,7 +2076,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_STR_OBJECT(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -2135,7 +2124,7 @@ static PyObject *COMPARE_LE_OBJECT_UNICODE_UNICODE(PyObject *operand1, PyObject
 
         // Convert to target type.
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
 
@@ -2178,7 +2167,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_UNICODE(PyObject *operand1, PyObject *op
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -2219,7 +2208,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_UNICODE(PyObject *operand1, PyObject *op
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -2239,11 +2228,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_UNICODE(PyObject *operand1, PyObject *op
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -2253,7 +2242,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_UNICODE(PyObject *operand1, PyObject *op
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = PyUnicode_Type.tp_richcompare;
@@ -2266,7 +2255,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_UNICODE(PyObject *operand1, PyObject *op
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -2354,7 +2343,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_UNICODE(PyObject *operand1, PyObject *op
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
@@ -2374,11 +2363,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_UNICODE(PyObject *operand1, PyObject *op
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -2389,7 +2378,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_UNICODE(PyObject *operand1, PyObject *op
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -2404,7 +2393,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_UNICODE(PyObject *operand1, PyObject *op
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -2416,13 +2405,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_UNICODE(PyObject *operand1, PyObject *op
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -2472,7 +2461,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_UNICODE_OBJECT(PyObject *operand1, PyObject *op
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -2513,7 +2502,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_UNICODE_OBJECT(PyObject *operand1, PyObject *op
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -2522,7 +2511,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_UNICODE_OBJECT(PyObject *operand1, PyObject *op
     richcmpfunc f;
 
     if (&PyUnicode_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyUnicode_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -2533,7 +2522,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_UNICODE_OBJECT(PyObject *operand1, PyObject *op
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -2547,10 +2536,10 @@ PyObject *RICH_COMPARE_LE_OBJECT_UNICODE_OBJECT(PyObject *operand1, PyObject *op
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -2560,7 +2549,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_UNICODE_OBJECT(PyObject *operand1, PyObject *op
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -2648,14 +2637,14 @@ PyObject *RICH_COMPARE_LE_OBJECT_UNICODE_OBJECT(PyObject *operand1, PyObject *op
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
     richcmpfunc f;
 
     if (&PyUnicode_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyUnicode_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -2668,7 +2657,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_UNICODE_OBJECT(PyObject *operand1, PyObject *op
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -2683,11 +2672,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_UNICODE_OBJECT(PyObject *operand1, PyObject *op
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -2698,7 +2687,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_UNICODE_OBJECT(PyObject *operand1, PyObject *op
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -2710,13 +2699,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_UNICODE_OBJECT(PyObject *operand1, PyObject *op
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -2763,7 +2752,7 @@ static bool COMPARE_LE_CBOOL_UNICODE_UNICODE(PyObject *operand1, PyObject *opera
 
     // Convert to target type if necessary
     bool result = r == Py_True;
-    Py_DECREF(r);
+    Py_DECREF_IMMORTAL(r);
 
     return result;
 }
@@ -2816,7 +2805,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_UNICODE(PyObject *operand1, PyObject *o
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -2885,11 +2874,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_UNICODE(PyObject *operand1, PyObject *o
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -2907,7 +2896,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_UNICODE(PyObject *operand1, PyObject *o
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = PyUnicode_Type.tp_richcompare;
@@ -2928,7 +2917,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_UNICODE(PyObject *operand1, PyObject *o
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -3044,11 +3033,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_UNICODE(PyObject *operand1, PyObject *o
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -3067,7 +3056,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_UNICODE(PyObject *operand1, PyObject *o
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -3090,7 +3079,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_UNICODE(PyObject *operand1, PyObject *o
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -3166,7 +3155,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_UNICODE_OBJECT(PyObject *operand1, PyObject *o
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -3216,7 +3205,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_UNICODE_OBJECT(PyObject *operand1, PyObject *o
     richcmpfunc f;
 
     if (&PyUnicode_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyUnicode_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -3235,7 +3224,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_UNICODE_OBJECT(PyObject *operand1, PyObject *o
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -3257,10 +3246,10 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_UNICODE_OBJECT(PyObject *operand1, PyObject *o
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -3278,7 +3267,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_UNICODE_OBJECT(PyObject *operand1, PyObject *o
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -3373,7 +3362,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_UNICODE_OBJECT(PyObject *operand1, PyObject *o
     richcmpfunc f;
 
     if (&PyUnicode_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyUnicode_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -3394,7 +3383,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_UNICODE_OBJECT(PyObject *operand1, PyObject *o
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -3417,11 +3406,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_UNICODE_OBJECT(PyObject *operand1, PyObject *o
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -3440,7 +3429,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_UNICODE_OBJECT(PyObject *operand1, PyObject *o
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -3490,7 +3479,7 @@ static PyObject *COMPARE_LE_OBJECT_BYTES_BYTES(PyObject *operand1, PyObject *ope
 
         // Convert to target type.
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
 
@@ -3518,9 +3507,11 @@ static PyObject *COMPARE_LE_OBJECT_BYTES_BYTES(PyObject *operand1, PyObject *ope
 
     // Convert to target type.
     PyObject *result = BOOL_FROM(c != 0);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 }
+#endif
+#if PYTHON_VERSION >= 0x300
 /* Code referring to "OBJECT" corresponds to any Python object and "BYTES" to Python3 'bytes'. */
 PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_BYTES(PyObject *operand1, PyObject *operand2) {
 
@@ -3555,7 +3546,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_BYTES(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -3596,7 +3587,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_BYTES(PyObject *operand1, PyObject *oper
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -3616,11 +3607,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_BYTES(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -3630,7 +3621,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_BYTES(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = PyBytes_Type.tp_richcompare;
@@ -3643,7 +3634,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_BYTES(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -3731,7 +3722,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_BYTES(PyObject *operand1, PyObject *oper
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
@@ -3751,11 +3742,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_BYTES(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -3766,7 +3757,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_BYTES(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -3781,7 +3772,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_BYTES(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -3793,13 +3784,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_BYTES(PyObject *operand1, PyObject *oper
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -3849,7 +3840,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_BYTES_OBJECT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -3890,7 +3881,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_BYTES_OBJECT(PyObject *operand1, PyObject *oper
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -3899,7 +3890,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_BYTES_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyBytes_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyBytes_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -3910,7 +3901,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_BYTES_OBJECT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -3924,10 +3915,10 @@ PyObject *RICH_COMPARE_LE_OBJECT_BYTES_OBJECT(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -3937,7 +3928,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_BYTES_OBJECT(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -4025,14 +4016,14 @@ PyObject *RICH_COMPARE_LE_OBJECT_BYTES_OBJECT(PyObject *operand1, PyObject *oper
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
     richcmpfunc f;
 
     if (&PyBytes_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyBytes_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -4045,7 +4036,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_BYTES_OBJECT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -4060,11 +4051,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_BYTES_OBJECT(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -4075,7 +4066,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_BYTES_OBJECT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -4087,13 +4078,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_BYTES_OBJECT(PyObject *operand1, PyObject *oper
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -4163,6 +4154,8 @@ static bool COMPARE_LE_CBOOL_BYTES_BYTES(PyObject *operand1, PyObject *operand2)
 
     return result;
 }
+#endif
+#if PYTHON_VERSION >= 0x300
 /* Code referring to "BYTES" corresponds to Python3 'bytes' and "BYTES" to Python3 'bytes'. */
 bool RICH_COMPARE_LE_CBOOL_BYTES_BYTES(PyObject *operand1, PyObject *operand2) {
 
@@ -4213,7 +4206,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_BYTES(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -4282,11 +4275,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_BYTES(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -4304,7 +4297,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_BYTES(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = PyBytes_Type.tp_richcompare;
@@ -4325,7 +4318,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_BYTES(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -4441,11 +4434,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_BYTES(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -4464,7 +4457,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_BYTES(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -4487,7 +4480,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_BYTES(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -4563,7 +4556,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_BYTES_OBJECT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -4613,7 +4606,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_BYTES_OBJECT(PyObject *operand1, PyObject *ope
     richcmpfunc f;
 
     if (&PyBytes_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyBytes_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -4632,7 +4625,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_BYTES_OBJECT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -4654,10 +4647,10 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_BYTES_OBJECT(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -4675,7 +4668,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_BYTES_OBJECT(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -4770,7 +4763,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_BYTES_OBJECT(PyObject *operand1, PyObject *ope
     richcmpfunc f;
 
     if (&PyBytes_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyBytes_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -4791,7 +4784,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_BYTES_OBJECT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -4814,11 +4807,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_BYTES_OBJECT(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -4837,7 +4830,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_BYTES_OBJECT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -4905,7 +4898,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_INT(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -4946,7 +4939,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_INT(PyObject *operand1, PyObject *operan
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -4966,11 +4959,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_INT(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -4980,7 +4973,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_INT(PyObject *operand1, PyObject *operan
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = NULL;
@@ -4993,7 +4986,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_INT(PyObject *operand1, PyObject *operan
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -5081,7 +5074,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_INT(PyObject *operand1, PyObject *operan
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
@@ -5101,11 +5094,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_INT(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -5116,7 +5109,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_INT(PyObject *operand1, PyObject *operan
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -5131,7 +5124,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_INT(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -5143,13 +5136,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_INT(PyObject *operand1, PyObject *operan
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -5199,7 +5192,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_INT_OBJECT(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -5240,7 +5233,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_INT_OBJECT(PyObject *operand1, PyObject *operan
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -5249,7 +5242,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_INT_OBJECT(PyObject *operand1, PyObject *operan
     richcmpfunc f;
 
     if (&PyInt_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyInt_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -5260,7 +5253,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_INT_OBJECT(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -5274,10 +5267,10 @@ PyObject *RICH_COMPARE_LE_OBJECT_INT_OBJECT(PyObject *operand1, PyObject *operan
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -5287,7 +5280,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_INT_OBJECT(PyObject *operand1, PyObject *operan
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -5375,14 +5368,14 @@ PyObject *RICH_COMPARE_LE_OBJECT_INT_OBJECT(PyObject *operand1, PyObject *operan
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
     richcmpfunc f;
 
     if (&PyInt_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyInt_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -5395,7 +5388,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_INT_OBJECT(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -5410,11 +5403,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_INT_OBJECT(PyObject *operand1, PyObject *operan
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -5425,7 +5418,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_INT_OBJECT(PyObject *operand1, PyObject *operan
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -5437,13 +5430,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_INT_OBJECT(PyObject *operand1, PyObject *operan
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -5517,7 +5510,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_INT(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -5586,11 +5579,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_INT(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -5608,7 +5601,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_INT(PyObject *operand1, PyObject *opera
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = NULL;
@@ -5629,7 +5622,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_INT(PyObject *operand1, PyObject *opera
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -5745,11 +5738,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_INT(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -5768,7 +5761,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_INT(PyObject *operand1, PyObject *opera
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -5791,7 +5784,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_INT(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -5867,7 +5860,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_INT_OBJECT(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -5917,7 +5910,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_INT_OBJECT(PyObject *operand1, PyObject *opera
     richcmpfunc f;
 
     if (&PyInt_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyInt_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -5936,7 +5929,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_INT_OBJECT(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -5958,10 +5951,10 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_INT_OBJECT(PyObject *operand1, PyObject *opera
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -5979,7 +5972,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_INT_OBJECT(PyObject *operand1, PyObject *opera
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -6074,7 +6067,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_INT_OBJECT(PyObject *operand1, PyObject *opera
     richcmpfunc f;
 
     if (&PyInt_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyInt_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -6095,7 +6088,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_INT_OBJECT(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -6118,11 +6111,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_INT_OBJECT(PyObject *operand1, PyObject *opera
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -6141,7 +6134,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_INT_OBJECT(PyObject *operand1, PyObject *opera
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -6188,15 +6181,19 @@ static PyObject *COMPARE_LE_OBJECT_LONG_LONG(PyObject *operand1, PyObject *opera
 
     if (operand1_long_object == operand2_long_object) {
         r = true;
-    } else if (Py_SIZE(operand1_long_object) != Py_SIZE(operand2_long_object)) {
-        r = Py_SIZE(operand1_long_object) - Py_SIZE(operand2_long_object) < 0;
+    } else if (Nuitka_LongGetSignedDigitSize(operand1_long_object) !=
+               Nuitka_LongGetSignedDigitSize(operand2_long_object)) {
+        r = Nuitka_LongGetSignedDigitSize(operand1_long_object) - Nuitka_LongGetSignedDigitSize(operand2_long_object) <
+            0;
     } else {
-        Py_ssize_t i = Py_ABS(Py_SIZE(operand1_long_object));
+        Py_ssize_t i = Nuitka_LongGetDigitSize(operand1_long_object);
         r = true;
         while (--i >= 0) {
-            if (operand1_long_object->ob_digit[i] != operand2_long_object->ob_digit[i]) {
-                r = operand1_long_object->ob_digit[i] < operand2_long_object->ob_digit[i];
-                if (Py_SIZE(operand1_long_object) < 0) {
+            if (Nuitka_LongGetDigitPointer(operand1_long_object)[i] !=
+                Nuitka_LongGetDigitPointer(operand2_long_object)[i]) {
+                r = Nuitka_LongGetDigitPointer(operand1_long_object)[i] <
+                    Nuitka_LongGetDigitPointer(operand2_long_object)[i];
+                if (Nuitka_LongIsNegative(operand1_long_object)) {
                     r = !r;
                 }
                 break;
@@ -6206,7 +6203,7 @@ static PyObject *COMPARE_LE_OBJECT_LONG_LONG(PyObject *operand1, PyObject *opera
 
     // Convert to target type.
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 }
 /* Code referring to "OBJECT" corresponds to any Python object and "LONG" to Python2 'long', Python3 'int'. */
@@ -6243,7 +6240,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LONG(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -6284,7 +6281,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LONG(PyObject *operand1, PyObject *opera
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -6304,11 +6301,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LONG(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -6318,7 +6315,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LONG(PyObject *operand1, PyObject *opera
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = (PYTHON_VERSION < 0x300 ? NULL : PyLong_Type.tp_richcompare);
@@ -6331,7 +6328,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LONG(PyObject *operand1, PyObject *opera
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -6419,7 +6416,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LONG(PyObject *operand1, PyObject *opera
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
@@ -6439,11 +6436,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LONG(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -6454,7 +6451,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LONG(PyObject *operand1, PyObject *opera
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -6469,7 +6466,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LONG(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -6481,13 +6478,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LONG(PyObject *operand1, PyObject *opera
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -6537,7 +6534,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_LONG_OBJECT(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -6578,7 +6575,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_LONG_OBJECT(PyObject *operand1, PyObject *opera
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -6587,7 +6584,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_LONG_OBJECT(PyObject *operand1, PyObject *opera
     richcmpfunc f;
 
     if (&PyLong_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyLong_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -6598,7 +6595,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_LONG_OBJECT(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -6612,10 +6609,10 @@ PyObject *RICH_COMPARE_LE_OBJECT_LONG_OBJECT(PyObject *operand1, PyObject *opera
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -6625,7 +6622,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_LONG_OBJECT(PyObject *operand1, PyObject *opera
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -6713,14 +6710,14 @@ PyObject *RICH_COMPARE_LE_OBJECT_LONG_OBJECT(PyObject *operand1, PyObject *opera
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
     richcmpfunc f;
 
     if (&PyLong_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyLong_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -6733,7 +6730,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_LONG_OBJECT(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -6748,11 +6745,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_LONG_OBJECT(PyObject *operand1, PyObject *opera
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -6763,7 +6760,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_LONG_OBJECT(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -6775,13 +6772,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_LONG_OBJECT(PyObject *operand1, PyObject *opera
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -6817,15 +6814,19 @@ static bool COMPARE_LE_CBOOL_LONG_LONG(PyObject *operand1, PyObject *operand2) {
 
     if (operand1_long_object == operand2_long_object) {
         r = true;
-    } else if (Py_SIZE(operand1_long_object) != Py_SIZE(operand2_long_object)) {
-        r = Py_SIZE(operand1_long_object) - Py_SIZE(operand2_long_object) < 0;
+    } else if (Nuitka_LongGetSignedDigitSize(operand1_long_object) !=
+               Nuitka_LongGetSignedDigitSize(operand2_long_object)) {
+        r = Nuitka_LongGetSignedDigitSize(operand1_long_object) - Nuitka_LongGetSignedDigitSize(operand2_long_object) <
+            0;
     } else {
-        Py_ssize_t i = Py_ABS(Py_SIZE(operand1_long_object));
+        Py_ssize_t i = Nuitka_LongGetDigitSize(operand1_long_object);
         r = true;
         while (--i >= 0) {
-            if (operand1_long_object->ob_digit[i] != operand2_long_object->ob_digit[i]) {
-                r = operand1_long_object->ob_digit[i] < operand2_long_object->ob_digit[i];
-                if (Py_SIZE(operand1_long_object) < 0) {
+            if (Nuitka_LongGetDigitPointer(operand1_long_object)[i] !=
+                Nuitka_LongGetDigitPointer(operand2_long_object)[i]) {
+                r = Nuitka_LongGetDigitPointer(operand1_long_object)[i] <
+                    Nuitka_LongGetDigitPointer(operand2_long_object)[i];
+                if (Nuitka_LongIsNegative(operand1_long_object)) {
                     r = !r;
                 }
                 break;
@@ -6886,7 +6887,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LONG(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -6955,11 +6956,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LONG(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -6977,7 +6978,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LONG(PyObject *operand1, PyObject *oper
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = (PYTHON_VERSION < 0x300 ? NULL : PyLong_Type.tp_richcompare);
@@ -6998,7 +6999,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LONG(PyObject *operand1, PyObject *oper
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -7114,11 +7115,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LONG(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -7137,7 +7138,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LONG(PyObject *operand1, PyObject *oper
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -7160,7 +7161,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LONG(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -7236,7 +7237,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LONG_OBJECT(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -7286,7 +7287,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LONG_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyLong_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyLong_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -7305,7 +7306,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LONG_OBJECT(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -7327,10 +7328,10 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LONG_OBJECT(PyObject *operand1, PyObject *oper
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -7348,7 +7349,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LONG_OBJECT(PyObject *operand1, PyObject *oper
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -7443,7 +7444,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LONG_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyLong_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyLong_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -7464,7 +7465,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LONG_OBJECT(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -7487,11 +7488,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LONG_OBJECT(PyObject *operand1, PyObject *oper
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -7510,7 +7511,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LONG_OBJECT(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -7557,7 +7558,7 @@ static PyObject *COMPARE_LE_OBJECT_FLOAT_FLOAT(PyObject *operand1, PyObject *ope
 
     // Convert to target type.
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 }
 /* Code referring to "OBJECT" corresponds to any Python object and "FLOAT" to Python 'float'. */
@@ -7594,7 +7595,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_FLOAT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -7635,7 +7636,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_FLOAT(PyObject *operand1, PyObject *oper
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -7655,11 +7656,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_FLOAT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -7669,7 +7670,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_FLOAT(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = PyFloat_Type.tp_richcompare;
@@ -7682,7 +7683,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_FLOAT(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -7770,7 +7771,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_FLOAT(PyObject *operand1, PyObject *oper
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
@@ -7790,11 +7791,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_FLOAT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -7805,7 +7806,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_FLOAT(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -7820,7 +7821,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_FLOAT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -7832,13 +7833,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_FLOAT(PyObject *operand1, PyObject *oper
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -7886,7 +7887,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_FLOAT_OBJECT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -7927,7 +7928,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_FLOAT_OBJECT(PyObject *operand1, PyObject *oper
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -7936,7 +7937,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_FLOAT_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyFloat_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyFloat_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -7947,7 +7948,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_FLOAT_OBJECT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -7961,10 +7962,10 @@ PyObject *RICH_COMPARE_LE_OBJECT_FLOAT_OBJECT(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -7974,7 +7975,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_FLOAT_OBJECT(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -8062,14 +8063,14 @@ PyObject *RICH_COMPARE_LE_OBJECT_FLOAT_OBJECT(PyObject *operand1, PyObject *oper
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
     richcmpfunc f;
 
     if (&PyFloat_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyFloat_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -8082,7 +8083,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_FLOAT_OBJECT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -8097,11 +8098,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_FLOAT_OBJECT(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -8112,7 +8113,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_FLOAT_OBJECT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -8124,13 +8125,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_FLOAT_OBJECT(PyObject *operand1, PyObject *oper
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -8214,7 +8215,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_FLOAT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -8283,11 +8284,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_FLOAT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -8305,7 +8306,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_FLOAT(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = PyFloat_Type.tp_richcompare;
@@ -8326,7 +8327,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_FLOAT(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -8442,11 +8443,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_FLOAT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -8465,7 +8466,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_FLOAT(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -8488,7 +8489,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_FLOAT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -8562,7 +8563,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_FLOAT_OBJECT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -8612,7 +8613,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_FLOAT_OBJECT(PyObject *operand1, PyObject *ope
     richcmpfunc f;
 
     if (&PyFloat_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyFloat_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -8631,7 +8632,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_FLOAT_OBJECT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -8653,10 +8654,10 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_FLOAT_OBJECT(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -8674,7 +8675,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_FLOAT_OBJECT(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -8769,7 +8770,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_FLOAT_OBJECT(PyObject *operand1, PyObject *ope
     richcmpfunc f;
 
     if (&PyFloat_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyFloat_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -8790,7 +8791,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_FLOAT_OBJECT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -8813,11 +8814,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_FLOAT_OBJECT(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -8836,7 +8837,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_FLOAT_OBJECT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -8909,7 +8910,7 @@ static PyObject *COMPARE_LE_OBJECT_TUPLE_TUPLE(PyObject *operand1, PyObject *ope
 
         // Convert to target type.
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
 
@@ -8949,7 +8950,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_TUPLE(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -8990,7 +8991,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_TUPLE(PyObject *operand1, PyObject *oper
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -9010,11 +9011,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_TUPLE(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -9024,7 +9025,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_TUPLE(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = PyTuple_Type.tp_richcompare;
@@ -9037,7 +9038,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_TUPLE(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -9125,7 +9126,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_TUPLE(PyObject *operand1, PyObject *oper
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
@@ -9145,11 +9146,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_TUPLE(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -9160,7 +9161,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_TUPLE(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -9175,7 +9176,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_TUPLE(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -9187,13 +9188,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_TUPLE(PyObject *operand1, PyObject *oper
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -9241,7 +9242,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_TUPLE_OBJECT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -9282,7 +9283,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_TUPLE_OBJECT(PyObject *operand1, PyObject *oper
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -9291,7 +9292,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_TUPLE_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyTuple_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyTuple_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -9302,7 +9303,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_TUPLE_OBJECT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -9316,10 +9317,10 @@ PyObject *RICH_COMPARE_LE_OBJECT_TUPLE_OBJECT(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -9329,7 +9330,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_TUPLE_OBJECT(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -9417,14 +9418,14 @@ PyObject *RICH_COMPARE_LE_OBJECT_TUPLE_OBJECT(PyObject *operand1, PyObject *oper
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
     richcmpfunc f;
 
     if (&PyTuple_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyTuple_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -9437,7 +9438,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_TUPLE_OBJECT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -9452,11 +9453,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_TUPLE_OBJECT(PyObject *operand1, PyObject *oper
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -9467,7 +9468,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_TUPLE_OBJECT(PyObject *operand1, PyObject *oper
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -9479,13 +9480,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_TUPLE_OBJECT(PyObject *operand1, PyObject *oper
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -9594,7 +9595,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_TUPLE(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -9663,11 +9664,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_TUPLE(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -9685,7 +9686,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_TUPLE(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = PyTuple_Type.tp_richcompare;
@@ -9706,7 +9707,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_TUPLE(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -9822,11 +9823,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_TUPLE(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -9845,7 +9846,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_TUPLE(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -9868,7 +9869,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_TUPLE(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -9942,7 +9943,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_TUPLE_OBJECT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -9992,7 +9993,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_TUPLE_OBJECT(PyObject *operand1, PyObject *ope
     richcmpfunc f;
 
     if (&PyTuple_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyTuple_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -10011,7 +10012,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_TUPLE_OBJECT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -10033,10 +10034,10 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_TUPLE_OBJECT(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -10054,7 +10055,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_TUPLE_OBJECT(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -10149,7 +10150,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_TUPLE_OBJECT(PyObject *operand1, PyObject *ope
     richcmpfunc f;
 
     if (&PyTuple_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyTuple_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -10170,7 +10171,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_TUPLE_OBJECT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -10193,11 +10194,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_TUPLE_OBJECT(PyObject *operand1, PyObject *ope
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -10216,7 +10217,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_TUPLE_OBJECT(PyObject *operand1, PyObject *ope
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -10263,14 +10264,11 @@ static PyObject *COMPARE_LE_OBJECT_LIST_LIST(PyObject *operand1, PyObject *opera
     PyListObject *a = (PyListObject *)operand1;
     PyListObject *b = (PyListObject *)operand2;
 
-    Py_ssize_t len_a = Py_SIZE(a);
-    Py_ssize_t len_b = Py_SIZE(b);
-
     bool found = false;
     nuitka_bool res = NUITKA_BOOL_TRUE;
 
     Py_ssize_t i;
-    for (i = 0; i < len_a && i < len_b; i++) {
+    for (i = 0; i < Py_SIZE(a) && i < Py_SIZE(b); i++) {
         PyObject *aa = a->ob_item[i];
         PyObject *bb = b->ob_item[i];
 
@@ -10278,7 +10276,11 @@ static PyObject *COMPARE_LE_OBJECT_LIST_LIST(PyObject *operand1, PyObject *opera
             continue;
         }
 
+        Py_INCREF(aa);
+        Py_INCREF(bb);
         res = RICH_COMPARE_EQ_NBOOL_OBJECT_OBJECT(aa, bb);
+        Py_DECREF(aa);
+        Py_DECREF(bb);
 
         if (res == NUITKA_BOOL_EXCEPTION) {
             return NULL;
@@ -10291,11 +10293,11 @@ static PyObject *COMPARE_LE_OBJECT_LIST_LIST(PyObject *operand1, PyObject *opera
     }
 
     if (found == false) {
-        bool r = len_a <= len_b;
+        bool r = Py_SIZE(a) <= Py_SIZE(b);
 
         // Convert to target type.
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
 
@@ -10335,7 +10337,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LIST(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -10376,7 +10378,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LIST(PyObject *operand1, PyObject *opera
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -10396,11 +10398,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LIST(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -10410,7 +10412,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LIST(PyObject *operand1, PyObject *opera
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = PyList_Type.tp_richcompare;
@@ -10423,7 +10425,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LIST(PyObject *operand1, PyObject *opera
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -10511,7 +10513,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LIST(PyObject *operand1, PyObject *opera
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
@@ -10531,11 +10533,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LIST(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -10546,7 +10548,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LIST(PyObject *operand1, PyObject *opera
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -10561,7 +10563,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LIST(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -10573,13 +10575,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_OBJECT_LIST(PyObject *operand1, PyObject *opera
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -10627,7 +10629,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_LIST_OBJECT(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -10668,7 +10670,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_LIST_OBJECT(PyObject *operand1, PyObject *opera
 
             bool r = c != 0;
             PyObject *result = BOOL_FROM(r);
-            Py_INCREF(result);
+            Py_INCREF_IMMORTAL(result);
             return result;
         }
     }
@@ -10677,7 +10679,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_LIST_OBJECT(PyObject *operand1, PyObject *opera
     richcmpfunc f;
 
     if (&PyList_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyList_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -10688,7 +10690,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_LIST_OBJECT(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -10702,10 +10704,10 @@ PyObject *RICH_COMPARE_LE_OBJECT_LIST_OBJECT(PyObject *operand1, PyObject *opera
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -10715,7 +10717,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_LIST_OBJECT(PyObject *operand1, PyObject *opera
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -10803,14 +10805,14 @@ PyObject *RICH_COMPARE_LE_OBJECT_LIST_OBJECT(PyObject *operand1, PyObject *opera
 
     bool r = c != 0;
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 #else
     bool checked_reverse_op = false;
     richcmpfunc f;
 
     if (&PyList_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyList_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -10823,7 +10825,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_LIST_OBJECT(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -10838,11 +10840,11 @@ PyObject *RICH_COMPARE_LE_OBJECT_LIST_OBJECT(PyObject *operand1, PyObject *opera
             return result;
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -10853,7 +10855,7 @@ PyObject *RICH_COMPARE_LE_OBJECT_LIST_OBJECT(PyObject *operand1, PyObject *opera
                 return result;
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -10865,13 +10867,13 @@ PyObject *RICH_COMPARE_LE_OBJECT_LIST_OBJECT(PyObject *operand1, PyObject *opera
     case Py_EQ: {
         bool r = operand1 == operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     case Py_NE: {
         bool r = operand1 != operand2;
         PyObject *result = BOOL_FROM(r);
-        Py_INCREF(result);
+        Py_INCREF_IMMORTAL(result);
         return result;
     }
     default:
@@ -10900,14 +10902,11 @@ static nuitka_bool COMPARE_LE_NBOOL_LIST_LIST(PyObject *operand1, PyObject *oper
     PyListObject *a = (PyListObject *)operand1;
     PyListObject *b = (PyListObject *)operand2;
 
-    Py_ssize_t len_a = Py_SIZE(a);
-    Py_ssize_t len_b = Py_SIZE(b);
-
     bool found = false;
     nuitka_bool res = NUITKA_BOOL_TRUE;
 
     Py_ssize_t i;
-    for (i = 0; i < len_a && i < len_b; i++) {
+    for (i = 0; i < Py_SIZE(a) && i < Py_SIZE(b); i++) {
         PyObject *aa = a->ob_item[i];
         PyObject *bb = b->ob_item[i];
 
@@ -10915,7 +10914,11 @@ static nuitka_bool COMPARE_LE_NBOOL_LIST_LIST(PyObject *operand1, PyObject *oper
             continue;
         }
 
+        Py_INCREF(aa);
+        Py_INCREF(bb);
         res = RICH_COMPARE_EQ_NBOOL_OBJECT_OBJECT(aa, bb);
+        Py_DECREF(aa);
+        Py_DECREF(bb);
 
         if (res == NUITKA_BOOL_EXCEPTION) {
             return NUITKA_BOOL_EXCEPTION;
@@ -10928,7 +10931,7 @@ static nuitka_bool COMPARE_LE_NBOOL_LIST_LIST(PyObject *operand1, PyObject *oper
     }
 
     if (found == false) {
-        bool r = len_a <= len_b;
+        bool r = Py_SIZE(a) <= Py_SIZE(b);
 
         // Convert to target type.
         nuitka_bool result = r ? NUITKA_BOOL_TRUE : NUITKA_BOOL_FALSE;
@@ -10980,7 +10983,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LIST(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -11049,11 +11052,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LIST(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
 
@@ -11071,7 +11074,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LIST(PyObject *operand1, PyObject *oper
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     f = PyList_Type.tp_richcompare;
@@ -11092,7 +11095,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LIST(PyObject *operand1, PyObject *oper
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -11208,11 +11211,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LIST(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
-    f = RICHCOMPARE(type1);
+    f = TP_RICHCOMPARE(type1);
 
     if (f != NULL) {
         PyObject *result = (*f)(operand1, operand2, Py_LE);
@@ -11231,7 +11234,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LIST(PyObject *operand1, PyObject *oper
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
@@ -11254,7 +11257,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_OBJECT_LIST(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -11328,7 +11331,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LIST_OBJECT(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
 
         // No rich comparison worked, but maybe compare works.
@@ -11378,7 +11381,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LIST_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyList_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyList_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -11397,7 +11400,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LIST_OBJECT(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -11419,10 +11422,10 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LIST_OBJECT(PyObject *operand1, PyObject *oper
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
-    f = RICHCOMPARE(type2);
+    f = TP_RICHCOMPARE(type2);
     if (f != NULL) {
         PyObject *result = (*f)(operand2, operand1, Py_GE);
 
@@ -11440,7 +11443,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LIST_OBJECT(PyObject *operand1, PyObject *oper
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     int c;
@@ -11535,7 +11538,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LIST_OBJECT(PyObject *operand1, PyObject *oper
     richcmpfunc f;
 
     if (&PyList_Type != type2 && Nuitka_Type_IsSubtype(type2, &PyList_Type)) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             checked_reverse_op = true;
@@ -11556,7 +11559,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LIST_OBJECT(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -11579,11 +11582,11 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LIST_OBJECT(PyObject *operand1, PyObject *oper
             }
         }
 
-        Py_DECREF(result);
+        Py_DECREF_IMMORTAL(result);
     }
 
     if (checked_reverse_op == false) {
-        f = RICHCOMPARE(type2);
+        f = TP_RICHCOMPARE(type2);
 
         if (f != NULL) {
             PyObject *result = (*f)(operand2, operand1, Py_GE);
@@ -11602,7 +11605,7 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LIST_OBJECT(PyObject *operand1, PyObject *oper
                 }
             }
 
-            Py_DECREF(result);
+            Py_DECREF_IMMORTAL(result);
         }
     }
 
@@ -11640,7 +11643,6 @@ nuitka_bool RICH_COMPARE_LE_NBOOL_LIST_LIST(PyObject *operand1, PyObject *operan
     return COMPARE_LE_NBOOL_LIST_LIST(operand1, operand2);
 }
 
-#if PYTHON_VERSION < 0x300
 static PyObject *COMPARE_LE_OBJECT_LONG_CLONG(PyObject *operand1, long operand2) {
     CHECK_OBJECT(operand1);
     assert(PyLong_CheckExact(operand1));
@@ -11659,7 +11661,7 @@ static PyObject *COMPARE_LE_OBJECT_LONG_CLONG(PyObject *operand1, long operand2)
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 
@@ -11672,19 +11674,20 @@ static PyObject *COMPARE_LE_OBJECT_LONG_CLONG(PyObject *operand1, long operand2)
         }
     }
 
-    Py_ssize_t operand2_size = operand2_is_negative == false ? operand2_digit_count : -operand2_digit_count;
+    NUITKA_MAY_BE_UNUSED Py_ssize_t operand2_size =
+        operand2_is_negative == false ? operand2_digit_count : -operand2_digit_count;
 
     bool r;
 
-    if (Py_SIZE(operand1_long_object) != operand2_size) {
-        r = Py_SIZE(operand1_long_object) - operand2_size < 0;
+    if (Nuitka_LongGetSignedDigitSize(operand1_long_object) != operand2_size) {
+        r = Nuitka_LongGetSignedDigitSize(operand1_long_object) - operand2_size < 0;
     } else {
-        Py_ssize_t i = Py_ABS(Py_SIZE(operand1_long_object));
+        Py_ssize_t i = Nuitka_LongGetDigitSize(operand1_long_object);
         r = true;
         while (--i >= 0) {
-            if (operand1_long_object->ob_digit[i] != operand2_digits[i]) {
-                r = operand1_long_object->ob_digit[i] < operand2_digits[i];
-                if (Py_SIZE(operand1_long_object) < 0) {
+            if (Nuitka_LongGetDigitPointer(operand1_long_object)[i] != operand2_digits[i]) {
+                r = Nuitka_LongGetDigitPointer(operand1_long_object)[i] < operand2_digits[i];
+                if (Nuitka_LongIsNegative(operand1_long_object)) {
                     r = !r;
                 }
                 break;
@@ -11694,9 +11697,10 @@ static PyObject *COMPARE_LE_OBJECT_LONG_CLONG(PyObject *operand1, long operand2)
 
     // Convert to target type.
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 }
+#if PYTHON_VERSION < 0x300
 /* Code referring to "LONG" corresponds to Python2 'long', Python3 'int' and "INT" to Python2 'int'. */
 PyObject *RICH_COMPARE_LE_OBJECT_LONG_INT(PyObject *operand1, PyObject *operand2) {
 
@@ -11704,7 +11708,6 @@ PyObject *RICH_COMPARE_LE_OBJECT_LONG_INT(PyObject *operand1, PyObject *operand2
 }
 #endif
 
-#if PYTHON_VERSION < 0x300
 static bool COMPARE_LE_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
     CHECK_OBJECT(operand1);
     assert(PyLong_CheckExact(operand1));
@@ -11723,7 +11726,7 @@ static bool COMPARE_LE_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 
@@ -11736,19 +11739,20 @@ static bool COMPARE_LE_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
         }
     }
 
-    Py_ssize_t operand2_size = operand2_is_negative == false ? operand2_digit_count : -operand2_digit_count;
+    NUITKA_MAY_BE_UNUSED Py_ssize_t operand2_size =
+        operand2_is_negative == false ? operand2_digit_count : -operand2_digit_count;
 
     bool r;
 
-    if (Py_SIZE(operand1_long_object) != operand2_size) {
-        r = Py_SIZE(operand1_long_object) - operand2_size < 0;
+    if (Nuitka_LongGetSignedDigitSize(operand1_long_object) != operand2_size) {
+        r = Nuitka_LongGetSignedDigitSize(operand1_long_object) - operand2_size < 0;
     } else {
-        Py_ssize_t i = Py_ABS(Py_SIZE(operand1_long_object));
+        Py_ssize_t i = Nuitka_LongGetDigitSize(operand1_long_object);
         r = true;
         while (--i >= 0) {
-            if (operand1_long_object->ob_digit[i] != operand2_digits[i]) {
-                r = operand1_long_object->ob_digit[i] < operand2_digits[i];
-                if (Py_SIZE(operand1_long_object) < 0) {
+            if (Nuitka_LongGetDigitPointer(operand1_long_object)[i] != operand2_digits[i]) {
+                r = Nuitka_LongGetDigitPointer(operand1_long_object)[i] < operand2_digits[i];
+                if (Nuitka_LongIsNegative(operand1_long_object)) {
                     r = !r;
                 }
                 break;
@@ -11761,6 +11765,7 @@ static bool COMPARE_LE_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
 
     return result;
 }
+#if PYTHON_VERSION < 0x300
 /* Code referring to "LONG" corresponds to Python2 'long', Python3 'int' and "INT" to Python2 'int'. */
 bool RICH_COMPARE_LE_CBOOL_LONG_INT(PyObject *operand1, PyObject *operand2) {
 
@@ -11780,9 +11785,11 @@ static PyObject *COMPARE_LE_OBJECT_INT_CLONG(PyObject *operand1, long operand2)
 
     // Convert to target type.
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 }
+#endif
+#if PYTHON_VERSION < 0x300
 /* Code referring to "INT" corresponds to Python2 'int' and "CLONG" to C platform long value. */
 PyObject *RICH_COMPARE_LE_OBJECT_INT_CLONG(PyObject *operand1, long operand2) {
 
@@ -11805,6 +11812,8 @@ static bool COMPARE_LE_CBOOL_INT_CLONG(PyObject *operand1, long operand2) {
 
     return result;
 }
+#endif
+#if PYTHON_VERSION < 0x300
 /* Code referring to "INT" corresponds to Python2 'int' and "CLONG" to C platform long value. */
 bool RICH_COMPARE_LE_CBOOL_INT_CLONG(PyObject *operand1, long operand2) {
 
@@ -11821,15 +11830,18 @@ static PyObject *COMPARE_LE_OBJECT_LONG_DIGIT(PyObject *operand1, long operand2)
 
     bool r;
 
-    if (Py_SIZE(operand1_long_object) != (Py_ssize_t)((operand2 == 0) ? 0 : ((operand2 < 0) ? -1 : 1))) {
-        r = Py_SIZE(operand1_long_object) - (Py_ssize_t)((operand2 == 0) ? 0 : ((operand2 < 0) ? -1 : 1)) < 0;
+    if (Nuitka_LongGetSignedDigitSize(operand1_long_object) !=
+        (Py_ssize_t)((operand2 == 0) ? 0 : ((operand2 < 0) ? -1 : 1))) {
+        r = Nuitka_LongGetSignedDigitSize(operand1_long_object) -
+                (Py_ssize_t)((operand2 == 0) ? 0 : ((operand2 < 0) ? -1 : 1)) <
+            0;
     } else {
-        Py_ssize_t i = Py_ABS(Py_SIZE(operand1_long_object));
+        Py_ssize_t i = Nuitka_LongGetDigitSize(operand1_long_object);
         r = true;
         while (--i >= 0) {
-            if (operand1_long_object->ob_digit[i] != (digit)Py_ABS(operand2)) {
-                r = operand1_long_object->ob_digit[i] < (digit)Py_ABS(operand2);
-                if (Py_SIZE(operand1_long_object) < 0) {
+            if (Nuitka_LongGetDigitPointer(operand1_long_object)[i] != (digit)Py_ABS(operand2)) {
+                r = Nuitka_LongGetDigitPointer(operand1_long_object)[i] < (digit)Py_ABS(operand2);
+                if (Nuitka_LongIsNegative(operand1_long_object)) {
                     r = !r;
                 }
                 break;
@@ -11839,7 +11851,7 @@ static PyObject *COMPARE_LE_OBJECT_LONG_DIGIT(PyObject *operand1, long operand2)
 
     // Convert to target type.
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 }
 /* Code referring to "LONG" corresponds to Python2 'long', Python3 'int' and "DIGIT" to C platform digit value for long
@@ -11858,15 +11870,18 @@ static bool COMPARE_LE_CBOOL_LONG_DIGIT(PyObject *operand1, long operand2) {
 
     bool r;
 
-    if (Py_SIZE(operand1_long_object) != (Py_ssize_t)((operand2 == 0) ? 0 : ((operand2 < 0) ? -1 : 1))) {
-        r = Py_SIZE(operand1_long_object) - (Py_ssize_t)((operand2 == 0) ? 0 : ((operand2 < 0) ? -1 : 1)) < 0;
+    if (Nuitka_LongGetSignedDigitSize(operand1_long_object) !=
+        (Py_ssize_t)((operand2 == 0) ? 0 : ((operand2 < 0) ? -1 : 1))) {
+        r = Nuitka_LongGetSignedDigitSize(operand1_long_object) -
+                (Py_ssize_t)((operand2 == 0) ? 0 : ((operand2 < 0) ? -1 : 1)) <
+            0;
     } else {
-        Py_ssize_t i = Py_ABS(Py_SIZE(operand1_long_object));
+        Py_ssize_t i = Nuitka_LongGetDigitSize(operand1_long_object);
         r = true;
         while (--i >= 0) {
-            if (operand1_long_object->ob_digit[i] != (digit)Py_ABS(operand2)) {
-                r = operand1_long_object->ob_digit[i] < (digit)Py_ABS(operand2);
-                if (Py_SIZE(operand1_long_object) < 0) {
+            if (Nuitka_LongGetDigitPointer(operand1_long_object)[i] != (digit)Py_ABS(operand2)) {
+                r = Nuitka_LongGetDigitPointer(operand1_long_object)[i] < (digit)Py_ABS(operand2);
+                if (Nuitka_LongIsNegative(operand1_long_object)) {
                     r = !r;
                 }
                 break;
@@ -11897,7 +11912,7 @@ static PyObject *COMPARE_LE_OBJECT_FLOAT_CFLOAT(PyObject *operand1, double opera
 
     // Convert to target type.
     PyObject *result = BOOL_FROM(r);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 }
 /* Code referring to "FLOAT" corresponds to Python 'float' and "CFLOAT" to C platform float value. */
@@ -11925,3 +11940,18 @@ bool RICH_COMPARE_LE_CBOOL_FLOAT_CFLOAT(PyObject *operand1, double operand2) {
 
     return COMPARE_LE_CBOOL_FLOAT_CFLOAT(operand1, operand2);
 }
+
+//     Part of "Nuitka", an optimizing Python compiler that is compatible and
+//     integrates with CPython, but also works on its own.
+//
+//     Licensed under the Apache License, Version 2.0 (the "License");
+//     you may not use this file except in compliance with the License.
+//     You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//     Unless required by applicable law or agreed to in writing, software
+//     distributed under the License is distributed on an "AS IS" BASIS,
+//     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//     See the License for the specific language governing permissions and
+//     limitations under the License.