Fix more cpplint warnings.
Remove final lint warning.