Improved link_or_rename() to handle prefer_rename better.