diff --git a/src/Foundation/I18n/TH.hs b/src/Foundation/I18n/TH.hs
index 0068a5391..991d43e5d 100644
--- a/src/Foundation/I18n/TH.hs
+++ b/src/Foundation/I18n/TH.hs
@@ -113,28 +113,28 @@ mkMessage :: TH.Name  -- ^ Foundation type
           -> FilePath -- ^ Base directory of translation files
           -> Lang     -- ^ Default translation language
           -> TH.DecsQ
-mkMessage dt folder lang = mkMessageCommon True "Msg" dt (TH.mkName $ TH.nameBase dt <> "Message") folder lang
+mkMessage dt = mkMessageCommon True "Msg" dt . TH.mkName $ TH.nameBase dt <> "Message"
 
 mkMessageFor :: TH.Name    -- ^ Foundation type
              -> TH.Name    -- ^ Existing type to add translations for
              -> FilePath   -- ^ Base directory of translation files
              -> Lang       -- ^ Default translation language
              -> TH.DecsQ
-mkMessageFor master dt folder lang = mkMessageCommon False "" master dt folder lang
+mkMessageFor = mkMessageCommon False ""
 
 mkMessageVariant :: TH.Name  -- ^ Foundation type
                  -> TH.Name  -- ^ Existing type to add translations for
                  -> FilePath -- ^ Base directory of translation files
                  -> Lang     -- ^ Default translation language
                  -> TH.DecsQ
-mkMessageVariant master dt folder lang = mkMessageCommon False "Msg" master dt folder lang
+mkMessageVariant = mkMessageCommon False "Msg"
   
 mkMessageAddition :: TH.Name  -- ^ Foundation type
                   -> String   -- ^ Qualifier to insert into name of message type
                   -> FilePath -- ^ Base directory of translation files
                   -> Lang     -- ^ Default translation language
                   -> TH.DecsQ
-mkMessageAddition master dt folder lang = mkMessageCommon True "Msg" master (TH.mkName $ TH.nameBase master <> dt <> "Message") folder lang
+mkMessageAddition master qual = mkMessageCommon True "Msg" master . TH.mkName $ TH.nameBase master <> qual <> "Message"
 
 mkMessageCommon :: Bool     -- ^ Generate new datatype
                 -> String   -- ^ String to prepend to constructor names