Merge pull request #740 from rloomba/rloomba/trivial-clippy-fixes