Checkboxradio: Correctly assemble radio group

Closes gh-6659
Closes gh-7082
Fixes gh-7088