Minor fixups found during Rust rewrite.