Clean up and harden various methods around trait substs #104533
+309
−350
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.