Tweak Makefile for Cabal 1.20
Remove test dictionary creation code.
Instantiate types based on types of instantiated values.