Proper port to Rust-0.6