Automated fixes to follow Rust's recent developments