Updated for latest Rust and deps.