Bring code up to date with Rust master (f9260d4).