Fixes type: choices variables to have a domain, rather than domains