IDI-104: Remove arrays of supported values from the data model into options.