diff --git a/test/array/assign_to_function_var.wgsl b/test/array/assign_to_function_var.wgsl
index aba7c60..aeb1ab9 100644
--- a/test/array/assign_to_function_var.wgsl
+++ b/test/array/assign_to_function_var.wgsl
@@ -1,6 +1,5 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };
diff --git a/test/array/assign_to_function_var.wgsl.expected.wgsl b/test/array/assign_to_function_var.wgsl.expected.wgsl
index 0ab9c0f..8d3a0c0 100644
--- a/test/array/assign_to_function_var.wgsl.expected.wgsl
+++ b/test/array/assign_to_function_var.wgsl.expected.wgsl
@@ -1,6 +1,5 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };
diff --git a/test/array/assign_to_private_var.wgsl b/test/array/assign_to_private_var.wgsl
index 194c041..b8b342c 100644
--- a/test/array/assign_to_private_var.wgsl
+++ b/test/array/assign_to_private_var.wgsl
@@ -1,6 +1,5 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };
diff --git a/test/array/assign_to_private_var.wgsl.expected.wgsl b/test/array/assign_to_private_var.wgsl.expected.wgsl
index ab6e8c7..c5e4e1f 100644
--- a/test/array/assign_to_private_var.wgsl.expected.wgsl
+++ b/test/array/assign_to_private_var.wgsl.expected.wgsl
@@ -1,6 +1,5 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };
diff --git a/test/array/assign_to_storage_var.wgsl b/test/array/assign_to_storage_var.wgsl
index b50f0dd..9bc068a 100644
--- a/test/array/assign_to_storage_var.wgsl
+++ b/test/array/assign_to_storage_var.wgsl
@@ -1,11 +1,9 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };
 
-[[block]]
 struct S_nested {
   arr : array<array<array<i32, 2>, 3>, 4>;
 };
diff --git a/test/array/assign_to_storage_var.wgsl.expected.wgsl b/test/array/assign_to_storage_var.wgsl.expected.wgsl
index 4c2228d..cb0b54b 100644
--- a/test/array/assign_to_storage_var.wgsl.expected.wgsl
+++ b/test/array/assign_to_storage_var.wgsl.expected.wgsl
@@ -1,11 +1,9 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };
 
-[[block]]
 struct S_nested {
   arr : array<array<array<i32, 2>, 3>, 4>;
 };
diff --git a/test/array/assign_to_workgroup_var.wgsl b/test/array/assign_to_workgroup_var.wgsl
index f2b237c..225f2f2 100644
--- a/test/array/assign_to_workgroup_var.wgsl
+++ b/test/array/assign_to_workgroup_var.wgsl
@@ -1,6 +1,5 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };
diff --git a/test/array/assign_to_workgroup_var.wgsl.expected.wgsl b/test/array/assign_to_workgroup_var.wgsl.expected.wgsl
index c19bd6f..0d3b5a3 100644
--- a/test/array/assign_to_workgroup_var.wgsl.expected.wgsl
+++ b/test/array/assign_to_workgroup_var.wgsl.expected.wgsl
@@ -1,6 +1,5 @@
 type ArrayType = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct S {
   arr : ArrayType;
 };
diff --git a/test/buffer/storage/dynamic_index/read.wgsl b/test/buffer/storage/dynamic_index/read.wgsl
index 8295c4d..633b1be 100644
--- a/test/buffer/storage/dynamic_index/read.wgsl
+++ b/test/buffer/storage/dynamic_index/read.wgsl
@@ -10,7 +10,6 @@
     i : [[stride(16)]] array<vec4<i32>, 4>;
 };
 
-[[block]]
 struct S {
     arr : array<Inner>;
 };
diff --git a/test/buffer/storage/dynamic_index/read.wgsl.expected.wgsl b/test/buffer/storage/dynamic_index/read.wgsl.expected.wgsl
index 3af1fa8..0363eda 100644
--- a/test/buffer/storage/dynamic_index/read.wgsl.expected.wgsl
+++ b/test/buffer/storage/dynamic_index/read.wgsl.expected.wgsl
@@ -10,7 +10,6 @@
   i : [[stride(16)]] array<vec4<i32>, 4>;
 };
 
-[[block]]
 struct S {
   arr : array<Inner>;
 };
diff --git a/test/buffer/storage/dynamic_index/write.wgsl b/test/buffer/storage/dynamic_index/write.wgsl
index 0e4b480..836c018 100644
--- a/test/buffer/storage/dynamic_index/write.wgsl
+++ b/test/buffer/storage/dynamic_index/write.wgsl
@@ -10,7 +10,6 @@
     i : [[stride(16)]] array<vec4<i32>, 4>;
 };
 
-[[block]]
 struct S {
     arr : array<Inner>;
 };
diff --git a/test/buffer/storage/dynamic_index/write.wgsl.expected.wgsl b/test/buffer/storage/dynamic_index/write.wgsl.expected.wgsl
index d6aea47..db3497d 100644
--- a/test/buffer/storage/dynamic_index/write.wgsl.expected.wgsl
+++ b/test/buffer/storage/dynamic_index/write.wgsl.expected.wgsl
@@ -10,7 +10,6 @@
   i : [[stride(16)]] array<vec4<i32>, 4>;
 };
 
-[[block]]
 struct S {
   arr : array<Inner>;
 };
diff --git a/test/buffer/storage/static_index/read.wgsl b/test/buffer/storage/static_index/read.wgsl
index 096492d..c0824b3 100644
--- a/test/buffer/storage/static_index/read.wgsl
+++ b/test/buffer/storage/static_index/read.wgsl
@@ -2,7 +2,6 @@
     x : i32;
 };
 
-[[block]]
 struct S {
     a : vec3<i32>;
     b : i32;
diff --git a/test/buffer/storage/static_index/read.wgsl.expected.wgsl b/test/buffer/storage/static_index/read.wgsl.expected.wgsl
index 5dcc611..8a9f17c 100644
--- a/test/buffer/storage/static_index/read.wgsl.expected.wgsl
+++ b/test/buffer/storage/static_index/read.wgsl.expected.wgsl
@@ -2,7 +2,6 @@
   x : i32;
 };
 
-[[block]]
 struct S {
   a : vec3<i32>;
   b : i32;
diff --git a/test/buffer/storage/static_index/write.wgsl b/test/buffer/storage/static_index/write.wgsl
index 6b6affb..7b4affb 100644
--- a/test/buffer/storage/static_index/write.wgsl
+++ b/test/buffer/storage/static_index/write.wgsl
@@ -2,7 +2,6 @@
     x : i32;
 };
 
-[[block]]
 struct S {
     a : vec3<i32>;
     b : i32;
diff --git a/test/buffer/storage/static_index/write.wgsl.expected.wgsl b/test/buffer/storage/static_index/write.wgsl.expected.wgsl
index 16725de..b4c8329 100644
--- a/test/buffer/storage/static_index/write.wgsl.expected.wgsl
+++ b/test/buffer/storage/static_index/write.wgsl.expected.wgsl
@@ -2,7 +2,6 @@
   x : i32;
 };
 
-[[block]]
 struct S {
   a : vec3<i32>;
   b : i32;
diff --git a/test/buffer/uniform/dynamic_index/read.wgsl b/test/buffer/uniform/dynamic_index/read.wgsl
index f1612ea..2e79833 100644
--- a/test/buffer/uniform/dynamic_index/read.wgsl
+++ b/test/buffer/uniform/dynamic_index/read.wgsl
@@ -12,7 +12,6 @@
     [[align(16)]] k : [[stride(16)]] array<vec4<i32>, 4>;
 };
 
-[[block]]
 struct S {
     arr : array<Inner, 8>;
 };
diff --git a/test/buffer/uniform/dynamic_index/read.wgsl.expected.wgsl b/test/buffer/uniform/dynamic_index/read.wgsl.expected.wgsl
index 017eb39..b5279f6 100644
--- a/test/buffer/uniform/dynamic_index/read.wgsl.expected.wgsl
+++ b/test/buffer/uniform/dynamic_index/read.wgsl.expected.wgsl
@@ -14,7 +14,6 @@
   k : [[stride(16)]] array<vec4<i32>, 4>;
 };
 
-[[block]]
 struct S {
   arr : array<Inner, 8>;
 };
diff --git a/test/buffer/uniform/static_index/read.wgsl b/test/buffer/uniform/static_index/read.wgsl
index c3ad9ad..a735ccf 100644
--- a/test/buffer/uniform/static_index/read.wgsl
+++ b/test/buffer/uniform/static_index/read.wgsl
@@ -2,7 +2,6 @@
     x : i32;
 };
 
-[[block]]
 struct S {
     a : vec3<i32>;
     b : i32;
diff --git a/test/buffer/uniform/static_index/read.wgsl.expected.wgsl b/test/buffer/uniform/static_index/read.wgsl.expected.wgsl
index d856b8c..99c50f1 100644
--- a/test/buffer/uniform/static_index/read.wgsl.expected.wgsl
+++ b/test/buffer/uniform/static_index/read.wgsl.expected.wgsl
@@ -2,7 +2,6 @@
   x : i32;
 };
 
-[[block]]
 struct S {
   a : vec3<i32>;
   b : i32;
diff --git a/test/bug/chromium/1273230.wgsl b/test/bug/chromium/1273230.wgsl
index 0a5cf26..a2152ff 100644
--- a/test/bug/chromium/1273230.wgsl
+++ b/test/bug/chromium/1273230.wgsl
@@ -11,7 +11,7 @@
     _ = isNormal(4.);
     _ = isNormal(2.);
 
-}[[block]]
+}
 struct Uniforms {
   numTriangles : u32;
   gridSize : u32;
@@ -21,7 +21,6 @@
   bbMax : vec3<f32>;
 };
 
-[[block]]
 struct Dbg {
   offsetCounter : atomic<u32>;
   pad0 : u32;
@@ -37,27 +36,22 @@
   value_f32_3 : f32;
 };
 
-[[block]]
 struct F32s {
   values : [[stride(4)]] array<f32>;
 };
 
-[[block]]
 struct U32s {
   values : [[stride(4)]] array<u32>;
 };
 
-[[block]]
 struct I32s {
   values : [[stride(4)]] array<i32>;
 };
 
-[[block]]
 struct AU32s {
   values : [[stride(4)]] array<atomic<u32>>;
 };
 
-[[block]]
 struct AI32s {
   values : [[stride(4)]] array<atomic<i32>>;
 };
diff --git a/test/bug/chromium/1273230.wgsl.expected.wgsl b/test/bug/chromium/1273230.wgsl.expected.wgsl
index 6d99fbb..4e2d55b 100644
--- a/test/bug/chromium/1273230.wgsl.expected.wgsl
+++ b/test/bug/chromium/1273230.wgsl.expected.wgsl
@@ -29,7 +29,6 @@
   _ = isNormal(2.0);
 }
 
-[[block]]
 struct Uniforms {
   numTriangles : u32;
   gridSize : u32;
@@ -39,7 +38,6 @@
   bbMax : vec3<f32>;
 };
 
-[[block]]
 struct Dbg {
   offsetCounter : atomic<u32>;
   pad0 : u32;
@@ -55,27 +53,22 @@
   value_f32_3 : f32;
 };
 
-[[block]]
 struct F32s {
   values : [[stride(4)]] array<f32>;
 };
 
-[[block]]
 struct U32s {
   values : [[stride(4)]] array<u32>;
 };
 
-[[block]]
 struct I32s {
   values : [[stride(4)]] array<i32>;
 };
 
-[[block]]
 struct AU32s {
   values : [[stride(4)]] array<atomic<u32>>;
 };
 
-[[block]]
 struct AI32s {
   values : [[stride(4)]] array<atomic<i32>>;
 };
