Does anyone know if it will become a part of the Workflow Import Wizard to let us change the referenced objects?

I know that once you import the workflow you can open it and change them.  But what I would like to prevent is cluttering up my lists with sources that shouldn't be used in that environment.

For example, I have a data source set up to a SQL table in my Dev, Test, and Production environments but each is a different path since I don't want all three environments pointing to the same table.  Once I promote it from Dev, my test environment now has both the Dev and Test data sources.

The only way to keep my list clean is to go into the workflow history and delete the first version then going into the data sources and deleting the source.  Only to have it show back up the next time I promote something with this same data source.