A fix another issue with radiogroup, and improve previous commit to
avoid dealing with decoding a utf-8 key entirely.  Keep track of the
original key for each option instead of getting a label's text
(which I guess is messing with the encoding).