Merge: Move `common_ffi` to `ffi` and clean up typos