Update to compile with template-haskell 2.8, present in GHC 7.6