Fixing fallout from recent Rust changes.