[cppcheck] Part 2: Some further style fixes etc.