Update some additional package rules where structure changed in #3963. (#3966)

I think the template files are simply an oversight. The fuzz files
should probably be updated because failing on the `package` line isn't
an interesting test of logic. Plus one minor comment edit.

toolchain/check/fuzzer_corpus/ea9a466902e7e5de89ab73b1fb426fc8b5a6d995 → toolchain/check/fuzzer_corpus/008cb7b685ac13c051abc8e778bb56c6be8c920d

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 1
 
-package ExplorerTest api;
+package ExplorerTest;
 
 var x: i32;
 

toolchain/check/fuzzer_corpus/52d56f074421d8a0d70b7165db6df02000f35359 → toolchain/check/fuzzer_corpus/016a8df42375f098eaf2bda8fa7ed1cdd322e51d

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 1
 
-package ExplorerTest api;
+package ExplorerTest;
 
 choice Ints {
   None,

toolchain/check/fuzzer_corpus/4367b235dfdad01ab5652abfe5052b5b1a410d82 → toolchain/check/fuzzer_corpus/01b6283c2544cf135b8c219478e5b0f8da2325ed

@@ -8,7 +8,7 @@
 // CHECK:STDOUT: 210
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 class A { var n: i32; }
 

toolchain/check/fuzzer_corpus/4487e8bd672c03926d372d25aa108d6fa909c11a → toolchain/check/fuzzer_corpus/02163cf92aea19e124c4a5838dae8f0ed340fbfa

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 3
 
-package ExplorerTest api;
+package ExplorerTest;
 
 class Cell(T:! type) {
   fn Create(x: T) -> Cell(T) { return { .data = x }; }

toolchain/check/fuzzer_corpus/b7b4b3663513c4530e99086904fbb7108200bc77 → toolchain/check/fuzzer_corpus/0234ac9a0b945c8a32fc87ee33f9a6d8f9933019

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Bad[T:! type](x: {.a: i32, .b: T}) {}
 

toolchain/check/fuzzer_corpus/7a20636f05cc0619b0d09767f2f804541e9b1db7 → toolchain/check/fuzzer_corpus/023877f085e3eedd9a0f13951f04859de07944e9

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   var (x: auto, y: [i32;]) = (42, (0, 1));

toolchain/check/fuzzer_corpus/22d9a3333ee8d54f7e1233bf62920026ca8f3a1d → toolchain/check/fuzzer_corpus/0272d8c7b9a7495efe6a19e9e814ecbe55823213

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 interface X { fn F(); }
 impl i32 as X { fn F() {} }

toolchain/check/fuzzer_corpus/299dc67e6adcc047d41fb7c54c8733ae1f5a730f → toolchain/check/fuzzer_corpus/03a61af13df6ab601a52a1784995ad7b84d04555

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 1
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   var x: i32;

toolchain/check/fuzzer_corpus/741d81851f3d0d1ad8e1a1b2584d04390c1de134 → toolchain/check/fuzzer_corpus/03f031da904f8bb48412e82acaa77957fde2445b

@@ -9,7 +9,7 @@
 // CHECK:STDOUT: ba.b: 1
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 alias AB = {.a: i32, .b: i32};
 alias BA = {.b: i32, .a: i32};

toolchain/check/fuzzer_corpus/795411f0b98335ca22f12b48b685bde1fc75bb61 → toolchain/check/fuzzer_corpus/048e2bfcc725778f118b704acf2679b712bc6ded

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 choice AB {
   A(),

toolchain/check/fuzzer_corpus/2c8bd9d51c37b6e039d31465180dcd971e372a33 → toolchain/check/fuzzer_corpus/068ac29021d30e21dc976177ae56f68096da6740

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn ReturnIndirectly[T:! type](direct: bool, x: T) -> type {
   if (direct) {

toolchain/check/fuzzer_corpus/f489479b6711f206c1674ab760a65ae1f611d23c → toolchain/check/fuzzer_corpus/06c71952ad52d77790a1a5eb631eaa0759800fec

@@ -9,7 +9,7 @@
 // CHECK:STDOUT: 1
 // CHECK:STDOUT: result: 0
 
-package Foo api;
+package Foo;
 class X {
   fn F[self: Self]() -> i32 { return self.n; }
   var n: i32;

toolchain/check/fuzzer_corpus/ae4a3a0f6a16334564bf7c43ce7ff480597c2cdb → toolchain/check/fuzzer_corpus/078ec0d032fa51fabffef18fc82712e9536b013e

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 interface ManyTypes {
   let T0:! type;

toolchain/check/fuzzer_corpus/08187c797a711bdfbd1e48edcba3d9102766cb9d → toolchain/check/fuzzer_corpus/07b0e6716d0adf617012146642d9cba39b9b006b

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn ReturnSecond(_: i32, x: i32) -> i32 {
   return x;

toolchain/check/fuzzer_corpus/a418c18490f25bad7569608825bb2cfc65010510 → toolchain/check/fuzzer_corpus/081d7c4effd1e9cc6129090e3c831e1af2633e62

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: -2
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn apply[T:! type, U:! type](f: __Fn (T) -> U, x: T) -> U {
   return f(x);

toolchain/check/fuzzer_corpus/d6ebebabaf129b9b53a10b3287236c126c4dd4c4 → toolchain/check/fuzzer_corpus/0831e49d5a00cd7ae6512b7cd8f782c1ed305fa5

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 choice AB {
   A(),

toolchain/check/fuzzer_corpus/789722555be3fb72c649473531436974c36c0b99 → toolchain/check/fuzzer_corpus/083cd63392060ddfbc062ce0ba14a7ac89441a1f

@@ -10,7 +10,7 @@
 // CHECK:STDOUT: (*dc).Foo(): 3
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 base class C {
   var value_c: i32;

toolchain/check/fuzzer_corpus/46c4faddda6395f30cf8690eb32cd453b255f015 → toolchain/check/fuzzer_corpus/0900a9afaef22b798df75b576e8096343a98903a

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 // Test mutation of a global variable.
 

toolchain/check/fuzzer_corpus/d982134d38f2ad7437e7faeba8a70c2d7c926b9a → toolchain/check/fuzzer_corpus/09762ec95a5e7e5a232b735f95e808da510678fd

@@ -7,7 +7,7 @@
 // CHECK:STDOUT: 3
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 interface GetX {
   fn DoIt[self: Self]() -> i32;

toolchain/check/fuzzer_corpus/cce8949457022158df2d24b36f167db5f4acd9f7 → toolchain/check/fuzzer_corpus/0c1db2e8ec3df9d6adf52c88ba67333e2059da97

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 526
 
-package ExplorerTest api;
+package ExplorerTest;
 
 interface A { fn F() -> i32; fn G() -> i32; }
 interface B { fn H() -> i32; }

toolchain/check/fuzzer_corpus/e46d4e048f036d89c5cca5f3162868a8c5a6f117 → toolchain/check/fuzzer_corpus/0ca753d0d0e5afc30bc37f855501c9db4776cb5c

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 
 fn Main() -> i32 {

toolchain/check/fuzzer_corpus/e25ab871af04cab76fa6c546132504aa96f3faaf → toolchain/check/fuzzer_corpus/0ce1b0382ddf1eaf0a21e39a1932936edd0c7b63

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 3
 
-package Foo api;
+package Foo;
 class X {
   fn F[self: Self](o: Self) -> Self { return {.n = self.n + o.n}; }
   var n: i32;

toolchain/check/fuzzer_corpus/ed4b817bb59e605b98255e448092e811f6e82a1b → toolchain/check/fuzzer_corpus/0d824e8e58e5a28b74bfde959ca83df292a33702

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 interface Vector {
   fn Add[self: Self](b: Self) -> Self;

toolchain/check/fuzzer_corpus/ac402eca16b8a60ca297a1c22e20896e4ac13d0c → toolchain/check/fuzzer_corpus/0d9b1f8863ca4b08680e246aeb58b12737afc902

@@ -13,7 +13,7 @@
 // CHECK:STDOUT: ints greater eq: 1
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   Print("strings less: {0}", if "hello" < "world" then 1 else 0);

toolchain/check/fuzzer_corpus/f86b41031c5d4d3bdac24f679b6057470f3e47c7 → toolchain/check/fuzzer_corpus/0dc65251b81300d504287a2f7be97054bd22d386

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 namespace N;
 fn N.F() {}

toolchain/check/fuzzer_corpus/d6e613d75099261a4c26abf0efbf03f48084e913 → toolchain/check/fuzzer_corpus/0e272375f1c866bb051eab5262ad87da60f5ce8c

@@ -9,7 +9,7 @@
 // CHECK:STDOUT: 4: 4
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 class A {
   var n: i32;

toolchain/check/fuzzer_corpus/85c4bfadcd8471f961da3bd10b0b34e4c7d5009f → toolchain/check/fuzzer_corpus/0fc717e2905c26bce32a4591acdd0f46859765a2

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 // AUTOUPDATE
-package ExplorerTest api;
+package ExplorerTest;
 
 __mixin M1 {
   fn F1[self: Self](x: Self) -> Self{

toolchain/check/fuzzer_corpus/766f0c11773ae0fa80bdb4e441c61024fe08dbfa → toolchain/check/fuzzer_corpus/10204d82b32ad9dc256b595048de9efabd93067f

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 class C(T:! type) {}
 

toolchain/check/fuzzer_corpus/73da4596259bfcfb0dc1a29e39f7c3b0944b1e32 → toolchain/check/fuzzer_corpus/11253cbc5df4b6b891cc68ac943599555d3e30dc

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn DoNothing() {
   // Empty block

toolchain/check/fuzzer_corpus/d8fab3ec1a5e5cc74cf915da2a182a47dde177ff → toolchain/check/fuzzer_corpus/12b56f338f82115bc9733846f50bc5863ca3fd9c

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   var s: String = '''filetype

toolchain/check/fuzzer_corpus/105bf041eb0ec468660023a131981170036c4aa4 → toolchain/check/fuzzer_corpus/12c9b3f16c56bbb271111f4bdc8a2401dab16154

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn CompareStr(s: String) -> i32 {
   if (s == ##"str"##) {

toolchain/check/fuzzer_corpus/4b82dcd5072f57a2b04077c7e256b32c79410963 → toolchain/check/fuzzer_corpus/138a0e4547e111ad5cc545e9b19a1e430348636b

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest impl;
+impl package ExplorerTest;
 
 fn Main() -> i32 {
   // CHECK:STDERR: RUNTIME ERROR: fail_index_empty.carbon:[[@LINE+1]]: Invalid `{}` in `Print: {}`

toolchain/check/fuzzer_corpus/13936e89e497ed4f7b0555ad0fe8142c71385208 → toolchain/check/fuzzer_corpus/13f9d954261112e0d9131eb97327515395550d00

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn add1(x: i32) -> i32 {
   return x + 1;

toolchain/check/fuzzer_corpus/7f48faf27fbcc85cce85d7d07d8557961e5ced8a → toolchain/check/fuzzer_corpus/1551a409e456b8102c5b44313303aad008b2a06d

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 interface IFace {
   // CHECK:STDERR: COMPILATION ERROR: fail_use_assoc_const_before_decl.carbon:[[@LINE+1]]: 'C' has not been declared yet

toolchain/check/fuzzer_corpus/7d621f229fa589942992db52f964d08c90debaf8 → toolchain/check/fuzzer_corpus/155ec88a933f5a3ae411ee810eb89f5631bff2d5

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 namespace N;
 

toolchain/check/fuzzer_corpus/58f5a5b2c0b164ab3ab191696c790a041a5b14c1 → toolchain/check/fuzzer_corpus/15a7fdcf1eda6e722c03d2cccbc93ddf75681128

@@ -8,7 +8,7 @@
 // CHECK:STDOUT: (*c).Bar(): 1
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 base class C {
   var a: i32;

toolchain/check/fuzzer_corpus/119ac0fd33bccc1f9d8d4c78f485db62b8261039 → toolchain/check/fuzzer_corpus/162348262c5e2797cf53a49adec2c1df056268d2

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   var x: i32;

toolchain/check/fuzzer_corpus/45579d56ffeffc9eb8926dc0cbcf5e86f34762a9 → toolchain/check/fuzzer_corpus/16fb4fcee5f2fbd4b5b4e65358ab00e800f67db9

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 interface Number {
   fn Zero() -> Self;

toolchain/check/fuzzer_corpus/9291fb7d068a7b1191009b1f7225a7a6f1e4ad39 → toolchain/check/fuzzer_corpus/17261c3182bd1de4382f0d3fef3917a949c36e32

@@ -6,7 +6,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 1
 
-package ExplorerTest api;
+package ExplorerTest;
 
 interface ManyTypes {
   let T0:! type;

toolchain/check/fuzzer_corpus/d8e999fde93a63c561311ca9b1e68e6cc0a1d2f5 → toolchain/check/fuzzer_corpus/184c236354c35072383945d9e6bdf0c005b5d20e

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 class Point {
   fn Origin() -> Point {

toolchain/check/fuzzer_corpus/34d5a979143e2dac42a721445d89d3681f13f4cd → toolchain/check/fuzzer_corpus/18909d083c5867fc03a952211bd61ca688bb908e

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 interface Container {
   let Element:! type;

toolchain/check/fuzzer_corpus/69c04a4e172b38ee2bd233cf2e16bc54e64f86c8 → toolchain/check/fuzzer_corpus/1986b4fb3bc5c60ad5f4faa1b8003beb70a7ece8

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 1
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   var (x: i32, y: i32);

toolchain/check/fuzzer_corpus/0f16578e125b372618b0f999fa14d20e64baa5c5 → toolchain/check/fuzzer_corpus/1a5c8022aeb946ee3551e569dad4ed36cdbcd44f

@@ -9,7 +9,7 @@
 // CHECK:STDOUT: c.c: 3
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 base class A {
   fn FunctionA() {}

toolchain/check/fuzzer_corpus/e9cbf6617e536aeba214c934e3bdaf0c078353ff → toolchain/check/fuzzer_corpus/1afe54e48b1e5bcdd7c8949513e0b2a3fbde1a65

@@ -6,7 +6,7 @@
 // CHECK:STDOUT: Print: {0}
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   Print("Print: {{0}");

toolchain/check/fuzzer_corpus/3bddb2be6780b792248656a086347171ecca2f1d → toolchain/check/fuzzer_corpus/1b85cf86024d9fcfe011f6998861b289aac97e60

@@ -16,7 +16,7 @@
 // CHECK:STDOUT: DESTRUCTOR C
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 base class A {
   virtual destructor[self: Self] {

toolchain/check/fuzzer_corpus/e43ad190c7a05b408d5b8f37b249188ad17d604e → toolchain/check/fuzzer_corpus/1baac08b0dfe6bf0b1157757b14ad4a389ba4693

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   // CHECK:STDERR: COMPILATION ERROR: fail_too_many_args.carbon:[[@LINE+1]]: Print takes 1 or 2 arguments, received 5

toolchain/check/fuzzer_corpus/e8f8d81bcb2d00b480af6a7e6b469642d79a301e → toolchain/check/fuzzer_corpus/1be679f324846aca4379ea4939981410425b287f

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   // CHECK:STDERR: COMPILATION ERROR: fail_assign_to_rval.carbon:[[@LINE+1]]: Only a reference expression can be assigned to, but got `1`

toolchain/check/fuzzer_corpus/9e094e36792e0aaecca1ff9a71578e9d30acd809 → toolchain/check/fuzzer_corpus/1c7eed351b92a87b8fd0c60d58e1916f3ae242d6

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 25
 
-package ExplorerTest api;
+package ExplorerTest;
 
 class List {
   choice Node {

toolchain/check/fuzzer_corpus/73b4d1aee1031af813cfe9efbf1427f3b2d10f6b → toolchain/check/fuzzer_corpus/1d35c2bfb3606a1875a7d9218edc05b242cc75aa

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 3
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn AddInt(a: i32, b: i32) -> i32 {
   if (a == b) {

toolchain/check/fuzzer_corpus/c1aaf1dd13a2d1ac0f10ccd627f5cf913b28e194 → toolchain/check/fuzzer_corpus/1e1c015742738ddadeecb98baeb2988e9debfb6f

@@ -7,7 +7,7 @@
 // CHECK:STDOUT: String
 // CHECK:STDOUT: result: 0
 
-package Testcase api;
+package Testcase;
 
 interface HasName {
     let Name:! String;

toolchain/check/fuzzer_corpus/2464b8df7ccb3280edff4bce116483b5b165a953 → toolchain/check/fuzzer_corpus/1e55c67e9a55008a70df08daf7964b04102f5dd7

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn add(x: i32, y: i32) -> auto { return x + y; }
 

toolchain/check/fuzzer_corpus/6e17f17d5bfc65e44683079702a3ff6fb2eb5599 → toolchain/check/fuzzer_corpus/1f6409865ff8ddad8bc5771a00d12932a67fb7dd

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDERR: RUNTIME ERROR: {{.*}}/explorer/data/prelude.carbon:{{.*}}: Integer overflow
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   var a: auto = 5 << -1;

toolchain/check/fuzzer_corpus/eb86ced910a15a563fdf6b97b35561ad7a62634a → toolchain/check/fuzzer_corpus/20e03ea11ed959b8d8c2815133dbf0b31e2164c2

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 1
 
-package Foo api;
+package Foo;
 interface A { fn F() -> i32; }
 class X {
   extend impl as A {

toolchain/check/fuzzer_corpus/57b625d24d4e508e02fd4d013c5b8542b01925a2 → toolchain/check/fuzzer_corpus/2106211513dcb519a34bb65957c8fd0c85f75b16

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   {

toolchain/check/fuzzer_corpus/e55351de4fa2d74ad5b31c7043567f06eecfa80d → toolchain/check/fuzzer_corpus/219513dc72d769293ba33b019ebd2282b7833404

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 choice AB {
   A(),

toolchain/check/fuzzer_corpus/18ec728eade91679104b23c3a949271089132321 → toolchain/check/fuzzer_corpus/2268ee6ebd54f257f7fe853a15c6ef7785108cea

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 class Point {
   var x: i32;

toolchain/check/fuzzer_corpus/acc010e81f0b5de102362c90fb118a5b56e2c25e → toolchain/check/fuzzer_corpus/228ce64e3803e722ecf32dc43b499d6726756daf

@@ -8,7 +8,7 @@
 // CHECK:STDOUT: 0
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 class A { var n: i32; }
 

toolchain/check/fuzzer_corpus/94e81fee5787c7d7cbc11d9bb6d6a42f1fa1fd3f → toolchain/check/fuzzer_corpus/2335a5e08cccb3045cf4b8bc8e68feb442d2324f

@@ -7,7 +7,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 import ExplorerTest library "Nonexistent";
 

toolchain/check/fuzzer_corpus/bc1b6d2505d65d64d6ca362158e2c2ec3dd83577 → toolchain/check/fuzzer_corpus/236e8e31b5787b58b23bb57e00b101f89e8535b0

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 class A {}
 

toolchain/check/fuzzer_corpus/1af0cf0cfeabefdff968d557c1b67a32a424f357 → toolchain/check/fuzzer_corpus/2379517a82b1d7db9c20bb4922230d42bbffa68a

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 1
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   var x: i32;

toolchain/check/fuzzer_corpus/1c939f5777f53aaf53300f4e54c1f2380b8b4f6a → toolchain/check/fuzzer_corpus/2394164e5f5c1d546a3da770f5b6e05994f3a30f

@@ -8,7 +8,7 @@
 // CHECK:STDOUT: 3
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 base class A {
   var a: i32;

toolchain/check/fuzzer_corpus/0686bcb78820140c8d024e5b7d35adaa5eec3621 → toolchain/check/fuzzer_corpus/241b6bbd6226547b2428d4a5cb71fed63597659d

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 choice Ints {
   None,

toolchain/check/fuzzer_corpus/585e5c74fac0d5cee731959d16d129154a776dd8 → toolchain/check/fuzzer_corpus/24a8948753be6ae079a443e207af49e88785fc27

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 class ConvertTo(T:! type) {
   var v: T;

toolchain/check/fuzzer_corpus/164cd743faa60d9495a35aeeaaac5ebcbaaed5c8 → toolchain/check/fuzzer_corpus/24f96b44faf9d816c26ec36acd1f5c4562d0f1e9

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   // CHECK:STDERR: COMPILATION ERROR: fail_destination_not_type.carbon:[[@LINE+1]]: type error in type expression: 'i32' is not implicitly convertible to 'type'

toolchain/check/fuzzer_corpus/62843918195183e17a993c061b9c88d636ca28f0 → toolchain/check/fuzzer_corpus/2689f156236c25d70a265b1261f8bea8cfef527f

@@ -8,7 +8,7 @@
 // CHECK:STDOUT: This is a String Entry 4
 // CHECK:STDOUT: Value 1337
 // CHECK:STDOUT: result: 0
-package ExplorerTest api;
+package ExplorerTest;
 
 class Node(T:! type) {
   fn Create(value: T)-> Node(T) {

toolchain/check/fuzzer_corpus/3974726c6015a615360574cb1221200e183175c2 → toolchain/check/fuzzer_corpus/283a045fd6c041aa47df273da411d601e7dada48

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 12
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   var cond: if true then bool else i32 = true;

toolchain/check/fuzzer_corpus/40ec85973059ea2eb5ad4495a0e72412427eb429 → toolchain/check/fuzzer_corpus/291711a108e2ed04586d978f1ac4a730277ffbb8

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 5
 
-package ExplorerTest api;
+package ExplorerTest;
 
 class A { var n: i32; }
 

toolchain/check/fuzzer_corpus/bc3e368a7f2a1647772386571ac9efc52d0f6aff → toolchain/check/fuzzer_corpus/2a9df05598f94d7fefa11dd1451237e8c7b99f60

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 2
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn A(b: bool) -> i32 {
   match (b) {

toolchain/check/fuzzer_corpus/e4423a3ef9ca66952fa4b4d7f5cbbca5adfd0f9c → toolchain/check/fuzzer_corpus/2b504c78bc414daf63ba4618ebbd36bd92004d6e

@@ -6,7 +6,7 @@
 // CHECK:STDOUT: Nice!
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   var i: i32 = Rand(0, 100);

toolchain/check/fuzzer_corpus/2c68b43d8a3accf3dffde64ee1346170c321cf8a → toolchain/check/fuzzer_corpus/2c05dbcf73a57af47793888b03384cdd43d5c594

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   // CHECK:STDERR: RUNTIME ERROR: fail_div_by_zero.carbon:[[@LINE+1]]: division by zero

toolchain/check/fuzzer_corpus/f4644987ac7761e6269cc798952123a412d60579 → toolchain/check/fuzzer_corpus/2d316de15bbe6edbbbeb3bc65e9350a7b53e0abe

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 2
 
-package Foo api;
+package Foo;
 fn Main() -> i32 {
   return {.m = 1, .n = 2}.({.n: i32, .m: i32}.n);
 }

toolchain/check/fuzzer_corpus/2e7f4e15df56d8a05046d80c7a7ce01e6cb6779b → toolchain/check/fuzzer_corpus/2df8a8f5865c0e813ed26a874c2ea0daf7421086

@@ -10,7 +10,7 @@
 // CHECK:STDOUT: BothFs.F
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 choice ImplKind {
   Checked,

toolchain/check/fuzzer_corpus/6bacf9e89d7d4ecc9d6fd27310cccdd491d03040 → toolchain/check/fuzzer_corpus/2e02f9befd32eac2983de14b6ac8cf6cef960b4c

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Id(t: type) -> auto { return t; }
 

toolchain/check/fuzzer_corpus/f76a0f5a984ac0ce2b83dfd9b9a0f98a23c10db8 → toolchain/check/fuzzer_corpus/2e05abea6fd46fc2b5315dca60d3b56e5b407fd4

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 class Shape {
   var x: i32;

toolchain/check/fuzzer_corpus/7bb08a33952aae009b591d3cf1f9bb883fb0d552 → toolchain/check/fuzzer_corpus/2e1aea3071937c4307dd48ebb2b1df3bc9e8716f

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 12
 
-package Foo api;
+package Foo;
 interface A {
   fn F[self: Self]() -> i32;
 }

toolchain/check/fuzzer_corpus/20bbc444ffd3b0a688732fe0aa1eeff6969c33cc → toolchain/check/fuzzer_corpus/300e45006b32eec72e90d33d3cd6685680448957

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest impl;
+impl package ExplorerTest;
 
 fn Main() -> i32 {
   // CHECK:STDERR: RUNTIME ERROR: fail_single_brace.carbon:[[@LINE+1]]: `{` must be followed by a second `{` or index in `{`

toolchain/check/fuzzer_corpus/78b31fa3b989055733f498c49e86a6211e1316bc → toolchain/check/fuzzer_corpus/301dc6263f2a34b4630aa88e940f42acf020f160

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   // CHECK:STDERR: SYNTAX ERROR: fail_raw_block_quotes_not_on_own_line.carbon:[[@LINE+1]]: Invalid block string: Should end with triple quotes: error: closing '''

toolchain/check/fuzzer_corpus/3e51c009c54026d5e2cbbfe253b38765d4e71c63 → toolchain/check/fuzzer_corpus/3037fd1afeda607e889fe3e73fb1088d13c9f8bf

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 // Check that even generic parameters are looked up in the namespace of an
 // entity.

toolchain/check/fuzzer_corpus/188ed5d12d9c374702dfc38ab438dfe4b8cbabfd → toolchain/check/fuzzer_corpus/3082cf2a6045d00b6e81d3ae14a3a3d56314b988

@@ -11,7 +11,7 @@
 // CHECK:STDOUT: cc.Bar() -> 2
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 base class C {
   virtual fn Foo[self: Self]() -> i32 {

toolchain/check/fuzzer_corpus/db8531a2205eba4d74aac481d01b5412148a8609 → toolchain/check/fuzzer_corpus/3116bbbb3bae537a09e62f5c8331a431d6c56b1e

@@ -12,7 +12,7 @@
 // CHECK:STDOUT: Return
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 
 base class A{

toolchain/check/fuzzer_corpus/27b81cef471374f0e9d02dcf2be5e79e45c0de2c → toolchain/check/fuzzer_corpus/3119cacb5f47007660225c4a63a934eff83091a2

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 interface Vector {
   fn Zero() -> Self;

toolchain/check/fuzzer_corpus/2f13aa997ff8ff9e53fa3e0d38fd27ff214319d9 → toolchain/check/fuzzer_corpus/317bdb0ba661c19d4be7dc1a9e0eb74529c80bba

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   if (0 == 1) {

toolchain/check/fuzzer_corpus/23e9f18ca5b5c85f4a44e3c472bbd23d1420013b → toolchain/check/fuzzer_corpus/31e5d9b3712744f0659429e330ba44958eadce7c

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest impl;
+impl package ExplorerTest;
 
 fn Main() -> i32 {
   // CHECK:STDERR: RUNTIME ERROR: fail_index_bounds1.carbon:[[@LINE+1]]: Index invalid with argument count of 1 at offset 12 in `Print: {0} {1}`

toolchain/check/fuzzer_corpus/f50ed08142a8c7abf9eb8a0fe9a1560172460772 → toolchain/check/fuzzer_corpus/3292cacd15031b51dcfdd4d623e0ef30c66eb86b

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 __mixin Operations {
   fn F[self: Self](x: Self) -> Self{

toolchain/check/fuzzer_corpus/e658fe116862210da87f0899577af9c2a39229c7 → toolchain/check/fuzzer_corpus/32ffc355b444c61ccd2d80ca466aa47b4f5b4d4b

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 12
 
-package ExplorerTest api;
+package ExplorerTest;
 
 interface Runnable {
   fn Run[self: Self]() -> i32;

toolchain/check/fuzzer_corpus/2038a206d7fa99068235bb2ba54820e768b29cb9 → toolchain/check/fuzzer_corpus/33358007d39274e780a256e497695c3fe46f1029

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 1
 
-package Foo api;
+package Foo;
 interface A { fn F[self: Self]() -> i32; }
 class X {
   extend impl as A {

toolchain/check/fuzzer_corpus/903eb115fd74cf5365d4a359caca9374cdd98d03 → toolchain/check/fuzzer_corpus/3476b8646b5b6b64fba9ab4b662850eff9312d41

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 // Ensure that we can declare all different kinds of declarations as namespace
 // members.

toolchain/check/fuzzer_corpus/1171a926d8aa677aec7042fe5f9e29c1632f5300 → toolchain/check/fuzzer_corpus/358f451f412939d0e0863704128cbc4756839499

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package EmptyIdentifier impl;
+impl package EmptyIdentifier;
 
 fn A() {
   // CHECK:STDERR: RUNTIME ERROR: fail_function_recursion.carbon:[[@LINE+1]]: stack overflow: too many interpreter actions on stack

toolchain/check/fuzzer_corpus/bcb7fa4d022bd1099fce1eed15408ef42bd5346c → toolchain/check/fuzzer_corpus/37934fb6e5e6d857d3227ea76872ce6a3bc4d630

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   if (0 == 1) {

toolchain/check/fuzzer_corpus/b2674ac0752c471c50d74e2fa23f67e29cfdae08 → toolchain/check/fuzzer_corpus/37b6c00cc00d3ea562a9a67d365b1617be17cda4

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn AddInt(a: i32, b: i32) -> i32 {
   // CHECK:STDERR: COMPILATION ERROR: fail_returned_var_type_mismatch.carbon:[[@LINE+1]]: type of returned var `bool` does not match return type `i32`

toolchain/check/fuzzer_corpus/db1e5ec70d15bbfc7afd16f53ab14b24032e6ab0 → toolchain/check/fuzzer_corpus/396c9121839a9d9866282f987fb283fa86556474

@@ -13,7 +13,7 @@
 // CHECK:STDOUT: None: 4
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 interface A {
   fn Which() -> i32;

toolchain/check/fuzzer_corpus/cda355e8d76ac84f9c04ce81d4b10c43ede462fa → toolchain/check/fuzzer_corpus/3a414cdb79537ba6113eebe683a258098caebe9c

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 class C {
   // CHECK:STDERR: COMPILATION ERROR: fail_member_of_self.carbon:[[@LINE+1]]: incomplete type `class C` used in type of variable

toolchain/check/fuzzer_corpus/9be6536b748480b8d7046c4e360fefa33a996d59 → toolchain/check/fuzzer_corpus/3abd6729fc8141ee2cf270432da6cfe0bc85c3b6

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 interface Invalid {}
 

toolchain/check/fuzzer_corpus/93fb896d84d3c28400848dd05e02196ca359693f → toolchain/check/fuzzer_corpus/3ade1694dc4a9b14c34f03ad62b68872d22dee82

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn f(x: i32, y: i32) -> i32 { return x + y; }
 

toolchain/check/fuzzer_corpus/29366dc2c3a372bec197172efb4c3b245a6b6e95 → toolchain/check/fuzzer_corpus/3c57cd00b20c65032e36beeae83dbc34da90d96a

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package EmptyIdentifier impl;
+impl package EmptyIdentifier;
 
 fn Main() -> i32 {
   while (true) {

toolchain/check/fuzzer_corpus/c371479ed5d61900879832df3d14674b8bf586c4 → toolchain/check/fuzzer_corpus/3cf84352b479800d6fc3cf96f8493945c2211b0f

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 fn Main() -> i32 {
   // CHECK:STDERR: SYNTAX ERROR: fail_raw_block_more_hash_tags_on_left.carbon:[[@LINE+1]]: Unexpected end of file

toolchain/check/fuzzer_corpus/1e4c94040dcf313929b6e45bb96932198f296d9e → toolchain/check/fuzzer_corpus/3d3543e880e8d01a5f3de62c8e5137fb6cddf741

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 4
 
-package ExplorerTest api;
+package ExplorerTest;
 
 alias TypeAlias = i32;
 

toolchain/check/fuzzer_corpus/7317dc5445182496edbdede5df5cc895f598dd2f → toolchain/check/fuzzer_corpus/3e2b7a2777680a17f8ee4fdc72e6e2eeccb06bbe

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 __mixin Operations {
   fn Square[self: Self](x:i32) -> i32{

toolchain/check/fuzzer_corpus/8e47cb329a5e2b86a17af1db4765dda7f4cb9522 → toolchain/check/fuzzer_corpus/41de2a58a6891d68e779f2017ef063decc946cd4

@@ -4,7 +4,7 @@
 //
 // AUTOUPDATE
 
-package ExplorerTest api;
+package ExplorerTest;
 
 class C {
   // CHECK:STDERR: SYNTAX ERROR: fail_method_self_misspelled.carbon:[[@LINE+1]]: illegal binding pattern in implicit parameter list

toolchain/check/fuzzer_corpus/9f448813378568e8b33edac8f46e3e419cc936cc → toolchain/check/fuzzer_corpus/423c611625411a3e7e1a514f78b3f56d4482852f

@@ -5,7 +5,7 @@
 // AUTOUPDATE
 // CHECK:STDOUT: result: 0
 
-package ExplorerTest api;
+package ExplorerTest;
 
 class Point {
   fn Origin() -> Point {