More logical OptionChoice representation format