diff --git a/test/bug/dawn/947.wgsl b/test/bug/dawn/947.wgsl
index 5cee0a4..008d88a 100644
--- a/test/bug/dawn/947.wgsl
+++ b/test/bug/dawn/947.wgsl
@@ -1,4 +1,4 @@
-[[block]] struct Uniforms {
+ struct Uniforms {
     u_scale : vec2<f32>;
     u_offset : vec2<f32>;
 };
diff --git a/test/bug/dawn/947.wgsl.expected.wgsl b/test/bug/dawn/947.wgsl.expected.wgsl
index 618cc72..b417862 100644
--- a/test/bug/dawn/947.wgsl.expected.wgsl
+++ b/test/bug/dawn/947.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct Uniforms {
   u_scale : vec2<f32>;
   u_offset : vec2<f32>;
diff --git a/test/bug/fxc/dyn_array_idx/read/function.wgsl b/test/bug/fxc/dyn_array_idx/read/function.wgsl
index b1f7ad0..5af0065 100644
--- a/test/bug/fxc/dyn_array_idx/read/function.wgsl
+++ b/test/bug/fxc/dyn_array_idx/read/function.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.wgsl b/test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.wgsl
index 1a66054..85f665b 100644
--- a/test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.wgsl
+++ b/test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/read/private.wgsl b/test/bug/fxc/dyn_array_idx/read/private.wgsl
index 731e57b..c7c0b7a 100644
--- a/test/bug/fxc/dyn_array_idx/read/private.wgsl
+++ b/test/bug/fxc/dyn_array_idx/read/private.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.wgsl b/test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.wgsl
index 68074bd..4a1fecc 100644
--- a/test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.wgsl
+++ b/test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/read/storage.wgsl b/test/bug/fxc/dyn_array_idx/read/storage.wgsl
index 5237a5b..62908a2 100644
--- a/test/bug/fxc/dyn_array_idx/read/storage.wgsl
+++ b/test/bug/fxc/dyn_array_idx/read/storage.wgsl
@@ -1,15 +1,12 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
 [[group(0), binding(0)]] var<uniform> ubo: UBO;
-[[block]]
 struct Result {
   out: i32;
 };
 [[group(0), binding(2)]] var<storage, read_write> result: Result;
 
-[[block]]
 struct SSBO {
   data: array<i32, 4>;
 };
diff --git a/test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.wgsl b/test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.wgsl
index 7610025..76cf15c 100644
--- a/test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.wgsl
+++ b/test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.wgsl
@@ -1,18 +1,15 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
 
 [[group(0), binding(0)]] var<uniform> ubo : UBO;
 
-[[block]]
 struct Result {
   out : i32;
 };
 
 [[group(0), binding(2)]] var<storage, read_write> result : Result;
 
-[[block]]
 struct SSBO {
   data : array<i32, 4>;
 };
diff --git a/test/bug/fxc/dyn_array_idx/read/uniform.wgsl b/test/bug/fxc/dyn_array_idx/read/uniform.wgsl
index 6edb1df..22d1133 100644
--- a/test/bug/fxc/dyn_array_idx/read/uniform.wgsl
+++ b/test/bug/fxc/dyn_array_idx/read/uniform.wgsl
@@ -1,10 +1,8 @@
-[[block]]
 struct UBO {
   data: [[stride(16)]] array<i32, 4>;
   dynamic_idx: i32;
 };
 [[group(0), binding(0)]] var<uniform> ubo: UBO;
-[[block]]
 struct Result {
   out: i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.wgsl b/test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.wgsl
index 6612630..cd2664a 100644
--- a/test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.wgsl
+++ b/test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   data : [[stride(16)]] array<i32, 4>;
   dynamic_idx : i32;
@@ -6,7 +5,6 @@
 
 [[group(0), binding(0)]] var<uniform> ubo : UBO;
 
-[[block]]
 struct Result {
   out : i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl b/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl
index b598cd3..66450c2 100644
--- a/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl
+++ b/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.wgsl b/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.wgsl
index 51c70f7..edca39d 100644
--- a/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.wgsl
+++ b/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/function.wgsl b/test/bug/fxc/dyn_array_idx/write/function.wgsl
index 1fad5bc..3dea9fa 100644
--- a/test/bug/fxc/dyn_array_idx/write/function.wgsl
+++ b/test/bug/fxc/dyn_array_idx/write/function.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.wgsl b/test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.wgsl
index 1871726..dc84c69 100644
--- a/test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.wgsl
+++ b/test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl b/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl
index ab909db..bf46f99 100644
--- a/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl
+++ b/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.wgsl b/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.wgsl
index c106f66..d560432 100644
--- a/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.wgsl
+++ b/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/private.wgsl b/test/bug/fxc/dyn_array_idx/write/private.wgsl
index 4f33168..c8fade0 100644
--- a/test/bug/fxc/dyn_array_idx/write/private.wgsl
+++ b/test/bug/fxc/dyn_array_idx/write/private.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.wgsl b/test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.wgsl
index 42f5858..36ef547 100644
--- a/test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.wgsl
+++ b/test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl b/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl
index 6c20074..3c7cf56 100644
--- a/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl
+++ b/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.wgsl b/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.wgsl
index 176c727..5a820ac 100644
--- a/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.wgsl
+++ b/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/storage.wgsl b/test/bug/fxc/dyn_array_idx/write/storage.wgsl
index 7bedb67..0ced96e 100644
--- a/test/bug/fxc/dyn_array_idx/write/storage.wgsl
+++ b/test/bug/fxc/dyn_array_idx/write/storage.wgsl
@@ -1,15 +1,12 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
 [[group(0), binding(0)]] var<uniform> ubo: UBO;
-[[block]]
 struct Result {
   out: i32;
 };
 [[group(0), binding(2)]] var<storage, read_write> result: Result;
 
-[[block]]
 struct SSBO {
   data: array<i32, 4>;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.wgsl b/test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.wgsl
index b06072b..9e51589 100644
--- a/test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.wgsl
+++ b/test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.wgsl
@@ -1,18 +1,15 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
 
 [[group(0), binding(0)]] var<uniform> ubo : UBO;
 
-[[block]]
 struct Result {
   out : i32;
 };
 
 [[group(0), binding(2)]] var<storage, read_write> result : Result;
 
-[[block]]
 struct SSBO {
   data : array<i32, 4>;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl b/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl
index 26efbe6..8f7e84b 100644
--- a/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl
+++ b/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx: i32;
 };
@@ -6,7 +5,6 @@
 struct S {
   data: array<i32, 64>;
 };
-[[block]]
 struct Result {
   out: i32;
 };
diff --git a/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.wgsl b/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.wgsl
index 4b11871..4874b2a 100644
--- a/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.wgsl
+++ b/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct UBO {
   dynamic_idx : i32;
 };
@@ -9,7 +8,6 @@
   data : array<i32, 64>;
 };
 
-[[block]]
 struct Result {
   out : i32;
 };
diff --git a/test/bug/tint/1046.wgsl b/test/bug/tint/1046.wgsl
index 97088c9..1c8ac15 100644
--- a/test/bug/tint/1046.wgsl
+++ b/test/bug/tint/1046.wgsl
@@ -3,11 +3,11 @@
     position : vec4<f32>;
 };
 
-[[block]] struct PointLights {
+ struct PointLights {
     values : [[stride(16)]] array<PointLight>;
 };
 
-[[block]] struct Uniforms {
+ struct Uniforms {
     worldView : mat4x4<f32>;
     proj : mat4x4<f32>;
     numPointLights : u32;
diff --git a/test/bug/tint/1046.wgsl.expected.wgsl b/test/bug/tint/1046.wgsl.expected.wgsl
index d29c519..3c654b0 100644
--- a/test/bug/tint/1046.wgsl.expected.wgsl
+++ b/test/bug/tint/1046.wgsl.expected.wgsl
@@ -2,12 +2,10 @@
   position : vec4<f32>;
 };
 
-[[block]]
 struct PointLights {
   values : [[stride(16)]] array<PointLight>;
 };
 
-[[block]]
 struct Uniforms {
   worldView : mat4x4<f32>;
   proj : mat4x4<f32>;
diff --git a/test/bug/tint/1113.wgsl b/test/bug/tint/1113.wgsl
index dba7d01..0e7874d 100644
--- a/test/bug/tint/1113.wgsl
+++ b/test/bug/tint/1113.wgsl
@@ -1,5 +1,5 @@
 
-[[block]] struct Uniforms {
+ struct Uniforms {
     numTriangles     : u32;
     gridSize         : u32;
     pad1             : u32;
@@ -8,7 +8,7 @@
     bbMax            : vec3<f32>;      // offset(32)
 };
 
-[[block]] struct Dbg {
+ struct Dbg {
     offsetCounter : atomic<u32>;
     pad0 : u32;
     pad1 : u32;
@@ -23,11 +23,11 @@
     value_f32_3 : f32;
 };
 
-[[block]] struct F32s { values : [[stride(4)]] array<f32>; };
-[[block]] struct U32s { values : [[stride(4)]] array<u32>; };
-[[block]] struct I32s { values : [[stride(4)]] array<i32>; };
-[[block]] struct AU32s { values : [[stride(4)]] array<atomic<u32>>; };
-[[block]] struct AI32s { values : [[stride(4)]] array<atomic<i32>>; };
+ struct F32s { values : [[stride(4)]] array<f32>; };
+ struct U32s { values : [[stride(4)]] array<u32>; };
+ struct I32s { values : [[stride(4)]] array<i32>; };
+ struct AU32s { values : [[stride(4)]] array<atomic<u32>>; };
+ struct AI32s { values : [[stride(4)]] array<atomic<i32>>; };
 
 // IN
 [[binding(0), group(0)]] var<uniform> uniforms : Uniforms;
diff --git a/test/bug/tint/1113.wgsl.expected.wgsl b/test/bug/tint/1113.wgsl.expected.wgsl
index cd39fdf..f8db09d 100644
--- a/test/bug/tint/1113.wgsl.expected.wgsl
+++ b/test/bug/tint/1113.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct Uniforms {
   numTriangles : u32;
   gridSize : u32;
@@ -8,7 +7,6 @@
   bbMax : vec3<f32>;
 };
 
-[[block]]
 struct Dbg {
   offsetCounter : atomic<u32>;
   pad0 : u32;
@@ -24,27 +22,22 @@
   value_f32_3 : f32;
 };
 
-[[block]]
 struct F32s {
   values : [[stride(4)]] array<f32>;
 };
 
-[[block]]
 struct U32s {
   values : [[stride(4)]] array<u32>;
 };
 
-[[block]]
 struct I32s {
   values : [[stride(4)]] array<i32>;
 };
 
-[[block]]
 struct AU32s {
   values : [[stride(4)]] array<atomic<u32>>;
 };
 
-[[block]]
 struct AI32s {
   values : [[stride(4)]] array<atomic<i32>>;
 };
diff --git a/test/bug/tint/1121.wgsl b/test/bug/tint/1121.wgsl
index 75425d1..c7fba35 100644
--- a/test/bug/tint/1121.wgsl
+++ b/test/bug/tint/1121.wgsl
@@ -12,7 +12,7 @@
     color : vec3<f32>;
     radius : f32;
 };
-[[block]] struct LightsBuffer {
+ struct LightsBuffer {
     lights: array<LightData>;
 };
 [[group(0), binding(0)]] var<storage, read_write> lightsBuffer: LightsBuffer;
@@ -20,12 +20,12 @@
     count: atomic<u32>;
     lightId: array<u32, 64>;
 };
-[[block]] struct Tiles {
+ struct Tiles {
     data: array<TileLightIdData, 4>;
 };
 [[group(1), binding(0)]] var<storage, read_write> tileLightId: Tiles;
   
-[[block]] struct Config {
+ struct Config {
     numLights : u32;
     numTiles : u32;
     tileCountX : u32;
@@ -34,7 +34,7 @@
     tileSize : u32;
 };
 [[group(2), binding(0)]] var<uniform> config: Config;
-[[block]] struct Uniforms {
+ struct Uniforms {
     min : vec4<f32>;
     max : vec4<f32>;
     // camera
diff --git a/test/bug/tint/1121.wgsl.expected.wgsl b/test/bug/tint/1121.wgsl.expected.wgsl
index 65efc9a..4f28ea4 100644
--- a/test/bug/tint/1121.wgsl.expected.wgsl
+++ b/test/bug/tint/1121.wgsl.expected.wgsl
@@ -4,7 +4,6 @@
   radius : f32;
 };
 
-[[block]]
 struct LightsBuffer {
   lights : array<LightData>;
 };
@@ -16,14 +15,12 @@
   lightId : array<u32, 64>;
 };
 
-[[block]]
 struct Tiles {
   data : array<TileLightIdData, 4>;
 };
 
 [[group(1), binding(0)]] var<storage, read_write> tileLightId : Tiles;
 
-[[block]]
 struct Config {
   numLights : u32;
   numTiles : u32;
@@ -35,7 +32,6 @@
 
 [[group(2), binding(0)]] var<uniform> config : Config;
 
-[[block]]
 struct Uniforms {
   min : vec4<f32>;
   max : vec4<f32>;
diff --git a/test/bug/tint/1136.wgsl b/test/bug/tint/1136.wgsl
index d3ad119..ee73478 100644
--- a/test/bug/tint/1136.wgsl
+++ b/test/bug/tint/1136.wgsl
@@ -1,3 +1,3 @@
-[[block]] struct Buffer { data: u32; };
+ struct Buffer { data: u32; };
 [[group(0), binding(0)]] var<storage, read_write> buffer: Buffer;
 fn main() { buffer.data = buffer.data + 1u;  }
diff --git a/test/bug/tint/1136.wgsl.expected.wgsl b/test/bug/tint/1136.wgsl.expected.wgsl
index a7b4b26..b23fded 100644
--- a/test/bug/tint/1136.wgsl.expected.wgsl
+++ b/test/bug/tint/1136.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct Buffer {
   data : u32;
 };
diff --git a/test/bug/tint/221.wgsl b/test/bug/tint/221.wgsl
index 1aea191..9c6a70f 100644
--- a/test/bug/tint/221.wgsl
+++ b/test/bug/tint/221.wgsl
@@ -1,6 +1,5 @@
 type Arr = array<u32, 50>;
 
-[[block]]
 struct Buf{
   count : u32;
   data : Arr;
diff --git a/test/bug/tint/221.wgsl.expected.wgsl b/test/bug/tint/221.wgsl.expected.wgsl
index 70d478f..de43263 100644
--- a/test/bug/tint/221.wgsl.expected.wgsl
+++ b/test/bug/tint/221.wgsl.expected.wgsl
@@ -1,6 +1,5 @@
 type Arr = array<u32, 50>;
 
-[[block]]
 struct Buf {
   count : u32;
   data : Arr;
diff --git a/test/bug/tint/294.wgsl b/test/bug/tint/294.wgsl
index 6f9aa16..83831c7 100644
--- a/test/bug/tint/294.wgsl
+++ b/test/bug/tint/294.wgsl
@@ -2,7 +2,7 @@
   position : vec3<f32>;
   colour : vec3<f32>;
 };
-[[block]] struct Lights {
+ struct Lights {
   light : [[stride(32)]] array<Light>;
 };
 [[group(0), binding(1)]] var<storage, read> lights : Lights;
diff --git a/test/bug/tint/294.wgsl.expected.wgsl b/test/bug/tint/294.wgsl.expected.wgsl
index ea5db21..7cb8698 100644
--- a/test/bug/tint/294.wgsl.expected.wgsl
+++ b/test/bug/tint/294.wgsl.expected.wgsl
@@ -3,7 +3,6 @@
   colour : vec3<f32>;
 };
 
-[[block]]
 struct Lights {
   light : [[stride(32)]] array<Light>;
 };
diff --git a/test/bug/tint/369.wgsl b/test/bug/tint/369.wgsl
index db09448..05386cb 100644
--- a/test/bug/tint/369.wgsl
+++ b/test/bug/tint/369.wgsl
@@ -1,4 +1,4 @@
-[[block]] struct S {
+ struct S {
     m : mat2x2<f32>;
 };
 
diff --git a/test/bug/tint/369.wgsl.expected.wgsl b/test/bug/tint/369.wgsl.expected.wgsl
index 72de20d..7f45473 100644
--- a/test/bug/tint/369.wgsl.expected.wgsl
+++ b/test/bug/tint/369.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   m : mat2x2<f32>;
 };
diff --git a/test/bug/tint/403.wgsl b/test/bug/tint/403.wgsl
index d9a54cc..011fbf0 100644
--- a/test/bug/tint/403.wgsl
+++ b/test/bug/tint/403.wgsl
@@ -1,9 +1,7 @@
 
-[[block]]
 struct vertexUniformBuffer1 {
   transform1 : mat2x2<f32>;
 };
-[[block]]
 struct vertexUniformBuffer2 {
   transform2 : mat2x2<f32>;
 };
diff --git a/test/bug/tint/403.wgsl.expected.wgsl b/test/bug/tint/403.wgsl.expected.wgsl
index 3af2bd2..6e1ae44 100644
--- a/test/bug/tint/403.wgsl.expected.wgsl
+++ b/test/bug/tint/403.wgsl.expected.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct vertexUniformBuffer1 {
   transform1 : mat2x2<f32>;
 };
 
-[[block]]
 struct vertexUniformBuffer2 {
   transform2 : mat2x2<f32>;
 };
diff --git a/test/bug/tint/492.wgsl b/test/bug/tint/492.wgsl
index 855a8d5..bbba0aa 100644
--- a/test/bug/tint/492.wgsl
+++ b/test/bug/tint/492.wgsl
@@ -1,4 +1,4 @@
-[[block]] struct S { a : i32; };
+ struct S { a : i32; };
 [[group(0), binding(0)]] var<storage, read_write> buf : S;
 
 [[stage(compute), workgroup_size(1)]] fn main() {
diff --git a/test/bug/tint/492.wgsl.expected.wgsl b/test/bug/tint/492.wgsl.expected.wgsl
index 6245430..3b56c94 100644
--- a/test/bug/tint/492.wgsl.expected.wgsl
+++ b/test/bug/tint/492.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   a : i32;
 };
diff --git a/test/bug/tint/534.wgsl b/test/bug/tint/534.wgsl
index 56e8e0a..1aaf535 100644
--- a/test/bug/tint/534.wgsl
+++ b/test/bug/tint/534.wgsl
@@ -1,10 +1,10 @@
-[[block]] struct Uniforms {
+ struct Uniforms {
     dstTextureFlipY : u32;
     isFloat16 : u32;
     isRGB10A2Unorm : u32;
     channelCount : u32;
 };
-[[block]] struct OutputBuf {
+ struct OutputBuf {
     result : [[stride(4)]] array<u32>;
 };
 [[group(0), binding(0)]] var src : texture_2d<f32>;
diff --git a/test/bug/tint/534.wgsl.expected.wgsl b/test/bug/tint/534.wgsl.expected.wgsl
index 1fd409c..7604745 100644
--- a/test/bug/tint/534.wgsl.expected.wgsl
+++ b/test/bug/tint/534.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct Uniforms {
   dstTextureFlipY : u32;
   isFloat16 : u32;
@@ -6,7 +5,6 @@
   channelCount : u32;
 };
 
-[[block]]
 struct OutputBuf {
   result : [[stride(4)]] array<u32>;
 };
diff --git a/test/bug/tint/744.wgsl b/test/bug/tint/744.wgsl
index 72db750..c8c8cd2 100644
--- a/test/bug/tint/744.wgsl
+++ b/test/bug/tint/744.wgsl
@@ -1,9 +1,9 @@
-[[block]] struct Uniforms {
+ struct Uniforms {
     aShape : vec2<u32>;
     bShape : vec2<u32>;
     outShape : vec2<u32>;
 };
-[[block]] struct Matrix {
+ struct Matrix {
     numbers: array<u32>;
 };
 
diff --git a/test/bug/tint/744.wgsl.expected.wgsl b/test/bug/tint/744.wgsl.expected.wgsl
index ad6c01e..27c747d 100644
--- a/test/bug/tint/744.wgsl.expected.wgsl
+++ b/test/bug/tint/744.wgsl.expected.wgsl
@@ -1,11 +1,9 @@
-[[block]]
 struct Uniforms {
   aShape : vec2<u32>;
   bShape : vec2<u32>;
   outShape : vec2<u32>;
 };
 
-[[block]]
 struct Matrix {
   numbers : array<u32>;
 };
diff --git a/test/bug/tint/757.wgsl b/test/bug/tint/757.wgsl
index 5800e25..c5aca24 100644
--- a/test/bug/tint/757.wgsl
+++ b/test/bug/tint/757.wgsl
@@ -1,12 +1,12 @@
 
-[[block]] struct Constants {
+ struct Constants {
   level : i32;
 };
 
 [[group(0), binding(0)]] var<uniform> constants : Constants;
 [[group(0), binding(1)]] var myTexture : texture_2d_array<f32>;
 
-[[block]] struct Result {
+ struct Result {
   values : [[stride(4)]] array<f32>;
 };
 [[group(0), binding(3)]] var<storage, read_write> result : Result;
diff --git a/test/bug/tint/757.wgsl.expected.wgsl b/test/bug/tint/757.wgsl.expected.wgsl
index 9690af5..2407fea 100644
--- a/test/bug/tint/757.wgsl.expected.wgsl
+++ b/test/bug/tint/757.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct Constants {
   level : i32;
 };
@@ -7,7 +6,6 @@
 
 [[group(0), binding(1)]] var myTexture : texture_2d_array<f32>;
 
-[[block]]
 struct Result {
   values : [[stride(4)]] array<f32>;
 };
diff --git a/test/bug/tint/804.spv.expected.hlsl b/test/bug/tint/804.spv.expected.hlsl
index c515711..f94b4a6 100644
--- a/test/bug/tint/804.spv.expected.hlsl
+++ b/test/bug/tint/804.spv.expected.hlsl
@@ -1,7 +1,6 @@
 SKIP: FAILED
 
 
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/bug/tint/807.spv.expected.hlsl b/test/bug/tint/807.spv.expected.hlsl
index e736bf8..785418e 100644
--- a/test/bug/tint/807.spv.expected.hlsl
+++ b/test/bug/tint/807.spv.expected.hlsl
@@ -1,7 +1,6 @@
 SKIP: FAILED
 
 
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/bug/tint/827.wgsl b/test/bug/tint/827.wgsl
index a9b7834..35fa8db 100644
--- a/test/bug/tint/827.wgsl
+++ b/test/bug/tint/827.wgsl
@@ -1,4 +1,4 @@
-[[block]] struct Result {
+ struct Result {
     values : array<f32>;
 };
 
diff --git a/test/bug/tint/827.wgsl.expected.wgsl b/test/bug/tint/827.wgsl.expected.wgsl
index 993b06d..48baf0c 100644
--- a/test/bug/tint/827.wgsl.expected.wgsl
+++ b/test/bug/tint/827.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct Result {
   values : array<f32>;
 };
diff --git a/test/bug/tint/913.wgsl b/test/bug/tint/913.wgsl
index 467a944..2df489f 100644
--- a/test/bug/tint/913.wgsl
+++ b/test/bug/tint/913.wgsl
@@ -1,11 +1,11 @@
-[[block]] struct Uniforms {
+ struct Uniforms {
     dstTextureFlipY : u32;
     channelCount    : u32;
     srcCopyOrigin   : vec2<u32>;
     dstCopyOrigin   : vec2<u32>;
     copySize        : vec2<u32>;
 };
-[[block]] struct OutputBuf {
+ struct OutputBuf {
     result : array<u32>;
 };
 [[group(0), binding(0)]] var src : texture_2d<f32>;
diff --git a/test/bug/tint/913.wgsl.expected.wgsl b/test/bug/tint/913.wgsl.expected.wgsl
index b38c001..ecc1c2b 100644
--- a/test/bug/tint/913.wgsl.expected.wgsl
+++ b/test/bug/tint/913.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct Uniforms {
   dstTextureFlipY : u32;
   channelCount : u32;
@@ -7,7 +6,6 @@
   copySize : vec2<u32>;
 };
 
-[[block]]
 struct OutputBuf {
   result : array<u32>;
 };
diff --git a/test/bug/tint/914.wgsl b/test/bug/tint/914.wgsl
index 4042066..372e0d1 100644
--- a/test/bug/tint/914.wgsl
+++ b/test/bug/tint/914.wgsl
@@ -1,9 +1,9 @@
-[[block]] struct Uniforms {
+ struct Uniforms {
     dimAOuter : u32;
     dimInner : u32;
     dimBOuter : u32;
 };
-[[block]] struct Matrix {
+ struct Matrix {
     numbers: array<f32>;
 };
 
diff --git a/test/bug/tint/914.wgsl.expected.wgsl b/test/bug/tint/914.wgsl.expected.wgsl
index 17ca3f3..6b42dac 100644
--- a/test/bug/tint/914.wgsl.expected.wgsl
+++ b/test/bug/tint/914.wgsl.expected.wgsl
@@ -1,11 +1,9 @@
-[[block]]
 struct Uniforms {
   dimAOuter : u32;
   dimInner : u32;
   dimBOuter : u32;
 };
 
-[[block]]
 struct Matrix {
   numbers : array<f32>;
 };
diff --git a/test/bug/tint/922.wgsl b/test/bug/tint/922.wgsl
index 09d3876..0d334f2 100644
--- a/test/bug/tint/922.wgsl
+++ b/test/bug/tint/922.wgsl
@@ -16,18 +16,15 @@
     my: vec4<f32>;
 };
 
-[[block]]
 struct ub_SceneParams {
     u_Projection: Mat4x4_;
 };
 
-[[block]]
 struct ub_MaterialParams {
     u_TexMtx: [[stride(32)]] array<Mat4x2_,1>;
     u_Misc0_: vec4<f32>;
 };
 
-[[block]]
 struct ub_PacketParams {
     u_PosMtx: [[stride(48)]] array<Mat4x3_,32>;
 };
diff --git a/test/bug/tint/922.wgsl.expected.wgsl b/test/bug/tint/922.wgsl.expected.wgsl
index aa20cc7..6e637c7 100644
--- a/test/bug/tint/922.wgsl.expected.wgsl
+++ b/test/bug/tint/922.wgsl.expected.wgsl
@@ -16,18 +16,15 @@
   my : vec4<f32>;
 };
 
-[[block]]
 struct ub_SceneParams {
   u_Projection : Mat4x4_;
 };
 
-[[block]]
 struct ub_MaterialParams {
   u_TexMtx : [[stride(32)]] array<Mat4x2_, 1>;
   u_Misc0_ : vec4<f32>;
 };
 
-[[block]]
 struct ub_PacketParams {
   u_PosMtx : [[stride(48)]] array<Mat4x3_, 32>;
 };
diff --git a/test/bug/tint/926.wgsl b/test/bug/tint/926.wgsl
index 808416b..b308f5a 100644
--- a/test/bug/tint/926.wgsl
+++ b/test/bug/tint/926.wgsl
@@ -1,4 +1,4 @@
-[[block]] struct DrawIndirectArgs {
+ struct DrawIndirectArgs {
   vertexCount : atomic<u32>;
 };
 [[group(0), binding(5)]] var<storage, read_write> drawOut : DrawIndirectArgs;
diff --git a/test/bug/tint/926.wgsl.expected.wgsl b/test/bug/tint/926.wgsl.expected.wgsl
index 75c4434..b21aa73 100644
--- a/test/bug/tint/926.wgsl.expected.wgsl
+++ b/test/bug/tint/926.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct DrawIndirectArgs {
   vertexCount : atomic<u32>;
 };
diff --git a/test/bug/tint/942.wgsl b/test/bug/tint/942.wgsl
index aaf7549..eb2ae53 100644
--- a/test/bug/tint/942.wgsl
+++ b/test/bug/tint/942.wgsl
@@ -1,4 +1,4 @@
-[[block]] struct Params {
+ struct Params {
   filterDim : u32;
   blockDim : u32;
 };
@@ -8,7 +8,7 @@
 [[group(1), binding(1)]] var inputTex : texture_2d<f32>;
 [[group(1), binding(2)]] var outputTex : texture_storage_2d<rgba8unorm, write>;
 
-[[block]] struct Flip {
+ struct Flip {
   value : u32;
 };
 [[group(1), binding(3)]] var<uniform> flip : Flip;
diff --git a/test/bug/tint/942.wgsl.expected.wgsl b/test/bug/tint/942.wgsl.expected.wgsl
index b936d4e..327b5aa 100644
--- a/test/bug/tint/942.wgsl.expected.wgsl
+++ b/test/bug/tint/942.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct Params {
   filterDim : u32;
   blockDim : u32;
@@ -12,7 +11,6 @@
 
 [[group(1), binding(2)]] var outputTex : texture_storage_2d<rgba8unorm, write>;
 
-[[block]]
 struct Flip {
   value : u32;
 };
diff --git a/test/bug/tint/948.wgsl b/test/bug/tint/948.wgsl
index 3654f57..99056b4 100644
--- a/test/bug/tint/948.wgsl
+++ b/test/bug/tint/948.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct LeftOver {
   time : f32;
   [[size(12)]]
diff --git a/test/bug/tint/948.wgsl.expected.wgsl b/test/bug/tint/948.wgsl.expected.wgsl
index 9a337f7..4fe5b0c 100644
--- a/test/bug/tint/948.wgsl.expected.wgsl
+++ b/test/bug/tint/948.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct LeftOver {
   time : f32;
   [[size(12)]]
diff --git a/test/bug/tint/949.wgsl b/test/bug/tint/949.wgsl
index 41be7ed..2d52b91 100644
--- a/test/bug/tint/949.wgsl
+++ b/test/bug/tint/949.wgsl
@@ -4,7 +4,6 @@
   specular : vec3<f32>;
 };
 
-[[block]]
 struct LeftOver {
   u_World : mat4x4<f32>;
   u_ViewProjection : mat4x4<f32>;
@@ -19,7 +18,6 @@
   tangentSpaceParameter0 : vec2<f32>;
 };
 
-[[block]]
 struct Light0 {
   vLightData : vec4<f32>;
   vLightDiffuse : vec4<f32>;
diff --git a/test/bug/tint/949.wgsl.expected.wgsl b/test/bug/tint/949.wgsl.expected.wgsl
index 73b74ea..68602e1 100644
--- a/test/bug/tint/949.wgsl.expected.wgsl
+++ b/test/bug/tint/949.wgsl.expected.wgsl
@@ -3,7 +3,6 @@
   specular : vec3<f32>;
 };
 
-[[block]]
 struct LeftOver {
   u_World : mat4x4<f32>;
   u_ViewProjection : mat4x4<f32>;
@@ -18,7 +17,6 @@
   tangentSpaceParameter0 : vec2<f32>;
 };
 
-[[block]]
 struct Light0 {
   vLightData : vec4<f32>;
   vLightDiffuse : vec4<f32>;
diff --git a/test/bug/tint/959.wgsl b/test/bug/tint/959.wgsl
index 91092b7..f8feea2 100644
--- a/test/bug/tint/959.wgsl
+++ b/test/bug/tint/959.wgsl
@@ -3,7 +3,6 @@
 // MSL. Use some high binding numbers to also test that the remapped numbers are
 // densely packed starting at 0.
 
-[[block]]
 struct S {
   a : f32;
 };
diff --git a/test/bug/tint/959.wgsl.expected.wgsl b/test/bug/tint/959.wgsl.expected.wgsl
index 3936db7..6a440f7 100644
--- a/test/bug/tint/959.wgsl.expected.wgsl
+++ b/test/bug/tint/959.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   a : f32;
 };
diff --git a/test/bug/tint/980.wgsl b/test/bug/tint/980.wgsl
index 28d7d73..bd82785 100644
--- a/test/bug/tint/980.wgsl
+++ b/test/bug/tint/980.wgsl
@@ -5,7 +5,7 @@
   return normalize(normal);
 }
 
-[[block]] struct S { v : vec3<f32>; i : u32; };
+ struct S { v : vec3<f32>; i : u32; };
 [[binding(0), group(0)]] var<storage, read_write> io : S;
 [[stage(compute), workgroup_size(1)]]
 fn main([[builtin(local_invocation_index)]] idx : u32) {
diff --git a/test/bug/tint/980.wgsl.expected.wgsl b/test/bug/tint/980.wgsl.expected.wgsl
index acc7ee6..1af06ba 100644
--- a/test/bug/tint/980.wgsl.expected.wgsl
+++ b/test/bug/tint/980.wgsl.expected.wgsl
@@ -4,7 +4,6 @@
   return normalize(normal);
 }
 
-[[block]]
 struct S {
   v : vec3<f32>;
   i : u32;
diff --git a/test/bug/tint/993.wgsl b/test/bug/tint/993.wgsl
index d9167f8..cf774f7 100644
--- a/test/bug/tint/993.wgsl
+++ b/test/bug/tint/993.wgsl
@@ -1,15 +1,15 @@
 
-[[block]] struct Constants {
+ struct Constants {
   zero: u32;
 };
 [[group(1), binding(0)]] var<uniform> constants: Constants;
 
-[[block]] struct Result {
+ struct Result {
   value: u32;
 };
 [[group(1), binding(1)]] var<storage, write> result: Result;
 
-[[block]] struct TestData {
+ struct TestData {
   data: array<atomic<i32>,3>;
 };
 [[group(0), binding(0)]] var<storage, read_write> s: TestData;
diff --git a/test/bug/tint/993.wgsl.expected.wgsl b/test/bug/tint/993.wgsl.expected.wgsl
index b5bf11b..588ebed 100644
--- a/test/bug/tint/993.wgsl.expected.wgsl
+++ b/test/bug/tint/993.wgsl.expected.wgsl
@@ -1,18 +1,15 @@
-[[block]]
 struct Constants {
   zero : u32;
 };
 
 [[group(1), binding(0)]] var<uniform> constants : Constants;
 
-[[block]]
 struct Result {
   value : u32;
 };
 
 [[group(1), binding(1)]] var<storage, write> result : Result;
 
-[[block]]
 struct TestData {
   data : array<atomic<i32>, 3>;
 };
diff --git a/test/bug/tint/998.wgsl b/test/bug/tint/998.wgsl
index 2b3655f..39357d6 100644
--- a/test/bug/tint/998.wgsl
+++ b/test/bug/tint/998.wgsl
@@ -1,9 +1,9 @@
-[[block]] struct Constants {
+ struct Constants {
   zero: u32;
 };
 [[group(1), binding(0)]] var<uniform> constants: Constants;
 
-[[block]] struct Result {
+ struct Result {
   value: u32;
 };
 [[group(1), binding(1)]] var<storage, write> result: Result;
diff --git a/test/bug/tint/998.wgsl.expected.wgsl b/test/bug/tint/998.wgsl.expected.wgsl
index acc05d2..f6e3471 100644
--- a/test/bug/tint/998.wgsl.expected.wgsl
+++ b/test/bug/tint/998.wgsl.expected.wgsl
@@ -1,11 +1,9 @@
-[[block]]
 struct Constants {
   zero : u32;
 };
 
 [[group(1), binding(0)]] var<uniform> constants : Constants;
 
-[[block]]
 struct Result {
   value : u32;
 };
diff --git a/test/expressions/binary/mul/mat3x2-vec3/f32.wgsl b/test/expressions/binary/mul/mat3x2-vec3/f32.wgsl
index ccfdaa1..711e0c8 100644
--- a/test/expressions/binary/mul/mat3x2-vec3/f32.wgsl
+++ b/test/expressions/binary/mul/mat3x2-vec3/f32.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     matrix : mat3x2<f32>;
     vector : vec3<f32>;
diff --git a/test/expressions/binary/mul/mat3x2-vec3/f32.wgsl.expected.wgsl b/test/expressions/binary/mul/mat3x2-vec3/f32.wgsl.expected.wgsl
index e2551fa..ae7c935 100644
--- a/test/expressions/binary/mul/mat3x2-vec3/f32.wgsl.expected.wgsl
+++ b/test/expressions/binary/mul/mat3x2-vec3/f32.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   matrix : mat3x2<f32>;
   vector : vec3<f32>;
diff --git a/test/expressions/binary/mul/mat3x3-vec3/f32.wgsl b/test/expressions/binary/mul/mat3x3-vec3/f32.wgsl
index 2193faf..1101f92 100644
--- a/test/expressions/binary/mul/mat3x3-vec3/f32.wgsl
+++ b/test/expressions/binary/mul/mat3x3-vec3/f32.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     matrix : mat3x3<f32>;
     vector : vec3<f32>;
diff --git a/test/expressions/binary/mul/mat3x3-vec3/f32.wgsl.expected.wgsl b/test/expressions/binary/mul/mat3x3-vec3/f32.wgsl.expected.wgsl
index e60691c..67be8b6 100644
--- a/test/expressions/binary/mul/mat3x3-vec3/f32.wgsl.expected.wgsl
+++ b/test/expressions/binary/mul/mat3x3-vec3/f32.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   matrix : mat3x3<f32>;
   vector : vec3<f32>;
diff --git a/test/expressions/binary/mul/vec3-mat3x3/f32.wgsl b/test/expressions/binary/mul/vec3-mat3x3/f32.wgsl
index 498b3dd..8cfd8e1 100644
--- a/test/expressions/binary/mul/vec3-mat3x3/f32.wgsl
+++ b/test/expressions/binary/mul/vec3-mat3x3/f32.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     matrix : mat3x3<f32>;
     vector : vec3<f32>;
diff --git a/test/expressions/binary/mul/vec3-mat3x3/f32.wgsl.expected.wgsl b/test/expressions/binary/mul/vec3-mat3x3/f32.wgsl.expected.wgsl
index 3a8b957..884e94c 100644
--- a/test/expressions/binary/mul/vec3-mat3x3/f32.wgsl.expected.wgsl
+++ b/test/expressions/binary/mul/vec3-mat3x3/f32.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   matrix : mat3x3<f32>;
   vector : vec3<f32>;
diff --git a/test/expressions/binary/mul/vec3-mat4x3/f32.wgsl b/test/expressions/binary/mul/vec3-mat4x3/f32.wgsl
index 97844ad..48b2709 100644
--- a/test/expressions/binary/mul/vec3-mat4x3/f32.wgsl
+++ b/test/expressions/binary/mul/vec3-mat4x3/f32.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     matrix : mat4x3<f32>;
     vector : vec3<f32>;
diff --git a/test/expressions/binary/mul/vec3-mat4x3/f32.wgsl.expected.wgsl b/test/expressions/binary/mul/vec3-mat4x3/f32.wgsl.expected.wgsl
index 2f567cc..36c0fe4 100644
--- a/test/expressions/binary/mul/vec3-mat4x3/f32.wgsl.expected.wgsl
+++ b/test/expressions/binary/mul/vec3-mat4x3/f32.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   matrix : mat4x3<f32>;
   vector : vec3<f32>;
diff --git a/test/expressions/swizzle/read/packed_vec3/f32.wgsl b/test/expressions/swizzle/read/packed_vec3/f32.wgsl
index 81a9220..dd4826a 100644
--- a/test/expressions/swizzle/read/packed_vec3/f32.wgsl
+++ b/test/expressions/swizzle/read/packed_vec3/f32.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     v: vec3<f32>;
 };
diff --git a/test/expressions/swizzle/read/packed_vec3/f32.wgsl.expected.wgsl b/test/expressions/swizzle/read/packed_vec3/f32.wgsl.expected.wgsl
index 1e01c44..6a0255b 100644
--- a/test/expressions/swizzle/read/packed_vec3/f32.wgsl.expected.wgsl
+++ b/test/expressions/swizzle/read/packed_vec3/f32.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   v : vec3<f32>;
 };
diff --git a/test/expressions/swizzle/read/packed_vec3/i32.wgsl b/test/expressions/swizzle/read/packed_vec3/i32.wgsl
index 114397b..b81d0dd 100644
--- a/test/expressions/swizzle/read/packed_vec3/i32.wgsl
+++ b/test/expressions/swizzle/read/packed_vec3/i32.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     v: vec3<i32>;
 };
diff --git a/test/expressions/swizzle/read/packed_vec3/i32.wgsl.expected.wgsl b/test/expressions/swizzle/read/packed_vec3/i32.wgsl.expected.wgsl
index d174a70..9220cb8 100644
--- a/test/expressions/swizzle/read/packed_vec3/i32.wgsl.expected.wgsl
+++ b/test/expressions/swizzle/read/packed_vec3/i32.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   v : vec3<i32>;
 };
diff --git a/test/expressions/swizzle/read/packed_vec3/u32.wgsl b/test/expressions/swizzle/read/packed_vec3/u32.wgsl
index 358d13b..d0497a6 100644
--- a/test/expressions/swizzle/read/packed_vec3/u32.wgsl
+++ b/test/expressions/swizzle/read/packed_vec3/u32.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     v: vec3<u32>;
 };
diff --git a/test/expressions/swizzle/read/packed_vec3/u32.wgsl.expected.wgsl b/test/expressions/swizzle/read/packed_vec3/u32.wgsl.expected.wgsl
index 96b7263..e77660c 100644
--- a/test/expressions/swizzle/read/packed_vec3/u32.wgsl.expected.wgsl
+++ b/test/expressions/swizzle/read/packed_vec3/u32.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   v : vec3<u32>;
 };
diff --git a/test/expressions/swizzle/write/packed_vec3/f32.wgsl b/test/expressions/swizzle/write/packed_vec3/f32.wgsl
index 7703af9..9a194ea 100644
--- a/test/expressions/swizzle/write/packed_vec3/f32.wgsl
+++ b/test/expressions/swizzle/write/packed_vec3/f32.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     v: vec3<f32>;
 };
diff --git a/test/expressions/swizzle/write/packed_vec3/f32.wgsl.expected.wgsl b/test/expressions/swizzle/write/packed_vec3/f32.wgsl.expected.wgsl
index db3ef39..35bcaa3 100644
--- a/test/expressions/swizzle/write/packed_vec3/f32.wgsl.expected.wgsl
+++ b/test/expressions/swizzle/write/packed_vec3/f32.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   v : vec3<f32>;
 };
diff --git a/test/expressions/swizzle/write/packed_vec3/i32.wgsl b/test/expressions/swizzle/write/packed_vec3/i32.wgsl
index fb1ebc5..2880622 100644
--- a/test/expressions/swizzle/write/packed_vec3/i32.wgsl
+++ b/test/expressions/swizzle/write/packed_vec3/i32.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     v: vec3<i32>;
 };
diff --git a/test/expressions/swizzle/write/packed_vec3/i32.wgsl.expected.wgsl b/test/expressions/swizzle/write/packed_vec3/i32.wgsl.expected.wgsl
index b84a23a..75986e1 100644
--- a/test/expressions/swizzle/write/packed_vec3/i32.wgsl.expected.wgsl
+++ b/test/expressions/swizzle/write/packed_vec3/i32.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   v : vec3<i32>;
 };
diff --git a/test/expressions/swizzle/write/packed_vec3/u32.wgsl b/test/expressions/swizzle/write/packed_vec3/u32.wgsl
index 306e540..4dd1bfd 100644
--- a/test/expressions/swizzle/write/packed_vec3/u32.wgsl
+++ b/test/expressions/swizzle/write/packed_vec3/u32.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     v: vec3<u32>;
 };
diff --git a/test/expressions/swizzle/write/packed_vec3/u32.wgsl.expected.wgsl b/test/expressions/swizzle/write/packed_vec3/u32.wgsl.expected.wgsl
index 0e7c8da..8db4caf 100644
--- a/test/expressions/swizzle/write/packed_vec3/u32.wgsl.expected.wgsl
+++ b/test/expressions/swizzle/write/packed_vec3/u32.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   v : vec3<u32>;
 };
diff --git a/test/intrinsics/arrayLength/complex_via_let.wgsl b/test/intrinsics/arrayLength/complex_via_let.wgsl
index 72c7b70..4b3a76d 100644
--- a/test/intrinsics/arrayLength/complex_via_let.wgsl
+++ b/test/intrinsics/arrayLength/complex_via_let.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     a : array<i32>;
 };
diff --git a/test/intrinsics/arrayLength/complex_via_let.wgsl.expected.wgsl b/test/intrinsics/arrayLength/complex_via_let.wgsl.expected.wgsl
index df8e389..0448ef6 100644
--- a/test/intrinsics/arrayLength/complex_via_let.wgsl.expected.wgsl
+++ b/test/intrinsics/arrayLength/complex_via_let.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   a : array<i32>;
 };
diff --git a/test/intrinsics/arrayLength/deprecated.wgsl b/test/intrinsics/arrayLength/deprecated.wgsl
index 45923b7..c3381aa 100644
--- a/test/intrinsics/arrayLength/deprecated.wgsl
+++ b/test/intrinsics/arrayLength/deprecated.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     a : array<i32>;
 };
diff --git a/test/intrinsics/arrayLength/deprecated.wgsl.expected.wgsl b/test/intrinsics/arrayLength/deprecated.wgsl.expected.wgsl
index 700fbbf..1db02f4 100644
--- a/test/intrinsics/arrayLength/deprecated.wgsl.expected.wgsl
+++ b/test/intrinsics/arrayLength/deprecated.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   a : array<i32>;
 };
diff --git a/test/intrinsics/arrayLength/simple.wgsl b/test/intrinsics/arrayLength/simple.wgsl
index c3abf89..d3cba2a 100644
--- a/test/intrinsics/arrayLength/simple.wgsl
+++ b/test/intrinsics/arrayLength/simple.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     a : array<i32>;
 };
diff --git a/test/intrinsics/arrayLength/simple.wgsl.expected.wgsl b/test/intrinsics/arrayLength/simple.wgsl.expected.wgsl
index f275755..72d32ba 100644
--- a/test/intrinsics/arrayLength/simple.wgsl.expected.wgsl
+++ b/test/intrinsics/arrayLength/simple.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   a : array<i32>;
 };
diff --git a/test/intrinsics/arrayLength/via_let.wgsl b/test/intrinsics/arrayLength/via_let.wgsl
index f6b2e4c..d9d71f5 100644
--- a/test/intrinsics/arrayLength/via_let.wgsl
+++ b/test/intrinsics/arrayLength/via_let.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     a : array<i32>;
 };
diff --git a/test/intrinsics/arrayLength/via_let.wgsl.expected.wgsl b/test/intrinsics/arrayLength/via_let.wgsl.expected.wgsl
index de8dd81..163a302 100644
--- a/test/intrinsics/arrayLength/via_let.wgsl.expected.wgsl
+++ b/test/intrinsics/arrayLength/via_let.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   a : array<i32>;
 };
diff --git a/test/intrinsics/arrayLength/via_let_complex.wgsl b/test/intrinsics/arrayLength/via_let_complex.wgsl
index 64b769a..98cfdd4 100644
--- a/test/intrinsics/arrayLength/via_let_complex.wgsl
+++ b/test/intrinsics/arrayLength/via_let_complex.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     a : array<i32>;
 };
diff --git a/test/intrinsics/arrayLength/via_let_complex.wgsl.expected.wgsl b/test/intrinsics/arrayLength/via_let_complex.wgsl.expected.wgsl
index b718cf5..d4255df 100644
--- a/test/intrinsics/arrayLength/via_let_complex.wgsl.expected.wgsl
+++ b/test/intrinsics/arrayLength/via_let_complex.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   a : array<i32>;
 };
diff --git a/test/intrinsics/gen/arrayLength/1588cd.wgsl b/test/intrinsics/gen/arrayLength/1588cd.wgsl
index 6c7f8d5..f4a4123 100644
--- a/test/intrinsics/gen/arrayLength/1588cd.wgsl
+++ b/test/intrinsics/gen/arrayLength/1588cd.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RO {
   arg_0: array<i32>;
 };
diff --git a/test/intrinsics/gen/arrayLength/1588cd.wgsl.expected.wgsl b/test/intrinsics/gen/arrayLength/1588cd.wgsl.expected.wgsl
index 4f3d875..a3c1031 100644
--- a/test/intrinsics/gen/arrayLength/1588cd.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/arrayLength/1588cd.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RO {
   arg_0 : array<i32>;
 };
diff --git a/test/intrinsics/gen/arrayLength/61b1c7.wgsl b/test/intrinsics/gen/arrayLength/61b1c7.wgsl
index 987a666..8716a4e 100644
--- a/test/intrinsics/gen/arrayLength/61b1c7.wgsl
+++ b/test/intrinsics/gen/arrayLength/61b1c7.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: array<i32>;
 };
diff --git a/test/intrinsics/gen/arrayLength/61b1c7.wgsl.expected.wgsl b/test/intrinsics/gen/arrayLength/61b1c7.wgsl.expected.wgsl
index 8034355..6d43b63 100644
--- a/test/intrinsics/gen/arrayLength/61b1c7.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/arrayLength/61b1c7.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : array<i32>;
 };
diff --git a/test/intrinsics/gen/arrayLength/a0f5ca.wgsl b/test/intrinsics/gen/arrayLength/a0f5ca.wgsl
index e59b30a..c367b4d 100644
--- a/test/intrinsics/gen/arrayLength/a0f5ca.wgsl
+++ b/test/intrinsics/gen/arrayLength/a0f5ca.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RO {
   arg_0: array<f32>;
 };
diff --git a/test/intrinsics/gen/arrayLength/a0f5ca.wgsl.expected.wgsl b/test/intrinsics/gen/arrayLength/a0f5ca.wgsl.expected.wgsl
index 0260079..1e5ca7a 100644
--- a/test/intrinsics/gen/arrayLength/a0f5ca.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/arrayLength/a0f5ca.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RO {
   arg_0 : array<f32>;
 };
diff --git a/test/intrinsics/gen/arrayLength/cdd123.wgsl b/test/intrinsics/gen/arrayLength/cdd123.wgsl
index 7bd4543..cd4b56a 100644
--- a/test/intrinsics/gen/arrayLength/cdd123.wgsl
+++ b/test/intrinsics/gen/arrayLength/cdd123.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: array<f32>;
 };
diff --git a/test/intrinsics/gen/arrayLength/cdd123.wgsl.expected.wgsl b/test/intrinsics/gen/arrayLength/cdd123.wgsl.expected.wgsl
index eaa36ee..e0afa3c 100644
--- a/test/intrinsics/gen/arrayLength/cdd123.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/arrayLength/cdd123.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : array<f32>;
 };
diff --git a/test/intrinsics/gen/arrayLength/cfca0a.wgsl b/test/intrinsics/gen/arrayLength/cfca0a.wgsl
index eab72be..c89fb1d 100644
--- a/test/intrinsics/gen/arrayLength/cfca0a.wgsl
+++ b/test/intrinsics/gen/arrayLength/cfca0a.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RO {
   arg_0: array<u32>;
 };
diff --git a/test/intrinsics/gen/arrayLength/cfca0a.wgsl.expected.wgsl b/test/intrinsics/gen/arrayLength/cfca0a.wgsl.expected.wgsl
index 0e16bfc..84f74eb 100644
--- a/test/intrinsics/gen/arrayLength/cfca0a.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/arrayLength/cfca0a.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RO {
   arg_0 : array<u32>;
 };
diff --git a/test/intrinsics/gen/arrayLength/eb510f.wgsl b/test/intrinsics/gen/arrayLength/eb510f.wgsl
index 7b74ccc..0f7df32 100644
--- a/test/intrinsics/gen/arrayLength/eb510f.wgsl
+++ b/test/intrinsics/gen/arrayLength/eb510f.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: array<u32>;
 };
diff --git a/test/intrinsics/gen/arrayLength/eb510f.wgsl.expected.wgsl b/test/intrinsics/gen/arrayLength/eb510f.wgsl.expected.wgsl
index b92318f..7b7f49c 100644
--- a/test/intrinsics/gen/arrayLength/eb510f.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/arrayLength/eb510f.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : array<u32>;
 };
diff --git a/test/intrinsics/gen/atomicAdd/8a199a.wgsl b/test/intrinsics/gen/atomicAdd/8a199a.wgsl
index 62e6e53..0b728d5 100644
--- a/test/intrinsics/gen/atomicAdd/8a199a.wgsl
+++ b/test/intrinsics/gen/atomicAdd/8a199a.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicAdd/8a199a.wgsl.expected.wgsl b/test/intrinsics/gen/atomicAdd/8a199a.wgsl.expected.wgsl
index df0df7c..ad75b16 100644
--- a/test/intrinsics/gen/atomicAdd/8a199a.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicAdd/8a199a.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicAdd/d32fe4.wgsl b/test/intrinsics/gen/atomicAdd/d32fe4.wgsl
index 2c4e98d..88fd8f6 100644
--- a/test/intrinsics/gen/atomicAdd/d32fe4.wgsl
+++ b/test/intrinsics/gen/atomicAdd/d32fe4.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicAdd/d32fe4.wgsl.expected.wgsl b/test/intrinsics/gen/atomicAdd/d32fe4.wgsl.expected.wgsl
index 30423b8..acbf6ff 100644
--- a/test/intrinsics/gen/atomicAdd/d32fe4.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicAdd/d32fe4.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicAnd/152966.wgsl b/test/intrinsics/gen/atomicAnd/152966.wgsl
index f370dd4..deb1160 100644
--- a/test/intrinsics/gen/atomicAnd/152966.wgsl
+++ b/test/intrinsics/gen/atomicAnd/152966.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicAnd/152966.wgsl.expected.wgsl b/test/intrinsics/gen/atomicAnd/152966.wgsl.expected.wgsl
index b67d2c4..026499f 100644
--- a/test/intrinsics/gen/atomicAnd/152966.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicAnd/152966.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicAnd/85a8d9.wgsl b/test/intrinsics/gen/atomicAnd/85a8d9.wgsl
index 1e480f0..414f521 100644
--- a/test/intrinsics/gen/atomicAnd/85a8d9.wgsl
+++ b/test/intrinsics/gen/atomicAnd/85a8d9.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicAnd/85a8d9.wgsl.expected.wgsl b/test/intrinsics/gen/atomicAnd/85a8d9.wgsl.expected.wgsl
index ea479c2..7f6b09e 100644
--- a/test/intrinsics/gen/atomicAnd/85a8d9.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicAnd/85a8d9.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicCompareExchangeWeak/12871c.wgsl b/test/intrinsics/gen/atomicCompareExchangeWeak/12871c.wgsl
index 5e703cd..ebbe26f 100644
--- a/test/intrinsics/gen/atomicCompareExchangeWeak/12871c.wgsl
+++ b/test/intrinsics/gen/atomicCompareExchangeWeak/12871c.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicCompareExchangeWeak/12871c.wgsl.expected.wgsl b/test/intrinsics/gen/atomicCompareExchangeWeak/12871c.wgsl.expected.wgsl
index a5b95a6..990942e 100644
--- a/test/intrinsics/gen/atomicCompareExchangeWeak/12871c.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicCompareExchangeWeak/12871c.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicCompareExchangeWeak/6673da.wgsl b/test/intrinsics/gen/atomicCompareExchangeWeak/6673da.wgsl
index 8c5a630..ac2e91d 100644
--- a/test/intrinsics/gen/atomicCompareExchangeWeak/6673da.wgsl
+++ b/test/intrinsics/gen/atomicCompareExchangeWeak/6673da.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicCompareExchangeWeak/6673da.wgsl.expected.wgsl b/test/intrinsics/gen/atomicCompareExchangeWeak/6673da.wgsl.expected.wgsl
index fb3bf43..985e3bd 100644
--- a/test/intrinsics/gen/atomicCompareExchangeWeak/6673da.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicCompareExchangeWeak/6673da.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicExchange/d59712.wgsl b/test/intrinsics/gen/atomicExchange/d59712.wgsl
index 1fa5416..6a5c6f2 100644
--- a/test/intrinsics/gen/atomicExchange/d59712.wgsl
+++ b/test/intrinsics/gen/atomicExchange/d59712.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicExchange/d59712.wgsl.expected.wgsl b/test/intrinsics/gen/atomicExchange/d59712.wgsl.expected.wgsl
index 434b6b3..293aaad 100644
--- a/test/intrinsics/gen/atomicExchange/d59712.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicExchange/d59712.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicExchange/f2e22f.wgsl b/test/intrinsics/gen/atomicExchange/f2e22f.wgsl
index 933892f..990cfb4 100644
--- a/test/intrinsics/gen/atomicExchange/f2e22f.wgsl
+++ b/test/intrinsics/gen/atomicExchange/f2e22f.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicExchange/f2e22f.wgsl.expected.wgsl b/test/intrinsics/gen/atomicExchange/f2e22f.wgsl.expected.wgsl
index 21668e2..58c2ae3 100644
--- a/test/intrinsics/gen/atomicExchange/f2e22f.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicExchange/f2e22f.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicLoad/0806ad.wgsl b/test/intrinsics/gen/atomicLoad/0806ad.wgsl
index 916b0b9..98dd4f5 100644
--- a/test/intrinsics/gen/atomicLoad/0806ad.wgsl
+++ b/test/intrinsics/gen/atomicLoad/0806ad.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicLoad/0806ad.wgsl.expected.wgsl b/test/intrinsics/gen/atomicLoad/0806ad.wgsl.expected.wgsl
index af2034f..3b643bb 100644
--- a/test/intrinsics/gen/atomicLoad/0806ad.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicLoad/0806ad.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicLoad/fe6cc3.wgsl b/test/intrinsics/gen/atomicLoad/fe6cc3.wgsl
index c0a0a99..3c8ea5e 100644
--- a/test/intrinsics/gen/atomicLoad/fe6cc3.wgsl
+++ b/test/intrinsics/gen/atomicLoad/fe6cc3.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicLoad/fe6cc3.wgsl.expected.wgsl b/test/intrinsics/gen/atomicLoad/fe6cc3.wgsl.expected.wgsl
index c8d536d..6155c41 100644
--- a/test/intrinsics/gen/atomicLoad/fe6cc3.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicLoad/fe6cc3.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicMax/51b9be.wgsl b/test/intrinsics/gen/atomicMax/51b9be.wgsl
index 8b0b8fd..8c53dfa 100644
--- a/test/intrinsics/gen/atomicMax/51b9be.wgsl
+++ b/test/intrinsics/gen/atomicMax/51b9be.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicMax/51b9be.wgsl.expected.wgsl b/test/intrinsics/gen/atomicMax/51b9be.wgsl.expected.wgsl
index 8ce2581..e2dd9eb 100644
--- a/test/intrinsics/gen/atomicMax/51b9be.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicMax/51b9be.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicMax/92aa72.wgsl b/test/intrinsics/gen/atomicMax/92aa72.wgsl
index 3973fb6..74431a7 100644
--- a/test/intrinsics/gen/atomicMax/92aa72.wgsl
+++ b/test/intrinsics/gen/atomicMax/92aa72.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicMax/92aa72.wgsl.expected.wgsl b/test/intrinsics/gen/atomicMax/92aa72.wgsl.expected.wgsl
index 36eb427..a59e10a 100644
--- a/test/intrinsics/gen/atomicMax/92aa72.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicMax/92aa72.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicMin/8e38dc.wgsl b/test/intrinsics/gen/atomicMin/8e38dc.wgsl
index 17fdd47..8f50406 100644
--- a/test/intrinsics/gen/atomicMin/8e38dc.wgsl
+++ b/test/intrinsics/gen/atomicMin/8e38dc.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicMin/8e38dc.wgsl.expected.wgsl b/test/intrinsics/gen/atomicMin/8e38dc.wgsl.expected.wgsl
index a7eacff..f4da3b5 100644
--- a/test/intrinsics/gen/atomicMin/8e38dc.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicMin/8e38dc.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicMin/c67a74.wgsl b/test/intrinsics/gen/atomicMin/c67a74.wgsl
index 5df6517..afcf5d3 100644
--- a/test/intrinsics/gen/atomicMin/c67a74.wgsl
+++ b/test/intrinsics/gen/atomicMin/c67a74.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicMin/c67a74.wgsl.expected.wgsl b/test/intrinsics/gen/atomicMin/c67a74.wgsl.expected.wgsl
index ac788b1..91b08cc 100644
--- a/test/intrinsics/gen/atomicMin/c67a74.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicMin/c67a74.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicOr/5e95d4.wgsl b/test/intrinsics/gen/atomicOr/5e95d4.wgsl
index 2168399..c90026e 100644
--- a/test/intrinsics/gen/atomicOr/5e95d4.wgsl
+++ b/test/intrinsics/gen/atomicOr/5e95d4.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicOr/5e95d4.wgsl.expected.wgsl b/test/intrinsics/gen/atomicOr/5e95d4.wgsl.expected.wgsl
index 77578c9..2f15ddd 100644
--- a/test/intrinsics/gen/atomicOr/5e95d4.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicOr/5e95d4.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicOr/8d96a0.wgsl b/test/intrinsics/gen/atomicOr/8d96a0.wgsl
index b48024f..7102b0c 100644
--- a/test/intrinsics/gen/atomicOr/8d96a0.wgsl
+++ b/test/intrinsics/gen/atomicOr/8d96a0.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicOr/8d96a0.wgsl.expected.wgsl b/test/intrinsics/gen/atomicOr/8d96a0.wgsl.expected.wgsl
index dc40096..dd150f6 100644
--- a/test/intrinsics/gen/atomicOr/8d96a0.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicOr/8d96a0.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicStore/cdc29e.wgsl b/test/intrinsics/gen/atomicStore/cdc29e.wgsl
index 96b6690..5961171 100644
--- a/test/intrinsics/gen/atomicStore/cdc29e.wgsl
+++ b/test/intrinsics/gen/atomicStore/cdc29e.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicStore/cdc29e.wgsl.expected.wgsl b/test/intrinsics/gen/atomicStore/cdc29e.wgsl.expected.wgsl
index 013b467..fc0ae3b 100644
--- a/test/intrinsics/gen/atomicStore/cdc29e.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicStore/cdc29e.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicStore/d1e9a6.wgsl b/test/intrinsics/gen/atomicStore/d1e9a6.wgsl
index d4519dd..cbbec6e 100644
--- a/test/intrinsics/gen/atomicStore/d1e9a6.wgsl
+++ b/test/intrinsics/gen/atomicStore/d1e9a6.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicStore/d1e9a6.wgsl.expected.wgsl b/test/intrinsics/gen/atomicStore/d1e9a6.wgsl.expected.wgsl
index 61c7235..e038d50 100644
--- a/test/intrinsics/gen/atomicStore/d1e9a6.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicStore/d1e9a6.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicSub/051100.wgsl b/test/intrinsics/gen/atomicSub/051100.wgsl
index 7ac5834..d8083ad 100644
--- a/test/intrinsics/gen/atomicSub/051100.wgsl
+++ b/test/intrinsics/gen/atomicSub/051100.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicSub/051100.wgsl.expected.wgsl b/test/intrinsics/gen/atomicSub/051100.wgsl.expected.wgsl
index 12a51de..e94eefc 100644
--- a/test/intrinsics/gen/atomicSub/051100.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicSub/051100.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicSub/15bfc9.wgsl b/test/intrinsics/gen/atomicSub/15bfc9.wgsl
index 3c2959d..a8ad318 100644
--- a/test/intrinsics/gen/atomicSub/15bfc9.wgsl
+++ b/test/intrinsics/gen/atomicSub/15bfc9.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicSub/15bfc9.wgsl.expected.wgsl b/test/intrinsics/gen/atomicSub/15bfc9.wgsl.expected.wgsl
index c47be99..ca53ef6 100644
--- a/test/intrinsics/gen/atomicSub/15bfc9.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicSub/15bfc9.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicXor/54510e.wgsl b/test/intrinsics/gen/atomicXor/54510e.wgsl
index 74d21ab..b7c85f0 100644
--- a/test/intrinsics/gen/atomicXor/54510e.wgsl
+++ b/test/intrinsics/gen/atomicXor/54510e.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicXor/54510e.wgsl.expected.wgsl b/test/intrinsics/gen/atomicXor/54510e.wgsl.expected.wgsl
index 85a2589..c9a6544 100644
--- a/test/intrinsics/gen/atomicXor/54510e.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicXor/54510e.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<u32>;
 };
diff --git a/test/intrinsics/gen/atomicXor/c1b78c.wgsl b/test/intrinsics/gen/atomicXor/c1b78c.wgsl
index 616f00c..eb665b4 100644
--- a/test/intrinsics/gen/atomicXor/c1b78c.wgsl
+++ b/test/intrinsics/gen/atomicXor/c1b78c.wgsl
@@ -22,7 +22,6 @@
 // Do not modify this file directly
 ////////////////////////////////////////////////////////////////////////////////
 
-[[block]]
 struct SB_RW {
   arg_0: atomic<i32>;
 };
diff --git a/test/intrinsics/gen/atomicXor/c1b78c.wgsl.expected.wgsl b/test/intrinsics/gen/atomicXor/c1b78c.wgsl.expected.wgsl
index fc5725b..010c089 100644
--- a/test/intrinsics/gen/atomicXor/c1b78c.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/atomicXor/c1b78c.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SB_RW {
   arg_0 : atomic<i32>;
 };
diff --git a/test/intrinsics/ignore/runtime_array.wgsl b/test/intrinsics/ignore/runtime_array.wgsl
index d934291..b7cc1e7 100644
--- a/test/intrinsics/ignore/runtime_array.wgsl
+++ b/test/intrinsics/ignore/runtime_array.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     arr : array<i32>;
 };
diff --git a/test/intrinsics/ignore/runtime_array.wgsl.expected.hlsl b/test/intrinsics/ignore/runtime_array.wgsl.expected.hlsl
index dbc8853..dcbeba5 100644
--- a/test/intrinsics/ignore/runtime_array.wgsl.expected.hlsl
+++ b/test/intrinsics/ignore/runtime_array.wgsl.expected.hlsl
@@ -1,4 +1,4 @@
-intrinsics/ignore/runtime_array.wgsl:10:5 warning: use of deprecated intrinsic
+intrinsics/ignore/runtime_array.wgsl:9:5 warning: use of deprecated intrinsic
     ignore(s.arr);
     ^^^^^^
 
diff --git a/test/intrinsics/ignore/runtime_array.wgsl.expected.msl b/test/intrinsics/ignore/runtime_array.wgsl.expected.msl
index 8be1139..47ea3dd 100644
--- a/test/intrinsics/ignore/runtime_array.wgsl.expected.msl
+++ b/test/intrinsics/ignore/runtime_array.wgsl.expected.msl
@@ -1,4 +1,4 @@
-intrinsics/ignore/runtime_array.wgsl:10:5 warning: use of deprecated intrinsic
+intrinsics/ignore/runtime_array.wgsl:9:5 warning: use of deprecated intrinsic
     ignore(s.arr);
     ^^^^^^
 
diff --git a/test/intrinsics/ignore/runtime_array.wgsl.expected.spvasm b/test/intrinsics/ignore/runtime_array.wgsl.expected.spvasm
index 3d32726..9251926 100644
--- a/test/intrinsics/ignore/runtime_array.wgsl.expected.spvasm
+++ b/test/intrinsics/ignore/runtime_array.wgsl.expected.spvasm
@@ -1,4 +1,4 @@
-intrinsics/ignore/runtime_array.wgsl:10:5 warning: use of deprecated intrinsic
+intrinsics/ignore/runtime_array.wgsl:9:5 warning: use of deprecated intrinsic
     ignore(s.arr);
     ^^^^^^
 
diff --git a/test/intrinsics/ignore/runtime_array.wgsl.expected.wgsl b/test/intrinsics/ignore/runtime_array.wgsl.expected.wgsl
index fd0b75c..ab69868 100644
--- a/test/intrinsics/ignore/runtime_array.wgsl.expected.wgsl
+++ b/test/intrinsics/ignore/runtime_array.wgsl.expected.wgsl
@@ -1,8 +1,7 @@
-intrinsics/ignore/runtime_array.wgsl:10:5 warning: use of deprecated intrinsic
+intrinsics/ignore/runtime_array.wgsl:9:5 warning: use of deprecated intrinsic
     ignore(s.arr);
     ^^^^^^
 
-[[block]]
 struct S {
   arr : array<i32>;
 };
diff --git a/test/intrinsics/ignore/storage_buffer.wgsl b/test/intrinsics/ignore/storage_buffer.wgsl
index 5e64740..be63c03 100644
--- a/test/intrinsics/ignore/storage_buffer.wgsl
+++ b/test/intrinsics/ignore/storage_buffer.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     i : i32;
 };
