Improve handling of repeated choices with one element