Make Environment explicit, remove old macro