Fix more snappy warnings.