diff --git a/share/machdeps/make_machdep/make_machdep.py b/share/machdeps/make_machdep/make_machdep.py
index 55770106954867f941f3f0c48cac1de47e06a19c..97aa2901b0a849a3b0f5962acfc62e5d3bbbcdab 100755
--- a/share/machdeps/make_machdep/make_machdep.py
+++ b/share/machdeps/make_machdep/make_machdep.py
@@ -191,7 +191,7 @@ def find_value(name, typ, output):
             return int(x)
 
     elif typ == "type":
-        expected = "([a-zA-Z_]+)"
+        expected = "'([^']+)'"
 
         def conversion(x):
             return x
diff --git a/share/machdeps/make_machdep/make_machdep_common.h b/share/machdeps/make_machdep/make_machdep_common.h
index 2dd4ae89ff4b326c9cd32d8b72b7e8324f38c37b..729a741947eeba95a6b88d30f9b45c64ff9f2a7e 100644
--- a/share/machdeps/make_machdep/make_machdep_common.h
+++ b/share/machdeps/make_machdep/make_machdep_common.h
@@ -39,6 +39,6 @@
 #define mkstr(s) #s
 
 #define TEST_TYPE_COMPATIBLE(T1, T2)                                           \
-  _Static_assert(!COMPATIBLE(T1, T2), "" mkstr(T2) " is " #T1);
+  _Static_assert(!COMPATIBLE(T1, T2), "" mkstr(T2) " is '" #T1 "'");
 
 #define TEST_TYPE_IS(type) TEST_TYPE_COMPATIBLE(type, TEST_TYPE)
diff --git a/share/machdeps/make_machdep/size_t.c b/share/machdeps/make_machdep/size_t.c
index eeca11c8bc7a4ea7a625720cd4d83709ba8c5e75..13a4685263cda07d1c57d97088bf9ee85f9b59a1 100644
--- a/share/machdeps/make_machdep/size_t.c
+++ b/share/machdeps/make_machdep/size_t.c
@@ -23,5 +23,8 @@
 #include "make_machdep_common.h"
 #include <stddef.h>
 
-_Static_assert(!COMPATIBLE(unsigned int, size_t), "size_t is unsigned int");
-_Static_assert(!COMPATIBLE(unsigned long, size_t), "size_t is unsigned long");
+#define TEST_TYPE size_t
+
+TEST_TYPE_IS(unsigned int)
+TEST_TYPE_IS(unsigned long)
+TEST_TYPE_IS(unsigned long long)