Modify for upcoming Rust 0.9