@@ -110,14 +110,6 @@ def check_dont_replace(self, source):
         source = reformat(source)
         self.assertEqual(patch(source), source)
 
-    def test_expr_regex(self):
-        self.check_replace("a->b->ob_type", "Py_TYPE(a->b)")
-        self.check_replace("a.b->ob_type", "Py_TYPE(a.b)")
-        self.check_replace("array[2]->ob_type", "Py_TYPE(array[2])")
-
-        # Don't match function calls
-        self.check_dont_replace("func()->ob_type")
-
     def test_pythoncapi_compat(self):
         # If pythoncapi_compat.h is included, avoid compatibility includes
         # and macros.
@@ -538,6 +530,32 @@ def test_py_is(self):
             }
         """)
 
+        self.check_replace("""
+            void test_expr(struct MyStruct *obj)
+            {
+                if (obj->attr1 == Py_None) {
+                    return 1;
+                }
+                if (obj->attr2.name == Py_None) {
+                    return 1;
+                }
+                return 0;
+            }
+        """, """
+            #include "pythoncapi_compat.h"
+
+            void test_expr(struct MyStruct *obj)
+            {
+                if (Py_IsNone(obj->attr1)) {
+                    return 1;
+                }
+                if (Py_IsNone(obj->attr2.name)) {
+                    return 1;
+                }
+                return 0;
+            }
+        """)
+
 
     def test_no_compat(self):
         # Don't add "#include "pythoncapi_compat.h"
 
@@ -315,12 +315,12 @@ def replace2(regs):
         return f'{x} = _Py_StealRef({y});'
 
     REPLACE = []
-    id_regex = r'(%s)' % ID_REGEX
+    expr = r'(%s)' % EXPR_REGEX
     for name in ('None', 'True', 'False'):
         REPLACE.extend((
-            (re.compile(fr'({ID_REGEX}) == Py_{name}\b'),
+            (re.compile(fr'{expr} == Py_{name}\b'),
              fr'Py_Is{name}(\1)'),
-            (re.compile(fr'({ID_REGEX}) != Py_{name}\b'),
+            (re.compile(fr'{expr} != Py_{name}\b'),
              fr'!Py_Is{name}(\1)'),
         ))