Update for new C source for iconv handling.