Update to work with latest Rust master