clippy +nightly: Uncontroversial adjustments from Nick
This is a subset of !1388 (closed) containing precisely the commits I completely agree with, cherry picked.
I'll double check the contents, but after that, since @nickm wrote these commits, I will just set it to merge.