diff --git a/test/intrinsics/ignore/storage_buffer.wgsl.expected.hlsl b/test/intrinsics/ignore/storage_buffer.wgsl.expected.hlsl
index 4140026..f98fdf6 100644
--- a/test/intrinsics/ignore/storage_buffer.wgsl.expected.hlsl
+++ b/test/intrinsics/ignore/storage_buffer.wgsl.expected.hlsl
@@ -1,8 +1,8 @@
-intrinsics/ignore/storage_buffer.wgsl:10:5 warning: use of deprecated intrinsic
+intrinsics/ignore/storage_buffer.wgsl:9:5 warning: use of deprecated intrinsic
     ignore(s);
     ^^^^^^
 
-intrinsics/ignore/storage_buffer.wgsl:11:5 warning: use of deprecated intrinsic
+intrinsics/ignore/storage_buffer.wgsl:10:5 warning: use of deprecated intrinsic
     ignore(s.i);
     ^^^^^^
 
diff --git a/test/intrinsics/ignore/storage_buffer.wgsl.expected.msl b/test/intrinsics/ignore/storage_buffer.wgsl.expected.msl
index 8fd6daa..4db9c85 100644
--- a/test/intrinsics/ignore/storage_buffer.wgsl.expected.msl
+++ b/test/intrinsics/ignore/storage_buffer.wgsl.expected.msl
@@ -1,8 +1,8 @@
-intrinsics/ignore/storage_buffer.wgsl:10:5 warning: use of deprecated intrinsic
+intrinsics/ignore/storage_buffer.wgsl:9:5 warning: use of deprecated intrinsic
     ignore(s);
     ^^^^^^
 
