Fixups for recent Rust changes