initial modifications for per-ic cbqi
Minor fixes for --fmf-fmc for quantifiers containing datatypes