Fix code that would othwerwise use unititialized variables

 (cppcheck emits "uninitialized variable" warning for this).