-- Fix incorrect references and add a safety check    (for the rewritten domain property inference).
-- Fix incorrect references and add a safety check
   (for the rewritten domain property inference).

zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb