Get rid of __cdecl where possible