Tweak suggest_constraining_type_param
#70009
+439
−640
Merged