Fix Makefile
Reduce dump typeclass boilerplate code