Code cleanup based on 'infer' suggestions; mostly just dead stores.

One forgotten change
7 files changed