More FFI touchups.