fix various /analyze warnings
revert unintended change in r9695