Updated to compile on Rust master (pre-0.9)