@@ -1088,21 +1088,26 @@ private Type getForwardedConstructorType(
   Function forwarder, string namespace, string type, boolean subtypes, string name,
   string signature, string ext, string constructorType
 ) {
-  exists(int index |
-    forwardsModel(namespace, type, subtypes, name, signature, ext, _, constructorType, _, _, _) and
-    forwarder = interpretElement(namespace, type, subtypes, name, signature, ext)
-  |
-    exists(string typeArguments |
+  forwardsModel(namespace, type, subtypes, name, signature, ext, _, constructorType, _, _, _) and
+  forwarder = interpretElement(namespace, type, subtypes, name, signature, ext) and
+  (
+    exists(string typeArguments, int index |
       parseAngles(type, _, typeArguments, "") and
       constructorType = getAtIndex(typeArguments, index) and
       result = forwarder.getDeclaringType().getTemplateArgument(index)
     )
     or
-    exists(string nameArguments |
+    exists(string nameArguments, int index |
       parseAngles(name, _, nameArguments, "") and
       constructorType = getAtIndex(nameArguments, index) and
       result = forwarder.getTemplateArgument(index)
     )
+    or
+    exists(TypedefType member |
+      member = forwarder.getDeclaringType().getAMember() and
+      member.hasName(constructorType) and
+      result = member.getUnderlyingType()
+    )
   )
 }
 
 
@@ -414,17 +414,17 @@ void forward_test_model() {
   c.emplace(0, x);
 
   Element e = c.get();
-  ymlSink(e.x); // $ MISSING: ir
+  ymlSink(e.x); // $ ir
 }
 
 void forward_test_member_alias_scalar() {
   Container<int> scalar;
   scalar.emplace(0, ymlSource());
-  ymlSink(scalar.get()); // $ MISSING: ir
+  ymlSink(scalar.get()); // $ ir
 
   Container<int*> pointer;
   pointer.emplace(0, ymlSourcePtr());
-  ymlSink(*pointer.get()); // $ MISSING: ir
+  ymlSink(*pointer.get()); // $ ir
 }
 
 struct ElementWithDefaultArgument {
@@ -438,7 +438,7 @@ void forward_test_model_with_default_argument() {
   c.emplace(0, x);
 
   ElementWithDefaultArgument e = c.get();
-  ymlSink(e.x); // $ MISSING: ir
+  ymlSink(e.x); // $ ir
 }
 
 struct ElementWithOverloadedArity {
@@ -452,7 +452,7 @@ void forward_test_constructor_arity() {
   {
     Container<ElementWithOverloadedArity> c;
     c.emplace(0, x);
-    ymlSink(c.get().x); // $ MISSING: ir
+    ymlSink(c.get().x); // $ ir
   }
   {
     Container<ElementWithOverloadedArity> c;
@@ -462,7 +462,7 @@ void forward_test_constructor_arity() {
   {
     Container<ElementWithOverloadedArity> c;
     c.emplace(0, 0, x);
-    ymlSink(c.get().x); // $ MISSING: ir
+    ymlSink(c.get().x); // $ ir
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -414,17 +414,17 @@ void forward_test_model() {`
`414`	`414`	`c.emplace(0, x);`
`415`	`415`
`416`	`416`	`Element e = c.get();`
`417`		`- ymlSink(e.x); // $ MISSING: ir`
	`417`	`+ ymlSink(e.x); // $ ir`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`void forward_test_member_alias_scalar() {`
`421`	`421`	`Container<int> scalar;`
`422`	`422`	`scalar.emplace(0, ymlSource());`
`423`		`- ymlSink(scalar.get()); // $ MISSING: ir`
	`423`	`+ ymlSink(scalar.get()); // $ ir`
`424`	`424`
`425`	`425`	`Container<int*> pointer;`
`426`	`426`	`pointer.emplace(0, ymlSourcePtr());`
`427`		`- ymlSink(*pointer.get()); // $ MISSING: ir`
	`427`	`+ ymlSink(*pointer.get()); // $ ir`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`struct ElementWithDefaultArgument {`
`@@ -438,7 +438,7 @@ void forward_test_model_with_default_argument() {`
`438`	`438`	`c.emplace(0, x);`
`439`	`439`
`440`	`440`	`ElementWithDefaultArgument e = c.get();`
`441`		`- ymlSink(e.x); // $ MISSING: ir`
	`441`	`+ ymlSink(e.x); // $ ir`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`struct ElementWithOverloadedArity {`
`@@ -452,7 +452,7 @@ void forward_test_constructor_arity() {`
`452`	`452`	`{`
`453`	`453`	`Container<ElementWithOverloadedArity> c;`
`454`	`454`	`c.emplace(0, x);`
`455`		`- ymlSink(c.get().x); // $ MISSING: ir`
	`455`	`+ ymlSink(c.get().x); // $ ir`
`456`	`456`	`}`
`457`	`457`	`{`
`458`	`458`	`Container<ElementWithOverloadedArity> c;`
`@@ -462,7 +462,7 @@ void forward_test_constructor_arity() {`
`462`	`462`	`{`
`463`	`463`	`Container<ElementWithOverloadedArity> c;`
`464`	`464`	`c.emplace(0, 0, x);`
`465`		`- ymlSink(c.get().x); // $ MISSING: ir`
	`465`	`+ ymlSink(c.get().x); // $ ir`
`466`	`466`	`}`
`467`	`467`	`}`
`468`	`468`