Fix self-substituting during instantiation