Update to work with new, runtime-free Rust