Upgrade to rust 0.7