Fix for latest Rust master.