Started moving towards Rust 0.7