Fix pack deduction to only deduce the arity of packs that are actually

expanded by the deduced pack.

We recently started also deducing the arity of separately-expanded packs
that are merely mentioned within the pack in question, which is
incorrect.

(cherry picked from commit e8f198dd)