make define_opaque_types fully explicit
#109166
+307
−224
Merged