diff --git a/library/LuaTools.cpp b/library/LuaTools.cpp
index bf40e4041..b4f959446 100644
--- a/library/LuaTools.cpp
+++ b/library/LuaTools.cpp
@@ -981,7 +981,7 @@ void DFHack::Lua::InvokeEvent(color_ostream &out, lua_State *state, void *key, i
     set_dfhack_output(state, cur_out);
 }
 
-void DFHack::Lua::CreateEvent(lua_State *state, void *key)
+void DFHack::Lua::MakeEvent(lua_State *state, void *key)
 {
     lua_rawgetp(state, LUA_REGISTRYINDEX, key);
 
@@ -1009,7 +1009,7 @@ void DFHack::Lua::Notification::bind(lua_State *state, void *key)
 
 void DFHack::Lua::Notification::bind(lua_State *state, const char *name)
 {
-    CreateEvent(state, this);
+    MakeEvent(state, this);
 
     if (handler)
     {
diff --git a/library/PluginManager.cpp b/library/PluginManager.cpp
index edc7fb9f8..1821e18d7 100644
--- a/library/PluginManager.cpp
+++ b/library/PluginManager.cpp
@@ -537,7 +537,7 @@ void Plugin::open_lua(lua_State *state, int table)
     {
         for (auto it = lua_events.begin(); it != lua_events.end(); ++it)
         {
-            Lua::CreateEvent(state, it->second);
+            Lua::MakeEvent(state, it->second);
 
             push_function(state, &it->second->handler);
             lua_rawsetp(state, -2, NULL);
diff --git a/library/include/LuaTools.h b/library/include/LuaTools.h
index 549bdaaf0..7e38f5bb3 100644
--- a/library/include/LuaTools.h
+++ b/library/include/LuaTools.h
@@ -175,6 +175,7 @@ namespace DFHack {namespace Lua {
     /**
      * Push utility functions
      */
+#if 0
 #define NUMBER_PUSH(type) inline void Push(lua_State *state, type value) { lua_pushnumber(state, value); }
     NUMBER_PUSH(char)
     NUMBER_PUSH(int8_t) NUMBER_PUSH(uint8_t)
@@ -183,6 +184,11 @@ namespace DFHack {namespace Lua {
     NUMBER_PUSH(int64_t) NUMBER_PUSH(uint64_t)
     NUMBER_PUSH(float) NUMBER_PUSH(double)
 #undef NUMBER_PUSH
+#else
+    template<class T> inline void Push(lua_State *state, T value) {
+        lua_pushnumber(state, lua_Number(value));
+    }
+#endif
     inline void Push(lua_State *state, bool value) {
         lua_pushboolean(state, value);
     }
@@ -212,7 +218,7 @@ namespace DFHack {namespace Lua {
     DFHACK_EXPORT bool IsCoreContext(lua_State *state);
 
     DFHACK_EXPORT int NewEvent(lua_State *state);
-    DFHACK_EXPORT void CreateEvent(lua_State *state, void *key);
+    DFHACK_EXPORT void MakeEvent(lua_State *state, void *key);
     DFHACK_EXPORT void InvokeEvent(color_ostream &out, lua_State *state, void *key, int num_args);
 
     /**