diff --git a/virtinst/support.py b/virtinst/support.py
index 6cd411c74..2908e2e52 100644
--- a/virtinst/support.py
+++ b/virtinst/support.py
@@ -23,51 +23,52 @@ import libvirt
 
 
 # Flags for check_conn_support
-SUPPORT_CONN_STORAGE = 0
-SUPPORT_CONN_FINDPOOLSOURCES = 1
-SUPPORT_CONN_NODEDEV = 2
-SUPPORT_CONN_KEYMAP_AUTODETECT = 3
-SUPPORT_CONN_GETHOSTNAME = 4
-SUPPORT_CONN_DOMAIN_VIDEO = 5
-SUPPORT_CONN_NETWORK = 7
-SUPPORT_CONN_INTERFACE = 8
-SUPPORT_CONN_MAXVCPUS_XML = 9
-SUPPORT_CONN_STREAM = 10
+(SUPPORT_CONN_STORAGE,
+ SUPPORT_CONN_FINDPOOLSOURCES,
+ SUPPORT_CONN_NODEDEV,
+ SUPPORT_CONN_KEYMAP_AUTODETECT,
+ SUPPORT_CONN_GETHOSTNAME,
+ SUPPORT_CONN_DOMAIN_VIDEO,
+ SUPPORT_CONN_NETWORK,
+ SUPPORT_CONN_INTERFACE,
+ SUPPORT_CONN_MAXVCPUS_XML,
+ SUPPORT_CONN_STREAM) = range(10)
 
 # Flags for check_domain_support
-SUPPORT_DOMAIN_GETVCPUS = 1000
-SUPPORT_DOMAIN_XML_SECURE = 1001
-SUPPORT_DOMAIN_XML_INACTIVE = 1002
-SUPPORT_DOMAIN_MANAGED_SAVE = 1003
-SUPPORT_DOMAIN_MIGRATE_DOWNTIME = 1004
-SUPPORT_DOMAIN_JOB_INFO = 1005
-SUPPORT_DOMAIN_MAXVCPUS_XML = 1006
-SUPPORT_DOMAIN_CONSOLE_STREAM = 1007
-SUPPORT_DOMAIN_SET_METADATA = 1008
-SUPPORT_DOMAIN_CPU_HOST_MODEL = 1009
+(SUPPORT_DOMAIN_GETVCPUS,
+ SUPPORT_DOMAIN_XML_SECURE,
+ SUPPORT_DOMAIN_XML_INACTIVE,
+ SUPPORT_DOMAIN_MANAGED_SAVE,
+ SUPPORT_DOMAIN_MIGRATE_DOWNTIME,
+ SUPPORT_DOMAIN_JOB_INFO,
+ SUPPORT_DOMAIN_MAXVCPUS_XML,
+ SUPPORT_DOMAIN_CONSOLE_STREAM,
+ SUPPORT_DOMAIN_SET_METADATA,
+ SUPPORT_DOMAIN_CPU_HOST_MODEL) = range(1000, 1010)
 
 # Flags for check_pool_support
-SUPPORT_STORAGE_CREATEVOLFROM = 2000
-SUPPORT_STORAGE_UPLOAD = 2001
+(SUPPORT_STORAGE_CREATEVOLFROM,
+ SUPPORT_STORAGE_UPLOAD) = range(2000, 2002)
 
 # Flags for check_nodedev_support
-SUPPORT_NODEDEV_PCI_DETACH = 3000
+(SUPPORT_NODEDEV_PCI_DETACH,) = range(3000, 3001)
 
 # Flags for check_interface_support
-SUPPORT_INTERFACE_XML_INACTIVE = 4000
+(SUPPORT_INTERFACE_XML_INACTIVE,) = range(4000, 4001)
 
 # Flags for check_conn_hv_support
-SUPPORT_CONN_HV_VIRTIO = 5000
-SUPPORT_CONN_HV_SKIP_DEFAULT_ACPI = 5001
-SUPPORT_CONN_HV_SOUND_AC97 = 5002
-SUPPORT_CONN_HV_SOUND_ICH6 = 5003
-SUPPORT_CONN_HV_GRAPHICS_SPICE = 5004
-SUPPORT_CONN_HV_CHAR_SPICEVMC = 5005
-SUPPORT_CONN_HV_DIRECT_INTERFACE = 5006
-SUPPORT_CONN_HV_FILESYSTEM = 5007
+(SUPPORT_CONN_HV_VIRTIO,
+ SUPPORT_CONN_HV_SKIP_DEFAULT_ACPI,
+ SUPPORT_CONN_HV_SOUND_AC97,
+ SUPPORT_CONN_HV_SOUND_ICH6,
+ SUPPORT_CONN_HV_GRAPHICS_SPICE,
+ SUPPORT_CONN_HV_CHAR_SPICEVMC,
+ SUPPORT_CONN_HV_DIRECT_INTERFACE,
+ SUPPORT_CONN_HV_FILESYSTEM) = range(5000, 5008)
 
 # Flags for check_stream_support
-SUPPORT_STREAM_UPLOAD = 6000
+(SUPPORT_STREAM_UPLOAD,) = range(6000, 6001)
+
 
 # Possible keys:
 #