diff --git a/src/checker.hpp b/src/checker.hpp
index 6a00ce0e1..b760482ff 100644
--- a/src/checker.hpp
+++ b/src/checker.hpp
@@ -9,15 +9,15 @@ struct Checker;
 struct CheckerInfo;
 struct CheckerContext;
 
-enum AddressingMode;
+enum AddressingMode : u8;
 struct TypeAndValue;
 
 // ExprInfo stores information used for "untyped" expressions
 struct ExprInfo {
 	AddressingMode mode;
+	bool is_lhs; // Debug info
 	Type *         type;
 	ExactValue     value;
-	bool is_lhs; // Debug info
 };
 
 gb_inline ExprInfo *make_expr_info(AddressingMode mode, Type *type, ExactValue const &value, bool is_lhs) {
diff --git a/src/parser.hpp b/src/parser.hpp
index b14e336c3..390bfbba2 100644
--- a/src/parser.hpp
+++ b/src/parser.hpp
@@ -6,7 +6,7 @@ struct DeclInfo;
 struct AstFile;
 struct AstPackage;
 
-enum AddressingMode {
+enum AddressingMode : u8 {
 	Addressing_Invalid   = 0,        // invalid addressing mode
 	Addressing_NoValue   = 1,        // no value (void in C)
 	Addressing_Value     = 2,        // computed value (rvalue)
@@ -29,6 +29,7 @@ enum AddressingMode {
 
 struct TypeAndValue {
 	AddressingMode mode;
+	bool           is_lhs; // Debug info
 	Type *         type;
 	ExactValue     value;
 };