Reorg to prep for including in Rust.