diff --git a/sys/driver_info.h b/sys/driver_info.h
index 336975c..94a02fd 100644
--- a/sys/driver_info.h
+++ b/sys/driver_info.h
@@ -101,6 +101,7 @@
 #define DI_NUM_STRING_TABLE_SLOTS_USED                      -426
 #define DI_NUM_REGEX                                        -427
 #define DI_NUM_REGEX_TABLE_SLOTS                            -428
+#define DI_NUM_LVALUES                                      -429
 
 #define DI_SIZE_ACTIONS                                     -450
 #define DI_SIZE_CALLOUTS                                    -451
diff --git a/sys/lpctypes.h b/sys/lpctypes.h
index 3187d6b..3c585bc 100644
--- a/sys/lpctypes.h
+++ b/sys/lpctypes.h
@@ -46,7 +46,12 @@
 #define CLOSURE_LAMBDA          5  /* normal lambda closure */
 #define CLOSURE_UNBOUND_LAMBDA  6  /* unbound lambda closure. */
 
-#define CLOSURE_OPERATOR        (0xe800)
+#ifdef __PYTHON__
+#  define CLOSURE_OPERATOR      (0xe000)
+#  define CLOSURE_PYTHON_EFUN   (0xe800)
+#else
+#  define CLOSURE_OPERATOR      (0xe800)
+#endif
 #define CLOSURE_EFUN            (0xf000)
 #define CLOSURE_SIMUL_EFUN      (0xf800)
 
@@ -58,6 +63,9 @@
 #define CLOSURE_IS_SIMUL_EFUN(x) (((x) & 0xf800) == CLOSURE_SIMUL_EFUN)
 #define CLOSURE_IS_EFUN(x)	 (((x) & 0xf800) == CLOSURE_EFUN)
 #define CLOSURE_IS_OPERATOR(x)	 (((x) & 0xf800) == CLOSURE_OPERATOR)
+#ifdef __PYTHON__
+#  define CLOSURE_IS_PYTHON_EFUN(x)	(((x) & 0xf800) == CLOSURE_PYTHON_EFUN)
+#endif
 
 #endif /* __DRIVER_SOURCE__ */
 
diff --git a/sys/telnet.h b/sys/telnet.h
index 94a2b14..de7b75c 100644
--- a/sys/telnet.h
+++ b/sys/telnet.h
@@ -117,7 +117,6 @@
 #define  TELOPT_ZMP           93        /* Zenith Mud Protocol */
 #define  TELOPT_MUSHCLIENT   102        /* Mushclient/Aardwolf Protocol */
 #define  TELOPT_ATCP         200        /* Achaea Telnet Client Protocol */
-#define  TELOPT_GMCP         201        /* General Mud Communication Protocol*/
 
 #define  NTELOPTS            256        /* was: (1+TELOPT_NEWENV) */