Remove references to scope trees in Rename

This should make it easier to modify ScopeTrees