Removed some debugging output
Improved metavar error reporting
Moved complex instantiation code out of Equivalence