Appease Clippy.

[ndarilek]

I got tired of seeing all these warnings, so most of them are fixed. :)

I disabled one because I thought the code it suggested was way more obscure than was strictly necessary.

[klangner]

Thanks!