diff --git a/compiler/noirc_frontend/src/monomorphization/mod.rs b/compiler/noirc_frontend/src/monomorphization/mod.rs
index cfd9a61d13f..9d11ecd54bc 100644
--- a/compiler/noirc_frontend/src/monomorphization/mod.rs
+++ b/compiler/noirc_frontend/src/monomorphization/mod.rs
@@ -1691,23 +1691,15 @@ impl<'interner> Monomorphizer<'interner> {
 }
 
 fn unwrap_tuple_type(typ: &HirType) -> Vec<HirType> {
-    match typ {
+    match typ.follow_bindings() {
         HirType::Tuple(fields) => fields.clone(),
-        HirType::TypeVariable(binding, TypeVariableKind::Normal) => match &*binding.borrow() {
-            TypeBinding::Bound(binding) => unwrap_tuple_type(binding),
-            TypeBinding::Unbound(_) => unreachable!(),
-        },
         other => unreachable!("unwrap_tuple_type: expected tuple, found {:?}", other),
     }
 }
 
 fn unwrap_struct_type(typ: &HirType) -> Vec<(String, HirType)> {
-    match typ {
-        HirType::Struct(def, args) => def.borrow().get_fields(args),
-        HirType::TypeVariable(binding, TypeVariableKind::Normal) => match &*binding.borrow() {
-            TypeBinding::Bound(binding) => unwrap_struct_type(binding),
-            TypeBinding::Unbound(_) => unreachable!(),
-        },
+    match typ.follow_bindings() {
+        HirType::Struct(def, args) => def.borrow().get_fields(&args),
         other => unreachable!("unwrap_struct_type: expected struct, found {:?}", other),
     }
 }