diff --git a/go/loader/cgo.go b/go/loader/cgo.go
index 299e72579f..fb39e53e74 100644
--- a/go/loader/cgo.go
+++ b/go/loader/cgo.go
@@ -87,9 +87,9 @@ func processCgoFiles(bp *build.Package, fset *token.FileSet, DisplayPath func(pa
 		if err != nil {
 			return nil, err
 		}
-		defer rd.Close()
 		display := filepath.Join(bp.Dir, cgoDisplayFiles[i])
 		f, err := parser.ParseFile(fset, display, rd, mode)
+		rd.Close()
 		if err != nil {
 			return nil, err
 		}
diff --git a/go/loader/loader.go b/go/loader/loader.go
index bbacc5b431..1d3ead0df8 100644
--- a/go/loader/loader.go
+++ b/go/loader/loader.go
@@ -449,7 +449,9 @@ func (conf *Config) Load() (*Program, error) {
 		conf.FindPackage = func(ctxt *build.Context, path string) (*build.Package, error) {
 			// TODO(adonovan): cache calls to build.Import
 			// so we don't do it three times per test package.
+			ioLimit <- true
 			bp, err := ctxt.Import(path, conf.Cwd, 0)
+			<-ioLimit
 			if _, ok := err.(*build.NoGoError); ok {
 				return bp, nil // empty directory is not an error
 			}
diff --git a/go/loader/util.go b/go/loader/util.go
index 0404e99106..3b64856571 100644
--- a/go/loader/util.go
+++ b/go/loader/util.go
@@ -19,7 +19,7 @@ import (
 
 // We use a counting semaphore to limit
 // the number of parallel I/O calls per process.
-var sema = make(chan bool, 10)
+var ioLimit = make(chan bool, 10)
 
 // parseFiles parses the Go source files within directory dir and
 // returns the ASTs of the ones that could be at least partially parsed,
@@ -42,10 +42,10 @@ func parseFiles(fset *token.FileSet, ctxt *build.Context, displayPath func(strin
 		}
 		wg.Add(1)
 		go func(i int, file string) {
-			sema <- true // wait
+			ioLimit <- true // wait
 			defer func() {
 				wg.Done()
-				<-sema // signal
+				<-ioLimit // signal
 			}()
 			var rd io.ReadCloser
 			var err error