Improved handling of singleton domains (especially for XCSP)