diff --git a/go/packages/golist/golist.go b/go/packages/golist/golist.go
index f0bbeb4b..a04b1b9d 100644
--- a/go/packages/golist/golist.go
+++ b/go/packages/golist/golist.go
@@ -44,18 +44,17 @@ func LoadRaw(ctx context.Context, cfg *raw.Config, patterns ...string) ([]string
 	}
 	// Determine files requested in contains patterns
 	var containFiles []string
-	{
-		restPatterns := make([]string, 0, len(patterns))
-		for _, pattern := range patterns {
-			if containFile := strings.TrimPrefix(pattern, "contains:"); containFile != pattern {
-				containFiles = append(containFiles, containFile)
-			} else {
-				restPatterns = append(restPatterns, pattern)
-			}
+	restPatterns := make([]string, 0, len(patterns))
+	for _, pattern := range patterns {
+		if strings.HasPrefix(pattern, "contains:") {
+			containFile := strings.TrimPrefix(pattern, "contains:")
+			containFiles = append(containFiles, containFile)
+		} else {
+			restPatterns = append(restPatterns, pattern)
 		}
-		containFiles = absJoin(cfg.Dir, containFiles)
-		patterns = restPatterns
 	}
+	containFiles = absJoin(cfg.Dir, containFiles)
+	patterns = restPatterns
 
 	// TODO(matloob): Remove the definition of listfunc and just use golistPackages once go1.12 is released.
 	var listfunc func(ctx context.Context, cfg *raw.Config, words ...string) ([]string, []*raw.Package, error)
diff --git a/go/packages/packages.go b/go/packages/packages.go
index 2bdac145..89076ab6 100644
--- a/go/packages/packages.go
+++ b/go/packages/packages.go
@@ -258,8 +258,8 @@ func newLoader(cfg *Config) *loader {
 		ld.Context = context.Background()
 	}
 	if ld.Dir == "" {
-		if cwd, err := os.Getwd(); err == nil {
-			ld.Dir = cwd
+		if dir, err := os.Getwd(); err == nil {
+			ld.Dir = dir
 		}
 	}