Refactor entailment filtering for conjecture generator.  Other minor cleanup.