diff --git a/src/cc65/codeent.c b/src/cc65/codeent.c
index b74c1e8d3..427a17ef1 100644
--- a/src/cc65/codeent.c
+++ b/src/cc65/codeent.c
@@ -244,10 +244,10 @@ CodeEntry* NewCodeEntry (opc_t OPC, am_t AM, const char* Arg,
     /* Initialize the fields */
     E->OPC    = D->OPC;
     E->AM     = AM;
-    E->Arg    = GetArgCopy (Arg);
-    E->Flags  = NumArg (E->Arg, &E->Num)? CEF_NUMARG : 0;
-    E->Info   = D->Info;
     E->Size   = GetInsnSize (E->OPC, E->AM);
+    E->Flags  = NumArg (E->Arg, &E->Num)? CEF_NUMARG : 0;
+    E->Arg    = GetArgCopy (Arg);
+    E->Info   = D->Info;
     E->JumpTo = JumpTo;
     E->LI     = UseLineInfo (LI);
     E->RI     = 0;
diff --git a/src/cc65/codeent.h b/src/cc65/codeent.h
index 60fc28bf8..81660287a 100644
--- a/src/cc65/codeent.h
+++ b/src/cc65/codeent.h
@@ -66,15 +66,15 @@
 /* Code entry structure */
 typedef struct CodeEntry CodeEntry;
 struct CodeEntry {
-    opc_t	     	OPC;		/* Opcode */
-    am_t	     	AM;		/* Adressing mode */
+    unsigned char       OPC;		/* Opcode */
+    unsigned char       AM;		/* Adressing mode */
+    unsigned char    	Size;		/* Estimated size */
+    unsigned char       Flags;		/* Flags */
     char*      	       	Arg;   	       	/* Argument as string */
     unsigned long    	Num;		/* Numeric argument */
-    unsigned short   	Flags;		/* Flags */
     unsigned short      Info;		/* Additional code info */
     unsigned short      Use;		/* Registers used */
     unsigned short      Chg;		/* Registers changed/destroyed */
-    unsigned char    	Size;		/* Estimated size */
     CodeLabel*	     	JumpTo;		/* Jump label */
     Collection	     	Labels;		/* Labels for this instruction */
     LineInfo*           LI;             /* Source line info for this insn */