@@ -112,8 +112,8 @@ public static NewReference tp_richcompare(BorrowedReference ob, BorrowedReferenc
             {
                 case Runtime.Py_EQ:
                 case Runtime.Py_NE:
-                    PyObject pytrue = Runtime.PyTrue;
-                    PyObject pyfalse = Runtime.PyFalse;
+                    BorrowedReference pytrue = Runtime.PyTrue;
+                    BorrowedReference pyfalse = Runtime.PyFalse;
 
                     // swap true and false for NE
                     if (op != Runtime.Py_EQ)
@@ -163,7 +163,7 @@ public static NewReference tp_richcompare(BorrowedReference ob, BorrowedReferenc
                     {
                         int cmp = co1Comp.CompareTo(co2.inst);
 
-                        PyObject pyCmp;
+                        BorrowedReference pyCmp;
                         if (cmp < 0)
                         {
                             if (op == Runtime.Py_LT || op == Runtime.Py_LE)
 
@@ -664,7 +664,7 @@ public static T InvokeMethod<T>(IPythonDerivedType obj, string methodName, strin
                 try
                 {
                     using var pyself = new PyObject(self.CheckRun());
-                    using PyObject method = pyself.GetAttr(methodName, Runtime.PyNone);
+                    using PyObject method = pyself.GetAttr(methodName, Runtime.None);
                     if (method.Reference != Runtime.PyNone)
                     {
                         // if the method hasn't been overridden then it will be a managed object
@@ -717,9 +717,9 @@ public static void InvokeMethodVoid(IPythonDerivedType obj, string methodName, s
                 try
                 {
                     using var pyself = new PyObject(self.CheckRun());
-                    PyObject method = pyself.GetAttr(methodName, Runtime.PyNone);
+                    PyObject method = pyself.GetAttr(methodName, Runtime.None);
                     disposeList.Add(method);
-                    if (method.Reference != Runtime.PyNone)
+                    if (method.Reference != Runtime.None)
                     {
                         // if the method hasn't been overridden then it will be a managed object
                         ManagedType? managedMethod = ManagedType.GetManagedObject(method);
 
@@ -209,12 +209,12 @@ private static void InitPyMembers()
 
                 SetPyMember(out PyBaseObjectType, PyObject_GetAttrString(builtins, "object").StealNullable());
 
-                SetPyMember(out PyNone, PyObject_GetAttrString(builtins, "None").StealNullable());
-                SetPyMember(out PyTrue, PyObject_GetAttrString(builtins, "True").StealNullable());
-                SetPyMember(out PyFalse, PyObject_GetAttrString(builtins, "False").StealNullable());
+                SetPyMember(out _PyNone, PyObject_GetAttrString(builtins, "None").StealNullable());
+                SetPyMember(out _PyTrue, PyObject_GetAttrString(builtins, "True").StealNullable());
+                SetPyMember(out _PyFalse, PyObject_GetAttrString(builtins, "False").StealNullable());
 
-                SetPyMemberTypeOf(out PyBoolType, PyTrue!);
-                SetPyMemberTypeOf(out PyNoneType, PyNone!);
+                SetPyMemberTypeOf(out PyBoolType, _PyTrue!);
+                SetPyMemberTypeOf(out PyNoneType, _PyNone!);
 
                 SetPyMemberTypeOf(out PyMethodType, PyObject_GetAttrString(builtins, "len").StealNullable());
 
@@ -598,9 +598,12 @@ private static void MoveClrInstancesOnwershipToPython()
         internal const int Py_GT = 4;
         internal const int Py_GE = 5;
 
-        internal static PyObject PyTrue;
-        internal static PyObject PyFalse;
-        internal static PyObject PyNone;
+        internal static BorrowedReference PyTrue => _PyTrue;
+        static PyObject _PyTrue;
+        internal static BorrowedReference PyFalse => _PyFalse;
+        static PyObject _PyFalse;
+        internal static BorrowedReference PyNone => _PyNone;
+        private static PyObject _PyNone;
 
         private static Lazy<PyObject> inspect;
         internal static PyObject InspectModule => inspect.Value;
@@ -610,7 +613,7 @@ private static void MoveClrInstancesOnwershipToPython()
 
         internal static BorrowedReference CLRMetaType => PyCLRMetaType;
 
-        public static PyObject None => new(PyNone);
+        public static PyObject None => new(_PyNone);
 
         /// <summary>
         /// Check if any Python Exceptions occurred.
Original file line number	Diff line number	Diff line change
@@ -112,8 +112,8 @@ public static NewReference tp_richcompare(BorrowedReference ob, BorrowedReferenc
112	112	{
113	113	case Runtime.Py_EQ:
114	114	case Runtime.Py_NE:
115		- PyObject pytrue = Runtime.PyTrue;
116		- PyObject pyfalse = Runtime.PyFalse;
	115	+ BorrowedReference pytrue = Runtime.PyTrue;
	116	+ BorrowedReference pyfalse = Runtime.PyFalse;
117	117
118	118	// swap true and false for NE
119	119	if (op != Runtime.Py_EQ)
@@ -163,7 +163,7 @@ public static NewReference tp_richcompare(BorrowedReference ob, BorrowedReferenc
163	163	{
164	164	int cmp = co1Comp.CompareTo(co2.inst);
165	165
166		- PyObject pyCmp;
	166	+ BorrowedReference pyCmp;
167	167	if (cmp < 0)
168	168	{
169	169	if (op == Runtime.Py_LT \|\| op == Runtime.Py_LE)
Original file line number	Diff line number	Diff line change
@@ -664,7 +664,7 @@ public static T InvokeMethod<T>(IPythonDerivedType obj, string methodName, strin
664	664	try
665	665	{
666	666	using var pyself = new PyObject(self.CheckRun());
667		- using PyObject method = pyself.GetAttr(methodName, Runtime.PyNone);
	667	+ using PyObject method = pyself.GetAttr(methodName, Runtime.None);
668	668	if (method.Reference != Runtime.PyNone)
669	669	{
670	670	// if the method hasn't been overridden then it will be a managed object
@@ -717,9 +717,9 @@ public static void InvokeMethodVoid(IPythonDerivedType obj, string methodName, s
717	717	try
718	718	{
719	719	using var pyself = new PyObject(self.CheckRun());
720		- PyObject method = pyself.GetAttr(methodName, Runtime.PyNone);
	720	+ PyObject method = pyself.GetAttr(methodName, Runtime.None);
721	721	disposeList.Add(method);
722		- if (method.Reference != Runtime.PyNone)
	722	+ if (method.Reference != Runtime.None)
723	723	{
724	724	// if the method hasn't been overridden then it will be a managed object
725	725	ManagedType? managedMethod = ManagedType.GetManagedObject(method);