-intrinsics/ignore/storage_buffer.wgsl:11:5 warning: use of deprecated intrinsic
+intrinsics/ignore/storage_buffer.wgsl:10:5 warning: use of deprecated intrinsic
     ignore(s.i);
     ^^^^^^
 
diff --git a/test/intrinsics/ignore/storage_buffer.wgsl.expected.spvasm b/test/intrinsics/ignore/storage_buffer.wgsl.expected.spvasm
index 206dd03..ad1ba5b 100644
--- a/test/intrinsics/ignore/storage_buffer.wgsl.expected.spvasm
+++ b/test/intrinsics/ignore/storage_buffer.wgsl.expected.spvasm
@@ -1,8 +1,8 @@
-intrinsics/ignore/storage_buffer.wgsl:10:5 warning: use of deprecated intrinsic
+intrinsics/ignore/storage_buffer.wgsl:9:5 warning: use of deprecated intrinsic
     ignore(s);
     ^^^^^^
 
-intrinsics/ignore/storage_buffer.wgsl:11:5 warning: use of deprecated intrinsic
+intrinsics/ignore/storage_buffer.wgsl:10:5 warning: use of deprecated intrinsic
     ignore(s.i);
     ^^^^^^
 
diff --git a/test/intrinsics/ignore/storage_buffer.wgsl.expected.wgsl b/test/intrinsics/ignore/storage_buffer.wgsl.expected.wgsl
index f0a5cd1..34817fc 100644
--- a/test/intrinsics/ignore/storage_buffer.wgsl.expected.wgsl
+++ b/test/intrinsics/ignore/storage_buffer.wgsl.expected.wgsl
@@ -1,12 +1,11 @@
-intrinsics/ignore/storage_buffer.wgsl:10:5 warning: use of deprecated intrinsic
+intrinsics/ignore/storage_buffer.wgsl:9:5 warning: use of deprecated intrinsic
     ignore(s);
     ^^^^^^
 
-intrinsics/ignore/storage_buffer.wgsl:11:5 warning: use of deprecated intrinsic
+intrinsics/ignore/storage_buffer.wgsl:10:5 warning: use of deprecated intrinsic
     ignore(s.i);
     ^^^^^^
 
-[[block]]
 struct S {
   i : i32;
 };
diff --git a/test/intrinsics/ignore/uniform_buffer.wgsl b/test/intrinsics/ignore/uniform_buffer.wgsl
index b96eb83..bf92e75 100644
--- a/test/intrinsics/ignore/uniform_buffer.wgsl
+++ b/test/intrinsics/ignore/uniform_buffer.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     i : i32;
 };
diff --git a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.hlsl b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.hlsl
index 43fa9fb..96e0cb8 100644
--- a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.hlsl
+++ b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.hlsl
@@ -1,8 +1,8 @@
-intrinsics/ignore/uniform_buffer.wgsl:10:5 warning: use of deprecated intrinsic
+intrinsics/ignore/uniform_buffer.wgsl:9:5 warning: use of deprecated intrinsic
     ignore(u);
     ^^^^^^
 
-intrinsics/ignore/uniform_buffer.wgsl:11:5 warning: use of deprecated intrinsic
+intrinsics/ignore/uniform_buffer.wgsl:10:5 warning: use of deprecated intrinsic
     ignore(u.i);
     ^^^^^^
 
diff --git a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.msl b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.msl
index b3db6a6..bde29d3 100644
--- a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.msl
+++ b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.msl
@@ -1,8 +1,8 @@
-intrinsics/ignore/uniform_buffer.wgsl:10:5 warning: use of deprecated intrinsic
+intrinsics/ignore/uniform_buffer.wgsl:9:5 warning: use of deprecated intrinsic
     ignore(u);
     ^^^^^^
 
-intrinsics/ignore/uniform_buffer.wgsl:11:5 warning: use of deprecated intrinsic
+intrinsics/ignore/uniform_buffer.wgsl:10:5 warning: use of deprecated intrinsic
     ignore(u.i);
     ^^^^^^
 
diff --git a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.spvasm b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.spvasm
index cb533d8..a675c40 100644
--- a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.spvasm
+++ b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.spvasm
@@ -1,8 +1,8 @@
-intrinsics/ignore/uniform_buffer.wgsl:10:5 warning: use of deprecated intrinsic
+intrinsics/ignore/uniform_buffer.wgsl:9:5 warning: use of deprecated intrinsic
     ignore(u);
     ^^^^^^
 
-intrinsics/ignore/uniform_buffer.wgsl:11:5 warning: use of deprecated intrinsic
+intrinsics/ignore/uniform_buffer.wgsl:10:5 warning: use of deprecated intrinsic
     ignore(u.i);
     ^^^^^^
 
diff --git a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.wgsl b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.wgsl
index ae04bdc..2d8a109 100644
--- a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.wgsl
+++ b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.wgsl
@@ -1,12 +1,11 @@
-intrinsics/ignore/uniform_buffer.wgsl:10:5 warning: use of deprecated intrinsic
+intrinsics/ignore/uniform_buffer.wgsl:9:5 warning: use of deprecated intrinsic
     ignore(u);
     ^^^^^^
 
-intrinsics/ignore/uniform_buffer.wgsl:11:5 warning: use of deprecated intrinsic
+intrinsics/ignore/uniform_buffer.wgsl:10:5 warning: use of deprecated intrinsic
     ignore(u.i);
     ^^^^^^
 
-[[block]]
 struct S {
   i : i32;
 };
diff --git a/test/intrinsics/intrinsics.wgsl.tmpl b/test/intrinsics/intrinsics.wgsl.tmpl
index 9ed3c42..16f72c3 100644
--- a/test/intrinsics/intrinsics.wgsl.tmpl
+++ b/test/intrinsics/intrinsics.wgsl.tmpl
@@ -38,7 +38,6 @@
                                                "access"      "read_write"
                                                "args"        $args -}}
 {{-   if $sb_rw_fields -}}
