Update for latest Rust and change from tabs to spaces