Improve 'opam update' again.

This fixes regressions introduced by #597. Incidentaly, this is also related to #622 as old packages where not cleaned properly.