As is so often the case in Rust, most of the work was fixing compiler
errors and removing spurious type annotations.