This makes them automatically render correctly as radio buttons in the popover.
While at that bring in some other smaller fixes.