diff --git a/src/sem/access_control_type.cc b/src/sem/access_control_type.cc
index 03bfbc0902..8e94d6094b 100644
--- a/src/sem/access_control_type.cc
+++ b/src/sem/access_control_type.cc
@@ -66,11 +66,5 @@ std::string AccessControl::FriendlyName(const SymbolTable& symbols) const {
   return out.str();
 }
 
-AccessControl* AccessControl::Clone(CloneContext* ctx) const {
-  // Clone arguments outside of create() call to have deterministic ordering
-  auto* ty = ctx->Clone(type());
-  return ctx->dst->create<AccessControl>(access_, ty);
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/access_control_type.h b/src/sem/access_control_type.h
index bf0db33e7b..8f49ee023d 100644
--- a/src/sem/access_control_type.h
+++ b/src/sem/access_control_type.h
@@ -54,11 +54,6 @@ class AccessControl : public Castable<AccessControl, Type> {
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
 
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  AccessControl* Clone(CloneContext* ctx) const override;
-
  private:
   ast::AccessControl::Access const access_;
   const Type* const subtype_;
diff --git a/src/sem/alias_type.cc b/src/sem/alias_type.cc
index 8e5e750214..26b05c02bc 100644
--- a/src/sem/alias_type.cc
+++ b/src/sem/alias_type.cc
@@ -40,12 +40,5 @@ std::string Alias::FriendlyName(const SymbolTable& symbols) const {
   return symbols.NameFor(symbol_);
 }
 
-Alias* Alias::Clone(CloneContext* ctx) const {
-  // Clone arguments outside of create() call to have deterministic ordering
-  auto sym = ctx->Clone(symbol());
-  auto* ty = ctx->Clone(type());
-  return ctx->dst->create<Alias>(sym, ty);
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/alias_type.h b/src/sem/alias_type.h
index 75ffe0a0e3..927234a941 100644
--- a/src/sem/alias_type.h
+++ b/src/sem/alias_type.h
@@ -18,6 +18,7 @@
 #include <string>
 
 #include "src/sem/type.h"
+#include "src/symbol.h"
 
 namespace tint {
 namespace sem {
@@ -47,11 +48,6 @@ class Alias : public Castable<Alias, Type> {
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
 
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  Alias* Clone(CloneContext* ctx) const override;
-
  private:
   Symbol const symbol_;
   Type const* const subtype_;
diff --git a/src/sem/array_type.cc b/src/sem/array_type.cc
index ebac7c2c9c..f0846e46de 100644
--- a/src/sem/array_type.cc
+++ b/src/sem/array_type.cc
@@ -63,12 +63,5 @@ std::string ArrayType::FriendlyName(const SymbolTable& symbols) const {
   return out.str();
 }
 
-ArrayType* ArrayType::Clone(CloneContext* ctx) const {
-  // Clone arguments outside of create() call to have deterministic ordering
-  auto* ty = ctx->Clone(type());
-  auto decos = ctx->Clone(decorations());
-  return ctx->dst->create<ArrayType>(ty, size_, decos);
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/array_type.h b/src/sem/array_type.h
index 6ddad88ebe..77fe676f9a 100644
--- a/src/sem/array_type.h
+++ b/src/sem/array_type.h
@@ -58,11 +58,6 @@ class ArrayType : public Castable<ArrayType, Type> {
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
 
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  ArrayType* Clone(CloneContext* ctx) const override;
-
  private:
   Type* const subtype_;
   uint32_t const size_;
diff --git a/src/sem/bool_type.cc b/src/sem/bool_type.cc
index b828742631..817693fc29 100644
--- a/src/sem/bool_type.cc
+++ b/src/sem/bool_type.cc
@@ -35,9 +35,5 @@ std::string Bool::FriendlyName(const SymbolTable&) const {
   return "bool";
 }
 
-Bool* Bool::Clone(CloneContext* ctx) const {
-  return ctx->dst->create<Bool>();
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/bool_type.h b/src/sem/bool_type.h
index c42213e42d..af2a21cdac 100644
--- a/src/sem/bool_type.h
+++ b/src/sem/bool_type.h
@@ -44,11 +44,6 @@ class Bool : public Castable<Bool, Type> {
   /// @returns the name for this type that closely resembles how it would be
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
-
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  Bool* Clone(CloneContext* ctx) const override;
 };
 
 }  // namespace sem
diff --git a/src/sem/depth_texture_type.cc b/src/sem/depth_texture_type.cc
index 81ba2b8d89..d028d68113 100644
--- a/src/sem/depth_texture_type.cc
+++ b/src/sem/depth_texture_type.cc
@@ -51,9 +51,5 @@ std::string DepthTexture::FriendlyName(const SymbolTable&) const {
   return out.str();
 }
 
-DepthTexture* DepthTexture::Clone(CloneContext* ctx) const {
-  return ctx->dst->create<DepthTexture>(dim());
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/depth_texture_type.h b/src/sem/depth_texture_type.h
index 947223fae2..1704ad97e7 100644
--- a/src/sem/depth_texture_type.h
+++ b/src/sem/depth_texture_type.h
@@ -39,11 +39,6 @@ class DepthTexture : public Castable<DepthTexture, Texture> {
   /// @returns the name for this type that closely resembles how it would be
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
-
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  DepthTexture* Clone(CloneContext* ctx) const override;
 };
 
 }  // namespace sem
diff --git a/src/sem/external_texture_type.cc b/src/sem/external_texture_type.cc
index c101245890..5152fc11d1 100644
--- a/src/sem/external_texture_type.cc
+++ b/src/sem/external_texture_type.cc
@@ -35,9 +35,5 @@ std::string ExternalTexture::FriendlyName(const SymbolTable&) const {
   return "texture_external";
 }
 
-ExternalTexture* ExternalTexture::Clone(CloneContext* ctx) const {
-  return ctx->dst->create<ExternalTexture>();
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/external_texture_type.h b/src/sem/external_texture_type.h
index e91cd00583..9b2fbccb36 100644
--- a/src/sem/external_texture_type.h
+++ b/src/sem/external_texture_type.h
@@ -39,11 +39,6 @@ class ExternalTexture : public Castable<ExternalTexture, Texture> {
   /// @returns the name for this type that closely resembles how it would be
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
-
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  ExternalTexture* Clone(CloneContext* ctx) const override;
 };
 
 }  // namespace sem
diff --git a/src/sem/f32_type.cc b/src/sem/f32_type.cc
index f2d2043606..12f5c1ef42 100644
--- a/src/sem/f32_type.cc
+++ b/src/sem/f32_type.cc
@@ -35,9 +35,5 @@ std::string F32::FriendlyName(const SymbolTable&) const {
   return "f32";
 }
 
-F32* F32::Clone(CloneContext* ctx) const {
-  return ctx->dst->create<F32>();
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/f32_type.h b/src/sem/f32_type.h
index e26bba9319..54dc1cd40b 100644
--- a/src/sem/f32_type.h
+++ b/src/sem/f32_type.h
@@ -38,11 +38,6 @@ class F32 : public Castable<F32, Type> {
   /// @returns the name for this type that closely resembles how it would be
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
-
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  F32* Clone(CloneContext* ctx) const override;
 };
 
 }  // namespace sem
diff --git a/src/sem/i32_type.cc b/src/sem/i32_type.cc
index 495180cc25..dcc6a78c49 100644
--- a/src/sem/i32_type.cc
+++ b/src/sem/i32_type.cc
@@ -35,9 +35,5 @@ std::string I32::FriendlyName(const SymbolTable&) const {
   return "i32";
 }
 
-I32* I32::Clone(CloneContext* ctx) const {
-  return ctx->dst->create<I32>();
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/i32_type.h b/src/sem/i32_type.h
index 5d96fcf17f..27bd3bb70d 100644
--- a/src/sem/i32_type.h
+++ b/src/sem/i32_type.h
@@ -38,11 +38,6 @@ class I32 : public Castable<I32, Type> {
   /// @returns the name for this type that closely resembles how it would be
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
-
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  I32* Clone(CloneContext* ctx) const override;
 };
 
 }  // namespace sem
diff --git a/src/sem/matrix_type.cc b/src/sem/matrix_type.cc
index b8b965c556..06e392e3d3 100644
--- a/src/sem/matrix_type.cc
+++ b/src/sem/matrix_type.cc
@@ -49,11 +49,5 @@ std::string Matrix::FriendlyName(const SymbolTable& symbols) const {
   return out.str();
 }
 
-Matrix* Matrix::Clone(CloneContext* ctx) const {
-  // Clone arguments outside of create() call to have deterministic ordering
-  auto* column_type = ctx->Clone(ColumnType());
-  return ctx->dst->create<Matrix>(column_type, columns_);
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/matrix_type.h b/src/sem/matrix_type.h
index 4a4be0ff1a..d91ded059f 100644
--- a/src/sem/matrix_type.h
+++ b/src/sem/matrix_type.h
@@ -54,11 +54,6 @@ class Matrix : public Castable<Matrix, Type> {
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
 
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  Matrix* Clone(CloneContext* ctx) const override;
-
  private:
   Type* const subtype_;
   Vector* const column_type_;
diff --git a/src/sem/multisampled_texture_type.cc b/src/sem/multisampled_texture_type.cc
index d0c01c33ad..ad84dc7d51 100644
--- a/src/sem/multisampled_texture_type.cc
+++ b/src/sem/multisampled_texture_type.cc
@@ -45,11 +45,5 @@ std::string MultisampledTexture::FriendlyName(
   return out.str();
 }
 
-MultisampledTexture* MultisampledTexture::Clone(CloneContext* ctx) const {
-  // Clone arguments outside of create() call to have deterministic ordering
-  auto* ty = ctx->Clone(type());
-  return ctx->dst->create<MultisampledTexture>(dim(), ty);
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/multisampled_texture_type.h b/src/sem/multisampled_texture_type.h
index 5b3064f72b..715d6aa808 100644
--- a/src/sem/multisampled_texture_type.h
+++ b/src/sem/multisampled_texture_type.h
@@ -44,11 +44,6 @@ class MultisampledTexture : public Castable<MultisampledTexture, Texture> {
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
 
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  MultisampledTexture* Clone(CloneContext* ctx) const override;
-
  private:
   const Type* const type_;
 };
diff --git a/src/sem/pointer_type.cc b/src/sem/pointer_type.cc
index 8ca1703377..1bb9c128ff 100644
--- a/src/sem/pointer_type.cc
+++ b/src/sem/pointer_type.cc
@@ -44,11 +44,5 @@ Pointer::Pointer(Pointer&&) = default;
 
 Pointer::~Pointer() = default;
 
-Pointer* Pointer::Clone(CloneContext* ctx) const {
-  // Clone arguments outside of create() call to have deterministic ordering
-  auto* ty = ctx->Clone(type());
-  return ctx->dst->create<Pointer>(ty, storage_class_);
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/pointer_type.h b/src/sem/pointer_type.h
index cdc73f2438..843167b6e0 100644
--- a/src/sem/pointer_type.h
+++ b/src/sem/pointer_type.h
@@ -47,11 +47,6 @@ class Pointer : public Castable<Pointer, Type> {
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
 
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  Pointer* Clone(CloneContext* ctx) const override;
-
  private:
   Type* const subtype_;
   ast::StorageClass const storage_class_;
diff --git a/src/sem/sampled_texture_type.cc b/src/sem/sampled_texture_type.cc
index 8f8ee77e7a..c54ef1b921 100644
--- a/src/sem/sampled_texture_type.cc
+++ b/src/sem/sampled_texture_type.cc
@@ -42,11 +42,5 @@ std::string SampledTexture::FriendlyName(const SymbolTable& symbols) const {
   return out.str();
 }
 
-SampledTexture* SampledTexture::Clone(CloneContext* ctx) const {
-  // Clone arguments outside of create() call to have deterministic ordering
-  auto* ty = ctx->Clone(type());
-  return ctx->dst->create<SampledTexture>(dim(), ty);
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/sampled_texture_type.h b/src/sem/sampled_texture_type.h
index 605de68846..32c36b9c59 100644
--- a/src/sem/sampled_texture_type.h
+++ b/src/sem/sampled_texture_type.h
@@ -44,11 +44,6 @@ class SampledTexture : public Castable<SampledTexture, Texture> {
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
 
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  SampledTexture* Clone(CloneContext* ctx) const override;
-
  private:
   const Type* const type_;
 };
diff --git a/src/sem/sampler_type.cc b/src/sem/sampler_type.cc
index cc71125381..7af21e477c 100644
--- a/src/sem/sampler_type.cc
+++ b/src/sem/sampler_type.cc
@@ -36,9 +36,5 @@ std::string Sampler::FriendlyName(const SymbolTable&) const {
   return kind_ == ast::SamplerKind::kSampler ? "sampler" : "sampler_comparison";
 }
 
-Sampler* Sampler::Clone(CloneContext* ctx) const {
-  return ctx->dst->create<Sampler>(kind_);
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/sampler_type.h b/src/sem/sampler_type.h
index fc93b178ed..19e5a6b458 100644
--- a/src/sem/sampler_type.h
+++ b/src/sem/sampler_type.h
@@ -49,11 +49,6 @@ class Sampler : public Castable<Sampler, Type> {
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
 
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  Sampler* Clone(CloneContext* ctx) const override;
-
  private:
   ast::SamplerKind const kind_;
 };
diff --git a/src/sem/storage_texture_type.cc b/src/sem/storage_texture_type.cc
index 231758b530..c99f932fe7 100644
--- a/src/sem/storage_texture_type.cc
+++ b/src/sem/storage_texture_type.cc
@@ -42,12 +42,6 @@ std::string StorageTexture::FriendlyName(const SymbolTable&) const {
   return out.str();
 }
 
-StorageTexture* StorageTexture::Clone(CloneContext* ctx) const {
-  // Clone arguments outside of create() call to have deterministic ordering
-  auto* ty = ctx->Clone(type());
-  return ctx->dst->create<StorageTexture>(dim(), image_format_, ty);
-}
-
 sem::Type* StorageTexture::SubtypeFor(ast::ImageFormat format,
                                       sem::Manager& type_mgr) {
   switch (format) {
diff --git a/src/sem/storage_texture_type.h b/src/sem/storage_texture_type.h
index 8162974830..5ca3206ce6 100644
--- a/src/sem/storage_texture_type.h
+++ b/src/sem/storage_texture_type.h
@@ -54,11 +54,6 @@ class StorageTexture : public Castable<StorageTexture, Texture> {
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
 
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  StorageTexture* Clone(CloneContext* ctx) const override;
-
   /// @param format the storage texture image format
   /// @param type_mgr the sem::Manager used to build the returned type
   /// @returns the storage texture subtype for the given ImageFormat
diff --git a/src/sem/struct_type.cc b/src/sem/struct_type.cc
index 403d421658..21ea67eb38 100644
--- a/src/sem/struct_type.cc
+++ b/src/sem/struct_type.cc
@@ -37,11 +37,5 @@ std::string StructType::FriendlyName(const SymbolTable& symbols) const {
   return impl()->FriendlyName(symbols);
 }
 
-StructType* StructType::Clone(CloneContext* ctx) const {
-  // Clone arguments outside of create() call to have deterministic ordering
-  auto* str = ctx->Clone(impl());
-  return ctx->dst->create<StructType>(str);
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/struct_type.h b/src/sem/struct_type.h
index 6165b5ee1d..e39010a290 100644
--- a/src/sem/struct_type.h
+++ b/src/sem/struct_type.h
@@ -47,11 +47,6 @@ class StructType : public Castable<StructType, Type> {
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
 
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  StructType* Clone(CloneContext* ctx) const override;
-
  private:
   ast::Struct* const struct_;
 
diff --git a/src/sem/type.h b/src/sem/type.h
index 186cf97600..c5a35c2d7c 100644
--- a/src/sem/type.h
+++ b/src/sem/type.h
@@ -17,7 +17,7 @@
 
 #include <string>
 
-#include "src/clone_context.h"
+#include "src/castable.h"
 
 namespace tint {
 
@@ -31,7 +31,7 @@ namespace sem {
 enum class MemoryLayout { kUniformBuffer, kStorageBuffer };
 
 /// Base class for a type in the system
-class Type : public Castable<Type, ShareableCloneable> {
+class Type : public Castable<Type> {
  public:
   /// Move constructor
   Type(Type&&);
@@ -132,13 +132,6 @@ class Type : public Castable<Type, ShareableCloneable> {
   Type();
 };
 
-/// @returns the ProgramID of the given type.
-inline ProgramID ProgramIDOf(const Type*) {
-  /// TODO(crbug.com/tint/724): Actually implement this once we split the `type`
-  /// namespace into ast::Type and sem::Type.
-  return ProgramID();
-}
-
 }  // namespace sem
 }  // namespace tint
 
diff --git a/src/sem/u32_type.cc b/src/sem/u32_type.cc
index d4e014520f..8dced5f750 100644
--- a/src/sem/u32_type.cc
+++ b/src/sem/u32_type.cc
@@ -35,9 +35,5 @@ std::string U32::FriendlyName(const SymbolTable&) const {
   return "u32";
 }
 
-U32* U32::Clone(CloneContext* ctx) const {
-  return ctx->dst->create<U32>();
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/u32_type.h b/src/sem/u32_type.h
index eb1937d3e0..b530b79e3c 100644
--- a/src/sem/u32_type.h
+++ b/src/sem/u32_type.h
@@ -38,11 +38,6 @@ class U32 : public Castable<U32, Type> {
   /// @returns the name for this type that closely resembles how it would be
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
-
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  U32* Clone(CloneContext* ctx) const override;
 };
 
 }  // namespace sem
diff --git a/src/sem/vector_type.cc b/src/sem/vector_type.cc
index caa43c41ef..9b4ef83c62 100644
--- a/src/sem/vector_type.cc
+++ b/src/sem/vector_type.cc
@@ -41,11 +41,5 @@ std::string Vector::FriendlyName(const SymbolTable& symbols) const {
   return out.str();
 }
 
-Vector* Vector::Clone(CloneContext* ctx) const {
-  // Clone arguments outside of create() call to have deterministic ordering
-  auto* ty = ctx->Clone(type());
-  return ctx->dst->create<Vector>(ty, size_);
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/vector_type.h b/src/sem/vector_type.h
index 0c9cae7d7b..5f8d319567 100644
--- a/src/sem/vector_type.h
+++ b/src/sem/vector_type.h
@@ -46,11 +46,6 @@ class Vector : public Castable<Vector, Type> {
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
 
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  Vector* Clone(CloneContext* ctx) const override;
-
  private:
   Type const* const subtype_;
   uint32_t const size_;
diff --git a/src/sem/void_type.cc b/src/sem/void_type.cc
index fbdd3b3568..7792f92ab4 100644
--- a/src/sem/void_type.cc
+++ b/src/sem/void_type.cc
@@ -35,9 +35,5 @@ std::string Void::FriendlyName(const SymbolTable&) const {
   return "void";
 }
 
-Void* Void::Clone(CloneContext* ctx) const {
-  return ctx->dst->create<Void>();
-}
-
 }  // namespace sem
 }  // namespace tint
diff --git a/src/sem/void_type.h b/src/sem/void_type.h
index f32cb473b0..02fc754a0e 100644
--- a/src/sem/void_type.h
+++ b/src/sem/void_type.h
@@ -38,11 +38,6 @@ class Void : public Castable<Void, Type> {
   /// @returns the name for this type that closely resembles how it would be
   /// declared in WGSL.
   std::string FriendlyName(const SymbolTable& symbols) const override;
-
-  /// Clones this type and all transitive types using the `CloneContext` `ctx`.
-  /// @param ctx the clone context
-  /// @return the newly cloned type
-  Void* Clone(CloneContext* ctx) const override;
 };
 
 }  // namespace sem
diff --git a/src/transform/decompose_storage_access.cc b/src/transform/decompose_storage_access.cc
index c9f9ebf848..c3f28933d8 100644
--- a/src/transform/decompose_storage_access.cc
+++ b/src/transform/decompose_storage_access.cc
@@ -444,8 +444,7 @@ struct DecomposeStorageAccess::State {
       } else {
         ast::ExpressionList values;
         if (auto* mat_ty = el_ty->As<sem::Matrix>()) {
-          auto* vec_ty = ctx.dst->create<sem::Vector>(ctx.Clone(mat_ty->type()),
-                                                      mat_ty->rows());
+          auto* vec_ty = mat_ty->ColumnType();
           Symbol load = LoadFunc(ctx, insert_after, buf_ty, vec_ty);
           for (uint32_t i = 0; i < mat_ty->columns(); i++) {
             auto* offset =
@@ -517,8 +516,7 @@ struct DecomposeStorageAccess::State {
       } else {
         ast::StatementList body;
         if (auto* mat_ty = el_ty->As<sem::Matrix>()) {
-          auto* vec_ty = ctx.dst->create<sem::Vector>(ctx.Clone(mat_ty->type()),
-                                                      mat_ty->rows());
+          auto* vec_ty = mat_ty->ColumnType();
           Symbol store = StoreFunc(ctx, insert_after, buf_ty, vec_ty);
           for (uint32_t i = 0; i < mat_ty->columns(); i++) {
             auto* offset =
@@ -719,13 +717,11 @@ Output DecomposeStorageAccess::Run(const Program* in, const DataMap&) {
         }
         if (auto* mat_ty = access.type->As<sem::Matrix>()) {
           auto offset = Mul(MatrixColumnStride(mat_ty), accessor->idx_expr());
-          auto* vec_ty = ctx.dst->create<sem::Vector>(
-              ctx.Clone(mat_ty->type()->UnwrapAll()), mat_ty->rows());
           state.AddAccess(accessor,
                           {
                               access.var,
                               Add(std::move(access.offset), std::move(offset)),
-                              vec_ty,
+                              mat_ty->ColumnType(),
                           });
           continue;
         }
diff --git a/src/transform/decompose_storage_access_test.cc b/src/transform/decompose_storage_access_test.cc
index 683b69928f..dadf24c225 100644
--- a/src/transform/decompose_storage_access_test.cc
+++ b/src/transform/decompose_storage_access_test.cc
@@ -142,52 +142,43 @@ fn tint_symbol_10(buffer : [[access(read_write)]] SB, offset : u32) -> vec4<u32>
 [[internal(intrinsic_load_vec4_f32)]]
 fn tint_symbol_11(buffer : [[access(read_write)]] SB, offset : u32) -> vec4<f32>
 
-[[internal(intrinsic_load_vec2_f32)]]
-fn tint_symbol_12(buffer : [[access(read_write)]] SB, offset : u32) -> vec2<f32>
-
-fn tint_symbol_13(buffer : [[access(read_write)]] SB, offset : u32) -> mat2x2<f32> {
-  return mat2x2<f32>(tint_symbol_12(buffer, (offset + 0u)), tint_symbol_12(buffer, (offset + 8u)));
+fn tint_symbol_12(buffer : [[access(read_write)]] SB, offset : u32) -> mat2x2<f32> {
+  return mat2x2<f32>(tint_symbol_5(buffer, (offset + 0u)), tint_symbol_5(buffer, (offset + 8u)));
 }
 
-[[internal(intrinsic_load_vec3_f32)]]
-fn tint_symbol_14(buffer : [[access(read_write)]] SB, offset : u32) -> vec3<f32>
-
-fn tint_symbol_15(buffer : [[access(read_write)]] SB, offset : u32) -> mat2x3<f32> {
-  return mat2x3<f32>(tint_symbol_14(buffer, (offset + 0u)), tint_symbol_14(buffer, (offset + 16u)));
+fn tint_symbol_13(buffer : [[access(read_write)]] SB, offset : u32) -> mat2x3<f32> {
+  return mat2x3<f32>(tint_symbol_8(buffer, (offset + 0u)), tint_symbol_8(buffer, (offset + 16u)));
 }
 
-[[internal(intrinsic_load_vec4_f32)]]
-fn tint_symbol_16(buffer : [[access(read_write)]] SB, offset : u32) -> vec4<f32>
-
-fn tint_symbol_17(buffer : [[access(read_write)]] SB, offset : u32) -> mat2x4<f32> {
-  return mat2x4<f32>(tint_symbol_16(buffer, (offset + 0u)), tint_symbol_16(buffer, (offset + 16u)));
+fn tint_symbol_14(buffer : [[access(read_write)]] SB, offset : u32) -> mat2x4<f32> {
+  return mat2x4<f32>(tint_symbol_11(buffer, (offset + 0u)), tint_symbol_11(buffer, (offset + 16u)));
 }
 
-fn tint_symbol_18(buffer : [[access(read_write)]] SB, offset : u32) -> mat3x2<f32> {
-  return mat3x2<f32>(tint_symbol_12(buffer, (offset + 0u)), tint_symbol_12(buffer, (offset + 8u)), tint_symbol_12(buffer, (offset + 16u)));
+fn tint_symbol_15(buffer : [[access(read_write)]] SB, offset : u32) -> mat3x2<f32> {
+  return mat3x2<f32>(tint_symbol_5(buffer, (offset + 0u)), tint_symbol_5(buffer, (offset + 8u)), tint_symbol_5(buffer, (offset + 16u)));
 }
 
-fn tint_symbol_19(buffer : [[access(read_write)]] SB, offset : u32) -> mat3x3<f32> {
-  return mat3x3<f32>(tint_symbol_14(buffer, (offset + 0u)), tint_symbol_14(buffer, (offset + 16u)), tint_symbol_14(buffer, (offset + 32u)));
+fn tint_symbol_16(buffer : [[access(read_write)]] SB, offset : u32) -> mat3x3<f32> {
+  return mat3x3<f32>(tint_symbol_8(buffer, (offset + 0u)), tint_symbol_8(buffer, (offset + 16u)), tint_symbol_8(buffer, (offset + 32u)));
 }
 
-fn tint_symbol_20(buffer : [[access(read_write)]] SB, offset : u32) -> mat3x4<f32> {
-  return mat3x4<f32>(tint_symbol_16(buffer, (offset + 0u)), tint_symbol_16(buffer, (offset + 16u)), tint_symbol_16(buffer, (offset + 32u)));
+fn tint_symbol_17(buffer : [[access(read_write)]] SB, offset : u32) -> mat3x4<f32> {
+  return mat3x4<f32>(tint_symbol_11(buffer, (offset + 0u)), tint_symbol_11(buffer, (offset + 16u)), tint_symbol_11(buffer, (offset + 32u)));
 }
 
-fn tint_symbol_21(buffer : [[access(read_write)]] SB, offset : u32) -> mat4x2<f32> {
-  return mat4x2<f32>(tint_symbol_12(buffer, (offset + 0u)), tint_symbol_12(buffer, (offset + 8u)), tint_symbol_12(buffer, (offset + 16u)), tint_symbol_12(buffer, (offset + 24u)));
+fn tint_symbol_18(buffer : [[access(read_write)]] SB, offset : u32) -> mat4x2<f32> {
+  return mat4x2<f32>(tint_symbol_5(buffer, (offset + 0u)), tint_symbol_5(buffer, (offset + 8u)), tint_symbol_5(buffer, (offset + 16u)), tint_symbol_5(buffer, (offset + 24u)));
 }
 
-fn tint_symbol_22(buffer : [[access(read_write)]] SB, offset : u32) -> mat4x3<f32> {
-  return mat4x3<f32>(tint_symbol_14(buffer, (offset + 0u)), tint_symbol_14(buffer, (offset + 16u)), tint_symbol_14(buffer, (offset + 32u)), tint_symbol_14(buffer, (offset + 48u)));
+fn tint_symbol_19(buffer : [[access(read_write)]] SB, offset : u32) -> mat4x3<f32> {
+  return mat4x3<f32>(tint_symbol_8(buffer, (offset + 0u)), tint_symbol_8(buffer, (offset + 16u)), tint_symbol_8(buffer, (offset + 32u)), tint_symbol_8(buffer, (offset + 48u)));
 }
 
-fn tint_symbol_23(buffer : [[access(read_write)]] SB, offset : u32) -> mat4x4<f32> {
-  return mat4x4<f32>(tint_symbol_16(buffer, (offset + 0u)), tint_symbol_16(buffer, (offset + 16u)), tint_symbol_16(buffer, (offset + 32u)), tint_symbol_16(buffer, (offset + 48u)));
+fn tint_symbol_20(buffer : [[access(read_write)]] SB, offset : u32) -> mat4x4<f32> {
+  return mat4x4<f32>(tint_symbol_11(buffer, (offset + 0u)), tint_symbol_11(buffer, (offset + 16u)), tint_symbol_11(buffer, (offset + 32u)), tint_symbol_11(buffer, (offset + 48u)));
 }
 
-fn tint_symbol_24(buffer : [[access(read_write)]] SB, offset : u32) -> array<vec3<f32>, 2> {
+fn tint_symbol_21(buffer : [[access(read_write)]] SB, offset : u32) -> array<vec3<f32>, 2> {
   return array<vec3<f32>, 2>(tint_symbol_8(buffer, (offset + 0u)), tint_symbol_8(buffer, (offset + 16u)));
 }
 
@@ -207,16 +198,16 @@ fn main() {
   var j : vec4<i32> = tint_symbol_9(sb, 96u);
   var k : vec4<u32> = tint_symbol_10(sb, 112u);
   var l : vec4<f32> = tint_symbol_11(sb, 128u);
-  var m : mat2x2<f32> = tint_symbol_13(sb, 144u);
-  var n : mat2x3<f32> = tint_symbol_15(sb, 160u);
-  var o : mat2x4<f32> = tint_symbol_17(sb, 192u);
-  var p : mat3x2<f32> = tint_symbol_18(sb, 224u);
-  var q : mat3x3<f32> = tint_symbol_19(sb, 256u);
-  var r : mat3x4<f32> = tint_symbol_20(sb, 304u);
-  var s : mat4x2<f32> = tint_symbol_21(sb, 352u);
-  var t : mat4x3<f32> = tint_symbol_22(sb, 384u);
-  var u : mat4x4<f32> = tint_symbol_23(sb, 448u);
-  var v : array<vec3<f32>, 2> = tint_symbol_24(sb, 512u);
+  var m : mat2x2<f32> = tint_symbol_12(sb, 144u);
+  var n : mat2x3<f32> = tint_symbol_13(sb, 160u);
+  var o : mat2x4<f32> = tint_symbol_14(sb, 192u);
+  var p : mat3x2<f32> = tint_symbol_15(sb, 224u);
+  var q : mat3x3<f32> = tint_symbol_16(sb, 256u);
+  var r : mat3x4<f32> = tint_symbol_17(sb, 304u);
+  var s : mat4x2<f32> = tint_symbol_18(sb, 352u);
+  var t : mat4x3<f32> = tint_symbol_19(sb, 384u);
+  var u : mat4x4<f32> = tint_symbol_20(sb, 448u);
+  var v : array<vec3<f32>, 2> = tint_symbol_21(sb, 512u);
 }
 )";
 
@@ -345,70 +336,61 @@ fn tint_symbol_10(buffer : [[access(read_write)]] SB, offset : u32, value : vec4
 [[internal(intrinsic_store_vec4_i32)]]
 fn tint_symbol_11(buffer : [[access(read_write)]] SB, offset : u32, value : vec4<f32>)
 
-[[internal(intrinsic_store_vec2_i32)]]
-fn tint_symbol_12(buffer : [[access(read_write)]] SB, offset : u32, value : vec2<f32>)
-
-fn tint_symbol_13(buffer : [[access(read_write)]] SB, offset : u32, value : mat2x2<f32>) {
-  tint_symbol_12(buffer, (offset + 0u), value[0u]);
-  tint_symbol_12(buffer, (offset + 8u), value[1u]);
+fn tint_symbol_12(buffer : [[access(read_write)]] SB, offset : u32, value : mat2x2<f32>) {
+  tint_symbol_5(buffer, (offset + 0u), value[0u]);
+  tint_symbol_5(buffer, (offset + 8u), value[1u]);
 }
 
-[[internal(intrinsic_store_vec3_i32)]]
-fn tint_symbol_14(buffer : [[access(read_write)]] SB, offset : u32, value : vec3<f32>)
-
-fn tint_symbol_15(buffer : [[access(read_write)]] SB, offset : u32, value : mat2x3<f32>) {
-  tint_symbol_14(buffer, (offset + 0u), value[0u]);
-  tint_symbol_14(buffer, (offset + 16u), value[1u]);
+fn tint_symbol_13(buffer : [[access(read_write)]] SB, offset : u32, value : mat2x3<f32>) {
+  tint_symbol_8(buffer, (offset + 0u), value[0u]);
+  tint_symbol_8(buffer, (offset + 16u), value[1u]);
 }
 
-[[internal(intrinsic_store_vec4_i32)]]
-fn tint_symbol_16(buffer : [[access(read_write)]] SB, offset : u32, value : vec4<f32>)
-
-fn tint_symbol_17(buffer : [[access(read_write)]] SB, offset : u32, value : mat2x4<f32>) {
-  tint_symbol_16(buffer, (offset + 0u), value[0u]);
-  tint_symbol_16(buffer, (offset + 16u), value[1u]);
+fn tint_symbol_14(buffer : [[access(read_write)]] SB, offset : u32, value : mat2x4<f32>) {
+  tint_symbol_11(buffer, (offset + 0u), value[0u]);
+  tint_symbol_11(buffer, (offset + 16u), value[1u]);
 }
 
-fn tint_symbol_18(buffer : [[access(read_write)]] SB, offset : u32, value : mat3x2<f32>) {
-  tint_symbol_12(buffer, (offset + 0u), value[0u]);
-  tint_symbol_12(buffer, (offset + 8u), value[1u]);
-  tint_symbol_12(buffer, (offset + 16u), value[2u]);
+fn tint_symbol_15(buffer : [[access(read_write)]] SB, offset : u32, value : mat3x2<f32>) {
+  tint_symbol_5(buffer, (offset + 0u), value[0u]);
+  tint_symbol_5(buffer, (offset + 8u), value[1u]);
+  tint_symbol_5(buffer, (offset + 16u), value[2u]);
 }
 
-fn tint_symbol_19(buffer : [[access(read_write)]] SB, offset : u32, value : mat3x3<f32>) {
-  tint_symbol_14(buffer, (offset + 0u), value[0u]);
-  tint_symbol_14(buffer, (offset + 16u), value[1u]);
-  tint_symbol_14(buffer, (offset + 32u), value[2u]);
+fn tint_symbol_16(buffer : [[access(read_write)]] SB, offset : u32, value : mat3x3<f32>) {
+  tint_symbol_8(buffer, (offset + 0u), value[0u]);
+  tint_symbol_8(buffer, (offset + 16u), value[1u]);
+  tint_symbol_8(buffer, (offset + 32u), value[2u]);
 }
 
-fn tint_symbol_20(buffer : [[access(read_write)]] SB, offset : u32, value : mat3x4<f32>) {
-  tint_symbol_16(buffer, (offset + 0u), value[0u]);
-  tint_symbol_16(buffer, (offset + 16u), value[1u]);
-  tint_symbol_16(buffer, (offset + 32u), value[2u]);
+fn tint_symbol_17(buffer : [[access(read_write)]] SB, offset : u32, value : mat3x4<f32>) {
+  tint_symbol_11(buffer, (offset + 0u), value[0u]);
+  tint_symbol_11(buffer, (offset + 16u), value[1u]);
+  tint_symbol_11(buffer, (offset + 32u), value[2u]);
 }
 
-fn tint_symbol_21(buffer : [[access(read_write)]] SB, offset : u32, value : mat4x2<f32>) {
-  tint_symbol_12(buffer, (offset + 0u), value[0u]);
-  tint_symbol_12(buffer, (offset + 8u), value[1u]);
-  tint_symbol_12(buffer, (offset + 16u), value[2u]);
-  tint_symbol_12(buffer, (offset + 24u), value[3u]);
+fn tint_symbol_18(buffer : [[access(read_write)]] SB, offset : u32, value : mat4x2<f32>) {
+  tint_symbol_5(buffer, (offset + 0u), value[0u]);
+  tint_symbol_5(buffer, (offset + 8u), value[1u]);
+  tint_symbol_5(buffer, (offset + 16u), value[2u]);
+  tint_symbol_5(buffer, (offset + 24u), value[3u]);
 }
 
-fn tint_symbol_22(buffer : [[access(read_write)]] SB, offset : u32, value : mat4x3<f32>) {
-  tint_symbol_14(buffer, (offset + 0u), value[0u]);
-  tint_symbol_14(buffer, (offset + 16u), value[1u]);
-  tint_symbol_14(buffer, (offset + 32u), value[2u]);
-  tint_symbol_14(buffer, (offset + 48u), value[3u]);
+fn tint_symbol_19(buffer : [[access(read_write)]] SB, offset : u32, value : mat4x3<f32>) {
+  tint_symbol_8(buffer, (offset + 0u), value[0u]);
+  tint_symbol_8(buffer, (offset + 16u), value[1u]);
+  tint_symbol_8(buffer, (offset + 32u), value[2u]);
+  tint_symbol_8(buffer, (offset + 48u), value[3u]);
 }
 
-fn tint_symbol_23(buffer : [[access(read_write)]] SB, offset : u32, value : mat4x4<f32>) {
-  tint_symbol_16(buffer, (offset + 0u), value[0u]);
-  tint_symbol_16(buffer, (offset + 16u), value[1u]);
-  tint_symbol_16(buffer, (offset + 32u), value[2u]);
-  tint_symbol_16(buffer, (offset + 48u), value[3u]);
+fn tint_symbol_20(buffer : [[access(read_write)]] SB, offset : u32, value : mat4x4<f32>) {
+  tint_symbol_11(buffer, (offset + 0u), value[0u]);
+  tint_symbol_11(buffer, (offset + 16u), value[1u]);
+  tint_symbol_11(buffer, (offset + 32u), value[2u]);
+  tint_symbol_11(buffer, (offset + 48u), value[3u]);
 }
 
-fn tint_symbol_24(buffer : [[access(read_write)]] SB, offset : u32, value : array<vec3<f32>, 2>) {
+fn tint_symbol_21(buffer : [[access(read_write)]] SB, offset : u32, value : array<vec3<f32>, 2>) {
   tint_symbol_8(buffer, (offset + 0u), value[0u]);
   tint_symbol_8(buffer, (offset + 16u), value[1u]);
 }
@@ -429,16 +411,16 @@ fn main() {
   tint_symbol_9(sb, 96u, vec4<i32>());
   tint_symbol_10(sb, 112u, vec4<u32>());
   tint_symbol_11(sb, 128u, vec4<f32>());
-  tint_symbol_13(sb, 144u, mat2x2<f32>());
-  tint_symbol_15(sb, 160u, mat2x3<f32>());
-  tint_symbol_17(sb, 192u, mat2x4<f32>());
-  tint_symbol_18(sb, 224u, mat3x2<f32>());
-  tint_symbol_19(sb, 256u, mat3x3<f32>());
-  tint_symbol_20(sb, 304u, mat3x4<f32>());
-  tint_symbol_21(sb, 352u, mat4x2<f32>());
-  tint_symbol_22(sb, 384u, mat4x3<f32>());
-  tint_symbol_23(sb, 448u, mat4x4<f32>());
-  tint_symbol_24(sb, 512u, array<vec3<f32>, 2>());
+  tint_symbol_12(sb, 144u, mat2x2<f32>());
+  tint_symbol_13(sb, 160u, mat2x3<f32>());
+  tint_symbol_14(sb, 192u, mat2x4<f32>());
+  tint_symbol_15(sb, 224u, mat3x2<f32>());
+  tint_symbol_16(sb, 256u, mat3x3<f32>());
+  tint_symbol_17(sb, 304u, mat3x4<f32>());
+  tint_symbol_18(sb, 352u, mat4x2<f32>());
+  tint_symbol_19(sb, 384u, mat4x3<f32>());
+  tint_symbol_20(sb, 448u, mat4x4<f32>());
+  tint_symbol_21(sb, 512u, array<vec3<f32>, 2>());
 }
 )";
 
@@ -546,64 +528,55 @@ fn tint_symbol_10(buffer : [[access(read_write)]] SB, offset : u32) -> vec4<u32>
 [[internal(intrinsic_load_vec4_f32)]]
 fn tint_symbol_11(buffer : [[access(read_write)]] SB, offset : u32) -> vec4<f32>
 
-[[internal(intrinsic_load_vec2_f32)]]
-fn tint_symbol_12(buffer : [[access(read_write)]] SB, offset : u32) -> vec2<f32>
-
-fn tint_symbol_13(buffer : [[access(read_write)]] SB, offset : u32) -> mat2x2<f32> {
-  return mat2x2<f32>(tint_symbol_12(buffer, (offset + 0u)), tint_symbol_12(buffer, (offset + 8u)));
+fn tint_symbol_12(buffer : [[access(read_write)]] SB, offset : u32) -> mat2x2<f32> {
+  return mat2x2<f32>(tint_symbol_5(buffer, (offset + 0u)), tint_symbol_5(buffer, (offset + 8u)));
 }
 
-[[internal(intrinsic_load_vec3_f32)]]
-fn tint_symbol_14(buffer : [[access(read_write)]] SB, offset : u32) -> vec3<f32>
-
-fn tint_symbol_15(buffer : [[access(read_write)]] SB, offset : u32) -> mat2x3<f32> {
-  return mat2x3<f32>(tint_symbol_14(buffer, (offset + 0u)), tint_symbol_14(buffer, (offset + 16u)));
+fn tint_symbol_13(buffer : [[access(read_write)]] SB, offset : u32) -> mat2x3<f32> {
+  return mat2x3<f32>(tint_symbol_8(buffer, (offset + 0u)), tint_symbol_8(buffer, (offset + 16u)));
 }
 
-[[internal(intrinsic_load_vec4_f32)]]
-fn tint_symbol_16(buffer : [[access(read_write)]] SB, offset : u32) -> vec4<f32>
-
-fn tint_symbol_17(buffer : [[access(read_write)]] SB, offset : u32) -> mat2x4<f32> {
-  return mat2x4<f32>(tint_symbol_16(buffer, (offset + 0u)), tint_symbol_16(buffer, (offset + 16u)));
+fn tint_symbol_14(buffer : [[access(read_write)]] SB, offset : u32) -> mat2x4<f32> {
+  return mat2x4<f32>(tint_symbol_11(buffer, (offset + 0u)), tint_symbol_11(buffer, (offset + 16u)));
 }
 
-fn tint_symbol_18(buffer : [[access(read_write)]] SB, offset : u32) -> mat3x2<f32> {
-  return mat3x2<f32>(tint_symbol_12(buffer, (offset + 0u)), tint_symbol_12(buffer, (offset + 8u)), tint_symbol_12(buffer, (offset + 16u)));
+fn tint_symbol_15(buffer : [[access(read_write)]] SB, offset : u32) -> mat3x2<f32> {
+  return mat3x2<f32>(tint_symbol_5(buffer, (offset + 0u)), tint_symbol_5(buffer, (offset + 8u)), tint_symbol_5(buffer, (offset + 16u)));
 }
 
-fn tint_symbol_19(buffer : [[access(read_write)]] SB, offset : u32) -> mat3x3<f32> {
-  return mat3x3<f32>(tint_symbol_14(buffer, (offset + 0u)), tint_symbol_14(buffer, (offset + 16u)), tint_symbol_14(buffer, (offset + 32u)));
+fn tint_symbol_16(buffer : [[access(read_write)]] SB, offset : u32) -> mat3x3<f32> {
+  return mat3x3<f32>(tint_symbol_8(buffer, (offset + 0u)), tint_symbol_8(buffer, (offset + 16u)), tint_symbol_8(buffer, (offset + 32u)));
 }
 
-fn tint_symbol_20(buffer : [[access(read_write)]] SB, offset : u32) -> mat3x4<f32> {
-  return mat3x4<f32>(tint_symbol_16(buffer, (offset + 0u)), tint_symbol_16(buffer, (offset + 16u)), tint_symbol_16(buffer, (offset + 32u)));
+fn tint_symbol_17(buffer : [[access(read_write)]] SB, offset : u32) -> mat3x4<f32> {
+  return mat3x4<f32>(tint_symbol_11(buffer, (offset + 0u)), tint_symbol_11(buffer, (offset + 16u)), tint_symbol_11(buffer, (offset + 32u)));
 }
 
-fn tint_symbol_21(buffer : [[access(read_write)]] SB, offset : u32) -> mat4x2<f32> {
-  return mat4x2<f32>(tint_symbol_12(buffer, (offset + 0u)), tint_symbol_12(buffer, (offset + 8u)), tint_symbol_12(buffer, (offset + 16u)), tint_symbol_12(buffer, (offset + 24u)));
+fn tint_symbol_18(buffer : [[access(read_write)]] SB, offset : u32) -> mat4x2<f32> {
+  return mat4x2<f32>(tint_symbol_5(buffer, (offset + 0u)), tint_symbol_5(buffer, (offset + 8u)), tint_symbol_5(buffer, (offset + 16u)), tint_symbol_5(buffer, (offset + 24u)));
 }
 
-fn tint_symbol_22(buffer : [[access(read_write)]] SB, offset : u32) -> mat4x3<f32> {
-  return mat4x3<f32>(tint_symbol_14(buffer, (offset + 0u)), tint_symbol_14(buffer, (offset + 16u)), tint_symbol_14(buffer, (offset + 32u)), tint_symbol_14(buffer, (offset + 48u)));
+fn tint_symbol_19(buffer : [[access(read_write)]] SB, offset : u32) -> mat4x3<f32> {
+  return mat4x3<f32>(tint_symbol_8(buffer, (offset + 0u)), tint_symbol_8(buffer, (offset + 16u)), tint_symbol_8(buffer, (offset + 32u)), tint_symbol_8(buffer, (offset + 48u)));
 }
 
-fn tint_symbol_23(buffer : [[access(read_write)]] SB, offset : u32) -> mat4x4<f32> {
-  return mat4x4<f32>(tint_symbol_16(buffer, (offset + 0u)), tint_symbol_16(buffer, (offset + 16u)), tint_symbol_16(buffer, (offset + 32u)), tint_symbol_16(buffer, (offset + 48u)));
+fn tint_symbol_20(buffer : [[access(read_write)]] SB, offset : u32) -> mat4x4<f32> {
+  return mat4x4<f32>(tint_symbol_11(buffer, (offset + 0u)), tint_symbol_11(buffer, (offset + 16u)), tint_symbol_11(buffer, (offset + 32u)), tint_symbol_11(buffer, (offset + 48u)));
 }
 
-fn tint_symbol_24(buffer : [[access(read_write)]] SB, offset : u32) -> array<vec3<f32>, 2> {
+fn tint_symbol_21(buffer : [[access(read_write)]] SB, offset : u32) -> array<vec3<f32>, 2> {
   return array<vec3<f32>, 2>(tint_symbol_8(buffer, (offset + 0u)), tint_symbol_8(buffer, (offset + 16u)));
 }
 
-fn tint_symbol_25(buffer : [[access(read_write)]] SB, offset : u32) -> SB {
-  return SB(tint_symbol(buffer, (offset + 0u)), tint_symbol_1(buffer, (offset + 4u)), tint_symbol_2(buffer, (offset + 8u)), tint_symbol_3(buffer, (offset + 16u)), tint_symbol_4(buffer, (offset + 24u)), tint_symbol_5(buffer, (offset + 32u)), tint_symbol_6(buffer, (offset + 48u)), tint_symbol_7(buffer, (offset + 64u)), tint_symbol_8(buffer, (offset + 80u)), tint_symbol_9(buffer, (offset + 96u)), tint_symbol_10(buffer, (offset + 112u)), tint_symbol_11(buffer, (offset + 128u)), tint_symbol_13(buffer, (offset + 144u)), tint_symbol_15(buffer, (offset + 160u)), tint_symbol_17(buffer, (offset + 192u)), tint_symbol_18(buffer, (offset + 224u)), tint_symbol_19(buffer, (offset + 256u)), tint_symbol_20(buffer, (offset + 304u)), tint_symbol_21(buffer, (offset + 352u)), tint_symbol_22(buffer, (offset + 384u)), tint_symbol_23(buffer, (offset + 448u)), tint_symbol_24(buffer, (offset + 512u)));
+fn tint_symbol_22(buffer : [[access(read_write)]] SB, offset : u32) -> SB {
+  return SB(tint_symbol(buffer, (offset + 0u)), tint_symbol_1(buffer, (offset + 4u)), tint_symbol_2(buffer, (offset + 8u)), tint_symbol_3(buffer, (offset + 16u)), tint_symbol_4(buffer, (offset + 24u)), tint_symbol_5(buffer, (offset + 32u)), tint_symbol_6(buffer, (offset + 48u)), tint_symbol_7(buffer, (offset + 64u)), tint_symbol_8(buffer, (offset + 80u)), tint_symbol_9(buffer, (offset + 96u)), tint_symbol_10(buffer, (offset + 112u)), tint_symbol_11(buffer, (offset + 128u)), tint_symbol_12(buffer, (offset + 144u)), tint_symbol_13(buffer, (offset + 160u)), tint_symbol_14(buffer, (offset + 192u)), tint_symbol_15(buffer, (offset + 224u)), tint_symbol_16(buffer, (offset + 256u)), tint_symbol_17(buffer, (offset + 304u)), tint_symbol_18(buffer, (offset + 352u)), tint_symbol_19(buffer, (offset + 384u)), tint_symbol_20(buffer, (offset + 448u)), tint_symbol_21(buffer, (offset + 512u)));
 }
 
 var<storage> sb : [[access(read_write)]] SB;
 
 [[stage(compute)]]
 fn main() {
-  var x : SB = tint_symbol_25(sb, 0u);
+  var x : SB = tint_symbol_22(sb, 0u);
 }
 )";
 
@@ -711,75 +684,66 @@ fn tint_symbol_10(buffer : [[access(read_write)]] SB, offset : u32, value : vec4
 [[internal(intrinsic_store_vec4_i32)]]
 fn tint_symbol_11(buffer : [[access(read_write)]] SB, offset : u32, value : vec4<f32>)
 
-[[internal(intrinsic_store_vec2_i32)]]
-fn tint_symbol_12(buffer : [[access(read_write)]] SB, offset : u32, value : vec2<f32>)
-
-fn tint_symbol_13(buffer : [[access(read_write)]] SB, offset : u32, value : mat2x2<f32>) {
-  tint_symbol_12(buffer, (offset + 0u), value[0u]);
-  tint_symbol_12(buffer, (offset + 8u), value[1u]);
+fn tint_symbol_12(buffer : [[access(read_write)]] SB, offset : u32, value : mat2x2<f32>) {
+  tint_symbol_5(buffer, (offset + 0u), value[0u]);
+  tint_symbol_5(buffer, (offset + 8u), value[1u]);
 }
 
-[[internal(intrinsic_store_vec3_i32)]]
-fn tint_symbol_14(buffer : [[access(read_write)]] SB, offset : u32, value : vec3<f32>)
-
-fn tint_symbol_15(buffer : [[access(read_write)]] SB, offset : u32, value : mat2x3<f32>) {
-  tint_symbol_14(buffer, (offset + 0u), value[0u]);
-  tint_symbol_14(buffer, (offset + 16u), value[1u]);
-}
-
-[[internal(intrinsic_store_vec4_i32)]]
-fn tint_symbol_16(buffer : [[access(read_write)]] SB, offset : u32, value : vec4<f32>)
-
-fn tint_symbol_17(buffer : [[access(read_write)]] SB, offset : u32, value : mat2x4<f32>) {
-  tint_symbol_16(buffer, (offset + 0u), value[0u]);
-  tint_symbol_16(buffer, (offset + 16u), value[1u]);
-}
-
-fn tint_symbol_18(buffer : [[access(read_write)]] SB, offset : u32, value : mat3x2<f32>) {
-  tint_symbol_12(buffer, (offset + 0u), value[0u]);
-  tint_symbol_12(buffer, (offset + 8u), value[1u]);
-  tint_symbol_12(buffer, (offset + 16u), value[2u]);
-}
-
-fn tint_symbol_19(buffer : [[access(read_write)]] SB, offset : u32, value : mat3x3<f32>) {
-  tint_symbol_14(buffer, (offset + 0u), value[0u]);
-  tint_symbol_14(buffer, (offset + 16u), value[1u]);
-  tint_symbol_14(buffer, (offset + 32u), value[2u]);
-}
-
-fn tint_symbol_20(buffer : [[access(read_write)]] SB, offset : u32, value : mat3x4<f32>) {
-  tint_symbol_16(buffer, (offset + 0u), value[0u]);
-  tint_symbol_16(buffer, (offset + 16u), value[1u]);
-  tint_symbol_16(buffer, (offset + 32u), value[2u]);
-}
-
-fn tint_symbol_21(buffer : [[access(read_write)]] SB, offset : u32, value : mat4x2<f32>) {
-  tint_symbol_12(buffer, (offset + 0u), value[0u]);
-  tint_symbol_12(buffer, (offset + 8u), value[1u]);
-  tint_symbol_12(buffer, (offset + 16u), value[2u]);
-  tint_symbol_12(buffer, (offset + 24u), value[3u]);
-}
-
-fn tint_symbol_22(buffer : [[access(read_write)]] SB, offset : u32, value : mat4x3<f32>) {
-  tint_symbol_14(buffer, (offset + 0u), value[0u]);
-  tint_symbol_14(buffer, (offset + 16u), value[1u]);
-  tint_symbol_14(buffer, (offset + 32u), value[2u]);
-  tint_symbol_14(buffer, (offset + 48u), value[3u]);
-}
-
-fn tint_symbol_23(buffer : [[access(read_write)]] SB, offset : u32, value : mat4x4<f32>) {
-  tint_symbol_16(buffer, (offset + 0u), value[0u]);
-  tint_symbol_16(buffer, (offset + 16u), value[1u]);
-  tint_symbol_16(buffer, (offset + 32u), value[2u]);
-  tint_symbol_16(buffer, (offset + 48u), value[3u]);
-}
-
-fn tint_symbol_24(buffer : [[access(read_write)]] SB, offset : u32, value : array<vec3<f32>, 2>) {
+fn tint_symbol_13(buffer : [[access(read_write)]] SB, offset : u32, value : mat2x3<f32>) {
   tint_symbol_8(buffer, (offset + 0u), value[0u]);
   tint_symbol_8(buffer, (offset + 16u), value[1u]);
 }
 
-fn tint_symbol_25(buffer : [[access(read_write)]] SB, offset : u32, value : SB) {
+fn tint_symbol_14(buffer : [[access(read_write)]] SB, offset : u32, value : mat2x4<f32>) {
+  tint_symbol_11(buffer, (offset + 0u), value[0u]);
+  tint_symbol_11(buffer, (offset + 16u), value[1u]);
+}
+
+fn tint_symbol_15(buffer : [[access(read_write)]] SB, offset : u32, value : mat3x2<f32>) {
+  tint_symbol_5(buffer, (offset + 0u), value[0u]);
+  tint_symbol_5(buffer, (offset + 8u), value[1u]);
+  tint_symbol_5(buffer, (offset + 16u), value[2u]);
+}
+
+fn tint_symbol_16(buffer : [[access(read_write)]] SB, offset : u32, value : mat3x3<f32>) {
+  tint_symbol_8(buffer, (offset + 0u), value[0u]);
+  tint_symbol_8(buffer, (offset + 16u), value[1u]);
+  tint_symbol_8(buffer, (offset + 32u), value[2u]);
+}
+
+fn tint_symbol_17(buffer : [[access(read_write)]] SB, offset : u32, value : mat3x4<f32>) {
+  tint_symbol_11(buffer, (offset + 0u), value[0u]);
+  tint_symbol_11(buffer, (offset + 16u), value[1u]);
+  tint_symbol_11(buffer, (offset + 32u), value[2u]);
+}
+
+fn tint_symbol_18(buffer : [[access(read_write)]] SB, offset : u32, value : mat4x2<f32>) {
+  tint_symbol_5(buffer, (offset + 0u), value[0u]);
+  tint_symbol_5(buffer, (offset + 8u), value[1u]);
+  tint_symbol_5(buffer, (offset + 16u), value[2u]);
+  tint_symbol_5(buffer, (offset + 24u), value[3u]);
+}
+
+fn tint_symbol_19(buffer : [[access(read_write)]] SB, offset : u32, value : mat4x3<f32>) {
+  tint_symbol_8(buffer, (offset + 0u), value[0u]);
+  tint_symbol_8(buffer, (offset + 16u), value[1u]);
+  tint_symbol_8(buffer, (offset + 32u), value[2u]);
+  tint_symbol_8(buffer, (offset + 48u), value[3u]);
+}
+
+fn tint_symbol_20(buffer : [[access(read_write)]] SB, offset : u32, value : mat4x4<f32>) {
+  tint_symbol_11(buffer, (offset + 0u), value[0u]);
+  tint_symbol_11(buffer, (offset + 16u), value[1u]);
+  tint_symbol_11(buffer, (offset + 32u), value[2u]);
+  tint_symbol_11(buffer, (offset + 48u), value[3u]);
+}
+
+fn tint_symbol_21(buffer : [[access(read_write)]] SB, offset : u32, value : array<vec3<f32>, 2>) {
+  tint_symbol_8(buffer, (offset + 0u), value[0u]);
+  tint_symbol_8(buffer, (offset + 16u), value[1u]);
+}
+
+fn tint_symbol_22(buffer : [[access(read_write)]] SB, offset : u32, value : SB) {
   tint_symbol(buffer, (offset + 0u), value.a);
   tint_symbol_1(buffer, (offset + 4u), value.b);
   tint_symbol_2(buffer, (offset + 8u), value.c);
@@ -792,23 +756,23 @@ fn tint_symbol_25(buffer : [[access(read_write)]] SB, offset : u32, value : SB)
   tint_symbol_9(buffer, (offset + 96u), value.j);
   tint_symbol_10(buffer, (offset + 112u), value.k);
   tint_symbol_11(buffer, (offset + 128u), value.l);
-  tint_symbol_13(buffer, (offset + 144u), value.m);
-  tint_symbol_15(buffer, (offset + 160u), value.n);
-  tint_symbol_17(buffer, (offset + 192u), value.o);
-  tint_symbol_18(buffer, (offset + 224u), value.p);
-  tint_symbol_19(buffer, (offset + 256u), value.q);
-  tint_symbol_20(buffer, (offset + 304u), value.r);
-  tint_symbol_21(buffer, (offset + 352u), value.s);
-  tint_symbol_22(buffer, (offset + 384u), value.t);
-  tint_symbol_23(buffer, (offset + 448u), value.u);
-  tint_symbol_24(buffer, (offset + 512u), value.v);
+  tint_symbol_12(buffer, (offset + 144u), value.m);
+  tint_symbol_13(buffer, (offset + 160u), value.n);
+  tint_symbol_14(buffer, (offset + 192u), value.o);
+  tint_symbol_15(buffer, (offset + 224u), value.p);
+  tint_symbol_16(buffer, (offset + 256u), value.q);
+  tint_symbol_17(buffer, (offset + 304u), value.r);
+  tint_symbol_18(buffer, (offset + 352u), value.s);
+  tint_symbol_19(buffer, (offset + 384u), value.t);
+  tint_symbol_20(buffer, (offset + 448u), value.u);
+  tint_symbol_21(buffer, (offset + 512u), value.v);
 }
 
 var<storage> sb : [[access(read_write)]] SB;
 
 [[stage(compute)]]
 fn main() {
-  tint_symbol_25(sb, 0u, SB());
+  tint_symbol_22(sb, 0u, SB());
 }
 )";