Tweak to convert_str_with_type to pass through non strings immediatly