[cppcheck] Part 3: More perf fixes that were missed during non-verbose run for whatever reason