Swapped order of resolve_option_values and resolve_dst_type