[mgaunard]

There are several problems with the C++ variant, which could have been easily avoided by just following the original Rust more closely.