-[[block]]
 struct SB_RW {
 {{- $sb_rw_fields -}}
 };
@@ -52,7 +51,6 @@
                                                "access"      "read"
                                                "args"        $args -}}
 {{-   if $sb_ro_fields -}}
-[[block]]
 struct SB_RO {
 {{- $sb_ro_fields -}}
 };
@@ -66,7 +64,6 @@
                                             "access"      "read"
                                             "args"        $args -}}
 {{-   if $ub_fields -}}
-[[block]]
 struct UB {
 {{- $ub_fields -}}
 };
diff --git a/test/layout/storage/mat2x2/f32.wgsl b/test/layout/storage/mat2x2/f32.wgsl
index c0cdb01..2be17c3 100644
--- a/test/layout/storage/mat2x2/f32.wgsl
+++ b/test/layout/storage/mat2x2/f32.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SSBO {
   m : mat2x2<f32>;
 };
diff --git a/test/layout/storage/mat2x2/f32.wgsl.expected.wgsl b/test/layout/storage/mat2x2/f32.wgsl.expected.wgsl
index b4f1f51..0df98b4 100644
--- a/test/layout/storage/mat2x2/f32.wgsl.expected.wgsl
+++ b/test/layout/storage/mat2x2/f32.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct SSBO {
   m : mat2x2<f32>;
 };
diff --git a/test/ptr_ref/load/local/ptr_storage.wgsl b/test/ptr_ref/load/local/ptr_storage.wgsl
index 476cdbb..1b1bfba 100644
--- a/test/ptr_ref/load/local/ptr_storage.wgsl
+++ b/test/ptr_ref/load/local/ptr_storage.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   a : i32;
 };
diff --git a/test/ptr_ref/load/local/ptr_storage.wgsl.expected.wgsl b/test/ptr_ref/load/local/ptr_storage.wgsl.expected.wgsl
index b88f09f..13f8743 100644
--- a/test/ptr_ref/load/local/ptr_storage.wgsl.expected.wgsl
+++ b/test/ptr_ref/load/local/ptr_storage.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   a : i32;
 };
diff --git a/test/ptr_ref/load/local/ptr_uniform.wgsl b/test/ptr_ref/load/local/ptr_uniform.wgsl
index 527134e..1d0e355 100644
--- a/test/ptr_ref/load/local/ptr_uniform.wgsl
+++ b/test/ptr_ref/load/local/ptr_uniform.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   a : i32;
 };
diff --git a/test/ptr_ref/load/local/ptr_uniform.wgsl.expected.wgsl b/test/ptr_ref/load/local/ptr_uniform.wgsl.expected.wgsl
index d1a45b2..9ce5c52 100644
--- a/test/ptr_ref/load/local/ptr_uniform.wgsl.expected.wgsl
+++ b/test/ptr_ref/load/local/ptr_uniform.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   a : i32;
 };
diff --git a/test/samples/compute_boids.wgsl b/test/samples/compute_boids.wgsl
index 8924524..53ea4c5 100644
--- a/test/samples/compute_boids.wgsl
+++ b/test/samples/compute_boids.wgsl
@@ -39,7 +39,7 @@
   vel : vec2<f32>;
 };
 
-[[block]] struct SimParams {
+ struct SimParams {
   deltaT : f32;
   rule1Distance : f32;
   rule2Distance : f32;
@@ -49,7 +49,7 @@
   rule3Scale : f32;
 };
 
-[[block]] struct Particles {
+ struct Particles {
   particles : array<Particle, 5>;
 };
 
diff --git a/test/samples/compute_boids.wgsl.expected.wgsl b/test/samples/compute_boids.wgsl.expected.wgsl
index dd981f4..8fd0a19 100644
--- a/test/samples/compute_boids.wgsl.expected.wgsl
+++ b/test/samples/compute_boids.wgsl.expected.wgsl
@@ -15,7 +15,6 @@
   vel : vec2<f32>;
 };
 
-[[block]]
 struct SimParams {
   deltaT : f32;
   rule1Distance : f32;
@@ -26,7 +25,6 @@
   rule3Scale : f32;
 };
 
-[[block]]
 struct Particles {
   particles : array<Particle, 5>;
 };
diff --git a/test/samples/cube.wgsl b/test/samples/cube.wgsl
index 6eefd59..5b9fab1 100644
--- a/test/samples/cube.wgsl
+++ b/test/samples/cube.wgsl
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 // Vertex shader
-[[block]] struct Uniforms {
+ struct Uniforms {
   modelViewProjectionMatrix : mat4x4<f32>;
 };
 
diff --git a/test/samples/cube.wgsl.expected.wgsl b/test/samples/cube.wgsl.expected.wgsl
index a53fdec..29109a6 100644
--- a/test/samples/cube.wgsl.expected.wgsl
+++ b/test/samples/cube.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct Uniforms {
   modelViewProjectionMatrix : mat4x4<f32>;
 };
diff --git a/test/shader_io/shared_struct_storage_buffer.wgsl b/test/shader_io/shared_struct_storage_buffer.wgsl
index 15e4158..5d3f93e 100644
--- a/test/shader_io/shared_struct_storage_buffer.wgsl
+++ b/test/shader_io/shared_struct_storage_buffer.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   [[align(64)]] [[location(0)]] f : f32;
   [[size(32)]] [[location(1), interpolate(flat)]] u : u32;
diff --git a/test/shader_io/shared_struct_storage_buffer.wgsl.expected.wgsl b/test/shader_io/shared_struct_storage_buffer.wgsl.expected.wgsl
index c5fa8f7..971ff7b 100644
--- a/test/shader_io/shared_struct_storage_buffer.wgsl.expected.wgsl
+++ b/test/shader_io/shared_struct_storage_buffer.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   [[align(64), location(0)]]
   f : f32;
diff --git a/test/statements/assign/phony/addr_of_non_constructable.wgsl b/test/statements/assign/phony/addr_of_non_constructable.wgsl
index dc2b494..2ebe66d 100644
--- a/test/statements/assign/phony/addr_of_non_constructable.wgsl
+++ b/test/statements/assign/phony/addr_of_non_constructable.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     arr : array<i32>;
 };
diff --git a/test/statements/assign/phony/addr_of_non_constructable.wgsl.expected.wgsl b/test/statements/assign/phony/addr_of_non_constructable.wgsl.expected.wgsl
index 31c4b7c..6cd06e9 100644
--- a/test/statements/assign/phony/addr_of_non_constructable.wgsl.expected.wgsl
+++ b/test/statements/assign/phony/addr_of_non_constructable.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   arr : array<i32>;
 };
diff --git a/test/statements/assign/phony/addr_of_runtime_array.wgsl b/test/statements/assign/phony/addr_of_runtime_array.wgsl
index d146bc3..9121fe8 100644
--- a/test/statements/assign/phony/addr_of_runtime_array.wgsl
+++ b/test/statements/assign/phony/addr_of_runtime_array.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     arr : array<i32>;
 };
diff --git a/test/statements/assign/phony/addr_of_runtime_array.wgsl.expected.wgsl b/test/statements/assign/phony/addr_of_runtime_array.wgsl.expected.wgsl
index 1bdbbb5..02446cd 100644
--- a/test/statements/assign/phony/addr_of_runtime_array.wgsl.expected.wgsl
+++ b/test/statements/assign/phony/addr_of_runtime_array.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   arr : array<i32>;
 };
diff --git a/test/statements/assign/phony/storage_buffer.wgsl b/test/statements/assign/phony/storage_buffer.wgsl
index b4edd05..9f78472 100644
--- a/test/statements/assign/phony/storage_buffer.wgsl
+++ b/test/statements/assign/phony/storage_buffer.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     i : i32;
 };
diff --git a/test/statements/assign/phony/storage_buffer.wgsl.expected.wgsl b/test/statements/assign/phony/storage_buffer.wgsl.expected.wgsl
index da77a76..3a83d4d 100644
--- a/test/statements/assign/phony/storage_buffer.wgsl.expected.wgsl
+++ b/test/statements/assign/phony/storage_buffer.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   i : i32;
 };
diff --git a/test/statements/assign/phony/uniform_buffer.wgsl b/test/statements/assign/phony/uniform_buffer.wgsl
index bc59e1b..c0526bc 100644
--- a/test/statements/assign/phony/uniform_buffer.wgsl
+++ b/test/statements/assign/phony/uniform_buffer.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
     i : i32;
 };
diff --git a/test/statements/assign/phony/uniform_buffer.wgsl.expected.wgsl b/test/statements/assign/phony/uniform_buffer.wgsl.expected.wgsl
index 15763ac..7a04f48 100644
--- a/test/statements/assign/phony/uniform_buffer.wgsl.expected.wgsl
+++ b/test/statements/assign/phony/uniform_buffer.wgsl.expected.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   i : i32;
 };
diff --git a/test/vk-gl-cts/api/descriptor_set/descriptor_set_layout_binding/layout_binding_order/0.wgsl b/test/vk-gl-cts/api/descriptor_set/descriptor_set_layout_binding/layout_binding_order/0.wgsl
index 7f8a2d7..cd91ab7 100644
--- a/test/vk-gl-cts/api/descriptor_set/descriptor_set_layout_binding/layout_binding_order/0.wgsl
+++ b/test/vk-gl-cts/api/descriptor_set/descriptor_set_layout_binding/layout_binding_order/0.wgsl
@@ -1,21 +1,17 @@
-[[block]]
 struct result {
   res0 : i32;
   res1 : i32;
   res2 : i32;
 };
 
-[[block]]
 struct block0 {
   data0 : i32;
 };
 
-[[block]]
 struct block1 {
   data1 : i32;
 };
 
-[[block]]
 struct block2 {
   data2 : i32;
 };
diff --git a/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_compute/0.wgsl b/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_compute/0.wgsl
index 40325a2..8d78d1e 100644
--- a/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_compute/0.wgsl
+++ b/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_compute/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct block0 {
   data : vec4<f32>;
 };
diff --git a/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/0.wgsl b/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/0.wgsl
index 1b98fae..465aac8 100644
--- a/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/0.wgsl
+++ b/test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct block0 {
   in_color : vec4<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/always-discarding-function/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/always-discarding-function/0-opt.wgsl
index 58324d8..32cc07e 100644
--- a/test/vk-gl-cts/graphicsfuzz/always-discarding-function/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/always-discarding-function/0-opt.wgsl
@@ -2,7 +2,6 @@
   nmb : array<i32, 1>;
 };
 
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/arr-value-set-to-arr-value-squared/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/arr-value-set-to-arr-value-squared/0-opt.wgsl
index 03cd2ba..c345dfc 100644
--- a/test/vk-gl-cts/graphicsfuzz/arr-value-set-to-arr-value-squared/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/arr-value-set-to-arr-value-squared/0-opt.wgsl
@@ -2,7 +2,6 @@
   numbers : array<i32, 10>;
 };
 
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/array-idx-multiplied-by-for-loop-idx/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/array-idx-multiplied-by-for-loop-idx/0-opt.wgsl
index 430c6db..75f4bd37 100644
--- a/test/vk-gl-cts/graphicsfuzz/array-idx-multiplied-by-for-loop-idx/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/array-idx-multiplied-by-for-loop-idx/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl
index f57b088..5793a6f 100644
--- a/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl
@@ -1,12 +1,10 @@
 type RTArr = [[stride(4)]] array<i32>;
 
-[[block]]
 struct doesNotMatter {
   global_seed : i32;
   data : RTArr;
 };
 
-[[block]]
 struct buf1 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/break-in-do-while-with-nested-if/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/break-in-do-while-with-nested-if/0-opt.wgsl
index 4e7bacd..5ac0f1a 100644
--- a/test/vk-gl-cts/graphicsfuzz/break-in-do-while-with-nested-if/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/break-in-do-while-with-nested-if/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/call-function-with-discard/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/call-function-with-discard/0-opt.wgsl
index 64f1aaa..817d91b 100644
--- a/test/vk-gl-cts/graphicsfuzz/call-function-with-discard/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/call-function-with-discard/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/call-if-while-switch/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/call-if-while-switch/0-opt.wgsl
index e49880e..d68a5ec 100644
--- a/test/vk-gl-cts/graphicsfuzz/call-if-while-switch/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/call-if-while-switch/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/color-set-in-for-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/color-set-in-for-loop/0-opt.wgsl
index 1d247e7..72afddb 100644
--- a/test/vk-gl-cts/graphicsfuzz/color-set-in-for-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/color-set-in-for-loop/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/conditional-return-in-infinite-while/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/conditional-return-in-infinite-while/0-opt.wgsl
index bd10f84..937a8df 100644
--- a/test/vk-gl-cts/graphicsfuzz/conditional-return-in-infinite-while/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/conditional-return-in-infinite-while/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.wgsl
index 9ca6d37..4affd4f 100644
--- a/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cosh-return-inf-unused/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cosh-return-inf-unused/0-opt.wgsl
index a6a3d97..c7a4fe2 100644
--- a/test/vk-gl-cts/graphicsfuzz/cosh-return-inf-unused/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cosh-return-inf-unused/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   zero : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-access-array-dot/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-access-array-dot/0-opt.wgsl
index a706204..021c3f7 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-access-array-dot/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-access-array-dot/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-analysis-reachable-from-many/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-analysis-reachable-from-many/0-opt.wgsl
index f8b40bd..b046ca1 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-analysis-reachable-from-many/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-analysis-reachable-from-many/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   zero : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-and-even-numbers-from-fragcoord/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-and-even-numbers-from-fragcoord/0-opt.wgsl
index 9a549c4..1fff19f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-and-even-numbers-from-fragcoord/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-and-even-numbers-from-fragcoord/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-acos-ldexp/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-acos-ldexp/0-opt.wgsl
index eb29614..6c62828 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-acos-ldexp/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-acos-ldexp/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   two : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mix-nan/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mix-nan/0-opt.wgsl
index a59f8d8..32c79b7 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mix-nan/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mix-nan/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 10>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl
index ee6f6f7..d1079cb 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl
index 8b2ad19..019dd07 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-reflect-denorm/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-reflect-denorm/0-opt.wgsl
index c992ddc..e8b285f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-reflect-denorm/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-reflect-denorm/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 5>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-sinh-negative-log2/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-sinh-negative-log2/0-opt.wgsl
index 09b3c27..57cbd69 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-sinh-negative-log2/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-sinh-negative-log2/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-undefined-matrix-mul/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-undefined-matrix-mul/0-opt.wgsl
index e298a8c..3c3604a 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-undefined-matrix-mul/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-undefined-matrix-mul/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 12>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl
index a67101b..058b636 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-array-accesses-clamp/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-array-accesses-clamp/0-opt.wgsl
index eac5611..ba3f0fe 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-array-accesses-clamp/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-array-accesses-clamp/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-array-copies-loops-with-limiters/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-array-copies-loops-with-limiters/0-opt.wgsl
index 60a0604..ab2be50 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-array-copies-loops-with-limiters/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-array-copies-loops-with-limiters/0-opt.wgsl
@@ -1,11 +1,9 @@
 type Arr = [[stride(16)]] array<i32, 20>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
-[[block]]
 struct buf1 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-asin-undefined-smoothstep/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-asin-undefined-smoothstep/0-opt.wgsl
index 32f966d..f95fe55 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-asin-undefined-smoothstep/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-asin-undefined-smoothstep/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<f32, 7>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-atan-trunc-vec4/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-atan-trunc-vec4/0-opt.wgsl
index 0ac797e..74ba82b 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-atan-trunc-vec4/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-atan-trunc-vec4/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-basic-block-discard-in-function/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-basic-block-discard-in-function/0-opt.wgsl
index 39b2064..fbe9843 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-basic-block-discard-in-function/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-basic-block-discard-in-function/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   zero : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl
index a14b4cb..8cbbc01 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl
index c0b46ef..f5e5913 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-bitwise-inverse-uniform-condition/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-bitwise-inverse-uniform-condition/0-opt.wgsl
index 1e307de..1d88159 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-bitwise-inverse-uniform-condition/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-bitwise-inverse-uniform-condition/0-opt.wgsl
@@ -1,18 +1,15 @@
-[[block]]
 struct buf2 {
   zero : f32;
 };
 
 type Arr = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-branch-probability-identity-matrix/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-branch-probability-identity-matrix/0-opt.wgsl
