coverity#704575 et al.  and clean-up.

Change-Id: I24b38b63d26bc2d4e1d479754120dfd5b5635737