fix switch_names() breakage in short-to-short case