Moves C binary make-picks to choose-picks, to avoid confusion