Update choice related form templates to be closer to the stock ones

 * Move radio/checkbox logic to `choice_widget_expanded`
 * Add missing `required` variable handling