- Further simplifications & fixes to call_ffi