Additional cdecl fixes.