Revert some previous "CppCheck fixes" that might affect performance (and
is not really needed anyway). Not sure what I was smoking that day.