index 83081ec..b8f5efd 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-branch-probability-identity-matrix/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-branch-probability-identity-matrix/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-cast-float-to-int-and-back/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-cast-float-to-int-and-back/0-opt.wgsl
index f7217b1..3319941 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-cast-float-to-int-and-back/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-cast-float-to-int-and-back/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-clamp-loop-limit-increment-float-array/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-clamp-loop-limit-increment-float-array/0-opt.wgsl
index 07d81cb..6cc8571 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-clamp-loop-limit-increment-float-array/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-clamp-loop-limit-increment-float-array/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-clamp-lower-limit-from-always-false/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-clamp-lower-limit-from-always-false/0-opt.wgsl
index 883179d..f53bccb 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-clamp-lower-limit-from-always-false/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-clamp-lower-limit-from-always-false/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-clamp-vector-component-condition-using-matrix/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-clamp-vector-component-condition-using-matrix/0-opt.wgsl
index 667c5e6..6251946 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-clamp-vector-component-condition-using-matrix/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-clamp-vector-component-condition-using-matrix/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 5>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-clamp-vector-element-ceil-negative/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-clamp-vector-element-ceil-negative/0-opt.wgsl
index bc87bc8..e0b9928 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-clamp-vector-element-ceil-negative/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-clamp-vector-element-ceil-negative/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-clamp-vector-variable-negative-offset/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-clamp-vector-variable-negative-offset/0-opt.wgsl
index fa52af1..dc68ea4 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-clamp-vector-variable-negative-offset/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-clamp-vector-variable-negative-offset/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-clear-yz-inside-condition/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-clear-yz-inside-condition/0-opt.wgsl
index edebd91..8d15f49 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-clear-yz-inside-condition/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-clear-yz-inside-condition/0-opt.wgsl
@@ -1,11 +1,9 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
-[[block]]
 struct buf1 {
   zero : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl
index 771813e..7094098 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl
@@ -1,25 +1,21 @@
 type Arr = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf2 {
   x_GLF_uniform_int_values : Arr_1;
 };
 
-[[block]]
 struct buf3 {
   three : i32;
 };
 
 type Arr_2 = [[stride(16)]] array<u32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_uint_values : Arr_2;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-color-overwrite-identity-matrix-multiply/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-color-overwrite-identity-matrix-multiply/0.wgsl
index 4b6e9c8..4287868 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-color-overwrite-identity-matrix-multiply/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-color-overwrite-identity-matrix-multiply/0.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<f32, 5>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.wgsl
index 5cf4af4..5049fc2 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-combine-and-or-xor-gt-lt/0-opt.wgsl
@@ -1,11 +1,9 @@
-[[block]]
 struct buf1 {
   v1 : vec2<f32>;
 };
 
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-condition-loop-index-bitwise-not/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-condition-loop-index-bitwise-not/0-opt.wgsl
index 0900dc7..8cc5601 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-condition-loop-index-bitwise-not/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-condition-loop-index-bitwise-not/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.wgsl
index aa0d3ab..3860701 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-conditional-discard-inside-loop/0-opt.wgsl
@@ -1,18 +1,15 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
-[[block]]
 struct buf2 {
   injectionSwitch : vec2<f32>;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-ceil-vec4/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-ceil-vec4/0-opt.wgsl
index cb4aa38..279f432 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-ceil-vec4/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-ceil-vec4/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   quarter : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-min/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-min/0-opt.wgsl
index ad25a06..c3e6f5d 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-min/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-min/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   zero : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-vs-original/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-vs-original/0-opt.wgsl
index 5b41038..45f886f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-vs-original/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-vs-original/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp/0-opt.wgsl
index 4969baa..b2ed065 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   fourtytwo : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-gte-const-first/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-gte-const-first/0.wgsl
index 12d7ca4..78b9651 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-gte-const-first/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-gte-const-first/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-min-as-loop-range/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-min-as-loop-range/0-opt.wgsl
index 1ba10ec..bab28c3 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-min-as-loop-range/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-min-as-loop-range/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   zero : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl
index 020e0e9..919120b 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-pow-large-exp/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-pow-large-exp/0-opt.wgsl
index 5f17cf5..9bdf93e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-pow-large-exp/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-pow-large-exp/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-same-condition/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-same-condition/0-opt.wgsl
index c41a337..92d63c5 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-same-condition/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-same-condition/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.wgsl
index 39460bf..f14b530 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-sinh-inf/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-constants-combine-add-sub/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-constants-combine-add-sub/0-opt.wgsl
index e697708..0fdf48f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-constants-combine-add-sub/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-constants-combine-add-sub/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 5>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-constants-mix-uniform/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-constants-mix-uniform/0-opt.wgsl
index 04be2cd..9853546 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-constants-mix-uniform/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-constants-mix-uniform/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-continue-break-discard-return-in-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-continue-break-discard-return-in-loop/0-opt.wgsl
index 8e2cdde..3af5bf9 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-continue-break-discard-return-in-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-continue-break-discard-return-in-loop/0-opt.wgsl
@@ -1,11 +1,9 @@
 type Arr = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
-[[block]]
 struct buf1 {
   zero : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-copy-prop-arrays-func-argument/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-copy-prop-arrays-func-argument/0-opt.wgsl
index c3fe68b..91ec687 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-copy-prop-arrays-func-argument/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-copy-prop-arrays-func-argument/0-opt.wgsl
@@ -2,7 +2,6 @@
   values : array<i32, 2>;
 };
 
-[[block]]
 struct buf0 {
   zero : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-copy-prop-arrays-no-stores/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-copy-prop-arrays-no-stores/0-opt.wgsl
index 6e13d32..be4b0ae 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-copy-prop-arrays-no-stores/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-copy-prop-arrays-no-stores/0-opt.wgsl
@@ -2,7 +2,6 @@
   values : array<i32, 2>;
 };
 
-[[block]]
 struct buf0 {
   zero : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-copy-prop-arrays-param-uniform/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-copy-prop-arrays-param-uniform/0-opt.wgsl
index 29debc5..1604234 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-copy-prop-arrays-param-uniform/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-copy-prop-arrays-param-uniform/0-opt.wgsl
@@ -2,7 +2,6 @@
   values : array<i32, 2>;
 };
 
-[[block]]
 struct buf0 {
   zero : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-cosh-clamped-to-one/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-cosh-clamped-to-one/0-opt.wgsl
index b0081f2..56180ef 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-cosh-clamped-to-one/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-cosh-clamped-to-one/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 1>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-cumulate-loops-unreachable/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-cumulate-loops-unreachable/0-opt.wgsl
index 723c264..a5bfcb9 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-cumulate-loops-unreachable/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-cumulate-loops-unreachable/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 5>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-clamp-undefined-access-array/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-clamp-undefined-access-array/0-opt.wgsl
index f6f65a6..645096c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-clamp-undefined-access-array/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-clamp-undefined-access-array/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-combine-casts-legalize-vector-types-xyz-swizzle-for-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-combine-casts-legalize-vector-types-xyz-swizzle-for-loop/0-opt.wgsl
index f495ad7..5c74b32 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-combine-casts-legalize-vector-types-xyz-swizzle-for-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-combine-casts-legalize-vector-types-xyz-swizzle-for-loop/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-glf_color/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-glf_color/0-opt.wgsl
index f0938fc..1a131cd 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-glf_color/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-glf_color/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-increment-color/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-increment-color/0-opt.wgsl
index 3598a77..06ea4a2 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-increment-color/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-increment-color/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<f32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl
index e594013..eadf964 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-neg-div-pow2/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-neg-div-pow2/0-opt.wgsl
index 7a99cd9..1a4e159 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-neg-div-pow2/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-neg-div-pow2/0-opt.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct buf1 {
   ten : i32;
 };
 
-[[block]]
 struct buf0 {
   minusEight : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-same-cond-nested/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-same-cond-nested/0-opt.wgsl
index b06321e..d6f28e9 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-same-cond-nested/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-same-cond-nested/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-dead-code-unreachable-merge/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-dead-code-unreachable-merge/0-opt.wgsl
index f6836ba..46da53a 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-dead-code-unreachable-merge/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-dead-code-unreachable-merge/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl
index d3e05f8..e1e2a9e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl
@@ -1,18 +1,15 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
 
-[[block]]
 struct buf2 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-descending-loop-min-max-always-zero/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-descending-loop-min-max-always-zero/0-opt.wgsl
index 973feb9..0155704 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-descending-loop-min-max-always-zero/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-descending-loop-min-max-always-zero/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-double-if-true-in-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-double-if-true-in-loop/0-opt.wgsl
index cb4c4d4..b93b128 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-double-if-true-in-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-double-if-true-in-loop/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-empty-loop-minus-one-modulo-variable-one/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-empty-loop-minus-one-modulo-variable-one/0-opt.wgsl
index 6a47f1c..690c3dd 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-empty-loop-minus-one-modulo-variable-one/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-empty-loop-minus-one-modulo-variable-one/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-float-array-init-pow/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-float-array-init-pow/0-opt.wgsl
index 0c41106..28e53df 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-float-array-init-pow/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-float-array-init-pow/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fold-and-in-for-loop-range/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-fold-and-in-for-loop-range/0-opt.wgsl
index b8c3805..35a6b62 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fold-and-in-for-loop-range/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fold-and-in-for-loop-range/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fold-bitwise-and-zero/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-fold-bitwise-and-zero/0.wgsl
index f8191eb..57dfb87 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fold-bitwise-and-zero/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fold-bitwise-and-zero/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fold-bitwise-or-full-mask/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-fold-bitwise-or-full-mask/0.wgsl
index 6af6f72..76cdd76 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fold-bitwise-or-full-mask/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fold-bitwise-or-full-mask/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fold-negate-min-int-value/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-fold-negate-min-int-value/0-opt.wgsl
index ae8dd8b..10c8137 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fold-negate-min-int-value/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fold-negate-min-int-value/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   minusOne : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fold-shift-gte32/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-fold-shift-gte32/0.wgsl
index ec6d634..9e985c7 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fold-shift-gte32/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fold-shift-gte32/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : u32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-clamp-cmp-const-first/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-clamp-cmp-const-first/0-opt.wgsl
index 8478100..6795d45 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-clamp-cmp-const-first/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-clamp-cmp-const-first/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-merge-add-sub-uniform/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-merge-add-sub-uniform/0-opt.wgsl
index ed61556..485238c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-merge-add-sub-uniform/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-merge-add-sub-uniform/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-construct-extract/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-construct-extract/0-opt.wgsl
index dc6b0c4..eb49629 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-construct-extract/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-construct-extract/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   twoandthree : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-dot-extract/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-dot-extract/0-opt.wgsl
index da33dc4..017d331 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-dot-extract/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-dot-extract/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   three : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-dot-no-extract/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-dot-no-extract/0.wgsl
index b9c222e..c832a10 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-dot-no-extract/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-dot-no-extract/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   three : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-div-mul/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-div-mul/0-opt.wgsl
index 5b77b48..eb97819 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-div-mul/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-div-mul/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-divs/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-divs/0-opt.wgsl
index 8900821..82d53fc 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-divs/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-divs/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   four : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-mul-div/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-mul-div/0-opt.wgsl
index fd79096..738c840 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-mul-div/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-mul-div/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-var-sub/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-var-sub/0-opt.wgsl
index b7d98c8..1bba57f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-var-sub/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-var-sub/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   five : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-mix-uniform-weight/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-mix-uniform-weight/0-opt.wgsl
index 39b846d..1315b97 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-mix-uniform-weight/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-mix-uniform-weight/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-negate-div/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-negate-div/0-opt.wgsl
index 31222ff..a762a7d 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-negate-div/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-negate-div/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   four : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-negate-sub/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-negate-sub/0-opt.wgsl
index 73f36ea..edfae00 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-negate-sub/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-negate-sub/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-redundant-mix/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-redundant-mix/0-opt.wgsl
index fcf7c4a..5938fe4 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-redundant-mix/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-redundant-mix/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl
index 790f1a1..bbb0ca6 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl
index 8168671..49c9205 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   threeandfour : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-vec-mix-uniform/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-vec-mix-uniform/0-opt.wgsl
index d0d096b..bca2411 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-vec-mix-uniform/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-vec-mix-uniform/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   zeroOne : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-for-array-initializing-modulo/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-for-array-initializing-modulo/0-opt.wgsl
index d60c969..c13349f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-for-array-initializing-modulo/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-for-array-initializing-modulo/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-for-loop-min-increment-array-element/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-for-loop-min-increment-array-element/0-opt.wgsl
index acc05e5..c5585de 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-for-loop-min-increment-array-element/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-for-loop-min-increment-array-element/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-for-switch-fallthrough/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-for-switch-fallthrough/0-opt.wgsl
index 5bce8a9..af6ec42 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-for-switch-fallthrough/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-for-switch-fallthrough/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl
index 4f8be8c..05228f7 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl
index 14326d3..a1ab4e0 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fragcoord-bitwise-not/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-fragcoord-bitwise-not/0-opt.wgsl
index b258d3f..9d5718a 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fragcoord-bitwise-not/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fragcoord-bitwise-not/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fragcoord-clamp-array-access/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-fragcoord-clamp-array-access/0-opt.wgsl
index 5e2efc9..0ea6e7d 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fragcoord-clamp-array-access/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fragcoord-clamp-array-access/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fragcoord-multiply/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-fragcoord-multiply/0-opt.wgsl
index 8306f38..baa752e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-fragcoord-multiply/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-fragcoord-multiply/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-function-fragcoord-condition-always-return/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-function-fragcoord-condition-always-return/0-opt.wgsl
index 36f0a6f..0791d46 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-function-fragcoord-condition-always-return/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-function-fragcoord-condition-always-return/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-function-vec2-never-discard/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-function-vec2-never-discard/0-opt.wgsl
index d352923..b695c16 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-function-vec2-never-discard/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-function-vec2-never-discard/0-opt.wgsl
@@ -1,18 +1,15 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
-[[block]]
 struct buf2 {
   zero : f32;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-bound-true-logical-or/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-bound-true-logical-or/0-opt.wgsl
index 1beed3d..9c26d44 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-bound-true-logical-or/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-bound-true-logical-or/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-float-accumulate-matrix/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-float-accumulate-matrix/0-opt.wgsl
index 40aaeca..57432b7 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-float-accumulate-matrix/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-float-accumulate-matrix/0-opt.wgsl
@@ -1,18 +1,15 @@
 type Arr = [[stride(16)]] array<f32, 18>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
 
-[[block]]
 struct buf2 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.wgsl
index 96fb7f7..19d84ed 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-multiply-one-minus/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-multiply-one-minus/0.wgsl
index 038864a..510a02a 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-multiply-one-minus/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-multiply-one-minus/0.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-squared-comparison/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-squared-comparison/0-opt.wgsl
index 27cfa37..231d414 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-squared-comparison/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-squared-comparison/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-if-conversion-identical-branches/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-if-conversion-identical-branches/0-opt.wgsl
index a2c8423..080e3ba 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-if-conversion-identical-branches/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-if-conversion-identical-branches/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   zero : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-if-switch-fallthrough/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-if-switch-fallthrough/0.wgsl
index 8f12c6b..fa50b1e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-if-switch-fallthrough/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-if-switch-fallthrough/0.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-if-true-continue/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-if-true-continue/0-opt.wgsl
index 73577eb..e31894b 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-if-true-continue/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-if-true-continue/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-if-true-discard-in-do-while-never-reached/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-if-true-discard-in-do-while-never-reached/0-opt.wgsl
index 80683f1..ff058e8 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-if-true-discard-in-do-while-never-reached/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-if-true-discard-in-do-while-never-reached/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inc-inside-switch-and-for/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inc-inside-switch-and-for/0-opt.wgsl
index 1a774f6..e18c700 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inc-inside-switch-and-for/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inc-inside-switch-and-for/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   three : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-increment-array-element-in-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-increment-array-element-in-loop/0-opt.wgsl
index dff82e2..9dc640b 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-increment-array-element-in-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-increment-array-element-in-loop/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-increment-float-in-loop-abs/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-increment-float-in-loop-abs/0-opt.wgsl
index 0fc1914..d9a10ba 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-increment-float-in-loop-abs/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-increment-float-in-loop-abs/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-increment-global-counter-loop-function/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-increment-global-counter-loop-function/0-opt.wgsl
index bb1a4df..d16fa14 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-increment-global-counter-loop-function/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-increment-global-counter-loop-function/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-increment-inside-clamp/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-increment-inside-clamp/0-opt.wgsl
index f70aa97..5f11cde 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-increment-inside-clamp/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-increment-inside-clamp/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-increment-int-loop-counter-mod-array/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-increment-int-loop-counter-mod-array/0-opt.wgsl
index 486246c..0bb69b8 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-increment-int-loop-counter-mod-array/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-increment-int-loop-counter-mod-array/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 5>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.wgsl
index 5a769f4..a1adef2 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 5>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-increment-vector-array-matrix-element/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-increment-vector-array-matrix-element/0-opt.wgsl
index 302eb53..5a5096d 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-increment-vector-array-matrix-element/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-increment-vector-array-matrix-element/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-increment-vector-component-with-matrix-copy/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-increment-vector-component-with-matrix-copy/0-opt.wgsl
index ff8e0f0..02f7508 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-increment-vector-component-with-matrix-copy/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-increment-vector-component-with-matrix-copy/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inline-pass-nested-loops/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inline-pass-nested-loops/0-opt.wgsl
index c24e92c..ab1fd10 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inline-pass-nested-loops/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inline-pass-nested-loops/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   zero : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-increase-negative/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-increase-negative/0-opt.wgsl
index afe4b0e..95eb9e4 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-increase-negative/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-increase-negative/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-ldexp/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-ldexp/0-opt.wgsl
index bb8ec9b..de17bea 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-ldexp/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-ldexp/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-neg-func-arg/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-neg-func-arg/0-opt.wgsl
index a15e3bc..46580ae 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-neg-func-arg/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-neg-func-arg/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 5>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-pre-increase/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-pre-increase/0-opt.wgsl
index 4135af8..10bc47e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-pre-increase/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-add-sub-pre-increase/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl
index 281628c..d0f8b62 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-switch/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-switch/0-opt.wgsl
index c70fd11..3e90ab3 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-switch/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-switch/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 5>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-xor-add/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-xor-add/0-opt.wgsl
index e5869f4..8b9be4e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-xor-add/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-xor-add/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-isnan/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-isnan/0-opt.wgsl
index 9ee635e..41a1c55 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-isnan/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-isnan/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ldexp/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ldexp/0-opt.wgsl
index e029395..a691939 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ldexp/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ldexp/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-pre-increment-clamp/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-pre-increment-clamp/0-opt.wgsl
index 1a497da..5e268e0 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-pre-increment-clamp/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-pre-increment-clamp/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ternary-vector-access/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ternary-vector-access/0-opt.wgsl
index 2e2a9f1..4cc9cf8 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ternary-vector-access/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-ternary-vector-access/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-while-modulo/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-while-modulo/0-opt.wgsl
index 7198d38..ed48840 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-while-modulo/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-compares-while-modulo/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.wgsl
index a6defc7..585c193 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl
index 47774e7..2b819ba 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 7>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-left-shift-for/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-left-shift-for/0-opt.wgsl
index ad9faee..eae85ef 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-left-shift-for/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-left-shift-for/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl
index 591926d..628a5ec 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl
index c893e13..c18fcc8 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl
index ebc5637..c423f55 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-switch-or-xor/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-switch-or-xor/0-opt.wgsl
index 22c3ac0..7b441cf 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-switch-or-xor/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-switch-or-xor/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-vector-ops-asin/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-vector-ops-asin/0-opt.wgsl
index d9201c6..58bf348 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-vector-ops-asin/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-vector-ops-asin/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl
index 239caf2..3591994 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-bit-shifting/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-bit-shifting/0-opt.wgsl
index 32e102d..2c3b18f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-bit-shifting/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-bit-shifting/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inclusive-or/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inclusive-or/0-opt.wgsl
index 1210250..ebf9237 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inclusive-or/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inclusive-or/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inst-combine-calls-for-compare-function-call-result/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inst-combine-calls-for-compare-function-call-result/0-opt.wgsl
index 37cab95..6b0ffef 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inst-combine-calls-for-compare-function-call-result/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-inst-combine-calls-for-compare-function-call-result/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 12>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl
index b317f98..dbbbe2b 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl
index bf323a2..e3df98e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-sqrt/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-sqrt/0.wgsl
index 0deb2a8..43f4562 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-sqrt/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-sqrt/0.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.wgsl
index dedf3c2..fb49913 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-instructions-first-value-phi/0-opt.wgsl
@@ -2,14 +2,12 @@
   data : i32;
 };
 
-[[block]]
 struct buf1 {
   v1 : vec2<f32>;
 };
 
 type Arr = [[stride(16)]] array<i32, 5>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-instructions-for-if-less-than-equal/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-instructions-for-if-less-than-equal/0-opt.wgsl
index 5aa01a6..0590a0e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-instructions-for-if-less-than-equal/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-instructions-for-if-less-than-equal/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-int-div-round-to-zero/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-int-div-round-to-zero/0-opt.wgsl
index c5c24bf..b584e24 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-int-div-round-to-zero/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-int-div-round-to-zero/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-int-full-bits-divide-by-two-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-int-full-bits-divide-by-two-loop/0-opt.wgsl
index 15a377c..ab9a5fd 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-int-full-bits-divide-by-two-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-int-full-bits-divide-by-two-loop/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-integer-modulo-negative/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-integer-modulo-negative/0-opt.wgsl
index c94e6de..054f760 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-integer-modulo-negative/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-integer-modulo-negative/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-ldexp-undefined-mat-vec-multiply/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-ldexp-undefined-mat-vec-multiply/0.wgsl
index 83090a7..a317457 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-ldexp-undefined-mat-vec-multiply/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-ldexp-undefined-mat-vec-multiply/0.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-left-shift-array-access/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-left-shift-array-access/0-opt.wgsl
index a39da82..cf4338c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-left-shift-array-access/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-left-shift-array-access/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-left-shift-right-shift-compare/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-left-shift-right-shift-compare/0.wgsl
index 7ccdb81..6029823 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-left-shift-right-shift-compare/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-left-shift-right-shift-compare/0.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-abs-multiply-offset/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-abs-multiply-offset/0-opt.wgsl
index 098a4c9..c13d80f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-loop-abs-multiply-offset/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-abs-multiply-offset/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-break-floor-nan-never-executed/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-break-floor-nan-never-executed/0-opt.wgsl
index 8de51a9..4c1cc2e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-loop-break-floor-nan-never-executed/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-break-floor-nan-never-executed/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-clamp-to-one-empty-condition/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-clamp-to-one-empty-condition/0-opt.wgsl
index f074ac2..8f286a3 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-loop-clamp-to-one-empty-condition/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-clamp-to-one-empty-condition/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.wgsl
index 3e3cb21..3dc9b8f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 6>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl
index 52eb93c..4f881f0 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.wgsl
index b9b8a36..d17d686 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-or-divide-by-loop-index/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-or-divide-by-loop-index/0-opt.wgsl
index 5615de9..6bee0d7 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-or-divide-by-loop-index/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-or-divide-by-loop-index/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-integer-half-minus-one/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-integer-half-minus-one/0-opt.wgsl
index 5a6c993..61e176c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-loop-integer-half-minus-one/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-integer-half-minus-one/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-logical-xor/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-logical-xor/0-opt.wgsl
index a11c846..fbaf576 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-loop-logical-xor/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-logical-xor/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-returns-behind-true-and-false/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-returns-behind-true-and-false/0-opt.wgsl
index 7b901c6..5d36dbd 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-loop-returns-behind-true-and-false/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-returns-behind-true-and-false/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-with-two-integers/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-with-two-integers/0-opt.wgsl
index 9bd8ed5..3edff4c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-loop-with-two-integers/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-with-two-integers/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-machine-basic-block-for-for-for-less-than/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-machine-basic-block-for-for-for-less-than/0-opt.wgsl
index b603ec3..b2a62e1 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-machine-basic-block-for-for-for-less-than/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-machine-basic-block-for-for-for-less-than/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 6>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-machine-scheduler-for-if-pow/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-machine-scheduler-for-if-pow/0-opt.wgsl
index c2a6296..f9b028d 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-machine-scheduler-for-if-pow/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-machine-scheduler-for-if-pow/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-machinevaluetype-one-iter-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-machinevaluetype-one-iter-loop/0-opt.wgsl
index 238c476..633587b 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-machinevaluetype-one-iter-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-machinevaluetype-one-iter-loop/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-matching-conditions-break/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-matching-conditions-break/0-opt.wgsl
index 1eebdd9..97d05ee 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-matching-conditions-break/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-matching-conditions-break/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-matching-if-always-true-inside-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-matching-if-always-true-inside-loop/0-opt.wgsl
index 9e7764a..bacb0e9 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-matching-if-always-true-inside-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-matching-if-always-true-inside-loop/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 5>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.wgsl
index 510e118..745d306 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-matrix-square-mul-with-vector/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-matrix-square-mul-with-vector/0-opt.wgsl
index eff2ddf..7556722 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-matrix-square-mul-with-vector/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-matrix-square-mul-with-vector/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-max-clamp-same-minval/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-max-clamp-same-minval/0-opt.wgsl
index ae45234..6847d17 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-max-clamp-same-minval/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-max-clamp-same-minval/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-max-min-less-than/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-max-min-less-than/0-opt.wgsl
index 24c7553..4168f03 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-max-min-less-than/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-max-min-less-than/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-mem-pass-sum-struct-members/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-mem-pass-sum-struct-members/0-opt.wgsl
index d664615..7987ab9 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-mem-pass-sum-struct-members/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-mem-pass-sum-struct-members/0-opt.wgsl
@@ -4,7 +4,6 @@
   c : i32;
 };
 
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-mem-pass-unused-component/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-mem-pass-unused-component/0-opt.wgsl
index f09a1ff..9c1a3af 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-mem-pass-unused-component/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-mem-pass-unused-component/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   two : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-merge-return-condition-twice/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-merge-return-condition-twice/0-opt.wgsl
index 6a9c3b7..a30ca1f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-merge-return-condition-twice/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-merge-return-condition-twice/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   three : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-min-intbitstofloat-undefined-never-used/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-min-intbitstofloat-undefined-never-used/0-opt.wgsl
index 089465d..194355f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-min-intbitstofloat-undefined-never-used/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-min-intbitstofloat-undefined-never-used/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl
index 3db210a..0eacd57 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl
@@ -1,11 +1,9 @@
-[[block]]
 struct buf1 {
   one : u32;
 };
 
 type Arr = [[stride(16)]] array<i32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl
index 8f1d936..ee397ee 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-modulo-zero-never-executed/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-modulo-zero-never-executed/0-opt.wgsl
index 5204e88..45050a1 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-modulo-zero-never-executed/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-modulo-zero-never-executed/0-opt.wgsl
@@ -1,20 +1,17 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf2 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
 
 type Arr_2 = [[stride(16)]] array<u32, 1>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_uint_values : Arr_2;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.wgsl
index 7e9de86..85ab856 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.wgsl
@@ -1,18 +1,15 @@
-[[block]]
 struct buf2 {
   one : f32;
 };
 
 type Arr = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-nested-loop-undefined-smoothstep-never-executed/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-nested-loop-undefined-smoothstep-never-executed/0-opt.wgsl
index e3aa195..888c7e3 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-nested-loop-undefined-smoothstep-never-executed/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-nested-loop-undefined-smoothstep-never-executed/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.wgsl
index ed88017..6961cb2 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-nested-loops-global-loop-counter-do-while-accumulate-float/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-nir-array-access/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-nir-array-access/0-opt.wgsl
index 464bdec..3542b4b 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-nir-array-access/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-nir-array-access/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 19>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-nir-opt-large-constants-for-clamp-vector-access/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-nir-opt-large-constants-for-clamp-vector-access/0-opt.wgsl
index 856399f..014de3f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-nir-opt-large-constants-for-clamp-vector-access/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-nir-opt-large-constants-for-clamp-vector-access/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-nir-opt-loop-unroll-if-if-if-if-do-while/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-nir-opt-loop-unroll-if-if-if-if-do-while/0-opt.wgsl
index 84258b8..8033cb9 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-nir-opt-loop-unroll-if-if-if-if-do-while/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-nir-opt-loop-unroll-if-if-if-if-do-while/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-not-clamp-matrix-access/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-not-clamp-matrix-access/0-opt.wgsl
index a1de151..c83f471 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-not-clamp-matrix-access/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-not-clamp-matrix-access/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 5>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-one-minus-clamp-always-one-cast-to-int/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-one-minus-clamp-always-one-cast-to-int/0-opt.wgsl
index fd31b1f..045939d 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-one-minus-clamp-always-one-cast-to-int/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-one-minus-clamp-always-one-cast-to-int/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for-for-do-while-if-if/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for-for-do-while-if-if/0-opt.wgsl
index 9373467..40c7d3e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for-for-do-while-if-if/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for-for-do-while-if-if/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for/0-opt.wgsl
index 6a32b2d..07eb0ab 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-optimize-phis-for/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl
index 5220a98..25ac138 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-pattern-match-signum/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-pattern-match-signum/0-opt.wgsl
index 06c350a..967e25d 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-pattern-match-signum/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-pattern-match-signum/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-pattern-match-single-bit/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-pattern-match-single-bit/0.wgsl
index 5354413..23deeb0 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-pattern-match-single-bit/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-pattern-match-single-bit/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   three : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-peephole-optimizer-target-instr-info-for-if-if-if/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-peephole-optimizer-target-instr-info-for-if-if-if/0-opt.wgsl
index 70772f9..9526fa4 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-peephole-optimizer-target-instr-info-for-if-if-if/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-peephole-optimizer-target-instr-info-for-if-if-if/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-pow-identical-value-sqrt/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-pow-identical-value-sqrt/0-opt.wgsl
index 39bc587..45a9af8 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-pow-identical-value-sqrt/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-pow-identical-value-sqrt/0-opt.wgsl
@@ -1,18 +1,15 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
-[[block]]
 struct buf2 {
   one : f32;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined-result-condition-with-always-true/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined-result-condition-with-always-true/0-opt.wgsl
index b378e4c..ed5b89a 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined-result-condition-with-always-true/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined-result-condition-with-always-true/0-opt.wgsl
@@ -1,18 +1,15 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
-[[block]]
 struct buf2 {
   zero : i32;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.wgsl
index 4be05e5..7418f6e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-rcp-negative-int/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-rcp-negative-int/0-opt.wgsl
index 39a800e..c40a4c6 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-rcp-negative-int/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-rcp-negative-int/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-reciprocal-var-minus-one/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-reciprocal-var-minus-one/0-opt.wgsl
index 6c4550f..04d4193 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-reciprocal-var-minus-one/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-reciprocal-var-minus-one/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.wgsl
index d5ebd09..dad9c78 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   zero : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-replace-extract/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-replace-extract/0-opt.wgsl
index 779fafc..9d610146 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-replace-extract/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-replace-extract/0-opt.wgsl
@@ -3,7 +3,6 @@
   y : i32;
 };
 
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-register-coalescer-live-intervals-target-instr-info-for-discard-for-discard/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-register-coalescer-live-intervals-target-instr-info-for-discard-for-discard/0-opt.wgsl
index a5fd0d0..8e1fa65 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-register-coalescer-live-intervals-target-instr-info-for-discard-for-discard/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-register-coalescer-live-intervals-target-instr-info-for-discard-for-discard/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.wgsl
index 3ad4f9b..149bcab 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-replace-copy-object/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-replace-copy-object/0-opt.wgsl
index 3eef414..708e046 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-replace-copy-object/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-replace-copy-object/0-opt.wgsl
@@ -2,7 +2,6 @@
   data : i32;
 };
 
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-return-after-do-while/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-return-after-do-while/0-opt.wgsl
index 3471958..d902f3f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-return-after-do-while/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-return-after-do-while/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.wgsl
index 444e50a..5fbcdd9 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-return-after-first-iteration/0-opt.wgsl
@@ -1,18 +1,15 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
 
-[[block]]
 struct buf2 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-return-partly-undefined-vector-from-array/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-return-partly-undefined-vector-from-array/0-opt.wgsl
index 6a66f39..4f29ab6 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-return-partly-undefined-vector-from-array/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-return-partly-undefined-vector-from-array/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-scaled-number-nested-loops-array-access/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-scaled-number-nested-loops-array-access/0-opt.wgsl
index 3235625..97c49ab 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-scaled-number-nested-loops-array-access/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-scaled-number-nested-loops-array-access/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 7>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-scaled-number-nested-loops/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-scaled-number-nested-loops/0-opt.wgsl
index 66f0852..3e5c910 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-scaled-number-nested-loops/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-scaled-number-nested-loops/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-schedule-dag-rrlist-mix-log-cos/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-schedule-dag-rrlist-mix-log-cos/0-opt.wgsl
index b6b2e8d..2794ec5 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-schedule-dag-rrlist-mix-log-cos/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-schedule-dag-rrlist-mix-log-cos/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<f32, 5>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-assign-back-and-forth/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-assign-back-and-forth/0-opt.wgsl
index 501fd60..d74e3c2 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-assign-back-and-forth/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-assign-back-and-forth/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-inverse-clamp/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-inverse-clamp/0-opt.wgsl
index 97a2a50..b2a778b 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-inverse-clamp/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-inverse-clamp/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.wgsl
index 61503b5..27faee3 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-lt-gt/0-opt.wgsl
@@ -1,11 +1,9 @@
-[[block]]
 struct buf1 {
   v1 : vec2<f32>;
 };
 
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-same-cond-twice/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-same-cond-twice/0-opt.wgsl
index cc257f4..b48fce6 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-same-cond-twice/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-selection-dag-same-cond-twice/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-set-output-color-function-call-nested-loop/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-set-output-color-function-call-nested-loop/0.wgsl
index 295609c..8b99a56 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-set-output-color-function-call-nested-loop/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-set-output-color-function-call-nested-loop/0.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 6>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-set-vector-cos-fragcoord/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-set-vector-cos-fragcoord/0-opt.wgsl
index 017a1d9..75a7f4c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-set-vector-cos-fragcoord/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-set-vector-cos-fragcoord/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplification-unused-struct/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-simplification-unused-struct/0-opt.wgsl
index ddc01d1..30873ed 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplification-unused-struct/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplification-unused-struct/0-opt.wgsl
@@ -2,7 +2,6 @@
   arr : array<i32, 2>;
 };
 
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplification-while-inside-for/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-simplification-while-inside-for/0-opt.wgsl
index 19c0780..47c21ce 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplification-while-inside-for/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplification-while-inside-for/0-opt.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct buf0 {
   one : i32;
 };
 
-[[block]]
 struct buf1 {
   zero : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-clamp-max-itself/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-clamp-max-itself/0-opt.wgsl
index 7e6bd6d..3fd60e5 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-clamp-max-itself/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-clamp-max-itself/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   sequence : vec4<i32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-combine-compares-max-max-one/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-combine-compares-max-max-one/0-opt.wgsl
index c54d32c..4480579 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-combine-compares-max-max-one/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-combine-compares-max-max-one/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-component-uniform-idx/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-component-uniform-idx/0-opt.wgsl
index a3a1f46..36eceec 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-component-uniform-idx/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-component-uniform-idx/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   two : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-div-by-uint-one/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-div-by-uint-one/0-opt.wgsl
index 50c6355..99296b4 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-div-by-uint-one/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-div-by-uint-one/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   two : u32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-for-bitwise-condition/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-for-bitwise-condition/0-opt.wgsl
index 0f3c2eb..98b5b4c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-for-bitwise-condition/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-for-bitwise-condition/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-ldexp-exponent-zero/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-ldexp-exponent-zero/0-opt.wgsl
index b5a9b3b..66ce6c9 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-ldexp-exponent-zero/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-ldexp-exponent-zero/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   three : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-max-multiplied-values/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-max-multiplied-values/0-opt.wgsl
index f4af7a1..2336efa 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-max-multiplied-values/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-max-multiplied-values/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 5>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl
index 2690c8d..2ac7c5e 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 1>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-mul-identity/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-mul-identity/0-opt.wgsl
index acefefb..a54df57 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-mul-identity/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-mul-identity/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-not-less-than-neg/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-not-less-than-neg/0.wgsl
index 6bdc812..8395eda 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-not-less-than-neg/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-not-less-than-neg/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   three : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-right-shift-greater-than-zero/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-right-shift-greater-than-zero/0-opt.wgsl
index 24991ca..318f16a 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-right-shift-greater-than-zero/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-right-shift-greater-than-zero/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-sign-cosh/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-sign-cosh/0.wgsl
index b37e8cf..a903014 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-sign-cosh/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-sign-cosh/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-smoothstep-undef/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-smoothstep-undef/0-opt.wgsl
index 6638485..2b24d07 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-smoothstep-undef/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-smoothstep-undef/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   zero : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-sin-mul-mat-mat-mul-vec-mat/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-sin-mul-mat-mat-mul-vec-mat/0-opt.wgsl
index c0a7f76..a3418a9 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-sin-mul-mat-mat-mul-vec-mat/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-sin-mul-mat-mat-mul-vec-mat/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-single-block-elim-self-assign/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-single-block-elim-self-assign/0-opt.wgsl
index 8a01eaa..2e51071 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-single-block-elim-self-assign/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-single-block-elim-self-assign/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-sinh-ldexp/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-sinh-ldexp/0-opt.wgsl
index 6c083f8..0814ab2 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-sinh-ldexp/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-sinh-ldexp/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-ssa-rewrite-case-with-default/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-ssa-rewrite-case-with-default/0-opt.wgsl
index 1f005a5..cc2ab67 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-ssa-rewrite-case-with-default/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-ssa-rewrite-case-with-default/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.wgsl
index 57db954..ba81461 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-struct-float-array-mix-uniform-vectors/0-opt.wgsl
@@ -4,24 +4,20 @@
 
 type Arr = [[stride(16)]] array<f32, 5>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
-[[block]]
 struct buf2 {
   zeroVec : vec2<f32>;
 };
 
-[[block]]
 struct buf3 {
   oneVec : vec2<f32>;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.wgsl
index 9b46e47..5174f36 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-sum-uniform-vector-components-round/0-opt.wgsl
@@ -1,18 +1,15 @@
 type Arr = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
-[[block]]
 struct buf2 {
   resolution : vec2<f32>;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-for-for-for/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-for-for-for/0-opt.wgsl
index 69896d9..0397e5b 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-for-for-for/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-for-for-for/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-infinite-loops/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-infinite-loops/0-opt.wgsl
index 4b28ce8..210236b 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-infinite-loops/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-tail-duplicator-infinite-loops/0-opt.wgsl
@@ -1,18 +1,15 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
-[[block]]
 struct buf2 {
   zero : f32;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.wgsl
index 7165a35..c1757e6 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   two : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.wgsl
index 68f76e2..0ee891d 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-inst-combine-compares-struct-array-clamp-function-cal/0-opt.wgsl
@@ -2,14 +2,12 @@
   data : i32;
 };
 
-[[block]]
 struct buf1 {
   v1 : vec2<f32>;
 };
 
 type Arr = [[stride(16)]] array<i32, 5>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl
index bba3d95..d2a1597 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-types-return-in-main-never-hit/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-types-return-in-main-never-hit/0-opt.wgsl
index a354d57..cb2e891 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-types-return-in-main-never-hit/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-types-return-in-main-never-hit/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.wgsl
index 1e71e59..97b93bc 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-undefined-inversesqrt-reflect/0-opt.wgsl
@@ -1,11 +1,9 @@
 type Arr = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr;
 };
 
-[[block]]
 struct buf1 {
   v1 : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-uninitialized-values-passed-to-function-never-executed/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-uninitialized-values-passed-to-function-never-executed/0-opt.wgsl
index b1a8e78..8691174 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-uninitialized-values-passed-to-function-never-executed/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-uninitialized-values-passed-to-function-never-executed/0-opt.wgsl
@@ -4,7 +4,6 @@
 
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl
index b44947b..ce444a3 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl
@@ -1,20 +1,17 @@
 type Arr = [[stride(16)]] array<u32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_uint_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr_1;
 };
 
 type Arr_2 = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf2 {
   x_GLF_uniform_float_values : Arr_2;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl
index 7c1756e..b2e8650 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.wgsl
index cd04198..f99a3bc 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-val-cfg-case-fallthrough/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-val-cfg-case-fallthrough/0-opt.wgsl
index 7ac234c..4aa9d43 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-val-cfg-case-fallthrough/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-val-cfg-case-fallthrough/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-value-inst-combine-select-value-tracking-flip-bits/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-value-inst-combine-select-value-tracking-flip-bits/0-opt.wgsl
index c17f0bb..00262c5 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-value-inst-combine-select-value-tracking-flip-bits/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-value-inst-combine-select-value-tracking-flip-bits/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-apint-inst-combine-simplify-one-mod-loop-iterator/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-apint-inst-combine-simplify-one-mod-loop-iterator/0-opt.wgsl
index d11bb08..4c3b34b 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-apint-inst-combine-simplify-one-mod-loop-iterator/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-apint-inst-combine-simplify-one-mod-loop-iterator/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-inclusive-or/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-inclusive-or/0-opt.wgsl
index 5aa3bbe..36afb2f 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-inclusive-or/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-inclusive-or/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   two : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-known-nonzero/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-known-nonzero/0-opt.wgsl
index c8d8ccc..c80f332 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-known-nonzero/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-known-nonzero/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-max-uintbitstofloat/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-max-uintbitstofloat/0-opt.wgsl
index 0bf1020..240d9d9 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-max-uintbitstofloat/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-max-uintbitstofloat/0-opt.wgsl
@@ -1,20 +1,17 @@
 type Arr = [[stride(16)]] array<u32, 1>;
 
-[[block]]
 struct buf2 {
   x_GLF_uniform_uint_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
 
 type Arr_2 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_2;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-selection-dag-negation-clamp-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-selection-dag-negation-clamp-loop/0-opt.wgsl
index 2dc09e0..2c1e642 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-selection-dag-negation-clamp-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-selection-dag-negation-clamp-loop/0-opt.wgsl
@@ -1,6 +1,5 @@
 type Arr = [[stride(16)]] array<i32, 16>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-uniform-incident/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-uniform-incident/0-opt.wgsl
index 40281ef..da47422 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-uniform-incident/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-value-tracking-uniform-incident/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   quarter : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-inc-unused-comp/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-inc-unused-comp/0-opt.wgsl
index ef1ccfe..941df15 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-inc-unused-comp/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-inc-unused-comp/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   zero : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl
index 712a69e..c5a9449 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 3>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-apfloat-nan-cos-cos/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-apfloat-nan-cos-cos/0-opt.wgsl
index 5e5c216..9a7681c 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-apfloat-nan-cos-cos/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-apfloat-nan-cos-cos/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-machine-value-type-uint-to-float/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-machine-value-type-uint-to-float/0-opt.wgsl
index 79c6767..f3f84a4 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-machine-value-type-uint-to-float/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-machine-value-type-uint-to-float/0-opt.wgsl
@@ -1,20 +1,17 @@
 type Arr = [[stride(16)]] array<u32, 2>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_uint_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<f32, 1>;
 
-[[block]]
 struct buf2 {
   x_GLF_uniform_float_values : Arr_1;
 };
 
 type Arr_2 = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_2;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-negative-left-shift/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-negative-left-shift/0-opt.wgsl
index e999646..814eae3 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-negative-left-shift/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-negative-left-shift/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(16)]] array<f32, 3>;
 
-[[block]]
 struct buf1 {
   x_GLF_uniform_float_values : Arr;
 };
 
 type Arr_1 = [[stride(16)]] array<i32, 4>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr_1;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-selection-dag-struct-array-clamp-index/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-selection-dag-struct-array-clamp-index/0-opt.wgsl
index af4102c..8551242 100644
--- a/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-selection-dag-struct-array-clamp-index/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/cov-x86-isel-lowering-selection-dag-struct-array-clamp-index/0-opt.wgsl
@@ -6,7 +6,6 @@
 
 type Arr = [[stride(16)]] array<i32, 2>;
 
-[[block]]
 struct buf0 {
   x_GLF_uniform_int_values : Arr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/create-color-in-do-while-for-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/create-color-in-do-while-for-loop/0-opt.wgsl
index 6d6d467..d154e28 100644
--- a/test/vk-gl-cts/graphicsfuzz/create-color-in-do-while-for-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/create-color-in-do-while-for-loop/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/dead-barriers-in-loops/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/dead-barriers-in-loops/0-opt.wgsl
index 899baac..765114d 100644
--- a/test/vk-gl-cts/graphicsfuzz/dead-barriers-in-loops/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/dead-barriers-in-loops/0-opt.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct theSSBO {
   out_data : i32;
 };
 
-[[block]]
 struct buf1 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/disc-and-add-in-func-in-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/disc-and-add-in-func-in-loop/0-opt.wgsl
index 96cc10e..c416382 100644
--- a/test/vk-gl-cts/graphicsfuzz/disc-and-add-in-func-in-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/disc-and-add-in-func-in-loop/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/discard-continue-return/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/discard-continue-return/0-opt.wgsl
index 2da08c5..549895b 100644
--- a/test/vk-gl-cts/graphicsfuzz/discard-continue-return/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/discard-continue-return/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/discard-in-loop-in-function/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/discard-in-loop-in-function/0-opt.wgsl
index bf03fdc..8ff5ce8 100644
--- a/test/vk-gl-cts/graphicsfuzz/discard-in-loop-in-function/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/discard-in-loop-in-function/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/do-while-if-return/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/do-while-if-return/0-opt.wgsl
index 43fb691..45e2a65 100644
--- a/test/vk-gl-cts/graphicsfuzz/do-while-if-return/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/do-while-if-return/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/early-return-and-barrier/0.wgsl b/test/vk-gl-cts/graphicsfuzz/early-return-and-barrier/0.wgsl
index 7eaea5b..82a7bae 100644
--- a/test/vk-gl-cts/graphicsfuzz/early-return-and-barrier/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/early-return-and-barrier/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct theSSBO {
   out_data : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/flag-always-false-if/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/flag-always-false-if/0-opt.wgsl
index 08be511..c02f2ce 100644
--- a/test/vk-gl-cts/graphicsfuzz/flag-always-false-if/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/flag-always-false-if/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/frag-coord-func-call-and-ifs/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/frag-coord-func-call-and-ifs/0-opt.wgsl
index f94238d..64ef616 100644
--- a/test/vk-gl-cts/graphicsfuzz/frag-coord-func-call-and-ifs/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/frag-coord-func-call-and-ifs/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/function-with-uniform-return/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/function-with-uniform-return/0-opt.wgsl
index ad60ab7..2fffb92 100644
--- a/test/vk-gl-cts/graphicsfuzz/function-with-uniform-return/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/function-with-uniform-return/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/global-array-loops/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/global-array-loops/0-opt.wgsl
index 68df8e3..999c03a 100644
--- a/test/vk-gl-cts/graphicsfuzz/global-array-loops/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/global-array-loops/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/if-and-switch/0.wgsl b/test/vk-gl-cts/graphicsfuzz/if-and-switch/0.wgsl
index 71828f6..7948d49 100644
--- a/test/vk-gl-cts/graphicsfuzz/if-and-switch/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/if-and-switch/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/increment-value-in-nested-for-loop/0.wgsl b/test/vk-gl-cts/graphicsfuzz/increment-value-in-nested-for-loop/0.wgsl
index 7b1d980..944e589 100644
--- a/test/vk-gl-cts/graphicsfuzz/increment-value-in-nested-for-loop/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/increment-value-in-nested-for-loop/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/injection-switch-as-comparison/0.wgsl b/test/vk-gl-cts/graphicsfuzz/injection-switch-as-comparison/0.wgsl
index d594596..8d4edc0 100644
--- a/test/vk-gl-cts/graphicsfuzz/injection-switch-as-comparison/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/injection-switch-as-comparison/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.wgsl
index 26a8a10..2002e51 100644
--- a/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/loops-ifs-continues-call/0.wgsl b/test/vk-gl-cts/graphicsfuzz/loops-ifs-continues-call/0.wgsl
index 9d9f80c..eb27e35 100644
--- a/test/vk-gl-cts/graphicsfuzz/loops-ifs-continues-call/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/loops-ifs-continues-call/0.wgsl
@@ -2,7 +2,6 @@
   prime_numbers : array<i32, 10>;
 };
 
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/max-mix-conditional-discard/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/max-mix-conditional-discard/0-opt.wgsl
index f4bf9c7..03312ac 100644
--- a/test/vk-gl-cts/graphicsfuzz/max-mix-conditional-discard/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/max-mix-conditional-discard/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/nested-for-break-mat-color/0.wgsl b/test/vk-gl-cts/graphicsfuzz/nested-for-break-mat-color/0.wgsl
index b35920e..a1058d6 100644
--- a/test/vk-gl-cts/graphicsfuzz/nested-for-break-mat-color/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/nested-for-break-mat-color/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   one : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/nested-ifs-and-return-in-for-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/nested-ifs-and-return-in-for-loop/0-opt.wgsl
index ac61d8e..515f38a 100644
--- a/test/vk-gl-cts/graphicsfuzz/nested-ifs-and-return-in-for-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/nested-ifs-and-return-in-for-loop/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.wgsl b/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.wgsl
index 31f3f0e..1921a1c 100644
--- a/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/nested-switch-break-discard/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/nested-switch-break-discard/0-opt.wgsl
index 44294d2..ac98e18 100644
--- a/test/vk-gl-cts/graphicsfuzz/nested-switch-break-discard/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/nested-switch-break-discard/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/one-sized-array/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/one-sized-array/0-opt.wgsl
index 62409af..3a6e54e 100644
--- a/test/vk-gl-cts/graphicsfuzz/one-sized-array/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/one-sized-array/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   zero : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/return-float-from-while-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/return-float-from-while-loop/0-opt.wgsl
index fd8fb0e..c9c712e 100644
--- a/test/vk-gl-cts/graphicsfuzz/return-float-from-while-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/return-float-from-while-loop/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/returned-boolean-in-vector/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/returned-boolean-in-vector/0-opt.wgsl
index b1bfcca..dc15751 100644
--- a/test/vk-gl-cts/graphicsfuzz/returned-boolean-in-vector/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/returned-boolean-in-vector/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/set-color-in-one-iteration-while-loop/0.wgsl b/test/vk-gl-cts/graphicsfuzz/set-color-in-one-iteration-while-loop/0.wgsl
index ee729d9..ff67040 100644
--- a/test/vk-gl-cts/graphicsfuzz/set-color-in-one-iteration-while-loop/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/set-color-in-one-iteration-while-loop/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/similar-nested-ifs/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/similar-nested-ifs/0-opt.wgsl
index 592be78..6af14a0 100644
--- a/test/vk-gl-cts/graphicsfuzz/similar-nested-ifs/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/similar-nested-ifs/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-access-chains/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-access-chains/0-opt.wgsl
index 4128fb7..df653e8 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-access-chains/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-access-chains/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/0.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/0.wgsl
index 1fea790..532521f 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/1.wgsl
index 8b6ba81..ec923c0 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composite-phi/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composite2/0.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-composite2/0.wgsl
index 8d0080b..2081172 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-composite2/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composite2/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composite2/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-composite2/1.wgsl
index daa4973..f104dd3 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-composite2/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composite2/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composites/0.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-composites/0.wgsl
index bdc7096..57ef309 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-composites/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composites/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-composites/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-composites/1.wgsl
index a8a9633..57c0006 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-composites/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-composites/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-dead-break-and-unroll/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-dead-break-and-unroll/1.wgsl
index 14e531e..8400b67 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-dead-break-and-unroll/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-dead-break-and-unroll/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/0-opt.wgsl
index f8f9584..4d73d20 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/1.wgsl
index f70d557..1d54a26 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-declare-bvec4/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.wgsl
index e61feb5..e41e03c 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
 
-[[block]]
 struct buf1 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.wgsl
index b969e06..39cf669 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
 
-[[block]]
 struct buf1 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/0.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/0.wgsl
index 819f07b..7899f1b 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/0.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct buf1 {
   resolution : vec2<f32>;
 };
 
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/1.wgsl
index aac8d57..6d8202a 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block2/1.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct buf1 {
   resolution : vec2<f32>;
 };
 
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.wgsl
index b26ac12..03f5d4a 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
 
-[[block]]
 struct buf1 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-null-in-phi-and-unroll/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-null-in-phi-and-unroll/1.wgsl
index 1742de0..62fb33d 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-null-in-phi-and-unroll/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-null-in-phi-and-unroll/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/1.wgsl
index e7aeb6d..913b37e 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/2.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/2.wgsl
index 088e3cd..8954930 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/2.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-bifurcation-Os-mutate-var-vector-shuffle/2.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/0.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/0.wgsl
index 9074163..6ee1e3f 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/0.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct buf1 {
   resolution : vec2<f32>;
 };
 
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/1.wgsl
index 6e36ff7..ce2fc53 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-bubblesort-flag-complex-conditionals/1.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct buf1 {
   resolution : vec2<f32>;
 };
 
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/0.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/0.wgsl
index 919b5ea..502e8b7 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/1.wgsl
index 872479c..0f6f3db 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-collatz-O-mutate-composite-construct-extract/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-colorgrid-modulo-O-move-block-down/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-colorgrid-modulo-O-move-block-down/1.wgsl
index dbdad85..3626dd3 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-colorgrid-modulo-O-move-block-down/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-colorgrid-modulo-O-move-block-down/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.wgsl
index 7636426..a2c109a 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/2.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/2.wgsl
index 774e546..1012c1f 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/2.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-maze-flatten-copy-composite/2.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.wgsl
index fc4bfa1..633a6d5 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.wgsl
index 0d0b64b..bafcb6d 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.wgsl
index c8f464e..5b0e2fe 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.wgsl
index 4e442a3..2f33bdb 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.wgsl
index 5fac853..f9628e7 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.wgsl
index e349c0c..1007714 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.wgsl
index bf16229..c2695fb 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.wgsl
index 57c9c29..90086b8 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/0.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/0.wgsl
index be331aa..6c17b27 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/1.wgsl
index 0424d49..6821821 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-O-mutate-variable/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/0.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/0.wgsl
index 8fe4ab4..6afaa07 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/1.wgsl
index f0b6447..12209a3 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/2.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/2.wgsl
index 55f9a36..a28de2c 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/2.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-orbit-Os-access-chain-mutate-pointer/2.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/1.wgsl
index 43a6481..af34df2 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/2.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/2.wgsl
index b52da64..fdca5df 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/2.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-O-op-select-to-op-phi/2.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/0.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/0.wgsl
index 5502287..de4a473 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/1.wgsl
index 34fe03d..8ec24b1 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-pillars-volatile-nontemporal-store/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-dontinline/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-dontinline/0-opt.wgsl
index df70a1d..bb41ccf 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-dontinline/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-dontinline/0-opt.wgsl
@@ -2,7 +2,6 @@
   numbers : array<i32, 10>;
 };
 
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-mat-func-param/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-mat-func-param/1.wgsl
index af97bb8..843a743 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-mat-func-param/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-quicksort-mat-func-param/1.wgsl
@@ -2,7 +2,6 @@
   numbers : array<i32, 10>;
 };
 
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/1.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/1.wgsl
index 8f0982f..9c26329 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/2.wgsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/2.wgsl
index 1bf1c72..2f0c558 100644
--- a/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/2.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-rects-Os-mutate-var-push-through-var/2.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-false-if-discard-loop/1.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-false-if-discard-loop/1.wgsl
index c4e135a..dcb31b3 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-false-if-discard-loop/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-false-if-discard-loop/1.wgsl
@@ -4,7 +4,6 @@
   rightIndex : i32;
 };
 
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-nested-if-and-conditional/1.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-nested-if-and-conditional/1.wgsl
index 06f95bb..1f17892 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-nested-if-and-conditional/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-nested-if-and-conditional/1.wgsl
@@ -4,7 +4,6 @@
   rightIndex : i32;
 };
 
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/1.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/1.wgsl
index cd61e29..80872f4 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-binarysearch-tree-with-loop-read-write-global/1.wgsl
@@ -8,7 +8,6 @@
   numbers : array<i32, 10>;
 };
 
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-collatz-push-constant-with-nested-min-max/0.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-collatz-push-constant-with-nested-min-max/0.wgsl
index 10f5505..e1656b7 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-collatz-push-constant-with-nested-min-max/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-collatz-push-constant-with-nested-min-max/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-double-always-false-discard/1.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-double-always-false-discard/1.wgsl
index 2e1bc0e..eaaaea2 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-double-always-false-discard/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-double-always-false-discard/1.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct buf1 {
   injectionSwitch : vec2<f32>;
 };
 
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl
index 82eab45..b30f116 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl
index 60de1ab..7520419 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
 
