Fix infinite loop in datatypes enumerator.  Minor work on conjecture generator.