Merge: Some FFI cleanup