Sync with ports, catch up with recent iconv changes.