Fix more package clone warnings.

We can probably move these to simple resources() not nil checks.