Cleanup: Use rustc's same_type
for our same_tys
#5528
+29
−47
Merged