diff --git a/importer/source_test.go b/importer/source_test.go
index 743f4c16..a9911f8a 100644
--- a/importer/source_test.go
+++ b/importer/source_test.go
@@ -42,7 +42,7 @@ func pathToString(path []ast.Node) string {
 // an error has already been reported in that case.
 //
 func findInterval(t *testing.T, fset *token.FileSet, input, substr string) (f *ast.File, start, end token.Pos) {
-	f, err := parser.ParseFile(fset, "<input>", input, parser.DeclarationErrors)
+	f, err := parser.ParseFile(fset, "<input>", input, 0)
 	if err != nil {
 		t.Errorf("parse error: %s", err)
 		return
diff --git a/importer/util.go b/importer/util.go
index d66a7366..7b9796a2 100644
--- a/importer/util.go
+++ b/importer/util.go
@@ -84,7 +84,7 @@ func ParseFiles(fset *token.FileSet, dir string, files ...string) ([]*ast.File,
 		}
 		wg.Add(1)
 		go func(i int, file string) {
-			parsed[i], errors[i] = parser.ParseFile(fset, file, nil, parser.DeclarationErrors)
+			parsed[i], errors[i] = parser.ParseFile(fset, file, nil, 0)
 			wg.Done()
 		}(i, file)
 	}
diff --git a/oracle/oracle_test.go b/oracle/oracle_test.go
index da210b14..f78a5d08 100644
--- a/oracle/oracle_test.go
+++ b/oracle/oracle_test.go
@@ -75,8 +75,7 @@ func parseQueries(t *testing.T, filename string) []*query {
 
 	// Parse the file once to discover the test queries.
 	var fset token.FileSet
-	f, err := parser.ParseFile(&fset, filename, filedata,
-		parser.DeclarationErrors|parser.ParseComments)
+	f, err := parser.ParseFile(&fset, filename, filedata, parser.ParseComments)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/pointer/example_test.go b/pointer/example_test.go
index bd86818a..9f78b696 100644
--- a/pointer/example_test.go
+++ b/pointer/example_test.go
@@ -45,7 +45,7 @@ func main() {
 	imp := importer.New(&importer.Config{Build: &build.Default})
 
 	// Parse the input file.
-	file, err := parser.ParseFile(imp.Fset, "myprog.go", myprog, parser.DeclarationErrors)
+	file, err := parser.ParseFile(imp.Fset, "myprog.go", myprog, 0)
 	if err != nil {
 		fmt.Print(err) // parse error
 		return
diff --git a/pointer/pointer_test.go b/pointer/pointer_test.go
index 80f68ae8..3e48bb24 100644
--- a/pointer/pointer_test.go
+++ b/pointer/pointer_test.go
@@ -169,7 +169,7 @@ func doOneInput(input, filename string) bool {
 	imp := importer.New(impctx)
 
 	// Parsing.
-	f, err := parser.ParseFile(imp.Fset, filename, input, parser.DeclarationErrors)
+	f, err := parser.ParseFile(imp.Fset, filename, input, 0)
 	if err != nil {
 		// TODO(adonovan): err is a scanner error list;
 		// display all errors not just first?
diff --git a/ssa/builder_test.go b/ssa/builder_test.go
index 8f5d6e7c..408a823a 100644
--- a/ssa/builder_test.go
+++ b/ssa/builder_test.go
@@ -40,7 +40,7 @@ func main() {
 `
 	imp := importer.New(new(importer.Config)) // no go/build.Context; uses GC importer
 
-	f, err := parser.ParseFile(imp.Fset, "<input>", test, parser.DeclarationErrors)
+	f, err := parser.ParseFile(imp.Fset, "<input>", test, 0)
 	if err != nil {
 		t.Error(err)
 		return
diff --git a/ssa/example_test.go b/ssa/example_test.go
index bdf2b3df..3f16e7e4 100644
--- a/ssa/example_test.go
+++ b/ssa/example_test.go
@@ -45,7 +45,7 @@ func main() {
 	imp := importer.New(&importer.Config{Build: &build.Default})
 
 	// Parse the input file.
-	file, err := parser.ParseFile(imp.Fset, "hello.go", hello, parser.DeclarationErrors)
+	file, err := parser.ParseFile(imp.Fset, "hello.go", hello, 0)
 	if err != nil {
 		fmt.Print(err) // parse error
 		return
diff --git a/ssa/source_test.go b/ssa/source_test.go
index 366aac0e..36272cc3 100644
--- a/ssa/source_test.go
+++ b/ssa/source_test.go
@@ -24,7 +24,7 @@ import (
 
 func TestObjValueLookup(t *testing.T) {
 	imp := importer.New(new(importer.Config)) // (uses GCImporter)
-	f, err := parser.ParseFile(imp.Fset, "testdata/objlookup.go", nil, parser.DeclarationErrors|parser.ParseComments)
+	f, err := parser.ParseFile(imp.Fset, "testdata/objlookup.go", nil, parser.ParseComments)
 	if err != nil {
 		t.Error(err)
 		return
@@ -178,8 +178,7 @@ func checkVarValue(t *testing.T, prog *ssa.Program, pkg *ssa.Package, ref []ast.
 // corresponding to every ast.Expr.
 func TestValueForExpr(t *testing.T) {
 	imp := importer.New(new(importer.Config)) // (uses GCImporter)
-	f, err := parser.ParseFile(imp.Fset, "testdata/valueforexpr.go", nil,
-		parser.DeclarationErrors|parser.ParseComments)
+	f, err := parser.ParseFile(imp.Fset, "testdata/valueforexpr.go", nil, parser.ParseComments)
 	if err != nil {
 		t.Error(err)
 		return