Oops, when rename-merging a tag, get rid of the old tag!