-[[block]]
 struct buf1 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/0-opt.wgsl
index eceedd3..848cfcd 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/1.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/1.wgsl
index 503ae49..046ec18 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-divided-1/1.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
 
-[[block]]
 struct buf1 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl
index 97ffaf9..f3cb6eb 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
 
-[[block]]
 struct buf1 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl
index ee16548..3bafe44 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.wgsl
index 460ad4b..eca86f4 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.wgsl
index eb23a41..30d100d 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.wgsl
index c64c646..13e6965 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-conditional-bitwise-or-clamp/1.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-conditional-bitwise-or-clamp/1.wgsl
index 68052db..a800ba9 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-conditional-bitwise-or-clamp/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-conditional-bitwise-or-clamp/1.wgsl
@@ -2,7 +2,6 @@
   numbers : array<i32, 10>;
 };
 
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/0-opt.wgsl
index 134b77f..c3d31af 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/0-opt.wgsl
@@ -2,7 +2,6 @@
   numbers : array<i32, 10>;
 };
 
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/2-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/2-opt.wgsl
index b0ecbc4..7a24166 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/2-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-for-loop-with-injection/2-opt.wgsl
@@ -2,12 +2,10 @@
   numbers : array<i32, 10>;
 };
 
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
 
-[[block]]
 struct buf1 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/0.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/0.wgsl
