(cleanup) Update for latest rust and cargo.