Update for latest Template Haskell