Revert mistakes made in CPPCheck commit