Updated for latest Rust: std::comm changes