Update to work with the last Rust api.