Misc cleanup of code nearby clang analyzer warnings.

No warnings were actually fixed.  Removed some unnecessary checks for null before delete(), changed some variables used as booleans to real 'bool's, moved some declarations together with initial assignment, made some private globals static.

Change-Id: I76d54ae907dc504866576df935c9a47e71785f68