diff --git a/src/ecmascript/spidermonkey/document.c b/src/ecmascript/spidermonkey/document.c
index 0d2543f1..fed609e2 100644
--- a/src/ecmascript/spidermonkey/document.c
+++ b/src/ecmascript/spidermonkey/document.c
@@ -379,7 +379,7 @@ JSPropertySpec document_props[] = {
 	JS_PSG("referrer",	document_get_property_referrer, JSPROP_ENUMERATE),
 	JS_PSGS("title",	document_get_property_title, document_set_property_title, JSPROP_ENUMERATE), /* TODO: Charset? */
 	JS_PSGS("url",	document_get_property_url, document_set_property_url, JSPROP_ENUMERATE),
-	{ NULL }
+	JS_PS_END
 };
 
 
diff --git a/src/ecmascript/spidermonkey/form.c b/src/ecmascript/spidermonkey/form.c
index 7210dbe5..adbfc3d3 100644
--- a/src/ecmascript/spidermonkey/form.c
+++ b/src/ecmascript/spidermonkey/form.c
@@ -1263,7 +1263,7 @@ static JSPropertySpec input_props[] = {
 	JS_PSG("tabindex",	input_get_property_tabIndex, JSPROP_ENUMERATE),
 	JS_PSG("type",	input_get_property_type, JSPROP_ENUMERATE),
 	JS_PSGS("value",	input_get_property_value, input_set_property_value, JSPROP_ENUMERATE),
-	{ NULL }
+	JS_PS_END
 };
 
 static bool input_blur(JSContext *ctx, unsigned int argc, JS::Value *rval);
@@ -1628,7 +1628,7 @@ enum form_elements_prop {
 };
 static JSPropertySpec form_elements_props[] = {
 	JS_PSG("length",	form_elements_get_property_length, JSPROP_ENUMERATE),
-	{ NULL }
+	JS_PS_END
 };
 
 static bool
@@ -1904,7 +1904,7 @@ static JSPropertySpec form_props[] = {
 	JS_PSGS("method",	form_get_property_method, form_set_property_method, JSPROP_ENUMERATE),
 	JS_PSGS("name",	form_get_property_name, form_set_property_name, JSPROP_ENUMERATE),
 	JS_PSGS("target",	form_get_property_target, form_set_property_target, JSPROP_ENUMERATE),
-	{ NULL }
+	JS_PS_END
 };
 
 static bool form_reset(JSContext *ctx, unsigned int argc, JS::Value *rval);
