diff --git a/source/gui/scripting/JSInterface_GUITypes.cpp b/source/gui/scripting/JSInterface_GUITypes.cpp
index 5e8da28361..1b39076e92 100644
--- a/source/gui/scripting/JSInterface_GUITypes.cpp
+++ b/source/gui/scripting/JSInterface_GUITypes.cpp
@@ -23,11 +23,10 @@
 /**** GUISize ****/
 JSClass JSI_GUISize::JSI_class = {
 	"GUISize", 0,
-		JS_PropertyStub, JS_DeletePropertyStub,
-		JS_PropertyStub, JS_StrictPropertyStub,
-		JS_EnumerateStub, JS_ResolveStub,
-		JS_ConvertStub, NULL,
-		NULL, NULL, JSI_GUISize::construct, NULL
+	nullptr, nullptr,
+	nullptr, nullptr,
+	nullptr, nullptr, nullptr, nullptr,
+	nullptr, nullptr, JSI_GUISize::construct, nullptr
 };
 
 JSFunctionSpec JSI_GUISize::JSI_methods[] =
@@ -132,11 +131,10 @@ bool JSI_GUISize::toString(JSContext* cx, uint argc, jsval* vp)
 
 JSClass JSI_GUIColor::JSI_class = {
 	"GUIColor", 0,
-		JS_PropertyStub, JS_DeletePropertyStub,
-		JS_PropertyStub, JS_StrictPropertyStub,
-		JS_EnumerateStub, JS_ResolveStub,
-		JS_ConvertStub, NULL,
-		NULL, NULL, JSI_GUIColor::construct, NULL
+	nullptr, nullptr,
+	nullptr, nullptr,
+	nullptr, nullptr, nullptr, nullptr,
+	nullptr, nullptr, JSI_GUIColor::construct, nullptr
 };
 
 JSFunctionSpec JSI_GUIColor::JSI_methods[] =
@@ -202,11 +200,10 @@ bool JSI_GUIColor::toString(JSContext* cx, uint argc, jsval* vp)
 
 JSClass JSI_GUIMouse::JSI_class = {
 	"GUIMouse", 0,
-		JS_PropertyStub, JS_DeletePropertyStub,
-		JS_PropertyStub, JS_StrictPropertyStub,
-		JS_EnumerateStub, JS_ResolveStub,
-		JS_ConvertStub, NULL,
-		NULL, NULL, JSI_GUIMouse::construct, NULL
+	nullptr, nullptr,
+	nullptr, nullptr,
+	nullptr, nullptr, nullptr, nullptr,
+	nullptr, nullptr, JSI_GUIMouse::construct, nullptr
 };
 
 JSFunctionSpec JSI_GUIMouse::JSI_methods[] =
diff --git a/source/gui/scripting/JSInterface_IGUIObject.cpp b/source/gui/scripting/JSInterface_IGUIObject.cpp
index e0c033d682..34175f6012 100644
--- a/source/gui/scripting/JSInterface_IGUIObject.cpp
+++ b/source/gui/scripting/JSInterface_IGUIObject.cpp
@@ -33,11 +33,10 @@
 
 JSClass JSI_IGUIObject::JSI_class = {
 	"GUIObject", JSCLASS_HAS_PRIVATE,
-	JS_PropertyStub, JS_DeletePropertyStub,
+	nullptr, nullptr,
 	JSI_IGUIObject::getProperty, JSI_IGUIObject::setProperty,
-	JS_EnumerateStub, JS_ResolveStub,
-	JS_ConvertStub, NULL,
-	NULL, NULL, JSI_IGUIObject::construct, NULL
+	nullptr, nullptr, nullptr, nullptr,
+	nullptr, nullptr, JSI_IGUIObject::construct, nullptr
 };
 
 JSPropertySpec JSI_IGUIObject::JSI_props[] =
diff --git a/source/scriptinterface/ScriptInterface.cpp b/source/scriptinterface/ScriptInterface.cpp
index 5e5eba50a3..2c3611ec27 100644
--- a/source/scriptinterface/ScriptInterface.cpp
+++ b/source/scriptinterface/ScriptInterface.cpp
@@ -81,9 +81,9 @@ namespace
 
 JSClass global_class = {
 	"global", JSCLASS_GLOBAL_FLAGS,
-	JS_PropertyStub, JS_DeletePropertyStub, 
-	JS_PropertyStub, JS_StrictPropertyStub,
-	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub,
+	nullptr, nullptr,
+	nullptr, nullptr,
+	nullptr, nullptr, nullptr,
 	nullptr, nullptr, nullptr, nullptr,
 	JS_GlobalObjectTraceHook
 };
diff --git a/source/simulation2/system/InterfaceScripted.h b/source/simulation2/system/InterfaceScripted.h
index 9fe75692b3..133af6b207 100644
--- a/source/simulation2/system/InterfaceScripted.h
+++ b/source/simulation2/system/InterfaceScripted.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,11 +22,7 @@
 
 #define BEGIN_INTERFACE_WRAPPER(iname) \
 	JSClass class_ICmp##iname = { \
-		"ICmp" #iname, JSCLASS_HAS_PRIVATE, \
-		JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub, \
-		JS_EnumerateStub, JS_ResolveStub, \
-		JS_ConvertStub, NULL, \
-		NULL, NULL, NULL, NULL \
+		"ICmp" #iname, JSCLASS_HAS_PRIVATE \
 	}; \
 	static JSFunctionSpec methods_ICmp##iname[] = {