Refactor after Rust's numeric reform.