Simplify entailment code

acoburn requested to merge entailment2 into master

I am pretty sure that the integration tests fail for this, but it works in manual testing.

Merge request reports