Fix remaining lint errors.