Similar to #306 , is there a way to improve and simplify the current implementation of radio and checkbox form controls?