remove GCC '... may be used uninitialized' warnings

It's a minor refactoring that reduces GCC warnings, so my users will not be scared when they are upgrading.
Hope you would consider the pull request, very appreciated!