diff --git a/Yesod/Form.hs b/Yesod/Form.hs
index 7944dc5c..8db1f2ef 100644
--- a/Yesod/Form.hs
+++ b/Yesod/Form.hs
@@ -64,6 +64,11 @@ import Control.Arrow ((&&&))
 import Data.List (group, sort)
 import Data.Monoid (mempty)
 
+#if __GLASGOW_HASKELL__ >= 700
+#define HAMLET hamlet
+#else
+#define HAMLET $hamlet
+#endif
 -- | Display only the actual input widget code, without any decoration.
 fieldsToPlain :: FormField sub y a -> Form sub y a
 fieldsToPlain = mapFormXml $ mapM_ fiInput
@@ -73,12 +78,7 @@ fieldsToPlain = mapFormXml $ mapM_ fiInput
 fieldsToTable :: FormField sub y a -> Form sub y a
 fieldsToTable = mapFormXml $ mapM_ go
   where
-    go fi =
-#if __GLASGOW_HASKELL__ >= 700
-                [hamlet|
-#else
-                [$hamlet|
-#endif
+    go fi = [HAMLET|
 <tr .#{clazz fi}>
     <td>
         <label for="#{fiIdent fi}">#{fiLabel fi}
@@ -94,12 +94,7 @@ fieldsToTable = mapFormXml $ mapM_ go
 fieldsToDivs :: FormField sub y a -> Form sub y a
 fieldsToDivs = mapFormXml $ mapM_ go
   where
-    go fi =
-#if __GLASGOW_HASKELL__ >= 700
-                [hamlet|
-#else
-                [$hamlet|
-#endif
+    go fi = [HAMLET|
 <div .#{clazz fi}>
     <label for="#{fiIdent fi}">#{fiLabel fi}
         <div .tooltip>#{fiTooltip fi}
@@ -134,12 +129,7 @@ runFormPost f = do
                 _ -> res
     return (res', xml, enctype, maybe mempty hidden nonce)
   where
-    hidden nonce =
-#if __GLASGOW_HASKELL__ >= 700
-                [hamlet|
-#else
-                [$hamlet|
-#endif
+    hidden nonce = [HAMLET|
     <input type="hidden" name="#{nonceName}" value="#{nonce}">
 |]
 
@@ -172,12 +162,7 @@ runFormTable :: Route m -> String -> FormField s m a
              -> GHandler s m (FormResult a, GWidget s m ())
 runFormTable dest inputLabel form = do
     (res, widget, enctype, nonce) <- runFormPost $ fieldsToTable form
-    let widget' =
-#if __GLASGOW_HASKELL__ >= 700
-                [hamlet|
-#else
-                [$hamlet|
-#endif
+    return (res, [HAMLET|
 <form method="post" action="@{dest}" enctype="#{enctype}">
     <table>
         \^{widget}
@@ -185,27 +170,20 @@ runFormTable dest inputLabel form = do
             <td colspan="2">
                 \#{nonce}
                 <input type="submit" value="#{inputLabel}">
-|]
-    return (res, widget')
+|])
 
 -- | Same as 'runFormPostTable', but uses 'fieldsToDivs' for styling.
 runFormDivs :: Route m -> String -> FormField s m a
             -> GHandler s m (FormResult a, GWidget s m ())
 runFormDivs dest inputLabel form = do
     (res, widget, enctype, nonce) <- runFormPost $ fieldsToDivs form
-    let widget' =
-#if __GLASGOW_HASKELL__ >= 700
-                [hamlet|
-#else
-                [$hamlet|
-#endif
+    return (res, [HAMLET|
 <form method="post" action="@{dest}" enctype="#{enctype}">
     \^{widget}
     <div>
         \#{nonce}
         <input type="submit" value="#{inputLabel}">
-|]
-    return (res, widget')
+|])
 
 -- | Run a form against GET parameters, disregarding the resulting HTML and
 -- returning an error response on invalid input.
@@ -223,12 +201,7 @@ generateForm :: GForm s m xml a -> GHandler s m (xml, Enctype, Html)
 generateForm f = do
     (_, b, c) <- runFormGeneric [] [] f
     nonce <- fmap reqNonce getRequest
-    return (b, c,
-#if __GLASGOW_HASKELL__ >= 700
-                [hamlet|
-#else
-                [$hamlet|
-#endif
+    return (b, c, [HAMLET|\
 $maybe n <- nonce
     <input type="hidden" name="#{nonceName}" value="#{n}">
 |])
diff --git a/Yesod/Form/Fields.hs b/Yesod/Form/Fields.hs
index 2aac1a18..ad46681f 100644
--- a/Yesod/Form/Fields.hs
+++ b/Yesod/Form/Fields.hs
@@ -63,6 +63,12 @@ import Data.Monoid
 import Control.Monad (join)
 import Data.Maybe (fromMaybe, isNothing)
 
+#if __GLASGOW_HASKELL__ >= 700
+#define HAMLET hamlet
+#else
+#define HAMLET $hamlet
+#endif
+
 stringField :: (IsForm f, FormType f ~ String)
             => FormFieldSettings -> Maybe String -> f
 stringField = requiredFieldHelper stringFieldProfile
@@ -141,12 +147,7 @@ boolField ffs orig = toForm $ do
             { fiLabel = string label
             , fiTooltip = tooltip
             , fiIdent = theId
-            , fiInput =
-#if __GLASGOW_HASKELL__ >= 700
-                [hamlet|
-#else
-                [$hamlet|
-#endif
+            , fiInput = [HAMLET|
 <input id="#{theId}" type="checkbox" name="#{name}" :val:checked="">
 |]
             , fiErrors = case res of
@@ -281,12 +282,7 @@ boolInput n = GForm $ do
                 Just "" -> FormSuccess False
                 Just "false" -> FormSuccess False
                 Just _ -> FormSuccess True
-    let xml =
-#if __GLASGOW_HASKELL__ >= 700
-                [hamlet|
-#else
-                [$hamlet|
-#endif
+    let xml = [HAMLET|
     <input id="#{n}" type="checkbox" name="#{n}">
 |]
     return (res, [xml], UrlEncoded)
@@ -401,12 +397,7 @@ maybeFileField ffs = toForm $ do
     return (res, fi, Multipart)
 
 fileWidget :: String -> String -> Bool -> GWidget s m ()
-fileWidget theId name isReq =
-#if __GLASGOW_HASKELL__ >= 700
-                [hamlet|
-#else
-                [$hamlet|
-#endif
+fileWidget theId name isReq = [HAMLET|
 <input id="#{theId}" type="file" name="#{name}" :isReq:required="">
 |]
 
@@ -436,12 +427,7 @@ radioField pairs ffs initial = toForm $ do
             case res of
                 FormSuccess y -> x == y
                 _ -> Just x == initial
-    let input =
-#if __GLASGOW_HASKELL__ >= 700
-                [hamlet|
-#else
-                [$hamlet|
-#endif
+    let input = [HAMLET|
 <div id="#{theId}">
    $forall pair <- pairs'
        <div>