Fix generation of second-class attribute choices, with unbounded option.