Update for Rust v0.9