Man, it is a little embarrassing to see some of my earliest Rust code from way back when. Thanks for going through and fixing/cleaning up a bunch of stuff. I put a few comments, but I don't think any of them are major.

Thanks for the recent changes.

The last things would be:

• See my comment about _quotation; we should see if we can just remove that variable if its not doing anything useful.
• Regarding tarpaulin, I'd see if you can figure out what the situation there is... ideally, we can just remove the lint rule and be fine, but if there's issues without that rule we should understand why.

This PR looks basically great to me minus the two items above, and both of those items are not dealbreakers.

For your information, I will be away on travel until 9/25. My responses in this PR may be delayed.

Sorry for the delay, but this looks great. Thanks!