More refactoring of conjecture generation.  Term generation into own class.