Fix suppressed clippy nightly warnings

While working on #2009 (closed), I've found some cases where I needed to suppress a warning rather than fix it, either because the fix was too hard, or because the code is under active development. I've marked them with TODO #2010.