Work around a limitatin of syntactic unification causing variable collisions.
Cleanup debug statements