Single unfold case inadvertently omitted in previous commit
Allow variable renaming to override instantiated variables