Minor changes for rust -master

Some minor changes that happened since Rust 0.9.