Instance declarations are working now.

It would be a good idea to rewrite `fixClauses` though.
Removing an obsolete case