Simplify lemma data preparation & usage - no need for both an 'in' an…

Simplify lemma data preparation & usage - no need for both an 'in' an… #6429