New branch implementing typed/untyped Template Haskell