Fix various lint errors.

I don't know how so many previous builds were successful. In any case, this should at least avoid breakage due to silly lint errors.