diff --git a/src/Control/Abstract/Value.hs b/src/Control/Abstract/Value.hs
index c31d0725a..eb8a6646b 100644
--- a/src/Control/Abstract/Value.hs
+++ b/src/Control/Abstract/Value.hs
@@ -211,7 +211,7 @@ evaluateInScopedEnv :: ( AbstractValue address value effects
                     -> Evaluator address value effects a
 evaluateInScopedEnv scopedEnvTerm term = do
   scopedEnv <- scopedEnvironment scopedEnvTerm
-  env <- maybe getEnv pure scopedEnv
+  env <- maybeM getEnv scopedEnv
   withEnv env term
 
 
diff --git a/src/Language/Go/Syntax.hs b/src/Language/Go/Syntax.hs
index af71cc32b..d6ef4d76c 100644
--- a/src/Language/Go/Syntax.hs
+++ b/src/Language/Go/Syntax.hs
@@ -87,7 +87,7 @@ instance Evaluatable QualifiedImport where
     paths <- resolveGoImport importPath
     alias <- maybeM (throwEvalError NoNameError) (declaredName (subterm aliasTerm))
     void . letrec' alias $ \addr -> do
-      makeNamespace alias addr Nothing $ for_ paths $ \p -> do
+      makeNamespace alias addr Nothing . for_ paths $ \p -> do
         traceResolve (unPath importPath) p
         importedEnv <- fst <$> require p
         bindAll importedEnv