I was worried about this too, so (a) this change is in expandInstanceForEnv() so that it happens as late as possible (after all RS addons), and (b) I ran all the tests (unit & func) locally before issuing this PR.