Updated code to Rust 0.9-pre