Aggressively simplify testing trees.
Remove unused import.
Rework term structure again.