diff --git a/core/container/array.odin b/core/container/array.odin
index 123440b2e..945d2a5c2 100644
--- a/core/container/array.odin
+++ b/core/container/array.odin
@@ -46,23 +46,23 @@ array_slice :: proc(a: $A/Array($T)) -> []T {
 }
 
 
-array_get :: proc(a: $A/Array($T), index: int) -> T {
-	assert(uint(index) < a.len);
+array_get :: proc(a: $A/Array($T), index: int, loc := #caller_location) -> T {
+	assert(condition=0 <= index && index < a.len, loc=loc);
 	return (^T)(uintptr(a.data) + size_of(T)*uintptr(index))^;
 }
-array_get_ptr :: proc(a: $A/Array($T), index: int) -> ^T {
-	assert(uint(index) < a.len);
+array_get_ptr :: proc(a: $A/Array($T), index: int, loc := #caller_location) -> ^T {
+	assert(condition=0 <= index && index < a.len, loc=loc);
 	return (^T)(uintptr(a.data) + size_of(T)*uintptr(index));
 }
 
-array_set :: proc(a: ^$A/Array($T), index: int, item: T)  {
-	assert(uint(index) < a.len);
+array_set :: proc(a: ^$A/Array($T), index: int, item: T, loc := #caller_location)  {
+	assert(condition=0 <= index && index < a.len, loc=loc);
 	(^T)(uintptr(a.data) + size_of(T)*uintptr(index))^ = item;
 }
 
 
 array_reserve :: proc(a: ^$A/Array, capacity: int) {
-	if capacity > a.size {
+	if capacity > a.len {
 		array_set_capacity(a, capacity);
 	}
 }
@@ -81,8 +81,8 @@ array_push_back :: proc(a: ^$A/Array($T), item: T) {
 		array_grow(a);
 	}
 
-	a.size += 1;
-	array_set(a, a.size, item);
+	a.len += 1;
+	array_set(a, a.len-1, item);
 }
 
 array_push_front :: proc(a: ^$A/Array($T), item: T) {
@@ -114,8 +114,8 @@ array_pop_font :: proc(a: ^$A/Array($T)) -> T {
 
 
 array_consume :: proc(a: ^$A/Array($T), count: int) {
-	assert(a.size >= count);
-	a.size -= count;
+	assert(a.len >= count);
+	a.len -= count;
 }
 
 
@@ -130,7 +130,7 @@ array_clear :: proc(q: ^$Q/Queue($T)) {
 
 array_push_back_elems :: proc(a: ^$A/Array($T), items: ..T) {
 	if array_space(a^) < len(items) {
-		array_grow(a, a.size + len(items));
+		array_grow(a, a.len + len(items));
 	}
 	offset := a.len;
 	a.len += len(items);
@@ -163,6 +163,6 @@ array_set_capacity :: proc(a: ^$A/Array($T), new_capacity: int) {
 	a.cap = new_capacity;
 }
 array_grow :: proc(a: ^$A/Array, min_capacity: int = 0) {
-	new_capacity := max(len(a.data)*2 + 8, min_capacity);
+	new_capacity := max(array_len(a^)*2 + 8, min_capacity);
 	array_set_capacity(a, new_capacity);
 }
diff --git a/src/check_expr.cpp b/src/check_expr.cpp
index 357c6b53a..d43d51e21 100644
--- a/src/check_expr.cpp
+++ b/src/check_expr.cpp
@@ -5762,36 +5762,34 @@ bool check_assignment_arguments(CheckerContext *ctx, Array<Operand> const &lhs,
 				val.type = tuple->Tuple.variables[0]->type;
 				val.mode = Addressing_Value;
 				array_add(operands, val);
-				tuple_index += 1;
+				tuple_index += tuple->Tuple.variables.count;
 			} else {
 				array_add(operands, o);
 				tuple_index += 1;
 			}
 		} else {
 			TypeTuple *tuple = &o.type->Tuple;
-			if (o.mode == Addressing_OptionalOk) {
+			if (o.mode == Addressing_OptionalOk && lhs.count == 1) {
 				GB_ASSERT(tuple->variables.count == 2);
-				if (lhs.count == 1) {
-					Ast *expr = unparen_expr(o.expr);
-					if (expr->kind == Ast_CallExpr) {
-						expr->CallExpr.optional_ok_one = true;
-					}
-					Operand val = o;
-					val.type = tuple->variables[0]->type;
-					val.mode = Addressing_Value;
-					array_add(operands, val);
-					tuple_index += 1;
-					continue;
+				Ast *expr = unparen_expr(o.expr);
+				if (expr->kind == Ast_CallExpr) {
+					expr->CallExpr.optional_ok_one = true;
 				}
-			}
+				Operand val = o;
+				val.type = tuple->variables[0]->type;
+				val.mode = Addressing_Value;
+				array_add(operands, val);
+				tuple_index += tuple->variables.count;
 
-			for_array(j, tuple->variables) {
-				o.type = tuple->variables[j]->type;
-				array_add(operands, o);
-			}
+				add_type_and_value(c->info, val.expr, val.mode, val.type, val.value);
+			} else {
+				for_array(j, tuple->variables) {
+					o.type = tuple->variables[j]->type;
+					array_add(operands, o);
+				}
 
-			isize count = tuple->variables.count;
-			tuple_index += 2;
+				tuple_index += tuple->variables.count;
+			}
 		}
 	}
 
@@ -5868,29 +5866,30 @@ bool check_unpack_arguments(CheckerContext *ctx, Entity **lhs, isize lhs_count,
 			}
 		} else {
 			TypeTuple *tuple = &o.type->Tuple;
-			if (o.mode == Addressing_OptionalOk) {
+			if (o.mode == Addressing_OptionalOk && lhs_count == 1) {
 				GB_ASSERT(tuple->variables.count == 2);
-				if (lhs_count == 1) {
-					Ast *expr = unparen_expr(o.expr);
-					if (expr->kind == Ast_CallExpr) {
-						expr->CallExpr.optional_ok_one = true;
-					}
-					Operand val = o;
-					val.type = tuple->variables[0]->type;
-					val.mode = Addressing_Value;
-					array_add(operands, val);
-					tuple_index += 1;
-					continue;
+				Ast *expr = unparen_expr(o.expr);
+				if (expr->kind == Ast_CallExpr) {
+					expr->CallExpr.optional_ok_one = true;
 				}
-			}
+				Operand val = o;
+				val.type = tuple->variables[0]->type;
+				val.mode = Addressing_Value;
+				array_add(operands, val);
 
-			for_array(j, tuple->variables) {
-				o.type = tuple->variables[j]->type;
-				array_add(operands, o);
-			}
+				isize count = tuple->variables.count;
+				tuple_index += add_dependencies_from_unpacking(c, lhs, lhs_count, tuple_index, count);
+				
+				add_type_and_value(c->info, val.expr, val.mode, val.type, val.value);
+			} else {
+				for_array(j, tuple->variables) {
+					o.type = tuple->variables[j]->type;
+					array_add(operands, o);
+				}
 
-			isize count = tuple->variables.count;
-			tuple_index += add_dependencies_from_unpacking(c, lhs, lhs_count, tuple_index, count);
+				isize count = tuple->variables.count;
+				tuple_index += add_dependencies_from_unpacking(c, lhs, lhs_count, tuple_index, count);
+			}
 		}
 	}