Upgrade code to work with Rust 0.13