WIP - Update for Rust 0.10