Unify the FFI types everywhere
Unify the FFI types everywhere