diff --git a/include/lightning.h b/include/lightning.h
index 23585a434..d045ca116 100644
--- a/include/lightning.h
+++ b/include/lightning.h
@@ -871,7 +871,7 @@ typedef enum {
 #define jit_va_arg_d(u, v)	jit_new_node_ww(jit_code_va_arg_d, u, v)
     jit_code_va_end,
 #define jit_va_end(u)		jit_new_node_w(jit_code_va_end, u)
-#define jit_code_last_code	jit_code_va_end
+    jit_code_last_code
 } jit_code_t;
 
 typedef void* (*jit_alloc_func_ptr)	(size_t);
diff --git a/lib/jit_size.c b/lib/jit_size.c
index eef7ed1e6..8cb433ec9 100644
--- a/lib/jit_size.c
+++ b/lib/jit_size.c
@@ -26,7 +26,7 @@
 /*
  * Initialization
  */
-static jit_int16_t	_szs[jit_code_last_code + 1] = {
+static jit_int16_t	_szs[jit_code_last_code] = {
 #if GET_JIT_SIZE
 #  define JIT_INSTR_MAX		256
 #else
diff --git a/size.c b/size.c
index f83aeca24..59a7322c8 100644
--- a/size.c
+++ b/size.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "lib/jit_names.c"
 
-jit_int16_t	_szs[jit_code_last_code + 1];
+jit_int16_t	_szs[jit_code_last_code];
 
 int
 main(int argc, char *argv[])
@@ -40,7 +40,7 @@ main(int argc, char *argv[])
     fclose(fp);
 
     max = 0;
-    for (offset = 0; offset <= jit_code_last_code; offset++)
+    for (offset = 0; offset < jit_code_last_code; offset++)
 	if (max < _szs[offset])
 	    max = _szs[offset];
 
@@ -82,7 +82,7 @@ main(int argc, char *argv[])
     fprintf(fp, "#if defined(__powerpc__)\n");
 #endif
     fprintf(fp, "#define JIT_INSTR_MAX %d\n", max);
-    for (offset = 0; offset <= jit_code_last_code; offset++)
+    for (offset = 0; offset < jit_code_last_code; offset++)
 	fprintf(fp, "    %d,	/* %s */\n", _szs[offset], code_name[offset]);
 #if defined(__arm__)
     fprintf(fp, "#endif /* __ARM_PCS_VFP */\n");