Allow FXFormFieldTypeOption fields to work again

Sorry, introduced a bug in the FXFormOptionPickerCell branch that turned regular
FXFormFieldTypeOption fields into FXFormFieldTypeDefault fields.

This PR fixes that problem