Bugfix for previous commit.

Now, the catchall branch of equality instances are well kinded to
prevent overlap.

Also, removed explicit template-haskell version number dependency,
because that caused more problems than it solved.