diff --git a/include/revng/Support/MetaAddress.h b/include/revng/Support/MetaAddress.h
index 5c57d414c..9d3436a6e 100644
--- a/include/revng/Support/MetaAddress.h
+++ b/include/revng/Support/MetaAddress.h
@@ -930,12 +930,10 @@ public:
 private:
   constexpr bool verify() const debug_function {
     // Invalid addresses are all the same
-    if (type() == MetaAddressType::Invalid) {
-      return *this == invalid();
-    }
-
-    if (static_cast<uint16_t>(Type) > MetaAddressType::Code_systemz)
+    if (type() == MetaAddressType::Invalid
+        or type() >= MetaAddressType::Count) {
       return false;
+    }
 
     // Check alignment
     if (Address % alignment() != 0)