Work/code quality

Some code quality improvements, mostly spotted by clazy.

I have split this up into separate commits, to make it easier to review.

@yurchor @melnichenko