Make clippy happy

Now that we have CI access, we'll run clippy against every change.

As it stands clippy isn't happy with how things are right now and that should be addressed.