updates for GHC 7.10 and Template Haskell 2.10