Macro expansions cause multiple redundant assertions

[giovinazzo-kevin]

This is before running a query.

And this is after. There are multiple identical instances of fibonacci/4 and others.

[giovinazzo-kevin]

Partially fixed by using NumberVars to check for predicate structural equality.

Expansions are being refactored to be more efficient and consistent across the board.