Fix all nightly clippy warnings

A few of these seem to have snuck in; we should fix them before Rust 1.71 releases in mid-July.

Assigning this to myself, but please feel free to do this if you love fixing clippy warnings.