Fix a bad return from convert_to_unicode.

The recent cleanup in convert_to_unicode returned one value instead of a
tuple for one of the conditionals. It now returns the encoding along
with the value.