Revert "Fixing some issues found by Clang/LLVM static analyzer. "

This reverts commit a203fcf8332d86d49990506992f0f2194cb56bfb.
Fixing another Clang/LLVM warning.