cleanup and let radio/select fields have tuples or scalars