@@ -2707,7 +2707,7 @@ enum forms_prop {
 };
 JSPropertySpec forms_props[] = {
 	JS_PSG("length",	forms_get_property_length, JSPROP_ENUMERATE),
-	{ NULL }
+	JS_PS_END
 };
 
 /* Find the form whose name is @name, which should normally be a
diff --git a/src/ecmascript/spidermonkey/location.c b/src/ecmascript/spidermonkey/location.c
index ebebdcd6..4a8a6951 100644
--- a/src/ecmascript/spidermonkey/location.c
+++ b/src/ecmascript/spidermonkey/location.c
@@ -179,7 +179,7 @@ enum location_prop {
 };
 JSPropertySpec location_props[] = {
 	JS_PSGS("href",	location_get_property_href, location_set_property_href, JSPROP_ENUMERATE),
-	{ NULL }
+	JS_PS_END
 };
 
 
diff --git a/src/ecmascript/spidermonkey/navigator.c b/src/ecmascript/spidermonkey/navigator.c
index 46c35dc1..2d19acd3 100644
--- a/src/ecmascript/spidermonkey/navigator.c
+++ b/src/ecmascript/spidermonkey/navigator.c
@@ -84,7 +84,7 @@ JSPropertySpec navigator_props[] = {
 	JS_PSG("language",	navigator_get_property_language, JSPROP_ENUMERATE),
 	JS_PSG("platform",	navigator_get_property_platform, JSPROP_ENUMERATE),
 	JS_PSG("userAgent",	navigator_get_property_userAgent, JSPROP_ENUMERATE),
-	{ NULL }
+	JS_PS_END
 };
 
 
diff --git a/src/ecmascript/spidermonkey/unibar.c b/src/ecmascript/spidermonkey/unibar.c
index 3f43736f..bf54b311 100644
--- a/src/ecmascript/spidermonkey/unibar.c
+++ b/src/ecmascript/spidermonkey/unibar.c
@@ -82,7 +82,7 @@ enum unibar_prop {
 };
 JSPropertySpec unibar_props[] = {
 	JS_PSGS("visible",	unibar_get_property_visible, unibar_set_property_visible, JSPROP_ENUMERATE),
-	{ NULL }
+	JS_PS_END
 };
 
 
diff --git a/src/ecmascript/spidermonkey/window.c b/src/ecmascript/spidermonkey/window.c
index bb00db44..23733521 100644
--- a/src/ecmascript/spidermonkey/window.c
+++ b/src/ecmascript/spidermonkey/window.c
@@ -90,7 +90,7 @@ JSPropertySpec window_props[] = {
 	JS_PSGS("status",	window_get_property_status, window_set_property_status, 0),
 	JS_PSG("top",	window_get_property_top, JSPROP_ENUMERATE),
 	JS_PSG("window",	window_get_property_self, JSPROP_ENUMERATE),
-	{ NULL }
+	JS_PS_END
 };
 
 
diff --git a/src/scripting/smjs/bookmarks.c b/src/scripting/smjs/bookmarks.c
index d32bf1c4..b1390b4c 100644
--- a/src/scripting/smjs/bookmarks.c
+++ b/src/scripting/smjs/bookmarks.c
@@ -102,7 +102,7 @@ static const JSPropertySpec bookmark_props[] = {
 	JS_PSGS("title", bookmark_get_property_title, bookmark_set_property_title, JSPROP_ENUMERATE),
 	JS_PSGS( "url", bookmark_get_property_url, bookmark_set_property_url, JSPROP_ENUMERATE),
 	JS_PSG("children", bookmark_get_property_children, JSPROP_ENUMERATE),
-	{ NULL }
+	JS_PS_END
 };
 
 static JSObject *smjs_get_bookmark_folder_object(struct bookmark *bookmark);
diff --git a/src/scripting/smjs/cache_object.c b/src/scripting/smjs/cache_object.c
index 0ea15d1c..162b87f2 100644
--- a/src/scripting/smjs/cache_object.c
+++ b/src/scripting/smjs/cache_object.c
@@ -56,7 +56,7 @@ static const JSPropertySpec cache_entry_props[] = {
 	JS_PSG("length", cache_entry_get_property_length, JSPROP_ENUMERATE),
 	JS_PSGS("head", cache_entry_get_property_head, cache_entry_set_property_head, JSPROP_ENUMERATE),
 	JS_PSG("uri", cache_entry_get_property_uri, JSPROP_ENUMERATE),
-	{ NULL }
+	JS_PS_END
 };
 
 static bool
diff --git a/src/scripting/smjs/elinks_object.c b/src/scripting/smjs/elinks_object.c
index 50b709d6..a2cfae0f 100644
--- a/src/scripting/smjs/elinks_object.c
+++ b/src/scripting/smjs/elinks_object.c
@@ -102,7 +102,7 @@ static const JSPropertySpec elinks_props[] = {
 	JS_PSG("home", elinks_get_property_home, JSPROP_ENUMERATE),
 	JS_PSGS("location", elinks_get_property_location, elinks_set_property_location, JSPROP_ENUMERATE),
 	JS_PSG("session", elinks_get_property_session, JSPROP_ENUMERATE),
-	{ NULL }
+	JS_PS_END
 };
 
 static bool elinks_get_property(JSContext *ctx, JS::HandleObject hobj, JS::HandleId hid, JS::MutableHandleValue hvp);
diff --git a/src/scripting/smjs/globhist.c b/src/scripting/smjs/globhist.c
index 28ecf8b3..9c386a02 100644
--- a/src/scripting/smjs/globhist.c
+++ b/src/scripting/smjs/globhist.c
@@ -66,7 +66,7 @@ static const JSPropertySpec smjs_globhist_item_props[] = {
 	JS_PSGS("title", smjs_globhist_item_get_property_title, smjs_globhist_item_set_property_title, JSPROP_ENUMERATE),
 	JS_PSGS("url", smjs_globhist_item_get_property_url, smjs_globhist_item_set_property_url, JSPROP_ENUMERATE),
 	JS_PSGS("last_visit", smjs_globhist_item_get_property_last_visit, smjs_globhist_item_set_property_last_visit, JSPROP_ENUMERATE),
-	{ NULL }
+	JS_PS_END
 };
 
 /* @smjs_globhist_item_class.getProperty */