diff --git a/src/llvm_backend_debug.cpp b/src/llvm_backend_debug.cpp
index a793aaa6d..ee2e03739 100644
--- a/src/llvm_backend_debug.cpp
+++ b/src/llvm_backend_debug.cpp
@@ -980,8 +980,7 @@ void lb_add_debug_local_variable(lbProcedure *p, LLVMValueRef ptr, Type *type, T
 	LLVMDIBuilderInsertDeclareAtEnd(m->debug_builder, storage, var_info, llvm_expr, llvm_debug_loc, block);
 }
 
-
-void lb_add_debug_param_variable_direct(lbProcedure *p, LLVMValueRef ptr, Type *type, Token const &token, unsigned arg_number, lbBlock *block) {
+void lb_add_debug_param_variable(lbProcedure *p, LLVMValueRef ptr, Type *type, Token const &token, unsigned arg_number, lbBlock *block, lbArgKind arg_kind) {
 	if (p->debug_info == nullptr) {
 		return;
 	}
@@ -1042,73 +1041,15 @@ void lb_add_debug_param_variable_direct(lbProcedure *p, LLVMValueRef ptr, Type *
 	// NOTE(bill, 2022-02-01): For parameter values, you must insert them at the end of the decl block
 	// The reason is that if the parameter is at index 0 and a pointer, there is not such things as an
 	// instruction "before" it.
-	LLVMDIBuilderInsertDbgValueAtEnd(m->debug_builder, storage, var_info, llvm_expr, llvm_debug_loc, block->block);
-}
-
-
-void lb_add_debug_param_variable_indirect(lbProcedure *p, LLVMValueRef ptr, Type *type, Token const &token, unsigned arg_number, lbBlock *block) {
-	if (p->debug_info == nullptr) {
-		return;
-	}
-	if (type == nullptr) {
-		return;
-	}
-	if (type == t_invalid) {
-		return;
-	}
-	if (p->body == nullptr) {
-		return;
+	switch (arg_kind) {
+	case lbArg_Direct:
+		LLVMDIBuilderInsertDbgValueAtEnd(m->debug_builder, storage, var_info, llvm_expr, llvm_debug_loc, block->block);
+		break;
+	case lbArg_Indirect:
+		LLVMDIBuilderInsertDeclareAtEnd(m->debug_builder, storage, var_info, llvm_expr, llvm_debug_loc, block->block);
+		break;
 	}
 
-	lbModule *m = p->module;
-	String const &name = token.string;
-	if (name == "" || name == "_") {
-		return;
-	}
-
-	if (lb_get_llvm_metadata(m, ptr) != nullptr) {
-		// Already been set
-		return;
-	}
-
-
-	AstFile *file = p->body->file();
-
-	LLVMMetadataRef llvm_scope = lb_get_current_debug_scope(p);
-	LLVMMetadataRef llvm_file = lb_get_llvm_metadata(m, file);
-	GB_ASSERT(llvm_scope != nullptr);
-	if (llvm_file == nullptr) {
-		llvm_file = LLVMDIScopeGetFile(llvm_scope);
-	}
-
-	if (llvm_file == nullptr) {
-		return;
-	}
-
-	LLVMDIFlags flags = LLVMDIFlagZero;
-	LLVMBool always_preserve = build_context.optimization_level == 0;
-
-	LLVMMetadataRef debug_type = lb_debug_type(m, type);
-
-	LLVMMetadataRef var_info = LLVMDIBuilderCreateParameterVariable(
-		m->debug_builder, llvm_scope,
-		cast(char const *)name.text, cast(size_t)name.len,
-		arg_number,
-		llvm_file, token.pos.line,
-		debug_type,
-		always_preserve, flags
-	);
-
-	LLVMValueRef storage = ptr;
-	LLVMMetadataRef llvm_debug_loc = lb_debug_location_from_token_pos(p, token.pos);
-	LLVMMetadataRef llvm_expr = LLVMDIBuilderCreateExpression(m->debug_builder, nullptr, 0);
-	lb_set_llvm_metadata(m, ptr, llvm_expr);
-
-	// NOTE(bill, 2022-02-01): For parameter values, you must insert them at the end of the decl block
-	// The reason is that if the parameter is at index 0 and a pointer, there is not such things as an
-	// instruction "before" it.
-	LLVMDIBuilderInsertDeclareAtEnd(m->debug_builder, storage, var_info, llvm_expr, llvm_debug_loc, block->block);
-	// LLVMDIBuilderInsertDbgValueAtEnd(m->debug_builder, storage, var_info, llvm_expr, llvm_debug_loc, block->block);
 }
 
 
diff --git a/src/llvm_backend_proc.cpp b/src/llvm_backend_proc.cpp
index 0e771fcc0..17501d657 100644
--- a/src/llvm_backend_proc.cpp
+++ b/src/llvm_backend_proc.cpp
@@ -552,7 +552,7 @@ void lb_begin_procedure_body(lbProcedure *p) {
 						if (original_value != value && LLVMIsALoadInst(value)) {
 							debug_storage_value = LLVMGetOperand(value, 0);
 						}
-						lb_add_debug_param_variable_direct(p, debug_storage_value, e->type, e->token, param_index+1, block);
+						lb_add_debug_param_variable(p, debug_storage_value, e->type, e->token, param_index+1, block, arg_type->kind);
 					}
 				} else if (arg_type->kind == lbArg_Indirect) {
 					if (e->token.string.len != 0 && !is_blank_ident(e->token.string)) {
@@ -560,7 +560,7 @@ void lb_begin_procedure_body(lbProcedure *p) {
 						ptr.value = LLVMGetParam(p->value, param_offset+param_index);
 						ptr.type = alloc_type_pointer(e->type);
 						lb_add_entity(p->module, e, ptr);
-						lb_add_debug_param_variable_indirect(p, ptr.value, e->type, e->token, param_index+1, p->decl_block);
+						lb_add_debug_param_variable(p, ptr.value, e->type, e->token, param_index+1, p->decl_block, arg_type->kind);
 					}
 				}
 			}