Address some clazy warnings
Reason for the change
Fixes some trivial issues found by clazy. The only remaining warnings are related to mixing iterator
s with const_iterator
s and not trivial to fix (I will do it in another MR so it is easier to review).
Test plan
Compile & run autotests