Fix more lint warnings.