Updated to build against current Rust master