diff --git a/src/lisp/compiler.h b/src/lisp/compiler.h
index b3bd89c..ae66001 100644
--- a/src/lisp/compiler.h
+++ b/src/lisp/compiler.h
@@ -11,10 +11,10 @@
 	int nargs; // number of arguments
 
 	union {
-		value_t (*def0) ();
-		value_t (*def1) (value_t);
-		value_t (*def2) (value_t, value_t);
-		value_t (*def3) (value_t, value_t, value_t);
+		value_t (*def0)();
+		value_t (*def1)(value_t);
+		value_t (*def2)(value_t, value_t);
+		value_t (*def3)(value_t, value_t, value_t);
 		void *code_ptr;
 		uintptr_t code_addr;
 	};
@@ -39,13 +39,16 @@
 {
 	int num_vars;
 	struct variable *first;
+	int npc;
+	int nextpc;
 };
 
-void compile_expression (struct environment *env, struct local *local,
-                         value_t val, dasm_State **Dst);
-void compile_expr_to_func (struct environment *env, char *name, value_t val,
-                           dasm_State **Dst);
+void compile_expression(struct environment *env, struct local *local,
+                        value_t val, dasm_State **Dst);
+void compile_expr_to_func(struct environment *env, char *name, value_t val,
+                          dasm_State **Dst);
+int nextpc(struct local *local, dasm_State **Dst);
 // Compile top-level declaration
-void compile_tl (value_t val, struct environment *env);
-struct environment compile_all (struct istream *is);
-struct function *find_function (struct environment *env, char *name);
+void compile_tl(value_t val, struct environment *env);
+struct environment compile_all(struct istream *is);
+struct function *find_function(struct environment *env, char *name);