Fix multiple-return-value-to-first-class-aggregates autoupgrade to