diff --git a/src/checker.cpp b/src/checker.cpp
index c8b737df8..a6cb80b7d 100644
--- a/src/checker.cpp
+++ b/src/checker.cpp
@@ -1035,12 +1035,22 @@ void add_type_and_value(CheckerInfo *i, Ast *expr, AddressingMode mode, Type *ty
 		return;
 	}
 
-	expr->tav.mode = mode;
-	expr->tav.type = type;
-	if (mode == Addressing_Constant || mode == Addressing_Invalid) {
-		expr->tav.value = value;
-	} else if (mode == Addressing_Value && is_type_typeid(type)) {
-		expr->tav.value = value;
+	Ast *prev_expr = nullptr;
+	for (;;) {
+		if (prev_expr != expr) {
+			expr->tav.mode = mode;
+			expr->tav.type = type;
+			if (mode == Addressing_Constant || mode == Addressing_Invalid) {
+				expr->tav.value = value;
+			} else if (mode == Addressing_Value && is_type_typeid(type)) {
+				expr->tav.value = value;
+			}
+
+			prev_expr = expr;
+		} else {
+			break;
+		}
+		expr = unparen_expr(expr);
 	}
 }
 
diff --git a/src/ir.cpp b/src/ir.cpp
index 40b83c048..2b6917d0d 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -7046,13 +7046,18 @@ irValue *ir_build_expr(irProcedure *proc, Ast *expr) {
 }
 
 irValue *ir_build_expr_internal(irProcedure *proc, Ast *expr) {
+	Ast *original_expr = expr;
 	expr = unparen_expr(expr);
 	// ir_push_debug_location(proc->module, expr, proc->debug_scope);
 	// defer (ir_pop_debug_location(proc->module));
 
 	TypeAndValue tv = type_and_value_of_expr(expr);
 	GB_ASSERT(tv.mode != Addressing_Invalid);
-	GB_ASSERT(tv.mode != Addressing_Type);
+	if (tv.mode == Addressing_Type) {
+		// HACK TODO(bill): This is hack but it should be safe in virtually all cases
+		irValue *v = ir_typeid(proc->module, tv.type);
+		return ir_emit_conv(proc, v, t_typeid);
+	} 
 
 	if (tv.value.kind != ExactValue_Invalid) {
 		// NOTE(bill): Edge case