misc cleanups for rust-fm