index dcc0835..a6b6c61 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/0.wgsl
@@ -2,7 +2,6 @@
   numbers : array<i32, 10>;
 };
 
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/2.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/2.wgsl
index 7c15a5c..89fc186 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/2.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-if-false-else-return/2.wgsl
@@ -2,7 +2,6 @@
   numbers : array<i32, 10>;
 };
 
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-max-value-as-index/2-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-max-value-as-index/2-opt.wgsl
index 3d6cec0..8f8de06 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-quicksort-max-value-as-index/2-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-quicksort-max-value-as-index/2-opt.wgsl
@@ -2,12 +2,10 @@
   numbers : array<i32, 10>;
 };
 
-[[block]]
 struct buf1 {
   resolution : vec2<f32>;
 };
 
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-rects-vec4-clamp-conditional-min-mix/1.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-rects-vec4-clamp-conditional-min-mix/1.wgsl
index 4b3b3b5..518cf6b 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-rects-vec4-clamp-conditional-min-mix/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-rects-vec4-clamp-conditional-min-mix/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl
index a1ef230..697b608 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl
index 7c75dff..357f622 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl
index d4883c7..048a25e 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.wgsl
index 33d8a7d..12eb944 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl
index 4f8753d..6b3a7b0 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl
index 2044a9e..acb40bf 100644
--- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl
@@ -1,9 +1,7 @@
-[[block]]
 struct buf1 {
   injectionSwitch : vec2<f32>;
 };
 
-[[block]]
 struct buf0 {
   resolution : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/struct-array-index/0.wgsl b/test/vk-gl-cts/graphicsfuzz/struct-array-index/0.wgsl
index 914402c..f28293a 100644
--- a/test/vk-gl-cts/graphicsfuzz/struct-array-index/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/struct-array-index/0.wgsl
@@ -4,7 +4,6 @@
   rightIndex : i32;
 };
 
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/struct-controlled-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/struct-controlled-loop/0-opt.wgsl
index 863b10c..a46cd46 100644
--- a/test/vk-gl-cts/graphicsfuzz/struct-controlled-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/struct-controlled-loop/0-opt.wgsl
@@ -3,7 +3,6 @@
   f1 : vec3<bool>;
 };
 
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/struct-used-as-temporary/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/struct-used-as-temporary/0-opt.wgsl
index de69a65..0ea59c0 100644
--- a/test/vk-gl-cts/graphicsfuzz/struct-used-as-temporary/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/struct-used-as-temporary/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct S {
   field0 : vec4<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/switch-if-discard/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/switch-if-discard/0-opt.wgsl
index 2a93d7f..1fe3437 100644
--- a/test/vk-gl-cts/graphicsfuzz/switch-if-discard/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/switch-if-discard/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/switch-inside-while-always-return/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/switch-inside-while-always-return/0-opt.wgsl
index 546668a..027c6a7 100644
--- a/test/vk-gl-cts/graphicsfuzz/switch-inside-while-always-return/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/switch-inside-while-always-return/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   zero : f32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/switch-loop-switch-if/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/switch-loop-switch-if/0-opt.wgsl
index 8c6c5d7..a458da5 100644
--- a/test/vk-gl-cts/graphicsfuzz/switch-loop-switch-if/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/switch-loop-switch-if/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/switch-with-fall-through-cases/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/switch-with-fall-through-cases/0-opt.wgsl
index b469ccc..7c355bb 100644
--- a/test/vk-gl-cts/graphicsfuzz/switch-with-fall-through-cases/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/switch-with-fall-through-cases/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/two-2-iteration-loops/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/two-2-iteration-loops/0-opt.wgsl
index aec3b11..d9ba1c9 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-2-iteration-loops/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/two-2-iteration-loops/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl
index bc88eb2..73c71d0 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl
@@ -1,11 +1,9 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
 
 type RTArr = [[stride(4)]] array<u32>;
 
-[[block]]
 struct doesNotMatter {
   x_compute_data : RTArr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/two-loops-matrix/0.wgsl b/test/vk-gl-cts/graphicsfuzz/two-loops-matrix/0.wgsl
index 71733dd..3177b79 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-loops-matrix/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/two-loops-matrix/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   matrix_a_uni : mat4x4<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/two-loops-set-struct/0.wgsl b/test/vk-gl-cts/graphicsfuzz/two-loops-set-struct/0.wgsl
index 187ea36..027fc0f 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-loops-set-struct/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/two-loops-set-struct/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/two-nested-do-whiles/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/two-nested-do-whiles/0-opt.wgsl
index a826fa8..b68fb06 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-nested-do-whiles/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/two-nested-do-whiles/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl
index 01d9e68..21c6a7b 100644
--- a/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl
@@ -1,6 +1,5 @@
 type RTArr = [[stride(4)]] array<f32>;
 
-[[block]]
 struct doesNotMatter {
   x_compute_data : RTArr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/undefined-assign-in-infinite-loop/0.wgsl b/test/vk-gl-cts/graphicsfuzz/undefined-assign-in-infinite-loop/0.wgsl
index eec717f..2124377 100644
--- a/test/vk-gl-cts/graphicsfuzz/undefined-assign-in-infinite-loop/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/undefined-assign-in-infinite-loop/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/undefined-integer-in-function/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/undefined-integer-in-function/0-opt.wgsl
index 0ddfab8..b6321d8 100644
--- a/test/vk-gl-cts/graphicsfuzz/undefined-integer-in-function/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/undefined-integer-in-function/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/uninit-element-cast-in-loop/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/uninit-element-cast-in-loop/0-opt.wgsl
index ee9a420..dd73656 100644
--- a/test/vk-gl-cts/graphicsfuzz/uninit-element-cast-in-loop/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/uninit-element-cast-in-loop/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl
index 2b4eb0e..aed1aee 100644
--- a/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl
@@ -1,16 +1,13 @@
-[[block]]
 struct buf1 {
   injectionSwitch : vec2<f32>;
 };
 
-[[block]]
 struct buf2 {
   resolution : vec2<f32>;
 };
 
 type RTArr = [[stride(4)]] array<i32>;
 
-[[block]]
 struct doesNotMatter {
   x_compute_data : RTArr;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-continue-statement/0.wgsl b/test/vk-gl-cts/graphicsfuzz/unreachable-continue-statement/0.wgsl
index 543e524..a7740fe 100644
--- a/test/vk-gl-cts/graphicsfuzz/unreachable-continue-statement/0.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/unreachable-continue-statement/0.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-discard-statement-in-if/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/unreachable-discard-statement-in-if/0-opt.wgsl
index 9873801..54af3d3 100644
--- a/test/vk-gl-cts/graphicsfuzz/unreachable-discard-statement-in-if/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/unreachable-discard-statement-in-if/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-loops/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/unreachable-loops/0-opt.wgsl
index 204bbae..e6da47e 100644
--- a/test/vk-gl-cts/graphicsfuzz/unreachable-loops/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/unreachable-loops/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injected : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/vector-values-multiplied-by-fragcoord/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/vector-values-multiplied-by-fragcoord/0-opt.wgsl
index 1036f48..3761ab1 100644
--- a/test/vk-gl-cts/graphicsfuzz/vector-values-multiplied-by-fragcoord/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/vector-values-multiplied-by-fragcoord/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/while-function-always-false/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/while-function-always-false/0-opt.wgsl
index 563d5c3..9770d45 100644
--- a/test/vk-gl-cts/graphicsfuzz/while-function-always-false/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/while-function-always-false/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/write-before-break/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/write-before-break/0-opt.wgsl
index 00e805e..ad7b1a1 100644
--- a/test/vk-gl-cts/graphicsfuzz/write-before-break/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/write-before-break/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injected : i32;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.wgsl
index eaa0aec..086a895 100644
--- a/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.wgsl
@@ -4,7 +4,6 @@
   rightIndex : i32;
 };
 
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/graphicsfuzz/wrong-color-in-always-false-if/0-opt.wgsl b/test/vk-gl-cts/graphicsfuzz/wrong-color-in-always-false-if/0-opt.wgsl
index a5f11f5..aabebad 100644
--- a/test/vk-gl-cts/graphicsfuzz/wrong-color-in-always-false-if/0-opt.wgsl
+++ b/test/vk-gl-cts/graphicsfuzz/wrong-color-in-always-false-if/0-opt.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct buf0 {
   injectionSwitch : vec2<f32>;
 };
diff --git a/test/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_overflow/0-opt.wgsl b/test/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_overflow/0-opt.wgsl
index e16f3b9..ef817f7 100644
--- a/test/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_overflow/0-opt.wgsl
+++ b/test/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_overflow/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(4)]] array<i32, 8>;
 
-[[block]]
 struct In2 {
   data_in2 : Arr;
 };
 
 type Arr_1 = [[stride(4)]] array<i32, 1024>;
 
-[[block]]
 struct Out0 {
   data_out0 : Arr_1;
 };
@@ -16,12 +14,10 @@
 
 type Arr_3 = [[stride(4)]] array<i32, 512>;
 
-[[block]]
 struct In1 {
   data_in1 : Arr_3;
 };
 
-[[block]]
 struct In0 {
   data_in0 : Arr_3;
 };
diff --git a/test/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_underflow/0-opt.wgsl b/test/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_underflow/0-opt.wgsl
index 6aa8659..7665283 100644
--- a/test/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_underflow/0-opt.wgsl
+++ b/test/vk-gl-cts/non_robust_buffer_access/unexecuted_oob_underflow/0-opt.wgsl
@@ -1,13 +1,11 @@
 type Arr = [[stride(4)]] array<i32, 8>;
 
-[[block]]
 struct In2 {
   data_in2 : Arr;
 };
 
 type Arr_1 = [[stride(4)]] array<i32, 1024>;
 
-[[block]]
 struct Out0 {
   data_out0 : Arr_1;
 };
@@ -16,12 +14,10 @@
 
 type Arr_3 = [[stride(4)]] array<i32, 512>;
 
-[[block]]
 struct In0 {
   data_in0 : Arr_3;
 };
 
-[[block]]
 struct In1 {
   data_in1 : Arr_3;
 };
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl
index 8c7af0e..2b3b645 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl
@@ -1,11 +1,9 @@
-[[block]]
 struct Buf1 {
   result : i32;
 };
 
 type RTArr = [[stride(4)]] array<u32>;
 
-[[block]]
 struct Buf0 {
   values : RTArr;
 };
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl
index b5c093a..0fee5ee 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl
@@ -1,6 +1,5 @@
 type RTArr = [[stride(4)]] array<u32>;
 
-[[block]]
 struct S {
   field0 : RTArr;
 };
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl
index 4aba7ac..cf2536e 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl
@@ -1,6 +1,5 @@
 type RTArr = [[stride(4)]] array<u32>;
 
-[[block]]
 struct S {
   field0 : RTArr;
 };
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl
index c8fe707..f842e24 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl
@@ -1,6 +1,5 @@
 type RTArr = [[stride(4)]] array<u32>;
 
-[[block]]
 struct S {
   field0 : RTArr;
 };
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl
index a8c97bf..21548c6 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl
@@ -1,6 +1,5 @@
 type RTArr = [[stride(4)]] array<u32>;
 
-[[block]]
 struct S {
   field0 : RTArr;
 };
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl
index d03857b..51319ac 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl
@@ -1,6 +1,5 @@
 type RTArr = [[stride(4)]] array<i32>;
 
-[[block]]
 struct S {
   field0 : RTArr;
 };
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl
index 52b1532..8abb109 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl
@@ -1,6 +1,5 @@
 type RTArr = [[stride(4)]] array<u32>;
 
-[[block]]
 struct S {
   field0 : RTArr;
 };
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl
index e582903..fce79f04 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl
@@ -1,6 +1,5 @@
 type RTArr = [[stride(4)]] array<u32>;
 
-[[block]]
 struct S {
   field0 : RTArr;
 };
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl
index 883eb2a..c21661d 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl
@@ -1,6 +1,5 @@
 type RTArr = [[stride(4)]] array<u32>;
 
-[[block]]
 struct S {
   field0 : RTArr;
 };
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl
index 93b1988..f83857f 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl
@@ -1,6 +1,5 @@
 type RTArr = [[stride(4)]] array<u32>;
 
-[[block]]
 struct S {
   field0 : RTArr;
 };
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl
index c6a7af6..de05c79 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl
@@ -1,6 +1,5 @@
 type RTArr = [[stride(4)]] array<u32>;
 
-[[block]]
 struct S {
   field0 : RTArr;
 };
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl
index 1956524..3e60e98 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl
@@ -1,6 +1,5 @@
 type RTArr = [[stride(4)]] array<u32>;
 
-[[block]]
 struct S {
   field0 : RTArr;
 };
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl
index 8bf85f1..fd8dd5f 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl
@@ -1,6 +1,5 @@
 type RTArr = [[stride(4)]] array<i32>;
 
-[[block]]
 struct S {
   field0 : RTArr;
 };
diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl
index 55cb745..4a8c8a7 100644
--- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl
+++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl
@@ -1,6 +1,5 @@
 type RTArr = [[stride(4)]] array<i32>;
 
-[[block]]
 struct S {
   field0 : RTArr;
 };