Fix things commented on in past code review.

Change-Id: I4dafd098eefa99bc37fdbfebeb4c61a7251ad0be