diff --git a/scripts/codemap.py b/scripts/codemap.py
index c235c8db..cec6c91a 100755
--- a/scripts/codemap.py
+++ b/scripts/codemap.py
@@ -247,9 +247,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
-                    or attr[0] in {None, (), (None,), ('*',)}):
+            if not isinstance(attr, tuple):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 
diff --git a/scripts/codemapd3.py b/scripts/codemapd3.py
index ccabda5e..dfdb335f 100755
--- a/scripts/codemapd3.py
+++ b/scripts/codemapd3.py
@@ -116,9 +116,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
-                    or attr[0] in {None, (), (None,), ('*',)}):
+            if not isinstance(attr, tuple):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 
diff --git a/scripts/dbgbmap.py b/scripts/dbgbmap.py
index 6b4f5af5..c18a4571 100755
--- a/scripts/dbgbmap.py
+++ b/scripts/dbgbmap.py
@@ -3806,9 +3806,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
-                    or attr[0] in {None, (), (None,), ('*',)}):
+            if not isinstance(attr, tuple):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 
diff --git a/scripts/dbgbmapd3.py b/scripts/dbgbmapd3.py
index e2b1ef56..ae91cfdf 100755
--- a/scripts/dbgbmapd3.py
+++ b/scripts/dbgbmapd3.py
@@ -3694,9 +3694,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
-                    or attr[0] in {None, (), (None,), ('*',)}):
+            if not isinstance(attr, tuple):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 
diff --git a/scripts/dbgtrace.py b/scripts/dbgtrace.py
index 0b78bdc2..02f00b8e 100755
--- a/scripts/dbgtrace.py
+++ b/scripts/dbgtrace.py
@@ -262,9 +262,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
-                    or attr[0] in {None, (), (None,), ('*',)}):
+            if not isinstance(attr, tuple):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 
diff --git a/scripts/plot.py b/scripts/plot.py
index 2aef5850..7a9a0e26 100755
--- a/scripts/plot.py
+++ b/scripts/plot.py
@@ -424,9 +424,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
-                    or attr[0] in {None, (), (None,), ('*',)}):
+            if not isinstance(attr, tuple):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 
diff --git a/scripts/plotmpl.py b/scripts/plotmpl.py
index 10ac0a37..edd5bf68 100755
--- a/scripts/plotmpl.py
+++ b/scripts/plotmpl.py
@@ -308,9 +308,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
-                    or attr[0] in {None, (), (None,), ('*',)}):
+            if not isinstance(attr, tuple):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 
diff --git a/scripts/treemap.py b/scripts/treemap.py
index 031724fb..226b145c 100755
--- a/scripts/treemap.py
+++ b/scripts/treemap.py
@@ -316,9 +316,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
-                    or attr[0] in {None, (), (None,), ('*',)}):
+            if not isinstance(attr, tuple):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])
 
diff --git a/scripts/treemapd3.py b/scripts/treemapd3.py
index f884a090..ec4ff005 100755
--- a/scripts/treemapd3.py
+++ b/scripts/treemapd3.py
@@ -184,9 +184,10 @@ class Attr:
         self.attrs = []
         self.keyed = co.OrderedDict()
         for attr in attrs:
-            if (not isinstance(attr, tuple)
-                    or attr[0] in {None, (), (None,), ('*',)}):
+            if not isinstance(attr, tuple):
                 attr = ((), attr)
+            if attr[0] in {None, (), (None,), ('*',)}:
+                attr = ((), attr[1])
             if not isinstance(attr[0], tuple):
                 attr = ((attr[0],), attr[1])