Extracted the nested variant-classification ternary out of resolvePickOrder's double loop into a named pure helper, toPick(base, keepers); Exported the existing PickBase type (it was already defined but unexported) and reused it, rather than the old inline anonymous base shape