Cleaned up Wrangler._rename_asset() and Wrangler._remove_asset().

Factored out asset-selection logic from both methods.