Unify momenta treatment, and include tracks-plus-jets momenta.