diff --git a/types/dispatch.hpp b/types/dispatch.hpp
index b599e21a..829e942d 100644
--- a/types/dispatch.hpp
+++ b/types/dispatch.hpp
@@ -23,39 +23,39 @@ namespace cruft::types {
     decltype(auto)
     visit (description const &descriminator, FunctionT &&func, Args&&...args)
     {
-        #define INVOKE(KLASS)               \
+        #define INVOKE(TAG)                 \
         return std::invoke(                 \
             std::forward<FunctionT> (func), \
             std::forward<Args> (args)...,   \
-            type_tag<KLASS> {}              \
+            TAG                             \
         );
 
         switch (descriminator.category) {
-            case category ::NONE: INVOKE(void)
+            case category ::NONE: INVOKE(type_tag<void> {})
             case category::REAL:
                 switch (descriminator.width) {
-                    case 4: INVOKE(f32)
-                    case 8: INVOKE(f64)
+                    case 4: INVOKE(type_tag<f32> {})
+                    case 8: INVOKE(type_tag<f64> {})
                     default:
                         throw std::invalid_argument ("Unsupported floating point width");
                 }
 
-            case category::BOOL: INVOKE(bool)
+            case category::BOOL: INVOKE(type_tag<bool> {})
 
             case category::ENUM: {
                 if (descriminator.signedness) {
                     switch (descriminator.width) {
-                        case 1: INVOKE(unknown_enum_tag<i08>)
-                        case 2: INVOKE(unknown_enum_tag<i16>)
-                        case 3: INVOKE(unknown_enum_tag<i32>)
-                        case 4: INVOKE(unknown_enum_tag<i64>)
+                        case 1: INVOKE(type_tag<unknown_enum_tag<i08>> { descriminator })
+                        case 2: INVOKE(type_tag<unknown_enum_tag<i16>> { descriminator })
+                        case 3: INVOKE(type_tag<unknown_enum_tag<i32>> { descriminator })
+                        case 4: INVOKE(type_tag<unknown_enum_tag<i64>> { descriminator })
                     }
                 } else {
                     switch (descriminator.width) {
-                        case 1: INVOKE(unknown_enum_tag<u08>)
-                        case 2: INVOKE(unknown_enum_tag<u16>)
-                        case 3: INVOKE(unknown_enum_tag<u32>)
-                        case 4: INVOKE(unknown_enum_tag<u64>)
+                        case 1: INVOKE(type_tag<unknown_enum_tag<u08>> { descriminator })
+                        case 2: INVOKE(type_tag<unknown_enum_tag<u16>> { descriminator })
+                        case 3: INVOKE(type_tag<unknown_enum_tag<u32>> { descriminator })
+                        case 4: INVOKE(type_tag<unknown_enum_tag<u64>> { descriminator })
                     }
                 }
                 break;
@@ -66,17 +66,17 @@ namespace cruft::types {
 
                 if (descriminator.signedness) {
                     switch (descriminator.width) {
-                        case 1: INVOKE(i08)
-                        case 2: INVOKE(i16)
-                        case 3: INVOKE(i32)
-                        case 4: INVOKE(i64)
+                        case 1: INVOKE(type_tag<i08> {})
+                        case 2: INVOKE(type_tag<i16> {})
+                        case 3: INVOKE(type_tag<i32> {})
+                        case 4: INVOKE(type_tag<i64> {})
                     }
                 } else {
                     switch (descriminator.width) {
-                        case 1: INVOKE(u08)
-                        case 2: INVOKE(u16)
-                        case 3: INVOKE(u32)
-                        case 4: INVOKE(u64)
+                        case 1: INVOKE(type_tag<u08> {})
+                        case 2: INVOKE(type_tag<u16> {})
+                        case 3: INVOKE(type_tag<u32> {})
+                        case 4: INVOKE(type_tag<u64> {})
                     }
                 }