Update for rust changes and silence silly warning.
Cargo-ify!