Updates variables and domains to have appropriate option choices