Fix in Expr and Fact classes.

No need to add additional recursion in Expr and Fact