Minor modifications for building with latest Template-Haskell 2.9