Synchronise with unpack-funcs-0.3.1 on hackage
Fix compilation with template-haskell >= 2.8