Improvements found by cppcheck: remove some unused variables and dead assignments, reduce the scope of some variables, add some parens to improve readability