diff --git a/src/back/hlsl/conv.rs b/src/back/hlsl/conv.rs
index 039bfcce30..3feb80bb68 100644
--- a/src/back/hlsl/conv.rs
+++ b/src/back/hlsl/conv.rs
@@ -73,7 +73,6 @@ impl crate::TypeInner {
 
     /// Used to generate the name of the wrapped type constructor
     pub(super) fn hlsl_type_id<'a>(
-        &self,
         base: crate::Handle<crate::Type>,
         types: &crate::UniqueArena<crate::Type>,
         constants: &crate::Arena<crate::Constant>,
@@ -103,7 +102,7 @@ impl crate::TypeInner {
             } => Cow::Owned(format!(
                 "array{}_{}_",
                 constants[size].to_array_length().unwrap(),
-                self.hlsl_type_id(base, types, constants, names)?
+                Self::hlsl_type_id(base, types, constants, names)?
             )),
             crate::TypeInner::Struct { .. } => {
                 Cow::Borrowed(&names[&crate::proc::NameKey::Type(base)])
diff --git a/src/back/hlsl/help.rs b/src/back/hlsl/help.rs
index ec913ba66d..bea6220e78 100644
--- a/src/back/hlsl/help.rs
+++ b/src/back/hlsl/help.rs
@@ -274,7 +274,7 @@ impl<'a, W: Write> super::Writer<'a, W> {
         // Write function body
         writeln!(self.out, "{{")?;
 
-        let array_coords = if wiq.arrayed { 1 } else { 0 };
+        let array_coords = usize::from(wiq.arrayed);
         // extra parameter is the mip level count or the sample count
         let extra_coords = match wiq.class {
             crate::ImageClass::Storage { .. } => 0,
@@ -358,7 +358,7 @@ impl<'a, W: Write> super::Writer<'a, W> {
         module: &crate::Module,
         constructor: WrappedConstructor,
     ) -> BackendResult {
-        let name = module.types[constructor.ty].inner.hlsl_type_id(
+        let name = crate::TypeInner::hlsl_type_id(
             constructor.ty,
             &module.types,
             &module.constants,
@@ -927,7 +927,7 @@ impl<'a, W: Write> super::Writer<'a, W> {
 
                     if let Some(crate::AddressSpace::Storage { .. }) = pointer_space {
                         if let Some(ty) = func_ctx.info[handle].ty.handle() {
-                            write_wrapped_constructor(self, ty, module, func_ctx)?;
+                            write_wrapped_constructor(self, ty, module)?;
                         }
                     }
 
@@ -935,12 +935,11 @@ impl<'a, W: Write> super::Writer<'a, W> {
                         writer: &mut super::Writer<'_, W>,
                         ty: Handle<crate::Type>,
                         module: &crate::Module,
-                        func_ctx: &FunctionCtx,
                     ) -> BackendResult {
                         match module.types[ty].inner {
                             crate::TypeInner::Struct { ref members, .. } => {
                                 for member in members {
-                                    write_wrapped_constructor(writer, member.ty, module, func_ctx)?;
+                                    write_wrapped_constructor(writer, member.ty, module)?;
                                 }
 
                                 let constructor = WrappedConstructor { ty };
@@ -951,7 +950,7 @@ impl<'a, W: Write> super::Writer<'a, W> {
                                 }
                             }
                             crate::TypeInner::Array { base, .. } => {
-                                write_wrapped_constructor(writer, base, module, func_ctx)?;
+                                write_wrapped_constructor(writer, base, module)?;
                             }
                             _ => {}
                         };
diff --git a/src/back/spv/image.rs b/src/back/spv/image.rs
index e070cd6175..e19da14855 100644
--- a/src/back/spv/image.rs
+++ b/src/back/spv/image.rs
@@ -1017,7 +1017,7 @@ impl<'w> BlockContext<'w> {
                     Id::D3 => 3,
                 };
                 let extended_size_type_id = {
-                    let array_coords = if arrayed { 1 } else { 0 };
+                    let array_coords = usize::from(arrayed);
                     let vector_size = match dim_coords + array_coords {
                         2 => Some(crate::VectorSize::Bi),
                         3 => Some(crate::VectorSize::Tri),
diff --git a/src/front/glsl/mod.rs b/src/front/glsl/mod.rs
index f28ff7b6ec..0e0b503d3c 100644
--- a/src/front/glsl/mod.rs
+++ b/src/front/glsl/mod.rs
@@ -105,7 +105,7 @@ impl ShaderMetadata {
         self.version = 0;
         self.profile = Profile::Core;
         self.stage = stage;
-        self.workgroup_size = [if stage == ShaderStage::Compute { 1 } else { 0 }; 3];
+        self.workgroup_size = [u32::from(stage == ShaderStage::Compute); 3];
         self.early_fragment_tests = false;
         self.extensions.clear();
     }