156 files changed, 49550 insertions, 32026 deletions

diff --git a/content/Makefile b/content/Makefile
index b4353ba95..188d0f46e 100644
--- a/content/Makefile
+++ b/content/Makefile
@@ -1,7 +1,15 @@
 # Content sources
 
-S_CONTENT := content.c content_factory.c dirlist.c fetch.c hlcache.c	\
-	llcache.c mimesniff.c urldb.c no_backing_store.c
+S_CONTENT :=			\
+	content.c		\
+	content_factory.c	\
+	fetch.c			\
+	hlcache.c		\
+	llcache.c		\
+	mimesniff.c		\
+	textsearch.c		\
+	urldb.c			\
+	no_backing_store.c
 
 # Make filesystem backing store available
 ifeq ($(NETSURF_FS_BACKING_STORE),YES)
@@ -9,10 +17,12 @@ ifeq ($(NETSURF_FS_BACKING_STORE),YES)
 endif
 
 
-# Content fetchers sources
+# Content fetcher sources
 include content/fetchers/Makefile
 
-# Content handlers
+S_FETCHERS := $(addprefix content/,$(S_FETCHERS))
+
+# Content handler sources
 include content/handlers/Makefile
 
 S_CONTENT := $(addprefix content/,$(S_CONTENT))
diff --git a/content/content.c b/content/content.c
index 3a5628096..ae4718f54 100644
--- a/content/content.c
+++ b/content/content.c
@@ -23,20 +23,23 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 #include <nsutils/time.h>
 
 #include "netsurf/inttypes.h"
 #include "utils/log.h"
 #include "utils/messages.h"
+#include "utils/corestrings.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/bitmap.h"
 #include "netsurf/content.h"
 #include "desktop/knockout.h"
-#include "desktop/gui_internal.h"
 
 #include "content/content_protected.h"
+#include "content/textsearch.h"
 #include "content/content_debug.h"
 #include "content/hlcache.h"
+#include "content/urldb.h"
 
 #define URL_FMT_SPC "%.140s"
 
@@ -47,85 +50,48 @@ const char * const content_status_name[] = {
 	"ERROR"
 };
 
-static nserror content_llcache_callback(llcache_handle *llcache,
-		const llcache_event *event, void *pw);
-static void content_convert(struct content *c);
-
 
 /**
- * Initialise a new content structure.
+ * All data has arrived, convert for display.
  *
- * \param c                 Content to initialise
- * \param handler           Content handler
- * \param imime_type        MIME type of content
- * \param params            HTTP parameters
- * \param llcache           Source data handle
- * \param fallback_charset  Fallback charset
- * \param quirks            Quirkiness of content
- * \return NSERROR_OK on success, appropriate error otherwise
+ * Calls the convert function for the content.
+ *
+ * - If the conversion succeeds, but there is still some processing required
+ *   (eg. loading images), the content gets status CONTENT_STATUS_READY, and a
+ *   CONTENT_MSG_READY is sent to all users.
+ * - If the conversion succeeds and is complete, the content gets status
+ *   CONTENT_STATUS_DONE, and CONTENT_MSG_READY then CONTENT_MSG_DONE are sent.
+ * - If the conversion fails, CONTENT_MSG_ERROR is sent. The content will soon
+ *   be destroyed and must no longer be used.
  */
-
-nserror content__init(struct content *c, const content_handler *handler,
-		lwc_string *imime_type, const struct http_parameter *params,
-		llcache_handle *llcache, const char *fallback_charset, 
-		bool quirks)
+static void content_convert(struct content *c)
 {
-	struct content_user *user_sentinel;
-	nserror error;
-	
-	NSLOG(netsurf, INFO, "url "URL_FMT_SPC" -> %p",
-			nsurl_access_log(llcache_handle_get_url(llcache)), c);
-
-	user_sentinel = calloc(1, sizeof(struct content_user));
-	if (user_sentinel == NULL) {
-		return NSERROR_NOMEM;
-	}
+	assert(c);
+	assert(c->status == CONTENT_STATUS_LOADING ||
+	       c->status == CONTENT_STATUS_ERROR);
 
-	if (fallback_charset != NULL) {
-		c->fallback_charset = strdup(fallback_charset);
-		if (c->fallback_charset == NULL) {
-			free(user_sentinel);
-			return NSERROR_NOMEM;
-		}
-	}
+	if (c->status != CONTENT_STATUS_LOADING)
+		return;
 
-	c->llcache = llcache;
-	c->mime_type = lwc_string_ref(imime_type);
-	c->handler = handler;
-	c->status = CONTENT_STATUS_LOADING;
-	c->width = 0;
-	c->height = 0;
-	c->available_width = 0;
-	c->available_height = 0;
-	c->quirks = quirks;
-	c->refresh = 0;
-	nsu_getmonotonic_ms(&c->time);
-	c->size = 0;
-	c->title = NULL;
-	c->active = 0;
-	user_sentinel->callback = NULL;
-	user_sentinel->pw = NULL;
-	user_sentinel->next = NULL;
-	c->user_list = user_sentinel;
-	c->sub_status[0] = 0;
-	c->locked = false;
-	c->total_size = 0;
-	c->http_code = 0;
-	c->error_count = 0;
+	if (c->locked == true)
+		return;
 
-	content_set_status(c, messages_get("Loading"));
+	NSLOG(netsurf, INFO, "content "URL_FMT_SPC" (%p)",
+	      nsurl_access_log(llcache_handle_get_url(c->llcache)), c);
 
-	/* Finally, claim low-level cache events */
-	error = llcache_handle_change_callback(llcache, 
-			content_llcache_callback, c);
-	if (error != NSERROR_OK) {
-		lwc_string_unref(c->mime_type);
-		return error;
+	if (c->handler->data_complete != NULL) {
+		c->locked = true;
+		if (c->handler->data_complete(c) == false) {
+			content_set_error(c);
+		}
+		/* Conversion to the READY state will unlock the content */
+	} else {
+		content_set_ready(c);
+		content_set_done(c);
 	}
-
-	return NSERROR_OK;
 }
 
+
 /**
  * Handler for low-level cache events
  *
@@ -134,22 +100,26 @@ nserror content__init(struct content *c, const content_handler *handler,
  * \param pw	   Pointer to our context
  * \return NSERROR_OK on success, appropriate error otherwise
  */
-nserror content_llcache_callback(llcache_handle *llcache,
-		const llcache_event *event, void *pw)
+static nserror
+content_llcache_callback(llcache_handle *llcache,
+			 const llcache_event *event, void *pw)
 {
 	struct content *c = pw;
 	union content_msg_data msg_data;
 	nserror error = NSERROR_OK;
 
 	switch (event->type) {
+	case LLCACHE_EVENT_GOT_CERTS:
+		/* Will never happen: handled in hlcache */
+		break;
 	case LLCACHE_EVENT_HAD_HEADERS:
 		/* Will never happen: handled in hlcache */
 		break;
 	case LLCACHE_EVENT_HAD_DATA:
 		if (c->handler->process_data != NULL) {
-			if (c->handler->process_data(c, 
-					(const char *) event->data.data.buf, 
-					event->data.data.len) == false) {
+			if (c->handler->process_data(c,
+						     (const char *) event->data.data.buf,
+						     event->data.data.len) == false) {
 				llcache_handle_abort(c->llcache);
 				c->status = CONTENT_STATUS_ERROR;
 				/** \todo It's not clear what error this is */
@@ -158,26 +128,27 @@ nserror content_llcache_callback(llcache_handle *llcache,
 		}
 		break;
 	case LLCACHE_EVENT_DONE:
-	{
-		size_t source_size;
+		{
+			size_t source_size;
 
-		(void) llcache_handle_get_source_data(llcache, &source_size);
+			(void) llcache_handle_get_source_data(llcache, &source_size);
 
-		content_set_status(c, messages_get("Processing"));
-		msg_data.explicit_status_text = NULL;
-		content_broadcast(c, CONTENT_MSG_STATUS, &msg_data);
+			content_set_status(c, messages_get("Processing"));
+			msg_data.explicit_status_text = NULL;
+			content_broadcast(c, CONTENT_MSG_STATUS, &msg_data);
 
-		content_convert(c);
-	}
+			content_convert(c);
+		}
 		break;
 	case LLCACHE_EVENT_ERROR:
 		/** \todo Error page? */
 		c->status = CONTENT_STATUS_ERROR;
-		msg_data.error = event->data.msg;
+		msg_data.errordata.errorcode = event->data.error.code;
+		msg_data.errordata.errormsg = event->data.error.msg;
 		content_broadcast(c, CONTENT_MSG_ERROR, &msg_data);
 		break;
 	case LLCACHE_EVENT_PROGRESS:
-		content_set_status(c, event->data.msg);
+		content_set_status(c, event->data.progress_msg);
 		msg_data.explicit_status_text = NULL;
 		content_broadcast(c, CONTENT_MSG_STATUS, &msg_data);
 		break;
@@ -191,111 +162,129 @@ nserror content_llcache_callback(llcache_handle *llcache,
 	return error;
 }
 
+
 /**
- * Get whether a content can reformat
+ * update content status message
  *
- * \param h  content to check
- * \return whether the content can reformat
+ * \param c the content to update.
  */
-bool content_can_reformat(hlcache_handle *h)
-{
-	struct content *c = hlcache_handle_get_content(h);
-
-	if (c == NULL)
-		return false;
-
-	return (c->handler->reformat != NULL);
-}
-
-
 static void content_update_status(struct content *c)
 {
 	if (c->status == CONTENT_STATUS_LOADING ||
-			c->status == CONTENT_STATUS_READY) {
+	    c->status == CONTENT_STATUS_READY) {
 		/* Not done yet */
 		snprintf(c->status_message, sizeof (c->status_message),
-				"%s%s%s", messages_get("Fetching"),
-				c->sub_status[0] != '\0' ? ", " : " ",
-				c->sub_status);
+			 "%s%s%s", messages_get("Fetching"),
+			 c->sub_status[0] != '\0' ? ", " : " ",
+			 c->sub_status);
 	} else {
 		snprintf(c->status_message, sizeof (c->status_message),
-				"%s (%.1fs)", messages_get("Done"),
-				(float) c->time / 1000);
+			 "%s (%.1fs)", messages_get("Done"),
+			 (float) c->time / 1000);
 	}
 }
 
 
-/**
- * Updates content with new status.
- *
- * The textual status contained in the content is updated with given string.
- *
- * \param c The content to set status in.
- * \param status_message new textual status
- */
-
-void content_set_status(struct content *c, const char *status_message)
+/* exported interface documented in content/protected.h */
+nserror
+content__init(struct content *c,
+	      const content_handler *handler,
+	      lwc_string *imime_type,
+	      const struct http_parameter *params,
+	      llcache_handle *llcache,
+	      const char *fallback_charset,
+	      bool quirks)
 {
-	size_t len = strlen(status_message);
+	struct content_user *user_sentinel;
+	nserror error;
 
-	if (len >= sizeof(c->sub_status)) {
-		len = sizeof(c->sub_status) - 1;
+	NSLOG(netsurf, INFO, "url "URL_FMT_SPC" -> %p",
+	      nsurl_access_log(llcache_handle_get_url(llcache)), c);
+
+	user_sentinel = calloc(1, sizeof(struct content_user));
+	if (user_sentinel == NULL) {
+		return NSERROR_NOMEM;
 	}
-	memcpy(c->sub_status, status_message, len);
-	c->sub_status[len] = '\0';
 
-	content_update_status(c);
-}
+	if (fallback_charset != NULL) {
+		c->fallback_charset = strdup(fallback_charset);
+		if (c->fallback_charset == NULL) {
+			free(user_sentinel);
+			return NSERROR_NOMEM;
+		}
+	}
 
+	c->llcache = llcache;
+	c->mime_type = lwc_string_ref(imime_type);
+	c->handler = handler;
+	c->status = CONTENT_STATUS_LOADING;
+	c->width = 0;
+	c->height = 0;
+	c->available_width = 0;
+	c->available_height = 0;
+	c->quirks = quirks;
+	c->refresh = 0;
+	nsu_getmonotonic_ms(&c->time);
+	c->size = 0;
+	c->title = NULL;
+	c->active = 0;
+	user_sentinel->callback = NULL;
+	user_sentinel->pw = NULL;
+	user_sentinel->next = NULL;
+	c->user_list = user_sentinel;
+	c->sub_status[0] = 0;
+	c->locked = false;
+	c->total_size = 0;
+	c->http_code = 0;
 
-/**
- * All data has arrived, convert for display.
- *
- * Calls the convert function for the content.
- *
- * - If the conversion succeeds, but there is still some processing required
- *   (eg. loading images), the content gets status CONTENT_STATUS_READY, and a
- *   CONTENT_MSG_READY is sent to all users.
- * - If the conversion succeeds and is complete, the content gets status
- *   CONTENT_STATUS_DONE, and CONTENT_MSG_READY then CONTENT_MSG_DONE are sent.
- * - If the conversion fails, CONTENT_MSG_ERROR is sent. The content will soon
- *   be destroyed and must no longer be used.
- */
+	c->textsearch.string = NULL;
+	c->textsearch.context = NULL;
 
-void content_convert(struct content *c)
+	content_set_status(c, messages_get("Loading"));
+
+	/* Finally, claim low-level cache events */
+	error = llcache_handle_change_callback(llcache,
+					       content_llcache_callback, c);
+	if (error != NSERROR_OK) {
+		lwc_string_unref(c->mime_type);
+		return error;
+	}
+
+	return NSERROR_OK;
+}
+
+
+/* exported interface documented in content/content.h */
+bool content_can_reformat(hlcache_handle *h)
 {
-	assert(c);
-	assert(c->status == CONTENT_STATUS_LOADING ||
-			c->status == CONTENT_STATUS_ERROR);
+	struct content *c = hlcache_handle_get_content(h);
 
-	if (c->status != CONTENT_STATUS_LOADING)
-		return;
+	if (c == NULL)
+		return false;
 
-	if (c->locked == true)
-		return;
-	
-	NSLOG(netsurf, INFO, "content "URL_FMT_SPC" (%p)",
-		nsurl_access_log(llcache_handle_get_url(c->llcache)), c);
+	return (c->handler->reformat != NULL);
+}
 
-	if (c->handler->data_complete != NULL) {
-		c->locked = true;
-		if (c->handler->data_complete(c) == false) {
-			content_set_error(c);
-		}
-		/* Conversion to the READY state will unlock the content */
-	} else {
-		content_set_ready(c);
-		content_set_done(c);
+
+/* exported interface documented in content/protected.h */
+void content_set_status(struct content *c, const char *status_message)
+{
+	size_t len = strlen(status_message);
+
+	if (len >= sizeof(c->sub_status)) {
+		len = sizeof(c->sub_status) - 1;
 	}
+	memcpy(c->sub_status, status_message, len);
+	c->sub_status[len] = '\0';
+
+	content_update_status(c);
 }
 
-/**
- * Put a content in status CONTENT_STATUS_READY and unlock the content.
- */
 
+/* exported interface documented in content/protected.h */
 void content_set_ready(struct content *c)
 {
-	/* The content must be locked at this point, as it can only 
+	/* The content must be locked at this point, as it can only
 	 * become READY after conversion. */
 	assert(c->locked);
 	c->locked = false;
@@ -305,10 +294,8 @@ void content_set_ready(struct content *c)
 	content_broadcast(c, CONTENT_MSG_READY, NULL);
 }
 
-/**
- * Put a content in status CONTENT_STATUS_DONE.
- */
 
+/* exported interface documented in content/protected.h */
 void content_set_done(struct content *c)
 {
 	uint64_t now_ms;
@@ -321,38 +308,32 @@ void content_set_done(struct content *c)
 	content_broadcast(c, CONTENT_MSG_DONE, NULL);
 }
 
-/**
- * Put a content in status CONTENT_STATUS_ERROR and unlock the content.
- *
- * \note We expect the caller to broadcast an error report if needed.
- */
 
+/* exported interface documented in content/protected.h */
 void content_set_error(struct content *c)
 {
 	c->locked = false;
 	c->status = CONTENT_STATUS_ERROR;
 }
 
-/**
- * Reformat to new size.
- *
- * Calls the reformat function for the content.
- */
 
+/* exported interface documented in content/content.h */
 void content_reformat(hlcache_handle *h, bool background,
-		int width, int height)
+		      int width, int height)
 {
 	content__reformat(hlcache_handle_get_content(h), background,
-			width, height);
+			  width, height);
 }
 
-void content__reformat(struct content *c, bool background,
-		int width, int height)
+
+/* exported interface documented in content/protected.h */
+void
+content__reformat(struct content *c, bool background, int width, int height)
 {
 	union content_msg_data data;
 	assert(c != 0);
 	assert(c->status == CONTENT_STATUS_READY ||
-			c->status == CONTENT_STATUS_DONE);
+	       c->status == CONTENT_STATUS_DONE);
 	assert(c->locked == false);
 
 	c->available_width = width;
@@ -369,19 +350,14 @@ void content__reformat(struct content *c, bool background,
 }
 
 
-/**
- * Destroy and free a content.
- *
- * Calls the destroy function for the content, and frees the structure.
- */
-
+/* exported interface documented in content/content.h */
 void content_destroy(struct content *c)
 {
 	struct content_rfc5988_link *link;
 
 	assert(c);
 	NSLOG(netsurf, INFO, "content %p %s", c,
-			nsurl_access_log(llcache_handle_get_url(c->llcache)));
+	      nsurl_access_log(llcache_handle_get_url(c->llcache)));
 	assert(c->locked == false);
 
 	if (c->handler->destroy != NULL)
@@ -417,18 +393,12 @@ void content_destroy(struct content *c)
 }
 
 
-/**
- * Handle mouse movements in a content window.
- *
- * \param  h	  Content handle
- * \param  bw	  browser window
- * \param  mouse  state of mouse buttons and modifier keys
- * \param  x	  coordinate of mouse
- * \param  y	  coordinate of mouse
- */
-
-void content_mouse_track(hlcache_handle *h, struct browser_window *bw,
-		browser_mouse_state mouse, int x, int y)
+/* exported interface documented in content/content.h */
+void
+content_mouse_track(hlcache_handle *h,
+		    struct browser_window *bw,
+		    browser_mouse_state mouse,
+		    int x, int y)
 {
 	struct content *c = hlcache_handle_get_content(h);
 	assert(c != NULL);
@@ -446,24 +416,12 @@ void content_mouse_track(hlcache_handle *h, struct browser_window *bw,
 }
 
 
-/**
- * Handle mouse clicks and movements in a content window.
- *
- * \param  h	  Content handle
- * \param  bw	  browser window
- * \param  mouse  state of mouse buttons and modifier keys
- * \param  x	  coordinate of mouse
- * \param  y	  coordinate of mouse
- *
- * This function handles both hovering and clicking. It is important that the
- * code path is identical (except that hovering doesn't carry out the action),
- * so that the status bar reflects exactly what will happen. Having separate
- * code paths opens the possibility that an attacker will make the status bar
- * show some harmless action where clicking will be harmful.
- */
-
-void content_mouse_action(hlcache_handle *h, struct browser_window *bw,
-		browser_mouse_state mouse, int x, int y)
+/* exported interface documented in content/content.h */
+void
+content_mouse_action(hlcache_handle *h,
+		     struct browser_window *bw,
+		     browser_mouse_state mouse,
+		     int x, int y)
 {
 	struct content *c = hlcache_handle_get_content(h);
 	assert(c != NULL);
@@ -475,14 +433,7 @@ void content_mouse_action(hlcache_handle *h, struct browser_window *bw,
 }
 
 
-/**
- * Handle keypresses.
- *
- * \param  h	Content handle
- * \param  key	The UCS4 character codepoint
- * \return true if key handled, false otherwise
- */
-
+/* exported interface documented in content/content.h */
 bool content_keypress(struct hlcache_handle *h, uint32_t key)
 {
 	struct content *c = hlcache_handle_get_content(h);
@@ -495,34 +446,18 @@ bool content_keypress(struct hlcache_handle *h, uint32_t key)
 }
 
 
-/**
- * Request a redraw of an area of a content
- *
- * \param h	  high-level cache handle
- * \param x	  x co-ord of left edge
- * \param y	  y co-ord of top edge
- * \param width	  Width of rectangle
- * \param height  Height of rectangle
- */
+/* exported interface documented in content/content.h */
 void content_request_redraw(struct hlcache_handle *h,
-		int x, int y, int width, int height)
+			    int x, int y, int width, int height)
 {
 	content__request_redraw(hlcache_handle_get_content(h),
-			x, y, width, height);
+				x, y, width, height);
 }
 
 
-/**
- * Request a redraw of an area of a content
- *
- * \param c	  Content
- * \param x	  x co-ord of left edge
- * \param y	  y co-ord of top edge
- * \param width	  Width of rectangle
- * \param height  Height of rectangle
- */
+/* exported interface, documented in content/protected.h */
 void content__request_redraw(struct content *c,
-		int x, int y, int width, int height)
+			     int x, int y, int width, int height)
 {
 	union content_msg_data data;
 
@@ -534,42 +469,96 @@ void content__request_redraw(struct content *c,
 	data.redraw.width = width;
 	data.redraw.height = height;
 
-	data.redraw.full_redraw = true;
-
-	data.redraw.object = c;
-	data.redraw.object_x = 0;
-	data.redraw.object_y = 0;
-	data.redraw.object_width = c->width;
-	data.redraw.object_height = c->height;
-
 	content_broadcast(c, CONTENT_MSG_REDRAW, &data);
 }
 
+
 /* exported interface, documented in content/content.h */
 bool content_exec(struct hlcache_handle *h, const char *src, size_t srclen)
 {
 	struct content *c = hlcache_handle_get_content(h);
-	
+
 	assert(c != NULL);
-	
+
 	if (c->locked) {
 		/* Not safe to do stuff */
 		NSLOG(netsurf, DEEPDEBUG, "Unable to exec, content locked");
 		return false;
 	}
-	
+
 	if (c->handler->exec == NULL) {
 		/* Can't exec something on this content */
 		NSLOG(netsurf, DEEPDEBUG, "Unable to exec, no exec function");
 		return false;
 	}
-	
+
 	return c->handler->exec(c, src, srclen);
 }
 
+
 /* exported interface, documented in content/content.h */
-bool content_redraw(hlcache_handle *h, struct content_redraw_data *data,
-		const struct rect *clip, const struct redraw_context *ctx)
+bool content_saw_insecure_objects(struct hlcache_handle *h)
+{
+	struct content *c = hlcache_handle_get_content(h);
+	struct nsurl *url = hlcache_handle_get_url(h);
+	lwc_string *scheme = nsurl_get_component(url, NSURL_SCHEME);
+	bool match;
+
+	/* Is this an internal scheme? If so, we trust here and stop */
+	if ((lwc_string_isequal(scheme, corestring_lwc_about,
+				&match) == lwc_error_ok &&
+	     (match == true)) ||
+	    (lwc_string_isequal(scheme, corestring_lwc_data,
+				&match) == lwc_error_ok &&
+	     (match == true)) ||
+	    (lwc_string_isequal(scheme, corestring_lwc_resource,
+				&match) == lwc_error_ok &&
+	     (match == true)) ||
+	    /* Our internal x-ns-css scheme is secure */
+	    (lwc_string_isequal(scheme, corestring_lwc_x_ns_css,
+				&match) == lwc_error_ok &&
+	     (match == true)) ||
+	    /* We also treat file: as "not insecure" here */
+	    (lwc_string_isequal(scheme, corestring_lwc_file,
+				&match) == lwc_error_ok &&
+	     (match == true))) {
+		/* No insecurity to find */
+		lwc_string_unref(scheme);
+		return false;
+	}
+
+	/* Okay, not internal, am *I* secure? */
+	if ((lwc_string_isequal(scheme, corestring_lwc_https,
+				&match) == lwc_error_ok)
+	    && (match == false)) {
+		/* I did see something insecure -- ME! */
+		lwc_string_unref(scheme);
+		return true;
+	}
+
+	lwc_string_unref(scheme);
+	/* I am supposed to be secure, but was I overridden */
+	if (urldb_get_cert_permissions(url)) {
+		/* I was https:// but I was overridden, that's no good */
+		return true;
+	}
+
+	/* Otherwise try and chain through the handler */
+	if (c != NULL && c->handler->saw_insecure_objects != NULL) {
+		return c->handler->saw_insecure_objects(c);
+	}
+
+	/* If we can't see insecure objects, we can't see them */
+	return false;
+}
+
+
+/* exported interface, documented in content/content.h */
+bool
+content_redraw(hlcache_handle *h,
+	       struct content_redraw_data *data,
+	       const struct rect *clip,
+	       const struct redraw_context *ctx)
 {
 	struct content *c = hlcache_handle_get_content(h);
 
@@ -590,8 +579,10 @@ bool content_redraw(hlcache_handle *h, struct content_redraw_data *data,
 
 
 /* exported interface, documented in content/content.h */
-bool content_scaled_redraw(struct hlcache_handle *h,
-		int width, int height, const struct redraw_context *ctx)
+bool
+content_scaled_redraw(struct hlcache_handle *h,
+		      int width, int height,
+		      const struct redraw_context *ctx)
 {
 	struct content *c = hlcache_handle_get_content(h);
 	struct redraw_context new_ctx = *ctx;
@@ -657,32 +648,22 @@ bool content_scaled_redraw(struct hlcache_handle *h,
 	return plot_ok;
 }
 
-/**
- * Register a user for callbacks.
- *
- * \param  c	     the content to register
- * \param  callback  the callback function
- * \param  pw	     callback private data
- * \return true on success, false otherwise on memory exhaustion
- *
- * The callback will be called when content_broadcast() is
- * called with the content.
- */
 
-bool content_add_user(
-		struct content *c,
-		void (*callback)(
-				struct content *c,
-				content_msg msg,
-				const union content_msg_data *data,
-				void *pw),
-		void *pw)
+/* exported interface documented in content/content.h */
+bool
+content_add_user(struct content *c,
+		 void (*callback)(
+				  struct content *c,
+				  content_msg msg,
+				  const union content_msg_data *data,
+				  void *pw),
+		 void *pw)
 {
 	struct content_user *user;
 
 	NSLOG(netsurf, INFO, "content "URL_FMT_SPC" (%p), user %p %p",
-			nsurl_access_log(llcache_handle_get_url(c->llcache)),
-			c, callback, pw);
+	      nsurl_access_log(llcache_handle_get_url(c->llcache)),
+	      c, callback, pw);
 	user = malloc(sizeof(struct content_user));
 	if (!user)
 		return false;
@@ -698,31 +679,25 @@ bool content_add_user(
 }
 
 
-/**
- * Remove a callback user.
- *
- * The callback function and pw must be identical to those passed to
- * content_add_user().
- */
-
-void content_remove_user(
-		struct content *c,
-		void (*callback)(
-				struct content *c,
-				content_msg msg,
-				const union content_msg_data *data,
-				void *pw),
-		void *pw)
+/* exported interface documented in content/content.h */
+void
+content_remove_user(struct content *c,
+		    void (*callback)(
+				     struct content *c,
+				     content_msg msg,
+				     const union content_msg_data *data,
+				     void *pw),
+		    void *pw)
 {
 	struct content_user *user, *next;
 	NSLOG(netsurf, INFO, "content "URL_FMT_SPC" (%p), user %p %p",
-			nsurl_access_log(llcache_handle_get_url(c->llcache)),
-			c, callback, pw);
+	      nsurl_access_log(llcache_handle_get_url(c->llcache)),
+	      c, callback, pw);
 
 	/* user_list starts with a sentinel */
 	for (user = c->user_list; user->next != 0 &&
-			!(user->next->callback == callback &&
-				user->next->pw == pw); user = user->next)
+		     !(user->next->callback == callback &&
+		       user->next->pw == pw); user = user->next)
 		;
 	if (user->next == 0) {
 		NSLOG(netsurf, INFO, "user not found in list");
@@ -738,17 +713,15 @@ void content_remove_user(
 	free(next);
 }
 
-/**
- * Count users for the content.
- */
 
+/* exported interface documented in content/content.h */
 uint32_t content_count_users(struct content *c)
 {
 	struct content_user *user;
 	uint32_t counter = 0;
 
 	assert(c != NULL);
-	
+
 	for (user = c->user_list; user != NULL; user = user->next)
 		counter += 1;
 
@@ -757,13 +730,8 @@ uint32_t content_count_users(struct content *c)
 	return counter - 1; /* Subtract 1 for the sentinel */
 }
 
-/**
- * Determine if quirks mode matches
- *
- * \param c       Content to consider
- * \param quirks  Quirks mode to match
- * \return True if quirks match, false otherwise
- */
+
+/* exported interface documented in content/content.h */
 bool content_matches_quirks(struct content *c, bool quirks)
 {
 	if (c->handler->matches_quirks == NULL)
@@ -772,23 +740,17 @@ bool content_matches_quirks(struct content *c, bool quirks)
 	return c->handler->matches_quirks(c, quirks);
 }
 
-/**
- * Determine if a content is shareable
- *
- * \param c  Content to consider
- * \return True if content is shareable, false otherwise
- */
+
+/* exported interface documented in content/content.h */
 bool content_is_shareable(struct content *c)
 {
 	return c->handler->no_share == false;
 }
 
-/**
- * Send a message to all users.
- */
 
+/* exported interface documented in content/protected.h */
 void content_broadcast(struct content *c, content_msg msg,
-		const union content_msg_data *data)
+		       const union content_msg_data *data)
 {
 	struct content_user *user, *next;
 	assert(c);
@@ -801,72 +763,87 @@ void content_broadcast(struct content *c, content_msg msg,
 	}
 }
 
+
 /* exported interface documented in content_protected.h */
-void content_broadcast_errorcode(struct content *c, nserror errorcode)
+void
+content_broadcast_error(struct content *c, nserror errorcode, const char *msg)
 {
 	struct content_user *user, *next;
 	union content_msg_data data;
 
 	assert(c);
 
-	data.errorcode = errorcode;
+	data.errordata.errorcode = errorcode;
+	data.errordata.errormsg = msg;
 
 	for (user = c->user_list->next; user != 0; user = next) {
 		next = user->next;  /* user may be destroyed during callback */
 		if (user->callback != 0) {
-			user->callback(c, CONTENT_MSG_ERRORCODE,
-					&data, user->pw);
+			user->callback(c, CONTENT_MSG_ERROR,
+				       &data, user->pw);
 		}
 	}
 }
 
 
-/**
- * A window containing the content has been opened.
- *
- * \param h	 handle to content that has been opened
- * \param bw	 browser window containing the content
- * \param page   content of type CONTENT_HTML containing h, or 0 if not an
- *		   object within a page
- * \param params object parameters, or 0 if not an object
- *
- * Calls the open function for the content.
- */
-
-void content_open(hlcache_handle *h, struct browser_window *bw,
-		struct content *page, struct object_params *params)
+/* exported interface, documented in content/content.h */
+nserror
+content_open(hlcache_handle *h,
+	     struct browser_window *bw,
+	     struct content *page,
+	     struct object_params *params)
 {
-	struct content *c = hlcache_handle_get_content(h);
+	struct content *c;
+	nserror res;
+
+	c = hlcache_handle_get_content(h);
 	assert(c != 0);
 	NSLOG(netsurf, INFO, "content %p %s", c,
-			nsurl_access_log(llcache_handle_get_url(c->llcache)));
-	if (c->handler->open != NULL)
-		c->handler->open(c, bw, page, params);
+	      nsurl_access_log(llcache_handle_get_url(c->llcache)));
+	if (c->handler->open != NULL) {
+		res = c->handler->open(c, bw, page, params);
+	} else {
+		res = NSERROR_OK;
+	}
+	return res;
 }
 
 
-/**
- * The window containing the content has been closed.
- *
- * Calls the close function for the content.
- */
-
-void content_close(hlcache_handle *h)
+/* exported interface, documented in content/content.h */
+nserror content_close(hlcache_handle *h)
 {
-	struct content *c = hlcache_handle_get_content(h);
-	assert(c != 0);
+	struct content *c;
+	nserror res;
+
+	c = hlcache_handle_get_content(h);
+	if (c == NULL) {
+		return NSERROR_BAD_PARAMETER;
+	}
+
+	if ((c->status != CONTENT_STATUS_READY) &&
+	    (c->status != CONTENT_STATUS_DONE)) {
+		/* status is not read or done so nothing to do */
+		return NSERROR_INVALID;
+	}
+
 	NSLOG(netsurf, INFO, "content %p %s", c,
-			nsurl_access_log(llcache_handle_get_url(c->llcache)));
-	if (c->handler->close != NULL)
-		c->handler->close(c);
-}
+	      nsurl_access_log(llcache_handle_get_url(c->llcache)));
 
+	if (c->textsearch.context != NULL) {
+		content_textsearch_destroy(c->textsearch.context);
+		c->textsearch.context = NULL;
+	}
 
-/**
- * Tell a content that any selection it has, or one of its objects has, must be
- * cleared.
- */
+	if (c->handler->close != NULL) {
+		res = c->handler->close(c);
+	} else {
+		res = NSERROR_OK;
+	}
+	return res;
+}
 
+
+/* exported interface, documented in content/content.h */
 void content_clear_selection(hlcache_handle *h)
 {
 	struct content *c = hlcache_handle_get_content(h);
@@ -877,11 +854,7 @@ void content_clear_selection(hlcache_handle *h)
 }
 
 
-/**
- * Get a text selection from a content.  Ownership is passed to the caller,
- * who must free() it.
- */
-
+/* exported interface, documented in content/content.h */
 char * content_get_selection(hlcache_handle *h)
 {
 	struct content *c = hlcache_handle_get_content(h);
@@ -893,9 +866,12 @@ char * content_get_selection(hlcache_handle *h)
 		return NULL;
 }
 
+
 /* exported interface documented in content/content.h */
-nserror content_get_contextual_content(struct hlcache_handle *h,
-		int x, int y, struct browser_window_features *data)
+nserror
+content_get_contextual_content(struct hlcache_handle *h,
+			       int x, int y,
+			       struct browser_window_features *data)
 {
 	struct content *c = hlcache_handle_get_content(h);
 	assert(c != 0);
@@ -909,8 +885,11 @@ nserror content_get_contextual_content(struct hlcache_handle *h,
 }
 
 
-bool content_scroll_at_point(struct hlcache_handle *h,
-		int x, int y, int scrx, int scry)
+/* exported interface, documented in content/content.h */
+bool
+content_scroll_at_point(struct hlcache_handle *h,
+			int x, int y,
+			int scrx, int scry)
 {
 	struct content *c = hlcache_handle_get_content(h);
 	assert(c != 0);
@@ -922,8 +901,11 @@ bool content_scroll_at_point(struct hlcache_handle *h,
 }
 
 
-bool content_drop_file_at_point(struct hlcache_handle *h,
-		int x, int y, char *file)
+/* exported interface, documented in content/content.h */
+bool
+content_drop_file_at_point(struct hlcache_handle *h,
+			   int x, int y,
+			   char *file)
 {
 	struct content *c = hlcache_handle_get_content(h);
 	assert(c != 0);
@@ -935,30 +917,9 @@ bool content_drop_file_at_point(struct hlcache_handle *h,
 }
 
 
-void content_search(struct hlcache_handle *h, void *context,
-		search_flags_t flags, const char *string)
-{
-	struct content *c = hlcache_handle_get_content(h);
-	assert(c != 0);
-
-	if (c->handler->search != NULL) {
-		c->handler->search(c, context, flags, string);
-	}
-}
-
-
-void content_search_clear(struct hlcache_handle *h)
-{
-	struct content *c = hlcache_handle_get_content(h);
-	assert(c != 0);
-
-	if (c->handler->search_clear != NULL) {
-		c->handler->search_clear(c);
-	}
-}
-
 /* exported interface documented in content/content.h */
-nserror content_debug_dump(struct hlcache_handle *h, FILE *f, enum content_debug op)
+nserror
+content_debug_dump(struct hlcache_handle *h, FILE *f, enum content_debug op)
 {
 	struct content *c = hlcache_handle_get_content(h);
 	assert(c != 0);
@@ -970,6 +931,7 @@ nserror content_debug_dump(struct hlcache_handle *h, FILE *f, enum content_debug
 	return c->handler->debug_dump(c, f, op);
 }
 
+
 /* exported interface documented in content/content.h */
 nserror content_debug(struct hlcache_handle *h, enum content_debug op)
 {
@@ -987,12 +949,6 @@ nserror content_debug(struct hlcache_handle *h, enum content_debug op)
 }
 
 
-void content_add_error(struct content *c, const char *token,
-		unsigned int line)
-{
-}
-
-
 /* exported interface documented in content/content.h */
 struct content_rfc5988_link *
 content_find_rfc5988_link(hlcache_handle *h, lwc_string *rel)
@@ -1003,7 +959,7 @@ content_find_rfc5988_link(hlcache_handle *h, lwc_string *rel)
 
 	while (link != NULL) {
 		if (lwc_string_caseless_isequal(link->rel, rel,
-				&rel_match) == lwc_error_ok && rel_match) {
+						&rel_match) == lwc_error_ok && rel_match) {
 			break;
 		}
 		link = link->next;
@@ -1011,8 +967,10 @@ content_find_rfc5988_link(hlcache_handle *h, lwc_string *rel)
 	return link;
 }
 
+
+/* exported interface documented in content/protected.h */
 struct content_rfc5988_link *
-content__free_rfc5988_link(struct content_rfc5988_link *link) 
+content__free_rfc5988_link(struct content_rfc5988_link *link)
 {
 	struct content_rfc5988_link *next;
 
@@ -1037,10 +995,13 @@ content__free_rfc5988_link(struct content_rfc5988_link *link)
 	return next;
 }
 
-bool content__add_rfc5988_link(struct content *c, 
-		const struct content_rfc5988_link *link)
+
+/* exported interface documented in content/protected.h */
+bool
+content__add_rfc5988_link(struct content *c,
+			  const struct content_rfc5988_link *link)
 {
-	struct content_rfc5988_link *newlink;	
+	struct content_rfc5988_link *newlink;
 	union content_msg_data msg_data;
 
 	/* a link relation must be present for it to be a link */
@@ -1055,7 +1016,7 @@ bool content__add_rfc5988_link(struct content *c,
 
 	newlink = calloc(1, sizeof(struct content_rfc5988_link));
 	if (newlink == NULL) {
-		return false; 
+		return false;
 	}
 
 	/* copy values */
@@ -1086,7 +1047,6 @@ bool content__add_rfc5988_link(struct content *c,
 }
 
 
-
 /* exported interface documented in content/content.h */
 nsurl *content_get_url(struct content *c)
 {
@@ -1115,6 +1075,7 @@ lwc_string *content_get_mime_type(hlcache_handle *h)
 	return content__get_mime_type(hlcache_handle_get_content(h));
 }
 
+
 /* exported interface documented in content/content_protected.h */
 lwc_string *content__get_mime_type(struct content *c)
 {
@@ -1147,6 +1108,7 @@ const char *content_get_title(hlcache_handle *h)
 	return content__get_title(hlcache_handle_get_content(h));
 }
 
+
 /* exported interface documented in content/content_protected.h */
 const char *content__get_title(struct content *c)
 {
@@ -1154,7 +1116,7 @@ const char *content__get_title(struct content *c)
 		return NULL;
 
 	return c->title != NULL ? c->title :
-			nsurl_access(llcache_handle_get_url(c->llcache));
+		nsurl_access(llcache_handle_get_url(c->llcache));
 }
 
 
@@ -1164,6 +1126,7 @@ content_status content_get_status(hlcache_handle *h)
 	return content__get_status(hlcache_handle_get_content(h));
 }
 
+
 /* exported interface documented in content/content_protected.h */
 content_status content__get_status(struct content *c)
 {
@@ -1180,6 +1143,7 @@ const char *content_get_status_message(hlcache_handle *h)
 	return content__get_status_message(hlcache_handle_get_content(h));
 }
 
+
 /* exported interface documented in content/content_protected.h */
 const char *content__get_status_message(struct content *c)
 {
@@ -1196,6 +1160,7 @@ int content_get_width(hlcache_handle *h)
 	return content__get_width(hlcache_handle_get_content(h));
 }
 
+
 /* exported interface documented in content/content_protected.h */
 int content__get_width(struct content *c)
 {
@@ -1212,6 +1177,7 @@ int content_get_height(hlcache_handle *h)
 	return content__get_height(hlcache_handle_get_content(h));
 }
 
+
 /* exported interface documented in content/content_protected.h */
 int content__get_height(struct content *c)
 {
@@ -1228,6 +1194,7 @@ int content_get_available_width(hlcache_handle *h)
 	return content__get_available_width(hlcache_handle_get_content(h));
 }
 
+
 /* exported interface documented in content/content_protected.h */
 int content__get_available_width(struct content *c)
 {
@@ -1244,6 +1211,7 @@ const uint8_t *content_get_source_data(hlcache_handle *h, size_t *size)
 	return content__get_source_data(hlcache_handle_get_content(h), size);
 }
 
+
 /* exported interface documented in content/content_protected.h */
 const uint8_t *content__get_source_data(struct content *c, size_t *size)
 {
@@ -1256,12 +1224,14 @@ const uint8_t *content__get_source_data(struct content *c, size_t *size)
 	return llcache_handle_get_source_data(c->llcache, size);
 }
 
+
 /* exported interface documented in content/content.h */
 void content_invalidate_reuse_data(hlcache_handle *h)
 {
 	content__invalidate_reuse_data(hlcache_handle_get_content(h));
 }
 
+
 /* exported interface documented in content/content_protected.h */
 void content__invalidate_reuse_data(struct content *c)
 {
@@ -1272,12 +1242,14 @@ void content__invalidate_reuse_data(struct content *c)
 	llcache_handle_invalidate_cache_data(c->llcache);
 }
 
+
 /* exported interface documented in content/content.h */
 nsurl *content_get_refresh_url(hlcache_handle *h)
 {
 	return content__get_refresh_url(hlcache_handle_get_content(h));
 }
 
+
 /* exported interface documented in content/content_protected.h */
 nsurl *content__get_refresh_url(struct content *c)
 {
@@ -1300,9 +1272,9 @@ struct bitmap *content__get_bitmap(struct content *c)
 {
 	struct bitmap *bitmap = NULL;
 
-	if ((c != NULL) && 
-	    (c->handler != NULL) && 
-	    (c->handler->type != NULL) && 
+	if ((c != NULL) &&
+	    (c->handler != NULL) &&
+	    (c->handler->type != NULL) &&
 	    (c->handler->type() == CONTENT_IMAGE) &&
 	    (c->handler->get_internal != NULL) ) {
 		bitmap = c->handler->get_internal(c, NULL);
@@ -1322,21 +1294,13 @@ bool content_get_opaque(hlcache_handle *h)
 /* exported interface documented in content/content_protected.h */
 bool content__get_opaque(struct content *c)
 {
-	bool opaque = false;
-
-	if ((c != NULL) && 
-	    (c->handler != NULL) && 
-	    (c->handler->type != NULL) && 
-	    (c->handler->type() == CONTENT_IMAGE) &&
-	    (c->handler->get_internal != NULL) ) {
-		struct bitmap *bitmap = NULL;
-		bitmap = c->handler->get_internal(c, NULL);
-		if (bitmap != NULL) { 
-			opaque = guit->bitmap->get_opaque(bitmap);
-		}
+	if ((c != NULL) &&
+	    (c->handler != NULL) &&
+	    (c->handler->is_opaque != NULL)) {
+		return c->handler->is_opaque(c);
 	}
 
-	return opaque;
+	return false;
 }
 
 
@@ -1353,14 +1317,16 @@ bool content_get_quirks(hlcache_handle *h)
 
 
 /* exported interface documented in content/content.h */
-const char *content_get_encoding(hlcache_handle *h, enum content_encoding_type op)
+const char *
+content_get_encoding(hlcache_handle *h, enum content_encoding_type op)
 {
 	return content__get_encoding(hlcache_handle_get_content(h), op);
 }
 
 
 /* exported interface documented in content/content_protected.h */
-const char *content__get_encoding(struct content *c, enum content_encoding_type op)
+const char *
+content__get_encoding(struct content *c, enum content_encoding_type op)
 {
 	const char *encoding = NULL;
 
@@ -1387,12 +1353,8 @@ bool content__is_locked(struct content *c)
 	return c->locked;
 }
 
-/**
- * Retrieve the low-level cache handle for a content
- *
- * \param c Content to retrieve from
- * \return Low-level cache handle
- */
+
+/* exported interface documented in content/content.h */
 const llcache_handle *content_get_llcache_handle(struct content *c)
 {
 	if (c == NULL)
@@ -1401,12 +1363,8 @@ const llcache_handle *content_get_llcache_handle(struct content *c)
 	return c->llcache;
 }
 
-/**
- * Clone a content object in its current state.
- *
- * \param c  Content to clone
- * \return Clone of \a c
- */
+
+/* exported interface documented in content/protected.h */
 struct content *content_clone(struct content *c)
 {
 	struct content *nc;
@@ -1419,13 +1377,8 @@ struct content *content_clone(struct content *c)
 	return nc;
 };
 
-/**
- * Clone a content's data members
- *
- * \param c   Content to clone
- * \param nc  Content to populate
- * \return NSERROR_OK on success, appropriate error otherwise
- */
+
+/* exported interface documented in content/protected.h */
 nserror content__clone(const struct content *c, struct content *nc)
 {
 	nserror error;
@@ -1486,24 +1439,19 @@ nserror content__clone(const struct content *c, struct content *nc)
 	nc->locked = c->locked;
 	nc->total_size = c->total_size;
 	nc->http_code = c->http_code;
-	
+
 	return NSERROR_OK;
 }
 
-/**
- * Abort a content object
- *
- * \param c The content object to abort
- * \return NSERROR_OK on success, otherwise appropriate error
- */
+
+/* exported interface documented in content/content.h */
 nserror content_abort(struct content *c)
 {
 	NSLOG(netsurf, INFO, "Aborting %p", c);
-	
+
 	if (c->handler->stop != NULL)
 		c->handler->stop(c);
-	
+
 	/* And for now, abort our llcache object */
 	return llcache_handle_abort(c->llcache);
 }
-
diff --git a/content/content.h b/content/content.h
index 2cbc9e3dd..1bae813b2 100644
--- a/content/content.h
+++ b/content/content.h
@@ -24,14 +24,12 @@
  * The content functions manipulate struct contents, which correspond to URLs.
  */
 
-#ifndef _NETSURF_CONTENT_CONTENT_H_
-#define _NETSURF_CONTENT_CONTENT_H_
+#ifndef NETSURF_CONTENT_CONTENT_H_
+#define NETSURF_CONTENT_CONTENT_H_
 
 #include <libwapcaplet/libwapcaplet.h>
 
-#include "utils/errors.h"
-#include "content/content_factory.h"
-#include "desktop/search.h" /* search flags enum */
+#include "netsurf/content_type.h"
 #include "netsurf/mouse.h" /* mouse state enums */
 #include "netsurf/console.h" /* console state and flags enums */
 
@@ -43,45 +41,7 @@ struct hlcache_handle;
 struct object_params;
 struct rect;
 struct redraw_context;
-
-/** Status of a content */
-typedef enum {
-	CONTENT_STATUS_LOADING,	/**< Content is being fetched or
-				  converted and is not safe to display. */
-	CONTENT_STATUS_READY,	/**< Some parts of content still being
-				  loaded, but can be displayed. */
-	CONTENT_STATUS_DONE,	/**< All finished. */
-	CONTENT_STATUS_ERROR	/**< Error occurred, content will be
-				  destroyed imminently. */
-} content_status;
-
-/** Used in callbacks to indicate what has occurred. */
-typedef enum {
-	CONTENT_MSG_LOG,       /**< Content wishes to log something */
-	CONTENT_MSG_LOADING,   /**< fetching or converting */
-	CONTENT_MSG_READY,     /**< may be displayed */
-	CONTENT_MSG_DONE,      /**< finished */
-	CONTENT_MSG_ERROR,     /**< error occurred */
-	CONTENT_MSG_ERRORCODE, /**< error occurred return nserror */
-	CONTENT_MSG_REDIRECT,  /**< fetch url redirect occured */
-	CONTENT_MSG_STATUS,    /**< new status string */
-	CONTENT_MSG_REFORMAT,  /**< content_reformat done */
-	CONTENT_MSG_REDRAW,    /**< needs redraw (eg. new animation frame) */
-	CONTENT_MSG_REFRESH,   /**< wants refresh */
-	CONTENT_MSG_DOWNLOAD,  /**< download, not for display */
-	CONTENT_MSG_LINK,      /**< RFC5988 link */
-	CONTENT_MSG_GETCTX,    /**< Javascript context */
-	CONTENT_MSG_GETDIMS,   /**< Get viewport dimensions. */
-	CONTENT_MSG_SCROLL,    /**< Request to scroll content */
-	CONTENT_MSG_DRAGSAVE,  /**< Allow drag saving of content */
-	CONTENT_MSG_SAVELINK,  /**< Allow URL to be saved */
-	CONTENT_MSG_POINTER,   /**< Wants a specific mouse pointer set */
-	CONTENT_MSG_SELECTION, /**< A selection made or cleared */
-	CONTENT_MSG_CARET,     /**< Caret movement / hiding */
-	CONTENT_MSG_DRAG,      /**< A drag started or ended */
-	CONTENT_MSG_SELECTMENU,/**< Create a select menu */
-	CONTENT_MSG_GADGETCLICK/**< A gadget has been clicked on (mainly for file) */
-} content_msg;
+struct cert_chain;
 
 
 /** RFC5988 metadata link */
@@ -98,64 +58,115 @@ struct content_rfc5988_link {
 
 /** Extra data for some content_msg messages. */
 union content_msg_data {
-	/** CONTENT_MSG_LOG - Information for logging */
+	/**
+	 * CONTENT_MSG_LOG - Information for logging
+	 */
 	struct {
-		browser_window_console_source src; /**< The source of the logging */
-		const char *msg; /**< The message to log */
-		size_t msglen; /**< The length of that message */
-		browser_window_console_flags flags; /**< The flags of the logging */
+		/** The source of the logging */
+		browser_window_console_source src;
+		/** The message to log */
+		const char *msg;
+		/** The length of that message */
+		size_t msglen;
+		/** The flags of the logging */
+		browser_window_console_flags flags;
 	} log;
-	/** CONTENT_MSG_ERROR - Error message */
-	const char *error;
-        /** CONTENT_MSG_ERRORCODE - Error code */
-	nserror errorcode;
-        /** CONTENT_MSG_REDIRECT - Redirect info */
+
+	/**
+	 * CONTENT_MSG_SSL_CERTS - The certificate chain from the
+	 *   underlying fetch
+	 */
+	const struct cert_chain *chain;
+
+	/**
+	 * CONTENT_MSG_ERROR - Error from content or underlying fetch
+	 */
+	struct {
+		/**
+		 * The error code to convey meaning
+		 */
+		nserror errorcode;
+		/**
+		 * The message.  if NSERROR_UNKNOWN then this is the direct
+		 *   message, otherwise is some kind of metadata (e.g. a
+		 *   message name or somesuch) but always a null terminated
+		 *   string.
+		 */
+		const char *errormsg;
+	} errordata;
+
+	/**
+	 * CONTENT_MSG_REDIRECT - Redirect info
+	 */
 	struct {
 		struct nsurl *from;	/**< Redirect origin */
 		struct nsurl *to;	/**< Redirect target */
 	} redirect;		/**< Fetch URL redirect occured */
-	/** CONTENT_MSG_REDRAW - Area of content which needs redrawing */
+
+	/**
+	 * CONTENT_MSG_REDRAW - Area of content which needs redrawing
+	 */
 	struct {
 		int x, y, width, height;
-		/** Redraw the area fully. If false, object must be set,
-		 * and only the object will be redrawn. */
-		bool full_redraw;
-		/** Object to redraw if full_redraw is false. */
-		struct content *object;
-		/** Coordinates to plot object at. */
-		int object_x, object_y;
-		/** Dimensions to plot object with. */
-		int object_width, object_height;
 	} redraw;
-	/** CONTENT_MSG_REFRESH - Minimum delay  */
+
+	/**
+	 * CONTENT_MSG_REFRESH - Minimum delay
+	 */
 	int delay;
-	/** CONTENT_MSG_REFORMAT - Reformat should not cause a redraw */
+
+	/**
+	 * CONTENT_MSG_REFORMAT - Reformat should not cause a redraw
+	 */
 	bool background;
-	/** CONTENT_MSG_STATUS - Status message update.  If NULL, the content's
-	 * internal status text has been updated, and listener should use
-	 * content_get_status_message() */
+
+	/**
+	 * CONTENT_MSG_STATUS - Status message update.  If NULL, the
+	 * content's internal status text has been updated, and
+	 * listener should use content_get_status_message()
+	 */
 	const char *explicit_status_text;
-	/** CONTENT_MSG_DOWNLOAD - Low-level cache handle */
+
+	/**
+	 * CONTENT_MSG_DOWNLOAD - Low-level cache handle
+	 */
 	struct llcache_handle *download;
-	/** CONTENT_MSG_RFC5988_LINK - rfc5988 link data   */
+
+	/**
+	 * CONTENT_MSG_RFC5988_LINK - rfc5988 link data
+	 */
 	struct content_rfc5988_link *rfc5988_link;
-	/** CONTENT_MSG_GETCTX - Javascript context */
-	struct jscontext **jscontext;
-	/** CONTENT_MSG_GETDIMS - Get the viewport dimensions */
+
+	/**
+	 * CONTENT_MSG_GETTHREAD - Javascript context (thread)
+	 */
+	struct jsthread **jsthread;
+
+	/**
+	 * CONTENT_MSG_GETDIMS - Get the viewport dimensions
+	 */
 	struct {
-		/* TODO: Consider getting screen_width, screen_height too. */
+		/** \todo Consider getting screen_width, screen_height too. */
 		unsigned *viewport_width;
 		unsigned *viewport_height;
 	} getdims;
-	/** CONTENT_MSG_SCROLL - Part of content to scroll to show */
+
+	/**
+	 * CONTENT_MSG_SCROLL - Part of content to scroll to show
+	 */
 	struct {
-		/** if true, scroll to show area given by (x0, y0) and (x1,y1).
-		 * if false, scroll point (x0, y0) to top left of viewport */
+		/*
+		 * if true, scroll to show area given by (x0, y0) and (x1,y1).
+		 * if false, scroll point (x0, y0) to top left of viewport
+		 */
 		bool area;
 		int x0, y0;
 		int x1, y1;
 	} scroll;
-	/** CONTENT_MSG_DRAGSAVE - Drag save a content */
+
+	/**
+	 * CONTENT_MSG_DRAGSAVE - Drag save a content
+	 */
 	struct {
 		enum {
 			CONTENT_SAVE_ORIG,
@@ -166,19 +177,31 @@ union content_msg_data {
 		 /** if NULL, save the content generating the message */
 		struct hlcache_handle *content;
 	} dragsave;
-	/** CONTENT_MSG_SAVELINK - Save a URL */
+
+	/**
+	 * CONTENT_MSG_SAVELINK - Save a URL
+	 */
 	struct {
 		struct nsurl *url;
 		const char *title;
 	} savelink;
-	/** CONTENT_MSG_POINTER - Mouse pointer to set */
+
+	/**
+	 * CONTENT_MSG_POINTER - Mouse pointer to set
+	 */
 	browser_pointer_shape pointer;
-	/** CONTENT_MSG_SELECTION - Selection made or cleared */
+
+	/**
+	 * CONTENT_MSG_SELECTION - Selection made or cleared
+	 */
 	struct {
 		bool selection; /**< false for selection cleared */
 		bool read_only;
 	} selection;
-	/** CONTENT_MSG_CARET - set caret position or, hide caret */
+
+	/**
+	 * CONTENT_MSG_CARET - set caret position or, hide caret
+	 */
 	struct {
 		enum {
 			CONTENT_CARET_SET_POS,
@@ -192,7 +215,10 @@ union content_msg_data {
 			const struct rect *clip;	/**< Carret clip rect */
 		} pos;			/**< With CONTENT_CARET_SET_POS */
 	} caret;
-	/** CONTENT_MSG_DRAG - Drag start or end */
+
+	/**
+	 * CONTENT_MSG_DRAG - Drag start or end
+	 */
 	struct {
 		enum {
 			CONTENT_DRAG_NONE,
@@ -201,90 +227,166 @@ union content_msg_data {
 		} type;
 		const struct rect *rect;
 	} drag;
-	/** CONTENT_MSG_SELECTMENU - Create select menu at pointer */
+
+	/**
+	 * CONTENT_MSG_SELECTMENU - Create select menu at pointer
+	 */
 	struct {
 		struct form_control *gadget;
 	} select_menu;
-	/** CONTENT_MSG_GADGETCLICK - User clicked on a form gadget */
+
+	/**
+	 * CONTENT_MSG_GADGETCLICK - User clicked on a form gadget
+	 */
 	struct {
 		struct form_control *gadget;
 	} gadget_click;
-};
 
+	/**
+	 * CONTENT_MSG_TEXTSEARCH - Free text search action
+	 */
+	struct {
+		/**
+		 * The type of text search operation
+		 */
+		enum {
+		      /**
+		       * Free text search find operation has started or finished
+		       */
+		      CONTENT_TEXTSEARCH_FIND,
+		      /**
+		       * Free text search match state has changed
+		       */
+		      CONTENT_TEXTSEARCH_MATCH,
+		      /**
+		       * Free text search back available state changed
+		       */
+		      CONTENT_TEXTSEARCH_BACK,
+		      /**
+		       * Free text search forward available state changed
+		       */
+		      CONTENT_TEXTSEARCH_FORWARD,
+		      /**
+		       * add a search query string to the recent searches
+		       */
+		      CONTENT_TEXTSEARCH_RECENT
+		} type;
+		/**
+		 * context passed to browser_window_search()
+		 */
+		void *ctx;
+		/**
+		 * state for operation
+		 */
+		bool state;
+		/**
+		 * search string
+		 */
+		const char *string;
+	} textsearch;
 
-/* The following are for hlcache */
-void content_destroy(struct content *c);
-
-
-bool content_add_user(
-		struct content *h,
-		void (*callback)(
-				struct content *c,
-				content_msg msg,
-				const union content_msg_data *data,
-				void *pw),
-		void *pw);
-
-
-void content_remove_user(
-		struct content *c,
-		void (*callback)(
-				struct content *c,
-				content_msg msg,
-				const union content_msg_data *data,
-				void *pw),
-		void *pw);
-
-
-uint32_t content_count_users(struct content *c);
-
-
-bool content_matches_quirks(struct content *c, bool quirks);
-
-
-bool content_is_shareable(struct content *c);
-
-/* only used by cocoa apple image handling and for getting nsurl of content */
-const struct llcache_handle *content_get_llcache_handle(struct content *c);
+};
 
 
 /**
- * Retrieve URL associated with content
+ * Get whether a content can reformat
  *
- * \param c  Content to retrieve URL from
- * \return Pointer to URL, or NULL if not found.
+ * \param h  content to check
+ * \return whether the content can reformat
  */
-struct nsurl *content_get_url(struct content *c);
-
-struct content *content_clone(struct content *c);
-
-nserror content_abort(struct content *c);
-
-/* Client functions */
 bool content_can_reformat(struct hlcache_handle *h);
 
+/**
+ * Reformat to new size.
+ *
+ * Calls the reformat function for the content.
+ */
 void content_reformat(struct hlcache_handle *h, bool background,
 		int width, int height);
 
+/**
+ * Request a redraw of an area of a content
+ *
+ * \param h	  high-level cache handle
+ * \param x	  x co-ord of left edge
+ * \param y	  y co-ord of top edge
+ * \param width	  Width of rectangle
+ * \param height  Height of rectangle
+ */
 void content_request_redraw(struct hlcache_handle *h,
 		int x, int y, int width, int height);
 
+/**
+ * Handle mouse movements in a content window.
+ *
+ * \param  h	  Content handle
+ * \param  bw	  browser window
+ * \param  mouse  state of mouse buttons and modifier keys
+ * \param  x	  coordinate of mouse
+ * \param  y	  coordinate of mouse
+ */
 void content_mouse_track(struct hlcache_handle *h, struct browser_window *bw,
 		browser_mouse_state mouse, int x, int y);
 
+/**
+ * Handle mouse clicks and movements in a content window.
+ *
+ * \param  h	  Content handle
+ * \param  bw	  browser window
+ * \param  mouse  state of mouse buttons and modifier keys
+ * \param  x	  coordinate of mouse
+ * \param  y	  coordinate of mouse
+ *
+ * This function handles both hovering and clicking. It is important that the
+ * code path is identical (except that hovering doesn't carry out the action),
+ * so that the status bar reflects exactly what will happen. Having separate
+ * code paths opens the possibility that an attacker will make the status bar
+ * show some harmless action where clicking will be harmful.
+ */
 void content_mouse_action(struct hlcache_handle *h, struct browser_window *bw,
 		browser_mouse_state mouse, int x, int y);
 
+/**
+ * Handle keypresses.
+ *
+ * \param  h	Content handle
+ * \param  key	The UCS4 character codepoint
+ * \return true if key handled, false otherwise
+ */
 bool content_keypress(struct hlcache_handle *h, uint32_t key);
 
 
-void content_open(struct hlcache_handle *h, struct browser_window *bw,
+/**
+ * A window containing the content has been opened.
+ *
+ * \param h	 handle to content that has been opened
+ * \param bw	 browser window containing the content
+ * \param page   content of type CONTENT_HTML containing h, or NULL if not an
+ *		   object within a page
+ * \param params object parameters, or NULL if not an object
+ *
+ * Calls the open function for the content.
+ */
+nserror content_open(struct hlcache_handle *h, struct browser_window *bw,
 		struct content *page, struct object_params *params);
 
-void content_close(struct hlcache_handle *h);
+/**
+ * The window containing the content has been closed.
+ *
+ * Calls the close function for the content.
+ */
+nserror content_close(struct hlcache_handle *h);
 
+/**
+ * Tell a content that any selection it has, or one of its objects
+ * has, must be cleared.
+ */
 void content_clear_selection(struct hlcache_handle *h);
 
+/**
+ * Get a text selection from a content.  Ownership is passed to the caller,
+ * who must free() it.
+ */
 char * content_get_selection(struct hlcache_handle *h);
 
 /**
@@ -298,17 +400,26 @@ char * content_get_selection(struct hlcache_handle *h);
 nserror content_get_contextual_content(struct hlcache_handle *h,
 		int x, int y, struct browser_window_features *data);
 
+/**
+ * scroll content at coordnate
+ *
+ * \param[in] h Handle to content to examine.
+ * \param[in] x The x coordinate to examine.
+ * \param[in] y The y coordinate to examine.
+ */
 bool content_scroll_at_point(struct hlcache_handle *h,
 		int x, int y, int scrx, int scry);
 
+/**
+ * Drag and drop a file at coordinate
+ *
+ * \param[in] h Handle to content to examine.
+ * \param[in] x The x coordinate to examine.
+ * \param[in] y The y coordinate to examine.
+ */
 bool content_drop_file_at_point(struct hlcache_handle *h,
 		int x, int y, char *file);
 
-void content_search(struct hlcache_handle *h, void *context,
-		search_flags_t flags, const char *string);
-
-void content_search_clear(struct hlcache_handle *h);
-
 
 /**
  * Control debug con a content.
@@ -415,5 +526,17 @@ bool content_is_locked(struct hlcache_handle *h);
  */
 bool content_exec(struct hlcache_handle *h, const char *src, size_t srclen);
 
+/**
+ * Determine if the content referred to any insecure objects.
+ *
+ * Query the content to determine if any of its referred objects were loaded
+ * in a manner not considered secure.  For a content to be recursively
+ * secure it must only load over https and must not have certificate overrides
+ * in place.
+ *
+ * \param h The handle to the content
+ * \return Whether the content referred to any insecure objects
+ */
+bool content_saw_insecure_objects(struct hlcache_handle *h);
 
 #endif
diff --git a/content/content_factory.c b/content/content_factory.c
index 935354a5d..44fc333c8 100644
--- a/content/content_factory.c
+++ b/content/content_factory.c
@@ -16,8 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * Content factory (implementation)
+/**
+ * \file
+ * Content factory implementation
  */
 
 #include <assert.h>
diff --git a/content/content_factory.h b/content/content_factory.h
index 9beeb193c..354a1789f 100644
--- a/content/content_factory.h
+++ b/content/content_factory.h
@@ -46,13 +46,12 @@ nserror HNAME##_init(void)						\
 
 struct content;
 struct llcache_handle;
-
-typedef struct content_handler content_handler;
+struct content_handler;
 
 void content_factory_fini(void);
 
 nserror content_factory_register_handler(const char *mime_type,
-		const content_handler *handler);
+		const struct content_handler *handler);
 
 struct content *content_factory_create_content(struct llcache_handle *llcache, 
 		const char *fallback_charset, bool quirks,
diff --git a/content/content_protected.h b/content/content_protected.h
index 0101790d1..fd0924d64 100644
--- a/content/content_protected.h
+++ b/content/content_protected.h
@@ -24,18 +24,38 @@
  * The content functions manipulate struct contents, which correspond to URLs.
  */
 
-#ifndef _NETSURF_CONTENT_CONTENT_PROTECTED_H_
-#define _NETSURF_CONTENT_CONTENT_PROTECTED_H_
+#ifndef NETSURF_CONTENT_CONTENT_PROTECTED_H_
+#define NETSURF_CONTENT_CONTENT_PROTECTED_H_
 
 #include <stdio.h>
+#include <libwapcaplet/libwapcaplet.h>
 
-#include "utils/nsurl.h"
 #include "netsurf/content_type.h"
-#include "content/content.h"
+#include "netsurf/mouse.h" /* mouse state enums */
 
+struct nsurl;
 struct content_redraw_data;
+union content_msg_data;
 struct http_parameter;
+struct llcache_handle;
+struct object_params;
+struct content;
+struct redraw_context;
+struct rect;
+struct browser_window;
+struct browser_window_features;
+struct textsearch_context;
+struct box;
+struct selection;
+struct selection_string;
+
+typedef struct content_handler content_handler;
 
+/**
+ * Content operation function table
+ *
+ * function table implementing a content type.
+ */
 struct content_handler {
 	void (*fini)(void);
 
@@ -46,23 +66,23 @@ struct content_handler {
                           const char *fallback_charset, bool quirks,
                           struct content **c);
 
-	bool (*process_data)(struct content *c, 
+	bool (*process_data)(struct content *c,
 			const char *data, unsigned int size);
 	bool (*data_complete)(struct content *c);
 	void (*reformat)(struct content *c, int width, int height);
 	void (*destroy)(struct content *c);
 	void (*stop)(struct content *c);
-	void (*mouse_track)(struct content *c, struct browser_window *bw,
+	nserror (*mouse_track)(struct content *c, struct browser_window *bw,
 			browser_mouse_state mouse, int x, int y);
-	void (*mouse_action)(struct content *c, struct browser_window *bw,
+	nserror (*mouse_action)(struct content *c, struct browser_window *bw,
 			browser_mouse_state mouse, int x, int y);
 	bool (*keypress)(struct content *c, uint32_t key);
 	bool (*redraw)(struct content *c, struct content_redraw_data *data,
 			const struct rect *clip,
 			const struct redraw_context *ctx);
-	void (*open)(struct content *c, struct browser_window *bw,
+	nserror (*open)(struct content *c, struct browser_window *bw,
 			struct content *page, struct object_params *params);
-	void (*close)(struct content *c);
+	nserror (*close)(struct content *c);
 	void (*clear_selection)(struct content *c);
 	char * (*get_selection)(struct content *c);
 	nserror (*get_contextual_content)(struct content *c, int x, int y,
@@ -71,9 +91,6 @@ struct content_handler {
 			int scrx, int scry);
 	bool (*drop_file_at_point)(struct content *c, int x, int y,
 			char *file);
-	void (*search)(struct content *c, void *context, search_flags_t flags,
-		       const char *string);
-	void (*search_clear)(struct content *c);
 	nserror (*debug_dump)(struct content *c, FILE *f, enum content_debug op);
 	nserror (*debug)(struct content *c, enum content_debug op);
 	nserror (*clone)(const struct content *old, struct content **newc);
@@ -83,15 +100,68 @@ struct content_handler {
 	void (*add_user)(struct content *c);
 	void (*remove_user)(struct content *c);
 	bool (*exec)(struct content *c, const char *src, size_t srclen);
+	bool (*saw_insecure_objects)(struct content *c);
+
+	/**
+	 * content specific free text search find
+	 */
+	nserror (*textsearch_find)(struct content *c, struct textsearch_context *context, const char *pattern, int p_len, bool case_sens);
+
+	/**
+	 * get bounds of free text search match
+	 */
+	nserror (*textsearch_bounds)(struct content *c, unsigned start_idx, unsigned end_idx, struct box *start_ptr, struct box *end_ptr, struct rect *bounds_out);
+
+	/**
+	 * redraw an area of selected text
+	 *
+	 * The defined text selection will cause an area of the
+	 *   content to be marked as invalid and hence redrawn.
+	 *
+	 * \param c The content being redrawn
+	 * \param start_idx The start index of the text region to be redrawn
+	 * \param end_idx The end index of teh text region to be redrawn
+	 * \return NSERROR_OK on success else error code
+	 */
+	nserror (*textselection_redraw)(struct content *c, unsigned start_idx, unsigned end_idx);
 
-        /** handler dependant content sensitive internal data interface. */
-	void * (*get_internal)(const struct content *c, void *context);
+	/**
+	 * copy selected text into selection string possibly with formatting
+	 */
+	nserror (*textselection_copy)(struct content *c, unsigned start_idx, unsigned end_idx, struct selection_string *selstr);
+
+	/**
+	 * get maximum index of text section.
+	 *
+	 * \param[in] c The content to measure
+	 * \param[out] end_idx pointer to value to recive result
+	 * \return NSERROR_OK and \a end_idx updated else error code
+	 */
+	nserror (*textselection_get_end)(struct content *c, unsigned *end_idx);
+
+        /**
+	 * handler dependant content sensitive internal data interface.
+	 */
+	void *(*get_internal)(const struct content *c, void *context);
+
+	/**
+	 * are the content contents opaque.
+	 *
+	 * Determine if this content would obscure (not mix with) any background
+	 *
+	 * \param c The content to check
+	 */
+	bool (*is_opaque)(struct content *c);
 
-	/** There must be one content per user for this type. */
+	/**
+	 * There must be one content per user for this type.
+	 */
 	bool no_share;
 };
 
-/** Linked list of users of a content. */
+/**
+ * Linked list of users of a content.
+ */
 struct content_user
 {
 	void (*callback)(
@@ -104,93 +174,233 @@ struct content_user
 	struct content_user *next;
 };
 
-/** Corresponds to a single URL. */
+/**
+ * Content which corresponds to a single URL.
+ */
 struct content {
-	struct llcache_handle *llcache; /**< Low-level cache object */
+	/**
+	 * Low-level cache object
+	 */
+	struct llcache_handle *llcache;
 
-	lwc_string *mime_type;	/**< Original MIME type of data */
+	/**
+	 * Original MIME type of data
+	 */
+	lwc_string *mime_type;
 
-	const struct content_handler *handler;	/**< Handler for content */
+	/**
+	 * Handler for content
+	 */
+	const struct content_handler *handler;
 
-	content_status status;	/**< Current status. */
+	/**
+	 * Current status.
+	 */
+	content_status status;
 
-	int width, height;	/**< Dimensions, if applicable. */
-	int available_width;	/**< Viewport width. */
-	int available_height;	/**< Viewport height. */
+	/**
+	 * Width dimension, if applicable.
+	 */
+	int width;
+	/**
+	 * Height dimension, if applicable.
+	 */
+	int height;
+	/**
+	 * Viewport width.
+	 */
+	int available_width;
+	/**
+	 * Viewport height.
+	 */
+	int available_height;
 
-	bool quirks;		/**< Content is in quirks mode */
-	char *fallback_charset;	/**< Fallback charset, or NULL */
+	/**
+	 * Content is in quirks mode
+	 */
+	bool quirks;
+	/**
+	 * Fallback charset, or NULL
+	 */
+	char *fallback_charset;
 
-	nsurl *refresh;		/**< URL for refresh request */
+	/**
+	 * URL for refresh request
+	 */
+	struct nsurl *refresh;
 
-	struct content_rfc5988_link *links; /**< list of metadata links */
+	/**
+	 * list of metadata links
+	 */
+	struct content_rfc5988_link *links;
 
-	/** Creation timestamp when LOADING or READY.
-	 * Total time in ms when DONE.
+	/**
+	 * Creation timestamp when LOADING or READY.  Total time in ms
+	 * when DONE.
 	 */
 	uint64_t time;
 
-	uint64_t reformat_time;	/**< Earliest time to attempt a period
-                                 * reflow while fetching a page's objects.
-                                 */
-
-	unsigned int size;		/**< Estimated size of all data
-					  associated with this content */
-	char *title;			/**< Title for browser window. */
-	unsigned int active;		/**< Number of child fetches or
-					  conversions currently in progress. */
-	struct content_user *user_list;	/**< List of users. */
-	char status_message[120];	/**< Full text for status bar. */
-	char sub_status[80];		/**< Status of content. */
-	/** Content is being processed: data structures may be inconsistent
-	 * and content must not be redrawn or modified. */
+	/**
+	 * Earliest time to attempt a period reflow while fetching a
+	 * page's objects.
+	 */
+	uint64_t reformat_time;
+
+	/**
+	 * Estimated size of all data associated with this content
+	 */
+	unsigned int size;
+	/**
+	 * Title for browser window.
+	 */
+	char *title;
+	/**
+	 * Number of child fetches or conversions currently in progress.
+	 */
+	unsigned int active;
+	/**
+	 * List of users.
+	 */
+	struct content_user *user_list;
+	/**
+	 * Full text for status bar.
+	 */
+	char status_message[120];
+	/**
+	 * Status of content.
+	 */
+	char sub_status[80];
+	/**
+	 * Content is being processed: data structures may be
+	 * inconsistent and content must not be redrawn or modified.
+	 */
 	bool locked;
 
-	unsigned long total_size;	/**< Total data size, 0 if unknown. */
-	long http_code;			/**< HTTP status code, 0 if not HTTP. */
+	/**
+	 * Total data size, 0 if unknown.
+	 */
+	unsigned long total_size;
+	/**
+	 * HTTP status code, 0 if not HTTP.
+	 */
+	long http_code;
 
-	/** Array of first n rendering errors or warnings. */
+	/**
+	 * Free text search state
+	 */
 	struct {
-		const char *token;
-		unsigned int line;	/**< Line no, 0 if not applicable. */
-	} error_list[40];
-	unsigned int error_count;	/**< Number of valid error entries. */
+		char *string;
+		struct textsearch_context *context;
+	} textsearch;
 };
 
 extern const char * const content_type_name[];
 extern const char * const content_status_name[];
 
+
+/**
+ * Initialise a new base content structure.
+ *
+ * \param c                 Content to initialise
+ * \param handler           Content handler
+ * \param imime_type        MIME type of content
+ * \param params            HTTP parameters
+ * \param llcache           Source data handle
+ * \param fallback_charset  Fallback charset
+ * \param quirks            Quirkiness of content
+ * \return NSERROR_OK on success, appropriate error otherwise
+ */
 nserror content__init(struct content *c, const struct content_handler *handler,
 		lwc_string *imime_type, const struct http_parameter *params,
 		struct llcache_handle *llcache, const char *fallback_charset,
 		bool quirks);
+
+/**
+ * Clone a content's data members
+ *
+ * \param c   Content to clone
+ * \param nc  Content to populate
+ * \return NSERROR_OK on success, appropriate error otherwise
+ */
 nserror content__clone(const struct content *c, struct content *nc);
 
+/**
+ * Put a content in status CONTENT_STATUS_READY and unlock the content.
+ */
 void content_set_ready(struct content *c);
+
+/**
+ * Put a content in status CONTENT_STATUS_DONE.
+ */
 void content_set_done(struct content *c);
+
+/**
+ * Put a content in status CONTENT_STATUS_ERROR and unlock the content.
+ *
+ * \note We expect the caller to broadcast an error report if needed.
+ */
 void content_set_error(struct content *c);
 
+/**
+ * Updates content with new status.
+ *
+ * The textual status contained in the content is updated with given string.
+ *
+ * \param c The content to set status in.
+ * \param status_message new textual status
+ */
 void content_set_status(struct content *c, const char *status_message);
-void content_broadcast(struct content *c, content_msg msg,
-		const union content_msg_data *data);
+
 /**
- * Send an errorcode message to all users.
+ * Send a message to all users.
  */
-void content_broadcast_errorcode(struct content *c, nserror errorcode);
+void content_broadcast(struct content *c, content_msg msg, const union content_msg_data *data);
 
-void content_add_error(struct content *c, const char *token,
-		unsigned int line);
+/**
+ * Send an error message to all users.
+ *
+ * \param c The content whose users should be informed of an error
+ * \param errorcode The nserror code to send
+ * \param msg The error message to send alongside
+ */
+void content_broadcast_error(struct content *c, nserror errorcode, const char *msg);
 
-bool content__add_rfc5988_link(struct content *c, 
-		const struct content_rfc5988_link *link);
-struct content_rfc5988_link *content__free_rfc5988_link(
-		struct content_rfc5988_link *link);
+/**
+ * associate a metadata link with a content.
+ *
+ * \param c content to add link to
+ * \param link The rfc5988 link to add
+ */
+bool content__add_rfc5988_link(struct content *c, const struct content_rfc5988_link *link);
 
-void content__reformat(struct content *c, bool background,
-		int width, int height);
-void content__request_redraw(struct content *c,
-		int x, int y, int width, int height);
+/**
+ * free a rfc5988 link
+ *
+ * \param link The link to free
+ * \return The next link in the chain
+ */
+struct content_rfc5988_link *content__free_rfc5988_link(struct content_rfc5988_link *link);
 
+/**
+ * cause a content to be reformatted.
+ *
+ * \param c content to be reformatted
+ * \param background perform reformat in background
+ * \param width The available width to reformat content in
+ * \param height The available height to reformat content in
+ */
+void content__reformat(struct content *c, bool background, int width, int height);
+
+/**
+ * Request a redraw of an area of a content
+ *
+ * \param c	  Content
+ * \param x	  x co-ord of left edge
+ * \param y	  y co-ord of top edge
+ * \param width	  Width of rectangle
+ * \param height  Height of rectangle
+ */
+void content__request_redraw(struct content *c, int x, int y, int width, int height);
 
 /**
  * Retrieve mime-type of content
@@ -275,7 +485,7 @@ void content__invalidate_reuse_data(struct content *c);
  * \param c Content to retrieve refresh URL from
  * \return Pointer to URL or NULL if none
  */
-nsurl *content__get_refresh_url(struct content *c);
+struct nsurl *content__get_refresh_url(struct content *c);
 
 /**
  * Retrieve the bitmap contained in an image content
@@ -311,4 +521,108 @@ const char *content__get_encoding(struct content *c, enum content_encoding_type
  */
 bool content__is_locked(struct content *c);
 
+/**
+ * Destroy and free a content.
+ *
+ * Calls the destroy function for the content, and frees the structure.
+ */
+void content_destroy(struct content *c);
+
+/**
+ * Register a user for callbacks.
+ *
+ * \param c the content to register
+ * \param callback the user callback function
+ * \param pw callback private data
+ * \return true on success, false otherwise on memory exhaustion
+ *
+ * The callback will be called when content_broadcast() is
+ * called with the content.
+ */
+bool content_add_user(struct content *h,
+		      void (*callback)(
+				       struct content *c,
+				       content_msg msg,
+				       const union content_msg_data *data,
+				       void *pw),
+		      void *pw);
+
+/**
+ * Remove a callback user.
+ *
+ * The callback function and pw must be identical to those passed to
+ * content_add_user().
+ *
+ * \param c Content to remove user from
+ * \param callback passed when added
+ * \param ctx Context passed when added
+ */
+void content_remove_user(struct content *c,
+			 void (*callback)(
+					  struct content *c,
+					  content_msg msg,
+					  const union content_msg_data *data,
+					  void *pw),
+			 void *ctx);
+
+
+/**
+ * Count users for the content.
+ *
+ * \param c Content to consider
+ */
+uint32_t content_count_users(struct content *c);
+
+
+/**
+ * Determine if quirks mode matches
+ *
+ * \param c Content to consider
+ * \param quirks  Quirks mode to match
+ * \return True if quirks match, false otherwise
+ */
+bool content_matches_quirks(struct content *c, bool quirks);
+
+/**
+ * Determine if a content is shareable
+ *
+ * \param c  Content to consider
+ * \return True if content is shareable, false otherwise
+ */
+bool content_is_shareable(struct content *c);
+
+/**
+ * Retrieve the low-level cache handle for a content
+ *
+ * \note only used by hlcache
+ *
+ * \param c Content to retrieve from
+ * \return Low-level cache handle
+ */
+const struct llcache_handle *content_get_llcache_handle(struct content *c);
+
+/**
+ * Retrieve URL associated with content
+ *
+ * \param c  Content to retrieve URL from
+ * \return Pointer to URL, or NULL if not found.
+ */
+struct nsurl *content_get_url(struct content *c);
+
+/**
+ * Clone a content object in its current state.
+ *
+ * \param c  Content to clone
+ * \return Clone of \a c
+ */
+struct content *content_clone(struct content *c);
+
+/**
+ * Abort a content object
+ *
+ * \param c The content object to abort
+ * \return NSERROR_OK on success, otherwise appropriate error
+ */
+nserror content_abort(struct content *c);
+
 #endif
diff --git a/content/fetch.c b/content/fetch.c
index 766502941..1fcc3f996 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -53,10 +53,10 @@
 #include "content/fetch.h"
 #include "content/fetchers.h"
 #include "content/fetchers/resource.h"
-#include "content/fetchers/about.h"
+#include "content/fetchers/about/about.h"
 #include "content/fetchers/curl.h"
 #include "content/fetchers/data.h"
-#include "content/fetchers/file.h"
+#include "content/fetchers/file/file.h"
 #include "javascript/fetcher.h"
 #include "content/urldb.h"
 
@@ -90,7 +90,6 @@ struct fetch {
 	fetch_callback callback;/**< Callback function. */
 	nsurl *url;		/**< URL. */
 	nsurl *referer;		/**< Referer URL. */
-	bool send_referer;	/**< Valid to send the referer */
 	bool verifiable;	/**< Transaction is verifiable */
 	void *p;		/**< Private data for callback. */
 	lwc_string *host;	/**< Host part of URL, interned */
@@ -98,6 +97,7 @@ struct fetch {
 	int fetcherd;           /**< Fetcher descriptor for this fetch */
 	void *fetcher_handle;	/**< The handle for the fetcher. */
 	bool fetch_is_active;	/**< This fetch is active. */
+	fetch_msg_type last_msg;/**< The last message sent for this fetch */
 	struct fetch *r_prev;	/**< Previous active fetch in ::fetch_ring. */
 	struct fetch *r_next;	/**< Next active fetch in ::fetch_ring. */
 };
@@ -460,9 +460,8 @@ fetch_start(nsurl *url,
 {
 	struct fetch *fetch;
 	lwc_string *scheme;
-	bool match;
 
-	fetch = malloc(sizeof (*fetch));
+	fetch = calloc(1, sizeof (*fetch));
 	if (fetch == NULL) {
 		return NSERROR_NOMEM;
 	}
@@ -473,8 +472,8 @@ fetch_start(nsurl *url,
 
 	/* try and obtain a fetcher for this scheme */
 	fetch->fetcherd = get_fetcher_for_scheme(scheme);
+	lwc_string_unref(scheme);
 	if (fetch->fetcherd == -1) {
-		lwc_string_unref(scheme);
 		free(fetch);
 		return NSERROR_NO_FETCH_HANDLER;
 	}
@@ -486,58 +485,12 @@ fetch_start(nsurl *url,
 	fetch->url = nsurl_ref(url);
 	fetch->verifiable = verifiable;
 	fetch->p = p;
-	fetch->http_code = 0;
-	fetch->r_prev = NULL;
-	fetch->r_next = NULL;
-	fetch->referer = NULL;
-	fetch->send_referer = false;
-	fetch->fetcher_handle = NULL;
-	fetch->fetch_is_active = false;
 	fetch->host = nsurl_get_component(url, NSURL_HOST);
 
 	if (referer != NULL) {
-		lwc_string *ref_scheme;
 		fetch->referer = nsurl_ref(referer);
-
-		ref_scheme = nsurl_get_component(referer, NSURL_SCHEME);
-		/* Not a problem if referer has no scheme */
-
-		/* Determine whether to send the Referer header */
-		if (nsoption_bool(send_referer) && ref_scheme != NULL) {
-			/* User permits us to send the header
-			 * Only send it if:
-			 *    1) The fetch and referer schemes match
-			 * or 2) The fetch is https and the referer is http
-			 *
-			 * This ensures that referer information is only sent
-			 * across schemes in the special case of an https
-			 * request from a page served over http. The inverse
-			 * (https -> http) should not send the referer (15.1.3)
-			 */
-			bool match1;
-			bool match2;
-			if (lwc_string_isequal(scheme, ref_scheme,
-					       &match) != lwc_error_ok) {
-				match = false;
-			}
-			if (lwc_string_isequal(scheme, corestring_lwc_https,
-					       &match1) != lwc_error_ok) {
-				match1 = false;
-			}
-			if (lwc_string_isequal(ref_scheme, corestring_lwc_http,
-					       &match2) != lwc_error_ok) {
-				match2= false;
-			}
-			if (match == true || (match1 == true && match2 == true))
-				fetch->send_referer = true;
-		}
-		if (ref_scheme != NULL)
-			lwc_string_unref(ref_scheme);
 	}
 
-	/* these aren't needed past here */
-	lwc_string_unref(scheme);
-
 	/* try and set up the fetch */
 	fetch->fetcher_handle = fetchers[fetch->fetcherd].ops.setup(fetch, url,
 						only_2xx, downgrade_tls,
@@ -584,6 +537,7 @@ fetch_start(nsurl *url,
 void fetch_abort(struct fetch *f)
 {
 	assert(f);
+	f->last_msg = FETCH__INTERNAL_ABORTED;
 	NSLOG(fetch, DEBUG,
 	      "fetch %p, fetcher %p, url '%s'", f, f->fetcher_handle,
 	     nsurl_access(f->url));
@@ -593,6 +547,20 @@ void fetch_abort(struct fetch *f)
 /* exported interface documented in content/fetch.h */
 void fetch_free(struct fetch *f)
 {
+	if (f->last_msg < FETCH_MIN_FINISHED_MSG) {
+		/* We didn't finish, so tell our user that an error occurred */
+		fetch_msg msg;
+
+		msg.type = FETCH_ERROR;
+		msg.data.error = "FetchFailedToFinish";
+
+		NSLOG(fetch, CRITICAL,
+		      "During the fetch of %s, the fetcher did not finish.",
+		      nsurl_access(f->url));
+
+		fetch_send_callback(&msg, f);
+	}
+
 	NSLOG(fetch, DEBUG,
 	      "Freeing fetch %p, fetcher %p",
 	      f,
@@ -712,6 +680,23 @@ fetch_multipart_data_clone(const struct fetch_multipart_data *list)
 	return result;
 }
 
+
+/* exported interface documented in content/fetch.h */
+const char *
+fetch_multipart_data_find(const struct fetch_multipart_data *list,
+			  const char *name)
+{
+	while (list != NULL) {
+		if (strcmp(list->name, name) == 0) {
+			return list->value;
+		}
+		list = list->next;
+	}
+
+	return NULL;
+}
+
+
 /* exported interface documented in content/fetch.h */
 void fetch_multipart_data_destroy(struct fetch_multipart_data *list)
 {
@@ -730,10 +715,50 @@ void fetch_multipart_data_destroy(struct fetch_multipart_data *list)
 	}
 }
 
+
+/* exported interface documented in content/fetch.h */
+nserror
+fetch_multipart_data_new_kv(struct fetch_multipart_data **list,
+			    const char *name,
+			    const char *value)
+{
+	struct fetch_multipart_data *newdata;
+
+	assert(list);
+
+	newdata = calloc(sizeof(*newdata), 1);
+
+	if (newdata == NULL) {
+		return NSERROR_NOMEM;
+	}
+
+	newdata->name = strdup(name);
+	if (newdata->name == NULL) {
+		free(newdata);
+		return NSERROR_NOMEM;
+	}
+
+	newdata->value = strdup(value);
+	if (newdata->value == NULL) {
+		free(newdata->name);
+		free(newdata);
+		return NSERROR_NOMEM;
+	}
+
+	newdata->next = *list;
+	*list = newdata;
+
+	return NSERROR_OK;
+}
+
+
 /* exported interface documented in content/fetch.h */
 void
 fetch_send_callback(const fetch_msg *msg, struct fetch *fetch)
 {
+	/* Bump the last_msg to the greatest seen msg */
+	if (msg->type > fetch->last_msg)
+		fetch->last_msg = msg->type;
 	fetch->callback(msg, fetch->p);
 }
 
@@ -773,13 +798,6 @@ void fetch_set_http_code(struct fetch *fetch, long http_code)
 	fetch->http_code = http_code;
 }
 
-/* exported interface documented in content/fetch.h */
-const char *fetch_get_referer_to_send(struct fetch *fetch)
-{
-	if (fetch->send_referer)
-		return nsurl_access(fetch->referer);
-	return NULL;
-}
 
 /* exported interface documented in content/fetch.h */
 void fetch_set_cookie(struct fetch *fetch, const char *data)
diff --git a/content/fetch.h b/content/fetch.h
index 0b4b52a2f..e7180d0c3 100644
--- a/content/fetch.h
+++ b/content/fetch.h
@@ -28,15 +28,21 @@
 #include "utils/config.h"
 #include "utils/nsurl.h"
 #include "utils/inet.h"
+#include "netsurf/ssl_certs.h"
 
 struct content;
 struct fetch;
 struct ssl_cert_info;
 
+/**
+ * Fetcher message types
+ */
 typedef enum {
 	FETCH_PROGRESS,
+	FETCH_CERTS,
 	FETCH_HEADER,
 	FETCH_DATA,
+	/* Anything after here is a completed fetch of some kind. */
 	FETCH_FINISHED,
 	FETCH_TIMEDOUT,
 	FETCH_ERROR,
@@ -47,6 +53,22 @@ typedef enum {
 	FETCH_SSL_ERR
 } fetch_msg_type;
 
+/** Minimum finished message type.
+ *
+ * If a fetch does not progress this far, it's an error and the fetch machinery
+ * will send FETCH_ERROR to the llcache on fetch_free()
+ */
+#define FETCH_MIN_FINISHED_MSG FETCH_FINISHED
+
+/**
+ * This message is actually an internal message used to indicate
+ * that a fetch was aborted.  Do not send this, nor expect it.
+ */
+#define FETCH__INTERNAL_ABORTED FETCH_ERROR
+
+/**
+ * Fetcher message data
+ */
 typedef struct fetch_msg {
 	fetch_msg_type type;
 
@@ -67,14 +89,21 @@ typedef struct fetch_msg {
 			const char *realm;
 		} auth;
 
-		struct {
-			const struct ssl_cert_info *certs;
-			size_t num_certs;
-		} cert_err;
+		const struct cert_chain *chain;
 	} data;
 } fetch_msg;
 
 /**
+ * Fetcher post data types
+ */
+typedef enum {
+	FETCH_POSTDATA_NONE,
+	FETCH_POSTDATA_URLENC,
+	FETCH_POSTDATA_MULTIPART,
+} fetch_postdata_type;
+
+
+/**
  * Fetch POST multipart data
  */
 struct fetch_multipart_data {
@@ -88,19 +117,19 @@ struct fetch_multipart_data {
 };
 
 /**
- * ssl certificate information for certificate error message
+ * fetch POST data
  */
-struct ssl_cert_info {
-	long version;		/**< Certificate version */
-	char not_before[32];	/**< Valid from date */
-	char not_after[32];	/**< Valid to date */
-	int sig_type;		/**< Signature type */
-	long serial;		/**< Serial number */
-	char issuer[256];	/**< Issuer details */
-	char subject[256];	/**< Subject details */
-	int cert_type;		/**< Certificate type */
+struct fetch_postdata {
+	fetch_postdata_type type;
+	union {
+		/** Url encoded POST string if type is FETCH_POSTDATA_URLENC */
+		char *urlenc;
+		/** Multipart post data if type is FETCH_POSTDATA_MULTIPART */
+		struct fetch_multipart_data *multipart;
+	} data;
 };
 
+
 typedef void (*fetch_callback)(const fetch_msg *msg, void *p);
 
 /**
@@ -181,6 +210,30 @@ void fetch_multipart_data_destroy(struct fetch_multipart_data *list);
 struct fetch_multipart_data *fetch_multipart_data_clone(const struct fetch_multipart_data *list);
 
 /**
+ * Find an entry in a fetch_multipart_data
+ *
+ * \param list Pointer to the multipart list
+ * \param name The name to look for in the list
+ * \return The value found, or NULL if not present
+ */
+const char *fetch_multipart_data_find(const struct fetch_multipart_data *list,
+				      const char *name);
+
+/**
+ * Create an entry for a fetch_multipart_data
+ *
+ * If an entry exists of the same name, it will *NOT* be overwritten
+ *
+ * \param list Pointer to the pointer to the current multipart list
+ * \param name The name of the entry to create
+ * \param value The value of the entry to create
+ * \return The result of the attempt
+ */
+nserror fetch_multipart_data_new_kv(struct fetch_multipart_data **list,
+				    const char *name,
+				    const char *value);
+
+/**
  * send message to fetch
  */
 void fetch_send_callback(const fetch_msg *msg, struct fetch *fetch);
@@ -201,11 +254,6 @@ void fetch_free(struct fetch *f);
 void fetch_set_http_code(struct fetch *fetch, long http_code);
 
 /**
- * get the referer from the fetch
- */
-const char *fetch_get_referer_to_send(struct fetch *fetch);
-
-/**
  * set cookie data on a fetch
  */
 void fetch_set_cookie(struct fetch *fetch, const char *data);
diff --git a/content/fetchers/Makefile b/content/fetchers/Makefile
index 9c8479320..8f6e5211f 100644
--- a/content/fetchers/Makefile
+++ b/content/fetchers/Makefile
@@ -1,10 +1,15 @@
 # Content fetchers sources
 
-S_FETCHERS_YES := data.c file.c about.c resource.c
+S_FETCHERS_YES := data.c resource.c
 S_FETCHERS_NO :=
 S_FETCHERS_$(NETSURF_USE_CURL) += curl.c
 
-S_FETCHERS := $(addprefix content/fetchers/,$(S_FETCHERS_YES))
+S_FETCHERS := $(addprefix fetchers/,$(S_FETCHERS_YES))
 
-# The following files depend on the testament
-content/fetchers/about.c: testament $(OBJROOT)/testament.h
+# about fetcher
+include content/fetchers/about/Makefile
+S_FETCHERS += $(addprefix fetchers/about/,$(S_FETCHER_ABOUT))
+
+# file fetcher
+include content/fetchers/file/Makefile
+S_FETCHERS += $(addprefix fetchers/file/,$(S_FETCHER_FILE))
diff --git a/content/fetchers/about.c b/content/fetchers/about.c
deleted file mode 100644
index 4d14020b0..000000000
--- a/content/fetchers/about.c
+++ /dev/null
@@ -1,862 +0,0 @@
-/*
- * Copyright 2011 Vincent Sanders <vince@netsurf-browser.org>
- *
- * This file is part of NetSurf.
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file
- *
- * URL handling for the "about" scheme.
- *
- * Based on the data fetcher by Rob Kendrick
- * This fetcher provides a simple scheme for the user to access
- * information from the browser from a known, fixed URL.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "testament.h"
-#include "utils/corestrings.h"
-#include "utils/nsoption.h"
-#include "utils/utils.h"
-#include "utils/ring.h"
-
-#include "content/fetch.h"
-#include "content/fetchers.h"
-#include "content/fetchers/about.h"
-#include "image/image_cache.h"
-
-
-struct fetch_about_context;
-
-typedef bool (*fetch_about_handler)(struct fetch_about_context *);
-
-/** Context for an about fetch */
-struct fetch_about_context {
-	struct fetch_about_context *r_next, *r_prev;
-
-	struct fetch *fetchh; /**< Handle for this fetch */
-
-	bool aborted; /**< Flag indicating fetch has been aborted */
-	bool locked; /**< Flag indicating entry is already entered */
-
-	nsurl *url; /**< The full url the fetch refers to */
-
-	fetch_about_handler handler;
-};
-
-static struct fetch_about_context *ring = NULL;
-
-/** issue fetch callbacks with locking */
-static inline bool fetch_about_send_callback(const fetch_msg *msg,
-		struct fetch_about_context *ctx)
-{
-	ctx->locked = true;
-	fetch_send_callback(msg, ctx->fetchh);
-	ctx->locked = false;
-
-	return ctx->aborted;
-}
-
-static bool fetch_about_send_header(struct fetch_about_context *ctx,
-		const char *fmt, ...)
-{
-	char header[64];
-	fetch_msg msg;
-	va_list ap;
-
-	va_start(ap, fmt);
-
-	vsnprintf(header, sizeof header, fmt, ap);
-
-	va_end(ap);
-
-	msg.type = FETCH_HEADER;
-	msg.data.header_or_data.buf = (const uint8_t *) header;
-	msg.data.header_or_data.len = strlen(header);
-
-	fetch_about_send_callback(&msg, ctx);
-
-	return ctx->aborted;
-}
-
-
-
-
-static bool fetch_about_blank_handler(struct fetch_about_context *ctx)
-{
-	fetch_msg msg;
-	const char buffer[2] = { ' ', '\0' };
-
-	/* content is going to return ok */
-	fetch_set_http_code(ctx->fetchh, 200);
-
-	/* content type */
-	if (fetch_about_send_header(ctx, "Content-Type: text/html"))
-		goto fetch_about_blank_handler_aborted;
-
-	msg.type = FETCH_DATA;
-	msg.data.header_or_data.buf = (const uint8_t *) buffer;
-	msg.data.header_or_data.len = strlen(buffer);
-
-	if (fetch_about_send_callback(&msg, ctx))
-		goto fetch_about_blank_handler_aborted;
-
-	msg.type = FETCH_FINISHED;
-
-	fetch_about_send_callback(&msg, ctx);
-
-	return true;
-
-fetch_about_blank_handler_aborted:
-	return false;
-}
-
-
-static bool fetch_about_credits_handler(struct fetch_about_context *ctx)
-{
-	fetch_msg msg;
-
-	/* content is going to return redirect */
-	fetch_set_http_code(ctx->fetchh, 302);
-
-	msg.type = FETCH_REDIRECT;
-	msg.data.redirect = "resource:credits.html";
-
-	fetch_about_send_callback(&msg, ctx);
-
-	return true;
-}
-
-
-static bool fetch_about_licence_handler(struct fetch_about_context *ctx)
-{
-	fetch_msg msg;
-
-	/* content is going to return redirect */
-	fetch_set_http_code(ctx->fetchh, 302);
-
-	msg.type = FETCH_REDIRECT;
-	msg.data.redirect = "resource:licence.html";
-
-	fetch_about_send_callback(&msg, ctx);
-
-	return true;
-}
-
-/**
- * Handler to generate about:cache page.
- *
- * Shows details of current image cache.
- *
- * \param ctx The fetcher context.
- * \return true if handled false if aborted.
- */
-static bool fetch_about_imagecache_handler(struct fetch_about_context *ctx)
-{
-	fetch_msg msg;
-	char buffer[2048]; /* output buffer */
-	int code = 200;
-	int slen;
-	unsigned int cent_loop = 0;
-	int res = 0;
-
-	/* content is going to return ok */
-	fetch_set_http_code(ctx->fetchh, code);
-
-	/* content type */
-	if (fetch_about_send_header(ctx, "Content-Type: text/html"))
-		goto fetch_about_imagecache_handler_aborted;
-
-	msg.type = FETCH_DATA;
-	msg.data.header_or_data.buf = (const uint8_t *) buffer;
-
-	/* page head */
-	slen = snprintf(buffer, sizeof buffer,
-			"<html>\n<head>\n"
-			"<title>NetSurf Browser Image Cache Status</title>\n"
-			"<link rel=\"stylesheet\" type=\"text/css\" "
-			"href=\"resource:internal.css\">\n"
-			"</head>\n"
-			"<body id =\"cachelist\">\n"
-			"<p class=\"banner\">"
-			"<a href=\"http://www.netsurf-browser.org/\">"
-			"<img src=\"resource:netsurf.png\" alt=\"NetSurf\"></a>"
-			"</p>\n"
-			"<h1>NetSurf Browser Image Cache Status</h1>\n"	);
-	msg.data.header_or_data.len = slen;
-	if (fetch_about_send_callback(&msg, ctx))
-		goto fetch_about_imagecache_handler_aborted;
-
-	/* image cache summary */
-	slen = image_cache_snsummaryf(buffer, sizeof(buffer),
-		"<p>Configured limit of %a hysteresis of %b</p>\n"
-		"<p>Total bitmap size in use %c (in %d)</p>\n"
-		"<p>Age %es</p>\n"
-		"<p>Peak size %f (in %g)</p>\n"
-		"<p>Peak image count %h (size %i)</p>\n"
-		"<p>Cache total/hit/miss/fail (counts) %j/%k/%l/%m "
-				"(%pj%%/%pk%%/%pl%%/%pm%%)</p>\n"
-		"<p>Cache total/hit/miss/fail (size) %n/%o/%q/%r "
-				"(%pn%%/%po%%/%pq%%/%pr%%)</p>\n"
-		"<p>Total images never rendered: %s "
-				"(includes %t that were converted)</p>\n"
-		"<p>Total number of excessive conversions: %u "
-				"(from %v images converted more than once)"
-				"</p>\n"
-		"<p>Bitmap of size %w had most (%x) conversions</p>\n"
-		"<h2>Current image cache contents</h2>\n");
-	if (slen >= (int) (sizeof(buffer)))
-		goto fetch_about_imagecache_handler_aborted; /* overflow */
-
-	msg.data.header_or_data.len = slen;
-	if (fetch_about_send_callback(&msg, ctx))
-		goto fetch_about_imagecache_handler_aborted;
-
-
-	/* image cache entry table */
-	slen = snprintf(buffer, sizeof buffer,
-			"<p class=\"imagecachelist\">\n"
-			"<strong>"
-			"<span>Entry</span>"
-			"<span>Content Key</span>"
-			"<span>Redraw Count</span>"
-			"<span>Conversion Count</span>"
-			"<span>Last Redraw</span>"
-			"<span>Bitmap Age</span>"
-			"<span>Bitmap Size</span>"
-			"<span>Source</span>"
-			"</strong>\n");
-	do {
-		res = image_cache_snentryf(buffer + slen, sizeof buffer - slen,
-				cent_loop,
-				"<a href=\"%U\">"
-				"<span>%e</span>"
-				"<span>%k</span>"
-				"<span>%r</span>"
-				"<span>%c</span>"
-				"<span>%a</span>"
-				"<span>%g</span>"
-				"<span>%s</span>"
-				"<span>%o</span>"
-				"</a>\n");
-		if (res <= 0)
-			break; /* last option */
-
-		if (res >= (int) (sizeof buffer - slen)) {
-			/* last entry would not fit in buffer, submit buffer */
-			msg.data.header_or_data.len = slen;
-			if (fetch_about_send_callback(&msg, ctx))
-				goto fetch_about_imagecache_handler_aborted;
-			slen = 0;
-		} else {
-			/* normal addition */
-			slen += res;
-			cent_loop++;
-		}
-	} while (res > 0);
-
-	slen += snprintf(buffer + slen, sizeof buffer - slen,
-			 "</p>\n</body>\n</html>\n");
-
-	msg.data.header_or_data.len = slen;
-	if (fetch_about_send_callback(&msg, ctx))
-		goto fetch_about_imagecache_handler_aborted;
-
-	msg.type = FETCH_FINISHED;
-	fetch_about_send_callback(&msg, ctx);
-
-	return true;
-
-fetch_about_imagecache_handler_aborted:
-	return false;
-}
-
-/** Handler to generate about:config page */
-static bool fetch_about_config_handler(struct fetch_about_context *ctx)
-{
-	fetch_msg msg;
-	char buffer[1024];
-	int code = 200;
-	int slen;
-	unsigned int opt_loop = 0;
-	int res = 0;
-
-	/* content is going to return ok */
-	fetch_set_http_code(ctx->fetchh, code);
-
-	/* content type */
-	if (fetch_about_send_header(ctx, "Content-Type: text/html"))
-		goto fetch_about_config_handler_aborted;
-
-	msg.type = FETCH_DATA;
-	msg.data.header_or_data.buf = (const uint8_t *) buffer;
-
-	slen = snprintf(buffer, sizeof buffer,
-			"<html>\n<head>\n"
-			"<title>NetSurf Browser Config</title>\n"
-			"<link rel=\"stylesheet\" type=\"text/css\" "
-			"href=\"resource:internal.css\">\n"
-			"</head>\n"
-			"<body id =\"configlist\">\n"
-			"<p class=\"banner\">"
-			"<a href=\"http://www.netsurf-browser.org/\">"
-			"<img src=\"resource:netsurf.png\" alt=\"NetSurf\"></a>"
-			"</p>\n"
-			"<h1>NetSurf Browser Config</h1>\n"
-			"<table class=\"config\">\n"
-			"<tr><th>Option</th><th>Type</th><th>Provenance</th><th>Setting</th></tr>\n");
-
-	do {
-		res = nsoption_snoptionf(buffer + slen,
-					 sizeof buffer - slen,
-					 opt_loop,
-					 "<tr><th>%k</th><td>%t</td><td>%p</td><td>%V</td></tr>\n");
-		if (res <= 0)
-			break; /* last option */
-
-		if (res >= (int) (sizeof buffer - slen)) {
-			/* last entry would not fit in buffer, submit buffer */
-			msg.data.header_or_data.len = slen;
-			if (fetch_about_send_callback(&msg, ctx))
-				goto fetch_about_config_handler_aborted;
-			slen = 0;
-		} else {
-			/* normal addition */
-			slen += res;
-			opt_loop++;
-		}
-	} while (res > 0);
-
-	slen += snprintf(buffer + slen, sizeof buffer - slen,
-			 "</table>\n</body>\n</html>\n");
-
-	msg.data.header_or_data.len = slen;
-	if (fetch_about_send_callback(&msg, ctx))
-		goto fetch_about_config_handler_aborted;
-
-	msg.type = FETCH_FINISHED;
-	fetch_about_send_callback(&msg, ctx);
-
-	return true;
-
-fetch_about_config_handler_aborted:
-	return false;
-}
-
-
-/** Generate the text of a Choices file which represents the current
- * in use options.
- */
-static bool fetch_about_choices_handler(struct fetch_about_context *ctx)
-{
-	fetch_msg msg;
-	char buffer[1024];
-	int code = 200;
-	int slen;
-	unsigned int opt_loop = 0;
-	int res = 0;
-
-	/* content is going to return ok */
-	fetch_set_http_code(ctx->fetchh, code);
-
-	/* content type */
-	if (fetch_about_send_header(ctx, "Content-Type: text/plain"))
-		goto fetch_about_choices_handler_aborted;
-
-	msg.type = FETCH_DATA;
-	msg.data.header_or_data.buf = (const uint8_t *) buffer;
-
-	slen = snprintf(buffer, sizeof buffer,
-		 "# Automatically generated current NetSurf browser Choices\n");
-
-	do {
-		res = nsoption_snoptionf(buffer + slen,
-				sizeof buffer - slen,
-				opt_loop,
-				"%k:%v\n");
-		if (res <= 0)
-			break; /* last option */
-
-		if (res >= (int) (sizeof buffer - slen)) {
-			/* last entry would not fit in buffer, submit buffer */
-			msg.data.header_or_data.len = slen;
-			if (fetch_about_send_callback(&msg, ctx))
-				goto fetch_about_choices_handler_aborted;
-			slen = 0;
-		} else {
-			/* normal addition */
-			slen += res;
-			opt_loop++;
-		}
-	} while (res > 0);
-
-	msg.data.header_or_data.len = slen;
-	if (fetch_about_send_callback(&msg, ctx))
-		goto fetch_about_choices_handler_aborted;
-
-	msg.type = FETCH_FINISHED;
-	fetch_about_send_callback(&msg, ctx);
-
-	return true;
-
-fetch_about_choices_handler_aborted:
-	return false;
-}
-
-/** Generate the text of an svn testament which represents the current
- * build-tree status
- */
-typedef struct { const char *leaf; const char *modtype; } modification_t;
-static bool fetch_about_testament_handler(struct fetch_about_context *ctx)
-{
-	static modification_t modifications[] = WT_MODIFICATIONS;
-	fetch_msg msg;
-	char buffer[1024];
-	int code = 200;
-	int slen;
-	int i;
-
-
-	/* content is going to return ok */
-	fetch_set_http_code(ctx->fetchh, code);
-
-	/* content type */
-	if (fetch_about_send_header(ctx, "Content-Type: text/plain"))
-		goto fetch_about_testament_handler_aborted;
-
-	msg.type = FETCH_DATA;
-	msg.data.header_or_data.buf = (const uint8_t *) buffer;
-
-	slen = snprintf(buffer, sizeof buffer,
-		 "# Automatically generated by NetSurf build system\n\n");
-
-	msg.data.header_or_data.len = slen;
-	if (fetch_about_send_callback(&msg, ctx))
-		goto fetch_about_testament_handler_aborted;
-
-	slen = snprintf(buffer, sizeof buffer,
-#if defined(WT_BRANCHISTRUNK) || defined(WT_BRANCHISMASTER)
-			"# This is a *DEVELOPMENT* build from the main line.\n\n"
-#elif defined(WT_BRANCHISTAG) && (WT_MODIFIED == 0)
-			"# This is a tagged build of NetSurf\n"
-#ifdef WT_TAGIS
-			"#      The tag used was '" WT_TAGIS "'\n\n"
-#else
-			"\n"
-#endif
-#elif defined(WT_NO_SVN) || defined(WT_NO_GIT)
-			"# This NetSurf was built outside of our revision "
-			"control environment.\n"
-			"# This testament is therefore not very useful.\n\n"
-#else
-			"# This NetSurf was built from a branch (" WT_BRANCHPATH ").\n\n"
-#endif
-#if defined(CI_BUILD)
-			"# This build carries the CI build number '" CI_BUILD "'\n\n"
-#endif
-			);
-
-	msg.data.header_or_data.len = slen;
-	if (fetch_about_send_callback(&msg, ctx))
-		goto fetch_about_testament_handler_aborted;
-
-
-	slen = snprintf(buffer, sizeof buffer,
-			"Built by %s (%s) from %s at revision %s on %s\n\n",
-			GECOS, USERNAME, WT_BRANCHPATH, WT_REVID, WT_COMPILEDATE);
-
-	msg.data.header_or_data.len = slen;
-	if (fetch_about_send_callback(&msg, ctx))
-		goto fetch_about_testament_handler_aborted;
-
-	slen = snprintf(buffer, sizeof buffer,
-			"Built on %s in %s\n\n",
-			WT_HOSTNAME, WT_ROOT);
-
-	msg.data.header_or_data.len = slen;
-	if (fetch_about_send_callback(&msg, ctx))
-		goto fetch_about_testament_handler_aborted;
-
-	if (WT_MODIFIED > 0) {
-		slen = snprintf(buffer, sizeof buffer,
-				"Working tree has %d modification%s\n\n",
-				WT_MODIFIED, WT_MODIFIED == 1 ? "" : "s");
-	} else {
-		slen = snprintf(buffer, sizeof buffer,
-				"Working tree is not modified.\n");
-	}
-
-	msg.data.header_or_data.len = slen;
-	if (fetch_about_send_callback(&msg, ctx))
-		goto fetch_about_testament_handler_aborted;
-
-	for (i = 0; i < WT_MODIFIED; ++i) {
-		slen = snprintf(buffer, sizeof buffer,
-				"  %s  %s\n",
-				modifications[i].modtype,
-				modifications[i].leaf);
-		msg.data.header_or_data.len = slen;
-		if (fetch_about_send_callback(&msg, ctx))
-			goto fetch_about_testament_handler_aborted;
-
-	}
-
-	msg.type = FETCH_FINISHED;
-	fetch_about_send_callback(&msg, ctx);
-
-	return true;
-
-fetch_about_testament_handler_aborted:
-	return false;
-}
-
-static bool fetch_about_logo_handler(struct fetch_about_context *ctx)
-{
-	fetch_msg msg;
-
-	/* content is going to return redirect */
-	fetch_set_http_code(ctx->fetchh, 302);
-
-	msg.type = FETCH_REDIRECT;
-	msg.data.redirect = "resource:netsurf.png";
-
-	fetch_about_send_callback(&msg, ctx);
-
-	return true;
-}
-
-static bool fetch_about_welcome_handler(struct fetch_about_context *ctx)
-{
-	fetch_msg msg;
-
-	/* content is going to return redirect */
-	fetch_set_http_code(ctx->fetchh, 302);
-
-	msg.type = FETCH_REDIRECT;
-	msg.data.redirect = "resource:welcome.html";
-
-	fetch_about_send_callback(&msg, ctx);
-
-	return true;
-}
-
-static bool fetch_about_maps_handler(struct fetch_about_context *ctx)
-{
-	fetch_msg msg;
-
-	/* content is going to return redirect */
-	fetch_set_http_code(ctx->fetchh, 302);
-
-	msg.type = FETCH_REDIRECT;
-	msg.data.redirect = "resource:maps.html";
-
-	fetch_about_send_callback(&msg, ctx);
-
-	return true;
-}
-
-/* Forward declaration because this handler requires the handler table. */
-static bool fetch_about_about_handler(struct fetch_about_context *ctx);
-
-struct about_handlers {
-	const char *name; /**< name to match in url */
-	int name_len;
-	lwc_string *lname; /**< Interned name */
-	fetch_about_handler handler; /* handler for the url */
-	bool hidden; /* Flag indicating if entry should show in listing */
-};
-
-/** List of about paths and their handlers */
-struct about_handlers about_handler_list[] = {
-	{ "credits", SLEN("credits"), NULL,
-			fetch_about_credits_handler, false },
-	{ "licence", SLEN("licence"), NULL,
-			fetch_about_licence_handler, false },
-	{ "license", SLEN("license"), NULL,
-			fetch_about_licence_handler, true },
-	{ "welcome", SLEN("welcome"), NULL,
-			fetch_about_welcome_handler, false },
-	{ "maps", SLEN("maps"), NULL,
-			fetch_about_maps_handler, false },
-	{ "config", SLEN("config"), NULL,
-			fetch_about_config_handler, false },
-	{ "Choices", SLEN("Choices"), NULL,
-			fetch_about_choices_handler, false },
-	{ "testament", SLEN("testament"), NULL,
-			fetch_about_testament_handler, false },
-	{ "about", SLEN("about"), NULL,
-			fetch_about_about_handler, true },
-	{ "logo", SLEN("logo"), NULL,
-			fetch_about_logo_handler, true },
-	/* details about the image cache */
-	{ "imagecache", SLEN("imagecache"), NULL,
-			fetch_about_imagecache_handler, true },
-	/* The default blank page */
-	{ "blank", SLEN("blank"), NULL,
-			fetch_about_blank_handler, true }
-};
-
-#define about_handler_list_len (sizeof(about_handler_list) /		\
-		sizeof(struct about_handlers))
-
-/**
- * List all the valid about: paths available
- *
- * \param ctx The fetch context.
- * \return true for sucess or false to generate an error.
- */
-static bool fetch_about_about_handler(struct fetch_about_context *ctx)
-{
-	fetch_msg msg;
-	char buffer[1024];
-	int code = 200;
-	int slen;
-	unsigned int abt_loop = 0;
-	int res = 0;
-
-	/* content is going to return ok */
-	fetch_set_http_code(ctx->fetchh, code);
-
-	/* content type */
-	if (fetch_about_send_header(ctx, "Content-Type: text/html"))
-		goto fetch_about_config_handler_aborted;
-
-	msg.type = FETCH_DATA;
-	msg.data.header_or_data.buf = (const uint8_t *) buffer;
-
-	slen = snprintf(buffer, sizeof buffer,
-			"<html>\n<head>\n"
-			"<title>NetSurf List of About pages</title>\n"
-			"<link rel=\"stylesheet\" type=\"text/css\" "
-			"href=\"resource:internal.css\">\n"
-			"</head>\n"
-			"<body id =\"aboutlist\">\n"
-			"<p class=\"banner\">"
-			"<a href=\"http://www.netsurf-browser.org/\">"
-			"<img src=\"resource:netsurf.png\" alt=\"NetSurf\"></a>"
-			"</p>\n"
-			"<h1>NetSurf List of About pages</h1>\n"
-			"<ul>\n");
-
-	for (abt_loop = 0; abt_loop < about_handler_list_len; abt_loop++) {
-
-		/* Skip over hidden entries */
-		if (about_handler_list[abt_loop].hidden)
-			continue;
-
-		res = snprintf(buffer + slen, sizeof buffer - slen,
-			       "<li><a href=\"about:%s\">about:%s</a></li>\n",
-			       about_handler_list[abt_loop].name,
-			       about_handler_list[abt_loop].name);
-		if (res <= 0)
-			break; /* last option */
-
-		if (res >= (int)(sizeof buffer - slen)) {
-			/* last entry would not fit in buffer, submit buffer */
-			msg.data.header_or_data.len = slen;
-			if (fetch_about_send_callback(&msg, ctx))
-				goto fetch_about_config_handler_aborted;
-			slen = 0;
-		} else {
-			/* normal addition */
-			slen += res;
-		}
-	}
-
-	slen += snprintf(buffer + slen, sizeof buffer - slen,
-			 "</ul>\n</body>\n</html>\n");
-
-	msg.data.header_or_data.len = slen;
-	if (fetch_about_send_callback(&msg, ctx))
-		goto fetch_about_config_handler_aborted;
-
-	msg.type = FETCH_FINISHED;
-	fetch_about_send_callback(&msg, ctx);
-
-	return true;
-
-fetch_about_config_handler_aborted:
-	return false;
-}
-
-
-/** callback to initialise the about fetcher. */
-static bool fetch_about_initialise(lwc_string *scheme)
-{
-	unsigned int abt_loop = 0;
-	lwc_error error;
-
-	for (abt_loop = 0; abt_loop < about_handler_list_len; abt_loop++) {
-		error = lwc_intern_string(about_handler_list[abt_loop].name,
-					about_handler_list[abt_loop].name_len,
-					&about_handler_list[abt_loop].lname);
-		if (error != lwc_error_ok) {
-			while (abt_loop-- != 0) {
-				lwc_string_unref(about_handler_list[abt_loop].lname);
-			}
-			return false;
-		}
-	}
-
-	return true;
-}
-
-/** callback to finalise the about fetcher. */
-static void fetch_about_finalise(lwc_string *scheme)
-{
-	unsigned int abt_loop = 0;
-	for (abt_loop = 0; abt_loop < about_handler_list_len; abt_loop++) {
-		lwc_string_unref(about_handler_list[abt_loop].lname);
-	}
-}
-
-static bool fetch_about_can_fetch(const nsurl *url)
-{
-	return true;
-}
-
-/** callback to set up a about fetch context. */
-static void *
-fetch_about_setup(struct fetch *fetchh,
-		 nsurl *url,
-		 bool only_2xx,
-		 bool downgrade_tls,
-		 const char *post_urlenc,
-		 const struct fetch_multipart_data *post_multipart,
-		 const char **headers)
-{
-	struct fetch_about_context *ctx;
-	unsigned int handler_loop;
-	lwc_string *path;
-	bool match;
-
-	ctx = calloc(1, sizeof(*ctx));
-	if (ctx == NULL)
-		return NULL;
-
-	path = nsurl_get_component(url, NSURL_PATH);
-
-	for (handler_loop = 0;
-	     handler_loop < about_handler_list_len;
-	     handler_loop++) {
-		ctx->handler = about_handler_list[handler_loop].handler;
-		if (lwc_string_isequal(path,
-				       about_handler_list[handler_loop].lname,
-				       &match) == lwc_error_ok && match) {
-			break;
-		}
-	}
-
-	if (path != NULL)
-		lwc_string_unref(path);
-
-	ctx->fetchh = fetchh;
-	ctx->url = nsurl_ref(url);
-
-	RING_INSERT(ring, ctx);
-
-	return ctx;
-}
-
-/** callback to free a about fetch */
-static void fetch_about_free(void *ctx)
-{
-	struct fetch_about_context *c = ctx;
-	nsurl_unref(c->url);
-	RING_REMOVE(ring, c);
-	free(ctx);
-}
-
-/** callback to start a about fetch */
-static bool fetch_about_start(void *ctx)
-{
-	return true;
-}
-
-/** callback to abort a about fetch */
-static void fetch_about_abort(void *ctx)
-{
-	struct fetch_about_context *c = ctx;
-
-	/* To avoid the poll loop having to deal with the fetch context
-	 * disappearing from under it, we simply flag the abort here.
-	 * The poll loop itself will perform the appropriate cleanup.
-	 */
-	c->aborted = true;
-}
-
-
-/** callback to poll for additional about fetch contents */
-static void fetch_about_poll(lwc_string *scheme)
-{
-	struct fetch_about_context *c, *next;
-
-	if (ring == NULL) return;
-
-	/* Iterate over ring, processing each pending fetch */
-	c = ring;
-	do {
-		/* Ignore fetches that have been flagged as locked.
-		 * This allows safe re-entrant calls to this function.
-		 * Re-entrancy can occur if, as a result of a callback,
-		 * the interested party causes fetch_poll() to be called
-		 * again.
-		 */
-		if (c->locked == true) {
-			next = c->r_next;
-			continue;
-		}
-
-		/* Only process non-aborted fetches */
-		if (c->aborted == false) {
-			/* about fetches can be processed in one go */
-			c->handler(c);
-		}
-
-		/* Compute next fetch item at the last possible moment
-		 * as processing this item may have added to the ring
-		 */
-		next = c->r_next;
-
-		fetch_remove_from_queues(c->fetchh);
-		fetch_free(c->fetchh);
-
-		/* Advance to next ring entry, exiting if we've reached
-		 * the start of the ring or the ring has become empty
-		 */
-	} while ( (c = next) != ring && ring != NULL);
-}
-
-nserror fetch_about_register(void)
-{
-	lwc_string *scheme = lwc_string_ref(corestring_lwc_about);
-	const struct fetcher_operation_table fetcher_ops = {
-		.initialise = fetch_about_initialise,
-		.acceptable = fetch_about_can_fetch,
-		.setup = fetch_about_setup,
-		.start = fetch_about_start,
-		.abort = fetch_about_abort,
-		.free = fetch_about_free,
-		.poll = fetch_about_poll,
-		.finalise = fetch_about_finalise
-	};
-
-	return fetcher_add(scheme, &fetcher_ops);
-}
diff --git a/content/fetchers/about/Makefile b/content/fetchers/about/Makefile
new file mode 100644
index 000000000..4f12a0626
--- /dev/null
+++ b/content/fetchers/about/Makefile
@@ -0,0 +1,20 @@
+# about fetcher sources
+
+S_FETCHER_ABOUT := \
+	about.c \
+	blank.c \
+	certificate.c \
+	chart.c \
+	choices.c \
+	config.c \
+	imagecache.c \
+	nscolours.c \
+	query.c \
+	query_auth.c \
+	query_fetcherror.c \
+	query_privacy.c \
+	query_timeout.c \
+	testament.c
+
+# The following files depend on the testament
+content/fetchers/about/testament.c: testament $(OBJROOT)/testament.h
diff --git a/content/fetchers/about/about.c b/content/fetchers/about/about.c
new file mode 100644
index 000000000..651894249
--- /dev/null
+++ b/content/fetchers/about/about.c
@@ -0,0 +1,758 @@
+/*
+ * Copyright 2011 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ *
+ * URL handling for the "about" scheme.
+ *
+ * Based on the data fetcher by Rob Kendrick
+ * This fetcher provides a simple scheme for the user to access
+ * information from the browser from a known, fixed URL.
+ */
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "netsurf/inttypes.h"
+
+#include "utils/errors.h"
+#include "utils/nsurl.h"
+#include "utils/corestrings.h"
+#include "utils/utils.h"
+#include "utils/ring.h"
+
+#include "content/fetch.h"
+#include "content/fetchers.h"
+
+#include "private.h"
+#include "about.h"
+#include "blank.h"
+#include "certificate.h"
+#include "config.h"
+#include "chart.h"
+#include "choices.h"
+#include "imagecache.h"
+#include "nscolours.h"
+#include "query.h"
+#include "query_auth.h"
+#include "query_fetcherror.h"
+#include "query_privacy.h"
+#include "query_timeout.h"
+#include "atestament.h"
+
+typedef bool (*fetch_about_handler)(struct fetch_about_context *);
+
+/**
+ * Context for an about fetch
+ */
+struct fetch_about_context {
+	struct fetch_about_context *r_next, *r_prev;
+
+	struct fetch *fetchh; /**< Handle for this fetch */
+
+	bool aborted; /**< Flag indicating fetch has been aborted */
+	bool locked; /**< Flag indicating entry is already entered */
+
+	nsurl *url; /**< The full url the fetch refers to */
+
+	const struct fetch_multipart_data *multipart; /**< post data */
+
+	fetch_about_handler handler;
+};
+
+static struct fetch_about_context *ring = NULL;
+
+/**
+ * handler info for about scheme
+ */
+struct about_handlers {
+	const char *name; /**< name to match in url */
+	int name_len;
+	lwc_string *lname; /**< Interned name */
+	fetch_about_handler handler; /**< handler for the url */
+	bool hidden; /**< If entry should be hidden in listing */
+};
+
+
+
+/**
+ * issue fetch callbacks with locking
+ */
+static bool
+fetch_about_send_callback(const fetch_msg *msg, struct fetch_about_context *ctx)
+{
+	ctx->locked = true;
+	fetch_send_callback(msg, ctx->fetchh);
+	ctx->locked = false;
+
+	return ctx->aborted;
+}
+
+/* exported interface documented in about/private.h */
+bool
+fetch_about_send_finished(struct fetch_about_context *ctx)
+{
+	fetch_msg msg;
+	msg.type = FETCH_FINISHED;
+	return fetch_about_send_callback(&msg, ctx);
+}
+
+/* exported interface documented in about/private.h */
+bool fetch_about_set_http_code(struct fetch_about_context *ctx, long code)
+{
+	fetch_set_http_code(ctx->fetchh, code);
+
+	return ctx->aborted;
+}
+
+/* exported interface documented in about/private.h */
+bool
+fetch_about_send_header(struct fetch_about_context *ctx, const char *fmt, ...)
+{
+	char header[64];
+	fetch_msg msg;
+	va_list ap;
+
+	va_start(ap, fmt);
+
+	vsnprintf(header, sizeof header, fmt, ap);
+
+	va_end(ap);
+
+	msg.type = FETCH_HEADER;
+	msg.data.header_or_data.buf = (const uint8_t *) header;
+	msg.data.header_or_data.len = strlen(header);
+
+	return fetch_about_send_callback(&msg, ctx);
+}
+
+/* exported interface documented in about/private.h */
+nserror
+fetch_about_senddata(struct fetch_about_context *ctx, const uint8_t *data, size_t data_len)
+{
+	fetch_msg msg;
+
+	msg.type = FETCH_DATA;
+	msg.data.header_or_data.buf = data;
+	msg.data.header_or_data.len = data_len;
+
+	if (fetch_about_send_callback(&msg, ctx)) {
+		return NSERROR_INVALID;
+	}
+
+	return NSERROR_OK;
+}
+
+/* exported interface documented in about/private.h */
+nserror
+fetch_about_ssenddataf(struct fetch_about_context *ctx, const char *fmt, ...)
+{
+	char buffer[1024];
+	char *dbuff;
+	fetch_msg msg;
+	va_list ap;
+	int slen;
+
+	va_start(ap, fmt);
+
+	slen = vsnprintf(buffer, sizeof(buffer), fmt, ap);
+
+	va_end(ap);
+
+	if (slen < (int)sizeof(buffer)) {
+		msg.type = FETCH_DATA;
+		msg.data.header_or_data.buf = (const uint8_t *) buffer;
+		msg.data.header_or_data.len = slen;
+
+		if (fetch_about_send_callback(&msg, ctx)) {
+			return NSERROR_INVALID;
+		}
+
+		return NSERROR_OK;
+	}
+
+	dbuff = malloc(slen + 1);
+	if (dbuff == NULL) {
+		return NSERROR_NOSPACE;
+	}
+
+	va_start(ap, fmt);
+
+	slen = vsnprintf(dbuff, slen + 1, fmt, ap);
+
+	va_end(ap);
+
+	msg.type = FETCH_DATA;
+	msg.data.header_or_data.buf = (const uint8_t *)dbuff;
+	msg.data.header_or_data.len = slen;
+
+	if (fetch_about_send_callback(&msg, ctx)) {
+		free(dbuff);
+		return NSERROR_INVALID;
+	}
+
+	free(dbuff);
+	return NSERROR_OK;
+}
+
+
+/* exported interface documented in about/private.h */
+nsurl *fetch_about_get_url(struct fetch_about_context *ctx)
+{
+	return ctx->url;
+}
+
+
+/* exported interface documented in about/private.h */
+const struct fetch_multipart_data *
+fetch_about_get_multipart(struct fetch_about_context *ctx)
+{
+	return ctx->multipart;
+}
+
+
+/* exported interface documented in about/private.h */
+bool fetch_about_srverror(struct fetch_about_context *ctx)
+{
+	nserror res;
+
+	fetch_set_http_code(ctx->fetchh, 500);
+
+	/* content type */
+	if (fetch_about_send_header(ctx, "Content-Type: text/plain"))
+		return false;
+
+	res = fetch_about_ssenddataf(ctx, "Server error 500");
+	if (res != NSERROR_OK) {
+		return false;
+	}
+
+	fetch_about_send_finished(ctx);
+
+	return true;
+}
+
+
+/**
+ * Handler to generate about scheme credits page.
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+static bool fetch_about_credits_handler(struct fetch_about_context *ctx)
+{
+	fetch_msg msg;
+
+	/* content is going to return redirect */
+	fetch_set_http_code(ctx->fetchh, 302);
+
+	msg.type = FETCH_REDIRECT;
+	msg.data.redirect = "resource:credits.html";
+
+	fetch_about_send_callback(&msg, ctx);
+
+	return true;
+}
+
+
+/**
+ * Handler to generate about scheme licence page.
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+static bool fetch_about_licence_handler(struct fetch_about_context *ctx)
+{
+	fetch_msg msg;
+
+	/* content is going to return redirect */
+	fetch_set_http_code(ctx->fetchh, 302);
+
+	msg.type = FETCH_REDIRECT;
+	msg.data.redirect = "resource:licence.html";
+
+	fetch_about_send_callback(&msg, ctx);
+
+	return true;
+}
+
+
+/**
+ * Handler to generate about scheme logo page
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+static bool fetch_about_logo_handler(struct fetch_about_context *ctx)
+{
+	fetch_msg msg;
+
+	/* content is going to return redirect */
+	fetch_set_http_code(ctx->fetchh, 302);
+
+	msg.type = FETCH_REDIRECT;
+	msg.data.redirect = "resource:netsurf.png";
+
+	fetch_about_send_callback(&msg, ctx);
+
+	return true;
+}
+
+
+/**
+ * Handler to generate about scheme welcome page
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+static bool fetch_about_welcome_handler(struct fetch_about_context *ctx)
+{
+	fetch_msg msg;
+
+	/* content is going to return redirect */
+	fetch_set_http_code(ctx->fetchh, 302);
+
+	msg.type = FETCH_REDIRECT;
+	msg.data.redirect = "resource:welcome.html";
+
+	fetch_about_send_callback(&msg, ctx);
+
+	return true;
+}
+
+
+/* Forward declaration because this handler requires the handler table. */
+static bool fetch_about_about_handler(struct fetch_about_context *ctx);
+
+/**
+ * List of about paths and their handlers
+ */
+struct about_handlers about_handler_list[] = {
+	{
+		"credits",
+		SLEN("credits"),
+		NULL,
+		fetch_about_credits_handler,
+		false
+	},
+	{
+		"licence",
+		SLEN("licence"),
+		NULL,
+		fetch_about_licence_handler,
+		false
+	},
+	{
+		"license",
+		SLEN("license"),
+		NULL,
+		fetch_about_licence_handler,
+		true
+	},
+	{
+		"welcome",
+		SLEN("welcome"),
+		NULL,
+		fetch_about_welcome_handler,
+		false
+	},
+	{
+		"config",
+		SLEN("config"),
+		NULL,
+		fetch_about_config_handler,
+		false
+	},
+	{
+		"Choices",
+		SLEN("Choices"),
+		NULL,
+		fetch_about_choices_handler,
+		false
+	},
+	{
+		"testament",
+		SLEN("testament"),
+		NULL,
+		fetch_about_testament_handler,
+		false
+	},
+	{
+		"about",
+		SLEN("about"),
+		NULL,
+		fetch_about_about_handler,
+		true
+	},
+	{
+		"nscolours.css",
+		SLEN("nscolours.css"),
+		NULL,
+		fetch_about_nscolours_handler,
+		true
+	},
+	{
+		"logo",
+		SLEN("logo"),
+		NULL,
+		fetch_about_logo_handler,
+		true
+	},
+	{
+		/* details about the image cache */
+		"imagecache",
+		SLEN("imagecache"),
+		NULL,
+		fetch_about_imagecache_handler,
+		true
+	},
+	{
+		/* The default blank page */
+		"blank",
+		SLEN("blank"),
+		NULL,
+		fetch_about_blank_handler,
+		true
+	},
+	{
+		/* details about a certificate */
+		"certificate",
+		SLEN("certificate"),
+		NULL,
+		fetch_about_certificate_handler,
+		true
+	},
+	{
+		/* chart generator */
+		"chart",
+		SLEN("chart"),
+		NULL,
+		fetch_about_chart_handler,
+		true
+	},
+	{
+		"query/auth",
+		SLEN("query/auth"),
+		NULL,
+		fetch_about_query_auth_handler,
+		true
+	},
+	{
+		"query/ssl",
+		SLEN("query/ssl"),
+		NULL,
+		fetch_about_query_privacy_handler,
+		true
+	},
+	{
+		"query/timeout",
+		SLEN("query/timeout"),
+		NULL,
+		fetch_about_query_timeout_handler,
+		true
+	},
+	{
+		"query/fetcherror",
+		SLEN("query/fetcherror"),
+		NULL,
+		fetch_about_query_fetcherror_handler,
+		true
+	}
+};
+
+#define about_handler_list_len \
+	(sizeof(about_handler_list) / sizeof(struct about_handlers))
+
+/**
+ * List all the valid about: paths available
+ *
+ * \param ctx The fetch context.
+ * \return true for sucess or false to generate an error.
+ */
+static bool fetch_about_about_handler(struct fetch_about_context *ctx)
+{
+	nserror res;
+	unsigned int abt_loop = 0;
+
+	/* content is going to return ok */
+	fetch_set_http_code(ctx->fetchh, 200);
+
+	/* content type */
+	if (fetch_about_send_header(ctx, "Content-Type: text/html"))
+		goto fetch_about_config_handler_aborted;
+
+	res = fetch_about_ssenddataf(ctx,
+			"<html>\n<head>\n"
+			"<title>List of NetSurf pages</title>\n"
+			"<link rel=\"stylesheet\" type=\"text/css\" "
+			"href=\"resource:internal.css\">\n"
+			"</head>\n"
+			"<body class=\"ns-even-bg ns-even-fg ns-border\">\n"
+			"<h1 class =\"ns-border\">List of NetSurf pages</h1>\n"
+			"<ul>\n");
+	if (res != NSERROR_OK) {
+		goto fetch_about_config_handler_aborted;
+	}
+
+	for (abt_loop = 0; abt_loop < about_handler_list_len; abt_loop++) {
+
+		/* Skip over hidden entries */
+		if (about_handler_list[abt_loop].hidden)
+			continue;
+
+		res = fetch_about_ssenddataf(ctx,
+			       "<li><a href=\"about:%s\">about:%s</a></li>\n",
+			       about_handler_list[abt_loop].name,
+			       about_handler_list[abt_loop].name);
+		if (res != NSERROR_OK) {
+			goto fetch_about_config_handler_aborted;
+		}
+	}
+
+	res = fetch_about_ssenddataf(ctx, "</ul>\n</body>\n</html>\n");
+	if (res != NSERROR_OK) {
+		goto fetch_about_config_handler_aborted;
+	}
+
+	fetch_about_send_finished(ctx);
+
+	return true;
+
+fetch_about_config_handler_aborted:
+	return false;
+}
+
+static bool
+fetch_about_404_handler(struct fetch_about_context *ctx)
+{
+	nserror res;
+
+	/* content is going to return 404 */
+	fetch_set_http_code(ctx->fetchh, 404);
+
+	/* content type */
+	if (fetch_about_send_header(ctx, "Content-Type: text/plain; charset=utf-8")) {
+		return false;
+	}
+
+	res = fetch_about_ssenddataf(ctx, "Unknown page: %s", nsurl_access(ctx->url));
+	if (res != NSERROR_OK) {
+		return false;
+	}
+
+	fetch_about_send_finished(ctx);
+
+	return true;
+}
+
+/**
+ * callback to initialise the about scheme fetcher.
+ */
+static bool fetch_about_initialise(lwc_string *scheme)
+{
+	unsigned int abt_loop = 0;
+	lwc_error error;
+
+	for (abt_loop = 0; abt_loop < about_handler_list_len; abt_loop++) {
+		error = lwc_intern_string(about_handler_list[abt_loop].name,
+					about_handler_list[abt_loop].name_len,
+					&about_handler_list[abt_loop].lname);
+		if (error != lwc_error_ok) {
+			while (abt_loop-- != 0) {
+				lwc_string_unref(about_handler_list[abt_loop].lname);
+			}
+			return false;
+		}
+	}
+
+	return true;
+}
+
+
+/**
+ * callback to finalise the about scheme fetcher.
+ */
+static void fetch_about_finalise(lwc_string *scheme)
+{
+	unsigned int abt_loop = 0;
+	for (abt_loop = 0; abt_loop < about_handler_list_len; abt_loop++) {
+		lwc_string_unref(about_handler_list[abt_loop].lname);
+	}
+}
+
+
+static bool fetch_about_can_fetch(const nsurl *url)
+{
+	return true;
+}
+
+
+/**
+ * callback to set up a about scheme fetch.
+ *
+ * \param post_urlenc post data in urlenc format, owned by the llcache object
+ *                        hence valid the entire lifetime of the fetch.
+ * \param post_multipart post data in multipart format, owned by the llcache
+ *                        object hence valid the entire lifetime of the fetch.
+ */
+static void *
+fetch_about_setup(struct fetch *fetchh,
+		  nsurl *url,
+		  bool only_2xx,
+		  bool downgrade_tls,
+		  const char *post_urlenc,
+		  const struct fetch_multipart_data *post_multipart,
+		  const char **headers)
+{
+	struct fetch_about_context *ctx;
+	unsigned int handler_loop;
+	lwc_string *path;
+	bool match;
+
+	ctx = calloc(1, sizeof(*ctx));
+	if (ctx == NULL)
+		return NULL;
+
+	path = nsurl_get_component(url, NSURL_PATH);
+
+	for (handler_loop = 0;
+	     handler_loop < about_handler_list_len;
+	     handler_loop++) {
+		if (lwc_string_isequal(path,
+				       about_handler_list[handler_loop].lname,
+				       &match) == lwc_error_ok && match) {
+			ctx->handler = about_handler_list[handler_loop].handler;
+			break;
+		}
+	}
+
+	if (path != NULL)
+		lwc_string_unref(path);
+
+	ctx->fetchh = fetchh;
+	ctx->url = nsurl_ref(url);
+	ctx->multipart = post_multipart;
+
+	RING_INSERT(ring, ctx);
+
+	return ctx;
+}
+
+
+/**
+ * callback to free a about scheme fetch
+ */
+static void fetch_about_free(void *ctx)
+{
+	struct fetch_about_context *c = ctx;
+	nsurl_unref(c->url);
+	free(ctx);
+}
+
+
+/**
+ * callback to start an about scheme fetch
+ */
+static bool fetch_about_start(void *ctx)
+{
+	return true;
+}
+
+
+/**
+ * callback to abort a about fetch
+ */
+static void fetch_about_abort(void *ctx)
+{
+	struct fetch_about_context *c = ctx;
+
+	/* To avoid the poll loop having to deal with the fetch context
+	 * disappearing from under it, we simply flag the abort here.
+	 * The poll loop itself will perform the appropriate cleanup.
+	 */
+	c->aborted = true;
+}
+
+
+/**
+ * callback to poll for additional about fetch contents
+ */
+static void fetch_about_poll(lwc_string *scheme)
+{
+	struct fetch_about_context *c, *save_ring = NULL;
+
+	/* Iterate over ring, processing each pending fetch */
+	while (ring != NULL) {
+		/* Take the first entry from the ring */
+		c = ring;
+		RING_REMOVE(ring, c);
+
+		/* Ignore fetches that have been flagged as locked.
+		 * This allows safe re-entrant calls to this function.
+		 * Re-entrancy can occur if, as a result of a callback,
+		 * the interested party causes fetch_poll() to be called
+		 * again.
+		 */
+		if (c->locked == true) {
+			RING_INSERT(save_ring, c);
+			continue;
+		}
+
+		/* Only process non-aborted fetches */
+		if (c->aborted == false) {
+			/* about fetches can be processed in one go */
+			if (c->handler == NULL) {
+				fetch_about_404_handler(c);
+			} else {
+				c->handler(c);
+			}
+		}
+
+		/* And now finish */
+		fetch_remove_from_queues(c->fetchh);
+		fetch_free(c->fetchh);
+	}
+
+	/* Finally, if we saved any fetches which were locked, put them back
+	 * into the ring for next time
+	 */
+	ring = save_ring;
+}
+
+
+nserror fetch_about_register(void)
+{
+	lwc_string *scheme = lwc_string_ref(corestring_lwc_about);
+	const struct fetcher_operation_table fetcher_ops = {
+		.initialise = fetch_about_initialise,
+		.acceptable = fetch_about_can_fetch,
+		.setup = fetch_about_setup,
+		.start = fetch_about_start,
+		.abort = fetch_about_abort,
+		.free = fetch_about_free,
+		.poll = fetch_about_poll,
+		.finalise = fetch_about_finalise
+	};
+
+	return fetcher_add(scheme, &fetcher_ops);
+}
diff --git a/content/fetchers/about.h b/content/fetchers/about/about.h
index 944f84a59..bf6379709 100644
--- a/content/fetchers/about.h
+++ b/content/fetchers/about/about.h
@@ -16,12 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * about: URL method handler
+/**
+ * \file
+ * about scheme URL method handler
  */
 
-#ifndef NETSURF_CONTENT_FETCHERS_FETCH_ABOUT_H
-#define NETSURF_CONTENT_FETCHERS_FETCH_ABOUT_H
+#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_ABOUT_H
+#define NETSURF_CONTENT_FETCHERS_ABOUT_ABOUT_H
 
 /**
  * Register about scheme handler.
diff --git a/content/fetchers/about/atestament.h b/content/fetchers/about/atestament.h
new file mode 100644
index 000000000..1851e8f3c
--- /dev/null
+++ b/content/fetchers/about/atestament.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * about scheme testament handler interface
+ */
+
+#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_TESTAMENT_H
+#define NETSURF_CONTENT_FETCHERS_ABOUT_TESTAMENT_H
+
+/**
+ * Handler to generate about scheme testament page.
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_testament_handler(struct fetch_about_context *ctx);
+
+#endif
diff --git a/content/fetchers/about/blank.c b/content/fetchers/about/blank.c
new file mode 100644
index 000000000..8ad774512
--- /dev/null
+++ b/content/fetchers/about/blank.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * content generator for the about scheme blank page
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "netsurf/types.h"
+#include "utils/errors.h"
+
+#include "private.h"
+#include "blank.h"
+
+/**
+ * Handler to generate about scheme cache page.
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_blank_handler(struct fetch_about_context *ctx)
+{
+	const char buffer[2] = { ' ', '\0' };
+
+	/* content is going to return ok */
+	fetch_about_set_http_code(ctx, 200);
+
+	/* content type */
+	if (fetch_about_send_header(ctx, "Content-Type: text/html"))
+		goto fetch_about_blank_handler_aborted;
+
+	if (fetch_about_senddata(ctx, (const uint8_t *) buffer, strlen(buffer)) != NSERROR_OK)
+		goto fetch_about_blank_handler_aborted;
+
+	fetch_about_send_finished(ctx);
+
+	return true;
+
+fetch_about_blank_handler_aborted:
+	return false;
+}
diff --git a/content/fetchers/about/blank.h b/content/fetchers/about/blank.h
new file mode 100644
index 000000000..09dcc1f6a
--- /dev/null
+++ b/content/fetchers/about/blank.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * about scheme blank handler interface
+ */
+
+#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_BLANK_H
+#define NETSURF_CONTENT_FETCHERS_ABOUT_BLANK_H
+
+/**
+ * Handler to generate about scheme blank page.
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_blank_handler(struct fetch_about_context *ctx);
+
+#endif
diff --git a/content/fetchers/about/certificate.c b/content/fetchers/about/certificate.c
new file mode 100644
index 000000000..6f634d22a
--- /dev/null
+++ b/content/fetchers/about/certificate.c
@@ -0,0 +1,1291 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * content generator for the about scheme certificate page
+ */
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "utils/errors.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "netsurf/inttypes.h"
+#include "netsurf/ssl_certs.h"
+
+#include "private.h"
+#include "certificate.h"
+
+/**
+ * certificate name parameters
+ */
+struct ns_cert_name {
+	char *common_name;
+	char *organisation;
+	char *organisation_unit;
+	char *locality;
+	char *province;
+	char *country;
+};
+
+/**
+ * Certificate public key parameters
+ */
+struct ns_cert_pkey {
+	char *algor;
+	int size;
+	char *modulus;
+	char *exponent;
+	char *curve;
+	char *public;
+};
+
+/**
+ * Certificate subject alternative name
+ */
+struct ns_cert_san {
+	struct ns_cert_san *next;
+	char *name;
+};
+
+/**
+ * certificate information for certificate chain
+ */
+struct ns_cert_info {
+	struct ns_cert_name subject_name; /**< Subject details */
+	struct ns_cert_name issuer_name; /**< Issuer details */
+	struct ns_cert_pkey public_key; /**< public key details */
+	long version;		/**< Certificate version */
+	char *not_before;	/**< Valid from date */
+	char *not_after;	/**< Valid to date */
+	int sig_type;		/**< Signature type */
+	char *sig_algor;        /**< Signature Algorithm */
+	char *serialnum;	/**< Serial number */
+	char *sha1fingerprint; /**< fingerprint shar1 encoded */
+	char *sha256fingerprint; /**< fingerprint shar256 encoded */
+	struct ns_cert_san *san; /**< subject alternative names */
+	ssl_cert_err err;       /**< Whatever is wrong with this certificate */
+};
+
+/**
+ * free all resources associated with a certificate information structure
+ */
+static nserror free_ns_cert_info(struct ns_cert_info *cinfo)
+{
+	struct ns_cert_san *san;
+
+	free(cinfo->subject_name.common_name);
+	free(cinfo->subject_name.organisation);
+	free(cinfo->subject_name.organisation_unit);
+	free(cinfo->subject_name.locality);
+	free(cinfo->subject_name.province);
+	free(cinfo->subject_name.country);
+	free(cinfo->issuer_name.common_name);
+	free(cinfo->issuer_name.organisation);
+	free(cinfo->issuer_name.organisation_unit);
+	free(cinfo->issuer_name.locality);
+	free(cinfo->issuer_name.province);
+	free(cinfo->issuer_name.country);
+	free(cinfo->public_key.algor);
+	free(cinfo->public_key.modulus);
+	free(cinfo->public_key.exponent);
+	free(cinfo->public_key.curve);
+	free(cinfo->public_key.public);
+	free(cinfo->not_before);
+	free(cinfo->not_after);
+	free(cinfo->sig_algor);
+	free(cinfo->serialnum);
+
+	/* free san list avoiding use after free */
+	san = cinfo->san;
+	while (san != NULL) {
+		struct ns_cert_san *next;
+		next = san->next;
+		free(san);
+		san = next;
+	}
+
+	free(cinfo);
+
+	return NSERROR_OK;
+}
+
+#ifdef WITH_OPENSSL
+
+#include <openssl/ssl.h>
+#include <openssl/x509v3.h>
+
+#if (OPENSSL_VERSION_NUMBER < 0x30000000L)
+/* OpenSSL 1.1.1 or LibreSSL */
+
+# if defined(LIBRESSL_VERSION_NUMBER)
+  /* LibreSSL */
+#  if (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
+   /* LibreSSL <3.5.0 */
+
+#   if (LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+    /* LibreSSL <2.7.0 */
+static int ns_X509_get_signature_nid(X509 *cert)
+{
+	return OBJ_obj2nid(cert->cert_info->key->algor->algorithm);
+}
+
+static const unsigned char *ns_ASN1_STRING_get0_data(ASN1_STRING *asn1str)
+{
+	return (const unsigned char *)ASN1_STRING_data(asn1str);
+}
+#   else
+#    define ns_X509_get_signature_nid X509_get_signature_nid
+#    define ns_ASN1_STRING_get0_data ASN1_STRING_get0_data
+#   endif
+
+static const BIGNUM *ns_RSA_get0_n(const RSA *d)
+{
+	return d->n;
+}
+
+static const BIGNUM *ns_RSA_get0_e(const RSA *d)
+{
+	return d->e;
+}
+#  else
+   /* LibreSSL >= 3.5.0 */
+#   define ns_X509_get_signature_nid X509_get_signature_nid
+#   define ns_ASN1_STRING_get0_data ASN1_STRING_get0_data
+#   define ns_RSA_get0_n RSA_get0_n
+#   define ns_RSA_get0_e RSA_get0_e
+#  endif
+# else
+  /* OpenSSL 1.1.1 */
+#  define ns_X509_get_signature_nid X509_get_signature_nid
+#  define ns_ASN1_STRING_get0_data ASN1_STRING_get0_data
+#  define ns_RSA_get0_n RSA_get0_n
+#  define ns_RSA_get0_e RSA_get0_e
+# endif
+
+static int ns_EVP_PKEY_get_bn_param(const EVP_PKEY *pkey,
+		const char *key_name, BIGNUM **bn) {
+	RSA *rsa;
+	BIGNUM *result = NULL;
+
+	/* Check parameters: only support allocation-form *bn */
+	if (pkey == NULL || key_name == NULL || bn == NULL || *bn != NULL)
+		return 0;
+
+	/* Only support RSA keys */
+	if (EVP_PKEY_base_id(pkey) != EVP_PKEY_RSA)
+		return 0;
+
+	rsa = EVP_PKEY_get1_RSA((EVP_PKEY *) pkey);
+	if (rsa == NULL)
+		return 0;
+
+	if (strcmp(key_name, "n") == 0) {
+		const BIGNUM *n = ns_RSA_get0_n(rsa);
+		if (n != NULL)
+			result = BN_dup(n);
+	} else if (strcmp(key_name, "e") == 0) {
+		const BIGNUM *e = ns_RSA_get0_e(rsa);
+		if (e != NULL)
+			result = BN_dup(e);
+	}
+
+	RSA_free(rsa);
+
+	*bn = result;
+
+	return (result != NULL) ? 1 : 0;
+}
+
+static int ns_EVP_PKEY_get_utf8_string_param(const EVP_PKEY *pkey,
+		const char *key_name, char *str, size_t max_len,
+		size_t *out_len)
+{
+	const EC_GROUP *ecgroup;
+	const char *group;
+	EC_KEY *ec;
+	int ret = 0;
+
+	if (pkey == NULL || key_name == NULL)
+		return 0;
+
+	/* Only support EC keys */
+	if (EVP_PKEY_base_id(pkey) != EVP_PKEY_EC)
+		return 0;
+
+	/* Only support fetching the group */
+	if (strcmp(key_name, "group") != 0)
+		return 0;
+
+	ec = EVP_PKEY_get1_EC_KEY((EVP_PKEY *) pkey);
+
+	ecgroup = EC_KEY_get0_group(ec);
+	if (ecgroup == NULL) {
+		group = "";
+	} else {
+		group = OBJ_nid2ln(EC_GROUP_get_curve_name(ecgroup));
+	}
+
+	if (str != NULL && max_len > strlen(group)) {
+		strcpy(str, group);
+		str[strlen(group)] = '\0';
+		ret = 1;
+	}
+	if (out_len != NULL)
+		*out_len = strlen(group);
+
+	EC_KEY_free(ec);
+
+	return ret;
+}
+
+static int ns_EVP_PKEY_get_octet_string_param(const EVP_PKEY *pkey,
+		const char *key_name, unsigned char *buf, size_t max_len,
+		size_t *out_len)
+{
+	const EC_GROUP *ecgroup;
+	const EC_POINT *ecpoint;
+	size_t len;
+	BN_CTX *bnctx;
+	EC_KEY *ec;
+	int ret = 0;
+
+	if (pkey == NULL || key_name == NULL)
+		return 0;
+
+	/* Only support EC keys */
+	if (EVP_PKEY_base_id(pkey) != EVP_PKEY_EC)
+		return 0;
+
+	if (strcmp(key_name, "encoded-pub-key") != 0)
+		return 0;
+
+	ec = EVP_PKEY_get1_EC_KEY((EVP_PKEY *) pkey);
+	if (ec == NULL)
+		return 0;
+
+	ecgroup = EC_KEY_get0_group(ec);
+	if (ecgroup != NULL) {
+		ecpoint = EC_KEY_get0_public_key(ec);
+		if (ecpoint != NULL) {
+			bnctx = BN_CTX_new();
+			len = EC_POINT_point2oct(ecgroup,
+						 ecpoint,
+						 POINT_CONVERSION_UNCOMPRESSED,
+						 NULL,
+						 0,
+						 bnctx);
+			if (len != 0 && len <= max_len) {
+				if (EC_POINT_point2oct(ecgroup,
+						       ecpoint,
+						       POINT_CONVERSION_UNCOMPRESSED,
+						       buf,
+						       len,
+						       bnctx) == len)
+					ret = 1;
+			}
+			if (out_len != NULL)
+				*out_len = len;
+			BN_CTX_free(bnctx);
+		}
+	}
+
+	EC_KEY_free(ec);
+
+	return ret;
+}
+#else
+/* OpenSSL 3.x and later */
+#define ns_X509_get_signature_nid X509_get_signature_nid
+#define ns_ASN1_STRING_get0_data ASN1_STRING_get0_data
+#define ns_RSA_get0_n RSA_get0_n
+#define ns_RSA_get0_e RSA_get0_e
+#define ns_EVP_PKEY_get_bn_param EVP_PKEY_get_bn_param
+#define ns_EVP_PKEY_get_octet_string_param EVP_PKEY_get_octet_string_param
+#define ns_EVP_PKEY_get_utf8_string_param EVP_PKEY_get_utf8_string_param
+#endif
+
+/**
+ * extract certificate name information
+ *
+ * \param xname The X509 name to convert. The reference is borrowed so is not freeed
+ * \param iname The info structure to recive the extracted parameters.
+ * \return NSERROR_OK on success else error code
+ */
+static nserror
+xname_to_info(X509_NAME *xname, struct ns_cert_name *iname)
+{
+	int entryidx;
+	int entrycnt;
+	X509_NAME_ENTRY *entry; /* current name entry */
+	ASN1_STRING *value;
+	const unsigned char *value_str;
+	ASN1_OBJECT *name;
+	int name_nid;
+	char **field;
+
+	entrycnt = X509_NAME_entry_count(xname);
+
+	for (entryidx = 0; entryidx < entrycnt; entryidx++) {
+		entry = X509_NAME_get_entry(xname, entryidx);
+		name = X509_NAME_ENTRY_get_object(entry);
+		name_nid = OBJ_obj2nid(name);
+		value = X509_NAME_ENTRY_get_data(entry);
+		value_str = ns_ASN1_STRING_get0_data(value);
+		switch (name_nid) {
+		case NID_commonName:
+			field = &iname->common_name;
+			break;
+		case NID_countryName:
+			field = &iname->country;
+			break;
+		case NID_localityName:
+			field = &iname->locality;
+			break;
+		case NID_stateOrProvinceName:
+			field = &iname->province;
+			break;
+		case NID_organizationName:
+			field = &iname->organisation;
+			break;
+		case NID_organizationalUnitName:
+			field = &iname->organisation_unit;
+			break;
+		default :
+			field = NULL;
+			break;
+		}
+		if (field != NULL) {
+			*field = strdup((const char *)value_str);
+			NSLOG(netsurf, DEEPDEBUG,
+			      "NID:%d value: %s", name_nid, *field);
+		} else {
+			NSLOG(netsurf, DEEPDEBUG, "NID:%d", name_nid);
+		}
+	}
+
+	/*
+	 * ensure the common name is set to something, this being
+	 *  missing means the certificate is broken but this should be
+	 *  robust in the face of bad data
+	 */
+	if (iname->common_name == NULL) {
+		iname->common_name = strdup("Unknown");
+	}
+
+	return NSERROR_OK;
+}
+
+
+/**
+ * duplicate a hex formatted string inserting the colons
+ *
+ * \todo only uses html entity as separator because netsurfs line breaking
+ *       fails otherwise.
+ */
+static char *hexdup(const char *hex)
+{
+	int hexlen;
+	char *dst;
+	char *out;
+	int cn = 0;
+
+	hexlen = strlen(hex);
+	/* allow space fox XXYY to XX&#58;YY&#58; */
+	dst = malloc(((hexlen * 7) + 6) / 2);
+
+	if (dst != NULL) {
+		for (out = dst; *hex != 0; hex++) {
+			if (cn == 2) {
+				cn = 0;
+				*out++ = '&';
+				*out++ = '#';
+				*out++ = '5';
+				*out++ = '8';
+				*out++ = ';';
+			}
+			*out++ = *hex;
+			cn++;
+		}
+		*out = 0;
+	}
+	return dst;
+}
+
+
+/**
+ * create a hex formatted string inserting the colons from binary data
+ *
+ * \todo only uses html entity as separator because netsurfs line breaking
+ *       fails otherwise.
+ */
+static char *bindup(unsigned char *bin, unsigned int binlen)
+{
+	char *dst;
+	char *out;
+	unsigned int idx;
+	const char hex[] = { '0', '1', '2', '3', '4', '5', '6', '7',
+			     '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+
+	/* allow space fox XY to expand to XX&#58;YY&#58; */
+	dst = malloc(binlen * 7);
+
+	if (dst != NULL) {
+		out = dst;
+		for (idx = 0; idx < binlen; idx++) {
+			*out++ = hex[(bin[idx] & 0xf0) >> 4];
+			*out++ = hex[bin[idx] & 0xf];
+
+			*out++ = '&';
+			*out++ = '#';
+			*out++ = '5';
+			*out++ = '8';
+			*out++ = ';';
+		}
+		out -= 5;
+		*out = 0;
+	}
+	return dst;
+}
+
+
+/**
+ * extract RSA key information to info structure
+ *
+ * \param pkey The RSA key to examine.
+ * \param ikey The public key info structure to fill
+ * \rerun NSERROR_OK on success else error code.
+ */
+static nserror
+rsa_to_info(EVP_PKEY *pkey, struct ns_cert_pkey *ikey)
+{
+	BIGNUM *n = NULL, *e = NULL;
+	char *tmp;
+
+	if (ns_EVP_PKEY_get_bn_param(pkey, "n", &n) != 1) {
+		return NSERROR_BAD_PARAMETER;
+	}
+
+	if (ns_EVP_PKEY_get_bn_param(pkey, "e", &e) != 1) {
+		BN_free(n);
+		return NSERROR_BAD_PARAMETER;
+	}
+
+	ikey->algor = strdup("RSA");
+
+	ikey->size = EVP_PKEY_bits(pkey);
+
+	tmp = BN_bn2hex(n);
+	if (tmp != NULL) {
+		ikey->modulus = hexdup(tmp);
+		OPENSSL_free(tmp);
+	}
+
+	tmp = BN_bn2dec(e);
+	if (tmp != NULL) {
+		ikey->exponent = strdup(tmp);
+		OPENSSL_free(tmp);
+	}
+
+	BN_free(e);
+	BN_free(n);
+
+	return NSERROR_OK;
+}
+
+
+/**
+ * extract DSA key information to info structure
+ *
+ * \param pkey The DSA key to examine.
+ * \param ikey The public key info structure to fill
+ * \rerun NSERROR_OK on success else error code.
+ */
+static nserror
+dsa_to_info(EVP_PKEY *pkey, struct ns_cert_pkey *ikey)
+{
+	ikey->algor = strdup("DSA");
+
+	ikey->size = EVP_PKEY_bits(pkey);
+
+	return NSERROR_OK;
+}
+
+
+/**
+ * extract DH key information to info structure
+ *
+ * \param pkey The DH key to examine.
+ * \param ikey The public key info structure to fill
+ * \rerun NSERROR_OK on success else error code.
+ */
+static nserror
+dh_to_info(EVP_PKEY *pkey, struct ns_cert_pkey *ikey)
+{
+	ikey->algor = strdup("Diffie Hellman");
+
+	ikey->size = EVP_PKEY_bits(pkey);
+
+	return NSERROR_OK;
+}
+
+
+/**
+ * extract EC key information to info structure
+ *
+ * \param pkey The EC key to examine.
+ * \param ikey The public key info structure to fill
+ * \rerun NSERROR_OK on success else error code.
+ */
+static nserror
+ec_to_info(EVP_PKEY *pkey, struct ns_cert_pkey *ikey)
+{
+	size_t len;
+
+	ikey->algor = strdup("Elliptic Curve");
+
+	ikey->size = EVP_PKEY_bits(pkey);
+
+	len = 0;
+	ns_EVP_PKEY_get_utf8_string_param(pkey, "group", NULL, 0, &len);
+	if (len != 0) {
+		ikey->curve = malloc(len + 1);
+		if (ikey->curve != NULL) {
+			if (ns_EVP_PKEY_get_utf8_string_param(pkey, "group",
+					ikey->curve, len + 1, NULL) == 0) {
+				free(ikey->curve);
+				ikey->curve = NULL;
+			}
+		}
+	}
+
+	len = 0;
+	ns_EVP_PKEY_get_octet_string_param(pkey, "encoded-pub-key",
+			NULL, 0, &len);
+	if (len != 0) {
+		unsigned char *point = malloc(len);
+		if (point != NULL) {
+			if (ns_EVP_PKEY_get_octet_string_param(pkey,
+					"encoded-pub-key", point, len,
+					NULL) == 1) {
+				ikey->public = bindup(point, len);
+			}
+			free(point);
+		}
+	}
+
+	return NSERROR_OK;
+}
+
+/**
+ * extract public key information to info structure
+ *
+ * \param pkey the public key to examine. The reference is dropped on return
+ * \param ikey The public key info structure to fill
+ * \rerun NSERROR_OK on success else error code.
+ */
+static nserror
+pkey_to_info(EVP_PKEY *pkey, struct ns_cert_pkey *ikey)
+{
+	nserror res;
+
+	if (pkey == NULL) {
+		return NSERROR_BAD_PARAMETER;
+	}
+
+	switch (EVP_PKEY_base_id(pkey)) {
+	case EVP_PKEY_RSA:
+		res = rsa_to_info(pkey, ikey);
+		break;
+
+	case EVP_PKEY_DSA:
+		res = dsa_to_info(pkey, ikey);
+		break;
+
+	case EVP_PKEY_DH:
+		res = dh_to_info(pkey, ikey);
+		break;
+
+	case EVP_PKEY_EC:
+		res = ec_to_info(pkey, ikey);
+		break;
+
+	default:
+		res = NSERROR_NOT_IMPLEMENTED;
+		break;
+	}
+
+	EVP_PKEY_free(pkey);
+
+	return res;
+}
+
+static nserror san_to_info(X509 *cert, struct ns_cert_san **prev_next)
+{
+	int idx;
+	int san_names_nb = -1;
+	const GENERAL_NAME *current_name;
+	const unsigned char *dns_name;
+	struct ns_cert_san *isan;
+
+	STACK_OF(GENERAL_NAME) *san_names = NULL;
+
+	san_names = X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL);
+	if (san_names == NULL) {
+		return NSERROR_OK;
+	}
+
+	san_names_nb = sk_GENERAL_NAME_num(san_names);
+
+	/* Check each name within the extension */
+	for (idx = 0; idx < san_names_nb; idx++) {
+		current_name = sk_GENERAL_NAME_value(san_names, idx);
+
+		if (current_name->type == GEN_DNS) {
+			/* extract DNS name into info structure */
+			dns_name = ns_ASN1_STRING_get0_data(current_name->d.dNSName);
+
+			isan = malloc(sizeof(struct ns_cert_san));
+			if (isan != NULL) {
+				isan->name = strdup((const char *)dns_name);
+				isan->next = NULL;
+				*prev_next = isan;
+				prev_next = &isan->next;
+			}
+		}
+	}
+
+	/* AmiSSL can't cope with the "correct" mechanism of freeing
+	 * the GENERAL_NAME stack, which is:
+	 * sk_GENERAL_NAME_pop_free(san_names, GENERAL_NAME_free);
+	 * So instead we do this open-coded loop which does the same:
+	 */
+	for (idx = 0; idx < san_names_nb; idx++) {
+		GENERAL_NAME *entry = sk_GENERAL_NAME_pop(san_names);
+		GENERAL_NAME_free(entry);
+	}
+	sk_GENERAL_NAME_free(san_names);
+
+	return NSERROR_OK;
+}
+
+static nserror
+der_to_certinfo(const uint8_t *der,
+		size_t der_length,
+		struct ns_cert_info *info)
+{
+	BIO *mem;
+	BUF_MEM *buf;
+	const ASN1_INTEGER *asn1_num;
+	BIGNUM *bignum;
+	X509 *cert;		/**< Pointer to certificate */
+
+	if (der == NULL) {
+		return NSERROR_OK;
+	}
+
+	cert = d2i_X509(NULL, &der, der_length);
+	if (cert == NULL) {
+		return NSERROR_INVALID;
+	}
+
+	/*
+	 * get certificate version
+	 *
+	 * \note this is defined by standards (X.509 et al) to be one
+	 *        less than the certificate version.
+	 */
+	info->version = X509_get_version(cert) + 1;
+
+	/* not before date */
+	mem = BIO_new(BIO_s_mem());
+	ASN1_TIME_print(mem, X509_get_notBefore(cert));
+	BIO_get_mem_ptr(mem, &buf);
+	(void) BIO_set_close(mem, BIO_NOCLOSE);
+	BIO_free(mem);
+	info->not_before = calloc(1, buf->length + 1);
+	if (info->not_before != NULL) {
+		memcpy(info->not_before, buf->data, (unsigned)buf->length);
+	}
+	BUF_MEM_free(buf);
+
+	/* not after date */
+	mem = BIO_new(BIO_s_mem());
+	ASN1_TIME_print(mem,
+			X509_get_notAfter(cert));
+	BIO_get_mem_ptr(mem, &buf);
+	(void) BIO_set_close(mem, BIO_NOCLOSE);
+	BIO_free(mem);
+	info->not_after = calloc(1, buf->length + 1);
+	if (info->not_after != NULL) {
+		memcpy(info->not_after, buf->data, (unsigned)buf->length);
+	}
+	BUF_MEM_free(buf);
+
+	/* signature type */
+	info->sig_type = X509_get_signature_type(cert);
+
+	/* signature algorithm */
+	int pkey_nid = ns_X509_get_signature_nid(cert);
+	if (pkey_nid != NID_undef) {
+		const char* sslbuf = OBJ_nid2ln(pkey_nid);
+		if (sslbuf != NULL) {
+			info->sig_algor = strdup(sslbuf);
+		}
+	}
+
+	/* serial number */
+	asn1_num = X509_get_serialNumber(cert);
+	if (asn1_num != NULL) {
+		bignum = ASN1_INTEGER_to_BN(asn1_num, NULL);
+		if (bignum != NULL) {
+			char *tmp = BN_bn2hex(bignum);
+			if (tmp != NULL) {
+				info->serialnum = hexdup(tmp);
+				OPENSSL_free(tmp);
+			}
+			BN_free(bignum);
+			bignum = NULL;
+		}
+	}
+
+	/* fingerprints */
+	const EVP_MD *digest;
+	unsigned int dig_len;
+	unsigned char *buff;
+	int rc;
+
+	digest = EVP_sha1();
+	buff = malloc(EVP_MD_size(digest));
+	if (buff != NULL) {
+		rc = X509_digest(cert, digest, buff, &dig_len);
+		if ((rc == 1) && (dig_len == (unsigned int)EVP_MD_size(digest))) {
+			info->sha1fingerprint = bindup(buff, dig_len);
+		}
+		free(buff);
+	}
+
+	digest = EVP_sha256();
+	buff = malloc(EVP_MD_size(digest));
+	if (buff != NULL) {
+		rc = X509_digest(cert, digest, buff, &dig_len);
+		if ((rc == 1) && (dig_len == (unsigned int)EVP_MD_size(digest))) {
+			info->sha256fingerprint = bindup(buff, dig_len);
+		}
+		free(buff);
+	}
+
+	/* subject alternative names */
+	san_to_info(cert, &info->san);
+
+	/* issuer name */
+	xname_to_info(X509_get_issuer_name(cert), &info->issuer_name);
+
+	/* subject */
+	xname_to_info(X509_get_subject_name(cert), &info->subject_name);
+
+	/* public key */
+	pkey_to_info(X509_get_pubkey(cert), &info->public_key);
+
+	X509_free(cert);
+
+	return NSERROR_OK;
+}
+
+/* copy certificate data */
+static nserror
+convert_chain_to_cert_info(const struct cert_chain *chain,
+			   struct ns_cert_info **cert_info_out)
+{
+	struct ns_cert_info *certs;
+	size_t depth;
+	nserror res;
+
+	certs = calloc(chain->depth, sizeof(struct ns_cert_info));
+	if (certs == NULL) {
+		return NSERROR_NOMEM;
+	}
+
+	for (depth = 0; depth < chain->depth;depth++) {
+		res = der_to_certinfo(chain->certs[depth].der,
+				      chain->certs[depth].der_length,
+				      certs + depth);
+		if (res != NSERROR_OK) {
+			free(certs);
+			return res;
+		}
+		certs[depth].err = chain->certs[depth].err;
+	}
+
+	*cert_info_out = certs;
+	return NSERROR_OK;
+}
+
+#else
+static nserror
+convert_chain_to_cert_info(const struct cert_chain *chain,
+			   struct ns_cert_info **cert_info_out)
+{
+	return NSERROR_NOT_IMPLEMENTED;
+}
+#endif
+
+
+static nserror
+format_certificate_name(struct fetch_about_context *ctx,
+			struct ns_cert_name *cert_name)
+{
+	nserror res;
+	res = fetch_about_ssenddataf(ctx,
+			 "<tr><th>Common Name</th><td>%s</td></tr>\n",
+			 cert_name->common_name);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	if (cert_name->organisation != NULL) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<tr><th>Organisation</th><td>%s</td></tr>\n",
+				 cert_name->organisation);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	if (cert_name->organisation_unit != NULL) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<tr><th>Organisation Unit</th><td>%s</td></tr>\n",
+				 cert_name->organisation_unit);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	if (cert_name->locality != NULL) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<tr><th>Locality</th><td>%s</td></tr>\n",
+				 cert_name->locality);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	if (cert_name->province != NULL) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<tr><th>Privince</th><td>%s</td></tr>\n",
+				 cert_name->province);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	if (cert_name->country != NULL) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<tr><th>Country</th><td>%s</td></tr>\n",
+				 cert_name->country);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	return res;
+}
+
+/**
+ * output formatted certificate subject alternate names
+ */
+static nserror
+format_certificate_san(struct fetch_about_context *ctx,
+			      struct ns_cert_san *san)
+{
+	nserror res;
+
+	if (san == NULL) {
+		return NSERROR_OK;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<table class=\"info\">\n"
+			 "<tr><th>Alternative Names</th><td><hr></td></tr>\n");
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	while (san != NULL) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<tr><th>DNS Name</th><td>%s</td></tr>\n",
+				 san->name);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+
+		san = san->next;
+	}
+
+	res = fetch_about_ssenddataf(ctx, "</table>\n");
+
+	return res;
+
+}
+
+
+static nserror
+format_certificate_public_key(struct fetch_about_context *ctx,
+			      struct ns_cert_pkey *public_key)
+{
+	nserror res;
+
+	if (public_key->algor == NULL) {
+		/* skip the table if no algorithm name */
+		return NSERROR_OK;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<table class=\"info\">\n"
+			 "<tr><th>Public Key</th><td><hr></td></tr>\n"
+			 "<tr><th>Algorithm</th><td>%s</td></tr>\n"
+			 "<tr><th>Key Size</th><td>%d</td></tr>\n",
+			 public_key->algor,
+			 public_key->size);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+
+	if (public_key->exponent != NULL) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<tr><th>Exponent</th><td>%s</td></tr>\n",
+				 public_key->exponent);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	if (public_key->modulus != NULL) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<tr><th>Modulus</th><td class=\"data\">%s</td></tr>\n",
+				 public_key->modulus);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	if (public_key->curve != NULL) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<tr><th>Curve</th><td>%s</td></tr>\n",
+				 public_key->curve);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	if (public_key->public != NULL) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<tr><th>Public Value</th><td>%s</td></tr>\n",
+				 public_key->public);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	res = fetch_about_ssenddataf(ctx, "</table>\n");
+
+	return res;
+}
+
+static nserror
+format_certificate_fingerprint(struct fetch_about_context *ctx,
+			      struct ns_cert_info *cert_info)
+{
+	nserror res;
+
+	if ((cert_info->sha1fingerprint == NULL) &&
+	    (cert_info->sha256fingerprint == NULL))  {
+		/* skip the table if no fingerprints */
+		return NSERROR_OK;
+	}
+
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<table class=\"info\">\n"
+			 "<tr><th>Fingerprints</th><td><hr></td></tr>\n");
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	if (cert_info->sha256fingerprint != NULL) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<tr><th>SHA-256</th><td class=\"data\">%s</td></tr>\n",
+				 cert_info->sha256fingerprint);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	if (cert_info->sha1fingerprint != NULL) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<tr><th>SHA-1</th><td class=\"data\">%s</td></tr>\n",
+				 cert_info->sha1fingerprint);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	res = fetch_about_ssenddataf(ctx, "</table>\n");
+
+	return res;
+}
+
+static nserror
+format_certificate(struct fetch_about_context *ctx,
+		   struct ns_cert_info *cert_info,
+		   size_t depth)
+{
+	nserror res;
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<h2 id=\"%"PRIsizet"\" class=\"ns-border\">%s</h2>\n",
+			 depth, cert_info->subject_name.common_name);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	if (cert_info->err != SSL_CERT_ERR_OK) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<table class=\"info\">\n"
+				 "<tr class=\"ns-even-fg-bad\">"
+				 "<th>Fault</th>"
+				 "<td>%s</td>"
+				 "</tr>"
+				 "</table>\n",
+				 messages_get_sslcode(cert_info->err));
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<table class=\"info\">\n"
+			 "<tr><th>Issued To</th><td><hr></td></tr>\n");
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	res = format_certificate_name(ctx, &cert_info->subject_name);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "</table>\n");
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<table class=\"info\">\n"
+			 "<tr><th>Issued By</th><td><hr></td></tr>\n");
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	res = format_certificate_name(ctx, &cert_info->issuer_name);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "</table>\n");
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<table class=\"info\">\n"
+			 "<tr><th>Validity</th><td><hr></td></tr>\n"
+			 "<tr><th>Valid From</th><td>%s</td></tr>\n"
+			 "<tr><th>Valid Until</th><td>%s</td></tr>\n"
+			 "</table>\n",
+			 cert_info->not_before,
+			 cert_info->not_after);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	res = format_certificate_san(ctx, cert_info->san);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	res = format_certificate_public_key(ctx, &cert_info->public_key);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<table class=\"info\">\n"
+			 "<tr><th>Miscellaneous</th><td><hr></td></tr>\n");
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	if (cert_info->serialnum != NULL) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<tr><th>Serial Number</th><td>%s</td></tr>\n",
+				 cert_info->serialnum);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	if (cert_info->sig_algor != NULL) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<tr><th>Signature Algorithm</th>"
+				 "<td>%s</td></tr>\n",
+				 cert_info->sig_algor);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<tr><th>Version</th><td>%ld</td></tr>\n"
+			 "</table>\n",
+			 cert_info->version);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	res = format_certificate_fingerprint(ctx, cert_info);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	return res;
+}
+
+/**
+ * Handler to generate about:certificate page.
+ *
+ * Shows details of a certificate chain
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_certificate_handler(struct fetch_about_context *ctx)
+{
+	int code = 200;
+	nserror res;
+	struct cert_chain *chain = NULL;
+
+	/* content is going to return ok */
+	fetch_about_set_http_code(ctx, code);
+
+	/* content type */
+	if (fetch_about_send_header(ctx, "Content-Type: text/html"))
+		goto fetch_about_certificate_handler_aborted;
+
+	/* page head */
+	res = fetch_about_ssenddataf(ctx,
+			"<html>\n<head>\n"
+			"<title>NetSurf Browser Certificate Viewer</title>\n"
+			"<link rel=\"stylesheet\" type=\"text/css\" "
+					"href=\"resource:internal.css\">\n"
+			"</head>\n"
+			"<body id=\"certificate\" class=\"ns-even-bg ns-even-fg ns-border\">\n"
+			"<h1 class=\"ns-border\">Certificate</h1>\n");
+	if (res != NSERROR_OK) {
+		goto fetch_about_certificate_handler_aborted;
+	}
+
+	res = cert_chain_from_query(fetch_about_get_url(ctx), &chain);
+	if (res != NSERROR_OK) {
+		res = fetch_about_ssenddataf(ctx, "<p>Could not process that</p>\n");
+		if (res != NSERROR_OK) {
+			goto fetch_about_certificate_handler_aborted;
+		}
+	} else {
+		struct ns_cert_info *cert_info;
+		res = convert_chain_to_cert_info(chain, &cert_info);
+		if (res == NSERROR_OK) {
+			size_t depth;
+			res = fetch_about_ssenddataf(ctx, "<ul>\n");
+			if (res != NSERROR_OK) {
+				free_ns_cert_info(cert_info);
+				goto fetch_about_certificate_handler_aborted;
+			}
+
+			for (depth = 0; depth < chain->depth; depth++) {
+				res = fetch_about_ssenddataf(ctx, "<li><a href=\"#%"PRIsizet"\">%s</a></li>\n",
+						depth, (cert_info + depth)
+							->subject_name
+								.common_name);
+				if (res != NSERROR_OK) {
+					free_ns_cert_info(cert_info);
+					goto fetch_about_certificate_handler_aborted;
+				}
+
+			}
+
+			res = fetch_about_ssenddataf(ctx, "</ul>\n");
+			if (res != NSERROR_OK) {
+				free_ns_cert_info(cert_info);
+				goto fetch_about_certificate_handler_aborted;
+			}
+
+			for (depth = 0; depth < chain->depth; depth++) {
+				res = format_certificate(ctx, cert_info + depth,
+						depth);
+				if (res != NSERROR_OK) {
+					free_ns_cert_info(cert_info);
+					goto fetch_about_certificate_handler_aborted;
+				}
+
+			}
+			free_ns_cert_info(cert_info);
+
+		} else {
+			res = fetch_about_ssenddataf(ctx,
+					 "<p>Invalid certificate data</p>\n");
+			if (res != NSERROR_OK) {
+				goto fetch_about_certificate_handler_aborted;
+			}
+		}
+	}
+
+
+	/* page footer */
+	res = fetch_about_ssenddataf(ctx, "</body>\n</html>\n");
+	if (res != NSERROR_OK) {
+		goto fetch_about_certificate_handler_aborted;
+	}
+
+	fetch_about_send_finished(ctx);
+
+	cert_chain_free(chain);
+
+	return true;
+
+fetch_about_certificate_handler_aborted:
+	cert_chain_free(chain);
+	return false;
+}
diff --git a/content/fetchers/about/certificate.h b/content/fetchers/about/certificate.h
new file mode 100644
index 000000000..80ac06853
--- /dev/null
+++ b/content/fetchers/about/certificate.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * about scheme certificate handler interface
+ */
+
+#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_CERTIFICATE_H
+#define NETSURF_CONTENT_FETCHERS_ABOUT_CERTIFICATE_H
+
+/**
+ * Handler to generate about scheme certificate page.
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_certificate_handler(struct fetch_about_context *ctx);
+
+#endif
diff --git a/content/fetchers/about/chart.c b/content/fetchers/about/chart.c
new file mode 100644
index 000000000..c030c12b4
--- /dev/null
+++ b/content/fetchers/about/chart.c
@@ -0,0 +1,630 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * content generator for the about scheme chart page
+ *
+ * A chart consists of the figure area in which a chart a title and a
+ * key are placed.
+ *
+ *
+ */
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <stdio.h>
+
+#include "utils/config.h"
+#include "netsurf/inttypes.h"
+#include "utils/config.h"
+#include "utils/utils.h"
+#include "utils/errors.h"
+#include "utils/nsurl.h"
+
+#include "private.h"
+#include "chart.h"
+
+/** minimum figure dimension */
+#define FIGURE_MIN_WIDTH 150
+#define FIGURE_MIN_HEIGHT 100
+
+enum chart_type {
+		 CHART_TYPE_UNKNOWN,
+		 CHART_TYPE_PIE,
+};
+
+/* type of chart key */
+enum key_type {
+	       CHART_KEY_UNSET,
+	       CHART_KEY_NONE,
+	       CHART_KEY_LEFT,
+	       CHART_KEY_RIGHT,
+	       CHART_KEY_TOP,
+	       CHART_KEY_BOT,
+	       CHART_KEY_END
+};
+
+
+struct chart_label {
+	char *title; /* label title */
+	unsigned int colour; /* colour */
+};
+
+struct chart_series {
+	unsigned int len; /* number of values in the series */
+	float *value; /* array of values */
+};
+
+#define MAX_SERIES 4
+
+struct chart_data {
+	unsigned int series_len;
+	struct chart_series series[MAX_SERIES];
+
+	unsigned int label_len; /* number of labels */
+	struct chart_label *label;
+
+};
+
+/**
+ * parameters for a chart figure
+ */
+struct chart_param {
+	enum chart_type type;
+	enum key_type key; /* what type of key to use */
+	unsigned int width; /* width of figure */
+	unsigned int height; /* height of figure */
+	char *title; /* title */
+	struct {
+		unsigned int x;
+		unsigned int y;
+		unsigned int width;
+		unsigned int height;
+	} area; /* chart area within figure */
+	struct chart_data data;
+};
+
+#define DEF_COLOUR_NUM 8
+/** default colour series */
+static unsigned int colour_series[DEF_COLOUR_NUM] =
+	{
+	 0x00ff00, /* green */
+	 0x0000ff, /* blue */
+	 0xff0000, /* red */
+	 0xffff00, /* yellow */
+	 0x00ffff, /* cyan */
+	 0xff00ff, /* pink */
+	 0x777777, /* grey */
+	 0x000000, /* black */
+	};
+
+
+/* ensures there are labels present for every value */
+static nserror ensure_label_count(struct chart_param *chart, unsigned int count)
+{
+	unsigned int lidx;
+	int deltac;
+	struct chart_label *nlabels;
+
+	deltac = count - chart->data.label_len;
+	if (deltac <= 0) {
+		/* there are enough labels */
+		return NSERROR_OK;
+	}
+
+	nlabels = realloc(chart->data.label,
+			  count * sizeof(struct chart_label));
+	if (nlabels == NULL) {
+		return NSERROR_NOMEM;
+	}
+	chart->data.label = nlabels;
+
+	for (lidx = chart->data.label_len; lidx < count; lidx++) {
+		chart->data.label[lidx].title = calloc(1, 20);
+		snprintf(chart->data.label[lidx].title, 19, "item %d", lidx + 1);
+		chart->data.label[lidx].colour = colour_series[lidx % DEF_COLOUR_NUM];
+	}
+
+	chart->data.label_len = count;
+
+	return NSERROR_OK;
+}
+
+/**
+ * extract values for a series
+ */
+static nserror
+extract_series_values(struct chart_param *chart,
+		      unsigned int series_num,
+		      const char *valstr,
+		      size_t valstrlen)
+{
+	nserror res;
+	unsigned int valcur;
+	size_t valstart;/* value start in valstr */
+	size_t vallen; /* value end in valstr */
+	struct chart_series *series;
+
+	series = chart->data.series + series_num;
+
+	/* ensure we do not leak any data in this series */
+	if (series->value != NULL) {
+		free(series->value);
+	}
+
+	/* count how many values present */
+	for (series->len = 1, valstart=0; valstart < valstrlen; valstart++) {
+		if (valstr[valstart] == ',') {
+			series->len++;
+		}
+	}
+
+	/* allocate storage for values */
+	series->value = calloc(series->len, sizeof(float));
+	if (series->value == NULL) {
+		return NSERROR_NOMEM;
+	}
+
+	/* extract values from query string */
+	for (valcur = 0, vallen = 0, valstart = 0;
+	     (valstart < valstrlen) && (valcur < series->len);
+	     valstart += vallen, valcur++) {
+		/* get query section length */
+		vallen = 0;
+		while (((valstart + vallen) < valstrlen) &&
+		       (valstr[valstart + vallen] != ',')) {
+			vallen++;
+		}
+
+		series->value[valcur] = strtof(valstr + valstart, NULL);
+		vallen++; /* account for , separator */
+	}
+
+	res = ensure_label_count(chart, series->len);
+
+	return res;
+}
+
+
+/**
+ * extract values for next series
+ */
+static nserror
+extract_next_series_values(struct chart_param *chart,
+		      const char *valstr,
+		      size_t valstrlen)
+{
+	nserror res;
+
+	if (chart->data.series_len >= MAX_SERIES) {
+		return NSERROR_NOSPACE;
+	}
+
+	res = extract_series_values(chart,
+				    chart->data.series_len,
+				    valstr,
+				    valstrlen);
+	if (res == NSERROR_OK) {
+		chart->data.series_len++;
+	}
+
+	return res;
+}
+
+
+/**
+ * extract label title
+ */
+static nserror
+extract_series_labels(struct chart_param *chart,
+		      const char *valstr,
+		      size_t valstrlen)
+{
+	nserror res;
+	unsigned int valcount; /* count of values in valstr */
+	unsigned int valcur;
+	size_t valstart;/* value start in valstr */
+	size_t vallen; /* value end in valstr */
+
+	for (valcount = 1, valstart=0; valstart < valstrlen; valstart++) {
+		if (valstr[valstart] == ',') {
+			valcount++;
+		}
+	}
+
+	res = ensure_label_count(chart, valcount);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+
+	for (valcur = 0, vallen = 0, valstart = 0;
+	     (valstart < valstrlen) && (valcur < chart->data.label_len);
+	     valstart += vallen, valcur++) {
+		/* get query section length */
+		vallen = 0;
+		while (((valstart + vallen) < valstrlen) &&
+		       (valstr[valstart + vallen] != ',')) {
+			vallen++;
+		}
+
+		chart->data.label[valcur].title = strndup(valstr + valstart, vallen);
+		vallen++; /* account for , separator */
+	}
+	return NSERROR_OK;
+}
+
+
+/**
+ * extract labels colour
+ */
+static nserror
+extract_series_colours(struct chart_param *chart,
+		      const char *valstr,
+		      size_t valstrlen)
+{
+	return NSERROR_OK;
+}
+
+/**
+ * process a part of a query
+ */
+static nserror
+process_query_section(const char *str, size_t len, struct chart_param *chart)
+{
+	nserror res = NSERROR_OK;
+
+	if ((len > 6) &&
+	    (strncmp(str, "width=", 6) == 0)) {
+		/* figure width */
+		chart->width = strtoul(str + 6, NULL, 10);
+	} else if ((len > 7) &&
+	    (strncmp(str, "height=", 7) == 0)) {
+		/* figure height */
+		chart->height = strtoul(str + 7, NULL, 10);
+	} else if ((len > 8) &&
+	    (strncmp(str, "cawidth=", 8) == 0)) {
+		/* chart area width */
+		chart->area.width = strtoul(str + 8, NULL, 10);
+	} else if ((len > 9) &&
+	    (strncmp(str, "caheight=", 9) == 0)) {
+		/* chart area height */
+		chart->area.height = strtoul(str + 9, NULL, 10);
+	} else if ((len > 4) &&
+	    (strncmp(str, "key=", 4) == 0)) {
+		/* figure has key */
+		chart->key = strtoul(str + 4, NULL, 10);
+	} else if ((len > 6) &&
+	    (strncmp(str, "title=", 6) == 0)) {
+		chart->title = strndup(str + 6, len - 6);
+	} else if ((len > 5) &&
+	    (strncmp(str, "type=", 5) == 0)) {
+		if (strncmp(str + 5, "pie", len - 5) == 0) {
+			chart->type = CHART_TYPE_PIE;
+		} else {
+			chart->type = CHART_TYPE_UNKNOWN;
+		}
+	} else if ((len > 7) &&
+	    (strncmp(str, "values=", 7) == 0)) {
+		res = extract_next_series_values(chart, str + 7, len - 7);
+	} else if ((len > 7) &&
+	    (strncmp(str, "labels=", 7) == 0)) {
+		res = extract_series_labels(chart, str + 7, len - 7);
+	} else if ((len > 8) &&
+	    (strncmp(str, "colours=", 8) == 0)) {
+		res = extract_series_colours(chart, str + 8, len - 8);
+	}
+
+	return res;
+}
+
+
+
+static nserror
+chart_from_query(struct nsurl *url, struct chart_param *chart)
+{
+	nserror res;
+	char *querystr;
+	size_t querylen;
+	size_t kvstart;/* key value start */
+	size_t kvlen; /* key value end */
+
+	res = nsurl_get(url, NSURL_QUERY, &querystr, &querylen);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	for (kvlen = 0, kvstart = 0; kvstart < querylen; kvstart += kvlen) {
+		/* get query section length */
+		kvlen = 0;
+		while (((kvstart + kvlen) < querylen) &&
+		       (querystr[kvstart + kvlen] != '&')) {
+			kvlen++;
+		}
+
+		res = process_query_section(querystr + kvstart, kvlen, chart);
+		if (res != NSERROR_OK) {
+			break;
+		}
+		kvlen++; /* account for & separator */
+	}
+	free(querystr);
+
+	/* sanity check dimensions */
+	if (chart->width < FIGURE_MIN_WIDTH) {
+		/* bad width - check height */
+		if (chart->height < FIGURE_MIN_HEIGHT) {
+			/* both bad set to defaults */
+			chart->width = FIGURE_MIN_WIDTH;
+			chart->height = FIGURE_MIN_HEIGHT;
+		} else {
+			/* base width on valid height */
+			chart->width = (chart->height * 3) / 2;
+		}
+	} else {
+		/* good width check height */
+		if (chart->height < FIGURE_MIN_HEIGHT) {
+			/* base height on valid width */
+			chart->height = (chart->width * 2) / 3;
+		}
+	}
+
+	/* ensure legend type correct */
+	if ((chart->key == CHART_KEY_UNSET) ||
+	    (chart->key >= CHART_KEY_END )) {
+		/* default to putting key on right */
+		chart->key = CHART_KEY_RIGHT;
+	}
+
+	return NSERROR_OK;
+}
+
+
+static nserror
+output_pie_legend(struct fetch_about_context *ctx, struct chart_param *chart)
+{
+	nserror res;
+	unsigned int lblidx;
+	unsigned int legend_width;
+	unsigned int legend_height;
+	unsigned int vertical_spacing;
+
+	switch (chart->key) {
+
+	case CHART_KEY_NONE:
+		break;
+	case CHART_KEY_RIGHT:
+		legend_width = chart->width - chart->area.width - chart->area.x;
+		legend_width -= 10; /* margin */
+		legend_height = chart->height;
+		vertical_spacing = legend_height / (chart->data.label_len + 1);
+
+		for(lblidx = 0; lblidx < chart->data.label_len ; lblidx++) {
+			res = fetch_about_ssenddataf(ctx,
+				"<rect  x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" fill=\"#%06x\" />",
+				chart->width - legend_width,
+				(vertical_spacing * lblidx) + (vertical_spacing/2),
+				vertical_spacing * 2 / 3,
+				vertical_spacing * 2 / 3,
+				chart->data.label[lblidx].colour);
+			if (res != NSERROR_OK) {
+				return res;
+			}
+			res = fetch_about_ssenddataf(ctx,
+				"<text x=\"%d\" y=\"%d\" fill=\"#%06x\" >%s</text>",
+				chart->width - legend_width + vertical_spacing,
+				vertical_spacing * (lblidx+1),
+			     chart->data.label[lblidx].colour,
+				chart->data.label[lblidx].title);
+			if (res != NSERROR_OK) {
+				return res;
+			}
+		}
+		break;
+	default:
+		break;
+	}
+
+	return NSERROR_OK;
+}
+
+static float
+compute_series_total(struct chart_param *chart, unsigned int series)
+{
+	float total;
+	unsigned int curdata;
+
+	for (total = 0, curdata = 0;
+	     curdata < chart->data.series[series].len;
+	     curdata++) {
+		total += chart->data.series[series].value[curdata];
+	}
+	return total;
+}
+
+/**
+ * render the data as a pie chart svg
+ */
+static bool
+pie_chart(struct fetch_about_context *ctx, struct chart_param *chart)
+{
+	nserror res;
+	float ra; /* pie a radius */
+	float rb; /* pie b radius */
+	float series_total;
+	unsigned int curdata; /* current data point index */
+	float last_x, last_y;
+	float end_x, end_y;
+	float start;
+	float extent;
+	bool large;
+	float circle_centre_x, circle_centre_y;
+
+	/* ensure there is data to render */
+	if ((chart->data.series_len < 1) || (chart->data.series[0].len < 2)) {
+		return NSERROR_BAD_PARAMETER;
+	}
+
+	/* get the first series total value */
+	series_total = compute_series_total(chart, 0);
+	if (series_total == 0) {
+		/* dividing by zero is embarasing */
+		return NSERROR_BAD_PARAMETER;
+	}
+
+	/*
+	 * need to ensure the chart area is setup correctly
+	 *
+	 * this is left to each chart type as different charts
+	 *  have differnt requirements
+	 */
+	if ((chart->area.width == 0) || (chart->area.height == 0)) {
+		/*
+		 * pie chart defaults to square of smaller of figure
+		 *  width and height
+		 */
+		if (chart->width > chart->height) {
+			chart->area.width = chart->area.height = (chart->height - chart->area.x);
+		} else {
+			chart->area.width = chart->area.height = (chart->width - chart->area.y);
+		}
+	}
+
+	/* content is going to return ok */
+	fetch_about_set_http_code(ctx, 200);
+
+	/* content type */
+	if (fetch_about_send_header(ctx,
+			"Content-Type: image/svg; charset=utf-8")) {
+		goto aborted;
+	}
+
+	/* get the pie charts elipse radii */
+	ra = chart->area.width / 2;
+	rb = chart->area.height / 2;
+
+	/* get the offset to the circle centre */
+	circle_centre_x = chart->area.x + ra;
+	circle_centre_y = chart->area.y + rb;
+
+
+	/* svg header */
+	res = fetch_about_ssenddataf(ctx,
+			"<svg width=\"%u\" height=\"%u\" "
+			"xmlns=\"http://www.w3.org/2000/svg\">\n",
+			chart->width, chart->height);
+	if (res != NSERROR_OK) {
+		goto aborted;
+	}
+
+	/* generate the legend */
+	res = output_pie_legend(ctx, chart);
+	if (res != NSERROR_OK) {
+		goto aborted;
+	}
+
+	/* plot the arcs */
+	start = -M_PI_2;
+	last_x = (ra * cos(start));
+	last_y = (rb * sin(start));
+
+	/* iterate over each data point creating a slice o pie */
+	for (curdata=0; curdata < chart->data.series[0].len; curdata++) {
+		extent = ((chart->data.series[0].value[curdata] / series_total) * 2 * M_PI);
+		end_x = (ra * cos(start + extent));
+		end_y = (rb * sin(start + extent));
+
+		if (extent > M_PI) {
+			large = true;
+		} else {
+			large = false;
+		}
+
+		res = fetch_about_ssenddataf(
+			ctx,
+			"<path d=\"M %g %g\n"
+			"A %g %g 0 %d 1 %g %g\n"
+			"L %g %g Z\" fill=\"#%06x\" />\n",
+			circle_centre_x + last_x,
+			circle_centre_y + last_y,
+			ra, rb, large?1:0,
+			circle_centre_x + end_x,
+			circle_centre_y + end_y,
+			circle_centre_x,
+			circle_centre_y,
+			chart->data.label[curdata].colour);
+		if (res != NSERROR_OK) {
+			goto aborted;
+		}
+		last_x = end_x;
+		last_y = end_y;
+		start +=extent;
+	}
+
+	res = fetch_about_ssenddataf(ctx, "</svg>\n");
+	if (res != NSERROR_OK) {
+		goto aborted;
+	}
+
+	fetch_about_send_finished(ctx);
+
+	return true;
+
+ aborted:
+
+	return false;
+
+}
+
+/**
+ * Handler to generate about scheme chart page.
+ *
+ * generates an svg chart
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_chart_handler(struct fetch_about_context *ctx)
+{
+	nserror res;
+	struct chart_param chart;
+	memset(&chart, 0, sizeof(struct chart_param));
+
+	res = chart_from_query(fetch_about_get_url(ctx), &chart);
+	if (res != NSERROR_OK) {
+		goto aborted;
+	}
+
+	switch (chart.type) {
+	case CHART_TYPE_PIE:
+		return pie_chart(ctx, &chart);
+
+
+	default:
+		break;
+	}
+
+aborted:
+
+	return false;
+
+}
diff --git a/content/fetchers/about/chart.h b/content/fetchers/about/chart.h
new file mode 100644
index 000000000..4eb7e7898
--- /dev/null
+++ b/content/fetchers/about/chart.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * about scheme chart handler interface
+ */
+
+#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_CHART_H
+#define NETSURF_CONTENT_FETCHERS_ABOUT_CHART_H
+
+/**
+ * Handler to generate about scheme chart page.
+ *
+ * generates an svg chart
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_chart_handler(struct fetch_about_context *ctx);
+
+#endif
diff --git a/content/fetchers/about/choices.c b/content/fetchers/about/choices.c
new file mode 100644
index 000000000..a95502e6e
--- /dev/null
+++ b/content/fetchers/about/choices.c
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * content generator for the about scheme blank page
+ */
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+
+#include "netsurf/types.h"
+#include "utils/errors.h"
+#include "utils/nsoption.h"
+
+#include "private.h"
+#include "choices.h"
+
+/**
+ * Generate the text of a Choices file which represents the current
+ * in use options.
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_choices_handler(struct fetch_about_context *ctx)
+{
+	char buffer[1024];
+	int code = 200;
+	int slen;
+	unsigned int opt_loop = 0;
+	int res = 0;
+
+	/* content is going to return ok */
+	fetch_about_set_http_code(ctx, code);
+
+	/* content type */
+	if (fetch_about_send_header(ctx, "Content-Type: text/plain"))
+		goto fetch_about_choices_handler_aborted;
+
+	slen = snprintf(buffer, sizeof buffer,
+		 "# Automatically generated current NetSurf browser Choices\n");
+
+	do {
+		res = nsoption_snoptionf(buffer + slen,
+				sizeof buffer - slen,
+				opt_loop,
+				"%k:%v\n");
+		if (res <= 0)
+			break; /* last option */
+
+		if (res >= (int) (sizeof buffer - slen)) {
+			/* last entry would not fit in buffer, submit buffer */
+			res = fetch_about_senddata(ctx, (const uint8_t *)buffer, slen);
+			if (res != NSERROR_OK) {
+				goto fetch_about_choices_handler_aborted;
+			}
+			slen = 0;
+		} else {
+			/* normal addition */
+			slen += res;
+			opt_loop++;
+		}
+	} while (res > 0);
+
+	res = fetch_about_senddata(ctx, (const uint8_t *)buffer, slen);
+	if (res != NSERROR_OK) {
+		goto fetch_about_choices_handler_aborted;
+	}
+
+	fetch_about_send_finished(ctx);
+
+	return true;
+
+fetch_about_choices_handler_aborted:
+	return false;
+}
diff --git a/content/fetchers/about/choices.h b/content/fetchers/about/choices.h
new file mode 100644
index 000000000..0548f5b9c
--- /dev/null
+++ b/content/fetchers/about/choices.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * about scheme choices handler interface
+ */
+
+#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_CHOICES_H
+#define NETSURF_CONTENT_FETCHERS_ABOUT_CHOICES_H
+
+/**
+ * Handler to generate about scheme choices page.
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_choices_handler(struct fetch_about_context *ctx);
+
+#endif
diff --git a/content/fetchers/about/config.c b/content/fetchers/about/config.c
new file mode 100644
index 000000000..a18af956f
--- /dev/null
+++ b/content/fetchers/about/config.c
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * content generator for the about scheme blank page
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "netsurf/types.h"
+#include "utils/errors.h"
+#include "utils/nsoption.h"
+
+#include "private.h"
+#include "config.h"
+
+/**
+ * Handler to generate about scheme config page
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_config_handler(struct fetch_about_context *ctx)
+{
+	char buffer[1024];
+	int slen = 0;
+	unsigned int opt_loop = 0;
+	int elen = 0; /* entry length */
+	nserror res;
+	bool even = false;
+
+	/* content is going to return ok */
+	fetch_about_set_http_code(ctx, 200);
+
+	/* content type */
+	if (fetch_about_send_header(ctx, "Content-Type: text/html")) {
+		goto fetch_about_config_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			"<html>\n<head>\n"
+			"<title>NetSurf Browser Config</title>\n"
+			"<link rel=\"stylesheet\" type=\"text/css\" "
+			"href=\"resource:internal.css\">\n"
+			"</head>\n"
+			"<body "
+				"id =\"configlist\" "
+				"class=\"ns-even-bg ns-even-fg ns-border\" "
+				"style=\"overflow: hidden;\">\n"
+			"<h1 class=\"ns-border\">NetSurf Browser Config</h1>\n"
+			"<table class=\"config\">\n"
+			"<tr><th>Option</th>"
+			"<th>Type</th>"
+			"<th>Provenance</th>"
+			"<th>Setting</th></tr>\n");
+	if (res != NSERROR_OK) {
+		goto fetch_about_config_handler_aborted;
+	}
+
+
+	do {
+		if (even) {
+			elen = nsoption_snoptionf(buffer + slen,
+					sizeof buffer - slen,
+					opt_loop,
+					"<tr class=\"ns-even-bg\">"
+						"<th class=\"ns-border\">%k</th>"
+						"<td class=\"ns-border\">%t</td>"
+						"<td class=\"ns-border\">%p</td>"
+						"<td class=\"ns-border\">%V</td>"
+					"</tr>\n");
+		} else {
+			elen = nsoption_snoptionf(buffer + slen,
+					sizeof buffer - slen,
+					opt_loop,
+					"<tr class=\"ns-odd-bg\">"
+						"<th class=\"ns-border\">%k</th>"
+						"<td class=\"ns-border\">%t</td>"
+						"<td class=\"ns-border\">%p</td>"
+						"<td class=\"ns-border\">%V</td>"
+					"</tr>\n");
+		}
+		if (elen <= 0)
+			break; /* last option */
+
+		if (elen >= (int) (sizeof buffer - slen)) {
+			/* last entry would not fit in buffer, submit buffer */
+			res = fetch_about_senddata(ctx, (const uint8_t *)buffer, slen);
+			if (res != NSERROR_OK) {
+				goto fetch_about_config_handler_aborted;
+			}
+			slen = 0;
+		} else {
+			/* normal addition */
+			slen += elen;
+			opt_loop++;
+			even = !even;
+		}
+	} while (elen > 0);
+
+	slen += snprintf(buffer + slen, sizeof buffer - slen,
+			 "</table>\n</body>\n</html>\n");
+
+	res = fetch_about_senddata(ctx, (const uint8_t *)buffer, slen);
+	if (res != NSERROR_OK) {
+		goto fetch_about_config_handler_aborted;
+	}
+
+	fetch_about_send_finished(ctx);
+
+	return true;
+
+fetch_about_config_handler_aborted:
+	return false;
+}
diff --git a/content/fetchers/about/config.h b/content/fetchers/about/config.h
new file mode 100644
index 000000000..efef23971
--- /dev/null
+++ b/content/fetchers/about/config.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * about scheme config handler interface
+ */
+
+#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_CONFIG_H
+#define NETSURF_CONTENT_FETCHERS_ABOUT_CONFIG_H
+
+/**
+ * Handler to generate about scheme config page.
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_config_handler(struct fetch_about_context *ctx);
+
+#endif
diff --git a/content/fetchers/about/imagecache.c b/content/fetchers/about/imagecache.c
new file mode 100644
index 000000000..23d3ef41c
--- /dev/null
+++ b/content/fetchers/about/imagecache.c
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * content generator for the about scheme imagecache page
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+
+#include "netsurf/types.h"
+
+#include "image/image_cache.h"
+
+#include "private.h"
+#include "imagecache.h"
+
+/* exported interface documented in about/imagecache.h */
+bool fetch_about_imagecache_handler(struct fetch_about_context *ctx)
+{
+	char buffer[2048]; /* output buffer */
+	int code = 200;
+	int slen;
+	unsigned int cent_loop = 0;
+	int elen = 0; /* entry length */
+	nserror res;
+	bool even = false;
+
+	/* content is going to return ok */
+	fetch_about_set_http_code(ctx, code);
+
+	/* content type */
+	if (fetch_about_send_header(ctx, "Content-Type: text/html"))
+		goto fetch_about_imagecache_handler_aborted;
+
+	/* page head */
+	res = fetch_about_ssenddataf(ctx,
+		"<html>\n<head>\n"
+		"<title>Image Cache Status</title>\n"
+		"<link rel=\"stylesheet\" type=\"text/css\" "
+		"href=\"resource:internal.css\">\n"
+		"</head>\n"
+		"<body id =\"cachelist\" class=\"ns-even-bg ns-even-fg ns-border\">\n"
+		"<h1 class=\"ns-border\">Image Cache Status</h1>\n");
+	if (res != NSERROR_OK) {
+		goto fetch_about_imagecache_handler_aborted;
+	}
+
+	/* image cache summary */
+	slen = image_cache_snsummaryf(buffer, sizeof(buffer),
+		"<p>Configured limit of %a hysteresis of %b</p>\n"
+		"<p>Total bitmap size in use %c (in %d)</p>\n"
+		"<p>Age %es</p>\n"
+		"<p>Peak size %f (in %g)</p>\n"
+		"<p>Peak image count %h (size %i)</p>\n"
+		"<p>Cache total/hit/miss/fail (counts) %j/%k/%l/%m "
+		"(%pj%%/%pk%%/%pl%%/%pm%%)"
+		"<img width=200 height=100 src=\"about:chart?type=pie&width=200&height=100&labels=hit,miss,fail&values=%k,%l,%m\" />"
+		"</p>\n");
+	if (slen >= (int) (sizeof(buffer))) {
+		goto fetch_about_imagecache_handler_aborted; /* overflow */
+	}
+
+	res = fetch_about_senddata(ctx, (const uint8_t *)buffer, slen);
+	if (res != NSERROR_OK) {
+		goto fetch_about_imagecache_handler_aborted;
+	}
+
+	/* image cache summary */
+	slen = image_cache_snsummaryf(buffer, sizeof(buffer),
+		"<p>Cache total/hit/miss/fail (size) %n/%o/%q/%r "
+				"(%pn%%/%po%%/%pq%%/%pr%%)"
+		"<img width=200 height=100 src=\"about:chart?type=pie&width=200&height=100&labels=hit,miss,fail&values=%o,%q,%r\" /></p>\n"
+		"<p>Total images never rendered: %s "
+				"(includes %t that were converted)</p>\n"
+		"<p>Total number of excessive conversions: %u "
+				"(from %v images converted more than once)"
+				"</p>\n"
+		"<p>Bitmap of size %w had most (%x) conversions</p>\n"
+		"<h2 class=\"ns-border\">Current contents</h2>\n");
+	if (slen >= (int) (sizeof(buffer))) {
+		goto fetch_about_imagecache_handler_aborted; /* overflow */
+	}
+
+	res = fetch_about_senddata(ctx, (const uint8_t *)buffer, slen);
+	if (res != NSERROR_OK) {
+		goto fetch_about_imagecache_handler_aborted;
+	}
+
+	/* image cache entry table */
+	res = fetch_about_ssenddataf(ctx, "<p class=\"imagecachelist\">\n"
+			"<strong>"
+			"<span>Entry</span>"
+			"<span>Content Key</span>"
+			"<span>Redraw Count</span>"
+			"<span>Conversion Count</span>"
+			"<span>Last Redraw</span>"
+			"<span>Bitmap Age</span>"
+			"<span>Bitmap Size</span>"
+			"<span>Source</span>"
+			"</strong>\n");
+	if (res != NSERROR_OK) {
+		goto fetch_about_imagecache_handler_aborted;
+	}
+
+	slen = 0;
+	do {
+		if (even) {
+			elen = image_cache_snentryf(buffer + slen,
+						   sizeof buffer - slen,
+					cent_loop,
+					"<a href=\"%U\">"
+					"<span class=\"ns-border\">%e</span>"
+					"<span class=\"ns-border\">%k</span>"
+					"<span class=\"ns-border\">%r</span>"
+					"<span class=\"ns-border\">%c</span>"
+					"<span class=\"ns-border\">%a</span>"
+					"<span class=\"ns-border\">%g</span>"
+					"<span class=\"ns-border\">%s</span>"
+					"<span class=\"ns-border\">%o</span>"
+					"</a>\n");
+		} else {
+			elen = image_cache_snentryf(buffer + slen,
+						   sizeof buffer - slen,
+					cent_loop,
+					"<a class=\"ns-odd-bg\" href=\"%U\">"
+					"<span class=\"ns-border\">%e</span>"
+					"<span class=\"ns-border\">%k</span>"
+					"<span class=\"ns-border\">%r</span>"
+					"<span class=\"ns-border\">%c</span>"
+					"<span class=\"ns-border\">%a</span>"
+					"<span class=\"ns-border\">%g</span>"
+					"<span class=\"ns-border\">%s</span>"
+					"<span class=\"ns-border\">%o</span>"
+					"</a>\n");
+		}
+		if (elen <= 0)
+			break; /* last option */
+
+		if (elen >= (int) (sizeof buffer - slen)) {
+			/* last entry would not fit in buffer, submit buffer */
+			res = fetch_about_senddata(ctx,
+						   (const uint8_t *)buffer,
+						   slen);
+			if (res != NSERROR_OK) {
+				goto fetch_about_imagecache_handler_aborted;
+			}
+
+			slen = 0;
+		} else {
+			/* normal addition */
+			slen += elen;
+			cent_loop++;
+			even = !even;
+		}
+	} while (elen > 0);
+
+	slen += snprintf(buffer + slen, sizeof buffer - slen,
+			 "</p>\n</body>\n</html>\n");
+
+	res = fetch_about_senddata(ctx, (const uint8_t *)buffer, slen);
+	if (res != NSERROR_OK) {
+		goto fetch_about_imagecache_handler_aborted;
+	}
+
+	fetch_about_send_finished(ctx);
+
+	return true;
+
+fetch_about_imagecache_handler_aborted:
+	return false;
+}
diff --git a/content/fetchers/about/imagecache.h b/content/fetchers/about/imagecache.h
new file mode 100644
index 000000000..d1419cea7
--- /dev/null
+++ b/content/fetchers/about/imagecache.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * about scheme imagecache handler interface
+ */
+
+#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_IMAGECACHE_H
+#define NETSURF_CONTENT_FETCHERS_ABOUT_IMAGECACHE_H
+
+/**
+ * Handler to generate about scheme imagecache page.
+ *
+ * Shows details of current image cache.
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_imagecache_handler(struct fetch_about_context *ctx);
+
+#endif
diff --git a/content/fetchers/about/nscolours.c b/content/fetchers/about/nscolours.c
new file mode 100644
index 000000000..bd7a5ed7a
--- /dev/null
+++ b/content/fetchers/about/nscolours.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * content generator for the about scheme query privacy page
+ */
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "netsurf/plot_style.h"
+
+#include "utils/errors.h"
+#include "utils/nscolour.h"
+
+#include "private.h"
+#include "nscolours.h"
+
+/**
+ * Handler to generate the nscolours stylesheet
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_nscolours_handler(struct fetch_about_context *ctx)
+{
+	nserror res;
+	const char *stylesheet;
+
+	/* content is going to return ok */
+	fetch_about_set_http_code(ctx, 200);
+
+	/* content type */
+	if (fetch_about_send_header(ctx, "Content-Type: text/css; charset=utf-8")) {
+		goto aborted;
+	}
+
+	res = nscolour_get_stylesheet(&stylesheet);
+	if (res != NSERROR_OK) {
+		goto aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			"html {\n"
+			"\tbackground-color: #%06x;\n"
+			"}\n"
+			"%s",
+			colour_rb_swap(nscolours[NSCOLOUR_WIN_ODD_BG]),
+			stylesheet);
+	if (res != NSERROR_OK) {
+		goto aborted;
+	}
+
+	fetch_about_send_finished(ctx);
+
+	return true;
+
+aborted:
+
+	return false;
+}
diff --git a/content/fetchers/about/nscolours.h b/content/fetchers/about/nscolours.h
new file mode 100644
index 000000000..a602e4d99
--- /dev/null
+++ b/content/fetchers/about/nscolours.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * about scheme nscolours handler interface
+ */
+
+#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_NSCOLOURS_H
+#define NETSURF_CONTENT_FETCHERS_ABOUT_NSCOLOURS_H
+
+/**
+ * Handler to generate the nscolours stylesheet
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_nscolours_handler(struct fetch_about_context *ctx);
+
+#endif
diff --git a/content/fetchers/about/private.h b/content/fetchers/about/private.h
new file mode 100644
index 000000000..fcf9b1987
--- /dev/null
+++ b/content/fetchers/about/private.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * Private interfaces for the about scheme fetcher.
+ */
+
+#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_PRIVATE_H
+#define NETSURF_CONTENT_FETCHERS_ABOUT_PRIVATE_H
+
+struct fetch_about_context;
+struct fetch_multipart_data;
+
+/**
+ * set http response code on about response
+ */
+bool fetch_about_set_http_code(struct fetch_about_context *ctx, long code);
+
+/**
+ * Send a header on the about response
+ *
+ * \param ctx The about fetch context
+ * \param fmt The format specifier of the header
+ * \return true if the fetch has been aborted else false
+ */
+bool fetch_about_send_header(struct fetch_about_context *ctx, const char *fmt, ...);
+
+/**
+ * send data on the about response
+ */
+nserror fetch_about_senddata(struct fetch_about_context *ctx, const uint8_t *data, size_t data_len);
+
+/**
+ * send formatted data on the about response
+ */
+nserror fetch_about_ssenddataf(struct fetch_about_context *ctx, const char *fmt, ...);
+
+/**
+ * complete the about fetch response
+ */
+bool fetch_about_send_finished(struct fetch_about_context *ctx);
+
+/**
+ * Generate a 500 server error respnse
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_srverror(struct fetch_about_context *ctx);
+
+/**
+ * get the fetch url
+ */
+struct nsurl *fetch_about_get_url(struct fetch_about_context *ctx);
+
+/**
+ * get multipart fetch data
+ */
+const struct fetch_multipart_data *fetch_about_get_multipart(struct fetch_about_context *ctx);
+
+#endif
diff --git a/content/fetchers/about/query.c b/content/fetchers/about/query.c
new file mode 100644
index 000000000..7c4e9f442
--- /dev/null
+++ b/content/fetchers/about/query.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * content generator for the about scheme query privacy page
+ */
+
+#include <stdlib.h>
+
+#include "utils/errors.h"
+#include "utils/nsurl.h"
+#include "utils/messages.h"
+
+#include "query.h"
+
+/* exported interface documented in about/query.h */
+nserror
+get_query_description(struct nsurl *url,
+		      const char *key,
+		      char **out_str)
+{
+	nserror res;
+	char *url_s;
+	size_t url_l;
+	char *str = NULL;
+
+	/* get the host in question */
+	res = nsurl_get(url, NSURL_HOST, &url_s, &url_l);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	/* obtain the description with the url substituted */
+	str = messages_get_buff(key, url_s);
+	if (str == NULL) {
+		res = NSERROR_NOMEM;
+	} else {
+		*out_str = str;
+	}
+
+	free(url_s);
+
+	return res;
+}
diff --git a/content/fetchers/about/query.h b/content/fetchers/about/query.h
new file mode 100644
index 000000000..889a9ecdd
--- /dev/null
+++ b/content/fetchers/about/query.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * about scheme query handlers support interface
+ */
+
+#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_QUERY_H
+#define NETSURF_CONTENT_FETCHERS_ABOUT_QUERY_H
+
+/**
+ * generate a generic query description
+ *
+ * \param url The site url
+ * \param key message key
+ * \param out_str pointer to buffer with output
+ */
+nserror get_query_description(struct nsurl *url, const char *key, char **out_str);
+
+#endif
diff --git a/content/fetchers/about/query_auth.c b/content/fetchers/about/query_auth.c
new file mode 100644
index 000000000..1ed2e80ee
--- /dev/null
+++ b/content/fetchers/about/query_auth.c
@@ -0,0 +1,246 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * content generator for the about scheme query privacy page
+ */
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "utils/errors.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "content/fetch.h"
+
+#include "private.h"
+#include "query_auth.h"
+
+
+/**
+ * generate the description of the login query
+ */
+static nserror
+get_authentication_description(struct nsurl *url,
+			       const char *realm,
+			       const char *username,
+			       const char *password,
+			       char **out_str)
+{
+	nserror res;
+	char *url_s;
+	size_t url_l;
+	char *str = NULL;
+	const char *key;
+
+	res = nsurl_get(url, NSURL_HOST, &url_s, &url_l);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	if ((*username == 0) && (*password == 0)) {
+		key = "LoginDescription";
+	} else {
+		key = "LoginAgain";
+	}
+
+	str = messages_get_buff(key, url_s, realm);
+	if (str != NULL) {
+		NSLOG(netsurf, INFO,
+		      "key:%s url:%s realm:%s str:%s",
+		      key, url_s, realm, str);
+		*out_str = str;
+	} else {
+		res = NSERROR_NOMEM;
+	}
+
+	free(url_s);
+
+	return res;
+}
+
+
+/**
+ * Handler to generate about scheme authentication query page
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_query_auth_handler(struct fetch_about_context *ctx)
+{
+	nserror res;
+	char *url_s;
+	size_t url_l;
+	const char *realm = "";
+	const char *username = "";
+	const char *password = "";
+	const char *title;
+	char *description = NULL;
+	struct nsurl *siteurl = NULL;
+	const struct fetch_multipart_data *curmd; /* mutipart data iterator */
+
+	/* extract parameters from multipart post data */
+	curmd = fetch_about_get_multipart(ctx);
+	while (curmd != NULL) {
+		if (strcmp(curmd->name, "siteurl") == 0) {
+			res = nsurl_create(curmd->value, &siteurl);
+			if (res != NSERROR_OK) {
+				return fetch_about_srverror(ctx);
+			}
+		} else if (strcmp(curmd->name, "realm") == 0) {
+			realm = curmd->value;
+		} else if (strcmp(curmd->name, "username") == 0) {
+			username = curmd->value;
+		} else if (strcmp(curmd->name, "password") == 0) {
+			password = curmd->value;
+		}
+		curmd = curmd->next;
+	}
+
+	if (siteurl == NULL) {
+		return fetch_about_srverror(ctx);
+	}
+
+	/* content is going to return ok */
+	fetch_about_set_http_code(ctx, 200);
+
+	/* content type */
+	if (fetch_about_send_header(ctx, "Content-Type: text/html; charset=utf-8")) {
+		goto fetch_about_query_auth_handler_aborted;
+	}
+
+	title = messages_get("LoginTitle");
+	res = fetch_about_ssenddataf(ctx,
+			"<html>\n<head>\n"
+			"<title>%s</title>\n"
+			"<link rel=\"stylesheet\" type=\"text/css\" "
+			"href=\"resource:internal.css\">\n"
+			"</head>\n"
+			"<body class=\"ns-even-bg ns-even-fg ns-border\" id =\"authentication\">\n"
+			"<h1 class=\"ns-border\">%s</h1>\n",
+			title, title);
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_auth_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<form method=\"post\""
+			 " enctype=\"multipart/form-data\">");
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_auth_handler_aborted;
+	}
+
+	res = get_authentication_description(siteurl,
+					     realm,
+					     username,
+					     password,
+					     &description);
+	if (res == NSERROR_OK) {
+		res = fetch_about_ssenddataf(ctx, "<p>%s</p>", description);
+		free(description);
+		if (res != NSERROR_OK) {
+			goto fetch_about_query_auth_handler_aborted;
+		}
+	}
+
+	res = fetch_about_ssenddataf(ctx, "<table>");
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_auth_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<tr>"
+			 "<th><label for=\"name\">%s:</label></th>"
+			 "<td><input type=\"text\" id=\"username\" "
+			 "name=\"username\" value=\"%s\"></td>"
+			 "</tr>",
+			 messages_get("Username"), username);
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_auth_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<tr>"
+			 "<th><label for=\"password\">%s:</label></th>"
+			 "<td><input type=\"password\" id=\"password\" "
+			 "name=\"password\" value=\"%s\"></td>"
+			 "</tr>",
+			 messages_get("Password"), password);
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_auth_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx, "</table>");
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_auth_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<div id=\"buttons\">"
+			 "<input type=\"submit\" id=\"login\" name=\"login\" "
+			 "value=\"%s\" class=\"default-action\">"
+			 "<input type=\"submit\" id=\"cancel\" name=\"cancel\" "
+			 "value=\"%s\">"
+			 "</div>",
+			 messages_get("Login"),
+			 messages_get("Cancel"));
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_auth_handler_aborted;
+	}
+
+	res = nsurl_get(siteurl, NSURL_COMPLETE, &url_s, &url_l);
+	if (res != NSERROR_OK) {
+		url_s = strdup("");
+	}
+	res = fetch_about_ssenddataf(ctx,
+			 "<input type=\"hidden\" name=\"siteurl\" value=\"%s\">",
+			 url_s);
+	free(url_s);
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_auth_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<input type=\"hidden\" name=\"realm\" value=\"%s\">",
+			 realm);
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_auth_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx, "</form></body>\n</html>\n");
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_auth_handler_aborted;
+	}
+
+	fetch_about_send_finished(ctx);
+
+	nsurl_unref(siteurl);
+
+	return true;
+
+fetch_about_query_auth_handler_aborted:
+
+	nsurl_unref(siteurl);
+
+	return false;
+}
diff --git a/content/fetchers/about/query_auth.h b/content/fetchers/about/query_auth.h
new file mode 100644
index 000000000..1c7f658e1
--- /dev/null
+++ b/content/fetchers/about/query_auth.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * about scheme query auth handler interface
+ */
+
+#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_QUERY_AUTH_H
+#define NETSURF_CONTENT_FETCHERS_ABOUT_QUERY_AUTH_H
+
+/**
+ * Handler to generate about scheme query auth page.
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_query_auth_handler(struct fetch_about_context *ctx);
+
+#endif
diff --git a/content/fetchers/about/query_fetcherror.c b/content/fetchers/about/query_fetcherror.c
new file mode 100644
index 000000000..010a597e4
--- /dev/null
+++ b/content/fetchers/about/query_fetcherror.c
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * content generator for the about scheme query privacy page
+ */
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "utils/errors.h"
+#include "utils/messages.h"
+#include "content/fetch.h"
+
+#include "private.h"
+#include "query.h"
+#include "query_fetcherror.h"
+
+/**
+ * Handler to generate about scheme fetch error query page
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_query_fetcherror_handler(struct fetch_about_context *ctx)
+{
+	nserror res;
+	char *url_s;
+	size_t url_l;
+	const char *reason = "";
+	const char *title;
+	struct nsurl *siteurl = NULL;
+	char *description = NULL;
+	const struct fetch_multipart_data *curmd; /* mutipart data iterator */
+
+	/* extract parameters from multipart post data */
+	curmd = fetch_about_get_multipart(ctx);
+	while (curmd != NULL) {
+		if (strcmp(curmd->name, "siteurl") == 0) {
+			res = nsurl_create(curmd->value, &siteurl);
+			if (res != NSERROR_OK) {
+				return fetch_about_srverror(ctx);
+			}
+		} else if (strcmp(curmd->name, "reason") == 0) {
+			reason = curmd->value;
+		}
+		curmd = curmd->next;
+	}
+
+	if (siteurl == NULL) {
+		return fetch_about_srverror(ctx);
+	}
+
+	/* content is going to return ok */
+	fetch_about_set_http_code(ctx, 200);
+
+	/* content type */
+	if (fetch_about_send_header(ctx, "Content-Type: text/html; charset=utf-8")) {
+		goto fetch_about_query_fetcherror_handler_aborted;
+	}
+
+	title = messages_get("FetchErrorTitle");
+	res = fetch_about_ssenddataf(ctx,
+			"<html>\n<head>\n"
+			"<title>%s</title>\n"
+			"<link rel=\"stylesheet\" type=\"text/css\" "
+			"href=\"resource:internal.css\">\n"
+			"</head>\n"
+			"<body class=\"ns-even-bg ns-even-fg ns-border\" id =\"fetcherror\">\n"
+			"<h1 class=\"ns-border ns-odd-fg-bad\">%s</h1>\n",
+			title, title);
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_fetcherror_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<form method=\"post\""
+			 " enctype=\"multipart/form-data\">");
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_fetcherror_handler_aborted;
+	}
+
+	res = get_query_description(siteurl,
+				    "FetchErrorDescription",
+				    &description);
+	if (res == NSERROR_OK) {
+		res = fetch_about_ssenddataf(ctx, "<div><p>%s</p></div>", description);
+		free(description);
+		if (res != NSERROR_OK) {
+			goto fetch_about_query_fetcherror_handler_aborted;
+		}
+	}
+	res = fetch_about_ssenddataf(ctx, "<div><p>%s</p></div>", reason);
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_fetcherror_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<div id=\"buttons\">"
+			 "<input type=\"submit\" id=\"back\" name=\"back\" "
+			 "value=\"%s\" class=\"default-action\">"
+			 "<input type=\"submit\" id=\"retry\" name=\"retry\" "
+			 "value=\"%s\">"
+			 "</div>",
+			 messages_get("Backtoprevious"),
+			 messages_get("TryAgain"));
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_fetcherror_handler_aborted;
+	}
+
+	res = nsurl_get(siteurl, NSURL_COMPLETE, &url_s, &url_l);
+	if (res != NSERROR_OK) {
+		url_s = strdup("");
+	}
+	res = fetch_about_ssenddataf(ctx,
+			 "<input type=\"hidden\" name=\"siteurl\" value=\"%s\">",
+			 url_s);
+	free(url_s);
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_fetcherror_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx, "</form></body>\n</html>\n");
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_fetcherror_handler_aborted;
+	}
+
+	fetch_about_send_finished(ctx);
+
+	nsurl_unref(siteurl);
+
+	return true;
+
+fetch_about_query_fetcherror_handler_aborted:
+	nsurl_unref(siteurl);
+
+	return false;
+}
diff --git a/content/fetchers/about/query_fetcherror.h b/content/fetchers/about/query_fetcherror.h
new file mode 100644
index 000000000..85d972f8e
--- /dev/null
+++ b/content/fetchers/about/query_fetcherror.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * about scheme query fetch error handler interface
+ */
+
+#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_QUERY_FETCHERROR_H
+#define NETSURF_CONTENT_FETCHERS_ABOUT_QUERY_FETCHERROR_H
+
+/**
+ * Handler to generate about scheme fetch error query page
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_query_fetcherror_handler(struct fetch_about_context *ctx);
+
+#endif
diff --git a/content/fetchers/about/query_privacy.c b/content/fetchers/about/query_privacy.c
new file mode 100644
index 000000000..030672bab
--- /dev/null
+++ b/content/fetchers/about/query_privacy.c
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * content generator for the about scheme query privacy page
+ */
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "utils/errors.h"
+#include "utils/messages.h"
+#include "content/fetch.h"
+
+#include "private.h"
+#include "query.h"
+#include "query_privacy.h"
+
+/**
+ * Handler to generate about scheme privacy query page
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_query_privacy_handler(struct fetch_about_context *ctx)
+{
+	nserror res;
+	char *url_s;
+	size_t url_l;
+	const char *reason = "";
+	const char *title;
+	struct nsurl *siteurl = NULL;
+	char *description = NULL;
+	const char *chainurl = NULL;
+	const struct fetch_multipart_data *curmd; /* mutipart data iterator */
+
+	/* extract parameters from multipart post data */
+	curmd = fetch_about_get_multipart(ctx);
+	while (curmd != NULL) {
+		if (strcmp(curmd->name, "siteurl") == 0) {
+			res = nsurl_create(curmd->value, &siteurl);
+			if (res != NSERROR_OK) {
+				return fetch_about_srverror(ctx);
+			}
+		} else if (strcmp(curmd->name, "reason") == 0) {
+			reason = curmd->value;
+		} else if (strcmp(curmd->name, "chainurl") == 0) {
+			chainurl = curmd->value;
+		}
+		curmd = curmd->next;
+	}
+
+	if (siteurl == NULL) {
+		return fetch_about_srverror(ctx);
+	}
+
+	/* content is going to return ok */
+	fetch_about_set_http_code(ctx, 200);
+
+	/* content type */
+	if (fetch_about_send_header(ctx, "Content-Type: text/html; charset=utf-8")) {
+		goto fetch_about_query_ssl_handler_aborted;
+	}
+
+	title = messages_get("PrivacyTitle");
+	res = fetch_about_ssenddataf(ctx,
+			"<html>\n<head>\n"
+			"<title>%s</title>\n"
+			"<link rel=\"stylesheet\" type=\"text/css\" "
+			"href=\"resource:internal.css\">\n"
+			"</head>\n"
+			"<body class=\"ns-even-bg ns-even-fg ns-border\" id =\"privacy\">\n"
+			"<h1 class=\"ns-border ns-odd-fg-bad\">%s</h1>\n",
+			title, title);
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_ssl_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<form method=\"post\""
+			 " enctype=\"multipart/form-data\">");
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_ssl_handler_aborted;
+	}
+
+	res = get_query_description(siteurl,
+				    "PrivacyDescription",
+				    &description);
+	if (res == NSERROR_OK) {
+		res = fetch_about_ssenddataf(ctx, "<div><p>%s</p></div>", description);
+		free(description);
+		if (res != NSERROR_OK) {
+			goto fetch_about_query_ssl_handler_aborted;
+		}
+	}
+
+	if (chainurl == NULL) {
+		res = fetch_about_ssenddataf(ctx,
+				 "<div><p>%s</p></div>"
+				 "<div><p>%s</p></div>",
+				 reason,
+				 messages_get("ViewCertificatesNotPossible"));
+	} else {
+		res = fetch_about_ssenddataf(ctx,
+				 "<div><p>%s</p></div>"
+				 "<div><p><a href=\"%s\" target=\"_blank\">%s</a></p></div>",
+				 reason,
+				 chainurl,
+				 messages_get("ViewCertificates"));
+	}
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_ssl_handler_aborted;
+	}
+	res = fetch_about_ssenddataf(ctx,
+			 "<div id=\"buttons\">"
+			 "<input type=\"submit\" id=\"back\" name=\"back\" "
+			 "value=\"%s\" class=\"default-action\">"
+			 "<input type=\"submit\" id=\"proceed\" name=\"proceed\" "
+			 "value=\"%s\">"
+			 "</div>",
+			 messages_get("Backtosafety"),
+			 messages_get("Proceed"));
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_ssl_handler_aborted;
+	}
+
+	res = nsurl_get(siteurl, NSURL_COMPLETE, &url_s, &url_l);
+	if (res != NSERROR_OK) {
+		url_s = strdup("");
+	}
+	res = fetch_about_ssenddataf(ctx,
+			 "<input type=\"hidden\" name=\"siteurl\" value=\"%s\">",
+			 url_s);
+	free(url_s);
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_ssl_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx, "</form></body>\n</html>\n");
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_ssl_handler_aborted;
+	}
+
+	fetch_about_send_finished(ctx);
+
+	nsurl_unref(siteurl);
+
+	return true;
+
+fetch_about_query_ssl_handler_aborted:
+	nsurl_unref(siteurl);
+
+	return false;
+}
diff --git a/content/fetchers/about/query_privacy.h b/content/fetchers/about/query_privacy.h
new file mode 100644
index 000000000..38ddbe889
--- /dev/null
+++ b/content/fetchers/about/query_privacy.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * about scheme query privacy handler interface
+ */
+
+#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_QUERY_PRIVACY_H
+#define NETSURF_CONTENT_FETCHERS_ABOUT_QUERY_PRIVACY_H
+
+/**
+ * Handler to generate about scheme query privacy page.
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_query_privacy_handler(struct fetch_about_context *ctx);
+
+#endif
diff --git a/content/fetchers/about/query_timeout.c b/content/fetchers/about/query_timeout.c
new file mode 100644
index 000000000..5c014bc9b
--- /dev/null
+++ b/content/fetchers/about/query_timeout.c
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * content generator for the about scheme query timeout page
+ */
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "utils/errors.h"
+#include "utils/messages.h"
+#include "content/fetch.h"
+
+#include "private.h"
+#include "query.h"
+#include "query_timeout.h"
+
+/**
+ * Handler to generate about scheme timeout query page
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_query_timeout_handler(struct fetch_about_context *ctx)
+{
+	nserror res;
+	char *url_s;
+	size_t url_l;
+	const char *reason = "";
+	const char *title;
+	struct nsurl *siteurl = NULL;
+	char *description = NULL;
+	const struct fetch_multipart_data *curmd; /* mutipart data iterator */
+
+	/* extract parameters from multipart post data */
+	curmd = fetch_about_get_multipart(ctx);
+	while (curmd != NULL) {
+		if (strcmp(curmd->name, "siteurl") == 0) {
+			res = nsurl_create(curmd->value, &siteurl);
+			if (res != NSERROR_OK) {
+				return fetch_about_srverror(ctx);
+			}
+		} else if (strcmp(curmd->name, "reason") == 0) {
+			reason = curmd->value;
+		}
+		curmd = curmd->next;
+	}
+
+	if (siteurl == NULL) {
+		return fetch_about_srverror(ctx);
+	}
+
+	/* content is going to return ok */
+	fetch_about_set_http_code(ctx, 200);
+
+	/* content type */
+	if (fetch_about_send_header(ctx, "Content-Type: text/html; charset=utf-8")) {
+		goto fetch_about_query_timeout_handler_aborted;
+	}
+
+	title = messages_get("TimeoutTitle");
+	res = fetch_about_ssenddataf(ctx,
+			"<html>\n<head>\n"
+			"<title>%s</title>\n"
+			"<link rel=\"stylesheet\" type=\"text/css\" "
+			"href=\"resource:internal.css\">\n"
+			"</head>\n"
+			"<body class=\"ns-even-bg ns-even-fg ns-border\" id =\"timeout\">\n"
+			"<h1 class=\"ns-border ns-odd-fg-bad\">%s</h1>\n",
+			title, title);
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_timeout_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<form method=\"post\""
+			 " enctype=\"multipart/form-data\">");
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_timeout_handler_aborted;
+	}
+
+	res = get_query_description(siteurl,
+				    "TimeoutDescription",
+				    &description);
+	if (res == NSERROR_OK) {
+		res = fetch_about_ssenddataf(ctx, "<div><p>%s</p></div>", description);
+		free(description);
+		if (res != NSERROR_OK) {
+			goto fetch_about_query_timeout_handler_aborted;
+		}
+	}
+	res = fetch_about_ssenddataf(ctx, "<div><p>%s</p></div>", reason);
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_timeout_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+			 "<div id=\"buttons\">"
+			 "<input type=\"submit\" id=\"back\" name=\"back\" "
+			 "value=\"%s\" class=\"default-action\">"
+			 "<input type=\"submit\" id=\"retry\" name=\"retry\" "
+			 "value=\"%s\">"
+			 "</div>",
+			 messages_get("Backtoprevious"),
+			 messages_get("TryAgain"));
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_timeout_handler_aborted;
+	}
+
+	res = nsurl_get(siteurl, NSURL_COMPLETE, &url_s, &url_l);
+	if (res != NSERROR_OK) {
+		url_s = strdup("");
+	}
+	res = fetch_about_ssenddataf(ctx,
+			 "<input type=\"hidden\" name=\"siteurl\" value=\"%s\">",
+			 url_s);
+	free(url_s);
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_timeout_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx, "</form></body>\n</html>\n");
+	if (res != NSERROR_OK) {
+		goto fetch_about_query_timeout_handler_aborted;
+	}
+
+	fetch_about_send_finished(ctx);
+
+	nsurl_unref(siteurl);
+
+	return true;
+
+fetch_about_query_timeout_handler_aborted:
+	nsurl_unref(siteurl);
+
+	return false;
+}
diff --git a/content/fetchers/about/query_timeout.h b/content/fetchers/about/query_timeout.h
new file mode 100644
index 000000000..a64757f21
--- /dev/null
+++ b/content/fetchers/about/query_timeout.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * about scheme query timeout handler interface
+ */
+
+#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_QUERY_TIMEOUT_H
+#define NETSURF_CONTENT_FETCHERS_ABOUT_QUERY_TIMEOUT_H
+
+/**
+ * Handler to generate about scheme timeout query page
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_query_timeout_handler(struct fetch_about_context *ctx);
+
+#endif
diff --git a/content/fetchers/about/testament.c b/content/fetchers/about/testament.c
new file mode 100644
index 000000000..ae992ec52
--- /dev/null
+++ b/content/fetchers/about/testament.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf.
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * content generator for the about scheme testament page
+ */
+
+#include <stdbool.h>
+#include <stddef.h>
+
+#include "utils/errors.h"
+#include "netsurf/inttypes.h"
+#include "testament.h"
+
+#include "private.h"
+#include "atestament.h"
+
+typedef struct {
+	const char *leaf;
+	const char *modtype;
+} modification_t;
+
+/**
+ * Generate the text of an svn testament which represents the current
+ * build-tree status
+ *
+ * \param ctx The fetcher context.
+ * \return true if handled false if aborted.
+ */
+bool fetch_about_testament_handler(struct fetch_about_context *ctx)
+{
+	nserror res;
+	static modification_t modifications[] = WT_MODIFICATIONS;
+	int modidx; /* midification index */
+
+	/* content is going to return ok */
+	fetch_about_set_http_code(ctx, 200);
+
+	/* content type */
+	if (fetch_about_send_header(ctx, "Content-Type: text/plain"))
+		goto fetch_about_testament_handler_aborted;
+
+	res = fetch_about_ssenddataf(ctx,
+		"# Automatically generated by NetSurf build system\n\n");
+	if (res != NSERROR_OK) {
+		goto fetch_about_testament_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+#if defined(WT_BRANCHISTRUNK) || defined(WT_BRANCHISMASTER)
+			"# This is a *DEVELOPMENT* build from the main line.\n\n"
+#elif defined(WT_BRANCHISTAG) && (WT_MODIFIED == 0)
+			"# This is a tagged build of NetSurf\n"
+#ifdef WT_TAGIS
+			"#      The tag used was '" WT_TAGIS "'\n\n"
+#else
+			"\n"
+#endif
+#elif defined(WT_NO_SVN) || defined(WT_NO_GIT)
+			"# This NetSurf was built outside of our revision "
+			"control environment.\n"
+			"# This testament is therefore not very useful.\n\n"
+#else
+			"# This NetSurf was built from a branch (" WT_BRANCHPATH ").\n\n"
+#endif
+#if defined(CI_BUILD)
+			"# This build carries the CI build number '" CI_BUILD "'\n\n"
+#endif
+			);
+	if (res != NSERROR_OK) {
+		goto fetch_about_testament_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx,
+		"Built by %s (%s) from %s at revision %s on %s\n\n",
+		GECOS, USERNAME, WT_BRANCHPATH, WT_REVID, WT_COMPILEDATE);
+	if (res != NSERROR_OK) {
+		goto fetch_about_testament_handler_aborted;
+	}
+
+	res = fetch_about_ssenddataf(ctx, "Built on %s in %s\n\n", WT_HOSTNAME, WT_ROOT);
+	if (res != NSERROR_OK) {
+		goto fetch_about_testament_handler_aborted;
+	}
+
+	if (WT_MODIFIED > 0) {
+		res = fetch_about_ssenddataf(ctx,
+				"Working tree has %d modification%s\n\n",
+				WT_MODIFIED, WT_MODIFIED == 1 ? "" : "s");
+	} else {
+		res = fetch_about_ssenddataf(ctx, "Working tree is not modified.\n");
+	}
+	if (res != NSERROR_OK) {
+		goto fetch_about_testament_handler_aborted;
+	}
+
+	for (modidx = 0; modidx < WT_MODIFIED; ++modidx) {
+		res = fetch_about_ssenddataf(ctx,
+				 "  %s  %s\n",
+				 modifications[modidx].modtype,
+				 modifications[modidx].leaf);
+		if (res != NSERROR_OK) {
+			goto fetch_about_testament_handler_aborted;
+		}
+	}
+
+	fetch_about_send_finished(ctx);
+
+	return true;
+
+fetch_about_testament_handler_aborted:
+	return false;
+}
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index c039429a5..680e60456 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -38,12 +38,12 @@
 #include <strings.h>
 #include <time.h>
 #include <sys/stat.h>
-#include <openssl/ssl.h>
 
 #include <libwapcaplet/libwapcaplet.h>
 #include <nsutils/time.h>
 
 #include "utils/corestrings.h"
+#include "utils/hashmap.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
 #include "utils/messages.h"
@@ -61,26 +61,149 @@
 #include "content/fetchers/curl.h"
 #include "content/urldb.h"
 
-/** maximum number of progress notifications per second */
+/**
+ * maximum number of progress notifications per second
+ */
 #define UPDATES_PER_SECOND 2
 
-/** maximum number of X509 certificates in chain for TLS connection */
-#define MAX_CERTS 10
+/**
+ * The ciphersuites the browser is prepared to use for TLS1.3
+ */
+#define CIPHER_SUITES						\
+	"TLS_AES_256_GCM_SHA384:"				\
+	"TLS_CHACHA20_POLY1305_SHA256:"				\
+	"TLS_AES_128_GCM_SHA256"
 
-/* the ciphersuites we are willing to use */
+/**
+ * The ciphersuites the browser is prepared to use for TLS<1.3
+ */
 #define CIPHER_LIST						\
 	/* disable everything */				\
 	"-ALL:"							\
-	/* enable TLSv1.2 PFS suites */				\
-	"EECDH+AES+TLSv1.2:EDH+AES+TLSv1.2:"			\
-	/* enable PFS AES GCM suites */				\
-	"EECDH+AESGCM:EDH+AESGCM:"				\
-	/* Enable PFS AES CBC suites */				\
-	"EECDH+AES:EDH+AES:"					\
-	/* Enable non-PFS fallback suite */			\
-	"AES128-SHA:"						\
-	/* Remove any PFS suites using weak DSA key exchange */	\
-	"-DSS"
+	/* enable TLSv1.2 ECDHE AES GCM suites */		\
+	"EECDH+AESGCM+TLSv1.2:"					\
+	/* enable ECDHE CHACHA20/POLY1305 suites */		\
+	"EECDH+CHACHA20:"					\
+	/* Sort above by strength */				\
+	"@STRENGTH:"						\
+	/* enable ECDHE (auth=RSA, mac=SHA1) AES CBC suites */	\
+	"EECDH+aRSA+AES+SHA1"
+
+/**
+ * The legacy cipher suites the browser is prepared to use for TLS<1.3
+ */
+#define CIPHER_LIST_LEGACY					\
+	/* as above */						\
+	CIPHER_LIST":"						\
+	/* enable (non-PFS) RSA AES GCM suites */		\
+	"RSA+AESGCM:"						\
+	/* enable (non-PFS) RSA (mac=SHA1) AES CBC suites */	\
+	"RSA+AES+SHA1"
+
+/* Open SSL compatability for certificate handling */
+#ifdef WITH_OPENSSL
+
+#include <openssl/ssl.h>
+#include <openssl/x509v3.h>
+
+#else /* WITH_OPENSSL */
+
+typedef char X509;
+
+static void X509_free(X509 *cert)
+{
+	free(cert);
+}
+
+#endif /* WITH_OPENSSL */
+
+/* SSL certificate chain cache */
+
+/* We're only interested in the hostname and port */
+static uint32_t
+curl_fetch_ssl_key_hash(void *key)
+{
+	nsurl *url = key;
+	lwc_string *hostname = nsurl_get_component(url, NSURL_HOST);
+	lwc_string *port = nsurl_get_component(url, NSURL_PORT);
+	uint32_t hash;
+
+	if (port == NULL)
+		port = lwc_string_ref(corestring_lwc_443);
+
+	hash = lwc_string_hash_value(hostname) ^ lwc_string_hash_value(port);
+
+	lwc_string_unref(hostname);
+	lwc_string_unref(port);
+
+	return hash;
+}
+
+/* We only compare the hostname and port */
+static bool
+curl_fetch_ssl_key_eq(void *key1, void *key2)
+{
+	nsurl *url1 = key1;
+	nsurl *url2 = key2;
+	lwc_string *hostname1 = nsurl_get_component(url1, NSURL_HOST);
+	lwc_string *hostname2 = nsurl_get_component(url2, NSURL_HOST);
+	lwc_string *port1 = nsurl_get_component(url1, NSURL_PORT);
+	lwc_string *port2 = nsurl_get_component(url2, NSURL_PORT);
+	bool iseq = false;
+
+	if (port1 == NULL)
+		port1 = lwc_string_ref(corestring_lwc_443);
+	if (port2 == NULL)
+		port2 = lwc_string_ref(corestring_lwc_443);
+
+	if (lwc_string_isequal(hostname1, hostname2, &iseq) != lwc_error_ok ||
+			iseq == false)
+		goto out;
+
+	iseq = false;
+	if (lwc_string_isequal(port1, port2, &iseq) != lwc_error_ok)
+		goto out;
+
+out:
+	lwc_string_unref(hostname1);
+	lwc_string_unref(hostname2);
+	lwc_string_unref(port1);
+	lwc_string_unref(port2);
+
+	return iseq;
+}
+
+static void *
+curl_fetch_ssl_value_alloc(void *key)
+{
+	struct cert_chain *out;
+
+	if (cert_chain_alloc(0, &out) != NSERROR_OK) {
+		return NULL;
+	}
+
+	return out;
+}
+
+static void
+curl_fetch_ssl_value_destroy(void *value)
+{
+	struct cert_chain *chain = value;
+	if (cert_chain_free(chain) != NSERROR_OK) {
+		NSLOG(netsurf, WARNING, "Problem freeing SSL certificate chain");
+	}
+}
+
+static hashmap_parameters_t curl_fetch_ssl_hashmap_parameters = {
+	.key_clone = (hashmap_key_clone_t)nsurl_ref,
+	.key_destroy = (hashmap_key_destroy_t)nsurl_unref,
+	.key_eq = curl_fetch_ssl_key_eq,
+	.key_hash = curl_fetch_ssl_key_hash,
+	.value_alloc = curl_fetch_ssl_value_alloc,
+	.value_destroy = curl_fetch_ssl_value_destroy,
+};
+
+static hashmap_t *curl_fetch_ssl_hashmap = NULL;
 
 /** SSL certificate info */
 struct cert_info {
@@ -88,15 +211,36 @@ struct cert_info {
 	long err;		/**< OpenSSL error code */
 };
 
+#if LIBCURL_VERSION_NUM >= 0x072000 /* 7.32.0 depricated CURLOPT_PROGRESSFUNCTION*/
+#define NSCURLOPT_PROGRESS_FUNCTION CURLOPT_XFERINFOFUNCTION
+#define NSCURLOPT_PROGRESS_DATA CURLOPT_XFERINFODATA
+#define NSCURL_PROGRESS_T curl_off_t
+#else
+#define NSCURLOPT_PROGRESS_FUNCTION CURLOPT_PROGRESSFUNCTION
+#define NSCURLOPT_PROGRESS_DATA CURLOPT_PROGRESSDATA
+#define NSCURL_PROGRESS_T double
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x073800 /* 7.56.0 depricated curl_formadd */
+#define NSCURL_POSTDATA_T curl_mime
+#define NSCURL_POSTDATA_CURLOPT CURLOPT_MIMEPOST
+#define NSCURL_POSTDATA_FREE(x) curl_mime_free(x)
+#else
+#define NSCURL_POSTDATA_T struct curl_httppost
+#define NSCURL_POSTDATA_CURLOPT CURLOPT_HTTPPOST
+#define NSCURL_POSTDATA_FREE(x) curl_formfree(x)
+#endif
+
 /** Information for a single fetch. */
 struct curl_fetch_info {
 	struct fetch *fetch_handle; /**< The fetch handle we're parented by. */
 	CURL * curl_handle;	/**< cURL handle if being fetched, or 0. */
+	bool sent_ssl_chain;	/**< Have we tried to send the SSL chain */
 	bool had_headers;	/**< Headers have been processed. */
 	bool abort;		/**< Abort requested. */
 	bool stopped;		/**< Download stopped on purpose. */
 	bool only_2xx;		/**< Only HTTP 2xx responses acceptable. */
-	bool downgrade_tls;	/**< Downgrade to TLS <= 1.0 */
+	bool downgrade_tls;	/**< Downgrade to TLS 1.2 */
 	nsurl *url;		/**< URL of this fetch. */
 	lwc_string *host;	/**< The hostname of this fetch. */
 	struct curl_slist *headers;	/**< List of request headers. */
@@ -104,12 +248,14 @@ struct curl_fetch_info {
 	unsigned long content_length;	/**< Response Content-Length, or 0. */
 	char *cookie_string;	/**< Cookie string for this fetch */
 	char *realm;		/**< HTTP Auth Realm */
-	char *post_urlenc;	/**< Url encoded POST string, or 0. */
+	struct fetch_postdata *postdata; /**< POST data */
+	NSCURL_POSTDATA_T *curl_postdata; /**< POST data in curl representation */
+
 	long http_code; /**< HTTP result code from cURL. */
-	struct curl_httppost *post_multipart;	/**< Multipart post data, or 0. */
+
 	uint64_t last_progress_update;	/**< Time of last progress update */
 	int cert_depth; /**< deepest certificate in use */
-	struct cert_info cert_data[MAX_CERTS];	/**< HTTPS certificate data */
+	struct cert_info cert_data[MAX_CERT_DEPTH]; /**< HTTPS certificate data */
 };
 
 /** curl handle cache entry */
@@ -146,28 +292,6 @@ static char fetch_proxy_userpwd[100];
 static bool inside_curl = false;
 
 
-/* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed
- * LibreSSL declares its OpenSSL version as 2.1 but only supports the old way
- */
-#if (defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x1010000fL))
-static int ns_X509_up_ref(X509 *cert)
-{
-	cert->references++;
-	return 1;
-}
-
-static void ns_X509_free(X509 *cert)
-{
-	cert->references--;
-	if (cert->references == 0) {
-		X509_free(cert);
-	}
-}
-#else
-#define ns_X509_up_ref X509_up_ref
-#define ns_X509_free X509_free
-#endif
-
 /**
  * Initialise a cURL fetcher.
  */
@@ -206,6 +330,10 @@ static void fetch_curl_finalise(lwc_string *scheme)
 			      "curl_multi_cleanup failed: ignoring");
 
 		curl_global_cleanup();
+
+		NSLOG(netsurf, DEBUG, "Cleaning up SSL cert chain hashmap");
+		hashmap_destroy(curl_fetch_ssl_hashmap);
+		curl_fetch_ssl_hashmap = NULL;
 	}
 
 	/* Free anything remaining in the cached curl handle ring */
@@ -231,85 +359,95 @@ static bool fetch_curl_can_fetch(const nsurl *url)
 }
 
 
+
 /**
- * Convert a list of struct ::fetch_multipart_data to a list of
- * struct curl_httppost for libcurl.
+ * allocate postdata
  */
-static struct curl_httppost *
-fetch_curl_post_convert(const struct fetch_multipart_data *control)
+static struct fetch_postdata *
+fetch_curl_alloc_postdata(const char *post_urlenc,
+			  const struct fetch_multipart_data *post_multipart)
 {
-	struct curl_httppost *post = 0, *last = 0;
-	CURLFORMcode code;
-	nserror ret;
-
-	for (; control; control = control->next) {
-		if (control->file) {
-			char *leafname = NULL;
-			ret = guit->file->basename(control->value, &leafname, NULL);
-			if (ret != NSERROR_OK) {
-				continue;
+	struct fetch_postdata *postdata;
+	postdata = calloc(1, sizeof(struct fetch_postdata));
+	if (postdata != NULL) {
+
+		if (post_urlenc) {
+			postdata->type = FETCH_POSTDATA_URLENC;
+			postdata->data.urlenc = strdup(post_urlenc);
+			if (postdata->data.urlenc == NULL) {
+				free(postdata);
+				postdata = NULL;
 			}
-
-			/* We have to special case filenames of "", so curl
-			 * a) actually attempts the fetch and
-			 * b) doesn't attempt to open the file ""
-			 */
-			if (control->value[0] == '\0') {
-				/* dummy buffer - needs to be static so
-				 * pointer's still valid when we go out
-				 * of scope (not that libcurl should be
-				 * attempting to access it, of course).
-				 */
-				static char buf;
-
-				code = curl_formadd(&post, &last,
-					CURLFORM_COPYNAME, control->name,
-					CURLFORM_BUFFER, control->value,
-					/* needed, as basename("") == "." */
-					CURLFORM_FILENAME, "",
-					CURLFORM_BUFFERPTR, &buf,
-					CURLFORM_BUFFERLENGTH, 0,
-					CURLFORM_CONTENTTYPE,
-						"application/octet-stream",
-					CURLFORM_END);
-				if (code != CURL_FORMADD_OK)
-					NSLOG(netsurf, INFO,
-					      "curl_formadd: %d (%s)", code,
-					      control->name);
-			} else {
-				char *mimetype = guit->fetch->mimetype(control->value);
-				code = curl_formadd(&post, &last,
-					CURLFORM_COPYNAME, control->name,
-					CURLFORM_FILE, control->rawfile,
-					CURLFORM_FILENAME, leafname,
-					CURLFORM_CONTENTTYPE,
-					(mimetype != 0 ? mimetype : "text/plain"),
-					CURLFORM_END);
-				if (code != CURL_FORMADD_OK)
-					NSLOG(netsurf, INFO,
-					      "curl_formadd: %d (%s=%s)",
-					      code,
-					      control->name,
-					      control->value);
-				free(mimetype);
+		} else if (post_multipart) {
+			postdata->type = FETCH_POSTDATA_MULTIPART;
+			postdata->data.multipart = fetch_multipart_data_clone(post_multipart);
+			if (postdata->data.multipart == NULL) {
+				free(postdata);
+				postdata = NULL;
 			}
-			free(leafname);
-		}
-		else {
-			code = curl_formadd(&post, &last,
-					CURLFORM_COPYNAME, control->name,
-					CURLFORM_COPYCONTENTS, control->value,
-					CURLFORM_END);
-			if (code != CURL_FORMADD_OK)
-				NSLOG(netsurf, INFO,
-				      "curl_formadd: %d (%s=%s)", code,
-				      control->name, control->value);
+		} else {
+			postdata->type = FETCH_POSTDATA_NONE;
 		}
 	}
+	return postdata;
+}
 
-	return post;
+/**
+ * free postdata
+ */
+static void fetch_curl_free_postdata(struct fetch_postdata *postdata)
+{
+	if (postdata != NULL) {
+		switch (postdata->type) {
+		case FETCH_POSTDATA_NONE:
+			break;
+		case FETCH_POSTDATA_URLENC:
+			free(postdata->data.urlenc);
+			break;
+		case FETCH_POSTDATA_MULTIPART:
+			fetch_multipart_data_destroy(postdata->data.multipart);
+			break;
+		}
+
+		free(postdata);
+	}
 }
 
+/**
+ *construct a new fetch structure
+ */
+static struct curl_fetch_info *fetch_alloc(void)
+{
+	struct curl_fetch_info *fetch;
+	fetch = malloc(sizeof (*fetch));
+	if (fetch == NULL)
+		return NULL;
+
+	fetch->curl_handle = NULL;
+	fetch->sent_ssl_chain = false;
+	fetch->had_headers = false;
+	fetch->abort = false;
+	fetch->stopped = false;
+	fetch->only_2xx = false;
+	fetch->downgrade_tls = false;
+	fetch->headers = NULL;
+	fetch->url = NULL;
+	fetch->host = NULL;
+	fetch->location = NULL;
+	fetch->content_length = 0;
+	fetch->http_code = 0;
+	fetch->cookie_string = NULL;
+	fetch->realm = NULL;
+	fetch->last_progress_update = 0;
+	fetch->postdata = NULL;
+	fetch->curl_postdata = NULL;
+
+	/* Clear certificate chain data */
+	memset(fetch->cert_data, 0, sizeof(fetch->cert_data));
+	fetch->cert_depth = -1;
+
+	return fetch;
+}
 
 /**
  * Start fetching data for the given URL.
@@ -345,45 +483,22 @@ fetch_curl_setup(struct fetch *parent_fetch,
 	struct curl_slist *slist;
 	int i;
 
-	fetch = malloc(sizeof (*fetch));
+	fetch = fetch_alloc();
 	if (fetch == NULL)
-		return 0;
-
-	fetch->fetch_handle = parent_fetch;
+		return NULL;
 
 	NSLOG(netsurf, INFO, "fetch %p, url '%s'", fetch, nsurl_access(url));
 
-	/* construct a new fetch structure */
-	fetch->curl_handle = NULL;
-	fetch->had_headers = false;
-	fetch->abort = false;
-	fetch->stopped = false;
 	fetch->only_2xx = only_2xx;
 	fetch->downgrade_tls = downgrade_tls;
-	fetch->headers = NULL;
+	fetch->fetch_handle = parent_fetch;
 	fetch->url = nsurl_ref(url);
 	fetch->host = nsurl_get_component(url, NSURL_HOST);
-	fetch->location = NULL;
-	fetch->content_length = 0;
-	fetch->http_code = 0;
-	fetch->cookie_string = NULL;
-	fetch->realm = NULL;
-	fetch->post_urlenc = NULL;
-	fetch->post_multipart = NULL;
-	if (post_urlenc) {
-		fetch->post_urlenc = strdup(post_urlenc);
-	} else if (post_multipart) {
-		fetch->post_multipart = fetch_curl_post_convert(post_multipart);
+	if (fetch->host == NULL) {
+		goto failed;
 	}
-	fetch->last_progress_update = 0;
-
-	/* TLS defaults */
-	memset(fetch->cert_data, 0, sizeof(fetch->cert_data));
-	fetch->cert_depth = -1;
-
-	if ((fetch->host == NULL) ||
-	    (post_multipart != NULL && fetch->post_multipart == NULL) ||
-	    (post_urlenc != NULL && fetch->post_urlenc == NULL)) {
+	fetch->postdata = fetch_curl_alloc_postdata(post_urlenc, post_multipart);
+	if (fetch->postdata == NULL) {
 		goto failed;
 	}
 
@@ -436,15 +551,141 @@ failed:
 		lwc_string_unref(fetch->host);
 
 	nsurl_unref(fetch->url);
-	free(fetch->post_urlenc);
-	if (fetch->post_multipart)
-		curl_formfree(fetch->post_multipart);
+	fetch_curl_free_postdata(fetch->postdata);
 	curl_slist_free_all(fetch->headers);
 	free(fetch);
 	return NULL;
 }
 
 
+#ifdef WITH_OPENSSL
+
+/**
+ * Retrieve the ssl cert chain for the fetch, creating a blank one if needed
+ */
+static struct cert_chain *
+fetch_curl_get_cached_chain(struct curl_fetch_info *f)
+{
+	struct cert_chain *chain;
+
+	chain = hashmap_lookup(curl_fetch_ssl_hashmap, f->url);
+	if (chain == NULL) {
+		chain = hashmap_insert(curl_fetch_ssl_hashmap, f->url);
+	}
+
+	return chain;
+}
+
+/**
+ * Report the certificate information in the fetch to the users
+ */
+static void
+fetch_curl_store_certs_in_cache(struct curl_fetch_info *f)
+{
+	size_t depth;
+	BIO *mem;
+	BUF_MEM *buf[MAX_CERT_DEPTH];
+	struct cert_chain chain, *cached_chain;
+	struct cert_info *certs;
+
+	memset(&chain, 0, sizeof(chain));
+
+	certs = f->cert_data;
+	chain.depth = f->cert_depth + 1; /* 0 indexed certificate depth */
+
+	for (depth = 0; depth < chain.depth; depth++) {
+		if (certs[depth].cert == NULL) {
+			/* This certificate is missing, skip it */
+			chain.certs[depth].err = SSL_CERT_ERR_CERT_MISSING;
+			continue;
+		}
+
+		/* error code (if any) */
+		switch (certs[depth].err) {
+		case X509_V_OK:
+			chain.certs[depth].err = SSL_CERT_ERR_OK;
+			break;
+
+		case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
+			/* fallthrough */
+		case X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY:
+			chain.certs[depth].err = SSL_CERT_ERR_BAD_ISSUER;
+			break;
+
+		case X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE:
+			/* fallthrough */
+		case X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE:
+			/* fallthrough */
+		case X509_V_ERR_CERT_SIGNATURE_FAILURE:
+			/* fallthrough */
+		case X509_V_ERR_CRL_SIGNATURE_FAILURE:
+			chain.certs[depth].err = SSL_CERT_ERR_BAD_SIG;
+			break;
+
+		case X509_V_ERR_CERT_NOT_YET_VALID:
+			/* fallthrough */
+		case X509_V_ERR_CRL_NOT_YET_VALID:
+			chain.certs[depth].err = SSL_CERT_ERR_TOO_YOUNG;
+			break;
+
+		case X509_V_ERR_CERT_HAS_EXPIRED:
+			/* fallthrough */
+		case X509_V_ERR_CRL_HAS_EXPIRED:
+			chain.certs[depth].err = SSL_CERT_ERR_TOO_OLD;
+			break;
+
+		case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+			chain.certs[depth].err = SSL_CERT_ERR_SELF_SIGNED;
+			break;
+
+		case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN:
+			chain.certs[depth].err = SSL_CERT_ERR_CHAIN_SELF_SIGNED;
+			break;
+
+		case X509_V_ERR_CERT_REVOKED:
+			chain.certs[depth].err = SSL_CERT_ERR_REVOKED;
+			break;
+
+		case X509_V_ERR_HOSTNAME_MISMATCH:
+			chain.certs[depth].err = SSL_CERT_ERR_HOSTNAME_MISMATCH;
+			break;
+
+		default:
+			chain.certs[depth].err = SSL_CERT_ERR_UNKNOWN;
+			break;
+		}
+
+		/*
+		 * get certificate in Distinguished Encoding Rules (DER) format.
+		 */
+		mem = BIO_new(BIO_s_mem());
+		i2d_X509_bio(mem, certs[depth].cert);
+		BIO_get_mem_ptr(mem, &buf[depth]);
+		(void) BIO_set_close(mem, BIO_NOCLOSE);
+		BIO_free(mem);
+
+		chain.certs[depth].der = (uint8_t *)buf[depth]->data;
+		chain.certs[depth].der_length = buf[depth]->length;
+	}
+
+	/* Now dup that chain into the cache */
+	cached_chain = fetch_curl_get_cached_chain(f);
+	if (cert_chain_dup_into(&chain, cached_chain) != NSERROR_OK) {
+		/* Something went wrong storing the chain, give up */
+		hashmap_remove(curl_fetch_ssl_hashmap, f->url);
+	}
+
+	/* release the openssl memory buffer */
+	for (depth = 0; depth < chain.depth; depth++) {
+		if (chain.certs[depth].err == SSL_CERT_ERR_CERT_MISSING) {
+			continue;
+		}
+		if (buf[depth] != NULL) {
+			BUF_MEM_free(buf[depth]);
+		}
+	}
+}
+
 /**
  * OpenSSL Certificate verification callback
  *
@@ -473,24 +714,24 @@ fetch_curl_verify_callback(int verify_ok, X509_STORE_CTX *x509_ctx)
 	depth = X509_STORE_CTX_get_error_depth(x509_ctx);
 	fetch = X509_STORE_CTX_get_app_data(x509_ctx);
 
-	/* record the max depth */
-	if (depth > fetch->cert_depth) {
-		fetch->cert_depth = depth;
-	}
-
 	/* certificate chain is excessively deep so fail verification */
-	if (depth >= MAX_CERTS) {
+	if (depth >= MAX_CERT_DEPTH) {
 		X509_STORE_CTX_set_error(x509_ctx,
 					 X509_V_ERR_CERT_CHAIN_TOO_LONG);
 		return 0;
 	}
 
+	/* record the max depth */
+	if (depth > fetch->cert_depth) {
+		fetch->cert_depth = depth;
+	}
+
 	/* save the certificate by incrementing the reference count and
 	 * keeping a pointer.
 	 */
 	if (!fetch->cert_data[depth].cert) {
 		fetch->cert_data[depth].cert = X509_STORE_CTX_get_current_cert(x509_ctx);
-		ns_X509_up_ref(fetch->cert_data[depth].cert);
+		X509_up_ref(fetch->cert_data[depth].cert);
 		fetch->cert_data[depth].err = X509_STORE_CTX_get_error(x509_ctx);
 	}
 
@@ -524,16 +765,30 @@ fetch_curl_verify_callback(int verify_ok, X509_STORE_CTX *x509_ctx)
  */
 static int fetch_curl_cert_verify_callback(X509_STORE_CTX *x509_ctx, void *parm)
 {
+	struct curl_fetch_info *f = (struct curl_fetch_info *) parm;
 	int ok;
+	X509_VERIFY_PARAM *vparam;
+
+	/* Configure the verification parameters to include hostname */
+	vparam = X509_STORE_CTX_get0_param(x509_ctx);
+	X509_VERIFY_PARAM_set_hostflags(vparam, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
+
+	ok = X509_VERIFY_PARAM_set1_host(vparam,
+					 lwc_string_data(f->host),
+					 lwc_string_length(f->host));
 
 	/* Store fetch struct in context for verify callback */
-	ok = X509_STORE_CTX_set_app_data(x509_ctx, parm);
+	if (ok) {
+		ok = X509_STORE_CTX_set_app_data(x509_ctx, parm);
+	}
 
 	/* verify the certificate chain using standard call */
 	if (ok) {
 		ok = X509_verify_cert(x509_ctx);
 	}
 
+	fetch_curl_store_certs_in_cache(f);
+
 	return ok;
 }
 
@@ -551,7 +806,8 @@ fetch_curl_sslctxfun(CURL *curl_handle, void *_sslctx, void *parm)
 {
 	struct curl_fetch_info *f = (struct curl_fetch_info *) parm;
 	SSL_CTX *sslctx = _sslctx;
-	long options = SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
+	long options = SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
+			SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1;
 
 	/* set verify callback for each certificate in chain */
 	SSL_CTX_set_verify(sslctx, SSL_VERIFY_PEER, fetch_curl_verify_callback);
@@ -562,19 +818,14 @@ fetch_curl_sslctxfun(CURL *curl_handle, void *_sslctx, void *parm)
 					 parm);
 
 	if (f->downgrade_tls) {
-		/* Disable TLS 1.1/1.2 if the server can't cope with them */
-#ifdef SSL_OP_NO_TLSv1_1
-		options |= SSL_OP_NO_TLSv1_1;
-#endif
-#ifdef SSL_OP_NO_TLSv1_2
-		options |= SSL_OP_NO_TLSv1_2;
+		/* Disable TLS 1.3 if the server can't cope with it */
+#ifdef SSL_OP_NO_TLSv1_3
+		options |= SSL_OP_NO_TLSv1_3;
 #endif
 #ifdef SSL_MODE_SEND_FALLBACK_SCSV
 		/* Ensure server rejects the connection if downgraded too far */
 		SSL_CTX_set_mode(sslctx, SSL_MODE_SEND_FALLBACK_SCSV);
 #endif
-		/* Disable TLS1.2 ciphersuites */
-		SSL_CTX_set_cipher_list(sslctx, CIPHER_LIST ":-TLSv1.2");
 	}
 
 	SSL_CTX_set_options(sslctx, options);
@@ -587,6 +838,326 @@ fetch_curl_sslctxfun(CURL *curl_handle, void *_sslctx, void *parm)
 }
 
 
+#endif /* WITH_OPENSSL */
+
+
+/**
+ * Report the certificate information in the fetch to the users
+ */
+static void
+fetch_curl_report_certs_upstream(struct curl_fetch_info *f)
+{
+	fetch_msg msg;
+	struct cert_chain *chain;
+
+	chain = hashmap_lookup(curl_fetch_ssl_hashmap, f->url);
+
+	if (chain != NULL) {
+		msg.type = FETCH_CERTS;
+		msg.data.chain = chain;
+
+		fetch_send_callback(&msg, f->fetch_handle);
+	}
+
+	f->sent_ssl_chain = true;
+}
+
+#if LIBCURL_VERSION_NUM >= 0x073800 /* 7.56.0 depricated curl_formadd */
+
+/**
+ * curl mime data context
+ */
+struct curl_mime_ctx {
+	char *buffer;
+	curl_off_t size;
+	curl_off_t position;
+};
+
+static size_t mime_data_read_callback(char *buffer, size_t size, size_t nitems, void *arg)
+{
+	struct curl_mime_ctx *mctx = (struct curl_mime_ctx *) arg;
+	curl_off_t sz = mctx->size - mctx->position;
+
+	nitems *= size;
+	if(sz > (curl_off_t)nitems) {
+		sz = nitems;
+	}
+	if(sz) {
+		memcpy(buffer, mctx->buffer + mctx->position, sz);
+	}
+	mctx->position += sz;
+	return sz;
+}
+
+static int mime_data_seek_callback(void *arg, curl_off_t offset, int origin)
+{
+	struct curl_mime_ctx *mctx = (struct curl_mime_ctx *) arg;
+
+	switch(origin) {
+	case SEEK_END:
+		offset += mctx->size;
+		break;
+	case SEEK_CUR:
+		offset += mctx->position;
+		break;
+	}
+
+	if(offset < 0) {
+		return CURL_SEEKFUNC_FAIL;
+	}
+	mctx->position = offset;
+	return CURL_SEEKFUNC_OK;
+}
+
+static void mime_data_free_callback(void *arg)
+{
+	struct curl_mime_ctx *mctx = (struct curl_mime_ctx *) arg;
+	free(mctx);
+}
+
+/**
+ * Convert a POST data list to a libcurl curl_mime.
+ *
+ * \param chandle curl fetch handle.
+ * \param multipart limked list of struct ::fetch_multipart forming post data.
+ */
+static curl_mime *
+fetch_curl_postdata_convert(CURL *chandle,
+			    const struct fetch_multipart_data *multipart)
+{
+	curl_mime *cmime;
+	curl_mimepart *part;
+	CURLcode code = CURLE_OK;
+	size_t value_len;
+
+	cmime = curl_mime_init(chandle);
+	if (cmime == NULL) {
+		NSLOG(netsurf, WARNING, "postdata conversion failed to curl mime context");
+		return NULL;
+	}
+
+	/* iterate post data */
+	for (; multipart != NULL; multipart = multipart->next) {
+		part = curl_mime_addpart(cmime);
+		if (part == NULL) {
+			goto convert_failed;
+		}
+
+		code = curl_mime_name(part, multipart->name);
+		if (code != CURLE_OK) {
+			goto convert_failed;
+		}
+
+		value_len = strlen(multipart->value);
+
+		if (multipart->file && value_len==0) {
+			/* file entries with no filename require special handling */
+			code=curl_mime_data(part, multipart->value, value_len);
+			if (code != CURLE_OK) {
+				goto convert_failed;
+			}
+
+			code = curl_mime_filename(part, "");
+			if (code != CURLE_OK) {
+				goto convert_failed;
+			}
+
+			code = curl_mime_type(part, "application/octet-stream");
+			if (code != CURLE_OK) {
+				goto convert_failed;
+			}
+
+		} else if(multipart->file) {
+			/* file entry */
+			nserror ret;
+			char *leafname = NULL;
+			char *mimetype = NULL;
+
+			code = curl_mime_filedata(part, multipart->rawfile);
+			if (code != CURLE_OK) {
+				goto convert_failed;
+			}
+
+			ret = guit->file->basename(multipart->value, &leafname, NULL);
+			if (ret != NSERROR_OK) {
+				goto convert_failed;
+			}
+			code = curl_mime_filename(part, leafname);
+			free(leafname);
+			if (code != CURLE_OK) {
+				goto convert_failed;
+			}
+
+			mimetype = guit->fetch->mimetype(multipart->value);
+			if (mimetype == NULL) {
+				mimetype=strdup("text/plain");
+			}
+			if (mimetype == NULL) {
+				goto convert_failed;
+			}
+			code = curl_mime_type(part, mimetype);
+			free(mimetype);
+			if (code != CURLE_OK) {
+				goto convert_failed;
+			}
+
+		} else {
+			/* make the curl mime reference the existing multipart
+			 * data which requires use of a callback and context.
+			 */
+			struct curl_mime_ctx *cb_ctx;
+			cb_ctx = malloc(sizeof(struct curl_mime_ctx));
+			if (cb_ctx == NULL) {
+				goto convert_failed;
+			}
+			cb_ctx->buffer = multipart->value;
+			cb_ctx->size = value_len;
+			cb_ctx->position = 0;
+			code = curl_mime_data_cb(part,
+						 value_len,
+						 mime_data_read_callback,
+						 mime_data_seek_callback,
+						 mime_data_free_callback,
+						 cb_ctx);
+			if (code != CURLE_OK) {
+				free(cb_ctx);
+				goto convert_failed;
+			}
+		}
+	}
+
+	return cmime;
+
+convert_failed:
+	NSLOG(netsurf, WARNING, "postdata conversion failed with curl code: %d", code);
+	curl_mime_free(cmime);
+	return NULL;
+}
+
+#else /* LIBCURL_VERSION_NUM >= 0x073800 */
+
+/**
+ * Convert a list of struct ::fetch_multipart_data to a list of
+ * struct curl_httppost for libcurl.
+ */
+static struct curl_httppost *
+fetch_curl_postdata_convert(CURL *chandle,
+			    const struct fetch_multipart_data *control)
+{
+	struct curl_httppost *post = NULL, *last = NULL;
+	CURLFORMcode code;
+	nserror ret;
+
+	for (; control; control = control->next) {
+		if (control->file) {
+			char *leafname = NULL;
+			ret = guit->file->basename(control->value, &leafname, NULL);
+			if (ret != NSERROR_OK) {
+				continue;
+			}
+
+			/* We have to special case filenames of "", so curl
+			 * a) actually attempts the fetch and
+			 * b) doesn't attempt to open the file ""
+			 */
+			if (control->value[0] == '\0') {
+				/* dummy buffer - needs to be static so
+				 * pointer's still valid when we go out
+				 * of scope (not that libcurl should be
+				 * attempting to access it, of course).
+				 */
+				static char buf;
+
+				code = curl_formadd(&post, &last,
+						    CURLFORM_COPYNAME, control->name,
+						    CURLFORM_BUFFER, control->value,
+						    /* needed, as basename("") == "." */
+						    CURLFORM_FILENAME, "",
+						    CURLFORM_BUFFERPTR, &buf,
+						    CURLFORM_BUFFERLENGTH, 0,
+						    CURLFORM_CONTENTTYPE,
+						    "application/octet-stream",
+						    CURLFORM_END);
+				if (code != CURL_FORMADD_OK)
+					NSLOG(netsurf, INFO,
+					      "curl_formadd: %d (%s)", code,
+					      control->name);
+			} else {
+				char *mimetype = guit->fetch->mimetype(control->value);
+				code = curl_formadd(&post, &last,
+						    CURLFORM_COPYNAME, control->name,
+						    CURLFORM_FILE, control->rawfile,
+						    CURLFORM_FILENAME, leafname,
+						    CURLFORM_CONTENTTYPE,
+						    (mimetype != 0 ? mimetype : "text/plain"),
+						    CURLFORM_END);
+				if (code != CURL_FORMADD_OK)
+					NSLOG(netsurf, INFO,
+					      "curl_formadd: %d (%s=%s)",
+					      code,
+					      control->name,
+					      control->value);
+				free(mimetype);
+			}
+			free(leafname);
+		} else {
+			code = curl_formadd(&post, &last,
+					    CURLFORM_COPYNAME, control->name,
+					    CURLFORM_COPYCONTENTS, control->value,
+					    CURLFORM_END);
+			if (code != CURL_FORMADD_OK)
+				NSLOG(netsurf, INFO,
+				      "curl_formadd: %d (%s=%s)", code,
+				      control->name, control->value);
+		}
+	}
+
+	return post;
+}
+
+#endif  /* LIBCURL_VERSION_NUM >= 0x073800 */
+
+/**
+ * Setup multipart post data
+ */
+static CURLcode fetch_curl_set_postdata(struct curl_fetch_info *f)
+{
+	CURLcode code = CURLE_OK;
+
+#undef SETOPT
+#define SETOPT(option, value) { \
+	code = curl_easy_setopt(f->curl_handle, option, value);	\
+	if (code != CURLE_OK)					\
+		return code;					\
+	}
+
+	switch (f->postdata->type) {
+	case FETCH_POSTDATA_NONE:
+		SETOPT(CURLOPT_POSTFIELDS, NULL);
+		SETOPT(NSCURL_POSTDATA_CURLOPT, NULL);
+		SETOPT(CURLOPT_HTTPGET, 1L);
+		break;
+
+	case FETCH_POSTDATA_URLENC:
+		SETOPT(NSCURL_POSTDATA_CURLOPT, NULL);
+		SETOPT(CURLOPT_HTTPGET, 0L);
+		SETOPT(CURLOPT_POSTFIELDS, f->postdata->data.urlenc);
+		break;
+
+	case FETCH_POSTDATA_MULTIPART:
+		SETOPT(CURLOPT_POSTFIELDS, NULL);
+		SETOPT(CURLOPT_HTTPGET, 0L);
+		if (f->curl_postdata == NULL) {
+			f->curl_postdata =
+				fetch_curl_postdata_convert(f->curl_handle,
+							    f->postdata->data.multipart);
+		}
+		SETOPT(NSCURL_POSTDATA_CURLOPT, f->curl_postdata);
+		break;
+	}
+	return code;
+}
+
 /**
  * Set options specific for a fetch.
  *
@@ -609,21 +1180,11 @@ static CURLcode fetch_curl_set_options(struct curl_fetch_info *f)
 	SETOPT(CURLOPT_PRIVATE, f);
 	SETOPT(CURLOPT_WRITEDATA, f);
 	SETOPT(CURLOPT_WRITEHEADER, f);
-	SETOPT(CURLOPT_PROGRESSDATA, f);
-	SETOPT(CURLOPT_REFERER, fetch_get_referer_to_send(f->fetch_handle));
+	SETOPT(NSCURLOPT_PROGRESS_DATA, f);
 	SETOPT(CURLOPT_HTTPHEADER, f->headers);
-	if (f->post_urlenc) {
-		SETOPT(CURLOPT_HTTPPOST, NULL);
-		SETOPT(CURLOPT_HTTPGET, 0L);
-		SETOPT(CURLOPT_POSTFIELDS, f->post_urlenc);
-	} else if (f->post_multipart) {
-		SETOPT(CURLOPT_POSTFIELDS, NULL);
-		SETOPT(CURLOPT_HTTPGET, 0L);
-		SETOPT(CURLOPT_HTTPPOST, f->post_multipart);
-	} else {
-		SETOPT(CURLOPT_POSTFIELDS, NULL);
-		SETOPT(CURLOPT_HTTPPOST, NULL);
-		SETOPT(CURLOPT_HTTPGET, 1L);
+	code = fetch_curl_set_postdata(f);
+	if (code != CURLE_OK) {
+		return code;
 	}
 
 	f->cookie_string = urldb_get_cookie(f->url, true);
@@ -634,7 +1195,7 @@ static CURLcode fetch_curl_set_options(struct curl_fetch_info *f)
 	}
 
 	if ((auth = urldb_get_auth_details(f->url, NULL)) != NULL) {
-		SETOPT(CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+		SETOPT(CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
 		SETOPT(CURLOPT_USERPWD, auth);
 	} else {
 		SETOPT(CURLOPT_USERPWD, NULL);
@@ -670,6 +1231,12 @@ static CURLcode fetch_curl_set_options(struct curl_fetch_info *f)
 		SETOPT(CURLOPT_PROXY, NULL);
 	}
 
+
+	if (curl_with_openssl) {
+		SETOPT(CURLOPT_SSL_CIPHER_LIST,
+			f->downgrade_tls ? CIPHER_LIST_LEGACY : CIPHER_LIST);
+	}
+
 	/* Force-enable SSL session ID caching, as some distros are odd. */
 	SETOPT(CURLOPT_SSL_SESSIONID_CACHE, 1);
 
@@ -685,10 +1252,12 @@ static CURLcode fetch_curl_set_options(struct curl_fetch_info *f)
 		/* do verification */
 		SETOPT(CURLOPT_SSL_VERIFYPEER, 1L);
 		SETOPT(CURLOPT_SSL_VERIFYHOST, 2L);
+#ifdef WITH_OPENSSL
 		if (curl_with_openssl) {
 			SETOPT(CURLOPT_SSL_CTX_FUNCTION, fetch_curl_sslctxfun);
 			SETOPT(CURLOPT_SSL_CTX_DATA, f);
 		}
+#endif
 	}
 
 	return CURLE_OK;
@@ -813,23 +1382,6 @@ static void fetch_curl_cache_handle(CURL *handle, lwc_string *host)
 
 
 /**
- * Abort a fetch.
- */
-static void fetch_curl_abort(void *vf)
-{
-	struct curl_fetch_info *f = (struct curl_fetch_info *)vf;
-	assert(f);
-	NSLOG(netsurf, INFO, "fetch %p, url '%s'", f, nsurl_access(f->url));
-	if (f->curl_handle) {
-		f->abort = true;
-	} else {
-		fetch_remove_from_queues(f->fetch_handle);
-		fetch_free(f->fetch_handle);
-	}
-}
-
-
-/**
  * Clean up the provided fetch object and free it.
  *
  * Will prod the queue afterwards to allow pending requests to be initiated.
@@ -856,6 +1408,30 @@ static void fetch_curl_stop(struct curl_fetch_info *f)
 
 
 /**
+ * Abort a fetch.
+ */
+static void fetch_curl_abort(void *vf)
+{
+	struct curl_fetch_info *f = (struct curl_fetch_info *)vf;
+	assert(f);
+	NSLOG(netsurf, INFO, "fetch %p, url '%s'", f, nsurl_access(f->url));
+	if (f->curl_handle) {
+		if (inside_curl) {
+			NSLOG(netsurf, DEBUG, "Deferring cleanup");
+			f->abort = true;
+		} else {
+			NSLOG(netsurf, DEBUG, "Immediate abort");
+			fetch_curl_stop(f);
+			fetch_free(f->fetch_handle);
+		}
+	} else {
+		fetch_remove_from_queues(f->fetch_handle);
+		fetch_free(f->fetch_handle);
+	}
+}
+
+
+/**
  * Free a fetch structure and associated resources.
  */
 static void fetch_curl_free(void *vf)
@@ -874,13 +1450,14 @@ static void fetch_curl_free(void *vf)
 	if (f->headers) {
 		curl_slist_free_all(f->headers);
 	}
-	free(f->post_urlenc);
-	if (f->post_multipart) {
-		curl_formfree(f->post_multipart);
-	}
+	fetch_curl_free_postdata(f->postdata);
+	NSCURL_POSTDATA_FREE(f->curl_postdata);
 
-	for (i = 0; i < MAX_CERTS && f->cert_data[i].cert; i++) {
-		ns_X509_free(f->cert_data[i].cert);
+	/* free certificate data */
+	for (i = 0; i < MAX_CERT_DEPTH; i++) {
+		if (f->cert_data[i].cert != NULL) {
+			X509_free(f->cert_data[i].cert);
+		}
 	}
 
 	free(f);
@@ -909,7 +1486,7 @@ static bool fetch_curl_process_headers(struct curl_fetch_info *f)
 	http_code = f->http_code;
 	NSLOG(netsurf, INFO, "HTTP status code %li", http_code);
 
-	if (http_code == 304 && !f->post_urlenc && !f->post_multipart) {
+	if ((http_code == 304) && (f->postdata->type==FETCH_POSTDATA_NONE)) {
 		/* Not Modified && GET request */
 		msg.type = FETCH_NOTMODIFIED;
 		fetch_send_callback(&msg, f->fetch_handle);
@@ -948,114 +1525,6 @@ static bool fetch_curl_process_headers(struct curl_fetch_info *f)
 	return false;
 }
 
-/**
- * setup callback to allow the user to examine certificates which have
- * failed to validate during fetch.
- */
-static void
-curl_start_cert_validate(struct curl_fetch_info *f,
-			 struct cert_info *certs)
-{
-	int depth;
-	BIO *mem;
-	BUF_MEM *buf;
-	struct ssl_cert_info ssl_certs[MAX_CERTS];
-	fetch_msg msg;
-
-	for (depth = 0; depth <= f->cert_depth; depth++) {
-		assert(certs[depth].cert != NULL);
-
-		/* get certificate version */
-		ssl_certs[depth].version = X509_get_version(certs[depth].cert);
-
-		/* not before date */
-		mem = BIO_new(BIO_s_mem());
-		ASN1_TIME_print(mem, X509_get_notBefore(certs[depth].cert));
-		BIO_get_mem_ptr(mem, &buf);
-		(void) BIO_set_close(mem, BIO_NOCLOSE);
-		BIO_free(mem);
-		memcpy(ssl_certs[depth].not_before,
-		       buf->data,
-		       min(sizeof(ssl_certs[depth].not_before) - 1,
-			   (unsigned)buf->length));
-		ssl_certs[depth].not_before[min(sizeof(ssl_certs[depth].not_before) - 1,
-					    (unsigned)buf->length)] = 0;
-		BUF_MEM_free(buf);
-
-		/* not after date */
-		mem = BIO_new(BIO_s_mem());
-		ASN1_TIME_print(mem,
-				X509_get_notAfter(certs[depth].cert));
-		BIO_get_mem_ptr(mem, &buf);
-		(void) BIO_set_close(mem, BIO_NOCLOSE);
-		BIO_free(mem);
-		memcpy(ssl_certs[depth].not_after,
-		       buf->data,
-		       min(sizeof(ssl_certs[depth].not_after) - 1,
-			   (unsigned)buf->length));
-		ssl_certs[depth].not_after[min(sizeof(ssl_certs[depth].not_after) - 1,
-					   (unsigned)buf->length)] = 0;
-		BUF_MEM_free(buf);
-
-		/* signature type */
-		ssl_certs[depth].sig_type =
-			X509_get_signature_type(certs[depth].cert);
-
-		/* serial number */
-		ssl_certs[depth].serial =
-			ASN1_INTEGER_get(
-				X509_get_serialNumber(certs[depth].cert));
-
-		/* issuer name */
-		mem = BIO_new(BIO_s_mem());
-		X509_NAME_print_ex(mem,
-				   X509_get_issuer_name(certs[depth].cert),
-				   0, XN_FLAG_SEP_CPLUS_SPC |
-				   XN_FLAG_DN_REV | XN_FLAG_FN_NONE);
-		BIO_get_mem_ptr(mem, &buf);
-		(void) BIO_set_close(mem, BIO_NOCLOSE);
-		BIO_free(mem);
-		memcpy(ssl_certs[depth].issuer,
-		       buf->data,
-		       min(sizeof(ssl_certs[depth].issuer) - 1,
-			   (unsigned) buf->length));
-		ssl_certs[depth].issuer[min(sizeof(ssl_certs[depth].issuer) - 1,
-					(unsigned) buf->length)] = 0;
-		BUF_MEM_free(buf);
-
-		/* subject */
-		mem = BIO_new(BIO_s_mem());
-		X509_NAME_print_ex(mem,
-				   X509_get_subject_name(certs[depth].cert),
-				   0,
-				   XN_FLAG_SEP_CPLUS_SPC |
-				   XN_FLAG_DN_REV |
-				   XN_FLAG_FN_NONE);
-		BIO_get_mem_ptr(mem, &buf);
-		(void) BIO_set_close(mem, BIO_NOCLOSE);
-		BIO_free(mem);
-		memcpy(ssl_certs[depth].subject,
-		       buf->data,
-		       min(sizeof(ssl_certs[depth].subject) - 1,
-			   (unsigned)buf->length));
-		ssl_certs[depth].subject[min(sizeof(ssl_certs[depth].subject) - 1,
-					 (unsigned) buf->length)] = 0;
-		BUF_MEM_free(buf);
-
-		/* type of certificate */
-		ssl_certs[depth].cert_type =
-			X509_certificate_type(certs[depth].cert,
-					      X509_get_pubkey(certs[depth].cert));
-
-		/* and clean up */
-		ns_X509_free(certs[depth].cert);
-	}
-
-	msg.type = FETCH_CERT_ERR;
-	msg.data.cert_err.certs = ssl_certs;
-	msg.data.cert_err.num_certs = depth;
-	fetch_send_callback(&msg, f->fetch_handle);
-}
 
 /**
  * Handle a completed fetch (CURLMSG_DONE from curl_multi_info_read()).
@@ -1072,7 +1541,6 @@ static void fetch_curl_done(CURL *curl_handle, CURLcode result)
 	struct curl_fetch_info *f;
 	char **_hideous_hack = (char **) (void *) &f;
 	CURLcode code;
-	struct cert_info certs[MAX_CERTS];
 
 	/* find the structure associated with this fetch */
 	/* For some reason, cURL thinks CURLINFO_PRIVATE should be a string?! */
@@ -1116,13 +1584,11 @@ static void fetch_curl_done(CURL *curl_handle, CURLcode result)
 		 */
 		;
 	} else if (result == CURLE_SSL_PEER_CERTIFICATE ||
-			result == CURLE_SSL_CACERT) {
-		/* CURLE_SSL_PEER_CERTIFICATE renamed to
-		 * CURLE_PEER_FAILED_VERIFICATION
+		   result == CURLE_SSL_CACERT) {
+		/* Some kind of failure has occurred.  If we don't know
+		 * what happened, we'll have reported unknown errors up
+		 * to the user already via the certificate chain error fields.
 		 */
-		memset(certs, 0, sizeof(certs));
-		memcpy(certs, f->cert_data, sizeof(certs));
-		memset(f->cert_data, 0, sizeof(f->cert_data));
 		cert = true;
 	} else {
 		NSLOG(netsurf, INFO, "Unknown cURL response code %d", result);
@@ -1131,6 +1597,10 @@ static void fetch_curl_done(CURL *curl_handle, CURLcode result)
 
 	fetch_curl_stop(f);
 
+	if (f->sent_ssl_chain == false) {
+		fetch_curl_report_certs_upstream(f);
+	}
+
 	if (abort_fetch) {
 		; /* fetch was aborted: no callback */
 	} else if (finished) {
@@ -1139,7 +1609,9 @@ static void fetch_curl_done(CURL *curl_handle, CURLcode result)
 		fetch_send_callback(&msg, f->fetch_handle);
 	} else if (cert) {
 		/* user needs to validate certificate with issue */
-		curl_start_cert_validate(f, certs);
+		fetch_msg msg;
+		msg.type = FETCH_CERT_ERR;
+		fetch_send_callback(&msg, f->fetch_handle);
 	} else if (error) {
 		fetch_msg msg;
 		switch (result) {
@@ -1215,12 +1687,13 @@ static void fetch_curl_poll(lwc_string *scheme_ignored)
 	}
 
 	/* do any possible work on the current fetches */
+	inside_curl = true;
 	do {
 		codem = curl_multi_perform(fetch_curl_multi, &running);
 		if (codem != CURLM_OK && codem != CURLM_CALL_MULTI_PERFORM) {
-			NSLOG(netsurf, WARNING, "curl_multi_perform: %i %s",
+			NSLOG(netsurf, WARNING,
+			      "curl_multi_perform: %i %s",
 			      codem, curl_multi_strerror(codem));
-			guit->misc->warning("MiscError", curl_multi_strerror(codem));
 			return;
 		}
 	} while (codem == CURLM_CALL_MULTI_PERFORM);
@@ -1238,6 +1711,7 @@ static void fetch_curl_poll(lwc_string *scheme_ignored)
 		}
 		curl_msg = curl_multi_info_read(fetch_curl_multi, &queue);
 	}
+	inside_curl = false;
 }
 
 
@@ -1248,10 +1722,10 @@ static void fetch_curl_poll(lwc_string *scheme_ignored)
  */
 static int
 fetch_curl_progress(void *clientp,
-		    double dltotal,
-		    double dlnow,
-		    double ultotal,
-		    double ulnow)
+		    NSCURL_PROGRESS_T dltotal,
+		    NSCURL_PROGRESS_T dlnow,
+		    NSCURL_PROGRESS_T ultotal,
+		    NSCURL_PROGRESS_T ulnow)
 {
 	static char fetch_progress_buffer[256]; /**< Progress buffer for cURL */
 	struct curl_fetch_info *f = (struct curl_fetch_info *) clientp;
@@ -1318,6 +1792,24 @@ fetch_curl_debug(CURL *handle,
 }
 
 
+static curl_socket_t fetch_curl_socket_open(void *clientp,
+		curlsocktype purpose, struct curl_sockaddr *address)
+{
+	(void) clientp;
+	(void) purpose;
+
+	return (curl_socket_t) guit->fetch->socket_open(
+			address->family, address->socktype,
+			address->protocol);
+}
+
+static int fetch_curl_socket_close(void *clientp, curl_socket_t item)
+{
+	(void) clientp;
+
+	return guit->fetch->socket_close((int) item);
+}
+
 /**
  * Callback function for cURL.
  */
@@ -1327,9 +1819,6 @@ static size_t fetch_curl_data(char *data, size_t size, size_t nmemb, void *_f)
 	CURLcode code;
 	fetch_msg msg;
 
-	assert(inside_curl == false);
-	inside_curl = true;
-
 	/* ensure we only have to get this information once */
 	if (!f->http_code) {
 		code = curl_easy_getinfo(f->curl_handle, CURLINFO_HTTP_CODE,
@@ -1343,13 +1832,11 @@ static size_t fetch_curl_data(char *data, size_t size, size_t nmemb, void *_f)
 	 */
 	if (f->http_code == 401) {
 		f->http_code = 0;
-		inside_curl = false;
 		return size * nmemb;
 	}
 
 	if (f->abort || (!f->had_headers && fetch_curl_process_headers(f))) {
 		f->stopped = true;
-		inside_curl = false;
 		return 0;
 	}
 
@@ -1359,7 +1846,6 @@ static size_t fetch_curl_data(char *data, size_t size, size_t nmemb, void *_f)
 	msg.data.header_or_data.len = size * nmemb;
 	fetch_send_callback(&msg, f->fetch_handle);
 
-	inside_curl = false;
 	if (f->abort) {
 		f->stopped = true;
 		return 0;
@@ -1387,6 +1873,10 @@ fetch_curl_header(char *data, size_t size, size_t nmemb, void *_f)
 		return 0;
 	}
 
+	if (f->sent_ssl_chain == false) {
+		fetch_curl_report_certs_upstream(f);
+	}
+
 	msg.type = FETCH_HEADER;
 	msg.data.header_or_data.buf = (const uint8_t *) data;
 	msg.data.header_or_data.len = size;
@@ -1490,6 +1980,18 @@ nserror fetch_curl_register(void)
 		.finalise = fetch_curl_finalise
 	};
 
+#if LIBCURL_VERSION_NUM >= 0x073800
+	/* version 7.56.0 can select which SSL backend to use */
+	CURLsslset setres;
+
+	setres = curl_global_sslset(CURLSSLBACKEND_OPENSSL, NULL, NULL);
+	if (setres == CURLSSLSET_OK) {
+		curl_with_openssl = true;
+	} else {
+		curl_with_openssl = false;
+	}
+#endif
+
 	NSLOG(netsurf, INFO, "curl_version %s", curl_version());
 
 	code = curl_global_init(CURL_GLOBAL_ALL);
@@ -1514,8 +2016,10 @@ nserror fetch_curl_register(void)
 #undef SETOPT
 #define SETOPT(option, value) \
 	mcode = curl_multi_setopt(fetch_curl_multi, option, value);	\
-	if (mcode != CURLM_OK)						\
-		goto curl_multi_setopt_failed;
+	if (mcode != CURLM_OK) {					\
+		NSLOG(netsurf, ERROR, "attempting curl_multi_setopt(%s, ...)", #option); \
+		goto curl_multi_setopt_failed;				\
+	}
 
 		SETOPT(CURLMOPT_MAXCONNECTS, maxconnects);
 		SETOPT(CURLMOPT_MAX_TOTAL_CONNECTIONS, maxconnects);
@@ -1535,8 +2039,10 @@ nserror fetch_curl_register(void)
 #undef SETOPT
 #define SETOPT(option, value) \
 	code = curl_easy_setopt(fetch_blank_curl, option, value);	\
-	if (code != CURLE_OK)						\
-		goto curl_easy_setopt_failed;
+	if (code != CURLE_OK) {						\
+		NSLOG(netsurf, ERROR, "attempting curl_easy_setopt(%s, ...)", #option); \
+		goto curl_easy_setopt_failed;				\
+	}
 
 	SETOPT(CURLOPT_ERRORBUFFER, fetch_error_buffer);
 	SETOPT(CURLOPT_DEBUGFUNCTION, fetch_curl_debug);
@@ -1551,7 +2057,7 @@ nserror fetch_curl_register(void)
 
 	SETOPT(CURLOPT_WRITEFUNCTION, fetch_curl_data);
 	SETOPT(CURLOPT_HEADERFUNCTION, fetch_curl_header);
-	SETOPT(CURLOPT_PROGRESSFUNCTION, fetch_curl_progress);
+	SETOPT(NSCURLOPT_PROGRESS_FUNCTION, fetch_curl_progress);
 	SETOPT(CURLOPT_NOPROGRESS, 0);
 	SETOPT(CURLOPT_USERAGENT, user_agent_string());
 	SETOPT(CURLOPT_ENCODING, "gzip");
@@ -1559,7 +2065,8 @@ nserror fetch_curl_register(void)
 	SETOPT(CURLOPT_LOW_SPEED_TIME, 180L);
 	SETOPT(CURLOPT_NOSIGNAL, 1L);
 	SETOPT(CURLOPT_CONNECTTIMEOUT, nsoption_uint(curl_fetch_timeout));
-	SETOPT(CURLOPT_SSL_CIPHER_LIST, CIPHER_LIST);
+	SETOPT(CURLOPT_OPENSOCKETFUNCTION, fetch_curl_socket_open);
+	SETOPT(CURLOPT_CLOSESOCKETFUNCTION, fetch_curl_socket_close);
 
 	if (nsoption_charp(ca_bundle) &&
 	    strcmp(nsoption_charp(ca_bundle), "")) {
@@ -1572,12 +2079,32 @@ nserror fetch_curl_register(void)
 		SETOPT(CURLOPT_CAPATH, nsoption_charp(ca_path));
 	}
 
-	/* Detect whether the SSL CTX function API works */
-	curl_with_openssl = true;
-	code = curl_easy_setopt(fetch_blank_curl,
-			CURLOPT_SSL_CTX_FUNCTION, NULL);
+#if LIBCURL_VERSION_NUM < 0x073800
+	/*
+	 * before 7.56.0 Detect openssl from whether the SSL CTX
+	 *  function API works
+	 */
+	code = curl_easy_setopt(fetch_blank_curl, CURLOPT_SSL_CTX_FUNCTION, NULL);
 	if (code != CURLE_OK) {
 		curl_with_openssl = false;
+	} else {
+		curl_with_openssl = true;
+	}
+#endif
+
+	if (curl_with_openssl) {
+		/* only set the cipher list with openssl otherwise the
+		 *  fetch fails with "Unknown cipher in list"
+		 */
+#if LIBCURL_VERSION_NUM >= 0x073d00
+		/* Need libcurl 7.61.0 or later built against OpenSSL with
+		 * TLS1.3 support */
+		code = curl_easy_setopt(fetch_blank_curl,
+				CURLOPT_TLS13_CIPHERS, CIPHER_SUITES);
+		if (code != CURLE_OK && code != CURLE_NOT_BUILT_IN)
+			goto curl_easy_setopt_failed;
+#endif
+		SETOPT(CURLOPT_SSL_CIPHER_LIST, CIPHER_LIST);
 	}
 
 	NSLOG(netsurf, INFO, "cURL %slinked against openssl",
@@ -1587,6 +2114,12 @@ nserror fetch_curl_register(void)
 
 	data = curl_version_info(CURLVERSION_NOW);
 
+	curl_fetch_ssl_hashmap = hashmap_create(&curl_fetch_ssl_hashmap_parameters);
+	if (curl_fetch_ssl_hashmap == NULL) {
+		NSLOG(netsurf, CRITICAL, "Unable to initialise SSL certificate hashmap");
+		return NSERROR_NOMEM;
+	}
+
 	for (i = 0; data->protocols[i]; i++) {
 		if (strcmp(data->protocols[i], "http") == 0) {
 			scheme = lwc_string_ref(corestring_lwc_http);
diff --git a/content/fetchers/data.c b/content/fetchers/data.c
index 8c04bcfea..c7de14c3d 100644
--- a/content/fetchers/data.c
+++ b/content/fetchers/data.c
@@ -23,6 +23,7 @@
 
 #include <stdbool.h>
 #include <string.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <libwapcaplet/libwapcaplet.h>
 #include <nsutils/base64.h>
@@ -74,6 +75,36 @@ static bool fetch_data_can_fetch(const nsurl *url)
 	return true;
 }
 
+static void fetch_data_send_callback(const fetch_msg *msg,
+		struct fetch_data_context *c)
+{
+	c->locked = true;
+	fetch_send_callback(msg, c->parent_fetch);
+	c->locked = false;
+}
+
+static void fetch_data_send_header(struct fetch_data_context *ctx,
+		const char *fmt, ...)
+{
+	char header[64];
+	fetch_msg msg;
+	va_list ap;
+	int len;
+
+	va_start(ap, fmt);
+	len = vsnprintf(header, sizeof(header), fmt, ap);
+	va_end(ap);
+
+	if (len >= (int)sizeof(header) || len < 0) {
+		return;
+	}
+
+	msg.type = FETCH_HEADER;
+	msg.data.header_or_data.len = len;
+	msg.data.header_or_data.buf = (const uint8_t *)header;
+	fetch_data_send_callback(&msg, ctx);
+}
+
 static void *fetch_data_setup(struct fetch *parent_fetch, nsurl *url,
 		 bool only_2xx, bool downgrade_tls, const char *post_urlenc,
 		 const struct fetch_multipart_data *post_multipart,
@@ -104,7 +135,6 @@ static void fetch_data_free(void *ctx)
 	nsurl_unref(c->url);
 	free(c->data);
 	free(c->mimetype);
-	RING_REMOVE(ring, c);
 	free(ctx);
 }
 
@@ -119,14 +149,6 @@ static void fetch_data_abort(void *ctx)
 	c->aborted = true;
 }
 
-static void fetch_data_send_callback(const fetch_msg *msg, 
-		struct fetch_data_context *c) 
-{
-	c->locked = true;
-	fetch_send_callback(msg, c->parent_fetch);
-	c->locked = false;
-}
-
 static bool fetch_data_process(struct fetch_data_context *c)
 {
 	nserror res;
@@ -222,13 +244,14 @@ static bool fetch_data_process(struct fetch_data_context *c)
 static void fetch_data_poll(lwc_string *scheme)
 {
 	fetch_msg msg;
-	struct fetch_data_context *c, *next;
-	
-	if (ring == NULL) return;
+	struct fetch_data_context *c, *save_ring = NULL;
 	
 	/* Iterate over ring, processing each pending fetch */
-	c = ring;
-	do {
+	while (ring != NULL) {
+		/* Take the first entry from the ring */
+		c = ring;
+		RING_REMOVE(ring, c);
+
 		/* Ignore fetches that have been flagged as locked.
 		 * This allows safe re-entrant calls to this function.
 		 * Re-entrancy can occur if, as a result of a callback,
@@ -236,14 +259,12 @@ static void fetch_data_poll(lwc_string *scheme)
 		 * again.
 		 */
 		if (c->locked == true) {
-			next = c->r_next;
+			RING_INSERT(save_ring, c);
 			continue;
 		}
 
 		/* Only process non-aborted fetches */
 		if (c->aborted == false && fetch_data_process(c) == true) {
-			char header[64];
-
 			fetch_set_http_code(c->parent_fetch, 200);
 			NSLOG(netsurf, INFO,
 			      "setting data: MIME type to %s, length to %"PRIsizet,
@@ -253,22 +274,18 @@ static void fetch_data_poll(lwc_string *scheme)
 			 * Therefore, we _must_ check for this after _every_
 			 * call to fetch_data_send_callback().
 			 */
-			snprintf(header, sizeof header, "Content-Type: %s",
+			fetch_data_send_header(c, "Content-Type: %s",
 					c->mimetype);
-			msg.type = FETCH_HEADER;
-			msg.data.header_or_data.buf = (const uint8_t *) header;
-			msg.data.header_or_data.len = strlen(header);
-			fetch_data_send_callback(&msg, c); 
 
 			if (c->aborted == false) {
-				snprintf(header, sizeof header, 
-					 "Content-Length: %" PRIsizet,
-					 c->datalen);
-				msg.type = FETCH_HEADER;
-				msg.data.header_or_data.buf = 
-						(const uint8_t *) header;
-				msg.data.header_or_data.len = strlen(header);
-				fetch_data_send_callback(&msg, c);
+				fetch_data_send_header(c, "Content-Length: %"
+						PRIsizet, c->datalen);
+			}
+
+			if (c->aborted == false) {
+				/* Set max-age to 1 year. */
+				fetch_data_send_header(c, "Cache-Control: "
+						"max-age=31536000");
 			}
 
 			if (c->aborted == false) {
@@ -293,18 +310,15 @@ static void fetch_data_poll(lwc_string *scheme)
 			assert(c->locked == false);
 		}
 
-		/* Compute next fetch item at the last possible moment as
-		 * processing this item may have added to the ring.
-		 */
-		next = c->r_next;
-
+		/* And now finish */
 		fetch_remove_from_queues(c->parent_fetch);
 		fetch_free(c->parent_fetch);
+	}
 
-		/* Advance to next ring entry, exiting if we've reached
-		 * the start of the ring or the ring has become empty
-		 */
-	} while ( (c = next) != ring && ring != NULL);
+	/* Finally, if we saved any fetches which were locked, put them back
+	 * into the ring for next time
+	 */
+	ring = save_ring;
 }
 
 nserror fetch_data_register(void)
diff --git a/content/fetchers/file/Makefile b/content/fetchers/file/Makefile
new file mode 100644
index 000000000..c22400a56
--- /dev/null
+++ b/content/fetchers/file/Makefile
@@ -0,0 +1,3 @@
+# File fetcher sources
+
+S_FETCHER_FILE := dirlist.c file.c
diff --git a/content/dirlist.c b/content/fetchers/file/dirlist.c
index 1d7a67e1f..345dbd8f3 100644
--- a/content/dirlist.c
+++ b/content/fetchers/file/dirlist.c
@@ -27,8 +27,14 @@
 
 #include "utils/nsurl.h"
 #include "utils/messages.h"
+#include "utils/nscolour.h"
 
-#include "content/dirlist.h"
+#include "netsurf/inttypes.h"
+#include "netsurf/types.h"
+#include "netsurf/plot_style.h"
+
+#include "dirlist.h"
+#include "desktop/system_colour.h"
 
 static int dirlist_filesize_calculate(unsigned long *bytesize);
 static int dirlist_filesize_value(unsigned long bytesize);
@@ -136,18 +142,33 @@ bool dirlist_generate_hide_columns(int flags, char *buffer, int buffer_length)
 
 bool dirlist_generate_title(const char *title, char *buffer, int buffer_length)
 {
+	const char *stylesheet;
+	nserror err;
 	int error;
 
 	if (title == NULL)
 		title = "";
 
+	err = nscolour_get_stylesheet(&stylesheet);
+	if (err != NSERROR_OK) {
+		return false;
+	}
+
 	error = snprintf(buffer, buffer_length,
 			"</style>\n"
 			"<title>%s</title>\n"
+			"<style>\n"
+			"html {\n"
+			"\tbackground-color: #%06"PRIx32";\n"
+			"}\n"
+			"%s"
+			"</style>\n"
 			"</head>\n"
-			"<body id=\"dirlist\">\n"
-			"<h1>%s</h1>\n",
-			title, title);
+			"<body id=\"dirlist\" class=\"ns-even-bg ns-even-fg ns-border\">\n"
+			"<h1 class=\"ns-border\">%s</h1>\n",
+			title,
+			colour_rb_swap(nscolours[NSCOLOUR_WIN_ODD_BG]),
+			stylesheet, title);
 	if (error < 0 || error >= buffer_length)
 		/* Error or buffer too small */
 		return false;
@@ -284,14 +305,14 @@ bool dirlist_generate_row(bool even, bool directory, nsurl *url, char *name,
 
 	error = snprintf(buffer, buffer_length,
 			"<a href=\"%s\" class=\"%s %s\">\n"
-			"\t<span class=\"name\">%s</span>\n"
-			"\t<span class=\"type\">%s</span>\n"
-			"\t<span class=\"size\">%s</span>"
-			"<span class=\"size\">%s</span>\n"
-			"\t<span class=\"date\">%s</span>\n"
-			"\t<span class=\"time\">%s</span>\n"
-			"</a>\n",
-			 nsurl_access(url), even ? "even" : "odd",
+			"\t<span class=\"name ns-border\">%s</span>\n"
+			"\t<span class=\"type ns-border\">%s</span>\n"
+			"\t<span class=\"size ns-border\">%s</span>"
+			"<span class=\"size ns-border\">%s</span>\n"
+			"\t<span class=\"date ns-border\">%s</span>\n"
+			"\t<span class=\"time ns-border\">%s</span>\n"
+			"</a>\n", nsurl_access(url),
+			even ? "even ns-even-bg" : "odd  ns-odd-bg",
 			directory ? "dir" : "file",
 			name, mimetype, size_string, unit, date, time);
 	if (error < 0 || error >= buffer_length)
diff --git a/content/dirlist.h b/content/fetchers/file/dirlist.h
index 5cdaf7532..3a0d48c1c 100644
--- a/content/dirlist.h
+++ b/content/fetchers/file/dirlist.h
@@ -16,14 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * Generate HTML content for displaying directory listings (interface).
+/**
+ * \file
+ * interface to generate HTML content for displaying directory listings.
  *
  * These functions should in general be called via the content interface.
  */
 
-#ifndef _NETSURF_CONTENT_DIRLIST_H_
-#define _NETSURF_CONTENT_DIRLIST_H_
+#ifndef NETSURF_CONTENT_DIRLIST_H_
+#define NETSURF_CONTENT_DIRLIST_H_
 
 #include <stdbool.h>
 
diff --git a/content/fetchers/file.c b/content/fetchers/file/file.c
index 4fa1a2138..ff3a1b1f6 100644
--- a/content/fetchers/file.c
+++ b/content/fetchers/file/file.c
@@ -50,15 +50,17 @@
 #include "utils/corestrings.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
+#include "utils/log.h"
+#include "utils/time.h"
 #include "utils/ring.h"
 #include "utils/file.h"
 #include "netsurf/fetch.h"
 #include "desktop/gui_internal.h"
 
-#include "content/dirlist.h"
 #include "content/fetch.h"
 #include "content/fetchers.h"
-#include "content/fetchers/file.h"
+#include "dirlist.h"
+#include "file.h"
 
 /* Maximum size of read buffer */
 #define FETCH_FILE_MAX_BUF_SIZE (1024 * 1024)
@@ -97,19 +99,21 @@ static bool fetch_file_send_header(struct fetch_file_context *ctx,
 	fetch_msg msg;
 	char header[64];
 	va_list ap;
+	int len;
 
 	va_start(ap, fmt);
-
-	vsnprintf(header, sizeof header, fmt, ap);
-
+	len = vsnprintf(header, sizeof header, fmt, ap);
 	va_end(ap);
 
+	if (len >= (int)sizeof(header) || len < 0) {
+		return false;
+	}
+
 	msg.type = FETCH_HEADER;
 	msg.data.header_or_data.buf = (const uint8_t *) header;
-	msg.data.header_or_data.len = strlen(header);
-	fetch_file_send_callback(&msg, ctx);
+	msg.data.header_or_data.len = len;
 
-	return ctx->aborted;
+	return fetch_file_send_callback(&msg, ctx);
 }
 
 /** callback to initialise the file fetcher. */
@@ -156,18 +160,25 @@ fetch_file_setup(struct fetch *fetchh,
 
 	/* Scan request headers looking for If-None-Match */
 	for (i = 0; headers[i] != NULL; i++) {
-		if (strncasecmp(headers[i], "If-None-Match:", 
-				SLEN("If-None-Match:")) == 0) {
-			/* If-None-Match: "12345678" */
-			const char *d = headers[i] + SLEN("If-None-Match:");
-
-			/* Scan to first digit, if any */
-			while (*d != '\0' && (*d < '0' || '9' < *d))
-				d++;
-
-			/* Convert to time_t */
-			if (*d != '\0')
-				ctx->file_etag = atoi(d);
+		if (strncasecmp(headers[i], "If-None-Match:",
+				SLEN("If-None-Match:")) != 0) {
+			continue;
+		}
+
+		/* If-None-Match: "12345678" */
+		const char *d = headers[i] + SLEN("If-None-Match:");
+
+		/* Scan to first digit, if any */
+		while (*d != '\0' && (*d < '0' || '9' < *d))
+			d++;
+
+		/* Convert to time_t */
+		if (*d != '\0') {
+			ret = nsc_snptimet(d, strlen(d), &ctx->file_etag);
+			if (ret != NSERROR_OK) {
+				NSLOG(fetch, WARNING,
+						"Bad If-None-Match value");
+			}
 		}
 	}
 
@@ -184,7 +195,6 @@ static void fetch_file_free(void *ctx)
 	struct fetch_file_context *c = ctx;
 	nsurl_unref(c->url);
 	free(c->path);
-	RING_REMOVE(ring, c);
 	free(ctx);
 }
 
@@ -780,13 +790,13 @@ static void fetch_file_process(struct fetch_file_context *ctx)
 /** callback to poll for additional file fetch contents */
 static void fetch_file_poll(lwc_string *scheme)
 {
-	struct fetch_file_context *c, *next;
+	struct fetch_file_context *c, *save_ring = NULL;
 
-	if (ring == NULL) return;
+	while (ring != NULL) {
+		/* Take the first entry from the ring */
+		c = ring;
+		RING_REMOVE(ring, c);
 
-	/* Iterate over ring, processing each pending fetch */
-	c = ring;
-	do {
 		/* Ignore fetches that have been flagged as locked.
 		 * This allows safe re-entrant calls to this function.
 		 * Re-entrancy can occur if, as a result of a callback,
@@ -794,7 +804,7 @@ static void fetch_file_poll(lwc_string *scheme)
 		 * again.
 		 */
 		if (c->locked == true) {
-			next = c->r_next;
+			RING_INSERT(save_ring, c);
 			continue;
 		}
 
@@ -804,18 +814,16 @@ static void fetch_file_poll(lwc_string *scheme)
 			fetch_file_process(c);
 		}
 
-		/* Compute next fetch item at the last possible moment as
-		 * processing this item may have added to the ring.
-		 */
-		next = c->r_next;
-
+		/* And now finish */
 		fetch_remove_from_queues(c->fetchh);
 		fetch_free(c->fetchh);
 
-		/* Advance to next ring entry, exiting if we've reached
-		 * the start of the ring or the ring has become empty
-		 */
-	} while ( (c = next) != ring && ring != NULL);
+	}
+
+	/* Finally, if we saved any fetches which were locked, put them back
+	 * into the ring for next time
+	 */
+	ring = save_ring;
 }
 
 nserror fetch_file_register(void)
diff --git a/content/fetchers/file.h b/content/fetchers/file/file.h
index 5a5cfe89b..5a5cfe89b 100644
--- a/content/fetchers/file.h
+++ b/content/fetchers/file/file.h
diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c
index 78757733e..c8176f34b 100644
--- a/content/fetchers/resource.c
+++ b/content/fetchers/resource.c
@@ -33,6 +33,7 @@
 #include "utils/nsurl.h"
 #include "utils/corestrings.h"
 #include "utils/log.h"
+#include "utils/time.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/ring.h"
@@ -55,7 +56,6 @@ static const char *fetch_resource_paths[] = {
 	"credits.html",
 	"licence.html",
 	"welcome.html",
-	"maps.html",
 	"favicon.ico",
 	"default.ico",
 	"netsurf.png",
@@ -97,7 +97,7 @@ struct fetch_resource_context {
 
 	fetch_resource_handler handler;
 
-	int etag;
+	time_t etag;
 };
 
 static struct fetch_resource_context *ring = NULL;
@@ -121,19 +121,21 @@ static bool fetch_resource_send_header(struct fetch_resource_context *ctx,
 	fetch_msg msg;
 	char header[64];
 	va_list ap;
+	int len;
 
 	va_start(ap, fmt);
-
-	vsnprintf(header, sizeof header, fmt, ap);
-
+	len = vsnprintf(header, sizeof header, fmt, ap);
 	va_end(ap);
 
+	if (len >= (int)sizeof(header) || len < 0) {
+		return false;
+	}
+
 	msg.type = FETCH_HEADER;
 	msg.data.header_or_data.buf = (const uint8_t *) header;
-	msg.data.header_or_data.len = strlen(header);
-	fetch_resource_send_callback(&msg, ctx);
+	msg.data.header_or_data.len = len;
 
-	return ctx->aborted;
+	return fetch_resource_send_callback(&msg, ctx);
 }
 
 
@@ -194,6 +196,11 @@ static bool fetch_resource_data_handler(struct fetch_resource_context *ctx)
 		goto fetch_resource_data_aborted;
 	}
 
+	/* create max-age of 1 year */
+	if (fetch_resource_send_header(ctx,
+			"Cache-Control: max-age=31536000")) {
+		goto fetch_resource_data_aborted;
+	}
 
 	msg.type = FETCH_DATA;
 	msg.data.header_or_data.buf = (const uint8_t *) ctx->entry->data;
@@ -328,6 +335,7 @@ fetch_resource_setup(struct fetch *fetchh,
 {
 	struct fetch_resource_context *ctx;
 	lwc_string *path;
+	nserror ret;
 	uint32_t i;
 
 	ctx = calloc(1, sizeof(*ctx));
@@ -364,17 +372,24 @@ fetch_resource_setup(struct fetch *fetchh,
 	/* Scan request headers looking for If-None-Match */
 	for (i = 0; headers[i] != NULL; i++) {
 		if (strncasecmp(headers[i], "If-None-Match:",
-				SLEN("If-None-Match:")) == 0) {
-			/* If-None-Match: "12345678" */
-			const char *d = headers[i] + SLEN("If-None-Match:");
+				SLEN("If-None-Match:")) != 0) {
+			continue;
+		}
+
+		/* If-None-Match: "12345678" */
+		const char *d = headers[i] + SLEN("If-None-Match:");
 
-			/* Scan to first digit, if any */
-			while (*d != '\0' && (*d < '0' || '9' < *d))
-				d++;
+		/* Scan to first digit, if any */
+		while (*d != '\0' && (*d < '0' || '9' < *d))
+			d++;
 
-			/* Convert to time_t */
-			if (*d != '\0')
-				ctx->etag = atoi(d);
+		/* Convert to time_t */
+		if (*d != '\0') {
+			ret = nsc_snptimet(d, strlen(d), &ctx->etag);
+			if (ret != NSERROR_OK) {
+				NSLOG(fetch, WARNING,
+						"Bad If-None-Match value");
+			}
 		}
 	}
 
@@ -391,7 +406,6 @@ static void fetch_resource_free(void *ctx)
 	struct fetch_resource_context *c = ctx;
 	if (c->url != NULL)
 		nsurl_unref(c->url);
-	RING_REMOVE(ring, c);
 	free(ctx);
 }
 
@@ -417,13 +431,13 @@ static void fetch_resource_abort(void *ctx)
 /** callback to poll for additional resource fetch contents */
 static void fetch_resource_poll(lwc_string *scheme)
 {
-	struct fetch_resource_context *c, *next;
+	struct fetch_resource_context *c, *save_ring = NULL;
 
-	if (ring == NULL) return;
+	while (ring != NULL) {
+		/* Take the first entry from the ring */
+		c = ring;
+		RING_REMOVE(ring, c);
 
-	/* Iterate over ring, processing each pending fetch */
-	c = ring;
-	do {
 		/* Ignore fetches that have been flagged as locked.
 		 * This allows safe re-entrant calls to this function.
 		 * Re-entrancy can occur if, as a result of a callback,
@@ -431,7 +445,7 @@ static void fetch_resource_poll(lwc_string *scheme)
 		 * again.
 		 */
 		if (c->locked == true) {
-			next = c->r_next;
+			RING_INSERT(save_ring, c);
 			continue;
 		}
 
@@ -441,18 +455,15 @@ static void fetch_resource_poll(lwc_string *scheme)
 			c->handler(c);
 		}
 
-		/* Compute next fetch item at the last possible moment
-		 * as processing this item may have added to the ring
-		 */
-		next = c->r_next;
-
+		/* And now finish */
 		fetch_remove_from_queues(c->fetchh);
 		fetch_free(c->fetchh);
+	}
 
-		/* Advance to next ring entry, exiting if we've reached
-		 * the start of the ring or the ring has become empty
-		 */
-	} while ( (c = next) != ring && ring != NULL);
+	/* Finally, if we saved any fetches which were locked, put them back
+	 * into the ring for next time
+	 */
+	ring = save_ring;
 }
 
 nserror fetch_resource_register(void)
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index 19eb1ca7b..a145c6fe1 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -49,32 +49,21 @@
 #include "utils/nsurl.h"
 #include "utils/log.h"
 #include "utils/messages.h"
+#include "utils/hashmap.h"
 #include "desktop/gui_internal.h"
 #include "netsurf/misc.h"
 
 #include "content/backing_store.h"
 
-/** Default number of bits of the ident to use in index hash */
-#define DEFAULT_IDENT_SIZE 20
-
-/** Default number of bits to use for an entry index. */
-#define DEFAULT_ENTRY_SIZE 16
-
 /** Backing store file format version */
-#define CONTROL_VERSION 130
+#define CONTROL_VERSION 202
 
-/** Number of milliseconds after a update before control data maintenance is performed  */
+/**
+ * Number of milliseconds after a update before control data
+ * maintenance is performed
+ */
 #define CONTROL_MAINT_TIME 10000
 
-/** Get address from ident */
-#define BS_ADDRESS(ident, state) ((ident) & ((1 << state->ident_bits) - 1))
-
-/** Lookup store entry index from ident */
-#define BS_ENTRY_INDEX(ident, state) state->addrmap[(ident) & ((1 << state->ident_bits) - 1)]
-
-/** Get store entry from ident. */
-#define BS_ENTRY(ident, state) state->entries[state->addrmap[(ident) & ((1 << state->ident_bits) - 1)]]
-
 /** Filename of serialised entries */
 #define ENTRIES_FNAME "entries"
 
@@ -84,8 +73,8 @@
 /** log2 block data address length (64k) */
 #define BLOCK_ADDR_LEN 16
 
-/** log2 number of entries per block file(4k) */
-#define BLOCK_ENTRY_COUNT 12
+/** log2 number of entries per block file(1024) */
+#define BLOCK_ENTRY_COUNT 10
 
 /** log2 number of data block files */
 #define BLOCK_FILE_COUNT (BLOCK_ADDR_LEN - BLOCK_ENTRY_COUNT)
@@ -93,21 +82,13 @@
 /** log2 size of data blocks (8k) */
 #define BLOCK_DATA_SIZE 13
 
-/** log2 size of metadata blocks (1k) */
-#define BLOCK_META_SIZE 10
+/** log2 size of metadata blocks (8k) */
+#define BLOCK_META_SIZE 13
 
 /** length in bytes of a block files use map */
 #define BLOCK_USE_MAP_SIZE (1 << (BLOCK_ENTRY_COUNT - 3))
 
 /**
- * The type used to store index values referring to store entries. Care
- * must be taken with this type as it is used to build address to
- * entry mapping so changing the size will have large impacts on
- * memory usage.
- */
-typedef uint16_t entry_index_t;
-
-/**
  * The type used as a binary identifier for each entry derived from
  * the URL. A larger identifier will have fewer collisions but
  * requires proportionately more storage.
@@ -184,8 +165,8 @@ struct store_entry_element {
  * @note Order is important to avoid excessive structure packing overhead.
  */
 struct store_entry {
+	nsurl *url; /**< The URL for this entry */
 	int64_t last_used; /**< UNIX time the entry was last used */
-	entry_ident_t ident; /**< entry identifier */
 	uint16_t use_count; /**< number of times this entry has been accessed */
 	uint8_t flags; /**< entry flags */
 	/** Entry element (data or meta) specific information */
@@ -219,29 +200,16 @@ struct store_state {
 	size_t limit; /**< The backing store upper bound target size */
 	size_t hysteresis; /**< The hysteresis around the target size */
 
-	unsigned int ident_bits; /**< log2 number of bits to use for address. */
-
-
-	/* cache entry management */
-	struct store_entry *entries; /**< store entries. */
-	unsigned int entry_bits; /**< log2 number of bits in entry index. */
-	unsigned int last_entry; /**< index of last usable entry. */
+	/**
+	 * The cache object hash
+	 */
+	hashmap_t *entries;
 
 	/** flag indicating if the entries have been made persistent
 	 * since they were last changed.
 	 */
 	bool entries_dirty;
 
-	/**
-	 * URL identifier to entry index mapping.
-	 *
-	 * This is an open coded index on the entries URL field and
-	 * provides a computationally inexpensive way to go from the
-	 * URL to an entry.
-	 */
-	entry_index_t *addrmap;
-
-
 	/** small block indexes */
 	struct block_file blocks[ENTRY_ELEM_COUNT][BLOCK_FILE_COUNT];
 
@@ -273,60 +241,44 @@ struct store_state {
  */
 struct store_state *storestate;
 
-
-/**
- * Remove a backing store entry from the entry table.
+/* Entries hashmap parameters
  *
- * This finds the store entry associated with the given key and
- * removes it from the table. The removed entry is returned but is
- * only valid until the next set_store_entry call.
- *
- * @param[in] state The store state to use.
- * @param[in, out] bse Pointer to the entry to be removed.
- * @return NSERROR_OK and \a bse updated on success or NSERROR_NOT_FOUND
- *         if no entry corresponds to the URL.
+ * Our hashmap has nsurl keys and store_entry values
  */
-static nserror
-remove_store_entry(struct store_state *state, struct store_entry **bse)
-{
-	entry_index_t sei; /* store entry index */
-
-	/* sei is index to entry to be removed, we swap it to the end
-	 * of the table so there are no gaps and the returned entry is
-	 * held in storage with reasonable lifetime.
-	 */
-
-	sei = BS_ENTRY_INDEX((*bse)->ident, state);
-
-	/* remove entry from map */
-	BS_ENTRY_INDEX((*bse)->ident, state) = 0;
-
-	/* global allocation accounting  */
-	state->total_alloc -= state->entries[sei].elem[ENTRY_ELEM_DATA].size;
-	state->total_alloc -= state->entries[sei].elem[ENTRY_ELEM_META].size;
-
-	state->last_entry--;
-
-	if (sei == state->last_entry) {
-		/* the removed entry was the last one, how convenient */
-		*bse = &state->entries[sei];
-	} else {
-		/* need to swap entries */
-		struct store_entry tent;
-
-		tent = state->entries[sei];
-		state->entries[sei] = state->entries[state->last_entry];
-		state->entries[state->last_entry] = tent;
 
-		/* update map for moved entry */
-		BS_ENTRY_INDEX(state->entries[sei].ident, state) = sei;
+static bool
+entries_hashmap_key_eq(void *key1, void *key2)
+{
+	return nsurl_compare((nsurl *)key1, (nsurl *)key2, NSURL_COMPLETE);
+}
 
-		*bse = &state->entries[state->last_entry];
+static void *
+entries_hashmap_value_alloc(void *key)
+{
+	struct store_entry *ent = calloc(1, sizeof(struct store_entry));
+	if (ent != NULL) {
+		ent->url = nsurl_ref(key);
 	}
+	return ent;
+}
 
-	return NSERROR_OK;
+static void
+entries_hashmap_value_destroy(void *value)
+{
+	struct store_entry *ent = value;
+	/** \todo Do we need to do any disk cleanup here?  if so, meep! */
+	nsurl_unref(ent->url);
+	free(ent);
 }
 
+static hashmap_parameters_t entries_hashmap_parameters = {
+	.key_clone = (hashmap_key_clone_t)nsurl_ref,
+	.key_destroy = (hashmap_key_destroy_t)nsurl_unref,
+	.key_hash = (hashmap_key_hash_t)nsurl_hash,
+	.key_eq = entries_hashmap_key_eq,
+	.value_alloc = entries_hashmap_value_alloc,
+	.value_destroy = entries_hashmap_value_destroy,
+};
 
 /**
  * Generate a filename for an object.
@@ -484,7 +436,7 @@ invalidate_element(struct store_state *state,
 		char *fname;
 
 		/* unlink the file from disc */
-		fname = store_fname(state, bse->ident, elem_idx);
+		fname = store_fname(state, nsurl_hash(bse->url), elem_idx);
 		if (fname == NULL) {
 			return NSERROR_NOMEM;
 		}
@@ -492,6 +444,8 @@ invalidate_element(struct store_state *state,
 		free(fname);
 	}
 
+	state->total_alloc -= bse->elem[elem_idx].size;
+
 	return NSERROR_OK;
 }
 
@@ -519,29 +473,27 @@ invalidate_entry(struct store_state *state, struct store_entry *bse)
 		 * This entry cannot be immediately removed as it has
 		 * associated allocation so wait for allocation release.
 		 */
-		NSLOG(netsurf, INFO,
+		NSLOG(netsurf, DEBUG,
 		      "invalidating entry with referenced allocation");
 		return NSERROR_OK;
 	}
 
-	NSLOG(netsurf, INFO, "Removing entry for %p", bse);
-
-	/* remove the entry from the index */
-	ret = remove_store_entry(state, &bse);
-	if (ret != NSERROR_OK) {
-		return ret;
-	}
+	NSLOG(netsurf, VERBOSE, "Removing entry for %s", nsurl_access(bse->url));
 
 	ret = invalidate_element(state, bse, ENTRY_ELEM_META);
 	if (ret != NSERROR_OK) {
-		NSLOG(netsurf, INFO, "Error invalidating metadata element");
+		NSLOG(netsurf, ERROR, "Error invalidating metadata element");
 	}
 
 	ret = invalidate_element(state, bse, ENTRY_ELEM_DATA);
 	if (ret != NSERROR_OK) {
-		NSLOG(netsurf, INFO, "Error invalidating data element");
+		NSLOG(netsurf, ERROR, "Error invalidating data element");
 	}
 
+	/* As our final act we remove bse from the cache */
+	hashmap_remove(state->entries, bse->url);
+	/* From now, bse is invalid memory */
+
 	return NSERROR_OK;
 }
 
@@ -551,8 +503,8 @@ invalidate_entry(struct store_state *state, struct store_entry *bse)
  */
 static int compar(const void *va, const void *vb)
 {
-	const struct store_entry *a = &BS_ENTRY(*(entry_ident_t *)va, storestate);
-	const struct store_entry *b = &BS_ENTRY(*(entry_ident_t *)vb, storestate);
+	const struct store_entry *a = *(const struct store_entry **)va;
+	const struct store_entry *b = *(const struct store_entry **)vb;
 
 	/* consider the allocation flags - if an entry has an
 	 * allocation it is considered more valuable as it cannot be
@@ -591,6 +543,22 @@ static int compar(const void *va, const void *vb)
 	return 0;
 }
 
+typedef struct {
+	struct store_entry **elist;
+	size_t ent_count;
+} eviction_state_t;
+
+/**
+ * Iterator for gathering entries to compute eviction order
+ */
+static bool
+entry_eviction_iterator_cb(void *key, void *value, void *ctx)
+{
+	eviction_state_t *estate = ctx;
+	struct store_entry *ent = value;
+	estate->elist[estate->ent_count++] = ent;
+	return false;
+}
 
 /**
  * Evict entries from backing store as per configuration.
@@ -608,15 +576,14 @@ static int compar(const void *va, const void *vb)
  */
 static nserror store_evict(struct store_state *state)
 {
-	entry_ident_t *elist; /* sorted list of entry identifiers */
-	unsigned int ent;
-	unsigned int ent_count;
-	size_t removed; /* size of removed entries */
+	size_t ent = 0;
+	size_t removed = 0; /* size of removed entries */
 	nserror ret = NSERROR_OK;
+	size_t old_count;
+	eviction_state_t estate;
 
 	/* check if the cache has exceeded configured limit */
-	if ((state->total_alloc < state->limit) &&
-	    (state->last_entry < (1U << state->entry_bits))) {
+	if (state->total_alloc < state->limit) {
 		/* cache within limits */
 		return NSERROR_OK;
 	}
@@ -627,24 +594,31 @@ static nserror store_evict(struct store_state *state)
 	      state->hysteresis);
 
 	/* allocate storage for the list */
-	elist = malloc(sizeof(entry_ident_t) * state->last_entry);
-	if (elist == NULL) {
+	old_count = hashmap_count(state->entries);
+	estate.ent_count = 0;
+	estate.elist = malloc(sizeof(struct state_entry*) * old_count);
+	if (estate.elist == NULL) {
 		return NSERROR_NOMEM;
 	}
 
-	/* sort the list avoiding entry 0 which is the empty sentinel */
-	for (ent = 1; ent < state->last_entry; ent++) {
-		elist[ent - 1] = state->entries[ent].ident;
+	if (hashmap_iterate(state->entries, entry_eviction_iterator_cb, &estate)) {
+		NSLOG(netsurf, WARNING, "Unexpected termination of eviction iterator");
+		free(estate.elist);
+		return NSERROR_UNKNOWN;
+	}
+
+	if (old_count != estate.ent_count) {
+		NSLOG(netsurf, WARNING, "Incorrect entry count after eviction iterator");
+		free(estate.elist);
+		return NSERROR_UNKNOWN;
 	}
-	ent_count = ent - 1; /* important to keep this as the entry count will change when entries are removed */
-	qsort(elist, ent_count, sizeof(entry_ident_t), compar);
+
+	qsort(estate.elist, estate.ent_count, sizeof(struct state_entry*), compar);
 
 	/* evict entries in listed order */
 	removed = 0;
-	for (ent = 0; ent < ent_count; ent++) {
-		struct store_entry *bse;
-
-		bse = &BS_ENTRY(elist[ent], state);
+	for (ent = 0; ent < estate.ent_count; ent++) {
+		struct store_entry *bse = estate.elist[ent];
 
 		removed += bse->elem[ENTRY_ELEM_DATA].size;
 		removed += bse->elem[ENTRY_ELEM_META].size;
@@ -659,14 +633,55 @@ static nserror store_evict(struct store_state *state)
 		}
 	}
 
-	free(elist);
+	free(estate.elist);
 
-	NSLOG(netsurf, INFO, "removed %"PRIsizet" in %d entries", removed,
-	      ent);
+	NSLOG(netsurf, INFO,
+	      "removed %"PRIsizet" in %"PRIsizet" entries, %"PRIu64" remaining in %"PRIsizet" entries",
+	      removed, ent, state->total_alloc, old_count - ent);
 
 	return ret;
 }
 
+/**
+ * Write a single store entry to disk
+ *
+ * To serialise a single store entry for now we write out a 32bit int
+ * which is the length of the url, then that many bytes of the url.
+ * Then we write out the full store entry struct as-is, which includes
+ * a useless nsurl pointer.
+ */
+static nserror
+write_entry(struct store_entry *ent, int fd)
+{
+	uint32_t len = strlen(nsurl_access(ent->url));
+	if (write(fd, &len, sizeof(len)) != sizeof(len))
+		return NSERROR_SAVE_FAILED;
+	if (write(fd, nsurl_access(ent->url), len) != (ssize_t)len)
+		return NSERROR_SAVE_FAILED;
+	if (write(fd, ent, sizeof(*ent)) != sizeof(*ent))
+		return NSERROR_SAVE_FAILED;
+
+	return NSERROR_OK;
+}
+
+typedef struct {
+	int fd;
+	size_t written;
+} write_entry_iteration_state;
+
+/**
+ * Callback for iterating the entries hashmap
+ */
+static bool
+write_entry_iterator(void *key, void *value, void *ctx)
+{
+	/* We ignore the key */
+	struct store_entry *ent = value;
+	write_entry_iteration_state *state = ctx;
+	state->written++;
+	/* We stop early if we fail to write this entry */
+	return write_entry(ent, state->fd) != NSERROR_OK;
+}
 
 /**
  * Write filesystem entries to file.
@@ -678,13 +693,13 @@ static nserror store_evict(struct store_state *state)
  */
 static nserror write_entries(struct store_state *state)
 {
-	int fd;
 	char *tname = NULL; /* temporary file name for atomic replace */
 	char *fname = NULL; /* target filename */
-	size_t entries_size;
-	size_t written;
+	write_entry_iteration_state weistate;
 	nserror ret;
 
+	memset(&weistate, 0, sizeof(weistate));
+
 	if (state->entries_dirty == false) {
 		/* entries have not been updated since last write */
 		return NSERROR_OK;
@@ -695,25 +710,22 @@ static nserror write_entries(struct store_state *state)
 		return ret;
 	}
 
-	fd = open(tname, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
-	if (fd == -1) {
+	weistate.fd = open(tname, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
+	if (weistate.fd == -1) {
 		free(tname);
 		return NSERROR_SAVE_FAILED;
 	}
 
-	entries_size = state->last_entry * sizeof(struct store_entry);
-
-	written = (size_t)write(fd, state->entries, entries_size);
-
-	close(fd);
-
-	/* check all data was written */
-	if (written != entries_size) {
+	if (hashmap_iterate(state->entries, write_entry_iterator, &weistate)) {
+		/* The iteration ended early, so we failed */
+		close(weistate.fd);
 		unlink(tname);
 		free(tname);
 		return NSERROR_SAVE_FAILED;
 	}
 
+	close(weistate.fd);
+
 	ret = netsurf_mkpath(&fname, NULL, 2, state->path, ENTRIES_FNAME);
 	if (ret != NSERROR_OK) {
 		unlink(tname);
@@ -730,6 +742,8 @@ static nserror write_entries(struct store_state *state)
 		return NSERROR_SAVE_FAILED;
 	}
 
+	NSLOG(netsurf, INFO, "Wrote out %"PRIsizet" entries", weistate.written);
+
 	return NSERROR_OK;
 }
 
@@ -777,7 +791,7 @@ static nserror write_blocks(struct store_state *state)
 				   &state->blocks[elem_idx][bfidx].use_map[0],
 				   BLOCK_USE_MAP_SIZE);
 			if (wr != BLOCK_USE_MAP_SIZE) {
-				NSLOG(netsurf, INFO,
+				NSLOG(netsurf, DEBUG,
 				      "writing block file %d use index on file number %d failed",
 				      elem_idx,
 				      bfidx);
@@ -836,21 +850,21 @@ static nserror set_block_extents(struct store_state *state)
 		return NSERROR_OK;
 	}
 
-	NSLOG(netsurf, INFO, "Starting");
+	NSLOG(netsurf, DEBUG, "Starting");
 	for (elem_idx = 0; elem_idx < ENTRY_ELEM_COUNT; elem_idx++) {
 		for (bfidx = 0; bfidx < BLOCK_FILE_COUNT; bfidx++) {
 			if (state->blocks[elem_idx][bfidx].fd != -1) {
 				/* ensure block file is correct extent */
 				ftr = ftruncate(state->blocks[elem_idx][bfidx].fd, 1U << (log2_block_size[elem_idx] + BLOCK_ENTRY_COUNT));
 				if (ftr == -1) {
-					NSLOG(netsurf, INFO,
+					NSLOG(netsurf, ERROR,
 					      "Truncate failed errno:%d",
 					      errno);
 				}
 			}
 		}
 	}
-	NSLOG(netsurf, INFO, "Complete");
+	NSLOG(netsurf, DEBUG, "Complete");
 
 	state->blocks_opened = false;
 
@@ -866,7 +880,7 @@ static nserror set_block_extents(struct store_state *state)
  *
  * \param s store state to maintain.
  */
-static void control_maintinance(void *s)
+static void control_maintenance(void *s)
 {
 	struct store_state *state = s;
 
@@ -892,36 +906,22 @@ static void control_maintinance(void *s)
 static nserror
 get_store_entry(struct store_state *state, nsurl *url, struct store_entry **bse)
 {
-	entry_ident_t ident;
-	unsigned int sei; /* store entry index */
-
-	NSLOG(netsurf, INFO, "url:%s", nsurl_access(url));
+	struct store_entry *ent;
 
-	/* use the url hash as the entry identifier */
-	ident = nsurl_hash(url);
+	ent = hashmap_lookup(state->entries, url);
 
-	sei = BS_ENTRY_INDEX(ident, state);
-
-	if (sei == 0) {
-		NSLOG(netsurf, INFO, "Failed to find ident 0x%x in index",
-		      ident);
-		return NSERROR_NOT_FOUND;
-	}
-
-	if (state->entries[sei].ident != ident) {
-		/* entry ident did not match */
-		NSLOG(netsurf, INFO, "ident did not match entry");
+	if (ent == NULL) {
 		return NSERROR_NOT_FOUND;
 	}
 
-	*bse = &state->entries[sei];
+	*bse = ent;
 
-	state->entries[sei].last_used = time(NULL);
-	state->entries[sei].use_count++;
+	ent->last_used = time(NULL);
+	ent->use_count++;
 
 	state->entries_dirty = true;
 
-	guit->misc->schedule(CONTROL_MAINT_TIME, control_maintinance, state);
+	guit->misc->schedule(CONTROL_MAINT_TIME, control_maintenance, state);
 
 	return NSERROR_OK;
 }
@@ -979,13 +979,11 @@ set_store_entry(struct store_state *state,
 		const size_t datalen,
 		struct store_entry **bse)
 {
-	entry_ident_t ident;
-	entry_index_t sei; /* store entry index */
 	struct store_entry *se;
 	nserror ret;
 	struct store_entry_element *elem;
 
-	NSLOG(netsurf, INFO, "url:%s", nsurl_access(url));
+	NSLOG(netsurf, DEBUG, "url:%s", nsurl_access(url));
 
 	/* evict entries as required and ensure there is at least one
 	 * new entry available.
@@ -995,40 +993,12 @@ set_store_entry(struct store_state *state,
 		return ret;
 	}
 
-	/* use the url hash as the entry identifier */
-	ident = nsurl_hash(url);
-
-	/* get the entry index from the ident */
-	sei = BS_ENTRY_INDEX(ident, state);
-	if (sei == 0) {
-		/* allocating the next available entry */
-		sei = state->last_entry;
-		state->last_entry++;
-		BS_ENTRY_INDEX(ident, state) = sei;
-
-		/* the entry */
-		se = &state->entries[sei];
-
-		/* clear the new entry */
-		memset(se, 0, sizeof(struct store_entry));
-	} else {
-		/* index found existing entry */
-
-		/* the entry */
-		se = &state->entries[sei];
-
-		if (se->ident != ident) {
-			/** @todo Is there a better heuristic than
-			 * first come, first served? Should we check
-			 * to see if the old entry is in use and if
-			 * not prefer the newly stored entry instead?
-			 */
-			NSLOG(netsurf, INFO,
-			      "Entry index collision trying to replace %x with %x",
-			      se->ident,
-			      ident);
-			return NSERROR_PERMISSION;
-		}
+	se = hashmap_lookup(state->entries, url);
+	if (se == NULL) {
+		se = hashmap_insert(state->entries, url);
+	}
+	if (se == NULL) {
+		return NSERROR_NOMEM;
 	}
 
 	/* the entry element */
@@ -1039,13 +1009,12 @@ set_store_entry(struct store_state *state,
 		/* this entry cannot be removed as it has associated
 		 * allocation.
 		 */
-		NSLOG(netsurf, INFO,
+		NSLOG(netsurf, ERROR,
 		      "attempt to overwrite entry with in use data");
 		return NSERROR_PERMISSION;
 	}
 
 	/* set the common entry data */
-	se->ident = ident;
 	se->use_count = 1;
 	se->last_used = time(NULL);
 
@@ -1066,7 +1035,7 @@ set_store_entry(struct store_state *state,
 
 	/* ensure control maintenance scheduled. */
 	state->entries_dirty = true;
-	guit->misc->schedule(CONTROL_MAINT_TIME, control_maintinance, state);
+	guit->misc->schedule(CONTROL_MAINT_TIME, control_maintenance, state);
 
 	*bse = se;
 
@@ -1099,7 +1068,7 @@ store_open(struct store_state *state,
 
 	fname = store_fname(state, ident, elem_idx);
 	if (fname == NULL) {
-		NSLOG(netsurf, INFO, "filename error");
+		NSLOG(netsurf, ERROR, "filename error");
 		return -1;
 	}
 
@@ -1107,14 +1076,14 @@ store_open(struct store_state *state,
 	if (openflags & O_CREAT) {
 		ret = netsurf_mkdir_all(fname);
 		if (ret != NSERROR_OK) {
-			NSLOG(netsurf, INFO,
+			NSLOG(netsurf, WARNING,
 			      "file path \"%s\" could not be created", fname);
 			free(fname);
 			return -1;
 		}
 	}
 
-	NSLOG(netsurf, INFO, "opening %s", fname);
+	NSLOG(netsurf, DEBUG, "opening %s", fname);
 	fd = open(fname, openflags, S_IRUSR | S_IWUSR);
 
 	free(fname);
@@ -1122,57 +1091,6 @@ store_open(struct store_state *state,
 	return fd;
 }
 
-/**
- * Construct address ident to filesystem entry map
- *
- * To allow a filesystem entry to be found from it's identifier we
- * construct an mapping index. This is a hash map from the entries URL
- * (its unique key) to filesystem entry.
- *
- * As the entire entry list must be iterated over to construct the map
- * we also compute the total storage in use.
- *
- * @param state The backing store global state.
- * @return NSERROR_OK on success or NSERROR_NOMEM if the map storage
- *         could not be allocated.
- */
-static nserror
-build_entrymap(struct store_state *state)
-{
-	unsigned int eloop;
-
-	NSLOG(netsurf, INFO, "Allocating %"PRIsizet" bytes for max of %d buckets",
-	      (1 << state->ident_bits) * sizeof(entry_index_t),
-	      1 << state->ident_bits);
-
-	state->addrmap = calloc(1 << state->ident_bits, sizeof(entry_index_t));
-	if (state->addrmap == NULL) {
-		return NSERROR_NOMEM;
-	}
-
-	state->total_alloc = 0;
-
-	for (eloop = 1; eloop < state->last_entry; eloop++) {
-
-		NSLOG(llcache, DEEPDEBUG,
-		      "entry:%d ident:0x%08x used:%d",
-		      eloop,
-		      BS_ADDRESS(state->entries[eloop].ident, state),
-		      state->entries[eloop].use_count);
-
-		/* update the address map to point at the entry */
-		BS_ENTRY_INDEX(state->entries[eloop].ident, state) = eloop;
-
-		/* account for the storage space */
-		state->total_alloc += state->entries[eloop].elem[ENTRY_ELEM_DATA].size;
-		state->total_alloc += state->entries[eloop].elem[ENTRY_ELEM_META].size;
-		/* ensure entry does not have any allocation state */
-		state->entries[eloop].elem[ENTRY_ELEM_DATA].flags &= ~(ENTRY_ELEM_FLAG_HEAP | ENTRY_ELEM_FLAG_MMAP);
-		state->entries[eloop].elem[ENTRY_ELEM_META].flags &= ~(ENTRY_ELEM_FLAG_HEAP | ENTRY_ELEM_FLAG_MMAP);
-	}
-
-	return NSERROR_OK;
-}
 
 /**
  * Unlink entries file
@@ -1206,46 +1124,84 @@ unlink_entries(struct store_state *state)
 static nserror
 read_entries(struct store_state *state)
 {
-	int fd;
-	ssize_t rd;
-	size_t entries_size;
 	char *fname = NULL;
+	char *url;
+	nsurl *nsurl;
 	nserror ret;
+	size_t read_entries = 0;
+	struct store_entry *ent;
+	int fd;
 
 	ret = netsurf_mkpath(&fname, NULL, 2, state->path, ENTRIES_FNAME);
 	if (ret != NSERROR_OK) {
 		return ret;
 	}
 
-	entries_size = (1 << state->entry_bits) * sizeof(struct store_entry);
-
-	NSLOG(netsurf, INFO,
-	      "Allocating %"PRIsizet" bytes for max of %d entries of %"PRIsizet" length elements %"PRIsizet" length",
-	      entries_size,
-	      1 << state->entry_bits,
-	      sizeof(struct store_entry),
-	      sizeof(struct store_entry_element));
-
-	state->entries = calloc(1, entries_size);
+	state->entries = hashmap_create(&entries_hashmap_parameters);
 	if (state->entries == NULL) {
 		free(fname);
 		return NSERROR_NOMEM;
 	}
 
 	fd = open(fname, O_RDWR);
-	free(fname);
 	if (fd != -1) {
-		rd = read(fd, state->entries, entries_size);
-		close(fd);
-		if (rd > 0) {
-			state->last_entry = rd / sizeof(struct store_entry);
-			NSLOG(netsurf, INFO, "Read %d entries",
-			      state->last_entry);
+		uint32_t urllen;
+		while (read(fd, &urllen, sizeof(urllen)) == sizeof(urllen)) {
+			url = calloc(1, urllen+1);
+			if (url == NULL) {
+				close(fd);
+				free(fname);
+				return NSERROR_NOMEM;
+			}
+			if (read(fd, url, urllen) != (ssize_t)urllen) {
+				free(url);
+				close(fd);
+				free(fname);
+				return NSERROR_INIT_FAILED;
+			}
+			ret = nsurl_create(url, &nsurl);
+			if (ret != NSERROR_OK) {
+				free(url);
+				close(fd);
+				free(fname);
+				return ret;
+			}
+			free(url);
+			/* We have to be careful here about nsurl refs */
+			ent = hashmap_insert(state->entries, nsurl);
+			if (ent == NULL) {
+				nsurl_unref(nsurl);
+				close(fd);
+				free(fname);
+				return NSERROR_NOMEM;
+			}
+			/* At this point, ent actually owns a ref of nsurl */
+			if (read(fd, ent, sizeof(*ent)) != sizeof(*ent)) {
+				/* The read failed, so reset the ptr */
+				ent->url = nsurl; /* It already had a ref */
+				nsurl_unref(nsurl);
+				close(fd);
+				free(fname);
+				return NSERROR_INIT_FAILED;
+			}
+			ent->url = nsurl; /* It already owns a ref */
+			nsurl_unref(nsurl);
+			NSLOG(netsurf, DEBUG, "Successfully read entry for %s", nsurl_access(ent->url));
+			read_entries++;
+			/* Note the size allocation */
+			state->total_alloc += ent->elem[ENTRY_ELEM_DATA].size;
+			state->total_alloc += ent->elem[ENTRY_ELEM_META].size;
+			/* And ensure we don't pretend to have this in memory yet */
+			ent->elem[ENTRY_ELEM_DATA].flags &= ~(ENTRY_ELEM_FLAG_HEAP | ENTRY_ELEM_FLAG_MMAP);
+			ent->elem[ENTRY_ELEM_META].flags &= ~(ENTRY_ELEM_FLAG_HEAP | ENTRY_ELEM_FLAG_MMAP);
+
 		}
-	} else {
-		/* could rebuild entries from fs */
-		state->last_entry = 1;
+		close(fd);
 	}
+
+	NSLOG(netsurf, INFO, "Read %"PRIsizet" entries from cache", read_entries);
+
+	free(fname);
 	return NSERROR_OK;
 }
 
@@ -1283,7 +1239,7 @@ read_blocks(struct store_state *state)
 					  &state->blocks[elem_idx][bfidx].use_map[0],
 					  BLOCK_USE_MAP_SIZE);
 				if (rd <= 0) {
-					NSLOG(netsurf, INFO,
+					NSLOG(netsurf, ERROR,
 					      "reading block file %d use index on file number %d failed",
 					      elem_idx,
 					      bfidx);
@@ -1382,9 +1338,6 @@ write_control(struct store_state *state)
 	}
 
 	fprintf(fcontrol, "%u%c", CONTROL_VERSION, 0);
-	fprintf(fcontrol, "%u%c", state->entry_bits, 0);
-	fprintf(fcontrol, "%u%c", state->ident_bits, 0);
-	fprintf(fcontrol, "%u%c", state->last_entry, 0);
 
 	fclose(fcontrol);
 
@@ -1404,8 +1357,6 @@ read_control(struct store_state *state)
 	nserror ret;
 	FILE *fcontrol;
 	unsigned int ctrlversion;
-	unsigned int addrbits;
-	unsigned int entrybits;
 	char *fname = NULL;
 
 	ret = netsurf_mkpath(&fname, NULL, 2, state->path, "control");
@@ -1443,27 +1394,8 @@ read_control(struct store_state *state)
 		goto control_error;
 	}
 
-	/* second line is log2 max number of entries */
-	if (fscanf(fcontrol, "%u", &entrybits) != 1) {
-		goto control_error;
-	}
-	if (fgetc(fcontrol) != 0) {
-		goto control_error;
-	}
-
-	/* second line is log2 size of address hash */
-	if (fscanf(fcontrol, "%u", &addrbits) != 1) {
-		goto control_error;
-	}
-	if (fgetc(fcontrol) != 0) {
-		goto control_error;
-	}
-
 	fclose(fcontrol);
 
-	state->entry_bits = entrybits;
-	state->ident_bits = addrbits;
-
 	return NSERROR_OK;
 
 control_error: /* problem with the control file */
@@ -1515,23 +1447,25 @@ initialise(const struct llcache_store_parameters *parameters)
 	newstate->limit = parameters->limit;
 	newstate->hysteresis = parameters->hysteresis;
 
-	if (parameters->address_size == 0) {
-		newstate->ident_bits = DEFAULT_IDENT_SIZE;
-	} else {
-		newstate->ident_bits = parameters->address_size;
-	}
-
-	if (parameters->entry_size == 0) {
-		newstate->entry_bits = DEFAULT_ENTRY_SIZE;
-	} else {
-		newstate->entry_bits = parameters->entry_size;
-	}
-
 	/* read store control and create new if required */
 	ret = read_control(newstate);
 	if (ret != NSERROR_OK) {
-		NSLOG(netsurf, INFO, "read control failed %s",
-		      messages_get_errorcode(ret));
+		if (ret == NSERROR_NOT_FOUND) {
+			NSLOG(netsurf, INFO, "cache control file not found, making fresh");
+		} else {
+			NSLOG(netsurf, ERROR, "read control failed %s",
+			      messages_get_errorcode(ret));
+			ret = netsurf_recursive_rm(newstate->path);
+			if (ret != NSERROR_OK) {
+				NSLOG(netsurf, WARNING, "Error `%s` while removing `%s`",
+				      messages_get_errorcode(ret), newstate->path);
+				NSLOG(netsurf, WARNING, "Unable to clean up partial cache state.");
+				NSLOG(netsurf, WARNING, "Funky behaviour may ensue.");
+			} else {
+				NSLOG(netsurf, INFO, "Successfully removed old cache from `%s`",
+				      newstate->path);
+			}
+		}
 		ret = write_control(newstate);
 		if (ret == NSERROR_OK) {
 			unlink_entries(newstate);
@@ -1545,13 +1479,6 @@ initialise(const struct llcache_store_parameters *parameters)
 		return ret;
 	}
 
-	/* ensure the maximum number of entries can be represented in
-	 * the type available to store it.
-	 */
-	if (newstate->entry_bits > (8 * sizeof(entry_index_t))) {
-		newstate->entry_bits = (8 * sizeof(entry_index_t));
-	}
-
 	/* read filesystem entries */
 	ret = read_entries(newstate);
 	if (ret != NSERROR_OK) {
@@ -1561,21 +1488,11 @@ initialise(const struct llcache_store_parameters *parameters)
 		return ret;
 	}
 
-	/* build entry hash map */
-	ret = build_entrymap(newstate);
-	if (ret != NSERROR_OK) {
-		/* that obviously went well */
-		free(newstate->entries);
-		free(newstate->path);
-		free(newstate);
-		return ret;
-	}
-
+	/* read blocks */
 	ret = read_blocks(newstate);
 	if (ret != NSERROR_OK) {
 		/* oh dear */
-		free(newstate->addrmap);
-		free(newstate->entries);
+		hashmap_destroy(newstate->entries);
 		free(newstate->path);
 		free(newstate);
 		return ret;
@@ -1586,12 +1503,10 @@ initialise(const struct llcache_store_parameters *parameters)
 	NSLOG(netsurf, INFO, "FS backing store init successful");
 
 	NSLOG(netsurf, INFO,
-	      "path:%s limit:%"PRIsizet" hyst:%"PRIsizet" addr:%d entries:%d",
+	      "path:%s limit:%"PRIsizet" hyst:%"PRIsizet,
 	      newstate->path,
 	      newstate->limit,
-	      newstate->hysteresis,
-	      newstate->ident_bits,
-	      newstate->entry_bits);
+	      newstate->hysteresis);
 	NSLOG(netsurf, INFO, "Using %"PRIu64"/%"PRIsizet,
 	      newstate->total_alloc, newstate->limit);
 
@@ -1614,7 +1529,7 @@ finalise(void)
 	unsigned int op_count;
 
 	if (storestate != NULL) {
-		guit->misc->schedule(-1, control_maintinance, storestate);
+		guit->misc->schedule(-1, control_maintenance, storestate);
 		write_entries(storestate);
 		write_blocks(storestate);
 
@@ -1643,8 +1558,7 @@ finalise(void)
 			      0);
 		}
 
-		free(storestate->addrmap);
-		free(storestate->entries);
+		hashmap_destroy(storestate->entries);
 		free(storestate->path);
 		free(storestate);
 		storestate = NULL;
@@ -1676,7 +1590,7 @@ static nserror store_write_block(struct store_state *state,
 		state->blocks[elem_idx][bf].fd = store_open(state, bf,
 				elem_idx + ENTRY_ELEM_COUNT, O_CREAT | O_RDWR);
 		if (state->blocks[elem_idx][bf].fd == -1) {
-			NSLOG(netsurf, INFO, "Open failed errno %d", errno);
+			NSLOG(netsurf, ERROR, "Open failed errno %d", errno);
 			return NSERROR_SAVE_FAILED;
 		}
 
@@ -1687,24 +1601,24 @@ static nserror store_write_block(struct store_state *state,
 	offst = (unsigned int)bi << log2_block_size[elem_idx];
 
 	wr = nsu_pwrite(state->blocks[elem_idx][bf].fd,
-		    bse->elem[elem_idx].data,
-		    bse->elem[elem_idx].size,
-		    offst);
+			bse->elem[elem_idx].data,
+			bse->elem[elem_idx].size,
+			offst);
 	if (wr != (ssize_t)bse->elem[elem_idx].size) {
-		NSLOG(netsurf, INFO,
-		      "Write failed %"PRIssizet" of %d bytes from %p at 0x%jx block %d errno %d",
+		NSLOG(netsurf, ERROR,
+		      "Write failed %"PRIssizet" of %"PRId32" bytes from %p at %"PRIsizet" block %"PRIu16" errno %d",
 		      wr,
 		      bse->elem[elem_idx].size,
 		      bse->elem[elem_idx].data,
-		      (uintmax_t)offst,
+		      (size_t)offst,
 		      bse->elem[elem_idx].block,
 		      errno);
 		return NSERROR_SAVE_FAILED;
 	}
 
 	NSLOG(netsurf, INFO,
-	      "Wrote %"PRIssizet" bytes from %p at 0x%jx block %d", wr,
-	      bse->elem[elem_idx].data, (uintmax_t)offst,
+	      "Wrote %"PRIssizet" bytes from %p at %"PRIsizet" block %d", wr,
+	      bse->elem[elem_idx].data, (size_t)offst,
 	      bse->elem[elem_idx].block);
 
 	return NSERROR_OK;
@@ -1726,10 +1640,10 @@ static nserror store_write_file(struct store_state *state,
 	int fd;
 	int err;
 
-	fd = store_open(state, bse->ident, elem_idx, O_CREAT | O_WRONLY);
+	fd = store_open(state, nsurl_hash(bse->url), elem_idx, O_CREAT | O_WRONLY);
 	if (fd < 0) {
 		perror("");
-		NSLOG(netsurf, INFO, "Open failed %d errno %d", fd, errno);
+		NSLOG(netsurf, ERROR, "Open failed %d errno %d", fd, errno);
 		return NSERROR_SAVE_FAILED;
 	}
 
@@ -1738,8 +1652,8 @@ static nserror store_write_file(struct store_state *state,
 
 	close(fd);
 	if (wr != (ssize_t)bse->elem[elem_idx].size) {
-		NSLOG(netsurf, INFO,
-		      "Write failed %"PRIssizet" of %d bytes from %p errno %d",
+		NSLOG(netsurf, ERROR,
+		      "Write failed %"PRIssizet" of %"PRId32" bytes from %p errno %d",
 		      wr,
 		      bse->elem[elem_idx].size,
 		      bse->elem[elem_idx].data,
@@ -1749,7 +1663,7 @@ static nserror store_write_file(struct store_state *state,
 		return NSERROR_SAVE_FAILED;
 	}
 
-	NSLOG(netsurf, INFO, "Wrote %"PRIssizet" bytes from %p", wr,
+	NSLOG(netsurf, VERBOSE, "Wrote %"PRIssizet" bytes from %p", wr,
 	      bse->elem[elem_idx].data);
 
 	return NSERROR_OK;
@@ -1791,7 +1705,7 @@ store(nsurl *url,
 	/* set the store entry up */
 	ret = set_store_entry(storestate, url, elem_idx, data, datalen, &bse);
 	if (ret != NSERROR_OK) {
-		NSLOG(netsurf, INFO, "store entry setting failed");
+		NSLOG(netsurf, ERROR, "store entry setting failed");
 		return ret;
 	}
 
@@ -1814,7 +1728,7 @@ static nserror entry_release_alloc(struct store_entry_element *elem)
 	if ((elem->flags & ENTRY_ELEM_FLAG_HEAP) != 0) {
 		elem->ref--;
 		if (elem->ref == 0) {
-			NSLOG(netsurf, INFO, "freeing %p", elem->data);
+			NSLOG(netsurf, DEEPDEBUG, "freeing %p", elem->data);
 			free(elem->data);
 			elem->flags &= ~ENTRY_ELEM_FLAG_HEAP;
 		}
@@ -1846,7 +1760,7 @@ static nserror store_read_block(struct store_state *state,
 		state->blocks[elem_idx][bf].fd = store_open(state, bf,
 				elem_idx + ENTRY_ELEM_COUNT, O_CREAT | O_RDWR);
 		if (state->blocks[elem_idx][bf].fd == -1) {
-			NSLOG(netsurf, INFO, "Open failed errno %d", errno);
+			NSLOG(netsurf, ERROR, "Open failed errno %d", errno);
 			return NSERROR_SAVE_FAILED;
 		}
 
@@ -1857,24 +1771,24 @@ static nserror store_read_block(struct store_state *state,
 	offst = (unsigned int)bi << log2_block_size[elem_idx];
 
 	rd = nsu_pread(state->blocks[elem_idx][bf].fd,
-		   bse->elem[elem_idx].data,
-		   bse->elem[elem_idx].size,
-		   offst);
+		       bse->elem[elem_idx].data,
+		       bse->elem[elem_idx].size,
+		       offst);
 	if (rd != (ssize_t)bse->elem[elem_idx].size) {
-		NSLOG(netsurf, INFO,
-		      "Failed reading %"PRIssizet" of %d bytes into %p from 0x%jx block %d errno %d",
+		NSLOG(netsurf, ERROR,
+		      "Failed reading %"PRIssizet" of %"PRId32" bytes into %p from %"PRIsizet" block %"PRIu16" errno %d",
 		      rd,
 		      bse->elem[elem_idx].size,
 		      bse->elem[elem_idx].data,
-		      (uintmax_t)offst,
+		      (size_t)offst,
 		      bse->elem[elem_idx].block,
 		      errno);
 		return NSERROR_SAVE_FAILED;
 	}
 
-	NSLOG(netsurf, INFO,
-	      "Read %"PRIssizet" bytes into %p from 0x%jx block %d", rd,
-	      bse->elem[elem_idx].data, (uintmax_t)offst,
+	NSLOG(netsurf, DEEPDEBUG,
+	      "Read %"PRIssizet" bytes into %p from %"PRIsizet" block %d", rd,
+	      bse->elem[elem_idx].data, (size_t)offst,
 	      bse->elem[elem_idx].block);
 
 	return NSERROR_OK;
@@ -1898,9 +1812,9 @@ static nserror store_read_file(struct store_state *state,
 	size_t tot = 0; /* total size */
 
 	/* separate file in backing store */
-	fd = store_open(storestate, bse->ident, elem_idx, O_RDONLY);
+	fd = store_open(storestate, nsurl_hash(bse->url), elem_idx, O_RDONLY);
 	if (fd < 0) {
-		NSLOG(netsurf, INFO, "Open failed %d errno %d", fd, errno);
+		NSLOG(netsurf, ERROR, "Open failed %d errno %d", fd, errno);
 		/** @todo should this invalidate the entry? */
 		return NSERROR_NOT_FOUND;
 	}
@@ -1910,7 +1824,7 @@ static nserror store_read_file(struct store_state *state,
 			  bse->elem[elem_idx].data + tot,
 			  bse->elem[elem_idx].size - tot);
 		if (rd <= 0) {
-			NSLOG(netsurf, INFO,
+			NSLOG(netsurf, ERROR,
 			      "read error returned %"PRIssizet" errno %d",
 			      rd,
 			      errno);
@@ -1922,7 +1836,7 @@ static nserror store_read_file(struct store_state *state,
 
 	close(fd);
 
-	NSLOG(netsurf, INFO, "Read %"PRIsizet" bytes into %p", tot,
+	NSLOG(netsurf, DEEPDEBUG, "Read %"PRIsizet" bytes into %p", tot,
 	      bse->elem[elem_idx].data);
 
 	return ret;
@@ -1956,13 +1870,13 @@ fetch(nsurl *url,
 	/* fetch store entry */
 	ret = get_store_entry(storestate, url, &bse);
 	if (ret != NSERROR_OK) {
-		NSLOG(netsurf, INFO, "entry not found");
+		NSLOG(netsurf, DEBUG, "Entry for %s not found", nsurl_access(url));
 		storestate->miss_count++;
 		return ret;
 	}
 	storestate->hit_count++;
 
-	NSLOG(netsurf, INFO, "retrieving cache data for url:%s",
+	NSLOG(netsurf, DEBUG, "retrieving cache data for url:%s",
 	      nsurl_access(url));
 
 	/* calculate the entry element index */
@@ -1978,7 +1892,7 @@ fetch(nsurl *url,
 		/* use the existing allocation and bump the ref count. */
 		elem->ref++;
 
-		NSLOG(netsurf, INFO,
+		NSLOG(netsurf, DEEPDEBUG,
 		      "Using existing entry (%p) allocation %p refs:%d", bse,
 		      elem->data, elem->ref);
 
@@ -1986,11 +1900,11 @@ fetch(nsurl *url,
 		/* allocate from the heap */
 		elem->data = malloc(elem->size);
 		if (elem->data == NULL) {
-			NSLOG(netsurf, INFO,
+			NSLOG(netsurf, ERROR,
 			      "Failed to create new heap allocation");
 			return NSERROR_NOMEM;
 		}
-		NSLOG(netsurf, INFO, "Created new heap allocation %p",
+		NSLOG(netsurf, DEEPDEBUG, "Created new heap allocation %p",
 		      elem->data);
 
 		/* mark the entry as having a valid heap allocation */
@@ -2040,7 +1954,7 @@ static nserror release(nsurl *url, enum backing_store_flags bsflags)
 
 	ret = get_store_entry(storestate, url, &bse);
 	if (ret != NSERROR_OK) {
-		NSLOG(netsurf, INFO, "entry not found");
+		NSLOG(netsurf, WARNING, "entry not found");
 		return ret;
 	}
 
diff --git a/content/handlers/css/Makefile b/content/handlers/css/Makefile
index bbfc8d7b4..d5cf16647 100644
--- a/content/handlers/css/Makefile
+++ b/content/handlers/css/Makefile
@@ -1,4 +1,4 @@
 # CSS sources
 
-S_CSS := css.c dump.c internal.c hints.c select.c utils.c
+S_CSS := css.c dump.c internal.c hints.c select.c
 
diff --git a/content/handlers/css/css.c b/content/handlers/css/css.c
index 0dcbe9907..f9197ddfe 100644
--- a/content/handlers/css/css.c
+++ b/content/handlers/css/css.c
@@ -16,19 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <string.h>
 #include <assert.h>
 #include <libwapcaplet/libwapcaplet.h>
 #include <dom/dom.h>
 
-#include "content/content_protected.h"
-#include "content/fetch.h"
-#include "content/hlcache.h"
-#include "desktop/system_colour.h"
+#include "utils/errors.h"
 #include "utils/corestrings.h"
 #include "utils/utils.h"
 #include "utils/http.h"
 #include "utils/log.h"
 #include "utils/messages.h"
+#include "content/content_protected.h"
+#include "content/content_factory.h"
+#include "content/fetch.h"
+#include "content/hlcache.h"
+#include "desktop/system_colour.h"
 
 #include "css/css.h"
 #include "css/hints.h"
@@ -37,6 +40,9 @@
 /* Define to trace import fetches */
 #undef NSCSS_IMPORT_TRACE
 
+/** Screen DPI in fixed point units: defaults to 90, which RISC OS uses */
+css_fixed nscss_screen_dpi = F_90;
+
 struct content_css_data;
 
 /**
@@ -168,7 +174,7 @@ nscss_create(const content_handler *handler,
 			xnsbase, charset, result->base.quirks,
 			nscss_content_done, result);
 	if (error != NSERROR_OK) {
-		content_broadcast_errorcode(&result->base, NSERROR_NOMEM);
+		content_broadcast_error(&result->base, NSERROR_NOMEM, NULL);
 		if (charset_value != NULL)
 			lwc_string_unref(charset_value);
 		free(result);
@@ -251,7 +257,7 @@ nscss_process_data(struct content *c, const char *data, unsigned int size)
 
 	error = nscss_process_css_data(&css->data, data, size);
 	if (error != CSS_OK && error != CSS_NEEDDATA) {
-		content_broadcast_errorcode(c, NSERROR_CSS);
+		content_broadcast_error(c, NSERROR_CSS, NULL);
 	}
 
 	return (error == CSS_OK || error == CSS_NEEDDATA);
@@ -285,7 +291,7 @@ bool nscss_convert(struct content *c)
 
 	error = nscss_convert_css_data(&css->data);
 	if (error != CSS_OK) {
-		content_broadcast_errorcode(c, NSERROR_CSS);
+		content_broadcast_error(c, NSERROR_CSS, NULL);
 		return false;
 	}
 
@@ -480,7 +486,7 @@ void nscss_content_done(struct content_css_data *css, void *pw)
 	/* Retrieve the size of this sheet */
 	error = css_stylesheet_size(css->sheet, &size);
 	if (error != CSS_OK) {
-		content_broadcast_errorcode(c, NSERROR_CSS);
+		content_broadcast_error(c, NSERROR_CSS, NULL);
 		content_set_error(c);
 		return;
 	}
@@ -634,7 +640,6 @@ nserror nscss_import(hlcache_handle *handle,
 		error = nscss_import_complete(ctx);
 		break;
 
-	case CONTENT_MSG_ERRORCODE:
 	case CONTENT_MSG_ERROR:
 		hlcache_handle_release(handle);
 		ctx->css->imports[ctx->index].c = NULL;
@@ -642,7 +647,6 @@ nserror nscss_import(hlcache_handle *handle,
 		error = nscss_import_complete(ctx);
 		/* Already released handle */
 		break;
-
 	default:
 		break;
 	}
diff --git a/content/handlers/css/dump.c b/content/handlers/css/dump.c
index b12e1d9e8..950a6f8cc 100644
--- a/content/handlers/css/dump.c
+++ b/content/handlers/css/dump.c
@@ -19,6 +19,8 @@
 #include <stdio.h>
 #include <libcss/libcss.h>
 
+#include "netsurf/inttypes.h"
+
 #include "css/dump.h"
 #include "css/utils.h"
 
@@ -36,7 +38,7 @@ static void dump_css_fixed(FILE *stream, css_fixed f)
 	uint32_t fracpart = ((NSCSS_ABS(f) & 0x3ff) * 1000 + 500) / (1 << 10);
 #undef NSCSS_ABS
 
-	fprintf(stream, "%s%d.%03d", f < 0 ? "-" : "", uintpart, fracpart);
+	fprintf(stream, "%s%"PRIu32".%03"PRIu32, f < 0 ? "-" : "", uintpart, fracpart);
 }
 
 /**
@@ -48,7 +50,7 @@ static void dump_css_fixed(FILE *stream, css_fixed f)
 static void dump_css_number(FILE *stream, css_fixed val)
 {
 	if (INTTOFIX(FIXTOINT(val)) == val)
-		fprintf(stream, "%d", FIXTOINT(val));
+		fprintf(stream, "%"PRId32, FIXTOINT(val));
 	else
 		dump_css_fixed(stream, val);
 }
@@ -113,24 +115,15 @@ static void dump_css_unit(FILE *stream, css_fixed val, css_unit unit)
 	case CSS_UNIT_KHZ:
 		fprintf(stream, "kHz");
 		break;
-	case CSS_UNIT_CAP:
-		fprintf(stream, "cap");
-		break;
 	case CSS_UNIT_CH:
 		fprintf(stream, "ch");
 		break;
-	case CSS_UNIT_IC:
-		fprintf(stream, "ic");
-		break;
 	case CSS_UNIT_REM:
 		fprintf(stream, "rem");
 		break;
 	case CSS_UNIT_LH:
 		fprintf(stream, "lh");
 		break;
-	case CSS_UNIT_RLH:
-		fprintf(stream, "rlh");
-		break;
 	case CSS_UNIT_VH:
 		fprintf(stream, "vh");
 		break;
@@ -190,7 +183,7 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
 	val = css_computed_background_color(style, &color);
 	switch (val) {
 	case CSS_BACKGROUND_COLOR_COLOR:
-		fprintf(stream, "background-color: #%08x ", color);
+		fprintf(stream, "background-color: #%08"PRIx32" ", color);
 		break;
 	default:
 		break;
@@ -264,7 +257,7 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
 	val = css_computed_border_top_color(style, &color);
 	switch (val) {
 	case CSS_BORDER_COLOR_COLOR:
-		fprintf(stream, "border-top-color: #%08x ", color);
+		fprintf(stream, "border-top-color: #%08"PRIx32" ", color);
 		break;
 	default:
 		break;
@@ -274,7 +267,7 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
 	val = css_computed_border_right_color(style, &color);
 	switch (val) {
 	case CSS_BORDER_COLOR_COLOR:
-		fprintf(stream, "border-right-color: #%08x ", color);
+		fprintf(stream, "border-right-color: #%08"PRIx32" ", color);
 		break;
 	default:
 		break;
@@ -284,7 +277,7 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
 	val = css_computed_border_bottom_color(style, &color);
 	switch (val) {
 	case CSS_BORDER_COLOR_COLOR:
-		fprintf(stream, "border-bottom-color: #%08x ", color);
+		fprintf(stream, "border-bottom-color: #%08"PRIx32" ", color);
 		break;
 	default:
 		break;
@@ -294,7 +287,7 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
 	val = css_computed_border_left_color(style, &color);
 	switch (val) {
 	case CSS_BORDER_COLOR_COLOR:
-		fprintf(stream, "border-left-color: #%08x ", color);
+		fprintf(stream, "border-left-color: #%08"PRIx32" ", color);
 		break;
 	default:
 		break;
@@ -619,7 +612,7 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
 	/* color */
 	val = css_computed_color(style, &color);
 	if (val == CSS_COLOR_COLOR) {
-		fprintf(stream, "color: #%08x ", color);
+		fprintf(stream, "color: #%08"PRIx32" ", color);
 	}
 
 	/* content */
@@ -873,6 +866,12 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
 	case CSS_DISPLAY_NONE:
 		fprintf(stream, "display: none ");
 		break;
+	case CSS_DISPLAY_FLEX:
+		fprintf(stream, "display: flex ");
+		break;
+	case CSS_DISPLAY_INLINE_FLEX:
+		fprintf(stream, "display: inline-flex ");
+		break;
 	default:
 		break;
 	}
@@ -1356,7 +1355,7 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
 		fprintf(stream, "outline-color: invert ");
 		break;
 	case CSS_OUTLINE_COLOR_COLOR:
-		fprintf(stream, "outline-color: #%08x ", color);
+		fprintf(stream, "outline-color: #%08"PRIx32" ", color);
 		break;
 	default:
 		break;
@@ -1823,7 +1822,7 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
 		fprintf(stream, "z-index: auto ");
 		break;
 	case CSS_Z_INDEX_SET:
-		fprintf(stream, "z-index: %d ", zindex);
+		fprintf(stream, "z-index: %"PRId32" ", zindex);
 		break;
 	default:
 		break;
diff --git a/content/handlers/css/hints.c b/content/handlers/css/hints.c
index d3d27fb3c..0f246a64c 100644
--- a/content/handlers/css/hints.c
+++ b/content/handlers/css/hints.c
@@ -607,12 +607,12 @@ static void css_hint_clean(void)
 	hint_ctx.len = 0;
 }
 
-static inline struct css_hint * css_hint_advance(struct css_hint *hint)
+static inline void css_hint_advance(struct css_hint **hint)
 {
 	hint_ctx.len++;
 	assert(hint_ctx.len < MAX_HINTS_PER_ELEMENT);
 
-	return ++hint;
+	(*hint)++;
 }
 
 static void css_hint_get_hints(struct css_hint **hints, uint32_t *nhints)
@@ -671,7 +671,7 @@ static void css_hint_table_cell_border_padding(
 			     hint_prop++) {
 				hint->prop = hint_prop;
 				hint->status = CSS_BORDER_STYLE_INSET;
-				hint = css_hint_advance(hint);
+				css_hint_advance(&hint);
 			}
 
 			for (hint_prop = CSS_PROP_BORDER_TOP_WIDTH;
@@ -681,7 +681,7 @@ static void css_hint_table_cell_border_padding(
 				hint->data.length.value = INTTOFIX(1);
 				hint->data.length.unit = CSS_UNIT_PX;
 				hint->status = CSS_BORDER_WIDTH_WIDTH;
-				hint = css_hint_advance(hint);
+				css_hint_advance(&hint);
 			}
 		}
 		dom_string_unref(attr);
@@ -704,7 +704,7 @@ static void css_hint_table_cell_border_padding(
 				hint->prop = hint_prop;
 				hint->data.color = hint_color;
 				hint->status = CSS_BORDER_COLOR_COLOR;
-				hint = css_hint_advance(hint);
+				css_hint_advance(&hint);
 			}
 		}
 		dom_string_unref(attr);
@@ -729,7 +729,7 @@ static void css_hint_table_cell_border_padding(
 				hint->data.length.value = hint_length.value;
 				hint->data.length.unit = hint_length.unit;
 				hint->status = CSS_PADDING_SET;
-				hint = css_hint_advance(hint);
+				css_hint_advance(&hint);
 			}
 		}
 		dom_string_unref(attr);
@@ -754,25 +754,25 @@ static void css_hint_vertical_align_table_cells(
 				corestring_lwc_top)) {
 			hint->prop = CSS_PROP_VERTICAL_ALIGN;
 			hint->status = CSS_VERTICAL_ALIGN_TOP;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 		} else if (dom_string_caseless_lwc_isequal(attr,
 					corestring_lwc_middle)) {
 			hint->prop = CSS_PROP_VERTICAL_ALIGN;
 			hint->status = CSS_VERTICAL_ALIGN_MIDDLE;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 		} else if (dom_string_caseless_lwc_isequal(attr,
 					corestring_lwc_bottom)) {
 			hint->prop = CSS_PROP_VERTICAL_ALIGN;
 			hint->status = CSS_VERTICAL_ALIGN_BOTTOM;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 		} else if (dom_string_caseless_lwc_isequal(attr,
 					corestring_lwc_baseline)) {
 			hint->prop = CSS_PROP_VERTICAL_ALIGN;
 			hint->status = CSS_VERTICAL_ALIGN_BASELINE;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(attr);
 	}
@@ -794,7 +794,7 @@ static void css_hint_vertical_align_replaced(
 				corestring_lwc_top)) {
 			hint->prop = CSS_PROP_VERTICAL_ALIGN;
 			hint->status = CSS_VERTICAL_ALIGN_TOP;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 		} else if (dom_string_caseless_lwc_isequal(attr,
 					corestring_lwc_bottom) ||
@@ -802,13 +802,13 @@ static void css_hint_vertical_align_replaced(
 					corestring_lwc_baseline)) {
 			hint->prop = CSS_PROP_VERTICAL_ALIGN;
 			hint->status = CSS_VERTICAL_ALIGN_BASELINE;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 		} else if (dom_string_caseless_lwc_isequal(attr,
 					corestring_lwc_texttop)) {
 			hint->prop = CSS_PROP_VERTICAL_ALIGN;
 			hint->status = CSS_VERTICAL_ALIGN_TEXT_TOP;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 		} else if (dom_string_caseless_lwc_isequal(attr,
 					corestring_lwc_absmiddle) ||
@@ -816,7 +816,7 @@ static void css_hint_vertical_align_replaced(
 					corestring_lwc_abscenter)) {
 			hint->prop = CSS_PROP_VERTICAL_ALIGN;
 			hint->status = CSS_VERTICAL_ALIGN_MIDDLE;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(attr);
 	}
@@ -837,25 +837,25 @@ static void css_hint_text_align_normal(
 				corestring_lwc_left)) {
 			hint->prop = CSS_PROP_TEXT_ALIGN;
 			hint->status = CSS_TEXT_ALIGN_LEFT;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 		} else if (dom_string_caseless_lwc_isequal(align,
 					corestring_lwc_center)) {
 			hint->prop = CSS_PROP_TEXT_ALIGN;
 			hint->status = CSS_TEXT_ALIGN_CENTER;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 		} else if (dom_string_caseless_lwc_isequal(align,
 					corestring_lwc_right)) {
 			hint->prop = CSS_PROP_TEXT_ALIGN;
 			hint->status = CSS_TEXT_ALIGN_RIGHT;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 		} else if (dom_string_caseless_lwc_isequal(align,
 					corestring_lwc_justify)) {
 			hint->prop = CSS_PROP_TEXT_ALIGN;
 			hint->status = CSS_TEXT_ALIGN_JUSTIFY;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(align);
 	}
@@ -869,7 +869,7 @@ static void css_hint_text_align_center(
 
 	hint->prop = CSS_PROP_TEXT_ALIGN;
 	hint->status = CSS_TEXT_ALIGN_LIBCSS_CENTER;
-	hint = css_hint_advance(hint);
+	css_hint_advance(&hint);
 }
 
 static void css_hint_margin_left_right_align_center(
@@ -895,11 +895,11 @@ static void css_hint_margin_left_right_align_center(
 						corestring_lwc_absmiddle)) {
 			hint->prop = CSS_PROP_MARGIN_LEFT;
 			hint->status = CSS_MARGIN_AUTO;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 			hint->prop = CSS_PROP_MARGIN_RIGHT;
 			hint->status = CSS_MARGIN_AUTO;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(attr);
 	}
@@ -921,25 +921,25 @@ static void css_hint_text_align_special(
 				corestring_lwc_center)) {
 			hint->prop = CSS_PROP_TEXT_ALIGN;
 			hint->status = CSS_TEXT_ALIGN_LIBCSS_CENTER;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 		} else if (dom_string_caseless_lwc_isequal(align,
 					corestring_lwc_left)) {
 			hint->prop = CSS_PROP_TEXT_ALIGN;
 			hint->status = CSS_TEXT_ALIGN_LIBCSS_LEFT;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 		} else if (dom_string_caseless_lwc_isequal(align,
 					corestring_lwc_right)) {
 			hint->prop = CSS_PROP_TEXT_ALIGN;
 			hint->status = CSS_TEXT_ALIGN_LIBCSS_RIGHT;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 		} else if (dom_string_caseless_lwc_isequal(align,
 					corestring_lwc_justify)) {
 			hint->prop = CSS_PROP_TEXT_ALIGN;
 			hint->status = CSS_TEXT_ALIGN_JUSTIFY;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(align);
 	}
@@ -953,7 +953,7 @@ static void css_hint_text_align_table_special(
 
 	hint->prop = CSS_PROP_TEXT_ALIGN;
 	hint->status = CSS_TEXT_ALIGN_INHERIT_IF_NON_MAGIC;
-	hint = css_hint_advance(hint);
+	css_hint_advance(&hint);
 }
 
 static void css_hint_margin_hspace_vspace(
@@ -977,13 +977,13 @@ static void css_hint_margin_hspace_vspace(
 			hint->data.length.value = hint_length.value;
 			hint->data.length.unit = hint_length.unit;
 			hint->status = CSS_MARGIN_SET;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 			hint->prop = CSS_PROP_MARGIN_BOTTOM;
 			hint->data.length.value = hint_length.value;
 			hint->data.length.unit = hint_length.unit;
 			hint->status = CSS_MARGIN_SET;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(attr);
 	}
@@ -1001,13 +1001,13 @@ static void css_hint_margin_hspace_vspace(
 			hint->data.length.value = hint_length.value;
 			hint->data.length.unit = hint_length.unit;
 			hint->status = CSS_MARGIN_SET;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 			hint->prop = CSS_PROP_MARGIN_RIGHT;
 			hint->data.length.value = hint_length.value;
 			hint->data.length.unit = hint_length.unit;
 			hint->status = CSS_MARGIN_SET;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(attr);
 	}
@@ -1032,33 +1032,33 @@ static void css_hint_margin_left_right_hr(
 			hint->data.length.value = 0;
 			hint->data.length.unit = CSS_UNIT_PX;
 			hint->status = CSS_MARGIN_SET;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 			hint->prop = CSS_PROP_MARGIN_RIGHT;
 			hint->status = CSS_MARGIN_AUTO;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 		} else if (dom_string_caseless_lwc_isequal(attr,
 				corestring_lwc_center)) {
 			hint->prop = CSS_PROP_MARGIN_LEFT;
 			hint->status = CSS_MARGIN_AUTO;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 			hint->prop = CSS_PROP_MARGIN_RIGHT;
 			hint->status = CSS_MARGIN_AUTO;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 		} else if (dom_string_caseless_lwc_isequal(attr,
 				corestring_lwc_right)) {
 			hint->prop = CSS_PROP_MARGIN_LEFT;
 			hint->status = CSS_MARGIN_AUTO;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 			hint->prop = CSS_PROP_MARGIN_RIGHT;
 			hint->data.length.value = 0;
 			hint->data.length.unit = CSS_UNIT_PX;
 			hint->status = CSS_MARGIN_SET;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(attr);
 	}
@@ -1083,7 +1083,7 @@ static void css_hint_table_spacing_border(
 			     hint_prop++) {
 				hint->prop = hint_prop;
 				hint->status = CSS_BORDER_STYLE_OUTSET;
-				hint = css_hint_advance(hint);
+				css_hint_advance(&hint);
 		}
 
 		if (parse_dimension(
@@ -1098,7 +1098,7 @@ static void css_hint_table_spacing_border(
 				hint->data.length.value = hint_length.value;
 				hint->data.length.unit = hint_length.unit;
 				hint->status = CSS_BORDER_WIDTH_WIDTH;
-				hint = css_hint_advance(hint);
+				css_hint_advance(&hint);
 			}
 		}
 		dom_string_unref(attr);
@@ -1121,7 +1121,7 @@ static void css_hint_table_spacing_border(
 				hint->prop = hint_prop;
 				hint->data.color = hint_color;
 				hint->status = CSS_BORDER_COLOR_COLOR;
-				hint = css_hint_advance(hint);
+				css_hint_advance(&hint);
 			}
 		}
 		dom_string_unref(attr);
@@ -1138,7 +1138,7 @@ static void css_hint_table_spacing_border(
 			hint->prop = CSS_PROP_BORDER_SPACING;
 			hint->data.position.v = hint->data.position.h;
 			hint->status = CSS_BORDER_SPACING_SET;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(attr);
 	}
@@ -1162,7 +1162,7 @@ static void css_hint_height(
 				&hint->data.length.unit)) {
 			hint->prop = CSS_PROP_HEIGHT;
 			hint->status = CSS_HEIGHT_SET;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(attr);
 	}
@@ -1186,7 +1186,7 @@ static void css_hint_width(
 				&hint->data.length.unit)) {
 			hint->prop = CSS_PROP_WIDTH;
 			hint->status = CSS_WIDTH_SET;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(attr);
 	}
@@ -1211,7 +1211,7 @@ static void css_hint_height_width_textarea(
 			hint->prop = CSS_PROP_HEIGHT;
 			hint->data.length.unit = CSS_UNIT_EM;
 			hint->status = CSS_HEIGHT_SET;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(attr);
 	}
@@ -1227,12 +1227,74 @@ static void css_hint_height_width_textarea(
 			hint->prop = CSS_PROP_WIDTH;
 			hint->data.length.unit = CSS_UNIT_EX;
 			hint->status = CSS_WIDTH_SET;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(attr);
 	}
 }
 
+static void css_hint_height_width_canvas(
+		nscss_select_ctx *ctx,
+		dom_node *node)
+{
+	struct css_hint *hint = &hint_ctx.hints[hint_ctx.len];
+	dom_string *attr = NULL;
+	dom_exception err;
+	bool set_dim = false;
+
+	err = dom_element_get_attribute(node,
+			corestring_dom_height, &attr);
+
+	if (err == DOM_NO_ERR && attr != NULL) {
+		if (parse_dimension(
+				(const char *)dom_string_data(attr), true,
+				&hint->data.length.value,
+				&hint->data.length.unit)) {
+			hint->prop = CSS_PROP_HEIGHT;
+			hint->data.length.unit = CSS_UNIT_PX;
+			hint->status = CSS_HEIGHT_SET;
+			css_hint_advance(&hint);
+			set_dim = true;
+		}
+		dom_string_unref(attr);
+	}
+	if (set_dim == false) {
+		/* canvas defaults to 150px tall */
+		hint->prop = CSS_PROP_HEIGHT;
+		hint->data.length.unit = CSS_UNIT_PX;
+		hint->data.length.value = INTTOFIX(150);
+		hint->status = CSS_HEIGHT_SET;
+		css_hint_advance(&hint);
+	} else {
+		set_dim = false;
+	}
+
+	err = dom_element_get_attribute(node,
+			corestring_dom_width, &attr);
+
+	if (err == DOM_NO_ERR && attr != NULL) {
+		if (parse_dimension(
+				(const char *)dom_string_data(attr), true,
+				&hint->data.length.value,
+				&hint->data.length.unit)) {
+			hint->prop = CSS_PROP_WIDTH;
+			hint->data.length.unit = CSS_UNIT_PX;
+			hint->status = CSS_WIDTH_SET;
+			css_hint_advance(&hint);
+			set_dim = true;
+		}
+		dom_string_unref(attr);
+	}
+	if (set_dim == false) {
+		/* canvas defaults to 300px wide */
+		hint->prop = CSS_PROP_WIDTH;
+		hint->data.length.unit = CSS_UNIT_PX;
+		hint->data.length.value = INTTOFIX(300);
+		hint->status = CSS_WIDTH_SET;
+		css_hint_advance(&hint);
+	}
+}
+
 static void css_hint_width_input(
 		nscss_select_ctx *ctx,
 		dom_node *node)
@@ -1276,7 +1338,7 @@ static void css_hint_width_input(
 				if (attr2 != NULL) {
 					dom_string_unref(attr2);
 				}
-				hint = css_hint_advance(hint);
+				css_hint_advance(&hint);
 			}
 		}
 		dom_string_unref(attr);
@@ -1329,7 +1391,7 @@ static void css_hint_anchor_color(
 						&hint->data.color)) {
 			hint->prop = CSS_PROP_COLOR;
 			hint->status = CSS_COLOR_COLOR;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(color);
 	}
@@ -1351,7 +1413,7 @@ static void css_hint_body_color(
 						&hint->data.color)) {
 			hint->prop = CSS_PROP_COLOR;
 			hint->status = CSS_COLOR_COLOR;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(color);
 	}
@@ -1373,7 +1435,7 @@ static void css_hint_color(
 						&hint->data.color)) {
 			hint->prop = CSS_PROP_COLOR;
 			hint->status = CSS_COLOR_COLOR;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(color);
 	}
@@ -1395,7 +1457,7 @@ static void css_hint_font_size(
 						&hint->data.length.value,
 						&hint->data.length.unit)) {
 			hint->prop = CSS_PROP_FONT_SIZE;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(size);
 	}
@@ -1415,13 +1477,13 @@ static void css_hint_float(
 				corestring_lwc_left)) {
 			hint->prop = CSS_PROP_FLOAT;
 			hint->status = CSS_FLOAT_LEFT;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 
 		} else if (dom_string_caseless_lwc_isequal(align,
 				corestring_lwc_right)) {
 			hint->prop = CSS_PROP_FLOAT;
 			hint->status = CSS_FLOAT_RIGHT;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(align);
 	}
@@ -1441,7 +1503,7 @@ static void css_hint_caption_side(
 				corestring_lwc_bottom)) {
 			hint->prop = CSS_PROP_CAPTION_SIDE;
 			hint->status = CSS_CAPTION_SIDE_BOTTOM;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(align);
 	}
@@ -1463,7 +1525,7 @@ static void css_hint_bg_color(
 				&hint->data.color)) {
 			hint->prop = CSS_PROP_BACKGROUND_COLOR;
 			hint->status = CSS_BACKGROUND_COLOR_COLOR;
-			hint = css_hint_advance(hint);
+			css_hint_advance(&hint);
 		}
 		dom_string_unref(bgcolor);
 	}
@@ -1495,7 +1557,7 @@ static void css_hint_bg_image(
 				hint->prop = CSS_PROP_BACKGROUND_IMAGE;
 				hint->data.string = iurl;
 				hint->status = CSS_BACKGROUND_IMAGE_IMAGE;
-				hint = css_hint_advance(hint);
+				css_hint_advance(&hint);
 			}
 		}
 	}
@@ -1513,18 +1575,68 @@ static void css_hint_white_space_nowrap(
 	if (err == DOM_NO_ERR && nowrap == true) {
 		hint->prop = CSS_PROP_WHITE_SPACE;
 		hint->status = CSS_WHITE_SPACE_NOWRAP;
-		hint = css_hint_advance(hint);
+		css_hint_advance(&hint);
 	}
 }
 
+static void css_hint_list(
+		nscss_select_ctx *ctx,
+		dom_node *node)
+{
+	struct css_hint *hint = &(hint_ctx.hints[hint_ctx.len]);
+	dom_exception err;
+	dom_string *attr;
 
-/* Exported function, documeted in css/hints.h */
+	err = dom_element_get_attribute(node, corestring_dom_type, &attr);
+	if (err == DOM_NO_ERR && attr != NULL) {
+		const char *attr_str = dom_string_data(attr);
+		size_t attr_len = dom_string_byte_length(attr);
+		enum css_list_style_type_e type = CSS_LIST_STYLE_TYPE_INHERIT;
+
+		if (attr_len == 1) {
+			switch (attr_str[0]) {
+			case 'a':
+				type = CSS_LIST_STYLE_TYPE_LOWER_ALPHA;
+				break;
+			case 'A':
+				type = CSS_LIST_STYLE_TYPE_UPPER_ALPHA;
+				break;
+			case 'i':
+				type = CSS_LIST_STYLE_TYPE_LOWER_ROMAN;
+				break;
+			case 'I':
+				type = CSS_LIST_STYLE_TYPE_UPPER_ROMAN;
+				break;
+			case '1':
+				type = CSS_LIST_STYLE_TYPE_DECIMAL;
+				break;
+			}
+		}
+
+		if (type != CSS_LIST_STYLE_TYPE_INHERIT) {
+			hint->prop = CSS_PROP_LIST_STYLE_TYPE;
+			hint->status = type;
+			css_hint_advance(&hint);
+		}
+
+		dom_string_unref(attr);
+	}
+}
+
+
+/* Exported function, documented in css/hints.h */
 css_error node_presentational_hint(void *pw, void *node,
 		uint32_t *nhints, css_hint **hints)
 {
 	dom_exception exc;
 	dom_html_element_type tag_type;
 
+	if (nsoption_bool(author_level_css) == false) {
+		*nhints = 0;
+		*hints = NULL;
+		return CSS_OK;
+	}
+
 	css_hint_clean();
 
 	exc = dom_html_element_get_tag_type(node, &tag_type);
@@ -1538,22 +1650,22 @@ css_error node_presentational_hint(void *pw, void *node,
 		css_hint_width(pw, node);
 		css_hint_table_cell_border_padding(pw, node);
 		css_hint_white_space_nowrap(pw, node);
-		/* fall through */
+		fallthrough;
 	case DOM_HTML_ELEMENT_TYPE_TR:
 		css_hint_height(pw, node);
-		/* fall through */
+		fallthrough;
 	case DOM_HTML_ELEMENT_TYPE_THEAD:
 	case DOM_HTML_ELEMENT_TYPE_TBODY:
 	case DOM_HTML_ELEMENT_TYPE_TFOOT:
 		css_hint_text_align_special(pw, node);
-		/* fall through */
+		fallthrough;
 	case DOM_HTML_ELEMENT_TYPE_COL:
 		css_hint_vertical_align_table_cells(pw, node);
 		break;
 	case DOM_HTML_ELEMENT_TYPE_APPLET:
 	case DOM_HTML_ELEMENT_TYPE_IMG:
 		css_hint_margin_hspace_vspace(pw, node);
-		/* fall through */
+		fallthrough;
 	case DOM_HTML_ELEMENT_TYPE_EMBED:
 	case DOM_HTML_ELEMENT_TYPE_IFRAME:
 	case DOM_HTML_ELEMENT_TYPE_OBJECT:
@@ -1576,7 +1688,7 @@ css_error node_presentational_hint(void *pw, void *node,
 		break;
 	case DOM_HTML_ELEMENT_TYPE_CAPTION:
 		css_hint_caption_side(pw, node);
-		/* fall through */
+		fallthrough;
 	case DOM_HTML_ELEMENT_TYPE_DIV:
 		css_hint_text_align_special(pw, node);
 		break;
@@ -1606,6 +1718,12 @@ css_error node_presentational_hint(void *pw, void *node,
 	case DOM_HTML_ELEMENT_TYPE_BODY:
 		css_hint_body_color(pw, node);
 		break;
+	case DOM_HTML_ELEMENT_TYPE_CANVAS:
+		css_hint_height_width_canvas(pw, node);
+		break;
+	case DOM_HTML_ELEMENT_TYPE_OL:
+		css_hint_list(pw, node);
+		break;
 	default:
 		break;
 	}
diff --git a/content/handlers/css/select.c b/content/handlers/css/select.c
index 99840e954..c77644b43 100644
--- a/content/handlers/css/select.c
+++ b/content/handlers/css/select.c
@@ -91,10 +91,6 @@ static css_error set_libcss_node_data(void *pw, void *node,
 static css_error get_libcss_node_data(void *pw, void *node,
 		void **libcss_node_data);
 
-static css_error nscss_compute_font_size(void *pw, const css_hint *parent,
-		css_hint *size);
-
-
 /**
  * Selection callback table for libcss
  */
@@ -135,9 +131,8 @@ static css_select_handler selection_handler = {
 	node_is_lang,
 	node_presentational_hint,
 	ua_default_for_property,
-	nscss_compute_font_size,
 	set_libcss_node_data,
-	get_libcss_node_data
+	get_libcss_node_data,
 };
 
 /**
@@ -250,12 +245,15 @@ static void nscss_dom_user_data_handler(dom_node_operation operation,
  * \param ctx             CSS selection context
  * \param n               Element to select for
  * \param media           Permitted media types
+ * \param unit_unit_len_ctx    Unit length conversion context
  * \param inline_style    Inline style associated with element, or NULL
  * \return Pointer to selection results (containing computed styles),
  *         or NULL on failure
  */
 css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
-		const css_media *media, const css_stylesheet *inline_style)
+		const css_media *media,
+		const css_unit_ctx *unit_len_ctx,
+		const css_stylesheet *inline_style)
 {
 	css_computed_style *composed;
 	css_select_results *styles;
@@ -263,7 +261,7 @@ css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
 	css_error error;
 
 	/* Select style for node */
-	error = css_select_style(ctx->ctx, n, media, inline_style,
+	error = css_select_style(ctx->ctx, n, unit_len_ctx, media, inline_style,
 			&selection_handler, ctx, &styles);
 
 	if (error != CSS_OK || styles == NULL) {
@@ -278,8 +276,7 @@ css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
 		 * element's style */
 		error = css_computed_style_compose(ctx->parent_style,
 				styles->styles[CSS_PSEUDO_ELEMENT_NONE],
-				nscss_compute_font_size, ctx,
-				&composed);
+				unit_len_ctx, &composed);
 		if (error != CSS_OK) {
 			css_select_results_destroy(styles);
 			return NULL;
@@ -310,8 +307,7 @@ css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
 		error = css_computed_style_compose(
 				styles->styles[CSS_PSEUDO_ELEMENT_NONE],
 				styles->styles[pseudo_element],
-				nscss_compute_font_size, ctx,
-				&composed);
+				unit_len_ctx, &composed);
 		if (error != CSS_OK) {
 			/* TODO: perhaps this shouldn't be quite so
 			 * catastrophic? */
@@ -330,11 +326,13 @@ css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
 /**
  * Get a blank style
  *
- * \param ctx     CSS selection context
- * \param parent  Parent style to cascade inherited properties from
+ * \param ctx           CSS selection context
+ * \param unit_unit_len_ctx  Unit length conversion context
+ * \param parent        Parent style to cascade inherited properties from
  * \return Pointer to blank style, or NULL on failure
  */
 css_computed_style *nscss_get_blank_style(nscss_select_ctx *ctx,
+		const css_unit_ctx *unit_len_ctx,
 		const css_computed_style *parent)
 {
 	css_computed_style *partial, *composed;
@@ -349,7 +347,7 @@ css_computed_style *nscss_get_blank_style(nscss_select_ctx *ctx,
 	/* TODO: Do we really need to compose?  Initial style shouldn't
 	 * have any inherited properties. */
 	error = css_computed_style_compose(parent, partial,
-			nscss_compute_font_size, ctx, &composed);
+			unit_len_ctx, &composed);
 	css_computed_style_destroy(partial);
 	if (error != CSS_OK) {
 		css_computed_style_destroy(composed);
@@ -359,133 +357,6 @@ css_computed_style *nscss_get_blank_style(nscss_select_ctx *ctx,
 	return composed;
 }
 
-/**
- * Font size computation callback for libcss
- *
- * \param pw      Computation context
- * \param parent  Parent font size (absolute)
- * \param size    Font size to compute
- * \return CSS_OK on success
- *
- * \post \a size will be an absolute font size
- */
-css_error nscss_compute_font_size(void *pw, const css_hint *parent,
-		css_hint *size)
-{
-	/**
-	 * Table of font-size keyword scale factors
-	 *
-	 * These are multiplied by the configured default font size
-	 * to produce an absolute size for the relevant keyword
-	 */
-	static const css_fixed factors[] = {
-		FLTTOFIX(0.5625), /* xx-small */
-		FLTTOFIX(0.6250), /* x-small */
-		FLTTOFIX(0.8125), /* small */
-		FLTTOFIX(1.0000), /* medium */
-		FLTTOFIX(1.1250), /* large */
-		FLTTOFIX(1.5000), /* x-large */
-		FLTTOFIX(2.0000)  /* xx-large */
-	};
-	css_hint_length parent_size;
-
-	/* Grab parent size, defaulting to medium if none */
-	if (parent == NULL) {
-		parent_size.value = FDIV(FMUL(factors[CSS_FONT_SIZE_MEDIUM - 1],
-				INTTOFIX(nsoption_int(font_size))),
-				INTTOFIX(10));
-		parent_size.unit = CSS_UNIT_PT;
-	} else {
-		assert(parent->status == CSS_FONT_SIZE_DIMENSION);
-		assert(parent->data.length.unit != CSS_UNIT_EM);
-		assert(parent->data.length.unit != CSS_UNIT_EX);
-		assert(parent->data.length.unit != CSS_UNIT_PCT);
-
-		parent_size = parent->data.length;
-	}
-
-	assert(size->status != CSS_FONT_SIZE_INHERIT);
-
-	if (size->status < CSS_FONT_SIZE_LARGER) {
-		/* Keyword -- simple */
-		size->data.length.value = FDIV(FMUL(factors[size->status - 1],
-				INTTOFIX(nsoption_int(font_size))), F_10);
-		size->data.length.unit = CSS_UNIT_PT;
-	} else if (size->status == CSS_FONT_SIZE_LARGER) {
-		/** \todo Step within table, if appropriate */
-		size->data.length.value =
-				FMUL(parent_size.value, FLTTOFIX(1.2));
-		size->data.length.unit = parent_size.unit;
-	} else if (size->status == CSS_FONT_SIZE_SMALLER) {
-		/** \todo Step within table, if appropriate */
-		size->data.length.value =
-				FDIV(parent_size.value, FLTTOFIX(1.2));
-		size->data.length.unit = parent_size.unit;
-	} else if (size->data.length.unit == CSS_UNIT_EM ||
-			size->data.length.unit == CSS_UNIT_EX ||
-			size->data.length.unit == CSS_UNIT_CAP ||
-			size->data.length.unit == CSS_UNIT_CH ||
-			size->data.length.unit == CSS_UNIT_IC) {
-		size->data.length.value =
-			FMUL(size->data.length.value, parent_size.value);
-
-		switch (size->data.length.unit) {
-		case CSS_UNIT_EX:
-			/* 1ex = 0.6em in NetSurf */
-			size->data.length.value = FMUL(size->data.length.value,
-					FLTTOFIX(0.6));
-			break;
-		case CSS_UNIT_CAP:
-			/* Height of captals.  1cap = 0.9em in NetSurf. */
-			size->data.length.value = FMUL(size->data.length.value,
-					FLTTOFIX(0.9));
-			break;
-		case CSS_UNIT_CH:
-			/* Width of '0'.  1ch = 0.4em in NetSurf. */
-			size->data.length.value = FMUL(size->data.length.value,
-					FLTTOFIX(0.4));
-			break;
-		case CSS_UNIT_IC:
-			/* Width of U+6C43.  1ic = 1.1em in NetSurf. */
-			size->data.length.value = FMUL(size->data.length.value,
-					FLTTOFIX(1.1));
-			break;
-		default:
-			/* No scaling required for EM. */
-			break;
-		}
-
-		size->data.length.unit = parent_size.unit;
-	} else if (size->data.length.unit == CSS_UNIT_PCT) {
-		size->data.length.value = FDIV(FMUL(size->data.length.value,
-				parent_size.value), INTTOFIX(100));
-		size->data.length.unit = parent_size.unit;
-	} else if (size->data.length.unit == CSS_UNIT_REM) {
-		nscss_select_ctx *ctx = pw;
-		if (parent == NULL) {
-			size->data.length.value = parent_size.value;
-			size->data.length.unit = parent_size.unit;
-		} else {
-			css_computed_font_size(ctx->root_style,
-					&parent_size.value,
-					&size->data.length.unit);
-			size->data.length.value = FMUL(
-					size->data.length.value,
-					parent_size.value);
-		}
-	} else if (size->data.length.unit == CSS_UNIT_RLH) {
-		/** TODO: Convert root element line-height to absolute value. */
-		size->data.length.value = FMUL(size->data.length.value, FDIV(
-				INTTOFIX(nsoption_int(font_size)),
-				INTTOFIX(10)));
-		size->data.length.unit = CSS_UNIT_PT;
-	}
-
-	size->status = CSS_FONT_SIZE_DIMENSION;
-
-	return CSS_OK;
-}
-
 /******************************************************************************
  * Style selection callbacks                                                  *
  ******************************************************************************/
@@ -602,6 +473,7 @@ css_error named_ancestor_node(void *pw, void *node,
 {
 	dom_element_named_ancestor_node(node, qname->name,
 			(struct dom_element **)ancestor);
+	dom_node_unref(*ancestor);
 
 	return CSS_OK;
 }
@@ -622,6 +494,7 @@ css_error named_parent_node(void *pw, void *node,
 {
 	dom_element_named_parent_node(node, qname->name,
 			(struct dom_element **)parent);
+	dom_node_unref(*parent);
 
 	return CSS_OK;
 }
@@ -771,6 +644,7 @@ css_error named_generic_sibling_node(void *pw, void *node,
 css_error parent_node(void *pw, void *node, void **parent)
 {
 	dom_element_parent_node(node, (struct dom_element **)parent);
+	dom_node_unref(*parent);
 
 	return CSS_OK;
 }
diff --git a/content/handlers/css/select.h b/content/handlers/css/select.h
index b45d1ed3c..c17caadcb 100644
--- a/content/handlers/css/select.h
+++ b/content/handlers/css/select.h
@@ -45,9 +45,12 @@ css_stylesheet *nscss_create_inline_style(const uint8_t *data, size_t len,
 		const char *charset, const char *url, bool allow_quirks);
 
 css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
-		const css_media *media, const css_stylesheet *inline_style);
+		const css_media *media,
+		const css_unit_ctx *unit_len_ctx,
+		const css_stylesheet *inline_style);
 
 css_computed_style *nscss_get_blank_style(nscss_select_ctx *ctx,
+		const css_unit_ctx *unit_len_ctx,
 		const css_computed_style *parent);
 
 
diff --git a/content/handlers/css/utils.c b/content/handlers/css/utils.c
deleted file mode 100644
index cac777c1f..000000000
--- a/content/handlers/css/utils.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright 2004 James Bursa <james@netsurf-browser.org>
- * Copyright 2009 John-Mark Bell <jmb@netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <assert.h>
-
-#include "utils/nsoption.h"
-#include "utils/log.h"
-
-#include "css/utils.h"
-
-/** Screen DPI in fixed point units: defaults to 90, which RISC OS uses */
-css_fixed nscss_screen_dpi = F_90;
-
-/** Medium screen density for device viewing distance. */
-css_fixed nscss_baseline_pixel_density = F_96;
-
-/**
- * Map viewport-relative length units to either vh or vw.
- *
- * Non-viewport-relative units are unchanged.
- *
- * \param[in] ctx   Length conversion context.
- * \param[in] unit  Unit to map.
- * \return the mapped unit.
- */
-static inline css_unit css_utils__fudge_viewport_units(
-		const nscss_len_ctx *ctx,
-		css_unit unit)
-{
-	switch (unit) {
-	case CSS_UNIT_VI:
-		assert(ctx->root_style != NULL);
-		if (css_computed_writing_mode(ctx->root_style) ==
-				CSS_WRITING_MODE_HORIZONTAL_TB) {
-			unit = CSS_UNIT_VW;
-		} else {
-			unit = CSS_UNIT_VH;
-		}
-		break;
-	case CSS_UNIT_VB:
-		assert(ctx->root_style != NULL);
-		if (css_computed_writing_mode(ctx->root_style) ==
-				CSS_WRITING_MODE_HORIZONTAL_TB) {
-			unit = CSS_UNIT_VH;
-		} else {
-			unit = CSS_UNIT_VW;
-		}
-		break;
-	case CSS_UNIT_VMIN:
-		if (ctx->vh < ctx->vw) {
-			unit = CSS_UNIT_VH;
-		} else {
-			unit = CSS_UNIT_VW;
-		}
-		break;
-	case CSS_UNIT_VMAX:
-		if (ctx->vh > ctx->vw) {
-			unit = CSS_UNIT_VH;
-		} else {
-			unit = CSS_UNIT_VW;
-		}
-		break;
-	default: break;
-	}
-
-	return unit;
-}
-
-/* exported interface documented in content/handlers/css/utils.h */
-css_fixed nscss_len2pt(
-		const nscss_len_ctx *ctx,
-		css_fixed length,
-		css_unit unit)
-{
-	/* Length must not be relative */
-	assert(unit != CSS_UNIT_EM &&
-			unit != CSS_UNIT_EX &&
-			unit != CSS_UNIT_CAP &&
-			unit != CSS_UNIT_CH &&
-			unit != CSS_UNIT_IC &&
-			unit != CSS_UNIT_REM &&
-			unit != CSS_UNIT_RLH);
-
-	unit = css_utils__fudge_viewport_units(ctx, unit);
-
-	switch (unit) {
-	/* We assume the screen and any other output has the same dpi */
-	/* 1in = DPIpx => 1px = (72/DPI)pt */
-	case CSS_UNIT_PX: return FDIV(FMUL(length, F_72), F_96);
-	/* 1in = 72pt */
-	case CSS_UNIT_IN: return FMUL(length, F_72);
-	/* 1in = 2.54cm => 1cm = (72/2.54)pt */
-	case CSS_UNIT_CM: return FMUL(length,
-				FDIV(F_72, FLTTOFIX(2.54)));
-	/* 1in = 25.4mm => 1mm = (72/25.4)pt */
-	case CSS_UNIT_MM: return FMUL(length,
-				      FDIV(F_72, FLTTOFIX(25.4)));
-	/* 1in = 101.6q => 1mm = (72/101.6)pt */
-	case CSS_UNIT_Q: return FMUL(length,
-				      FDIV(F_72, FLTTOFIX(101.6)));
-	case CSS_UNIT_PT: return length;
-	/* 1pc = 12pt */
-	case CSS_UNIT_PC: return FMUL(length, INTTOFIX(12));
-	case CSS_UNIT_VH: return FDIV(FMUL(FDIV((length * ctx->vh), F_100), F_72), F_96);
-	case CSS_UNIT_VW: return FDIV(FMUL(FDIV((length * ctx->vw), F_100), F_72), F_96);
-	default: break;
-	}
-
-	return 0;
-}
-
-/* exported interface documented in content/handlers/css/utils.h */
-css_fixed nscss_len2px(
-		const nscss_len_ctx *ctx,
-		css_fixed length,
-		css_unit unit,
-		const css_computed_style *style)
-{
-	/* We assume the screen and any other output has the same dpi */
-	css_fixed px_per_unit;
-
-	unit = css_utils__fudge_viewport_units(ctx, unit);
-
-	switch (unit) {
-	case CSS_UNIT_EM:
-	case CSS_UNIT_EX:
-	case CSS_UNIT_CAP:
-	case CSS_UNIT_CH:
-	case CSS_UNIT_IC:
-	{
-		css_fixed font_size = 0;
-		css_unit font_unit = CSS_UNIT_PT;
-
-		assert(style != NULL);
-
-		css_computed_font_size(style, &font_size, &font_unit);
-
-		/* Convert to points */
-		font_size = nscss_len2pt(ctx, font_size, font_unit);
-
-		/* Clamp to configured minimum */
-		if (font_size < FDIV(INTTOFIX(nsoption_int(font_min_size)), F_10)) {
-		  font_size = FDIV(INTTOFIX(nsoption_int(font_min_size)), F_10);
-		}
-
-		/* Convert to pixels (manually, to maximise precision)
-		 * 1in = 72pt => 1pt = (DPI/72)px */
-		px_per_unit = FDIV(FMUL(font_size, F_96), F_72);
-
-		/* Scale non-em units to em.  We have fixed ratios. */
-		switch (unit) {
-		case CSS_UNIT_EX:
-			px_per_unit = FMUL(px_per_unit, FLTTOFIX(0.6));
-			break;
-		case CSS_UNIT_CAP:
-			px_per_unit = FMUL(px_per_unit, FLTTOFIX(0.9));
-			break;
-		case CSS_UNIT_CH:
-			px_per_unit = FMUL(px_per_unit, FLTTOFIX(0.4));
-			break;
-		case CSS_UNIT_IC:
-			px_per_unit = FMUL(px_per_unit, FLTTOFIX(1.1));
-			break;
-		default: break;
-		}
-	}
-		break;
-	case CSS_UNIT_PX:
-		px_per_unit = F_1;
-		break;
-	/* 1in = 96 CSS pixels */
-	case CSS_UNIT_IN:
-		px_per_unit = F_96;
-		break;
-	/* 1in = 2.54cm => 1cm = (DPI/2.54)px */
-	case CSS_UNIT_CM:
-		px_per_unit = FDIV(F_96, FLTTOFIX(2.54));
-		break;
-	/* 1in = 25.4mm => 1mm = (DPI/25.4)px */
-	case CSS_UNIT_MM:
-		px_per_unit = FDIV(F_96, FLTTOFIX(25.4));
-		break;
-	/* 1in = 101.6q => 1q = (DPI/101.6)px */
-	case CSS_UNIT_Q:
-		px_per_unit = FDIV(F_96, FLTTOFIX(101.6));
-		break;
-	/* 1in = 72pt => 1pt = (DPI/72)px */
-	case CSS_UNIT_PT:
-		px_per_unit = FDIV(F_96, F_72);
-		break;
-	/* 1pc = 12pt => 1in = 6pc => 1pc = (DPI/6)px */
-	case CSS_UNIT_PC:
-		px_per_unit = FDIV(F_96, INTTOFIX(6));
-		break;
-	case CSS_UNIT_REM:
-	{
-		css_fixed font_size = 0;
-		css_unit font_unit = CSS_UNIT_PT;
-
-		assert(ctx->root_style != NULL);
-
-		css_computed_font_size(ctx->root_style,
-				&font_size, &font_unit);
-
-		/* Convert to points */
-		font_size = nscss_len2pt(ctx, font_size, font_unit);
-
-		/* Clamp to configured minimum */
-		if (font_size < FDIV(INTTOFIX(nsoption_int(font_min_size)), F_10)) {
-			font_size = FDIV(INTTOFIX(nsoption_int(font_min_size)), F_10);
-		}
-
-		/* Convert to pixels (manually, to maximise precision)
-		 * 1in = 72pt => 1pt = (DPI/72)px */
-		px_per_unit = FDIV(FMUL(font_size, F_96), F_72);
-		break;
-	}
-	/* 1rlh = <user_font_size>pt => 1rlh = (DPI/user_font_size)px */
-	case CSS_UNIT_RLH:
-		px_per_unit = FDIV(F_96, FDIV(
-				INTTOFIX(nsoption_int(font_size)),
-				INTTOFIX(10)));
-		break;
-	case CSS_UNIT_VH:
-		px_per_unit = FDIV(ctx->vh, F_100);
-		break;
-	case CSS_UNIT_VW:
-		px_per_unit = FDIV(ctx->vw, F_100);
-		break;
-	default:
-		px_per_unit = 0;
-		break;
-	}
-
-	px_per_unit = nscss_pixels_css_to_physical(px_per_unit);
-
-	/* Ensure we round px_per_unit to the nearest whole number of pixels:
-	 * the use of FIXTOINT() below will truncate. */
-	px_per_unit += F_0_5;
-
-	/* Calculate total number of pixels */
-	return FMUL(length, TRUNCATEFIX(px_per_unit));
-}
diff --git a/content/handlers/css/utils.h b/content/handlers/css/utils.h
index e35a6605b..ee241e2cc 100644
--- a/content/handlers/css/utils.h
+++ b/content/handlers/css/utils.h
@@ -26,122 +26,52 @@
 /** DPI of the screen, in fixed point units */
 extern css_fixed nscss_screen_dpi;
 
-/** Medium screen density for device viewing distance. */
-extern css_fixed nscss_baseline_pixel_density;
-
-/**
- * Length conversion context data.
- */
-typedef struct nscss_len_ctx {
-	/**
-	 * Viewport width in px.
-	 * Only used if unit is vh, vw, vi, vb, vmin, or vmax.
-	 */
-	int vw;
-	/**
-	 * Viewport height in px.
-	 * Only used if unit is vh, vw, vi, vb, vmin, or vmax.
-	 */
-	int vh;
-	/**
-	 * Computed style for the document root element.
-	 * May be NULL if unit is not rem, or rlh.
-	 */
-	const css_computed_style *root_style;
-} nscss_len_ctx;
-
-/**
- * Convert an absolute CSS length to points.
- *
- * \param[in] ctx     Length conversion context.
- * \param[in] length  Absolute CSS length.
- * \param[in] unit    Unit of the length.
- * \return length in points
- */
-css_fixed nscss_len2pt(
-		const nscss_len_ctx *ctx,
-		css_fixed length,
-		css_unit unit);
-
-/**
- * Convert a CSS length to pixels.
- *
- * \param[in] ctx     Length conversion context.
- * \param[in] length  Length to convert.
- * \param[in] unit    Corresponding unit.
- * \param[in] style   Computed style applying to length.
- *                    May be NULL if unit is not em, ex, cap, ch, or ic.
- * \return length in pixels
- */
-css_fixed nscss_len2px(
-		const nscss_len_ctx *ctx,
-		css_fixed length,
-		css_unit unit,
-		const css_computed_style *style);
-
-/**
- * Convert css pixels to physical pixels.
- *
- * \param[in] css_pixels  Length in css pixels.
- * \return length in physical pixels
- */
-static inline css_fixed nscss_pixels_css_to_physical(
-		css_fixed css_pixels)
-{
-	return FDIV(FMUL(css_pixels, nscss_screen_dpi),
-			nscss_baseline_pixel_density);
-}
-
-/**
- * Convert physical pixels to css pixels.
- *
- * \param[in] physical_pixels  Length in physical pixels.
- * \return length in css pixels
- */
-static inline css_fixed nscss_pixels_physical_to_css(
-		css_fixed physical_pixels)
-{
-	return FDIV(FMUL(physical_pixels, nscss_baseline_pixel_density),
-			nscss_screen_dpi);
-}
-
 /**
  * Temporary helper wrappers for for libcss computed style getter, while
- * we don't support flexbox related property values.
+ * we don't support all values of display.
  */
-
 static inline uint8_t ns_computed_display(
 		const css_computed_style *style, bool root)
 {
 	uint8_t value = css_computed_display(style, root);
 
-	if (value == CSS_DISPLAY_FLEX) {
+	switch (value) {
+	case CSS_DISPLAY_GRID:
 		return CSS_DISPLAY_BLOCK;
 
-	} else if (value == CSS_DISPLAY_INLINE_FLEX) {
+	case CSS_DISPLAY_INLINE_GRID:
 		return CSS_DISPLAY_INLINE_BLOCK;
+
+	default:
+		break;
 	}
 
 	return value;
 }
 
-
+/**
+ * Temporary helper wrappers for for libcss computed style getter, while
+ * we don't support all values of display.
+ */
 static inline uint8_t ns_computed_display_static(
 		const css_computed_style *style)
 {
 	uint8_t value = css_computed_display_static(style);
 
-	if (value == CSS_DISPLAY_FLEX) {
+	switch (value) {
+	case CSS_DISPLAY_GRID:
 		return CSS_DISPLAY_BLOCK;
 
-	} else if (value == CSS_DISPLAY_INLINE_FLEX) {
+	case CSS_DISPLAY_INLINE_GRID:
 		return CSS_DISPLAY_INLINE_BLOCK;
+
+	default:
+		break;
 	}
 
 	return value;
 }
 
-
 static inline uint8_t ns_computed_min_height(
 		const css_computed_style *style,
 		css_fixed *length, css_unit *unit)
diff --git a/content/handlers/html/Makefile b/content/handlers/html/Makefile
index afefba27d..e41cc1d22 100644
--- a/content/handlers/html/Makefile
+++ b/content/handlers/html/Makefile
@@ -1,7 +1,25 @@
 # HTML content handler sources
 
-S_HTML := box.c box_construct.c box_normalise.c box_textarea.c	\
-	font.c form.c imagemap.c layout.c search.c table.c 	\
-	html.c html_css.c html_css_fetcher.c html_script.c	\
-	html_interaction.c html_redraw.c html_redraw_border.c	\
-	html_forms.c html_object.c
+S_HTML := box_construct.c	\
+	box_inspect.c		\
+	box_manipulate.c	\
+	box_normalise.c		\
+	box_special.c		\
+	box_textarea.c		\
+	css.c			\
+	css_fetcher.c		\
+	dom_event.c		\
+	font.c			\
+	form.c			\
+	forms.c			\
+	html.c			\
+	imagemap.c		\
+	interaction.c		\
+	layout.c		\
+	layout_flex.c		\
+	object.c		\
+	redraw.c		\
+	redraw_border.c		\
+	script.c		\
+	table.c			\
+	textselection.c
diff --git a/content/handlers/html/box.c b/content/handlers/html/box.c
deleted file mode 100644
index d9e649558..000000000
--- a/content/handlers/html/box.c
+++ /dev/null
@@ -1,1241 +0,0 @@
-/*
- * Copyright 2005-2007 James Bursa <bursa@users.sourceforge.net>
- * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
- * Copyright 2005 John M Bell <jmb202@ecs.soton.ac.uk>
- * Copyright 2008 Michael Drake <tlsa@netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file
- * implementation of box tree manipulation.
- */
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <dom/dom.h>
-
-#include "utils/nsoption.h"
-#include "utils/log.h"
-#include "utils/talloc.h"
-#include "netsurf/misc.h"
-#include "netsurf/content.h"
-#include "netsurf/mouse.h"
-#include "css/utils.h"
-#include "css/dump.h"
-#include "desktop/scrollbar.h"
-#include "desktop/gui_internal.h"
-
-#include "html/box.h"
-#include "html/form_internal.h"
-#include "html/html_internal.h"
-
-#define box_is_float(box) (box->type == BOX_FLOAT_LEFT || \
-		box->type == BOX_FLOAT_RIGHT)
-
-/**
- * Destructor for box nodes which own styles
- *
- * \param b The box being destroyed.
- * \return 0 to allow talloc to continue destroying the tree.
- */
-static int box_talloc_destructor(struct box *b)
-{
-	struct html_scrollbar_data *data;
-
-	if ((b->flags & STYLE_OWNED) && b->style != NULL) {
-		css_computed_style_destroy(b->style);
-		b->style = NULL;
-	}
-
-	if (b->styles != NULL) {
-		css_select_results_destroy(b->styles);
-		b->styles = NULL;
-	}
-
-	if (b->href != NULL)
-		nsurl_unref(b->href);
-
-	if (b->id != NULL) {
-		lwc_string_unref(b->id);
-	}
-
-	if (b->node != NULL) {
-		dom_node_unref(b->node);
-	}
-
-	if (b->scroll_x != NULL) {
-		data = scrollbar_get_data(b->scroll_x);
-		scrollbar_destroy(b->scroll_x);
-		free(data);
-	}
-
-	if (b->scroll_y != NULL) {
-		data = scrollbar_get_data(b->scroll_y);
-		scrollbar_destroy(b->scroll_y);
-		free(data);
-	}
-
-	return 0;
-}
-
-/**
- * Create a box tree node.
- *
- * \param  styles       selection results for the box, or NULL
- * \param  style        computed style for the box (not copied), or 0
- * \param  style_owned  whether style is owned by this box
- * \param  href         href for the box (copied), or 0
- * \param  target       target for the box (not copied), or 0
- * \param  title        title for the box (not copied), or 0
- * \param  id           id for the box (not copied), or 0
- * \param  context      context for allocations
- * \return  allocated and initialised box, or 0 on memory exhaustion
- *
- * styles is always owned by the box, if it is set.
- * style is only owned by the box in the case of implied boxes.
- */
-
-struct box * box_create(css_select_results *styles, css_computed_style *style,
-		bool style_owned, nsurl *href, const char *target,
-		const char *title, lwc_string *id, void *context)
-{
-	unsigned int i;
-	struct box *box;
-
-	box = talloc(context, struct box);
-	if (!box) {
-		return 0;
-	}
-
-	talloc_set_destructor(box, box_talloc_destructor);
-
-	box->type = BOX_INLINE;
-	box->flags = 0;
-	box->flags = style_owned ? (box->flags | STYLE_OWNED) : box->flags;
-	box->styles = styles;
-	box->style = style;
-	box->x = box->y = 0;
-	box->width = UNKNOWN_WIDTH;
-	box->height = 0;
-	box->descendant_x0 = box->descendant_y0 = 0;
-	box->descendant_x1 = box->descendant_y1 = 0;
-	for (i = 0; i != 4; i++)
-		box->margin[i] = box->padding[i] = box->border[i].width = 0;
-	box->scroll_x = box->scroll_y = NULL;
-	box->min_width = 0;
-	box->max_width = UNKNOWN_MAX_WIDTH;
-	box->byte_offset = 0;
-	box->text = NULL;
-	box->length = 0;
-	box->space = 0;
-	box->href = (href == NULL) ? NULL : nsurl_ref(href);
-	box->target = target;
-	box->title = title;
-	box->columns = 1;
-	box->rows = 1;
-	box->start_column = 0;
-	box->next = NULL;
-	box->prev = NULL;
-	box->children = NULL;
-	box->last = NULL;
-	box->parent = NULL;
-	box->inline_end = NULL;
-	box->float_children = NULL;
-	box->float_container = NULL;
-	box->next_float = NULL;
-	box->cached_place_below_level = 0;
-	box->list_marker = NULL;
-	box->col = NULL;
-	box->gadget = NULL;
-	box->usemap = NULL;
-	box->id = id;
-	box->background = NULL;
-	box->object = NULL;
-	box->object_params = NULL;
-	box->iframe = NULL;
-	box->node = NULL;
-
-	return box;
-}
-
-/**
- * Add a child to a box tree node.
- *
- * \param  parent  box giving birth
- * \param  child   box to link as last child of parent
- */
-
-void box_add_child(struct box *parent, struct box *child)
-{
-	assert(parent);
-	assert(child);
-
-	if (parent->children != 0) {	/* has children already */
-		parent->last->next = child;
-		child->prev = parent->last;
-	} else {			/* this is the first child */
-		parent->children = child;
-		child->prev = 0;
-	}
-
-	parent->last = child;
-	child->parent = parent;
-}
-
-
-/**
- * Insert a new box as a sibling to a box in a tree.
- *
- * \param  box      box already in tree
- * \param  new_box  box to link into tree as next sibling
- */
-
-void box_insert_sibling(struct box *box, struct box *new_box)
-{
-	new_box->parent = box->parent;
-	new_box->prev = box;
-	new_box->next = box->next;
-	box->next = new_box;
-	if (new_box->next)
-		new_box->next->prev = new_box;
-	else if (new_box->parent)
-		new_box->parent->last = new_box;
-}
-
-
-/**
- * Unlink a box from the box tree and then free it recursively.
- *
- * \param  box  box to unlink and free recursively.
- */
-
-void box_unlink_and_free(struct box *box)
-{
-	struct box *parent = box->parent;
-	struct box *next = box->next;
-	struct box *prev = box->prev;
-
-	if (parent) {
-		if (parent->children == box)
-			parent->children = next;
-		if (parent->last == box)
-			parent->last = next ? next : prev;
-	}
-
-	if (prev)
-		prev->next = next;
-	if (next)
-		next->prev = prev;
-
-	box_free(box);
-}
-
-
-/**
- * Free a box tree recursively.
- *
- * \param  box  box to free recursively
- *
- * The box and all its children is freed.
- */
-
-void box_free(struct box *box)
-{
-	struct box *child, *next;
-
-	/* free children first */
-	for (child = box->children; child; child = next) {
-		next = child->next;
-		box_free(child);
-	}
-
-	/* last this box */
-	box_free_box(box);
-}
-
-
-/**
- * Free the data in a single box structure.
- *
- * \param  box  box to free
- */
-
-void box_free_box(struct box *box)
-{
-	if (!(box->flags & CLONE)) {
-		if (box->gadget)
-			form_free_control(box->gadget);
-		if (box->scroll_x != NULL)
-			scrollbar_destroy(box->scroll_x);
-		if (box->scroll_y != NULL)
-			scrollbar_destroy(box->scroll_y);
-		if (box->styles != NULL)
-			css_select_results_destroy(box->styles);
-	}
-
-	talloc_free(box);
-}
-
-
-/**
- * Find the absolute coordinates of a box.
- *
- * \param  box  the box to calculate coordinates of
- * \param  x    updated to x coordinate
- * \param  y    updated to y coordinate
- */
-
-void box_coords(struct box *box, int *x, int *y)
-{
-	*x = box->x;
-	*y = box->y;
-	while (box->parent) {
-		if (box_is_float(box)) {
-			do {
-				box = box->parent;
-			} while (!box->float_children);
-		} else
-			box = box->parent;
-		*x += box->x - scrollbar_get_offset(box->scroll_x);
-		*y += box->y - scrollbar_get_offset(box->scroll_y);
-	}
-}
-
-
-/**
- * Find the bounds of a box.
- *
- * \param  box  the box to calculate bounds of
- * \param  r    receives bounds
- */
-
-void box_bounds(struct box *box, struct rect *r)
-{
-	int width, height;
-
-	box_coords(box, &r->x0, &r->y0);
-
-	width = box->padding[LEFT] + box->width + box->padding[RIGHT];
-	height = box->padding[TOP] + box->height + box->padding[BOTTOM];
-
-	r->x1 = r->x0 + width;
-	r->y1 = r->y0 + height;
-}
-
-
-/**
- * Determine if a point lies within a box.
- *
- * \param[in]  len_ctx     CSS length conversion context to use.
- * \param[in]  box         Box to consider
- * \param[in]  x           Coordinate relative to box
- * \param[in]  y           Coordinate relative to box
- * \param[out] physically  If function returning true, physically is set true
- *                         iff point is within the box's physical dimensions and
- *                         false if the point is not within the box's physical
- *                         dimensions but is in the area defined by the box's
- *                         descendants.  If function returns false, physically
- *                         is undefined.
- * \return  true if the point is within the box or a descendant box
- *
- * This is a helper function for box_at_point().
- */
-
-static bool box_contains_point(
-		const nscss_len_ctx *len_ctx,
-		const struct box *box,
-		int x,
-		int y,
-		bool *physically)
-{
-	css_computed_clip_rect css_rect;
-
-	if (box->style != NULL &&
-			css_computed_position(box->style) ==
-					CSS_POSITION_ABSOLUTE &&
-			css_computed_clip(box->style, &css_rect) ==
-					CSS_CLIP_RECT) {
-		/* We have an absolutly positioned box with a clip rect */
-		struct rect r = {
-			.x0 = box->border[LEFT].width,
-			.y0 = box->border[TOP].width,
-			.x1 = box->padding[LEFT] + box->width +
-					box->border[RIGHT].width +
-					box->padding[RIGHT],
-			.y1 = box->padding[TOP] + box->height +
-					box->border[BOTTOM].width +
-					box->padding[BOTTOM]
-		};
-		if (x >= r.x0 && x < r.x1 && y >= r.y0 && y < r.y1)
-			*physically = true;
-		else
-			*physically = false;
-
-		/* Adjust rect to css clip region */
-		if (css_rect.left_auto == false) {
-			r.x0 += FIXTOINT(nscss_len2px(len_ctx,
-					css_rect.left, css_rect.lunit,
-					box->style));
-		}
-		if (css_rect.top_auto == false) {
-			r.y0 += FIXTOINT(nscss_len2px(len_ctx,
-					css_rect.top, css_rect.tunit,
-					box->style));
-		}
-		if (css_rect.right_auto == false) {
-			r.x1 = box->border[LEFT].width +
-					FIXTOINT(nscss_len2px(len_ctx,
-							css_rect.right,
-							css_rect.runit,
-							box->style));
-		}
-		if (css_rect.bottom_auto == false) {
-			r.y1 = box->border[TOP].width +
-					FIXTOINT(nscss_len2px(len_ctx,
-							css_rect.bottom,
-							css_rect.bunit,
-							box->style));
-		}
-
-		/* Test if point is in clipped box */
-		if (x >= r.x0 && x < r.x1 && y >= r.y0 && y < r.y1) {
-			/* inside clip area */
-			return true;
-		}
-
-		/* Not inside clip area */
-		return false;
-	}
-	if (x >= -box->border[LEFT].width &&
-			x < box->padding[LEFT] + box->width +
-			box->padding[RIGHT] + box->border[RIGHT].width &&
-			y >= -box->border[TOP].width &&
-			y < box->padding[TOP] + box->height +
-			box->padding[BOTTOM] + box->border[BOTTOM].width) {
-		*physically = true;
-		return true;
-	}
-	if (box->list_marker && box->list_marker->x - box->x <= x +
-			box->list_marker->border[LEFT].width &&
-			x < box->list_marker->x - box->x +
-			box->list_marker->padding[LEFT] +
-			box->list_marker->width +
-			box->list_marker->border[RIGHT].width +
-			box->list_marker->padding[RIGHT] &&
-			box->list_marker->y - box->y <= y +
-			box->list_marker->border[TOP].width &&
-			y < box->list_marker->y - box->y +
-			box->list_marker->padding[TOP] +
-			box->list_marker->height +
-			box->list_marker->border[BOTTOM].width +
-			box->list_marker->padding[BOTTOM]) {
-		*physically = true;
-		return true;
-	}
-	if ((box->style && css_computed_overflow_x(box->style) ==
-			CSS_OVERFLOW_VISIBLE) || !box->style) {
-		if (box->descendant_x0 <= x &&
-				x < box->descendant_x1) {
-			*physically = false;
-			return true;
-		}
-	}
-	if ((box->style && css_computed_overflow_y(box->style) ==
-			CSS_OVERFLOW_VISIBLE) || !box->style) {
-		if (box->descendant_y0 <= y &&
-				y < box->descendant_y1) {
-			*physically = false;
-			return true;
-		}
-	}
-	return false;
-}
-
-
-/** Direction to move in a box-tree walk */
-enum box_walk_dir {
-	BOX_WALK_CHILDREN,
-	BOX_WALK_PARENT,
-	BOX_WALK_NEXT_SIBLING,
-	BOX_WALK_FLOAT_CHILDREN,
-	BOX_WALK_NEXT_FLOAT_SIBLING,
-	BOX_WALK_FLOAT_CONTAINER
-};
-
-
-/**
- * Move from box to next box in given direction, adjusting for box coord change
- *
- * \param b	box to move from from
- * \param dir	direction to move in
- * \param x	box's global x-coord, updated to position of next box
- * \param y	box's global y-coord, updated to position of next box
- *
- * If no box can be found in given direction, NULL is returned.
- */
-static inline struct box *box_move_xy(struct box *b, enum box_walk_dir dir,
-		int *x, int *y)
-{
-	struct box *rb = NULL;
-
-	switch (dir) {
-	case BOX_WALK_CHILDREN:
-		b = b->children;
-		if (b == NULL)
-			break;
-		*x += b->x;
-		*y += b->y;
-		if (!box_is_float(b)) {
-			rb = b;
-			break;
-		}
-		/* fall through */
-
-	case BOX_WALK_NEXT_SIBLING:
-		do {
-			*x -= b->x;
-			*y -= b->y;
-			b = b->next;
-			if (b == NULL)
-				break;
-			*x += b->x;
-			*y += b->y;
-		} while (box_is_float(b));
-		rb = b;
-		break;
-
-	case BOX_WALK_PARENT:
-		*x -= b->x;
-		*y -= b->y;
-		rb = b->parent;
-		break;
-
-	case BOX_WALK_FLOAT_CHILDREN:
-		b = b->float_children;
-		if (b == NULL)
-			break;
-		*x += b->x;
-		*y += b->y;
-		rb = b;
-		break;
-
-	case BOX_WALK_NEXT_FLOAT_SIBLING:
-		*x -= b->x;
-		*y -= b->y;
-		b = b->next_float;
-		if (b == NULL)
-			break;
-		*x += b->x;
-		*y += b->y;
-		rb = b;
-		break;
-
-	case BOX_WALK_FLOAT_CONTAINER:
-		*x -= b->x;
-		*y -= b->y;
-		rb = b->float_container;
-		break;
-
-	default:
-		assert(0 && "Bad box walk type.");
-	}
-
-	return rb;
-}
-
-
-/**
- * Itterator for walking to next box in interaction order
- *
- * \param b	box to find next box from
- * \param x	box's global x-coord, updated to position of next box
- * \param y	box's global y-coord, updated to position of next box
- * \param skip_children	whether to skip box's children
- *
- * This walks to a boxes float children before its children.  When walking
- * children, floating boxes are skipped.
- */
-static inline struct box *box_next_xy(struct box *b, int *x, int *y,
-		bool skip_children)
-{
-	struct box *n;
-	int tx, ty;
-
-	assert(b != NULL);
-
-	if (skip_children) {
-		/* Caller is not interested in any kind of children */
-		goto skip_children;
-	}
-
-	tx = *x; ty = *y;
-	n = box_move_xy(b, BOX_WALK_FLOAT_CHILDREN, &tx, &ty);
-	if (n) {
-		/* Next node is float child */
-		*x = tx;
-		*y = ty;
-		return n;
-	}
-done_float_children:
-
-	tx = *x; ty = *y;
-	n = box_move_xy(b, BOX_WALK_CHILDREN, &tx, &ty);
-	if (n) {
-		/* Next node is child */
-		*x = tx;
-		*y = ty;
-		return n;
-	}
-
-skip_children:
-	tx = *x; ty = *y;
-	n = box_move_xy(b, BOX_WALK_NEXT_FLOAT_SIBLING, &tx, &ty);
-	if (n) {
-		/* Go to next float sibling */
-		*x = tx;
-		*y = ty;
-		return n;
-	}
-
-	if (box_is_float(b)) {
-		/* Done floats, but the float container may have children,
-		 * or siblings, or ansestors with siblings.  Change to
-		 * float container and move past handling its float children.
-		 */
-		b = box_move_xy(b, BOX_WALK_FLOAT_CONTAINER, x, y);
-		goto done_float_children;
-	}
-
-	/* Go to next sibling, or nearest ancestor with next sibling. */
-	while (b) {
-		while (!b->next && b->parent) {
-			b = box_move_xy(b, BOX_WALK_PARENT, x, y);
-			if (box_is_float(b)) {
-				/* Go on to next float, if there is one */
-				goto skip_children;
-			}
-		}
-		if (!b->next) {
-			/* No more boxes */
-			return NULL;
-		}
-
-		tx = *x; ty = *y;
-		n = box_move_xy(b, BOX_WALK_NEXT_SIBLING, &tx, &ty);
-		if (n) {
-			/* Go to non-float (ancestor) sibling */
-			*x = tx;
-			*y = ty;
-			return n;
-
-		} else if (b->parent) {
-			b = box_move_xy(b, BOX_WALK_PARENT, x, y);
-			if (box_is_float(b)) {
-				/* Go on to next float, if there is one */
-				goto skip_children;
-			}
-
-		} else {
-			/* No more boxes */
-			return NULL;
-		}
-	}
-
-	assert(b != NULL);
-	return NULL;
-}
-
-
-
-/**
- * Find the boxes at a point.
- *
- * \param  len_ctx  CSS length conversion context for document.
- * \param  box      box to search children of
- * \param  x        point to find, in global document coordinates
- * \param  y        point to find, in global document coordinates
- * \param  box_x    position of box, in global document coordinates, updated
- *                  to position of returned box, if any
- * \param  box_y    position of box, in global document coordinates, updated
- *                  to position of returned box, if any
- * \return  box at given point, or 0 if none found
- *
- * To find all the boxes in the hierarchy at a certain point, use code like
- * this:
- * \code
- *	struct box *box = top_of_document_to_search;
- *	int box_x = 0, box_y = 0;
- *
- *	while ((box = box_at_point(len_ctx, box, x, y, &box_x, &box_y))) {
- *		// process box
- *	}
- * \endcode
- */
-
-struct box *box_at_point(const nscss_len_ctx *len_ctx,
-		struct box *box, const int x, const int y,
-		int *box_x, int *box_y)
-{
-	bool skip_children;
-	bool physically;
-
-	assert(box);
-
-	skip_children = false;
-	while ((box = box_next_xy(box, box_x, box_y, skip_children))) {
-		if (box_contains_point(len_ctx, box, x - *box_x, y - *box_y,
-				&physically)) {
-			*box_x -= scrollbar_get_offset(box->scroll_x);
-			*box_y -= scrollbar_get_offset(box->scroll_y);
-
-			if (physically)
-				return box;
-
-			skip_children = false;
-		} else {
-			skip_children = true;
-		}
-	}
-
-	return NULL;
-}
-
-
-/**
- * Check whether box is nearer mouse coordinates than current nearest box
- *
- * \param  box      box to test
- * \param  bx	    position of box, in global document coordinates
- * \param  by	    position of box, in global document coordinates
- * \param  x	    mouse point, in global document coordinates
- * \param  y	    mouse point, in global document coordinates
- * \param  dir      direction in which to search (-1 = above-left,
- *						  +1 = below-right)
- * \param  nearest  nearest text box found, or NULL if none
- *		    updated if box is nearer than existing nearest
- * \param  tx	    position of text_box, in global document coordinates
- *		    updated if box is nearer than existing nearest
- * \param  ty	    position of text_box, in global document coordinates
- *		    updated if box is nearer than existing nearest
- * \param  nr_xd    distance to nearest text box found
- *		    updated if box is nearer than existing nearest
- * \param  nr_yd    distance to nearest text box found
- *		    updated if box is nearer than existing nearest
- * \return true if mouse point is inside box
- */
-
-static bool box_nearer_text_box(struct box *box, int bx, int by,
-		int x, int y, int dir, struct box **nearest, int *tx, int *ty,
-		int *nr_xd, int *nr_yd)
-{
-	int w = box->padding[LEFT] + box->width + box->padding[RIGHT];
-	int h = box->padding[TOP] + box->height + box->padding[BOTTOM];
-	int y1 = by + h;
-	int x1 = bx + w;
-	int yd = INT_MAX;
-	int xd = INT_MAX;
-
-	if (x >= bx && x1 > x && y >= by && y1 > y) {
-		*nearest = box;
-		*tx = bx;
-		*ty = by;
-		return true;
-	}
-
-	if (box->parent->list_marker != box) {
-		if (dir < 0) {
-			/* consider only those children (partly) above-left */
-			if (by <= y && bx < x) {
-				yd = y <= y1 ? 0 : y - y1;
-				xd = x <= x1 ? 0 : x - x1;
-			}
-		} else {
-			/* consider only those children (partly) below-right */
-			if (y1 > y && x1 > x) {
-				yd = y > by ? 0 : by - y;
-				xd = x > bx ? 0 : bx - x;
-			}
-		}
-
-		/* give y displacement precedence over x */
-		if (yd < *nr_yd || (yd == *nr_yd && xd <= *nr_xd)) {
-			*nr_yd = yd;
-			*nr_xd = xd;
-			*nearest = box;
-			*tx = bx;
-			*ty = by;
-		}
-	}
-	return false;
-}
-
-
-/**
- * Pick the text box child of 'box' that is closest to and above-left
- * (dir -ve) or below-right (dir +ve) of the point 'x,y'
- *
- * \param  box      parent box
- * \param  bx	    position of box, in global document coordinates
- * \param  by	    position of box, in global document coordinates
- * \param  fx	    position of float parent, in global document coordinates
- * \param  fy	    position of float parent, in global document coordinates
- * \param  x	    mouse point, in global document coordinates
- * \param  y	    mouse point, in global document coordinates
- * \param  dir      direction in which to search (-1 = above-left,
- *						  +1 = below-right)
- * \param  nearest  nearest text box found, or NULL if none
- *		    updated if a descendant of box is nearer than old nearest
- * \param  tx	    position of nearest, in global document coordinates
- *		    updated if a descendant of box is nearer than old nearest
- * \param  ty	    position of nearest, in global document coordinates
- *		    updated if a descendant of box is nearer than old nearest
- * \param  nr_xd    distance to nearest text box found
- *		    updated if a descendant of box is nearer than old nearest
- * \param  nr_yd    distance to nearest text box found
- *		    updated if a descendant of box is nearer than old nearest
- * \return true if mouse point is inside text_box
- */
-
-static bool box_nearest_text_box(struct box *box, int bx, int by,
-		int fx, int fy, int x, int y, int dir, struct box **nearest,
-		int *tx, int *ty, int *nr_xd, int *nr_yd)
-{
-	struct box *child = box->children;
-	int c_bx, c_by;
-	int c_fx, c_fy;
-	bool in_box = false;
-
-	if (*nearest == NULL) {
-		*nr_xd = INT_MAX / 2; /* displacement of 'nearest so far' */
-		*nr_yd = INT_MAX / 2;
-	}
-	if (box->type == BOX_INLINE_CONTAINER) {
-		int bw = box->padding[LEFT] + box->width + box->padding[RIGHT];
-		int bh = box->padding[TOP] + box->height + box->padding[BOTTOM];
-		int b_y1 = by + bh;
-		int b_x1 = bx + bw;
-		if (x >= bx && b_x1 > x && y >= by && b_y1 > y) {
-			in_box = true;
-		}
-	}
-
-	while (child) {
-		if (child->type == BOX_FLOAT_LEFT ||
-				child->type == BOX_FLOAT_RIGHT) {
-			c_bx = fx + child->x -
-					scrollbar_get_offset(child->scroll_x);
-			c_by = fy + child->y -
-					scrollbar_get_offset(child->scroll_y);
-		} else {
-			c_bx = bx + child->x -
-					scrollbar_get_offset(child->scroll_x);
-			c_by = by + child->y -
-					scrollbar_get_offset(child->scroll_y);
-		}
-		if (child->float_children) {
-			c_fx = c_bx;
-			c_fy = c_by;
-		} else {
-			c_fx = fx;
-			c_fy = fy;
-		}
-		if (in_box && child->text && !child->object) {
-			if (box_nearer_text_box(child,
-					c_bx, c_by, x, y, dir, nearest,
-					tx, ty, nr_xd, nr_yd))
-				return true;
-		} else {
-			if (child->list_marker) {
-				if (box_nearer_text_box(
-						child->list_marker,
-						c_bx + child->list_marker->x,
-						c_by + child->list_marker->y,
-						x, y, dir, nearest,
-						tx, ty, nr_xd, nr_yd))
-					return true;
-			}
-			if (box_nearest_text_box(child, c_bx, c_by,
-					c_fx, c_fy, x, y, dir, nearest, tx, ty,
-					nr_xd, nr_yd))
-				return true;
-		}
-		child = child->next;
-	}
-
-	return false;
-}
-
-
-/**
- * Peform pick text on browser window contents to locate the box under
- * the mouse pointer, or nearest in the given direction if the pointer is
- * not over a text box.
- *
- * \param html	an HTML content
- * \param x	coordinate of mouse
- * \param y	coordinate of mouse
- * \param dir	direction to search (-1 = above-left, +1 = below-right)
- * \param dx	receives x ordinate of mouse relative to text box
- * \param dy	receives y ordinate of mouse relative to text box
- */
-
-struct box *box_pick_text_box(struct html_content *html,
-		int x, int y, int dir, int *dx, int *dy)
-{
-	struct box *text_box = NULL;
-	struct box *box;
-	int nr_xd, nr_yd;
-	int bx, by;
-	int fx, fy;
-	int tx, ty;
-
-	if (html == NULL)
-		return NULL;
-
-	box = html->layout;
-	bx = box->margin[LEFT];
-	by = box->margin[TOP];
-	fx = bx;
-	fy = by;
-
-	if (!box_nearest_text_box(box, bx, by, fx, fy, x, y,
-			dir, &text_box, &tx, &ty, &nr_xd, &nr_yd)) {
-		if (text_box && text_box->text && !text_box->object) {
-			int w = (text_box->padding[LEFT] +
-					text_box->width +
-					text_box->padding[RIGHT]);
-			int h = (text_box->padding[TOP] +
-					text_box->height +
-					text_box->padding[BOTTOM]);
-			int x1, y1;
-
-			y1 = ty + h;
-			x1 = tx + w;
-
-			/* ensure point lies within the text box */
-			if (x < tx) x = tx;
-			if (y < ty) y = ty;
-			if (y > y1) y = y1;
-			if (x > x1) x = x1;
-		}
-	}
-
-	/* return coordinates relative to box */
-	*dx = x - tx;
-	*dy = y - ty;
-
-	return text_box;
-}
-
-
-/**
- * Find a box based upon its id attribute.
- *
- * \param  box  box tree to search
- * \param  id   id to look for
- * \return  the box or 0 if not found
- */
-
-struct box *box_find_by_id(struct box *box, lwc_string *id)
-{
-	struct box *a, *b;
-	bool m;
-
-	if (box->id != NULL &&
-			lwc_string_isequal(id, box->id, &m) == lwc_error_ok &&
-			m == true)
-		return box;
-
-	for (a = box->children; a; a = a->next) {
-		if ((b = box_find_by_id(a, id)) != NULL)
-			return b;
-	}
-
-	return NULL;
-}
-
-
-/**
- * Determine if a box is visible when the tree is rendered.
- *
- * \param  box  box to check
- * \return  true iff the box is rendered
- */
-
-bool box_visible(struct box *box)
-{
-	/* visibility: hidden */
-	if (box->style && css_computed_visibility(box->style) ==
-			CSS_VISIBILITY_HIDDEN)
-		return false;
-
-	return true;
-}
-
-
-/**
- * Print a box tree to a file.
- */
-
-void box_dump(FILE *stream, struct box *box, unsigned int depth, bool style)
-{
-	unsigned int i;
-	struct box *c, *prev;
-
-	for (i = 0; i != depth; i++)
-		fprintf(stream, "  ");
-
-	fprintf(stream, "%p ", box);
-	fprintf(stream, "x%i y%i w%i h%i ", box->x, box->y,
-			box->width, box->height);
-	if (box->max_width != UNKNOWN_MAX_WIDTH)
-		fprintf(stream, "min%i max%i ", box->min_width, box->max_width);
-	fprintf(stream, "(%i %i %i %i) ",
-			box->descendant_x0, box->descendant_y0,
-			box->descendant_x1, box->descendant_y1);
-
-	fprintf(stream, "m(%i %i %i %i) ",
-			box->margin[TOP], box->margin[LEFT],
-			box->margin[BOTTOM], box->margin[RIGHT]);
-
-	switch (box->type) {
-	case BOX_BLOCK:            fprintf(stream, "BLOCK "); break;
-	case BOX_INLINE_CONTAINER: fprintf(stream, "INLINE_CONTAINER "); break;
-	case BOX_INLINE:           fprintf(stream, "INLINE "); break;
-	case BOX_INLINE_END:       fprintf(stream, "INLINE_END "); break;
-	case BOX_INLINE_BLOCK:     fprintf(stream, "INLINE_BLOCK "); break;
-	case BOX_TABLE:            fprintf(stream, "TABLE [columns %i] ",
-					   box->columns); break;
-	case BOX_TABLE_ROW:        fprintf(stream, "TABLE_ROW "); break;
-	case BOX_TABLE_CELL:       fprintf(stream, "TABLE_CELL [columns %i, "
-					   "start %i, rows %i] ", box->columns,
-					   box->start_column, box->rows); break;
-	case BOX_TABLE_ROW_GROUP:  fprintf(stream, "TABLE_ROW_GROUP "); break;
-	case BOX_FLOAT_LEFT:       fprintf(stream, "FLOAT_LEFT "); break;
-	case BOX_FLOAT_RIGHT:      fprintf(stream, "FLOAT_RIGHT "); break;
-	case BOX_BR:               fprintf(stream, "BR "); break;
-	case BOX_TEXT:             fprintf(stream, "TEXT "); break;
-	default:                   fprintf(stream, "Unknown box type ");
-	}
-
-	if (box->text)
-		fprintf(stream, "%li '%.*s' ", (unsigned long) box->byte_offset,
-				(int) box->length, box->text);
-	if (box->space)
-		fprintf(stream, "space ");
-	if (box->object) {
-		fprintf(stream, "(object '%s') ",
-				nsurl_access(hlcache_handle_get_url(box->object)));
-	}
-	if (box->iframe) {
-		fprintf(stream, "(iframe) ");
-	}
-	if (box->gadget)
-		fprintf(stream, "(gadget) ");
-	if (style && box->style)
-		nscss_dump_computed_style(stream, box->style);
-	if (box->href)
-		fprintf(stream, " -> '%s'", nsurl_access(box->href));
-	if (box->target)
-		fprintf(stream, " |%s|", box->target);
-	if (box->title)
-		fprintf(stream, " [%s]", box->title);
-	if (box->id)
-		fprintf(stream, " ID:%s", lwc_string_data(box->id));
-	if (box->type == BOX_INLINE || box->type == BOX_INLINE_END)
-		fprintf(stream, " inline_end %p", box->inline_end);
-	if (box->float_children)
-		fprintf(stream, " float_children %p", box->float_children);
-	if (box->next_float)
-		fprintf(stream, " next_float %p", box->next_float);
-	if (box->float_container)
-		fprintf(stream, " float_container %p", box->float_container);
-	if (box->col) {
-		fprintf(stream, " (columns");
-		for (i = 0; i != box->columns; i++)
-			fprintf(stream, " (%s %s %i %i %i)",
-					((const char *[]) {"UNKNOWN", "FIXED",
-					"AUTO", "PERCENT", "RELATIVE"})
-					[box->col[i].type],
-					((const char *[]) {"normal",
-					"positioned"})
-					[box->col[i].positioned],
-					box->col[i].width,
-					box->col[i].min, box->col[i].max);
-		fprintf(stream, ")");
-	}
-	if (box->node != NULL) {
-		dom_string *name;
-		if (dom_node_get_node_name(box->node, &name) == DOM_NO_ERR) {
-			fprintf(stream, " <%s>", dom_string_data(name));
-			dom_string_unref(name);
-		}
-	}
-	fprintf(stream, "\n");
-
-	if (box->list_marker) {
-		for (i = 0; i != depth; i++)
-			fprintf(stream, "  ");
-		fprintf(stream, "list_marker:\n");
-		box_dump(stream, box->list_marker, depth + 1, style);
-	}
-
-	for (c = box->children; c && c->next; c = c->next)
-		;
-	if (box->last != c)
-		fprintf(stream, "warning: box->last %p (should be %p) "
-				"(box %p)\n", box->last, c, box);
-	for (prev = 0, c = box->children; c; prev = c, c = c->next) {
-		if (c->parent != box)
-			fprintf(stream, "warning: box->parent %p (should be "
-					"%p) (box on next line)\n",
-					c->parent, box);
-		if (c->prev != prev)
-			fprintf(stream, "warning: box->prev %p (should be "
-					"%p) (box on next line)\n",
-					c->prev, prev);
-		box_dump(stream, c, depth + 1, style);
-	}
-}
-
-/**
- * Applies the given scroll setup to a box. This includes scroll
- * creation/deletion as well as scroll dimension updates.
- *
- * \param c		content in which the box is located
- * \param box		the box to handle the scrolls for
- * \param bottom	whether the horizontal scrollbar should be present
- * \param right		whether the vertical scrollbar should be present
- * \return		true on success false otherwise
- */
-bool box_handle_scrollbars(struct content *c, struct box *box,
-		bool bottom, bool right)
-{
-	struct html_scrollbar_data *data;
-	int visible_width, visible_height;
-	int full_width, full_height;
-
-	if (!bottom && box->scroll_x != NULL) {
-		data = scrollbar_get_data(box->scroll_x);
-		scrollbar_destroy(box->scroll_x);
-		free(data);
-		box->scroll_x = NULL;
-	}
-
-	if (!right && box->scroll_y != NULL) {
-		data = scrollbar_get_data(box->scroll_y);
-		scrollbar_destroy(box->scroll_y);
-		free(data);
-		box->scroll_y = NULL;
-	}
-
-	if (!bottom && !right)
-		return true;
-
-	visible_width = box->width + box->padding[RIGHT] + box->padding[LEFT];
-	visible_height = box->height + box->padding[TOP] + box->padding[BOTTOM];
-
-	full_width = ((box->descendant_x1 - box->border[RIGHT].width) >
-			visible_width) ?
-			box->descendant_x1 + box->padding[RIGHT] :
-			visible_width;
-	full_height = ((box->descendant_y1 - box->border[BOTTOM].width) >
-			visible_height) ?
-			box->descendant_y1 + box->padding[BOTTOM] :
-			visible_height;
-
-	if (right) {
-		if (box->scroll_y == NULL) {
-			data = malloc(sizeof(struct html_scrollbar_data));
-			if (data == NULL) {
-				NSLOG(netsurf, INFO, "malloc failed");
-				guit->misc->warning("NoMemory", 0);
-				return false;
-			}
-			data->c = c;
-			data->box = box;
-			if (scrollbar_create(false, visible_height,
-					full_height, visible_height,
-					data, html_overflow_scroll_callback,
-					     &(box->scroll_y)) != NSERROR_OK) {
-				return false;
-			}
-		} else  {
-			scrollbar_set_extents(box->scroll_y, visible_height,
-					visible_height, full_height);
-		}
-	}
-	if (bottom) {
-		if (box->scroll_x == NULL) {
-			data = malloc(sizeof(struct html_scrollbar_data));
-			if (data == NULL) {
-				NSLOG(netsurf, INFO, "malloc failed");
-				guit->misc->warning("NoMemory", 0);
-				return false;
-			}
-			data->c = c;
-			data->box = box;
-			if (scrollbar_create(true,
-					visible_width -
-					(right ? SCROLLBAR_WIDTH : 0),
-					full_width, visible_width,
-					data, html_overflow_scroll_callback,
-					     &box->scroll_x) != NSERROR_OK) {
-				return false;
-			}
-		} else {
-			scrollbar_set_extents(box->scroll_x,
-					visible_width -
-					(right ? SCROLLBAR_WIDTH : 0),
-					visible_width, full_width);
-		}
-	}
-
-	if (right && bottom)
-		scrollbar_make_pair(box->scroll_x, box->scroll_y);
-
-	return true;
-}
-
-/**
- * Determine if a box has a vertical scrollbar.
- *
- * \param  box  scrolling box
- * \return the box has a vertical scrollbar
- */
-
-bool box_vscrollbar_present(const struct box * const box)
-{
-	return box->padding[TOP] + box->height + box->padding[BOTTOM] +
-			box->border[BOTTOM].width < box->descendant_y1;
-}
-
-
-/**
- * Determine if a box has a horizontal scrollbar.
- *
- * \param  box  scrolling box
- * \return the box has a horizontal scrollbar
- */
-
-bool box_hscrollbar_present(const struct box * const box)
-{
-	return box->padding[LEFT] + box->width + box->padding[RIGHT] +
-			box->border[RIGHT].width < box->descendant_x1;
-}
diff --git a/content/handlers/html/box.h b/content/handlers/html/box.h
index 0952b841b..df2b99d87 100644
--- a/content/handlers/html/box.h
+++ b/content/handlers/html/box.h
@@ -1,6 +1,7 @@
 /*
  * Copyright 2005 James Bursa <bursa@users.sourceforge.net>
  * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
  *
  * This file is part of NetSurf, http://www.netsurf-browser.org/
  *
@@ -19,69 +20,8 @@
 
 /**
  * \file
- * Box tree construction and manipulation (interface).
+ * Box interface.
  *
- * This stage of rendering converts a tree of dom_nodes (produced by libdom)
- * to a tree of struct box. The box tree represents the structure of the
- * document as given by the CSS display and float properties.
- *
- * For example, consider the following HTML:
- * \code
- *   <h1>Example Heading</h1>
- *   <p>Example paragraph <em>with emphasised text</em> etc.</p>       \endcode
- *
- * This would produce approximately the following box tree with default CSS
- * rules:
- * \code
- *   BOX_BLOCK (corresponds to h1)
- *     BOX_INLINE_CONTAINER
- *       BOX_INLINE "Example Heading"
- *   BOX_BLOCK (p)
- *     BOX_INLINE_CONTAINER
- *       BOX_INLINE "Example paragraph "
- *       BOX_INLINE "with emphasised text" (em)
- *       BOX_INLINE "etc."                                             \endcode
- *
- * Note that the em has been collapsed into the INLINE_CONTAINER.
- *
- * If these CSS rules were applied:
- * \code
- *   h1 { display: table-cell }
- *   p { display: table-cell }
- *   em { float: left; width: 5em }                                    \endcode
- *
- * then the box tree would instead look like this:
- * \code
- *   BOX_TABLE
- *     BOX_TABLE_ROW_GROUP
- *       BOX_TABLE_ROW
- *         BOX_TABLE_CELL (h1)
- *           BOX_INLINE_CONTAINER
- *             BOX_INLINE "Example Heading"
- *         BOX_TABLE_CELL (p)
- *           BOX_INLINE_CONTAINER
- *             BOX_INLINE "Example paragraph "
- *             BOX_FLOAT_LEFT (em)
- *               BOX_BLOCK
- *                 BOX_INLINE_CONTAINER
- *                   BOX_INLINE "with emphasised text"
- *             BOX_INLINE "etc."                                       \endcode
- *
- * Here implied boxes have been added and a float is present.
- *
- * A box tree is "normalized" if the following is satisfied:
- * \code
- * parent               permitted child nodes
- * BLOCK, INLINE_BLOCK  BLOCK, INLINE_CONTAINER, TABLE
- * INLINE_CONTAINER     INLINE, INLINE_BLOCK, FLOAT_LEFT, FLOAT_RIGHT, BR, TEXT,
- *                      INLINE_END
- * INLINE               none
- * TABLE                at least 1 TABLE_ROW_GROUP
- * TABLE_ROW_GROUP      at least 1 TABLE_ROW
- * TABLE_ROW            at least 1 TABLE_CELL
- * TABLE_CELL           BLOCK, INLINE_CONTAINER, TABLE (same as BLOCK)
- * FLOAT_(LEFT|RIGHT)   exactly 1 BLOCK or TABLE
- * \endcode
  */
 
 #ifndef NETSURF_HTML_BOX_H
@@ -89,7 +29,6 @@
 
 #include <limits.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <libcss/libcss.h>
 
 #include "content/handlers/css/utils.h"
@@ -97,9 +36,6 @@
 struct content;
 struct box;
 struct browser_window;
-struct column;
-struct object_params;
-struct object_param;
 struct html_content;
 struct nsurl;
 struct dom_node;
@@ -109,20 +45,36 @@ struct rect;
 #define UNKNOWN_WIDTH INT_MAX
 #define UNKNOWN_MAX_WIDTH INT_MAX
 
+
 typedef void (*box_construct_complete_cb)(struct html_content *c, bool success);
 
-/** Type of a struct box. */
+
+/**
+ * Type of a struct box.
+ */
 typedef enum {
-	BOX_BLOCK, BOX_INLINE_CONTAINER, BOX_INLINE,
-	BOX_TABLE, BOX_TABLE_ROW, BOX_TABLE_CELL,
+	BOX_BLOCK,
+	BOX_INLINE_CONTAINER,
+	BOX_INLINE,
+	BOX_TABLE,
+	BOX_TABLE_ROW,
+	BOX_TABLE_CELL,
 	BOX_TABLE_ROW_GROUP,
-	BOX_FLOAT_LEFT, BOX_FLOAT_RIGHT,
-	BOX_INLINE_BLOCK, BOX_BR, BOX_TEXT,
-	BOX_INLINE_END, BOX_NONE
+	BOX_FLOAT_LEFT,
+	BOX_FLOAT_RIGHT,
+	BOX_INLINE_BLOCK,
+	BOX_BR,
+	BOX_TEXT,
+	BOX_INLINE_END,
+	BOX_NONE,
+	BOX_FLEX,
+	BOX_INLINE_FLEX,
 } box_type;
 
 
-/** Flags for a struct box. */
+/**
+ * Flags for a struct box.
+ */
 typedef enum {
 	NEW_LINE    = 1 << 0,	/* first inline on a new line */
 	STYLE_OWNED = 1 << 1,	/* style is owned by this box */
@@ -139,9 +91,13 @@ typedef enum {
 	IS_REPLACED = 1 << 12	/* box is a replaced element */
 } box_flags;
 
-/* Sides of a box */
+
+/**
+ * Sides of a box
+ */
 enum box_side { TOP, RIGHT, BOTTOM, LEFT };
 
+
 /**
  * Container for box border details
  */
@@ -151,31 +107,190 @@ struct box_border {
 	int width;			/**< border-width (pixels) */
 };
 
-/** Node in box tree. All dimensions are in pixels. */
+
+/**
+ * Table column data.
+ */
+struct column {
+	/**
+	 * Type of column.
+	 */
+	enum {
+	      COLUMN_WIDTH_UNKNOWN,
+	      COLUMN_WIDTH_FIXED,
+	      COLUMN_WIDTH_AUTO,
+	      COLUMN_WIDTH_PERCENT,
+	      COLUMN_WIDTH_RELATIVE
+	} type;
+
+	/**
+	 * Preferred width of column. Pixels for FIXED, percentage for
+	 *  PERCENT, relative units for RELATIVE, unused for AUTO.
+	 */
+	int width;
+
+	/**
+	 * Minimum width of content.
+	 */
+	int min;
+
+	/**
+	 * Maximum width of content.
+	 */
+	int max;
+
+	/**
+	 * Whether all of column's cells are css positioned.
+	 */
+	bool positioned;
+};
+
+
+/**
+ * Linked list of object element parameters.
+ */
+struct object_param {
+	char *name;
+	char *value;
+	char *type;
+	char *valuetype;
+	struct object_param *next;
+};
+
+
+/**
+ * Parameters for object element and similar elements.
+ */
+struct object_params {
+	struct nsurl *data;
+	char *type;
+	char *codetype;
+	struct nsurl *codebase;
+	struct nsurl *classid;
+	struct object_param *params;
+};
+
+
+/**
+ * Node in box tree. All dimensions are in pixels.
+ */
 struct box {
-	/** Type of box. */
+	/**
+	 * Type of box.
+	 */
 	box_type type;
 
-	/** Box flags */
+	/**
+	 * Box flags
+	 */
 	box_flags flags;
 
-	/** Computed styles for elements and their pseudo elements.  NULL on
-	 *  non-element boxes. */
+	/**
+	 * DOM node that generated this box or NULL
+	 */
+	struct dom_node *node;
+
+	/**
+	 * Computed styles for elements and their pseudo elements.
+	 *  NULL on non-element boxes.
+	 */
 	css_select_results *styles;
 
-	/** Style for this box. 0 for INLINE_CONTAINER and FLOAT_*. Pointer into
-	 *  a box's 'styles' select results, except for implied boxes, where it
-	 *  is a pointer to an owned computed style. */
+	/**
+	 * Style for this box. 0 for INLINE_CONTAINER and
+	 *  FLOAT_*. Pointer into a box's 'styles' select results,
+	 *  except for implied boxes, where it is a pointer to an
+	 *  owned computed style.
+	 */
 	css_computed_style *style;
 
-	/** Coordinate of left padding edge relative to parent box, or relative
-	 * to ancestor that contains this box in float_children for FLOAT_. */
+	/**
+	 *  value of id attribute (or name for anchors)
+	 */
+	lwc_string *id;
+
+
+	/**
+	 * Next sibling box, or NULL.
+	 */
+	struct box *next;
+
+	/**
+	 * Previous sibling box, or NULL.
+	 */
+	struct box *prev;
+
+	/**
+	 * First child box, or NULL.
+	 */
+	struct box *children;
+
+	/**
+	 * Last child box, or NULL.
+	 */
+	struct box *last;
+
+	/**
+	 * Parent box, or NULL.
+	 */
+	struct box *parent;
+
+	/**
+	 * INLINE_END box corresponding to this INLINE box, or INLINE
+	 * box corresponding to this INLINE_END box.
+	 */
+	struct box *inline_end;
+
+
+	/**
+	 * First float child box, or NULL. Float boxes are in the tree
+	 * twice, in this list for the block box which defines the
+	 * area for floats, and also in the standard tree given by
+	 * children, next, prev, etc.
+	 */
+	struct box *float_children;
+
+	/**
+	 * Next sibling float box.
+	 */
+	struct box *next_float;
+
+	/**
+	 * If box is a float, points to box's containing block
+	 */
+	struct box *float_container;
+
+	/**
+	 * Level below which subsequent floats must be cleared.  This
+	 * is used only for boxes with float_children
+	 */
+	int clear_level;
+
+	/**
+	 * Level below which floats have been placed.
+	 */
+	int cached_place_below_level;
+
+
+	/**
+	 * Coordinate of left padding edge relative to parent box, or
+	 * relative to ancestor that contains this box in
+	 * float_children for FLOAT_.
+	 */
 	int x;
-	/** Coordinate of top padding edge, relative as for x. */
+	/**
+	 * Coordinate of top padding edge, relative as for x.
+	 */
 	int y;
 
-	int width;   /**< Width of content box (excluding padding etc.). */
-	int height;  /**< Height of content box (excluding padding etc.). */
+	/**
+	 * Width of content box (excluding padding etc.).
+	 */
+	int width;
+	/**
+	 * Height of content box (excluding padding etc.).
+	 */
+	int height;
 
 	/* These four variables determine the maximum extent of a box's
 	 * descendants. They are relative to the x,y coordinates of the box.
@@ -196,185 +311,147 @@ struct box {
 	int descendant_x1;  /**< right edge of descendants */
 	int descendant_y1;  /**< bottom edge of descendants */
 
-	int margin[4];   /**< Margin: TOP, RIGHT, BOTTOM, LEFT. */
-	int padding[4];  /**< Padding: TOP, RIGHT, BOTTOM, LEFT. */
-	struct box_border border[4];   /**< Border: TOP, RIGHT, BOTTOM, LEFT. */
+	/**
+	 * Margin: TOP, RIGHT, BOTTOM, LEFT.
+	 */
+	int margin[4];
+
+	/**
+	 * Padding: TOP, RIGHT, BOTTOM, LEFT.
+	 */
+	int padding[4];
+
+	/**
+	 * Border: TOP, RIGHT, BOTTOM, LEFT.
+	 */
+	struct box_border border[4];
 
-	struct scrollbar *scroll_x;  /**< Horizontal scroll. */
-	struct scrollbar *scroll_y;  /**< Vertical scroll. */
+	/**
+	 * Horizontal scroll.
+	 */
+	struct scrollbar *scroll_x;
+
+	/**
+	 * Vertical scroll.
+	 */
+	struct scrollbar *scroll_y;
 
-	/** Width of box taking all line breaks (including margins etc). Must
-	 * be non-negative. */
+	/**
+	 * Width of box taking all line breaks (including margins
+	 * etc). Must be non-negative.
+	 */
 	int min_width;
-	/** Width that would be taken with no line breaks. Must be
-	 * non-negative. */
+
+	/**
+	 * Width that would be taken with no line breaks. Must be
+	 * non-negative.
+	 */
 	int max_width;
 
-	/**< Byte offset within a textual representation of this content. */
-	size_t byte_offset;
 
-	char *text;     /**< Text, or 0 if none. Unterminated. */
-	size_t length;  /**< Length of text. */
+	/**
+	 * Text, or NULL if none. Unterminated.
+	 */
+	char *text;
+
+	/**
+	 * Length of text.
+	 */
+	size_t length;
 
-	/** Width of space after current text (depends on font and size). */
+	/**
+	 * Width of space after current text (depends on font and size).
+	 */
 	int space;
 
-	struct nsurl *href;   /**< Link, or 0. */
-	const char *target;  /**< Link target, or 0. */
-	const char *title;  /**< Title, or 0. */
-
-	unsigned int columns;  /**< Number of columns for TABLE / TABLE_CELL. */
-	unsigned int rows;     /**< Number of rows for TABLE only. */
-	unsigned int start_column;  /**< Start column for TABLE_CELL only. */
-
-	struct box *next;      /**< Next sibling box, or 0. */
-	struct box *prev;      /**< Previous sibling box, or 0. */
-	struct box *children;  /**< First child box, or 0. */
-	struct box *last;      /**< Last child box, or 0. */
-	struct box *parent;    /**< Parent box, or 0. */
-	/** INLINE_END box corresponding to this INLINE box, or INLINE box
-	 * corresponding to this INLINE_END box. */
-	struct box *inline_end;
+	/**
+	 * Byte offset within a textual representation of this content.
+	 */
+	size_t byte_offset;
 
-	/** First float child box, or 0. Float boxes are in the tree twice, in
-	 * this list for the block box which defines the area for floats, and
-	 * also in the standard tree given by children, next, prev, etc. */
-	struct box *float_children;
-	/** Next sibling float box. */
-	struct box *next_float;
-	/** If box is a float, points to box's containing block */
-	struct box *float_container;
-	/** Level below which subsequent floats must be cleared.
-	 * This is used only for boxes with float_children */
-	int clear_level;
 
-	/* Level below which floats have been placed. */
-	int cached_place_below_level;
+	/**
+	 * Link, or NULL.
+	 */
+	struct nsurl *href;
 
-	/** List marker box if this is a list-item, or 0. */
-	struct box *list_marker;
+	/**
+	 * Link target, or NULL.
+	 */
+	const char *target;
 
-	struct column *col;  /**< Array of table column data for TABLE only. */
+	/**
+	 * Title, or NULL.
+	 */
+	const char *title;
 
-	/** Form control data, or 0 if not a form control. */
-	struct form_control* gadget;
 
-	char *usemap; /** (Image)map to use with this object, or 0 if none */
-	lwc_string *id; /**<  value of id attribute (or name for anchors) */
+	/**
+	 * Number of columns for TABLE / TABLE_CELL.
+	 */
+	unsigned int columns;
 
-	/** Background image for this box, or 0 if none */
-	struct hlcache_handle *background;
+	/**
+	 * Number of rows for TABLE only.
+	 */
+	unsigned int rows;
 
-	/** Object in this box (usually an image), or 0 if none. */
-	struct hlcache_handle* object;
-	/** Parameters for the object, or 0. */
-	struct object_params *object_params;
+	/**
+	 * Start column for TABLE_CELL only.
+	 */
+	unsigned int start_column;
 
-	/** Iframe's browser_window, or NULL if none */
-	struct browser_window *iframe;
+	/**
+	 * Array of table column data for TABLE only.
+	 */
+	struct column *col;
 
-	struct dom_node *node; /**< DOM node that generated this box or NULL */
-};
+	/**
+	 * List item value.
+	 */
+	int list_value;
 
-/** Table column data. */
-struct column {
-	/** Type of column. */
-	enum { COLUMN_WIDTH_UNKNOWN, COLUMN_WIDTH_FIXED,
-	       COLUMN_WIDTH_AUTO, COLUMN_WIDTH_PERCENT,
-	       COLUMN_WIDTH_RELATIVE } type;
-	/** Preferred width of column. Pixels for FIXED, percentage for PERCENT,
-	 *  relative units for RELATIVE, unused for AUTO. */
-	int width;
-	/** Minimum width of content. */
-	int min;
-	/** Maximum width of content. */
-	int max;
-	/** Whether all of column's cells are css positioned. */
-	bool positioned;
-};
+	/**
+	 * List marker box if this is a list-item, or NULL.
+	 */
+	struct box *list_marker;
 
-/** Parameters for object element and similar elements. */
-struct object_params {
-	struct nsurl *data;
-	char *type;
-	char *codetype;
-	struct nsurl *codebase;
-	struct nsurl *classid;
-	struct object_param *params;
-};
 
-/** Linked list of object element parameters. */
-struct object_param {
-	char *name;
-	char *value;
-	char *type;
-	char *valuetype;
-	struct object_param *next;
-};
+	/**
+	 * Form control data, or NULL if not a form control.
+	 */
+	struct form_control* gadget;
 
-/** Frame target names (constant pointers to save duplicating the strings many
- * times). We convert _blank to _top for user-friendliness. */
-extern const char *TARGET_SELF;
-extern const char *TARGET_PARENT;
-extern const char *TARGET_TOP;
-extern const char *TARGET_BLANK;
-
-
-
-struct box * box_create(css_select_results *styles, css_computed_style *style,
-		bool style_owned, struct nsurl *href, const char *target,
-		const char *title, lwc_string *id, void *context);
-void box_add_child(struct box *parent, struct box *child);
-void box_insert_sibling(struct box *box, struct box *new_box);
-void box_unlink_and_free(struct box *box);
-void box_free(struct box *box);
-void box_free_box(struct box *box);
-void box_bounds(struct box *box, struct rect *r);
-void box_coords(struct box *box, int *x, int *y);
-struct box *box_at_point(
-		const nscss_len_ctx *len_ctx,
-		struct box *box, const int x, const int y,
-		int *box_x, int *box_y);
-struct box *box_pick_text_box(struct html_content *html,
-		int x, int y, int dir, int *dx, int *dy);
-struct box *box_find_by_id(struct box *box, lwc_string *id);
-bool box_visible(struct box *box);
-void box_dump(FILE *stream, struct box *box, unsigned int depth, bool style);
 
-/**
- * Extract a URL from a relative link, handling junk like whitespace and
- * attempting to read a real URL from "javascript:" links.
- *
- * \param content html content
- * \param dsrel relative URL text taken from page
- * \param base base for relative URLs
- * \param result updated to target URL on heap, unchanged if extract failed
- * \return true on success, false on memory exhaustion
- */
-bool box_extract_link(const struct html_content *content, const struct dom_string *dsrel, struct nsurl *base, struct nsurl **result);
+	/**
+	 * (Image)map to use with this object, or NULL if none
+	 */
+	char *usemap;
 
-bool box_handle_scrollbars(struct content *c, struct box *box,
-		bool bottom, bool right);
-bool box_vscrollbar_present(const struct box *box);
-bool box_hscrollbar_present(const struct box *box);
 
-nserror dom_to_box(struct dom_node *n, struct html_content *c,
-		box_construct_complete_cb cb);
+	/**
+	 * Background image for this box, or NULL if none
+	 */
+	struct hlcache_handle *background;
 
-bool box_normalise_block(
-		struct box *block,
-		const struct box *root,
-		struct html_content *c);
 
-/**
- * Check if layout box is a first child.
- *
- * \param[in] b  Box to check.
- * \return true iff box is first child.
- */
-static inline bool box_is_first_child(struct box *b)
-{
-	return (b->parent == NULL || b == b->parent->children);
-}
+	/**
+	 * Object in this box (usually an image), or NULL if none.
+	 */
+	struct hlcache_handle* object;
+
+	/**
+	 * Parameters for the object, or NULL.
+	 */
+	struct object_params *object_params;
+
+
+	/**
+	 * Iframe's browser_window, or NULL if none
+	 */
+	struct browser_window *iframe;
+
+};
+
 
 #endif
diff --git a/content/handlers/html/box_construct.c b/content/handlers/html/box_construct.c
index 4d0cba748..8519c2b1d 100644
--- a/content/handlers/html/box_construct.c
+++ b/content/handlers/html/box_construct.c
@@ -25,35 +25,28 @@
  * Implementation of conversion from DOM tree to box tree.
  */
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
 #include <string.h>
-#include <strings.h>
+#include <dom/dom.h>
 
-#include "utils/config.h"
+#include "utils/errors.h"
 #include "utils/nsoption.h"
 #include "utils/corestrings.h"
-#include "utils/log.h"
-#include "utils/messages.h"
 #include "utils/talloc.h"
 #include "utils/string.h"
 #include "utils/ascii.h"
-#include "netsurf/css.h"
+#include "utils/nsurl.h"
 #include "netsurf/misc.h"
-#include "netsurf/plot_style.h"
-#include "content/content_protected.h"
-#include "css/hints.h"
 #include "css/select.h"
-#include "css/utils.h"
 #include "desktop/gui_internal.h"
 
-#include "html/html.h"
+#include "html/private.h"
+#include "html/object.h"
 #include "html/box.h"
-#include "html/box_textarea.h"
+#include "html/box_manipulate.h"
+#include "html/box_construct.h"
+#include "html/box_special.h"
+#include "html/box_normalise.h"
 #include "html/form_internal.h"
-#include "html/html_internal.h"
 
 /**
  * Context for box tree construction
@@ -77,7 +70,7 @@ struct box_construct_props {
 	/** Style from which to inherit, or NULL if none */
 	const css_computed_style *parent_style;
 	/** Current link target, or NULL if none */
-	nsurl *href;
+	struct nsurl *href;
 	/** Current frame target, or NULL if none */
 	const char *target;
 	/** Current title attribute, or NULL if none */
@@ -93,137 +86,39 @@ struct box_construct_props {
 
 static const content_type image_types = CONTENT_IMAGE;
 
-/* the strings are not important, since we just compare the pointers */
-const char *TARGET_SELF = "_self";
-const char *TARGET_PARENT = "_parent";
-const char *TARGET_TOP = "_top";
-const char *TARGET_BLANK = "_blank";
-
-static void convert_xml_to_box(struct box_construct_ctx *ctx);
-static bool box_construct_element(struct box_construct_ctx *ctx,
-		bool *convert_children);
-static void box_construct_element_after(dom_node *n, html_content *content);
-static bool box_construct_text(struct box_construct_ctx *ctx);
-static css_select_results * box_get_style(html_content *c,
-		const css_computed_style *parent_style,
-		const css_computed_style *root_style, dom_node *n);
-static void box_text_transform(char *s, unsigned int len,
-		enum css_text_transform_e tt);
-#define BOX_SPECIAL_PARAMS dom_node *n, html_content *content, \
-		struct box *box, bool *convert_children
-static bool box_a(BOX_SPECIAL_PARAMS);
-static bool box_body(BOX_SPECIAL_PARAMS);
-static bool box_br(BOX_SPECIAL_PARAMS);
-static bool box_image(BOX_SPECIAL_PARAMS);
-static bool box_textarea(BOX_SPECIAL_PARAMS);
-static bool box_select(BOX_SPECIAL_PARAMS);
-static bool box_input(BOX_SPECIAL_PARAMS);
-static bool box_button(BOX_SPECIAL_PARAMS);
-static bool box_frameset(BOX_SPECIAL_PARAMS);
-static bool box_create_frameset(struct content_html_frames *f, dom_node *n,
-		html_content *content);
-static bool box_select_add_option(struct form_control *control, dom_node *n);
-static bool box_noscript(BOX_SPECIAL_PARAMS);
-static bool box_object(BOX_SPECIAL_PARAMS);
-static bool box_embed(BOX_SPECIAL_PARAMS);
-static bool box_pre(BOX_SPECIAL_PARAMS);
-static bool box_iframe(BOX_SPECIAL_PARAMS);
-static bool box_get_attribute(dom_node *n, const char *attribute,
-		void *context, char **value);
-
-/* element_table must be sorted by name */
-struct element_entry {
-	char name[10];	 /* element type */
-	bool (*convert)(BOX_SPECIAL_PARAMS);
-};
-static const struct element_entry element_table[] = {
-	{"a", box_a},
-	{"body", box_body},
-	{"br", box_br},
-	{"button", box_button},
-	{"embed", box_embed},
-	{"frameset", box_frameset},
-	{"iframe", box_iframe},
-	{"img", box_image},
-	{"input", box_input},
-	{"noscript", box_noscript},
-	{"object", box_object},
-	{"pre", box_pre},
-	{"select", box_select},
-	{"textarea", box_textarea}
-};
-#define ELEMENT_TABLE_COUNT (sizeof(element_table) / sizeof(element_table[0]))
-
-/**
- * Construct a box tree from an xml tree and stylesheets.
- *
- * \param n   xml tree
- * \param c   content of type CONTENT_HTML to construct box tree in
- * \param cb  callback to report conversion completion
- * \return    netsurf error code indicating status of call
- */
-
-nserror dom_to_box(dom_node *n, html_content *c, box_construct_complete_cb cb)
-{
-	struct box_construct_ctx *ctx;
-
-	if (c->bctx == NULL) {
-		/* create a context allocation for this box tree */
-		c->bctx = talloc_zero(0, int);
-		if (c->bctx == NULL) {
-			return NSERROR_NOMEM;
-		}
-	}
-
-	ctx = malloc(sizeof(*ctx));
-	if (ctx == NULL) {
-		return NSERROR_NOMEM;
-	}
-
-	ctx->content = c;
-	ctx->n = dom_node_ref(n);
-	ctx->root_box = NULL;
-	ctx->cb = cb;
-	ctx->bctx = c->bctx;
-
-	return guit->misc->schedule(0, (void *)convert_xml_to_box, ctx);
-}
-
 /* mapping from CSS display to box type
  * this table must be in sync with libcss' css_display enum */
 static const box_type box_map[] = {
-	0, /*CSS_DISPLAY_INHERIT,*/
-	BOX_INLINE, /*CSS_DISPLAY_INLINE,*/
-	BOX_BLOCK, /*CSS_DISPLAY_BLOCK,*/
-	BOX_BLOCK, /*CSS_DISPLAY_LIST_ITEM,*/
-	BOX_INLINE, /*CSS_DISPLAY_RUN_IN,*/
-	BOX_INLINE_BLOCK, /*CSS_DISPLAY_INLINE_BLOCK,*/
-	BOX_TABLE, /*CSS_DISPLAY_TABLE,*/
-	BOX_TABLE, /*CSS_DISPLAY_INLINE_TABLE,*/
-	BOX_TABLE_ROW_GROUP, /*CSS_DISPLAY_TABLE_ROW_GROUP,*/
-	BOX_TABLE_ROW_GROUP, /*CSS_DISPLAY_TABLE_HEADER_GROUP,*/
-	BOX_TABLE_ROW_GROUP, /*CSS_DISPLAY_TABLE_FOOTER_GROUP,*/
-	BOX_TABLE_ROW, /*CSS_DISPLAY_TABLE_ROW,*/
-	BOX_NONE, /*CSS_DISPLAY_TABLE_COLUMN_GROUP,*/
-	BOX_NONE, /*CSS_DISPLAY_TABLE_COLUMN,*/
-	BOX_TABLE_CELL, /*CSS_DISPLAY_TABLE_CELL,*/
-	BOX_INLINE, /*CSS_DISPLAY_TABLE_CAPTION,*/
-	BOX_NONE /*CSS_DISPLAY_NONE*/
+	BOX_BLOCK,           /* CSS_DISPLAY_INHERIT */
+	BOX_INLINE,          /* CSS_DISPLAY_INLINE */
+	BOX_BLOCK,           /* CSS_DISPLAY_BLOCK */
+	BOX_BLOCK,           /* CSS_DISPLAY_LIST_ITEM */
+	BOX_INLINE,          /* CSS_DISPLAY_RUN_IN */
+	BOX_INLINE_BLOCK,    /* CSS_DISPLAY_INLINE_BLOCK */
+	BOX_TABLE,           /* CSS_DISPLAY_TABLE */
+	BOX_TABLE,           /* CSS_DISPLAY_INLINE_TABLE */
+	BOX_TABLE_ROW_GROUP, /* CSS_DISPLAY_TABLE_ROW_GROUP */
+	BOX_TABLE_ROW_GROUP, /* CSS_DISPLAY_TABLE_HEADER_GROUP */
+	BOX_TABLE_ROW_GROUP, /* CSS_DISPLAY_TABLE_FOOTER_GROUP */
+	BOX_TABLE_ROW,       /* CSS_DISPLAY_TABLE_ROW */
+	BOX_NONE,            /* CSS_DISPLAY_TABLE_COLUMN_GROUP */
+	BOX_NONE,            /* CSS_DISPLAY_TABLE_COLUMN */
+	BOX_TABLE_CELL,      /* CSS_DISPLAY_TABLE_CELL */
+	BOX_INLINE,          /* CSS_DISPLAY_TABLE_CAPTION */
+	BOX_NONE,            /* CSS_DISPLAY_NONE */
+	BOX_FLEX,            /* CSS_DISPLAY_FLEX */
+	BOX_INLINE_FLEX,     /* CSS_DISPLAY_INLINE_FLEX */
+	BOX_BLOCK,           /* CSS_DISPLAY_GRID */
+	BOX_INLINE_BLOCK,    /* CSS_DISPLAY_INLINE_GRID */
 };
 
-static inline struct box *box_for_node(dom_node *n)
-{
-	struct box *box = NULL;
-	dom_exception err;
-
-	err = dom_node_get_user_data(n, corestring_dom___ns_key_box_node_data,
-			(void *) &box);
-	if (err != DOM_NO_ERR)
-		return NULL;
-
-	return box;
-}
 
+/**
+ * determine if a box is the root node
+ *
+ * \param n node to check
+ * \return true if node is root else false.
+ */
 static inline bool box_is_root(dom_node *n)
 {
 	dom_node *parent;
@@ -250,207 +145,215 @@ static inline bool box_is_root(dom_node *n)
 }
 
 /**
- * Find the next node in the DOM tree, completing
- * element construction where appropriate.
- *
- * \param n                 Current node
- * \param content           Containing content
- * \param convert_children  Whether to consider children of \a n
- * \return Next node to process, or NULL if complete
+ * Extract transient construction properties
  *
- * \note \a n will be unreferenced
+ * \param n      Current DOM node to convert
+ * \param props  Property object to populate
  */
-static dom_node *next_node(dom_node *n, html_content *content,
-		bool convert_children)
+static void
+box_extract_properties(dom_node *n, struct box_construct_props *props)
 {
-	dom_node *next = NULL;
-	bool has_children;
-	dom_exception err;
-
-	err = dom_node_has_child_nodes(n, &has_children);
-	if (err != DOM_NO_ERR) {
-		dom_node_unref(n);
-		return NULL;
-	}
-
-	if (convert_children && has_children) {
-		err = dom_node_get_first_child(n, &next);
-		if (err != DOM_NO_ERR) {
-			dom_node_unref(n);
-			return NULL;
-		}
-		dom_node_unref(n);
-	} else {
-		err = dom_node_get_next_sibling(n, &next);
-		if (err != DOM_NO_ERR) {
-			dom_node_unref(n);
-			return NULL;
-		}
-
-		if (next != NULL) {
-			if (box_for_node(n) != NULL)
-				box_construct_element_after(n, content);
-			dom_node_unref(n);
-		} else {
-			if (box_for_node(n) != NULL)
-				box_construct_element_after(n, content);
-
-			while (box_is_root(n) == false) {
-				dom_node *parent = NULL;
-				dom_node *parent_next = NULL;
+	memset(props, 0, sizeof(*props));
 
-				err = dom_node_get_parent_node(n, &parent);
-				if (err != DOM_NO_ERR) {
-					dom_node_unref(n);
-					return NULL;
-				}
+	props->node_is_root = box_is_root(n);
 
-				assert(parent != NULL);
+	/* Extract properties from containing DOM node */
+	if (props->node_is_root == false) {
+		dom_node *current_node = n;
+		dom_node *parent_node = NULL;
+		struct box *parent_box;
+		dom_exception err;
 
-				err = dom_node_get_next_sibling(parent,
-						&parent_next);
-				if (err != DOM_NO_ERR) {
-					dom_node_unref(parent);
-					dom_node_unref(n);
-					return NULL;
-				}
+		/* Find ancestor node containing parent box */
+		while (true) {
+			err = dom_node_get_parent_node(current_node,
+					&parent_node);
+			if (err != DOM_NO_ERR || parent_node == NULL)
+				break;
 
-				if (parent_next != NULL) {
-					dom_node_unref(parent_next);
-					dom_node_unref(parent);
-					break;
-				}
+			parent_box = box_for_node(parent_node);
 
-				dom_node_unref(n);
-				n = parent;
-				parent = NULL;
+			if (parent_box != NULL) {
+				props->parent_style = parent_box->style;
+				props->href = parent_box->href;
+				props->target = parent_box->target;
+				props->title = parent_box->title;
 
-				if (box_for_node(n) != NULL) {
-					box_construct_element_after(
-							n, content);
-				}
+				dom_node_unref(parent_node);
+				break;
+			} else {
+				if (current_node != n)
+					dom_node_unref(current_node);
+				current_node = parent_node;
+				parent_node = NULL;
 			}
+		}
 
-			if (box_is_root(n) == false) {
-				dom_node *parent = NULL;
+		/* Find containing block (may be parent) */
+		while (true) {
+			struct box *b;
 
-				err = dom_node_get_parent_node(n, &parent);
-				if (err != DOM_NO_ERR) {
-					dom_node_unref(n);
-					return NULL;
-				}
+			err = dom_node_get_parent_node(current_node,
+					&parent_node);
+			if (err != DOM_NO_ERR || parent_node == NULL) {
+				if (current_node != n)
+					dom_node_unref(current_node);
+				break;
+			}
 
-				assert(parent != NULL);
+			if (current_node != n)
+				dom_node_unref(current_node);
 
-				err = dom_node_get_next_sibling(parent, &next);
-				if (err != DOM_NO_ERR) {
-					dom_node_unref(parent);
-					dom_node_unref(n);
-					return NULL;
-				}
+			b = box_for_node(parent_node);
 
-				if (box_for_node(parent) != NULL) {
-					box_construct_element_after(parent,
-							content);
-				}
+			/* Children of nodes that created an inline box
+			 * will generate boxes which are attached as
+			 * _siblings_ of the box generated for their
+			 * parent node. Note, however, that we'll still
+			 * use the parent node's styling as the parent
+			 * style, above. */
+			if (b != NULL && b->type != BOX_INLINE &&
+					b->type != BOX_BR) {
+				props->containing_block = b;
 
-				dom_node_unref(parent);
+				dom_node_unref(parent_node);
+				break;
+			} else {
+				current_node = parent_node;
+				parent_node = NULL;
 			}
-
-			dom_node_unref(n);
 		}
 	}
 
-	return next;
+	/* Compute current inline container, if any */
+	if (props->containing_block != NULL &&
+			props->containing_block->last != NULL &&
+			props->containing_block->last->type ==
+				BOX_INLINE_CONTAINER)
+		props->inline_container = props->containing_block->last;
 }
 
+
 /**
- * Convert an ELEMENT node to a box tree fragment,
- * then schedule conversion of the next ELEMENT node
+ * Get the style for an element.
+ *
+ * \param  c               content of type CONTENT_HTML that is being processed
+ * \param  parent_style    style at this point in xml tree, or NULL for root
+ * \param  root_style      root node's style, or NULL for root
+ * \param  n               node in xml tree
+ * \return  the new style, or NULL on memory exhaustion
  */
-void convert_xml_to_box(struct box_construct_ctx *ctx)
+static css_select_results *
+box_get_style(html_content *c,
+	      const css_computed_style *parent_style,
+	      const css_computed_style *root_style,
+	      dom_node *n)
 {
-	dom_node *next;
-	bool convert_children;
-	uint32_t num_processed = 0;
-	const uint32_t max_processed_before_yield = 10;
-
-	do {
-		convert_children = true;
-
-		assert(ctx->n != NULL);
+	dom_string *s = NULL;
+	css_stylesheet *inline_style = NULL;
+	css_select_results *styles;
+	nscss_select_ctx ctx;
 
-		if (box_construct_element(ctx, &convert_children) == false) {
-			ctx->cb(ctx->content, false);
-			dom_node_unref(ctx->n);
-			free(ctx);
-			return;
+	/* Firstly, construct inline stylesheet, if any */
+	if (nsoption_bool(author_level_css)) {
+		dom_exception err;
+		err = dom_element_get_attribute(n, corestring_dom_style, &s);
+		if (err != DOM_NO_ERR) {
+			return NULL;
 		}
+	}
 
-		/* Find next element to process, converting text nodes as we go */
-		next = next_node(ctx->n, ctx->content, convert_children);
-		while (next != NULL) {
-			dom_node_type type;
-			dom_exception err;
+	if (s != NULL) {
+		inline_style = nscss_create_inline_style(
+				(const uint8_t *) dom_string_data(s),
+				dom_string_byte_length(s),
+				c->encoding,
+				nsurl_access(c->base_url),
+				c->quirks != DOM_DOCUMENT_QUIRKS_MODE_NONE);
 
-			err = dom_node_get_node_type(next, &type);
-			if (err != DOM_NO_ERR) {
-				ctx->cb(ctx->content, false);
-				dom_node_unref(next);
-				free(ctx);
-				return;
-			}
+		dom_string_unref(s);
 
-			if (type == DOM_ELEMENT_NODE)
-				break;
+		if (inline_style == NULL)
+			return NULL;
+	}
 
-			if (type == DOM_TEXT_NODE) {
-				ctx->n = next;
-				if (box_construct_text(ctx) == false) {
-					ctx->cb(ctx->content, false);
-					dom_node_unref(ctx->n);
-					free(ctx);
-					return;
-				}
-			}
+	/* Populate selection context */
+	ctx.ctx = c->select_ctx;
+	ctx.quirks = (c->quirks == DOM_DOCUMENT_QUIRKS_MODE_FULL);
+	ctx.base_url = c->base_url;
+	ctx.universal = c->universal;
+	ctx.root_style = root_style;
+	ctx.parent_style = parent_style;
 
-			next = next_node(next, ctx->content, true);
-		}
+	/* Select style for element */
+	styles = nscss_get_style(&ctx, n, &c->media, &c->unit_len_ctx,
+			inline_style);
 
-		ctx->n = next;
+	/* No longer need inline style */
+	if (inline_style != NULL)
+		css_stylesheet_destroy(inline_style);
 
-		if (next == NULL) {
-			/* Conversion complete */
-			struct box root;
+	return styles;
+}
 
-			memset(&root, 0, sizeof(root));
 
-			root.type = BOX_BLOCK;
-			root.children = root.last = ctx->root_box;
-			root.children->parent = &root;
+/**
+ * Construct the box required for a generated element.
+ *
+ * \param n        XML node of type XML_ELEMENT_NODE
+ * \param content  Content of type CONTENT_HTML that is being processed
+ * \param box      Box which may have generated content
+ * \param style    Complete computed style for pseudo element, or NULL
+ *
+ * \todo This is currently incomplete. It just does enough to support
+ * the clearfix hack. (http://www.positioniseverything.net/easyclearing.html )
+ */
+static void
+box_construct_generate(dom_node *n,
+		       html_content *content,
+		       struct box *box,
+		       const css_computed_style *style)
+{
+	struct box *gen = NULL;
+	enum css_display_e computed_display;
+	const css_computed_content_item *c_item;
 
-			/** \todo Remove box_normalise_block */
-			if (box_normalise_block(&root, ctx->root_box,
-					ctx->content) == false) {
-				ctx->cb(ctx->content, false);
-			} else {
-				ctx->content->layout = root.children;
-				ctx->content->layout->parent = NULL;
+	/* Nothing to generate if the parent box is not a block */
+	if (box->type != BOX_BLOCK)
+		return;
 
-				ctx->cb(ctx->content, true);
-			}
+	/* To determine if an element has a pseudo element, we select
+	 * for it and test to see if the returned style's content
+	 * property is set to normal. */
+	if (style == NULL ||
+			css_computed_content(style, &c_item) ==
+			CSS_CONTENT_NORMAL) {
+		/* No pseudo element */
+		return;
+	}
 
-			assert(ctx->n == NULL);
+	/* create box for this element */
+	computed_display = ns_computed_display(style, box_is_root(n));
+	if (computed_display == CSS_DISPLAY_BLOCK ||
+			computed_display == CSS_DISPLAY_TABLE) {
+		/* currently only support block level boxes */
 
-			free(ctx);
+		/** \todo Not wise to drop const from the computed style */
+		gen = box_create(NULL, (css_computed_style *) style,
+				false, NULL, NULL, NULL, NULL, content->bctx);
+		if (gen == NULL) {
 			return;
 		}
-	} while (++num_processed < max_processed_before_yield);
 
-	/* More work to do: schedule a continuation */
-	guit->misc->schedule(0, (void *)convert_xml_to_box, ctx);
+		/* set box type from computed display */
+		gen->type = box_map[ns_computed_display(
+				style, box_is_root(n))];
+
+		box_add_child(box, gen);
+	}
 }
 
+
 /**
  * Construct a list marker box
  *
@@ -460,11 +363,15 @@ void convert_xml_to_box(struct box_construct_ctx *ctx)
  * \param parent   Current block-level container
  * \return true on success, false on memory exhaustion
  */
-static bool box_construct_marker(struct box *box, const char *title,
-		struct box_construct_ctx *ctx, struct box *parent)
+static bool
+box_construct_marker(struct box *box,
+		     const char *title,
+		     struct box_construct_ctx *ctx,
+		     struct box *parent)
 {
 	lwc_string *image_uri;
 	struct box *marker;
+	enum css_list_style_type_e list_style_type;
 
 	marker = box_create(NULL, box->style, false, NULL, NULL, title,
 			NULL, ctx->bctx);
@@ -473,81 +380,33 @@ static bool box_construct_marker(struct box *box, const char *title,
 
 	marker->type = BOX_BLOCK;
 
+	list_style_type = css_computed_list_style_type(box->style);
+
 	/** \todo marker content (list-style-type) */
-	switch (css_computed_list_style_type(box->style)) {
+	switch (list_style_type) {
 	case CSS_LIST_STYLE_TYPE_DISC:
 		/* 2022 BULLET */
 		marker->text = (char *) "\342\200\242";
 		marker->length = 3;
 		break;
+
 	case CSS_LIST_STYLE_TYPE_CIRCLE:
 		/* 25CB WHITE CIRCLE */
 		marker->text = (char *) "\342\227\213";
 		marker->length = 3;
 		break;
+
 	case CSS_LIST_STYLE_TYPE_SQUARE:
 		/* 25AA BLACK SMALL SQUARE */
 		marker->text = (char *) "\342\226\252";
 		marker->length = 3;
 		break;
-	case CSS_LIST_STYLE_TYPE_DECIMAL:
-	case CSS_LIST_STYLE_TYPE_LOWER_ALPHA:
-	case CSS_LIST_STYLE_TYPE_LOWER_ROMAN:
-	case CSS_LIST_STYLE_TYPE_UPPER_ALPHA:
-	case CSS_LIST_STYLE_TYPE_UPPER_ROMAN:
-	default:
-		if (parent->last) {
-			struct box *last = parent->last;
-
-			/* Drill down into last child of parent
-			 * to find the list marker (if any)
-			 *
-			 * Floated list boxes end up as:
-			 *
-			 * parent
-			 *   BOX_INLINE_CONTAINER
-			 *     BOX_FLOAT_{LEFT,RIGHT}
-			 *       BOX_BLOCK <-- list box
-			 *        ...
-			 */
-			while (last != NULL && last->list_marker == NULL) {
-				struct box *last_inner = last;
-
-				while (last_inner != NULL) {
-					if (last_inner->list_marker != NULL)
-						break;
-					if (last_inner->type ==
-							BOX_INLINE_CONTAINER ||
-							last_inner->type ==
-							BOX_FLOAT_LEFT ||
-							last_inner->type ==
-							BOX_FLOAT_RIGHT) {
-						last_inner = last_inner->last;
-					} else {
-						last_inner = NULL;
-					}
-				}
-				if (last_inner != NULL) {
-					last = last_inner;
-				} else {
-					last = last->prev;
-				}
-			}
-
-			if (last && last->list_marker) {
-				marker->rows = last->list_marker->rows + 1;
-			}
-		}
-
-		marker->text = talloc_array(ctx->bctx, char, 20);
-		if (marker->text == NULL)
-			return false;
 
-		snprintf(marker->text, 20, "%u.", marker->rows);
-		marker->length = strlen(marker->text);
-		break;
+	default:
+		/* Numerical list counters get handled in layout. */
+		/* Fall through. */
 	case CSS_LIST_STYLE_TYPE_NONE:
-		marker->text = 0;
+		marker->text = NULL;
 		marker->length = 0;
 		break;
 	}
@@ -566,9 +425,11 @@ static bool box_construct_marker(struct box *box, const char *title,
 		if (error != NSERROR_OK)
 			return false;
 
-		if (html_fetch_object(ctx->content, url, marker, image_types,
-				ctx->content->base.available_width, 1000, false) ==
-				false) {
+		if (html_fetch_object(ctx->content,
+				      url,
+				      marker,
+				      image_types,
+				      false) ==	false) {
 			nsurl_unref(url);
 			return false;
 		}
@@ -581,147 +442,22 @@ static bool box_construct_marker(struct box *box, const char *title,
 	return true;
 }
 
-/**
- * Construct the box required for a generated element.
- *
- * \param n        XML node of type XML_ELEMENT_NODE
- * \param content  Content of type CONTENT_HTML that is being processed
- * \param box      Box which may have generated content
- * \param style    Complete computed style for pseudo element, or NULL
- *
- * TODO:
- * This is currently incomplete. It just does enough to support the clearfix
- * hack. ( http://www.positioniseverything.net/easyclearing.html )
- */
-static void box_construct_generate(dom_node *n, html_content *content,
-		struct box *box, const css_computed_style *style)
+static inline bool box__style_is_float(const struct box *box)
 {
-	struct box *gen = NULL;
-	enum css_display_e computed_display;
-	const css_computed_content_item *c_item;
-
-	/* Nothing to generate if the parent box is not a block */
-	if (box->type != BOX_BLOCK)
-		return;
-
-	/* To determine if an element has a pseudo element, we select
-	 * for it and test to see if the returned style's content
-	 * property is set to normal. */
-	if (style == NULL ||
-			css_computed_content(style, &c_item) ==
-			CSS_CONTENT_NORMAL) {
-		/* No pseudo element */
-		return;
-	}
-
-	/* create box for this element */
-	computed_display = ns_computed_display(style, box_is_root(n));
-	if (computed_display == CSS_DISPLAY_BLOCK ||
-			computed_display == CSS_DISPLAY_TABLE) {
-		/* currently only support block level boxes */
-
-		/** \todo Not wise to drop const from the computed style */
-		gen = box_create(NULL, (css_computed_style *) style,
-				false, NULL, NULL, NULL, NULL, content->bctx);
-		if (gen == NULL) {
-			return;
-		}
-
-		/* set box type from computed display */
-		gen->type = box_map[ns_computed_display(
-				style, box_is_root(n))];
-
-		box_add_child(box, gen);
-	}
+	return css_computed_float(box->style) == CSS_FLOAT_LEFT ||
+	       css_computed_float(box->style) == CSS_FLOAT_RIGHT;
 }
 
-/**
- * Extract transient construction properties
- *
- * \param n      Current DOM node to convert
- * \param props  Property object to populate
- */
-static void box_extract_properties(dom_node *n,
-		struct box_construct_props *props)
+static inline bool box__is_flex(const struct box *box)
 {
-	memset(props, 0, sizeof(*props));
-
-	props->node_is_root = box_is_root(n);
-
-	/* Extract properties from containing DOM node */
-	if (props->node_is_root == false) {
-		dom_node *current_node = n;
-		dom_node *parent_node = NULL;
-		struct box *parent_box;
-		dom_exception err;
-
-		/* Find ancestor node containing parent box */
-		while (true) {
-			err = dom_node_get_parent_node(current_node,
-					&parent_node);
-			if (err != DOM_NO_ERR || parent_node == NULL)
-				break;
-
-			parent_box = box_for_node(parent_node);
-
-			if (parent_box != NULL) {
-				props->parent_style = parent_box->style;
-				props->href = parent_box->href;
-				props->target = parent_box->target;
-				props->title = parent_box->title;
-
-				dom_node_unref(parent_node);
-				break;
-			} else {
-				if (current_node != n)
-					dom_node_unref(current_node);
-				current_node = parent_node;
-				parent_node = NULL;
-			}
-		}
-
-		/* Find containing block (may be parent) */
-		while (true) {
-			struct box *b;
-
-			err = dom_node_get_parent_node(current_node,
-					&parent_node);
-			if (err != DOM_NO_ERR || parent_node == NULL) {
-				if (current_node != n)
-					dom_node_unref(current_node);
-				break;
-			}
-
-			if (current_node != n)
-				dom_node_unref(current_node);
-
-			b = box_for_node(parent_node);
-
-			/* Children of nodes that created an inline box
-			 * will generate boxes which are attached as
-			 * _siblings_ of the box generated for their
-			 * parent node. Note, however, that we'll still
-			 * use the parent node's styling as the parent
-			 * style, above. */
-			if (b != NULL && b->type != BOX_INLINE &&
-					b->type != BOX_BR) {
-				props->containing_block = b;
-
-				dom_node_unref(parent_node);
-				break;
-			} else {
-				current_node = parent_node;
-				parent_node = NULL;
-			}
-		}
-	}
+	return box->type == BOX_FLEX || box->type == BOX_INLINE_FLEX;
+}
 
-	/* Compute current inline container, if any */
-	if (props->containing_block != NULL &&
-			props->containing_block->last != NULL &&
-			props->containing_block->last->type ==
-				BOX_INLINE_CONTAINER)
-		props->inline_container = props->containing_block->last;
+static inline bool box__containing_block_is_flex(
+		const struct box_construct_props *props)
+{
+	return props->containing_block != NULL &&
+	       box__is_flex(props->containing_block);
 }
 
 /**
@@ -731,15 +467,14 @@ static void box_extract_properties(dom_node *n,
  * \param convert_children  Whether to convert children
  * \return  true on success, false on memory exhaustion
  */
-
-bool box_construct_element(struct box_construct_ctx *ctx,
-		bool *convert_children)
+static bool
+box_construct_element(struct box_construct_ctx *ctx, bool *convert_children)
 {
 	dom_string *title0, *s;
 	lwc_string *id = NULL;
+	enum css_display_e css_display;
 	struct box *box = NULL, *old_box;
 	css_select_results *styles = NULL;
-	struct element_entry *element;
 	lwc_string *bgimage_uri;
 	dom_exception err;
 	struct box_construct_props props;
@@ -836,16 +571,15 @@ bool box_construct_element(struct box_construct_ctx *ctx,
 		dom_string_unref(s);
 	}
 
+	css_display = ns_computed_display_static(box->style);
+
 	/* Set box type from computed display */
 	if ((css_computed_position(box->style) == CSS_POSITION_ABSOLUTE ||
-			css_computed_position(box->style) ==
-					CSS_POSITION_FIXED) &&
-			(ns_computed_display_static(box->style) ==
-					CSS_DISPLAY_INLINE ||
-			 ns_computed_display_static(box->style) ==
-					CSS_DISPLAY_INLINE_BLOCK ||
-			 ns_computed_display_static(box->style) ==
-					CSS_DISPLAY_INLINE_TABLE)) {
+	     css_computed_position(box->style) == CSS_POSITION_FIXED) &&
+			(css_display == CSS_DISPLAY_INLINE ||
+			 css_display == CSS_DISPLAY_INLINE_BLOCK ||
+			 css_display == CSS_DISPLAY_INLINE_TABLE ||
+			 css_display == CSS_DISPLAY_INLINE_FLEX)) {
 		/* Special case for absolute positioning: make absolute inlines
 		 * into inline block so that the boxes are constructed in an
 		 * inline container as if they were not absolutely positioned.
@@ -859,24 +593,28 @@ bool box_construct_element(struct box_construct_ctx *ctx,
 		/* Normal mapping */
 		box->type = box_map[ns_computed_display(box->style,
 				props.node_is_root)];
+
+		if (props.containing_block->type == BOX_FLEX ||
+		    props.containing_block->type == BOX_INLINE_FLEX) {
+			/* Blockification */
+			switch (box->type) {
+			case BOX_INLINE_FLEX:
+				box->type = BOX_FLEX;
+				break;
+			case BOX_INLINE_BLOCK:
+				box->type = BOX_BLOCK;
+				break;
+			default:
+				break;
+			}
+		}
 	}
 
-	err = dom_node_get_node_name(ctx->n, &s);
-	if (err != DOM_NO_ERR || s == NULL)
+	if (convert_special_elements(ctx->n,
+				     ctx->content,
+				     box,
+				     convert_children) == false) {
 		return false;
-
-	/* Special elements */
-	element = bsearch(dom_string_data(s), element_table,
-			ELEMENT_TABLE_COUNT, sizeof(element_table[0]),
-			(int (*)(const void *, const void *)) strcasecmp);
-
-	dom_string_unref(s);
-
-	if (element != NULL) {
-		/* A special convert function exists for this element */
-		if (element->convert(ctx->n, ctx->content, box,
-				convert_children) == false)
-			return false;
 	}
 
 	/* Handle the :before pseudo element */
@@ -922,8 +660,9 @@ bool box_construct_element(struct box_construct_ctx *ctx,
 			(box->type == BOX_INLINE ||
 			 box->type == BOX_BR ||
 			 box->type == BOX_INLINE_BLOCK ||
-			 css_computed_float(box->style) == CSS_FLOAT_LEFT ||
-			 css_computed_float(box->style) == CSS_FLOAT_RIGHT) &&
+			 box->type == BOX_INLINE_FLEX ||
+			 (box__style_is_float(box) &&
+			  !box__containing_block_is_flex(&props))) &&
 			props.node_is_root == false) {
 		/* Found an inline child of a block without a current container
 		 * (i.e. this box is the first child of its parent, or was
@@ -955,10 +694,11 @@ bool box_construct_element(struct box_construct_ctx *ctx,
 		error = nsurl_create(lwc_string_data(bgimage_uri), &url);
 		if (error == NSERROR_OK) {
 			/* Fetch image if we got a valid URL */
-			if (html_fetch_object(ctx->content, url, box,
-					image_types,
-					ctx->content->base.available_width,
-					1000, true) == false) {
+			if (html_fetch_object(ctx->content,
+					      url,
+					      box,
+					      image_types,
+					      true) == false) {
 				nsurl_unref(url);
 				return false;
 			}
@@ -970,6 +710,7 @@ bool box_construct_element(struct box_construct_ctx *ctx,
 		box->flags |= CONVERT_CHILDREN;
 
 	if (box->type == BOX_INLINE || box->type == BOX_BR ||
+			box->type == BOX_INLINE_FLEX ||
 			box->type == BOX_INLINE_BLOCK) {
 		/* Inline container must exist, as we'll have
 		 * created it above if it didn't */
@@ -986,6 +727,7 @@ bool box_construct_element(struct box_construct_ctx *ctx,
 		}
 
 		if (props.node_is_root == false &&
+				box__containing_block_is_flex(&props) == false &&
 				(css_computed_float(box->style) ==
 				CSS_FLOAT_LEFT ||
 				css_computed_float(box->style) ==
@@ -1016,6 +758,7 @@ bool box_construct_element(struct box_construct_ctx *ctx,
 	return true;
 }
 
+
 /**
  * Complete construction of the box tree for an element.
  *
@@ -1024,7 +767,7 @@ bool box_construct_element(struct box_construct_ctx *ctx,
  *
  * This will be called after all children of an element have been processed
  */
-void box_construct_element_after(dom_node *n, html_content *content)
+static void box_construct_element_after(dom_node *n, html_content *content)
 {
 	struct box_construct_props props;
 	struct box *box = box_for_node(n);
@@ -1083,14 +826,168 @@ void box_construct_element_after(dom_node *n, html_content *content)
 	}
 }
 
+
+/**
+ * Find the next node in the DOM tree, completing element construction
+ * where appropriate.
+ *
+ * \param n                 Current node
+ * \param content           Containing content
+ * \param convert_children  Whether to consider children of \a n
+ * \return Next node to process, or NULL if complete
+ *
+ * \note \a n will be unreferenced
+ */
+static dom_node *
+next_node(dom_node *n, html_content *content, bool convert_children)
+{
+	dom_node *next = NULL;
+	bool has_children;
+	dom_exception err;
+
+	err = dom_node_has_child_nodes(n, &has_children);
+	if (err != DOM_NO_ERR) {
+		dom_node_unref(n);
+		return NULL;
+	}
+
+	if (convert_children && has_children) {
+		err = dom_node_get_first_child(n, &next);
+		if (err != DOM_NO_ERR) {
+			dom_node_unref(n);
+			return NULL;
+		}
+		dom_node_unref(n);
+	} else {
+		err = dom_node_get_next_sibling(n, &next);
+		if (err != DOM_NO_ERR) {
+			dom_node_unref(n);
+			return NULL;
+		}
+
+		if (next != NULL) {
+			if (box_for_node(n) != NULL)
+				box_construct_element_after(n, content);
+			dom_node_unref(n);
+		} else {
+			if (box_for_node(n) != NULL)
+				box_construct_element_after(n, content);
+
+			while (box_is_root(n) == false) {
+				dom_node *parent = NULL;
+				dom_node *parent_next = NULL;
+
+				err = dom_node_get_parent_node(n, &parent);
+				if (err != DOM_NO_ERR) {
+					dom_node_unref(n);
+					return NULL;
+				}
+
+				assert(parent != NULL);
+
+				err = dom_node_get_next_sibling(parent,
+						&parent_next);
+				if (err != DOM_NO_ERR) {
+					dom_node_unref(parent);
+					dom_node_unref(n);
+					return NULL;
+				}
+
+				if (parent_next != NULL) {
+					dom_node_unref(parent_next);
+					dom_node_unref(parent);
+					break;
+				}
+
+				dom_node_unref(n);
+				n = parent;
+				parent = NULL;
+
+				if (box_for_node(n) != NULL) {
+					box_construct_element_after(
+							n, content);
+				}
+			}
+
+			if (box_is_root(n) == false) {
+				dom_node *parent = NULL;
+
+				err = dom_node_get_parent_node(n, &parent);
+				if (err != DOM_NO_ERR) {
+					dom_node_unref(n);
+					return NULL;
+				}
+
+				assert(parent != NULL);
+
+				err = dom_node_get_next_sibling(parent, &next);
+				if (err != DOM_NO_ERR) {
+					dom_node_unref(parent);
+					dom_node_unref(n);
+					return NULL;
+				}
+
+				if (box_for_node(parent) != NULL) {
+					box_construct_element_after(parent,
+							content);
+				}
+
+				dom_node_unref(parent);
+			}
+
+			dom_node_unref(n);
+		}
+	}
+
+	return next;
+}
+
+
+/**
+ * Apply the CSS text-transform property to given text for its ASCII chars.
+ *
+ * \param  s	string to transform
+ * \param  len  length of s
+ * \param  tt	transform type
+ */
+static void
+box_text_transform(char *s, unsigned int len, enum css_text_transform_e tt)
+{
+	unsigned int i;
+	if (len == 0)
+		return;
+	switch (tt) {
+		case CSS_TEXT_TRANSFORM_UPPERCASE:
+			for (i = 0; i < len; ++i)
+				if ((unsigned char) s[i] < 0x80)
+					s[i] = ascii_to_upper(s[i]);
+			break;
+		case CSS_TEXT_TRANSFORM_LOWERCASE:
+			for (i = 0; i < len; ++i)
+				if ((unsigned char) s[i] < 0x80)
+					s[i] = ascii_to_lower(s[i]);
+			break;
+		case CSS_TEXT_TRANSFORM_CAPITALIZE:
+			if ((unsigned char) s[0] < 0x80)
+				s[0] = ascii_to_upper(s[0]);
+			for (i = 1; i < len; ++i)
+				if ((unsigned char) s[i] < 0x80 &&
+						ascii_is_space(s[i - 1]))
+					s[i] = ascii_to_upper(s[i]);
+			break;
+		default:
+			break;
+	}
+}
+
+
 /**
  * Construct the box tree for an XML text node.
  *
  * \param  ctx  Tree construction context
  * \return  true on success, false on memory exhaustion
  */
-
-bool box_construct_text(struct box_construct_ctx *ctx)
+static bool box_construct_text(struct box_construct_ctx *ctx)
 {
 	struct box_construct_props props;
 	struct box *box = NULL;
@@ -1326,1755 +1223,164 @@ bool box_construct_text(struct box_construct_ctx *ctx)
 	return true;
 }
 
-/**
- * Get the style for an element.
- *
- * \param  c               content of type CONTENT_HTML that is being processed
- * \param  parent_style    style at this point in xml tree, or NULL for root
- * \param  root_style      root node's style, or NULL for root
- * \param  n               node in xml tree
- * \return  the new style, or NULL on memory exhaustion
- */
-css_select_results *box_get_style(html_content *c,
-		const css_computed_style *parent_style,
-		const css_computed_style *root_style, dom_node *n)
-{
-	dom_string *s;
-	dom_exception err;
-	css_stylesheet *inline_style = NULL;
-	css_select_results *styles;
-	nscss_select_ctx ctx;
-
-	/* Firstly, construct inline stylesheet, if any */
-	err = dom_element_get_attribute(n, corestring_dom_style, &s);
-	if (err != DOM_NO_ERR)
-		return NULL;
-
-	if (s != NULL) {
-		inline_style = nscss_create_inline_style(
-				(const uint8_t *) dom_string_data(s),
-				dom_string_byte_length(s),
-				c->encoding,
-				nsurl_access(c->base_url),
-				c->quirks != DOM_DOCUMENT_QUIRKS_MODE_NONE);
-
-		dom_string_unref(s);
-
-		if (inline_style == NULL)
-			return NULL;
-	}
-
-	/* Populate selection context */
-	ctx.ctx = c->select_ctx;
-	ctx.quirks = (c->quirks == DOM_DOCUMENT_QUIRKS_MODE_FULL);
-	ctx.base_url = c->base_url;
-	ctx.universal = c->universal;
-	ctx.root_style = root_style;
-	ctx.parent_style = parent_style;
-
-	/* Select style for element */
-	styles = nscss_get_style(&ctx, n, &c->media, inline_style);
-
-	/* No longer need inline style */
-	if (inline_style != NULL)
-		css_stylesheet_destroy(inline_style);
-
-	return styles;
-}
-
-
-/**
- * Apply the CSS text-transform property to given text for its ASCII chars.
- *
- * \param  s	string to transform
- * \param  len  length of s
- * \param  tt	transform type
- */
-
-void box_text_transform(char *s, unsigned int len, enum css_text_transform_e tt)
-{
-	unsigned int i;
-	if (len == 0)
-		return;
-	switch (tt) {
-		case CSS_TEXT_TRANSFORM_UPPERCASE:
-			for (i = 0; i < len; ++i)
-				if ((unsigned char) s[i] < 0x80)
-					s[i] = toupper(s[i]);
-			break;
-		case CSS_TEXT_TRANSFORM_LOWERCASE:
-			for (i = 0; i < len; ++i)
-				if ((unsigned char) s[i] < 0x80)
-					s[i] = tolower(s[i]);
-			break;
-		case CSS_TEXT_TRANSFORM_CAPITALIZE:
-			if ((unsigned char) s[0] < 0x80)
-				s[0] = toupper(s[0]);
-			for (i = 1; i < len; ++i)
-				if ((unsigned char) s[i] < 0x80 &&
-						isspace(s[i - 1]))
-					s[i] = toupper(s[i]);
-			break;
-		default:
-			break;
-	}
-}
-
-
-/**
- * \name  Special case element handlers
- *
- * These functions are called by box_construct_element() when an element is
- * being converted, according to the entries in element_table.
- *
- * The parameters are the xmlNode, the content for the document, and a partly
- * filled in box structure for the element.
- *
- * Return true on success, false on memory exhaustion. Set *convert_children
- * to false if children of this element in the XML tree should be skipped (for
- * example, if they have been processed in some special way already).
- *
- * Elements ordered as in the HTML 4.01 specification. Section numbers in
- * brackets [] refer to the spec.
- *
- * \{
- */
-
-/**
- * Document body [7.5.1].
- */
-
-bool box_body(BOX_SPECIAL_PARAMS)
-{
-	css_color color;
-
-	css_computed_background_color(box->style, &color);
-	if (nscss_color_is_transparent(color))
-		content->background_colour = NS_TRANSPARENT;
-	else
-		content->background_colour = nscss_color_to_ns(color);
-
-	return true;
-}
-
-
-/**
- * Forced line break [9.3.2].
- */
-
-bool box_br(BOX_SPECIAL_PARAMS)
-{
-	box->type = BOX_BR;
-	return true;
-}
-
-/**
- * Preformatted text [9.3.4].
- */
-
-bool box_pre(BOX_SPECIAL_PARAMS)
-{
-	box->flags |= PRE_STRIP;
-	return true;
-}
-
-/**
- * Anchor [12.2].
- */
-
-bool box_a(BOX_SPECIAL_PARAMS)
-{
-	bool ok;
-	nsurl *url;
-	dom_string *s;
-	dom_exception err;
-
-	err = dom_element_get_attribute(n, corestring_dom_href, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		ok = box_extract_link(content, s, content->base_url, &url);
-		dom_string_unref(s);
-		if (!ok)
-			return false;
-		if (url) {
-			if (box->href != NULL)
-				nsurl_unref(box->href);
-			box->href = url;
-		}
-	}
-
-	/* name and id share the same namespace */
-	err = dom_element_get_attribute(n, corestring_dom_name, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		lwc_string *lwc_name;
-
-		err = dom_string_intern(s, &lwc_name);
-
-		dom_string_unref(s);
-
-		if (err == DOM_NO_ERR) {
-			/* name replaces existing id
-			 * TODO: really? */
-			if (box->id != NULL)
-				lwc_string_unref(box->id);
-
-			box->id = lwc_name;
-		}
-	}
-
-	/* target frame [16.3] */
-	err = dom_element_get_attribute(n, corestring_dom_target, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		if (dom_string_caseless_lwc_isequal(s,
-				corestring_lwc__blank))
-			box->target = TARGET_BLANK;
-		else if (dom_string_caseless_lwc_isequal(s,
-				corestring_lwc__top))
-			box->target = TARGET_TOP;
-		else if (dom_string_caseless_lwc_isequal(s,
-				corestring_lwc__parent))
-			box->target = TARGET_PARENT;
-		else if (dom_string_caseless_lwc_isequal(s,
-				corestring_lwc__self))
-			/* the default may have been overridden by a
-			 * <base target=...>, so this is different to 0 */
-			box->target = TARGET_SELF;
-		else {
-			/* 6.16 says that frame names must begin with [a-zA-Z]
-			 * This doesn't match reality, so just take anything */
-			box->target = talloc_strdup(content->bctx,
-					dom_string_data(s));
-			if (!box->target) {
-				dom_string_unref(s);
-				return false;
-			}
-		}
-		dom_string_unref(s);
-	}
-
-	return true;
-}
-
-
-/**
- * Embedded image [13.2].
- */
-
-bool box_image(BOX_SPECIAL_PARAMS)
-{
-	bool ok;
-	dom_string *s;
-	dom_exception err;
-	nsurl *url;
-	enum css_width_e wtype;
-	enum css_height_e htype;
-	css_fixed value = 0;
-	css_unit wunit = CSS_UNIT_PX;
-	css_unit hunit = CSS_UNIT_PX;
-
-	if (box->style && ns_computed_display(box->style,
-			box_is_root(n)) == CSS_DISPLAY_NONE)
-		return true;
-
-	/* handle alt text */
-	err = dom_element_get_attribute(n, corestring_dom_alt, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		char *alt = squash_whitespace(dom_string_data(s));
-		dom_string_unref(s);
-		if (alt == NULL)
-			return false;
-		box->text = talloc_strdup(content->bctx, alt);
-		free(alt);
-		if (box->text == NULL)
-			return false;
-		box->length = strlen(box->text);
-	}
-
-	if (nsoption_bool(foreground_images) == false) {
-		return true;
-	}
-
-	/* imagemap associated with this image */
-	if (!box_get_attribute(n, "usemap", content->bctx, &box->usemap))
-		return false;
-	if (box->usemap && box->usemap[0] == '#')
-		box->usemap++;
-
-	/* get image URL */
-	err = dom_element_get_attribute(n, corestring_dom_src, &s);
-	if (err != DOM_NO_ERR || s == NULL)
-		return true;
-
-	if (box_extract_link(content, s, content->base_url, &url) == false) {
-		dom_string_unref(s);
-		return false;
-	}
-
-	dom_string_unref(s);
-
-	if (url == NULL)
-		return true;
-
-	/* start fetch */
-	box->flags |= IS_REPLACED;
-	ok = html_fetch_object(content, url, box, image_types,
-			content->base.available_width, 1000, false);
-	nsurl_unref(url);
-
-	wtype = css_computed_width(box->style, &value, &wunit);
-	htype = css_computed_height(box->style, &value, &hunit);
-
-	if (wtype == CSS_WIDTH_SET && wunit != CSS_UNIT_PCT &&
-			htype == CSS_HEIGHT_SET && hunit != CSS_UNIT_PCT) {
-		/* We know the dimensions the image will be shown at before it's
-		 * fetched. */
-		box->flags |= REPLACE_DIM;
-	}
-
-	return ok;
-}
-
-
-/**
- * Noscript element
- */
-
-bool box_noscript(BOX_SPECIAL_PARAMS)
-{
-	/* If scripting is enabled, do not display the contents of noscript */
-	if (content->enable_scripting)
-		*convert_children = false;
-
-	return true;
-}
-
 
 /**
- * Destructor for object_params, for &lt;object&gt; elements
- *
- * \param o  The object params being destroyed.
- * \return 0 to allow talloc to continue destroying the tree.
- */
-static int box_object_talloc_destructor(struct object_params *o)
-{
-	if (o->codebase != NULL)
-		nsurl_unref(o->codebase);
-	if (o->classid != NULL)
-		nsurl_unref(o->classid);
-	if (o->data != NULL)
-		nsurl_unref(o->data);
-
-	return 0;
-}
-
-/**
- * Generic embedded object [13.3].
+ * Convert an ELEMENT node to a box tree fragment,
+ * then schedule conversion of the next ELEMENT node
  */
-
-bool box_object(BOX_SPECIAL_PARAMS)
+static void convert_xml_to_box(struct box_construct_ctx *ctx)
 {
-	struct object_params *params;
-	struct object_param *param;
-	dom_string *codebase, *classid, *data;
-	dom_node *c;
-	dom_exception err;
-
-	if (box->style && ns_computed_display(box->style,
-			box_is_root(n)) == CSS_DISPLAY_NONE)
-		return true;
-
-	if (box_get_attribute(n, "usemap", content->bctx, &box->usemap) ==
-			false)
-		return false;
-	if (box->usemap && box->usemap[0] == '#')
-		box->usemap++;
-
-	params = talloc(content->bctx, struct object_params);
-	if (params == NULL)
-		return false;
-
-	talloc_set_destructor(params, box_object_talloc_destructor);
-
-	params->data = NULL;
-	params->type = NULL;
-	params->codetype = NULL;
-	params->codebase = NULL;
-	params->classid = NULL;
-	params->params = NULL;
-
-	/* codebase, classid, and data are URLs
-	 * (codebase is the base for the other two) */
-	err = dom_element_get_attribute(n, corestring_dom_codebase, &codebase);
-	if (err == DOM_NO_ERR && codebase != NULL) {
-		if (box_extract_link(content, codebase,	content->base_url,
-				&params->codebase) == false) {
-			dom_string_unref(codebase);
-			return false;
-		}
-		dom_string_unref(codebase);
-	}
-	if (params->codebase == NULL)
-		params->codebase = nsurl_ref(content->base_url);
-
-	err = dom_element_get_attribute(n, corestring_dom_classid, &classid);
-	if (err == DOM_NO_ERR && classid != NULL) {
-		if (box_extract_link(content, classid,
-				params->codebase, &params->classid) == false) {
-			dom_string_unref(classid);
-			return false;
-		}
-		dom_string_unref(classid);
-	}
-
-	err = dom_element_get_attribute(n, corestring_dom_data, &data);
-	if (err == DOM_NO_ERR && data != NULL) {
-		if (box_extract_link(content, data,
-				params->codebase, &params->data) == false) {
-			dom_string_unref(data);
-			return false;
-		}
-		dom_string_unref(data);
-	}
-
-	if (params->classid == NULL && params->data == NULL)
-		/* nothing to embed; ignore */
-		return true;
-
-	/* Don't include ourself */
-	if (params->classid != NULL && nsurl_compare(content->base_url,
-			params->classid, NSURL_COMPLETE))
-		return true;
-
-	if (params->data != NULL && nsurl_compare(content->base_url,
-			params->data, NSURL_COMPLETE))
-		return true;
-
-	/* codetype and type are MIME types */
-	if (box_get_attribute(n, "codetype", params,
-			&params->codetype) == false)
-		return false;
-	if (box_get_attribute(n, "type", params, &params->type) == false)
-		return false;
-
-	/* classid && !data => classid is used (consult codetype)
-	 * (classid || !classid) && data => data is used (consult type)
-	 * !classid && !data => invalid; ignored */
-
-	if (params->classid != NULL && params->data == NULL &&
-			params->codetype != NULL) {
-		lwc_string *icodetype;
-		lwc_error lerror;
-
-		lerror = lwc_intern_string(params->codetype,
-				strlen(params->codetype), &icodetype);
-		if (lerror != lwc_error_ok)
-			return false;
-
-		if (content_factory_type_from_mime_type(icodetype) ==
-				CONTENT_NONE) {
-			/* can't handle this MIME type */
-			lwc_string_unref(icodetype);
-			return true;
-		}
-
-		lwc_string_unref(icodetype);
-	}
-
-	if (params->data != NULL && params->type != NULL) {
-		lwc_string *itype;
-		lwc_error lerror;
-
-		lerror = lwc_intern_string(params->type, strlen(params->type),
-				&itype);
-		if (lerror != lwc_error_ok)
-			return false;
-
-		if (content_factory_type_from_mime_type(itype) ==
-				CONTENT_NONE) {
-			/* can't handle this MIME type */
-			lwc_string_unref(itype);
-			return true;
-		}
-
-		lwc_string_unref(itype);
-	}
+	dom_node *next;
+	bool convert_children;
+	uint32_t num_processed = 0;
+	const uint32_t max_processed_before_yield = 10;
 
-	/* add parameters to linked list */
-	err = dom_node_get_first_child(n, &c);
-	if (err != DOM_NO_ERR)
-		return false;
+	do {
+		convert_children = true;
 
-	while (c != NULL) {
-		dom_node *next;
-		dom_node_type type;
+		assert(ctx->n != NULL);
 
-		err = dom_node_get_node_type(c, &type);
-		if (err != DOM_NO_ERR) {
-			dom_node_unref(c);
-			return false;
+		if (box_construct_element(ctx, &convert_children) == false) {
+			ctx->cb(ctx->content, false);
+			dom_node_unref(ctx->n);
+			free(ctx);
+			return;
 		}
 
-		if (type == DOM_ELEMENT_NODE) {
-			dom_string *name;
+		/* Find next element to process, converting text nodes as we go */
+		next = next_node(ctx->n, ctx->content, convert_children);
+		while (next != NULL) {
+			dom_node_type type;
+			dom_exception err;
 
-			err = dom_node_get_node_name(c, &name);
+			err = dom_node_get_node_type(next, &type);
 			if (err != DOM_NO_ERR) {
-				dom_node_unref(c);
-				return false;
+				ctx->cb(ctx->content, false);
+				dom_node_unref(next);
+				free(ctx);
+				return;
 			}
 
-			if (!dom_string_caseless_lwc_isequal(name,
-					corestring_lwc_param)) {
-				/* The first non-param child is the start of
-				 * the alt html. Therefore, we should break
-				 * out of this loop. */
-				dom_node_unref(c);
+			if (type == DOM_ELEMENT_NODE)
 				break;
-			}
-
-			param = talloc(params, struct object_param);
-			if (param == NULL) {
-				dom_node_unref(c);
-				return false;
-			}
-			param->name = NULL;
-			param->value = NULL;
-			param->type = NULL;
-			param->valuetype = NULL;
-			param->next = NULL;
-
-			if (box_get_attribute(c, "name", param,
-					&param->name) == false) {
-				dom_node_unref(c);
-				return false;
-			}
-
-			if (box_get_attribute(c, "value", param,
-					&param->value) == false) {
-				dom_node_unref(c);
-				return false;
-			}
-
-			if (box_get_attribute(c, "type", param,
-					&param->type) == false) {
-				dom_node_unref(c);
-				return false;
-			}
 
-			if (box_get_attribute(c, "valuetype", param,
-					&param->valuetype) == false) {
-				dom_node_unref(c);
-				return false;
-			}
-
-			if (param->valuetype == NULL) {
-				param->valuetype = talloc_strdup(param, "data");
-				if (param->valuetype == NULL) {
-					dom_node_unref(c);
-					return false;
+			if (type == DOM_TEXT_NODE) {
+				ctx->n = next;
+				if (box_construct_text(ctx) == false) {
+					ctx->cb(ctx->content, false);
+					dom_node_unref(ctx->n);
+					free(ctx);
+					return;
 				}
 			}
 
-			param->next = params->params;
-			params->params = param;
-		}
-
-		err = dom_node_get_next_sibling(c, &next);
-		if (err != DOM_NO_ERR) {
-			dom_node_unref(c);
-			return false;
-		}
-
-		dom_node_unref(c);
-		c = next;
-	}
-
-	box->object_params = params;
-
-	/* start fetch (MIME type is ok or not specified) */
-	box->flags |= IS_REPLACED;
-	if (!html_fetch_object(content,
-			params->data ? params->data : params->classid,
-			box, CONTENT_ANY, content->base.available_width, 1000,
-			false))
-		return false;
-
-	*convert_children = false;
-	return true;
-}
-
-
-/**
- * Window subdivision [16.2.1].
- */
-
-bool box_frameset(BOX_SPECIAL_PARAMS)
-{
-	bool ok;
-
-	if (content->frameset) {
-		NSLOG(netsurf, INFO, "Error: multiple framesets in document.");
-		/* Don't convert children */
-		if (convert_children)
-			*convert_children = false;
-		/* And ignore this spurious frameset */
-		box->type = BOX_NONE;
-		return true;
-	}
-
-	content->frameset = talloc_zero(content->bctx, struct content_html_frames);
-	if (!content->frameset)
-		return false;
-
-	ok = box_create_frameset(content->frameset, n, content);
-	if (ok)
-		box->type = BOX_NONE;
-
-	if (convert_children)
-		*convert_children = false;
-	return ok;
-}
-
-
-/**
- * Destructor for content_html_frames, for frame elements
- *
- * \param f  The frame params being destroyed.
- * \return 0 to allow talloc to continue destroying the tree.
- */
-static int box_frames_talloc_destructor(struct content_html_frames *f)
-{
-	if (f->url != NULL) {
-		nsurl_unref(f->url);
-		f->url = NULL;
-	}
-
-	return 0;
-}
-
-
-/**
- * Parse a multi-length-list, as defined by HTML 4.01.
- *
- * \param ds dom string to parse
- * \param count updated to number of entries
- * \return array of struct box_multi_length, or 0 on memory exhaustion
- */
-static struct frame_dimension *
-box_parse_multi_lengths(const dom_string *ds, unsigned int *count)
-{
-	char *end;
-	unsigned int i, n;
-	struct frame_dimension *length;
-	const char *s;
-
-	s = dom_string_data(ds);
-
-	for (i = 0, n = 1; s[i]; i++)
-		if (s[i] == ',')
-			n++;
-
-	length = calloc(n, sizeof(struct frame_dimension));
-	if (!length)
-		return NULL;
-
-	for (i = 0; i != n; i++) {
-		while (ascii_is_space(*s)) {
-			s++;
-		}
-		length[i].value = strtof(s, &end);
-		if (length[i].value <= 0) {
-			length[i].value = 1;
-		}
-		s = end;
-		switch (*s) {
-			case '%':
-				length[i].unit = FRAME_DIMENSION_PERCENT;
-				break;
-			case '*':
-				length[i].unit = FRAME_DIMENSION_RELATIVE;
-				break;
-			default:
-				length[i].unit = FRAME_DIMENSION_PIXELS;
-				break;
-		}
-		while (*s && *s != ',') {
-			s++;
-		}
-		if (*s == ',') {
-			s++;
-		}
-	}
-
-	*count = n;
-	return length;
-}
-
-
-bool box_create_frameset(struct content_html_frames *f, dom_node *n,
-		html_content *content) {
-	unsigned int row, col, index, i;
-	unsigned int rows = 1, cols = 1;
-	dom_string *s;
-	dom_exception err;
-	nsurl *url;
-	struct frame_dimension *row_height = 0, *col_width = 0;
-	dom_node *c, *next;
-	struct content_html_frames *frame;
-	bool default_border = true;
-	colour default_border_colour = 0x000000;
-
-	/* parse rows and columns */
-	err = dom_element_get_attribute(n, corestring_dom_rows, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		row_height = box_parse_multi_lengths(s, &rows);
-		dom_string_unref(s);
-		if (row_height == NULL)
-			return false;
-	} else {
-		row_height = calloc(1, sizeof(struct frame_dimension));
-		if (row_height == NULL)
-			return false;
-		row_height->value = 100;
-		row_height->unit = FRAME_DIMENSION_PERCENT;
-	}
-
-	err = dom_element_get_attribute(n, corestring_dom_cols, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		col_width = box_parse_multi_lengths(s, &cols);
-		dom_string_unref(s);
-		if (col_width == NULL) {
-			free(row_height);
-			return false;
-		}
-	} else {
-		col_width = calloc(1, sizeof(struct frame_dimension));
-		if (col_width == NULL) {
-			free(row_height);
-			return false;
-		}
-		col_width->value = 100;
-		col_width->unit = FRAME_DIMENSION_PERCENT;
-	}
-
-	/* common extension: border="0|1" to control all children */
-	err = dom_element_get_attribute(n, corestring_dom_border, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		if ((dom_string_data(s)[0] == '0') &&
-				(dom_string_data(s)[1] == '\0'))
-			default_border = false;
-		dom_string_unref(s);
-	}
-
-	/* common extension: frameborder="yes|no" to control all children */
-	err = dom_element_get_attribute(n, corestring_dom_frameborder, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		if (dom_string_caseless_lwc_isequal(s,
-				corestring_lwc_no) == 0)
-			default_border = false;
-		dom_string_unref(s);
-	}
-
-	/* common extension: bordercolor="#RRGGBB|<named colour>" to control
-	 *all children */
-	err = dom_element_get_attribute(n, corestring_dom_bordercolor, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		css_color color;
-
-		if (nscss_parse_colour(dom_string_data(s), &color))
-			default_border_colour = nscss_color_to_ns(color);
-
-		dom_string_unref(s);
-	}
-
-	/* update frameset and create default children */
-	f->cols = cols;
-	f->rows = rows;
-	f->scrolling = BW_SCROLLING_NO;
-	f->children = talloc_array(content->bctx, struct content_html_frames,
-								(rows * cols));
-
-	talloc_set_destructor(f->children, box_frames_talloc_destructor);
-
-	for (row = 0; row < rows; row++) {
-		for (col = 0; col < cols; col++) {
-			index = (row * cols) + col;
-			frame = &f->children[index];
-			frame->cols = 0;
-			frame->rows = 0;
-			frame->width = col_width[col];
-			frame->height = row_height[row];
-			frame->margin_width = 0;
-			frame->margin_height = 0;
-			frame->name = NULL;
-			frame->url = NULL;
-			frame->no_resize = false;
-			frame->scrolling = BW_SCROLLING_AUTO;
-			frame->border = default_border;
-			frame->border_colour = default_border_colour;
-			frame->children = NULL;
+			next = next_node(next, ctx->content, true);
 		}
-	}
-	free(col_width);
-	free(row_height);
-
-	/* create the frameset windows */
-	err = dom_node_get_first_child(n, &c);
-	if (err != DOM_NO_ERR)
-		return false;
-
-	for (row = 0; c != NULL && row < rows; row++) {
-		for (col = 0; c != NULL && col < cols; col++) {
-			while (c != NULL) {
-				dom_node_type type;
-				dom_string *name;
-
-				err = dom_node_get_node_type(c, &type);
-				if (err != DOM_NO_ERR) {
-					dom_node_unref(c);
-					return false;
-				}
-
-				err = dom_node_get_node_name(c, &name);
-				if (err != DOM_NO_ERR) {
-					dom_node_unref(c);
-					return false;
-				}
-
-				if (type != DOM_ELEMENT_NODE ||
-					(!dom_string_caseless_lwc_isequal(
-							name,
-							corestring_lwc_frame) &&
-					!dom_string_caseless_lwc_isequal(
-							name,
-							corestring_lwc_frameset
-							))) {
-					err = dom_node_get_next_sibling(c,
-							&next);
-					if (err != DOM_NO_ERR) {
-						dom_string_unref(name);
-						dom_node_unref(c);
-						return false;
-					}
-
-					dom_string_unref(name);
-					dom_node_unref(c);
-					c = next;
-				} else {
-					/* Got a FRAME or FRAMESET element */
-					dom_string_unref(name);
-					break;
-				}
-			}
-
-			if (c == NULL)
-				break;
-
-			/* get current frame */
-			index = (row * cols) + col;
-			frame = &f->children[index];
-
-			/* nest framesets */
-			err = dom_node_get_node_name(c, &s);
-			if (err != DOM_NO_ERR) {
-				dom_node_unref(c);
-				return false;
-			}
-
-			if (dom_string_caseless_lwc_isequal(s,
-					corestring_lwc_frameset)) {
-				dom_string_unref(s);
-				frame->border = 0;
-				if (box_create_frameset(frame, c,
-						content) == false) {
-					dom_node_unref(c);
-					return false;
-				}
 
-				err = dom_node_get_next_sibling(c, &next);
-				if (err != DOM_NO_ERR) {
-					dom_node_unref(c);
-					return false;
-				}
-
-				dom_node_unref(c);
-				c = next;
-				continue;
-			}
-
-			dom_string_unref(s);
-
-			/* get frame URL (not required) */
-			url = NULL;
-			err = dom_element_get_attribute(c, corestring_dom_src, &s);
-			if (err == DOM_NO_ERR && s != NULL) {
-				box_extract_link(content, s, content->base_url,
-						 &url);
-				dom_string_unref(s);
-			}
-
-			/* copy url */
-			if (url != NULL) {
-				/* no self-references */
-				if (nsurl_compare(content->base_url, url,
-						NSURL_COMPLETE) == false)
-					frame->url = url;
-				url = NULL;
-			}
-
-			/* fill in specified values */
-			err = dom_element_get_attribute(c, corestring_dom_name, &s);
-			if (err == DOM_NO_ERR && s != NULL) {
-				frame->name = talloc_strdup(content->bctx,
-						dom_string_data(s));
-				dom_string_unref(s);
-			}
-
-			dom_element_has_attribute(c, corestring_dom_noresize,
-					&frame->no_resize);
-
-			err = dom_element_get_attribute(c, corestring_dom_frameborder,
-					&s);
-			if (err == DOM_NO_ERR && s != NULL) {
-				i = atoi(dom_string_data(s));
-				frame->border = (i != 0);
-				dom_string_unref(s);
-			}
-
-			err = dom_element_get_attribute(c, corestring_dom_scrolling, &s);
-			if (err == DOM_NO_ERR && s != NULL) {
-				if (dom_string_caseless_lwc_isequal(s,
-						corestring_lwc_yes))
-					frame->scrolling = BW_SCROLLING_YES;
-				else if (dom_string_caseless_lwc_isequal(s,
-						corestring_lwc_no))
-					frame->scrolling = BW_SCROLLING_NO;
-				dom_string_unref(s);
-			}
-
-			err = dom_element_get_attribute(c, corestring_dom_marginwidth,
-					&s);
-			if (err == DOM_NO_ERR && s != NULL) {
-				frame->margin_width = atoi(dom_string_data(s));
-				dom_string_unref(s);
-			}
+		ctx->n = next;
 
-			err = dom_element_get_attribute(c, corestring_dom_marginheight,
-					&s);
-			if (err == DOM_NO_ERR && s != NULL) {
-				frame->margin_height = atoi(dom_string_data(s));
-				dom_string_unref(s);
-			}
+		if (next == NULL) {
+			/* Conversion complete */
+			struct box root;
 
-			err = dom_element_get_attribute(c, corestring_dom_bordercolor,
-					&s);
-			if (err == DOM_NO_ERR && s != NULL) {
-				css_color color;
+			memset(&root, 0, sizeof(root));
 
-				if (nscss_parse_colour(dom_string_data(s),
-						&color))
-					frame->border_colour =
-						nscss_color_to_ns(color);
+			root.type = BOX_BLOCK;
+			root.children = root.last = ctx->root_box;
+			root.children->parent = &root;
 
-				dom_string_unref(s);
-			}
+			/** \todo Remove box_normalise_block */
+			if (box_normalise_block(&root, ctx->root_box,
+					ctx->content) == false) {
+				ctx->cb(ctx->content, false);
+			} else {
+				ctx->content->layout = root.children;
+				ctx->content->layout->parent = NULL;
 
-			/* advance */
-			err = dom_node_get_next_sibling(c, &next);
-			if (err != DOM_NO_ERR) {
-				dom_node_unref(c);
-				return false;
+				ctx->cb(ctx->content, true);
 			}
 
-			dom_node_unref(c);
-			c = next;
-		}
-	}
-
-	/* If the last child wasn't a frame, we still need to unref it */
-	if (c != NULL) {
-		dom_node_unref(c);
-	}
-
-	return true;
-}
-
-
-/**
- * Destructor for content_html_iframe, for &lt;iframe&gt; elements
- *
- * \param f The iframe params being destroyed.
- * \return 0 to allow talloc to continue destroying the tree.
- */
-static int box_iframes_talloc_destructor(struct content_html_iframe *f)
-{
-	if (f->url != NULL) {
-		nsurl_unref(f->url);
-		f->url = NULL;
-	}
-
-	return 0;
-}
-
-
-/**
- * Inline subwindow [16.5].
- */
-
-bool box_iframe(BOX_SPECIAL_PARAMS)
-{
-	nsurl *url;
-	dom_string *s;
-	dom_exception err;
-	struct content_html_iframe *iframe;
-	int i;
-
-	if (box->style && ns_computed_display(box->style,
-			box_is_root(n)) == CSS_DISPLAY_NONE)
-		return true;
-
-	if (box->style && css_computed_visibility(box->style) ==
-			CSS_VISIBILITY_HIDDEN)
-		/* Don't create iframe discriptors for invisible iframes
-		 * TODO: handle hidden iframes at browser_window generation
-		 * time instead? */
-		return true;
-
-	/* get frame URL */
-	err = dom_element_get_attribute(n, corestring_dom_src, &s);
-	if (err != DOM_NO_ERR || s == NULL)
-		return true;
-	if (box_extract_link(content, s, content->base_url, &url) == false) {
-		dom_string_unref(s);
-		return false;
-	}
-	dom_string_unref(s);
-	if (url == NULL)
-		return true;
-
-	/* don't include ourself */
-	if (nsurl_compare(content->base_url, url, NSURL_COMPLETE)) {
-		nsurl_unref(url);
-		return true;
-	}
-
-	/* create a new iframe */
-	iframe = talloc(content->bctx, struct content_html_iframe);
-	if (iframe == NULL) {
-		nsurl_unref(url);
-		return false;
-	}
-
-	talloc_set_destructor(iframe, box_iframes_talloc_destructor);
-
-	iframe->box = box;
-	iframe->margin_width = 0;
-	iframe->margin_height = 0;
-	iframe->name = NULL;
-	iframe->url = url;
-	iframe->scrolling = BW_SCROLLING_AUTO;
-	iframe->border = true;
-
-	/* Add this iframe to the linked list of iframes */
-	iframe->next = content->iframe;
-	content->iframe = iframe;
-
-	/* fill in specified values */
-	err = dom_element_get_attribute(n, corestring_dom_name, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		iframe->name = talloc_strdup(content->bctx, dom_string_data(s));
-		dom_string_unref(s);
-	}
-
-	err = dom_element_get_attribute(n, corestring_dom_frameborder, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		i = atoi(dom_string_data(s));
-		iframe->border = (i != 0);
-		dom_string_unref(s);
-	}
-
-	err = dom_element_get_attribute(n, corestring_dom_bordercolor, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		css_color color;
-
-		if (nscss_parse_colour(dom_string_data(s), &color))
-			iframe->border_colour = nscss_color_to_ns(color);
-
-		dom_string_unref(s);
-	}
-
-	err = dom_element_get_attribute(n, corestring_dom_scrolling, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		if (dom_string_caseless_lwc_isequal(s,
-				corestring_lwc_yes))
-			iframe->scrolling = BW_SCROLLING_YES;
-		else if (dom_string_caseless_lwc_isequal(s,
-				corestring_lwc_no))
-			iframe->scrolling = BW_SCROLLING_NO;
-		dom_string_unref(s);
-	}
-
-	err = dom_element_get_attribute(n, corestring_dom_marginwidth, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		iframe->margin_width = atoi(dom_string_data(s));
-		dom_string_unref(s);
-	}
-
-	err = dom_element_get_attribute(n, corestring_dom_marginheight, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		iframe->margin_height = atoi(dom_string_data(s));
-		dom_string_unref(s);
-	}
-
-	/* box */
-	assert(box->style);
-	box->flags |= IFRAME;
-	box->flags |= IS_REPLACED;
-
-	/* Showing iframe, so don't show alternate content */
-	if (convert_children)
-		*convert_children = false;
-	return true;
-}
-
-
-/**
- * Helper function for adding textarea widget to box.
- *
- * This is a load of hacks to ensure boxes replaced with textareas
- * can be handled by the layout code.
- */
-
-static bool box_input_text(html_content *html, struct box *box,
-		struct dom_node *node)
-{
-	struct box *inline_container, *inline_box;
-
-	box->type = BOX_INLINE_BLOCK;
-
-	inline_container = box_create(NULL, 0, false, 0, 0, 0, 0, html->bctx);
-	if (!inline_container)
-		return false;
-	inline_container->type = BOX_INLINE_CONTAINER;
-	inline_box = box_create(NULL, box->style, false, 0, 0, box->title, 0,
-			html->bctx);
-	if (!inline_box)
-		return false;
-	inline_box->type = BOX_TEXT;
-	inline_box->text = talloc_strdup(html->bctx, "");
-
-	box_add_child(inline_container, inline_box);
-	box_add_child(box, inline_container);
-
-	return box_textarea_create_textarea(html, box, node);
-}
-
-
-/**
- * Form control [17.4].
- */
-
-bool box_input(BOX_SPECIAL_PARAMS)
-{
-	struct form_control *gadget;
-	dom_string *type = NULL;
-	dom_exception err;
-	nsurl *url;
-	nserror error;
-
-	gadget = html_forms_get_control_for_node(content->forms, n);
-	if (gadget == NULL) {
-		return false;
-	}
-
-	box->gadget = gadget;
-	box->flags |= IS_REPLACED;
-	gadget->box = box;
-	gadget->html = content;
-
-	/* get entry type */
-	err = dom_element_get_attribute(n, corestring_dom_type, &type);
-	if ((err != DOM_NO_ERR) || (type == NULL)) {
-		/* no type so "text" is assumed */
-		if (box_input_text(content, box, n) == false) {
-			return false;
-		}
-		*convert_children = false;
-		return true;
-	}
-
+			assert(ctx->n == NULL);
 
-	if (dom_string_caseless_lwc_isequal(type, corestring_lwc_password)) {
-		if (box_input_text(content, box, n) == false)
-			goto no_memory;
-
-	} else if (dom_string_caseless_lwc_isequal(type, corestring_lwc_file)) {
-		box->type = BOX_INLINE_BLOCK;
-
-	} else if (dom_string_caseless_lwc_isequal(type,
-			corestring_lwc_hidden)) {
-		/* no box for hidden inputs */
-		box->type = BOX_NONE;
-
-	} else if ((dom_string_caseless_lwc_isequal(type,
-				corestring_lwc_checkbox) ||
-			dom_string_caseless_lwc_isequal(type,
-				corestring_lwc_radio))) {
-
-	} else if (dom_string_caseless_lwc_isequal(type,
-				corestring_lwc_submit) ||
-			dom_string_caseless_lwc_isequal(type,
-				corestring_lwc_reset) ||
-			dom_string_caseless_lwc_isequal(type,
-				corestring_lwc_button)) {
-		struct box *inline_container, *inline_box;
-
-		if (box_button(n, content, box, 0) == false)
-			goto no_memory;
-
-		inline_container = box_create(NULL, 0, false, 0, 0, 0, 0,
-				content->bctx);
-		if (inline_container == NULL)
-			goto no_memory;
-
-		inline_container->type = BOX_INLINE_CONTAINER;
-
-		inline_box = box_create(NULL, box->style, false, 0, 0,
-				box->title, 0, content->bctx);
-		if (inline_box == NULL)
-			goto no_memory;
-
-		inline_box->type = BOX_TEXT;
-
-		if (box->gadget->value != NULL)
-			inline_box->text = talloc_strdup(content->bctx,
-					box->gadget->value);
-		else if (box->gadget->type == GADGET_SUBMIT)
-			inline_box->text = talloc_strdup(content->bctx,
-					messages_get("Form_Submit"));
-		else if (box->gadget->type == GADGET_RESET)
-			inline_box->text = talloc_strdup(content->bctx,
-					messages_get("Form_Reset"));
-		else
-			inline_box->text = talloc_strdup(content->bctx,
-							 "Button");
-
-		if (inline_box->text == NULL)
-			goto no_memory;
-
-		inline_box->length = strlen(inline_box->text);
-
-		box_add_child(inline_container, inline_box);
-
-		box_add_child(box, inline_container);
-
-	} else if (dom_string_caseless_lwc_isequal(type,
-			corestring_lwc_image)) {
-		gadget->type = GADGET_IMAGE;
-
-		if (box->style &&
-		    ns_computed_display(box->style,
-				box_is_root(n)) != CSS_DISPLAY_NONE &&
-		    nsoption_bool(foreground_images) == true) {
-			dom_string *s;
-
-			err = dom_element_get_attribute(n, corestring_dom_src, &s);
-			if (err == DOM_NO_ERR && s != NULL) {
-				error = nsurl_join(content->base_url,
-						dom_string_data(s), &url);
-				dom_string_unref(s);
-				if (error != NSERROR_OK)
-					goto no_memory;
-
-				/* if url is equivalent to the parent's url,
-				 * we've got infinite inclusion. stop it here
-				 */
-				if (nsurl_compare(url, content->base_url,
-						NSURL_COMPLETE) == false) {
-					if (!html_fetch_object(content, url,
-							box, image_types,
-							content->base.
-							available_width,
-							1000, false)) {
-						nsurl_unref(url);
-						goto no_memory;
-					}
-				}
-				nsurl_unref(url);
-			}
+			free(ctx);
+			return;
 		}
-	} else {
-		/* unhandled type the default is "text" */
-		if (box_input_text(content, box, n) == false)
-			goto no_memory;
-	}
-
-	dom_string_unref(type);
-
-	*convert_children = false;
-
-	return true;
-
-no_memory:
-	dom_string_unref(type);
-
-	return false;
-}
-
-
-/**
- * Push button [17.5].
- */
-
-bool box_button(BOX_SPECIAL_PARAMS)
-{
-	struct form_control *gadget;
-
-	gadget = html_forms_get_control_for_node(content->forms, n);
-	if (!gadget)
-		return false;
-
-	gadget->html = content;
-	box->gadget = gadget;
-	box->flags |= IS_REPLACED;
-	gadget->box = box;
-
-	box->type = BOX_INLINE_BLOCK;
-
-	/* Just render the contents */
+	} while (++num_processed < max_processed_before_yield);
 
-	return true;
+	/* More work to do: schedule a continuation */
+	guit->misc->schedule(0, (void *)convert_xml_to_box, ctx);
 }
 
 
-/**
- * Option selector [17.6].
- */
-
-bool box_select(BOX_SPECIAL_PARAMS)
+/* exported function documented in html/box_construct.h */
+nserror
+dom_to_box(dom_node *n,
+	   html_content *c,
+	   box_construct_complete_cb cb,
+	   void **box_conversion_context)
 {
-	struct box *inline_container;
-	struct box *inline_box;
-	struct form_control *gadget;
-	dom_node *c, *c2;
-	dom_node *next, *next2;
-	dom_exception err;
-
-	gadget = html_forms_get_control_for_node(content->forms, n);
-	if (gadget == NULL)
-		return false;
-
-	gadget->html = content;
-	err = dom_node_get_first_child(n, &c);
-	if (err != DOM_NO_ERR) {
-		form_free_control(gadget);
-		return false;
-	}
-
-	while (c != NULL) {
-		dom_string *name;
-
-		err = dom_node_get_node_name(c, &name);
-		if (err != DOM_NO_ERR) {
-			dom_node_unref(c);
-			form_free_control(gadget);
-			return false;
-		}
-
-		if (dom_string_caseless_lwc_isequal(name,
-				corestring_lwc_option)) {
-			dom_string_unref(name);
-
-			if (box_select_add_option(gadget, c) == false) {
-				dom_node_unref(c);
-				form_free_control(gadget);
-				return false;
-			}
-		} else if (dom_string_caseless_lwc_isequal(name,
-				corestring_lwc_optgroup)) {
-			dom_string_unref(name);
-
-			err = dom_node_get_first_child(c, &c2);
-			if (err != DOM_NO_ERR) {
-				dom_node_unref(c);
-				form_free_control(gadget);
-				return false;
-			}
-
-			while (c2 != NULL) {
-				dom_string *c2_name;
-
-				err = dom_node_get_node_name(c2, &c2_name);
-				if (err != DOM_NO_ERR) {
-					dom_node_unref(c2);
-					dom_node_unref(c);
-					form_free_control(gadget);
-					return false;
-				}
-
-				if (dom_string_caseless_lwc_isequal(c2_name,
-						corestring_lwc_option)) {
-					dom_string_unref(c2_name);
-
-					if (box_select_add_option(gadget,
-							c2) == false) {
-						dom_node_unref(c2);
-						dom_node_unref(c);
-						form_free_control(gadget);
-						return false;
-					}
-				} else {
-					dom_string_unref(c2_name);
-				}
-
-				err = dom_node_get_next_sibling(c2, &next2);
-				if (err != DOM_NO_ERR) {
-					dom_node_unref(c2);
-					dom_node_unref(c);
-					form_free_control(gadget);
-					return false;
-				}
+	struct box_construct_ctx *ctx;
 
-				dom_node_unref(c2);
-				c2 = next2;
-			}
-		} else {
-			dom_string_unref(name);
-		}
+	assert(box_conversion_context != NULL);
 
-		err = dom_node_get_next_sibling(c, &next);
-		if (err != DOM_NO_ERR) {
-			dom_node_unref(c);
-			form_free_control(gadget);
-			return false;
+	if (c->bctx == NULL) {
+		/* create a context allocation for this box tree */
+		c->bctx = talloc_zero(0, int);
+		if (c->bctx == NULL) {
+			return NSERROR_NOMEM;
 		}
-
-		dom_node_unref(c);
-		c = next;
-	}
-
-	if (gadget->data.select.num_items == 0) {
-		/* no options: ignore entire select */
-		form_free_control(gadget);
-		return true;
-	}
-
-	box->type = BOX_INLINE_BLOCK;
-	box->gadget = gadget;
-	box->flags |= IS_REPLACED;
-	gadget->box = box;
-
-	inline_container = box_create(NULL, 0, false, 0, 0, 0, 0, content->bctx);
-	if (inline_container == NULL)
-		goto no_memory;
-	inline_container->type = BOX_INLINE_CONTAINER;
-	inline_box = box_create(NULL, box->style, false, 0, 0, box->title, 0,
-			content->bctx);
-	if (inline_box == NULL)
-		goto no_memory;
-	inline_box->type = BOX_TEXT;
-	box_add_child(inline_container, inline_box);
-	box_add_child(box, inline_container);
-
-	if (gadget->data.select.multiple == false &&
-			gadget->data.select.num_selected == 0) {
-		gadget->data.select.current = gadget->data.select.items;
-		gadget->data.select.current->initial_selected =
-			gadget->data.select.current->selected = true;
-		gadget->data.select.num_selected = 1;
-		dom_html_option_element_set_selected(
-				gadget->data.select.current->node, true);
-	}
-
-	if (gadget->data.select.num_selected == 0)
-		inline_box->text = talloc_strdup(content->bctx,
-				messages_get("Form_None"));
-	else if (gadget->data.select.num_selected == 1)
-		inline_box->text = talloc_strdup(content->bctx,
-				gadget->data.select.current->text);
-	else
-		inline_box->text = talloc_strdup(content->bctx,
-				messages_get("Form_Many"));
-	if (inline_box->text == NULL)
-		goto no_memory;
-
-	inline_box->length = strlen(inline_box->text);
-
-	*convert_children = false;
-	return true;
-
-no_memory:
-	return false;
-}
-
-
-/**
- * Add an option to a form select control (helper function for box_select()).
- *
- * \param  control  select containing the &lt;option&gt;
- * \param  n	    xml element node for &lt;option&gt;
- * \return  true on success, false on memory exhaustion
- */
-
-bool box_select_add_option(struct form_control *control, dom_node *n)
-{
-	char *value = NULL;
-	char *text = NULL;
-	char *text_nowrap = NULL;
-	bool selected;
-	dom_string *content, *s;
-	dom_exception err;
-
-	err = dom_node_get_text_content(n, &content);
-	if (err != DOM_NO_ERR)
-		return false;
-
-	if (content != NULL) {
-		text = squash_whitespace(dom_string_data(content));
-		dom_string_unref(content);
-	} else {
-		text = strdup("");
 	}
 
-	if (text == NULL)
-		goto no_memory;
-
-	err = dom_element_get_attribute(n, corestring_dom_value, &s);
-	if (err == DOM_NO_ERR && s != NULL) {
-		value = strdup(dom_string_data(s));
-		dom_string_unref(s);
-	} else {
-		value = strdup(text);
+	ctx = malloc(sizeof(*ctx));
+	if (ctx == NULL) {
+		return NSERROR_NOMEM;
 	}
 
-	if (value == NULL)
-		goto no_memory;
-
-	dom_element_has_attribute(n, corestring_dom_selected, &selected);
-
-	/* replace spaces/TABs with hard spaces to prevent line wrapping */
-	text_nowrap = cnv_space2nbsp(text);
-	if (text_nowrap == NULL)
-		goto no_memory;
-
-	if (form_add_option(control, value, text_nowrap, selected, n) == false)
-		goto no_memory;
-
-	free(text);
-
-	return true;
-
-no_memory:
-	free(value);
-	free(text);
-	free(text_nowrap);
-	return false;
-}
-
-
-/**
- * Multi-line text field [17.7].
- */
-
-bool box_textarea(BOX_SPECIAL_PARAMS)
-{
-	/* Get the form_control for the DOM node */
-	box->gadget = html_forms_get_control_for_node(content->forms, n);
-	if (box->gadget == NULL)
-		return false;
-
-	box->flags |= IS_REPLACED;
-	box->gadget->html = content;
-	box->gadget->box = box;
+	ctx->content = c;
+	ctx->n = dom_node_ref(n);
+	ctx->root_box = NULL;
+	ctx->cb = cb;
+	ctx->bctx = c->bctx;
 
-	if (!box_input_text(content, box, n))
-		return false;
+	*box_conversion_context = ctx;
 
-	*convert_children = false;
-	return true;
+	return guit->misc->schedule(0, (void *)convert_xml_to_box, ctx);
 }
 
 
-/**
- * Embedded object (not in any HTML specification:
- * see http://wp.netscape.com/assist/net_sites/new_html3_prop.html )
- */
-
-bool box_embed(BOX_SPECIAL_PARAMS)
+/* exported function documented in html/box_construct.h */
+nserror cancel_dom_to_box(void *box_conversion_context)
 {
-	struct object_params *params;
-	struct object_param *param;
-	dom_namednodemap *attrs;
-	unsigned long idx;
-	uint32_t num_attrs;
-	dom_string *src;
-	dom_exception err;
-
-	if (box->style && ns_computed_display(box->style,
-			box_is_root(n)) == CSS_DISPLAY_NONE)
-		return true;
-
-	params = talloc(content->bctx, struct object_params);
-	if (params == NULL)
-		return false;
-
-	talloc_set_destructor(params, box_object_talloc_destructor);
-
-	params->data = NULL;
-	params->type = NULL;
-	params->codetype = NULL;
-	params->codebase = NULL;
-	params->classid = NULL;
-	params->params = NULL;
-
-	/* src is a URL */
-	err = dom_element_get_attribute(n, corestring_dom_src, &src);
-	if (err != DOM_NO_ERR || src == NULL)
-		return true;
-	if (box_extract_link(content, src, content->base_url,
-			     &params->data) == false) {
-		dom_string_unref(src);
-		return false;
-	}
-
-	dom_string_unref(src);
+	struct box_construct_ctx *ctx = box_conversion_context;
+	nserror err;
 
-	if (params->data == NULL)
-		return true;
-
-	/* Don't include ourself */
-	if (nsurl_compare(content->base_url, params->data, NSURL_COMPLETE))
-		return true;
-
-	/* add attributes as parameters to linked list */
-	err = dom_node_get_attributes(n, &attrs);
-	if (err != DOM_NO_ERR)
-		return false;
-
-	err = dom_namednodemap_get_length(attrs, &num_attrs);
-	if (err != DOM_NO_ERR) {
-		dom_namednodemap_unref(attrs);
-		return false;
+	err = guit->misc->schedule(-1, (void *)convert_xml_to_box, ctx);
+	if (err != NSERROR_OK) {
+		return err;
 	}
 
-	for (idx = 0; idx < num_attrs; idx++) {
-		dom_attr *attr;
-		dom_string *name, *value;
-
-		err = dom_namednodemap_item(attrs, idx, (void *) &attr);
-		if (err != DOM_NO_ERR) {
-			dom_namednodemap_unref(attrs);
-			return false;
-		}
-
-		err = dom_attr_get_name(attr, &name);
-		if (err != DOM_NO_ERR) {
-			dom_namednodemap_unref(attrs);
-			return false;
-		}
-
-		if (dom_string_caseless_lwc_isequal(name, corestring_lwc_src)) {
-			dom_string_unref(name);
-			continue;
-		}
+	dom_node_unref(ctx->n);
+	free(ctx);
 
-		err = dom_attr_get_value(attr, &value);
-		if (err != DOM_NO_ERR) {
-			dom_string_unref(name);
-			dom_namednodemap_unref(attrs);
-			return false;
-		}
-
-		param = talloc(content->bctx, struct object_param);
-		if (param == NULL) {
-			dom_string_unref(value);
-			dom_string_unref(name);
-			dom_namednodemap_unref(attrs);
-			return false;
-		}
-
-		param->name = talloc_strdup(content->bctx, dom_string_data(name));
-		param->value = talloc_strdup(content->bctx, dom_string_data(value));
-		param->type = NULL;
-		param->valuetype = talloc_strdup(content->bctx, "data");
-		param->next = NULL;
-
-		dom_string_unref(value);
-		dom_string_unref(name);
-
-		if (param->name == NULL || param->value == NULL ||
-				param->valuetype == NULL) {
-			dom_namednodemap_unref(attrs);
-			return false;
-		}
-
-		param->next = params->params;
-		params->params = param;
-	}
-
-	dom_namednodemap_unref(attrs);
-
-	box->object_params = params;
-
-	/* start fetch */
-	box->flags |= IS_REPLACED;
-	return html_fetch_object(content, params->data, box, CONTENT_ANY,
-			content->base.available_width, 1000, false);
+	return NSERROR_OK;
 }
 
-/**
- * \}
- */
-
 
-/**
- * Get the value of an XML element's attribute.
- *
- * \param  n	      xmlNode, of type XML_ELEMENT_NODE
- * \param  attribute  name of attribute
- * \param  context    talloc context for result buffer
- * \param  value      updated to value, if the attribute is present
- * \return  true on success, false if attribute present but memory exhausted
- *
- * Note that returning true does not imply that the attribute was found. If the
- * attribute was not found, *value will be unchanged.
- */
-
-bool box_get_attribute(dom_node *n, const char *attribute,
-		void *context, char **value)
+/* exported function documented in html/box_construct.h */
+struct box *box_for_node(dom_node *n)
 {
-	char *result;
-	dom_string *attr, *attr_name;
+	struct box *box = NULL;
 	dom_exception err;
 
-	err = dom_string_create_interned((const uint8_t *) attribute,
-			strlen(attribute), &attr_name);
+	err = dom_node_get_user_data(n, corestring_dom___ns_key_box_node_data,
+			(void *) &box);
 	if (err != DOM_NO_ERR)
-		return false;
-
-	err = dom_element_get_attribute(n, attr_name, &attr);
-	if (err != DOM_NO_ERR) {
-		dom_string_unref(attr_name);
-		return false;
-	}
-
-	dom_string_unref(attr_name);
-
-	if (attr != NULL) {
-		result = talloc_strdup(context, dom_string_data(attr));
-
-		dom_string_unref(attr);
-
-		if (result == NULL)
-			return false;
-
-		*value = result;
-	}
+		return NULL;
 
-	return true;
+	return box;
 }
 
-
-/* exported function documented in html/box.h */
+/* exported function documented in html/box_construct.h */
 bool
 box_extract_link(const html_content *content,
 		 const dom_string *dsrel,
diff --git a/content/handlers/html/box_construct.h b/content/handlers/html/box_construct.h
new file mode 100644
index 000000000..f4bd119b1
--- /dev/null
+++ b/content/handlers/html/box_construct.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * HTML Box tree construction interface.
+ *
+ * This stage of rendering converts a tree of dom_nodes (produced by libdom)
+ * to a tree of struct box. The box tree represents the structure of the
+ * document as given by the CSS display and float properties.
+ *
+ * For example, consider the following HTML:
+ * \code
+ *   <h1>Example Heading</h1>
+ *   <p>Example paragraph <em>with emphasised text</em> etc.</p>       \endcode
+ *
+ * This would produce approximately the following box tree with default CSS
+ * rules:
+ * \code
+ *   BOX_BLOCK (corresponds to h1)
+ *     BOX_INLINE_CONTAINER
+ *       BOX_INLINE "Example Heading"
+ *   BOX_BLOCK (p)
+ *     BOX_INLINE_CONTAINER
+ *       BOX_INLINE "Example paragraph "
+ *       BOX_INLINE "with emphasised text" (em)
+ *       BOX_INLINE "etc."                                             \endcode
+ *
+ * Note that the em has been collapsed into the INLINE_CONTAINER.
+ *
+ * If these CSS rules were applied:
+ * \code
+ *   h1 { display: table-cell }
+ *   p { display: table-cell }
+ *   em { float: left; width: 5em }                                    \endcode
+ *
+ * then the box tree would instead look like this:
+ * \code
+ *   BOX_TABLE
+ *     BOX_TABLE_ROW_GROUP
+ *       BOX_TABLE_ROW
+ *         BOX_TABLE_CELL (h1)
+ *           BOX_INLINE_CONTAINER
+ *             BOX_INLINE "Example Heading"
+ *         BOX_TABLE_CELL (p)
+ *           BOX_INLINE_CONTAINER
+ *             BOX_INLINE "Example paragraph "
+ *             BOX_FLOAT_LEFT (em)
+ *               BOX_BLOCK
+ *                 BOX_INLINE_CONTAINER
+ *                   BOX_INLINE "with emphasised text"
+ *             BOX_INLINE "etc."                                       \endcode
+ *
+ * Here implied boxes have been added and a float is present.
+ */
+
+#ifndef NETSURF_HTML_BOX_CONSTRUCT_H
+#define NETSURF_HTML_BOX_CONSTRUCT_H
+
+/**
+ * Construct a box tree from a dom and html content
+ *
+ * \param n dom document
+ * \param c content of type CONTENT_HTML to construct box tree in
+ * \param cb callback to report conversion completion
+ * \param box_conversion_context pointer that recives the conversion context
+ * \return netsurf error code indicating status of call
+ */
+nserror dom_to_box(struct dom_node *n, struct html_content *c, box_construct_complete_cb cb, void **box_conversion_context);
+
+
+/**
+ * aborts any ongoing box construction
+ */
+nserror cancel_dom_to_box(void *box_conversion_context);
+
+
+/**
+ * Retrieve the box for a dom node, if there is one
+ *
+ * \param node The DOM node
+ * \return The box if there is one
+ */
+struct box *box_for_node(struct dom_node *node);
+
+/**
+ * Extract a URL from a relative link, handling junk like whitespace and
+ * attempting to read a real URL from "javascript:" links.
+ *
+ * \param content html content
+ * \param dsrel relative URL text taken from page
+ * \param base base for relative URLs
+ * \param result updated to target URL on heap, unchanged if extract failed
+ * \return true on success, false on memory exhaustion
+ */
+bool box_extract_link(const struct html_content *content, const struct dom_string *dsrel, struct nsurl *base, struct nsurl **result);
+
+#endif
diff --git a/content/handlers/html/box_inspect.c b/content/handlers/html/box_inspect.c
new file mode 100644
index 000000000..6591b6446
--- /dev/null
+++ b/content/handlers/html/box_inspect.c
@@ -0,0 +1,898 @@
+/*
+ * Copyright 2008 Michael Drake <tlsa@netsurf-browser.org>
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * implementation of box tree inspection.
+ */
+
+#include <stdio.h>
+#include <dom/dom.h>
+
+#include "utils/utils.h"
+#include "utils/nsurl.h"
+#include "utils/errors.h"
+#include "netsurf/types.h"
+#include "netsurf/content.h"
+#include "netsurf/mouse.h"
+#include "css/utils.h"
+#include "css/dump.h"
+#include "desktop/scrollbar.h"
+
+#include "html/private.h"
+#include "html/box.h"
+#include "html/box_inspect.h"
+
+/**
+ * Direction to move in a box-tree walk
+ */
+enum box_walk_dir {
+		   BOX_WALK_CHILDREN,
+		   BOX_WALK_PARENT,
+		   BOX_WALK_NEXT_SIBLING,
+		   BOX_WALK_FLOAT_CHILDREN,
+		   BOX_WALK_NEXT_FLOAT_SIBLING,
+		   BOX_WALK_FLOAT_CONTAINER
+};
+
+#define box_is_float(box) (box->type == BOX_FLOAT_LEFT ||	\
+			   box->type == BOX_FLOAT_RIGHT)
+
+/**
+ * Determine if a point lies within a box.
+ *
+ * \param[in]  unit_len_ctx     CSS length conversion context to use.
+ * \param[in]  box         Box to consider
+ * \param[in]  x           Coordinate relative to box
+ * \param[in]  y           Coordinate relative to box
+ * \param[out] physically  If function returning true, physically is set true
+ *                         iff point is within the box's physical dimensions and
+ *                         false if the point is not within the box's physical
+ *                         dimensions but is in the area defined by the box's
+ *                         descendants.  If function returns false, physically
+ *                         is undefined.
+ * \return  true if the point is within the box or a descendant box
+ *
+ * This is a helper function for box_at_point().
+ */
+static bool
+box_contains_point(const css_unit_ctx *unit_len_ctx,
+		   const struct box *box,
+		   int x,
+		   int y,
+		   bool *physically)
+{
+	css_computed_clip_rect css_rect;
+
+	if (box->style != NULL &&
+	    css_computed_position(box->style) == CSS_POSITION_ABSOLUTE &&
+	    css_computed_clip(box->style, &css_rect) == CSS_CLIP_RECT) {
+		/* We have an absolutly positioned box with a clip rect */
+		struct rect r = {
+				 .x0 = box->border[LEFT].width,
+				 .y0 = box->border[TOP].width,
+				 .x1 = box->padding[LEFT] + box->width +
+				 box->border[RIGHT].width +
+				 box->padding[RIGHT],
+				 .y1 = box->padding[TOP] + box->height +
+				 box->border[BOTTOM].width +
+				 box->padding[BOTTOM]
+		};
+		if (x >= r.x0 && x < r.x1 && y >= r.y0 && y < r.y1) {
+			*physically = true;
+		} else {
+			*physically = false;
+		}
+
+		/* Adjust rect to css clip region */
+		if (css_rect.left_auto == false) {
+			r.x0 += FIXTOINT(css_unit_len2device_px(
+						box->style,
+						unit_len_ctx,
+						css_rect.left,
+						css_rect.lunit));
+		}
+		if (css_rect.top_auto == false) {
+			r.y0 += FIXTOINT(css_unit_len2device_px(
+						box->style,
+						unit_len_ctx,
+						css_rect.top,
+						css_rect.tunit));
+		}
+		if (css_rect.right_auto == false) {
+			r.x1 = box->border[LEFT].width +
+				FIXTOINT(css_unit_len2device_px(
+						box->style,
+						unit_len_ctx,
+						css_rect.right,
+						css_rect.runit));
+		}
+		if (css_rect.bottom_auto == false) {
+			r.y1 = box->border[TOP].width +
+				FIXTOINT(css_unit_len2device_px(
+						box->style,
+						unit_len_ctx,
+						css_rect.bottom,
+						css_rect.bunit));
+		}
+
+		/* Test if point is in clipped box */
+		if (x >= r.x0 && x < r.x1 && y >= r.y0 && y < r.y1) {
+			/* inside clip area */
+			return true;
+		}
+
+		/* Not inside clip area */
+		return false;
+	}
+	if (x >= -box->border[LEFT].width &&
+	    x < box->padding[LEFT] + box->width +
+	    box->padding[RIGHT] + box->border[RIGHT].width &&
+	    y >= -box->border[TOP].width &&
+	    y < box->padding[TOP] + box->height +
+	    box->padding[BOTTOM] + box->border[BOTTOM].width) {
+		*physically = true;
+		return true;
+	}
+	if (box->list_marker && box->list_marker->x - box->x <= x +
+	    box->list_marker->border[LEFT].width &&
+	    x < box->list_marker->x - box->x +
+	    box->list_marker->padding[LEFT] +
+	    box->list_marker->width +
+	    box->list_marker->border[RIGHT].width +
+	    box->list_marker->padding[RIGHT] &&
+	    box->list_marker->y - box->y <= y +
+	    box->list_marker->border[TOP].width &&
+	    y < box->list_marker->y - box->y +
+	    box->list_marker->padding[TOP] +
+	    box->list_marker->height +
+	    box->list_marker->border[BOTTOM].width +
+	    box->list_marker->padding[BOTTOM]) {
+		*physically = true;
+		return true;
+	}
+	if ((box->style && css_computed_overflow_x(box->style) ==
+	     CSS_OVERFLOW_VISIBLE) || !box->style) {
+		if (box->descendant_x0 <= x &&
+		    x < box->descendant_x1) {
+			*physically = false;
+			return true;
+		}
+	}
+	if ((box->style && css_computed_overflow_y(box->style) ==
+	     CSS_OVERFLOW_VISIBLE) || !box->style) {
+		if (box->descendant_y0 <= y &&
+		    y < box->descendant_y1) {
+			*physically = false;
+			return true;
+		}
+	}
+	return false;
+}
+
+
+/**
+ * Move from box to next box in given direction, adjusting for box coord change
+ *
+ * \param b box to move from from
+ * \param dir direction to move in
+ * \param x box's global x-coord, updated to position of next box
+ * \param y box's global y-coord, updated to position of next box
+ *
+ * If no box can be found in given direction, NULL is returned.
+ */
+static inline struct box *
+box_move_xy(struct box *b, enum box_walk_dir dir, int *x, int *y)
+{
+	struct box *rb = NULL;
+
+	switch (dir) {
+	case BOX_WALK_CHILDREN:
+		b = b->children;
+		if (b == NULL)
+			break;
+		*x += b->x;
+		*y += b->y;
+		if (!box_is_float(b)) {
+			rb = b;
+			break;
+		}
+		fallthrough;
+
+	case BOX_WALK_NEXT_SIBLING:
+		do {
+			*x -= b->x;
+			*y -= b->y;
+			b = b->next;
+			if (b == NULL)
+				break;
+			*x += b->x;
+			*y += b->y;
+		} while (box_is_float(b));
+		rb = b;
+		break;
+
+	case BOX_WALK_PARENT:
+		*x -= b->x;
+		*y -= b->y;
+		rb = b->parent;
+		break;
+
+	case BOX_WALK_FLOAT_CHILDREN:
+		b = b->float_children;
+		if (b == NULL)
+			break;
+		*x += b->x;
+		*y += b->y;
+		rb = b;
+		break;
+
+	case BOX_WALK_NEXT_FLOAT_SIBLING:
+		*x -= b->x;
+		*y -= b->y;
+		b = b->next_float;
+		if (b == NULL)
+			break;
+		*x += b->x;
+		*y += b->y;
+		rb = b;
+		break;
+
+	case BOX_WALK_FLOAT_CONTAINER:
+		*x -= b->x;
+		*y -= b->y;
+		rb = b->float_container;
+		break;
+
+	default:
+		assert(0 && "Bad box walk type.");
+	}
+
+	return rb;
+}
+
+
+/**
+ * Itterator for walking to next box in interaction order
+ *
+ * \param b	box to find next box from
+ * \param x	box's global x-coord, updated to position of next box
+ * \param y	box's global y-coord, updated to position of next box
+ * \param skip_children	whether to skip box's children
+ *
+ * This walks to a boxes float children before its children.  When walking
+ * children, floating boxes are skipped.
+ */
+static inline struct box *
+box_next_xy(struct box *b, int *x, int *y, bool skip_children)
+{
+	struct box *n;
+	int tx, ty;
+
+	assert(b != NULL);
+
+	if (skip_children) {
+		/* Caller is not interested in any kind of children */
+		goto skip_children;
+	}
+
+	tx = *x; ty = *y;
+	n = box_move_xy(b, BOX_WALK_FLOAT_CHILDREN, &tx, &ty);
+	if (n) {
+		/* Next node is float child */
+		*x = tx;
+		*y = ty;
+		return n;
+	}
+ done_float_children:
+
+	tx = *x; ty = *y;
+	n = box_move_xy(b, BOX_WALK_CHILDREN, &tx, &ty);
+	if (n) {
+		/* Next node is child */
+		*x = tx;
+		*y = ty;
+		return n;
+	}
+
+ skip_children:
+	tx = *x; ty = *y;
+	n = box_move_xy(b, BOX_WALK_NEXT_FLOAT_SIBLING, &tx, &ty);
+	if (n) {
+		/* Go to next float sibling */
+		*x = tx;
+		*y = ty;
+		return n;
+	}
+
+	if (box_is_float(b)) {
+		/* Done floats, but the float container may have children,
+		 * or siblings, or ansestors with siblings.  Change to
+		 * float container and move past handling its float children.
+		 */
+		b = box_move_xy(b, BOX_WALK_FLOAT_CONTAINER, x, y);
+		goto done_float_children;
+	}
+
+	/* Go to next sibling, or nearest ancestor with next sibling. */
+	while (b) {
+		while (!b->next && b->parent) {
+			b = box_move_xy(b, BOX_WALK_PARENT, x, y);
+			if (box_is_float(b)) {
+				/* Go on to next float, if there is one */
+				goto skip_children;
+			}
+		}
+		if (!b->next) {
+			/* No more boxes */
+			return NULL;
+		}
+
+		tx = *x; ty = *y;
+		n = box_move_xy(b, BOX_WALK_NEXT_SIBLING, &tx, &ty);
+		if (n) {
+			/* Go to non-float (ancestor) sibling */
+			*x = tx;
+			*y = ty;
+			return n;
+
+		} else if (b->parent) {
+			b = box_move_xy(b, BOX_WALK_PARENT, x, y);
+			if (box_is_float(b)) {
+				/* Go on to next float, if there is one */
+				goto skip_children;
+			}
+
+		} else {
+			/* No more boxes */
+			return NULL;
+		}
+	}
+
+	assert(b != NULL);
+	return NULL;
+}
+
+
+/**
+ * Check whether box is nearer mouse coordinates than current nearest box
+ *
+ * \param  box      box to test
+ * \param  bx	    position of box, in global document coordinates
+ * \param  by	    position of box, in global document coordinates
+ * \param  x	    mouse point, in global document coordinates
+ * \param  y	    mouse point, in global document coordinates
+ * \param  dir      direction in which to search (-1 = above-left,
+ *						  +1 = below-right)
+ * \param  nearest  nearest text box found, or NULL if none
+ *		    updated if box is nearer than existing nearest
+ * \param  tx	    position of text_box, in global document coordinates
+ *		    updated if box is nearer than existing nearest
+ * \param  ty	    position of text_box, in global document coordinates
+ *		    updated if box is nearer than existing nearest
+ * \param  nr_xd    distance to nearest text box found
+ *		    updated if box is nearer than existing nearest
+ * \param  nr_yd    distance to nearest text box found
+ *		    updated if box is nearer than existing nearest
+ * \return true if mouse point is inside box
+ */
+static bool
+box_nearer_text_box(struct box *box,
+		    int bx, int by,
+		    int x, int y,
+		    int dir,
+		    struct box **nearest,
+		    int *tx, int *ty,
+		    int *nr_xd, int *nr_yd)
+{
+	int w = box->padding[LEFT] + box->width + box->padding[RIGHT];
+	int h = box->padding[TOP] + box->height + box->padding[BOTTOM];
+	int y1 = by + h;
+	int x1 = bx + w;
+	int yd = INT_MAX;
+	int xd = INT_MAX;
+
+	if (x >= bx && x1 > x && y >= by && y1 > y) {
+		*nearest = box;
+		*tx = bx;
+		*ty = by;
+		return true;
+	}
+
+	if (box->parent->list_marker != box) {
+		if (dir < 0) {
+			/* consider only those children (partly) above-left */
+			if (by <= y && bx < x) {
+				yd = y <= y1 ? 0 : y - y1;
+				xd = x <= x1 ? 0 : x - x1;
+			}
+		} else {
+			/* consider only those children (partly) below-right */
+			if (y1 > y && x1 > x) {
+				yd = y > by ? 0 : by - y;
+				xd = x > bx ? 0 : bx - x;
+			}
+		}
+
+		/* give y displacement precedence over x */
+		if (yd < *nr_yd || (yd == *nr_yd && xd <= *nr_xd)) {
+			*nr_yd = yd;
+			*nr_xd = xd;
+			*nearest = box;
+			*tx = bx;
+			*ty = by;
+		}
+	}
+	return false;
+}
+
+
+/**
+ * Pick the text box child of 'box' that is closest to and above-left
+ * (dir -ve) or below-right (dir +ve) of the point 'x,y'
+ *
+ * \param  box      parent box
+ * \param  bx	    position of box, in global document coordinates
+ * \param  by	    position of box, in global document coordinates
+ * \param  fx	    position of float parent, in global document coordinates
+ * \param  fy	    position of float parent, in global document coordinates
+ * \param  x	    mouse point, in global document coordinates
+ * \param  y	    mouse point, in global document coordinates
+ * \param  dir      direction in which to search (-1 = above-left,
+ *						  +1 = below-right)
+ * \param  nearest  nearest text box found, or NULL if none
+ *		    updated if a descendant of box is nearer than old nearest
+ * \param  tx	    position of nearest, in global document coordinates
+ *		    updated if a descendant of box is nearer than old nearest
+ * \param  ty	    position of nearest, in global document coordinates
+ *		    updated if a descendant of box is nearer than old nearest
+ * \param  nr_xd    distance to nearest text box found
+ *		    updated if a descendant of box is nearer than old nearest
+ * \param  nr_yd    distance to nearest text box found
+ *		    updated if a descendant of box is nearer than old nearest
+ * \return true if mouse point is inside text_box
+ */
+static bool
+box_nearest_text_box(struct box *box,
+		     int bx, int by,
+		     int fx, int fy,
+		     int x, int y,
+		     int dir,
+		     struct box **nearest,
+		     int *tx, int *ty,
+		     int *nr_xd, int *nr_yd)
+{
+	struct box *child = box->children;
+	int c_bx, c_by;
+	int c_fx, c_fy;
+	bool in_box = false;
+
+	if (*nearest == NULL) {
+		*nr_xd = INT_MAX / 2; /* displacement of 'nearest so far' */
+		*nr_yd = INT_MAX / 2;
+	}
+	if (box->type == BOX_INLINE_CONTAINER) {
+		int bw = box->padding[LEFT] + box->width + box->padding[RIGHT];
+		int bh = box->padding[TOP] + box->height + box->padding[BOTTOM];
+		int b_y1 = by + bh;
+		int b_x1 = bx + bw;
+		if (x >= bx && b_x1 > x && y >= by && b_y1 > y) {
+			in_box = true;
+		}
+	}
+
+	while (child) {
+		if (child->type == BOX_FLOAT_LEFT ||
+		    child->type == BOX_FLOAT_RIGHT) {
+			c_bx = fx + child->x -
+				scrollbar_get_offset(child->scroll_x);
+			c_by = fy + child->y -
+				scrollbar_get_offset(child->scroll_y);
+		} else {
+			c_bx = bx + child->x -
+				scrollbar_get_offset(child->scroll_x);
+			c_by = by + child->y -
+				scrollbar_get_offset(child->scroll_y);
+		}
+		if (child->float_children) {
+			c_fx = c_bx;
+			c_fy = c_by;
+		} else {
+			c_fx = fx;
+			c_fy = fy;
+		}
+		if (in_box && child->text && !child->object) {
+			if (box_nearer_text_box(child,
+						c_bx, c_by, x, y, dir, nearest,
+						tx, ty, nr_xd, nr_yd))
+				return true;
+		} else {
+			if (child->list_marker) {
+				if (box_nearer_text_box(
+						child->list_marker,
+						c_bx + child->list_marker->x,
+						c_by + child->list_marker->y,
+						x, y, dir, nearest,
+						tx, ty, nr_xd, nr_yd))
+					return true;
+			}
+			if (box_nearest_text_box(child, c_bx, c_by,
+						 c_fx, c_fy,
+						 x, y, dir, nearest, tx, ty,
+						 nr_xd, nr_yd))
+				return true;
+		}
+		child = child->next;
+	}
+
+	return false;
+}
+
+
+/* Exported function documented in html/box.h */
+void box_coords(struct box *box, int *x, int *y)
+{
+	*x = box->x;
+	*y = box->y;
+	while (box->parent) {
+		if (box_is_float(box)) {
+			assert(box->float_container);
+			box = box->float_container;
+		} else {
+			box = box->parent;
+		}
+		*x += box->x - scrollbar_get_offset(box->scroll_x);
+		*y += box->y - scrollbar_get_offset(box->scroll_y);
+	}
+}
+
+
+/* Exported function documented in html/box.h */
+void box_bounds(struct box *box, struct rect *r)
+{
+	int width, height;
+
+	box_coords(box, &r->x0, &r->y0);
+
+	width = box->padding[LEFT] + box->width + box->padding[RIGHT];
+	height = box->padding[TOP] + box->height + box->padding[BOTTOM];
+
+	r->x1 = r->x0 + width;
+	r->y1 = r->y0 + height;
+}
+
+
+/* Exported function documented in html/box.h */
+struct box *
+box_at_point(const css_unit_ctx *unit_len_ctx,
+	     struct box *box,
+	     const int x, const int y,
+	     int *box_x, int *box_y)
+{
+	bool skip_children;
+	bool physically;
+
+	assert(box);
+
+	skip_children = false;
+	while ((box = box_next_xy(box, box_x, box_y, skip_children))) {
+		if (box_contains_point(unit_len_ctx, box, x - *box_x, y - *box_y,
+				       &physically)) {
+			*box_x -= scrollbar_get_offset(box->scroll_x);
+			*box_y -= scrollbar_get_offset(box->scroll_y);
+
+			if (physically)
+				return box;
+
+			skip_children = false;
+		} else {
+			skip_children = true;
+		}
+	}
+
+	return NULL;
+}
+
+
+/* Exported function documented in html/box.h */
+struct box *box_find_by_id(struct box *box, lwc_string *id)
+{
+	struct box *a, *b;
+	bool m;
+
+	if (box->id != NULL &&
+	    lwc_string_isequal(id, box->id, &m) == lwc_error_ok &&
+	    m == true) {
+		return box;
+	}
+
+	for (a = box->children; a; a = a->next) {
+		if ((b = box_find_by_id(a, id)) != NULL) {
+			return b;
+		}
+	}
+
+	return NULL;
+}
+
+
+/* Exported function documented in html/box.h */
+bool box_visible(struct box *box)
+{
+	/* visibility: hidden */
+	if (box->style &&
+	    css_computed_visibility(box->style) == CSS_VISIBILITY_HIDDEN) {
+		return false;
+	}
+
+	return true;
+}
+
+
+/* Exported function documented in html/box.h */
+void box_dump(FILE *stream, struct box *box, unsigned int depth, bool style)
+{
+	unsigned int i;
+	struct box *c, *prev;
+
+	for (i = 0; i != depth; i++) {
+		fprintf(stream, "  ");
+	}
+
+	fprintf(stream, "%p ", box);
+	fprintf(stream, "x%i y%i w%i h%i ",
+		box->x, box->y, box->width, box->height);
+	if (box->max_width != UNKNOWN_MAX_WIDTH) {
+		fprintf(stream, "min%i max%i ", box->min_width, box->max_width);
+	}
+	fprintf(stream, "desc(%i %i %i %i) ",
+		box->descendant_x0, box->descendant_y0,
+		box->descendant_x1, box->descendant_y1);
+
+	fprintf(stream, "m(%i %i %i %i) ",
+		box->margin[TOP], box->margin[LEFT],
+		box->margin[BOTTOM], box->margin[RIGHT]);
+
+	switch (box->type) {
+	case BOX_BLOCK:
+		fprintf(stream, "BLOCK ");
+		break;
+
+	case BOX_INLINE_CONTAINER:
+		fprintf(stream, "INLINE_CONTAINER ");
+		break;
+
+	case BOX_INLINE:
+		fprintf(stream, "INLINE ");
+		break;
+
+	case BOX_INLINE_END:
+		fprintf(stream, "INLINE_END ");
+		break;
+
+	case BOX_INLINE_BLOCK:
+		fprintf(stream, "INLINE_BLOCK ");
+		break;
+
+	case BOX_TABLE:
+		fprintf(stream, "TABLE [columns %i] ", box->columns);
+		break;
+
+	case BOX_TABLE_ROW:
+		fprintf(stream, "TABLE_ROW ");
+		break;
+
+	case BOX_TABLE_CELL:
+		fprintf(stream, "TABLE_CELL [columns %i, start %i, rows %i] ",
+			box->columns,
+			box->start_column,
+			box->rows);
+		break;
+
+	case BOX_TABLE_ROW_GROUP:
+		fprintf(stream, "TABLE_ROW_GROUP ");
+		break;
+
+	case BOX_FLOAT_LEFT:
+		fprintf(stream, "FLOAT_LEFT ");
+		break;
+
+	case BOX_FLOAT_RIGHT:
+		fprintf(stream, "FLOAT_RIGHT ");
+		break;
+
+	case BOX_BR:
+		fprintf(stream, "BR ");
+		break;
+
+	case BOX_TEXT:
+		fprintf(stream, "TEXT ");
+		break;
+
+	case BOX_FLEX:
+		fprintf(stream, "FLEX ");
+		break;
+
+	case BOX_INLINE_FLEX:
+		fprintf(stream, "INLINE_FLEX ");
+		break;
+
+	default:
+		fprintf(stream, "Unknown box type ");
+	}
+
+	if (box->text)
+		fprintf(stream, "%li '%.*s' ", (unsigned long) box->byte_offset,
+			(int) box->length, box->text);
+	if (box->space)
+		fprintf(stream, "space ");
+	if (box->object) {
+		fprintf(stream, "(object '%s') ",
+			nsurl_access(hlcache_handle_get_url(box->object)));
+	}
+	if (box->iframe) {
+		fprintf(stream, "(iframe) ");
+	}
+	if (box->gadget)
+		fprintf(stream, "(gadget) ");
+	if (style && box->style)
+		nscss_dump_computed_style(stream, box->style);
+	if (box->href)
+		fprintf(stream, " -> '%s'", nsurl_access(box->href));
+	if (box->target)
+		fprintf(stream, " |%s|", box->target);
+	if (box->title)
+		fprintf(stream, " [%s]", box->title);
+	if (box->id)
+		fprintf(stream, " ID:%s", lwc_string_data(box->id));
+	if (box->type == BOX_INLINE || box->type == BOX_INLINE_END)
+		fprintf(stream, " inline_end %p", box->inline_end);
+	if (box->float_children)
+		fprintf(stream, " float_children %p", box->float_children);
+	if (box->next_float)
+		fprintf(stream, " next_float %p", box->next_float);
+	if (box->float_container)
+		fprintf(stream, " float_container %p", box->float_container);
+	if (box->col) {
+		fprintf(stream, " (columns");
+		for (i = 0; i != box->columns; i++) {
+			fprintf(stream, " (%s %s %i %i %i)",
+				((const char *[]) {
+					"UNKNOWN",
+					"FIXED",
+					"AUTO",
+					"PERCENT",
+					"RELATIVE"
+						})
+				[box->col[i].type],
+				((const char *[]) {
+					"normal",
+					"positioned"})
+				[box->col[i].positioned],
+				box->col[i].width,
+				box->col[i].min, box->col[i].max);
+		}
+		fprintf(stream, ")");
+	}
+	if (box->node != NULL) {
+		dom_string *name;
+		if (dom_node_get_node_name(box->node, &name) == DOM_NO_ERR) {
+			fprintf(stream, " <%s>", dom_string_data(name));
+			dom_string_unref(name);
+		}
+	}
+	fprintf(stream, "\n");
+
+	if (box->list_marker) {
+		for (i = 0; i != depth; i++)
+			fprintf(stream, "  ");
+		fprintf(stream, "list_marker:\n");
+		box_dump(stream, box->list_marker, depth + 1, style);
+	}
+
+	for (c = box->children; c && c->next; c = c->next)
+		;
+	if (box->last != c)
+		fprintf(stream, "warning: box->last %p (should be %p) "
+			"(box %p)\n", box->last, c, box);
+	for (prev = 0, c = box->children; c; prev = c, c = c->next) {
+		if (c->parent != box)
+			fprintf(stream, "warning: box->parent %p (should be "
+				"%p) (box on next line)\n",
+				c->parent, box);
+		if (c->prev != prev)
+			fprintf(stream, "warning: box->prev %p (should be "
+				"%p) (box on next line)\n",
+				c->prev, prev);
+		box_dump(stream, c, depth + 1, style);
+	}
+}
+
+
+/* exported interface documented in html/box.h */
+bool box_vscrollbar_present(const struct box * const box)
+{
+	return box->padding[TOP] +
+		box->height +
+		box->padding[BOTTOM] +
+		box->border[BOTTOM].width < box->descendant_y1;
+}
+
+
+/* exported interface documented in html/box.h */
+bool box_hscrollbar_present(const struct box * const box)
+{
+	return box->padding[LEFT] +
+		box->width +
+		box->padding[RIGHT] +
+		box->border[RIGHT].width < box->descendant_x1;
+}
+
+
+/* Exported function documented in html/box.h */
+struct box *
+box_pick_text_box(struct html_content *html,
+		  int x, int y,
+		  int dir,
+		  int *dx, int *dy)
+{
+	struct box *text_box = NULL;
+	struct box *box;
+	int nr_xd, nr_yd;
+	int bx, by;
+	int fx, fy;
+	int tx, ty;
+
+	if (html == NULL)
+		return NULL;
+
+	box = html->layout;
+	bx = box->margin[LEFT];
+	by = box->margin[TOP];
+	fx = bx;
+	fy = by;
+
+	if (!box_nearest_text_box(box, bx, by, fx, fy, x, y,
+				  dir, &text_box, &tx, &ty, &nr_xd, &nr_yd)) {
+		if (text_box && text_box->text && !text_box->object) {
+			int w = (text_box->padding[LEFT] +
+				 text_box->width +
+				 text_box->padding[RIGHT]);
+			int h = (text_box->padding[TOP] +
+				 text_box->height +
+				 text_box->padding[BOTTOM]);
+			int x1, y1;
+
+			y1 = ty + h;
+			x1 = tx + w;
+
+			/* ensure point lies within the text box */
+			if (x < tx) x = tx;
+			if (y < ty) y = ty;
+			if (y > y1) y = y1;
+			if (x > x1) x = x1;
+		}
+	}
+
+	/* return coordinates relative to box */
+	*dx = x - tx;
+	*dy = y - ty;
+
+	return text_box;
+}
diff --git a/content/handlers/html/box_inspect.h b/content/handlers/html/box_inspect.h
new file mode 100644
index 000000000..a218326d8
--- /dev/null
+++ b/content/handlers/html/box_inspect.h
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * HTML Box tree inspection interface.
+ */
+
+#ifndef NETSURF_HTML_BOX_INSPECT_H
+#define NETSURF_HTML_BOX_INSPECT_H
+
+/**
+ * Find the absolute coordinates of a box.
+ *
+ * \param  box  the box to calculate coordinates of
+ * \param  x    updated to x coordinate
+ * \param  y    updated to y coordinate
+ */
+void box_coords(struct box *box, int *x, int *y);
+
+
+/**
+ * Find the bounds of a box.
+ *
+ * \param  box  the box to calculate bounds of
+ * \param  r    receives bounds
+ */
+void box_bounds(struct box *box, struct rect *r);
+
+
+/**
+ * Find the boxes at a point.
+ *
+ * \param  unit_len_ctx  CSS length conversion context for document.
+ * \param  box      box to search children of
+ * \param  x        point to find, in global document coordinates
+ * \param  y        point to find, in global document coordinates
+ * \param  box_x    position of box, in global document coordinates, updated
+ *                  to position of returned box, if any
+ * \param  box_y    position of box, in global document coordinates, updated
+ *                  to position of returned box, if any
+ * \return  box at given point, or 0 if none found
+ *
+ * To find all the boxes in the hierarchy at a certain point, use code like
+ * this:
+ * \code
+ *	struct box *box = top_of_document_to_search;
+ *	int box_x = 0, box_y = 0;
+ *
+ *	while ((box = box_at_point(unit_len_ctx, box, x, y, &box_x, &box_y))) {
+ *		// process box
+ *	}
+ * \endcode
+ */
+struct box *box_at_point(const css_unit_ctx *unit_len_ctx, struct box *box, const int x, const int y, int *box_x, int *box_y);
+
+
+/**
+ * Find a box based upon its id attribute.
+ *
+ * \param  box  box tree to search
+ * \param  id   id to look for
+ * \return  the box or 0 if not found
+ */
+struct box *box_find_by_id(struct box *box, lwc_string *id);
+
+
+/**
+ * Determine if a box is visible when the tree is rendered.
+ *
+ * \param  box  box to check
+ * \return  true iff the box is rendered
+ */
+bool box_visible(struct box *box);
+
+
+/**
+ * Print a box tree to a file.
+ */
+void box_dump(FILE *stream, struct box *box, unsigned int depth, bool style);
+
+
+/**
+ * Determine if a box has a vertical scrollbar.
+ *
+ * \param  box  scrolling box
+ * \return the box has a vertical scrollbar
+ */
+bool box_vscrollbar_present(const struct box *box);
+
+
+/**
+ * Determine if a box has a horizontal scrollbar.
+ *
+ * \param  box  scrolling box
+ * \return the box has a horizontal scrollbar
+ */
+bool box_hscrollbar_present(const struct box *box);
+
+
+/**
+ * Peform pick text on browser window contents to locate the box under
+ * the mouse pointer, or nearest in the given direction if the pointer is
+ * not over a text box.
+ *
+ * \param html	an HTML content
+ * \param x	coordinate of mouse
+ * \param y	coordinate of mouse
+ * \param dir	direction to search (-1 = above-left, +1 = below-right)
+ * \param dx	receives x ordinate of mouse relative to text box
+ * \param dy	receives y ordinate of mouse relative to text box
+ */
+struct box *box_pick_text_box(struct html_content *html, int x, int y, int dir, int *dx, int *dy);
+
+
+/**
+ * Check if layout box is a first child.
+ *
+ * \param[in] b  Box to check.
+ * \return true iff box is first child.
+ */
+static inline bool box_is_first_child(struct box *b)
+{
+	return (b->parent == NULL || b == b->parent->children);
+}
+
+static inline unsigned box_count_children(const struct box *b)
+{
+	const struct box *c = b->children;
+	unsigned count = 0;
+
+	while (c != NULL) {
+		count++;
+		c = c->next;
+	}
+
+	return count;
+}
+
+#endif
diff --git a/content/handlers/html/box_manipulate.c b/content/handlers/html/box_manipulate.c
new file mode 100644
index 000000000..8073a7fd1
--- /dev/null
+++ b/content/handlers/html/box_manipulate.c
@@ -0,0 +1,352 @@
+/*
+ * Copyright 2005-2007 James Bursa <bursa@users.sourceforge.net>
+ * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
+ * Copyright 2005 John M Bell <jmb202@ecs.soton.ac.uk>
+ * Copyright 2008 Michael Drake <tlsa@netsurf-browser.org>
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * implementation of box tree manipulation.
+ */
+
+
+#include "utils/errors.h"
+#include "utils/talloc.h"
+#include "utils/nsurl.h"
+#include "netsurf/types.h"
+#include "netsurf/mouse.h"
+#include "desktop/scrollbar.h"
+
+#include "html/private.h"
+#include "html/form_internal.h"
+#include "html/interaction.h"
+#include "html/box.h"
+#include "html/box_manipulate.h"
+
+
+/**
+ * Destructor for box nodes which own styles
+ *
+ * \param b The box being destroyed.
+ * \return 0 to allow talloc to continue destroying the tree.
+ */
+static int box_talloc_destructor(struct box *b)
+{
+	struct html_scrollbar_data *data;
+
+	if ((b->flags & STYLE_OWNED) && b->style != NULL) {
+		css_computed_style_destroy(b->style);
+		b->style = NULL;
+	}
+
+	if (b->styles != NULL) {
+		css_select_results_destroy(b->styles);
+		b->styles = NULL;
+	}
+
+	if (b->href != NULL)
+		nsurl_unref(b->href);
+
+	if (b->id != NULL) {
+		lwc_string_unref(b->id);
+	}
+
+	if (b->node != NULL) {
+		dom_node_unref(b->node);
+	}
+
+	if (b->scroll_x != NULL) {
+		data = scrollbar_get_data(b->scroll_x);
+		scrollbar_destroy(b->scroll_x);
+		free(data);
+	}
+
+	if (b->scroll_y != NULL) {
+		data = scrollbar_get_data(b->scroll_y);
+		scrollbar_destroy(b->scroll_y);
+		free(data);
+	}
+
+	return 0;
+}
+
+
+/* Exported function documented in html/box.h */
+struct box *
+box_create(css_select_results *styles,
+	   css_computed_style *style,
+	   bool style_owned,
+	   nsurl *href,
+	   const char *target,
+	   const char *title,
+	   lwc_string *id,
+	   void *context)
+{
+	unsigned int i;
+	struct box *box;
+
+	box = talloc(context, struct box);
+	if (!box) {
+		return 0;
+	}
+
+	talloc_set_destructor(box, box_talloc_destructor);
+
+	box->type = BOX_INLINE;
+	box->flags = 0;
+	box->flags = style_owned ? (box->flags | STYLE_OWNED) : box->flags;
+	box->styles = styles;
+	box->style = style;
+	box->x = box->y = 0;
+	box->width = UNKNOWN_WIDTH;
+	box->height = 0;
+	box->descendant_x0 = box->descendant_y0 = 0;
+	box->descendant_x1 = box->descendant_y1 = 0;
+	for (i = 0; i != 4; i++)
+		box->margin[i] = box->padding[i] = box->border[i].width = 0;
+	box->scroll_x = box->scroll_y = NULL;
+	box->min_width = 0;
+	box->max_width = UNKNOWN_MAX_WIDTH;
+	box->byte_offset = 0;
+	box->text = NULL;
+	box->length = 0;
+	box->space = 0;
+	box->href = (href == NULL) ? NULL : nsurl_ref(href);
+	box->target = target;
+	box->title = title;
+	box->columns = 1;
+	box->rows = 1;
+	box->start_column = 0;
+	box->next = NULL;
+	box->prev = NULL;
+	box->children = NULL;
+	box->last = NULL;
+	box->parent = NULL;
+	box->inline_end = NULL;
+	box->float_children = NULL;
+	box->float_container = NULL;
+	box->next_float = NULL;
+	box->cached_place_below_level = 0;
+	box->list_value = 1;
+	box->list_marker = NULL;
+	box->col = NULL;
+	box->gadget = NULL;
+	box->usemap = NULL;
+	box->id = id;
+	box->background = NULL;
+	box->object = NULL;
+	box->object_params = NULL;
+	box->iframe = NULL;
+	box->node = NULL;
+
+	return box;
+}
+
+
+/* Exported function documented in html/box.h */
+void box_add_child(struct box *parent, struct box *child)
+{
+	assert(parent);
+	assert(child);
+
+	if (parent->children != 0) {	/* has children already */
+		parent->last->next = child;
+		child->prev = parent->last;
+	} else {			/* this is the first child */
+		parent->children = child;
+		child->prev = 0;
+	}
+
+	parent->last = child;
+	child->parent = parent;
+}
+
+
+/* Exported function documented in html/box.h */
+void box_insert_sibling(struct box *box, struct box *new_box)
+{
+	new_box->parent = box->parent;
+	new_box->prev = box;
+	new_box->next = box->next;
+	box->next = new_box;
+	if (new_box->next)
+		new_box->next->prev = new_box;
+	else if (new_box->parent)
+		new_box->parent->last = new_box;
+}
+
+
+/* Exported function documented in html/box.h */
+void box_unlink_and_free(struct box *box)
+{
+	struct box *parent = box->parent;
+	struct box *next = box->next;
+	struct box *prev = box->prev;
+
+	if (parent) {
+		if (parent->children == box)
+			parent->children = next;
+		if (parent->last == box)
+			parent->last = next ? next : prev;
+	}
+
+	if (prev)
+		prev->next = next;
+	if (next)
+		next->prev = prev;
+
+	box_free(box);
+}
+
+
+/* Exported function documented in html/box.h */
+void box_free(struct box *box)
+{
+	struct box *child, *next;
+
+	/* free children first */
+	for (child = box->children; child; child = next) {
+		next = child->next;
+		box_free(child);
+	}
+
+	/* last this box */
+	box_free_box(box);
+}
+
+
+/* Exported function documented in html/box.h */
+void box_free_box(struct box *box)
+{
+	if (!(box->flags & CLONE)) {
+		if (box->gadget)
+			form_free_control(box->gadget);
+		if (box->scroll_x != NULL)
+			scrollbar_destroy(box->scroll_x);
+		if (box->scroll_y != NULL)
+			scrollbar_destroy(box->scroll_y);
+		if (box->styles != NULL)
+			css_select_results_destroy(box->styles);
+	}
+
+	talloc_free(box);
+}
+
+
+/* exported interface documented in html/box.h */
+nserror
+box_handle_scrollbars(struct content *c,
+		      struct box *box,
+		      bool bottom,
+		      bool right)
+{
+	struct html_scrollbar_data *data;
+	int visible_width, visible_height;
+	int full_width, full_height;
+	nserror res;
+
+	if (!bottom && box->scroll_x != NULL) {
+		data = scrollbar_get_data(box->scroll_x);
+		scrollbar_destroy(box->scroll_x);
+		free(data);
+		box->scroll_x = NULL;
+	}
+
+	if (!right && box->scroll_y != NULL) {
+		data = scrollbar_get_data(box->scroll_y);
+		scrollbar_destroy(box->scroll_y);
+		free(data);
+		box->scroll_y = NULL;
+	}
+
+	if (!bottom && !right) {
+		return NSERROR_OK;
+	}
+
+	visible_width = box->width + box->padding[RIGHT] + box->padding[LEFT];
+	visible_height = box->height + box->padding[TOP] + box->padding[BOTTOM];
+
+	full_width = ((box->descendant_x1 - box->border[RIGHT].width) >
+			visible_width) ?
+			box->descendant_x1 + box->padding[RIGHT] :
+			visible_width;
+	full_height = ((box->descendant_y1 - box->border[BOTTOM].width) >
+			visible_height) ?
+			box->descendant_y1 + box->padding[BOTTOM] :
+			visible_height;
+
+	if (right) {
+		if (box->scroll_y == NULL) {
+			data = malloc(sizeof(struct html_scrollbar_data));
+			if (data == NULL) {
+				return NSERROR_NOMEM;
+			}
+			data->c = c;
+			data->box = box;
+			res = scrollbar_create(false,
+					       visible_height,
+					       full_height,
+					       visible_height,
+					       data,
+					       html_overflow_scroll_callback,
+					       &(box->scroll_y));
+			if (res != NSERROR_OK) {
+				return res;
+			}
+		} else  {
+			scrollbar_set_extents(box->scroll_y,
+					      visible_height,
+					      visible_height,
+					      full_height);
+		}
+	}
+	if (bottom) {
+		if (box->scroll_x == NULL) {
+			data = malloc(sizeof(struct html_scrollbar_data));
+			if (data == NULL) {
+				return NSERROR_OK;
+			}
+			data->c = c;
+			data->box = box;
+			res = scrollbar_create(true,
+					       visible_width - (right ? SCROLLBAR_WIDTH : 0),
+					       full_width,
+					       visible_width,
+					       data,
+					       html_overflow_scroll_callback,
+					       &box->scroll_x);
+			if (res != NSERROR_OK) {
+				return res;
+			}
+		} else {
+			scrollbar_set_extents(box->scroll_x,
+					visible_width -
+					(right ? SCROLLBAR_WIDTH : 0),
+					visible_width, full_width);
+		}
+	}
+
+	if (right && bottom) {
+		scrollbar_make_pair(box->scroll_x, box->scroll_y);
+	}
+
+	return NSERROR_OK;
+}
+
+
diff --git a/content/handlers/html/box_manipulate.h b/content/handlers/html/box_manipulate.h
new file mode 100644
index 000000000..43a66a7d9
--- /dev/null
+++ b/content/handlers/html/box_manipulate.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2005 James Bursa <bursa@users.sourceforge.net>
+ * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * Box tree manipulation interface.
+ */
+
+#ifndef NETSURF_HTML_BOX_MANIPULATE_H
+#define NETSURF_HTML_BOX_MANIPULATE_H
+
+
+/**
+ * Create a box tree node.
+ *
+ * \param  styles       selection results for the box, or NULL
+ * \param  style        computed style for the box (not copied), or 0
+ * \param  style_owned  whether style is owned by this box
+ * \param  href         href for the box (copied), or 0
+ * \param  target       target for the box (not copied), or 0
+ * \param  title        title for the box (not copied), or 0
+ * \param  id           id for the box (not copied), or 0
+ * \param  context      context for allocations
+ * \return  allocated and initialised box, or 0 on memory exhaustion
+ *
+ * styles is always owned by the box, if it is set.
+ * style is only owned by the box in the case of implied boxes.
+ */
+struct box * box_create(css_select_results *styles, css_computed_style *style, bool style_owned, struct nsurl *href, const char *target, const char *title, lwc_string *id, void *context);
+
+
+/**
+ * Add a child to a box tree node.
+ *
+ * \param parent box giving birth
+ * \param child box to link as last child of parent
+ */
+void box_add_child(struct box *parent, struct box *child);
+
+
+/**
+ * Insert a new box as a sibling to a box in a tree.
+ *
+ * \param box box already in tree
+ * \param new_box box to link into tree as next sibling
+ */
+void box_insert_sibling(struct box *box, struct box *new_box);
+
+
+/**
+ * Unlink a box from the box tree and then free it recursively.
+ *
+ * \param box box to unlink and free recursively.
+ */
+void box_unlink_and_free(struct box *box);
+
+
+/**
+ * Free a box tree recursively.
+ *
+ * \param  box  box to free recursively
+ *
+ * The box and all its children is freed.
+ */
+void box_free(struct box *box);
+
+
+/**
+ * Free the data in a single box structure.
+ *
+ * \param box box to free
+ */
+void box_free_box(struct box *box);
+
+
+/**
+ * Applies the given scroll setup to a box. This includes scroll
+ * creation/deletion as well as scroll dimension updates.
+ *
+ * \param c		content in which the box is located
+ * \param box		the box to handle the scrolls for
+ * \param bottom	whether the horizontal scrollbar should be present
+ * \param right		whether the vertical scrollbar should be present
+ * \return		true on success false otherwise
+ */
+nserror box_handle_scrollbars(struct content *c, struct box *box,
+		bool bottom, bool right);
+
+
+#endif
diff --git a/content/handlers/html/box_normalise.c b/content/handlers/html/box_normalise.c
index 7155cb722..8f25b031f 100644
--- a/content/handlers/html/box_normalise.c
+++ b/content/handlers/html/box_normalise.c
@@ -21,7 +21,7 @@
 
 /**
  * \file
- * Box tree normalisation (implementation).
+ * Box tree normalisation implementation.
  */
 
 #include <assert.h>
@@ -32,9 +32,11 @@
 #include "utils/errors.h"
 #include "css/select.h"
 
-#include "html/box.h"
-#include "html/html_internal.h"
+#include "html/private.h"
 #include "html/table.h"
+#include "html/box.h"
+#include "html/box_manipulate.h"
+#include "html/box_normalise.h"
 
 /* Define to enable box normalise debug */
 #undef BOX_NORMALISE_DEBUG
@@ -66,282 +68,321 @@ struct columns {
 };
 
 
-static bool box_normalise_table(
-		struct box *table,
-		const struct box *root,
-		html_content *c);
-static bool box_normalise_table_spans(
-		struct box *table,
-		const struct box *root,
-		struct span_info *spans,
-		html_content *c);
-static bool box_normalise_table_row_group(
-		struct box *row_group,
-		const struct box *root,
-		struct columns *col_info,
-		html_content *c);
-static bool box_normalise_table_row(
-		struct box *row,
-		const struct box *root,
-		struct columns *col_info,
-		html_content *c);
-static bool calculate_table_row(struct columns *col_info,
-		unsigned int col_span, unsigned int row_span,
-		unsigned int *start_column, struct box *cell);
-static bool box_normalise_inline_container(
-		struct box *cont,
-		const struct box *root,
-		html_content *c);
-
 /**
- * Ensure the box tree is correctly nested by adding and removing nodes.
- *
- * \param block  box of type BLOCK, INLINE_BLOCK, or TABLE_CELL
- * \param root   root box of document
- * \param c      content of boxes
- * \return true on success, false on memory exhaustion
+ * Compute the column index at which the current cell begins.
+ * Additionally, update the column record to reflect row spanning.
  *
- * The tree is modified to satisfy the following:
- * \code
- * parent               permitted child nodes
- * BLOCK, INLINE_BLOCK  BLOCK, INLINE_CONTAINER, TABLE
- * INLINE_CONTAINER     INLINE, INLINE_BLOCK, FLOAT_LEFT, FLOAT_RIGHT, BR, TEXT
- * INLINE, TEXT         none
- * TABLE                at least 1 TABLE_ROW_GROUP
- * TABLE_ROW_GROUP      at least 1 TABLE_ROW
- * TABLE_ROW            at least 1 TABLE_CELL
- * TABLE_CELL           BLOCK, INLINE_CONTAINER, TABLE (same as BLOCK)
- * FLOAT_(LEFT|RIGHT)   exactly 1 BLOCK or TABLE
- * \endcode
+ * \param col_info      Column record
+ * \param col_span      Number of columns that current cell spans
+ * \param row_span      Number of rows that current cell spans
+ * \param start_column  Pointer to location to receive column index
+ * \param cell		Box for current table cell
+ * \return  true on success, false on memory exhaustion
  */
+static bool
+calculate_table_row(struct columns *col_info,
+		    unsigned int col_span,
+		    unsigned int row_span,
+		    unsigned int *start_column,
+		    struct box *cell)
+{
+	unsigned int cell_start_col = col_info->current_column;
+	unsigned int cell_end_col;
+	unsigned int i;
+	struct span_info *spans;
+	struct box *rg = cell->parent->parent; /* Cell's row group */
 
-bool box_normalise_block(
-		struct box *block,
-		const struct box *root,
-		html_content *c)
+	/* Skip columns with cells spanning from above */
+	/* TODO: Need to ignore cells spanning from above that belong to
+	 *       different row group.  We don't have that info here. */
+	while (col_info->spans[cell_start_col].row_span != 0 &&
+			col_info->spans[cell_start_col].rg == rg) {
+		cell_start_col++;
+	}
+
+	/* Update current column with calculated start */
+	col_info->current_column = cell_start_col;
+
+	/* If this cell has a colspan of 0, then assume 1.
+	 * No other browser supports colspan=0, anyway. */
+	if (col_span == 0)
+		col_span = 1;
+
+	cell_end_col = cell_start_col + col_span;
+
+	if (col_info->num_columns < cell_end_col) {
+		/* It appears that this row has more columns than
+		 * the maximum recorded for the table so far.
+		 * Allocate more span records. */
+		spans = realloc(col_info->spans,
+				sizeof *spans * (cell_end_col + 1));
+		if (spans == NULL)
+			return false;
+
+		col_info->spans = spans;
+		col_info->num_columns = cell_end_col;
+
+		/* Mark new final column as sentinel */
+		col_info->spans[cell_end_col].row_span = 0;
+		col_info->spans[cell_end_col].auto_row = false;
+	}
+
+	/* This cell may span multiple columns. If it also wants to span
+	 * multiple rows, temporarily assume it spans 1 row only. This will
+	 * be fixed up in box_normalise_table_spans() */
+	for (i = cell_start_col; i < cell_end_col; i++) {
+		col_info->spans[i].row_span = (row_span == 0) ? 1 : row_span;
+		col_info->spans[i].auto_row = (row_span == 0);
+		col_info->spans[i].rg = rg;
+	}
+
+	/* Update current column with calculated end. */
+	col_info->current_column = cell_end_col;
+
+	*start_column = cell_start_col;
+
+	return true;
+}
+
+
+static bool
+box_normalise_table_row(struct box *row,
+			const struct box *root,
+			struct columns *col_info,
+			html_content * c)
 {
 	struct box *child;
 	struct box *next_child;
-	struct box *table;
+	struct box *cell = NULL;
 	css_computed_style *style;
+	unsigned int i;
 	nscss_select_ctx ctx;
 
-	assert(block != NULL);
-	assert(root != NULL);
+	assert(row != NULL);
+	assert(row->type == BOX_TABLE_ROW);
 
 	ctx.root_style = root->style;
 
 #ifdef BOX_NORMALISE_DEBUG
-	NSLOG(netsurf, INFO, "block %p, block->type %u", block, block->type);
-#endif
-
-	assert(block->type == BOX_BLOCK || block->type == BOX_INLINE_BLOCK ||
-			block->type == BOX_TABLE_CELL);
-
-	for (child = block->children; child != NULL; child = next_child) {
-#ifdef BOX_NORMALISE_DEBUG
-		NSLOG(netsurf, INFO, "child %p, child->type = %d", child,
-		      child->type);
+	NSLOG(netsurf, INFO, "row %p", row);
 #endif
 
-		next_child = child->next;	/* child may be destroyed */
+	for (child = row->children; child != NULL; child = next_child) {
+		next_child = child->next;
 
 		switch (child->type) {
-		case BOX_BLOCK:
+		case BOX_TABLE_CELL:
 			/* ok */
 			if (box_normalise_block(child, root, c) == false)
 				return false;
+			cell = child;
 			break;
+		case BOX_FLEX:
+		case BOX_BLOCK:
 		case BOX_INLINE_CONTAINER:
-			if (box_normalise_inline_container(child, root, c) == false)
-				return false;
-			break;
 		case BOX_TABLE:
-			if (box_normalise_table(child, root, c) == false)
-				return false;
-			break;
-		case BOX_INLINE:
-		case BOX_INLINE_END:
-		case BOX_INLINE_BLOCK:
-		case BOX_FLOAT_LEFT:
-		case BOX_FLOAT_RIGHT:
-		case BOX_BR:
-		case BOX_TEXT:
-			/* should have been wrapped in inline
-			   container by convert_xml_to_box() */
-			assert(0);
-			break;
 		case BOX_TABLE_ROW_GROUP:
 		case BOX_TABLE_ROW:
-		case BOX_TABLE_CELL:
-			/* insert implied table */
-			assert(block->style != NULL);
+			/* insert implied table cell */
+			assert(row->style != NULL);
 
 			ctx.ctx = c->select_ctx;
 			ctx.quirks = (c->quirks == DOM_DOCUMENT_QUIRKS_MODE_FULL);
 			ctx.base_url = c->base_url;
 			ctx.universal = c->universal;
 
-			style = nscss_get_blank_style(&ctx, block->style);
+			style = nscss_get_blank_style(&ctx, &c->unit_len_ctx,
+					row->style);
 			if (style == NULL)
 				return false;
 
-			table = box_create(NULL, style, true, block->href,
-					block->target, NULL, NULL, c->bctx);
-			if (table == NULL) {
+			cell = box_create(NULL, style, true, row->href,
+					row->target, NULL, NULL, c->bctx);
+			if (cell == NULL) {
 				css_computed_style_destroy(style);
 				return false;
 			}
-			table->type = BOX_TABLE;
+			cell->type = BOX_TABLE_CELL;
 
 			if (child->prev == NULL)
-				block->children = table;
+				row->children = cell;
 			else
-				child->prev->next = table;
+				child->prev->next = cell;
 
-			table->prev = child->prev;
+			cell->prev = child->prev;
 
 			while (child != NULL && (
+					child->type == BOX_FLEX ||
+					child->type == BOX_BLOCK ||
+					child->type == BOX_INLINE_CONTAINER ||
+					child->type == BOX_TABLE ||
 					child->type == BOX_TABLE_ROW_GROUP ||
-					child->type == BOX_TABLE_ROW ||
-					child->type == BOX_TABLE_CELL)) {
-				box_add_child(table, child);
+					child->type == BOX_TABLE_ROW)) {
+				box_add_child(cell, child);
 
 				next_child = child->next;
 				child->next = NULL;
 				child = next_child;
 			}
 
-			table->last->next = NULL;
-			table->next = next_child = child;
-			if (table->next != NULL)
-				table->next->prev = table;
+			assert(cell->last != NULL);
+
+			cell->last->next = NULL;
+			cell->next = next_child = child;
+			if (cell->next != NULL)
+				cell->next->prev = cell;
 			else
-				block->last = table;
-			table->parent = block;
+				row->last = cell;
+			cell->parent = row;
 
-			if (box_normalise_table(table, root, c) == false)
+			if (box_normalise_block(cell, root, c) == false)
 				return false;
 			break;
+		case BOX_INLINE:
+		case BOX_INLINE_END:
+		case BOX_INLINE_FLEX:
+		case BOX_INLINE_BLOCK:
+		case BOX_FLOAT_LEFT:
+		case BOX_FLOAT_RIGHT:
+		case BOX_BR:
+		case BOX_TEXT:
+			/* should have been wrapped in inline
+			   container by convert_xml_to_box() */
+			assert(0);
+			break;
 		default:
 			assert(0);
 		}
+
+		if (calculate_table_row(col_info, cell->columns, cell->rows,
+				&cell->start_column, cell) == false)
+			return false;
+	}
+
+
+	/* Update row spanning details for all columns */
+	for (i = 0; i < col_info->num_columns; i++) {
+		if (col_info->spans[i].row_span != 0 &&
+				col_info->spans[i].auto_row == false) {
+			/* This cell spans rows, and is not an auto row.
+			 * Reduce number of rows left to span */
+			col_info->spans[i].row_span--;
+		}
 	}
 
+	/* Reset current column for next row */
+	col_info->current_column = 0;
+
+	/* Increment row counter */
+	col_info->num_rows++;
+
+#ifdef BOX_NORMALISE_DEBUG
+	NSLOG(netsurf, INFO, "row %p done", row);
+#endif
+
 	return true;
 }
 
 
-bool box_normalise_table(
-		struct box *table,
-		const struct box *root,
-		html_content * c)
+static bool
+box_normalise_table_row_group(struct box *row_group,
+			      const struct box *root,
+			      struct columns *col_info,
+			      html_content * c)
 {
 	struct box *child;
 	struct box *next_child;
-	struct box *row_group;
+	struct box *row;
 	css_computed_style *style;
-	struct columns col_info;
 	nscss_select_ctx ctx;
+	unsigned int group_row_count = 0;
 
-	assert(table != NULL);
-	assert(table->type == BOX_TABLE);
+	assert(row_group != 0);
+	assert(row_group->type == BOX_TABLE_ROW_GROUP);
 
 	ctx.root_style = root->style;
 
 #ifdef BOX_NORMALISE_DEBUG
-	NSLOG(netsurf, INFO, "table %p", table);
+	NSLOG(netsurf, INFO, "row_group %p", row_group);
 #endif
 
-	col_info.num_columns = 1;
-	col_info.current_column = 0;
-	col_info.spans = malloc(2 * sizeof *col_info.spans);
-	if (col_info.spans == NULL)
-		return false;
-
-	col_info.spans[0].row_span = col_info.spans[1].row_span = 0;
-	col_info.spans[0].auto_row = false;
-	col_info.spans[1].auto_row = false;
-	col_info.num_rows = 0;
-
-	for (child = table->children; child != NULL; child = next_child) {
+	for (child = row_group->children; child != NULL; child = next_child) {
 		next_child = child->next;
+
 		switch (child->type) {
-		case BOX_TABLE_ROW_GROUP:
+		case BOX_TABLE_ROW:
 			/* ok */
-			if (box_normalise_table_row_group(child, root,
-					&col_info, c) == false) {
-				free(col_info.spans);
+			group_row_count++;
+			if (box_normalise_table_row(child, root, col_info,
+					c) == false)
 				return false;
-			}
 			break;
+		case BOX_FLEX:
 		case BOX_BLOCK:
 		case BOX_INLINE_CONTAINER:
 		case BOX_TABLE:
-		case BOX_TABLE_ROW:
+		case BOX_TABLE_ROW_GROUP:
 		case BOX_TABLE_CELL:
-			/* insert implied table row group */
-			assert(table->style != NULL);
+			/* insert implied table row */
+			assert(row_group->style != NULL);
 
 			ctx.ctx = c->select_ctx;
 			ctx.quirks = (c->quirks == DOM_DOCUMENT_QUIRKS_MODE_FULL);
 			ctx.base_url = c->base_url;
 			ctx.universal = c->universal;
 
-			style = nscss_get_blank_style(&ctx, table->style);
-			if (style == NULL) {
-				free(col_info.spans);
+			style = nscss_get_blank_style(&ctx, &c->unit_len_ctx,
+					row_group->style);
+			if (style == NULL)
 				return false;
-			}
 
-			row_group = box_create(NULL, style, true, table->href,
-					table->target, NULL, NULL, c->bctx);
-			if (row_group == NULL) {
+			row = box_create(NULL, style, true, row_group->href,
+					row_group->target, NULL, NULL, c->bctx);
+			if (row == NULL) {
 				css_computed_style_destroy(style);
-				free(col_info.spans);
 				return false;
 			}
-
-			row_group->type = BOX_TABLE_ROW_GROUP;
+			row->type = BOX_TABLE_ROW;
 
 			if (child->prev == NULL)
-				table->children = row_group;
+				row_group->children = row;
 			else
-				child->prev->next = row_group;
+				child->prev->next = row;
 
-			row_group->prev = child->prev;
+			row->prev = child->prev;
 
 			while (child != NULL && (
+					child->type == BOX_FLEX ||
 					child->type == BOX_BLOCK ||
 					child->type == BOX_INLINE_CONTAINER ||
 					child->type == BOX_TABLE ||
-					child->type == BOX_TABLE_ROW ||
+					child->type == BOX_TABLE_ROW_GROUP ||
 					child->type == BOX_TABLE_CELL)) {
-				box_add_child(row_group, child);
+				box_add_child(row, child);
 
 				next_child = child->next;
 				child->next = NULL;
 				child = next_child;
 			}
 
-			assert(row_group->last != NULL);
+			assert(row->last != NULL);
 
-			row_group->last->next = NULL;
-			row_group->next = next_child = child;
-			if (row_group->next != NULL)
-				row_group->next->prev = row_group;
+			row->last->next = NULL;
+			row->next = next_child = child;
+			if (row->next != NULL)
+				row->next->prev = row;
 			else
-				table->last = row_group;
-			row_group->parent = table;
+				row_group->last = row;
+			row->parent = row_group;
 
-			if (box_normalise_table_row_group(row_group, root,
-					&col_info, c) == false) {
-				free(col_info.spans);
+			group_row_count++;
+			if (box_normalise_table_row(row, root, col_info,
+					c) == false)
 				return false;
-			}
 			break;
 		case BOX_INLINE:
 		case BOX_INLINE_END:
+		case BOX_INLINE_FLEX:
 		case BOX_INLINE_BLOCK:
 		case BOX_FLOAT_LEFT:
 		case BOX_FLOAT_RIGHT:
@@ -352,48 +393,26 @@ bool box_normalise_table(
 			assert(0);
 			break;
 		default:
-			fprintf(stderr, "%i\n", child->type);
 			assert(0);
 		}
 	}
 
-	table->columns = col_info.num_columns;
-	table->rows = col_info.num_rows;
-
-	if (table->children == NULL) {
-		struct box *row;
-
+	if (row_group->children == NULL) {
 #ifdef BOX_NORMALISE_DEBUG
 		NSLOG(netsurf, INFO,
-		      "table->children == 0, creating implied row");
+		      "row_group->children == 0, inserting implied row");
 #endif
 
-		assert(table->style != NULL);
+		assert(row_group->style != NULL);
 
 		ctx.ctx = c->select_ctx;
 		ctx.quirks = (c->quirks == DOM_DOCUMENT_QUIRKS_MODE_FULL);
 		ctx.base_url = c->base_url;
 		ctx.universal = c->universal;
 
-		style = nscss_get_blank_style(&ctx, table->style);
-		if (style == NULL) {
-			free(col_info.spans);
-			return false;
-		}
-
-		row_group = box_create(NULL, style, true, table->href,
-				table->target, NULL, NULL, c->bctx);
-		if (row_group == NULL) {
-			css_computed_style_destroy(style);
-			free(col_info.spans);
-			return false;
-		}
-		row_group->type = BOX_TABLE_ROW_GROUP;
-
-		style = nscss_get_blank_style(&ctx, row_group->style);
+		style = nscss_get_blank_style(&ctx, &c->unit_len_ctx,
+				row_group->style);
 		if (style == NULL) {
-			box_free(row_group);
-			free(col_info.spans);
 			return false;
 		}
 
@@ -401,8 +420,6 @@ bool box_normalise_table(
 				row_group->target, NULL, NULL, c->bctx);
 		if (row == NULL) {
 			css_computed_style_destroy(style);
-			box_free(row_group);
-			free(col_info.spans);
 			return false;
 		}
 		row->type = BOX_TABLE_ROW;
@@ -410,21 +427,16 @@ bool box_normalise_table(
 		row->parent = row_group;
 		row_group->children = row_group->last = row;
 
-		row_group->parent = table;
-		table->children = table->last = row_group;
-
-		table->rows = 1;
-	}
+		group_row_count = 1;
 
-	if (box_normalise_table_spans(table, root, col_info.spans, c) == false) {
-		free(col_info.spans);
-		return false;
+		/* Keep table's row count in sync */
+		col_info->num_rows++;
 	}
 
-	free(col_info.spans);
+	row_group->rows = group_row_count;
 
 #ifdef BOX_NORMALISE_DEBUG
-	NSLOG(netsurf, INFO, "table %p done", table);
+	NSLOG(netsurf, INFO, "row_group %p done", row_group);
 #endif
 
 	return true;
@@ -441,12 +453,11 @@ bool box_normalise_table(
  * \param c      Content containing table
  * \return True on success, false on memory exhaustion.
  */
-
-bool box_normalise_table_spans(
-		struct box *table,
-		const struct box *root,
-		struct span_info *spans,
-		html_content *c)
+static bool
+box_normalise_table_spans(struct box *table,
+			  const struct box *root,
+			  struct span_info *spans,
+			  html_content *c)
 {
 	struct box *table_row_group;
 	struct box *table_row;
@@ -531,6 +542,7 @@ bool box_normalise_table_spans(
 					ctx.universal = c->universal;
 
 					style = nscss_get_blank_style(&ctx,
+							&c->unit_len_ctx,
 							table_row->style);
 					if (style == NULL)
 						return false;
@@ -601,101 +613,118 @@ bool box_normalise_table_spans(
 }
 
 
-bool box_normalise_table_row_group(
-		struct box *row_group,
-		const struct box *root,
-		struct columns *col_info,
-		html_content * c)
+static bool
+box_normalise_table(struct box *table, const struct box *root, html_content * c)
 {
 	struct box *child;
 	struct box *next_child;
-	struct box *row;
+	struct box *row_group;
 	css_computed_style *style;
+	struct columns col_info;
 	nscss_select_ctx ctx;
-	unsigned int group_row_count = 0;
 
-	assert(row_group != 0);
-	assert(row_group->type == BOX_TABLE_ROW_GROUP);
+	assert(table != NULL);
+	assert(table->type == BOX_TABLE);
 
 	ctx.root_style = root->style;
 
 #ifdef BOX_NORMALISE_DEBUG
-	NSLOG(netsurf, INFO, "row_group %p", row_group);
+	NSLOG(netsurf, INFO, "table %p", table);
 #endif
 
-	for (child = row_group->children; child != NULL; child = next_child) {
-		next_child = child->next;
+	col_info.num_columns = 1;
+	col_info.current_column = 0;
+	col_info.spans = malloc(2 * sizeof *col_info.spans);
+	if (col_info.spans == NULL)
+		return false;
 
+	col_info.spans[0].row_span = col_info.spans[1].row_span = 0;
+	col_info.spans[0].auto_row = false;
+	col_info.spans[1].auto_row = false;
+	col_info.num_rows = 0;
+
+	for (child = table->children; child != NULL; child = next_child) {
+		next_child = child->next;
 		switch (child->type) {
-		case BOX_TABLE_ROW:
+		case BOX_TABLE_ROW_GROUP:
 			/* ok */
-			group_row_count++;
-			if (box_normalise_table_row(child, root, col_info,
-					c) == false)
+			if (box_normalise_table_row_group(child, root,
+					&col_info, c) == false) {
+				free(col_info.spans);
 				return false;
+			}
 			break;
+		case BOX_FLEX:
 		case BOX_BLOCK:
 		case BOX_INLINE_CONTAINER:
 		case BOX_TABLE:
-		case BOX_TABLE_ROW_GROUP:
+		case BOX_TABLE_ROW:
 		case BOX_TABLE_CELL:
-			/* insert implied table row */
-			assert(row_group->style != NULL);
+			/* insert implied table row group */
+			assert(table->style != NULL);
 
 			ctx.ctx = c->select_ctx;
 			ctx.quirks = (c->quirks == DOM_DOCUMENT_QUIRKS_MODE_FULL);
 			ctx.base_url = c->base_url;
 			ctx.universal = c->universal;
 
-			style = nscss_get_blank_style(&ctx, row_group->style);
-			if (style == NULL)
+			style = nscss_get_blank_style(&ctx, &c->unit_len_ctx,
+					table->style);
+			if (style == NULL) {
+				free(col_info.spans);
 				return false;
+			}
 
-			row = box_create(NULL, style, true, row_group->href,
-					row_group->target, NULL, NULL, c->bctx);
-			if (row == NULL) {
+			row_group = box_create(NULL, style, true, table->href,
+					table->target, NULL, NULL, c->bctx);
+			if (row_group == NULL) {
 				css_computed_style_destroy(style);
+				free(col_info.spans);
 				return false;
 			}
-			row->type = BOX_TABLE_ROW;
+
+			row_group->type = BOX_TABLE_ROW_GROUP;
 
 			if (child->prev == NULL)
-				row_group->children = row;
+				table->children = row_group;
 			else
-				child->prev->next = row;
+				child->prev->next = row_group;
 
-			row->prev = child->prev;
+			row_group->prev = child->prev;
 
 			while (child != NULL && (
+					child->type == BOX_FLEX ||
 					child->type == BOX_BLOCK ||
 					child->type == BOX_INLINE_CONTAINER ||
 					child->type == BOX_TABLE ||
-					child->type == BOX_TABLE_ROW_GROUP ||
+					child->type == BOX_TABLE_ROW ||
 					child->type == BOX_TABLE_CELL)) {
-				box_add_child(row, child);
+				box_add_child(row_group, child);
 
 				next_child = child->next;
 				child->next = NULL;
 				child = next_child;
 			}
 
-			assert(row->last != NULL);
+			assert(row_group->last != NULL);
 
-			row->last->next = NULL;
-			row->next = next_child = child;
-			if (row->next != NULL)
-				row->next->prev = row;
+			row_group->last->next = NULL;
+			row_group->next = next_child = child;
+			if (row_group->next != NULL)
+				row_group->next->prev = row_group;
 			else
-				row_group->last = row;
-			row->parent = row_group;
+				table->last = row_group;
+			row_group->parent = table;
 
-			group_row_count++;
-			if (box_normalise_table_row(row, root, col_info,
-					c) == false)
+			if (box_normalise_table_row_group(row_group, root,
+					&col_info, c) == false) {
+				free(col_info.spans);
 				return false;
+			}
 			break;
 		case BOX_INLINE:
 		case BOX_INLINE_END:
+		case BOX_INLINE_FLEX:
 		case BOX_INLINE_BLOCK:
 		case BOX_FLOAT_LEFT:
 		case BOX_FLOAT_RIGHT:
@@ -706,25 +735,50 @@ bool box_normalise_table_row_group(
 			assert(0);
 			break;
 		default:
+			fprintf(stderr, "%i\n", child->type);
 			assert(0);
 		}
 	}
 
-	if (row_group->children == NULL) {
+	table->columns = col_info.num_columns;
+	table->rows = col_info.num_rows;
+
+	if (table->children == NULL) {
+		struct box *row;
+
 #ifdef BOX_NORMALISE_DEBUG
 		NSLOG(netsurf, INFO,
-		      "row_group->children == 0, inserting implied row");
+		      "table->children == 0, creating implied row");
 #endif
 
-		assert(row_group->style != NULL);
+		assert(table->style != NULL);
 
 		ctx.ctx = c->select_ctx;
 		ctx.quirks = (c->quirks == DOM_DOCUMENT_QUIRKS_MODE_FULL);
 		ctx.base_url = c->base_url;
 		ctx.universal = c->universal;
 
-		style = nscss_get_blank_style(&ctx, row_group->style);
+		style = nscss_get_blank_style(&ctx, &c->unit_len_ctx,
+				table->style);
+		if (style == NULL) {
+			free(col_info.spans);
+			return false;
+		}
+
+		row_group = box_create(NULL, style, true, table->href,
+				table->target, NULL, NULL, c->bctx);
+		if (row_group == NULL) {
+			css_computed_style_destroy(style);
+			free(col_info.spans);
+			return false;
+		}
+		row_group->type = BOX_TABLE_ROW_GROUP;
+
+		style = nscss_get_blank_style(&ctx, &c->unit_len_ctx,
+				row_group->style);
 		if (style == NULL) {
+			box_free(row_group);
+			free(col_info.spans);
 			return false;
 		}
 
@@ -732,6 +786,8 @@ bool box_normalise_table_row_group(
 				row_group->target, NULL, NULL, c->bctx);
 		if (row == NULL) {
 			css_computed_style_destroy(style);
+			box_free(row_group);
+			free(col_info.spans);
 			return false;
 		}
 		row->type = BOX_TABLE_ROW;
@@ -739,114 +795,129 @@ bool box_normalise_table_row_group(
 		row->parent = row_group;
 		row_group->children = row_group->last = row;
 
-		group_row_count = 1;
+		row_group->parent = table;
+		table->children = table->last = row_group;
 
-		/* Keep table's row count in sync */
-		col_info->num_rows++;
+		table->rows = 1;
 	}
 
-	row_group->rows = group_row_count;
+	if (box_normalise_table_spans(table, root, col_info.spans, c) == false) {
+		free(col_info.spans);
+		return false;
+	}
+
+	free(col_info.spans);
 
 #ifdef BOX_NORMALISE_DEBUG
-	NSLOG(netsurf, INFO, "row_group %p done", row_group);
+	NSLOG(netsurf, INFO, "table %p done", table);
 #endif
 
 	return true;
 }
 
-
-bool box_normalise_table_row(
-		struct box *row,
+static bool box_normalise_flex(
+		struct box *flex_container,
 		const struct box *root,
-		struct columns *col_info,
-		html_content * c)
+		html_content *c)
 {
 	struct box *child;
 	struct box *next_child;
-	struct box *cell = NULL;
+	struct box *implied_flex_item;
 	css_computed_style *style;
-	unsigned int i;
 	nscss_select_ctx ctx;
 
-	assert(row != NULL);
-	assert(row->type == BOX_TABLE_ROW);
+	assert(flex_container != NULL);
+	assert(root != NULL);
 
 	ctx.root_style = root->style;
 
 #ifdef BOX_NORMALISE_DEBUG
-	NSLOG(netsurf, INFO, "row %p", row);
+	NSLOG(netsurf, INFO, "flex_container %p, flex_container->type %u",
+			flex_container, flex_container->type);
 #endif
 
-	for (child = row->children; child != NULL; child = next_child) {
-		next_child = child->next;
+	assert(flex_container->type == BOX_FLEX ||
+	       flex_container->type == BOX_INLINE_FLEX);
+
+	for (child = flex_container->children; child != NULL; child = next_child) {
+#ifdef BOX_NORMALISE_DEBUG
+		NSLOG(netsurf, INFO, "child %p, child->type = %d",
+				child, child->type);
+#endif
+
+		next_child = child->next;	/* child may be destroyed */
 
 		switch (child->type) {
-		case BOX_TABLE_CELL:
+		case BOX_FLEX:
 			/* ok */
-			if (box_normalise_block(child, root, c) == false)
+			if (box_normalise_flex(child, root, c) == false)
 				return false;
-			cell = child;
 			break;
 		case BOX_BLOCK:
+			/* ok */
+			if (box_normalise_block(child, root, c) == false)
+				return false;
+			break;
 		case BOX_INLINE_CONTAINER:
-		case BOX_TABLE:
-		case BOX_TABLE_ROW_GROUP:
-		case BOX_TABLE_ROW:
-			/* insert implied table cell */
-			assert(row->style != NULL);
+			/* insert implied flex item */
+			assert(flex_container->style != NULL);
 
 			ctx.ctx = c->select_ctx;
 			ctx.quirks = (c->quirks == DOM_DOCUMENT_QUIRKS_MODE_FULL);
 			ctx.base_url = c->base_url;
 			ctx.universal = c->universal;
 
-			style = nscss_get_blank_style(&ctx, row->style);
+			style = nscss_get_blank_style(&ctx, &c->unit_len_ctx,
+					flex_container->style);
 			if (style == NULL)
 				return false;
 
-			cell = box_create(NULL, style, true, row->href,
-					row->target, NULL, NULL, c->bctx);
-			if (cell == NULL) {
+			implied_flex_item = box_create(NULL, style, true,
+					flex_container->href,
+					flex_container->target,
+					NULL, NULL, c->bctx);
+			if (implied_flex_item == NULL) {
 				css_computed_style_destroy(style);
 				return false;
 			}
-			cell->type = BOX_TABLE_CELL;
+			implied_flex_item->type = BOX_BLOCK;
 
 			if (child->prev == NULL)
-				row->children = cell;
+				flex_container->children = implied_flex_item;
 			else
-				child->prev->next = cell;
+				child->prev->next = implied_flex_item;
 
-			cell->prev = child->prev;
+			implied_flex_item->prev = child->prev;
 
-			while (child != NULL && (
-					child->type == BOX_BLOCK ||
-					child->type == BOX_INLINE_CONTAINER ||
-					child->type == BOX_TABLE ||
-					child->type == BOX_TABLE_ROW_GROUP ||
-					child->type == BOX_TABLE_ROW)) {
-				box_add_child(cell, child);
+			while (child != NULL &&
+					child->type == BOX_INLINE_CONTAINER) {
+				box_add_child(implied_flex_item, child);
 
 				next_child = child->next;
 				child->next = NULL;
 				child = next_child;
 			}
 
-			assert(cell->last != NULL);
-
-			cell->last->next = NULL;
-			cell->next = next_child = child;
-			if (cell->next != NULL)
-				cell->next->prev = cell;
+			implied_flex_item->last->next = NULL;
+			implied_flex_item->next = next_child = child;
+			if (implied_flex_item->next != NULL)
+				implied_flex_item->next->prev = implied_flex_item;
 			else
-				row->last = cell;
-			cell->parent = row;
+				flex_container->last = implied_flex_item;
+			implied_flex_item->parent = flex_container;
 
-			if (box_normalise_block(cell, root, c) == false)
+			if (box_normalise_block(implied_flex_item,
+					root, c) == false)
+				return false;
+			break;
+
+		case BOX_TABLE:
+			if (box_normalise_table(child, root, c) == false)
 				return false;
 			break;
 		case BOX_INLINE:
 		case BOX_INLINE_END:
+		case BOX_INLINE_FLEX:
 		case BOX_INLINE_BLOCK:
 		case BOX_FLOAT_LEFT:
 		case BOX_FLOAT_RIGHT:
@@ -856,119 +927,74 @@ bool box_normalise_table_row(
 			   container by convert_xml_to_box() */
 			assert(0);
 			break;
-		default:
-			assert(0);
-		}
-
-		if (calculate_table_row(col_info, cell->columns, cell->rows,
-				&cell->start_column, cell) == false)
-			return false;
-	}
-
-
-	/* Update row spanning details for all columns */
-	for (i = 0; i < col_info->num_columns; i++) {
-		if (col_info->spans[i].row_span != 0 &&
-				col_info->spans[i].auto_row == false) {
-			/* This cell spans rows, and is not an auto row.
-			 * Reduce number of rows left to span */
-			col_info->spans[i].row_span--;
-		}
-	}
-
-	/* Reset current column for next row */
-	col_info->current_column = 0;
-
-	/* Increment row counter */
-	col_info->num_rows++;
-
-#ifdef BOX_NORMALISE_DEBUG
-	NSLOG(netsurf, INFO, "row %p done", row);
-#endif
-
-	return true;
-}
-
-
-/**
- * Compute the column index at which the current cell begins.
- * Additionally, update the column record to reflect row spanning.
- *
- * \param col_info      Column record
- * \param col_span      Number of columns that current cell spans
- * \param row_span      Number of rows that current cell spans
- * \param start_column  Pointer to location to receive column index
- * \param cell		Box for current table cell
- * \return  true on success, false on memory exhaustion
- */
+		case BOX_TABLE_ROW_GROUP:
+		case BOX_TABLE_ROW:
+		case BOX_TABLE_CELL:
+			/* insert implied table */
+			assert(flex_container->style != NULL);
 
-bool calculate_table_row(struct columns *col_info,
-		unsigned int col_span, unsigned int row_span,
-		unsigned int *start_column, struct box *cell)
-{
-	unsigned int cell_start_col = col_info->current_column;
-	unsigned int cell_end_col;
-	unsigned int i;
-	struct span_info *spans;
-	struct box *rg = cell->parent->parent; /* Cell's row group */
+			ctx.ctx = c->select_ctx;
+			ctx.quirks = (c->quirks == DOM_DOCUMENT_QUIRKS_MODE_FULL);
+			ctx.base_url = c->base_url;
+			ctx.universal = c->universal;
 
-	/* Skip columns with cells spanning from above */
-	/* TODO: Need to ignore cells spanning from above that belong to
-	 *       different row group.  We don't have that info here. */
-	while (col_info->spans[cell_start_col].row_span != 0 &&
-			col_info->spans[cell_start_col].rg == rg) {
-		cell_start_col++;
-	}
+			style = nscss_get_blank_style(&ctx, &c->unit_len_ctx,
+					flex_container->style);
+			if (style == NULL)
+				return false;
 
-	/* Update current column with calculated start */
-	col_info->current_column = cell_start_col;
+			implied_flex_item = box_create(NULL, style, true,
+					flex_container->href,
+					flex_container->target,
+					NULL, NULL, c->bctx);
+			if (implied_flex_item == NULL) {
+				css_computed_style_destroy(style);
+				return false;
+			}
+			implied_flex_item->type = BOX_TABLE;
 
-	/* If this cell has a colspan of 0, then assume 1.
-	 * No other browser supports colspan=0, anyway. */
-	if (col_span == 0)
-		col_span = 1;
+			if (child->prev == NULL)
+				flex_container->children = implied_flex_item;
+			else
+				child->prev->next = implied_flex_item;
 
-	cell_end_col = cell_start_col + col_span;
+			implied_flex_item->prev = child->prev;
 
-	if (col_info->num_columns < cell_end_col) {
-		/* It appears that this row has more columns than
-		 * the maximum recorded for the table so far.
-		 * Allocate more span records. */
-		spans = realloc(col_info->spans,
-				sizeof *spans * (cell_end_col + 1));
-		if (spans == NULL)
-			return false;
+			while (child != NULL && (
+					child->type == BOX_TABLE_ROW_GROUP ||
+					child->type == BOX_TABLE_ROW ||
+					child->type == BOX_TABLE_CELL)) {
+				box_add_child(implied_flex_item, child);
 
-		col_info->spans = spans;
-		col_info->num_columns = cell_end_col;
+				next_child = child->next;
+				child->next = NULL;
+				child = next_child;
+			}
 
-		/* Mark new final column as sentinel */
-		col_info->spans[cell_end_col].row_span = 0;
-		col_info->spans[cell_end_col].auto_row = false;
-	}
+			implied_flex_item->last->next = NULL;
+			implied_flex_item->next = next_child = child;
+			if (implied_flex_item->next != NULL)
+				implied_flex_item->next->prev = implied_flex_item;
+			else
+				flex_container->last = implied_flex_item;
+			implied_flex_item->parent = flex_container;
 
-	/* This cell may span multiple columns. If it also wants to span
-	 * multiple rows, temporarily assume it spans 1 row only. This will
-	 * be fixed up in box_normalise_table_spans() */
-	for (i = cell_start_col; i < cell_end_col; i++) {
-		col_info->spans[i].row_span = (row_span == 0) ? 1 : row_span;
-		col_info->spans[i].auto_row = (row_span == 0);
-		col_info->spans[i].rg = rg;
+			if (box_normalise_table(implied_flex_item,
+					root, c) == false)
+				return false;
+			break;
+		default:
+			assert(0);
+		}
 	}
 
-	/* Update current column with calculated end. */
-	col_info->current_column = cell_end_col;
-
-	*start_column = cell_start_col;
-
 	return true;
 }
 
-
-bool box_normalise_inline_container(
-		struct box *cont,
-		const struct box *root,
-		html_content * c)
+static bool
+box_normalise_inline_container(struct box *cont,
+			       const struct box *root,
+			       html_content * c)
 {
 	struct box *child;
 	struct box *next_child;
@@ -994,6 +1020,11 @@ bool box_normalise_inline_container(
 			if (box_normalise_block(child, root, c) == false)
 				return false;
 			break;
+		case BOX_INLINE_FLEX:
+			/* ok */
+			if (box_normalise_flex(child, root, c) == false)
+				return false;
+			break;
 		case BOX_FLOAT_LEFT:
 		case BOX_FLOAT_RIGHT:
 			/* ok */
@@ -1010,6 +1041,11 @@ bool box_normalise_inline_container(
 						c) == false)
 					return false;
 				break;
+			case BOX_FLEX:
+				if (box_normalise_flex(child->children, root,
+						c) == false)
+					return false;
+				break;
 			default:
 				assert(0);
 			}
@@ -1028,6 +1064,7 @@ bool box_normalise_inline_container(
 				box_free(child);
 			}
 			break;
+		case BOX_FLEX:
 		case BOX_BLOCK:
 		case BOX_INLINE_CONTAINER:
 		case BOX_TABLE:
@@ -1045,3 +1082,125 @@ bool box_normalise_inline_container(
 
 	return true;
 }
+
+/* Exported function documented in html/box_normalise.h */
+bool
+box_normalise_block(struct box *block, const struct box *root, html_content *c)
+{
+	struct box *child;
+	struct box *next_child;
+	struct box *table;
+	css_computed_style *style;
+	nscss_select_ctx ctx;
+
+	assert(block != NULL);
+	assert(root != NULL);
+
+	ctx.root_style = root->style;
+
+#ifdef BOX_NORMALISE_DEBUG
+	NSLOG(netsurf, INFO, "block %p, block->type %u", block, block->type);
+#endif
+
+	assert(block->type == BOX_BLOCK || block->type == BOX_INLINE_BLOCK ||
+			block->type == BOX_TABLE_CELL);
+
+	for (child = block->children; child != NULL; child = next_child) {
+#ifdef BOX_NORMALISE_DEBUG
+		NSLOG(netsurf, INFO, "child %p, child->type = %d", child,
+		      child->type);
+#endif
+
+		next_child = child->next;	/* child may be destroyed */
+
+		switch (child->type) {
+		case BOX_FLEX:
+			/* ok */
+			if (box_normalise_flex(child, root, c) == false)
+				return false;
+			break;
+		case BOX_BLOCK:
+			/* ok */
+			if (box_normalise_block(child, root, c) == false)
+				return false;
+			break;
+		case BOX_INLINE_CONTAINER:
+			if (box_normalise_inline_container(child, root, c) == false)
+				return false;
+			break;
+		case BOX_TABLE:
+			if (box_normalise_table(child, root, c) == false)
+				return false;
+			break;
+		case BOX_INLINE:
+		case BOX_INLINE_END:
+		case BOX_INLINE_FLEX:
+		case BOX_INLINE_BLOCK:
+		case BOX_FLOAT_LEFT:
+		case BOX_FLOAT_RIGHT:
+		case BOX_BR:
+		case BOX_TEXT:
+			/* should have been wrapped in inline
+			   container by convert_xml_to_box() */
+			assert(0);
+			break;
+		case BOX_TABLE_ROW_GROUP:
+		case BOX_TABLE_ROW:
+		case BOX_TABLE_CELL:
+			/* insert implied table */
+			assert(block->style != NULL);
+
+			ctx.ctx = c->select_ctx;
+			ctx.quirks = (c->quirks == DOM_DOCUMENT_QUIRKS_MODE_FULL);
+			ctx.base_url = c->base_url;
+			ctx.universal = c->universal;
+
+			style = nscss_get_blank_style(&ctx, &c->unit_len_ctx,
+					block->style);
+			if (style == NULL)
+				return false;
+
+			table = box_create(NULL, style, true, block->href,
+					block->target, NULL, NULL, c->bctx);
+			if (table == NULL) {
+				css_computed_style_destroy(style);
+				return false;
+			}
+			table->type = BOX_TABLE;
+
+			if (child->prev == NULL)
+				block->children = table;
+			else
+				child->prev->next = table;
+
+			table->prev = child->prev;
+
+			while (child != NULL && (
+					child->type == BOX_TABLE_ROW_GROUP ||
+					child->type == BOX_TABLE_ROW ||
+					child->type == BOX_TABLE_CELL)) {
+				box_add_child(table, child);
+
+				next_child = child->next;
+				child->next = NULL;
+				child = next_child;
+			}
+
+			table->last->next = NULL;
+			table->next = next_child = child;
+			if (table->next != NULL)
+				table->next->prev = table;
+			else
+				block->last = table;
+			table->parent = block;
+
+			if (box_normalise_table(table, root, c) == false)
+				return false;
+			break;
+		default:
+			assert(0);
+		}
+	}
+
+	return true;
+}
diff --git a/content/handlers/html/box_normalise.h b/content/handlers/html/box_normalise.h
new file mode 100644
index 000000000..377cd9019
--- /dev/null
+++ b/content/handlers/html/box_normalise.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * HTML Box tree normalise interface.
+ *
+ * A box tree is "normalized" if the following is satisfied:
+ * \code
+ * parent               permitted child nodes
+ * BLOCK, INLINE_BLOCK  BLOCK, INLINE_CONTAINER, TABLE
+ * INLINE_CONTAINER     INLINE, INLINE_BLOCK, FLOAT_LEFT, FLOAT_RIGHT, BR, TEXT,
+ *                      INLINE_END
+ * INLINE               none
+ * TABLE                at least 1 TABLE_ROW_GROUP
+ * TABLE_ROW_GROUP      at least 1 TABLE_ROW
+ * TABLE_ROW            at least 1 TABLE_CELL
+ * TABLE_CELL           BLOCK, INLINE_CONTAINER, TABLE (same as BLOCK)
+ * FLOAT_(LEFT|RIGHT)   exactly 1 BLOCK or TABLE
+ * \endcode
+ *
+ */
+
+#ifndef NETSURF_HTML_BOX_NORMALISE_H
+#define NETSURF_HTML_BOX_NORMALISE_H
+
+/**
+ * Ensure the box tree is correctly nested by adding and removing nodes.
+ *
+ * \param block  box of type BLOCK, INLINE_BLOCK, or TABLE_CELL
+ * \param root   root box of document
+ * \param c      content of boxes
+ * \return true on success, false on memory exhaustion
+ *
+ * The tree is modified to satisfy the following:
+ * \code
+ * parent               permitted child nodes
+ * BLOCK, INLINE_BLOCK  BLOCK, INLINE_CONTAINER, TABLE, FLEX
+ * FLEX, INLINE_FLEX    BLOCK, INLINE_CONTAINER, TABLE, FLEX
+ * INLINE_CONTAINER     INLINE, INLINE_BLOCK, FLOAT_LEFT, FLOAT_RIGHT, BR, TEXT, INLINE_FLEX
+ * INLINE, TEXT         none
+ * TABLE                at least 1 TABLE_ROW_GROUP
+ * TABLE_ROW_GROUP      at least 1 TABLE_ROW
+ * TABLE_ROW            at least 1 TABLE_CELL
+ * TABLE_CELL           BLOCK, INLINE_CONTAINER, TABLE, FLEX (same as BLOCK)
+ * FLOAT_(LEFT|RIGHT)   exactly 1 BLOCK, TABLE or FLEX
+ * \endcode
+ */
+bool box_normalise_block(struct box *block, const struct box *root, struct html_content *c);
+
+#endif
diff --git a/content/handlers/html/box_special.c b/content/handlers/html/box_special.c
new file mode 100644
index 000000000..db3c4126d
--- /dev/null
+++ b/content/handlers/html/box_special.c
@@ -0,0 +1,1935 @@
+/*
+ * Copyright 2005 James Bursa <bursa@users.sourceforge.net>
+ * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
+ * Copyright 2005 John M Bell <jmb202@ecs.soton.ac.uk>
+ * Copyright 2006 Richard Wilson <info@tinct.net>
+ * Copyright 2008 Michael Drake <tlsa@netsurf-browser.org>
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * Implementation of special element handling conversion.
+ */
+
+#include <string.h>
+#include <stdbool.h>
+#include <dom/dom.h>
+
+#include "utils/nsoption.h"
+#include "utils/corestrings.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/talloc.h"
+#include "utils/string.h"
+#include "utils/ascii.h"
+#include "utils/nsurl.h"
+#include "netsurf/plot_style.h"
+#include "css/hints.h"
+#include "desktop/frame_types.h"
+#include "content/content_factory.h"
+
+#include "html/html.h"
+#include "html/private.h"
+#include "html/object.h"
+#include "html/box.h"
+#include "html/box_manipulate.h"
+#include "html/box_construct.h"
+#include "html/box_special.h"
+#include "html/box_textarea.h"
+#include "html/form_internal.h"
+
+
+static const content_type image_types = CONTENT_IMAGE;
+
+
+/**
+ * determine if a box is the root node
+ *
+ * \param n node to check
+ * \return true if node is root else false.
+ */
+static inline bool box_is_root(dom_node *n)
+{
+	dom_node *parent;
+	dom_node_type type;
+	dom_exception err;
+
+	err = dom_node_get_parent_node(n, &parent);
+	if (err != DOM_NO_ERR)
+		return false;
+
+	if (parent != NULL) {
+		err = dom_node_get_node_type(parent, &type);
+
+		dom_node_unref(parent);
+
+		if (err != DOM_NO_ERR)
+			return false;
+
+		if (type != DOM_DOCUMENT_NODE)
+			return false;
+	}
+
+	return true;
+}
+
+
+/**
+ * Destructor for object_params, for &lt;object&gt; elements
+ *
+ * \param o  The object params being destroyed.
+ * \return 0 to allow talloc to continue destroying the tree.
+ */
+static int box_object_talloc_destructor(struct object_params *o)
+{
+	if (o->codebase != NULL)
+		nsurl_unref(o->codebase);
+	if (o->classid != NULL)
+		nsurl_unref(o->classid);
+	if (o->data != NULL)
+		nsurl_unref(o->data);
+
+	return 0;
+}
+
+
+/**
+ * Parse a multi-length-list, as defined by HTML 4.01.
+ *
+ * \param ds dom string to parse
+ * \param count updated to number of entries
+ * \return array of struct box_multi_length, or 0 on memory exhaustion
+ */
+static struct frame_dimension *
+box_parse_multi_lengths(const dom_string *ds, unsigned int *count)
+{
+	char *end;
+	unsigned int i, n;
+	struct frame_dimension *length;
+	const char *s;
+
+	s = dom_string_data(ds);
+
+	for (i = 0, n = 1; s[i]; i++)
+		if (s[i] == ',')
+			n++;
+
+	length = calloc(n, sizeof(struct frame_dimension));
+	if (!length)
+		return NULL;
+
+	for (i = 0; i != n; i++) {
+		while (ascii_is_space(*s)) {
+			s++;
+		}
+		length[i].value = strtof(s, &end);
+		if (length[i].value <= 0) {
+			length[i].value = 1;
+		}
+		s = end;
+		switch (*s) {
+			case '%':
+				length[i].unit = FRAME_DIMENSION_PERCENT;
+				break;
+			case '*':
+				length[i].unit = FRAME_DIMENSION_RELATIVE;
+				break;
+			default:
+				length[i].unit = FRAME_DIMENSION_PIXELS;
+				break;
+		}
+		while (*s && *s != ',') {
+			s++;
+		}
+		if (*s == ',') {
+			s++;
+		}
+	}
+
+	*count = n;
+	return length;
+}
+
+
+/**
+ * Destructor for content_html_frames, for frame elements
+ *
+ * \param f  The frame params being destroyed.
+ * \return 0 to allow talloc to continue destroying the tree.
+ */
+static int box_frames_talloc_destructor(struct content_html_frames *f)
+{
+	if (f->url != NULL) {
+		nsurl_unref(f->url);
+		f->url = NULL;
+	}
+
+	return 0;
+}
+
+
+/**
+ * create a frameset box tree
+ */
+static bool
+box_create_frameset(struct content_html_frames *f,
+		    dom_node *n,
+		    html_content *content)
+{
+	unsigned int row, col, index, i;
+	unsigned int rows = 1, cols = 1;
+	dom_string *s;
+	dom_exception err;
+	nsurl *url;
+	struct frame_dimension *row_height = 0, *col_width = 0;
+	dom_node *c, *next;
+	struct content_html_frames *frame;
+	bool default_border = true;
+	colour default_border_colour = 0x000000;
+
+	/* parse rows and columns */
+	err = dom_element_get_attribute(n, corestring_dom_rows, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		row_height = box_parse_multi_lengths(s, &rows);
+		dom_string_unref(s);
+		if (row_height == NULL)
+			return false;
+	} else {
+		row_height = calloc(1, sizeof(struct frame_dimension));
+		if (row_height == NULL)
+			return false;
+		row_height->value = 100;
+		row_height->unit = FRAME_DIMENSION_PERCENT;
+	}
+
+	err = dom_element_get_attribute(n, corestring_dom_cols, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		col_width = box_parse_multi_lengths(s, &cols);
+		dom_string_unref(s);
+		if (col_width == NULL) {
+			free(row_height);
+			return false;
+		}
+	} else {
+		col_width = calloc(1, sizeof(struct frame_dimension));
+		if (col_width == NULL) {
+			free(row_height);
+			return false;
+		}
+		col_width->value = 100;
+		col_width->unit = FRAME_DIMENSION_PERCENT;
+	}
+
+	/* common extension: border="0|1" to control all children */
+	err = dom_element_get_attribute(n, corestring_dom_border, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		if ((dom_string_data(s)[0] == '0') &&
+				(dom_string_data(s)[1] == '\0'))
+			default_border = false;
+		dom_string_unref(s);
+	}
+
+	/* common extension: frameborder="yes|no" to control all children */
+	err = dom_element_get_attribute(n, corestring_dom_frameborder, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		if (dom_string_caseless_lwc_isequal(s,
+				corestring_lwc_no) == 0)
+			default_border = false;
+		dom_string_unref(s);
+	}
+
+	/* common extension: bordercolor="#RRGGBB|<named colour>" to control
+	 *all children */
+	err = dom_element_get_attribute(n, corestring_dom_bordercolor, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		css_color color;
+
+		if (nscss_parse_colour(dom_string_data(s), &color))
+			default_border_colour = nscss_color_to_ns(color);
+
+		dom_string_unref(s);
+	}
+
+	/* update frameset and create default children */
+	f->cols = cols;
+	f->rows = rows;
+	f->scrolling = BW_SCROLLING_NO;
+	f->children = talloc_array(content->bctx, struct content_html_frames,
+								(rows * cols));
+
+	talloc_set_destructor(f->children, box_frames_talloc_destructor);
+
+	for (row = 0; row < rows; row++) {
+		for (col = 0; col < cols; col++) {
+			index = (row * cols) + col;
+			frame = &f->children[index];
+			frame->cols = 0;
+			frame->rows = 0;
+			frame->width = col_width[col];
+			frame->height = row_height[row];
+			frame->margin_width = 0;
+			frame->margin_height = 0;
+			frame->name = NULL;
+			frame->url = NULL;
+			frame->no_resize = false;
+			frame->scrolling = BW_SCROLLING_AUTO;
+			frame->border = default_border;
+			frame->border_colour = default_border_colour;
+			frame->children = NULL;
+		}
+	}
+	free(col_width);
+	free(row_height);
+
+	/* create the frameset windows */
+	err = dom_node_get_first_child(n, &c);
+	if (err != DOM_NO_ERR)
+		return false;
+
+	for (row = 0; c != NULL && row < rows; row++) {
+		for (col = 0; c != NULL && col < cols; col++) {
+			while (c != NULL) {
+				dom_node_type type;
+				dom_string *name;
+
+				err = dom_node_get_node_type(c, &type);
+				if (err != DOM_NO_ERR) {
+					dom_node_unref(c);
+					return false;
+				}
+
+				err = dom_node_get_node_name(c, &name);
+				if (err != DOM_NO_ERR) {
+					dom_node_unref(c);
+					return false;
+				}
+
+				if (type != DOM_ELEMENT_NODE ||
+					(!dom_string_caseless_lwc_isequal(
+							name,
+							corestring_lwc_frame) &&
+					!dom_string_caseless_lwc_isequal(
+							name,
+							corestring_lwc_frameset
+							))) {
+					err = dom_node_get_next_sibling(c,
+							&next);
+					if (err != DOM_NO_ERR) {
+						dom_string_unref(name);
+						dom_node_unref(c);
+						return false;
+					}
+
+					dom_string_unref(name);
+					dom_node_unref(c);
+					c = next;
+				} else {
+					/* Got a FRAME or FRAMESET element */
+					dom_string_unref(name);
+					break;
+				}
+			}
+
+			if (c == NULL)
+				break;
+
+			/* get current frame */
+			index = (row * cols) + col;
+			frame = &f->children[index];
+
+			/* nest framesets */
+			err = dom_node_get_node_name(c, &s);
+			if (err != DOM_NO_ERR) {
+				dom_node_unref(c);
+				return false;
+			}
+
+			if (dom_string_caseless_lwc_isequal(s,
+					corestring_lwc_frameset)) {
+				dom_string_unref(s);
+				frame->border = 0;
+				if (box_create_frameset(frame, c,
+						content) == false) {
+					dom_node_unref(c);
+					return false;
+				}
+
+				err = dom_node_get_next_sibling(c, &next);
+				if (err != DOM_NO_ERR) {
+					dom_node_unref(c);
+					return false;
+				}
+
+				dom_node_unref(c);
+				c = next;
+				continue;
+			}
+
+			dom_string_unref(s);
+
+			/* get frame URL (not required) */
+			url = NULL;
+			err = dom_element_get_attribute(c, corestring_dom_src, &s);
+			if (err == DOM_NO_ERR && s != NULL) {
+				box_extract_link(content, s, content->base_url,
+						 &url);
+				dom_string_unref(s);
+			}
+
+			/* copy url */
+			if (url != NULL) {
+				/* no self-references */
+				if (nsurl_compare(content->base_url, url,
+						NSURL_COMPLETE) == false)
+					frame->url = url;
+				url = NULL;
+			}
+
+			/* fill in specified values */
+			err = dom_element_get_attribute(c, corestring_dom_name, &s);
+			if (err == DOM_NO_ERR && s != NULL) {
+				frame->name = talloc_strdup(content->bctx,
+						dom_string_data(s));
+				dom_string_unref(s);
+			}
+
+			if (dom_element_has_attribute(c, corestring_dom_noresize,
+						      &frame->no_resize) != DOM_NO_ERR) {
+				/* If we can't read the attribute for some reason,
+				 * assume we didn't have it.
+				 */
+				frame->no_resize = false;
+			}
+
+			err = dom_element_get_attribute(c, corestring_dom_frameborder,
+					&s);
+			if (err == DOM_NO_ERR && s != NULL) {
+				i = atoi(dom_string_data(s));
+				frame->border = (i != 0);
+				dom_string_unref(s);
+			}
+
+			err = dom_element_get_attribute(c, corestring_dom_scrolling, &s);
+			if (err == DOM_NO_ERR && s != NULL) {
+				if (dom_string_caseless_lwc_isequal(s,
+						corestring_lwc_yes))
+					frame->scrolling = BW_SCROLLING_YES;
+				else if (dom_string_caseless_lwc_isequal(s,
+						corestring_lwc_no))
+					frame->scrolling = BW_SCROLLING_NO;
+				dom_string_unref(s);
+			}
+
+			err = dom_element_get_attribute(c, corestring_dom_marginwidth,
+					&s);
+			if (err == DOM_NO_ERR && s != NULL) {
+				frame->margin_width = atoi(dom_string_data(s));
+				dom_string_unref(s);
+			}
+
+			err = dom_element_get_attribute(c, corestring_dom_marginheight,
+					&s);
+			if (err == DOM_NO_ERR && s != NULL) {
+				frame->margin_height = atoi(dom_string_data(s));
+				dom_string_unref(s);
+			}
+
+			err = dom_element_get_attribute(c, corestring_dom_bordercolor,
+					&s);
+			if (err == DOM_NO_ERR && s != NULL) {
+				css_color color;
+
+				if (nscss_parse_colour(dom_string_data(s),
+						&color))
+					frame->border_colour =
+						nscss_color_to_ns(color);
+
+				dom_string_unref(s);
+			}
+
+			/* advance */
+			err = dom_node_get_next_sibling(c, &next);
+			if (err != DOM_NO_ERR) {
+				dom_node_unref(c);
+				return false;
+			}
+
+			dom_node_unref(c);
+			c = next;
+		}
+	}
+
+	/* If the last child wasn't a frame, we still need to unref it */
+	if (c != NULL) {
+		dom_node_unref(c);
+	}
+
+	return true;
+}
+
+
+/**
+ * Destructor for content_html_iframe, for &lt;iframe&gt; elements
+ *
+ * \param f The iframe params being destroyed.
+ * \return 0 to allow talloc to continue destroying the tree.
+ */
+static int box_iframes_talloc_destructor(struct content_html_iframe *f)
+{
+	if (f->url != NULL) {
+		nsurl_unref(f->url);
+		f->url = NULL;
+	}
+
+	return 0;
+}
+
+
+/**
+ * Get the value of a dom node element's attribute.
+ *
+ * \param  n	      dom element node
+ * \param  attribute  name of attribute
+ * \param  context    talloc context for result buffer
+ * \param  value      updated to value, if the attribute is present
+ * \return  true on success, false if attribute present but memory exhausted
+ *
+ * \note returning true does not imply that the attribute was found. If the
+ * attribute was not found, *value will be unchanged.
+ */
+static bool
+box_get_attribute(dom_node *n,
+		  const char *attribute,
+		  void *context,
+		  char **value)
+{
+	char *result;
+	dom_string *attr, *attr_name;
+	dom_exception err;
+
+	err = dom_string_create_interned((const uint8_t *) attribute,
+			strlen(attribute), &attr_name);
+	if (err != DOM_NO_ERR)
+		return false;
+
+	err = dom_element_get_attribute(n, attr_name, &attr);
+	if (err != DOM_NO_ERR) {
+		dom_string_unref(attr_name);
+		return false;
+	}
+
+	dom_string_unref(attr_name);
+
+	if (attr != NULL) {
+		result = talloc_strdup(context, dom_string_data(attr));
+
+		dom_string_unref(attr);
+
+		if (result == NULL)
+			return false;
+
+		*value = result;
+	}
+
+	return true;
+}
+
+
+/**
+ * Helper function for adding textarea widget to box.
+ *
+ * This is a load of hacks to ensure boxes replaced with textareas
+ * can be handled by the layout code.
+ */
+static bool
+box_input_text(html_content *html, struct box *box, struct dom_node *node)
+{
+	struct box *inline_container, *inline_box;
+	uint8_t display = css_computed_display_static(box->style);
+
+	switch (display) {
+	case CSS_DISPLAY_GRID:
+	case CSS_DISPLAY_FLEX:
+	case CSS_DISPLAY_BLOCK:
+		box->type = BOX_BLOCK;
+		break;
+	default:
+		box->type = BOX_INLINE_BLOCK;
+		break;
+	}
+
+	inline_container = box_create(NULL, 0, false, 0, 0, 0, 0, html->bctx);
+	if (!inline_container)
+		return false;
+	inline_container->type = BOX_INLINE_CONTAINER;
+	inline_box = box_create(NULL, box->style, false, 0, 0, box->title, 0,
+			html->bctx);
+	if (!inline_box)
+		return false;
+	inline_box->type = BOX_TEXT;
+	inline_box->text = talloc_strdup(html->bctx, "");
+
+	box_add_child(inline_container, inline_box);
+	box_add_child(box, inline_container);
+
+	return box_textarea_create_textarea(html, box, node);
+}
+
+
+/**
+ * Add an option to a form select control (helper function for box_select()).
+ *
+ * \param  control  select containing the &lt;option&gt;
+ * \param  n	    xml element node for &lt;option&gt;
+ * \return  true on success, false on memory exhaustion
+ */
+static bool box_select_add_option(struct form_control *control, dom_node *n)
+{
+	char *value = NULL;
+	char *text = NULL;
+	char *text_nowrap = NULL;
+	bool selected;
+	dom_string *content, *s;
+	dom_exception err;
+
+	err = dom_node_get_text_content(n, &content);
+	if (err != DOM_NO_ERR)
+		return false;
+
+	if (content != NULL) {
+		text = squash_whitespace(dom_string_data(content));
+		dom_string_unref(content);
+	} else {
+		text = strdup("");
+	}
+
+	if (text == NULL)
+		goto no_memory;
+
+	err = dom_element_get_attribute(n, corestring_dom_value, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		value = strdup(dom_string_data(s));
+		dom_string_unref(s);
+	} else {
+		value = strdup(text);
+	}
+
+	if (value == NULL)
+		goto no_memory;
+
+	if (dom_element_has_attribute(n, corestring_dom_selected, &selected) != DOM_NO_ERR) {
+		/* Assume not selected if we can't read the attribute presence */
+		selected = false;
+	}
+
+	/* replace spaces/TABs with hard spaces to prevent line wrapping */
+	text_nowrap = cnv_space2nbsp(text);
+	if (text_nowrap == NULL)
+		goto no_memory;
+
+	if (form_add_option(control, value, text_nowrap, selected, n) == false)
+		goto no_memory;
+
+	free(text);
+
+	return true;
+
+no_memory:
+	free(value);
+	free(text);
+	free(text_nowrap);
+	return false;
+}
+
+
+/**
+ * \name  Special case element handlers
+ *
+ * These functions are called by box_construct_element() when an element is
+ * being converted, according to the entries in element_table.
+ *
+ * The parameters are the xmlNode, the content for the document, and a partly
+ * filled in box structure for the element.
+ *
+ * Return true on success, false on memory exhaustion. Set *convert_children
+ * to false if children of this element in the XML tree should be skipped (for
+ * example, if they have been processed in some special way already).
+ *
+ * Elements ordered as in the HTML 4.01 specification. Section numbers in
+ * brackets [] refer to the spec.
+ *
+ * \{
+ */
+
+/**
+ * special element handler for Anchor [12.2].
+ */
+static bool
+box_a(dom_node *n,
+      html_content *content,
+      struct box *box,
+      bool *convert_children)
+{
+	bool ok;
+	nsurl *url;
+	dom_string *s;
+	dom_exception err;
+
+	err = dom_element_get_attribute(n, corestring_dom_href, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		ok = box_extract_link(content, s, content->base_url, &url);
+		dom_string_unref(s);
+		if (!ok)
+			return false;
+		if (url) {
+			if (box->href != NULL)
+				nsurl_unref(box->href);
+			box->href = url;
+		}
+	}
+
+	/* name and id share the same namespace */
+	err = dom_element_get_attribute(n, corestring_dom_name, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		lwc_string *lwc_name;
+
+		err = dom_string_intern(s, &lwc_name);
+
+		dom_string_unref(s);
+
+		if (err == DOM_NO_ERR) {
+			/* name replaces existing id
+			 * TODO: really? */
+			if (box->id != NULL)
+				lwc_string_unref(box->id);
+
+			box->id = lwc_name;
+		}
+	}
+
+	/* target frame [16.3] */
+	err = dom_element_get_attribute(n, corestring_dom_target, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		if (dom_string_caseless_lwc_isequal(s,
+				corestring_lwc__blank))
+			box->target = "_blank";
+		else if (dom_string_caseless_lwc_isequal(s,
+				corestring_lwc__top))
+			box->target = "_top";
+		else if (dom_string_caseless_lwc_isequal(s,
+				corestring_lwc__parent))
+			box->target = "_parent";
+		else if (dom_string_caseless_lwc_isequal(s,
+				corestring_lwc__self))
+			/* the default may have been overridden by a
+			 * <base target=...>, so this is different to 0 */
+			box->target = "_self";
+		else {
+			/* 6.16 says that frame names must begin with [a-zA-Z]
+			 * This doesn't match reality, so just take anything */
+			box->target = talloc_strdup(content->bctx,
+					dom_string_data(s));
+			if (!box->target) {
+				dom_string_unref(s);
+				return false;
+			}
+		}
+		dom_string_unref(s);
+	}
+
+	return true;
+}
+
+
+/**
+ * Document body special element handler [7.5.1].
+ */
+static bool
+box_body(dom_node *n,
+	 html_content *content,
+	 struct box *box,
+	 bool *convert_children)
+{
+	css_color color;
+
+	css_computed_background_color(box->style, &color);
+	if (nscss_color_is_transparent(color)) {
+		content->background_colour = NS_TRANSPARENT;
+	} else {
+		content->background_colour = nscss_color_to_ns(color);
+	}
+
+	return true;
+}
+
+
+/**
+ * special element handler for forced line break [9.3.2].
+ */
+static bool
+box_br(dom_node *n,
+       html_content *content,
+       struct box *box,
+       bool *convert_children)
+{
+	box->type = BOX_BR;
+	return true;
+}
+
+
+/**
+ * special element handler for Push button [17.5].
+ */
+static bool
+box_button(dom_node *n,
+	   html_content *content,
+	   struct box *box,
+	   bool *convert_children)
+{
+	struct form_control *gadget;
+
+	gadget = html_forms_get_control_for_node(content->forms, n);
+	if (!gadget)
+		return false;
+
+	gadget->html = content;
+	box->gadget = gadget;
+	box->flags |= IS_REPLACED;
+	gadget->box = box;
+
+	box->type = BOX_INLINE_BLOCK;
+
+	/* Just render the contents */
+
+	return true;
+}
+
+
+/**
+ * Canvas element
+ */
+static bool
+box_canvas(dom_node *n,
+	     html_content *content,
+	     struct box *box,
+	     bool *convert_children)
+{
+	/* If scripting is not enabled display the contents of canvas */
+	if (!content->enable_scripting) {
+		return true;
+	}
+	*convert_children = false;
+
+	if (box->style && ns_computed_display(box->style,
+			box_is_root(n)) == CSS_DISPLAY_NONE)
+		return true;
+
+	/* This is replaced content */
+	box->flags |= IS_REPLACED | REPLACE_DIM;
+
+	return true;
+}
+
+
+/**
+ * Embedded object (not in any HTML specification:
+ * see http://wp.netscape.com/assist/net_sites/new_html3_prop.html )
+ */
+static bool
+box_embed(dom_node *n,
+	  html_content *content,
+	  struct box *box,
+	  bool *convert_children)
+{
+	struct object_params *params;
+	struct object_param *param;
+	dom_namednodemap *attrs;
+	unsigned long idx;
+	uint32_t num_attrs;
+	dom_string *src;
+	dom_exception err;
+
+	if (box->style && ns_computed_display(box->style,
+			box_is_root(n)) == CSS_DISPLAY_NONE)
+		return true;
+
+	params = talloc(content->bctx, struct object_params);
+	if (params == NULL)
+		return false;
+
+	talloc_set_destructor(params, box_object_talloc_destructor);
+
+	params->data = NULL;
+	params->type = NULL;
+	params->codetype = NULL;
+	params->codebase = NULL;
+	params->classid = NULL;
+	params->params = NULL;
+
+	/* src is a URL */
+	err = dom_element_get_attribute(n, corestring_dom_src, &src);
+	if (err != DOM_NO_ERR || src == NULL)
+		return true;
+	if (box_extract_link(content, src, content->base_url,
+			     &params->data) == false) {
+		dom_string_unref(src);
+		return false;
+	}
+
+	dom_string_unref(src);
+
+	if (params->data == NULL)
+		return true;
+
+	/* Don't include ourself */
+	if (nsurl_compare(content->base_url, params->data, NSURL_COMPLETE))
+		return true;
+
+	/* add attributes as parameters to linked list */
+	err = dom_node_get_attributes(n, &attrs);
+	if (err != DOM_NO_ERR)
+		return false;
+
+	err = dom_namednodemap_get_length(attrs, &num_attrs);
+	if (err != DOM_NO_ERR) {
+		dom_namednodemap_unref(attrs);
+		return false;
+	}
+
+	for (idx = 0; idx < num_attrs; idx++) {
+		dom_attr *attr;
+		dom_string *name, *value;
+
+		err = dom_namednodemap_item(attrs, idx, (void *) &attr);
+		if (err != DOM_NO_ERR) {
+			dom_namednodemap_unref(attrs);
+			return false;
+		}
+
+		err = dom_attr_get_name(attr, &name);
+		if (err != DOM_NO_ERR) {
+			dom_node_unref(attr);
+			dom_namednodemap_unref(attrs);
+			return false;
+		}
+
+		if (dom_string_caseless_lwc_isequal(name, corestring_lwc_src)) {
+			dom_node_unref(attr);
+			dom_string_unref(name);
+			continue;
+		}
+
+		err = dom_attr_get_value(attr, &value);
+		if (err != DOM_NO_ERR) {
+			dom_node_unref(attr);
+			dom_string_unref(name);
+			dom_namednodemap_unref(attrs);
+			return false;
+		}
+
+		param = talloc(content->bctx, struct object_param);
+		if (param == NULL) {
+			dom_node_unref(attr);
+			dom_string_unref(value);
+			dom_string_unref(name);
+			dom_namednodemap_unref(attrs);
+			return false;
+		}
+
+		param->name = talloc_strdup(content->bctx, dom_string_data(name));
+		param->value = talloc_strdup(content->bctx, dom_string_data(value));
+		param->type = NULL;
+		param->valuetype = talloc_strdup(content->bctx, "data");
+		param->next = NULL;
+
+		dom_string_unref(value);
+		dom_string_unref(name);
+		dom_node_unref(attr);
+
+		if (param->name == NULL || param->value == NULL ||
+				param->valuetype == NULL) {
+			dom_namednodemap_unref(attrs);
+			return false;
+		}
+
+		param->next = params->params;
+		params->params = param;
+	}
+
+	dom_namednodemap_unref(attrs);
+
+	box->object_params = params;
+
+	/* start fetch */
+	box->flags |= IS_REPLACED;
+	return html_fetch_object(content, params->data, box, CONTENT_ANY, false);
+}
+
+
+/**
+ * Window subdivision [16.2.1].
+ */
+static bool
+box_frameset(dom_node *n,
+	     html_content *content,
+	     struct box *box,
+	     bool *convert_children)
+{
+	bool ok;
+
+	if (content->frameset) {
+		NSLOG(netsurf, INFO, "Error: multiple framesets in document.");
+		/* Don't convert children */
+		if (convert_children)
+			*convert_children = false;
+		/* And ignore this spurious frameset */
+		box->type = BOX_NONE;
+		return true;
+	}
+
+	content->frameset = talloc_zero(content->bctx,
+					struct content_html_frames);
+	if (!content->frameset) {
+		return false;
+	}
+
+	ok = box_create_frameset(content->frameset, n, content);
+	if (ok) {
+		box->type = BOX_NONE;
+	}
+
+	if (convert_children) {
+		*convert_children = false;
+	}
+	return ok;
+}
+
+
+/**
+ * Inline subwindow [16.5].
+ */
+static bool
+box_iframe(dom_node *n,
+	   html_content *content,
+	   struct box *box,
+	   bool *convert_children)
+{
+	nsurl *url;
+	dom_string *s;
+	dom_exception err;
+	struct content_html_iframe *iframe;
+	int i;
+
+	if (box->style && ns_computed_display(box->style,
+			box_is_root(n)) == CSS_DISPLAY_NONE)
+		return true;
+
+	if (box->style &&
+	    css_computed_visibility(box->style) == CSS_VISIBILITY_HIDDEN) {
+		/* Don't create iframe discriptors for invisible iframes
+		 * TODO: handle hidden iframes at browser_window generation
+		 * time instead? */
+		return true;
+	}
+
+	/* get frame URL */
+	err = dom_element_get_attribute(n, corestring_dom_src, &s);
+	if (err != DOM_NO_ERR || s == NULL)
+		return true;
+	if (box_extract_link(content, s, content->base_url, &url) == false) {
+		dom_string_unref(s);
+		return false;
+	}
+	dom_string_unref(s);
+	if (url == NULL)
+		return true;
+
+	/* don't include ourself */
+	if (nsurl_compare(content->base_url, url, NSURL_COMPLETE)) {
+		nsurl_unref(url);
+		return true;
+	}
+
+	/* create a new iframe */
+	iframe = talloc(content->bctx, struct content_html_iframe);
+	if (iframe == NULL) {
+		nsurl_unref(url);
+		return false;
+	}
+
+	talloc_set_destructor(iframe, box_iframes_talloc_destructor);
+
+	iframe->box = box;
+	iframe->margin_width = 0;
+	iframe->margin_height = 0;
+	iframe->name = NULL;
+	iframe->url = url;
+	iframe->scrolling = BW_SCROLLING_AUTO;
+	iframe->border = true;
+
+	/* Add this iframe to the linked list of iframes */
+	iframe->next = content->iframe;
+	content->iframe = iframe;
+
+	/* fill in specified values */
+	err = dom_element_get_attribute(n, corestring_dom_name, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		iframe->name = talloc_strdup(content->bctx, dom_string_data(s));
+		dom_string_unref(s);
+	}
+
+	err = dom_element_get_attribute(n, corestring_dom_frameborder, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		i = atoi(dom_string_data(s));
+		iframe->border = (i != 0);
+		dom_string_unref(s);
+	}
+
+	err = dom_element_get_attribute(n, corestring_dom_bordercolor, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		css_color color;
+
+		if (nscss_parse_colour(dom_string_data(s), &color))
+			iframe->border_colour = nscss_color_to_ns(color);
+
+		dom_string_unref(s);
+	}
+
+	err = dom_element_get_attribute(n, corestring_dom_scrolling, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		if (dom_string_caseless_lwc_isequal(s,
+				corestring_lwc_yes))
+			iframe->scrolling = BW_SCROLLING_YES;
+		else if (dom_string_caseless_lwc_isequal(s,
+				corestring_lwc_no))
+			iframe->scrolling = BW_SCROLLING_NO;
+		dom_string_unref(s);
+	}
+
+	err = dom_element_get_attribute(n, corestring_dom_marginwidth, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		iframe->margin_width = atoi(dom_string_data(s));
+		dom_string_unref(s);
+	}
+
+	err = dom_element_get_attribute(n, corestring_dom_marginheight, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		iframe->margin_height = atoi(dom_string_data(s));
+		dom_string_unref(s);
+	}
+
+	/* box */
+	assert(box->style);
+	box->flags |= IFRAME;
+	box->flags |= IS_REPLACED;
+
+	/* Showing iframe, so don't show alternate content */
+	if (convert_children)
+		*convert_children = false;
+	return true;
+}
+
+
+/**
+ * Embedded image [13.2].
+ */
+static bool
+box_image(dom_node *n,
+	  html_content *content,
+	  struct box *box,
+	  bool *convert_children)
+{
+	bool ok;
+	dom_string *s;
+	dom_exception err;
+	nsurl *url;
+	enum css_width_e wtype;
+	enum css_height_e htype;
+	css_fixed value = 0;
+	css_unit wunit = CSS_UNIT_PX;
+	css_unit hunit = CSS_UNIT_PX;
+
+	if (box->style && ns_computed_display(box->style,
+			box_is_root(n)) == CSS_DISPLAY_NONE)
+		return true;
+
+	/* handle alt text */
+	err = dom_element_get_attribute(n, corestring_dom_alt, &s);
+	if (err == DOM_NO_ERR && s != NULL) {
+		char *alt = squash_whitespace(dom_string_data(s));
+		dom_string_unref(s);
+		if (alt == NULL)
+			return false;
+		box->text = talloc_strdup(content->bctx, alt);
+		free(alt);
+		if (box->text == NULL)
+			return false;
+		box->length = strlen(box->text);
+	}
+
+	if (nsoption_bool(foreground_images) == false) {
+		return true;
+	}
+
+	/* imagemap associated with this image */
+	if (!box_get_attribute(n, "usemap", content->bctx, &box->usemap))
+		return false;
+	if (box->usemap && box->usemap[0] == '#')
+		box->usemap++;
+
+	/* get image URL */
+	err = dom_element_get_attribute(n, corestring_dom_src, &s);
+	if (err != DOM_NO_ERR || s == NULL)
+		return true;
+
+	if (box_extract_link(content, s, content->base_url, &url) == false) {
+		dom_string_unref(s);
+		return false;
+	}
+
+	dom_string_unref(s);
+
+	if (url == NULL)
+		return true;
+
+	/* start fetch */
+	box->flags |= IS_REPLACED;
+	ok = html_fetch_object(content, url, box, image_types, false);
+	nsurl_unref(url);
+
+	wtype = css_computed_width(box->style, &value, &wunit);
+	htype = css_computed_height(box->style, &value, &hunit);
+
+	if (wtype == CSS_WIDTH_SET &&
+	    wunit != CSS_UNIT_PCT &&
+	    htype == CSS_HEIGHT_SET &&
+	    hunit != CSS_UNIT_PCT) {
+		/* We know the dimensions the image will be shown at
+		 * before it's fetched. */
+		box->flags |= REPLACE_DIM;
+	}
+
+	return ok;
+}
+
+
+/**
+ * Form control [17.4].
+ */
+static bool
+box_input(dom_node *n,
+	  html_content *content,
+	  struct box *box,
+	  bool *convert_children)
+{
+	struct form_control *gadget;
+	dom_string *type = NULL;
+	dom_exception err;
+	nsurl *url;
+	nserror error;
+
+	gadget = html_forms_get_control_for_node(content->forms, n);
+	if (gadget == NULL) {
+		return false;
+	}
+
+	box->gadget = gadget;
+	box->flags |= IS_REPLACED;
+	gadget->box = box;
+	gadget->html = content;
+
+	/* get entry type */
+	err = dom_element_get_attribute(n, corestring_dom_type, &type);
+	if ((err != DOM_NO_ERR) || (type == NULL)) {
+		/* no type so "text" is assumed */
+		if (box_input_text(content, box, n) == false) {
+			return false;
+		}
+		*convert_children = false;
+		return true;
+	}
+
+	if (dom_string_caseless_lwc_isequal(type, corestring_lwc_password)) {
+		if (box_input_text(content, box, n) == false)
+			goto no_memory;
+
+	} else if (dom_string_caseless_lwc_isequal(type, corestring_lwc_file)) {
+		box->type = BOX_INLINE_BLOCK;
+
+	} else if (dom_string_caseless_lwc_isequal(type,
+			corestring_lwc_hidden)) {
+		/* no box for hidden inputs */
+		box->type = BOX_NONE;
+
+	} else if ((dom_string_caseless_lwc_isequal(type,
+				corestring_lwc_checkbox) ||
+			dom_string_caseless_lwc_isequal(type,
+				corestring_lwc_radio))) {
+
+	} else if (dom_string_caseless_lwc_isequal(type,
+				corestring_lwc_submit) ||
+			dom_string_caseless_lwc_isequal(type,
+				corestring_lwc_reset) ||
+			dom_string_caseless_lwc_isequal(type,
+				corestring_lwc_button)) {
+		struct box *inline_container, *inline_box;
+
+		if (box_button(n, content, box, 0) == false)
+			goto no_memory;
+
+		inline_container = box_create(NULL, 0, false, 0, 0, 0, 0,
+				content->bctx);
+		if (inline_container == NULL)
+			goto no_memory;
+
+		inline_container->type = BOX_INLINE_CONTAINER;
+
+		inline_box = box_create(NULL, box->style, false, 0, 0,
+				box->title, 0, content->bctx);
+		if (inline_box == NULL)
+			goto no_memory;
+
+		inline_box->type = BOX_TEXT;
+
+		if (box->gadget->value != NULL)
+			inline_box->text = talloc_strdup(content->bctx,
+					box->gadget->value);
+		else if (box->gadget->type == GADGET_SUBMIT)
+			inline_box->text = talloc_strdup(content->bctx,
+					messages_get("Form_Submit"));
+		else if (box->gadget->type == GADGET_RESET)
+			inline_box->text = talloc_strdup(content->bctx,
+					messages_get("Form_Reset"));
+		else
+			inline_box->text = talloc_strdup(content->bctx,
+							 "Button");
+
+		if (inline_box->text == NULL)
+			goto no_memory;
+
+		inline_box->length = strlen(inline_box->text);
+
+		box_add_child(inline_container, inline_box);
+
+		box_add_child(box, inline_container);
+
+	} else if (dom_string_caseless_lwc_isequal(type,
+						   corestring_lwc_image)) {
+		gadget->type = GADGET_IMAGE;
+
+		if (box->style && ns_computed_display(box->style,
+				box_is_root(n)) != CSS_DISPLAY_NONE &&
+				nsoption_bool(foreground_images) == true) {
+			dom_string *s;
+
+			err = dom_element_get_attribute(n, corestring_dom_src, &s);
+			if (err == DOM_NO_ERR && s != NULL) {
+				error = nsurl_join(content->base_url,
+						dom_string_data(s), &url);
+				dom_string_unref(s);
+				if (error != NSERROR_OK)
+					goto no_memory;
+
+				/* if url is equivalent to the parent's url,
+				 * we've got infinite inclusion. stop it here
+				 */
+				if (nsurl_compare(url, content->base_url,
+						NSURL_COMPLETE) == false) {
+					if (!html_fetch_object(content,
+							       url,
+							       box,
+							       image_types,
+							       false)) {
+						nsurl_unref(url);
+						goto no_memory;
+					}
+				}
+				nsurl_unref(url);
+			}
+		}
+	} else {
+		/* unhandled type the default is "text" */
+		if (box_input_text(content, box, n) == false)
+			goto no_memory;
+	}
+
+	dom_string_unref(type);
+
+	*convert_children = false;
+
+	return true;
+
+no_memory:
+	dom_string_unref(type);
+
+	return false;
+}
+
+
+/**
+ * Noscript element
+ */
+static bool
+box_noscript(dom_node *n,
+	     html_content *content,
+	     struct box *box,
+	     bool *convert_children)
+{
+	/* If scripting is enabled, do not display the contents of noscript */
+	if (content->enable_scripting) {
+		*convert_children = false;
+	}
+
+	return true;
+}
+
+
+/**
+ * Generic embedded object [13.3].
+ */
+static bool
+box_object(dom_node *n,
+	   html_content *content,
+	   struct box *box,
+	   bool *convert_children)
+{
+	struct object_params *params;
+	struct object_param *param;
+	dom_string *codebase, *classid, *data;
+	dom_node *c;
+	dom_exception err;
+
+	if (box->style && ns_computed_display(box->style,
+			box_is_root(n)) == CSS_DISPLAY_NONE)
+		return true;
+
+	if (box_get_attribute(n, "usemap", content->bctx, &box->usemap) ==
+			false)
+		return false;
+	if (box->usemap && box->usemap[0] == '#')
+		box->usemap++;
+
+	params = talloc(content->bctx, struct object_params);
+	if (params == NULL)
+		return false;
+
+	talloc_set_destructor(params, box_object_talloc_destructor);
+
+	params->data = NULL;
+	params->type = NULL;
+	params->codetype = NULL;
+	params->codebase = NULL;
+	params->classid = NULL;
+	params->params = NULL;
+
+	/* codebase, classid, and data are URLs
+	 * (codebase is the base for the other two) */
+	err = dom_element_get_attribute(n, corestring_dom_codebase, &codebase);
+	if (err == DOM_NO_ERR && codebase != NULL) {
+		if (box_extract_link(content, codebase,	content->base_url,
+				&params->codebase) == false) {
+			dom_string_unref(codebase);
+			return false;
+		}
+		dom_string_unref(codebase);
+	}
+	if (params->codebase == NULL)
+		params->codebase = nsurl_ref(content->base_url);
+
+	err = dom_element_get_attribute(n, corestring_dom_classid, &classid);
+	if (err == DOM_NO_ERR && classid != NULL) {
+		if (box_extract_link(content, classid,
+				params->codebase, &params->classid) == false) {
+			dom_string_unref(classid);
+			return false;
+		}
+		dom_string_unref(classid);
+	}
+
+	err = dom_element_get_attribute(n, corestring_dom_data, &data);
+	if (err == DOM_NO_ERR && data != NULL) {
+		if (box_extract_link(content, data,
+				params->codebase, &params->data) == false) {
+			dom_string_unref(data);
+			return false;
+		}
+		dom_string_unref(data);
+	}
+
+	if (params->classid == NULL && params->data == NULL)
+		/* nothing to embed; ignore */
+		return true;
+
+	/* Don't include ourself */
+	if (params->classid != NULL && nsurl_compare(content->base_url,
+			params->classid, NSURL_COMPLETE))
+		return true;
+
+	if (params->data != NULL && nsurl_compare(content->base_url,
+			params->data, NSURL_COMPLETE))
+		return true;
+
+	/* codetype and type are MIME types */
+	if (box_get_attribute(n, "codetype", params,
+			&params->codetype) == false)
+		return false;
+	if (box_get_attribute(n, "type", params, &params->type) == false)
+		return false;
+
+	/* classid && !data => classid is used (consult codetype)
+	 * (classid || !classid) && data => data is used (consult type)
+	 * !classid && !data => invalid; ignored */
+
+	if (params->classid != NULL && params->data == NULL &&
+			params->codetype != NULL) {
+		lwc_string *icodetype;
+		lwc_error lerror;
+
+		lerror = lwc_intern_string(params->codetype,
+				strlen(params->codetype), &icodetype);
+		if (lerror != lwc_error_ok)
+			return false;
+
+		if (content_factory_type_from_mime_type(icodetype) ==
+				CONTENT_NONE) {
+			/* can't handle this MIME type */
+			lwc_string_unref(icodetype);
+			return true;
+		}
+
+		lwc_string_unref(icodetype);
+	}
+
+	if (params->data != NULL && params->type != NULL) {
+		lwc_string *itype;
+		lwc_error lerror;
+
+		lerror = lwc_intern_string(params->type, strlen(params->type),
+				&itype);
+		if (lerror != lwc_error_ok)
+			return false;
+
+		if (content_factory_type_from_mime_type(itype) ==
+				CONTENT_NONE) {
+			/* can't handle this MIME type */
+			lwc_string_unref(itype);
+			return true;
+		}
+
+		lwc_string_unref(itype);
+	}
+
+	/* add parameters to linked list */
+	err = dom_node_get_first_child(n, &c);
+	if (err != DOM_NO_ERR)
+		return false;
+
+	while (c != NULL) {
+		dom_node *next;
+		dom_node_type type;
+
+		err = dom_node_get_node_type(c, &type);
+		if (err != DOM_NO_ERR) {
+			dom_node_unref(c);
+			return false;
+		}
+
+		if (type == DOM_ELEMENT_NODE) {
+			dom_string *name;
+
+			err = dom_node_get_node_name(c, &name);
+			if (err != DOM_NO_ERR) {
+				dom_node_unref(c);
+				return false;
+			}
+
+			if (!dom_string_caseless_lwc_isequal(name,
+					corestring_lwc_param)) {
+				/* The first non-param child is the start of
+				 * the alt html. Therefore, we should break
+				 * out of this loop. */
+				dom_string_unref(name);
+				dom_node_unref(c);
+				break;
+			}
+			dom_string_unref(name);
+
+			param = talloc(params, struct object_param);
+			if (param == NULL) {
+				dom_node_unref(c);
+				return false;
+			}
+			param->name = NULL;
+			param->value = NULL;
+			param->type = NULL;
+			param->valuetype = NULL;
+			param->next = NULL;
+
+			if (box_get_attribute(c, "name", param,
+					&param->name) == false) {
+				dom_node_unref(c);
+				return false;
+			}
+
+			if (box_get_attribute(c, "value", param,
+					&param->value) == false) {
+				dom_node_unref(c);
+				return false;
+			}
+
+			if (box_get_attribute(c, "type", param,
+					&param->type) == false) {
+				dom_node_unref(c);
+				return false;
+			}
+
+			if (box_get_attribute(c, "valuetype", param,
+					&param->valuetype) == false) {
+				dom_node_unref(c);
+				return false;
+			}
+
+			if (param->valuetype == NULL) {
+				param->valuetype = talloc_strdup(param, "data");
+				if (param->valuetype == NULL) {
+					dom_node_unref(c);
+					return false;
+				}
+			}
+
+			param->next = params->params;
+			params->params = param;
+		}
+
+		err = dom_node_get_next_sibling(c, &next);
+		if (err != DOM_NO_ERR) {
+			dom_node_unref(c);
+			return false;
+		}
+
+		dom_node_unref(c);
+		c = next;
+	}
+
+	box->object_params = params;
+
+	/* start fetch (MIME type is ok or not specified) */
+	box->flags |= IS_REPLACED;
+	if (!html_fetch_object(content,
+			       params->data ? params->data : params->classid,
+			       box,
+			       CONTENT_ANY,
+			       false))
+		return false;
+
+	*convert_children = false;
+	return true;
+}
+
+
+/**
+ * Preformatted text [9.3.4].
+ */
+static bool
+box_pre(dom_node *n,
+	html_content *content,
+	struct box *box,
+	bool *convert_children)
+{
+	box->flags |= PRE_STRIP;
+	return true;
+}
+
+
+/**
+ * Option selector [17.6].
+ */
+static bool
+box_select(dom_node *n,
+	   html_content *content,
+	   struct box *box,
+	   bool *convert_children)
+{
+	struct box *inline_container;
+	struct box *inline_box;
+	struct form_control *gadget;
+	dom_node *c, *c2;
+	dom_node *next, *next2;
+	dom_exception err;
+
+	gadget = html_forms_get_control_for_node(content->forms, n);
+	if (gadget == NULL)
+		return false;
+
+	gadget->html = content;
+	err = dom_node_get_first_child(n, &c);
+	if (err != DOM_NO_ERR) {
+		form_free_control(gadget);
+		return false;
+	}
+
+	while (c != NULL) {
+		dom_string *name;
+
+		err = dom_node_get_node_name(c, &name);
+		if (err != DOM_NO_ERR) {
+			dom_node_unref(c);
+			form_free_control(gadget);
+			return false;
+		}
+
+		if (dom_string_caseless_lwc_isequal(name,
+				corestring_lwc_option)) {
+			dom_string_unref(name);
+
+			if (box_select_add_option(gadget, c) == false) {
+				dom_node_unref(c);
+				form_free_control(gadget);
+				return false;
+			}
+		} else if (dom_string_caseless_lwc_isequal(name,
+				corestring_lwc_optgroup)) {
+			dom_string_unref(name);
+
+			err = dom_node_get_first_child(c, &c2);
+			if (err != DOM_NO_ERR) {
+				dom_node_unref(c);
+				form_free_control(gadget);
+				return false;
+			}
+
+			while (c2 != NULL) {
+				dom_string *c2_name;
+
+				err = dom_node_get_node_name(c2, &c2_name);
+				if (err != DOM_NO_ERR) {
+					dom_node_unref(c2);
+					dom_node_unref(c);
+					form_free_control(gadget);
+					return false;
+				}
+
+				if (dom_string_caseless_lwc_isequal(c2_name,
+						corestring_lwc_option)) {
+					dom_string_unref(c2_name);
+
+					if (box_select_add_option(gadget,
+							c2) == false) {
+						dom_node_unref(c2);
+						dom_node_unref(c);
+						form_free_control(gadget);
+						return false;
+					}
+				} else {
+					dom_string_unref(c2_name);
+				}
+
+				err = dom_node_get_next_sibling(c2, &next2);
+				if (err != DOM_NO_ERR) {
+					dom_node_unref(c2);
+					dom_node_unref(c);
+					form_free_control(gadget);
+					return false;
+				}
+
+				dom_node_unref(c2);
+				c2 = next2;
+			}
+		} else {
+			dom_string_unref(name);
+		}
+
+		err = dom_node_get_next_sibling(c, &next);
+		if (err != DOM_NO_ERR) {
+			dom_node_unref(c);
+			form_free_control(gadget);
+			return false;
+		}
+
+		dom_node_unref(c);
+		c = next;
+	}
+
+	if (gadget->data.select.num_items == 0) {
+		/* no options: ignore entire select */
+		form_free_control(gadget);
+		return true;
+	}
+
+	box->type = BOX_INLINE_BLOCK;
+	box->gadget = gadget;
+	box->flags |= IS_REPLACED;
+	gadget->box = box;
+
+	inline_container = box_create(NULL, 0, false, 0, 0, 0, 0, content->bctx);
+	if (inline_container == NULL)
+		goto no_memory;
+	inline_container->type = BOX_INLINE_CONTAINER;
+	inline_box = box_create(NULL, box->style, false, 0, 0, box->title, 0,
+			content->bctx);
+	if (inline_box == NULL)
+		goto no_memory;
+	inline_box->type = BOX_TEXT;
+	box_add_child(inline_container, inline_box);
+	box_add_child(box, inline_container);
+
+	if (gadget->data.select.multiple == false &&
+			gadget->data.select.num_selected == 0) {
+		gadget->data.select.current = gadget->data.select.items;
+		gadget->data.select.current->initial_selected =
+			gadget->data.select.current->selected = true;
+		gadget->data.select.num_selected = 1;
+		dom_html_option_element_set_selected(
+				gadget->data.select.current->node, true);
+	}
+
+	if (gadget->data.select.num_selected == 0)
+		inline_box->text = talloc_strdup(content->bctx,
+				messages_get("Form_None"));
+	else if (gadget->data.select.num_selected == 1)
+		inline_box->text = talloc_strdup(content->bctx,
+				gadget->data.select.current->text);
+	else
+		inline_box->text = talloc_strdup(content->bctx,
+				messages_get("Form_Many"));
+	if (inline_box->text == NULL)
+		goto no_memory;
+
+	inline_box->length = strlen(inline_box->text);
+
+	*convert_children = false;
+	return true;
+
+no_memory:
+	return false;
+}
+
+
+/**
+ * Multi-line text field [17.7].
+ */
+static bool box_textarea(dom_node *n,
+			html_content *content,
+			struct box *box,
+			bool *convert_children)
+{
+	/* Get the form_control for the DOM node */
+	box->gadget = html_forms_get_control_for_node(content->forms, n);
+	if (box->gadget == NULL)
+		return false;
+
+	box->flags |= IS_REPLACED;
+	box->gadget->html = content;
+	box->gadget->box = box;
+
+	if (!box_input_text(content, box, n))
+		return false;
+
+	*convert_children = false;
+	return true;
+}
+
+
+/**
+ * \}
+ */
+
+
+/* exported interface documented in html/box_special.h */
+bool
+convert_special_elements(dom_node *node,
+			 html_content *content,
+			 struct box *box,
+			 bool *convert_children)
+{
+	dom_exception exc;
+	dom_html_element_type tag_type;
+	bool res;
+
+	exc = dom_html_element_get_tag_type(node, &tag_type);
+	if (exc != DOM_NO_ERR) {
+		tag_type = DOM_HTML_ELEMENT_TYPE__UNKNOWN;
+	}
+
+	switch (tag_type) {
+	case DOM_HTML_ELEMENT_TYPE_A:
+		res =  box_a(node, content, box, convert_children);
+		break;
+
+	case DOM_HTML_ELEMENT_TYPE_BODY:
+		res = box_body(node, content, box, convert_children);
+		break;
+
+	case DOM_HTML_ELEMENT_TYPE_BR:
+		res = box_br(node, content, box, convert_children);
+		break;
+
+	case DOM_HTML_ELEMENT_TYPE_BUTTON:
+		res = box_button(node, content, box, convert_children);
+		break;
+
+	case DOM_HTML_ELEMENT_TYPE_CANVAS:
+		res = box_canvas(node, content, box, convert_children);
+		break;
+
+	case DOM_HTML_ELEMENT_TYPE_EMBED:
+		res = box_embed(node, content, box, convert_children);
+		break;
+
+	case DOM_HTML_ELEMENT_TYPE_FRAMESET:
+		res = box_frameset(node, content, box, convert_children);
+		break;
+
+	case DOM_HTML_ELEMENT_TYPE_IFRAME:
+		res = box_iframe(node, content, box, convert_children);
+		break;
+
+	case DOM_HTML_ELEMENT_TYPE_IMG:
+		res = box_image(node, content, box, convert_children);
+		break;
+
+	case DOM_HTML_ELEMENT_TYPE_INPUT:
+		res = box_input(node, content, box, convert_children);
+		break;
+
+	case DOM_HTML_ELEMENT_TYPE_NOSCRIPT:
+		res = box_noscript(node, content, box, convert_children);
+		break;
+
+	case DOM_HTML_ELEMENT_TYPE_OBJECT:
+		res = box_object(node, content, box, convert_children);
+		break;
+
+	case DOM_HTML_ELEMENT_TYPE_PRE:
+		res = box_pre(node, content, box, convert_children);
+		break;
+
+	case DOM_HTML_ELEMENT_TYPE_SELECT:
+		res = box_select(node, content, box, convert_children);
+		break;
+
+	case DOM_HTML_ELEMENT_TYPE_TEXTAREA:
+		res = box_textarea(node, content, box, convert_children);
+		break;
+
+	default:
+		res = true;
+	}
+
+	return res;
+}
diff --git a/content/handlers/html/box_special.h b/content/handlers/html/box_special.h
new file mode 100644
index 000000000..973ab976a
--- /dev/null
+++ b/content/handlers/html/box_special.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * HTML Box tree construction special element conversion interface.
+ */
+
+#ifndef NETSURF_HTML_BOX_SPECIAL_H
+#define NETSURF_HTML_BOX_SPECIAL_H
+
+
+/**
+ * call an elements special conversion handler
+ *
+ * \return true if box construction should continue else false on error.
+ */
+bool convert_special_elements(dom_node *node, html_content *content, struct box *box, bool *convert_children);
+
+#endif
diff --git a/content/handlers/html/box_textarea.c b/content/handlers/html/box_textarea.c
index f0ba9f9de..d08660030 100644
--- a/content/handlers/html/box_textarea.c
+++ b/content/handlers/html/box_textarea.c
@@ -21,6 +21,7 @@
  * Box tree treeview box replacement (implementation).
  */
 
+#include <string.h>
 #include <dom/dom.h>
 
 #include "utils/config.h"
@@ -29,90 +30,97 @@
 #include "netsurf/keypress.h"
 #include "netsurf/misc.h"
 #include "desktop/textarea.h"
-#include "desktop/gui_internal.h"
 
-#include "html/html_internal.h"
+#include "html/private.h"
+#include "html/interaction.h"
 #include "html/box.h"
+#include "html/box_inspect.h"
 #include "html/box_textarea.h"
 #include "html/font.h"
 #include "html/form_internal.h"
 
 
-bool box_textarea_keypress(html_content *html, struct box *box, uint32_t key)
+nserror box_textarea_keypress(html_content *html, struct box *box, uint32_t key)
 {
 	struct form_control *gadget = box->gadget;
 	struct textarea *ta = gadget->data.text.ta;
 	struct form* form = box->gadget->form;
-	struct content *c = (struct content *) html;
-	nserror res;
+	struct content *c = (struct content *)html;
+	nserror res = NSERROR_OK;
 
 	assert(ta != NULL);
 
-	if (gadget->type != GADGET_TEXTAREA) {
-		switch (key) {
-		case NS_KEY_NL:
-		case NS_KEY_CR:
-			if (form) {
-				res = form_submit(content_get_url(c),
-						  html->bw,
-						  form,
-						  NULL);
-				if (res != NSERROR_OK) {
-					guit->misc->warning(messages_get_errorcode(res), NULL);
-				}
+	if (gadget->type == GADGET_TEXTAREA) {
+		if (textarea_keypress(ta, key)) {
+			return NSERROR_OK;
+		} else {
+			return NSERROR_INVALID;
+		}
+	}
 
-			}
-			return true;
+	/* non textarea input */
+	switch (key) {
+	case NS_KEY_NL:
+	case NS_KEY_CR:
+		if (form) {
+			res = form_submit(content_get_url(c),
+					  html->bw,
+					  form,
+					  NULL);
+		}
+		break;
 
-		case NS_KEY_TAB:
+	case NS_KEY_TAB:
 		{
 			struct form_control *next_input;
 			/* Find next text entry field that is actually
 			 * displayed (i.e. has an associated box) */
 			for (next_input = gadget->next;
-					next_input &&
-					((next_input->type != GADGET_TEXTBOX &&
-					next_input->type != GADGET_TEXTAREA &&
-					next_input->type != GADGET_PASSWORD) ||
-					!next_input->box);
-					next_input = next_input->next)
+			     next_input &&
+				     ((next_input->type != GADGET_TEXTBOX &&
+				       next_input->type != GADGET_TEXTAREA &&
+				       next_input->type != GADGET_PASSWORD) ||
+				      !next_input->box);
+			     next_input = next_input->next)
 				;
-			if (!next_input)
-				return true;
 
-			textarea_set_caret(ta, -1);
-			textarea_set_caret(next_input->data.text.ta, 0);
+			if (next_input != NULL) {
+				textarea_set_caret(ta, -1);
+				textarea_set_caret(next_input->data.text.ta, 0);
+			}
 		}
-			return true;
+		break;
 
-		case NS_KEY_SHIFT_TAB:
+	case NS_KEY_SHIFT_TAB:
 		{
 			struct form_control *prev_input;
 			/* Find previous text entry field that is actually
 			 * displayed (i.e. has an associated box) */
 			for (prev_input = gadget->prev;
-					prev_input &&
-					((prev_input->type != GADGET_TEXTBOX &&
-					prev_input->type != GADGET_TEXTAREA &&
-					prev_input->type != GADGET_PASSWORD) ||
-					!prev_input->box);
-					prev_input = prev_input->prev)
+			     prev_input &&
+				     ((prev_input->type != GADGET_TEXTBOX &&
+				       prev_input->type != GADGET_TEXTAREA &&
+				       prev_input->type != GADGET_PASSWORD) ||
+				      !prev_input->box);
+			     prev_input = prev_input->prev)
 				;
-			if (!prev_input)
-				return true;
 
-			textarea_set_caret(ta, -1);
-			textarea_set_caret(prev_input->data.text.ta, 0);
+			if (prev_input != NULL) {
+				textarea_set_caret(ta, -1);
+				textarea_set_caret(prev_input->data.text.ta, 0);
+			}
 		}
-			return true;
+		break;
 
-		default:
-			/* Pass to textarea widget */
-			break;
+	default:
+		/* Pass to textarea widget */
+		if (!textarea_keypress(ta, key)) {
+			res = NSERROR_INVALID;
 		}
+		break;
 	}
 
-	return textarea_keypress(ta, key);
+	return res;
 }
 
 
diff --git a/content/handlers/html/box_textarea.h b/content/handlers/html/box_textarea.h
index 822fc8b10..219ef2301 100644
--- a/content/handlers/html/box_textarea.h
+++ b/content/handlers/html/box_textarea.h
@@ -45,8 +45,8 @@ bool box_textarea_create_textarea(struct html_content *html,
  * \param html    html content object
  * \param box     box with textarea widget
  * \param key     keypress
- * \return true iff keypress handled
+ * \return NSERROR_OK iff keypress handled
  */
-bool box_textarea_keypress(struct html_content *html, struct box *box, uint32_t key);
+nserror box_textarea_keypress(struct html_content *html, struct box *box, uint32_t key);
 
 #endif
diff --git a/content/handlers/html/html_css.c b/content/handlers/html/css.c
index 2a2fde6c6..0bc38844f 100644
--- a/content/handlers/html/html_css.c
+++ b/content/handlers/html/css.c
@@ -21,6 +21,8 @@
  * Processing for html content css operations.
  */
 
+#include "utils/config.h"
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdint.h>
@@ -30,8 +32,8 @@
 
 #include "utils/nsoption.h"
 #include "utils/corestrings.h"
-#include "utils/config.h"
 #include "utils/log.h"
+#include "netsurf/inttypes.h"
 #include "netsurf/misc.h"
 #include "netsurf/content.h"
 #include "content/hlcache.h"
@@ -39,13 +41,17 @@
 #include "desktop/gui_internal.h"
 
 #include "html/html.h"
-#include "html/html_internal.h"
+#include "html/private.h"
+#include "html/css.h"
 
 static nsurl *html_default_stylesheet_url;
 static nsurl *html_adblock_stylesheet_url;
 static nsurl *html_quirks_stylesheet_url;
 static nsurl *html_user_stylesheet_url;
 
+/**
+ * Convert css error to netsurf error.
+ */
 static nserror css_error_to_nserror(css_error error)
 {
 	switch (error) {
@@ -79,10 +85,10 @@ static nserror css_error_to_nserror(css_error error)
 	return NSERROR_CSS;
 }
 
+
 /**
  * Callback for fetchcache() for stylesheets.
  */
-
 static nserror
 html_convert_css_callback(hlcache_handle *css,
 			  const hlcache_event *event,
@@ -114,15 +120,12 @@ html_convert_css_callback(hlcache_handle *css,
 	case CONTENT_MSG_ERROR:
 		NSLOG(netsurf, INFO, "stylesheet %s failed: %s",
 		      nsurl_access(hlcache_handle_get_url(css)),
-		      event->data.error);
-		/* fall through */
+		      event->data.errordata.errormsg);
 
-	case CONTENT_MSG_ERRORCODE:
 		hlcache_handle_release(css);
 		s->sheet = NULL;
 		parent->base.active--;
 		NSLOG(netsurf, INFO, "%d fetches active", parent->base.active);
-		content_add_error(&parent->base, "?", 0);
 		break;
 
 	case CONTENT_MSG_POINTER:
@@ -140,6 +143,7 @@ html_convert_css_callback(hlcache_handle *css,
 	return NSERROR_OK;
 }
 
+
 static nserror
 html_stylesheet_from_domnode(html_content *c,
 			     dom_node *node,
@@ -170,7 +174,7 @@ html_stylesheet_from_domnode(html_content *c,
 
 	dom_string_unref(style);
 
-	snprintf(urlbuf, sizeof(urlbuf), "x-ns-css:%u", key);
+	snprintf(urlbuf, sizeof(urlbuf), "x-ns-css:%"PRIu32"", key);
 
 	error = nsurl_create(urlbuf, &url);
 	if (error != NSERROR_OK) {
@@ -194,6 +198,7 @@ html_stylesheet_from_domnode(html_content *c,
 	return NSERROR_OK;
 }
 
+
 /**
  * Process an inline stylesheet in the document.
  *
@@ -201,7 +206,6 @@ html_stylesheet_from_domnode(html_content *c,
  * \param  style  xml node of style element
  * \return  true on success, false if an error occurred
  */
-
 static struct html_stylesheet *
 html_create_style_element(html_content *c, dom_node *style)
 {
@@ -238,7 +242,7 @@ html_create_style_element(html_content *c, dom_node *style)
 			      (c->stylesheet_count + 1));
 	if (stylesheets == NULL) {
 
-		content_broadcast_errorcode(&c->base, NSERROR_NOMEM);
+		content_broadcast_error(&c->base, NSERROR_NOMEM, NULL);
 		return false;
 
 	}
@@ -253,8 +257,9 @@ html_create_style_element(html_content *c, dom_node *style)
 	return c->stylesheets + (c->stylesheet_count - 1);
 }
 
-static bool html_css_process_modified_style(html_content *c,
-		struct html_stylesheet *s)
+
+static bool
+html_css_process_modified_style(html_content *c, struct html_stylesheet *s)
 {
 	hlcache_handle *sheet = NULL;
 	nserror error;
@@ -262,7 +267,7 @@ static bool html_css_process_modified_style(html_content *c,
 	error = html_stylesheet_from_domnode(c, s->node, &sheet);
 	if (error != NSERROR_OK) {
 		NSLOG(netsurf, INFO, "Failed to update sheet");
-		content_broadcast_errorcode(&c->base, error);
+		content_broadcast_error(&c->base, error, NULL);
 		return false;
 	}
 
@@ -290,6 +295,10 @@ static bool html_css_process_modified_style(html_content *c,
 	return true;
 }
 
+
+/**
+ * process a stylesheet that has been modified.
+ */
 static void html_css_process_modified_styles(void *pw)
 {
 	html_content *c = pw;
@@ -309,6 +318,8 @@ static void html_css_process_modified_styles(void *pw)
 	}
 }
 
+
+/* exported function documented in html/css.h */
 bool html_css_update_style(html_content *c, dom_node *style)
 {
 	unsigned int i;
@@ -336,6 +347,8 @@ bool html_css_update_style(html_content *c, dom_node *style)
 	return true;
 }
 
+
+/* exported function documented in html/css.h */
 bool html_css_process_style(html_content *c, dom_node *node)
 {
 	unsigned int i;
@@ -367,6 +380,8 @@ bool html_css_process_style(html_content *c, dom_node *node)
 	return true;
 }
 
+
+/* exported function documented in html/css.h */
 bool html_css_process_link(html_content *htmlc, dom_node *node)
 {
 	dom_string *rel, *type_attr, *media, *href;
@@ -381,16 +396,20 @@ bool html_css_process_link(html_content *htmlc, dom_node *node)
 	if (exc != DOM_NO_ERR || rel == NULL)
 		return true;
 
-	if (strcasestr(dom_string_data(rel), "stylesheet") == 0) {
+	if (strcasestr(dom_string_data(rel), "stylesheet") == NULL) {
 		dom_string_unref(rel);
 		return true;
-	} else if (strcasestr(dom_string_data(rel), "alternate") != 0) {
+	} else if (strcasestr(dom_string_data(rel), "alternate") != NULL) {
 		/* Ignore alternate stylesheets */
 		dom_string_unref(rel);
 		return true;
 	}
 	dom_string_unref(rel);
 
+	if (nsoption_bool(author_level_css) == false) {
+		return true;
+	}
+
 	/* type='text/css' or not present */
 	exc = dom_element_get_attribute(node, corestring_dom_type, &type_attr);
 	if (exc == DOM_NO_ERR && type_attr != NULL) {
@@ -470,10 +489,11 @@ bool html_css_process_link(html_content *htmlc, dom_node *node)
 	return true;
 
 no_memory:
-	content_broadcast_errorcode(&htmlc->base, ns_error);
+	content_broadcast_error(&htmlc->base, ns_error, NULL);
 	return false;
 }
 
+
 /* exported interface documented in html/html.h */
 struct html_stylesheet *html_get_stylesheets(hlcache_handle *h, unsigned int *n)
 {
@@ -488,7 +508,26 @@ struct html_stylesheet *html_get_stylesheets(hlcache_handle *h, unsigned int *n)
 }
 
 
-/* exported interface documented in html/html_internal.h */
+/* exported function documented in html/css.h */
+bool html_css_saw_insecure_stylesheets(html_content *html)
+{
+	struct html_stylesheet *s;
+	unsigned int i;
+
+	for (i = 0, s = html->stylesheets; i < html->stylesheet_count;
+	     i++, s++) {
+		if (s->sheet != NULL) {
+			if (content_saw_insecure_objects(s->sheet)) {
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+
+/* exported function documented in html/css.h */
 nserror html_css_free_stylesheets(html_content *html)
 {
 	unsigned int i;
@@ -508,7 +547,8 @@ nserror html_css_free_stylesheets(html_content *html)
 	return NSERROR_OK;
 }
 
-/* exported interface documented in html/html_internal.h */
+
+/* exported function documented in html/css.h */
 nserror html_css_quirks_stylesheets(html_content *c)
 {
 	nserror ns_error = NSERROR_OK;
@@ -536,7 +576,8 @@ nserror html_css_quirks_stylesheets(html_content *c)
 	return ns_error;
 }
 
-/* exported interface documented in html/html_internal.h */
+
+/* exported function documented in html/css.h */
 nserror html_css_new_stylesheets(html_content *c)
 {
 	nserror ns_error;
@@ -606,6 +647,8 @@ nserror html_css_new_stylesheets(html_content *c)
 	return ns_error;
 }
 
+
+/* exported function documented in html/css.h */
 nserror
 html_css_new_selection_context(html_content *c, css_select_ctx **ret_select_ctx)
 {
@@ -668,6 +711,8 @@ html_css_new_selection_context(html_content *c, css_select_ctx **ret_select_ctx)
 	return NSERROR_OK;
 }
 
+
+/* exported function documented in html/css.h */
 nserror html_css_init(void)
 {
 	nserror error;
@@ -697,6 +742,8 @@ nserror html_css_init(void)
 	return error;
 }
 
+
+/* exported function documented in html/css.h */
 void html_css_fini(void)
 {
 	if (html_user_stylesheet_url != NULL) {
diff --git a/content/handlers/html/css.h b/content/handlers/html/css.h
new file mode 100644
index 000000000..35f6a61e9
--- /dev/null
+++ b/content/handlers/html/css.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * HTML content handler CSS interface.
+ */
+
+#ifndef NETSURF_HTML_CSS_H
+#define NETSURF_HTML_CSS_H
+
+/**
+ * Initialise html content css handling.
+ *
+ * \return NSERROR_OK on success else error code
+ */
+nserror html_css_init(void);
+
+/**
+ * Finalise html content css handling.
+ */
+void html_css_fini(void);
+
+/**
+ * create a new css selection context for an html content.
+ *
+ * \param c The html content to create css selction on.
+ * \param select_ctx A pointer to receive the new context.
+ * \return NSERROR_OK on success and \a select_ctx updated else error code
+ */
+nserror html_css_new_selection_context(struct html_content *c, css_select_ctx **select_ctx);
+
+/**
+ * Initialise core stylesheets for a content
+ *
+ * \param c content structure to update
+ * \return NSERROR_OK on success or error code
+ */
+nserror html_css_new_stylesheets(struct html_content *c);
+
+/**
+ * Initialise quirk stylesheets for a content
+ *
+ * \param c content structure to update
+ * \return NSERROR_OK on success or error code
+ */
+nserror html_css_quirks_stylesheets(struct html_content *c);
+
+/**
+ * Free all css stylesheets associated with an HTML content. 
+ *
+ * \param html The HTML content to free stylesheets from.
+ * \return NSERROR_OK on success or error code.
+ */
+nserror html_css_free_stylesheets(struct html_content *html);
+
+/**
+ * determine if any of the stylesheets were loaded insecurely
+ *
+ * \param htmlc The HTML content to check.
+ * \return true if there were insecurely loadd stylesheets else false.
+ */
+bool html_css_saw_insecure_stylesheets(struct html_content *htmlc);
+
+/**
+ * process a css stylesheet dom LINK node 
+ *
+ * \param htmlc The HTML content.
+ * \param node the DOM link node to process. 
+ * \return true on success else false.
+ */
+bool html_css_process_link(struct html_content *htmlc, dom_node *node);
+
+/**
+ * process a css style dom node 
+ *
+ * \param htmlc The HTML content.
+ * \param node the DOM node to process. 
+ * \return true on success else false.
+ */
+bool html_css_process_style(struct html_content *htmlc, dom_node *node);
+
+/**
+ * process a css style dom node update 
+ *
+ * \param htmlc The HTML content.
+ * \param node the DOM node to process. 
+ * \return true on success else false.
+ */
+bool html_css_update_style(struct html_content *htmlc, dom_node *node);
+
+
+
+#endif
diff --git a/content/handlers/html/html_css_fetcher.c b/content/handlers/html/css_fetcher.c
index 7987ea094..4e0f672e9 100644
--- a/content/handlers/html/html_css_fetcher.c
+++ b/content/handlers/html/css_fetcher.c
@@ -31,6 +31,7 @@
 
 #include "netsurf/inttypes.h"
 #include "utils/config.h"
+#include "utils/corestrings.h"
 #include "utils/log.h"
 #include "utils/ring.h"
 #include "utils/nsurl.h"
@@ -38,7 +39,7 @@
 #include "content/fetch.h"
 #include "content/fetchers.h"
 
-#include "html/html_internal.h"
+#include "html/private.h"
 
 typedef struct html_css_fetcher_item {
 	uint32_t key;
@@ -284,7 +285,6 @@ static void html_css_fetcher_poll(lwc_string *scheme)
 /* exported interface documented in html_internal.h */
 nserror html_css_fetcher_register(void)
 {
-	lwc_string *scheme;
 	const struct fetcher_operation_table html_css_fetcher_ops = {
 		.initialise = html_css_fetcher_initialise,
 		.acceptable = html_css_fetcher_can_fetch,
@@ -296,13 +296,8 @@ nserror html_css_fetcher_register(void)
 		.finalise = html_css_fetcher_finalise
 	};
 
-	if (lwc_intern_string("x-ns-css", SLEN("x-ns-css"),
-			      &scheme) != lwc_error_ok) {
-		NSLOG(netsurf, INFO, "could not intern \"x-ns-css\".");
-		return NSERROR_INIT_FAILED;
-	}
-
-	return fetcher_add(scheme, &html_css_fetcher_ops);
+	return fetcher_add(lwc_string_ref(corestring_lwc_x_ns_css),
+			&html_css_fetcher_ops);
 }
 
 /* exported interface documented in html_internal.h */
diff --git a/content/handlers/html/dom_event.c b/content/handlers/html/dom_event.c
new file mode 100644
index 000000000..d42882515
--- /dev/null
+++ b/content/handlers/html/dom_event.c
@@ -0,0 +1,789 @@
+/*
+ * Copyright 2010 Michael Drake <tlsa@netsurf-browser.org>
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * Implementation of HTML content DOM event handling.
+ */
+
+#include <string.h>
+
+#include "utils/config.h"
+#include "utils/utils.h"
+#include "utils/corestrings.h"
+#include "utils/nsoption.h"
+#include "utils/log.h"
+#include "utils/ascii.h"
+#include "utils/string.h"
+#include "utils/nsurl.h"
+#include "content/content.h"
+#include "javascript/js.h"
+
+#include "netsurf/bitmap.h"
+
+#include "html/private.h"
+#include "html/object.h"
+#include "html/css.h"
+#include "html/box.h"
+#include "html/box_construct.h"
+#include "html/form_internal.h"
+#include "html/dom_event.h"
+
+
+/**
+ * process a base element being inserted into the DOM
+ *
+ * \param htmlc The html content containing the DOM
+ * \param node The DOM node being inserted
+ * \return NSERROR_OK on success else appropriate error code
+ */
+static bool html_process_inserted_base(html_content *htmlc, dom_node *node)
+{
+	dom_exception exc; /* returned by libdom functions */
+	dom_string *atr_string;
+
+	/* get href attribute if present */
+	exc = dom_element_get_attribute(node, corestring_dom_href, &atr_string);
+	if ((exc == DOM_NO_ERR) && (atr_string != NULL)) {
+		nsurl *url;
+		nserror error;
+
+		/* get url from string */
+		error = nsurl_create(dom_string_data(atr_string), &url);
+		dom_string_unref(atr_string);
+		if (error == NSERROR_OK) {
+			if (htmlc->base_url != NULL) {
+				nsurl_unref(htmlc->base_url);
+			}
+			htmlc->base_url = url;
+		}
+	}
+
+
+	/* get target attribute if present and not already set */
+	if (htmlc->base_target != NULL) {
+		return true;
+	}
+
+	exc = dom_element_get_attribute(node,
+					corestring_dom_target,
+					&atr_string);
+	if ((exc == DOM_NO_ERR) && (atr_string != NULL)) {
+		/* Validation rules from the HTML5 spec for the base element:
+		 *  The target must be one of _blank, _self, _parent, or
+		 *  _top or any identifier which does not begin with an
+		 *  underscore
+		 */
+		if (*dom_string_data(atr_string) != '_' ||
+				dom_string_caseless_lwc_isequal(atr_string,
+						corestring_lwc__blank) ||
+				dom_string_caseless_lwc_isequal(atr_string,
+						corestring_lwc__self) ||
+				dom_string_caseless_lwc_isequal(atr_string,
+						corestring_lwc__parent) ||
+				dom_string_caseless_lwc_isequal(atr_string,
+						corestring_lwc__top)) {
+			htmlc->base_target = strdup(dom_string_data(atr_string));
+		}
+		dom_string_unref(atr_string);
+	}
+
+	return true;
+}
+
+
+
+/**
+ * Process img element being inserted into the DOM.
+ *
+ * \param htmlc The html content containing the DOM
+ * \param node The DOM node being inserted
+ * \return NSERROR_OK on success else appropriate error code
+ */
+static bool html_process_inserted_img(html_content *htmlc, dom_node *node)
+{
+	dom_string *src;
+	nsurl *url;
+	nserror err;
+	dom_exception exc;
+	bool success;
+
+	/* Do nothing if foreground images are disabled */
+	if (nsoption_bool(foreground_images) == false) {
+		return true;
+	}
+
+	exc = dom_element_get_attribute(node, corestring_dom_src, &src);
+	if (exc != DOM_NO_ERR || src == NULL) {
+		return true;
+	}
+
+	err = nsurl_join(htmlc->base_url, dom_string_data(src), &url);
+	if (err != NSERROR_OK) {
+		dom_string_unref(src);
+		return false;
+	}
+	dom_string_unref(src);
+
+	/* Speculatively fetch the image */
+	success = html_fetch_object(htmlc, url, NULL, CONTENT_IMAGE, false);
+	nsurl_unref(url);
+
+	return success;
+}
+
+
+/**
+ * process a LINK element being inserted into the DOM
+ *
+ * \note only the http-equiv attribute for refresh is currently considered
+ *
+ * \param htmlc The html content containing the DOM
+ * \param n The DOM node being inserted
+ * \return NSERROR_OK on success else appropriate error code
+ */
+static bool html_process_inserted_link(html_content *c, dom_node *node)
+{
+	struct content_rfc5988_link link; /* the link added to the content */
+	dom_exception exc; /* returned by libdom functions */
+	dom_string *atr_string;
+	nserror error;
+
+	/* Handle stylesheet loading */
+	html_css_process_link(c, (dom_node *)node);
+
+	/* try Generic link handling */
+
+	memset(&link, 0, sizeof(struct content_rfc5988_link));
+
+	/* check that the relation exists - w3c spec says must be present */
+	exc = dom_element_get_attribute(node, corestring_dom_rel, &atr_string);
+	if ((exc != DOM_NO_ERR) || (atr_string == NULL)) {
+		return false;
+	}
+	/* get a lwc string containing the link relation */
+	exc = dom_string_intern(atr_string, &link.rel);
+	dom_string_unref(atr_string);
+	if (exc != DOM_NO_ERR) {
+		return false;
+	}
+
+	/* check that the href exists - w3c spec says must be present */
+	exc = dom_element_get_attribute(node, corestring_dom_href, &atr_string);
+	if ((exc != DOM_NO_ERR) || (atr_string == NULL)) {
+		lwc_string_unref(link.rel);
+		return false;
+	}
+
+	/* get nsurl */
+	error = nsurl_join(c->base_url, dom_string_data(atr_string),
+			&link.href);
+	dom_string_unref(atr_string);
+	if (error != NSERROR_OK) {
+		lwc_string_unref(link.rel);
+		return false;
+	}
+
+	/* look for optional properties -- we don't care if internment fails */
+
+	exc = dom_element_get_attribute(node,
+			corestring_dom_hreflang, &atr_string);
+	if ((exc == DOM_NO_ERR) && (atr_string != NULL)) {
+		/* get a lwc string containing the href lang */
+		(void)dom_string_intern(atr_string, &link.hreflang);
+		dom_string_unref(atr_string);
+	}
+
+	exc = dom_element_get_attribute(node,
+			corestring_dom_type, &atr_string);
+	if ((exc == DOM_NO_ERR) && (atr_string != NULL)) {
+		/* get a lwc string containing the type */
+		(void)dom_string_intern(atr_string, &link.type);
+		dom_string_unref(atr_string);
+	}
+
+	exc = dom_element_get_attribute(node,
+			corestring_dom_media, &atr_string);
+	if ((exc == DOM_NO_ERR) && (atr_string != NULL)) {
+		/* get a lwc string containing the media */
+		(void)dom_string_intern(atr_string, &link.media);
+		dom_string_unref(atr_string);
+	}
+
+	exc = dom_element_get_attribute(node,
+			corestring_dom_sizes, &atr_string);
+	if ((exc == DOM_NO_ERR) && (atr_string != NULL)) {
+		/* get a lwc string containing the sizes */
+		(void)dom_string_intern(atr_string, &link.sizes);
+		dom_string_unref(atr_string);
+	}
+
+	/* add to content */
+	content__add_rfc5988_link(&c->base, &link);
+
+	if (link.sizes != NULL)
+		lwc_string_unref(link.sizes);
+	if (link.media != NULL)
+		lwc_string_unref(link.media);
+	if (link.type != NULL)
+		lwc_string_unref(link.type);
+	if (link.hreflang != NULL)
+		lwc_string_unref(link.hreflang);
+
+	nsurl_unref(link.href);
+	lwc_string_unref(link.rel);
+
+	return true;
+}
+
+
+/* handler for a SCRIPT which has been added to a tree */
+static void
+dom_SCRIPT_showed_up(html_content *htmlc, dom_html_script_element *script)
+{
+	dom_exception exc;
+	dom_html_script_element_flags flags;
+	dom_hubbub_error res;
+	bool within;
+
+	if (!htmlc->enable_scripting) {
+		NSLOG(netsurf, INFO, "Encountered a script, but scripting is off, ignoring");
+		return;
+	}
+
+	NSLOG(netsurf, DEEPDEBUG, "Encountered a script, node %p showed up", script);
+
+	exc = dom_html_script_element_get_flags(script, &flags);
+	if (exc != DOM_NO_ERR) {
+		NSLOG(netsurf, DEEPDEBUG, "Unable to retrieve flags, giving up");
+		return;
+	}
+
+	if (flags & DOM_HTML_SCRIPT_ELEMENT_FLAG_PARSER_INSERTED) {
+		NSLOG(netsurf, DEBUG, "Script was parser inserted, skipping");
+		return;
+	}
+
+	exc = dom_node_contains(htmlc->document, script, &within);
+	if (exc != DOM_NO_ERR) {
+		NSLOG(netsurf, DEBUG, "Unable to determine if script was within document, ignoring");
+		return;
+	}
+
+	if (!within) {
+		NSLOG(netsurf, DEBUG, "Script was not within the document, ignoring for now");
+		return;
+	}
+
+	res = html_process_script(htmlc, (dom_node *) script);
+	if (res == DOM_HUBBUB_OK) {
+		NSLOG(netsurf, DEEPDEBUG, "Inserted script has finished running");
+	} else {
+		if (res == (DOM_HUBBUB_HUBBUB_ERR | HUBBUB_PAUSED)) {
+			NSLOG(netsurf, DEEPDEBUG, "Inserted script has launced asynchronously");
+		} else {
+			NSLOG(netsurf, DEEPDEBUG, "Failure starting script");
+		}
+	}
+}
+
+
+/**
+ * process a META element being inserted into the DOM
+ *
+ * \note only the http-equiv attribute for refresh is currently considered
+ *
+ * \param htmlc The html content containing the DOM
+ * \param n The DOM node being inserted
+ * \return NSERROR_OK on success else appropriate error code
+ */
+static nserror html_process_inserted_meta(html_content *c, dom_node *n)
+{
+	union content_msg_data msg_data;
+	const char *url, *end, *refresh = NULL;
+	char *new_url;
+	char quote = '\0';
+	dom_string *equiv, *content;
+	dom_exception exc;
+	nsurl *nsurl;
+	nserror error = NSERROR_OK;
+
+	if (c->refresh) {
+		/* refresh already delt with */
+		return NSERROR_OK;
+	}
+
+	exc = dom_element_get_attribute(n, corestring_dom_http_equiv, &equiv);
+	if (exc != DOM_NO_ERR) {
+		return NSERROR_DOM;
+	}
+
+	if (equiv == NULL) {
+		return NSERROR_OK;
+	}
+
+	if (!dom_string_caseless_lwc_isequal(equiv, corestring_lwc_refresh)) {
+		dom_string_unref(equiv);
+		return NSERROR_OK;
+	}
+
+	dom_string_unref(equiv);
+
+	exc = dom_element_get_attribute(n, corestring_dom_content, &content);
+	if (exc != DOM_NO_ERR) {
+		return NSERROR_DOM;
+	}
+
+	if (content == NULL) {
+		return NSERROR_OK;
+	}
+
+	end = dom_string_data(content) + dom_string_byte_length(content);
+
+	/* content  := *LWS intpart fracpart? *LWS [';' *LWS *1url *LWS]
+	 * intpart  := 1*DIGIT
+	 * fracpart := 1*('.' | DIGIT)
+	 * url      := "url" *LWS '=' *LWS (url-nq | url-sq | url-dq)
+	 * url-nq   := *urlchar
+	 * url-sq   := "'" *(urlchar | '"') "'"
+	 * url-dq   := '"' *(urlchar | "'") '"'
+	 * urlchar  := [#x9#x21#x23-#x26#x28-#x7E] | nonascii
+	 * nonascii := [#x80-#xD7FF#xE000-#xFFFD#x10000-#x10FFFF]
+	 */
+
+	url = dom_string_data(content);
+
+	/* *LWS */
+	while (url < end && ascii_is_space(*url)) {
+		url++;
+	}
+
+	/* intpart */
+	if (url == end || (*url < '0' || '9' < *url)) {
+		/* Empty content, or invalid timeval */
+		dom_string_unref(content);
+		return NSERROR_OK;
+	}
+
+	msg_data.delay = (int) strtol(url, &new_url, 10);
+	/* a very small delay and self-referencing URL can cause a loop
+	 * that grinds machines to a halt. To prevent this we set a
+	 * minimum refresh delay of 1s. */
+	if (msg_data.delay < 1) {
+		msg_data.delay = 1;
+	}
+
+	url = new_url;
+
+	/* fracpart? (ignored, as delay is integer only) */
+	while (url < end && (('0' <= *url && *url <= '9') ||
+			*url == '.')) {
+		url++;
+	}
+
+	/* *LWS */
+	while (url < end && ascii_is_space(*url)) {
+		url++;
+	}
+
+	/* ';' */
+	if (url < end && *url == ';')
+		url++;
+
+	/* *LWS */
+	while (url < end && ascii_is_space(*url)) {
+		url++;
+	}
+
+	if (url == end) {
+		/* Just delay specified, so refresh current page */
+		dom_string_unref(content);
+
+		c->base.refresh = nsurl_ref(content_get_url(&c->base));
+
+		content_broadcast(&c->base, CONTENT_MSG_REFRESH, &msg_data);
+
+		return NSERROR_OK;
+	}
+
+	/* "url" */
+	if (url <= end - 3) {
+		if (strncasecmp(url, "url", 3) == 0) {
+			url += 3;
+		} else {
+			/* Unexpected input, ignore this header */
+			dom_string_unref(content);
+			return NSERROR_OK;
+		}
+	} else {
+		/* Insufficient input, ignore this header */
+		dom_string_unref(content);
+		return NSERROR_OK;
+	}
+
+	/* *LWS */
+	while (url < end && ascii_is_space(*url)) {
+		url++;
+	}
+
+	/* '=' */
+	if (url < end) {
+		if (*url == '=') {
+			url++;
+		} else {
+			/* Unexpected input, ignore this header */
+			dom_string_unref(content);
+			return NSERROR_OK;
+		}
+	} else {
+		/* Insufficient input, ignore this header */
+		dom_string_unref(content);
+		return NSERROR_OK;
+	}
+
+	/* *LWS */
+	while (url < end && ascii_is_space(*url)) {
+		url++;
+	}
+
+	/* '"' or "'" */
+	if (url < end && (*url == '"' || *url == '\'')) {
+		quote = *url;
+		url++;
+	}
+
+	/* Start of URL */
+	refresh = url;
+
+	if (quote != 0) {
+		/* url-sq | url-dq */
+		while (url < end && *url != quote)
+			url++;
+	} else {
+		/* url-nq */
+		while (url < end && !ascii_is_space(*url))
+			url++;
+	}
+
+	/* '"' or "'" or *LWS (we don't care) */
+	if (url > refresh) {
+		/* There's a URL */
+		new_url = strndup(refresh, url - refresh);
+		if (new_url == NULL) {
+			dom_string_unref(content);
+			return NSERROR_NOMEM;
+		}
+
+		error = nsurl_join(c->base_url, new_url, &nsurl);
+		if (error == NSERROR_OK) {
+			/* broadcast valid refresh url */
+
+			c->base.refresh = nsurl;
+
+			content_broadcast(&c->base,
+					  CONTENT_MSG_REFRESH,
+					  &msg_data);
+			c->refresh = true;
+		}
+
+		free(new_url);
+
+	}
+
+	dom_string_unref(content);
+
+	return error;
+}
+
+
+/**
+ * Process title element being inserted into the DOM.
+ *
+ * https://html.spec.whatwg.org/multipage/semantics.html#the-title-element
+ *
+ * \param htmlc The html content containing the DOM
+ * \param node The DOM node being inserted
+ * \return NSERROR_OK on success else appropriate error code
+ */
+static nserror html_process_inserted_title(html_content *htmlc, dom_node *node)
+{
+	if (htmlc->title == NULL) {
+		/* only the first title is considered */
+		htmlc->title = dom_node_ref(node);
+	}
+	return NSERROR_OK;
+}
+
+
+/** process title node */
+static bool html_process_title(html_content *c, dom_node *node)
+{
+	dom_exception exc; /* returned by libdom functions */
+	dom_string *title;
+	char *title_str;
+	bool success;
+
+	exc = dom_node_get_text_content(node, &title);
+	if ((exc != DOM_NO_ERR) || (title == NULL)) {
+		return false;
+	}
+
+	title_str = squash_whitespace(dom_string_data(title));
+	dom_string_unref(title);
+
+	if (title_str == NULL) {
+		return false;
+	}
+
+	success = content__set_title(&c->base, title_str);
+
+	free(title_str);
+
+	return success;
+}
+
+
+/**
+ * Deal with input elements being modified by resyncing their gadget
+ * if they have one.
+ */
+static void html_texty_element_update(html_content *htmlc, dom_node *node)
+{
+	struct box *box = box_for_node(node);
+	if (box == NULL) {
+		return; /* No Box (yet?) so no gadget to update */
+	}
+	if (box->gadget == NULL) {
+		return; /* No gadget yet (under construction perhaps?) */
+	}
+	form_gadget_sync_with_dom(box->gadget);
+	/* And schedule a redraw for the box */
+	html__redraw_a_box(htmlc, box);
+}
+
+
+/**
+ * callback for DOMNodeInserted end type
+ */
+static void
+dom_default_action_DOMNodeInserted_cb(struct dom_event *evt, void *pw)
+{
+	dom_event_target *node;
+	dom_node_type type;
+	dom_exception exc;
+	html_content *htmlc = pw;
+
+	exc = dom_event_get_target(evt, &node);
+	if ((exc != DOM_NO_ERR) || (node == NULL)) {
+		/* failed to obtain the event target node */
+		return;
+	}
+
+	exc = dom_node_get_node_type(node, &type);
+	if ((exc == DOM_NO_ERR) && (type == DOM_ELEMENT_NODE)) {
+		/* an element node has been inserted */
+		dom_html_element_type tag_type;
+
+		exc = dom_html_element_get_tag_type(node, &tag_type);
+		if (exc != DOM_NO_ERR) {
+			tag_type = DOM_HTML_ELEMENT_TYPE__UNKNOWN;
+		}
+
+		switch (tag_type) {
+		case DOM_HTML_ELEMENT_TYPE_BASE:
+			html_process_inserted_base(htmlc, (dom_node *)node);
+			break;
+
+		case DOM_HTML_ELEMENT_TYPE_IMG:
+			html_process_inserted_img(htmlc, (dom_node *)node);
+			break;
+
+		case DOM_HTML_ELEMENT_TYPE_LINK:
+			html_process_inserted_link(htmlc, (dom_node *)node);
+			break;
+
+		case DOM_HTML_ELEMENT_TYPE_META:
+			html_process_inserted_meta(htmlc, (dom_node *)node);
+			break;
+
+		case DOM_HTML_ELEMENT_TYPE_STYLE:
+			if (nsoption_bool(author_level_css)) {
+				html_css_process_style(htmlc, (dom_node *)node);
+			}
+			break;
+
+		case DOM_HTML_ELEMENT_TYPE_SCRIPT:
+			dom_SCRIPT_showed_up(htmlc,
+					     (dom_html_script_element *)node);
+			break;
+
+		case DOM_HTML_ELEMENT_TYPE_TITLE:
+			html_process_inserted_title(htmlc, (dom_node *)node);
+			break;
+
+		default:
+			break;
+		}
+
+		if (htmlc->enable_scripting) {
+			/* ensure javascript context is available */
+			if (htmlc->jsthread == NULL) {
+				union content_msg_data msg_data;
+
+				msg_data.jsthread = &htmlc->jsthread;
+				content_broadcast(&htmlc->base,
+						  CONTENT_MSG_GETTHREAD,
+						  &msg_data);
+				NSLOG(netsurf, INFO,
+				      "javascript context: %p (htmlc: %p)",
+				      htmlc->jsthread,
+				      htmlc);
+			}
+			if (htmlc->jsthread != NULL) {
+				js_handle_new_element(htmlc->jsthread,
+						      (dom_element *) node);
+			}
+		}
+	}
+	dom_node_unref(node);
+}
+
+
+/**
+ * callback for DOMNodeInsertedIntoDocument end type
+ */
+static void
+dom_default_action_DOMNodeInsertedIntoDocument_cb(struct dom_event *evt,
+						  void *pw)
+{
+	html_content *htmlc = pw;
+	dom_event_target *node;
+	dom_node_type type;
+	dom_exception exc;
+
+	exc = dom_event_get_target(evt, &node);
+	if ((exc == DOM_NO_ERR) && (node != NULL)) {
+		exc = dom_node_get_node_type(node, &type);
+		if ((exc == DOM_NO_ERR) && (type == DOM_ELEMENT_NODE)) {
+			/* an element node has been modified */
+			dom_html_element_type tag_type;
+
+			exc = dom_html_element_get_tag_type(node, &tag_type);
+			if (exc != DOM_NO_ERR) {
+				tag_type = DOM_HTML_ELEMENT_TYPE__UNKNOWN;
+			}
+
+			switch (tag_type) {
+			case DOM_HTML_ELEMENT_TYPE_SCRIPT:
+				dom_SCRIPT_showed_up(htmlc, (dom_html_script_element *) node);
+				fallthrough;
+			default:
+				break;
+			}
+		}
+		dom_node_unref(node);
+	}
+}
+
+
+/**
+ * callback for DOMSubtreeModified end type
+ */
+static void
+dom_default_action_DOMSubtreeModified_cb(struct dom_event *evt, void *pw)
+{
+	dom_event_target *node;
+	dom_node_type type;
+	dom_exception exc;
+	html_content *htmlc = pw;
+
+	exc = dom_event_get_target(evt, &node);
+	if ((exc == DOM_NO_ERR) && (node != NULL)) {
+		if (htmlc->title == (dom_node *)node) {
+			/* Node is our title node */
+			html_process_title(htmlc, (dom_node *)node);
+			dom_node_unref(node);
+			return;
+		}
+
+		exc = dom_node_get_node_type(node, &type);
+		if ((exc == DOM_NO_ERR) && (type == DOM_ELEMENT_NODE)) {
+			/* an element node has been modified */
+			dom_html_element_type tag_type;
+
+			exc = dom_html_element_get_tag_type(node, &tag_type);
+			if (exc != DOM_NO_ERR) {
+				tag_type = DOM_HTML_ELEMENT_TYPE__UNKNOWN;
+			}
+
+			switch (tag_type) {
+			case DOM_HTML_ELEMENT_TYPE_STYLE:
+				if (nsoption_bool(author_level_css)) {
+					html_css_update_style(htmlc,
+							(dom_node *)node);
+				}
+				break;
+			case DOM_HTML_ELEMENT_TYPE_TEXTAREA:
+			case DOM_HTML_ELEMENT_TYPE_INPUT:
+				html_texty_element_update(htmlc, (dom_node *)node);
+				fallthrough;
+			default:
+				break;
+			}
+		}
+		dom_node_unref(node);
+	}
+}
+
+
+/**
+ * callback for default action finished
+ */
+static void
+dom_default_action_finished_cb(struct dom_event *evt, void *pw)
+{
+	html_content *htmlc = pw;
+
+	if (htmlc->jsthread != NULL)
+		js_event_cleanup(htmlc->jsthread, evt);
+}
+
+
+/* exported interface documented in html/dom_event.c */
+dom_default_action_callback
+html_dom_event_fetcher(dom_string *type,
+		  dom_default_action_phase phase,
+		  void **pw)
+{
+	NSLOG(netsurf, DEEPDEBUG,
+	      "phase:%d type:%s", phase, dom_string_data(type));
+
+	if (phase == DOM_DEFAULT_ACTION_END) {
+		if (dom_string_isequal(type, corestring_dom_DOMNodeInserted)) {
+			return dom_default_action_DOMNodeInserted_cb;
+		} else if (dom_string_isequal(type, corestring_dom_DOMNodeInsertedIntoDocument)) {
+			return dom_default_action_DOMNodeInsertedIntoDocument_cb;
+		} else if (dom_string_isequal(type, corestring_dom_DOMSubtreeModified)) {
+			return dom_default_action_DOMSubtreeModified_cb;
+		}
+	} else if (phase == DOM_DEFAULT_ACTION_FINISHED) {
+		return dom_default_action_finished_cb;
+	}
+	return NULL;
+}
diff --git a/content/handlers/html/dom_event.h b/content/handlers/html/dom_event.h
new file mode 100644
index 000000000..dec828df7
--- /dev/null
+++ b/content/handlers/html/dom_event.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * HTML content DOM event handling interface
+ */
+
+#ifndef NETSURF_HTML_DOM_EVENT_H
+#define NETSURF_HTML_DOM_EVENT_H
+
+/**
+ * html content DOM action callback function selector
+ *
+ * selects a callback function for libdom to call based on the type and phase.
+ * dom_default_action_phase from events/document_event.h
+ *
+ * The principle events are:
+ *   DOMSubtreeModified
+ *   DOMAttrModified
+ *   DOMNodeInserted
+ *   DOMNodeInsertedIntoDocument
+ *
+ * @return callback function pointer or NULL for none
+ */
+dom_default_action_callback html_dom_event_fetcher(dom_string *type, dom_default_action_phase phase, void **pw);
+
+#endif
diff --git a/content/handlers/html/font.c b/content/handlers/html/font.c
index 7ebe16825..4a64759d7 100644
--- a/content/handlers/html/font.c
+++ b/content/handlers/html/font.c
@@ -133,7 +133,7 @@ static plot_font_flags_t plot_font_flags(enum css_font_style_e style,
 
 /* exported function documented in html/font.h */
 void font_plot_style_from_css(
-		const nscss_len_ctx *len_ctx,
+		const css_unit_ctx *unit_len_ctx,
 		const css_computed_style *css,
 		plot_font_style_t *fstyle)
 {
@@ -147,7 +147,8 @@ void font_plot_style_from_css(
 	fstyle->families = families;
 
 	css_computed_font_size(css, &length, &unit);
-	fstyle->size = FIXTOINT(FMUL(nscss_len2pt(len_ctx, length, unit),
+	fstyle->size = FIXTOINT(FMUL(css_unit_font_size_len2pt(css,
+				      unit_len_ctx, length, unit),
 				      INTTOFIX(PLOT_STYLE_SCALE)));
 
 	/* Clamp font size to configured minimum */
diff --git a/content/handlers/html/font.h b/content/handlers/html/font.h
index 5f69ee7d3..26f5bf289 100644
--- a/content/handlers/html/font.h
+++ b/content/handlers/html/font.h
@@ -32,11 +32,11 @@ struct plot_font_style;
 /**
  * Populate a font style using data from a computed CSS style
  *
- * \param len_ctx  Length conversion context
+ * \param unit_len_ctx  Length conversion context
  * \param css      Computed style to consider
  * \param fstyle   Font style to populate
  */
-void font_plot_style_from_css(const nscss_len_ctx *len_ctx,
+void font_plot_style_from_css(const css_unit_ctx *unit_len_ctx,
 			      const css_computed_style *css,
 			      struct plot_font_style *fstyle);
 
diff --git a/content/handlers/html/form.c b/content/handlers/html/form.c
index 3d787e762..9b6768a56 100644
--- a/content/handlers/html/form.c
+++ b/content/handlers/html/form.c
@@ -41,6 +41,7 @@
 #include "utils/utf8.h"
 #include "utils/ascii.h"
 #include "netsurf/browser_window.h"
+#include "netsurf/inttypes.h"
 #include "netsurf/mouse.h"
 #include "netsurf/plotters.h"
 #include "netsurf/misc.h"
@@ -50,14 +51,14 @@
 #include "desktop/knockout.h"
 #include "desktop/scrollbar.h"
 #include "desktop/textarea.h"
-#include "desktop/gui_internal.h"
 
+#include "html/html.h"
+#include "html/private.h"
+#include "html/layout.h"
 #include "html/box.h"
+#include "html/box_inspect.h"
 #include "html/font.h"
 #include "html/form_internal.h"
-#include "html/html.h"
-#include "html/html_internal.h"
-#include "html/layout.h"
 
 #define MAX_SELECT_HEIGHT 210
 #define SELECT_LINE_SPACING 0.2
@@ -88,247 +89,82 @@ static plot_font_style_t plot_fstyle_entry = {
 	.foreground = 0x000000,
 };
 
-static char *form_acceptable_charset(struct form *form);
-static char *form_encode_item(const char *item, uint32_t len, const char *charset,
-		const char *fallback);
-static void form_select_menu_clicked(struct form_control *control,
-		int x, int y);
-static void form_select_menu_scroll_callback(void *client_data,
-		struct scrollbar_msg_data *scrollbar_data);
-
-/* exported interface documented in html/form_internal.h */
-struct form *form_new(void *node, const char *action, const char *target,
-		form_method method, const char *charset,
-		const char *doc_charset)
-{
-	struct form *form;
-
-	form = calloc(1, sizeof *form);
-	if (!form)
-		return NULL;
-
-	form->action = strdup(action != NULL ? action : "");
-	if (form->action == NULL) {
-		free(form);
-		return NULL;
-	}
-
-	form->target = target != NULL ? strdup(target) : NULL;
-	if (target != NULL && form->target == NULL) {
-		free(form->action);
-		free(form);
-		return NULL;
-	}
-
-	form->method = method;
-
-	form->accept_charsets = charset != NULL ? strdup(charset) : NULL;
-	if (charset != NULL && form->accept_charsets == NULL) {
-		free(form->target);
-		free(form->action);
-		free(form);
-		return NULL;
-	}
-
-	form->document_charset = doc_charset != NULL ? strdup(doc_charset)
-						     : NULL;
-	if (doc_charset && form->document_charset == NULL) {
-		free(form->accept_charsets);
-		free(form->target);
-		free(form->action);
-		free(form);
-		return NULL;
-	}
-
-	form->node = node;
-
-	return form;
-}
-
-
-/* exported interface documented in html/form_internal.h */
-void form_free(struct form *form)
-{
-	struct form_control *c, *d;
-
-	for (c = form->controls; c != NULL; c = d) {
-		d = c->next;
-
-		form_free_control(c);
-	}
-
-	free(form->action);
-	free(form->target);
-	free(form->accept_charsets);
-	free(form->document_charset);
-
-	free(form);
-}
-
-/* exported interface documented in html/form_internal.h */
-struct form_control *form_new_control(void *node, form_control_type type)
-{
-	struct form_control *control;
-
-	control = calloc(1, sizeof *control);
-	if (control == NULL)
-		return NULL;
-
-	control->node = node;
-	control->type = type;
-
-	return control;
-}
-
 
 /**
- * Add a control to the list of controls in a form.
+ * Convert a string from UTF-8 to the specified charset
+ * As a final fallback, this will attempt to convert to ISO-8859-1.
  *
- * \param form  The form to add the control to
- * \param control  The control to add
- */
-void form_add_control(struct form *form, struct form_control *control)
-{
-	if (form == NULL) {
-		return;
-	}
-
-	control->form = form;
-
-	if (form->controls != NULL) {
-		assert(form->last_control);
-
-		form->last_control->next = control;
-		control->prev = form->last_control;
-		control->next = NULL;
-		form->last_control = control;
-	} else {
-		form->controls = form->last_control = control;
-	}
-}
-
-
-/**
- * Free a struct form_control.
+ * \todo Return charset used?
  *
- * \param  control  structure to free
+ * \param item String to convert
+ * \param len Length of string to convert
+ * \param charset Destination charset
+ * \param fallback Fallback charset (may be NULL),
+ *                 used iff converting to charset fails
+ * \return Pointer to converted string (on heap, caller frees), or NULL
  */
-void form_free_control(struct form_control *control)
+static char *
+form_encode_item(const char *item,
+		 uint32_t len,
+		 const char *charset,
+		 const char *fallback)
 {
-	struct form_control *c;
-	assert(control != NULL);
-
-	NSLOG(netsurf, INFO, "Control:%p name:%p value:%p initial:%p",
-	      control, control->name, control->value, control->initial_value);
-	free(control->name);
-	free(control->value);
-	free(control->initial_value);
-
-	if (control->type == GADGET_SELECT) {
-		struct form_option *option, *next;
+	nserror err;
+	char *ret = NULL;
+	char cset[256];
 
-		for (option = control->data.select.items; option;
-				option = next) {
-			next = option->next;
-			NSLOG(netsurf, INFO,
-			      "select option:%p text:%p value:%p", option,
-			      option->text, option->value);
-			free(option->text);
-			free(option->value);
-			free(option);
-		}
-		if (control->data.select.menu != NULL) {
-			form_free_select_menu(control);
-		}
-	}
+	if (!item || !charset)
+		return NULL;
 
-	if (control->type == GADGET_TEXTAREA ||
-			control->type == GADGET_TEXTBOX ||
-			control->type == GADGET_PASSWORD) {
+	snprintf(cset, sizeof cset, "%s//TRANSLIT", charset);
 
-		if (control->data.text.initial != NULL) {
-			dom_string_unref(control->data.text.initial);
-		}
+	err = utf8_to_enc(item, cset, 0, &ret);
+	if (err == NSERROR_BAD_ENCODING) {
+		/* charset not understood, try without transliteration */
+		snprintf(cset, sizeof cset, "%s", charset);
+		err = utf8_to_enc(item, cset, len, &ret);
 
-		if (control->data.text.ta != NULL) {
-			textarea_destroy(control->data.text.ta);
-		}
-	}
+		if (err == NSERROR_BAD_ENCODING) {
+			/* nope, try fallback charset (if any) */
+			if (fallback) {
+				snprintf(cset, sizeof cset,
+						"%s//TRANSLIT", fallback);
+				err = utf8_to_enc(item, cset, 0, &ret);
 
-	/* unlink the control from the form */
-	if (control->form != NULL) {
-		for (c = control->form->controls; c != NULL; c = c->next) {
-			if (c->next == control) {
-				c->next = control->next;
-				if (control->form->last_control == control)
-					control->form->last_control = c;
-				break;
+				if (err == NSERROR_BAD_ENCODING) {
+					/* and without transliteration */
+					snprintf(cset, sizeof cset,
+							"%s", fallback);
+					err = utf8_to_enc(item, cset, 0, &ret);
+				}
 			}
-			if (c == control) {
-				/* can only happen if control was first control */
-				control->form->controls = control->next;
-				if (control->form->last_control == control)
-					control->form->controls =
-						control->form->last_control = NULL;
-				break;
+
+			if (err == NSERROR_BAD_ENCODING) {
+				/* that also failed, use 8859-1 */
+				err = utf8_to_enc(item, "ISO-8859-1//TRANSLIT",
+						0, &ret);
+				if (err == NSERROR_BAD_ENCODING) {
+					/* and without transliteration */
+					err = utf8_to_enc(item, "ISO-8859-1",
+							0, &ret);
+				}
 			}
 		}
 	}
+	if (err == NSERROR_NOMEM) {
+		return NULL;
+	}
 
-	free(control);
+	return ret;
 }
 
 
 /**
- * Add an option to a form select control.
- *
- * \param  control   form control of type GADGET_SELECT
- * \param  value     value of option, used directly (not copied)
- * \param  text      text for option, used directly (not copied)
- * \param  selected  this option is selected
- * \param  node      the DOM node this option is associated with
- * \return  true on success, false on memory exhaustion
+ * string allocation size for numeric values in multipart data
  */
-bool form_add_option(struct form_control *control, char *value, char *text,
-		     bool selected, void *node)
-{
-	struct form_option *option;
-
-	assert(control);
-	assert(control->type == GADGET_SELECT);
-
-	option = calloc(1, sizeof *option);
-	if (!option)
-		return false;
-
-	option->value = value;
-	option->text = text;
-
-	/* add to linked list */
-	if (control->data.select.items == 0)
-		control->data.select.items = option;
-	else
-		control->data.select.last_item->next = option;
-	control->data.select.last_item = option;
-
-	/* set selected */
-	if (selected && (control->data.select.num_selected == 0 ||
-			control->data.select.multiple)) {
-		option->selected = option->initial_selected = true;
-		control->data.select.num_selected++;
-		control->data.select.current = option;
-	}
-
-	control->data.select.num_items++;
-
-	option->node = node;
-
-	return true;
-}
-
-/** string allocation size for numeric values in multipart data */
 #define FETCH_DATA_INT_VALUE_SIZE 20
 
+
 /**
  * append split key name and integer value to a multipart data list
  *
@@ -456,6 +292,7 @@ fetch_data_list_add(dom_string *name,
 	return NSERROR_OK;
 }
 
+
 /**
  * process form HTMLTextAreaElement into multipart data.
  *
@@ -529,6 +366,7 @@ form_dom_to_data_textarea(dom_html_text_area_element *text_area_element,
 	return res;
 }
 
+
 static nserror
 form_dom_to_data_select_option(dom_html_option_element *option_element,
 			      dom_string *keyname,
@@ -571,6 +409,7 @@ form_dom_to_data_select_option(dom_html_option_element *option_element,
 	return res;
 }
 
+
 /**
  * process form HTMLSelectElement into multipart data.
  *
@@ -648,7 +487,7 @@ form_dom_to_data_select(dom_html_select_element *select_element,
 						       &option_element);
 		if (exp != DOM_NO_ERR) {
 			NSLOG(netsurf, INFO,
-			      "Could not get options item %d", option_index);
+			      "Could not get options item %"PRId32, option_index);
 			res = NSERROR_DOM;
 		} else {
 			res = form_dom_to_data_select_option(
@@ -672,6 +511,7 @@ form_dom_to_data_select(dom_html_select_element *select_element,
 	return res;
 }
 
+
 static nserror
 form_dom_to_data_input_submit(dom_html_input_element *input_element,
 			      dom_string *inputname,
@@ -712,7 +552,6 @@ form_dom_to_data_input_submit(dom_html_input_element *input_element,
 }
 
 
-
 static nserror
 form_dom_to_data_input_image(dom_html_input_element *input_element,
 			     dom_string *inputname,
@@ -769,6 +608,7 @@ form_dom_to_data_input_image(dom_html_input_element *input_element,
 	return res;
 }
 
+
 static nserror
 form_dom_to_data_input_checkbox(dom_html_input_element *input_element,
 				dom_string *inputname,
@@ -818,6 +658,7 @@ form_dom_to_data_input_checkbox(dom_html_input_element *input_element,
 	return res;
 }
 
+
 static nserror
 form_dom_to_data_input_file(dom_html_input_element *input_element,
 			    dom_string *inputname,
@@ -861,6 +702,7 @@ form_dom_to_data_input_file(dom_html_input_element *input_element,
 	return res;
 }
 
+
 static nserror
 form_dom_to_data_input_text(dom_html_input_element *input_element,
 			    dom_string *inputname,
@@ -891,6 +733,7 @@ form_dom_to_data_input_text(dom_html_input_element *input_element,
 	return res;
 }
 
+
 /**
  * process form input element into multipart data.
  *
@@ -1015,6 +858,7 @@ form_dom_to_data_input(dom_html_input_element *input_element,
 	return res;
 }
 
+
 /**
  * process form HTMLButtonElement into multipart data.
  *
@@ -1124,6 +968,68 @@ form_dom_to_data_button(dom_html_button_element *button_element,
 
 
 /**
+ * Find an acceptable character set encoding with which to submit the form
+ *
+ * \param form  The form
+ * \return Pointer to charset name (on heap, caller should free) or NULL
+ */
+static char *form_acceptable_charset(struct form *form)
+{
+	char *temp, *c;
+
+	if (!form->accept_charsets) {
+		/* no accept-charsets attribute for this form */
+		if (form->document_charset) {
+			/* document charset present, so use it */
+			return strdup(form->document_charset);
+		} else {
+			/* no document charset, so default to 8859-1 */
+			return strdup("ISO-8859-1");
+		}
+	}
+
+	/* make temporary copy of accept-charsets attribute */
+	temp = strdup(form->accept_charsets);
+	if (!temp)
+		return NULL;
+
+	/* make it upper case */
+	for (c = temp; *c; c++) {
+		*c = ascii_to_upper(*c);
+	}
+
+	/* is UTF-8 specified? */
+	c = strstr(temp, "UTF-8");
+	if (c) {
+		free(temp);
+		return strdup("UTF-8");
+	}
+
+	/* dispense with temporary copy */
+	free(temp);
+
+	/* according to RFC2070, the accept-charsets attribute of the
+	 * form element contains a space and/or comma separated list */
+	c = form->accept_charsets;
+
+	/** \todo an improvement would be to choose an encoding
+	 * acceptable to the server which covers as much of the input
+	 * values as possible. Additionally, we need to handle the
+	 * case where none of the acceptable encodings cover all the
+	 * textual input values.  For now, we just extract the first
+	 * element of the charset list
+	 */
+	while (*c && !ascii_is_space(*c)) {
+		if (*c == ',')
+			break;
+		c++;
+	}
+
+	return strndup(form->accept_charsets, c - form->accept_charsets);
+}
+
+
+/**
  * Construct multipart data list from 'successful' controls via the DOM.
  *
  * All text strings in the successful controls list will be in the charset most
@@ -1195,7 +1101,7 @@ form_dom_to_data(struct form *form,
 		exp = dom_html_collection_item(elements, element_idx, &element);
 		if (exp != DOM_NO_ERR) {
 			NSLOG(netsurf, INFO,
-			      "retrieving form element %d failed with %d",
+			      "retrieving form element %"PRIu32" failed with %d",
 			      element_idx, exp);
 			res = NSERROR_DOM;
 			goto form_dom_to_data_error;
@@ -1205,7 +1111,7 @@ form_dom_to_data(struct form *form,
 		exp = dom_node_get_node_name(element, &nodename);
 		if (exp != DOM_NO_ERR) {
 			NSLOG(netsurf, INFO,
-			      "getting element node name %d failed with %d",
+			      "getting element node name %"PRIu32" failed with %d",
 			      element_idx, exp);
 			dom_node_unref(element);
 			res = NSERROR_DOM;
@@ -1349,140 +1255,321 @@ form_url_encode(struct form *form,
 	return NSERROR_OK;
 }
 
+
 /**
- * Find an acceptable character set encoding with which to submit the form
- *
- * \param form  The form
- * \return Pointer to charset name (on heap, caller should free) or NULL
+ * Callback for the select menus scroll
  */
-char *form_acceptable_charset(struct form *form)
+static void
+form_select_menu_scroll_callback(void *client_data,
+				 struct scrollbar_msg_data *scrollbar_data)
 {
-	char *temp, *c;
+	struct form_control *control = client_data;
+	struct form_select_menu *menu = control->data.select.menu;
+	html_content *html = (html_content *)menu->c;
 
-	if (!form->accept_charsets) {
-		/* no accept-charsets attribute for this form */
-		if (form->document_charset) {
-			/* document charset present, so use it */
-			return strdup(form->document_charset);
-		} else {
-			/* no document charset, so default to 8859-1 */
-			return strdup("ISO-8859-1");
+	switch (scrollbar_data->msg) {
+		case SCROLLBAR_MSG_MOVED:
+			menu->callback(menu->client_data,
+					0, 0,
+					menu->width,
+					menu->height);
+			break;
+		case SCROLLBAR_MSG_SCROLL_START:
+		{
+			struct rect rect = {
+				.x0 = scrollbar_data->x0,
+				.y0 = scrollbar_data->y0,
+				.x1 = scrollbar_data->x1,
+				.y1 = scrollbar_data->y1
+			};
+
+			browser_window_set_drag_type(html->bw,
+					DRAGGING_CONTENT_SCROLLBAR, &rect);
+
+			menu->scroll_capture = true;
 		}
+			break;
+		case SCROLLBAR_MSG_SCROLL_FINISHED:
+			menu->scroll_capture = false;
+
+			browser_window_set_drag_type(html->bw,
+					DRAGGING_NONE, NULL);
+			break;
+		default:
+			break;
 	}
+}
 
-	/* make temporary copy of accept-charsets attribute */
-	temp = strdup(form->accept_charsets);
-	if (!temp)
-		return NULL;
 
-	/* make it upper case */
-	for (c = temp; *c; c++) {
-		*c = ascii_to_upper(*c);
-	}
+/**
+ * Process a selection from a form select menu.
+ *
+ * \param  html The html content handle for the form
+ * \param  control  form control with menu
+ * \param  item	    index of item selected from the menu
+ * \return NSERROR_OK or appropriate error code.
+ */
+static nserror
+form__select_process_selection(html_content *html,
+			       struct form_control *control,
+			       int item)
+{
+	struct box *inline_box;
+	struct form_option *o;
+	int count;
+	nserror ret = NSERROR_OK;
 
-	/* is UTF-8 specified? */
-	c = strstr(temp, "UTF-8");
-	if (c) {
-		free(temp);
-		return strdup("UTF-8");
+	assert(control != NULL);
+	assert(html != NULL);
+
+	/**
+	 * \todo Even though the form code is effectively part of the html
+	 *        content handler, poking around inside contents is not good
+	 */
+
+	inline_box = control->box->children->children;
+
+	for (count = 0, o = control->data.select.items;
+			o != NULL;
+			count++, o = o->next) {
+		if (!control->data.select.multiple && o->selected) {
+			o->selected = false;
+			dom_html_option_element_set_selected(o->node, false);
+		}
+
+		if (count == item) {
+			if (control->data.select.multiple) {
+				if (o->selected) {
+					o->selected = false;
+					dom_html_option_element_set_selected(
+							o->node, false);
+					control->data.select.num_selected--;
+				} else {
+					o->selected = true;
+					dom_html_option_element_set_selected(
+							o->node, true);
+					control->data.select.num_selected++;
+				}
+			} else {
+				dom_html_option_element_set_selected(
+						o->node, true);
+				o->selected = true;
+			}
+		}
+
+		if (o->selected) {
+			control->data.select.current = o;
+		}
 	}
 
-	/* dispense with temporary copy */
-	free(temp);
+	talloc_free(inline_box->text);
+	inline_box->text = 0;
 
-	/* according to RFC2070, the accept-charsets attribute of the
-	 * form element contains a space and/or comma separated list */
-	c = form->accept_charsets;
+	if (control->data.select.num_selected == 0) {
+		inline_box->text = talloc_strdup(html->bctx,
+				messages_get("Form_None"));
+	} else if (control->data.select.num_selected == 1) {
+		inline_box->text = talloc_strdup(html->bctx,
+				control->data.select.current->text);
+	} else {
+		inline_box->text = talloc_strdup(html->bctx,
+				messages_get("Form_Many"));
+	}
 
-	/** \todo an improvement would be to choose an encoding
-	 * acceptable to the server which covers as much of the input
-	 * values as possible. Additionally, we need to handle the
-	 * case where none of the acceptable encodings cover all the
-	 * textual input values.  For now, we just extract the first
-	 * element of the charset list
-	 */
-	while (*c && !ascii_is_space(*c)) {
-		if (*c == ',')
-			break;
-		c++;
+	if (!inline_box->text) {
+		ret = NSERROR_NOMEM;
+		inline_box->length = 0;
+	} else {
+		inline_box->length = strlen(inline_box->text);
 	}
+	inline_box->width = control->box->width;
 
-	return strndup(form->accept_charsets, c - form->accept_charsets);
+	html__redraw_a_box(html, control->box);
+
+	return ret;
 }
 
+
 /**
- * Convert a string from UTF-8 to the specified charset
- * As a final fallback, this will attempt to convert to ISO-8859-1.
- *
- * \todo Return charset used?
+ * Handle a click on the area of the currently opened select menu.
  *
- * \param item String to convert
- * \param len Length of string to convert
- * \param charset Destination charset
- * \param fallback Fallback charset (may be NULL),
- *                 used iff converting to charset fails
- * \return Pointer to converted string (on heap, caller frees), or NULL
+ * \param control the select menu which received the click
+ * \param x X coordinate of click
+ * \param y Y coordinate of click
  */
-char *
-form_encode_item(const char *item,
-		 uint32_t len,
-		 const char *charset,
-		 const char *fallback)
+static void form_select_menu_clicked(struct form_control *control, int x, int y)
 {
-	nserror err;
-	char *ret = NULL;
-	char cset[256];
+	struct form_select_menu *menu = control->data.select.menu;
+	struct form_option *option;
+	html_content *html = (html_content *)menu->c;
+	int line_height, line_height_with_spacing;
+	int item_bottom_y;
+	int scroll, i;
 
-	if (!item || !charset)
-		return NULL;
+	scroll = scrollbar_get_offset(menu->scrollbar);
 
-	snprintf(cset, sizeof cset, "%s//TRANSLIT", charset);
+	line_height = menu->line_height;
+	line_height_with_spacing = line_height +
+			line_height * SELECT_LINE_SPACING;
 
-	err = utf8_to_enc(item, cset, 0, &ret);
-	if (err == NSERROR_BAD_ENCODING) {
-		/* charset not understood, try without transliteration */
-		snprintf(cset, sizeof cset, "%s", charset);
-		err = utf8_to_enc(item, cset, len, &ret);
+	option = control->data.select.items;
+	item_bottom_y = line_height_with_spacing;
+	i = 0;
+	while (option && item_bottom_y < scroll + y) {
+		item_bottom_y += line_height_with_spacing;
+		option = option->next;
+		i++;
+	}
 
-		if (err == NSERROR_BAD_ENCODING) {
-			/* nope, try fallback charset (if any) */
-			if (fallback) {
-				snprintf(cset, sizeof cset,
-						"%s//TRANSLIT", fallback);
-				err = utf8_to_enc(item, cset, 0, &ret);
+	if (option != NULL) {
+		form__select_process_selection(html, control, i);
+	}
 
-				if (err == NSERROR_BAD_ENCODING) {
-					/* and without transliteration */
-					snprintf(cset, sizeof cset,
-							"%s", fallback);
-					err = utf8_to_enc(item, cset, 0, &ret);
-				}
-			}
+	menu->callback(menu->client_data, 0, 0, menu->width, menu->height);
+}
 
-			if (err == NSERROR_BAD_ENCODING) {
-				/* that also failed, use 8859-1 */
-				err = utf8_to_enc(item, "ISO-8859-1//TRANSLIT",
-						0, &ret);
-				if (err == NSERROR_BAD_ENCODING) {
-					/* and without transliteration */
-					err = utf8_to_enc(item, "ISO-8859-1",
-							0, &ret);
-				}
+
+/* exported interface documented in html/form_internal.h */
+void form_add_control(struct form *form, struct form_control *control)
+{
+	if (form == NULL) {
+		return;
+	}
+
+	control->form = form;
+
+	if (form->controls != NULL) {
+		assert(form->last_control);
+
+		form->last_control->next = control;
+		control->prev = form->last_control;
+		control->next = NULL;
+		form->last_control = control;
+	} else {
+		form->controls = form->last_control = control;
+	}
+}
+
+
+/* exported interface documented in html/form_internal.h */
+void form_free_control(struct form_control *control)
+{
+	struct form_control *c;
+	assert(control != NULL);
+
+	NSLOG(netsurf, INFO, "Control:%p name:%p value:%p initial:%p",
+	      control, control->name, control->value, control->initial_value);
+	free(control->name);
+	free(control->value);
+	free(control->initial_value);
+	if (control->last_synced_value != NULL) {
+		free(control->last_synced_value);
+	}
+
+	if (control->type == GADGET_SELECT) {
+		struct form_option *option, *next;
+
+		for (option = control->data.select.items; option;
+				option = next) {
+			next = option->next;
+			NSLOG(netsurf, INFO,
+			      "select option:%p text:%p value:%p", option,
+			      option->text, option->value);
+			free(option->text);
+			free(option->value);
+			free(option);
+		}
+		if (control->data.select.menu != NULL) {
+			form_free_select_menu(control);
+		}
+	}
+
+	if (control->type == GADGET_TEXTAREA ||
+			control->type == GADGET_TEXTBOX ||
+			control->type == GADGET_PASSWORD) {
+
+		if (control->data.text.initial != NULL) {
+			dom_string_unref(control->data.text.initial);
+		}
+
+		if (control->data.text.ta != NULL) {
+			textarea_destroy(control->data.text.ta);
+		}
+	}
+
+	/* unlink the control from the form */
+	if (control->form != NULL) {
+		for (c = control->form->controls; c != NULL; c = c->next) {
+			if (c->next == control) {
+				c->next = control->next;
+				if (control->form->last_control == control)
+					control->form->last_control = c;
+				break;
+			}
+			if (c == control) {
+				/* can only happen if control was first control */
+				control->form->controls = control->next;
+				if (control->form->last_control == control)
+					control->form->controls =
+						control->form->last_control = NULL;
+				break;
 			}
 		}
 	}
-	if (err == NSERROR_NOMEM) {
-		return NULL;
+
+	if (control->node_value != NULL) {
+		dom_string_unref(control->node_value);
 	}
 
-	return ret;
+	free(control);
+}
+
+
+/* exported interface documented in html/form_internal.h */
+bool form_add_option(struct form_control *control, char *value, char *text,
+		     bool selected, void *node)
+{
+	struct form_option *option;
+
+	assert(control);
+	assert(control->type == GADGET_SELECT);
+
+	option = calloc(1, sizeof *option);
+	if (!option)
+		return false;
+
+	option->value = value;
+	option->text = text;
+
+	/* add to linked list */
+	if (control->data.select.items == 0)
+		control->data.select.items = option;
+	else
+		control->data.select.last_item->next = option;
+	control->data.select.last_item = option;
+
+	/* set selected */
+	if (selected && (control->data.select.num_selected == 0 ||
+			control->data.select.multiple)) {
+		option->selected = option->initial_selected = true;
+		control->data.select.num_selected++;
+		control->data.select.current = option;
+	}
+
+	control->data.select.num_items++;
+
+	option->node = node;
+
+	return true;
 }
 
+
 /* exported interface documented in html/form_internal.h */
-bool form_open_select_menu(void *client_data,
-		struct form_control *control,
-		select_menu_redraw_callback callback,
-		struct content *c)
+nserror
+form_open_select_menu(void *client_data,
+		      struct form_control *control,
+		      select_menu_redraw_callback callback,
+		      struct content *c)
 {
 	int line_height_with_spacing;
 	struct box *box;
@@ -1490,15 +1577,14 @@ bool form_open_select_menu(void *client_data,
 	int total_height;
 	struct form_select_menu *menu;
 	html_content *html = (html_content *)c;
-
+	nserror res;
 
 	/* if the menu is opened for the first time */
 	if (control->data.select.menu == NULL) {
 
 		menu = calloc(1, sizeof (struct form_select_menu));
 		if (menu == NULL) {
-			guit->misc->warning("NoMemory", 0);
-			return false;
+			return NSERROR_NOMEM;
 		}
 
 		control->data.select.menu = menu;
@@ -1506,16 +1592,15 @@ bool form_open_select_menu(void *client_data,
 		box = control->box;
 
 		menu->width = box->width +
-				box->border[RIGHT].width +
-				box->border[LEFT].width +
-				box->padding[RIGHT] + box->padding[LEFT];
+			box->border[RIGHT].width + box->padding[RIGHT] +
+			box->border[LEFT].width + box->padding[LEFT];
 
-		font_plot_style_from_css(&html->len_ctx, control->box->style,
-				&fstyle);
+		font_plot_style_from_css(&html->unit_len_ctx,
+				control->box->style, &fstyle);
 		menu->f_size = fstyle.size;
 
 		menu->line_height = FIXTOINT(FDIV((FMUL(FLTTOFIX(1.2),
-				FMUL(nscss_screen_dpi,
+				FMUL(html->unit_len_ctx.device_dpi,
 				INTTOFIX(fstyle.size / PLOT_STYLE_SCALE)))),
 				F_72));
 
@@ -1528,28 +1613,31 @@ bool form_open_select_menu(void *client_data,
 		menu->height = total_height;
 
 		if (menu->height > MAX_SELECT_HEIGHT) {
-
 			menu->height = MAX_SELECT_HEIGHT;
 		}
+
 		menu->client_data = client_data;
 		menu->callback = callback;
-		if (scrollbar_create(false,
-				menu->height,
-				total_height,
-				menu->height,
-				control,
-				form_select_menu_scroll_callback,
-				&(menu->scrollbar)) != NSERROR_OK) {
+		res = scrollbar_create(false,
+				       menu->height,
+				       total_height,
+				       menu->height,
+				       control,
+				       form_select_menu_scroll_callback,
+				       &(menu->scrollbar));
+		if (res != NSERROR_OK) {
+			control->data.select.menu = NULL;
 			free(menu);
-			return false;
+			return res;
 		}
 		menu->c = c;
+	} else {
+		menu = control->data.select.menu;
 	}
-	else menu = control->data.select.menu;
 
 	menu->callback(client_data, 0, 0, menu->width, menu->height);
 
-	return true;
+	return NSERROR_OK;
 }
 
 
@@ -1564,9 +1652,12 @@ void form_free_select_menu(struct form_control *control)
 
 
 /* exported interface documented in html/form_internal.h */
-bool form_redraw_select_menu(struct form_control *control, int x, int y,
-		float scale, const struct rect *clip,
-		const struct redraw_context *ctx)
+bool
+form_redraw_select_menu(struct form_control *control,
+			int x, int y,
+			float scale,
+			const struct rect *clip,
+			const struct redraw_context *ctx)
 {
 	struct box *box;
 	struct form_select_menu *menu = control->data.select.menu;
@@ -1710,17 +1801,12 @@ bool form_redraw_select_menu(struct form_control *control, int x, int y,
 	return true;
 }
 
-/**
- * Check whether a clipping rectangle is completely contained in the
- * select menu.
- *
- * \param control  the select menu to check the clipping rectangle for
- * \param scale    the current browser window scale
- * \param clip     the clipping rectangle
- * \return true if inside false otherwise
- */
-bool form_clip_inside_select_menu(struct form_control *control, float scale,
-		const struct rect *clip)
+
+/* private interface described in html/form_internal.h */
+bool
+form_clip_inside_select_menu(struct form_control *control,
+			     float scale,
+			     const struct rect *clip)
 {
 	struct form_select_menu *menu = control->data.select.menu;
 	int width, height;
@@ -1734,99 +1820,16 @@ bool form_clip_inside_select_menu(struct form_control *control, float scale,
 		height *= scale;
 	}
 
-	if (clip->x0 >= 0 && clip->x1 <= width &&
-			clip->y0 >= 0 && clip->y1 <= height)
+	if (clip->x0 >= 0 &&
+	    clip->x1 <= width &&
+	    clip->y0 >= 0 &&
+	    clip->y1 <= height)
 		return true;
 
 	return false;
 }
 
 
-/**
- * Process a selection from a form select menu.
- *
- * \param  html The html content handle for the form
- * \param  control  form control with menu
- * \param  item	    index of item selected from the menu
- * \return NSERROR_OK or appropriate error code.
- */
-static nserror form__select_process_selection(html_content *html,
-		struct form_control *control, int item)
-{
-	struct box *inline_box;
-	struct form_option *o;
-	int count;
-	nserror ret = NSERROR_OK;
-
-	assert(control != NULL);
-	assert(html != NULL);
-
-	/** \todo Even though the form code is effectively part of the html
-	 *        content handler, poking around inside contents is not good
-	 */
-
-	inline_box = control->box->children->children;
-
-	for (count = 0, o = control->data.select.items;
-			o != NULL;
-			count++, o = o->next) {
-		if (!control->data.select.multiple && o->selected) {
-			o->selected = false;
-			dom_html_option_element_set_selected(o->node, false);
-		}
-
-		if (count == item) {
-			if (control->data.select.multiple) {
-				if (o->selected) {
-					o->selected = false;
-					dom_html_option_element_set_selected(
-							o->node, false);
-					control->data.select.num_selected--;
-				} else {
-					o->selected = true;
-					dom_html_option_element_set_selected(
-							o->node, true);
-					control->data.select.num_selected++;
-				}
-			} else {
-				dom_html_option_element_set_selected(
-						o->node, true);
-				o->selected = true;
-			}
-		}
-
-		if (o->selected) {
-			control->data.select.current = o;
-		}
-	}
-
-	talloc_free(inline_box->text);
-	inline_box->text = 0;
-
-	if (control->data.select.num_selected == 0) {
-		inline_box->text = talloc_strdup(html->bctx,
-				messages_get("Form_None"));
-	} else if (control->data.select.num_selected == 1) {
-		inline_box->text = talloc_strdup(html->bctx,
-				control->data.select.current->text);
-	} else {
-		inline_box->text = talloc_strdup(html->bctx,
-				messages_get("Form_Many"));
-	}
-
-	if (!inline_box->text) {
-		ret = NSERROR_NOMEM;
-		inline_box->length = 0;
-	} else {
-		inline_box->length = strlen(inline_box->text);
-	}
-	inline_box->width = control->box->width;
-
-	html__redraw_a_box(html, control->box);
-
-	return ret;
-}
-
 /* exported interface documented in netsurf/form.h */
 nserror form_select_process_selection(struct form_control *control, int item)
 {
@@ -1835,6 +1838,7 @@ nserror form_select_process_selection(struct form_control *control, int item)
 	return form__select_process_selection(control->html, control, item);
 }
 
+
 /* exported interface documented in netsurf/form.h */
 struct form_option *
 form_select_get_option(struct form_control *control, int item)
@@ -1849,12 +1853,14 @@ form_select_get_option(struct form_control *control, int item)
 	return opt;
 }
 
+
 /* exported interface documented in netsurf/form.h */
 char *form_control_get_name(struct form_control *control)
 {
 	return control->name;
 }
 
+
 /* exported interface documented in netsurf/form.h */
 nserror form_control_bounding_rect(struct form_control *control, struct rect *r)
 {
@@ -1863,56 +1869,11 @@ nserror form_control_bounding_rect(struct form_control *control, struct rect *r)
 }
 
 
-/**
- * Handle a click on the area of the currently opened select menu.
- *
- * \param control	the select menu which received the click
- * \param x		X coordinate of click
- * \param y		Y coordinate of click
- */
-void form_select_menu_clicked(struct form_control *control, int x, int y)
-{
-	struct form_select_menu *menu = control->data.select.menu;
-	struct form_option *option;
-	html_content *html = (html_content *)menu->c;
-	int line_height, line_height_with_spacing;
-	int item_bottom_y;
-	int scroll, i;
-
-	scroll = scrollbar_get_offset(menu->scrollbar);
-
-	line_height = menu->line_height;
-	line_height_with_spacing = line_height +
-			line_height * SELECT_LINE_SPACING;
-
-	option = control->data.select.items;
-	item_bottom_y = line_height_with_spacing;
-	i = 0;
-	while (option && item_bottom_y < scroll + y) {
-		item_bottom_y += line_height_with_spacing;
-		option = option->next;
-		i++;
-	}
-
-	if (option != NULL) {
-		form__select_process_selection(html, control, i);
-	}
-
-	menu->callback(menu->client_data, 0, 0, menu->width, menu->height);
-}
-
-/**
- * Handle mouse action for the currently opened select menu.
- *
- * \param control	the select menu which received the mouse action
- * \param mouse		current mouse state
- * \param x		X coordinate of click
- * \param y		Y coordinate of click
- * \return		text for the browser status bar or NULL if the menu has
- *			to be closed
- */
-const char *form_select_mouse_action(struct form_control *control,
-		browser_mouse_state mouse, int x, int y)
+/* private interface described in html/form_internal.h */
+const char *
+form_select_mouse_action(struct form_control *control,
+			 browser_mouse_state mouse,
+			 int x, int y)
 {
 	struct form_select_menu *menu = control->data.select.menu;
 	int x0, y0, x1, y1, scrollbar_x;
@@ -1957,16 +1918,12 @@ const char *form_select_mouse_action(struct form_control *control,
 	return status;
 }
 
-/**
- * Handle mouse drag end for the currently opened select menu.
- *
- * \param control	the select menu which received the mouse drag end
- * \param mouse		current mouse state
- * \param x		X coordinate of drag end
- * \param y		Y coordinate of drag end
- */
-void form_select_mouse_drag_end(struct form_control *control,
-		browser_mouse_state mouse, int x, int y)
+
+/* private interface described in html/form_internal.h */
+void
+form_select_mouse_drag_end(struct form_control *control,
+			   browser_mouse_state mouse,
+			   int x, int y)
 {
 	int x0, y0, x1, y1;
 	int box_x, box_y;
@@ -1997,61 +1954,14 @@ void form_select_mouse_drag_end(struct form_control *control,
 	y1 = menu->height;
 
 
-	if (x > x0 && x < x1 - SCROLLBAR_WIDTH && y >  y0 && y < y1)
+	if (x > x0 && x < x1 - SCROLLBAR_WIDTH && y >  y0 && y < y1) {
 		/* handle drag end above the option area like a regular click */
 		form_select_menu_clicked(control, x, y);
-}
-
-/**
- * Callback for the select menus scroll
- */
-void form_select_menu_scroll_callback(void *client_data,
-		struct scrollbar_msg_data *scrollbar_data)
-{
-	struct form_control *control = client_data;
-	struct form_select_menu *menu = control->data.select.menu;
-	html_content *html = (html_content *)menu->c;
-
-	switch (scrollbar_data->msg) {
-		case SCROLLBAR_MSG_MOVED:
-			menu->callback(menu->client_data,
-					0, 0,
-					menu->width,
-					menu->height);
-			break;
-		case SCROLLBAR_MSG_SCROLL_START:
-		{
-			struct rect rect = {
-				.x0 = scrollbar_data->x0,
-				.y0 = scrollbar_data->y0,
-				.x1 = scrollbar_data->x1,
-				.y1 = scrollbar_data->y1
-			};
-
-			browser_window_set_drag_type(html->bw,
-					DRAGGING_CONTENT_SCROLLBAR, &rect);
-
-			menu->scroll_capture = true;
-		}
-			break;
-		case SCROLLBAR_MSG_SCROLL_FINISHED:
-			menu->scroll_capture = false;
-
-			browser_window_set_drag_type(html->bw,
-					DRAGGING_NONE, NULL);
-			break;
-		default:
-			break;
 	}
 }
 
-/**
- * Get the dimensions of a select menu.
- *
- * \param control	the select menu to get the dimensions of
- * \param width		gets updated to menu width
- * \param height	gets updated to menu height
- */
+
+/* private interface described in html/form_internal.h */
 void form_select_get_dimensions(struct form_control *control,
 		int *width, int *height)
 {
@@ -2059,9 +1969,8 @@ void form_select_get_dimensions(struct form_control *control,
 	*height = control->data.select.menu->height;
 }
 
-/**
- * Callback for the core select menu.
- */
+
+/* private interface described in html/form_internal.h */
 void form_select_menu_callback(void *client_data,
 		int x, int y, int width, int height)
 {
@@ -2081,12 +1990,7 @@ void form_select_menu_callback(void *client_data,
 }
 
 
-/**
- * Set a radio form control and clear the others in the group.
- *
- * \param radio form control of type GADGET_RADIO
- */
-
+/* private interface described in html/form_internal.h */
 void form_radio_set(struct form_control *radio)
 {
 	struct form_control *control;
@@ -2098,15 +2002,33 @@ void form_radio_set(struct form_control *radio)
 	if (radio->selected)
 		return;
 
-	for (control = radio->form->controls; control;
-			control = control->next) {
+	/* Clear selected state for other controls in
+	 * the same radio button group */
+	for (control = radio->form->controls;
+	     control != NULL;
+	     control = control->next) {
+		/* Only interested in radio inputs */
 		if (control->type != GADGET_RADIO)
 			continue;
+
+		/* Ignore ourself */
 		if (control == radio)
 			continue;
-		if (strcmp(control->name, radio->name) != 0)
+
+		/* Ignore inputs where:
+		 *   a) this or the other control have no name attribute
+		 *   b) this or the other control have an empty name attribute
+		 *   c) the control names do not match
+		 */
+		if ((control->name == NULL) ||
+		    (radio->name == NULL) ||
+		    (control->name[0] == '\0') ||
+		    (radio->name[0] == '\0') ||
+		    strcmp(control->name, radio->name) != 0)
 			continue;
 
+		/* Other control is in the same radio button group: clear its
+		 * selected state */
 		if (control->selected) {
 			control->selected = false;
 			dom_html_input_element_set_checked(control->node, false);
@@ -2201,6 +2123,8 @@ form_submit(nsurl *page_url,
 	return res;
 }
 
+
+/* exported interface documented in html/form_internal.h */
 void form_gadget_update_value(struct form_control *control, char *value)
 {
 	switch (control->type) {
@@ -2235,4 +2159,203 @@ void form_gadget_update_value(struct form_control *control, char *value)
 		/* Do nothing */
 		break;
 	}
+
+	/* Finally, sync this with the DOM */
+	form_gadget_sync_with_dom(control);
+}
+
+
+/* Exported API, see html/form_internal.h */
+void
+form_gadget_sync_with_dom(struct form_control *control)
+{
+	dom_exception exc;
+	dom_string *value = NULL;
+	bool changed_dom = false;
+
+	if (control->syncing ||
+	    (control->type != GADGET_TEXTBOX &&
+	     control->type != GADGET_PASSWORD &&
+	     control->type != GADGET_HIDDEN &&
+	     control->type != GADGET_TEXTAREA)) {
+		/* Not a control we support, or the control is already
+		 * mid-sync so we don't want to disrupt that
+		 */
+		return;
+	}
+
+	control->syncing = true;
+
+	/* If we've changed value, sync that toward the DOM */
+	if ((control->last_synced_value == NULL &&
+	     control->value != NULL &&
+	     control->value[0] != '\0') ||
+	    (control->last_synced_value != NULL &&
+	     control->value != NULL &&
+	     strcmp(control->value, control->last_synced_value) != 0)) {
+		char *dup = strdup(control->value);
+		if (dup == NULL) {
+			goto out;
+		}
+		if (control->last_synced_value != NULL) {
+			free(control->last_synced_value);
+		}
+		control->last_synced_value = dup;
+		exc = dom_string_create((uint8_t *)(control->value),
+					strlen(control->value), &value);
+		if (exc != DOM_NO_ERR) {
+			goto out;
+		}
+		if (control->node_value != NULL) {
+			dom_string_unref(control->node_value);
+		}
+		control->node_value = value;
+		value = NULL;
+		if (control->type == GADGET_TEXTAREA) {
+			exc = dom_html_text_area_element_set_value(control->node, control->node_value);
+		} else {
+			exc = dom_html_input_element_set_value(control->node, control->node_value);
+		}
+		if (exc != DOM_NO_ERR) {
+			goto out;
+		}
+		changed_dom = true;
+	}
+
+	/* Now check if the DOM has changed since our last go */
+	if (control->type == GADGET_TEXTAREA) {
+		exc = dom_html_text_area_element_get_value(control->node, &value);
+	} else {
+		exc = dom_html_input_element_get_value(control->node, &value);
+	}
+
+	if (exc != DOM_NO_ERR) {
+		/* Nothing much we can do here */
+		goto out;
+	}
+
+	if (!dom_string_isequal(control->node_value, value)) {
+		/* The DOM has changed */
+		if (!changed_dom) {
+			/* And it wasn't us */
+			char *value_s = strndup(
+				dom_string_data(value),
+				dom_string_byte_length(value));
+			char *dup = NULL;
+			if (value_s == NULL) {
+				goto out;
+			}
+			dup = strdup(value_s);
+			if (dup == NULL) {
+				free(value_s);
+				goto out;
+			}
+			free(control->value);
+			control->value = value_s;
+			free(control->last_synced_value);
+			control->last_synced_value = dup;
+			if (control->type != GADGET_HIDDEN &&
+			    control->data.text.ta != NULL) {
+				textarea_set_text(control->data.text.ta,
+						  value_s);
+			}
+		}
+		control->node_value = value;
+		value = NULL;
+	}
+
+out:
+	if (value != NULL)
+		dom_string_unref(value);
+	control->syncing = false;
+}
+
+
+/* exported interface documented in html/form_internal.h */
+struct form *
+form_new(void *node,
+	 const char *action,
+	 const char *target,
+	 form_method method,
+	 const char *charset,
+	 const char *doc_charset)
+{
+	struct form *form;
+
+	form = calloc(1, sizeof *form);
+	if (!form)
+		return NULL;
+
+	form->action = strdup(action != NULL ? action : "");
+	if (form->action == NULL) {
+		free(form);
+		return NULL;
+	}
+
+	form->target = target != NULL ? strdup(target) : NULL;
+	if (target != NULL && form->target == NULL) {
+		free(form->action);
+		free(form);
+		return NULL;
+	}
+
+	form->method = method;
+
+	form->accept_charsets = charset != NULL ? strdup(charset) : NULL;
+	if (charset != NULL && form->accept_charsets == NULL) {
+		free(form->target);
+		free(form->action);
+		free(form);
+		return NULL;
+	}
+
+	form->document_charset = doc_charset != NULL ? strdup(doc_charset)
+						     : NULL;
+	if (doc_charset && form->document_charset == NULL) {
+		free(form->accept_charsets);
+		free(form->target);
+		free(form->action);
+		free(form);
+		return NULL;
+	}
+
+	form->node = node;
+
+	return form;
+}
+
+
+/* exported interface documented in html/form_internal.h */
+void form_free(struct form *form)
+{
+	struct form_control *c, *d;
+
+	for (c = form->controls; c != NULL; c = d) {
+		d = c->next;
+
+		form_free_control(c);
+	}
+
+	free(form->action);
+	free(form->target);
+	free(form->accept_charsets);
+	free(form->document_charset);
+
+	free(form);
+}
+
+
+/* exported interface documented in html/form_internal.h */
+struct form_control *form_new_control(void *node, form_control_type type)
+{
+	struct form_control *control;
+
+	control = calloc(1, sizeof *control);
+	if (control == NULL)
+		return NULL;
+
+	control->node = node;
+	control->type = type;
+
+	return control;
 }
diff --git a/content/handlers/html/form_internal.h b/content/handlers/html/form_internal.h
index f76f126b4..292a5df44 100644
--- a/content/handlers/html/form_internal.h
+++ b/content/handlers/html/form_internal.h
@@ -72,6 +72,8 @@ struct image_input_coords {
 /** Form control. */
 struct form_control {
 	void *node;			/**< Corresponding DOM node */
+	struct dom_string *node_value;  /**< The last value sync'd with the DOM */
+	bool syncing;                   /**< Set if a DOM sync is in-progress */
 	struct html_content *html;	/**< HTML content containing control */
 
 	form_control_type type;		/**< Type of control */
@@ -81,6 +83,7 @@ struct form_control {
 	char *name;			/**< Control name */
 	char *value;			/**< Current value of control */
 	char *initial_value;		/**< Initial value of control */
+	char *last_synced_value;        /**< The last value sync'd to the DOM */
 	bool disabled;			/**< Whether control is disabled */
 
 	struct box *box;		/**< Box for control */
@@ -177,6 +180,7 @@ struct form *form_new(void *node, const char *action, const char *target,
  */
 void form_free(struct form *form);
 
+
 /**
  * Create a struct form_control.
  *
@@ -186,33 +190,53 @@ void form_free(struct form *form);
  */
 struct form_control *form_new_control(void *node, form_control_type type);
 
+
+/**
+ * Add a control to the list of controls in a form.
+ *
+ * \param form  The form to add the control to
+ * \param control  The control to add
+ */
 void form_add_control(struct form *form, struct form_control *control);
+
+
+/**
+ * Free a struct form_control.
+ *
+ * \param  control  structure to free
+ */
 void form_free_control(struct form_control *control);
+
+
+/**
+ * Add an option to a form select control.
+ *
+ * \param  control   form control of type GADGET_SELECT
+ * \param  value     value of option, used directly (not copied)
+ * \param  text      text for option, used directly (not copied)
+ * \param  selected  this option is selected
+ * \param  node      the DOM node this option is associated with
+ * \return  true on success, false on memory exhaustion
+ */
 bool form_add_option(struct form_control *control, char *value, char *text,
 		     bool selected, void *node);
-bool form_successful_controls(struct form *form,
-		struct form_control *submit_button,
-		struct fetch_multipart_data **successful_controls);
+
 
 /**
  * Open a select menu for a select form control, creating it if necessary.
  *
- * \param client_data  data passed to the redraw callback
- * \param control  The select form control for which the menu is being opened
- * \param redraw_callback  The callback to redraw the select menu.
- * \param c  The content the select menu is opening for.
- * \return false on memory exhaustion, true otherwise
+ * \param client_data data passed to the redraw callback
+ * \param control The select form control for which the menu is being opened
+ * \param redraw_callback The callback to redraw the select menu.
+ * \param c The content the select menu is opening for.
+ * \return NSERROR_OK on sucess else error code.
  */
-bool form_open_select_menu(void *client_data,
+nserror form_open_select_menu(void *client_data,
 		struct form_control *control,
 		select_menu_redraw_callback redraw_callback,
 		struct content *c);
 
 
-void form_select_menu_callback(void *client_data,
-		int x, int y, int width, int height);
-
-
 /**
  * Destroy a select menu and free allocated memory.
  *
@@ -237,15 +261,70 @@ bool form_redraw_select_menu(struct form_control *control, int x, int y,
 		float scale, const struct rect *clip,
 		const struct redraw_context *ctx);
 
+
+/**
+ * Check whether a clipping rectangle is completely contained in the
+ * select menu.
+ *
+ * \param control  the select menu to check the clipping rectangle for
+ * \param scale    the current browser window scale
+ * \param clip     the clipping rectangle
+ * \return true if inside false otherwise
+ */
 bool form_clip_inside_select_menu(struct form_control *control, float scale,
 		const struct rect *clip);
+
+
+/**
+ * Handle mouse action for the currently opened select menu.
+ *
+ * \param control the select menu which received the mouse action
+ * \param mouse current mouse state
+ * \param x X coordinate of click
+ * \param y Y coordinate of click
+ * \return text for the browser status bar or NULL if the menu has to be closed
+ */
 const char *form_select_mouse_action(struct form_control *control,
 		enum browser_mouse_state mouse, int x, int y);
+
+
+/**
+ * Handle mouse drag end for the currently opened select menu.
+ *
+ * \param control the select menu which received the mouse drag end
+ * \param mouse current mouse state
+ * \param x X coordinate of drag end
+ * \param y Y coordinate of drag end
+ */
 void form_select_mouse_drag_end(struct form_control *control,
 		enum browser_mouse_state mouse, int x, int y);
+
+
+/**
+ * Get the dimensions of a select menu.
+ *
+ * \param control	the select menu to get the dimensions of
+ * \param width		gets updated to menu width
+ * \param height	gets updated to menu height
+ */
 void form_select_get_dimensions(struct form_control *control,
 		int *width, int *height);
 
+
+/**
+ * Callback for the core select menu.
+ */
+void form_select_menu_callback(void *client_data,
+		int x, int y, int width, int height);
+
+
+/**
+ * Set a radio form control and clear the others in the group.
+ *
+ * \param radio form control of type GADGET_RADIO
+ */
+void form_radio_set(struct form_control *radio);
+
 /**
  * navigate browser window based on form submission.
  *
@@ -257,8 +336,25 @@ void form_select_get_dimensions(struct form_control *control,
 nserror form_submit(struct nsurl *page_url, struct browser_window *target,
 		struct form *form, struct form_control *submit_button);
 
-void form_radio_set(struct form_control *radio);
 
+/**
+ * Update gadget value.
+ */
 void form_gadget_update_value(struct form_control *control, char *value);
 
+
+/**
+ * Synchronise this gadget with its associated DOM node.
+ *
+ * If the DOM has changed and the gadget has not, the DOM's new value is
+ * imported into the gadget.  If the gadget's value has changed and the DOM's
+ * has not, the gadget's value is pushed into the DOM.
+ * If both have changed, the gadget's value wins.
+ *
+ * \param control The form gadget to synchronise
+ *
+ * \note Currently this will only synchronise input gadgets (text/password)
+ */
+void form_gadget_sync_with_dom(struct form_control *control);
+
 #endif
diff --git a/content/handlers/html/html_forms.c b/content/handlers/html/forms.c
index 915eb002f..4669154e9 100644
--- a/content/handlers/html/html_forms.c
+++ b/content/handlers/html/forms.c
@@ -21,12 +21,14 @@
  * HTML form handling implementation
  */
 
+#include <string.h>
+
 #include "utils/config.h"
 #include "utils/corestrings.h"
 #include "utils/log.h"
 
 #include "html/form_internal.h"
-#include "html/html_internal.h"
+#include "html/private.h"
 
 /**
  * process form element from dom
@@ -391,7 +393,18 @@ parse_input_element(struct form *forms, dom_html_input_element *input)
 				control = NULL;
 				goto out;
 			}
+
+			control->last_synced_value = strdup(control->value);
+			if (control->last_synced_value == NULL) {
+				form_free_control(control);
+				control = NULL;
+				goto out;
+			}
+
+			control->node_value = dom_string_ref(ds_value);
 		}
+		/* Force the gadget and DOM to be in sync */
+		form_gadget_sync_with_dom(control);
 	}
 
 	if (form != NULL && control != NULL)
@@ -528,8 +541,8 @@ invent_fake_gadget(dom_node *node)
 }
 
 /* documented in html_internal.h */
-struct form_control *html_forms_get_control_for_node(struct form *forms,
-		dom_node *node)
+struct form_control *
+html_forms_get_control_for_node(struct form *forms, dom_node *node)
 {
 	struct form *f;
 	struct form_control *ctl = NULL;
diff --git a/content/handlers/html/html.c b/content/handlers/html/html.c
index ba80ad12e..82f5f1388 100644
--- a/content/handlers/html/html.c
+++ b/content/handlers/html/html.c
@@ -44,9 +44,12 @@
 #include "netsurf/content.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/utf8.h"
+#include "netsurf/keypress.h"
 #include "netsurf/layout.h"
 #include "netsurf/misc.h"
 #include "content/hlcache.h"
+#include "content/content_factory.h"
+#include "content/textsearch.h"
 #include "desktop/selection.h"
 #include "desktop/scrollbar.h"
 #include "desktop/textarea.h"
@@ -55,13 +58,19 @@
 #include "desktop/gui_internal.h"
 
 #include "html/html.h"
+#include "html/private.h"
+#include "html/dom_event.h"
+#include "html/css.h"
+#include "html/object.h"
 #include "html/html_save.h"
-#include "html/html_internal.h"
+#include "html/interaction.h"
 #include "html/box.h"
+#include "html/box_construct.h"
+#include "html/box_inspect.h"
 #include "html/form_internal.h"
 #include "html/imagemap.h"
 #include "html/layout.h"
-#include "html/search.h"
+#include "html/textselection.h"
 
 #define CHUNK 4096
 
@@ -76,9 +85,31 @@ static const char *html_types[] = {
 	"text/html"
 };
 
+/**
+ * Fire an event at the DOM
+ *
+ * Helper that swallows DOM errors.
+ *
+ * \param[in] event   the event to fire at the DOM
+ * \param[in] target  the event target
+ * \return true on success
+ */
+static bool fire_dom_event(dom_event *event, dom_node *target)
+{
+	dom_exception exc;
+	bool result;
+
+	exc = dom_event_target_dispatch_event(target, event, &result);
+	if (exc != DOM_NO_ERR) {
+		return false;
+	}
+
+	return result;
+}
+
 /* Exported interface, see html_internal.h */
-bool fire_dom_event(dom_string *type, dom_node *target,
-		    bool bubbles, bool cancelable)
+bool fire_generic_dom_event(dom_string *type, dom_node *target,
+		bool bubbles, bool cancelable)
 {
 	dom_exception exc;
 	dom_event *evt;
@@ -92,11 +123,86 @@ bool fire_dom_event(dom_string *type, dom_node *target,
 		return false;
 	}
 	NSLOG(netsurf, INFO, "Dispatching '%*s' against %p",
-	      dom_string_length(type), dom_string_data(type), target);
-	exc = dom_event_target_dispatch_event(target, evt, &result);
+	      (int)dom_string_length(type), dom_string_data(type), target);
+	result = fire_dom_event(evt, target);
+	dom_event_unref(evt);
+	return result;
+}
+
+/* Exported interface, see html_internal.h */
+bool fire_dom_keyboard_event(dom_string *type, dom_node *target,
+		bool bubbles, bool cancelable, uint32_t key)
+{
+	bool is_special = key <= 0x001F || (0x007F <= key && key <= 0x009F);
+	dom_string *dom_key = NULL;
+	dom_keyboard_event *evt;
+	dom_exception exc;
+	bool result;
+
+	if (is_special) {
+		switch (key) {
+		case NS_KEY_ESCAPE:
+			dom_key = dom_string_ref(corestring_dom_Escape);
+			break;
+		case NS_KEY_LEFT:
+			dom_key = dom_string_ref(corestring_dom_ArrowLeft);
+			break;
+		case NS_KEY_RIGHT:
+			dom_key = dom_string_ref(corestring_dom_ArrowRight);
+			break;
+		case NS_KEY_UP:
+			dom_key = dom_string_ref(corestring_dom_ArrowUp);
+			break;
+		case NS_KEY_DOWN:
+			dom_key = dom_string_ref(corestring_dom_ArrowDown);
+			break;
+		case NS_KEY_PAGE_UP:
+			dom_key = dom_string_ref(corestring_dom_PageUp);
+			break;
+		case NS_KEY_PAGE_DOWN:
+			dom_key = dom_string_ref(corestring_dom_PageDown);
+			break;
+		case NS_KEY_TEXT_START:
+			dom_key = dom_string_ref(corestring_dom_Home);
+			break;
+		case NS_KEY_TEXT_END:
+			dom_key = dom_string_ref(corestring_dom_End);
+			break;
+		default:
+			dom_key = NULL;
+			break;
+		}
+	} else {
+		char utf8[6];
+		size_t length = utf8_from_ucs4(key, utf8);
+		utf8[length] = '\0';
+
+		exc = dom_string_create((const uint8_t *)utf8, strlen(utf8),
+				&dom_key);
+		if (exc != DOM_NO_ERR) {
+			return exc;
+		}
+	}
+
+	exc = dom_keyboard_event_create(&evt);
 	if (exc != DOM_NO_ERR) {
-		result = false;
+		dom_string_unref(dom_key);
+		return false;
 	}
+
+	exc = dom_keyboard_event_init(evt, type, bubbles, cancelable, NULL,
+			dom_key, NULL, DOM_KEY_LOCATION_STANDARD, false,
+			false, false, false, false, false);
+	dom_string_unref(dom_key);
+	if (exc != DOM_NO_ERR) {
+		dom_event_unref(evt);
+		return false;
+	}
+
+	NSLOG(netsurf, INFO, "Dispatching '%*s' against %p",
+			(int)dom_string_length(type), dom_string_data(type), target);
+
+	result = fire_dom_event((dom_event *) evt, target);
 	dom_event_unref(evt);
 	return result;
 }
@@ -113,16 +219,18 @@ static void html_box_convert_done(html_content *c, bool success)
 	dom_exception exc; /* returned by libdom functions */
 	dom_node *html;
 
-	NSLOG(netsurf, INFO, "Done XML to box (%p)", c);
+	NSLOG(netsurf, INFO, "DOM to box conversion complete (content %p)", c);
+
+	c->box_conversion_context = NULL;
 
 	/* Clean up and report error if unsuccessful or aborted */
 	if ((success == false) || (c->aborted)) {
 		html_object_free_objects(c);
 
 		if (success == false) {
-			content_broadcast_errorcode(&c->base, NSERROR_BOX_CONVERT);
+			content_broadcast_error(&c->base, NSERROR_BOX_CONVERT, NULL);
 		} else {
-			content_broadcast_errorcode(&c->base, NSERROR_STOPPED);
+			content_broadcast_error(&c->base, NSERROR_STOPPED, NULL);
 		}
 
 		content_set_error(&c->base);
@@ -144,7 +252,7 @@ static void html_box_convert_done(html_content *c, bool success)
 		 * like the other error paths
 		 */
 		NSLOG(netsurf, INFO, "error retrieving html element from dom");
-		content_broadcast_errorcode(&c->base, NSERROR_DOM);
+		content_broadcast_error(&c->base, NSERROR_DOM, NULL);
 		content_set_error(&c->base);
 		return;
 	}
@@ -154,7 +262,7 @@ static void html_box_convert_done(html_content *c, bool success)
 	if (err != NSERROR_OK) {
 		NSLOG(netsurf, INFO, "imagemap extraction failed");
 		html_object_free_objects(c);
-		content_broadcast_errorcode(&c->base, err);
+		content_broadcast_error(&c->base, err, NULL);
 		content_set_error(&c->base);
 		dom_node_unref(html);
 		return;
@@ -167,411 +275,39 @@ static void html_box_convert_done(html_content *c, bool success)
 
 	content_set_ready(&c->base);
 
-	if (c->base.active == 0) {
-		content_set_done(&c->base);
-	}
+	html_proceed_to_done(c);
 
 	dom_node_unref(html);
 }
 
-
-/** process link node */
-static bool html_process_link(html_content *c, dom_node *node)
-{
-	struct content_rfc5988_link link; /* the link added to the content */
-	dom_exception exc; /* returned by libdom functions */
-	dom_string *atr_string;
-	nserror error;
-
-	memset(&link, 0, sizeof(struct content_rfc5988_link));
-
-	/* check that the relation exists - w3c spec says must be present */
-	exc = dom_element_get_attribute(node, corestring_dom_rel, &atr_string);
-	if ((exc != DOM_NO_ERR) || (atr_string == NULL)) {
-		return false;
-	}
-	/* get a lwc string containing the link relation */
-	exc = dom_string_intern(atr_string, &link.rel);
-	dom_string_unref(atr_string);
-	if (exc != DOM_NO_ERR) {
-		return false;
-	}
-
-	/* check that the href exists - w3c spec says must be present */
-	exc = dom_element_get_attribute(node, corestring_dom_href, &atr_string);
-	if ((exc != DOM_NO_ERR) || (atr_string == NULL)) {
-		lwc_string_unref(link.rel);
-		return false;
-	}
-
-	/* get nsurl */
-	error = nsurl_join(c->base_url, dom_string_data(atr_string),
-			&link.href);
-	dom_string_unref(atr_string);
-	if (error != NSERROR_OK) {
-		lwc_string_unref(link.rel);
-		return false;
-	}
-
-	/* look for optional properties -- we don't care if internment fails */
-
-	exc = dom_element_get_attribute(node,
-			corestring_dom_hreflang, &atr_string);
-	if ((exc == DOM_NO_ERR) && (atr_string != NULL)) {
-		/* get a lwc string containing the href lang */
-		exc = dom_string_intern(atr_string, &link.hreflang);
-		dom_string_unref(atr_string);
-	}
-
-	exc = dom_element_get_attribute(node,
-			corestring_dom_type, &atr_string);
-	if ((exc == DOM_NO_ERR) && (atr_string != NULL)) {
-		/* get a lwc string containing the type */
-		exc = dom_string_intern(atr_string, &link.type);
-		dom_string_unref(atr_string);
-	}
-
-	exc = dom_element_get_attribute(node,
-			corestring_dom_media, &atr_string);
-	if ((exc == DOM_NO_ERR) && (atr_string != NULL)) {
-		/* get a lwc string containing the media */
-		exc = dom_string_intern(atr_string, &link.media);
-		dom_string_unref(atr_string);
-	}
-
-	exc = dom_element_get_attribute(node,
-			corestring_dom_sizes, &atr_string);
-	if ((exc == DOM_NO_ERR) && (atr_string != NULL)) {
-		/* get a lwc string containing the sizes */
-		exc = dom_string_intern(atr_string, &link.sizes);
-		dom_string_unref(atr_string);
-	}
-
-	/* add to content */
-	content__add_rfc5988_link(&c->base, &link);
-
-	if (link.sizes != NULL)
-		lwc_string_unref(link.sizes);
-	if (link.media != NULL)
-		lwc_string_unref(link.media);
-	if (link.type != NULL)
-		lwc_string_unref(link.type);
-	if (link.hreflang != NULL)
-		lwc_string_unref(link.hreflang);
-
-	nsurl_unref(link.href);
-	lwc_string_unref(link.rel);
-
-	return true;
-}
-
-/** process title node */
-static bool html_process_title(html_content *c, dom_node *node)
-{
-	dom_exception exc; /* returned by libdom functions */
-	dom_string *title;
-	char *title_str;
-	bool success;
-
-	exc = dom_node_get_text_content(node, &title);
-	if ((exc != DOM_NO_ERR) || (title == NULL)) {
-		return false;
-	}
-
-	title_str = squash_whitespace(dom_string_data(title));
-	dom_string_unref(title);
-
-	if (title_str == NULL) {
-		return false;
-	}
-
-	success = content__set_title(&c->base, title_str);
-
-	free(title_str);
-
-	return success;
-}
-
-static bool html_process_base(html_content *c, dom_node *node)
-{
-	dom_exception exc; /* returned by libdom functions */
-	dom_string *atr_string;
-
-	/* get href attribute if present */
-	exc = dom_element_get_attribute(node,
-			corestring_dom_href, &atr_string);
-	if ((exc == DOM_NO_ERR) && (atr_string != NULL)) {
-		nsurl *url;
-		nserror error;
-
-		/* get url from string */
-		error = nsurl_create(dom_string_data(atr_string), &url);
-		dom_string_unref(atr_string);
-		if (error == NSERROR_OK) {
-			if (c->base_url != NULL)
-				nsurl_unref(c->base_url);
-			c->base_url = url;
-		}
-	}
-
-
-	/* get target attribute if present and not already set */
-	if (c->base_target != NULL) {
-		return true;
-	}
-
-	exc = dom_element_get_attribute(node,
-			corestring_dom_target, &atr_string);
-	if ((exc == DOM_NO_ERR) && (atr_string != NULL)) {
-		/* Validation rules from the HTML5 spec for the base element:
-		 *  The target must be one of _blank, _self, _parent, or
-		 *  _top or any identifier which does not begin with an
-		 *  underscore
-		 */
-		if (*dom_string_data(atr_string) != '_' ||
-				dom_string_caseless_lwc_isequal(atr_string,
-						corestring_lwc__blank) ||
-				dom_string_caseless_lwc_isequal(atr_string,
-						corestring_lwc__self) ||
-				dom_string_caseless_lwc_isequal(atr_string,
-						corestring_lwc__parent) ||
-				dom_string_caseless_lwc_isequal(atr_string,
-						corestring_lwc__top)) {
-			c->base_target = strdup(dom_string_data(atr_string));
-		}
-		dom_string_unref(atr_string);
-	}
-
-	return true;
-}
-
-static nserror html_meta_refresh_process_element(html_content *c, dom_node *n)
+/* Documented in html_internal.h */
+nserror
+html_proceed_to_done(html_content *html)
 {
-	union content_msg_data msg_data;
-	const char *url, *end, *refresh = NULL;
-	char *new_url;
-	char quote = '\0';
-	dom_string *equiv, *content;
-	dom_exception exc;
-	nsurl *nsurl;
-	nserror error = NSERROR_OK;
-
-	exc = dom_element_get_attribute(n, corestring_dom_http_equiv, &equiv);
-	if (exc != DOM_NO_ERR) {
-		return NSERROR_DOM;
-	}
-
-	if (equiv == NULL) {
-		return NSERROR_OK;
-	}
-
-	if (!dom_string_caseless_lwc_isequal(equiv, corestring_lwc_refresh)) {
-		dom_string_unref(equiv);
-		return NSERROR_OK;
-	}
-
-	dom_string_unref(equiv);
-
-	exc = dom_element_get_attribute(n, corestring_dom_content, &content);
-	if (exc != DOM_NO_ERR) {
-		return NSERROR_DOM;
-	}
-
-	if (content == NULL) {
-		return NSERROR_OK;
-	}
-
-	end = dom_string_data(content) + dom_string_byte_length(content);
-
-	/* content  := *LWS intpart fracpart? *LWS [';' *LWS *1url *LWS]
-	 * intpart  := 1*DIGIT
-	 * fracpart := 1*('.' | DIGIT)
-	 * url      := "url" *LWS '=' *LWS (url-nq | url-sq | url-dq)
-	 * url-nq   := *urlchar
-	 * url-sq   := "'" *(urlchar | '"') "'"
-	 * url-dq   := '"' *(urlchar | "'") '"'
-	 * urlchar  := [#x9#x21#x23-#x26#x28-#x7E] | nonascii
-	 * nonascii := [#x80-#xD7FF#xE000-#xFFFD#x10000-#x10FFFF]
-	 */
-
-	url = dom_string_data(content);
-
-	/* *LWS */
-	while (url < end && ascii_is_space(*url)) {
-		url++;
-	}
-
-	/* intpart */
-	if (url == end || (*url < '0' || '9' < *url)) {
-		/* Empty content, or invalid timeval */
-		dom_string_unref(content);
-		return NSERROR_OK;
-	}
-
-	msg_data.delay = (int) strtol(url, &new_url, 10);
-	/* a very small delay and self-referencing URL can cause a loop
-	 * that grinds machines to a halt. To prevent this we set a
-	 * minimum refresh delay of 1s. */
-	if (msg_data.delay < 1) {
-		msg_data.delay = 1;
-	}
-
-	url = new_url;
-
-	/* fracpart? (ignored, as delay is integer only) */
-	while (url < end && (('0' <= *url && *url <= '9') ||
-			*url == '.')) {
-		url++;
-	}
-
-	/* *LWS */
-	while (url < end && ascii_is_space(*url)) {
-		url++;
-	}
-
-	/* ';' */
-	if (url < end && *url == ';')
-		url++;
-
-	/* *LWS */
-	while (url < end && ascii_is_space(*url)) {
-		url++;
-	}
-
-	if (url == end) {
-		/* Just delay specified, so refresh current page */
-		dom_string_unref(content);
-
-		c->base.refresh = nsurl_ref(
-				content_get_url(&c->base));
-
-		content_broadcast(&c->base, CONTENT_MSG_REFRESH, &msg_data);
-
-		return NSERROR_OK;
-	}
-
-	/* "url" */
-	if (url <= end - 3) {
-		if (strncasecmp(url, "url", 3) == 0) {
-			url += 3;
-		} else {
-			/* Unexpected input, ignore this header */
-			dom_string_unref(content);
-			return NSERROR_OK;
-		}
-	} else {
-		/* Insufficient input, ignore this header */
-		dom_string_unref(content);
-		return NSERROR_OK;
-	}
-
-	/* *LWS */
-	while (url < end && ascii_is_space(*url)) {
-		url++;
-	}
-
-	/* '=' */
-	if (url < end) {
-		if (*url == '=') {
-			url++;
-		} else {
-			/* Unexpected input, ignore this header */
-			dom_string_unref(content);
+	switch (content__get_status(&html->base)) {
+	case CONTENT_STATUS_READY:
+		if (html->base.active == 0) {
+			content_set_done(&html->base);
 			return NSERROR_OK;
 		}
-	} else {
-		/* Insufficient input, ignore this header */
-		dom_string_unref(content);
+		break;
+	case CONTENT_STATUS_DONE:
+		/* fallthrough */
+	case CONTENT_STATUS_LOADING:
 		return NSERROR_OK;
+	default:
+		NSLOG(netsurf, ERROR, "Content status unexpectedly not LOADING/READY/DONE");
+		break;
 	}
-
-	/* *LWS */
-	while (url < end && ascii_is_space(*url)) {
-		url++;
-	}
-
-	/* '"' or "'" */
-	if (url < end && (*url == '"' || *url == '\'')) {
-		quote = *url;
-		url++;
-	}
-
-	/* Start of URL */
-	refresh = url;
-
-	if (quote != 0) {
-		/* url-sq | url-dq */
-		while (url < end && *url != quote)
-			url++;
-	} else {
-		/* url-nq */
-		while (url < end && !ascii_is_space(*url))
-			url++;
-	}
-
-	/* '"' or "'" or *LWS (we don't care) */
-	if (url > refresh) {
-		/* There's a URL */
-		new_url = strndup(refresh, url - refresh);
-		if (new_url == NULL) {
-			dom_string_unref(content);
-			return NSERROR_NOMEM;
-		}
-
-		error = nsurl_join(c->base_url, new_url, &nsurl);
-		if (error == NSERROR_OK) {
-			/* broadcast valid refresh url */
-
-			c->base.refresh = nsurl;
-
-			content_broadcast(&c->base, CONTENT_MSG_REFRESH,
-					&msg_data);
-			c->refresh = true;
-		}
-
-		free(new_url);
-
-	}
-
-	dom_string_unref(content);
-
-	return error;
+	return NSERROR_UNKNOWN;
 }
 
-static bool html_process_img(html_content *c, dom_node *node)
-{
-	dom_string *src;
-	nsurl *url;
-	nserror err;
-	dom_exception exc;
-	bool success;
-
-	/* Do nothing if foreground images are disabled */
-	if (nsoption_bool(foreground_images) == false) {
-		return true;
-	}
-
-	exc = dom_element_get_attribute(node, corestring_dom_src, &src);
-	if (exc != DOM_NO_ERR || src == NULL) {
-		return true;
-	}
-
-	err = nsurl_join(c->base_url, dom_string_data(src), &url);
-	if (err != NSERROR_OK) {
-		dom_string_unref(src);
-		return false;
-	}
-	dom_string_unref(src);
-
-	/* Speculatively fetch the image */
-	success = html_fetch_object(c, url, NULL, CONTENT_IMAGE, 0, 0, false);
-	nsurl_unref(url);
-
-	return success;
-}
 
 static void html_get_dimensions(html_content *htmlc)
 {
+	css_fixed device_dpi = nscss_screen_dpi;
+	unsigned f_size;
+	unsigned f_min;
 	unsigned w;
 	unsigned h;
 	union content_msg_data msg_data = {
@@ -583,13 +319,22 @@ static void html_get_dimensions(html_content *htmlc)
 
 	content_broadcast(&htmlc->base, CONTENT_MSG_GETDIMS, &msg_data);
 
-	htmlc->media.width  = nscss_pixels_physical_to_css(INTTOFIX(w));
-	htmlc->media.height = nscss_pixels_physical_to_css(INTTOFIX(h));
-	htmlc->media.client_font_size =
-			FDIV(INTTOFIX(nsoption_int(font_size)), F_10);
-	htmlc->media.client_line_height =
-			FMUL(nscss_len2px(NULL, htmlc->media.client_font_size,
-					CSS_UNIT_PT, NULL), FLTTOFIX(1.33));
+
+	w = css_unit_device2css_px(INTTOFIX(w), device_dpi);
+	h = css_unit_device2css_px(INTTOFIX(h), device_dpi);
+
+	htmlc->media.width  = w;
+	htmlc->media.height = h;
+	htmlc->unit_len_ctx.viewport_width  = w;
+	htmlc->unit_len_ctx.viewport_height = h;
+	htmlc->unit_len_ctx.device_dpi = device_dpi;
+
+	/** \todo Change nsoption font sizes to px. */
+	f_size = FDIV(FMUL(F_96, FDIV(INTTOFIX(nsoption_int(font_size)), F_10)), F_72);
+	f_min  = FDIV(FMUL(F_96, FDIV(INTTOFIX(nsoption_int(font_min_size)), F_10)), F_72);
+
+	htmlc->unit_len_ctx.font_size_default = f_size;
+	htmlc->unit_len_ctx.font_size_minimum = f_min;
 }
 
 /* exported function documented in html/html_internal.h */
@@ -602,7 +347,7 @@ void html_finish_conversion(html_content *htmlc)
 
 	/* Bail out if we've been aborted */
 	if (htmlc->aborted) {
-		content_broadcast_errorcode(&htmlc->base, NSERROR_STOPPED);
+		content_broadcast_error(&htmlc->base, NSERROR_STOPPED, NULL);
 		content_set_error(&htmlc->base);
 		return;
 	}
@@ -626,7 +371,7 @@ void html_finish_conversion(html_content *htmlc)
 	/* create new css selection context */
 	error = html_css_new_selection_context(htmlc, &htmlc->select_ctx);
 	if (error != NSERROR_OK) {
-		content_broadcast_errorcode(&htmlc->base, error);
+		content_broadcast_error(&htmlc->base, error, NULL);
 		content_set_error(&htmlc->base);
 		return;
 	}
@@ -636,8 +381,8 @@ void html_finish_conversion(html_content *htmlc)
 	 * object, but with its target set to the Document object (and
 	 * the currentTarget set to the Window object)
 	 */
-	if (htmlc->jscontext != NULL) {
-		js_fire_event(htmlc->jscontext, "load", htmlc->document, NULL);
+	if (htmlc->jsthread != NULL) {
+		js_fire_event(htmlc->jsthread, "load", htmlc->document, NULL);
 	}
 
 	/* convert dom tree to box tree */
@@ -649,19 +394,19 @@ void html_finish_conversion(html_content *htmlc)
 	exc = dom_document_get_document_element(htmlc->document, (void *) &html);
 	if ((exc != DOM_NO_ERR) || (html == NULL)) {
 		NSLOG(netsurf, INFO, "error retrieving html element from dom");
-		content_broadcast_errorcode(&htmlc->base, NSERROR_DOM);
+		content_broadcast_error(&htmlc->base, NSERROR_DOM, NULL);
 		content_set_error(&htmlc->base);
 		return;
 	}
 
 	html_get_dimensions(htmlc);
 
-	error = dom_to_box(html, htmlc, html_box_convert_done);
+	error = dom_to_box(html, htmlc, html_box_convert_done, &htmlc->box_conversion_context);
 	if (error != NSERROR_OK) {
 		NSLOG(netsurf, INFO, "box conversion failed");
 		dom_node_unref(html);
 		html_object_free_objects(htmlc);
-		content_broadcast_errorcode(&htmlc->base, error);
+		content_broadcast_error(&htmlc->base, error, NULL);
 		content_set_error(&htmlc->base);
 		return;
 	}
@@ -669,248 +414,6 @@ void html_finish_conversion(html_content *htmlc)
 	dom_node_unref(html);
 }
 
-/* handler for a SCRIPT which has been added to a tree */
-static void
-dom_SCRIPT_showed_up(html_content *htmlc, dom_html_script_element *script)
-{
-	dom_exception exc;
-	dom_html_script_element_flags flags;
-	dom_hubbub_error res;
-	bool within;
-
-	if (!htmlc->enable_scripting) {
-		NSLOG(netsurf, INFO, "Encountered a script, but scripting is off, ignoring");
-		return;
-	}
-
-	NSLOG(netsurf, DEEPDEBUG, "Encountered a script, node %p showed up", script);
-
-	exc = dom_html_script_element_get_flags(script, &flags);
-	if (exc != DOM_NO_ERR) {
-		NSLOG(netsurf, DEEPDEBUG, "Unable to retrieve flags, giving up");
-		return;
-	}
-
-	if (flags & DOM_HTML_SCRIPT_ELEMENT_FLAG_PARSER_INSERTED) {
-		NSLOG(netsurf, DEBUG, "Script was parser inserted, skipping");
-		return;
-	}
-
-	exc = dom_node_contains(htmlc->document, script, &within);
-	if (exc != DOM_NO_ERR) {
-		NSLOG(netsurf, DEBUG, "Unable to determine if script was within document, ignoring");
-		return;
-	}
-
-	if (!within) {
-		NSLOG(netsurf, DEBUG, "Script was not within the document, ignoring for now");
-		return;
-	}
-
-	res = html_process_script(htmlc, (dom_node *) script);
-	if (res == DOM_HUBBUB_OK) {
-		NSLOG(netsurf, DEEPDEBUG, "Inserted script has finished running");
-	} else {
-		if (res == (DOM_HUBBUB_HUBBUB_ERR | HUBBUB_PAUSED)) {
-			NSLOG(netsurf, DEEPDEBUG, "Inserted script has launced asynchronously");
-		} else {
-			NSLOG(netsurf, DEEPDEBUG, "Failure starting script");
-		}
-	}
-}
-
-/* callback for DOMNodeInserted end type */
-static void
-dom_default_action_DOMNodeInserted_cb(struct dom_event *evt, void *pw)
-{
-	dom_event_target *node;
-	dom_node_type type;
-	dom_exception exc;
-	html_content *htmlc = pw;
-
-	exc = dom_event_get_target(evt, &node);
-	if ((exc == DOM_NO_ERR) && (node != NULL)) {
-		exc = dom_node_get_node_type(node, &type);
-		if ((exc == DOM_NO_ERR) && (type == DOM_ELEMENT_NODE)) {
-			/* an element node has been inserted */
-			dom_html_element_type tag_type;
-
-			exc = dom_html_element_get_tag_type(node, &tag_type);
-			if (exc != DOM_NO_ERR) {
-				tag_type = DOM_HTML_ELEMENT_TYPE__UNKNOWN;
-			}
-
-			switch (tag_type) {
-			case DOM_HTML_ELEMENT_TYPE_LINK:
-				/* Handle stylesheet loading */
-				html_css_process_link(htmlc, (dom_node *)node);
-				/* Generic link handling */
-				html_process_link(htmlc, (dom_node *)node);
-				break;
-			case DOM_HTML_ELEMENT_TYPE_META:
-				if (htmlc->refresh)
-					break;
-				html_meta_refresh_process_element(htmlc,
-						(dom_node *)node);
-				break;
-			case DOM_HTML_ELEMENT_TYPE_TITLE:
-				if (htmlc->title != NULL)
-					break;
-				htmlc->title = dom_node_ref(node);
-				break;
-			case DOM_HTML_ELEMENT_TYPE_BASE:
-				html_process_base(htmlc, (dom_node *)node);
-				break;
-			case DOM_HTML_ELEMENT_TYPE_IMG:
-				html_process_img(htmlc, (dom_node *) node);
-				break;
-			case DOM_HTML_ELEMENT_TYPE_STYLE:
-				html_css_process_style(htmlc, (dom_node *) node);
-				break;
-			case DOM_HTML_ELEMENT_TYPE_SCRIPT:
-				dom_SCRIPT_showed_up(htmlc, (dom_html_script_element *) node);
-				break;
-			default:
-				break;
-			}
-			if (htmlc->enable_scripting) {
-				/* ensure javascript context is available */
-				if (htmlc->jscontext == NULL) {
-					union content_msg_data msg_data;
-
-					msg_data.jscontext = &htmlc->jscontext;
-					content_broadcast(&htmlc->base,
-							CONTENT_MSG_GETCTX,
-							&msg_data);
-					NSLOG(netsurf, INFO,
-					      "javascript context: %p (htmlc: %p)",
-					      htmlc->jscontext,
-					      htmlc);
-				}
-				if (htmlc->jscontext != NULL) {
-					js_handle_new_element(htmlc->jscontext,
-							(dom_element *) node);
-				}
-			}
-		}
-		dom_node_unref(node);
-	}
-}
-
-/* callback for DOMNodeInsertedIntoDocument end type */
-static void
-dom_default_action_DOMNodeInsertedIntoDocument_cb(struct dom_event *evt, void *pw)
-{
-	html_content *htmlc = pw;
-	dom_event_target *node;
-	dom_node_type type;
-	dom_exception exc;
-
-	exc = dom_event_get_target(evt, &node);
-	if ((exc == DOM_NO_ERR) && (node != NULL)) {
-		exc = dom_node_get_node_type(node, &type);
-		if ((exc == DOM_NO_ERR) && (type == DOM_ELEMENT_NODE)) {
-			/* an element node has been modified */
-			dom_html_element_type tag_type;
-
-			exc = dom_html_element_get_tag_type(node, &tag_type);
-			if (exc != DOM_NO_ERR) {
-				tag_type = DOM_HTML_ELEMENT_TYPE__UNKNOWN;
-			}
-
-			switch (tag_type) {
-			case DOM_HTML_ELEMENT_TYPE_SCRIPT:
-				dom_SCRIPT_showed_up(htmlc, (dom_html_script_element *) node);
-			default:
-				break;
-			}
-		}
-		dom_node_unref(node);
-	}
-}
-
-/* callback for DOMSubtreeModified end type */
-static void
-dom_default_action_DOMSubtreeModified_cb(struct dom_event *evt, void *pw)
-{
-	dom_event_target *node;
-	dom_node_type type;
-	dom_exception exc;
-	html_content *htmlc = pw;
-
-	exc = dom_event_get_target(evt, &node);
-	if ((exc == DOM_NO_ERR) && (node != NULL)) {
-		if (htmlc->title == (dom_node *)node) {
-			/* Node is our title node */
-			html_process_title(htmlc, (dom_node *)node);
-			dom_node_unref(node);
-			return;
-		}
-
-		exc = dom_node_get_node_type(node, &type);
-		if ((exc == DOM_NO_ERR) && (type == DOM_ELEMENT_NODE)) {
-			/* an element node has been modified */
-			dom_html_element_type tag_type;
-
-			exc = dom_html_element_get_tag_type(node, &tag_type);
-			if (exc != DOM_NO_ERR) {
-				tag_type = DOM_HTML_ELEMENT_TYPE__UNKNOWN;
-			}
-
-			switch (tag_type) {
-			case DOM_HTML_ELEMENT_TYPE_STYLE:
-				html_css_update_style(htmlc, (dom_node *)node);
-				break;
-			default:
-				break;
-			}
-		}
-		dom_node_unref(node);
-	}
-}
-
-static void
-dom_default_action_finished_cb(struct dom_event *evt, void *pw)
-{
-	html_content *htmlc = pw;
-
-	if (htmlc->jscontext != NULL)
-		js_event_cleanup(htmlc->jscontext, evt);
-}
-
-/* callback function selector
- *
- * selects a callback function for libdom to call based on the type and phase.
- * dom_default_action_phase from events/document_event.h
- *
- * The principle events are:
- *   DOMSubtreeModified
- *   DOMAttrModified
- *   DOMNodeInserted
- *   DOMNodeInsertedIntoDocument
- *
- * @return callback function pointer or NULL for none
- */
-static dom_default_action_callback
-dom_event_fetcher(dom_string *type,
-		  dom_default_action_phase phase,
-		  void **pw)
-{
-	NSLOG(netsurf, DEEPDEBUG, "phase:%d type:%s", phase, dom_string_data(type));
-
-	if (phase == DOM_DEFAULT_ACTION_END) {
-		if (dom_string_isequal(type, corestring_dom_DOMNodeInserted)) {
-			return dom_default_action_DOMNodeInserted_cb;
-		} else if (dom_string_isequal(type, corestring_dom_DOMNodeInsertedIntoDocument)) {
-			return dom_default_action_DOMNodeInsertedIntoDocument_cb;
-		} else if (dom_string_isequal(type, corestring_dom_DOMSubtreeModified)) {
-			return dom_default_action_DOMSubtreeModified_cb;
-		}
-	} else if (phase == DOM_DEFAULT_ACTION_FINISHED) {
-		return dom_default_action_finished_cb;
-	}
-	return NULL;
-}
 
 static void
 html_document_user_data_handler(dom_node_operation operation,
@@ -955,6 +458,8 @@ html_create_html_data(html_content *c, const http_parameter *params)
 	dom_hubbub_error error;
 	dom_exception err;
 	void *old_node_data;
+	const char *prefer_color_mode = (nsoption_bool(prefer_dark_mode)) ?
+			"dark" : "light";
 
 	c->parser = NULL;
 	c->parse_completed = false;
@@ -991,11 +496,9 @@ html_create_html_data(html_content *c, const http_parameter *params)
 	c->selection_owner.none = true;
 	c->focus_type = HTML_FOCUS_SELF;
 	c->focus_owner.self = true;
-	c->search = NULL;
-	c->search_string = NULL;
 	c->scripts_count = 0;
 	c->scripts = NULL;
-	c->jscontext = NULL;
+	c->jsthread = NULL;
 
 	c->enable_scripting = nsoption_bool(enable_javascript);
 	c->base.active = 1; /* The html content itself is active */
@@ -1004,7 +507,14 @@ html_create_html_data(html_content *c, const http_parameter *params)
 		return NSERROR_NOMEM;
 	}
 
-	selection_prepare(&c->sel, (struct content *)c, true);
+	if (lwc_intern_string(prefer_color_mode, strlen(prefer_color_mode),
+			&c->media.prefers_color_scheme) != lwc_error_ok) {
+		lwc_string_unref(c->universal);
+		c->universal = NULL;
+		return NSERROR_NOMEM;
+	}
+
+	c->sel = selection_create((struct content *)c);
 
 	nerror = http_parameter_list_find_item(params, corestring_lwc_charset, &charset);
 	if (nerror == NSERROR_OK) {
@@ -1015,6 +525,8 @@ html_create_html_data(html_content *c, const http_parameter *params)
 		if (c->encoding == NULL) {
 			lwc_string_unref(c->universal);
 			c->universal = NULL;
+			lwc_string_unref(c->media.prefers_color_scheme);
+			c->media.prefers_color_scheme = NULL;
 			return NSERROR_NOMEM;
 
 		}
@@ -1028,7 +540,7 @@ html_create_html_data(html_content *c, const http_parameter *params)
 	parse_params.msg = NULL;
 	parse_params.script = html_process_script;
 	parse_params.ctx = c;
-	parse_params.daf = dom_event_fetcher;
+	parse_params.daf = html_dom_event_fetcher;
 
 	error = dom_hubbub_parser_create(&parse_params,
 					 &c->parser,
@@ -1051,6 +563,8 @@ html_create_html_data(html_content *c, const http_parameter *params)
 
 		lwc_string_unref(c->universal);
 		c->universal = NULL;
+		lwc_string_unref(c->media.prefers_color_scheme);
+		c->media.prefers_color_scheme = NULL;
 
 		return libdom_hubbub_error_to_nserror(error);
 	}
@@ -1067,6 +581,8 @@ html_create_html_data(html_content *c, const http_parameter *params)
 
 		lwc_string_unref(c->universal);
 		c->universal = NULL;
+		lwc_string_unref(c->media.prefers_color_scheme);
+		c->media.prefers_color_scheme = NULL;
 
 		NSLOG(netsurf, INFO, "Unable to set user data.");
 		return NSERROR_DOM;
@@ -1110,14 +626,14 @@ html_create(const content_handler *handler,
 
 	error = html_create_html_data(html, params);
 	if (error != NSERROR_OK) {
-		content_broadcast_errorcode(&html->base, error);
+		content_broadcast_error(&html->base, error, NULL);
 		free(html);
 		return error;
 	}
 
 	error = html_css_new_stylesheets(html);
 	if (error != NSERROR_OK) {
-		content_broadcast_errorcode(&html->base, error);
+		content_broadcast_error(&html->base, error, NULL);
 		free(html);
 		return error;
 	}
@@ -1172,7 +688,7 @@ html_process_encoding_change(struct content *c,
 	parse_params.msg = NULL;
 	parse_params.script = html_process_script;
 	parse_params.ctx = html;
-	parse_params.daf = dom_event_fetcher;
+	parse_params.daf = html_dom_event_fetcher;
 
 	/* Create new binding, using the new encoding */
 	error = dom_hubbub_parser_create(&parse_params,
@@ -1236,7 +752,7 @@ html_process_data(struct content *c, const char *data, unsigned int size)
 
 	/* broadcast the error if necessary */
 	if (err != NSERROR_OK) {
-		content_broadcast_errorcode(c, err);
+		content_broadcast_error(c, err, NULL);
 		return false;
 	}
 
@@ -1338,11 +854,19 @@ html_begin_conversion(html_content *htmlc)
 		NSLOG(netsurf, INFO, "Completing parse (%p)", htmlc);
 		/* complete parsing */
 		error = dom_hubbub_parser_completed(htmlc->parser);
+		if (error == DOM_HUBBUB_HUBBUB_ERR_PAUSED && htmlc->base.active > 0) {
+			/* The act of completing the parse failed because we've
+			 * encountered a sync script which needs to run
+			 */
+			NSLOG(netsurf, INFO, "Completing parse brought synchronous JS to light, cannot complete yet");
+			return true;
+		}
 		if (error != DOM_HUBBUB_OK) {
 			NSLOG(netsurf, INFO, "Parsing failed");
 
-			content_broadcast_errorcode(&htmlc->base,
-						    libdom_hubbub_error_to_nserror(error));
+			content_broadcast_error(&htmlc->base,
+						libdom_hubbub_error_to_nserror(error),
+						NULL);
 
 			return false;
 		}
@@ -1360,7 +884,7 @@ html_begin_conversion(html_content *htmlc)
 		NSLOG(netsurf, INFO, "Conversion aborted (%p) (active: %u)",
 		      htmlc, htmlc->base.active);
 		content_set_error(&htmlc->base);
-		content_broadcast_errorcode(&htmlc->base, NSERROR_STOPPED);
+		content_broadcast_error(&htmlc->base, NSERROR_STOPPED, NULL);
 		return false;
 	}
 
@@ -1381,15 +905,17 @@ html_begin_conversion(html_content *htmlc)
 		encoding = dom_hubbub_parser_get_encoding(htmlc->parser,
 					&htmlc->encoding_source);
 		if (encoding == NULL) {
-			content_broadcast_errorcode(&htmlc->base,
-						    NSERROR_NOMEM);
+			content_broadcast_error(&htmlc->base,
+						NSERROR_NOMEM,
+						NULL);
 			return false;
 		}
 
 		htmlc->encoding = strdup(encoding);
 		if (htmlc->encoding == NULL) {
-			content_broadcast_errorcode(&htmlc->base,
-						    NSERROR_NOMEM);
+			content_broadcast_error(&htmlc->base,
+						NSERROR_NOMEM,
+						NULL);
 			return false;
 		}
 	}
@@ -1398,7 +924,7 @@ html_begin_conversion(html_content *htmlc)
 	exc = dom_document_get_document_element(htmlc->document, (void *) &html);
 	if ((exc != DOM_NO_ERR) || (html == NULL)) {
 		NSLOG(netsurf, INFO, "error retrieving html element from dom");
-		content_broadcast_errorcode(&htmlc->base, NSERROR_DOM);
+		content_broadcast_error(&htmlc->base, NSERROR_DOM, NULL);
 		return false;
 	}
 
@@ -1408,7 +934,7 @@ html_begin_conversion(html_content *htmlc)
 	    (!dom_string_caseless_lwc_isequal(node_name,
 			corestring_lwc_html))) {
 		NSLOG(netsurf, INFO, "root element not html");
-		content_broadcast_errorcode(&htmlc->base, NSERROR_DOM);
+		content_broadcast_error(&htmlc->base, NSERROR_DOM, NULL);
 		dom_node_unref(html);
 		return false;
 	}
@@ -1434,7 +960,7 @@ html_begin_conversion(html_content *htmlc)
 		}
 
 		if (ns_error != NSERROR_OK) {
-			content_broadcast_errorcode(&htmlc->base, ns_error);
+			content_broadcast_error(&htmlc->base, ns_error, NULL);
 
 			dom_node_unref(html);
 			return false;
@@ -1444,8 +970,9 @@ html_begin_conversion(html_content *htmlc)
 		f->action = strdup(nsurl_access(action));
 		nsurl_unref(action);
 		if (f->action == NULL) {
-			content_broadcast_errorcode(&htmlc->base,
-						    NSERROR_NOMEM);
+			content_broadcast_error(&htmlc->base,
+						NSERROR_NOMEM,
+						NULL);
 
 			dom_node_unref(html);
 			return false;
@@ -1455,8 +982,9 @@ html_begin_conversion(html_content *htmlc)
 		if (f->document_charset == NULL) {
 			f->document_charset = strdup(htmlc->encoding);
 			if (f->document_charset == NULL) {
-				content_broadcast_errorcode(&htmlc->base,
-							    NSERROR_NOMEM);
+				content_broadcast_error(&htmlc->base,
+							NSERROR_NOMEM,
+							NULL);
 				dom_node_unref(html);
 				return false;
 			}
@@ -1484,17 +1012,15 @@ static void html_stop(struct content *c)
 {
 	html_content *htmlc = (html_content *) c;
 
-	/* invalidate the html content reference to the javascript context
-	 * as it is about to become invalid and must not be used any
-	 * more.
-	 */
-	html_script_invalidate_ctx(htmlc);
-
 	switch (c->status) {
 	case CONTENT_STATUS_LOADING:
 		/* Still loading; simply flag that we've been aborted
 		 * html_convert/html_finish_conversion will do the rest */
 		htmlc->aborted = true;
+		if (htmlc->jsthread != NULL) {
+			/* Close the JS thread to cancel out any callbacks */
+			js_closethread(htmlc->jsthread);
+		}
 		break;
 
 	case CONTENT_STATUS_READY:
@@ -1536,9 +1062,11 @@ static void html_reformat(struct content *c, int width, int height)
 
 	htmlc->reflowing = true;
 
-	htmlc->len_ctx.vw = nscss_pixels_physical_to_css(width);
-	htmlc->len_ctx.vh = nscss_pixels_physical_to_css(height);
-	htmlc->len_ctx.root_style = htmlc->layout->style;
+	htmlc->unit_len_ctx.viewport_width = css_unit_device2css_px(
+			INTTOFIX(width), htmlc->unit_len_ctx.device_dpi);
+	htmlc->unit_len_ctx.viewport_height = css_unit_device2css_px(
+			INTTOFIX(height), htmlc->unit_len_ctx.device_dpi);
+	htmlc->unit_len_ctx.root_style = htmlc->layout->style;
 
 	layout_document(htmlc, width, height);
 	layout = htmlc->layout;
@@ -1557,9 +1085,10 @@ static void html_reformat(struct content *c, int width, int height)
 	if (c->height < layout->y + layout->descendant_y1)
 		c->height = layout->y + layout->descendant_y1;
 
-	selection_reinit(&htmlc->sel, htmlc->layout);
+	selection_reinit(htmlc->sel);
 
 	htmlc->reflowing = false;
+	htmlc->had_initial_layout = true;
 
 	/* calculate next reflow time at three times what it took to reflow */
 	nsu_getmonotonic_ms(&ms_after);
@@ -1677,6 +1206,15 @@ static void html_destroy(struct content *c)
 
 	NSLOG(netsurf, INFO, "content %p", c);
 
+	/* If we're still converting a layout, cancel it */
+	if (html->box_conversion_context != NULL) {
+		if (cancel_dom_to_box(html->box_conversion_context) != NSERROR_OK) {
+			NSLOG(netsurf, CRITICAL, "WARNING, Unable to cancel conversion context, browser may crash");
+		}
+	}
+
+	selection_destroy(html->sel);
+
 	/* Destroy forms */
 	for (f = html->forms; f != NULL; f = g) {
 		g = f->prev;
@@ -1692,6 +1230,14 @@ static void html_destroy(struct content *c)
 	if (html->base_url)
 		nsurl_unref(html->base_url);
 
+	/* At this point we can be moderately confident the JS is offline
+	 * so we destroy the JS thread.
+	 */
+	if (html->jsthread != NULL) {
+		js_destroythread(html->jsthread);
+		html->jsthread = NULL;
+	}
+
 	if (html->parser != NULL) {
 		dom_hubbub_parser_destroy(html->parser);
 		html->parser = NULL;
@@ -1743,6 +1289,11 @@ static void html_destroy(struct content *c)
 		html->universal = NULL;
 	}
 
+	if (html->media.prefers_color_scheme != NULL) {
+		lwc_string_unref(html->media.prefers_color_scheme);
+		html->media.prefers_color_scheme = NULL;
+	}
+
 	/* Free stylesheets */
 	html_css_free_stylesheets(html);
 
@@ -1774,7 +1325,7 @@ static nserror html_clone(const struct content *old, struct content **newc)
  * Handle a window containing a CONTENT_HTML being opened.
  */
 
-static void
+static nserror
 html_open(struct content *c,
 	  struct browser_window *bw,
 	  struct content *page,
@@ -1789,11 +1340,13 @@ html_open(struct content *c,
 	html->drag_owner.no_owner = true;
 
 	/* text selection */
-	selection_init(&html->sel, html->layout, &html->len_ctx);
+	selection_init(html->sel);
 	html->selection_type = HTML_SELECTION_NONE;
 	html->selection_owner.none = true;
 
 	html_object_open_objects(html, bw);
+
+	return NSERROR_OK;
 }
 
 
@@ -1801,27 +1354,25 @@ html_open(struct content *c,
  * Handle a window containing a CONTENT_HTML being closed.
  */
 
-static void html_close(struct content *c)
+static nserror html_close(struct content *c)
 {
 	html_content *htmlc = (html_content *) c;
+	nserror ret = NSERROR_OK;
 
-	selection_clear(&htmlc->sel, false);
-
-	if (htmlc->search != NULL) {
-		search_destroy_context(htmlc->search);
-	}
+	selection_clear(htmlc->sel, false);
 
 	/* clear the html content reference to the browser window */
 	htmlc->bw = NULL;
 
-	/* invalidate the html content reference to the javascript context
-	 * as it is about to become invalid and must not be used any
-	 * more.
-	 */
-	html_script_invalidate_ctx(htmlc);
-
 	/* remove all object references from the html content */
 	html_object_close_objects(htmlc);
+
+	if (htmlc->jsthread != NULL) {
+		/* Close, but do not destroy (yet) the JS thread */
+		ret = js_closethread(htmlc->jsthread);
+	}
+
+	return ret;
 }
 
 
@@ -1844,7 +1395,7 @@ static void html_clear_selection(struct content *c)
 		break;
 	case HTML_SELECTION_SELF:
 		assert(html->selection_owner.none == false);
-		selection_clear(&html->sel, true);
+		selection_clear(html->sel, true);
 		break;
 	case HTML_SELECTION_CONTENT:
 		content_clear_selection(html->selection_owner.content->object);
@@ -1873,7 +1424,7 @@ static char *html_get_selection(struct content *c)
 				gadget->data.text.ta);
 	case HTML_SELECTION_SELF:
 		assert(html->selection_owner.none == false);
-		return selection_get_copy(&html->sel);
+		return selection_get_copy(html->sel);
 	case HTML_SELECTION_CONTENT:
 		return content_get_selection(
 				html->selection_owner.content->object);
@@ -1910,7 +1461,7 @@ html_get_contextual_content(struct content *c, int x, int y,
 	struct box *next;
 	int box_x = 0, box_y = 0;
 
-	while ((next = box_at_point(&html->len_ctx, box, x, y,
+	while ((next = box_at_point(&html->unit_len_ctx, box, x, y,
 			&box_x, &box_y)) != NULL) {
 		box = next;
 
@@ -1921,8 +1472,11 @@ html_get_contextual_content(struct content *c, int x, int y,
 		}
 
 		if (box->iframe) {
+			float scale = browser_window_get_scale(box->iframe);
 			browser_window_get_features(box->iframe,
-					x - box_x, y - box_y, data);
+						    (x - box_x) * scale,
+						    (y - box_y) * scale,
+						    data);
 		}
 
 		if (box->object)
@@ -1988,7 +1542,7 @@ html_scroll_at_point(struct content *c, int x, int y, int scrx, int scry)
 
 	/* TODO: invert order; visit deepest box first */
 
-	while ((next = box_at_point(&html->len_ctx, box, x, y,
+	while ((next = box_at_point(&html->unit_len_ctx, box, x, y,
 			&box_x, &box_y)) != NULL) {
 		box = next;
 
@@ -1997,9 +1551,15 @@ html_scroll_at_point(struct content *c, int x, int y, int scrx, int scry)
 			continue;
 
 		/* Pass into iframe */
-		if (box->iframe && browser_window_scroll_at_point(box->iframe,
-				x - box_x, y - box_y, scrx, scry) == true)
-			return true;
+		if (box->iframe) {
+			float scale = browser_window_get_scale(box->iframe);
+
+			if (browser_window_scroll_at_point(box->iframe,
+							   (x - box_x) * scale,
+							   (y - box_y) * scale,
+							   scrx, scry) == true)
+				return true;
+		}
 
 		/* Pass into textarea widget */
 		if (box->gadget && (box->gadget->type == GADGET_TEXTAREA ||
@@ -2131,19 +1691,25 @@ static bool html_drop_file_at_point(struct content *c, int x, int y, char *file)
 	int box_x = 0, box_y = 0;
 
 	/* Scan box tree for boxes that can handle drop */
-	while ((next = box_at_point(&html->len_ctx, box, x, y,
+	while ((next = box_at_point(&html->unit_len_ctx, box, x, y,
 			&box_x, &box_y)) != NULL) {
 		box = next;
 
-		if (box->style && css_computed_visibility(box->style) ==
-				CSS_VISIBILITY_HIDDEN)
+		if (box->style &&
+		    css_computed_visibility(box->style) == CSS_VISIBILITY_HIDDEN)
 			continue;
 
-		if (box->iframe)
-			return browser_window_drop_file_at_point(box->iframe,
-					x - box_x, y - box_y, file);
+		if (box->iframe) {
+			float scale = browser_window_get_scale(box->iframe);
+			return browser_window_drop_file_at_point(
+				box->iframe,
+				(x - box_x) * scale,
+				(y - box_y) * scale,
+				file);
+		}
 
-		if (box->object && content_drop_file_at_point(box->object,
+		if (box->object &&
+		    content_drop_file_at_point(box->object,
 					x - box_x, y - box_y, file) == true)
 			return true;
 
@@ -2235,10 +1801,11 @@ static bool html_drop_file_at_point(struct content *c, int x, int y, char *file)
 		ret = guit->utf8->local_to_utf8(buffer, file_len, &utf8_buff);
 		if (ret != NSERROR_OK) {
 			/* bad encoding shouldn't happen */
+			NSLOG(netsurf, ERROR,
+			      "local to utf8 encoding failed (%s)",
+			      messages_get_errorcode(ret));
 			assert(ret != NSERROR_BAD_ENCODING);
-			NSLOG(netsurf, INFO, "local to utf8 encoding failed");
 			free(buffer);
-			guit->misc->warning("NoMemory", NULL);
 			return true;
 		}
 
@@ -2520,7 +2087,7 @@ bool html_get_id_offset(hlcache_handle *h, lwc_string *frag_id, int *x, int *y)
 	return false;
 }
 
-static bool html_exec(struct content *c, const char *src, size_t srclen)
+bool html_exec(struct content *c, const char *src, size_t srclen)
 {
 	html_content *htmlc = (html_content *)c;
 	bool result = false;
@@ -2547,41 +2114,41 @@ static bool html_exec(struct content *c, const char *src, size_t srclen)
 		NSLOG(netsurf, DEEPDEBUG, "Unable to retrieve body element");
 		goto out_no_body;
 	}
-	
+
 	err = dom_document_create_text_node(htmlc->document, dom_src, &text_node);
 	if (err != DOM_NO_ERR) {
 		NSLOG(netsurf, DEEPDEBUG, "Unable to exec, could not create text node");
 		goto out_no_text_node;
 	}
-	
+
 	err = dom_document_create_element(htmlc->document, corestring_dom_SCRIPT, &script_node);
 	if (err != DOM_NO_ERR) {
 		NSLOG(netsurf, DEEPDEBUG, "Unable to exec, could not create script node");
 		goto out_no_script_node;
 	}
-	
+
 	err = dom_node_append_child(script_node, text_node, &spare_node);
 	if (err != DOM_NO_ERR) {
 		NSLOG(netsurf, DEEPDEBUG, "Unable to exec, could not insert code node into script node");
 		goto out_unparented;
 	}
 	dom_node_unref(spare_node); /* We do not need the spare ref at all */
-	
+
 	err = dom_node_append_child(body_node, script_node, &spare_node);
 	if (err != DOM_NO_ERR) {
 		NSLOG(netsurf, DEEPDEBUG, "Unable to exec, could not insert script node into document body");
 		goto out_unparented;
 	}
 	dom_node_unref(spare_node); /* Again no need for the spare ref */
-	
+
 	/* We successfully inserted the node into the DOM */
-	
+
 	result = true;
-	
+
 	/* Now we unwind, starting by removing the script from wherever it
 	 * ended up parented
 	 */
-	
+
 	err = dom_node_get_parent_node(script_node, &spare_node);
 	if (err == DOM_NO_ERR && spare_node != NULL) {
 		dom_node *second_spare;
@@ -2604,6 +2171,35 @@ out_no_string:
 	return result;
 }
 
+/* See \ref content_saw_insecure_objects */
+static bool
+html_saw_insecure_objects(struct content *c)
+{
+	html_content *htmlc = (html_content *)c;
+	struct content_html_object *obj = htmlc->object_list;
+
+	/* Check through the object list */
+	while (obj != NULL) {
+		if (obj->content != NULL) {
+			if (content_saw_insecure_objects(obj->content))
+				return true;
+		}
+		obj = obj->next;
+	}
+
+	/* Now check the script list */
+	if (html_saw_insecure_scripts(htmlc)) {
+		return true;
+	}
+
+	/* Now check stylesheets */
+	if (html_css_saw_insecure_stylesheets(htmlc)) {
+		return true;
+	}
+
+	return false;
+}
+
 /**
  * Compute the type of a content
  *
@@ -2620,6 +2216,133 @@ static void html_fini(void)
 	html_css_fini();
 }
 
+/**
+ * Finds all occurrences of a given string in an html box
+ *
+ * \param pattern   the string pattern to search for
+ * \param p_len     pattern length
+ * \param cur       pointer to the current box
+ * \param case_sens whether to perform a case sensitive search
+ * \param context   The search context to add the entry to.
+ * \return true on success, false on memory allocation failure
+ */
+static nserror
+find_occurrences_html_box(const char *pattern,
+			  int p_len,
+			  struct box *cur,
+			  bool case_sens,
+			  struct textsearch_context *context)
+{
+	struct box *a;
+	nserror res = NSERROR_OK;
+
+	/* ignore this box, if there's no visible text */
+	if (!cur->object && cur->text) {
+		const char *text = cur->text;
+		unsigned length = cur->length;
+
+		while (length > 0) {
+			unsigned match_length;
+			unsigned match_offset;
+			const char *new_text;
+			const char *pos;
+
+			pos = content_textsearch_find_pattern(text,
+					   length,
+					   pattern,
+					   p_len,
+					   case_sens,
+					   &match_length);
+			if (!pos)
+				break;
+
+			/* found string in box => add to list */
+			match_offset = pos - cur->text;
+
+			res = content_textsearch_add_match(context,
+					cur->byte_offset + match_offset,
+					cur->byte_offset + match_offset + match_length,
+					cur,
+					cur);
+			if (res != NSERROR_OK) {
+				return res;
+			}
+
+			new_text = pos + match_length;
+			length -= (new_text - text);
+			text = new_text;
+		}
+	}
+
+	/* and recurse */
+	for (a = cur->children; a; a = a->next) {
+		res = find_occurrences_html_box(pattern,
+						p_len,
+						a,
+						case_sens,
+						context);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	return res;
+}
+
+/**
+ * Finds all occurrences of a given string in the html box tree
+ *
+ * \param pattern   the string pattern to search for
+ * \param p_len     pattern length
+ * \param c The content to search
+ * \param csens whether to perform a case sensitive search
+ * \param context   The search context to add the entry to.
+ * \return true on success, false on memory allocation failure
+ */
+static nserror
+html_textsearch_find(struct content *c,
+		     struct textsearch_context *context,
+		     const char *pattern,
+		     int p_len,
+		     bool csens)
+{
+	html_content *html = (html_content *)c;
+
+	if (html->layout == NULL) {
+		return NSERROR_INVALID;
+	}
+
+	return find_occurrences_html_box(pattern,
+					 p_len,
+					 html->layout,
+					 csens,
+					 context);
+}
+
+
+static nserror
+html_textsearch_bounds(struct content *c,
+		       unsigned start_idx,
+		       unsigned end_idx,
+		       struct box *start_box,
+		       struct box *end_box,
+		       struct rect *bounds)
+{
+	/* get box position and jump to it */
+	box_coords(start_box, &bounds->x0, &bounds->y0);
+	/* \todo: move x0 in by correct idx */
+	box_coords(end_box, &bounds->x1, &bounds->y1);
+	/* \todo: move x1 in by correct idx */
+	bounds->x1 += end_box->width;
+	bounds->y1 += end_box->height;
+
+	return NSERROR_OK;
+}
+
+
+/**
+ * HTML content handler function table
+ */
 static const content_handler html_content_handler = {
 	.fini = html_fini,
 	.create = html_create,
@@ -2639,17 +2362,23 @@ static const content_handler html_content_handler = {
 	.get_contextual_content = html_get_contextual_content,
 	.scroll_at_point = html_scroll_at_point,
 	.drop_file_at_point = html_drop_file_at_point,
-	.search = html_search,
-	.search_clear = html_search_clear,
 	.debug_dump = html_debug_dump,
 	.debug = html_debug,
 	.clone = html_clone,
 	.get_encoding = html_encoding,
 	.type = html_content_type,
 	.exec = html_exec,
+	.saw_insecure_objects = html_saw_insecure_objects,
+	.textsearch_find = html_textsearch_find,
+	.textsearch_bounds = html_textsearch_bounds,
+	.textselection_redraw = html_textselection_redraw,
+	.textselection_copy = html_textselection_copy,
+	.textselection_get_end = html_textselection_get_end,
 	.no_share = true,
 };
 
+
+/* exported function documented in html/html.h */
 nserror html_init(void)
 {
 	uint32_t i;
@@ -2673,19 +2402,3 @@ error:
 
 	return error;
 }
-
-/**
- * Get the browser window containing an HTML content
- *
- * \param  c	HTML content
- * \return the browser window
- */
-struct browser_window *html_get_browser_window(struct content *c)
-{
-	html_content *html = (html_content *) c;
-
-	assert(c != NULL);
-	assert(c->handler == &html_content_handler);
-
-	return html->bw;
-}
diff --git a/content/handlers/html/html_interaction.c b/content/handlers/html/html_interaction.c
deleted file mode 100644
index da4c67c40..000000000
--- a/content/handlers/html/html_interaction.c
+++ /dev/null
@@ -1,1453 +0,0 @@
-/*
- * Copyright 2006 James Bursa <bursa@users.sourceforge.net>
- * Copyright 2006 Richard Wilson <info@tinct.net>
- * Copyright 2008 Michael Drake <tlsa@netsurf-browser.org>
- * Copyright 2009 Paul Blokus <paul_pl@users.sourceforge.net>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file
- * implementation of user interaction with a CONTENT_HTML.
- */
-
-#include <assert.h>
-#include <stdbool.h>
-
-#include <dom/dom.h>
-
-#include "utils/corestrings.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
-#include "utils/log.h"
-#include "utils/nsoption.h"
-#include "netsurf/content.h"
-#include "netsurf/browser_window.h"
-#include "netsurf/mouse.h"
-#include "netsurf/misc.h"
-#include "netsurf/layout.h"
-#include "netsurf/keypress.h"
-#include "content/hlcache.h"
-#include "desktop/frames.h"
-#include "desktop/scrollbar.h"
-#include "desktop/selection.h"
-#include "desktop/textarea.h"
-#include "javascript/js.h"
-#include "desktop/gui_internal.h"
-
-#include "html/box.h"
-#include "html/box_textarea.h"
-#include "html/font.h"
-#include "html/form_internal.h"
-#include "html/html_internal.h"
-#include "html/imagemap.h"
-#include "html/search.h"
-
-/**
- * Get pointer shape for given box
- *
- * \param box       box in question
- * \param imagemap  whether an imagemap applies to the box
- */
-
-static browser_pointer_shape get_pointer_shape(struct box *box, bool imagemap)
-{
-	browser_pointer_shape pointer;
-	css_computed_style *style;
-	enum css_cursor_e cursor;
-	lwc_string **cursor_uris;
-
-	if (box->type == BOX_FLOAT_LEFT || box->type == BOX_FLOAT_RIGHT)
-		style = box->children->style;
-	else
-		style = box->style;
-
-	if (style == NULL)
-		return BROWSER_POINTER_DEFAULT;
-
-	cursor = css_computed_cursor(style, &cursor_uris);
-
-	switch (cursor) {
-	case CSS_CURSOR_AUTO:
-		if (box->href || (box->gadget &&
-				(box->gadget->type == GADGET_IMAGE ||
-				box->gadget->type == GADGET_SUBMIT)) ||
-				imagemap) {
-			/* link */
-			pointer = BROWSER_POINTER_POINT;
-		} else if (box->gadget &&
-				(box->gadget->type == GADGET_TEXTBOX ||
-				box->gadget->type == GADGET_PASSWORD ||
-				box->gadget->type == GADGET_TEXTAREA)) {
-			/* text input */
-			pointer = BROWSER_POINTER_CARET;
-		} else {
-			/* html content doesn't mind */
-			pointer = BROWSER_POINTER_AUTO;
-		}
-		break;
-	case CSS_CURSOR_CROSSHAIR:
-		pointer = BROWSER_POINTER_CROSS;
-		break;
-	case CSS_CURSOR_POINTER:
-		pointer = BROWSER_POINTER_POINT;
-		break;
-	case CSS_CURSOR_MOVE:
-		pointer = BROWSER_POINTER_MOVE;
-		break;
-	case CSS_CURSOR_E_RESIZE:
-		pointer = BROWSER_POINTER_RIGHT;
-		break;
-	case CSS_CURSOR_W_RESIZE:
-		pointer = BROWSER_POINTER_LEFT;
-		break;
-	case CSS_CURSOR_N_RESIZE:
-		pointer = BROWSER_POINTER_UP;
-		break;
-	case CSS_CURSOR_S_RESIZE:
-		pointer = BROWSER_POINTER_DOWN;
-		break;
-	case CSS_CURSOR_NE_RESIZE:
-		pointer = BROWSER_POINTER_RU;
-		break;
-	case CSS_CURSOR_SW_RESIZE:
-		pointer = BROWSER_POINTER_LD;
-		break;
-	case CSS_CURSOR_SE_RESIZE:
-		pointer = BROWSER_POINTER_RD;
-		break;
-	case CSS_CURSOR_NW_RESIZE:
-		pointer = BROWSER_POINTER_LU;
-		break;
-	case CSS_CURSOR_TEXT:
-		pointer = BROWSER_POINTER_CARET;
-		break;
-	case CSS_CURSOR_WAIT:
-		pointer = BROWSER_POINTER_WAIT;
-		break;
-	case CSS_CURSOR_PROGRESS:
-		pointer = BROWSER_POINTER_PROGRESS;
-		break;
-	case CSS_CURSOR_HELP:
-		pointer = BROWSER_POINTER_HELP;
-		break;
-	default:
-		pointer = BROWSER_POINTER_DEFAULT;
-		break;
-	}
-
-	return pointer;
-}
-
-
-/**
- * Start drag scrolling the contents of a box
- *
- * \param box	the box to be scrolled
- * \param x	x ordinate of initial mouse position
- * \param y	y ordinate
- */
-
-static void html_box_drag_start(struct box *box, int x, int y)
-{
-	int box_x, box_y;
-	int scroll_mouse_x, scroll_mouse_y;
-
-	box_coords(box, &box_x, &box_y);
-
-	if (box->scroll_x != NULL) {
-		scroll_mouse_x = x - box_x ;
-		scroll_mouse_y = y - (box_y + box->padding[TOP] +
-				box->height + box->padding[BOTTOM] -
-				SCROLLBAR_WIDTH);
-		scrollbar_start_content_drag(box->scroll_x,
-				scroll_mouse_x, scroll_mouse_y);
-	} else if (box->scroll_y != NULL) {
-		scroll_mouse_x = x - (box_x + box->padding[LEFT] +
-				box->width + box->padding[RIGHT] -
-				SCROLLBAR_WIDTH);
-		scroll_mouse_y = y - box_y;
-
-		scrollbar_start_content_drag(box->scroll_y,
-				scroll_mouse_x, scroll_mouse_y);
-	}
-}
-
-
-/**
- * End overflow scroll scrollbar drags
- *
- * \param html   html content
- * \param mouse  state of mouse buttons and modifier keys
- * \param x	 coordinate of mouse
- * \param y	 coordinate of mouse
- * \param dir    Direction of drag
- */
-static size_t html_selection_drag_end(struct html_content *html,
-		browser_mouse_state mouse, int x, int y, int dir)
-{
-	int pixel_offset;
-	struct box *box;
-	int dx, dy;
-	size_t idx = 0;
-
-	box = box_pick_text_box(html, x, y, dir, &dx, &dy);
-	if (box) {
-		plot_font_style_t fstyle;
-
-		font_plot_style_from_css(&html->len_ctx, box->style, &fstyle);
-
-		guit->layout->position(&fstyle, box->text, box->length,
-				       dx, &idx, &pixel_offset);
-
-		idx += box->byte_offset;
-	}
-
-	return idx;
-}
-
-
-/**
- * Handle mouse tracking (including drags) in an HTML content window.
- *
- * \param  c	  content of type html
- * \param  bw	  browser window
- * \param  mouse  state of mouse buttons and modifier keys
- * \param  x	  coordinate of mouse
- * \param  y	  coordinate of mouse
- */
-
-void html_mouse_track(struct content *c, struct browser_window *bw,
-		browser_mouse_state mouse, int x, int y)
-{
-	html_mouse_action(c, bw, mouse, x, y);
-}
-
-/**
- * Helper for file gadgets to store their filename.
- *
- * Stores the filename unencoded on the dom node associated with the
- * gadget.
- *
- * \todo Get rid of this crap eventually
- *
- * \param operation DOM operation
- * \param key DOM node key being considerd
- * \param _data The data assocated with the key
- * \param src The source DOM node.
- * \param dst The destination DOM node.
- */
-static void
-html__image_coords_dom_user_data_handler(dom_node_operation operation,
-					 dom_string *key,
-					 void *_data,
-					 struct dom_node *src,
-					 struct dom_node *dst)
-{
-	struct image_input_coords *oldcoords, *coords = _data, *newcoords;
-
-	if (!dom_string_isequal(corestring_dom___ns_key_image_coords_node_data,
-				key) || coords == NULL) {
-		return;
-	}
-
-	switch (operation) {
-	case DOM_NODE_CLONED:
-		newcoords = calloc(1, sizeof(*newcoords));
-		if (newcoords != NULL) {
-			*newcoords = *coords;
-			if (dom_node_set_user_data(dst,
-				 corestring_dom___ns_key_image_coords_node_data,
-				 newcoords,
-				 html__image_coords_dom_user_data_handler,
-				 &oldcoords) == DOM_NO_ERR) {
-				free(oldcoords);
-			}
-		}
-		break;
-
-	case DOM_NODE_DELETED:
-		free(coords);
-		break;
-
-	case DOM_NODE_RENAMED:
-	case DOM_NODE_IMPORTED:
-	case DOM_NODE_ADOPTED:
-		break;
-
-	default:
-		NSLOG(netsurf, INFO, "User data operation not handled.");
-		assert(0);
-	}
-}
-
-
-/**
- * End overflow scroll scrollbar drags
- *
- * \param  scrollbar  scrollbar widget
- * \param  mouse   state of mouse buttons and modifier keys
- * \param  x	   coordinate of mouse
- * \param  y	   coordinate of mouse
- */
-static void
-html_overflow_scroll_drag_end(struct scrollbar *scrollbar,
-			      browser_mouse_state mouse,
-			      int x, int y)
-{
-	int scroll_mouse_x, scroll_mouse_y, box_x, box_y;
-	struct html_scrollbar_data *data = scrollbar_get_data(scrollbar);
-	struct box *box;
-
-	box = data->box;
-	box_coords(box, &box_x, &box_y);
-
-	if (scrollbar_is_horizontal(scrollbar)) {
-		scroll_mouse_x = x - box_x;
-		scroll_mouse_y = y - (box_y + box->padding[TOP] +
-				box->height + box->padding[BOTTOM] -
-				SCROLLBAR_WIDTH);
-		scrollbar_mouse_drag_end(scrollbar, mouse,
-				scroll_mouse_x, scroll_mouse_y);
-	} else {
-		scroll_mouse_x = x - (box_x + box->padding[LEFT] +
-				box->width + box->padding[RIGHT] -
-				SCROLLBAR_WIDTH);
-		scroll_mouse_y = y - box_y;
-		scrollbar_mouse_drag_end(scrollbar, mouse,
-				scroll_mouse_x, scroll_mouse_y);
-	}
-}
-
-
-/**
- * Handle mouse clicks and movements in an HTML content window.
- *
- * \param  c	  content of type html
- * \param  bw	  browser window
- * \param  mouse  state of mouse buttons and modifier keys
- * \param  x	  coordinate of mouse
- * \param  y	  coordinate of mouse
- *
- * This function handles both hovering and clicking. It is important that the
- * code path is identical (except that hovering doesn't carry out the action),
- * so that the status bar reflects exactly what will happen. Having separate
- * code paths opens the possibility that an attacker will make the status bar
- * show some harmless action where clicking will be harmful.
- */
-
-void html_mouse_action(struct content *c, struct browser_window *bw,
-		browser_mouse_state mouse, int x, int y)
-{
-	html_content *html = (html_content *) c;
-	enum { ACTION_NONE, ACTION_SUBMIT, ACTION_GO } action = ACTION_NONE;
-	const char *title = 0;
-	nsurl *url = 0;
-	char *url_s = NULL;
-	size_t url_l = 0;
-	const char *target = 0;
-	char status_buffer[200];
-	const char *status = 0;
-	browser_pointer_shape pointer = BROWSER_POINTER_DEFAULT;
-	bool imagemap = false;
-	int box_x = 0, box_y = 0;
-	int gadget_box_x = 0, gadget_box_y = 0;
-	int html_object_pos_x = 0, html_object_pos_y = 0;
-	int text_box_x = 0;
-	struct box *url_box = 0;
-	struct box *gadget_box = 0;
-	struct box *text_box = 0;
-	struct box *box;
-	struct form_control *gadget = 0;
-	hlcache_handle *object = NULL;
-	struct box *html_object_box = NULL;
-	struct browser_window *iframe = NULL;
-	struct box *drag_candidate = NULL;
-	struct scrollbar *scrollbar = NULL;
-	plot_font_style_t fstyle;
-	int scroll_mouse_x = 0, scroll_mouse_y = 0;
-	int padding_left, padding_right, padding_top, padding_bottom;
-	browser_drag_type drag_type = browser_window_get_drag_type(bw);
-	union content_msg_data msg_data;
-	struct dom_node *node = NULL;
-	union html_drag_owner drag_owner;
-	union html_selection_owner sel_owner;
-	bool click = mouse & (BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_PRESS_2 |
-			BROWSER_MOUSE_CLICK_1 | BROWSER_MOUSE_CLICK_2 |
-			BROWSER_MOUSE_DRAG_1 | BROWSER_MOUSE_DRAG_2);
-
-	nserror res = NSERROR_OK;
-
-	if (drag_type != DRAGGING_NONE && !mouse &&
-			html->visible_select_menu != NULL) {
-		/* drag end: select menu */
-		form_select_mouse_drag_end(html->visible_select_menu,
-				mouse, x, y);
-	}
-
-	if (html->visible_select_menu != NULL) {
-		box = html->visible_select_menu->box;
-		box_coords(box, &box_x, &box_y);
-
-		box_x -= box->border[LEFT].width;
-		box_y += box->height + box->border[BOTTOM].width +
-				box->padding[BOTTOM] + box->padding[TOP];
-		status = form_select_mouse_action(html->visible_select_menu,
-				mouse, x - box_x, y - box_y);
-		if (status != NULL) {
-			msg_data.explicit_status_text = status;
-			content_broadcast(c, CONTENT_MSG_STATUS, &msg_data);
-		} else {
-			int width, height;
-			form_select_get_dimensions(html->visible_select_menu,
-					&width, &height);
-			html->visible_select_menu = NULL;
-			browser_window_redraw_rect(bw, box_x, box_y,
-					width, height);
-		}
-		return;
-	}
-
-	if (html->drag_type == HTML_DRAG_SELECTION) {
-		/* Selection drag */
-		struct box *box;
-		int dir = -1;
-		int dx, dy;
-
-		if (!mouse) {
-			/* End of selection drag */
-			int dir = -1;
-			size_t idx;
-
-			if (selection_dragging_start(&html->sel))
-				dir = 1;
-
-			idx = html_selection_drag_end(html, mouse, x, y, dir);
-
-			if (idx != 0)
-				selection_track(&html->sel, mouse, idx);
-
-			drag_owner.no_owner = true;
-			html_set_drag_type(html, HTML_DRAG_NONE,
-					drag_owner, NULL);
-			return;
-		}
-
-		if (selection_dragging_start(&html->sel))
-			dir = 1;
-
-		box = box_pick_text_box(html, x, y, dir, &dx, &dy);
-
-		if (box != NULL) {
-			int pixel_offset;
-			size_t idx;
-			plot_font_style_t fstyle;
-
-			font_plot_style_from_css(&html->len_ctx,
-					box->style, &fstyle);
-
-			guit->layout->position(&fstyle,
-					       box->text, box->length,
-					       dx, &idx, &pixel_offset);
-
-			selection_track(&html->sel, mouse,
-					box->byte_offset + idx);
-		}
-		return;
-	}
-
-	if (html->drag_type == HTML_DRAG_SCROLLBAR) {
-		struct scrollbar *scr = html->drag_owner.scrollbar;
-		struct html_scrollbar_data *data = scrollbar_get_data(scr);
-
-		if (!mouse) {
-			/* drag end: scrollbar */
-			html_overflow_scroll_drag_end(scr, mouse, x, y);
-		}
-
-		box = data->box;
-		box_coords(box, &box_x, &box_y);
-		if (scrollbar_is_horizontal(scr)) {
-			scroll_mouse_x = x - box_x ;
-			scroll_mouse_y = y - (box_y + box->padding[TOP] +
-					box->height + box->padding[BOTTOM] -
-					SCROLLBAR_WIDTH);
-			status = scrollbar_mouse_status_to_message(
-					scrollbar_mouse_action(scr, mouse,
-							scroll_mouse_x,
-							scroll_mouse_y));
-		} else {
-			scroll_mouse_x = x - (box_x + box->padding[LEFT] +
-					box->width + box->padding[RIGHT] -
-					SCROLLBAR_WIDTH);
-			scroll_mouse_y = y - box_y;
-			status = scrollbar_mouse_status_to_message(
-					scrollbar_mouse_action(scr, mouse,
-							scroll_mouse_x,
-							scroll_mouse_y));
-		}
-
-		msg_data.explicit_status_text = status;
-		content_broadcast(c, CONTENT_MSG_STATUS, &msg_data);
-		return;
-	}
-
-	if (html->drag_type == HTML_DRAG_TEXTAREA_SELECTION ||
-			html->drag_type == HTML_DRAG_TEXTAREA_SCROLLBAR) {
-		box = html->drag_owner.textarea;
-		assert(box->gadget != NULL);
-		assert(box->gadget->type == GADGET_TEXTAREA ||
-				box->gadget->type == GADGET_PASSWORD ||
-				box->gadget->type == GADGET_TEXTBOX);
-
-		box_coords(box, &box_x, &box_y);
-		textarea_mouse_action(box->gadget->data.text.ta, mouse,
-				x - box_x, y - box_y);
-
-		/* TODO: Set appropriate statusbar message */
-		return;
-	}
-
-	if (html->drag_type == HTML_DRAG_CONTENT_SELECTION ||
-			html->drag_type == HTML_DRAG_CONTENT_SCROLL) {
-		box = html->drag_owner.content;
-		assert(box->object != NULL);
-
-		box_coords(box, &box_x, &box_y);
-		content_mouse_track(box->object, bw, mouse,
-				x - box_x, y - box_y);
-		return;
-	}
-
-	if (html->drag_type == HTML_DRAG_CONTENT_SELECTION) {
-		box = html->drag_owner.content;
-		assert(box->object != NULL);
-
-		box_coords(box, &box_x, &box_y);
-		content_mouse_track(box->object, bw, mouse,
-				x - box_x, y - box_y);
-		return;
-	}
-
-	/* Content related drags handled by now */
-	assert(html->drag_type == HTML_DRAG_NONE);
-
-	/* search the box tree for a link, imagemap, form control, or
-	 * box with scrollbars
-	 */
-
-	box = html->layout;
-
-	/* Consider the margins of the html page now */
-	box_x = box->margin[LEFT];
-	box_y = box->margin[TOP];
-
-	/* descend through visible boxes setting more specific values for:
-	 * box - deepest box at point
-	 * html_object_box - html object
-	 * html_object_pos_x - html object
-	 * html_object_pos_y - html object
-	 * object - non html object
-	 * iframe - iframe
-	 * url - href or imagemap
-	 * target - href or imagemap or gadget
-	 * url_box - href or imagemap
-	 * imagemap - imagemap
-	 * gadget - gadget
-	 * gadget_box - gadget
-	 * gadget_box_x - gadget
-	 * gadget_box_y - gadget
-	 * title - title
-	 * pointer
-	 *
-	 * drag_candidate - first box with scroll
-	 * padding_left - box with scroll
-	 * padding_right
-	 * padding_top
-	 * padding_bottom
-	 * scrollbar - inside padding box stops decent
-	 * scroll_mouse_x - inside padding box stops decent
-	 * scroll_mouse_y - inside padding box stops decent
-	 *
-	 * text_box - text box
-	 * text_box_x - text_box
-	 */
-	do {
-		if ((box->style != NULL) &&
-		    (css_computed_visibility(box->style) ==
-		     CSS_VISIBILITY_HIDDEN)) {
-			continue;
-		}
-
-		if (box->node != NULL) {
-			node = box->node;
-		}
-
-		if (box->object) {
-			if (content_get_type(box->object) == CONTENT_HTML) {
-				html_object_box = box;
-				html_object_pos_x = box_x;
-				html_object_pos_y = box_y;
-			} else {
-				object = box->object;
-			}
-		}
-
-		if (box->iframe) {
-			iframe = box->iframe;
-		}
-
-		if (box->href) {
-			url = box->href;
-			target = box->target;
-			url_box = box;
-		}
-
-		if (box->usemap) {
-			url = imagemap_get(html, box->usemap,
-					box_x, box_y, x, y, &target);
-			if (url) {
-				imagemap = true;
-				url_box = box;
-			}
-		}
-
-		if (box->gadget) {
-			gadget = box->gadget;
-			gadget_box = box;
-			gadget_box_x = box_x;
-			gadget_box_y = box_y;
-			if (gadget->form)
-				target = gadget->form->target;
-		}
-
-		if (box->title) {
-			title = box->title;
-		}
-
-		pointer = get_pointer_shape(box, false);
-
-		if ((box->scroll_x != NULL) ||
-		    (box->scroll_y != NULL)) {
-
-			if (drag_candidate == NULL) {
-				drag_candidate = box;
-			}
-
-			padding_left = box_x +
-					scrollbar_get_offset(box->scroll_x);
-			padding_right = padding_left + box->padding[LEFT] +
-					box->width + box->padding[RIGHT];
-			padding_top = box_y +
-					scrollbar_get_offset(box->scroll_y);
-			padding_bottom = padding_top + box->padding[TOP] +
-					box->height + box->padding[BOTTOM];
-
-			if ((x > padding_left) &&
-			    (x < padding_right) &&
-			    (y > padding_top) &&
-			    (y < padding_bottom)) {
-				/* mouse inside padding box */
-
-				if ((box->scroll_y != NULL) &&
-						(x > (padding_right -
-							SCROLLBAR_WIDTH))) {
-					/* mouse above vertical box scroll */
-
-					scrollbar = box->scroll_y;
-					scroll_mouse_x = x - (padding_right -
-							     SCROLLBAR_WIDTH);
-					scroll_mouse_y = y - padding_top;
-					break;
-
-				} else if ((box->scroll_x != NULL) &&
-						(y > (padding_bottom -
-							SCROLLBAR_WIDTH))) {
-					/* mouse above horizontal box scroll */
-
-					scrollbar = box->scroll_x;
-					scroll_mouse_x = x - padding_left;
-					scroll_mouse_y = y - (padding_bottom -
-							SCROLLBAR_WIDTH);
-					break;
-				}
-			}
-		}
-
-		if (box->text && !box->object) {
-			text_box = box;
-			text_box_x = box_x;
-		}
-	} while ((box = box_at_point(&html->len_ctx, box, x, y,
-			&box_x, &box_y)) != NULL);
-
-	/* use of box_x, box_y, or content below this point is probably a
-	 * mistake; they will refer to the last box returned by box_at_point */
-	assert(node != NULL);
-
-	if (scrollbar) {
-		status = scrollbar_mouse_status_to_message(
-				scrollbar_mouse_action(scrollbar, mouse,
-						scroll_mouse_x,
-						scroll_mouse_y));
-		pointer = BROWSER_POINTER_DEFAULT;
-	} else if (gadget) {
-		textarea_mouse_status ta_status;
-
-		switch (gadget->type) {
-		case GADGET_SELECT:
-			status = messages_get("FormSelect");
-			pointer = BROWSER_POINTER_MENU;
-			if (mouse & BROWSER_MOUSE_CLICK_1 &&
-			    nsoption_bool(core_select_menu)) {
-				html->visible_select_menu = gadget;
-				form_open_select_menu(c, gadget,
-						form_select_menu_callback,
-						c);
-				pointer = BROWSER_POINTER_DEFAULT;
-			} else if (mouse & BROWSER_MOUSE_CLICK_1) {
-				msg_data.select_menu.gadget = gadget;
-				content_broadcast(c, CONTENT_MSG_SELECTMENU,
-						&msg_data);
-			}
-			break;
-		case GADGET_CHECKBOX:
-			status = messages_get("FormCheckbox");
-			if (mouse & BROWSER_MOUSE_CLICK_1) {
-				gadget->selected = !gadget->selected;
-				dom_html_input_element_set_checked(
-					(dom_html_input_element *)(gadget->node),
-					gadget->selected);
-				html__redraw_a_box(html, gadget_box);
-			}
-			break;
-		case GADGET_RADIO:
-			status = messages_get("FormRadio");
-			if (mouse & BROWSER_MOUSE_CLICK_1)
-				form_radio_set(gadget);
-			break;
-		case GADGET_IMAGE:
-			/* This falls through to SUBMIT */
-			if (mouse & BROWSER_MOUSE_CLICK_1) {
-				struct image_input_coords *coords, *oldcoords;
-				/** \todo Find a way to not ignore errors */
-				coords = calloc(1, sizeof(*coords));
-				if (coords == NULL) {
-					return;
-				}
-				coords->x = x - gadget_box_x;
-				coords->y = y - gadget_box_y;
-				if (dom_node_set_user_data(
-					    gadget->node,
-					    corestring_dom___ns_key_image_coords_node_data,
-					    coords, html__image_coords_dom_user_data_handler,
-					    &oldcoords) != DOM_NO_ERR)
-					return;
-				free(oldcoords);
-			}
-			/* Fall through */
-		case GADGET_SUBMIT:
-			if (gadget->form) {
-				snprintf(status_buffer, sizeof status_buffer,
-						messages_get("FormSubmit"),
-						gadget->form->action);
-				status = status_buffer;
-				pointer = get_pointer_shape(gadget_box, false);
-				if (mouse & (BROWSER_MOUSE_CLICK_1 |
-						BROWSER_MOUSE_CLICK_2))
-					action = ACTION_SUBMIT;
-			} else {
-				status = messages_get("FormBadSubmit");
-			}
-			break;
-		case GADGET_TEXTBOX:
-		case GADGET_PASSWORD:
-		case GADGET_TEXTAREA:
-			if (gadget->type == GADGET_TEXTAREA)
-				status = messages_get("FormTextarea");
-			else
-				status = messages_get("FormTextbox");
-
-			if (click && (html->selection_type !=
-					HTML_SELECTION_TEXTAREA ||
-					html->selection_owner.textarea !=
-					gadget_box)) {
-				sel_owner.none = true;
-				html_set_selection(html, HTML_SELECTION_NONE,
-						sel_owner, true);
-			}
-
-			ta_status = textarea_mouse_action(gadget->data.text.ta,
-					mouse, x - gadget_box_x,
-					y - gadget_box_y);
-
-			if (ta_status & TEXTAREA_MOUSE_EDITOR) {
-				pointer = get_pointer_shape(gadget_box, false);
-			} else {
-				pointer = BROWSER_POINTER_DEFAULT;
-				status = scrollbar_mouse_status_to_message(
-						ta_status >> 3);
-			}
-			break;
-		case GADGET_HIDDEN:
-			/* not possible: no box generated */
-			break;
-		case GADGET_RESET:
-			status = messages_get("FormReset");
-			break;
-		case GADGET_FILE:
-			status = messages_get("FormFile");
-			if (mouse & BROWSER_MOUSE_CLICK_1) {
-				msg_data.gadget_click.gadget = gadget;
-				content_broadcast(c, CONTENT_MSG_GADGETCLICK,
-						&msg_data);
-			}
-			break;
-		case GADGET_BUTTON:
-			/* This gadget cannot be activated */
-			status = messages_get("FormButton");
-			break;
-		}
-
-	} else if (object && (mouse & BROWSER_MOUSE_MOD_2)) {
-
-		if (mouse & BROWSER_MOUSE_DRAG_2) {
-			msg_data.dragsave.type = CONTENT_SAVE_NATIVE;
-			msg_data.dragsave.content = object;
-			content_broadcast(c, CONTENT_MSG_DRAGSAVE, &msg_data);
-
-		} else if (mouse & BROWSER_MOUSE_DRAG_1) {
-			msg_data.dragsave.type = CONTENT_SAVE_ORIG;
-			msg_data.dragsave.content = object;
-			content_broadcast(c, CONTENT_MSG_DRAGSAVE, &msg_data);
-		}
-
-		/* \todo should have a drag-saving object msg */
-
-	} else if (iframe) {
-		int pos_x, pos_y;
-		float scale = browser_window_get_scale(bw);
-
-		browser_window_get_position(iframe, false, &pos_x, &pos_y);
-
-		pos_x /= scale;
-		pos_y /= scale;
-
-		if (mouse & BROWSER_MOUSE_CLICK_1 ||
-				mouse & BROWSER_MOUSE_CLICK_2) {
-			browser_window_mouse_click(iframe, mouse,
-					x - pos_x, y - pos_y);
-		} else {
-			browser_window_mouse_track(iframe, mouse,
-					x - pos_x, y - pos_y);
-		}
-	} else if (html_object_box) {
-
-		if (click && (html->selection_type != HTML_SELECTION_CONTENT ||
-				html->selection_owner.content !=
-						html_object_box)) {
-			sel_owner.none = true;
-			html_set_selection(html, HTML_SELECTION_NONE,
-					sel_owner, true);
-		}
-		if (mouse & BROWSER_MOUSE_CLICK_1 ||
-				mouse & BROWSER_MOUSE_CLICK_2) {
-			content_mouse_action(html_object_box->object,
-					bw, mouse,
-					x - html_object_pos_x,
-					y - html_object_pos_y);
-		} else {
-			content_mouse_track(html_object_box->object,
-					bw, mouse,
-					x - html_object_pos_x,
-					y - html_object_pos_y);
-		}
-	} else if (url) {
-		if (nsoption_bool(display_decoded_idn) == true) {
-			res = nsurl_get_utf8(url, &url_s, &url_l);
-			if (res != NSERROR_OK) {
-				/* Unable to obtain a decoded IDN. This is not
-				 *  a fatal error.  Ensure the string pointer
-				 *  is NULL so we use the encoded version.
-				 */
-				url_s = NULL;
-			}
-		}
-
-		if (title) {
-			snprintf(status_buffer, sizeof status_buffer, "%s: %s",
-					url_s ? url_s : nsurl_access(url), title);
-		} else {
-			snprintf(status_buffer, sizeof status_buffer, "%s",
-					url_s ? url_s : nsurl_access(url));
-		}
-
-		status = status_buffer;
-
-		if (url_s != NULL)
-			free(url_s);
-
-		pointer = get_pointer_shape(url_box, imagemap);
-
-		if (mouse & BROWSER_MOUSE_CLICK_1 &&
-				mouse & BROWSER_MOUSE_MOD_1) {
-			/* force download of link */
-			browser_window_navigate(bw,
-				url,
-				content_get_url(c),
-				BW_NAVIGATE_DOWNLOAD,
-				NULL,
-				NULL,
-				NULL);
-
-		} else if (mouse & BROWSER_MOUSE_CLICK_2 &&
-				mouse & BROWSER_MOUSE_MOD_1) {
-			msg_data.savelink.url = url;
-			msg_data.savelink.title = title;
-			content_broadcast(c, CONTENT_MSG_SAVELINK, &msg_data);
-
-		} else if (mouse & (BROWSER_MOUSE_CLICK_1 |
-				BROWSER_MOUSE_CLICK_2))
-			action = ACTION_GO;
-	} else {
-		bool done = false;
-
-		/* frame resizing */
-		if (browser_window_frame_resize_start(bw, mouse, x, y,
-				&pointer)) {
-			if (mouse & (BROWSER_MOUSE_DRAG_1 |
-					BROWSER_MOUSE_DRAG_2)) {
-				status = messages_get("FrameDrag");
-			}
-			done = true;
-		}
-
-		/* if clicking in the main page, remove the selection from any
-		 * text areas */
-		if (!done) {
-
-			if (click && html->focus_type != HTML_FOCUS_SELF) {
-				union html_focus_owner fo;
-				fo.self = true;
-				html_set_focus(html, HTML_FOCUS_SELF, fo,
-						true, 0, 0, 0, NULL);
-			}
-			if (click && html->selection_type !=
-					HTML_SELECTION_SELF) {
-				sel_owner.none = true;
-				html_set_selection(html, HTML_SELECTION_NONE,
-						sel_owner, true);
-			}
-
-			if (text_box) {
-				int pixel_offset;
-				size_t idx;
-
-				font_plot_style_from_css(&html->len_ctx,
-						text_box->style, &fstyle);
-
-				guit->layout->position(&fstyle,
-						       text_box->text,
-						       text_box->length,
-						       x - text_box_x,
-						       &idx,
-						       &pixel_offset);
-
-				if (selection_click(&html->sel, mouse,
-						text_box->byte_offset + idx)) {
-					/* key presses must be directed at the
-					 * main browser window, paste text
-					 * operations ignored */
-					html_drag_type drag_type;
-					union html_drag_owner drag_owner;
-
-					if (selection_dragging(&html->sel)) {
-						drag_type = HTML_DRAG_SELECTION;
-						drag_owner.no_owner = true;
-						html_set_drag_type(html,
-								drag_type,
-								drag_owner,
-								NULL);
-						status = messages_get(
-								"Selecting");
-					}
-
-					done = true;
-				}
-
-			} else if (mouse & BROWSER_MOUSE_PRESS_1) {
-				sel_owner.none = true;
-				selection_clear(&html->sel, true);
-			}
-
-			if (selection_defined(&html->sel)) {
-				sel_owner.none = false;
-				html_set_selection(html, HTML_SELECTION_SELF,
-						sel_owner, true);
-			} else if (click && html->selection_type !=
-					HTML_SELECTION_NONE) {
-				sel_owner.none = true;
-				html_set_selection(html, HTML_SELECTION_NONE,
-						sel_owner, true);
-			}
-		}
-
-		if (!done) {
-			if (title)
-				status = title;
-
-			if (mouse & BROWSER_MOUSE_DRAG_1) {
-				if (mouse & BROWSER_MOUSE_MOD_2) {
-					msg_data.dragsave.type =
-							CONTENT_SAVE_COMPLETE;
-					msg_data.dragsave.content = NULL;
-					content_broadcast(c,
-							CONTENT_MSG_DRAGSAVE,
-							&msg_data);
-				} else {
-					if (drag_candidate == NULL) {
-						browser_window_page_drag_start(
-								bw, x, y);
-					} else {
-						html_box_drag_start(
-								drag_candidate,
-								x, y);
-					}
-					pointer = BROWSER_POINTER_MOVE;
-				}
-			}
-			else if (mouse & BROWSER_MOUSE_DRAG_2) {
-				if (mouse & BROWSER_MOUSE_MOD_2) {
-					msg_data.dragsave.type =
-							CONTENT_SAVE_SOURCE;
-					msg_data.dragsave.content = NULL;
-					content_broadcast(c,
-							CONTENT_MSG_DRAGSAVE,
-							&msg_data);
-				} else {
-					if (drag_candidate == NULL) {
-						browser_window_page_drag_start(
-								bw, x, y);
-					} else {
-						html_box_drag_start(
-								drag_candidate,
-								x, y);
-					}
-					pointer = BROWSER_POINTER_MOVE;
-				}
-			}
-		}
-		if (mouse && mouse < BROWSER_MOUSE_MOD_1) {
-			/* ensure key presses still act on the browser window */
-			union html_focus_owner fo;
-			fo.self = true;
-			html_set_focus(html, HTML_FOCUS_SELF, fo,
-					true, 0, 0, 0, NULL);
-		}
-	}
-
-	if (!iframe && !html_object_box) {
-		msg_data.explicit_status_text = status;
-		content_broadcast(c, CONTENT_MSG_STATUS, &msg_data);
-
-		msg_data.pointer = pointer;
-		content_broadcast(c, CONTENT_MSG_POINTER, &msg_data);
-	}
-
-	/* fire dom click event */
-	if (mouse & BROWSER_MOUSE_CLICK_1) {
-		fire_dom_event(corestring_dom_click, node, true, true);
-	}
-
-	/* deferred actions that can cause this browser_window to be destroyed
-	 * and must therefore be done after set_status/pointer
-	 */
-	switch (action) {
-	case ACTION_SUBMIT:
-		res = form_submit(content_get_url(c),
-				  browser_window_find_target(bw, target, mouse),
-				  gadget->form,
-				  gadget);
-		break;
-
-	case ACTION_GO:
-		res = browser_window_navigate(
-				browser_window_find_target(bw, target, mouse),
-				url,
-				content_get_url(c),
-				BW_NAVIGATE_HISTORY,
-				NULL,
-				NULL,
-				NULL);
-		break;
-
-	case ACTION_NONE:
-		res = NSERROR_OK;
-		break;
-	}
-
-	if (res != NSERROR_OK) {
-		guit->misc->warning(messages_get_errorcode(res), NULL);
-	}
-
-}
-
-
-/**
- * Handle keypresses.
- *
- * \param  c	content of type HTML
- * \param  key	The UCS4 character codepoint
- * \return true if key handled, false otherwise
- */
-
-bool html_keypress(struct content *c, uint32_t key)
-{
-	html_content *html = (html_content *) c;
-	struct selection *sel = &html->sel;
-	struct box *box;
-
-	switch (html->focus_type) {
-	case HTML_FOCUS_CONTENT:
-		box = html->focus_owner.content;
-		return content_keypress(box->object, key);
-
-	case HTML_FOCUS_TEXTAREA:
-		box = html->focus_owner.textarea;
-		return box_textarea_keypress(html, box, key);
-
-	default:
-		/* Deal with it below */
-		break;
-	}
-
-	switch (key) {
-	case NS_KEY_COPY_SELECTION:
-		selection_copy_to_clipboard(sel);
-		return true;
-
-	case NS_KEY_CLEAR_SELECTION:
-		selection_clear(sel, true);
-		return true;
-
-	case NS_KEY_SELECT_ALL:
-		selection_select_all(sel);
-		return true;
-
-	case NS_KEY_ESCAPE:
-		if (selection_defined(sel)) {
-			selection_clear(sel, true);
-			return true;
-		}
-
-		/* if there's no selection, leave Escape for the caller */
-		return false;
-	}
-
-	return false;
-}
-
-
-/**
- * Handle search.
- *
- * \param  c			content of type HTML
- * \param  context		front end private data
- * \param  flags		search flags
- * \param  string		search string
- */
-void html_search(struct content *c, void *context,
-		search_flags_t flags, const char *string)
-{
-	html_content *html = (html_content *)c;
-
-	assert(c != NULL);
-
-	if (string != NULL && html->search_string != NULL &&
-			strcmp(string, html->search_string) == 0 &&
-			html->search != NULL) {
-		/* Continue prev. search */
-		search_step(html->search, flags, string);
-
-	} else if (string != NULL) {
-		/* New search */
-		free(html->search_string);
-		html->search_string = strdup(string);
-		if (html->search_string == NULL)
-			return;
-
-		if (html->search != NULL) {
-			search_destroy_context(html->search);
-			html->search = NULL;
-		}
-
-		html->search = search_create_context(c, CONTENT_HTML, context);
-
-		if (html->search == NULL)
-			return;
-
-		search_step(html->search, flags, string);
-
-	} else {
-		/* Clear search */
-		html_search_clear(c);
-
-		free(html->search_string);
-		html->search_string = NULL;
-	}
-}
-
-
-/**
- * Terminate a search.
- *
- * \param  c			content of type HTML
- */
-void html_search_clear(struct content *c)
-{
-	html_content *html = (html_content *)c;
-
-	assert(c != NULL);
-
-	free(html->search_string);
-	html->search_string = NULL;
-
-	if (html->search != NULL) {
-		search_destroy_context(html->search);
-	}
-	html->search = NULL;
-}
-
-
-/**
- * Callback for in-page scrollbars.
- */
-void html_overflow_scroll_callback(void *client_data,
-		struct scrollbar_msg_data *scrollbar_data)
-{
-	struct html_scrollbar_data *data = client_data;
-	html_content *html = (html_content *)data->c;
-	struct box *box = data->box;
-	union content_msg_data msg_data;
-	html_drag_type drag_type;
-	union html_drag_owner drag_owner;
-
-	switch(scrollbar_data->msg) {
-	case SCROLLBAR_MSG_MOVED:
-
-		if (html->reflowing == true) {
-			/* Can't redraw during layout, and it will
-			 * be redrawn after layout anyway. */
-			break;
-		}
-
-		html__redraw_a_box(html, box);
-		break;
-	case SCROLLBAR_MSG_SCROLL_START:
-	{
-		struct rect rect = {
-			.x0 = scrollbar_data->x0,
-			.y0 = scrollbar_data->y0,
-			.x1 = scrollbar_data->x1,
-			.y1 = scrollbar_data->y1
-		};
-		drag_type = HTML_DRAG_SCROLLBAR;
-		drag_owner.scrollbar = scrollbar_data->scrollbar;
-		html_set_drag_type(html, drag_type, drag_owner, &rect);
-	}
-		break;
-	case SCROLLBAR_MSG_SCROLL_FINISHED:
-		drag_type = HTML_DRAG_NONE;
-		drag_owner.no_owner = true;
-		html_set_drag_type(html, drag_type, drag_owner, NULL);
-
-		msg_data.pointer = BROWSER_POINTER_AUTO;
-		content_broadcast(data->c, CONTENT_MSG_POINTER, &msg_data);
-		break;
-	}
-}
-
-
-/* Documented in html_internal.h */
-void html_set_drag_type(html_content *html, html_drag_type drag_type,
-		union html_drag_owner drag_owner, const struct rect *rect)
-{
-	union content_msg_data msg_data;
-
-	assert(html != NULL);
-
-	html->drag_type = drag_type;
-	html->drag_owner = drag_owner;
-
-	switch (drag_type) {
-	case HTML_DRAG_NONE:
-		assert(drag_owner.no_owner == true);
-		msg_data.drag.type = CONTENT_DRAG_NONE;
-		break;
-
-	case HTML_DRAG_SCROLLBAR:
-	case HTML_DRAG_TEXTAREA_SCROLLBAR:
-	case HTML_DRAG_CONTENT_SCROLL:
-		msg_data.drag.type = CONTENT_DRAG_SCROLL;
-		break;
-
-	case HTML_DRAG_SELECTION:
-		assert(drag_owner.no_owner == true);
-		/* Fall through */
-	case HTML_DRAG_TEXTAREA_SELECTION:
-	case HTML_DRAG_CONTENT_SELECTION:
-		msg_data.drag.type = CONTENT_DRAG_SELECTION;
-		break;
-	}
-	msg_data.drag.rect = rect;
-
-	/* Inform of the content's drag status change */
-	content_broadcast((struct content *)html, CONTENT_MSG_DRAG, &msg_data);
-}
-
-/* Documented in html_internal.h */
-void html_set_focus(html_content *html, html_focus_type focus_type,
-		union html_focus_owner focus_owner, bool hide_caret,
-		int x, int y, int height, const struct rect *clip)
-{
-	union content_msg_data msg_data;
-	int x_off = 0;
-	int y_off = 0;
-	struct rect cr;
-	bool textarea_lost_focus = html->focus_type == HTML_FOCUS_TEXTAREA &&
-			focus_type != HTML_FOCUS_TEXTAREA;
-
-	assert(html != NULL);
-
-	switch (focus_type) {
-	case HTML_FOCUS_SELF:
-		assert(focus_owner.self == true);
-		if (html->focus_type == HTML_FOCUS_SELF)
-			/* Don't need to tell anyone anything */
-			return;
-		break;
-
-	case HTML_FOCUS_CONTENT:
-		box_coords(focus_owner.content, &x_off, &y_off);
-		break;
-
-	case HTML_FOCUS_TEXTAREA:
-		box_coords(focus_owner.textarea, &x_off, &y_off);
-		break;
-	}
-
-	html->focus_type = focus_type;
-	html->focus_owner = focus_owner;
-
-	if (textarea_lost_focus) {
-		msg_data.caret.type = CONTENT_CARET_REMOVE;
-	} else if (focus_type != HTML_FOCUS_SELF && hide_caret) {
-		msg_data.caret.type = CONTENT_CARET_HIDE;
-	} else {
-		if (clip != NULL) {
-			cr = *clip;
-			cr.x0 += x_off;
-			cr.y0 += y_off;
-			cr.x1 += x_off;
-			cr.y1 += y_off;
-		}
-
-		msg_data.caret.type = CONTENT_CARET_SET_POS;
-		msg_data.caret.pos.x = x + x_off;
-		msg_data.caret.pos.y = y + y_off;
-		msg_data.caret.pos.height = height;
-		msg_data.caret.pos.clip = (clip == NULL) ? NULL : &cr;
-	}
-
-	/* Inform of the content's drag status change */
-	content_broadcast((struct content *)html, CONTENT_MSG_CARET, &msg_data);
-}
-
-/* Documented in html_internal.h */
-void html_set_selection(html_content *html, html_selection_type selection_type,
-		union html_selection_owner selection_owner, bool read_only)
-{
-	union content_msg_data msg_data;
-	struct box *box;
-	bool changed = false;
-	bool same_type = html->selection_type == selection_type;
-
-	assert(html != NULL);
-
-	if ((selection_type == HTML_SELECTION_NONE &&
-			html->selection_type != HTML_SELECTION_NONE) ||
-			(selection_type != HTML_SELECTION_NONE &&
-			html->selection_type == HTML_SELECTION_NONE))
-		/* Existance of selection has changed, and we'll need to
-		 * inform our owner */
-		changed = true;
-
-	/* Clear any existing selection */
-	if (html->selection_type != HTML_SELECTION_NONE) {
-		switch (html->selection_type) {
-		case HTML_SELECTION_SELF:
-			if (same_type)
-				break;
-			selection_clear(&html->sel, true);
-			break;
-		case HTML_SELECTION_TEXTAREA:
-			if (same_type && html->selection_owner.textarea ==
-					selection_owner.textarea)
-				break;
-			box = html->selection_owner.textarea;
-			textarea_clear_selection(box->gadget->data.text.ta);
-			break;
-		case HTML_SELECTION_CONTENT:
-			if (same_type && html->selection_owner.content ==
-					selection_owner.content)
-				break;
-			box = html->selection_owner.content;
-			content_clear_selection(box->object);
-			break;
-		default:
-			break;
-		}
-	}
-
-	html->selection_type = selection_type;
-	html->selection_owner = selection_owner;
-
-	if (!changed)
-		/* Don't need to report lack of change to owner */
-		return;
-
-	/* Prepare msg */
-	switch (selection_type) {
-	case HTML_SELECTION_NONE:
-		assert(selection_owner.none == true);
-		msg_data.selection.selection = false;
-		break;
-	case HTML_SELECTION_SELF:
-		assert(selection_owner.none == false);
-		/* fall through */
-	case HTML_SELECTION_TEXTAREA:
-	case HTML_SELECTION_CONTENT:
-		msg_data.selection.selection = true;
-		break;
-	default:
-		break;
-	}
-	msg_data.selection.read_only = read_only;
-
-	/* Inform of the content's selection status change */
-	content_broadcast((struct content *)html, CONTENT_MSG_SELECTION,
-			&msg_data);
-}
diff --git a/content/handlers/html/imagemap.c b/content/handlers/html/imagemap.c
index 0c3576842..f23be2353 100644
--- a/content/handlers/html/imagemap.c
+++ b/content/handlers/html/imagemap.c
@@ -36,7 +36,8 @@
 #include "content/hlcache.h"
 
 #include "html/box.h"
-#include "html/html_internal.h"
+#include "html/box_construct.h"
+#include "html/private.h"
 #include "html/imagemap.h"
 
 #define HASH_SIZE 31 /* fixed size hash table */
diff --git a/content/handlers/html/interaction.c b/content/handlers/html/interaction.c
new file mode 100644
index 000000000..0a843e026
--- /dev/null
+++ b/content/handlers/html/interaction.c
@@ -0,0 +1,1816 @@
+/*
+ * Copyright 2006 James Bursa <bursa@users.sourceforge.net>
+ * Copyright 2006 Richard Wilson <info@tinct.net>
+ * Copyright 2008 Michael Drake <tlsa@netsurf-browser.org>
+ * Copyright 2009 Paul Blokus <paul_pl@users.sourceforge.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * implementation of user interaction with a CONTENT_HTML.
+ */
+
+#include <assert.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include <dom/dom.h>
+
+#include "utils/corestrings.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
+#include "utils/log.h"
+#include "utils/nsoption.h"
+#include "netsurf/content.h"
+#include "netsurf/browser_window.h"
+#include "netsurf/mouse.h"
+#include "netsurf/misc.h"
+#include "netsurf/layout.h"
+#include "netsurf/keypress.h"
+#include "content/hlcache.h"
+#include "content/textsearch.h"
+#include "desktop/frames.h"
+#include "desktop/scrollbar.h"
+#include "desktop/selection.h"
+#include "desktop/textarea.h"
+#include "javascript/js.h"
+#include "desktop/gui_internal.h"
+
+#include "html/box.h"
+#include "html/box_textarea.h"
+#include "html/box_inspect.h"
+#include "html/font.h"
+#include "html/form_internal.h"
+#include "html/private.h"
+#include "html/imagemap.h"
+#include "html/interaction.h"
+
+/**
+ * Get pointer shape for given box
+ *
+ * \param box       box in question
+ * \param imagemap  whether an imagemap applies to the box
+ */
+
+static browser_pointer_shape get_pointer_shape(struct box *box, bool imagemap)
+{
+	browser_pointer_shape pointer;
+	css_computed_style *style;
+	enum css_cursor_e cursor;
+	lwc_string **cursor_uris;
+
+	if (box->type == BOX_FLOAT_LEFT || box->type == BOX_FLOAT_RIGHT)
+		style = box->children->style;
+	else
+		style = box->style;
+
+	if (style == NULL)
+		return BROWSER_POINTER_DEFAULT;
+
+	cursor = css_computed_cursor(style, &cursor_uris);
+
+	switch (cursor) {
+	case CSS_CURSOR_AUTO:
+		if (box->href || (box->gadget &&
+				(box->gadget->type == GADGET_IMAGE ||
+				box->gadget->type == GADGET_SUBMIT)) ||
+				imagemap) {
+			/* link */
+			pointer = BROWSER_POINTER_POINT;
+		} else if (box->gadget &&
+				(box->gadget->type == GADGET_TEXTBOX ||
+				box->gadget->type == GADGET_PASSWORD ||
+				box->gadget->type == GADGET_TEXTAREA)) {
+			/* text input */
+			pointer = BROWSER_POINTER_CARET;
+		} else {
+			/* html content doesn't mind */
+			pointer = BROWSER_POINTER_AUTO;
+		}
+		break;
+	case CSS_CURSOR_CROSSHAIR:
+		pointer = BROWSER_POINTER_CROSS;
+		break;
+	case CSS_CURSOR_POINTER:
+		pointer = BROWSER_POINTER_POINT;
+		break;
+	case CSS_CURSOR_MOVE:
+		pointer = BROWSER_POINTER_MOVE;
+		break;
+	case CSS_CURSOR_E_RESIZE:
+		pointer = BROWSER_POINTER_RIGHT;
+		break;
+	case CSS_CURSOR_W_RESIZE:
+		pointer = BROWSER_POINTER_LEFT;
+		break;
+	case CSS_CURSOR_N_RESIZE:
+		pointer = BROWSER_POINTER_UP;
+		break;
+	case CSS_CURSOR_S_RESIZE:
+		pointer = BROWSER_POINTER_DOWN;
+		break;
+	case CSS_CURSOR_NE_RESIZE:
+		pointer = BROWSER_POINTER_RU;
+		break;
+	case CSS_CURSOR_SW_RESIZE:
+		pointer = BROWSER_POINTER_LD;
+		break;
+	case CSS_CURSOR_SE_RESIZE:
+		pointer = BROWSER_POINTER_RD;
+		break;
+	case CSS_CURSOR_NW_RESIZE:
+		pointer = BROWSER_POINTER_LU;
+		break;
+	case CSS_CURSOR_TEXT:
+		pointer = BROWSER_POINTER_CARET;
+		break;
+	case CSS_CURSOR_WAIT:
+		pointer = BROWSER_POINTER_WAIT;
+		break;
+	case CSS_CURSOR_PROGRESS:
+		pointer = BROWSER_POINTER_PROGRESS;
+		break;
+	case CSS_CURSOR_HELP:
+		pointer = BROWSER_POINTER_HELP;
+		break;
+	default:
+		pointer = BROWSER_POINTER_DEFAULT;
+		break;
+	}
+
+	return pointer;
+}
+
+
+/**
+ * Start drag scrolling the contents of a box
+ *
+ * \param box	the box to be scrolled
+ * \param x	x ordinate of initial mouse position
+ * \param y	y ordinate
+ */
+
+static void html_box_drag_start(struct box *box, int x, int y)
+{
+	int box_x, box_y;
+	int scroll_mouse_x, scroll_mouse_y;
+
+	box_coords(box, &box_x, &box_y);
+
+	if (box->scroll_x != NULL) {
+		scroll_mouse_x = x - box_x ;
+		scroll_mouse_y = y - (box_y + box->padding[TOP] +
+				box->height + box->padding[BOTTOM] -
+				SCROLLBAR_WIDTH);
+		scrollbar_start_content_drag(box->scroll_x,
+				scroll_mouse_x, scroll_mouse_y);
+	} else if (box->scroll_y != NULL) {
+		scroll_mouse_x = x - (box_x + box->padding[LEFT] +
+				box->width + box->padding[RIGHT] -
+				SCROLLBAR_WIDTH);
+		scroll_mouse_y = y - box_y;
+
+		scrollbar_start_content_drag(box->scroll_y,
+				scroll_mouse_x, scroll_mouse_y);
+	}
+}
+
+
+/**
+ * End overflow scroll scrollbar drags
+ *
+ * \param html   html content
+ * \param mouse  state of mouse buttons and modifier keys
+ * \param x	 coordinate of mouse
+ * \param y	 coordinate of mouse
+ * \param dir    Direction of drag
+ */
+static size_t html_selection_drag_end(struct html_content *html,
+		browser_mouse_state mouse, int x, int y, int dir)
+{
+	int pixel_offset;
+	struct box *box;
+	int dx, dy;
+	size_t idx = 0;
+
+	box = box_pick_text_box(html, x, y, dir, &dx, &dy);
+	if (box) {
+		plot_font_style_t fstyle;
+
+		font_plot_style_from_css(&html->unit_len_ctx, box->style, &fstyle);
+
+		guit->layout->position(&fstyle, box->text, box->length,
+				       dx, &idx, &pixel_offset);
+
+		idx += box->byte_offset;
+	}
+
+	return idx;
+}
+
+
+/**
+ * Helper for file gadgets to store their filename.
+ *
+ * Stores the filename unencoded on the dom node associated with the
+ * gadget.
+ *
+ * \todo Get rid of this crap eventually
+ *
+ * \param operation DOM operation
+ * \param key DOM node key being considerd
+ * \param _data The data assocated with the key
+ * \param src The source DOM node.
+ * \param dst The destination DOM node.
+ */
+static void
+html__image_coords_dom_user_data_handler(dom_node_operation operation,
+					 dom_string *key,
+					 void *_data,
+					 struct dom_node *src,
+					 struct dom_node *dst)
+{
+	struct image_input_coords *oldcoords, *coords = _data, *newcoords;
+
+	if (!dom_string_isequal(corestring_dom___ns_key_image_coords_node_data,
+				key) || coords == NULL) {
+		return;
+	}
+
+	switch (operation) {
+	case DOM_NODE_CLONED:
+		newcoords = calloc(1, sizeof(*newcoords));
+		if (newcoords != NULL) {
+			*newcoords = *coords;
+			if (dom_node_set_user_data(dst,
+				 corestring_dom___ns_key_image_coords_node_data,
+				 newcoords,
+				 html__image_coords_dom_user_data_handler,
+				 &oldcoords) == DOM_NO_ERR) {
+				free(oldcoords);
+			}
+		}
+		break;
+
+	case DOM_NODE_DELETED:
+		free(coords);
+		break;
+
+	case DOM_NODE_RENAMED:
+	case DOM_NODE_IMPORTED:
+	case DOM_NODE_ADOPTED:
+		break;
+
+	default:
+		NSLOG(netsurf, INFO, "User data operation not handled.");
+		assert(0);
+	}
+}
+
+
+/**
+ * End overflow scroll scrollbar drags
+ *
+ * \param  scrollbar  scrollbar widget
+ * \param  mouse   state of mouse buttons and modifier keys
+ * \param  x	   coordinate of mouse
+ * \param  y	   coordinate of mouse
+ */
+static void
+html_overflow_scroll_drag_end(struct scrollbar *scrollbar,
+			      browser_mouse_state mouse,
+			      int x, int y)
+{
+	int scroll_mouse_x, scroll_mouse_y, box_x, box_y;
+	struct html_scrollbar_data *data = scrollbar_get_data(scrollbar);
+	struct box *box;
+
+	box = data->box;
+	box_coords(box, &box_x, &box_y);
+
+	if (scrollbar_is_horizontal(scrollbar)) {
+		scroll_mouse_x = x - box_x;
+		scroll_mouse_y = y - (box_y + box->padding[TOP] +
+				box->height + box->padding[BOTTOM] -
+				SCROLLBAR_WIDTH);
+		scrollbar_mouse_drag_end(scrollbar, mouse,
+				scroll_mouse_x, scroll_mouse_y);
+	} else {
+		scroll_mouse_x = x - (box_x + box->padding[LEFT] +
+				box->width + box->padding[RIGHT] -
+				SCROLLBAR_WIDTH);
+		scroll_mouse_y = y - box_y;
+		scrollbar_mouse_drag_end(scrollbar, mouse,
+				scroll_mouse_x, scroll_mouse_y);
+	}
+}
+
+
+/**
+ * handle html mouse action when select menu is open
+ *
+ */
+static nserror
+mouse_action_select_menu(html_content *html,
+			 struct browser_window *bw,
+			 browser_mouse_state mouse,
+			 int x, int y)
+{
+	struct box *box;
+	int box_x = 0;
+	int box_y = 0;
+	const char *status;
+	int width, height;
+	struct hlcache_handle *bw_content;
+	browser_drag_type bw_drag_type;
+
+	assert(html->visible_select_menu != NULL);
+
+	bw_drag_type = browser_window_get_drag_type(bw);
+	if (bw_drag_type != DRAGGING_NONE && !mouse) {
+		/* drag end: select menu */
+		form_select_mouse_drag_end(html->visible_select_menu, mouse, x, y);
+	}
+
+	box = html->visible_select_menu->box;
+	box_coords(box, &box_x, &box_y);
+
+	box_x -= box->border[LEFT].width;
+	box_y += box->height + box->border[BOTTOM].width +
+		box->padding[BOTTOM] + box->padding[TOP];
+
+	status = form_select_mouse_action(html->visible_select_menu,
+					  mouse,
+					  x - box_x,
+					  y - box_y);
+	if (status != NULL) {
+		/* set status if menu still open */
+		union content_msg_data msg_data;
+		msg_data.explicit_status_text = status;
+		content_broadcast((struct content *)html,
+				  CONTENT_MSG_STATUS,
+				  &msg_data);
+		return NSERROR_OK;
+	}
+
+	/* close menu and redraw where it was */
+	form_select_get_dimensions(html->visible_select_menu, &width, &height);
+
+	html->visible_select_menu = NULL;
+
+	bw_content = browser_window_get_content(bw);
+	content_request_redraw(bw_content,
+			       box_x,
+			       box_y,
+			       width,
+			       height);
+	return NSERROR_OK;
+}
+
+
+/**
+ * handle html mouse action when a selection drag is being performed
+ *
+ */
+static nserror
+mouse_action_drag_selection(html_content *html,
+			    struct browser_window *bw,
+			    browser_mouse_state mouse,
+			    int x, int y)
+{
+	struct box *box;
+	int dir = -1;
+	int dx, dy;
+	size_t idx;
+	union html_drag_owner drag_owner;
+	int pixel_offset;
+	plot_font_style_t fstyle;
+
+	if (!mouse) {
+		/* End of selection drag */
+		if (selection_dragging_start(html->sel)) {
+			dir = 1;
+		}
+
+		idx = html_selection_drag_end(html, mouse, x, y, dir);
+
+		if (idx != 0) {
+			selection_track(html->sel, mouse, idx);
+		}
+
+		drag_owner.no_owner = true;
+		html_set_drag_type(html, HTML_DRAG_NONE, drag_owner, NULL);
+
+		return NSERROR_OK;
+	}
+
+	if (selection_dragging_start(html->sel)) {
+		dir = 1;
+	}
+
+	box = box_pick_text_box(html, x, y, dir, &dx, &dy);
+	if (box != NULL) {
+		font_plot_style_from_css(&html->unit_len_ctx, box->style, &fstyle);
+
+		guit->layout->position(&fstyle,
+				       box->text,
+				       box->length,
+				       dx,
+				       &idx,
+				       &pixel_offset);
+
+		selection_track(html->sel, mouse, box->byte_offset + idx);
+	}
+	return NSERROR_OK;
+}
+
+
+/**
+ * handle html mouse action when a scrollbar drag is being performed
+ *
+ */
+static nserror
+mouse_action_drag_scrollbar(html_content *html,
+			    struct browser_window *bw,
+			    browser_mouse_state mouse,
+			    int x, int y)
+{
+	struct scrollbar *scr;
+	struct html_scrollbar_data *data;
+	struct box *box;
+	int box_x = 0;
+	int box_y = 0;
+	const char *status;
+	int scroll_mouse_x = 0, scroll_mouse_y = 0;
+	scrollbar_mouse_status scrollbar_status;
+
+	scr = html->drag_owner.scrollbar;
+
+	if (!mouse) {
+		/* drag end: scrollbar */
+		html_overflow_scroll_drag_end(scr, mouse, x, y);
+	}
+
+	data = scrollbar_get_data(scr);
+
+	box = data->box;
+
+	box_coords(box, &box_x, &box_y);
+
+	if (scrollbar_is_horizontal(scr)) {
+		scroll_mouse_x = x - box_x ;
+		scroll_mouse_y = y - (box_y + box->padding[TOP] +
+				      box->height + box->padding[BOTTOM] -
+				      SCROLLBAR_WIDTH);
+		scrollbar_status = scrollbar_mouse_action(scr,
+							  mouse,
+							  scroll_mouse_x,
+							  scroll_mouse_y);
+	} else {
+		scroll_mouse_x = x - (box_x + box->padding[LEFT] +
+				      box->width + box->padding[RIGHT] -
+				      SCROLLBAR_WIDTH);
+		scroll_mouse_y = y - box_y;
+
+		scrollbar_status = scrollbar_mouse_action(scr,
+							  mouse,
+							  scroll_mouse_x,
+							  scroll_mouse_y);
+	}
+	status = scrollbar_mouse_status_to_message(scrollbar_status);
+
+	if (status != NULL) {
+		union content_msg_data msg_data;
+
+		msg_data.explicit_status_text = status;
+		content_broadcast((struct content *)html,
+				  CONTENT_MSG_STATUS,
+				  &msg_data);
+	}
+
+	return NSERROR_OK;
+}
+
+
+/**
+ * handle mouse actions while dragging in a text area
+ */
+static nserror
+mouse_action_drag_textarea(html_content *html,
+			    struct browser_window *bw,
+			    browser_mouse_state mouse,
+			    int x, int y)
+{
+	struct box *box;
+	int box_x = 0;
+	int box_y = 0;
+
+	box = html->drag_owner.textarea;
+
+	assert(box->gadget != NULL);
+	assert(box->gadget->type == GADGET_TEXTAREA ||
+	       box->gadget->type == GADGET_PASSWORD ||
+	       box->gadget->type == GADGET_TEXTBOX);
+
+	box_coords(box, &box_x, &box_y);
+	textarea_mouse_action(box->gadget->data.text.ta,
+			      mouse,
+			      x - box_x,
+			      y - box_y);
+
+	/* TODO: Set appropriate statusbar message */
+	return NSERROR_OK;
+}
+
+
+/**
+ * handle mouse actions while dragging in a content
+ */
+static nserror
+mouse_action_drag_content(html_content *html,
+			  struct browser_window *bw,
+			  browser_mouse_state mouse,
+			  int x, int y)
+{
+	struct box *box;
+	int box_x = 0;
+	int box_y = 0;
+
+	box = html->drag_owner.content;
+	assert(box->object != NULL);
+
+	box_coords(box, &box_x, &box_y);
+	content_mouse_track(box->object,
+			    bw, mouse,
+			    x - box_x,
+			    y - box_y);
+	return NSERROR_OK;
+}
+
+
+/**
+ * local structure containing all the mouse action state information
+ */
+struct mouse_action_state {
+	struct {
+		const char *status; /**< status text */
+		browser_pointer_shape pointer; /**< pointer shape */
+		enum {
+		      ACTION_NONE,
+		      ACTION_NOSEND, /**< do not send status and pointer message */
+		      ACTION_SUBMIT,
+		      ACTION_GO,
+		      ACTION_JS,
+		} action;
+	} result;
+
+	/** dom node */
+	struct dom_node *node;
+
+	/** html object */
+	struct {
+		struct box *box;
+		int pos_x;
+		int pos_y;
+	} html_object;
+
+	/** non html object */
+	hlcache_handle *object;
+
+	/** iframe */
+	struct browser_window *iframe;
+
+	/** link either from href or imagemap */
+	struct {
+		struct box *box;
+		nsurl *url;
+		const char *target;
+		bool is_imagemap;
+	} link;
+
+	/** gadget */
+	struct {
+		struct form_control *control;
+		struct box *box;
+		int box_x;
+		int box_y;
+		const char *target;
+	} gadget;
+
+	/** title */
+	const char *title;
+
+	/** candidate box for drag operation */
+	struct box *drag_candidate;
+
+	/** scrollbar */
+	struct {
+		struct scrollbar *bar;
+		int mouse_x;
+		int mouse_y;
+	} scroll;
+
+	/** text in box */
+	struct {
+		struct box *box;
+		int box_x;
+	} text;
+};
+
+
+/**
+ * iterate the box tree for deepest node at coordinates
+ *
+ * extracts mouse action node information by descending through
+ *  visible boxes setting more specific values for:
+ *
+ * box - deepest box at point
+ * html_object_box - html object
+ * html_object_pos_x - html object
+ * html_object_pos_y - html object
+ * object - non html object
+ * iframe - iframe
+ * url - href or imagemap
+ * target - href or imagemap or gadget
+ * url_box - href or imagemap
+ * imagemap - imagemap
+ * gadget - gadget
+ * gadget_box - gadget
+ * gadget_box_x - gadget
+ * gadget_box_y - gadget
+ * title - title
+ * pointer
+ *
+ * drag_candidate - first box with scroll
+ * padding_left - box with scroll
+ * padding_right
+ * padding_top
+ * padding_bottom
+ * scrollbar - inside padding box stops decent
+ * scroll_mouse_x - inside padding box stops decent
+ * scroll_mouse_y - inside padding box stops decent
+ *
+ * text_box - text box
+ * text_box_x - text_box
+ */
+static nserror
+get_mouse_action_node(html_content *html,
+		      int x, int y,
+		      struct mouse_action_state *man)
+{
+	struct box *box;
+	int box_x = 0;
+	int box_y = 0;
+
+	/* initialise the mouse action state data */
+	memset(man, 0, sizeof(struct mouse_action_state));
+	man->node = html->layout->node; /* Default dom node to the <HTML> */
+	man->result.pointer = BROWSER_POINTER_DEFAULT;
+
+	/* search the box tree for a link, imagemap, form control, or
+	 * box with scrollbars
+	 */
+	box = html->layout;
+
+	/* Consider the margins of the html page now */
+	box_x = box->margin[LEFT];
+	box_y = box->margin[TOP];
+
+	do {
+		/* skip hidden boxes */
+		if ((box->style != NULL) &&
+		    (css_computed_visibility(box->style) ==
+		     CSS_VISIBILITY_HIDDEN)) {
+			goto next_box;
+		}
+
+		if (box->node != NULL) {
+			man->node = box->node;
+		}
+
+		if (box->object) {
+			if (content_get_type(box->object) == CONTENT_HTML) {
+				man->html_object.box = box;
+				man->html_object.pos_x = box_x;
+				man->html_object.pos_y = box_y;
+			} else {
+				man->object = box->object;
+			}
+		}
+
+		if (box->iframe) {
+			man->iframe = box->iframe;
+		}
+
+		if (box->href) {
+			man->link.url = box->href;
+			man->link.target = box->target;
+			man->link.box = box;
+			man->link.is_imagemap = false;
+		}
+
+		if (box->usemap) {
+			man->link.url = imagemap_get(html,
+						     box->usemap,
+						     box_x,
+						     box_y,
+						     x, y,
+						     &man->link.target);
+			man->link.box = box;
+			man->link.is_imagemap = true;
+		}
+
+		if (box->gadget) {
+			man->gadget.control = box->gadget;
+			man->gadget.box = box;
+			man->gadget.box_x = box_x;
+			man->gadget.box_y = box_y;
+			if (box->gadget->form) {
+				man->gadget.target = box->gadget->form->target;
+			}
+		}
+
+		if (box->title) {
+			man->title = box->title;
+		}
+
+		man->result.pointer = get_pointer_shape(box, false);
+
+		if ((box->scroll_x != NULL) ||
+		    (box->scroll_y != NULL)) {
+			int padding_left;
+			int padding_right;
+			int padding_top;
+			int padding_bottom;
+
+			if (man->drag_candidate == NULL) {
+				man->drag_candidate = box;
+			}
+
+			padding_left = box_x +
+					scrollbar_get_offset(box->scroll_x);
+			padding_right = padding_left + box->padding[LEFT] +
+					box->width + box->padding[RIGHT];
+			padding_top = box_y +
+					scrollbar_get_offset(box->scroll_y);
+			padding_bottom = padding_top + box->padding[TOP] +
+					box->height + box->padding[BOTTOM];
+
+			if ((x > padding_left) &&
+			    (x < padding_right) &&
+			    (y > padding_top) &&
+			    (y < padding_bottom)) {
+				/* mouse inside padding box */
+
+				if ((box->scroll_y != NULL) &&
+				    (x > (padding_right - SCROLLBAR_WIDTH))) {
+					/* mouse above vertical box scroll */
+
+					man->scroll.bar = box->scroll_y;
+					man->scroll.mouse_x = x - (padding_right - SCROLLBAR_WIDTH);
+					man->scroll.mouse_y = y - padding_top;
+					break;
+
+				} else if ((box->scroll_x != NULL) &&
+					   (y > (padding_bottom -
+							SCROLLBAR_WIDTH))) {
+					/* mouse above horizontal box scroll */
+
+					man->scroll.bar = box->scroll_x;
+					man->scroll.mouse_x = x - padding_left;
+					man->scroll.mouse_y = y - (padding_bottom - SCROLLBAR_WIDTH);
+					break;
+				}
+			}
+		}
+
+		if (box->text && !box->object) {
+			man->text.box = box;
+			man->text.box_x = box_x;
+		}
+
+	next_box:
+		/* iterate to next box */
+		box = box_at_point(&html->unit_len_ctx, box, x, y, &box_x, &box_y);
+	} while (box != NULL);
+
+	/* use of box_x, box_y, or content below this point is probably a
+	 * mistake; they will refer to the last box returned by box_at_point */
+
+	assert(man->node != NULL);
+
+	return NSERROR_OK;
+}
+
+
+/**
+ * process mouse activity on a form gadget
+ */
+static nserror
+gadget_mouse_action(html_content *html,
+		    browser_mouse_state mouse,
+		    int x, int y,
+		    struct mouse_action_state *mas)
+{
+	struct content *c = (struct content *)html;
+	textarea_mouse_status ta_status;
+	union content_msg_data msg_data;
+	nserror res;
+	bool click;
+	click = mouse & (BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_PRESS_2 |
+			 BROWSER_MOUSE_CLICK_1 | BROWSER_MOUSE_CLICK_2 |
+			 BROWSER_MOUSE_DRAG_1 | BROWSER_MOUSE_DRAG_2);
+
+	switch (mas->gadget.control->type) {
+	case GADGET_SELECT:
+		mas->result.status = messages_get("FormSelect");
+		mas->result.pointer = BROWSER_POINTER_MENU;
+		if (mouse & BROWSER_MOUSE_CLICK_1 &&
+		    nsoption_bool(core_select_menu)) {
+			html->visible_select_menu = mas->gadget.control;
+			res = form_open_select_menu(c,
+						    mas->gadget.control,
+						    form_select_menu_callback,
+						    c);
+			if (res != NSERROR_OK) {
+				NSLOG(netsurf, ERROR, "%s",
+				      messages_get_errorcode(res));
+				html->visible_select_menu = NULL;
+			}
+			mas->result.pointer = BROWSER_POINTER_DEFAULT;
+		} else if (mouse & BROWSER_MOUSE_CLICK_1) {
+			msg_data.select_menu.gadget = mas->gadget.control;
+			content_broadcast(c,
+					  CONTENT_MSG_SELECTMENU,
+					  &msg_data);
+		}
+		break;
+
+	case GADGET_CHECKBOX:
+		mas->result.status = messages_get("FormCheckbox");
+		if (mouse & BROWSER_MOUSE_CLICK_1) {
+			mas->gadget.control->selected = !mas->gadget.control->selected;
+			dom_html_input_element_set_checked(
+				(dom_html_input_element *)(mas->gadget.control->node),
+				mas->gadget.control->selected);
+			html__redraw_a_box(html, mas->gadget.box);
+		}
+		break;
+
+	case GADGET_RADIO:
+		mas->result.status = messages_get("FormRadio");
+		if (mouse & BROWSER_MOUSE_CLICK_1) {
+			form_radio_set(mas->gadget.control);
+		}
+		break;
+
+	case GADGET_IMAGE:
+		/* This falls through to SUBMIT */
+		if (mouse & BROWSER_MOUSE_CLICK_1) {
+			struct image_input_coords *coords, *oldcoords;
+			/** \todo Find a way to not ignore errors */
+			coords = calloc(1, sizeof(*coords));
+			if (coords == NULL) {
+				return NSERROR_OK;
+			}
+			coords->x = x - mas->gadget.box_x;
+			coords->y = y - mas->gadget.box_y;
+			if (dom_node_set_user_data(
+				mas->gadget.control->node,
+				corestring_dom___ns_key_image_coords_node_data,
+				coords,
+				html__image_coords_dom_user_data_handler,
+				&oldcoords) != DOM_NO_ERR) {
+				return NSERROR_OK;
+			}
+			free(oldcoords);
+		}
+		fallthrough;
+
+	case GADGET_SUBMIT:
+		if (mas->gadget.control->form) {
+			static char status_buffer[200];
+
+			snprintf(status_buffer,
+				 sizeof status_buffer,
+				 messages_get("FormSubmit"),
+				 mas->gadget.control->form->action);
+			mas->result.status = status_buffer;
+			mas->result.pointer = get_pointer_shape(mas->gadget.box,
+								false);
+			if (mouse & (BROWSER_MOUSE_CLICK_1 |
+				     BROWSER_MOUSE_CLICK_2)) {
+				mas->result.action = ACTION_SUBMIT;
+			}
+		} else {
+			mas->result.status = messages_get("FormBadSubmit");
+		}
+		break;
+
+	case GADGET_TEXTBOX:
+	case GADGET_PASSWORD:
+	case GADGET_TEXTAREA:
+		if (mas->gadget.control->type == GADGET_TEXTAREA) {
+			mas->result.status = messages_get("FormTextarea");
+		} else {
+			mas->result.status = messages_get("FormTextbox");
+		}
+
+		if (click &&
+		    (html->selection_type != HTML_SELECTION_TEXTAREA ||
+		     html->selection_owner.textarea != mas->gadget.box)) {
+			union html_selection_owner sel_owner;
+			sel_owner.none = true;
+			html_set_selection(html,
+					   HTML_SELECTION_NONE,
+					   sel_owner,
+					   true);
+		}
+
+		ta_status = textarea_mouse_action(mas->gadget.control->data.text.ta,
+						  mouse,
+						  x - mas->gadget.box_x,
+						  y - mas->gadget.box_y);
+
+		if (ta_status & TEXTAREA_MOUSE_EDITOR) {
+			mas->result.pointer = get_pointer_shape(mas->gadget.box, false);
+		} else {
+			mas->result.pointer = BROWSER_POINTER_DEFAULT;
+			mas->result.status = scrollbar_mouse_status_to_message(ta_status >> 3);
+		}
+		break;
+
+	case GADGET_HIDDEN:
+		/* not possible: no box generated */
+		break;
+
+	case GADGET_RESET:
+		mas->result.status = messages_get("FormReset");
+		break;
+
+	case GADGET_FILE:
+		mas->result.status = messages_get("FormFile");
+		if (mouse & BROWSER_MOUSE_CLICK_1) {
+			msg_data.gadget_click.gadget = mas->gadget.control;
+			content_broadcast(c,
+					  CONTENT_MSG_GADGETCLICK,
+					  &msg_data);
+		}
+		break;
+
+	case GADGET_BUTTON:
+		/* This gadget cannot be activated */
+		mas->result.status = messages_get("FormButton");
+		break;
+	}
+
+	return NSERROR_OK;
+}
+
+
+/**
+ * process mouse activity on an iframe
+ */
+static nserror
+iframe_mouse_action(struct browser_window *bw,
+		    browser_mouse_state mouse,
+		    int x, int y,
+		    struct mouse_action_state *mas)
+{
+	int pos_x, pos_y;
+	float scale;
+
+	scale = browser_window_get_scale(bw);
+
+	browser_window_get_position(mas->iframe, false, &pos_x, &pos_y);
+
+	if (mouse & BROWSER_MOUSE_CLICK_1 ||
+	    mouse & BROWSER_MOUSE_CLICK_2) {
+		browser_window_mouse_click(mas->iframe,
+					   mouse,
+					   (x * scale) - pos_x,
+					   (y * scale) - pos_y);
+	} else {
+		browser_window_mouse_track(mas->iframe,
+					   mouse,
+					   (x * scale) - pos_x,
+					   (y * scale) - pos_y);
+	}
+	mas->result.action = ACTION_NOSEND;
+
+	return NSERROR_OK;
+}
+
+
+/**
+ * process mouse activity on an html object
+ */
+static nserror
+html_object_mouse_action(html_content *html,
+			 struct browser_window *bw,
+			 browser_mouse_state mouse,
+			 int x, int y,
+			 struct mouse_action_state *mas)
+{
+	bool click;
+	click = mouse & (BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_PRESS_2 |
+			 BROWSER_MOUSE_CLICK_1 | BROWSER_MOUSE_CLICK_2 |
+			 BROWSER_MOUSE_DRAG_1 | BROWSER_MOUSE_DRAG_2);
+
+	if (click &&
+	    (html->selection_type != HTML_SELECTION_CONTENT ||
+	     html->selection_owner.content != mas->html_object.box)) {
+		union html_selection_owner sel_owner;
+		sel_owner.none = true;
+		html_set_selection(html, HTML_SELECTION_NONE, sel_owner, true);
+	}
+
+	if (mouse & BROWSER_MOUSE_CLICK_1 ||
+	    mouse & BROWSER_MOUSE_CLICK_2) {
+		content_mouse_action(mas->html_object.box->object,
+				     bw,
+				     mouse,
+				     x - mas->html_object.pos_x,
+				     y - mas->html_object.pos_y);
+	} else {
+		content_mouse_track(mas->html_object.box->object,
+				    bw,
+				    mouse,
+				    x - mas->html_object.pos_x,
+				    y - mas->html_object.pos_y);
+	}
+
+	mas->result.action = ACTION_NOSEND;
+	return NSERROR_OK;
+}
+
+
+/**
+ * determine if a url has a javascript scheme
+ *
+ * \param urm The url to check.
+ * \return true if the url is a javascript scheme else false
+ */
+static bool is_javascript_navigate_url(nsurl *url)
+{
+	bool is_js = false;
+	lwc_string *scheme;
+
+	scheme = nsurl_get_component(url, NSURL_SCHEME);
+	if (scheme != NULL) {
+		if (scheme == corestring_lwc_javascript) {
+			is_js = true;
+		}
+		lwc_string_unref(scheme);
+	}
+	return is_js;
+}
+
+
+/**
+ * process mouse activity on a link
+ */
+static nserror
+link_mouse_action(html_content *html,
+		  struct browser_window *bw,
+		  browser_mouse_state mouse,
+		  int x, int y,
+		  struct mouse_action_state *mas)
+{
+	nserror res;
+	char *url_s = NULL;
+	size_t url_l = 0;
+	static char status_buffer[200];
+	union content_msg_data msg_data;
+
+	if (nsoption_bool(display_decoded_idn) == true) {
+		res = nsurl_get_utf8(mas->link.url, &url_s, &url_l);
+		if (res != NSERROR_OK) {
+			/* Unable to obtain a decoded IDN. This is not
+			 *  a fatal error.  Ensure the string pointer
+			 *  is NULL so we use the encoded version.
+			 */
+			url_s = NULL;
+		}
+	}
+
+	if (mas->title) {
+		snprintf(status_buffer,
+			 sizeof status_buffer,
+			 "%s: %s",
+			 url_s ? url_s : nsurl_access(mas->link.url),
+			 mas->title);
+	} else {
+		snprintf(status_buffer,
+			 sizeof status_buffer,
+			 "%s",
+			 url_s ? url_s : nsurl_access(mas->link.url));
+	}
+
+	if (url_s != NULL) {
+		free(url_s);
+	}
+
+	mas->result.status = status_buffer;
+
+	mas->result.pointer = get_pointer_shape(mas->link.box,
+						mas->link.is_imagemap);
+
+	if (mouse & BROWSER_MOUSE_CLICK_1 &&
+	    mouse & BROWSER_MOUSE_MOD_1) {
+		/* force download of link */
+		browser_window_navigate(bw,
+					mas->link.url,
+					content_get_url((struct content *)html),
+					BW_NAVIGATE_DOWNLOAD,
+					NULL,
+					NULL,
+					NULL);
+
+	} else if (mouse & BROWSER_MOUSE_CLICK_2 &&
+		   mouse & BROWSER_MOUSE_MOD_1) {
+		msg_data.savelink.url = mas->link.url;
+		msg_data.savelink.title = mas->title;
+		content_broadcast((struct content *)html,
+				  CONTENT_MSG_SAVELINK,
+				  &msg_data);
+
+	} else if (mouse & (BROWSER_MOUSE_CLICK_1 | BROWSER_MOUSE_CLICK_2)) {
+		if (is_javascript_navigate_url(mas->link.url)) {
+			mas->result.action = ACTION_JS;
+		} else {
+			mas->result.action = ACTION_GO;
+		}
+	}
+
+	return NSERROR_OK;
+}
+
+
+
+/**
+ * process mouse activity if it is not anything else
+ */
+static nserror
+default_mouse_action(html_content *html,
+		  struct browser_window *bw,
+		  browser_mouse_state mouse,
+		  int x, int y,
+		  struct mouse_action_state *mas)
+{
+	struct content *c = (struct content *)html;
+	bool done = false;
+
+	/* frame resizing */
+	if (browser_window_frame_resize_start(bw, mouse, x, y, &mas->result.pointer)) {
+		if (mouse & (BROWSER_MOUSE_DRAG_1 | BROWSER_MOUSE_DRAG_2)) {
+			mas->result.status = messages_get("FrameDrag");
+		}
+		done = true;
+	}
+
+	/* if clicking in the main page, remove the selection from any
+	 * text areas */
+	if (!done) {
+		union html_selection_owner sel_owner;
+		bool click;
+		click = mouse & (BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_PRESS_2 |
+				 BROWSER_MOUSE_CLICK_1 | BROWSER_MOUSE_CLICK_2 |
+				 BROWSER_MOUSE_DRAG_1 | BROWSER_MOUSE_DRAG_2);
+
+		if (click && html->focus_type != HTML_FOCUS_SELF) {
+			union html_focus_owner fo;
+			fo.self = true;
+			html_set_focus(html, HTML_FOCUS_SELF, fo,
+				       true, 0, 0, 0, NULL);
+		}
+		if (click && html->selection_type != HTML_SELECTION_SELF) {
+			sel_owner.none = true;
+			html_set_selection(html, HTML_SELECTION_NONE,
+					   sel_owner, true);
+		}
+
+		if (mas->text.box) {
+			int pixel_offset;
+			size_t idx;
+			plot_font_style_t fstyle;
+
+			font_plot_style_from_css(&html->unit_len_ctx,
+						 mas->text.box->style,
+						 &fstyle);
+
+			guit->layout->position(&fstyle,
+					       mas->text.box->text,
+					       mas->text.box->length,
+					       x - mas->text.box_x,
+					       &idx,
+					       &pixel_offset);
+
+			if (selection_click(html->sel,
+					    html->bw,
+					    mouse,
+					    mas->text.box->byte_offset + idx)) {
+				/* key presses must be directed at the
+				 * main browser window, paste text
+				 * operations ignored */
+				html_drag_type drag_type;
+				union html_drag_owner drag_owner;
+
+				if (selection_dragging(html->sel)) {
+					drag_type = HTML_DRAG_SELECTION;
+					drag_owner.no_owner = true;
+					html_set_drag_type(html,
+							   drag_type,
+							   drag_owner,
+							   NULL);
+					mas->result.status = messages_get("Selecting");
+				}
+
+				done = true;
+			}
+
+		} else if (mouse & BROWSER_MOUSE_PRESS_1) {
+			sel_owner.none = true;
+			selection_clear(html->sel, true);
+		}
+
+		if (selection_active(html->sel)) {
+			sel_owner.none = false;
+			html_set_selection(html,
+					   HTML_SELECTION_SELF,
+					   sel_owner,
+					   true);
+		} else if (click &&
+			   html->selection_type != HTML_SELECTION_NONE) {
+			sel_owner.none = true;
+			html_set_selection(html,
+					   HTML_SELECTION_NONE,
+					   sel_owner,
+					   true);
+		}
+	}
+
+	if (!done) {
+		union content_msg_data msg_data;
+		if (mas->title) {
+			mas->result.status = mas->title;
+		}
+
+		if (mouse & BROWSER_MOUSE_DRAG_1) {
+			if (mouse & BROWSER_MOUSE_MOD_2) {
+				msg_data.dragsave.type = CONTENT_SAVE_COMPLETE;
+				msg_data.dragsave.content = NULL;
+				content_broadcast(c,
+						  CONTENT_MSG_DRAGSAVE,
+						  &msg_data);
+			} else {
+				if (mas->drag_candidate == NULL) {
+					browser_window_page_drag_start(bw,
+								       x, y);
+				} else {
+					html_box_drag_start(mas->drag_candidate,
+							    x, y);
+				}
+				mas->result.pointer = BROWSER_POINTER_MOVE;
+			}
+		} else if (mouse & BROWSER_MOUSE_DRAG_2) {
+			if (mouse & BROWSER_MOUSE_MOD_2) {
+				msg_data.dragsave.type = CONTENT_SAVE_SOURCE;
+				msg_data.dragsave.content = NULL;
+				content_broadcast(c,
+						  CONTENT_MSG_DRAGSAVE,
+						  &msg_data);
+			} else {
+				if (mas->drag_candidate == NULL) {
+					browser_window_page_drag_start(bw,
+								       x, y);
+				} else {
+					html_box_drag_start(mas->drag_candidate,
+							    x, y);
+				}
+				mas->result.pointer = BROWSER_POINTER_MOVE;
+			}
+		}
+	}
+
+	if (mouse && mouse < BROWSER_MOUSE_MOD_1) {
+		/* ensure key presses still act on the browser window */
+		union html_focus_owner fo;
+		fo.self = true;
+		html_set_focus(html, HTML_FOCUS_SELF, fo, true, 0, 0, 0, NULL);
+	}
+
+	return NSERROR_OK;
+}
+
+
+/**
+ * handle non dragging mouse actions
+ */
+static nserror
+mouse_action_drag_none(html_content *html,
+		       struct browser_window *bw,
+		       browser_mouse_state mouse,
+		       int x, int y)
+{
+	nserror res;
+	struct content *c = (struct content *)html;
+	union content_msg_data msg_data;
+	lwc_string *path;
+
+	/**
+	 * computed state
+	 *
+	 * not on heap to avoid allocation or stack because it is large
+	 */
+	static struct mouse_action_state mas;
+
+	res = get_mouse_action_node(html, x, y, &mas);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	if (mas.scroll.bar) {
+		mas.result.status = scrollbar_mouse_status_to_message(
+				scrollbar_mouse_action(mas.scroll.bar,
+						       mouse,
+						       mas.scroll.mouse_x,
+						       mas.scroll.mouse_y));
+		mas.result.pointer = BROWSER_POINTER_DEFAULT;
+
+	} else if (mas.gadget.control) {
+		res = gadget_mouse_action(html, mouse, x, y, &mas);
+
+	} else if ((mas.object != NULL) && (mouse & BROWSER_MOUSE_MOD_2)) {
+
+		if (mouse & BROWSER_MOUSE_DRAG_2) {
+			msg_data.dragsave.type = CONTENT_SAVE_NATIVE;
+			msg_data.dragsave.content = mas.object;
+			content_broadcast(c, CONTENT_MSG_DRAGSAVE, &msg_data);
+
+		} else if (mouse & BROWSER_MOUSE_DRAG_1) {
+			msg_data.dragsave.type = CONTENT_SAVE_ORIG;
+			msg_data.dragsave.content = mas.object;
+			content_broadcast(c, CONTENT_MSG_DRAGSAVE, &msg_data);
+		}
+
+		/* \todo should have a drag-saving object msg */
+
+	} else if (mas.iframe != NULL) {
+		res = iframe_mouse_action(bw, mouse, x, y, &mas);
+
+	} else if (mas.html_object.box != NULL) {
+		res = html_object_mouse_action(html, bw, mouse, x, y, &mas);
+
+	} else if (mas.link.url != NULL) {
+		res = link_mouse_action(html, bw, mouse, x, y, &mas);
+
+	} else {
+		res = default_mouse_action(html, bw, mouse, x, y, &mas);
+
+	}
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	/* send status and pointer message */
+	if (mas.result.action != ACTION_NOSEND) {
+		msg_data.explicit_status_text = mas.result.status;
+		content_broadcast(c, CONTENT_MSG_STATUS, &msg_data);
+
+		msg_data.pointer = mas.result.pointer;
+		content_broadcast(c, CONTENT_MSG_POINTER, &msg_data);
+	}
+
+	/* fire dom click event */
+	if (mouse & BROWSER_MOUSE_CLICK_1) {
+		fire_generic_dom_event(corestring_dom_click, mas.node, true, true);
+	}
+
+	/* deferred actions that can cause this browser_window to be destroyed
+	 * and must therefore be done after set_status/pointer
+	 */
+	switch (mas.result.action) {
+	case ACTION_SUBMIT:
+		res = form_submit(content_get_url(c),
+				  browser_window_find_target(bw,
+							     mas.gadget.target,
+							     mouse),
+				  mas.gadget.control->form,
+				  mas.gadget.control);
+		break;
+
+	case ACTION_GO:
+		res = browser_window_navigate(
+				browser_window_find_target(bw,
+							   mas.link.target,
+							   mouse),
+				mas.link.url,
+				content_get_url(c),
+				BW_NAVIGATE_HISTORY,
+				NULL,
+				NULL,
+				NULL);
+		break;
+
+	case ACTION_JS:
+		path = nsurl_get_component(mas.link.url, NSURL_PATH);
+		if (path != NULL) {
+			html_exec(c,
+				  lwc_string_data(path),
+				  lwc_string_length(path));
+			lwc_string_unref(path);
+		}
+		break;
+
+	case ACTION_NOSEND:
+	case ACTION_NONE:
+		res = NSERROR_OK;
+		break;
+	}
+
+	return res;
+}
+
+
+/* exported interface documented in html/interaction.h */
+nserror html_mouse_track(struct content *c,
+			 struct browser_window *bw,
+			 browser_mouse_state mouse,
+			 int x, int y)
+{
+	return html_mouse_action(c, bw, mouse, x, y);
+}
+
+
+/* exported interface documented in html/interaction.h */
+nserror
+html_mouse_action(struct content *c,
+		  struct browser_window *bw,
+		  browser_mouse_state mouse,
+		  int x, int y)
+{
+	html_content *html = (html_content *)c;
+	nserror res = NSERROR_OK;
+
+	/* handle open select menu */
+	if (html->visible_select_menu != NULL) {
+		return mouse_action_select_menu(html, bw, mouse, x, y);
+	}
+
+	/* handle content drag */
+	switch (html->drag_type) {
+	case HTML_DRAG_SELECTION:
+		res = mouse_action_drag_selection(html, bw, mouse, x, y);
+		break;
+
+	case HTML_DRAG_SCROLLBAR:
+		res = mouse_action_drag_scrollbar(html, bw, mouse, x, y);
+		break;
+
+	case HTML_DRAG_TEXTAREA_SELECTION:
+	case HTML_DRAG_TEXTAREA_SCROLLBAR:
+		res = mouse_action_drag_textarea(html, bw, mouse, x, y);
+		break;
+
+	case HTML_DRAG_CONTENT_SELECTION:
+	case HTML_DRAG_CONTENT_SCROLL:
+		res = mouse_action_drag_content(html, bw, mouse, x, y);
+		break;
+
+	case HTML_DRAG_NONE:
+		res = mouse_action_drag_none(html, bw, mouse, x, y);
+		break;
+
+	default:
+		/* Unknown content related drag type */
+		assert(0 && "Unknown content related drag type");
+	}
+
+	if (res != NSERROR_OK) {
+		NSLOG(netsurf, ERROR, "%s", messages_get_errorcode(res));
+	}
+
+	return res;
+}
+
+
+/**
+ * Handle keypresses.
+ *
+ * \param  c	content of type HTML
+ * \param  key	The UCS4 character codepoint
+ * \return true if key handled, false otherwise
+ */
+bool html_keypress(struct content *c, uint32_t key)
+{
+	html_content *html = (html_content *) c;
+	struct selection *sel = html->sel;
+
+	/** \todo
+	 * At the moment, the front end interface for keypress only gives
+	 * us a UCS4 key value.  This doesn't doesn't have all the information
+	 * we need to fill out the event properly.  We don't get to know about
+	 * modifier keys, and things like CTRL+C are passed in as
+	 * \ref NS_KEY_COPY_SELECTION, a magic value outside the valid Unicode
+	 * range.
+	 *
+	 * We need to:
+	 *
+	 * 1. Update the front end interface so that both press and release
+	 *    events reach the core.
+	 * 2. Stop encoding the special keys like \ref NS_KEY_COPY_SELECTION as
+	 *    magic values in the front ends, so we just get the events, e.g.:
+	 *    1. Press ctrl
+	 *    2. Press c
+	 *    3. Release c
+	 *    4. Release ctrl
+	 * 3. Pass all the new info to the DOM KeyboardEvent events.
+	 * 4. If there is a focused element, fire the event at that, instead of
+	 *    `html->layout->node`.
+	 * 5. Rebuild the \ref NS_KEY_COPY_SELECTION values from the info we
+	 *    now get given, and use that for the code below this
+	 *    \ref fire_dom_keyboard_event call.
+	 * 6. Move the code after this \ref fire_dom_keyboard_event call into
+	 *    the default action handler for DOM events.
+	 *
+	 * This will mean that if the JavaScript event listener does
+	 * `event.preventDefault()` then we won't handle the event when
+	 * we're not supposed to.
+	 */
+	if (html->layout != NULL && html->layout->node != NULL) {
+		fire_dom_keyboard_event(corestring_dom_keydown,
+				html->layout->node, true, true, key);
+	}
+
+	switch (html->focus_type) {
+	case HTML_FOCUS_CONTENT:
+		return content_keypress(html->focus_owner.content->object, key);
+
+	case HTML_FOCUS_TEXTAREA:
+		if (box_textarea_keypress(html, html->focus_owner.textarea, key) == NSERROR_OK) {
+			return true;
+		} else {
+			return false;
+		}
+
+	default:
+		/* Deal with it below */
+		break;
+	}
+
+	switch (key) {
+	case NS_KEY_COPY_SELECTION:
+		selection_copy_to_clipboard(sel);
+		return true;
+
+	case NS_KEY_CLEAR_SELECTION:
+		selection_clear(sel, true);
+		return true;
+
+	case NS_KEY_SELECT_ALL:
+		selection_select_all(sel);
+		return true;
+
+	case NS_KEY_ESCAPE:
+		/* if there's no selection, leave Escape for the caller */
+		return selection_clear(sel, true);
+	}
+
+	return false;
+}
+
+
+/**
+ * Callback for in-page scrollbars.
+ */
+void html_overflow_scroll_callback(void *client_data,
+		struct scrollbar_msg_data *scrollbar_data)
+{
+	struct html_scrollbar_data *data = client_data;
+	html_content *html = (html_content *)data->c;
+	struct box *box = data->box;
+	union content_msg_data msg_data;
+	html_drag_type drag_type;
+	union html_drag_owner drag_owner;
+
+	switch(scrollbar_data->msg) {
+	case SCROLLBAR_MSG_MOVED:
+
+		if (html->reflowing == true) {
+			/* Can't redraw during layout, and it will
+			 * be redrawn after layout anyway. */
+			break;
+		}
+
+		html__redraw_a_box(html, box);
+		break;
+	case SCROLLBAR_MSG_SCROLL_START:
+	{
+		struct rect rect = {
+			.x0 = scrollbar_data->x0,
+			.y0 = scrollbar_data->y0,
+			.x1 = scrollbar_data->x1,
+			.y1 = scrollbar_data->y1
+		};
+		drag_type = HTML_DRAG_SCROLLBAR;
+		drag_owner.scrollbar = scrollbar_data->scrollbar;
+		html_set_drag_type(html, drag_type, drag_owner, &rect);
+	}
+		break;
+	case SCROLLBAR_MSG_SCROLL_FINISHED:
+		drag_type = HTML_DRAG_NONE;
+		drag_owner.no_owner = true;
+		html_set_drag_type(html, drag_type, drag_owner, NULL);
+
+		msg_data.pointer = BROWSER_POINTER_AUTO;
+		content_broadcast(data->c, CONTENT_MSG_POINTER, &msg_data);
+		break;
+	}
+}
+
+
+/* Documented in html_internal.h */
+void html_set_drag_type(html_content *html, html_drag_type drag_type,
+		union html_drag_owner drag_owner, const struct rect *rect)
+{
+	union content_msg_data msg_data;
+
+	assert(html != NULL);
+
+	html->drag_type = drag_type;
+	html->drag_owner = drag_owner;
+
+	switch (drag_type) {
+	case HTML_DRAG_NONE:
+		assert(drag_owner.no_owner == true);
+		msg_data.drag.type = CONTENT_DRAG_NONE;
+		break;
+
+	case HTML_DRAG_SCROLLBAR:
+	case HTML_DRAG_TEXTAREA_SCROLLBAR:
+	case HTML_DRAG_CONTENT_SCROLL:
+		msg_data.drag.type = CONTENT_DRAG_SCROLL;
+		break;
+
+	case HTML_DRAG_SELECTION:
+		assert(drag_owner.no_owner == true);
+		fallthrough;
+	case HTML_DRAG_TEXTAREA_SELECTION:
+	case HTML_DRAG_CONTENT_SELECTION:
+		msg_data.drag.type = CONTENT_DRAG_SELECTION;
+		break;
+	}
+	msg_data.drag.rect = rect;
+
+	/* Inform of the content's drag status change */
+	content_broadcast((struct content *)html, CONTENT_MSG_DRAG, &msg_data);
+}
+
+/* Documented in html_internal.h */
+void html_set_focus(html_content *html, html_focus_type focus_type,
+		union html_focus_owner focus_owner, bool hide_caret,
+		int x, int y, int height, const struct rect *clip)
+{
+	union content_msg_data msg_data;
+	int x_off = 0;
+	int y_off = 0;
+	struct rect cr;
+	bool textarea_lost_focus = html->focus_type == HTML_FOCUS_TEXTAREA &&
+			focus_type != HTML_FOCUS_TEXTAREA;
+
+	assert(html != NULL);
+
+	switch (focus_type) {
+	case HTML_FOCUS_SELF:
+		assert(focus_owner.self == true);
+		if (html->focus_type == HTML_FOCUS_SELF)
+			/* Don't need to tell anyone anything */
+			return;
+		break;
+
+	case HTML_FOCUS_CONTENT:
+		box_coords(focus_owner.content, &x_off, &y_off);
+		break;
+
+	case HTML_FOCUS_TEXTAREA:
+		box_coords(focus_owner.textarea, &x_off, &y_off);
+		break;
+	}
+
+	html->focus_type = focus_type;
+	html->focus_owner = focus_owner;
+
+	if (textarea_lost_focus) {
+		msg_data.caret.type = CONTENT_CARET_REMOVE;
+	} else if (focus_type != HTML_FOCUS_SELF && hide_caret) {
+		msg_data.caret.type = CONTENT_CARET_HIDE;
+	} else {
+		if (clip != NULL) {
+			cr = *clip;
+			cr.x0 += x_off;
+			cr.y0 += y_off;
+			cr.x1 += x_off;
+			cr.y1 += y_off;
+		}
+
+		msg_data.caret.type = CONTENT_CARET_SET_POS;
+		msg_data.caret.pos.x = x + x_off;
+		msg_data.caret.pos.y = y + y_off;
+		msg_data.caret.pos.height = height;
+		msg_data.caret.pos.clip = (clip == NULL) ? NULL : &cr;
+	}
+
+	/* Inform of the content's drag status change */
+	content_broadcast((struct content *)html, CONTENT_MSG_CARET, &msg_data);
+}
+
+/* Documented in html_internal.h */
+void html_set_selection(html_content *html, html_selection_type selection_type,
+		union html_selection_owner selection_owner, bool read_only)
+{
+	union content_msg_data msg_data;
+	struct box *box;
+	bool changed = false;
+	bool same_type = html->selection_type == selection_type;
+
+	assert(html != NULL);
+
+	if ((selection_type == HTML_SELECTION_NONE &&
+			html->selection_type != HTML_SELECTION_NONE) ||
+			(selection_type != HTML_SELECTION_NONE &&
+			html->selection_type == HTML_SELECTION_NONE))
+		/* Existance of selection has changed, and we'll need to
+		 * inform our owner */
+		changed = true;
+
+	/* Clear any existing selection */
+	if (html->selection_type != HTML_SELECTION_NONE) {
+		switch (html->selection_type) {
+		case HTML_SELECTION_SELF:
+			if (same_type)
+				break;
+			selection_clear(html->sel, true);
+			break;
+		case HTML_SELECTION_TEXTAREA:
+			if (same_type && html->selection_owner.textarea ==
+					selection_owner.textarea)
+				break;
+			box = html->selection_owner.textarea;
+			textarea_clear_selection(box->gadget->data.text.ta);
+			break;
+		case HTML_SELECTION_CONTENT:
+			if (same_type && html->selection_owner.content ==
+					selection_owner.content)
+				break;
+			box = html->selection_owner.content;
+			content_clear_selection(box->object);
+			break;
+		default:
+			break;
+		}
+	}
+
+	html->selection_type = selection_type;
+	html->selection_owner = selection_owner;
+
+	if (!changed)
+		/* Don't need to report lack of change to owner */
+		return;
+
+	/* Prepare msg */
+	switch (selection_type) {
+	case HTML_SELECTION_NONE:
+		assert(selection_owner.none == true);
+		msg_data.selection.selection = false;
+		break;
+	case HTML_SELECTION_SELF:
+		assert(selection_owner.none == false);
+		fallthrough;
+	case HTML_SELECTION_TEXTAREA:
+	case HTML_SELECTION_CONTENT:
+		msg_data.selection.selection = true;
+		break;
+	default:
+		break;
+	}
+	msg_data.selection.read_only = read_only;
+
+	/* Inform of the content's selection status change */
+	content_broadcast((struct content *)html, CONTENT_MSG_SELECTION,
+			&msg_data);
+}
diff --git a/content/handlers/html/interaction.h b/content/handlers/html/interaction.h
new file mode 100644
index 000000000..f92e3adb0
--- /dev/null
+++ b/content/handlers/html/interaction.h
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2004 James Bursa <bursa@users.sourceforge.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * HTML content user interaction handling
+ */
+
+#ifndef NETSURF_HTML_INTERACTION_H
+#define NETSURF_HTML_INTERACTION_H
+
+#include "desktop/search.h" /* search flags enum */
+
+/**
+ * Context for scrollbar
+ */
+struct html_scrollbar_data {
+	struct content *c;
+	struct box *box;
+};
+
+/**
+ * Handle mouse tracking (including drags) in an HTML content window.
+ *
+ * \param  c	  content of type html
+ * \param  bw	  browser window
+ * \param  mouse  state of mouse buttons and modifier keys
+ * \param  x	  coordinate of mouse
+ * \param  y	  coordinate of mouse
+ */
+nserror html_mouse_track(struct content *c, struct browser_window *bw,
+			browser_mouse_state mouse, int x, int y);
+
+
+/**
+ * Handle mouse clicks and movements in an HTML content window.
+ *
+ * This function handles both hovering and clicking. It is important that the
+ * code path is identical (except that hovering doesn't carry out the action),
+ * so that the status bar reflects exactly what will happen. Having separate
+ * code paths opens the possibility that an attacker will make the status bar
+ * show some harmless action where clicking will be harmful.
+ *
+ * \param c content of type html
+ * \param bw browser window
+ * \param mouse state of mouse buttons and modifier keys
+ * \param x x coordinate of mouse
+ * \param y y coordinate of mouse
+ * \return NSERROR_OK or appropriate error code.
+ */
+nserror html_mouse_action(struct content *c, struct browser_window *bw,
+			browser_mouse_state mouse, int x, int y);
+
+
+bool html_keypress(struct content *c, uint32_t key);
+
+
+void html_overflow_scroll_callback(void *client_data,
+		struct scrollbar_msg_data *scrollbar_data);
+
+
+void html_search(struct content *c, void *context,
+		search_flags_t flags, const char *string);
+
+
+void html_search_clear(struct content *c);
+
+
+/**
+ * Set our drag status, and inform whatever owns the content
+ *
+ * \param html		HTML content
+ * \param drag_type	Type of drag
+ * \param drag_owner	What owns the drag
+ * \param rect		Pointer movement bounds
+ */
+void html_set_drag_type(html_content *html, html_drag_type drag_type,
+		union html_drag_owner drag_owner, const struct rect *rect);
+
+
+/**
+ * Set our selection status, and inform whatever owns the content
+ *
+ * \param html			HTML content
+ * \param selection_type	Type of selection
+ * \param selection_owner	What owns the selection
+ * \param read_only		True iff selection is read only
+ */
+void html_set_selection(html_content *html, html_selection_type selection_type,
+		union html_selection_owner selection_owner, bool read_only);
+
+
+/**
+ * Set our input focus, and inform whatever owns the content
+ *
+ * \param html			HTML content
+ * \param focus_type		Type of input focus
+ * \param focus_owner		What owns the focus
+ * \param hide_caret		True iff caret to be hidden
+ * \param x			Carret x-coord rel to owner
+ * \param y			Carret y-coord rel to owner
+ * \param height		Carret height
+ * \param clip			Carret clip rect
+ */
+void html_set_focus(html_content *html, html_focus_type focus_type,
+		union html_focus_owner focus_owner, bool hide_caret,
+		int x, int y, int height, const struct rect *clip);
+
+
+#endif
diff --git a/content/handlers/html/layout.c b/content/handlers/html/layout.c
index f4a1a206f..76ce24df5 100644
--- a/content/handlers/html/layout.c
+++ b/content/handlers/html/layout.c
@@ -47,10 +47,13 @@
 #include "utils/talloc.h"
 #include "utils/utils.h"
 #include "utils/nsoption.h"
+#include "utils/corestrings.h"
+#include "utils/nsurl.h"
 #include "netsurf/inttypes.h"
 #include "netsurf/content.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/layout.h"
+#include "content/content.h"
 #include "content/content_protected.h"
 #include "css/utils.h"
 #include "desktop/scrollbar.h"
@@ -58,29 +61,17 @@
 
 #include "html/html.h"
 #include "html/html_save.h"
-#include "html/html_internal.h"
+#include "html/private.h"
 #include "html/box.h"
+#include "html/box_inspect.h"
 #include "html/font.h"
 #include "html/form_internal.h"
 #include "html/layout.h"
+#include "html/layout_internal.h"
 #include "html/table.h"
 
-#define AUTO INT_MIN
-
-/* Fixed point percentage (a) of an integer (b), to an integer */
-#define FPCT_OF_INT_TOINT(a, b) (FIXTOINT(FDIV((a * b), F_100)))
-
-typedef uint8_t (*css_len_func)(
-		const css_computed_style *style,
-		css_fixed *length, css_unit *unit);
-typedef uint8_t (*css_border_style_func)(
-		const css_computed_style *style);
-typedef uint8_t (*css_border_color_func)(
-		const css_computed_style *style,
-		css_color *color);
-
 /** Array of per-side access functions for computed style margins. */
-static const css_len_func margin_funcs[4] = {
+const css_len_func margin_funcs[4] = {
 	[TOP]    = css_computed_margin_top,
 	[RIGHT]  = css_computed_margin_right,
 	[BOTTOM] = css_computed_margin_bottom,
@@ -88,7 +79,7 @@ static const css_len_func margin_funcs[4] = {
 };
 
 /** Array of per-side access functions for computed style paddings. */
-static const css_len_func padding_funcs[4] = {
+const css_len_func padding_funcs[4] = {
 	[TOP]    = css_computed_padding_top,
 	[RIGHT]  = css_computed_padding_right,
 	[BOTTOM] = css_computed_padding_bottom,
@@ -96,7 +87,7 @@ static const css_len_func padding_funcs[4] = {
 };
 
 /** Array of per-side access functions for computed style border_widths. */
-static const css_len_func border_width_funcs[4] = {
+const css_len_func border_width_funcs[4] = {
 	[TOP]    = css_computed_border_top_width,
 	[RIGHT]  = css_computed_border_right_width,
 	[BOTTOM] = css_computed_border_bottom_width,
@@ -104,7 +95,7 @@ static const css_len_func border_width_funcs[4] = {
 };
 
 /** Array of per-side access functions for computed style border styles. */
-static const css_border_style_func border_style_funcs[4] = {
+const css_border_style_func border_style_funcs[4] = {
 	[TOP]    = css_computed_border_top_style,
 	[RIGHT]  = css_computed_border_right_style,
 	[BOTTOM] = css_computed_border_bottom_style,
@@ -112,7 +103,7 @@ static const css_border_style_func border_style_funcs[4] = {
 };
 
 /** Array of per-side access functions for computed style border colors. */
-static const css_border_color_func border_color_funcs[4] = {
+const css_border_color_func border_color_funcs[4] = {
 	[TOP]    = css_computed_border_top_color,
 	[RIGHT]  = css_computed_border_right_color,
 	[BOTTOM] = css_computed_border_bottom_color,
@@ -120,16 +111,11 @@ static const css_border_color_func border_color_funcs[4] = {
 };
 
 /* forward declaration to break cycles */
-static bool layout_block_context(
-		struct box *block,
-		int viewport_height,
-		html_content *content);
 static void layout_minmax_block(
 		struct box *block,
 		const struct gui_layout_table *font_func,
 		const html_content *content);
 
-
 /**
  * Compute the size of replaced boxes with auto dimensions, according to
  * content.
@@ -220,6 +206,11 @@ layout_get_object_dimensions(struct box *box,
 		int intrinsic_width = content_get_width(box->object);
 		int intrinsic_height = content_get_height(box->object);
 
+		if (min_width >  0 && min_width > *width)
+			*width = min_width;
+		if (max_width >= 0 && max_width < *width)
+			*width = max_width;
+
 		if (intrinsic_width != 0)
 			*height = (*width * intrinsic_height) /
 					intrinsic_width;
@@ -237,7 +228,7 @@ layout_get_object_dimensions(struct box *box,
  * \return  length of indent
  */
 static int layout_text_indent(
-		const nscss_len_ctx *len_ctx,
+		const css_unit_ctx *unit_len_ctx,
 		const css_computed_style *style, int width)
 {
 	css_fixed value = 0;
@@ -248,73 +239,8 @@ static int layout_text_indent(
 	if (unit == CSS_UNIT_PCT) {
 		return FPCT_OF_INT_TOINT(value, width);
 	} else {
-		return FIXTOINT(nscss_len2px(len_ctx, value, unit, style));
-	}
-}
-
-
-/**
- * Determine width of margin, borders, and padding on one side of a box.
- *
- * \param len_ctx  CSS length conversion context for document
- * \param style    style to measure
- * \param side     side of box to measure
- * \param margin   whether margin width is required
- * \param border   whether border width is required
- * \param padding  whether padding width is required
- * \param fixed    increased by sum of fixed margin, border, and padding
- * \param frac     increased by sum of fractional margin and padding
- */
-static void
-calculate_mbp_width(const nscss_len_ctx *len_ctx,
-		    const css_computed_style *style,
-		    unsigned int side,
-		    bool margin,
-		    bool border,
-		    bool padding,
-		    int *fixed,
-		    float *frac)
-{
-	css_fixed value = 0;
-	css_unit unit = CSS_UNIT_PX;
-
-	assert(style);
-
-	/* margin */
-	if (margin) {
-		enum css_margin_e type;
-
-		type = margin_funcs[side](style, &value, &unit);
-		if (type == CSS_MARGIN_SET) {
-			if (unit == CSS_UNIT_PCT) {
-				*frac += FIXTOINT(FDIV(value, F_100));
-			} else {
-				*fixed += FIXTOINT(nscss_len2px(len_ctx,
-						value, unit, style));
-			}
-		}
-	}
-
-	/* border */
-	if (border) {
-		if (border_style_funcs[side](style) !=
-				CSS_BORDER_STYLE_NONE) {
-			border_width_funcs[side](style, &value, &unit);
-
-			*fixed += FIXTOINT(nscss_len2px(len_ctx,
-					value, unit, style));
-		}
-	}
-
-	/* padding */
-	if (padding) {
-		padding_funcs[side](style, &value, &unit);
-		if (unit == CSS_UNIT_PCT) {
-			*frac += FIXTOINT(FDIV(value, F_100));
-		} else {
-			*fixed += FIXTOINT(nscss_len2px(len_ctx,
-					value, unit, style));
-		}
+		return FIXTOINT(css_unit_len2device_px(style, unit_len_ctx,
+				value, unit));
 	}
 }
 
@@ -347,8 +273,8 @@ static void layout_minmax_table(struct box *table,
 	if (table->max_width != UNKNOWN_MAX_WIDTH)
 		return;
 
-	if (table_calculate_column_types(&content->len_ctx, table) == false) {
-		NSLOG(netsurf, WARNING,
+	if (table_calculate_column_types(&content->unit_len_ctx, table) == false) {
+		NSLOG(netsurf, ERROR,
 				"Could not establish table column types.");
 		return;
 	}
@@ -370,8 +296,10 @@ static void layout_minmax_table(struct box *table,
 
 		css_computed_border_spacing(table->style, &h, &hu, &v, &vu);
 
-		border_spacing_h = FIXTOINT(nscss_len2px(&content->len_ctx,
-				h, hu, table->style));
+		border_spacing_h = FIXTOINT(css_unit_len2device_px(
+				table->style,
+				&content->unit_len_ctx,
+				h, hu));
 	}
 
 	/* 1st pass: consider cells with colspan 1 only */
@@ -476,8 +404,10 @@ static void layout_minmax_table(struct box *table,
 	/* fixed width takes priority, unless it is too narrow */
 	wtype = css_computed_width(table->style, &value, &unit);
 	if (wtype == CSS_WIDTH_SET && unit != CSS_UNIT_PCT) {
-		int width = FIXTOINT(nscss_len2px(&content->len_ctx,
-				value, unit, table->style));
+		int width = FIXTOINT(css_unit_len2device_px(
+					table->style,
+					&content->unit_len_ctx,
+					value, unit));
 		if (table_min < width)
 			table_min = width;
 		if (table_max < width)
@@ -485,10 +415,10 @@ static void layout_minmax_table(struct box *table,
 	}
 
 	/* add margins, border, padding to min, max widths */
-	calculate_mbp_width(&content->len_ctx,
+	calculate_mbp_width(&content->unit_len_ctx,
 			table->style, LEFT, true, true, true,
 			&extra_fixed, &extra_frac);
-	calculate_mbp_width(&content->len_ctx,
+	calculate_mbp_width(&content->unit_len_ctx,
 			table->style, RIGHT, true, true, true,
 			&extra_fixed, &extra_frac);
 	if (extra_fixed < 0)
@@ -572,11 +502,7 @@ layout_minmax_line(struct box *first,
 		css_fixed value = 0;
 		css_unit unit = CSS_UNIT_PX;
 
-		assert(b->type == BOX_INLINE || b->type == BOX_INLINE_BLOCK ||
-				b->type == BOX_FLOAT_LEFT ||
-				b->type == BOX_FLOAT_RIGHT ||
-				b->type == BOX_BR || b->type == BOX_TEXT ||
-				b->type == BOX_INLINE_END);
+		assert(lh__box_is_inline_content(b));
 
 		NSLOG(layout, DEBUG, "%p: min %i, max %i", b, min, max);
 
@@ -585,13 +511,13 @@ layout_minmax_line(struct box *first,
 			break;
 		}
 
-		if (b->type == BOX_FLOAT_LEFT || b->type == BOX_FLOAT_RIGHT) {
+		if (lh__box_is_float_box(b)) {
 			assert(b->children);
-			if (b->children->type == BOX_BLOCK)
-				layout_minmax_block(b->children, font_func,
+			if (b->children->type == BOX_TABLE)
+				layout_minmax_table(b->children, font_func,
 						content);
 			else
-				layout_minmax_table(b->children, font_func,
+				layout_minmax_block(b->children, font_func,
 						content);
 			b->min_width = b->children->min_width;
 			b->max_width = b->children->max_width;
@@ -601,7 +527,7 @@ layout_minmax_line(struct box *first,
 			continue;
 		}
 
-		if (b->type == BOX_INLINE_BLOCK) {
+		if (b->type == BOX_INLINE_BLOCK || b->type == BOX_INLINE_FLEX) {
 			layout_minmax_block(b, font_func, content);
 			if (min < b->min_width)
 				min = b->min_width;
@@ -613,17 +539,17 @@ layout_minmax_line(struct box *first,
 		}
 
 		assert(b->style);
-		font_plot_style_from_css(&content->len_ctx, b->style, &fstyle);
+		font_plot_style_from_css(&content->unit_len_ctx, b->style, &fstyle);
 
 		if (b->type == BOX_INLINE && !b->object &&
 				!(b->flags & REPLACE_DIM) &&
 				!(b->flags & IFRAME)) {
 			fixed = frac = 0;
-			calculate_mbp_width(&content->len_ctx,
+			calculate_mbp_width(&content->unit_len_ctx,
 					b->style, LEFT, true, true, true,
 					&fixed, &frac);
 			if (!b->inline_end)
-				calculate_mbp_width(&content->len_ctx,
+				calculate_mbp_width(&content->unit_len_ctx,
 						b->style, RIGHT,
 						true, true, true,
 						&fixed, &frac);
@@ -633,7 +559,7 @@ layout_minmax_line(struct box *first,
 			/* \todo  update min width, consider fractional extra */
 		} else if (b->type == BOX_INLINE_END) {
 			fixed = frac = 0;
-			calculate_mbp_width(&content->len_ctx,
+			calculate_mbp_width(&content->unit_len_ctx,
 					b->inline_end->style, RIGHT,
 					true, true, true,
 					&fixed, &frac);
@@ -652,8 +578,7 @@ layout_minmax_line(struct box *first,
 			continue;
 		}
 
-		if (!b->object && !(b->flags & IFRAME) && !b->gadget &&
-				!(b->flags & REPLACE_DIM)) {
+		if (lh__box_is_replace(b) == false) {
 			/* inline non-replaced, 10.3.1 and 10.6.1 */
 			bool no_wrap_box;
 			if (!b->text)
@@ -751,16 +676,18 @@ layout_minmax_line(struct box *first,
 			if (unit == CSS_UNIT_PCT) {
 				width = AUTO;
 			} else {
-				width = FIXTOINT(nscss_len2px(&content->len_ctx,
-						value, unit, b->style));
+				width = FIXTOINT(css_unit_len2device_px(
+						b->style,
+						&content->unit_len_ctx,
+						value, unit));
 
 				if (bs == CSS_BOX_SIZING_BORDER_BOX) {
 					fixed = frac = 0;
-					calculate_mbp_width(&content->len_ctx,
+					calculate_mbp_width(&content->unit_len_ctx,
 							block->style, LEFT,
 							false, true, true,
 							&fixed, &frac);
-					calculate_mbp_width(&content->len_ctx,
+					calculate_mbp_width(&content->unit_len_ctx,
 							block->style, RIGHT,
 							false, true, true,
 							&fixed, &frac);
@@ -778,8 +705,10 @@ layout_minmax_line(struct box *first,
 		/* height */
 		htype = css_computed_height(b->style, &value, &unit);
 		if (htype == CSS_HEIGHT_SET) {
-			height = FIXTOINT(nscss_len2px(&content->len_ctx,
-					value, unit, b->style));
+			height = FIXTOINT(css_unit_len2device_px(
+					b->style,
+					&content->unit_len_ctx,
+					value, unit));
 		} else {
 			height = AUTO;
 		}
@@ -795,20 +724,20 @@ layout_minmax_line(struct box *first,
 
 			fixed = frac = 0;
 			if (bs == CSS_BOX_SIZING_BORDER_BOX) {
-				calculate_mbp_width(&content->len_ctx,
+				calculate_mbp_width(&content->unit_len_ctx,
 						b->style, LEFT,
 						true, false, false,
 						&fixed, &frac);
-				calculate_mbp_width(&content->len_ctx,
+				calculate_mbp_width(&content->unit_len_ctx,
 						b->style, RIGHT,
 						true, false, false,
 						&fixed, &frac);
 			} else {
-				calculate_mbp_width(&content->len_ctx,
+				calculate_mbp_width(&content->unit_len_ctx,
 						b->style, LEFT,
 						true, true, true,
 						&fixed, &frac);
-				calculate_mbp_width(&content->len_ctx,
+				calculate_mbp_width(&content->unit_len_ctx,
 						b->style, RIGHT,
 						true, true, true,
 						&fixed, &frac);
@@ -822,20 +751,20 @@ layout_minmax_line(struct box *first,
 
 			fixed = frac = 0;
 			if (bs == CSS_BOX_SIZING_BORDER_BOX) {
-				calculate_mbp_width(&content->len_ctx,
+				calculate_mbp_width(&content->unit_len_ctx,
 						b->style, LEFT,
 						true, false, false,
 						&fixed, &frac);
-				calculate_mbp_width(&content->len_ctx,
+				calculate_mbp_width(&content->unit_len_ctx,
 						b->style, RIGHT,
 						true, false, false,
 						&fixed, &frac);
 			} else {
-				calculate_mbp_width(&content->len_ctx,
+				calculate_mbp_width(&content->unit_len_ctx,
 						b->style, LEFT,
 						true, true, true,
 						&fixed, &frac);
-				calculate_mbp_width(&content->len_ctx,
+				calculate_mbp_width(&content->unit_len_ctx,
 						b->style, RIGHT,
 						true, true, true,
 						&fixed, &frac);
@@ -847,10 +776,10 @@ layout_minmax_line(struct box *first,
 		} else {
 			/* form control with no object */
 			if (width == AUTO)
-				width = FIXTOINT(nscss_len2px(
-						&content->len_ctx,
-						INTTOFIX(1), CSS_UNIT_EM,
-						b->style));
+				width = FIXTOINT(css_unit_len2device_px(
+						b->style,
+						&content->unit_len_ctx,
+						INTTOFIX(1), CSS_UNIT_EM));
 		}
 
 		if (min < width && !box_has_percentage_max_width(b))
@@ -864,7 +793,7 @@ layout_minmax_line(struct box *first,
 	if (first_line) {
 		/* todo: handle percentage values properly */
 		/* todo: handle text-indent interaction with floats */
-		int text_indent = layout_text_indent(&content->len_ctx,
+		int text_indent = layout_text_indent(&content->unit_len_ctx,
 				first->parent->parent->style, 100);
 		min = (min + text_indent < 0) ? 0 : min + text_indent;
 		max = (max + text_indent < 0) ? 0 : max + text_indent;
@@ -931,7 +860,6 @@ layout_minmax_inline_container(struct box *inline_container,
 			inline_container->max_width);
 }
 
-
 /**
  * Calculate minimum and maximum width of a block.
  *
@@ -957,9 +885,13 @@ static void layout_minmax_block(
 	css_fixed height = 0;
 	css_unit hunit = CSS_UNIT_PX;
 	enum css_box_sizing_e bs = CSS_BOX_SIZING_CONTENT_BOX;
+	bool using_min_border_box = false;
+	bool using_max_border_box = false;
 	bool child_has_height = false;
 
 	assert(block->type == BOX_BLOCK ||
+			block->type == BOX_FLEX ||
+			block->type == BOX_INLINE_FLEX ||
 			block->type == BOX_INLINE_BLOCK ||
 			block->type == BOX_TABLE_CELL);
 
@@ -974,9 +906,9 @@ static void layout_minmax_block(
 	}
 
 	/* set whether the minimum width is of any interest for this box */
-	if (((block->parent && (block->parent->type == BOX_FLOAT_LEFT ||
-			block->parent->type == BOX_FLOAT_RIGHT)) ||
-			block->type == BOX_INLINE_BLOCK) &&
+	if (((block->parent && lh__box_is_float_box(block->parent)) ||
+			block->type == BOX_INLINE_BLOCK ||
+			block->type == BOX_INLINE_FLEX) &&
 			wtype != CSS_WIDTH_SET) {
 		/* box shrinks to fit; need minimum width */
 		block->flags |= NEED_MIN;
@@ -987,6 +919,9 @@ static void layout_minmax_block(
 			wtype != CSS_WIDTH_SET) {
 		/* box inside shrink-to-fit context; need minimum width */
 		block->flags |= NEED_MIN;
+	} else if (block->parent && (block->parent->type == BOX_FLEX)) {
+		/* box is flex item */
+		block->flags |= NEED_MIN;
 	}
 
 	if (block->gadget && (block->gadget->type == GADGET_TEXTBOX ||
@@ -997,8 +932,8 @@ static void layout_minmax_block(
 		css_fixed size = INTTOFIX(10);
 		css_unit unit = CSS_UNIT_EM;
 
-		min = max = FIXTOINT(nscss_len2px(&content->len_ctx,
-				size, unit, block->style));
+		min = max = FIXTOINT(css_unit_len2device_px(block->style,
+				&content->unit_len_ctx, size, unit));
 
 		block->flags |= HAS_HEIGHT;
 	}
@@ -1011,8 +946,8 @@ static void layout_minmax_block(
 
 		/* form checkbox or radio button
 		 * if width is AUTO, set it to 1em */
-		min = max = FIXTOINT(nscss_len2px(&content->len_ctx,
-				size, unit, block->style));
+		min = max = FIXTOINT(css_unit_len2device_px(block->style,
+				&content->unit_len_ctx, size, unit));
 
 		block->flags |= HAS_HEIGHT;
 	}
@@ -1036,6 +971,7 @@ static void layout_minmax_block(
 		/* recurse through children */
 		for (child = block->children; child; child = child->next) {
 			switch (child->type) {
+			case BOX_FLEX:
 			case BOX_BLOCK:
 				layout_minmax_block(child, font_func,
 						content);
@@ -1077,10 +1013,24 @@ static void layout_minmax_block(
 				continue;
 			}
 
-			if (min < child->min_width)
-				min = child->min_width;
-			if (max < child->max_width)
-				max = child->max_width;
+			if (lh__box_is_flex_container(block) &&
+			    lh__flex_main_is_horizontal(block)) {
+				if (block->style != NULL &&
+				    css_computed_flex_wrap(block->style) ==
+						CSS_FLEX_WRAP_NOWRAP) {
+					min += child->min_width;
+				} else {
+					if (min < child->min_width)
+						min = child->min_width;
+				}
+				max += child->max_width;
+
+			} else {
+				if (min < child->min_width)
+					min = child->min_width;
+				if (max < child->max_width)
+					max = child->max_width;
+			}
 
 			if (child_has_height)
 				block->flags |= HAS_HEIGHT;
@@ -1093,23 +1043,40 @@ static void layout_minmax_block(
 	}
 
 	/* fixed width takes priority */
-	if (block->type != BOX_TABLE_CELL && wtype == CSS_WIDTH_SET &&
-			wunit != CSS_UNIT_PCT) {
-		min = max = FIXTOINT(nscss_len2px(&content->len_ctx,
-				width, wunit, block->style));
-		if (bs == CSS_BOX_SIZING_BORDER_BOX) {
-			int border_box_fixed = 0;
-			float border_box_frac = 0;
-			calculate_mbp_width(&content->len_ctx,
-					block->style, LEFT,
-					false, true, true,
-					&border_box_fixed, &border_box_frac);
-			calculate_mbp_width(&content->len_ctx,
-					block->style, RIGHT,
-					false, true, true,
-					&border_box_fixed, &border_box_frac);
-			if (min < border_box_fixed) {
-				min = max = border_box_fixed;
+	if (block->type != BOX_TABLE_CELL && !lh__box_is_flex_item(block)) {
+		bool border_box = bs == CSS_BOX_SIZING_BORDER_BOX;
+		enum css_max_width_e max_type;
+		enum css_min_width_e min_type;
+		css_unit unit = CSS_UNIT_PX;
+		css_fixed value = 0;
+
+		if (wtype == CSS_WIDTH_SET && wunit != CSS_UNIT_PCT) {
+			min = max = FIXTOINT(
+					css_unit_len2device_px(block->style,
+					&content->unit_len_ctx, width, wunit));
+			using_max_border_box = border_box;
+			using_min_border_box = border_box;
+		}
+
+		min_type = css_computed_min_width(block->style, &value, &unit);
+		if (min_type == CSS_MIN_WIDTH_SET && unit != CSS_UNIT_PCT) {
+			int val = FIXTOINT(css_unit_len2device_px(block->style,
+					&content->unit_len_ctx, value, unit));
+
+			if (min < val) {
+				min = val;
+				using_min_border_box = border_box;
+			}
+		}
+
+		max_type = css_computed_max_width(block->style, &value, &unit);
+		if (max_type == CSS_MAX_WIDTH_SET && unit != CSS_UNIT_PCT) {
+			int val = FIXTOINT(css_unit_len2device_px(block->style,
+					&content->unit_len_ctx, value, unit));
+
+			if (val >= 0 && max > val) {
+				max = val;
+				using_max_border_box = border_box;
 			}
 		}
 	}
@@ -1123,22 +1090,30 @@ static void layout_minmax_block(
 	/* add margins, border, padding to min, max widths */
 	/* Note: we don't know available width here so percentage margin
 	 * and paddings are wrong. */
-	if (bs == CSS_BOX_SIZING_BORDER_BOX && wtype == CSS_WIDTH_SET) {
-		/* Border and padding included in width, so just get margin */
-		calculate_mbp_width(&content->len_ctx,
-				block->style, LEFT, true, false, false,
-				&extra_fixed, &extra_frac);
-		calculate_mbp_width(&content->len_ctx,
-				block->style, RIGHT, true, false, false,
-				&extra_fixed, &extra_frac);
-	} else {
-		calculate_mbp_width(&content->len_ctx,
-				block->style, LEFT, true, true, true,
-				&extra_fixed, &extra_frac);
-		calculate_mbp_width(&content->len_ctx,
-				block->style, RIGHT, true, true, true,
-				&extra_fixed, &extra_frac);
+	calculate_mbp_width(&content->unit_len_ctx, block->style, LEFT,
+			false, true, true, &extra_fixed, &extra_frac);
+	calculate_mbp_width(&content->unit_len_ctx, block->style, RIGHT,
+			false, true, true, &extra_fixed, &extra_frac);
+
+	if (using_max_border_box) {
+		max -= extra_fixed;
+		max = max(max, 0);
+	}
+
+	if (using_min_border_box) {
+		min -= extra_fixed;
+		min = max(min, 0);
+	}
+
+	if (max < min) {
+		min = max;
 	}
+
+	calculate_mbp_width(&content->unit_len_ctx, block->style, LEFT,
+			true, false, false, &extra_fixed, &extra_frac);
+	calculate_mbp_width(&content->unit_len_ctx, block->style, RIGHT,
+			true, false, false, &extra_fixed, &extra_frac);
+
 	if (extra_fixed < 0)
 		extra_fixed = 0;
 	if (extra_frac < 0)
@@ -1157,375 +1132,15 @@ static void layout_minmax_block(
 		block->max_width = (max + extra_fixed) / (1.0 - extra_frac);
 	}
 
-	assert(0 <= block->min_width && block->min_width <= block->max_width);
-}
-
-
-/**
- * Adjust a specified width or height for the box-sizing property.
- *
- * This turns the specified dimension into a content-box dimension.
- *
- * \param  len_ctx          Length conversion context
- * \param  box		    gadget to adjust dimensions of
- * \param  available_width  width of containing block
- * \param  setwidth	    set true if the dimension to be tweaked is a width,
- *				else set false for a height
- * \param  dimension	    current value for given width/height dimension.
- *				updated to new value after consideration of
- *				gadget properties.
- */
-static void layout_handle_box_sizing(
-		const nscss_len_ctx *len_ctx,
-		struct box *box,
-		int available_width,
-		bool setwidth,
-		int *dimension)
-{
-	enum css_box_sizing_e bs;
-
-	assert(box && box->style);
-
-	bs = css_computed_box_sizing(box->style);
-
-	if (bs == CSS_BOX_SIZING_BORDER_BOX) {
-		int orig = *dimension;
-		int fixed = 0;
-		float frac = 0;
-
-		calculate_mbp_width(len_ctx, box->style,
-				setwidth ? LEFT : TOP,
-				false, true, true, &fixed, &frac);
-		calculate_mbp_width(len_ctx, box->style,
-				setwidth ? RIGHT : BOTTOM,
-				false, true, true, &fixed, &frac);
-		orig -= frac * available_width + fixed;
-		*dimension = orig > 0 ? orig : 0;
-	}
-}
-
-
-/**
- * Calculate width, height, and thickness of margins, paddings, and borders.
- *
- * \param  len_ctx          Length conversion context
- * \param  available_width  width of containing block
- * \param  viewport_height  height of viewport in pixels or -ve if unknown
- * \param  box		    current box
- * \param  style	    style giving width, height, margins, paddings,
- *                          and borders
- * \param  width            updated to width, may be NULL
- * \param  height           updated to height, may be NULL
- * \param  max_width        updated to max-width, may be NULL
- * \param  min_width        updated to min-width, may be NULL
- * \param  max_height       updated to max-height, may be NULL
- * \param  min_height       updated to min-height, may be NULL
- * \param  margin	    filled with margins, may be NULL
- * \param  padding	    filled with paddings, may be NULL
- * \param  border	    filled with border widths, may be NULL
- */
-static void
-layout_find_dimensions(const nscss_len_ctx *len_ctx,
-		       int available_width,
-		       int viewport_height,
-		       struct box *box,
-		       const css_computed_style *style,
-		       int *width,
-		       int *height,
-		       int *max_width,
-		       int *min_width,
-		       int *max_height,
-		       int *min_height,
-		       int margin[4],
-		       int padding[4],
-		       struct box_border border[4])
-{
-	struct box *containing_block = NULL;
-	unsigned int i;
-
-	if (width) {
-		enum css_width_e wtype;
-		css_fixed value = 0;
-		css_unit unit = CSS_UNIT_PX;
-
-		wtype = css_computed_width(style, &value, &unit);
-
-		if (wtype == CSS_WIDTH_SET) {
-			if (unit == CSS_UNIT_PCT) {
-				*width = FPCT_OF_INT_TOINT(
-						value, available_width);
-			} else {
-				*width = FIXTOINT(nscss_len2px(len_ctx,
-						value, unit, style));
-			}
-		} else {
-			*width = AUTO;
-		}
-
-		if (*width != AUTO) {
-			layout_handle_box_sizing(len_ctx, box, available_width,
-					true, width);
-		}
-	}
-
-	if (height) {
-		enum css_height_e htype;
-		css_fixed value = 0;
-		css_unit unit = CSS_UNIT_PX;
-
-		htype = css_computed_height(style, &value, &unit);
-
-		if (htype == CSS_HEIGHT_SET) {
-			if (unit == CSS_UNIT_PCT) {
-				enum css_height_e cbhtype;
-
-				if (css_computed_position(box->style) ==
-						CSS_POSITION_ABSOLUTE &&
-						box->parent) {
-					/* Box is absolutely positioned */
-					assert(box->float_container);
-					containing_block = box->float_container;
-				} else if (box->float_container &&
-					css_computed_position(box->style) !=
-						CSS_POSITION_ABSOLUTE &&
-					(css_computed_float(box->style) ==
-						CSS_FLOAT_LEFT ||
-					 css_computed_float(box->style) ==
-						CSS_FLOAT_RIGHT)) {
-					/* Box is a float */
-					assert(box->parent &&
-						box->parent->parent &&
-						box->parent->parent->parent);
-
-					containing_block =
-						box->parent->parent->parent;
-				} else if (box->parent && box->parent->type !=
-						BOX_INLINE_CONTAINER) {
-					/* Box is a block level element */
-					containing_block = box->parent;
-				} else if (box->parent && box->parent->type ==
-						BOX_INLINE_CONTAINER) {
-					/* Box is an inline block */
-					assert(box->parent->parent);
-					containing_block = box->parent->parent;
-				}
-
-				if (containing_block) {
-					css_fixed f = 0;
-					css_unit u = CSS_UNIT_PX;
-
-					cbhtype = css_computed_height(
-							containing_block->style,
-							&f, &u);
-				}
-
-				if (containing_block &&
-					containing_block->height != AUTO &&
-					(css_computed_position(box->style) ==
-							CSS_POSITION_ABSOLUTE ||
-						cbhtype == CSS_HEIGHT_SET)) {
-					/* Box is absolutely positioned or its
-					 * containing block has a valid
-					 * specified height.
-					 * (CSS 2.1 Section 10.5) */
-					*height = FPCT_OF_INT_TOINT(value,
-						containing_block->height);
-				} else if ((!box->parent ||
-						!box->parent->parent) &&
-						viewport_height >= 0) {
-					/* If root element or it's child
-					 * (HTML or BODY) */
-					*height = FPCT_OF_INT_TOINT(value,
-							viewport_height);
-				} else {
-					/* precentage height not permissible
-					 * treat height as auto */
-					*height = AUTO;
-				}
-			} else {
-				*height = FIXTOINT(nscss_len2px(len_ctx,
-						value, unit, style));
-			}
-		} else {
-			*height = AUTO;
-		}
-
-		if (*height != AUTO) {
-			layout_handle_box_sizing(len_ctx, box, available_width,
-					false, height);
-		}
-	}
-
-	if (max_width) {
-		enum css_max_width_e type;
-		css_fixed value = 0;
-		css_unit unit = CSS_UNIT_PX;
-
-		type = css_computed_max_width(style, &value, &unit);
-
-		if (type == CSS_MAX_WIDTH_SET) {
-			if (unit == CSS_UNIT_PCT) {
-				*max_width = FPCT_OF_INT_TOINT(value,
-						available_width);
-			} else {
-				*max_width = FIXTOINT(nscss_len2px(len_ctx,
-						value, unit, style));
-			}
-		} else {
-			/* Inadmissible */
-			*max_width = -1;
-		}
-
-		if (*max_width != -1) {
-			layout_handle_box_sizing(len_ctx, box, available_width,
-					true, max_width);
-		}
-	}
-
-	if (min_width) {
-		enum css_min_width_e type;
-		css_fixed value = 0;
-		css_unit unit = CSS_UNIT_PX;
-
-		type = ns_computed_min_width(style, &value, &unit);
-
-		if (type == CSS_MIN_WIDTH_SET) {
-			if (unit == CSS_UNIT_PCT) {
-				*min_width = FPCT_OF_INT_TOINT(value,
-						available_width);
-			} else {
-				*min_width = FIXTOINT(nscss_len2px(len_ctx,
-						value, unit, style));
-			}
-		} else {
-			/* Inadmissible */
-			*min_width = 0;
-		}
-
-		if (*min_width != 0) {
-			layout_handle_box_sizing(len_ctx, box, available_width,
-					true, min_width);
-		}
-	}
-
-	if (max_height) {
-		enum css_max_height_e type;
-		css_fixed value = 0;
-		css_unit unit = CSS_UNIT_PX;
-
-		type = css_computed_max_height(style, &value, &unit);
-
-		if (type == CSS_MAX_HEIGHT_SET) {
-			if (unit == CSS_UNIT_PCT) {
-				/* TODO: handle percentage */
-				*max_height = -1;
-			} else {
-				*max_height = FIXTOINT(nscss_len2px(len_ctx,
-						value, unit, style));
-			}
-		} else {
-			/* Inadmissible */
-			*max_height = -1;
-		}
-	}
-
-	if (min_height) {
-		enum css_min_height_e type;
-		css_fixed value = 0;
-		css_unit unit = CSS_UNIT_PX;
-
-		type = ns_computed_min_height(style, &value, &unit);
-
-		if (type == CSS_MIN_HEIGHT_SET) {
-			if (unit == CSS_UNIT_PCT) {
-				/* TODO: handle percentage */
-				*min_height = 0;
-			} else {
-				*min_height = FIXTOINT(nscss_len2px(len_ctx,
-						value, unit, style));
-			}
-		} else {
-			/* Inadmissible */
-			*min_height = 0;
-		}
-	}
-
-	for (i = 0; i != 4; i++) {
-		if (margin) {
-			enum css_margin_e type = CSS_MARGIN_AUTO;
-			css_fixed value = 0;
-			css_unit unit = CSS_UNIT_PX;
-
-			type = margin_funcs[i](style, &value, &unit);
-
-			if (type == CSS_MARGIN_SET) {
-				if (unit == CSS_UNIT_PCT) {
-					margin[i] = FPCT_OF_INT_TOINT(value,
-							available_width);
-				} else {
-					margin[i] = FIXTOINT(nscss_len2px(
-							len_ctx,
-							value, unit, style));
-				}
-			} else {
-				margin[i] = AUTO;
-			}
-		}
-
-		if (padding) {
-			css_fixed value = 0;
-			css_unit unit = CSS_UNIT_PX;
-
-			padding_funcs[i](style, &value, &unit);
-
-			if (unit == CSS_UNIT_PCT) {
-				padding[i] = FPCT_OF_INT_TOINT(value,
-						available_width);
-			} else {
-				padding[i] = FIXTOINT(nscss_len2px(len_ctx,
-						value, unit, style));
-			}
-		}
-
-		/* Table cell borders are populated in table.c */
-		if (border && box->type != BOX_TABLE_CELL) {
-			enum css_border_style_e bstyle = CSS_BORDER_STYLE_NONE;
-			css_color color = 0;
-			css_fixed value = 0;
-			css_unit unit = CSS_UNIT_PX;
-
-			border_width_funcs[i](style, &value, &unit);
-			bstyle = border_style_funcs[i](style);
-			border_color_funcs[i](style, &color);
-
-			border[i].style = bstyle;
-			border[i].c = color;
-
-			if (bstyle == CSS_BORDER_STYLE_HIDDEN ||
-					bstyle == CSS_BORDER_STYLE_NONE)
-				/* spec unclear: following Mozilla */
-				border[i].width = 0;
-			else
-				border[i].width = FIXTOINT(nscss_len2px(len_ctx,
-						value, unit, style));
-
-			/* Special case for border-collapse: make all borders
-			 * on table/table-row-group/table-row zero width. */
-			if (css_computed_border_collapse(style) ==
-					CSS_BORDER_COLLAPSE_COLLAPSE &&
-					(box->type == BOX_TABLE ||
-					 box->type == BOX_TABLE_ROW_GROUP ||
-					 box->type == BOX_TABLE_ROW))
-				border[i].width = 0;
-		}
-	}
+	assert(0 <= block->min_width);
+	assert(block->min_width <= block->max_width);
 }
 
 
 /**
  * Find next block that current margin collapses to.
  *
- * \param  len_ctx  Length conversion context
+ * \param  unit_len_ctx  Length conversion context
  * \param  box    box to start tree-order search from (top margin is included)
  * \param  block  box responsible for current block fromatting context
  * \param  viewport_height  height of viewport in px
@@ -1534,7 +1149,7 @@ layout_find_dimensions(const nscss_len_ctx *len_ctx,
  * \return  next box that current margin collapses to, or NULL if none.
  */
 static struct box*
-layout_next_margin_block(const nscss_len_ctx *len_ctx,
+layout_next_margin_block(const css_unit_ctx *unit_len_ctx,
 			 struct box *box,
 			 struct box *block,
 			 int viewport_height,
@@ -1554,7 +1169,7 @@ layout_next_margin_block(const nscss_len_ctx *len_ctx,
 
 			/* Get margins */
 			if (box->style) {
-				layout_find_dimensions(len_ctx,
+				layout_find_dimensions(unit_len_ctx,
 						box->parent->width,
 						viewport_height, box,
 						box->style,
@@ -1629,7 +1244,7 @@ layout_next_margin_block(const nscss_len_ctx *len_ctx,
 
 			/* Get margins */
 			if (box->style) {
-				layout_find_dimensions(len_ctx,
+				layout_find_dimensions(unit_len_ctx,
 						box->parent->width,
 						viewport_height, box,
 						box->style,
@@ -1866,7 +1481,7 @@ layout_solve_width(struct box *box,
  * Compute dimensions of box, margins, paddings, and borders for a block-level
  * element.
  *
- * \param  len_ctx          Length conversion context
+ * \param  unit_len_ctx          Length conversion context
  * \param  available_width  Max width available in pixels
  * \param  viewport_height  Height of viewport in pixels or -ve if unknown
  * \param  lm		    min left margin required to avoid floats in px.
@@ -1879,7 +1494,7 @@ layout_solve_width(struct box *box,
  * See CSS 2.1 10.3.3, 10.3.4, 10.6.2, and 10.6.3.
  */
 static void
-layout_block_find_dimensions(const nscss_len_ctx *len_ctx,
+layout_block_find_dimensions(const css_unit_ctx *unit_len_ctx,
 			     int available_width,
 			     int viewport_height,
 			     int lm,
@@ -1893,7 +1508,7 @@ layout_block_find_dimensions(const nscss_len_ctx *len_ctx,
 	struct box_border *border = box->border;
 	const css_computed_style *style = box->style;
 
-	layout_find_dimensions(len_ctx, available_width, viewport_height, box,
+	layout_find_dimensions(unit_len_ctx, available_width, viewport_height, box,
 			style, &width, &height, &max_width, &min_width,
 			&max_height, &min_height, margin, padding, border);
 
@@ -1985,15 +1600,10 @@ static void layout_move_children(struct box *box, int x, int y)
 }
 
 
-/**
- * Layout a table.
- *
- * \param  table	    table to layout
- * \param  available_width  width of containing block
- * \param  content	   memory pool for any new boxes
- * \return  true on success, false on memory exhaustion
- */
-static bool layout_table(struct box *table, int available_width,
+/* Documented in layout_internal.h */
+bool layout_table(
+		struct box *table,
+		int available_width,
 		html_content *content)
 {
 	unsigned int columns = table->columns;  /* total columns */
@@ -2047,7 +1657,7 @@ static bool layout_table(struct box *table, int available_width,
 	memcpy(col, table->col, sizeof(col[0]) * columns);
 
 	/* find margins, paddings, and borders for table and cells */
-	layout_find_dimensions(&content->len_ctx, available_width, -1, table,
+	layout_find_dimensions(&content->unit_len_ctx, available_width, -1, table,
 			style, 0, 0, 0, 0, 0, 0, table->margin, table->padding,
 			table->border);
 	for (row_group = table->children; row_group;
@@ -2059,8 +1669,8 @@ static bool layout_table(struct box *table, int available_width,
 
 				assert(c->style);
 				table_used_border_for_cell(
-						&content->len_ctx, c);
-				layout_find_dimensions(&content->len_ctx,
+						&content->unit_len_ctx, c);
+				layout_find_dimensions(&content->unit_len_ctx,
 						available_width, -1, c,
 						c->style, 0, 0, 0, 0, 0, 0,
 						0, c->padding, c->border);
@@ -2090,10 +1700,10 @@ static bool layout_table(struct box *table, int available_width,
 
 		css_computed_border_spacing(style, &h, &hu, &v, &vu);
 
-		border_spacing_h = FIXTOINT(nscss_len2px(&content->len_ctx,
-				h, hu, style));
-		border_spacing_v = FIXTOINT(nscss_len2px(&content->len_ctx,
-				v, vu, style));
+		border_spacing_h = FIXTOINT(css_unit_len2device_px(
+				style, &content->unit_len_ctx, h, hu));
+		border_spacing_v = FIXTOINT(css_unit_len2device_px(
+				style, &content->unit_len_ctx, v, vu));
 	}
 
 	/* find specified table width, or available width if auto-width */
@@ -2103,8 +1713,9 @@ static bool layout_table(struct box *table, int available_width,
 			table_width = FPCT_OF_INT_TOINT(value, available_width);
 		} else {
 			table_width =
-				FIXTOINT(nscss_len2px(&content->len_ctx,
-						value, unit, style));
+				FIXTOINT(css_unit_len2device_px(
+						style, &content->unit_len_ctx,
+						value, unit));
 		}
 
 		/* specified width includes border */
@@ -2182,8 +1793,9 @@ static bool layout_table(struct box *table, int available_width,
 		} else {
 			/* This is the minimum height for the table
 			 * (see 17.5.3) */
-			min_height = FIXTOINT(nscss_len2px(&content->len_ctx,
-					value, unit, style));
+			min_height = FIXTOINT(css_unit_len2device_px(
+					style, &content->unit_len_ctx,
+					value, unit));
 		}
 	}
 
@@ -2373,9 +1985,10 @@ static bool layout_table(struct box *table, int available_width,
 
 			htype = css_computed_height(row->style, &value, &unit);
 			if (htype == CSS_HEIGHT_SET && unit != CSS_UNIT_PCT) {
-				row_height = FIXTOINT(nscss_len2px(
-						&content->len_ctx,
-						value, unit, row->style));
+				row_height = FIXTOINT(css_unit_len2device_px(
+						row->style,
+						&content->unit_len_ctx,
+						value, unit));
 			}
 			for (c = row->children; c; c = c->next) {
 				assert(c->style);
@@ -2412,9 +2025,10 @@ static bool layout_table(struct box *table, int available_width,
 					/* some sites use height="1" or similar
 					 * to attempt to make cells as small as
 					 * possible, so treat it as a minimum */
-					int h = FIXTOINT(nscss_len2px(
-							&content->len_ctx,
-							value, unit, c->style));
+					int h = FIXTOINT(css_unit_len2device_px(
+							c->style,
+							&content->unit_len_ctx,
+							value, unit));
 					if (c->height < h)
 						c->height = h;
 				}
@@ -2558,14 +2172,14 @@ static bool layout_table(struct box *table, int available_width,
 /**
  * Manimpulate box height according to CSS min-height and max-height properties
  *
- * \param  len_ctx      CSS length conversion context for document.
+ * \param  unit_len_ctx      CSS length conversion context for document.
  * \param  box		block to modify with any min-height or max-height
  * \param  container	containing block for absolutely positioned elements, or
  *			NULL for non absolutely positioned elements.
  * \return		whether the height has been changed
  */
 static bool layout_apply_minmax_height(
-		const nscss_len_ctx *len_ctx,
+		const css_unit_ctx *unit_len_ctx,
 		struct box *box,
 		struct box *container)
 {
@@ -2626,8 +2240,9 @@ static bool layout_apply_minmax_height(
 					}
 				}
 			} else {
-				h = FIXTOINT(nscss_len2px(len_ctx,
-						value, unit, box->style));
+				h = FIXTOINT(css_unit_len2device_px(
+						box->style, unit_len_ctx,
+						value, unit));
 				if (h < box->height) {
 					box->height = h;
 					updated = true;
@@ -2656,8 +2271,9 @@ static bool layout_apply_minmax_height(
 					}
 				}
 			} else {
-				h = FIXTOINT(nscss_len2px(len_ctx,
-						value, unit, box->style));
+				h = FIXTOINT(css_unit_len2device_px(
+						box->style, unit_len_ctx,
+						value, unit));
 				if (h > box->height) {
 					box->height = h;
 					updated = true;
@@ -2679,7 +2295,9 @@ static bool layout_block_object(struct box *block)
 {
 	assert(block);
 	assert(block->type == BOX_BLOCK ||
+			block->type == BOX_FLEX ||
 			block->type == BOX_INLINE_BLOCK ||
+			block->type == BOX_INLINE_FLEX ||
 			block->type == BOX_TABLE ||
 			block->type == BOX_TABLE_CELL);
 	assert(block->object);
@@ -2687,7 +2305,7 @@ static bool layout_block_object(struct box *block)
 	NSLOG(layout, DEBUG,  "block %p, object %p, width %i", block,
 	      hlcache_handle_get_url(block->object), block->width);
 
-	if (content_get_type(block->object) == CONTENT_HTML) {
+	if (content_can_reformat(block->object)) {
 		content_reformat(block->object, false, block->width, 1);
 	} else {
 		/* Non-HTML objects */
@@ -2825,7 +2443,7 @@ layout_text_box_split(html_content *content,
  * Compute dimensions of box, margins, paddings, and borders for a floating
  * element using shrink-to-fit. Also used for inline-blocks.
  *
- * \param  len_ctx          CSS length conversion context for document.
+ * \param  unit_len_ctx          CSS length conversion context for document.
  * \param  available_width  Max width available in pixels
  * \param  style	    Box's style
  * \param  box		    Box for which to find dimensions
@@ -2834,7 +2452,7 @@ layout_text_box_split(html_content *content,
  */
 static void
 layout_float_find_dimensions(
-		const nscss_len_ctx *len_ctx,
+		const css_unit_ctx *unit_len_ctx,
 		int available_width,
 		const css_computed_style *style,
 		struct box *box)
@@ -2854,7 +2472,7 @@ layout_float_find_dimensions(
 			 overflow_y == CSS_OVERFLOW_AUTO) ?
 			SCROLLBAR_WIDTH : 0;
 
-	layout_find_dimensions(len_ctx, available_width, -1, box, style,
+	layout_find_dimensions(unit_len_ctx, available_width, -1, box, style,
 			&width, &height, &max_width, &min_width,
 			&max_height, &min_height, margin, padding, border);
 
@@ -2890,26 +2508,30 @@ layout_float_find_dimensions(
 				box->gadget->type == GADGET_FILE) {
 			if (width == AUTO) {
 				size = INTTOFIX(10);
-				width = FIXTOINT(nscss_len2px(len_ctx,
-						size, unit, box->style));
+				width = FIXTOINT(css_unit_len2device_px(
+						box->style, unit_len_ctx,
+						size, unit));
 			}
 			if (box->gadget->type == GADGET_FILE &&
 					height == AUTO) {
 				size = FLTTOFIX(1.5);
-				height = FIXTOINT(nscss_len2px(len_ctx,
-						size, unit, box->style));
+				height = FIXTOINT(css_unit_len2device_px(
+						box->style, unit_len_ctx,
+						size, unit));
 			}
 		}
 		if (box->gadget->type == GADGET_TEXTAREA) {
 			if (width == AUTO) {
 				size = INTTOFIX(10);
-				width = FIXTOINT(nscss_len2px(len_ctx,
-						size, unit, box->style));
+				width = FIXTOINT(css_unit_len2device_px(
+						box->style, unit_len_ctx,
+						size, unit));
 			}
 			if (height == AUTO) {
 				size = INTTOFIX(4);
-				height = FIXTOINT(nscss_len2px(len_ctx,
-						size, unit, box->style));
+				height = FIXTOINT(css_unit_len2device_px(
+						box->style, unit_len_ctx,
+						size, unit));
 			}
 		}
 	} else if (width == AUTO) {
@@ -2930,9 +2552,9 @@ layout_float_find_dimensions(
 			 * mbp as was used in layout_minmax_block() */
 			int fixed = 0;
 			float frac = 0;
-			calculate_mbp_width(len_ctx, box->style, LEFT,
+			calculate_mbp_width(unit_len_ctx, box->style, LEFT,
 					true, true, true, &fixed, &frac);
-			calculate_mbp_width(len_ctx, box->style, RIGHT,
+			calculate_mbp_width(unit_len_ctx, box->style, RIGHT,
 					true, true, true, &fixed, &frac);
 			if (fixed < 0)
 				fixed = 0;
@@ -2969,12 +2591,20 @@ layout_float_find_dimensions(
  */
 static bool layout_float(struct box *b, int width, html_content *content)
 {
-	assert(b->type == BOX_TABLE || b->type == BOX_BLOCK ||
-			b->type == BOX_INLINE_BLOCK);
-	layout_float_find_dimensions(&content->len_ctx, width, b->style, b);
-	if (b->type == BOX_TABLE) {
-		if (!layout_table(b, width, content))
-			return false;
+	assert(b->type == BOX_TABLE ||
+	       b->type == BOX_BLOCK ||
+	       b->type == BOX_INLINE_BLOCK ||
+	       b->type == BOX_FLEX ||
+	       b->type == BOX_INLINE_FLEX);
+	layout_float_find_dimensions(&content->unit_len_ctx, width, b->style, b);
+	if (b->type == BOX_TABLE || b->type == BOX_INLINE_FLEX) {
+		if (b->type == BOX_TABLE) {
+			if (!layout_table(b, width, content))
+				return false;
+		} else {
+			if (!layout_flex(b, width, content))
+				return false;
+		}
 		if (b->margin[LEFT] == AUTO)
 			b->margin[LEFT] = 0;
 		if (b->margin[RIGHT] == AUTO)
@@ -2983,8 +2613,9 @@ static bool layout_float(struct box *b, int width, html_content *content)
 			b->margin[TOP] = 0;
 		if (b->margin[BOTTOM] == AUTO)
 			b->margin[BOTTOM] = 0;
-	} else
+	} else {
 		return layout_block_context(b, -1, content);
+	}
 	return true;
 }
 
@@ -3044,7 +2675,7 @@ place_float_below(struct box *c, int width, int cx, int y, struct box *cont)
  * Calculate line height from a style.
  */
 static int line_height(
-		const nscss_len_ctx *len_ctx,
+		const css_unit_ctx *unit_len_ctx,
 		const css_computed_style *style)
 {
 	enum css_line_height_e lhtype;
@@ -3063,16 +2694,16 @@ static int line_height(
 
 	if (lhtype == CSS_LINE_HEIGHT_NUMBER ||
 			lhunit == CSS_UNIT_PCT) {
-		line_height = nscss_len2px(len_ctx,
-				lhvalue, CSS_UNIT_EM, style);
+		line_height = css_unit_len2device_px(style, unit_len_ctx,
+				lhvalue, CSS_UNIT_EM);
 
 		if (lhtype != CSS_LINE_HEIGHT_NUMBER)
 			line_height = FDIV(line_height, F_100);
 	} else {
 		assert(lhunit != CSS_UNIT_PCT);
 
-		line_height = nscss_len2px(len_ctx,
-				lhvalue, lhunit, style);
+		line_height = css_unit_len2device_px(style, unit_len_ctx,
+				lhvalue, lhunit);
 	}
 
 	return FIXTOINT(line_height);
@@ -3144,7 +2775,7 @@ layout_line(struct box *first,
 	x1 -= cx;
 
 	if (indent)
-		x0 += layout_text_indent(&content->len_ctx,
+		x0 += layout_text_indent(&content->unit_len_ctx,
 				first->parent->parent->style, *width);
 
 	if (x1 < x0)
@@ -3154,7 +2785,7 @@ layout_line(struct box *first,
 	 * this is the line-height if there are text children and also in the
 	 * case of an initially empty text input */
 	if (has_text_children || first->parent->parent->gadget)
-		used_height = height = line_height(&content->len_ctx,
+		used_height = height = line_height(&content->unit_len_ctx,
 				first->parent->parent->style);
 	else
 		/* inline containers with no text are usually for layout and
@@ -3171,20 +2802,14 @@ layout_line(struct box *first,
 	for (x = 0, b = first; x <= x1 - x0 && b != 0; b = b->next) {
 		int min_width, max_width, min_height, max_height;
 
-		assert(b->type == BOX_INLINE || b->type == BOX_INLINE_BLOCK ||
-				b->type == BOX_FLOAT_LEFT ||
-				b->type == BOX_FLOAT_RIGHT ||
-				b->type == BOX_BR || b->type == BOX_TEXT ||
-				b->type == BOX_INLINE_END);
-
+		assert(lh__box_is_inline_content(b));
 
 		NSLOG(layout, DEBUG,  "pass 1: b %p, x %i", b, x);
 
-
 		if (b->type == BOX_BR)
 			break;
 
-		if (b->type == BOX_FLOAT_LEFT || b->type == BOX_FLOAT_RIGHT)
+		if (lh__box_is_float_box(b))
 			continue;
 		if (b->type == BOX_INLINE_BLOCK &&
 				(css_computed_position(b->style) ==
@@ -3194,11 +2819,12 @@ layout_line(struct box *first,
 			continue;
 
 		assert(b->style != NULL);
-		font_plot_style_from_css(&content->len_ctx, b->style, &fstyle);
+		font_plot_style_from_css(&content->unit_len_ctx, b->style, &fstyle);
 
 		x += space_after;
 
-		if (b->type == BOX_INLINE_BLOCK) {
+		if (b->type == BOX_INLINE_BLOCK ||
+		    b->type == BOX_INLINE_FLEX) {
 			if (b->max_width != UNKNOWN_WIDTH)
 				if (!layout_float(b, *width, content))
 					return false;
@@ -3218,7 +2844,7 @@ layout_line(struct box *first,
 
 		if (b->type == BOX_INLINE) {
 			/* calculate borders, margins, and padding */
-			layout_find_dimensions(&content->len_ctx,
+			layout_find_dimensions(&content->unit_len_ctx,
 					*width, -1, b, b->style, 0, 0, 0, 0,
 					0, 0, b->margin, b->padding, b->border);
 			for (i = 0; i != 4; i++)
@@ -3250,10 +2876,9 @@ layout_line(struct box *first,
 			continue;
 		}
 
-		if (!b->object && !(b->flags & IFRAME) && !b->gadget &&
-				!(b->flags & REPLACE_DIM)) {
+		if (lh__box_is_replace(b) == false) {
 			/* inline non-replaced, 10.3.1 and 10.6.1 */
-			b->height = line_height(&content->len_ctx,
+			b->height = line_height(&content->unit_len_ctx,
 					b->style ? b->style :
 					b->parent->parent->style);
 			if (height < b->height)
@@ -3324,7 +2949,7 @@ layout_line(struct box *first,
 		/* inline replaced, 10.3.2 and 10.6.2 */
 		assert(b->style);
 
-		layout_find_dimensions(&content->len_ctx,
+		layout_find_dimensions(&content->unit_len_ctx,
 				*width, -1, b, b->style,
 				&b->width, &b->height,
 				&max_width, &min_width,
@@ -3347,17 +2972,19 @@ layout_line(struct box *first,
 		} else {
 			/* form control with no object */
 			if (b->width == AUTO)
-				b->width = FIXTOINT(nscss_len2px(
-						&content->len_ctx, INTTOFIX(1),
-						CSS_UNIT_EM, b->style));
+				b->width = FIXTOINT(css_unit_len2device_px(
+						b->style,
+						&content->unit_len_ctx, INTTOFIX(1),
+						CSS_UNIT_EM));
 			if (b->height == AUTO)
-				b->height = FIXTOINT(nscss_len2px(
-						&content->len_ctx, INTTOFIX(1),
-						CSS_UNIT_EM, b->style));
+				b->height = FIXTOINT(css_unit_len2device_px(
+						b->style,
+						&content->unit_len_ctx, INTTOFIX(1),
+						CSS_UNIT_EM));
 		}
 
 		/* Reformat object to new box size */
-		if (b->object && content_get_type(b->object) == CONTENT_HTML &&
+		if (b->object && content_can_reformat(b->object) &&
 				b->width !=
 				content_get_available_width(b->object)) {
 			css_fixed value = 0;
@@ -3386,7 +3013,7 @@ layout_line(struct box *first,
 	x1 -= cx;
 
 	if (indent)
-		x0 += layout_text_indent(&content->len_ctx,
+		x0 += layout_text_indent(&content->unit_len_ctx,
 				first->parent->parent->style, *width);
 
 	if (x1 < x0)
@@ -3409,10 +3036,7 @@ layout_line(struct box *first,
 						CSS_POSITION_FIXED)) {
 			b->x = x + space_after;
 
-		} else if (b->type == BOX_INLINE ||
-				b->type == BOX_INLINE_BLOCK ||
-				b->type == BOX_TEXT ||
-				b->type == BOX_INLINE_END) {
+		} else if (lh__box_is_inline_flow(b)) {
 			assert(b->width != UNKNOWN_WIDTH);
 
 			x_previous = x;
@@ -3420,7 +3044,8 @@ layout_line(struct box *first,
 			b->x = x;
 
 			if ((b->type == BOX_INLINE && !b->inline_end) ||
-					b->type == BOX_INLINE_BLOCK) {
+					b->type == BOX_INLINE_BLOCK ||
+					b->type == BOX_INLINE_FLEX) {
 				b->x += b->margin[LEFT] + b->border[LEFT].width;
 				x = b->x + b->padding[LEFT] + b->width +
 						b->padding[RIGHT] +
@@ -3445,7 +3070,7 @@ layout_line(struct box *first,
 			else if (b->text || b->type == BOX_INLINE_END) {
 				if (b->space == UNKNOWN_WIDTH) {
 					font_plot_style_from_css(
-							&content->len_ctx,
+							&content->unit_len_ctx,
 							b->style, &fstyle);
 					/** \todo handle errors */
 					font_func->width(&fstyle, " ", 1,
@@ -3599,7 +3224,7 @@ layout_line(struct box *first,
 		    !(split_box->flags & IFRAME) &&
 		    !split_box->gadget && split_box->text) {
 
-			font_plot_style_from_css(&content->len_ctx,
+			font_plot_style_from_css(&content->unit_len_ctx,
 					split_box->style, &fstyle);
 			/** \todo handle errors */
 			font_func->split(&fstyle,
@@ -3751,9 +3376,7 @@ layout_line(struct box *first,
 			d->y = *y;
 			continue;
 		} else if ((d->type == BOX_INLINE &&
-				((d->object || d->gadget) == false) &&
-				!(d->flags & IFRAME) &&
-				!(d->flags & REPLACE_DIM)) ||
+				lh__box_is_replace(d) == false) ||
 				d->type == BOX_BR ||
 				d->type == BOX_TEXT ||
 				d->type == BOX_INLINE_END) {
@@ -3874,8 +3497,7 @@ static bool layout_inline_container(struct box *inline_container, int width,
 				whitespace == CSS_WHITE_SPACE_PRE_WRAP);
 		}
 
-		if ((!c->object && !(c->flags & REPLACE_DIM) &&
-				!(c->flags & IFRAME) &&
+		if ((lh__box_is_object(c) == false &&
 				c->text && (c->length || is_pre)) ||
 				c->type == BOX_BR)
 			has_text_children = true;
@@ -3905,21 +3527,11 @@ static bool layout_inline_container(struct box *inline_container, int width,
 }
 
 
-/**
- * Layout a block formatting context.
- *
- * \param  block	    BLOCK, INLINE_BLOCK, or TABLE_CELL to layout
- * \param  viewport_height  Height of viewport in pixels or -ve if unknown
- * \param  content	    Memory pool for any new boxes
- * \return  true on success, false on memory exhaustion
- *
- * This function carries out layout of a block and its children, as described
- * in CSS 2.1 9.4.1.
- */
-static bool
-layout_block_context(struct box *block,
-		     int viewport_height,
-		     html_content *content)
+/* Documented in layout_intertnal.h */
+bool layout_block_context(
+		struct box *block,
+		int viewport_height,
+		html_content *content)
 {
 	struct box *box;
 	int cx, cy;  /**< current coordinates */
@@ -3934,7 +3546,9 @@ layout_block_context(struct box *block,
 
 	assert(block->type == BOX_BLOCK ||
 			block->type == BOX_INLINE_BLOCK ||
-			block->type == BOX_TABLE_CELL);
+			block->type == BOX_TABLE_CELL ||
+			block->type == BOX_FLEX ||
+			block->type == BOX_INLINE_FLEX);
 	assert(block->width != UNKNOWN_WIDTH);
 	assert(block->width != AUTO);
 
@@ -3963,9 +3577,10 @@ layout_block_context(struct box *block,
 		gadget_unit = CSS_UNIT_EM;
 		gadget_size = INTTOFIX(1);
 		if (block->height == AUTO)
-			block->height = FIXTOINT(nscss_len2px(
-					&content->len_ctx, gadget_size,
-					gadget_unit, block->style));
+			block->height = FIXTOINT(css_unit_len2device_px(
+					block->style,
+					&content->unit_len_ctx,
+					gadget_size, gadget_unit));
 	}
 
 	box = block->children;
@@ -4002,7 +3617,9 @@ layout_block_context(struct box *block,
 		enum css_overflow_e overflow_x = CSS_OVERFLOW_VISIBLE;
 		enum css_overflow_e overflow_y = CSS_OVERFLOW_VISIBLE;
 
-		assert(box->type == BOX_BLOCK || box->type == BOX_TABLE ||
+		assert(box->type == BOX_BLOCK ||
+				box->type == BOX_FLEX ||
+				box->type == BOX_TABLE ||
 				box->type == BOX_INLINE_CONTAINER);
 
 		/* Tables are laid out before being positioned, because the
@@ -4029,7 +3646,7 @@ layout_block_context(struct box *block,
 		 * through to, find out.  Update the pos/neg margin values. */
 		if (margin_collapse == NULL) {
 			margin_collapse = layout_next_margin_block(
-					&content->len_ctx, box, block,
+					&content->unit_len_ctx, box, block,
 					viewport_height,
 					&max_pos_margin, &max_neg_margin);
 			/* We have a margin that has not yet been applied. */
@@ -4053,9 +3670,10 @@ layout_block_context(struct box *block,
 		 * left and right margins to avoid any floats. */
 		lm = rm = 0;
 
-		if (box->type == BOX_BLOCK || box->flags & IFRAME) {
-			if (!box->object && !(box->flags & IFRAME) &&
-					!(box->flags & REPLACE_DIM) &&
+		if (box->type == BOX_FLEX ||
+		    box->type == BOX_BLOCK ||
+		    box->flags & IFRAME) {
+			if (lh__box_is_object(box) == false &&
 					box->style &&
 					(overflow_x != CSS_OVERFLOW_VISIBLE ||
 					 overflow_y != CSS_OVERFLOW_VISIBLE)) {
@@ -4080,7 +3698,7 @@ layout_block_context(struct box *block,
 						box->parent->padding[RIGHT] -
 						x1;
 			}
-			layout_block_find_dimensions(&content->len_ctx,
+			layout_block_find_dimensions(&content->unit_len_ctx,
 					box->parent->width,
 					viewport_height, lm, rm, box);
 			if (box->type == BOX_BLOCK && !(box->flags & IFRAME)) {
@@ -4140,6 +3758,7 @@ layout_block_context(struct box *block,
 
 		/* Vertical margin */
 		if (((box->type == BOX_BLOCK && (box->flags & HAS_HEIGHT)) ||
+		     box->type == BOX_FLEX ||
 		     box->type == BOX_TABLE ||
 		     (box->type == BOX_INLINE_CONTAINER &&
 		      !box_is_first_child(box)) ||
@@ -4164,11 +3783,19 @@ layout_block_context(struct box *block,
 
 		/* Unless the box has an overflow style of visible, the box
 		 * establishes a new block context. */
-		if (box->type == BOX_BLOCK && box->style &&
-				(overflow_x != CSS_OVERFLOW_VISIBLE ||
-				 overflow_y != CSS_OVERFLOW_VISIBLE)) {
+		if (box->type == BOX_FLEX ||
+				(box->type == BOX_BLOCK && box->style &&
+				 (overflow_x != CSS_OVERFLOW_VISIBLE ||
+				  overflow_y != CSS_OVERFLOW_VISIBLE))) {
 
-			layout_block_context(box, viewport_height, content);
+			if (box->type == BOX_FLEX) {
+				if (!layout_flex(box, box->width, content)) {
+					return false;
+				}
+			} else {
+				layout_block_context(box,
+						viewport_height, content);
+			}
 
 			cy += box->padding[TOP];
 
@@ -4189,7 +3816,8 @@ layout_block_context(struct box *block,
 			goto advance_to_next_box;
 		}
 
-		NSLOG(layout, DEBUG,  "box %p, cx %i, cy %i", box, cx, cy);
+		NSLOG(layout, DEBUG,  "box %p, cx %i, cy %i, width %i",
+				box, cx, cy, box->width);
 
 		/* Layout (except tables). */
 		if (box->object) {
@@ -4321,7 +3949,7 @@ layout_block_context(struct box *block,
 					css_computed_position(box->style) !=
 						CSS_POSITION_ABSOLUTE &&
 						layout_apply_minmax_height(
-							&content->len_ctx,
+							&content->unit_len_ctx,
 							box, NULL)) {
 					/* Height altered */
 					/* Set current cy */
@@ -4378,7 +4006,7 @@ layout_block_context(struct box *block,
 	if (block->style && css_computed_position(block->style) !=
 			CSS_POSITION_ABSOLUTE) {
 		/* Block is in normal flow */
-		layout_apply_minmax_height(&content->len_ctx, block, NULL);
+		layout_apply_minmax_height(&content->unit_len_ctx, block, NULL);
 	}
 
 	if (block->gadget &&
@@ -4390,7 +4018,7 @@ layout_block_context(struct box *block,
 				block->padding[RIGHT];
 		int ta_height = block->padding[TOP] + block->height +
 				block->padding[BOTTOM];
-		font_plot_style_from_css(&content->len_ctx,
+		font_plot_style_from_css(&content->unit_len_ctx,
 				block->style, &fstyle);
 		fstyle.background = NS_TRANSPARENT;
 		textarea_set_layout(block->gadget->data.text.ta,
@@ -4402,36 +4030,426 @@ layout_block_context(struct box *block,
 	return true;
 }
 
+/**
+ * Get a dom node's element tag type.
+ *
+ * \param[in]  node  Node to get tag type of.
+ * \param[in]  type  Returns element tag type on success.
+ * \return true if on success, false otherwise.
+ */
+static bool
+layout__get_element_tag(
+		const dom_node *node,
+		dom_html_element_type *type)
+{
+	dom_html_element_type element_type;
+	dom_node_type node_type;
+	dom_exception exc;
+
+	exc = dom_node_get_node_type(node, &node_type);
+	if (exc != DOM_NO_ERR ||
+	    node_type != DOM_ELEMENT_NODE) {
+		return false;
+	}
+
+	exc = dom_html_element_get_tag_type(node, &element_type);
+	if (exc != DOM_NO_ERR) {
+		return false;
+	}
+
+	*type = element_type;
+	return true;
+}
+
+
+/**
+ * Check a node's tag type.
+ *
+ * \param[in]  node  Node to check tag type of.
+ * \param[in]  type  Tag type to test for.
+ * \return true if if node has given type, false otherwise.
+ */
+static inline bool
+layout__check_element_type(
+		const dom_node *node,
+		dom_html_element_type type)
+{
+	dom_html_element_type element_type;
+
+	if (!layout__get_element_tag(node, &element_type)) {
+		return false;
+	}
+
+	return element_type == type;
+}
+
+
+/**
+ * Helper to get attribute value from a LI node.
+ *
+ * \param[in]  li_node    DOM node for the LI element;
+ * \param[out] value_out  Returns the value on success.
+ * \return true if node has value, otherwise false.
+ */
+static bool
+layout__get_li_value(dom_node *li_node, dom_long *value_out)
+{
+	dom_exception exc;
+	dom_long value;
+	bool has_value;
+
+	/** \todo
+	 * dom_html_li_element_get_value() is rubbish and we can't tell
+	 * a lack of value attribute or invalid value from a perfectly
+	 * valid '-1'.
+	 *
+	 * This helps for the common case of no value.  However we should
+	 * fix libdom to have some kind of sane interface to get numerical
+	 * attributes.
+	 */
+	exc = dom_element_has_attribute(li_node,
+			corestring_dom_value,
+			&has_value);
+	if (exc != DOM_NO_ERR || has_value == false) {
+		return false;
+	}
+
+	exc = dom_html_li_element_get_value(
+			(dom_html_li_element *)li_node,
+			&value);
+	if (exc != DOM_NO_ERR) {
+		return false;
+	}
+
+	*value_out = value;
+	return true;
+}
+
+
+/**
+ * Helper to get start attribute value from a OL node.
+ *
+ * \param[in]  ol_node    DOM node for the OL element;
+ * \param[out] start_out  Returns the value on success.
+ * \return true if node has value, otherwise false.
+ */
+static bool
+layout__get_ol_start(dom_node *ol_node, dom_long *start_out)
+{
+	dom_exception exc;
+	dom_long start;
+	bool has_start;
+
+	/** \todo
+	 * see layout__get_li_value().
+	 */
+	exc = dom_element_has_attribute(ol_node,
+			corestring_dom_start,
+			&has_start);
+	if (exc != DOM_NO_ERR || has_start == false) {
+		return false;
+	}
+
+	exc = dom_html_olist_element_get_start(
+			(dom_html_olist_element *)ol_node,
+			&start);
+	if (exc != DOM_NO_ERR) {
+		return false;
+	}
+
+	*start_out = start;
+	return true;
+}
+
+
+/**
+ * Helper to get reversed attribute value from a OL node.
+ *
+ * \param[in]  ol_node    DOM node for the OL element;
+ * \return true if node has reversed, otherwise false.
+ */
+static bool
+layout__get_ol_reversed(dom_node *ol_node)
+{
+	dom_exception exc;
+	bool has_reversed;
+
+	exc = dom_element_has_attribute(ol_node,
+			corestring_dom_reversed,
+			&has_reversed);
+	if (exc != DOM_NO_ERR) {
+		return false;
+	}
+
+	return has_reversed;
+}
+
+
+/**
+ * Get the number of list items for a list owner.
+ *
+ * \param[in]  list_owner  DOM node to count list items for.
+ * \param[in]  count_out   Returns list item count on success.
+ * \return true on success, otherwise false.
+ */
+static bool
+layout__get_list_item_count(
+		dom_node *list_owner, dom_long *count_out)
+{
+	dom_html_element_type tag_type;
+	dom_exception exc;
+	dom_node *child;
+	int count;
+
+	if (list_owner == NULL) {
+		return false;
+	}
+
+	if (!layout__get_element_tag(list_owner, &tag_type)) {
+		return false;
+	}
+
+	if (tag_type != DOM_HTML_ELEMENT_TYPE_OL &&
+	    tag_type != DOM_HTML_ELEMENT_TYPE_UL) {
+		return false;
+	}
+
+	exc = dom_node_get_first_child(list_owner, &child);
+	if (exc != DOM_NO_ERR) {
+		return false;
+	}
+
+	count = 0;
+	while (child != NULL) {
+		dom_node *temp_node;
+
+		if (layout__check_element_type(child,
+				DOM_HTML_ELEMENT_TYPE_LI)) {
+			struct box *child_box;
+			if (dom_node_get_user_data(child,
+					corestring_dom___ns_key_box_node_data,
+					&child_box) != DOM_NO_ERR) {
+				dom_node_unref(child);
+				return false;
+			}
+
+			if (child_box != NULL &&
+			    child_box->list_marker != NULL) {
+				count++;
+			}
+		}
+
+		exc = dom_node_get_next_sibling(child, &temp_node);
+		dom_node_unref(child);
+		if (exc != DOM_NO_ERR) {
+			return false;
+		}
+
+		child = temp_node;
+	}
+
+	*count_out = count;
+	return true;
+}
+
+
+/**
+ * Handle list item counting, if this is a list owner box.
+ *
+ * \param[in]  box  Box to do list item counting for.
+ */
+static void
+layout__ordered_list_count(
+		struct box *box)
+{
+	dom_html_element_type tag_type;
+	dom_exception exc;
+	dom_node *child;
+	int step = 1;
+	dom_long next;
+
+	if (box->node == NULL) {
+		return;
+	}
+
+	if (!layout__get_element_tag(box->node, &tag_type)) {
+		return;
+	}
+
+	if (tag_type != DOM_HTML_ELEMENT_TYPE_OL &&
+	    tag_type != DOM_HTML_ELEMENT_TYPE_UL) {
+		return;
+	}
+
+	next = 1;
+	if (tag_type == DOM_HTML_ELEMENT_TYPE_OL) {
+		bool have_start = layout__get_ol_start(box->node, &next);
+		bool have_reversed = layout__get_ol_reversed(box->node);
+
+		if (have_reversed) {
+			step = -1;
+		}
+
+		if (!have_start && have_reversed) {
+			layout__get_list_item_count(box->node, &next);
+		}
+	}
+
+	exc = dom_node_get_first_child(box->node, &child);
+	if (exc != DOM_NO_ERR) {
+		return;
+	}
+
+	while (child != NULL) {
+		dom_node *temp_node;
+
+		if (layout__check_element_type(child,
+				DOM_HTML_ELEMENT_TYPE_LI)) {
+			struct box *child_box;
+
+			if (dom_node_get_user_data(child,
+					corestring_dom___ns_key_box_node_data,
+					&child_box) != DOM_NO_ERR) {
+				dom_node_unref(child);
+				return;
+			}
+
+			if (child_box != NULL &&
+			    child_box->list_marker != NULL) {
+				dom_long value;
+				struct box *marker = child_box->list_marker;
+				if (layout__get_li_value(child, &value)) {
+					marker->list_value = value;
+					next = marker->list_value;
+				} else {
+					marker->list_value = next;
+				}
+				next += step;
+			}
+		}
+
+		exc = dom_node_get_next_sibling(child, &temp_node);
+		dom_node_unref(child);
+		if (exc != DOM_NO_ERR) {
+			return;
+		}
+
+		child = temp_node;
+	}
+}
+
+/**
+ * Set up the marker text for a numerical list item.
+ *
+ * \param[in]  content  The HTML content.
+ * \param[in]  box      The list item's main box.
+ */
+static void
+layout__set_numerical_marker_text(
+		const html_content *content,
+		struct box *box)
+{
+	struct box *marker = box->list_marker;
+	size_t counter_len;
+	css_error css_res;
+	enum {
+		/**
+		 * initial length of a list marker buffer
+		 *
+		 * enough for 9,999,999,999,999,999,999 in decimal
+		 * or five characters for 4-byte UTF-8.
+		 */
+		LIST_MARKER_SIZE = 20,
+	};
+
+	marker->text = talloc_array(content->bctx, char, LIST_MARKER_SIZE);
+	if (marker->text == NULL) {
+		return;
+	}
+
+	css_res = css_computed_format_list_style(box->style, marker->list_value,
+			marker->text, LIST_MARKER_SIZE, &counter_len);
+	if (css_res == CSS_OK) {
+		if (counter_len > LIST_MARKER_SIZE) {
+			/* Use computed size as marker did not fit in
+			 * default allocation. */
+			marker->text = talloc_realloc(content->bctx,
+					marker->text,
+					char,
+					counter_len);
+			if (marker->text == NULL) {
+				return;
+			}
+			css_computed_format_list_style(box->style,
+					marker->list_value, marker->text,
+					counter_len, &counter_len);
+		}
+		marker->length = counter_len;
+	}
+}
+
+/**
+ * Find out if box's style represents a numerical list style type.
+ *
+ * \param[in]  b  Box with style to test.
+ * \return true if box has numerical list style type, false otherwise.
+ */
+static bool
+layout__list_item_is_numerical(
+		const struct box *b)
+{
+	enum css_list_style_type_e t = css_computed_list_style_type(b->style);
+
+	switch (t) {
+	case CSS_LIST_STYLE_TYPE_DISC:   /* Fall through. */
+	case CSS_LIST_STYLE_TYPE_CIRCLE: /* Fall through. */
+	case CSS_LIST_STYLE_TYPE_SQUARE: /* Fall through. */
+	case CSS_LIST_STYLE_TYPE_NONE:
+		return false;
+
+	default:
+		return true;
+	}
+}
 
 /**
  * Layout list markers.
  */
 static void
-layout_lists(struct box *box,
-	     const struct gui_layout_table *font_func,
-	     const nscss_len_ctx *len_ctx)
+layout_lists(const html_content *content, struct box *box)
 {
 	struct box *child;
-	struct box *marker;
-	plot_font_style_t fstyle;
+
+	layout__ordered_list_count(box);
 
 	for (child = box->children; child; child = child->next) {
 		if (child->list_marker) {
-			marker = child->list_marker;
+			struct box *marker = child->list_marker;
+
+			if (layout__list_item_is_numerical(child)) {
+				if (marker->text == NULL) {
+					layout__set_numerical_marker_text(
+							content, child);
+				}
+			}
 			if (marker->object) {
 				marker->width =
 					content_get_width(marker->object);
 				marker->x = -marker->width;
 				marker->height =
 					content_get_height(marker->object);
-				marker->y = (line_height(len_ctx,
+				marker->y = (line_height(
+						&content->unit_len_ctx,
 						marker->style) -
 						marker->height) / 2;
 			} else if (marker->text) {
 				if (marker->width == UNKNOWN_WIDTH) {
-					font_plot_style_from_css(len_ctx,
-							marker->style, &fstyle);
-					font_func->width(&fstyle,
+					plot_font_style_t fstyle;
+					font_plot_style_from_css(
+							&content->unit_len_ctx,
+							marker->style,
+							&fstyle);
+					content->font_func->width(&fstyle,
 							marker->text,
 							marker->length,
 							&marker->width);
@@ -4439,7 +4457,8 @@ layout_lists(struct box *box,
 				}
 				marker->x = -marker->width;
 				marker->y = 0;
-				marker->height = line_height(len_ctx,
+				marker->height = line_height(
+						&content->unit_len_ctx,
 						marker->style);
 			} else {
 				marker->x = 0;
@@ -4450,7 +4469,7 @@ layout_lists(struct box *box,
 			/* Gap between marker and content */
 			marker->x -= 4;
 		}
-		layout_lists(child, font_func, len_ctx);
+		layout_lists(content, child);
 	}
 }
 
@@ -4459,7 +4478,7 @@ layout_lists(struct box *box,
  * Compute box offsets for a relatively or absolutely positioned box with
  * respect to a box.
  *
- * \param  len_ctx           Length conversion context
+ * \param  unit_len_ctx           Length conversion context
  * \param  box               box to compute offsets for
  * \param  containing_block  box to compute percentages with respect to
  * \param  top               updated to top offset, or AUTO
@@ -4470,7 +4489,7 @@ layout_lists(struct box *box,
  * See CSS 2.1 9.3.2. containing_block must have width and height.
  */
 static void
-layout_compute_offsets(const nscss_len_ctx *len_ctx,
+layout_compute_offsets(const css_unit_ctx *unit_len_ctx,
 		       struct box *box,
 		       struct box *containing_block,
 		       int *top,
@@ -4482,9 +4501,9 @@ layout_compute_offsets(const nscss_len_ctx *len_ctx,
 	css_fixed value = 0;
 	css_unit unit = CSS_UNIT_PX;
 
-	assert(containing_block->width != UNKNOWN_WIDTH &&
-			containing_block->width != AUTO &&
-			containing_block->height != AUTO);
+	assert(containing_block->width != UNKNOWN_WIDTH);
+	assert(containing_block->width != AUTO);
+	assert(containing_block->height != AUTO);
 
 	/* left */
 	type = css_computed_left(box->style, &value, &unit);
@@ -4493,8 +4512,9 @@ layout_compute_offsets(const nscss_len_ctx *len_ctx,
 			*left = FPCT_OF_INT_TOINT(value,
 					containing_block->width);
 		} else {
-			*left = FIXTOINT(nscss_len2px(len_ctx,
-					value, unit, box->style));
+			*left = FIXTOINT(css_unit_len2device_px(
+					box->style, unit_len_ctx,
+					value, unit));
 		}
 	} else {
 		*left = AUTO;
@@ -4507,8 +4527,9 @@ layout_compute_offsets(const nscss_len_ctx *len_ctx,
 			*right = FPCT_OF_INT_TOINT(value,
 					containing_block->width);
 		} else {
-			*right = FIXTOINT(nscss_len2px(len_ctx,
-					value, unit, box->style));
+			*right = FIXTOINT(css_unit_len2device_px(
+					box->style, unit_len_ctx,
+					value, unit));
 		}
 	} else {
 		*right = AUTO;
@@ -4521,8 +4542,9 @@ layout_compute_offsets(const nscss_len_ctx *len_ctx,
 			*top = FPCT_OF_INT_TOINT(value,
 					containing_block->height);
 		} else {
-			*top = FIXTOINT(nscss_len2px(len_ctx,
-					value, unit, box->style));
+			*top = FIXTOINT(css_unit_len2device_px(
+					box->style, unit_len_ctx,
+					value, unit));
 		}
 	} else {
 		*top = AUTO;
@@ -4535,8 +4557,9 @@ layout_compute_offsets(const nscss_len_ctx *len_ctx,
 			*bottom = FPCT_OF_INT_TOINT(value,
 					containing_block->height);
 		} else {
-			*bottom = FIXTOINT(nscss_len2px(len_ctx,
-					value, unit, box->style));
+			*bottom = FIXTOINT(css_unit_len2device_px(
+					box->style, unit_len_ctx,
+					value, unit));
 		}
 	} else {
 		*bottom = AUTO;
@@ -4570,7 +4593,9 @@ layout_absolute(struct box *box,
 	int space;
 
 	assert(box->type == BOX_BLOCK || box->type == BOX_TABLE ||
-			box->type == BOX_INLINE_BLOCK);
+			box->type == BOX_INLINE_BLOCK ||
+			box->type == BOX_FLEX ||
+			box->type == BOX_INLINE_FLEX);
 
 	/* The static position is where the box would be if it was not
 	 * absolutely positioned. The x and y are filled in by
@@ -4588,18 +4613,16 @@ layout_absolute(struct box *box,
 				containing_block->padding[RIGHT];
 		containing_block->height += containing_block->padding[TOP] +
 				containing_block->padding[BOTTOM];
-	} else {
-		/** \todo inline containers */
 	}
 
-	layout_compute_offsets(&content->len_ctx, box, containing_block,
+	layout_compute_offsets(&content->unit_len_ctx, box, containing_block,
 			&top, &right, &bottom, &left);
 
 	/* Pass containing block into layout_find_dimensions via the float
 	 * containing block box member. This is unused for absolutely positioned
 	 * boxes because a box can't be floated and absolutely positioned. */
 	box->float_container = containing_block;
-	layout_find_dimensions(&content->len_ctx, available_width, -1,
+	layout_find_dimensions(&content->unit_len_ctx, available_width, -1,
 			box, box->style, &width, &height,
 			&max_width, &min_width, 0, 0,
 			margin, padding, border);
@@ -4807,6 +4830,13 @@ layout_absolute(struct box *box,
 		box->float_container = NULL;
 		layout_solve_width(box, box->parent->width, box->width, 0, 0,
 				-1, -1);
+	} else if (box->type == BOX_FLEX || box->type == BOX_INLINE_FLEX) {
+		/* layout_table also expects the containing block to be
+		 * stored in the float_container field */
+		box->float_container = containing_block;
+		if (!layout_flex(box, width, content))
+			return false;
+		box->float_container = NULL;
 	}
 
 	/* 10.6.4 */
@@ -4917,7 +4947,7 @@ layout_absolute(struct box *box,
 		/** \todo Inline ancestors */
 	}
 	box->height = height;
-	layout_apply_minmax_height(&content->len_ctx, box, containing_block);
+	layout_apply_minmax_height(&content->unit_len_ctx, box, containing_block);
 
 	return true;
 }
@@ -4943,7 +4973,9 @@ layout_position_absolute(struct box *box,
 
 	for (c = box->children; c; c = c->next) {
 		if ((c->type == BOX_BLOCK || c->type == BOX_TABLE ||
-				c->type == BOX_INLINE_BLOCK) &&
+				c->type == BOX_INLINE_BLOCK ||
+				c->type == BOX_FLEX ||
+				c->type == BOX_INLINE_FLEX) &&
 				(css_computed_position(c->style) ==
 						CSS_POSITION_ABSOLUTE ||
 				 css_computed_position(c->style) ==
@@ -4994,13 +5026,13 @@ layout_position_absolute(struct box *box,
 /**
  * Compute a box's relative offset as per CSS 2.1 9.4.3
  *
- * \param  len_ctx  Length conversion context
+ * \param  unit_len_ctx  Length conversion context
  * \param  box	Box to compute relative offsets for.
  * \param  x	Receives relative offset in x.
  * \param  y	Receives relative offset in y.
  */
 static void layout_compute_relative_offset(
-		const nscss_len_ctx *len_ctx,
+		const css_unit_ctx *unit_len_ctx,
 		struct box *box,
 		int *x,
 		int *y)
@@ -5020,7 +5052,7 @@ static void layout_compute_relative_offset(
 		containing_block = box->parent;
 	}
 
-	layout_compute_offsets(len_ctx, box, containing_block,
+	layout_compute_offsets(unit_len_ctx, box, containing_block,
 			&top, &right, &bottom, &left);
 
 	if (left == AUTO && right == AUTO)
@@ -5068,7 +5100,7 @@ static void layout_compute_relative_offset(
 /**
  * Adjust positions of relatively positioned boxes.
  *
- * \param  len_ctx  Length conversion context
+ * \param  unit_len_ctx  Length conversion context
  * \param  root  box to adjust the position of
  * \param  fp    box which forms the block formatting context for children of
  *		 "root" which are floats
@@ -5081,7 +5113,7 @@ static void layout_compute_relative_offset(
  */
 static void
 layout_position_relative(
-		const nscss_len_ctx *len_ctx,
+		const css_unit_ctx *unit_len_ctx,
 		struct box *root,
 		struct box *fp,
 		int fx,
@@ -5110,7 +5142,7 @@ layout_position_relative(
 		if (box->style && css_computed_position(box->style) ==
 				CSS_POSITION_RELATIVE)
 			layout_compute_relative_offset(
-					len_ctx, box, &x, &y);
+					unit_len_ctx, box, &x, &y);
 		else
 			x = y = 0;
 
@@ -5146,7 +5178,7 @@ layout_position_relative(
 		}
 
 		/* recurse first */
-		layout_position_relative(len_ctx, box, fn, fnx, fny);
+		layout_position_relative(unit_len_ctx, box, fn, fnx, fny);
 
 		/* Ignore things we're not interested in. */
 		if (!box->style || (box->style &&
@@ -5175,7 +5207,7 @@ layout_position_relative(
 /**
  * Find a box's bounding box relative to itself, i.e. the box's border edge box
  *
- * \param  len_ctx  Length conversion context
+ * \param  unit_len_ctx  Length conversion context
  * \param  box      box find bounding box of
  * \param  desc_x0  updated to left of box's bbox
  * \param  desc_y0  updated to top of box's bbox
@@ -5184,7 +5216,7 @@ layout_position_relative(
  */
 static void
 layout_get_box_bbox(
-		const nscss_len_ctx *len_ctx,
+		const css_unit_ctx *unit_len_ctx,
 		struct box *box,
 		int *desc_x0, int *desc_y0,
 		int *desc_x1, int *desc_y1)
@@ -5207,8 +5239,8 @@ layout_get_box_bbox(
 		int text_height;
 
 		css_computed_font_size(box->style, &font_size, &font_unit);
-		text_height = nscss_len2px(len_ctx, font_size, font_unit,
-				box->style);
+		text_height = css_unit_len2device_px(box->style, unit_len_ctx,
+				font_size, font_unit);
 		text_height = FIXTOINT(text_height * 3 / 4);
 		*desc_y0 = (*desc_y0 < -text_height) ? *desc_y0 : -text_height;
 	}
@@ -5218,7 +5250,7 @@ layout_get_box_bbox(
 /**
  * Apply changes to box descendant_[xy][01] values due to given child.
  *
- * \param  len_ctx  Length conversion context
+ * \param  unit_len_ctx  Length conversion context
  * \param  box      box to update
  * \param  child    a box, which may affect box's descendant bbox
  * \param  off_x    offset to apply to child->x coord to treat as child of box
@@ -5226,7 +5258,7 @@ layout_get_box_bbox(
  */
 static void
 layout_update_descendant_bbox(
-		const nscss_len_ctx *len_ctx,
+		const css_unit_ctx *unit_len_ctx,
 		struct box *box,
 		struct box *child,
 		int off_x,
@@ -5250,7 +5282,7 @@ layout_update_descendant_bbox(
 	}
 
 	/* Get child's border edge */
-	layout_get_box_bbox(len_ctx, child,
+	layout_get_box_bbox(unit_len_ctx, child,
 			&child_desc_x0, &child_desc_y0,
 			&child_desc_x1, &child_desc_y1);
 
@@ -5288,11 +5320,11 @@ layout_update_descendant_bbox(
  * Recursively calculate the descendant_[xy][01] values for a laid-out box tree
  * and inform iframe browser windows of their size and position.
  *
- * \param  len_ctx  Length conversion context
+ * \param  unit_len_ctx  Length conversion context
  * \param  box      tree of boxes to update
  */
 static void layout_calculate_descendant_bboxes(
-		const nscss_len_ctx *len_ctx,
+		const css_unit_ctx *unit_len_ctx,
 		struct box *box)
 {
 	struct box *child;
@@ -5302,7 +5334,7 @@ static void layout_calculate_descendant_bboxes(
 	/* assert((box->width >= 0) && (box->height >= 0)); */
 
 	/* Initialise box's descendant box to border edge box */
-	layout_get_box_bbox(len_ctx, box,
+	layout_get_box_bbox(unit_len_ctx, box,
 			&box->descendant_x0, &box->descendant_y0,
 			&box->descendant_x1, &box->descendant_y1);
 
@@ -5336,7 +5368,7 @@ static void layout_calculate_descendant_bboxes(
 					child->type == BOX_FLOAT_RIGHT)
 				continue;
 
-			layout_update_descendant_bbox(len_ctx, box, child,
+			layout_update_descendant_bbox(unit_len_ctx, box, child,
 					box->x, box->y);
 
 			if (child == box->inline_end)
@@ -5354,7 +5386,7 @@ static void layout_calculate_descendant_bboxes(
 				child->type == BOX_FLOAT_RIGHT)
 			continue;
 
-		layout_calculate_descendant_bboxes(len_ctx, child);
+		layout_calculate_descendant_bboxes(unit_len_ctx, child);
 
 		if (box->style && css_computed_overflow_x(box->style) ==
 				CSS_OVERFLOW_HIDDEN &&
@@ -5362,23 +5394,23 @@ static void layout_calculate_descendant_bboxes(
 				CSS_OVERFLOW_HIDDEN)
 			continue;
 
-		layout_update_descendant_bbox(len_ctx, box, child, 0, 0);
+		layout_update_descendant_bbox(unit_len_ctx, box, child, 0, 0);
 	}
 
 	for (child = box->float_children; child; child = child->next_float) {
 		assert(child->type == BOX_FLOAT_LEFT ||
 				child->type == BOX_FLOAT_RIGHT);
 
-		layout_calculate_descendant_bboxes(len_ctx, child);
+		layout_calculate_descendant_bboxes(unit_len_ctx, child);
 
-		layout_update_descendant_bbox(len_ctx, box, child, 0, 0);
+		layout_update_descendant_bbox(unit_len_ctx, box, child, 0, 0);
 	}
 
 	if (box->list_marker) {
 		child = box->list_marker;
-		layout_calculate_descendant_bboxes(len_ctx, child);
+		layout_calculate_descendant_bboxes(unit_len_ctx, child);
 
-		layout_update_descendant_bbox(len_ctx, box, child, 0, 0);
+		layout_update_descendant_bbox(unit_len_ctx, box, child, 0, 0);
 	}
 }
 
@@ -5396,7 +5428,7 @@ bool layout_document(html_content *content, int width, int height)
 
 	layout_minmax_block(doc, font_func, content);
 
-	layout_block_find_dimensions(&content->len_ctx,
+	layout_block_find_dimensions(&content->unit_len_ctx,
 			width, height, 0, 0, doc);
 	doc->x = doc->margin[LEFT] + doc->border[LEFT].width;
 	doc->y = doc->margin[TOP] + doc->border[TOP].width;
@@ -5428,11 +5460,11 @@ bool layout_document(html_content *content, int width, int height)
 					 doc->children->margin[BOTTOM]);
 	}
 
-	layout_lists(doc, font_func, &content->len_ctx);
+	layout_lists(content, doc);
 	layout_position_absolute(doc, doc, 0, 0, content);
-	layout_position_relative(&content->len_ctx, doc, doc, 0, 0);
+	layout_position_relative(&content->unit_len_ctx, doc, doc, 0, 0);
 
-	layout_calculate_descendant_bboxes(&content->len_ctx, doc);
+	layout_calculate_descendant_bboxes(&content->unit_len_ctx, doc);
 
 	return ret;
 }
diff --git a/content/handlers/html/layout_flex.c b/content/handlers/html/layout_flex.c
new file mode 100644
index 000000000..bde3c5bd1
--- /dev/null
+++ b/content/handlers/html/layout_flex.c
@@ -0,0 +1,1117 @@
+/*
+ * Copyright 2022 Michael Drake <tlsa@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * HTML layout implementation: display: flex.
+ *
+ * Layout is carried out in two stages:
+ *
+ * 1. + calculation of minimum / maximum box widths, and
+ *    + determination of whether block level boxes will have >zero height
+ *
+ * 2. + layout (position and dimensions)
+ *
+ * In most cases the functions for the two stages are a corresponding pair
+ * layout_minmax_X() and layout_X().
+ */
+
+#include <string.h>
+
+#include "utils/log.h"
+#include "utils/utils.h"
+
+#include "html/box.h"
+#include "html/html.h"
+#include "html/private.h"
+#include "html/box_inspect.h"
+#include "html/layout_internal.h"
+
+/**
+ * Flex item data
+ */
+struct flex_item_data {
+	enum css_flex_basis_e basis;
+	css_fixed basis_length;
+	css_unit basis_unit;
+	struct box *box;
+
+	css_fixed shrink;
+	css_fixed grow;
+
+	int min_main;
+	int max_main;
+	int min_cross;
+	int max_cross;
+
+	int target_main_size;
+	int base_size;
+	int main_size;
+	size_t line;
+
+	bool freeze;
+	bool min_violation;
+	bool max_violation;
+};
+
+/**
+ * Flex line data
+ */
+struct flex_line_data {
+	int main_size;
+	int cross_size;
+
+	int used_main_size;
+	int main_auto_margin_count;
+
+	int pos;
+
+	size_t first;
+	size_t count;
+	size_t frozen;
+};
+
+/**
+ * Flex layout context
+ */
+struct flex_ctx {
+	html_content *content;
+	const struct box *flex;
+	const css_unit_ctx *unit_len_ctx;
+
+	int main_size;
+	int cross_size;
+
+	int available_main;
+	int available_cross;
+
+	bool horizontal;
+	bool main_reversed;
+	enum css_flex_wrap_e wrap;
+
+	struct flex_items {
+		size_t count;
+		struct flex_item_data *data;
+	} item;
+
+	struct flex_lines {
+		size_t count;
+		size_t alloc;
+		struct flex_line_data *data;
+	} line;
+};
+
+/**
+ * Destroy a flex layout context
+ *
+ * \param[in] ctx  Flex layout context
+ */
+static void layout_flex_ctx__destroy(struct flex_ctx *ctx)
+{
+	if (ctx != NULL) {
+		free(ctx->item.data);
+		free(ctx->line.data);
+		free(ctx);
+	}
+}
+
+/**
+ * Create a flex layout context
+ *
+ * \param[in] content  HTML content containing flex box
+ * \param[in] flex     Box to create layout context for
+ * \return flex layout context or NULL on error
+ */
+static struct flex_ctx *layout_flex_ctx__create(
+		html_content *content,
+		const struct box *flex)
+{
+	struct flex_ctx *ctx;
+
+	ctx = calloc(1, sizeof(*ctx));
+	if (ctx == NULL) {
+		return NULL;
+	}
+	ctx->line.alloc = 1;
+
+	ctx->item.count = box_count_children(flex);
+	ctx->item.data = calloc(ctx->item.count, sizeof(*ctx->item.data));
+	if (ctx->item.data == NULL) {
+		layout_flex_ctx__destroy(ctx);
+		return NULL;
+	}
+
+	ctx->line.alloc = 1;
+	ctx->line.data = calloc(ctx->line.alloc, sizeof(*ctx->line.data));
+	if (ctx->line.data == NULL) {
+		layout_flex_ctx__destroy(ctx);
+		return NULL;
+	}
+
+	ctx->flex = flex;
+	ctx->content = content;
+	ctx->unit_len_ctx = &content->unit_len_ctx;
+
+	ctx->wrap = css_computed_flex_wrap(flex->style);
+	ctx->horizontal = lh__flex_main_is_horizontal(flex);
+	ctx->main_reversed = lh__flex_direction_reversed(flex);
+
+	return ctx;
+}
+
+/**
+ * Find box side representing the start of flex container in main direction.
+ *
+ * \param[in] ctx   Flex layout context.
+ * \return the start side.
+ */
+static enum box_side layout_flex__main_start_side(
+		const struct flex_ctx *ctx)
+{
+	if (ctx->horizontal) {
+		return (ctx->main_reversed) ? RIGHT : LEFT;
+	} else {
+		return (ctx->main_reversed) ? BOTTOM : TOP;
+	}
+}
+
+/**
+ * Find box side representing the end of flex container in main direction.
+ *
+ * \param[in] ctx   Flex layout context.
+ * \return the end side.
+ */
+static enum box_side layout_flex__main_end_side(
+		const struct flex_ctx *ctx)
+{
+	if (ctx->horizontal) {
+		return (ctx->main_reversed) ? LEFT : RIGHT;
+	} else {
+		return (ctx->main_reversed) ? TOP : BOTTOM;
+	}
+}
+
+/**
+ * Perform layout on a flex item
+ *
+ * \param[in] ctx              Flex layout context
+ * \param[in] item             Item to lay out
+ * \param[in] available_width  Available width for item in pixels
+ * \return true on success false on failure
+ */
+static bool layout_flex_item(
+		const struct flex_ctx *ctx,
+		const struct flex_item_data *item,
+		int available_width)
+{
+	bool success;
+	struct box *b = item->box;
+
+	switch (b->type) {
+	case BOX_BLOCK:
+		success = layout_block_context(b, -1, ctx->content);
+		break;
+	case BOX_TABLE:
+		b->float_container = b->parent;
+		success = layout_table(b, available_width, ctx->content);
+		b->float_container = NULL;
+		break;
+	case BOX_FLEX:
+		b->float_container = b->parent;
+		success = layout_flex(b, available_width, ctx->content);
+		b->float_container = NULL;
+		break;
+	default:
+		assert(0 && "Bad flex item back type");
+		success = false;
+		break;
+	}
+
+	if (!success) {
+		NSLOG(flex, ERROR, "box %p: layout failed", b);
+	}
+
+	return success;
+}
+
+/**
+ * Calculate an item's base and target main sizes.
+ *
+ * \param[in] ctx              Flex layout context
+ * \param[in] item             Item to get sizes of
+ * \param[in] available_width  Available width in pixels
+ * \return true on success false on failure
+ */
+static inline bool layout_flex__base_and_main_sizes(
+		const struct flex_ctx *ctx,
+		struct flex_item_data *item,
+		int available_width)
+{
+	struct box *b = item->box;
+	int content_min_width = b->min_width;
+	int content_max_width = b->max_width;
+	int delta_outer_main = lh__delta_outer_main(ctx->flex, b);
+
+	NSLOG(flex, DEEPDEBUG, "box %p: delta_outer_main: %i",
+			b, delta_outer_main);
+
+	if (item->basis == CSS_FLEX_BASIS_SET) {
+		if (item->basis_unit == CSS_UNIT_PCT) {
+			item->base_size = FPCT_OF_INT_TOINT(
+					item->basis_length,
+					available_width);
+		} else {
+			item->base_size = FIXTOINT(css_unit_len2device_px(
+					b->style, ctx->unit_len_ctx,
+					item->basis_length,
+					item->basis_unit));
+		}
+
+	} else if (item->basis == CSS_FLEX_BASIS_AUTO) {
+		item->base_size = ctx->horizontal ? b->width : b->height;
+	} else {
+		item->base_size = AUTO;
+	}
+
+	if (ctx->horizontal == false) {
+		if (b->width == AUTO) {
+			b->width = min(max(content_min_width, available_width),
+					content_max_width);
+			b->width -= lh__delta_outer_width(b);
+		}
+
+		if (!layout_flex_item(ctx, item, b->width)) {
+			return false;
+		}
+	}
+
+	if (item->base_size == AUTO) {
+		if (ctx->horizontal == false) {
+			item->base_size = b->height;
+		} else {
+			item->base_size = content_max_width - delta_outer_main;
+		}
+	}
+
+	item->base_size += delta_outer_main;
+
+	if (ctx->horizontal) {
+		item->base_size = min(item->base_size, available_width);
+		item->base_size = max(item->base_size, content_min_width);
+	}
+
+	item->target_main_size = item->base_size;
+	item->main_size = item->base_size;
+
+	if (item->max_main > 0 &&
+	    item->main_size > item->max_main + delta_outer_main) {
+		item->main_size = item->max_main + delta_outer_main;
+	}
+
+	if (item->main_size < item->min_main + delta_outer_main) {
+		item->main_size = item->min_main + delta_outer_main;
+	}
+
+	NSLOG(flex, DEEPDEBUG, "flex-item box: %p: base_size: %i, main_size %i",
+			b, item->base_size, item->main_size);
+
+	return true;
+}
+
+/**
+ * Fill out all item's data in a flex container.
+ *
+ * \param[in] ctx              Flex layout context
+ * \param[in] flex             Flex box
+ * \param[in] available_width  Available width in pixels
+ */
+static void layout_flex_ctx__populate_item_data(
+		const struct flex_ctx *ctx,
+		const struct box *flex,
+		int available_width)
+{
+	size_t i = 0;
+	bool horizontal = ctx->horizontal;
+
+	for (struct box *b = flex->children; b != NULL; b = b->next) {
+		struct flex_item_data *item = &ctx->item.data[i++];
+
+		b->float_container = b->parent;
+		layout_find_dimensions(ctx->unit_len_ctx, available_width, -1,
+				b, b->style, &b->width, &b->height,
+				horizontal ? &item->max_main : &item->max_cross,
+				horizontal ? &item->min_main : &item->min_cross,
+				horizontal ? &item->max_cross : &item->max_main,
+				horizontal ? &item->min_cross : &item->min_main,
+				b->margin, b->padding, b->border);
+		b->float_container = NULL;
+
+		NSLOG(flex, DEEPDEBUG, "flex-item box: %p: width: %i",
+				b, b->width);
+
+		item->box = b;
+		item->basis = css_computed_flex_basis(b->style,
+				&item->basis_length, &item->basis_unit);
+
+		css_computed_flex_shrink(b->style, &item->shrink);
+		css_computed_flex_grow(b->style, &item->grow);
+
+		layout_flex__base_and_main_sizes(ctx, item, available_width);
+	}
+}
+
+/**
+ * Ensure context's lines array has a free space
+ *
+ * \param[in] ctx  Flex layout context
+ * \return true on success false on out of memory
+ */
+static bool layout_flex_ctx__ensure_line(struct flex_ctx *ctx)
+{
+	struct flex_line_data *temp;
+	size_t line_alloc = ctx->line.alloc * 2;
+
+	if (ctx->line.alloc > ctx->line.count) {
+		return true;
+	}
+
+	temp = realloc(ctx->line.data, sizeof(*ctx->line.data) * line_alloc);
+	if (temp == NULL) {
+		return false;
+	}
+	ctx->line.data = temp;
+
+	memset(ctx->line.data + ctx->line.alloc, 0,
+	       sizeof(*ctx->line.data) * (line_alloc - ctx->line.alloc));
+	ctx->line.alloc = line_alloc;
+
+	return true;
+}
+
+/**
+ * Assigns flex items to the line and returns the line
+ *
+ * \param[in] ctx         Flex layout context
+ * \param[in] item_index  Index to first item to assign to this line
+ * \return Pointer to the new line, or NULL on error.
+ */
+static struct flex_line_data *layout_flex__build_line(struct flex_ctx *ctx,
+		size_t item_index)
+{
+	enum box_side start_side = layout_flex__main_start_side(ctx);
+	enum box_side end_side = layout_flex__main_end_side(ctx);
+	struct flex_line_data *line;
+	int used_main = 0;
+
+	if (!layout_flex_ctx__ensure_line(ctx)) {
+		return NULL;
+	}
+
+	line = &ctx->line.data[ctx->line.count];
+	line->first = item_index;
+
+	NSLOG(flex, DEEPDEBUG, "flex container %p: available main: %i",
+			ctx->flex, ctx->available_main);
+
+	while (item_index < ctx->item.count) {
+		struct flex_item_data *item = &ctx->item.data[item_index];
+		struct box *b = item->box;
+		int pos_main;
+
+		pos_main = ctx->horizontal ?
+				item->main_size :
+				b->height + lh__delta_outer_main(ctx->flex, b);
+
+		if (ctx->wrap == CSS_FLEX_WRAP_NOWRAP ||
+		    pos_main + used_main <= ctx->available_main ||
+		    lh__box_is_absolute(item->box) ||
+		    ctx->available_main == AUTO ||
+		    line->count == 0 ||
+		    pos_main == 0) {
+			if (lh__box_is_absolute(item->box) == false) {
+				line->main_size += item->main_size;
+				used_main += pos_main;
+
+				if (b->margin[start_side] == AUTO) {
+					line->main_auto_margin_count++;
+				}
+				if (b->margin[end_side] == AUTO) {
+					line->main_auto_margin_count++;
+				}
+			}
+			item->line = ctx->line.count;
+			line->count++;
+			item_index++;
+		} else {
+			break;
+		}
+	}
+
+	if (line->count > 0) {
+		ctx->line.count++;
+	} else {
+		NSLOG(layout, ERROR, "Failed to fit any flex items");
+	}
+
+	return line;
+}
+
+/**
+ * Freeze an item on a line
+ *
+ * \param[in] line  Line to containing item
+ * \param[in] item  Item to freeze
+ */
+static inline void layout_flex__item_freeze(
+		struct flex_line_data *line,
+		struct flex_item_data *item)
+{
+	item->freeze = true;
+	line->frozen++;
+
+	if (!lh__box_is_absolute(item->box)){
+		line->used_main_size += item->target_main_size;
+	}
+
+	NSLOG(flex, DEEPDEBUG, "flex-item box: %p: "
+			"Frozen at target_main_size: %i",
+			item->box, item->target_main_size);
+}
+
+/**
+ * Calculate remaining free space and unfrozen item factor sum
+ *
+ * \param[in]  ctx                  Flex layout context
+ * \param[in]  line                 Line to calculate free space on
+ * \param[out] unfrozen_factor_sum  Returns sum of unfrozen item's flex factors
+ * \param[in]  initial_free_main    Initial free space in main direction
+ * \param[in]  available_main       Available space in main direction
+ * \param[in]  grow                 Whether to grow or shrink
+ * return remaining free space on line
+ */
+static inline int layout_flex__remaining_free_main(
+		struct flex_ctx *ctx,
+		struct flex_line_data *line,
+		css_fixed *unfrozen_factor_sum,
+		int initial_free_main,
+		int available_main,
+		bool grow)
+{
+	int remaining_free_main = available_main;
+	size_t item_count = line->first + line->count;
+
+	*unfrozen_factor_sum = 0;
+
+	for (size_t i = line->first; i < item_count; i++) {
+		struct flex_item_data *item = &ctx->item.data[i];
+
+		if (item->freeze) {
+			remaining_free_main -= item->target_main_size;
+		} else {
+			remaining_free_main -= item->base_size;
+
+			*unfrozen_factor_sum += grow ?
+					item->grow : item->shrink;
+		}
+	}
+
+	if (*unfrozen_factor_sum < F_1) {
+		int free_space = FIXTOINT(FMUL(INTTOFIX(initial_free_main),
+				*unfrozen_factor_sum));
+
+		if (free_space < remaining_free_main) {
+			remaining_free_main = free_space;
+		}
+	}
+
+	NSLOG(flex, DEEPDEBUG, "Remaining free space: %i",
+			remaining_free_main);
+
+	return remaining_free_main;
+}
+
+/**
+ * Clamp flex item target main size and get min/max violations
+ *
+ * \param[in] ctx   Flex layout context
+ * \param[in] line  Line to align items on
+ * return total violation in pixels
+ */
+static inline int layout_flex__get_min_max_violations(
+		struct flex_ctx *ctx,
+		struct flex_line_data *line)
+{
+
+	int total_violation = 0;
+	size_t item_count = line->first + line->count;
+
+	for (size_t i = line->first; i < item_count; i++) {
+		struct flex_item_data *item = &ctx->item.data[i];
+		int target_main_size = item->target_main_size;
+
+		NSLOG(flex, DEEPDEBUG, "item %p: target_main_size: %i",
+					item->box, target_main_size);
+
+		if (item->freeze) {
+			continue;
+		}
+
+		if (item->max_main > 0 &&
+		    target_main_size > item->max_main) {
+			target_main_size = item->max_main;
+			item->max_violation = true;
+			NSLOG(flex, DEEPDEBUG, "Violation: max_main: %i",
+					item->max_main);
+		}
+
+		if (target_main_size < item->min_main) {
+			target_main_size = item->min_main;
+			item->min_violation = true;
+			NSLOG(flex, DEEPDEBUG, "Violation: min_main: %i",
+					item->min_main);
+		}
+
+		if (target_main_size < item->box->min_width) {
+			target_main_size = item->box->min_width;
+			item->min_violation = true;
+			NSLOG(flex, DEEPDEBUG, "Violation: box min_width: %i",
+					item->box->min_width);
+		}
+
+		if (target_main_size < 0) {
+			target_main_size = 0;
+			item->min_violation = true;
+			NSLOG(flex, DEEPDEBUG, "Violation: less than 0");
+		}
+
+		total_violation += target_main_size - item->target_main_size;
+		item->target_main_size = target_main_size;
+	}
+
+	NSLOG(flex, DEEPDEBUG, "Total violation: %i", total_violation);
+
+	return total_violation;
+}
+
+/**
+ * Distribute remaining free space proportional to the flex factors.
+ *
+ * Remaining free space may be negative.
+ *
+ * \param[in] ctx                  Flex layout context
+ * \param[in] line                 Line to distribute free space on
+ * \param[in] unfrozen_factor_sum  Sum of unfrozen item's flex factors
+ * \param[in] remaining_free_main  Remaining free space in main direction
+ * \param[in] grow                 Whether to grow or shrink
+ */
+static inline void layout_flex__distribute_free_main(
+		struct flex_ctx *ctx,
+		struct flex_line_data *line,
+		css_fixed unfrozen_factor_sum,
+		int remaining_free_main,
+		bool grow)
+{
+	size_t item_count = line->first + line->count;
+
+	if (grow) {
+		css_fixed remainder = 0;
+		for (size_t i = line->first; i < item_count; i++) {
+			struct flex_item_data *item = &ctx->item.data[i];
+			css_fixed result;
+			css_fixed ratio;
+
+			if (item->freeze) {
+				continue;
+			}
+
+			ratio = FDIV(item->grow, unfrozen_factor_sum);
+			result = FMUL(INTTOFIX(remaining_free_main), ratio) +
+					remainder;
+
+			item->target_main_size = item->base_size +
+					FIXTOINT(result);
+			remainder = FIXFRAC(result);
+		}
+	} else {
+		css_fixed scaled_shrink_factor_sum = 0;
+		css_fixed remainder = 0;
+
+		for (size_t i = line->first; i < item_count; i++) {
+			struct flex_item_data *item = &ctx->item.data[i];
+			css_fixed scaled_shrink_factor;
+
+			if (item->freeze) {
+				continue;
+			}
+
+			scaled_shrink_factor = FMUL(
+					item->shrink,
+					INTTOFIX(item->base_size));
+			scaled_shrink_factor_sum += scaled_shrink_factor;
+		}
+
+		for (size_t i = line->first; i < item_count; i++) {
+			struct flex_item_data *item = &ctx->item.data[i];
+			css_fixed scaled_shrink_factor;
+			css_fixed result;
+			css_fixed ratio;
+
+			if (item->freeze) {
+				continue;
+			} else if (scaled_shrink_factor_sum == 0) {
+				item->target_main_size = item->main_size;
+				layout_flex__item_freeze(line, item);
+				continue;
+			}
+
+			scaled_shrink_factor = FMUL(
+					item->shrink,
+					INTTOFIX(item->base_size));
+			ratio = FDIV(scaled_shrink_factor,
+			             scaled_shrink_factor_sum);
+			result = FMUL(INTTOFIX(abs(remaining_free_main)),
+			              ratio) + remainder;
+
+			item->target_main_size = item->base_size -
+					FIXTOINT(result);
+			remainder = FIXFRAC(result);
+		}
+	}
+}
+
+/**
+ * Resolve flexible item lengths along a line.
+ *
+ * See 9.7 of Tests CSS Flexible Box Layout Module Level 1.
+ *
+ * \param[in] ctx   Flex layout context
+ * \param[in] line  Line to resolve
+ * \return true on success, false on failure.
+ */
+static bool layout_flex__resolve_line(
+		struct flex_ctx *ctx,
+		struct flex_line_data *line)
+{
+	size_t item_count = line->first + line->count;
+	int available_main = ctx->available_main;
+	int initial_free_main;
+	bool grow;
+
+	if (available_main == AUTO) {
+		available_main = INT_MAX;
+	}
+
+	grow = (line->main_size < available_main);
+	initial_free_main = available_main;
+
+	NSLOG(flex, DEEPDEBUG, "box %p: line %zu: first: %zu, count: %zu",
+			ctx->flex, line - ctx->line.data,
+			line->first, line->count);
+	NSLOG(flex, DEEPDEBUG, "Line main_size: %i, available_main: %i",
+			line->main_size, available_main);
+
+	for (size_t i = line->first; i < item_count; i++) {
+		struct flex_item_data *item = &ctx->item.data[i];
+
+		/* 3. Size inflexible items */
+		if (grow) {
+			if (item->grow == 0 ||
+			    item->base_size > item->main_size) {
+				item->target_main_size = item->main_size;
+				layout_flex__item_freeze(line, item);
+			}
+		} else {
+			if (item->shrink == 0 ||
+			    item->base_size < item->main_size) {
+				item->target_main_size = item->main_size;
+				layout_flex__item_freeze(line, item);
+			}
+		}
+
+		/* 4. Calculate initial free space */
+		if (item->freeze) {
+			initial_free_main -= item->target_main_size;
+		} else {
+			initial_free_main -= item->base_size;
+		}
+	}
+
+	/* 5. Loop */
+	while (line->frozen < line->count) {
+		css_fixed unfrozen_factor_sum;
+		int remaining_free_main;
+		int total_violation;
+
+		NSLOG(flex, DEEPDEBUG, "flex-container: %p: Resolver pass",
+				ctx->flex);
+
+		/* b */
+		remaining_free_main = layout_flex__remaining_free_main(ctx,
+				line, &unfrozen_factor_sum, initial_free_main,
+				available_main, grow);
+
+		/* c */
+		if (remaining_free_main != 0) {
+			layout_flex__distribute_free_main(ctx,
+					line, unfrozen_factor_sum,
+					remaining_free_main, grow);
+		}
+
+		/* d */
+		total_violation = layout_flex__get_min_max_violations(
+				ctx, line);
+
+		/* e */
+		for (size_t i = line->first; i < item_count; i++) {
+			struct flex_item_data *item = &ctx->item.data[i];
+
+			if (item->freeze) {
+				continue;
+			}
+
+			if (total_violation == 0 ||
+			    (total_violation > 0 && item->min_violation) ||
+			    (total_violation < 0 && item->max_violation)) {
+				layout_flex__item_freeze(line, item);
+			}
+		}
+	}
+
+	return true;
+}
+
+/**
+ * Position items along a line
+ *
+ * \param[in] ctx   Flex layout context
+ * \param[in] line  Line to resolve
+ * \return true on success, false on failure.
+ */
+static bool layout_flex__place_line_items_main(
+		struct flex_ctx *ctx,
+		struct flex_line_data *line)
+{
+	int main_pos = ctx->flex->padding[layout_flex__main_start_side(ctx)];
+	int post_multiplier = ctx->main_reversed ? 0 : 1;
+	int pre_multiplier = ctx->main_reversed ? -1 : 0;
+	size_t item_count = line->first + line->count;
+	int extra_remainder = 0;
+	int extra = 0;
+
+	if (ctx->main_reversed) {
+		main_pos = lh__box_size_main(ctx->horizontal, ctx->flex) -
+				main_pos;
+	}
+
+	if (ctx->available_main != AUTO &&
+	    ctx->available_main != UNKNOWN_WIDTH &&
+	    ctx->available_main > line->used_main_size) {
+		if (line->main_auto_margin_count > 0) {
+			extra = ctx->available_main - line->used_main_size;
+
+			extra_remainder = extra % line->main_auto_margin_count;
+			extra /= line->main_auto_margin_count;
+		}
+	}
+
+	for (size_t i = line->first; i < item_count; i++) {
+		enum box_side main_end = ctx->horizontal ? RIGHT : BOTTOM;
+		enum box_side main_start = ctx->horizontal ? LEFT : TOP;
+		struct flex_item_data *item = &ctx->item.data[i];
+		struct box *b = item->box;
+		int extra_total = 0;
+		int extra_post = 0;
+		int extra_pre = 0;
+		int box_size_main;
+		int *box_pos_main;
+
+		if (ctx->horizontal) {
+			b->width = item->target_main_size -
+					lh__delta_outer_width(b);
+
+			if (!layout_flex_item(ctx, item, b->width)) {
+				return false;
+			}
+		}
+
+		box_size_main = lh__box_size_main(ctx->horizontal, b);
+		box_pos_main = ctx->horizontal ? &b->x : &b->y;
+
+		if (!lh__box_is_absolute(b)) {
+			if (b->margin[main_start] == AUTO) {
+				extra_pre = extra + extra_remainder;
+			}
+			if (b->margin[main_end] == AUTO) {
+				extra_post = extra + extra_remainder;
+			}
+			extra_total = extra_pre + extra_post;
+
+			main_pos += pre_multiplier *
+					(extra_total + box_size_main +
+					 lh__delta_outer_main(ctx->flex, b));
+		}
+
+		*box_pos_main = main_pos + lh__non_auto_margin(b, main_start) +
+				extra_pre + b->border[main_start].width;
+
+		if (!lh__box_is_absolute(b)) {
+			int cross_size;
+			int box_size_cross = lh__box_size_cross(
+					ctx->horizontal, b);
+
+			main_pos += post_multiplier *
+					(extra_total + box_size_main +
+					 lh__delta_outer_main(ctx->flex, b));
+
+			cross_size = box_size_cross + lh__delta_outer_cross(
+					ctx->flex, b);
+			if (line->cross_size < cross_size) {
+				line->cross_size = cross_size;
+			}
+		}
+	}
+
+	return true;
+}
+
+/**
+ * Collect items onto lines and place items along the lines
+ *
+ * \param[in] ctx   Flex layout context
+ * \return true on success, false on failure.
+ */
+static bool layout_flex__collect_items_into_lines(
+		struct flex_ctx *ctx)
+{
+	size_t pos = 0;
+
+	while (pos < ctx->item.count) {
+		struct flex_line_data *line;
+
+		line = layout_flex__build_line(ctx, pos);
+		if (line == NULL) {
+			return false;
+		}
+
+		pos += line->count;
+
+		NSLOG(flex, DEEPDEBUG, "flex-container: %p: "
+				"fitted: %zu (total: %zu/%zu)",
+				ctx->flex, line->count,
+				pos, ctx->item.count);
+
+		if (!layout_flex__resolve_line(ctx, line)) {
+			return false;
+		}
+
+		if (!layout_flex__place_line_items_main(ctx, line)) {
+			return false;
+		}
+
+		ctx->cross_size += line->cross_size;
+		if (ctx->main_size < line->main_size) {
+			ctx->main_size = line->main_size;
+		}
+	}
+
+	return true;
+}
+
+/**
+ * Align items on a line.
+ *
+ * \param[in] ctx    Flex layout context
+ * \param[in] line   Line to align items on
+ * \param[in] extra  Extra line width in pixels
+ */
+static void layout_flex__place_line_items_cross(struct flex_ctx *ctx,
+		struct flex_line_data *line, int extra)
+{
+	enum box_side cross_start = ctx->horizontal ? TOP : LEFT;
+	size_t item_count = line->first + line->count;
+
+	for (size_t i = line->first; i < item_count; i++) {
+		struct flex_item_data *item = &ctx->item.data[i];
+		struct box *b = item->box;
+		int cross_free_space;
+		int *box_size_cross;
+		int *box_pos_cross;
+
+		box_pos_cross = ctx->horizontal ? &b->y : &b->x;
+		box_size_cross = lh__box_size_cross_ptr(ctx->horizontal, b);
+
+		cross_free_space = line->cross_size + extra - *box_size_cross -
+				lh__delta_outer_cross(ctx->flex, b);
+
+		switch (lh__box_align_self(ctx->flex, b)) {
+		default:
+		case CSS_ALIGN_SELF_STRETCH:
+			if (lh__box_size_cross_is_auto(ctx->horizontal, b)) {
+				*box_size_cross += cross_free_space;
+
+				/* Relayout children for stretch. */
+				if (!layout_flex_item(ctx, item, b->width)) {
+					return;
+				}
+			}
+			fallthrough;
+		case CSS_ALIGN_SELF_FLEX_START:
+			*box_pos_cross = ctx->flex->padding[cross_start] +
+					line->pos +
+					lh__non_auto_margin(b, cross_start) +
+					b->border[cross_start].width;
+			break;
+
+		case CSS_ALIGN_SELF_FLEX_END:
+			*box_pos_cross = ctx->flex->padding[cross_start] +
+					line->pos + cross_free_space +
+					lh__non_auto_margin(b, cross_start) +
+					b->border[cross_start].width;
+			break;
+
+		case CSS_ALIGN_SELF_BASELINE:
+		case CSS_ALIGN_SELF_CENTER:
+			*box_pos_cross = ctx->flex->padding[cross_start] +
+					line->pos + cross_free_space / 2 +
+					lh__non_auto_margin(b, cross_start) +
+					b->border[cross_start].width;
+			break;
+		}
+	}
+}
+
+/**
+ * Place the lines and align the items on the line.
+ *
+ * \param[in] ctx  Flex layout context
+ */
+static void layout_flex__place_lines(struct flex_ctx *ctx)
+{
+	bool reversed = ctx->wrap == CSS_FLEX_WRAP_WRAP_REVERSE;
+	int line_pos = reversed ? ctx->cross_size : 0;
+	int post_multiplier = reversed ? 0 : 1;
+	int pre_multiplier = reversed ? -1 : 0;
+	int extra_remainder = 0;
+	int extra = 0;
+
+	if (ctx->available_cross != AUTO &&
+	    ctx->available_cross > ctx->cross_size &&
+	    ctx->line.count > 0) {
+		extra = ctx->available_cross - ctx->cross_size;
+
+		extra_remainder = extra % ctx->line.count;
+		extra /= ctx->line.count;
+	}
+
+	for (size_t i = 0; i < ctx->line.count; i++) {
+		struct flex_line_data *line = &ctx->line.data[i];
+
+		line_pos += pre_multiplier * line->cross_size;
+		line->pos = line_pos;
+		line_pos += post_multiplier * line->cross_size +
+				extra + extra_remainder;
+
+		layout_flex__place_line_items_cross(ctx, line,
+				extra + extra_remainder);
+
+		if (extra_remainder > 0) {
+			extra_remainder--;
+		}
+	}
+}
+
+/**
+ * Layout a flex container.
+ *
+ * \param[in] flex             table to layout
+ * \param[in] available_width  width of containing block
+ * \param[in] content          memory pool for any new boxes
+ * \return  true on success, false on memory exhaustion
+ */
+bool layout_flex(struct box *flex, int available_width,
+		html_content *content)
+{
+	int max_height, min_height;
+	struct flex_ctx *ctx;
+	bool success = false;
+
+	ctx = layout_flex_ctx__create(content, flex);
+	if (ctx == NULL) {
+		return false;
+	}
+
+	NSLOG(flex, DEEPDEBUG, "box %p: %s, available_width %i, width: %i",
+			flex, ctx->horizontal ? "horizontal" : "vertical",
+			available_width, flex->width);
+
+	layout_find_dimensions(
+			ctx->unit_len_ctx, available_width, -1,
+			flex, flex->style, NULL, &flex->height,
+			NULL, NULL, &max_height, &min_height,
+			flex->margin, flex->padding, flex->border);
+
+	available_width = min(available_width, flex->width);
+
+	if (ctx->horizontal) {
+		ctx->available_main = available_width;
+		ctx->available_cross = ctx->flex->height;
+	} else {
+		ctx->available_main = ctx->flex->height;
+		ctx->available_cross = available_width;
+	}
+
+	NSLOG(flex, DEEPDEBUG, "box %p: available_main: %i",
+			flex, ctx->available_main);
+	NSLOG(flex, DEEPDEBUG, "box %p: available_cross: %i",
+			flex, ctx->available_cross);
+
+	layout_flex_ctx__populate_item_data(ctx, flex, available_width);
+
+	/* Place items onto lines. */
+	success = layout_flex__collect_items_into_lines(ctx);
+	if (!success) {
+		goto cleanup;
+	}
+
+	layout_flex__place_lines(ctx);
+
+	if (flex->height == AUTO) {
+		flex->height = ctx->horizontal ?
+				ctx->cross_size :
+				ctx->main_size;
+	}
+
+	if (flex->height != AUTO) {
+		if (max_height >= 0 && flex->height > max_height) {
+			flex->height = max_height;
+		}
+		if (min_height >  0 && flex->height < min_height) {
+			flex->height = min_height;
+		}
+	}
+
+	success = true;
+
+cleanup:
+	layout_flex_ctx__destroy(ctx);
+
+	NSLOG(flex, DEEPDEBUG, "box %p: %s: w: %i, h: %i", flex,
+			success ? "success" : "failure",
+			flex->width, flex->height);
+	return success;
+}
diff --git a/content/handlers/html/layout_internal.h b/content/handlers/html/layout_internal.h
new file mode 100644
index 000000000..d094462ec
--- /dev/null
+++ b/content/handlers/html/layout_internal.h
@@ -0,0 +1,738 @@
+/*
+ * Copyright 2003 James Bursa <bursa@users.sourceforge.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * HTML layout private interface.
+ */
+
+#ifndef NETSURF_HTML_LAYOUT_INTERNAL_H
+#define NETSURF_HTML_LAYOUT_INTERNAL_H
+
+#define AUTO INT_MIN
+
+/* Fixed point percentage (a) of an integer (b), to an integer */
+#define FPCT_OF_INT_TOINT(a, b) (FIXTOINT(FDIV((a * b), F_100)))
+
+/**
+ * Layout a block formatting context.
+ *
+ * \param  block            BLOCK, INLINE_BLOCK, or TABLE_CELL to layout
+ * \param  viewport_height  Height of viewport in pixels or -ve if unknown
+ * \param  content          Memory pool for any new boxes
+ * \return  true on success, false on memory exhaustion
+ *
+ * This function carries out layout of a block and its children, as described
+ * in CSS 2.1 9.4.1.
+ */
+bool layout_block_context(
+		struct box *block,
+		int viewport_height,
+		html_content *content);
+
+/**
+ * Layout a table.
+ *
+ * \param  table            table to layout
+ * \param  available_width  width of containing block
+ * \param  content          memory pool for any new boxes
+ * \return  true on success, false on memory exhaustion
+ */
+bool layout_table(
+		struct box *table,
+		int available_width,
+		html_content *content);
+
+/**
+ * Layout a flex container.
+ *
+ * \param[in] flex             table to layout
+ * \param[in] available_width  width of containing block
+ * \param[in] content          memory pool for any new boxes
+ * \return  true on success, false on memory exhaustion
+ */
+bool layout_flex(
+		struct box *flex,
+		int available_width,
+		html_content *content);
+
+typedef uint8_t (*css_len_func)(
+		const css_computed_style *style,
+		css_fixed *length, css_unit *unit);
+typedef uint8_t (*css_border_style_func)(
+		const css_computed_style *style);
+typedef uint8_t (*css_border_color_func)(
+		const css_computed_style *style,
+		css_color *color);
+
+/** Array of per-side access functions for computed style margins. */
+extern const css_len_func margin_funcs[4];
+
+/** Array of per-side access functions for computed style paddings. */
+extern const css_len_func padding_funcs[4];
+
+/** Array of per-side access functions for computed style border_widths. */
+extern const css_len_func border_width_funcs[4];
+
+/** Array of per-side access functions for computed style border styles. */
+extern const css_border_style_func border_style_funcs[4];
+
+/** Array of per-side access functions for computed style border colors. */
+extern const css_border_color_func border_color_funcs[4];
+
+/** Layout helper: Check whether box is a float. */
+static inline bool lh__box_is_float_box(const struct box *b)
+{
+	return b->type == BOX_FLOAT_LEFT ||
+	       b->type == BOX_FLOAT_RIGHT;
+}
+
+/** Layout helper: Check whether box takes part in inline flow. */
+static inline bool lh__box_is_inline_flow(const struct box *b)
+{
+	return b->type == BOX_INLINE ||
+	       b->type == BOX_INLINE_FLEX ||
+	       b->type == BOX_INLINE_BLOCK ||
+	       b->type == BOX_TEXT ||
+	       b->type == BOX_INLINE_END;
+}
+
+/** Layout helper: Check whether box takes part in inline flow. */
+static inline bool lh__box_is_flex_container(const struct box *b)
+{
+	return b->type == BOX_FLEX ||
+	       b->type == BOX_INLINE_FLEX;
+}
+
+/** Layout helper: Check whether box takes part in inline flow. */
+static inline bool lh__box_is_flex_item(const struct box *b)
+{
+	return (b->parent != NULL) && lh__box_is_flex_container(b->parent);
+}
+
+/** Layout helper: Check whether box is inline level. (Includes BR.) */
+static inline bool lh__box_is_inline_level(const struct box *b)
+{
+	return lh__box_is_inline_flow(b) ||
+	       b->type == BOX_BR;
+}
+
+/** Layout helper: Check whether box is inline level. (Includes BR, floats.) */
+static inline bool lh__box_is_inline_content(const struct box *b)
+{
+	return lh__box_is_float_box(b) ||
+	       lh__box_is_inline_level(b);
+}
+
+/** Layout helper: Check whether box is an object. */
+static inline bool lh__box_is_object(const struct box *b)
+{
+	return b->object ||
+	       (b->flags & (IFRAME | REPLACE_DIM));
+}
+
+/** Layout helper: Check whether box is replaced. */
+static inline bool lh__box_is_replace(const struct box *b)
+{
+	return b->gadget ||
+	       lh__box_is_object(b);
+}
+
+/** Layout helper: Check for CSS border on given side. */
+static inline bool lh__have_border(
+		enum box_side side,
+		const css_computed_style *style)
+{
+	return border_style_funcs[side](style) != CSS_BORDER_STYLE_NONE;
+}
+
+static inline bool lh__box_is_absolute(const struct box *b)
+{
+	return css_computed_position(b->style) == CSS_POSITION_ABSOLUTE ||
+	       css_computed_position(b->style) == CSS_POSITION_FIXED;
+}
+
+static inline bool lh__flex_main_is_horizontal(const struct box *flex)
+{
+	const css_computed_style *style = flex->style;
+
+	assert(style != NULL);
+
+	switch (css_computed_flex_direction(style)) {
+	default:                        /* Fallthrough. */
+	case CSS_FLEX_DIRECTION_ROW:    /* Fallthrough. */
+	case CSS_FLEX_DIRECTION_ROW_REVERSE:
+		return true;
+	case CSS_FLEX_DIRECTION_COLUMN: /* Fallthrough. */
+	case CSS_FLEX_DIRECTION_COLUMN_REVERSE:
+		return false;
+	}
+}
+
+static inline bool lh__flex_direction_reversed(const struct box *flex)
+{
+	switch (css_computed_flex_direction(flex->style)) {
+	default:                             /* Fallthrough. */
+	case CSS_FLEX_DIRECTION_ROW_REVERSE: /* Fallthrough. */
+	case CSS_FLEX_DIRECTION_COLUMN_REVERSE:
+		return true;
+	case CSS_FLEX_DIRECTION_ROW: /* Fallthrough. */
+	case CSS_FLEX_DIRECTION_COLUMN:
+		return false;
+	}
+}
+
+static inline int lh__non_auto_margin(const struct box *b, enum box_side side)
+{
+	return (b->margin[side] == AUTO) ? 0 : b->margin[side];
+}
+
+static inline int lh__delta_outer_height(const struct box *b)
+{
+	return b->padding[TOP] +
+	       b->padding[BOTTOM] +
+	       b->border[TOP].width +
+	       b->border[BOTTOM].width +
+	       lh__non_auto_margin(b, TOP) +
+	       lh__non_auto_margin(b, BOTTOM);
+}
+
+static inline int lh__delta_outer_width(const struct box *b)
+{
+	return b->padding[LEFT] +
+	       b->padding[RIGHT] +
+	       b->border[LEFT].width +
+	       b->border[RIGHT].width +
+	       lh__non_auto_margin(b, LEFT) +
+	       lh__non_auto_margin(b, RIGHT);
+}
+
+static inline int lh__delta_outer_main(
+		const struct box *flex,
+		const struct box *b)
+{
+	if (lh__flex_main_is_horizontal(flex)) {
+		return lh__delta_outer_width(b);
+	} else {
+		return lh__delta_outer_height(b);
+	}
+}
+
+static inline int lh__delta_outer_cross(
+		const struct box *flex,
+		const struct box *b)
+{
+	if (lh__flex_main_is_horizontal(flex) == false) {
+		return lh__delta_outer_width(b);
+	} else {
+		return lh__delta_outer_height(b);
+	}
+}
+
+static inline int *lh__box_size_main_ptr(
+		bool horizontal,
+		struct box *b)
+{
+	return horizontal ? &b->width : &b->height;
+}
+
+static inline int *lh__box_size_cross_ptr(
+		bool horizontal,
+		struct box *b)
+{
+	return horizontal ? &b->height : &b->width;
+}
+
+static inline int lh__box_size_main(
+		bool horizontal,
+		const struct box *b)
+{
+	return horizontal ? b->width : b->height;
+}
+
+static inline int lh__box_size_cross(
+		bool horizontal,
+		const struct box *b)
+{
+	return horizontal ? b->height : b->width;
+}
+
+static inline bool lh__box_size_cross_is_auto(
+		bool horizontal,
+		struct box *b)
+{
+	css_fixed length;
+	css_unit unit;
+
+	if (horizontal) {
+		return css_computed_height(b->style,
+				&length, &unit) == CSS_HEIGHT_AUTO;
+	} else {
+		return css_computed_width(b->style,
+				&length, &unit) == CSS_WIDTH_AUTO;
+	}
+}
+
+static inline enum css_align_self_e lh__box_align_self(
+		const struct box *flex,
+		const struct box *item)
+{
+	enum css_align_self_e align_self = css_computed_align_self(item->style);
+
+	if (align_self == CSS_ALIGN_SELF_AUTO) {
+		align_self = css_computed_align_items(flex->style);
+	}
+
+	return align_self;
+}
+
+/**
+ * Determine width of margin, borders, and padding on one side of a box.
+ *
+ * \param unit_len_ctx  CSS length conversion context for document
+ * \param style    style to measure
+ * \param side     side of box to measure
+ * \param margin   whether margin width is required
+ * \param border   whether border width is required
+ * \param padding  whether padding width is required
+ * \param fixed    increased by sum of fixed margin, border, and padding
+ * \param frac     increased by sum of fractional margin and padding
+ */
+static inline void calculate_mbp_width(
+		const css_unit_ctx *unit_len_ctx,
+		const css_computed_style *style,
+		unsigned int side,
+		bool margin,
+		bool border,
+		bool padding,
+		int *fixed,
+		float *frac)
+{
+	css_fixed value = 0;
+	css_unit unit = CSS_UNIT_PX;
+
+	assert(style);
+
+	/* margin */
+	if (margin) {
+		enum css_margin_e type;
+
+		type = margin_funcs[side](style, &value, &unit);
+		if (type == CSS_MARGIN_SET) {
+			if (unit == CSS_UNIT_PCT) {
+				*frac += FIXTOFLT(FDIV(value, F_100));
+			} else {
+				*fixed += FIXTOINT(css_unit_len2device_px(
+						style, unit_len_ctx,
+						value, unit));
+			}
+		}
+	}
+
+	/* border */
+	if (border) {
+		if (lh__have_border(side, style)) {
+			border_width_funcs[side](style, &value, &unit);
+
+			*fixed += FIXTOINT(css_unit_len2device_px(
+					style, unit_len_ctx,
+					value, unit));
+		}
+	}
+
+	/* padding */
+	if (padding) {
+		padding_funcs[side](style, &value, &unit);
+		if (unit == CSS_UNIT_PCT) {
+			*frac += FIXTOFLT(FDIV(value, F_100));
+		} else {
+			*fixed += FIXTOINT(css_unit_len2device_px(
+					style, unit_len_ctx,
+					value, unit));
+		}
+	}
+}
+
+/**
+ * Adjust a specified width or height for the box-sizing property.
+ *
+ * This turns the specified dimension into a content-box dimension.
+ *
+ * \param  unit_len_ctx          Length conversion context
+ * \param  box		    gadget to adjust dimensions of
+ * \param  available_width  width of containing block
+ * \param  setwidth	    set true if the dimension to be tweaked is a width,
+ *				else set false for a height
+ * \param  dimension	    current value for given width/height dimension.
+ *				updated to new value after consideration of
+ *				gadget properties.
+ */
+static inline void layout_handle_box_sizing(
+		const css_unit_ctx *unit_len_ctx,
+		const struct box *box,
+		int available_width,
+		bool setwidth,
+		int *dimension)
+{
+	enum css_box_sizing_e bs;
+
+	assert(box && box->style);
+
+	bs = css_computed_box_sizing(box->style);
+
+	if (bs == CSS_BOX_SIZING_BORDER_BOX) {
+		int orig = *dimension;
+		int fixed = 0;
+		float frac = 0;
+
+		calculate_mbp_width(unit_len_ctx, box->style,
+				setwidth ? LEFT : TOP,
+				false, true, true, &fixed, &frac);
+		calculate_mbp_width(unit_len_ctx, box->style,
+				setwidth ? RIGHT : BOTTOM,
+				false, true, true, &fixed, &frac);
+		orig -= frac * available_width + fixed;
+		*dimension = orig > 0 ? orig : 0;
+	}
+}
+
+/**
+ * Calculate width, height, and thickness of margins, paddings, and borders.
+ *
+ * \param  unit_len_ctx     Length conversion context
+ * \param  available_width  width of containing block
+ * \param  viewport_height  height of viewport in pixels or -ve if unknown
+ * \param  box              current box
+ * \param  style            style giving width, height, margins, paddings,
+ *                          and borders
+ * \param  width            updated to width, may be NULL
+ * \param  height           updated to height, may be NULL
+ * \param  max_width        updated to max-width, may be NULL
+ * \param  min_width        updated to min-width, may be NULL
+ * \param  max_height       updated to max-height, may be NULL
+ * \param  min_height       updated to min-height, may be NULL
+ * \param  margin           filled with margins, may be NULL
+ * \param  padding          filled with paddings, may be NULL
+ * \param  border           filled with border widths, may be NULL
+ */
+static inline void layout_find_dimensions(
+		const css_unit_ctx *unit_len_ctx,
+		int available_width,
+		int viewport_height,
+		const struct box *box,
+		const css_computed_style *style,
+		int *width,
+		int *height,
+		int *max_width,
+		int *min_width,
+		int *max_height,
+		int *min_height,
+		int margin[4],
+		int padding[4],
+		struct box_border border[4])
+{
+	struct box *containing_block = NULL;
+	unsigned int i;
+
+	if (width) {
+		enum css_width_e wtype;
+		css_fixed value = 0;
+		css_unit unit = CSS_UNIT_PX;
+
+		wtype = css_computed_width(style, &value, &unit);
+
+		if (wtype == CSS_WIDTH_SET) {
+			if (unit == CSS_UNIT_PCT) {
+				*width = FPCT_OF_INT_TOINT(
+						value, available_width);
+			} else {
+				*width = FIXTOINT(css_unit_len2device_px(
+						style, unit_len_ctx,
+						value, unit));
+			}
+		} else {
+			*width = AUTO;
+		}
+
+		if (*width != AUTO) {
+			layout_handle_box_sizing(unit_len_ctx, box,
+					available_width, true, width);
+		}
+	}
+
+	if (height) {
+		enum css_height_e htype;
+		css_fixed value = 0;
+		css_unit unit = CSS_UNIT_PX;
+
+		htype = css_computed_height(style, &value, &unit);
+
+		if (htype == CSS_HEIGHT_SET) {
+			if (unit == CSS_UNIT_PCT) {
+				enum css_height_e cbhtype;
+
+				if (css_computed_position(box->style) ==
+						CSS_POSITION_ABSOLUTE &&
+						box->parent) {
+					/* Box is absolutely positioned */
+					assert(box->float_container);
+					containing_block = box->float_container;
+				} else if (box->float_container &&
+					css_computed_position(box->style) !=
+						CSS_POSITION_ABSOLUTE &&
+					(css_computed_float(box->style) ==
+						CSS_FLOAT_LEFT ||
+					 css_computed_float(box->style) ==
+						CSS_FLOAT_RIGHT)) {
+					/* Box is a float */
+					assert(box->parent &&
+						box->parent->parent &&
+						box->parent->parent->parent);
+
+					containing_block =
+						box->parent->parent->parent;
+				} else if (box->parent && box->parent->type !=
+						BOX_INLINE_CONTAINER) {
+					/* Box is a block level element */
+					containing_block = box->parent;
+				} else if (box->parent && box->parent->type ==
+						BOX_INLINE_CONTAINER) {
+					/* Box is an inline block */
+					assert(box->parent->parent);
+					containing_block = box->parent->parent;
+				}
+
+				if (containing_block) {
+					css_fixed f = 0;
+					css_unit u = CSS_UNIT_PX;
+
+					cbhtype = css_computed_height(
+							containing_block->style,
+							&f, &u);
+				}
+
+				if (containing_block &&
+					containing_block->height != AUTO &&
+					(css_computed_position(box->style) ==
+							CSS_POSITION_ABSOLUTE ||
+						cbhtype == CSS_HEIGHT_SET)) {
+					/* Box is absolutely positioned or its
+					 * containing block has a valid
+					 * specified height.
+					 * (CSS 2.1 Section 10.5) */
+					*height = FPCT_OF_INT_TOINT(value,
+						containing_block->height);
+				} else if ((!box->parent ||
+						!box->parent->parent) &&
+						viewport_height >= 0) {
+					/* If root element or it's child
+					 * (HTML or BODY) */
+					*height = FPCT_OF_INT_TOINT(value,
+							viewport_height);
+				} else {
+					/* precentage height not permissible
+					 * treat height as auto */
+					*height = AUTO;
+				}
+			} else {
+				*height = FIXTOINT(css_unit_len2device_px(
+						style, unit_len_ctx,
+						value, unit));
+			}
+		} else {
+			*height = AUTO;
+		}
+
+		if (*height != AUTO) {
+			layout_handle_box_sizing(unit_len_ctx, box,
+					available_width, false, height);
+		}
+	}
+
+	if (max_width) {
+		enum css_max_width_e type;
+		css_fixed value = 0;
+		css_unit unit = CSS_UNIT_PX;
+
+		type = css_computed_max_width(style, &value, &unit);
+
+		if (type == CSS_MAX_WIDTH_SET) {
+			if (unit == CSS_UNIT_PCT) {
+				*max_width = FPCT_OF_INT_TOINT(value,
+						available_width);
+			} else {
+				*max_width = FIXTOINT(css_unit_len2device_px(
+						style, unit_len_ctx,
+						value, unit));
+			}
+		} else {
+			/* Inadmissible */
+			*max_width = -1;
+		}
+
+		if (*max_width != -1) {
+			layout_handle_box_sizing(unit_len_ctx, box,
+					available_width, true, max_width);
+		}
+	}
+
+	if (min_width) {
+		enum css_min_width_e type;
+		css_fixed value = 0;
+		css_unit unit = CSS_UNIT_PX;
+
+		type = ns_computed_min_width(style, &value, &unit);
+
+		if (type == CSS_MIN_WIDTH_SET) {
+			if (unit == CSS_UNIT_PCT) {
+				*min_width = FPCT_OF_INT_TOINT(value,
+						available_width);
+			} else {
+				*min_width = FIXTOINT(css_unit_len2device_px(
+						style, unit_len_ctx,
+						value, unit));
+			}
+		} else {
+			/* Inadmissible */
+			*min_width = 0;
+		}
+
+		if (*min_width != 0) {
+			layout_handle_box_sizing(unit_len_ctx, box,
+					available_width, true, min_width);
+		}
+	}
+
+	if (max_height) {
+		enum css_max_height_e type;
+		css_fixed value = 0;
+		css_unit unit = CSS_UNIT_PX;
+
+		type = css_computed_max_height(style, &value, &unit);
+
+		if (type == CSS_MAX_HEIGHT_SET) {
+			if (unit == CSS_UNIT_PCT) {
+				/* TODO: handle percentage */
+				*max_height = -1;
+			} else {
+				*max_height = FIXTOINT(css_unit_len2device_px(
+						style, unit_len_ctx,
+						value, unit));
+			}
+		} else {
+			/* Inadmissible */
+			*max_height = -1;
+		}
+	}
+
+	if (min_height) {
+		enum css_min_height_e type;
+		css_fixed value = 0;
+		css_unit unit = CSS_UNIT_PX;
+
+		type = ns_computed_min_height(style, &value, &unit);
+
+		if (type == CSS_MIN_HEIGHT_SET) {
+			if (unit == CSS_UNIT_PCT) {
+				/* TODO: handle percentage */
+				*min_height = 0;
+			} else {
+				*min_height = FIXTOINT(css_unit_len2device_px(
+						style, unit_len_ctx,
+						value, unit));
+			}
+		} else {
+			/* Inadmissible */
+			*min_height = 0;
+		}
+	}
+
+	for (i = 0; i != 4; i++) {
+		if (margin) {
+			enum css_margin_e type = CSS_MARGIN_AUTO;
+			css_fixed value = 0;
+			css_unit unit = CSS_UNIT_PX;
+
+			type = margin_funcs[i](style, &value, &unit);
+
+			if (type == CSS_MARGIN_SET) {
+				if (unit == CSS_UNIT_PCT) {
+					margin[i] = FPCT_OF_INT_TOINT(value,
+							available_width);
+				} else {
+					margin[i] = FIXTOINT(css_unit_len2device_px(
+							style, unit_len_ctx,
+							value, unit));
+				}
+			} else {
+				margin[i] = AUTO;
+			}
+		}
+
+		if (padding) {
+			css_fixed value = 0;
+			css_unit unit = CSS_UNIT_PX;
+
+			padding_funcs[i](style, &value, &unit);
+
+			if (unit == CSS_UNIT_PCT) {
+				padding[i] = FPCT_OF_INT_TOINT(value,
+						available_width);
+			} else {
+				padding[i] = FIXTOINT(css_unit_len2device_px(
+						style, unit_len_ctx,
+						value, unit));
+			}
+		}
+
+		/* Table cell borders are populated in table.c */
+		if (border && box->type != BOX_TABLE_CELL) {
+			enum css_border_style_e bstyle = CSS_BORDER_STYLE_NONE;
+			css_color color = 0;
+			css_fixed value = 0;
+			css_unit unit = CSS_UNIT_PX;
+
+			border_width_funcs[i](style, &value, &unit);
+			bstyle = border_style_funcs[i](style);
+			border_color_funcs[i](style, &color);
+
+			border[i].style = bstyle;
+			border[i].c = color;
+
+			if (bstyle == CSS_BORDER_STYLE_HIDDEN ||
+					bstyle == CSS_BORDER_STYLE_NONE)
+				/* spec unclear: following Mozilla */
+				border[i].width = 0;
+			else
+				border[i].width = FIXTOINT(css_unit_len2device_px(
+						style, unit_len_ctx,
+						value, unit));
+
+			/* Special case for border-collapse: make all borders
+			 * on table/table-row-group/table-row zero width. */
+			if (css_computed_border_collapse(style) ==
+					CSS_BORDER_COLLAPSE_COLLAPSE &&
+					(box->type == BOX_TABLE ||
+					 box->type == BOX_TABLE_ROW_GROUP ||
+					 box->type == BOX_TABLE_ROW))
+				border[i].width = 0;
+		}
+	}
+}
+
+#endif
diff --git a/content/handlers/html/html_object.c b/content/handlers/html/object.c
index 1dc8e645d..a1f020bf7 100644
--- a/content/handlers/html/html_object.c
+++ b/content/handlers/html/object.c
@@ -41,8 +41,11 @@
 #include "desktop/gui_internal.h"
 
 #include "html/html.h"
+#include "html/private.h"
+#include "html/interaction.h"
 #include "html/box.h"
-#include "html/html_internal.h"
+#include "html/box_inspect.h"
+#include "html/object.h"
 
 /* break reference loop */
 static void html_object_refresh(void *p);
@@ -122,10 +125,35 @@ html_object_done(struct box *box,
 	}
 }
 
+
 /**
- * Callback for hlcache_handle_retrieve() for objects.
+ * Callback for hlcache_handle_retrieve() for objects with no box.
  */
+static nserror
+html_object_nobox_callback(hlcache_handle *object,
+			   const hlcache_event *event,
+			   void *pw)
+{
+	struct content_html_object *chobject = pw;
+
+	switch (event->type) {
+	case CONTENT_MSG_ERROR:
+		hlcache_handle_release(object);
+
+		chobject->content = NULL;
+		break;
+
+	default:
+		break;
+	}
 
+	return NSERROR_OK;
+}
+
+
+/**
+ * Callback for hlcache_handle_retrieve() for objects with a box.
+ */
 static nserror
 html_object_callback(hlcache_handle *object,
 		     const hlcache_event *event,
@@ -137,11 +165,6 @@ html_object_callback(hlcache_handle *object,
 	struct box *box;
 
 	box = o->box;
-	if (box == NULL &&
-			event->type != CONTENT_MSG_ERROR &&
-			event->type != CONTENT_MSG_ERRORCODE) {
-		return NSERROR_OK;
-	}
 
 	switch (event->type) {
 	case CONTENT_MSG_LOADING:
@@ -180,6 +203,10 @@ html_object_callback(hlcache_handle *object,
 				box->flags & REPLACE_DIM) {
 			union content_msg_data data;
 
+			if (c->had_initial_layout == false) {
+				break;
+			}
+
 			if (!box_visible(box))
 				break;
 
@@ -189,32 +216,31 @@ html_object_callback(hlcache_handle *object,
 			data.redraw.y = y + box->padding[TOP];
 			data.redraw.width = box->width;
 			data.redraw.height = box->height;
-			data.redraw.full_redraw = true;
 
 			content_broadcast(&c->base, CONTENT_MSG_REDRAW, &data);
 		}
 		break;
 
-	case CONTENT_MSG_ERRORCODE:
 	case CONTENT_MSG_ERROR:
 		hlcache_handle_release(object);
 
 		o->content = NULL;
 
-		if (box != NULL) {
-			c->base.active--;
-			NSLOG(netsurf, INFO, "%d fetches active",
-			      c->base.active);
+		c->base.active--;
+		NSLOG(netsurf, INFO, "%d fetches active", c->base.active);
+
+		html_object_failed(box, c, o->background);
 
-			content_add_error(&c->base, "?", 0);
-			html_object_failed(box, c, o->background);
-		}
 		break;
 
 	case CONTENT_MSG_REDRAW:
 		if (c->base.status != CONTENT_STATUS_LOADING) {
 			union content_msg_data data = event->data;
 
+			if (c->had_initial_layout == false) {
+				break;
+			}
+
 			if (!box_visible(box))
 				break;
 
@@ -239,18 +265,20 @@ html_object_callback(hlcache_handle *object,
 				if (hunit == CSS_UNIT_PCT) {
 					l = (width - w) * hpos / INTTOFIX(100);
 				} else {
-					l = FIXTOINT(nscss_len2px(&c->len_ctx,
-							hpos, hunit,
-							box->style));
+					l = FIXTOINT(css_unit_len2device_px(
+							box->style,
+							&c->unit_len_ctx,
+							hpos, hunit));
 				}
 
 				h = content_get_height(box->background);
 				if (vunit == CSS_UNIT_PCT) {
 					t = (height - h) * vpos / INTTOFIX(100);
 				} else {
-					t = FIXTOINT(nscss_len2px(&c->len_ctx,
-							vpos, vunit,
-							box->style));
+					t = FIXTOINT(css_unit_len2device_px(
+							box->style,
+							&c->unit_len_ctx,
+							vpos, vunit));
 				}
 
 				/* Redraw area depends on background-repeat */
@@ -284,53 +312,39 @@ html_object_callback(hlcache_handle *object,
 					break;
 				}
 
-				data.redraw.object_width = box->width;
-				data.redraw.object_height = box->height;
-
 				/* Add offset to box */
 				data.redraw.x += x;
 				data.redraw.y += y;
-				data.redraw.object_x += x;
-				data.redraw.object_y += y;
-
-				content_broadcast(&c->base,
-						CONTENT_MSG_REDRAW, &data);
-				break;
 
 			} else {
 				/* Non-background case */
-				if (hlcache_handle_get_content(object) ==
-						event->data.redraw.object) {
-
-					int w = content_get_width(object);
-					int h = content_get_height(object);
-
-					if (w != 0) {
-						data.redraw.x =
-							data.redraw.x *
+				int w = content_get_width(object);
+				int h = content_get_height(object);
+
+				if (w != 0 && box->width != w) {
+					/* Not showing image at intrinsic
+					 * width; need to scale the redraw
+					 * request area. */
+					data.redraw.x = data.redraw.x *
 							box->width / w;
-						data.redraw.width =
+					data.redraw.width =
 							data.redraw.width *
 							box->width / w;
-					}
+				}
 
-					if (h != 0) {
-						data.redraw.y =
-							data.redraw.y *
+				if (h != 0 && box->height != w) {
+					/* Not showing image at intrinsic
+					 * height; need to scale the redraw
+					 * request area. */
+					data.redraw.y = data.redraw.y *
 							box->height / h;
-						data.redraw.height =
+					data.redraw.height =
 							data.redraw.height *
 							box->height / h;
-					}
-
-					data.redraw.object_width = box->width;
-					data.redraw.object_height = box->height;
 				}
 
 				data.redraw.x += x + box->padding[LEFT];
 				data.redraw.y += y + box->padding[TOP];
-				data.redraw.object_x += x + box->padding[LEFT];
-				data.redraw.object_y += y + box->padding[TOP];
 			}
 
 			content_broadcast(&c->base, CONTENT_MSG_REDRAW, &data);
@@ -350,8 +364,9 @@ html_object_callback(hlcache_handle *object,
 		/* Don't care about favicons that aren't on top level content */
 		break;
 
-	case CONTENT_MSG_GETCTX:
-		*(event->data.jscontext) = NULL;
+	case CONTENT_MSG_GETTHREAD:
+		/* Objects don't have JS threads */
+		*(event->data.jsthread) = NULL;
 		break;
 
 	case CONTENT_MSG_GETDIMS:
@@ -462,8 +477,7 @@ html_object_callback(hlcache_handle *object,
 	    c->base.active == 0 &&
 	    (event->type == CONTENT_MSG_LOADING ||
 	     event->type == CONTENT_MSG_DONE ||
-	     event->type == CONTENT_MSG_ERROR ||
-	     event->type == CONTENT_MSG_ERRORCODE)) {
+	     event->type == CONTENT_MSG_ERROR)) {
 		/* all objects have arrived */
 		content__reformat(&c->base, false, c->base.available_width,
 				c->base.available_height);
@@ -498,6 +512,7 @@ html_object_callback(hlcache_handle *object,
 	return NSERROR_OK;
 }
 
+
 /**
  * Start a fetch for an object required by a page, replacing an existing object.
  *
@@ -505,7 +520,6 @@ html_object_callback(hlcache_handle *object,
  * \param  url             URL of object to fetch (copied)
  * \return  true on success, false on memory exhaustion
  */
-
 static bool html_replace_object(struct content_html_object *object, nsurl *url)
 {
 	html_content *c;
@@ -558,7 +572,6 @@ static bool html_replace_object(struct content_html_object *object, nsurl *url)
 /**
  * schedule callback for object refresh
  */
-
 static void html_object_refresh(void *p)
 {
 	struct content_html_object *object = p;
@@ -580,6 +593,8 @@ static void html_object_refresh(void *p)
 	}
 }
 
+
+/* exported interface documented in html/object.h */
 nserror html_object_open_objects(html_content *html, struct browser_window *bw)
 {
 	struct content_html_object *object, *next;
@@ -601,6 +616,8 @@ nserror html_object_open_objects(html_content *html, struct browser_window *bw)
 	return NSERROR_OK;
 }
 
+
+/* exported interface documented in html/object.h */
 nserror html_object_abort_objects(html_content *htmlc)
 {
 	struct content_html_object *object;
@@ -641,6 +658,8 @@ nserror html_object_abort_objects(html_content *htmlc)
 	return NSERROR_OK;
 }
 
+
+/* exported interface documented in html/object.h */
 nserror html_object_close_objects(html_content *html)
 {
 	struct content_html_object *object, *next;
@@ -663,6 +682,8 @@ nserror html_object_close_objects(html_content *html)
 	return NSERROR_OK;
 }
 
+
+/* exported interface documented in html/object.h */
 nserror html_object_free_objects(html_content *html)
 {
 	while (html->object_list != NULL) {
@@ -684,14 +705,16 @@ nserror html_object_free_objects(html_content *html)
 }
 
 
-
-/* exported interface documented in html/html_internal.h */
-bool html_fetch_object(html_content *c, nsurl *url, struct box *box,
-		content_type permitted_types,
-		int available_width, int available_height,
-		bool background)
+/* exported interface documented in html/object.h */
+bool
+html_fetch_object(html_content *c,
+		  nsurl *url,
+		  struct box *box,
+		  content_type permitted_types,
+		  bool background)
 {
 	struct content_html_object *object;
+	hlcache_handle_callback object_callback;
 	hlcache_child_context child;
 	nserror error;
 
@@ -707,6 +730,12 @@ bool html_fetch_object(html_content *c, nsurl *url, struct box *box,
 		return false;
 	}
 
+	if (box == NULL) {
+		object_callback = html_object_nobox_callback;
+	} else {
+		object_callback = html_object_callback;
+	}
+
 	object->parent = (struct content *) c;
 	object->next = NULL;
 	object->content = NULL;
@@ -715,10 +744,14 @@ bool html_fetch_object(html_content *c, nsurl *url, struct box *box,
 	object->background = background;
 
 	error = hlcache_handle_retrieve(url,
-			HLCACHE_RETRIEVE_SNIFF_TYPE,
-			content_get_url(&c->base), NULL,
-			html_object_callback, object, &child,
-			object->permitted_types, &object->content);
+					HLCACHE_RETRIEVE_SNIFF_TYPE,
+					content_get_url(&c->base),
+					NULL,
+					object_callback,
+					object,
+					&child,
+					object->permitted_types,
+					&object->content);
 	if (error != NSERROR_OK) {
 		free(object);
 		return error != NSERROR_NOMEM;
diff --git a/content/handlers/html/object.h b/content/handlers/html/object.h
new file mode 100644
index 000000000..67d770c9e
--- /dev/null
+++ b/content/handlers/html/object.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * HTML content object interface
+ */
+
+#ifndef NETSURF_HTML_OBJECT_H
+#define NETSURF_HTML_OBJECT_H
+
+struct html_content;
+struct browser_window;
+struct box;
+struct nsurl;
+
+/**
+ * Start a fetch for an object required by a page.
+ *
+ * The created content object is added to the HTML content which is
+ *  updated as the fetch progresses. The box (if any) is updated when
+ *  the object content becomes done.
+ *
+ * \param c content of type CONTENT_HTML
+ * \param url URL of object to fetch
+ * \param box box that will contain the object or NULL if none
+ * \param permitted_types bitmap of acceptable types
+ * \param background this is a background image
+ * \return true on success, false on memory exhaustion
+ */
+bool html_fetch_object(struct html_content *c, struct nsurl *url, struct box *box, content_type permitted_types, bool background);
+
+/**
+ * release memory of content objects associated with a HTML content
+ *
+ * The content objects contents should have been previously closed
+ *  with html_object_close_objects().
+ *
+ * \param html The html content to release the objects from.
+ * \return NSERROR_OK on success else appropriate error code.
+ */
+nserror html_object_free_objects(struct html_content *html);
+
+/**
+ * close content of content objects associated with a HTML content
+ *
+ * \param html The html content to close the objects from.
+ * \return NSERROR_OK on success else appropriate error code.
+ */
+nserror html_object_close_objects(struct html_content *html);
+
+
+/**
+ * open content of content objects associated with a HTML content
+ *
+ * \param html The html content to open the objects from.
+ * \param bw Browser window handle to open contents with.
+ * \return NSERROR_OK on success else appropriate error code.
+ */
+nserror html_object_open_objects(struct html_content *html, struct browser_window *bw);
+
+
+/**
+ * abort any content objects that have not completed fetching.
+ *
+ * \param html The html content to abort the objects from.
+ * \return NSERROR_OK on success else appropriate error code.
+ */
+nserror html_object_abort_objects(struct html_content *html);
+
+#endif
diff --git a/content/handlers/html/html_internal.h b/content/handlers/html/private.h
index 2ba96f0f8..56cd957d5 100644
--- a/content/handlers/html/html_internal.h
+++ b/content/handlers/html/private.h
@@ -21,18 +21,20 @@
  * Private data for text/html content.
  */
 
-#ifndef NETSURF_HTML_HTML_INTERNAL_H
-#define NETSURF_HTML_HTML_INTERNAL_H
+#ifndef NETSURF_HTML_PRIVATE_H
+#define NETSURF_HTML_PRIVATE_H
 
-#include <libcss/libcss.h>
 #include <dom/bindings/hubbub/parser.h>
 
 #include "netsurf/types.h"
 #include "content/content_protected.h"
-#include "desktop/selection.h"
+#include "content/handlers/css/utils.h"
+
 
 struct gui_layout_table;
 struct scrollbar_msg_data;
+struct content_redraw_data;
+struct selection;
 
 typedef enum {
 	HTML_DRAG_NONE,			/** No drag */
@@ -85,11 +87,6 @@ union html_focus_owner {
 	struct box *content;
 };
 
-struct html_scrollbar_data {
-	struct content *c;
-	struct box *box;
-};
-
 /**
  * Data specific to CONTENT_HTML.
  */
@@ -111,13 +108,10 @@ typedef struct html_content {
 	dom_hubbub_encoding_source encoding_source;
 
 	/** Base URL (may be a copy of content->url). */
-	nsurl *base_url;
+	struct nsurl *base_url;
 	/** Base target */
 	char *base_target;
 
-	/** CSS length conversion context for document. */
-	nscss_len_ctx len_ctx;
-
 	/** Content has been aborted in the LOADING state */
 	bool aborted;
 
@@ -127,6 +121,9 @@ typedef struct html_content {
 	/** Whether a layout (reflow) is in progress */
 	bool reflowing;
 
+	/** Whether an initial layout has been done */
+	bool had_initial_layout;
+
 	/** Whether scripts are enabled for this content */
 	bool enable_scripting;
 
@@ -135,6 +132,10 @@ typedef struct html_content {
 
 	/** A talloc context purely for the render box tree */
 	int *bctx;
+	/** A context pointer for the box conversion, NULL if no conversion
+	 * is in progress.
+	 */
+	void *box_conversion_context;
 	/** Box tree, or NULL. */
 	struct box *layout;
 	/** Document background colour. */
@@ -147,8 +148,8 @@ typedef struct html_content {
 	unsigned int scripts_count;
 	/** Scripts */
 	struct html_script *scripts;
-	/** javascript context */
-	struct jscontext *jscontext;
+	/** javascript thread in use */
+	struct jsthread *jsthread;
 
 	/** Number of entries in stylesheet_content. */
 	unsigned int stylesheet_count;
@@ -158,6 +159,8 @@ typedef struct html_content {
 	css_select_ctx *select_ctx;
 	/**< Style selection media specification */
 	css_media media;
+	/** CSS length conversion context for document. */
+	css_unit_ctx unit_len_ctx;
 	/**< Universal selector */
 	lwc_string *universal;
 
@@ -199,65 +202,33 @@ typedef struct html_content {
 	union html_focus_owner focus_owner;
 
 	/** HTML content's own text selection object */
-	struct selection sel;
+	struct selection *sel;
 
-	/** Open core-handled form SELECT menu,
-	 *  or NULL if none currently open. */
+	/**
+	 * Open core-handled form SELECT menu, or NULL if none
+	 *  currently open.
+	 */
 	struct form_control *visible_select_menu;
 
-	/** Context for free text search, or NULL if none */
-	struct search_context *search;
-	/** Search string or NULL */
-	char *search_string;
-
 } html_content;
 
-/** Render padding and margin box outlines in html_redraw(). */
-extern bool html_redraw_debug;
-
-void html__redraw_a_box(html_content *html, struct box *box);
-
 /**
- * Set our drag status, and inform whatever owns the content
- *
- * \param html		HTML content
- * \param drag_type	Type of drag
- * \param drag_owner	What owns the drag
- * \param rect		Pointer movement bounds
+ * Render padding and margin box outlines in html_redraw().
  */
-void html_set_drag_type(html_content *html, html_drag_type drag_type,
-		union html_drag_owner drag_owner, const struct rect *rect);
+extern bool html_redraw_debug;
 
-/**
- * Set our selection status, and inform whatever owns the content
- *
- * \param html			HTML content
- * \param selection_type	Type of selection
- * \param selection_owner	What owns the selection
- * \param read_only		True iff selection is read only
- */
-void html_set_selection(html_content *html, html_selection_type selection_type,
-		union html_selection_owner selection_owner, bool read_only);
+
+/* in html/html.c */
 
 /**
- * Set our input focus, and inform whatever owns the content
+ * redraw a box
  *
- * \param html			HTML content
- * \param focus_type		Type of input focus
- * \param focus_owner		What owns the focus
- * \param hide_caret		True iff caret to be hidden
- * \param x			Carret x-coord rel to owner
- * \param y			Carret y-coord rel to owner
- * \param height		Carret height
- * \param clip			Carret clip rect
+ * \param htmlc HTML content
+ * \param box The box to redraw.
  */
-void html_set_focus(html_content *html, html_focus_type focus_type,
-		union html_focus_owner focus_owner, bool hide_caret,
-		int x, int y, int height, const struct rect *clip);
+void html__redraw_a_box(html_content *htmlc, struct box *box);
 
 
-struct browser_window *html_get_browser_window(struct content *c);
-
 /**
  * Complete conversion of an HTML document
  *
@@ -265,6 +236,7 @@ struct browser_window *html_get_browser_window(struct content *c);
  */
 void html_finish_conversion(html_content *htmlc);
 
+
 /**
  * Test if an HTML content conversion can begin
  *
@@ -273,6 +245,7 @@ void html_finish_conversion(html_content *htmlc);
  */
 bool html_can_begin_conversion(html_content *htmlc);
 
+
 /**
  * Begin conversion of an HTML document
  *
@@ -280,34 +253,12 @@ bool html_can_begin_conversion(html_content *htmlc);
  */
 bool html_begin_conversion(html_content *htmlc);
 
-/* in html/html_redraw.c */
-bool html_redraw(struct content *c, struct content_redraw_data *data,
-		const struct rect *clip, const struct redraw_context *ctx);
-
-/* in html/html_redraw_border.c */
-bool html_redraw_borders(struct box *box, int x_parent, int y_parent,
-		int p_width, int p_height, const struct rect *clip, float scale,
-		const struct redraw_context *ctx);
-
-bool html_redraw_inline_borders(struct box *box, struct rect b,
-		const struct rect *clip, float scale, bool first, bool last,
-		const struct redraw_context *ctx);
-
-/* in html/html_interaction.c */
-void html_mouse_track(struct content *c, struct browser_window *bw,
-			browser_mouse_state mouse, int x, int y);
-void html_mouse_action(struct content *c, struct browser_window *bw,
-			browser_mouse_state mouse, int x, int y);
-bool html_keypress(struct content *c, uint32_t key);
-void html_overflow_scroll_callback(void *client_data,
-		struct scrollbar_msg_data *scrollbar_data);
-void html_search(struct content *c, void *context,
-		search_flags_t flags, const char *string);
-void html_search_clear(struct content *c);
 
+/**
+ * execute some text as a script element
+ */
+bool html_exec(struct content *c, const char *src, size_t srclen);
 
-/* in html/html_script.c */
-dom_hubbub_error html_process_script(void *ctx, dom_node *node);
 
 /**
  * Attempt script execution for defer and async scripts
@@ -321,6 +272,7 @@ dom_hubbub_error html_process_script(void *ctx, dom_node *node);
  */
 nserror html_script_exec(html_content *htmlc, bool allow_defer);
 
+
 /**
  * Free all script resources and references for a html content.
  *
@@ -329,82 +281,70 @@ nserror html_script_exec(html_content *htmlc, bool allow_defer);
  */
 nserror html_script_free(html_content *htmlc);
 
+
 /**
- * Ensure the html content javascript context is invalidated.
- *
- * \param htmlc html content.
- * \return NSERROR_OK or error code.
+ * Check if any of the scripts loaded were insecure
  */
-nserror html_script_invalidate_ctx(html_content *htmlc);
+bool html_saw_insecure_scripts(html_content *htmlc);
 
-/* in html/html_forms.c */
-struct form *html_forms_get_forms(const char *docenc, dom_html_document *doc);
-struct form_control *html_forms_get_control_for_node(struct form *forms,
-		dom_node *node);
-
-/* in html/html_css.c */
-nserror html_css_init(void);
-void html_css_fini(void);
 
 /**
- * Initialise core stylesheets for a content
- *
- * \param c content structure to update
- * \return nserror
+ * Complete the HTML content state machine *iff* all scripts are finished
  */
-nserror html_css_new_stylesheets(html_content *c);
-nserror html_css_quirks_stylesheets(html_content *c);
-nserror html_css_free_stylesheets(html_content *html);
+nserror html_proceed_to_done(html_content *html);
+
+
+/* in html/redraw.c */
+bool html_redraw(struct content *c, struct content_redraw_data *data,
+		const struct rect *clip, const struct redraw_context *ctx);
+
+
+/* in html/redraw_border.c */
+bool html_redraw_borders(struct box *box, int x_parent, int y_parent,
+		int p_width, int p_height, const struct rect *clip, float scale,
+		const struct redraw_context *ctx);
+
+
+bool html_redraw_inline_borders(struct box *box, struct rect b,
+		const struct rect *clip, float scale, bool first, bool last,
+		const struct redraw_context *ctx);
 
-bool html_css_process_link(html_content *htmlc, dom_node *node);
-bool html_css_process_style(html_content *htmlc, dom_node *node);
-bool html_css_update_style(html_content *c, dom_node *style);
 
-nserror html_css_new_selection_context(html_content *c,
-		css_select_ctx **ret_select_ctx);
+/* in html/script.c */
+dom_hubbub_error html_process_script(void *ctx, dom_node *node);
+
+
+/* in html/forms.c */
+struct form *html_forms_get_forms(const char *docenc, dom_html_document *doc);
+struct form_control *html_forms_get_control_for_node(struct form *forms,
+		dom_node *node);
+
 
-/* in html/html_css_fetcher.c */
+/* in html/css_fetcher.c */
 /**
  * Register the fetcher for the pseudo x-ns-css scheme.
  *
  * \return NSERROR_OK on successful registration or error code on failure.
  */
 nserror html_css_fetcher_register(void);
-nserror html_css_fetcher_add_item(dom_string *data, nsurl *base_url,
+nserror html_css_fetcher_add_item(dom_string *data, struct nsurl *base_url,
 		uint32_t *key);
 
-/* in html/html_object.c */
-
-/**
- * Start a fetch for an object required by a page.
- *
- * \param  c                 content of type CONTENT_HTML
- * \param  url               URL of object to fetch (copied)
- * \param  box               box that will contain the object
- * \param  permitted_types   bitmap of acceptable types
- * \param  available_width   estimate of width of object
- * \param  available_height  estimate of height of object
- * \param  background        this is a background image
- * \return  true on success, false on memory exhaustion
- */
-bool html_fetch_object(html_content *c, nsurl *url, struct box *box,
-		content_type permitted_types,
-		int available_width, int available_height,
-		bool background);
-
-nserror html_object_free_objects(html_content *html);
-nserror html_object_close_objects(html_content *html);
-nserror html_object_open_objects(html_content *html, struct browser_window *bw);
-nserror html_object_abort_objects(html_content *html);
 
 /* Events */
 /**
  * Construct an event and fire it at the DOM
  *
  */
-bool fire_dom_event(dom_string *type, dom_node *target,
+bool fire_generic_dom_event(dom_string *type, dom_node *target,
 		    bool bubbles, bool cancelable);
 
+/**
+ * Construct a keyboard event and fire it at the DOM
+ */
+bool fire_dom_keyboard_event(dom_string *type, dom_node *target,
+		bool bubbles, bool cancelable, uint32_t key);
+
 /* Useful dom_string pointers */
 struct dom_string;
 
diff --git a/content/handlers/html/html_redraw.c b/content/handlers/html/redraw.c
index d05df8753..f770699bb 100644
--- a/content/handlers/html/html_redraw.c
+++ b/content/handlers/html/redraw.c
@@ -40,12 +40,15 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/nsoption.h"
+#include "utils/corestrings.h"
 #include "netsurf/content.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/plotters.h"
 #include "netsurf/bitmap.h"
 #include "netsurf/layout.h"
+#include "content/content.h"
 #include "content/content_protected.h"
+#include "content/textsearch.h"
 #include "css/utils.h"
 #include "desktop/selection.h"
 #include "desktop/print.h"
@@ -54,11 +57,12 @@
 #include "desktop/gui_internal.h"
 
 #include "html/box.h"
+#include "html/box_inspect.h"
+#include "html/box_manipulate.h"
 #include "html/font.h"
 #include "html/form_internal.h"
-#include "html/html_internal.h"
+#include "html/private.h"
 #include "html/layout.h"
-#include "html/search.h"
 
 
 bool html_redraw_debug = false;
@@ -164,7 +168,6 @@ text_redraw(const char *utf8_text,
 	    bool excluded,
 	    struct content *c,
 	    const struct selection *sel,
-	    struct search_context *search,
 	    const struct redraw_context *ctx)
 {
 	bool highlighted = false;
@@ -181,18 +184,22 @@ text_redraw(const char *utf8_text,
 		unsigned end_idx;
 
 		/* first try the browser window's current selection */
-		if (selection_defined(sel) && selection_highlighted(sel,
-					offset, offset + len,
-					&start_idx, &end_idx)) {
+		if (selection_highlighted(sel,
+					  offset,
+					  offset + len,
+					  &start_idx,
+					  &end_idx)) {
 			highlighted = true;
 		}
 
 		/* what about the current search operation, if any? */
-		if (!highlighted && (search != NULL) &&
-				search_term_highlighted(c,
-						offset, offset + len,
-						&start_idx, &end_idx,
-						search)) {
+		if (!highlighted &&
+		    (c->textsearch.context != NULL) &&
+		    content_textsearch_ishighlighted(c->textsearch.context,
+						     offset,
+						     offset + len,
+						     &start_idx,
+						     &end_idx)) {
 			highlighted = true;
 		}
 
@@ -521,14 +528,14 @@ static bool html_redraw_radio(int x, int y, int width, int height,
  * \param  box	     box of input
  * \param  scale     scale for redraw
  * \param  background_colour  current background colour
- * \param  len_ctx   Length conversion context
+ * \param  unit_len_ctx   Length conversion context
  * \param  ctx	     current redraw context
  * \return true if successful, false otherwise
  */
 
 static bool html_redraw_file(int x, int y, int width, int height,
 		struct box *box, float scale, colour background_colour,
-		const nscss_len_ctx *len_ctx,
+		const css_unit_ctx *unit_len_ctx,
 		const struct redraw_context *ctx)
 {
 	int text_width;
@@ -537,7 +544,7 @@ static bool html_redraw_file(int x, int y, int width, int height,
 	plot_font_style_t fstyle;
 	nserror res;
 
-	font_plot_style_from_css(len_ctx, box->style, &fstyle);
+	font_plot_style_from_css(unit_len_ctx, box->style, &fstyle);
 	fstyle.background = background_colour;
 
 	if (box->gadget->value) {
@@ -580,7 +587,7 @@ static bool html_redraw_file(int x, int y, int width, int height,
  * \param  clip   current clip rectangle
  * \param  background_colour  current background colour
  * \param  background  box containing background details (usually \a box)
- * \param  len_ctx  Length conversion context
+ * \param  unit_len_ctx  Length conversion context
  * \param  ctx      current redraw context
  * \return true if successful, false otherwise
  */
@@ -588,7 +595,7 @@ static bool html_redraw_file(int x, int y, int width, int height,
 static bool html_redraw_background(int x, int y, struct box *box, float scale,
 		const struct rect *clip, colour *background_colour,
 		struct box *background,
-		const nscss_len_ctx *len_ctx,
+		const css_unit_ctx *unit_len_ctx,
 		const struct redraw_context *ctx)
 {
 	bool repeat_x = false;
@@ -665,8 +672,9 @@ static bool html_redraw_background(int x, int y, struct box *box, float scale,
 				content_get_width(background->background)) *
 				scale * FIXTOFLT(hpos) / 100.;
 		} else {
-			x += (int) (FIXTOFLT(nscss_len2px(len_ctx, hpos, hunit,
-					background->style)) * scale);
+			x += (int) (FIXTOFLT(css_unit_len2device_px(
+					background->style, unit_len_ctx,
+					hpos, hunit)) * scale);
 		}
 
 		if (vunit == CSS_UNIT_PCT) {
@@ -674,8 +682,9 @@ static bool html_redraw_background(int x, int y, struct box *box, float scale,
 				content_get_height(background->background)) *
 				scale * FIXTOFLT(vpos) / 100.;
 		} else {
-			y += (int) (FIXTOFLT(nscss_len2px(len_ctx, vpos, vunit,
-					background->style)) * scale);
+			y += (int) (FIXTOFLT(css_unit_len2device_px(
+					background->style, unit_len_ctx,
+					vpos, vunit)) * scale);
 		}
 	}
 
@@ -807,7 +816,7 @@ static bool html_redraw_background(int x, int y, struct box *box, float scale,
  * \param  first  true if this is the first rectangle associated with the inline
  * \param  last   true if this is the last rectangle associated with the inline
  * \param  background_colour  updated to current background colour if plotted
- * \param  len_ctx  Length conversion context
+ * \param  unit_len_ctx  Length conversion context
  * \param  ctx      current redraw context
  * \return true if successful, false otherwise
  */
@@ -815,7 +824,7 @@ static bool html_redraw_background(int x, int y, struct box *box, float scale,
 static bool html_redraw_inline_background(int x, int y, struct box *box,
 		float scale, const struct rect *clip, struct rect b,
 		bool first, bool last, colour *background_colour,
-		const nscss_len_ctx *len_ctx,
+		const css_unit_ctx *unit_len_ctx,
 		const struct redraw_context *ctx)
 {
 	struct rect r = *clip;
@@ -876,8 +885,9 @@ static bool html_redraw_inline_background(int x, int y, struct box *box,
 				plot_content = false;
 			}
 		} else {
-			x += (int) (FIXTOFLT(nscss_len2px(len_ctx, hpos, hunit,
-					box->style)) * scale);
+			x += (int) (FIXTOFLT(css_unit_len2device_px(
+					box->style, unit_len_ctx,
+					hpos, hunit)) * scale);
 		}
 
 		if (vunit == CSS_UNIT_PCT) {
@@ -885,8 +895,9 @@ static bool html_redraw_inline_background(int x, int y, struct box *box,
 					content_get_height(box->background) *
 					scale) * FIXTOFLT(vpos) / 100.;
 		} else {
-			y += (int) (FIXTOFLT(nscss_len2px(len_ctx, vpos, vunit,
-					box->style)) * scale);
+			y += (int) (FIXTOFLT(css_unit_len2device_px(
+					box->style, unit_len_ctx,
+					vpos, vunit)) * scale);
 		}
 	}
 
@@ -1127,14 +1138,22 @@ static bool html_redraw_text_box(const html_content *html, struct box *box,
 	bool excluded = (box->object != NULL);
 	plot_font_style_t fstyle;
 
-	font_plot_style_from_css(&html->len_ctx, box->style, &fstyle);
+	font_plot_style_from_css(&html->unit_len_ctx, box->style, &fstyle);
 	fstyle.background = current_background_color;
 
-	if (!text_redraw(box->text, box->length, box->byte_offset,
-			box->space, &fstyle, x, y,
-			clip, box->height, scale, excluded,
-			(struct content *)html, &html->sel,
-			html->search, ctx))
+	if (!text_redraw(box->text,
+			 box->length,
+			 box->byte_offset,
+			 box->space,
+			 &fstyle,
+			 x, y,
+			 clip,
+			 box->height,
+			 scale,
+			 excluded,
+			 (struct content *)html,
+			 html->sel,
+			 ctx))
 		return false;
 
 	return true;
@@ -1224,10 +1243,12 @@ bool html_redraw_box(const html_content *html, struct box *box,
 	struct rect rect;
 	int x_scrolled, y_scrolled;
 	struct box *bg_box = NULL;
-	bool has_x_scroll, has_y_scroll;
 	css_computed_clip_rect css_rect;
 	enum css_overflow_e overflow_x = CSS_OVERFLOW_VISIBLE;
 	enum css_overflow_e overflow_y = CSS_OVERFLOW_VISIBLE;
+	dom_exception exc;
+	dom_html_element_type tag_type;
+
 
 	if (html_redraw_printing && (box->flags & PRINTED))
 		return true;
@@ -1388,28 +1409,24 @@ bool html_redraw_box(const html_content *html, struct box *box,
 					CSS_CLIP_RECT) {
 		/* We have an absolutly positioned box with a clip rect */
 		if (css_rect.left_auto == false)
-			r.x0 = x - border_left + FIXTOINT(nscss_len2px(
-					&html->len_ctx,
-					css_rect.left, css_rect.lunit,
-					box->style));
+			r.x0 = x - border_left + FIXTOINT(css_unit_len2device_px(
+					box->style, &html->unit_len_ctx,
+					css_rect.left, css_rect.lunit));
 
 		if (css_rect.top_auto == false)
-			r.y0 = y - border_top + FIXTOINT(nscss_len2px(
-					&html->len_ctx,
-					css_rect.top, css_rect.tunit,
-					box->style));
+			r.y0 = y - border_top + FIXTOINT(css_unit_len2device_px(
+					box->style, &html->unit_len_ctx,
+					css_rect.top, css_rect.tunit));
 
 		if (css_rect.right_auto == false)
-			r.x1 = x - border_left + FIXTOINT(nscss_len2px(
-					&html->len_ctx,
-					css_rect.right, css_rect.runit,
-					box->style));
+			r.x1 = x - border_left + FIXTOINT(css_unit_len2device_px(
+					box->style, &html->unit_len_ctx,
+					css_rect.right, css_rect.runit));
 
 		if (css_rect.bottom_auto == false)
-			r.y1 = y - border_top + FIXTOINT(nscss_len2px(
-					&html->len_ctx,
-					css_rect.bottom, css_rect.bunit,
-					box->style));
+			r.y1 = y - border_top + FIXTOINT(css_unit_len2device_px(
+					box->style, &html->unit_len_ctx,
+					css_rect.bottom, css_rect.bunit));
 
 		/* find intersection of clip rectangle and box */
 		if (r.x0 < clip->x0) r.x0 = clip->x0;
@@ -1498,7 +1515,7 @@ bool html_redraw_box(const html_content *html, struct box *box,
 			/* plot background */
 			if (!html_redraw_background(x, y, box, scale, &p,
 					&current_background_color, bg_box,
-					&html->len_ctx, ctx))
+					&html->unit_len_ctx, ctx))
 				return false;
 			/* restore previous graphics window */
 			if (ctx->plot->clip(ctx, &r) != NSERROR_OK)
@@ -1578,7 +1595,7 @@ bool html_redraw_box(const html_content *html, struct box *box,
 						x, y, box, scale, &p, b,
 						first, false,
 						&current_background_color,
-						&html->len_ctx, ctx))
+						&html->unit_len_ctx, ctx))
 					return false;
 				/* restore previous graphics window */
 				if (ctx->plot->clip(ctx, &r) != NSERROR_OK)
@@ -1611,7 +1628,7 @@ bool html_redraw_box(const html_content *html, struct box *box,
 		 * the inline */
 		if (!html_redraw_inline_background(x, ib_y, box, scale, &p, b,
 				first, true, &current_background_color,
-				&html->len_ctx, ctx))
+				&html->unit_len_ctx, ctx))
 			return false;
 		/* restore previous graphics window */
 		if (ctx->plot->clip(ctx, &r) != NSERROR_OK)
@@ -1729,6 +1746,15 @@ bool html_redraw_box(const html_content *html, struct box *box,
 			return false;
 	}
 
+	if (box->node != NULL) {
+		exc = dom_html_element_get_tag_type(box->node, &tag_type);
+		if (exc != DOM_NO_ERR) {
+			tag_type = DOM_HTML_ELEMENT_TYPE__UNKNOWN;
+		}
+	} else {
+		tag_type = DOM_HTML_ELEMENT_TYPE__UNKNOWN;
+	}
+
 	if (box->object && width != 0 && height != 0) {
 		struct content_redraw_data obj_data;
 
@@ -1782,12 +1808,27 @@ bool html_redraw_box(const html_content *html, struct box *box,
 					    obj, sizeof(obj) - 1) != NSERROR_OK)
 				return false;
 		}
-
+	} else if (tag_type == DOM_HTML_ELEMENT_TYPE_CANVAS &&
+		   box->node != NULL &&
+		   box->flags & REPLACE_DIM) {
+		/* Canvas to draw */
+		struct bitmap *bitmap = NULL;
+		exc = dom_node_get_user_data(box->node,
+					     corestring_dom___ns_key_canvas_node_data,
+					     &bitmap);
+		if (exc != DOM_NO_ERR) {
+			bitmap = NULL;
+		}
+		if (bitmap != NULL &&
+		    ctx->plot->bitmap(ctx, bitmap, x + padding_left, y + padding_top,
+				      width, height, current_background_color,
+				      BITMAPF_NONE) != NSERROR_OK)
+			return false;
 	} else if (box->iframe) {
 		/* Offset is passed to browser window redraw unscaled */
 		browser_window_redraw(box->iframe,
-				(x + padding_left) / scale,
-				(y + padding_top) / scale, &r, ctx);
+				x + padding_left,
+				y + padding_top, &r, ctx);
 
 	} else if (box->gadget && box->gadget->type == GADGET_CHECKBOX) {
 		if (!html_redraw_checkbox(x + padding_left, y + padding_top,
@@ -1802,7 +1843,7 @@ bool html_redraw_box(const html_content *html, struct box *box,
 	} else if (box->gadget && box->gadget->type == GADGET_FILE) {
 		if (!html_redraw_file(x + padding_left, y + padding_top,
 				width, height, box, scale,
-				current_background_color, &html->len_ctx, ctx))
+				current_background_color, &html->unit_len_ctx, ctx))
 			return false;
 
 	} else if (box->gadget &&
@@ -1841,20 +1882,29 @@ bool html_redraw_box(const html_content *html, struct box *box,
 
 	/* scrollbars */
 	if (((box->style && box->type != BOX_BR &&
-			box->type != BOX_TABLE && box->type != BOX_INLINE &&
-			(overflow_x == CSS_OVERFLOW_SCROLL ||
-			 overflow_x == CSS_OVERFLOW_AUTO ||
-			 overflow_y == CSS_OVERFLOW_SCROLL ||
-			 overflow_y == CSS_OVERFLOW_AUTO)) ||
-			(box->object && content_get_type(box->object) ==
-			CONTENT_HTML)) && box->parent != NULL) {
-
-		has_x_scroll = box_hscrollbar_present(box);
-		has_y_scroll = box_vscrollbar_present(box);
-
-		if (!box_handle_scrollbars((struct content *)html,
-				box, has_x_scroll, has_y_scroll))
+	      box->type != BOX_TABLE && box->type != BOX_INLINE &&
+	      (box->gadget == NULL || box->gadget->type != GADGET_TEXTAREA) &&
+	      (overflow_x == CSS_OVERFLOW_SCROLL ||
+	       overflow_x == CSS_OVERFLOW_AUTO ||
+	       overflow_y == CSS_OVERFLOW_SCROLL ||
+	       overflow_y == CSS_OVERFLOW_AUTO)) ||
+	     (box->object && content_get_type(box->object) ==
+	      CONTENT_HTML)) && box->parent != NULL) {
+		nserror res;
+		bool has_x_scroll = (overflow_x == CSS_OVERFLOW_SCROLL);
+		bool has_y_scroll = (overflow_y == CSS_OVERFLOW_SCROLL);
+
+		has_x_scroll |= (overflow_x == CSS_OVERFLOW_AUTO) &&
+				box_hscrollbar_present(box);
+		has_y_scroll |= (overflow_y == CSS_OVERFLOW_AUTO) &&
+				box_vscrollbar_present(box);
+
+		res = box_handle_scrollbars((struct content *)html,
+					    box, has_x_scroll, has_y_scroll);
+		if (res != NSERROR_OK) {
+			NSLOG(netsurf, INFO, "%s", messages_get_errorcode(res));
 			return false;
+		}
 
 		if (box->scroll_x != NULL)
 			scrollbar_redraw(box->scroll_x,
diff --git a/content/handlers/html/html_redraw_border.c b/content/handlers/html/redraw_border.c
index 0b3d858e6..3a1f6f308 100644
--- a/content/handlers/html/html_redraw_border.c
+++ b/content/handlers/html/redraw_border.c
@@ -25,12 +25,13 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
+#include "utils/utils.h"
 #include "utils/log.h"
 #include "netsurf/plotters.h"
 #include "netsurf/css.h"
 
 #include "html/box.h"
-#include "html/html_internal.h"
+#include "html/private.h"
 
 
 static plot_style_t plot_style_bdr = {
@@ -121,7 +122,7 @@ html_redraw_border_plot(const int side,
 	switch (style) {
 	case CSS_BORDER_STYLE_DOTTED:
 		plot_style_bdr.stroke_type = PLOT_OP_TYPE_DOT;
-		/* fall through */
+		fallthrough;
 	case CSS_BORDER_STYLE_DASHED:
 		rect.x0 = (p[0] + p[2]) / 2;
 		rect.y0 = (p[1] + p[3]) / 2;
@@ -131,7 +132,7 @@ html_redraw_border_plot(const int side,
 		break;
 
 	case CSS_BORDER_STYLE_SOLID:
-		/* fall through to default */
+		/* solid is the default */
 	default:
 		if (rectangular || thickness == 1) {
 
@@ -190,7 +191,7 @@ html_redraw_border_plot(const int side,
 
 	case CSS_BORDER_STYLE_GROOVE:
 		light = 3 - light;
-		/* fall through */
+		fallthrough;
 	case CSS_BORDER_STYLE_RIDGE:
 		/* choose correct colours for each part of the border line */
 		if (light <= 1) {
@@ -300,7 +301,7 @@ html_redraw_border_plot(const int side,
 
 	case CSS_BORDER_STYLE_INSET:
 		light = (light + 2) % 4;
-		/* fall through */
+		fallthrough;
 	case CSS_BORDER_STYLE_OUTSET:
 		/* choose correct colours for each part of the border line */
 		switch (light) {
diff --git a/content/handlers/html/html_script.c b/content/handlers/html/script.c
index 2a72d512e..554fc4f70 100644
--- a/content/handlers/html/html_script.c
+++ b/content/handlers/html/script.c
@@ -36,13 +36,14 @@
 #include "netsurf/content.h"
 #include "javascript/js.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "content/fetch.h"
 #include "content/hlcache.h"
 
 #include "html/html.h"
-#include "html/html_internal.h"
+#include "html/private.h"
 
-typedef bool (script_handler_t)(struct jscontext *jscontext, const uint8_t *data, size_t size, const char *name);
+typedef bool (script_handler_t)(struct jsthread *jsthread, const uint8_t *data, size_t size, const char *name);
 
 
 static script_handler_t *select_script_handler(content_type ctype)
@@ -60,8 +61,9 @@ nserror html_script_exec(html_content *c, bool allow_defer)
 	unsigned int i;
 	struct html_script *s;
 	script_handler_t *script_handler;
+	bool have_run_something = false;
 
-	if (c->jscontext == NULL) {
+	if (c->jsthread == NULL) {
 		return NSERROR_BAD_PARAMETER;
 	}
 
@@ -94,8 +96,9 @@ nserror html_script_exec(html_content *c, bool allow_defer)
 				size_t size;
 				data = content_get_source_data(
 						s->data.handle, &size );
-				script_handler(c->jscontext, data, size,
+				script_handler(c->jsthread, data, size,
 					       nsurl_access(hlcache_handle_get_url(s->data.handle)));
+				have_run_something = true;
 				/* We have to re-acquire this here since the
 				 * c->scripts array may have been reallocated
 				 * as a result of executing this script.
@@ -108,6 +111,10 @@ nserror html_script_exec(html_content *c, bool allow_defer)
 		}
 	}
 
+	if (have_run_something) {
+		return html_proceed_to_done(c);
+	}
+
 	return NSERROR_OK;
 }
 
@@ -183,15 +190,12 @@ convert_script_async_cb(hlcache_handle *script,
 	case CONTENT_MSG_ERROR:
 		NSLOG(netsurf, INFO, "script %s failed: %s",
 		      nsurl_access(hlcache_handle_get_url(script)),
-		      event->data.error);
-		/* fall through */
+		      event->data.errordata.errormsg);
 
-	case CONTENT_MSG_ERRORCODE:
 		hlcache_handle_release(script);
 		s->data.handle = NULL;
 		parent->base.active--;
 		NSLOG(netsurf, INFO, "%d fetches active", parent->base.active);
-		content_add_error(&parent->base, "?", 0);
 
 		break;
 
@@ -210,7 +214,7 @@ convert_script_async_cb(hlcache_handle *script,
 	 * scripts as they come in.
 	 */
 	else if (parent->conversion_begun) {
-		html_script_exec(parent, false);
+		return html_script_exec(parent, false);
 	}
 
 	return NSERROR_OK;
@@ -249,15 +253,12 @@ convert_script_defer_cb(hlcache_handle *script,
 	case CONTENT_MSG_ERROR:
 		NSLOG(netsurf, INFO, "script %s failed: %s",
 		      nsurl_access(hlcache_handle_get_url(script)),
-		      event->data.error);
-		/* fall through */
+		      event->data.errordata.errormsg);
 
-	case CONTENT_MSG_ERRORCODE:
 		hlcache_handle_release(script);
 		s->data.handle = NULL;
 		parent->base.active--;
 		NSLOG(netsurf, INFO, "%d fetches active", parent->base.active);
-		content_add_error(&parent->base, "?", 0);
 
 		break;
 
@@ -288,6 +289,15 @@ convert_script_sync_cb(hlcache_handle *script,
 	struct html_script *s;
 	script_handler_t *script_handler;
 	dom_hubbub_error err;
+	unsigned int active_sync_scripts = 0;
+
+	/* Count sync scripts which have yet to complete (other than us) */
+	for (i = 0, s = parent->scripts; i != parent->scripts_count; i++, s++) {
+		if (s->type == HTML_SCRIPT_SYNC &&
+		    s->data.handle != script && s->already_started == false) {
+			active_sync_scripts++;
+		}
+	}
 
 	/* Find script */
 	for (i = 0, s = parent->scripts; i != parent->scripts_count; i++, s++) {
@@ -308,17 +318,17 @@ convert_script_sync_cb(hlcache_handle *script,
 
 		/* attempt to execute script */
 		script_handler = select_script_handler(content_get_type(s->data.handle));
-		if (script_handler != NULL && parent->jscontext != NULL) {
+		if (script_handler != NULL && parent->jsthread != NULL) {
 			/* script has a handler */
 			const uint8_t *data;
 			size_t size;
 			data = content_get_source_data(s->data.handle, &size );
-			script_handler(parent->jscontext, data, size,
+			script_handler(parent->jsthread, data, size,
 				       nsurl_access(hlcache_handle_get_url(s->data.handle)));
 		}
 
 		/* continue parse */
-		if (parent->parser != NULL) {
+		if (parent->parser != NULL && active_sync_scripts == 0) {
 			err = dom_hubbub_parser_pause(parent->parser, false);
 			if (err != DOM_HUBBUB_OK) {
 				NSLOG(netsurf, INFO, "unpause returned 0x%x", err);
@@ -330,21 +340,18 @@ convert_script_sync_cb(hlcache_handle *script,
 	case CONTENT_MSG_ERROR:
 		NSLOG(netsurf, INFO, "script %s failed: %s",
 		      nsurl_access(hlcache_handle_get_url(script)),
-		      event->data.error);
-		/* fall through */
+		      event->data.errordata.errormsg);
 
-	case CONTENT_MSG_ERRORCODE:
 		hlcache_handle_release(script);
 		s->data.handle = NULL;
 		parent->base.active--;
 
 		NSLOG(netsurf, INFO, "%d fetches active", parent->base.active);
-		content_add_error(&parent->base, "?", 0);
 
 		s->already_started = true;
 
 		/* continue parse */
-		if (parent->parser != NULL) {
+		if (parent->parser != NULL && active_sync_scripts == 0) {
 			err = dom_hubbub_parser_pause(parent->parser, false);
 			if (err != DOM_HUBBUB_OK) {
 				NSLOG(netsurf, INFO, "unpause returned 0x%x", err);
@@ -390,7 +397,7 @@ exec_src_script(html_content *c,
 	/* src url */
 	ns_error = nsurl_join(c->base_url, dom_string_data(src), &joined);
 	if (ns_error != NSERROR_OK) {
-		content_broadcast_errorcode(&c->base, NSERROR_NOMEM);
+		content_broadcast_error(&c->base, NSERROR_NOMEM, NULL);
 		return DOM_HUBBUB_NOMEM;
 	}
 
@@ -452,7 +459,7 @@ exec_src_script(html_content *c,
 	nscript = html_process_new_script(c, mimetype, script_type);
 	if (nscript == NULL) {
 		nsurl_unref(joined);
-		content_broadcast_errorcode(&c->base, NSERROR_NOMEM);
+		content_broadcast_error(&c->base, NSERROR_NOMEM, NULL);
 		return DOM_HUBBUB_NOMEM;
 	}
 
@@ -488,6 +495,7 @@ exec_src_script(html_content *c,
 		switch (script_type) {
 		case HTML_SCRIPT_SYNC:
 			ret =  DOM_HUBBUB_HUBBUB_ERR | HUBBUB_PAUSED;
+			break;
 
 		case HTML_SCRIPT_ASYNC:
 			break;
@@ -522,7 +530,7 @@ exec_inline_script(html_content *c, dom_node *node, dom_string *mimetype)
 	if (nscript == NULL) {
 		dom_string_unref(script);
 
-		content_broadcast_errorcode(&c->base, NSERROR_NOMEM);
+		content_broadcast_error(&c->base, NSERROR_NOMEM, NULL);
 		return DOM_HUBBUB_NOMEM;
 
 	}
@@ -531,12 +539,16 @@ exec_inline_script(html_content *c, dom_node *node, dom_string *mimetype)
 	nscript->already_started = true;
 
 	/* ensure script handler for content type */
-	dom_string_intern(mimetype, &lwcmimetype);
+	exc = dom_string_intern(mimetype, &lwcmimetype);
+	if (exc != DOM_NO_ERR) {
+		return DOM_HUBBUB_DOM;
+	}
+
 	script_handler = select_script_handler(content_factory_type_from_mime_type(lwcmimetype));
 	lwc_string_unref(lwcmimetype);
 
 	if (script_handler != NULL) {
-		script_handler(c->jscontext,
+		script_handler(c->jsthread,
 			       (const uint8_t *)dom_string_data(script),
 			       dom_string_byte_length(script),
 			       "?inline script?");
@@ -562,13 +574,13 @@ html_process_script(void *ctx, dom_node *node)
 	/* We should only ever be here if scripting was enabled for this
 	 * content so it's correct to make a javascript context if there
 	 * isn't one already. */
-	if (c->jscontext == NULL) {
+	if (c->jsthread == NULL) {
 		union content_msg_data msg_data;
 
-		msg_data.jscontext = &c->jscontext;
-		content_broadcast(&c->base, CONTENT_MSG_GETCTX, &msg_data);
-		NSLOG(netsurf, INFO, "javascript context %p ", c->jscontext);
-		if (c->jscontext == NULL) {
+		msg_data.jsthread = &c->jsthread;
+		content_broadcast(&c->base, CONTENT_MSG_GETTHREAD, &msg_data);
+		NSLOG(netsurf, INFO, "javascript context %p ", c->jsthread);
+		if (c->jsthread == NULL) {
 			/* no context and it could not be created, abort */
 			return DOM_HUBBUB_OK;
 		}
@@ -596,6 +608,31 @@ html_process_script(void *ctx, dom_node *node)
 }
 
 /* exported internal interface documented in html/html_internal.h */
+bool html_saw_insecure_scripts(html_content *htmlc)
+{
+	struct html_script *s;
+	unsigned int i;
+
+	for (i = 0, s = htmlc->scripts; i != htmlc->scripts_count; i++, s++) {
+		if (s->type == HTML_SCRIPT_INLINE) {
+			/* Inline scripts are no less secure than their
+			 * containing HTML content
+			 */
+			continue;
+		}
+		if (s->data.handle == NULL) {
+			/* We've not begun loading this? */
+			continue;
+		}
+		if (content_saw_insecure_objects(s->data.handle)) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+/* exported internal interface documented in html/html_internal.h */
 nserror html_script_free(html_content *html)
 {
 	unsigned int i;
@@ -626,10 +663,3 @@ nserror html_script_free(html_content *html)
 
 	return NSERROR_OK;
 }
-
-/* exported internal interface documented in html/html_internal.h */
-nserror html_script_invalidate_ctx(html_content *htmlc)
-{
-	htmlc->jscontext = NULL;
-	return NSERROR_OK;
-}
diff --git a/content/handlers/html/search.c b/content/handlers/html/search.c
deleted file mode 100644
index 9ba2957e4..000000000
--- a/content/handlers/html/search.c
+++ /dev/null
@@ -1,656 +0,0 @@
-/*
- * Copyright 2004 John M Bell <jmb202@ecs.soton.ac.uk>
- * Copyright 2005 Adrian Lees <adrianl@users.sourceforge.net>
- * Copyright 2009 Mark Benjamin <netsurf-browser.org.MarkBenjamin@dfgh.net>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file
- * Free text search (core)
- */
-
-#include <ctype.h>
-#include <string.h>
-#include <dom/dom.h>
-
-#include "utils/config.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
-#include "content/content.h"
-#include "content/hlcache.h"
-#include "desktop/selection.h"
-#include "netsurf/search.h"
-#include "netsurf/misc.h"
-#include "desktop/gui_internal.h"
-
-#include "text/textplain.h"
-#include "html/box.h"
-#include "html/html.h"
-#include "html/html_internal.h"
-#include "html/search.h"
-
-#ifndef NOF_ELEMENTS
-#define NOF_ELEMENTS(array) (sizeof(array)/sizeof(*(array)))
-#endif
-
-
-struct list_entry {
-	unsigned start_idx;	/* start position of match */
-	unsigned end_idx;	/* end of match */
-
-	struct box *start_box;	/* used only for html contents */
-	struct box *end_box;
-
-	struct selection *sel;
-
-	struct list_entry *prev;
-	struct list_entry *next;
-};
-
-struct search_context {
-	void *gui_p;
-	struct content *c;
-	struct list_entry *found;
-	struct list_entry *current; /* first for select all */
-	char *string;
-	bool prev_case_sens;
-	bool newsearch;
-	bool is_html;
-};
-
-
-/* Exported function documented in search.h */
-struct search_context * search_create_context(struct content *c,
-		content_type type, void *gui_data)
-{
-	struct search_context *context;
-	struct list_entry *search_head;
-
-	if (type != CONTENT_HTML && type != CONTENT_TEXTPLAIN) {
-		return NULL;
-	}
-
-	context = malloc(sizeof(struct search_context));
-	if (context == NULL) {
-		guit->misc->warning("NoMemory", 0);
-		return NULL;
-	}
-
-	search_head = malloc(sizeof(struct list_entry));
-	if (search_head == NULL) {
-		guit->misc->warning("NoMemory", 0);
-		free(context);
-		return NULL;
-	}
-
-	search_head->start_idx = 0;
-	search_head->end_idx = 0;
-	search_head->start_box = NULL;
-	search_head->end_box = NULL;
-	search_head->sel = NULL;
-	search_head->prev = NULL;
-	search_head->next = NULL;
-
-	context->found = search_head;
-	context->current = NULL;
-	context->string = NULL;
-	context->prev_case_sens = false;
-	context->newsearch = true;
-	context->c = c;
-	context->is_html = (type == CONTENT_HTML) ? true : false;
-	context->gui_p = gui_data;
-
-	return context;
-}
-
-
-/**
- * Release the memory used by the list of matches,
- * deleting selection objects too
- */
-
-static void free_matches(struct search_context *context)
-{
-	struct list_entry *a;
-	struct list_entry *b;
-
-	a = context->found->next;
-
-	/* empty the list before clearing and deleting the
-	 * selections because the the clearing updates the
-	 * screen immediately, causing nested accesses to the list */
-
-	context->found->prev = NULL;
-	context->found->next = NULL;
-
-	for (; a; a = b) {
-		b = a->next;
-		if (a->sel) {
-			selection_clear(a->sel, true);
-			selection_destroy(a->sel);
-		}
-		free(a);
-	}
-}
-
-
-/**
- * Find the first occurrence of 'match' in 'string' and return its index
- *
- * \param  string     the string to be searched (unterminated)
- * \param  s_len      length of the string to be searched
- * \param  pattern    the pattern for which we are searching (unterminated)
- * \param  p_len      length of pattern
- * \param  case_sens  true iff case sensitive match required
- * \param  m_len      accepts length of match in bytes
- * \return pointer to first match, NULL if none
- */
-
-static const char *find_pattern(const char *string, int s_len,
-		const char *pattern, int p_len, bool case_sens,
-		unsigned int *m_len)
-{
-	struct { const char *ss, *s, *p; bool first; } context[16];
-	const char *ep = pattern + p_len;
-	const char *es = string  + s_len;
-	const char *p = pattern - 1;  /* a virtual '*' before the pattern */
-	const char *ss = string;
-	const char *s = string;
-	bool first = true;
-	int top = 0;
-
-	while (p < ep) {
-		bool matches;
-		if (p < pattern || *p == '*') {
-			char ch;
-
-			/* skip any further asterisks; one is the same as many
-			*/
-			do p++; while (p < ep && *p == '*');
-
-			/* if we're at the end of the pattern, yes, it matches
-			*/
-			if (p >= ep) break;
-
-			/* anything matches a # so continue matching from
-			   here, and stack a context that will try to match
-			   the wildcard against the next character */
-
-			ch = *p;
-			if (ch != '#') {
-				/* scan forwards until we find a match for
-				   this char */
-				if (!case_sens) ch = toupper(ch);
-				while (s < es) {
-					if (case_sens) {
-						if (*s == ch) break;
-					} else if (toupper(*s) == ch)
-						break;
-					s++;
-				}
-			}
-
-			if (s < es) {
-				/* remember where we are in case the match
-				   fails; we may then resume */
-				if (top < (int)NOF_ELEMENTS(context)) {
-					context[top].ss = ss;
-					context[top].s  = s + 1;
-					context[top].p  = p - 1;
-					/* ptr to last asterisk */
-					context[top].first = first;
-					top++;
-				}
-
-				if (first) {
-					ss = s;
-					/* remember first non-'*' char */
-					first = false;
-				}
-
-				matches = true;
-			} else {
-				matches = false;
-			}
-
-		} else if (s < es) {
-			char ch = *p;
-			if (ch == '#')
-				matches = true;
-			else {
-				if (case_sens)
-					matches = (*s == ch);
-				else
-					matches = (toupper(*s) == toupper(ch));
-			}
-			if (matches && first) {
-				ss = s;  /* remember first non-'*' char */
-				first = false;
-			}
-		} else {
-			matches = false;
-		}
-
-		if (matches) {
-			p++; s++;
-		} else {
-			/* doesn't match,
-			 * resume with stacked context if we have one */
-			if (--top < 0)
-				return NULL;  /* no match, give up */
-
-			ss = context[top].ss;
-			s  = context[top].s;
-			p  = context[top].p;
-			first = context[top].first;
-		}
-	}
-
-	/* end of pattern reached */
-	*m_len = max(s - ss, 1);
-	return ss;
-}
-
-
-/**
- * Add a new entry to the list of matches
- *
- * \param start_idx Offset of match start within textual representation
- * \param end_idx   Offset of match end
- * \param context   The search context to add the entry to.
- * \return Pointer to added entry, NULL iff failed.
- */
-
-static struct list_entry *add_entry(unsigned start_idx, unsigned end_idx,
-		struct search_context *context)
-{
-	struct list_entry *entry;
-
-	/* found string in box => add to list */
-	entry = calloc(1, sizeof(*entry));
-	if (!entry) {
-		guit->misc->warning("NoMemory", 0);
-		return NULL;
-	}
-
-	entry->start_idx = start_idx;
-	entry->end_idx = end_idx;
-	entry->sel = NULL;
-
-	entry->next = 0;
-	entry->prev = context->found->prev;
-
-	if (context->found->prev == NULL)
-		context->found->next = entry;
-	else
-		context->found->prev->next = entry;
-
-	context->found->prev = entry;
-
-	return entry;
-}
-
-
-/**
- * Finds all occurrences of a given string in the html box tree
- *
- * \param pattern   the string pattern to search for
- * \param p_len     pattern length
- * \param cur       pointer to the current box
- * \param case_sens whether to perform a case sensitive search
- * \param context   The search context to add the entry to.
- * \return true on success, false on memory allocation failure
- */
-static bool find_occurrences_html(const char *pattern, int p_len,
-		struct box *cur, bool case_sens,
-		struct search_context *context)
-{
-	struct box *a;
-
-	/* ignore this box, if there's no visible text */
-	if (!cur->object && cur->text) {
-		const char *text = cur->text;
-		unsigned length = cur->length;
-
-		while (length > 0) {
-			struct list_entry *entry;
-			unsigned match_length;
-			unsigned match_offset;
-			const char *new_text;
-			const char *pos = find_pattern(text, length,
-					pattern, p_len, case_sens,
-					&match_length);
-			if (!pos)
-				break;
-
-			/* found string in box => add to list */
-			match_offset = pos - cur->text;
-
-			entry = add_entry(cur->byte_offset + match_offset,
-						cur->byte_offset +
-							match_offset +
-							match_length, context);
-			if (!entry)
-				return false;
-
-			entry->start_box = cur;
-			entry->end_box = cur;
-
-			new_text = pos + match_length;
-			length -= (new_text - text);
-			text = new_text;
-		}
-	}
-
-	/* and recurse */
-	for (a = cur->children; a; a = a->next) {
-		if (!find_occurrences_html(pattern, p_len, a, case_sens,
-				context))
-			return false;
-	}
-
-	return true;
-}
-
-
-/**
- * Finds all occurrences of a given string in a textplain content
- *
- * \param pattern   the string pattern to search for
- * \param p_len     pattern length
- * \param c         the content to be searched
- * \param case_sens whether to perform a case sensitive search
- * \param context   The search context to add the entry to.
- * \return true on success, false on memory allocation failure
- */
-
-static bool find_occurrences_text(const char *pattern, int p_len,
-		struct content *c, bool case_sens,
-		struct search_context *context)
-{
-	int nlines = textplain_line_count(c);
-	int line;
-
-	for(line = 0; line < nlines; line++) {
-		size_t offset, length;
-		const char *text = textplain_get_line(c, line,
-				&offset, &length);
-		if (text) {
-			while (length > 0) {
-				struct list_entry *entry;
-				unsigned match_length;
-				size_t start_idx;
-				const char *new_text;
-				const char *pos = find_pattern(text, length,
-						pattern, p_len, case_sens,
-						&match_length);
-				if (!pos)
-					break;
-
-				/* found string in line => add to list */
-				start_idx = offset + (pos - text);
-				entry = add_entry(start_idx, start_idx +
-						match_length, context);
-				if (!entry)
-					return false;
-
-				new_text = pos + match_length;
-				offset += (new_text - text);
-				length -= (new_text - text);
-				text = new_text;
-			}
-		}
-	}
-
-	return true;
-}
-
-
-/**
- * Search for a string in the box tree
- *
- * \param string the string to search for
- * \param string_len length of search string
- * \param context The search context to add the entry to.
- * \param flags flags to control the search.
- */
-static void search_text(const char *string, int string_len,
-		struct search_context *context, search_flags_t flags)
-{
-	struct rect bounds;
-	struct box *box = NULL;
-	union content_msg_data msg_data;
-	bool case_sensitive, forwards, showall;
-
-	case_sensitive = ((flags & SEARCH_FLAG_CASE_SENSITIVE) != 0) ?
-			true : false;
-	forwards = ((flags & SEARCH_FLAG_FORWARDS) != 0) ? true : false;
-	showall = ((flags & SEARCH_FLAG_SHOWALL) != 0) ? true : false;
-
-	if (context->c == NULL)
-		return;
-
-	if (context->is_html == true) {
-		html_content *html = (html_content *)context->c;
-
-		box = html->layout;
-
-		if (!box)
-			return;
-	}
-
-
-	/* check if we need to start a new search or continue an old one */
-	if (context->newsearch) {
-		bool res;
-
-		if (context->string != NULL)
-			free(context->string);
-
-		context->current = NULL;
-		free_matches(context);
-
-		context->string = malloc(string_len + 1);
-		if (context->string != NULL) {
-			memcpy(context->string, string, string_len);
-			context->string[string_len] = '\0';
-		}
-
-		guit->search->hourglass(true, context->gui_p);
-
-		if (context->is_html == true) {
-			res = find_occurrences_html(string, string_len,
-					box, case_sensitive, context);
-		} else {
-			res = find_occurrences_text(string, string_len,
-					context->c, case_sensitive, context);
-		}
-
-		if (!res) {
-			free_matches(context);
-			guit->search->hourglass(false, context->gui_p);
-			return;
-		}
-		guit->search->hourglass(false, context->gui_p);
-
-		context->prev_case_sens = case_sensitive;
-
-		/* new search, beginning at the top of the page */
-		context->current = context->found->next;
-		context->newsearch = false;
-
-	} else if (context->current != NULL) {
-		/* continued search in the direction specified */
-		if (forwards) {
-			if (context->current->next)
-				context->current = context->current->next;
-		} else {
-			if (context->current->prev)
-				context->current = context->current->prev;
-		}
-	}
-
-	guit->search->status((context->current != NULL), context->gui_p);
-
-	search_show_all(showall, context);
-
-	guit->search->back_state((context->current != NULL) &&
-				(context->current->prev != NULL),
-				context->gui_p);
-	guit->search->forward_state((context->current != NULL) &&
-				(context->current->next != NULL),
-				context->gui_p);
-
-	if (context->current == NULL)
-		return;
-
-	if (context->is_html == true) {
-		/* get box position and jump to it */
-		box_coords(context->current->start_box, &bounds.x0, &bounds.y0);
-		/* \todo: move x0 in by correct idx */
-		box_coords(context->current->end_box, &bounds.x1, &bounds.y1);
-		/* \todo: move x1 in by correct idx */
-		bounds.x1 += context->current->end_box->width;
-		bounds.y1 += context->current->end_box->height;
-	} else {
-		textplain_coords_from_range(context->c,
-				context->current->start_idx,
-				context->current->end_idx, &bounds);
-	}
-
-	msg_data.scroll.area = true;
-	msg_data.scroll.x0 = bounds.x0;
-	msg_data.scroll.y0 = bounds.y0;
-	msg_data.scroll.x1 = bounds.x1;
-	msg_data.scroll.y1 = bounds.y1;
-	content_broadcast(context->c, CONTENT_MSG_SCROLL, &msg_data);
-}
-
-
-/* Exported function documented in search.h */
-void search_step(struct search_context *context, search_flags_t flags,
-		const char *string)
-{
-	int string_len;
-	int i = 0;
-
-	if (context == NULL) {
-		guit->misc->warning("SearchError", 0);
-		return;
-	}
-
-	guit->search->add_recent(string, context->gui_p);
-
-	string_len = strlen(string);
-	for (i = 0; i < string_len; i++)
-		if (string[i] != '#' && string[i] != '*')
-			break;
-	if (i >= string_len) {
-		union content_msg_data msg_data;
-		free_matches(context);
-
-		guit->search->status(true, context->gui_p);
-		guit->search->back_state(false, context->gui_p);
-		guit->search->forward_state(false, context->gui_p);
-
-		msg_data.scroll.area = false;
-		msg_data.scroll.x0 = 0;
-		msg_data.scroll.y0 = 0;
-		content_broadcast(context->c, CONTENT_MSG_SCROLL, &msg_data);
-		return;
-	}
-	search_text(string, string_len, context, flags);
-}
-
-
-/* Exported function documented in search.h */
-bool search_term_highlighted(struct content *c,
-		unsigned start_offset, unsigned end_offset,
-		unsigned *start_idx, unsigned *end_idx,
-		struct search_context *context)
-{
-	if (c == context->c) {
-		struct list_entry *a;
-		for (a = context->found->next; a; a = a->next)
-			if (a->sel && selection_defined(a->sel) &&
-					selection_highlighted(a->sel,
-						start_offset, end_offset,
-						start_idx, end_idx))
-				return true;
-	}
-
-	return false;
-}
-
-
-/* Exported function documented in search.h */
-void search_show_all(bool all, struct search_context *context)
-{
-	struct list_entry *a;
-
-	for (a = context->found->next; a; a = a->next) {
-		bool add = true;
-		if (!all && a != context->current) {
-			add = false;
-			if (a->sel) {
-				selection_clear(a->sel, true);
-				selection_destroy(a->sel);
-				a->sel = NULL;
-			}
-		}
-		if (add && !a->sel) {
-
-			if (context->is_html == true) {
-				html_content *html = (html_content *)context->c;
-				a->sel = selection_create(context->c, true);
-				if (!a->sel)
-					continue;
-
-				selection_init(a->sel, html->layout,
-						&html->len_ctx);
-			} else {
-				a->sel = selection_create(context->c, false);
-				if (!a->sel)
-					continue;
-
-				selection_init(a->sel, NULL, NULL);
-			}
-
-			selection_set_start(a->sel, a->start_idx);
-			selection_set_end(a->sel, a->end_idx);
-		}
-	}
-}
-
-
-/* Exported function documented in search.h */
-void search_destroy_context(struct search_context *context)
-{
-	assert(context != NULL);
-
-	if (context->string != NULL) {
-		guit->search->add_recent(context->string, context->gui_p);
-		free(context->string);
-	}
-
-	guit->search->forward_state(true, context->gui_p);
-	guit->search->back_state(true, context->gui_p);
-
-	free_matches(context);
-	free(context);
-}
diff --git a/content/handlers/html/search.h b/content/handlers/html/search.h
deleted file mode 100644
index 5c9408e3e..000000000
--- a/content/handlers/html/search.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2009 Mark Benjamin <netsurf-browser.org.MarkBenjamin@dfgh.net>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file
- * Interface to HTML searching.
- */
-
-#ifndef NETSURF_HTML_SEARCH_H
-#define NETSURF_HTML_SEARCH_H
-
-#include <ctype.h>
-#include <string.h>
-
-#include "desktop/search.h"
-
-struct search_context;
-
-/**
- * create a search_context
- *
- * \param c       The content the search_context is connected to
- * \param type    The content type of c
- * \param context A context pointer passed to the provider routines.
- * \return A new search context or NULL on error.
- */
-struct search_context *search_create_context(struct content *c,
-				      content_type type, void *context);
-
-/**
- * Ends the search process, invalidating all state
- * freeing the list of found boxes
- */
-void search_destroy_context(struct search_context *context);
-
-/**
- * Begins/continues the search process
- *
- * \note that this may be called many times for a single search.
- *
- * \param context The search context in use.
- * \param flags   The flags forward/back etc
- * \param string  The string to match
- */
-void search_step(struct search_context *context, search_flags_t flags,
-		const char * string);
-
-/**
- * Specifies whether all matches or just the current match should
- * be highlighted in the search text.
- */
-void search_show_all(bool all, struct search_context *context);
-
-/**
- * Determines whether any portion of the given text box should be
- * selected because it matches the current search string.
- *
- * \param c            The content to hilight within.
- * \param start_offset byte offset within text of string to be checked
- * \param end_offset   byte offset within text
- * \param start_idx    byte offset within string of highlight start
- * \param end_idx      byte offset of highlight end
- * \param context      The search context to hilight entries from.
- * \return true iff part of the box should be highlighted
- */
-bool search_term_highlighted(struct content *c,
-		unsigned start_offset, unsigned end_offset,
-		unsigned *start_idx, unsigned *end_idx,
-		struct search_context *context);
-
-#endif
diff --git a/content/handlers/html/table.c b/content/handlers/html/table.c
index 5609e8f29..f8762e862 100644
--- a/content/handlers/html/table.c
+++ b/content/handlers/html/table.c
@@ -26,6 +26,7 @@
 #include <dom/dom.h>
 
 #include "utils/log.h"
+#include "utils/utils.h"
 #include "utils/talloc.h"
 #include "css/utils.h"
 
@@ -46,316 +47,344 @@ struct border {
 	css_unit unit;			/**< border-width units */
 };
 
-static void table_used_left_border_for_cell(
-		const nscss_len_ctx *len_ctx,
-		struct box *cell);
-static void table_used_top_border_for_cell(
-		const nscss_len_ctx *len_ctx,
-		struct box *cell);
-static void table_used_right_border_for_cell(
-		const nscss_len_ctx *len_ctx,
-		struct box *cell);
-static void table_used_bottom_border_for_cell(
-		const nscss_len_ctx *len_ctx,
-		struct box *cell);
-static bool table_border_is_more_eyecatching(
-		const nscss_len_ctx *len_ctx,
-		const struct border *a,
-		box_type a_src,
-		const struct border *b,
-		box_type b_src);
-static void table_cell_top_process_table(
-		const nscss_len_ctx *len_ctx,
-		struct box *table,
-		struct border *a,
-		box_type *a_src);
-static bool table_cell_top_process_group(
-		const nscss_len_ctx *len_ctx,
-		struct box *cell,
-		struct box *group,
-		struct border *a,
-		box_type *a_src);
-static bool table_cell_top_process_row(
-		const nscss_len_ctx *len_ctx,
-		struct box *cell,
-		struct box *row,
-		struct border *a,
-		box_type *a_src);
-
 
 /**
- * Determine the column width types for a table.
- *
- * \param  len_ctx  Length conversion context
- * \param  table    box of type BOX_TABLE
- * \return  true on success, false on memory exhaustion
+ * Determine if a border style is more eyecatching than another
  *
- * The table->col array is allocated and type and width are filled in for each
- * column.
+ * \param unit_len_ctx  Length conversion context
+ * \param a        Reference border style
+ * \param a_src    Source of \a a
+ * \param b        Candidate border style
+ * \param b_src    Source of \a b
+ * \return True if \a b is more eyecatching than \a a
  */
-
-bool table_calculate_column_types(
-		const nscss_len_ctx *len_ctx,
-		struct box *table)
+static bool
+table_border_is_more_eyecatching(const css_unit_ctx *unit_len_ctx,
+				 const struct border *a,
+				 box_type a_src,
+				 const struct border *b,
+				 box_type b_src)
 {
-	unsigned int i, j;
-	struct column *col;
-	struct box *row_group, *row, *cell;
+	css_fixed awidth, bwidth;
+	int impact = 0;
 
-	if (table->col)
-		/* table->col already constructed, for example frameset table */
+	/* See CSS 2.1 $17.6.2.1 */
+
+	/* 1 + 2 -- hidden beats everything, none beats nothing */
+	if (a->style == CSS_BORDER_STYLE_HIDDEN ||
+	    b->style == CSS_BORDER_STYLE_NONE)
+		return false;
+
+	if (b->style == CSS_BORDER_STYLE_HIDDEN ||
+	    a->style == CSS_BORDER_STYLE_NONE)
 		return true;
 
-	table->col = col = talloc_array(table, struct column, table->columns);
-	if (!col)
+	/* 3a -- wider borders beat narrow ones */
+	/* The widths must be absolute, which will be the case
+	 * if they've come from a computed style. */
+	assert(a->unit != CSS_UNIT_EM && a->unit != CSS_UNIT_EX);
+	assert(b->unit != CSS_UNIT_EM && b->unit != CSS_UNIT_EX);
+	awidth = css_unit_len2device_px(NULL, unit_len_ctx, a->width, a->unit);
+	bwidth = css_unit_len2device_px(NULL, unit_len_ctx, b->width, b->unit);
+
+	if (awidth < bwidth)
+		return true;
+	else if (bwidth < awidth)
 		return false;
 
-	for (i = 0; i != table->columns; i++) {
-		col[i].type = COLUMN_WIDTH_UNKNOWN;
-		col[i].width = 0;
-		col[i].positioned = true;
+	/* 3b -- sort by style */
+	switch (a->style) {
+	case CSS_BORDER_STYLE_DOUBLE: impact++; fallthrough;
+	case CSS_BORDER_STYLE_SOLID:  impact++; fallthrough;
+	case CSS_BORDER_STYLE_DASHED: impact++; fallthrough;
+	case CSS_BORDER_STYLE_DOTTED: impact++; fallthrough;
+	case CSS_BORDER_STYLE_RIDGE:  impact++; fallthrough;
+	case CSS_BORDER_STYLE_OUTSET: impact++; fallthrough;
+	case CSS_BORDER_STYLE_GROOVE: impact++; fallthrough;
+	case CSS_BORDER_STYLE_INSET:  impact++; fallthrough;
+	default:
+		break;
 	}
 
-	/* 1st pass: cells with colspan 1 only */
-	for (row_group = table->children; row_group; row_group =row_group->next)
-	for (row = row_group->children; row; row = row->next)
-	for (cell = row->children; cell; cell = cell->next) {
-		enum css_width_e type;
-		css_fixed value = 0;
-		css_unit unit = CSS_UNIT_PX;
+	switch (b->style) {
+	case CSS_BORDER_STYLE_DOUBLE: impact--; fallthrough;
+	case CSS_BORDER_STYLE_SOLID:  impact--; fallthrough;
+	case CSS_BORDER_STYLE_DASHED: impact--; fallthrough;
+	case CSS_BORDER_STYLE_DOTTED: impact--; fallthrough;
+	case CSS_BORDER_STYLE_RIDGE:  impact--; fallthrough;
+	case CSS_BORDER_STYLE_OUTSET: impact--; fallthrough;
+	case CSS_BORDER_STYLE_GROOVE: impact--; fallthrough;
+	case CSS_BORDER_STYLE_INSET:  impact--; fallthrough;
+	default:
+		break;
+	}
 
-		assert(cell->type == BOX_TABLE_CELL);
-		assert(cell->style);
+	if (impact < 0)
+		return true;
+	else if (impact > 0)
+		return false;
 
-		if (cell->columns != 1)
-			continue;
-		i = cell->start_column;
+	/* 4a -- sort by origin */
+	impact = 0;
 
-		if (css_computed_position(cell->style) !=
-				CSS_POSITION_ABSOLUTE &&
-				css_computed_position(cell->style) !=
-				CSS_POSITION_FIXED) {
-			col[i].positioned = false;
-		}
+	/** \todo COL/COL_GROUP */
+	switch (a_src) {
+	case BOX_TABLE_CELL:       impact++; fallthrough;
+	case BOX_TABLE_ROW:        impact++; fallthrough;
+	case BOX_TABLE_ROW_GROUP:  impact++; fallthrough;
+	case BOX_TABLE:            impact++; fallthrough;
+	default:
+		break;
+	}
 
-		type = css_computed_width(cell->style, &value, &unit);
-
-		/* fixed width takes priority over any other width type */
-		if (col[i].type != COLUMN_WIDTH_FIXED &&
-				type == CSS_WIDTH_SET && unit != CSS_UNIT_PCT) {
-			col[i].type = COLUMN_WIDTH_FIXED;
-			col[i].width = FIXTOINT(nscss_len2px(len_ctx,
-					value, unit, cell->style));
-			if (col[i].width < 0)
-				col[i].width = 0;
-			continue;
-		}
+	/** \todo COL/COL_GROUP */
+	switch (b_src) {
+	case BOX_TABLE_CELL:       impact--; fallthrough;
+	case BOX_TABLE_ROW:        impact--; fallthrough;
+	case BOX_TABLE_ROW_GROUP:  impact--; fallthrough;
+	case BOX_TABLE:            impact--; fallthrough;
+	default:
+		break;
+	}
 
-		if (col[i].type != COLUMN_WIDTH_UNKNOWN)
-			continue;
+	if (impact < 0)
+		return true;
+	else if (impact > 0)
+		return false;
 
-		if (type == CSS_WIDTH_SET && unit == CSS_UNIT_PCT) {
-			col[i].type = COLUMN_WIDTH_PERCENT;
-			col[i].width = FIXTOINT(value);
-			if (col[i].width < 0)
-				col[i].width = 0;
-		} else if (type == CSS_WIDTH_AUTO) {
-			col[i].type = COLUMN_WIDTH_AUTO;
-		}
+	/* 4b -- furthest left (if direction: ltr) and towards top wins */
+	/** \todo Currently assumes b satisifies this */
+	return true;
+}
+
+
+/**
+ * Process a table
+ *
+ * \param unit_len_ctx  Length conversion context
+ * \param table    Table to process
+ * \param a        Current border style for cell
+ * \param a_src    Source of \a a
+ *
+ * \post \a a will be updated with most eyecatching style
+ * \post \a a_src will be updated also
+ */
+static void
+table_cell_top_process_table(const css_unit_ctx *unit_len_ctx,
+			     struct box *table,
+			     struct border *a,
+			     box_type *a_src)
+{
+	struct border b;
+	box_type b_src;
+
+	/* Top border of table */
+	b.style = css_computed_border_top_style(table->style);
+	b.color = css_computed_border_top_color(table->style, &b.c);
+	css_computed_border_top_width(table->style, &b.width, &b.unit);
+	b.width = css_unit_len2device_px(table->style, unit_len_ctx,
+			b.width, b.unit);
+	b.unit = CSS_UNIT_PX;
+	b_src = BOX_TABLE;
+
+	if (table_border_is_more_eyecatching(unit_len_ctx, a, *a_src, &b, b_src)) {
+		*a = b;
+		*a_src = b_src;
 	}
+}
 
-	/* 2nd pass: cells which span multiple columns */
-	for (row_group = table->children; row_group; row_group =row_group->next)
-	for (row = row_group->children; row; row = row->next)
-	for (cell = row->children; cell; cell = cell->next) {
-		unsigned int fixed_columns = 0, percent_columns = 0,
-				auto_columns = 0, unknown_columns = 0;
-		int fixed_width = 0, percent_width = 0;
-		enum css_width_e type;
-		css_fixed value = 0;
-		css_unit unit = CSS_UNIT_PX;
 
-		if (cell->columns == 1)
-			continue;
-		i = cell->start_column;
+/**
+ * Process a row
+ *
+ * \param unit_len_ctx  Length conversion context
+ * \param cell     Cell being considered
+ * \param row      Row to process
+ * \param a        Current border style for cell
+ * \param a_src    Source of \a a
+ * \return true if row has cells, false otherwise
+ *
+ * \post \a a will be updated with most eyecatching style
+ * \post \a a_src will be updated also
+ */
+static bool
+table_cell_top_process_row(const css_unit_ctx *unit_len_ctx,
+			   struct box *cell,
+			   struct box *row,
+			   struct border *a,
+			   box_type *a_src)
+{
+	struct border b;
+	box_type b_src;
+
+	/* Bottom border of row */
+	b.style = css_computed_border_bottom_style(row->style);
+	b.color = css_computed_border_bottom_color(row->style, &b.c);
+	css_computed_border_bottom_width(row->style, &b.width, &b.unit);
+	b.width = css_unit_len2device_px(row->style, unit_len_ctx,
+			b.width, b.unit);
+	b.unit = CSS_UNIT_PX;
+	b_src = BOX_TABLE_ROW;
 
-		for (j = i; j < i + cell->columns; j++) {
-			col[j].positioned = false;
-		}
+	if (table_border_is_more_eyecatching(unit_len_ctx, a, *a_src, &b, b_src)) {
+		*a = b;
+		*a_src = b_src;
+	}
 
-		/* count column types in spanned cells */
-		for (j = 0; j != cell->columns; j++) {
-			if (col[i + j].type == COLUMN_WIDTH_FIXED) {
-				fixed_width += col[i + j].width;
-				fixed_columns++;
-			} else if (col[i + j].type == COLUMN_WIDTH_PERCENT) {
-				percent_width += col[i + j].width;
-				percent_columns++;
-			} else if (col[i + j].type == COLUMN_WIDTH_AUTO) {
-				auto_columns++;
-			} else {
-				unknown_columns++;
-			}
+	if (row->children == NULL) {
+		/* Row is empty, so consider its top border */
+		b.style = css_computed_border_top_style(row->style);
+		b.color = css_computed_border_top_color(row->style, &b.c);
+		css_computed_border_top_width(row->style, &b.width, &b.unit);
+		b.width = css_unit_len2device_px(row->style, unit_len_ctx,
+				b.width, b.unit);
+		b.unit = CSS_UNIT_PX;
+		b_src = BOX_TABLE_ROW;
+
+		if (table_border_is_more_eyecatching(unit_len_ctx,
+						     a, *a_src, &b, b_src)) {
+			*a = b;
+			*a_src = b_src;
 		}
 
-		if (!unknown_columns)
-			continue;
-
-		type = css_computed_width(cell->style, &value, &unit);
-
-		/* if cell is fixed width, and all spanned columns are fixed
-		 * or unknown width, split extra width among unknown columns */
-		if (type == CSS_WIDTH_SET && unit != CSS_UNIT_PCT &&
-				fixed_columns + unknown_columns ==
-				cell->columns) {
-			int width = (FIXTOFLT(nscss_len2px(len_ctx, value, unit,
-					cell->style)) -	fixed_width) /
-					unknown_columns;
-			if (width < 0)
-				width = 0;
-			for (j = 0; j != cell->columns; j++) {
-				if (col[i + j].type == COLUMN_WIDTH_UNKNOWN) {
-					col[i + j].type = COLUMN_WIDTH_FIXED;
-					col[i + j].width = width;
+		return false;
+	} else {
+		/* Process cells that are directly above the cell being
+		 * considered. They may not be in this row, but in one of the
+		 * rows above it in the case where rowspan > 1. */
+		struct box *c;
+		bool processed = false;
+
+		while (processed == false) {
+			for (c = row->children; c != NULL; c = c->next) {
+				/* Ignore cells to the left */
+				if (c->start_column + c->columns - 1 <
+				    cell->start_column)
+					continue;
+				/* Ignore cells to the right */
+				if (c->start_column > cell->start_column +
+				    cell->columns - 1)
+					continue;
+
+				/* Flag that we've processed a cell */
+				processed = true;
+
+				/* Consider bottom border */
+				b.style = css_computed_border_bottom_style(
+							c->style);
+				b.color = css_computed_border_bottom_color(
+							c->style, &b.c);
+				css_computed_border_bottom_width(c->style,
+							&b.width, &b.unit);
+				b.width = css_unit_len2device_px(
+						c->style, unit_len_ctx,
+						b.width, b.unit);
+				b.unit = CSS_UNIT_PX;
+				b_src = BOX_TABLE_CELL;
+
+				if (table_border_is_more_eyecatching(unit_len_ctx,
+								     a,
+								     *a_src,
+								     &b,
+								     b_src)) {
+					*a = b;
+					*a_src = b_src;
 				}
 			}
-		}
 
-		/* as above for percentage width */
-		if (type == CSS_WIDTH_SET && unit == CSS_UNIT_PCT &&
-				percent_columns + unknown_columns ==
-				cell->columns) {
-			int width = (FIXTOFLT(value) -
-					percent_width) / unknown_columns;
-			if (width < 0)
-				width = 0;
-			for (j = 0; j != cell->columns; j++) {
-				if (col[i + j].type == COLUMN_WIDTH_UNKNOWN) {
-					col[i + j].type = COLUMN_WIDTH_PERCENT;
-					col[i + j].width = width;
-				}
+			if (processed == false) {
+				/* There must be a preceding row */
+				assert(row->prev != NULL);
+
+				row = row->prev;
 			}
 		}
 	}
 
-	/* use AUTO if no width type was specified */
-	for (i = 0; i != table->columns; i++) {
-		if (col[i].type == COLUMN_WIDTH_UNKNOWN)
-			col[i].type = COLUMN_WIDTH_AUTO;
-	}
-
-#ifdef TABLE_DEBUG
-	for (i = 0; i != table->columns; i++)
-		NSLOG(netsurf, INFO,
-		      "table %p, column %u: type %s, width %i", table, i, ((const char *[]){
-			"UNKNOWN",
-			"FIXED",
-			"AUTO",
-			"PERCENT",
-			"RELATIVE",
-				})[col[i].type], col[i].width);
-#endif
-
 	return true;
 }
 
+
 /**
- * Calculate used values of border-{trbl}-{style,color,width} for table cells.
+ * Process a group
  *
- * \param len_ctx  Length conversion context
- * \param cell     Table cell to consider
+ * \param unit_len_ctx  Length conversion context
+ * \param cell     Cell being considered
+ * \param group    Group to process
+ * \param a        Current border style for cell
+ * \param a_src    Source of \a a
+ * \return true if group has non-empty rows, false otherwise
  *
- * \post \a cell's border array is populated
+ * \post \a a will be updated with most eyecatching style
+ * \post \a a_src will be updated also
  */
-void table_used_border_for_cell(
-		const nscss_len_ctx *len_ctx,
-		struct box *cell)
+static bool
+table_cell_top_process_group(const css_unit_ctx *unit_len_ctx,
+			     struct box *cell,
+			     struct box *group,
+			     struct border *a,
+			     box_type *a_src)
 {
-	int side;
-
-	assert(cell->type == BOX_TABLE_CELL);
-
-	if (css_computed_border_collapse(cell->style) ==
-			CSS_BORDER_COLLAPSE_SEPARATE) {
-		css_fixed width = 0;
-		css_unit unit = CSS_UNIT_PX;
+	struct border b;
+	box_type b_src;
 
-		/* Left border */
-		cell->border[LEFT].style =
-				css_computed_border_left_style(cell->style);
-		css_computed_border_left_color(cell->style,
-				&cell->border[LEFT].c);
-		css_computed_border_left_width(cell->style, &width, &unit);
-		cell->border[LEFT].width =
-			FIXTOINT(nscss_len2px(len_ctx,
-					width, unit, cell->style));
+	/* Bottom border of group */
+	b.style = css_computed_border_bottom_style(group->style);
+	b.color = css_computed_border_bottom_color(group->style, &b.c);
+	css_computed_border_bottom_width(group->style, &b.width, &b.unit);
+	b.width = css_unit_len2device_px(group->style, unit_len_ctx,
+			b.width, b.unit);
+	b.unit = CSS_UNIT_PX;
+	b_src = BOX_TABLE_ROW_GROUP;
 
-		/* Top border */
-		cell->border[TOP].style =
-				css_computed_border_top_style(cell->style);
-		css_computed_border_top_color(cell->style,
-				&cell->border[TOP].c);
-		css_computed_border_top_width(cell->style, &width, &unit);
-		cell->border[TOP].width =
-			FIXTOINT(nscss_len2px(len_ctx,
-					width, unit, cell->style));
+	if (table_border_is_more_eyecatching(unit_len_ctx, a, *a_src, &b, b_src)) {
+		*a = b;
+		*a_src = b_src;
+	}
 
-		/* Right border */
-		cell->border[RIGHT].style =
-				css_computed_border_right_style(cell->style);
-		css_computed_border_right_color(cell->style,
-				&cell->border[RIGHT].c);
-		css_computed_border_right_width(cell->style, &width, &unit);
-		cell->border[RIGHT].width =
-			FIXTOINT(nscss_len2px(len_ctx,
-					width, unit, cell->style));
+	if (group->last != NULL) {
+		/* Process rows in group, starting with last */
+		struct box *row = group->last;
 
-		/* Bottom border */
-		cell->border[BOTTOM].style =
-				css_computed_border_bottom_style(cell->style);
-		css_computed_border_bottom_color(cell->style,
-				&cell->border[BOTTOM].c);
-		css_computed_border_bottom_width(cell->style, &width, &unit);
-		cell->border[BOTTOM].width =
-			FIXTOINT(nscss_len2px(len_ctx,
-					width, unit, cell->style));
+		while (table_cell_top_process_row(unit_len_ctx, cell, row,
+						  a, a_src) == false) {
+			if (row->prev == NULL) {
+				return false;
+			} else {
+				row = row->prev;
+			}
+		}
 	} else {
-		/* Left border */
-		table_used_left_border_for_cell(len_ctx, cell);
-
-		/* Top border */
-		table_used_top_border_for_cell(len_ctx, cell);
+		/* Group is empty, so consider its top border */
+		b.style = css_computed_border_top_style(group->style);
+		b.color = css_computed_border_top_color(group->style, &b.c);
+		css_computed_border_top_width(group->style, &b.width, &b.unit);
+		b.width = css_unit_len2device_px(group->style, unit_len_ctx,
+				b.width, b.unit);
+		b.unit = CSS_UNIT_PX;
+		b_src = BOX_TABLE_ROW_GROUP;
 
-		/* Right border */
-		table_used_right_border_for_cell(len_ctx, cell);
+		if (table_border_is_more_eyecatching(unit_len_ctx,
+						     a, *a_src, &b, b_src)) {
+			*a = b;
+			*a_src = b_src;
+		}
 
-		/* Bottom border */
-		table_used_bottom_border_for_cell(len_ctx, cell);
+		return false;
 	}
 
-	/* Finally, ensure that any borders configured as
-	 * hidden or none have zero width. (c.f. layout_find_dimensions) */
-	for (side = 0; side != 4; side++) {
-		if (cell->border[side].style == CSS_BORDER_STYLE_HIDDEN ||
-				cell->border[side].style ==
-				CSS_BORDER_STYLE_NONE)
-			cell->border[side].width = 0;
-	}
+	return true;
 }
 
-/******************************************************************************
- * Helpers for used border calculations                                       *
- ******************************************************************************/
 
 /**
  * Calculate used values of border-left-{style,color,width}
  *
- * \param len_ctx  Length conversion context
+ * \param unit_len_ctx  Length conversion context
  * \param cell     Table cell to consider
  */
-void table_used_left_border_for_cell(
-		const nscss_len_ctx *len_ctx,
-		struct box *cell)
+static void
+table_used_left_border_for_cell(const css_unit_ctx *unit_len_ctx, struct box *cell)
 {
 	struct border a, b;
 	box_type a_src, b_src;
@@ -366,7 +395,8 @@ void table_used_left_border_for_cell(
 	a.style = css_computed_border_left_style(cell->style);
 	a.color = css_computed_border_left_color(cell->style, &a.c);
 	css_computed_border_left_width(cell->style, &a.width, &a.unit);
-	a.width = nscss_len2px(len_ctx, a.width, a.unit, cell->style);
+	a.width = css_unit_len2device_px(cell->style, unit_len_ctx,
+			a.width, a.unit);
 	a.unit = CSS_UNIT_PX;
 	a_src = BOX_TABLE_CELL;
 
@@ -380,10 +410,10 @@ void table_used_left_border_for_cell(
 			/* Spanned from a previous row in current row group */
 			for (row = cell->parent; row != NULL; row = row->prev) {
 				for (prev = row->children; prev != NULL;
-						prev = prev->next) {
+				     prev = prev->next) {
 					if (prev->start_column +
-							prev->columns ==
-							cell->start_column)
+					    prev->columns ==
+					    cell->start_column)
 						break;
 				}
 
@@ -399,12 +429,13 @@ void table_used_left_border_for_cell(
 		b.style = css_computed_border_right_style(prev->style);
 		b.color = css_computed_border_right_color(prev->style, &b.c);
 		css_computed_border_right_width(prev->style, &b.width, &b.unit);
-		b.width = nscss_len2px(len_ctx, b.width, b.unit, prev->style);
+		b.width = css_unit_len2device_px(prev->style, unit_len_ctx,
+				b.width, b.unit);
 		b.unit = CSS_UNIT_PX;
 		b_src = BOX_TABLE_CELL;
 
-		if (table_border_is_more_eyecatching(len_ctx,
-				&a, a_src, &b, b_src)) {
+		if (table_border_is_more_eyecatching(unit_len_ctx,
+						     &a, a_src, &b, b_src)) {
 			a = b;
 			a_src = b_src;
 		}
@@ -419,16 +450,17 @@ void table_used_left_border_for_cell(
 			/* Spanned rows -- consider their left border */
 			b.style = css_computed_border_left_style(row->style);
 			b.color = css_computed_border_left_color(
-					row->style, &b.c);
+								 row->style, &b.c);
 			css_computed_border_left_width(
-					row->style, &b.width, &b.unit);
-			b.width = nscss_len2px(len_ctx,
-					b.width, b.unit, row->style);
+						       row->style, &b.width, &b.unit);
+			b.width = css_unit_len2device_px(
+					row->style, unit_len_ctx,
+					b.width, b.unit);
 			b.unit = CSS_UNIT_PX;
 			b_src = BOX_TABLE_ROW;
 
-			if (table_border_is_more_eyecatching(len_ctx,
-					&a, a_src, &b, b_src)) {
+			if (table_border_is_more_eyecatching(unit_len_ctx,
+							     &a, a_src, &b, b_src)) {
 				a = b;
 				a_src = b_src;
 			}
@@ -442,12 +474,13 @@ void table_used_left_border_for_cell(
 		b.style = css_computed_border_left_style(group->style);
 		b.color = css_computed_border_left_color(group->style, &b.c);
 		css_computed_border_left_width(group->style, &b.width, &b.unit);
-		b.width = nscss_len2px(len_ctx, b.width, b.unit, group->style);
+		b.width = css_unit_len2device_px(group->style, unit_len_ctx,
+				b.width, b.unit);
 		b.unit = CSS_UNIT_PX;
 		b_src = BOX_TABLE_ROW_GROUP;
 
-		if (table_border_is_more_eyecatching(len_ctx,
-				&a, a_src, &b, b_src)) {
+		if (table_border_is_more_eyecatching(unit_len_ctx,
+						     &a, a_src, &b, b_src)) {
 			a = b;
 			a_src = b_src;
 		}
@@ -456,12 +489,13 @@ void table_used_left_border_for_cell(
 		b.style = css_computed_border_left_style(table->style);
 		b.color = css_computed_border_left_color(table->style, &b.c);
 		css_computed_border_left_width(table->style, &b.width, &b.unit);
-		b.width = nscss_len2px(len_ctx, b.width, b.unit, table->style);
+		b.width = css_unit_len2device_px(table->style, unit_len_ctx,
+				b.width, b.unit);
 		b.unit = CSS_UNIT_PX;
 		b_src = BOX_TABLE;
 
-		if (table_border_is_more_eyecatching(len_ctx,
-				&a, a_src, &b, b_src)) {
+		if (table_border_is_more_eyecatching(unit_len_ctx,
+						     &a, a_src, &b, b_src)) {
 			a = b;
 			a_src = b_src;
 		}
@@ -470,19 +504,19 @@ void table_used_left_border_for_cell(
 	/* a now contains the used left border for the cell */
 	cell->border[LEFT].style = a.style;
 	cell->border[LEFT].c = a.c;
-	cell->border[LEFT].width = FIXTOINT(nscss_len2px(len_ctx,
-					a.width, a.unit, cell->style));
+	cell->border[LEFT].width = FIXTOINT(css_unit_len2device_px(
+			cell->style, unit_len_ctx, a.width, a.unit));
 }
 
+
 /**
  * Calculate used values of border-top-{style,color,width}
  *
- * \param len_ctx  Length conversion context
+ * \param unit_len_ctx  Length conversion context
  * \param cell     Table cell to consider
  */
-void table_used_top_border_for_cell(
-		const nscss_len_ctx *len_ctx,
-		struct box *cell)
+static void
+table_used_top_border_for_cell(const css_unit_ctx *unit_len_ctx, struct box *cell)
 {
 	struct border a, b;
 	box_type a_src, b_src;
@@ -493,7 +527,8 @@ void table_used_top_border_for_cell(
 	a.style = css_computed_border_top_style(cell->style);
 	css_computed_border_top_color(cell->style, &a.c);
 	css_computed_border_top_width(cell->style, &a.width, &a.unit);
-	a.width = nscss_len2px(len_ctx, a.width, a.unit, cell->style);
+	a.width = css_unit_len2device_px(cell->style, unit_len_ctx,
+			a.width, a.unit);
 	a.unit = CSS_UNIT_PX;
 	a_src = BOX_TABLE_CELL;
 
@@ -501,19 +536,20 @@ void table_used_top_border_for_cell(
 	b.style = css_computed_border_top_style(row->style);
 	css_computed_border_top_color(row->style, &b.c);
 	css_computed_border_top_width(row->style, &b.width, &b.unit);
-	b.width = nscss_len2px(len_ctx, b.width, b.unit, row->style);
+	b.width = css_unit_len2device_px(row->style, unit_len_ctx,
+			b.width, b.unit);
 	b.unit = CSS_UNIT_PX;
 	b_src = BOX_TABLE_ROW;
 
-	if (table_border_is_more_eyecatching(len_ctx, &a, a_src, &b, b_src)) {
+	if (table_border_is_more_eyecatching(unit_len_ctx, &a, a_src, &b, b_src)) {
 		a = b;
 		a_src = b_src;
 	}
 
 	if (row->prev != NULL) {
 		/* Consider row(s) above */
-		while (table_cell_top_process_row(len_ctx, cell, row->prev,
-				&a, &a_src) == false) {
+		while (table_cell_top_process_row(unit_len_ctx, cell, row->prev,
+						  &a, &a_src) == false) {
 			if (row->prev->prev == NULL) {
 				/* Consider row group */
 				process_group = true;
@@ -533,30 +569,31 @@ void table_used_top_border_for_cell(
 		b.style = css_computed_border_top_style(group->style);
 		b.color = css_computed_border_top_color(group->style, &b.c);
 		css_computed_border_top_width(group->style, &b.width, &b.unit);
-		b.width = nscss_len2px(len_ctx, b.width, b.unit, group->style);
+		b.width = css_unit_len2device_px(group->style, unit_len_ctx,
+				b.width, b.unit);
 		b.unit = CSS_UNIT_PX;
 		b_src = BOX_TABLE_ROW_GROUP;
 
-		if (table_border_is_more_eyecatching(len_ctx,
-				&a, a_src, &b, b_src)) {
+		if (table_border_is_more_eyecatching(unit_len_ctx,
+						     &a, a_src, &b, b_src)) {
 			a = b;
 			a_src = b_src;
 		}
 
 		if (group->prev == NULL) {
 			/* Top border of table */
-			table_cell_top_process_table(len_ctx,
-					group->parent, &a, &a_src);
+			table_cell_top_process_table(unit_len_ctx,
+						     group->parent, &a, &a_src);
 		} else {
 			/* Process previous group(s) */
-			while (table_cell_top_process_group(len_ctx,
-					cell, group->prev,
-					&a, &a_src) == false) {
+			while (table_cell_top_process_group(unit_len_ctx,
+							    cell, group->prev,
+							    &a, &a_src) == false) {
 				if (group->prev->prev == NULL) {
 					/* Top border of table */
-					table_cell_top_process_table(len_ctx,
-							group->parent,
-							&a, &a_src);
+					table_cell_top_process_table(unit_len_ctx,
+								     group->parent,
+								     &a, &a_src);
 					break;
 				} else {
 					group = group->prev;
@@ -568,19 +605,18 @@ void table_used_top_border_for_cell(
 	/* a now contains the used top border for the cell */
 	cell->border[TOP].style = a.style;
 	cell->border[TOP].c = a.c;
-	cell->border[TOP].width = FIXTOINT(nscss_len2px(len_ctx,
-			a.width, a.unit, cell->style));
+	cell->border[TOP].width = FIXTOINT(css_unit_len2device_px(
+			cell->style, unit_len_ctx, a.width, a.unit));
 }
 
 /**
  * Calculate used values of border-right-{style,color,width}
  *
- * \param len_ctx  Length conversion context
+ * \param unit_len_ctx  Length conversion context
  * \param cell     Table cell to consider
  */
-void table_used_right_border_for_cell(
-		const nscss_len_ctx *len_ctx,
-		struct box *cell)
+static void
+table_used_right_border_for_cell(const css_unit_ctx *unit_len_ctx, struct box *cell)
 {
 	struct border a, b;
 	box_type a_src, b_src;
@@ -591,12 +627,13 @@ void table_used_right_border_for_cell(
 	a.style = css_computed_border_right_style(cell->style);
 	css_computed_border_right_color(cell->style, &a.c);
 	css_computed_border_right_width(cell->style, &a.width, &a.unit);
-	a.width = nscss_len2px(len_ctx, a.width, a.unit, cell->style);
+	a.width = css_unit_len2device_px(cell->style, unit_len_ctx,
+			a.width, a.unit);
 	a.unit = CSS_UNIT_PX;
 	a_src = BOX_TABLE_CELL;
 
 	if (cell->next != NULL || cell->start_column + cell->columns !=
-			cell->parent->parent->parent->columns) {
+	    cell->parent->parent->parent->columns) {
 		/* Cell is not at right edge of table -- no right border */
 		a.style = CSS_BORDER_STYLE_NONE;
 		a.width = 0;
@@ -611,17 +648,20 @@ void table_used_right_border_for_cell(
 		while (rows-- > 0 && row != NULL) {
 			/* Spanned rows -- consider their right border */
 			b.style = css_computed_border_right_style(row->style);
-			b.color = css_computed_border_right_color(
-					row->style, &b.c);
-			css_computed_border_right_width(
-					row->style, &b.width, &b.unit);
-			b.width = nscss_len2px(len_ctx,
-					b.width, b.unit, row->style);
+			b.color = css_computed_border_right_color(row->style,
+								  &b.c);
+			css_computed_border_right_width(row->style,
+							&b.width,
+							&b.unit);
+			b.width = css_unit_len2device_px(
+					row->style, unit_len_ctx,
+					b.width, b.unit);
 			b.unit = CSS_UNIT_PX;
 			b_src = BOX_TABLE_ROW;
 
-			if (table_border_is_more_eyecatching(len_ctx,
-					&a, a_src, &b, b_src)) {
+			if (table_border_is_more_eyecatching(unit_len_ctx,
+							     &a, a_src,
+							     &b, b_src)) {
 				a = b;
 				a_src = b_src;
 			}
@@ -635,13 +675,14 @@ void table_used_right_border_for_cell(
 		b.style = css_computed_border_right_style(group->style);
 		b.color = css_computed_border_right_color(group->style, &b.c);
 		css_computed_border_right_width(group->style,
-				&b.width, &b.unit);
-		b.width = nscss_len2px(len_ctx, b.width, b.unit, group->style);
+						&b.width, &b.unit);
+		b.width = css_unit_len2device_px(group->style, unit_len_ctx,
+				b.width, b.unit);
 		b.unit = CSS_UNIT_PX;
 		b_src = BOX_TABLE_ROW_GROUP;
 
-		if (table_border_is_more_eyecatching(len_ctx,
-				&a, a_src, &b, b_src)) {
+		if (table_border_is_more_eyecatching(unit_len_ctx,
+						     &a, a_src, &b, b_src)) {
 			a = b;
 			a_src = b_src;
 		}
@@ -650,13 +691,15 @@ void table_used_right_border_for_cell(
 		b.style = css_computed_border_right_style(table->style);
 		b.color = css_computed_border_right_color(table->style, &b.c);
 		css_computed_border_right_width(table->style,
-				&b.width, &b.unit);
-		b.width = nscss_len2px(len_ctx, b.width, b.unit, table->style);
+						&b.width, &b.unit);
+		b.width = css_unit_len2device_px(table->style, unit_len_ctx,
+				b.width, b.unit);
 		b.unit = CSS_UNIT_PX;
 		b_src = BOX_TABLE;
 
-		if (table_border_is_more_eyecatching(len_ctx,
-				&a, a_src, &b, b_src)) {
+		if (table_border_is_more_eyecatching(unit_len_ctx,
+						     &a, a_src,
+						     &b, b_src)) {
 			a = b;
 			a_src = b_src;
 		}
@@ -665,19 +708,20 @@ void table_used_right_border_for_cell(
 	/* a now contains the used right border for the cell */
 	cell->border[RIGHT].style = a.style;
 	cell->border[RIGHT].c = a.c;
-	cell->border[RIGHT].width = FIXTOINT(nscss_len2px(len_ctx,
-			a.width, a.unit, cell->style));
+	cell->border[RIGHT].width = FIXTOINT(css_unit_len2device_px(
+			cell->style, unit_len_ctx, a.width, a.unit));
 }
 
+
 /**
  * Calculate used values of border-bottom-{style,color,width}
  *
- * \param len_ctx  Length conversion context
+ * \param unit_len_ctx  Length conversion context
  * \param cell     Table cell to consider
  */
-void table_used_bottom_border_for_cell(
-		const nscss_len_ctx *len_ctx,
-		struct box *cell)
+static void
+table_used_bottom_border_for_cell(const css_unit_ctx *unit_len_ctx,
+				  struct box *cell)
 {
 	struct border a, b;
 	box_type a_src, b_src;
@@ -688,7 +732,8 @@ void table_used_bottom_border_for_cell(
 	a.style = css_computed_border_bottom_style(cell->style);
 	css_computed_border_bottom_color(cell->style, &a.c);
 	css_computed_border_bottom_width(cell->style, &a.width, &a.unit);
-	a.width = nscss_len2px(len_ctx, a.width, a.unit, cell->style);
+	a.width = css_unit_len2device_px(cell->style, unit_len_ctx,
+			a.width, a.unit);
 	a.unit = CSS_UNIT_PX;
 	a_src = BOX_TABLE_CELL;
 
@@ -712,12 +757,13 @@ void table_used_bottom_border_for_cell(
 		b.style = css_computed_border_bottom_style(row->style);
 		b.color = css_computed_border_bottom_color(row->style, &b.c);
 		css_computed_border_bottom_width(row->style, &b.width, &b.unit);
-		b.width = nscss_len2px(len_ctx, b.width, b.unit, row->style);
+		b.width = css_unit_len2device_px(row->style, unit_len_ctx,
+				b.width, b.unit);
 		b.unit = CSS_UNIT_PX;
 		b_src = BOX_TABLE_ROW;
 
-		if (table_border_is_more_eyecatching(len_ctx,
-				&a, a_src, &b, b_src)) {
+		if (table_border_is_more_eyecatching(unit_len_ctx,
+						     &a, a_src, &b, b_src)) {
 			a = b;
 			a_src = b_src;
 		}
@@ -726,13 +772,14 @@ void table_used_bottom_border_for_cell(
 		b.style = css_computed_border_bottom_style(group->style);
 		b.color = css_computed_border_bottom_color(group->style, &b.c);
 		css_computed_border_bottom_width(group->style,
-				&b.width, &b.unit);
-		b.width = nscss_len2px(len_ctx, b.width, b.unit, group->style);
+						 &b.width, &b.unit);
+		b.width = css_unit_len2device_px(group->style, unit_len_ctx,
+				b.width, b.unit);
 		b.unit = CSS_UNIT_PX;
 		b_src = BOX_TABLE_ROW_GROUP;
 
-		if (table_border_is_more_eyecatching(len_ctx,
-				&a, a_src, &b, b_src)) {
+		if (table_border_is_more_eyecatching(unit_len_ctx,
+						     &a, a_src, &b, b_src)) {
 			a = b;
 			a_src = b_src;
 		}
@@ -741,13 +788,14 @@ void table_used_bottom_border_for_cell(
 		b.style = css_computed_border_bottom_style(table->style);
 		b.color = css_computed_border_bottom_color(table->style, &b.c);
 		css_computed_border_bottom_width(table->style,
-				&b.width, &b.unit);
-		b.width = nscss_len2px(len_ctx, b.width, b.unit, table->style);
+						 &b.width, &b.unit);
+		b.width = css_unit_len2device_px(table->style, unit_len_ctx,
+				b.width, b.unit);
 		b.unit = CSS_UNIT_PX;
 		b_src = BOX_TABLE;
 
-		if (table_border_is_more_eyecatching(len_ctx,
-				&a, a_src, &b, b_src)) {
+		if (table_border_is_more_eyecatching(unit_len_ctx,
+						     &a, a_src, &b, b_src)) {
 			a = b;
 		}
 	}
@@ -755,326 +803,262 @@ void table_used_bottom_border_for_cell(
 	/* a now contains the used bottom border for the cell */
 	cell->border[BOTTOM].style = a.style;
 	cell->border[BOTTOM].c = a.c;
-	cell->border[BOTTOM].width = FIXTOINT(nscss_len2px(len_ctx,
-			a.width, a.unit, cell->style));
+	cell->border[BOTTOM].width = FIXTOINT(css_unit_len2device_px(
+			cell->style, unit_len_ctx, a.width, a.unit));
 }
 
-/**
- * Determine if a border style is more eyecatching than another
- *
- * \param len_ctx  Length conversion context
- * \param a        Reference border style
- * \param a_src    Source of \a a
- * \param b        Candidate border style
- * \param b_src    Source of \a b
- * \return True if \a b is more eyecatching than \a a
- */
-bool table_border_is_more_eyecatching(
-		const nscss_len_ctx *len_ctx,
-		const struct border *a,
-		box_type a_src,
-		const struct border *b,
-		box_type b_src)
-{
-	css_fixed awidth, bwidth;
-	int impact = 0;
-
-	/* See CSS 2.1 $17.6.2.1 */
 
-	/* 1 + 2 -- hidden beats everything, none beats nothing */
-	if (a->style == CSS_BORDER_STYLE_HIDDEN ||
-			b->style == CSS_BORDER_STYLE_NONE)
-		return false;
+/* exported interface documented in html/table.h */
+bool
+table_calculate_column_types(const css_unit_ctx *unit_len_ctx, struct box *table)
+{
+	unsigned int i, j;
+	struct column *col;
+	struct box *row_group, *row, *cell;
 
-	if (b->style == CSS_BORDER_STYLE_HIDDEN ||
-			a->style == CSS_BORDER_STYLE_NONE)
+	if (table->col)
+		/* table->col already constructed, for example frameset table */
 		return true;
 
-	/* 3a -- wider borders beat narrow ones */
-	/* The widths must be absolute, which will be the case
-	 * if they've come from a computed style. */
-	assert(a->unit != CSS_UNIT_EM && a->unit != CSS_UNIT_EX);
-	assert(b->unit != CSS_UNIT_EM && b->unit != CSS_UNIT_EX);
-	awidth = nscss_len2px(len_ctx, a->width, a->unit, NULL);
-	bwidth = nscss_len2px(len_ctx, b->width, b->unit, NULL);
-
-	if (awidth < bwidth)
-		return true;
-	else if (bwidth < awidth)
+	table->col = col = talloc_array(table, struct column, table->columns);
+	if (!col)
 		return false;
 
-	/* 3b -- sort by style */
-	switch (a->style) {
-	case CSS_BORDER_STYLE_DOUBLE: impact++; /* Fall through */
-	case CSS_BORDER_STYLE_SOLID:  impact++; /* Fall through */
-	case CSS_BORDER_STYLE_DASHED: impact++; /* Fall through */
-	case CSS_BORDER_STYLE_DOTTED: impact++; /* Fall through */
-	case CSS_BORDER_STYLE_RIDGE:  impact++; /* Fall through */
-	case CSS_BORDER_STYLE_OUTSET: impact++; /* Fall through */
-	case CSS_BORDER_STYLE_GROOVE: impact++; /* Fall through */
-	case CSS_BORDER_STYLE_INSET:  impact++; /* Fall through */
-	default:
-		break;
-	}
-
-	switch (b->style) {
-	case CSS_BORDER_STYLE_DOUBLE: impact--; /* Fall through */
-	case CSS_BORDER_STYLE_SOLID:  impact--; /* Fall through */
-	case CSS_BORDER_STYLE_DASHED: impact--; /* Fall through */
-	case CSS_BORDER_STYLE_DOTTED: impact--; /* Fall through */
-	case CSS_BORDER_STYLE_RIDGE:  impact--; /* Fall through */
-	case CSS_BORDER_STYLE_OUTSET: impact--; /* Fall through */
-	case CSS_BORDER_STYLE_GROOVE: impact--; /* Fall through */
-	case CSS_BORDER_STYLE_INSET:  impact--; /* Fall through */
-	default:
-		break;
+	for (i = 0; i != table->columns; i++) {
+		col[i].type = COLUMN_WIDTH_UNKNOWN;
+		col[i].width = 0;
+		col[i].positioned = true;
 	}
 
-	if (impact < 0)
-		return true;
-	else if (impact > 0)
-		return false;
-
-	/* 4a -- sort by origin */
-	impact = 0;
-
-	/** \todo COL/COL_GROUP */
-	switch (a_src) {
-	case BOX_TABLE_CELL:       impact++; /* Fall through */
-	case BOX_TABLE_ROW:        impact++; /* Fall through */
-	case BOX_TABLE_ROW_GROUP:  impact++; /* Fall through */
-	case BOX_TABLE:            impact++; /* Fall through */
-	default:
-		break;
-	}
+	/* 1st pass: cells with colspan 1 only */
+	for (row_group = table->children; row_group; row_group =row_group->next)
+		for (row = row_group->children; row; row = row->next)
+			for (cell = row->children; cell; cell = cell->next) {
+				enum css_width_e type;
+				css_fixed value = 0;
+				css_unit unit = CSS_UNIT_PX;
 
-	/** \todo COL/COL_GROUP */
-	switch (b_src) {
-	case BOX_TABLE_CELL:       impact--; /* Fall through */
-	case BOX_TABLE_ROW:        impact--; /* Fall through */
-	case BOX_TABLE_ROW_GROUP:  impact--; /* Fall through */
-	case BOX_TABLE:            impact--; /* Fall through */
-	default:
-		break;
-	}
+				assert(cell->type == BOX_TABLE_CELL);
+				assert(cell->style);
 
-	if (impact < 0)
-		return true;
-	else if (impact > 0)
-		return false;
+				if (cell->columns != 1)
+					continue;
+				i = cell->start_column;
 
-	/* 4b -- furthest left (if direction: ltr) and towards top wins */
-	/** \todo Currently assumes b satisifies this */
-	return true;
-}
+				if (css_computed_position(cell->style) !=
+				    CSS_POSITION_ABSOLUTE &&
+				    css_computed_position(cell->style) !=
+				    CSS_POSITION_FIXED) {
+					col[i].positioned = false;
+				}
 
-/******************************************************************************
- * Helpers for top border collapsing                                          *
- ******************************************************************************/
+				type = css_computed_width(cell->style, &value, &unit);
+
+				/* fixed width takes priority over any other width type */
+				if (col[i].type != COLUMN_WIDTH_FIXED &&
+				    type == CSS_WIDTH_SET && unit != CSS_UNIT_PCT) {
+					col[i].type = COLUMN_WIDTH_FIXED;
+					col[i].width = FIXTOINT(css_unit_len2device_px(
+							cell->style,
+							unit_len_ctx,
+							value, unit));
+					if (col[i].width < 0)
+						col[i].width = 0;
+					continue;
+				}
 
-/**
- * Process a table
- *
- * \param len_ctx  Length conversion context
- * \param table    Table to process
- * \param a        Current border style for cell
- * \param a_src    Source of \a a
- *
- * \post \a a will be updated with most eyecatching style
- * \post \a a_src will be updated also
- */
-void table_cell_top_process_table(
-		const nscss_len_ctx *len_ctx,
-		struct box *table,
-		struct border *a,
-		box_type *a_src)
-{
-	struct border b;
-	box_type b_src;
+				if (col[i].type != COLUMN_WIDTH_UNKNOWN)
+					continue;
 
-	/* Top border of table */
-	b.style = css_computed_border_top_style(table->style);
-	b.color = css_computed_border_top_color(table->style, &b.c);
-	css_computed_border_top_width(table->style, &b.width, &b.unit);
-	b.width = nscss_len2px(len_ctx, b.width, b.unit, table->style);
-	b.unit = CSS_UNIT_PX;
-	b_src = BOX_TABLE;
+				if (type == CSS_WIDTH_SET && unit == CSS_UNIT_PCT) {
+					col[i].type = COLUMN_WIDTH_PERCENT;
+					col[i].width = FIXTOINT(value);
+					if (col[i].width < 0)
+						col[i].width = 0;
+				} else if (type == CSS_WIDTH_AUTO) {
+					col[i].type = COLUMN_WIDTH_AUTO;
+				}
+			}
 
-	if (table_border_is_more_eyecatching(len_ctx, a, *a_src, &b, b_src)) {
-		*a = b;
-		*a_src = b_src;
-	}
-}
+	/* 2nd pass: cells which span multiple columns */
+	for (row_group = table->children; row_group; row_group =row_group->next)
+		for (row = row_group->children; row; row = row->next)
+			for (cell = row->children; cell; cell = cell->next) {
+				unsigned int fixed_columns = 0,
+					percent_columns = 0,
+					auto_columns = 0,
+					unknown_columns = 0;
+				int fixed_width = 0, percent_width = 0;
+				enum css_width_e type;
+				css_fixed value = 0;
+				css_unit unit = CSS_UNIT_PX;
+
+				if (cell->columns == 1)
+					continue;
+				i = cell->start_column;
 
-/**
- * Process a group
- *
- * \param len_ctx  Length conversion context
- * \param cell     Cell being considered
- * \param group    Group to process
- * \param a        Current border style for cell
- * \param a_src    Source of \a a
- * \return true if group has non-empty rows, false otherwise
- *
- * \post \a a will be updated with most eyecatching style
- * \post \a a_src will be updated also
- */
-bool table_cell_top_process_group(
-		const nscss_len_ctx *len_ctx,
-		struct box *cell,
-		struct box *group,
-		struct border *a,
-		box_type *a_src)
-{
-	struct border b;
-	box_type b_src;
+				for (j = i; j < i + cell->columns; j++) {
+					col[j].positioned = false;
+				}
 
-	/* Bottom border of group */
-	b.style = css_computed_border_bottom_style(group->style);
-	b.color = css_computed_border_bottom_color(group->style, &b.c);
-	css_computed_border_bottom_width(group->style, &b.width, &b.unit);
-	b.width = nscss_len2px(len_ctx, b.width, b.unit, group->style);
-	b.unit = CSS_UNIT_PX;
-	b_src = BOX_TABLE_ROW_GROUP;
+				/* count column types in spanned cells */
+				for (j = 0; j != cell->columns; j++) {
+					if (col[i + j].type == COLUMN_WIDTH_FIXED) {
+						fixed_width += col[i + j].width;
+						fixed_columns++;
+					} else if (col[i + j].type == COLUMN_WIDTH_PERCENT) {
+						percent_width += col[i + j].width;
+						percent_columns++;
+					} else if (col[i + j].type == COLUMN_WIDTH_AUTO) {
+						auto_columns++;
+					} else {
+						unknown_columns++;
+					}
+				}
 
-	if (table_border_is_more_eyecatching(len_ctx, a, *a_src, &b, b_src)) {
-		*a = b;
-		*a_src = b_src;
-	}
+				if (!unknown_columns)
+					continue;
 
-	if (group->last != NULL) {
-		/* Process rows in group, starting with last */
-		struct box *row = group->last;
+				type = css_computed_width(cell->style, &value, &unit);
+
+				/* if cell is fixed width, and all spanned columns are fixed
+				 * or unknown width, split extra width among unknown columns */
+				if (type == CSS_WIDTH_SET && unit != CSS_UNIT_PCT &&
+				    fixed_columns + unknown_columns ==
+				    cell->columns) {
+					int width = (FIXTOFLT(css_unit_len2device_px(
+							cell->style,
+							unit_len_ctx,
+							value, unit)) -
+						fixed_width) / unknown_columns;
+					if (width < 0)
+						width = 0;
+					for (j = 0; j != cell->columns; j++) {
+						if (col[i + j].type == COLUMN_WIDTH_UNKNOWN) {
+							col[i + j].type = COLUMN_WIDTH_FIXED;
+							col[i + j].width = width;
+						}
+					}
+				}
 
-		while (table_cell_top_process_row(len_ctx, cell, row,
-				a, a_src) == false) {
-			if (row->prev == NULL) {
-				return false;
-			} else {
-				row = row->prev;
+				/* as above for percentage width */
+				if (type == CSS_WIDTH_SET && unit == CSS_UNIT_PCT &&
+				    percent_columns + unknown_columns ==
+				    cell->columns) {
+					int width = (FIXTOFLT(value) -
+						     percent_width) / unknown_columns;
+					if (width < 0)
+						width = 0;
+					for (j = 0; j != cell->columns; j++) {
+						if (col[i + j].type == COLUMN_WIDTH_UNKNOWN) {
+							col[i + j].type = COLUMN_WIDTH_PERCENT;
+							col[i + j].width = width;
+						}
+					}
+				}
 			}
-		}
-	} else {
-		/* Group is empty, so consider its top border */
-		b.style = css_computed_border_top_style(group->style);
-		b.color = css_computed_border_top_color(group->style, &b.c);
-		css_computed_border_top_width(group->style, &b.width, &b.unit);
-		b.width = nscss_len2px(len_ctx, b.width, b.unit, group->style);
-		b.unit = CSS_UNIT_PX;
-		b_src = BOX_TABLE_ROW_GROUP;
 
-		if (table_border_is_more_eyecatching(len_ctx,
-				a, *a_src, &b, b_src)) {
-			*a = b;
-			*a_src = b_src;
-		}
-
-		return false;
+	/* use AUTO if no width type was specified */
+	for (i = 0; i != table->columns; i++) {
+		if (col[i].type == COLUMN_WIDTH_UNKNOWN)
+			col[i].type = COLUMN_WIDTH_AUTO;
 	}
 
+#ifdef TABLE_DEBUG
+	for (i = 0; i != table->columns; i++)
+		NSLOG(netsurf, INFO,
+		      "table %p, column %u: type %s, width %i",
+		      table,
+		      i,
+		      ((const char *[]){
+					"UNKNOWN",
+					"FIXED",
+					"AUTO",
+					"PERCENT",
+					"RELATIVE",
+				      })[col[i].type],
+		      col[i].width);
+#endif
+
 	return true;
 }
 
-/**
- * Process a row
- *
- * \param len_ctx  Length conversion context
- * \param cell     Cell being considered
- * \param row      Row to process
- * \param a        Current border style for cell
- * \param a_src    Source of \a a
- * \return true if row has cells, false otherwise
- *
- * \post \a a will be updated with most eyecatching style
- * \post \a a_src will be updated also
- */
-bool table_cell_top_process_row(
-		const nscss_len_ctx *len_ctx,
-		struct box *cell,
-		struct box *row,
-		struct border *a,
-		box_type *a_src)
-{
-	struct border b;
-	box_type b_src;
-
-	/* Bottom border of row */
-	b.style = css_computed_border_bottom_style(row->style);
-	b.color = css_computed_border_bottom_color(row->style, &b.c);
-	css_computed_border_bottom_width(row->style, &b.width, &b.unit);
-	b.width = nscss_len2px(len_ctx, b.width, b.unit, row->style);
-	b.unit = CSS_UNIT_PX;
-	b_src = BOX_TABLE_ROW;
 
-	if (table_border_is_more_eyecatching(len_ctx, a, *a_src, &b, b_src)) {
-		*a = b;
-		*a_src = b_src;
-	}
+/* exported interface documented in html/table.h */
+void table_used_border_for_cell(const css_unit_ctx *unit_len_ctx, struct box *cell)
+{
+	int side;
 
-	if (row->children == NULL) {
-		/* Row is empty, so consider its top border */
-		b.style = css_computed_border_top_style(row->style);
-		b.color = css_computed_border_top_color(row->style, &b.c);
-		css_computed_border_top_width(row->style, &b.width, &b.unit);
-		b.width = nscss_len2px(len_ctx, b.width, b.unit, row->style);
-		b.unit = CSS_UNIT_PX;
-		b_src = BOX_TABLE_ROW;
+	assert(cell->type == BOX_TABLE_CELL);
 
-		if (table_border_is_more_eyecatching(len_ctx,
-				a, *a_src, &b, b_src)) {
-			*a = b;
-			*a_src = b_src;
-		}
+	if (css_computed_border_collapse(cell->style) ==
+	    CSS_BORDER_COLLAPSE_SEPARATE) {
+		css_fixed width = 0;
+		css_unit unit = CSS_UNIT_PX;
 
-		return false;
-	} else {
-		/* Process cells that are directly above the cell being
-		 * considered. They may not be in this row, but in one of the
-		 * rows above it in the case where rowspan > 1. */
-		struct box *c;
-		bool processed = false;
+		/* Left border */
+		cell->border[LEFT].style =
+			css_computed_border_left_style(cell->style);
+		css_computed_border_left_color(cell->style,
+					       &cell->border[LEFT].c);
+		css_computed_border_left_width(cell->style, &width, &unit);
+		cell->border[LEFT].width =
+			FIXTOINT(css_unit_len2device_px(
+					cell->style, unit_len_ctx,
+					width, unit));
 
-		while (processed == false) {
-			for (c = row->children; c != NULL; c = c->next) {
-				/* Ignore cells to the left */
-				if (c->start_column + c->columns - 1 <
-						cell->start_column)
-					continue;
-				/* Ignore cells to the right */
-				if (c->start_column > cell->start_column +
-						cell->columns - 1)
-					continue;
+		/* Top border */
+		cell->border[TOP].style =
+			css_computed_border_top_style(cell->style);
+		css_computed_border_top_color(cell->style,
+					      &cell->border[TOP].c);
+		css_computed_border_top_width(cell->style, &width, &unit);
+		cell->border[TOP].width =
+			FIXTOINT(css_unit_len2device_px(
+					cell->style, unit_len_ctx,
+					width, unit));
 
-				/* Flag that we've processed a cell */
-				processed = true;
+		/* Right border */
+		cell->border[RIGHT].style =
+			css_computed_border_right_style(cell->style);
+		css_computed_border_right_color(cell->style,
+						&cell->border[RIGHT].c);
+		css_computed_border_right_width(cell->style, &width, &unit);
+		cell->border[RIGHT].width =
+			FIXTOINT(css_unit_len2device_px(
+					cell->style, unit_len_ctx,
+					width, unit));
 
-				/* Consider bottom border */
-				b.style = css_computed_border_bottom_style(
-						c->style);
-				b.color = css_computed_border_bottom_color(
-						c->style, &b.c);
-				css_computed_border_bottom_width(c->style,
-						&b.width, &b.unit);
-				b.width = nscss_len2px(len_ctx,
-						b.width, b.unit, c->style);
-				b.unit = CSS_UNIT_PX;
-				b_src = BOX_TABLE_CELL;
+		/* Bottom border */
+		cell->border[BOTTOM].style =
+			css_computed_border_bottom_style(cell->style);
+		css_computed_border_bottom_color(cell->style,
+						 &cell->border[BOTTOM].c);
+		css_computed_border_bottom_width(cell->style, &width, &unit);
+		cell->border[BOTTOM].width =
+			FIXTOINT(css_unit_len2device_px(
+					cell->style, unit_len_ctx,
+					width, unit));
+	} else {
+		/* Left border */
+		table_used_left_border_for_cell(unit_len_ctx, cell);
 
-				if (table_border_is_more_eyecatching(len_ctx,
-						a, *a_src, &b, b_src)) {
-					*a = b;
-					*a_src = b_src;
-				}
-			}
+		/* Top border */
+		table_used_top_border_for_cell(unit_len_ctx, cell);
 
-			if (processed == false) {
-				/* There must be a preceding row */
-				assert(row->prev != NULL);
+		/* Right border */
+		table_used_right_border_for_cell(unit_len_ctx, cell);
 
-				row = row->prev;
-			}
-		}
+		/* Bottom border */
+		table_used_bottom_border_for_cell(unit_len_ctx, cell);
 	}
 
-	return true;
+	/* Finally, ensure that any borders configured as
+	 * hidden or none have zero width. (c.f. layout_find_dimensions) */
+	for (side = 0; side != 4; side++) {
+		if (cell->border[side].style == CSS_BORDER_STYLE_HIDDEN ||
+		    cell->border[side].style ==
+		    CSS_BORDER_STYLE_NONE)
+			cell->border[side].width = 0;
+	}
 }
diff --git a/content/handlers/html/table.h b/content/handlers/html/table.h
index 11ab653c6..557032b06 100644
--- a/content/handlers/html/table.h
+++ b/content/handlers/html/table.h
@@ -29,11 +29,28 @@
 
 struct box;
 
-bool table_calculate_column_types(
-		const nscss_len_ctx *len_ctx,
-		struct box *table);
-void table_used_border_for_cell(
-		const nscss_len_ctx *len_ctx,
-		struct box *cell);
+
+/**
+ * Determine the column width types for a table.
+ *
+ * \param unit_len_ctx Length conversion context
+ * \param table box of type BOX_TABLE
+ * \return true on success, false on memory exhaustion
+ *
+ * The table->col array is allocated and type and width are filled in for each
+ * column.
+ */
+bool table_calculate_column_types(const css_unit_ctx *unit_len_ctx,	struct box *table);
+
+
+/**
+ * Calculate used values of border-{trbl}-{style,color,width} for table cells.
+ *
+ * \param unit_len_ctx Length conversion context
+ * \param cell Table cell to consider
+ *
+ * \post \a cell's border array is populated
+ */
+void table_used_border_for_cell(const css_unit_ctx *unit_len_ctx, struct box *cell);
 
 #endif
diff --git a/content/handlers/html/textselection.c b/content/handlers/html/textselection.c
new file mode 100644
index 000000000..9b83e73ec
--- /dev/null
+++ b/content/handlers/html/textselection.c
@@ -0,0 +1,547 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * implementation of text selection for a HTML content.
+ */
+
+#include <stdlib.h>
+
+#include "utils/errors.h"
+#include "utils/utils.h"
+#include "netsurf/types.h"
+#include "netsurf/plot_style.h"
+#include "desktop/selection.h"
+#include "desktop/save_text.h"
+
+#include "html/private.h"
+#include "html/box.h"
+#include "html/box_inspect.h"
+#include "html/font.h"
+#include "html/textselection.h"
+
+#define SPACE_LEN(b) ((b->space == 0) ? 0 : 1)
+
+struct rdw_info {
+	bool inited;
+	struct rect r;
+};
+
+
+/**
+ * Tests whether a text box lies partially within the given range of
+ * byte offsets, returning the start and end indexes of the bytes
+ * that are enclosed.
+ *
+ * \param box box to be tested
+ * \param start_idx byte offset of start of range
+ * \param end_idx byte offset of end of range
+ * \param start_offset receives the start offset of the selected part
+ * \param end_offset receives the end offset of the selected part
+ * \return true iff the range encloses at least part of the box
+ */
+static bool
+selected_part(struct box *box,
+	      unsigned start_idx,
+	      unsigned end_idx,
+	      unsigned *start_offset,
+	      unsigned *end_offset)
+{
+	size_t box_length = box->length + SPACE_LEN(box);
+
+	if (box_length > 0) {
+		if ((box->byte_offset >= start_idx) &&
+		    (box->byte_offset + box_length <= end_idx)) {
+
+			/* fully enclosed */
+			*start_offset = 0;
+			*end_offset = box_length;
+			return true;
+		} else if ((box->byte_offset + box_length > start_idx) &&
+			   (box->byte_offset < end_idx)) {
+			/* partly enclosed */
+			int offset = 0;
+			int len;
+
+			if (box->byte_offset < start_idx) {
+				offset = start_idx - box->byte_offset;
+			}
+
+			len = box_length - offset;
+
+			if (box->byte_offset + box_length > end_idx) {
+				len = end_idx - (box->byte_offset + offset);
+			}
+
+			*start_offset = offset;
+			*end_offset = offset + len;
+
+			return true;
+		}
+	}
+	return false;
+}
+
+
+/**
+ * Traverse the given box subtree adding the boxes inside the
+ *   selection to the coordinate range.
+ *
+ * \param box box subtree
+ * \param start_idx start of range within textual representation (bytes)
+ * \param end_idx end of range
+ * \param rdwi redraw range to fill in
+ * \param do_marker whether deal enter any marker box
+ * \return NSERROR_OK on success else error code
+ */
+static nserror
+coords_from_range(struct box *box,
+		  unsigned start_idx,
+		  unsigned end_idx,
+		  struct rdw_info *rdwi,
+		  bool do_marker)
+{
+	struct box *child;
+	nserror res;
+
+	assert(box);
+
+	/* If selection starts inside marker */
+	if (box->parent &&
+	    box->parent->list_marker == box &&
+	    !do_marker) {
+		/* set box to main list element */
+		box = box->parent;
+	}
+
+	/* If box has a list marker */
+	if (box->list_marker) {
+		/* do the marker box before continuing with the rest of the
+		 * list element */
+		res = coords_from_range(box->list_marker,
+					start_idx,
+					end_idx,
+					rdwi,
+					true);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	/* we can prune this subtree, it's after the selection */
+	if (box->byte_offset >= end_idx) {
+		return NSERROR_OK;
+	}
+
+	/* read before calling the handler in case it modifies the tree */
+	child = box->children;
+
+	if ((box->type != BOX_BR) &&
+	    !((box->type == BOX_FLOAT_LEFT ||
+	       box->type == BOX_FLOAT_RIGHT) &&
+	      !box->text)) {
+		unsigned start_off;
+		unsigned end_off;
+
+		if (selected_part(box, start_idx, end_idx, &start_off, &end_off)) {
+			int width, height;
+			int x, y;
+
+			/**
+			 * \todo it should be possible to reduce the redrawn
+			 *        area using the offsets
+			 */
+			box_coords(box, &x, &y);
+
+			width = box->padding[LEFT] + box->width + box->padding[RIGHT];
+			height = box->padding[TOP] + box->height + box->padding[BOTTOM];
+
+			if ((box->type == BOX_TEXT) &&
+			    (box->space != 0)) {
+				width += box->space;
+			}
+
+			if (rdwi->inited) {
+				if (x < rdwi->r.x0) {
+					rdwi->r.x0 = x;
+				}
+				if (y < rdwi->r.y0) {
+					rdwi->r.y0 = y;
+				}
+				if (x + width > rdwi->r.x1) {
+					rdwi->r.x1 = x + width;
+				}
+				if (y + height > rdwi->r.y1) {
+					rdwi->r.y1 = y + height;
+				}
+			} else {
+				rdwi->inited = true;
+				rdwi->r.x0 = x;
+				rdwi->r.y0 = y;
+				rdwi->r.x1 = x + width;
+				rdwi->r.y1 = y + height;
+			}
+		}
+	}
+
+	/* find the first child that could lie partially within the selection;
+	 * this is important at the top-levels of the tree for pruning subtrees
+	 * that lie entirely before the selection */
+
+	if (child) {
+		struct box *next = child->next;
+
+		while (next && next->byte_offset < start_idx) {
+			child = next;
+			next = child->next;
+		}
+
+		while (child) {
+			/* read before calling the handler in case it modifies
+			 * the tree */
+			struct box *next = child->next;
+
+			res = coords_from_range(child,
+						start_idx,
+						end_idx,
+						rdwi,
+						false);
+			if (res != NSERROR_OK) {
+				return res;
+			}
+
+			child = next;
+		}
+	}
+
+	return NSERROR_OK;
+}
+
+
+/**
+ * Append the contents of a box to a selection along with style information
+ *
+ * \param text         pointer to text being added, or NULL for newline
+ * \param length       length of text to be appended (bytes)
+ * \param box          pointer to text box, or NULL if from textplain
+ * \param unit_len_ctx      Length conversion context
+ * \param handle       selection string to append to
+ * \param whitespace_text    whitespace to place before text for formatting
+ *                            may be NULL
+ * \param whitespace_length  length of whitespace_text
+ * \return NSERROR_OK iff successful and traversal should continue else error code
+ */
+static nserror
+selection_copy_box(const char *text,
+		   size_t length,
+		   struct box *box,
+		   const css_unit_ctx *unit_len_ctx,
+		   struct selection_string *handle,
+		   const char *whitespace_text,
+		   size_t whitespace_length)
+{
+	bool add_space = false;
+	plot_font_style_t style;
+	plot_font_style_t *pstyle = NULL;
+
+	/* add any whitespace which precedes the text from this box */
+	if (whitespace_text != NULL &&
+	    whitespace_length > 0) {
+		if (!selection_string_append(whitespace_text,
+					     whitespace_length,
+					     false,
+					     pstyle,
+					     handle)) {
+			return NSERROR_NOMEM;
+		}
+	}
+
+	if (box != NULL) {
+		/* HTML */
+		add_space = (box->space != 0);
+
+		if (box->style != NULL) {
+			/* Override default font style */
+			font_plot_style_from_css(unit_len_ctx, box->style, &style);
+			pstyle = &style;
+		} else {
+			/* If there's no style, there must be no text */
+			assert(box->text == NULL);
+		}
+	}
+
+	/* add the text from this box */
+	if (!selection_string_append(text, length, add_space, pstyle, handle)) {
+		return NSERROR_NOMEM;
+	}
+
+	return NSERROR_OK;
+}
+
+
+/**
+ * Traverse the given box subtree, calling selection copy for all
+ * boxes that lie (partially) within the given range
+ *
+ * \param box        box subtree
+ * \param unit_len_ctx    Length conversion context.
+ * \param start_idx  start of range within textual representation (bytes)
+ * \param end_idx    end of range
+ * \param handler    handler function to call
+ * \param handle     handle to pass
+ * \param before     type of whitespace to place before next encountered text
+ * \param first      whether this is the first box with text
+ * \param do_marker  whether deal enter any marker box
+ * \return NSERROR_OK on sucess else error code
+ */
+static nserror
+selection_copy(struct box *box,
+	       const css_unit_ctx *unit_len_ctx,
+	       unsigned start_idx,
+	       unsigned end_idx,
+	       struct selection_string *selstr,
+	       save_text_whitespace *before,
+	       bool *first,
+	       bool do_marker)
+{
+	nserror res;
+	struct box *child;
+	const char *whitespace_text = "";
+	size_t whitespace_length = 0;
+
+	assert(box);
+
+	/* If selection starts inside marker */
+	if (box->parent &&
+	    box->parent->list_marker == box &&
+	    !do_marker) {
+		/* set box to main list element */
+		box = box->parent;
+	}
+
+	/* If box has a list marker */
+	if (box->list_marker) {
+		/* do the marker box before continuing with the rest of the
+		 * list element */
+		res = selection_copy(box->list_marker,
+				     unit_len_ctx,
+				     start_idx,
+				     end_idx,
+				     selstr,
+				     before,
+				     first,
+				     true);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+	}
+
+	/* we can prune this subtree, it's after the selection */
+	if (box->byte_offset >= end_idx) {
+		return NSERROR_OK;
+	}
+
+	/* read before calling the handler in case it modifies the tree */
+	child = box->children;
+
+	/* If nicely formatted output of the selected text is required, work
+	 * out what whitespace should be placed before the next bit of text */
+	if (before) {
+		save_text_solve_whitespace(box,
+					   first,
+					   before,
+					   &whitespace_text,
+					   &whitespace_length);
+	} else {
+		whitespace_text = NULL;
+	}
+
+	if ((box->type != BOX_BR) &&
+	    !((box->type == BOX_FLOAT_LEFT ||
+	       box->type == BOX_FLOAT_RIGHT) &&
+	      !box->text)) {
+		unsigned start_off;
+		unsigned end_off;
+
+		if (selected_part(box, start_idx, end_idx, &start_off, &end_off)) {
+			res = selection_copy_box(box->text + start_off,
+						 min(box->length, end_off) - start_off,
+						 box,
+						 unit_len_ctx,
+						 selstr,
+						 whitespace_text,
+						 whitespace_length);
+			if (res != NSERROR_OK) {
+				return res;
+			}
+			if (before) {
+				*first = false;
+				*before = WHITESPACE_NONE;
+			}
+		}
+	}
+
+	/* find the first child that could lie partially within the selection;
+	 * this is important at the top-levels of the tree for pruning subtrees
+	 * that lie entirely before the selection */
+
+	if (child) {
+		struct box *next = child->next;
+
+		while (next && next->byte_offset < start_idx) {
+			child = next;
+			next = child->next;
+		}
+
+		while (child) {
+			/* read before calling the handler in case it modifies
+			 * the tree */
+			struct box *next = child->next;
+
+			res = selection_copy(child,
+					     unit_len_ctx,
+					     start_idx,
+					     end_idx,
+					     selstr,
+					     before,
+					     first,
+					     false);
+			if (res != NSERROR_OK) {
+				return res;
+			}
+
+			child = next;
+		}
+	}
+
+	return NSERROR_OK;
+}
+
+
+/**
+ * Label each text box in the given box subtree with its position
+ * in a textual representation of the content.
+ *
+ * \param box The box at root of subtree
+ * \param idx current position within textual representation
+ * \return updated position
+ */
+static unsigned selection_label_subtree(struct box *box, unsigned idx)
+{
+	struct box *child;
+
+	assert(box != NULL);
+
+	child = box->children;
+
+	box->byte_offset = idx;
+
+	if (box->text) {
+		idx += box->length + SPACE_LEN(box);
+	}
+
+	while (child) {
+		if (child->list_marker) {
+			idx = selection_label_subtree(child->list_marker, idx);
+		}
+
+		idx = selection_label_subtree(child, idx);
+		child = child->next;
+	}
+
+	return idx;
+}
+
+
+/* exported interface documented in html/textselection.h */
+nserror
+html_textselection_redraw(struct content *c,
+			  unsigned start_idx,
+			  unsigned end_idx)
+{
+	nserror res;
+	html_content *html = (html_content *)c;
+	struct rdw_info rdw;
+
+	if (html->layout == NULL) {
+		return NSERROR_INVALID;
+	}
+
+	rdw.inited = false;
+
+	res = coords_from_range(html->layout, start_idx, end_idx, &rdw, false);
+	if (res != NSERROR_OK) {
+		return res;
+	}
+
+	if (rdw.inited) {
+		content__request_redraw(c,
+					rdw.r.x0,
+					rdw.r.y0,
+					rdw.r.x1 - rdw.r.x0,
+					rdw.r.y1 - rdw.r.y0);
+	}
+
+	return NSERROR_OK;
+}
+
+
+/* exported interface documented in html/textselection.h */
+nserror
+html_textselection_copy(struct content *c,
+			unsigned start_idx,
+			unsigned end_idx,
+			struct selection_string *selstr)
+{
+	html_content *html = (html_content *)c;
+	save_text_whitespace before = WHITESPACE_NONE;
+	bool first = true;
+
+	if (html->layout == NULL) {
+		return NSERROR_INVALID;
+	}
+
+	return selection_copy(html->layout,
+			      &html->unit_len_ctx,
+			      start_idx,
+			      end_idx,
+			      selstr,
+			      &before,
+			      &first,
+			      false);
+}
+
+
+/* exported interface documented in html/textselection.h */
+nserror
+html_textselection_get_end(struct content *c, unsigned *end_idx)
+{
+	html_content *html = (html_content *)c;
+	unsigned root_idx;
+
+	if (html->layout == NULL) {
+		return NSERROR_INVALID;
+	}
+
+	root_idx = 0;
+
+	*end_idx = selection_label_subtree(html->layout, root_idx);
+
+	return NSERROR_OK;
+}
diff --git a/content/handlers/html/textselection.h b/content/handlers/html/textselection.h
new file mode 100644
index 000000000..46db045ef
--- /dev/null
+++ b/content/handlers/html/textselection.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * HTML text selection handling
+ */
+
+#ifndef NETSURF_HTML_TEXTSELECTION_H
+#define NETSURF_HTML_TEXTSELECTION_H
+
+struct content;
+struct selection;
+
+nserror html_textselection_redraw(struct content *c, unsigned start_idx, unsigned end_idx);
+
+nserror html_textselection_copy(struct content *c, unsigned start_idx, unsigned end_idx, struct selection_string *selstr);
+
+/**
+ * get maximum index of text section.
+ *
+ * \param[in] c The content to measure
+ * \param[out] end_idx pointer to value to recive result
+ * \return NSERROR_OK and \a end_idx updated else error code
+ */
+nserror html_textselection_get_end(struct content *c, unsigned *end_idx);
+
+#endif
diff --git a/content/handlers/image/Makefile b/content/handlers/image/Makefile
index 1c27f74d7..ac052b37a 100644
--- a/content/handlers/image/Makefile
+++ b/content/handlers/image/Makefile
@@ -7,10 +7,11 @@ S_IMAGE_$(NETSURF_USE_BMP) += bmp.c
 S_IMAGE_$(NETSURF_USE_GIF) += gif.c
 S_IMAGE_$(NETSURF_USE_BMP) += ico.c
 S_IMAGE_$(NETSURF_USE_JPEG) += jpeg.c
+S_IMAGE_$(NETSURF_USE_JPEGXL) += jpegxl.c
 S_IMAGE_$(NETSURF_USE_ROSPRITE) += nssprite.c
 S_IMAGE_$(NETSURF_USE_PNG) += png.c
 S_IMAGE_$(NETSURF_USE_NSSVG) += svg.c
-S_IMAGE_$(NETSURF_USE_RSVG) += rsvg.c
+S_IMAGE_$(NETSURF_USE_RSVG) += rsvg$(RSVG_API).c
 S_IMAGE_$(NETSURF_USE_VIDEO) += video.c
 S_IMAGE_$(NETSURF_USE_WEBP) += webp.c
 
diff --git a/content/handlers/image/bmp.c b/content/handlers/image/bmp.c
index 75d8880f3..3fec2cc75 100644
--- a/content/handlers/image/bmp.c
+++ b/content/handlers/image/bmp.c
@@ -33,7 +33,9 @@
 #include "netsurf/content.h"
 #include "content/llcache.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "desktop/gui_internal.h"
+#include "desktop/bitmap.h"
 
 #include "image/bmp.h"
 
@@ -56,12 +58,12 @@ typedef struct nsbmp_content {
  */
 static void *nsbmp_bitmap_create(int width, int height, unsigned int bmp_state)
 {
-	unsigned int bitmap_state = BITMAP_NEW;
+	unsigned int bitmap_state = BITMAP_NONE;
 
 	/* set bitmap state based on bmp state */
 	bitmap_state |= (bmp_state & BMP_OPAQUE) ? BITMAP_OPAQUE : 0;
 	bitmap_state |= (bmp_state & BMP_CLEAR_MEMORY) ?
-			BITMAP_CLEAR_MEMORY : 0;
+			BITMAP_CLEAR : 0;
 
 	/* return the created bitmap */
 	return guit->bitmap->create(width, height, bitmap_state);
@@ -73,12 +75,11 @@ static nserror nsbmp_create_bmp_data(nsbmp_content *bmp)
 		.bitmap_create = nsbmp_bitmap_create,
 		.bitmap_destroy = guit->bitmap->destroy,
 		.bitmap_get_buffer = guit->bitmap->get_buffer,
-		.bitmap_get_bpp = guit->bitmap->get_bpp
 	};
 
 	bmp->bmp = calloc(sizeof(struct bmp_image), 1);
 	if (bmp->bmp == NULL) {
-		content_broadcast_errorcode(&bmp->base, NSERROR_NOMEM);
+		content_broadcast_error(&bmp->base, NSERROR_NOMEM, NULL);
 		return NSERROR_NOMEM;
 	}
 
@@ -87,10 +88,14 @@ static nserror nsbmp_create_bmp_data(nsbmp_content *bmp)
 	return NSERROR_OK;
 }
 
-static nserror nsbmp_create(const content_handler *handler,
-		lwc_string *imime_type, const struct http_parameter *params,
-		llcache_handle *llcache, const char *fallback_charset,
-		bool quirks, struct content **c)
+static nserror
+nsbmp_create(const struct content_handler *handler,
+	     lwc_string *imime_type,
+	     const struct http_parameter *params,
+	     llcache_handle *llcache,
+	     const char *fallback_charset,
+	     bool quirks,
+	     struct content **c)
 {
 	nsbmp_content *bmp;
 	nserror error;
@@ -135,19 +140,18 @@ static bool nsbmp_convert(struct content *c)
 		case BMP_OK:
 			break;
 		case BMP_INSUFFICIENT_MEMORY:
-			content_broadcast_errorcode(c, NSERROR_NOMEM);
+			content_broadcast_error(c, NSERROR_NOMEM, NULL);
 			return false;
 		case BMP_INSUFFICIENT_DATA:
 		case BMP_DATA_ERROR:
-			content_broadcast_errorcode(c, NSERROR_BMP_ERROR);
+			content_broadcast_error(c, NSERROR_BMP_ERROR, NULL);
 			return false;
 	}
 
 	/* Store our content width and description */
 	c->width = bmp->bmp->width;
 	c->height = bmp->bmp->height;
-	swidth = bmp->bmp->bitmap_callbacks.bitmap_get_bpp(bmp->bmp->bitmap) * 
-			bmp->bmp->width;
+	swidth = sizeof(uint32_t) * bmp->bmp->width;
 	c->size += (swidth * bmp->bmp->height) + 16 + 44;
 
 	/* set title text */
@@ -186,6 +190,9 @@ static bool nsbmp_redraw(struct content *c, struct content_redraw_data *data,
 			return false;
 		}
 
+		bitmap_format_to_client(bmp->bitmap, &(bitmap_fmt_t) {
+			.layout = BITMAP_LAYOUT_R8G8B8A8,
+		});
 		guit->bitmap->modified(bmp->bitmap);
 	}
 
@@ -259,6 +266,16 @@ static content_type nsbmp_content_type(void)
 	return CONTENT_IMAGE;
 }
 
+static bool nsbmp_content_is_opaque(struct content *c)
+{
+	nsbmp_content *bmp = (nsbmp_content *)c;
+
+	if (bmp->bitmap != NULL) {
+		return guit->bitmap->get_opaque(bmp->bitmap);
+	}
+
+	return false;
+}
 
 static const content_handler nsbmp_content_handler = {
 	.create = nsbmp_create,
@@ -268,6 +285,7 @@ static const content_handler nsbmp_content_handler = {
 	.clone = nsbmp_clone,
 	.get_internal = nsbmp_get_internal,
 	.type = nsbmp_content_type,
+	.is_opaque = nsbmp_content_is_opaque,
 	.no_share = false,
 };
 
diff --git a/content/handlers/image/bmp.h b/content/handlers/image/bmp.h
index f3b398584..d3d7623ed 100644
--- a/content/handlers/image/bmp.h
+++ b/content/handlers/image/bmp.h
@@ -17,16 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * Content for image/bmp (interface).
+/**
+ * \file
+ * interface to image/bmp content handler initialisation.
  */
 
-#ifndef _NETSURF_IMAGE_BMP_H_
-#define _NETSURF_IMAGE_BMP_H_
-
-#include <libnsbmp.h>
-
-extern bmp_bitmap_callback_vt bmp_bitmap_callbacks; /** Only to be used by ICO code.  */
+#ifndef NETSURF_IMAGE_BMP_H_
+#define NETSURF_IMAGE_BMP_H_
 
 nserror nsbmp_init(void);
 
diff --git a/content/handlers/image/gif.c b/content/handlers/image/gif.c
index ee85a6309..4671d1df5 100644
--- a/content/handlers/image/gif.c
+++ b/content/handlers/image/gif.c
@@ -34,8 +34,12 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <libnsgif.h>
 
+#include <nsutils/assert.h>
+
+#include <nsgif.h>
+
+#include "utils/log.h"
 #include "utils/utils.h"
 #include "utils/messages.h"
 #include "utils/nsoption.h"
@@ -43,19 +47,37 @@
 #include "netsurf/bitmap.h"
 #include "netsurf/content.h"
 #include "content/llcache.h"
+#include "content/content.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "desktop/gui_internal.h"
+#include "desktop/bitmap.h"
 
 #include "image/image.h"
 #include "image/gif.h"
 
-typedef struct nsgif_content {
+typedef struct gif_content {
 	struct content base;
 
-	struct gif_animation *gif; /**< GIF animation data */
-	int current_frame;   /**< current frame to display [0...(max-1)] */
-} nsgif_content;
+	nsgif_t *gif; /**< GIF animation data */
+	uint32_t current_frame;   /**< current frame to display [0...(max-1)] */
+} gif_content;
 
+static inline nserror gif__nsgif_error_to_ns(nsgif_error gif_res)
+{
+	nserror err;
+
+	switch (gif_res) {
+	case NSGIF_ERR_OOM:
+		err = NSERROR_NOMEM;
+		break;
+	default:
+		err = NSERROR_GIF_ERROR;
+		break;
+	}
+
+	return err;
+}
 
 /**
  * Callback for libnsgif; forwards the call to bitmap_create()
@@ -64,44 +86,60 @@ typedef struct nsgif_content {
  * \param  height  width of image in pixels
  * \return an opaque struct bitmap, or NULL on memory exhaustion
  */
-static void *nsgif_bitmap_create(int width, int height)
+static void *gif_bitmap_create(int width, int height)
 {
-	return guit->bitmap->create(width, height, BITMAP_NEW);
+	return guit->bitmap->create(width, height, BITMAP_NONE);
 }
 
+/**
+ * Convert client bitmap format to a LibNSGIF format specifier.
+ */
+static nsgif_bitmap_fmt_t nsgif__get_bitmap_format(void)
+{
+	ns_static_assert((int)BITMAP_LAYOUT_R8G8B8A8 == (int)NSGIF_BITMAP_FMT_R8G8B8A8);
+	ns_static_assert((int)BITMAP_LAYOUT_B8G8R8A8 == (int)NSGIF_BITMAP_FMT_B8G8R8A8);
+	ns_static_assert((int)BITMAP_LAYOUT_A8R8G8B8 == (int)NSGIF_BITMAP_FMT_A8R8G8B8);
+	ns_static_assert((int)BITMAP_LAYOUT_A8B8G8R8 == (int)NSGIF_BITMAP_FMT_A8B8G8R8);
+	ns_static_assert((int)BITMAP_LAYOUT_RGBA8888 == (int)NSGIF_BITMAP_FMT_RGBA8888);
+	ns_static_assert((int)BITMAP_LAYOUT_BGRA8888 == (int)NSGIF_BITMAP_FMT_BGRA8888);
+	ns_static_assert((int)BITMAP_LAYOUT_ARGB8888 == (int)NSGIF_BITMAP_FMT_ARGB8888);
+	ns_static_assert((int)BITMAP_LAYOUT_ABGR8888 == (int)NSGIF_BITMAP_FMT_ABGR8888);
+
+	return (nsgif_bitmap_fmt_t)bitmap_fmt.layout;
+}
 
-static nserror nsgif_create_gif_data(nsgif_content *c)
+static nserror gif_create_gif_data(gif_content *c)
 {
-	gif_bitmap_callback_vt gif_bitmap_callbacks = {
-		.bitmap_create = nsgif_bitmap_create,
-		.bitmap_destroy = guit->bitmap->destroy,
-		.bitmap_get_buffer = guit->bitmap->get_buffer,
-		.bitmap_set_opaque = guit->bitmap->set_opaque,
-		.bitmap_test_opaque = guit->bitmap->test_opaque,
-		.bitmap_modified = guit->bitmap->modified
+	nsgif_error gif_res;
+	const nsgif_bitmap_cb_vt gif_bitmap_callbacks = {
+		.create = gif_bitmap_create,
+		.destroy = guit->bitmap->destroy,
+		.get_buffer = guit->bitmap->get_buffer,
+		.set_opaque = guit->bitmap->set_opaque,
+		.test_opaque = bitmap_test_opaque,
+		.modified = guit->bitmap->modified,
 	};
 
-	/* Initialise our data structure */
-	c->gif = calloc(sizeof(gif_animation), 1);
-	if (c->gif == NULL) {
-		content_broadcast_errorcode(&c->base, NSERROR_NOMEM);
-		return NSERROR_NOMEM;
+	gif_res = nsgif_create(&gif_bitmap_callbacks,
+			nsgif__get_bitmap_format(), &c->gif);
+	if (gif_res != NSGIF_OK) {
+		nserror err = gif__nsgif_error_to_ns(gif_res);
+		content_broadcast_error(&c->base, err, NULL);
+		return err;
 	}
-	gif_create(c->gif, &gif_bitmap_callbacks);
+
 	return NSERROR_OK;
 }
 
-
-
-static nserror nsgif_create(const content_handler *handler, 
-		lwc_string *imime_type, const struct http_parameter *params, 
+static nserror gif_create(const content_handler *handler,
+		lwc_string *imime_type, const struct http_parameter *params,
 		llcache_handle *llcache, const char *fallback_charset,
 		bool quirks, struct content **c)
 {
-	nsgif_content *result;
+	gif_content *result;
 	nserror error;
 
-	result = calloc(1, sizeof(nsgif_content));
+	result = calloc(1, sizeof(gif_content));
 	if (result == NULL)
 		return NSERROR_NOMEM;
 
@@ -112,7 +150,7 @@ static nserror nsgif_create(const content_handler *handler,
 		return error;
 	}
 
-	error = nsgif_create_gif_data(result);
+	error = gif_create_gif_data(result);
 	if (error != NSERROR_OK) {
 		free(result);
 		return error;
@@ -124,119 +162,65 @@ static nserror nsgif_create(const content_handler *handler,
 }
 
 /**
+ * Scheduler callback. Performs any necessary animation.
+ *
+ * \param p  The content to animate
+*/
+static void gif_animate_cb(void *p);
+
+/**
  * Performs any necessary animation.
  *
  * \param p  The content to animate
 */
-static void nsgif_animate(void *p)
+static nserror gif__animate(gif_content *gif, bool redraw)
 {
-	nsgif_content *gif = p;
-	union content_msg_data data;
-	int delay;
-	int f;
-
-	/* Advance by a frame, updating the loop count accordingly */
-	gif->current_frame++;
-	if (gif->current_frame == (int)gif->gif->frame_count_partial) {
-		gif->current_frame = 0;
-
-		/* A loop count of 0 has a special meaning of infinite */
-		if (gif->gif->loop_count != 0) {
-			gif->gif->loop_count--;
-			if (gif->gif->loop_count == 0) {
-				gif->current_frame =
-					gif->gif->frame_count_partial - 1;
-				gif->gif->loop_count = -1;
-			}
-		}
+	nsgif_error gif_res;
+	nsgif_rect_t rect;
+	uint32_t delay;
+	uint32_t f;
+
+	gif_res = nsgif_frame_prepare(gif->gif, &rect, &delay, &f);
+	if (gif_res != NSGIF_OK) {
+		return gif__nsgif_error_to_ns(gif_res);
 	}
 
+	gif->current_frame = f;
+
 	/* Continue animating if we should */
-	if (gif->gif->loop_count >= 0) {
-		delay = gif->gif->frames[gif->current_frame].frame_delay;
-		if (delay < nsoption_int(minimum_gif_delay))
-			delay = nsoption_int(minimum_gif_delay);
-		guit->misc->schedule(delay * 10, nsgif_animate, gif);
+	if (nsoption_bool(animate_images) && delay != NSGIF_INFINITE) {
+		guit->misc->schedule(delay * 10, gif_animate_cb, gif);
 	}
 
-	if ((!nsoption_bool(animate_images)) ||
-	    (!gif->gif->frames[gif->current_frame].display)) {
-		return;
-	}
+	if (redraw) {
+		union content_msg_data data;
 
-	/* area within gif to redraw */
-	f = gif->current_frame;
-	data.redraw.x = gif->gif->frames[f].redraw_x;
-	data.redraw.y = gif->gif->frames[f].redraw_y;
-	data.redraw.width = gif->gif->frames[f].redraw_width;
-	data.redraw.height = gif->gif->frames[f].redraw_height;
-
-	/* redraw background (true) or plot on top (false) */
-	if (gif->current_frame > 0) {
-		data.redraw.full_redraw = 
-				gif->gif->frames[f - 1].redraw_required;
-		/* previous frame needed clearing: expand the redraw area to
-		 * cover it */
-		if (data.redraw.full_redraw) {
-			if (data.redraw.x >
-					(int)(gif->gif->frames[f - 1].redraw_x)) {
-				data.redraw.width += data.redraw.x -
-					gif->gif->frames[f - 1].redraw_x;
-				data.redraw.x = 
-					gif->gif->frames[f - 1].redraw_x;
-			}
-			if (data.redraw.y >
-					(int)(gif->gif->frames[f - 1].redraw_y)) {
-				data.redraw.height += (data.redraw.y -
-					gif->gif->frames[f - 1].redraw_y);
-				data.redraw.y = 
-					gif->gif->frames[f - 1].redraw_y;
-			}
-			if ((int)(gif->gif->frames[f - 1].redraw_x +
-					gif->gif->frames[f - 1].redraw_width) >
-					(data.redraw.x + data.redraw.width))
-				data.redraw.width =
-					gif->gif->frames[f - 1].redraw_x -
-					data.redraw.x +
-					gif->gif->frames[f - 1].redraw_width;
-			if ((int)(gif->gif->frames[f - 1].redraw_y +
-					gif->gif->frames[f - 1].redraw_height) >
-					(data.redraw.y + data.redraw.height))
-				data.redraw.height =
-					gif->gif->frames[f - 1].redraw_y -
-					data.redraw.y +
-					gif->gif->frames[f - 1].redraw_height;
-		}
-	} else {
-		/* do advanced check */
-		if ((data.redraw.x == 0) && (data.redraw.y == 0) &&
-				(data.redraw.width == (int)(gif->gif->width)) &&
-				(data.redraw.height == (int)(gif->gif->height))) {
-			data.redraw.full_redraw = !gif->gif->frames[f].opaque;
-		} else {
-			data.redraw.full_redraw = true;
-			data.redraw.x = 0;
-			data.redraw.y = 0;
-			data.redraw.width = gif->gif->width;
-			data.redraw.height = gif->gif->height;
-		}
+		/* area within gif to redraw */
+		data.redraw.x = rect.x0;
+		data.redraw.y = rect.y0;
+		data.redraw.width  = rect.x1 - rect.x0;
+		data.redraw.height = rect.y1 - rect.y0;
+
+		content_broadcast(&gif->base, CONTENT_MSG_REDRAW, &data);
 	}
 
-	/* other data */
-	data.redraw.object = (struct content *) gif;
-	data.redraw.object_x = 0;
-	data.redraw.object_y = 0;
-	data.redraw.object_width = gif->base.width;
-	data.redraw.object_height = gif->base.height;
+	return NSERROR_OK;
+}
 
-	content_broadcast(&gif->base, CONTENT_MSG_REDRAW, &data);
+static void gif_animate_cb(void *p)
+{
+	gif_content *gif = p;
+
+	gif__animate(gif, true);
 }
 
-static bool nsgif_convert(struct content *c)
+static bool gif_convert(struct content *c)
 {
-	nsgif_content *gif = (nsgif_content *) c;
-	int res;
+	gif_content *gif = (gif_content *) c;
+	const nsgif_info_t *gif_info;
 	const uint8_t *data;
+	nsgif_error gif_err;
+	nserror err;
 	size_t size;
 	char *title;
 
@@ -244,37 +228,32 @@ static bool nsgif_convert(struct content *c)
 	data = content__get_source_data(c, &size);
 
 	/* Initialise the GIF */
-	do {
-		res = gif_initialise(gif->gif, size, (unsigned char *) data);
-		if (res != GIF_OK && res != GIF_WORKING && 
-				res != GIF_INSUFFICIENT_FRAME_DATA) {
-			nserror error = NSERROR_UNKNOWN;
-			switch (res) {
-			case GIF_FRAME_DATA_ERROR:
-			case GIF_INSUFFICIENT_DATA:
-			case GIF_DATA_ERROR:
-				error = NSERROR_GIF_ERROR;
-				break;
-			case GIF_INSUFFICIENT_MEMORY:
-				error = NSERROR_NOMEM;
-				break;
-			}
-			content_broadcast_errorcode(c, error);
-			return false;
-		}
-	} while (res != GIF_OK && res != GIF_INSUFFICIENT_FRAME_DATA);
+	gif_err = nsgif_data_scan(gif->gif, size, data);
+	if (gif_err != NSGIF_OK) {
+		NSLOG(netsurf, INFO, "nsgif scan: %s", nsgif_strerror(gif_err));
+		/* Not fatal unless we have no frames. */
+	}
+
+	nsgif_data_complete(gif->gif);
+
+	gif_info = nsgif_get_info(gif->gif);
+	assert(gif_info != NULL);
 
 	/* Abort on bad GIFs */
-	if ((gif->gif->frame_count_partial == 0) || (gif->gif->width == 0) ||
-			(gif->gif->height == 0)) {
-		content_broadcast_errorcode(c, NSERROR_GIF_ERROR);
+	if (gif_info->frame_count == 0) {
+		err = gif__nsgif_error_to_ns(gif_err);
+		content_broadcast_error(c, err, "GIF with no frames.");
+		return false;
+	} else if (gif_info->width == 0 || gif_info->height == 0) {
+		err = gif__nsgif_error_to_ns(gif_err);
+		content_broadcast_error(c, err, "Zero size image.");
 		return false;
 	}
 
 	/* Store our content width, height and calculate size */
-	c->width = gif->gif->width;
-	c->height = gif->gif->height;
-	c->size += (gif->gif->width * gif->gif->height * 4) + 16 + 44;
+	c->width = gif_info->width;
+	c->height = gif_info->height;
+	c->size += (gif_info->width * gif_info->height * 4) + 16 + 44;
 
 	/* set title text */
 	title = messages_get_buff("GIFTitle",
@@ -285,12 +264,11 @@ static bool nsgif_convert(struct content *c)
 		free(title);
 	}
 
-	/* Schedule the animation if we have one */
-	gif->current_frame = 0;
-	if (gif->gif->frame_count_partial > 1)
-		guit->misc->schedule(gif->gif->frames[0].frame_delay * 10,
-					nsgif_animate,
-					c);
+	err = gif__animate(gif, false);
+	if (err != NSERROR_OK) {
+		content_broadcast_error(c, NSERROR_GIF_ERROR, NULL);
+		return false;
+	}
 
 	/* Exit as a success */
 	content_set_ready(c);
@@ -301,68 +279,51 @@ static bool nsgif_convert(struct content *c)
 	return true;
 }
 
-
 /**
  * Updates the GIF bitmap to display the current frame
  *
  * \param gif The gif context to update.
- * \return GIF_OK on success else apropriate error code.
+ * \return NSGIF_OK on success else apropriate error code.
  */
-static gif_result nsgif_get_frame(nsgif_content *gif)
+static nsgif_error gif_get_frame(gif_content *gif,
+		nsgif_bitmap_t **bitmap)
 {
-	int previous_frame, current_frame, frame;
-	gif_result res = GIF_OK;
-
-	current_frame = gif->current_frame;
+	uint32_t current_frame = gif->current_frame;
 	if (!nsoption_bool(animate_images)) {
 		current_frame = 0;
 	}
 
-	if (current_frame < gif->gif->decoded_frame) {
-		previous_frame = 0;
-	} else {
-		previous_frame = gif->gif->decoded_frame + 1;
-	}
-
-	for (frame = previous_frame; frame <= current_frame; frame++) {
-		res = gif_decode_frame(gif->gif, frame);
-	}
-
-	return res;
+	return nsgif_frame_decode(gif->gif, current_frame, bitmap);
 }
 
-static bool nsgif_redraw(struct content *c, struct content_redraw_data *data,
+static bool gif_redraw(struct content *c, struct content_redraw_data *data,
 		const struct rect *clip, const struct redraw_context *ctx)
 {
-	nsgif_content *gif = (nsgif_content *) c;
+	gif_content *gif = (gif_content *) c;
+	nsgif_bitmap_t *bitmap;
 
-	if (gif->current_frame != gif->gif->decoded_frame) {
-		if (nsgif_get_frame(gif) != GIF_OK) {
-			return false;
-		}
+	if (gif_get_frame(gif, &bitmap) != NSGIF_OK) {
+		return false;
 	}
 
-	return image_bitmap_plot(gif->gif->frame_image, data, clip, ctx);
+	return image_bitmap_plot(bitmap, data, clip, ctx);
 }
 
-
-static void nsgif_destroy(struct content *c)
+static void gif_destroy(struct content *c)
 {
-	nsgif_content *gif = (nsgif_content *) c;
+	gif_content *gif = (gif_content *) c;
 
 	/* Free all the associated memory buffers */
-	guit->misc->schedule(-1, nsgif_animate, c);
-	gif_finalise(gif->gif);
-	free(gif->gif);
+	guit->misc->schedule(-1, gif_animate_cb, c);
+	nsgif_destroy(gif->gif);
 }
 
-
-static nserror nsgif_clone(const struct content *old, struct content **newc)
+static nserror gif_clone(const struct content *old, struct content **newc)
 {
-	nsgif_content *gif;
+	gif_content *gif;
 	nserror error;
 
-	gif = calloc(1, sizeof(nsgif_content));
+	gif = calloc(1, sizeof(gif_content));
 	if (gif == NULL)
 		return NSERROR_NOMEM;
 
@@ -373,7 +334,7 @@ static nserror nsgif_clone(const struct content *old, struct content **newc)
 	}
 
 	/* Simply replay creation and conversion of content */
-	error = nsgif_create_gif_data(gif);
+	error = gif_create_gif_data(gif);
 	if (error != NSERROR_OK) {
 		content_destroy(&gif->base);
 		return error;
@@ -381,7 +342,7 @@ static nserror nsgif_clone(const struct content *old, struct content **newc)
 
 	if (old->status == CONTENT_STATUS_READY ||
 			old->status == CONTENT_STATUS_DONE) {
-		if (nsgif_convert(&gif->base) == false) {
+		if (gif_convert(&gif->base) == false) {
 			content_destroy(&gif->base);
 			return NSERROR_CLONE_FAILED;
 		}
@@ -392,9 +353,9 @@ static nserror nsgif_clone(const struct content *old, struct content **newc)
 	return NSERROR_OK;
 }
 
-static void nsgif_add_user(struct content *c)
+static void gif_add_user(struct content *c)
 {
-	nsgif_content *gif = (nsgif_content *) c;
+	gif_content *gif = (gif_content *) c;
 
 	/* Ensure this content has already been converted.
 	 * If it hasn't, the animation will start at the conversion phase instead. */
@@ -402,53 +363,66 @@ static void nsgif_add_user(struct content *c)
 
 	if (content_count_users(c) == 1) {
 		/* First user, and content already converted, so start the animation. */
-		if (gif->gif->frame_count_partial > 1) {
-			guit->misc->schedule(gif->gif->frames[0].frame_delay * 10,
-				nsgif_animate, c);
+		if (nsgif_reset(gif->gif) == NSGIF_OK) {
+			gif__animate(gif, true);
 		}
 	}
 }
 
-static void nsgif_remove_user(struct content *c)
+static void gif_remove_user(struct content *c)
 {
 	if (content_count_users(c) == 1) {
 		/* Last user is about to be removed from this content, so stop the animation. */
-		guit->misc->schedule(-1, nsgif_animate, c);
+		guit->misc->schedule(-1, gif_animate_cb, c);
 	}
 }
 
-static void *nsgif_get_internal(const struct content *c, void *context)
+static nsgif_bitmap_t *gif_get_bitmap(
+		const struct content *c, void *context)
 {
-	nsgif_content *gif = (nsgif_content *) c;
+	gif_content *gif = (gif_content *) c;
+	nsgif_bitmap_t *bitmap;
 
-	if (gif->current_frame != gif->gif->decoded_frame) {
-		if (nsgif_get_frame(gif) != GIF_OK)
-			return NULL;
+	if (gif_get_frame(gif, &bitmap) != NSGIF_OK) {
+		return NULL;
 	}
 
-	return gif->gif->frame_image;
+	return bitmap;
 }
 
-static content_type nsgif_content_type(void)
+static content_type gif_content_type(void)
 {
 	return CONTENT_IMAGE;
 }
 
-static const content_handler nsgif_content_handler = {
-	.create = nsgif_create,
-	.data_complete = nsgif_convert,
-	.destroy = nsgif_destroy,
-	.redraw = nsgif_redraw,
-	.clone = nsgif_clone,
-	.add_user = nsgif_add_user,
-	.remove_user = nsgif_remove_user,
-	.get_internal = nsgif_get_internal,
-	.type = nsgif_content_type,
+static bool gif_content_is_opaque(struct content *c)
+{
+	gif_content *gif = (gif_content *) c;
+	nsgif_bitmap_t *bitmap;
+
+	if (gif_get_frame(gif, &bitmap) != NSGIF_OK) {
+		return false;
+	}
+
+	return guit->bitmap->get_opaque(bitmap);
+}
+
+static const content_handler gif_content_handler = {
+	.create = gif_create,
+	.data_complete = gif_convert,
+	.destroy = gif_destroy,
+	.redraw = gif_redraw,
+	.clone = gif_clone,
+	.add_user = gif_add_user,
+	.remove_user = gif_remove_user,
+	.get_internal = gif_get_bitmap,
+	.type = gif_content_type,
+	.is_opaque = gif_content_is_opaque,
 	.no_share = false,
 };
 
-static const char *nsgif_types[] = {
+static const char *gif_types[] = {
 	"image/gif"
 };
 
-CONTENT_FACTORY_REGISTER_TYPES(nsgif, nsgif_types, nsgif_content_handler);
+CONTENT_FACTORY_REGISTER_TYPES(nsgif, gif_types, gif_content_handler);
diff --git a/content/handlers/image/ico.c b/content/handlers/image/ico.c
index 467533376..871da41a9 100644
--- a/content/handlers/image/ico.c
+++ b/content/handlers/image/ico.c
@@ -16,8 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * Content for image/ico (implementation)
+/**
+ * \file
+ * implementation for image/ico content handler
  */
 
 #include <stdbool.h>
@@ -31,7 +32,9 @@
 #include "netsurf/content.h"
 #include "content/llcache.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "desktop/gui_internal.h"
+#include "desktop/bitmap.h"
 
 #include "image/image.h"
 #include "image/ico.h"
@@ -39,8 +42,7 @@
 typedef struct nsico_content {
 	struct content base;
 
-	struct ico_collection *ico;	/** ICO collection data */
-
+	struct ico_collection *ico; /** ICO collection data */
 } nsico_content;
 
 /**
@@ -53,12 +55,12 @@ typedef struct nsico_content {
  */
 static void *nsico_bitmap_create(int width, int height, unsigned int bmp_state)
 {
-	unsigned int bitmap_state = BITMAP_NEW;
+	unsigned int bitmap_state = BITMAP_NONE;
 
 	/* set bitmap state based on bmp state */
 	bitmap_state |= (bmp_state & BMP_OPAQUE) ? BITMAP_OPAQUE : 0;
 	bitmap_state |= (bmp_state & BMP_CLEAR_MEMORY) ?
-			BITMAP_CLEAR_MEMORY : 0;
+			BITMAP_CLEAR : 0;
 
 	/* return the created bitmap */
 	return guit->bitmap->create(width, height, bitmap_state);
@@ -70,12 +72,11 @@ static nserror nsico_create_ico_data(nsico_content *c)
 		.bitmap_create = nsico_bitmap_create,
 		.bitmap_destroy = guit->bitmap->destroy,
 		.bitmap_get_buffer = guit->bitmap->get_buffer,
-		.bitmap_get_bpp = guit->bitmap->get_bpp
 	};
 
 	c->ico = calloc(sizeof(ico_collection), 1);
 	if (c->ico == NULL) {
-		content_broadcast_errorcode(&c->base, NSERROR_NOMEM);
+		content_broadcast_error(&c->base, NSERROR_NOMEM, NULL);
 		return NSERROR_NOMEM;
 	}
 	ico_collection_create(c->ico, &bmp_bitmap_callbacks);
@@ -83,7 +84,7 @@ static nserror nsico_create_ico_data(nsico_content *c)
 }
 
 
-static nserror nsico_create(const content_handler *handler, 
+static nserror nsico_create(const content_handler *handler,
 		lwc_string *imime_type, const struct http_parameter *params,
 		llcache_handle *llcache, const char *fallback_charset,
 		bool quirks, struct content **c)
@@ -134,11 +135,11 @@ static bool nsico_convert(struct content *c)
 	case BMP_OK:
 		break;
 	case BMP_INSUFFICIENT_MEMORY:
-		content_broadcast_errorcode(c, NSERROR_NOMEM);
+		content_broadcast_error(c, NSERROR_NOMEM, NULL);
 		return false;
 	case BMP_INSUFFICIENT_DATA:
 	case BMP_DATA_ERROR:
-		content_broadcast_errorcode(c, NSERROR_ICO_ERROR);
+		content_broadcast_error(c, NSERROR_ICO_ERROR, NULL);
 		return false;
 	}
 
@@ -172,6 +173,23 @@ static bool nsico_convert(struct content *c)
 	return true;
 }
 
+static bool nsico__decode(struct bmp_image *ico)
+{
+	if (ico->decoded == false) {
+		NSLOG(netsurf, DEBUG, "Decoding ICO %p", ico);
+		if (bmp_decode(ico) != BMP_OK) {
+			return false;
+		}
+
+		bitmap_format_to_client(ico->bitmap, &(bitmap_fmt_t) {
+			.layout = BITMAP_LAYOUT_R8G8B8A8,
+		});
+		guit->bitmap->modified(ico->bitmap);
+
+	}
+
+	return true;
+}
 
 static bool nsico_redraw(struct content *c, struct content_redraw_data *data,
 		const struct rect *clip, const struct redraw_context *ctx)
@@ -188,14 +206,8 @@ static bool nsico_redraw(struct content *c, struct content_redraw_data *data,
 	}
 
 	/* ensure its decided */
-	if (bmp->decoded == false) {
-		if (bmp_decode(bmp) != BMP_OK) {
-			return false;
-		} else {
-			NSLOG(netsurf, INFO, "Decoding bitmap");
-			guit->bitmap->modified(bmp->bitmap);
-		}
-
+	if (!nsico__decode(bmp)) {
+		return false;
 	}
 
 	return image_bitmap_plot(bmp->bitmap, data, clip, ctx);
@@ -250,7 +262,7 @@ static void *nsico_get_internal(const struct content *c, void *context)
 	nsico_content *ico = (nsico_content *) c;
 	/* TODO: Pick best size for purpose.
 	 *       Currently assumes it's for a URL bar. */
-	struct bmp_image *bmp; 
+	struct bmp_image *bmp;
 
 	bmp = ico_find(ico->ico, 16, 16);
 	if (bmp == NULL) {
@@ -259,12 +271,8 @@ static void *nsico_get_internal(const struct content *c, void *context)
 		return NULL;
 	}
 
-	if (bmp->decoded == false) {
-		if (bmp_decode(bmp) != BMP_OK) {
-			return NULL;
-		} else {
-			guit->bitmap->modified(bmp->bitmap);
-		}
+	if (!nsico__decode(bmp)) {
+		return NULL;
 	}
 
 	return bmp->bitmap;
@@ -275,6 +283,29 @@ static content_type nsico_content_type(void)
 	return CONTENT_IMAGE;
 }
 
+static bool nsico_is_opaque(struct content *c)
+{
+	nsico_content *ico = (nsico_content *) c;
+	struct bmp_image *bmp;
+
+	/**
+	 * \todo Pick best size for purpose. Currently assumes
+	 *         it's for a URL bar.
+	 */
+	bmp = ico_find(ico->ico, 16, 16);
+	if (bmp == NULL) {
+		/* return error */
+		NSLOG(netsurf, INFO, "Failed to select icon");
+		return false;
+	}
+
+	if (!nsico__decode(bmp)) {
+		return false;
+	}
+
+	return guit->bitmap->get_opaque(bmp->bitmap);
+}
+
 static const content_handler nsico_content_handler = {
 	.create = nsico_create,
 	.data_complete = nsico_convert,
@@ -283,6 +314,7 @@ static const content_handler nsico_content_handler = {
 	.clone = nsico_clone,
 	.get_internal = nsico_get_internal,
 	.type = nsico_content_type,
+	.is_opaque = nsico_is_opaque,
 	.no_share = false,
 };
 
diff --git a/content/handlers/image/image.c b/content/handlers/image/image.c
index 4eb366e0b..2bd5f5f8d 100644
--- a/content/handlers/image/image.c
+++ b/content/handlers/image/image.c
@@ -26,11 +26,13 @@
 #include "netsurf/bitmap.h"
 #include "netsurf/content.h"
 #include "desktop/gui_internal.h"
+#include "desktop/bitmap.h"
 
 #include "image/bmp.h"
 #include "image/gif.h"
 #include "image/ico.h"
 #include "image/jpeg.h"
+#include "image/jpegxl.h"
 #include "image/nssprite.h"
 #include "image/png.h"
 #include "image/rsvg.h"
@@ -71,6 +73,12 @@ nserror image_init(void)
 		return error;
 #endif
 
+#ifdef WITH_JPEGXL
+	error = nsjpegxl_init();
+	if (error != NSERROR_OK)
+		return error;
+#endif
+
 #ifdef WITH_PNG
 	error = nspng_init();
 	if (error != NSERROR_OK)
@@ -124,7 +132,7 @@ bool image_bitmap_plot(struct bitmap *bitmap,
 		if (height == 1) {
 			/* optimise 1x1 bitmap plot */
 			pixel = guit->bitmap->get_buffer(bitmap);
-			fill_style.fill_colour = pixel_to_colour(pixel);
+			fill_style.fill_colour = bitmap_pixel_to_colour(pixel);
 
 			if (guit->bitmap->get_opaque(bitmap) ||
 			    ((fill_style.fill_colour & 0xff000000) == 0xff000000)) {
diff --git a/content/handlers/image/image_cache.c b/content/handlers/image/image_cache.c
index a1de01da5..8f7ff89ff 100644
--- a/content/handlers/image/image_cache.c
+++ b/content/handlers/image/image_cache.c
@@ -438,6 +438,7 @@ image_cache_init(const struct image_cache_parameters *image_cache_parameters)
 nserror image_cache_fini(void)
 {
 	unsigned int op_count;
+	uint64_t op_size;
 
 	guit->misc->schedule(-1, image_cache__background_update, image_cache);
 
@@ -452,6 +453,10 @@ nserror image_cache_fini(void)
 		image_cache->miss_count +
 		image_cache->fail_count;
 
+	op_size = image_cache->hit_size +
+		image_cache->miss_size +
+		image_cache->fail_size;
+
 	NSLOG(netsurf, INFO, "Age %ds", image_cache->current_age / 1000);
 	NSLOG(netsurf, INFO, "Peak size %"PRIsizet" (in %d)",
 	      image_cache->max_bitmap_size,
@@ -460,12 +465,7 @@ nserror image_cache_fini(void)
 	      image_cache->max_bitmap_count,
 	      image_cache->max_bitmap_count_size);
 
-	if (op_count > 0) {
-		uint64_t op_size;
-
-		op_size = image_cache->hit_size +
-			image_cache->miss_size +
-			image_cache->fail_size;
+	if ((op_count > 0) && (op_size >0)) {
 
 		NSLOG(netsurf, INFO,
 		      "Cache total/hit/miss/fail (counts) %d/%d/%d/%d (100%%/%d%%/%d%%/%d%%)",
@@ -528,7 +528,7 @@ nserror image_cache_add(struct content *content,
 		image_cache__link(centry);
 		centry->content = content;
 
-		centry->bitmap_size = content->width * content->height * 4;
+		centry->bitmap_size = content->width * content->height * 4llu;
 	}
 
 	NSLOG(netsurf, INFO, "centry %p, content %p, bitmap %p", centry,
@@ -632,15 +632,15 @@ case chr :					\
 				slen++;
 				break;
 
-			FMTCHR('a', PRIssizet, params.limit);
-			FMTCHR('b', PRIssizet, params.hysteresis);
-			FMTCHR('c', PRIssizet, total_bitmap_size);
+			FMTCHR('a', PRIsizet, params.limit);
+			FMTCHR('b', PRIsizet, params.hysteresis);
+			FMTCHR('c', PRIsizet, total_bitmap_size);
 			FMTCHR('d', "d", bitmap_count);
 			FMTCHR('e', "u", current_age / 1000);
-			FMTCHR('f', PRIssizet, max_bitmap_size);
+			FMTCHR('f', PRIsizet, max_bitmap_size);
 			FMTCHR('g', "d", max_bitmap_size_count);
 			FMTCHR('h', "d", max_bitmap_count);
-			FMTCHR('i', PRIssizet, max_bitmap_count_size);
+			FMTCHR('i', PRIsizet, max_bitmap_count_size);
 
 
 			case 'j':
@@ -770,7 +770,7 @@ image_cache_snentryf(char *string,
 				if (centry->bitmap != NULL) {
 					slen += snprintf(string + slen,
 							 size - slen,
-							 "%" PRIssizet,
+							 "%" PRIsizet,
 							 centry->bitmap_size);
 				} else {
 					slen += snprintf(string + slen,
@@ -859,6 +859,17 @@ void *image_cache_get_internal(const struct content *c, void *context)
 }
 
 /* exported interface documented in image_cache.h */
+bool image_cache_is_opaque(struct content *c)
+{
+	struct bitmap *bmp;
+	bmp = image_cache_get_bitmap(c);
+	if (bmp != NULL) {
+		return guit->bitmap->get_opaque(bmp);
+	}
+	return false;
+}
+
+/* exported interface documented in image_cache.h */
 content_type image_cache_content_type(void)
 {
 	return CONTENT_IMAGE;
diff --git a/content/handlers/image/image_cache.h b/content/handlers/image/image_cache.h
index d57a3a956..1c2d621a6 100644
--- a/content/handlers/image/image_cache.h
+++ b/content/handlers/image/image_cache.h
@@ -40,6 +40,7 @@
 #include "utils/errors.h"
 #include "netsurf/content_type.h"
 
+struct content;
 struct content_redraw_data;
 struct redraw_context;
 
@@ -170,7 +171,8 @@ int image_cache_snsummaryf(char *string, size_t size, const char *fmt);
 
 /********* Image content handler generic cache callbacks ************/
 
-/** Generic content redraw callback
+/**
+ * Generic content redraw callback
  *
  * May be used by image content handlers as their redraw
  * callback. Performs all neccissary cache lookups and conversions and
@@ -185,6 +187,8 @@ void image_cache_destroy(struct content *c);
 
 void *image_cache_get_internal(const struct content *c, void *context);
 
+bool image_cache_is_opaque(struct content *c);
+
 content_type image_cache_content_type(void);
 
 #endif
diff --git a/content/handlers/image/jpeg.c b/content/handlers/image/jpeg.c
index 52cdb2201..93372f15a 100644
--- a/content/handlers/image/jpeg.c
+++ b/content/handlers/image/jpeg.c
@@ -33,8 +33,11 @@
 #include "utils/messages.h"
 #include "netsurf/bitmap.h"
 #include "content/llcache.h"
+#include "content/content.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "desktop/gui_internal.h"
+#include "desktop/bitmap.h"
 
 #include "image/image_cache.h"
 
@@ -47,13 +50,8 @@
  */
 #define MIN_JPEG_SIZE 20
 
-#ifdef riscos
-/* We prefer the library to be configured with these options to save
- * copying data during decoding. */
-#if RGB_RED != 0 || RGB_GREEN != 1 || RGB_BLUE != 2 || RGB_PIXELSIZE != 4
-#warning JPEG library not optimally configured. Decoding will be slower.
-#endif
-/* but we don't care if we're not on RISC OS */
+#ifndef LIBJPEG_TURBO_VERSION
+#warning Using libjpeg (libjpeg-turbo is recommended)
 #endif
 
 static char nsjpeg_error_buffer[JMSG_LENGTH_MAX];
@@ -163,6 +161,96 @@ static void nsjpeg_error_exit(j_common_ptr cinfo)
 }
 
 /**
+ * Convert scan lines from CMYK to core client bitmap layout.
+ */
+static inline void nsjpeg__decode_cmyk(
+		struct jpeg_decompress_struct *cinfo,
+		uint8_t * volatile pixels,
+		size_t rowstride)
+{
+	int width = cinfo->output_width * 4;
+
+	do {
+		JSAMPROW scanlines[1] = {
+			[0] = (JSAMPROW)
+				(pixels + rowstride * cinfo->output_scanline),
+		};
+		jpeg_read_scanlines(cinfo, scanlines, 1);
+
+		for (int i = width - 4; 0 <= i; i -= 4) {
+			/* Trivial inverse CMYK -> RGBA */
+			const int c = scanlines[0][i + 0];
+			const int m = scanlines[0][i + 1];
+			const int y = scanlines[0][i + 2];
+			const int k = scanlines[0][i + 3];
+
+			const int ck = c * k;
+			const int mk = m * k;
+			const int yk = y * k;
+
+#define DIV255(x) ((x) + 1 + ((x) >> 8)) >> 8
+			scanlines[0][i + bitmap_layout.r] = DIV255(ck);
+			scanlines[0][i + bitmap_layout.g] = DIV255(mk);
+			scanlines[0][i + bitmap_layout.b] = DIV255(yk);
+			scanlines[0][i + bitmap_layout.a] = 0xff;
+#undef DIV255
+		}
+	} while (cinfo->output_scanline != cinfo->output_height);
+}
+
+/**
+ * Convert scan lines from CMYK to core client bitmap layout.
+ */
+static inline void nsjpeg__decode_rgb(
+		struct jpeg_decompress_struct *cinfo,
+		uint8_t * volatile pixels,
+		size_t rowstride)
+{
+#if RGB_RED != 0 || RGB_GREEN != 1 || RGB_BLUE != 2 || RGB_PIXELSIZE != 4
+	int width = cinfo->output_width;
+#endif
+
+	do {
+		JSAMPROW scanlines[1] = {
+			[0] = (JSAMPROW)
+				(pixels + rowstride * cinfo->output_scanline),
+		};
+		jpeg_read_scanlines(cinfo, scanlines, 1);
+
+#if RGB_RED != 0 || RGB_GREEN != 1 || RGB_BLUE != 2 || RGB_PIXELSIZE != 4
+		/* Missmatch between configured libjpeg pixel format and
+		 * NetSurf pixel format.  Convert to RGBA */
+		for (int i = width - 1; 0 <= i; i--) {
+			int r = scanlines[0][i * RGB_PIXELSIZE + RGB_RED];
+			int g = scanlines[0][i * RGB_PIXELSIZE + RGB_GREEN];
+			int b = scanlines[0][i * RGB_PIXELSIZE + RGB_BLUE];
+			scanlines[0][i * 4 + bitmap_layout.r] = r;
+			scanlines[0][i * 4 + bitmap_layout.g] = g;
+			scanlines[0][i * 4 + bitmap_layout.b] = b;
+			scanlines[0][i * 4 + bitmap_layout.a] = 0xff;
+		}
+#endif
+	} while (cinfo->output_scanline != cinfo->output_height);
+}
+
+/**
+ * Convert scan lines from CMYK to core client bitmap layout.
+ */
+static inline void nsjpeg__decode_client_fmt(
+		struct jpeg_decompress_struct *cinfo,
+		uint8_t * volatile pixels,
+		size_t rowstride)
+{
+	do {
+		JSAMPROW scanlines[1] = {
+			[0] = (JSAMPROW)
+				(pixels + rowstride * cinfo->output_scanline),
+		};
+		jpeg_read_scanlines(cinfo, scanlines, 1);
+	} while (cinfo->output_scanline != cinfo->output_height);
+}
+
+/**
  * create a bitmap from jpeg content.
  */
 static struct bitmap *
@@ -173,8 +261,6 @@ jpeg_cache_convert(struct content *c)
 	struct jpeg_decompress_struct cinfo;
 	struct jpeg_error_mgr jerr;
 	jmp_buf setjmp_buffer;
-	unsigned int height;
-	unsigned int width;
 	struct bitmap * volatile bitmap = NULL;
 	uint8_t * volatile pixels = NULL;
 	size_t rowstride;
@@ -219,21 +305,42 @@ jpeg_cache_convert(struct content *c)
 
 	/* set output processing parameters */
 	if (cinfo.jpeg_color_space == JCS_CMYK ||
-			cinfo.jpeg_color_space == JCS_YCCK) {
+	    cinfo.jpeg_color_space == JCS_YCCK) {
 		cinfo.out_color_space = JCS_CMYK;
 	} else {
+#ifdef JCS_ALPHA_EXTENSIONS
+		switch (bitmap_fmt.layout) {
+		case BITMAP_LAYOUT_R8G8B8A8:
+			cinfo.out_color_space = JCS_EXT_RGBA;
+			break;
+		case BITMAP_LAYOUT_B8G8R8A8:
+			cinfo.out_color_space = JCS_EXT_BGRA;
+			break;
+		case BITMAP_LAYOUT_A8R8G8B8:
+			cinfo.out_color_space = JCS_EXT_ARGB;
+			break;
+		case BITMAP_LAYOUT_A8B8G8R8:
+			cinfo.out_color_space = JCS_EXT_ABGR;
+			break;
+		default:
+			NSLOG(netsurf, ERROR, "Unexpected bitmap format: %u",
+					bitmap_fmt.layout);
+			jpeg_destroy_decompress(&cinfo);
+			return NULL;
+		}
+#else
 		cinfo.out_color_space = JCS_RGB;
+#endif
 	}
 	cinfo.dct_method = JDCT_ISLOW;
 
 	/* commence the decompression, output parameters now valid */
 	jpeg_start_decompress(&cinfo);
 
-	width = cinfo.output_width;
-	height = cinfo.output_height;
-
 	/* create opaque bitmap (jpegs cannot be transparent) */
-	bitmap = guit->bitmap->create(width, height, BITMAP_NEW | BITMAP_OPAQUE);
+	bitmap = guit->bitmap->create(
+			cinfo.output_width,
+			cinfo.output_height, BITMAP_OPAQUE);
 	if (bitmap == NULL) {
 		/* empty bitmap could not be created */
 		jpeg_destroy_decompress(&cinfo);
@@ -250,50 +357,21 @@ jpeg_cache_convert(struct content *c)
 
 	/* Convert scanlines from jpeg into bitmap */
 	rowstride = guit->bitmap->get_rowstride(bitmap);
-	do {
-		JSAMPROW scanlines[1];
 
-		scanlines[0] = (JSAMPROW) (pixels +
-					   rowstride * cinfo.output_scanline);
-		jpeg_read_scanlines(&cinfo, scanlines, 1);
+	switch (cinfo.out_color_space) {
+	case JCS_CMYK:
+		nsjpeg__decode_cmyk(&cinfo, pixels, rowstride);
+		break;
 
-		if (cinfo.out_color_space == JCS_CMYK) {
-			int i;
-			for (i = width - 1; 0 <= i; i--) {
-				/* Trivial inverse CMYK -> RGBA */
-				const int c = scanlines[0][i * 4 + 0];
-				const int m = scanlines[0][i * 4 + 1];
-				const int y = scanlines[0][i * 4 + 2];
-				const int k = scanlines[0][i * 4 + 3];
+	case JCS_RGB:
+		nsjpeg__decode_rgb(&cinfo, pixels, rowstride);
+		break;
 
-				const int ck = c * k;
-				const int mk = m * k;
-				const int yk = y * k;
+	default:
+		nsjpeg__decode_client_fmt(&cinfo, pixels, rowstride);
+		break;
+	}
 
-#define DIV255(x) ((x) + 1 + ((x) >> 8)) >> 8
-				scanlines[0][i * 4 + 0] = DIV255(ck);
-				scanlines[0][i * 4 + 1] = DIV255(mk);
-				scanlines[0][i * 4 + 2] = DIV255(yk);
-				scanlines[0][i * 4 + 3] = 0xff;
-#undef DIV255
-			}
-		} else {
-#if RGB_RED != 0 || RGB_GREEN != 1 || RGB_BLUE != 2 || RGB_PIXELSIZE != 4
-			/* Missmatch between configured libjpeg pixel format and
-			 * NetSurf pixel format.  Convert to RGBA */
-			int i;
-			for (i = width - 1; 0 <= i; i--) {
-				int r = scanlines[0][i * RGB_PIXELSIZE + RGB_RED];
-				int g = scanlines[0][i * RGB_PIXELSIZE + RGB_GREEN];
-				int b = scanlines[0][i * RGB_PIXELSIZE + RGB_BLUE];
-				scanlines[0][i * 4 + 0] = r;
-				scanlines[0][i * 4 + 1] = g;
-				scanlines[0][i * 4 + 2] = b;
-				scanlines[0][i * 4 + 3] = 0xff;
-			}
-#endif
-		}
-	} while (cinfo.output_scanline != cinfo.output_height);
 	guit->bitmap->modified(bitmap);
 
 	jpeg_finish_decompress(&cinfo);
@@ -329,7 +407,8 @@ static bool nsjpeg_convert(struct content *c)
 	if (setjmp(setjmp_buffer)) {
 		jpeg_destroy_decompress(&cinfo);
 
-		msg_data.error = nsjpeg_error_buffer;
+		msg_data.errordata.errorcode = NSERROR_UNKNOWN;
+		msg_data.errordata.errormsg = nsjpeg_error_buffer;
 		content_broadcast(c, CONTENT_MSG_ERROR, &msg_data);
 		return false;
 	}
@@ -411,6 +490,7 @@ static const content_handler nsjpeg_content_handler = {
 	.clone = nsjpeg_clone,
 	.get_internal = image_cache_get_internal,
 	.type = image_cache_content_type,
+	.is_opaque = image_cache_is_opaque,
 	.no_share = false,
 };
 
diff --git a/content/handlers/image/jpegxl.c b/content/handlers/image/jpegxl.c
new file mode 100644
index 000000000..01c704577
--- /dev/null
+++ b/content/handlers/image/jpegxl.c
@@ -0,0 +1,340 @@
+/*
+ * Copyright 2023 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * implementation of content handling for image/jpegxl
+ *
+ * This implementation uses the JXL library.
+ */
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <setjmp.h>
+#include <string.h>
+
+#include <jxl/decode.h>
+
+#include "utils/utils.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "netsurf/bitmap.h"
+#include "content/llcache.h"
+#include "content/content.h"
+#include "content/content_protected.h"
+#include "content/content_factory.h"
+#include "desktop/gui_internal.h"
+#include "desktop/bitmap.h"
+
+#include "image/image_cache.h"
+
+#include "image/jpegxl.h"
+
+
+/**
+ * output image format
+ */
+static const JxlPixelFormat jxl_output_format = {
+	.num_channels = 4,
+	.data_type    = JXL_TYPE_UINT8,
+	.endianness   = JXL_LITTLE_ENDIAN,
+	.align        = 0,
+};
+
+/**
+ * Content create entry point.
+ */
+static nserror
+nsjpegxl_create(const content_handler *handler,
+		lwc_string *imime_type, const struct http_parameter *params,
+		llcache_handle *llcache, const char *fallback_charset,
+		bool quirks, struct content **c)
+{
+	struct content *jpeg;
+	nserror error;
+
+	jpeg = calloc(1, sizeof(struct content));
+	if (jpeg == NULL)
+		return NSERROR_NOMEM;
+
+	error = content__init(jpeg, handler, imime_type, params,
+			      llcache, fallback_charset, quirks);
+	if (error != NSERROR_OK) {
+		free(jpeg);
+		return error;
+	}
+
+	*c = jpeg;
+
+	return NSERROR_OK;
+}
+
+/**
+ * create a bitmap from jpeg xl content.
+ */
+static struct bitmap *
+jpegxl_cache_convert(struct content *c)
+{
+	struct bitmap * bitmap = NULL;
+	JxlDecoder *jxldec;
+	JxlDecoderStatus decstatus;
+	JxlBasicInfo binfo;
+	const uint8_t *src_data;
+	size_t src_size;
+	uint8_t * output;
+	bitmap_fmt_t jxl_fmt = {
+		/** TODO: At the moment we have to set the layout to the only
+		 *        pixel layout that libjxl supports. It looks like they
+		 *        plan to add support for decoding to other layouts
+		 *        in the future, as shown by the TODO in the docs:
+		 *
+		 * https://libjxl.readthedocs.io/en/latest/api_common.html#_CPPv414JxlPixelFormat
+		 */
+		.layout = BITMAP_LAYOUT_R8G8B8A8,
+		.pma    = bitmap_fmt.pma,
+	};
+
+	jxldec = JxlDecoderCreate(NULL);
+	if (jxldec == NULL) {
+		NSLOG(netsurf, ERROR, "Unable to allocate decoder");
+		return NULL;
+	}
+
+	decstatus = JxlDecoderSetUnpremultiplyAlpha(jxldec, !bitmap_fmt.pma);
+	if (decstatus != JXL_DEC_SUCCESS) {
+		NSLOG(netsurf, ERROR, "unable to set premultiplied alpha status: %d",
+				decstatus);
+		JxlDecoderDestroy(jxldec);
+		return NULL;
+	}
+
+	decstatus= JxlDecoderSubscribeEvents(jxldec, JXL_DEC_FULL_IMAGE);
+	if (decstatus != JXL_DEC_SUCCESS) {
+		NSLOG(netsurf, ERROR, "Unable to subscribe");
+		return NULL;
+	}
+	src_data = content__get_source_data(c, &src_size);
+
+	decstatus = JxlDecoderSetInput(jxldec, src_data, src_size);
+	if (decstatus != JXL_DEC_SUCCESS) {
+		NSLOG(netsurf, ERROR, "unable to set input");
+		return NULL;
+	}
+
+	decstatus = JxlDecoderProcessInput(jxldec);
+	if (decstatus != JXL_DEC_NEED_IMAGE_OUT_BUFFER) {
+		NSLOG(netsurf, ERROR,
+		      "expected status JXL_DEC_NEED_IMAGE_OUT_BUFFER(%d) got %d",
+		      JXL_DEC_NEED_IMAGE_OUT_BUFFER,
+		      decstatus);
+		JxlDecoderDestroy(jxldec);
+		return NULL;
+	}
+
+	decstatus = JxlDecoderGetBasicInfo(jxldec, &binfo);
+	if (decstatus != JXL_DEC_SUCCESS) {
+		NSLOG(netsurf, ERROR, "unable to get basic info status:%d",decstatus);
+		JxlDecoderDestroy(jxldec);
+		return NULL;
+	}
+
+	/* create bitmap with appropriate opacity */
+	if (binfo.alpha_bits > 0) {
+		bitmap = guit->bitmap->create(c->width, c->height, BITMAP_OPAQUE);
+	} else {
+		bitmap = guit->bitmap->create(c->width, c->height, BITMAP_NONE);
+	}
+	if (bitmap == NULL) {
+		/* empty bitmap could not be created */
+		JxlDecoderDestroy(jxldec);
+		return NULL;
+	}
+
+	/* ensure buffer was allocated */
+	output = guit->bitmap->get_buffer(bitmap);
+	if (output == NULL) {
+		/* bitmap with no buffer available */
+		guit->bitmap->destroy(bitmap);
+		JxlDecoderDestroy(jxldec);
+		return NULL;
+	}
+	decstatus = JxlDecoderSetImageOutBuffer(jxldec, &jxl_output_format, output, c->size);
+	if (decstatus != JXL_DEC_SUCCESS) {
+		NSLOG(netsurf, ERROR, "unable to set output buffer callback status:%d",decstatus);
+		guit->bitmap->destroy(bitmap);
+		JxlDecoderDestroy(jxldec);
+		return NULL;
+	}
+
+	decstatus = JxlDecoderProcessInput(jxldec);
+	if (decstatus != JXL_DEC_FULL_IMAGE) {
+		NSLOG(netsurf, ERROR, "did not get decode event");
+		guit->bitmap->destroy(bitmap);
+		JxlDecoderDestroy(jxldec);
+		return NULL;
+	}
+	
+	JxlDecoderDestroy(jxldec);
+
+	bitmap_format_to_client(bitmap, &jxl_fmt);
+	guit->bitmap->modified(bitmap);
+
+	return bitmap;
+}
+
+/**
+ * report failiure
+ */
+static bool jxl_report_fail(struct content *c, JxlDecoderStatus decstatus, const char *msg)
+{
+	union content_msg_data msg_data;
+	NSLOG(netsurf, ERROR, "%s decoder status:%d", msg, decstatus);
+	msg_data.errordata.errorcode = NSERROR_UNKNOWN;
+	msg_data.errordata.errormsg = msg;
+	content_broadcast(c, CONTENT_MSG_ERROR, &msg_data);
+	return false;
+}
+
+/**
+ * Convert a CONTENT_JPEGXL for display.
+ */
+static bool nsjpegxl_convert(struct content *c)
+{
+	JxlDecoder *jxldec;
+	JxlSignature decsig;
+	JxlDecoderStatus decstatus = JXL_DEC_ERROR;
+	JxlBasicInfo binfo;
+	union content_msg_data msg_data;
+	const uint8_t *data;
+	size_t size;
+	char *title;
+	size_t image_size;
+
+	/* check image header is valid and get width/height */
+	data = content__get_source_data(c, &size);
+
+	decsig = JxlSignatureCheck(data,size);
+	if ((decsig != JXL_SIG_CODESTREAM) && (decsig != JXL_SIG_CONTAINER)) {
+		NSLOG(netsurf, ERROR, "signature failed");
+		msg_data.errordata.errorcode = NSERROR_UNKNOWN;
+		msg_data.errordata.errormsg = "Signature failed";
+		content_broadcast(c, CONTENT_MSG_ERROR, &msg_data);
+		return false;
+	}
+
+	jxldec = JxlDecoderCreate(NULL);
+	if (jxldec == NULL) {
+		return jxl_report_fail(c, decstatus, "Unable to allocate decoder");
+	}
+	decstatus= JxlDecoderSubscribeEvents(jxldec, JXL_DEC_BASIC_INFO);
+	if (decstatus != JXL_DEC_SUCCESS) {
+		return jxl_report_fail(c, decstatus, "Unable to subscribe");
+	}
+	decstatus = JxlDecoderSetInput(jxldec, data,size);
+	if (decstatus != JXL_DEC_SUCCESS) {
+		return jxl_report_fail(c, decstatus, "unable to set input");
+	}
+	decstatus = JxlDecoderProcessInput(jxldec);
+	if (decstatus != JXL_DEC_BASIC_INFO) {
+		return jxl_report_fail(c, decstatus, "did not get basic info event");
+	}
+	decstatus = JxlDecoderGetBasicInfo(jxldec, &binfo);
+	if (decstatus != JXL_DEC_SUCCESS) {
+		return jxl_report_fail(c, decstatus, "unable to get basic info");
+	}
+	decstatus = JxlDecoderImageOutBufferSize(jxldec, &jxl_output_format, &image_size);
+	if (decstatus != JXL_DEC_SUCCESS) {
+		return jxl_report_fail(c, decstatus, "unable get image size");
+	}
+	
+	JxlDecoderDestroy(jxldec);
+
+	NSLOG(netsurf, INFO, "got basic info size:%ld x:%d y:%d", image_size, binfo.xsize, binfo.ysize);
+
+	c->width = binfo.xsize;
+	c->height = binfo.ysize;
+	c->size = image_size;
+
+	image_cache_add(c, NULL, jpegxl_cache_convert);
+
+	/* set title text */
+	title = messages_get_buff("JPEGXLTitle",
+			nsurl_access_leaf(llcache_handle_get_url(c->llcache)),
+			c->width, c->height);
+	if (title != NULL) {
+		content__set_title(c, title);
+		free(title);
+	}
+
+	content_set_ready(c);
+	content_set_done(c);	
+	content_set_status(c, ""); /* Done: update status bar */
+
+	return true;
+}
+
+
+/**
+ * Clone content.
+ */
+static nserror nsjpegxl_clone(const struct content *old, struct content **newc)
+{
+	struct content *jpegxl_c;
+	nserror error;
+
+	jpegxl_c = calloc(1, sizeof(struct content));
+	if (jpegxl_c == NULL)
+		return NSERROR_NOMEM;
+
+	error = content__clone(old, jpegxl_c);
+	if (error != NSERROR_OK) {
+		content_destroy(jpegxl_c);
+		return error;
+	}
+
+	/* re-convert if the content is ready */
+	if ((old->status == CONTENT_STATUS_READY) ||
+	    (old->status == CONTENT_STATUS_DONE)) {
+		if (nsjpegxl_convert(jpegxl_c) == false) {
+			content_destroy(jpegxl_c);
+			return NSERROR_CLONE_FAILED;
+		}
+	}
+
+	*newc = jpegxl_c;
+
+	return NSERROR_OK;
+}
+
+static const content_handler nsjpegxl_content_handler = {
+	.create = nsjpegxl_create,
+	.data_complete = nsjpegxl_convert,
+	.destroy = image_cache_destroy,
+	.redraw = image_cache_redraw,
+	.clone = nsjpegxl_clone,
+	.get_internal = image_cache_get_internal,
+	.type = image_cache_content_type,
+	.is_opaque = image_cache_is_opaque,
+	.no_share = false,
+};
+
+static const char *nsjpegxl_types[] = {
+	"image/jxl",
+};
+
+CONTENT_FACTORY_REGISTER_TYPES(nsjpegxl, nsjpegxl_types, nsjpegxl_content_handler);
diff --git a/content/handlers/image/jpegxl.h b/content/handlers/image/jpegxl.h
new file mode 100644
index 000000000..e37d9344e
--- /dev/null
+++ b/content/handlers/image/jpegxl.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2023 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** \file
+ * Content for image/jpegxl (interface).
+ */
+
+#ifndef _NETSURF_IMAGE_JPEGXL_H_
+#define _NETSURF_IMAGE_JPEGXL_H_
+
+nserror nsjpegxl_init(void);
+
+#endif
diff --git a/content/handlers/image/nssprite.c b/content/handlers/image/nssprite.c
index 916bcbd34..c18f49063 100644
--- a/content/handlers/image/nssprite.c
+++ b/content/handlers/image/nssprite.c
@@ -23,6 +23,8 @@
 
 #include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include <librosprite.h>
 
 #include "utils/utils.h"
@@ -33,7 +35,9 @@
 #include "netsurf/content.h"
 #include "content/llcache.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "desktop/gui_internal.h"
+#include "desktop/bitmap.h"
 
 #include "image/nssprite.h"
 
@@ -115,31 +119,19 @@ static bool nssprite_convert(struct content *c)
 
 	struct rosprite* sprite = sprite_area->sprites[0];
 
-	nssprite->bitmap = guit->bitmap->create(sprite->width, sprite->height, BITMAP_NEW);
+	nssprite->bitmap = guit->bitmap->create(sprite->width, sprite->height, BITMAP_NONE);
 	if (!nssprite->bitmap) {
-		content_broadcast_errorcode(c, NSERROR_NOMEM);
+		content_broadcast_error(c, NSERROR_NOMEM, NULL);
 		return false;
 	}
-	uint32_t* imagebuf = (uint32_t *)guit->bitmap->get_buffer(nssprite->bitmap);
+	uint32_t* imagebuf = (uint32_t *)(void *)guit->bitmap->get_buffer(nssprite->bitmap);
 	if (!imagebuf) {
-		content_broadcast_errorcode(c, NSERROR_NOMEM);
+		content_broadcast_error(c, NSERROR_NOMEM, NULL);
 		return false;
 	}
 	unsigned char *spritebuf = (unsigned char *)sprite->image;
 
-	/* reverse byte order of each word */
-	for (uint32_t y = 0; y < sprite->height; y++) {
-		for (uint32_t x = 0; x < sprite->width; x++) {
-			int offset = 4 * (y * sprite->width + x);
-
-			*imagebuf = (spritebuf[offset] << 24) |
-					(spritebuf[offset + 1] << 16) |
-					(spritebuf[offset + 2] << 8) |
-					(spritebuf[offset + 3]);
-
-			imagebuf++;
-		}
-	}
+	memcpy(imagebuf, spritebuf, sprite->width * sprite->height * 4);
 
 	c->width = sprite->width;
 	c->height = sprite->height;
@@ -153,6 +145,9 @@ static bool nssprite_convert(struct content *c)
 		free(title);
 	}
 
+	bitmap_format_to_client(nssprite->bitmap, &(bitmap_fmt_t) {
+		.layout = BITMAP_LAYOUT_A8B8G8R8,
+	});
 	guit->bitmap->modified(nssprite->bitmap);
 
 	content_set_ready(c);
@@ -165,7 +160,7 @@ ro_sprite_error:
 	if (ctx != NULL) {
 		rosprite_destroy_mem_context(ctx);
 	}
-	content_broadcast_errorcode(c, NSERROR_SPRITE_ERROR);
+	content_broadcast_error(c, NSERROR_SPRITE_ERROR, NULL);
 
 	return false;
 }
@@ -257,6 +252,17 @@ static content_type nssprite_content_type(void)
 }
 
 
+static bool nssprite_content_is_opaque(struct content *c)
+{
+	nssprite_content *nssprite = (nssprite_content *) c;
+
+	if (nssprite->bitmap != NULL) {
+		return guit->bitmap->get_opaque(nssprite->bitmap);
+	}
+
+	return false;
+}
+
 static const content_handler nssprite_content_handler = {
 	.create = nssprite_create,
 	.data_complete = nssprite_convert,
@@ -265,6 +271,7 @@ static const content_handler nssprite_content_handler = {
 	.clone = nssprite_clone,
 	.get_internal = nssprite_get_internal,
 	.type = nssprite_content_type,
+	.is_opaque = nssprite_content_is_opaque,
 	.no_share = false,
 };
 
diff --git a/content/handlers/image/png.c b/content/handlers/image/png.c
index 841d5de52..97a5795b3 100644
--- a/content/handlers/image/png.c
+++ b/content/handlers/image/png.c
@@ -19,6 +19,7 @@
  */
 
 #include <stdbool.h>
+#include <string.h>
 #include <stdlib.h>
 #include <png.h>
 
@@ -29,7 +30,9 @@
 #include "netsurf/bitmap.h"
 #include "content/llcache.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "desktop/gui_internal.h"
+#include "desktop/bitmap.h"
 
 #include "image/image_cache.h"
 #include "image/png.h"
@@ -116,8 +119,37 @@ static void nspng_setup_transforms(png_structp png_ptr, png_infop info_ptr)
 		png_set_gray_to_rgb(png_ptr);
 	}
 
+	switch (bitmap_fmt.layout) {
+	case BITMAP_LAYOUT_B8G8R8A8: /* Fall through. */
+	case BITMAP_LAYOUT_A8B8G8R8:
+		png_set_bgr(png_ptr);
+		break;
+	default:
+		/* RGB is the default. */
+		break;
+	}
+
 	if (!(color_type & PNG_COLOR_MASK_ALPHA)) {
-		png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
+		switch (bitmap_fmt.layout) {
+		case BITMAP_LAYOUT_A8R8G8B8: /* Fall through. */
+		case BITMAP_LAYOUT_A8B8G8R8:
+			png_set_filler(png_ptr, 0xff, PNG_FILLER_BEFORE);
+			break;
+
+		default:
+			png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
+			break;
+		}
+	} else {
+		switch (bitmap_fmt.layout) {
+		case BITMAP_LAYOUT_A8R8G8B8: /* Fall through. */
+		case BITMAP_LAYOUT_A8B8G8R8:
+			png_set_swap_alpha(png_ptr);
+			break;
+		default:
+			/* Alpha as final component is the default. */
+			break;
+		}
 	}
 
 	/* gamma correction - we use 2.2 as our screen gamma
@@ -161,14 +193,14 @@ static void info_callback(png_structp png_s, png_infop info)
 	}
 
 	/* Claim the required memory for the converted PNG */
-	png_c->bitmap = guit->bitmap->create(width, height, BITMAP_NEW);
+	png_c->bitmap = guit->bitmap->create(width, height, BITMAP_NONE);
 	if (png_c->bitmap == NULL) {
 		/* Failed to create bitmap skip pre-conversion */
 		longjmp(png_jmpbuf(png_s), CBERR_NOPRE);
 	}
 
 	png_c->rowstride = guit->bitmap->get_rowstride(png_c->bitmap);
-	png_c->bpp = guit->bitmap->get_bpp(png_c->bitmap);
+	png_c->bpp = sizeof(uint32_t);
 
 	nspng_setup_transforms(png_s, info);
 
@@ -242,7 +274,7 @@ static nserror nspng_create_png_data(nspng_content *png_c)
 
 	png_c->png = png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
 	if (png_c->png == NULL) {
-		content_broadcast_errorcode(&png_c->base, NSERROR_NOMEM);
+		content_broadcast_error(&png_c->base, NSERROR_NOMEM, NULL);
 		return NSERROR_NOMEM;
 	}
 
@@ -252,7 +284,7 @@ static nserror nspng_create_png_data(nspng_content *png_c)
 	if (png_c->info == NULL) {
 		png_destroy_read_struct(&png_c->png, &png_c->info, 0);
 
-		content_broadcast_errorcode(&png_c->base, NSERROR_NOMEM);
+		content_broadcast_error(&png_c->base, NSERROR_NOMEM, NULL);
 		return NSERROR_NOMEM;
 	}
 
@@ -262,7 +294,7 @@ static nserror nspng_create_png_data(nspng_content *png_c)
 		png_c->png = NULL;
 		png_c->info = NULL;
 
-		content_broadcast_errorcode(&png_c->base, NSERROR_PNG_ERROR);
+		content_broadcast_error(&png_c->base, NSERROR_PNG_ERROR, NULL);
 		return NSERROR_NOMEM;
 	}
 
@@ -355,7 +387,7 @@ static bool nspng_process_data(struct content *c, const char *data,
 			png_c->png = NULL;
 			png_c->info = NULL;
 
-			content_broadcast_errorcode(c, NSERROR_PNG_ERROR);
+			content_broadcast_error(c, NSERROR_PNG_ERROR, NULL);
 
 			ret = false;
 
@@ -481,7 +513,7 @@ png_cache_convert(struct content *c)
 	height = png_get_image_height(png_ptr, info_ptr);
 
 	/* Claim the required memory for the converted PNG */
-	bitmap = guit->bitmap->create(width, height, BITMAP_NEW);
+	bitmap = guit->bitmap->create(width, height, BITMAP_NONE);
 	if (bitmap == NULL) {
 		/* cleanup and bail */
 		goto png_cache_convert_error;
@@ -506,7 +538,13 @@ png_cache_convert_error:
 	}
 
 	if (bitmap != NULL) {
-		guit->bitmap->modified((struct bitmap *)bitmap);
+		bool opaque = bitmap_test_opaque((void *)bitmap);
+		guit->bitmap->set_opaque((void *)bitmap, opaque);
+		bitmap_format_to_client((void *)bitmap, &(bitmap_fmt_t) {
+			.layout = bitmap_fmt.layout,
+			.pma = opaque ? bitmap_fmt.pma : false,
+		});
+		guit->bitmap->modified((void *)bitmap);
 	}
 
 	return (struct bitmap *)bitmap;
@@ -533,7 +571,12 @@ static bool nspng_convert(struct content *c)
 	}
 
 	if (png_c->bitmap != NULL) {
-		guit->bitmap->set_opaque(png_c->bitmap, guit->bitmap->test_opaque(png_c->bitmap));
+		bool opaque = bitmap_test_opaque(png_c->bitmap);
+		guit->bitmap->set_opaque(png_c->bitmap, opaque);
+		bitmap_format_to_client(png_c->bitmap, &(bitmap_fmt_t) {
+			.layout = bitmap_fmt.layout,
+			.pma = opaque ? bitmap_fmt.pma : false,
+		});
 		guit->bitmap->modified(png_c->bitmap);
 	}
 
@@ -601,6 +644,7 @@ static const content_handler nspng_content_handler = {
 	.redraw = image_cache_redraw,
 	.get_internal = image_cache_get_internal,
 	.type = image_cache_content_type,
+	.is_opaque = image_cache_is_opaque,
 	.no_share = false,
 };
 
diff --git a/content/handlers/image/rsvg.c b/content/handlers/image/rsvg.c
index ee7373795..24fc1a4e0 100644
--- a/content/handlers/image/rsvg.c
+++ b/content/handlers/image/rsvg.c
@@ -49,7 +49,9 @@
 #include "netsurf/content.h"
 #include "content/llcache.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "desktop/gui_internal.h"
+#include "desktop/bitmap.h"
 
 #include "image/rsvg.h"
 
@@ -71,7 +73,7 @@ static nserror rsvg_create_svg_data(rsvg_content *c)
 
 	if ((c->rsvgh = rsvg_handle_new()) == NULL) {
 		NSLOG(netsurf, INFO, "rsvg_handle_new() returned NULL.");
-		content_broadcast_errorcode(&c->base, NSERROR_NOMEM);
+		content_broadcast_error(&c->base, NSERROR_NOMEM, NULL);
 		return NSERROR_NOMEM;
 	}
 
@@ -120,48 +122,13 @@ static bool rsvg_process_data(struct content *c, const char *data,
 				&err) == FALSE) {
 		NSLOG(netsurf, INFO,
 		      "rsvg_handle_write returned an error: %s", err->message);
-		content_broadcast_errorcode(c, NSERROR_SVG_ERROR);
+		content_broadcast_error(c, NSERROR_SVG_ERROR, NULL);
 		return false;
 	}
 
 	return true;
 }
 
-/** Convert Cairo's ARGB output to NetSurf's favoured ABGR format.  It converts
- * the data in-place. 
- *
- * \param pixels	Pixel data, in the form of ARGB.  This will
- *			be overwritten with new data in the form of ABGR.
- * \param width		Width of the bitmap
- * \param height	Height of the bitmap
- * \param rowstride	Number of bytes to skip after each row (this
- *			implementation requires this to be a multiple of 4.)
- */
-static inline void rsvg_argb_to_abgr(uint8_t *pixels, 
-		int width, int height, size_t rowstride)
-{
-	uint8_t *p = pixels;
-	int boff = 0, roff = 2;
-
-	if (endian_host_is_le() == false) {
-		boff = 1;
-		roff = 3;
-	}
-
-	for (int y = 0; y < height; y++) {
-		for (int x = 0; x < width; x++) {
-			/* Swap R and B */
-			const uint8_t r = p[4*x+roff];
-
-			p[4*x+roff] = p[4*x+boff];
-
-			p[4*x+boff] = r;
-		}
-
-		p += rowstride;
-	}
-}
-
 static bool rsvg_convert(struct content *c)
 {
 	rsvg_content *d = (rsvg_content *) c;
@@ -171,7 +138,7 @@ static bool rsvg_convert(struct content *c)
 	if (rsvg_handle_close(d->rsvgh, &err) == FALSE) {
 		NSLOG(netsurf, INFO,
 		      "rsvg_handle_close returned an error: %s", err->message);
-		content_broadcast_errorcode(c, NSERROR_SVG_ERROR);
+		content_broadcast_error(c, NSERROR_SVG_ERROR, NULL);
 		return false;
 	}
 
@@ -186,10 +153,10 @@ static bool rsvg_convert(struct content *c)
 	c->height = rsvgsize.height;
 
 	if ((d->bitmap = guit->bitmap->create(c->width, c->height,
-			BITMAP_NEW)) == NULL) {
+			BITMAP_NONE)) == NULL) {
 		NSLOG(netsurf, INFO,
 		      "Failed to create bitmap for rsvg render.");
-		content_broadcast_errorcode(c, NSERROR_NOMEM);
+		content_broadcast_error(c, NSERROR_NOMEM, NULL);
 		return false;
 	}
 
@@ -200,22 +167,22 @@ static bool rsvg_convert(struct content *c)
 			guit->bitmap->get_rowstride(d->bitmap))) == NULL) {
 		NSLOG(netsurf, INFO,
 		      "Failed to create Cairo image surface for rsvg render.");
-		content_broadcast_errorcode(c, NSERROR_NOMEM);
+		content_broadcast_error(c, NSERROR_NOMEM, NULL);
 		return false;
 	}
 
 	if ((d->ct = cairo_create(d->cs)) == NULL) {
 		NSLOG(netsurf, INFO,
 		      "Failed to create Cairo drawing context for rsvg render.");
-		content_broadcast_errorcode(c, NSERROR_NOMEM);
+		content_broadcast_error(c, NSERROR_NOMEM, NULL);
 		return false;
 	}
 
 	rsvg_handle_render_cairo(d->rsvgh, d->ct);
-	rsvg_argb_to_abgr(guit->bitmap->get_buffer(d->bitmap),
-				c->width, c->height,
-				guit->bitmap->get_rowstride(d->bitmap));
 
+	bitmap_format_to_client(d->bitmap, &(bitmap_fmt_t) {
+		.layout = BITMAP_LAYOUT_ARGB8888,
+	});
 	guit->bitmap->modified(d->bitmap);
 	content_set_ready(c);
 	content_set_done(c);
@@ -315,6 +282,19 @@ static content_type rsvg_content_type(void)
 	return CONTENT_IMAGE;
 }
 
+
+static bool rsvg_content_is_opaque(struct content *c)
+{
+	rsvg_content *d = (rsvg_content *) c;
+
+	if (d->bitmap != NULL) {
+		return guit->bitmap->get_opaque(d->bitmap);
+	}
+
+	return false;
+}
+
+
 static const content_handler rsvg_content_handler = {
 	.create = rsvg_create,
 	.process_data = rsvg_process_data,
@@ -324,6 +304,7 @@ static const content_handler rsvg_content_handler = {
 	.clone = rsvg_clone,
 	.get_internal = rsvg_get_internal,
 	.type = rsvg_content_type,
+	.is_opaque = rsvg_content_is_opaque,
 	.no_share = false,
 };
 
diff --git a/content/handlers/image/rsvg246.c b/content/handlers/image/rsvg246.c
new file mode 100644
index 000000000..0e337132f
--- /dev/null
+++ b/content/handlers/image/rsvg246.c
@@ -0,0 +1,280 @@
+/*
+ * Copyright 2022 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * implementation of content handler for image/svg using librsvg 2.46 API.
+ *
+ * SVG files are rendered to a NetSurf bitmap by creating a Cairo rendering
+ * surface (content_rsvg_data.cs) over the bitmap's data, creating a Cairo
+ * drawing context using that surface, and then passing that drawing context
+ * to librsvg which then uses Cairo calls to plot the graphic to the bitmap.
+ * We store this in content->bitmap, and then use the usual bitmap plotter
+ * function to render it for redraw requests.
+ */
+
+#include <stdlib.h>
+#include <stdbool.h>
+#include <assert.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include <librsvg/rsvg.h>
+
+#include <nsutils/endian.h>
+
+#include "utils/log.h"
+#include "utils/utils.h"
+#include "utils/messages.h"
+#include "netsurf/plotters.h"
+#include "netsurf/bitmap.h"
+#include "netsurf/content.h"
+#include "content/llcache.h"
+#include "content/content_protected.h"
+#include "content/content_factory.h"
+#include "desktop/gui_internal.h"
+#include "desktop/bitmap.h"
+
+#include "image/image_cache.h"
+
+#include "image/rsvg.h"
+
+
+typedef struct rsvg_content {
+	struct content base;
+
+	RsvgHandle *rsvgh;	/**< Context handle for RSVG renderer */
+} rsvg_content;
+
+
+static nserror
+rsvg_create(const content_handler *handler,
+	    lwc_string *imime_type,
+	    const struct http_parameter *params,
+	    llcache_handle *llcache,
+	    const char *fallback_charset,
+	    bool quirks,
+	    struct content **c)
+{
+	rsvg_content *svg;
+	nserror error;
+
+	svg = calloc(1, sizeof(rsvg_content));
+	if (svg == NULL)
+		return NSERROR_NOMEM;
+
+	error = content__init(&svg->base, handler, imime_type, params,
+			      llcache, fallback_charset, quirks);
+	if (error != NSERROR_OK) {
+		free(svg);
+		return error;
+	}
+
+	*c = (struct content *)svg;
+
+	return NSERROR_OK;
+}
+
+
+/**
+ * create a bitmap from jpeg content for the image cache.
+ */
+static struct bitmap *
+rsvg_cache_convert(struct content *c)
+{
+	rsvg_content *svgc = (rsvg_content *)c;
+	struct bitmap *bitmap;
+	cairo_surface_t *cs;
+	cairo_t *cr;
+	RsvgRectangle viewport;
+	gboolean renderres;
+
+	if ((bitmap = guit->bitmap->create(c->width, c->height,	BITMAP_NONE)) == NULL) {
+		NSLOG(netsurf, INFO, "Failed to create bitmap for rsvg render.");
+		return NULL;
+	}
+
+	if ((cs = cairo_image_surface_create_for_data(
+		     (unsigned char *)guit->bitmap->get_buffer(bitmap),
+		     CAIRO_FORMAT_ARGB32,
+		     c->width, c->height,
+		     guit->bitmap->get_rowstride(bitmap))) == NULL) {
+		NSLOG(netsurf, INFO, "Failed to create Cairo image surface for rsvg render.");
+		guit->bitmap->destroy(bitmap);
+		return NULL;
+	}
+	if ((cr = cairo_create(cs)) == NULL) {
+		NSLOG(netsurf, INFO,
+		      "Failed to create Cairo drawing context for rsvg render.");
+		cairo_surface_destroy(cs);
+		guit->bitmap->destroy(bitmap);
+		return NULL;
+	}
+
+	viewport.x = 0;
+	viewport.y = 0;
+	viewport.width = c->width;
+	viewport.height = c->height;
+	renderres = rsvg_handle_render_document(svgc->rsvgh, cr, &viewport, NULL);
+	NSLOG(netsurf, DEBUG, "rsvg render:%d, width:%d, height %d", renderres, c->width, c->height);
+
+	bitmap_format_to_client(bitmap, &(bitmap_fmt_t) {
+			.layout = BITMAP_LAYOUT_ARGB8888,
+		});
+	guit->bitmap->modified(bitmap);
+
+	cairo_destroy(cr);
+	cairo_surface_destroy(cs);
+
+	return bitmap;
+}
+
+static void rsvg__get_demensions(const rsvg_content *svgc,
+		int *width, int *height)
+{
+#if LIBRSVG_MAJOR_VERSION >= 2 && LIBRSVG_MINOR_VERSION >= 52
+	gdouble rwidth;
+	gdouble rheight;
+	gboolean gotsize;
+
+	gotsize = rsvg_handle_get_intrinsic_size_in_pixels(svgc->rsvgh,
+							   &rwidth,
+							   &rheight);
+	if (gotsize == TRUE) {
+		*width = rwidth;
+		*height = rheight;
+	} else {
+		RsvgRectangle ink_rect;
+		RsvgRectangle logical_rect;
+		rsvg_handle_get_geometry_for_element(svgc->rsvgh,
+						     NULL,
+						     &ink_rect,
+						     &logical_rect,
+						     NULL);
+		*width = ink_rect.width;
+		*height = ink_rect.height;
+	}
+#else
+	RsvgDimensionData rsvgsize;
+
+	rsvg_handle_get_dimensions(svgc->rsvgh, &rsvgsize);
+	*width = rsvgsize.width;
+	*height = rsvgsize.height;
+#endif
+	NSLOG(netsurf, DEBUG, "rsvg width:%d height:%d.", *width, *height);
+}
+
+static bool rsvg_convert(struct content *c)
+{
+	rsvg_content *svgc = (rsvg_content *)c;
+	const uint8_t *data; /* content data */
+	size_t size; /* content data size */
+	GInputStream * istream;
+	GError *gerror = NULL;
+
+	/* check image header is valid and get width/height */
+
+	data = content__get_source_data(c, &size);
+
+	istream = g_memory_input_stream_new_from_data(data, size, NULL);
+	svgc->rsvgh = rsvg_handle_new_from_stream_sync(istream,
+						       NULL,
+						       RSVG_HANDLE_FLAGS_NONE,
+						       NULL,
+						       &gerror);
+	g_object_unref(istream);
+	if (svgc->rsvgh == NULL) {
+		NSLOG(netsurf, INFO, "Failed to create rsvg handle for content.");
+		return false;
+	}
+
+	rsvg__get_demensions(svgc, &c->width, &c->height);
+
+	c->size = c->width * c->height * 4;
+
+	image_cache_add(c, NULL, rsvg_cache_convert);
+
+	content_set_ready(c);
+	content_set_done(c);
+	content_set_status(c, ""); /* Done: update status bar */
+
+	return true;
+}
+
+
+static nserror rsvg_clone(const struct content *old, struct content **newc)
+{
+	rsvg_content *svg;
+	nserror error;
+
+	svg = calloc(1, sizeof(rsvg_content));
+	if (svg == NULL)
+		return NSERROR_NOMEM;
+
+	error = content__clone(old, &svg->base);
+	if (error != NSERROR_OK) {
+		content_destroy(&svg->base);
+		return error;
+	}
+
+	/* re-convert if the content is ready */
+	if ((old->status == CONTENT_STATUS_READY) ||
+	    (old->status == CONTENT_STATUS_DONE)) {
+		if (rsvg_convert(&svg->base) == false) {
+			content_destroy(&svg->base);
+			return NSERROR_CLONE_FAILED;
+		}
+	}
+
+	*newc = (struct content *)svg;
+
+	return NSERROR_OK;
+}
+
+
+static void rsvg_destroy(struct content *c)
+{
+	rsvg_content *d = (rsvg_content *) c;
+
+	if (d->rsvgh != NULL) {
+		g_object_unref(d->rsvgh);
+		d->rsvgh = NULL;
+	}
+
+	return image_cache_destroy(c);
+}
+
+static const content_handler rsvg_content_handler = {
+	.create = rsvg_create,
+	.data_complete = rsvg_convert,
+	.destroy = rsvg_destroy,
+	.redraw = image_cache_redraw,
+	.clone = rsvg_clone,
+	.get_internal = image_cache_get_internal,
+	.type = image_cache_content_type,
+	.is_opaque = image_cache_is_opaque,
+	.no_share = false,
+};
+
+static const char *rsvg_types[] = {
+	"image/svg",
+	"image/svg+xml"
+};
+
+CONTENT_FACTORY_REGISTER_TYPES(nsrsvg, rsvg_types, rsvg_content_handler);
+
diff --git a/content/handlers/image/svg.c b/content/handlers/image/svg.c
index 3f4e00c89..895d799df 100644
--- a/content/handlers/image/svg.c
+++ b/content/handlers/image/svg.c
@@ -30,9 +30,11 @@
 
 #include "utils/messages.h"
 #include "utils/utils.h"
+#include "utils/nsurl.h"
 #include "netsurf/plotters.h"
 #include "netsurf/content.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 
 #include "image/svg.h"
 
@@ -59,7 +61,7 @@ static nserror svg_create_svg_data(svg_content *c)
 	return NSERROR_OK;
 
 no_memory:
-	content_broadcast_errorcode(&c->base, NSERROR_NOMEM);
+	content_broadcast_error(&c->base, NSERROR_NOMEM, NULL);
 	return NSERROR_NOMEM;
 }
 
diff --git a/content/handlers/image/webp.c b/content/handlers/image/webp.c
index cbcb5ce55..c04c0efd2 100644
--- a/content/handlers/image/webp.c
+++ b/content/handlers/image/webp.c
@@ -36,7 +36,9 @@
 #include "netsurf/bitmap.h"
 #include "content/llcache.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "desktop/gui_internal.h"
+#include "desktop/bitmap.h"
 
 #include "image/image_cache.h"
 
@@ -96,6 +98,9 @@ webp_cache_convert(struct content *c)
 	uint8_t *decoded;
 	size_t rowstride;
 	struct bitmap *bitmap = NULL;
+	bitmap_fmt_t webp_fmt = {
+		.layout = bitmap_fmt.layout,
+	};
 
 	source_data = content__get_source_data(c, &source_size);
 
@@ -106,9 +111,13 @@ webp_cache_convert(struct content *c)
 	}
 
 	if (webpfeatures.has_alpha == 0) {
-		bmap_flags = BITMAP_NEW | BITMAP_OPAQUE;
+		bmap_flags = BITMAP_OPAQUE;
+		/* Image has no alpha. Premultiplied alpha makes no difference.
+		 * Optimisation: Avoid unnecessary conversion by copying format.
+		 */
+		webp_fmt.pma = bitmap_fmt.pma;
 	} else {
-		bmap_flags = BITMAP_NEW;
+		bmap_flags = BITMAP_NONE;
 	}
 
 	/* create bitmap */
@@ -129,17 +138,35 @@ webp_cache_convert(struct content *c)
 
 	rowstride = guit->bitmap->get_rowstride(bitmap);
 
-	decoded = WebPDecodeBGRAInto(source_data,
-				     source_size,
-				     pixels,
-				     webpfeatures.width * webpfeatures.height * 4,
-				     rowstride);
+	switch (webp_fmt.layout) {
+	default:
+		/* WebP has no ABGR function, fall back to default. */
+		webp_fmt.layout = BITMAP_LAYOUT_R8G8B8A8;
+		fallthrough;
+	case BITMAP_LAYOUT_R8G8B8A8:
+		decoded = WebPDecodeRGBAInto(source_data, source_size, pixels,
+				rowstride * webpfeatures.height, rowstride);
+		break;
+
+	case BITMAP_LAYOUT_B8G8R8A8:
+		decoded = WebPDecodeBGRAInto(source_data, source_size, pixels,
+				rowstride * webpfeatures.height, rowstride);
+		break;
+
+	case BITMAP_LAYOUT_A8R8G8B8:
+		decoded = WebPDecodeARGBInto(source_data, source_size, pixels,
+				rowstride * webpfeatures.height, rowstride);
+		break;
+	}
 	if (decoded == NULL) {
 		/* decode failed */
 		guit->bitmap->destroy(bitmap);
 		return NULL;
 	}
 
+	bitmap_format_to_client(bitmap, &webp_fmt);
+	guit->bitmap->modified(bitmap);
+
 	return bitmap;
 }
 
@@ -222,6 +249,7 @@ static const content_handler webp_content_handler = {
 	.clone = webp_clone,
 	.get_internal = image_cache_get_internal,
 	.type = image_cache_content_type,
+	.is_opaque = image_cache_is_opaque,
 	.no_share = false,
 };
 
diff --git a/content/handlers/javascript/content.c b/content/handlers/javascript/content.c
index ef5614094..9f37e126c 100644
--- a/content/handlers/javascript/content.c
+++ b/content/handlers/javascript/content.c
@@ -16,8 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * Content for javascript (implementation)
+/**
+ * \file
+ * javascript content implementation
  */
 
 #include <assert.h>
@@ -25,8 +26,10 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
+#include "utils/errors.h"
 #include "utils/config.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "content/hlcache.h"
 #include "utils/log.h"
 #include "utils/messages.h"
diff --git a/content/handlers/javascript/duktape/CSSRule.bnd b/content/handlers/javascript/duktape/CSSRule.bnd
new file mode 100644
index 000000000..555023c85
--- /dev/null
+++ b/content/handlers/javascript/duktape/CSSRule.bnd
@@ -0,0 +1,22 @@
+/* CSS Rule binding for NetSurf using duktape and libcss/libdom
+ *
+ * Copyright 2022 Daniel Silverstone <dsilvers@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * Released under the terms of the MIT License,
+ *         http://www.opensource.org/licenses/mit-license
+ */
+
+/* Note, for now this exists purely to block warnings, eventually
+ * rules will have to come from stylesheets etc.
+ */
+
+class CSSRule {
+    private bool unused;
+};
+
+init CSSRule()
+%{
+    priv->unused = true;
+%}
diff --git a/content/handlers/javascript/duktape/CSSStyleSheet.bnd b/content/handlers/javascript/duktape/CSSStyleSheet.bnd
new file mode 100644
index 000000000..9167b8afa
--- /dev/null
+++ b/content/handlers/javascript/duktape/CSSStyleSheet.bnd
@@ -0,0 +1,22 @@
+/* CSS Stylesheet binding for NetSurf using duktape and libcss/libdom
+ *
+ * Copyright 2022 Daniel Silverstone <dsilvers@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * Released under the terms of the MIT License,
+ *         http://www.opensource.org/licenses/mit-license
+ */
+
+/* Note, for now this exists purely to block warnings, eventually
+ * stylesheets will have to come from documents etc.
+ */
+
+class CSSStyleSheet {
+    private bool unused;
+};
+
+init CSSStyleSheet()
+%{
+    priv->unused = true;
+%}
diff --git a/content/handlers/javascript/duktape/CanvasRenderingContext2D.bnd b/content/handlers/javascript/duktape/CanvasRenderingContext2D.bnd
new file mode 100644
index 000000000..2fe73f4e1
--- /dev/null
+++ b/content/handlers/javascript/duktape/CanvasRenderingContext2D.bnd
@@ -0,0 +1,603 @@
+/* HTML canvas element rendering context binding using duktape and libdom
+ *
+ * Copyright 2020 Daniel Silverstone <dsilvers@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * Released under the terms of the MIT License,
+ *         http://www.opensource.org/licenses/mit-license
+ */
+
+class CanvasRenderingContext2D {
+      private struct dom_html_canvas_element *canvas;
+      private struct bitmap *bitmap;
+      private int width;
+      private int height;
+      private size_t stride;
+      private dom_event_listener *listener;
+      prologue %{
+/* prologue */
+#include "desktop/gui_internal.h"
+#include "desktop/gui_table.h"
+#include "netsurf/bitmap.h"
+#include "utils/corestrings.h"
+/* It's a smidge naughty of us to read
+ * this particular header, but we're needing
+ * to redraw the node we represent
+ */
+#include "content/handlers/html/private.h"
+
+static void redraw_node(dom_node *node)
+{
+	struct box *box = NULL;
+	html_content *htmlc = NULL;
+	dom_exception exc;
+	dom_document *doc;
+
+	exc = dom_node_get_user_data(node,
+				     corestring_dom___ns_key_box_node_data,
+				     &box);
+	if (exc != DOM_NO_ERR || box == NULL) {
+		return;
+	}
+
+	exc = dom_node_get_owner_document(node, &doc);
+	if (exc != DOM_NO_ERR || doc == NULL) {
+		return;
+	}
+
+	exc = dom_node_get_user_data(doc,
+				     corestring_dom___ns_key_html_content_data,
+				     &htmlc);
+	if (exc != DOM_NO_ERR || htmlc == NULL) {
+		dom_node_unref(doc);
+		return;
+	}
+
+	html__redraw_a_box(htmlc, box);
+
+	dom_node_unref(doc);
+}
+
+/**
+ * deal with events from the DOM for canvas node user data
+ *
+ * \param operation The DOM operation happening
+ * \param key The user data key
+ * \param data The user data (our bitmap)
+ * \param src The DOM node emitting the event (our <canvas>)
+ * \param dst The target DOM node if applicable
+ */
+static void
+canvas2d_user_data_handler(dom_node_operation operation,
+			   dom_string *key,
+			   void *data,
+			   struct dom_node *src,
+			   struct dom_node *dst)
+{
+	struct bitmap *newbitmap, *bitmap = (struct bitmap*)data, *oldbitmap = NULL;
+	int width, height;
+	size_t stride;
+
+	if (dom_string_isequal(key,corestring_dom___ns_key_canvas_node_data) == false || data == NULL) {
+		/* Not for us */
+		return;
+	}
+
+	switch (operation) {
+	case DOM_NODE_CLONED:
+		width = guit->bitmap->get_width(bitmap);
+		height = guit->bitmap->get_height(bitmap);
+		stride = guit->bitmap->get_rowstride(bitmap);
+		newbitmap = guit->bitmap->create(width, height,
+						 BITMAP_NONE);
+		if (newbitmap != NULL) {
+			if (guit->bitmap->get_rowstride(newbitmap) == stride) {
+				// Compatible bitmap, bung the data over
+				memcpy(guit->bitmap->get_buffer(newbitmap),
+				       guit->bitmap->get_buffer(bitmap),
+				       stride * height);
+				guit->bitmap->modified(newbitmap);
+			}
+		}
+		if (dom_node_set_user_data(dst,
+					   corestring_dom___ns_key_canvas_node_data,
+					   newbitmap, canvas2d_user_data_handler,
+					   &oldbitmap) == DOM_NO_ERR) {
+			if (oldbitmap != NULL)
+				guit->bitmap->destroy(oldbitmap);
+		}
+		break;
+
+	case DOM_NODE_RENAMED:
+	case DOM_NODE_IMPORTED:
+	case DOM_NODE_ADOPTED:
+		break;
+
+	case DOM_NODE_DELETED:
+		guit->bitmap->destroy(bitmap);
+		break;
+	default:
+		NSLOG(netsurf, INFO, "User data operation not handled.");
+		assert(0);
+	}
+}
+
+/**
+ * Give the canvas element an appropriately sized bitmap
+ *
+ * \param node The DOM node being inserted
+ * \param[out] bitmap_out The bitmap created
+ * \return NSERROR_OK on success else appropriate error code
+ */
+static nserror canvas2d_create_bitmap(dom_node *node, struct bitmap **bitmap_out)
+{
+	dom_exception exc;
+	dom_string *width_s = NULL, *height_s = NULL;
+	unsigned long width = 300, height = 150;
+	struct bitmap *bitmap, *oldbitmap = NULL;
+
+	exc = dom_element_get_attribute(node,
+					corestring_dom_width,
+					&width_s);
+	if (exc == DOM_NO_ERR && width_s != NULL) {
+		const char *ptr = (const char *)dom_string_data(width_s);
+		const char *endptr = ptr + dom_string_length(width_s);
+		char * ended;
+		unsigned long width_n = strtoul(ptr, &ended, 10);
+
+		if (ended == endptr || strcasecmp(ended, "px") == 0) {
+			/* parsed it all */
+			width = width_n;
+		}
+
+		dom_string_unref(width_s);
+	}
+
+	exc = dom_element_get_attribute(node,
+					corestring_dom_height,
+					&height_s);
+	if (exc == DOM_NO_ERR && height_s != NULL) {
+		const char *ptr = (const char *)dom_string_data(height_s);
+		const char *endptr = ptr + dom_string_length(height_s);
+		char * ended;
+		unsigned long height_n = strtoul(ptr, &ended, 10);
+
+		if (ended == endptr || strcasecmp(ended, "px") == 0) {
+			/* parsed it all */
+			height = height_n;
+		}
+
+		dom_string_unref(height_s);
+	}
+
+	bitmap = guit->bitmap->create(
+		(int)width, (int)height,
+		BITMAP_NONE);
+
+	if (bitmap == NULL) {
+		return NSERROR_NOMEM;
+	}
+
+	memset(guit->bitmap->get_buffer(bitmap),
+	       0, /* Transparent black */
+	       height * guit->bitmap->get_rowstride(bitmap));
+	guit->bitmap->modified(bitmap);
+
+	exc = dom_node_set_user_data(node,
+				     corestring_dom___ns_key_canvas_node_data,
+				     bitmap,
+				     canvas2d_user_data_handler,
+				     &oldbitmap);
+
+	if (exc != DOM_NO_ERR) {
+		guit->bitmap->destroy(bitmap);
+		return NSERROR_DOM;
+	}
+
+	assert(oldbitmap == NULL);
+
+	if (bitmap_out != NULL)
+		*bitmap_out = bitmap;
+
+	return NSERROR_OK;
+}
+
+/**
+ * Handle subtree modified events for our canvas node
+ *
+ * If width or height has changed relative to our priv, then
+ * we need to recreate the bitmap and reset our cached width
+ * and height values in order to be safe.  Plus redraw ourselves.
+ *
+ * \param evt The event which occurred
+ * \param pw The private pointer for our canvas object
+ */
+static void
+canvas2d__handle_dom_event(dom_event *evt, void *pw)
+{
+	canvas_rendering_context2d_private_t *priv = pw;
+	dom_ulong width;
+	dom_ulong height;
+	dom_exception exc;
+	struct bitmap *newbitmap, *oldbitmap = NULL;
+	size_t stride;
+	dom_event_flow_phase phase;
+	
+	exc = dom_event_get_event_phase(evt, &phase);
+	assert(exc == DOM_NO_ERR);
+	/* If we're not being hit right now, we're not up for it */
+	if (phase != DOM_AT_TARGET) return;
+	
+	/* Rather than being complex about things, let's just work out
+	 * what the width and height are and hope nothing else matters
+	 */
+	
+	exc = dom_html_canvas_element_get_width(priv->canvas, &width);
+	if (exc != DOM_NO_ERR) return;
+	exc = dom_html_canvas_element_get_height(priv->canvas, &height);
+	if (exc != DOM_NO_ERR) return;
+	
+	if ((int)height == priv->height && (int)width == priv->width) return;
+	
+	/* Okay, we need to reallocate our bitmap and re-cache values */
+	
+	newbitmap = guit->bitmap->create(width, height, BITMAP_NONE);
+	stride = guit->bitmap->get_rowstride(newbitmap);
+
+	if (newbitmap != NULL) {
+		memset(guit->bitmap->get_buffer(newbitmap),
+		       0,
+		       stride * height);
+		guit->bitmap->modified(newbitmap);
+	}
+
+	if (dom_node_set_user_data(priv->canvas,
+				   corestring_dom___ns_key_canvas_node_data,
+				   newbitmap, canvas2d_user_data_handler,
+				   &oldbitmap) == DOM_NO_ERR) {
+		if (oldbitmap != NULL)
+			guit->bitmap->destroy(oldbitmap);
+	} else {
+		guit->bitmap->destroy(newbitmap);
+		/* We'll stick with the old, odd though that might be */
+		return;
+	}
+
+	/* Cache the new values */
+	priv->width = (int)width;
+	priv->height = (int)height;
+	priv->stride = stride;
+	priv->bitmap = newbitmap;
+}
+
+typedef struct {
+	uint8_t *ptr;
+	size_t stride;
+	ssize_t width;
+	ssize_t height;
+} raw_bitmap;
+
+typedef struct {
+	raw_bitmap src;
+	raw_bitmap dst;
+	/* These are relative to the destination top/left */
+	ssize_t dst_x;
+	ssize_t dst_y;
+	/* These are relative to the source top/left */
+	ssize_t x1;
+	ssize_t y1;
+	/* And these are +1, so a 1x1 copy will have x2==x1+1 etc */
+	ssize_t x2;
+	ssize_t y2;
+} copy_operation;
+
+/**
+ * Copy from src to dst
+ *
+ * Note, this is destructive to its copy_operation input
+ *
+ * \param op The copy operation to perform
+ * \return Whether the destination bitmap was altered
+ */
+static bool
+canvas2d__copy_bitmap_to_bitmap(copy_operation *op)
+{
+	/* Constrain src rectangle to src bitmap size */
+	if (op->x1 < 0) op->x1 = 0;
+	if (op->y1 < 0) op->y1 = 0;
+	if (op->x2 > op->src.width) op->x2 = op->src.width;
+	if (op->y2 > op->src.height) op->y2 = op->src.height;
+	/* Offset the rectangle into dst coordinates */
+	op->x1 += op->dst_x;
+	op->x2 += op->dst_x;
+	op->y1 += op->dst_y;
+	op->y2 += op->dst_y;
+	/* Constrain dst rectangle to dst bitmap */
+	if (op->x1 < 0) op->x1 = 0;
+	if (op->y1 < 0) op->y1 = 0;
+	if (op->x2 > op->dst.width) op->x2 = op->dst.width;
+	if (op->y2 > op->dst.height) op->y2 = op->dst.height;
+	/* If we have nothing to copy, stop now */
+	if ((op->x2 - op->x1) < 1 ||
+	    (op->y2 - op->y1) < 1)
+		return false;
+	/* Okay, stuff to copy, so let's begin */
+	op->src.ptr +=
+		(op->src.stride * (op->y1 - op->dst_y)) + /* move down y1 rows */
+		(op->x1 - op->dst_x) * 4; /* and across x1 pixels */
+	op->dst.ptr +=
+		(op->dst.stride * op->y1) + /* down down y1 rows */
+		(op->x1 * 4); /* and across x1 pixels */
+	for (ssize_t rowctr = op->y2 - op->y1; rowctr > 0; --rowctr) {
+		memcpy(op->dst.ptr, op->src.ptr, (op->x2 - op->x1) * 4);
+		op->src.ptr += op->src.stride;
+		op->dst.ptr += op->dst.stride;
+	}
+	return true;
+}
+
+/* prologue ends */
+%};
+};
+
+init CanvasRenderingContext2D(struct dom_html_canvas_element *canvas)
+%{
+	struct bitmap *bitmap;
+	dom_exception exc;
+
+	assert(canvas != NULL);
+	
+	priv->canvas = canvas;
+	dom_node_ref(canvas);
+	
+	exc = dom_event_listener_create(canvas2d__handle_dom_event,
+					priv,
+					&priv->listener);
+	assert(exc == DOM_NO_ERR);
+	
+	exc = dom_event_target_add_event_listener(
+		canvas,
+		corestring_dom_DOMSubtreeModified,
+		priv->listener,
+		false);
+	assert(exc == DOM_NO_ERR);
+	
+	exc = dom_node_get_user_data(canvas,
+				     corestring_dom___ns_key_canvas_node_data,
+				     &bitmap);
+	assert(exc == DOM_NO_ERR);
+	
+	if (bitmap == NULL) {
+		if (canvas2d_create_bitmap((dom_node *)canvas,
+					   &bitmap) != NSERROR_OK) {
+			priv->bitmap = NULL;
+			priv->width = -1;
+			priv->height = -1;
+			priv->stride = 0;
+			return;
+		}
+	}
+
+	assert(bitmap != NULL);
+	
+	priv->bitmap = bitmap;
+	priv->width = guit->bitmap->get_width(bitmap);
+	priv->height = guit->bitmap->get_height(bitmap);
+	priv->stride = guit->bitmap->get_rowstride(bitmap);
+%}
+
+fini CanvasRenderingContext2D()
+%{
+	dom_exception exc;
+	exc = dom_event_target_remove_event_listener(
+		priv->canvas,
+		corestring_dom_DOMSubtreeModified,
+		priv->listener,
+		false);
+	assert(exc == DOM_NO_ERR);
+	dom_event_listener_unref(priv->listener);
+	dom_node_unref(priv->canvas);
+%}
+
+getter CanvasRenderingContext2D::canvas()
+%{
+	dukky_push_node(ctx, (dom_node *)priv->canvas);
+	return 1;
+%}
+
+getter CanvasRenderingContext2D::width()
+%{
+	dom_exception exc;
+	dom_ulong width;
+	
+	exc = dom_html_canvas_element_get_width(priv->canvas, &width);
+	if (exc != DOM_NO_ERR) return 0;
+	
+	duk_push_number(ctx, (duk_double_t)width);
+	return 1;
+%}
+
+setter CanvasRenderingContext2D::width()
+%{
+	dom_exception exc;
+	dom_ulong width = duk_get_uint(ctx, 0);
+
+	exc = dom_html_canvas_element_set_width(priv->canvas, width);
+	if (exc != DOM_NO_ERR) return 0;
+
+	return 1;
+%}
+
+getter CanvasRenderingContext2D::height()
+%{
+	dom_exception exc;
+	dom_ulong height;
+	
+	exc = dom_html_canvas_element_get_height(priv->canvas, &height);
+	if (exc != DOM_NO_ERR) return 0;
+	
+	duk_push_number(ctx, (duk_double_t)height);
+	return 1;
+%}
+
+setter CanvasRenderingContext2D::height()
+%{
+	dom_exception exc;
+	dom_ulong height = duk_get_uint(ctx, 0);
+
+	exc = dom_html_canvas_element_set_height(priv->canvas, height);
+	if (exc != DOM_NO_ERR) return 0;
+
+	return 1;
+%}
+
+method CanvasRenderingContext2D::createImageData()
+%{
+	/* Can be called either with width and height, or with a reference
+	 * imagedata object
+	 */
+	image_data_private_t *idpriv;
+	int width, height;
+
+	if (duk_get_top(ctx) == 2) {
+		width = duk_to_int(ctx, 0);
+		height = duk_to_int(ctx, 1);
+	} else if (dukky_instanceof(ctx, 0, PROTO_NAME(IMAGEDATA))) {
+		duk_get_prop_string(ctx, 0, dukky_magic_string_private);
+		idpriv = duk_get_pointer(ctx, -1);
+		width = idpriv->width;
+		height = idpriv->height;
+		duk_pop(ctx);
+	} else {
+		duk_push_null(ctx);
+		return 1;
+	}
+
+	duk_push_int(ctx, width);
+	duk_push_int(ctx, height);
+	if (dukky_create_object(ctx,
+				PROTO_NAME(IMAGEDATA),
+				2) != DUK_EXEC_SUCCESS) {
+		return duk_error(ctx,
+				 DUK_ERR_ERROR,
+				 "Unable to create ImageData");
+	}
+	return 1;
+%}
+
+method CanvasRenderingContext2D::getImageData()
+%{
+	/* called with x, y, width, height */
+	int x = duk_get_int(ctx, 0);
+	int y = duk_get_int(ctx, 1);
+	int width = duk_get_int(ctx, 2);
+	int height = duk_get_int(ctx, 3);
+	image_data_private_t *idpriv;
+	copy_operation copyop;
+
+	if (priv->bitmap == NULL)
+		return duk_generic_error(ctx, "Canvas in bad state, sorry");
+
+	duk_push_int(ctx, width);
+	duk_push_int(ctx, height);
+	if (dukky_create_object(ctx,
+				PROTO_NAME(IMAGEDATA),
+				2) != DUK_EXEC_SUCCESS) {
+		return duk_error(ctx,
+				 DUK_ERR_ERROR,
+				 "Unable to create ImageData");
+	}
+
+	/* ... imgdata */
+	duk_get_prop_string(ctx, -1, dukky_magic_string_private);
+	idpriv = duk_get_pointer(ctx, -1);
+	duk_pop(ctx);
+
+	/* We now have access to the imagedata private, so we need to copy
+	 * the pixel range out of ourselves
+	 */
+	copyop.src.ptr = guit->bitmap->get_buffer(priv->bitmap);
+	copyop.src.stride = priv->stride;
+	copyop.src.width = priv->width;
+	copyop.src.height = priv->height;
+
+	copyop.dst.ptr = idpriv->data;
+	copyop.dst.stride = idpriv->width * 4;
+	copyop.dst.width = idpriv->width;
+	copyop.dst.height = idpriv->height;
+
+	/* Copying to top/left of our new bitmap */
+	copyop.dst_x = 0;
+	copyop.dst_y = 0;
+
+	/* Copying from x,y for width,height */
+	copyop.x1 = x;
+	copyop.x2 = x + width;
+	copyop.y1 = y;
+	copyop.y2 = y + height;
+
+	/* We don't care if the copy operation wrote or not because
+	 * we don't need to invalidate ImageData objects
+	 */
+	(void)canvas2d__copy_bitmap_to_bitmap(&copyop);
+	return 1;
+%}
+
+method CanvasRenderingContext2D::putImageData()
+%{
+	/* imgdata, x, y[, clipx, clipy, clipw, cliph] */
+	/* If provided, the clip coordinates are within the input image data */
+	/* We pretend the image is placed at x,y within ourselves, and then we
+	 * copy the clip rectangle (defaults to whole image)
+	 */
+	image_data_private_t *idpriv;
+	copy_operation copyop;
+
+	if (!dukky_instanceof(ctx, 0, PROTO_NAME(IMAGEDATA))) {
+		return duk_generic_error(ctx, "Expected ImageData as first argument");
+	}
+
+	if (priv->bitmap == NULL)
+		return duk_generic_error(ctx, "Canvas in bad state, sorry");
+
+	duk_get_prop_string(ctx, 0, dukky_magic_string_private);
+	idpriv = duk_get_pointer(ctx, -1);
+	duk_pop(ctx);
+
+	/* Copying from the input ImageData object */
+	copyop.src.ptr = idpriv->data;
+	copyop.src.stride = idpriv->width * 4;
+	copyop.src.width = idpriv->width;
+	copyop.src.height = idpriv->height;
+
+	/* Copying to ourselves */
+	copyop.dst.ptr = guit->bitmap->get_buffer(priv->bitmap);
+	copyop.dst.stride = priv->stride;
+	copyop.dst.width = priv->width;
+	copyop.dst.height = priv->height;
+
+	/* X Y target coordinates */
+	copyop.dst_x = duk_to_int(ctx, 1);
+	copyop.dst_y = duk_to_int(ctx, 2);
+
+	if (duk_get_top(ctx) < 7) {
+		/* Clipping data not provided */
+		copyop.x1 = 0;
+		copyop.y1 = 0;
+		copyop.x2 = idpriv->width;
+		copyop.y2 = idpriv->height;
+	} else {
+		copyop.x1 = duk_to_int(ctx, 3);
+		copyop.y1 = duk_to_int(ctx, 4);
+		copyop.x2 = copyop.x1 + duk_to_int(ctx, 5);
+		copyop.y2 = copyop.y1 + duk_to_int(ctx, 6);
+	}
+
+	if (canvas2d__copy_bitmap_to_bitmap(&copyop)) {
+		guit->bitmap->modified(priv->bitmap);
+		redraw_node((dom_node *)(priv->canvas));
+	}
+
+	return 0;
+%}
diff --git a/content/handlers/javascript/duktape/Console.bnd b/content/handlers/javascript/duktape/Console.bnd
index cf4bc4f92..89d13cfad 100644
--- a/content/handlers/javascript/duktape/Console.bnd
+++ b/content/handlers/javascript/duktape/Console.bnd
@@ -51,7 +51,8 @@ write_log_entry(duk_context *ctx, unsigned int group, browser_window_console_fla
 	duk_size_t msglen;
 	const char *msg = duk_safe_to_lstring(ctx, 0, &msglen);
 
-	if (browser_window_console_log(priv_win->win, BW_CS_SCRIPT_CONSOLE,
+	if (priv_win == NULL || priv_win->win == NULL || priv_win->closed_down == true ||
+	    browser_window_console_log(priv_win->win, BW_CS_SCRIPT_CONSOLE,
 				       msg, msglen,
 				       flags) != NSERROR_OK) {
 		NSLOG(netsurf, DEBUG, "Unable to log: %s", duk_safe_to_string(ctx, 0));
@@ -181,7 +182,7 @@ method Console::timeEnd()
 	duk_del_prop(ctx, 0);
 	duk_push_string(ctx, "Timer elapsed: ");
 	duk_insert(ctx, 0);
-	duk_push_sprintf(ctx, "%lu ms", (duk_uint_t)(time_ms - old_time_ms));
+	duk_push_sprintf(ctx, "%u ms", (duk_uint_t)(time_ms - old_time_ms));
 	write_log_entry(ctx, priv->group, BW_CS_FLAG_LEVEL_INFO);
 	return 0;
 %}
diff --git a/content/handlers/javascript/duktape/DOMImplementation.bnd b/content/handlers/javascript/duktape/DOMImplementation.bnd
new file mode 100644
index 000000000..05c481ddc
--- /dev/null
+++ b/content/handlers/javascript/duktape/DOMImplementation.bnd
@@ -0,0 +1,120 @@
+/* DOMImplementation binding for browser using duktape and libdom
+ *
+ * Copyright 2020 Daniel Silverstone <dsilvers@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * Released under the terms of the MIT License,
+ *         http://www.opensource.org/licenses/mit-license
+ */
+
+prologue DOMImplementation ()
+%{
+#include "utils/corestrings.h"
+%}
+
+method DOMImplemention::hasFeature ()
+%{
+	/* Always return true */
+	duk_push_bool(ctx, true);
+	return 1;
+%}
+
+method DOMImplementation::createHTMLDocument ()
+%{
+	duk_size_t text_len;
+	const char *text = duk_safe_to_lstring(ctx, 0, &text_len);
+	struct dom_document *doc = NULL, *ret = NULL;
+	struct dom_document_type *doctype = NULL;
+	struct dom_html_element *html = NULL, *head = NULL, *title = NULL, *body = NULL;
+	struct dom_node *spare_ref = NULL;
+	dom_string *text_str = NULL;
+	dom_exception exc;
+
+	exc = dom_string_create((const uint8_t*)text, text_len, &text_str);
+	if (exc != DOM_NO_ERR) goto out;
+
+	exc = dom_implementation_create_document(
+		DOM_IMPLEMENTATION_HTML,
+		NULL, NULL,
+		NULL,
+		NULL, NULL,
+		&doc
+		);
+	if (exc != DOM_NO_ERR) goto out;
+
+	exc = dom_implementation_create_document_type(
+		"html", NULL, NULL, &doctype);
+	if (exc != DOM_NO_ERR) goto out;
+
+	exc = dom_node_append_child(doc, doctype, &spare_ref);
+	if (exc != DOM_NO_ERR) goto out;
+	if (spare_ref != NULL) { dom_node_unref(spare_ref); spare_ref = NULL; }
+
+	exc = dom_document_create_element_ns(doc, corestring_dom_html_namespace,
+					     corestring_dom_HTML, &html);
+	if (exc != DOM_NO_ERR) goto out;
+
+	exc = dom_document_create_element_ns(doc, corestring_dom_html_namespace,
+					     corestring_dom_HEAD, &head);
+	if (exc != DOM_NO_ERR) goto out;
+
+	exc = dom_document_create_element_ns(doc, corestring_dom_html_namespace,
+					     corestring_dom_TITLE, &title);
+	if (exc != DOM_NO_ERR) goto out;
+
+	exc = dom_document_create_element_ns(doc, corestring_dom_html_namespace,
+					     corestring_dom_BODY, &body);
+	if (exc != DOM_NO_ERR) goto out;
+
+	exc = dom_node_set_text_content(title, text_str);
+	if (exc != DOM_NO_ERR) goto out;
+
+	exc = dom_node_append_child(head, title, &spare_ref);
+	if (exc != DOM_NO_ERR) goto out;
+	if (spare_ref != NULL) { dom_node_unref(spare_ref); spare_ref = NULL; }
+
+	exc = dom_node_append_child(html, head, &spare_ref);
+	if (exc != DOM_NO_ERR) goto out;
+	if (spare_ref != NULL) { dom_node_unref(spare_ref); spare_ref = NULL; }
+
+	exc = dom_node_append_child(html, body, &spare_ref);
+	if (exc != DOM_NO_ERR) goto out;
+	if (spare_ref != NULL) { dom_node_unref(spare_ref); spare_ref = NULL; }
+
+	exc = dom_node_append_child(doc, html, &spare_ref);
+	if (exc != DOM_NO_ERR) goto out;
+	if (spare_ref != NULL) { dom_node_unref(spare_ref); spare_ref = NULL; }
+
+	ret = doc;
+	doc = NULL;
+
+out:
+	if (text_str != NULL) {
+		dom_string_unref(text_str);
+	}
+	if (doc != NULL) {
+		dom_node_unref(doc);
+	}
+	if (html != NULL) {
+		dom_node_unref(html);
+	}
+	if (head != NULL) {
+		dom_node_unref(head);
+	}
+	if (title != NULL) {
+		dom_node_unref(title);
+	}
+	if (body != NULL) {
+		dom_node_unref(body);
+	}
+	if (doctype != NULL) {
+		dom_node_unref(doctype);
+	}
+	if (ret != NULL) {
+		dukky_push_node(ctx, (struct dom_node *)ret);
+		dom_node_unref(ret);
+		return 1;
+	}
+	return 0; /* Coerced to undefined */
+%}
diff --git a/content/handlers/javascript/duktape/DOMSettableTokenList.bnd b/content/handlers/javascript/duktape/DOMSettableTokenList.bnd
new file mode 100644
index 000000000..ac5c7062a
--- /dev/null
+++ b/content/handlers/javascript/duktape/DOMSettableTokenList.bnd
@@ -0,0 +1,44 @@
+/* DOMTokenList binding for browser using duktape and libdom
+ *
+ * Copyright 2015 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * Released under the terms of the MIT License,
+ *         http://www.opensource.org/licenses/mit-license
+ */
+
+class DOMSettableTokenList {
+};
+
+init DOMSettableTokenList(struct dom_tokenlist *tokens::tokens);
+
+getter DOMSettableTokenList::value()
+%{
+	dom_exception exc;
+	dom_string *value;
+
+	exc = dom_tokenlist_get_value(priv->parent.tokens, &value);
+	if (exc != DOM_NO_ERR) return 0; /* coerced to undefined */
+
+	duk_push_lstring(ctx, dom_string_data(value), dom_string_length(value));
+	dom_string_unref(value);
+
+	return 1;
+%}
+
+setter DOMSettableTokenList::value()
+%{
+	dom_exception exc;
+	dom_string *value;
+    duk_size_t slen;
+    const char *s = duk_require_lstring(ctx, 0, &slen);
+
+    exc = dom_string_create_interned((const uint8_t *)s, slen, &value);
+    if (exc != DOM_NO_ERR) return 0;
+
+    exc = dom_tokenlist_set_value(priv->parent.tokens, value);
+    dom_string_unref(value);
+
+    return 0;
+%}
\ No newline at end of file
diff --git a/content/handlers/javascript/duktape/DOMTokenList.bnd b/content/handlers/javascript/duktape/DOMTokenList.bnd
new file mode 100644
index 000000000..928d9ef35
--- /dev/null
+++ b/content/handlers/javascript/duktape/DOMTokenList.bnd
@@ -0,0 +1,163 @@
+/* DOMTokenList binding for browser using duktape and libdom
+ *
+ * Copyright 2015 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * Released under the terms of the MIT License,
+ *         http://www.opensource.org/licenses/mit-license
+ */
+
+class DOMTokenList {
+	private struct dom_tokenlist *tokens;
+};
+
+init DOMTokenList(struct dom_tokenlist *tokens)
+%{
+	priv->tokens = tokens;
+	dom_tokenlist_ref(tokens);
+%}
+
+fini DOMTokenList()
+%{
+	dom_tokenlist_unref(priv->tokens);
+%}
+
+getter DOMTokenList::length()
+%{
+	dom_exception err;
+	uint32_t len;
+
+	err = dom_tokenlist_get_length(priv->tokens, &len);
+
+	if (err != DOM_NO_ERR) return 0; /* coerced to undefined */
+
+	duk_push_uint(ctx, (duk_uint_t)len);
+
+	return 1;
+%}
+
+method DOMTokenList::item()
+%{
+	unsigned long i = duk_to_uint(ctx, 0);
+	dom_exception err;
+	dom_string *value;
+
+	err = dom_tokenlist_item(priv->tokens, i, &value);
+
+	if (err != DOM_NO_ERR) return 0; /* coerced to undefined */
+
+    if (value == NULL) {
+        duk_push_null(ctx);
+        return 1;
+    }
+
+    duk_push_lstring(ctx, dom_string_data(value), dom_string_length(value));
+	dom_string_unref(value);
+
+	return 1;
+%}
+
+method DOMTokenList::add()
+%{
+	dom_exception exc;
+	dom_string *value;
+	duk_size_t slen;
+	const char *s;
+	duk_idx_t spos;
+
+	for (spos = 0; spos < duk_get_top(ctx); ++spos) {
+		s = duk_safe_to_lstring(ctx, spos, &slen);
+
+		duk_safe_to_lstring(ctx, 0, &slen);
+
+		exc = dom_string_create_interned((const uint8_t *)s, slen, &value);
+		if (exc != DOM_NO_ERR) return 0;
+
+		exc = dom_tokenlist_add(priv->tokens, value);
+		dom_string_unref(value);
+	}
+	
+	return 0;
+%}
+
+method DOMTokenList::remove()
+%{
+	dom_exception exc;
+	dom_string *value;
+	duk_size_t slen;
+	const char *s;
+	duk_idx_t spos;
+
+	for (spos = 0; spos < duk_get_top(ctx); ++spos) {
+		s = duk_safe_to_lstring(ctx, spos, &slen);
+
+		duk_safe_to_lstring(ctx, 0, &slen);
+
+		exc = dom_string_create_interned((const uint8_t *)s, slen, &value);
+		if (exc != DOM_NO_ERR) return 0;
+
+		exc = dom_tokenlist_remove(priv->tokens, value);
+		dom_string_unref(value);
+	}
+	
+	return 0;
+%}
+
+method DOMTokenList::contains()
+%{
+	dom_exception exc;
+	dom_string *value;
+	duk_size_t slen;
+	const char *s = duk_safe_to_lstring(ctx, 0, &slen);
+	bool present = false;
+
+	exc = dom_string_create_interned((const uint8_t *)s, slen, &value);
+	if (exc != DOM_NO_ERR) return 0;
+
+	exc = dom_tokenlist_contains(priv->tokens, value, &present);
+	dom_string_unref(value);
+	if (exc != DOM_NO_ERR) return 0;
+
+	duk_push_boolean(ctx, present);
+	
+	return 1;
+%}
+
+method DOMTokenList::toggle()
+%{
+	dom_exception exc;
+	dom_string *value;
+	duk_size_t slen;
+	const char *s = duk_require_lstring(ctx, 0, &slen);
+	bool toggle_set = duk_get_top(ctx) > 1;
+	bool toggle = duk_opt_boolean(ctx, 1, 0);
+	bool present;
+
+	exc = dom_string_create_interned((const uint8_t *)s, slen, &value);
+	if (exc != DOM_NO_ERR) return 0;
+
+	exc = dom_tokenlist_contains(priv->tokens, value, &present);
+	if (exc != DOM_NO_ERR) {
+		dom_string_unref(value);
+		return 0;
+	}
+
+	/* Decision matrix is based on present, toggle_set, and toggle */
+	if (toggle_set) {
+		if (toggle) {
+			exc = dom_tokenlist_add(priv->tokens, value);
+		} else {
+			exc = dom_tokenlist_remove(priv->tokens, value);
+		}
+	} else {
+		if (present) {
+			exc = dom_tokenlist_add(priv->tokens, value);
+		} else {
+			exc = dom_tokenlist_remove(priv->tokens, value);
+		}
+	}
+	dom_string_unref(value);
+
+	return 0;
+%}
\ No newline at end of file
diff --git a/content/handlers/javascript/duktape/Document.bnd b/content/handlers/javascript/duktape/Document.bnd
index bd0206822..2f9adc380 100644
--- a/content/handlers/javascript/duktape/Document.bnd
+++ b/content/handlers/javascript/duktape/Document.bnd
@@ -14,7 +14,7 @@ prologue Document()
 #include "utils/libdom.h"
 #include "utils/utils.h"
 #include "content/hlcache.h"
-#include "html/html_internal.h"
+#include "html/private.h"
 #include "content/urldb.h"
 
 #define HANDLER_MAGIC MAGIC(HANDLER_MAP)
@@ -374,7 +374,39 @@ getter Document::cookie()
 		if (cookie_str != NULL) {
 			duk_push_string(ctx, cookie_str);
 			free(cookie_str);
-			return 1;
+		} else {
+			duk_push_string(ctx, "");
+		}
+		return 1;
+	} else {
+		NSLOG(netsurf, INFO,
+		      "error getting htmlc. parent node:%p htmlc:%p",
+		      priv->parent.node, htmlc);
+	}
+	return 0;
+%}
+
+setter Document::cookie()
+%{
+	struct html_content *htmlc;
+	dom_exception err;
+
+	const char * cookie_str = duk_safe_to_string(ctx, 0);
+
+	err = dom_node_get_user_data(priv->parent.node,
+				     corestring_dom___ns_key_html_content_data,
+				     &htmlc);
+	if ((err == DOM_NO_ERR) && (htmlc != NULL)) {
+		/* At this point we need to get the given cookie string parsed
+		 * and inserted into the urldb
+		 */
+		bool ok = urldb_set_cookie(cookie_str, /* The cookie string to set */
+					   /* The location to set the cookie for */
+					   llcache_handle_get_url(htmlc->base.llcache),
+					   NULL); /* The referer, which we trust */
+		if (!ok) {
+			NSLOG(netsurf, DEEPDEBUG, "unable to set cookie: %s", cookie_str);
+			/* However there's no useful way to signal that to JS */
 		}
 	} else {
 		NSLOG(netsurf, INFO,
@@ -401,6 +433,27 @@ method Document::createEvent ()
 	return 1;
 %}
 
+getter Document::implementation ()
+%{
+	/* Create a new DOMImplementation instance */
+	duk_push_this(ctx);
+	duk_get_prop_string(ctx, -1, MAGIC(DOMImplementation));
+	if (duk_is_undefined(ctx, -1)) {
+		duk_pop(ctx);
+
+		if (dukky_create_object(ctx,
+					PROTO_NAME(DOMIMPLEMENTATION),
+					0) != DUK_EXEC_SUCCESS) {
+			return duk_error(ctx,
+				  DUK_ERR_ERROR,
+				  "Unable to create dom implementation object");
+		}
+		duk_dup(ctx, -1);
+		duk_put_prop_string(ctx, -3, MAGIC(DOMImplementation));
+	}
+	return 1;
+%}
+
 getter Document::onabort();
 setter Document::onabort();
 getter Document::onautocompleteerror();
diff --git a/content/handlers/javascript/duktape/Element.bnd b/content/handlers/javascript/duktape/Element.bnd
index 33fc0863e..ff0686fd9 100644
--- a/content/handlers/javascript/duktape/Element.bnd
+++ b/content/handlers/javascript/duktape/Element.bnd
@@ -11,6 +11,7 @@
 class Element {
 	prologue %{
 #include <utils/corestrings.h>
+#include <dom/bindings/hubbub/parser.h>
 %};
 };
 
@@ -283,6 +284,9 @@ method Element::getAttribute()
 	const char *s = duk_safe_to_lstring(ctx, 0, &slen);
 	exc = dom_string_create((const uint8_t *)s, slen, &attr_name);
 	duk_pop(ctx);
+	if (exc != DOM_NO_ERR) {
+		return 0;
+	}
 
 	exc = dom_element_get_attribute(priv->parent.node,
 			attr_name, &attr_value);
@@ -336,6 +340,9 @@ method Element::hasAttribute()
 	const char *s = duk_safe_to_lstring(ctx, 0, &slen);
 	exc = dom_string_create((const uint8_t *)s, slen, &attr_name);
 	duk_pop(ctx);
+	if (exc != DOM_NO_ERR) {
+		return 0;
+	}
 
 	exc = dom_element_has_attribute(priv->parent.node,
 			attr_name, &res);
@@ -385,3 +392,184 @@ setter Element::className ()
 	return 0;
 %}
 
+getter Element::classList ()
+%{
+	dom_exception exc;
+	dom_tokenlist *tokens;
+
+	duk_set_top(ctx, 0);
+	duk_push_this(ctx);
+	duk_get_prop_string(ctx, 0, MAGIC(classList));
+
+	if (duk_is_undefined(ctx, -1)) {
+		duk_pop(ctx);
+		exc = dom_tokenlist_create((dom_element *)priv->parent.node, corestring_dom_class, &tokens);
+		if (exc != DOM_NO_ERR) return 0; /* Coerced to undefined */
+
+		/* Create a settable tokenlist - While the IDL says this isn't settable, all browsers
+		 * seem to make it settable, so we'll permit it too
+		 */
+		duk_push_pointer(ctx, tokens);
+		if (dukky_create_object(ctx, PROTO_NAME(DOMSETTABLETOKENLIST), 1) != DUK_EXEC_SUCCESS) {
+			dom_tokenlist_unref(tokens);
+			NSLOG(dukky, DEBUG, "Unable to create DOMSettableTokenList object");
+			return 0; /* Coerced to undefined */
+		}
+		dom_tokenlist_unref(tokens);
+		duk_dup(ctx, -1);
+		duk_put_prop_string(ctx, 0, MAGIC(classList));
+	}
+
+	return 1;
+%}
+
+getter Element::innerHTML()
+%{
+	duk_push_lstring(ctx, "", 0);
+	return 1;
+%}
+
+setter Element::innerHTML()
+%{
+	duk_size_t size;
+	const char *s = duk_safe_to_lstring(ctx, 0, &size);
+	dom_hubbub_parser_params parse_params;
+	dom_hubbub_error error;
+	dom_hubbub_parser *parser = NULL;
+	struct dom_document *doc = NULL;
+	struct dom_document_fragment *fragment = NULL;
+	dom_exception exc;
+	struct dom_node *child = NULL, *html = NULL, *body = NULL;
+	struct dom_nodelist *bodies = NULL;
+
+	exc = dom_node_get_owner_document(priv->parent.node, &doc);
+	if (exc != DOM_NO_ERR) goto out;
+
+	parse_params.enc = "UTF-8";
+	parse_params.fix_enc = true;
+	parse_params.enable_script = false;
+	parse_params.msg = NULL;
+	parse_params.script = NULL;
+	parse_params.ctx = NULL;
+	parse_params.daf = NULL;
+
+	error = dom_hubbub_fragment_parser_create(&parse_params,
+						  doc,
+						  &parser,
+						  &fragment);
+	if (error != DOM_HUBBUB_OK) {
+		NSLOG(netsurf, ERROR, "Unable to create fragment parser!");
+		goto out;
+	}
+
+	error = dom_hubbub_parser_parse_chunk(parser, (const uint8_t*)s, size);
+	if (error != DOM_HUBBUB_OK) {
+		NSLOG(netsurf, ERROR, "Unable to parse HTML chunk");
+		goto out;
+	}
+	error = dom_hubbub_parser_completed(parser);
+	if (error != DOM_HUBBUB_OK) {
+		NSLOG(netsurf, ERROR, "Unable to complete parser");
+		goto out;
+	}
+
+	/* Parse is finished, transfer contents of fragment into node */
+
+	/* 1. empty this node */
+	exc = dom_node_get_first_child(priv->parent.node, &child);
+	if (exc != DOM_NO_ERR) goto out;
+	while (child != NULL) {
+		struct dom_node *cref;
+		exc = dom_node_remove_child(priv->parent.node, child, &cref);
+		if (exc != DOM_NO_ERR) goto out;
+		dom_node_unref(child);
+		child = NULL;
+		dom_node_unref(cref);
+		exc = dom_node_get_first_child(priv->parent.node, &child);
+		if (exc != DOM_NO_ERR) goto out;
+	}
+
+	/* 2. the first child in the fragment will be an HTML element
+	 * because that's how hubbub works, walk through that to the body
+	 * element hubbub will have created, we want to migrate that element's
+	 * children into ourself.
+	 */
+	exc = dom_node_get_first_child(fragment, &html);
+	if (exc != DOM_NO_ERR) goto out;
+
+	/* We can then ask that HTML element to give us its body */
+	exc = dom_element_get_elements_by_tag_name(html, corestring_dom_BODY, &bodies);
+	if (exc != DOM_NO_ERR) goto out;
+
+	/* And now we can get the body which will be the zeroth body */
+	exc = dom_nodelist_item(bodies, 0, &body);
+	if (exc != DOM_NO_ERR) goto out;
+
+	/* 3. Migrate the children */
+	exc = dom_node_get_first_child(body, &child);
+	if (exc != DOM_NO_ERR) goto out;
+	while (child != NULL) {
+		struct dom_node *cref;
+		exc = dom_node_remove_child(body, child, &cref);
+		if (exc != DOM_NO_ERR) goto out;
+		dom_node_unref(cref);
+		exc = dom_node_append_child(priv->parent.node, child, &cref);
+		if (exc != DOM_NO_ERR) goto out;
+		dom_node_unref(cref);
+		dom_node_unref(child);
+		child = NULL;
+		exc = dom_node_get_first_child(body, &child);
+		if (exc != DOM_NO_ERR) goto out;
+	}
+out:
+	if (parser != NULL) {
+		dom_hubbub_parser_destroy(parser);
+	}
+	if (doc != NULL) {
+		dom_node_unref(doc);
+	}
+	if (fragment != NULL) {
+		dom_node_unref(fragment);
+	}
+	if (child != NULL) {
+		dom_node_unref(child);
+	}
+	if (html != NULL) {
+		dom_node_unref(html);
+	}
+	if (bodies != NULL) {
+		dom_nodelist_unref(bodies);
+	}
+	if (body != NULL) {
+		dom_node_unref(body);
+	}
+	return 0;
+%}
+
+getter Element::attributes()
+%{
+	dom_exception exc;
+	dom_namednodemap *nmap = NULL;
+	duk_set_top(ctx, 0);
+	duk_push_this(ctx);
+	duk_get_prop_string(ctx, 0, MAGIC(attributes));
+	if (duk_is_undefined(ctx, -1)) {
+		duk_pop(ctx);
+		exc = dom_node_get_attributes(priv->parent.node, &nmap);
+		if (exc != DOM_NO_ERR) return 0;
+		dukky_push_generics(ctx, "makeNodeMapProxy");
+		duk_push_pointer(ctx, nmap);
+		if (dukky_create_object(ctx, PROTO_NAME(NAMEDNODEMAP), 1) != DUK_EXEC_SUCCESS) {
+			dom_namednodemap_unref(nmap);
+			return 0;
+		}
+		dom_namednodemap_unref(nmap);
+		if (dukky_pcall(ctx, 1, false) != 0) {
+			NSLOG(dukky, DEBUG, "Unable to construct nodelist?");
+			return 0; /* coerced to undefined */
+		}
+		duk_dup(ctx, -1);
+		duk_put_prop_string(ctx, 0, MAGIC(attributes));
+	}
+	return 1;
+%}
diff --git a/content/handlers/javascript/duktape/Event.bnd b/content/handlers/javascript/duktape/Event.bnd
index aa69daac3..2c24cfa73 100644
--- a/content/handlers/javascript/duktape/Event.bnd
+++ b/content/handlers/javascript/duktape/Event.bnd
@@ -182,8 +182,8 @@ method Event::initEvent ()
 	cancellable = duk_get_boolean(ctx, 2);
 
 	exc = dom_event_init(priv->evt, text_str, bubbles, cancellable);
+	dom_string_unref(text_str);
 	if (exc != DOM_NO_ERR) {
-		dom_string_unref(text_str);
 		return 0;
 	}
 
diff --git a/content/handlers/javascript/duktape/HTMLCanvasElement.bnd b/content/handlers/javascript/duktape/HTMLCanvasElement.bnd
new file mode 100644
index 000000000..da9f66dee
--- /dev/null
+++ b/content/handlers/javascript/duktape/HTMLCanvasElement.bnd
@@ -0,0 +1,47 @@
+/* HTML canvas element binding using duktape and libdom
+ *
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ * Copyright 2020 Daniel Silverstone <dsilvers@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * Released under the terms of the MIT License,
+ *         http://www.opensource.org/licenses/mit-license
+ */
+
+init HTMLCanvasElement(struct dom_html_element *html_canvas_element::html_element);
+
+getter HTMLCanvasElement::width();
+setter HTMLCanvasElement::width();
+
+getter HTMLCanvasElement::height();
+setter HTMLCanvasElement::height();
+
+method HTMLCanvasElement::getContext()
+%{
+	/* modetype[, {options}] */
+	const char *modetype = duk_to_string(ctx, 0);
+	if (strcmp(modetype, "2d") != 0) {
+		duk_push_null(ctx);
+		return 1;
+	}
+
+	duk_push_this(ctx);
+	duk_get_prop_string(ctx, -1, MAGIC(Context2D));
+	if (duk_is_undefined(ctx, -1)) {
+		duk_pop(ctx);
+
+		duk_push_pointer(ctx, ((node_private_t*)priv)->node);
+		if (dukky_create_object(ctx,
+					PROTO_NAME(CANVASRENDERINGCONTEXT2D),
+					1) != DUK_EXEC_SUCCESS) {
+			return duk_error(ctx,
+				  DUK_ERR_ERROR,
+				  "Unable to create CanvasRenderingContext2D");
+		}
+		duk_dup(ctx, -1);
+		duk_put_prop_string(ctx, -3, MAGIC(Context2D));
+	}
+	return 1;
+%}
+
diff --git a/content/handlers/javascript/duktape/ImageData.bnd b/content/handlers/javascript/duktape/ImageData.bnd
new file mode 100644
index 000000000..be28cbd77
--- /dev/null
+++ b/content/handlers/javascript/duktape/ImageData.bnd
@@ -0,0 +1,44 @@
+/* HTML canvas ImageData objects
+ *
+ * Copyright 2020 Daniel Silverstone <dsilvers@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * Released under the terms of the MIT License,
+ *         http://www.opensource.org/licenses/mit-license
+ */
+
+class ImageData {
+      private int width;
+      private int height;
+      private uint8_t *data;
+};
+
+init ImageData(int width, int height)
+%{
+	priv->width = width;
+	priv->height = height;
+	priv->data = duk_push_buffer(ctx, width * height * 4, false);
+	duk_put_prop_string(ctx, 0, MAGIC(DATA));
+	duk_pop(ctx);
+%}
+
+getter ImageData::width()
+%{
+	duk_push_int(ctx, priv->width);
+	return 1;
+%}
+
+getter ImageData::height()
+%{
+	duk_push_int(ctx, priv->height);
+	return 1;
+%}
+
+getter ImageData::data()
+%{
+	duk_push_this(ctx);
+	duk_get_prop_string(ctx, -1, MAGIC(DATA));
+	duk_push_buffer_object(ctx, -1, 0, priv->width * priv->height * 4llu, DUK_BUFOBJ_UINT8CLAMPEDARRAY);
+	return 1;
+%}
diff --git a/content/handlers/javascript/duktape/KeyboardEvent.bnd b/content/handlers/javascript/duktape/KeyboardEvent.bnd
new file mode 100644
index 000000000..67c4564c9
--- /dev/null
+++ b/content/handlers/javascript/duktape/KeyboardEvent.bnd
@@ -0,0 +1,142 @@
+/* Binding for browser using duktape and libdom
+ *
+ * Copyright 2019 Michael Drake <tlsa@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * Released under the terms of the MIT License,
+ *         http://www.opensource.org/licenses/mit-license
+ */
+
+init KeyboardEvent (struct dom_keyboard_event *evt::ui_event);
+
+getter KeyboardEvent::key ()
+%{
+	dom_exception err;
+	dom_string *key;
+
+	err = dom_keyboard_event_get_key(priv->parent.parent.evt, &key);
+	if (err != DOM_NO_ERR) {
+		return 0;
+	}
+
+	duk_push_lstring(ctx, dom_string_data(key), dom_string_length(key));
+	dom_string_unref(key);
+	return 1;
+%}
+
+getter KeyboardEvent::code ()
+%{
+	dom_exception err;
+	dom_string *code;
+
+	err = dom_keyboard_event_get_code(priv->parent.parent.evt, &code);
+	if (err != DOM_NO_ERR) {
+		return 0;
+	}
+
+	duk_push_lstring(ctx, dom_string_data(code), dom_string_length(code));
+	dom_string_unref(code);
+	return 1;
+%}
+
+getter KeyboardEvent::location ()
+%{
+	dom_exception err;
+	dom_key_location location;
+
+	err = dom_keyboard_event_get_location(priv->parent.parent.evt,
+			&location);
+	if (err != DOM_NO_ERR) {
+		return 0;
+	}
+
+	duk_push_uint(ctx, (duk_uint_t) location);
+	return 1;
+%}
+
+getter KeyboardEvent::ctrlKey ()
+%{
+	dom_exception err;
+	bool ctrl_key;
+
+	err = dom_keyboard_event_get_ctrl_key(priv->parent.parent.evt,
+			&ctrl_key);
+	if (err != DOM_NO_ERR) {
+		return 0;
+	}
+
+	duk_push_boolean(ctx, (duk_bool_t) ctrl_key);
+	return 1;
+%}
+
+getter KeyboardEvent::shiftKey ()
+%{
+	dom_exception err;
+	bool shift_key;
+
+	err = dom_keyboard_event_get_shift_key(priv->parent.parent.evt,
+			&shift_key);
+	if (err != DOM_NO_ERR) {
+		return 0;
+	}
+
+	duk_push_boolean(ctx, (duk_bool_t) shift_key);
+	return 1;
+%}
+
+getter KeyboardEvent::altKey ()
+%{
+	dom_exception err;
+	bool alt_key;
+
+	err = dom_keyboard_event_get_alt_key(priv->parent.parent.evt,
+			&alt_key);
+	if (err != DOM_NO_ERR) {
+		return 0;
+	}
+
+	duk_push_boolean(ctx, (duk_bool_t) alt_key);
+	return 1;
+%}
+
+getter KeyboardEvent::metaKey ()
+%{
+	dom_exception err;
+	bool meta_key;
+
+	err = dom_keyboard_event_get_meta_key(priv->parent.parent.evt,
+			&meta_key);
+	if (err != DOM_NO_ERR) {
+		return 0;
+	}
+
+	duk_push_boolean(ctx, (duk_bool_t) meta_key);
+	return 1;
+%}
+
+method KeyboardEvent::getModifierState ()
+%{
+	dom_string *modifier;
+	dom_exception err;
+	duk_size_t slen;
+	const char *s;
+	bool state;
+
+	s = duk_safe_to_lstring(ctx, 0, &slen);
+	err = dom_string_create((const uint8_t *)s, slen, &modifier);
+	duk_pop(ctx);
+	if (err != DOM_NO_ERR) {
+		return 0;
+	}
+
+	err = dom_keyboard_event_get_modifier_state(priv->parent.parent.evt,
+			modifier, &state);
+	dom_string_unref(modifier);
+	if (err != DOM_NO_ERR) {
+		return 0;
+	}
+
+	duk_push_boolean(ctx, (duk_bool_t) state);
+	return 1;
+%}
diff --git a/content/handlers/javascript/duktape/Makefile b/content/handlers/javascript/duktape/Makefile
index 7c9e60a8b..638ca4458 100644
--- a/content/handlers/javascript/duktape/Makefile
+++ b/content/handlers/javascript/duktape/Makefile
@@ -4,17 +4,27 @@
 # Included by javascript/Makefile
 #
 
-content/handlers/javascript/duktape/dukky.c: $(OBJROOT)/duktape/binding.h $(OBJROOT)/duktape/generics.js.inc
+content/handlers/javascript/duktape/dukky.c: \
+	$(OBJROOT)/duktape/binding.h \
+	$(OBJROOT)/duktape/generics.js.inc \
+	$(OBJROOT)/duktape/polyfill.js.inc
 
 BINDINGS := $(wildcard content/handlers/javascript/duktape/*.bnd)
 
 # Generator for the C include representing the generics.js
-$(OBJROOT)/duktape/generics.js.inc: content/handlers/javascript/duktape/generics.js
+$(OBJROOT)/duktape/generics.js.inc: content/handlers/javascript/duktape/generics.js $(TOOLROOT)/xxd
 	$(Q)$(MKDIR) -p $(OBJROOT)/duktape
 	$(VQ)echo "     XXD: $<"
-	$(Q)xxd -i $< $@.tmp
+	$(Q)$(TOOLROOT)/xxd -i $< $@.tmp
 	$(Q)sed -e 's/content_handlers_javascript_duktape_generics_js/generics_js/' $@.tmp > $@
 
+# Generator for the C include representing the polyfill.js
+$(OBJROOT)/duktape/polyfill.js.inc: content/handlers/javascript/duktape/polyfill.js $(TOOLROOT)/xxd
+	$(Q)$(MKDIR) -p $(OBJROOT)/duktape
+	$(VQ)echo "     XXD: $<"
+	$(Q)$(TOOLROOT)/xxd -i $< $@.tmp
+	$(Q)sed -e 's/content_handlers_javascript_duktape_polyfill_js/polyfill_js/' $@.tmp > $@
+
 # ensure genbind generates debugging files
 GBFLAGS+=-D
 
diff --git a/content/handlers/javascript/duktape/NamedNodeMap.bnd b/content/handlers/javascript/duktape/NamedNodeMap.bnd
new file mode 100644
index 000000000..c81993c92
--- /dev/null
+++ b/content/handlers/javascript/duktape/NamedNodeMap.bnd
@@ -0,0 +1,74 @@
+/* NamedNodeMap binding for browser using duktape and libdom
+ *
+ * Copyright 2020 Daniel Silverstone <dsilvers@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * Released under the terms of the MIT License,
+ *         http://www.opensource.org/licenses/mit-license
+ */
+
+class NamedNodeMap {
+	private struct dom_namednodemap *map;
+};
+
+init NamedNodeMap(struct dom_namednodemap *map)
+%{
+	priv->map = map;
+	dom_namednodemap_ref(map);
+%}
+
+fini NamedNodeMap()
+%{
+	dom_namednodemap_unref(priv->map);
+%}
+
+getter NamedNodeMap::length()
+%{
+	dom_exception err;
+	uint32_t len;
+
+	err = dom_namednodemap_get_length(priv->map, &len);
+
+	if (err != DOM_NO_ERR) return 0; /* coerced to undefined */
+
+	duk_push_uint(ctx, (duk_uint_t)len);
+
+	return 1;
+%}
+
+method NamedNodeMap::item()
+%{
+	unsigned long i = duk_to_uint(ctx, 0);
+	dom_exception err;
+	dom_node *node;
+
+	err = dom_namednodemap_item(priv->map, i, &node);
+
+	if (err != DOM_NO_ERR) return 0; /* coerced to undefined */
+
+	dukky_push_node(ctx, node);
+	dom_node_unref(node);
+
+	return 1;
+%}
+
+method NamedNodeMap::getNamedItem()
+%{
+	duk_size_t size;
+	const char *s = duk_safe_to_lstring(ctx, 0, &size);
+	dom_exception exc;
+	dom_node *attr = NULL;
+	dom_string *name = NULL;
+
+	exc = dom_string_create((const uint8_t*)s, size, &name);
+	if (exc != DOM_NO_ERR) return 0; /* coerced to undefined */
+	
+	exc = dom_namednodemap_get_named_item(priv->map, name, &attr);
+	dom_string_unref(name);
+	if (exc != DOM_NO_ERR) return 0; /* coerced to undefined */
+	
+	dukky_push_node(ctx, attr);
+	dom_node_unref(attr);
+	return 1;
+%}
diff --git a/content/handlers/javascript/duktape/Node.bnd b/content/handlers/javascript/duktape/Node.bnd
index 98fb5dd7c..8cd07944d 100644
--- a/content/handlers/javascript/duktape/Node.bnd
+++ b/content/handlers/javascript/duktape/Node.bnd
@@ -221,7 +221,8 @@ setter Node::nodeValue()
 	if (exc != DOM_NO_ERR) return 0;
 	exc = dom_node_set_node_value(priv->node, content);
 	dom_string_unref(content);
-	return 0;
+	if (exc != DOM_NO_ERR) return 0;
+	return 1;
 %}
 
 getter Node::textContent()
diff --git a/content/handlers/javascript/duktape/Window.bnd b/content/handlers/javascript/duktape/Window.bnd
index 39c58c41d..f7d143f6c 100644
--- a/content/handlers/javascript/duktape/Window.bnd
+++ b/content/handlers/javascript/duktape/Window.bnd
@@ -12,13 +12,14 @@ class Window {
 	private struct browser_window * win;
 	private struct html_content * htmlc;
 	private struct window_schedule_s * schedule_ring;
+	private bool closed_down;
 	prologue %{
 #include "utils/corestrings.h"
 #include "utils/nsurl.h"
 #include "netsurf/browser_window.h"
 #include "content/hlcache.h"
 #include "html/html.h"
-#include "html/html_internal.h"
+#include "html/private.h"
 #include "desktop/gui_internal.h"
 #include "netsurf/misc.h"
 #include "utils/ring.h"
@@ -52,7 +53,9 @@ static void window_remove_callback_bits(duk_context *ctx, size_t handle) {
 	/* ... */
 }
 
-static void window_call_callback(duk_context *ctx, size_t handle, bool clear_entry) {
+static void
+window_call_callback(duk_context *ctx, size_t handle, bool clear_entry)
+{
 	NSLOG(dukky, DEEPDEBUG, "ctx=%p, handle=%"PRIsizet, ctx, handle);
 	/* Stack is ... */
 	duk_push_global_object(ctx);
@@ -96,21 +99,32 @@ static void window_call_callback(duk_context *ctx, size_t handle, bool clear_ent
 	//dukky_log_stack_frame(ctx, "On leaving callback");
 }
 
-static void window_schedule_callback(void *p) {
+
+static void
+window_schedule_callback(void *p)
+{
 	window_schedule_t *priv = (window_schedule_t *)p;
 
-	NSLOG(dukky, DEEPDEBUG, "Entered window scheduler callback: %"PRIsizet, priv->handle);
+	NSLOG(dukky, DEEPDEBUG,
+	      "Entered window scheduler callback: %"PRIsizet, priv->handle);
 
 	priv->running = true;
-	window_call_callback(priv->ctx, priv->handle, priv->repeat_timeout == 0);
+	window_call_callback(priv->ctx,
+			     priv->handle,
+			     priv->repeat_timeout == 0);
 	priv->running = false;
 
 	if (priv->repeat_timeout > 0) {
 		/* Reschedule */
-		NSLOG(dukky, DEEPDEBUG, "Rescheduling repeating callback %"PRIsizet, priv->handle);
-		guit->misc->schedule(priv->repeat_timeout, window_schedule_callback, priv);
+		NSLOG(dukky, DEEPDEBUG,
+		      "Rescheduling repeating callback %"PRIsizet,
+		      priv->handle);
+		guit->misc->schedule(priv->repeat_timeout,
+				     window_schedule_callback,
+				     priv);
 	} else {
-		NSLOG(dukky, DEEPDEBUG, "Removing completed callback %"PRIsizet, priv->handle);
+		NSLOG(dukky, DEEPDEBUG,
+		      "Removing completed callback %"PRIsizet, priv->handle);
 		/* Remove this from the ring */
 		RING_REMOVE(priv->owner->schedule_ring, priv);
 		window_remove_callback_bits(priv->ctx, priv->handle);
@@ -118,8 +132,12 @@ static void window_schedule_callback(void *p) {
 	}
 }
 
-static size_t window_alloc_new_callback(duk_context *ctx, window_private_t *window,
-					bool repeating, int timeout) {
+static size_t
+window_alloc_new_callback(duk_context *ctx,
+			  window_private_t *window,
+			  bool repeating,
+			  int timeout)
+{
 	size_t new_handle = next_handle++;
 	window_schedule_t *sched = calloc(sizeof *sched, 1);
 	if (sched == NULL) {
@@ -168,18 +186,24 @@ static size_t window_alloc_new_callback(duk_context *ctx, window_private_t *wind
 	return new_handle;
 }
 
-static void window_remove_callback_by_handle(duk_context *ctx,
-					     window_private_t *window,
-					     size_t handle) {
+static void
+window_remove_callback_by_handle(duk_context *ctx,
+				 window_private_t *window,
+				 size_t handle)
+{
 	int res;
 
 	RING_ITERATE_START(window_schedule_t, window->schedule_ring, sched) {
 		if (sched->handle == handle) {
 			if (sched->running) {
-				NSLOG(dukky, DEEPDEBUG, "Cancelling in-train callback %"PRIsizet, sched->handle);
+				NSLOG(dukky, DEEPDEBUG,
+				      "Cancelling in-train callback %"PRIsizet,
+				      sched->handle);
 				sched->repeat_timeout = 0;
 			} else {
-				NSLOG(dukky, DEEPDEBUG, "Cancelled callback %"PRIsizet, sched->handle);
+				NSLOG(dukky, DEEPDEBUG,
+				      "Cancelled callback %"PRIsizet,
+				      sched->handle);
 				res = guit->misc->schedule(-1,
 							   window_schedule_callback,
 							   sched);
@@ -193,8 +217,8 @@ static void window_remove_callback_by_handle(duk_context *ctx,
 	} RING_ITERATE_END(window->schedule_ring, sched);
 }
 
-/* This is the dodgy compartment closedown method */
-static duk_ret_t dukky_window_closedown_compartment(duk_context *ctx)
+/* This is the dodgy thread closedown method */
+static duk_ret_t dukky_window_closedown_thread(duk_context *ctx)
 {
 	window_private_t *priv = NULL;
 
@@ -207,9 +231,42 @@ static duk_ret_t dukky_window_closedown_compartment(duk_context *ctx)
 		return 0;
 	}
 
-	NSLOG(dukky, DEEPDEBUG, "Closing down compartment");
+	priv->closed_down = true;
+
+	NSLOG(dukky, DEEPDEBUG, "Closing down thread");
 	while (priv->schedule_ring != NULL) {
-		window_remove_callback_by_handle(ctx, priv, priv->schedule_ring->handle);
+		window_schedule_t *to_remove = NULL;
+		// Find a schedule item to remove
+		RING_ITERATE_START(window_schedule_t, priv->schedule_ring, sched) {
+			if (sched->running == false) {
+				// This one is not running, we can remove it
+				to_remove = sched;
+				RING_ITERATE_STOP(window->schedule_ring, sched);
+			} else if (sched->repeat_timeout != 0) {
+				// This one is running and has yet to be
+				// cancelled, so prevent it rescheduling itself
+				NSLOG(dukky, DEEPDEBUG,
+				      "Cancelling in-train callback %"PRIsizet,
+				      sched->handle);
+				sched->repeat_timeout = 0;
+			}
+		} RING_ITERATE_END(priv->schedule_ring, sched);
+
+		if (to_remove == NULL) {
+			// We didn't find any non-running callbacks
+			// so let's log that and break out of the closedown
+			// loop so we can continue and hopefully close down
+			NSLOG(dukky, DEEPDEBUG,
+			      "Leaving in-train callbacks to unwind");
+			break;
+		}
+		
+		// Remove the handle we found, this will reduce the callback
+		// scheduler ring by one and perhaps leave it empty so we can
+		// finish the closedown.
+		window_remove_callback_by_handle(ctx,
+						 priv,
+						 to_remove->handle);
 	}
 
 	return 0;
@@ -220,10 +277,14 @@ static duk_ret_t dukky_window_closedown_compartment(duk_context *ctx)
 
 init Window(struct browser_window *win, struct html_content *htmlc)
 %{
+	/* It makes no sense if win or htmlc are NULL */
+	assert(win != NULL);
+	assert(htmlc != NULL);
 	/* element window */
 	priv->win = win;
 	priv->htmlc = htmlc;
 	priv->schedule_ring = NULL;
+	priv->closed_down = false;
 	NSLOG(netsurf, DEEPDEBUG, "win=%p htmlc=%p", priv->win, priv->htmlc);
 
 	NSLOG(netsurf, DEEPDEBUG,
@@ -246,30 +307,100 @@ prototype Window()
 #define EXPOSE(v) \
 	duk_get_global_string(ctx, #v); \
 	duk_put_prop_string(ctx, 0, #v)
-	/* steal undefined */
+	/* https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects */
+	/* ** Value properties */
+	EXPOSE(Infinity);
+	EXPOSE(NaN);
 	EXPOSE(undefined);
+	EXPOSE(null);
+	EXPOSE(globalThis);
+
+	/* ** Function properties */
 	EXPOSE(eval);
-	EXPOSE(Object);
-	EXPOSE(parseInt);
+	/* EXPOSE(uneval); */ /* Not standard, maybe not available */
+	EXPOSE(isFinite);
+	EXPOSE(isNaN);
 	EXPOSE(parseFloat);
-	EXPOSE(Array);
+	EXPOSE(parseInt);
+	EXPOSE(decodeURI);
+	EXPOSE(decodeURIComponent);
+	EXPOSE(encodeURI);
+	EXPOSE(encodeURIComponent);
+	EXPOSE(escape);
+	EXPOSE(unescape);
+
+	/* ** Fundamental Objects */
+	EXPOSE(Object);
+	EXPOSE(Function);
+	EXPOSE(Boolean);
+	EXPOSE(Symbol);
+	EXPOSE(Error);
+	EXPOSE(EvalError);
+	EXPOSE(InternalError);
+	EXPOSE(RangeError);
+	EXPOSE(ReferenceError);
+	EXPOSE(SyntaxError);
+	EXPOSE(TypeError);
+	EXPOSE(URIError);
+
+	/* ** Numbers and Dates */
+	EXPOSE(Number);
+	EXPOSE(BigInt);
+	EXPOSE(Math);
 	EXPOSE(Date);
+
+	/* ** Text Processing */
+	EXPOSE(String);
 	EXPOSE(RegExp);
-	EXPOSE(Math);
-	EXPOSE(Function);
+
+	/* ** Indexed Collections */
+	EXPOSE(Array);
+	EXPOSE(Int8Array);
+	EXPOSE(Uint8Array);
+	EXPOSE(Uint8ClampedArray);
+	EXPOSE(Int16Array);
+	EXPOSE(Uint16Array);
+	EXPOSE(Int32Array);
+	EXPOSE(Uint32Array);
+	EXPOSE(Float32Array);
+	EXPOSE(Float64Array);
+	/* EXPOSE(BigInt64Array); */ /* Duktape lacks this - nonstandard API */
+	/* EXPOSE(BigUint64Array); */ /* Duktape lacks this - nonstandard API */
+
+	/* ** Keyed Collections */
+	/* EXPOSE(Map); */ /* Duktape lacks this - ES6 */
+	/* EXPOSE(Set); */ /* Duktape lacks this - ES6 */
+	/* EXPOSE(WeakMap); */ /* Duktape lacks this - ES6 */
+	/* EXPOSE(WeakSet); */ /* Duktape lacks this - ES6 */
+
+	/* Structured Data */
+	EXPOSE(ArrayBuffer);
+	/* EXPOSE(SharedArrayBuffer); */ /* Duktape lacks this - experimental API */
+	/* EXPOSE(Atomics); */ /* Duktape lacks this - experimental API */
+	EXPOSE(DataView);
+	EXPOSE(JSON);
+
+	/* ** Control abstraction properties */
+	/* EXPOSE(Promise); */ /* Probably ought to be one of ours? Also ES6 */
+	/* EXPOSE(Generator); */ /* Duktape and async? ES6 */
+	/* EXPOSE(GeneratorFunction); */ /* Duktape and async? ES6 */
+	/* EXPOSE(AsyncFunction); */ /* Duktape lacks this - experimental API */
+
+	/* Reflection */
+	EXPOSE(Reflect);
 	EXPOSE(Proxy);
-	EXPOSE(String);
-	EXPOSE(Number);
-	EXPOSE(Error);
-	EXPOSE(encodeURI);
-	EXPOSE(encodeURIComponent);
-	EXPOSE(NaN);
-	EXPOSE(isNaN);
+
+	/* ** Internationalisation */
+	/* Duktape lacks Intl - Maybe polyfill it? */
+	/* There is suggestion that cdn.polyfill.io exists for it */
+
+	/* ** WebAssembly */
+	/* As yet, Duktape lacks WA */
 #undef EXPOSE
-	/* Add s3kr1t method to close the compartment */
+	/* Add s3kr1t method to close the JS thread (browsing context) */
 	duk_dup(ctx, 0);
-	duk_push_string(ctx, MAGIC(closedownCompartment));
-	duk_push_c_function(ctx, dukky_window_closedown_compartment, DUK_VARARGS);
+	duk_push_string(ctx, MAGIC(closedownThread));
+	duk_push_c_function(ctx, dukky_window_closedown_thread, DUK_VARARGS);
 	duk_def_prop(ctx, -3,
 		     DUK_DEFPROP_HAVE_VALUE |
 		     DUK_DEFPROP_HAVE_WRITABLE |
@@ -385,13 +516,16 @@ method Window::alert()
 method Window::setTimeout()
 %{
 	duk_idx_t argc = duk_get_top(ctx);
-	if (argc < 2) {
-		/* not enough arguments */
-		return duk_error(ctx, DUK_RET_TYPE_ERROR, dukky_error_fmt_argument, 2, argc);
+	duk_int_t timeout = 10;
+
+	if (priv->closed_down == true) {
+		return 0; /* coerced to undefined */
 	}
 
-	/* func, timeout, args... */
-	duk_int_t timeout = duk_get_int(ctx, 1);
+	if (argc >= 2) {
+		timeout = duk_get_int(ctx, 1);
+	}
+	/* func, [timeout, args...] */
 	if (timeout < 10) { timeout = 10; }
 	size_t handle = window_alloc_new_callback(ctx, priv, false, (int)timeout);
 
@@ -402,13 +536,16 @@ method Window::setTimeout()
 method Window::setInterval()
 %{
 	duk_idx_t argc = duk_get_top(ctx);
-	if (argc < 2) {
-		/* not enough arguments */
-		return duk_error(ctx, DUK_RET_TYPE_ERROR, dukky_error_fmt_argument, 2, argc);
+	duk_int_t timeout = 10;
+
+	if (priv->closed_down == true) {
+		return 0; /* coerced to undefined */
 	}
 
-	/* func, timeout, args... */
-	duk_int_t timeout = duk_get_int(ctx, 1);
+	if (argc >= 2) {
+		timeout = duk_get_int(ctx, 1);
+	}
+	/* func, [timeout, args...] */
 	if (timeout < 10) { timeout = 10; }
 	size_t handle = window_alloc_new_callback(ctx, priv, true, (int)timeout);
 
diff --git a/content/handlers/javascript/duktape/duk_config.h b/content/handlers/javascript/duktape/duk_config.h
index 40df0fe8e..cba3e0f00 100644
--- a/content/handlers/javascript/duktape/duk_config.h
+++ b/content/handlers/javascript/duktape/duk_config.h
@@ -18,6 +18,7 @@
  *      - QNX
  *      - TI-Nspire
  *      - Emscripten
+ *      - Android
  *      - Linux
  *      - Solaris
  *      - AIX
@@ -39,6 +40,8 @@
  *      - PowerPC 64-bit
  *      - SPARC 32-bit
  *      - SPARC 64-bit
+ *      - RISC-V 32-bit
+ *      - RISC-V 64-bit
  *      - SuperH
  *      - Motorola 68k
  *      - Emscripten
@@ -170,6 +173,10 @@
 #define DUK_F_BCC
 #endif
 
+#if defined(ANDROID) || defined(__ANDROID__)
+#define DUK_F_ANDROID
+#endif
+
 /* Linux */
 #if defined(__linux) || defined(__linux__) || defined(linux)
 #define DUK_F_LINUX
@@ -246,9 +253,9 @@
 #endif
 
 /* ARM */
-#if defined(__arm__) || defined(__thumb__) || defined(_ARM) || defined(_M_ARM) || defined(__aarch64__)
+#if defined(__arm__) || defined(__thumb__) || defined(_ARM) || defined(_M_ARM) || defined(_M_ARM64) || defined(__aarch64__)
 #define DUK_F_ARM
-#if defined(__LP64__) || defined(_LP64) || defined(__arm64) || defined(__arm64__) || defined(__aarch64__)
+#if defined(__LP64__) || defined(_LP64) || defined(__arm64) || defined(__arm64__) || defined(_M_ARM64) || defined(__aarch64__)
 #define DUK_F_ARM64
 #else
 #define DUK_F_ARM32
@@ -280,6 +287,22 @@
 #endif
 #endif
 
+/* RISC-V, https://github.com/riscv/riscv-toolchain-conventions#cc-preprocessor-definitions */
+#if defined(__riscv)
+#define DUK_F_RISCV
+#if defined(__riscv_xlen)
+#if (__riscv_xlen == 32)
+#define DUK_F_RISCV32
+#elif (__riscv_xlen == 64)
+#define DUK_F_RISCV64
+#else
+#error __riscv_xlen has unsupported value (not 32 or 64)
+#endif
+#else
+#error __riscv defined without __riscv_xlen
+#endif
+#endif  /* __riscv */
+
 /* SuperH */
 #if defined(__sh__) || \
     defined(__sh1__) || defined(__SH1__) || \
@@ -356,10 +379,6 @@
 #define DUK_F_VBCC
 #endif
 
-#if defined(ANDROID) || defined(__ANDROID__)
-#define DUK_F_ANDROID
-#endif
-
 /* Atari Mint */
 #if defined(__MINT__)
 #define DUK_F_MINT
@@ -665,6 +684,41 @@
 #define DUK_USE_DATE_FMT_STRFTIME
 
 #define DUK_USE_OS_STRING "emscripten"
+#elif defined(DUK_F_ANDROID)
+/* --- Android --- */
+#if defined(DUK_COMPILING_DUKTAPE)
+#if !defined(_POSIX_C_SOURCE)
+#define _POSIX_C_SOURCE  200809L
+#endif
+#if !defined(_GNU_SOURCE)
+#define _GNU_SOURCE      /* e.g. getdate_r */
+#endif
+#if !defined(_XOPEN_SOURCE)
+#define _XOPEN_SOURCE    /* e.g. strptime */
+#endif
+#endif  /* DUK_COMPILING_DUKTAPE */
+
+#include <sys/types.h>
+#if defined(DUK_F_BCC)
+/* no endian.h or stdint.h */
+#else
+#include <endian.h>
+#include <stdint.h>
+#endif  /* DUK_F_BCC */
+#include <sys/param.h>
+#include <sys/time.h>
+#include <time.h>
+
+#define DUK_USE_DATE_NOW_GETTIMEOFDAY
+#define DUK_USE_DATE_TZO_GMTIME_R
+#define DUK_USE_DATE_PRS_STRPTIME
+#define DUK_USE_DATE_FMT_STRFTIME
+
+#if 0  /* XXX: safe condition? */
+#define DUK_USE_GET_MONOTONIC_TIME_CLOCK_GETTIME
+#endif
+
+#define DUK_USE_OS_STRING "android"
 #elif defined(DUK_F_LINUX)
 /* --- Linux --- */
 #if defined(DUK_COMPILING_DUKTAPE)
@@ -715,7 +769,7 @@
 #define DUK_USE_BYTEORDER 3
 #endif
 #else  /* DUK_F_OLD_SOLARIS */
-#include <ast/endian.h>
+#include <sys/param.h>
 #endif  /* DUK_F_OLD_SOLARIS */
 
 #include <sys/param.h>
@@ -910,9 +964,7 @@
 #elif defined(DUK_F_PPC64)
 /* --- PowerPC 64-bit --- */
 #define DUK_USE_ARCH_STRING "ppc64"
-#if !defined(DUK_USE_BYTEORDER)
-#define DUK_USE_BYTEORDER 3
-#endif
+/* No forced byteorder (both little and big endian are possible). */
 #undef DUK_USE_PACKED_TVAL
 #define DUK_F_PACKED_TVAL_PROVIDED
 #elif defined(DUK_F_SPARC32)
@@ -927,6 +979,18 @@
 /* SPARC byte order varies so rely on autodetection. */
 #undef DUK_USE_PACKED_TVAL
 #define DUK_F_PACKED_TVAL_PROVIDED
+#elif defined(DUK_F_RISCV32)
+/* --- RISC-V 32-bit --- */
+#define DUK_USE_ARCH_STRING "riscv32"
+#define DUK_USE_BYTEORDER 1
+#define DUK_USE_PACKED_TVAL
+#define DUK_F_PACKED_TVAL_PROVIDED
+#elif defined(DUK_F_RISCV64)
+/* --- RISC-V 64-bit --- */
+#define DUK_USE_ARCH_STRING "riscv64"
+#define DUK_USE_BYTEORDER 1
+#undef DUK_USE_PACKED_TVAL
+#define DUK_F_PACKED_TVAL_PROVIDED
 #elif defined(DUK_F_SUPERH)
 /* --- SuperH --- */
 #define DUK_USE_ARCH_STRING "sh"
@@ -1067,8 +1131,20 @@
 #define DUK_USE_FLEX_ZEROSIZE
 #endif
 
-#undef DUK_USE_GCC_PRAGMAS
+#define DUK_USE_CLANG_PRAGMAS
 #define DUK_USE_PACK_CLANG_ATTR
+
+#if defined(__clang__) && defined(__has_builtin)
+#if __has_builtin(__builtin_bswap64)
+#define DUK_BSWAP64(x) ((duk_uint64_t) __builtin_bswap64((duk_uint64_t) (x)))
+#endif
+#if __has_builtin(__builtin_bswap32)
+#define DUK_BSWAP32(x) ((duk_uint32_t) __builtin_bswap32((duk_uint32_t) (x)))
+#endif
+#if __has_builtin(__builtin_bswap16)
+#define DUK_BSWAP16(x) ((duk_uint16_t) __builtin_bswap16((duk_uint16_t) (x)))
+#endif
+#endif
 #elif defined(DUK_F_GCC)
 /* --- GCC --- */
 #if defined(DUK_F_C99) || defined(DUK_F_CPP11)
@@ -1079,13 +1155,17 @@
 #define DUK_VA_COPY(dest,src) __va_copy(dest,src)
 #endif
 
-#if defined(DUK_F_GCC_VERSION) && (DUK_F_GCC_VERSION >= 20500L)
-/* since gcc-2.5 */
+#if defined(DUK_F_GCC_VERSION) && (DUK_F_GCC_VERSION >= 20500L) && (DUK_F_GCC_VERSION < 50000L)
+/* Since gcc-2.5.
+ *
+ * Disabled temporarily in GCC 5+ because of an unresolved noreturn-related
+ * issue: https://github.com/svaarala/duktape/issues/2155.
+ */
 #define DUK_NORETURN(decl)  decl __attribute__((noreturn))
 #endif
 
 #if defined(DUK_F_GCC_VERSION) && (DUK_F_GCC_VERSION >= 40500L)
-/* since gcc-4.5 */
+/* Since gcc-4.5. */
 #define DUK_UNREACHABLE()  do { __builtin_unreachable(); } while (0)
 #endif
 
@@ -1191,6 +1271,7 @@
 #define DUK_USE_FLEX_ZEROSIZE
 #endif
 
+/* Since 4.6 one can '#pragma GCC diagnostic push/pop'. */
 #if defined(DUK_F_GCC_VERSION) && (DUK_F_GCC_VERSION >= 40600)
 #define DUK_USE_GCC_PRAGMAS
 #else
@@ -1198,6 +1279,16 @@
 #endif
 
 #define DUK_USE_PACK_GCC_ATTR
+
+/* Availability varies based on platform (between GCC 4.4 and 4.8), and there
+ * are apparently some bugs in GCC 4.x.  Check for GCC 5.0 before enabling
+ * these to be safe.
+ */
+#if defined(DUK_F_GCC_VERSION) && (DUK_F_GCC_VERSION >= 50000L)
+#define DUK_BSWAP64(x) ((duk_uint64_t) __builtin_bswap64((duk_uint64_t) (x)))
+#define DUK_BSWAP32(x) ((duk_uint32_t) __builtin_bswap32((duk_uint32_t) (x)))
+#define DUK_BSWAP16(x) ((duk_uint16_t) __builtin_bswap16((duk_uint16_t) (x)))
+#endif
 #elif defined(DUK_F_MSVC)
 /* --- MSVC --- */
 /* http://msdn.microsoft.com/en-us/library/aa235362(VS.60).aspx */
@@ -2504,7 +2595,7 @@ typedef struct duk_hthread duk_context;
 #define DUK_USE_ALIGN_BY 8
 #endif
 
-/* Compiler specific hackery needed to force struct size to match aligment,
+/* Compiler specific hackery needed to force struct size to match alignment,
  * see e.g. duk_hbuffer.h.
  *
  * http://stackoverflow.com/questions/11130109/c-struct-size-alignment
@@ -2515,6 +2606,13 @@ typedef struct duk_hthread duk_context;
 #define DUK_USE_PACK_DUMMY_MEMBER
 #endif
 
+#if !defined(DUK_U64_CONSTANT)
+#define DUK_U64_CONSTANT(x) x##ULL
+#endif
+#if !defined(DUK_I64_CONSTANT)
+#define DUK_I64_CONSTANT(x) x##LL
+#endif
+
 #if !defined(DUK_VA_COPY)
 /* We need va_copy() which is defined in C99 / C++11, so an awkward
  * replacement is needed for pre-C99 / pre-C++11 environments.  This
@@ -2579,12 +2677,15 @@ typedef struct duk_hthread duk_context;
 #define DUK_WO_NORETURN(stmt) do { stmt } while (0)
 #endif
 
-#if !defined(DUK_UNREACHABLE)
+#if defined(DUK_UNREACHABLE)
+#define DUK_WO_UNREACHABLE(stmt) do { } while (0)
+#else
 /* Don't know how to declare unreachable point, so don't do it; this
  * may cause some spurious compilation warnings (e.g. "variable used
  * uninitialized").
  */
 #define DUK_UNREACHABLE()  do { } while (0)
+#define DUK_WO_UNREACHABLE(stmt) do { stmt } while (0)
 #endif
 
 #if !defined(DUK_LOSE_CONST)
@@ -2665,17 +2766,30 @@ typedef struct duk_hthread duk_context;
 #endif
 #endif
 
+#if defined(DUK_F_HAVE_64BIT)
+#if !defined(DUK_BSWAP64)
+#define DUK_BSWAP64(x) \
+	((((duk_uint64_t) (x)) >> 56U) | \
+	 ((((duk_uint64_t) (x)) >> 40U) & DUK_U64_CONSTANT(0xff00)) | \
+	 ((((duk_uint64_t) (x)) >> 24U) & DUK_U64_CONSTANT(0xff0000)) | \
+	 ((((duk_uint64_t) (x)) >> 8U) & DUK_U64_CONSTANT(0xff000000)) | \
+	 ((((duk_uint64_t) (x)) << 8U) & DUK_U64_CONSTANT(0xff00000000)) | \
+	 ((((duk_uint64_t) (x)) << 24U) & DUK_U64_CONSTANT(0xff0000000000)) | \
+	 ((((duk_uint64_t) (x)) << 40U) & DUK_U64_CONSTANT(0xff000000000000)) | \
+	 (((duk_uint64_t) (x)) << 56U))
+#endif
+#endif
 #if !defined(DUK_BSWAP32)
 #define DUK_BSWAP32(x) \
-	((((duk_uint32_t) (x)) >> 24) | \
-	 ((((duk_uint32_t) (x)) >> 8) & 0xff00UL) | \
-	 ((((duk_uint32_t) (x)) << 8) & 0xff0000UL) | \
-	 (((duk_uint32_t) (x)) << 24))
+	((((duk_uint32_t) (x)) >> 24U) | \
+	 ((((duk_uint32_t) (x)) >> 8U) & 0xff00UL) | \
+	 ((((duk_uint32_t) (x)) << 8U) & 0xff0000UL) | \
+	 (((duk_uint32_t) (x)) << 24U))
 #endif
 #if !defined(DUK_BSWAP16)
 #define DUK_BSWAP16(x) \
-	((duk_uint16_t) (x) >> 8) | \
-	((duk_uint16_t) (x) << 8)
+	((duk_uint16_t) (x) >> 8U) | \
+	((duk_uint16_t) (x) << 8U)
 #endif
 
 /* DUK_USE_VARIADIC_MACROS: required from compilers, so no fill-in. */
@@ -2698,13 +2812,6 @@ typedef struct duk_hthread duk_context;
 #undef DUK_USE_GCC_PRAGMAS
 #endif
 
-#if !defined(DUK_U64_CONSTANT)
-#define DUK_U64_CONSTANT(x) x##ULL
-#endif
-#if !defined(DUK_I64_CONSTANT)
-#define DUK_I64_CONSTANT(x) x##LL
-#endif
-
 /* Workaround for GH-323: avoid inlining control when compiling from
  * multiple sources, as it causes compiler portability trouble.
  */
@@ -2807,7 +2914,10 @@ typedef struct duk_hthread duk_context;
 #define DUK_USE_CACHE_ACTIVATION
 #define DUK_USE_CACHE_CATCHER
 #define DUK_USE_CALLSTACK_LIMIT 10000
-#define DUK_USE_COMMONJS_MODULES
+#define DUK_USE_CBOR_BUILTIN
+#define DUK_USE_CBOR_DEC_RECLIMIT 1000
+#define DUK_USE_CBOR_ENC_RECLIMIT 1000
+#define DUK_USE_CBOR_SUPPORT
 #define DUK_USE_COMPILER_RECLIMIT 2500
 #define DUK_USE_COROUTINE_SUPPORT
 #undef DUK_USE_CPP_EXCEPTIONS
@@ -2871,7 +2981,7 @@ typedef struct duk_hthread duk_context;
 #undef DUK_USE_GC_TORTURE
 #undef DUK_USE_GET_MONOTONIC_TIME
 #undef DUK_USE_GET_RANDOM_DOUBLE
-#undef DUK_USE_GLOBAL_BINDING
+#define DUK_USE_GLOBAL_BINDING
 #define DUK_USE_GLOBAL_BUILTIN
 #undef DUK_USE_HEAPPTR16
 #undef DUK_USE_HEAPPTR_DEC16
@@ -2879,6 +2989,7 @@ typedef struct duk_hthread duk_context;
 #define DUK_USE_HEX_FASTPATH
 #define DUK_USE_HEX_SUPPORT
 #define DUK_USE_HOBJECT_ARRAY_ABANDON_LIMIT 2
+#define DUK_USE_HOBJECT_ARRAY_ABANDON_MINSIZE 257
 #define DUK_USE_HOBJECT_ARRAY_FAST_RESIZE_LIMIT 9
 #define DUK_USE_HOBJECT_ARRAY_MINGROW_ADD 16
 #define DUK_USE_HOBJECT_ARRAY_MINGROW_DIVISOR 8
@@ -2912,6 +3023,7 @@ typedef struct duk_hthread duk_context;
 #define DUK_USE_MARK_AND_SWEEP_RECLIMIT 256
 #define DUK_USE_MATH_BUILTIN
 #define DUK_USE_NATIVE_CALL_RECLIMIT 1000
+#undef DUK_USE_NATIVE_STACK_CHECK
 #define DUK_USE_NONSTD_ARRAY_SPLICE_DELCOUNT
 #undef DUK_USE_NONSTD_FUNC_CALLER_PROPERTY
 #undef DUK_USE_NONSTD_FUNC_SOURCE_PROPERTY
@@ -2962,12 +3074,11 @@ typedef struct duk_hthread duk_context;
 #define DUK_USE_STRTAB_RESIZE_CHECK_MASK 255
 #define DUK_USE_STRTAB_SHRINK_LIMIT 6
 #undef DUK_USE_STRTAB_TORTURE
-#undef DUK_USE_SYMBOL_BUILTIN
+#define DUK_USE_SYMBOL_BUILTIN
 #define DUK_USE_TAILCALL
 #define DUK_USE_TARGET_INFO "unknown"
 #define DUK_USE_TRACEBACKS
 #define DUK_USE_TRACEBACK_DEPTH 10
-#define DUK_USE_USER_DECLARE() /* no user declarations */
 #define DUK_USE_VALSTACK_GROW_SHIFT 2
 #define DUK_USE_VALSTACK_LIMIT 1000000L
 #define DUK_USE_VALSTACK_SHRINK_CHECK_SHIFT 2
diff --git a/content/handlers/javascript/duktape/dukky.c b/content/handlers/javascript/duktape/dukky.c
index a828667ef..a780b0067 100644
--- a/content/handlers/javascript/duktape/dukky.c
+++ b/content/handlers/javascript/duktape/dukky.c
@@ -19,7 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
+/**
+ * \file
  * Duktapeish implementation of javascript engine functions.
  */
 
@@ -38,6 +39,7 @@
 
 #include "duktape/binding.h"
 #include "duktape/generics.js.inc"
+#include "duktape/polyfill.js.inc"
 
 #include "duktape.h"
 #include "dukky.h"
@@ -49,6 +51,29 @@
 #define HANDLER_MAGIC MAGIC(HANDLER_MAP)
 #define EVENT_LISTENER_JS_MAGIC MAGIC(EVENT_LISTENER_JS_MAP)
 #define GENERICS_MAGIC MAGIC(GENERICS_TABLE)
+#define THREAD_MAP MAGIC(THREAD_MAP)
+
+/**
+ * dukky javascript heap
+ */
+struct jsheap {
+	duk_context *ctx; /**< duktape base context */
+	duk_uarridx_t next_thread; /**< monotonic thread counter */
+	bool pending_destroy; /**< Whether this heap is pending destruction */
+	unsigned int live_threads; /**< number of live threads */
+	uint64_t exec_start_time;
+};
+
+/**
+ * dukky javascript thread
+ */
+struct jsthread {
+	bool pending_destroy; /**< Whether this thread is pending destruction */
+	unsigned int in_use; /**< The number of times this thread is in use */
+	jsheap *heap; /**< The heap this thread belongs to */
+	duk_context *ctx; /**< The duktape thread context */
+	duk_uarridx_t thread_idx; /**< The thread number */
+};
 
 static duk_ret_t dukky_populate_object(duk_context *ctx, void *udata)
 {
@@ -58,17 +83,20 @@ static duk_ret_t dukky_populate_object(duk_context *ctx, void *udata)
 	/* ... obj args protoname */
 	duk_get_global_string(ctx, PROTO_MAGIC);
 	/* .. obj args protoname prototab */
-	duk_insert(ctx, -2);
-	/* ... obj args prototab protoname */
+	duk_dup(ctx, -2);
+	/* ... obj args protoname prototab protoname */
 	duk_get_prop(ctx, -2);
-	/* ... obj args prototab {proto/undefined} */
+	/* ... obj args protoname prototab {proto/undefined} */
 	if (duk_is_undefined(ctx, -1)) {
 		NSLOG(dukky, WARNING,
-		      "RuhRoh, couldn't find a prototype, HTMLUnknownElement it is");
+		      "Unable to find dukky prototype for `%s` - falling back to HTMLUnknownElement",
+		      duk_get_string(ctx, -3) + 2 /* Skip the two unprintables */);
 		duk_pop(ctx);
 		duk_push_string(ctx, PROTO_NAME(HTMLUNKNOWNELEMENT));
 		duk_get_prop(ctx, -2);
 	}
+	/* ... obj args protoname prototab proto */
+	duk_remove(ctx, -3);
 	/* ... obj args prototab proto */
 	duk_dup(ctx, -1);
 	/* ... obj args prototab proto proto */
@@ -165,7 +193,7 @@ dukky_push_node_stacked(duk_context *ctx)
 	/* ... node nodeptr klass nodes */
 	duk_pop_3(ctx);
 	/* ... node */
-	{
+	if (NSLOG_COMPILED_MIN_LEVEL <= NSLOG_LEVEL_DEEPDEBUG) {
 		duk_dup(ctx, -1);
 		const char * what = duk_safe_to_string(ctx, -1);
 		NSLOG(dukky, DEEPDEBUG, "Created: %s", what);
@@ -213,7 +241,7 @@ static void dukky_html_element_class_from_tag_type(dom_html_element_type type,
 		SET_HTML_CLASS(LINK)
 		break;
 	case DOM_HTML_ELEMENT_TYPE_BUTTON:
-		SET_HTML_CLASS(BUTTOM)
+		SET_HTML_CLASS(BUTTON)
 		break;
 	case DOM_HTML_ELEMENT_TYPE_INPUT:
 		SET_HTML_CLASS(INPUT)
@@ -352,9 +380,12 @@ static void dukky_html_element_class_from_tag_type(dom_html_element_type type,
 	case DOM_HTML_ELEMENT_TYPE_ISINDEX:
 		SET_HTML_CLASS(ISINDEX)
 		break;
+	case DOM_HTML_ELEMENT_TYPE_CANVAS:
+		SET_HTML_CLASS(CANVAS)
+		break;
 	case DOM_HTML_ELEMENT_TYPE__COUNT:
 		assert(type != DOM_HTML_ELEMENT_TYPE__COUNT);
-		/* fallthrough */
+		fallthrough;
 	case DOM_HTML_ELEMENT_TYPE__UNKNOWN:
 		SET_HTML_CLASS(UNKNOWN)
 		break;
@@ -465,7 +496,7 @@ dukky_push_node(duk_context *ctx, struct dom_node *node)
 		/* ... node nodes */
 		duk_pop(ctx);
 		/* ... node */
-		{
+		if (NSLOG_COMPILED_MIN_LEVEL <= NSLOG_LEVEL_DEEPDEBUG) {
 			duk_dup(ctx, -1);
 			const char * what = duk_safe_to_string(ctx, -1);
 			NSLOG(dukky, DEEPDEBUG, "Found it memoised: %s", what);
@@ -535,22 +566,14 @@ static void *dukky_realloc_function(void *udata, void *ptr, duk_size_t size)
 	return realloc(ptr, size);
 }
 
+
 static void dukky_free_function(void *udata, void *ptr)
 {
 	if (ptr != NULL)
 		free(ptr);
 }
 
-
-/**************************************** js.h ******************************/
-struct jscontext {
-	duk_context *ctx;
-	duk_context *thread;
-	uint64_t exec_start_time;
-};
-
-#define CTX (ctx->thread)
-
+/* exported interface documented in js.h */
 void js_initialise(void)
 {
 	/** TODO: Forces JS on for our testing, needs changing before a release
@@ -562,21 +585,22 @@ void js_initialise(void)
 	javascript_init();
 }
 
+
+/* exported interface documented in js.h */
 void js_finalise(void)
 {
 	/* NADA for now */
 }
 
-#define DUKKY_NEW_PROTOTYPE(klass, uklass, klass_name)			\
-	dukky_create_prototype(ctx, dukky_##klass##___proto, PROTO_NAME(uklass), klass_name)
 
-nserror js_newcontext(int timeout, jscallback *cb, void *cbctx,
-		jscontext **jsctx)
+/* exported interface documented in js.h */
+nserror
+js_newheap(int timeout, jsheap **heap)
 {
 	duk_context *ctx;
-	jscontext *ret = calloc(1, sizeof(*ret));
-	*jsctx = NULL;
-	NSLOG(dukky, DEBUG, "Creating new duktape javascript context");
+	jsheap *ret = calloc(1, sizeof(*ret));
+	*heap = NULL;
+	NSLOG(dukky, DEBUG, "Creating new duktape javascript heap");
 	if (ret == NULL) return NSERROR_NOMEM;
 	ctx = ret->ctx = duk_create_heap(
 		dukky_alloc_function,
@@ -592,37 +616,62 @@ nserror js_newcontext(int timeout, jscallback *cb, void *cbctx,
 	duk_put_global_string(ctx, PROTO_MAGIC);
 	/* Create prototypes here */
 	dukky_create_prototypes(ctx);
+	/* Now create the thread map */
+	duk_push_object(ctx);
+	duk_put_global_string(ctx, THREAD_MAP);
 
-	*jsctx = ret;
+	*heap = ret;
 	return NSERROR_OK;
 }
 
-void js_destroycontext(jscontext *ctx)
+
+static void dukky_destroyheap(jsheap *heap)
 {
+	assert(heap->pending_destroy == true);
+	assert(heap->live_threads == 0);
 	NSLOG(dukky, DEBUG, "Destroying duktape javascript context");
-	duk_destroy_heap(ctx->ctx);
-	free(ctx);
+	duk_destroy_heap(heap->ctx);
+	free(heap);
 }
 
-jsobject *js_newcompartment(jscontext *ctx, void *win_priv, void *doc_priv)
+/* exported interface documented in js.h */
+void js_destroyheap(jsheap *heap)
 {
-	assert(ctx != NULL);
-	NSLOG(dukky, DEBUG,
-	      "New javascript/duktape compartment, win_priv=%p, doc_priv=%p", win_priv,
-	      doc_priv);
-	/* Pop any active thread off */
-	if (CTX != NULL) {
-		/* Closing down the extant compartment */
-		NSLOG(dukky, DEEPDEBUG, "Closing down extant compartment...");
-		duk_get_global_string(CTX, MAGIC(closedownCompartment));
-		dukky_pcall(CTX, 0, true);
-		NSLOG(dukky, DEEPDEBUG, "Popping the thread off the stack");
-		duk_set_top(ctx->ctx, 0);
-		duk_gc(ctx->ctx, 0);
-		duk_gc(ctx->ctx, DUK_GC_COMPACT);
+	heap->pending_destroy = true;
+	if (heap->live_threads == 0) {
+		dukky_destroyheap(heap);
 	}
-	duk_push_thread(ctx->ctx);
-	ctx->thread = duk_require_context(ctx->ctx, -1);
+}
+
+/* Just for here, the CTX is in ret, not thread */
+#define CTX (ret->ctx)
+
+/* exported interface documented in js.h */
+nserror js_newthread(jsheap *heap, void *win_priv, void *doc_priv, jsthread **thread)
+{
+	jsthread *ret;
+	assert(heap != NULL);
+	assert(heap->pending_destroy == false);
+
+	ret = calloc(1, sizeof (*ret));
+	if (ret == NULL) {
+		NSLOG(dukky, ERROR, "Unable to allocate new JS thread structure");
+		return NSERROR_NOMEM;
+	}
+
+	NSLOG(dukky, DEBUG,
+	      "New javascript/duktape thread, win_priv=%p, doc_priv=%p",
+	      win_priv, doc_priv);
+
+	/* create new thread */
+	duk_get_global_string(heap->ctx, THREAD_MAP); /* ... threads */
+	duk_push_thread(heap->ctx); /* ... threads thread */
+	ret->heap = heap;
+	ret->ctx = duk_require_context(heap->ctx, -1);
+	ret->thread_idx = heap->next_thread++;
+	duk_put_prop_index(heap->ctx, -2, ret->thread_idx);
+	heap->live_threads++;
+	duk_pop(heap->ctx); /* ... */
 	duk_push_int(CTX, 0);
 	duk_push_int(CTX, 1);
 	duk_push_int(CTX, 2);
@@ -646,6 +695,27 @@ jsobject *js_newcompartment(jscontext *ctx, void *win_priv, void *doc_priv)
 	duk_push_object(CTX);
 	duk_put_global_string(CTX, EVENT_MAGIC);
 
+	/* Now load the polyfills */
+	/* ... */
+	duk_push_string(CTX, "polyfill.js");
+	/* ..., polyfill.js */
+	if (duk_pcompile_lstring_filename(CTX, DUK_COMPILE_EVAL,
+					  (const char *)polyfill_js, polyfill_js_len) != 0) {
+		NSLOG(dukky, CRITICAL, "%s", duk_safe_to_string(CTX, -1));
+		NSLOG(dukky, CRITICAL, "Unable to compile polyfill.js, thread aborted");
+		js_destroythread(ret);
+		return NSERROR_INIT_FAILED;
+	}
+	/* ..., (generics.js) */
+	if (dukky_pcall(CTX, 0, true) != 0) {
+		NSLOG(dukky, CRITICAL, "Unable to run polyfill.js, thread aborted");
+		js_destroythread(ret);
+		return NSERROR_INIT_FAILED;
+	}
+	/* ..., result */
+	duk_pop(CTX);
+	/* ... */
+
 	/* Now load the NetSurf table in */
 	/* ... */
 	duk_push_string(CTX, "generics.js");
@@ -653,13 +723,15 @@ jsobject *js_newcompartment(jscontext *ctx, void *win_priv, void *doc_priv)
 	if (duk_pcompile_lstring_filename(CTX, DUK_COMPILE_EVAL,
 					  (const char *)generics_js, generics_js_len) != 0) {
 		NSLOG(dukky, CRITICAL, "%s", duk_safe_to_string(CTX, -1));
-		NSLOG(dukky, CRITICAL, "Unable to compile generics.js, compartment aborted");
-		return NULL;
+		NSLOG(dukky, CRITICAL, "Unable to compile generics.js, thread aborted");
+		js_destroythread(ret);
+		return NSERROR_INIT_FAILED;
 	}
 	/* ..., (generics.js) */
 	if (dukky_pcall(CTX, 0, true) != 0) {
-		NSLOG(dukky, CRITICAL, "Unable to run generics.js, compartment aborted");
-		return NULL;
+		NSLOG(dukky, CRITICAL, "Unable to run generics.js, thread aborted");
+		js_destroythread(ret);
+		return NSERROR_INIT_FAILED;
 	}
 	/* ..., result */
 	duk_pop(CTX);
@@ -674,15 +746,101 @@ jsobject *js_newcompartment(jscontext *ctx, void *win_priv, void *doc_priv)
 	duk_pop(CTX);
 	/* ... */
 
-	dukky_log_stack_frame(CTX, "New compartment created");
+	dukky_log_stack_frame(CTX, "New thread created");
+	NSLOG(dukky, DEBUG, "New thread is %p in heap %p", thread, heap);
+	*thread = ret;
 
-	return (jsobject *)ctx;
+	return NSERROR_OK;
+}
+
+/* Now switch to the long term CTX behaviour */
+#undef CTX
+#define CTX (thread->ctx)
+
+/* exported interface documented in js.h */
+nserror js_closethread(jsthread *thread)
+{
+	/* We can always close down a thread, it might just confuse
+	 * the code running, though we don't mind since we're in the
+	 * process of destruction at this point
+	 */
+	duk_int_t top = duk_get_top(CTX);
+
+	/* Closing down the extant thread */
+	NSLOG(dukky, DEBUG, "Closing down extant thread %p in heap %p", thread, thread->heap);
+	duk_get_global_string(CTX, MAGIC(closedownThread));
+	dukky_pcall(CTX, 0, true);
+
+	/* Restore whatever stack we had */
+	duk_set_top(CTX, top);
+
+	return NSERROR_OK;
+}
+
+/**
+ * Destroy a Duktape thread
+ */
+static void dukky_destroythread(jsthread *thread)
+{
+	jsheap *heap = thread->heap;
+
+	assert(thread->in_use == 0);
+	assert(thread->pending_destroy == true);
+
+	/* Closing down the extant thread */
+	NSLOG(dukky, DEBUG, "Closing down extant thread %p in heap %p", thread, heap);
+	duk_get_global_string(CTX, MAGIC(closedownThread));
+	dukky_pcall(CTX, 0, true);
+
+	/* Now delete the thread from the heap */
+	duk_get_global_string(heap->ctx, THREAD_MAP); /* ... threads */
+	duk_del_prop_index(heap->ctx, -1, thread->thread_idx);
+	duk_pop(heap->ctx); /* ... */
+
+	/* We can now free the thread object */
+	free(thread);
+
+	/* Finally give the heap a chance to clean up */
+	duk_gc(heap->ctx, 0);
+	duk_gc(heap->ctx, DUK_GC_COMPACT);
+	heap->live_threads--;
+
+	/* And if the heap should now go, blow it away */
+	if (heap->pending_destroy == true && heap->live_threads == 0) {
+		dukky_destroyheap(heap);
+	}
+}
+
+/* exported interface documented in js.h */
+void js_destroythread(jsthread *thread)
+{
+	thread->pending_destroy = true;
+	if (thread->in_use == 0) {
+		dukky_destroythread(thread);
+	}
+}
+
+static void dukky_enter_thread(jsthread *thread)
+{
+	assert(thread != NULL);
+	thread->in_use++;
+}
+
+static void dukky_leave_thread(jsthread *thread)
+{
+	assert(thread != NULL);
+	assert(thread->in_use > 0);
+
+	thread->in_use--;
+	if (thread->in_use == 0 && thread->pending_destroy == true) {
+		dukky_destroythread(thread);
+	}
 }
 
 duk_bool_t dukky_check_timeout(void *udata)
 {
 #define JS_EXEC_TIMEOUT_MS 10000 /* 10 seconds */
-	jscontext *ctx = (jscontext *) udata;
+	jsheap *heap = (jsheap *) udata;
 	uint64_t now;
 
 	(void) nsu_getmonotonic_ms(&now);
@@ -691,60 +849,34 @@ duk_bool_t dukky_check_timeout(void *udata)
 	 * so only test for execution timeout if we've recorded a
 	 * start time.
 	 */
-	return ctx->exec_start_time != 0 &&
-			now > (ctx->exec_start_time + JS_EXEC_TIMEOUT_MS);
+	return heap->exec_start_time != 0 &&
+			now > (heap->exec_start_time + JS_EXEC_TIMEOUT_MS);
 }
 
-static duk_ret_t dukky_safe_get(duk_context *ctx, void *udata)
+static void dukky_dump_error(duk_context *ctx)
 {
-	duk_get_prop_string(ctx, 0, udata);
-	return 1;
+	/* stack is ..., errobj */
+	duk_dup_top(ctx);
+	/* ..., errobj, errobj */
+	NSLOG(jserrors, WARNING, "Uncaught error in JS: %s", duk_safe_to_stacktrace(ctx, -1));
+	/* ..., errobj, errobj.stackstring */
+	duk_pop(ctx);
+	/* ..., errobj */
 }
 
-static void dukky_dump_error(duk_context *ctx)
+static void dukky_reset_start_time(duk_context *ctx)
 {
-	/* stack is ..., errobj */
-	duk_idx_t stacktop = duk_get_top(ctx);
-	if (!duk_is_error(ctx, -1)) {
-		NSLOG(dukky, INFO, "Uncaught non-Error derived error in JS: %s", duk_safe_to_string(ctx, -1));
-	} else {
-#define GETTER(what)						\
-		if (duk_has_prop_string(ctx, stacktop - 1, what)) {	\
-			NSLOG(dukky, DEEPDEBUG, "Fetching " what); \
-			duk_dup(ctx, stacktop - 1);			\
-			if (duk_safe_call(ctx, dukky_safe_get, (void *)what, 1, 1) != DUK_EXEC_SUCCESS) { \
-				NSLOG(dukky, DEBUG, "Error fetching " what ": %s", duk_safe_to_string(ctx, -1)); \
-			} else { \
-				NSLOG(dukky, DEEPDEBUG, "Success fetching " what);	\
-			}						\
-		} else {						\
-			NSLOG(dukky, DEBUG, "Faking " what);		\
-			duk_push_string(ctx, "?" what "?");		\
-		}
-		GETTER("name");
-		GETTER("message");
-		GETTER("fileName");
-		GETTER("lineNumber");
-		GETTER("stack");
-		NSLOG(dukky, DEBUG, "Uncaught error in JS: %s: %s",
-		      duk_safe_to_string(ctx, -5), duk_safe_to_string(ctx, -4));
-		NSLOG(dukky, DEBUG, "              was at: %s line %s",
-		duk_safe_to_string(ctx, -3), duk_safe_to_string(ctx, -2));
-		NSLOG(dukky, DEBUG, "         Stack trace: %s",
-		      duk_safe_to_string(ctx, -1));
-#undef GETTER
-	}
-	duk_set_top(ctx, stacktop);
+	duk_memory_functions funcs;
+	jsheap *heap;
+	duk_get_memory_functions(ctx, &funcs);
+	heap = funcs.udata;
+	(void) nsu_getmonotonic_ms(&heap->exec_start_time);
 }
 
 duk_int_t dukky_pcall(duk_context *ctx, duk_size_t argc, bool reset_timeout)
 {
 	if (reset_timeout) {
-		duk_memory_functions funcs;
-		jscontext *jsctx;
-		duk_get_memory_functions(ctx, &funcs);
-		jsctx = funcs.udata;
-		(void) nsu_getmonotonic_ms(&jsctx->exec_start_time);
+		dukky_reset_start_time(ctx);
 	}
 
 	duk_int_t ret = duk_pcall(ctx, argc);
@@ -787,19 +919,27 @@ void dukky_log_stack_frame(duk_context *ctx, const char * reason)
 
 /* exported interface documented in js.h */
 bool
-js_exec(jscontext *ctx, const uint8_t *txt, size_t txtlen, const char *name)
+js_exec(jsthread *thread, const uint8_t *txt, size_t txtlen, const char *name)
 {
-	assert(ctx);
+	bool ret = false;
+	assert(thread);
 
 	if (txt == NULL || txtlen == 0) {
 		return false;
 	}
 
+	if (thread->pending_destroy) {
+		NSLOG(dukky, DEEPDEBUG, "Skipping exec call because thread is dead");
+		return false;
+	}
+
+	dukky_enter_thread(thread);
+
 	duk_set_top(CTX, 0);
 	NSLOG(dukky, DEEPDEBUG, "Running %"PRIsizet" bytes from %s", txtlen, name);
 	/* NSLOG(dukky, DEEPDEBUG, "\n%s\n", txt); */
 
-	(void) nsu_getmonotonic_ms(&ctx->exec_start_time);
+	dukky_reset_start_time(CTX);
 	if (name != NULL) {
 		duk_push_string(CTX, name);
 	} else {
@@ -821,11 +961,44 @@ js_exec(jscontext *ctx, const uint8_t *txt, size_t txtlen, const char *name)
 	if (duk_get_top(CTX) == 0) duk_push_boolean(CTX, false);
 	NSLOG(dukky, DEEPDEBUG, "Returning %s",
 	      duk_get_boolean(CTX, 0) ? "true" : "false");
-	return duk_get_boolean(CTX, 0);
+	ret = duk_get_boolean(CTX, 0);
+	goto out;
 
 handle_error:
 	dukky_dump_error(CTX);
-	return false;
+out:
+	dukky_leave_thread(thread);
+	return ret;
+}
+
+static const char* dukky_event_proto(dom_event *evt)
+{
+	const char *ret = PROTO_NAME(EVENT);
+	dom_string *type = NULL;
+	dom_exception err;
+
+	err = dom_event_get_type(evt, &type);
+	if (err != DOM_NO_ERR) {
+		goto out;
+	}
+
+	if (dom_string_isequal(type, corestring_dom_keydown)) {
+		ret = PROTO_NAME(KEYBOARDEVENT);
+		goto out;
+	} else if (dom_string_isequal(type, corestring_dom_keyup)) {
+		ret = PROTO_NAME(KEYBOARDEVENT);
+		goto out;
+	} else if (dom_string_isequal(type, corestring_dom_keypress)) {
+		ret = PROTO_NAME(KEYBOARDEVENT);
+		goto out;
+	}
+
+out:
+	if (type != NULL) {
+		dom_string_unref(type);
+	}
+
+	return ret;
 }
 
 /*** New style event handling ***/
@@ -844,7 +1017,7 @@ void dukky_push_event(duk_context *ctx, dom_event *evt)
 		duk_pop(ctx);
 		/* ... events */
 		duk_push_pointer(ctx, evt);
-		if (dukky_create_object(ctx, PROTO_NAME(EVENT), 1) != DUK_EXEC_SUCCESS) {
+		if (dukky_create_object(ctx, dukky_event_proto(evt), 1) != DUK_EXEC_SUCCESS) {
 			/* ... events err */
 			duk_pop(ctx);
 			/* ... events */
@@ -969,9 +1142,7 @@ bool dukky_get_current_value_of_event_handler(duk_context *ctx,
 
 static void dukky_generic_event_handler(dom_event *evt, void *pw)
 {
-	duk_memory_functions funcs;
 	duk_context *ctx = (duk_context *)pw;
-	jscontext *jsctx;
 	dom_string *name;
 	dom_exception exc;
 	dom_event_target *targ;
@@ -979,17 +1150,13 @@ static void dukky_generic_event_handler(dom_event *evt, void *pw)
 	duk_uarridx_t idx;
 	event_listener_flags flags;
 
-	/* Retrieve the JS context from the Duktape context */
-	duk_get_memory_functions(ctx, &funcs);
-	jsctx = funcs.udata;
-
 	NSLOG(dukky, DEBUG, "Handling an event in duktape interface...");
 	exc = dom_event_get_type(evt, &name);
 	if (exc != DOM_NO_ERR) {
 		NSLOG(dukky, DEBUG, "Unable to find the event name");
 		return;
 	}
-	NSLOG(dukky, DEBUG, "Event's name is %*s", dom_string_length(name),
+	NSLOG(dukky, DEBUG, "Event's name is %*s", (int)dom_string_length(name),
 	      dom_string_data(name));
 	exc = dom_event_get_event_phase(evt, &phase);
 	if (exc != DOM_NO_ERR) {
@@ -1030,7 +1197,7 @@ static void dukky_generic_event_handler(dom_event *evt, void *pw)
 	/* ... handler node */
 	dukky_push_event(ctx, evt);
 	/* ... handler node event */
-	(void) nsu_getmonotonic_ms(&jsctx->exec_start_time);
+	dukky_reset_start_time(ctx);
 	if (duk_pcall_method(ctx, 1) != 0) {
 		/* Failed to run the method */
 		/* ... err */
@@ -1129,7 +1296,7 @@ handle_extras:
 		/* ... copy handler callback node */
 		dukky_push_event(ctx, evt);
 		/* ... copy handler callback node event */
-		(void) nsu_getmonotonic_ms(&jsctx->exec_start_time);
+		dukky_reset_start_time(ctx);
 		if (duk_pcall_method(ctx, 1) != 0) {
 			/* Failed to run the method */
 			/* ... copy handler err */
@@ -1227,10 +1394,10 @@ void dukky_register_event_listener_for(duk_context *ctx,
 	if (exc != DOM_NO_ERR) {
 		NSLOG(dukky, DEBUG,
 		      "Unable to register listener for %p.%*s", ele,
-		      dom_string_length(name), dom_string_data(name));
+		      (int)dom_string_length(name), dom_string_data(name));
 	} else {
 		NSLOG(dukky, DEBUG, "have registered listener for %p.%*s",
-		      ele, dom_string_length(name), dom_string_data(name));
+		      ele, (int)dom_string_length(name), dom_string_data(name));
 	}
 	dom_event_listener_unref(listen);
 }
@@ -1301,9 +1468,9 @@ void dukky_shuffle_array(duk_context *ctx, duk_uarridx_t idx)
 }
 
 
-void js_handle_new_element(jscontext *ctx, struct dom_element *node)
+void js_handle_new_element(jsthread *thread, struct dom_element *node)
 {
-	assert(ctx);
+	assert(thread);
 	assert(node);
 	dom_namednodemap *map;
 	dom_exception exc;
@@ -1326,6 +1493,8 @@ void js_handle_new_element(jscontext *ctx, struct dom_element *node)
 	if (exc != DOM_NO_ERR) return;
 	if (map == NULL) return;
 
+	dukky_enter_thread(thread);
+
 	exc = dom_namednodemap_get_length(map, &siz);
 	if (exc != DOM_NO_ERR) goto out;
 
@@ -1375,11 +1544,14 @@ out:
 		dom_node_unref(attr);
 
 	dom_namednodemap_unref(map);
+
+	dukky_leave_thread(thread);
 }
 
-void js_event_cleanup(jscontext *ctx, struct dom_event *evt)
+void js_event_cleanup(jsthread *thread, struct dom_event *evt)
 {
-	assert(ctx);
+	assert(thread);
+	dukky_enter_thread(thread);
 	/* ... */
 	duk_get_global_string(CTX, EVENT_MAGIC);
 	/* ... EVENT_MAP */
@@ -1389,9 +1561,10 @@ void js_event_cleanup(jscontext *ctx, struct dom_event *evt)
 	/* ... EVENT_MAP */
 	duk_pop(CTX);
 	/* ... */
+	dukky_leave_thread(thread);
 }
 
-bool js_fire_event(jscontext *ctx, const char *type, struct dom_document *doc, struct dom_node *target)
+bool js_fire_event(jsthread *thread, const char *type, struct dom_document *doc, struct dom_node *target)
 {
 	dom_exception exc;
 	dom_event *evt;
@@ -1427,6 +1600,7 @@ bool js_fire_event(jscontext *ctx, const char *type, struct dom_document *doc, s
 		dom_event_unref(evt);
 		return true;
 	}
+	dukky_enter_thread(thread);
 	/* ... */
 	duk_get_global_string(CTX, HANDLER_MAGIC);
 	/* ... handlers */
@@ -1443,6 +1617,7 @@ bool js_fire_event(jscontext *ctx, const char *type, struct dom_document *doc, s
 		exc = dom_html_document_get_body(doc, &body);
 		if (exc != DOM_NO_ERR) {
 			dom_event_unref(evt);
+			dukky_leave_thread(thread);
 			return true;
 		}
 		dukky_push_node(CTX, (struct dom_node *)body);
@@ -1453,6 +1628,7 @@ bool js_fire_event(jscontext *ctx, const char *type, struct dom_document *doc, s
 			dom_node_unref(body);
 			/* ... handlers */
 			duk_pop(CTX);
+			dukky_leave_thread(thread);
 			return true;
 		}
 		/* Unref the body, we don't need it any more */
@@ -1469,7 +1645,7 @@ bool js_fire_event(jscontext *ctx, const char *type, struct dom_document *doc, s
 	/* ... handler Window */
 	dukky_push_event(CTX, evt);
 	/* ... handler Window event */
-	(void) nsu_getmonotonic_ms(&ctx->exec_start_time);
+	dukky_reset_start_time(CTX);
 	if (duk_pcall_method(CTX, 1) != 0) {
 		/* Failed to run the handler */
 		/* ... err */
@@ -1492,14 +1668,16 @@ bool js_fire_event(jscontext *ctx, const char *type, struct dom_document *doc, s
 
 		duk_pop_n(CTX, 6);
 		/* ... */
-		js_event_cleanup(ctx, evt);
+		js_event_cleanup(thread, evt);
 		dom_event_unref(evt);
+		dukky_leave_thread(thread);
 		return true;
 	}
 	/* ... result */
 	duk_pop(CTX);
 	/* ... */
-	js_event_cleanup(ctx, evt);
+	js_event_cleanup(thread, evt);
 	dom_event_unref(evt);
+	dukky_leave_thread(thread);
 	return true;
 }
diff --git a/content/handlers/javascript/duktape/duktape.c b/content/handlers/javascript/duktape/duktape.c
index 91c4e65bb..18b2e99f9 100644
--- a/content/handlers/javascript/duktape/duktape.c
+++ b/content/handlers/javascript/duktape/duktape.c
@@ -1,7 +1,7 @@
 /* Omit from static analysis. */
 #ifndef __clang_analyzer__
 /*
- *  Single source autogenerated distributable for Duktape 2.3.0.
+ *  Single source autogenerated distributable for Duktape 2.7.0.
  *
  *  Git commit external (external).
  *  Git branch external.
@@ -18,7 +18,7 @@
 *
 *  (http://opensource.org/licenses/MIT)
 *
-*  Copyright (c) 2013-2018 by Duktape authors (see AUTHORS.rst)
+*  Copyright (c) 2013-present by Duktape authors (see AUTHORS.rst)
 *
 *  Permission is hereby granted, free of charge, to any person obtaining a copy
 *  of this software and associated documentation files (the "Software"), to deal
@@ -97,6 +97,22 @@
 *  * Michal Kasperek (https://github.com/michalkas)
 *  * Andrew Janke (https://github.com/apjanke)
 *  * Steve Fan (https://github.com/stevefan1999)
+*  * Edward Betts (https://github.com/edwardbetts)
+*  * Ozhan Duz (https://github.com/webfolderio)
+*  * Akos Kiss (https://github.com/akosthekiss)
+*  * TheBrokenRail (https://github.com/TheBrokenRail)
+*  * Jesse Doyle (https://github.com/jessedoyle)
+*  * Gero Kuehn (https://github.com/dc6jgk)
+*  * James Swift (https://github.com/phraemer)
+*  * Luis de Bethencourt (https://github.com/luisbg)
+*  * Ian Whyman (https://github.com/v00d00)
+*  * Rick Sayre (https://github.com/whorfin)
+*  * Craig Leres (https://github.com/leres)
+*  * Maurici Abad (https://github.com/mauriciabad)
+*  * Nancy Li (https://github.com/NancyLi1013)
+*  * William Parks (https://github.com/WilliamParks)
+*  * Sam Hellawell (https://github.com/samhellawell)
+*  * Vladislavs Sokurenko (https://github.com/sokurenko)
 *
 *  Other contributions
 *  ===================
@@ -137,6 +153,8 @@
 *  * Neil Kolban (https://github.com/nkolban)
 *  * Wilhelm Wanecek (https://github.com/wanecek)
 *  * Andrew Janke (https://github.com/apjanke)
+*  * Unamer (https://github.com/unamer)
+*  * Karl Dahlke (eklhad@gmail.com)
 *
 *  If you are accidentally missing from this list, send me an e-mail
 *  (``sami.vaarala@iki.fi``) and I'll fix the omission.
@@ -179,13 +197,6 @@
 #include "duktape.h"
 
 /*
- *  User declarations, e.g. prototypes for user functions used by Duktape
- *  macros.
- */
-
-DUK_USE_USER_DECLARE()
-
-/*
  *  Duktape includes (other than duk_features.h)
  *
  *  The header files expect to be included in an order which satisfies header
@@ -223,13 +234,14 @@ DUK_USE_USER_DECLARE()
  *
  *    A B C D E F G H    Big endian (e.g. 68k)           DUK_USE_DOUBLE_BE
  *    H G F E D C B A    Little endian (e.g. x86)        DUK_USE_DOUBLE_LE
- *    D C B A H G F E    Mixed/cross endian (e.g. ARM)   DUK_USE_DOUBLE_ME
+ *    D C B A H G F E    Mixed endian (e.g. ARM FPA)     DUK_USE_DOUBLE_ME
  *
- *  ARM is a special case: ARM double values are in mixed/cross endian
- *  format while ARM duk_uint64_t values are in standard little endian
+ *  Legacy ARM (FPA) is a special case: ARM double values are in mixed
+ *  endian format while ARM duk_uint64_t values are in standard little endian
  *  format (H G F E D C B A).  When a double is read as a duk_uint64_t
  *  from memory, the register will contain the (logical) value
  *  E F G H A B C D.  This requires some special handling below.
+ *  See http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0056d/Bcfhgcgd.html.
  *
  *  Indexes of various types (8-bit, 16-bit, 32-bit) in memory relative to
  *  the logical (big endian) order:
@@ -262,7 +274,7 @@ union duk_double_union {
 	duk_uint16_t us[4];
 	duk_uint8_t uc[8];
 #if defined(DUK_USE_PACKED_TVAL)
-	void *vp[2];  /* used by packed duk_tval, assumes sizeof(void *) == 4 */
+	void *vp[2]; /* used by packed duk_tval, assumes sizeof(void *) == 4 */
 #endif
 };
 
@@ -274,64 +286,64 @@ typedef union duk_double_union duk_double_union;
 
 #if defined(DUK_USE_DOUBLE_LE)
 #if defined(DUK_USE_64BIT_OPS)
-#define DUK_DBL_IDX_ULL0   0
-#endif
-#define DUK_DBL_IDX_UI0    1
-#define DUK_DBL_IDX_UI1    0
-#define DUK_DBL_IDX_US0    3
-#define DUK_DBL_IDX_US1    2
-#define DUK_DBL_IDX_US2    1
-#define DUK_DBL_IDX_US3    0
-#define DUK_DBL_IDX_UC0    7
-#define DUK_DBL_IDX_UC1    6
-#define DUK_DBL_IDX_UC2    5
-#define DUK_DBL_IDX_UC3    4
-#define DUK_DBL_IDX_UC4    3
-#define DUK_DBL_IDX_UC5    2
-#define DUK_DBL_IDX_UC6    1
-#define DUK_DBL_IDX_UC7    0
-#define DUK_DBL_IDX_VP0    DUK_DBL_IDX_UI0  /* packed tval */
-#define DUK_DBL_IDX_VP1    DUK_DBL_IDX_UI1  /* packed tval */
+#define DUK_DBL_IDX_ULL0 0
+#endif
+#define DUK_DBL_IDX_UI0 1
+#define DUK_DBL_IDX_UI1 0
+#define DUK_DBL_IDX_US0 3
+#define DUK_DBL_IDX_US1 2
+#define DUK_DBL_IDX_US2 1
+#define DUK_DBL_IDX_US3 0
+#define DUK_DBL_IDX_UC0 7
+#define DUK_DBL_IDX_UC1 6
+#define DUK_DBL_IDX_UC2 5
+#define DUK_DBL_IDX_UC3 4
+#define DUK_DBL_IDX_UC4 3
+#define DUK_DBL_IDX_UC5 2
+#define DUK_DBL_IDX_UC6 1
+#define DUK_DBL_IDX_UC7 0
+#define DUK_DBL_IDX_VP0 DUK_DBL_IDX_UI0 /* packed tval */
+#define DUK_DBL_IDX_VP1 DUK_DBL_IDX_UI1 /* packed tval */
 #elif defined(DUK_USE_DOUBLE_BE)
 #if defined(DUK_USE_64BIT_OPS)
-#define DUK_DBL_IDX_ULL0   0
-#endif
-#define DUK_DBL_IDX_UI0    0
-#define DUK_DBL_IDX_UI1    1
-#define DUK_DBL_IDX_US0    0
-#define DUK_DBL_IDX_US1    1
-#define DUK_DBL_IDX_US2    2
-#define DUK_DBL_IDX_US3    3
-#define DUK_DBL_IDX_UC0    0
-#define DUK_DBL_IDX_UC1    1
-#define DUK_DBL_IDX_UC2    2
-#define DUK_DBL_IDX_UC3    3
-#define DUK_DBL_IDX_UC4    4
-#define DUK_DBL_IDX_UC5    5
-#define DUK_DBL_IDX_UC6    6
-#define DUK_DBL_IDX_UC7    7
-#define DUK_DBL_IDX_VP0    DUK_DBL_IDX_UI0  /* packed tval */
-#define DUK_DBL_IDX_VP1    DUK_DBL_IDX_UI1  /* packed tval */
+#define DUK_DBL_IDX_ULL0 0
+#endif
+#define DUK_DBL_IDX_UI0 0
+#define DUK_DBL_IDX_UI1 1
+#define DUK_DBL_IDX_US0 0
+#define DUK_DBL_IDX_US1 1
+#define DUK_DBL_IDX_US2 2
+#define DUK_DBL_IDX_US3 3
+#define DUK_DBL_IDX_UC0 0
+#define DUK_DBL_IDX_UC1 1
+#define DUK_DBL_IDX_UC2 2
+#define DUK_DBL_IDX_UC3 3
+#define DUK_DBL_IDX_UC4 4
+#define DUK_DBL_IDX_UC5 5
+#define DUK_DBL_IDX_UC6 6
+#define DUK_DBL_IDX_UC7 7
+#define DUK_DBL_IDX_VP0 DUK_DBL_IDX_UI0 /* packed tval */
+#define DUK_DBL_IDX_VP1 DUK_DBL_IDX_UI1 /* packed tval */
 #elif defined(DUK_USE_DOUBLE_ME)
 #if defined(DUK_USE_64BIT_OPS)
-#define DUK_DBL_IDX_ULL0   0  /* not directly applicable, byte order differs from a double */
-#endif
-#define DUK_DBL_IDX_UI0    0
-#define DUK_DBL_IDX_UI1    1
-#define DUK_DBL_IDX_US0    1
-#define DUK_DBL_IDX_US1    0
-#define DUK_DBL_IDX_US2    3
-#define DUK_DBL_IDX_US3    2
-#define DUK_DBL_IDX_UC0    3
-#define DUK_DBL_IDX_UC1    2
-#define DUK_DBL_IDX_UC2    1
-#define DUK_DBL_IDX_UC3    0
-#define DUK_DBL_IDX_UC4    7
-#define DUK_DBL_IDX_UC5    6
-#define DUK_DBL_IDX_UC6    5
-#define DUK_DBL_IDX_UC7    4
-#define DUK_DBL_IDX_VP0    DUK_DBL_IDX_UI0  /* packed tval */
-#define DUK_DBL_IDX_VP1    DUK_DBL_IDX_UI1  /* packed tval */
+#define DUK_DBL_IDX_ULL0 0 /* not directly applicable, byte order differs from a double */
+#endif
+#define DUK_DBL_IDX_UI0 0
+#define DUK_DBL_IDX_UI1 1
+#define DUK_DBL_IDX_US0 1
+#define DUK_DBL_IDX_US1 0
+#define DUK_DBL_IDX_US2 3
+#define DUK_DBL_IDX_US3 2
+#define DUK_DBL_IDX_UC0 3
+#define DUK_DBL_IDX_UC1 2
+#define DUK_DBL_IDX_UC2 1
+#define DUK_DBL_IDX_UC3 0
+#define DUK_DBL_IDX_UC4 7
+#define DUK_DBL_IDX_UC5 6
+#define DUK_DBL_IDX_UC6 5
+#define DUK_DBL_IDX_UC7 4
+#define DUK_DBL_IDX_VP0 DUK_DBL_IDX_UI0 /* packed tval */
+#define DUK_DBL_IDX_VP1 DUK_DBL_IDX_UI1 /* packed tval */
 #else
 #error internal error
 #endif
@@ -341,57 +353,63 @@ typedef union duk_double_union duk_double_union;
  *  by duk_numconv.c and duk_tval.h.
  */
 
-#define DUK_DBLUNION_SET_DOUBLE(u,v)  do {  \
+#define DUK_DBLUNION_SET_DOUBLE(u, v) \
+	do { \
 		(u)->d = (v); \
 	} while (0)
 
-#define DUK_DBLUNION_SET_HIGH32(u,v)  do {  \
+#define DUK_DBLUNION_SET_HIGH32(u, v) \
+	do { \
 		(u)->ui[DUK_DBL_IDX_UI0] = (duk_uint32_t) (v); \
 	} while (0)
 
 #if defined(DUK_USE_64BIT_OPS)
 #if defined(DUK_USE_DOUBLE_ME)
-#define DUK_DBLUNION_SET_HIGH32_ZERO_LOW32(u,v)  do { \
+#define DUK_DBLUNION_SET_HIGH32_ZERO_LOW32(u, v) \
+	do { \
 		(u)->ull[DUK_DBL_IDX_ULL0] = (duk_uint64_t) (v); \
 	} while (0)
 #else
-#define DUK_DBLUNION_SET_HIGH32_ZERO_LOW32(u,v)  do { \
+#define DUK_DBLUNION_SET_HIGH32_ZERO_LOW32(u, v) \
+	do { \
 		(u)->ull[DUK_DBL_IDX_ULL0] = ((duk_uint64_t) (v)) << 32; \
 	} while (0)
 #endif
-#else  /* DUK_USE_64BIT_OPS */
-#define DUK_DBLUNION_SET_HIGH32_ZERO_LOW32(u,v)  do { \
+#else /* DUK_USE_64BIT_OPS */
+#define DUK_DBLUNION_SET_HIGH32_ZERO_LOW32(u, v) \
+	do { \
 		(u)->ui[DUK_DBL_IDX_UI0] = (duk_uint32_t) (v); \
 		(u)->ui[DUK_DBL_IDX_UI1] = (duk_uint32_t) 0; \
 	} while (0)
-#endif  /* DUK_USE_64BIT_OPS */
+#endif /* DUK_USE_64BIT_OPS */
 
-#define DUK_DBLUNION_SET_LOW32(u,v)  do {  \
+#define DUK_DBLUNION_SET_LOW32(u, v) \
+	do { \
 		(u)->ui[DUK_DBL_IDX_UI1] = (duk_uint32_t) (v); \
 	} while (0)
 
-#define DUK_DBLUNION_GET_DOUBLE(u)  ((u)->d)
-#define DUK_DBLUNION_GET_HIGH32(u)  ((u)->ui[DUK_DBL_IDX_UI0])
-#define DUK_DBLUNION_GET_LOW32(u)   ((u)->ui[DUK_DBL_IDX_UI1])
+#define DUK_DBLUNION_GET_DOUBLE(u) ((u)->d)
+#define DUK_DBLUNION_GET_HIGH32(u) ((u)->ui[DUK_DBL_IDX_UI0])
+#define DUK_DBLUNION_GET_LOW32(u)  ((u)->ui[DUK_DBL_IDX_UI1])
 
 #if defined(DUK_USE_64BIT_OPS)
 #if defined(DUK_USE_DOUBLE_ME)
-#define DUK_DBLUNION_SET_UINT64(u,v)  do { \
+#define DUK_DBLUNION_SET_UINT64(u, v) \
+	do { \
 		(u)->ui[DUK_DBL_IDX_UI0] = (duk_uint32_t) ((v) >> 32); \
 		(u)->ui[DUK_DBL_IDX_UI1] = (duk_uint32_t) (v); \
 	} while (0)
-#define DUK_DBLUNION_GET_UINT64(u) \
-	((((duk_uint64_t) (u)->ui[DUK_DBL_IDX_UI0]) << 32) | \
-	 ((duk_uint64_t) (u)->ui[DUK_DBL_IDX_UI1]))
+#define DUK_DBLUNION_GET_UINT64(u) ((((duk_uint64_t) (u)->ui[DUK_DBL_IDX_UI0]) << 32) | ((duk_uint64_t) (u)->ui[DUK_DBL_IDX_UI1]))
 #else
-#define DUK_DBLUNION_SET_UINT64(u,v)  do { \
+#define DUK_DBLUNION_SET_UINT64(u, v) \
+	do { \
 		(u)->ull[DUK_DBL_IDX_ULL0] = (duk_uint64_t) (v); \
 	} while (0)
-#define DUK_DBLUNION_GET_UINT64(u)  ((u)->ull[DUK_DBL_IDX_ULL0])
+#define DUK_DBLUNION_GET_UINT64(u) ((u)->ull[DUK_DBL_IDX_ULL0])
 #endif
-#define DUK_DBLUNION_SET_INT64(u,v) DUK_DBLUNION_SET_UINT64((u), (duk_uint64_t) (v))
-#define DUK_DBLUNION_GET_INT64(u)   ((duk_int64_t) DUK_DBLUNION_GET_UINT64((u)))
-#endif  /* DUK_USE_64BIT_OPS */
+#define DUK_DBLUNION_SET_INT64(u, v) DUK_DBLUNION_SET_UINT64((u), (duk_uint64_t) (v))
+#define DUK_DBLUNION_GET_INT64(u)    ((duk_int64_t) DUK_DBLUNION_GET_UINT64((u)))
+#endif /* DUK_USE_64BIT_OPS */
 
 /*
  *  Double NaN manipulation macros related to NaN normalization needed when
@@ -422,103 +440,87 @@ typedef union duk_double_union duk_double_union;
 #if defined(DUK_USE_64BIT_OPS)
 #if defined(DUK_USE_DOUBLE_ME)
 /* Macros for 64-bit ops + mixed endian doubles. */
-#define DUK__DBLUNION_SET_NAN_FULL(u)  do { \
+#define DUK__DBLUNION_SET_NAN_FULL(u) \
+	do { \
 		(u)->ull[DUK_DBL_IDX_ULL0] = DUK_U64_CONSTANT(0x000000007ff80000); \
 	} while (0)
 #define DUK__DBLUNION_IS_NAN_FULL(u) \
 	((((u)->ull[DUK_DBL_IDX_ULL0] & DUK_U64_CONSTANT(0x000000007ff00000)) == DUK_U64_CONSTANT(0x000000007ff00000)) && \
 	 ((((u)->ull[DUK_DBL_IDX_ULL0]) & DUK_U64_CONSTANT(0xffffffff000fffff)) != 0))
-#define DUK__DBLUNION_IS_NORMALIZED_NAN_FULL(u) \
-	((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x000000007ff80000))
+#define DUK__DBLUNION_IS_NORMALIZED_NAN_FULL(u) ((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x000000007ff80000))
 #define DUK__DBLUNION_IS_ANYINF(u) \
 	(((u)->ull[DUK_DBL_IDX_ULL0] & DUK_U64_CONSTANT(0xffffffff7fffffff)) == DUK_U64_CONSTANT(0x000000007ff00000))
-#define DUK__DBLUNION_IS_POSINF(u) \
-	((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x000000007ff00000))
-#define DUK__DBLUNION_IS_NEGINF(u) \
-	((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x00000000fff00000))
+#define DUK__DBLUNION_IS_POSINF(u) ((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x000000007ff00000))
+#define DUK__DBLUNION_IS_NEGINF(u) ((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x00000000fff00000))
 #define DUK__DBLUNION_IS_ANYZERO(u) \
 	(((u)->ull[DUK_DBL_IDX_ULL0] & DUK_U64_CONSTANT(0xffffffff7fffffff)) == DUK_U64_CONSTANT(0x0000000000000000))
-#define DUK__DBLUNION_IS_POSZERO(u) \
-	((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x0000000000000000))
-#define DUK__DBLUNION_IS_NEGZERO(u) \
-	((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x0000000080000000))
+#define DUK__DBLUNION_IS_POSZERO(u) ((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x0000000000000000))
+#define DUK__DBLUNION_IS_NEGZERO(u) ((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x0000000080000000))
 #else
 /* Macros for 64-bit ops + big/little endian doubles. */
-#define DUK__DBLUNION_SET_NAN_FULL(u)  do { \
+#define DUK__DBLUNION_SET_NAN_FULL(u) \
+	do { \
 		(u)->ull[DUK_DBL_IDX_ULL0] = DUK_U64_CONSTANT(0x7ff8000000000000); \
 	} while (0)
 #define DUK__DBLUNION_IS_NAN_FULL(u) \
 	((((u)->ull[DUK_DBL_IDX_ULL0] & DUK_U64_CONSTANT(0x7ff0000000000000)) == DUK_U64_CONSTANT(0x7ff0000000000000)) && \
 	 ((((u)->ull[DUK_DBL_IDX_ULL0]) & DUK_U64_CONSTANT(0x000fffffffffffff)) != 0))
-#define DUK__DBLUNION_IS_NORMALIZED_NAN_FULL(u) \
-	((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x7ff8000000000000))
+#define DUK__DBLUNION_IS_NORMALIZED_NAN_FULL(u) ((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x7ff8000000000000))
 #define DUK__DBLUNION_IS_ANYINF(u) \
 	(((u)->ull[DUK_DBL_IDX_ULL0] & DUK_U64_CONSTANT(0x7fffffffffffffff)) == DUK_U64_CONSTANT(0x7ff0000000000000))
-#define DUK__DBLUNION_IS_POSINF(u) \
-	((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x7ff0000000000000))
-#define DUK__DBLUNION_IS_NEGINF(u) \
-	((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0xfff0000000000000))
+#define DUK__DBLUNION_IS_POSINF(u) ((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x7ff0000000000000))
+#define DUK__DBLUNION_IS_NEGINF(u) ((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0xfff0000000000000))
 #define DUK__DBLUNION_IS_ANYZERO(u) \
 	(((u)->ull[DUK_DBL_IDX_ULL0] & DUK_U64_CONSTANT(0x7fffffffffffffff)) == DUK_U64_CONSTANT(0x0000000000000000))
-#define DUK__DBLUNION_IS_POSZERO(u) \
-	((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x0000000000000000))
-#define DUK__DBLUNION_IS_NEGZERO(u) \
-	((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x8000000000000000))
+#define DUK__DBLUNION_IS_POSZERO(u) ((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x0000000000000000))
+#define DUK__DBLUNION_IS_NEGZERO(u) ((u)->ull[DUK_DBL_IDX_ULL0] == DUK_U64_CONSTANT(0x8000000000000000))
 #endif
-#else  /* DUK_USE_64BIT_OPS */
+#else /* DUK_USE_64BIT_OPS */
 /* Macros for no 64-bit ops, any endianness. */
-#define DUK__DBLUNION_SET_NAN_FULL(u)  do { \
+#define DUK__DBLUNION_SET_NAN_FULL(u) \
+	do { \
 		(u)->ui[DUK_DBL_IDX_UI0] = (duk_uint32_t) 0x7ff80000UL; \
 		(u)->ui[DUK_DBL_IDX_UI1] = (duk_uint32_t) 0x00000000UL; \
 	} while (0)
 #define DUK__DBLUNION_IS_NAN_FULL(u) \
 	((((u)->ui[DUK_DBL_IDX_UI0] & 0x7ff00000UL) == 0x7ff00000UL) && \
-	 (((u)->ui[DUK_DBL_IDX_UI0] & 0x000fffffUL) != 0 || \
-          (u)->ui[DUK_DBL_IDX_UI1] != 0))
+	 (((u)->ui[DUK_DBL_IDX_UI0] & 0x000fffffUL) != 0 || (u)->ui[DUK_DBL_IDX_UI1] != 0))
 #define DUK__DBLUNION_IS_NORMALIZED_NAN_FULL(u) \
-	(((u)->ui[DUK_DBL_IDX_UI0] == 0x7ff80000UL) && \
-	 ((u)->ui[DUK_DBL_IDX_UI1] == 0x00000000UL))
+	(((u)->ui[DUK_DBL_IDX_UI0] == 0x7ff80000UL) && ((u)->ui[DUK_DBL_IDX_UI1] == 0x00000000UL))
 #define DUK__DBLUNION_IS_ANYINF(u) \
-	((((u)->ui[DUK_DBL_IDX_UI0] & 0x7fffffffUL) == 0x7ff00000UL) && \
-	 ((u)->ui[DUK_DBL_IDX_UI1] == 0x00000000UL))
-#define DUK__DBLUNION_IS_POSINF(u) \
-	(((u)->ui[DUK_DBL_IDX_UI0] == 0x7ff00000UL) && \
-	 ((u)->ui[DUK_DBL_IDX_UI1] == 0x00000000UL))
-#define DUK__DBLUNION_IS_NEGINF(u) \
-	(((u)->ui[DUK_DBL_IDX_UI0] == 0xfff00000UL) && \
-	 ((u)->ui[DUK_DBL_IDX_UI1] == 0x00000000UL))
+	((((u)->ui[DUK_DBL_IDX_UI0] & 0x7fffffffUL) == 0x7ff00000UL) && ((u)->ui[DUK_DBL_IDX_UI1] == 0x00000000UL))
+#define DUK__DBLUNION_IS_POSINF(u) (((u)->ui[DUK_DBL_IDX_UI0] == 0x7ff00000UL) && ((u)->ui[DUK_DBL_IDX_UI1] == 0x00000000UL))
+#define DUK__DBLUNION_IS_NEGINF(u) (((u)->ui[DUK_DBL_IDX_UI0] == 0xfff00000UL) && ((u)->ui[DUK_DBL_IDX_UI1] == 0x00000000UL))
 #define DUK__DBLUNION_IS_ANYZERO(u) \
-	((((u)->ui[DUK_DBL_IDX_UI0] & 0x7fffffffUL) == 0x00000000UL) && \
-	 ((u)->ui[DUK_DBL_IDX_UI1] == 0x00000000UL))
-#define DUK__DBLUNION_IS_POSZERO(u) \
-	(((u)->ui[DUK_DBL_IDX_UI0] == 0x00000000UL) && \
-	 ((u)->ui[DUK_DBL_IDX_UI1] == 0x00000000UL))
-#define DUK__DBLUNION_IS_NEGZERO(u) \
-	(((u)->ui[DUK_DBL_IDX_UI0] == 0x80000000UL) && \
-	 ((u)->ui[DUK_DBL_IDX_UI1] == 0x00000000UL))
-#endif  /* DUK_USE_64BIT_OPS */
-
-#define DUK__DBLUNION_SET_NAN_NOTFULL(u)  do { \
+	((((u)->ui[DUK_DBL_IDX_UI0] & 0x7fffffffUL) == 0x00000000UL) && ((u)->ui[DUK_DBL_IDX_UI1] == 0x00000000UL))
+#define DUK__DBLUNION_IS_POSZERO(u) (((u)->ui[DUK_DBL_IDX_UI0] == 0x00000000UL) && ((u)->ui[DUK_DBL_IDX_UI1] == 0x00000000UL))
+#define DUK__DBLUNION_IS_NEGZERO(u) (((u)->ui[DUK_DBL_IDX_UI0] == 0x80000000UL) && ((u)->ui[DUK_DBL_IDX_UI1] == 0x00000000UL))
+#endif /* DUK_USE_64BIT_OPS */
+
+#define DUK__DBLUNION_SET_NAN_NOTFULL(u) \
+	do { \
 		(u)->us[DUK_DBL_IDX_US0] = 0x7ff8UL; \
 	} while (0)
 
 #define DUK__DBLUNION_IS_NAN_NOTFULL(u) \
 	/* E == 0x7ff, topmost four bits of F != 0 => assume NaN */ \
-	((((u)->us[DUK_DBL_IDX_US0] & 0x7ff0UL) == 0x7ff0UL) && \
-	 (((u)->us[DUK_DBL_IDX_US0] & 0x000fUL) != 0x0000UL))
+	((((u)->us[DUK_DBL_IDX_US0] & 0x7ff0UL) == 0x7ff0UL) && (((u)->us[DUK_DBL_IDX_US0] & 0x000fUL) != 0x0000UL))
 
 #define DUK__DBLUNION_IS_NORMALIZED_NAN_NOTFULL(u) \
 	/* E == 0x7ff, F == 8 => normalized NaN */ \
 	((u)->us[DUK_DBL_IDX_US0] == 0x7ff8UL)
 
-#define DUK__DBLUNION_NORMALIZE_NAN_CHECK_FULL(u)  do { \
+#define DUK__DBLUNION_NORMALIZE_NAN_CHECK_FULL(u) \
+	do { \
 		if (DUK__DBLUNION_IS_NAN_FULL((u))) { \
 			DUK__DBLUNION_SET_NAN_FULL((u)); \
 		} \
 	} while (0)
 
-#define DUK__DBLUNION_NORMALIZE_NAN_CHECK_NOTFULL(u)  do { \
-		if (DUK__DBLUNION_IS_NAN_NOTFULL((u))) { \
+#define DUK__DBLUNION_NORMALIZE_NAN_CHECK_NOTFULL(u) \
+	do { \
+		/* Check must be full. */ \
+		if (DUK__DBLUNION_IS_NAN_FULL((u))) { \
 			DUK__DBLUNION_SET_NAN_NOTFULL((u)); \
 		} \
 	} while (0)
@@ -530,30 +532,30 @@ typedef union duk_double_union duk_double_union;
  */
 
 #if defined(DUK_USE_PACKED_TVAL)
-#if defined(DUK_USE_FULL_TVAL)
-#define DUK_DBLUNION_NORMALIZE_NAN_CHECK(u)  DUK__DBLUNION_NORMALIZE_NAN_CHECK_FULL((u))
-#define DUK_DBLUNION_IS_NAN(u)               DUK__DBLUNION_IS_NAN_FULL((u))
-#define DUK_DBLUNION_IS_NORMALIZED_NAN(u)    DUK__DBLUNION_IS_NORMALIZED_NAN_FULL((u))
-#define DUK_DBLUNION_SET_NAN(d)              DUK__DBLUNION_SET_NAN_FULL((d))
-#else
-#define DUK_DBLUNION_NORMALIZE_NAN_CHECK(u)  DUK__DBLUNION_NORMALIZE_NAN_CHECK_NOTFULL((u))
-#define DUK_DBLUNION_IS_NAN(u)               DUK__DBLUNION_IS_NAN_NOTFULL((u))
-#define DUK_DBLUNION_IS_NORMALIZED_NAN(u)    DUK__DBLUNION_IS_NORMALIZED_NAN_NOTFULL((u))
-#define DUK_DBLUNION_SET_NAN(d)              DUK__DBLUNION_SET_NAN_NOTFULL((d))
+#define DUK_DBLUNION_NORMALIZE_NAN_CHECK(u) DUK__DBLUNION_NORMALIZE_NAN_CHECK_FULL((u))
+#define DUK_DBLUNION_IS_NAN(u)              DUK__DBLUNION_IS_NAN_FULL((u))
+#define DUK_DBLUNION_IS_NORMALIZED_NAN(u)   DUK__DBLUNION_IS_NORMALIZED_NAN_FULL((u))
+#define DUK_DBLUNION_SET_NAN(d)             DUK__DBLUNION_SET_NAN_FULL((d))
+#if 0
+#define DUK_DBLUNION_NORMALIZE_NAN_CHECK(u) DUK__DBLUNION_NORMALIZE_NAN_CHECK_NOTFULL((u))
+#define DUK_DBLUNION_IS_NAN(u)              DUK__DBLUNION_IS_NAN_NOTFULL((u))
+#define DUK_DBLUNION_IS_NORMALIZED_NAN(u)   DUK__DBLUNION_IS_NORMALIZED_NAN_NOTFULL((u))
+#define DUK_DBLUNION_SET_NAN(d)             DUK__DBLUNION_SET_NAN_NOTFULL((d))
 #endif
 #define DUK_DBLUNION_IS_NORMALIZED(u) \
-	(!DUK_DBLUNION_IS_NAN((u)) ||  /* either not a NaN */ \
-	 DUK_DBLUNION_IS_NORMALIZED_NAN((u)))  /* or is a normalized NaN */
-#else  /* DUK_USE_PACKED_TVAL */
-#define DUK_DBLUNION_NORMALIZE_NAN_CHECK(u)  /* nop: no need to normalize */
-#define DUK_DBLUNION_IS_NAN(u)               DUK__DBLUNION_IS_NAN_FULL((u))  /* (DUK_ISNAN((u)->d)) */
-#define DUK_DBLUNION_IS_NORMALIZED_NAN(u)    DUK__DBLUNION_IS_NAN_FULL((u))  /* (DUK_ISNAN((u)->d)) */
-#define DUK_DBLUNION_IS_NORMALIZED(u)        1  /* all doubles are considered normalized */
-#define DUK_DBLUNION_SET_NAN(u)  do { \
+	(!DUK_DBLUNION_IS_NAN((u)) || /* either not a NaN */ \
+	 DUK_DBLUNION_IS_NORMALIZED_NAN((u))) /* or is a normalized NaN */
+#else /* DUK_USE_PACKED_TVAL */
+#define DUK_DBLUNION_NORMALIZE_NAN_CHECK(u) /* nop: no need to normalize */
+#define DUK_DBLUNION_IS_NAN(u)              DUK__DBLUNION_IS_NAN_FULL((u)) /* (DUK_ISNAN((u)->d)) */
+#define DUK_DBLUNION_IS_NORMALIZED_NAN(u)   DUK__DBLUNION_IS_NAN_FULL((u)) /* (DUK_ISNAN((u)->d)) */
+#define DUK_DBLUNION_IS_NORMALIZED(u)       1 /* all doubles are considered normalized */
+#define DUK_DBLUNION_SET_NAN(u) \
+	do { \
 		/* in non-packed representation we don't care about which NaN is used */ \
 		(u)->d = DUK_DOUBLE_NAN; \
 	} while (0)
-#endif  /* DUK_USE_PACKED_TVAL */
+#endif /* DUK_USE_PACKED_TVAL */
 
 #define DUK_DBLUNION_IS_ANYINF(u) DUK__DBLUNION_IS_ANYINF((u))
 #define DUK_DBLUNION_IS_POSINF(u) DUK__DBLUNION_IS_POSINF((u))
@@ -566,7 +568,8 @@ typedef union duk_double_union duk_double_union;
 /* XXX: native 64-bit byteswaps when available */
 
 /* 64-bit byteswap, same operation independent of target endianness. */
-#define DUK_DBLUNION_BSWAP64(u) do { \
+#define DUK_DBLUNION_BSWAP64(u) \
+	do { \
 		duk_uint32_t duk__bswaptmp1, duk__bswaptmp2; \
 		duk__bswaptmp1 = (u)->ui[0]; \
 		duk__bswaptmp2 = (u)->ui[1]; \
@@ -580,7 +583,8 @@ typedef union duk_double_union duk_double_union;
  * order.  For a big endian target this is a no-op.
  */
 #if defined(DUK_USE_DOUBLE_LE)
-#define DUK_DBLUNION_DOUBLE_HTON(u) do { \
+#define DUK_DBLUNION_DOUBLE_HTON(u) \
+	do { \
 		duk_uint32_t duk__bswaptmp1, duk__bswaptmp2; \
 		duk__bswaptmp1 = (u)->ui[0]; \
 		duk__bswaptmp2 = (u)->ui[1]; \
@@ -590,7 +594,8 @@ typedef union duk_double_union duk_double_union;
 		(u)->ui[1] = duk__bswaptmp1; \
 	} while (0)
 #elif defined(DUK_USE_DOUBLE_ME)
-#define DUK_DBLUNION_DOUBLE_HTON(u) do { \
+#define DUK_DBLUNION_DOUBLE_HTON(u) \
+	do { \
 		duk_uint32_t duk__bswaptmp1, duk__bswaptmp2; \
 		duk__bswaptmp1 = (u)->ui[0]; \
 		duk__bswaptmp2 = (u)->ui[1]; \
@@ -600,7 +605,9 @@ typedef union duk_double_union duk_double_union;
 		(u)->ui[1] = duk__bswaptmp2; \
 	} while (0)
 #elif defined(DUK_USE_DOUBLE_BE)
-#define DUK_DBLUNION_DOUBLE_HTON(u) do { } while (0)
+#define DUK_DBLUNION_DOUBLE_HTON(u) \
+	do { \
+	} while (0)
 #else
 #error internal error, double endianness insane
 #endif
@@ -617,7 +624,47 @@ typedef union duk_double_union duk_double_union;
 #define DUK_DBLUNION_GET_SIGNBIT(u) (((u)->ui[DUK_DBL_IDX_UI0] >> 31U))
 #endif
 
-#endif  /* DUK_DBLUNION_H_INCLUDED */
+#endif /* DUK_DBLUNION_H_INCLUDED */
+/* #include duk_fltunion.h */
+/*
+ *  Union to access IEEE float memory representation.
+ */
+
+#if !defined(DUK_FLTUNION_H_INCLUDED)
+#define DUK_FLTUNION_H_INCLUDED
+
+/* #include duk_internal.h -> already included */
+
+union duk_float_union {
+	float f;
+	duk_uint32_t ui[1];
+	duk_uint16_t us[2];
+	duk_uint8_t uc[4];
+};
+
+typedef union duk_float_union duk_float_union;
+
+#if defined(DUK_USE_DOUBLE_LE) || defined(DUK_USE_DOUBLE_ME)
+#define DUK_FLT_IDX_UI0 0
+#define DUK_FLT_IDX_US0 1
+#define DUK_FLT_IDX_US1 0
+#define DUK_FLT_IDX_UC0 3
+#define DUK_FLT_IDX_UC1 2
+#define DUK_FLT_IDX_UC2 1
+#define DUK_FLT_IDX_UC3 0
+#elif defined(DUK_USE_DOUBLE_BE)
+#define DUK_FLT_IDX_UI0 0
+#define DUK_FLT_IDX_US0 0
+#define DUK_FLT_IDX_US1 1
+#define DUK_FLT_IDX_UC0 0
+#define DUK_FLT_IDX_UC1 1
+#define DUK_FLT_IDX_UC2 2
+#define DUK_FLT_IDX_UC3 3
+#else
+#error internal error
+#endif
+
+#endif /* DUK_FLTUNION_H_INCLUDED */
 /* #include duk_replacements.h */
 #if !defined(DUK_REPLACEMENTS_H_INCLUDED)
 #define DUK_REPLACEMENTS_H_INCLUDED
@@ -629,7 +676,7 @@ DUK_INTERNAL_DECL double duk_computed_infinity;
 #if defined(DUK_USE_COMPUTED_NAN)
 DUK_INTERNAL_DECL double duk_computed_nan;
 #endif
-#endif  /* !DUK_SINGLE_FILE */
+#endif /* !DUK_SINGLE_FILE */
 
 #if defined(DUK_USE_REPL_FPCLASSIFY)
 DUK_INTERNAL_DECL int duk_repl_fpclassify(double x);
@@ -647,7 +694,7 @@ DUK_INTERNAL_DECL int duk_repl_isnan(double x);
 DUK_INTERNAL_DECL int duk_repl_isinf(double x);
 #endif
 
-#endif  /* DUK_REPLACEMENTS_H_INCLUDED */
+#endif /* DUK_REPLACEMENTS_H_INCLUDED */
 /* #include duk_jmpbuf.h */
 /*
  *  Wrapper for jmp_buf.
@@ -664,7 +711,7 @@ DUK_INTERNAL_DECL int duk_repl_isinf(double x);
 
 #if defined(DUK_USE_CPP_EXCEPTIONS)
 struct duk_jmpbuf {
-	duk_small_int_t dummy;  /* unused */
+	duk_small_int_t dummy; /* unused */
 };
 #else
 struct duk_jmpbuf {
@@ -672,7 +719,7 @@ struct duk_jmpbuf {
 };
 #endif
 
-#endif  /* DUK_JMPBUF_H_INCLUDED */
+#endif /* DUK_JMPBUF_H_INCLUDED */
 /* #include duk_exception.h */
 /*
  *  Exceptions for Duktape internal throws when C++ exceptions are used
@@ -698,12 +745,13 @@ class duk_internal_exception {
  * aware of the "unsafe to continue" semantics.
  */
 class duk_fatal_exception : public virtual std::runtime_error {
- public:
-	duk_fatal_exception(const char *message) : std::runtime_error(message) {}
+      public:
+	duk_fatal_exception(const char *message) : std::runtime_error(message) {
+	}
 };
 #endif
 
-#endif  /* DUK_EXCEPTION_H_INCLUDED */
+#endif /* DUK_EXCEPTION_H_INCLUDED */
 /* #include duk_forwdecl.h */
 /*
  *  Forward declarations for all Duktape structures.
@@ -838,7 +886,7 @@ typedef struct duk_compiler_ctx duk_compiler_ctx;
 typedef struct duk_re_matcher_ctx duk_re_matcher_ctx;
 typedef struct duk_re_compiler_ctx duk_re_compiler_ctx;
 
-#endif  /* DUK_FORWDECL_H_INCLUDED */
+#endif /* DUK_FORWDECL_H_INCLUDED */
 /* #include duk_tval.h */
 /*
  *  Tagged type definition (duk_tval) and accessor macros.
@@ -883,30 +931,29 @@ typedef struct {
 } duk_tval_unused;
 
 /* tags */
-#define DUK_TAG_NORMALIZED_NAN    0x7ff8UL   /* the NaN variant we use */
+#define DUK_TAG_NORMALIZED_NAN 0x7ff8UL /* the NaN variant we use */
 /* avoid tag 0xfff0, no risk of confusion with negative infinity */
-#define DUK_TAG_MIN               0xfff1UL
+#define DUK_TAG_MIN            0xfff1UL
 #if defined(DUK_USE_FASTINT)
-#define DUK_TAG_FASTINT           0xfff1UL   /* embed: integer value */
+#define DUK_TAG_FASTINT 0xfff1UL /* embed: integer value */
 #endif
-#define DUK_TAG_UNUSED            0xfff2UL   /* marker; not actual tagged value */
-#define DUK_TAG_UNDEFINED         0xfff3UL   /* embed: nothing */
-#define DUK_TAG_NULL              0xfff4UL   /* embed: nothing */
-#define DUK_TAG_BOOLEAN           0xfff5UL   /* embed: 0 or 1 (false or true) */
+#define DUK_TAG_UNUSED    0xfff2UL /* marker; not actual tagged value */
+#define DUK_TAG_UNDEFINED 0xfff3UL /* embed: nothing */
+#define DUK_TAG_NULL      0xfff4UL /* embed: nothing */
+#define DUK_TAG_BOOLEAN   0xfff5UL /* embed: 0 or 1 (false or true) */
 /* DUK_TAG_NUMBER would logically go here, but it has multiple 'tags' */
-#define DUK_TAG_POINTER           0xfff6UL   /* embed: void ptr */
-#define DUK_TAG_LIGHTFUNC         0xfff7UL   /* embed: func ptr */
-#define DUK_TAG_STRING            0xfff8UL   /* embed: duk_hstring ptr */
-#define DUK_TAG_OBJECT            0xfff9UL   /* embed: duk_hobject ptr */
-#define DUK_TAG_BUFFER            0xfffaUL   /* embed: duk_hbuffer ptr */
-#define DUK_TAG_MAX               0xfffaUL
+#define DUK_TAG_POINTER   0xfff6UL /* embed: void ptr */
+#define DUK_TAG_LIGHTFUNC 0xfff7UL /* embed: func ptr */
+#define DUK_TAG_STRING    0xfff8UL /* embed: duk_hstring ptr */
+#define DUK_TAG_OBJECT    0xfff9UL /* embed: duk_hobject ptr */
+#define DUK_TAG_BUFFER    0xfffaUL /* embed: duk_hbuffer ptr */
+#define DUK_TAG_MAX       0xfffaUL
 
 /* for convenience */
-#define DUK_XTAG_BOOLEAN_FALSE    0xfff50000UL
-#define DUK_XTAG_BOOLEAN_TRUE     0xfff50001UL
+#define DUK_XTAG_BOOLEAN_FALSE 0xfff50000UL
+#define DUK_XTAG_BOOLEAN_TRUE  0xfff50001UL
 
-#define DUK_TVAL_IS_VALID_TAG(tv) \
-	(DUK_TVAL_GET_TAG((tv)) - DUK_TAG_MIN <= DUK_TAG_MAX - DUK_TAG_MIN)
+#define DUK_TVAL_IS_VALID_TAG(tv) (DUK_TVAL_GET_TAG((tv)) - DUK_TAG_MIN <= DUK_TAG_MAX - DUK_TAG_MIN)
 
 /* DUK_TVAL_UNUSED initializer for duk_tval_unused, works for any endianness. */
 #define DUK_TVAL_UNUSED_INITIALIZER() \
@@ -915,116 +962,136 @@ typedef struct {
 /* two casts to avoid gcc warning: "warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]" */
 #if defined(DUK_USE_64BIT_OPS)
 #if defined(DUK_USE_DOUBLE_ME)
-#define DUK__TVAL_SET_TAGGEDPOINTER(tv,h,tag)  do { \
+#define DUK__TVAL_SET_TAGGEDPOINTER(tv, h, tag) \
+	do { \
 		(tv)->ull[DUK_DBL_IDX_ULL0] = (((duk_uint64_t) (tag)) << 16) | (((duk_uint64_t) (duk_uint32_t) (h)) << 32); \
 	} while (0)
 #else
-#define DUK__TVAL_SET_TAGGEDPOINTER(tv,h,tag)  do { \
+#define DUK__TVAL_SET_TAGGEDPOINTER(tv, h, tag) \
+	do { \
 		(tv)->ull[DUK_DBL_IDX_ULL0] = (((duk_uint64_t) (tag)) << 48) | ((duk_uint64_t) (duk_uint32_t) (h)); \
 	} while (0)
 #endif
-#else  /* DUK_USE_64BIT_OPS */
-#define DUK__TVAL_SET_TAGGEDPOINTER(tv,h,tag)  do { \
+#else /* DUK_USE_64BIT_OPS */
+#define DUK__TVAL_SET_TAGGEDPOINTER(tv, h, tag) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
 		duk__tv->ui[DUK_DBL_IDX_UI0] = ((duk_uint32_t) (tag)) << 16; \
 		duk__tv->ui[DUK_DBL_IDX_UI1] = (duk_uint32_t) (h); \
 	} while (0)
-#endif  /* DUK_USE_64BIT_OPS */
+#endif /* DUK_USE_64BIT_OPS */
 
 #if defined(DUK_USE_64BIT_OPS)
 /* Double casting for pointer to avoid gcc warning (cast from pointer to integer of different size) */
 #if defined(DUK_USE_DOUBLE_ME)
-#define DUK__TVAL_SET_LIGHTFUNC(tv,fp,flags)  do { \
-		(tv)->ull[DUK_DBL_IDX_ULL0] = (((duk_uint64_t) DUK_TAG_LIGHTFUNC) << 16) | \
-		                              ((duk_uint64_t) (flags)) | \
+#define DUK__TVAL_SET_LIGHTFUNC(tv, fp, flags) \
+	do { \
+		(tv)->ull[DUK_DBL_IDX_ULL0] = (((duk_uint64_t) DUK_TAG_LIGHTFUNC) << 16) | ((duk_uint64_t) (flags)) | \
 		                              (((duk_uint64_t) (duk_uint32_t) (fp)) << 32); \
 	} while (0)
 #else
-#define DUK__TVAL_SET_LIGHTFUNC(tv,fp,flags)  do { \
-		(tv)->ull[DUK_DBL_IDX_ULL0] = (((duk_uint64_t) DUK_TAG_LIGHTFUNC) << 48) | \
-		                              (((duk_uint64_t) (flags)) << 32) | \
+#define DUK__TVAL_SET_LIGHTFUNC(tv, fp, flags) \
+	do { \
+		(tv)->ull[DUK_DBL_IDX_ULL0] = (((duk_uint64_t) DUK_TAG_LIGHTFUNC) << 48) | (((duk_uint64_t) (flags)) << 32) | \
 		                              ((duk_uint64_t) (duk_uint32_t) (fp)); \
 	} while (0)
 #endif
-#else  /* DUK_USE_64BIT_OPS */
-#define DUK__TVAL_SET_LIGHTFUNC(tv,fp,flags)  do { \
+#else /* DUK_USE_64BIT_OPS */
+#define DUK__TVAL_SET_LIGHTFUNC(tv, fp, flags) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
 		duk__tv->ui[DUK_DBL_IDX_UI0] = (((duk_uint32_t) DUK_TAG_LIGHTFUNC) << 16) | ((duk_uint32_t) (flags)); \
 		duk__tv->ui[DUK_DBL_IDX_UI1] = (duk_uint32_t) (fp); \
 	} while (0)
-#endif  /* DUK_USE_64BIT_OPS */
+#endif /* DUK_USE_64BIT_OPS */
 
 #if defined(DUK_USE_FASTINT)
 /* Note: masking is done for 'i' to deal with negative numbers correctly */
 #if defined(DUK_USE_DOUBLE_ME)
-#define DUK__TVAL_SET_I48(tv,i)  do { \
+#define DUK__TVAL_SET_I48(tv, i) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
-		duk__tv->ui[DUK_DBL_IDX_UI0] = ((duk_uint32_t) DUK_TAG_FASTINT) << 16 | (((duk_uint32_t) ((i) >> 32)) & 0x0000ffffUL); \
+		duk__tv->ui[DUK_DBL_IDX_UI0] = \
+		    ((duk_uint32_t) DUK_TAG_FASTINT) << 16 | (((duk_uint32_t) ((i) >> 32)) & 0x0000ffffUL); \
 		duk__tv->ui[DUK_DBL_IDX_UI1] = (duk_uint32_t) (i); \
 	} while (0)
-#define DUK__TVAL_SET_U32(tv,i)  do { \
+#define DUK__TVAL_SET_U32(tv, i) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
 		duk__tv->ui[DUK_DBL_IDX_UI0] = ((duk_uint32_t) DUK_TAG_FASTINT) << 16; \
 		duk__tv->ui[DUK_DBL_IDX_UI1] = (duk_uint32_t) (i); \
 	} while (0)
 #else
-#define DUK__TVAL_SET_I48(tv,i)  do { \
-		(tv)->ull[DUK_DBL_IDX_ULL0] = (((duk_uint64_t) DUK_TAG_FASTINT) << 48) | (((duk_uint64_t) (i)) & DUK_U64_CONSTANT(0x0000ffffffffffff)); \
+#define DUK__TVAL_SET_I48(tv, i) \
+	do { \
+		(tv)->ull[DUK_DBL_IDX_ULL0] = \
+		    (((duk_uint64_t) DUK_TAG_FASTINT) << 48) | (((duk_uint64_t) (i)) & DUK_U64_CONSTANT(0x0000ffffffffffff)); \
 	} while (0)
-#define DUK__TVAL_SET_U32(tv,i)  do { \
+#define DUK__TVAL_SET_U32(tv, i) \
+	do { \
 		(tv)->ull[DUK_DBL_IDX_ULL0] = (((duk_uint64_t) DUK_TAG_FASTINT) << 48) | (duk_uint64_t) (i); \
 	} while (0)
 #endif
 
 /* This needs to go through a cast because sign extension is needed. */
-#define DUK__TVAL_SET_I32(tv,i)  do { \
+#define DUK__TVAL_SET_I32(tv, i) \
+	do { \
 		duk_int64_t duk__tmp = (duk_int64_t) (i); \
 		DUK_TVAL_SET_I48((tv), duk__tmp); \
 	} while (0)
 
 /* XXX: Clumsy sign extend and masking of 16 topmost bits. */
 #if defined(DUK_USE_DOUBLE_ME)
-#define DUK__TVAL_GET_FASTINT(tv)      (((duk_int64_t) ((((duk_uint64_t) (tv)->ui[DUK_DBL_IDX_UI0]) << 32) | ((duk_uint64_t) (tv)->ui[DUK_DBL_IDX_UI1]))) << 16 >> 16)
+#define DUK__TVAL_GET_FASTINT(tv) \
+	(((duk_int64_t) ((((duk_uint64_t) (tv)->ui[DUK_DBL_IDX_UI0]) << 32) | ((duk_uint64_t) (tv)->ui[DUK_DBL_IDX_UI1]))) \
+	     << 16 >> \
+	 16)
 #else
-#define DUK__TVAL_GET_FASTINT(tv)      ((((duk_int64_t) (tv)->ull[DUK_DBL_IDX_ULL0]) << 16) >> 16)
+#define DUK__TVAL_GET_FASTINT(tv) ((((duk_int64_t) (tv)->ull[DUK_DBL_IDX_ULL0]) << 16) >> 16)
 #endif
-#define DUK__TVAL_GET_FASTINT_U32(tv)  ((tv)->ui[DUK_DBL_IDX_UI1])
-#define DUK__TVAL_GET_FASTINT_I32(tv)  ((duk_int32_t) (tv)->ui[DUK_DBL_IDX_UI1])
-#endif  /* DUK_USE_FASTINT */
+#define DUK__TVAL_GET_FASTINT_U32(tv) ((tv)->ui[DUK_DBL_IDX_UI1])
+#define DUK__TVAL_GET_FASTINT_I32(tv) ((duk_int32_t) (tv)->ui[DUK_DBL_IDX_UI1])
+#endif /* DUK_USE_FASTINT */
 
-#define DUK_TVAL_SET_UNDEFINED(tv)  do { \
+#define DUK_TVAL_SET_UNDEFINED(tv) \
+	do { \
 		(tv)->us[DUK_DBL_IDX_US0] = (duk_uint16_t) DUK_TAG_UNDEFINED; \
 	} while (0)
-#define DUK_TVAL_SET_UNUSED(tv)  do { \
+#define DUK_TVAL_SET_UNUSED(tv) \
+	do { \
 		(tv)->us[DUK_DBL_IDX_US0] = (duk_uint16_t) DUK_TAG_UNUSED; \
 	} while (0)
-#define DUK_TVAL_SET_NULL(tv)  do { \
+#define DUK_TVAL_SET_NULL(tv) \
+	do { \
 		(tv)->us[DUK_DBL_IDX_US0] = (duk_uint16_t) DUK_TAG_NULL; \
 	} while (0)
 
-#define DUK_TVAL_SET_BOOLEAN(tv,val)         DUK_DBLUNION_SET_HIGH32((tv), (((duk_uint32_t) DUK_TAG_BOOLEAN) << 16) | ((duk_uint32_t) (val)))
+#define DUK_TVAL_SET_BOOLEAN(tv, val) \
+	DUK_DBLUNION_SET_HIGH32((tv), (((duk_uint32_t) DUK_TAG_BOOLEAN) << 16) | ((duk_uint32_t) (val)))
 
-#define DUK_TVAL_SET_NAN(tv)                 DUK_DBLUNION_SET_NAN_FULL((tv))
+#define DUK_TVAL_SET_NAN(tv) DUK_DBLUNION_SET_NAN_FULL((tv))
 
 /* Assumes that caller has normalized NaNs, otherwise trouble ahead. */
 #if defined(DUK_USE_FASTINT)
-#define DUK_TVAL_SET_DOUBLE(tv,d)  do { \
+#define DUK_TVAL_SET_DOUBLE(tv, d) \
+	do { \
 		duk_double_t duk__dblval; \
 		duk__dblval = (d); \
 		DUK_ASSERT_DOUBLE_IS_NORMALIZED(duk__dblval); \
 		DUK_DBLUNION_SET_DOUBLE((tv), duk__dblval); \
 	} while (0)
-#define DUK_TVAL_SET_I48(tv,i)               DUK__TVAL_SET_I48((tv), (i))
-#define DUK_TVAL_SET_I32(tv,i)               DUK__TVAL_SET_I32((tv), (i))
-#define DUK_TVAL_SET_U32(tv,i)               DUK__TVAL_SET_U32((tv), (i))
-#define DUK_TVAL_SET_NUMBER_CHKFAST_FAST(tv,d)  duk_tval_set_number_chkfast_fast((tv), (d))
-#define DUK_TVAL_SET_NUMBER_CHKFAST_SLOW(tv,d)  duk_tval_set_number_chkfast_slow((tv), (d))
-#define DUK_TVAL_SET_NUMBER(tv,d)            DUK_TVAL_SET_DOUBLE((tv), (d))
-#define DUK_TVAL_CHKFAST_INPLACE_FAST(tv)  do { \
+#define DUK_TVAL_SET_I48(tv, i)                 DUK__TVAL_SET_I48((tv), (i))
+#define DUK_TVAL_SET_I32(tv, i)                 DUK__TVAL_SET_I32((tv), (i))
+#define DUK_TVAL_SET_U32(tv, i)                 DUK__TVAL_SET_U32((tv), (i))
+#define DUK_TVAL_SET_NUMBER_CHKFAST_FAST(tv, d) duk_tval_set_number_chkfast_fast((tv), (d))
+#define DUK_TVAL_SET_NUMBER_CHKFAST_SLOW(tv, d) duk_tval_set_number_chkfast_slow((tv), (d))
+#define DUK_TVAL_SET_NUMBER(tv, d)              DUK_TVAL_SET_DOUBLE((tv), (d))
+#define DUK_TVAL_CHKFAST_INPLACE_FAST(tv) \
+	do { \
 		duk_tval *duk__tv; \
 		duk_double_t duk__d; \
 		duk__tv = (tv); \
@@ -1033,7 +1100,8 @@ typedef struct {
 			DUK_TVAL_SET_NUMBER_CHKFAST_FAST(duk__tv, duk__d); \
 		} \
 	} while (0)
-#define DUK_TVAL_CHKFAST_INPLACE_SLOW(tv)  do { \
+#define DUK_TVAL_CHKFAST_INPLACE_SLOW(tv) \
+	do { \
 		duk_tval *duk__tv; \
 		duk_double_t duk__d; \
 		duk__tv = (tv); \
@@ -1042,89 +1110,98 @@ typedef struct {
 			DUK_TVAL_SET_NUMBER_CHKFAST_SLOW(duk__tv, duk__d); \
 		} \
 	} while (0)
-#else  /* DUK_USE_FASTINT */
-#define DUK_TVAL_SET_DOUBLE(tv,d)  do { \
+#else /* DUK_USE_FASTINT */
+#define DUK_TVAL_SET_DOUBLE(tv, d) \
+	do { \
 		duk_double_t duk__dblval; \
 		duk__dblval = (d); \
 		DUK_ASSERT_DOUBLE_IS_NORMALIZED(duk__dblval); \
 		DUK_DBLUNION_SET_DOUBLE((tv), duk__dblval); \
 	} while (0)
-#define DUK_TVAL_SET_I48(tv,i)               DUK_TVAL_SET_DOUBLE((tv), (duk_double_t) (i))  /* XXX: fast int-to-double */
-#define DUK_TVAL_SET_I32(tv,i)               DUK_TVAL_SET_DOUBLE((tv), (duk_double_t) (i))
-#define DUK_TVAL_SET_U32(tv,i)               DUK_TVAL_SET_DOUBLE((tv), (duk_double_t) (i))
-#define DUK_TVAL_SET_NUMBER_CHKFAST_FAST(tv,d)    DUK_TVAL_SET_DOUBLE((tv), (d))
-#define DUK_TVAL_SET_NUMBER_CHKFAST_SLOW(tv,d)    DUK_TVAL_SET_DOUBLE((tv), (d))
-#define DUK_TVAL_SET_NUMBER(tv,d)            DUK_TVAL_SET_DOUBLE((tv), (d))
-#define DUK_TVAL_CHKFAST_INPLACE_FAST(tv)  do { } while (0)
-#define DUK_TVAL_CHKFAST_INPLACE_SLOW(tv)  do { } while (0)
-#endif  /* DUK_USE_FASTINT */
-
-#define DUK_TVAL_SET_FASTINT(tv,i)           DUK_TVAL_SET_I48((tv), (i))  /* alias */
-
-#define DUK_TVAL_SET_LIGHTFUNC(tv,fp,flags)  DUK__TVAL_SET_LIGHTFUNC((tv), (fp), (flags))
-#define DUK_TVAL_SET_STRING(tv,h)            DUK__TVAL_SET_TAGGEDPOINTER((tv), (h), DUK_TAG_STRING)
-#define DUK_TVAL_SET_OBJECT(tv,h)            DUK__TVAL_SET_TAGGEDPOINTER((tv), (h), DUK_TAG_OBJECT)
-#define DUK_TVAL_SET_BUFFER(tv,h)            DUK__TVAL_SET_TAGGEDPOINTER((tv), (h), DUK_TAG_BUFFER)
-#define DUK_TVAL_SET_POINTER(tv,p)           DUK__TVAL_SET_TAGGEDPOINTER((tv), (p), DUK_TAG_POINTER)
-
-#define DUK_TVAL_SET_TVAL(tv,x)              do { *(tv) = *(x); } while (0)
+#define DUK_TVAL_SET_I48(tv, i)                 DUK_TVAL_SET_DOUBLE((tv), (duk_double_t) (i)) /* XXX: fast int-to-double */
+#define DUK_TVAL_SET_I32(tv, i)                 DUK_TVAL_SET_DOUBLE((tv), (duk_double_t) (i))
+#define DUK_TVAL_SET_U32(tv, i)                 DUK_TVAL_SET_DOUBLE((tv), (duk_double_t) (i))
+#define DUK_TVAL_SET_NUMBER_CHKFAST_FAST(tv, d) DUK_TVAL_SET_DOUBLE((tv), (d))
+#define DUK_TVAL_SET_NUMBER_CHKFAST_SLOW(tv, d) DUK_TVAL_SET_DOUBLE((tv), (d))
+#define DUK_TVAL_SET_NUMBER(tv, d)              DUK_TVAL_SET_DOUBLE((tv), (d))
+#define DUK_TVAL_CHKFAST_INPLACE_FAST(tv) \
+	do { \
+	} while (0)
+#define DUK_TVAL_CHKFAST_INPLACE_SLOW(tv) \
+	do { \
+	} while (0)
+#endif /* DUK_USE_FASTINT */
+
+#define DUK_TVAL_SET_FASTINT(tv, i) DUK_TVAL_SET_I48((tv), (i)) /* alias */
+
+#define DUK_TVAL_SET_LIGHTFUNC(tv, fp, flags) DUK__TVAL_SET_LIGHTFUNC((tv), (fp), (flags))
+#define DUK_TVAL_SET_STRING(tv, h)            DUK__TVAL_SET_TAGGEDPOINTER((tv), (h), DUK_TAG_STRING)
+#define DUK_TVAL_SET_OBJECT(tv, h)            DUK__TVAL_SET_TAGGEDPOINTER((tv), (h), DUK_TAG_OBJECT)
+#define DUK_TVAL_SET_BUFFER(tv, h)            DUK__TVAL_SET_TAGGEDPOINTER((tv), (h), DUK_TAG_BUFFER)
+#define DUK_TVAL_SET_POINTER(tv, p)           DUK__TVAL_SET_TAGGEDPOINTER((tv), (p), DUK_TAG_POINTER)
+
+#define DUK_TVAL_SET_TVAL(tv, x) \
+	do { \
+		*(tv) = *(x); \
+	} while (0)
 
 /* getters */
-#define DUK_TVAL_GET_BOOLEAN(tv)             ((duk_small_uint_t) (tv)->us[DUK_DBL_IDX_US1])
+#define DUK_TVAL_GET_BOOLEAN(tv) ((duk_small_uint_t) (tv)->us[DUK_DBL_IDX_US1])
 #if defined(DUK_USE_FASTINT)
-#define DUK_TVAL_GET_DOUBLE(tv)              ((tv)->d)
-#define DUK_TVAL_GET_FASTINT(tv)             DUK__TVAL_GET_FASTINT((tv))
-#define DUK_TVAL_GET_FASTINT_U32(tv)         DUK__TVAL_GET_FASTINT_U32((tv))
-#define DUK_TVAL_GET_FASTINT_I32(tv)         DUK__TVAL_GET_FASTINT_I32((tv))
-#define DUK_TVAL_GET_NUMBER(tv)              duk_tval_get_number_packed((tv))
+#define DUK_TVAL_GET_DOUBLE(tv)      ((tv)->d)
+#define DUK_TVAL_GET_FASTINT(tv)     DUK__TVAL_GET_FASTINT((tv))
+#define DUK_TVAL_GET_FASTINT_U32(tv) DUK__TVAL_GET_FASTINT_U32((tv))
+#define DUK_TVAL_GET_FASTINT_I32(tv) DUK__TVAL_GET_FASTINT_I32((tv))
+#define DUK_TVAL_GET_NUMBER(tv)      duk_tval_get_number_packed((tv))
 #else
-#define DUK_TVAL_GET_NUMBER(tv)              ((tv)->d)
-#define DUK_TVAL_GET_DOUBLE(tv)              ((tv)->d)
+#define DUK_TVAL_GET_NUMBER(tv) ((tv)->d)
+#define DUK_TVAL_GET_DOUBLE(tv) ((tv)->d)
 #endif
-#define DUK_TVAL_GET_LIGHTFUNC(tv,out_fp,out_flags)  do { \
+#define DUK_TVAL_GET_LIGHTFUNC(tv, out_fp, out_flags) \
+	do { \
 		(out_flags) = (tv)->ui[DUK_DBL_IDX_UI0] & 0xffffUL; \
 		(out_fp) = (duk_c_function) (tv)->ui[DUK_DBL_IDX_UI1]; \
 	} while (0)
-#define DUK_TVAL_GET_LIGHTFUNC_FUNCPTR(tv)   ((duk_c_function) ((tv)->ui[DUK_DBL_IDX_UI1]))
-#define DUK_TVAL_GET_LIGHTFUNC_FLAGS(tv)     (((duk_small_uint_t) (tv)->ui[DUK_DBL_IDX_UI0]) & 0xffffUL)
-#define DUK_TVAL_GET_STRING(tv)              ((duk_hstring *) (tv)->vp[DUK_DBL_IDX_VP1])
-#define DUK_TVAL_GET_OBJECT(tv)              ((duk_hobject *) (tv)->vp[DUK_DBL_IDX_VP1])
-#define DUK_TVAL_GET_BUFFER(tv)              ((duk_hbuffer *) (tv)->vp[DUK_DBL_IDX_VP1])
-#define DUK_TVAL_GET_POINTER(tv)             ((void *) (tv)->vp[DUK_DBL_IDX_VP1])
-#define DUK_TVAL_GET_HEAPHDR(tv)             ((duk_heaphdr *) (tv)->vp[DUK_DBL_IDX_VP1])
+#define DUK_TVAL_GET_LIGHTFUNC_FUNCPTR(tv) ((duk_c_function) ((tv)->ui[DUK_DBL_IDX_UI1]))
+#define DUK_TVAL_GET_LIGHTFUNC_FLAGS(tv)   (((duk_small_uint_t) (tv)->ui[DUK_DBL_IDX_UI0]) & 0xffffUL)
+#define DUK_TVAL_GET_STRING(tv)            ((duk_hstring *) (tv)->vp[DUK_DBL_IDX_VP1])
+#define DUK_TVAL_GET_OBJECT(tv)            ((duk_hobject *) (tv)->vp[DUK_DBL_IDX_VP1])
+#define DUK_TVAL_GET_BUFFER(tv)            ((duk_hbuffer *) (tv)->vp[DUK_DBL_IDX_VP1])
+#define DUK_TVAL_GET_POINTER(tv)           ((void *) (tv)->vp[DUK_DBL_IDX_VP1])
+#define DUK_TVAL_GET_HEAPHDR(tv)           ((duk_heaphdr *) (tv)->vp[DUK_DBL_IDX_VP1])
 
 /* decoding */
-#define DUK_TVAL_GET_TAG(tv)                 ((duk_small_uint_t) (tv)->us[DUK_DBL_IDX_US0])
-
-#define DUK_TVAL_IS_UNDEFINED(tv)            (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_UNDEFINED)
-#define DUK_TVAL_IS_UNUSED(tv)               (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_UNUSED)
-#define DUK_TVAL_IS_NULL(tv)                 (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_NULL)
-#define DUK_TVAL_IS_BOOLEAN(tv)              (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_BOOLEAN)
-#define DUK_TVAL_IS_BOOLEAN_TRUE(tv)         ((tv)->ui[DUK_DBL_IDX_UI0] == DUK_XTAG_BOOLEAN_TRUE)
-#define DUK_TVAL_IS_BOOLEAN_FALSE(tv)        ((tv)->ui[DUK_DBL_IDX_UI0] == DUK_XTAG_BOOLEAN_FALSE)
-#define DUK_TVAL_IS_LIGHTFUNC(tv)            (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_LIGHTFUNC)
-#define DUK_TVAL_IS_STRING(tv)               (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_STRING)
-#define DUK_TVAL_IS_OBJECT(tv)               (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_OBJECT)
-#define DUK_TVAL_IS_BUFFER(tv)               (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_BUFFER)
-#define DUK_TVAL_IS_POINTER(tv)              (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_POINTER)
+#define DUK_TVAL_GET_TAG(tv) ((duk_small_uint_t) (tv)->us[DUK_DBL_IDX_US0])
+
+#define DUK_TVAL_IS_UNDEFINED(tv)     (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_UNDEFINED)
+#define DUK_TVAL_IS_UNUSED(tv)        (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_UNUSED)
+#define DUK_TVAL_IS_NULL(tv)          (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_NULL)
+#define DUK_TVAL_IS_BOOLEAN(tv)       (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_BOOLEAN)
+#define DUK_TVAL_IS_BOOLEAN_TRUE(tv)  ((tv)->ui[DUK_DBL_IDX_UI0] == DUK_XTAG_BOOLEAN_TRUE)
+#define DUK_TVAL_IS_BOOLEAN_FALSE(tv) ((tv)->ui[DUK_DBL_IDX_UI0] == DUK_XTAG_BOOLEAN_FALSE)
+#define DUK_TVAL_IS_LIGHTFUNC(tv)     (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_LIGHTFUNC)
+#define DUK_TVAL_IS_STRING(tv)        (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_STRING)
+#define DUK_TVAL_IS_OBJECT(tv)        (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_OBJECT)
+#define DUK_TVAL_IS_BUFFER(tv)        (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_BUFFER)
+#define DUK_TVAL_IS_POINTER(tv)       (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_POINTER)
 #if defined(DUK_USE_FASTINT)
 /* 0xfff0 is -Infinity */
-#define DUK_TVAL_IS_DOUBLE(tv)               (DUK_TVAL_GET_TAG((tv)) <= 0xfff0UL)
-#define DUK_TVAL_IS_FASTINT(tv)              (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_FASTINT)
-#define DUK_TVAL_IS_NUMBER(tv)               (DUK_TVAL_GET_TAG((tv)) <= 0xfff1UL)
+#define DUK_TVAL_IS_DOUBLE(tv)  (DUK_TVAL_GET_TAG((tv)) <= 0xfff0UL)
+#define DUK_TVAL_IS_FASTINT(tv) (DUK_TVAL_GET_TAG((tv)) == DUK_TAG_FASTINT)
+#define DUK_TVAL_IS_NUMBER(tv)  (DUK_TVAL_GET_TAG((tv)) <= 0xfff1UL)
 #else
-#define DUK_TVAL_IS_NUMBER(tv)               (DUK_TVAL_GET_TAG((tv)) <= 0xfff0UL)
-#define DUK_TVAL_IS_DOUBLE(tv)               DUK_TVAL_IS_NUMBER((tv))
+#define DUK_TVAL_IS_NUMBER(tv) (DUK_TVAL_GET_TAG((tv)) <= 0xfff0UL)
+#define DUK_TVAL_IS_DOUBLE(tv) DUK_TVAL_IS_NUMBER((tv))
 #endif
 
 /* This is performance critical because it appears in every DECREF. */
-#define DUK_TVAL_IS_HEAP_ALLOCATED(tv)       (DUK_TVAL_GET_TAG((tv)) >= DUK_TAG_STRING)
+#define DUK_TVAL_IS_HEAP_ALLOCATED(tv) (DUK_TVAL_GET_TAG((tv)) >= DUK_TAG_STRING)
 
 #if defined(DUK_USE_FASTINT)
 DUK_INTERNAL_DECL duk_double_t duk_tval_get_number_packed(duk_tval *tv);
 #endif
 
-#else  /* DUK_USE_PACKED_TVAL */
+#else /* DUK_USE_PACKED_TVAL */
 /* ======================================================================== */
 
 /*
@@ -1148,7 +1225,7 @@ struct duk_tval_struct {
 		duk_double_t d;
 		duk_small_int_t i;
 #if defined(DUK_USE_FASTINT)
-		duk_int64_t fi;  /* if present, forces 16-byte duk_tval */
+		duk_int64_t fi; /* if present, forces 16-byte duk_tval */
 #endif
 		void *voidptr;
 		duk_hstring *hstring;
@@ -1176,24 +1253,23 @@ typedef struct {
 #define DUK_TVAL_UNUSED_INITIALIZER() \
 	{ DUK_TAG_UNUSED, 0, 0.0 }
 
-#define DUK_TAG_MIN                   0
-#define DUK_TAG_NUMBER                0  /* DUK_TAG_NUMBER only defined for non-packed duk_tval */
+#define DUK_TAG_MIN    0
+#define DUK_TAG_NUMBER 0 /* DUK_TAG_NUMBER only defined for non-packed duk_tval */
 #if defined(DUK_USE_FASTINT)
-#define DUK_TAG_FASTINT               1
-#endif
-#define DUK_TAG_UNDEFINED             2
-#define DUK_TAG_NULL                  3
-#define DUK_TAG_BOOLEAN               4
-#define DUK_TAG_POINTER               5
-#define DUK_TAG_LIGHTFUNC             6
-#define DUK_TAG_UNUSED                7  /* marker; not actual tagged type */
-#define DUK_TAG_STRING                8  /* first heap allocated, match bit boundary */
-#define DUK_TAG_OBJECT                9
-#define DUK_TAG_BUFFER                10
-#define DUK_TAG_MAX                   10
-
-#define DUK_TVAL_IS_VALID_TAG(tv) \
-	(DUK_TVAL_GET_TAG((tv)) - DUK_TAG_MIN <= DUK_TAG_MAX - DUK_TAG_MIN)
+#define DUK_TAG_FASTINT 1
+#endif
+#define DUK_TAG_UNDEFINED 2
+#define DUK_TAG_NULL      3
+#define DUK_TAG_BOOLEAN   4
+#define DUK_TAG_POINTER   5
+#define DUK_TAG_LIGHTFUNC 6
+#define DUK_TAG_UNUSED    7 /* marker; not actual tagged type */
+#define DUK_TAG_STRING    8 /* first heap allocated, match bit boundary */
+#define DUK_TAG_OBJECT    9
+#define DUK_TAG_BUFFER    10
+#define DUK_TAG_MAX       10
+
+#define DUK_TVAL_IS_VALID_TAG(tv) (DUK_TVAL_GET_TAG((tv)) - DUK_TAG_MIN <= DUK_TAG_MAX - DUK_TAG_MIN)
 
 /* DUK_TAG_NUMBER is intentionally first, as it is the default clause in code
  * to support the 8-byte representation.  Further, it is a non-heap-allocated
@@ -1202,25 +1278,29 @@ typedef struct {
  */
 
 /* setters */
-#define DUK_TVAL_SET_UNDEFINED(tv)  do { \
+#define DUK_TVAL_SET_UNDEFINED(tv) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
 		duk__tv->t = DUK_TAG_UNDEFINED; \
 	} while (0)
 
-#define DUK_TVAL_SET_UNUSED(tv)  do { \
+#define DUK_TVAL_SET_UNUSED(tv) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
 		duk__tv->t = DUK_TAG_UNUSED; \
 	} while (0)
 
-#define DUK_TVAL_SET_NULL(tv)  do { \
+#define DUK_TVAL_SET_NULL(tv) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
 		duk__tv->t = DUK_TAG_NULL; \
 	} while (0)
 
-#define DUK_TVAL_SET_BOOLEAN(tv,val)  do { \
+#define DUK_TVAL_SET_BOOLEAN(tv, val) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
 		duk__tv->t = DUK_TAG_BOOLEAN; \
@@ -1228,7 +1308,8 @@ typedef struct {
 	} while (0)
 
 #if defined(DUK_USE_FASTINT)
-#define DUK_TVAL_SET_DOUBLE(tv,val)  do { \
+#define DUK_TVAL_SET_DOUBLE(tv, val) \
+	do { \
 		duk_tval *duk__tv; \
 		duk_double_t duk__dblval; \
 		duk__dblval = (val); \
@@ -1237,31 +1318,32 @@ typedef struct {
 		duk__tv->t = DUK_TAG_NUMBER; \
 		duk__tv->v.d = duk__dblval; \
 	} while (0)
-#define DUK_TVAL_SET_I48(tv,val)  do { \
+#define DUK_TVAL_SET_I48(tv, val) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
 		duk__tv->t = DUK_TAG_FASTINT; \
 		duk__tv->v.fi = (val); \
 	} while (0)
-#define DUK_TVAL_SET_U32(tv,val)  do { \
+#define DUK_TVAL_SET_U32(tv, val) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
 		duk__tv->t = DUK_TAG_FASTINT; \
 		duk__tv->v.fi = (duk_int64_t) (val); \
 	} while (0)
-#define DUK_TVAL_SET_I32(tv,val)  do { \
+#define DUK_TVAL_SET_I32(tv, val) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
 		duk__tv->t = DUK_TAG_FASTINT; \
 		duk__tv->v.fi = (duk_int64_t) (val); \
 	} while (0)
-#define DUK_TVAL_SET_NUMBER_CHKFAST_FAST(tv,d) \
-	duk_tval_set_number_chkfast_fast((tv), (d))
-#define DUK_TVAL_SET_NUMBER_CHKFAST_SLOW(tv,d) \
-	duk_tval_set_number_chkfast_slow((tv), (d))
-#define DUK_TVAL_SET_NUMBER(tv,val) \
-	DUK_TVAL_SET_DOUBLE((tv), (val))
-#define DUK_TVAL_CHKFAST_INPLACE_FAST(tv)  do { \
+#define DUK_TVAL_SET_NUMBER_CHKFAST_FAST(tv, d) duk_tval_set_number_chkfast_fast((tv), (d))
+#define DUK_TVAL_SET_NUMBER_CHKFAST_SLOW(tv, d) duk_tval_set_number_chkfast_slow((tv), (d))
+#define DUK_TVAL_SET_NUMBER(tv, val)            DUK_TVAL_SET_DOUBLE((tv), (val))
+#define DUK_TVAL_CHKFAST_INPLACE_FAST(tv) \
+	do { \
 		duk_tval *duk__tv; \
 		duk_double_t duk__d; \
 		duk__tv = (tv); \
@@ -1270,7 +1352,8 @@ typedef struct {
 			DUK_TVAL_SET_NUMBER_CHKFAST_FAST(duk__tv, duk__d); \
 		} \
 	} while (0)
-#define DUK_TVAL_CHKFAST_INPLACE_SLOW(tv)  do { \
+#define DUK_TVAL_CHKFAST_INPLACE_SLOW(tv) \
+	do { \
 		duk_tval *duk__tv; \
 		duk_double_t duk__d; \
 		duk__tv = (tv); \
@@ -1279,16 +1362,13 @@ typedef struct {
 			DUK_TVAL_SET_NUMBER_CHKFAST_SLOW(duk__tv, duk__d); \
 		} \
 	} while (0)
-#else  /* DUK_USE_FASTINT */
-#define DUK_TVAL_SET_DOUBLE(tv,d) \
-	DUK_TVAL_SET_NUMBER((tv), (d))
-#define DUK_TVAL_SET_I48(tv,val) \
-	DUK_TVAL_SET_NUMBER((tv), (duk_double_t) (val))  /* XXX: fast int-to-double */
-#define DUK_TVAL_SET_U32(tv,val) \
-	DUK_TVAL_SET_NUMBER((tv), (duk_double_t) (val))
-#define DUK_TVAL_SET_I32(tv,val) \
-	DUK_TVAL_SET_NUMBER((tv), (duk_double_t) (val))
-#define DUK_TVAL_SET_NUMBER(tv,val)  do { \
+#else /* DUK_USE_FASTINT */
+#define DUK_TVAL_SET_DOUBLE(tv, d) DUK_TVAL_SET_NUMBER((tv), (d))
+#define DUK_TVAL_SET_I48(tv, val)  DUK_TVAL_SET_NUMBER((tv), (duk_double_t) (val)) /* XXX: fast int-to-double */
+#define DUK_TVAL_SET_U32(tv, val)  DUK_TVAL_SET_NUMBER((tv), (duk_double_t) (val))
+#define DUK_TVAL_SET_I32(tv, val)  DUK_TVAL_SET_NUMBER((tv), (duk_double_t) (val))
+#define DUK_TVAL_SET_NUMBER(tv, val) \
+	do { \
 		duk_tval *duk__tv; \
 		duk_double_t duk__dblval; \
 		duk__dblval = (val); \
@@ -1297,25 +1377,28 @@ typedef struct {
 		duk__tv->t = DUK_TAG_NUMBER; \
 		duk__tv->v.d = duk__dblval; \
 	} while (0)
-#define DUK_TVAL_SET_NUMBER_CHKFAST_FAST(tv,d) \
-	DUK_TVAL_SET_NUMBER((tv), (d))
-#define DUK_TVAL_SET_NUMBER_CHKFAST_SLOW(tv,d) \
-	DUK_TVAL_SET_NUMBER((tv), (d))
-#define DUK_TVAL_CHKFAST_INPLACE_FAST(tv)  do { } while (0)
-#define DUK_TVAL_CHKFAST_INPLACE_SLOW(tv)  do { } while (0)
-#endif  /* DUK_USE_FASTINT */
-
-#define DUK_TVAL_SET_FASTINT(tv,i) \
-	DUK_TVAL_SET_I48((tv), (i))  /* alias */
-
-#define DUK_TVAL_SET_POINTER(tv,hptr)  do { \
+#define DUK_TVAL_SET_NUMBER_CHKFAST_FAST(tv, d) DUK_TVAL_SET_NUMBER((tv), (d))
+#define DUK_TVAL_SET_NUMBER_CHKFAST_SLOW(tv, d) DUK_TVAL_SET_NUMBER((tv), (d))
+#define DUK_TVAL_CHKFAST_INPLACE_FAST(tv) \
+	do { \
+	} while (0)
+#define DUK_TVAL_CHKFAST_INPLACE_SLOW(tv) \
+	do { \
+	} while (0)
+#endif /* DUK_USE_FASTINT */
+
+#define DUK_TVAL_SET_FASTINT(tv, i) DUK_TVAL_SET_I48((tv), (i)) /* alias */
+
+#define DUK_TVAL_SET_POINTER(tv, hptr) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
 		duk__tv->t = DUK_TAG_POINTER; \
 		duk__tv->v.voidptr = (hptr); \
 	} while (0)
 
-#define DUK_TVAL_SET_LIGHTFUNC(tv,fp,flags)  do { \
+#define DUK_TVAL_SET_LIGHTFUNC(tv, fp, flags) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
 		duk__tv->t = DUK_TAG_LIGHTFUNC; \
@@ -1323,28 +1406,32 @@ typedef struct {
 		duk__tv->v.lightfunc = (duk_c_function) (fp); \
 	} while (0)
 
-#define DUK_TVAL_SET_STRING(tv,hptr)  do { \
+#define DUK_TVAL_SET_STRING(tv, hptr) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
 		duk__tv->t = DUK_TAG_STRING; \
 		duk__tv->v.hstring = (hptr); \
 	} while (0)
 
-#define DUK_TVAL_SET_OBJECT(tv,hptr)  do { \
+#define DUK_TVAL_SET_OBJECT(tv, hptr) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
 		duk__tv->t = DUK_TAG_OBJECT; \
 		duk__tv->v.hobject = (hptr); \
 	} while (0)
 
-#define DUK_TVAL_SET_BUFFER(tv,hptr)  do { \
+#define DUK_TVAL_SET_BUFFER(tv, hptr) \
+	do { \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
 		duk__tv->t = DUK_TAG_BUFFER; \
 		duk__tv->v.hbuffer = (hptr); \
 	} while (0)
 
-#define DUK_TVAL_SET_NAN(tv)  do { \
+#define DUK_TVAL_SET_NAN(tv) \
+	do { \
 		/* in non-packed representation we don't care about which NaN is used */ \
 		duk_tval *duk__tv; \
 		duk__tv = (tv); \
@@ -1352,32 +1439,32 @@ typedef struct {
 		duk__tv->v.d = DUK_DOUBLE_NAN; \
 	} while (0)
 
-#define DUK_TVAL_SET_TVAL(tv,x)            do { *(tv) = *(x); } while (0)
+#define DUK_TVAL_SET_TVAL(tv, x) \
+	do { \
+		*(tv) = *(x); \
+	} while (0)
 
 /* getters */
-#define DUK_TVAL_GET_BOOLEAN(tv)           ((duk_small_uint_t) (tv)->v.i)
+#define DUK_TVAL_GET_BOOLEAN(tv) ((duk_small_uint_t) (tv)->v.i)
 #if defined(DUK_USE_FASTINT)
-#define DUK_TVAL_GET_DOUBLE(tv)            ((tv)->v.d)
-#define DUK_TVAL_GET_FASTINT(tv)           ((tv)->v.fi)
-#define DUK_TVAL_GET_FASTINT_U32(tv)       ((duk_uint32_t) ((tv)->v.fi))
-#define DUK_TVAL_GET_FASTINT_I32(tv)       ((duk_int32_t) ((tv)->v.fi))
+#define DUK_TVAL_GET_DOUBLE(tv)      ((tv)->v.d)
+#define DUK_TVAL_GET_FASTINT(tv)     ((tv)->v.fi)
+#define DUK_TVAL_GET_FASTINT_U32(tv) ((duk_uint32_t) ((tv)->v.fi))
+#define DUK_TVAL_GET_FASTINT_I32(tv) ((duk_int32_t) ((tv)->v.fi))
 #if 0
-#define DUK_TVAL_GET_NUMBER(tv)            (DUK_TVAL_IS_FASTINT((tv)) ? \
-                                               (duk_double_t) DUK_TVAL_GET_FASTINT((tv)) : \
-                                               DUK_TVAL_GET_DOUBLE((tv)))
-#define DUK_TVAL_GET_NUMBER(tv)            duk_tval_get_number_unpacked((tv))
+#define DUK_TVAL_GET_NUMBER(tv) (DUK_TVAL_IS_FASTINT((tv)) ? (duk_double_t) DUK_TVAL_GET_FASTINT((tv)) : DUK_TVAL_GET_DOUBLE((tv)))
+#define DUK_TVAL_GET_NUMBER(tv) duk_tval_get_number_unpacked((tv))
 #else
 /* This seems reasonable overall. */
-#define DUK_TVAL_GET_NUMBER(tv)            (DUK_TVAL_IS_FASTINT((tv)) ? \
-                                               duk_tval_get_number_unpacked_fastint((tv)) : \
-                                               DUK_TVAL_GET_DOUBLE((tv)))
+#define DUK_TVAL_GET_NUMBER(tv) (DUK_TVAL_IS_FASTINT((tv)) ? duk_tval_get_number_unpacked_fastint((tv)) : DUK_TVAL_GET_DOUBLE((tv)))
 #endif
 #else
-#define DUK_TVAL_GET_NUMBER(tv)            ((tv)->v.d)
-#define DUK_TVAL_GET_DOUBLE(tv)            ((tv)->v.d)
-#endif  /* DUK_USE_FASTINT */
-#define DUK_TVAL_GET_POINTER(tv)           ((tv)->v.voidptr)
-#define DUK_TVAL_GET_LIGHTFUNC(tv,out_fp,out_flags)  do { \
+#define DUK_TVAL_GET_NUMBER(tv) ((tv)->v.d)
+#define DUK_TVAL_GET_DOUBLE(tv) ((tv)->v.d)
+#endif /* DUK_USE_FASTINT */
+#define DUK_TVAL_GET_POINTER(tv) ((tv)->v.voidptr)
+#define DUK_TVAL_GET_LIGHTFUNC(tv, out_fp, out_flags) \
+	do { \
 		(out_flags) = (duk_uint32_t) (tv)->v_extra; \
 		(out_fp) = (tv)->v.lightfunc; \
 	} while (0)
@@ -1397,19 +1484,18 @@ typedef struct {
 #define DUK_TVAL_IS_BOOLEAN_TRUE(tv)       (((tv)->t == DUK_TAG_BOOLEAN) && ((tv)->v.i != 0))
 #define DUK_TVAL_IS_BOOLEAN_FALSE(tv)      (((tv)->t == DUK_TAG_BOOLEAN) && ((tv)->v.i == 0))
 #if defined(DUK_USE_FASTINT)
-#define DUK_TVAL_IS_DOUBLE(tv)             ((tv)->t == DUK_TAG_NUMBER)
-#define DUK_TVAL_IS_FASTINT(tv)            ((tv)->t == DUK_TAG_FASTINT)
-#define DUK_TVAL_IS_NUMBER(tv)             ((tv)->t == DUK_TAG_NUMBER || \
-                                            (tv)->t == DUK_TAG_FASTINT)
+#define DUK_TVAL_IS_DOUBLE(tv)  ((tv)->t == DUK_TAG_NUMBER)
+#define DUK_TVAL_IS_FASTINT(tv) ((tv)->t == DUK_TAG_FASTINT)
+#define DUK_TVAL_IS_NUMBER(tv)  ((tv)->t == DUK_TAG_NUMBER || (tv)->t == DUK_TAG_FASTINT)
 #else
-#define DUK_TVAL_IS_NUMBER(tv)             ((tv)->t == DUK_TAG_NUMBER)
-#define DUK_TVAL_IS_DOUBLE(tv)             DUK_TVAL_IS_NUMBER((tv))
-#endif  /* DUK_USE_FASTINT */
-#define DUK_TVAL_IS_POINTER(tv)            ((tv)->t == DUK_TAG_POINTER)
-#define DUK_TVAL_IS_LIGHTFUNC(tv)          ((tv)->t == DUK_TAG_LIGHTFUNC)
-#define DUK_TVAL_IS_STRING(tv)             ((tv)->t == DUK_TAG_STRING)
-#define DUK_TVAL_IS_OBJECT(tv)             ((tv)->t == DUK_TAG_OBJECT)
-#define DUK_TVAL_IS_BUFFER(tv)             ((tv)->t == DUK_TAG_BUFFER)
+#define DUK_TVAL_IS_NUMBER(tv) ((tv)->t == DUK_TAG_NUMBER)
+#define DUK_TVAL_IS_DOUBLE(tv) DUK_TVAL_IS_NUMBER((tv))
+#endif /* DUK_USE_FASTINT */
+#define DUK_TVAL_IS_POINTER(tv)   ((tv)->t == DUK_TAG_POINTER)
+#define DUK_TVAL_IS_LIGHTFUNC(tv) ((tv)->t == DUK_TAG_LIGHTFUNC)
+#define DUK_TVAL_IS_STRING(tv)    ((tv)->t == DUK_TAG_STRING)
+#define DUK_TVAL_IS_OBJECT(tv)    ((tv)->t == DUK_TAG_OBJECT)
+#define DUK_TVAL_IS_BUFFER(tv)    ((tv)->t == DUK_TAG_BUFFER)
 
 /* This is performance critical because it's needed for every DECREF.
  * Take advantage of the fact that the first heap allocated tag is 8,
@@ -1417,61 +1503,68 @@ typedef struct {
  * non-heap-allocated tags).
  */
 #if 0
-#define DUK_TVAL_IS_HEAP_ALLOCATED(tv)     ((tv)->t >= DUK_TAG_STRING)
+#define DUK_TVAL_IS_HEAP_ALLOCATED(tv) ((tv)->t >= DUK_TAG_STRING)
 #endif
-#define DUK_TVAL_IS_HEAP_ALLOCATED(tv)     ((tv)->t & 0x08)
+#define DUK_TVAL_IS_HEAP_ALLOCATED(tv) ((tv)->t & 0x08)
 
 #if defined(DUK_USE_FASTINT)
 #if 0
 DUK_INTERNAL_DECL duk_double_t duk_tval_get_number_unpacked(duk_tval *tv);
 #endif
-DUK_INTERNAL_DECL DUK_INLINE duk_double_t duk_tval_get_number_unpacked_fastint(duk_tval *tv);
+DUK_INTERNAL_DECL duk_double_t duk_tval_get_number_unpacked_fastint(duk_tval *tv);
 #endif
 
-#endif  /* DUK_USE_PACKED_TVAL */
+#endif /* DUK_USE_PACKED_TVAL */
 
 /*
  *  Convenience (independent of representation)
  */
 
-#define DUK_TVAL_SET_BOOLEAN_TRUE(tv)        DUK_TVAL_SET_BOOLEAN((tv), 1)
-#define DUK_TVAL_SET_BOOLEAN_FALSE(tv)       DUK_TVAL_SET_BOOLEAN((tv), 0)
+#define DUK_TVAL_SET_BOOLEAN_TRUE(tv)  DUK_TVAL_SET_BOOLEAN((tv), 1)
+#define DUK_TVAL_SET_BOOLEAN_FALSE(tv) DUK_TVAL_SET_BOOLEAN((tv), 0)
 
-#define DUK_TVAL_STRING_IS_SYMBOL(tv) \
-	DUK_HSTRING_HAS_SYMBOL(DUK_TVAL_GET_STRING((tv)))
+#define DUK_TVAL_STRING_IS_SYMBOL(tv) DUK_HSTRING_HAS_SYMBOL(DUK_TVAL_GET_STRING((tv)))
 
 /* Lightfunc flags packing and unpacking. */
 /* Sign extend: 0x0000##00 -> 0x##000000 -> sign extend to 0xssssss##.
  * Avoid signed shifts due to portability limitations.
  */
-#define DUK_LFUNC_FLAGS_GET_MAGIC(lf_flags) \
-	((duk_int32_t) (duk_int8_t) (((duk_uint16_t) (lf_flags)) >> 8))
-#define DUK_LFUNC_FLAGS_GET_LENGTH(lf_flags) \
-	(((lf_flags) >> 4) & 0x0fU)
-#define DUK_LFUNC_FLAGS_GET_NARGS(lf_flags) \
-	((lf_flags) & 0x0fU)
-#define DUK_LFUNC_FLAGS_PACK(magic,length,nargs) \
-	((((duk_small_uint_t) (magic)) & 0xffU) << 8) | ((length) << 4) | (nargs)
-
-#define DUK_LFUNC_NARGS_VARARGS             0x0f   /* varargs marker */
-#define DUK_LFUNC_NARGS_MIN                 0x00
-#define DUK_LFUNC_NARGS_MAX                 0x0e   /* max, excl. varargs marker */
-#define DUK_LFUNC_LENGTH_MIN                0x00
-#define DUK_LFUNC_LENGTH_MAX                0x0f
-#define DUK_LFUNC_MAGIC_MIN                 (-0x80)
-#define DUK_LFUNC_MAGIC_MAX                 0x7f
+#define DUK_LFUNC_FLAGS_GET_MAGIC(lf_flags)        ((duk_int32_t) (duk_int8_t) (((duk_uint16_t) (lf_flags)) >> 8))
+#define DUK_LFUNC_FLAGS_GET_LENGTH(lf_flags)       (((lf_flags) >> 4) & 0x0fU)
+#define DUK_LFUNC_FLAGS_GET_NARGS(lf_flags)        ((lf_flags) &0x0fU)
+#define DUK_LFUNC_FLAGS_PACK(magic, length, nargs) ((((duk_small_uint_t) (magic)) & 0xffU) << 8) | ((length) << 4) | (nargs)
+
+#define DUK_LFUNC_NARGS_VARARGS 0x0f /* varargs marker */
+#define DUK_LFUNC_NARGS_MIN     0x00
+#define DUK_LFUNC_NARGS_MAX     0x0e /* max, excl. varargs marker */
+#define DUK_LFUNC_LENGTH_MIN    0x00
+#define DUK_LFUNC_LENGTH_MAX    0x0f
+#define DUK_LFUNC_MAGIC_MIN     (-0x80)
+#define DUK_LFUNC_MAGIC_MAX     0x7f
 
 /* fastint constants etc */
 #if defined(DUK_USE_FASTINT)
-#define DUK_FASTINT_MIN           (DUK_I64_CONSTANT(-0x800000000000))
-#define DUK_FASTINT_MAX           (DUK_I64_CONSTANT(0x7fffffffffff))
-#define DUK_FASTINT_BITS          48
+#define DUK_FASTINT_MIN  (DUK_I64_CONSTANT(-0x800000000000))
+#define DUK_FASTINT_MAX  (DUK_I64_CONSTANT(0x7fffffffffff))
+#define DUK_FASTINT_BITS 48
 
-DUK_INTERNAL_DECL DUK_INLINE void duk_tval_set_number_chkfast_fast(duk_tval *tv, duk_double_t x);
+DUK_INTERNAL_DECL void duk_tval_set_number_chkfast_fast(duk_tval *tv, duk_double_t x);
 DUK_INTERNAL_DECL void duk_tval_set_number_chkfast_slow(duk_tval *tv, duk_double_t x);
 #endif
 
-#endif  /* DUK_TVAL_H_INCLUDED */
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL_DECL void duk_tval_assert_valid(duk_tval *tv);
+#define DUK_TVAL_ASSERT_VALID(tv) \
+	do { \
+		duk_tval_assert_valid((tv)); \
+	} while (0)
+#else
+#define DUK_TVAL_ASSERT_VALID(tv) \
+	do { \
+	} while (0)
+#endif
+
+#endif /* DUK_TVAL_H_INCLUDED */
 /* #include duk_builtins.h */
 /*
  *  Automatically generated by genbuiltins.py, do not edit!
@@ -1501,9 +1594,9 @@ DUK_INTERNAL_DECL void duk_tval_set_number_chkfast_slow(duk_tval *tv, duk_double
 #define DUK_STRIDX_UC_FUNCTION                                        5                              /* 'Function' */
 #define DUK_HEAP_STRING_UC_FUNCTION(heap)                             DUK_HEAP_GET_STRING((heap),DUK_STRIDX_UC_FUNCTION)
 #define DUK_HTHREAD_STRING_UC_FUNCTION(thr)                           DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_UC_FUNCTION)
-#define DUK_STRIDX_ARRAY                                              6                              /* 'Array' */
-#define DUK_HEAP_STRING_ARRAY(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_ARRAY)
-#define DUK_HTHREAD_STRING_ARRAY(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_ARRAY)
+#define DUK_STRIDX_UC_ARRAY                                           6                              /* 'Array' */
+#define DUK_HEAP_STRING_UC_ARRAY(heap)                                DUK_HEAP_GET_STRING((heap),DUK_STRIDX_UC_ARRAY)
+#define DUK_HTHREAD_STRING_UC_ARRAY(thr)                              DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_UC_ARRAY)
 #define DUK_STRIDX_UC_STRING                                          7                              /* 'String' */
 #define DUK_HEAP_STRING_UC_STRING(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_UC_STRING)
 #define DUK_HTHREAD_STRING_UC_STRING(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_UC_STRING)
@@ -1513,9 +1606,9 @@ DUK_INTERNAL_DECL void duk_tval_set_number_chkfast_slow(duk_tval *tv, duk_double
 #define DUK_STRIDX_UC_NUMBER                                          9                              /* 'Number' */
 #define DUK_HEAP_STRING_UC_NUMBER(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_UC_NUMBER)
 #define DUK_HTHREAD_STRING_UC_NUMBER(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_UC_NUMBER)
-#define DUK_STRIDX_DATE                                               10                             /* 'Date' */
-#define DUK_HEAP_STRING_DATE(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_DATE)
-#define DUK_HTHREAD_STRING_DATE(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_DATE)
+#define DUK_STRIDX_UC_DATE                                            10                             /* 'Date' */
+#define DUK_HEAP_STRING_UC_DATE(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_UC_DATE)
+#define DUK_HTHREAD_STRING_UC_DATE(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_UC_DATE)
 #define DUK_STRIDX_REG_EXP                                            11                             /* 'RegExp' */
 #define DUK_HEAP_STRING_REG_EXP(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_REG_EXP)
 #define DUK_HTHREAD_STRING_REG_EXP(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_REG_EXP)
@@ -1741,260 +1834,263 @@ DUK_INTERNAL_DECL void duk_tval_set_number_chkfast_slow(duk_tval *tv, duk_double
 #define DUK_STRIDX_DATA                                               85                             /* 'data' */
 #define DUK_HEAP_STRING_DATA(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_DATA)
 #define DUK_HTHREAD_STRING_DATA(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_DATA)
-#define DUK_STRIDX_LENGTH                                             86                             /* 'length' */
+#define DUK_STRIDX_LC_BUFFER                                          86                             /* 'buffer' */
+#define DUK_HEAP_STRING_LC_BUFFER(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_LC_BUFFER)
+#define DUK_HTHREAD_STRING_LC_BUFFER(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_LC_BUFFER)
+#define DUK_STRIDX_LENGTH                                             87                             /* 'length' */
 #define DUK_HEAP_STRING_LENGTH(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_LENGTH)
 #define DUK_HTHREAD_STRING_LENGTH(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_LENGTH)
-#define DUK_STRIDX_SET                                                87                             /* 'set' */
+#define DUK_STRIDX_SET                                                88                             /* 'set' */
 #define DUK_HEAP_STRING_SET(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_SET)
 #define DUK_HTHREAD_STRING_SET(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_SET)
-#define DUK_STRIDX_STACK                                              88                             /* 'stack' */
+#define DUK_STRIDX_STACK                                              89                             /* 'stack' */
 #define DUK_HEAP_STRING_STACK(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_STACK)
 #define DUK_HTHREAD_STRING_STACK(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_STACK)
-#define DUK_STRIDX_PC                                                 89                             /* 'pc' */
+#define DUK_STRIDX_PC                                                 90                             /* 'pc' */
 #define DUK_HEAP_STRING_PC(heap)                                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_PC)
 #define DUK_HTHREAD_STRING_PC(thr)                                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_PC)
-#define DUK_STRIDX_LINE_NUMBER                                        90                             /* 'lineNumber' */
+#define DUK_STRIDX_LINE_NUMBER                                        91                             /* 'lineNumber' */
 #define DUK_HEAP_STRING_LINE_NUMBER(heap)                             DUK_HEAP_GET_STRING((heap),DUK_STRIDX_LINE_NUMBER)
 #define DUK_HTHREAD_STRING_LINE_NUMBER(thr)                           DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_LINE_NUMBER)
-#define DUK_STRIDX_INT_TRACEDATA                                      91                             /* '\x82Tracedata' */
+#define DUK_STRIDX_INT_TRACEDATA                                      92                             /* '\x82Tracedata' */
 #define DUK_HEAP_STRING_INT_TRACEDATA(heap)                           DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_TRACEDATA)
 #define DUK_HTHREAD_STRING_INT_TRACEDATA(thr)                         DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_TRACEDATA)
-#define DUK_STRIDX_NAME                                               92                             /* 'name' */
+#define DUK_STRIDX_NAME                                               93                             /* 'name' */
 #define DUK_HEAP_STRING_NAME(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_NAME)
 #define DUK_HTHREAD_STRING_NAME(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_NAME)
-#define DUK_STRIDX_FILE_NAME                                          93                             /* 'fileName' */
+#define DUK_STRIDX_FILE_NAME                                          94                             /* 'fileName' */
 #define DUK_HEAP_STRING_FILE_NAME(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_FILE_NAME)
 #define DUK_HTHREAD_STRING_FILE_NAME(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_FILE_NAME)
-#define DUK_STRIDX_LC_POINTER                                         94                             /* 'pointer' */
+#define DUK_STRIDX_LC_POINTER                                         95                             /* 'pointer' */
 #define DUK_HEAP_STRING_LC_POINTER(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_LC_POINTER)
 #define DUK_HTHREAD_STRING_LC_POINTER(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_LC_POINTER)
-#define DUK_STRIDX_INT_TARGET                                         95                             /* '\x82Target' */
+#define DUK_STRIDX_INT_TARGET                                         96                             /* '\x82Target' */
 #define DUK_HEAP_STRING_INT_TARGET(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_TARGET)
 #define DUK_HTHREAD_STRING_INT_TARGET(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_TARGET)
-#define DUK_STRIDX_INT_NEXT                                           96                             /* '\x82Next' */
+#define DUK_STRIDX_INT_NEXT                                           97                             /* '\x82Next' */
 #define DUK_HEAP_STRING_INT_NEXT(heap)                                DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_NEXT)
 #define DUK_HTHREAD_STRING_INT_NEXT(thr)                              DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_NEXT)
-#define DUK_STRIDX_INT_BYTECODE                                       97                             /* '\x82Bytecode' */
+#define DUK_STRIDX_INT_BYTECODE                                       98                             /* '\x82Bytecode' */
 #define DUK_HEAP_STRING_INT_BYTECODE(heap)                            DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_BYTECODE)
 #define DUK_HTHREAD_STRING_INT_BYTECODE(thr)                          DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_BYTECODE)
-#define DUK_STRIDX_INT_FORMALS                                        98                             /* '\x82Formals' */
+#define DUK_STRIDX_INT_FORMALS                                        99                             /* '\x82Formals' */
 #define DUK_HEAP_STRING_INT_FORMALS(heap)                             DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_FORMALS)
 #define DUK_HTHREAD_STRING_INT_FORMALS(thr)                           DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_FORMALS)
-#define DUK_STRIDX_INT_VARMAP                                         99                             /* '\x82Varmap' */
+#define DUK_STRIDX_INT_VARMAP                                         100                            /* '\x82Varmap' */
 #define DUK_HEAP_STRING_INT_VARMAP(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_VARMAP)
 #define DUK_HTHREAD_STRING_INT_VARMAP(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_VARMAP)
-#define DUK_STRIDX_INT_SOURCE                                         100                            /* '\x82Source' */
+#define DUK_STRIDX_INT_SOURCE                                         101                            /* '\x82Source' */
 #define DUK_HEAP_STRING_INT_SOURCE(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_SOURCE)
 #define DUK_HTHREAD_STRING_INT_SOURCE(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_SOURCE)
-#define DUK_STRIDX_INT_PC2LINE                                        101                            /* '\x82Pc2line' */
+#define DUK_STRIDX_INT_PC2LINE                                        102                            /* '\x82Pc2line' */
 #define DUK_HEAP_STRING_INT_PC2LINE(heap)                             DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_PC2LINE)
 #define DUK_HTHREAD_STRING_INT_PC2LINE(thr)                           DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_PC2LINE)
-#define DUK_STRIDX_INT_MAP                                            102                            /* '\x82Map' */
+#define DUK_STRIDX_INT_MAP                                            103                            /* '\x82Map' */
 #define DUK_HEAP_STRING_INT_MAP(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_MAP)
 #define DUK_HTHREAD_STRING_INT_MAP(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_MAP)
-#define DUK_STRIDX_INT_VARENV                                         103                            /* '\x82Varenv' */
+#define DUK_STRIDX_INT_VARENV                                         104                            /* '\x82Varenv' */
 #define DUK_HEAP_STRING_INT_VARENV(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_VARENV)
 #define DUK_HTHREAD_STRING_INT_VARENV(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_VARENV)
-#define DUK_STRIDX_INT_FINALIZER                                      104                            /* '\x82Finalizer' */
+#define DUK_STRIDX_INT_FINALIZER                                      105                            /* '\x82Finalizer' */
 #define DUK_HEAP_STRING_INT_FINALIZER(heap)                           DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_FINALIZER)
 #define DUK_HTHREAD_STRING_INT_FINALIZER(thr)                         DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_FINALIZER)
-#define DUK_STRIDX_INT_VALUE                                          105                            /* '\x82Value' */
+#define DUK_STRIDX_INT_VALUE                                          106                            /* '\x82Value' */
 #define DUK_HEAP_STRING_INT_VALUE(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_VALUE)
 #define DUK_HTHREAD_STRING_INT_VALUE(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_VALUE)
-#define DUK_STRIDX_COMPILE                                            106                            /* 'compile' */
+#define DUK_STRIDX_COMPILE                                            107                            /* 'compile' */
 #define DUK_HEAP_STRING_COMPILE(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_COMPILE)
 #define DUK_HTHREAD_STRING_COMPILE(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_COMPILE)
-#define DUK_STRIDX_INPUT                                              107                            /* 'input' */
+#define DUK_STRIDX_INPUT                                              108                            /* 'input' */
 #define DUK_HEAP_STRING_INPUT(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INPUT)
 #define DUK_HTHREAD_STRING_INPUT(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INPUT)
-#define DUK_STRIDX_ERR_CREATE                                         108                            /* 'errCreate' */
+#define DUK_STRIDX_ERR_CREATE                                         109                            /* 'errCreate' */
 #define DUK_HEAP_STRING_ERR_CREATE(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_ERR_CREATE)
 #define DUK_HTHREAD_STRING_ERR_CREATE(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_ERR_CREATE)
-#define DUK_STRIDX_ERR_THROW                                          109                            /* 'errThrow' */
+#define DUK_STRIDX_ERR_THROW                                          110                            /* 'errThrow' */
 #define DUK_HEAP_STRING_ERR_THROW(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_ERR_THROW)
 #define DUK_HTHREAD_STRING_ERR_THROW(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_ERR_THROW)
-#define DUK_STRIDX_ENV                                                110                            /* 'env' */
+#define DUK_STRIDX_ENV                                                111                            /* 'env' */
 #define DUK_HEAP_STRING_ENV(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_ENV)
 #define DUK_HTHREAD_STRING_ENV(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_ENV)
-#define DUK_STRIDX_HEX                                                111                            /* 'hex' */
+#define DUK_STRIDX_HEX                                                112                            /* 'hex' */
 #define DUK_HEAP_STRING_HEX(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_HEX)
 #define DUK_HTHREAD_STRING_HEX(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_HEX)
-#define DUK_STRIDX_BASE64                                             112                            /* 'base64' */
+#define DUK_STRIDX_BASE64                                             113                            /* 'base64' */
 #define DUK_HEAP_STRING_BASE64(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_BASE64)
 #define DUK_HTHREAD_STRING_BASE64(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_BASE64)
-#define DUK_STRIDX_JX                                                 113                            /* 'jx' */
+#define DUK_STRIDX_JX                                                 114                            /* 'jx' */
 #define DUK_HEAP_STRING_JX(heap)                                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JX)
 #define DUK_HTHREAD_STRING_JX(thr)                                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JX)
-#define DUK_STRIDX_JC                                                 114                            /* 'jc' */
+#define DUK_STRIDX_JC                                                 115                            /* 'jc' */
 #define DUK_HEAP_STRING_JC(heap)                                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JC)
 #define DUK_HTHREAD_STRING_JC(thr)                                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JC)
-#define DUK_STRIDX_JSON_EXT_UNDEFINED                                 115                            /* '{"_undef":true}' */
+#define DUK_STRIDX_JSON_EXT_UNDEFINED                                 116                            /* '{"_undef":true}' */
 #define DUK_HEAP_STRING_JSON_EXT_UNDEFINED(heap)                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JSON_EXT_UNDEFINED)
 #define DUK_HTHREAD_STRING_JSON_EXT_UNDEFINED(thr)                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JSON_EXT_UNDEFINED)
-#define DUK_STRIDX_JSON_EXT_NAN                                       116                            /* '{"_nan":true}' */
+#define DUK_STRIDX_JSON_EXT_NAN                                       117                            /* '{"_nan":true}' */
 #define DUK_HEAP_STRING_JSON_EXT_NAN(heap)                            DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JSON_EXT_NAN)
 #define DUK_HTHREAD_STRING_JSON_EXT_NAN(thr)                          DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JSON_EXT_NAN)
-#define DUK_STRIDX_JSON_EXT_POSINF                                    117                            /* '{"_inf":true}' */
+#define DUK_STRIDX_JSON_EXT_POSINF                                    118                            /* '{"_inf":true}' */
 #define DUK_HEAP_STRING_JSON_EXT_POSINF(heap)                         DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JSON_EXT_POSINF)
 #define DUK_HTHREAD_STRING_JSON_EXT_POSINF(thr)                       DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JSON_EXT_POSINF)
-#define DUK_STRIDX_JSON_EXT_NEGINF                                    118                            /* '{"_ninf":true}' */
+#define DUK_STRIDX_JSON_EXT_NEGINF                                    119                            /* '{"_ninf":true}' */
 #define DUK_HEAP_STRING_JSON_EXT_NEGINF(heap)                         DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JSON_EXT_NEGINF)
 #define DUK_HTHREAD_STRING_JSON_EXT_NEGINF(thr)                       DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JSON_EXT_NEGINF)
-#define DUK_STRIDX_JSON_EXT_FUNCTION1                                 119                            /* '{"_func":true}' */
+#define DUK_STRIDX_JSON_EXT_FUNCTION1                                 120                            /* '{"_func":true}' */
 #define DUK_HEAP_STRING_JSON_EXT_FUNCTION1(heap)                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JSON_EXT_FUNCTION1)
 #define DUK_HTHREAD_STRING_JSON_EXT_FUNCTION1(thr)                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JSON_EXT_FUNCTION1)
-#define DUK_STRIDX_JSON_EXT_FUNCTION2                                 120                            /* '{_func:true}' */
+#define DUK_STRIDX_JSON_EXT_FUNCTION2                                 121                            /* '{_func:true}' */
 #define DUK_HEAP_STRING_JSON_EXT_FUNCTION2(heap)                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JSON_EXT_FUNCTION2)
 #define DUK_HTHREAD_STRING_JSON_EXT_FUNCTION2(thr)                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JSON_EXT_FUNCTION2)
-#define DUK_STRIDX_BREAK                                              121                            /* 'break' */
+#define DUK_STRIDX_BREAK                                              122                            /* 'break' */
 #define DUK_HEAP_STRING_BREAK(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_BREAK)
 #define DUK_HTHREAD_STRING_BREAK(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_BREAK)
-#define DUK_STRIDX_CASE                                               122                            /* 'case' */
+#define DUK_STRIDX_CASE                                               123                            /* 'case' */
 #define DUK_HEAP_STRING_CASE(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_CASE)
 #define DUK_HTHREAD_STRING_CASE(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_CASE)
-#define DUK_STRIDX_CATCH                                              123                            /* 'catch' */
+#define DUK_STRIDX_CATCH                                              124                            /* 'catch' */
 #define DUK_HEAP_STRING_CATCH(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_CATCH)
 #define DUK_HTHREAD_STRING_CATCH(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_CATCH)
-#define DUK_STRIDX_CONTINUE                                           124                            /* 'continue' */
+#define DUK_STRIDX_CONTINUE                                           125                            /* 'continue' */
 #define DUK_HEAP_STRING_CONTINUE(heap)                                DUK_HEAP_GET_STRING((heap),DUK_STRIDX_CONTINUE)
 #define DUK_HTHREAD_STRING_CONTINUE(thr)                              DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_CONTINUE)
-#define DUK_STRIDX_DEBUGGER                                           125                            /* 'debugger' */
+#define DUK_STRIDX_DEBUGGER                                           126                            /* 'debugger' */
 #define DUK_HEAP_STRING_DEBUGGER(heap)                                DUK_HEAP_GET_STRING((heap),DUK_STRIDX_DEBUGGER)
 #define DUK_HTHREAD_STRING_DEBUGGER(thr)                              DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_DEBUGGER)
-#define DUK_STRIDX_DEFAULT                                            126                            /* 'default' */
+#define DUK_STRIDX_DEFAULT                                            127                            /* 'default' */
 #define DUK_HEAP_STRING_DEFAULT(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_DEFAULT)
 #define DUK_HTHREAD_STRING_DEFAULT(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_DEFAULT)
-#define DUK_STRIDX_DELETE                                             127                            /* 'delete' */
+#define DUK_STRIDX_DELETE                                             128                            /* 'delete' */
 #define DUK_HEAP_STRING_DELETE(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_DELETE)
 #define DUK_HTHREAD_STRING_DELETE(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_DELETE)
-#define DUK_STRIDX_DO                                                 128                            /* 'do' */
+#define DUK_STRIDX_DO                                                 129                            /* 'do' */
 #define DUK_HEAP_STRING_DO(heap)                                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_DO)
 #define DUK_HTHREAD_STRING_DO(thr)                                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_DO)
-#define DUK_STRIDX_ELSE                                               129                            /* 'else' */
+#define DUK_STRIDX_ELSE                                               130                            /* 'else' */
 #define DUK_HEAP_STRING_ELSE(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_ELSE)
 #define DUK_HTHREAD_STRING_ELSE(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_ELSE)
-#define DUK_STRIDX_FINALLY                                            130                            /* 'finally' */
+#define DUK_STRIDX_FINALLY                                            131                            /* 'finally' */
 #define DUK_HEAP_STRING_FINALLY(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_FINALLY)
 #define DUK_HTHREAD_STRING_FINALLY(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_FINALLY)
-#define DUK_STRIDX_FOR                                                131                            /* 'for' */
+#define DUK_STRIDX_FOR                                                132                            /* 'for' */
 #define DUK_HEAP_STRING_FOR(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_FOR)
 #define DUK_HTHREAD_STRING_FOR(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_FOR)
-#define DUK_STRIDX_LC_FUNCTION                                        132                            /* 'function' */
+#define DUK_STRIDX_LC_FUNCTION                                        133                            /* 'function' */
 #define DUK_HEAP_STRING_LC_FUNCTION(heap)                             DUK_HEAP_GET_STRING((heap),DUK_STRIDX_LC_FUNCTION)
 #define DUK_HTHREAD_STRING_LC_FUNCTION(thr)                           DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_LC_FUNCTION)
-#define DUK_STRIDX_IF                                                 133                            /* 'if' */
+#define DUK_STRIDX_IF                                                 134                            /* 'if' */
 #define DUK_HEAP_STRING_IF(heap)                                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_IF)
 #define DUK_HTHREAD_STRING_IF(thr)                                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_IF)
-#define DUK_STRIDX_IN                                                 134                            /* 'in' */
+#define DUK_STRIDX_IN                                                 135                            /* 'in' */
 #define DUK_HEAP_STRING_IN(heap)                                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_IN)
 #define DUK_HTHREAD_STRING_IN(thr)                                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_IN)
-#define DUK_STRIDX_INSTANCEOF                                         135                            /* 'instanceof' */
+#define DUK_STRIDX_INSTANCEOF                                         136                            /* 'instanceof' */
 #define DUK_HEAP_STRING_INSTANCEOF(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INSTANCEOF)
 #define DUK_HTHREAD_STRING_INSTANCEOF(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INSTANCEOF)
-#define DUK_STRIDX_NEW                                                136                            /* 'new' */
+#define DUK_STRIDX_NEW                                                137                            /* 'new' */
 #define DUK_HEAP_STRING_NEW(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_NEW)
 #define DUK_HTHREAD_STRING_NEW(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_NEW)
-#define DUK_STRIDX_RETURN                                             137                            /* 'return' */
+#define DUK_STRIDX_RETURN                                             138                            /* 'return' */
 #define DUK_HEAP_STRING_RETURN(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_RETURN)
 #define DUK_HTHREAD_STRING_RETURN(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_RETURN)
-#define DUK_STRIDX_SWITCH                                             138                            /* 'switch' */
+#define DUK_STRIDX_SWITCH                                             139                            /* 'switch' */
 #define DUK_HEAP_STRING_SWITCH(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_SWITCH)
 #define DUK_HTHREAD_STRING_SWITCH(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_SWITCH)
-#define DUK_STRIDX_THIS                                               139                            /* 'this' */
+#define DUK_STRIDX_THIS                                               140                            /* 'this' */
 #define DUK_HEAP_STRING_THIS(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_THIS)
 #define DUK_HTHREAD_STRING_THIS(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_THIS)
-#define DUK_STRIDX_THROW                                              140                            /* 'throw' */
+#define DUK_STRIDX_THROW                                              141                            /* 'throw' */
 #define DUK_HEAP_STRING_THROW(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_THROW)
 #define DUK_HTHREAD_STRING_THROW(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_THROW)
-#define DUK_STRIDX_TRY                                                141                            /* 'try' */
+#define DUK_STRIDX_TRY                                                142                            /* 'try' */
 #define DUK_HEAP_STRING_TRY(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_TRY)
 #define DUK_HTHREAD_STRING_TRY(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_TRY)
-#define DUK_STRIDX_TYPEOF                                             142                            /* 'typeof' */
+#define DUK_STRIDX_TYPEOF                                             143                            /* 'typeof' */
 #define DUK_HEAP_STRING_TYPEOF(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_TYPEOF)
 #define DUK_HTHREAD_STRING_TYPEOF(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_TYPEOF)
-#define DUK_STRIDX_VAR                                                143                            /* 'var' */
+#define DUK_STRIDX_VAR                                                144                            /* 'var' */
 #define DUK_HEAP_STRING_VAR(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_VAR)
 #define DUK_HTHREAD_STRING_VAR(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_VAR)
-#define DUK_STRIDX_CONST                                              144                            /* 'const' */
+#define DUK_STRIDX_CONST                                              145                            /* 'const' */
 #define DUK_HEAP_STRING_CONST(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_CONST)
 #define DUK_HTHREAD_STRING_CONST(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_CONST)
-#define DUK_STRIDX_VOID                                               145                            /* 'void' */
+#define DUK_STRIDX_VOID                                               146                            /* 'void' */
 #define DUK_HEAP_STRING_VOID(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_VOID)
 #define DUK_HTHREAD_STRING_VOID(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_VOID)
-#define DUK_STRIDX_WHILE                                              146                            /* 'while' */
+#define DUK_STRIDX_WHILE                                              147                            /* 'while' */
 #define DUK_HEAP_STRING_WHILE(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_WHILE)
 #define DUK_HTHREAD_STRING_WHILE(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_WHILE)
-#define DUK_STRIDX_WITH                                               147                            /* 'with' */
+#define DUK_STRIDX_WITH                                               148                            /* 'with' */
 #define DUK_HEAP_STRING_WITH(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_WITH)
 #define DUK_HTHREAD_STRING_WITH(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_WITH)
-#define DUK_STRIDX_CLASS                                              148                            /* 'class' */
+#define DUK_STRIDX_CLASS                                              149                            /* 'class' */
 #define DUK_HEAP_STRING_CLASS(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_CLASS)
 #define DUK_HTHREAD_STRING_CLASS(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_CLASS)
-#define DUK_STRIDX_ENUM                                               149                            /* 'enum' */
+#define DUK_STRIDX_ENUM                                               150                            /* 'enum' */
 #define DUK_HEAP_STRING_ENUM(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_ENUM)
 #define DUK_HTHREAD_STRING_ENUM(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_ENUM)
-#define DUK_STRIDX_EXPORT                                             150                            /* 'export' */
+#define DUK_STRIDX_EXPORT                                             151                            /* 'export' */
 #define DUK_HEAP_STRING_EXPORT(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_EXPORT)
 #define DUK_HTHREAD_STRING_EXPORT(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_EXPORT)
-#define DUK_STRIDX_EXTENDS                                            151                            /* 'extends' */
+#define DUK_STRIDX_EXTENDS                                            152                            /* 'extends' */
 #define DUK_HEAP_STRING_EXTENDS(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_EXTENDS)
 #define DUK_HTHREAD_STRING_EXTENDS(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_EXTENDS)
-#define DUK_STRIDX_IMPORT                                             152                            /* 'import' */
+#define DUK_STRIDX_IMPORT                                             153                            /* 'import' */
 #define DUK_HEAP_STRING_IMPORT(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_IMPORT)
 #define DUK_HTHREAD_STRING_IMPORT(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_IMPORT)
-#define DUK_STRIDX_SUPER                                              153                            /* 'super' */
+#define DUK_STRIDX_SUPER                                              154                            /* 'super' */
 #define DUK_HEAP_STRING_SUPER(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_SUPER)
 #define DUK_HTHREAD_STRING_SUPER(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_SUPER)
-#define DUK_STRIDX_LC_NULL                                            154                            /* 'null' */
+#define DUK_STRIDX_LC_NULL                                            155                            /* 'null' */
 #define DUK_HEAP_STRING_LC_NULL(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_LC_NULL)
 #define DUK_HTHREAD_STRING_LC_NULL(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_LC_NULL)
-#define DUK_STRIDX_TRUE                                               155                            /* 'true' */
+#define DUK_STRIDX_TRUE                                               156                            /* 'true' */
 #define DUK_HEAP_STRING_TRUE(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_TRUE)
 #define DUK_HTHREAD_STRING_TRUE(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_TRUE)
-#define DUK_STRIDX_FALSE                                              156                            /* 'false' */
+#define DUK_STRIDX_FALSE                                              157                            /* 'false' */
 #define DUK_HEAP_STRING_FALSE(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_FALSE)
 #define DUK_HTHREAD_STRING_FALSE(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_FALSE)
-#define DUK_STRIDX_IMPLEMENTS                                         157                            /* 'implements' */
+#define DUK_STRIDX_IMPLEMENTS                                         158                            /* 'implements' */
 #define DUK_HEAP_STRING_IMPLEMENTS(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_IMPLEMENTS)
 #define DUK_HTHREAD_STRING_IMPLEMENTS(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_IMPLEMENTS)
-#define DUK_STRIDX_INTERFACE                                          158                            /* 'interface' */
+#define DUK_STRIDX_INTERFACE                                          159                            /* 'interface' */
 #define DUK_HEAP_STRING_INTERFACE(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INTERFACE)
 #define DUK_HTHREAD_STRING_INTERFACE(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INTERFACE)
-#define DUK_STRIDX_LET                                                159                            /* 'let' */
+#define DUK_STRIDX_LET                                                160                            /* 'let' */
 #define DUK_HEAP_STRING_LET(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_LET)
 #define DUK_HTHREAD_STRING_LET(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_LET)
-#define DUK_STRIDX_PACKAGE                                            160                            /* 'package' */
+#define DUK_STRIDX_PACKAGE                                            161                            /* 'package' */
 #define DUK_HEAP_STRING_PACKAGE(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_PACKAGE)
 #define DUK_HTHREAD_STRING_PACKAGE(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_PACKAGE)
-#define DUK_STRIDX_PRIVATE                                            161                            /* 'private' */
+#define DUK_STRIDX_PRIVATE                                            162                            /* 'private' */
 #define DUK_HEAP_STRING_PRIVATE(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_PRIVATE)
 #define DUK_HTHREAD_STRING_PRIVATE(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_PRIVATE)
-#define DUK_STRIDX_PROTECTED                                          162                            /* 'protected' */
+#define DUK_STRIDX_PROTECTED                                          163                            /* 'protected' */
 #define DUK_HEAP_STRING_PROTECTED(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_PROTECTED)
 #define DUK_HTHREAD_STRING_PROTECTED(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_PROTECTED)
-#define DUK_STRIDX_PUBLIC                                             163                            /* 'public' */
+#define DUK_STRIDX_PUBLIC                                             164                            /* 'public' */
 #define DUK_HEAP_STRING_PUBLIC(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_PUBLIC)
 #define DUK_HTHREAD_STRING_PUBLIC(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_PUBLIC)
-#define DUK_STRIDX_STATIC                                             164                            /* 'static' */
+#define DUK_STRIDX_STATIC                                             165                            /* 'static' */
 #define DUK_HEAP_STRING_STATIC(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_STATIC)
 #define DUK_HTHREAD_STRING_STATIC(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_STATIC)
-#define DUK_STRIDX_YIELD                                              165                            /* 'yield' */
+#define DUK_STRIDX_YIELD                                              166                            /* 'yield' */
 #define DUK_HEAP_STRING_YIELD(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_YIELD)
 #define DUK_HTHREAD_STRING_YIELD(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_YIELD)
 
-#define DUK_HEAP_NUM_STRINGS                                          166
-#define DUK_STRIDX_START_RESERVED                                     121
-#define DUK_STRIDX_START_STRICT_RESERVED                              157
-#define DUK_STRIDX_END_RESERVED                                       166                            /* exclusive endpoint */
+#define DUK_HEAP_NUM_STRINGS                                          167
+#define DUK_STRIDX_START_RESERVED                                     122
+#define DUK_STRIDX_START_STRICT_RESERVED                              158
+#define DUK_STRIDX_END_RESERVED                                       167                            /* exclusive endpoint */
 
 /* To convert a heap stridx to a token number, subtract
  * DUK_STRIDX_START_RESERVED and add DUK_TOK_START_RESERVED.
  */
 #if !defined(DUK_SINGLE_FILE)
-DUK_INTERNAL_DECL const duk_uint8_t duk_strings_data[967];
+DUK_INTERNAL_DECL const duk_uint8_t duk_strings_data[972];
 #endif  /* !DUK_SINGLE_FILE */
 #define DUK_STRDATA_MAX_STRLEN                                        27
-#define DUK_STRDATA_DATA_LENGTH                                       967
+#define DUK_STRDATA_DATA_LENGTH                                       972
 #endif  /* DUK_USE_ROM_STRINGS */
 
 #if defined(DUK_USE_ROM_OBJECTS)
@@ -2016,6 +2112,7 @@ DUK_INTERNAL_DECL duk_ret_t duk_bi_global_object_parse_float(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_thread_constructor(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_pointer_constructor(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_proxy_constructor(duk_context *ctx);
+DUK_INTERNAL_DECL duk_ret_t duk_bi_symbol_constructor_shared(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_arraybuffer_constructor(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_dataview_constructor(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_typedarray_constructor(duk_context *ctx);
@@ -2056,6 +2153,7 @@ DUK_INTERNAL_DECL duk_ret_t duk_bi_function_prototype_to_string(duk_context *ctx
 DUK_INTERNAL_DECL duk_ret_t duk_bi_function_prototype_apply(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_function_prototype_call(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_function_prototype_bind(duk_context *ctx);
+DUK_INTERNAL_DECL duk_ret_t duk_bi_function_prototype_hasinstance(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_native_function_length(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_native_function_name(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_array_constructor_is_array(duk_context *ctx);
@@ -2111,6 +2209,7 @@ DUK_INTERNAL_DECL duk_ret_t duk_bi_date_prototype_get_shared(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_date_prototype_get_timezone_offset(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_date_prototype_set_time(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_date_prototype_set_shared(duk_context *ctx);
+DUK_INTERNAL_DECL duk_ret_t duk_bi_date_prototype_toprimitive(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_regexp_prototype_exec(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_regexp_prototype_test(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_regexp_prototype_tostring(duk_context *ctx);
@@ -2151,6 +2250,9 @@ DUK_INTERNAL_DECL duk_ret_t duk_bi_reflect_object_delete_property(duk_context *c
 DUK_INTERNAL_DECL duk_ret_t duk_bi_reflect_object_get(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_reflect_object_has(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_reflect_object_set(duk_context *ctx);
+DUK_INTERNAL_DECL duk_ret_t duk_bi_symbol_key_for(duk_context *ctx);
+DUK_INTERNAL_DECL duk_ret_t duk_bi_symbol_tostring_shared(duk_context *ctx);
+DUK_INTERNAL_DECL duk_ret_t duk_bi_symbol_toprimitive(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_arraybuffer_isview(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_typedarray_bytelength_getter(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_buffer_slice_shared(duk_context *ctx);
@@ -2171,13 +2273,15 @@ DUK_INTERNAL_DECL duk_ret_t duk_bi_nodejs_buffer_tojson(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_nodejs_buffer_fill(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_nodejs_buffer_copy(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_nodejs_buffer_write(duk_context *ctx);
+DUK_INTERNAL_DECL duk_ret_t duk_bi_cbor_encode(duk_context *ctx);
+DUK_INTERNAL_DECL duk_ret_t duk_bi_cbor_decode(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_textencoder_prototype_encoding_getter(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_textencoder_prototype_encode(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_textdecoder_prototype_shared_getter(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_textdecoder_prototype_decode(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_performance_now(duk_context *ctx);
 #if !defined(DUK_SINGLE_FILE)
-DUK_INTERNAL_DECL const duk_c_function duk_bi_native_functions[177];
+DUK_INTERNAL_DECL const duk_c_function duk_bi_native_functions[185];
 #endif  /* !DUK_SINGLE_FILE */
 #define DUK_BIDX_GLOBAL                                               0
 #define DUK_BIDX_GLOBAL_ENV                                           1
@@ -2232,22 +2336,22 @@ DUK_INTERNAL_DECL const duk_c_function duk_bi_native_functions[177];
 #define DUK_BIDX_NODEJS_BUFFER_PROTOTYPE                              50
 #define DUK_NUM_BUILTINS                                              51
 #define DUK_NUM_BIDX_BUILTINS                                         51
-#define DUK_NUM_ALL_BUILTINS                                          78
+#define DUK_NUM_ALL_BUILTINS                                          80
 #if defined(DUK_USE_DOUBLE_LE)
 #if !defined(DUK_SINGLE_FILE)
-DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[4116];
+DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[4281];
 #endif  /* !DUK_SINGLE_FILE */
-#define DUK_BUILTINS_DATA_LENGTH                                      4116
+#define DUK_BUILTINS_DATA_LENGTH                                      4281
 #elif defined(DUK_USE_DOUBLE_BE)
 #if !defined(DUK_SINGLE_FILE)
-DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[4116];
+DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[4281];
 #endif  /* !DUK_SINGLE_FILE */
-#define DUK_BUILTINS_DATA_LENGTH                                      4116
+#define DUK_BUILTINS_DATA_LENGTH                                      4281
 #elif defined(DUK_USE_DOUBLE_ME)
 #if !defined(DUK_SINGLE_FILE)
-DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[4116];
+DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[4281];
 #endif  /* !DUK_SINGLE_FILE */
-#define DUK_BUILTINS_DATA_LENGTH                                      4116
+#define DUK_BUILTINS_DATA_LENGTH                                      4281
 #else
 #error invalid endianness defines
 #endif
@@ -2262,20 +2366,14 @@ DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[4116];
 #if !defined(DUK_UTIL_H_INCLUDED)
 #define DUK_UTIL_H_INCLUDED
 
-#if defined(DUK_USE_GET_RANDOM_DOUBLE)
-#define DUK_UTIL_GET_RANDOM_DOUBLE(thr) DUK_USE_GET_RANDOM_DOUBLE((thr)->heap_udata)
-#else
-#define DUK_UTIL_GET_RANDOM_DOUBLE(thr) duk_util_tinyrandom_get_double(thr)
-#endif
-
 /*
  *  Some useful constants
  */
 
-#define DUK_DOUBLE_2TO32     4294967296.0
-#define DUK_DOUBLE_2TO31     2147483648.0
-#define DUK_DOUBLE_LOG2E     1.4426950408889634
-#define DUK_DOUBLE_LOG10E    0.4342944819032518
+#define DUK_DOUBLE_2TO32  4294967296.0
+#define DUK_DOUBLE_2TO31  2147483648.0
+#define DUK_DOUBLE_LOG2E  1.4426950408889634
+#define DUK_DOUBLE_LOG10E 0.4342944819032518
 
 /*
  *  Endian conversion
@@ -2324,40 +2422,51 @@ struct duk_bitencoder_ctx {
 
 /*
  *  Raw write/read macros for big endian, unaligned basic values.
- *  Caller ensures there's enough space.  The macros update the pointer
- *  argument automatically on resizes.  The idiom seems a bit odd, but
- *  leads to compact code.
+ *  Caller ensures there's enough space.  The INC macro variants
+ *  update the pointer argument automatically.
  */
 
-#define DUK_RAW_WRITE_U8(ptr,val)  do { \
-		*(ptr)++ = (duk_uint8_t) (val); \
-	} while (0)
-#define DUK_RAW_WRITE_U16_BE(ptr,val) duk_raw_write_u16_be(&(ptr), (duk_uint16_t) (val))
-#define DUK_RAW_WRITE_U32_BE(ptr,val) duk_raw_write_u32_be(&(ptr), (duk_uint32_t) (val))
-#define DUK_RAW_WRITE_DOUBLE_BE(ptr,val) duk_raw_write_double_be(&(ptr), (duk_double_t) (val))
-#define DUK_RAW_WRITE_XUTF8(ptr,val)  do { \
-		/* 'ptr' is evaluated both as LHS and RHS. */ \
-		duk_uint8_t *duk__ptr; \
-		duk_small_int_t duk__len; \
-		duk__ptr = (duk_uint8_t *) (ptr); \
-		duk__len = duk_unicode_encode_xutf8((duk_ucodepoint_t) (val), duk__ptr); \
-		duk__ptr += duk__len; \
-		(ptr) = duk__ptr; \
+#define DUK_RAW_WRITE_U8(ptr, val) \
+	do { \
+		*(ptr) = (duk_uint8_t) (val); \
 	} while (0)
-#define DUK_RAW_WRITE_CESU8(ptr,val)  do { \
-		/* 'ptr' is evaluated both as LHS and RHS. */ \
-		duk_uint8_t *duk__ptr; \
-		duk_small_int_t duk__len; \
-		duk__ptr = (duk_uint8_t *) (ptr); \
-		duk__len = duk_unicode_encode_cesu8((duk_ucodepoint_t) (val), duk__ptr); \
-		duk__ptr += duk__len; \
-		(ptr) = duk__ptr; \
+#define DUK_RAW_WRITE_U16_BE(ptr, val)    duk_raw_write_u16_be((ptr), (duk_uint16_t) (val))
+#define DUK_RAW_WRITE_U32_BE(ptr, val)    duk_raw_write_u32_be((ptr), (duk_uint32_t) (val))
+#define DUK_RAW_WRITE_FLOAT_BE(ptr, val)  duk_raw_write_float_be((ptr), (duk_float_t) (val))
+#define DUK_RAW_WRITE_DOUBLE_BE(ptr, val) duk_raw_write_double_be((ptr), (duk_double_t) (val))
+#define DUK_RAW_WRITE_XUTF8(ptr, val)     duk_raw_write_xutf8((ptr), (duk_ucodepoint_t) (val))
+
+#define DUK_RAW_WRITEINC_U8(ptr, val) \
+	do { \
+		*(ptr)++ = (duk_uint8_t) (val); \
 	} while (0)
+#define DUK_RAW_WRITEINC_U16_BE(ptr, val)    duk_raw_writeinc_u16_be(&(ptr), (duk_uint16_t) (val))
+#define DUK_RAW_WRITEINC_U32_BE(ptr, val)    duk_raw_writeinc_u32_be(&(ptr), (duk_uint32_t) (val))
+#define DUK_RAW_WRITEINC_FLOAT_BE(ptr, val)  duk_raw_writeinc_float_be(&(ptr), (duk_float_t) (val))
+#define DUK_RAW_WRITEINC_DOUBLE_BE(ptr, val) duk_raw_writeinc_double_be(&(ptr), (duk_double_t) (val))
+#define DUK_RAW_WRITEINC_XUTF8(ptr, val)     duk_raw_writeinc_xutf8(&(ptr), (duk_ucodepoint_t) (val))
+#define DUK_RAW_WRITEINC_CESU8(ptr, val)     duk_raw_writeinc_cesu8(&(ptr), (duk_ucodepoint_t) (val))
+
+#define DUK_RAW_READ_U8(ptr)        ((duk_uint8_t) (*(ptr)))
+#define DUK_RAW_READ_U16_BE(ptr)    duk_raw_read_u16_be((ptr));
+#define DUK_RAW_READ_U32_BE(ptr)    duk_raw_read_u32_be((ptr));
+#define DUK_RAW_READ_DOUBLE_BE(ptr) duk_raw_read_double_be((ptr));
 
-#define DUK_RAW_READ_U8(ptr) ((duk_uint8_t) (*(ptr)++))
-#define DUK_RAW_READ_U16_BE(ptr) duk_raw_read_u16_be(&(ptr));
-#define DUK_RAW_READ_U32_BE(ptr) duk_raw_read_u32_be(&(ptr));
-#define DUK_RAW_READ_DOUBLE_BE(ptr) duk_raw_read_double_be(&(ptr));
+#define DUK_RAW_READINC_U8(ptr)        ((duk_uint8_t) (*(ptr)++))
+#define DUK_RAW_READINC_U16_BE(ptr)    duk_raw_readinc_u16_be(&(ptr));
+#define DUK_RAW_READINC_U32_BE(ptr)    duk_raw_readinc_u32_be(&(ptr));
+#define DUK_RAW_READINC_DOUBLE_BE(ptr) duk_raw_readinc_double_be(&(ptr));
+
+/*
+ *  Double and float byte order operations.
+ */
+
+DUK_INTERNAL_DECL void duk_dblunion_host_to_little(duk_double_union *u);
+DUK_INTERNAL_DECL void duk_dblunion_little_to_host(duk_double_union *u);
+DUK_INTERNAL_DECL void duk_dblunion_host_to_big(duk_double_union *u);
+DUK_INTERNAL_DECL void duk_dblunion_big_to_host(duk_double_union *u);
+DUK_INTERNAL_DECL void duk_fltunion_host_to_big(duk_float_union *u);
+DUK_INTERNAL_DECL void duk_fltunion_big_to_host(duk_float_union *u);
 
 /*
  *  Buffer writer (dynamic buffer only)
@@ -2392,79 +2501,82 @@ struct duk_bufwriter_ctx {
 };
 
 #if defined(DUK_USE_PREFER_SIZE)
-#define DUK_BW_SLACK_ADD           64
-#define DUK_BW_SLACK_SHIFT         4    /* 2^4 -> 1/16 = 6.25% slack */
+#define DUK_BW_SLACK_ADD   64
+#define DUK_BW_SLACK_SHIFT 4 /* 2^4 -> 1/16 = 6.25% slack */
 #else
-#define DUK_BW_SLACK_ADD           64
-#define DUK_BW_SLACK_SHIFT         2    /* 2^2 -> 1/4 = 25% slack */
+#define DUK_BW_SLACK_ADD   64
+#define DUK_BW_SLACK_SHIFT 2 /* 2^2 -> 1/4 = 25% slack */
 #endif
 
 /* Initialization and finalization (compaction), converting to other types. */
 
-#define DUK_BW_INIT_PUSHBUF(thr,bw_ctx,sz) do { \
+#define DUK_BW_INIT_PUSHBUF(thr, bw_ctx, sz) \
+	do { \
 		duk_bw_init_pushbuf((thr), (bw_ctx), (sz)); \
 	} while (0)
-#define DUK_BW_INIT_WITHBUF(thr,bw_ctx,buf) do { \
+#define DUK_BW_INIT_WITHBUF(thr, bw_ctx, buf) \
+	do { \
 		duk_bw_init((thr), (bw_ctx), (buf)); \
 	} while (0)
-#define DUK_BW_COMPACT(thr,bw_ctx) do { \
+#define DUK_BW_COMPACT(thr, bw_ctx) \
+	do { \
 		/* Make underlying buffer compact to match DUK_BW_GET_SIZE(). */ \
 		duk_bw_compact((thr), (bw_ctx)); \
 	} while (0)
-#define DUK_BW_PUSH_AS_STRING(thr,bw_ctx) do { \
-		duk_push_lstring((thr), \
-		                 (const char *) (bw_ctx)->p_base, \
-		                 (duk_size_t) ((bw_ctx)->p - (bw_ctx)->p_base)); \
+#define DUK_BW_PUSH_AS_STRING(thr, bw_ctx) \
+	do { \
+		duk_push_lstring((thr), (const char *) (bw_ctx)->p_base, (duk_size_t) ((bw_ctx)->p - (bw_ctx)->p_base)); \
 	} while (0)
+
 /* Pointers may be NULL for a while when 'buf' size is zero and before any
  * ENSURE calls have been made.  Once an ENSURE has been made, the pointers
  * are required to be non-NULL so that it's always valid to use memcpy() and
  * memmove(), even for zero size.
  */
-#define DUK_BW_ASSERT_VALID_EXPR(thr,bw_ctx) \
-	DUK_ASSERT_EXPR((bw_ctx) != NULL && \
-	                (bw_ctx)->buf != NULL && \
-			((DUK_HBUFFER_DYNAMIC_GET_SIZE((bw_ctx)->buf) == 0) || \
-				((bw_ctx)->p != NULL && \
-		                 (bw_ctx)->p_base != NULL && \
-		                 (bw_ctx)->p_limit != NULL && \
-		                 (bw_ctx)->p_limit >= (bw_ctx)->p_base && \
-		                 (bw_ctx)->p >= (bw_ctx)->p_base && \
-		                 (bw_ctx)->p <= (bw_ctx)->p_limit)))
-#define DUK_BW_ASSERT_VALID(thr,bw_ctx) do { \
-		DUK_BW_ASSERT_VALID_EXPR((thr), (bw_ctx)); \
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL_DECL void duk_bw_assert_valid(duk_hthread *thr, duk_bufwriter_ctx *bw_ctx);
+#define DUK_BW_ASSERT_VALID_EXPR(thr, bw_ctx) (duk_bw_assert_valid((thr), (bw_ctx)))
+#define DUK_BW_ASSERT_VALID(thr, bw_ctx) \
+	do { \
+		duk_bw_assert_valid((thr), (bw_ctx)); \
 	} while (0)
+#else
+#define DUK_BW_ASSERT_VALID_EXPR(thr, bw_ctx) DUK_ASSERT_EXPR(1)
+#define DUK_BW_ASSERT_VALID(thr, bw_ctx) \
+	do { \
+	} while (0)
+#endif
 
 /* Working with the pointer and current size. */
 
-#define DUK_BW_GET_PTR(thr,bw_ctx) \
-	((bw_ctx)->p)
-#define DUK_BW_SET_PTR(thr,bw_ctx,ptr) do { \
+#define DUK_BW_GET_PTR(thr, bw_ctx) ((bw_ctx)->p)
+#define DUK_BW_SET_PTR(thr, bw_ctx, ptr) \
+	do { \
 		(bw_ctx)->p = (ptr); \
 	} while (0)
-#define DUK_BW_ADD_PTR(thr,bw_ctx,delta) do { \
+#define DUK_BW_ADD_PTR(thr, bw_ctx, delta) \
+	do { \
 		(bw_ctx)->p += (delta); \
 	} while (0)
-#define DUK_BW_GET_BASEPTR(thr,bw_ctx) \
-	((bw_ctx)->p_base)
-#define DUK_BW_GET_LIMITPTR(thr,bw_ctx) \
-	((bw_ctx)->p_limit)
-#define DUK_BW_GET_SIZE(thr,bw_ctx) \
-	((duk_size_t) ((bw_ctx)->p - (bw_ctx)->p_base))
-#define DUK_BW_SET_SIZE(thr,bw_ctx,sz) do { \
+#define DUK_BW_GET_BASEPTR(thr, bw_ctx)  ((bw_ctx)->p_base)
+#define DUK_BW_GET_LIMITPTR(thr, bw_ctx) ((bw_ctx)->p_limit)
+#define DUK_BW_GET_SIZE(thr, bw_ctx)     ((duk_size_t) ((bw_ctx)->p - (bw_ctx)->p_base))
+#define DUK_BW_SET_SIZE(thr, bw_ctx, sz) \
+	do { \
 		DUK_ASSERT((duk_size_t) (sz) <= (duk_size_t) ((bw_ctx)->p - (bw_ctx)->p_base)); \
 		(bw_ctx)->p = (bw_ctx)->p_base + (sz); \
 	} while (0)
-#define DUK_BW_RESET_SIZE(thr,bw_ctx) do { \
+#define DUK_BW_RESET_SIZE(thr, bw_ctx) \
+	do { \
 		/* Reset to zero size, keep current limit. */ \
 		(bw_ctx)->p = (bw_ctx)->p_base; \
 	} while (0)
-#define DUK_BW_GET_BUFFER(thr,bw_ctx) \
-	((bw_ctx)->buf)
+#define DUK_BW_GET_BUFFER(thr, bw_ctx) ((bw_ctx)->buf)
 
 /* Ensuring (reserving) space. */
 
-#define DUK_BW_ENSURE(thr,bw_ctx,sz) do { \
+#define DUK_BW_ENSURE(thr, bw_ctx, sz) \
+	do { \
 		duk_size_t duk__sz, duk__space; \
 		DUK_BW_ASSERT_VALID((thr), (bw_ctx)); \
 		duk__sz = (sz); \
@@ -2475,22 +2587,21 @@ struct duk_bufwriter_ctx {
 	} while (0)
 /* NOTE: Multiple evaluation of 'ptr' in this macro. */
 /* XXX: Rework to use an always-inline function? */
-#define DUK_BW_ENSURE_RAW(thr,bw_ctx,sz,ptr) \
-	(((duk_size_t) ((bw_ctx)->p_limit - (ptr)) >= (sz)) ? \
-	 (ptr) : \
-	 ((bw_ctx)->p = (ptr), duk_bw_resize((thr),(bw_ctx),(sz))))
-#define DUK_BW_ENSURE_GETPTR(thr,bw_ctx,sz) \
-	DUK_BW_ENSURE_RAW((thr), (bw_ctx), (sz), (bw_ctx)->p)
-#define DUK_BW_ASSERT_SPACE_EXPR(thr,bw_ctx,sz) \
+#define DUK_BW_ENSURE_RAW(thr, bw_ctx, sz, ptr) \
+	(((duk_size_t) ((bw_ctx)->p_limit - (ptr)) >= (sz)) ? (ptr) : ((bw_ctx)->p = (ptr), duk_bw_resize((thr), (bw_ctx), (sz))))
+#define DUK_BW_ENSURE_GETPTR(thr, bw_ctx, sz) DUK_BW_ENSURE_RAW((thr), (bw_ctx), (sz), (bw_ctx)->p)
+#define DUK_BW_ASSERT_SPACE_EXPR(thr, bw_ctx, sz) \
 	(DUK_BW_ASSERT_VALID_EXPR((thr), (bw_ctx)), \
 	 DUK_ASSERT_EXPR((duk_size_t) ((bw_ctx)->p_limit - (bw_ctx)->p) >= (duk_size_t) (sz)))
-#define DUK_BW_ASSERT_SPACE(thr,bw_ctx,sz) do { \
+#define DUK_BW_ASSERT_SPACE(thr, bw_ctx, sz) \
+	do { \
 		DUK_BW_ASSERT_SPACE_EXPR((thr), (bw_ctx), (sz)); \
 	} while (0)
 
 /* Miscellaneous. */
 
-#define DUK_BW_SETPTR_AND_COMPACT(thr,bw_ctx,ptr) do { \
+#define DUK_BW_SETPTR_AND_COMPACT(thr, bw_ctx, ptr) \
+	do { \
 		(bw_ctx)->p = (ptr); \
 		duk_bw_compact((thr), (bw_ctx)); \
 	} while (0)
@@ -2501,11 +2612,13 @@ struct duk_bufwriter_ctx {
  * explicit pointer load/stores get generated (e.g. gcc -Os).
  */
 
-#define DUK_BW_WRITE_RAW_U8(thr,bw_ctx,val) do { \
+#define DUK_BW_WRITE_RAW_U8(thr, bw_ctx, val) \
+	do { \
 		DUK_BW_ASSERT_SPACE((thr), (bw_ctx), 1); \
 		*(bw_ctx)->p++ = (duk_uint8_t) (val); \
 	} while (0)
-#define DUK_BW_WRITE_RAW_U8_2(thr,bw_ctx,val1,val2) do { \
+#define DUK_BW_WRITE_RAW_U8_2(thr, bw_ctx, val1, val2) \
+	do { \
 		duk_uint8_t *duk__p; \
 		DUK_BW_ASSERT_SPACE((thr), (bw_ctx), 2); \
 		duk__p = (bw_ctx)->p; \
@@ -2513,7 +2626,8 @@ struct duk_bufwriter_ctx {
 		*duk__p++ = (duk_uint8_t) (val2); \
 		(bw_ctx)->p = duk__p; \
 	} while (0)
-#define DUK_BW_WRITE_RAW_U8_3(thr,bw_ctx,val1,val2,val3) do { \
+#define DUK_BW_WRITE_RAW_U8_3(thr, bw_ctx, val1, val2, val3) \
+	do { \
 		duk_uint8_t *duk__p; \
 		DUK_BW_ASSERT_SPACE((thr), (bw_ctx), 3); \
 		duk__p = (bw_ctx)->p; \
@@ -2522,7 +2636,8 @@ struct duk_bufwriter_ctx {
 		*duk__p++ = (duk_uint8_t) (val3); \
 		(bw_ctx)->p = duk__p; \
 	} while (0)
-#define DUK_BW_WRITE_RAW_U8_4(thr,bw_ctx,val1,val2,val3,val4) do { \
+#define DUK_BW_WRITE_RAW_U8_4(thr, bw_ctx, val1, val2, val3, val4) \
+	do { \
 		duk_uint8_t *duk__p; \
 		DUK_BW_ASSERT_SPACE((thr), (bw_ctx), 4); \
 		duk__p = (bw_ctx)->p; \
@@ -2532,7 +2647,8 @@ struct duk_bufwriter_ctx {
 		*duk__p++ = (duk_uint8_t) (val4); \
 		(bw_ctx)->p = duk__p; \
 	} while (0)
-#define DUK_BW_WRITE_RAW_U8_5(thr,bw_ctx,val1,val2,val3,val4,val5) do { \
+#define DUK_BW_WRITE_RAW_U8_5(thr, bw_ctx, val1, val2, val3, val4, val5) \
+	do { \
 		duk_uint8_t *duk__p; \
 		DUK_BW_ASSERT_SPACE((thr), (bw_ctx), 5); \
 		duk__p = (bw_ctx)->p; \
@@ -2543,7 +2659,8 @@ struct duk_bufwriter_ctx {
 		*duk__p++ = (duk_uint8_t) (val5); \
 		(bw_ctx)->p = duk__p; \
 	} while (0)
-#define DUK_BW_WRITE_RAW_U8_6(thr,bw_ctx,val1,val2,val3,val4,val5,val6) do { \
+#define DUK_BW_WRITE_RAW_U8_6(thr, bw_ctx, val1, val2, val3, val4, val5, val6) \
+	do { \
 		duk_uint8_t *duk__p; \
 		DUK_BW_ASSERT_SPACE((thr), (bw_ctx), 6); \
 		duk__p = (bw_ctx)->p; \
@@ -2555,7 +2672,8 @@ struct duk_bufwriter_ctx {
 		*duk__p++ = (duk_uint8_t) (val6); \
 		(bw_ctx)->p = duk__p; \
 	} while (0)
-#define DUK_BW_WRITE_RAW_XUTF8(thr,bw_ctx,cp) do { \
+#define DUK_BW_WRITE_RAW_XUTF8(thr, bw_ctx, cp) \
+	do { \
 		duk_ucodepoint_t duk__cp; \
 		duk_small_int_t duk__enc_len; \
 		duk__cp = (duk_ucodepoint_t) (cp); \
@@ -2563,7 +2681,8 @@ struct duk_bufwriter_ctx {
 		duk__enc_len = duk_unicode_encode_xutf8(duk__cp, (bw_ctx)->p); \
 		(bw_ctx)->p += duk__enc_len; \
 	} while (0)
-#define DUK_BW_WRITE_RAW_CESU8(thr,bw_ctx,cp) do { \
+#define DUK_BW_WRITE_RAW_CESU8(thr, bw_ctx, cp) \
+	do { \
 		duk_ucodepoint_t duk__cp; \
 		duk_small_int_t duk__enc_len; \
 		duk__cp = (duk_ucodepoint_t) (cp); \
@@ -2573,7 +2692,8 @@ struct duk_bufwriter_ctx {
 	} while (0)
 /* XXX: add temporary duk__p pointer here too; sharing */
 /* XXX: avoid unsafe variants */
-#define DUK_BW_WRITE_RAW_BYTES(thr,bw_ctx,valptr,valsz) do { \
+#define DUK_BW_WRITE_RAW_BYTES(thr, bw_ctx, valptr, valsz) \
+	do { \
 		const void *duk__valptr; \
 		duk_size_t duk__valsz; \
 		duk__valptr = (const void *) (valptr); \
@@ -2581,7 +2701,8 @@ struct duk_bufwriter_ctx {
 		duk_memcpy_unsafe((void *) ((bw_ctx)->p), duk__valptr, duk__valsz); \
 		(bw_ctx)->p += duk__valsz; \
 	} while (0)
-#define DUK_BW_WRITE_RAW_CSTRING(thr,bw_ctx,val) do { \
+#define DUK_BW_WRITE_RAW_CSTRING(thr, bw_ctx, val) \
+	do { \
 		const duk_uint8_t *duk__val; \
 		duk_size_t duk__val_len; \
 		duk__val = (const duk_uint8_t *) (val); \
@@ -2589,93 +2710,107 @@ struct duk_bufwriter_ctx {
 		duk_memcpy_unsafe((void *) ((bw_ctx)->p), (const void *) duk__val, duk__val_len); \
 		(bw_ctx)->p += duk__val_len; \
 	} while (0)
-#define DUK_BW_WRITE_RAW_HSTRING(thr,bw_ctx,val) do { \
+#define DUK_BW_WRITE_RAW_HSTRING(thr, bw_ctx, val) \
+	do { \
 		duk_size_t duk__val_len; \
 		duk__val_len = DUK_HSTRING_GET_BYTELEN((val)); \
 		duk_memcpy_unsafe((void *) ((bw_ctx)->p), (const void *) DUK_HSTRING_GET_DATA((val)), duk__val_len); \
 		(bw_ctx)->p += duk__val_len; \
 	} while (0)
-#define DUK_BW_WRITE_RAW_HBUFFER(thr,bw_ctx,val) do { \
+#define DUK_BW_WRITE_RAW_HBUFFER(thr, bw_ctx, val) \
+	do { \
 		duk_size_t duk__val_len; \
 		duk__val_len = DUK_HBUFFER_GET_SIZE((val)); \
-		duk_memcpy_unsafe((void *) ((bw_ctx)->p), (const void *) DUK_HBUFFER_GET_DATA_PTR((thr)->heap, (val)), duk__val_len); \
+		duk_memcpy_unsafe((void *) ((bw_ctx)->p), \
+		                  (const void *) DUK_HBUFFER_GET_DATA_PTR((thr)->heap, (val)), \
+		                  duk__val_len); \
 		(bw_ctx)->p += duk__val_len; \
 	} while (0)
-#define DUK_BW_WRITE_RAW_HBUFFER_FIXED(thr,bw_ctx,val) do { \
+#define DUK_BW_WRITE_RAW_HBUFFER_FIXED(thr, bw_ctx, val) \
+	do { \
 		duk_size_t duk__val_len; \
 		duk__val_len = DUK_HBUFFER_FIXED_GET_SIZE((val)); \
-		duk_memcpy_unsafe((void *) ((bw_ctx)->p), (const void *) DUK_HBUFFER_FIXED_GET_DATA_PTR((thr)->heap, (val)), duk__val_len); \
+		duk_memcpy_unsafe((void *) ((bw_ctx)->p), \
+		                  (const void *) DUK_HBUFFER_FIXED_GET_DATA_PTR((thr)->heap, (val)), \
+		                  duk__val_len); \
 		(bw_ctx)->p += duk__val_len; \
 	} while (0)
-#define DUK_BW_WRITE_RAW_HBUFFER_DYNAMIC(thr,bw_ctx,val) do { \
+#define DUK_BW_WRITE_RAW_HBUFFER_DYNAMIC(thr, bw_ctx, val) \
+	do { \
 		duk_size_t duk__val_len; \
 		duk__val_len = DUK_HBUFFER_DYNAMIC_GET_SIZE((val)); \
-		duk_memcpy_unsafe((void *) ((bw_ctx)->p), (const void *) DUK_HBUFFER_DYNAMIC_GET_DATA_PTR((thr)->heap, (val)), duk__val_len); \
+		duk_memcpy_unsafe((void *) ((bw_ctx)->p), \
+		                  (const void *) DUK_HBUFFER_DYNAMIC_GET_DATA_PTR((thr)->heap, (val)), \
+		                  duk__val_len); \
 		(bw_ctx)->p += duk__val_len; \
 	} while (0)
 
 /* Append bytes from a slice already in the buffer. */
-#define DUK_BW_WRITE_RAW_SLICE(thr,bw,dst_off,dst_len) \
-	duk_bw_write_raw_slice((thr), (bw), (dst_off), (dst_len))
+#define DUK_BW_WRITE_RAW_SLICE(thr, bw, dst_off, dst_len) duk_bw_write_raw_slice((thr), (bw), (dst_off), (dst_len))
 
 /* Insert bytes in the middle of the buffer from an external buffer. */
-#define DUK_BW_INSERT_RAW_BYTES(thr,bw,dst_off,buf,len) \
-	duk_bw_insert_raw_bytes((thr), (bw), (dst_off), (buf), (len))
+#define DUK_BW_INSERT_RAW_BYTES(thr, bw, dst_off, buf, len) duk_bw_insert_raw_bytes((thr), (bw), (dst_off), (buf), (len))
 
 /* Insert bytes in the middle of the buffer from a slice already
  * in the buffer.  Source offset is interpreted "before" the operation.
  */
-#define DUK_BW_INSERT_RAW_SLICE(thr,bw,dst_off,src_off,len) \
-	duk_bw_insert_raw_slice((thr), (bw), (dst_off), (src_off), (len))
+#define DUK_BW_INSERT_RAW_SLICE(thr, bw, dst_off, src_off, len) duk_bw_insert_raw_slice((thr), (bw), (dst_off), (src_off), (len))
 
 /* Insert a reserved area somewhere in the buffer; caller fills it.
  * Evaluates to a (duk_uint_t *) pointing to the start of the reserved
  * area for convenience.
  */
-#define DUK_BW_INSERT_RAW_AREA(thr,bw,off,len) \
-	duk_bw_insert_raw_area((thr), (bw), (off), (len))
+#define DUK_BW_INSERT_RAW_AREA(thr, bw, off, len) duk_bw_insert_raw_area((thr), (bw), (off), (len))
 
 /* Remove a slice from inside buffer. */
-#define DUK_BW_REMOVE_RAW_SLICE(thr,bw,off,len) \
-	duk_bw_remove_raw_slice((thr), (bw), (off), (len))
+#define DUK_BW_REMOVE_RAW_SLICE(thr, bw, off, len) duk_bw_remove_raw_slice((thr), (bw), (off), (len))
 
 /* Safe write calls which will ensure space first. */
 
-#define DUK_BW_WRITE_ENSURE_U8(thr,bw_ctx,val) do { \
+#define DUK_BW_WRITE_ENSURE_U8(thr, bw_ctx, val) \
+	do { \
 		DUK_BW_ENSURE((thr), (bw_ctx), 1); \
 		DUK_BW_WRITE_RAW_U8((thr), (bw_ctx), (val)); \
 	} while (0)
-#define DUK_BW_WRITE_ENSURE_U8_2(thr,bw_ctx,val1,val2) do { \
+#define DUK_BW_WRITE_ENSURE_U8_2(thr, bw_ctx, val1, val2) \
+	do { \
 		DUK_BW_ENSURE((thr), (bw_ctx), 2); \
 		DUK_BW_WRITE_RAW_U8_2((thr), (bw_ctx), (val1), (val2)); \
 	} while (0)
-#define DUK_BW_WRITE_ENSURE_U8_3(thr,bw_ctx,val1,val2,val3) do { \
+#define DUK_BW_WRITE_ENSURE_U8_3(thr, bw_ctx, val1, val2, val3) \
+	do { \
 		DUK_BW_ENSURE((thr), (bw_ctx), 3); \
 		DUK_BW_WRITE_RAW_U8_3((thr), (bw_ctx), (val1), (val2), (val3)); \
 	} while (0)
-#define DUK_BW_WRITE_ENSURE_U8_4(thr,bw_ctx,val1,val2,val3,val4) do { \
+#define DUK_BW_WRITE_ENSURE_U8_4(thr, bw_ctx, val1, val2, val3, val4) \
+	do { \
 		DUK_BW_ENSURE((thr), (bw_ctx), 4); \
 		DUK_BW_WRITE_RAW_U8_4((thr), (bw_ctx), (val1), (val2), (val3), (val4)); \
 	} while (0)
-#define DUK_BW_WRITE_ENSURE_U8_5(thr,bw_ctx,val1,val2,val3,val4,val5) do { \
+#define DUK_BW_WRITE_ENSURE_U8_5(thr, bw_ctx, val1, val2, val3, val4, val5) \
+	do { \
 		DUK_BW_ENSURE((thr), (bw_ctx), 5); \
 		DUK_BW_WRITE_RAW_U8_5((thr), (bw_ctx), (val1), (val2), (val3), (val4), (val5)); \
 	} while (0)
-#define DUK_BW_WRITE_ENSURE_U8_6(thr,bw_ctx,val1,val2,val3,val4,val5,val6) do { \
+#define DUK_BW_WRITE_ENSURE_U8_6(thr, bw_ctx, val1, val2, val3, val4, val5, val6) \
+	do { \
 		DUK_BW_ENSURE((thr), (bw_ctx), 6); \
 		DUK_BW_WRITE_RAW_U8_6((thr), (bw_ctx), (val1), (val2), (val3), (val4), (val5), (val6)); \
 	} while (0)
-#define DUK_BW_WRITE_ENSURE_XUTF8(thr,bw_ctx,cp) do { \
+#define DUK_BW_WRITE_ENSURE_XUTF8(thr, bw_ctx, cp) \
+	do { \
 		DUK_BW_ENSURE((thr), (bw_ctx), DUK_UNICODE_MAX_XUTF8_LENGTH); \
 		DUK_BW_WRITE_RAW_XUTF8((thr), (bw_ctx), (cp)); \
 	} while (0)
-#define DUK_BW_WRITE_ENSURE_CESU8(thr,bw_ctx,cp) do { \
+#define DUK_BW_WRITE_ENSURE_CESU8(thr, bw_ctx, cp) \
+	do { \
 		DUK_BW_ENSURE((thr), (bw_ctx), DUK_UNICODE_MAX_CESU8_LENGTH); \
 		DUK_BW_WRITE_RAW_CESU8((thr), (bw_ctx), (cp)); \
 	} while (0)
 /* XXX: add temporary duk__p pointer here too; sharing */
 /* XXX: avoid unsafe */
-#define DUK_BW_WRITE_ENSURE_BYTES(thr,bw_ctx,valptr,valsz) do { \
+#define DUK_BW_WRITE_ENSURE_BYTES(thr, bw_ctx, valptr, valsz) \
+	do { \
 		const void *duk__valptr; \
 		duk_size_t duk__valsz; \
 		duk__valptr = (const void *) (valptr); \
@@ -2684,7 +2819,8 @@ struct duk_bufwriter_ctx {
 		duk_memcpy_unsafe((void *) ((bw_ctx)->p), duk__valptr, duk__valsz); \
 		(bw_ctx)->p += duk__valsz; \
 	} while (0)
-#define DUK_BW_WRITE_ENSURE_CSTRING(thr,bw_ctx,val) do { \
+#define DUK_BW_WRITE_ENSURE_CSTRING(thr, bw_ctx, val) \
+	do { \
 		const duk_uint8_t *duk__val; \
 		duk_size_t duk__val_len; \
 		duk__val = (const duk_uint8_t *) (val); \
@@ -2693,45 +2829,53 @@ struct duk_bufwriter_ctx {
 		duk_memcpy_unsafe((void *) ((bw_ctx)->p), (const void *) duk__val, duk__val_len); \
 		(bw_ctx)->p += duk__val_len; \
 	} while (0)
-#define DUK_BW_WRITE_ENSURE_HSTRING(thr,bw_ctx,val) do { \
+#define DUK_BW_WRITE_ENSURE_HSTRING(thr, bw_ctx, val) \
+	do { \
 		duk_size_t duk__val_len; \
 		duk__val_len = DUK_HSTRING_GET_BYTELEN((val)); \
 		DUK_BW_ENSURE((thr), (bw_ctx), duk__val_len); \
 		duk_memcpy_unsafe((void *) ((bw_ctx)->p), (const void *) DUK_HSTRING_GET_DATA((val)), duk__val_len); \
 		(bw_ctx)->p += duk__val_len; \
 	} while (0)
-#define DUK_BW_WRITE_ENSURE_HBUFFER(thr,bw_ctx,val) do { \
+#define DUK_BW_WRITE_ENSURE_HBUFFER(thr, bw_ctx, val) \
+	do { \
 		duk_size_t duk__val_len; \
 		duk__val_len = DUK_HBUFFER_GET_SIZE((val)); \
 		DUK_BW_ENSURE((thr), (bw_ctx), duk__val_len); \
-		duk_memcpy_unsafe((void *) ((bw_ctx)->p), (const void *) DUK_HBUFFER_GET_DATA_PTR((thr)->heap, (val)), duk__val_len); \
+		duk_memcpy_unsafe((void *) ((bw_ctx)->p), \
+		                  (const void *) DUK_HBUFFER_GET_DATA_PTR((thr)->heap, (val)), \
+		                  duk__val_len); \
 		(bw_ctx)->p += duk__val_len; \
 	} while (0)
-#define DUK_BW_WRITE_ENSURE_HBUFFER_FIXED(thr,bw_ctx,val) do { \
+#define DUK_BW_WRITE_ENSURE_HBUFFER_FIXED(thr, bw_ctx, val) \
+	do { \
 		duk_size_t duk__val_len; \
 		duk__val_len = DUK_HBUFFER_FIXED_GET_SIZE((val)); \
 		DUK_BW_ENSURE((thr), (bw_ctx), duk__val_len); \
-		duk_memcpy_unsafe((void *) ((bw_ctx)->p), (const void *) DUK_HBUFFER_FIXED_GET_DATA_PTR((thr)->heap, (val)), duk__val_len); \
+		duk_memcpy_unsafe((void *) ((bw_ctx)->p), \
+		                  (const void *) DUK_HBUFFER_FIXED_GET_DATA_PTR((thr)->heap, (val)), \
+		                  duk__val_len); \
 		(bw_ctx)->p += duk__val_len; \
 	} while (0)
-#define DUK_BW_WRITE_ENSURE_HBUFFER_DYNAMIC(thr,bw_ctx,val) do { \
+#define DUK_BW_WRITE_ENSURE_HBUFFER_DYNAMIC(thr, bw_ctx, val) \
+	do { \
 		duk_size_t duk__val_len; \
 		duk__val_len = DUK_HBUFFER_DYNAMIC_GET_SIZE((val)); \
 		DUK_BW_ENSURE((thr), (bw_ctx), duk__val_len); \
-		duk_memcpy_unsafe((void *) ((bw_ctx)->p), (const void *) DUK_HBUFFER_DYNAMIC_GET_DATA_PTR((thr)->heap, (val)), duk__val_len); \
+		duk_memcpy_unsafe((void *) ((bw_ctx)->p), \
+		                  (const void *) DUK_HBUFFER_DYNAMIC_GET_DATA_PTR((thr)->heap, (val)), \
+		                  duk__val_len); \
 		(bw_ctx)->p += duk__val_len; \
 	} while (0)
 
-#define DUK_BW_WRITE_ENSURE_SLICE(thr,bw,dst_off,dst_len) \
-	duk_bw_write_ensure_slice((thr), (bw), (dst_off), (dst_len))
-#define DUK_BW_INSERT_ENSURE_BYTES(thr,bw,dst_off,buf,len) \
-	duk_bw_insert_ensure_bytes((thr), (bw), (dst_off), (buf), (len))
-#define DUK_BW_INSERT_ENSURE_SLICE(thr,bw,dst_off,src_off,len) \
+#define DUK_BW_WRITE_ENSURE_SLICE(thr, bw, dst_off, dst_len)   duk_bw_write_ensure_slice((thr), (bw), (dst_off), (dst_len))
+#define DUK_BW_INSERT_ENSURE_BYTES(thr, bw, dst_off, buf, len) duk_bw_insert_ensure_bytes((thr), (bw), (dst_off), (buf), (len))
+#define DUK_BW_INSERT_ENSURE_SLICE(thr, bw, dst_off, src_off, len) \
 	duk_bw_insert_ensure_slice((thr), (bw), (dst_off), (src_off), (len))
-#define DUK_BW_INSERT_ENSURE_AREA(thr,bw,off,len) \
+#define DUK_BW_INSERT_ENSURE_AREA(thr, bw, off, len) \
 	/* Evaluates to (duk_uint8_t *) pointing to start of area. */ \
 	duk_bw_insert_ensure_area((thr), (bw), (off), (len))
-#define DUK_BW_REMOVE_ENSURE_SLICE(thr,bw,off,len) \
+#define DUK_BW_REMOVE_ENSURE_SLICE(thr, bw, off, len) \
 	/* No difference between raw/ensure because the buffer shrinks. */ \
 	DUK_BW_REMOVE_RAW_SLICE((thr), (bw), (off), (len))
 
@@ -2747,13 +2891,13 @@ DUK_INTERNAL_DECL const duk_int8_t duk_hex_dectab[256];
 DUK_INTERNAL_DECL const duk_int16_t duk_hex_dectab_shift4[256];
 DUK_INTERNAL_DECL const duk_uint16_t duk_hex_enctab[256];
 #endif
-#endif  /* !DUK_SINGLE_FILE */
+#endif /* !DUK_SINGLE_FILE */
 
 /* Note: assumes that duk_util_probe_steps size is 32 */
 #if defined(DUK_USE_HOBJECT_HASH_PART)
 #if !defined(DUK_SINGLE_FILE)
 DUK_INTERNAL_DECL duk_uint8_t duk_util_probe_steps[32];
-#endif  /* !DUK_SINGLE_FILE */
+#endif /* !DUK_SINGLE_FILE */
 #endif
 
 #if defined(DUK_USE_STRHASH_DENSE)
@@ -2781,26 +2925,58 @@ DUK_INTERNAL_DECL duk_uint8_t *duk_bw_resize(duk_hthread *thr, duk_bufwriter_ctx
 DUK_INTERNAL_DECL void duk_bw_compact(duk_hthread *thr, duk_bufwriter_ctx *bw_ctx);
 DUK_INTERNAL_DECL void duk_bw_write_raw_slice(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t src_off, duk_size_t len);
 DUK_INTERNAL_DECL void duk_bw_write_ensure_slice(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t src_off, duk_size_t len);
-DUK_INTERNAL_DECL void duk_bw_insert_raw_bytes(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t dst_off, const duk_uint8_t *buf, duk_size_t len);
-DUK_INTERNAL_DECL void duk_bw_insert_ensure_bytes(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t dst_off, const duk_uint8_t *buf, duk_size_t len);
-DUK_INTERNAL_DECL void duk_bw_insert_raw_slice(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t dst_off, duk_size_t src_off, duk_size_t len);
-DUK_INTERNAL_DECL void duk_bw_insert_ensure_slice(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t dst_off, duk_size_t src_off, duk_size_t len);
+DUK_INTERNAL_DECL void duk_bw_insert_raw_bytes(duk_hthread *thr,
+                                               duk_bufwriter_ctx *bw,
+                                               duk_size_t dst_off,
+                                               const duk_uint8_t *buf,
+                                               duk_size_t len);
+DUK_INTERNAL_DECL void duk_bw_insert_ensure_bytes(duk_hthread *thr,
+                                                  duk_bufwriter_ctx *bw,
+                                                  duk_size_t dst_off,
+                                                  const duk_uint8_t *buf,
+                                                  duk_size_t len);
+DUK_INTERNAL_DECL void duk_bw_insert_raw_slice(duk_hthread *thr,
+                                               duk_bufwriter_ctx *bw,
+                                               duk_size_t dst_off,
+                                               duk_size_t src_off,
+                                               duk_size_t len);
+DUK_INTERNAL_DECL void duk_bw_insert_ensure_slice(duk_hthread *thr,
+                                                  duk_bufwriter_ctx *bw,
+                                                  duk_size_t dst_off,
+                                                  duk_size_t src_off,
+                                                  duk_size_t len);
 DUK_INTERNAL_DECL duk_uint8_t *duk_bw_insert_raw_area(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t off, duk_size_t len);
 DUK_INTERNAL_DECL duk_uint8_t *duk_bw_insert_ensure_area(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t off, duk_size_t len);
 DUK_INTERNAL_DECL void duk_bw_remove_raw_slice(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t off, duk_size_t len);
 /* No duk_bw_remove_ensure_slice(), functionality would be identical. */
 
-DUK_INTERNAL_DECL DUK_INLINE duk_uint16_t duk_raw_read_u16_be(duk_uint8_t **p);
-DUK_INTERNAL_DECL DUK_INLINE duk_uint32_t duk_raw_read_u32_be(duk_uint8_t **p);
-DUK_INTERNAL_DECL DUK_INLINE duk_double_t duk_raw_read_double_be(duk_uint8_t **p);
-DUK_INTERNAL_DECL DUK_INLINE void duk_raw_write_u16_be(duk_uint8_t **p, duk_uint16_t val);
-DUK_INTERNAL_DECL DUK_INLINE void duk_raw_write_u32_be(duk_uint8_t **p, duk_uint32_t val);
-DUK_INTERNAL_DECL DUK_INLINE void duk_raw_write_double_be(duk_uint8_t **p, duk_double_t val);
-
-#if defined(DUK_USE_DEBUGGER_SUPPORT)  /* For now only needed by the debugger. */
+DUK_INTERNAL_DECL duk_uint16_t duk_raw_read_u16_be(const duk_uint8_t *p);
+DUK_INTERNAL_DECL duk_uint32_t duk_raw_read_u32_be(const duk_uint8_t *p);
+DUK_INTERNAL_DECL duk_float_t duk_raw_read_float_be(const duk_uint8_t *p);
+DUK_INTERNAL_DECL duk_double_t duk_raw_read_double_be(const duk_uint8_t *p);
+DUK_INTERNAL_DECL duk_uint16_t duk_raw_readinc_u16_be(const duk_uint8_t **p);
+DUK_INTERNAL_DECL duk_uint32_t duk_raw_readinc_u32_be(const duk_uint8_t **p);
+DUK_INTERNAL_DECL duk_float_t duk_raw_readinc_float_be(const duk_uint8_t **p);
+DUK_INTERNAL_DECL duk_double_t duk_raw_readinc_double_be(const duk_uint8_t **p);
+DUK_INTERNAL_DECL void duk_raw_write_u16_be(duk_uint8_t *p, duk_uint16_t val);
+DUK_INTERNAL_DECL void duk_raw_write_u32_be(duk_uint8_t *p, duk_uint32_t val);
+DUK_INTERNAL_DECL void duk_raw_write_float_be(duk_uint8_t *p, duk_float_t val);
+DUK_INTERNAL_DECL void duk_raw_write_double_be(duk_uint8_t *p, duk_double_t val);
+DUK_INTERNAL_DECL duk_small_int_t duk_raw_write_xutf8(duk_uint8_t *p, duk_ucodepoint_t val);
+DUK_INTERNAL_DECL duk_small_int_t duk_raw_write_cesu8(duk_uint8_t *p, duk_ucodepoint_t val);
+DUK_INTERNAL_DECL void duk_raw_writeinc_u16_be(duk_uint8_t **p, duk_uint16_t val);
+DUK_INTERNAL_DECL void duk_raw_writeinc_u32_be(duk_uint8_t **p, duk_uint32_t val);
+DUK_INTERNAL_DECL void duk_raw_writeinc_float_be(duk_uint8_t **p, duk_float_t val);
+DUK_INTERNAL_DECL void duk_raw_writeinc_double_be(duk_uint8_t **p, duk_double_t val);
+DUK_INTERNAL_DECL void duk_raw_writeinc_xutf8(duk_uint8_t **p, duk_ucodepoint_t val);
+DUK_INTERNAL_DECL void duk_raw_writeinc_cesu8(duk_uint8_t **p, duk_ucodepoint_t val);
+
+#if defined(DUK_USE_DEBUGGER_SUPPORT) /* For now only needed by the debugger. */
 DUK_INTERNAL_DECL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len);
 #endif
 
+DUK_INTERNAL_DECL duk_double_t duk_util_get_random_double(duk_hthread *thr);
+
 /* memcpy(), memmove() etc wrappers.  The plain variants like duk_memcpy()
  * assume C99+ and 'src' and 'dst' pointers must be non-NULL even when the
  * operation size is zero.  The unsafe variants like duk_memcpy_safe() deal
@@ -2811,7 +2987,8 @@ DUK_INTERNAL_DECL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len);
  * few extra bytes per call site adds up to ~1kB footprint.
  */
 #if defined(DUK_USE_ALLOW_UNDEFINED_BEHAVIOR)
-#define duk_memcpy(dst,src,len)  do { \
+#define duk_memcpy(dst, src, len) \
+	do { \
 		void *duk__dst = (dst); \
 		const void *duk__src = (src); \
 		duk_size_t duk__len = (len); \
@@ -2819,8 +2996,9 @@ DUK_INTERNAL_DECL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len);
 		DUK_ASSERT(duk__src != NULL || duk__len == 0U); \
 		(void) DUK_MEMCPY(duk__dst, duk__src, (size_t) duk__len); \
 	} while (0)
-#define duk_memcpy_unsafe(dst,src,len)  duk_memcpy((dst), (src), (len))
-#define duk_memmove(dst,src,len)  do { \
+#define duk_memcpy_unsafe(dst, src, len) duk_memcpy((dst), (src), (len))
+#define duk_memmove(dst, src, len) \
+	do { \
 		void *duk__dst = (dst); \
 		const void *duk__src = (src); \
 		duk_size_t duk__len = (len); \
@@ -2828,24 +3006,27 @@ DUK_INTERNAL_DECL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len);
 		DUK_ASSERT(duk__src != NULL || duk__len == 0U); \
 		(void) DUK_MEMMOVE(duk__dst, duk__src, (size_t) duk__len); \
 	} while (0)
-#define duk_memmove_unsafe(dst,src,len)  duk_memmove((dst), (src), (len))
-#define duk_memset(dst,val,len)  do { \
+#define duk_memmove_unsafe(dst, src, len) duk_memmove((dst), (src), (len))
+#define duk_memset(dst, val, len) \
+	do { \
 		void *duk__dst = (dst); \
 		duk_small_int_t duk__val = (val); \
 		duk_size_t duk__len = (len); \
 		DUK_ASSERT(duk__dst != NULL || duk__len == 0U); \
 		(void) DUK_MEMSET(duk__dst, duk__val, (size_t) duk__len); \
 	} while (0)
-#define duk_memset_unsafe(dst,val,len)  duk_memset((dst), (val), (len))
-#define duk_memzero(dst,len)  do { \
+#define duk_memset_unsafe(dst, val, len) duk_memset((dst), (val), (len))
+#define duk_memzero(dst, len) \
+	do { \
 		void *duk__dst = (dst); \
 		duk_size_t duk__len = (len); \
 		DUK_ASSERT(duk__dst != NULL || duk__len == 0U); \
 		(void) DUK_MEMZERO(duk__dst, (size_t) duk__len); \
 	} while (0)
-#define duk_memzero_unsafe(dst,len)  duk_memzero((dst), (len))
-#else  /* DUK_USE_ALLOW_UNDEFINED_BEHAVIOR */
-#define duk_memcpy(dst,src,len)  do { \
+#define duk_memzero_unsafe(dst, len) duk_memzero((dst), (len))
+#else /* DUK_USE_ALLOW_UNDEFINED_BEHAVIOR */
+#define duk_memcpy(dst, src, len) \
+	do { \
 		void *duk__dst = (dst); \
 		const void *duk__src = (src); \
 		duk_size_t duk__len = (len); \
@@ -2853,7 +3034,8 @@ DUK_INTERNAL_DECL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len);
 		DUK_ASSERT(duk__src != NULL); \
 		(void) DUK_MEMCPY(duk__dst, duk__src, (size_t) duk__len); \
 	} while (0)
-#define duk_memcpy_unsafe(dst,src,len)  do { \
+#define duk_memcpy_unsafe(dst, src, len) \
+	do { \
 		void *duk__dst = (dst); \
 		const void *duk__src = (src); \
 		duk_size_t duk__len = (len); \
@@ -2865,7 +3047,8 @@ DUK_INTERNAL_DECL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len);
 			(void) DUK_MEMCPY(duk__dst, duk__src, (size_t) duk__len); \
 		} \
 	} while (0)
-#define duk_memmove(dst,src,len)  do { \
+#define duk_memmove(dst, src, len) \
+	do { \
 		void *duk__dst = (dst); \
 		const void *duk__src = (src); \
 		duk_size_t duk__len = (len); \
@@ -2873,7 +3056,8 @@ DUK_INTERNAL_DECL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len);
 		DUK_ASSERT(duk__src != NULL); \
 		(void) DUK_MEMMOVE(duk__dst, duk__src, (size_t) duk__len); \
 	} while (0)
-#define duk_memmove_unsafe(dst,src,len)  do { \
+#define duk_memmove_unsafe(dst, src, len) \
+	do { \
 		void *duk__dst = (dst); \
 		const void *duk__src = (src); \
 		duk_size_t duk__len = (len); \
@@ -2885,14 +3069,16 @@ DUK_INTERNAL_DECL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len);
 			(void) DUK_MEMMOVE(duk__dst, duk__src, (size_t) duk__len); \
 		} \
 	} while (0)
-#define duk_memset(dst,val,len)  do { \
+#define duk_memset(dst, val, len) \
+	do { \
 		void *duk__dst = (dst); \
 		duk_small_int_t duk__val = (val); \
 		duk_size_t duk__len = (len); \
 		DUK_ASSERT(duk__dst != NULL); \
 		(void) DUK_MEMSET(duk__dst, duk__val, (size_t) duk__len); \
 	} while (0)
-#define duk_memset_unsafe(dst,val,len)  do { \
+#define duk_memset_unsafe(dst, val, len) \
+	do { \
 		void *duk__dst = (dst); \
 		duk_small_int_t duk__val = (val); \
 		duk_size_t duk__len = (len); \
@@ -2902,13 +3088,15 @@ DUK_INTERNAL_DECL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len);
 			(void) DUK_MEMSET(duk__dst, duk__val, (size_t) duk__len); \
 		} \
 	} while (0)
-#define duk_memzero(dst,len)  do { \
+#define duk_memzero(dst, len) \
+	do { \
 		void *duk__dst = (dst); \
 		duk_size_t duk__len = (len); \
 		DUK_ASSERT(duk__dst != NULL); \
 		(void) DUK_MEMZERO(duk__dst, (size_t) duk__len); \
 	} while (0)
-#define duk_memzero_unsafe(dst,len)  do { \
+#define duk_memzero_unsafe(dst, len) \
+	do { \
 		void *duk__dst = (dst); \
 		duk_size_t duk__len = (len); \
 		DUK_ASSERT(duk__dst != NULL || duk__len == 0U); \
@@ -2917,10 +3105,10 @@ DUK_INTERNAL_DECL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len);
 			(void) DUK_MEMZERO(duk__dst, (size_t) duk__len); \
 		} \
 	} while (0)
-#endif  /* DUK_USE_ALLOW_UNDEFINED_BEHAVIOR */
+#endif /* DUK_USE_ALLOW_UNDEFINED_BEHAVIOR */
 
-DUK_INTERNAL_DECL DUK_INLINE duk_small_int_t duk_memcmp(const void *s1, const void *s2, duk_size_t len);
-DUK_INTERNAL_DECL DUK_INLINE duk_small_int_t duk_memcmp_unsafe(const void *s1, const void *s2, duk_size_t len);
+DUK_INTERNAL_DECL duk_small_int_t duk_memcmp(const void *s1, const void *s2, duk_size_t len);
+DUK_INTERNAL_DECL duk_small_int_t duk_memcmp_unsafe(const void *s1, const void *s2, duk_size_t len);
 
 DUK_INTERNAL_DECL duk_bool_t duk_is_whole_get_int32_nonegzero(duk_double_t x, duk_int32_t *ival);
 DUK_INTERNAL_DECL duk_bool_t duk_is_whole_get_int32(duk_double_t x, duk_int32_t *ival);
@@ -2940,12 +3128,14 @@ DUK_INTERNAL_DECL duk_bool_t duk_double_is_finite(duk_double_t x);
 DUK_INTERNAL_DECL duk_bool_t duk_double_is_integer(duk_double_t x);
 DUK_INTERNAL_DECL duk_bool_t duk_double_is_safe_integer(duk_double_t x);
 
-DUK_INTERNAL_DECL DUK_INLINE duk_double_t duk_double_div(duk_double_t x, duk_double_t y);
+DUK_INTERNAL_DECL duk_double_t duk_double_div(duk_double_t x, duk_double_t y);
 DUK_INTERNAL_DECL duk_int_t duk_double_to_int_t(duk_double_t x);
 DUK_INTERNAL_DECL duk_uint_t duk_double_to_uint_t(duk_double_t x);
 DUK_INTERNAL_DECL duk_int32_t duk_double_to_int32_t(duk_double_t x);
 DUK_INTERNAL_DECL duk_uint32_t duk_double_to_uint32_t(duk_double_t x);
 DUK_INTERNAL_DECL duk_float_t duk_double_to_float_t(duk_double_t x);
+DUK_INTERNAL_DECL duk_bool_t duk_double_equals(duk_double_t x, duk_double_t y);
+DUK_INTERNAL_DECL duk_bool_t duk_float_equals(duk_float_t x, duk_float_t y);
 
 /*
  *  Miscellaneous
@@ -2961,10 +3151,9 @@ DUK_INTERNAL_DECL duk_float_t duk_double_to_float_t(duk_double_t x);
  *
  * However, incorrectly true for x == 0 so check for that explicitly.
  */
-#define DUK_IS_POWER_OF_TWO(x) \
-	((x) != 0U && ((x) & ((x) - 1U)) == 0U)
+#define DUK_IS_POWER_OF_TWO(x) ((x) != 0U && ((x) & ((x) -1U)) == 0U)
 
-#endif  /* DUK_UTIL_H_INCLUDED */
+#endif /* DUK_UTIL_H_INCLUDED */
 /* #include duk_strings.h */
 /*
  *  Shared string macros.
@@ -2990,149 +3179,151 @@ DUK_INTERNAL_DECL duk_float_t duk_double_to_float_t(duk_double_t x);
 #define DUK_ERRMSG_H_INCLUDED
 
 /* Mostly API and built-in method related */
-#define DUK_STR_INTERNAL_ERROR                   "internal error"
-#define DUK_STR_UNSUPPORTED                      "unsupported"
-#define DUK_STR_INVALID_COUNT                    "invalid count"
-#define DUK_STR_INVALID_ARGS                     "invalid args"
-#define DUK_STR_INVALID_STATE                    "invalid state"
-#define DUK_STR_INVALID_INPUT                    "invalid input"
-#define DUK_STR_INVALID_LENGTH                   "invalid length"
-#define DUK_STR_NOT_CONSTRUCTABLE                "not constructable"
-#define DUK_STR_CONSTRUCT_ONLY                   "constructor requires 'new'"
-#define DUK_STR_NOT_CALLABLE                     "not callable"
-#define DUK_STR_NOT_EXTENSIBLE                   "not extensible"
-#define DUK_STR_NOT_WRITABLE                     "not writable"
-#define DUK_STR_NOT_CONFIGURABLE                 "not configurable"
-#define DUK_STR_INVALID_CONTEXT                  "invalid context"
-#define DUK_STR_INVALID_INDEX                    "invalid args"
-#define DUK_STR_PUSH_BEYOND_ALLOC_STACK          "cannot push beyond allocated stack"
-#define DUK_STR_NOT_UNDEFINED                    "unexpected type"
-#define DUK_STR_NOT_NULL                         "unexpected type"
-#define DUK_STR_NOT_BOOLEAN                      "unexpected type"
-#define DUK_STR_NOT_NUMBER                       "unexpected type"
-#define DUK_STR_NOT_STRING                       "unexpected type"
-#define DUK_STR_NOT_OBJECT                       "unexpected type"
-#define DUK_STR_NOT_POINTER                      "unexpected type"
-#define DUK_STR_NOT_BUFFER                       "not buffer"  /* still in use with verbose messages */
-#define DUK_STR_UNEXPECTED_TYPE                  "unexpected type"
-#define DUK_STR_NOT_THREAD                       "unexpected type"
-#define DUK_STR_NOT_COMPFUNC                     "unexpected type"
-#define DUK_STR_NOT_NATFUNC                      "unexpected type"
-#define DUK_STR_NOT_C_FUNCTION                   "unexpected type"
-#define DUK_STR_NOT_FUNCTION                     "unexpected type"
-#define DUK_STR_NOT_REGEXP                       "unexpected type"
-#define DUK_STR_TOPRIMITIVE_FAILED               "coercion to primitive failed"
-#define DUK_STR_NUMBER_OUTSIDE_RANGE             "number outside range"
-#define DUK_STR_NOT_OBJECT_COERCIBLE             "not object coercible"
-#define DUK_STR_CANNOT_NUMBER_COERCE_SYMBOL      "cannot number coerce Symbol"
-#define DUK_STR_CANNOT_STRING_COERCE_SYMBOL      "cannot string coerce Symbol"
-#define DUK_STR_STRING_TOO_LONG                  "string too long"
-#define DUK_STR_BUFFER_TOO_LONG                  "buffer too long"
-#define DUK_STR_ALLOC_FAILED                     "alloc failed"
-#define DUK_STR_WRONG_BUFFER_TYPE                "wrong buffer type"
-#define DUK_STR_BASE64_ENCODE_FAILED             "base64 encode failed"
-#define DUK_STR_SOURCE_DECODE_FAILED             "source decode failed"
-#define DUK_STR_UTF8_DECODE_FAILED               "utf-8 decode failed"
-#define DUK_STR_BASE64_DECODE_FAILED             "base64 decode failed"
-#define DUK_STR_HEX_DECODE_FAILED                "hex decode failed"
-#define DUK_STR_INVALID_BYTECODE                 "invalid bytecode"
-#define DUK_STR_NO_SOURCECODE                    "no sourcecode"
-#define DUK_STR_RESULT_TOO_LONG                  "result too long"
-#define DUK_STR_INVALID_CFUNC_RC                 "invalid C function rc"
-#define DUK_STR_INVALID_INSTANCEOF_RVAL          "invalid instanceof rval"
-#define DUK_STR_INVALID_INSTANCEOF_RVAL_NOPROTO  "instanceof rval has no .prototype"
+#define DUK_STR_INTERNAL_ERROR                  "internal error"
+#define DUK_STR_UNSUPPORTED                     "unsupported"
+#define DUK_STR_INVALID_COUNT                   "invalid count"
+#define DUK_STR_INVALID_ARGS                    "invalid args"
+#define DUK_STR_INVALID_STATE                   "invalid state"
+#define DUK_STR_INVALID_INPUT                   "invalid input"
+#define DUK_STR_INVALID_LENGTH                  "invalid length"
+#define DUK_STR_NOT_CONSTRUCTABLE               "not constructable"
+#define DUK_STR_CONSTRUCT_ONLY                  "constructor requires 'new'"
+#define DUK_STR_NOT_CALLABLE                    "not callable"
+#define DUK_STR_NOT_EXTENSIBLE                  "not extensible"
+#define DUK_STR_NOT_WRITABLE                    "not writable"
+#define DUK_STR_NOT_CONFIGURABLE                "not configurable"
+#define DUK_STR_INVALID_CONTEXT                 "invalid context"
+#define DUK_STR_INVALID_INDEX                   "invalid args"
+#define DUK_STR_PUSH_BEYOND_ALLOC_STACK         "cannot push beyond allocated stack"
+#define DUK_STR_NOT_UNDEFINED                   "unexpected type"
+#define DUK_STR_NOT_NULL                        "unexpected type"
+#define DUK_STR_NOT_BOOLEAN                     "unexpected type"
+#define DUK_STR_NOT_NUMBER                      "unexpected type"
+#define DUK_STR_NOT_STRING                      "unexpected type"
+#define DUK_STR_NOT_OBJECT                      "unexpected type"
+#define DUK_STR_NOT_POINTER                     "unexpected type"
+#define DUK_STR_NOT_BUFFER                      "not buffer" /* still in use with verbose messages */
+#define DUK_STR_UNEXPECTED_TYPE                 "unexpected type"
+#define DUK_STR_NOT_THREAD                      "unexpected type"
+#define DUK_STR_NOT_COMPFUNC                    "unexpected type"
+#define DUK_STR_NOT_NATFUNC                     "unexpected type"
+#define DUK_STR_NOT_C_FUNCTION                  "unexpected type"
+#define DUK_STR_NOT_FUNCTION                    "unexpected type"
+#define DUK_STR_NOT_REGEXP                      "unexpected type"
+#define DUK_STR_TOPRIMITIVE_FAILED              "coercion to primitive failed"
+#define DUK_STR_NUMBER_OUTSIDE_RANGE            "number outside range"
+#define DUK_STR_NOT_OBJECT_COERCIBLE            "not object coercible"
+#define DUK_STR_CANNOT_NUMBER_COERCE_SYMBOL     "cannot number coerce Symbol"
+#define DUK_STR_CANNOT_STRING_COERCE_SYMBOL     "cannot string coerce Symbol"
+#define DUK_STR_STRING_TOO_LONG                 "string too long"
+#define DUK_STR_BUFFER_TOO_LONG                 "buffer too long"
+#define DUK_STR_ALLOC_FAILED                    "alloc failed"
+#define DUK_STR_WRONG_BUFFER_TYPE               "wrong buffer type"
+#define DUK_STR_BASE64_ENCODE_FAILED            "base64 encode failed"
+#define DUK_STR_SOURCE_DECODE_FAILED            "source decode failed"
+#define DUK_STR_UTF8_DECODE_FAILED              "utf-8 decode failed"
+#define DUK_STR_BASE64_DECODE_FAILED            "base64 decode failed"
+#define DUK_STR_HEX_DECODE_FAILED               "hex decode failed"
+#define DUK_STR_INVALID_BYTECODE                "invalid bytecode"
+#define DUK_STR_NO_SOURCECODE                   "no sourcecode"
+#define DUK_STR_RESULT_TOO_LONG                 "result too long"
+#define DUK_STR_INVALID_CFUNC_RC                "invalid C function rc"
+#define DUK_STR_INVALID_INSTANCEOF_RVAL         "invalid instanceof rval"
+#define DUK_STR_INVALID_INSTANCEOF_RVAL_NOPROTO "instanceof rval has no .prototype"
 
 /* JSON */
-#define DUK_STR_FMT_PTR                          "%p"
-#define DUK_STR_FMT_INVALID_JSON                 "invalid json (at offset %ld)"
-#define DUK_STR_JSONDEC_RECLIMIT                 "json decode recursion limit"
-#define DUK_STR_JSONENC_RECLIMIT                 "json encode recursion limit"
-#define DUK_STR_CYCLIC_INPUT                     "cyclic input"
+#define DUK_STR_FMT_PTR          "%p"
+#define DUK_STR_FMT_INVALID_JSON "invalid json (at offset %ld)"
+#define DUK_STR_CYCLIC_INPUT     "cyclic input"
+
+/* Generic codec */
+#define DUK_STR_DEC_RECLIMIT "decode recursion limit"
+#define DUK_STR_ENC_RECLIMIT "encode recursion limit"
 
 /* Object property access */
-#define DUK_STR_INVALID_BASE                     "invalid base value"
-#define DUK_STR_STRICT_CALLER_READ               "cannot read strict 'caller'"
-#define DUK_STR_PROXY_REJECTED                   "proxy rejected"
-#define DUK_STR_INVALID_ARRAY_LENGTH             "invalid array length"
-#define DUK_STR_SETTER_UNDEFINED                 "setter undefined"
-#define DUK_STR_INVALID_DESCRIPTOR               "invalid descriptor"
+#define DUK_STR_INVALID_BASE         "invalid base value"
+#define DUK_STR_STRICT_CALLER_READ   "cannot read strict 'caller'"
+#define DUK_STR_PROXY_REJECTED       "proxy rejected"
+#define DUK_STR_INVALID_ARRAY_LENGTH "invalid array length"
+#define DUK_STR_SETTER_UNDEFINED     "setter undefined"
+#define DUK_STR_INVALID_DESCRIPTOR   "invalid descriptor"
 
 /* Proxy */
-#define DUK_STR_PROXY_REVOKED                    "proxy revoked"
-#define DUK_STR_INVALID_TRAP_RESULT              "invalid trap result"
+#define DUK_STR_PROXY_REVOKED       "proxy revoked"
+#define DUK_STR_INVALID_TRAP_RESULT "invalid trap result"
 
 /* Variables */
 
 /* Lexer */
-#define DUK_STR_INVALID_ESCAPE                   "invalid escape"
-#define DUK_STR_UNTERMINATED_STRING              "unterminated string"
-#define DUK_STR_UNTERMINATED_COMMENT             "unterminated comment"
-#define DUK_STR_UNTERMINATED_REGEXP              "unterminated regexp"
-#define DUK_STR_TOKEN_LIMIT                      "token limit"
-#define DUK_STR_REGEXP_SUPPORT_DISABLED          "regexp support disabled"
-#define DUK_STR_INVALID_NUMBER_LITERAL           "invalid number literal"
-#define DUK_STR_INVALID_TOKEN                    "invalid token"
+#define DUK_STR_INVALID_ESCAPE          "invalid escape"
+#define DUK_STR_UNTERMINATED_STRING     "unterminated string"
+#define DUK_STR_UNTERMINATED_COMMENT    "unterminated comment"
+#define DUK_STR_UNTERMINATED_REGEXP     "unterminated regexp"
+#define DUK_STR_TOKEN_LIMIT             "token limit"
+#define DUK_STR_REGEXP_SUPPORT_DISABLED "regexp support disabled"
+#define DUK_STR_INVALID_NUMBER_LITERAL  "invalid number literal"
+#define DUK_STR_INVALID_TOKEN           "invalid token"
 
 /* Compiler */
-#define DUK_STR_PARSE_ERROR                      "parse error"
-#define DUK_STR_DUPLICATE_LABEL                  "duplicate label"
-#define DUK_STR_INVALID_LABEL                    "invalid label"
-#define DUK_STR_INVALID_ARRAY_LITERAL            "invalid array literal"
-#define DUK_STR_INVALID_OBJECT_LITERAL           "invalid object literal"
-#define DUK_STR_INVALID_VAR_DECLARATION          "invalid variable declaration"
-#define DUK_STR_CANNOT_DELETE_IDENTIFIER         "cannot delete identifier"
-#define DUK_STR_INVALID_EXPRESSION               "invalid expression"
-#define DUK_STR_INVALID_LVALUE                   "invalid lvalue"
-#define DUK_STR_INVALID_NEWTARGET                "invalid new.target"
-#define DUK_STR_EXPECTED_IDENTIFIER              "expected identifier"
-#define DUK_STR_EMPTY_EXPR_NOT_ALLOWED           "empty expression not allowed"
-#define DUK_STR_INVALID_FOR                      "invalid for statement"
-#define DUK_STR_INVALID_SWITCH                   "invalid switch statement"
-#define DUK_STR_INVALID_BREAK_CONT_LABEL         "invalid break/continue label"
-#define DUK_STR_INVALID_RETURN                   "invalid return"
-#define DUK_STR_INVALID_TRY                      "invalid try"
-#define DUK_STR_INVALID_THROW                    "invalid throw"
-#define DUK_STR_WITH_IN_STRICT_MODE              "with in strict mode"
-#define DUK_STR_FUNC_STMT_NOT_ALLOWED            "function statement not allowed"
-#define DUK_STR_UNTERMINATED_STMT                "unterminated statement"
-#define DUK_STR_INVALID_ARG_NAME                 "invalid argument name"
-#define DUK_STR_INVALID_FUNC_NAME                "invalid function name"
-#define DUK_STR_INVALID_GETSET_NAME              "invalid getter/setter name"
-#define DUK_STR_FUNC_NAME_REQUIRED               "function name required"
+#define DUK_STR_PARSE_ERROR              "parse error"
+#define DUK_STR_DUPLICATE_LABEL          "duplicate label"
+#define DUK_STR_INVALID_LABEL            "invalid label"
+#define DUK_STR_INVALID_ARRAY_LITERAL    "invalid array literal"
+#define DUK_STR_INVALID_OBJECT_LITERAL   "invalid object literal"
+#define DUK_STR_INVALID_VAR_DECLARATION  "invalid variable declaration"
+#define DUK_STR_CANNOT_DELETE_IDENTIFIER "cannot delete identifier"
+#define DUK_STR_INVALID_EXPRESSION       "invalid expression"
+#define DUK_STR_INVALID_LVALUE           "invalid lvalue"
+#define DUK_STR_INVALID_NEWTARGET        "invalid new.target"
+#define DUK_STR_EXPECTED_IDENTIFIER      "expected identifier"
+#define DUK_STR_EMPTY_EXPR_NOT_ALLOWED   "empty expression not allowed"
+#define DUK_STR_INVALID_FOR              "invalid for statement"
+#define DUK_STR_INVALID_SWITCH           "invalid switch statement"
+#define DUK_STR_INVALID_BREAK_CONT_LABEL "invalid break/continue label"
+#define DUK_STR_INVALID_RETURN           "invalid return"
+#define DUK_STR_INVALID_TRY              "invalid try"
+#define DUK_STR_INVALID_THROW            "invalid throw"
+#define DUK_STR_WITH_IN_STRICT_MODE      "with in strict mode"
+#define DUK_STR_FUNC_STMT_NOT_ALLOWED    "function statement not allowed"
+#define DUK_STR_UNTERMINATED_STMT        "unterminated statement"
+#define DUK_STR_INVALID_ARG_NAME         "invalid argument name"
+#define DUK_STR_INVALID_FUNC_NAME        "invalid function name"
+#define DUK_STR_INVALID_GETSET_NAME      "invalid getter/setter name"
+#define DUK_STR_FUNC_NAME_REQUIRED       "function name required"
 
 /* RegExp */
-#define DUK_STR_INVALID_QUANTIFIER               "invalid regexp quantifier"
-#define DUK_STR_INVALID_QUANTIFIER_NO_ATOM       "quantifier without preceding atom"
-#define DUK_STR_INVALID_QUANTIFIER_VALUES        "quantifier values invalid (qmin > qmax)"
-#define DUK_STR_QUANTIFIER_TOO_MANY_COPIES       "quantifier requires too many atom copies"
-#define DUK_STR_UNEXPECTED_CLOSING_PAREN         "unexpected closing parenthesis"
-#define DUK_STR_UNEXPECTED_END_OF_PATTERN        "unexpected end of pattern"
-#define DUK_STR_UNEXPECTED_REGEXP_TOKEN          "unexpected token in regexp"
-#define DUK_STR_INVALID_REGEXP_FLAGS             "invalid regexp flags"
-#define DUK_STR_INVALID_REGEXP_ESCAPE            "invalid regexp escape"
-#define DUK_STR_INVALID_BACKREFS                 "invalid backreference(s)"
-#define DUK_STR_INVALID_REGEXP_CHARACTER         "invalid regexp character"
-#define DUK_STR_INVALID_REGEXP_GROUP             "invalid regexp group"
-#define DUK_STR_UNTERMINATED_CHARCLASS           "unterminated character class"
-#define DUK_STR_INVALID_RANGE                    "invalid range"
+#define DUK_STR_INVALID_QUANTIFIER         "invalid regexp quantifier"
+#define DUK_STR_INVALID_QUANTIFIER_NO_ATOM "quantifier without preceding atom"
+#define DUK_STR_INVALID_QUANTIFIER_VALUES  "quantifier values invalid (qmin > qmax)"
+#define DUK_STR_QUANTIFIER_TOO_MANY_COPIES "quantifier requires too many atom copies"
+#define DUK_STR_UNEXPECTED_CLOSING_PAREN   "unexpected closing parenthesis"
+#define DUK_STR_UNEXPECTED_END_OF_PATTERN  "unexpected end of pattern"
+#define DUK_STR_UNEXPECTED_REGEXP_TOKEN    "unexpected token in regexp"
+#define DUK_STR_INVALID_REGEXP_FLAGS       "invalid regexp flags"
+#define DUK_STR_INVALID_REGEXP_ESCAPE      "invalid regexp escape"
+#define DUK_STR_INVALID_BACKREFS           "invalid backreference(s)"
+#define DUK_STR_INVALID_REGEXP_CHARACTER   "invalid regexp character"
+#define DUK_STR_INVALID_REGEXP_GROUP       "invalid regexp group"
+#define DUK_STR_UNTERMINATED_CHARCLASS     "unterminated character class"
+#define DUK_STR_INVALID_RANGE              "invalid range"
 
 /* Limits */
-#define DUK_STR_VALSTACK_LIMIT                   "valstack limit"
-#define DUK_STR_CALLSTACK_LIMIT                  "callstack limit"
-#define DUK_STR_PROTOTYPE_CHAIN_LIMIT            "prototype chain limit"
-#define DUK_STR_BOUND_CHAIN_LIMIT                "function call bound chain limit"
-#define DUK_STR_C_CALLSTACK_LIMIT                "C call stack depth limit"
-#define DUK_STR_COMPILER_RECURSION_LIMIT         "compiler recursion limit"
-#define DUK_STR_BYTECODE_LIMIT                   "bytecode limit"
-#define DUK_STR_REG_LIMIT                        "register limit"
-#define DUK_STR_TEMP_LIMIT                       "temp limit"
-#define DUK_STR_CONST_LIMIT                      "const limit"
-#define DUK_STR_FUNC_LIMIT                       "function limit"
-#define DUK_STR_REGEXP_COMPILER_RECURSION_LIMIT  "regexp compiler recursion limit"
-#define DUK_STR_REGEXP_EXECUTOR_RECURSION_LIMIT  "regexp executor recursion limit"
-#define DUK_STR_REGEXP_EXECUTOR_STEP_LIMIT       "regexp step limit"
-
-#endif  /* DUK_ERRMSG_H_INCLUDED */
+#define DUK_STR_VALSTACK_LIMIT                  "valstack limit"
+#define DUK_STR_CALLSTACK_LIMIT                 "callstack limit"
+#define DUK_STR_PROTOTYPE_CHAIN_LIMIT           "prototype chain limit"
+#define DUK_STR_BOUND_CHAIN_LIMIT               "function call bound chain limit"
+#define DUK_STR_NATIVE_STACK_LIMIT              "C stack depth limit"
+#define DUK_STR_COMPILER_RECURSION_LIMIT        "compiler recursion limit"
+#define DUK_STR_BYTECODE_LIMIT                  "bytecode limit"
+#define DUK_STR_REG_LIMIT                       "register limit"
+#define DUK_STR_TEMP_LIMIT                      "temp limit"
+#define DUK_STR_CONST_LIMIT                     "const limit"
+#define DUK_STR_FUNC_LIMIT                      "function limit"
+#define DUK_STR_REGEXP_COMPILER_RECURSION_LIMIT "regexp compiler recursion limit"
+#define DUK_STR_REGEXP_EXECUTOR_RECURSION_LIMIT "regexp executor recursion limit"
+#define DUK_STR_REGEXP_EXECUTOR_STEP_LIMIT      "regexp step limit"
+
+#endif /* DUK_ERRMSG_H_INCLUDED */
 /* #include duk_js_bytecode.h */
 /*
  *  ECMAScript bytecode
@@ -3219,403 +3410,394 @@ DUK_INTERNAL_DECL duk_float_t duk_double_to_float_t(duk_double_t x);
 
 typedef duk_uint32_t duk_instr_t;
 
-#define DUK_BC_SHIFT_OP             0
-#define DUK_BC_SHIFT_A              8
-#define DUK_BC_SHIFT_B              16
-#define DUK_BC_SHIFT_C              24
-#define DUK_BC_SHIFT_BC             DUK_BC_SHIFT_B
-#define DUK_BC_SHIFT_ABC            DUK_BC_SHIFT_A
-
-#define DUK_BC_UNSHIFTED_MASK_OP    0xffUL
-#define DUK_BC_UNSHIFTED_MASK_A     0xffUL
-#define DUK_BC_UNSHIFTED_MASK_B     0xffUL
-#define DUK_BC_UNSHIFTED_MASK_C     0xffUL
-#define DUK_BC_UNSHIFTED_MASK_BC    0xffffUL
-#define DUK_BC_UNSHIFTED_MASK_ABC   0xffffffUL
-
-#define DUK_BC_SHIFTED_MASK_OP      (DUK_BC_UNSHIFTED_MASK_OP << DUK_BC_SHIFT_OP)
-#define DUK_BC_SHIFTED_MASK_A       (DUK_BC_UNSHIFTED_MASK_A << DUK_BC_SHIFT_A)
-#define DUK_BC_SHIFTED_MASK_B       (DUK_BC_UNSHIFTED_MASK_B << DUK_BC_SHIFT_B)
-#define DUK_BC_SHIFTED_MASK_C       (DUK_BC_UNSHIFTED_MASK_C << DUK_BC_SHIFT_C)
-#define DUK_BC_SHIFTED_MASK_BC      (DUK_BC_UNSHIFTED_MASK_BC << DUK_BC_SHIFT_BC)
-#define DUK_BC_SHIFTED_MASK_ABC     (DUK_BC_UNSHIFTED_MASK_ABC << DUK_BC_SHIFT_ABC)
-
-#define DUK_DEC_OP(x)               ((x) & 0xffUL)
-#define DUK_DEC_A(x)                (((x) >> 8) & 0xffUL)
-#define DUK_DEC_B(x)                (((x) >> 16) & 0xffUL)
-#define DUK_DEC_C(x)                (((x) >> 24) & 0xffUL)
-#define DUK_DEC_BC(x)               (((x) >> 16) & 0xffffUL)
-#define DUK_DEC_ABC(x)              (((x) >> 8) & 0xffffffUL)
-
-#define DUK_ENC_OP(op)              ((duk_instr_t) (op))
-#define DUK_ENC_OP_ABC(op,abc)      ((duk_instr_t) ( \
-                                        (((duk_instr_t) (abc)) << 8) | \
-                                        ((duk_instr_t) (op)) \
-                                    ))
-#define DUK_ENC_OP_A_BC(op,a,bc)    ((duk_instr_t) ( \
-                                        (((duk_instr_t) (bc)) << 16) | \
-                                        (((duk_instr_t) (a)) << 8) | \
-                                        ((duk_instr_t) (op)) \
-                                    ))
-#define DUK_ENC_OP_A_B_C(op,a,b,c)  ((duk_instr_t) ( \
-                                        (((duk_instr_t) (c)) << 24) | \
-                                        (((duk_instr_t) (b)) << 16) | \
-                                        (((duk_instr_t) (a)) << 8) | \
-                                        ((duk_instr_t) (op)) \
-                                    ))
-#define DUK_ENC_OP_A_B(op,a,b)      DUK_ENC_OP_A_B_C((op),(a),(b),0)
-#define DUK_ENC_OP_A(op,a)          DUK_ENC_OP_A_B_C((op),(a),0,0)
-#define DUK_ENC_OP_BC(op,bc)        DUK_ENC_OP_A_BC((op),0,(bc))
+#define DUK_BC_SHIFT_OP  0
+#define DUK_BC_SHIFT_A   8
+#define DUK_BC_SHIFT_B   16
+#define DUK_BC_SHIFT_C   24
+#define DUK_BC_SHIFT_BC  DUK_BC_SHIFT_B
+#define DUK_BC_SHIFT_ABC DUK_BC_SHIFT_A
+
+#define DUK_BC_UNSHIFTED_MASK_OP  0xffUL
+#define DUK_BC_UNSHIFTED_MASK_A   0xffUL
+#define DUK_BC_UNSHIFTED_MASK_B   0xffUL
+#define DUK_BC_UNSHIFTED_MASK_C   0xffUL
+#define DUK_BC_UNSHIFTED_MASK_BC  0xffffUL
+#define DUK_BC_UNSHIFTED_MASK_ABC 0xffffffUL
+
+#define DUK_BC_SHIFTED_MASK_OP  (DUK_BC_UNSHIFTED_MASK_OP << DUK_BC_SHIFT_OP)
+#define DUK_BC_SHIFTED_MASK_A   (DUK_BC_UNSHIFTED_MASK_A << DUK_BC_SHIFT_A)
+#define DUK_BC_SHIFTED_MASK_B   (DUK_BC_UNSHIFTED_MASK_B << DUK_BC_SHIFT_B)
+#define DUK_BC_SHIFTED_MASK_C   (DUK_BC_UNSHIFTED_MASK_C << DUK_BC_SHIFT_C)
+#define DUK_BC_SHIFTED_MASK_BC  (DUK_BC_UNSHIFTED_MASK_BC << DUK_BC_SHIFT_BC)
+#define DUK_BC_SHIFTED_MASK_ABC (DUK_BC_UNSHIFTED_MASK_ABC << DUK_BC_SHIFT_ABC)
+
+#define DUK_DEC_OP(x)  ((x) &0xffUL)
+#define DUK_DEC_A(x)   (((x) >> 8) & 0xffUL)
+#define DUK_DEC_B(x)   (((x) >> 16) & 0xffUL)
+#define DUK_DEC_C(x)   (((x) >> 24) & 0xffUL)
+#define DUK_DEC_BC(x)  (((x) >> 16) & 0xffffUL)
+#define DUK_DEC_ABC(x) (((x) >> 8) & 0xffffffUL)
+
+#define DUK_ENC_OP(op)          ((duk_instr_t) (op))
+#define DUK_ENC_OP_ABC(op, abc) ((duk_instr_t) ((((duk_instr_t) (abc)) << 8) | ((duk_instr_t) (op))))
+#define DUK_ENC_OP_A_BC(op, a, bc) \
+	((duk_instr_t) ((((duk_instr_t) (bc)) << 16) | (((duk_instr_t) (a)) << 8) | ((duk_instr_t) (op))))
+#define DUK_ENC_OP_A_B_C(op, a, b, c) \
+	((duk_instr_t) ((((duk_instr_t) (c)) << 24) | (((duk_instr_t) (b)) << 16) | (((duk_instr_t) (a)) << 8) | \
+	                ((duk_instr_t) (op))))
+#define DUK_ENC_OP_A_B(op, a, b) DUK_ENC_OP_A_B_C((op), (a), (b), 0)
+#define DUK_ENC_OP_A(op, a)      DUK_ENC_OP_A_B_C((op), (a), 0, 0)
+#define DUK_ENC_OP_BC(op, bc)    DUK_ENC_OP_A_BC((op), 0, (bc))
 
 /* Get opcode base value with B/C reg/const flags cleared. */
-#define DUK_BC_NOREGCONST_OP(op)    ((op) & 0xfc)
+#define DUK_BC_NOREGCONST_OP(op) ((op) &0xfc)
 
 /* Constants should be signed so that signed arithmetic involving them
  * won't cause values to be coerced accidentally to unsigned.
  */
-#define DUK_BC_OP_MIN               0
-#define DUK_BC_OP_MAX               0xffL
-#define DUK_BC_A_MIN                0
-#define DUK_BC_A_MAX                0xffL
-#define DUK_BC_B_MIN                0
-#define DUK_BC_B_MAX                0xffL
-#define DUK_BC_C_MIN                0
-#define DUK_BC_C_MAX                0xffL
-#define DUK_BC_BC_MIN               0
-#define DUK_BC_BC_MAX               0xffffL
-#define DUK_BC_ABC_MIN              0
-#define DUK_BC_ABC_MAX              0xffffffL
+#define DUK_BC_OP_MIN  0
+#define DUK_BC_OP_MAX  0xffL
+#define DUK_BC_A_MIN   0
+#define DUK_BC_A_MAX   0xffL
+#define DUK_BC_B_MIN   0
+#define DUK_BC_B_MAX   0xffL
+#define DUK_BC_C_MIN   0
+#define DUK_BC_C_MAX   0xffL
+#define DUK_BC_BC_MIN  0
+#define DUK_BC_BC_MAX  0xffffL
+#define DUK_BC_ABC_MIN 0
+#define DUK_BC_ABC_MAX 0xffffffL
 
 /* Masks for B/C reg/const indicator in opcode field. */
-#define DUK_BC_REGCONST_B           (0x01UL)
-#define DUK_BC_REGCONST_C           (0x02UL)
+#define DUK_BC_REGCONST_B (0x01UL)
+#define DUK_BC_REGCONST_C (0x02UL)
 
 /* Misc. masks for opcode field. */
-#define DUK_BC_INCDECP_FLAG_DEC     (0x04UL)
-#define DUK_BC_INCDECP_FLAG_POST    (0x08UL)
+#define DUK_BC_INCDECP_FLAG_DEC  (0x04UL)
+#define DUK_BC_INCDECP_FLAG_POST (0x08UL)
 
 /* Opcodes. */
-#define DUK_OP_LDREG                0
-#define DUK_OP_STREG                1
-#define DUK_OP_JUMP                 2
-#define DUK_OP_LDCONST              3
-#define DUK_OP_LDINT                4
-#define DUK_OP_LDINTX               5
-#define DUK_OP_LDTHIS               6
-#define DUK_OP_LDUNDEF              7
-#define DUK_OP_LDNULL               8
-#define DUK_OP_LDTRUE               9
-#define DUK_OP_LDFALSE              10
-#define DUK_OP_GETVAR               11
-#define DUK_OP_BNOT                 12
-#define DUK_OP_LNOT                 13
-#define DUK_OP_UNM                  14
-#define DUK_OP_UNP                  15
-#define DUK_OP_EQ                   16
-#define DUK_OP_EQ_RR                16
-#define DUK_OP_EQ_CR                17
-#define DUK_OP_EQ_RC                18
-#define DUK_OP_EQ_CC                19
-#define DUK_OP_NEQ                  20
-#define DUK_OP_NEQ_RR               20
-#define DUK_OP_NEQ_CR               21
-#define DUK_OP_NEQ_RC               22
-#define DUK_OP_NEQ_CC               23
-#define DUK_OP_SEQ                  24
-#define DUK_OP_SEQ_RR               24
-#define DUK_OP_SEQ_CR               25
-#define DUK_OP_SEQ_RC               26
-#define DUK_OP_SEQ_CC               27
-#define DUK_OP_SNEQ                 28
-#define DUK_OP_SNEQ_RR              28
-#define DUK_OP_SNEQ_CR              29
-#define DUK_OP_SNEQ_RC              30
-#define DUK_OP_SNEQ_CC              31
-#define DUK_OP_GT                   32
-#define DUK_OP_GT_RR                32
-#define DUK_OP_GT_CR                33
-#define DUK_OP_GT_RC                34
-#define DUK_OP_GT_CC                35
-#define DUK_OP_GE                   36
-#define DUK_OP_GE_RR                36
-#define DUK_OP_GE_CR                37
-#define DUK_OP_GE_RC                38
-#define DUK_OP_GE_CC                39
-#define DUK_OP_LT                   40
-#define DUK_OP_LT_RR                40
-#define DUK_OP_LT_CR                41
-#define DUK_OP_LT_RC                42
-#define DUK_OP_LT_CC                43
-#define DUK_OP_LE                   44
-#define DUK_OP_LE_RR                44
-#define DUK_OP_LE_CR                45
-#define DUK_OP_LE_RC                46
-#define DUK_OP_LE_CC                47
-#define DUK_OP_IFTRUE               48
-#define DUK_OP_IFTRUE_R             48
-#define DUK_OP_IFTRUE_C             49
-#define DUK_OP_IFFALSE              50
-#define DUK_OP_IFFALSE_R            50
-#define DUK_OP_IFFALSE_C            51
-#define DUK_OP_ADD                  52
-#define DUK_OP_ADD_RR               52
-#define DUK_OP_ADD_CR               53
-#define DUK_OP_ADD_RC               54
-#define DUK_OP_ADD_CC               55
-#define DUK_OP_SUB                  56
-#define DUK_OP_SUB_RR               56
-#define DUK_OP_SUB_CR               57
-#define DUK_OP_SUB_RC               58
-#define DUK_OP_SUB_CC               59
-#define DUK_OP_MUL                  60
-#define DUK_OP_MUL_RR               60
-#define DUK_OP_MUL_CR               61
-#define DUK_OP_MUL_RC               62
-#define DUK_OP_MUL_CC               63
-#define DUK_OP_DIV                  64
-#define DUK_OP_DIV_RR               64
-#define DUK_OP_DIV_CR               65
-#define DUK_OP_DIV_RC               66
-#define DUK_OP_DIV_CC               67
-#define DUK_OP_MOD                  68
-#define DUK_OP_MOD_RR               68
-#define DUK_OP_MOD_CR               69
-#define DUK_OP_MOD_RC               70
-#define DUK_OP_MOD_CC               71
-#define DUK_OP_EXP                  72
-#define DUK_OP_EXP_RR               72
-#define DUK_OP_EXP_CR               73
-#define DUK_OP_EXP_RC               74
-#define DUK_OP_EXP_CC               75
-#define DUK_OP_BAND                 76
-#define DUK_OP_BAND_RR              76
-#define DUK_OP_BAND_CR              77
-#define DUK_OP_BAND_RC              78
-#define DUK_OP_BAND_CC              79
-#define DUK_OP_BOR                  80
-#define DUK_OP_BOR_RR               80
-#define DUK_OP_BOR_CR               81
-#define DUK_OP_BOR_RC               82
-#define DUK_OP_BOR_CC               83
-#define DUK_OP_BXOR                 84
-#define DUK_OP_BXOR_RR              84
-#define DUK_OP_BXOR_CR              85
-#define DUK_OP_BXOR_RC              86
-#define DUK_OP_BXOR_CC              87
-#define DUK_OP_BASL                 88
-#define DUK_OP_BASL_RR              88
-#define DUK_OP_BASL_CR              89
-#define DUK_OP_BASL_RC              90
-#define DUK_OP_BASL_CC              91
-#define DUK_OP_BLSR                 92
-#define DUK_OP_BLSR_RR              92
-#define DUK_OP_BLSR_CR              93
-#define DUK_OP_BLSR_RC              94
-#define DUK_OP_BLSR_CC              95
-#define DUK_OP_BASR                 96
-#define DUK_OP_BASR_RR              96
-#define DUK_OP_BASR_CR              97
-#define DUK_OP_BASR_RC              98
-#define DUK_OP_BASR_CC              99
-#define DUK_OP_INSTOF               100
-#define DUK_OP_INSTOF_RR            100
-#define DUK_OP_INSTOF_CR            101
-#define DUK_OP_INSTOF_RC            102
-#define DUK_OP_INSTOF_CC            103
-#define DUK_OP_IN                   104
-#define DUK_OP_IN_RR                104
-#define DUK_OP_IN_CR                105
-#define DUK_OP_IN_RC                106
-#define DUK_OP_IN_CC                107
-#define DUK_OP_GETPROP              108
-#define DUK_OP_GETPROP_RR           108
-#define DUK_OP_GETPROP_CR           109
-#define DUK_OP_GETPROP_RC           110
-#define DUK_OP_GETPROP_CC           111
-#define DUK_OP_PUTPROP              112
-#define DUK_OP_PUTPROP_RR           112
-#define DUK_OP_PUTPROP_CR           113
-#define DUK_OP_PUTPROP_RC           114
-#define DUK_OP_PUTPROP_CC           115
-#define DUK_OP_DELPROP              116
-#define DUK_OP_DELPROP_RR           116
-#define DUK_OP_DELPROP_CR_UNUSED    117  /* unused now */
-#define DUK_OP_DELPROP_RC           118
-#define DUK_OP_DELPROP_CC_UNUSED    119  /* unused now */
-#define DUK_OP_PREINCR              120  /* pre/post opcode values have constraints, */
-#define DUK_OP_PREDECR              121  /* see duk_js_executor.c and duk_js_compiler.c. */
-#define DUK_OP_POSTINCR             122
-#define DUK_OP_POSTDECR             123
-#define DUK_OP_PREINCV              124
-#define DUK_OP_PREDECV              125
-#define DUK_OP_POSTINCV             126
-#define DUK_OP_POSTDECV             127
-#define DUK_OP_PREINCP              128  /* pre/post inc/dec prop opcodes have constraints */
-#define DUK_OP_PREINCP_RR           128
-#define DUK_OP_PREINCP_CR           129
-#define DUK_OP_PREINCP_RC           130
-#define DUK_OP_PREINCP_CC           131
-#define DUK_OP_PREDECP              132
-#define DUK_OP_PREDECP_RR           132
-#define DUK_OP_PREDECP_CR           133
-#define DUK_OP_PREDECP_RC           134
-#define DUK_OP_PREDECP_CC           135
-#define DUK_OP_POSTINCP             136
-#define DUK_OP_POSTINCP_RR          136
-#define DUK_OP_POSTINCP_CR          137
-#define DUK_OP_POSTINCP_RC          138
-#define DUK_OP_POSTINCP_CC          139
-#define DUK_OP_POSTDECP             140
-#define DUK_OP_POSTDECP_RR          140
-#define DUK_OP_POSTDECP_CR          141
-#define DUK_OP_POSTDECP_RC          142
-#define DUK_OP_POSTDECP_CC          143
-#define DUK_OP_DECLVAR              144
-#define DUK_OP_DECLVAR_RR           144
-#define DUK_OP_DECLVAR_CR           145
-#define DUK_OP_DECLVAR_RC           146
-#define DUK_OP_DECLVAR_CC           147
-#define DUK_OP_REGEXP               148
-#define DUK_OP_REGEXP_RR            148
-#define DUK_OP_REGEXP_CR            149
-#define DUK_OP_REGEXP_RC            150
-#define DUK_OP_REGEXP_CC            151
-#define DUK_OP_CLOSURE              152
-#define DUK_OP_TYPEOF               153
-#define DUK_OP_TYPEOFID             154
-#define DUK_OP_PUTVAR               155
-#define DUK_OP_DELVAR               156
-#define DUK_OP_RETREG               157
-#define DUK_OP_RETUNDEF             158
-#define DUK_OP_RETCONST             159
-#define DUK_OP_RETCONSTN            160  /* return const without incref (e.g. number) */
-#define DUK_OP_LABEL                161
-#define DUK_OP_ENDLABEL             162
-#define DUK_OP_BREAK                163
-#define DUK_OP_CONTINUE             164
-#define DUK_OP_TRYCATCH             165
-#define DUK_OP_ENDTRY               166
-#define DUK_OP_ENDCATCH             167
-#define DUK_OP_ENDFIN               168
-#define DUK_OP_THROW                169
-#define DUK_OP_INVLHS               170
-#define DUK_OP_CSREG                171
-#define DUK_OP_CSVAR                172
-#define DUK_OP_CSVAR_RR             172
-#define DUK_OP_CSVAR_CR             173
-#define DUK_OP_CSVAR_RC             174
-#define DUK_OP_CSVAR_CC             175
-#define DUK_OP_CALL0                176  /* DUK_OP_CALL0 & 0x0F must be zero. */
-#define DUK_OP_CALL1                177
-#define DUK_OP_CALL2                178
-#define DUK_OP_CALL3                179
-#define DUK_OP_CALL4                180
-#define DUK_OP_CALL5                181
-#define DUK_OP_CALL6                182
-#define DUK_OP_CALL7                183
-#define DUK_OP_CALL8                184
-#define DUK_OP_CALL9                185
-#define DUK_OP_CALL10               186
-#define DUK_OP_CALL11               187
-#define DUK_OP_CALL12               188
-#define DUK_OP_CALL13               189
-#define DUK_OP_CALL14               190
-#define DUK_OP_CALL15               191
-#define DUK_OP_NEWOBJ               192
-#define DUK_OP_NEWARR               193
-#define DUK_OP_MPUTOBJ              194
-#define DUK_OP_MPUTOBJI             195
-#define DUK_OP_INITSET              196
-#define DUK_OP_INITGET              197
-#define DUK_OP_MPUTARR              198
-#define DUK_OP_MPUTARRI             199
-#define DUK_OP_SETALEN              200
-#define DUK_OP_INITENUM             201
-#define DUK_OP_NEXTENUM             202
-#define DUK_OP_NEWTARGET            203
-#define DUK_OP_DEBUGGER             204
-#define DUK_OP_NOP                  205
-#define DUK_OP_INVALID              206
-#define DUK_OP_UNUSED207            207
-#define DUK_OP_GETPROPC             208
-#define DUK_OP_GETPROPC_RR          208
-#define DUK_OP_GETPROPC_CR          209
-#define DUK_OP_GETPROPC_RC          210
-#define DUK_OP_GETPROPC_CC          211
-#define DUK_OP_UNUSED212            212
-#define DUK_OP_UNUSED213            213
-#define DUK_OP_UNUSED214            214
-#define DUK_OP_UNUSED215            215
-#define DUK_OP_UNUSED216            216
-#define DUK_OP_UNUSED217            217
-#define DUK_OP_UNUSED218            218
-#define DUK_OP_UNUSED219            219
-#define DUK_OP_UNUSED220            220
-#define DUK_OP_UNUSED221            221
-#define DUK_OP_UNUSED222            222
-#define DUK_OP_UNUSED223            223
-#define DUK_OP_UNUSED224            224
-#define DUK_OP_UNUSED225            225
-#define DUK_OP_UNUSED226            226
-#define DUK_OP_UNUSED227            227
-#define DUK_OP_UNUSED228            228
-#define DUK_OP_UNUSED229            229
-#define DUK_OP_UNUSED230            230
-#define DUK_OP_UNUSED231            231
-#define DUK_OP_UNUSED232            232
-#define DUK_OP_UNUSED233            233
-#define DUK_OP_UNUSED234            234
-#define DUK_OP_UNUSED235            235
-#define DUK_OP_UNUSED236            236
-#define DUK_OP_UNUSED237            237
-#define DUK_OP_UNUSED238            238
-#define DUK_OP_UNUSED239            239
-#define DUK_OP_UNUSED240            240
-#define DUK_OP_UNUSED241            241
-#define DUK_OP_UNUSED242            242
-#define DUK_OP_UNUSED243            243
-#define DUK_OP_UNUSED244            244
-#define DUK_OP_UNUSED245            245
-#define DUK_OP_UNUSED246            246
-#define DUK_OP_UNUSED247            247
-#define DUK_OP_UNUSED248            248
-#define DUK_OP_UNUSED249            249
-#define DUK_OP_UNUSED250            250
-#define DUK_OP_UNUSED251            251
-#define DUK_OP_UNUSED252            252
-#define DUK_OP_UNUSED253            253
-#define DUK_OP_UNUSED254            254
-#define DUK_OP_UNUSED255            255
-#define DUK_OP_NONE                 256  /* dummy value used as marker (doesn't fit in 8-bit field) */
+#define DUK_OP_LDREG             0
+#define DUK_OP_STREG             1
+#define DUK_OP_JUMP              2
+#define DUK_OP_LDCONST           3
+#define DUK_OP_LDINT             4
+#define DUK_OP_LDINTX            5
+#define DUK_OP_LDTHIS            6
+#define DUK_OP_LDUNDEF           7
+#define DUK_OP_LDNULL            8
+#define DUK_OP_LDTRUE            9
+#define DUK_OP_LDFALSE           10
+#define DUK_OP_GETVAR            11
+#define DUK_OP_BNOT              12
+#define DUK_OP_LNOT              13
+#define DUK_OP_UNM               14
+#define DUK_OP_UNP               15
+#define DUK_OP_EQ                16
+#define DUK_OP_EQ_RR             16
+#define DUK_OP_EQ_CR             17
+#define DUK_OP_EQ_RC             18
+#define DUK_OP_EQ_CC             19
+#define DUK_OP_NEQ               20
+#define DUK_OP_NEQ_RR            20
+#define DUK_OP_NEQ_CR            21
+#define DUK_OP_NEQ_RC            22
+#define DUK_OP_NEQ_CC            23
+#define DUK_OP_SEQ               24
+#define DUK_OP_SEQ_RR            24
+#define DUK_OP_SEQ_CR            25
+#define DUK_OP_SEQ_RC            26
+#define DUK_OP_SEQ_CC            27
+#define DUK_OP_SNEQ              28
+#define DUK_OP_SNEQ_RR           28
+#define DUK_OP_SNEQ_CR           29
+#define DUK_OP_SNEQ_RC           30
+#define DUK_OP_SNEQ_CC           31
+#define DUK_OP_GT                32
+#define DUK_OP_GT_RR             32
+#define DUK_OP_GT_CR             33
+#define DUK_OP_GT_RC             34
+#define DUK_OP_GT_CC             35
+#define DUK_OP_GE                36
+#define DUK_OP_GE_RR             36
+#define DUK_OP_GE_CR             37
+#define DUK_OP_GE_RC             38
+#define DUK_OP_GE_CC             39
+#define DUK_OP_LT                40
+#define DUK_OP_LT_RR             40
+#define DUK_OP_LT_CR             41
+#define DUK_OP_LT_RC             42
+#define DUK_OP_LT_CC             43
+#define DUK_OP_LE                44
+#define DUK_OP_LE_RR             44
+#define DUK_OP_LE_CR             45
+#define DUK_OP_LE_RC             46
+#define DUK_OP_LE_CC             47
+#define DUK_OP_IFTRUE            48
+#define DUK_OP_IFTRUE_R          48
+#define DUK_OP_IFTRUE_C          49
+#define DUK_OP_IFFALSE           50
+#define DUK_OP_IFFALSE_R         50
+#define DUK_OP_IFFALSE_C         51
+#define DUK_OP_ADD               52
+#define DUK_OP_ADD_RR            52
+#define DUK_OP_ADD_CR            53
+#define DUK_OP_ADD_RC            54
+#define DUK_OP_ADD_CC            55
+#define DUK_OP_SUB               56
+#define DUK_OP_SUB_RR            56
+#define DUK_OP_SUB_CR            57
+#define DUK_OP_SUB_RC            58
+#define DUK_OP_SUB_CC            59
+#define DUK_OP_MUL               60
+#define DUK_OP_MUL_RR            60
+#define DUK_OP_MUL_CR            61
+#define DUK_OP_MUL_RC            62
+#define DUK_OP_MUL_CC            63
+#define DUK_OP_DIV               64
+#define DUK_OP_DIV_RR            64
+#define DUK_OP_DIV_CR            65
+#define DUK_OP_DIV_RC            66
+#define DUK_OP_DIV_CC            67
+#define DUK_OP_MOD               68
+#define DUK_OP_MOD_RR            68
+#define DUK_OP_MOD_CR            69
+#define DUK_OP_MOD_RC            70
+#define DUK_OP_MOD_CC            71
+#define DUK_OP_EXP               72
+#define DUK_OP_EXP_RR            72
+#define DUK_OP_EXP_CR            73
+#define DUK_OP_EXP_RC            74
+#define DUK_OP_EXP_CC            75
+#define DUK_OP_BAND              76
+#define DUK_OP_BAND_RR           76
+#define DUK_OP_BAND_CR           77
+#define DUK_OP_BAND_RC           78
+#define DUK_OP_BAND_CC           79
+#define DUK_OP_BOR               80
+#define DUK_OP_BOR_RR            80
+#define DUK_OP_BOR_CR            81
+#define DUK_OP_BOR_RC            82
+#define DUK_OP_BOR_CC            83
+#define DUK_OP_BXOR              84
+#define DUK_OP_BXOR_RR           84
+#define DUK_OP_BXOR_CR           85
+#define DUK_OP_BXOR_RC           86
+#define DUK_OP_BXOR_CC           87
+#define DUK_OP_BASL              88
+#define DUK_OP_BASL_RR           88
+#define DUK_OP_BASL_CR           89
+#define DUK_OP_BASL_RC           90
+#define DUK_OP_BASL_CC           91
+#define DUK_OP_BLSR              92
+#define DUK_OP_BLSR_RR           92
+#define DUK_OP_BLSR_CR           93
+#define DUK_OP_BLSR_RC           94
+#define DUK_OP_BLSR_CC           95
+#define DUK_OP_BASR              96
+#define DUK_OP_BASR_RR           96
+#define DUK_OP_BASR_CR           97
+#define DUK_OP_BASR_RC           98
+#define DUK_OP_BASR_CC           99
+#define DUK_OP_INSTOF            100
+#define DUK_OP_INSTOF_RR         100
+#define DUK_OP_INSTOF_CR         101
+#define DUK_OP_INSTOF_RC         102
+#define DUK_OP_INSTOF_CC         103
+#define DUK_OP_IN                104
+#define DUK_OP_IN_RR             104
+#define DUK_OP_IN_CR             105
+#define DUK_OP_IN_RC             106
+#define DUK_OP_IN_CC             107
+#define DUK_OP_GETPROP           108
+#define DUK_OP_GETPROP_RR        108
+#define DUK_OP_GETPROP_CR        109
+#define DUK_OP_GETPROP_RC        110
+#define DUK_OP_GETPROP_CC        111
+#define DUK_OP_PUTPROP           112
+#define DUK_OP_PUTPROP_RR        112
+#define DUK_OP_PUTPROP_CR        113
+#define DUK_OP_PUTPROP_RC        114
+#define DUK_OP_PUTPROP_CC        115
+#define DUK_OP_DELPROP           116
+#define DUK_OP_DELPROP_RR        116
+#define DUK_OP_DELPROP_CR_UNUSED 117 /* unused now */
+#define DUK_OP_DELPROP_RC        118
+#define DUK_OP_DELPROP_CC_UNUSED 119 /* unused now */
+#define DUK_OP_PREINCR           120 /* pre/post opcode values have constraints, */
+#define DUK_OP_PREDECR           121 /* see duk_js_executor.c and duk_js_compiler.c. */
+#define DUK_OP_POSTINCR          122
+#define DUK_OP_POSTDECR          123
+#define DUK_OP_PREINCV           124
+#define DUK_OP_PREDECV           125
+#define DUK_OP_POSTINCV          126
+#define DUK_OP_POSTDECV          127
+#define DUK_OP_PREINCP           128 /* pre/post inc/dec prop opcodes have constraints */
+#define DUK_OP_PREINCP_RR        128
+#define DUK_OP_PREINCP_CR        129
+#define DUK_OP_PREINCP_RC        130
+#define DUK_OP_PREINCP_CC        131
+#define DUK_OP_PREDECP           132
+#define DUK_OP_PREDECP_RR        132
+#define DUK_OP_PREDECP_CR        133
+#define DUK_OP_PREDECP_RC        134
+#define DUK_OP_PREDECP_CC        135
+#define DUK_OP_POSTINCP          136
+#define DUK_OP_POSTINCP_RR       136
+#define DUK_OP_POSTINCP_CR       137
+#define DUK_OP_POSTINCP_RC       138
+#define DUK_OP_POSTINCP_CC       139
+#define DUK_OP_POSTDECP          140
+#define DUK_OP_POSTDECP_RR       140
+#define DUK_OP_POSTDECP_CR       141
+#define DUK_OP_POSTDECP_RC       142
+#define DUK_OP_POSTDECP_CC       143
+#define DUK_OP_DECLVAR           144
+#define DUK_OP_DECLVAR_RR        144
+#define DUK_OP_DECLVAR_CR        145
+#define DUK_OP_DECLVAR_RC        146
+#define DUK_OP_DECLVAR_CC        147
+#define DUK_OP_REGEXP            148
+#define DUK_OP_REGEXP_RR         148
+#define DUK_OP_REGEXP_CR         149
+#define DUK_OP_REGEXP_RC         150
+#define DUK_OP_REGEXP_CC         151
+#define DUK_OP_CLOSURE           152
+#define DUK_OP_TYPEOF            153
+#define DUK_OP_TYPEOFID          154
+#define DUK_OP_PUTVAR            155
+#define DUK_OP_DELVAR            156
+#define DUK_OP_RETREG            157
+#define DUK_OP_RETUNDEF          158
+#define DUK_OP_RETCONST          159
+#define DUK_OP_RETCONSTN         160 /* return const without incref (e.g. number) */
+#define DUK_OP_LABEL             161
+#define DUK_OP_ENDLABEL          162
+#define DUK_OP_BREAK             163
+#define DUK_OP_CONTINUE          164
+#define DUK_OP_TRYCATCH          165
+#define DUK_OP_ENDTRY            166
+#define DUK_OP_ENDCATCH          167
+#define DUK_OP_ENDFIN            168
+#define DUK_OP_THROW             169
+#define DUK_OP_INVLHS            170
+#define DUK_OP_CSREG             171
+#define DUK_OP_CSVAR             172
+#define DUK_OP_CSVAR_RR          172
+#define DUK_OP_CSVAR_CR          173
+#define DUK_OP_CSVAR_RC          174
+#define DUK_OP_CSVAR_CC          175
+#define DUK_OP_CALL0             176 /* DUK_OP_CALL0 & 0x0F must be zero. */
+#define DUK_OP_CALL1             177
+#define DUK_OP_CALL2             178
+#define DUK_OP_CALL3             179
+#define DUK_OP_CALL4             180
+#define DUK_OP_CALL5             181
+#define DUK_OP_CALL6             182
+#define DUK_OP_CALL7             183
+#define DUK_OP_CALL8             184
+#define DUK_OP_CALL9             185
+#define DUK_OP_CALL10            186
+#define DUK_OP_CALL11            187
+#define DUK_OP_CALL12            188
+#define DUK_OP_CALL13            189
+#define DUK_OP_CALL14            190
+#define DUK_OP_CALL15            191
+#define DUK_OP_NEWOBJ            192
+#define DUK_OP_NEWARR            193
+#define DUK_OP_MPUTOBJ           194
+#define DUK_OP_MPUTOBJI          195
+#define DUK_OP_INITSET           196
+#define DUK_OP_INITGET           197
+#define DUK_OP_MPUTARR           198
+#define DUK_OP_MPUTARRI          199
+#define DUK_OP_SETALEN           200
+#define DUK_OP_INITENUM          201
+#define DUK_OP_NEXTENUM          202
+#define DUK_OP_NEWTARGET         203
+#define DUK_OP_DEBUGGER          204
+#define DUK_OP_NOP               205
+#define DUK_OP_INVALID           206
+#define DUK_OP_UNUSED207         207
+#define DUK_OP_GETPROPC          208
+#define DUK_OP_GETPROPC_RR       208
+#define DUK_OP_GETPROPC_CR       209
+#define DUK_OP_GETPROPC_RC       210
+#define DUK_OP_GETPROPC_CC       211
+#define DUK_OP_UNUSED212         212
+#define DUK_OP_UNUSED213         213
+#define DUK_OP_UNUSED214         214
+#define DUK_OP_UNUSED215         215
+#define DUK_OP_UNUSED216         216
+#define DUK_OP_UNUSED217         217
+#define DUK_OP_UNUSED218         218
+#define DUK_OP_UNUSED219         219
+#define DUK_OP_UNUSED220         220
+#define DUK_OP_UNUSED221         221
+#define DUK_OP_UNUSED222         222
+#define DUK_OP_UNUSED223         223
+#define DUK_OP_UNUSED224         224
+#define DUK_OP_UNUSED225         225
+#define DUK_OP_UNUSED226         226
+#define DUK_OP_UNUSED227         227
+#define DUK_OP_UNUSED228         228
+#define DUK_OP_UNUSED229         229
+#define DUK_OP_UNUSED230         230
+#define DUK_OP_UNUSED231         231
+#define DUK_OP_UNUSED232         232
+#define DUK_OP_UNUSED233         233
+#define DUK_OP_UNUSED234         234
+#define DUK_OP_UNUSED235         235
+#define DUK_OP_UNUSED236         236
+#define DUK_OP_UNUSED237         237
+#define DUK_OP_UNUSED238         238
+#define DUK_OP_UNUSED239         239
+#define DUK_OP_UNUSED240         240
+#define DUK_OP_UNUSED241         241
+#define DUK_OP_UNUSED242         242
+#define DUK_OP_UNUSED243         243
+#define DUK_OP_UNUSED244         244
+#define DUK_OP_UNUSED245         245
+#define DUK_OP_UNUSED246         246
+#define DUK_OP_UNUSED247         247
+#define DUK_OP_UNUSED248         248
+#define DUK_OP_UNUSED249         249
+#define DUK_OP_UNUSED250         250
+#define DUK_OP_UNUSED251         251
+#define DUK_OP_UNUSED252         252
+#define DUK_OP_UNUSED253         253
+#define DUK_OP_UNUSED254         254
+#define DUK_OP_UNUSED255         255
+#define DUK_OP_NONE              256 /* dummy value used as marker (doesn't fit in 8-bit field) */
 
 /* XXX: Allocate flags from opcode field?  Would take 16 opcode slots
  * but avoids shuffling in more cases.  Maybe not worth it.
  */
 /* DUK_OP_TRYCATCH flags in A. */
-#define DUK_BC_TRYCATCH_FLAG_HAVE_CATCH     (1U << 0)
-#define DUK_BC_TRYCATCH_FLAG_HAVE_FINALLY   (1U << 1)
-#define DUK_BC_TRYCATCH_FLAG_CATCH_BINDING  (1U << 2)
-#define DUK_BC_TRYCATCH_FLAG_WITH_BINDING   (1U << 3)
+#define DUK_BC_TRYCATCH_FLAG_HAVE_CATCH    (1U << 0)
+#define DUK_BC_TRYCATCH_FLAG_HAVE_FINALLY  (1U << 1)
+#define DUK_BC_TRYCATCH_FLAG_CATCH_BINDING (1U << 2)
+#define DUK_BC_TRYCATCH_FLAG_WITH_BINDING  (1U << 3)
 
 /* DUK_OP_DECLVAR flags in A; bottom bits are reserved for propdesc flags
  * (DUK_PROPDESC_FLAG_XXX).
  */
-#define DUK_BC_DECLVAR_FLAG_FUNC_DECL       (1U << 4)  /* function declaration */
+#define DUK_BC_DECLVAR_FLAG_FUNC_DECL (1U << 4) /* function declaration */
 
 /* DUK_OP_CALLn flags, part of opcode field.  Three lowest bits must match
  * DUK_CALL_FLAG_xxx directly.
  */
-#define DUK_BC_CALL_FLAG_TAILCALL           (1U << 0)
-#define DUK_BC_CALL_FLAG_CONSTRUCT          (1U << 1)
-#define DUK_BC_CALL_FLAG_CALLED_AS_EVAL     (1U << 2)
-#define DUK_BC_CALL_FLAG_INDIRECT           (1U << 3)
+#define DUK_BC_CALL_FLAG_TAILCALL       (1U << 0)
+#define DUK_BC_CALL_FLAG_CONSTRUCT      (1U << 1)
+#define DUK_BC_CALL_FLAG_CALLED_AS_EVAL (1U << 2)
+#define DUK_BC_CALL_FLAG_INDIRECT       (1U << 3)
 
 /* Misc constants and helper macros. */
-#define DUK_BC_LDINT_BIAS           (1L << 15)
-#define DUK_BC_LDINTX_SHIFT         16
-#define DUK_BC_JUMP_BIAS            (1L << 23)
+#define DUK_BC_LDINT_BIAS   (1L << 15)
+#define DUK_BC_LDINTX_SHIFT 16
+#define DUK_BC_JUMP_BIAS    (1L << 23)
 
-#endif  /* DUK_JS_BYTECODE_H_INCLUDED */
+#endif /* DUK_JS_BYTECODE_H_INCLUDED */
 /* #include duk_lexer.h */
 /*
  *  Lexer defines.
@@ -3645,156 +3827,156 @@ typedef void (*duk_re_range_callback)(void *user, duk_codepoint_t r1, duk_codepo
  *  in a continuous range and in a particular order.  See genstrings.py.
  */
 
-#define DUK_LEXER_INITCTX(ctx)        duk_lexer_initctx((ctx))
+#define DUK_LEXER_INITCTX(ctx) duk_lexer_initctx((ctx))
 
-#define DUK_LEXER_SETPOINT(ctx,pt)    duk_lexer_setpoint((ctx), (pt))
+#define DUK_LEXER_SETPOINT(ctx, pt) duk_lexer_setpoint((ctx), (pt))
 
-#define DUK_LEXER_GETPOINT(ctx,pt)    duk_lexer_getpoint((ctx), (pt))
+#define DUK_LEXER_GETPOINT(ctx, pt) duk_lexer_getpoint((ctx), (pt))
 
 /* Currently 6 characters of lookup are actually needed (duk_lexer.c). */
-#define DUK_LEXER_WINDOW_SIZE                     6
+#define DUK_LEXER_WINDOW_SIZE 6
 #if defined(DUK_USE_LEXER_SLIDING_WINDOW)
-#define DUK_LEXER_BUFFER_SIZE                     64
+#define DUK_LEXER_BUFFER_SIZE 64
 #endif
 
-#define DUK_TOK_MINVAL                            0
+#define DUK_TOK_MINVAL 0
 
 /* returned after EOF (infinite amount) */
-#define DUK_TOK_EOF                               0
+#define DUK_TOK_EOF 0
 
 /* identifier names (E5 Section 7.6) */
-#define DUK_TOK_IDENTIFIER                        1
+#define DUK_TOK_IDENTIFIER 1
 
 /* reserved words: keywords */
-#define DUK_TOK_START_RESERVED                    2
-#define DUK_TOK_BREAK                             2
-#define DUK_TOK_CASE                              3
-#define DUK_TOK_CATCH                             4
-#define DUK_TOK_CONTINUE                          5
-#define DUK_TOK_DEBUGGER                          6
-#define DUK_TOK_DEFAULT                           7
-#define DUK_TOK_DELETE                            8
-#define DUK_TOK_DO                                9
-#define DUK_TOK_ELSE                              10
-#define DUK_TOK_FINALLY                           11
-#define DUK_TOK_FOR                               12
-#define DUK_TOK_FUNCTION                          13
-#define DUK_TOK_IF                                14
-#define DUK_TOK_IN                                15
-#define DUK_TOK_INSTANCEOF                        16
-#define DUK_TOK_NEW                               17
-#define DUK_TOK_RETURN                            18
-#define DUK_TOK_SWITCH                            19
-#define DUK_TOK_THIS                              20
-#define DUK_TOK_THROW                             21
-#define DUK_TOK_TRY                               22
-#define DUK_TOK_TYPEOF                            23
-#define DUK_TOK_VAR                               24
-#define DUK_TOK_CONST                             25
-#define DUK_TOK_VOID                              26
-#define DUK_TOK_WHILE                             27
-#define DUK_TOK_WITH                              28
+#define DUK_TOK_START_RESERVED 2
+#define DUK_TOK_BREAK          2
+#define DUK_TOK_CASE           3
+#define DUK_TOK_CATCH          4
+#define DUK_TOK_CONTINUE       5
+#define DUK_TOK_DEBUGGER       6
+#define DUK_TOK_DEFAULT        7
+#define DUK_TOK_DELETE         8
+#define DUK_TOK_DO             9
+#define DUK_TOK_ELSE           10
+#define DUK_TOK_FINALLY        11
+#define DUK_TOK_FOR            12
+#define DUK_TOK_FUNCTION       13
+#define DUK_TOK_IF             14
+#define DUK_TOK_IN             15
+#define DUK_TOK_INSTANCEOF     16
+#define DUK_TOK_NEW            17
+#define DUK_TOK_RETURN         18
+#define DUK_TOK_SWITCH         19
+#define DUK_TOK_THIS           20
+#define DUK_TOK_THROW          21
+#define DUK_TOK_TRY            22
+#define DUK_TOK_TYPEOF         23
+#define DUK_TOK_VAR            24
+#define DUK_TOK_CONST          25
+#define DUK_TOK_VOID           26
+#define DUK_TOK_WHILE          27
+#define DUK_TOK_WITH           28
 
 /* reserved words: future reserved words */
-#define DUK_TOK_CLASS                             29
-#define DUK_TOK_ENUM                              30
-#define DUK_TOK_EXPORT                            31
-#define DUK_TOK_EXTENDS                           32
-#define DUK_TOK_IMPORT                            33
-#define DUK_TOK_SUPER                             34
+#define DUK_TOK_CLASS   29
+#define DUK_TOK_ENUM    30
+#define DUK_TOK_EXPORT  31
+#define DUK_TOK_EXTENDS 32
+#define DUK_TOK_IMPORT  33
+#define DUK_TOK_SUPER   34
 
 /* "null", "true", and "false" are always reserved words.
  * Note that "get" and "set" are not!
  */
-#define DUK_TOK_NULL                              35
-#define DUK_TOK_TRUE                              36
-#define DUK_TOK_FALSE                             37
+#define DUK_TOK_NULL  35
+#define DUK_TOK_TRUE  36
+#define DUK_TOK_FALSE 37
 
 /* reserved words: additional future reserved words in strict mode */
-#define DUK_TOK_START_STRICT_RESERVED             38  /* inclusive */
-#define DUK_TOK_IMPLEMENTS                        38
-#define DUK_TOK_INTERFACE                         39
-#define DUK_TOK_LET                               40
-#define DUK_TOK_PACKAGE                           41
-#define DUK_TOK_PRIVATE                           42
-#define DUK_TOK_PROTECTED                         43
-#define DUK_TOK_PUBLIC                            44
-#define DUK_TOK_STATIC                            45
-#define DUK_TOK_YIELD                             46
-
-#define DUK_TOK_END_RESERVED                      47  /* exclusive */
+#define DUK_TOK_START_STRICT_RESERVED 38 /* inclusive */
+#define DUK_TOK_IMPLEMENTS            38
+#define DUK_TOK_INTERFACE             39
+#define DUK_TOK_LET                   40
+#define DUK_TOK_PACKAGE               41
+#define DUK_TOK_PRIVATE               42
+#define DUK_TOK_PROTECTED             43
+#define DUK_TOK_PUBLIC                44
+#define DUK_TOK_STATIC                45
+#define DUK_TOK_YIELD                 46
+
+#define DUK_TOK_END_RESERVED 47 /* exclusive */
 
 /* "get" and "set" are tokens but NOT ReservedWords.  They are currently
  * parsed and identifiers and these defines are actually now unused.
  */
-#define DUK_TOK_GET                               47
-#define DUK_TOK_SET                               48
+#define DUK_TOK_GET 47
+#define DUK_TOK_SET 48
 
 /* punctuators (unlike the spec, also includes "/" and "/=") */
-#define DUK_TOK_LCURLY                            49
-#define DUK_TOK_RCURLY                            50
-#define DUK_TOK_LBRACKET                          51
-#define DUK_TOK_RBRACKET                          52
-#define DUK_TOK_LPAREN                            53
-#define DUK_TOK_RPAREN                            54
-#define DUK_TOK_PERIOD                            55
-#define DUK_TOK_SEMICOLON                         56
-#define DUK_TOK_COMMA                             57
-#define DUK_TOK_LT                                58
-#define DUK_TOK_GT                                59
-#define DUK_TOK_LE                                60
-#define DUK_TOK_GE                                61
-#define DUK_TOK_EQ                                62
-#define DUK_TOK_NEQ                               63
-#define DUK_TOK_SEQ                               64
-#define DUK_TOK_SNEQ                              65
-#define DUK_TOK_ADD                               66
-#define DUK_TOK_SUB                               67
-#define DUK_TOK_MUL                               68
-#define DUK_TOK_DIV                               69
-#define DUK_TOK_MOD                               70
-#define DUK_TOK_EXP                               71
-#define DUK_TOK_INCREMENT                         72
-#define DUK_TOK_DECREMENT                         73
-#define DUK_TOK_ALSHIFT                           74   /* named "arithmetic" because result is signed */
-#define DUK_TOK_ARSHIFT                           75
-#define DUK_TOK_RSHIFT                            76
-#define DUK_TOK_BAND                              77
-#define DUK_TOK_BOR                               78
-#define DUK_TOK_BXOR                              79
-#define DUK_TOK_LNOT                              80
-#define DUK_TOK_BNOT                              81
-#define DUK_TOK_LAND                              82
-#define DUK_TOK_LOR                               83
-#define DUK_TOK_QUESTION                          84
-#define DUK_TOK_COLON                             85
-#define DUK_TOK_EQUALSIGN                         86
-#define DUK_TOK_ADD_EQ                            87
-#define DUK_TOK_SUB_EQ                            88
-#define DUK_TOK_MUL_EQ                            89
-#define DUK_TOK_DIV_EQ                            90
-#define DUK_TOK_MOD_EQ                            91
-#define DUK_TOK_EXP_EQ                            92
-#define DUK_TOK_ALSHIFT_EQ                        93
-#define DUK_TOK_ARSHIFT_EQ                        94
-#define DUK_TOK_RSHIFT_EQ                         95
-#define DUK_TOK_BAND_EQ                           96
-#define DUK_TOK_BOR_EQ                            97
-#define DUK_TOK_BXOR_EQ                           98
+#define DUK_TOK_LCURLY     49
+#define DUK_TOK_RCURLY     50
+#define DUK_TOK_LBRACKET   51
+#define DUK_TOK_RBRACKET   52
+#define DUK_TOK_LPAREN     53
+#define DUK_TOK_RPAREN     54
+#define DUK_TOK_PERIOD     55
+#define DUK_TOK_SEMICOLON  56
+#define DUK_TOK_COMMA      57
+#define DUK_TOK_LT         58
+#define DUK_TOK_GT         59
+#define DUK_TOK_LE         60
+#define DUK_TOK_GE         61
+#define DUK_TOK_EQ         62
+#define DUK_TOK_NEQ        63
+#define DUK_TOK_SEQ        64
+#define DUK_TOK_SNEQ       65
+#define DUK_TOK_ADD        66
+#define DUK_TOK_SUB        67
+#define DUK_TOK_MUL        68
+#define DUK_TOK_DIV        69
+#define DUK_TOK_MOD        70
+#define DUK_TOK_EXP        71
+#define DUK_TOK_INCREMENT  72
+#define DUK_TOK_DECREMENT  73
+#define DUK_TOK_ALSHIFT    74 /* named "arithmetic" because result is signed */
+#define DUK_TOK_ARSHIFT    75
+#define DUK_TOK_RSHIFT     76
+#define DUK_TOK_BAND       77
+#define DUK_TOK_BOR        78
+#define DUK_TOK_BXOR       79
+#define DUK_TOK_LNOT       80
+#define DUK_TOK_BNOT       81
+#define DUK_TOK_LAND       82
+#define DUK_TOK_LOR        83
+#define DUK_TOK_QUESTION   84
+#define DUK_TOK_COLON      85
+#define DUK_TOK_EQUALSIGN  86
+#define DUK_TOK_ADD_EQ     87
+#define DUK_TOK_SUB_EQ     88
+#define DUK_TOK_MUL_EQ     89
+#define DUK_TOK_DIV_EQ     90
+#define DUK_TOK_MOD_EQ     91
+#define DUK_TOK_EXP_EQ     92
+#define DUK_TOK_ALSHIFT_EQ 93
+#define DUK_TOK_ARSHIFT_EQ 94
+#define DUK_TOK_RSHIFT_EQ  95
+#define DUK_TOK_BAND_EQ    96
+#define DUK_TOK_BOR_EQ     97
+#define DUK_TOK_BXOR_EQ    98
 
 /* literals (E5 Section 7.8), except null, true, false, which are treated
  * like reserved words (above).
  */
-#define DUK_TOK_NUMBER                            99
-#define DUK_TOK_STRING                            100
-#define DUK_TOK_REGEXP                            101
+#define DUK_TOK_NUMBER 99
+#define DUK_TOK_STRING 100
+#define DUK_TOK_REGEXP 101
 
-#define DUK_TOK_MAXVAL                            101  /* inclusive */
+#define DUK_TOK_MAXVAL 101 /* inclusive */
 
-#define DUK_TOK_INVALID                           DUK_SMALL_UINT_MAX
+#define DUK_TOK_INVALID DUK_SMALL_UINT_MAX
 
 /* Convert heap string index to a token (reserved words) */
-#define DUK_STRIDX_TO_TOK(x)                        ((x) - DUK_STRIDX_START_RESERVED + DUK_TOK_START_RESERVED)
+#define DUK_STRIDX_TO_TOK(x) ((x) -DUK_STRIDX_START_RESERVED + DUK_TOK_START_RESERVED)
 
 /* Sanity check */
 #if (DUK_TOK_MAXVAL > 255)
@@ -3939,57 +4121,57 @@ typedef void (*duk_re_range_callback)(void *user, duk_codepoint_t r1, duk_codepo
 #endif
 
 /* Regexp tokens */
-#define DUK_RETOK_EOF                              0
-#define DUK_RETOK_DISJUNCTION                      1
-#define DUK_RETOK_QUANTIFIER                       2
-#define DUK_RETOK_ASSERT_START                     3
-#define DUK_RETOK_ASSERT_END                       4
-#define DUK_RETOK_ASSERT_WORD_BOUNDARY             5
-#define DUK_RETOK_ASSERT_NOT_WORD_BOUNDARY         6
-#define DUK_RETOK_ASSERT_START_POS_LOOKAHEAD       7
-#define DUK_RETOK_ASSERT_START_NEG_LOOKAHEAD       8
-#define DUK_RETOK_ATOM_PERIOD                      9
-#define DUK_RETOK_ATOM_CHAR                        10
-#define DUK_RETOK_ATOM_DIGIT                       11  /* assumptions in regexp compiler */
-#define DUK_RETOK_ATOM_NOT_DIGIT                   12  /* -""- */
-#define DUK_RETOK_ATOM_WHITE                       13  /* -""- */
-#define DUK_RETOK_ATOM_NOT_WHITE                   14  /* -""- */
-#define DUK_RETOK_ATOM_WORD_CHAR                   15  /* -""- */
-#define DUK_RETOK_ATOM_NOT_WORD_CHAR               16  /* -""- */
-#define DUK_RETOK_ATOM_BACKREFERENCE               17
-#define DUK_RETOK_ATOM_START_CAPTURE_GROUP         18
-#define DUK_RETOK_ATOM_START_NONCAPTURE_GROUP      19
-#define DUK_RETOK_ATOM_START_CHARCLASS             20
-#define DUK_RETOK_ATOM_START_CHARCLASS_INVERTED    21
-#define DUK_RETOK_ATOM_END_GROUP                   22
+#define DUK_RETOK_EOF                           0
+#define DUK_RETOK_DISJUNCTION                   1
+#define DUK_RETOK_QUANTIFIER                    2
+#define DUK_RETOK_ASSERT_START                  3
+#define DUK_RETOK_ASSERT_END                    4
+#define DUK_RETOK_ASSERT_WORD_BOUNDARY          5
+#define DUK_RETOK_ASSERT_NOT_WORD_BOUNDARY      6
+#define DUK_RETOK_ASSERT_START_POS_LOOKAHEAD    7
+#define DUK_RETOK_ASSERT_START_NEG_LOOKAHEAD    8
+#define DUK_RETOK_ATOM_PERIOD                   9
+#define DUK_RETOK_ATOM_CHAR                     10
+#define DUK_RETOK_ATOM_DIGIT                    11 /* assumptions in regexp compiler */
+#define DUK_RETOK_ATOM_NOT_DIGIT                12 /* -""- */
+#define DUK_RETOK_ATOM_WHITE                    13 /* -""- */
+#define DUK_RETOK_ATOM_NOT_WHITE                14 /* -""- */
+#define DUK_RETOK_ATOM_WORD_CHAR                15 /* -""- */
+#define DUK_RETOK_ATOM_NOT_WORD_CHAR            16 /* -""- */
+#define DUK_RETOK_ATOM_BACKREFERENCE            17
+#define DUK_RETOK_ATOM_START_CAPTURE_GROUP      18
+#define DUK_RETOK_ATOM_START_NONCAPTURE_GROUP   19
+#define DUK_RETOK_ATOM_START_CHARCLASS          20
+#define DUK_RETOK_ATOM_START_CHARCLASS_INVERTED 21
+#define DUK_RETOK_ATOM_END_GROUP                22
 
 /* Constants for duk_lexer_ctx.buf. */
-#define DUK_LEXER_TEMP_BUF_LIMIT                   256
+#define DUK_LEXER_TEMP_BUF_LIMIT 256
 
 /* A token value.  Can be memcpy()'d, but note that slot1/slot2 values are on the valstack.
  * Some fields (like num, str1, str2) are only valid for specific token types and may have
  * stale values otherwise.
  */
 struct duk_token {
-	duk_small_uint_t t;           /* token type (with reserved word identification) */
-	duk_small_uint_t t_nores;     /* token type (with reserved words as DUK_TOK_IDENTIFER) */
-	duk_double_t num;             /* numeric value of token */
-	duk_hstring *str1;            /* string 1 of token (borrowed, stored to ctx->slot1_idx) */
-	duk_hstring *str2;            /* string 2 of token (borrowed, stored to ctx->slot2_idx) */
-	duk_size_t start_offset;      /* start byte offset of token in lexer input */
-	duk_int_t start_line;         /* start line of token (first char) */
-	duk_int_t num_escapes;        /* number of escapes and line continuations (for directive prologue) */
-	duk_bool_t lineterm;          /* token was preceded by a lineterm */
-	duk_bool_t allow_auto_semi;   /* token allows automatic semicolon insertion (eof or preceded by newline) */
+	duk_small_uint_t t; /* token type (with reserved word identification) */
+	duk_small_uint_t t_nores; /* token type (with reserved words as DUK_TOK_IDENTIFER) */
+	duk_double_t num; /* numeric value of token */
+	duk_hstring *str1; /* string 1 of token (borrowed, stored to ctx->slot1_idx) */
+	duk_hstring *str2; /* string 2 of token (borrowed, stored to ctx->slot2_idx) */
+	duk_size_t start_offset; /* start byte offset of token in lexer input */
+	duk_int_t start_line; /* start line of token (first char) */
+	duk_int_t num_escapes; /* number of escapes and line continuations (for directive prologue) */
+	duk_bool_t lineterm; /* token was preceded by a lineterm */
+	duk_bool_t allow_auto_semi; /* token allows automatic semicolon insertion (eof or preceded by newline) */
 };
 
-#define DUK_RE_QUANTIFIER_INFINITE         ((duk_uint32_t) 0xffffffffUL)
+#define DUK_RE_QUANTIFIER_INFINITE ((duk_uint32_t) 0xffffffffUL)
 
 /* A regexp token value. */
 struct duk_re_token {
-	duk_small_uint_t t;          /* token type */
+	duk_small_uint_t t; /* token type */
 	duk_small_uint_t greedy;
-	duk_uint32_t num;            /* numeric value (character, count) */
+	duk_uint32_t num; /* numeric value (character, count) */
 	duk_uint32_t qmin;
 	duk_uint32_t qmax;
 };
@@ -4016,23 +4198,23 @@ struct duk_lexer_ctx {
 	duk_lexer_codepoint window[DUK_LEXER_WINDOW_SIZE]; /* unicode code points, window[0] is always next */
 #endif
 
-	duk_hthread *thr;                              /* thread; minimizes argument passing */
+	duk_hthread *thr; /* thread; minimizes argument passing */
 
-	const duk_uint8_t *input;                      /* input string (may be a user pointer) */
-	duk_size_t input_length;                       /* input byte length */
-	duk_size_t input_offset;                       /* input offset for window leading edge (not window[0]) */
-	duk_int_t input_line;                          /* input linenumber at input_offset (not window[0]), init to 1 */
+	const duk_uint8_t *input; /* input string (may be a user pointer) */
+	duk_size_t input_length; /* input byte length */
+	duk_size_t input_offset; /* input offset for window leading edge (not window[0]) */
+	duk_int_t input_line; /* input linenumber at input_offset (not window[0]), init to 1 */
 
-	duk_idx_t slot1_idx;                           /* valstack slot for 1st token value */
-	duk_idx_t slot2_idx;                           /* valstack slot for 2nd token value */
-	duk_idx_t buf_idx;                             /* valstack slot for temp buffer */
-	duk_hbuffer_dynamic *buf;                      /* temp accumulation buffer */
-	duk_bufwriter_ctx bw;                          /* bufwriter for temp accumulation */
+	duk_idx_t slot1_idx; /* valstack slot for 1st token value */
+	duk_idx_t slot2_idx; /* valstack slot for 2nd token value */
+	duk_idx_t buf_idx; /* valstack slot for temp buffer */
+	duk_hbuffer_dynamic *buf; /* temp accumulation buffer */
+	duk_bufwriter_ctx bw; /* bufwriter for temp accumulation */
 
-	duk_int_t token_count;                         /* number of tokens parsed */
-	duk_int_t token_limit;                         /* maximum token count before error (sanity backstop) */
+	duk_int_t token_count; /* number of tokens parsed */
+	duk_int_t token_limit; /* maximum token count before error (sanity backstop) */
 
-	duk_small_uint_t flags;                        /* lexer flags, use compiler flag defines for now */
+	duk_small_uint_t flags; /* lexer flags, use compiler flag defines for now */
 };
 
 /*
@@ -4045,16 +4227,13 @@ DUK_INTERNAL_DECL void duk_lexer_getpoint(duk_lexer_ctx *lex_ctx, duk_lexer_poin
 DUK_INTERNAL_DECL void duk_lexer_setpoint(duk_lexer_ctx *lex_ctx, duk_lexer_point *pt);
 
 DUK_INTERNAL_DECL
-void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
-                                      duk_token *out_token,
-                                      duk_bool_t strict_mode,
-                                      duk_bool_t regexp_mode);
+void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx, duk_token *out_token, duk_bool_t strict_mode, duk_bool_t regexp_mode);
 #if defined(DUK_USE_REGEXP_SUPPORT)
 DUK_INTERNAL_DECL void duk_lexer_parse_re_token(duk_lexer_ctx *lex_ctx, duk_re_token *out_token);
 DUK_INTERNAL_DECL void duk_lexer_parse_re_ranges(duk_lexer_ctx *lex_ctx, duk_re_range_callback gen_range, void *userdata);
-#endif  /* DUK_USE_REGEXP_SUPPORT */
+#endif /* DUK_USE_REGEXP_SUPPORT */
 
-#endif  /* DUK_LEXER_H_INCLUDED */
+#endif /* DUK_LEXER_H_INCLUDED */
 /* #include duk_js_compiler.h */
 /*
  *  ECMAScript compiler.
@@ -4064,13 +4243,13 @@ DUK_INTERNAL_DECL void duk_lexer_parse_re_ranges(duk_lexer_ctx *lex_ctx, duk_re_
 #define DUK_JS_COMPILER_H_INCLUDED
 
 /* ECMAScript compiler limits */
-#define DUK_COMPILER_TOKEN_LIMIT           100000000L  /* 1e8: protects against deeply nested inner functions */
+#define DUK_COMPILER_TOKEN_LIMIT 100000000L /* 1e8: protects against deeply nested inner functions */
 
 /* maximum loopcount for peephole optimization */
-#define DUK_COMPILER_PEEPHOLE_MAXITER      3
+#define DUK_COMPILER_PEEPHOLE_MAXITER 3
 
 /* maximum bytecode length in instructions */
-#define DUK_COMPILER_MAX_BYTECODE_LENGTH   (256L * 1024L * 1024L)  /* 1 GB */
+#define DUK_COMPILER_MAX_BYTECODE_LENGTH (256L * 1024L * 1024L) /* 1 GB */
 
 /*
  *  Compiler intermediate values
@@ -4080,21 +4259,21 @@ DUK_INTERNAL_DECL void duk_lexer_parse_re_ranges(duk_lexer_ctx *lex_ctx, duk_re_
  *  either a left-hand-side or right-hand-side role (e.g. object property).
  */
 
-#define DUK_IVAL_NONE          0   /* no value */
-#define DUK_IVAL_PLAIN         1   /* register, constant, or value */
-#define DUK_IVAL_ARITH         2   /* binary arithmetic; DUK_OP_ADD, DUK_OP_EQ, other binary ops */
-#define DUK_IVAL_PROP          3   /* property access */
-#define DUK_IVAL_VAR           4   /* variable access */
+#define DUK_IVAL_NONE  0 /* no value */
+#define DUK_IVAL_PLAIN 1 /* register, constant, or value */
+#define DUK_IVAL_ARITH 2 /* binary arithmetic; DUK_OP_ADD, DUK_OP_EQ, other binary ops */
+#define DUK_IVAL_PROP  3 /* property access */
+#define DUK_IVAL_VAR   4 /* variable access */
 
-#define DUK_ISPEC_NONE         0   /* no value */
-#define DUK_ISPEC_VALUE        1   /* value resides in 'valstack_idx' */
-#define DUK_ISPEC_REGCONST     2   /* value resides in a register or constant */
+#define DUK_ISPEC_NONE     0 /* no value */
+#define DUK_ISPEC_VALUE    1 /* value resides in 'valstack_idx' */
+#define DUK_ISPEC_REGCONST 2 /* value resides in a register or constant */
 
 /* Bit mask which indicates that a regconst is a constant instead of a register.
  * Chosen so that when a regconst is cast to duk_int32_t, all consts are
  * negative values.
  */
-#define DUK_REGCONST_CONST_MARKER    DUK_INT32_MIN  /* = -0x80000000 */
+#define DUK_REGCONST_CONST_MARKER DUK_INT32_MIN /* = -0x80000000 */
 
 /* Type to represent a reg/const reference during compilation, with <0
  * indicating a constant.  Some call sites also use -1 to indicate 'none'.
@@ -4102,9 +4281,9 @@ DUK_INTERNAL_DECL void duk_lexer_parse_re_ranges(duk_lexer_ctx *lex_ctx, duk_re_
 typedef duk_int32_t duk_regconst_t;
 
 typedef struct {
-	duk_small_uint_t t;          /* DUK_ISPEC_XXX */
+	duk_small_uint_t t; /* DUK_ISPEC_XXX */
 	duk_regconst_t regconst;
-	duk_idx_t valstack_idx;      /* always set; points to a reserved valstack slot */
+	duk_idx_t valstack_idx; /* always set; points to a reserved valstack slot */
 } duk_ispec;
 
 typedef struct {
@@ -4116,8 +4295,8 @@ typedef struct {
 	 */
 
 	/* XXX: can be optimized for smaller footprint esp. on 32-bit environments */
-	duk_small_uint_t t;          /* DUK_IVAL_XXX */
-	duk_small_uint_t op;         /* bytecode opcode for binary ops */
+	duk_small_uint_t t; /* DUK_IVAL_XXX */
+	duk_small_uint_t op; /* bytecode opcode for binary ops */
 	duk_ispec x1;
 	duk_ispec x2;
 } duk_ivalue;
@@ -4139,22 +4318,22 @@ struct duk_compiler_instr {
  *  Compiler state
  */
 
-#define DUK_LABEL_FLAG_ALLOW_BREAK       (1U << 0)
-#define DUK_LABEL_FLAG_ALLOW_CONTINUE    (1U << 1)
+#define DUK_LABEL_FLAG_ALLOW_BREAK    (1U << 0)
+#define DUK_LABEL_FLAG_ALLOW_CONTINUE (1U << 1)
 
-#define DUK_DECL_TYPE_VAR                0
-#define DUK_DECL_TYPE_FUNC               1
+#define DUK_DECL_TYPE_VAR  0
+#define DUK_DECL_TYPE_FUNC 1
 
 /* XXX: optimize to 16 bytes */
 typedef struct {
 	duk_small_uint_t flags;
-	duk_int_t label_id;          /* numeric label_id (-1 reserved as marker) */
-	duk_hstring *h_label;        /* borrowed label name */
-	duk_int_t catch_depth;       /* catch depth at point of definition */
-	duk_int_t pc_label;          /* pc of label statement:
-	                              * pc+1: break jump site
-	                              * pc+2: continue jump site
-	                              */
+	duk_int_t label_id; /* numeric label_id (-1 reserved as marker) */
+	duk_hstring *h_label; /* borrowed label name */
+	duk_int_t catch_depth; /* catch depth at point of definition */
+	duk_int_t pc_label; /* pc of label statement:
+	                     * pc+1: break jump site
+	                     * pc+2: continue jump site
+	                     */
 
 	/* Fast jumps (which avoid longjmp) jump directly to the jump sites
 	 * which are always known even while the iteration/switch statement
@@ -4170,22 +4349,22 @@ struct duk_compiler_func {
 	 * platforms (e.g. if int is 32 bits and pointers are 64 bits).
 	 */
 
-	duk_bufwriter_ctx bw_code;          /* bufwriter for code */
+	duk_bufwriter_ctx bw_code; /* bufwriter for code */
 
-	duk_hstring *h_name;                /* function name (borrowed reference), ends up in _name */
+	duk_hstring *h_name; /* function name (borrowed reference), ends up in _name */
 	/* h_code: held in bw_code */
-	duk_hobject *h_consts;              /* array */
-	duk_hobject *h_funcs;               /* array of function templates: [func1, offset1, line1, func2, offset2, line2]
-	                                     * offset/line points to closing brace to allow skipping on pass 2
-	                                     */
-	duk_hobject *h_decls;               /* array of declarations: [ name1, val1, name2, val2, ... ]
-	                                     * valN = (typeN) | (fnum << 8), where fnum is inner func number (0 for vars)
-	                                     * record function and variable declarations in pass 1
-	                                     */
-	duk_hobject *h_labelnames;          /* array of active label names */
-	duk_hbuffer_dynamic *h_labelinfos;  /* C array of duk_labelinfo */
-	duk_hobject *h_argnames;            /* array of formal argument names (-> _Formals) */
-	duk_hobject *h_varmap;              /* variable map for pass 2 (identifier -> register number or null (unmapped)) */
+	duk_hobject *h_consts; /* array */
+	duk_hobject *h_funcs; /* array of function templates: [func1, offset1, line1, func2, offset2, line2]
+	                       * offset/line points to closing brace to allow skipping on pass 2
+	                       */
+	duk_hobject *h_decls; /* array of declarations: [ name1, val1, name2, val2, ... ]
+	                       * valN = (typeN) | (fnum << 8), where fnum is inner func number (0 for vars)
+	                       * record function and variable declarations in pass 1
+	                       */
+	duk_hobject *h_labelnames; /* array of active label names */
+	duk_hbuffer_dynamic *h_labelinfos; /* C array of duk_labelinfo */
+	duk_hobject *h_argnames; /* array of formal argument names (-> _Formals) */
+	duk_hobject *h_varmap; /* variable map for pass 2 (identifier -> register number or null (unmapped)) */
 
 	/* Value stack indices for tracking objects. */
 	/* code_idx: not needed */
@@ -4198,9 +4377,9 @@ struct duk_compiler_func {
 	duk_idx_t varmap_idx;
 
 	/* Temp reg handling. */
-	duk_regconst_t temp_first;           /* first register that is a temporary (below: variables) */
-	duk_regconst_t temp_next;            /* next temporary register to allocate */
-	duk_regconst_t temp_max;             /* highest value of temp_reg (temp_max - 1 is highest used reg) */
+	duk_regconst_t temp_first; /* first register that is a temporary (below: variables) */
+	duk_regconst_t temp_next; /* next temporary register to allocate */
+	duk_regconst_t temp_max; /* highest value of temp_reg (temp_max - 1 is highest used reg) */
 
 	/* Shuffle registers if large number of regs/consts. */
 	duk_regconst_t shuffle1;
@@ -4210,49 +4389,51 @@ struct duk_compiler_func {
 	/* Stats for current expression being parsed. */
 	duk_int_t nud_count;
 	duk_int_t led_count;
-	duk_int_t paren_level;              /* parenthesis count, 0 = top level */
-	duk_bool_t expr_lhs;                /* expression is left-hand-side compatible */
-	duk_bool_t allow_in;                /* current paren level allows 'in' token */
+	duk_int_t paren_level; /* parenthesis count, 0 = top level */
+	duk_bool_t expr_lhs; /* expression is left-hand-side compatible */
+	duk_bool_t allow_in; /* current paren level allows 'in' token */
 
 	/* Misc. */
-	duk_int_t stmt_next;                /* statement id allocation (running counter) */
-	duk_int_t label_next;               /* label id allocation (running counter) */
-	duk_int_t catch_depth;              /* catch stack depth */
-	duk_int_t with_depth;               /* with stack depth (affects identifier lookups) */
-	duk_int_t fnum_next;                /* inner function numbering */
-	duk_int_t num_formals;              /* number of formal arguments */
-	duk_regconst_t reg_stmt_value;      /* register for writing value of 'non-empty' statements (global or eval code), -1 is marker */
+	duk_int_t stmt_next; /* statement id allocation (running counter) */
+	duk_int_t label_next; /* label id allocation (running counter) */
+	duk_int_t catch_depth; /* catch stack depth */
+	duk_int_t with_depth; /* with stack depth (affects identifier lookups) */
+	duk_int_t fnum_next; /* inner function numbering */
+	duk_int_t num_formals; /* number of formal arguments */
+	duk_regconst_t
+	    reg_stmt_value; /* register for writing value of 'non-empty' statements (global or eval code), -1 is marker */
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
-	duk_int_t min_line;                 /* XXX: typing (duk_hcompfunc has duk_uint32_t) */
+	duk_int_t min_line; /* XXX: typing (duk_hcompfunc has duk_uint32_t) */
 	duk_int_t max_line;
 #endif
 
 	/* Status booleans. */
-	duk_uint8_t is_function;             /* is an actual function (not global/eval code) */
-	duk_uint8_t is_eval;                 /* is eval code */
-	duk_uint8_t is_global;               /* is global code */
-	duk_uint8_t is_namebinding;          /* needs a name binding */
-	duk_uint8_t is_constructable;        /* result is constructable */
-	duk_uint8_t is_setget;               /* is a setter/getter */
-	duk_uint8_t is_strict;               /* function is strict */
-	duk_uint8_t is_notail;               /* function must not be tail called */
-	duk_uint8_t in_directive_prologue;   /* parsing in "directive prologue", recognize directives */
-	duk_uint8_t in_scanning;             /* parsing in "scanning" phase (first pass) */
-	duk_uint8_t may_direct_eval;         /* function may call direct eval */
-	duk_uint8_t id_access_arguments;     /* function refers to 'arguments' identifier */
-	duk_uint8_t id_access_slow;          /* function makes one or more slow path accesses that won't match own static variables */
-	duk_uint8_t id_access_slow_own;      /* function makes one or more slow path accesses that may match own static variables */
-	duk_uint8_t is_arguments_shadowed;   /* argument/function declaration shadows 'arguments' */
-	duk_uint8_t needs_shuffle;           /* function needs shuffle registers */
-	duk_uint8_t reject_regexp_in_adv;    /* reject RegExp literal on next advance() call; needed for handling IdentifierName productions */
-	duk_uint8_t allow_regexp_in_adv;     /* allow RegExp literal on next advance() call */
+	duk_uint8_t is_function; /* is an actual function (not global/eval code) */
+	duk_uint8_t is_eval; /* is eval code */
+	duk_uint8_t is_global; /* is global code */
+	duk_uint8_t is_namebinding; /* needs a name binding */
+	duk_uint8_t is_constructable; /* result is constructable */
+	duk_uint8_t is_setget; /* is a setter/getter */
+	duk_uint8_t is_strict; /* function is strict */
+	duk_uint8_t is_notail; /* function must not be tail called */
+	duk_uint8_t in_directive_prologue; /* parsing in "directive prologue", recognize directives */
+	duk_uint8_t in_scanning; /* parsing in "scanning" phase (first pass) */
+	duk_uint8_t may_direct_eval; /* function may call direct eval */
+	duk_uint8_t id_access_arguments; /* function refers to 'arguments' identifier */
+	duk_uint8_t id_access_slow; /* function makes one or more slow path accesses that won't match own static variables */
+	duk_uint8_t id_access_slow_own; /* function makes one or more slow path accesses that may match own static variables */
+	duk_uint8_t is_arguments_shadowed; /* argument/function declaration shadows 'arguments' */
+	duk_uint8_t needs_shuffle; /* function needs shuffle registers */
+	duk_uint8_t
+	    reject_regexp_in_adv; /* reject RegExp literal on next advance() call; needed for handling IdentifierName productions */
+	duk_uint8_t allow_regexp_in_adv; /* allow RegExp literal on next advance() call */
 };
 
 struct duk_compiler_ctx {
 	duk_hthread *thr;
 
 	/* filename being compiled (ends up in functions' '_filename' property) */
-	duk_hstring *h_filename;            /* borrowed reference */
+	duk_hstring *h_filename; /* borrowed reference */
 
 	/* lexing (tokenization) state (contains two valstack slot indices) */
 	duk_lexer_ctx lex;
@@ -4260,10 +4441,10 @@ struct duk_compiler_ctx {
 	/* current and previous token for parsing */
 	duk_token prev_token;
 	duk_token curr_token;
-	duk_idx_t tok11_idx;                /* curr_token slot1 (matches 'lex' slot1_idx) */
-	duk_idx_t tok12_idx;                /* curr_token slot2 (matches 'lex' slot2_idx) */
-	duk_idx_t tok21_idx;                /* prev_token slot1 */
-	duk_idx_t tok22_idx;                /* prev_token slot2 */
+	duk_idx_t tok11_idx; /* curr_token slot1 (matches 'lex' slot1_idx) */
+	duk_idx_t tok12_idx; /* curr_token slot2 (matches 'lex' slot2_idx) */
+	duk_idx_t tok21_idx; /* prev_token slot1 */
+	duk_idx_t tok22_idx; /* prev_token slot2 */
 
 	/* recursion limit */
 	duk_int_t recursion_depth;
@@ -4280,9 +4461,12 @@ struct duk_compiler_ctx {
  *  Prototypes
  */
 
-DUK_INTERNAL_DECL void duk_js_compile(duk_hthread *thr, const duk_uint8_t *src_buffer, duk_size_t src_length, duk_small_uint_t flags);
+DUK_INTERNAL_DECL void duk_js_compile(duk_hthread *thr,
+                                      const duk_uint8_t *src_buffer,
+                                      duk_size_t src_length,
+                                      duk_small_uint_t flags);
 
-#endif  /* DUK_JS_COMPILER_H_INCLUDED */
+#endif /* DUK_JS_COMPILER_H_INCLUDED */
 /* #include duk_regexp.h */
 /*
  *  Regular expression structs, constants, and bytecode defines.
@@ -4292,39 +4476,39 @@ DUK_INTERNAL_DECL void duk_js_compile(duk_hthread *thr, const duk_uint8_t *src_b
 #define DUK_REGEXP_H_INCLUDED
 
 /* maximum bytecode copies for {n,m} quantifiers */
-#define DUK_RE_MAX_ATOM_COPIES             1000
+#define DUK_RE_MAX_ATOM_COPIES 1000
 
 /* regexp compilation limits */
-#define DUK_RE_COMPILE_TOKEN_LIMIT         100000000L   /* 1e8 */
+#define DUK_RE_COMPILE_TOKEN_LIMIT 100000000L /* 1e8 */
 
 /* regexp execution limits */
-#define DUK_RE_EXECUTE_STEPS_LIMIT         1000000000L  /* 1e9 */
+#define DUK_RE_EXECUTE_STEPS_LIMIT 1000000000L /* 1e9 */
 
 /* regexp opcodes */
-#define DUK_REOP_MATCH                     1
-#define DUK_REOP_CHAR                      2
-#define DUK_REOP_PERIOD                    3
-#define DUK_REOP_RANGES                    4
-#define DUK_REOP_INVRANGES                 5
-#define DUK_REOP_JUMP                      6
-#define DUK_REOP_SPLIT1                    7
-#define DUK_REOP_SPLIT2                    8
-#define DUK_REOP_SQMINIMAL                 9
-#define DUK_REOP_SQGREEDY                  10
-#define DUK_REOP_SAVE                      11
-#define DUK_REOP_WIPERANGE                 12
-#define DUK_REOP_LOOKPOS                   13
-#define DUK_REOP_LOOKNEG                   14
-#define DUK_REOP_BACKREFERENCE             15
-#define DUK_REOP_ASSERT_START              16
-#define DUK_REOP_ASSERT_END                17
-#define DUK_REOP_ASSERT_WORD_BOUNDARY      18
-#define DUK_REOP_ASSERT_NOT_WORD_BOUNDARY  19
+#define DUK_REOP_MATCH                    1
+#define DUK_REOP_CHAR                     2
+#define DUK_REOP_PERIOD                   3
+#define DUK_REOP_RANGES                   4
+#define DUK_REOP_INVRANGES                5
+#define DUK_REOP_JUMP                     6
+#define DUK_REOP_SPLIT1                   7
+#define DUK_REOP_SPLIT2                   8
+#define DUK_REOP_SQMINIMAL                9
+#define DUK_REOP_SQGREEDY                 10
+#define DUK_REOP_SAVE                     11
+#define DUK_REOP_WIPERANGE                12
+#define DUK_REOP_LOOKPOS                  13
+#define DUK_REOP_LOOKNEG                  14
+#define DUK_REOP_BACKREFERENCE            15
+#define DUK_REOP_ASSERT_START             16
+#define DUK_REOP_ASSERT_END               17
+#define DUK_REOP_ASSERT_WORD_BOUNDARY     18
+#define DUK_REOP_ASSERT_NOT_WORD_BOUNDARY 19
 
 /* flags */
-#define DUK_RE_FLAG_GLOBAL                 (1U << 0)
-#define DUK_RE_FLAG_IGNORE_CASE            (1U << 1)
-#define DUK_RE_FLAG_MULTILINE              (1U << 2)
+#define DUK_RE_FLAG_GLOBAL      (1U << 0)
+#define DUK_RE_FLAG_IGNORE_CASE (1U << 1)
+#define DUK_RE_FLAG_MULTILINE   (1U << 2)
 
 struct duk_re_matcher_ctx {
 	duk_hthread *thr;
@@ -4334,7 +4518,7 @@ struct duk_re_matcher_ctx {
 	const duk_uint8_t *input_end;
 	const duk_uint8_t *bytecode;
 	const duk_uint8_t *bytecode_end;
-	const duk_uint8_t **saved;  /* allocated from valstack (fixed buffer) */
+	const duk_uint8_t **saved; /* allocated from valstack (fixed buffer) */
 	duk_uint32_t nsaved;
 	duk_uint32_t recursion_depth;
 	duk_uint32_t recursion_limit;
@@ -4349,11 +4533,11 @@ struct duk_re_compiler_ctx {
 	duk_lexer_ctx lex;
 	duk_re_token curr_token;
 	duk_bufwriter_ctx bw;
-	duk_uint32_t captures;  /* highest capture number emitted so far (used as: ++captures) */
+	duk_uint32_t captures; /* highest capture number emitted so far (used as: ++captures) */
 	duk_uint32_t highest_backref;
 	duk_uint32_t recursion_depth;
 	duk_uint32_t recursion_limit;
-	duk_uint32_t nranges;  /* internal temporary value, used for char classes */
+	duk_uint32_t nranges; /* internal temporary value, used for char classes */
 };
 
 /*
@@ -4364,10 +4548,10 @@ struct duk_re_compiler_ctx {
 DUK_INTERNAL_DECL void duk_regexp_compile(duk_hthread *thr);
 DUK_INTERNAL_DECL void duk_regexp_create_instance(duk_hthread *thr);
 DUK_INTERNAL_DECL void duk_regexp_match(duk_hthread *thr);
-DUK_INTERNAL_DECL void duk_regexp_match_force_global(duk_hthread *thr);  /* hacky helper for String.prototype.split() */
+DUK_INTERNAL_DECL void duk_regexp_match_force_global(duk_hthread *thr); /* hacky helper for String.prototype.split() */
 #endif
 
-#endif  /* DUK_REGEXP_H_INCLUDED */
+#endif /* DUK_REGEXP_H_INCLUDED */
 /* #include duk_heaphdr.h */
 /*
  *  Heap header definition and assorted macros, including ref counting.
@@ -4420,7 +4604,7 @@ struct duk_heaphdr {
 #else
 	duk_size_t h_refcount;
 #endif
-#endif  /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_REFERENCE_COUNTING */
 
 #if defined(DUK_USE_HEAPPTR16)
 	duk_uint16_t h_next16;
@@ -4468,7 +4652,7 @@ struct duk_heaphdr_string {
 #endif
 #if defined(DUK_USE_REFCOUNT16)
 	duk_uint16_t h_refcount;
-	duk_uint16_t h_strextra16;  /* round out to 8 bytes */
+	duk_uint16_t h_strextra16; /* round out to 8 bytes */
 #elif defined(DUK_USE_REFCOUNT32)
 	duk_uint32_t h_refcount;
 #else
@@ -4476,160 +4660,169 @@ struct duk_heaphdr_string {
 #endif
 #else
 	duk_uint16_t h_strextra16;
-#endif  /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_REFERENCE_COUNTING */
 
 	duk_hstring *h_next;
 	/* No 'h_prev' pointer for strings. */
 };
 
-#define DUK_HEAPHDR_FLAGS_TYPE_MASK      0x00000003UL
-#define DUK_HEAPHDR_FLAGS_FLAG_MASK      (~DUK_HEAPHDR_FLAGS_TYPE_MASK)
+#define DUK_HEAPHDR_FLAGS_TYPE_MASK 0x00000003UL
+#define DUK_HEAPHDR_FLAGS_FLAG_MASK (~DUK_HEAPHDR_FLAGS_TYPE_MASK)
 
-                                             /* 2 bits for heap type */
-#define DUK_HEAPHDR_FLAGS_HEAP_START     2   /* 5 heap flags */
-#define DUK_HEAPHDR_FLAGS_USER_START     7   /* 25 user flags */
+/* 2 bits for heap type */
+#define DUK_HEAPHDR_FLAGS_HEAP_START 2 /* 5 heap flags */
+#define DUK_HEAPHDR_FLAGS_USER_START 7 /* 25 user flags */
 
-#define DUK_HEAPHDR_HEAP_FLAG_NUMBER(n)  (DUK_HEAPHDR_FLAGS_HEAP_START + (n))
-#define DUK_HEAPHDR_USER_FLAG_NUMBER(n)  (DUK_HEAPHDR_FLAGS_USER_START + (n))
-#define DUK_HEAPHDR_HEAP_FLAG(n)         (1UL << (DUK_HEAPHDR_FLAGS_HEAP_START + (n)))
-#define DUK_HEAPHDR_USER_FLAG(n)         (1UL << (DUK_HEAPHDR_FLAGS_USER_START + (n)))
+#define DUK_HEAPHDR_HEAP_FLAG_NUMBER(n) (DUK_HEAPHDR_FLAGS_HEAP_START + (n))
+#define DUK_HEAPHDR_USER_FLAG_NUMBER(n) (DUK_HEAPHDR_FLAGS_USER_START + (n))
+#define DUK_HEAPHDR_HEAP_FLAG(n)        (1UL << (DUK_HEAPHDR_FLAGS_HEAP_START + (n)))
+#define DUK_HEAPHDR_USER_FLAG(n)        (1UL << (DUK_HEAPHDR_FLAGS_USER_START + (n)))
 
-#define DUK_HEAPHDR_FLAG_REACHABLE       DUK_HEAPHDR_HEAP_FLAG(0)  /* mark-and-sweep: reachable */
-#define DUK_HEAPHDR_FLAG_TEMPROOT        DUK_HEAPHDR_HEAP_FLAG(1)  /* mark-and-sweep: children not processed */
-#define DUK_HEAPHDR_FLAG_FINALIZABLE     DUK_HEAPHDR_HEAP_FLAG(2)  /* mark-and-sweep: finalizable (on current pass) */
-#define DUK_HEAPHDR_FLAG_FINALIZED       DUK_HEAPHDR_HEAP_FLAG(3)  /* mark-and-sweep: finalized (on previous pass) */
-#define DUK_HEAPHDR_FLAG_READONLY        DUK_HEAPHDR_HEAP_FLAG(4)  /* read-only object, in code section */
+#define DUK_HEAPHDR_FLAG_REACHABLE   DUK_HEAPHDR_HEAP_FLAG(0) /* mark-and-sweep: reachable */
+#define DUK_HEAPHDR_FLAG_TEMPROOT    DUK_HEAPHDR_HEAP_FLAG(1) /* mark-and-sweep: children not processed */
+#define DUK_HEAPHDR_FLAG_FINALIZABLE DUK_HEAPHDR_HEAP_FLAG(2) /* mark-and-sweep: finalizable (on current pass) */
+#define DUK_HEAPHDR_FLAG_FINALIZED   DUK_HEAPHDR_HEAP_FLAG(3) /* mark-and-sweep: finalized (on previous pass) */
+#define DUK_HEAPHDR_FLAG_READONLY    DUK_HEAPHDR_HEAP_FLAG(4) /* read-only object, in code section */
 
-#define DUK_HTYPE_MIN                    0
-#define DUK_HTYPE_STRING                 0
-#define DUK_HTYPE_OBJECT                 1
-#define DUK_HTYPE_BUFFER                 2
-#define DUK_HTYPE_MAX                    2
+#define DUK_HTYPE_MIN    0
+#define DUK_HTYPE_STRING 0
+#define DUK_HTYPE_OBJECT 1
+#define DUK_HTYPE_BUFFER 2
+#define DUK_HTYPE_MAX    2
 
 #if defined(DUK_USE_HEAPPTR16)
-#define DUK_HEAPHDR_GET_NEXT(heap,h) \
-	((duk_heaphdr *) DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->h_next16))
-#define DUK_HEAPHDR_SET_NEXT(heap,h,val)   do { \
+#define DUK_HEAPHDR_GET_NEXT(heap, h) ((duk_heaphdr *) DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->h_next16))
+#define DUK_HEAPHDR_SET_NEXT(heap, h, val) \
+	do { \
 		(h)->h_next16 = DUK_USE_HEAPPTR_ENC16((heap)->heap_udata, (void *) val); \
 	} while (0)
 #else
-#define DUK_HEAPHDR_GET_NEXT(heap,h)  ((h)->h_next)
-#define DUK_HEAPHDR_SET_NEXT(heap,h,val)   do { \
+#define DUK_HEAPHDR_GET_NEXT(heap, h) ((h)->h_next)
+#define DUK_HEAPHDR_SET_NEXT(heap, h, val) \
+	do { \
 		(h)->h_next = (val); \
 	} while (0)
 #endif
 
 #if defined(DUK_USE_DOUBLE_LINKED_HEAP)
 #if defined(DUK_USE_HEAPPTR16)
-#define DUK_HEAPHDR_GET_PREV(heap,h) \
-	((duk_heaphdr *) DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->h_prev16))
-#define DUK_HEAPHDR_SET_PREV(heap,h,val)   do { \
+#define DUK_HEAPHDR_GET_PREV(heap, h) ((duk_heaphdr *) DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->h_prev16))
+#define DUK_HEAPHDR_SET_PREV(heap, h, val) \
+	do { \
 		(h)->h_prev16 = DUK_USE_HEAPPTR_ENC16((heap)->heap_udata, (void *) (val)); \
 	} while (0)
 #else
-#define DUK_HEAPHDR_GET_PREV(heap,h)       ((h)->h_prev)
-#define DUK_HEAPHDR_SET_PREV(heap,h,val)   do { \
+#define DUK_HEAPHDR_GET_PREV(heap, h) ((h)->h_prev)
+#define DUK_HEAPHDR_SET_PREV(heap, h, val) \
+	do { \
 		(h)->h_prev = (val); \
 	} while (0)
 #endif
 #endif
 
 #if defined(DUK_USE_REFERENCE_COUNTING)
-#define DUK_HEAPHDR_GET_REFCOUNT(h)   ((h)->h_refcount)
-#define DUK_HEAPHDR_SET_REFCOUNT(h,val)  do { \
+#define DUK_HEAPHDR_GET_REFCOUNT(h) ((h)->h_refcount)
+#define DUK_HEAPHDR_SET_REFCOUNT(h, val) \
+	do { \
 		(h)->h_refcount = (val); \
-		DUK_ASSERT((h)->h_refcount == (val));  /* No truncation. */ \
+		DUK_ASSERT((h)->h_refcount == (val)); /* No truncation. */ \
 	} while (0)
-#define DUK_HEAPHDR_PREINC_REFCOUNT(h)  (++(h)->h_refcount)  /* result: updated refcount */
-#define DUK_HEAPHDR_PREDEC_REFCOUNT(h)  (--(h)->h_refcount)  /* result: updated refcount */
+#define DUK_HEAPHDR_PREINC_REFCOUNT(h) (++(h)->h_refcount) /* result: updated refcount */
+#define DUK_HEAPHDR_PREDEC_REFCOUNT(h) (--(h)->h_refcount) /* result: updated refcount */
 #else
 /* refcount macros not defined without refcounting, caller must #if defined() now */
-#endif  /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_REFERENCE_COUNTING */
 
 /*
  *  Note: type is treated as a field separate from flags, so some masking is
  *  involved in the macros below.
  */
 
-#define DUK_HEAPHDR_GET_FLAGS_RAW(h)  ((h)->h_flags)
-#define DUK_HEAPHDR_SET_FLAGS_RAW(h,val)  do { \
-		(h)->h_flags = (val); } \
+#define DUK_HEAPHDR_GET_FLAGS_RAW(h) ((h)->h_flags)
+#define DUK_HEAPHDR_SET_FLAGS_RAW(h, val) \
+	do { \
+		(h)->h_flags = (val); \
+	} \
 	}
-#define DUK_HEAPHDR_GET_FLAGS(h)      ((h)->h_flags & DUK_HEAPHDR_FLAGS_FLAG_MASK)
-#define DUK_HEAPHDR_SET_FLAGS(h,val)  do { \
+#define DUK_HEAPHDR_GET_FLAGS(h) ((h)->h_flags & DUK_HEAPHDR_FLAGS_FLAG_MASK)
+#define DUK_HEAPHDR_SET_FLAGS(h, val) \
+	do { \
 		(h)->h_flags = ((h)->h_flags & ~(DUK_HEAPHDR_FLAGS_FLAG_MASK)) | (val); \
 	} while (0)
-#define DUK_HEAPHDR_GET_TYPE(h)       ((h)->h_flags & DUK_HEAPHDR_FLAGS_TYPE_MASK)
-#define DUK_HEAPHDR_SET_TYPE(h,val)   do { \
+#define DUK_HEAPHDR_GET_TYPE(h) ((h)->h_flags & DUK_HEAPHDR_FLAGS_TYPE_MASK)
+#define DUK_HEAPHDR_SET_TYPE(h, val) \
+	do { \
 		(h)->h_flags = ((h)->h_flags & ~(DUK_HEAPHDR_FLAGS_TYPE_MASK)) | (val); \
 	} while (0)
 
 /* Comparison for type >= DUK_HTYPE_MIN skipped; because DUK_HTYPE_MIN is zero
  * and the comparison is unsigned, it's always true and generates warnings.
  */
-#define DUK_HEAPHDR_HTYPE_VALID(h)    ( \
-	DUK_HEAPHDR_GET_TYPE((h)) <= DUK_HTYPE_MAX \
-	)
+#define DUK_HEAPHDR_HTYPE_VALID(h) (DUK_HEAPHDR_GET_TYPE((h)) <= DUK_HTYPE_MAX)
 
-#define DUK_HEAPHDR_SET_TYPE_AND_FLAGS(h,tval,fval)  do { \
-		(h)->h_flags = ((tval) & DUK_HEAPHDR_FLAGS_TYPE_MASK) | \
-		               ((fval) & DUK_HEAPHDR_FLAGS_FLAG_MASK); \
+#define DUK_HEAPHDR_SET_TYPE_AND_FLAGS(h, tval, fval) \
+	do { \
+		(h)->h_flags = ((tval) &DUK_HEAPHDR_FLAGS_TYPE_MASK) | ((fval) &DUK_HEAPHDR_FLAGS_FLAG_MASK); \
 	} while (0)
 
-#define DUK_HEAPHDR_SET_FLAG_BITS(h,bits)  do { \
+#define DUK_HEAPHDR_SET_FLAG_BITS(h, bits) \
+	do { \
 		DUK_ASSERT(((bits) & ~(DUK_HEAPHDR_FLAGS_FLAG_MASK)) == 0); \
 		(h)->h_flags |= (bits); \
 	} while (0)
 
-#define DUK_HEAPHDR_CLEAR_FLAG_BITS(h,bits)  do { \
+#define DUK_HEAPHDR_CLEAR_FLAG_BITS(h, bits) \
+	do { \
 		DUK_ASSERT(((bits) & ~(DUK_HEAPHDR_FLAGS_FLAG_MASK)) == 0); \
 		(h)->h_flags &= ~((bits)); \
 	} while (0)
 
-#define DUK_HEAPHDR_CHECK_FLAG_BITS(h,bits)  (((h)->h_flags & (bits)) != 0)
+#define DUK_HEAPHDR_CHECK_FLAG_BITS(h, bits) (((h)->h_flags & (bits)) != 0)
 
-#define DUK_HEAPHDR_SET_REACHABLE(h)      DUK_HEAPHDR_SET_FLAG_BITS((h),DUK_HEAPHDR_FLAG_REACHABLE)
-#define DUK_HEAPHDR_CLEAR_REACHABLE(h)    DUK_HEAPHDR_CLEAR_FLAG_BITS((h),DUK_HEAPHDR_FLAG_REACHABLE)
-#define DUK_HEAPHDR_HAS_REACHABLE(h)      DUK_HEAPHDR_CHECK_FLAG_BITS((h),DUK_HEAPHDR_FLAG_REACHABLE)
+#define DUK_HEAPHDR_SET_REACHABLE(h)   DUK_HEAPHDR_SET_FLAG_BITS((h), DUK_HEAPHDR_FLAG_REACHABLE)
+#define DUK_HEAPHDR_CLEAR_REACHABLE(h) DUK_HEAPHDR_CLEAR_FLAG_BITS((h), DUK_HEAPHDR_FLAG_REACHABLE)
+#define DUK_HEAPHDR_HAS_REACHABLE(h)   DUK_HEAPHDR_CHECK_FLAG_BITS((h), DUK_HEAPHDR_FLAG_REACHABLE)
 
-#define DUK_HEAPHDR_SET_TEMPROOT(h)       DUK_HEAPHDR_SET_FLAG_BITS((h),DUK_HEAPHDR_FLAG_TEMPROOT)
-#define DUK_HEAPHDR_CLEAR_TEMPROOT(h)     DUK_HEAPHDR_CLEAR_FLAG_BITS((h),DUK_HEAPHDR_FLAG_TEMPROOT)
-#define DUK_HEAPHDR_HAS_TEMPROOT(h)       DUK_HEAPHDR_CHECK_FLAG_BITS((h),DUK_HEAPHDR_FLAG_TEMPROOT)
+#define DUK_HEAPHDR_SET_TEMPROOT(h)   DUK_HEAPHDR_SET_FLAG_BITS((h), DUK_HEAPHDR_FLAG_TEMPROOT)
+#define DUK_HEAPHDR_CLEAR_TEMPROOT(h) DUK_HEAPHDR_CLEAR_FLAG_BITS((h), DUK_HEAPHDR_FLAG_TEMPROOT)
+#define DUK_HEAPHDR_HAS_TEMPROOT(h)   DUK_HEAPHDR_CHECK_FLAG_BITS((h), DUK_HEAPHDR_FLAG_TEMPROOT)
 
-#define DUK_HEAPHDR_SET_FINALIZABLE(h)    DUK_HEAPHDR_SET_FLAG_BITS((h),DUK_HEAPHDR_FLAG_FINALIZABLE)
-#define DUK_HEAPHDR_CLEAR_FINALIZABLE(h)  DUK_HEAPHDR_CLEAR_FLAG_BITS((h),DUK_HEAPHDR_FLAG_FINALIZABLE)
-#define DUK_HEAPHDR_HAS_FINALIZABLE(h)    DUK_HEAPHDR_CHECK_FLAG_BITS((h),DUK_HEAPHDR_FLAG_FINALIZABLE)
+#define DUK_HEAPHDR_SET_FINALIZABLE(h)   DUK_HEAPHDR_SET_FLAG_BITS((h), DUK_HEAPHDR_FLAG_FINALIZABLE)
+#define DUK_HEAPHDR_CLEAR_FINALIZABLE(h) DUK_HEAPHDR_CLEAR_FLAG_BITS((h), DUK_HEAPHDR_FLAG_FINALIZABLE)
+#define DUK_HEAPHDR_HAS_FINALIZABLE(h)   DUK_HEAPHDR_CHECK_FLAG_BITS((h), DUK_HEAPHDR_FLAG_FINALIZABLE)
 
-#define DUK_HEAPHDR_SET_FINALIZED(h)      DUK_HEAPHDR_SET_FLAG_BITS((h),DUK_HEAPHDR_FLAG_FINALIZED)
-#define DUK_HEAPHDR_CLEAR_FINALIZED(h)    DUK_HEAPHDR_CLEAR_FLAG_BITS((h),DUK_HEAPHDR_FLAG_FINALIZED)
-#define DUK_HEAPHDR_HAS_FINALIZED(h)      DUK_HEAPHDR_CHECK_FLAG_BITS((h),DUK_HEAPHDR_FLAG_FINALIZED)
+#define DUK_HEAPHDR_SET_FINALIZED(h)   DUK_HEAPHDR_SET_FLAG_BITS((h), DUK_HEAPHDR_FLAG_FINALIZED)
+#define DUK_HEAPHDR_CLEAR_FINALIZED(h) DUK_HEAPHDR_CLEAR_FLAG_BITS((h), DUK_HEAPHDR_FLAG_FINALIZED)
+#define DUK_HEAPHDR_HAS_FINALIZED(h)   DUK_HEAPHDR_CHECK_FLAG_BITS((h), DUK_HEAPHDR_FLAG_FINALIZED)
 
-#define DUK_HEAPHDR_SET_READONLY(h)       DUK_HEAPHDR_SET_FLAG_BITS((h),DUK_HEAPHDR_FLAG_READONLY)
-#define DUK_HEAPHDR_CLEAR_READONLY(h)     DUK_HEAPHDR_CLEAR_FLAG_BITS((h),DUK_HEAPHDR_FLAG_READONLY)
-#define DUK_HEAPHDR_HAS_READONLY(h)       DUK_HEAPHDR_CHECK_FLAG_BITS((h),DUK_HEAPHDR_FLAG_READONLY)
+#define DUK_HEAPHDR_SET_READONLY(h)   DUK_HEAPHDR_SET_FLAG_BITS((h), DUK_HEAPHDR_FLAG_READONLY)
+#define DUK_HEAPHDR_CLEAR_READONLY(h) DUK_HEAPHDR_CLEAR_FLAG_BITS((h), DUK_HEAPHDR_FLAG_READONLY)
+#define DUK_HEAPHDR_HAS_READONLY(h)   DUK_HEAPHDR_CHECK_FLAG_BITS((h), DUK_HEAPHDR_FLAG_READONLY)
 
 /* get or set a range of flags; m=first bit number, n=number of bits */
-#define DUK_HEAPHDR_GET_FLAG_RANGE(h,m,n)  (((h)->h_flags >> (m)) & ((1UL << (n)) - 1UL))
+#define DUK_HEAPHDR_GET_FLAG_RANGE(h, m, n) (((h)->h_flags >> (m)) & ((1UL << (n)) - 1UL))
 
-#define DUK_HEAPHDR_SET_FLAG_RANGE(h,m,n,v)  do { \
-		(h)->h_flags = \
-			((h)->h_flags & (~(((1UL << (n)) - 1UL) << (m)))) \
-			| ((v) << (m)); \
+#define DUK_HEAPHDR_SET_FLAG_RANGE(h, m, n, v) \
+	do { \
+		(h)->h_flags = ((h)->h_flags & (~(((1UL << (n)) - 1UL) << (m)))) | ((v) << (m)); \
 	} while (0)
 
 /* init pointer fields to null */
 #if defined(DUK_USE_DOUBLE_LINKED_HEAP)
-#define DUK_HEAPHDR_INIT_NULLS(h)       do { \
+#define DUK_HEAPHDR_INIT_NULLS(h) \
+	do { \
 		DUK_HEAPHDR_SET_NEXT((h), (void *) NULL); \
 		DUK_HEAPHDR_SET_PREV((h), (void *) NULL); \
 	} while (0)
 #else
-#define DUK_HEAPHDR_INIT_NULLS(h)       do { \
+#define DUK_HEAPHDR_INIT_NULLS(h) \
+	do { \
 		DUK_HEAPHDR_SET_NEXT((h), (void *) NULL); \
 	} while (0)
 #endif
 
-#define DUK_HEAPHDR_STRING_INIT_NULLS(h)  do { \
+#define DUK_HEAPHDR_STRING_INIT_NULLS(h) \
+	do { \
 		(h)->h_next = NULL; \
 	} while (0)
 
@@ -4654,26 +4847,28 @@ struct duk_heaphdr_string {
 /* Check that prev/next links are consistent: if e.g. h->prev is != NULL,
  * h->prev->next should point back to h.
  */
-#if defined(DUK_USE_DOUBLE_LINKED_HEAP) && defined(DUK_USE_ASSERTIONS)
-#define DUK_ASSERT_HEAPHDR_LINKS(heap,h) do { \
-		if ((h) != NULL) { \
-			duk_heaphdr *h__prev, *h__next; \
-			h__prev = DUK_HEAPHDR_GET_PREV((heap), (h)); \
-			h__next = DUK_HEAPHDR_GET_NEXT((heap), (h)); \
-			DUK_ASSERT(h__prev == NULL || (DUK_HEAPHDR_GET_NEXT((heap), h__prev) == (h))); \
-			DUK_ASSERT(h__next == NULL || (DUK_HEAPHDR_GET_PREV((heap), h__next) == (h))); \
-		} \
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL_DECL void duk_heaphdr_assert_valid_subclassed(duk_heaphdr *h);
+DUK_INTERNAL_DECL void duk_heaphdr_assert_links(duk_heap *heap, duk_heaphdr *h);
+DUK_INTERNAL_DECL void duk_heaphdr_assert_valid(duk_heaphdr *h);
+#define DUK_HEAPHDR_ASSERT_LINKS(heap, h) \
+	do { \
+		duk_heaphdr_assert_links((heap), (h)); \
+	} while (0)
+#define DUK_HEAPHDR_ASSERT_VALID(h) \
+	do { \
+		duk_heaphdr_assert_valid((h)); \
 	} while (0)
 #else
-#define DUK_ASSERT_HEAPHDR_LINKS(heap,h) do {} while (0)
-#endif
-
-#define DUK_ASSERT_HEAPHDR_VALID(h) do { \
-		DUK_ASSERT((h) != NULL); \
-		DUK_ASSERT(DUK_HEAPHDR_HTYPE_VALID((h))); \
+#define DUK_HEAPHDR_ASSERT_LINKS(heap, h) \
+	do { \
 	} while (0)
+#define DUK_HEAPHDR_ASSERT_VALID(h) \
+	do { \
+	} while (0)
+#endif
 
-#endif  /* DUK_HEAPHDR_H_INCLUDED */
+#endif /* DUK_HEAPHDR_H_INCLUDED */
 /* #include duk_refcount.h */
 /*
  *  Reference counting helper macros.  The macros take a thread argument
@@ -4694,19 +4889,20 @@ struct duk_heaphdr_string {
 /* XXX: double evaluation for 'tv' argument. */
 #define DUK_TVAL_NEEDS_REFCOUNT_UPDATE(tv) \
 	(DUK_TVAL_IS_HEAP_ALLOCATED((tv)) && !DUK_HEAPHDR_HAS_READONLY(DUK_TVAL_GET_HEAPHDR((tv))))
-#define DUK_HEAPHDR_NEEDS_REFCOUNT_UPDATE(h)  (!DUK_HEAPHDR_HAS_READONLY((h)))
-#else  /* DUK_USE_ROM_OBJECTS */
+#define DUK_HEAPHDR_NEEDS_REFCOUNT_UPDATE(h) (!DUK_HEAPHDR_HAS_READONLY((h)))
+#else /* DUK_USE_ROM_OBJECTS */
 /* Without ROM objects "needs refcount update" == is heap allocated. */
-#define DUK_TVAL_NEEDS_REFCOUNT_UPDATE(tv)    DUK_TVAL_IS_HEAP_ALLOCATED((tv))
-#define DUK_HEAPHDR_NEEDS_REFCOUNT_UPDATE(h)  1
-#endif  /* DUK_USE_ROM_OBJECTS */
+#define DUK_TVAL_NEEDS_REFCOUNT_UPDATE(tv)   DUK_TVAL_IS_HEAP_ALLOCATED((tv))
+#define DUK_HEAPHDR_NEEDS_REFCOUNT_UPDATE(h) 1
+#endif /* DUK_USE_ROM_OBJECTS */
 
 /* Fast variants, inline refcount operations except for refzero handling.
  * Can be used explicitly when speed is always more important than size.
  * For a good compiler and a single file build, these are basically the
  * same as a forced inline.
  */
-#define DUK_TVAL_INCREF_FAST(thr,tv) do { \
+#define DUK_TVAL_INCREF_FAST(thr, tv) \
+	do { \
 		duk_tval *duk__tv = (tv); \
 		DUK_ASSERT(duk__tv != NULL); \
 		if (DUK_TVAL_NEEDS_REFCOUNT_UPDATE(duk__tv)) { \
@@ -4714,10 +4910,11 @@ struct duk_heaphdr_string {
 			DUK_ASSERT(duk__h != NULL); \
 			DUK_ASSERT(DUK_HEAPHDR_HTYPE_VALID(duk__h)); \
 			DUK_HEAPHDR_PREINC_REFCOUNT(duk__h); \
-			DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT(duk__h) != 0);  /* No wrapping. */ \
+			DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT(duk__h) != 0); /* No wrapping. */ \
 		} \
 	} while (0)
-#define DUK_TVAL_DECREF_FAST(thr,tv) do { \
+#define DUK_TVAL_DECREF_FAST(thr, tv) \
+	do { \
 		duk_tval *duk__tv = (tv); \
 		DUK_ASSERT(duk__tv != NULL); \
 		if (DUK_TVAL_NEEDS_REFCOUNT_UPDATE(duk__tv)) { \
@@ -4730,7 +4927,8 @@ struct duk_heaphdr_string {
 			} \
 		} \
 	} while (0)
-#define DUK_TVAL_DECREF_NORZ_FAST(thr,tv) do { \
+#define DUK_TVAL_DECREF_NORZ_FAST(thr, tv) \
+	do { \
 		duk_tval *duk__tv = (tv); \
 		DUK_ASSERT(duk__tv != NULL); \
 		if (DUK_TVAL_NEEDS_REFCOUNT_UPDATE(duk__tv)) { \
@@ -4743,16 +4941,18 @@ struct duk_heaphdr_string {
 			} \
 		} \
 	} while (0)
-#define DUK_HEAPHDR_INCREF_FAST(thr,h) do { \
+#define DUK_HEAPHDR_INCREF_FAST(thr, h) \
+	do { \
 		duk_heaphdr *duk__h = (duk_heaphdr *) (h); \
 		DUK_ASSERT(duk__h != NULL); \
 		DUK_ASSERT(DUK_HEAPHDR_HTYPE_VALID(duk__h)); \
 		if (DUK_HEAPHDR_NEEDS_REFCOUNT_UPDATE(duk__h)) { \
 			DUK_HEAPHDR_PREINC_REFCOUNT(duk__h); \
-			DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT(duk__h) != 0);  /* No wrapping. */ \
+			DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT(duk__h) != 0); /* No wrapping. */ \
 		} \
 	} while (0)
-#define DUK_HEAPHDR_DECREF_FAST_RAW(thr,h,rzcall,rzcast) do { \
+#define DUK_HEAPHDR_DECREF_FAST_RAW(thr, h, rzcall, rzcast) \
+	do { \
 		duk_heaphdr *duk__h = (duk_heaphdr *) (h); \
 		DUK_ASSERT(duk__h != NULL); \
 		DUK_ASSERT(DUK_HEAPHDR_HTYPE_VALID(duk__h)); \
@@ -4763,29 +4963,72 @@ struct duk_heaphdr_string {
 			} \
 		} \
 	} while (0)
-#define DUK_HEAPHDR_DECREF_FAST(thr,h) \
-	DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_heaphdr_refzero,duk_heaphdr *)
-#define DUK_HEAPHDR_DECREF_NORZ_FAST(thr,h) \
-	DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_heaphdr_refzero_norz,duk_heaphdr *)
+#define DUK_HEAPHDR_DECREF_FAST(thr, h)      DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_heaphdr_refzero, duk_heaphdr *)
+#define DUK_HEAPHDR_DECREF_NORZ_FAST(thr, h) DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_heaphdr_refzero_norz, duk_heaphdr *)
 
 /* Slow variants, call to a helper to reduce code size.
  * Can be used explicitly when size is always more important than speed.
  */
-#define DUK_TVAL_INCREF_SLOW(thr,tv)         do { duk_tval_incref((tv)); } while (0)
-#define DUK_TVAL_DECREF_SLOW(thr,tv)         do { duk_tval_decref((thr), (tv)); } while (0)
-#define DUK_TVAL_DECREF_NORZ_SLOW(thr,tv)    do { duk_tval_decref_norz((thr), (tv)); } while (0)
-#define DUK_HEAPHDR_INCREF_SLOW(thr,h)       do { duk_heaphdr_incref((duk_heaphdr *) (h)); } while (0)
-#define DUK_HEAPHDR_DECREF_SLOW(thr,h)       do { duk_heaphdr_decref((thr), (duk_heaphdr *) (h)); } while (0)
-#define DUK_HEAPHDR_DECREF_NORZ_SLOW(thr,h)  do { duk_heaphdr_decref_norz((thr), (duk_heaphdr *) (h)); } while (0)
-#define DUK_HSTRING_INCREF_SLOW(thr,h)       do { duk_heaphdr_incref((duk_heaphdr *) (h)); } while (0)
-#define DUK_HSTRING_DECREF_SLOW(thr,h)       do { duk_heaphdr_decref((thr), (duk_heaphdr *) (h)); } while (0)
-#define DUK_HSTRING_DECREF_NORZ_SLOW(thr,h)  do { duk_heaphdr_decref_norz((thr), (duk_heaphdr *) (h)); } while (0)
-#define DUK_HBUFFER_INCREF_SLOW(thr,h)       do { duk_heaphdr_incref((duk_heaphdr *) (h)); } while (0)
-#define DUK_HBUFFER_DECREF_SLOW(thr,h)       do { duk_heaphdr_decref((thr), (duk_heaphdr *) (h)); } while (0)
-#define DUK_HBUFFER_DECREF_NORZ_SLOW(thr,h)  do { duk_heaphdr_decref_norz((thr), (duk_heaphdr *) (h)); } while (0)
-#define DUK_HOBJECT_INCREF_SLOW(thr,h)       do { duk_heaphdr_incref((duk_heaphdr *) (h)); } while (0)
-#define DUK_HOBJECT_DECREF_SLOW(thr,h)       do { duk_heaphdr_decref((thr), (duk_heaphdr *) (h)); } while (0)
-#define DUK_HOBJECT_DECREF_NORZ_SLOW(thr,h)  do { duk_heaphdr_decref_norz((thr), (duk_heaphdr *) (h)); } while (0)
+#define DUK_TVAL_INCREF_SLOW(thr, tv) \
+	do { \
+		duk_tval_incref((tv)); \
+	} while (0)
+#define DUK_TVAL_DECREF_SLOW(thr, tv) \
+	do { \
+		duk_tval_decref((thr), (tv)); \
+	} while (0)
+#define DUK_TVAL_DECREF_NORZ_SLOW(thr, tv) \
+	do { \
+		duk_tval_decref_norz((thr), (tv)); \
+	} while (0)
+#define DUK_HEAPHDR_INCREF_SLOW(thr, h) \
+	do { \
+		duk_heaphdr_incref((duk_heaphdr *) (h)); \
+	} while (0)
+#define DUK_HEAPHDR_DECREF_SLOW(thr, h) \
+	do { \
+		duk_heaphdr_decref((thr), (duk_heaphdr *) (h)); \
+	} while (0)
+#define DUK_HEAPHDR_DECREF_NORZ_SLOW(thr, h) \
+	do { \
+		duk_heaphdr_decref_norz((thr), (duk_heaphdr *) (h)); \
+	} while (0)
+#define DUK_HSTRING_INCREF_SLOW(thr, h) \
+	do { \
+		duk_heaphdr_incref((duk_heaphdr *) (h)); \
+	} while (0)
+#define DUK_HSTRING_DECREF_SLOW(thr, h) \
+	do { \
+		duk_heaphdr_decref((thr), (duk_heaphdr *) (h)); \
+	} while (0)
+#define DUK_HSTRING_DECREF_NORZ_SLOW(thr, h) \
+	do { \
+		duk_heaphdr_decref_norz((thr), (duk_heaphdr *) (h)); \
+	} while (0)
+#define DUK_HBUFFER_INCREF_SLOW(thr, h) \
+	do { \
+		duk_heaphdr_incref((duk_heaphdr *) (h)); \
+	} while (0)
+#define DUK_HBUFFER_DECREF_SLOW(thr, h) \
+	do { \
+		duk_heaphdr_decref((thr), (duk_heaphdr *) (h)); \
+	} while (0)
+#define DUK_HBUFFER_DECREF_NORZ_SLOW(thr, h) \
+	do { \
+		duk_heaphdr_decref_norz((thr), (duk_heaphdr *) (h)); \
+	} while (0)
+#define DUK_HOBJECT_INCREF_SLOW(thr, h) \
+	do { \
+		duk_heaphdr_incref((duk_heaphdr *) (h)); \
+	} while (0)
+#define DUK_HOBJECT_DECREF_SLOW(thr, h) \
+	do { \
+		duk_heaphdr_decref((thr), (duk_heaphdr *) (h)); \
+	} while (0)
+#define DUK_HOBJECT_DECREF_NORZ_SLOW(thr, h) \
+	do { \
+		duk_heaphdr_decref_norz((thr), (duk_heaphdr *) (h)); \
+	} while (0)
 
 /* Default variants.  Selection depends on speed/size preference.
  * Concretely: with gcc 4.8.1 -Os x64 the difference in final binary
@@ -4795,122 +5038,136 @@ struct duk_heaphdr_string {
 /* XXX: It would be nice to specialize for specific duk_hobject subtypes
  * but current refzero queue handling prevents that.
  */
-#define DUK_TVAL_INCREF(thr,tv)                DUK_TVAL_INCREF_FAST((thr),(tv))
-#define DUK_TVAL_DECREF(thr,tv)                DUK_TVAL_DECREF_FAST((thr),(tv))
-#define DUK_TVAL_DECREF_NORZ(thr,tv)           DUK_TVAL_DECREF_NORZ_FAST((thr),(tv))
-#define DUK_HEAPHDR_INCREF(thr,h)              DUK_HEAPHDR_INCREF_FAST((thr),(h))
-#define DUK_HEAPHDR_DECREF(thr,h)              DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_heaphdr_refzero,duk_heaphdr *)
-#define DUK_HEAPHDR_DECREF_NORZ(thr,h)         DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_heaphdr_refzero_norz,duk_heaphdr *)
-#define DUK_HSTRING_INCREF(thr,h)              DUK_HEAPHDR_INCREF((thr),(duk_heaphdr *) (h))
-#define DUK_HSTRING_DECREF(thr,h)              DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_hstring_refzero,duk_hstring *)
-#define DUK_HSTRING_DECREF_NORZ(thr,h)         DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_hstring_refzero,duk_hstring *)  /* no 'norz' variant */
-#define DUK_HOBJECT_INCREF(thr,h)              DUK_HEAPHDR_INCREF((thr),(duk_heaphdr *) (h))
-#define DUK_HOBJECT_DECREF(thr,h)              DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_hobject_refzero,duk_hobject *)
-#define DUK_HOBJECT_DECREF_NORZ(thr,h)         DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_hobject_refzero_norz,duk_hobject *)
-#define DUK_HBUFFER_INCREF(thr,h)              DUK_HEAPHDR_INCREF((thr),(duk_heaphdr *) (h))
-#define DUK_HBUFFER_DECREF(thr,h)              DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_hbuffer_refzero,duk_hbuffer *)
-#define DUK_HBUFFER_DECREF_NORZ(thr,h)         DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_hbuffer_refzero,duk_hbuffer *)  /* no 'norz' variant */
-#define DUK_HCOMPFUNC_INCREF(thr,h)            DUK_HEAPHDR_INCREF((thr),(duk_heaphdr *) &(h)->obj)
-#define DUK_HCOMPFUNC_DECREF(thr,h)            DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_hobject_refzero,duk_hobject *)
-#define DUK_HCOMPFUNC_DECREF_NORZ(thr,h)       DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_hobject_refzero_norz,duk_hobject *)
-#define DUK_HNATFUNC_INCREF(thr,h)             DUK_HEAPHDR_INCREF((thr),(duk_heaphdr *) &(h)->obj)
-#define DUK_HNATFUNC_DECREF(thr,h)             DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_hobject_refzero,duk_hobject *)
-#define DUK_HNATFUNC_DECREF_NORZ(thr,h)        DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_hobject_refzero_norz,duk_hobject *)
-#define DUK_HBUFOBJ_INCREF(thr,h)              DUK_HEAPHDR_INCREF((thr),(duk_heaphdr *) &(h)->obj)
-#define DUK_HBUFOBJ_DECREF(thr,h)              DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_hobject_refzero,duk_hobject *)
-#define DUK_HBUFOBJ_DECREF_NORZ(thr,h)         DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_hobject_refzero_norz,duk_hobject *)
-#define DUK_HTHREAD_INCREF(thr,h)              DUK_HEAPHDR_INCREF((thr),(duk_heaphdr *) &(h)->obj)
-#define DUK_HTHREAD_DECREF(thr,h)              DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_hobject_refzero,duk_hobject *)
-#define DUK_HTHREAD_DECREF_NORZ(thr,h)         DUK_HEAPHDR_DECREF_FAST_RAW((thr),(h),duk_hobject_refzero_norz,duk_hobject *)
+#define DUK_TVAL_INCREF(thr, tv)        DUK_TVAL_INCREF_FAST((thr), (tv))
+#define DUK_TVAL_DECREF(thr, tv)        DUK_TVAL_DECREF_FAST((thr), (tv))
+#define DUK_TVAL_DECREF_NORZ(thr, tv)   DUK_TVAL_DECREF_NORZ_FAST((thr), (tv))
+#define DUK_HEAPHDR_INCREF(thr, h)      DUK_HEAPHDR_INCREF_FAST((thr), (h))
+#define DUK_HEAPHDR_DECREF(thr, h)      DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_heaphdr_refzero, duk_heaphdr *)
+#define DUK_HEAPHDR_DECREF_NORZ(thr, h) DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_heaphdr_refzero_norz, duk_heaphdr *)
+#define DUK_HSTRING_INCREF(thr, h)      DUK_HEAPHDR_INCREF((thr), (duk_heaphdr *) (h))
+#define DUK_HSTRING_DECREF(thr, h)      DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_hstring_refzero, duk_hstring *)
+#define DUK_HSTRING_DECREF_NORZ(thr, h) \
+	DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_hstring_refzero, duk_hstring *) /* no 'norz' variant */
+#define DUK_HOBJECT_INCREF(thr, h)      DUK_HEAPHDR_INCREF((thr), (duk_heaphdr *) (h))
+#define DUK_HOBJECT_DECREF(thr, h)      DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_hobject_refzero, duk_hobject *)
+#define DUK_HOBJECT_DECREF_NORZ(thr, h) DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_hobject_refzero_norz, duk_hobject *)
+#define DUK_HBUFFER_INCREF(thr, h)      DUK_HEAPHDR_INCREF((thr), (duk_heaphdr *) (h))
+#define DUK_HBUFFER_DECREF(thr, h)      DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_hbuffer_refzero, duk_hbuffer *)
+#define DUK_HBUFFER_DECREF_NORZ(thr, h) \
+	DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_hbuffer_refzero, duk_hbuffer *) /* no 'norz' variant */
+#define DUK_HCOMPFUNC_INCREF(thr, h)      DUK_HEAPHDR_INCREF((thr), (duk_heaphdr *) &(h)->obj)
+#define DUK_HCOMPFUNC_DECREF(thr, h)      DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_hobject_refzero, duk_hobject *)
+#define DUK_HCOMPFUNC_DECREF_NORZ(thr, h) DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_hobject_refzero_norz, duk_hobject *)
+#define DUK_HNATFUNC_INCREF(thr, h)       DUK_HEAPHDR_INCREF((thr), (duk_heaphdr *) &(h)->obj)
+#define DUK_HNATFUNC_DECREF(thr, h)       DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_hobject_refzero, duk_hobject *)
+#define DUK_HNATFUNC_DECREF_NORZ(thr, h)  DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_hobject_refzero_norz, duk_hobject *)
+#define DUK_HBUFOBJ_INCREF(thr, h)        DUK_HEAPHDR_INCREF((thr), (duk_heaphdr *) &(h)->obj)
+#define DUK_HBUFOBJ_DECREF(thr, h)        DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_hobject_refzero, duk_hobject *)
+#define DUK_HBUFOBJ_DECREF_NORZ(thr, h)   DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_hobject_refzero_norz, duk_hobject *)
+#define DUK_HTHREAD_INCREF(thr, h)        DUK_HEAPHDR_INCREF((thr), (duk_heaphdr *) &(h)->obj)
+#define DUK_HTHREAD_DECREF(thr, h)        DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_hobject_refzero, duk_hobject *)
+#define DUK_HTHREAD_DECREF_NORZ(thr, h)   DUK_HEAPHDR_DECREF_FAST_RAW((thr), (h), duk_hobject_refzero_norz, duk_hobject *)
 #else
-#define DUK_TVAL_INCREF(thr,tv)                DUK_TVAL_INCREF_SLOW((thr),(tv))
-#define DUK_TVAL_DECREF(thr,tv)                DUK_TVAL_DECREF_SLOW((thr),(tv))
-#define DUK_TVAL_DECREF_NORZ(thr,tv)           DUK_TVAL_DECREF_NORZ_SLOW((thr),(tv))
-#define DUK_HEAPHDR_INCREF(thr,h)              DUK_HEAPHDR_INCREF_SLOW((thr),(h))
-#define DUK_HEAPHDR_DECREF(thr,h)              DUK_HEAPHDR_DECREF_SLOW((thr),(h))
-#define DUK_HEAPHDR_DECREF_NORZ(thr,h)         DUK_HEAPHDR_DECREF_NORZ_SLOW((thr),(h))
-#define DUK_HSTRING_INCREF(thr,h)              DUK_HEAPHDR_INCREF((thr),(duk_heaphdr *) (h))
-#define DUK_HSTRING_DECREF(thr,h)              DUK_HSTRING_DECREF_SLOW((thr),(h))
-#define DUK_HSTRING_DECREF_NORZ(thr,h)         DUK_HSTRING_DECREF_NORZ_SLOW((thr),(h))
-#define DUK_HOBJECT_INCREF(thr,h)              DUK_HEAPHDR_INCREF((thr),(duk_heaphdr *) (h))
-#define DUK_HOBJECT_DECREF(thr,h)              DUK_HOBJECT_DECREF_SLOW((thr),(h))
-#define DUK_HOBJECT_DECREF_NORZ(thr,h)         DUK_HOBJECT_DECREF_NORZ_SLOW((thr),(h))
-#define DUK_HBUFFER_INCREF(thr,h)              DUK_HEAPHDR_INCREF((thr),(duk_heaphdr *) (h))
-#define DUK_HBUFFER_DECREF(thr,h)              DUK_HBUFFER_DECREF_SLOW((thr),(h))
-#define DUK_HBUFFER_DECREF_NORZ(thr,h)         DUK_HBUFFER_DECREF_NORZ_SLOW((thr),(h))
-#define DUK_HCOMPFUNC_INCREF(thr,h)            DUK_HEAPHDR_INCREF((thr),(duk_heaphdr *) &(h)->obj)
-#define DUK_HCOMPFUNC_DECREF(thr,h)            DUK_HOBJECT_DECREF_SLOW((thr),(duk_hobject *) &(h)->obj)
-#define DUK_HCOMPFUNC_DECREF_NORZ(thr,h)       DUK_HOBJECT_DECREF_NORZ_SLOW((thr),(duk_hobject *) &(h)->obj)
-#define DUK_HNATFUNC_INCREF(thr,h)             DUK_HEAPHDR_INCREF((thr),(duk_heaphdr *) &(h)->obj)
-#define DUK_HNATFUNC_DECREF(thr,h)             DUK_HOBJECT_DECREF_SLOW((thr),(duk_hobject *) &(h)->obj)
-#define DUK_HNATFUNC_DECREF_NORZ(thr,h)        DUK_HOBJECT_DECREF_NORZ_SLOW((thr),(duk_hobject *) &(h)->obj)
-#define DUK_HBUFOBJ_INCREF(thr,h)              DUK_HEAPHDR_INCREF((thr),(duk_heaphdr *) &(h)->obj)
-#define DUK_HBUFOBJ_DECREF(thr,h)              DUK_HOBJECT_DECREF_SLOW((thr),(duk_hobject *) &(h)->obj)
-#define DUK_HBUFOB_DECREF_NORZ(thr,h)          DUK_HOBJECT_DECREF_NORZ_SLOW((thr),(duk_hobject *) &(h)->obj)
-#define DUK_HTHREAD_INCREF(thr,h)              DUK_HEAPHDR_INCREF((thr),(duk_heaphdr *) &(h)->obj)
-#define DUK_HTHREAD_DECREF(thr,h)              DUK_HOBJECT_DECREF_SLOW((thr),(duk_hobject *) &(h)->obj)
-#define DUK_HTHREAD_DECREF_NORZ(thr,h)         DUK_HOBJECT_DECREF_NORZ_SLOW((thr),(duk_hobject *) &(h)->obj)
+#define DUK_TVAL_INCREF(thr, tv)          DUK_TVAL_INCREF_SLOW((thr), (tv))
+#define DUK_TVAL_DECREF(thr, tv)          DUK_TVAL_DECREF_SLOW((thr), (tv))
+#define DUK_TVAL_DECREF_NORZ(thr, tv)     DUK_TVAL_DECREF_NORZ_SLOW((thr), (tv))
+#define DUK_HEAPHDR_INCREF(thr, h)        DUK_HEAPHDR_INCREF_SLOW((thr), (h))
+#define DUK_HEAPHDR_DECREF(thr, h)        DUK_HEAPHDR_DECREF_SLOW((thr), (h))
+#define DUK_HEAPHDR_DECREF_NORZ(thr, h)   DUK_HEAPHDR_DECREF_NORZ_SLOW((thr), (h))
+#define DUK_HSTRING_INCREF(thr, h)        DUK_HEAPHDR_INCREF((thr), (duk_heaphdr *) (h))
+#define DUK_HSTRING_DECREF(thr, h)        DUK_HSTRING_DECREF_SLOW((thr), (h))
+#define DUK_HSTRING_DECREF_NORZ(thr, h)   DUK_HSTRING_DECREF_NORZ_SLOW((thr), (h))
+#define DUK_HOBJECT_INCREF(thr, h)        DUK_HEAPHDR_INCREF((thr), (duk_heaphdr *) (h))
+#define DUK_HOBJECT_DECREF(thr, h)        DUK_HOBJECT_DECREF_SLOW((thr), (h))
+#define DUK_HOBJECT_DECREF_NORZ(thr, h)   DUK_HOBJECT_DECREF_NORZ_SLOW((thr), (h))
+#define DUK_HBUFFER_INCREF(thr, h)        DUK_HEAPHDR_INCREF((thr), (duk_heaphdr *) (h))
+#define DUK_HBUFFER_DECREF(thr, h)        DUK_HBUFFER_DECREF_SLOW((thr), (h))
+#define DUK_HBUFFER_DECREF_NORZ(thr, h)   DUK_HBUFFER_DECREF_NORZ_SLOW((thr), (h))
+#define DUK_HCOMPFUNC_INCREF(thr, h)      DUK_HEAPHDR_INCREF((thr), (duk_heaphdr *) &(h)->obj)
+#define DUK_HCOMPFUNC_DECREF(thr, h)      DUK_HOBJECT_DECREF_SLOW((thr), (duk_hobject *) &(h)->obj)
+#define DUK_HCOMPFUNC_DECREF_NORZ(thr, h) DUK_HOBJECT_DECREF_NORZ_SLOW((thr), (duk_hobject *) &(h)->obj)
+#define DUK_HNATFUNC_INCREF(thr, h)       DUK_HEAPHDR_INCREF((thr), (duk_heaphdr *) &(h)->obj)
+#define DUK_HNATFUNC_DECREF(thr, h)       DUK_HOBJECT_DECREF_SLOW((thr), (duk_hobject *) &(h)->obj)
+#define DUK_HNATFUNC_DECREF_NORZ(thr, h)  DUK_HOBJECT_DECREF_NORZ_SLOW((thr), (duk_hobject *) &(h)->obj)
+#define DUK_HBUFOBJ_INCREF(thr, h)        DUK_HEAPHDR_INCREF((thr), (duk_heaphdr *) &(h)->obj)
+#define DUK_HBUFOBJ_DECREF(thr, h)        DUK_HOBJECT_DECREF_SLOW((thr), (duk_hobject *) &(h)->obj)
+#define DUK_HBUFOB_DECREF_NORZ(thr, h)    DUK_HOBJECT_DECREF_NORZ_SLOW((thr), (duk_hobject *) &(h)->obj)
+#define DUK_HTHREAD_INCREF(thr, h)        DUK_HEAPHDR_INCREF((thr), (duk_heaphdr *) &(h)->obj)
+#define DUK_HTHREAD_DECREF(thr, h)        DUK_HOBJECT_DECREF_SLOW((thr), (duk_hobject *) &(h)->obj)
+#define DUK_HTHREAD_DECREF_NORZ(thr, h)   DUK_HOBJECT_DECREF_NORZ_SLOW((thr), (duk_hobject *) &(h)->obj)
 #endif
 
 /* Convenience for some situations; the above macros don't allow NULLs
  * for performance reasons.  Macros cover only actually needed cases.
  */
-#define DUK_HEAPHDR_INCREF_ALLOWNULL(thr,h) do { \
+#define DUK_HEAPHDR_INCREF_ALLOWNULL(thr, h) \
+	do { \
 		if ((h) != NULL) { \
 			DUK_HEAPHDR_INCREF((thr), (duk_heaphdr *) (h)); \
 		} \
 	} while (0)
-#define DUK_HEAPHDR_DECREF_ALLOWNULL(thr,h) do { \
+#define DUK_HEAPHDR_DECREF_ALLOWNULL(thr, h) \
+	do { \
 		if ((h) != NULL) { \
 			DUK_HEAPHDR_DECREF((thr), (duk_heaphdr *) (h)); \
 		} \
 	} while (0)
-#define DUK_HEAPHDR_DECREF_NORZ_ALLOWNULL(thr,h) do { \
+#define DUK_HEAPHDR_DECREF_NORZ_ALLOWNULL(thr, h) \
+	do { \
 		if ((h) != NULL) { \
 			DUK_HEAPHDR_DECREF_NORZ((thr), (duk_heaphdr *) (h)); \
 		} \
 	} while (0)
-#define DUK_HOBJECT_INCREF_ALLOWNULL(thr,h) do { \
+#define DUK_HOBJECT_INCREF_ALLOWNULL(thr, h) \
+	do { \
 		if ((h) != NULL) { \
 			DUK_HOBJECT_INCREF((thr), (h)); \
 		} \
 	} while (0)
-#define DUK_HOBJECT_DECREF_ALLOWNULL(thr,h) do { \
+#define DUK_HOBJECT_DECREF_ALLOWNULL(thr, h) \
+	do { \
 		if ((h) != NULL) { \
 			DUK_HOBJECT_DECREF((thr), (h)); \
 		} \
 	} while (0)
-#define DUK_HOBJECT_DECREF_NORZ_ALLOWNULL(thr,h) do { \
+#define DUK_HOBJECT_DECREF_NORZ_ALLOWNULL(thr, h) \
+	do { \
 		if ((h) != NULL) { \
 			DUK_HOBJECT_DECREF_NORZ((thr), (h)); \
 		} \
 	} while (0)
-#define DUK_HBUFFER_INCREF_ALLOWNULL(thr,h) do { \
+#define DUK_HBUFFER_INCREF_ALLOWNULL(thr, h) \
+	do { \
 		if ((h) != NULL) { \
 			DUK_HBUFFER_INCREF((thr), (h)); \
 		} \
 	} while (0)
-#define DUK_HBUFFER_DECREF_ALLOWNULL(thr,h) do { \
+#define DUK_HBUFFER_DECREF_ALLOWNULL(thr, h) \
+	do { \
 		if ((h) != NULL) { \
 			DUK_HBUFFER_DECREF((thr), (h)); \
 		} \
 	} while (0)
-#define DUK_HBUFFER_DECREF_NORZ_ALLOWNULL(thr,h) do { \
+#define DUK_HBUFFER_DECREF_NORZ_ALLOWNULL(thr, h) \
+	do { \
 		if ((h) != NULL) { \
 			DUK_HBUFFER_DECREF_NORZ((thr), (h)); \
 		} \
 	} while (0)
-#define DUK_HTHREAD_INCREF_ALLOWNULL(thr,h) do { \
+#define DUK_HTHREAD_INCREF_ALLOWNULL(thr, h) \
+	do { \
 		if ((h) != NULL) { \
 			DUK_HTHREAD_INCREF((thr), (h)); \
 		} \
 	} while (0)
-#define DUK_HTHREAD_DECREF_ALLOWNULL(thr,h) do { \
+#define DUK_HTHREAD_DECREF_ALLOWNULL(thr, h) \
+	do { \
 		if ((h) != NULL) { \
 			DUK_HTHREAD_DECREF((thr), (h)); \
 		} \
 	} while (0)
-#define DUK_HTHREAD_DECREF_NORZ_ALLOWNULL(thr,h) do { \
+#define DUK_HTHREAD_DECREF_NORZ_ALLOWNULL(thr, h) \
+	do { \
 		if ((h) != NULL) { \
 			DUK_HTHREAD_DECREF_NORZ((thr), (h)); \
 		} \
@@ -4922,16 +5179,22 @@ struct duk_heaphdr_string {
  * variant is performance critical.
  */
 #if defined(DUK_USE_FINALIZER_SUPPORT)
-#define DUK_REFZERO_CHECK_FAST(thr) do { \
+#define DUK_REFZERO_CHECK_FAST(thr) \
+	do { \
 		duk_refzero_check_fast((thr)); \
 	} while (0)
-#define DUK_REFZERO_CHECK_SLOW(thr) do { \
+#define DUK_REFZERO_CHECK_SLOW(thr) \
+	do { \
 		duk_refzero_check_slow((thr)); \
 	} while (0)
-#else  /* DUK_USE_FINALIZER_SUPPORT */
-#define DUK_REFZERO_CHECK_FAST(thr) do { } while (0)
-#define DUK_REFZERO_CHECK_SLOW(thr) do { } while (0)
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#else /* DUK_USE_FINALIZER_SUPPORT */
+#define DUK_REFZERO_CHECK_FAST(thr) \
+	do { \
+	} while (0)
+#define DUK_REFZERO_CHECK_SLOW(thr) \
+	do { \
+	} while (0)
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 
 /*
  *  Macros to set a duk_tval and update refcount of the target (decref the
@@ -4939,125 +5202,176 @@ struct duk_heaphdr_string {
  *  and footprint critical; any changes made should be measured for size/speed.
  */
 
-#define DUK_TVAL_SET_UNDEFINED_UPDREF_ALT0(thr,tvptr_dst) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_UNDEFINED_UPDREF_ALT0(thr, tvptr_dst) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_UNDEFINED(tv__dst); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
 
-#define DUK_TVAL_SET_UNDEFINED_UPDREF_NORZ_ALT0(thr,tvptr_dst) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_UNDEFINED_UPDREF_NORZ_ALT0(thr, tvptr_dst) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_UNDEFINED(tv__dst); \
 		DUK_TVAL_DECREF_NORZ((thr), &tv__tmp); \
 	} while (0)
 
-#define DUK_TVAL_SET_UNUSED_UPDREF_ALT0(thr,tvptr_dst) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_UNUSED_UPDREF_ALT0(thr, tvptr_dst) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_UNUSED(tv__dst); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
 
-#define DUK_TVAL_SET_NULL_UPDREF_ALT0(thr,tvptr_dst) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_NULL_UPDREF_ALT0(thr, tvptr_dst) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_NULL(tv__dst); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
 
-#define DUK_TVAL_SET_BOOLEAN_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_BOOLEAN_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_BOOLEAN(tv__dst, (newval)); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
 
-#define DUK_TVAL_SET_NUMBER_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_NUMBER_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_NUMBER(tv__dst, (newval)); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
-#define DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_NUMBER_CHKFAST_FAST(tv__dst, (newval)); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
-#define DUK_TVAL_SET_DOUBLE_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_DOUBLE_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_DOUBLE(tv__dst, (newval)); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
-#define DUK_TVAL_SET_NAN_UPDREF_ALT0(thr,tvptr_dst) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_NAN_UPDREF_ALT0(thr, tvptr_dst) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_NAN(tv__dst); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
 #if defined(DUK_USE_FASTINT)
-#define DUK_TVAL_SET_I48_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_I48_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_I48(tv__dst, (newval)); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
-#define DUK_TVAL_SET_I32_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_I32_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_I32(tv__dst, (newval)); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
-#define DUK_TVAL_SET_U32_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_U32_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_U32(tv__dst, (newval)); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
 #else
-#define DUK_TVAL_SET_DOUBLE_CAST_UPDREF(thr,tvptr_dst,newval) \
+#define DUK_TVAL_SET_DOUBLE_CAST_UPDREF(thr, tvptr_dst, newval) \
 	DUK_TVAL_SET_DOUBLE_UPDREF((thr), (tvptr_dst), (duk_double_t) (newval))
-#endif  /* DUK_USE_FASTINT */
+#endif /* DUK_USE_FASTINT */
 
-#define DUK_TVAL_SET_LIGHTFUNC_UPDREF_ALT0(thr,tvptr_dst,lf_v,lf_fp,lf_flags) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_LIGHTFUNC_UPDREF_ALT0(thr, tvptr_dst, lf_v, lf_fp, lf_flags) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_LIGHTFUNC(tv__dst, (lf_v), (lf_fp), (lf_flags)); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
 
-#define DUK_TVAL_SET_STRING_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_STRING_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_STRING(tv__dst, (newval)); \
 		DUK_HSTRING_INCREF((thr), (newval)); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
 
-#define DUK_TVAL_SET_OBJECT_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_OBJECT_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_OBJECT(tv__dst, (newval)); \
 		DUK_HOBJECT_INCREF((thr), (newval)); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
 
-#define DUK_TVAL_SET_BUFFER_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_BUFFER_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_BUFFER(tv__dst, (newval)); \
 		DUK_HBUFFER_INCREF((thr), (newval)); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
 
-#define DUK_TVAL_SET_POINTER_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; duk_tval tv__tmp; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_POINTER_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_POINTER(tv__dst, (newval)); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
 
 /* DUK_TVAL_SET_TVAL_UPDREF() is used a lot in executor, property lookups,
@@ -5068,281 +5382,452 @@ struct duk_heaphdr_string {
  */
 
 /* Original idiom used, minimal code size. */
-#define DUK_TVAL_SET_TVAL_UPDREF_ALT0(thr,tvptr_dst,tvptr_src) do { \
-		duk_tval *tv__dst, *tv__src; duk_tval tv__tmp; \
-		tv__dst = (tvptr_dst); tv__src = (tvptr_src); \
+#define DUK_TVAL_SET_TVAL_UPDREF_ALT0(thr, tvptr_dst, tvptr_src) \
+	do { \
+		duk_tval *tv__dst, *tv__src; \
+		duk_tval tv__tmp; \
+		tv__dst = (tvptr_dst); \
+		tv__src = (tvptr_src); \
 		DUK_TVAL_SET_TVAL(&tv__tmp, tv__dst); \
 		DUK_TVAL_SET_TVAL(tv__dst, tv__src); \
 		DUK_TVAL_INCREF((thr), tv__src); \
-		DUK_TVAL_DECREF((thr), &tv__tmp);  /* side effects */ \
+		DUK_TVAL_DECREF((thr), &tv__tmp); /* side effects */ \
 	} while (0)
 
 /* Faster alternative: avoid making a temporary copy of tvptr_dst and use
  * fast incref/decref macros.
  */
-#define DUK_TVAL_SET_TVAL_UPDREF_ALT1(thr,tvptr_dst,tvptr_src) do { \
-		duk_tval *tv__dst, *tv__src; duk_heaphdr *h__obj; \
-		tv__dst = (tvptr_dst); tv__src = (tvptr_src); \
+#define DUK_TVAL_SET_TVAL_UPDREF_ALT1(thr, tvptr_dst, tvptr_src) \
+	do { \
+		duk_tval *tv__dst, *tv__src; \
+		duk_heaphdr *h__obj; \
+		tv__dst = (tvptr_dst); \
+		tv__src = (tvptr_src); \
 		DUK_TVAL_INCREF_FAST((thr), tv__src); \
 		if (DUK_TVAL_NEEDS_REFCOUNT_UPDATE(tv__dst)) { \
 			h__obj = DUK_TVAL_GET_HEAPHDR(tv__dst); \
 			DUK_ASSERT(h__obj != NULL); \
 			DUK_TVAL_SET_TVAL(tv__dst, tv__src); \
-			DUK_HEAPHDR_DECREF_FAST((thr), h__obj);  /* side effects */ \
+			DUK_HEAPHDR_DECREF_FAST((thr), h__obj); /* side effects */ \
 		} else { \
 			DUK_TVAL_SET_TVAL(tv__dst, tv__src); \
 		} \
 	} while (0)
 
 /* XXX: no optimized variants yet */
-#define DUK_TVAL_SET_UNDEFINED_UPDREF         DUK_TVAL_SET_UNDEFINED_UPDREF_ALT0
-#define DUK_TVAL_SET_UNDEFINED_UPDREF_NORZ    DUK_TVAL_SET_UNDEFINED_UPDREF_NORZ_ALT0
-#define DUK_TVAL_SET_UNUSED_UPDREF            DUK_TVAL_SET_UNUSED_UPDREF_ALT0
-#define DUK_TVAL_SET_NULL_UPDREF              DUK_TVAL_SET_NULL_UPDREF_ALT0
-#define DUK_TVAL_SET_BOOLEAN_UPDREF           DUK_TVAL_SET_BOOLEAN_UPDREF_ALT0
-#define DUK_TVAL_SET_NUMBER_UPDREF            DUK_TVAL_SET_NUMBER_UPDREF_ALT0
-#define DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF    DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF_ALT0
-#define DUK_TVAL_SET_DOUBLE_UPDREF            DUK_TVAL_SET_DOUBLE_UPDREF_ALT0
-#define DUK_TVAL_SET_NAN_UPDREF               DUK_TVAL_SET_NAN_UPDREF_ALT0
+#define DUK_TVAL_SET_UNDEFINED_UPDREF      DUK_TVAL_SET_UNDEFINED_UPDREF_ALT0
+#define DUK_TVAL_SET_UNDEFINED_UPDREF_NORZ DUK_TVAL_SET_UNDEFINED_UPDREF_NORZ_ALT0
+#define DUK_TVAL_SET_UNUSED_UPDREF         DUK_TVAL_SET_UNUSED_UPDREF_ALT0
+#define DUK_TVAL_SET_NULL_UPDREF           DUK_TVAL_SET_NULL_UPDREF_ALT0
+#define DUK_TVAL_SET_BOOLEAN_UPDREF        DUK_TVAL_SET_BOOLEAN_UPDREF_ALT0
+#define DUK_TVAL_SET_NUMBER_UPDREF         DUK_TVAL_SET_NUMBER_UPDREF_ALT0
+#define DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF_ALT0
+#define DUK_TVAL_SET_DOUBLE_UPDREF         DUK_TVAL_SET_DOUBLE_UPDREF_ALT0
+#define DUK_TVAL_SET_NAN_UPDREF            DUK_TVAL_SET_NAN_UPDREF_ALT0
 #if defined(DUK_USE_FASTINT)
-#define DUK_TVAL_SET_I48_UPDREF               DUK_TVAL_SET_I48_UPDREF_ALT0
-#define DUK_TVAL_SET_I32_UPDREF               DUK_TVAL_SET_I32_UPDREF_ALT0
-#define DUK_TVAL_SET_U32_UPDREF               DUK_TVAL_SET_U32_UPDREF_ALT0
+#define DUK_TVAL_SET_I48_UPDREF DUK_TVAL_SET_I48_UPDREF_ALT0
+#define DUK_TVAL_SET_I32_UPDREF DUK_TVAL_SET_I32_UPDREF_ALT0
+#define DUK_TVAL_SET_U32_UPDREF DUK_TVAL_SET_U32_UPDREF_ALT0
 #else
-#define DUK_TVAL_SET_I48_UPDREF               DUK_TVAL_SET_DOUBLE_CAST_UPDREF  /* XXX: fast int-to-double */
-#define DUK_TVAL_SET_I32_UPDREF               DUK_TVAL_SET_DOUBLE_CAST_UPDREF
-#define DUK_TVAL_SET_U32_UPDREF               DUK_TVAL_SET_DOUBLE_CAST_UPDREF
-#endif  /* DUK_USE_FASTINT */
-#define DUK_TVAL_SET_FASTINT_UPDREF           DUK_TVAL_SET_I48_UPDREF  /* convenience */
-#define DUK_TVAL_SET_LIGHTFUNC_UPDREF         DUK_TVAL_SET_LIGHTFUNC_UPDREF_ALT0
-#define DUK_TVAL_SET_STRING_UPDREF            DUK_TVAL_SET_STRING_UPDREF_ALT0
-#define DUK_TVAL_SET_OBJECT_UPDREF            DUK_TVAL_SET_OBJECT_UPDREF_ALT0
-#define DUK_TVAL_SET_BUFFER_UPDREF            DUK_TVAL_SET_BUFFER_UPDREF_ALT0
-#define DUK_TVAL_SET_POINTER_UPDREF           DUK_TVAL_SET_POINTER_UPDREF_ALT0
+#define DUK_TVAL_SET_I48_UPDREF DUK_TVAL_SET_DOUBLE_CAST_UPDREF /* XXX: fast int-to-double */
+#define DUK_TVAL_SET_I32_UPDREF DUK_TVAL_SET_DOUBLE_CAST_UPDREF
+#define DUK_TVAL_SET_U32_UPDREF DUK_TVAL_SET_DOUBLE_CAST_UPDREF
+#endif /* DUK_USE_FASTINT */
+#define DUK_TVAL_SET_FASTINT_UPDREF   DUK_TVAL_SET_I48_UPDREF /* convenience */
+#define DUK_TVAL_SET_LIGHTFUNC_UPDREF DUK_TVAL_SET_LIGHTFUNC_UPDREF_ALT0
+#define DUK_TVAL_SET_STRING_UPDREF    DUK_TVAL_SET_STRING_UPDREF_ALT0
+#define DUK_TVAL_SET_OBJECT_UPDREF    DUK_TVAL_SET_OBJECT_UPDREF_ALT0
+#define DUK_TVAL_SET_BUFFER_UPDREF    DUK_TVAL_SET_BUFFER_UPDREF_ALT0
+#define DUK_TVAL_SET_POINTER_UPDREF   DUK_TVAL_SET_POINTER_UPDREF_ALT0
 
 #if defined(DUK_USE_FAST_REFCOUNT_DEFAULT)
 /* Optimized for speed. */
-#define DUK_TVAL_SET_TVAL_UPDREF              DUK_TVAL_SET_TVAL_UPDREF_ALT1
-#define DUK_TVAL_SET_TVAL_UPDREF_FAST         DUK_TVAL_SET_TVAL_UPDREF_ALT1
-#define DUK_TVAL_SET_TVAL_UPDREF_SLOW         DUK_TVAL_SET_TVAL_UPDREF_ALT0
+#define DUK_TVAL_SET_TVAL_UPDREF      DUK_TVAL_SET_TVAL_UPDREF_ALT1
+#define DUK_TVAL_SET_TVAL_UPDREF_FAST DUK_TVAL_SET_TVAL_UPDREF_ALT1
+#define DUK_TVAL_SET_TVAL_UPDREF_SLOW DUK_TVAL_SET_TVAL_UPDREF_ALT0
 #else
 /* Optimized for size. */
-#define DUK_TVAL_SET_TVAL_UPDREF              DUK_TVAL_SET_TVAL_UPDREF_ALT0
-#define DUK_TVAL_SET_TVAL_UPDREF_FAST         DUK_TVAL_SET_TVAL_UPDREF_ALT0
-#define DUK_TVAL_SET_TVAL_UPDREF_SLOW         DUK_TVAL_SET_TVAL_UPDREF_ALT0
-#endif
-
-#else  /* DUK_USE_REFERENCE_COUNTING */
-
-#define DUK_TVAL_NEEDS_REFCOUNT_UPDATE(tv)     0
-#define DUK_HEAPHDR_NEEDS_REFCOUNT_UPDATE(h)   0
-
-#define DUK_TVAL_INCREF_FAST(thr,v)            do {} while (0) /* nop */
-#define DUK_TVAL_DECREF_FAST(thr,v)            do {} while (0) /* nop */
-#define DUK_TVAL_DECREF_NORZ_FAST(thr,v)       do {} while (0) /* nop */
-#define DUK_TVAL_INCREF_SLOW(thr,v)            do {} while (0) /* nop */
-#define DUK_TVAL_DECREF_SLOW(thr,v)            do {} while (0) /* nop */
-#define DUK_TVAL_DECREF_NORZ_SLOW(thr,v)       do {} while (0) /* nop */
-#define DUK_TVAL_INCREF(thr,v)                 do {} while (0) /* nop */
-#define DUK_TVAL_DECREF(thr,v)                 do {} while (0) /* nop */
-#define DUK_TVAL_DECREF_NORZ(thr,v)            do {} while (0) /* nop */
-#define DUK_HEAPHDR_INCREF_FAST(thr,h)         do {} while (0) /* nop */
-#define DUK_HEAPHDR_DECREF_FAST(thr,h)         do {} while (0) /* nop */
-#define DUK_HEAPHDR_DECREF_NORZ_FAST(thr,h)    do {} while (0) /* nop */
-#define DUK_HEAPHDR_INCREF_SLOW(thr,h)         do {} while (0) /* nop */
-#define DUK_HEAPHDR_DECREF_SLOW(thr,h)         do {} while (0) /* nop */
-#define DUK_HEAPHDR_DECREF_NORZ_SLOW(thr,h)    do {} while (0) /* nop */
-#define DUK_HEAPHDR_INCREF(thr,h)              do {} while (0) /* nop */
-#define DUK_HEAPHDR_DECREF(thr,h)              do {} while (0) /* nop */
-#define DUK_HEAPHDR_DECREF_NORZ(thr,h)         do {} while (0) /* nop */
-#define DUK_HSTRING_INCREF_FAST(thr,h)         do {} while (0) /* nop */
-#define DUK_HSTRING_DECREF_FAST(thr,h)         do {} while (0) /* nop */
-#define DUK_HSTRING_DECREF_NORZ_FAST(thr,h)    do {} while (0) /* nop */
-#define DUK_HSTRING_INCREF_SLOW(thr,h)         do {} while (0) /* nop */
-#define DUK_HSTRING_DECREF_SLOW(thr,h)         do {} while (0) /* nop */
-#define DUK_HSTRING_DECREF_NORZ_SLOW(thr,h)    do {} while (0) /* nop */
-#define DUK_HSTRING_INCREF(thr,h)              do {} while (0) /* nop */
-#define DUK_HSTRING_DECREF(thr,h)              do {} while (0) /* nop */
-#define DUK_HSTRING_DECREF_NORZ(thr,h)         do {} while (0) /* nop */
-#define DUK_HOBJECT_INCREF_FAST(thr,h)         do {} while (0) /* nop */
-#define DUK_HOBJECT_DECREF_FAST(thr,h)         do {} while (0) /* nop */
-#define DUK_HOBJECT_DECREF_NORZ_FAST(thr,h)    do {} while (0) /* nop */
-#define DUK_HOBJECT_INCREF_SLOW(thr,h)         do {} while (0) /* nop */
-#define DUK_HOBJECT_DECREF_SLOW(thr,h)         do {} while (0) /* nop */
-#define DUK_HOBJECT_DECREF_NORZ_SLOW(thr,h)    do {} while (0) /* nop */
-#define DUK_HOBJECT_INCREF(thr,h)              do {} while (0) /* nop */
-#define DUK_HOBJECT_DECREF(thr,h)              do {} while (0) /* nop */
-#define DUK_HOBJECT_DECREF_NORZ(thr,h)         do {} while (0) /* nop */
-#define DUK_HBUFFER_INCREF_FAST(thr,h)         do {} while (0) /* nop */
-#define DUK_HBUFFER_DECREF_FAST(thr,h)         do {} while (0) /* nop */
-#define DUK_HBUFFER_DECREF_NORZ_FAST(thr,h)    do {} while (0) /* nop */
-#define DUK_HBUFFER_INCREF_SLOW(thr,h)         do {} while (0) /* nop */
-#define DUK_HBUFFER_DECREF_SLOW(thr,h)         do {} while (0) /* nop */
-#define DUK_HBUFFER_DECREF_NORZ_SLOW(thr,h)    do {} while (0) /* nop */
-#define DUK_HBUFFER_INCREF(thr,h)              do {} while (0) /* nop */
-#define DUK_HBUFFER_DECREF(thr,h)              do {} while (0) /* nop */
-#define DUK_HBUFFER_DECREF_NORZ(thr,h)         do {} while (0) /* nop */
-
-#define DUK_HCOMPFUNC_INCREF(thr,h)            do {} while (0) /* nop */
-#define DUK_HCOMPFUNC_DECREF(thr,h)            do {} while (0) /* nop */
-#define DUK_HCOMPFUNC_DECREF_NORZ(thr,h)       do {} while (0) /* nop */
-#define DUK_HNATFUNC_INCREF(thr,h)             do {} while (0) /* nop */
-#define DUK_HNATFUNC_DECREF(thr,h)             do {} while (0) /* nop */
-#define DUK_HNATFUNC_DECREF_NORZ(thr,h)        do {} while (0) /* nop */
-#define DUK_HBUFOBJ_INCREF(thr,h)              do {} while (0) /* nop */
-#define DUK_HBUFOBJ_DECREF(thr,h)              do {} while (0) /* nop */
-#define DUK_HBUFOBJ_DECREF_NORZ(thr,h)         do {} while (0) /* nop */
-#define DUK_HTHREAD_INCREF(thr,h)              do {} while (0) /* nop */
-#define DUK_HTHREAD_DECREF(thr,h)              do {} while (0) /* nop */
-#define DUK_HTHREAD_DECREF_NORZ(thr,h)         do {} while (0) /* nop */
-#define DUK_HOBJECT_INCREF_ALLOWNULL(thr,h)    do {} while (0) /* nop */
-#define DUK_HOBJECT_DECREF_ALLOWNULL(thr,h)    do {} while (0) /* nop */
-#define DUK_HOBJECT_DECREF_NORZ_ALLOWNULL(thr,h)  do {} while (0) /* nop */
-#define DUK_HBUFFER_INCREF_ALLOWNULL(thr,h)    do {} while (0) /* nop */
-#define DUK_HBUFFER_DECREF_ALLOWNULL(thr,h)    do {} while (0) /* nop */
-#define DUK_HBUFFER_DECREF_NORZ_ALLOWNULL(thr,h)  do {} while (0) /* nop */
-
-#define DUK_REFZERO_CHECK_FAST(thr)            do {} while (0) /* nop */
-#define DUK_REFZERO_CHECK_SLOW(thr)            do {} while (0) /* nop */
-
-#define DUK_TVAL_SET_UNDEFINED_UPDREF_ALT0(thr,tvptr_dst) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_TVAL_UPDREF      DUK_TVAL_SET_TVAL_UPDREF_ALT0
+#define DUK_TVAL_SET_TVAL_UPDREF_FAST DUK_TVAL_SET_TVAL_UPDREF_ALT0
+#define DUK_TVAL_SET_TVAL_UPDREF_SLOW DUK_TVAL_SET_TVAL_UPDREF_ALT0
+#endif
+
+#else /* DUK_USE_REFERENCE_COUNTING */
+
+#define DUK_TVAL_NEEDS_REFCOUNT_UPDATE(tv)   0
+#define DUK_HEAPHDR_NEEDS_REFCOUNT_UPDATE(h) 0
+
+#define DUK_TVAL_INCREF_FAST(thr, v) \
+	do { \
+	} while (0) /* nop */
+#define DUK_TVAL_DECREF_FAST(thr, v) \
+	do { \
+	} while (0) /* nop */
+#define DUK_TVAL_DECREF_NORZ_FAST(thr, v) \
+	do { \
+	} while (0) /* nop */
+#define DUK_TVAL_INCREF_SLOW(thr, v) \
+	do { \
+	} while (0) /* nop */
+#define DUK_TVAL_DECREF_SLOW(thr, v) \
+	do { \
+	} while (0) /* nop */
+#define DUK_TVAL_DECREF_NORZ_SLOW(thr, v) \
+	do { \
+	} while (0) /* nop */
+#define DUK_TVAL_INCREF(thr, v) \
+	do { \
+	} while (0) /* nop */
+#define DUK_TVAL_DECREF(thr, v) \
+	do { \
+	} while (0) /* nop */
+#define DUK_TVAL_DECREF_NORZ(thr, v) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HEAPHDR_INCREF_FAST(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HEAPHDR_DECREF_FAST(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HEAPHDR_DECREF_NORZ_FAST(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HEAPHDR_INCREF_SLOW(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HEAPHDR_DECREF_SLOW(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HEAPHDR_DECREF_NORZ_SLOW(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HEAPHDR_INCREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HEAPHDR_DECREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HEAPHDR_DECREF_NORZ(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HSTRING_INCREF_FAST(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HSTRING_DECREF_FAST(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HSTRING_DECREF_NORZ_FAST(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HSTRING_INCREF_SLOW(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HSTRING_DECREF_SLOW(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HSTRING_DECREF_NORZ_SLOW(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HSTRING_INCREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HSTRING_DECREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HSTRING_DECREF_NORZ(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HOBJECT_INCREF_FAST(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HOBJECT_DECREF_FAST(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HOBJECT_DECREF_NORZ_FAST(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HOBJECT_INCREF_SLOW(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HOBJECT_DECREF_SLOW(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HOBJECT_DECREF_NORZ_SLOW(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HOBJECT_INCREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HOBJECT_DECREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HOBJECT_DECREF_NORZ(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HBUFFER_INCREF_FAST(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HBUFFER_DECREF_FAST(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HBUFFER_DECREF_NORZ_FAST(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HBUFFER_INCREF_SLOW(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HBUFFER_DECREF_SLOW(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HBUFFER_DECREF_NORZ_SLOW(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HBUFFER_INCREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HBUFFER_DECREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HBUFFER_DECREF_NORZ(thr, h) \
+	do { \
+	} while (0) /* nop */
+
+#define DUK_HCOMPFUNC_INCREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HCOMPFUNC_DECREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HCOMPFUNC_DECREF_NORZ(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HNATFUNC_INCREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HNATFUNC_DECREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HNATFUNC_DECREF_NORZ(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HBUFOBJ_INCREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HBUFOBJ_DECREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HBUFOBJ_DECREF_NORZ(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HTHREAD_INCREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HTHREAD_DECREF(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HTHREAD_DECREF_NORZ(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HOBJECT_INCREF_ALLOWNULL(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HOBJECT_DECREF_ALLOWNULL(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HOBJECT_DECREF_NORZ_ALLOWNULL(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HBUFFER_INCREF_ALLOWNULL(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HBUFFER_DECREF_ALLOWNULL(thr, h) \
+	do { \
+	} while (0) /* nop */
+#define DUK_HBUFFER_DECREF_NORZ_ALLOWNULL(thr, h) \
+	do { \
+	} while (0) /* nop */
+
+#define DUK_REFZERO_CHECK_FAST(thr) \
+	do { \
+	} while (0) /* nop */
+#define DUK_REFZERO_CHECK_SLOW(thr) \
+	do { \
+	} while (0) /* nop */
+
+#define DUK_TVAL_SET_UNDEFINED_UPDREF_ALT0(thr, tvptr_dst) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_UNDEFINED(tv__dst); \
 		DUK_UNREF((thr)); \
 	} while (0)
 
-#define DUK_TVAL_SET_UNUSED_UPDREF_ALT0(thr,tvptr_dst) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_UNUSED_UPDREF_ALT0(thr, tvptr_dst) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_UNUSED(tv__dst); \
 		DUK_UNREF((thr)); \
 	} while (0)
 
-#define DUK_TVAL_SET_NULL_UPDREF_ALT0(thr,tvptr_dst) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_NULL_UPDREF_ALT0(thr, tvptr_dst) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_NULL(tv__dst); \
 		DUK_UNREF((thr)); \
 	} while (0)
 
-#define DUK_TVAL_SET_BOOLEAN_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_BOOLEAN_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_BOOLEAN(tv__dst, (newval)); \
 		DUK_UNREF((thr)); \
 	} while (0)
 
-#define DUK_TVAL_SET_NUMBER_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_NUMBER_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_NUMBER(tv__dst, (newval)); \
 		DUK_UNREF((thr)); \
 	} while (0)
-#define DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_NUMBER_CHKFAST_FAST(tv__dst, (newval)); \
 		DUK_UNREF((thr)); \
 	} while (0)
-#define DUK_TVAL_SET_DOUBLE_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_DOUBLE_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_DOUBLE(tv__dst, (newval)); \
 		DUK_UNREF((thr)); \
 	} while (0)
-#define DUK_TVAL_SET_NAN_UPDREF_ALT0(thr,tvptr_dst) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_NAN_UPDREF_ALT0(thr, tvptr_dst) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_NAN(tv__dst); \
 		DUK_UNREF((thr)); \
 	} while (0)
 #if defined(DUK_USE_FASTINT)
-#define DUK_TVAL_SET_I48_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_I48_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_I48(tv__dst, (newval)); \
 		DUK_UNREF((thr)); \
 	} while (0)
-#define DUK_TVAL_SET_I32_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_I32_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_I32(tv__dst, (newval)); \
 		DUK_UNREF((thr)); \
 	} while (0)
-#define DUK_TVAL_SET_U32_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_U32_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_U32(tv__dst, (newval)); \
 		DUK_UNREF((thr)); \
 	} while (0)
 #else
-#define DUK_TVAL_SET_DOUBLE_CAST_UPDREF(thr,tvptr_dst,newval) \
+#define DUK_TVAL_SET_DOUBLE_CAST_UPDREF(thr, tvptr_dst, newval) \
 	DUK_TVAL_SET_DOUBLE_UPDREF((thr), (tvptr_dst), (duk_double_t) (newval))
-#endif  /* DUK_USE_FASTINT */
+#endif /* DUK_USE_FASTINT */
 
-#define DUK_TVAL_SET_LIGHTFUNC_UPDREF_ALT0(thr,tvptr_dst,lf_v,lf_fp,lf_flags) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_LIGHTFUNC_UPDREF_ALT0(thr, tvptr_dst, lf_v, lf_fp, lf_flags) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_LIGHTFUNC(tv__dst, (lf_v), (lf_fp), (lf_flags)); \
 		DUK_UNREF((thr)); \
 	} while (0)
 
-#define DUK_TVAL_SET_STRING_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_STRING_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_STRING(tv__dst, (newval)); \
 		DUK_UNREF((thr)); \
 	} while (0)
 
-#define DUK_TVAL_SET_OBJECT_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_OBJECT_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_OBJECT(tv__dst, (newval)); \
 		DUK_UNREF((thr)); \
 	} while (0)
 
-#define DUK_TVAL_SET_BUFFER_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_BUFFER_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_BUFFER(tv__dst, (newval)); \
 		DUK_UNREF((thr)); \
 	} while (0)
 
-#define DUK_TVAL_SET_POINTER_UPDREF_ALT0(thr,tvptr_dst,newval) do { \
-		duk_tval *tv__dst; tv__dst = (tvptr_dst); \
+#define DUK_TVAL_SET_POINTER_UPDREF_ALT0(thr, tvptr_dst, newval) \
+	do { \
+		duk_tval *tv__dst; \
+		tv__dst = (tvptr_dst); \
 		DUK_TVAL_SET_POINTER(tv__dst, (newval)); \
 		DUK_UNREF((thr)); \
 	} while (0)
 
-#define DUK_TVAL_SET_TVAL_UPDREF_ALT0(thr,tvptr_dst,tvptr_src) do { \
+#define DUK_TVAL_SET_TVAL_UPDREF_ALT0(thr, tvptr_dst, tvptr_src) \
+	do { \
 		duk_tval *tv__dst, *tv__src; \
-		tv__dst = (tvptr_dst); tv__src = (tvptr_src); \
+		tv__dst = (tvptr_dst); \
+		tv__src = (tvptr_src); \
 		DUK_TVAL_SET_TVAL(tv__dst, tv__src); \
 		DUK_UNREF((thr)); \
 	} while (0)
 
-#define DUK_TVAL_SET_UNDEFINED_UPDREF         DUK_TVAL_SET_UNDEFINED_UPDREF_ALT0
-#define DUK_TVAL_SET_UNDEFINED_UPDREF_NORZ    DUK_TVAL_SET_UNDEFINED_UPDREF_ALT0
-#define DUK_TVAL_SET_UNUSED_UPDREF            DUK_TVAL_SET_UNUSED_UPDREF_ALT0
-#define DUK_TVAL_SET_NULL_UPDREF              DUK_TVAL_SET_NULL_UPDREF_ALT0
-#define DUK_TVAL_SET_BOOLEAN_UPDREF           DUK_TVAL_SET_BOOLEAN_UPDREF_ALT0
-#define DUK_TVAL_SET_NUMBER_UPDREF            DUK_TVAL_SET_NUMBER_UPDREF_ALT0
-#define DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF    DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF_ALT0
-#define DUK_TVAL_SET_DOUBLE_UPDREF            DUK_TVAL_SET_DOUBLE_UPDREF_ALT0
-#define DUK_TVAL_SET_NAN_UPDREF               DUK_TVAL_SET_NAN_UPDREF_ALT0
+#define DUK_TVAL_SET_UNDEFINED_UPDREF      DUK_TVAL_SET_UNDEFINED_UPDREF_ALT0
+#define DUK_TVAL_SET_UNDEFINED_UPDREF_NORZ DUK_TVAL_SET_UNDEFINED_UPDREF_ALT0
+#define DUK_TVAL_SET_UNUSED_UPDREF         DUK_TVAL_SET_UNUSED_UPDREF_ALT0
+#define DUK_TVAL_SET_NULL_UPDREF           DUK_TVAL_SET_NULL_UPDREF_ALT0
+#define DUK_TVAL_SET_BOOLEAN_UPDREF        DUK_TVAL_SET_BOOLEAN_UPDREF_ALT0
+#define DUK_TVAL_SET_NUMBER_UPDREF         DUK_TVAL_SET_NUMBER_UPDREF_ALT0
+#define DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF_ALT0
+#define DUK_TVAL_SET_DOUBLE_UPDREF         DUK_TVAL_SET_DOUBLE_UPDREF_ALT0
+#define DUK_TVAL_SET_NAN_UPDREF            DUK_TVAL_SET_NAN_UPDREF_ALT0
 #if defined(DUK_USE_FASTINT)
-#define DUK_TVAL_SET_I48_UPDREF               DUK_TVAL_SET_I48_UPDREF_ALT0
-#define DUK_TVAL_SET_I32_UPDREF               DUK_TVAL_SET_I32_UPDREF_ALT0
-#define DUK_TVAL_SET_U32_UPDREF               DUK_TVAL_SET_U32_UPDREF_ALT0
+#define DUK_TVAL_SET_I48_UPDREF DUK_TVAL_SET_I48_UPDREF_ALT0
+#define DUK_TVAL_SET_I32_UPDREF DUK_TVAL_SET_I32_UPDREF_ALT0
+#define DUK_TVAL_SET_U32_UPDREF DUK_TVAL_SET_U32_UPDREF_ALT0
 #else
-#define DUK_TVAL_SET_I48_UPDREF               DUK_TVAL_SET_DOUBLE_CAST_UPDREF  /* XXX: fast-int-to-double */
-#define DUK_TVAL_SET_I32_UPDREF               DUK_TVAL_SET_DOUBLE_CAST_UPDREF
-#define DUK_TVAL_SET_U32_UPDREF               DUK_TVAL_SET_DOUBLE_CAST_UPDREF
-#endif  /* DUK_USE_FASTINT */
-#define DUK_TVAL_SET_FASTINT_UPDREF           DUK_TVAL_SET_I48_UPDREF  /* convenience */
-#define DUK_TVAL_SET_LIGHTFUNC_UPDREF         DUK_TVAL_SET_LIGHTFUNC_UPDREF_ALT0
-#define DUK_TVAL_SET_STRING_UPDREF            DUK_TVAL_SET_STRING_UPDREF_ALT0
-#define DUK_TVAL_SET_OBJECT_UPDREF            DUK_TVAL_SET_OBJECT_UPDREF_ALT0
-#define DUK_TVAL_SET_BUFFER_UPDREF            DUK_TVAL_SET_BUFFER_UPDREF_ALT0
-#define DUK_TVAL_SET_POINTER_UPDREF           DUK_TVAL_SET_POINTER_UPDREF_ALT0
+#define DUK_TVAL_SET_I48_UPDREF DUK_TVAL_SET_DOUBLE_CAST_UPDREF /* XXX: fast-int-to-double */
+#define DUK_TVAL_SET_I32_UPDREF DUK_TVAL_SET_DOUBLE_CAST_UPDREF
+#define DUK_TVAL_SET_U32_UPDREF DUK_TVAL_SET_DOUBLE_CAST_UPDREF
+#endif /* DUK_USE_FASTINT */
+#define DUK_TVAL_SET_FASTINT_UPDREF   DUK_TVAL_SET_I48_UPDREF /* convenience */
+#define DUK_TVAL_SET_LIGHTFUNC_UPDREF DUK_TVAL_SET_LIGHTFUNC_UPDREF_ALT0
+#define DUK_TVAL_SET_STRING_UPDREF    DUK_TVAL_SET_STRING_UPDREF_ALT0
+#define DUK_TVAL_SET_OBJECT_UPDREF    DUK_TVAL_SET_OBJECT_UPDREF_ALT0
+#define DUK_TVAL_SET_BUFFER_UPDREF    DUK_TVAL_SET_BUFFER_UPDREF_ALT0
+#define DUK_TVAL_SET_POINTER_UPDREF   DUK_TVAL_SET_POINTER_UPDREF_ALT0
 
-#define DUK_TVAL_SET_TVAL_UPDREF              DUK_TVAL_SET_TVAL_UPDREF_ALT0
-#define DUK_TVAL_SET_TVAL_UPDREF_FAST         DUK_TVAL_SET_TVAL_UPDREF_ALT0
-#define DUK_TVAL_SET_TVAL_UPDREF_SLOW         DUK_TVAL_SET_TVAL_UPDREF_ALT0
+#define DUK_TVAL_SET_TVAL_UPDREF      DUK_TVAL_SET_TVAL_UPDREF_ALT0
+#define DUK_TVAL_SET_TVAL_UPDREF_FAST DUK_TVAL_SET_TVAL_UPDREF_ALT0
+#define DUK_TVAL_SET_TVAL_UPDREF_SLOW DUK_TVAL_SET_TVAL_UPDREF_ALT0
 
-#endif  /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_REFERENCE_COUNTING */
 
 /*
  *  Some convenience macros that don't have optimized implementations now.
  */
 
-#define DUK_TVAL_SET_TVAL_UPDREF_NORZ(thr,tv_dst,tv_src) do { \
+#define DUK_TVAL_SET_TVAL_UPDREF_NORZ(thr, tv_dst, tv_src) \
+	do { \
 		duk_hthread *duk__thr = (thr); \
 		duk_tval *duk__dst = (tv_dst); \
 		duk_tval *duk__src = (tv_src); \
@@ -5352,7 +5837,8 @@ struct duk_heaphdr_string {
 		DUK_TVAL_INCREF(thr, duk__dst); \
 	} while (0)
 
-#define DUK_TVAL_SET_U32_UPDREF_NORZ(thr,tv_dst,val) do { \
+#define DUK_TVAL_SET_U32_UPDREF_NORZ(thr, tv_dst, val) \
+	do { \
 		duk_hthread *duk__thr = (thr); \
 		duk_tval *duk__dst = (tv_dst); \
 		duk_uint32_t duk__val = (duk_uint32_t) (val); \
@@ -5368,11 +5854,11 @@ struct duk_heaphdr_string {
 #if defined(DUK_USE_REFERENCE_COUNTING)
 #if defined(DUK_USE_FINALIZER_SUPPORT)
 DUK_INTERNAL_DECL void duk_refzero_check_slow(duk_hthread *thr);
-DUK_INTERNAL_DECL DUK_INLINE void duk_refzero_check_fast(duk_hthread *thr);
+DUK_INTERNAL_DECL void duk_refzero_check_fast(duk_hthread *thr);
 #endif
 DUK_INTERNAL_DECL void duk_heaphdr_refcount_finalize_norz(duk_heap *heap, duk_heaphdr *hdr);
 DUK_INTERNAL_DECL void duk_hobject_refcount_finalize_norz(duk_heap *heap, duk_hobject *h);
-#if 0  /* Not needed: fast path handles inline; slow path uses duk_heaphdr_decref() which is needed anyway. */
+#if 0 /* Not needed: fast path handles inline; slow path uses duk_heaphdr_decref() which is needed anyway. */
 DUK_INTERNAL_DECL void duk_hstring_decref(duk_hthread *thr, duk_hstring *h);
 DUK_INTERNAL_DECL void duk_hstring_decref_norz(duk_hthread *thr, duk_hstring *h);
 DUK_INTERNAL_DECL void duk_hbuffer_decref(duk_hthread *thr, duk_hbuffer *h);
@@ -5383,8 +5869,8 @@ DUK_INTERNAL_DECL void duk_hobject_decref_norz(duk_hthread *thr, duk_hobject *h)
 DUK_INTERNAL_DECL void duk_heaphdr_refzero(duk_hthread *thr, duk_heaphdr *h);
 DUK_INTERNAL_DECL void duk_heaphdr_refzero_norz(duk_hthread *thr, duk_heaphdr *h);
 #if defined(DUK_USE_FAST_REFCOUNT_DEFAULT)
-DUK_INTERNAL_DECL void duk_hstring_refzero(duk_hthread *thr, duk_hstring *h);  /* no 'norz' variant */
-DUK_INTERNAL_DECL void duk_hbuffer_refzero(duk_hthread *thr, duk_hbuffer *h);  /* no 'norz' variant */
+DUK_INTERNAL_DECL void duk_hstring_refzero(duk_hthread *thr, duk_hstring *h); /* no 'norz' variant */
+DUK_INTERNAL_DECL void duk_hbuffer_refzero(duk_hthread *thr, duk_hbuffer *h); /* no 'norz' variant */
 DUK_INTERNAL_DECL void duk_hobject_refzero(duk_hthread *thr, duk_hobject *h);
 DUK_INTERNAL_DECL void duk_hobject_refzero_norz(duk_hthread *thr, duk_hobject *h);
 #else
@@ -5395,11 +5881,11 @@ DUK_INTERNAL_DECL void duk_heaphdr_incref(duk_heaphdr *h);
 DUK_INTERNAL_DECL void duk_heaphdr_decref(duk_hthread *thr, duk_heaphdr *h);
 DUK_INTERNAL_DECL void duk_heaphdr_decref_norz(duk_hthread *thr, duk_heaphdr *h);
 #endif
-#else  /* DUK_USE_REFERENCE_COUNTING */
+#else /* DUK_USE_REFERENCE_COUNTING */
 /* no refcounting */
-#endif  /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_REFERENCE_COUNTING */
 
-#endif  /* DUK_REFCOUNT_H_INCLUDED */
+#endif /* DUK_REFCOUNT_H_INCLUDED */
 /* #include duk_api_internal.h */
 /*
  *  Internal API calls which have (stack and other) semantics similar
@@ -5409,22 +5895,42 @@ DUK_INTERNAL_DECL void duk_heaphdr_decref_norz(duk_hthread *thr, duk_heaphdr *h)
 #if !defined(DUK_API_INTERNAL_H_INCLUDED)
 #define DUK_API_INTERNAL_H_INCLUDED
 
-#define DUK_INTERNAL_SYMBOL(x)     ("\x82" x)
+/* Inline macro helpers. */
+#if defined(DUK_USE_PREFER_SIZE)
+#define DUK_INLINE_PERF
+#define DUK_ALWAYS_INLINE_PERF
+#define DUK_NOINLINE_PERF
+#else
+#define DUK_INLINE_PERF        DUK_INLINE
+#define DUK_ALWAYS_INLINE_PERF DUK_ALWAYS_INLINE
+#define DUK_NOINLINE_PERF      DUK_NOINLINE
+#endif
+
+/* Inline macro helpers, for bytecode executor. */
+#if defined(DUK_USE_EXEC_PREFER_SIZE)
+#define DUK_EXEC_INLINE_PERF
+#define DUK_EXEC_ALWAYS_INLINE_PERF
+#define DUK_EXEC_NOINLINE_PERF
+#else
+#define DUK_EXEC_INLINE_PERF        DUK_INLINE
+#define DUK_EXEC_ALWAYS_INLINE_PERF DUK_ALWAYS_INLINE
+#define DUK_EXEC_NOINLINE_PERF      DUK_NOINLINE
+#endif
 
 /* duk_push_sprintf constants */
-#define DUK_PUSH_SPRINTF_INITIAL_SIZE  256L
-#define DUK_PUSH_SPRINTF_SANITY_LIMIT  (1L * 1024L * 1024L * 1024L)
+#define DUK_PUSH_SPRINTF_INITIAL_SIZE 256L
+#define DUK_PUSH_SPRINTF_SANITY_LIMIT (1L * 1024L * 1024L * 1024L)
 
 /* Flag ORed to err_code to indicate __FILE__ / __LINE__ is not
  * blamed as source of error for error fileName / lineNumber.
  */
-#define DUK_ERRCODE_FLAG_NOBLAME_FILELINE  (1L << 24)
+#define DUK_ERRCODE_FLAG_NOBLAME_FILELINE (1L << 24)
 
 /* Current convention is to use duk_size_t for value stack sizes and global indices,
  * and duk_idx_t for local frame indices.
  */
-DUK_INTERNAL_DECL DUK_INLINE void duk_valstack_grow_check_throw(duk_hthread *thr, duk_size_t min_bytes);
-DUK_INTERNAL_DECL DUK_INLINE duk_bool_t duk_valstack_grow_check_nothrow(duk_hthread *thr, duk_size_t min_bytes);
+DUK_INTERNAL_DECL void duk_valstack_grow_check_throw(duk_hthread *thr, duk_size_t min_bytes);
+DUK_INTERNAL_DECL duk_bool_t duk_valstack_grow_check_nothrow(duk_hthread *thr, duk_size_t min_bytes);
 DUK_INTERNAL_DECL void duk_valstack_shrink_check_nothrow(duk_hthread *thr, duk_bool_t snug);
 
 DUK_INTERNAL_DECL void duk_copy_tvals_incref(duk_hthread *thr, duk_tval *tv_dst, duk_tval *tv_src, duk_size_t count);
@@ -5480,29 +5986,24 @@ DUK_INTERNAL_DECL duk_hstring *duk_push_uint_to_hstring(duk_hthread *thr, duk_ui
 DUK_INTERNAL_DECL duk_tval *duk_get_borrowed_this_tval(duk_hthread *thr);
 
 /* XXX: add fastint support? */
-#define duk_push_u64(thr,val) \
-	duk_push_number((thr), (duk_double_t) (val))
-#define duk_push_i64(thr,val) \
-	duk_push_number((thr), (duk_double_t) (val))
+#define duk_push_u64(thr, val) duk_push_number((thr), (duk_double_t) (val))
+#define duk_push_i64(thr, val) duk_push_number((thr), (duk_double_t) (val))
 
 /* duk_push_(u)int() is guaranteed to support at least (un)signed 32-bit range */
-#define duk_push_u32(thr,val) \
-	duk_push_uint((thr), (duk_uint_t) (val))
-#define duk_push_i32(thr,val) \
-	duk_push_int((thr), (duk_int_t) (val))
+#define duk_push_u32(thr, val) duk_push_uint((thr), (duk_uint_t) (val))
+#define duk_push_i32(thr, val) duk_push_int((thr), (duk_int_t) (val))
 
 /* sometimes stack and array indices need to go on the stack */
-#define duk_push_idx(thr,val) \
-	duk_push_int((thr), (duk_int_t) (val))
-#define duk_push_uarridx(thr,val) \
-	duk_push_uint((thr), (duk_uint_t) (val))
-#define duk_push_size_t(thr,val) \
-	duk_push_uint((thr), (duk_uint_t) (val))  /* XXX: assumed to fit for now */
+#define duk_push_idx(thr, val)     duk_push_int((thr), (duk_int_t) (val))
+#define duk_push_uarridx(thr, val) duk_push_uint((thr), (duk_uint_t) (val))
+#define duk_push_size_t(thr, val)  duk_push_uint((thr), (duk_uint_t) (val)) /* XXX: assumed to fit for now */
 
 DUK_INTERNAL_DECL duk_bool_t duk_is_string_notsymbol(duk_hthread *thr, duk_idx_t idx);
 
 DUK_INTERNAL_DECL duk_bool_t duk_is_callable_tval(duk_hthread *thr, duk_tval *tv);
 
+DUK_INTERNAL_DECL duk_bool_t duk_is_bare_object(duk_hthread *thr, duk_idx_t idx);
+
 DUK_INTERNAL_DECL duk_hstring *duk_get_hstring(duk_hthread *thr, duk_idx_t idx);
 DUK_INTERNAL_DECL duk_hstring *duk_get_hstring_notsymbol(duk_hthread *thr, duk_idx_t idx);
 DUK_INTERNAL_DECL const char *duk_get_string_notsymbol(duk_hthread *thr, duk_idx_t idx);
@@ -5512,19 +6013,23 @@ DUK_INTERNAL_DECL duk_hthread *duk_get_hthread(duk_hthread *thr, duk_idx_t idx);
 DUK_INTERNAL_DECL duk_hcompfunc *duk_get_hcompfunc(duk_hthread *thr, duk_idx_t idx);
 DUK_INTERNAL_DECL duk_hnatfunc *duk_get_hnatfunc(duk_hthread *thr, duk_idx_t idx);
 
-DUK_INTERNAL_DECL void *duk_get_buffer_data_raw(duk_hthread *thr, duk_idx_t idx, duk_size_t *out_size, void *def_ptr, duk_size_t def_len, duk_bool_t throw_flag, duk_bool_t *out_isbuffer);
+DUK_INTERNAL_DECL void *duk_get_buffer_data_raw(duk_hthread *thr,
+                                                duk_idx_t idx,
+                                                duk_size_t *out_size,
+                                                void *def_ptr,
+                                                duk_size_t def_len,
+                                                duk_bool_t throw_flag,
+                                                duk_bool_t *out_isbuffer);
 
 DUK_INTERNAL_DECL duk_hobject *duk_get_hobject_with_class(duk_hthread *thr, duk_idx_t idx, duk_small_uint_t classnum);
 
 DUK_INTERNAL_DECL duk_hobject *duk_get_hobject_promote_mask(duk_hthread *thr, duk_idx_t idx, duk_uint_t type_mask);
 DUK_INTERNAL_DECL duk_hobject *duk_require_hobject_promote_mask(duk_hthread *thr, duk_idx_t idx, duk_uint_t type_mask);
 DUK_INTERNAL_DECL duk_hobject *duk_require_hobject_accept_mask(duk_hthread *thr, duk_idx_t idx, duk_uint_t type_mask);
-#define duk_require_hobject_promote_lfunc(thr,idx) \
-	duk_require_hobject_promote_mask((thr), (idx), DUK_TYPE_MASK_LIGHTFUNC)
-#define duk_get_hobject_promote_lfunc(thr,idx) \
-	duk_get_hobject_promote_mask((thr), (idx), DUK_TYPE_MASK_LIGHTFUNC)
+#define duk_require_hobject_promote_lfunc(thr, idx) duk_require_hobject_promote_mask((thr), (idx), DUK_TYPE_MASK_LIGHTFUNC)
+#define duk_get_hobject_promote_lfunc(thr, idx)     duk_get_hobject_promote_mask((thr), (idx), DUK_TYPE_MASK_LIGHTFUNC)
 
-#if 0  /*unused*/
+#if 0 /*unused*/
 DUK_INTERNAL_DECL void *duk_get_voidptr(duk_hthread *thr, duk_idx_t idx);
 #endif
 
@@ -5547,12 +6052,16 @@ DUK_INTERNAL_DECL duk_double_t duk_to_number_m2(duk_hthread *thr);
 
 DUK_INTERNAL_DECL duk_bool_t duk_to_boolean_top_pop(duk_hthread *thr);
 
-#if defined(DUK_USE_DEBUGGER_SUPPORT)  /* only needed by debugger for now */
+#if defined(DUK_USE_DEBUGGER_SUPPORT) /* only needed by debugger for now */
 DUK_INTERNAL_DECL duk_hstring *duk_safe_to_hstring(duk_hthread *thr, duk_idx_t idx);
 #endif
 DUK_INTERNAL_DECL void duk_push_class_string_tval(duk_hthread *thr, duk_tval *tv, duk_bool_t avoid_side_effects);
 
-DUK_INTERNAL_DECL duk_int_t duk_to_int_clamped_raw(duk_hthread *thr, duk_idx_t idx, duk_int_t minval, duk_int_t maxval, duk_bool_t *out_clamped);  /* out_clamped=NULL, RangeError if outside range */
+DUK_INTERNAL_DECL duk_int_t duk_to_int_clamped_raw(duk_hthread *thr,
+                                                   duk_idx_t idx,
+                                                   duk_int_t minval,
+                                                   duk_int_t maxval,
+                                                   duk_bool_t *out_clamped); /* out_clamped=NULL, RangeError if outside range */
 DUK_INTERNAL_DECL duk_int_t duk_to_int_clamped(duk_hthread *thr, duk_idx_t idx, duk_int_t minval, duk_int_t maxval);
 DUK_INTERNAL_DECL duk_int_t duk_to_int_check_range(duk_hthread *thr, duk_idx_t idx, duk_int_t minval, duk_int_t maxval);
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
@@ -5577,13 +6086,15 @@ DUK_INTERNAL_DECL void duk_push_hstring_stridx(duk_hthread *thr, duk_small_uint_
 DUK_INTERNAL_DECL void duk_push_hstring_empty(duk_hthread *thr);
 DUK_INTERNAL_DECL void duk_push_hobject(duk_hthread *thr, duk_hobject *h);
 DUK_INTERNAL_DECL void duk_push_hbuffer(duk_hthread *thr, duk_hbuffer *h);
-#define duk_push_hthread(thr,h) \
-	duk_push_hobject((thr), (duk_hobject *) (h))
-#define duk_push_hnatfunc(thr,h) \
-	duk_push_hobject((thr), (duk_hobject *) (h))
+#define duk_push_hthread(thr, h)  duk_push_hobject((thr), (duk_hobject *) (h))
+#define duk_push_hnatfunc(thr, h) duk_push_hobject((thr), (duk_hobject *) (h))
 DUK_INTERNAL_DECL void duk_push_hobject_bidx(duk_hthread *thr, duk_small_int_t builtin_idx);
-DUK_INTERNAL_DECL duk_hobject *duk_push_object_helper(duk_hthread *thr, duk_uint_t hobject_flags_and_class, duk_small_int_t prototype_bidx);
-DUK_INTERNAL_DECL duk_hobject *duk_push_object_helper_proto(duk_hthread *thr, duk_uint_t hobject_flags_and_class, duk_hobject *proto);
+DUK_INTERNAL_DECL duk_hobject *duk_push_object_helper(duk_hthread *thr,
+                                                      duk_uint_t hobject_flags_and_class,
+                                                      duk_small_int_t prototype_bidx);
+DUK_INTERNAL_DECL duk_hobject *duk_push_object_helper_proto(duk_hthread *thr,
+                                                            duk_uint_t hobject_flags_and_class,
+                                                            duk_hobject *proto);
 DUK_INTERNAL_DECL duk_hcompfunc *duk_push_hcompfunc(duk_hthread *thr);
 DUK_INTERNAL_DECL duk_hboundfunc *duk_push_hboundfunc(duk_hthread *thr);
 DUK_INTERNAL_DECL void duk_push_c_function_builtin(duk_hthread *thr, duk_c_function func, duk_int_t nargs);
@@ -5600,11 +6111,13 @@ DUK_INTERNAL_DECL void duk_push_string_funcptr(duk_hthread *thr, duk_uint8_t *pt
 DUK_INTERNAL_DECL void duk_push_lightfunc_name_raw(duk_hthread *thr, duk_c_function func, duk_small_uint_t lf_flags);
 DUK_INTERNAL_DECL void duk_push_lightfunc_name(duk_hthread *thr, duk_tval *tv);
 DUK_INTERNAL_DECL void duk_push_lightfunc_tostring(duk_hthread *thr, duk_tval *tv);
-#if 0  /* not used yet */
+#if 0 /* not used yet */
 DUK_INTERNAL_DECL void duk_push_hnatfunc_name(duk_hthread *thr, duk_hnatfunc *h);
 #endif
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
-DUK_INTERNAL_DECL duk_hbufobj *duk_push_bufobj_raw(duk_hthread *thr, duk_uint_t hobject_flags_and_class, duk_small_int_t prototype_bidx);
+DUK_INTERNAL_DECL duk_hbufobj *duk_push_bufobj_raw(duk_hthread *thr,
+                                                   duk_uint_t hobject_flags_and_class,
+                                                   duk_small_int_t prototype_bidx);
 #endif
 
 DUK_INTERNAL_DECL void *duk_push_fixed_buffer_nozero(duk_hthread *thr, duk_size_t len);
@@ -5621,72 +6134,86 @@ DUK_INTERNAL_DECL const char *duk_push_string_tval_readable_error(duk_hthread *t
  * arguments and such call sites are also easiest to verify to be correct.
  */
 
-DUK_INTERNAL_DECL duk_bool_t duk_get_prop_stridx(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx);     /* [] -> [val] */
+DUK_INTERNAL_DECL duk_bool_t duk_get_prop_stridx(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx); /* [] -> [val] */
 DUK_INTERNAL_DECL duk_bool_t duk_get_prop_stridx_short_raw(duk_hthread *thr, duk_uint_t packed_args);
-#define duk_get_prop_stridx_short(thr,obj_idx,stridx) \
+#define duk_get_prop_stridx_short(thr, obj_idx, stridx) \
 	(DUK_ASSERT_EXPR((duk_int_t) (obj_idx) >= -0x8000L && (duk_int_t) (obj_idx) <= 0x7fffL), \
 	 DUK_ASSERT_EXPR((duk_int_t) (stridx) >= 0 && (duk_int_t) (stridx) <= 0xffffL), \
 	 duk_get_prop_stridx_short_raw((thr), (((duk_uint_t) (obj_idx)) << 16) + ((duk_uint_t) (stridx))))
-DUK_INTERNAL_DECL duk_bool_t duk_get_prop_stridx_boolean(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx, duk_bool_t *out_has_prop);  /* [] -> [] */
+DUK_INTERNAL_DECL duk_bool_t duk_get_prop_stridx_boolean(duk_hthread *thr,
+                                                         duk_idx_t obj_idx,
+                                                         duk_small_uint_t stridx,
+                                                         duk_bool_t *out_has_prop); /* [] -> [] */
+
+DUK_INTERNAL_DECL duk_bool_t duk_xget_owndataprop(duk_hthread *thr, duk_idx_t obj_idx);
+DUK_INTERNAL_DECL duk_bool_t duk_xget_owndataprop_stridx(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx);
+DUK_INTERNAL_DECL duk_bool_t duk_xget_owndataprop_stridx_short_raw(duk_hthread *thr, duk_uint_t packed_args);
+#define duk_xget_owndataprop_stridx_short(thr, obj_idx, stridx) \
+	(DUK_ASSERT_EXPR((duk_int_t) (obj_idx) >= -0x8000L && (duk_int_t) (obj_idx) <= 0x7fffL), \
+	 DUK_ASSERT_EXPR((duk_int_t) (stridx) >= 0 && (duk_int_t) (stridx) <= 0xffffL), \
+	 duk_xget_owndataprop_stridx_short_raw((thr), (((duk_uint_t) (obj_idx)) << 16) + ((duk_uint_t) (stridx))))
 
-DUK_INTERNAL_DECL duk_bool_t duk_put_prop_stridx(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx);     /* [val] -> [] */
+DUK_INTERNAL_DECL duk_bool_t duk_put_prop_stridx(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx); /* [val] -> [] */
 DUK_INTERNAL_DECL duk_bool_t duk_put_prop_stridx_short_raw(duk_hthread *thr, duk_uint_t packed_args);
-#define duk_put_prop_stridx_short(thr,obj_idx,stridx) \
+#define duk_put_prop_stridx_short(thr, obj_idx, stridx) \
 	(DUK_ASSERT_EXPR((duk_int_t) (obj_idx) >= -0x8000L && (duk_int_t) (obj_idx) <= 0x7fffL), \
 	 DUK_ASSERT_EXPR((duk_int_t) (stridx) >= 0 && (duk_int_t) (stridx) <= 0xffffL), \
 	 duk_put_prop_stridx_short_raw((thr), (((duk_uint_t) (obj_idx)) << 16) + ((duk_uint_t) (stridx))))
 
-DUK_INTERNAL_DECL duk_bool_t duk_del_prop_stridx(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx);     /* [] -> [] */
-#if 0  /* Too few call sites to be useful. */
+DUK_INTERNAL_DECL duk_bool_t duk_del_prop_stridx(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx); /* [] -> [] */
+#if 0 /* Too few call sites to be useful. */
 DUK_INTERNAL_DECL duk_bool_t duk_del_prop_stridx_short_raw(duk_hthread *thr, duk_uint_t packed_args);
-#define duk_del_prop_stridx_short(thr,obj_idx,stridx) \
+#define duk_del_prop_stridx_short(thr, obj_idx, stridx) \
 	(DUK_ASSERT_EXPR((obj_idx) >= -0x8000L && (obj_idx) <= 0x7fffL), \
 	 DUK_ASSERT_EXPR((stridx) >= 0 && (stridx) <= 0xffffL), \
 	 duk_del_prop_stridx_short_raw((thr), (((duk_uint_t) (obj_idx)) << 16) + ((duk_uint_t) (stridx))))
 #endif
-#define duk_del_prop_stridx_short(thr,obj_idx,stridx) \
-	duk_del_prop_stridx((thr), (obj_idx), (stridx))
+#define duk_del_prop_stridx_short(thr, obj_idx, stridx) duk_del_prop_stridx((thr), (obj_idx), (stridx))
 
-DUK_INTERNAL_DECL duk_bool_t duk_has_prop_stridx(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx);     /* [] -> [] */
-#if 0  /* Too few call sites to be useful. */
+DUK_INTERNAL_DECL duk_bool_t duk_has_prop_stridx(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx); /* [] -> [] */
+#if 0 /* Too few call sites to be useful. */
 DUK_INTERNAL_DECL duk_bool_t duk_has_prop_stridx_short_raw(duk_hthread *thr, duk_uint_t packed_args);
-#define duk_has_prop_stridx_short(thr,obj_idx,stridx) \
+#define duk_has_prop_stridx_short(thr, obj_idx, stridx) \
 	(DUK_ASSERT_EXPR((obj_idx) >= -0x8000L && (obj_idx) <= 0x7fffL), \
 	 DUK_ASSERT_EXPR((stridx) >= 0 && (stridx) <= 0xffffL), \
 	 duk_has_prop_stridx_short_raw((thr), (((duk_uint_t) (obj_idx)) << 16) + ((duk_uint_t) (stridx))))
 #endif
-#define duk_has_prop_stridx_short(thr,obj_idx,stridx) \
-	duk_has_prop_stridx((thr), (obj_idx), (stridx))
+#define duk_has_prop_stridx_short(thr, obj_idx, stridx) duk_has_prop_stridx((thr), (obj_idx), (stridx))
 
-DUK_INTERNAL_DECL void duk_xdef_prop(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t desc_flags);  /* [key val] -> [] */
+DUK_INTERNAL_DECL void duk_xdef_prop(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t desc_flags); /* [key val] -> [] */
 
-DUK_INTERNAL_DECL void duk_xdef_prop_index(duk_hthread *thr, duk_idx_t obj_idx, duk_uarridx_t arr_idx, duk_small_uint_t desc_flags);  /* [val] -> [] */
+DUK_INTERNAL_DECL void duk_xdef_prop_index(duk_hthread *thr,
+                                           duk_idx_t obj_idx,
+                                           duk_uarridx_t arr_idx,
+                                           duk_small_uint_t desc_flags); /* [val] -> [] */
 
 /* XXX: Because stridx and desc_flags have a limited range, this call could
  * always pack stridx and desc_flags into a single argument.
  */
-DUK_INTERNAL_DECL void duk_xdef_prop_stridx(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx, duk_small_uint_t desc_flags);  /* [val] -> [] */
+DUK_INTERNAL_DECL void duk_xdef_prop_stridx(duk_hthread *thr,
+                                            duk_idx_t obj_idx,
+                                            duk_small_uint_t stridx,
+                                            duk_small_uint_t desc_flags); /* [val] -> [] */
 DUK_INTERNAL_DECL void duk_xdef_prop_stridx_short_raw(duk_hthread *thr, duk_uint_t packed_args);
-#define duk_xdef_prop_stridx_short(thr,obj_idx,stridx,desc_flags) \
+#define duk_xdef_prop_stridx_short(thr, obj_idx, stridx, desc_flags) \
 	(DUK_ASSERT_EXPR((duk_int_t) (obj_idx) >= -0x80L && (duk_int_t) (obj_idx) <= 0x7fL), \
 	 DUK_ASSERT_EXPR((duk_int_t) (stridx) >= 0 && (duk_int_t) (stridx) <= 0xffffL), \
 	 DUK_ASSERT_EXPR((duk_int_t) (desc_flags) >= 0 && (duk_int_t) (desc_flags) <= 0xffL), \
-	 duk_xdef_prop_stridx_short_raw((thr), (((duk_uint_t) (obj_idx)) << 24) + (((duk_uint_t) (stridx)) << 8) + (duk_uint_t) (desc_flags)))
-
-#define duk_xdef_prop_wec(thr,obj_idx) \
-	duk_xdef_prop((thr), (obj_idx), DUK_PROPDESC_FLAGS_WEC)
-#define duk_xdef_prop_index_wec(thr,obj_idx,arr_idx) \
-	duk_xdef_prop_index((thr), (obj_idx), (arr_idx), DUK_PROPDESC_FLAGS_WEC)
-#define duk_xdef_prop_stridx_wec(thr,obj_idx,stridx) \
-	duk_xdef_prop_stridx((thr), (obj_idx), (stridx), DUK_PROPDESC_FLAGS_WEC)
-#define duk_xdef_prop_stridx_short_wec(thr,obj_idx,stridx) \
+	 duk_xdef_prop_stridx_short_raw((thr), \
+	                                (((duk_uint_t) (obj_idx)) << 24) + (((duk_uint_t) (stridx)) << 8) + \
+	                                    (duk_uint_t) (desc_flags)))
+
+#define duk_xdef_prop_wec(thr, obj_idx)                duk_xdef_prop((thr), (obj_idx), DUK_PROPDESC_FLAGS_WEC)
+#define duk_xdef_prop_index_wec(thr, obj_idx, arr_idx) duk_xdef_prop_index((thr), (obj_idx), (arr_idx), DUK_PROPDESC_FLAGS_WEC)
+#define duk_xdef_prop_stridx_wec(thr, obj_idx, stridx) duk_xdef_prop_stridx((thr), (obj_idx), (stridx), DUK_PROPDESC_FLAGS_WEC)
+#define duk_xdef_prop_stridx_short_wec(thr, obj_idx, stridx) \
 	duk_xdef_prop_stridx_short((thr), (obj_idx), (stridx), DUK_PROPDESC_FLAGS_WEC)
 
-#if 0  /*unused*/
+#if 0 /*unused*/
 DUK_INTERNAL_DECL void duk_xdef_prop_stridx_builtin(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx, duk_small_int_t builtin_idx, duk_small_uint_t desc_flags);  /* [] -> [] */
 #endif
 
-DUK_INTERNAL_DECL void duk_xdef_prop_stridx_thrower(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx);  /* [] -> [] */
+DUK_INTERNAL_DECL void duk_xdef_prop_stridx_thrower(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx); /* [] -> [] */
 
 DUK_INTERNAL_DECL duk_bool_t duk_get_method_stridx(duk_hthread *thr, duk_idx_t idx, duk_small_uint_t stridx);
 
@@ -5696,8 +6223,6 @@ DUK_INTERNAL_DECL duk_idx_t duk_unpack_array_like(duk_hthread *thr, duk_idx_t id
 DUK_INTERNAL_DECL void duk_unpack(duk_hthread *thr);
 #endif
 
-DUK_INTERNAL_DECL void duk_require_constructor_call(duk_hthread *thr);
-DUK_INTERNAL_DECL void duk_require_constructable(duk_hthread *thr, duk_idx_t idx);
 DUK_INTERNAL_DECL void duk_push_symbol_descriptive_string(duk_hthread *thr, duk_hstring *h);
 
 DUK_INTERNAL_DECL void duk_resolve_nonbound_function(duk_hthread *thr);
@@ -5730,33 +6255,31 @@ DUK_INTERNAL_DECL duk_int_t duk_pcall_method_flags(duk_hthread *thr, duk_idx_t n
 DUK_INTERNAL_DECL void duk_to_primitive_ordinary(duk_hthread *thr, duk_idx_t idx, duk_int_t hint);
 #endif
 
+DUK_INTERNAL_DECL void duk_clear_prototype(duk_hthread *thr, duk_idx_t idx);
+
 /* Raw internal valstack access macros: access is unsafe so call site
  * must have a guarantee that the index is valid.  When that is the case,
  * using these macro results in faster and smaller code than duk_get_tval().
  * Both 'ctx' and 'idx' are evaluted multiple times, but only for asserts.
  */
-#define DUK_ASSERT_VALID_NEGIDX(thr,idx) \
+#define DUK_ASSERT_VALID_NEGIDX(thr, idx) \
 	(DUK_ASSERT_EXPR((duk_int_t) (idx) < 0), DUK_ASSERT_EXPR(duk_is_valid_index((thr), (idx))))
-#define DUK_ASSERT_VALID_POSIDX(thr,idx) \
+#define DUK_ASSERT_VALID_POSIDX(thr, idx) \
 	(DUK_ASSERT_EXPR((duk_int_t) (idx) >= 0), DUK_ASSERT_EXPR(duk_is_valid_index((thr), (idx))))
-#define DUK_GET_TVAL_NEGIDX(thr,idx) \
-	(DUK_ASSERT_VALID_NEGIDX((thr),(idx)), ((duk_hthread *) (thr))->valstack_top + (idx))
-#define DUK_GET_TVAL_POSIDX(thr,idx) \
-	(DUK_ASSERT_VALID_POSIDX((thr),(idx)), ((duk_hthread *) (thr))->valstack_bottom + (idx))
-#define DUK_GET_HOBJECT_NEGIDX(thr,idx) \
-	(DUK_ASSERT_VALID_NEGIDX((thr),(idx)), DUK_TVAL_GET_OBJECT(((duk_hthread *) (thr))->valstack_top + (idx)))
-#define DUK_GET_HOBJECT_POSIDX(thr,idx) \
-	(DUK_ASSERT_VALID_POSIDX((thr),(idx)), DUK_TVAL_GET_OBJECT(((duk_hthread *) (thr))->valstack_bottom + (idx)))
-
-#define DUK_GET_THIS_TVAL_PTR(thr) \
-	(DUK_ASSERT_EXPR((thr)->valstack_bottom > (thr)->valstack), \
-	 (thr)->valstack_bottom - 1)
+#define DUK_GET_TVAL_NEGIDX(thr, idx) (DUK_ASSERT_VALID_NEGIDX((thr), (idx)), ((duk_hthread *) (thr))->valstack_top + (idx))
+#define DUK_GET_TVAL_POSIDX(thr, idx) (DUK_ASSERT_VALID_POSIDX((thr), (idx)), ((duk_hthread *) (thr))->valstack_bottom + (idx))
+#define DUK_GET_HOBJECT_NEGIDX(thr, idx) \
+	(DUK_ASSERT_VALID_NEGIDX((thr), (idx)), DUK_TVAL_GET_OBJECT(((duk_hthread *) (thr))->valstack_top + (idx)))
+#define DUK_GET_HOBJECT_POSIDX(thr, idx) \
+	(DUK_ASSERT_VALID_POSIDX((thr), (idx)), DUK_TVAL_GET_OBJECT(((duk_hthread *) (thr))->valstack_bottom + (idx)))
+
+#define DUK_GET_THIS_TVAL_PTR(thr) (DUK_ASSERT_EXPR((thr)->valstack_bottom > (thr)->valstack), (thr)->valstack_bottom - 1)
 
 DUK_INTERNAL_DECL duk_double_t duk_time_get_ecmascript_time(duk_hthread *thr);
 DUK_INTERNAL_DECL duk_double_t duk_time_get_ecmascript_time_nofrac(duk_hthread *thr);
 DUK_INTERNAL_DECL duk_double_t duk_time_get_monotonic_time(duk_hthread *thr);
 
-#endif  /* DUK_API_INTERNAL_H_INCLUDED */
+#endif /* DUK_API_INTERNAL_H_INCLUDED */
 /* #include duk_hstring.h */
 /*
  *  Heap string representation.
@@ -5787,9 +6310,9 @@ DUK_INTERNAL_DECL duk_double_t duk_time_get_monotonic_time(duk_hthread *thr);
  */
 
 #if defined(DUK_USE_STRLEN16)
-#define DUK_HSTRING_MAX_BYTELEN                     (0x0000ffffUL)
+#define DUK_HSTRING_MAX_BYTELEN (0x0000ffffUL)
 #else
-#define DUK_HSTRING_MAX_BYTELEN                     (0x7fffffffUL)
+#define DUK_HSTRING_MAX_BYTELEN (0x7fffffffUL)
 #endif
 
 /* XXX: could add flags for "is valid CESU-8" (ECMAScript compatible strings),
@@ -5801,133 +6324,150 @@ DUK_INTERNAL_DECL duk_double_t duk_time_get_monotonic_time(duk_hthread *thr);
 /* With lowmem builds the high 16 bits of duk_heaphdr are used for other
  * purposes, so this leaves 7 duk_heaphdr flags and 9 duk_hstring flags.
  */
-#define DUK_HSTRING_FLAG_ASCII                      DUK_HEAPHDR_USER_FLAG(0)  /* string is ASCII, clen == blen */
-#define DUK_HSTRING_FLAG_ARRIDX                     DUK_HEAPHDR_USER_FLAG(1)  /* string is a valid array index */
-#define DUK_HSTRING_FLAG_SYMBOL                     DUK_HEAPHDR_USER_FLAG(2)  /* string is a symbol (invalid utf-8) */
-#define DUK_HSTRING_FLAG_HIDDEN                     DUK_HEAPHDR_USER_FLAG(3)  /* string is a hidden symbol (implies symbol, Duktape 1.x internal string) */
-#define DUK_HSTRING_FLAG_RESERVED_WORD              DUK_HEAPHDR_USER_FLAG(4)  /* string is a reserved word (non-strict) */
-#define DUK_HSTRING_FLAG_STRICT_RESERVED_WORD       DUK_HEAPHDR_USER_FLAG(5)  /* string is a reserved word (strict) */
-#define DUK_HSTRING_FLAG_EVAL_OR_ARGUMENTS          DUK_HEAPHDR_USER_FLAG(6)  /* string is 'eval' or 'arguments' */
-#define DUK_HSTRING_FLAG_EXTDATA                    DUK_HEAPHDR_USER_FLAG(7)  /* string data is external (duk_hstring_external) */
-#define DUK_HSTRING_FLAG_PINNED_LITERAL             DUK_HEAPHDR_USER_FLAG(8)  /* string is a literal, and pinned */
-
-#define DUK_HSTRING_HAS_ASCII(x)                    DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_ASCII)
-#define DUK_HSTRING_HAS_ARRIDX(x)                   DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_ARRIDX)
-#define DUK_HSTRING_HAS_SYMBOL(x)                   DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_SYMBOL)
-#define DUK_HSTRING_HAS_HIDDEN(x)                   DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_HIDDEN)
-#define DUK_HSTRING_HAS_RESERVED_WORD(x)            DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_RESERVED_WORD)
-#define DUK_HSTRING_HAS_STRICT_RESERVED_WORD(x)     DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_STRICT_RESERVED_WORD)
-#define DUK_HSTRING_HAS_EVAL_OR_ARGUMENTS(x)        DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_EVAL_OR_ARGUMENTS)
-#define DUK_HSTRING_HAS_EXTDATA(x)                  DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_EXTDATA)
-#define DUK_HSTRING_HAS_PINNED_LITERAL(x)           DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_PINNED_LITERAL)
-
-#define DUK_HSTRING_SET_ASCII(x)                    DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_ASCII)
-#define DUK_HSTRING_SET_ARRIDX(x)                   DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_ARRIDX)
-#define DUK_HSTRING_SET_SYMBOL(x)                   DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_SYMBOL)
-#define DUK_HSTRING_SET_HIDDEN(x)                   DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_HIDDEN)
-#define DUK_HSTRING_SET_RESERVED_WORD(x)            DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_RESERVED_WORD)
-#define DUK_HSTRING_SET_STRICT_RESERVED_WORD(x)     DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_STRICT_RESERVED_WORD)
-#define DUK_HSTRING_SET_EVAL_OR_ARGUMENTS(x)        DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_EVAL_OR_ARGUMENTS)
-#define DUK_HSTRING_SET_EXTDATA(x)                  DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_EXTDATA)
-#define DUK_HSTRING_SET_PINNED_LITERAL(x)           DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_PINNED_LITERAL)
-
-#define DUK_HSTRING_CLEAR_ASCII(x)                  DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_ASCII)
-#define DUK_HSTRING_CLEAR_ARRIDX(x)                 DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_ARRIDX)
-#define DUK_HSTRING_CLEAR_SYMBOL(x)                 DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_SYMBOL)
-#define DUK_HSTRING_CLEAR_HIDDEN(x)                 DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_HIDDEN)
-#define DUK_HSTRING_CLEAR_RESERVED_WORD(x)          DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_RESERVED_WORD)
-#define DUK_HSTRING_CLEAR_STRICT_RESERVED_WORD(x)   DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_STRICT_RESERVED_WORD)
-#define DUK_HSTRING_CLEAR_EVAL_OR_ARGUMENTS(x)      DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_EVAL_OR_ARGUMENTS)
-#define DUK_HSTRING_CLEAR_EXTDATA(x)                DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_EXTDATA)
-#define DUK_HSTRING_CLEAR_PINNED_LITERAL(x)         DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_PINNED_LITERAL)
-
-#if 0  /* Slightly smaller code without explicit flag, but explicit flag
-        * is very useful when 'clen' is dropped.
-        */
-#define DUK_HSTRING_IS_ASCII(x)                     (DUK_HSTRING_GET_BYTELEN((x)) == DUK_HSTRING_GET_CHARLEN((x)))
-#endif
-#define DUK_HSTRING_IS_ASCII(x)                     DUK_HSTRING_HAS_ASCII((x))  /* lazily set! */
-#define DUK_HSTRING_IS_EMPTY(x)                     (DUK_HSTRING_GET_BYTELEN((x)) == 0)
+#define DUK_HSTRING_FLAG_ASCII  DUK_HEAPHDR_USER_FLAG(0) /* string is ASCII, clen == blen */
+#define DUK_HSTRING_FLAG_ARRIDX DUK_HEAPHDR_USER_FLAG(1) /* string is a valid array index */
+#define DUK_HSTRING_FLAG_SYMBOL DUK_HEAPHDR_USER_FLAG(2) /* string is a symbol (invalid utf-8) */
+#define DUK_HSTRING_FLAG_HIDDEN \
+	DUK_HEAPHDR_USER_FLAG(3) /* string is a hidden symbol (implies symbol, Duktape 1.x internal string) */
+#define DUK_HSTRING_FLAG_RESERVED_WORD        DUK_HEAPHDR_USER_FLAG(4) /* string is a reserved word (non-strict) */
+#define DUK_HSTRING_FLAG_STRICT_RESERVED_WORD DUK_HEAPHDR_USER_FLAG(5) /* string is a reserved word (strict) */
+#define DUK_HSTRING_FLAG_EVAL_OR_ARGUMENTS    DUK_HEAPHDR_USER_FLAG(6) /* string is 'eval' or 'arguments' */
+#define DUK_HSTRING_FLAG_EXTDATA              DUK_HEAPHDR_USER_FLAG(7) /* string data is external (duk_hstring_external) */
+#define DUK_HSTRING_FLAG_PINNED_LITERAL       DUK_HEAPHDR_USER_FLAG(8) /* string is a literal, and pinned */
+
+#define DUK_HSTRING_HAS_ASCII(x)                DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_ASCII)
+#define DUK_HSTRING_HAS_ARRIDX(x)               DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_ARRIDX)
+#define DUK_HSTRING_HAS_SYMBOL(x)               DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_SYMBOL)
+#define DUK_HSTRING_HAS_HIDDEN(x)               DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_HIDDEN)
+#define DUK_HSTRING_HAS_RESERVED_WORD(x)        DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_RESERVED_WORD)
+#define DUK_HSTRING_HAS_STRICT_RESERVED_WORD(x) DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_STRICT_RESERVED_WORD)
+#define DUK_HSTRING_HAS_EVAL_OR_ARGUMENTS(x)    DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_EVAL_OR_ARGUMENTS)
+#define DUK_HSTRING_HAS_EXTDATA(x)              DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_EXTDATA)
+#define DUK_HSTRING_HAS_PINNED_LITERAL(x)       DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_PINNED_LITERAL)
+
+#define DUK_HSTRING_SET_ASCII(x)                DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_ASCII)
+#define DUK_HSTRING_SET_ARRIDX(x)               DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_ARRIDX)
+#define DUK_HSTRING_SET_SYMBOL(x)               DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_SYMBOL)
+#define DUK_HSTRING_SET_HIDDEN(x)               DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_HIDDEN)
+#define DUK_HSTRING_SET_RESERVED_WORD(x)        DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_RESERVED_WORD)
+#define DUK_HSTRING_SET_STRICT_RESERVED_WORD(x) DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_STRICT_RESERVED_WORD)
+#define DUK_HSTRING_SET_EVAL_OR_ARGUMENTS(x)    DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_EVAL_OR_ARGUMENTS)
+#define DUK_HSTRING_SET_EXTDATA(x)              DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_EXTDATA)
+#define DUK_HSTRING_SET_PINNED_LITERAL(x)       DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_PINNED_LITERAL)
+
+#define DUK_HSTRING_CLEAR_ASCII(x)                DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_ASCII)
+#define DUK_HSTRING_CLEAR_ARRIDX(x)               DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_ARRIDX)
+#define DUK_HSTRING_CLEAR_SYMBOL(x)               DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_SYMBOL)
+#define DUK_HSTRING_CLEAR_HIDDEN(x)               DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_HIDDEN)
+#define DUK_HSTRING_CLEAR_RESERVED_WORD(x)        DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_RESERVED_WORD)
+#define DUK_HSTRING_CLEAR_STRICT_RESERVED_WORD(x) DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_STRICT_RESERVED_WORD)
+#define DUK_HSTRING_CLEAR_EVAL_OR_ARGUMENTS(x)    DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_EVAL_OR_ARGUMENTS)
+#define DUK_HSTRING_CLEAR_EXTDATA(x)              DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_EXTDATA)
+#define DUK_HSTRING_CLEAR_PINNED_LITERAL(x)       DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HSTRING_FLAG_PINNED_LITERAL)
+
+#if 0 /* Slightly smaller code without explicit flag, but explicit flag \
+       * is very useful when 'clen' is dropped. \
+       */
+#define DUK_HSTRING_IS_ASCII(x) (DUK_HSTRING_GET_BYTELEN((x)) == DUK_HSTRING_GET_CHARLEN((x)))
+#endif
+#define DUK_HSTRING_IS_ASCII(x) DUK_HSTRING_HAS_ASCII((x)) /* lazily set! */
+#define DUK_HSTRING_IS_EMPTY(x) (DUK_HSTRING_GET_BYTELEN((x)) == 0)
 
 #if defined(DUK_USE_STRHASH16)
-#define DUK_HSTRING_GET_HASH(x)                     ((x)->hdr.h_flags >> 16)
-#define DUK_HSTRING_SET_HASH(x,v) do { \
+#define DUK_HSTRING_GET_HASH(x) ((x)->hdr.h_flags >> 16)
+#define DUK_HSTRING_SET_HASH(x, v) \
+	do { \
 		(x)->hdr.h_flags = ((x)->hdr.h_flags & 0x0000ffffUL) | ((v) << 16); \
 	} while (0)
 #else
-#define DUK_HSTRING_GET_HASH(x)                     ((x)->hash)
-#define DUK_HSTRING_SET_HASH(x,v) do { \
+#define DUK_HSTRING_GET_HASH(x) ((x)->hash)
+#define DUK_HSTRING_SET_HASH(x, v) \
+	do { \
 		(x)->hash = (v); \
 	} while (0)
 #endif
 
 #if defined(DUK_USE_STRLEN16)
-#define DUK_HSTRING_GET_BYTELEN(x)                  ((x)->hdr.h_strextra16)
-#define DUK_HSTRING_SET_BYTELEN(x,v) do { \
+#define DUK_HSTRING_GET_BYTELEN(x) ((x)->hdr.h_strextra16)
+#define DUK_HSTRING_SET_BYTELEN(x, v) \
+	do { \
 		(x)->hdr.h_strextra16 = (v); \
 	} while (0)
 #if defined(DUK_USE_HSTRING_CLEN)
-#define DUK_HSTRING_GET_CHARLEN(x)                  duk_hstring_get_charlen((x))
-#define DUK_HSTRING_SET_CHARLEN(x,v) do { \
+#define DUK_HSTRING_GET_CHARLEN(x) duk_hstring_get_charlen((x))
+#define DUK_HSTRING_SET_CHARLEN(x, v) \
+	do { \
 		(x)->clen16 = (v); \
 	} while (0)
 #else
-#define DUK_HSTRING_GET_CHARLEN(x)                  duk_hstring_get_charlen((x))
-#define DUK_HSTRING_SET_CHARLEN(x,v) do { \
-		DUK_ASSERT(0);  /* should never be called */ \
+#define DUK_HSTRING_GET_CHARLEN(x) duk_hstring_get_charlen((x))
+#define DUK_HSTRING_SET_CHARLEN(x, v) \
+	do { \
+		DUK_ASSERT(0); /* should never be called */ \
 	} while (0)
 #endif
 #else
-#define DUK_HSTRING_GET_BYTELEN(x)                  ((x)->blen)
-#define DUK_HSTRING_SET_BYTELEN(x,v) do { \
+#define DUK_HSTRING_GET_BYTELEN(x) ((x)->blen)
+#define DUK_HSTRING_SET_BYTELEN(x, v) \
+	do { \
 		(x)->blen = (v); \
 	} while (0)
-#define DUK_HSTRING_GET_CHARLEN(x)                  duk_hstring_get_charlen((x))
-#define DUK_HSTRING_SET_CHARLEN(x,v) do { \
+#define DUK_HSTRING_GET_CHARLEN(x) duk_hstring_get_charlen((x))
+#define DUK_HSTRING_SET_CHARLEN(x, v) \
+	do { \
 		(x)->clen = (v); \
 	} while (0)
 #endif
 
 #if defined(DUK_USE_HSTRING_EXTDATA)
-#define DUK_HSTRING_GET_EXTDATA(x) \
-	((x)->extdata)
+#define DUK_HSTRING_GET_EXTDATA(x) ((x)->extdata)
 #define DUK_HSTRING_GET_DATA(x) \
-	(DUK_HSTRING_HAS_EXTDATA((x)) ? \
-		DUK_HSTRING_GET_EXTDATA((const duk_hstring_external *) (x)) : ((const duk_uint8_t *) ((x) + 1)))
+	(DUK_HSTRING_HAS_EXTDATA((x)) ? DUK_HSTRING_GET_EXTDATA((const duk_hstring_external *) (x)) : \
+                                        ((const duk_uint8_t *) ((x) + 1)))
 #else
-#define DUK_HSTRING_GET_DATA(x) \
-	((const duk_uint8_t *) ((x) + 1))
+#define DUK_HSTRING_GET_DATA(x) ((const duk_uint8_t *) ((x) + 1))
 #endif
 
-#define DUK_HSTRING_GET_DATA_END(x) \
-	(DUK_HSTRING_GET_DATA((x)) + (x)->blen)
+#define DUK_HSTRING_GET_DATA_END(x) (DUK_HSTRING_GET_DATA((x)) + (x)->blen)
 
 /* Marker value; in E5 2^32-1 is not a valid array index (2^32-2 is highest
  * valid).
  */
-#define DUK_HSTRING_NO_ARRAY_INDEX  (0xffffffffUL)
+#define DUK_HSTRING_NO_ARRAY_INDEX (0xffffffffUL)
 
 #if defined(DUK_USE_HSTRING_ARRIDX)
-#define DUK_HSTRING_GET_ARRIDX_FAST(h)  ((h)->arridx)
-#define DUK_HSTRING_GET_ARRIDX_SLOW(h)  ((h)->arridx)
+#define DUK_HSTRING_GET_ARRIDX_FAST(h) ((h)->arridx)
+#define DUK_HSTRING_GET_ARRIDX_SLOW(h) ((h)->arridx)
 #else
 /* Get array index related to string (or return DUK_HSTRING_NO_ARRAY_INDEX);
  * avoids helper call if string has no array index value.
  */
-#define DUK_HSTRING_GET_ARRIDX_FAST(h)  \
+#define DUK_HSTRING_GET_ARRIDX_FAST(h) \
 	(DUK_HSTRING_HAS_ARRIDX((h)) ? duk_js_to_arrayindex_hstring_fast_known((h)) : DUK_HSTRING_NO_ARRAY_INDEX)
 
 /* Slower but more compact variant. */
-#define DUK_HSTRING_GET_ARRIDX_SLOW(h)  \
-	(duk_js_to_arrayindex_hstring_fast((h)))
+#define DUK_HSTRING_GET_ARRIDX_SLOW(h) (duk_js_to_arrayindex_hstring_fast((h)))
 #endif
 
 /* XXX: these actually fit into duk_hstring */
-#define DUK_SYMBOL_TYPE_HIDDEN 0
-#define DUK_SYMBOL_TYPE_GLOBAL 1
-#define DUK_SYMBOL_TYPE_LOCAL 2
+#define DUK_SYMBOL_TYPE_HIDDEN    0
+#define DUK_SYMBOL_TYPE_GLOBAL    1
+#define DUK_SYMBOL_TYPE_LOCAL     2
 #define DUK_SYMBOL_TYPE_WELLKNOWN 3
 
+/* Assertion for duk_hstring validity. */
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL_DECL void duk_hstring_assert_valid(duk_hstring *h);
+#define DUK_HSTRING_ASSERT_VALID(h) \
+	do { \
+		duk_hstring_assert_valid((h)); \
+	} while (0)
+#else
+#define DUK_HSTRING_ASSERT_VALID(h) \
+	do { \
+	} while (0)
+#endif
+
 /*
  *  Misc
  */
@@ -5995,14 +6535,17 @@ struct duk_hstring_external {
  *  Prototypes
  */
 
-DUK_INTERNAL_DECL duk_ucodepoint_t duk_hstring_char_code_at_raw(duk_hthread *thr, duk_hstring *h, duk_uint_t pos, duk_bool_t surrogate_aware);
+DUK_INTERNAL_DECL duk_ucodepoint_t duk_hstring_char_code_at_raw(duk_hthread *thr,
+                                                                duk_hstring *h,
+                                                                duk_uint_t pos,
+                                                                duk_bool_t surrogate_aware);
 DUK_INTERNAL_DECL duk_bool_t duk_hstring_equals_ascii_cstring(duk_hstring *h, const char *cstr);
 DUK_INTERNAL_DECL duk_size_t duk_hstring_get_charlen(duk_hstring *h);
 #if !defined(DUK_USE_HSTRING_LAZY_CLEN)
 DUK_INTERNAL_DECL void duk_hstring_init_charlen(duk_hstring *h);
 #endif
 
-#endif  /* DUK_HSTRING_H_INCLUDED */
+#endif /* DUK_HSTRING_H_INCLUDED */
 /* #include duk_hobject.h */
 /*
  *  Heap object representation.
@@ -6045,36 +6588,40 @@ DUK_INTERNAL_DECL void duk_hstring_init_charlen(duk_hstring *h);
 /* XXX: some flags are object subtype specific (e.g. common to all function
  * subtypes, duk_harray, etc) and could be reused for different subtypes.
  */
-#define DUK_HOBJECT_FLAG_EXTENSIBLE            DUK_HEAPHDR_USER_FLAG(0)   /* object is extensible */
-#define DUK_HOBJECT_FLAG_CONSTRUCTABLE         DUK_HEAPHDR_USER_FLAG(1)   /* object is constructable */
-#define DUK_HOBJECT_FLAG_CALLABLE              DUK_HEAPHDR_USER_FLAG(2)   /* object is callable */
-#define DUK_HOBJECT_FLAG_BOUNDFUNC             DUK_HEAPHDR_USER_FLAG(3)   /* object established using Function.prototype.bind() */
-#define DUK_HOBJECT_FLAG_COMPFUNC              DUK_HEAPHDR_USER_FLAG(4)   /* object is a compiled function (duk_hcompfunc) */
-#define DUK_HOBJECT_FLAG_NATFUNC               DUK_HEAPHDR_USER_FLAG(5)   /* object is a native function (duk_hnatfunc) */
-#define DUK_HOBJECT_FLAG_BUFOBJ                DUK_HEAPHDR_USER_FLAG(6)   /* object is a buffer object (duk_hbufobj) (always exotic) */
-#define DUK_HOBJECT_FLAG_FASTREFS              DUK_HEAPHDR_USER_FLAG(7)   /* object has no fields needing DECREF/marking beyond base duk_hobject header */
-#define DUK_HOBJECT_FLAG_ARRAY_PART            DUK_HEAPHDR_USER_FLAG(8)   /* object has an array part (a_size may still be 0) */
-#define DUK_HOBJECT_FLAG_STRICT                DUK_HEAPHDR_USER_FLAG(9)   /* function: function object is strict */
-#define DUK_HOBJECT_FLAG_NOTAIL                DUK_HEAPHDR_USER_FLAG(10)  /* function: function must not be tail called */
-#define DUK_HOBJECT_FLAG_NEWENV                DUK_HEAPHDR_USER_FLAG(11)  /* function: create new environment when called (see duk_hcompfunc) */
-#define DUK_HOBJECT_FLAG_NAMEBINDING           DUK_HEAPHDR_USER_FLAG(12)  /* function: create binding for func name (function templates only, used for named function expressions) */
-#define DUK_HOBJECT_FLAG_CREATEARGS            DUK_HEAPHDR_USER_FLAG(13)  /* function: create an arguments object on function call */
-#define DUK_HOBJECT_FLAG_HAVE_FINALIZER        DUK_HEAPHDR_USER_FLAG(14)  /* object has a callable (own) finalizer property */
-#define DUK_HOBJECT_FLAG_EXOTIC_ARRAY          DUK_HEAPHDR_USER_FLAG(15)  /* 'Array' object, array length and index exotic behavior */
-#define DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ      DUK_HEAPHDR_USER_FLAG(16)  /* 'String' object, array index exotic behavior */
-#define DUK_HOBJECT_FLAG_EXOTIC_ARGUMENTS      DUK_HEAPHDR_USER_FLAG(17)  /* 'Arguments' object and has arguments exotic behavior (non-strict callee) */
-#define DUK_HOBJECT_FLAG_EXOTIC_PROXYOBJ       DUK_HEAPHDR_USER_FLAG(18)  /* 'Proxy' object */
-#define DUK_HOBJECT_FLAG_SPECIAL_CALL          DUK_HEAPHDR_USER_FLAG(19)  /* special casing in call behavior, for .call(), .apply(), etc. */
-
-#define DUK_HOBJECT_FLAG_CLASS_BASE            DUK_HEAPHDR_USER_FLAG_NUMBER(20)
-#define DUK_HOBJECT_FLAG_CLASS_BITS            5
-
-#define DUK_HOBJECT_GET_CLASS_NUMBER(h)        \
+#define DUK_HOBJECT_FLAG_EXTENSIBLE    DUK_HEAPHDR_USER_FLAG(0) /* object is extensible */
+#define DUK_HOBJECT_FLAG_CONSTRUCTABLE DUK_HEAPHDR_USER_FLAG(1) /* object is constructable */
+#define DUK_HOBJECT_FLAG_CALLABLE      DUK_HEAPHDR_USER_FLAG(2) /* object is callable */
+#define DUK_HOBJECT_FLAG_BOUNDFUNC     DUK_HEAPHDR_USER_FLAG(3) /* object established using Function.prototype.bind() */
+#define DUK_HOBJECT_FLAG_COMPFUNC      DUK_HEAPHDR_USER_FLAG(4) /* object is a compiled function (duk_hcompfunc) */
+#define DUK_HOBJECT_FLAG_NATFUNC       DUK_HEAPHDR_USER_FLAG(5) /* object is a native function (duk_hnatfunc) */
+#define DUK_HOBJECT_FLAG_BUFOBJ        DUK_HEAPHDR_USER_FLAG(6) /* object is a buffer object (duk_hbufobj) (always exotic) */
+#define DUK_HOBJECT_FLAG_FASTREFS \
+	DUK_HEAPHDR_USER_FLAG(7) /* object has no fields needing DECREF/marking beyond base duk_hobject header */
+#define DUK_HOBJECT_FLAG_ARRAY_PART DUK_HEAPHDR_USER_FLAG(8) /* object has an array part (a_size may still be 0) */
+#define DUK_HOBJECT_FLAG_STRICT     DUK_HEAPHDR_USER_FLAG(9) /* function: function object is strict */
+#define DUK_HOBJECT_FLAG_NOTAIL     DUK_HEAPHDR_USER_FLAG(10) /* function: function must not be tail called */
+#define DUK_HOBJECT_FLAG_NEWENV     DUK_HEAPHDR_USER_FLAG(11) /* function: create new environment when called (see duk_hcompfunc) */
+#define DUK_HOBJECT_FLAG_NAMEBINDING \
+	DUK_HEAPHDR_USER_FLAG( \
+	    12) /* function: create binding for func name (function templates only, used for named function expressions) */
+#define DUK_HOBJECT_FLAG_CREATEARGS       DUK_HEAPHDR_USER_FLAG(13) /* function: create an arguments object on function call */
+#define DUK_HOBJECT_FLAG_HAVE_FINALIZER   DUK_HEAPHDR_USER_FLAG(14) /* object has a callable (own) finalizer property */
+#define DUK_HOBJECT_FLAG_EXOTIC_ARRAY     DUK_HEAPHDR_USER_FLAG(15) /* 'Array' object, array length and index exotic behavior */
+#define DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ DUK_HEAPHDR_USER_FLAG(16) /* 'String' object, array index exotic behavior */
+#define DUK_HOBJECT_FLAG_EXOTIC_ARGUMENTS \
+	DUK_HEAPHDR_USER_FLAG(17) /* 'Arguments' object and has arguments exotic behavior (non-strict callee) */
+#define DUK_HOBJECT_FLAG_EXOTIC_PROXYOBJ DUK_HEAPHDR_USER_FLAG(18) /* 'Proxy' object */
+#define DUK_HOBJECT_FLAG_SPECIAL_CALL    DUK_HEAPHDR_USER_FLAG(19) /* special casing in call behavior, for .call(), .apply(), etc. */
+
+#define DUK_HOBJECT_FLAG_CLASS_BASE DUK_HEAPHDR_USER_FLAG_NUMBER(20)
+#define DUK_HOBJECT_FLAG_CLASS_BITS 5
+
+#define DUK_HOBJECT_GET_CLASS_NUMBER(h) \
 	DUK_HEAPHDR_GET_FLAG_RANGE(&(h)->hdr, DUK_HOBJECT_FLAG_CLASS_BASE, DUK_HOBJECT_FLAG_CLASS_BITS)
-#define DUK_HOBJECT_SET_CLASS_NUMBER(h,v)      \
+#define DUK_HOBJECT_SET_CLASS_NUMBER(h, v) \
 	DUK_HEAPHDR_SET_FLAG_RANGE(&(h)->hdr, DUK_HOBJECT_FLAG_CLASS_BASE, DUK_HOBJECT_FLAG_CLASS_BITS, (v))
 
-#define DUK_HOBJECT_GET_CLASS_MASK(h)          \
+#define DUK_HOBJECT_GET_CLASS_MASK(h) \
 	(1UL << DUK_HEAPHDR_GET_FLAG_RANGE(&(h)->hdr, DUK_HOBJECT_FLAG_CLASS_BASE, DUK_HOBJECT_FLAG_CLASS_BITS))
 
 /* Macro for creating flag initializer from a class number.
@@ -6082,256 +6629,239 @@ DUK_INTERNAL_DECL void duk_hstring_init_charlen(duk_hstring *h);
  * a signed integer to an unsigned one; the largest class values
  * have the highest bit (bit 31) set which causes this.
  */
-#define DUK_HOBJECT_CLASS_AS_FLAGS(v)          (((duk_uint_t) (v)) << DUK_HOBJECT_FLAG_CLASS_BASE)
+#define DUK_HOBJECT_CLASS_AS_FLAGS(v) (((duk_uint_t) (v)) << DUK_HOBJECT_FLAG_CLASS_BASE)
 
 /* E5 Section 8.6.2 + custom classes */
-#define DUK_HOBJECT_CLASS_NONE                 0
-#define DUK_HOBJECT_CLASS_OBJECT               1
-#define DUK_HOBJECT_CLASS_ARRAY                2
-#define DUK_HOBJECT_CLASS_FUNCTION             3
-#define DUK_HOBJECT_CLASS_ARGUMENTS            4
-#define DUK_HOBJECT_CLASS_BOOLEAN              5
-#define DUK_HOBJECT_CLASS_DATE                 6
-#define DUK_HOBJECT_CLASS_ERROR                7
-#define DUK_HOBJECT_CLASS_JSON                 8
-#define DUK_HOBJECT_CLASS_MATH                 9
-#define DUK_HOBJECT_CLASS_NUMBER               10
-#define DUK_HOBJECT_CLASS_REGEXP               11
-#define DUK_HOBJECT_CLASS_STRING               12
-#define DUK_HOBJECT_CLASS_GLOBAL               13
-#define DUK_HOBJECT_CLASS_SYMBOL               14
-#define DUK_HOBJECT_CLASS_OBJENV               15  /* custom */
-#define DUK_HOBJECT_CLASS_DECENV               16  /* custom */
-#define DUK_HOBJECT_CLASS_POINTER              17  /* custom */
-#define DUK_HOBJECT_CLASS_THREAD               18  /* custom; implies DUK_HOBJECT_IS_THREAD */
-#define DUK_HOBJECT_CLASS_BUFOBJ_MIN           19
-#define DUK_HOBJECT_CLASS_ARRAYBUFFER          19  /* implies DUK_HOBJECT_IS_BUFOBJ */
-#define DUK_HOBJECT_CLASS_DATAVIEW             20
-#define DUK_HOBJECT_CLASS_INT8ARRAY            21
-#define DUK_HOBJECT_CLASS_UINT8ARRAY           22
-#define DUK_HOBJECT_CLASS_UINT8CLAMPEDARRAY    23
-#define DUK_HOBJECT_CLASS_INT16ARRAY           24
-#define DUK_HOBJECT_CLASS_UINT16ARRAY          25
-#define DUK_HOBJECT_CLASS_INT32ARRAY           26
-#define DUK_HOBJECT_CLASS_UINT32ARRAY          27
-#define DUK_HOBJECT_CLASS_FLOAT32ARRAY         28
-#define DUK_HOBJECT_CLASS_FLOAT64ARRAY         29
-#define DUK_HOBJECT_CLASS_BUFOBJ_MAX           29
-#define DUK_HOBJECT_CLASS_MAX                  29
+#define DUK_HOBJECT_CLASS_NONE              0
+#define DUK_HOBJECT_CLASS_OBJECT            1
+#define DUK_HOBJECT_CLASS_ARRAY             2
+#define DUK_HOBJECT_CLASS_FUNCTION          3
+#define DUK_HOBJECT_CLASS_ARGUMENTS         4
+#define DUK_HOBJECT_CLASS_BOOLEAN           5
+#define DUK_HOBJECT_CLASS_DATE              6
+#define DUK_HOBJECT_CLASS_ERROR             7
+#define DUK_HOBJECT_CLASS_JSON              8
+#define DUK_HOBJECT_CLASS_MATH              9
+#define DUK_HOBJECT_CLASS_NUMBER            10
+#define DUK_HOBJECT_CLASS_REGEXP            11
+#define DUK_HOBJECT_CLASS_STRING            12
+#define DUK_HOBJECT_CLASS_GLOBAL            13
+#define DUK_HOBJECT_CLASS_SYMBOL            14
+#define DUK_HOBJECT_CLASS_OBJENV            15 /* custom */
+#define DUK_HOBJECT_CLASS_DECENV            16 /* custom */
+#define DUK_HOBJECT_CLASS_POINTER           17 /* custom */
+#define DUK_HOBJECT_CLASS_THREAD            18 /* custom; implies DUK_HOBJECT_IS_THREAD */
+#define DUK_HOBJECT_CLASS_BUFOBJ_MIN        19
+#define DUK_HOBJECT_CLASS_ARRAYBUFFER       19 /* implies DUK_HOBJECT_IS_BUFOBJ */
+#define DUK_HOBJECT_CLASS_DATAVIEW          20
+#define DUK_HOBJECT_CLASS_INT8ARRAY         21
+#define DUK_HOBJECT_CLASS_UINT8ARRAY        22
+#define DUK_HOBJECT_CLASS_UINT8CLAMPEDARRAY 23
+#define DUK_HOBJECT_CLASS_INT16ARRAY        24
+#define DUK_HOBJECT_CLASS_UINT16ARRAY       25
+#define DUK_HOBJECT_CLASS_INT32ARRAY        26
+#define DUK_HOBJECT_CLASS_UINT32ARRAY       27
+#define DUK_HOBJECT_CLASS_FLOAT32ARRAY      28
+#define DUK_HOBJECT_CLASS_FLOAT64ARRAY      29
+#define DUK_HOBJECT_CLASS_BUFOBJ_MAX        29
+#define DUK_HOBJECT_CLASS_MAX               29
 
 /* Class masks. */
-#define DUK_HOBJECT_CMASK_ALL                  ((1UL << (DUK_HOBJECT_CLASS_MAX + 1)) - 1UL)
-#define DUK_HOBJECT_CMASK_NONE                 (1UL << DUK_HOBJECT_CLASS_NONE)
-#define DUK_HOBJECT_CMASK_ARGUMENTS            (1UL << DUK_HOBJECT_CLASS_ARGUMENTS)
-#define DUK_HOBJECT_CMASK_ARRAY                (1UL << DUK_HOBJECT_CLASS_ARRAY)
-#define DUK_HOBJECT_CMASK_BOOLEAN              (1UL << DUK_HOBJECT_CLASS_BOOLEAN)
-#define DUK_HOBJECT_CMASK_DATE                 (1UL << DUK_HOBJECT_CLASS_DATE)
-#define DUK_HOBJECT_CMASK_ERROR                (1UL << DUK_HOBJECT_CLASS_ERROR)
-#define DUK_HOBJECT_CMASK_FUNCTION             (1UL << DUK_HOBJECT_CLASS_FUNCTION)
-#define DUK_HOBJECT_CMASK_JSON                 (1UL << DUK_HOBJECT_CLASS_JSON)
-#define DUK_HOBJECT_CMASK_MATH                 (1UL << DUK_HOBJECT_CLASS_MATH)
-#define DUK_HOBJECT_CMASK_NUMBER               (1UL << DUK_HOBJECT_CLASS_NUMBER)
-#define DUK_HOBJECT_CMASK_OBJECT               (1UL << DUK_HOBJECT_CLASS_OBJECT)
-#define DUK_HOBJECT_CMASK_REGEXP               (1UL << DUK_HOBJECT_CLASS_REGEXP)
-#define DUK_HOBJECT_CMASK_STRING               (1UL << DUK_HOBJECT_CLASS_STRING)
-#define DUK_HOBJECT_CMASK_GLOBAL               (1UL << DUK_HOBJECT_CLASS_GLOBAL)
-#define DUK_HOBJECT_CMASK_SYMBOL               (1UL << DUK_HOBJECT_CLASS_SYMBOL)
-#define DUK_HOBJECT_CMASK_OBJENV               (1UL << DUK_HOBJECT_CLASS_OBJENV)
-#define DUK_HOBJECT_CMASK_DECENV               (1UL << DUK_HOBJECT_CLASS_DECENV)
-#define DUK_HOBJECT_CMASK_POINTER              (1UL << DUK_HOBJECT_CLASS_POINTER)
-#define DUK_HOBJECT_CMASK_ARRAYBUFFER          (1UL << DUK_HOBJECT_CLASS_ARRAYBUFFER)
-#define DUK_HOBJECT_CMASK_DATAVIEW             (1UL << DUK_HOBJECT_CLASS_DATAVIEW)
-#define DUK_HOBJECT_CMASK_INT8ARRAY            (1UL << DUK_HOBJECT_CLASS_INT8ARRAY)
-#define DUK_HOBJECT_CMASK_UINT8ARRAY           (1UL << DUK_HOBJECT_CLASS_UINT8ARRAY)
-#define DUK_HOBJECT_CMASK_UINT8CLAMPEDARRAY    (1UL << DUK_HOBJECT_CLASS_UINT8CLAMPEDARRAY)
-#define DUK_HOBJECT_CMASK_INT16ARRAY           (1UL << DUK_HOBJECT_CLASS_INT16ARRAY)
-#define DUK_HOBJECT_CMASK_UINT16ARRAY          (1UL << DUK_HOBJECT_CLASS_UINT16ARRAY)
-#define DUK_HOBJECT_CMASK_INT32ARRAY           (1UL << DUK_HOBJECT_CLASS_INT32ARRAY)
-#define DUK_HOBJECT_CMASK_UINT32ARRAY          (1UL << DUK_HOBJECT_CLASS_UINT32ARRAY)
-#define DUK_HOBJECT_CMASK_FLOAT32ARRAY         (1UL << DUK_HOBJECT_CLASS_FLOAT32ARRAY)
-#define DUK_HOBJECT_CMASK_FLOAT64ARRAY         (1UL << DUK_HOBJECT_CLASS_FLOAT64ARRAY)
+#define DUK_HOBJECT_CMASK_ALL               ((1UL << (DUK_HOBJECT_CLASS_MAX + 1)) - 1UL)
+#define DUK_HOBJECT_CMASK_NONE              (1UL << DUK_HOBJECT_CLASS_NONE)
+#define DUK_HOBJECT_CMASK_ARGUMENTS         (1UL << DUK_HOBJECT_CLASS_ARGUMENTS)
+#define DUK_HOBJECT_CMASK_ARRAY             (1UL << DUK_HOBJECT_CLASS_ARRAY)
+#define DUK_HOBJECT_CMASK_BOOLEAN           (1UL << DUK_HOBJECT_CLASS_BOOLEAN)
+#define DUK_HOBJECT_CMASK_DATE              (1UL << DUK_HOBJECT_CLASS_DATE)
+#define DUK_HOBJECT_CMASK_ERROR             (1UL << DUK_HOBJECT_CLASS_ERROR)
+#define DUK_HOBJECT_CMASK_FUNCTION          (1UL << DUK_HOBJECT_CLASS_FUNCTION)
+#define DUK_HOBJECT_CMASK_JSON              (1UL << DUK_HOBJECT_CLASS_JSON)
+#define DUK_HOBJECT_CMASK_MATH              (1UL << DUK_HOBJECT_CLASS_MATH)
+#define DUK_HOBJECT_CMASK_NUMBER            (1UL << DUK_HOBJECT_CLASS_NUMBER)
+#define DUK_HOBJECT_CMASK_OBJECT            (1UL << DUK_HOBJECT_CLASS_OBJECT)
+#define DUK_HOBJECT_CMASK_REGEXP            (1UL << DUK_HOBJECT_CLASS_REGEXP)
+#define DUK_HOBJECT_CMASK_STRING            (1UL << DUK_HOBJECT_CLASS_STRING)
+#define DUK_HOBJECT_CMASK_GLOBAL            (1UL << DUK_HOBJECT_CLASS_GLOBAL)
+#define DUK_HOBJECT_CMASK_SYMBOL            (1UL << DUK_HOBJECT_CLASS_SYMBOL)
+#define DUK_HOBJECT_CMASK_OBJENV            (1UL << DUK_HOBJECT_CLASS_OBJENV)
+#define DUK_HOBJECT_CMASK_DECENV            (1UL << DUK_HOBJECT_CLASS_DECENV)
+#define DUK_HOBJECT_CMASK_POINTER           (1UL << DUK_HOBJECT_CLASS_POINTER)
+#define DUK_HOBJECT_CMASK_ARRAYBUFFER       (1UL << DUK_HOBJECT_CLASS_ARRAYBUFFER)
+#define DUK_HOBJECT_CMASK_DATAVIEW          (1UL << DUK_HOBJECT_CLASS_DATAVIEW)
+#define DUK_HOBJECT_CMASK_INT8ARRAY         (1UL << DUK_HOBJECT_CLASS_INT8ARRAY)
+#define DUK_HOBJECT_CMASK_UINT8ARRAY        (1UL << DUK_HOBJECT_CLASS_UINT8ARRAY)
+#define DUK_HOBJECT_CMASK_UINT8CLAMPEDARRAY (1UL << DUK_HOBJECT_CLASS_UINT8CLAMPEDARRAY)
+#define DUK_HOBJECT_CMASK_INT16ARRAY        (1UL << DUK_HOBJECT_CLASS_INT16ARRAY)
+#define DUK_HOBJECT_CMASK_UINT16ARRAY       (1UL << DUK_HOBJECT_CLASS_UINT16ARRAY)
+#define DUK_HOBJECT_CMASK_INT32ARRAY        (1UL << DUK_HOBJECT_CLASS_INT32ARRAY)
+#define DUK_HOBJECT_CMASK_UINT32ARRAY       (1UL << DUK_HOBJECT_CLASS_UINT32ARRAY)
+#define DUK_HOBJECT_CMASK_FLOAT32ARRAY      (1UL << DUK_HOBJECT_CLASS_FLOAT32ARRAY)
+#define DUK_HOBJECT_CMASK_FLOAT64ARRAY      (1UL << DUK_HOBJECT_CLASS_FLOAT64ARRAY)
 
 #define DUK_HOBJECT_CMASK_ALL_BUFOBJS \
-	(DUK_HOBJECT_CMASK_ARRAYBUFFER | \
-	 DUK_HOBJECT_CMASK_DATAVIEW | \
-	 DUK_HOBJECT_CMASK_INT8ARRAY | \
-	 DUK_HOBJECT_CMASK_UINT8ARRAY | \
-	 DUK_HOBJECT_CMASK_UINT8CLAMPEDARRAY | \
-	 DUK_HOBJECT_CMASK_INT16ARRAY | \
-	 DUK_HOBJECT_CMASK_UINT16ARRAY | \
-	 DUK_HOBJECT_CMASK_INT32ARRAY | \
-	 DUK_HOBJECT_CMASK_UINT32ARRAY | \
-	 DUK_HOBJECT_CMASK_FLOAT32ARRAY | \
+	(DUK_HOBJECT_CMASK_ARRAYBUFFER | DUK_HOBJECT_CMASK_DATAVIEW | DUK_HOBJECT_CMASK_INT8ARRAY | DUK_HOBJECT_CMASK_UINT8ARRAY | \
+	 DUK_HOBJECT_CMASK_UINT8CLAMPEDARRAY | DUK_HOBJECT_CMASK_INT16ARRAY | DUK_HOBJECT_CMASK_UINT16ARRAY | \
+	 DUK_HOBJECT_CMASK_INT32ARRAY | DUK_HOBJECT_CMASK_UINT32ARRAY | DUK_HOBJECT_CMASK_FLOAT32ARRAY | \
 	 DUK_HOBJECT_CMASK_FLOAT64ARRAY)
 
-#define DUK_HOBJECT_IS_OBJENV(h)               (DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_OBJENV)
-#define DUK_HOBJECT_IS_DECENV(h)               (DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_DECENV)
-#define DUK_HOBJECT_IS_ENV(h)                  (DUK_HOBJECT_IS_OBJENV((h)) || DUK_HOBJECT_IS_DECENV((h)))
-#define DUK_HOBJECT_IS_ARRAY(h)                DUK_HOBJECT_HAS_EXOTIC_ARRAY((h))  /* Rely on class Array <=> exotic Array */
-#define DUK_HOBJECT_IS_BOUNDFUNC(h)            DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BOUNDFUNC)
-#define DUK_HOBJECT_IS_COMPFUNC(h)             DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_COMPFUNC)
-#define DUK_HOBJECT_IS_NATFUNC(h)              DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NATFUNC)
+#define DUK_HOBJECT_IS_OBJENV(h)    (DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_OBJENV)
+#define DUK_HOBJECT_IS_DECENV(h)    (DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_DECENV)
+#define DUK_HOBJECT_IS_ENV(h)       (DUK_HOBJECT_IS_OBJENV((h)) || DUK_HOBJECT_IS_DECENV((h)))
+#define DUK_HOBJECT_IS_ARRAY(h)     DUK_HOBJECT_HAS_EXOTIC_ARRAY((h)) /* Rely on class Array <=> exotic Array */
+#define DUK_HOBJECT_IS_BOUNDFUNC(h) DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BOUNDFUNC)
+#define DUK_HOBJECT_IS_COMPFUNC(h)  DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_COMPFUNC)
+#define DUK_HOBJECT_IS_NATFUNC(h)   DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NATFUNC)
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
-#define DUK_HOBJECT_IS_BUFOBJ(h)               DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BUFOBJ)
+#define DUK_HOBJECT_IS_BUFOBJ(h) DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BUFOBJ)
 #else
-#define DUK_HOBJECT_IS_BUFOBJ(h)               0
+#define DUK_HOBJECT_IS_BUFOBJ(h) 0
 #endif
-#define DUK_HOBJECT_IS_THREAD(h)               (DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_THREAD)
+#define DUK_HOBJECT_IS_THREAD(h) (DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_THREAD)
 #if defined(DUK_USE_ES6_PROXY)
-#define DUK_HOBJECT_IS_PROXY(h)                DUK_HOBJECT_HAS_EXOTIC_PROXYOBJ((h))
+#define DUK_HOBJECT_IS_PROXY(h) DUK_HOBJECT_HAS_EXOTIC_PROXYOBJ((h))
 #else
-#define DUK_HOBJECT_IS_PROXY(h)                0
+#define DUK_HOBJECT_IS_PROXY(h) 0
 #endif
 
-#define DUK_HOBJECT_IS_NONBOUND_FUNCTION(h)    DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, \
-                                                        DUK_HOBJECT_FLAG_COMPFUNC | \
-                                                        DUK_HOBJECT_FLAG_NATFUNC)
+#define DUK_HOBJECT_IS_NONBOUND_FUNCTION(h) \
+	DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_COMPFUNC | DUK_HOBJECT_FLAG_NATFUNC)
 
-#define DUK_HOBJECT_IS_FUNCTION(h)             DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, \
-                                                        DUK_HOBJECT_FLAG_BOUNDFUNC | \
-                                                        DUK_HOBJECT_FLAG_COMPFUNC | \
-                                                        DUK_HOBJECT_FLAG_NATFUNC)
+#define DUK_HOBJECT_IS_FUNCTION(h) \
+	DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BOUNDFUNC | DUK_HOBJECT_FLAG_COMPFUNC | DUK_HOBJECT_FLAG_NATFUNC)
 
-#define DUK_HOBJECT_IS_CALLABLE(h)             DUK_HOBJECT_HAS_CALLABLE((h))
+#define DUK_HOBJECT_IS_CALLABLE(h) DUK_HOBJECT_HAS_CALLABLE((h))
 
 /* Object has any exotic behavior(s). */
-#define DUK_HOBJECT_EXOTIC_BEHAVIOR_FLAGS      (DUK_HOBJECT_FLAG_EXOTIC_ARRAY | \
-                                                DUK_HOBJECT_FLAG_EXOTIC_ARGUMENTS | \
-                                                DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ | \
-                                                DUK_HOBJECT_FLAG_BUFOBJ | \
-                                                DUK_HOBJECT_FLAG_EXOTIC_PROXYOBJ)
-#define DUK_HOBJECT_HAS_EXOTIC_BEHAVIOR(h)     DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_EXOTIC_BEHAVIOR_FLAGS)
+#define DUK_HOBJECT_EXOTIC_BEHAVIOR_FLAGS \
+	(DUK_HOBJECT_FLAG_EXOTIC_ARRAY | DUK_HOBJECT_FLAG_EXOTIC_ARGUMENTS | DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ | \
+	 DUK_HOBJECT_FLAG_BUFOBJ | DUK_HOBJECT_FLAG_EXOTIC_PROXYOBJ)
+#define DUK_HOBJECT_HAS_EXOTIC_BEHAVIOR(h) DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_EXOTIC_BEHAVIOR_FLAGS)
 
 /* Object has any virtual properties (not counting Proxy behavior). */
-#define DUK_HOBJECT_VIRTUAL_PROPERTY_FLAGS     (DUK_HOBJECT_FLAG_EXOTIC_ARRAY | \
-                                                DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ | \
-                                                DUK_HOBJECT_FLAG_BUFOBJ)
-#define DUK_HOBJECT_HAS_VIRTUAL_PROPERTIES(h)  DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_VIRTUAL_PROPERTY_FLAGS)
-
-#define DUK_HOBJECT_HAS_EXTENSIBLE(h)          DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXTENSIBLE)
-#define DUK_HOBJECT_HAS_CONSTRUCTABLE(h)       DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CONSTRUCTABLE)
-#define DUK_HOBJECT_HAS_CALLABLE(h)            DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CALLABLE)
-#define DUK_HOBJECT_HAS_BOUNDFUNC(h)           DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BOUNDFUNC)
-#define DUK_HOBJECT_HAS_COMPFUNC(h)            DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_COMPFUNC)
-#define DUK_HOBJECT_HAS_NATFUNC(h)             DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NATFUNC)
+#define DUK_HOBJECT_VIRTUAL_PROPERTY_FLAGS \
+	(DUK_HOBJECT_FLAG_EXOTIC_ARRAY | DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ | DUK_HOBJECT_FLAG_BUFOBJ)
+#define DUK_HOBJECT_HAS_VIRTUAL_PROPERTIES(h) DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_VIRTUAL_PROPERTY_FLAGS)
+
+#define DUK_HOBJECT_HAS_EXTENSIBLE(h)    DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXTENSIBLE)
+#define DUK_HOBJECT_HAS_CONSTRUCTABLE(h) DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CONSTRUCTABLE)
+#define DUK_HOBJECT_HAS_CALLABLE(h)      DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CALLABLE)
+#define DUK_HOBJECT_HAS_BOUNDFUNC(h)     DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BOUNDFUNC)
+#define DUK_HOBJECT_HAS_COMPFUNC(h)      DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_COMPFUNC)
+#define DUK_HOBJECT_HAS_NATFUNC(h)       DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NATFUNC)
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
-#define DUK_HOBJECT_HAS_BUFOBJ(h)              DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BUFOBJ)
+#define DUK_HOBJECT_HAS_BUFOBJ(h) DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BUFOBJ)
 #else
-#define DUK_HOBJECT_HAS_BUFOBJ(h)              0
-#endif
-#define DUK_HOBJECT_HAS_FASTREFS(h)            DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_FASTREFS)
-#define DUK_HOBJECT_HAS_ARRAY_PART(h)          DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_ARRAY_PART)
-#define DUK_HOBJECT_HAS_STRICT(h)              DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_STRICT)
-#define DUK_HOBJECT_HAS_NOTAIL(h)              DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NOTAIL)
-#define DUK_HOBJECT_HAS_NEWENV(h)              DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NEWENV)
-#define DUK_HOBJECT_HAS_NAMEBINDING(h)         DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NAMEBINDING)
-#define DUK_HOBJECT_HAS_CREATEARGS(h)          DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CREATEARGS)
-#define DUK_HOBJECT_HAS_HAVE_FINALIZER(h)      DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_HAVE_FINALIZER)
-#define DUK_HOBJECT_HAS_EXOTIC_ARRAY(h)        DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_ARRAY)
-#define DUK_HOBJECT_HAS_EXOTIC_STRINGOBJ(h)    DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ)
-#define DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(h)    DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_ARGUMENTS)
+#define DUK_HOBJECT_HAS_BUFOBJ(h) 0
+#endif
+#define DUK_HOBJECT_HAS_FASTREFS(h)         DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_FASTREFS)
+#define DUK_HOBJECT_HAS_ARRAY_PART(h)       DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_ARRAY_PART)
+#define DUK_HOBJECT_HAS_STRICT(h)           DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_STRICT)
+#define DUK_HOBJECT_HAS_NOTAIL(h)           DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NOTAIL)
+#define DUK_HOBJECT_HAS_NEWENV(h)           DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NEWENV)
+#define DUK_HOBJECT_HAS_NAMEBINDING(h)      DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NAMEBINDING)
+#define DUK_HOBJECT_HAS_CREATEARGS(h)       DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CREATEARGS)
+#define DUK_HOBJECT_HAS_HAVE_FINALIZER(h)   DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_HAVE_FINALIZER)
+#define DUK_HOBJECT_HAS_EXOTIC_ARRAY(h)     DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_ARRAY)
+#define DUK_HOBJECT_HAS_EXOTIC_STRINGOBJ(h) DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ)
+#define DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(h) DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_ARGUMENTS)
 #if defined(DUK_USE_ES6_PROXY)
-#define DUK_HOBJECT_HAS_EXOTIC_PROXYOBJ(h)     DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_PROXYOBJ)
+#define DUK_HOBJECT_HAS_EXOTIC_PROXYOBJ(h) DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_PROXYOBJ)
 #else
-#define DUK_HOBJECT_HAS_EXOTIC_PROXYOBJ(h)     0
+#define DUK_HOBJECT_HAS_EXOTIC_PROXYOBJ(h) 0
 #endif
-#define DUK_HOBJECT_HAS_SPECIAL_CALL(h)        DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_SPECIAL_CALL)
+#define DUK_HOBJECT_HAS_SPECIAL_CALL(h) DUK_HEAPHDR_CHECK_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_SPECIAL_CALL)
 
-#define DUK_HOBJECT_SET_EXTENSIBLE(h)          DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXTENSIBLE)
-#define DUK_HOBJECT_SET_CONSTRUCTABLE(h)       DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CONSTRUCTABLE)
-#define DUK_HOBJECT_SET_CALLABLE(h)            DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CALLABLE)
-#define DUK_HOBJECT_SET_BOUNDFUNC(h)           DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BOUNDFUNC)
-#define DUK_HOBJECT_SET_COMPFUNC(h)            DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_COMPFUNC)
-#define DUK_HOBJECT_SET_NATFUNC(h)             DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NATFUNC)
+#define DUK_HOBJECT_SET_EXTENSIBLE(h)    DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXTENSIBLE)
+#define DUK_HOBJECT_SET_CONSTRUCTABLE(h) DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CONSTRUCTABLE)
+#define DUK_HOBJECT_SET_CALLABLE(h)      DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CALLABLE)
+#define DUK_HOBJECT_SET_BOUNDFUNC(h)     DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BOUNDFUNC)
+#define DUK_HOBJECT_SET_COMPFUNC(h)      DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_COMPFUNC)
+#define DUK_HOBJECT_SET_NATFUNC(h)       DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NATFUNC)
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
-#define DUK_HOBJECT_SET_BUFOBJ(h)              DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BUFOBJ)
-#endif
-#define DUK_HOBJECT_SET_FASTREFS(h)            DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_FASTREFS)
-#define DUK_HOBJECT_SET_ARRAY_PART(h)          DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_ARRAY_PART)
-#define DUK_HOBJECT_SET_STRICT(h)              DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_STRICT)
-#define DUK_HOBJECT_SET_NOTAIL(h)              DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NOTAIL)
-#define DUK_HOBJECT_SET_NEWENV(h)              DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NEWENV)
-#define DUK_HOBJECT_SET_NAMEBINDING(h)         DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NAMEBINDING)
-#define DUK_HOBJECT_SET_CREATEARGS(h)          DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CREATEARGS)
-#define DUK_HOBJECT_SET_HAVE_FINALIZER(h)      DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_HAVE_FINALIZER)
-#define DUK_HOBJECT_SET_EXOTIC_ARRAY(h)        DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_ARRAY)
-#define DUK_HOBJECT_SET_EXOTIC_STRINGOBJ(h)    DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ)
-#define DUK_HOBJECT_SET_EXOTIC_ARGUMENTS(h)    DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_ARGUMENTS)
+#define DUK_HOBJECT_SET_BUFOBJ(h) DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BUFOBJ)
+#endif
+#define DUK_HOBJECT_SET_FASTREFS(h)         DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_FASTREFS)
+#define DUK_HOBJECT_SET_ARRAY_PART(h)       DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_ARRAY_PART)
+#define DUK_HOBJECT_SET_STRICT(h)           DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_STRICT)
+#define DUK_HOBJECT_SET_NOTAIL(h)           DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NOTAIL)
+#define DUK_HOBJECT_SET_NEWENV(h)           DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NEWENV)
+#define DUK_HOBJECT_SET_NAMEBINDING(h)      DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NAMEBINDING)
+#define DUK_HOBJECT_SET_CREATEARGS(h)       DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CREATEARGS)
+#define DUK_HOBJECT_SET_HAVE_FINALIZER(h)   DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_HAVE_FINALIZER)
+#define DUK_HOBJECT_SET_EXOTIC_ARRAY(h)     DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_ARRAY)
+#define DUK_HOBJECT_SET_EXOTIC_STRINGOBJ(h) DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ)
+#define DUK_HOBJECT_SET_EXOTIC_ARGUMENTS(h) DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_ARGUMENTS)
 #if defined(DUK_USE_ES6_PROXY)
-#define DUK_HOBJECT_SET_EXOTIC_PROXYOBJ(h)     DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_PROXYOBJ)
+#define DUK_HOBJECT_SET_EXOTIC_PROXYOBJ(h) DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_PROXYOBJ)
 #endif
-#define DUK_HOBJECT_SET_SPECIAL_CALL(h)        DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_SPECIAL_CALL)
+#define DUK_HOBJECT_SET_SPECIAL_CALL(h) DUK_HEAPHDR_SET_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_SPECIAL_CALL)
 
-#define DUK_HOBJECT_CLEAR_EXTENSIBLE(h)        DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXTENSIBLE)
-#define DUK_HOBJECT_CLEAR_CONSTRUCTABLE(h)     DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CONSTRUCTABLE)
-#define DUK_HOBJECT_CLEAR_CALLABLE(h)          DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CALLABLE)
-#define DUK_HOBJECT_CLEAR_BOUNDFUNC(h)         DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BOUNDFUNC)
-#define DUK_HOBJECT_CLEAR_COMPFUNC(h)          DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_COMPFUNC)
-#define DUK_HOBJECT_CLEAR_NATFUNC(h)           DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NATFUNC)
+#define DUK_HOBJECT_CLEAR_EXTENSIBLE(h)    DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXTENSIBLE)
+#define DUK_HOBJECT_CLEAR_CONSTRUCTABLE(h) DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CONSTRUCTABLE)
+#define DUK_HOBJECT_CLEAR_CALLABLE(h)      DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CALLABLE)
+#define DUK_HOBJECT_CLEAR_BOUNDFUNC(h)     DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BOUNDFUNC)
+#define DUK_HOBJECT_CLEAR_COMPFUNC(h)      DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_COMPFUNC)
+#define DUK_HOBJECT_CLEAR_NATFUNC(h)       DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NATFUNC)
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
-#define DUK_HOBJECT_CLEAR_BUFOBJ(h)            DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BUFOBJ)
-#endif
-#define DUK_HOBJECT_CLEAR_FASTREFS(h)          DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_FASTREFS)
-#define DUK_HOBJECT_CLEAR_ARRAY_PART(h)        DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_ARRAY_PART)
-#define DUK_HOBJECT_CLEAR_STRICT(h)            DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_STRICT)
-#define DUK_HOBJECT_CLEAR_NOTAIL(h)            DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NOTAIL)
-#define DUK_HOBJECT_CLEAR_NEWENV(h)            DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NEWENV)
-#define DUK_HOBJECT_CLEAR_NAMEBINDING(h)       DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NAMEBINDING)
-#define DUK_HOBJECT_CLEAR_CREATEARGS(h)        DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CREATEARGS)
-#define DUK_HOBJECT_CLEAR_HAVE_FINALIZER(h)    DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_HAVE_FINALIZER)
-#define DUK_HOBJECT_CLEAR_EXOTIC_ARRAY(h)      DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_ARRAY)
-#define DUK_HOBJECT_CLEAR_EXOTIC_STRINGOBJ(h)  DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ)
-#define DUK_HOBJECT_CLEAR_EXOTIC_ARGUMENTS(h)  DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_ARGUMENTS)
+#define DUK_HOBJECT_CLEAR_BUFOBJ(h) DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_BUFOBJ)
+#endif
+#define DUK_HOBJECT_CLEAR_FASTREFS(h)         DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_FASTREFS)
+#define DUK_HOBJECT_CLEAR_ARRAY_PART(h)       DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_ARRAY_PART)
+#define DUK_HOBJECT_CLEAR_STRICT(h)           DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_STRICT)
+#define DUK_HOBJECT_CLEAR_NOTAIL(h)           DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NOTAIL)
+#define DUK_HOBJECT_CLEAR_NEWENV(h)           DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NEWENV)
+#define DUK_HOBJECT_CLEAR_NAMEBINDING(h)      DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_NAMEBINDING)
+#define DUK_HOBJECT_CLEAR_CREATEARGS(h)       DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_CREATEARGS)
+#define DUK_HOBJECT_CLEAR_HAVE_FINALIZER(h)   DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_HAVE_FINALIZER)
+#define DUK_HOBJECT_CLEAR_EXOTIC_ARRAY(h)     DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_ARRAY)
+#define DUK_HOBJECT_CLEAR_EXOTIC_STRINGOBJ(h) DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ)
+#define DUK_HOBJECT_CLEAR_EXOTIC_ARGUMENTS(h) DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_ARGUMENTS)
 #if defined(DUK_USE_ES6_PROXY)
-#define DUK_HOBJECT_CLEAR_EXOTIC_PROXYOBJ(h)   DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_PROXYOBJ)
+#define DUK_HOBJECT_CLEAR_EXOTIC_PROXYOBJ(h) DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_EXOTIC_PROXYOBJ)
 #endif
-#define DUK_HOBJECT_CLEAR_SPECIAL_CALL(h)      DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_SPECIAL_CALL)
+#define DUK_HOBJECT_CLEAR_SPECIAL_CALL(h) DUK_HEAPHDR_CLEAR_FLAG_BITS(&(h)->hdr, DUK_HOBJECT_FLAG_SPECIAL_CALL)
 
 /* Object can/cannot use FASTREFS, i.e. has no strong reference fields beyond
  * duk_hobject base header.  This is used just for asserts so doesn't need to
  * be optimized.
  */
 #define DUK_HOBJECT_PROHIBITS_FASTREFS(h) \
-	(DUK_HOBJECT_IS_COMPFUNC((h)) || DUK_HOBJECT_IS_DECENV((h)) || DUK_HOBJECT_IS_OBJENV((h)) || \
-	 DUK_HOBJECT_IS_BUFOBJ((h)) || DUK_HOBJECT_IS_THREAD((h)) || DUK_HOBJECT_IS_PROXY((h)) || \
-	 DUK_HOBJECT_IS_BOUNDFUNC((h)))
+	(DUK_HOBJECT_IS_COMPFUNC((h)) || DUK_HOBJECT_IS_DECENV((h)) || DUK_HOBJECT_IS_OBJENV((h)) || DUK_HOBJECT_IS_BUFOBJ((h)) || \
+	 DUK_HOBJECT_IS_THREAD((h)) || DUK_HOBJECT_IS_PROXY((h)) || DUK_HOBJECT_IS_BOUNDFUNC((h)))
 #define DUK_HOBJECT_ALLOWS_FASTREFS(h) (!DUK_HOBJECT_PROHIBITS_FASTREFS((h)))
 
 /* Flags used for property attributes in duk_propdesc and packed flags.
  * Must fit into 8 bits.
  */
-#define DUK_PROPDESC_FLAG_WRITABLE              (1U << 0)    /* E5 Section 8.6.1 */
-#define DUK_PROPDESC_FLAG_ENUMERABLE            (1U << 1)    /* E5 Section 8.6.1 */
-#define DUK_PROPDESC_FLAG_CONFIGURABLE          (1U << 2)    /* E5 Section 8.6.1 */
-#define DUK_PROPDESC_FLAG_ACCESSOR              (1U << 3)    /* accessor */
-#define DUK_PROPDESC_FLAG_VIRTUAL               (1U << 4)    /* property is virtual: used in duk_propdesc, never stored
-                                                             * (used by e.g. buffer virtual properties)
-                                                             */
-#define DUK_PROPDESC_FLAGS_MASK                 (DUK_PROPDESC_FLAG_WRITABLE | \
-                                                 DUK_PROPDESC_FLAG_ENUMERABLE | \
-                                                 DUK_PROPDESC_FLAG_CONFIGURABLE | \
-                                                 DUK_PROPDESC_FLAG_ACCESSOR)
+#define DUK_PROPDESC_FLAG_WRITABLE     (1U << 0) /* E5 Section 8.6.1 */
+#define DUK_PROPDESC_FLAG_ENUMERABLE   (1U << 1) /* E5 Section 8.6.1 */
+#define DUK_PROPDESC_FLAG_CONFIGURABLE (1U << 2) /* E5 Section 8.6.1 */
+#define DUK_PROPDESC_FLAG_ACCESSOR     (1U << 3) /* accessor */
+#define DUK_PROPDESC_FLAG_VIRTUAL \
+	(1U << 4) /* property is virtual: used in duk_propdesc, never stored \
+	           * (used by e.g. buffer virtual properties) \
+	           */
+#define DUK_PROPDESC_FLAGS_MASK \
+	(DUK_PROPDESC_FLAG_WRITABLE | DUK_PROPDESC_FLAG_ENUMERABLE | DUK_PROPDESC_FLAG_CONFIGURABLE | DUK_PROPDESC_FLAG_ACCESSOR)
 
 /* Additional flags which are passed in the same flags argument as property
  * flags but are not stored in object properties.
  */
-#define DUK_PROPDESC_FLAG_NO_OVERWRITE          (1U << 4)    /* internal define property: skip write silently if exists */
+#define DUK_PROPDESC_FLAG_NO_OVERWRITE (1U << 4) /* internal define property: skip write silently if exists */
 
 /* Convenience defines for property attributes. */
-#define DUK_PROPDESC_FLAGS_NONE                 0
-#define DUK_PROPDESC_FLAGS_W                    (DUK_PROPDESC_FLAG_WRITABLE)
-#define DUK_PROPDESC_FLAGS_E                    (DUK_PROPDESC_FLAG_ENUMERABLE)
-#define DUK_PROPDESC_FLAGS_C                    (DUK_PROPDESC_FLAG_CONFIGURABLE)
-#define DUK_PROPDESC_FLAGS_WE                   (DUK_PROPDESC_FLAG_WRITABLE | DUK_PROPDESC_FLAG_ENUMERABLE)
-#define DUK_PROPDESC_FLAGS_WC                   (DUK_PROPDESC_FLAG_WRITABLE | DUK_PROPDESC_FLAG_CONFIGURABLE)
-#define DUK_PROPDESC_FLAGS_EC                   (DUK_PROPDESC_FLAG_ENUMERABLE | DUK_PROPDESC_FLAG_CONFIGURABLE)
-#define DUK_PROPDESC_FLAGS_WEC                  (DUK_PROPDESC_FLAG_WRITABLE | \
-                                                 DUK_PROPDESC_FLAG_ENUMERABLE | \
-                                                 DUK_PROPDESC_FLAG_CONFIGURABLE)
+#define DUK_PROPDESC_FLAGS_NONE 0
+#define DUK_PROPDESC_FLAGS_W    (DUK_PROPDESC_FLAG_WRITABLE)
+#define DUK_PROPDESC_FLAGS_E    (DUK_PROPDESC_FLAG_ENUMERABLE)
+#define DUK_PROPDESC_FLAGS_C    (DUK_PROPDESC_FLAG_CONFIGURABLE)
+#define DUK_PROPDESC_FLAGS_WE   (DUK_PROPDESC_FLAG_WRITABLE | DUK_PROPDESC_FLAG_ENUMERABLE)
+#define DUK_PROPDESC_FLAGS_WC   (DUK_PROPDESC_FLAG_WRITABLE | DUK_PROPDESC_FLAG_CONFIGURABLE)
+#define DUK_PROPDESC_FLAGS_EC   (DUK_PROPDESC_FLAG_ENUMERABLE | DUK_PROPDESC_FLAG_CONFIGURABLE)
+#define DUK_PROPDESC_FLAGS_WEC  (DUK_PROPDESC_FLAG_WRITABLE | DUK_PROPDESC_FLAG_ENUMERABLE | DUK_PROPDESC_FLAG_CONFIGURABLE)
 
 /* Flags for duk_hobject_get_own_propdesc() and variants. */
-#define DUK_GETDESC_FLAG_PUSH_VALUE          (1U << 0)  /* push value to stack */
-#define DUK_GETDESC_FLAG_IGNORE_PROTOLOOP    (1U << 1)  /* don't throw for prototype loop */
+#define DUK_GETDESC_FLAG_PUSH_VALUE       (1U << 0) /* push value to stack */
+#define DUK_GETDESC_FLAG_IGNORE_PROTOLOOP (1U << 1) /* don't throw for prototype loop */
 
 /*
  *  Macro for object validity check
@@ -6339,78 +6869,58 @@ DUK_INTERNAL_DECL void duk_hstring_init_charlen(duk_hstring *h);
  *  Assert for currently guaranteed relations between flags, for instance.
  */
 
-#define DUK_ASSERT_HOBJECT_VALID(h) do { \
-		DUK_ASSERT((h) != NULL); \
-		DUK_ASSERT(!DUK_HOBJECT_IS_CALLABLE((h)) || \
-		           DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_FUNCTION); \
-		DUK_ASSERT(!DUK_HOBJECT_IS_BUFOBJ((h)) || \
-		           (DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_ARRAYBUFFER || \
-		            DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_DATAVIEW || \
-		            DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_INT8ARRAY || \
-		            DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_UINT8ARRAY || \
-		            DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_UINT8CLAMPEDARRAY || \
-		            DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_INT16ARRAY || \
-		            DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_UINT16ARRAY || \
-		            DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_INT32ARRAY || \
-		            DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_UINT32ARRAY || \
-		            DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_FLOAT32ARRAY || \
-		            DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_FLOAT64ARRAY)); \
-		/* Object is an Array <=> object has exotic array behavior */ \
-		DUK_ASSERT((DUK_HOBJECT_GET_CLASS_NUMBER((h)) == DUK_HOBJECT_CLASS_ARRAY && DUK_HOBJECT_HAS_EXOTIC_ARRAY((h))) || \
-		           (DUK_HOBJECT_GET_CLASS_NUMBER((h)) != DUK_HOBJECT_CLASS_ARRAY && !DUK_HOBJECT_HAS_EXOTIC_ARRAY((h)))); \
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL_DECL void duk_hobject_assert_valid(duk_hobject *h);
+#define DUK_HOBJECT_ASSERT_VALID(h) \
+	do { \
+		duk_hobject_assert_valid((h)); \
+	} while (0)
+#else
+#define DUK_HOBJECT_ASSERT_VALID(h) \
+	do { \
 	} while (0)
+#endif
 
 /*
  *  Macros to access the 'props' allocation.
  */
 
 #if defined(DUK_USE_HEAPPTR16)
-#define DUK_HOBJECT_GET_PROPS(heap,h) \
-	((duk_uint8_t *) DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, ((duk_heaphdr *) (h))->h_extra16))
-#define DUK_HOBJECT_SET_PROPS(heap,h,x) do { \
+#define DUK_HOBJECT_GET_PROPS(heap, h) ((duk_uint8_t *) DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, ((duk_heaphdr *) (h))->h_extra16))
+#define DUK_HOBJECT_SET_PROPS(heap, h, x) \
+	do { \
 		((duk_heaphdr *) (h))->h_extra16 = DUK_USE_HEAPPTR_ENC16((heap)->heap_udata, (void *) (x)); \
 	} while (0)
 #else
-#define DUK_HOBJECT_GET_PROPS(heap,h) \
-	((h)->props)
-#define DUK_HOBJECT_SET_PROPS(heap,h,x) do { \
+#define DUK_HOBJECT_GET_PROPS(heap, h) ((h)->props)
+#define DUK_HOBJECT_SET_PROPS(heap, h, x) \
+	do { \
 		(h)->props = (duk_uint8_t *) (x); \
 	} while (0)
 #endif
 
 #if defined(DUK_USE_HOBJECT_LAYOUT_1)
 /* LAYOUT 1 */
-#define DUK_HOBJECT_E_GET_KEY_BASE(heap,h) \
-	((duk_hstring **) (void *) ( \
-		DUK_HOBJECT_GET_PROPS((heap), (h)) \
-	))
-#define DUK_HOBJECT_E_GET_VALUE_BASE(heap,h) \
-	((duk_propvalue *) (void *) ( \
-		DUK_HOBJECT_GET_PROPS((heap), (h)) + \
-			DUK_HOBJECT_GET_ESIZE((h)) * sizeof(duk_hstring *) \
-	))
-#define DUK_HOBJECT_E_GET_FLAGS_BASE(heap,h) \
-	((duk_uint8_t *) (void *) ( \
-		DUK_HOBJECT_GET_PROPS((heap), (h)) + DUK_HOBJECT_GET_ESIZE((h)) * (sizeof(duk_hstring *) + sizeof(duk_propvalue)) \
-	))
-#define DUK_HOBJECT_A_GET_BASE(heap,h) \
-	((duk_tval *) (void *) ( \
-		DUK_HOBJECT_GET_PROPS((heap), (h)) + \
-			DUK_HOBJECT_GET_ESIZE((h)) * (sizeof(duk_hstring *) + sizeof(duk_propvalue) + sizeof(duk_uint8_t)) \
-	))
-#define DUK_HOBJECT_H_GET_BASE(heap,h) \
-	((duk_uint32_t *) (void *) ( \
-		DUK_HOBJECT_GET_PROPS((heap), (h)) + \
-			DUK_HOBJECT_GET_ESIZE((h)) * (sizeof(duk_hstring *) + sizeof(duk_propvalue) + sizeof(duk_uint8_t)) + \
-			DUK_HOBJECT_GET_ASIZE((h)) * sizeof(duk_tval) \
-	))
-#define DUK_HOBJECT_P_COMPUTE_SIZE(n_ent,n_arr,n_hash) \
-	( \
-		(n_ent) * (sizeof(duk_hstring *) + sizeof(duk_propvalue) + sizeof(duk_uint8_t)) + \
-		(n_arr) * sizeof(duk_tval) + \
-		(n_hash) * sizeof(duk_uint32_t) \
-	)
-#define DUK_HOBJECT_P_SET_REALLOC_PTRS(p_base,set_e_k,set_e_pv,set_e_f,set_a,set_h,n_ent,n_arr,n_hash)  do { \
+#define DUK_HOBJECT_E_GET_KEY_BASE(heap, h) ((duk_hstring **) (void *) (DUK_HOBJECT_GET_PROPS((heap), (h))))
+#define DUK_HOBJECT_E_GET_VALUE_BASE(heap, h) \
+	((duk_propvalue *) (void *) (DUK_HOBJECT_GET_PROPS((heap), (h)) + DUK_HOBJECT_GET_ESIZE((h)) * sizeof(duk_hstring *)))
+#define DUK_HOBJECT_E_GET_FLAGS_BASE(heap, h) \
+	((duk_uint8_t *) (void *) (DUK_HOBJECT_GET_PROPS((heap), (h)) + \
+	                           DUK_HOBJECT_GET_ESIZE((h)) * (sizeof(duk_hstring *) + sizeof(duk_propvalue))))
+#define DUK_HOBJECT_A_GET_BASE(heap, h) \
+	((duk_tval *) (void *) (DUK_HOBJECT_GET_PROPS((heap), (h)) + \
+	                        DUK_HOBJECT_GET_ESIZE((h)) * \
+	                            (sizeof(duk_hstring *) + sizeof(duk_propvalue) + sizeof(duk_uint8_t))))
+#define DUK_HOBJECT_H_GET_BASE(heap, h) \
+	((duk_uint32_t *) (void *) (DUK_HOBJECT_GET_PROPS((heap), (h)) + \
+	                            DUK_HOBJECT_GET_ESIZE((h)) * \
+	                                (sizeof(duk_hstring *) + sizeof(duk_propvalue) + sizeof(duk_uint8_t)) + \
+	                            DUK_HOBJECT_GET_ASIZE((h)) * sizeof(duk_tval)))
+#define DUK_HOBJECT_P_COMPUTE_SIZE(n_ent, n_arr, n_hash) \
+	((n_ent) * (sizeof(duk_hstring *) + sizeof(duk_propvalue) + sizeof(duk_uint8_t)) + (n_arr) * sizeof(duk_tval) + \
+	 (n_hash) * sizeof(duk_uint32_t))
+#define DUK_HOBJECT_P_SET_REALLOC_PTRS(p_base, set_e_k, set_e_pv, set_e_f, set_a, set_h, n_ent, n_arr, n_hash) \
+	do { \
 		(set_e_k) = (duk_hstring **) (void *) (p_base); \
 		(set_e_pv) = (duk_propvalue *) (void *) ((set_e_k) + (n_ent)); \
 		(set_e_f) = (duk_uint8_t *) (void *) ((set_e_pv) + (n_ent)); \
@@ -6428,85 +6938,57 @@ DUK_INTERNAL_DECL void duk_hstring_init_charlen(duk_hstring *h);
 #else
 #error invalid DUK_USE_ALIGN_BY
 #endif
-#define DUK_HOBJECT_E_GET_KEY_BASE(heap,h) \
-	((duk_hstring **) (void *) ( \
-		DUK_HOBJECT_GET_PROPS((heap), (h)) + \
-			DUK_HOBJECT_GET_ESIZE((h)) * sizeof(duk_propvalue) \
-	))
-#define DUK_HOBJECT_E_GET_VALUE_BASE(heap,h) \
-	((duk_propvalue *) (void *) ( \
-		DUK_HOBJECT_GET_PROPS((heap), (h)) \
-	))
-#define DUK_HOBJECT_E_GET_FLAGS_BASE(heap,h) \
-	((duk_uint8_t *) (void *) ( \
-		DUK_HOBJECT_GET_PROPS((heap), (h)) + DUK_HOBJECT_GET_ESIZE((h)) * (sizeof(duk_hstring *) + sizeof(duk_propvalue)) \
-	))
-#define DUK_HOBJECT_A_GET_BASE(heap,h) \
-	((duk_tval *) (void *) ( \
-		DUK_HOBJECT_GET_PROPS((heap), (h)) + \
-			DUK_HOBJECT_GET_ESIZE((h)) * (sizeof(duk_hstring *) + sizeof(duk_propvalue) + sizeof(duk_uint8_t)) + \
-			DUK_HOBJECT_E_FLAG_PADDING(DUK_HOBJECT_GET_ESIZE((h))) \
-	))
-#define DUK_HOBJECT_H_GET_BASE(heap,h) \
-	((duk_uint32_t *) (void *) ( \
-		DUK_HOBJECT_GET_PROPS((heap), (h)) + \
-			DUK_HOBJECT_GET_ESIZE((h)) * (sizeof(duk_hstring *) + sizeof(duk_propvalue) + sizeof(duk_uint8_t)) + \
-			DUK_HOBJECT_E_FLAG_PADDING(DUK_HOBJECT_GET_ESIZE((h))) + \
-			DUK_HOBJECT_GET_ASIZE((h)) * sizeof(duk_tval) \
-	))
-#define DUK_HOBJECT_P_COMPUTE_SIZE(n_ent,n_arr,n_hash) \
-	( \
-		(n_ent) * (sizeof(duk_hstring *) + sizeof(duk_propvalue) + sizeof(duk_uint8_t)) + \
-		DUK_HOBJECT_E_FLAG_PADDING((n_ent)) + \
-		(n_arr) * sizeof(duk_tval) + \
-		(n_hash) * sizeof(duk_uint32_t) \
-	)
-#define DUK_HOBJECT_P_SET_REALLOC_PTRS(p_base,set_e_k,set_e_pv,set_e_f,set_a,set_h,n_ent,n_arr,n_hash)  do { \
+#define DUK_HOBJECT_E_GET_KEY_BASE(heap, h) \
+	((duk_hstring **) (void *) (DUK_HOBJECT_GET_PROPS((heap), (h)) + DUK_HOBJECT_GET_ESIZE((h)) * sizeof(duk_propvalue)))
+#define DUK_HOBJECT_E_GET_VALUE_BASE(heap, h) ((duk_propvalue *) (void *) (DUK_HOBJECT_GET_PROPS((heap), (h))))
+#define DUK_HOBJECT_E_GET_FLAGS_BASE(heap, h) \
+	((duk_uint8_t *) (void *) (DUK_HOBJECT_GET_PROPS((heap), (h)) + \
+	                           DUK_HOBJECT_GET_ESIZE((h)) * (sizeof(duk_hstring *) + sizeof(duk_propvalue))))
+#define DUK_HOBJECT_A_GET_BASE(heap, h) \
+	((duk_tval *) (void *) (DUK_HOBJECT_GET_PROPS((heap), (h)) + \
+	                        DUK_HOBJECT_GET_ESIZE((h)) * \
+	                            (sizeof(duk_hstring *) + sizeof(duk_propvalue) + sizeof(duk_uint8_t)) + \
+	                        DUK_HOBJECT_E_FLAG_PADDING(DUK_HOBJECT_GET_ESIZE((h)))))
+#define DUK_HOBJECT_H_GET_BASE(heap, h) \
+	((duk_uint32_t *) (void *) (DUK_HOBJECT_GET_PROPS((heap), (h)) + \
+	                            DUK_HOBJECT_GET_ESIZE((h)) * \
+	                                (sizeof(duk_hstring *) + sizeof(duk_propvalue) + sizeof(duk_uint8_t)) + \
+	                            DUK_HOBJECT_E_FLAG_PADDING(DUK_HOBJECT_GET_ESIZE((h))) + \
+	                            DUK_HOBJECT_GET_ASIZE((h)) * sizeof(duk_tval)))
+#define DUK_HOBJECT_P_COMPUTE_SIZE(n_ent, n_arr, n_hash) \
+	((n_ent) * (sizeof(duk_hstring *) + sizeof(duk_propvalue) + sizeof(duk_uint8_t)) + DUK_HOBJECT_E_FLAG_PADDING((n_ent)) + \
+	 (n_arr) * sizeof(duk_tval) + (n_hash) * sizeof(duk_uint32_t))
+#define DUK_HOBJECT_P_SET_REALLOC_PTRS(p_base, set_e_k, set_e_pv, set_e_f, set_a, set_h, n_ent, n_arr, n_hash) \
+	do { \
 		(set_e_pv) = (duk_propvalue *) (void *) (p_base); \
 		(set_e_k) = (duk_hstring **) (void *) ((set_e_pv) + (n_ent)); \
 		(set_e_f) = (duk_uint8_t *) (void *) ((set_e_k) + (n_ent)); \
-		(set_a) = (duk_tval *) (void *) (((duk_uint8_t *) (set_e_f)) + \
-		                                 sizeof(duk_uint8_t) * (n_ent) + \
+		(set_a) = (duk_tval *) (void *) (((duk_uint8_t *) (set_e_f)) + sizeof(duk_uint8_t) * (n_ent) + \
 		                                 DUK_HOBJECT_E_FLAG_PADDING((n_ent))); \
 		(set_h) = (duk_uint32_t *) (void *) ((set_a) + (n_arr)); \
 	} while (0)
 #elif defined(DUK_USE_HOBJECT_LAYOUT_3)
 /* LAYOUT 3 */
-#define DUK_HOBJECT_E_GET_KEY_BASE(heap,h) \
-	((duk_hstring **) (void *) ( \
-		DUK_HOBJECT_GET_PROPS((heap), (h)) + \
-			DUK_HOBJECT_GET_ESIZE((h)) * sizeof(duk_propvalue) + \
-			DUK_HOBJECT_GET_ASIZE((h)) * sizeof(duk_tval) \
-	))
-#define DUK_HOBJECT_E_GET_VALUE_BASE(heap,h) \
-	((duk_propvalue *) (void *) ( \
-		DUK_HOBJECT_GET_PROPS((heap), (h)) \
-	))
-#define DUK_HOBJECT_E_GET_FLAGS_BASE(heap,h) \
-	((duk_uint8_t *) (void *) ( \
-		DUK_HOBJECT_GET_PROPS((heap), (h)) + \
-			DUK_HOBJECT_GET_ESIZE((h)) * (sizeof(duk_propvalue) + sizeof(duk_hstring *)) + \
-			DUK_HOBJECT_GET_ASIZE((h)) * sizeof(duk_tval) + \
-			DUK_HOBJECT_GET_HSIZE((h)) * sizeof(duk_uint32_t) \
-	))
-#define DUK_HOBJECT_A_GET_BASE(heap,h) \
-	((duk_tval *) (void *) ( \
-		DUK_HOBJECT_GET_PROPS((heap), (h)) + \
-			DUK_HOBJECT_GET_ESIZE((h)) * sizeof(duk_propvalue) \
-	))
-#define DUK_HOBJECT_H_GET_BASE(heap,h) \
-	((duk_uint32_t *) (void *) ( \
-		DUK_HOBJECT_GET_PROPS((heap), (h)) + \
-			DUK_HOBJECT_GET_ESIZE((h)) * (sizeof(duk_propvalue) + sizeof(duk_hstring *)) + \
-			DUK_HOBJECT_GET_ASIZE((h)) * sizeof(duk_tval) \
-	))
-#define DUK_HOBJECT_P_COMPUTE_SIZE(n_ent,n_arr,n_hash) \
-	( \
-		(n_ent) * (sizeof(duk_propvalue) + sizeof(duk_hstring *) + sizeof(duk_uint8_t)) + \
-		(n_arr) * sizeof(duk_tval) + \
-		(n_hash) * sizeof(duk_uint32_t) \
-	)
-#define DUK_HOBJECT_P_SET_REALLOC_PTRS(p_base,set_e_k,set_e_pv,set_e_f,set_a,set_h,n_ent,n_arr,n_hash)  do { \
+#define DUK_HOBJECT_E_GET_KEY_BASE(heap, h) \
+	((duk_hstring **) (void *) (DUK_HOBJECT_GET_PROPS((heap), (h)) + DUK_HOBJECT_GET_ESIZE((h)) * sizeof(duk_propvalue) + \
+	                            DUK_HOBJECT_GET_ASIZE((h)) * sizeof(duk_tval)))
+#define DUK_HOBJECT_E_GET_VALUE_BASE(heap, h) ((duk_propvalue *) (void *) (DUK_HOBJECT_GET_PROPS((heap), (h))))
+#define DUK_HOBJECT_E_GET_FLAGS_BASE(heap, h) \
+	((duk_uint8_t *) (void *) (DUK_HOBJECT_GET_PROPS((heap), (h)) + \
+	                           DUK_HOBJECT_GET_ESIZE((h)) * (sizeof(duk_propvalue) + sizeof(duk_hstring *)) + \
+	                           DUK_HOBJECT_GET_ASIZE((h)) * sizeof(duk_tval) + \
+	                           DUK_HOBJECT_GET_HSIZE((h)) * sizeof(duk_uint32_t)))
+#define DUK_HOBJECT_A_GET_BASE(heap, h) \
+	((duk_tval *) (void *) (DUK_HOBJECT_GET_PROPS((heap), (h)) + DUK_HOBJECT_GET_ESIZE((h)) * sizeof(duk_propvalue)))
+#define DUK_HOBJECT_H_GET_BASE(heap, h) \
+	((duk_uint32_t *) (void *) (DUK_HOBJECT_GET_PROPS((heap), (h)) + \
+	                            DUK_HOBJECT_GET_ESIZE((h)) * (sizeof(duk_propvalue) + sizeof(duk_hstring *)) + \
+	                            DUK_HOBJECT_GET_ASIZE((h)) * sizeof(duk_tval)))
+#define DUK_HOBJECT_P_COMPUTE_SIZE(n_ent, n_arr, n_hash) \
+	((n_ent) * (sizeof(duk_propvalue) + sizeof(duk_hstring *) + sizeof(duk_uint8_t)) + (n_arr) * sizeof(duk_tval) + \
+	 (n_hash) * sizeof(duk_uint32_t))
+#define DUK_HOBJECT_P_SET_REALLOC_PTRS(p_base, set_e_k, set_e_pv, set_e_f, set_a, set_h, n_ent, n_arr, n_hash) \
+	do { \
 		(set_e_pv) = (duk_propvalue *) (void *) (p_base); \
 		(set_a) = (duk_tval *) (void *) ((set_e_pv) + (n_ent)); \
 		(set_e_k) = (duk_hstring **) (void *) ((set_a) + (n_arr)); \
@@ -6515,85 +6997,99 @@ DUK_INTERNAL_DECL void duk_hstring_init_charlen(duk_hstring *h);
 	} while (0)
 #else
 #error invalid hobject layout defines
-#endif  /* hobject property layout */
+#endif /* hobject property layout */
 
 #define DUK_HOBJECT_P_ALLOC_SIZE(h) \
 	DUK_HOBJECT_P_COMPUTE_SIZE(DUK_HOBJECT_GET_ESIZE((h)), DUK_HOBJECT_GET_ASIZE((h)), DUK_HOBJECT_GET_HSIZE((h)))
 
-#define DUK_HOBJECT_E_GET_KEY(heap,h,i)              (DUK_HOBJECT_E_GET_KEY_BASE((heap), (h))[(i)])
-#define DUK_HOBJECT_E_GET_KEY_PTR(heap,h,i)          (&DUK_HOBJECT_E_GET_KEY_BASE((heap), (h))[(i)])
-#define DUK_HOBJECT_E_GET_VALUE(heap,h,i)            (DUK_HOBJECT_E_GET_VALUE_BASE((heap), (h))[(i)])
-#define DUK_HOBJECT_E_GET_VALUE_PTR(heap,h,i)        (&DUK_HOBJECT_E_GET_VALUE_BASE((heap), (h))[(i)])
-#define DUK_HOBJECT_E_GET_VALUE_TVAL(heap,h,i)       (DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)).v)
-#define DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(heap,h,i)   (&DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)).v)
-#define DUK_HOBJECT_E_GET_VALUE_GETTER(heap,h,i)     (DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)).a.get)
-#define DUK_HOBJECT_E_GET_VALUE_GETTER_PTR(heap,h,i) (&DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)).a.get)
-#define DUK_HOBJECT_E_GET_VALUE_SETTER(heap,h,i)     (DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)).a.set)
-#define DUK_HOBJECT_E_GET_VALUE_SETTER_PTR(heap,h,i) (&DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)).a.set)
-#define DUK_HOBJECT_E_GET_FLAGS(heap,h,i)            (DUK_HOBJECT_E_GET_FLAGS_BASE((heap), (h))[(i)])
-#define DUK_HOBJECT_E_GET_FLAGS_PTR(heap,h,i)        (&DUK_HOBJECT_E_GET_FLAGS_BASE((heap), (h))[(i)])
-#define DUK_HOBJECT_A_GET_VALUE(heap,h,i)            (DUK_HOBJECT_A_GET_BASE((heap), (h))[(i)])
-#define DUK_HOBJECT_A_GET_VALUE_PTR(heap,h,i)        (&DUK_HOBJECT_A_GET_BASE((heap), (h))[(i)])
-#define DUK_HOBJECT_H_GET_INDEX(heap,h,i)            (DUK_HOBJECT_H_GET_BASE((heap), (h))[(i)])
-#define DUK_HOBJECT_H_GET_INDEX_PTR(heap,h,i)        (&DUK_HOBJECT_H_GET_BASE((heap), (h))[(i)])
-
-#define DUK_HOBJECT_E_SET_KEY(heap,h,i,k)  do { \
+#define DUK_HOBJECT_E_GET_KEY(heap, h, i)              (DUK_HOBJECT_E_GET_KEY_BASE((heap), (h))[(i)])
+#define DUK_HOBJECT_E_GET_KEY_PTR(heap, h, i)          (&DUK_HOBJECT_E_GET_KEY_BASE((heap), (h))[(i)])
+#define DUK_HOBJECT_E_GET_VALUE(heap, h, i)            (DUK_HOBJECT_E_GET_VALUE_BASE((heap), (h))[(i)])
+#define DUK_HOBJECT_E_GET_VALUE_PTR(heap, h, i)        (&DUK_HOBJECT_E_GET_VALUE_BASE((heap), (h))[(i)])
+#define DUK_HOBJECT_E_GET_VALUE_TVAL(heap, h, i)       (DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)).v)
+#define DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(heap, h, i)   (&DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)).v)
+#define DUK_HOBJECT_E_GET_VALUE_GETTER(heap, h, i)     (DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)).a.get)
+#define DUK_HOBJECT_E_GET_VALUE_GETTER_PTR(heap, h, i) (&DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)).a.get)
+#define DUK_HOBJECT_E_GET_VALUE_SETTER(heap, h, i)     (DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)).a.set)
+#define DUK_HOBJECT_E_GET_VALUE_SETTER_PTR(heap, h, i) (&DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)).a.set)
+#define DUK_HOBJECT_E_GET_FLAGS(heap, h, i)            (DUK_HOBJECT_E_GET_FLAGS_BASE((heap), (h))[(i)])
+#define DUK_HOBJECT_E_GET_FLAGS_PTR(heap, h, i)        (&DUK_HOBJECT_E_GET_FLAGS_BASE((heap), (h))[(i)])
+#define DUK_HOBJECT_A_GET_VALUE(heap, h, i)            (DUK_HOBJECT_A_GET_BASE((heap), (h))[(i)])
+#define DUK_HOBJECT_A_GET_VALUE_PTR(heap, h, i)        (&DUK_HOBJECT_A_GET_BASE((heap), (h))[(i)])
+#define DUK_HOBJECT_H_GET_INDEX(heap, h, i)            (DUK_HOBJECT_H_GET_BASE((heap), (h))[(i)])
+#define DUK_HOBJECT_H_GET_INDEX_PTR(heap, h, i)        (&DUK_HOBJECT_H_GET_BASE((heap), (h))[(i)])
+
+#define DUK_HOBJECT_E_SET_KEY(heap, h, i, k) \
+	do { \
 		DUK_HOBJECT_E_GET_KEY((heap), (h), (i)) = (k); \
 	} while (0)
-#define DUK_HOBJECT_E_SET_VALUE(heap,h,i,v)  do { \
+#define DUK_HOBJECT_E_SET_VALUE(heap, h, i, v) \
+	do { \
 		DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)) = (v); \
 	} while (0)
-#define DUK_HOBJECT_E_SET_VALUE_TVAL(heap,h,i,v)  do { \
+#define DUK_HOBJECT_E_SET_VALUE_TVAL(heap, h, i, v) \
+	do { \
 		DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)).v = (v); \
 	} while (0)
-#define DUK_HOBJECT_E_SET_VALUE_GETTER(heap,h,i,v)  do { \
+#define DUK_HOBJECT_E_SET_VALUE_GETTER(heap, h, i, v) \
+	do { \
 		DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)).a.get = (v); \
 	} while (0)
-#define DUK_HOBJECT_E_SET_VALUE_SETTER(heap,h,i,v)  do { \
+#define DUK_HOBJECT_E_SET_VALUE_SETTER(heap, h, i, v) \
+	do { \
 		DUK_HOBJECT_E_GET_VALUE((heap), (h), (i)).a.set = (v); \
 	} while (0)
-#define DUK_HOBJECT_E_SET_FLAGS(heap,h,i,f)  do { \
+#define DUK_HOBJECT_E_SET_FLAGS(heap, h, i, f) \
+	do { \
 		DUK_HOBJECT_E_GET_FLAGS((heap), (h), (i)) = (duk_uint8_t) (f); \
 	} while (0)
-#define DUK_HOBJECT_A_SET_VALUE(heap,h,i,v)  do { \
+#define DUK_HOBJECT_A_SET_VALUE(heap, h, i, v) \
+	do { \
 		DUK_HOBJECT_A_GET_VALUE((heap), (h), (i)) = (v); \
 	} while (0)
-#define DUK_HOBJECT_A_SET_VALUE_TVAL(heap,h,i,v) \
-	DUK_HOBJECT_A_SET_VALUE((heap), (h), (i), (v))  /* alias for above */
-#define DUK_HOBJECT_H_SET_INDEX(heap,h,i,v)  do { \
+#define DUK_HOBJECT_A_SET_VALUE_TVAL(heap, h, i, v) DUK_HOBJECT_A_SET_VALUE((heap), (h), (i), (v)) /* alias for above */
+#define DUK_HOBJECT_H_SET_INDEX(heap, h, i, v) \
+	do { \
 		DUK_HOBJECT_H_GET_INDEX((heap), (h), (i)) = (v); \
 	} while (0)
 
-#define DUK_HOBJECT_E_SET_FLAG_BITS(heap,h,i,mask)  do { \
+#define DUK_HOBJECT_E_SET_FLAG_BITS(heap, h, i, mask) \
+	do { \
 		DUK_HOBJECT_E_GET_FLAGS_BASE((heap), (h))[(i)] |= (mask); \
 	} while (0)
 
-#define DUK_HOBJECT_E_CLEAR_FLAG_BITS(heap,h,i,mask)  do { \
+#define DUK_HOBJECT_E_CLEAR_FLAG_BITS(heap, h, i, mask) \
+	do { \
 		DUK_HOBJECT_E_GET_FLAGS_BASE((heap), (h))[(i)] &= ~(mask); \
 	} while (0)
 
-#define DUK_HOBJECT_E_SLOT_IS_WRITABLE(heap,h,i)     ((DUK_HOBJECT_E_GET_FLAGS((heap), (h), (i)) & DUK_PROPDESC_FLAG_WRITABLE) != 0)
-#define DUK_HOBJECT_E_SLOT_IS_ENUMERABLE(heap,h,i)   ((DUK_HOBJECT_E_GET_FLAGS((heap), (h), (i)) & DUK_PROPDESC_FLAG_ENUMERABLE) != 0)
-#define DUK_HOBJECT_E_SLOT_IS_CONFIGURABLE(heap,h,i) ((DUK_HOBJECT_E_GET_FLAGS((heap), (h), (i)) & DUK_PROPDESC_FLAG_CONFIGURABLE) != 0)
-#define DUK_HOBJECT_E_SLOT_IS_ACCESSOR(heap,h,i)     ((DUK_HOBJECT_E_GET_FLAGS((heap), (h), (i)) & DUK_PROPDESC_FLAG_ACCESSOR) != 0)
+#define DUK_HOBJECT_E_SLOT_IS_WRITABLE(heap, h, i) ((DUK_HOBJECT_E_GET_FLAGS((heap), (h), (i)) & DUK_PROPDESC_FLAG_WRITABLE) != 0)
+#define DUK_HOBJECT_E_SLOT_IS_ENUMERABLE(heap, h, i) \
+	((DUK_HOBJECT_E_GET_FLAGS((heap), (h), (i)) & DUK_PROPDESC_FLAG_ENUMERABLE) != 0)
+#define DUK_HOBJECT_E_SLOT_IS_CONFIGURABLE(heap, h, i) \
+	((DUK_HOBJECT_E_GET_FLAGS((heap), (h), (i)) & DUK_PROPDESC_FLAG_CONFIGURABLE) != 0)
+#define DUK_HOBJECT_E_SLOT_IS_ACCESSOR(heap, h, i) ((DUK_HOBJECT_E_GET_FLAGS((heap), (h), (i)) & DUK_PROPDESC_FLAG_ACCESSOR) != 0)
 
-#define DUK_HOBJECT_E_SLOT_SET_WRITABLE(heap,h,i)        DUK_HOBJECT_E_SET_FLAG_BITS((heap), (h), (i),DUK_PROPDESC_FLAG_WRITABLE)
-#define DUK_HOBJECT_E_SLOT_SET_ENUMERABLE(heap,h,i)      DUK_HOBJECT_E_SET_FLAG_BITS((heap), (h), (i),DUK_PROPDESC_FLAG_ENUMERABLE)
-#define DUK_HOBJECT_E_SLOT_SET_CONFIGURABLE(heap,h,i)    DUK_HOBJECT_E_SET_FLAG_BITS((heap), (h), (i),DUK_PROPDESC_FLAG_CONFIGURABLE)
-#define DUK_HOBJECT_E_SLOT_SET_ACCESSOR(heap,h,i)        DUK_HOBJECT_E_SET_FLAG_BITS((heap), (h), (i),DUK_PROPDESC_FLAG_ACCESSOR)
+#define DUK_HOBJECT_E_SLOT_SET_WRITABLE(heap, h, i)   DUK_HOBJECT_E_SET_FLAG_BITS((heap), (h), (i), DUK_PROPDESC_FLAG_WRITABLE)
+#define DUK_HOBJECT_E_SLOT_SET_ENUMERABLE(heap, h, i) DUK_HOBJECT_E_SET_FLAG_BITS((heap), (h), (i), DUK_PROPDESC_FLAG_ENUMERABLE)
+#define DUK_HOBJECT_E_SLOT_SET_CONFIGURABLE(heap, h, i) \
+	DUK_HOBJECT_E_SET_FLAG_BITS((heap), (h), (i), DUK_PROPDESC_FLAG_CONFIGURABLE)
+#define DUK_HOBJECT_E_SLOT_SET_ACCESSOR(heap, h, i) DUK_HOBJECT_E_SET_FLAG_BITS((heap), (h), (i), DUK_PROPDESC_FLAG_ACCESSOR)
 
-#define DUK_HOBJECT_E_SLOT_CLEAR_WRITABLE(heap,h,i)      DUK_HOBJECT_E_CLEAR_FLAG_BITS((heap), (h), (i),DUK_PROPDESC_FLAG_WRITABLE)
-#define DUK_HOBJECT_E_SLOT_CLEAR_ENUMERABLE(heap,h,i)    DUK_HOBJECT_E_CLEAR_FLAG_BITS((heap), (h), (i),DUK_PROPDESC_FLAG_ENUMERABLE)
-#define DUK_HOBJECT_E_SLOT_CLEAR_CONFIGURABLE(heap,h,i)  DUK_HOBJECT_E_CLEAR_FLAG_BITS((heap), (h), (i),DUK_PROPDESC_FLAG_CONFIGURABLE)
-#define DUK_HOBJECT_E_SLOT_CLEAR_ACCESSOR(heap,h,i)      DUK_HOBJECT_E_CLEAR_FLAG_BITS((heap), (h), (i),DUK_PROPDESC_FLAG_ACCESSOR)
+#define DUK_HOBJECT_E_SLOT_CLEAR_WRITABLE(heap, h, i) DUK_HOBJECT_E_CLEAR_FLAG_BITS((heap), (h), (i), DUK_PROPDESC_FLAG_WRITABLE)
+#define DUK_HOBJECT_E_SLOT_CLEAR_ENUMERABLE(heap, h, i) \
+	DUK_HOBJECT_E_CLEAR_FLAG_BITS((heap), (h), (i), DUK_PROPDESC_FLAG_ENUMERABLE)
+#define DUK_HOBJECT_E_SLOT_CLEAR_CONFIGURABLE(heap, h, i) \
+	DUK_HOBJECT_E_CLEAR_FLAG_BITS((heap), (h), (i), DUK_PROPDESC_FLAG_CONFIGURABLE)
+#define DUK_HOBJECT_E_SLOT_CLEAR_ACCESSOR(heap, h, i) DUK_HOBJECT_E_CLEAR_FLAG_BITS((heap), (h), (i), DUK_PROPDESC_FLAG_ACCESSOR)
 
-#define DUK_PROPDESC_IS_WRITABLE(p)             (((p)->flags & DUK_PROPDESC_FLAG_WRITABLE) != 0)
-#define DUK_PROPDESC_IS_ENUMERABLE(p)           (((p)->flags & DUK_PROPDESC_FLAG_ENUMERABLE) != 0)
-#define DUK_PROPDESC_IS_CONFIGURABLE(p)         (((p)->flags & DUK_PROPDESC_FLAG_CONFIGURABLE) != 0)
-#define DUK_PROPDESC_IS_ACCESSOR(p)             (((p)->flags & DUK_PROPDESC_FLAG_ACCESSOR) != 0)
+#define DUK_PROPDESC_IS_WRITABLE(p)     (((p)->flags & DUK_PROPDESC_FLAG_WRITABLE) != 0)
+#define DUK_PROPDESC_IS_ENUMERABLE(p)   (((p)->flags & DUK_PROPDESC_FLAG_ENUMERABLE) != 0)
+#define DUK_PROPDESC_IS_CONFIGURABLE(p) (((p)->flags & DUK_PROPDESC_FLAG_CONFIGURABLE) != 0)
+#define DUK_PROPDESC_IS_ACCESSOR(p)     (((p)->flags & DUK_PROPDESC_FLAG_ACCESSOR) != 0)
 
-#define DUK_HOBJECT_HASHIDX_UNUSED              0xffffffffUL
-#define DUK_HOBJECT_HASHIDX_DELETED             0xfffffffeUL
+#define DUK_HOBJECT_HASHIDX_UNUSED  0xffffffffUL
+#define DUK_HOBJECT_HASHIDX_DELETED 0xfffffffeUL
 
 /*
  *  Macros for accessing size fields
@@ -6601,33 +7097,63 @@ DUK_INTERNAL_DECL void duk_hstring_init_charlen(duk_hstring *h);
 
 #if defined(DUK_USE_OBJSIZES16)
 #define DUK_HOBJECT_GET_ESIZE(h) ((h)->e_size16)
-#define DUK_HOBJECT_SET_ESIZE(h,v) do { (h)->e_size16 = (v); } while (0)
+#define DUK_HOBJECT_SET_ESIZE(h, v) \
+	do { \
+		(h)->e_size16 = (v); \
+	} while (0)
 #define DUK_HOBJECT_GET_ENEXT(h) ((h)->e_next16)
-#define DUK_HOBJECT_SET_ENEXT(h,v) do { (h)->e_next16 = (v); } while (0)
+#define DUK_HOBJECT_SET_ENEXT(h, v) \
+	do { \
+		(h)->e_next16 = (v); \
+	} while (0)
 #define DUK_HOBJECT_POSTINC_ENEXT(h) ((h)->e_next16++)
-#define DUK_HOBJECT_GET_ASIZE(h) ((h)->a_size16)
-#define DUK_HOBJECT_SET_ASIZE(h,v) do { (h)->a_size16 = (v); } while (0)
+#define DUK_HOBJECT_GET_ASIZE(h)     ((h)->a_size16)
+#define DUK_HOBJECT_SET_ASIZE(h, v) \
+	do { \
+		(h)->a_size16 = (v); \
+	} while (0)
 #if defined(DUK_USE_HOBJECT_HASH_PART)
 #define DUK_HOBJECT_GET_HSIZE(h) ((h)->h_size16)
-#define DUK_HOBJECT_SET_HSIZE(h,v) do { (h)->h_size16 = (v); } while (0)
+#define DUK_HOBJECT_SET_HSIZE(h, v) \
+	do { \
+		(h)->h_size16 = (v); \
+	} while (0)
 #else
 #define DUK_HOBJECT_GET_HSIZE(h) 0
-#define DUK_HOBJECT_SET_HSIZE(h,v) do { DUK_ASSERT((v) == 0); } while (0)
+#define DUK_HOBJECT_SET_HSIZE(h, v) \
+	do { \
+		DUK_ASSERT((v) == 0); \
+	} while (0)
 #endif
 #else
 #define DUK_HOBJECT_GET_ESIZE(h) ((h)->e_size)
-#define DUK_HOBJECT_SET_ESIZE(h,v) do { (h)->e_size = (v); } while (0)
+#define DUK_HOBJECT_SET_ESIZE(h, v) \
+	do { \
+		(h)->e_size = (v); \
+	} while (0)
 #define DUK_HOBJECT_GET_ENEXT(h) ((h)->e_next)
-#define DUK_HOBJECT_SET_ENEXT(h,v) do { (h)->e_next = (v); } while (0)
+#define DUK_HOBJECT_SET_ENEXT(h, v) \
+	do { \
+		(h)->e_next = (v); \
+	} while (0)
 #define DUK_HOBJECT_POSTINC_ENEXT(h) ((h)->e_next++)
-#define DUK_HOBJECT_GET_ASIZE(h) ((h)->a_size)
-#define DUK_HOBJECT_SET_ASIZE(h,v) do { (h)->a_size = (v); } while (0)
+#define DUK_HOBJECT_GET_ASIZE(h)     ((h)->a_size)
+#define DUK_HOBJECT_SET_ASIZE(h, v) \
+	do { \
+		(h)->a_size = (v); \
+	} while (0)
 #if defined(DUK_USE_HOBJECT_HASH_PART)
 #define DUK_HOBJECT_GET_HSIZE(h) ((h)->h_size)
-#define DUK_HOBJECT_SET_HSIZE(h,v) do { (h)->h_size = (v); } while (0)
+#define DUK_HOBJECT_SET_HSIZE(h, v) \
+	do { \
+		(h)->h_size = (v); \
+	} while (0)
 #else
 #define DUK_HOBJECT_GET_HSIZE(h) 0
-#define DUK_HOBJECT_SET_HSIZE(h,v) do { DUK_ASSERT((v) == 0); } while (0)
+#define DUK_HOBJECT_SET_HSIZE(h, v) \
+	do { \
+		DUK_ASSERT((v) == 0); \
+	} while (0)
 #endif
 #endif
 
@@ -6638,46 +7164,44 @@ DUK_INTERNAL_DECL void duk_hstring_init_charlen(duk_hstring *h);
 /* Maximum prototype traversal depth.  Sanity limit which handles e.g.
  * prototype loops (even complex ones like 1->2->3->4->2->3->4->2->3->4).
  */
-#define DUK_HOBJECT_PROTOTYPE_CHAIN_SANITY      10000L
+#define DUK_HOBJECT_PROTOTYPE_CHAIN_SANITY 10000L
 
 /*
  *  ECMAScript [[Class]]
  */
 
 /* range check not necessary because all 4-bit values are mapped */
-#define DUK_HOBJECT_CLASS_NUMBER_TO_STRIDX(n)  duk_class_number_to_stridx[(n)]
+#define DUK_HOBJECT_CLASS_NUMBER_TO_STRIDX(n) duk_class_number_to_stridx[(n)]
 
-#define DUK_HOBJECT_GET_CLASS_STRING(heap,h)          \
-	DUK_HEAP_GET_STRING( \
-		(heap), \
-		DUK_HOBJECT_CLASS_NUMBER_TO_STRIDX(DUK_HOBJECT_GET_CLASS_NUMBER((h))) \
-	)
+#define DUK_HOBJECT_GET_CLASS_STRING(heap, h) \
+	DUK_HEAP_GET_STRING((heap), DUK_HOBJECT_CLASS_NUMBER_TO_STRIDX(DUK_HOBJECT_GET_CLASS_NUMBER((h))))
 
 /*
  *  Macros for property handling
  */
 
 #if defined(DUK_USE_HEAPPTR16)
-#define DUK_HOBJECT_GET_PROTOTYPE(heap,h) \
-	((duk_hobject *) DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->prototype16))
-#define DUK_HOBJECT_SET_PROTOTYPE(heap,h,x) do { \
+#define DUK_HOBJECT_GET_PROTOTYPE(heap, h) ((duk_hobject *) DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->prototype16))
+#define DUK_HOBJECT_SET_PROTOTYPE(heap, h, x) \
+	do { \
 		(h)->prototype16 = DUK_USE_HEAPPTR_ENC16((heap)->heap_udata, (void *) (x)); \
 	} while (0)
 #else
-#define DUK_HOBJECT_GET_PROTOTYPE(heap,h) \
-	((h)->prototype)
-#define DUK_HOBJECT_SET_PROTOTYPE(heap,h,x) do { \
+#define DUK_HOBJECT_GET_PROTOTYPE(heap, h) ((h)->prototype)
+#define DUK_HOBJECT_SET_PROTOTYPE(heap, h, x) \
+	do { \
 		(h)->prototype = (x); \
 	} while (0)
 #endif
 
 /* Set prototype, DECREF earlier value, INCREF new value (tolerating NULLs). */
-#define DUK_HOBJECT_SET_PROTOTYPE_UPDREF(thr,h,p)       duk_hobject_set_prototype_updref((thr), (h), (p))
+#define DUK_HOBJECT_SET_PROTOTYPE_UPDREF(thr, h, p) duk_hobject_set_prototype_updref((thr), (h), (p))
 
 /* Set initial prototype, assume NULL previous prototype, INCREF new value,
  * tolerate NULL.
  */
-#define DUK_HOBJECT_SET_PROTOTYPE_INIT_INCREF(thr,h,proto) do { \
+#define DUK_HOBJECT_SET_PROTOTYPE_INIT_INCREF(thr, h, proto) \
+	do { \
 		duk_hthread *duk__thr = (thr); \
 		duk_hobject *duk__obj = (h); \
 		duk_hobject *duk__proto = (proto); \
@@ -6692,9 +7216,9 @@ DUK_INTERNAL_DECL void duk_hstring_init_charlen(duk_hstring *h);
  */
 
 #if defined(DUK_USE_HEAPPTR16)
-#define DUK_HOBJECT_HAS_FINALIZER_FAST(heap,h) duk_hobject_has_finalizer_fast_raw((heap), (h))
+#define DUK_HOBJECT_HAS_FINALIZER_FAST(heap, h) duk_hobject_has_finalizer_fast_raw((heap), (h))
 #else
-#define DUK_HOBJECT_HAS_FINALIZER_FAST(heap,h) duk_hobject_has_finalizer_fast_raw((h))
+#define DUK_HOBJECT_HAS_FINALIZER_FAST(heap, h) duk_hobject_has_finalizer_fast_raw((h))
 #endif
 
 /*
@@ -6708,18 +7232,18 @@ DUK_INTERNAL_DECL void duk_hstring_init_charlen(duk_hstring *h);
  * so anything above 0x80000000 will cause trouble now.
  */
 #if defined(DUK_USE_OBJSIZES16)
-#define DUK_HOBJECT_MAX_PROPERTIES       0x0000ffffUL
+#define DUK_HOBJECT_MAX_PROPERTIES 0x0000ffffUL
 #else
-#define DUK_HOBJECT_MAX_PROPERTIES       0x3fffffffUL   /* 2**30-1 ~= 1G properties */
+#define DUK_HOBJECT_MAX_PROPERTIES 0x3fffffffUL /* 2**30-1 ~= 1G properties */
 #endif
 
 /* internal align target for props allocation, must be 2*n for some n */
 #if (DUK_USE_ALIGN_BY == 4)
-#define DUK_HOBJECT_ALIGN_TARGET         4
+#define DUK_HOBJECT_ALIGN_TARGET 4
 #elif (DUK_USE_ALIGN_BY == 8)
-#define DUK_HOBJECT_ALIGN_TARGET         8
+#define DUK_HOBJECT_ALIGN_TARGET 8
 #elif (DUK_USE_ALIGN_BY == 1)
-#define DUK_HOBJECT_ALIGN_TARGET         1
+#define DUK_HOBJECT_ALIGN_TARGET 1
 #else
 #error invalid DUK_USE_ALIGN_BY
 #endif
@@ -6728,10 +7252,10 @@ DUK_INTERNAL_DECL void duk_hstring_init_charlen(duk_hstring *h);
  *  PC-to-line constants
  */
 
-#define DUK_PC2LINE_SKIP    64
+#define DUK_PC2LINE_SKIP 64
 
 /* maximum length for a SKIP-1 diffstream: 35 bits per entry, rounded up to bytes */
-#define DUK_PC2LINE_MAX_DIFF_LENGTH    (((DUK_PC2LINE_SKIP - 1) * 35 + 7) / 8)
+#define DUK_PC2LINE_MAX_DIFF_LENGTH (((DUK_PC2LINE_SKIP - 1) * 35 + 7) / 8)
 
 /*
  *  Struct defs
@@ -6758,9 +7282,9 @@ struct duk_propdesc {
 	duk_hobject *set;
 
 	/* for updating (all are set to < 0 for virtual properties) */
-	duk_int_t e_idx;  /* prop index in 'entry part', < 0 if not there */
-	duk_int_t h_idx;  /* prop index in 'hash part', < 0 if not there */
-	duk_int_t a_idx;  /* prop index in 'array part', < 0 if not there */
+	duk_int_t e_idx; /* prop index in 'entry part', < 0 if not there */
+	duk_int_t h_idx; /* prop index in 'hash part', < 0 if not there */
+	duk_int_t a_idx; /* prop index in 'array part', < 0 if not there */
 };
 
 struct duk_hobject {
@@ -6855,11 +7379,11 @@ struct duk_hobject {
 	duk_uint16_t h_size16;
 #endif
 #else
-	duk_uint32_t e_size;  /* entry part size */
-	duk_uint32_t e_next;  /* index for next new key ([0,e_next[ are gc reachable) */
-	duk_uint32_t a_size;  /* array part size (entirely gc reachable) */
+	duk_uint32_t e_size; /* entry part size */
+	duk_uint32_t e_next; /* index for next new key ([0,e_next[ are gc reachable) */
+	duk_uint32_t a_size; /* array part size (entirely gc reachable) */
 #if defined(DUK_USE_HOBJECT_HASH_PART)
-	duk_uint32_t h_size;  /* hash part size or 0 if unused */
+	duk_uint32_t h_size; /* hash part size or 0 if unused */
 #endif
 #endif
 };
@@ -6870,7 +7394,7 @@ struct duk_hobject {
 
 #if !defined(DUK_SINGLE_FILE)
 DUK_INTERNAL_DECL duk_uint8_t duk_class_number_to_stridx[32];
-#endif  /* !DUK_SINGLE_FILE */
+#endif /* !DUK_SINGLE_FILE */
 
 /*
  *  Prototypes
@@ -6899,41 +7423,46 @@ DUK_INTERNAL_DECL void duk_hobject_realloc_props(duk_hthread *thr,
                                                  duk_uint32_t new_a_size,
                                                  duk_uint32_t new_h_size,
                                                  duk_bool_t abandon_array);
-DUK_INTERNAL_DECL void duk_hobject_resize_entrypart(duk_hthread *thr,
-                                                    duk_hobject *obj,
-                                                    duk_uint32_t new_e_size);
-#if 0  /*unused*/
+DUK_INTERNAL_DECL void duk_hobject_resize_entrypart(duk_hthread *thr, duk_hobject *obj, duk_uint32_t new_e_size);
+#if 0 /*unused*/
 DUK_INTERNAL_DECL void duk_hobject_resize_arraypart(duk_hthread *thr,
                                                     duk_hobject *obj,
                                                     duk_uint32_t new_a_size);
 #endif
 
 /* low-level property functions */
-DUK_INTERNAL_DECL duk_bool_t duk_hobject_find_existing_entry(duk_heap *heap, duk_hobject *obj, duk_hstring *key, duk_int_t *e_idx, duk_int_t *h_idx);
-DUK_INTERNAL_DECL duk_tval *duk_hobject_find_existing_entry_tval_ptr(duk_heap *heap, duk_hobject *obj, duk_hstring *key);
-DUK_INTERNAL_DECL duk_tval *duk_hobject_find_existing_entry_tval_ptr_and_attrs(duk_heap *heap, duk_hobject *obj, duk_hstring *key, duk_uint_t *out_attrs);
-DUK_INTERNAL_DECL duk_tval *duk_hobject_find_existing_array_entry_tval_ptr(duk_heap *heap, duk_hobject *obj, duk_uarridx_t i);
-DUK_INTERNAL_DECL duk_bool_t duk_hobject_get_own_propdesc(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_propdesc *out_desc, duk_small_uint_t flags);
-
-/* XXX: when optimizing for guaranteed property slots, use a guaranteed
- * slot for internal value; this call can then access it directly.
- */
-#define duk_hobject_get_internal_value_tval_ptr(heap,obj) \
-	duk_hobject_find_existing_entry_tval_ptr((heap), (obj), DUK_HEAP_STRING_INT_VALUE((heap)))
+DUK_INTERNAL_DECL duk_bool_t
+duk_hobject_find_entry(duk_heap *heap, duk_hobject *obj, duk_hstring *key, duk_int_t *e_idx, duk_int_t *h_idx);
+DUK_INTERNAL_DECL duk_tval *duk_hobject_find_entry_tval_ptr(duk_heap *heap, duk_hobject *obj, duk_hstring *key);
+DUK_INTERNAL_DECL duk_tval *duk_hobject_find_entry_tval_ptr_stridx(duk_heap *heap, duk_hobject *obj, duk_small_uint_t stridx);
+DUK_INTERNAL_DECL duk_tval *duk_hobject_find_entry_tval_ptr_and_attrs(duk_heap *heap,
+                                                                      duk_hobject *obj,
+                                                                      duk_hstring *key,
+                                                                      duk_uint_t *out_attrs);
+DUK_INTERNAL_DECL duk_tval *duk_hobject_find_array_entry_tval_ptr(duk_heap *heap, duk_hobject *obj, duk_uarridx_t i);
+DUK_INTERNAL_DECL duk_bool_t
+duk_hobject_get_own_propdesc(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_propdesc *out_desc, duk_small_uint_t flags);
 
 /* core property functions */
 DUK_INTERNAL_DECL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj, duk_tval *tv_key);
-DUK_INTERNAL_DECL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj, duk_tval *tv_key, duk_tval *tv_val, duk_bool_t throw_flag);
+DUK_INTERNAL_DECL duk_bool_t
+duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj, duk_tval *tv_key, duk_tval *tv_val, duk_bool_t throw_flag);
 DUK_INTERNAL_DECL duk_bool_t duk_hobject_delprop(duk_hthread *thr, duk_tval *tv_obj, duk_tval *tv_key, duk_bool_t throw_flag);
 DUK_INTERNAL_DECL duk_bool_t duk_hobject_hasprop(duk_hthread *thr, duk_tval *tv_obj, duk_tval *tv_key);
 
 /* internal property functions */
-#define DUK_DELPROP_FLAG_THROW  (1U << 0)
-#define DUK_DELPROP_FLAG_FORCE  (1U << 1)
+#define DUK_DELPROP_FLAG_THROW (1U << 0)
+#define DUK_DELPROP_FLAG_FORCE (1U << 1)
 DUK_INTERNAL_DECL duk_bool_t duk_hobject_delprop_raw(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_small_uint_t flags);
 DUK_INTERNAL_DECL duk_bool_t duk_hobject_hasprop_raw(duk_hthread *thr, duk_hobject *obj, duk_hstring *key);
-DUK_INTERNAL_DECL void duk_hobject_define_property_internal(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_small_uint_t flags);
-DUK_INTERNAL_DECL void duk_hobject_define_property_internal_arridx(duk_hthread *thr, duk_hobject *obj, duk_uarridx_t arr_idx, duk_small_uint_t flags);
+DUK_INTERNAL_DECL void duk_hobject_define_property_internal(duk_hthread *thr,
+                                                            duk_hobject *obj,
+                                                            duk_hstring *key,
+                                                            duk_small_uint_t flags);
+DUK_INTERNAL_DECL void duk_hobject_define_property_internal_arridx(duk_hthread *thr,
+                                                                   duk_hobject *obj,
+                                                                   duk_uarridx_t arr_idx,
+                                                                   duk_small_uint_t flags);
 DUK_INTERNAL_DECL duk_size_t duk_hobject_get_length(duk_hthread *thr, duk_hobject *obj);
 #if defined(DUK_USE_HEAPPTR16)
 DUK_INTERNAL_DECL duk_bool_t duk_hobject_has_finalizer_fast_raw(duk_heap *heap, duk_hobject *obj);
@@ -6964,8 +7493,10 @@ DUK_INTERNAL_DECL duk_bool_t duk_hobject_object_is_sealed_frozen_helper(duk_hthr
 DUK_INTERNAL_DECL duk_bool_t duk_hobject_object_ownprop_helper(duk_hthread *thr, duk_small_uint_t required_desc_flags);
 
 /* internal properties */
-DUK_INTERNAL_DECL duk_bool_t duk_hobject_get_internal_value(duk_heap *heap, duk_hobject *obj, duk_tval *tv);
+DUK_INTERNAL_DECL duk_tval *duk_hobject_get_internal_value_tval_ptr(duk_heap *heap, duk_hobject *obj);
 DUK_INTERNAL_DECL duk_hstring *duk_hobject_get_internal_value_string(duk_heap *heap, duk_hobject *obj);
+DUK_INTERNAL_DECL duk_harray *duk_hobject_get_formals(duk_hthread *thr, duk_hobject *obj);
+DUK_INTERNAL_DECL duk_hobject *duk_hobject_get_varmap(duk_hthread *thr, duk_hobject *obj);
 
 /* hobject management functions */
 DUK_INTERNAL_DECL void duk_hobject_compact_props(duk_hthread *thr, duk_hobject *obj);
@@ -6991,7 +7522,10 @@ DUK_INTERNAL_DECL duk_uint_fast32_t duk_hobject_pc2line_query(duk_hthread *thr,
 #endif
 
 /* misc */
-DUK_INTERNAL_DECL duk_bool_t duk_hobject_prototype_chain_contains(duk_hthread *thr, duk_hobject *h, duk_hobject *p, duk_bool_t ignore_loop);
+DUK_INTERNAL_DECL duk_bool_t duk_hobject_prototype_chain_contains(duk_hthread *thr,
+                                                                  duk_hobject *h,
+                                                                  duk_hobject *p,
+                                                                  duk_bool_t ignore_loop);
 
 #if !defined(DUK_USE_OBJECT_BUILTIN)
 /* These declarations are needed when related built-in is disabled and
@@ -7001,7 +7535,7 @@ DUK_INTERNAL_DECL duk_ret_t duk_bi_object_prototype_to_string(duk_hthread *thr);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_function_prototype(duk_hthread *thr);
 #endif
 
-#endif  /* DUK_HOBJECT_H_INCLUDED */
+#endif /* DUK_HOBJECT_H_INCLUDED */
 /* #include duk_hcompfunc.h */
 /*
  *  Heap compiled function (ECMAScript function) representation.
@@ -7020,50 +7554,55 @@ DUK_INTERNAL_DECL duk_ret_t duk_bi_function_prototype(duk_hthread *thr);
 /* XXX: casts could be improved, especially for GET/SET DATA */
 
 #if defined(DUK_USE_HEAPPTR16)
-#define DUK_HCOMPFUNC_GET_DATA(heap,h) \
-	((duk_hbuffer_fixed *) (void *) DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->data16))
-#define DUK_HCOMPFUNC_SET_DATA(heap,h,v) do { \
+#define DUK_HCOMPFUNC_GET_DATA(heap, h) ((duk_hbuffer_fixed *) (void *) DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->data16))
+#define DUK_HCOMPFUNC_SET_DATA(heap, h, v) \
+	do { \
 		(h)->data16 = DUK_USE_HEAPPTR_ENC16((heap)->heap_udata, (void *) (v)); \
 	} while (0)
-#define DUK_HCOMPFUNC_GET_FUNCS(heap,h)  \
-	((duk_hobject **) (void *) (DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->funcs16)))
-#define DUK_HCOMPFUNC_SET_FUNCS(heap,h,v)  do { \
+#define DUK_HCOMPFUNC_GET_FUNCS(heap, h) ((duk_hobject **) (void *) (DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->funcs16)))
+#define DUK_HCOMPFUNC_SET_FUNCS(heap, h, v) \
+	do { \
 		(h)->funcs16 = DUK_USE_HEAPPTR_ENC16((heap)->heap_udata, (void *) (v)); \
 	} while (0)
-#define DUK_HCOMPFUNC_GET_BYTECODE(heap,h)  \
-	((duk_instr_t *) (void *) (DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->bytecode16)))
-#define DUK_HCOMPFUNC_SET_BYTECODE(heap,h,v)  do { \
+#define DUK_HCOMPFUNC_GET_BYTECODE(heap, h) ((duk_instr_t *) (void *) (DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->bytecode16)))
+#define DUK_HCOMPFUNC_SET_BYTECODE(heap, h, v) \
+	do { \
 		(h)->bytecode16 = DUK_USE_HEAPPTR_ENC16((heap)->heap_udata, (void *) (v)); \
 	} while (0)
-#define DUK_HCOMPFUNC_GET_LEXENV(heap,h)  \
-	((duk_hobject *) (void *) (DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->lex_env16)))
-#define DUK_HCOMPFUNC_SET_LEXENV(heap,h,v)  do { \
+#define DUK_HCOMPFUNC_GET_LEXENV(heap, h) ((duk_hobject *) (void *) (DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->lex_env16)))
+#define DUK_HCOMPFUNC_SET_LEXENV(heap, h, v) \
+	do { \
 		(h)->lex_env16 = DUK_USE_HEAPPTR_ENC16((heap)->heap_udata, (void *) (v)); \
 	} while (0)
-#define DUK_HCOMPFUNC_GET_VARENV(heap,h)  \
-	((duk_hobject *) (void *) (DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->var_env16)))
-#define DUK_HCOMPFUNC_SET_VARENV(heap,h,v)  do { \
+#define DUK_HCOMPFUNC_GET_VARENV(heap, h) ((duk_hobject *) (void *) (DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (h)->var_env16)))
+#define DUK_HCOMPFUNC_SET_VARENV(heap, h, v) \
+	do { \
 		(h)->var_env16 = DUK_USE_HEAPPTR_ENC16((heap)->heap_udata, (void *) (v)); \
 	} while (0)
 #else
-#define DUK_HCOMPFUNC_GET_DATA(heap,h)  ((duk_hbuffer_fixed *) (void *) (h)->data)
-#define DUK_HCOMPFUNC_SET_DATA(heap,h,v) do { \
+#define DUK_HCOMPFUNC_GET_DATA(heap, h) ((duk_hbuffer_fixed *) (void *) (h)->data)
+#define DUK_HCOMPFUNC_SET_DATA(heap, h, v) \
+	do { \
 		(h)->data = (duk_hbuffer *) (v); \
 	} while (0)
-#define DUK_HCOMPFUNC_GET_FUNCS(heap,h)  ((h)->funcs)
-#define DUK_HCOMPFUNC_SET_FUNCS(heap,h,v)  do { \
+#define DUK_HCOMPFUNC_GET_FUNCS(heap, h) ((h)->funcs)
+#define DUK_HCOMPFUNC_SET_FUNCS(heap, h, v) \
+	do { \
 		(h)->funcs = (v); \
 	} while (0)
-#define DUK_HCOMPFUNC_GET_BYTECODE(heap,h)  ((h)->bytecode)
-#define DUK_HCOMPFUNC_SET_BYTECODE(heap,h,v)  do { \
+#define DUK_HCOMPFUNC_GET_BYTECODE(heap, h) ((h)->bytecode)
+#define DUK_HCOMPFUNC_SET_BYTECODE(heap, h, v) \
+	do { \
 		(h)->bytecode = (v); \
 	} while (0)
-#define DUK_HCOMPFUNC_GET_LEXENV(heap,h)  ((h)->lex_env)
-#define DUK_HCOMPFUNC_SET_LEXENV(heap,h,v)  do { \
+#define DUK_HCOMPFUNC_GET_LEXENV(heap, h) ((h)->lex_env)
+#define DUK_HCOMPFUNC_SET_LEXENV(heap, h, v) \
+	do { \
 		(h)->lex_env = (v); \
 	} while (0)
-#define DUK_HCOMPFUNC_GET_VARENV(heap,h)  ((h)->var_env)
-#define DUK_HCOMPFUNC_SET_VARENV(heap,h,v)  do { \
+#define DUK_HCOMPFUNC_GET_VARENV(heap, h) ((h)->var_env)
+#define DUK_HCOMPFUNC_SET_VARENV(heap, h, v) \
+	do { \
 		(h)->var_env = (v); \
 	} while (0)
 #endif
@@ -7073,72 +7612,56 @@ DUK_INTERNAL_DECL duk_ret_t duk_bi_function_prototype(duk_hthread *thr);
  */
 
 /* Note: assumes 'data' is always a fixed buffer */
-#define DUK_HCOMPFUNC_GET_BUFFER_BASE(heap,h)  \
-	DUK_HBUFFER_FIXED_GET_DATA_PTR((heap), DUK_HCOMPFUNC_GET_DATA((heap), (h)))
+#define DUK_HCOMPFUNC_GET_BUFFER_BASE(heap, h) DUK_HBUFFER_FIXED_GET_DATA_PTR((heap), DUK_HCOMPFUNC_GET_DATA((heap), (h)))
 
-#define DUK_HCOMPFUNC_GET_CONSTS_BASE(heap,h)  \
-	((duk_tval *) (void *) DUK_HCOMPFUNC_GET_BUFFER_BASE((heap), (h)))
+#define DUK_HCOMPFUNC_GET_CONSTS_BASE(heap, h) ((duk_tval *) (void *) DUK_HCOMPFUNC_GET_BUFFER_BASE((heap), (h)))
 
-#define DUK_HCOMPFUNC_GET_FUNCS_BASE(heap,h)  \
-	DUK_HCOMPFUNC_GET_FUNCS((heap), (h))
+#define DUK_HCOMPFUNC_GET_FUNCS_BASE(heap, h) DUK_HCOMPFUNC_GET_FUNCS((heap), (h))
 
-#define DUK_HCOMPFUNC_GET_CODE_BASE(heap,h)  \
-	DUK_HCOMPFUNC_GET_BYTECODE((heap), (h))
+#define DUK_HCOMPFUNC_GET_CODE_BASE(heap, h) DUK_HCOMPFUNC_GET_BYTECODE((heap), (h))
 
-#define DUK_HCOMPFUNC_GET_CONSTS_END(heap,h)  \
-	((duk_tval *) (void *) DUK_HCOMPFUNC_GET_FUNCS((heap), (h)))
+#define DUK_HCOMPFUNC_GET_CONSTS_END(heap, h) ((duk_tval *) (void *) DUK_HCOMPFUNC_GET_FUNCS((heap), (h)))
 
-#define DUK_HCOMPFUNC_GET_FUNCS_END(heap,h)  \
-	((duk_hobject **) (void *) DUK_HCOMPFUNC_GET_BYTECODE((heap), (h)))
+#define DUK_HCOMPFUNC_GET_FUNCS_END(heap, h) ((duk_hobject **) (void *) DUK_HCOMPFUNC_GET_BYTECODE((heap), (h)))
 
 /* XXX: double evaluation of DUK_HCOMPFUNC_GET_DATA() */
-#define DUK_HCOMPFUNC_GET_CODE_END(heap,h)  \
+#define DUK_HCOMPFUNC_GET_CODE_END(heap, h) \
 	((duk_instr_t *) (void *) (DUK_HBUFFER_FIXED_GET_DATA_PTR((heap), DUK_HCOMPFUNC_GET_DATA((heap), (h))) + \
-	                DUK_HBUFFER_GET_SIZE((duk_hbuffer *) DUK_HCOMPFUNC_GET_DATA((heap), h))))
-
-#define DUK_HCOMPFUNC_GET_CONSTS_SIZE(heap,h)  \
-	( \
-	 (duk_size_t) \
-	 ( \
-	   ((const duk_uint8_t *) DUK_HCOMPFUNC_GET_CONSTS_END((heap), (h))) - \
-	   ((const duk_uint8_t *) DUK_HCOMPFUNC_GET_CONSTS_BASE((heap), (h))) \
-	 ) \
-	)
-
-#define DUK_HCOMPFUNC_GET_FUNCS_SIZE(heap,h)  \
-	( \
-	 (duk_size_t) \
-	 ( \
-	   ((const duk_uint8_t *) DUK_HCOMPFUNC_GET_FUNCS_END((heap), (h))) - \
-	   ((const duk_uint8_t *) DUK_HCOMPFUNC_GET_FUNCS_BASE((heap), (h))) \
-	 ) \
-	)
-
-#define DUK_HCOMPFUNC_GET_CODE_SIZE(heap,h)  \
-	( \
-	 (duk_size_t) \
-	 ( \
-	   ((const duk_uint8_t *) DUK_HCOMPFUNC_GET_CODE_END((heap),(h))) - \
-	   ((const duk_uint8_t *) DUK_HCOMPFUNC_GET_CODE_BASE((heap),(h))) \
-	 ) \
-	)
-
-#define DUK_HCOMPFUNC_GET_CONSTS_COUNT(heap,h)  \
-	((duk_size_t) (DUK_HCOMPFUNC_GET_CONSTS_SIZE((heap), (h)) / sizeof(duk_tval)))
-
-#define DUK_HCOMPFUNC_GET_FUNCS_COUNT(heap,h)  \
-	((duk_size_t) (DUK_HCOMPFUNC_GET_FUNCS_SIZE((heap), (h)) / sizeof(duk_hobject *)))
-
-#define DUK_HCOMPFUNC_GET_CODE_COUNT(heap,h)  \
-	((duk_size_t) (DUK_HCOMPFUNC_GET_CODE_SIZE((heap), (h)) / sizeof(duk_instr_t)))
+	                           DUK_HBUFFER_GET_SIZE((duk_hbuffer *) DUK_HCOMPFUNC_GET_DATA((heap), h))))
+
+#define DUK_HCOMPFUNC_GET_CONSTS_SIZE(heap, h) \
+	((duk_size_t) (((const duk_uint8_t *) DUK_HCOMPFUNC_GET_CONSTS_END((heap), (h))) - \
+	               ((const duk_uint8_t *) DUK_HCOMPFUNC_GET_CONSTS_BASE((heap), (h)))))
+
+#define DUK_HCOMPFUNC_GET_FUNCS_SIZE(heap, h) \
+	((duk_size_t) (((const duk_uint8_t *) DUK_HCOMPFUNC_GET_FUNCS_END((heap), (h))) - \
+	               ((const duk_uint8_t *) DUK_HCOMPFUNC_GET_FUNCS_BASE((heap), (h)))))
+
+#define DUK_HCOMPFUNC_GET_CODE_SIZE(heap, h) \
+	((duk_size_t) (((const duk_uint8_t *) DUK_HCOMPFUNC_GET_CODE_END((heap), (h))) - \
+	               ((const duk_uint8_t *) DUK_HCOMPFUNC_GET_CODE_BASE((heap), (h)))))
+
+#define DUK_HCOMPFUNC_GET_CONSTS_COUNT(heap, h) ((duk_size_t) (DUK_HCOMPFUNC_GET_CONSTS_SIZE((heap), (h)) / sizeof(duk_tval)))
+
+#define DUK_HCOMPFUNC_GET_FUNCS_COUNT(heap, h) ((duk_size_t) (DUK_HCOMPFUNC_GET_FUNCS_SIZE((heap), (h)) / sizeof(duk_hobject *)))
+
+#define DUK_HCOMPFUNC_GET_CODE_COUNT(heap, h) ((duk_size_t) (DUK_HCOMPFUNC_GET_CODE_SIZE((heap), (h)) / sizeof(duk_instr_t)))
 
 /*
  *  Validity assert
  */
 
-#define DUK_ASSERT_HCOMPFUNC_VALID(h) do { \
-		DUK_ASSERT((h) != NULL); \
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL_DECL void duk_hcompfunc_assert_valid(duk_hcompfunc *h);
+#define DUK_HCOMPFUNC_ASSERT_VALID(h) \
+	do { \
+		duk_hcompfunc_assert_valid((h)); \
+	} while (0)
+#else
+#define DUK_HCOMPFUNC_ASSERT_VALID(h) \
+	do { \
 	} while (0)
+#endif
 
 /*
  *  Main struct
@@ -7224,8 +7747,8 @@ struct duk_hcompfunc {
 	 *  at run time, except for debugging, so it is not maintained.
 	 */
 
-	duk_uint16_t nregs;                /* regs to allocate */
-	duk_uint16_t nargs;                /* number of arguments allocated to regs */
+	duk_uint16_t nregs; /* regs to allocate */
+	duk_uint16_t nargs; /* number of arguments allocated to regs */
 
 	/*
 	 *  Additional control information is placed into the object itself
@@ -7272,7 +7795,7 @@ struct duk_hcompfunc {
 #endif
 };
 
-#endif  /* DUK_HCOMPFUNC_H_INCLUDED */
+#endif /* DUK_HCOMPFUNC_H_INCLUDED */
 /* #include duk_hnatfunc.h */
 /*
  *  Heap native function representation.
@@ -7281,8 +7804,20 @@ struct duk_hcompfunc {
 #if !defined(DUK_HNATFUNC_H_INCLUDED)
 #define DUK_HNATFUNC_H_INCLUDED
 
-#define DUK_HNATFUNC_NARGS_VARARGS  ((duk_int16_t) -1)
-#define DUK_HNATFUNC_NARGS_MAX      ((duk_int16_t) 0x7fff)
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL_DECL void duk_hnatfunc_assert_valid(duk_hnatfunc *h);
+#define DUK_HNATFUNC_ASSERT_VALID(h) \
+	do { \
+		duk_hnatfunc_assert_valid((h)); \
+	} while (0)
+#else
+#define DUK_HNATFUNC_ASSERT_VALID(h) \
+	do { \
+	} while (0)
+#endif
+
+#define DUK_HNATFUNC_NARGS_VARARGS ((duk_int16_t) -1)
+#define DUK_HNATFUNC_NARGS_MAX     ((duk_int16_t) 0x7fff)
 
 struct duk_hnatfunc {
 	/* shared object part */
@@ -7305,7 +7840,7 @@ struct duk_hnatfunc {
 	 */
 };
 
-#endif  /* DUK_HNATFUNC_H_INCLUDED */
+#endif /* DUK_HNATFUNC_H_INCLUDED */
 /* #include duk_hboundfunc.h */
 /*
  *  Bound function representation.
@@ -7319,15 +7854,17 @@ struct duk_hnatfunc {
  */
 #define DUK_HBOUNDFUNC_MAX_ARGS 0x20000000UL
 
-#define DUK_ASSERT_HBOUNDFUNC_VALID(h) do { \
-		DUK_ASSERT((h) != NULL); \
-		DUK_ASSERT(DUK_HOBJECT_IS_BOUNDFUNC((duk_hobject *) (h))); \
-		DUK_ASSERT(DUK_TVAL_IS_LIGHTFUNC(&(h)->target) || \
-		           (DUK_TVAL_IS_OBJECT(&(h)->target) && \
-		            DUK_HOBJECT_IS_CALLABLE(DUK_TVAL_GET_OBJECT(&(h)->target)))); \
-		DUK_ASSERT(!DUK_TVAL_IS_UNUSED(&(h)->this_binding)); \
-		DUK_ASSERT((h)->nargs == 0 || (h)->args != NULL); \
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL_DECL void duk_hboundfunc_assert_valid(duk_hboundfunc *h);
+#define DUK_HBOUNDFUNC_ASSERT_VALID(h) \
+	do { \
+		duk_hboundfunc_assert_valid((h)); \
 	} while (0)
+#else
+#define DUK_HBOUNDFUNC_ASSERT_VALID(h) \
+	do { \
+	} while (0)
+#endif
 
 struct duk_hboundfunc {
 	/* Shared object part. */
@@ -7342,11 +7879,11 @@ struct duk_hboundfunc {
 	duk_tval this_binding;
 
 	/* Arguments to prepend. */
-	duk_tval *args;  /* Separate allocation. */
+	duk_tval *args; /* Separate allocation. */
 	duk_idx_t nargs;
 };
 
-#endif  /* DUK_HBOUNDFUNC_H_INCLUDED */
+#endif /* DUK_HBOUNDFUNC_H_INCLUDED */
 /* #include duk_hbufobj.h */
 /*
  *  Heap Buffer object representation.  Used for all Buffer variants.
@@ -7358,51 +7895,37 @@ struct duk_hboundfunc {
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
 
 /* All element accessors are host endian now (driven by TypedArray spec). */
-#define DUK_HBUFOBJ_ELEM_UINT8           0
-#define DUK_HBUFOBJ_ELEM_UINT8CLAMPED    1
-#define DUK_HBUFOBJ_ELEM_INT8            2
-#define DUK_HBUFOBJ_ELEM_UINT16          3
-#define DUK_HBUFOBJ_ELEM_INT16           4
-#define DUK_HBUFOBJ_ELEM_UINT32          5
-#define DUK_HBUFOBJ_ELEM_INT32           6
-#define DUK_HBUFOBJ_ELEM_FLOAT32         7
-#define DUK_HBUFOBJ_ELEM_FLOAT64         8
-#define DUK_HBUFOBJ_ELEM_MAX             8
-
-#define DUK_ASSERT_HBUFOBJ_VALID(h) do { \
-		DUK_ASSERT((h) != NULL); \
-		DUK_ASSERT((h)->shift <= 3); \
-		DUK_ASSERT((h)->elem_type <= DUK_HBUFOBJ_ELEM_MAX); \
-		DUK_ASSERT(((h)->shift == 0 && (h)->elem_type == DUK_HBUFOBJ_ELEM_UINT8) || \
-		           ((h)->shift == 0 && (h)->elem_type == DUK_HBUFOBJ_ELEM_UINT8CLAMPED) || \
-		           ((h)->shift == 0 && (h)->elem_type == DUK_HBUFOBJ_ELEM_INT8) || \
-		           ((h)->shift == 1 && (h)->elem_type == DUK_HBUFOBJ_ELEM_UINT16) || \
-		           ((h)->shift == 1 && (h)->elem_type == DUK_HBUFOBJ_ELEM_INT16) || \
-		           ((h)->shift == 2 && (h)->elem_type == DUK_HBUFOBJ_ELEM_UINT32) || \
-		           ((h)->shift == 2 && (h)->elem_type == DUK_HBUFOBJ_ELEM_INT32) || \
-		           ((h)->shift == 2 && (h)->elem_type == DUK_HBUFOBJ_ELEM_FLOAT32) || \
-		           ((h)->shift == 3 && (h)->elem_type == DUK_HBUFOBJ_ELEM_FLOAT64)); \
-		DUK_ASSERT((h)->is_typedarray == 0 || (h)->is_typedarray == 1); \
-		DUK_ASSERT(DUK_HOBJECT_IS_BUFOBJ((duk_hobject *) (h))); \
-		if ((h)->buf == NULL) { \
-			DUK_ASSERT((h)->offset == 0); \
-			DUK_ASSERT((h)->length == 0); \
-		} else { \
-			/* No assertions for offset or length; in particular, \
-			 * it's OK for length to be longer than underlying \
-			 * buffer.  Just ensure they don't wrap when added. \
-			 */ \
-			DUK_ASSERT((h)->offset + (h)->length >= (h)->offset); \
-		} \
+#define DUK_HBUFOBJ_ELEM_UINT8        0
+#define DUK_HBUFOBJ_ELEM_UINT8CLAMPED 1
+#define DUK_HBUFOBJ_ELEM_INT8         2
+#define DUK_HBUFOBJ_ELEM_UINT16       3
+#define DUK_HBUFOBJ_ELEM_INT16        4
+#define DUK_HBUFOBJ_ELEM_UINT32       5
+#define DUK_HBUFOBJ_ELEM_INT32        6
+#define DUK_HBUFOBJ_ELEM_FLOAT32      7
+#define DUK_HBUFOBJ_ELEM_FLOAT64      8
+#define DUK_HBUFOBJ_ELEM_MAX          8
+
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL_DECL void duk_hbufobj_assert_valid(duk_hbufobj *h);
+#define DUK_HBUFOBJ_ASSERT_VALID(h) \
+	do { \
+		duk_hbufobj_assert_valid((h)); \
 	} while (0)
+#else
+#define DUK_HBUFOBJ_ASSERT_VALID(h) \
+	do { \
+	} while (0)
+#endif
 
 /* Get the current data pointer (caller must ensure buf != NULL) as a
  * duk_uint8_t ptr.  Note that the result may be NULL if the underlying
  * buffer has zero size and is not a fixed buffer.
  */
-#define DUK_HBUFOBJ_GET_SLICE_BASE(heap,h) \
-	(DUK_ASSERT_EXPR((h) != NULL), DUK_ASSERT_EXPR((h)->buf != NULL), \
-	(((duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR((heap), (h)->buf)) + (h)->offset))
+#define DUK_HBUFOBJ_GET_SLICE_BASE(heap, h) \
+	(DUK_ASSERT_EXPR((h) != NULL), \
+	 DUK_ASSERT_EXPR((h)->buf != NULL), \
+	 (((duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR((heap), (h)->buf)) + (h)->offset))
 
 /* True if slice is full, i.e. offset is zero and length covers the entire
  * buffer.  This status may change independently of the duk_hbufobj if
@@ -7410,15 +7933,17 @@ struct duk_hboundfunc {
  * being changed.
  */
 #define DUK_HBUFOBJ_FULL_SLICE(h) \
-	(DUK_ASSERT_EXPR((h) != NULL), DUK_ASSERT_EXPR((h)->buf != NULL), \
-	((h)->offset == 0 && (h)->length == DUK_HBUFFER_GET_SIZE((h)->buf)))
+	(DUK_ASSERT_EXPR((h) != NULL), \
+	 DUK_ASSERT_EXPR((h)->buf != NULL), \
+	 ((h)->offset == 0 && (h)->length == DUK_HBUFFER_GET_SIZE((h)->buf)))
 
 /* Validate that the whole slice [0,length[ is contained in the underlying
  * buffer.  Caller must ensure 'buf' != NULL.
  */
 #define DUK_HBUFOBJ_VALID_SLICE(h) \
-	(DUK_ASSERT_EXPR((h) != NULL), DUK_ASSERT_EXPR((h)->buf != NULL), \
-	((h)->offset + (h)->length <= DUK_HBUFFER_GET_SIZE((h)->buf)))
+	(DUK_ASSERT_EXPR((h) != NULL), \
+	 DUK_ASSERT_EXPR((h)->buf != NULL), \
+	 ((h)->offset + (h)->length <= DUK_HBUFFER_GET_SIZE((h)->buf)))
 
 /* Validate byte read/write for virtual 'offset', i.e. check that the
  * offset, taking into account h->offset, is within the underlying
@@ -7427,13 +7952,11 @@ struct duk_hboundfunc {
  * behavior (e.g. if an underlying dynamic buffer changes after being
  * setup).  Caller must ensure 'buf' != NULL.
  */
-#define DUK_HBUFOBJ_VALID_BYTEOFFSET_INCL(h,off) \
-	(DUK_ASSERT_EXPR((h) != NULL), DUK_ASSERT_EXPR((h)->buf != NULL), \
-	((h)->offset + (off) < DUK_HBUFFER_GET_SIZE((h)->buf)))
+#define DUK_HBUFOBJ_VALID_BYTEOFFSET_INCL(h, off) \
+	(DUK_ASSERT_EXPR((h) != NULL), DUK_ASSERT_EXPR((h)->buf != NULL), ((h)->offset + (off) < DUK_HBUFFER_GET_SIZE((h)->buf)))
 
-#define DUK_HBUFOBJ_VALID_BYTEOFFSET_EXCL(h,off) \
-	(DUK_ASSERT_EXPR((h) != NULL), DUK_ASSERT_EXPR((h)->buf != NULL), \
-	((h)->offset + (off) <= DUK_HBUFFER_GET_SIZE((h)->buf)))
+#define DUK_HBUFOBJ_VALID_BYTEOFFSET_EXCL(h, off) \
+	(DUK_ASSERT_EXPR((h) != NULL), DUK_ASSERT_EXPR((h)->buf != NULL), ((h)->offset + (off) <= DUK_HBUFFER_GET_SIZE((h)->buf)))
 
 /* Clamp an input byte length (already assumed to be within the nominal
  * duk_hbufobj 'length') to the current dynamic buffer limits to yield
@@ -7441,12 +7964,10 @@ struct duk_hboundfunc {
  * be invalidated by any side effect because it may trigger a user
  * callback that resizes the underlying buffer.
  */
-#define DUK_HBUFOBJ_CLAMP_BYTELENGTH(h,len) \
-	(DUK_ASSERT_EXPR((h) != NULL), \
-	duk_hbufobj_clamp_bytelength((h), (len)))
+#define DUK_HBUFOBJ_CLAMP_BYTELENGTH(h, len) (DUK_ASSERT_EXPR((h) != NULL), duk_hbufobj_clamp_bytelength((h), (len)))
 
 /* Typed arrays have virtual indices, ArrayBuffer and DataView do not. */
-#define DUK_HBUFOBJ_HAS_VIRTUAL_INDICES(h)  ((h)->is_typedarray)
+#define DUK_HBUFOBJ_HAS_VIRTUAL_INDICES(h) ((h)->is_typedarray)
 
 struct duk_hbufobj {
 	/* Shared object part. */
@@ -7471,26 +7992,36 @@ struct duk_hbufobj {
 	 * be dynamic and its pointer unstable.
 	 */
 
-	duk_uint_t offset;       /* byte offset to buf */
-	duk_uint_t length;       /* byte index limit for element access, exclusive */
-	duk_uint8_t shift;       /* element size shift:
-	                          *   0 = u8/i8
-	                          *   1 = u16/i16
-	                          *   2 = u32/i32/float
-	                          *   3 = double
-	                          */
-	duk_uint8_t elem_type;   /* element type */
+	duk_uint_t offset; /* byte offset to buf */
+	duk_uint_t length; /* byte index limit for element access, exclusive */
+	duk_uint8_t shift; /* element size shift:
+	                    *   0 = u8/i8
+	                    *   1 = u16/i16
+	                    *   2 = u32/i32/float
+	                    *   3 = double
+	                    */
+	duk_uint8_t elem_type; /* element type */
 	duk_uint8_t is_typedarray;
 };
 
 DUK_INTERNAL_DECL duk_uint_t duk_hbufobj_clamp_bytelength(duk_hbufobj *h_bufobj, duk_uint_t len);
 DUK_INTERNAL_DECL void duk_hbufobj_push_uint8array_from_plain(duk_hthread *thr, duk_hbuffer *h_buf);
-DUK_INTERNAL_DECL void duk_hbufobj_push_validated_read(duk_hthread *thr, duk_hbufobj *h_bufobj, duk_uint8_t *p, duk_small_uint_t elem_size);
-DUK_INTERNAL_DECL void duk_hbufobj_validated_write(duk_hthread *thr, duk_hbufobj *h_bufobj, duk_uint8_t *p, duk_small_uint_t elem_size);
+DUK_INTERNAL_DECL void duk_hbufobj_push_validated_read(duk_hthread *thr,
+                                                       duk_hbufobj *h_bufobj,
+                                                       duk_uint8_t *p,
+                                                       duk_small_uint_t elem_size);
+DUK_INTERNAL_DECL void duk_hbufobj_validated_write(duk_hthread *thr,
+                                                   duk_hbufobj *h_bufobj,
+                                                   duk_uint8_t *p,
+                                                   duk_small_uint_t elem_size);
 DUK_INTERNAL_DECL void duk_hbufobj_promote_plain(duk_hthread *thr, duk_idx_t idx);
 
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
-#endif  /* DUK_HBUFOBJ_H_INCLUDED */
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+
+/* nothing */
+
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_HBUFOBJ_H_INCLUDED */
 /* #include duk_hthread.h */
 /*
  *  Heap thread object representation.
@@ -7508,38 +8039,38 @@ DUK_INTERNAL_DECL void duk_hbufobj_promote_plain(duk_hthread *thr, duk_idx_t idx
  */
 
 /* Initial valstack size, roughly 0.7kiB. */
-#define DUK_VALSTACK_INITIAL_SIZE       96U
+#define DUK_VALSTACK_INITIAL_SIZE 96U
 
 /* Internal extra elements assumed on function entry, always added to
  * user-defined 'extra' for e.g. the duk_check_stack() call.
  */
-#define DUK_VALSTACK_INTERNAL_EXTRA     32U
+#define DUK_VALSTACK_INTERNAL_EXTRA 32U
 
 /* Number of elements guaranteed to be user accessible (in addition to call
  * arguments) on Duktape/C function entry.  This is the major public API
  * commitment.
  */
-#define DUK_VALSTACK_API_ENTRY_MINIMUM  DUK_API_ENTRY_STACK
+#define DUK_VALSTACK_API_ENTRY_MINIMUM DUK_API_ENTRY_STACK
 
 /*
  *  Activation defines
  */
 
-#define DUK_ACT_FLAG_STRICT             (1U << 0)  /* function executes in strict mode */
-#define DUK_ACT_FLAG_TAILCALLED         (1U << 1)  /* activation has tail called one or more times */
-#define DUK_ACT_FLAG_CONSTRUCT          (1U << 2)  /* function executes as a constructor (called via "new") */
-#define DUK_ACT_FLAG_PREVENT_YIELD      (1U << 3)  /* activation prevents yield (native call or "new") */
-#define DUK_ACT_FLAG_DIRECT_EVAL        (1U << 4)  /* activation is a direct eval call */
-#define DUK_ACT_FLAG_CONSTRUCT_PROXY    (1U << 5)  /* activation is for Proxy 'construct' call, special return value handling */
-#define DUK_ACT_FLAG_BREAKPOINT_ACTIVE  (1U << 6)  /* activation has active breakpoint(s) */
+#define DUK_ACT_FLAG_STRICT            (1U << 0) /* function executes in strict mode */
+#define DUK_ACT_FLAG_TAILCALLED        (1U << 1) /* activation has tail called one or more times */
+#define DUK_ACT_FLAG_CONSTRUCT         (1U << 2) /* function executes as a constructor (called via "new") */
+#define DUK_ACT_FLAG_PREVENT_YIELD     (1U << 3) /* activation prevents yield (native call or "new") */
+#define DUK_ACT_FLAG_DIRECT_EVAL       (1U << 4) /* activation is a direct eval call */
+#define DUK_ACT_FLAG_CONSTRUCT_PROXY   (1U << 5) /* activation is for Proxy 'construct' call, special return value handling */
+#define DUK_ACT_FLAG_BREAKPOINT_ACTIVE (1U << 6) /* activation has active breakpoint(s) */
 
-#define DUK_ACT_GET_FUNC(act)           ((act)->func)
+#define DUK_ACT_GET_FUNC(act) ((act)->func)
 
 /*
  *  Flags for __FILE__ / __LINE__ registered into tracedata
  */
 
-#define DUK_TB_FLAG_NOBLAME_FILELINE    (1U << 0)  /* don't report __FILE__ / __LINE__ as fileName/lineNumber */
+#define DUK_TB_FLAG_NOBLAME_FILELINE (1U << 0) /* don't report __FILE__ / __LINE__ as fileName/lineNumber */
 
 /*
  *  Catcher defines
@@ -7548,52 +8079,60 @@ DUK_INTERNAL_DECL void duk_hbufobj_promote_plain(duk_hthread *thr, duk_idx_t idx
 /* XXX: remove catcher type entirely */
 
 /* flags field: LLLLLLFT, L = label (24 bits), F = flags (4 bits), T = type (4 bits) */
-#define DUK_CAT_TYPE_MASK            0x0000000fUL
-#define DUK_CAT_TYPE_BITS            4
-#define DUK_CAT_LABEL_MASK           0xffffff00UL
-#define DUK_CAT_LABEL_BITS           24
-#define DUK_CAT_LABEL_SHIFT          8
-
-#define DUK_CAT_FLAG_CATCH_ENABLED          (1U << 4)   /* catch part will catch */
-#define DUK_CAT_FLAG_FINALLY_ENABLED        (1U << 5)   /* finally part will catch */
-#define DUK_CAT_FLAG_CATCH_BINDING_ENABLED  (1U << 6)   /* request to create catch binding */
-#define DUK_CAT_FLAG_LEXENV_ACTIVE          (1U << 7)   /* catch or with binding is currently active */
-
-#define DUK_CAT_TYPE_UNKNOWN         0
-#define DUK_CAT_TYPE_TCF             1
-#define DUK_CAT_TYPE_LABEL           2
-
-#define DUK_CAT_GET_TYPE(c)          ((c)->flags & DUK_CAT_TYPE_MASK)
-#define DUK_CAT_GET_LABEL(c)         (((c)->flags & DUK_CAT_LABEL_MASK) >> DUK_CAT_LABEL_SHIFT)
-
-#define DUK_CAT_HAS_CATCH_ENABLED(c)           ((c)->flags & DUK_CAT_FLAG_CATCH_ENABLED)
-#define DUK_CAT_HAS_FINALLY_ENABLED(c)         ((c)->flags & DUK_CAT_FLAG_FINALLY_ENABLED)
-#define DUK_CAT_HAS_CATCH_BINDING_ENABLED(c)   ((c)->flags & DUK_CAT_FLAG_CATCH_BINDING_ENABLED)
-#define DUK_CAT_HAS_LEXENV_ACTIVE(c)           ((c)->flags & DUK_CAT_FLAG_LEXENV_ACTIVE)
-
-#define DUK_CAT_SET_CATCH_ENABLED(c)    do { \
+#define DUK_CAT_TYPE_MASK   0x0000000fUL
+#define DUK_CAT_TYPE_BITS   4
+#define DUK_CAT_LABEL_MASK  0xffffff00UL
+#define DUK_CAT_LABEL_BITS  24
+#define DUK_CAT_LABEL_SHIFT 8
+
+#define DUK_CAT_FLAG_CATCH_ENABLED         (1U << 4) /* catch part will catch */
+#define DUK_CAT_FLAG_FINALLY_ENABLED       (1U << 5) /* finally part will catch */
+#define DUK_CAT_FLAG_CATCH_BINDING_ENABLED (1U << 6) /* request to create catch binding */
+#define DUK_CAT_FLAG_LEXENV_ACTIVE         (1U << 7) /* catch or with binding is currently active */
+
+#define DUK_CAT_TYPE_UNKNOWN 0
+#define DUK_CAT_TYPE_TCF     1
+#define DUK_CAT_TYPE_LABEL   2
+
+#define DUK_CAT_GET_TYPE(c)  ((c)->flags & DUK_CAT_TYPE_MASK)
+#define DUK_CAT_GET_LABEL(c) (((c)->flags & DUK_CAT_LABEL_MASK) >> DUK_CAT_LABEL_SHIFT)
+
+#define DUK_CAT_HAS_CATCH_ENABLED(c)         ((c)->flags & DUK_CAT_FLAG_CATCH_ENABLED)
+#define DUK_CAT_HAS_FINALLY_ENABLED(c)       ((c)->flags & DUK_CAT_FLAG_FINALLY_ENABLED)
+#define DUK_CAT_HAS_CATCH_BINDING_ENABLED(c) ((c)->flags & DUK_CAT_FLAG_CATCH_BINDING_ENABLED)
+#define DUK_CAT_HAS_LEXENV_ACTIVE(c)         ((c)->flags & DUK_CAT_FLAG_LEXENV_ACTIVE)
+
+#define DUK_CAT_SET_CATCH_ENABLED(c) \
+	do { \
 		(c)->flags |= DUK_CAT_FLAG_CATCH_ENABLED; \
 	} while (0)
-#define DUK_CAT_SET_FINALLY_ENABLED(c)  do { \
+#define DUK_CAT_SET_FINALLY_ENABLED(c) \
+	do { \
 		(c)->flags |= DUK_CAT_FLAG_FINALLY_ENABLED; \
 	} while (0)
-#define DUK_CAT_SET_CATCH_BINDING_ENABLED(c)    do { \
+#define DUK_CAT_SET_CATCH_BINDING_ENABLED(c) \
+	do { \
 		(c)->flags |= DUK_CAT_FLAG_CATCH_BINDING_ENABLED; \
 	} while (0)
-#define DUK_CAT_SET_LEXENV_ACTIVE(c)    do { \
+#define DUK_CAT_SET_LEXENV_ACTIVE(c) \
+	do { \
 		(c)->flags |= DUK_CAT_FLAG_LEXENV_ACTIVE; \
 	} while (0)
 
-#define DUK_CAT_CLEAR_CATCH_ENABLED(c)    do { \
+#define DUK_CAT_CLEAR_CATCH_ENABLED(c) \
+	do { \
 		(c)->flags &= ~DUK_CAT_FLAG_CATCH_ENABLED; \
 	} while (0)
-#define DUK_CAT_CLEAR_FINALLY_ENABLED(c)  do { \
+#define DUK_CAT_CLEAR_FINALLY_ENABLED(c) \
+	do { \
 		(c)->flags &= ~DUK_CAT_FLAG_FINALLY_ENABLED; \
 	} while (0)
-#define DUK_CAT_CLEAR_CATCH_BINDING_ENABLED(c)    do { \
+#define DUK_CAT_CLEAR_CATCH_BINDING_ENABLED(c) \
+	do { \
 		(c)->flags &= ~DUK_CAT_FLAG_CATCH_BINDING_ENABLED; \
 	} while (0)
-#define DUK_CAT_CLEAR_LEXENV_ACTIVE(c)    do { \
+#define DUK_CAT_CLEAR_LEXENV_ACTIVE(c) \
+	do { \
 		(c)->flags &= ~DUK_CAT_FLAG_LEXENV_ACTIVE; \
 	} while (0)
 
@@ -7602,24 +8141,21 @@ DUK_INTERNAL_DECL void duk_hbufobj_promote_plain(duk_hthread *thr, duk_idx_t idx
  */
 
 #if defined(DUK_USE_ROM_STRINGS)
-#define DUK_HTHREAD_GET_STRING(thr,idx) \
-	((duk_hstring *) DUK_LOSE_CONST(duk_rom_strings_stridx[(idx)]))
-#else  /* DUK_USE_ROM_STRINGS */
+#define DUK_HTHREAD_GET_STRING(thr, idx) ((duk_hstring *) DUK_LOSE_CONST(duk_rom_strings_stridx[(idx)]))
+#else /* DUK_USE_ROM_STRINGS */
 #if defined(DUK_USE_HEAPPTR16)
-#define DUK_HTHREAD_GET_STRING(thr,idx) \
-	((duk_hstring *) DUK_USE_HEAPPTR_DEC16((thr)->heap->heap_udata, (thr)->strs16[(idx)]))
+#define DUK_HTHREAD_GET_STRING(thr, idx) ((duk_hstring *) DUK_USE_HEAPPTR_DEC16((thr)->heap->heap_udata, (thr)->strs16[(idx)]))
 #else
-#define DUK_HTHREAD_GET_STRING(thr,idx) \
-	((thr)->strs[(idx)])
+#define DUK_HTHREAD_GET_STRING(thr, idx) ((thr)->strs[(idx)])
 #endif
-#endif  /* DUK_USE_ROM_STRINGS */
+#endif /* DUK_USE_ROM_STRINGS */
 
 /* values for the state field */
-#define DUK_HTHREAD_STATE_INACTIVE     1   /* thread not currently running */
-#define DUK_HTHREAD_STATE_RUNNING      2   /* thread currently running (only one at a time) */
-#define DUK_HTHREAD_STATE_RESUMED      3   /* thread resumed another thread (active but not running) */
-#define DUK_HTHREAD_STATE_YIELDED      4   /* thread has yielded */
-#define DUK_HTHREAD_STATE_TERMINATED   5   /* thread has terminated */
+#define DUK_HTHREAD_STATE_INACTIVE   1 /* thread not currently running */
+#define DUK_HTHREAD_STATE_RUNNING    2 /* thread currently running (only one at a time) */
+#define DUK_HTHREAD_STATE_RESUMED    3 /* thread resumed another thread (active but not running) */
+#define DUK_HTHREAD_STATE_YIELDED    4 /* thread has yielded */
+#define DUK_HTHREAD_STATE_TERMINATED 5 /* thread has terminated */
 
 /* Executor interrupt default interval when nothing else requires a
  * smaller value.  The default interval must be small enough to allow
@@ -7627,7 +8163,7 @@ DUK_INTERNAL_DECL void duk_hbufobj_promote_plain(duk_hthread *thr, duk_idx_t idx
  * impact on execution performance low.
  */
 #if defined(DUK_USE_INTERRUPT_COUNTER)
-#define DUK_HTHREAD_INTCTR_DEFAULT     (256L * 1024L)
+#define DUK_HTHREAD_INTCTR_DEFAULT (256L * 1024L)
 #endif
 
 /*
@@ -7638,37 +8174,35 @@ DUK_INTERNAL_DECL void duk_hbufobj_promote_plain(duk_hthread *thr, duk_idx_t idx
  *  diagnose behavior so it's worth checking even when the check is not 100%.
  */
 
+#if defined(DUK_USE_ASSERTIONS)
 /* Assertions for internals. */
-#define DUK_ASSERT_HTHREAD_VALID(thr) do { \
-		DUK_ASSERT((thr) != NULL); \
-		DUK_ASSERT(DUK_HEAPHDR_GET_TYPE((duk_heaphdr *) (thr)) == DUK_HTYPE_OBJECT); \
-		DUK_ASSERT(DUK_HOBJECT_IS_THREAD((duk_hobject *) (thr))); \
-		DUK_ASSERT((thr)->unused1 == 0); \
-		DUK_ASSERT((thr)->unused2 == 0); \
+DUK_INTERNAL_DECL void duk_hthread_assert_valid(duk_hthread *thr);
+#define DUK_HTHREAD_ASSERT_VALID(thr) \
+	do { \
+		duk_hthread_assert_valid((thr)); \
 	} while (0)
 
 /* Assertions for public API calls; a bit stronger. */
-#define DUK_ASSERT_CTX_VALID(thr) do { \
-		DUK_ASSERT((thr) != NULL); \
-		DUK_ASSERT_HTHREAD_VALID((thr)); \
-		DUK_ASSERT((thr)->valstack != NULL); \
-		DUK_ASSERT((thr)->valstack_bottom != NULL); \
-		DUK_ASSERT((thr)->valstack_top != NULL); \
-		DUK_ASSERT((thr)->valstack_end != NULL); \
-		DUK_ASSERT((thr)->valstack_alloc_end != NULL); \
-		DUK_ASSERT((thr)->valstack_alloc_end >= (thr)->valstack); \
-		DUK_ASSERT((thr)->valstack_end >= (thr)->valstack); \
-		DUK_ASSERT((thr)->valstack_top >= (thr)->valstack); \
-		DUK_ASSERT((thr)->valstack_top >= (thr)->valstack_bottom); \
-		DUK_ASSERT((thr)->valstack_end >= (thr)->valstack_top); \
-		DUK_ASSERT((thr)->valstack_alloc_end >= (thr)->valstack_end); \
+DUK_INTERNAL_DECL void duk_ctx_assert_valid(duk_hthread *thr);
+#define DUK_CTX_ASSERT_VALID(thr) \
+	do { \
+		duk_ctx_assert_valid((thr)); \
 	} while (0)
+#else
+#define DUK_HTHREAD_ASSERT_VALID(thr) \
+	do { \
+	} while (0)
+#define DUK_CTX_ASSERT_VALID(thr) \
+	do { \
+	} while (0)
+#endif
 
 /* Assertions for API call entry specifically.  Checks 'ctx' but also may
  * check internal state (e.g. not in a debugger transport callback).
  */
-#define DUK_ASSERT_API_ENTRY(thr) do { \
-		DUK_ASSERT_CTX_VALID((thr)); \
+#define DUK_ASSERT_API_ENTRY(thr) \
+	do { \
+		DUK_CTX_ASSERT_VALID((thr)); \
 		DUK_ASSERT((thr)->heap != NULL); \
 		DUK_ASSERT((thr)->heap->dbg_calling_transport == 0); \
 	} while (0)
@@ -7677,11 +8211,9 @@ DUK_INTERNAL_DECL void duk_hbufobj_promote_plain(duk_hthread *thr, duk_idx_t idx
  *  Assertion helpers.
  */
 
-#define DUK_ASSERT_STRIDX_VALID(val) \
-	DUK_ASSERT((duk_uint_t) (val) < DUK_HEAP_NUM_STRINGS)
+#define DUK_ASSERT_STRIDX_VALID(val) DUK_ASSERT((duk_uint_t) (val) < DUK_HEAP_NUM_STRINGS)
 
-#define DUK_ASSERT_BIDX_VALID(val) \
-	DUK_ASSERT((duk_uint_t) (val) < DUK_NUM_BUILTINS)
+#define DUK_ASSERT_BIDX_VALID(val) DUK_ASSERT((duk_uint_t) (val) < DUK_NUM_BUILTINS)
 
 /*
  *  Misc
@@ -7689,9 +8221,7 @@ DUK_INTERNAL_DECL void duk_hbufobj_promote_plain(duk_hthread *thr, duk_idx_t idx
 
 /* Fast access to 'this' binding.  Assumes there's a call in progress. */
 #define DUK_HTHREAD_THIS_PTR(thr) \
-	(DUK_ASSERT_EXPR((thr) != NULL), \
-	 DUK_ASSERT_EXPR((thr)->valstack_bottom > (thr)->valstack), \
-	 (thr)->valstack_bottom - 1)
+	(DUK_ASSERT_EXPR((thr) != NULL), DUK_ASSERT_EXPR((thr)->valstack_bottom > (thr)->valstack), (thr)->valstack_bottom - 1)
 
 /*
  *  Struct defines
@@ -7699,12 +8229,13 @@ DUK_INTERNAL_DECL void duk_hbufobj_promote_plain(duk_hthread *thr, duk_idx_t idx
 
 /* Fields are ordered for alignment/packing. */
 struct duk_activation {
-	duk_tval tv_func;       /* borrowed: full duk_tval for function being executed; for lightfuncs */
-	duk_hobject *func;      /* borrowed: function being executed; for bound function calls, this is the final, real function, NULL for lightfuncs */
+	duk_tval tv_func; /* borrowed: full duk_tval for function being executed; for lightfuncs */
+	duk_hobject *func; /* borrowed: function being executed; for bound function calls, this is the final, real function, NULL
+	                      for lightfuncs */
 	duk_activation *parent; /* previous (parent) activation (or NULL if none) */
-	duk_hobject *var_env;   /* current variable environment (may be NULL if delayed) */
-	duk_hobject *lex_env;   /* current lexical environment (may be NULL if delayed) */
-	duk_catcher *cat;       /* current catcher (or NULL) */
+	duk_hobject *var_env; /* current variable environment (may be NULL if delayed) */
+	duk_hobject *lex_env; /* current lexical environment (may be NULL if delayed) */
+	duk_catcher *cat; /* current catcher (or NULL) */
 
 #if defined(DUK_USE_NONSTD_FUNC_CALLER_PROPERTY)
 	/* Previous value of 'func' caller, restored when unwound.  Only in use
@@ -7713,7 +8244,7 @@ struct duk_activation {
 	duk_hobject *prev_caller;
 #endif
 
-	duk_instr_t *curr_pc;   /* next instruction to execute (points to 'func' bytecode, stable pointer), NULL for native calls */
+	duk_instr_t *curr_pc; /* next instruction to execute (points to 'func' bytecode, stable pointer), NULL for native calls */
 
 	/* bottom_byteoff and retval_byteoff are only used for book-keeping
 	 * of ECMAScript-initiated calls, to allow returning to an ECMAScript
@@ -7760,12 +8291,12 @@ struct duk_activation {
 };
 
 struct duk_catcher {
-	duk_catcher *parent;            /* previous (parent) catcher (or NULL if none) */
-	duk_hstring *h_varname;         /* borrowed reference to catch variable name (or NULL if none) */
-	                                /* (reference is valid as long activation exists) */
-	duk_instr_t *pc_base;           /* resume execution from pc_base or pc_base+1 (points to 'func' bytecode, stable pointer) */
-	duk_size_t idx_base;            /* idx_base and idx_base+1 get completion value and type */
-	duk_uint32_t flags;             /* type and control flags, label number */
+	duk_catcher *parent; /* previous (parent) catcher (or NULL if none) */
+	duk_hstring *h_varname; /* borrowed reference to catch variable name (or NULL if none) */
+	/* (reference is valid as long activation exists) */
+	duk_instr_t *pc_base; /* resume execution from pc_base or pc_base+1 (points to 'func' bytecode, stable pointer) */
+	duk_size_t idx_base; /* idx_base and idx_base+1 get completion value and type */
+	duk_uint32_t flags; /* type and control flags, label number */
 	/* XXX: could pack 'flags' and 'idx_base' to same value in practice,
 	 * on 32-bit targets this would make duk_catcher 16 bytes.
 	 */
@@ -7823,21 +8354,21 @@ struct duk_hthread {
 	 *     yyy = arbitrary values, inside current frame
 	 *     uuu = outside active value stack, initialized to 'undefined'
 	 */
-	duk_tval *valstack;                     /* start of valstack allocation */
-	duk_tval *valstack_end;                 /* end of valstack reservation/guarantee (exclusive) */
-	duk_tval *valstack_alloc_end;           /* end of valstack allocation */
-	duk_tval *valstack_bottom;              /* bottom of current frame */
-	duk_tval *valstack_top;                 /* top of current frame (exclusive) */
+	duk_tval *valstack; /* start of valstack allocation */
+	duk_tval *valstack_end; /* end of valstack reservation/guarantee (exclusive) */
+	duk_tval *valstack_alloc_end; /* end of valstack allocation */
+	duk_tval *valstack_bottom; /* bottom of current frame */
+	duk_tval *valstack_top; /* top of current frame (exclusive) */
 
 	/* Call stack, represented as a linked list starting from the current
 	 * activation (or NULL if nothing is active).
 	 */
-	duk_activation *callstack_curr;         /* current activation (or NULL if none) */
-	duk_size_t callstack_top;               /* number of activation records in callstack (0 if none) */
-	duk_size_t callstack_preventcount;      /* number of activation records in callstack preventing a yield */
+	duk_activation *callstack_curr; /* current activation (or NULL if none) */
+	duk_size_t callstack_top; /* number of activation records in callstack (0 if none) */
+	duk_size_t callstack_preventcount; /* number of activation records in callstack preventing a yield */
 
 	/* Yield/resume book-keeping. */
-	duk_hthread *resumer;                   /* who resumed us (if any) */
+	duk_hthread *resumer; /* who resumed us (if any) */
 
 	/* Current compiler state (if any), used for augmenting SyntaxErrors. */
 	duk_compiler_ctx *compile_ctx;
@@ -7850,8 +8381,8 @@ struct duk_hthread {
 	 * important for the counter to be conveniently accessible for the
 	 * bytecode executor inner loop for performance reasons.
 	 */
-	duk_int_t interrupt_counter;    /* countdown state */
-	duk_int_t interrupt_init;       /* start value for current countdown */
+	duk_int_t interrupt_counter; /* countdown state */
+	duk_int_t interrupt_init; /* start value for current countdown */
 #endif
 
 	/* Builtin-objects; may or may not be shared with other threads,
@@ -7888,13 +8419,13 @@ DUK_INTERNAL_DECL void duk_hthread_create_builtin_objects(duk_hthread *thr);
 DUK_INTERNAL_DECL duk_bool_t duk_hthread_init_stacks(duk_heap *heap, duk_hthread *thr);
 DUK_INTERNAL_DECL void duk_hthread_terminate(duk_hthread *thr);
 
-DUK_INTERNAL_DECL DUK_INLINE duk_activation *duk_hthread_activation_alloc(duk_hthread *thr);
+DUK_INTERNAL_DECL duk_activation *duk_hthread_activation_alloc(duk_hthread *thr);
 DUK_INTERNAL_DECL void duk_hthread_activation_free(duk_hthread *thr, duk_activation *act);
 DUK_INTERNAL_DECL void duk_hthread_activation_unwind_norz(duk_hthread *thr);
 DUK_INTERNAL_DECL void duk_hthread_activation_unwind_reuse_norz(duk_hthread *thr);
 DUK_INTERNAL_DECL duk_activation *duk_hthread_get_activation_for_level(duk_hthread *thr, duk_int_t level);
 
-DUK_INTERNAL_DECL DUK_INLINE duk_catcher *duk_hthread_catcher_alloc(duk_hthread *thr);
+DUK_INTERNAL_DECL duk_catcher *duk_hthread_catcher_alloc(duk_hthread *thr);
 DUK_INTERNAL_DECL void duk_hthread_catcher_free(duk_hthread *thr, duk_catcher *cat);
 DUK_INTERNAL_DECL void duk_hthread_catcher_unwind_norz(duk_hthread *thr, duk_activation *act);
 DUK_INTERNAL_DECL void duk_hthread_catcher_unwind_nolexenv_norz(duk_hthread *thr, duk_activation *act);
@@ -7903,7 +8434,7 @@ DUK_INTERNAL_DECL void duk_hthread_catcher_unwind_nolexenv_norz(duk_hthread *thr
 DUK_INTERNAL_DECL void duk_hthread_valstack_torture_realloc(duk_hthread *thr);
 #endif
 
-DUK_INTERNAL_DECL void *duk_hthread_get_valstack_ptr(duk_heap *heap, void *ud);  /* indirect allocs */
+DUK_INTERNAL_DECL void *duk_hthread_get_valstack_ptr(duk_heap *heap, void *ud); /* indirect allocs */
 
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
 DUK_INTERNAL_DECL duk_uint_fast32_t duk_hthread_get_act_curr_pc(duk_hthread *thr, duk_activation *act);
@@ -7912,7 +8443,7 @@ DUK_INTERNAL_DECL duk_uint_fast32_t duk_hthread_get_act_prev_pc(duk_hthread *thr
 DUK_INTERNAL_DECL void duk_hthread_sync_currpc(duk_hthread *thr);
 DUK_INTERNAL_DECL void duk_hthread_sync_and_null_currpc(duk_hthread *thr);
 
-#endif  /* DUK_HTHREAD_H_INCLUDED */
+#endif /* DUK_HTHREAD_H_INCLUDED */
 /* #include duk_harray.h */
 /*
  *  Array object representation, used for actual Array instances.
@@ -7925,16 +8456,28 @@ DUK_INTERNAL_DECL void duk_hthread_sync_and_null_currpc(duk_hthread *thr);
 #if !defined(DUK_HARRAY_H_INCLUDED)
 #define DUK_HARRAY_H_INCLUDED
 
-#define DUK_ASSERT_HARRAY_VALID(h) do { \
-		DUK_ASSERT((h) != NULL); \
-		DUK_ASSERT(DUK_HOBJECT_IS_ARRAY((duk_hobject *) (h))); \
-		DUK_ASSERT(DUK_HOBJECT_HAS_EXOTIC_ARRAY((duk_hobject *) (h))); \
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL_DECL void duk_harray_assert_valid(duk_harray *h);
+#define DUK_HARRAY_ASSERT_VALID(h) \
+	do { \
+		duk_harray_assert_valid((h)); \
+	} while (0)
+#else
+#define DUK_HARRAY_ASSERT_VALID(h) \
+	do { \
 	} while (0)
+#endif
 
-#define DUK_HARRAY_LENGTH_WRITABLE(h)         (!(h)->length_nonwritable)
-#define DUK_HARRAY_LENGTH_NONWRITABLE(h)      ((h)->length_nonwritable)
-#define DUK_HARRAY_SET_LENGTH_WRITABLE(h)     do { (h)->length_nonwritable = 0; } while (0)
-#define DUK_HARRAY_SET_LENGTH_NONWRITABLE(h)  do { (h)->length_nonwritable = 1; } while (0)
+#define DUK_HARRAY_LENGTH_WRITABLE(h)    (!(h)->length_nonwritable)
+#define DUK_HARRAY_LENGTH_NONWRITABLE(h) ((h)->length_nonwritable)
+#define DUK_HARRAY_SET_LENGTH_WRITABLE(h) \
+	do { \
+		(h)->length_nonwritable = 0; \
+	} while (0)
+#define DUK_HARRAY_SET_LENGTH_NONWRITABLE(h) \
+	do { \
+		(h)->length_nonwritable = 1; \
+	} while (0)
 
 struct duk_harray {
 	/* Shared object part. */
@@ -7960,7 +8503,7 @@ struct duk_harray {
 	duk_bool_t length_nonwritable;
 };
 
-#endif  /* DUK_HARRAY_H_INCLUDED */
+#endif /* DUK_HARRAY_H_INCLUDED */
 /* #include duk_henv.h */
 /*
  *  Environment object representation.
@@ -7969,18 +8512,25 @@ struct duk_harray {
 #if !defined(DUK_HENV_H_INCLUDED)
 #define DUK_HENV_H_INCLUDED
 
-#define DUK_ASSERT_HDECENV_VALID(h) do { \
-		DUK_ASSERT((h) != NULL); \
-		DUK_ASSERT(DUK_HOBJECT_IS_DECENV((duk_hobject *) (h))); \
-		DUK_ASSERT((h)->thread == NULL || (h)->varmap != NULL); \
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL_DECL void duk_hdecenv_assert_valid(duk_hdecenv *h);
+DUK_INTERNAL_DECL void duk_hobjenv_assert_valid(duk_hobjenv *h);
+#define DUK_HDECENV_ASSERT_VALID(h) \
+	do { \
+		duk_hdecenv_assert_valid((h)); \
 	} while (0)
-
-#define DUK_ASSERT_HOBJENV_VALID(h) do { \
-		DUK_ASSERT((h) != NULL); \
-		DUK_ASSERT(DUK_HOBJECT_IS_OBJENV((duk_hobject *) (h))); \
-		DUK_ASSERT((h)->target != NULL); \
-		DUK_ASSERT((h)->has_this == 0 || (h)->has_this == 1); \
+#define DUK_HOBJENV_ASSERT_VALID(h) \
+	do { \
+		duk_hobjenv_assert_valid((h)); \
 	} while (0)
+#else
+#define DUK_HDECENV_ASSERT_VALID(h) \
+	do { \
+	} while (0)
+#define DUK_HOBJENV_ASSERT_VALID(h) \
+	do { \
+	} while (0)
+#endif
 
 struct duk_hdecenv {
 	/* Shared object part. */
@@ -8009,7 +8559,7 @@ struct duk_hobjenv {
 	duk_bool_t has_this;
 };
 
-#endif  /* DUK_HENV_H_INCLUDED */
+#endif /* DUK_HENV_H_INCLUDED */
 /* #include duk_hbuffer.h */
 /*
  *  Heap buffer representation.
@@ -8033,17 +8583,17 @@ struct duk_hobjenv {
  *  External buffer:  DUK_HBUFFER_FLAG_DYNAMIC | DUK_HBUFFER_FLAG_EXTERNAL
  */
 
-#define DUK_HBUFFER_FLAG_DYNAMIC                  DUK_HEAPHDR_USER_FLAG(0)    /* buffer is behind a pointer, dynamic or external */
-#define DUK_HBUFFER_FLAG_EXTERNAL                 DUK_HEAPHDR_USER_FLAG(1)    /* buffer pointer is to an externally allocated buffer */
+#define DUK_HBUFFER_FLAG_DYNAMIC  DUK_HEAPHDR_USER_FLAG(0) /* buffer is behind a pointer, dynamic or external */
+#define DUK_HBUFFER_FLAG_EXTERNAL DUK_HEAPHDR_USER_FLAG(1) /* buffer pointer is to an externally allocated buffer */
 
-#define DUK_HBUFFER_HAS_DYNAMIC(x)                DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_DYNAMIC)
-#define DUK_HBUFFER_HAS_EXTERNAL(x)               DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_EXTERNAL)
+#define DUK_HBUFFER_HAS_DYNAMIC(x)  DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_DYNAMIC)
+#define DUK_HBUFFER_HAS_EXTERNAL(x) DUK_HEAPHDR_CHECK_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_EXTERNAL)
 
-#define DUK_HBUFFER_SET_DYNAMIC(x)                DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_DYNAMIC)
-#define DUK_HBUFFER_SET_EXTERNAL(x)               DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_EXTERNAL)
+#define DUK_HBUFFER_SET_DYNAMIC(x)  DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_DYNAMIC)
+#define DUK_HBUFFER_SET_EXTERNAL(x) DUK_HEAPHDR_SET_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_EXTERNAL)
 
-#define DUK_HBUFFER_CLEAR_DYNAMIC(x)              DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_DYNAMIC)
-#define DUK_HBUFFER_CLEAR_EXTERNAL(x)             DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_EXTERNAL)
+#define DUK_HBUFFER_CLEAR_DYNAMIC(x)  DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_DYNAMIC)
+#define DUK_HBUFFER_CLEAR_EXTERNAL(x) DUK_HEAPHDR_CLEAR_FLAG_BITS(&(x)->hdr, DUK_HBUFFER_FLAG_EXTERNAL)
 
 /*
  *  Misc defines
@@ -8056,12 +8606,12 @@ struct duk_hobjenv {
  */
 
 #if defined(DUK_USE_BUFLEN16)
-#define DUK_HBUFFER_MAX_BYTELEN                   (0x0000ffffUL)
+#define DUK_HBUFFER_MAX_BYTELEN (0x0000ffffUL)
 #else
 /* Intentionally not 0x7fffffffUL; at least JSON code expects that
  * 2*len + 2 fits in 32 bits.
  */
-#define DUK_HBUFFER_MAX_BYTELEN                   (0x7ffffffeUL)
+#define DUK_HBUFFER_MAX_BYTELEN (0x7ffffffeUL)
 #endif
 
 /*
@@ -8070,60 +8620,70 @@ struct duk_hobjenv {
 
 #if defined(DUK_USE_BUFLEN16)
 /* size stored in duk_heaphdr unused flag bits */
-#define DUK_HBUFFER_GET_SIZE(x)     ((x)->hdr.h_flags >> 16)
-#define DUK_HBUFFER_SET_SIZE(x,v)   do { \
+#define DUK_HBUFFER_GET_SIZE(x) ((x)->hdr.h_flags >> 16)
+#define DUK_HBUFFER_SET_SIZE(x, v) \
+	do { \
 		duk_size_t duk__v; \
 		duk__v = (v); \
 		DUK_ASSERT(duk__v <= 0xffffUL); \
 		(x)->hdr.h_flags = ((x)->hdr.h_flags & 0x0000ffffUL) | (((duk_uint32_t) duk__v) << 16); \
 	} while (0)
-#define DUK_HBUFFER_ADD_SIZE(x,dv)  do { \
+#define DUK_HBUFFER_ADD_SIZE(x, dv) \
+	do { \
 		(x)->hdr.h_flags += ((dv) << 16); \
 	} while (0)
-#define DUK_HBUFFER_SUB_SIZE(x,dv)  do { \
+#define DUK_HBUFFER_SUB_SIZE(x, dv) \
+	do { \
 		(x)->hdr.h_flags -= ((dv) << 16); \
 	} while (0)
 #else
-#define DUK_HBUFFER_GET_SIZE(x)     (((duk_hbuffer *) (x))->size)
-#define DUK_HBUFFER_SET_SIZE(x,v)   do { \
+#define DUK_HBUFFER_GET_SIZE(x) (((duk_hbuffer *) (x))->size)
+#define DUK_HBUFFER_SET_SIZE(x, v) \
+	do { \
 		((duk_hbuffer *) (x))->size = (v); \
 	} while (0)
-#define DUK_HBUFFER_ADD_SIZE(x,dv)  do { \
+#define DUK_HBUFFER_ADD_SIZE(x, dv) \
+	do { \
 		(x)->size += (dv); \
 	} while (0)
-#define DUK_HBUFFER_SUB_SIZE(x,dv)  do { \
+#define DUK_HBUFFER_SUB_SIZE(x, dv) \
+	do { \
 		(x)->size -= (dv); \
 	} while (0)
 #endif
 
-#define DUK_HBUFFER_FIXED_GET_SIZE(x)       DUK_HBUFFER_GET_SIZE((duk_hbuffer *) (x))
-#define DUK_HBUFFER_FIXED_SET_SIZE(x,v)     DUK_HBUFFER_SET_SIZE((duk_hbuffer *) (x))
+#define DUK_HBUFFER_FIXED_GET_SIZE(x)    DUK_HBUFFER_GET_SIZE((duk_hbuffer *) (x))
+#define DUK_HBUFFER_FIXED_SET_SIZE(x, v) DUK_HBUFFER_SET_SIZE((duk_hbuffer *) (x))
 
 #define DUK_HBUFFER_DYNAMIC_GET_SIZE(x)     DUK_HBUFFER_GET_SIZE((duk_hbuffer *) (x))
-#define DUK_HBUFFER_DYNAMIC_SET_SIZE(x,v)   DUK_HBUFFER_SET_SIZE((duk_hbuffer *) (x), (v))
-#define DUK_HBUFFER_DYNAMIC_ADD_SIZE(x,dv)  DUK_HBUFFER_ADD_SIZE((duk_hbuffer *) (x), (dv))
-#define DUK_HBUFFER_DYNAMIC_SUB_SIZE(x,dv)  DUK_HBUFFER_SUB_SIZE((duk_hbuffer *) (x), (dv))
+#define DUK_HBUFFER_DYNAMIC_SET_SIZE(x, v)  DUK_HBUFFER_SET_SIZE((duk_hbuffer *) (x), (v))
+#define DUK_HBUFFER_DYNAMIC_ADD_SIZE(x, dv) DUK_HBUFFER_ADD_SIZE((duk_hbuffer *) (x), (dv))
+#define DUK_HBUFFER_DYNAMIC_SUB_SIZE(x, dv) DUK_HBUFFER_SUB_SIZE((duk_hbuffer *) (x), (dv))
 
 #define DUK_HBUFFER_EXTERNAL_GET_SIZE(x)    DUK_HBUFFER_GET_SIZE((duk_hbuffer *) (x))
-#define DUK_HBUFFER_EXTERNAL_SET_SIZE(x,v)  DUK_HBUFFER_SET_SIZE((duk_hbuffer *) (x), (v))
+#define DUK_HBUFFER_EXTERNAL_SET_SIZE(x, v) DUK_HBUFFER_SET_SIZE((duk_hbuffer *) (x), (v))
 
-#define DUK_HBUFFER_FIXED_GET_DATA_PTR(heap,x)    ((duk_uint8_t *) (((duk_hbuffer_fixed *) (void *) (x)) + 1))
+#define DUK_HBUFFER_FIXED_GET_DATA_PTR(heap, x) ((duk_uint8_t *) (((duk_hbuffer_fixed *) (void *) (x)) + 1))
 
 #if defined(DUK_USE_HEAPPTR16)
-#define DUK_HBUFFER_DYNAMIC_GET_DATA_PTR(heap,x) \
+#define DUK_HBUFFER_DYNAMIC_GET_DATA_PTR(heap, x) \
 	((void *) DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, ((duk_heaphdr *) (x))->h_extra16))
-#define DUK_HBUFFER_DYNAMIC_SET_DATA_PTR(heap,x,v)     do { \
+#define DUK_HBUFFER_DYNAMIC_SET_DATA_PTR(heap, x, v) \
+	do { \
 		((duk_heaphdr *) (x))->h_extra16 = DUK_USE_HEAPPTR_ENC16((heap)->heap_udata, (void *) (v)); \
 	} while (0)
-#define DUK_HBUFFER_DYNAMIC_SET_DATA_PTR_NULL(heap,x)  do { \
-		((duk_heaphdr *) (x))->h_extra16 = 0;  /* assume 0 <=> NULL */ \
+#define DUK_HBUFFER_DYNAMIC_SET_DATA_PTR_NULL(heap, x) \
+	do { \
+		((duk_heaphdr *) (x))->h_extra16 = 0; /* assume 0 <=> NULL */ \
 	} while (0)
 #else
-#define DUK_HBUFFER_DYNAMIC_GET_DATA_PTR(heap,x)       ((x)->curr_alloc)
-#define DUK_HBUFFER_DYNAMIC_SET_DATA_PTR(heap,x,v)     do { \
+#define DUK_HBUFFER_DYNAMIC_GET_DATA_PTR(heap, x) ((x)->curr_alloc)
+#define DUK_HBUFFER_DYNAMIC_SET_DATA_PTR(heap, x, v) \
+	do { \
 		(x)->curr_alloc = (void *) (v); \
 	} while (0)
-#define DUK_HBUFFER_DYNAMIC_SET_DATA_PTR_NULL(heap,x)  do { \
+#define DUK_HBUFFER_DYNAMIC_SET_DATA_PTR_NULL(heap, x) \
+	do { \
 		(x)->curr_alloc = (void *) NULL; \
 	} while (0)
 #endif
@@ -8132,21 +8692,23 @@ struct duk_hobjenv {
  * Duktape heap.
  */
 #if defined(DUK_USE_HEAPPTR16)
-#define DUK_HBUFFER_EXTERNAL_GET_DATA_PTR(heap,x) \
-	((void *) (x)->curr_alloc)
-#define DUK_HBUFFER_EXTERNAL_SET_DATA_PTR(heap,x,v)     do { \
+#define DUK_HBUFFER_EXTERNAL_GET_DATA_PTR(heap, x) ((void *) (x)->curr_alloc)
+#define DUK_HBUFFER_EXTERNAL_SET_DATA_PTR(heap, x, v) \
+	do { \
 		(x)->curr_alloc = (void *) (v); \
 	} while (0)
-#define DUK_HBUFFER_EXTERNAL_SET_DATA_PTR_NULL(heap,x)  do { \
+#define DUK_HBUFFER_EXTERNAL_SET_DATA_PTR_NULL(heap, x) \
+	do { \
 		(x)->curr_alloc = (void *) NULL; \
 	} while (0)
 #else
-#define DUK_HBUFFER_EXTERNAL_GET_DATA_PTR(heap,x) \
-	((void *) (x)->curr_alloc)
-#define DUK_HBUFFER_EXTERNAL_SET_DATA_PTR(heap,x,v)     do { \
+#define DUK_HBUFFER_EXTERNAL_GET_DATA_PTR(heap, x) ((void *) (x)->curr_alloc)
+#define DUK_HBUFFER_EXTERNAL_SET_DATA_PTR(heap, x, v) \
+	do { \
 		(x)->curr_alloc = (void *) (v); \
 	} while (0)
-#define DUK_HBUFFER_EXTERNAL_SET_DATA_PTR_NULL(heap,x)  do { \
+#define DUK_HBUFFER_EXTERNAL_SET_DATA_PTR_NULL(heap, x) \
+	do { \
 		(x)->curr_alloc = (void *) NULL; \
 	} while (0)
 #endif
@@ -8155,24 +8717,31 @@ struct duk_hobjenv {
  * size).  May be NULL for zero size dynamic/external buffer.
  */
 #if defined(DUK_USE_HEAPPTR16)
-#define DUK_HBUFFER_GET_DATA_PTR(heap,x)  ( \
-	DUK_HBUFFER_HAS_DYNAMIC((x)) ? \
-		( \
-			DUK_HBUFFER_HAS_EXTERNAL((x)) ? \
-				DUK_HBUFFER_EXTERNAL_GET_DATA_PTR((heap), (duk_hbuffer_external *) (x)) : \
-				DUK_HBUFFER_DYNAMIC_GET_DATA_PTR((heap), (duk_hbuffer_dynamic *) (x)) \
-		) : \
-		DUK_HBUFFER_FIXED_GET_DATA_PTR((heap), (duk_hbuffer_fixed *) (void *) (x)) \
-	)
+#define DUK_HBUFFER_GET_DATA_PTR(heap, x) \
+	(DUK_HBUFFER_HAS_DYNAMIC((x)) ? \
+             (DUK_HBUFFER_HAS_EXTERNAL((x)) ? DUK_HBUFFER_EXTERNAL_GET_DATA_PTR((heap), (duk_hbuffer_external *) (x)) : \
+                                              DUK_HBUFFER_DYNAMIC_GET_DATA_PTR((heap), (duk_hbuffer_dynamic *) (x))) : \
+             DUK_HBUFFER_FIXED_GET_DATA_PTR((heap), (duk_hbuffer_fixed *) (void *) (x)))
 #else
 /* Without heap pointer compression duk_hbuffer_dynamic and duk_hbuffer_external
  * have the same layout so checking for fixed vs. dynamic (or external) is enough.
  */
-#define DUK_HBUFFER_GET_DATA_PTR(heap,x)  ( \
-	DUK_HBUFFER_HAS_DYNAMIC((x)) ? \
-		DUK_HBUFFER_DYNAMIC_GET_DATA_PTR((heap), (duk_hbuffer_dynamic *) (x)) : \
-		DUK_HBUFFER_FIXED_GET_DATA_PTR((heap), (duk_hbuffer_fixed *) (void *) (x)) \
-	)
+#define DUK_HBUFFER_GET_DATA_PTR(heap, x) \
+	(DUK_HBUFFER_HAS_DYNAMIC((x)) ? DUK_HBUFFER_DYNAMIC_GET_DATA_PTR((heap), (duk_hbuffer_dynamic *) (x)) : \
+                                        DUK_HBUFFER_FIXED_GET_DATA_PTR((heap), (duk_hbuffer_fixed *) (void *) (x)))
+#endif
+
+/* Validity assert. */
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL_DECL void duk_hbuffer_assert_valid(duk_hbuffer *h);
+#define DUK_HBUFFER_ASSERT_VALID(h) \
+	do { \
+		duk_hbuffer_assert_valid((h)); \
+	} while (0)
+#else
+#define DUK_HBUFFER_ASSERT_VALID(h) \
+	do { \
+	} while (0)
 #endif
 
 /*
@@ -8270,9 +8839,9 @@ struct duk_hbuffer_fixed {
 	 */
 }
 #if (DUK_USE_ALIGN_BY == 8) && defined(DUK_USE_PACK_GCC_ATTR)
-__attribute__ ((aligned (8)))
+__attribute__((aligned(8)))
 #elif (DUK_USE_ALIGN_BY == 8) && defined(DUK_USE_PACK_CLANG_ATTR)
-__attribute__ ((aligned (8)))
+__attribute__((aligned(8)))
 #endif
 ;
 #if (DUK_USE_ALIGN_BY == 8) && defined(DUK_USE_PACK_MSVC_PRAGMA)
@@ -8295,7 +8864,7 @@ struct duk_hbuffer_dynamic {
 #if defined(DUK_USE_HEAPPTR16)
 	/* Stored in duk_heaphdr h_extra16. */
 #else
-	void *curr_alloc;  /* may be NULL if alloc_size == 0 */
+	void *curr_alloc; /* may be NULL if alloc_size == 0 */
 #endif
 
 	/*
@@ -8324,7 +8893,7 @@ struct duk_hbuffer_external {
 	/* Cannot be compressed as a heap pointer because may point to
 	 * an arbitrary address.
 	 */
-	void *curr_alloc;  /* may be NULL if alloc_size == 0 */
+	void *curr_alloc; /* may be NULL if alloc_size == 0 */
 };
 
 /*
@@ -8332,13 +8901,13 @@ struct duk_hbuffer_external {
  */
 
 DUK_INTERNAL_DECL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk_small_uint_t flags, void **out_bufdata);
-DUK_INTERNAL_DECL void *duk_hbuffer_get_dynalloc_ptr(duk_heap *heap, void *ud);  /* indirect allocs */
+DUK_INTERNAL_DECL void *duk_hbuffer_get_dynalloc_ptr(duk_heap *heap, void *ud); /* indirect allocs */
 
 /* dynamic buffer ops */
 DUK_INTERNAL_DECL void duk_hbuffer_resize(duk_hthread *thr, duk_hbuffer_dynamic *buf, duk_size_t new_size);
 DUK_INTERNAL_DECL void duk_hbuffer_reset(duk_hthread *thr, duk_hbuffer_dynamic *buf);
 
-#endif  /* DUK_HBUFFER_H_INCLUDED */
+#endif /* DUK_HBUFFER_H_INCLUDED */
 /* #include duk_hproxy.h */
 /*
  *  Proxy object representation.
@@ -8347,12 +8916,17 @@ DUK_INTERNAL_DECL void duk_hbuffer_reset(duk_hthread *thr, duk_hbuffer_dynamic *
 #if !defined(DUK_HPROXY_H_INCLUDED)
 #define DUK_HPROXY_H_INCLUDED
 
-#define DUK_ASSERT_HPROXY_VALID(h) do { \
-		DUK_ASSERT((h) != NULL); \
-		DUK_ASSERT((h)->target != NULL); \
-		DUK_ASSERT((h)->handler != NULL); \
-		DUK_ASSERT(DUK_HOBJECT_HAS_EXOTIC_PROXYOBJ((duk_hobject *) (h))); \
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL_DECL void duk_hproxy_assert_valid(duk_hproxy *h);
+#define DUK_HPROXY_ASSERT_VALID(h) \
+	do { \
+		duk_hproxy_assert_valid((h)); \
 	} while (0)
+#else
+#define DUK_HPROXY_ASSERT_VALID(h) \
+	do { \
+	} while (0)
+#endif
 
 struct duk_hproxy {
 	/* Shared object part. */
@@ -8365,7 +8939,7 @@ struct duk_hproxy {
 	duk_hobject *handler;
 };
 
-#endif  /* DUK_HPROXY_H_INCLUDED */
+#endif /* DUK_HPROXY_H_INCLUDED */
 /* #include duk_heap.h */
 /*
  *  Heap structure.
@@ -8383,46 +8957,50 @@ struct duk_hproxy {
  *  Heap flags
  */
 
-#define DUK_HEAP_FLAG_MARKANDSWEEP_RECLIMIT_REACHED            (1U << 0)  /* mark-and-sweep marking reached a recursion limit and must use multi-pass marking */
-#define DUK_HEAP_FLAG_INTERRUPT_RUNNING                        (1U << 1)  /* executor interrupt running (used to avoid nested interrupts) */
-#define DUK_HEAP_FLAG_FINALIZER_NORESCUE                       (1U << 2)  /* heap destruction ongoing, finalizer rescue no longer possible */
-#define DUK_HEAP_FLAG_DEBUGGER_PAUSED                          (1U << 3)  /* debugger is paused: talk with debug client until step/resume */
+#define DUK_HEAP_FLAG_MARKANDSWEEP_RECLIMIT_REACHED \
+	(1U << 0) /* mark-and-sweep marking reached a recursion limit and must use multi-pass marking */
+#define DUK_HEAP_FLAG_INTERRUPT_RUNNING  (1U << 1) /* executor interrupt running (used to avoid nested interrupts) */
+#define DUK_HEAP_FLAG_FINALIZER_NORESCUE (1U << 2) /* heap destruction ongoing, finalizer rescue no longer possible */
+#define DUK_HEAP_FLAG_DEBUGGER_PAUSED    (1U << 3) /* debugger is paused: talk with debug client until step/resume */
 
-#define DUK__HEAP_HAS_FLAGS(heap,bits)               ((heap)->flags & (bits))
-#define DUK__HEAP_SET_FLAGS(heap,bits)  do { \
+#define DUK__HEAP_HAS_FLAGS(heap, bits) ((heap)->flags & (bits))
+#define DUK__HEAP_SET_FLAGS(heap, bits) \
+	do { \
 		(heap)->flags |= (bits); \
 	} while (0)
-#define DUK__HEAP_CLEAR_FLAGS(heap,bits)  do { \
+#define DUK__HEAP_CLEAR_FLAGS(heap, bits) \
+	do { \
 		(heap)->flags &= ~(bits); \
 	} while (0)
 
-#define DUK_HEAP_HAS_MARKANDSWEEP_RECLIMIT_REACHED(heap)   DUK__HEAP_HAS_FLAGS((heap), DUK_HEAP_FLAG_MARKANDSWEEP_RECLIMIT_REACHED)
-#define DUK_HEAP_HAS_INTERRUPT_RUNNING(heap)               DUK__HEAP_HAS_FLAGS((heap), DUK_HEAP_FLAG_INTERRUPT_RUNNING)
-#define DUK_HEAP_HAS_FINALIZER_NORESCUE(heap)              DUK__HEAP_HAS_FLAGS((heap), DUK_HEAP_FLAG_FINALIZER_NORESCUE)
-#define DUK_HEAP_HAS_DEBUGGER_PAUSED(heap)                 DUK__HEAP_HAS_FLAGS((heap), DUK_HEAP_FLAG_DEBUGGER_PAUSED)
+#define DUK_HEAP_HAS_MARKANDSWEEP_RECLIMIT_REACHED(heap) DUK__HEAP_HAS_FLAGS((heap), DUK_HEAP_FLAG_MARKANDSWEEP_RECLIMIT_REACHED)
+#define DUK_HEAP_HAS_INTERRUPT_RUNNING(heap)             DUK__HEAP_HAS_FLAGS((heap), DUK_HEAP_FLAG_INTERRUPT_RUNNING)
+#define DUK_HEAP_HAS_FINALIZER_NORESCUE(heap)            DUK__HEAP_HAS_FLAGS((heap), DUK_HEAP_FLAG_FINALIZER_NORESCUE)
+#define DUK_HEAP_HAS_DEBUGGER_PAUSED(heap)               DUK__HEAP_HAS_FLAGS((heap), DUK_HEAP_FLAG_DEBUGGER_PAUSED)
 
-#define DUK_HEAP_SET_MARKANDSWEEP_RECLIMIT_REACHED(heap)   DUK__HEAP_SET_FLAGS((heap), DUK_HEAP_FLAG_MARKANDSWEEP_RECLIMIT_REACHED)
-#define DUK_HEAP_SET_INTERRUPT_RUNNING(heap)               DUK__HEAP_SET_FLAGS((heap), DUK_HEAP_FLAG_INTERRUPT_RUNNING)
-#define DUK_HEAP_SET_FINALIZER_NORESCUE(heap)              DUK__HEAP_SET_FLAGS((heap), DUK_HEAP_FLAG_FINALIZER_NORESCUE)
-#define DUK_HEAP_SET_DEBUGGER_PAUSED(heap)                 DUK__HEAP_SET_FLAGS((heap), DUK_HEAP_FLAG_DEBUGGER_PAUSED)
+#define DUK_HEAP_SET_MARKANDSWEEP_RECLIMIT_REACHED(heap) DUK__HEAP_SET_FLAGS((heap), DUK_HEAP_FLAG_MARKANDSWEEP_RECLIMIT_REACHED)
+#define DUK_HEAP_SET_INTERRUPT_RUNNING(heap)             DUK__HEAP_SET_FLAGS((heap), DUK_HEAP_FLAG_INTERRUPT_RUNNING)
+#define DUK_HEAP_SET_FINALIZER_NORESCUE(heap)            DUK__HEAP_SET_FLAGS((heap), DUK_HEAP_FLAG_FINALIZER_NORESCUE)
+#define DUK_HEAP_SET_DEBUGGER_PAUSED(heap)               DUK__HEAP_SET_FLAGS((heap), DUK_HEAP_FLAG_DEBUGGER_PAUSED)
 
-#define DUK_HEAP_CLEAR_MARKANDSWEEP_RECLIMIT_REACHED(heap) DUK__HEAP_CLEAR_FLAGS((heap), DUK_HEAP_FLAG_MARKANDSWEEP_RECLIMIT_REACHED)
-#define DUK_HEAP_CLEAR_INTERRUPT_RUNNING(heap)             DUK__HEAP_CLEAR_FLAGS((heap), DUK_HEAP_FLAG_INTERRUPT_RUNNING)
-#define DUK_HEAP_CLEAR_FINALIZER_NORESCUE(heap)            DUK__HEAP_CLEAR_FLAGS((heap), DUK_HEAP_FLAG_FINALIZER_NORESCUE)
-#define DUK_HEAP_CLEAR_DEBUGGER_PAUSED(heap)               DUK__HEAP_CLEAR_FLAGS((heap), DUK_HEAP_FLAG_DEBUGGER_PAUSED)
+#define DUK_HEAP_CLEAR_MARKANDSWEEP_RECLIMIT_REACHED(heap) \
+	DUK__HEAP_CLEAR_FLAGS((heap), DUK_HEAP_FLAG_MARKANDSWEEP_RECLIMIT_REACHED)
+#define DUK_HEAP_CLEAR_INTERRUPT_RUNNING(heap)  DUK__HEAP_CLEAR_FLAGS((heap), DUK_HEAP_FLAG_INTERRUPT_RUNNING)
+#define DUK_HEAP_CLEAR_FINALIZER_NORESCUE(heap) DUK__HEAP_CLEAR_FLAGS((heap), DUK_HEAP_FLAG_FINALIZER_NORESCUE)
+#define DUK_HEAP_CLEAR_DEBUGGER_PAUSED(heap)    DUK__HEAP_CLEAR_FLAGS((heap), DUK_HEAP_FLAG_DEBUGGER_PAUSED)
 
 /*
  *  Longjmp types, also double as identifying continuation type for a rethrow (in 'finally')
  */
 
-#define DUK_LJ_TYPE_UNKNOWN      0    /* unused */
-#define DUK_LJ_TYPE_THROW        1    /* value1 -> error object */
-#define DUK_LJ_TYPE_YIELD        2    /* value1 -> yield value, iserror -> error / normal */
-#define DUK_LJ_TYPE_RESUME       3    /* value1 -> resume value, value2 -> resumee thread, iserror -> error/normal */
-#define DUK_LJ_TYPE_BREAK        4    /* value1 -> label number, pseudo-type to indicate a break continuation (for ENDFIN) */
-#define DUK_LJ_TYPE_CONTINUE     5    /* value1 -> label number, pseudo-type to indicate a continue continuation (for ENDFIN) */
-#define DUK_LJ_TYPE_RETURN       6    /* value1 -> return value, pseudo-type to indicate a return continuation (for ENDFIN) */
-#define DUK_LJ_TYPE_NORMAL       7    /* no value, pseudo-type to indicate a normal continuation (for ENDFIN) */
+#define DUK_LJ_TYPE_UNKNOWN  0 /* unused */
+#define DUK_LJ_TYPE_THROW    1 /* value1 -> error object */
+#define DUK_LJ_TYPE_YIELD    2 /* value1 -> yield value, iserror -> error / normal */
+#define DUK_LJ_TYPE_RESUME   3 /* value1 -> resume value, value2 -> resumee thread, iserror -> error/normal */
+#define DUK_LJ_TYPE_BREAK    4 /* value1 -> label number, pseudo-type to indicate a break continuation (for ENDFIN) */
+#define DUK_LJ_TYPE_CONTINUE 5 /* value1 -> label number, pseudo-type to indicate a continue continuation (for ENDFIN) */
+#define DUK_LJ_TYPE_RETURN   6 /* value1 -> return value, pseudo-type to indicate a return continuation (for ENDFIN) */
+#define DUK_LJ_TYPE_NORMAL   7 /* no value, pseudo-type to indicate a normal continuation (for ENDFIN) */
 
 /*
  *  Mark-and-sweep flags
@@ -8435,22 +9013,19 @@ struct duk_hproxy {
 /* Emergency mark-and-sweep: try extra hard, even at the cost of
  * performance.
  */
-#define DUK_MS_FLAG_EMERGENCY                (1U << 0)
-
-/* Voluntary mark-and-sweep: triggered periodically. */
-#define DUK_MS_FLAG_VOLUNTARY                (1U << 1)
+#define DUK_MS_FLAG_EMERGENCY (1U << 0)
 
 /* Postpone rescue decisions for reachable objects with FINALIZED set.
  * Used during finalize_list processing to avoid incorrect rescue
  * decisions due to finalize_list being a reachability root.
  */
-#define DUK_MS_FLAG_POSTPONE_RESCUE          (1U << 2)
+#define DUK_MS_FLAG_POSTPONE_RESCUE (1U << 1)
 
 /* Don't compact objects; needed during object property table resize
  * to prevent a recursive resize.  It would suffice to protect only the
  * current object being resized, but this is not yet implemented.
  */
-#define DUK_MS_FLAG_NO_OBJECT_COMPACTION     (1U << 3)
+#define DUK_MS_FLAG_NO_OBJECT_COMPACTION (1U << 2)
 
 /*
  *  Thread switching
@@ -8461,9 +9036,10 @@ struct duk_hproxy {
  */
 
 #if defined(DUK_USE_INTERRUPT_COUNTER)
-#define DUK_HEAP_SWITCH_THREAD(heap,newthr)  duk_heap_switch_thread((heap), (newthr))
+#define DUK_HEAP_SWITCH_THREAD(heap, newthr) duk_heap_switch_thread((heap), (newthr))
 #else
-#define DUK_HEAP_SWITCH_THREAD(heap,newthr)  do { \
+#define DUK_HEAP_SWITCH_THREAD(heap, newthr) \
+	do { \
 		(heap)->curr_thread = (newthr); \
 	} while (0)
 #endif
@@ -8473,11 +9049,14 @@ struct duk_hproxy {
  */
 
 #if defined(DUK_USE_DEBUG)
-#define DUK_STATS_INC(heap,fieldname) do { \
+#define DUK_STATS_INC(heap, fieldname) \
+	do { \
 		(heap)->fieldname += 1; \
 	} while (0)
 #else
-#define DUK_STATS_INC(heap,fieldname) do {} while (0)
+#define DUK_STATS_INC(heap, fieldname) \
+	do { \
+	} while (0)
 #endif
 
 /*
@@ -8495,36 +9074,41 @@ struct duk_hproxy {
  * only during init phases).
  */
 #if defined(DUK_USE_REFERENCE_COUNTING)
-#define DUK_HEAP_MARK_AND_SWEEP_TRIGGER_MULT              12800L  /* 50x heap size */
-#define DUK_HEAP_MARK_AND_SWEEP_TRIGGER_ADD               1024L
-#define DUK_HEAP_MARK_AND_SWEEP_TRIGGER_SKIP              256L
+#define DUK_HEAP_MARK_AND_SWEEP_TRIGGER_MULT 12800L /* 50x heap size */
+#define DUK_HEAP_MARK_AND_SWEEP_TRIGGER_ADD  1024L
+#define DUK_HEAP_MARK_AND_SWEEP_TRIGGER_SKIP 256L
 #else
-#define DUK_HEAP_MARK_AND_SWEEP_TRIGGER_MULT              256L    /* 1x heap size */
-#define DUK_HEAP_MARK_AND_SWEEP_TRIGGER_ADD               1024L
-#define DUK_HEAP_MARK_AND_SWEEP_TRIGGER_SKIP              256L
+#define DUK_HEAP_MARK_AND_SWEEP_TRIGGER_MULT 256L /* 1x heap size */
+#define DUK_HEAP_MARK_AND_SWEEP_TRIGGER_ADD  1024L
+#define DUK_HEAP_MARK_AND_SWEEP_TRIGGER_SKIP 256L
 #endif
 
 /* GC torture. */
 #if defined(DUK_USE_GC_TORTURE)
-#define DUK_GC_TORTURE(heap) do { duk_heap_mark_and_sweep((heap), 0); } while (0)
+#define DUK_GC_TORTURE(heap) \
+	do { \
+		duk_heap_mark_and_sweep((heap), 0); \
+	} while (0)
 #else
-#define DUK_GC_TORTURE(heap) do { } while (0)
+#define DUK_GC_TORTURE(heap) \
+	do { \
+	} while (0)
 #endif
 
 /* Stringcache is used for speeding up char-offset-to-byte-offset
  * translations for non-ASCII strings.
  */
-#define DUK_HEAP_STRCACHE_SIZE                            4
-#define DUK_HEAP_STRINGCACHE_NOCACHE_LIMIT                16  /* strings up to the this length are not cached */
+#define DUK_HEAP_STRCACHE_SIZE             4
+#define DUK_HEAP_STRINGCACHE_NOCACHE_LIMIT 16 /* strings up to the this length are not cached */
 
 /* Some list management macros. */
-#define DUK_HEAP_INSERT_INTO_HEAP_ALLOCATED(heap,hdr)     duk_heap_insert_into_heap_allocated((heap), (hdr))
+#define DUK_HEAP_INSERT_INTO_HEAP_ALLOCATED(heap, hdr) duk_heap_insert_into_heap_allocated((heap), (hdr))
 #if defined(DUK_USE_REFERENCE_COUNTING)
-#define DUK_HEAP_REMOVE_FROM_HEAP_ALLOCATED(heap,hdr)     duk_heap_remove_from_heap_allocated((heap), (hdr))
+#define DUK_HEAP_REMOVE_FROM_HEAP_ALLOCATED(heap, hdr) duk_heap_remove_from_heap_allocated((heap), (hdr))
 #endif
 #if defined(DUK_USE_FINALIZER_SUPPORT)
-#define DUK_HEAP_INSERT_INTO_FINALIZE_LIST(heap,hdr)      duk_heap_insert_into_finalize_list((heap), (hdr))
-#define DUK_HEAP_REMOVE_FROM_FINALIZE_LIST(heap,hdr)      duk_heap_remove_from_finalize_list((heap), (hdr))
+#define DUK_HEAP_INSERT_INTO_FINALIZE_LIST(heap, hdr) duk_heap_insert_into_finalize_list((heap), (hdr))
+#define DUK_HEAP_REMOVE_FROM_FINALIZE_LIST(heap, hdr) duk_heap_remove_from_finalize_list((heap), (hdr))
 #endif
 
 /*
@@ -8533,30 +9117,24 @@ struct duk_hproxy {
 
 /* heap string indices are autogenerated in duk_strings.h */
 #if defined(DUK_USE_ROM_STRINGS)
-#define DUK_HEAP_GET_STRING(heap,idx) \
-	((duk_hstring *) DUK_LOSE_CONST(duk_rom_strings_stridx[(idx)]))
-#else  /* DUK_USE_ROM_STRINGS */
+#define DUK_HEAP_GET_STRING(heap, idx) ((duk_hstring *) DUK_LOSE_CONST(duk_rom_strings_stridx[(idx)]))
+#else /* DUK_USE_ROM_STRINGS */
 #if defined(DUK_USE_HEAPPTR16)
-#define DUK_HEAP_GET_STRING(heap,idx) \
-	((duk_hstring *) DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (heap)->strs16[(idx)]))
+#define DUK_HEAP_GET_STRING(heap, idx) ((duk_hstring *) DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (heap)->strs16[(idx)]))
 #else
-#define DUK_HEAP_GET_STRING(heap,idx) \
-	((heap)->strs[(idx)])
+#define DUK_HEAP_GET_STRING(heap, idx) ((heap)->strs[(idx)])
 #endif
-#endif  /* DUK_USE_ROM_STRINGS */
+#endif /* DUK_USE_ROM_STRINGS */
 
 /*
  *  Raw memory calls: relative to heap, but no GC interaction
  */
 
-#define DUK_ALLOC_RAW(heap,size) \
-	((heap)->alloc_func((heap)->heap_udata, (size)))
+#define DUK_ALLOC_RAW(heap, size) ((heap)->alloc_func((heap)->heap_udata, (size)))
 
-#define DUK_REALLOC_RAW(heap,ptr,newsize) \
-	((heap)->realloc_func((heap)->heap_udata, (void *) (ptr), (newsize)))
+#define DUK_REALLOC_RAW(heap, ptr, newsize) ((heap)->realloc_func((heap)->heap_udata, (void *) (ptr), (newsize)))
 
-#define DUK_FREE_RAW(heap,ptr) \
-	((heap)->free_func((heap)->heap_udata, (void *) (ptr)))
+#define DUK_FREE_RAW(heap, ptr) ((heap)->free_func((heap)->heap_udata, (void *) (ptr)))
 
 /*
  *  Memory calls: relative to heap, GC interaction, but no error throwing.
@@ -8589,11 +9167,11 @@ struct duk_hproxy {
 /* callback for indirect reallocs, request for current pointer */
 typedef void *(*duk_mem_getptr)(duk_heap *heap, void *ud);
 
-#define DUK_ALLOC(heap,size)                            duk_heap_mem_alloc((heap), (size))
-#define DUK_ALLOC_ZEROED(heap,size)                     duk_heap_mem_alloc_zeroed((heap), (size))
-#define DUK_REALLOC(heap,ptr,newsize)                   duk_heap_mem_realloc((heap), (ptr), (newsize))
-#define DUK_REALLOC_INDIRECT(heap,cb,ud,newsize)        duk_heap_mem_realloc_indirect((heap), (cb), (ud), (newsize))
-#define DUK_FREE(heap,ptr)                              duk_heap_mem_free((heap), (ptr))
+#define DUK_ALLOC(heap, size)                       duk_heap_mem_alloc((heap), (size))
+#define DUK_ALLOC_ZEROED(heap, size)                duk_heap_mem_alloc_zeroed((heap), (size))
+#define DUK_REALLOC(heap, ptr, newsize)             duk_heap_mem_realloc((heap), (ptr), (newsize))
+#define DUK_REALLOC_INDIRECT(heap, cb, ud, newsize) duk_heap_mem_realloc_indirect((heap), (cb), (ud), (newsize))
+#define DUK_FREE(heap, ptr)                         duk_heap_mem_free((heap), (ptr))
 
 /*
  *  Checked allocation, relative to a thread
@@ -8602,24 +9180,26 @@ typedef void *(*duk_mem_getptr)(duk_heap *heap, void *ud);
  *  for convenience.
  */
 
-#define DUK_ALLOC_CHECKED(thr,size)                     duk_heap_mem_alloc_checked((thr), (size))
-#define DUK_ALLOC_CHECKED_ZEROED(thr,size)              duk_heap_mem_alloc_checked_zeroed((thr), (size))
-#define DUK_FREE_CHECKED(thr,ptr)                       duk_heap_mem_free((thr)->heap, (ptr))
+#define DUK_ALLOC_CHECKED(thr, size)        duk_heap_mem_alloc_checked((thr), (size))
+#define DUK_ALLOC_CHECKED_ZEROED(thr, size) duk_heap_mem_alloc_checked_zeroed((thr), (size))
+#define DUK_FREE_CHECKED(thr, ptr)          duk_heap_mem_free((thr)->heap, (ptr))
 
 /*
  *  Memory constants
  */
 
-#define DUK_HEAP_ALLOC_FAIL_MARKANDSWEEP_LIMIT           10  /* Retry allocation after mark-and-sweep for this
-                                                              * many times.  A single mark-and-sweep round is
-                                                              * not guaranteed to free all unreferenced memory
-                                                              * because of finalization (in fact, ANY number of
-                                                              * rounds is strictly not enough).
-                                                              */
+#define DUK_HEAP_ALLOC_FAIL_MARKANDSWEEP_LIMIT \
+	10 /* Retry allocation after mark-and-sweep for this \
+	    * many times.  A single mark-and-sweep round is \
+	    * not guaranteed to free all unreferenced memory \
+	    * because of finalization (in fact, ANY number of \
+	    * rounds is strictly not enough). \
+	    */
 
-#define DUK_HEAP_ALLOC_FAIL_MARKANDSWEEP_EMERGENCY_LIMIT  3  /* Starting from this round, use emergency mode
-                                                              * for mark-and-sweep.
-                                                              */
+#define DUK_HEAP_ALLOC_FAIL_MARKANDSWEEP_EMERGENCY_LIMIT \
+	3 /* Starting from this round, use emergency mode \
+	   * for mark-and-sweep. \
+	   */
 
 /*
  *  Debugger support
@@ -8628,26 +9208,26 @@ typedef void *(*duk_mem_getptr)(duk_heap *heap, void *ud);
 /* Maximum number of breakpoints.  Only breakpoints that are set are
  * consulted so increasing this has no performance impact.
  */
-#define DUK_HEAP_MAX_BREAKPOINTS          16
+#define DUK_HEAP_MAX_BREAKPOINTS 16
 
 /* Opcode interval for a Date-based status/peek rate limit check.  Only
  * relevant when debugger is attached.  Requesting a timestamp may be a
  * slow operation on some platforms so this shouldn't be too low.  On the
  * other hand a high value makes Duktape react to a pause request slowly.
  */
-#define DUK_HEAP_DBG_RATELIMIT_OPCODES    4000
+#define DUK_HEAP_DBG_RATELIMIT_OPCODES 4000
 
 /* Milliseconds between status notify and transport peeks. */
-#define DUK_HEAP_DBG_RATELIMIT_MILLISECS  200
+#define DUK_HEAP_DBG_RATELIMIT_MILLISECS 200
 
 /* Debugger pause flags. */
-#define DUK_PAUSE_FLAG_ONE_OPCODE        (1U << 0)   /* pause when a single opcode has been executed */
-#define DUK_PAUSE_FLAG_ONE_OPCODE_ACTIVE (1U << 1)   /* one opcode pause actually active; artifact of current implementation */
-#define DUK_PAUSE_FLAG_LINE_CHANGE       (1U << 2)   /* pause when current line number changes */
-#define DUK_PAUSE_FLAG_FUNC_ENTRY        (1U << 3)   /* pause when entering a function */
-#define DUK_PAUSE_FLAG_FUNC_EXIT         (1U << 4)   /* pause when exiting current function */
-#define DUK_PAUSE_FLAG_CAUGHT_ERROR      (1U << 5)   /* pause when about to throw an error that is caught */
-#define DUK_PAUSE_FLAG_UNCAUGHT_ERROR    (1U << 6)   /* pause when about to throw an error that won't be caught */
+#define DUK_PAUSE_FLAG_ONE_OPCODE        (1U << 0) /* pause when a single opcode has been executed */
+#define DUK_PAUSE_FLAG_ONE_OPCODE_ACTIVE (1U << 1) /* one opcode pause actually active; artifact of current implementation */
+#define DUK_PAUSE_FLAG_LINE_CHANGE       (1U << 2) /* pause when current line number changes */
+#define DUK_PAUSE_FLAG_FUNC_ENTRY        (1U << 3) /* pause when entering a function */
+#define DUK_PAUSE_FLAG_FUNC_EXIT         (1U << 4) /* pause when exiting current function */
+#define DUK_PAUSE_FLAG_CAUGHT_ERROR      (1U << 5) /* pause when about to throw an error that is caught */
+#define DUK_PAUSE_FLAG_UNCAUGHT_ERROR    (1U << 6) /* pause when about to throw an error that won't be caught */
 
 struct duk_breakpoint {
 	duk_hstring *filename;
@@ -8675,21 +9255,23 @@ struct duk_strcache_entry {
  */
 
 struct duk_ljstate {
-	duk_jmpbuf *jmpbuf_ptr;   /* current setjmp() catchpoint */
-	duk_small_uint_t type;    /* longjmp type */
-	duk_bool_t iserror;       /* isError flag for yield */
-	duk_tval value1;          /* 1st related value (type specific) */
-	duk_tval value2;          /* 2nd related value (type specific) */
+	duk_jmpbuf *jmpbuf_ptr; /* current setjmp() catchpoint */
+	duk_small_uint_t type; /* longjmp type */
+	duk_bool_t iserror; /* isError flag for yield */
+	duk_tval value1; /* 1st related value (type specific) */
+	duk_tval value2; /* 2nd related value (type specific) */
 };
 
-#define DUK_ASSERT_LJSTATE_UNSET(heap) do { \
+#define DUK_ASSERT_LJSTATE_UNSET(heap) \
+	do { \
 		DUK_ASSERT(heap != NULL); \
 		DUK_ASSERT(heap->lj.type == DUK_LJ_TYPE_UNKNOWN); \
 		DUK_ASSERT(heap->lj.iserror == 0); \
 		DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(&heap->lj.value1)); \
 		DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(&heap->lj.value2)); \
 	} while (0)
-#define DUK_ASSERT_LJSTATE_SET(heap) do { \
+#define DUK_ASSERT_LJSTATE_SET(heap) \
+	do { \
 		DUK_ASSERT(heap != NULL); \
 		DUK_ASSERT(heap->lj.type != DUK_LJ_TYPE_UNKNOWN); \
 	} while (0)
@@ -8707,6 +9289,18 @@ struct duk_litcache_entry {
  *  Main heap structure
  */
 
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL_DECL void duk_heap_assert_valid(duk_heap *heap);
+#define DUK_HEAP_ASSERT_VALID(heap) \
+	do { \
+		duk_heap_assert_valid((heap)); \
+	} while (0)
+#else
+#define DUK_HEAP_ASSERT_VALID(heap) \
+	do { \
+	} while (0)
+#endif
+
 struct duk_heap {
 	duk_small_uint_t flags;
 
@@ -8778,6 +9372,11 @@ struct duk_heap {
 
 	/* Mark-and-sweep running flag.  Prevents re-entry, and also causes
 	 * refzero events to be ignored (= objects won't be queued to refzero_list).
+	 *
+	 * 0: mark-and-sweep not running
+	 * 1: mark-and-sweep is running
+	 * 2: heap destruction active or debugger active, prevent mark-and-sweep
+	 *    and refzero processing (but mark-and-sweep not itself running)
 	 */
 	duk_uint_t ms_running;
 
@@ -8853,9 +9452,9 @@ struct duk_heap {
 	/* Random number state for duk_util_tinyrandom.c. */
 #if !defined(DUK_USE_GET_RANDOM_DOUBLE)
 #if defined(DUK_USE_PREFER_SIZE) || !defined(DUK_USE_64BIT_OPS)
-	duk_uint32_t rnd_state;  /* State for Shamir's three-op algorithm */
+	duk_uint32_t rnd_state; /* State for Shamir's three-op algorithm */
 #else
-	duk_uint64_t rnd_state[2];  /* State for xoroshiro128+ */
+	duk_uint64_t rnd_state[2]; /* State for xoroshiro128+ */
 #endif
 #endif
 
@@ -8878,8 +9477,8 @@ struct duk_heap {
 	/* Debugger state. */
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
 	/* Callbacks and udata; dbg_read_cb != NULL is used to indicate attached state. */
-	duk_debug_read_function dbg_read_cb;                /* required, NULL implies detached */
-	duk_debug_write_function dbg_write_cb;              /* required */
+	duk_debug_read_function dbg_read_cb; /* required, NULL implies detached */
+	duk_debug_write_function dbg_write_cb; /* required */
 	duk_debug_peek_function dbg_peek_cb;
 	duk_debug_read_flush_function dbg_read_flush_cb;
 	duk_debug_write_flush_function dbg_write_flush_cb;
@@ -8888,29 +9487,32 @@ struct duk_heap {
 	void *dbg_udata;
 
 	/* The following are only relevant when debugger is attached. */
-	duk_bool_t dbg_processing;              /* currently processing messages or breakpoints: don't enter message processing recursively (e.g. no breakpoints when processing debugger eval) */
-	duk_bool_t dbg_state_dirty;             /* resend state next time executor is about to run */
-	duk_bool_t dbg_force_restart;           /* force executor restart to recheck breakpoints; used to handle function returns (see GH-303) */
-	duk_bool_t dbg_detaching;               /* debugger detaching; used to avoid calling detach handler recursively */
-	duk_small_uint_t dbg_pause_flags;       /* flags for automatic pause behavior */
-	duk_activation *dbg_pause_act;          /* activation related to pause behavior (pause on line change, function entry/exit) */
-	duk_uint32_t dbg_pause_startline;       /* starting line number for line change related pause behavior */
-	duk_breakpoint dbg_breakpoints[DUK_HEAP_MAX_BREAKPOINTS];  /* breakpoints: [0,breakpoint_count[ gc reachable */
+	duk_bool_t dbg_processing; /* currently processing messages or breakpoints: don't enter message processing recursively (e.g.
+	                              no breakpoints when processing debugger eval) */
+	duk_bool_t dbg_state_dirty; /* resend state next time executor is about to run */
+	duk_bool_t
+	    dbg_force_restart; /* force executor restart to recheck breakpoints; used to handle function returns (see GH-303) */
+	duk_bool_t dbg_detaching; /* debugger detaching; used to avoid calling detach handler recursively */
+	duk_small_uint_t dbg_pause_flags; /* flags for automatic pause behavior */
+	duk_activation *dbg_pause_act; /* activation related to pause behavior (pause on line change, function entry/exit) */
+	duk_uint32_t dbg_pause_startline; /* starting line number for line change related pause behavior */
+	duk_breakpoint dbg_breakpoints[DUK_HEAP_MAX_BREAKPOINTS]; /* breakpoints: [0,breakpoint_count[ gc reachable */
 	duk_small_uint_t dbg_breakpoint_count;
-	duk_breakpoint *dbg_breakpoints_active[DUK_HEAP_MAX_BREAKPOINTS + 1];  /* currently active breakpoints: NULL term, borrowed pointers */
+	duk_breakpoint
+	    *dbg_breakpoints_active[DUK_HEAP_MAX_BREAKPOINTS + 1]; /* currently active breakpoints: NULL term, borrowed pointers */
 	/* XXX: make active breakpoints actual copies instead of pointers? */
 
 	/* These are for rate limiting Status notifications and transport peeking. */
-	duk_uint_t dbg_exec_counter;            /* cumulative opcode execution count (overflows are OK) */
-	duk_uint_t dbg_last_counter;            /* value of dbg_exec_counter when we last did a Date-based check */
-	duk_double_t dbg_last_time;             /* time when status/peek was last done (Date-based rate limit) */
+	duk_uint_t dbg_exec_counter; /* cumulative opcode execution count (overflows are OK) */
+	duk_uint_t dbg_last_counter; /* value of dbg_exec_counter when we last did a Date-based check */
+	duk_double_t dbg_last_time; /* time when status/peek was last done (Date-based rate limit) */
 
 	/* Used to support single-byte stream lookahead. */
 	duk_bool_t dbg_have_next_byte;
 	duk_uint8_t dbg_next_byte;
-#endif  /* DUK_USE_DEBUGGER_SUPPORT */
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
 #if defined(DUK_USE_ASSERTIONS)
-	duk_bool_t dbg_calling_transport;       /* transport call in progress, calling into Duktape forbidden */
+	duk_bool_t dbg_calling_transport; /* transport call in progress, calling into Duktape forbidden */
 #endif
 
 	/* String intern table (weak refs). */
@@ -8919,12 +9521,12 @@ struct duk_heap {
 #else
 	duk_hstring **strtable;
 #endif
-	duk_uint32_t st_mask;    /* mask for lookup, st_size - 1 */
-	duk_uint32_t st_size;    /* stringtable size */
+	duk_uint32_t st_mask; /* mask for lookup, st_size - 1 */
+	duk_uint32_t st_size; /* stringtable size */
 #if (DUK_USE_STRTAB_MINSIZE != DUK_USE_STRTAB_MAXSIZE)
-	duk_uint32_t st_count;   /* string count for resize load factor checks */
+	duk_uint32_t st_count; /* string count for resize load factor checks */
 #endif
-	duk_bool_t st_resizing;  /* string table is being resized; avoid recursive resize */
+	duk_bool_t st_resizing; /* string table is being resized; avoid recursive resize */
 
 	/* String access cache (codepoint offset -> byte offset) for fast string
 	 * character looping; 'weak' reference which needs special handling in GC.
@@ -8996,6 +9598,11 @@ struct duk_heap {
 	duk_int_t stats_putprop_proxy;
 	duk_int_t stats_getvar_all;
 	duk_int_t stats_putvar_all;
+	duk_int_t stats_envrec_delayedcreate;
+	duk_int_t stats_envrec_create;
+	duk_int_t stats_envrec_newenv;
+	duk_int_t stats_envrec_oldenv;
+	duk_int_t stats_envrec_pushclosure;
 #endif
 };
 
@@ -9033,7 +9640,9 @@ DUK_INTERNAL_DECL void duk_heap_switch_thread(duk_heap *heap, duk_hthread *new_t
 DUK_INTERNAL_DECL duk_hstring *duk_heap_strtable_intern(duk_heap *heap, const duk_uint8_t *str, duk_uint32_t blen);
 DUK_INTERNAL_DECL duk_hstring *duk_heap_strtable_intern_checked(duk_hthread *thr, const duk_uint8_t *str, duk_uint32_t len);
 #if defined(DUK_USE_LITCACHE_SIZE)
-DUK_INTERNAL_DECL duk_hstring *duk_heap_strtable_intern_literal_checked(duk_hthread *thr, const duk_uint8_t *str, duk_uint32_t blen);
+DUK_INTERNAL_DECL duk_hstring *duk_heap_strtable_intern_literal_checked(duk_hthread *thr,
+                                                                        const duk_uint8_t *str,
+                                                                        duk_uint32_t blen);
 #endif
 DUK_INTERNAL_DECL duk_hstring *duk_heap_strtable_intern_u32(duk_heap *heap, duk_uint32_t val);
 DUK_INTERNAL_DECL duk_hstring *duk_heap_strtable_intern_u32_checked(duk_hthread *thr, duk_uint32_t val);
@@ -9048,7 +9657,9 @@ DUK_INTERNAL void duk_heap_strtable_dump(duk_heap *heap);
 #endif
 
 DUK_INTERNAL_DECL void duk_heap_strcache_string_remove(duk_heap *heap, duk_hstring *h);
-DUK_INTERNAL_DECL duk_uint_fast32_t duk_heap_strcache_offset_char2byte(duk_hthread *thr, duk_hstring *h, duk_uint_fast32_t char_offset);
+DUK_INTERNAL_DECL duk_uint_fast32_t duk_heap_strcache_offset_char2byte(duk_hthread *thr,
+                                                                       duk_hstring *h,
+                                                                       duk_uint_fast32_t char_offset);
 
 #if defined(DUK_USE_PROVIDE_DEFAULT_ALLOC_FUNCTIONS)
 DUK_INTERNAL_DECL void *duk_default_alloc_function(void *udata, duk_size_t size);
@@ -9069,13 +9680,13 @@ DUK_INTERNAL_DECL void duk_heap_free_freelists(duk_heap *heap);
 #if defined(DUK_USE_FINALIZER_SUPPORT)
 DUK_INTERNAL_DECL void duk_heap_run_finalizer(duk_heap *heap, duk_hobject *obj);
 DUK_INTERNAL_DECL void duk_heap_process_finalize_list(duk_heap *heap);
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 
 DUK_INTERNAL_DECL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags);
 
 DUK_INTERNAL_DECL duk_uint32_t duk_heap_hashstring(duk_heap *heap, const duk_uint8_t *str, duk_size_t len);
 
-#endif  /* DUK_HEAP_H_INCLUDED */
+#endif /* DUK_HEAP_H_INCLUDED */
 /* #include duk_debugger.h */
 #if !defined(DUK_DEBUGGER_H_INCLUDED)
 #define DUK_DEBUGGER_H_INCLUDED
@@ -9083,77 +9694,77 @@ DUK_INTERNAL_DECL duk_uint32_t duk_heap_hashstring(duk_heap *heap, const duk_uin
 /* Debugger protocol version is defined in the public API header. */
 
 /* Initial bytes for markers. */
-#define DUK_DBG_IB_EOM                   0x00
-#define DUK_DBG_IB_REQUEST               0x01
-#define DUK_DBG_IB_REPLY                 0x02
-#define DUK_DBG_IB_ERROR                 0x03
-#define DUK_DBG_IB_NOTIFY                0x04
+#define DUK_DBG_IB_EOM     0x00
+#define DUK_DBG_IB_REQUEST 0x01
+#define DUK_DBG_IB_REPLY   0x02
+#define DUK_DBG_IB_ERROR   0x03
+#define DUK_DBG_IB_NOTIFY  0x04
 
 /* Other initial bytes. */
-#define DUK_DBG_IB_INT4                  0x10
-#define DUK_DBG_IB_STR4                  0x11
-#define DUK_DBG_IB_STR2                  0x12
-#define DUK_DBG_IB_BUF4                  0x13
-#define DUK_DBG_IB_BUF2                  0x14
-#define DUK_DBG_IB_UNUSED                0x15
-#define DUK_DBG_IB_UNDEFINED             0x16
-#define DUK_DBG_IB_NULL                  0x17
-#define DUK_DBG_IB_TRUE                  0x18
-#define DUK_DBG_IB_FALSE                 0x19
-#define DUK_DBG_IB_NUMBER                0x1a
-#define DUK_DBG_IB_OBJECT                0x1b
-#define DUK_DBG_IB_POINTER               0x1c
-#define DUK_DBG_IB_LIGHTFUNC             0x1d
-#define DUK_DBG_IB_HEAPPTR               0x1e
+#define DUK_DBG_IB_INT4      0x10
+#define DUK_DBG_IB_STR4      0x11
+#define DUK_DBG_IB_STR2      0x12
+#define DUK_DBG_IB_BUF4      0x13
+#define DUK_DBG_IB_BUF2      0x14
+#define DUK_DBG_IB_UNUSED    0x15
+#define DUK_DBG_IB_UNDEFINED 0x16
+#define DUK_DBG_IB_NULL      0x17
+#define DUK_DBG_IB_TRUE      0x18
+#define DUK_DBG_IB_FALSE     0x19
+#define DUK_DBG_IB_NUMBER    0x1a
+#define DUK_DBG_IB_OBJECT    0x1b
+#define DUK_DBG_IB_POINTER   0x1c
+#define DUK_DBG_IB_LIGHTFUNC 0x1d
+#define DUK_DBG_IB_HEAPPTR   0x1e
 /* The short string/integer initial bytes starting from 0x60 don't have
  * defines now.
  */
 
 /* Error codes. */
-#define DUK_DBG_ERR_UNKNOWN              0x00
-#define DUK_DBG_ERR_UNSUPPORTED          0x01
-#define DUK_DBG_ERR_TOOMANY              0x02
-#define DUK_DBG_ERR_NOTFOUND             0x03
-#define DUK_DBG_ERR_APPLICATION          0x04
+#define DUK_DBG_ERR_UNKNOWN     0x00
+#define DUK_DBG_ERR_UNSUPPORTED 0x01
+#define DUK_DBG_ERR_TOOMANY     0x02
+#define DUK_DBG_ERR_NOTFOUND    0x03
+#define DUK_DBG_ERR_APPLICATION 0x04
 
 /* Commands and notifys initiated by Duktape. */
-#define DUK_DBG_CMD_STATUS               0x01
-#define DUK_DBG_CMD_UNUSED_2             0x02  /* Duktape 1.x: print notify */
-#define DUK_DBG_CMD_UNUSED_3             0x03  /* Duktape 1.x: alert notify */
-#define DUK_DBG_CMD_UNUSED_4             0x04  /* Duktape 1.x: log notify */
-#define DUK_DBG_CMD_THROW                0x05
-#define DUK_DBG_CMD_DETACHING            0x06
-#define DUK_DBG_CMD_APPNOTIFY            0x07
+#define DUK_DBG_CMD_STATUS    0x01
+#define DUK_DBG_CMD_UNUSED_2  0x02 /* Duktape 1.x: print notify */
+#define DUK_DBG_CMD_UNUSED_3  0x03 /* Duktape 1.x: alert notify */
+#define DUK_DBG_CMD_UNUSED_4  0x04 /* Duktape 1.x: log notify */
+#define DUK_DBG_CMD_THROW     0x05
+#define DUK_DBG_CMD_DETACHING 0x06
+#define DUK_DBG_CMD_APPNOTIFY 0x07
 
 /* Commands initiated by debug client. */
-#define DUK_DBG_CMD_BASICINFO            0x10
-#define DUK_DBG_CMD_TRIGGERSTATUS        0x11
-#define DUK_DBG_CMD_PAUSE                0x12
-#define DUK_DBG_CMD_RESUME               0x13
-#define DUK_DBG_CMD_STEPINTO             0x14
-#define DUK_DBG_CMD_STEPOVER             0x15
-#define DUK_DBG_CMD_STEPOUT              0x16
-#define DUK_DBG_CMD_LISTBREAK            0x17
-#define DUK_DBG_CMD_ADDBREAK             0x18
-#define DUK_DBG_CMD_DELBREAK             0x19
-#define DUK_DBG_CMD_GETVAR               0x1a
-#define DUK_DBG_CMD_PUTVAR               0x1b
-#define DUK_DBG_CMD_GETCALLSTACK         0x1c
-#define DUK_DBG_CMD_GETLOCALS            0x1d
-#define DUK_DBG_CMD_EVAL                 0x1e
-#define DUK_DBG_CMD_DETACH               0x1f
-#define DUK_DBG_CMD_DUMPHEAP             0x20
-#define DUK_DBG_CMD_GETBYTECODE          0x21
-#define DUK_DBG_CMD_APPREQUEST           0x22
-#define DUK_DBG_CMD_GETHEAPOBJINFO       0x23
-#define DUK_DBG_CMD_GETOBJPROPDESC       0x24
-#define DUK_DBG_CMD_GETOBJPROPDESCRANGE  0x25
+#define DUK_DBG_CMD_BASICINFO           0x10
+#define DUK_DBG_CMD_TRIGGERSTATUS       0x11
+#define DUK_DBG_CMD_PAUSE               0x12
+#define DUK_DBG_CMD_RESUME              0x13
+#define DUK_DBG_CMD_STEPINTO            0x14
+#define DUK_DBG_CMD_STEPOVER            0x15
+#define DUK_DBG_CMD_STEPOUT             0x16
+#define DUK_DBG_CMD_LISTBREAK           0x17
+#define DUK_DBG_CMD_ADDBREAK            0x18
+#define DUK_DBG_CMD_DELBREAK            0x19
+#define DUK_DBG_CMD_GETVAR              0x1a
+#define DUK_DBG_CMD_PUTVAR              0x1b
+#define DUK_DBG_CMD_GETCALLSTACK        0x1c
+#define DUK_DBG_CMD_GETLOCALS           0x1d
+#define DUK_DBG_CMD_EVAL                0x1e
+#define DUK_DBG_CMD_DETACH              0x1f
+#define DUK_DBG_CMD_DUMPHEAP            0x20
+#define DUK_DBG_CMD_GETBYTECODE         0x21
+#define DUK_DBG_CMD_APPREQUEST          0x22
+#define DUK_DBG_CMD_GETHEAPOBJINFO      0x23
+#define DUK_DBG_CMD_GETOBJPROPDESC      0x24
+#define DUK_DBG_CMD_GETOBJPROPDESCRANGE 0x25
 
 /* The low 8 bits map directly to duk_hobject.h DUK_PROPDESC_FLAG_xxx.
  * The remaining flags are specific to the debugger.
  */
-#define DUK_DBG_PROPFLAG_SYMBOL          (1U << 8)
-#define DUK_DBG_PROPFLAG_HIDDEN          (1U << 9)
+#define DUK_DBG_PROPFLAG_SYMBOL (1U << 8)
+#define DUK_DBG_PROPFLAG_HIDDEN (1U << 9)
 
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
 DUK_INTERNAL_DECL void duk_debug_do_detach(duk_heap *heap);
@@ -9200,7 +9811,7 @@ DUK_INTERNAL_DECL void duk_debug_write_heapptr(duk_hthread *thr, duk_heaphdr *h)
 #endif
 DUK_INTERNAL_DECL void duk_debug_write_hobject(duk_hthread *thr, duk_hobject *obj);
 DUK_INTERNAL_DECL void duk_debug_write_tval(duk_hthread *thr, duk_tval *tv);
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_INTERNAL_DECL void duk_debug_write_request(duk_hthread *thr, duk_small_uint_t command);
 #endif
 DUK_INTERNAL_DECL void duk_debug_write_reply(duk_hthread *thr);
@@ -9225,9 +9836,9 @@ DUK_INTERNAL_DECL duk_bool_t duk_debug_is_paused(duk_heap *heap);
 DUK_INTERNAL_DECL void duk_debug_set_paused(duk_heap *heap);
 DUK_INTERNAL_DECL void duk_debug_clear_paused(duk_heap *heap);
 DUK_INTERNAL_DECL void duk_debug_clear_pause_state(duk_heap *heap);
-#endif  /* DUK_USE_DEBUGGER_SUPPORT */
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
 
-#endif  /* DUK_DEBUGGER_H_INCLUDED */
+#endif /* DUK_DEBUGGER_H_INCLUDED */
 /* #include duk_debug.h */
 /*
  *  Debugging macros, DUK_DPRINT() and its variants in particular.
@@ -9259,19 +9870,25 @@ DUK_INTERNAL_DECL void duk_debug_clear_pause_state(duk_heap *heap);
 #if defined(DUK_USE_DEBUG_LEVEL) && (DUK_USE_DEBUG_LEVEL >= 0)
 #define DUK_D(x) x
 #else
-#define DUK_D(x) do { } while (0) /* omit */
+#define DUK_D(x) \
+	do { \
+	} while (0) /* omit */
 #endif
 
 #if defined(DUK_USE_DEBUG_LEVEL) && (DUK_USE_DEBUG_LEVEL >= 1)
 #define DUK_DD(x) x
 #else
-#define DUK_DD(x) do { } while (0) /* omit */
+#define DUK_DD(x) \
+	do { \
+	} while (0) /* omit */
 #endif
 
 #if defined(DUK_USE_DEBUG_LEVEL) && (DUK_USE_DEBUG_LEVEL >= 2)
 #define DUK_DDD(x) x
 #else
-#define DUK_DDD(x) do { } while (0) /* omit */
+#define DUK_DDD(x) \
+	do { \
+	} while (0) /* omit */
 #endif
 
 /*
@@ -9283,35 +9900,35 @@ DUK_INTERNAL_DECL void duk_debug_clear_pause_state(duk_heap *heap);
 /* Note: combining __FILE__, __LINE__, and __func__ into fmt would be
  * possible compile time, but waste some space with shared function names.
  */
-#define DUK__DEBUG_LOG(lev,...)  duk_debug_log((duk_int_t) (lev), DUK_FILE_MACRO, (duk_int_t) DUK_LINE_MACRO, DUK_FUNC_MACRO, __VA_ARGS__);
+#define DUK__DEBUG_LOG(lev, ...) \
+	duk_debug_log((duk_int_t) (lev), DUK_FILE_MACRO, (duk_int_t) DUK_LINE_MACRO, DUK_FUNC_MACRO, __VA_ARGS__);
 
 #if defined(DUK_USE_DEBUG_LEVEL) && (DUK_USE_DEBUG_LEVEL >= 0)
-#define DUK_DPRINT(...)          DUK__DEBUG_LOG(DUK_LEVEL_DEBUG, __VA_ARGS__)
+#define DUK_DPRINT(...) DUK__DEBUG_LOG(DUK_LEVEL_DEBUG, __VA_ARGS__)
 #else
 #define DUK_DPRINT(...)
 #endif
 
 #if defined(DUK_USE_DEBUG_LEVEL) && (DUK_USE_DEBUG_LEVEL >= 1)
-#define DUK_DDPRINT(...)         DUK__DEBUG_LOG(DUK_LEVEL_DDEBUG, __VA_ARGS__)
+#define DUK_DDPRINT(...) DUK__DEBUG_LOG(DUK_LEVEL_DDEBUG, __VA_ARGS__)
 #else
 #define DUK_DDPRINT(...)
 #endif
 
 #if defined(DUK_USE_DEBUG_LEVEL) && (DUK_USE_DEBUG_LEVEL >= 2)
-#define DUK_DDDPRINT(...)        DUK__DEBUG_LOG(DUK_LEVEL_DDDEBUG, __VA_ARGS__)
+#define DUK_DDDPRINT(...) DUK__DEBUG_LOG(DUK_LEVEL_DDDEBUG, __VA_ARGS__)
 #else
 #define DUK_DDDPRINT(...)
 #endif
 
-#else  /* DUK_USE_VARIADIC_MACROS */
+#else /* DUK_USE_VARIADIC_MACROS */
 
-#define DUK__DEBUG_STASH(lev)    \
+#define DUK__DEBUG_STASH(lev) \
 	(void) DUK_SNPRINTF(duk_debug_file_stash, DUK_DEBUG_STASH_SIZE, "%s", (const char *) DUK_FILE_MACRO), \
-	(void) (duk_debug_file_stash[DUK_DEBUG_STASH_SIZE - 1] = (char) 0), \
-	(void) (duk_debug_line_stash = (duk_int_t) DUK_LINE_MACRO), \
-	(void) DUK_SNPRINTF(duk_debug_func_stash, DUK_DEBUG_STASH_SIZE, "%s", (const char *) DUK_FUNC_MACRO), \
-	(void) (duk_debug_func_stash[DUK_DEBUG_STASH_SIZE - 1] = (char) 0), \
-	(void) (duk_debug_level_stash = (lev))
+	    (void) (duk_debug_file_stash[DUK_DEBUG_STASH_SIZE - 1] = (char) 0), \
+	    (void) (duk_debug_line_stash = (duk_int_t) DUK_LINE_MACRO), \
+	    (void) DUK_SNPRINTF(duk_debug_func_stash, DUK_DEBUG_STASH_SIZE, "%s", (const char *) DUK_FUNC_MACRO), \
+	    (void) (duk_debug_func_stash[DUK_DEBUG_STASH_SIZE - 1] = (char) 0), (void) (duk_debug_level_stash = (lev))
 
 /* Without variadic macros resort to comma expression trickery to handle debug
  * prints.  This generates a lot of harmless warnings.  These hacks are not
@@ -9320,34 +9937,40 @@ DUK_INTERNAL_DECL void duk_debug_clear_pause_state(duk_heap *heap);
  */
 
 #if defined(DUK_USE_DEBUG_LEVEL) && (DUK_USE_DEBUG_LEVEL >= 0)
-#define DUK_DPRINT  DUK__DEBUG_STASH(DUK_LEVEL_DEBUG), (void) duk_debug_log  /* args go here in parens */
+#define DUK_DPRINT DUK__DEBUG_STASH(DUK_LEVEL_DEBUG), (void) duk_debug_log /* args go here in parens */
 #else
-#define DUK_DPRINT  0 && /* args go here as a comma expression in parens */
+#define DUK_DPRINT 0 && /* args go here as a comma expression in parens */
 #endif
 
 #if defined(DUK_USE_DEBUG_LEVEL) && (DUK_USE_DEBUG_LEVEL >= 1)
-#define DUK_DDPRINT  DUK__DEBUG_STASH(DUK_LEVEL_DDEBUG), (void) duk_debug_log  /* args go here in parens */
+#define DUK_DDPRINT DUK__DEBUG_STASH(DUK_LEVEL_DDEBUG), (void) duk_debug_log /* args go here in parens */
 #else
-#define DUK_DDPRINT  0 && /* args */
+#define DUK_DDPRINT 0 && /* args */
 #endif
 
 #if defined(DUK_USE_DEBUG_LEVEL) && (DUK_USE_DEBUG_LEVEL >= 2)
-#define DUK_DDDPRINT  DUK__DEBUG_STASH(DUK_LEVEL_DDDEBUG), (void) duk_debug_log  /* args go here in parens */
+#define DUK_DDDPRINT DUK__DEBUG_STASH(DUK_LEVEL_DDDEBUG), (void) duk_debug_log /* args go here in parens */
 #else
-#define DUK_DDDPRINT  0 && /* args */
+#define DUK_DDDPRINT 0 && /* args */
 #endif
 
-#endif  /* DUK_USE_VARIADIC_MACROS */
+#endif /* DUK_USE_VARIADIC_MACROS */
 
-#else  /* DUK_USE_DEBUG */
+#else /* DUK_USE_DEBUG */
 
 /*
  *  Exposed debug macros: debugging disabled
  */
 
-#define DUK_D(x) do { } while (0) /* omit */
-#define DUK_DD(x) do { } while (0) /* omit */
-#define DUK_DDD(x) do { } while (0) /* omit */
+#define DUK_D(x) \
+	do { \
+	} while (0) /* omit */
+#define DUK_DD(x) \
+	do { \
+	} while (0) /* omit */
+#define DUK_DDD(x) \
+	do { \
+	} while (0) /* omit */
 
 #if defined(DUK_USE_VARIADIC_MACROS)
 
@@ -9355,15 +9978,15 @@ DUK_INTERNAL_DECL void duk_debug_clear_pause_state(duk_heap *heap);
 #define DUK_DDPRINT(...)
 #define DUK_DDDPRINT(...)
 
-#else  /* DUK_USE_VARIADIC_MACROS */
+#else /* DUK_USE_VARIADIC_MACROS */
 
-#define DUK_DPRINT    0 && /* args go here as a comma expression in parens */
-#define DUK_DDPRINT   0 && /* args */
-#define DUK_DDDPRINT  0 && /* args */
+#define DUK_DPRINT   0 && /* args go here as a comma expression in parens */
+#define DUK_DDPRINT  0 && /* args */
+#define DUK_DDDPRINT 0 && /* args */
 
-#endif  /* DUK_USE_VARIADIC_MACROS */
+#endif /* DUK_USE_VARIADIC_MACROS */
 
-#endif  /* DUK_USE_DEBUG */
+#endif /* DUK_USE_DEBUG */
 
 /*
  *  Structs
@@ -9384,16 +10007,16 @@ struct duk_fixedbuffer {
 
 #if defined(DUK_USE_DEBUG)
 DUK_INTERNAL_DECL duk_int_t duk_debug_vsnprintf(char *str, duk_size_t size, const char *format, va_list ap);
-#if 0  /*unused*/
+#if 0 /*unused*/
 DUK_INTERNAL_DECL duk_int_t duk_debug_snprintf(char *str, duk_size_t size, const char *format, ...);
 #endif
 DUK_INTERNAL_DECL void duk_debug_format_funcptr(char *buf, duk_size_t buf_size, duk_uint8_t *fptr, duk_size_t fptr_size);
 
 #if defined(DUK_USE_VARIADIC_MACROS)
 DUK_INTERNAL_DECL void duk_debug_log(duk_int_t level, const char *file, duk_int_t line, const char *func, const char *fmt, ...);
-#else  /* DUK_USE_VARIADIC_MACROS */
+#else /* DUK_USE_VARIADIC_MACROS */
 /* parameter passing, not thread safe */
-#define DUK_DEBUG_STASH_SIZE  128
+#define DUK_DEBUG_STASH_SIZE 128
 #if !defined(DUK_SINGLE_FILE)
 DUK_INTERNAL_DECL char duk_debug_file_stash[DUK_DEBUG_STASH_SIZE];
 DUK_INTERNAL_DECL duk_int_t duk_debug_line_stash;
@@ -9401,7 +10024,7 @@ DUK_INTERNAL_DECL char duk_debug_func_stash[DUK_DEBUG_STASH_SIZE];
 DUK_INTERNAL_DECL duk_int_t duk_debug_level_stash;
 #endif
 DUK_INTERNAL_DECL void duk_debug_log(const char *fmt, ...);
-#endif  /* DUK_USE_VARIADIC_MACROS */
+#endif /* DUK_USE_VARIADIC_MACROS */
 
 DUK_INTERNAL_DECL void duk_fb_put_bytes(duk_fixedbuffer *fb, const duk_uint8_t *buffer, duk_size_t length);
 DUK_INTERNAL_DECL void duk_fb_put_byte(duk_fixedbuffer *fb, duk_uint8_t x);
@@ -9410,9 +10033,9 @@ DUK_INTERNAL_DECL void duk_fb_sprintf(duk_fixedbuffer *fb, const char *fmt, ...)
 DUK_INTERNAL_DECL void duk_fb_put_funcptr(duk_fixedbuffer *fb, duk_uint8_t *fptr, duk_size_t fptr_size);
 DUK_INTERNAL_DECL duk_bool_t duk_fb_is_full(duk_fixedbuffer *fb);
 
-#endif  /* DUK_USE_DEBUG */
+#endif /* DUK_USE_DEBUG */
 
-#endif  /* DUK_DEBUG_H_INCLUDED */
+#endif /* DUK_DEBUG_H_INCLUDED */
 /* #include duk_error.h */
 /*
  *  Error handling macros, assertion macro, error codes.
@@ -9469,79 +10092,153 @@ DUK_INTERNAL_DECL duk_bool_t duk_fb_is_full(duk_fixedbuffer *fb);
 /* Because there are quite many call sites, pack error code (require at most
  * 8-bit) into a single argument.
  */
-#define DUK_ERROR(thr,err,msg) do { \
-		duk_errcode_t duk__err = (err); duk_int_t duk__line = (duk_int_t) DUK_LINE_MACRO; \
-		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
+#define DUK_ERROR(thr, err, msg) \
+	do { \
+		duk_errcode_t duk__err = (err); \
+		duk_int_t duk__line = (duk_int_t) DUK_LINE_MACRO; \
+		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); \
+		DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
 		duk_err_handle_error((thr), DUK_FILE_MACRO, (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), (msg)); \
 	} while (0)
-#define DUK_ERROR_RAW(thr,file,line,err,msg) do { \
-		duk_errcode_t duk__err = (err); duk_int_t duk__line = (duk_int_t) (line); \
-		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
+#define DUK_ERROR_RAW(thr, file, line, err, msg) \
+	do { \
+		duk_errcode_t duk__err = (err); \
+		duk_int_t duk__line = (duk_int_t) (line); \
+		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); \
+		DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
 		duk_err_handle_error((thr), (file), (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), (msg)); \
 	} while (0)
 
-#define DUK_ERROR_FMT1(thr,err,fmt,arg1) do { \
-		duk_errcode_t duk__err = (err); duk_int_t duk__line = (duk_int_t) DUK_LINE_MACRO; \
-		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
-		duk_err_handle_error_fmt((thr), DUK_FILE_MACRO, (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), (fmt), (arg1)); \
+#define DUK_ERROR_FMT1(thr, err, fmt, arg1) \
+	do { \
+		duk_errcode_t duk__err = (err); \
+		duk_int_t duk__line = (duk_int_t) DUK_LINE_MACRO; \
+		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); \
+		DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
+		duk_err_handle_error_fmt((thr), \
+		                         DUK_FILE_MACRO, \
+		                         (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), \
+		                         (fmt), \
+		                         (arg1)); \
 	} while (0)
-#define DUK_ERROR_RAW_FMT1(thr,file,line,err,fmt,arg1) do { \
-		duk_errcode_t duk__err = (err); duk_int_t duk__line = (duk_int_t) (line); \
-		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
-		duk_err_handle_error_fmt((thr), (file), (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), (fmt), (arg1)); \
+#define DUK_ERROR_RAW_FMT1(thr, file, line, err, fmt, arg1) \
+	do { \
+		duk_errcode_t duk__err = (err); \
+		duk_int_t duk__line = (duk_int_t) (line); \
+		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); \
+		DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
+		duk_err_handle_error_fmt((thr), \
+		                         (file), \
+		                         (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), \
+		                         (fmt), \
+		                         (arg1)); \
 	} while (0)
 
-#define DUK_ERROR_FMT2(thr,err,fmt,arg1,arg2) do { \
-		duk_errcode_t duk__err = (err); duk_int_t duk__line = (duk_int_t) DUK_LINE_MACRO; \
-		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
-		duk_err_handle_error_fmt((thr), DUK_FILE_MACRO, (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), (fmt), (arg1), (arg2)); \
+#define DUK_ERROR_FMT2(thr, err, fmt, arg1, arg2) \
+	do { \
+		duk_errcode_t duk__err = (err); \
+		duk_int_t duk__line = (duk_int_t) DUK_LINE_MACRO; \
+		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); \
+		DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
+		duk_err_handle_error_fmt((thr), \
+		                         DUK_FILE_MACRO, \
+		                         (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), \
+		                         (fmt), \
+		                         (arg1), \
+		                         (arg2)); \
 	} while (0)
-#define DUK_ERROR_RAW_FMT2(thr,file,line,err,fmt,arg1,arg2) do { \
-		duk_errcode_t duk__err = (err); duk_int_t duk__line = (duk_int_t) (line); \
-		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
-		duk_err_handle_error_fmt((thr), (file), (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), (fmt), (arg1), (arg2)); \
+#define DUK_ERROR_RAW_FMT2(thr, file, line, err, fmt, arg1, arg2) \
+	do { \
+		duk_errcode_t duk__err = (err); \
+		duk_int_t duk__line = (duk_int_t) (line); \
+		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); \
+		DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
+		duk_err_handle_error_fmt((thr), \
+		                         (file), \
+		                         (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), \
+		                         (fmt), \
+		                         (arg1), \
+		                         (arg2)); \
 	} while (0)
 
-#define DUK_ERROR_FMT3(thr,err,fmt,arg1,arg2,arg3) do { \
-		duk_errcode_t duk__err = (err); duk_int_t duk__line = (duk_int_t) DUK_LINE_MACRO; \
-		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
-		duk_err_handle_error_fmt((thr), DUK_FILE_MACRO, (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), (fmt), (arg1), (arg2), (arg3)); \
+#define DUK_ERROR_FMT3(thr, err, fmt, arg1, arg2, arg3) \
+	do { \
+		duk_errcode_t duk__err = (err); \
+		duk_int_t duk__line = (duk_int_t) DUK_LINE_MACRO; \
+		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); \
+		DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
+		duk_err_handle_error_fmt((thr), \
+		                         DUK_FILE_MACRO, \
+		                         (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), \
+		                         (fmt), \
+		                         (arg1), \
+		                         (arg2), \
+		                         (arg3)); \
 	} while (0)
-#define DUK_ERROR_RAW_FMT3(thr,file,line,err,fmt,arg1,arg2,arg3) do { \
-		duk_errcode_t duk__err = (err); duk_int_t duk__line = (duk_int_t) (line); \
-		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
-		duk_err_handle_error_fmt((thr), (file), (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), (fmt), (arg1), (arg2), (arg3)); \
+#define DUK_ERROR_RAW_FMT3(thr, file, line, err, fmt, arg1, arg2, arg3) \
+	do { \
+		duk_errcode_t duk__err = (err); \
+		duk_int_t duk__line = (duk_int_t) (line); \
+		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); \
+		DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
+		duk_err_handle_error_fmt((thr), \
+		                         (file), \
+		                         (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), \
+		                         (fmt), \
+		                         (arg1), \
+		                         (arg2), \
+		                         (arg3)); \
 	} while (0)
 
-#define DUK_ERROR_FMT4(thr,err,fmt,arg1,arg2,arg3,arg4) do { \
-		duk_errcode_t duk__err = (err); duk_int_t duk__line = (duk_int_t) DUK_LINE_MACRO; \
-		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
-		duk_err_handle_error_fmt((thr), DUK_FILE_MACRO, (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), (fmt), (arg1), (arg2), (arg3), (arg4)); \
+#define DUK_ERROR_FMT4(thr, err, fmt, arg1, arg2, arg3, arg4) \
+	do { \
+		duk_errcode_t duk__err = (err); \
+		duk_int_t duk__line = (duk_int_t) DUK_LINE_MACRO; \
+		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); \
+		DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
+		duk_err_handle_error_fmt((thr), \
+		                         DUK_FILE_MACRO, \
+		                         (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), \
+		                         (fmt), \
+		                         (arg1), \
+		                         (arg2), \
+		                         (arg3), \
+		                         (arg4)); \
 	} while (0)
-#define DUK_ERROR_RAW_FMT4(thr,file,line,err,fmt,arg1,arg2,arg3,arg4) do { \
-		duk_errcode_t duk__err = (err); duk_int_t duk__line = (duk_int_t) (line); \
-		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
-		duk_err_handle_error_fmt((thr), (file), (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), (fmt), (arg1), (arg2), (arg3), (arg4)); \
+#define DUK_ERROR_RAW_FMT4(thr, file, line, err, fmt, arg1, arg2, arg3, arg4) \
+	do { \
+		duk_errcode_t duk__err = (err); \
+		duk_int_t duk__line = (duk_int_t) (line); \
+		DUK_ASSERT(duk__err >= 0 && duk__err <= 0xff); \
+		DUK_ASSERT(duk__line >= 0 && duk__line <= 0x00ffffffL); \
+		duk_err_handle_error_fmt((thr), \
+		                         (file), \
+		                         (((duk_uint_t) duk__err) << 24) | ((duk_uint_t) duk__line), \
+		                         (fmt), \
+		                         (arg1), \
+		                         (arg2), \
+		                         (arg3), \
+		                         (arg4)); \
 	} while (0)
 
-#else  /* DUK_USE_VERBOSE_ERRORS */
+#else /* DUK_USE_VERBOSE_ERRORS */
 
-#define DUK_ERROR(thr,err,msg)                    duk_err_handle_error((thr), (err))
-#define DUK_ERROR_RAW(thr,file,line,err,msg)      duk_err_handle_error((thr), (err))
+#define DUK_ERROR(thr, err, msg)                 duk_err_handle_error((thr), (err))
+#define DUK_ERROR_RAW(thr, file, line, err, msg) duk_err_handle_error((thr), (err))
 
-#define DUK_ERROR_FMT1(thr,err,fmt,arg1) DUK_ERROR((thr),(err),(fmt))
-#define DUK_ERROR_RAW_FMT1(thr,file,line,err,fmt,arg1) DUK_ERROR_RAW((thr),(file),(line),(err),(fmt))
+#define DUK_ERROR_FMT1(thr, err, fmt, arg1)                 DUK_ERROR((thr), (err), (fmt))
+#define DUK_ERROR_RAW_FMT1(thr, file, line, err, fmt, arg1) DUK_ERROR_RAW((thr), (file), (line), (err), (fmt))
 
-#define DUK_ERROR_FMT2(thr,err,fmt,arg1,arg2) DUK_ERROR((thr),(err),(fmt))
-#define DUK_ERROR_RAW_FMT2(thr,file,line,err,fmt,arg1,arg2) DUK_ERROR_RAW((thr),(file),(line),(err),(fmt))
+#define DUK_ERROR_FMT2(thr, err, fmt, arg1, arg2)                 DUK_ERROR((thr), (err), (fmt))
+#define DUK_ERROR_RAW_FMT2(thr, file, line, err, fmt, arg1, arg2) DUK_ERROR_RAW((thr), (file), (line), (err), (fmt))
 
-#define DUK_ERROR_FMT3(thr,err,fmt,arg1,arg2,arg3) DUK_ERROR((thr),(err),(fmt))
-#define DUK_ERROR_RAW_FMT3(thr,file,line,err,fmt,arg1,arg2,arg3) DUK_ERROR_RAW((thr),(file),(line),(err),(fmt))
+#define DUK_ERROR_FMT3(thr, err, fmt, arg1, arg2, arg3)                 DUK_ERROR((thr), (err), (fmt))
+#define DUK_ERROR_RAW_FMT3(thr, file, line, err, fmt, arg1, arg2, arg3) DUK_ERROR_RAW((thr), (file), (line), (err), (fmt))
 
-#define DUK_ERROR_FMT4(thr,err,fmt,arg1,arg2,arg3,arg4) DUK_ERROR((thr),(err),(fmt))
-#define DUK_ERROR_RAW_FMT4(thr,file,line,err,fmt,arg1,arg2,arg3,arg4) DUK_ERROR_RAW((thr),(file),(line),(err),(fmt))
+#define DUK_ERROR_FMT4(thr, err, fmt, arg1, arg2, arg3, arg4)                 DUK_ERROR((thr), (err), (fmt))
+#define DUK_ERROR_RAW_FMT4(thr, file, line, err, fmt, arg1, arg2, arg3, arg4) DUK_ERROR_RAW((thr), (file), (line), (err), (fmt))
 
-#endif  /* DUK_USE_VERBOSE_ERRORS */
+#endif /* DUK_USE_VERBOSE_ERRORS */
 
 /*
  *  Fatal error without context
@@ -9549,8 +10246,7 @@ DUK_INTERNAL_DECL duk_bool_t duk_fb_is_full(duk_fixedbuffer *fb);
  *  The macro is an expression to make it compatible with DUK_ASSERT_EXPR().
  */
 
-#define DUK_FATAL_WITHOUT_CONTEXT(msg) \
-	duk_default_fatal_handler(NULL, (msg))
+#define DUK_FATAL_WITHOUT_CONTEXT(msg) duk_default_fatal_handler(NULL, (msg))
 
 /*
  *  Error throwing helpers
@@ -9575,188 +10271,252 @@ DUK_INTERNAL_DECL duk_bool_t duk_fb_is_full(duk_fixedbuffer *fb);
  * vs. non-paranoid distinction affects only a few specific errors.
  */
 #if defined(DUK_USE_PARANOID_ERRORS)
-#define DUK_ERROR_REQUIRE_TYPE_INDEX(thr,idx,expectname,lowmemstr) do { \
+#define DUK_ERROR_REQUIRE_TYPE_INDEX(thr, idx, expectname, lowmemstr) \
+	do { \
 		duk_err_require_type_index((thr), DUK_FILE_MACRO, (duk_int_t) DUK_LINE_MACRO, (idx), (expectname)); \
 	} while (0)
-#else  /* DUK_USE_PARANOID_ERRORS */
-#define DUK_ERROR_REQUIRE_TYPE_INDEX(thr,idx,expectname,lowmemstr) do { \
+#else /* DUK_USE_PARANOID_ERRORS */
+#define DUK_ERROR_REQUIRE_TYPE_INDEX(thr, idx, expectname, lowmemstr) \
+	do { \
 		duk_err_require_type_index((thr), DUK_FILE_MACRO, (duk_int_t) DUK_LINE_MACRO, (idx), (expectname)); \
 	} while (0)
-#endif  /* DUK_USE_PARANOID_ERRORS */
+#endif /* DUK_USE_PARANOID_ERRORS */
 
-#define DUK_ERROR_INTERNAL(thr) do { \
+#define DUK_ERROR_INTERNAL(thr) \
+	do { \
 		duk_err_error_internal((thr), DUK_FILE_MACRO, (duk_int_t) DUK_LINE_MACRO); \
 	} while (0)
-#define DUK_DCERROR_INTERNAL(thr) do { \
+#define DUK_DCERROR_INTERNAL(thr) \
+	do { \
 		DUK_ERROR_INTERNAL((thr)); \
 		return 0; \
 	} while (0)
-#define DUK_ERROR_ALLOC_FAILED(thr) do { \
+#define DUK_ERROR_ALLOC_FAILED(thr) \
+	do { \
 		duk_err_error_alloc_failed((thr), DUK_FILE_MACRO, (duk_int_t) DUK_LINE_MACRO); \
 	} while (0)
-#define DUK_ERROR_UNSUPPORTED(thr) do { \
+#define DUK_ERROR_UNSUPPORTED(thr) \
+	do { \
 		DUK_ERROR((thr), DUK_ERR_ERROR, DUK_STR_UNSUPPORTED); \
 	} while (0)
-#define DUK_ERROR_ERROR(thr,msg) do { \
+#define DUK_DCERROR_UNSUPPORTED(thr) \
+	do { \
+		DUK_ERROR_UNSUPPORTED((thr)); \
+		return 0; \
+	} while (0)
+#define DUK_ERROR_ERROR(thr, msg) \
+	do { \
 		duk_err_error((thr), DUK_FILE_MACRO, (duk_int_t) DUK_LINE_MACRO, (msg)); \
 	} while (0)
-#define DUK_ERROR_RANGE_INDEX(thr,idx) do { \
+#define DUK_ERROR_RANGE_INDEX(thr, idx) \
+	do { \
 		duk_err_range_index((thr), DUK_FILE_MACRO, (duk_int_t) DUK_LINE_MACRO, (idx)); \
 	} while (0)
-#define DUK_ERROR_RANGE_PUSH_BEYOND(thr) do { \
+#define DUK_ERROR_RANGE_PUSH_BEYOND(thr) \
+	do { \
 		duk_err_range_push_beyond((thr), DUK_FILE_MACRO, (duk_int_t) DUK_LINE_MACRO); \
 	} while (0)
-#define DUK_ERROR_RANGE_INVALID_ARGS(thr) do { \
+#define DUK_ERROR_RANGE_INVALID_ARGS(thr) \
+	do { \
 		DUK_ERROR_RANGE((thr), DUK_STR_INVALID_ARGS); \
 	} while (0)
-#define DUK_DCERROR_RANGE_INVALID_ARGS(thr) do { \
+#define DUK_DCERROR_RANGE_INVALID_ARGS(thr) \
+	do { \
 		DUK_ERROR_RANGE_INVALID_ARGS((thr)); \
 		return 0; \
 	} while (0)
-#define DUK_ERROR_RANGE_INVALID_COUNT(thr) do { \
+#define DUK_ERROR_RANGE_INVALID_COUNT(thr) \
+	do { \
 		DUK_ERROR_RANGE((thr), DUK_STR_INVALID_COUNT); \
 	} while (0)
-#define DUK_DCERROR_RANGE_INVALID_COUNT(thr) do { \
+#define DUK_DCERROR_RANGE_INVALID_COUNT(thr) \
+	do { \
 		DUK_ERROR_RANGE_INVALID_COUNT((thr)); \
 		return 0; \
 	} while (0)
-#define DUK_ERROR_RANGE_INVALID_LENGTH(thr) do { \
+#define DUK_ERROR_RANGE_INVALID_LENGTH(thr) \
+	do { \
 		DUK_ERROR_RANGE((thr), DUK_STR_INVALID_LENGTH); \
 	} while (0)
-#define DUK_DCERROR_RANGE_INVALID_LENGTH(thr) do { \
+#define DUK_DCERROR_RANGE_INVALID_LENGTH(thr) \
+	do { \
 		DUK_ERROR_RANGE_INVALID_LENGTH((thr)); \
 		return 0; \
 	} while (0)
-#define DUK_ERROR_RANGE(thr,msg) do { \
+#define DUK_ERROR_RANGE(thr, msg) \
+	do { \
 		duk_err_range((thr), DUK_FILE_MACRO, (duk_int_t) DUK_LINE_MACRO, (msg)); \
 	} while (0)
-#define DUK_ERROR_EVAL(thr,msg) do { \
+#define DUK_ERROR_EVAL(thr, msg) \
+	do { \
 		DUK_ERROR((thr), DUK_ERR_EVAL_ERROR, (msg)); \
 	} while (0)
-#define DUK_ERROR_REFERENCE(thr,msg) do { \
+#define DUK_ERROR_REFERENCE(thr, msg) \
+	do { \
 		DUK_ERROR((thr), DUK_ERR_REFERENCE_ERROR, (msg)); \
 	} while (0)
-#define DUK_ERROR_SYNTAX(thr,msg) do { \
+#define DUK_ERROR_SYNTAX(thr, msg) \
+	do { \
 		DUK_ERROR((thr), DUK_ERR_SYNTAX_ERROR, (msg)); \
 	} while (0)
-#define DUK_ERROR_TYPE_INVALID_ARGS(thr) do { \
+#define DUK_ERROR_TYPE_INVALID_ARGS(thr) \
+	do { \
 		duk_err_type_invalid_args((thr), DUK_FILE_MACRO, (duk_int_t) DUK_LINE_MACRO); \
 	} while (0)
-#define DUK_DCERROR_TYPE_INVALID_ARGS(thr) do { \
+#define DUK_DCERROR_TYPE_INVALID_ARGS(thr) \
+	do { \
 		DUK_ERROR_TYPE_INVALID_ARGS((thr)); \
 		return 0; \
 	} while (0)
-#define DUK_ERROR_TYPE_INVALID_STATE(thr) do { \
+#define DUK_ERROR_TYPE_INVALID_STATE(thr) \
+	do { \
 		duk_err_type_invalid_state((thr), DUK_FILE_MACRO, (duk_int_t) DUK_LINE_MACRO); \
 	} while (0)
-#define DUK_DCERROR_TYPE_INVALID_STATE(thr) do { \
+#define DUK_DCERROR_TYPE_INVALID_STATE(thr) \
+	do { \
 		DUK_ERROR_TYPE_INVALID_STATE((thr)); \
 		return 0; \
 	} while (0)
-#define DUK_ERROR_TYPE_INVALID_TRAP_RESULT(thr) do { \
+#define DUK_ERROR_TYPE_INVALID_TRAP_RESULT(thr) \
+	do { \
 		duk_err_type_invalid_trap_result((thr), DUK_FILE_MACRO, (duk_int_t) DUK_LINE_MACRO); \
 	} while (0)
-#define DUK_DCERROR_TYPE_INVALID_TRAP_RESULT(thr) do { \
+#define DUK_DCERROR_TYPE_INVALID_TRAP_RESULT(thr) \
+	do { \
 		DUK_ERROR_TYPE((thr), DUK_STR_INVALID_TRAP_RESULT); \
 	} while (0)
-#define DUK_ERROR_TYPE(thr,msg) do { \
+#define DUK_ERROR_TYPE(thr, msg) \
+	do { \
 		DUK_ERROR((thr), DUK_ERR_TYPE_ERROR, (msg)); \
 	} while (0)
-#define DUK_ERROR_URI(thr,msg) do { \
+#define DUK_ERROR_URI(thr, msg) \
+	do { \
 		DUK_ERROR((thr), DUK_ERR_URI_ERROR, (msg)); \
 	} while (0)
-#else  /* DUK_USE_VERBOSE_ERRORS */
+#else /* DUK_USE_VERBOSE_ERRORS */
 /* Non-verbose errors for low memory targets: no file, line, or message. */
 
-#define DUK_ERROR_REQUIRE_TYPE_INDEX(thr,idx,expectname,lowmemstr) do { \
+#define DUK_ERROR_REQUIRE_TYPE_INDEX(thr, idx, expectname, lowmemstr) \
+	do { \
 		duk_err_type((thr)); \
 	} while (0)
 
-#define DUK_ERROR_INTERNAL(thr) do { \
+#define DUK_ERROR_INTERNAL(thr) \
+	do { \
 		duk_err_error((thr)); \
 	} while (0)
-#define DUK_DCERROR_INTERNAL(thr) do { \
+#define DUK_DCERROR_INTERNAL(thr) \
+	do { \
 		DUK_UNREF((thr)); \
 		return DUK_RET_ERROR; \
 	} while (0)
-#define DUK_ERROR_ALLOC_FAILED(thr) do { \
+#define DUK_ERROR_ALLOC_FAILED(thr) \
+	do { \
 		duk_err_error((thr)); \
 	} while (0)
-#define DUK_ERROR_UNSUPPORTED(thr) do { \
+#define DUK_ERROR_UNSUPPORTED(thr) \
+	do { \
 		duk_err_error((thr)); \
 	} while (0)
-#define DUK_ERROR_ERROR(thr,msg) do { \
+#define DUK_DCERROR_UNSUPPORTED(thr) \
+	do { \
+		DUK_UNREF((thr)); \
+		return DUK_RET_ERROR; \
+	} while (0)
+#define DUK_ERROR_ERROR(thr, msg) \
+	do { \
 		duk_err_error((thr)); \
 	} while (0)
-#define DUK_ERROR_RANGE_INDEX(thr,idx) do { \
+#define DUK_ERROR_RANGE_INDEX(thr, idx) \
+	do { \
 		duk_err_range((thr)); \
 	} while (0)
-#define DUK_ERROR_RANGE_PUSH_BEYOND(thr) do { \
+#define DUK_ERROR_RANGE_PUSH_BEYOND(thr) \
+	do { \
 		duk_err_range((thr)); \
 	} while (0)
-#define DUK_ERROR_RANGE_INVALID_ARGS(thr) do { \
+#define DUK_ERROR_RANGE_INVALID_ARGS(thr) \
+	do { \
 		duk_err_range((thr)); \
 	} while (0)
-#define DUK_DCERROR_RANGE_INVALID_ARGS(thr) do { \
+#define DUK_DCERROR_RANGE_INVALID_ARGS(thr) \
+	do { \
 		DUK_UNREF((thr)); \
 		return DUK_RET_RANGE_ERROR; \
 	} while (0)
-#define DUK_ERROR_RANGE_INVALID_COUNT(thr) do { \
+#define DUK_ERROR_RANGE_INVALID_COUNT(thr) \
+	do { \
 		duk_err_range((thr)); \
 	} while (0)
-#define DUK_DCERROR_RANGE_INVALID_COUNT(thr) do { \
+#define DUK_DCERROR_RANGE_INVALID_COUNT(thr) \
+	do { \
 		DUK_UNREF((thr)); \
 		return DUK_RET_RANGE_ERROR; \
 	} while (0)
-#define DUK_ERROR_RANGE_INVALID_LENGTH(thr) do { \
+#define DUK_ERROR_RANGE_INVALID_LENGTH(thr) \
+	do { \
 		duk_err_range((thr)); \
 	} while (0)
-#define DUK_DCERROR_RANGE_INVALID_LENGTH(thr) do { \
+#define DUK_DCERROR_RANGE_INVALID_LENGTH(thr) \
+	do { \
 		DUK_UNREF((thr)); \
 		return DUK_RET_RANGE_ERROR; \
 	} while (0)
-#define DUK_ERROR_RANGE(thr,msg) do { \
+#define DUK_ERROR_RANGE(thr, msg) \
+	do { \
 		duk_err_range((thr)); \
 	} while (0)
-#define DUK_ERROR_EVAL(thr,msg) do { \
+#define DUK_ERROR_EVAL(thr, msg) \
+	do { \
 		duk_err_eval((thr)); \
 	} while (0)
-#define DUK_ERROR_REFERENCE(thr,msg) do { \
+#define DUK_ERROR_REFERENCE(thr, msg) \
+	do { \
 		duk_err_reference((thr)); \
 	} while (0)
-#define DUK_ERROR_SYNTAX(thr,msg) do { \
+#define DUK_ERROR_SYNTAX(thr, msg) \
+	do { \
 		duk_err_syntax((thr)); \
 	} while (0)
-#define DUK_ERROR_TYPE_INVALID_ARGS(thr) do { \
+#define DUK_ERROR_TYPE_INVALID_ARGS(thr) \
+	do { \
 		duk_err_type((thr)); \
 	} while (0)
-#define DUK_DCERROR_TYPE_INVALID_ARGS(thr) do { \
+#define DUK_DCERROR_TYPE_INVALID_ARGS(thr) \
+	do { \
 		DUK_UNREF((thr)); \
 		return DUK_RET_TYPE_ERROR; \
 	} while (0)
-#define DUK_ERROR_TYPE_INVALID_STATE(thr) do { \
+#define DUK_ERROR_TYPE_INVALID_STATE(thr) \
+	do { \
 		duk_err_type((thr)); \
 	} while (0)
-#define DUK_DCERROR_TYPE_INVALID_STATE(thr) do { \
+#define DUK_DCERROR_TYPE_INVALID_STATE(thr) \
+	do { \
 		duk_err_type((thr)); \
 	} while (0)
-#define DUK_ERROR_TYPE_INVALID_TRAP_RESULT(thr) do { \
+#define DUK_ERROR_TYPE_INVALID_TRAP_RESULT(thr) \
+	do { \
 		duk_err_type((thr)); \
 	} while (0)
-#define DUK_DCERROR_TYPE_INVALID_TRAP_RESULT(thr) do { \
+#define DUK_DCERROR_TYPE_INVALID_TRAP_RESULT(thr) \
+	do { \
 		DUK_UNREF((thr)); \
 		return DUK_RET_TYPE_ERROR; \
 	} while (0)
-#define DUK_ERROR_TYPE_INVALID_TRAP_RESULT(thr) do { \
+#define DUK_ERROR_TYPE_INVALID_TRAP_RESULT(thr) \
+	do { \
 		duk_err_type((thr)); \
 	} while (0)
-#define DUK_ERROR_TYPE(thr,msg) do { \
+#define DUK_ERROR_TYPE(thr, msg) \
+	do { \
 		duk_err_type((thr)); \
 	} while (0)
-#define DUK_ERROR_URI(thr,msg) do { \
+#define DUK_ERROR_URI(thr, msg) \
+	do { \
 		duk_err_uri((thr)); \
 	} while (0)
-#endif  /* DUK_USE_VERBOSE_ERRORS */
+#endif /* DUK_USE_VERBOSE_ERRORS */
 
 /*
  *  Assert macro: failure causes a fatal error.
@@ -9774,63 +10534,72 @@ DUK_INTERNAL_DECL duk_bool_t duk_fb_is_full(duk_fixedbuffer *fb);
  * we don't care about assertion text size because they're not used in production
  * builds.
  */
-#define DUK_ASSERT(x)  do { \
-	if (!(x)) { \
-		DUK_FATAL_WITHOUT_CONTEXT("assertion failed: " #x \
-			" (" DUK_FILE_MACRO ":" DUK_MACRO_STRINGIFY(DUK_LINE_MACRO) ")"); \
-	} \
+#define DUK_ASSERT(x) \
+	do { \
+		if (!(x)) { \
+			DUK_FATAL_WITHOUT_CONTEXT("assertion failed: " #x " (" DUK_FILE_MACRO \
+			                          ":" DUK_MACRO_STRINGIFY(DUK_LINE_MACRO) ")"); \
+		} \
 	} while (0)
 
 /* Assertion compatible inside a comma expression, evaluates to void. */
 #define DUK_ASSERT_EXPR(x) \
-	((void) ((x) ? 0 : (DUK_FATAL_WITHOUT_CONTEXT("assertion failed: " #x \
-				" (" DUK_FILE_MACRO ":" DUK_MACRO_STRINGIFY(DUK_LINE_MACRO) ")"), 0)))
+	((void) ((x) ? 0 : \
+                       (DUK_FATAL_WITHOUT_CONTEXT("assertion failed: " #x " (" DUK_FILE_MACRO \
+	                                          ":" DUK_MACRO_STRINGIFY(DUK_LINE_MACRO) ")"), \
+	                0)))
 
-#else  /* DUK_USE_ASSERTIONS */
+#else /* DUK_USE_ASSERTIONS */
 
-#define DUK_ASSERT(x)  do { /* assertion omitted */ } while (0)
+#define DUK_ASSERT(x) \
+	do { /* assertion omitted */ \
+	} while (0)
 
-#define DUK_ASSERT_EXPR(x)  ((void) 0)
+#define DUK_ASSERT_EXPR(x) ((void) 0)
 
-#endif  /* DUK_USE_ASSERTIONS */
+#endif /* DUK_USE_ASSERTIONS */
 
 /* this variant is used when an assert would generate a compile warning by
  * being always true (e.g. >= 0 comparison for an unsigned value
  */
-#define DUK_ASSERT_DISABLE(x)  do { /* assertion disabled */ } while (0)
+#define DUK_ASSERT_DISABLE(x) \
+	do { /* assertion disabled */ \
+	} while (0)
 
 /*
  *  Assertion helpers
  */
 
 #if defined(DUK_USE_ASSERTIONS) && defined(DUK_USE_REFERENCE_COUNTING)
-#define DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(h)  do { \
+#define DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(h) \
+	do { \
 		DUK_ASSERT((h) == NULL || DUK_HEAPHDR_GET_REFCOUNT((duk_heaphdr *) (h)) > 0); \
 	} while (0)
-#define DUK_ASSERT_REFCOUNT_NONZERO_TVAL(tv)  do { \
+#define DUK_ASSERT_REFCOUNT_NONZERO_TVAL(tv) \
+	do { \
 		if ((tv) != NULL && DUK_TVAL_IS_HEAP_ALLOCATED((tv))) { \
 			DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT(DUK_TVAL_GET_HEAPHDR((tv))) > 0); \
 		} \
 	} while (0)
 #else
-#define DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(h)  /* no refcount check */
-#define DUK_ASSERT_REFCOUNT_NONZERO_TVAL(tv)    /* no refcount check */
+#define DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(h) /* no refcount check */
+#define DUK_ASSERT_REFCOUNT_NONZERO_TVAL(tv)   /* no refcount check */
 #endif
 
-#define DUK_ASSERT_TOP(ctx,n)  DUK_ASSERT((duk_idx_t) duk_get_top((ctx)) == (duk_idx_t) (n))
+#define DUK_ASSERT_TOP(ctx, n) DUK_ASSERT((duk_idx_t) duk_get_top((ctx)) == (duk_idx_t) (n))
 
 #if defined(DUK_USE_ASSERTIONS) && defined(DUK_USE_PACKED_TVAL)
-#define DUK_ASSERT_DOUBLE_IS_NORMALIZED(dval)  do { \
+#define DUK_ASSERT_DOUBLE_IS_NORMALIZED(dval) \
+	do { \
 		duk_double_union duk__assert_tmp_du; \
 		duk__assert_tmp_du.d = (dval); \
 		DUK_ASSERT(DUK_DBLUNION_IS_NORMALIZED(&duk__assert_tmp_du)); \
 	} while (0)
 #else
-#define DUK_ASSERT_DOUBLE_IS_NORMALIZED(dval)  /* nop */
+#define DUK_ASSERT_DOUBLE_IS_NORMALIZED(dval) /* nop */
 #endif
 
-#define DUK_ASSERT_VS_SPACE(thr) \
-	DUK_ASSERT(thr->valstack_top < thr->valstack_end)
+#define DUK_ASSERT_VS_SPACE(thr) DUK_ASSERT(thr->valstack_top < thr->valstack_end)
 
 /*
  *  Helper to initialize a memory area (e.g. struct) with garbage when
@@ -9838,11 +10607,14 @@ DUK_INTERNAL_DECL duk_bool_t duk_fb_is_full(duk_fixedbuffer *fb);
  */
 
 #if defined(DUK_USE_ASSERTIONS)
-#define DUK_ASSERT_SET_GARBAGE(ptr,size) do { \
+#define DUK_ASSERT_SET_GARBAGE(ptr, size) \
+	do { \
 		duk_memset_unsafe((void *) (ptr), 0x5a, size); \
 	} while (0)
 #else
-#define DUK_ASSERT_SET_GARBAGE(ptr,size) do {} while (0)
+#define DUK_ASSERT_SET_GARBAGE(ptr, size) \
+	do { \
+	} while (0)
 #endif
 
 /*
@@ -9853,16 +10625,18 @@ DUK_INTERNAL_DECL duk_bool_t duk_fb_is_full(duk_fixedbuffer *fb);
  *  or (b) Duktape calls which involve extending the valstack (e.g. getter call).
  */
 
-#define DUK_VALSTACK_ASSERT_EXTRA  5  /* this is added to checks to allow for Duktape
-                                       * API calls in addition to function's own use
-                                       */
+#define DUK_VALSTACK_ASSERT_EXTRA \
+	5 /* this is added to checks to allow for Duktape \
+	   * API calls in addition to function's own use \
+	   */
 #if defined(DUK_USE_ASSERTIONS)
-#define DUK_ASSERT_VALSTACK_SPACE(thr,n)   do { \
+#define DUK_ASSERT_VALSTACK_SPACE(thr, n) \
+	do { \
 		DUK_ASSERT((thr) != NULL); \
 		DUK_ASSERT((thr)->valstack_end - (thr)->valstack_top >= (n) + DUK_VALSTACK_ASSERT_EXTRA); \
 	} while (0)
 #else
-#define DUK_ASSERT_VALSTACK_SPACE(thr,n)   /* no valstack space check */
+#define DUK_ASSERT_VALSTACK_SPACE(thr, n) /* no valstack space check */
 #endif
 
 /*
@@ -9870,25 +10644,35 @@ DUK_INTERNAL_DECL duk_bool_t duk_fb_is_full(duk_fixedbuffer *fb);
  */
 
 #if defined(DUK_USE_VERBOSE_ERRORS)
-DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_handle_error(duk_hthread *thr, const char *filename, duk_uint_t line_and_code, const char *msg));
-DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_handle_error_fmt(duk_hthread *thr, const char *filename, duk_uint_t line_and_code, const char *fmt, ...));
-#else  /* DUK_USE_VERBOSE_ERRORS */
+DUK_NORETURN(
+    DUK_INTERNAL_DECL void duk_err_handle_error(duk_hthread *thr, const char *filename, duk_uint_t line_and_code, const char *msg));
+DUK_NORETURN(DUK_INTERNAL_DECL void
+                 duk_err_handle_error_fmt(duk_hthread *thr, const char *filename, duk_uint_t line_and_code, const char *fmt, ...));
+#else /* DUK_USE_VERBOSE_ERRORS */
 DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_handle_error(duk_hthread *thr, duk_errcode_t code));
-#endif  /* DUK_USE_VERBOSE_ERRORS */
+#endif /* DUK_USE_VERBOSE_ERRORS */
 
 #if defined(DUK_USE_VERBOSE_ERRORS)
-DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_create_and_throw(duk_hthread *thr, duk_errcode_t code, const char *msg, const char *filename, duk_int_t line));
+DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_create_and_throw(duk_hthread *thr,
+                                                             duk_errcode_t code,
+                                                             const char *msg,
+                                                             const char *filename,
+                                                             duk_int_t line));
 #else
 DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_create_and_throw(duk_hthread *thr, duk_errcode_t code));
 #endif
 
 DUK_NORETURN(DUK_INTERNAL_DECL void duk_error_throw_from_negative_rc(duk_hthread *thr, duk_ret_t rc));
 
-#define DUK_AUGMENT_FLAG_NOBLAME_FILELINE  (1U << 0)  /* if set, don't blame C file/line for .fileName and .lineNumber */
-#define DUK_AUGMENT_FLAG_SKIP_ONE          (1U << 1)  /* if set, skip topmost activation in traceback construction */
+#define DUK_AUGMENT_FLAG_NOBLAME_FILELINE (1U << 0) /* if set, don't blame C file/line for .fileName and .lineNumber */
+#define DUK_AUGMENT_FLAG_SKIP_ONE         (1U << 1) /* if set, skip topmost activation in traceback construction */
 
 #if defined(DUK_USE_AUGMENT_ERROR_CREATE)
-DUK_INTERNAL_DECL void duk_err_augment_error_create(duk_hthread *thr, duk_hthread *thr_callstack, const char *filename, duk_int_t line, duk_small_uint_t flags);
+DUK_INTERNAL_DECL void duk_err_augment_error_create(duk_hthread *thr,
+                                                    duk_hthread *thr_callstack,
+                                                    const char *filename,
+                                                    duk_int_t line,
+                                                    duk_small_uint_t flags);
 #endif
 #if defined(DUK_USE_AUGMENT_ERROR_THROW)
 DUK_INTERNAL_DECL void duk_err_augment_error_throw(duk_hthread *thr);
@@ -9896,20 +10680,31 @@ DUK_INTERNAL_DECL void duk_err_augment_error_throw(duk_hthread *thr);
 
 #if defined(DUK_USE_VERBOSE_ERRORS)
 #if defined(DUK_USE_PARANOID_ERRORS)
-DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_require_type_index(duk_hthread *thr, const char *filename, duk_int_t linenumber, duk_idx_t idx, const char *expect_name));
+DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_require_type_index(duk_hthread *thr,
+                                                               const char *filename,
+                                                               duk_int_t linenumber,
+                                                               duk_idx_t idx,
+                                                               const char *expect_name));
 #else
-DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_require_type_index(duk_hthread *thr, const char *filename, duk_int_t linenumber, duk_idx_t idx, const char *expect_name));
+DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_require_type_index(duk_hthread *thr,
+                                                               const char *filename,
+                                                               duk_int_t linenumber,
+                                                               duk_idx_t idx,
+                                                               const char *expect_name));
 #endif
 DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_error_internal(duk_hthread *thr, const char *filename, duk_int_t linenumber));
 DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_error_alloc_failed(duk_hthread *thr, const char *filename, duk_int_t linenumber));
-DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_error(duk_hthread *thr, const char *filename, duk_int_t linenumber, const char *message));
-DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_range_index(duk_hthread *thr, const char *filename, duk_int_t linenumber, duk_idx_t idx));
+DUK_NORETURN(
+    DUK_INTERNAL_DECL void duk_err_error(duk_hthread *thr, const char *filename, duk_int_t linenumber, const char *message));
+DUK_NORETURN(
+    DUK_INTERNAL_DECL void duk_err_range_index(duk_hthread *thr, const char *filename, duk_int_t linenumber, duk_idx_t idx));
 DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_range_push_beyond(duk_hthread *thr, const char *filename, duk_int_t linenumber));
-DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_range(duk_hthread *thr, const char *filename, duk_int_t linenumber, const char *message));
+DUK_NORETURN(
+    DUK_INTERNAL_DECL void duk_err_range(duk_hthread *thr, const char *filename, duk_int_t linenumber, const char *message));
 DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_type_invalid_args(duk_hthread *thr, const char *filename, duk_int_t linenumber));
 DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_type_invalid_state(duk_hthread *thr, const char *filename, duk_int_t linenumber));
 DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_type_invalid_trap_result(duk_hthread *thr, const char *filename, duk_int_t linenumber));
-#else  /* DUK_VERBOSE_ERRORS */
+#else /* DUK_VERBOSE_ERRORS */
 DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_error(duk_hthread *thr));
 DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_range(duk_hthread *thr));
 DUK_NORETURN(DUK_INTERNAL_DECL void duk_err_eval(duk_hthread *thr));
@@ -9930,7 +10725,7 @@ DUK_INTERNAL_DECL void duk_err_check_debugger_integration(duk_hthread *thr);
 
 DUK_INTERNAL_DECL duk_hobject *duk_error_prototype_from_code(duk_hthread *thr, duk_errcode_t err_code);
 
-#endif  /* DUK_ERROR_H_INCLUDED */
+#endif /* DUK_ERROR_H_INCLUDED */
 /* #include duk_unicode.h */
 /*
  *  Unicode helpers
@@ -9943,10 +10738,10 @@ DUK_INTERNAL_DECL duk_hobject *duk_error_prototype_from_code(duk_hthread *thr, d
  *  UTF-8 / XUTF-8 / CESU-8 constants
  */
 
-#define DUK_UNICODE_MAX_XUTF8_LENGTH      7   /* up to 36 bit codepoints */
-#define DUK_UNICODE_MAX_XUTF8_BMP_LENGTH  3   /* all codepoints up to U+FFFF */
-#define DUK_UNICODE_MAX_CESU8_LENGTH      6   /* all codepoints up to U+10FFFF */
-#define DUK_UNICODE_MAX_CESU8_BMP_LENGTH  3   /* all codepoints up to U+FFFF */
+#define DUK_UNICODE_MAX_XUTF8_LENGTH     7 /* up to 36 bit codepoints */
+#define DUK_UNICODE_MAX_XUTF8_BMP_LENGTH 3 /* all codepoints up to U+FFFF */
+#define DUK_UNICODE_MAX_CESU8_LENGTH     6 /* all codepoints up to U+10FFFF */
+#define DUK_UNICODE_MAX_CESU8_BMP_LENGTH 3 /* all codepoints up to U+FFFF */
 
 /*
  *  Useful Unicode codepoints
@@ -9955,9 +10750,11 @@ DUK_INTERNAL_DECL duk_hobject *duk_error_prototype_from_code(duk_hthread *thr, d
  *  in comparisons.
  */
 
-#define DUK_UNICODE_CP_ZWNJ                   0x200cL  /* zero-width non-joiner */
-#define DUK_UNICODE_CP_ZWJ                    0x200dL  /* zero-width joiner */
-#define DUK_UNICODE_CP_REPLACEMENT_CHARACTER  0xfffdL  /* http://en.wikipedia.org/wiki/Replacement_character#Replacement_character */
+#define DUK_UNICODE_CP_ZWNJ 0x200cL /* zero-width non-joiner */
+#define DUK_UNICODE_CP_ZWJ  0x200dL /* zero-width joiner */
+#define DUK_UNICODE_CP_REPLACEMENT_CHARACTER \
+	0xfffdL /* http://en.wikipedia.org/wiki/Replacement_character#Replacement_character \
+	         */
 
 /*
  *  ASCII character constants
@@ -9970,134 +10767,134 @@ DUK_INTERNAL_DECL duk_hobject *duk_error_prototype_from_code(duk_hthread *thr, d
  *  http://en.wikipedia.org/wiki/ASCII
  */
 
-#define DUK_ASC_NUL              0x00
-#define DUK_ASC_SOH              0x01
-#define DUK_ASC_STX              0x02
-#define DUK_ASC_ETX              0x03
-#define DUK_ASC_EOT              0x04
-#define DUK_ASC_ENQ              0x05
-#define DUK_ASC_ACK              0x06
-#define DUK_ASC_BEL              0x07
-#define DUK_ASC_BS               0x08
-#define DUK_ASC_HT               0x09
-#define DUK_ASC_LF               0x0a
-#define DUK_ASC_VT               0x0b
-#define DUK_ASC_FF               0x0c
-#define DUK_ASC_CR               0x0d
-#define DUK_ASC_SO               0x0e
-#define DUK_ASC_SI               0x0f
-#define DUK_ASC_DLE              0x10
-#define DUK_ASC_DC1              0x11
-#define DUK_ASC_DC2              0x12
-#define DUK_ASC_DC3              0x13
-#define DUK_ASC_DC4              0x14
-#define DUK_ASC_NAK              0x15
-#define DUK_ASC_SYN              0x16
-#define DUK_ASC_ETB              0x17
-#define DUK_ASC_CAN              0x18
-#define DUK_ASC_EM               0x19
-#define DUK_ASC_SUB              0x1a
-#define DUK_ASC_ESC              0x1b
-#define DUK_ASC_FS               0x1c
-#define DUK_ASC_GS               0x1d
-#define DUK_ASC_RS               0x1e
-#define DUK_ASC_US               0x1f
-#define DUK_ASC_SPACE            0x20
-#define DUK_ASC_EXCLAMATION      0x21
-#define DUK_ASC_DOUBLEQUOTE      0x22
-#define DUK_ASC_HASH             0x23
-#define DUK_ASC_DOLLAR           0x24
-#define DUK_ASC_PERCENT          0x25
-#define DUK_ASC_AMP              0x26
-#define DUK_ASC_SINGLEQUOTE      0x27
-#define DUK_ASC_LPAREN           0x28
-#define DUK_ASC_RPAREN           0x29
-#define DUK_ASC_STAR             0x2a
-#define DUK_ASC_PLUS             0x2b
-#define DUK_ASC_COMMA            0x2c
-#define DUK_ASC_MINUS            0x2d
-#define DUK_ASC_PERIOD           0x2e
-#define DUK_ASC_SLASH            0x2f
-#define DUK_ASC_0                0x30
-#define DUK_ASC_1                0x31
-#define DUK_ASC_2                0x32
-#define DUK_ASC_3                0x33
-#define DUK_ASC_4                0x34
-#define DUK_ASC_5                0x35
-#define DUK_ASC_6                0x36
-#define DUK_ASC_7                0x37
-#define DUK_ASC_8                0x38
-#define DUK_ASC_9                0x39
-#define DUK_ASC_COLON            0x3a
-#define DUK_ASC_SEMICOLON        0x3b
-#define DUK_ASC_LANGLE           0x3c
-#define DUK_ASC_EQUALS           0x3d
-#define DUK_ASC_RANGLE           0x3e
-#define DUK_ASC_QUESTION         0x3f
-#define DUK_ASC_ATSIGN           0x40
-#define DUK_ASC_UC_A             0x41
-#define DUK_ASC_UC_B             0x42
-#define DUK_ASC_UC_C             0x43
-#define DUK_ASC_UC_D             0x44
-#define DUK_ASC_UC_E             0x45
-#define DUK_ASC_UC_F             0x46
-#define DUK_ASC_UC_G             0x47
-#define DUK_ASC_UC_H             0x48
-#define DUK_ASC_UC_I             0x49
-#define DUK_ASC_UC_J             0x4a
-#define DUK_ASC_UC_K             0x4b
-#define DUK_ASC_UC_L             0x4c
-#define DUK_ASC_UC_M             0x4d
-#define DUK_ASC_UC_N             0x4e
-#define DUK_ASC_UC_O             0x4f
-#define DUK_ASC_UC_P             0x50
-#define DUK_ASC_UC_Q             0x51
-#define DUK_ASC_UC_R             0x52
-#define DUK_ASC_UC_S             0x53
-#define DUK_ASC_UC_T             0x54
-#define DUK_ASC_UC_U             0x55
-#define DUK_ASC_UC_V             0x56
-#define DUK_ASC_UC_W             0x57
-#define DUK_ASC_UC_X             0x58
-#define DUK_ASC_UC_Y             0x59
-#define DUK_ASC_UC_Z             0x5a
-#define DUK_ASC_LBRACKET         0x5b
-#define DUK_ASC_BACKSLASH        0x5c
-#define DUK_ASC_RBRACKET         0x5d
-#define DUK_ASC_CARET            0x5e
-#define DUK_ASC_UNDERSCORE       0x5f
-#define DUK_ASC_GRAVE            0x60
-#define DUK_ASC_LC_A             0x61
-#define DUK_ASC_LC_B             0x62
-#define DUK_ASC_LC_C             0x63
-#define DUK_ASC_LC_D             0x64
-#define DUK_ASC_LC_E             0x65
-#define DUK_ASC_LC_F             0x66
-#define DUK_ASC_LC_G             0x67
-#define DUK_ASC_LC_H             0x68
-#define DUK_ASC_LC_I             0x69
-#define DUK_ASC_LC_J             0x6a
-#define DUK_ASC_LC_K             0x6b
-#define DUK_ASC_LC_L             0x6c
-#define DUK_ASC_LC_M             0x6d
-#define DUK_ASC_LC_N             0x6e
-#define DUK_ASC_LC_O             0x6f
-#define DUK_ASC_LC_P             0x70
-#define DUK_ASC_LC_Q             0x71
-#define DUK_ASC_LC_R             0x72
-#define DUK_ASC_LC_S             0x73
-#define DUK_ASC_LC_T             0x74
-#define DUK_ASC_LC_U             0x75
-#define DUK_ASC_LC_V             0x76
-#define DUK_ASC_LC_W             0x77
-#define DUK_ASC_LC_X             0x78
-#define DUK_ASC_LC_Y             0x79
-#define DUK_ASC_LC_Z             0x7a
-#define DUK_ASC_LCURLY           0x7b
-#define DUK_ASC_PIPE             0x7c
-#define DUK_ASC_RCURLY           0x7d
-#define DUK_ASC_TILDE            0x7e
-#define DUK_ASC_DEL              0x7f
+#define DUK_ASC_NUL         0x00
+#define DUK_ASC_SOH         0x01
+#define DUK_ASC_STX         0x02
+#define DUK_ASC_ETX         0x03
+#define DUK_ASC_EOT         0x04
+#define DUK_ASC_ENQ         0x05
+#define DUK_ASC_ACK         0x06
+#define DUK_ASC_BEL         0x07
+#define DUK_ASC_BS          0x08
+#define DUK_ASC_HT          0x09
+#define DUK_ASC_LF          0x0a
+#define DUK_ASC_VT          0x0b
+#define DUK_ASC_FF          0x0c
+#define DUK_ASC_CR          0x0d
+#define DUK_ASC_SO          0x0e
+#define DUK_ASC_SI          0x0f
+#define DUK_ASC_DLE         0x10
+#define DUK_ASC_DC1         0x11
+#define DUK_ASC_DC2         0x12
+#define DUK_ASC_DC3         0x13
+#define DUK_ASC_DC4         0x14
+#define DUK_ASC_NAK         0x15
+#define DUK_ASC_SYN         0x16
+#define DUK_ASC_ETB         0x17
+#define DUK_ASC_CAN         0x18
+#define DUK_ASC_EM          0x19
+#define DUK_ASC_SUB         0x1a
+#define DUK_ASC_ESC         0x1b
+#define DUK_ASC_FS          0x1c
+#define DUK_ASC_GS          0x1d
+#define DUK_ASC_RS          0x1e
+#define DUK_ASC_US          0x1f
+#define DUK_ASC_SPACE       0x20
+#define DUK_ASC_EXCLAMATION 0x21
+#define DUK_ASC_DOUBLEQUOTE 0x22
+#define DUK_ASC_HASH        0x23
+#define DUK_ASC_DOLLAR      0x24
+#define DUK_ASC_PERCENT     0x25
+#define DUK_ASC_AMP         0x26
+#define DUK_ASC_SINGLEQUOTE 0x27
+#define DUK_ASC_LPAREN      0x28
+#define DUK_ASC_RPAREN      0x29
+#define DUK_ASC_STAR        0x2a
+#define DUK_ASC_PLUS        0x2b
+#define DUK_ASC_COMMA       0x2c
+#define DUK_ASC_MINUS       0x2d
+#define DUK_ASC_PERIOD      0x2e
+#define DUK_ASC_SLASH       0x2f
+#define DUK_ASC_0           0x30
+#define DUK_ASC_1           0x31
+#define DUK_ASC_2           0x32
+#define DUK_ASC_3           0x33
+#define DUK_ASC_4           0x34
+#define DUK_ASC_5           0x35
+#define DUK_ASC_6           0x36
+#define DUK_ASC_7           0x37
+#define DUK_ASC_8           0x38
+#define DUK_ASC_9           0x39
+#define DUK_ASC_COLON       0x3a
+#define DUK_ASC_SEMICOLON   0x3b
+#define DUK_ASC_LANGLE      0x3c
+#define DUK_ASC_EQUALS      0x3d
+#define DUK_ASC_RANGLE      0x3e
+#define DUK_ASC_QUESTION    0x3f
+#define DUK_ASC_ATSIGN      0x40
+#define DUK_ASC_UC_A        0x41
+#define DUK_ASC_UC_B        0x42
+#define DUK_ASC_UC_C        0x43
+#define DUK_ASC_UC_D        0x44
+#define DUK_ASC_UC_E        0x45
+#define DUK_ASC_UC_F        0x46
+#define DUK_ASC_UC_G        0x47
+#define DUK_ASC_UC_H        0x48
+#define DUK_ASC_UC_I        0x49
+#define DUK_ASC_UC_J        0x4a
+#define DUK_ASC_UC_K        0x4b
+#define DUK_ASC_UC_L        0x4c
+#define DUK_ASC_UC_M        0x4d
+#define DUK_ASC_UC_N        0x4e
+#define DUK_ASC_UC_O        0x4f
+#define DUK_ASC_UC_P        0x50
+#define DUK_ASC_UC_Q        0x51
+#define DUK_ASC_UC_R        0x52
+#define DUK_ASC_UC_S        0x53
+#define DUK_ASC_UC_T        0x54
+#define DUK_ASC_UC_U        0x55
+#define DUK_ASC_UC_V        0x56
+#define DUK_ASC_UC_W        0x57
+#define DUK_ASC_UC_X        0x58
+#define DUK_ASC_UC_Y        0x59
+#define DUK_ASC_UC_Z        0x5a
+#define DUK_ASC_LBRACKET    0x5b
+#define DUK_ASC_BACKSLASH   0x5c
+#define DUK_ASC_RBRACKET    0x5d
+#define DUK_ASC_CARET       0x5e
+#define DUK_ASC_UNDERSCORE  0x5f
+#define DUK_ASC_GRAVE       0x60
+#define DUK_ASC_LC_A        0x61
+#define DUK_ASC_LC_B        0x62
+#define DUK_ASC_LC_C        0x63
+#define DUK_ASC_LC_D        0x64
+#define DUK_ASC_LC_E        0x65
+#define DUK_ASC_LC_F        0x66
+#define DUK_ASC_LC_G        0x67
+#define DUK_ASC_LC_H        0x68
+#define DUK_ASC_LC_I        0x69
+#define DUK_ASC_LC_J        0x6a
+#define DUK_ASC_LC_K        0x6b
+#define DUK_ASC_LC_L        0x6c
+#define DUK_ASC_LC_M        0x6d
+#define DUK_ASC_LC_N        0x6e
+#define DUK_ASC_LC_O        0x6f
+#define DUK_ASC_LC_P        0x70
+#define DUK_ASC_LC_Q        0x71
+#define DUK_ASC_LC_R        0x72
+#define DUK_ASC_LC_S        0x73
+#define DUK_ASC_LC_T        0x74
+#define DUK_ASC_LC_U        0x75
+#define DUK_ASC_LC_V        0x76
+#define DUK_ASC_LC_W        0x77
+#define DUK_ASC_LC_X        0x78
+#define DUK_ASC_LC_Y        0x79
+#define DUK_ASC_LC_Z        0x7a
+#define DUK_ASC_LCURLY      0x7b
+#define DUK_ASC_PIPE        0x7c
+#define DUK_ASC_RCURLY      0x7d
+#define DUK_ASC_TILDE       0x7e
+#define DUK_ASC_DEL         0x7f
 
 /*
  *  Miscellaneous
@@ -10106,7 +10903,7 @@ DUK_INTERNAL_DECL duk_hobject *duk_error_prototype_from_code(duk_hthread *thr, d
 /* Uppercase A is 0x41, lowercase a is 0x61; OR 0x20 to convert uppercase
  * to lowercase.
  */
-#define DUK_LOWERCASE_CHAR_ASCII(x)  ((x) | 0x20)
+#define DUK_LOWERCASE_CHAR_ASCII(x) ((x) | 0x20)
 
 /*
  *  Unicode tables
@@ -10117,13 +10914,13 @@ DUK_INTERNAL_DECL duk_hobject *duk_error_prototype_from_code(duk_hthread *thr, d
  *  Automatically generated by extract_chars.py, do not edit!
  */
 
-extern const duk_uint8_t duk_unicode_ids_noa[1063];
+extern const duk_uint8_t duk_unicode_ids_noa[1116];
 #else
 /*
  *  Automatically generated by extract_chars.py, do not edit!
  */
 
-extern const duk_uint8_t duk_unicode_ids_noabmp[626];
+extern const duk_uint8_t duk_unicode_ids_noabmp[625];
 #endif
 
 #if defined(DUK_USE_SOURCE_NONBMP)
@@ -10145,7 +10942,7 @@ extern const duk_uint8_t duk_unicode_ids_m_let_noabmp[24];
  *  Automatically generated by extract_chars.py, do not edit!
  */
 
-extern const duk_uint8_t duk_unicode_idp_m_ids_noa[549];
+extern const duk_uint8_t duk_unicode_idp_m_ids_noa[576];
 #else
 /*
  *  Automatically generated by extract_chars.py, do not edit!
@@ -10158,8 +10955,8 @@ extern const duk_uint8_t duk_unicode_idp_m_ids_noabmp[358];
  *  Automatically generated by extract_caseconv.py, do not edit!
  */
 
-extern const duk_uint8_t duk_unicode_caseconv_uc[1386];
-extern const duk_uint8_t duk_unicode_caseconv_lc[680];
+extern const duk_uint8_t duk_unicode_caseconv_uc[1411];
+extern const duk_uint8_t duk_unicode_caseconv_lc[706];
 
 #if defined(DUK_USE_REGEXP_CANON_WORKAROUND)
 /*
@@ -10194,7 +10991,7 @@ DUK_INTERNAL_DECL const duk_uint16_t duk_unicode_re_ranges_not_digit[4];
 DUK_INTERNAL_DECL const duk_uint16_t duk_unicode_re_ranges_not_white[24];
 DUK_INTERNAL_DECL const duk_uint16_t duk_unicode_re_ranges_not_wordchar[10];
 DUK_INTERNAL_DECL const duk_int8_t duk_is_idchar_tab[128];
-#endif  /* !DUK_SINGLE_FILE */
+#endif /* !DUK_SINGLE_FILE */
 
 /*
  *  Prototypes
@@ -10206,9 +11003,17 @@ DUK_INTERNAL_DECL duk_small_int_t duk_unicode_get_cesu8_length(duk_ucodepoint_t
 #endif
 DUK_INTERNAL_DECL duk_small_int_t duk_unicode_encode_xutf8(duk_ucodepoint_t cp, duk_uint8_t *out);
 DUK_INTERNAL_DECL duk_small_int_t duk_unicode_encode_cesu8(duk_ucodepoint_t cp, duk_uint8_t *out);
-DUK_INTERNAL_DECL duk_small_int_t duk_unicode_decode_xutf8(duk_hthread *thr, const duk_uint8_t **ptr, const duk_uint8_t *ptr_start, const duk_uint8_t *ptr_end, duk_ucodepoint_t *out_cp);
-DUK_INTERNAL_DECL duk_ucodepoint_t duk_unicode_decode_xutf8_checked(duk_hthread *thr, const duk_uint8_t **ptr, const duk_uint8_t *ptr_start, const duk_uint8_t *ptr_end);
+DUK_INTERNAL_DECL duk_small_int_t duk_unicode_decode_xutf8(duk_hthread *thr,
+                                                           const duk_uint8_t **ptr,
+                                                           const duk_uint8_t *ptr_start,
+                                                           const duk_uint8_t *ptr_end,
+                                                           duk_ucodepoint_t *out_cp);
+DUK_INTERNAL_DECL duk_ucodepoint_t duk_unicode_decode_xutf8_checked(duk_hthread *thr,
+                                                                    const duk_uint8_t **ptr,
+                                                                    const duk_uint8_t *ptr_start,
+                                                                    const duk_uint8_t *ptr_end);
 DUK_INTERNAL_DECL duk_size_t duk_unicode_unvalidated_utf8_length(const duk_uint8_t *data, duk_size_t blen);
+DUK_INTERNAL_DECL duk_bool_t duk_unicode_is_utf8_compatible(const duk_uint8_t *buf, duk_size_t len);
 DUK_INTERNAL_DECL duk_small_int_t duk_unicode_is_whitespace(duk_codepoint_t cp);
 DUK_INTERNAL_DECL duk_small_int_t duk_unicode_is_line_terminator(duk_codepoint_t cp);
 DUK_INTERNAL_DECL duk_small_int_t duk_unicode_is_identifier_start(duk_codepoint_t cp);
@@ -10220,7 +11025,7 @@ DUK_INTERNAL_DECL duk_codepoint_t duk_unicode_re_canonicalize_char(duk_hthread *
 DUK_INTERNAL_DECL duk_small_int_t duk_unicode_re_is_wordchar(duk_codepoint_t cp);
 #endif
 
-#endif  /* DUK_UNICODE_H_INCLUDED */
+#endif /* DUK_UNICODE_H_INCLUDED */
 /* #include duk_json.h */
 /*
  *  Defines for JSON, especially duk_bi_json.c.
@@ -10230,28 +11035,28 @@ DUK_INTERNAL_DECL duk_small_int_t duk_unicode_re_is_wordchar(duk_codepoint_t cp)
 #define DUK_JSON_H_INCLUDED
 
 /* Encoding/decoding flags */
-#define DUK_JSON_FLAG_ASCII_ONLY              (1U << 0)  /* escape any non-ASCII characters */
-#define DUK_JSON_FLAG_AVOID_KEY_QUOTES        (1U << 1)  /* avoid key quotes when key is an ASCII Identifier */
-#define DUK_JSON_FLAG_EXT_CUSTOM              (1U << 2)  /* extended types: custom encoding */
-#define DUK_JSON_FLAG_EXT_COMPATIBLE          (1U << 3)  /* extended types: compatible encoding */
+#define DUK_JSON_FLAG_ASCII_ONLY       (1U << 0) /* escape any non-ASCII characters */
+#define DUK_JSON_FLAG_AVOID_KEY_QUOTES (1U << 1) /* avoid key quotes when key is an ASCII Identifier */
+#define DUK_JSON_FLAG_EXT_CUSTOM       (1U << 2) /* extended types: custom encoding */
+#define DUK_JSON_FLAG_EXT_COMPATIBLE   (1U << 3) /* extended types: compatible encoding */
 
 /* How much stack to require on entry to object/array encode */
-#define DUK_JSON_ENC_REQSTACK                 32
+#define DUK_JSON_ENC_REQSTACK 32
 
 /* How much stack to require on entry to object/array decode */
-#define DUK_JSON_DEC_REQSTACK                 32
+#define DUK_JSON_DEC_REQSTACK 32
 
 /* How large a loop detection stack to use */
-#define DUK_JSON_ENC_LOOPARRAY                64
+#define DUK_JSON_ENC_LOOPARRAY 64
 
 /* Encoding state.  Heap object references are all borrowed. */
 typedef struct {
 	duk_hthread *thr;
-	duk_bufwriter_ctx bw;        /* output bufwriter */
-	duk_hobject *h_replacer;     /* replacer function */
-	duk_hstring *h_gap;          /* gap (if empty string, NULL) */
-	duk_idx_t idx_proplist;      /* explicit PropertyList */
-	duk_idx_t idx_loop;          /* valstack index of loop detection object */
+	duk_bufwriter_ctx bw; /* output bufwriter */
+	duk_hobject *h_replacer; /* replacer function */
+	duk_hstring *h_gap; /* gap (if empty string, NULL) */
+	duk_idx_t idx_proplist; /* explicit PropertyList */
+	duk_idx_t idx_loop; /* valstack index of loop detection object */
 	duk_small_uint_t flags;
 	duk_small_uint_t flag_ascii_only;
 	duk_small_uint_t flag_avoid_key_quotes;
@@ -10262,7 +11067,7 @@ typedef struct {
 #endif
 	duk_uint_t recursion_depth;
 	duk_uint_t recursion_limit;
-	duk_uint_t mask_for_undefined;      /* type bit mask: types which certainly produce 'undefined' */
+	duk_uint_t mask_for_undefined; /* type bit mask: types which certainly produce 'undefined' */
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
 	duk_small_uint_t stridx_custom_undefined;
 	duk_small_uint_t stridx_custom_nan;
@@ -10270,7 +11075,7 @@ typedef struct {
 	duk_small_uint_t stridx_custom_posinf;
 	duk_small_uint_t stridx_custom_function;
 #endif
-	duk_hobject *visiting[DUK_JSON_ENC_LOOPARRAY];  /* indexed by recursion_depth */
+	duk_hobject *visiting[DUK_JSON_ENC_LOOPARRAY]; /* indexed by recursion_depth */
 } duk_json_enc_ctx;
 
 typedef struct {
@@ -10289,7 +11094,7 @@ typedef struct {
 	duk_int_t recursion_limit;
 } duk_json_dec_ctx;
 
-#endif  /* DUK_JSON_H_INCLUDED */
+#endif /* DUK_JSON_H_INCLUDED */
 /* #include duk_js.h */
 /*
  *  ECMAScript execution, support primitives.
@@ -10299,21 +11104,22 @@ typedef struct {
 #define DUK_JS_H_INCLUDED
 
 /* Flags for call handling.  Lowest flags must match bytecode DUK_BC_CALL_FLAG_xxx 1:1. */
-#define DUK_CALL_FLAG_TAILCALL                 (1U << 0)  /* setup for a tail call */
-#define DUK_CALL_FLAG_CONSTRUCT                (1U << 1)  /* constructor call (i.e. called as 'new Foo()') */
-#define DUK_CALL_FLAG_CALLED_AS_EVAL           (1U << 2)  /* call was made using the identifier 'eval' */
-#define DUK_CALL_FLAG_ALLOW_ECMATOECMA         (1U << 3)  /* ecma-to-ecma call with executor reuse is possible */
-#define DUK_CALL_FLAG_DIRECT_EVAL              (1U << 4)  /* call is a direct eval call */
-#define DUK_CALL_FLAG_CONSTRUCT_PROXY          (1U << 5)  /* handled via 'construct' proxy trap, check return value invariant(s) */
-#define DUK_CALL_FLAG_DEFAULT_INSTANCE_UPDATED (1U << 6)  /* prototype of 'default instance' updated, temporary flag in call handling */
+#define DUK_CALL_FLAG_TAILCALL         (1U << 0) /* setup for a tail call */
+#define DUK_CALL_FLAG_CONSTRUCT        (1U << 1) /* constructor call (i.e. called as 'new Foo()') */
+#define DUK_CALL_FLAG_CALLED_AS_EVAL   (1U << 2) /* call was made using the identifier 'eval' */
+#define DUK_CALL_FLAG_ALLOW_ECMATOECMA (1U << 3) /* ecma-to-ecma call with executor reuse is possible */
+#define DUK_CALL_FLAG_DIRECT_EVAL      (1U << 4) /* call is a direct eval call */
+#define DUK_CALL_FLAG_CONSTRUCT_PROXY  (1U << 5) /* handled via 'construct' proxy trap, check return value invariant(s) */
+#define DUK_CALL_FLAG_DEFAULT_INSTANCE_UPDATED \
+	(1U << 6) /* prototype of 'default instance' updated, temporary flag in call handling */
 
 /* Flags for duk_js_equals_helper(). */
-#define DUK_EQUALS_FLAG_SAMEVALUE            (1U << 0)  /* use SameValue instead of non-strict equality */
-#define DUK_EQUALS_FLAG_STRICT               (1U << 1)  /* use strict equality instead of non-strict equality */
+#define DUK_EQUALS_FLAG_SAMEVALUE (1U << 0) /* use SameValue instead of non-strict equality */
+#define DUK_EQUALS_FLAG_STRICT    (1U << 1) /* use strict equality instead of non-strict equality */
 
 /* Flags for duk_js_compare_helper(). */
-#define DUK_COMPARE_FLAG_NEGATE              (1U << 0)  /* negate result */
-#define DUK_COMPARE_FLAG_EVAL_LEFT_FIRST     (1U << 1)  /* eval left argument first */
+#define DUK_COMPARE_FLAG_NEGATE          (1U << 0) /* negate result */
+#define DUK_COMPARE_FLAG_EVAL_LEFT_FIRST (1U << 1) /* eval left argument first */
 
 /* conversions, coercions, comparison, etc */
 DUK_INTERNAL_DECL duk_bool_t duk_js_toboolean(duk_tval *tv);
@@ -10329,9 +11135,12 @@ DUK_INTERNAL_DECL duk_uarridx_t duk_js_to_arrayindex_hstring_fast_known(duk_hstr
 DUK_INTERNAL_DECL duk_uarridx_t duk_js_to_arrayindex_hstring_fast(duk_hstring *h);
 #endif
 DUK_INTERNAL_DECL duk_bool_t duk_js_equals_helper(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y, duk_small_uint_t flags);
-DUK_INTERNAL_DECL duk_small_int_t duk_js_data_compare(const duk_uint8_t *buf1, const duk_uint8_t *buf2, duk_size_t len1, duk_size_t len2);
+DUK_INTERNAL_DECL duk_small_int_t duk_js_data_compare(const duk_uint8_t *buf1,
+                                                      const duk_uint8_t *buf2,
+                                                      duk_size_t len1,
+                                                      duk_size_t len2);
 DUK_INTERNAL_DECL duk_small_int_t duk_js_string_compare(duk_hstring *h1, duk_hstring *h2);
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_INTERNAL_DECL duk_small_int_t duk_js_buffer_compare(duk_heap *heap, duk_hbuffer *h1, duk_hbuffer *h2);
 #endif
 DUK_INTERNAL_DECL duk_bool_t duk_js_compare_helper(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y, duk_small_uint_t flags);
@@ -10341,50 +11150,64 @@ DUK_INTERNAL_DECL duk_bool_t duk_js_instanceof_ordinary(duk_hthread *thr, duk_tv
 #endif
 DUK_INTERNAL_DECL duk_bool_t duk_js_in(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y);
 DUK_INTERNAL_DECL duk_small_uint_t duk_js_typeof_stridx(duk_tval *tv_x);
+DUK_INTERNAL_DECL duk_bool_t duk_js_isarray_hobject(duk_hobject *h);
+DUK_INTERNAL_DECL duk_bool_t duk_js_isarray(duk_tval *tv);
 
 /* arithmetic */
 DUK_INTERNAL_DECL double duk_js_arith_pow(double x, double y);
 DUK_INTERNAL_DECL double duk_js_arith_mod(double x, double y);
 
-#define duk_js_equals(thr,tv_x,tv_y) \
-	duk_js_equals_helper((thr), (tv_x), (tv_y), 0)
-#define duk_js_strict_equals(tv_x,tv_y) \
-	duk_js_equals_helper(NULL, (tv_x), (tv_y), DUK_EQUALS_FLAG_STRICT)
-#define duk_js_samevalue(tv_x,tv_y) \
-	duk_js_equals_helper(NULL, (tv_x), (tv_y), DUK_EQUALS_FLAG_SAMEVALUE)
+#define duk_js_equals(thr, tv_x, tv_y)   duk_js_equals_helper((thr), (tv_x), (tv_y), 0)
+#define duk_js_strict_equals(tv_x, tv_y) duk_js_equals_helper(NULL, (tv_x), (tv_y), DUK_EQUALS_FLAG_STRICT)
+#define duk_js_samevalue(tv_x, tv_y)     duk_js_equals_helper(NULL, (tv_x), (tv_y), DUK_EQUALS_FLAG_SAMEVALUE)
 
 /* E5 Sections 11.8.1, 11.8.5; x < y */
-#define duk_js_lessthan(thr,tv_x,tv_y) \
-	duk_js_compare_helper((thr), (tv_x), (tv_Y), DUK_COMPARE_FLAG_EVAL_LEFT_FIRST)
+#define duk_js_lessthan(thr, tv_x, tv_y) duk_js_compare_helper((thr), (tv_x), (tv_Y), DUK_COMPARE_FLAG_EVAL_LEFT_FIRST)
 
 /* E5 Sections 11.8.2, 11.8.5; x > y  -->  y < x */
-#define duk_js_greaterthan(thr,tv_x,tv_y) \
-	duk_js_compare_helper((thr), (tv_y), (tv_x), 0)
+#define duk_js_greaterthan(thr, tv_x, tv_y) duk_js_compare_helper((thr), (tv_y), (tv_x), 0)
 
 /* E5 Sections 11.8.3, 11.8.5; x <= y  -->  not (x > y)  -->  not (y < x) */
-#define duk_js_lessthanorequal(thr,tv_x,tv_y) \
-	duk_js_compare_helper((thr), (tv_y), (tv_x), DUK_COMPARE_FLAG_NEGATE)
+#define duk_js_lessthanorequal(thr, tv_x, tv_y) duk_js_compare_helper((thr), (tv_y), (tv_x), DUK_COMPARE_FLAG_NEGATE)
 
 /* E5 Sections 11.8.4, 11.8.5; x >= y  -->  not (x < y) */
-#define duk_js_greaterthanorequal(thr,tv_x,tv_y) \
+#define duk_js_greaterthanorequal(thr, tv_x, tv_y) \
 	duk_js_compare_helper((thr), (tv_x), (tv_y), DUK_COMPARE_FLAG_EVAL_LEFT_FIRST | DUK_COMPARE_FLAG_NEGATE)
 
 /* identifiers and environment handling */
-#if 0  /*unused*/
+#if 0 /*unused*/
 DUK_INTERNAL duk_bool_t duk_js_hasvar_envrec(duk_hthread *thr, duk_hobject *env, duk_hstring *name);
 #endif
 DUK_INTERNAL_DECL duk_bool_t duk_js_getvar_envrec(duk_hthread *thr, duk_hobject *env, duk_hstring *name, duk_bool_t throw_flag);
-DUK_INTERNAL_DECL duk_bool_t duk_js_getvar_activation(duk_hthread *thr, duk_activation *act, duk_hstring *name, duk_bool_t throw_flag);
-DUK_INTERNAL_DECL void duk_js_putvar_envrec(duk_hthread *thr, duk_hobject *env, duk_hstring *name, duk_tval *val, duk_bool_t strict);
-DUK_INTERNAL_DECL void duk_js_putvar_activation(duk_hthread *thr, duk_activation *act, duk_hstring *name, duk_tval *val, duk_bool_t strict);
-#if 0  /*unused*/
+DUK_INTERNAL_DECL duk_bool_t duk_js_getvar_activation(duk_hthread *thr,
+                                                      duk_activation *act,
+                                                      duk_hstring *name,
+                                                      duk_bool_t throw_flag);
+DUK_INTERNAL_DECL void duk_js_putvar_envrec(duk_hthread *thr,
+                                            duk_hobject *env,
+                                            duk_hstring *name,
+                                            duk_tval *val,
+                                            duk_bool_t strict);
+DUK_INTERNAL_DECL void duk_js_putvar_activation(duk_hthread *thr,
+                                                duk_activation *act,
+                                                duk_hstring *name,
+                                                duk_tval *val,
+                                                duk_bool_t strict);
+#if 0 /*unused*/
 DUK_INTERNAL_DECL duk_bool_t duk_js_delvar_envrec(duk_hthread *thr, duk_hobject *env, duk_hstring *name);
 #endif
 DUK_INTERNAL_DECL duk_bool_t duk_js_delvar_activation(duk_hthread *thr, duk_activation *act, duk_hstring *name);
-DUK_INTERNAL_DECL duk_bool_t duk_js_declvar_activation(duk_hthread *thr, duk_activation *act, duk_hstring *name, duk_tval *val, duk_small_uint_t prop_flags, duk_bool_t is_func_decl);
+DUK_INTERNAL_DECL duk_bool_t duk_js_declvar_activation(duk_hthread *thr,
+                                                       duk_activation *act,
+                                                       duk_hstring *name,
+                                                       duk_tval *val,
+                                                       duk_small_uint_t prop_flags,
+                                                       duk_bool_t is_func_decl);
 DUK_INTERNAL_DECL void duk_js_init_activation_environment_records_delayed(duk_hthread *thr, duk_activation *act);
 DUK_INTERNAL_DECL void duk_js_close_environment_record(duk_hthread *thr, duk_hobject *env);
-DUK_INTERNAL_DECL duk_hobject *duk_create_activation_environment_record(duk_hthread *thr, duk_hobject *func, duk_size_t bottom_byteoff);
+DUK_INTERNAL_DECL duk_hobject *duk_create_activation_environment_record(duk_hthread *thr,
+                                                                        duk_hobject *func,
+                                                                        duk_size_t bottom_byteoff);
 DUK_INTERNAL_DECL void duk_js_push_closure(duk_hthread *thr,
                                            duk_hcompfunc *fun_temp,
                                            duk_hobject *outer_var_env,
@@ -10392,18 +11215,20 @@ DUK_INTERNAL_DECL void duk_js_push_closure(duk_hthread *thr,
                                            duk_bool_t add_auto_proto);
 
 /* call handling */
+DUK_INTERNAL_DECL void duk_native_stack_check(duk_hthread *thr);
 DUK_INTERNAL_DECL duk_int_t duk_handle_call_unprotected(duk_hthread *thr, duk_idx_t idx_func, duk_small_uint_t call_flags);
 DUK_INTERNAL_DECL duk_int_t duk_handle_call_unprotected_nargs(duk_hthread *thr, duk_idx_t nargs, duk_small_uint_t call_flags);
-DUK_INTERNAL_DECL duk_int_t duk_handle_safe_call(duk_hthread *thr, duk_safe_call_function func, void *udata, duk_idx_t num_stack_args, duk_idx_t num_stack_res);
+DUK_INTERNAL_DECL duk_int_t
+duk_handle_safe_call(duk_hthread *thr, duk_safe_call_function func, void *udata, duk_idx_t num_stack_args, duk_idx_t num_stack_res);
 DUK_INTERNAL_DECL void duk_call_construct_postprocess(duk_hthread *thr, duk_small_uint_t proxy_invariant);
 #if defined(DUK_USE_VERBOSE_ERRORS)
-DUK_INTERNAL_DECL void duk_call_setup_propcall_error(duk_hthread *thr, duk_tval *tv_targ, duk_tval *tv_base, duk_tval *tv_key);
+DUK_INTERNAL_DECL void duk_call_setup_propcall_error(duk_hthread *thr, duk_tval *tv_base, duk_tval *tv_key);
 #endif
 
 /* bytecode execution */
 DUK_INTERNAL_DECL void duk_js_execute_bytecode(duk_hthread *exec_thr);
 
-#endif  /* DUK_JS_H_INCLUDED */
+#endif /* DUK_JS_H_INCLUDED */
 /* #include duk_numconv.h */
 /*
  *  Number-to-string conversion.  The semantics of these is very tightly
@@ -10416,23 +11241,23 @@ DUK_INTERNAL_DECL void duk_js_execute_bytecode(duk_hthread *exec_thr);
 /* Output a specified number of digits instead of using the shortest
  * form.  Used for toPrecision() and toFixed().
  */
-#define DUK_N2S_FLAG_FIXED_FORMAT         (1U << 0)
+#define DUK_N2S_FLAG_FIXED_FORMAT (1U << 0)
 
 /* Force exponential format.  Used for toExponential(). */
-#define DUK_N2S_FLAG_FORCE_EXP            (1U << 1)
+#define DUK_N2S_FLAG_FORCE_EXP (1U << 1)
 
 /* If number would need zero padding (for whole number part), use
  * exponential format instead.  E.g. if input number is 12300, 3
  * digits are generated ("123"), output "1.23e+4" instead of "12300".
  * Used for toPrecision().
  */
-#define DUK_N2S_FLAG_NO_ZERO_PAD          (1U << 2)
+#define DUK_N2S_FLAG_NO_ZERO_PAD (1U << 2)
 
 /* Digit count indicates number of fractions (i.e. an absolute
  * digit index instead of a relative one).  Used together with
  * DUK_N2S_FLAG_FIXED_FORMAT for toFixed().
  */
-#define DUK_N2S_FLAG_FRACTION_DIGITS      (1U << 3)
+#define DUK_N2S_FLAG_FRACTION_DIGITS (1U << 3)
 
 /*
  *  String-to-number conversion
@@ -10446,69 +11271,72 @@ DUK_INTERNAL_DECL void duk_js_execute_bytecode(duk_hthread *exec_thr);
  * radix 10, but with maximum radix (36) a safe limit is:
  * (10000000*36).toString(16) -> '15752a00'
  */
-#define DUK_S2N_MAX_EXPONENT              10000000L
+#define DUK_S2N_MAX_EXPONENT 10000000L
 
 /* Trim white space (= allow leading and trailing whitespace) */
-#define DUK_S2N_FLAG_TRIM_WHITE           (1U << 0)
+#define DUK_S2N_FLAG_TRIM_WHITE (1U << 0)
 
 /* Allow exponent */
-#define DUK_S2N_FLAG_ALLOW_EXP            (1U << 1)
+#define DUK_S2N_FLAG_ALLOW_EXP (1U << 1)
 
 /* Allow trailing garbage (e.g. treat "123foo" as "123) */
-#define DUK_S2N_FLAG_ALLOW_GARBAGE        (1U << 2)
+#define DUK_S2N_FLAG_ALLOW_GARBAGE (1U << 2)
 
 /* Allow leading plus sign */
-#define DUK_S2N_FLAG_ALLOW_PLUS           (1U << 3)
+#define DUK_S2N_FLAG_ALLOW_PLUS (1U << 3)
 
 /* Allow leading minus sign */
-#define DUK_S2N_FLAG_ALLOW_MINUS          (1U << 4)
+#define DUK_S2N_FLAG_ALLOW_MINUS (1U << 4)
 
 /* Allow 'Infinity' */
-#define DUK_S2N_FLAG_ALLOW_INF            (1U << 5)
+#define DUK_S2N_FLAG_ALLOW_INF (1U << 5)
 
 /* Allow fraction part */
-#define DUK_S2N_FLAG_ALLOW_FRAC           (1U << 6)
+#define DUK_S2N_FLAG_ALLOW_FRAC (1U << 6)
 
 /* Allow naked fraction (e.g. ".123") */
-#define DUK_S2N_FLAG_ALLOW_NAKED_FRAC     (1U << 7)
+#define DUK_S2N_FLAG_ALLOW_NAKED_FRAC (1U << 7)
 
 /* Allow empty fraction (e.g. "123.") */
-#define DUK_S2N_FLAG_ALLOW_EMPTY_FRAC     (1U << 8)
+#define DUK_S2N_FLAG_ALLOW_EMPTY_FRAC (1U << 8)
 
 /* Allow empty string to be interpreted as 0 */
-#define DUK_S2N_FLAG_ALLOW_EMPTY_AS_ZERO  (1U << 9)
+#define DUK_S2N_FLAG_ALLOW_EMPTY_AS_ZERO (1U << 9)
 
 /* Allow leading zeroes (e.g. "0123" -> "123") */
-#define DUK_S2N_FLAG_ALLOW_LEADING_ZERO   (1U << 10)
+#define DUK_S2N_FLAG_ALLOW_LEADING_ZERO (1U << 10)
 
 /* Allow automatic detection of hex base ("0x" or "0X" prefix),
  * overrides radix argument and forces integer mode.
  */
-#define DUK_S2N_FLAG_ALLOW_AUTO_HEX_INT   (1U << 11)
+#define DUK_S2N_FLAG_ALLOW_AUTO_HEX_INT (1U << 11)
 
 /* Allow automatic detection of legacy octal base ("0n"),
  * overrides radix argument and forces integer mode.
  */
-#define DUK_S2N_FLAG_ALLOW_AUTO_LEGACY_OCT_INT   (1U << 12)
+#define DUK_S2N_FLAG_ALLOW_AUTO_LEGACY_OCT_INT (1U << 12)
 
 /* Allow automatic detection of ES2015 octal base ("0o123"),
  * overrides radix argument and forces integer mode.
  */
-#define DUK_S2N_FLAG_ALLOW_AUTO_OCT_INT   (1U << 13)
+#define DUK_S2N_FLAG_ALLOW_AUTO_OCT_INT (1U << 13)
 
 /* Allow automatic detection of ES2015 binary base ("0b10001"),
  * overrides radix argument and forces integer mode.
  */
-#define DUK_S2N_FLAG_ALLOW_AUTO_BIN_INT   (1U << 14)
+#define DUK_S2N_FLAG_ALLOW_AUTO_BIN_INT (1U << 14)
 
 /*
  *  Prototypes
  */
 
-DUK_INTERNAL_DECL void duk_numconv_stringify(duk_hthread *thr, duk_small_int_t radix, duk_small_int_t digits, duk_small_uint_t flags);
+DUK_INTERNAL_DECL void duk_numconv_stringify(duk_hthread *thr,
+                                             duk_small_int_t radix,
+                                             duk_small_int_t digits,
+                                             duk_small_uint_t flags);
 DUK_INTERNAL_DECL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk_small_uint_t flags);
 
-#endif  /* DUK_NUMCONV_H_INCLUDED */
+#endif /* DUK_NUMCONV_H_INCLUDED */
 /* #include duk_bi_protos.h */
 /*
  *  Prototypes for built-in functions not automatically covered by the
@@ -10524,7 +11352,7 @@ DUK_INTERNAL_DECL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix
  *   32
  * Include additional space to be safe.
  */
-#define  DUK_BI_DATE_ISO8601_BUFSIZE  40
+#define DUK_BI_DATE_ISO8601_BUFSIZE 40
 
 /* Helpers exposed for internal use */
 DUK_INTERNAL_DECL void duk_bi_date_timeval_to_parts(duk_double_t d, duk_int_t *parts, duk_double_t *dparts, duk_small_uint_t flags);
@@ -10562,7 +11390,10 @@ DUK_INTERNAL_DECL duk_bool_t duk_bi_date_parse_string_strptime(duk_hthread *thr,
 DUK_INTERNAL_DECL duk_bool_t duk_bi_date_parse_string_getdate(duk_hthread *thr, const char *str);
 #endif
 #if defined(DUK_USE_DATE_FMT_STRFTIME)
-DUK_INTERNAL_DECL duk_bool_t duk_bi_date_format_parts_strftime(duk_hthread *thr, duk_int_t *parts, duk_int_t tzoffset, duk_small_uint_t flags);
+DUK_INTERNAL_DECL duk_bool_t duk_bi_date_format_parts_strftime(duk_hthread *thr,
+                                                               duk_int_t *parts,
+                                                               duk_int_t tzoffset,
+                                                               duk_small_uint_t flags);
 #endif
 
 #if defined(DUK_USE_GET_MONOTONIC_TIME_CLOCK_GETTIME)
@@ -10573,10 +11404,7 @@ DUK_INTERNAL_DECL duk_double_t duk_bi_date_get_monotonic_time_windows_qpc(void);
 #endif
 
 DUK_INTERNAL_DECL
-void duk_bi_json_parse_helper(duk_hthread *thr,
-                              duk_idx_t idx_value,
-                              duk_idx_t idx_reviver,
-                              duk_small_uint_t flags);
+void duk_bi_json_parse_helper(duk_hthread *thr, duk_idx_t idx_value, duk_idx_t idx_reviver, duk_small_uint_t flags);
 DUK_INTERNAL_DECL
 void duk_bi_json_stringify_helper(duk_hthread *thr,
                                   duk_idx_t idx_value,
@@ -10590,7 +11418,7 @@ DUK_INTERNAL_DECL duk_ret_t duk_textdecoder_decode_utf8_nodejs(duk_hthread *thr)
 DUK_INTERNAL_DECL void duk_proxy_ownkeys_postprocess(duk_hthread *thr, duk_hobject *h_proxy_target, duk_uint_t flags);
 #endif
 
-#endif  /* DUK_BUILTIN_PROTOS_H_INCLUDED */
+#endif /* DUK_BUILTIN_PROTOS_H_INCLUDED */
 /* #include duk_selftest.h */
 /*
  *  Selftest code
@@ -10606,9 +11434,9 @@ DUK_INTERNAL_DECL duk_uint_t duk_selftest_run_tests(duk_alloc_function alloc_fun
                                                     void *udata);
 #endif
 
-#endif  /* DUK_SELFTEST_H_INCLUDED */
+#endif /* DUK_SELFTEST_H_INCLUDED */
 
-#endif  /* DUK_INTERNAL_H_INCLUDED */
+#endif /* DUK_INTERNAL_H_INCLUDED */
 
 #if defined(DUK_USE_COMPUTED_NAN)
 DUK_INTERNAL double duk_computed_nan;
@@ -10702,7 +11530,7 @@ DUK_INTERNAL int duk_repl_isinf(double x) {
 #error debugging enabled (DUK_USE_DEBUG) but DUK_USE_DEBUG_WRITE not defined
 #endif
 
-#define DUK__DEBUG_BUFSIZE  DUK_USE_DEBUG_BUFSIZE
+#define DUK__DEBUG_BUFSIZE DUK_USE_DEBUG_BUFSIZE
 
 #if defined(DUK_USE_VARIADIC_MACROS)
 
@@ -10730,7 +11558,7 @@ DUK_INTERNAL void duk_debug_log(duk_int_t level, const char *file, duk_int_t lin
 	va_end(ap);
 }
 
-#else  /* DUK_USE_VARIADIC_MACROS */
+#else /* DUK_USE_VARIADIC_MACROS */
 
 DUK_INTERNAL char duk_debug_file_stash[DUK_DEBUG_STASH_SIZE];
 DUK_INTERNAL duk_int_t duk_debug_line_stash;
@@ -10761,15 +11589,15 @@ DUK_INTERNAL void duk_debug_log(const char *fmt, ...) {
 	va_end(ap);
 }
 
-#endif  /* DUK_USE_VARIADIC_MACROS */
+#endif /* DUK_USE_VARIADIC_MACROS */
 
-#else  /* DUK_USE_DEBUG */
+#else /* DUK_USE_DEBUG */
 
 /*
  *  Debugging disabled
  */
 
-#endif  /* DUK_USE_DEBUG */
+#endif /* DUK_USE_DEBUG */
 
 /* automatic undefs */
 #undef DUK__DEBUG_BUFSIZE
@@ -10788,7 +11616,7 @@ DUK_INTERNAL void duk_debug_log(const char *fmt, ...) {
 #if defined(DUK_USE_ROM_STRINGS)
 #error ROM support not enabled, rerun configure.py with --rom-support
 #else  /* DUK_USE_ROM_STRINGS */
-DUK_INTERNAL const duk_uint8_t duk_strings_data[967] = {
+DUK_INTERNAL const duk_uint8_t duk_strings_data[972] = {
 79,40,209,144,168,105,6,78,54,139,89,185,44,48,46,90,120,8,154,140,35,103,
 35,113,193,73,5,52,112,180,104,166,135,52,188,4,98,12,27,146,156,80,211,31,
 129,115,150,64,52,220,109,24,18,68,156,24,38,67,114,36,55,9,119,151,132,
@@ -10816,34 +11644,34 @@ DUK_INTERNAL const duk_uint8_t duk_strings_data[967] = {
 113,67,77,201,128,223,255,223,224,121,44,48,46,95,203,145,46,9,205,16,39,
 201,62,36,0,192,21,147,255,238,145,39,199,197,211,116,240,242,113,197,78,
 214,211,226,233,187,107,105,19,119,37,56,161,166,52,221,212,201,205,36,240,
-242,16,96,152,12,178,52,211,56,228,73,150,83,0,148,39,137,75,67,73,198,209,
-129,36,85,185,201,196,2,32,193,48,17,160,97,16,84,44,156,104,24,67,189,200,
-108,201,19,238,114,96,137,137,50,238,113,164,188,211,185,192,226,100,19,
-134,68,110,112,174,139,0,185,31,115,149,4,88,7,159,115,146,117,34,34,35,
-115,143,22,146,208,210,19,115,140,3,207,185,202,130,36,109,85,185,194,161,
-160,90,50,72,155,115,149,2,232,67,137,204,122,22,66,161,175,164,210,72,199,
-130,137,1,50,32,145,143,38,120,186,195,35,106,51,146,230,8,36,77,109,65,38,
-226,72,159,191,189,181,70,140,133,222,249,212,227,66,125,245,187,251,219,
-77,3,119,190,117,56,208,159,125,110,254,246,210,26,93,239,157,78,52,39,223,
-93,191,189,180,212,52,187,223,58,156,104,79,190,187,127,123,104,180,104,
-183,190,117,56,208,159,125,102,254,209,104,209,124,234,113,161,62,250,80,
-196,128,81,4,9,16,162,4,196,116,9,205,154,27,66,32,100,13,12,98,68,227,33,
-65,69,204,195,34,201,50,8,110,33,23,34,28,168,104,22,188,12,174,138,11,70,
-138,104,115,68,130,137,13,82,27,41,129,162,35,138,54,146,198,137,39,72,180,
-210,178,38,35,146,103,68,139,51,197,214,28,227,131,79,15,35,138,58,130,37,
-19,155,41,146,174,64,203,99,161,100,37,145,51,148,75,4,164,66,54,140,49,46,
-247,70,103,37,230,70,142,70,67,30,232,204,178,163,201,18,54,139,89,39,26,
-16,165,2,228,69,33,143,89,24,70,206,73,67,102,72,148,2,32,214,73,157,224,
-18,128,98,29,241,69,65,50,37,241,116,200,41,144,102,125,2,180,8,210,152,38,
-129,23,8,34,198,
+242,16,96,152,12,26,20,164,137,150,70,154,103,28,137,50,202,96,18,132,241,
+41,104,105,56,218,48,36,138,183,57,56,128,68,24,38,2,52,12,34,10,133,147,
+141,3,8,119,185,13,153,34,125,206,76,17,49,38,93,206,52,151,154,119,56,28,
+76,130,112,200,141,206,21,209,96,23,35,238,114,160,139,0,243,238,114,78,
+164,68,68,110,113,226,210,90,26,66,110,113,128,121,247,57,80,68,141,170,
+183,56,84,52,11,70,73,19,110,114,160,93,8,113,57,143,66,200,84,53,244,154,
+73,24,240,81,32,38,68,18,49,228,207,23,88,100,109,70,114,92,193,4,137,173,
+168,36,220,73,19,247,247,182,168,209,144,187,223,58,156,104,79,190,183,127,
+123,105,160,110,247,206,167,26,19,239,173,223,222,218,67,75,189,243,169,
+198,132,251,235,183,247,182,154,134,151,123,231,83,141,9,247,215,111,239,
+109,22,141,22,247,206,167,26,19,239,172,223,218,45,26,47,157,78,52,39,223,
+74,24,144,10,32,129,34,20,64,152,142,129,57,179,67,104,68,12,129,161,140,
+72,156,100,40,40,185,152,100,89,38,65,13,196,34,228,67,149,13,2,215,129,
+149,209,65,104,209,77,14,104,144,81,33,170,67,101,48,52,68,113,70,210,88,
+209,36,233,22,154,86,68,196,114,76,232,145,102,120,186,195,156,112,105,225,
+228,113,71,80,68,162,115,101,50,85,200,25,108,116,44,132,178,38,114,137,96,
+148,136,70,209,134,37,222,232,204,228,188,200,209,200,200,99,221,25,150,84,
+121,34,70,209,107,36,227,66,20,160,92,136,164,49,235,35,8,217,201,40,108,
+201,18,128,68,26,201,51,188,2,80,12,67,190,40,168,38,68,190,46,153,5,50,12,
+207,160,86,129,26,83,4,208,34,225,4,88,192,
 };
 #endif  /* DUK_USE_ROM_STRINGS */
 
 #if defined(DUK_USE_ROM_OBJECTS)
 #error ROM support not enabled, rerun configure.py with --rom-support
 #else  /* DUK_USE_ROM_OBJECTS */
-/* native functions: 177 */
-DUK_INTERNAL const duk_c_function duk_bi_native_functions[177] = {
+/* native functions: 185 */
+DUK_INTERNAL const duk_c_function duk_bi_native_functions[185] = {
 	NULL,
 	duk_bi_array_constructor,
 	duk_bi_array_constructor_is_array,
@@ -10869,6 +11697,8 @@ DUK_INTERNAL const duk_c_function duk_bi_native_functions[177] = {
 	duk_bi_buffer_readfield,
 	duk_bi_buffer_slice_shared,
 	duk_bi_buffer_writefield,
+	duk_bi_cbor_decode,
+	duk_bi_cbor_encode,
 	duk_bi_dataview_constructor,
 	duk_bi_date_constructor,
 	duk_bi_date_constructor_now,
@@ -10879,6 +11709,7 @@ DUK_INTERNAL const duk_c_function duk_bi_native_functions[177] = {
 	duk_bi_date_prototype_set_shared,
 	duk_bi_date_prototype_set_time,
 	duk_bi_date_prototype_to_json,
+	duk_bi_date_prototype_toprimitive,
 	duk_bi_date_prototype_tostring_shared,
 	duk_bi_date_prototype_value_of,
 	duk_bi_duktape_object_act,
@@ -10901,6 +11732,7 @@ DUK_INTERNAL const duk_c_function duk_bi_native_functions[177] = {
 	duk_bi_function_prototype_apply,
 	duk_bi_function_prototype_bind,
 	duk_bi_function_prototype_call,
+	duk_bi_function_prototype_hasinstance,
 	duk_bi_function_prototype_to_string,
 	duk_bi_global_object_decode_uri,
 	duk_bi_global_object_decode_uri_component,
@@ -11003,6 +11835,10 @@ DUK_INTERNAL const duk_c_function duk_bi_native_functions[177] = {
 	duk_bi_string_prototype_substring,
 	duk_bi_string_prototype_to_string,
 	duk_bi_string_prototype_trim,
+	duk_bi_symbol_constructor_shared,
+	duk_bi_symbol_key_for,
+	duk_bi_symbol_toprimitive,
+	duk_bi_symbol_tostring_shared,
 	duk_bi_textdecoder_constructor,
 	duk_bi_textdecoder_prototype_decode,
 	duk_bi_textdecoder_prototype_shared_getter,
@@ -11023,577 +11859,604 @@ DUK_INTERNAL const duk_c_function duk_bi_native_functions[177] = {
 	duk_bi_uint8array_plainof,
 };
 #if defined(DUK_USE_DOUBLE_LE)
-DUK_INTERNAL const duk_uint8_t duk_builtins_data[4116] = {
-144,148,105,224,32,68,52,228,62,12,104,200,165,132,52,167,194,138,105,243,
-124,57,28,211,57,18,64,52,238,126,44,138,111,171,241,164,19,87,129,30,33,
-167,16,145,159,8,211,136,9,225,42,5,240,145,139,163,163,8,211,136,10,228,
-64,211,19,132,140,93,29,56,70,156,64,119,34,66,146,36,104,137,194,70,46,
-142,172,35,78,32,47,146,195,102,11,240,145,139,163,175,8,211,136,9,228,240,
-242,112,145,139,163,179,8,211,136,8,237,34,130,118,49,116,118,225,26,48,0,
-1,82,29,201,158,46,183,39,135,147,132,140,93,16,132,76,66,33,8,66,16,132,
-33,8,66,26,179,233,97,167,60,150,34,33,154,112,0,1,75,247,35,79,95,237,198,
-174,200,47,31,23,95,17,13,51,19,35,93,68,216,209,128,0,10,208,174,79,15,32,
-248,8,196,24,8,107,192,0,5,106,118,27,94,0,0,43,83,227,94,0,0,43,84,46,215,
-128,0,10,213,28,198,188,0,0,86,169,100,53,224,0,2,181,79,85,175,0,0,21,170,
-154,45,120,0,0,173,85,217,107,192,0,5,106,182,243,86,193,106,52,127,130,
-249,50,94,124,35,68,225,146,49,13,31,186,23,201,146,243,224,200,39,12,145,
-136,67,134,19,49,0,0,0,0,0,0,3,225,255,51,0,0,0,0,0,0,3,193,255,47,18,1,
-172,19,120,71,10,25,196,136,113,162,156,136,199,42,57,204,144,115,132,240,
-149,2,248,72,197,209,58,2,185,16,52,196,225,35,23,68,233,14,228,72,82,68,
-141,17,56,72,197,209,58,130,249,44,54,96,191,9,24,186,39,88,79,39,135,147,
-132,140,93,19,176,35,180,138,9,216,197,209,59,82,79,35,40,242,65,248,58,42,
-96,121,14,232,94,62,46,190,15,42,31,145,33,86,65,76,242,214,143,73,48,242,
-243,79,49,56,243,115,207,57,64,243,180,79,61,72,243,244,207,65,80,244,53,
-79,69,88,244,98,30,8,200,156,67,102,120,241,79,4,100,78,21,110,4,207,32,47,
-147,37,231,194,52,78,25,34,122,81,124,153,47,62,12,130,112,201,19,211,139,
-121,34,87,69,128,104,137,239,83,18,238,108,165,2,162,92,104,56,220,233,1,8,
-151,10,134,162,100,206,16,18,50,9,195,39,105,20,101,136,18,25,4,225,147,
-180,138,5,215,49,238,105,27,60,185,1,36,104,156,50,118,145,70,96,129,34,52,
-78,25,59,72,160,93,115,30,230,145,179,204,144,12,73,8,15,38,104,128,138,52,
-146,16,30,77,1,0,2,11,132,193,198,36,248,248,186,110,158,30,78,56,188,194,
-70,183,170,136,48,98,79,142,179,120,248,185,228,140,241,193,146,66,138,31,
-55,71,138,128,153,137,62,58,205,227,226,231,146,51,199,26,6,18,92,146,64,
-96,74,72,51,120,43,192,97,68,128,153,56,72,7,12,133,67,73,199,197,207,36,
-103,142,35,2,3,33,80,210,113,241,115,201,25,160,146,225,160,9,34,1,124,178,
-1,139,18,19,36,229,146,8,190,36,169,27,62,18,243,35,100,135,54,92,162,2,17,
-46,72,128,89,7,200,32,33,18,225,98,236,145,188,130,64,196,75,132,188,200,
-217,32,43,39,28,128,69,19,18,228,144,42,98,79,142,179,120,248,185,228,140,
-241,201,97,129,114,229,201,37,2,68,184,200,1,147,93,159,153,213,34,235,250,
-96,48,157,32,24,94,160,1,199,4,184,235,55,143,139,158,72,207,28,226,3,81,
-46,62,46,155,167,135,147,142,47,60,129,71,197,207,36,103,142,34,92,35,104,
-194,68,1,89,58,36,8,109,109,12,133,67,73,195,18,115,36,118,182,185,168,8,
-109,109,12,133,67,73,201,18,115,36,118,182,185,168,130,27,91,75,115,149,71,
-240,196,156,201,29,173,174,129,2,27,91,75,115,149,71,242,68,156,201,29,173,
-174,129,34,12,16,28,128,62,191,42,3,71,146,68,4,16,22,188,161,240,16,40,
-104,242,103,196,16,93,158,125,96,110,115,235,64,131,16,16,58,37,192,70,32,
-194,144,114,25,67,95,40,6,18,8,32,48,156,209,2,108,124,96,224,144,6,247,62,
-16,0,143,164,143,12,248,15,18,84,145,145,34,128,11,35,160,179,140,0,44,150,
-129,18,58,0,146,116,103,32,128,105,61,104,17,36,175,1,232,217,29,5,156,179,
-224,58,26,50,95,142,43,159,64,181,130,83,226,26,50,95,142,43,159,192,7,255,
-248,41,42,72,226,1,160,18,78,97,32,26,64,114,186,60,32,4,120,6,148,13,128,
-124,3,76,12,84,46,100,140,3,78,13,18,14,130,36,67,232,23,18,14,130,39,34,
-131,30,113,15,224,3,255,253,6,48,40,194,197,204,224,142,8,240,78,25,60,231,
-192,210,197,204,224,156,50,113,238,67,103,232,62,28,138,156,104,82,170,107,
-255,32,48,191,144,1,132,112,71,128,159,168,128,161,28,17,224,156,50,112,19,
-245,144,22,39,12,156,123,144,217,240,19,245,146,3,9,205,16,39,236,62,3,161,
-163,37,248,226,251,141,1,107,4,167,196,52,100,191,28,95,113,164,13,91,132,
-5,147,130,115,30,8,147,222,64,43,1,49,31,224,64,60,72,245,128,68,249,32,13,
-34,2,34,63,204,128,89,45,2,39,209,0,89,61,104,159,213,0,153,80,50,156,80,
-211,126,16,11,155,184,183,88,145,224,129,34,122,64,17,155,184,183,8,11,39,
-22,235,18,60,16,36,79,72,1,115,119,40,247,146,60,16,36,79,72,32,140,221,
-197,184,64,89,57,71,188,145,224,129,34,122,65,1,39,20,51,244,0,52,72,242,2,
-127,18,2,165,48,70,114,229,145,51,253,141,1,4,104,229,203,34,103,251,26,64,
-132,52,75,160,201,47,105,160,26,84,12,167,31,186,8,50,0,114,58,113,163,46,
-190,120,35,11,60,4,25,68,81,61,96,47,181,80,46,132,129,255,255,255,255,255,
-255,222,254,39,172,67,118,170,5,208,144,0,64,0,0,0,0,0,0,51,16,0,0,0,0,0,0,
-62,31,200,245,238,146,38,138,147,105,13,42,26,137,226,0,0,0,0,0,0,7,131,
-249,30,180,134,4,209,82,109,33,165,67,81,60,64,0,0,0,0,0,0,240,255,15,210,
-62,72,91,155,0,0,0,0,0,0,2,192,240,135,88,11,237,72,5,38,210,27,50,24,145,
-129,255,255,255,255,255,254,126,134,67,172,67,118,164,2,147,105,13,153,12,
-72,192,255,255,255,255,255,255,63,195,16,240,70,68,226,27,51,199,138,120,
-35,34,112,171,112,38,121,7,16,137,112,168,106,38,77,193,1,40,151,16,217,
-144,196,142,224,144,21,18,227,65,198,238,9,67,81,46,72,5,39,16,217,144,196,
-142,224,152,228,148,227,64,0,0,0,0,0,0,0,0,131,175,223,16,194,111,8,97,119,
-224,3,205,220,42,46,65,238,200,13,155,184,75,189,205,35,102,128,47,116,64,
-92,221,199,196,130,68,144,230,239,72,65,152,12,21,224,140,137,92,128,62,
-210,98,177,252,3,107,173,88,3,146,211,141,32,0,0,0,0,0,3,225,255,19,175,
-188,0,100,221,193,130,100,228,167,20,52,215,129,3,38,238,77,12,39,37,56,
-161,166,188,10,194,94,6,18,155,184,183,8,11,39,6,9,147,146,156,80,211,94,7,
-18,155,184,183,8,11,39,38,134,19,146,156,80,211,94,8,12,53,224,130,195,222,
-8,77,133,210,24,91,224,3,152,147,228,208,194,95,0,44,196,159,11,69,175,152,
-32,35,100,33,135,24,147,237,38,34,246,139,95,48,64,70,200,68,8,49,39,198,
-57,179,61,144,138,22,98,79,180,152,153,215,54,103,178,17,129,204,73,240,96,
-153,44,132,112,163,18,125,164,196,62,130,100,178,18,1,140,73,240,96,197,
-144,146,18,98,79,180,152,135,208,98,200,74,8,49,39,195,186,145,149,144,150,
-22,98,79,180,152,143,215,82,50,178,19,2,140,73,241,136,109,38,73,89,9,161,
-166,36,251,73,137,157,67,105,50,74,200,78,10,49,39,201,16,78,104,229,100,
-39,134,152,147,237,38,41,116,130,115,71,43,33,64,60,196,159,24,133,173,18,
-32,156,209,202,200,81,18,49,39,218,76,76,234,22,180,72,130,115,71,43,33,72,
-68,196,159,38,134,19,46,105,56,226,150,68,157,160,1,228,73,242,104,97,46,
-16,31,34,79,140,66,214,137,16,78,104,229,108,169,137,72,147,237,38,38,117,
-11,90,36,65,57,163,149,178,168,21,34,79,146,32,156,209,202,218,250,161,178,
-36,251,73,138,93,32,156,209,202,218,250,193,82,36,248,196,54,147,36,173,
-191,174,27,34,79,180,152,153,212,54,147,36,173,191,176,17,34,79,135,117,35,
-43,115,236,133,200,147,237,38,35,245,212,140,173,207,180,15,34,79,131,4,
-201,108,173,133,72,147,237,38,33,244,19,37,178,184,17,34,79,140,115,102,
-123,107,238,133,200,147,237,38,38,117,205,153,237,175,188,23,34,79,133,162,
-215,204,16,17,182,254,248,116,137,62,210,98,47,104,181,243,4,4,109,191,192,
-131,152,147,230,8,8,217,12,16,60,137,62,96,128,141,178,193,160,206,1,201,
-176,113,146,0,0,0,0,0,0,0,0,49,185,252,65,137,207,227,37,215,207,227,12,86,
-127,24,152,188,254,49,88,33,46,65,120,72,4,153,37,63,33,13,127,148,4,26,0,
-57,62,6,228,163,228,74,86,215,62,55,28,110,179,226,113,70,223,62,47,24,38,
-191,30,2,125,32,40,20,87,114,41,225,42,5,240,145,139,163,145,41,68,250,128,
-80,41,174,228,85,200,129,166,39,9,24,186,57,18,148,79,172,5,2,170,238,69,
-220,137,10,72,145,162,39,9,24,186,57,18,148,79,176,5,2,186,238,69,124,150,
-27,48,95,132,140,93,28,137,74,39,218,2,129,101,119,34,158,79,15,39,9,24,
-186,57,18,148,79,184,5,2,218,238,69,29,164,80,78,198,46,142,68,165,16,64,
-28,24,61,73,25,33,205,128,0,0,0,0,1,167,166,129,108,242,151,15,39,8,34,26,
-87,97,200,3,0,167,129,32,8,194,195,16,6,84,55,10,60,3,35,69,132,30,1,140,
-130,193,143,1,196,230,60,2,158,8,131,153,64,115,42,46,191,176,8,194,246,0,
-80,5,220,193,95,6,234,5,100,225,35,23,71,35,6,228,140,93,29,180,55,108,145,
-139,163,182,112,52,107,67,76,56,3,153,132,20,28,76,156,89,26,105,158,62,0,
-0,42,193,2,201,104,17,41,34,156,204,176,160,226,100,226,200,211,76,241,240,
-0,1,86,2,131,137,147,142,41,100,73,199,192,0,5,96,6,13,10,82,70,62,0,0,42,
-130,88,115,18,124,67,103,177,69,49,129,6,36,249,68,54,123,20,82,216,65,137,
-62,33,179,209,214,162,152,208,147,18,124,162,27,61,29,106,41,112,32,196,
-159,16,217,233,233,81,76,112,73,137,62,81,13,158,158,149,20,186,20,98,79,
-133,91,129,61,61,42,41,120,40,196,159,10,183,2,122,218,148,82,248,60,137,
-62,33,179,216,166,216,192,137,18,124,162,27,61,138,109,108,34,68,159,16,
-217,232,235,83,108,104,76,137,62,81,13,158,142,181,54,184,17,34,79,136,108,
-244,244,169,182,56,38,68,159,40,134,207,79,74,155,93,10,145,39,194,173,192,
-158,158,149,54,188,21,34,79,133,91,129,61,109,74,109,125,155,51,136,71,161,
-196,201,45,167,146,59,68,89,24,70,206,0,0,0,0,0,0,7,129,249,155,51,168,71,
-161,196,201,45,167,146,59,68,89,24,70,206,0,0,0,0,0,0,7,129,249,155,51,200,
-71,161,196,201,45,167,146,59,68,89,24,70,206,0,0,0,0,0,0,7,129,249,155,51,
-232,71,161,196,201,45,167,146,59,68,89,24,70,206,0,0,0,0,0,0,0,2,1,155,52,
-8,71,161,196,201,45,167,146,59,68,89,24,70,206,0,0,0,0,0,0,0,2,1,155,52,40,
-71,161,196,201,45,167,146,59,68,89,24,70,206,0,0,0,0,0,0,0,130,1,155,52,72,
-71,161,196,201,45,167,146,59,68,89,24,70,206,0,0,0,0,0,0,0,130,1,155,52,
-104,71,161,196,201,45,167,146,59,68,89,24,70,206,0,0,0,0,0,0,0,130,1,155,
-52,136,71,161,196,201,45,167,146,59,68,89,24,70,206,0,0,0,0,0,0,1,2,1,135,
-52,166,32,76,72,1,246,136,235,103,177,69,0,136,144,3,226,27,61,138,41,44,
-50,36,0,251,68,117,179,209,214,234,201,69,16,50,36,0,251,68,117,179,209,
-214,232,73,69,34,5,196,128,31,16,217,232,235,117,100,162,147,2,226,64,15,
-136,108,244,117,186,18,81,74,129,145,32,7,218,35,173,158,158,151,86,74,40,
-161,145,32,7,218,35,173,158,158,151,66,74,41,20,46,36,0,248,134,207,79,75,
-171,37,20,154,23,18,0,124,67,103,167,165,208,146,138,85,11,137,0,62,21,110,
-4,250,178,81,70,11,137,0,62,21,110,4,250,18,81,72,193,145,32,7,193,186,129,
-89,58,178,81,71,12,137,0,62,13,212,10,201,208,146,138,71,10,137,0,62,209,
-29,108,250,178,81,104,1,81,32,7,218,35,173,159,66,74,45,32,38,36,0,248,134,
-207,171,37,22,160,19,18,0,124,67,103,208,146,139,88,10,180,81,50,118,136,
-235,103,177,77,128,155,69,19,39,16,217,236,83,105,97,182,138,38,78,209,29,
-108,244,117,186,178,83,100,13,180,81,50,118,136,235,103,163,173,208,146,
-155,68,12,180,81,50,113,13,158,142,183,86,74,109,48,50,209,68,201,196,54,
-122,58,221,9,41,181,64,219,69,19,39,104,142,182,122,122,93,89,41,178,134,
-218,40,153,59,68,117,179,211,210,232,73,77,162,134,90,40,153,56,134,207,79,
-75,171,37,54,154,25,104,162,100,226,27,61,61,46,132,148,218,168,101,162,
-137,147,133,91,129,62,172,148,217,131,45,20,76,156,42,220,9,244,36,166,209,
-131,109,20,76,156,27,168,21,147,171,37,54,112,219,69,19,39,6,234,5,100,232,
-73,77,163,133,218,40,153,59,68,117,179,234,201,78,32,5,218,40,153,59,68,
-117,179,232,73,78,36,5,90,40,153,56,134,207,171,37,56,160,21,104,162,100,
-226,27,62,132,148,226,195,95,182,97,176,218,128,8,84,45,123,38,1,137,10,1,
-114,160,64,56,156,199,130,36,160,72,8,39,63,27,24,1,100,180,8,148,146,0,45,
-162,137,147,111,2,8,4,16,7,8,96,120,72,13,42,226,145,97,87,224,168,1,58,
-182,232,232,64,22,85,181,187,177,107,2,64,7,213,183,74,7,121,207,215,242,
-17,119,49,248,94,173,198,210,36,15,232,34,182,84,113,95,115,240,221,91,141,
-163,160,72,1,220,164,194,175,121,123,103,224,186,244,64,24,45,68,84,251,33,
-9,64,15,217,66,51,209,218,210,129,154,118,254,205,61,65,204,126,23,178,132,
-103,165,3,52,237,253,154,122,131,216,254,168,48,6,90,130,1,0,39,75,80,72,8,
-9,33,186,130,80,64,76,13,212,19,2,130,96,110,150,173,0,65,6,51,212,20,128,
-65,17,11,212,19,130,137,121,211,210,209,144,6,39,75,80,80,0,201,119,234,10,
-8,41,86,231,71,80,80,129,79,135,186,122,69,224,34,25,69,233,80,3,91,141,
-168,40,96,139,113,180,181,5,36,21,110,54,142,134,160,165,1,176,23,211,47,0,
-216,134,233,215,128,111,117,181,104,128,209,3,70,230,106,64,5,139,168,209,
-234,10,32,36,144,102,234,136,3,146,27,168,40,160,146,132,103,168,40,192,
-115,3,117,5,28,22,113,163,69,168,41,103,1,66,188,17,145,52,40,4,202,113,67,
-76,130,227,68,194,13,240,108,0,0,83,96,0,2,161,0,104,146,84,97,48,0,1,78,
-192,56,169,24,145,179,192,0,5,48,8,56,16,32,128,56,18,52,125,166,86,147,
-182,140,28,50,21,13,39,31,23,60,145,158,56,140,141,47,113,6,155,186,188,24,
-49,39,199,89,188,124,92,242,70,120,224,201,33,69,15,155,163,197,68,14,49,
-39,199,197,211,116,240,242,113,197,230,18,180,253,228,3,17,46,18,243,35,
-100,128,172,156,114,70,163,146,76,34,248,146,164,108,248,75,204,141,146,28,
-217,114,137,27,78,251,241,173,234,162,160,225,1,3,34,92,170,9,105,164,32,
-225,64,131,155,1,193,133,7,19,39,22,70,154,103,143,128,0,10,176,20,28,76,
-156,113,75,34,78,62,0,0,43,0,48,104,82,146,49,240,0,1,84,11,180,192,0,5,
-114,1,18,160,65,24,131,20,145,25,172,48,132,122,28,76,146,218,121,35,180,
-69,145,132,108,224,0,0,0,0,0,0,120,31,153,172,56,132,122,28,76,146,218,121,
-35,180,69,145,132,108,224,0,0,0,0,0,0,120,31,168,160,45,110,23,30,176,33,
-184,0,0,175,32,29,235,2,27,199,23,0,0,22,4,51,88,129,8,244,56,153,37,180,
-242,71,104,139,35,8,217,192,0,0,0,0,0,0,240,63,51,88,145,8,244,56,153,37,
-180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,0,64,51,88,161,8,244,56,153,37,
-180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,0,64,51,88,177,8,244,56,153,37,
-180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,16,64,51,88,193,8,244,56,153,
-37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,16,64,51,88,209,8,244,56,
-153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,16,64,51,88,225,8,244,
-56,153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,32,64,32,227,194,0,
-97,57,162,4,245,232,5,34,92,35,68,225,161,166,218,16,16,137,112,52,41,73,
-29,153,1,65,196,201,197,145,166,153,245,200,3,137,204,120,34,74,8,200,58,
-112,28,211,32,130,52,78,26,26,110,248,0,0,164,4,12,70,137,195,39,252,73,
-240,117,32,57,168,97,4,104,156,52,52,221,255,160,20,160,152,23,223,250,32,
-148,25,174,137,58,23,51,191,244,84,12,50,9,195,39,240,81,238,2,3,107,173,
-214,3,192,
+DUK_INTERNAL const duk_uint8_t duk_builtins_data[4281] = {
+144,148,105,226,32,68,52,228,254,12,104,202,37,132,52,167,194,138,105,245,
+124,57,28,211,57,18,64,52,239,126,44,138,111,175,241,164,19,87,145,30,33,
+167,22,145,159,8,211,139,9,225,42,5,240,145,139,163,163,8,211,139,10,228,
+64,211,19,132,140,93,29,56,70,156,88,119,34,66,146,36,104,137,194,70,46,
+142,172,35,78,44,47,146,195,102,11,240,145,139,163,175,8,211,139,9,228,240,
+242,112,145,139,163,179,8,211,139,8,237,34,130,118,49,116,118,225,26,48,0,
+1,98,29,201,158,46,183,39,135,147,132,140,93,16,132,76,66,33,8,66,16,132,
+33,8,66,26,180,105,97,167,68,150,34,33,154,112,0,1,91,247,35,79,111,237,
+198,174,232,47,31,23,95,17,13,31,249,96,211,49,50,53,214,77,141,24,0,0,181,
+10,228,240,242,15,128,140,65,128,134,188,0,0,90,167,97,181,224,0,2,213,62,
+53,224,0,2,213,66,237,120,0,0,181,81,204,107,192,0,5,170,150,67,94,0,0,45,
+84,245,90,240,0,1,106,169,162,215,128,0,11,85,93,150,188,0,0,90,171,111,53,
+109,22,162,26,48,0,1,84,23,201,146,243,225,26,39,12,145,136,104,192,0,5,61,
+11,228,201,121,240,100,19,134,72,196,33,195,14,40,203,112,64,190,76,232,
+145,153,136,0,0,0,0,0,0,31,15,249,152,0,0,0,0,0,0,30,15,249,120,144,13,96,
+155,194,56,80,206,36,67,141,20,228,70,57,81,206,100,131,156,39,132,168,23,
+194,70,46,137,208,21,200,129,166,39,9,24,186,39,72,119,34,66,146,36,104,
+137,194,70,46,137,212,23,201,97,179,5,248,72,197,209,58,194,121,60,60,156,
+36,98,232,157,129,29,164,80,78,198,46,137,218,146,121,25,71,146,9,209,5,
+209,61,48,126,14,138,152,30,67,186,23,143,139,175,131,202,135,228,72,85,
+144,83,60,179,30,94,209,233,102,30,98,105,230,103,30,114,121,231,104,30,
+122,137,231,233,30,130,153,232,106,30,138,169,232,235,30,144,67,193,25,19,
+136,108,207,30,41,224,140,137,194,173,192,153,228,5,242,100,188,248,70,137,
+195,36,79,78,47,147,37,231,193,144,78,25,34,122,145,111,36,74,232,176,13,
+17,61,234,226,93,207,148,160,84,75,141,7,27,161,32,33,18,225,80,212,76,154,
+2,2,70,65,56,100,237,34,140,209,2,67,32,156,50,118,145,64,186,230,61,205,
+35,103,155,32,36,141,19,134,78,210,40,206,16,36,70,137,195,39,105,20,11,
+174,99,220,210,54,121,210,1,137,33,1,228,207,16,17,70,146,66,3,201,164,32,
+0,65,112,152,56,196,159,31,23,77,211,195,201,199,23,160,72,214,246,81,6,12,
+73,241,214,111,31,23,60,145,158,56,50,72,81,67,230,232,242,80,19,49,39,199,
+89,188,124,92,242,70,120,227,64,194,75,154,72,12,9,73,6,111,21,120,12,40,
+144,19,39,25,0,225,144,168,105,56,248,185,228,140,241,200,96,64,100,42,26,
+78,62,46,121,35,52,18,92,116,1,36,64,47,158,64,49,98,66,100,156,242,65,23,
+196,149,35,103,194,94,100,108,144,230,203,156,64,66,37,201,16,11,32,249,
+132,4,34,92,44,93,146,55,152,72,24,137,112,151,153,27,36,5,100,229,144,8,
+162,98,92,210,5,76,73,241,214,111,31,23,60,145,158,57,44,48,46,92,185,164,
+160,72,151,41,0,50,107,179,244,59,36,93,127,92,6,19,172,3,11,216,0,56,224,
+151,29,102,241,241,115,201,25,227,164,64,106,37,199,197,211,116,240,242,
+113,197,233,144,40,248,185,228,140,241,196,75,132,109,24,72,128,43,39,84,
+129,13,173,161,144,168,105,56,98,78,100,142,214,215,69,1,13,173,161,144,
+168,105,57,34,78,100,142,214,215,69,16,67,107,105,110,114,168,254,24,147,
+153,35,181,181,212,32,67,107,105,110,114,168,254,72,147,153,35,181,181,212,
+36,65,130,3,144,8,26,252,200,13,30,85,16,16,64,90,242,231,192,64,161,163,
+203,31,26,172,193,17,4,23,105,159,96,27,172,251,16,32,196,4,14,137,112,17,
+136,48,164,28,134,80,215,202,1,132,130,8,12,39,52,64,155,31,24,56,36,1,189,
+207,132,0,35,233,35,195,62,3,196,149,36,100,72,160,2,200,232,44,227,0,11,
+37,160,68,142,128,36,157,25,200,32,26,79,90,4,73,43,192,122,54,71,65,103,
+44,248,14,134,140,151,227,138,231,208,45,96,148,248,134,140,151,227,138,
+231,240,1,255,254,10,74,146,56,128,104,4,147,152,72,6,144,28,174,143,8,1,
+30,1,165,3,96,31,0,211,3,21,11,153,35,0,211,131,68,131,160,137,16,250,5,
+196,131,160,137,200,160,199,156,67,248,0,255,255,65,140,10,48,177,115,56,
+35,130,60,19,134,79,89,240,52,177,115,56,39,12,156,123,144,217,251,15,135,
+34,167,30,20,170,154,255,232,12,47,244,0,97,28,17,224,39,238,32,40,71,4,
+120,39,12,156,4,253,228,5,137,195,39,30,228,54,124,4,253,228,128,194,115,
+68,9,252,15,128,232,104,201,126,56,191,35,64,90,193,41,241,13,25,47,199,23,
+228,105,3,86,225,1,100,224,156,199,130,36,249,144,10,192,76,71,250,16,15,
+18,61,96,17,62,200,3,72,128,136,143,247,32,22,75,64,137,248,64,22,79,90,39,
+249,64,38,84,12,167,20,52,223,196,2,230,238,45,214,36,120,32,72,158,208,4,
+102,238,45,194,2,201,197,186,196,143,4,9,19,218,0,92,221,202,61,228,143,4,
+9,19,218,8,35,55,113,110,16,22,78,81,239,36,120,32,72,158,208,64,73,197,12,
+255,0,13,18,60,128,159,212,128,169,76,17,156,185,100,76,255,163,64,65,26,
+57,114,200,153,255,70,144,33,13,18,232,50,75,226,104,6,149,3,41,199,246,
+130,12,128,28,142,156,120,203,175,158,8,194,207,1,6,81,20,79,88,11,237,84,
+11,161,32,127,255,255,255,255,255,247,191,137,235,16,221,170,129,116,36,0,
+16,0,0,0,0,0,0,12,196,0,0,0,0,0,0,15,135,242,61,123,164,137,162,164,218,67,
+74,134,162,120,128,0,0,0,0,0,1,224,254,71,173,33,129,52,84,155,72,105,80,
+212,79,16,0,0,0,0,0,0,60,63,195,244,143,146,22,230,192,0,0,0,0,0,0,176,60,
+33,214,2,251,82,1,73,180,134,204,134,36,96,127,255,255,255,255,255,159,161,
+144,235,16,221,169,0,164,218,67,102,67,18,48,63,255,255,255,255,255,207,
+240,196,60,17,145,56,134,204,241,226,158,8,200,156,42,220,9,158,65,196,34,
+92,42,26,137,147,120,64,74,37,196,54,100,49,35,188,36,5,68,184,208,113,187,
+194,80,212,75,146,1,73,196,54,100,49,35,188,38,57,37,56,240,0,0,0,0,0,0,0,
+0,32,235,248,68,48,156,2,24,94,24,0,243,119,10,139,144,123,242,3,102,238,
+18,239,115,72,217,160,11,223,16,23,55,113,241,32,145,36,57,188,18,16,102,3,
+5,120,35,34,89,32,15,180,152,173,127,0,218,235,88,0,228,180,227,200,0,0,0,
+0,0,0,248,127,197,107,240,64,6,77,220,24,38,78,74,113,67,77,130,4,12,155,
+185,52,48,156,148,226,134,155,4,10,194,96,129,132,166,238,45,194,2,201,193,
+130,100,228,167,20,52,216,32,113,41,187,139,112,128,178,114,104,97,57,41,
+197,13,54,8,32,48,216,32,130,195,224,130,19,97,124,134,23,6,0,57,137,62,77,
+12,38,12,0,179,18,124,45,22,190,96,128,141,176,134,28,98,79,180,152,139,
+218,45,124,193,1,27,97,16,32,196,159,24,230,204,246,194,40,89,137,62,210,
+98,103,92,217,158,216,70,7,49,39,193,130,100,182,17,194,140,73,246,147,16,
+250,9,146,216,72,6,49,39,193,131,22,194,72,73,137,62,210,98,31,65,139,97,
+40,32,196,159,14,234,70,86,194,88,89,137,62,210,98,63,93,72,202,216,76,10,
+49,39,198,33,180,153,37,108,38,134,152,147,237,38,38,117,13,164,201,43,97,
+56,40,196,159,36,65,57,163,149,176,158,26,98,79,180,152,165,210,9,205,28,
+173,133,0,243,18,124,98,22,180,72,130,115,71,43,97,68,72,196,159,105,49,51,
+168,90,209,34,9,205,28,173,133,33,19,18,124,154,24,76,185,164,227,138,89,
+18,119,0,7,145,39,201,161,132,188,64,124,137,62,49,11,90,36,65,57,163,149,
+210,166,37,34,79,180,152,153,212,45,104,145,4,230,142,87,74,160,84,137,62,
+72,130,115,71,43,171,234,134,200,147,237,38,41,116,130,115,71,43,171,235,5,
+72,147,227,16,218,76,146,186,254,184,108,137,62,210,98,103,80,218,76,146,
+186,254,192,68,137,62,29,212,140,174,207,178,23,34,79,180,152,143,215,82,
+50,187,62,208,60,137,62,12,19,37,210,182,21,34,79,180,152,135,208,76,151,
+74,224,68,137,62,49,205,153,238,175,186,23,34,79,180,152,153,215,54,103,
+186,190,240,92,137,62,22,139,95,48,64,70,235,251,225,210,36,251,73,136,189,
+162,215,204,16,17,186,255,2,14,98,79,152,32,35,108,48,64,242,36,249,130,2,
+55,75,6,212,224,72,200,51,128,114,108,28,100,128,0,0,0,0,0,0,0,12,110,127,
+48,98,115,249,201,117,243,249,195,21,159,206,38,47,63,156,86,8,75,144,94,
+82,1,38,73,79,208,67,95,233,1,6,128,14,79,129,186,40,249,18,149,182,207,
+144,200,155,188,248,204,105,184,207,142,199,137,175,201,0,159,72,10,5,21,
+221,10,120,74,129,124,36,98,232,228,74,81,62,160,20,10,107,186,21,114,32,
+105,137,194,70,46,142,68,165,19,235,1,64,170,187,161,119,34,66,146,36,104,
+137,194,70,46,142,68,165,19,236,1,64,174,187,161,95,37,134,204,23,225,35,
+23,71,34,82,137,246,128,160,89,93,208,167,147,195,201,194,70,46,142,68,165,
+19,238,1,64,182,187,161,71,105,20,19,177,139,163,145,41,68,16,7,6,15,82,70,
+72,115,96,0,0,0,0,0,27,234,32,91,60,165,195,201,194,8,134,149,216,162,0,
+192,41,225,8,2,48,177,36,1,149,13,196,15,0,200,209,97,199,128,99,32,176,
+195,192,113,57,143,0,167,133,32,230,80,28,202,139,175,238,2,48,189,192,20,
+1,119,80,87,193,186,129,89,56,72,197,209,200,193,185,35,23,71,109,13,219,
+36,98,232,237,156,13,26,208,211,14,102,19,87,137,91,95,128,0,10,96,24,92,0,
+0,83,2,53,56,0,0,165,3,28,204,160,160,226,100,226,200,211,76,241,240,0,1,
+102,8,22,75,64,137,73,20,230,105,133,7,19,39,22,70,154,103,143,128,0,11,48,
+20,28,76,156,113,75,34,78,62,0,0,45,3,103,31,0,0,22,65,44,57,137,62,33,179,
+216,162,152,192,131,18,124,162,27,61,138,41,108,32,196,159,16,217,232,235,
+81,76,104,73,137,62,81,13,158,142,181,20,184,16,98,79,136,108,244,244,168,
+166,56,36,196,159,40,134,207,79,74,138,93,10,49,39,194,173,192,158,158,149,
+20,188,20,98,79,133,91,129,61,109,74,41,124,30,68,159,16,217,236,83,108,96,
+68,137,62,81,13,158,197,54,182,17,34,79,136,108,244,117,169,182,52,38,68,
+159,40,134,207,71,90,155,92,8,145,39,196,54,122,122,84,219,28,19,34,79,148,
+67,103,167,165,77,174,133,72,147,225,86,224,79,79,74,155,94,10,145,39,194,
+173,192,158,182,165,54,190,206,25,212,35,208,226,100,150,211,201,29,162,44,
+140,35,103,0,0,0,0,0,0,3,192,252,206,25,228,35,208,226,100,150,211,201,29,
+162,44,140,35,103,0,0,0,0,0,0,3,192,252,206,25,244,35,208,226,100,150,211,
+201,29,162,44,140,35,103,0,0,0,0,0,0,3,192,252,206,26,4,35,208,226,100,150,
+211,201,29,162,44,140,35,103,0,0,0,0,0,0,0,1,0,206,26,20,35,208,226,100,
+150,211,201,29,162,44,140,35,103,0,0,0,0,0,0,0,1,0,206,26,36,35,208,226,
+100,150,211,201,29,162,44,140,35,103,0,0,0,0,0,0,0,65,0,206,26,52,35,208,
+226,100,150,211,201,29,162,44,140,35,103,0,0,0,0,0,0,0,65,0,206,26,68,35,
+208,226,100,150,211,201,29,162,44,140,35,103,0,0,0,0,0,0,0,65,0,206,26,84,
+35,208,226,100,150,211,201,29,162,44,140,35,103,0,0,0,0,0,0,0,129,0,195,
+154,99,16,38,36,0,251,68,117,179,216,162,128,68,72,1,241,13,158,197,20,150,
+25,18,0,125,162,58,217,232,235,117,100,162,136,25,18,0,125,162,58,217,232,
+235,116,36,162,145,2,226,64,15,136,108,244,117,186,178,81,73,129,113,32,7,
+196,54,122,58,221,9,40,165,64,200,144,3,237,17,214,207,79,75,171,37,20,80,
+200,144,3,237,17,214,207,79,75,161,37,20,138,23,18,0,124,67,103,167,165,
+213,146,138,77,11,137,0,62,33,179,211,210,232,73,69,42,133,196,128,31,10,
+183,2,125,89,40,163,5,196,128,31,10,183,2,125,9,40,164,96,200,144,3,224,
+221,64,172,157,89,40,163,134,68,128,31,6,234,5,100,232,73,69,35,133,68,128,
+31,104,142,182,125,89,40,180,0,168,144,3,237,17,214,207,161,37,22,144,19,
+18,0,124,67,103,213,146,139,80,9,137,0,62,33,179,232,73,69,172,5,90,40,153,
+59,68,117,179,216,166,192,77,162,137,147,136,108,246,41,180,176,219,69,19,
+39,104,142,182,122,58,221,89,41,178,6,218,40,153,59,68,117,179,209,214,232,
+73,77,162,6,90,40,153,56,134,207,71,91,171,37,54,152,25,104,162,100,226,27,
+61,29,110,132,148,218,160,109,162,137,147,180,71,91,61,61,46,172,148,217,
+67,109,20,76,157,162,58,217,233,233,116,36,166,209,67,45,20,76,156,67,103,
+167,165,213,146,155,77,12,180,81,50,113,13,158,158,151,66,74,109,84,50,209,
+68,201,194,173,192,159,86,74,108,193,150,138,38,78,21,110,4,250,18,83,104,
+193,182,138,38,78,13,212,10,201,213,146,155,56,109,162,137,147,131,117,2,
+178,116,36,166,209,194,237,20,76,157,162,58,217,245,100,167,16,2,237,20,76,
+157,162,58,217,244,36,167,18,2,173,20,76,156,67,103,213,146,156,80,10,180,
+81,50,113,13,159,66,74,113,97,175,221,48,216,110,64,4,42,22,189,179,0,196,
+133,0,185,80,32,28,78,99,193,18,80,36,4,19,159,141,172,0,178,90,4,74,73,0,
+22,209,68,201,187,129,4,2,8,3,132,64,60,36,6,149,113,72,176,171,240,84,0,
+157,91,116,116,32,11,42,218,221,216,181,129,32,3,234,219,165,3,188,231,235,
+249,8,187,152,252,47,86,227,105,18,7,244,17,91,42,56,175,185,248,110,173,
+198,209,208,36,0,238,82,97,87,188,189,179,240,93,122,32,12,22,162,42,125,
+144,132,160,7,236,161,25,232,237,105,64,205,59,127,102,158,160,230,63,11,
+217,66,51,210,129,154,118,254,205,61,65,236,127,171,197,34,168,48,6,90,194,
+1,0,39,75,88,72,8,9,33,186,194,80,64,76,13,214,19,2,130,96,110,150,189,0,
+65,6,51,214,20,128,65,17,11,214,19,130,137,121,211,210,211,144,6,39,75,88,
+80,0,201,119,235,10,8,41,86,231,71,88,80,129,79,135,186,122,133,224,34,25,
+69,234,80,3,91,141,172,40,96,139,113,180,181,133,36,21,110,54,142,134,176,
+165,1,176,23,213,47,0,216,134,234,215,128,111,117,181,232,128,209,3,70,230,
+107,64,5,139,168,209,235,10,32,36,144,102,235,136,3,146,27,172,40,160,146,
+132,103,172,40,192,115,3,117,133,28,22,113,163,69,172,41,103,1,66,188,17,
+145,52,168,4,202,113,67,76,130,227,76,194,13,240,108,0,0,83,224,0,2,193,0,
+104,146,84,97,48,0,1,94,192,56,169,24,145,179,192,0,5,112,8,56,16,32,128,
+56,18,52,125,230,86,147,190,140,28,50,21,13,39,31,23,60,145,158,57,12,141,
+47,129,6,155,194,188,24,49,39,199,89,188,124,92,242,70,120,224,201,33,69,
+15,155,163,201,68,14,49,39,199,197,211,116,240,242,113,197,232,18,180,254,
+36,3,17,46,18,243,35,100,128,172,156,178,70,163,154,76,34,248,146,164,108,
+248,75,204,141,146,28,217,115,137,27,95,27,241,173,236,162,160,224,200,2,
+206,9,113,13,148,192,209,18,22,164,146,37,193,57,162,4,249,39,196,128,24,2,
+178,66,213,136,68,201,16,77,209,131,31,192,242,88,96,92,191,151,34,100,136,
+38,232,255,252,92,221,199,197,12,68,209,82,66,212,11,155,185,41,197,13,55,
+38,3,66,213,47,135,254,72,12,162,99,133,116,112,0,1,72,66,14,16,16,50,37,
+202,160,150,154,66,14,20,8,57,192,28,24,80,113,50,113,100,105,166,120,248,
+0,0,179,1,65,196,201,199,20,178,36,227,224,0,2,208,54,113,240,0,1,100,11,
+181,192,0,5,178,1,18,160,65,24,131,20,145,25,188,48,132,122,28,76,146,218,
+121,35,180,69,145,132,108,224,0,0,0,0,0,0,120,31,153,188,56,132,122,28,76,
+146,218,121,35,180,69,145,132,108,224,0,0,0,0,0,0,120,31,168,160,45,110,23,
+30,176,33,184,0,0,183,32,29,235,2,27,199,23,0,0,23,4,51,120,129,8,244,56,
+153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,240,63,51,120,145,8,244,
+56,153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,0,64,51,120,161,8,
+244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,0,64,51,120,177,
+8,244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,16,64,51,120,
+193,8,244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,16,64,51,
+120,209,8,244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,16,64,
+51,120,225,8,244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,32,
+64,32,227,194,0,97,57,162,4,246,104,5,34,92,35,68,225,161,166,220,16,16,
+137,112,52,41,73,29,185,1,65,196,201,197,145,166,153,246,72,3,137,204,120,
+34,74,8,199,1,67,17,162,112,201,84,128,97,144,78,25,42,16,131,169,1,205,66,
+8,35,68,225,161,166,239,128,0,10,192,64,196,104,156,50,96,0,2,172,73,240,
+117,96,57,170,97,4,104,156,52,52,221,240,0,1,82,1,74,9,129,125,240,0,1,82,
+32,148,25,174,137,58,23,51,190,0,0,42,69,64,195,32,156,50,96,0,2,160,81,
+238,2,3,107,173,218,3,192,
 };
 #elif defined(DUK_USE_DOUBLE_BE)
-DUK_INTERNAL const duk_uint8_t duk_builtins_data[4116] = {
-144,148,105,224,32,68,52,228,62,12,104,200,165,132,52,167,194,138,105,243,
-124,57,28,211,57,18,64,52,238,126,44,138,111,171,241,164,19,87,129,30,33,
-167,16,145,159,8,211,136,9,225,42,5,240,145,139,163,163,8,211,136,10,228,
-64,211,19,132,140,93,29,56,70,156,64,119,34,66,146,36,104,137,194,70,46,
-142,172,35,78,32,47,146,195,102,11,240,145,139,163,175,8,211,136,9,228,240,
-242,112,145,139,163,179,8,211,136,8,237,34,130,118,49,116,118,225,26,48,0,
-1,82,29,201,158,46,183,39,135,147,132,140,93,16,132,76,66,33,8,66,16,132,
-33,8,66,26,179,233,97,167,60,150,34,33,154,112,0,1,75,247,35,79,95,237,198,
-174,200,47,31,23,95,17,13,51,19,35,93,68,216,209,128,0,10,208,174,79,15,32,
-248,8,196,24,8,107,192,0,5,106,118,27,94,0,0,43,83,227,94,0,0,43,84,46,215,
-128,0,10,213,28,198,188,0,0,86,169,100,53,224,0,2,181,79,85,175,0,0,21,170,
-154,45,120,0,0,173,85,217,107,192,0,5,106,182,243,86,193,106,52,127,130,
-249,50,94,124,35,68,225,146,49,13,31,186,23,201,146,243,224,200,39,12,145,
-136,67,134,19,49,1,255,224,0,0,0,0,0,3,51,1,255,192,0,0,0,0,0,3,47,18,1,
-172,19,120,71,10,25,196,136,113,162,156,136,199,42,57,204,144,115,132,240,
-149,2,248,72,197,209,58,2,185,16,52,196,225,35,23,68,233,14,228,72,82,68,
-141,17,56,72,197,209,58,130,249,44,54,96,191,9,24,186,39,88,79,39,135,147,
-132,140,93,19,176,35,180,138,9,216,197,209,59,82,79,35,40,242,65,248,58,42,
-96,121,14,232,94,62,46,190,15,42,31,145,33,86,65,76,242,214,143,73,48,242,
-243,79,49,56,243,115,207,57,64,243,180,79,61,72,243,244,207,65,80,244,53,
-79,69,88,244,98,30,8,200,156,67,102,120,241,79,4,100,78,21,110,4,207,32,47,
-147,37,231,194,52,78,25,34,122,81,124,153,47,62,12,130,112,201,19,211,139,
-121,34,87,69,128,104,137,239,83,18,238,108,165,2,162,92,104,56,220,233,1,8,
-151,10,134,162,100,206,16,18,50,9,195,39,105,20,101,136,18,25,4,225,147,
-180,138,5,215,49,238,105,27,60,185,1,36,104,156,50,118,145,70,96,129,34,52,
-78,25,59,72,160,93,115,30,230,145,179,204,144,12,73,8,15,38,104,128,138,52,
-146,16,30,77,1,0,2,11,132,193,198,36,248,248,186,110,158,30,78,56,188,194,
-70,183,170,136,48,98,79,142,179,120,248,185,228,140,241,193,146,66,138,31,
-55,71,138,128,153,137,62,58,205,227,226,231,146,51,199,26,6,18,92,146,64,
-96,74,72,51,120,43,192,97,68,128,153,56,72,7,12,133,67,73,199,197,207,36,
-103,142,35,2,3,33,80,210,113,241,115,201,25,160,146,225,160,9,34,1,124,178,
-1,139,18,19,36,229,146,8,190,36,169,27,62,18,243,35,100,135,54,92,162,2,17,
-46,72,128,89,7,200,32,33,18,225,98,236,145,188,130,64,196,75,132,188,200,
-217,32,43,39,28,128,69,19,18,228,144,42,98,79,142,179,120,248,185,228,140,
-241,201,97,129,114,229,201,37,2,68,184,200,1,147,93,159,153,213,34,235,250,
-96,48,157,32,24,94,160,1,199,4,184,235,55,143,139,158,72,207,28,226,3,81,
-46,62,46,155,167,135,147,142,47,60,129,71,197,207,36,103,142,34,92,35,104,
-194,68,1,89,58,36,8,109,109,12,133,67,73,195,18,115,36,118,182,185,168,8,
-109,109,12,133,67,73,201,18,115,36,118,182,185,168,130,27,91,75,115,149,71,
-240,196,156,201,29,173,174,129,2,27,91,75,115,149,71,242,68,156,201,29,173,
-174,129,34,12,16,28,128,62,191,42,3,71,146,68,4,16,22,188,161,240,16,40,
-104,242,103,196,16,93,158,125,96,110,115,235,64,131,16,16,58,37,192,70,32,
-194,144,114,25,67,95,40,6,18,8,32,48,156,209,2,108,124,96,224,144,6,247,62,
-16,0,143,164,143,12,248,15,18,84,145,145,34,128,11,35,160,179,140,0,44,150,
-129,18,58,0,146,116,103,32,128,105,61,104,17,36,175,1,232,217,29,5,156,179,
-224,58,26,50,95,142,43,159,64,181,130,83,226,26,50,95,142,43,159,192,7,255,
-248,41,42,72,226,1,160,18,78,97,32,26,64,114,186,60,32,4,120,6,148,13,128,
-124,3,76,12,84,46,100,140,3,78,13,18,14,130,36,67,232,23,18,14,130,39,34,
-131,30,113,15,224,3,255,253,6,48,40,194,197,204,224,142,8,240,78,25,60,231,
-192,210,197,204,224,156,50,113,238,67,103,232,62,28,138,156,104,82,170,107,
-255,32,48,191,144,1,132,112,71,128,159,168,128,161,28,17,224,156,50,112,19,
-245,144,22,39,12,156,123,144,217,240,19,245,146,3,9,205,16,39,236,62,3,161,
-163,37,248,226,251,141,1,107,4,167,196,52,100,191,28,95,113,164,13,91,132,
-5,147,130,115,30,8,147,222,64,43,1,49,31,224,64,60,72,245,128,68,249,32,13,
-34,2,34,63,204,128,89,45,2,39,209,0,89,61,104,159,213,0,153,80,50,156,80,
-211,126,16,11,155,184,183,88,145,224,129,34,122,64,17,155,184,183,8,11,39,
-22,235,18,60,16,36,79,72,1,115,119,40,247,146,60,16,36,79,72,32,140,221,
-197,184,64,89,57,71,188,145,224,129,34,122,65,1,39,20,51,244,0,52,72,242,2,
-127,18,2,165,48,70,114,229,145,51,253,141,1,4,104,229,203,34,103,251,26,64,
-132,52,75,160,201,47,105,160,26,84,12,167,31,186,8,50,0,114,58,113,163,46,
-190,120,35,11,60,4,25,68,81,61,96,47,181,80,46,132,128,255,223,255,255,255,
-255,255,254,39,172,67,118,170,5,208,144,0,0,0,0,0,0,0,0,115,16,31,254,0,0,
-0,0,0,0,8,245,238,146,38,138,147,105,13,42,26,137,226,3,255,128,0,0,0,0,0,
-1,30,180,134,4,209,82,109,33,165,67,81,60,64,255,240,0,0,0,0,0,0,15,210,62,
-72,91,155,0,242,192,0,0,0,0,0,0,135,88,11,237,72,5,38,210,27,50,24,145,128,
-134,127,255,255,255,255,255,254,67,172,67,118,164,2,147,105,13,153,12,72,
-192,195,63,255,255,255,255,255,255,16,240,70,68,226,27,51,199,138,120,35,
-34,112,171,112,38,121,7,16,137,112,168,106,38,77,193,1,40,151,16,217,144,
-196,142,224,144,21,18,227,65,198,238,9,67,81,46,72,5,39,16,217,144,196,142,
-224,152,228,148,227,64,0,0,0,0,0,0,0,0,131,175,223,16,194,111,8,97,119,224,
-3,205,220,42,46,65,238,200,13,155,184,75,189,205,35,102,128,47,116,64,92,
-221,199,196,130,68,144,230,239,72,65,152,12,21,224,140,137,92,128,62,210,
-98,177,252,3,107,173,88,3,146,211,141,33,255,224,0,0,0,0,0,3,19,175,188,0,
-100,221,193,130,100,228,167,20,52,215,129,3,38,238,77,12,39,37,56,161,166,
-188,10,194,94,6,18,155,184,183,8,11,39,6,9,147,146,156,80,211,94,7,18,155,
-184,183,8,11,39,38,134,19,146,156,80,211,94,8,12,53,224,130,195,222,8,77,
-133,210,24,91,224,3,152,147,228,208,194,95,0,44,196,159,11,69,175,152,32,
-35,100,33,135,24,147,237,38,34,246,139,95,48,64,70,200,68,8,49,39,198,57,
-179,61,144,138,22,98,79,180,152,153,215,54,103,178,17,129,204,73,240,96,
-153,44,132,112,163,18,125,164,196,62,130,100,178,18,1,140,73,240,96,197,
-144,146,18,98,79,180,152,135,208,98,200,74,8,49,39,195,186,145,149,144,150,
-22,98,79,180,152,143,215,82,50,178,19,2,140,73,241,136,109,38,73,89,9,161,
-166,36,251,73,137,157,67,105,50,74,200,78,10,49,39,201,16,78,104,229,100,
-39,134,152,147,237,38,41,116,130,115,71,43,33,64,60,196,159,24,133,173,18,
-32,156,209,202,200,81,18,49,39,218,76,76,234,22,180,72,130,115,71,43,33,72,
-68,196,159,38,134,19,46,105,56,226,150,68,157,160,1,228,73,242,104,97,46,
-16,31,34,79,140,66,214,137,16,78,104,229,108,169,137,72,147,237,38,38,117,
-11,90,36,65,57,163,149,178,168,21,34,79,146,32,156,209,202,218,250,161,178,
-36,251,73,138,93,32,156,209,202,218,250,193,82,36,248,196,54,147,36,173,
-191,174,27,34,79,180,152,153,212,54,147,36,173,191,176,17,34,79,135,117,35,
-43,115,236,133,200,147,237,38,35,245,212,140,173,207,180,15,34,79,131,4,
-201,108,173,133,72,147,237,38,33,244,19,37,178,184,17,34,79,140,115,102,
-123,107,238,133,200,147,237,38,38,117,205,153,237,175,188,23,34,79,133,162,
-215,204,16,17,182,254,248,116,137,62,210,98,47,104,181,243,4,4,109,191,192,
-131,152,147,230,8,8,217,12,16,60,137,62,96,128,141,178,193,160,206,1,201,
-176,113,146,0,0,0,0,0,0,0,0,49,185,252,65,137,207,227,37,215,207,227,12,86,
-127,24,152,188,254,49,88,33,46,65,120,72,4,153,37,63,33,13,127,148,4,26,0,
-57,62,6,228,163,228,74,86,215,62,55,28,110,179,226,113,70,223,62,47,24,38,
-191,30,2,125,32,40,20,87,114,41,225,42,5,240,145,139,163,145,41,68,250,128,
-80,41,174,228,85,200,129,166,39,9,24,186,57,18,148,79,172,5,2,170,238,69,
-220,137,10,72,145,162,39,9,24,186,57,18,148,79,176,5,2,186,238,69,124,150,
-27,48,95,132,140,93,28,137,74,39,218,2,129,101,119,34,158,79,15,39,9,24,
-186,57,18,148,79,184,5,2,218,238,69,29,164,80,78,198,46,142,68,165,16,64,
-28,24,61,73,25,33,205,128,129,167,166,0,0,0,0,1,108,242,151,15,39,8,34,26,
-87,97,200,3,0,167,129,32,8,194,195,16,6,84,55,10,60,3,35,69,132,30,1,140,
-130,193,143,1,196,230,60,2,158,8,131,153,64,115,42,46,191,176,8,194,246,0,
-80,5,220,193,95,6,234,5,100,225,35,23,71,35,6,228,140,93,29,180,55,108,145,
-139,163,182,112,52,107,67,76,56,3,153,132,20,28,76,156,89,26,105,158,62,0,
-0,42,193,2,201,104,17,41,34,156,204,176,160,226,100,226,200,211,76,241,240,
-0,1,86,2,131,137,147,142,41,100,73,199,192,0,5,96,6,13,10,82,70,62,0,0,42,
-130,88,115,18,124,67,103,177,69,49,129,6,36,249,68,54,123,20,82,216,65,137,
-62,33,179,209,214,162,152,208,147,18,124,162,27,61,29,106,41,112,32,196,
-159,16,217,233,233,81,76,112,73,137,62,81,13,158,158,149,20,186,20,98,79,
-133,91,129,61,61,42,41,120,40,196,159,10,183,2,122,218,148,82,248,60,137,
-62,33,179,216,166,216,192,137,18,124,162,27,61,138,109,108,34,68,159,16,
-217,232,235,83,108,104,76,137,62,81,13,158,142,181,54,184,17,34,79,136,108,
-244,244,169,182,56,38,68,159,40,134,207,79,74,155,93,10,145,39,194,173,192,
-158,158,149,54,188,21,34,79,133,91,129,61,109,74,109,125,155,51,136,71,161,
-196,201,45,167,146,59,68,89,24,70,206,1,255,128,0,0,0,0,0,1,155,51,168,71,
-161,196,201,45,167,146,59,68,89,24,70,206,1,255,128,0,0,0,0,0,1,155,51,200,
-71,161,196,201,45,167,146,59,68,89,24,70,206,1,255,128,0,0,0,0,0,1,155,51,
-232,71,161,196,201,45,167,146,59,68,89,24,70,206,2,0,0,0,0,0,0,0,1,155,52,
-8,71,161,196,201,45,167,146,59,68,89,24,70,206,2,0,0,0,0,0,0,0,1,155,52,40,
-71,161,196,201,45,167,146,59,68,89,24,70,206,2,0,128,0,0,0,0,0,1,155,52,72,
-71,161,196,201,45,167,146,59,68,89,24,70,206,2,0,128,0,0,0,0,0,1,155,52,
-104,71,161,196,201,45,167,146,59,68,89,24,70,206,2,0,128,0,0,0,0,0,1,155,
-52,136,71,161,196,201,45,167,146,59,68,89,24,70,206,2,1,0,0,0,0,0,0,1,135,
-52,166,32,76,72,1,246,136,235,103,177,69,0,136,144,3,226,27,61,138,41,44,
-50,36,0,251,68,117,179,209,214,234,201,69,16,50,36,0,251,68,117,179,209,
-214,232,73,69,34,5,196,128,31,16,217,232,235,117,100,162,147,2,226,64,15,
-136,108,244,117,186,18,81,74,129,145,32,7,218,35,173,158,158,151,86,74,40,
-161,145,32,7,218,35,173,158,158,151,66,74,41,20,46,36,0,248,134,207,79,75,
-171,37,20,154,23,18,0,124,67,103,167,165,208,146,138,85,11,137,0,62,21,110,
-4,250,178,81,70,11,137,0,62,21,110,4,250,18,81,72,193,145,32,7,193,186,129,
-89,58,178,81,71,12,137,0,62,13,212,10,201,208,146,138,71,10,137,0,62,209,
-29,108,250,178,81,104,1,81,32,7,218,35,173,159,66,74,45,32,38,36,0,248,134,
-207,171,37,22,160,19,18,0,124,67,103,208,146,139,88,10,180,81,50,118,136,
-235,103,177,77,128,155,69,19,39,16,217,236,83,105,97,182,138,38,78,209,29,
-108,244,117,186,178,83,100,13,180,81,50,118,136,235,103,163,173,208,146,
-155,68,12,180,81,50,113,13,158,142,183,86,74,109,48,50,209,68,201,196,54,
-122,58,221,9,41,181,64,219,69,19,39,104,142,182,122,122,93,89,41,178,134,
-218,40,153,59,68,117,179,211,210,232,73,77,162,134,90,40,153,56,134,207,79,
-75,171,37,54,154,25,104,162,100,226,27,61,61,46,132,148,218,168,101,162,
-137,147,133,91,129,62,172,148,217,131,45,20,76,156,42,220,9,244,36,166,209,
-131,109,20,76,156,27,168,21,147,171,37,54,112,219,69,19,39,6,234,5,100,232,
-73,77,163,133,218,40,153,59,68,117,179,234,201,78,32,5,218,40,153,59,68,
-117,179,232,73,78,36,5,90,40,153,56,134,207,171,37,56,160,21,104,162,100,
-226,27,62,132,148,226,195,95,182,97,176,218,128,8,84,45,123,38,1,137,10,1,
-114,160,64,56,156,199,130,36,160,72,8,39,63,27,24,1,100,180,8,148,146,0,45,
-162,137,147,111,2,8,4,16,7,8,96,120,72,8,0,183,225,81,98,138,237,33,58,182,
-232,232,64,64,2,107,177,187,181,85,22,7,213,183,74,1,255,49,114,23,247,209,
-207,120,94,173,198,210,36,3,255,113,84,118,82,184,47,224,221,91,141,163,
-160,72,7,251,121,111,98,164,220,161,192,186,244,64,64,9,33,251,84,68,45,24,
-15,217,66,51,209,218,210,128,127,205,65,60,204,254,119,154,23,178,132,103,
-165,0,255,218,130,121,153,252,239,54,168,48,6,90,130,1,0,39,75,80,72,8,9,
-33,186,130,80,64,76,13,212,19,2,130,96,110,150,173,0,65,6,51,212,20,128,65,
-17,11,212,19,130,137,121,211,210,209,144,6,39,75,80,80,0,201,119,234,10,8,
-41,86,231,71,80,80,129,79,135,186,122,69,224,34,25,69,233,80,3,91,141,168,
-40,96,139,113,180,181,5,36,21,110,54,142,134,160,165,1,176,23,211,47,0,216,
-134,233,215,128,111,117,181,104,128,209,3,70,230,106,64,5,139,168,209,234,
-10,32,36,144,102,234,136,3,146,27,168,40,160,146,132,103,168,40,192,115,3,
-117,5,28,22,113,163,69,168,41,103,1,66,188,17,145,52,40,4,202,113,67,76,
-130,227,68,194,13,240,108,0,0,83,96,0,2,161,0,104,146,84,97,48,0,1,78,192,
-56,169,24,145,179,192,0,5,48,8,56,16,32,128,56,18,52,125,166,86,147,182,
-140,28,50,21,13,39,31,23,60,145,158,56,140,141,47,113,6,155,186,188,24,49,
-39,199,89,188,124,92,242,70,120,224,201,33,69,15,155,163,197,68,14,49,39,
-199,197,211,116,240,242,113,197,230,18,180,253,228,3,17,46,18,243,35,100,
-128,172,156,114,70,163,146,76,34,248,146,164,108,248,75,204,141,146,28,217,
-114,137,27,78,251,241,173,234,162,160,225,1,3,34,92,170,9,105,164,32,225,
-64,131,155,1,193,133,7,19,39,22,70,154,103,143,128,0,10,176,20,28,76,156,
-113,75,34,78,62,0,0,43,0,48,104,82,146,49,240,0,1,84,11,180,192,0,5,114,1,
-18,160,65,24,131,20,145,25,172,48,132,122,28,76,146,218,121,35,180,69,145,
-132,108,224,31,248,0,0,0,0,0,0,25,172,56,132,122,28,76,146,218,121,35,180,
-69,145,132,108,224,31,248,0,0,0,0,0,0,40,160,45,110,23,30,176,33,184,0,0,
-175,32,29,235,2,27,199,23,0,0,22,4,51,88,129,8,244,56,153,37,180,242,71,
-104,139,35,8,217,192,63,240,0,0,0,0,0,0,51,88,145,8,244,56,153,37,180,242,
-71,104,139,35,8,217,192,64,0,0,0,0,0,0,0,51,88,161,8,244,56,153,37,180,242,
-71,104,139,35,8,217,192,64,0,0,0,0,0,0,0,51,88,177,8,244,56,153,37,180,242,
-71,104,139,35,8,217,192,64,16,0,0,0,0,0,0,51,88,193,8,244,56,153,37,180,
-242,71,104,139,35,8,217,192,64,16,0,0,0,0,0,0,51,88,209,8,244,56,153,37,
-180,242,71,104,139,35,8,217,192,64,16,0,0,0,0,0,0,51,88,225,8,244,56,153,
-37,180,242,71,104,139,35,8,217,192,64,32,0,0,0,0,0,0,32,227,194,0,97,57,
-162,4,245,232,5,34,92,35,68,225,161,166,218,16,16,137,112,52,41,73,29,153,
-1,65,196,201,197,145,166,153,245,200,3,137,204,120,34,74,8,200,58,112,28,
-211,32,130,52,78,26,26,110,248,0,0,164,4,12,70,137,195,39,252,73,240,117,
-32,57,168,97,4,104,156,52,52,221,255,160,20,160,152,23,223,250,32,148,25,
-174,137,58,23,51,191,244,84,12,50,9,195,39,240,81,238,2,3,107,173,214,3,
-192,
+DUK_INTERNAL const duk_uint8_t duk_builtins_data[4281] = {
+144,148,105,226,32,68,52,228,254,12,104,202,37,132,52,167,194,138,105,245,
+124,57,28,211,57,18,64,52,239,126,44,138,111,175,241,164,19,87,145,30,33,
+167,22,145,159,8,211,139,9,225,42,5,240,145,139,163,163,8,211,139,10,228,
+64,211,19,132,140,93,29,56,70,156,88,119,34,66,146,36,104,137,194,70,46,
+142,172,35,78,44,47,146,195,102,11,240,145,139,163,175,8,211,139,9,228,240,
+242,112,145,139,163,179,8,211,139,8,237,34,130,118,49,116,118,225,26,48,0,
+1,98,29,201,158,46,183,39,135,147,132,140,93,16,132,76,66,33,8,66,16,132,
+33,8,66,26,180,105,97,167,68,150,34,33,154,112,0,1,91,247,35,79,111,237,
+198,174,232,47,31,23,95,17,13,31,249,96,211,49,50,53,214,77,141,24,0,0,181,
+10,228,240,242,15,128,140,65,128,134,188,0,0,90,167,97,181,224,0,2,213,62,
+53,224,0,2,213,66,237,120,0,0,181,81,204,107,192,0,5,170,150,67,94,0,0,45,
+84,245,90,240,0,1,106,169,162,215,128,0,11,85,93,150,188,0,0,90,171,111,53,
+109,22,162,26,48,0,1,84,23,201,146,243,225,26,39,12,145,136,104,192,0,5,61,
+11,228,201,121,240,100,19,134,72,196,33,195,14,40,203,112,64,190,76,232,
+145,153,136,15,255,0,0,0,0,0,0,25,152,15,254,0,0,0,0,0,0,25,120,144,13,96,
+155,194,56,80,206,36,67,141,20,228,70,57,81,206,100,131,156,39,132,168,23,
+194,70,46,137,208,21,200,129,166,39,9,24,186,39,72,119,34,66,146,36,104,
+137,194,70,46,137,212,23,201,97,179,5,248,72,197,209,58,194,121,60,60,156,
+36,98,232,157,129,29,164,80,78,198,46,137,218,146,121,25,71,146,9,209,5,
+209,61,48,126,14,138,152,30,67,186,23,143,139,175,131,202,135,228,72,85,
+144,83,60,179,30,94,209,233,102,30,98,105,230,103,30,114,121,231,104,30,
+122,137,231,233,30,130,153,232,106,30,138,169,232,235,30,144,67,193,25,19,
+136,108,207,30,41,224,140,137,194,173,192,153,228,5,242,100,188,248,70,137,
+195,36,79,78,47,147,37,231,193,144,78,25,34,122,145,111,36,74,232,176,13,
+17,61,234,226,93,207,148,160,84,75,141,7,27,161,32,33,18,225,80,212,76,154,
+2,2,70,65,56,100,237,34,140,209,2,67,32,156,50,118,145,64,186,230,61,205,
+35,103,155,32,36,141,19,134,78,210,40,206,16,36,70,137,195,39,105,20,11,
+174,99,220,210,54,121,210,1,137,33,1,228,207,16,17,70,146,66,3,201,164,32,
+0,65,112,152,56,196,159,31,23,77,211,195,201,199,23,160,72,214,246,81,6,12,
+73,241,214,111,31,23,60,145,158,56,50,72,81,67,230,232,242,80,19,49,39,199,
+89,188,124,92,242,70,120,227,64,194,75,154,72,12,9,73,6,111,21,120,12,40,
+144,19,39,25,0,225,144,168,105,56,248,185,228,140,241,200,96,64,100,42,26,
+78,62,46,121,35,52,18,92,116,1,36,64,47,158,64,49,98,66,100,156,242,65,23,
+196,149,35,103,194,94,100,108,144,230,203,156,64,66,37,201,16,11,32,249,
+132,4,34,92,44,93,146,55,152,72,24,137,112,151,153,27,36,5,100,229,144,8,
+162,98,92,210,5,76,73,241,214,111,31,23,60,145,158,57,44,48,46,92,185,164,
+160,72,151,41,0,50,107,179,244,59,36,93,127,92,6,19,172,3,11,216,0,56,224,
+151,29,102,241,241,115,201,25,227,164,64,106,37,199,197,211,116,240,242,
+113,197,233,144,40,248,185,228,140,241,196,75,132,109,24,72,128,43,39,84,
+129,13,173,161,144,168,105,56,98,78,100,142,214,215,69,1,13,173,161,144,
+168,105,57,34,78,100,142,214,215,69,16,67,107,105,110,114,168,254,24,147,
+153,35,181,181,212,32,67,107,105,110,114,168,254,72,147,153,35,181,181,212,
+36,65,130,3,144,8,26,252,200,13,30,85,16,16,64,90,242,231,192,64,161,163,
+203,31,26,172,193,17,4,23,105,159,96,27,172,251,16,32,196,4,14,137,112,17,
+136,48,164,28,134,80,215,202,1,132,130,8,12,39,52,64,155,31,24,56,36,1,189,
+207,132,0,35,233,35,195,62,3,196,149,36,100,72,160,2,200,232,44,227,0,11,
+37,160,68,142,128,36,157,25,200,32,26,79,90,4,73,43,192,122,54,71,65,103,
+44,248,14,134,140,151,227,138,231,208,45,96,148,248,134,140,151,227,138,
+231,240,1,255,254,10,74,146,56,128,104,4,147,152,72,6,144,28,174,143,8,1,
+30,1,165,3,96,31,0,211,3,21,11,153,35,0,211,131,68,131,160,137,16,250,5,
+196,131,160,137,200,160,199,156,67,248,0,255,255,65,140,10,48,177,115,56,
+35,130,60,19,134,79,89,240,52,177,115,56,39,12,156,123,144,217,251,15,135,
+34,167,30,20,170,154,255,232,12,47,244,0,97,28,17,224,39,238,32,40,71,4,
+120,39,12,156,4,253,228,5,137,195,39,30,228,54,124,4,253,228,128,194,115,
+68,9,252,15,128,232,104,201,126,56,191,35,64,90,193,41,241,13,25,47,199,23,
+228,105,3,86,225,1,100,224,156,199,130,36,249,144,10,192,76,71,250,16,15,
+18,61,96,17,62,200,3,72,128,136,143,247,32,22,75,64,137,248,64,22,79,90,39,
+249,64,38,84,12,167,20,52,223,196,2,230,238,45,214,36,120,32,72,158,208,4,
+102,238,45,194,2,201,197,186,196,143,4,9,19,218,0,92,221,202,61,228,143,4,
+9,19,218,8,35,55,113,110,16,22,78,81,239,36,120,32,72,158,208,64,73,197,12,
+255,0,13,18,60,128,159,212,128,169,76,17,156,185,100,76,255,163,64,65,26,
+57,114,200,153,255,70,144,33,13,18,232,50,75,226,104,6,149,3,41,199,246,
+130,12,128,28,142,156,120,203,175,158,8,194,207,1,6,81,20,79,88,11,237,84,
+11,161,32,63,247,255,255,255,255,255,255,137,235,16,221,170,129,116,36,0,0,
+0,0,0,0,0,0,28,196,7,255,128,0,0,0,0,0,2,61,123,164,137,162,164,218,67,74,
+134,162,120,128,255,224,0,0,0,0,0,0,71,173,33,129,52,84,155,72,105,80,212,
+79,16,63,252,0,0,0,0,0,0,3,244,143,146,22,230,192,60,176,0,0,0,0,0,0,33,
+214,2,251,82,1,73,180,134,204,134,36,96,33,159,255,255,255,255,255,255,144,
+235,16,221,169,0,164,218,67,102,67,18,48,48,207,255,255,255,255,255,255,
+196,60,17,145,56,134,204,241,226,158,8,200,156,42,220,9,158,65,196,34,92,
+42,26,137,147,120,64,74,37,196,54,100,49,35,188,36,5,68,184,208,113,187,
+194,80,212,75,146,1,73,196,54,100,49,35,188,38,57,37,56,240,0,0,0,0,0,0,0,
+0,32,235,248,68,48,156,2,24,94,24,0,243,119,10,139,144,123,242,3,102,238,
+18,239,115,72,217,160,11,223,16,23,55,113,241,32,145,36,57,188,18,16,102,3,
+5,120,35,34,89,32,15,180,152,173,127,0,218,235,88,0,228,180,227,200,127,
+248,0,0,0,0,0,0,197,107,240,64,6,77,220,24,38,78,74,113,67,77,130,4,12,155,
+185,52,48,156,148,226,134,155,4,10,194,96,129,132,166,238,45,194,2,201,193,
+130,100,228,167,20,52,216,32,113,41,187,139,112,128,178,114,104,97,57,41,
+197,13,54,8,32,48,216,32,130,195,224,130,19,97,124,134,23,6,0,57,137,62,77,
+12,38,12,0,179,18,124,45,22,190,96,128,141,176,134,28,98,79,180,152,139,
+218,45,124,193,1,27,97,16,32,196,159,24,230,204,246,194,40,89,137,62,210,
+98,103,92,217,158,216,70,7,49,39,193,130,100,182,17,194,140,73,246,147,16,
+250,9,146,216,72,6,49,39,193,131,22,194,72,73,137,62,210,98,31,65,139,97,
+40,32,196,159,14,234,70,86,194,88,89,137,62,210,98,63,93,72,202,216,76,10,
+49,39,198,33,180,153,37,108,38,134,152,147,237,38,38,117,13,164,201,43,97,
+56,40,196,159,36,65,57,163,149,176,158,26,98,79,180,152,165,210,9,205,28,
+173,133,0,243,18,124,98,22,180,72,130,115,71,43,97,68,72,196,159,105,49,51,
+168,90,209,34,9,205,28,173,133,33,19,18,124,154,24,76,185,164,227,138,89,
+18,119,0,7,145,39,201,161,132,188,64,124,137,62,49,11,90,36,65,57,163,149,
+210,166,37,34,79,180,152,153,212,45,104,145,4,230,142,87,74,160,84,137,62,
+72,130,115,71,43,171,234,134,200,147,237,38,41,116,130,115,71,43,171,235,5,
+72,147,227,16,218,76,146,186,254,184,108,137,62,210,98,103,80,218,76,146,
+186,254,192,68,137,62,29,212,140,174,207,178,23,34,79,180,152,143,215,82,
+50,187,62,208,60,137,62,12,19,37,210,182,21,34,79,180,152,135,208,76,151,
+74,224,68,137,62,49,205,153,238,175,186,23,34,79,180,152,153,215,54,103,
+186,190,240,92,137,62,22,139,95,48,64,70,235,251,225,210,36,251,73,136,189,
+162,215,204,16,17,186,255,2,14,98,79,152,32,35,108,48,64,242,36,249,130,2,
+55,75,6,212,224,72,200,51,128,114,108,28,100,128,0,0,0,0,0,0,0,12,110,127,
+48,98,115,249,201,117,243,249,195,21,159,206,38,47,63,156,86,8,75,144,94,
+82,1,38,73,79,208,67,95,233,1,6,128,14,79,129,186,40,249,18,149,182,207,
+144,200,155,188,248,204,105,184,207,142,199,137,175,201,0,159,72,10,5,21,
+221,10,120,74,129,124,36,98,232,228,74,81,62,160,20,10,107,186,21,114,32,
+105,137,194,70,46,142,68,165,19,235,1,64,170,187,161,119,34,66,146,36,104,
+137,194,70,46,142,68,165,19,236,1,64,174,187,161,95,37,134,204,23,225,35,
+23,71,34,82,137,246,128,160,89,93,208,167,147,195,201,194,70,46,142,68,165,
+19,238,1,64,182,187,161,71,105,20,19,177,139,163,145,41,68,16,7,6,15,82,70,
+72,115,96,32,106,27,128,0,0,0,0,91,60,165,195,201,194,8,134,149,216,162,0,
+192,41,225,8,2,48,177,36,1,149,13,196,15,0,200,209,97,199,128,99,32,176,
+195,192,113,57,143,0,167,133,32,230,80,28,202,139,175,238,2,48,189,192,20,
+1,119,80,87,193,186,129,89,56,72,197,209,200,193,185,35,23,71,109,13,219,
+36,98,232,237,156,13,26,208,211,14,102,19,87,137,91,95,128,0,10,96,24,92,0,
+0,83,2,53,56,0,0,165,3,28,204,160,160,226,100,226,200,211,76,241,240,0,1,
+102,8,22,75,64,137,73,20,230,105,133,7,19,39,22,70,154,103,143,128,0,11,48,
+20,28,76,156,113,75,34,78,62,0,0,45,3,103,31,0,0,22,65,44,57,137,62,33,179,
+216,162,152,192,131,18,124,162,27,61,138,41,108,32,196,159,16,217,232,235,
+81,76,104,73,137,62,81,13,158,142,181,20,184,16,98,79,136,108,244,244,168,
+166,56,36,196,159,40,134,207,79,74,138,93,10,49,39,194,173,192,158,158,149,
+20,188,20,98,79,133,91,129,61,109,74,41,124,30,68,159,16,217,236,83,108,96,
+68,137,62,81,13,158,197,54,182,17,34,79,136,108,244,117,169,182,52,38,68,
+159,40,134,207,71,90,155,92,8,145,39,196,54,122,122,84,219,28,19,34,79,148,
+67,103,167,165,77,174,133,72,147,225,86,224,79,79,74,155,94,10,145,39,194,
+173,192,158,182,165,54,190,206,25,212,35,208,226,100,150,211,201,29,162,44,
+140,35,103,0,255,192,0,0,0,0,0,0,206,25,228,35,208,226,100,150,211,201,29,
+162,44,140,35,103,0,255,192,0,0,0,0,0,0,206,25,244,35,208,226,100,150,211,
+201,29,162,44,140,35,103,0,255,192,0,0,0,0,0,0,206,26,4,35,208,226,100,150,
+211,201,29,162,44,140,35,103,1,0,0,0,0,0,0,0,0,206,26,20,35,208,226,100,
+150,211,201,29,162,44,140,35,103,1,0,0,0,0,0,0,0,0,206,26,36,35,208,226,
+100,150,211,201,29,162,44,140,35,103,1,0,64,0,0,0,0,0,0,206,26,52,35,208,
+226,100,150,211,201,29,162,44,140,35,103,1,0,64,0,0,0,0,0,0,206,26,68,35,
+208,226,100,150,211,201,29,162,44,140,35,103,1,0,64,0,0,0,0,0,0,206,26,84,
+35,208,226,100,150,211,201,29,162,44,140,35,103,1,0,128,0,0,0,0,0,0,195,
+154,99,16,38,36,0,251,68,117,179,216,162,128,68,72,1,241,13,158,197,20,150,
+25,18,0,125,162,58,217,232,235,117,100,162,136,25,18,0,125,162,58,217,232,
+235,116,36,162,145,2,226,64,15,136,108,244,117,186,178,81,73,129,113,32,7,
+196,54,122,58,221,9,40,165,64,200,144,3,237,17,214,207,79,75,171,37,20,80,
+200,144,3,237,17,214,207,79,75,161,37,20,138,23,18,0,124,67,103,167,165,
+213,146,138,77,11,137,0,62,33,179,211,210,232,73,69,42,133,196,128,31,10,
+183,2,125,89,40,163,5,196,128,31,10,183,2,125,9,40,164,96,200,144,3,224,
+221,64,172,157,89,40,163,134,68,128,31,6,234,5,100,232,73,69,35,133,68,128,
+31,104,142,182,125,89,40,180,0,168,144,3,237,17,214,207,161,37,22,144,19,
+18,0,124,67,103,213,146,139,80,9,137,0,62,33,179,232,73,69,172,5,90,40,153,
+59,68,117,179,216,166,192,77,162,137,147,136,108,246,41,180,176,219,69,19,
+39,104,142,182,122,58,221,89,41,178,6,218,40,153,59,68,117,179,209,214,232,
+73,77,162,6,90,40,153,56,134,207,71,91,171,37,54,152,25,104,162,100,226,27,
+61,29,110,132,148,218,160,109,162,137,147,180,71,91,61,61,46,172,148,217,
+67,109,20,76,157,162,58,217,233,233,116,36,166,209,67,45,20,76,156,67,103,
+167,165,213,146,155,77,12,180,81,50,113,13,158,158,151,66,74,109,84,50,209,
+68,201,194,173,192,159,86,74,108,193,150,138,38,78,21,110,4,250,18,83,104,
+193,182,138,38,78,13,212,10,201,213,146,155,56,109,162,137,147,131,117,2,
+178,116,36,166,209,194,237,20,76,157,162,58,217,245,100,167,16,2,237,20,76,
+157,162,58,217,244,36,167,18,2,173,20,76,156,67,103,213,146,156,80,10,180,
+81,50,113,13,159,66,74,113,97,175,221,48,216,110,64,4,42,22,189,179,0,196,
+133,0,185,80,32,28,78,99,193,18,80,36,4,19,159,141,172,0,178,90,4,74,73,0,
+22,209,68,201,187,129,4,2,8,3,132,64,60,36,4,0,91,240,168,177,69,118,144,
+157,91,116,116,32,32,1,53,216,221,218,170,139,3,234,219,165,0,255,152,185,
+11,251,232,231,188,47,86,227,105,18,1,255,184,170,59,41,92,23,240,110,173,
+198,209,208,36,3,253,188,183,177,82,110,80,224,93,122,32,32,4,144,253,170,
+34,22,140,7,236,161,25,232,237,105,64,63,230,160,158,102,127,59,205,11,217,
+66,51,210,128,127,237,65,60,204,254,119,155,171,197,34,168,48,6,90,194,1,0,
+39,75,88,72,8,9,33,186,194,80,64,76,13,214,19,2,130,96,110,150,189,0,65,6,
+51,214,20,128,65,17,11,214,19,130,137,121,211,210,211,144,6,39,75,88,80,0,
+201,119,235,10,8,41,86,231,71,88,80,129,79,135,186,122,133,224,34,25,69,
+234,80,3,91,141,172,40,96,139,113,180,181,133,36,21,110,54,142,134,176,165,
+1,176,23,213,47,0,216,134,234,215,128,111,117,181,232,128,209,3,70,230,107,
+64,5,139,168,209,235,10,32,36,144,102,235,136,3,146,27,172,40,160,146,132,
+103,172,40,192,115,3,117,133,28,22,113,163,69,172,41,103,1,66,188,17,145,
+52,168,4,202,113,67,76,130,227,76,194,13,240,108,0,0,83,224,0,2,193,0,104,
+146,84,97,48,0,1,94,192,56,169,24,145,179,192,0,5,112,8,56,16,32,128,56,18,
+52,125,230,86,147,190,140,28,50,21,13,39,31,23,60,145,158,57,12,141,47,129,
+6,155,194,188,24,49,39,199,89,188,124,92,242,70,120,224,201,33,69,15,155,
+163,201,68,14,49,39,199,197,211,116,240,242,113,197,232,18,180,254,36,3,17,
+46,18,243,35,100,128,172,156,178,70,163,154,76,34,248,146,164,108,248,75,
+204,141,146,28,217,115,137,27,95,27,241,173,236,162,160,224,200,2,206,9,
+113,13,148,192,209,18,22,164,146,37,193,57,162,4,249,39,196,128,24,2,178,
+66,213,136,68,201,16,77,209,131,31,192,242,88,96,92,191,151,34,100,136,38,
+232,255,252,92,221,199,197,12,68,209,82,66,212,11,155,185,41,197,13,55,38,
+3,66,213,47,135,254,72,12,162,99,133,116,112,0,1,72,66,14,16,16,50,37,202,
+160,150,154,66,14,20,8,57,192,28,24,80,113,50,113,100,105,166,120,248,0,0,
+179,1,65,196,201,199,20,178,36,227,224,0,2,208,54,113,240,0,1,100,11,181,
+192,0,5,178,1,18,160,65,24,131,20,145,25,188,48,132,122,28,76,146,218,121,
+35,180,69,145,132,108,224,31,248,0,0,0,0,0,0,25,188,56,132,122,28,76,146,
+218,121,35,180,69,145,132,108,224,31,248,0,0,0,0,0,0,40,160,45,110,23,30,
+176,33,184,0,0,183,32,29,235,2,27,199,23,0,0,23,4,51,120,129,8,244,56,153,
+37,180,242,71,104,139,35,8,217,192,63,240,0,0,0,0,0,0,51,120,145,8,244,56,
+153,37,180,242,71,104,139,35,8,217,192,64,0,0,0,0,0,0,0,51,120,161,8,244,
+56,153,37,180,242,71,104,139,35,8,217,192,64,0,0,0,0,0,0,0,51,120,177,8,
+244,56,153,37,180,242,71,104,139,35,8,217,192,64,16,0,0,0,0,0,0,51,120,193,
+8,244,56,153,37,180,242,71,104,139,35,8,217,192,64,16,0,0,0,0,0,0,51,120,
+209,8,244,56,153,37,180,242,71,104,139,35,8,217,192,64,16,0,0,0,0,0,0,51,
+120,225,8,244,56,153,37,180,242,71,104,139,35,8,217,192,64,32,0,0,0,0,0,0,
+32,227,194,0,97,57,162,4,246,104,5,34,92,35,68,225,161,166,220,16,16,137,
+112,52,41,73,29,185,1,65,196,201,197,145,166,153,246,72,3,137,204,120,34,
+74,8,199,1,67,17,162,112,201,84,128,97,144,78,25,42,16,131,169,1,205,66,8,
+35,68,225,161,166,239,128,0,10,192,64,196,104,156,50,96,0,2,172,73,240,117,
+96,57,170,97,4,104,156,52,52,221,240,0,1,82,1,74,9,129,125,240,0,1,82,32,
+148,25,174,137,58,23,51,190,0,0,42,69,64,195,32,156,50,96,0,2,160,81,238,2,
+3,107,173,218,3,192,
 };
 #elif defined(DUK_USE_DOUBLE_ME)
-DUK_INTERNAL const duk_uint8_t duk_builtins_data[4116] = {
-144,148,105,224,32,68,52,228,62,12,104,200,165,132,52,167,194,138,105,243,
-124,57,28,211,57,18,64,52,238,126,44,138,111,171,241,164,19,87,129,30,33,
-167,16,145,159,8,211,136,9,225,42,5,240,145,139,163,163,8,211,136,10,228,
-64,211,19,132,140,93,29,56,70,156,64,119,34,66,146,36,104,137,194,70,46,
-142,172,35,78,32,47,146,195,102,11,240,145,139,163,175,8,211,136,9,228,240,
-242,112,145,139,163,179,8,211,136,8,237,34,130,118,49,116,118,225,26,48,0,
-1,82,29,201,158,46,183,39,135,147,132,140,93,16,132,76,66,33,8,66,16,132,
-33,8,66,26,179,233,97,167,60,150,34,33,154,112,0,1,75,247,35,79,95,237,198,
-174,200,47,31,23,95,17,13,51,19,35,93,68,216,209,128,0,10,208,174,79,15,32,
-248,8,196,24,8,107,192,0,5,106,118,27,94,0,0,43,83,227,94,0,0,43,84,46,215,
-128,0,10,213,28,198,188,0,0,86,169,100,53,224,0,2,181,79,85,175,0,0,21,170,
-154,45,120,0,0,173,85,217,107,192,0,5,106,182,243,86,193,106,52,127,130,
-249,50,94,124,35,68,225,146,49,13,31,186,23,201,146,243,224,200,39,12,145,
-136,67,134,19,49,0,0,3,225,252,0,0,0,3,51,0,0,3,193,252,0,0,0,3,47,18,1,
-172,19,120,71,10,25,196,136,113,162,156,136,199,42,57,204,144,115,132,240,
-149,2,248,72,197,209,58,2,185,16,52,196,225,35,23,68,233,14,228,72,82,68,
-141,17,56,72,197,209,58,130,249,44,54,96,191,9,24,186,39,88,79,39,135,147,
-132,140,93,19,176,35,180,138,9,216,197,209,59,82,79,35,40,242,65,248,58,42,
-96,121,14,232,94,62,46,190,15,42,31,145,33,86,65,76,242,214,143,73,48,242,
-243,79,49,56,243,115,207,57,64,243,180,79,61,72,243,244,207,65,80,244,53,
-79,69,88,244,98,30,8,200,156,67,102,120,241,79,4,100,78,21,110,4,207,32,47,
-147,37,231,194,52,78,25,34,122,81,124,153,47,62,12,130,112,201,19,211,139,
-121,34,87,69,128,104,137,239,83,18,238,108,165,2,162,92,104,56,220,233,1,8,
-151,10,134,162,100,206,16,18,50,9,195,39,105,20,101,136,18,25,4,225,147,
-180,138,5,215,49,238,105,27,60,185,1,36,104,156,50,118,145,70,96,129,34,52,
-78,25,59,72,160,93,115,30,230,145,179,204,144,12,73,8,15,38,104,128,138,52,
-146,16,30,77,1,0,2,11,132,193,198,36,248,248,186,110,158,30,78,56,188,194,
-70,183,170,136,48,98,79,142,179,120,248,185,228,140,241,193,146,66,138,31,
-55,71,138,128,153,137,62,58,205,227,226,231,146,51,199,26,6,18,92,146,64,
-96,74,72,51,120,43,192,97,68,128,153,56,72,7,12,133,67,73,199,197,207,36,
-103,142,35,2,3,33,80,210,113,241,115,201,25,160,146,225,160,9,34,1,124,178,
-1,139,18,19,36,229,146,8,190,36,169,27,62,18,243,35,100,135,54,92,162,2,17,
-46,72,128,89,7,200,32,33,18,225,98,236,145,188,130,64,196,75,132,188,200,
-217,32,43,39,28,128,69,19,18,228,144,42,98,79,142,179,120,248,185,228,140,
-241,201,97,129,114,229,201,37,2,68,184,200,1,147,93,159,153,213,34,235,250,
-96,48,157,32,24,94,160,1,199,4,184,235,55,143,139,158,72,207,28,226,3,81,
-46,62,46,155,167,135,147,142,47,60,129,71,197,207,36,103,142,34,92,35,104,
-194,68,1,89,58,36,8,109,109,12,133,67,73,195,18,115,36,118,182,185,168,8,
-109,109,12,133,67,73,201,18,115,36,118,182,185,168,130,27,91,75,115,149,71,
-240,196,156,201,29,173,174,129,2,27,91,75,115,149,71,242,68,156,201,29,173,
-174,129,34,12,16,28,128,62,191,42,3,71,146,68,4,16,22,188,161,240,16,40,
-104,242,103,196,16,93,158,125,96,110,115,235,64,131,16,16,58,37,192,70,32,
-194,144,114,25,67,95,40,6,18,8,32,48,156,209,2,108,124,96,224,144,6,247,62,
-16,0,143,164,143,12,248,15,18,84,145,145,34,128,11,35,160,179,140,0,44,150,
-129,18,58,0,146,116,103,32,128,105,61,104,17,36,175,1,232,217,29,5,156,179,
-224,58,26,50,95,142,43,159,64,181,130,83,226,26,50,95,142,43,159,192,7,255,
-248,41,42,72,226,1,160,18,78,97,32,26,64,114,186,60,32,4,120,6,148,13,128,
-124,3,76,12,84,46,100,140,3,78,13,18,14,130,36,67,232,23,18,14,130,39,34,
-131,30,113,15,224,3,255,253,6,48,40,194,197,204,224,142,8,240,78,25,60,231,
-192,210,197,204,224,156,50,113,238,67,103,232,62,28,138,156,104,82,170,107,
-255,32,48,191,144,1,132,112,71,128,159,168,128,161,28,17,224,156,50,112,19,
-245,144,22,39,12,156,123,144,217,240,19,245,146,3,9,205,16,39,236,62,3,161,
-163,37,248,226,251,141,1,107,4,167,196,52,100,191,28,95,113,164,13,91,132,
-5,147,130,115,30,8,147,222,64,43,1,49,31,224,64,60,72,245,128,68,249,32,13,
-34,2,34,63,204,128,89,45,2,39,209,0,89,61,104,159,213,0,153,80,50,156,80,
-211,126,16,11,155,184,183,88,145,224,129,34,122,64,17,155,184,183,8,11,39,
-22,235,18,60,16,36,79,72,1,115,119,40,247,146,60,16,36,79,72,32,140,221,
-197,184,64,89,57,71,188,145,224,129,34,122,65,1,39,20,51,244,0,52,72,242,2,
-127,18,2,165,48,70,114,229,145,51,253,141,1,4,104,229,203,34,103,251,26,64,
-132,52,75,160,201,47,105,160,26,84,12,167,31,186,8,50,0,114,58,113,163,46,
-190,120,35,11,60,4,25,68,81,61,96,47,181,80,46,132,129,255,255,222,255,255,
-255,255,254,39,172,67,118,170,5,208,144,0,0,0,0,0,64,0,0,51,16,0,0,62,31,
-192,0,0,0,8,245,238,146,38,138,147,105,13,42,26,137,226,0,0,7,131,248,0,0,
-0,1,30,180,134,4,209,82,109,33,165,67,81,60,64,0,0,240,255,0,0,0,0,15,210,
-62,72,91,155,0,0,2,192,240,0,0,0,0,135,88,11,237,72,5,38,210,27,50,24,145,
-129,255,254,126,135,255,255,255,254,67,172,67,118,164,2,147,105,13,153,12,
-72,192,255,255,63,195,255,255,255,255,16,240,70,68,226,27,51,199,138,120,
-35,34,112,171,112,38,121,7,16,137,112,168,106,38,77,193,1,40,151,16,217,
-144,196,142,224,144,21,18,227,65,198,238,9,67,81,46,72,5,39,16,217,144,196,
-142,224,152,228,148,227,64,0,0,0,0,0,0,0,0,131,175,223,16,194,111,8,97,119,
-224,3,205,220,42,46,65,238,200,13,155,184,75,189,205,35,102,128,47,116,64,
-92,221,199,196,130,68,144,230,239,72,65,152,12,21,224,140,137,92,128,62,
-210,98,177,252,3,107,173,88,3,146,211,141,32,0,3,225,252,0,0,0,3,19,175,
-188,0,100,221,193,130,100,228,167,20,52,215,129,3,38,238,77,12,39,37,56,
-161,166,188,10,194,94,6,18,155,184,183,8,11,39,6,9,147,146,156,80,211,94,7,
-18,155,184,183,8,11,39,38,134,19,146,156,80,211,94,8,12,53,224,130,195,222,
-8,77,133,210,24,91,224,3,152,147,228,208,194,95,0,44,196,159,11,69,175,152,
-32,35,100,33,135,24,147,237,38,34,246,139,95,48,64,70,200,68,8,49,39,198,
-57,179,61,144,138,22,98,79,180,152,153,215,54,103,178,17,129,204,73,240,96,
-153,44,132,112,163,18,125,164,196,62,130,100,178,18,1,140,73,240,96,197,
-144,146,18,98,79,180,152,135,208,98,200,74,8,49,39,195,186,145,149,144,150,
-22,98,79,180,152,143,215,82,50,178,19,2,140,73,241,136,109,38,73,89,9,161,
-166,36,251,73,137,157,67,105,50,74,200,78,10,49,39,201,16,78,104,229,100,
-39,134,152,147,237,38,41,116,130,115,71,43,33,64,60,196,159,24,133,173,18,
-32,156,209,202,200,81,18,49,39,218,76,76,234,22,180,72,130,115,71,43,33,72,
-68,196,159,38,134,19,46,105,56,226,150,68,157,160,1,228,73,242,104,97,46,
-16,31,34,79,140,66,214,137,16,78,104,229,108,169,137,72,147,237,38,38,117,
-11,90,36,65,57,163,149,178,168,21,34,79,146,32,156,209,202,218,250,161,178,
-36,251,73,138,93,32,156,209,202,218,250,193,82,36,248,196,54,147,36,173,
-191,174,27,34,79,180,152,153,212,54,147,36,173,191,176,17,34,79,135,117,35,
-43,115,236,133,200,147,237,38,35,245,212,140,173,207,180,15,34,79,131,4,
-201,108,173,133,72,147,237,38,33,244,19,37,178,184,17,34,79,140,115,102,
-123,107,238,133,200,147,237,38,38,117,205,153,237,175,188,23,34,79,133,162,
-215,204,16,17,182,254,248,116,137,62,210,98,47,104,181,243,4,4,109,191,192,
-131,152,147,230,8,8,217,12,16,60,137,62,96,128,141,178,193,160,206,1,201,
-176,113,146,0,0,0,0,0,0,0,0,49,185,252,65,137,207,227,37,215,207,227,12,86,
-127,24,152,188,254,49,88,33,46,65,120,72,4,153,37,63,33,13,127,148,4,26,0,
-57,62,6,228,163,228,74,86,215,62,55,28,110,179,226,113,70,223,62,47,24,38,
-191,30,2,125,32,40,20,87,114,41,225,42,5,240,145,139,163,145,41,68,250,128,
-80,41,174,228,85,200,129,166,39,9,24,186,57,18,148,79,172,5,2,170,238,69,
-220,137,10,72,145,162,39,9,24,186,57,18,148,79,176,5,2,186,238,69,124,150,
-27,48,95,132,140,93,28,137,74,39,218,2,129,101,119,34,158,79,15,39,9,24,
-186,57,18,148,79,184,5,2,218,238,69,29,164,80,78,198,46,142,68,165,16,64,
-28,24,61,73,25,33,205,128,1,167,166,128,0,0,0,1,108,242,151,15,39,8,34,26,
-87,97,200,3,0,167,129,32,8,194,195,16,6,84,55,10,60,3,35,69,132,30,1,140,
-130,193,143,1,196,230,60,2,158,8,131,153,64,115,42,46,191,176,8,194,246,0,
-80,5,220,193,95,6,234,5,100,225,35,23,71,35,6,228,140,93,29,180,55,108,145,
-139,163,182,112,52,107,67,76,56,3,153,132,20,28,76,156,89,26,105,158,62,0,
-0,42,193,2,201,104,17,41,34,156,204,176,160,226,100,226,200,211,76,241,240,
-0,1,86,2,131,137,147,142,41,100,73,199,192,0,5,96,6,13,10,82,70,62,0,0,42,
-130,88,115,18,124,67,103,177,69,49,129,6,36,249,68,54,123,20,82,216,65,137,
-62,33,179,209,214,162,152,208,147,18,124,162,27,61,29,106,41,112,32,196,
-159,16,217,233,233,81,76,112,73,137,62,81,13,158,158,149,20,186,20,98,79,
-133,91,129,61,61,42,41,120,40,196,159,10,183,2,122,218,148,82,248,60,137,
-62,33,179,216,166,216,192,137,18,124,162,27,61,138,109,108,34,68,159,16,
-217,232,235,83,108,104,76,137,62,81,13,158,142,181,54,184,17,34,79,136,108,
-244,244,169,182,56,38,68,159,40,134,207,79,74,155,93,10,145,39,194,173,192,
-158,158,149,54,188,21,34,79,133,91,129,61,109,74,109,125,155,51,136,71,161,
-196,201,45,167,146,59,68,89,24,70,206,0,0,7,129,248,0,0,0,1,155,51,168,71,
-161,196,201,45,167,146,59,68,89,24,70,206,0,0,7,129,248,0,0,0,1,155,51,200,
-71,161,196,201,45,167,146,59,68,89,24,70,206,0,0,7,129,248,0,0,0,1,155,51,
-232,71,161,196,201,45,167,146,59,68,89,24,70,206,0,0,0,2,0,0,0,0,1,155,52,
-8,71,161,196,201,45,167,146,59,68,89,24,70,206,0,0,0,2,0,0,0,0,1,155,52,40,
-71,161,196,201,45,167,146,59,68,89,24,70,206,0,0,0,130,0,0,0,0,1,155,52,72,
-71,161,196,201,45,167,146,59,68,89,24,70,206,0,0,0,130,0,0,0,0,1,155,52,
-104,71,161,196,201,45,167,146,59,68,89,24,70,206,0,0,0,130,0,0,0,0,1,155,
-52,136,71,161,196,201,45,167,146,59,68,89,24,70,206,0,0,1,2,0,0,0,0,1,135,
-52,166,32,76,72,1,246,136,235,103,177,69,0,136,144,3,226,27,61,138,41,44,
-50,36,0,251,68,117,179,209,214,234,201,69,16,50,36,0,251,68,117,179,209,
-214,232,73,69,34,5,196,128,31,16,217,232,235,117,100,162,147,2,226,64,15,
-136,108,244,117,186,18,81,74,129,145,32,7,218,35,173,158,158,151,86,74,40,
-161,145,32,7,218,35,173,158,158,151,66,74,41,20,46,36,0,248,134,207,79,75,
-171,37,20,154,23,18,0,124,67,103,167,165,208,146,138,85,11,137,0,62,21,110,
-4,250,178,81,70,11,137,0,62,21,110,4,250,18,81,72,193,145,32,7,193,186,129,
-89,58,178,81,71,12,137,0,62,13,212,10,201,208,146,138,71,10,137,0,62,209,
-29,108,250,178,81,104,1,81,32,7,218,35,173,159,66,74,45,32,38,36,0,248,134,
-207,171,37,22,160,19,18,0,124,67,103,208,146,139,88,10,180,81,50,118,136,
-235,103,177,77,128,155,69,19,39,16,217,236,83,105,97,182,138,38,78,209,29,
-108,244,117,186,178,83,100,13,180,81,50,118,136,235,103,163,173,208,146,
-155,68,12,180,81,50,113,13,158,142,183,86,74,109,48,50,209,68,201,196,54,
-122,58,221,9,41,181,64,219,69,19,39,104,142,182,122,122,93,89,41,178,134,
-218,40,153,59,68,117,179,211,210,232,73,77,162,134,90,40,153,56,134,207,79,
-75,171,37,54,154,25,104,162,100,226,27,61,61,46,132,148,218,168,101,162,
-137,147,133,91,129,62,172,148,217,131,45,20,76,156,42,220,9,244,36,166,209,
-131,109,20,76,156,27,168,21,147,171,37,54,112,219,69,19,39,6,234,5,100,232,
-73,77,163,133,218,40,153,59,68,117,179,234,201,78,32,5,218,40,153,59,68,
-117,179,232,73,78,36,5,90,40,153,56,134,207,171,37,56,160,21,104,162,100,
-226,27,62,132,148,226,195,95,182,97,176,218,128,8,84,45,123,38,1,137,10,1,
-114,160,64,56,156,199,130,36,160,72,8,39,63,27,24,1,100,180,8,148,146,0,45,
-162,137,147,111,2,8,4,16,7,8,96,120,72,1,87,224,168,13,42,226,145,97,58,
-182,232,232,64,177,107,2,64,22,85,181,187,7,213,183,74,2,17,119,49,255,121,
-207,215,240,94,173,198,210,36,4,113,95,115,255,232,34,182,80,221,91,141,
-163,160,72,15,121,123,103,225,220,164,194,160,186,244,64,251,33,9,64,24,45,
-68,84,15,217,66,51,209,218,210,129,61,65,204,127,154,118,254,204,23,178,
-132,103,165,2,122,131,216,255,52,237,253,154,168,48,6,90,130,1,0,39,75,80,
-72,8,9,33,186,130,80,64,76,13,212,19,2,130,96,110,150,173,0,65,6,51,212,20,
-128,65,17,11,212,19,130,137,121,211,210,209,144,6,39,75,80,80,0,201,119,
-234,10,8,41,86,231,71,80,80,129,79,135,186,122,69,224,34,25,69,233,80,3,91,
-141,168,40,96,139,113,180,181,5,36,21,110,54,142,134,160,165,1,176,23,211,
-47,0,216,134,233,215,128,111,117,181,104,128,209,3,70,230,106,64,5,139,168,
-209,234,10,32,36,144,102,234,136,3,146,27,168,40,160,146,132,103,168,40,
-192,115,3,117,5,28,22,113,163,69,168,41,103,1,66,188,17,145,52,40,4,202,
-113,67,76,130,227,68,194,13,240,108,0,0,83,96,0,2,161,0,104,146,84,97,48,0,
-1,78,192,56,169,24,145,179,192,0,5,48,8,56,16,32,128,56,18,52,125,166,86,
-147,182,140,28,50,21,13,39,31,23,60,145,158,56,140,141,47,113,6,155,186,
-188,24,49,39,199,89,188,124,92,242,70,120,224,201,33,69,15,155,163,197,68,
-14,49,39,199,197,211,116,240,242,113,197,230,18,180,253,228,3,17,46,18,243,
-35,100,128,172,156,114,70,163,146,76,34,248,146,164,108,248,75,204,141,146,
-28,217,114,137,27,78,251,241,173,234,162,160,225,1,3,34,92,170,9,105,164,
-32,225,64,131,155,1,193,133,7,19,39,22,70,154,103,143,128,0,10,176,20,28,
-76,156,113,75,34,78,62,0,0,43,0,48,104,82,146,49,240,0,1,84,11,180,192,0,5,
-114,1,18,160,65,24,131,20,145,25,172,48,132,122,28,76,146,218,121,35,180,
-69,145,132,108,224,0,0,120,31,128,0,0,0,25,172,56,132,122,28,76,146,218,
-121,35,180,69,145,132,108,224,0,0,120,31,128,0,0,0,40,160,45,110,23,30,176,
-33,184,0,0,175,32,29,235,2,27,199,23,0,0,22,4,51,88,129,8,244,56,153,37,
-180,242,71,104,139,35,8,217,192,0,0,240,63,0,0,0,0,51,88,145,8,244,56,153,
-37,180,242,71,104,139,35,8,217,192,0,0,0,64,0,0,0,0,51,88,161,8,244,56,153,
-37,180,242,71,104,139,35,8,217,192,0,0,0,64,0,0,0,0,51,88,177,8,244,56,153,
-37,180,242,71,104,139,35,8,217,192,0,0,16,64,0,0,0,0,51,88,193,8,244,56,
-153,37,180,242,71,104,139,35,8,217,192,0,0,16,64,0,0,0,0,51,88,209,8,244,
-56,153,37,180,242,71,104,139,35,8,217,192,0,0,16,64,0,0,0,0,51,88,225,8,
-244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,32,64,0,0,0,0,32,227,194,
-0,97,57,162,4,245,232,5,34,92,35,68,225,161,166,218,16,16,137,112,52,41,73,
-29,153,1,65,196,201,197,145,166,153,245,200,3,137,204,120,34,74,8,200,58,
-112,28,211,32,130,52,78,26,26,110,248,0,0,164,4,12,70,137,195,39,252,73,
-240,117,32,57,168,97,4,104,156,52,52,221,255,160,20,160,152,23,223,250,32,
-148,25,174,137,58,23,51,191,244,84,12,50,9,195,39,240,81,238,2,3,107,173,
-214,3,192,
+DUK_INTERNAL const duk_uint8_t duk_builtins_data[4281] = {
+144,148,105,226,32,68,52,228,254,12,104,202,37,132,52,167,194,138,105,245,
+124,57,28,211,57,18,64,52,239,126,44,138,111,175,241,164,19,87,145,30,33,
+167,22,145,159,8,211,139,9,225,42,5,240,145,139,163,163,8,211,139,10,228,
+64,211,19,132,140,93,29,56,70,156,88,119,34,66,146,36,104,137,194,70,46,
+142,172,35,78,44,47,146,195,102,11,240,145,139,163,175,8,211,139,9,228,240,
+242,112,145,139,163,179,8,211,139,8,237,34,130,118,49,116,118,225,26,48,0,
+1,98,29,201,158,46,183,39,135,147,132,140,93,16,132,76,66,33,8,66,16,132,
+33,8,66,26,180,105,97,167,68,150,34,33,154,112,0,1,91,247,35,79,111,237,
+198,174,232,47,31,23,95,17,13,31,249,96,211,49,50,53,214,77,141,24,0,0,181,
+10,228,240,242,15,128,140,65,128,134,188,0,0,90,167,97,181,224,0,2,213,62,
+53,224,0,2,213,66,237,120,0,0,181,81,204,107,192,0,5,170,150,67,94,0,0,45,
+84,245,90,240,0,1,106,169,162,215,128,0,11,85,93,150,188,0,0,90,171,111,53,
+109,22,162,26,48,0,1,84,23,201,146,243,225,26,39,12,145,136,104,192,0,5,61,
+11,228,201,121,240,100,19,134,72,196,33,195,14,40,203,112,64,190,76,232,
+145,153,136,0,0,31,15,224,0,0,0,25,152,0,0,30,15,224,0,0,0,25,120,144,13,
+96,155,194,56,80,206,36,67,141,20,228,70,57,81,206,100,131,156,39,132,168,
+23,194,70,46,137,208,21,200,129,166,39,9,24,186,39,72,119,34,66,146,36,104,
+137,194,70,46,137,212,23,201,97,179,5,248,72,197,209,58,194,121,60,60,156,
+36,98,232,157,129,29,164,80,78,198,46,137,218,146,121,25,71,146,9,209,5,
+209,61,48,126,14,138,152,30,67,186,23,143,139,175,131,202,135,228,72,85,
+144,83,60,179,30,94,209,233,102,30,98,105,230,103,30,114,121,231,104,30,
+122,137,231,233,30,130,153,232,106,30,138,169,232,235,30,144,67,193,25,19,
+136,108,207,30,41,224,140,137,194,173,192,153,228,5,242,100,188,248,70,137,
+195,36,79,78,47,147,37,231,193,144,78,25,34,122,145,111,36,74,232,176,13,
+17,61,234,226,93,207,148,160,84,75,141,7,27,161,32,33,18,225,80,212,76,154,
+2,2,70,65,56,100,237,34,140,209,2,67,32,156,50,118,145,64,186,230,61,205,
+35,103,155,32,36,141,19,134,78,210,40,206,16,36,70,137,195,39,105,20,11,
+174,99,220,210,54,121,210,1,137,33,1,228,207,16,17,70,146,66,3,201,164,32,
+0,65,112,152,56,196,159,31,23,77,211,195,201,199,23,160,72,214,246,81,6,12,
+73,241,214,111,31,23,60,145,158,56,50,72,81,67,230,232,242,80,19,49,39,199,
+89,188,124,92,242,70,120,227,64,194,75,154,72,12,9,73,6,111,21,120,12,40,
+144,19,39,25,0,225,144,168,105,56,248,185,228,140,241,200,96,64,100,42,26,
+78,62,46,121,35,52,18,92,116,1,36,64,47,158,64,49,98,66,100,156,242,65,23,
+196,149,35,103,194,94,100,108,144,230,203,156,64,66,37,201,16,11,32,249,
+132,4,34,92,44,93,146,55,152,72,24,137,112,151,153,27,36,5,100,229,144,8,
+162,98,92,210,5,76,73,241,214,111,31,23,60,145,158,57,44,48,46,92,185,164,
+160,72,151,41,0,50,107,179,244,59,36,93,127,92,6,19,172,3,11,216,0,56,224,
+151,29,102,241,241,115,201,25,227,164,64,106,37,199,197,211,116,240,242,
+113,197,233,144,40,248,185,228,140,241,196,75,132,109,24,72,128,43,39,84,
+129,13,173,161,144,168,105,56,98,78,100,142,214,215,69,1,13,173,161,144,
+168,105,57,34,78,100,142,214,215,69,16,67,107,105,110,114,168,254,24,147,
+153,35,181,181,212,32,67,107,105,110,114,168,254,72,147,153,35,181,181,212,
+36,65,130,3,144,8,26,252,200,13,30,85,16,16,64,90,242,231,192,64,161,163,
+203,31,26,172,193,17,4,23,105,159,96,27,172,251,16,32,196,4,14,137,112,17,
+136,48,164,28,134,80,215,202,1,132,130,8,12,39,52,64,155,31,24,56,36,1,189,
+207,132,0,35,233,35,195,62,3,196,149,36,100,72,160,2,200,232,44,227,0,11,
+37,160,68,142,128,36,157,25,200,32,26,79,90,4,73,43,192,122,54,71,65,103,
+44,248,14,134,140,151,227,138,231,208,45,96,148,248,134,140,151,227,138,
+231,240,1,255,254,10,74,146,56,128,104,4,147,152,72,6,144,28,174,143,8,1,
+30,1,165,3,96,31,0,211,3,21,11,153,35,0,211,131,68,131,160,137,16,250,5,
+196,131,160,137,200,160,199,156,67,248,0,255,255,65,140,10,48,177,115,56,
+35,130,60,19,134,79,89,240,52,177,115,56,39,12,156,123,144,217,251,15,135,
+34,167,30,20,170,154,255,232,12,47,244,0,97,28,17,224,39,238,32,40,71,4,
+120,39,12,156,4,253,228,5,137,195,39,30,228,54,124,4,253,228,128,194,115,
+68,9,252,15,128,232,104,201,126,56,191,35,64,90,193,41,241,13,25,47,199,23,
+228,105,3,86,225,1,100,224,156,199,130,36,249,144,10,192,76,71,250,16,15,
+18,61,96,17,62,200,3,72,128,136,143,247,32,22,75,64,137,248,64,22,79,90,39,
+249,64,38,84,12,167,20,52,223,196,2,230,238,45,214,36,120,32,72,158,208,4,
+102,238,45,194,2,201,197,186,196,143,4,9,19,218,0,92,221,202,61,228,143,4,
+9,19,218,8,35,55,113,110,16,22,78,81,239,36,120,32,72,158,208,64,73,197,12,
+255,0,13,18,60,128,159,212,128,169,76,17,156,185,100,76,255,163,64,65,26,
+57,114,200,153,255,70,144,33,13,18,232,50,75,226,104,6,149,3,41,199,246,
+130,12,128,28,142,156,120,203,175,158,8,194,207,1,6,81,20,79,88,11,237,84,
+11,161,32,127,255,247,191,255,255,255,255,137,235,16,221,170,129,116,36,0,
+0,0,0,0,16,0,0,12,196,0,0,15,135,240,0,0,0,2,61,123,164,137,162,164,218,67,
+74,134,162,120,128,0,1,224,254,0,0,0,0,71,173,33,129,52,84,155,72,105,80,
+212,79,16,0,0,60,63,192,0,0,0,3,244,143,146,22,230,192,0,0,176,60,0,0,0,0,
+33,214,2,251,82,1,73,180,134,204,134,36,96,127,255,159,161,255,255,255,255,
+144,235,16,221,169,0,164,218,67,102,67,18,48,63,255,207,240,255,255,255,
+255,196,60,17,145,56,134,204,241,226,158,8,200,156,42,220,9,158,65,196,34,
+92,42,26,137,147,120,64,74,37,196,54,100,49,35,188,36,5,68,184,208,113,187,
+194,80,212,75,146,1,73,196,54,100,49,35,188,38,57,37,56,240,0,0,0,0,0,0,0,
+0,32,235,248,68,48,156,2,24,94,24,0,243,119,10,139,144,123,242,3,102,238,
+18,239,115,72,217,160,11,223,16,23,55,113,241,32,145,36,57,188,18,16,102,3,
+5,120,35,34,89,32,15,180,152,173,127,0,218,235,88,0,228,180,227,200,0,0,
+248,127,0,0,0,0,197,107,240,64,6,77,220,24,38,78,74,113,67,77,130,4,12,155,
+185,52,48,156,148,226,134,155,4,10,194,96,129,132,166,238,45,194,2,201,193,
+130,100,228,167,20,52,216,32,113,41,187,139,112,128,178,114,104,97,57,41,
+197,13,54,8,32,48,216,32,130,195,224,130,19,97,124,134,23,6,0,57,137,62,77,
+12,38,12,0,179,18,124,45,22,190,96,128,141,176,134,28,98,79,180,152,139,
+218,45,124,193,1,27,97,16,32,196,159,24,230,204,246,194,40,89,137,62,210,
+98,103,92,217,158,216,70,7,49,39,193,130,100,182,17,194,140,73,246,147,16,
+250,9,146,216,72,6,49,39,193,131,22,194,72,73,137,62,210,98,31,65,139,97,
+40,32,196,159,14,234,70,86,194,88,89,137,62,210,98,63,93,72,202,216,76,10,
+49,39,198,33,180,153,37,108,38,134,152,147,237,38,38,117,13,164,201,43,97,
+56,40,196,159,36,65,57,163,149,176,158,26,98,79,180,152,165,210,9,205,28,
+173,133,0,243,18,124,98,22,180,72,130,115,71,43,97,68,72,196,159,105,49,51,
+168,90,209,34,9,205,28,173,133,33,19,18,124,154,24,76,185,164,227,138,89,
+18,119,0,7,145,39,201,161,132,188,64,124,137,62,49,11,90,36,65,57,163,149,
+210,166,37,34,79,180,152,153,212,45,104,145,4,230,142,87,74,160,84,137,62,
+72,130,115,71,43,171,234,134,200,147,237,38,41,116,130,115,71,43,171,235,5,
+72,147,227,16,218,76,146,186,254,184,108,137,62,210,98,103,80,218,76,146,
+186,254,192,68,137,62,29,212,140,174,207,178,23,34,79,180,152,143,215,82,
+50,187,62,208,60,137,62,12,19,37,210,182,21,34,79,180,152,135,208,76,151,
+74,224,68,137,62,49,205,153,238,175,186,23,34,79,180,152,153,215,54,103,
+186,190,240,92,137,62,22,139,95,48,64,70,235,251,225,210,36,251,73,136,189,
+162,215,204,16,17,186,255,2,14,98,79,152,32,35,108,48,64,242,36,249,130,2,
+55,75,6,212,224,72,200,51,128,114,108,28,100,128,0,0,0,0,0,0,0,12,110,127,
+48,98,115,249,201,117,243,249,195,21,159,206,38,47,63,156,86,8,75,144,94,
+82,1,38,73,79,208,67,95,233,1,6,128,14,79,129,186,40,249,18,149,182,207,
+144,200,155,188,248,204,105,184,207,142,199,137,175,201,0,159,72,10,5,21,
+221,10,120,74,129,124,36,98,232,228,74,81,62,160,20,10,107,186,21,114,32,
+105,137,194,70,46,142,68,165,19,235,1,64,170,187,161,119,34,66,146,36,104,
+137,194,70,46,142,68,165,19,236,1,64,174,187,161,95,37,134,204,23,225,35,
+23,71,34,82,137,246,128,160,89,93,208,167,147,195,201,194,70,46,142,68,165,
+19,238,1,64,182,187,161,71,105,20,19,177,139,163,145,41,68,16,7,6,15,82,70,
+72,115,96,0,27,234,32,0,0,0,0,91,60,165,195,201,194,8,134,149,216,162,0,
+192,41,225,8,2,48,177,36,1,149,13,196,15,0,200,209,97,199,128,99,32,176,
+195,192,113,57,143,0,167,133,32,230,80,28,202,139,175,238,2,48,189,192,20,
+1,119,80,87,193,186,129,89,56,72,197,209,200,193,185,35,23,71,109,13,219,
+36,98,232,237,156,13,26,208,211,14,102,19,87,137,91,95,128,0,10,96,24,92,0,
+0,83,2,53,56,0,0,165,3,28,204,160,160,226,100,226,200,211,76,241,240,0,1,
+102,8,22,75,64,137,73,20,230,105,133,7,19,39,22,70,154,103,143,128,0,11,48,
+20,28,76,156,113,75,34,78,62,0,0,45,3,103,31,0,0,22,65,44,57,137,62,33,179,
+216,162,152,192,131,18,124,162,27,61,138,41,108,32,196,159,16,217,232,235,
+81,76,104,73,137,62,81,13,158,142,181,20,184,16,98,79,136,108,244,244,168,
+166,56,36,196,159,40,134,207,79,74,138,93,10,49,39,194,173,192,158,158,149,
+20,188,20,98,79,133,91,129,61,109,74,41,124,30,68,159,16,217,236,83,108,96,
+68,137,62,81,13,158,197,54,182,17,34,79,136,108,244,117,169,182,52,38,68,
+159,40,134,207,71,90,155,92,8,145,39,196,54,122,122,84,219,28,19,34,79,148,
+67,103,167,165,77,174,133,72,147,225,86,224,79,79,74,155,94,10,145,39,194,
+173,192,158,182,165,54,190,206,25,212,35,208,226,100,150,211,201,29,162,44,
+140,35,103,0,0,3,192,252,0,0,0,0,206,25,228,35,208,226,100,150,211,201,29,
+162,44,140,35,103,0,0,3,192,252,0,0,0,0,206,25,244,35,208,226,100,150,211,
+201,29,162,44,140,35,103,0,0,3,192,252,0,0,0,0,206,26,4,35,208,226,100,150,
+211,201,29,162,44,140,35,103,0,0,0,1,0,0,0,0,0,206,26,20,35,208,226,100,
+150,211,201,29,162,44,140,35,103,0,0,0,1,0,0,0,0,0,206,26,36,35,208,226,
+100,150,211,201,29,162,44,140,35,103,0,0,0,65,0,0,0,0,0,206,26,52,35,208,
+226,100,150,211,201,29,162,44,140,35,103,0,0,0,65,0,0,0,0,0,206,26,68,35,
+208,226,100,150,211,201,29,162,44,140,35,103,0,0,0,65,0,0,0,0,0,206,26,84,
+35,208,226,100,150,211,201,29,162,44,140,35,103,0,0,0,129,0,0,0,0,0,195,
+154,99,16,38,36,0,251,68,117,179,216,162,128,68,72,1,241,13,158,197,20,150,
+25,18,0,125,162,58,217,232,235,117,100,162,136,25,18,0,125,162,58,217,232,
+235,116,36,162,145,2,226,64,15,136,108,244,117,186,178,81,73,129,113,32,7,
+196,54,122,58,221,9,40,165,64,200,144,3,237,17,214,207,79,75,171,37,20,80,
+200,144,3,237,17,214,207,79,75,161,37,20,138,23,18,0,124,67,103,167,165,
+213,146,138,77,11,137,0,62,33,179,211,210,232,73,69,42,133,196,128,31,10,
+183,2,125,89,40,163,5,196,128,31,10,183,2,125,9,40,164,96,200,144,3,224,
+221,64,172,157,89,40,163,134,68,128,31,6,234,5,100,232,73,69,35,133,68,128,
+31,104,142,182,125,89,40,180,0,168,144,3,237,17,214,207,161,37,22,144,19,
+18,0,124,67,103,213,146,139,80,9,137,0,62,33,179,232,73,69,172,5,90,40,153,
+59,68,117,179,216,166,192,77,162,137,147,136,108,246,41,180,176,219,69,19,
+39,104,142,182,122,58,221,89,41,178,6,218,40,153,59,68,117,179,209,214,232,
+73,77,162,6,90,40,153,56,134,207,71,91,171,37,54,152,25,104,162,100,226,27,
+61,29,110,132,148,218,160,109,162,137,147,180,71,91,61,61,46,172,148,217,
+67,109,20,76,157,162,58,217,233,233,116,36,166,209,67,45,20,76,156,67,103,
+167,165,213,146,155,77,12,180,81,50,113,13,158,158,151,66,74,109,84,50,209,
+68,201,194,173,192,159,86,74,108,193,150,138,38,78,21,110,4,250,18,83,104,
+193,182,138,38,78,13,212,10,201,213,146,155,56,109,162,137,147,131,117,2,
+178,116,36,166,209,194,237,20,76,157,162,58,217,245,100,167,16,2,237,20,76,
+157,162,58,217,244,36,167,18,2,173,20,76,156,67,103,213,146,156,80,10,180,
+81,50,113,13,159,66,74,113,97,175,221,48,216,110,64,4,42,22,189,179,0,196,
+133,0,185,80,32,28,78,99,193,18,80,36,4,19,159,141,172,0,178,90,4,74,73,0,
+22,209,68,201,187,129,4,2,8,3,132,64,60,36,0,171,240,84,6,149,113,72,176,
+157,91,116,116,32,88,181,129,32,11,42,218,221,131,234,219,165,1,8,187,152,
+255,188,231,235,248,47,86,227,105,18,2,56,175,185,255,244,17,91,40,110,173,
+198,209,208,36,7,188,189,179,240,238,82,97,80,93,122,32,125,144,132,160,12,
+22,162,42,7,236,161,25,232,237,105,64,158,160,230,63,205,59,127,102,11,217,
+66,51,210,129,61,65,236,127,154,118,254,205,171,197,34,168,48,6,90,194,1,0,
+39,75,88,72,8,9,33,186,194,80,64,76,13,214,19,2,130,96,110,150,189,0,65,6,
+51,214,20,128,65,17,11,214,19,130,137,121,211,210,211,144,6,39,75,88,80,0,
+201,119,235,10,8,41,86,231,71,88,80,129,79,135,186,122,133,224,34,25,69,
+234,80,3,91,141,172,40,96,139,113,180,181,133,36,21,110,54,142,134,176,165,
+1,176,23,213,47,0,216,134,234,215,128,111,117,181,232,128,209,3,70,230,107,
+64,5,139,168,209,235,10,32,36,144,102,235,136,3,146,27,172,40,160,146,132,
+103,172,40,192,115,3,117,133,28,22,113,163,69,172,41,103,1,66,188,17,145,
+52,168,4,202,113,67,76,130,227,76,194,13,240,108,0,0,83,224,0,2,193,0,104,
+146,84,97,48,0,1,94,192,56,169,24,145,179,192,0,5,112,8,56,16,32,128,56,18,
+52,125,230,86,147,190,140,28,50,21,13,39,31,23,60,145,158,57,12,141,47,129,
+6,155,194,188,24,49,39,199,89,188,124,92,242,70,120,224,201,33,69,15,155,
+163,201,68,14,49,39,199,197,211,116,240,242,113,197,232,18,180,254,36,3,17,
+46,18,243,35,100,128,172,156,178,70,163,154,76,34,248,146,164,108,248,75,
+204,141,146,28,217,115,137,27,95,27,241,173,236,162,160,224,200,2,206,9,
+113,13,148,192,209,18,22,164,146,37,193,57,162,4,249,39,196,128,24,2,178,
+66,213,136,68,201,16,77,209,131,31,192,242,88,96,92,191,151,34,100,136,38,
+232,255,252,92,221,199,197,12,68,209,82,66,212,11,155,185,41,197,13,55,38,
+3,66,213,47,135,254,72,12,162,99,133,116,112,0,1,72,66,14,16,16,50,37,202,
+160,150,154,66,14,20,8,57,192,28,24,80,113,50,113,100,105,166,120,248,0,0,
+179,1,65,196,201,199,20,178,36,227,224,0,2,208,54,113,240,0,1,100,11,181,
+192,0,5,178,1,18,160,65,24,131,20,145,25,188,48,132,122,28,76,146,218,121,
+35,180,69,145,132,108,224,0,0,120,31,128,0,0,0,25,188,56,132,122,28,76,146,
+218,121,35,180,69,145,132,108,224,0,0,120,31,128,0,0,0,40,160,45,110,23,30,
+176,33,184,0,0,183,32,29,235,2,27,199,23,0,0,23,4,51,120,129,8,244,56,153,
+37,180,242,71,104,139,35,8,217,192,0,0,240,63,0,0,0,0,51,120,145,8,244,56,
+153,37,180,242,71,104,139,35,8,217,192,0,0,0,64,0,0,0,0,51,120,161,8,244,
+56,153,37,180,242,71,104,139,35,8,217,192,0,0,0,64,0,0,0,0,51,120,177,8,
+244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,16,64,0,0,0,0,51,120,193,
+8,244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,16,64,0,0,0,0,51,120,
+209,8,244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,16,64,0,0,0,0,51,
+120,225,8,244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,32,64,0,0,0,0,
+32,227,194,0,97,57,162,4,246,104,5,34,92,35,68,225,161,166,220,16,16,137,
+112,52,41,73,29,185,1,65,196,201,197,145,166,153,246,72,3,137,204,120,34,
+74,8,199,1,67,17,162,112,201,84,128,97,144,78,25,42,16,131,169,1,205,66,8,
+35,68,225,161,166,239,128,0,10,192,64,196,104,156,50,96,0,2,172,73,240,117,
+96,57,170,97,4,104,156,52,52,221,240,0,1,82,1,74,9,129,125,240,0,1,82,32,
+148,25,174,137,58,23,51,190,0,0,42,69,64,195,32,156,50,96,0,2,160,81,238,2,
+3,107,173,218,3,192,
 };
 #else
 #error invalid endianness defines
@@ -11608,31 +12471,43 @@ DUK_INTERNAL const duk_uint8_t duk_builtins_data[4116] = {
 
 /* #include duk_internal.h -> already included */
 
-#define DUK__ERRFMT_BUFSIZE  256  /* size for formatting buffers */
+#define DUK__ERRFMT_BUFSIZE 256 /* size for formatting buffers */
 
 #if defined(DUK_USE_VERBOSE_ERRORS)
 
-DUK_INTERNAL DUK_COLD void duk_err_handle_error_fmt(duk_hthread *thr, const char *filename, duk_uint_t line_and_code, const char *fmt, ...) {
+DUK_INTERNAL DUK_COLD void duk_err_handle_error_fmt(duk_hthread *thr,
+                                                    const char *filename,
+                                                    duk_uint_t line_and_code,
+                                                    const char *fmt,
+                                                    ...) {
 	va_list ap;
 	char msg[DUK__ERRFMT_BUFSIZE];
 	va_start(ap, fmt);
 	(void) DUK_VSNPRINTF(msg, sizeof(msg), fmt, ap);
 	msg[sizeof(msg) - 1] = (char) 0;
-	duk_err_create_and_throw(thr, (duk_errcode_t) (line_and_code >> 24), msg, filename, (duk_int_t) (line_and_code & 0x00ffffffL));
-	va_end(ap);  /* dead code, but ensures portability (see Linux man page notes) */
+	duk_err_create_and_throw(thr,
+	                         (duk_errcode_t) (line_and_code >> 24),
+	                         msg,
+	                         filename,
+	                         (duk_int_t) (line_and_code & 0x00ffffffL));
+	va_end(ap); /* dead code, but ensures portability (see Linux man page notes) */
 }
 
 DUK_INTERNAL DUK_COLD void duk_err_handle_error(duk_hthread *thr, const char *filename, duk_uint_t line_and_code, const char *msg) {
-	duk_err_create_and_throw(thr, (duk_errcode_t) (line_and_code >> 24), msg, filename, (duk_int_t) (line_and_code & 0x00ffffffL));
+	duk_err_create_and_throw(thr,
+	                         (duk_errcode_t) (line_and_code >> 24),
+	                         msg,
+	                         filename,
+	                         (duk_int_t) (line_and_code & 0x00ffffffL));
 }
 
-#else  /* DUK_USE_VERBOSE_ERRORS */
+#else /* DUK_USE_VERBOSE_ERRORS */
 
 DUK_INTERNAL DUK_COLD void duk_err_handle_error(duk_hthread *thr, duk_errcode_t code) {
 	duk_err_create_and_throw(thr, code);
 }
 
-#endif  /* DUK_USE_VERBOSE_ERRORS */
+#endif /* DUK_USE_VERBOSE_ERRORS */
 
 /*
  *  Error throwing helpers
@@ -11640,14 +12515,34 @@ DUK_INTERNAL DUK_COLD void duk_err_handle_error(duk_hthread *thr, duk_errcode_t
 
 #if defined(DUK_USE_VERBOSE_ERRORS)
 #if defined(DUK_USE_PARANOID_ERRORS)
-DUK_INTERNAL DUK_COLD void duk_err_require_type_index(duk_hthread *thr, const char *filename, duk_int_t linenumber, duk_idx_t idx, const char *expect_name) {
-	DUK_ERROR_RAW_FMT3(thr, filename, linenumber, DUK_ERR_TYPE_ERROR, "%s required, found %s (stack index %ld)",
-	                   expect_name, duk_get_type_name(thr, idx), (long) idx);
+DUK_INTERNAL DUK_COLD void duk_err_require_type_index(duk_hthread *thr,
+                                                      const char *filename,
+                                                      duk_int_t linenumber,
+                                                      duk_idx_t idx,
+                                                      const char *expect_name) {
+	DUK_ERROR_RAW_FMT3(thr,
+	                   filename,
+	                   linenumber,
+	                   DUK_ERR_TYPE_ERROR,
+	                   "%s required, found %s (stack index %ld)",
+	                   expect_name,
+	                   duk_get_type_name(thr, idx),
+	                   (long) idx);
 }
 #else
-DUK_INTERNAL DUK_COLD void duk_err_require_type_index(duk_hthread *thr, const char *filename, duk_int_t linenumber, duk_idx_t idx, const char *expect_name) {
-	DUK_ERROR_RAW_FMT3(thr, filename, linenumber, DUK_ERR_TYPE_ERROR, "%s required, found %s (stack index %ld)",
-	                   expect_name, duk_push_string_readable(thr, idx), (long) idx);
+DUK_INTERNAL DUK_COLD void duk_err_require_type_index(duk_hthread *thr,
+                                                      const char *filename,
+                                                      duk_int_t linenumber,
+                                                      duk_idx_t idx,
+                                                      const char *expect_name) {
+	DUK_ERROR_RAW_FMT3(thr,
+	                   filename,
+	                   linenumber,
+	                   DUK_ERR_TYPE_ERROR,
+	                   "%s required, found %s (stack index %ld)",
+	                   expect_name,
+	                   duk_push_string_readable(thr, idx),
+	                   (long) idx);
 }
 #endif
 DUK_INTERNAL DUK_COLD void duk_err_error_internal(duk_hthread *thr, const char *filename, duk_int_t linenumber) {
@@ -11774,14 +12669,14 @@ DUK_INTERNAL const duk_int8_t duk_is_idchar_tab[128] = {
 	 * 1: IdentifierStart and IdentifierPart
 	 * -1: IdentifierPart only
 	 */
-	0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x00...0x0f */
-	0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x10...0x1f */
-	0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x20...0x2f */
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0,  0,  0,  0,  0,  0,   /* 0x30...0x3f */
-	0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,   /* 0x40...0x4f */
-	1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  1,   /* 0x50...0x5f */
-	0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,   /* 0x60...0x6f */
-	1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  0    /* 0x70...0x7f */
+	0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, /* 0x00...0x0f */
+	0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, /* 0x10...0x1f */
+	0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, /* 0x20...0x2f */
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, /* 0x30...0x3f */
+	0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 1, 1, 1, 1, 1, /* 0x40...0x4f */
+	1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 0, 0, 0, 0, 1, /* 0x50...0x5f */
+	0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 1, 1, 1, 1, 1, /* 0x60...0x6f */
+	1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 0, 0, 0, 0, 0 /* 0x70...0x7f */
 };
 #endif
 
@@ -11831,15 +12726,13 @@ DUK_INTERNAL duk_small_int_t duk_unicode_get_cesu8_length(duk_ucodepoint_t cp) {
 		/* Encoded as surrogate pair, each encoding to 3 bytes for
 		 * 6 bytes total.  Codepoints above U+10FFFF encode as 6 bytes
 		 * too, see duk_unicode_encode_cesu8().
-		  */
+		 */
 		return 3 + 3;
 	}
 }
-#endif  /* DUK_USE_ASSERTIONS */
+#endif /* DUK_USE_ASSERTIONS */
 
-DUK_INTERNAL const duk_uint8_t duk_unicode_xutf8_markers[7] = {
-	0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe
-};
+DUK_INTERNAL const duk_uint8_t duk_unicode_xutf8_markers[7] = { 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe };
 
 /* Encode to extended UTF-8; 'out' must have space for at least
  * DUK_UNICODE_MAX_XUTF8_LENGTH bytes.  Allows encoding of any
@@ -11854,7 +12747,7 @@ DUK_INTERNAL duk_small_int_t duk_unicode_encode_xutf8(duk_ucodepoint_t cp, duk_u
 	len = duk_unicode_get_xutf8_length(cp);
 	DUK_ASSERT(len > 0);
 
-	marker = duk_unicode_xutf8_markers[len - 1];  /* 64-bit OK because always >= 0 */
+	marker = duk_unicode_xutf8_markers[len - 1]; /* 64-bit OK because always >= 0 */
 
 	i = len;
 	DUK_ASSERT(i > 0);
@@ -11939,7 +12832,11 @@ DUK_INTERNAL duk_small_int_t duk_unicode_encode_cesu8(duk_ucodepoint_t cp, duk_u
 }
 
 /* Decode helper.  Return zero on error. */
-DUK_INTERNAL duk_small_int_t duk_unicode_decode_xutf8(duk_hthread *thr, const duk_uint8_t **ptr, const duk_uint8_t *ptr_start, const duk_uint8_t *ptr_end, duk_ucodepoint_t *out_cp) {
+DUK_INTERNAL duk_small_int_t duk_unicode_decode_xutf8(duk_hthread *thr,
+                                                      const duk_uint8_t **ptr,
+                                                      const duk_uint8_t *ptr_start,
+                                                      const duk_uint8_t *ptr_end,
+                                                      duk_ucodepoint_t *out_cp) {
 	const duk_uint8_t *p;
 	duk_uint32_t res;
 	duk_uint_fast8_t ch;
@@ -12001,7 +12898,7 @@ DUK_INTERNAL duk_small_int_t duk_unicode_decode_xutf8(duk_hthread *thr, const du
 		goto fail;
 	}
 
-	DUK_ASSERT(p >= ptr_start);  /* verified at beginning */
+	DUK_ASSERT(p >= ptr_start); /* verified at beginning */
 	if (p + n > ptr_end) {
 		/* check pointer at end */
 		goto fail;
@@ -12027,12 +12924,15 @@ DUK_INTERNAL duk_small_int_t duk_unicode_decode_xutf8(duk_hthread *thr, const du
 	*out_cp = res;
 	return 1;
 
- fail:
+fail:
 	return 0;
 }
 
 /* used by e.g. duk_regexp_executor.c, string built-ins */
-DUK_INTERNAL duk_ucodepoint_t duk_unicode_decode_xutf8_checked(duk_hthread *thr, const duk_uint8_t **ptr, const duk_uint8_t *ptr_start, const duk_uint8_t *ptr_end) {
+DUK_INTERNAL duk_ucodepoint_t duk_unicode_decode_xutf8_checked(duk_hthread *thr,
+                                                               const duk_uint8_t **ptr,
+                                                               const duk_uint8_t *ptr_start,
+                                                               const duk_uint8_t *ptr_end) {
 	duk_ucodepoint_t cp;
 
 	if (duk_unicode_decode_xutf8(thr, ptr, ptr_start, ptr_end, &cp)) {
@@ -12079,7 +12979,7 @@ DUK_INTERNAL duk_size_t duk_unicode_unvalidated_utf8_length(const duk_uint8_t *d
 	DUK_ASSERT(clen <= blen);
 	return clen;
 }
-#else  /* DUK_USE_PREFER_SIZE */
+#else /* DUK_USE_PREFER_SIZE */
 /* This seems like a good overall approach.  Fast path for ASCII in 4 byte
  * blocks.
  */
@@ -12091,7 +12991,7 @@ DUK_INTERNAL duk_size_t duk_unicode_unvalidated_utf8_length(const duk_uint8_t *d
 	duk_size_t ncont;
 	duk_size_t clen;
 
-	ncont = 0;  /* number of continuation (non-initial) bytes in [0x80,0xbf] */
+	ncont = 0; /* number of continuation (non-initial) bytes in [0x80,0xbf] */
 	p = data;
 	p_end = data + blen;
 	if (blen < 16) {
@@ -12116,7 +13016,7 @@ DUK_INTERNAL duk_size_t duk_unicode_unvalidated_utf8_length(const duk_uint8_t *d
 		duk_uint32_t x;
 		x = *p32++;
 		if (DUK_LIKELY((x & 0x80808080UL) == 0)) {
-			;  /* ASCII fast path */
+			; /* ASCII fast path */
 		} else {
 			/* Flip highest bit of each byte which changes
 			 * the bit pattern 10xxxxxx into 00xxxxxx which
@@ -12140,7 +13040,7 @@ DUK_INTERNAL duk_size_t duk_unicode_unvalidated_utf8_length(const duk_uint8_t *d
 	p = (const duk_uint8_t *) p32;
 	/* Fall through to handle the rest. */
 
- skip_fastpath:
+skip_fastpath:
 	while (p != p_end) {
 		duk_uint8_t x;
 		x = *p++;
@@ -12154,7 +13054,91 @@ DUK_INTERNAL duk_size_t duk_unicode_unvalidated_utf8_length(const duk_uint8_t *d
 	DUK_ASSERT(clen <= blen);
 	return clen;
 }
-#endif  /* DUK_USE_PREFER_SIZE */
+#endif /* DUK_USE_PREFER_SIZE */
+
+/* Check whether a string is UTF-8 compatible or not. */
+DUK_INTERNAL duk_bool_t duk_unicode_is_utf8_compatible(const duk_uint8_t *buf, duk_size_t len) {
+	duk_size_t i = 0;
+#if !defined(DUK_USE_PREFER_SIZE)
+	duk_size_t len_safe;
+#endif
+
+	/* Many practical strings are ASCII only, so use a fast path check
+	 * to check chunks of bytes at once with minimal branch cost.
+	 */
+#if !defined(DUK_USE_PREFER_SIZE)
+	len_safe = len & ~0x03UL;
+	for (; i < len_safe; i += 4) {
+		duk_uint8_t t = buf[i] | buf[i + 1] | buf[i + 2] | buf[i + 3];
+		if (DUK_UNLIKELY((t & 0x80U) != 0U)) {
+			/* At least one byte was outside 0x00-0x7f, break
+			 * out to slow path (and remain there).
+			 *
+			 * XXX: We could also deal with the problem character
+			 * and resume fast path later.
+			 */
+			break;
+		}
+	}
+#endif
+
+	for (; i < len;) {
+		duk_uint8_t t;
+		duk_size_t left;
+		duk_size_t ncont;
+		duk_uint32_t cp;
+		duk_uint32_t mincp;
+
+		t = buf[i++];
+		if (DUK_LIKELY((t & 0x80U) == 0U)) {
+			/* Fast path, ASCII. */
+			continue;
+		}
+
+		/* Non-ASCII start byte, slow path.
+		 *
+		 * 10xx xxxx          -> continuation byte
+		 * 110x xxxx + 1*CONT -> [0x80, 0x7ff]
+		 * 1110 xxxx + 2*CONT -> [0x800, 0xffff], must reject [0xd800,0xdfff]
+		 * 1111 0xxx + 3*CONT -> [0x10000, 0x10ffff]
+		 */
+		left = len - i;
+		if (t <= 0xdfU) { /* 1101 1111 = 0xdf */
+			if (t <= 0xbfU) { /* 1011 1111 = 0xbf */
+				return 0;
+			}
+			ncont = 1;
+			mincp = 0x80UL;
+			cp = t & 0x1fU;
+		} else if (t <= 0xefU) { /* 1110 1111 = 0xef */
+			ncont = 2;
+			mincp = 0x800UL;
+			cp = t & 0x0fU;
+		} else if (t <= 0xf7U) { /* 1111 0111 = 0xf7 */
+			ncont = 3;
+			mincp = 0x10000UL;
+			cp = t & 0x07U;
+		} else {
+			return 0;
+		}
+		if (left < ncont) {
+			return 0;
+		}
+		while (ncont > 0U) {
+			t = buf[i++];
+			if ((t & 0xc0U) != 0x80U) { /* 10xx xxxx */
+				return 0;
+			}
+			cp = (cp << 6) + (t & 0x3fU);
+			ncont--;
+		}
+		if (cp < mincp || cp > 0x10ffffUL || (cp >= 0xd800UL && cp <= 0xdfffUL)) {
+			return 0;
+		}
+	}
+
+	return 1;
+}
 
 /*
  *  Unicode range matcher
@@ -12208,7 +13192,9 @@ DUK_LOCAL duk_small_int_t duk__uni_range_match(const duk_uint8_t *unitab, duk_si
 		/* [r1,r2] is the range */
 
 		DUK_DDD(DUK_DDDPRINT("duk__uni_range_match: cp=%06lx range=[0x%06lx,0x%06lx]",
-		                     (unsigned long) cp, (unsigned long) r1, (unsigned long) r2));
+		                     (unsigned long) cp,
+		                     (unsigned long) r1,
+		                     (unsigned long) r2));
 		if (cp >= r1 && cp <= r2) {
 			return 1;
 		}
@@ -12278,19 +13264,17 @@ DUK_INTERNAL duk_small_int_t duk_unicode_is_whitespace(duk_codepoint_t cp) {
 	/* cp == -1 (EOF) never matches and causes return value 0 */
 
 	lo = (duk_uint_fast8_t) (cp & 0xff);
-	hi = (duk_uint_fast32_t) (cp >> 8);  /* does not fit into an uchar */
+	hi = (duk_uint_fast32_t) (cp >> 8); /* does not fit into an uchar */
 
 	if (hi == 0x0000UL) {
-		if (lo == 0x09U || lo == 0x0bU || lo == 0x0cU ||
-		    lo == 0x20U || lo == 0xa0U) {
+		if (lo == 0x09U || lo == 0x0bU || lo == 0x0cU || lo == 0x20U || lo == 0xa0U) {
 			return 1;
 		}
 	} else if (hi == 0x0020UL) {
 		if (lo <= 0x0aU || lo == 0x2fU || lo == 0x5fU) {
 			return 1;
 		}
-	} else if (cp == 0x1680L || cp == 0x180eL || cp == 0x3000L ||
-	           cp == 0xfeffL) {
+	} else if (cp == 0x1680L || cp == 0x180eL || cp == 0x3000L || cp == 0xfeffL) {
 		return 1;
 	}
 
@@ -12309,8 +13293,7 @@ DUK_INTERNAL duk_small_int_t duk_unicode_is_line_terminator(duk_codepoint_t cp)
 	 *  into a single line terminator.  This must be handled by the caller.
 	 */
 
-	if (cp == 0x000aL || cp == 0x000dL || cp == 0x2028L ||
-	    cp == 0x2029L) {
+	if (cp == 0x000aL || cp == 0x000dL || cp == 0x2028L || cp == 0x2029L) {
 		return 1;
 	}
 
@@ -12361,9 +13344,7 @@ DUK_INTERNAL duk_small_int_t duk_unicode_is_identifier_start(duk_codepoint_t cp)
 #if defined(DUK_USE_IDCHAR_FASTPATH)
 		return (cp >= 0) && (duk_is_idchar_tab[cp] > 0);
 #else
-		if ((cp >= 'a' && cp <= 'z') ||
-		    (cp >= 'A' && cp <= 'Z') ||
-		    cp == '_' || cp == '$') {
+		if ((cp >= 'a' && cp <= 'z') || (cp >= 'A' && cp <= 'Z') || cp == '_' || cp == '$') {
 			return 1;
 		}
 		return 0;
@@ -12373,17 +13354,13 @@ DUK_INTERNAL duk_small_int_t duk_unicode_is_identifier_start(duk_codepoint_t cp)
 	/* Non-ASCII slow path (range-by-range linear comparison), very slow */
 
 #if defined(DUK_USE_SOURCE_NONBMP)
-	if (duk__uni_range_match(duk_unicode_ids_noa,
-	                         (duk_size_t) sizeof(duk_unicode_ids_noa),
-	                         (duk_codepoint_t) cp)) {
+	if (duk__uni_range_match(duk_unicode_ids_noa, (duk_size_t) sizeof(duk_unicode_ids_noa), (duk_codepoint_t) cp)) {
 		return 1;
 	}
 	return 0;
 #else
 	if (cp < 0x10000L) {
-		if (duk__uni_range_match(duk_unicode_ids_noabmp,
-		                         sizeof(duk_unicode_ids_noabmp),
-		                         (duk_codepoint_t) cp)) {
+		if (duk__uni_range_match(duk_unicode_ids_noabmp, sizeof(duk_unicode_ids_noabmp), (duk_codepoint_t) cp)) {
 			return 1;
 		}
 		return 0;
@@ -12450,10 +13427,7 @@ DUK_INTERNAL duk_small_int_t duk_unicode_is_identifier_part(duk_codepoint_t cp)
 #if defined(DUK_USE_IDCHAR_FASTPATH)
 		return (cp >= 0) && (duk_is_idchar_tab[cp] != 0);
 #else
-		if ((cp >= 'a' && cp <= 'z') ||
-		    (cp >= 'A' && cp <= 'Z') ||
-		    (cp >= '0' && cp <= '9') ||
-		    cp == '_' || cp == '$') {
+		if ((cp >= 'a' && cp <= 'z') || (cp >= 'A' && cp <= 'Z') || (cp >= '0' && cp <= '9') || cp == '_' || cp == '$') {
 			return 1;
 		}
 		return 0;
@@ -12463,20 +13437,14 @@ DUK_INTERNAL duk_small_int_t duk_unicode_is_identifier_part(duk_codepoint_t cp)
 	/* Non-ASCII slow path (range-by-range linear comparison), very slow */
 
 #if defined(DUK_USE_SOURCE_NONBMP)
-	if (duk__uni_range_match(duk_unicode_ids_noa,
-	                         sizeof(duk_unicode_ids_noa),
-	                         (duk_codepoint_t) cp) ||
-	    duk__uni_range_match(duk_unicode_idp_m_ids_noa,
-	                         sizeof(duk_unicode_idp_m_ids_noa),
-	                         (duk_codepoint_t) cp)) {
+	if (duk__uni_range_match(duk_unicode_ids_noa, sizeof(duk_unicode_ids_noa), (duk_codepoint_t) cp) ||
+	    duk__uni_range_match(duk_unicode_idp_m_ids_noa, sizeof(duk_unicode_idp_m_ids_noa), (duk_codepoint_t) cp)) {
 		return 1;
 	}
 	return 0;
 #else
 	if (cp < 0x10000L) {
-		if (duk__uni_range_match(duk_unicode_ids_noabmp,
-		                         sizeof(duk_unicode_ids_noabmp),
-		                         (duk_codepoint_t) cp) ||
+		if (duk__uni_range_match(duk_unicode_ids_noabmp, sizeof(duk_unicode_ids_noabmp), (duk_codepoint_t) cp) ||
 		    duk__uni_range_match(duk_unicode_idp_m_ids_noabmp,
 		                         sizeof(duk_unicode_idp_m_ids_noabmp),
 		                         (duk_codepoint_t) cp)) {
@@ -12512,8 +13480,7 @@ DUK_INTERNAL duk_small_int_t duk_unicode_is_letter(duk_codepoint_t cp) {
 
 	/* ASCII (and EOF) fast path -- quick accept and reject */
 	if (cp <= 0x7fL) {
-		if ((cp >= 'a' && cp <= 'z') ||
-		    (cp >= 'A' && cp <= 'Z')) {
+		if ((cp >= 'a' && cp <= 'z') || (cp >= 'A' && cp <= 'Z')) {
 			return 1;
 		}
 		return 0;
@@ -12522,20 +13489,14 @@ DUK_INTERNAL duk_small_int_t duk_unicode_is_letter(duk_codepoint_t cp) {
 	/* Non-ASCII slow path (range-by-range linear comparison), very slow */
 
 #if defined(DUK_USE_SOURCE_NONBMP)
-	if (duk__uni_range_match(duk_unicode_ids_noa,
-	                         sizeof(duk_unicode_ids_noa),
-	                         (duk_codepoint_t) cp) &&
-	    !duk__uni_range_match(duk_unicode_ids_m_let_noa,
-	                          sizeof(duk_unicode_ids_m_let_noa),
-	                          (duk_codepoint_t) cp)) {
+	if (duk__uni_range_match(duk_unicode_ids_noa, sizeof(duk_unicode_ids_noa), (duk_codepoint_t) cp) &&
+	    !duk__uni_range_match(duk_unicode_ids_m_let_noa, sizeof(duk_unicode_ids_m_let_noa), (duk_codepoint_t) cp)) {
 		return 1;
 	}
 	return 0;
 #else
 	if (cp < 0x10000L) {
-		if (duk__uni_range_match(duk_unicode_ids_noabmp,
-		                         sizeof(duk_unicode_ids_noabmp),
-		                         (duk_codepoint_t) cp) &&
+		if (duk__uni_range_match(duk_unicode_ids_noabmp, sizeof(duk_unicode_ids_noabmp), (duk_codepoint_t) cp) &&
 		    !duk__uni_range_match(duk_unicode_ids_m_let_noabmp,
 		                          sizeof(duk_unicode_ids_m_let_noabmp),
 		                          (duk_codepoint_t) cp)) {
@@ -12572,10 +13533,7 @@ DUK_INTERNAL duk_small_int_t duk_unicode_is_letter(duk_codepoint_t cp) {
  */
 
 DUK_LOCAL
-duk_codepoint_t duk__slow_case_conversion(duk_hthread *thr,
-                                          duk_bufwriter_ctx *bw,
-                                          duk_codepoint_t cp,
-                                          duk_bitdecoder_ctx *bd_ctx) {
+duk_codepoint_t duk__slow_case_conversion(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_codepoint_t cp, duk_bitdecoder_ctx *bd_ctx) {
 	duk_small_int_t skip = 0;
 	duk_small_int_t n;
 	duk_small_int_t t;
@@ -12605,10 +13563,13 @@ duk_codepoint_t duk__slow_case_conversion(duk_hthread *thr,
 			start_o = (duk_codepoint_t) duk_bd_decode(bd_ctx, 16);
 			count = (duk_small_int_t) duk_bd_decode(bd_ctx, 7);
 			DUK_DDD(DUK_DDDPRINT("range: start_i=%ld, start_o=%ld, count=%ld, skip=%ld",
-			                     (long) start_i, (long) start_o, (long) count, (long) skip));
+			                     (long) start_i,
+			                     (long) start_o,
+			                     (long) count,
+			                     (long) skip));
 
 			if (cp >= start_i) {
-				tmp_cp = cp - start_i;  /* always >= 0 */
+				tmp_cp = cp - start_i; /* always >= 0 */
 				if (tmp_cp < (duk_codepoint_t) count * (duk_codepoint_t) skip &&
 				    (tmp_cp % (duk_codepoint_t) skip) == 0) {
 					DUK_DDD(DUK_DDDPRINT("range matches input codepoint"));
@@ -12660,7 +13621,7 @@ duk_codepoint_t duk__slow_case_conversion(duk_hthread *thr,
 	DUK_DDD(DUK_DDDPRINT("no rule matches, output is same as input"));
 	/* fall through */
 
- single:
+single:
 	if (bw != NULL) {
 		DUK_BW_WRITE_RAW_XUTF8(thr, bw, (duk_ucodepoint_t) cp);
 	}
@@ -12722,9 +13683,9 @@ duk_codepoint_t duk__case_transform_helper(duk_hthread *thr,
 		 *  The rule is not locale/language specific so it is supported.
 		 */
 
-		if (cp == 0x03a3L &&    /* U+03A3 = GREEK CAPITAL LETTER SIGMA */
-		    duk_unicode_is_letter(prev) &&        /* prev exists and is not a letter */
-		    !duk_unicode_is_letter(next)) {       /* next does not exist or next is not a letter */
+		if (cp == 0x03a3L && /* U+03A3 = GREEK CAPITAL LETTER SIGMA */
+		    duk_unicode_is_letter(prev) && /* prev exists and is not a letter */
+		    !duk_unicode_is_letter(next)) { /* next does not exist or next is not a letter */
 			/* Capital sigma occurred at "end of word", lowercase to
 			 * U+03C2 = GREEK SMALL LETTER FINAL SIGMA.  Otherwise
 			 * fall through and let the normal rules lowercase it to
@@ -12750,13 +13711,13 @@ duk_codepoint_t duk__case_transform_helper(duk_hthread *thr,
 	}
 	return duk__slow_case_conversion(thr, bw, cp, &bd_ctx);
 
- singlechar:
+singlechar:
 	if (bw != NULL) {
 		DUK_BW_WRITE_RAW_XUTF8(thr, bw, (duk_ucodepoint_t) cp);
 	}
 	return cp;
 
- /* unused now, not needed until Turkish/Azeri */
+	/* unused now, not needed until Turkish/Azeri */
 #if 0
  nochar:
 	return -1;
@@ -12774,7 +13735,7 @@ DUK_INTERNAL void duk_unicode_case_convert_string(duk_hthread *thr, duk_bool_t u
 	const duk_uint8_t *p, *p_start, *p_end;
 	duk_codepoint_t prev, curr, next;
 
-	h_input = duk_require_hstring(thr, -1);  /* Accept symbols. */
+	h_input = duk_require_hstring(thr, -1); /* Accept symbols. */
 	DUK_ASSERT(h_input != NULL);
 
 	bw = &bw_alloc;
@@ -12786,7 +13747,8 @@ DUK_INTERNAL void duk_unicode_case_convert_string(duk_hthread *thr, duk_bool_t u
 	p_end = p_start + DUK_HSTRING_GET_BYTELEN(h_input);
 	p = p_start;
 
-	prev = -1; DUK_UNREF(prev);
+	prev = -1;
+	DUK_UNREF(prev);
 	curr = -1;
 	next = -1;
 	for (;;) {
@@ -12811,17 +13773,12 @@ DUK_INTERNAL void duk_unicode_case_convert_string(duk_hthread *thr, duk_bool_t u
 			/* Ensure space for maximum multi-character result; estimate is overkill. */
 			DUK_BW_ENSURE(thr, bw, 8 * DUK_UNICODE_MAX_XUTF8_LENGTH);
 
-			duk__case_transform_helper(thr,
-			                           bw,
-			                           (duk_codepoint_t) curr,
-			                           prev,
-			                           next,
-			                           uppercase);
+			duk__case_transform_helper(thr, bw, (duk_codepoint_t) curr, prev, next, uppercase);
 		}
 	}
 
 	DUK_BW_COMPACT(thr, bw);
-	(void) duk_buffer_to_string(thr, -1);  /* Safe, output is encoded. */
+	(void) duk_buffer_to_string(thr, -1); /* Safe, output is encoded. */
 	/* invalidates h_buf pointer */
 	duk_remove_m2(thr);
 }
@@ -12844,15 +13801,15 @@ DUK_INTERNAL duk_codepoint_t duk_unicode_re_canonicalize_char(duk_hthread *thr,
 		return (duk_codepoint_t) duk_unicode_re_canon_lookup[cp];
 	}
 	return cp;
-#else  /* DUK_USE_REGEXP_CANON_WORKAROUND */
+#else /* DUK_USE_REGEXP_CANON_WORKAROUND */
 	duk_codepoint_t y;
 
 	y = duk__case_transform_helper(thr,
-	                               NULL,    /* NULL is allowed, no output */
-	                               cp,      /* curr char */
-	                               -1,      /* prev char */
-	                               -1,      /* next char */
-	                               1);      /* uppercase */
+	                               NULL, /* NULL is allowed, no output */
+	                               cp, /* curr char */
+	                               -1, /* prev char */
+	                               -1, /* next char */
+	                               1); /* uppercase */
 
 	if ((y < 0) || (cp >= 0x80 && y < 0x80)) {
 		/* multiple codepoint conversion or non-ASCII mapped to ASCII
@@ -12862,7 +13819,7 @@ DUK_INTERNAL duk_codepoint_t duk_unicode_re_canonicalize_char(duk_hthread *thr,
 	}
 
 	return y;
-#endif  /* DUK_USE_REGEXP_CANON_WORKAROUND */
+#endif /* DUK_USE_REGEXP_CANON_WORKAROUND */
 }
 
 /*
@@ -12875,10 +13832,7 @@ DUK_INTERNAL duk_small_int_t duk_unicode_re_is_wordchar(duk_codepoint_t x) {
 	 *  Note: the description in E5 Section 15.10.2.6 has a typo, it
 	 *  contains 'A' twice and lacks 'a'; the intent is [0-9a-zA-Z_].
 	 */
-	if ((x >= '0' && x <= '9') ||
-	    (x >= 'a' && x <= 'z') ||
-	    (x >= 'A' && x <= 'Z') ||
-	    (x == '_')) {
+	if ((x >= '0' && x <= '9') || (x >= 'a' && x <= 'z') || (x >= 'A' && x <= 'Z') || (x == '_')) {
 		return 1;
 	}
 	return 0;
@@ -12890,54 +13844,187 @@ DUK_INTERNAL duk_small_int_t duk_unicode_re_is_wordchar(duk_codepoint_t x) {
 
 /* exposed because lexer needs these too */
 DUK_INTERNAL const duk_uint16_t duk_unicode_re_ranges_digit[2] = {
-	(duk_uint16_t) 0x0030UL, (duk_uint16_t) 0x0039UL,
+	(duk_uint16_t) 0x0030UL,
+	(duk_uint16_t) 0x0039UL,
 };
 DUK_INTERNAL const duk_uint16_t duk_unicode_re_ranges_white[22] = {
-	(duk_uint16_t) 0x0009UL, (duk_uint16_t) 0x000DUL,
-	(duk_uint16_t) 0x0020UL, (duk_uint16_t) 0x0020UL,
-	(duk_uint16_t) 0x00A0UL, (duk_uint16_t) 0x00A0UL,
-	(duk_uint16_t) 0x1680UL, (duk_uint16_t) 0x1680UL,
-	(duk_uint16_t) 0x180EUL, (duk_uint16_t) 0x180EUL,
-	(duk_uint16_t) 0x2000UL, (duk_uint16_t) 0x200AUL,
-	(duk_uint16_t) 0x2028UL, (duk_uint16_t) 0x2029UL,
-	(duk_uint16_t) 0x202FUL, (duk_uint16_t) 0x202FUL,
-	(duk_uint16_t) 0x205FUL, (duk_uint16_t) 0x205FUL,
-	(duk_uint16_t) 0x3000UL, (duk_uint16_t) 0x3000UL,
+	(duk_uint16_t) 0x0009UL, (duk_uint16_t) 0x000DUL, (duk_uint16_t) 0x0020UL, (duk_uint16_t) 0x0020UL, (duk_uint16_t) 0x00A0UL,
+	(duk_uint16_t) 0x00A0UL, (duk_uint16_t) 0x1680UL, (duk_uint16_t) 0x1680UL, (duk_uint16_t) 0x180EUL, (duk_uint16_t) 0x180EUL,
+	(duk_uint16_t) 0x2000UL, (duk_uint16_t) 0x200AUL, (duk_uint16_t) 0x2028UL, (duk_uint16_t) 0x2029UL, (duk_uint16_t) 0x202FUL,
+	(duk_uint16_t) 0x202FUL, (duk_uint16_t) 0x205FUL, (duk_uint16_t) 0x205FUL, (duk_uint16_t) 0x3000UL, (duk_uint16_t) 0x3000UL,
 	(duk_uint16_t) 0xFEFFUL, (duk_uint16_t) 0xFEFFUL,
 };
 DUK_INTERNAL const duk_uint16_t duk_unicode_re_ranges_wordchar[8] = {
-	(duk_uint16_t) 0x0030UL, (duk_uint16_t) 0x0039UL,
-	(duk_uint16_t) 0x0041UL, (duk_uint16_t) 0x005AUL,
-	(duk_uint16_t) 0x005FUL, (duk_uint16_t) 0x005FUL,
-	(duk_uint16_t) 0x0061UL, (duk_uint16_t) 0x007AUL,
+	(duk_uint16_t) 0x0030UL, (duk_uint16_t) 0x0039UL, (duk_uint16_t) 0x0041UL, (duk_uint16_t) 0x005AUL,
+	(duk_uint16_t) 0x005FUL, (duk_uint16_t) 0x005FUL, (duk_uint16_t) 0x0061UL, (duk_uint16_t) 0x007AUL,
 };
 DUK_INTERNAL const duk_uint16_t duk_unicode_re_ranges_not_digit[4] = {
-	(duk_uint16_t) 0x0000UL, (duk_uint16_t) 0x002FUL,
-	(duk_uint16_t) 0x003AUL, (duk_uint16_t) 0xFFFFUL,
+	(duk_uint16_t) 0x0000UL,
+	(duk_uint16_t) 0x002FUL,
+	(duk_uint16_t) 0x003AUL,
+	(duk_uint16_t) 0xFFFFUL,
 };
 DUK_INTERNAL const duk_uint16_t duk_unicode_re_ranges_not_white[24] = {
-	(duk_uint16_t) 0x0000UL, (duk_uint16_t) 0x0008UL,
-	(duk_uint16_t) 0x000EUL, (duk_uint16_t) 0x001FUL,
-	(duk_uint16_t) 0x0021UL, (duk_uint16_t) 0x009FUL,
-	(duk_uint16_t) 0x00A1UL, (duk_uint16_t) 0x167FUL,
-	(duk_uint16_t) 0x1681UL, (duk_uint16_t) 0x180DUL,
-	(duk_uint16_t) 0x180FUL, (duk_uint16_t) 0x1FFFUL,
-	(duk_uint16_t) 0x200BUL, (duk_uint16_t) 0x2027UL,
-	(duk_uint16_t) 0x202AUL, (duk_uint16_t) 0x202EUL,
-	(duk_uint16_t) 0x2030UL, (duk_uint16_t) 0x205EUL,
-	(duk_uint16_t) 0x2060UL, (duk_uint16_t) 0x2FFFUL,
-	(duk_uint16_t) 0x3001UL, (duk_uint16_t) 0xFEFEUL,
-	(duk_uint16_t) 0xFF00UL, (duk_uint16_t) 0xFFFFUL,
+	(duk_uint16_t) 0x0000UL, (duk_uint16_t) 0x0008UL, (duk_uint16_t) 0x000EUL, (duk_uint16_t) 0x001FUL, (duk_uint16_t) 0x0021UL,
+	(duk_uint16_t) 0x009FUL, (duk_uint16_t) 0x00A1UL, (duk_uint16_t) 0x167FUL, (duk_uint16_t) 0x1681UL, (duk_uint16_t) 0x180DUL,
+	(duk_uint16_t) 0x180FUL, (duk_uint16_t) 0x1FFFUL, (duk_uint16_t) 0x200BUL, (duk_uint16_t) 0x2027UL, (duk_uint16_t) 0x202AUL,
+	(duk_uint16_t) 0x202EUL, (duk_uint16_t) 0x2030UL, (duk_uint16_t) 0x205EUL, (duk_uint16_t) 0x2060UL, (duk_uint16_t) 0x2FFFUL,
+	(duk_uint16_t) 0x3001UL, (duk_uint16_t) 0xFEFEUL, (duk_uint16_t) 0xFF00UL, (duk_uint16_t) 0xFFFFUL,
 };
 DUK_INTERNAL const duk_uint16_t duk_unicode_re_ranges_not_wordchar[10] = {
-	(duk_uint16_t) 0x0000UL, (duk_uint16_t) 0x002FUL,
-	(duk_uint16_t) 0x003AUL, (duk_uint16_t) 0x0040UL,
-	(duk_uint16_t) 0x005BUL, (duk_uint16_t) 0x005EUL,
-	(duk_uint16_t) 0x0060UL, (duk_uint16_t) 0x0060UL,
-	(duk_uint16_t) 0x007BUL, (duk_uint16_t) 0xFFFFUL,
+	(duk_uint16_t) 0x0000UL, (duk_uint16_t) 0x002FUL, (duk_uint16_t) 0x003AUL, (duk_uint16_t) 0x0040UL, (duk_uint16_t) 0x005BUL,
+	(duk_uint16_t) 0x005EUL, (duk_uint16_t) 0x0060UL, (duk_uint16_t) 0x0060UL, (duk_uint16_t) 0x007BUL, (duk_uint16_t) 0xFFFFUL,
 };
 
-#endif  /* DUK_USE_REGEXP_SUPPORT */
+#endif /* DUK_USE_REGEXP_SUPPORT */
+/*
+ *  Macro support functions for reading/writing raw data.
+ *
+ *  These are done using memcpy to ensure they're valid even for unaligned
+ *  reads/writes on platforms where alignment counts.  On x86 at least gcc
+ *  is able to compile these into a bswap+mov.  "Always inline" is used to
+ *  ensure these macros compile to minimal code.
+ */
+
+/* #include duk_internal.h -> already included */
+
+union duk__u16_union {
+	duk_uint8_t b[2];
+	duk_uint16_t x;
+};
+typedef union duk__u16_union duk__u16_union;
+
+union duk__u32_union {
+	duk_uint8_t b[4];
+	duk_uint32_t x;
+};
+typedef union duk__u32_union duk__u32_union;
+
+#if defined(DUK_USE_64BIT_OPS)
+union duk__u64_union {
+	duk_uint8_t b[8];
+	duk_uint64_t x;
+};
+typedef union duk__u64_union duk__u64_union;
+#endif
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_uint16_t duk_raw_read_u16_be(const duk_uint8_t *p) {
+	duk__u16_union u;
+	duk_memcpy((void *) u.b, (const void *) p, (size_t) 2);
+	u.x = DUK_NTOH16(u.x);
+	return u.x;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_uint32_t duk_raw_read_u32_be(const duk_uint8_t *p) {
+	duk__u32_union u;
+	duk_memcpy((void *) u.b, (const void *) p, (size_t) 4);
+	u.x = DUK_NTOH32(u.x);
+	return u.x;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_float_t duk_raw_read_float_be(const duk_uint8_t *p) {
+	duk_float_union fu;
+	duk_memcpy((void *) fu.uc, (const void *) p, (size_t) 4);
+	duk_fltunion_big_to_host(&fu);
+	return fu.f;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_double_t duk_raw_read_double_be(const duk_uint8_t *p) {
+	duk_double_union du;
+	duk_memcpy((void *) du.uc, (const void *) p, (size_t) 8);
+	duk_dblunion_big_to_host(&du);
+	return du.d;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_uint16_t duk_raw_readinc_u16_be(const duk_uint8_t **p) {
+	duk_uint16_t res = duk_raw_read_u16_be(*p);
+	*p += 2;
+	return res;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_uint32_t duk_raw_readinc_u32_be(const duk_uint8_t **p) {
+	duk_uint32_t res = duk_raw_read_u32_be(*p);
+	*p += 4;
+	return res;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_float_t duk_raw_readinc_float_be(const duk_uint8_t **p) {
+	duk_float_t res = duk_raw_read_float_be(*p);
+	*p += 4;
+	return res;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_double_t duk_raw_readinc_double_be(const duk_uint8_t **p) {
+	duk_double_t res = duk_raw_read_double_be(*p);
+	*p += 8;
+	return res;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_u16_be(duk_uint8_t *p, duk_uint16_t val) {
+	duk__u16_union u;
+	u.x = DUK_HTON16(val);
+	duk_memcpy((void *) p, (const void *) u.b, (size_t) 2);
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_u32_be(duk_uint8_t *p, duk_uint32_t val) {
+	duk__u32_union u;
+	u.x = DUK_HTON32(val);
+	duk_memcpy((void *) p, (const void *) u.b, (size_t) 4);
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_float_be(duk_uint8_t *p, duk_float_t val) {
+	duk_float_union fu;
+	fu.f = val;
+	duk_fltunion_host_to_big(&fu);
+	duk_memcpy((void *) p, (const void *) fu.uc, (size_t) 4);
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_double_be(duk_uint8_t *p, duk_double_t val) {
+	duk_double_union du;
+	du.d = val;
+	duk_dblunion_host_to_big(&du);
+	duk_memcpy((void *) p, (const void *) du.uc, (size_t) 8);
+}
+
+DUK_INTERNAL duk_small_int_t duk_raw_write_xutf8(duk_uint8_t *p, duk_ucodepoint_t val) {
+	duk_small_int_t len = duk_unicode_encode_xutf8(val, p);
+	return len;
+}
+
+DUK_INTERNAL duk_small_int_t duk_raw_write_cesu8(duk_uint8_t *p, duk_ucodepoint_t val) {
+	duk_small_int_t len = duk_unicode_encode_cesu8(val, p);
+	return len;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_writeinc_u16_be(duk_uint8_t **p, duk_uint16_t val) {
+	duk_raw_write_u16_be(*p, val);
+	*p += 2;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_writeinc_u32_be(duk_uint8_t **p, duk_uint32_t val) {
+	duk_raw_write_u32_be(*p, val);
+	*p += 4;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_writeinc_float_be(duk_uint8_t **p, duk_float_t val) {
+	duk_raw_write_float_be(*p, val);
+	*p += 4;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_writeinc_double_be(duk_uint8_t **p, duk_double_t val) {
+	duk_raw_write_double_be(*p, val);
+	*p += 8;
+}
+
+DUK_INTERNAL void duk_raw_writeinc_xutf8(duk_uint8_t **p, duk_ucodepoint_t val) {
+	duk_small_int_t len = duk_unicode_encode_xutf8(val, *p);
+	*p += len;
+}
+
+DUK_INTERNAL void duk_raw_writeinc_cesu8(duk_uint8_t **p, duk_ucodepoint_t val) {
+	duk_small_int_t len = duk_unicode_encode_cesu8(val, *p);
+	*p += len;
+}
 /*
  *  Misc util stuff.
  */
@@ -12950,23 +14037,17 @@ DUK_INTERNAL const duk_uint16_t duk_unicode_re_ranges_not_wordchar[10] = {
  */
 
 DUK_INTERNAL const duk_uint8_t duk_lc_digits[36] = {
-	DUK_ASC_0, DUK_ASC_1, DUK_ASC_2, DUK_ASC_3,
-	DUK_ASC_4, DUK_ASC_5, DUK_ASC_6, DUK_ASC_7,
-	DUK_ASC_8, DUK_ASC_9, DUK_ASC_LC_A, DUK_ASC_LC_B,
-	DUK_ASC_LC_C, DUK_ASC_LC_D, DUK_ASC_LC_E, DUK_ASC_LC_F,
-	DUK_ASC_LC_G, DUK_ASC_LC_H, DUK_ASC_LC_I, DUK_ASC_LC_J,
-	DUK_ASC_LC_K, DUK_ASC_LC_L, DUK_ASC_LC_M, DUK_ASC_LC_N,
-	DUK_ASC_LC_O, DUK_ASC_LC_P, DUK_ASC_LC_Q, DUK_ASC_LC_R,
-	DUK_ASC_LC_S, DUK_ASC_LC_T, DUK_ASC_LC_U, DUK_ASC_LC_V,
+	DUK_ASC_0,    DUK_ASC_1,    DUK_ASC_2,    DUK_ASC_3,    DUK_ASC_4,    DUK_ASC_5,    DUK_ASC_6,    DUK_ASC_7,
+	DUK_ASC_8,    DUK_ASC_9,    DUK_ASC_LC_A, DUK_ASC_LC_B, DUK_ASC_LC_C, DUK_ASC_LC_D, DUK_ASC_LC_E, DUK_ASC_LC_F,
+	DUK_ASC_LC_G, DUK_ASC_LC_H, DUK_ASC_LC_I, DUK_ASC_LC_J, DUK_ASC_LC_K, DUK_ASC_LC_L, DUK_ASC_LC_M, DUK_ASC_LC_N,
+	DUK_ASC_LC_O, DUK_ASC_LC_P, DUK_ASC_LC_Q, DUK_ASC_LC_R, DUK_ASC_LC_S, DUK_ASC_LC_T, DUK_ASC_LC_U, DUK_ASC_LC_V,
 	DUK_ASC_LC_W, DUK_ASC_LC_X, DUK_ASC_LC_Y, DUK_ASC_LC_Z
 };
 
-DUK_INTERNAL const duk_uint8_t duk_uc_nybbles[16] = {
-	DUK_ASC_0, DUK_ASC_1, DUK_ASC_2, DUK_ASC_3,
-	DUK_ASC_4, DUK_ASC_5, DUK_ASC_6, DUK_ASC_7,
-	DUK_ASC_8, DUK_ASC_9, DUK_ASC_UC_A, DUK_ASC_UC_B,
-	DUK_ASC_UC_C, DUK_ASC_UC_D, DUK_ASC_UC_E, DUK_ASC_UC_F
-};
+DUK_INTERNAL const duk_uint8_t duk_uc_nybbles[16] = { DUK_ASC_0,    DUK_ASC_1,    DUK_ASC_2,    DUK_ASC_3,
+	                                              DUK_ASC_4,    DUK_ASC_5,    DUK_ASC_6,    DUK_ASC_7,
+	                                              DUK_ASC_8,    DUK_ASC_9,    DUK_ASC_UC_A, DUK_ASC_UC_B,
+	                                              DUK_ASC_UC_C, DUK_ASC_UC_D, DUK_ASC_UC_E, DUK_ASC_UC_F };
 
 /*
  *  Table for hex decoding ASCII hex digits
@@ -12974,43 +14055,43 @@ DUK_INTERNAL const duk_uint8_t duk_uc_nybbles[16] = {
 
 DUK_INTERNAL const duk_int8_t duk_hex_dectab[256] = {
 	/* -1 if invalid */
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  /* 0x00-0x0f */
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  /* 0x10-0x1f */
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  /* 0x20-0x2f */
-	 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, -1, -1, -1, -1, -1, -1,  /* 0x30-0x3f */
-	-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,  /* 0x40-0x4f */
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  /* 0x50-0x5f */
-	-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,  /* 0x60-0x6f */
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  /* 0x70-0x7f */
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  /* 0x80-0x8f */
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  /* 0x90-0x9f */
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  /* 0xa0-0xaf */
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  /* 0xb0-0xbf */
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  /* 0xc0-0xcf */
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  /* 0xd0-0xdf */
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  /* 0xe0-0xef */
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1   /* 0xf0-0xff */
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00-0x0f */
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10-0x1f */
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x20-0x2f */
+	0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  -1, -1, -1, -1, -1, -1, /* 0x30-0x3f */
+	-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x40-0x4f */
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x50-0x5f */
+	-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x60-0x6f */
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x70-0x7f */
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x80-0x8f */
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x90-0x9f */
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xa0-0xaf */
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xb0-0xbf */
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xc0-0xcf */
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xd0-0xdf */
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xe0-0xef */
+	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 /* 0xf0-0xff */
 };
 
 #if defined(DUK_USE_HEX_FASTPATH)
 /* Preshifted << 4.  Must use 16-bit entry to allow negative value signaling. */
 DUK_INTERNAL const duk_int16_t duk_hex_dectab_shift4[256] = {
-	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  /* 0x00-0x0f */
-	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  /* 0x10-0x1f */
-	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  /* 0x20-0x2f */
-	0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80, 0x90,   -1,   -1,   -1,   -1,   -1,   -1,  /* 0x30-0x3f */
-	  -1, 0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  /* 0x40-0x4f */
-	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  /* 0x50-0x5f */
-	  -1, 0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  /* 0x60-0x6f */
-	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  /* 0x70-0x7f */
-	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  /* 0x80-0x8f */
-	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  /* 0x90-0x9f */
-	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  /* 0xa0-0xaf */
-	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  /* 0xb0-0xbf */
-	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  /* 0xc0-0xcf */
-	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  /* 0xd0-0xdf */
-	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  /* 0xe0-0xef */
-	  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1   /* 0xf0-0xff */
+	-1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, -1, -1, -1, -1, -1, /* 0x00-0x0f */
+	-1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, -1, -1, -1, -1, -1, /* 0x10-0x1f */
+	-1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, -1, -1, -1, -1, -1, /* 0x20-0x2f */
+	0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80, 0x90, -1, -1, -1, -1, -1, -1, /* 0x30-0x3f */
+	-1,   0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0, -1,   -1,   -1,   -1, -1, -1, -1, -1, -1, /* 0x40-0x4f */
+	-1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, -1, -1, -1, -1, -1, /* 0x50-0x5f */
+	-1,   0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0, -1,   -1,   -1,   -1, -1, -1, -1, -1, -1, /* 0x60-0x6f */
+	-1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, -1, -1, -1, -1, -1, /* 0x70-0x7f */
+	-1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, -1, -1, -1, -1, -1, /* 0x80-0x8f */
+	-1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, -1, -1, -1, -1, -1, /* 0x90-0x9f */
+	-1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, -1, -1, -1, -1, -1, /* 0xa0-0xaf */
+	-1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, -1, -1, -1, -1, -1, /* 0xb0-0xbf */
+	-1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, -1, -1, -1, -1, -1, /* 0xc0-0xcf */
+	-1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, -1, -1, -1, -1, -1, /* 0xd0-0xdf */
+	-1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, -1, -1, -1, -1, -1, /* 0xe0-0xef */
+	-1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, -1, -1, -1, -1, -1 /* 0xf0-0xff */
 };
 #endif
 
@@ -13029,77 +14110,53 @@ DUK_INTERNAL const duk_int16_t duk_hex_dectab_shift4[256] = {
  *           print('0x' + t.encode('hex') + 'U')
  *   print('big endian'); genhextab(False)
  *   print('little endian'); genhextab(True)
-*/
+ */
 DUK_INTERNAL const duk_uint16_t duk_hex_enctab[256] = {
 #if defined(DUK_USE_INTEGER_BE)
-	0x3030U, 0x3031U, 0x3032U, 0x3033U, 0x3034U, 0x3035U, 0x3036U, 0x3037U,
-	0x3038U, 0x3039U, 0x3061U, 0x3062U, 0x3063U, 0x3064U, 0x3065U, 0x3066U,
-	0x3130U, 0x3131U, 0x3132U, 0x3133U, 0x3134U, 0x3135U, 0x3136U, 0x3137U,
-	0x3138U, 0x3139U, 0x3161U, 0x3162U, 0x3163U, 0x3164U, 0x3165U, 0x3166U,
-	0x3230U, 0x3231U, 0x3232U, 0x3233U, 0x3234U, 0x3235U, 0x3236U, 0x3237U,
-	0x3238U, 0x3239U, 0x3261U, 0x3262U, 0x3263U, 0x3264U, 0x3265U, 0x3266U,
-	0x3330U, 0x3331U, 0x3332U, 0x3333U, 0x3334U, 0x3335U, 0x3336U, 0x3337U,
-	0x3338U, 0x3339U, 0x3361U, 0x3362U, 0x3363U, 0x3364U, 0x3365U, 0x3366U,
-	0x3430U, 0x3431U, 0x3432U, 0x3433U, 0x3434U, 0x3435U, 0x3436U, 0x3437U,
-	0x3438U, 0x3439U, 0x3461U, 0x3462U, 0x3463U, 0x3464U, 0x3465U, 0x3466U,
-	0x3530U, 0x3531U, 0x3532U, 0x3533U, 0x3534U, 0x3535U, 0x3536U, 0x3537U,
-	0x3538U, 0x3539U, 0x3561U, 0x3562U, 0x3563U, 0x3564U, 0x3565U, 0x3566U,
-	0x3630U, 0x3631U, 0x3632U, 0x3633U, 0x3634U, 0x3635U, 0x3636U, 0x3637U,
-	0x3638U, 0x3639U, 0x3661U, 0x3662U, 0x3663U, 0x3664U, 0x3665U, 0x3666U,
-	0x3730U, 0x3731U, 0x3732U, 0x3733U, 0x3734U, 0x3735U, 0x3736U, 0x3737U,
-	0x3738U, 0x3739U, 0x3761U, 0x3762U, 0x3763U, 0x3764U, 0x3765U, 0x3766U,
-	0x3830U, 0x3831U, 0x3832U, 0x3833U, 0x3834U, 0x3835U, 0x3836U, 0x3837U,
-	0x3838U, 0x3839U, 0x3861U, 0x3862U, 0x3863U, 0x3864U, 0x3865U, 0x3866U,
-	0x3930U, 0x3931U, 0x3932U, 0x3933U, 0x3934U, 0x3935U, 0x3936U, 0x3937U,
-	0x3938U, 0x3939U, 0x3961U, 0x3962U, 0x3963U, 0x3964U, 0x3965U, 0x3966U,
-	0x6130U, 0x6131U, 0x6132U, 0x6133U, 0x6134U, 0x6135U, 0x6136U, 0x6137U,
-	0x6138U, 0x6139U, 0x6161U, 0x6162U, 0x6163U, 0x6164U, 0x6165U, 0x6166U,
-	0x6230U, 0x6231U, 0x6232U, 0x6233U, 0x6234U, 0x6235U, 0x6236U, 0x6237U,
-	0x6238U, 0x6239U, 0x6261U, 0x6262U, 0x6263U, 0x6264U, 0x6265U, 0x6266U,
-	0x6330U, 0x6331U, 0x6332U, 0x6333U, 0x6334U, 0x6335U, 0x6336U, 0x6337U,
-	0x6338U, 0x6339U, 0x6361U, 0x6362U, 0x6363U, 0x6364U, 0x6365U, 0x6366U,
-	0x6430U, 0x6431U, 0x6432U, 0x6433U, 0x6434U, 0x6435U, 0x6436U, 0x6437U,
-	0x6438U, 0x6439U, 0x6461U, 0x6462U, 0x6463U, 0x6464U, 0x6465U, 0x6466U,
-	0x6530U, 0x6531U, 0x6532U, 0x6533U, 0x6534U, 0x6535U, 0x6536U, 0x6537U,
-	0x6538U, 0x6539U, 0x6561U, 0x6562U, 0x6563U, 0x6564U, 0x6565U, 0x6566U,
-	0x6630U, 0x6631U, 0x6632U, 0x6633U, 0x6634U, 0x6635U, 0x6636U, 0x6637U,
-	0x6638U, 0x6639U, 0x6661U, 0x6662U, 0x6663U, 0x6664U, 0x6665U, 0x6666U
-#else  /* DUK_USE_INTEGER_BE */
-	0x3030U, 0x3130U, 0x3230U, 0x3330U, 0x3430U, 0x3530U, 0x3630U, 0x3730U,
-	0x3830U, 0x3930U, 0x6130U, 0x6230U, 0x6330U, 0x6430U, 0x6530U, 0x6630U,
-	0x3031U, 0x3131U, 0x3231U, 0x3331U, 0x3431U, 0x3531U, 0x3631U, 0x3731U,
-	0x3831U, 0x3931U, 0x6131U, 0x6231U, 0x6331U, 0x6431U, 0x6531U, 0x6631U,
-	0x3032U, 0x3132U, 0x3232U, 0x3332U, 0x3432U, 0x3532U, 0x3632U, 0x3732U,
-	0x3832U, 0x3932U, 0x6132U, 0x6232U, 0x6332U, 0x6432U, 0x6532U, 0x6632U,
-	0x3033U, 0x3133U, 0x3233U, 0x3333U, 0x3433U, 0x3533U, 0x3633U, 0x3733U,
-	0x3833U, 0x3933U, 0x6133U, 0x6233U, 0x6333U, 0x6433U, 0x6533U, 0x6633U,
-	0x3034U, 0x3134U, 0x3234U, 0x3334U, 0x3434U, 0x3534U, 0x3634U, 0x3734U,
-	0x3834U, 0x3934U, 0x6134U, 0x6234U, 0x6334U, 0x6434U, 0x6534U, 0x6634U,
-	0x3035U, 0x3135U, 0x3235U, 0x3335U, 0x3435U, 0x3535U, 0x3635U, 0x3735U,
-	0x3835U, 0x3935U, 0x6135U, 0x6235U, 0x6335U, 0x6435U, 0x6535U, 0x6635U,
-	0x3036U, 0x3136U, 0x3236U, 0x3336U, 0x3436U, 0x3536U, 0x3636U, 0x3736U,
-	0x3836U, 0x3936U, 0x6136U, 0x6236U, 0x6336U, 0x6436U, 0x6536U, 0x6636U,
-	0x3037U, 0x3137U, 0x3237U, 0x3337U, 0x3437U, 0x3537U, 0x3637U, 0x3737U,
-	0x3837U, 0x3937U, 0x6137U, 0x6237U, 0x6337U, 0x6437U, 0x6537U, 0x6637U,
-	0x3038U, 0x3138U, 0x3238U, 0x3338U, 0x3438U, 0x3538U, 0x3638U, 0x3738U,
-	0x3838U, 0x3938U, 0x6138U, 0x6238U, 0x6338U, 0x6438U, 0x6538U, 0x6638U,
-	0x3039U, 0x3139U, 0x3239U, 0x3339U, 0x3439U, 0x3539U, 0x3639U, 0x3739U,
-	0x3839U, 0x3939U, 0x6139U, 0x6239U, 0x6339U, 0x6439U, 0x6539U, 0x6639U,
-	0x3061U, 0x3161U, 0x3261U, 0x3361U, 0x3461U, 0x3561U, 0x3661U, 0x3761U,
-	0x3861U, 0x3961U, 0x6161U, 0x6261U, 0x6361U, 0x6461U, 0x6561U, 0x6661U,
-	0x3062U, 0x3162U, 0x3262U, 0x3362U, 0x3462U, 0x3562U, 0x3662U, 0x3762U,
-	0x3862U, 0x3962U, 0x6162U, 0x6262U, 0x6362U, 0x6462U, 0x6562U, 0x6662U,
-	0x3063U, 0x3163U, 0x3263U, 0x3363U, 0x3463U, 0x3563U, 0x3663U, 0x3763U,
-	0x3863U, 0x3963U, 0x6163U, 0x6263U, 0x6363U, 0x6463U, 0x6563U, 0x6663U,
-	0x3064U, 0x3164U, 0x3264U, 0x3364U, 0x3464U, 0x3564U, 0x3664U, 0x3764U,
-	0x3864U, 0x3964U, 0x6164U, 0x6264U, 0x6364U, 0x6464U, 0x6564U, 0x6664U,
-	0x3065U, 0x3165U, 0x3265U, 0x3365U, 0x3465U, 0x3565U, 0x3665U, 0x3765U,
-	0x3865U, 0x3965U, 0x6165U, 0x6265U, 0x6365U, 0x6465U, 0x6565U, 0x6665U,
-	0x3066U, 0x3166U, 0x3266U, 0x3366U, 0x3466U, 0x3566U, 0x3666U, 0x3766U,
-	0x3866U, 0x3966U, 0x6166U, 0x6266U, 0x6366U, 0x6466U, 0x6566U, 0x6666U
-#endif  /* DUK_USE_INTEGER_BE */
+	0x3030U, 0x3031U, 0x3032U, 0x3033U, 0x3034U, 0x3035U, 0x3036U, 0x3037U, 0x3038U, 0x3039U, 0x3061U, 0x3062U, 0x3063U,
+	0x3064U, 0x3065U, 0x3066U, 0x3130U, 0x3131U, 0x3132U, 0x3133U, 0x3134U, 0x3135U, 0x3136U, 0x3137U, 0x3138U, 0x3139U,
+	0x3161U, 0x3162U, 0x3163U, 0x3164U, 0x3165U, 0x3166U, 0x3230U, 0x3231U, 0x3232U, 0x3233U, 0x3234U, 0x3235U, 0x3236U,
+	0x3237U, 0x3238U, 0x3239U, 0x3261U, 0x3262U, 0x3263U, 0x3264U, 0x3265U, 0x3266U, 0x3330U, 0x3331U, 0x3332U, 0x3333U,
+	0x3334U, 0x3335U, 0x3336U, 0x3337U, 0x3338U, 0x3339U, 0x3361U, 0x3362U, 0x3363U, 0x3364U, 0x3365U, 0x3366U, 0x3430U,
+	0x3431U, 0x3432U, 0x3433U, 0x3434U, 0x3435U, 0x3436U, 0x3437U, 0x3438U, 0x3439U, 0x3461U, 0x3462U, 0x3463U, 0x3464U,
+	0x3465U, 0x3466U, 0x3530U, 0x3531U, 0x3532U, 0x3533U, 0x3534U, 0x3535U, 0x3536U, 0x3537U, 0x3538U, 0x3539U, 0x3561U,
+	0x3562U, 0x3563U, 0x3564U, 0x3565U, 0x3566U, 0x3630U, 0x3631U, 0x3632U, 0x3633U, 0x3634U, 0x3635U, 0x3636U, 0x3637U,
+	0x3638U, 0x3639U, 0x3661U, 0x3662U, 0x3663U, 0x3664U, 0x3665U, 0x3666U, 0x3730U, 0x3731U, 0x3732U, 0x3733U, 0x3734U,
+	0x3735U, 0x3736U, 0x3737U, 0x3738U, 0x3739U, 0x3761U, 0x3762U, 0x3763U, 0x3764U, 0x3765U, 0x3766U, 0x3830U, 0x3831U,
+	0x3832U, 0x3833U, 0x3834U, 0x3835U, 0x3836U, 0x3837U, 0x3838U, 0x3839U, 0x3861U, 0x3862U, 0x3863U, 0x3864U, 0x3865U,
+	0x3866U, 0x3930U, 0x3931U, 0x3932U, 0x3933U, 0x3934U, 0x3935U, 0x3936U, 0x3937U, 0x3938U, 0x3939U, 0x3961U, 0x3962U,
+	0x3963U, 0x3964U, 0x3965U, 0x3966U, 0x6130U, 0x6131U, 0x6132U, 0x6133U, 0x6134U, 0x6135U, 0x6136U, 0x6137U, 0x6138U,
+	0x6139U, 0x6161U, 0x6162U, 0x6163U, 0x6164U, 0x6165U, 0x6166U, 0x6230U, 0x6231U, 0x6232U, 0x6233U, 0x6234U, 0x6235U,
+	0x6236U, 0x6237U, 0x6238U, 0x6239U, 0x6261U, 0x6262U, 0x6263U, 0x6264U, 0x6265U, 0x6266U, 0x6330U, 0x6331U, 0x6332U,
+	0x6333U, 0x6334U, 0x6335U, 0x6336U, 0x6337U, 0x6338U, 0x6339U, 0x6361U, 0x6362U, 0x6363U, 0x6364U, 0x6365U, 0x6366U,
+	0x6430U, 0x6431U, 0x6432U, 0x6433U, 0x6434U, 0x6435U, 0x6436U, 0x6437U, 0x6438U, 0x6439U, 0x6461U, 0x6462U, 0x6463U,
+	0x6464U, 0x6465U, 0x6466U, 0x6530U, 0x6531U, 0x6532U, 0x6533U, 0x6534U, 0x6535U, 0x6536U, 0x6537U, 0x6538U, 0x6539U,
+	0x6561U, 0x6562U, 0x6563U, 0x6564U, 0x6565U, 0x6566U, 0x6630U, 0x6631U, 0x6632U, 0x6633U, 0x6634U, 0x6635U, 0x6636U,
+	0x6637U, 0x6638U, 0x6639U, 0x6661U, 0x6662U, 0x6663U, 0x6664U, 0x6665U, 0x6666U
+#else /* DUK_USE_INTEGER_BE */
+	0x3030U, 0x3130U, 0x3230U, 0x3330U, 0x3430U, 0x3530U, 0x3630U, 0x3730U, 0x3830U, 0x3930U, 0x6130U, 0x6230U, 0x6330U,
+	0x6430U, 0x6530U, 0x6630U, 0x3031U, 0x3131U, 0x3231U, 0x3331U, 0x3431U, 0x3531U, 0x3631U, 0x3731U, 0x3831U, 0x3931U,
+	0x6131U, 0x6231U, 0x6331U, 0x6431U, 0x6531U, 0x6631U, 0x3032U, 0x3132U, 0x3232U, 0x3332U, 0x3432U, 0x3532U, 0x3632U,
+	0x3732U, 0x3832U, 0x3932U, 0x6132U, 0x6232U, 0x6332U, 0x6432U, 0x6532U, 0x6632U, 0x3033U, 0x3133U, 0x3233U, 0x3333U,
+	0x3433U, 0x3533U, 0x3633U, 0x3733U, 0x3833U, 0x3933U, 0x6133U, 0x6233U, 0x6333U, 0x6433U, 0x6533U, 0x6633U, 0x3034U,
+	0x3134U, 0x3234U, 0x3334U, 0x3434U, 0x3534U, 0x3634U, 0x3734U, 0x3834U, 0x3934U, 0x6134U, 0x6234U, 0x6334U, 0x6434U,
+	0x6534U, 0x6634U, 0x3035U, 0x3135U, 0x3235U, 0x3335U, 0x3435U, 0x3535U, 0x3635U, 0x3735U, 0x3835U, 0x3935U, 0x6135U,
+	0x6235U, 0x6335U, 0x6435U, 0x6535U, 0x6635U, 0x3036U, 0x3136U, 0x3236U, 0x3336U, 0x3436U, 0x3536U, 0x3636U, 0x3736U,
+	0x3836U, 0x3936U, 0x6136U, 0x6236U, 0x6336U, 0x6436U, 0x6536U, 0x6636U, 0x3037U, 0x3137U, 0x3237U, 0x3337U, 0x3437U,
+	0x3537U, 0x3637U, 0x3737U, 0x3837U, 0x3937U, 0x6137U, 0x6237U, 0x6337U, 0x6437U, 0x6537U, 0x6637U, 0x3038U, 0x3138U,
+	0x3238U, 0x3338U, 0x3438U, 0x3538U, 0x3638U, 0x3738U, 0x3838U, 0x3938U, 0x6138U, 0x6238U, 0x6338U, 0x6438U, 0x6538U,
+	0x6638U, 0x3039U, 0x3139U, 0x3239U, 0x3339U, 0x3439U, 0x3539U, 0x3639U, 0x3739U, 0x3839U, 0x3939U, 0x6139U, 0x6239U,
+	0x6339U, 0x6439U, 0x6539U, 0x6639U, 0x3061U, 0x3161U, 0x3261U, 0x3361U, 0x3461U, 0x3561U, 0x3661U, 0x3761U, 0x3861U,
+	0x3961U, 0x6161U, 0x6261U, 0x6361U, 0x6461U, 0x6561U, 0x6661U, 0x3062U, 0x3162U, 0x3262U, 0x3362U, 0x3462U, 0x3562U,
+	0x3662U, 0x3762U, 0x3862U, 0x3962U, 0x6162U, 0x6262U, 0x6362U, 0x6462U, 0x6562U, 0x6662U, 0x3063U, 0x3163U, 0x3263U,
+	0x3363U, 0x3463U, 0x3563U, 0x3663U, 0x3763U, 0x3863U, 0x3963U, 0x6163U, 0x6263U, 0x6363U, 0x6463U, 0x6563U, 0x6663U,
+	0x3064U, 0x3164U, 0x3264U, 0x3364U, 0x3464U, 0x3564U, 0x3664U, 0x3764U, 0x3864U, 0x3964U, 0x6164U, 0x6264U, 0x6364U,
+	0x6464U, 0x6564U, 0x6664U, 0x3065U, 0x3165U, 0x3265U, 0x3365U, 0x3465U, 0x3565U, 0x3665U, 0x3765U, 0x3865U, 0x3965U,
+	0x6165U, 0x6265U, 0x6365U, 0x6465U, 0x6565U, 0x6665U, 0x3066U, 0x3166U, 0x3266U, 0x3366U, 0x3466U, 0x3566U, 0x3666U,
+	0x3766U, 0x3866U, 0x3966U, 0x6166U, 0x6266U, 0x6366U, 0x6466U, 0x6566U, 0x6666U
+#endif /* DUK_USE_INTEGER_BE */
 };
-#endif  /* DUK_USE_HEX_FASTPATH */
+#endif /* DUK_USE_HEX_FASTPATH */
 
 /*
  *  Arbitrary byteswap for potentially unaligned values
@@ -13107,7 +14164,7 @@ DUK_INTERNAL const duk_uint16_t duk_hex_enctab[256] = {
  *  Used to byteswap pointers e.g. in debugger code.
  */
 
-#if defined(DUK_USE_DEBUGGER_SUPPORT)  /* For now only needed by the debugger. */
+#if defined(DUK_USE_DEBUGGER_SUPPORT) /* For now only needed by the debugger. */
 DUK_INTERNAL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len) {
 	duk_uint8_t tmp;
 	duk_uint8_t *q = p + len - 1;
@@ -13121,6 +14178,18 @@ DUK_INTERNAL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len) {
 	}
 }
 #endif
+
+/*
+ *  Random
+ */
+
+DUK_INTERNAL duk_double_t duk_util_get_random_double(duk_hthread *thr) {
+#if defined(DUK_USE_GET_RANDOM_DOUBLE)
+	return DUK_USE_GET_RANDOM_DOUBLE(thr->heap->heap_udata);
+#else
+	return duk_util_tinyrandom_get_double(thr);
+#endif
+}
 /*
  *  Hobject ECMAScript [[Class]].
  */
@@ -13130,13 +14199,13 @@ DUK_INTERNAL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len) {
 #if (DUK_STRIDX_UC_ARGUMENTS > 255)
 #error constant too large
 #endif
-#if (DUK_STRIDX_ARRAY > 255)
+#if (DUK_STRIDX_UC_ARRAY > 255)
 #error constant too large
 #endif
 #if (DUK_STRIDX_UC_BOOLEAN > 255)
 #error constant too large
 #endif
-#if (DUK_STRIDX_DATE > 255)
+#if (DUK_STRIDX_UC_DATE > 255)
 #error constant too large
 #endif
 #if (DUK_STRIDX_UC_ERROR > 255)
@@ -13217,13 +14286,13 @@ DUK_INTERNAL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len) {
 
 /* Note: assumes that these string indexes are 8-bit, genstrings.py must ensure that */
 DUK_INTERNAL duk_uint8_t duk_class_number_to_stridx[32] = {
-	DUK_STRIDX_EMPTY_STRING,  /* NONE, intentionally empty */
+	DUK_STRIDX_EMPTY_STRING, /* NONE, intentionally empty */
 	DUK_STRIDX_UC_OBJECT,
-	DUK_STRIDX_ARRAY,
+	DUK_STRIDX_UC_ARRAY,
 	DUK_STRIDX_UC_FUNCTION,
 	DUK_STRIDX_UC_ARGUMENTS,
 	DUK_STRIDX_UC_BOOLEAN,
-	DUK_STRIDX_DATE,
+	DUK_STRIDX_UC_DATE,
 	DUK_STRIDX_UC_ERROR,
 	DUK_STRIDX_JSON,
 	DUK_STRIDX_MATH,
@@ -13247,8 +14316,8 @@ DUK_INTERNAL duk_uint8_t duk_class_number_to_stridx[32] = {
 	DUK_STRIDX_UINT32_ARRAY,
 	DUK_STRIDX_FLOAT32_ARRAY,
 	DUK_STRIDX_FLOAT64_ARRAY,
-	DUK_STRIDX_EMPTY_STRING,  /* UNUSED, intentionally empty */
-	DUK_STRIDX_EMPTY_STRING,  /* UNUSED, intentionally empty */
+	DUK_STRIDX_EMPTY_STRING, /* UNUSED, intentionally empty */
+	DUK_STRIDX_EMPTY_STRING, /* UNUSED, intentionally empty */
 };
 /*
  *  Default allocation functions.
@@ -13264,8 +14333,7 @@ DUK_INTERNAL void *duk_default_alloc_function(void *udata, duk_size_t size) {
 	void *res;
 	DUK_UNREF(udata);
 	res = DUK_ANSI_MALLOC(size);
-	DUK_DDD(DUK_DDDPRINT("default alloc function: %lu -> %p",
-	                     (unsigned long) size, (void *) res));
+	DUK_DDD(DUK_DDDPRINT("default alloc function: %lu -> %p", (unsigned long) size, (void *) res));
 	return res;
 }
 
@@ -13273,8 +14341,7 @@ DUK_INTERNAL void *duk_default_realloc_function(void *udata, void *ptr, duk_size
 	void *res;
 	DUK_UNREF(udata);
 	res = DUK_ANSI_REALLOC(ptr, newsize);
-	DUK_DDD(DUK_DDDPRINT("default realloc function: %p %lu -> %p",
-	                     (void *) ptr, (unsigned long) newsize, (void *) res));
+	DUK_DDD(DUK_DDDPRINT("default realloc function: %p %lu -> %p", (void *) ptr, (unsigned long) newsize, (void *) res));
 	return res;
 }
 
@@ -13283,7 +14350,7 @@ DUK_INTERNAL void duk_default_free_function(void *udata, void *ptr) {
 	DUK_UNREF(udata);
 	DUK_ANSI_FREE(ptr);
 }
-#endif  /* DUK_USE_PROVIDE_DEFAULT_ALLOC_FUNCTIONS */
+#endif /* DUK_USE_PROVIDE_DEFAULT_ALLOC_FUNCTIONS */
 /*
  *  Buffer
  */
@@ -13373,30 +14440,30 @@ DUK_EXTERNAL void duk_config_buffer(duk_hthread *thr, duk_idx_t idx, void *ptr,
 
 #if defined(DUK_USE_BYTECODE_DUMP_SUPPORT)
 
-#define DUK__SER_MARKER  0xbf
-#define DUK__SER_STRING  0x00
-#define DUK__SER_NUMBER  0x01
+#define DUK__SER_MARKER             0xbf
+#define DUK__SER_STRING             0x00
+#define DUK__SER_NUMBER             0x01
 #define DUK__BYTECODE_INITIAL_ALLOC 256
-#define DUK__NO_FORMALS  0xffffffffUL
+#define DUK__NO_FORMALS             0xffffffffUL
 
 /*
  *  Dump/load helpers, xxx_raw() helpers do no buffer checks
  */
 
-DUK_LOCAL duk_uint8_t *duk__load_string_raw(duk_hthread *thr, duk_uint8_t *p) {
+DUK_LOCAL const duk_uint8_t *duk__load_string_raw(duk_hthread *thr, const duk_uint8_t *p) {
 	duk_uint32_t len;
 
-	len = DUK_RAW_READ_U32_BE(p);
+	len = DUK_RAW_READINC_U32_BE(p);
 	duk_push_lstring(thr, (const char *) p, len);
 	p += len;
 	return p;
 }
 
-DUK_LOCAL duk_uint8_t *duk__load_buffer_raw(duk_hthread *thr, duk_uint8_t *p) {
+DUK_LOCAL const duk_uint8_t *duk__load_buffer_raw(duk_hthread *thr, const duk_uint8_t *p) {
 	duk_uint32_t len;
 	duk_uint8_t *buf;
 
-	len = DUK_RAW_READ_U32_BE(p);
+	len = DUK_RAW_READINC_U32_BE(p);
 	buf = (duk_uint8_t *) duk_push_fixed_buffer_nozero(thr, (duk_size_t) len);
 	DUK_ASSERT(buf != NULL);
 	duk_memcpy((void *) buf, (const void *) p, (size_t) len);
@@ -13411,12 +14478,10 @@ DUK_LOCAL duk_uint8_t *duk__dump_hstring_raw(duk_uint8_t *p, duk_hstring *h) {
 	DUK_ASSERT(h != NULL);
 
 	len = DUK_HSTRING_GET_BYTELEN(h);
-	DUK_ASSERT(len <= 0xffffffffUL);  /* string limits */
+	DUK_ASSERT(len <= 0xffffffffUL); /* string limits */
 	tmp32 = (duk_uint32_t) len;
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
-	duk_memcpy((void *) p,
-	           (const void *) DUK_HSTRING_GET_DATA(h),
-	           len);
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
+	duk_memcpy((void *) p, (const void *) DUK_HSTRING_GET_DATA(h), len);
 	p += len;
 	return p;
 }
@@ -13430,22 +14495,24 @@ DUK_LOCAL duk_uint8_t *duk__dump_hbuffer_raw(duk_hthread *thr, duk_uint8_t *p, d
 	DUK_UNREF(thr);
 
 	len = DUK_HBUFFER_GET_SIZE(h);
-	DUK_ASSERT(len <= 0xffffffffUL);  /* buffer limits */
+	DUK_ASSERT(len <= 0xffffffffUL); /* buffer limits */
 	tmp32 = (duk_uint32_t) len;
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 	/* When len == 0, buffer data pointer may be NULL. */
-	duk_memcpy_unsafe((void *) p,
-	                  (const void *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h),
-	                  len);
+	duk_memcpy_unsafe((void *) p, (const void *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h), len);
 	p += len;
 	return p;
 }
 
-DUK_LOCAL duk_uint8_t *duk__dump_string_prop(duk_hthread *thr, duk_uint8_t *p, duk_bufwriter_ctx *bw_ctx, duk_hobject *func, duk_small_uint_t stridx) {
+DUK_LOCAL duk_uint8_t *duk__dump_string_prop(duk_hthread *thr,
+                                             duk_uint8_t *p,
+                                             duk_bufwriter_ctx *bw_ctx,
+                                             duk_hobject *func,
+                                             duk_small_uint_t stridx) {
 	duk_hstring *h_str;
 	duk_tval *tv;
 
-	tv = duk_hobject_find_existing_entry_tval_ptr(thr->heap, (duk_hobject *) func, DUK_HTHREAD_GET_STRING(thr, stridx));
+	tv = duk_hobject_find_entry_tval_ptr_stridx(thr->heap, (duk_hobject *) func, stridx);
 	if (tv != NULL && DUK_TVAL_IS_STRING(tv)) {
 		h_str = DUK_TVAL_GET_STRING(tv);
 		DUK_ASSERT(h_str != NULL);
@@ -13453,56 +14520,61 @@ DUK_LOCAL duk_uint8_t *duk__dump_string_prop(duk_hthread *thr, duk_uint8_t *p, d
 		h_str = DUK_HTHREAD_STRING_EMPTY_STRING(thr);
 		DUK_ASSERT(h_str != NULL);
 	}
-	DUK_ASSERT(DUK_HSTRING_MAX_BYTELEN <= 0x7fffffffUL);  /* ensures no overflow */
+	DUK_ASSERT(DUK_HSTRING_MAX_BYTELEN <= 0x7fffffffUL); /* ensures no overflow */
 	p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 4U + DUK_HSTRING_GET_BYTELEN(h_str), p);
 	p = duk__dump_hstring_raw(p, h_str);
 	return p;
 }
 
-DUK_LOCAL duk_uint8_t *duk__dump_buffer_prop(duk_hthread *thr, duk_uint8_t *p, duk_bufwriter_ctx *bw_ctx, duk_hobject *func, duk_small_uint_t stridx) {
+DUK_LOCAL duk_uint8_t *duk__dump_buffer_prop(duk_hthread *thr,
+                                             duk_uint8_t *p,
+                                             duk_bufwriter_ctx *bw_ctx,
+                                             duk_hobject *func,
+                                             duk_small_uint_t stridx) {
 	duk_tval *tv;
 
-	tv = duk_hobject_find_existing_entry_tval_ptr(thr->heap, (duk_hobject *) func, DUK_HTHREAD_GET_STRING(thr, stridx));
+	tv = duk_hobject_find_entry_tval_ptr_stridx(thr->heap, (duk_hobject *) func, stridx);
 	if (tv != NULL && DUK_TVAL_IS_BUFFER(tv)) {
 		duk_hbuffer *h_buf;
 		h_buf = DUK_TVAL_GET_BUFFER(tv);
 		DUK_ASSERT(h_buf != NULL);
-		DUK_ASSERT(DUK_HBUFFER_MAX_BYTELEN <= 0x7fffffffUL);  /* ensures no overflow */
+		DUK_ASSERT(DUK_HBUFFER_MAX_BYTELEN <= 0x7fffffffUL); /* ensures no overflow */
 		p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 4U + DUK_HBUFFER_GET_SIZE(h_buf), p);
 		p = duk__dump_hbuffer_raw(thr, p, h_buf);
 	} else {
 		p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 4U, p);
-		DUK_RAW_WRITE_U32_BE(p, 0);
+		DUK_RAW_WRITEINC_U32_BE(p, 0);
 	}
 	return p;
 }
 
-DUK_LOCAL duk_uint8_t *duk__dump_uint32_prop(duk_hthread *thr, duk_uint8_t *p, duk_bufwriter_ctx *bw_ctx, duk_hobject *func, duk_small_uint_t stridx, duk_uint32_t def_value) {
+DUK_LOCAL duk_uint8_t *duk__dump_uint32_prop(duk_hthread *thr,
+                                             duk_uint8_t *p,
+                                             duk_bufwriter_ctx *bw_ctx,
+                                             duk_hobject *func,
+                                             duk_small_uint_t stridx,
+                                             duk_uint32_t def_value) {
 	duk_tval *tv;
 	duk_uint32_t val;
 
-	tv = duk_hobject_find_existing_entry_tval_ptr(thr->heap, (duk_hobject *) func, DUK_HTHREAD_GET_STRING(thr, stridx));
+	tv = duk_hobject_find_entry_tval_ptr_stridx(thr->heap, (duk_hobject *) func, stridx);
 	if (tv != NULL && DUK_TVAL_IS_NUMBER(tv)) {
 		val = (duk_uint32_t) DUK_TVAL_GET_NUMBER(tv);
 	} else {
 		val = def_value;
 	}
 	p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 4U, p);
-	DUK_RAW_WRITE_U32_BE(p, val);
+	DUK_RAW_WRITEINC_U32_BE(p, val);
 	return p;
 }
 
 DUK_LOCAL duk_uint8_t *duk__dump_varmap(duk_hthread *thr, duk_uint8_t *p, duk_bufwriter_ctx *bw_ctx, duk_hobject *func) {
-	duk_tval *tv;
+	duk_hobject *h;
 
-	tv = duk_hobject_find_existing_entry_tval_ptr(thr->heap, (duk_hobject *) func, DUK_HTHREAD_STRING_INT_VARMAP(thr));
-	if (tv != NULL && DUK_TVAL_IS_OBJECT(tv)) {
-		duk_hobject *h;
+	h = duk_hobject_get_varmap(thr, (duk_hobject *) func);
+	if (h != NULL) {
 		duk_uint_fast32_t i;
 
-		h = DUK_TVAL_GET_OBJECT(tv);
-		DUK_ASSERT(h != NULL);
-
 		/* We know _Varmap only has own properties so walk property
 		 * table directly.  We also know _Varmap is dense and all
 		 * values are numbers; assert for these.  GC and finalizers
@@ -13514,36 +14586,36 @@ DUK_LOCAL duk_uint8_t *duk__dump_varmap(duk_hthread *thr, duk_uint8_t *p, duk_bu
 			duk_uint32_t val;
 
 			key = DUK_HOBJECT_E_GET_KEY(thr->heap, h, i);
-			DUK_ASSERT(key != NULL);  /* _Varmap is dense */
+			DUK_ASSERT(key != NULL); /* _Varmap is dense */
 			DUK_ASSERT(!DUK_HOBJECT_E_SLOT_IS_ACCESSOR(thr->heap, h, i));
 			tv_val = DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, h, i);
 			DUK_ASSERT(tv_val != NULL);
-			DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv_val));  /* known to be number; in fact an integer */
+			DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv_val)); /* known to be number; in fact an integer */
 #if defined(DUK_USE_FASTINT)
 			DUK_ASSERT(DUK_TVAL_IS_FASTINT(tv_val));
-			DUK_ASSERT(DUK_TVAL_GET_FASTINT(tv_val) == (duk_int64_t) DUK_TVAL_GET_FASTINT_U32(tv_val));  /* known to be 32-bit */
+			DUK_ASSERT(DUK_TVAL_GET_FASTINT(tv_val) ==
+			           (duk_int64_t) DUK_TVAL_GET_FASTINT_U32(tv_val)); /* known to be 32-bit */
 			val = DUK_TVAL_GET_FASTINT_U32(tv_val);
 #else
 			val = (duk_uint32_t) DUK_TVAL_GET_NUMBER(tv_val);
 #endif
 
-			DUK_ASSERT(DUK_HSTRING_MAX_BYTELEN <= 0x7fffffffUL);  /* ensures no overflow */
+			DUK_ASSERT(DUK_HSTRING_MAX_BYTELEN <= 0x7fffffffUL); /* ensures no overflow */
 			p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 4U + DUK_HSTRING_GET_BYTELEN(key) + 4U, p);
 			p = duk__dump_hstring_raw(p, key);
-			DUK_RAW_WRITE_U32_BE(p, val);
+			DUK_RAW_WRITEINC_U32_BE(p, val);
 		}
 	}
 	p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 4U, p);
-	DUK_RAW_WRITE_U32_BE(p, 0);  /* end of _Varmap */
+	DUK_RAW_WRITEINC_U32_BE(p, 0); /* end of _Varmap */
 	return p;
 }
 
 DUK_LOCAL duk_uint8_t *duk__dump_formals(duk_hthread *thr, duk_uint8_t *p, duk_bufwriter_ctx *bw_ctx, duk_hobject *func) {
-	duk_tval *tv;
+	duk_harray *h;
 
-	tv = duk_hobject_find_existing_entry_tval_ptr(thr->heap, (duk_hobject *) func, DUK_HTHREAD_STRING_INT_FORMALS(thr));
-	if (tv != NULL && DUK_TVAL_IS_OBJECT(tv)) {
-		duk_harray *h;
+	h = duk_hobject_get_formals(thr, (duk_hobject *) func);
+	if (h != NULL) {
 		duk_uint32_t i;
 
 		/* Here we rely on _Formals being a dense array containing
@@ -13551,14 +14623,10 @@ DUK_LOCAL duk_uint8_t *duk__dump_formals(duk_hthread *thr, duk_uint8_t *p, duk_b
 		 * tweaked by the application (which we don't support right
 		 * now).
 		 */
-		h = (duk_harray *) DUK_TVAL_GET_OBJECT(tv);
-		DUK_ASSERT(h != NULL);
-		DUK_ASSERT(DUK_HOBJECT_IS_ARRAY((duk_hobject *) h));
-		DUK_ASSERT(h->length <= DUK_HOBJECT_GET_ASIZE((duk_hobject *) h));
 
 		p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 4U, p);
-		DUK_ASSERT(h->length != DUK__NO_FORMALS);  /* limits */
-		DUK_RAW_WRITE_U32_BE(p, h->length);
+		DUK_ASSERT(h->length != DUK__NO_FORMALS); /* limits */
+		DUK_RAW_WRITEINC_U32_BE(p, h->length);
 
 		for (i = 0; i < h->length; i++) {
 			duk_tval *tv_val;
@@ -13572,14 +14640,14 @@ DUK_LOCAL duk_uint8_t *duk__dump_formals(duk_hthread *thr, duk_uint8_t *p, duk_b
 			DUK_ASSERT(varname != NULL);
 			DUK_ASSERT(DUK_HSTRING_GET_BYTELEN(varname) >= 1);
 
-			DUK_ASSERT(DUK_HSTRING_MAX_BYTELEN <= 0x7fffffffUL);  /* ensures no overflow */
+			DUK_ASSERT(DUK_HSTRING_MAX_BYTELEN <= 0x7fffffffUL); /* ensures no overflow */
 			p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 4U + DUK_HSTRING_GET_BYTELEN(varname), p);
 			p = duk__dump_hstring_raw(p, varname);
 		}
 	} else {
 		DUK_DD(DUK_DDPRINT("dumping function without _Formals, emit marker to indicate missing _Formals"));
 		p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 4U, p);
-		DUK_RAW_WRITE_U32_BE(p, DUK__NO_FORMALS);  /* marker: no formals */
+		DUK_RAW_WRITEINC_U32_BE(p, DUK__NO_FORMALS); /* marker: no formals */
 	}
 	return p;
 }
@@ -13613,33 +14681,33 @@ static duk_uint8_t *duk__dump_func(duk_hthread *thr, duk_hcompfunc *func, duk_bu
 	                   (long) DUK_HCOMPFUNC_GET_CODE_SIZE(thr->heap, func),
 	                   (long) DUK_HCOMPFUNC_GET_CODE_COUNT(thr->heap, func)));
 
-	DUK_ASSERT(DUK_USE_ESBC_MAX_BYTES <= 0x7fffffffUL);  /* ensures no overflow */
+	DUK_ASSERT(DUK_USE_ESBC_MAX_BYTES <= 0x7fffffffUL); /* ensures no overflow */
 	count_instr = (duk_uint32_t) DUK_HCOMPFUNC_GET_CODE_COUNT(thr->heap, func);
 	p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 3U * 4U + 2U * 2U + 3U * 4U + count_instr * 4U, p);
 
 	/* Fixed header info. */
 	tmp32 = count_instr;
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 	tmp32 = (duk_uint32_t) DUK_HCOMPFUNC_GET_CONSTS_COUNT(thr->heap, func);
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 	tmp32 = (duk_uint32_t) DUK_HCOMPFUNC_GET_FUNCS_COUNT(thr->heap, func);
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 	tmp16 = func->nregs;
-	DUK_RAW_WRITE_U16_BE(p, tmp16);
+	DUK_RAW_WRITEINC_U16_BE(p, tmp16);
 	tmp16 = func->nargs;
-	DUK_RAW_WRITE_U16_BE(p, tmp16);
+	DUK_RAW_WRITEINC_U16_BE(p, tmp16);
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
 	tmp32 = func->start_line;
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 	tmp32 = func->end_line;
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 #else
-	DUK_RAW_WRITE_U32_BE(p, 0);
-	DUK_RAW_WRITE_U32_BE(p, 0);
+	DUK_RAW_WRITEINC_U32_BE(p, 0);
+	DUK_RAW_WRITEINC_U32_BE(p, 0);
 #endif
-	tmp32 = DUK_HEAPHDR_GET_FLAGS((duk_heaphdr *) func);  /* masks flags, only duk_hobject flags */
-	tmp32 &= ~(DUK_HOBJECT_FLAG_HAVE_FINALIZER);  /* finalizer flag is lost */
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
+	tmp32 = DUK_HEAPHDR_GET_FLAGS((duk_heaphdr *) func); /* masks flags, only duk_hobject flags */
+	tmp32 &= ~(DUK_HOBJECT_FLAG_HAVE_FINALIZER); /* finalizer flag is lost */
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 
 	/* Bytecode instructions: endian conversion needed unless
 	 * platform is big endian.
@@ -13648,12 +14716,13 @@ static duk_uint8_t *duk__dump_func(duk_hthread *thr, duk_hcompfunc *func, duk_bu
 	ins_end = DUK_HCOMPFUNC_GET_CODE_END(thr->heap, func);
 	DUK_ASSERT((duk_size_t) (ins_end - ins) == (duk_size_t) count_instr);
 #if defined(DUK_USE_INTEGER_BE)
-	duk_memcpy_unsafe((void *) p, (const void *) ins, (size_t) (ins_end - ins));
-	p += (size_t) (ins_end - ins);
+	duk_memcpy_unsafe((void *) p, (const void *) ins, count_instr * sizeof(duk_instr_t));
+	p += count_instr * sizeof(duk_instr_t);
+	DUK_UNREF(ins_end);
 #else
 	while (ins != ins_end) {
 		tmp32 = (duk_uint32_t) (*ins);
-		DUK_RAW_WRITE_U32_BE(p, tmp32);
+		DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 		ins++;
 	}
 #endif
@@ -13663,13 +14732,12 @@ static duk_uint8_t *duk__dump_func(duk_hthread *thr, duk_hcompfunc *func, duk_bu
 	tv_end = DUK_HCOMPFUNC_GET_CONSTS_END(thr->heap, func);
 	while (tv != tv_end) {
 		/* constants are strings or numbers now */
-		DUK_ASSERT(DUK_TVAL_IS_STRING(tv) ||
-		           DUK_TVAL_IS_NUMBER(tv));
+		DUK_ASSERT(DUK_TVAL_IS_STRING(tv) || DUK_TVAL_IS_NUMBER(tv));
 
 		if (DUK_TVAL_IS_STRING(tv)) {
 			h_str = DUK_TVAL_GET_STRING(tv);
 			DUK_ASSERT(h_str != NULL);
-			DUK_ASSERT(DUK_HSTRING_MAX_BYTELEN <= 0x7fffffffUL);  /* ensures no overflow */
+			DUK_ASSERT(DUK_HSTRING_MAX_BYTELEN <= 0x7fffffffUL); /* ensures no overflow */
 			p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 1U + 4U + DUK_HSTRING_GET_BYTELEN(h_str), p);
 			*p++ = DUK__SER_STRING;
 			p = duk__dump_hstring_raw(p, h_str);
@@ -13678,7 +14746,7 @@ static duk_uint8_t *duk__dump_func(duk_hthread *thr, duk_hcompfunc *func, duk_bu
 			p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 1U + 8U, p);
 			*p++ = DUK__SER_NUMBER;
 			d = DUK_TVAL_GET_NUMBER(tv);
-			DUK_RAW_WRITE_DOUBLE_BE(p, d);
+			DUK_RAW_WRITEINC_DOUBLE_BE(p, d);
 		}
 		tv++;
 	}
@@ -13735,11 +14803,12 @@ static duk_uint8_t *duk__dump_func(duk_hthread *thr, duk_hcompfunc *func, duk_bu
  * are validated (which is quite complex, especially for indirect opcodes).
  */
 
-#define DUK__ASSERT_LEFT(n) do { \
+#define DUK__ASSERT_LEFT(n) \
+	do { \
 		DUK_ASSERT((duk_size_t) (p_end - p) >= (duk_size_t) (n)); \
 	} while (0)
 
-static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t *p_end) {
+static const duk_uint8_t *duk__load_func(duk_hthread *thr, const duk_uint8_t *p, const duk_uint8_t *p_end) {
 	duk_hcompfunc *h_fun;
 	duk_hbuffer *h_data;
 	duk_size_t data_size;
@@ -13763,20 +14832,20 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 
 	DUK_ASSERT(thr != NULL);
 
-	DUK_DD(DUK_DDPRINT("loading function, p=%p, p_end=%p", (void *) p, (void *) p_end));
+	DUK_DD(DUK_DDPRINT("loading function, p=%p, p_end=%p", (const void *) p, (const void *) p_end));
 
 	DUK__ASSERT_LEFT(3 * 4);
-	count_instr = DUK_RAW_READ_U32_BE(p);
-	count_const = DUK_RAW_READ_U32_BE(p);
-	count_funcs = DUK_RAW_READ_U32_BE(p);
+	count_instr = DUK_RAW_READINC_U32_BE(p);
+	count_const = DUK_RAW_READINC_U32_BE(p);
+	count_funcs = DUK_RAW_READINC_U32_BE(p);
 
-	data_size = sizeof(duk_tval) * count_const +
-	            sizeof(duk_hobject *) * count_funcs +
-	            sizeof(duk_instr_t) * count_instr;
+	data_size = sizeof(duk_tval) * count_const + sizeof(duk_hobject *) * count_funcs + sizeof(duk_instr_t) * count_instr;
 
 	DUK_DD(DUK_DDPRINT("instr=%ld, const=%ld, funcs=%ld, data_size=%ld",
-	                   (long) count_instr, (long) count_const,
-	                   (long) count_const, (long) data_size));
+	                   (long) count_instr,
+	                   (long) count_const,
+	                   (long) count_const,
+	                   (long) data_size));
 
 	/* Value stack is used to ensure reachability of constants and
 	 * inner functions being loaded.  Require enough space to handle
@@ -13796,18 +14865,18 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 	DUK_ASSERT(DUK_HCOMPFUNC_GET_BYTECODE(thr->heap, h_fun) == NULL);
 	DUK_ASSERT(DUK_HOBJECT_GET_PROTOTYPE(thr->heap, (duk_hobject *) h_fun) == thr->builtins[DUK_BIDX_FUNCTION_PROTOTYPE]);
 
-	h_fun->nregs = DUK_RAW_READ_U16_BE(p);
-	h_fun->nargs = DUK_RAW_READ_U16_BE(p);
+	h_fun->nregs = DUK_RAW_READINC_U16_BE(p);
+	h_fun->nargs = DUK_RAW_READINC_U16_BE(p);
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
-	h_fun->start_line = DUK_RAW_READ_U32_BE(p);
-	h_fun->end_line = DUK_RAW_READ_U32_BE(p);
+	h_fun->start_line = DUK_RAW_READINC_U32_BE(p);
+	h_fun->end_line = DUK_RAW_READINC_U32_BE(p);
 #else
-	p += 8;  /* skip line info */
+	p += 8; /* skip line info */
 #endif
 
 	/* duk_hcompfunc flags; quite version specific */
-	tmp32 = DUK_RAW_READ_U32_BE(p);
-	DUK_HEAPHDR_SET_FLAGS((duk_heaphdr *) h_fun, tmp32);  /* masks flags to only change duk_hobject flags */
+	tmp32 = DUK_RAW_READINC_U32_BE(p);
+	DUK_HEAPHDR_SET_FLAGS((duk_heaphdr *) h_fun, tmp32); /* masks flags to only change duk_hobject flags */
 
 	/* standard prototype (no need to set here, already set) */
 	DUK_ASSERT(DUK_HOBJECT_GET_PROTOTYPE(thr->heap, (duk_hobject *) h_fun) == thr->builtins[DUK_BIDX_FUNCTION_PROTOTYPE]);
@@ -13821,6 +14890,7 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 	DUK_ASSERT(DUK_HOBJECT_HAS_COMPFUNC(&h_fun->obj));
 	DUK_ASSERT(!DUK_HOBJECT_HAS_NATFUNC(&h_fun->obj));
 	DUK_ASSERT(!DUK_HOBJECT_IS_THREAD(&h_fun->obj));
+	DUK_ASSERT(!DUK_HOBJECT_IS_PROXY(&h_fun->obj));
 	DUK_ASSERT(!DUK_HOBJECT_HAS_EXOTIC_ARRAY(&h_fun->obj));
 	DUK_ASSERT(!DUK_HOBJECT_HAS_EXOTIC_STRINGOBJ(&h_fun->obj));
 	DUK_ASSERT(!DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(&h_fun->obj));
@@ -13834,14 +14904,12 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 	DUK__ASSERT_LEFT(count_instr * sizeof(duk_instr_t));
 #if defined(DUK_USE_INTEGER_BE)
 	q = fun_data + sizeof(duk_tval) * count_const + sizeof(duk_hobject *) * count_funcs;
-	duk_memcpy((void *) q,
-	           (const void *) p,
-	           sizeof(duk_instr_t) * count_instr);
+	duk_memcpy((void *) q, (const void *) p, sizeof(duk_instr_t) * count_instr);
 	p += sizeof(duk_instr_t) * count_instr;
 #else
 	q = fun_data + sizeof(duk_tval) * count_const + sizeof(duk_hobject *) * count_funcs;
 	for (n = count_instr; n > 0; n--) {
-		*((duk_instr_t *) (void *) q) = DUK_RAW_READ_U32_BE(p);
+		*((duk_instr_t *) (void *) q) = DUK_RAW_READINC_U32_BE(p);
 		q += sizeof(duk_instr_t);
 	}
 #endif
@@ -13849,7 +14917,7 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 	/* Load constants onto value stack but don't yet copy to buffer. */
 	for (n = count_const; n > 0; n--) {
 		DUK__ASSERT_LEFT(1);
-		const_type = DUK_RAW_READ_U8(p);
+		const_type = DUK_RAW_READINC_U8(p);
 		switch (const_type) {
 		case DUK__SER_STRING: {
 			p = duk__load_string_raw(thr, p);
@@ -13862,7 +14930,7 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 			duk_tval tv_tmp;
 			duk_double_t val;
 			DUK__ASSERT_LEFT(8);
-			val = DUK_RAW_READ_DOUBLE_BE(p);
+			val = DUK_RAW_READINC_DOUBLE_BE(p);
 			DUK_TVAL_SET_NUMBER_CHKFAST_SLOW(&tv_tmp, val);
 			duk_push_tval(thr, &tv_tmp);
 			break;
@@ -13895,13 +14963,13 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 	DUK_HCOMPFUNC_SET_DATA(thr->heap, h_fun, h_data);
 	DUK_HBUFFER_INCREF(thr, h_data);
 
-	tv1 = duk_get_tval(thr, idx_base + 2);  /* may be NULL if no constants or inner funcs */
+	tv1 = duk_get_tval(thr, idx_base + 2); /* may be NULL if no constants or inner funcs */
 	DUK_ASSERT((count_const == 0 && count_funcs == 0) || tv1 != NULL);
 
 	q = fun_data;
 	duk_memcpy_unsafe((void *) q, (const void *) tv1, sizeof(duk_tval) * count_const);
 	for (n = count_const; n > 0; n--) {
-		DUK_TVAL_INCREF_FAST(thr, (duk_tval *) (void *) q);  /* no side effects */
+		DUK_TVAL_INCREF_FAST(thr, (duk_tval *) (void *) q); /* no side effects */
 		q += sizeof(duk_tval);
 	}
 	tv1 += count_const;
@@ -13929,12 +14997,12 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 	duk_set_top(thr, idx_base + 1);
 
 	/* Setup function properties. */
-	tmp32 = DUK_RAW_READ_U32_BE(p);
+	tmp32 = DUK_RAW_READINC_U32_BE(p);
 	duk_push_u32(thr, tmp32);
 	duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_LENGTH, DUK_PROPDESC_FLAGS_C);
 
 #if defined(DUK_USE_FUNC_NAME_PROPERTY)
-	p = duk__load_string_raw(thr, p);  /* -> [ func funcname ] */
+	p = duk__load_string_raw(thr, p); /* -> [ func funcname ] */
 	func_env = thr->builtins[DUK_BIDX_GLOBAL_ENV];
 	DUK_ASSERT(func_env != NULL);
 	need_pop = 0;
@@ -13945,14 +15013,13 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 		 */
 		duk_hdecenv *new_env;
 
-		new_env = duk_hdecenv_alloc(thr,
-		                            DUK_HOBJECT_FLAG_EXTENSIBLE |
-		                            DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DECENV));
+		new_env =
+		    duk_hdecenv_alloc(thr, DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DECENV));
 		DUK_ASSERT(new_env != NULL);
-		DUK_ASSERT(new_env->thread == NULL);  /* Closed. */
+		DUK_ASSERT(new_env->thread == NULL); /* Closed. */
 		DUK_ASSERT(new_env->varmap == NULL);
 		DUK_ASSERT(new_env->regbase_byteoff == 0);
-		DUK_ASSERT_HDECENV_VALID(new_env);
+		DUK_HDECENV_ASSERT_VALID(new_env);
 		DUK_ASSERT(DUK_HOBJECT_GET_PROTOTYPE(thr->heap, (duk_hobject *) new_env) == NULL);
 		DUK_HOBJECT_SET_PROTOTYPE(thr->heap, (duk_hobject *) new_env, func_env);
 		DUK_HOBJECT_INCREF(thr, func_env);
@@ -13961,11 +15028,11 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 
 		duk_push_hobject(thr, (duk_hobject *) new_env);
 
-		duk_dup_m2(thr);                                  /* -> [ func funcname env funcname ] */
-		duk_dup(thr, idx_base);                           /* -> [ func funcname env funcname func ] */
-		duk_xdef_prop(thr, -3, DUK_PROPDESC_FLAGS_NONE);  /* -> [ func funcname env ] */
+		duk_dup_m2(thr); /* -> [ func funcname env funcname ] */
+		duk_dup(thr, idx_base); /* -> [ func funcname env funcname func ] */
+		duk_xdef_prop(thr, -3, DUK_PROPDESC_FLAGS_NONE); /* -> [ func funcname env ] */
 
-		need_pop = 1;  /* Need to pop env, but -after- updating h_fun and increfs. */
+		need_pop = 1; /* Need to pop env, but -after- updating h_fun and increfs. */
 	}
 	DUK_ASSERT(func_env != NULL);
 	DUK_HCOMPFUNC_SET_LEXENV(thr->heap, h_fun, func_env);
@@ -13976,20 +15043,25 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 		duk_pop(thr);
 	}
 	duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_NAME, DUK_PROPDESC_FLAGS_C);
-#endif  /* DUK_USE_FUNC_NAME_PROPERTY */
+#endif /* DUK_USE_FUNC_NAME_PROPERTY */
 
 #if defined(DUK_USE_FUNC_FILENAME_PROPERTY)
 	p = duk__load_string_raw(thr, p);
 	duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_FILE_NAME, DUK_PROPDESC_FLAGS_C);
-#endif  /* DUK_USE_FUNC_FILENAME_PROPERTY */
+#endif /* DUK_USE_FUNC_FILENAME_PROPERTY */
 
 	if (DUK_HOBJECT_HAS_CONSTRUCTABLE((duk_hobject *) h_fun)) {
 		/* Restore empty external .prototype only for constructable
-		 * functions.
+		 * functions.  The prototype object should inherit from
+		 * Object.prototype.
 		 */
 		duk_push_object(thr);
+		DUK_ASSERT(!duk_is_bare_object(thr, -1));
 		duk_dup_m2(thr);
-		duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_CONSTRUCTOR, DUK_PROPDESC_FLAGS_WC);  /* func.prototype.constructor = func */
+		duk_xdef_prop_stridx_short(thr,
+		                           -2,
+		                           DUK_STRIDX_CONSTRUCTOR,
+		                           DUK_PROPDESC_FLAGS_WC); /* func.prototype.constructor = func */
 		duk_compact_m1(thr);
 		duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_PROTOTYPE, DUK_PROPDESC_FLAGS_W);
 	}
@@ -13997,9 +15069,9 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 #if defined(DUK_USE_PC2LINE)
 	p = duk__load_buffer_raw(thr, p);
 	duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_INT_PC2LINE, DUK_PROPDESC_FLAGS_WC);
-#endif  /* DUK_USE_PC2LINE */
+#endif /* DUK_USE_PC2LINE */
 
-	duk_push_object(thr);  /* _Varmap */
+	duk_push_bare_object(thr); /* _Varmap */
 	for (;;) {
 		/* XXX: awkward */
 		p = duk__load_string_raw(thr, p);
@@ -14007,7 +15079,7 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 			duk_pop(thr);
 			break;
 		}
-		tmp32 = DUK_RAW_READ_U32_BE(p);
+		tmp32 = DUK_RAW_READINC_U32_BE(p);
 		duk_push_u32(thr, tmp32);
 		duk_put_prop(thr, -3);
 	}
@@ -14017,9 +15089,9 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 	/* _Formals may have been missing in the original function, which is
 	 * handled using a marker length.
 	 */
-	arr_limit = DUK_RAW_READ_U32_BE(p);
+	arr_limit = DUK_RAW_READINC_U32_BE(p);
 	if (arr_limit != DUK__NO_FORMALS) {
-		duk_push_array(thr);  /* _Formals */
+		duk_push_bare_array(thr); /* _Formals */
 		for (arr_idx = 0; arr_idx < arr_limit; arr_idx++) {
 			p = duk__load_string_raw(thr, p);
 			duk_put_prop_index(thr, -2, arr_idx);
@@ -14035,7 +15107,7 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 	DUK_ASSERT_TOP(thr, idx_base + 1);
 	return p;
 
- format_error:
+format_error:
 	return NULL;
 }
 
@@ -14067,11 +15139,11 @@ DUK_EXTERNAL void duk_dump_function(duk_hthread *thr) {
 
 	DUK_DD(DUK_DDPRINT("serialized result: %!T", duk_get_tval(thr, -1)));
 
-	duk_remove_m2(thr);  /* [ ... func buf ] -> [ ... buf ] */
+	duk_remove_m2(thr); /* [ ... func buf ] -> [ ... buf ] */
 }
 
 DUK_EXTERNAL void duk_load_function(duk_hthread *thr) {
-	duk_uint8_t *p_buf, *p, *p_end;
+	const duk_uint8_t *p_buf, *p, *p_end;
 	duk_size_t sz;
 
 	DUK_ASSERT_API_ENTRY(thr);
@@ -14100,15 +15172,15 @@ DUK_EXTERNAL void duk_load_function(duk_hthread *thr) {
 		goto format_error;
 	}
 
-	duk_remove_m2(thr);  /* [ ... buf func ] -> [ ... func ] */
+	duk_remove_m2(thr); /* [ ... buf func ] -> [ ... func ] */
 	return;
 
- format_error:
+format_error:
 	DUK_ERROR_TYPE(thr, DUK_STR_INVALID_BYTECODE);
 	DUK_WO_NORETURN(return;);
 }
 
-#else  /* DUK_USE_BYTECODE_DUMP_SUPPORT */
+#else /* DUK_USE_BYTECODE_DUMP_SUPPORT */
 
 DUK_EXTERNAL void duk_dump_function(duk_hthread *thr) {
 	DUK_ASSERT_API_ENTRY(thr);
@@ -14122,7 +15194,7 @@ DUK_EXTERNAL void duk_load_function(duk_hthread *thr) {
 	DUK_WO_NORETURN(return;);
 }
 
-#endif  /* DUK_USE_BYTECODE_DUMP_SUPPORT */
+#endif /* DUK_USE_BYTECODE_DUMP_SUPPORT */
 
 /* automatic undefs */
 #undef DUK__ASSERT_LEFT
@@ -14184,7 +15256,7 @@ DUK_LOCAL duk_idx_t duk__call_get_idx_func(duk_hthread *thr, duk_idx_t nargs, du
 	DUK_ASSERT(other >= 0);
 
 	idx_func = duk_get_top(thr) - nargs - other;
-	if (DUK_UNLIKELY((idx_func | nargs) < 0)) {  /* idx_func < 0 || nargs < 0; OR sign bits */
+	if (DUK_UNLIKELY((idx_func | nargs) < 0)) { /* idx_func < 0 || nargs < 0; OR sign bits */
 		DUK_ERROR_TYPE_INVALID_ARGS(thr);
 		DUK_WO_NORETURN(return 0;);
 	}
@@ -14214,34 +15286,34 @@ DUK_LOCAL duk_idx_t duk__call_get_idx_func_unvalidated(duk_hthread *thr, duk_idx
  * May currently throw an error e.g. when getting the property.
  */
 DUK_LOCAL void duk__call_prop_prep_stack(duk_hthread *thr, duk_idx_t normalized_obj_idx, duk_idx_t nargs) {
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	DUK_ASSERT(nargs >= 0);
 
 	DUK_DDD(DUK_DDDPRINT("duk__call_prop_prep_stack, normalized_obj_idx=%ld, nargs=%ld, stacktop=%ld",
-	                     (long) normalized_obj_idx, (long) nargs, (long) duk_get_top(thr)));
+	                     (long) normalized_obj_idx,
+	                     (long) nargs,
+	                     (long) duk_get_top(thr)));
 
 	/* [... key arg1 ... argN] */
 
 	/* duplicate key */
-	duk_dup(thr, -nargs - 1);  /* Note: -nargs alone would fail for nargs == 0, this is OK */
+	duk_dup(thr, -nargs - 1); /* Note: -nargs alone would fail for nargs == 0, this is OK */
 	(void) duk_get_prop(thr, normalized_obj_idx);
 
 	DUK_DDD(DUK_DDDPRINT("func: %!T", (duk_tval *) duk_get_tval(thr, -1)));
 
 #if defined(DUK_USE_VERBOSE_ERRORS)
 	if (DUK_UNLIKELY(!duk_is_callable(thr, -1))) {
-		duk_tval *tv_targ;
 		duk_tval *tv_base;
 		duk_tval *tv_key;
 
-		tv_targ = DUK_GET_TVAL_NEGIDX(thr, -1);
+		/* tv_targ is passed on stack top (at index -1). */
 		tv_base = DUK_GET_TVAL_POSIDX(thr, normalized_obj_idx);
 		tv_key = DUK_GET_TVAL_NEGIDX(thr, -nargs - 2);
-		DUK_ASSERT(tv_targ >= thr->valstack_bottom && tv_targ < thr->valstack_top);
 		DUK_ASSERT(tv_base >= thr->valstack_bottom && tv_base < thr->valstack_top);
 		DUK_ASSERT(tv_key >= thr->valstack_bottom && tv_key < thr->valstack_top);
 
-		duk_call_setup_propcall_error(thr, tv_targ, tv_base, tv_key);
+		duk_call_setup_propcall_error(thr, tv_base, tv_key);
 	}
 #endif
 
@@ -14268,7 +15340,7 @@ DUK_EXTERNAL void duk_call(duk_hthread *thr, duk_idx_t nargs) {
 
 	duk_insert_undefined(thr, idx_func + 1);
 
-	call_flags = 0;  /* not protected, respect reclimit, not constructor */
+	call_flags = 0; /* not protected, respect reclimit, not constructor */
 	duk_handle_call_unprotected(thr, idx_func, call_flags);
 }
 
@@ -14281,7 +15353,7 @@ DUK_EXTERNAL void duk_call_method(duk_hthread *thr, duk_idx_t nargs) {
 	idx_func = duk__call_get_idx_func(thr, nargs, 2);
 	DUK_ASSERT(duk_is_valid_index(thr, idx_func));
 
-	call_flags = 0;  /* not protected, respect reclimit, not constructor */
+	call_flags = 0; /* not protected, respect reclimit, not constructor */
 	duk_handle_call_unprotected(thr, idx_func, call_flags);
 }
 
@@ -14295,7 +15367,7 @@ DUK_EXTERNAL void duk_call_prop(duk_hthread *thr, duk_idx_t obj_idx, duk_idx_t n
 
 	DUK_ASSERT_API_ENTRY(thr);
 
-	obj_idx = duk_require_normalize_index(thr, obj_idx);  /* make absolute */
+	obj_idx = duk_require_normalize_index(thr, obj_idx); /* make absolute */
 	if (DUK_UNLIKELY(nargs < 0)) {
 		DUK_ERROR_TYPE_INVALID_ARGS(thr);
 		DUK_WO_NORETURN(return;);
@@ -14311,7 +15383,7 @@ DUK_LOCAL duk_ret_t duk__pcall_raw(duk_hthread *thr, void *udata) {
 	duk_idx_t idx_func;
 	duk_int_t ret;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	DUK_ASSERT(udata != NULL);
 
 	args = (duk__pcall_args *) udata;
@@ -14347,7 +15419,7 @@ DUK_LOCAL duk_ret_t duk__pcall_method_raw(duk_hthread *thr, void *udata) {
 	duk_idx_t idx_func;
 	duk_int_t ret;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	DUK_ASSERT(udata != NULL);
 
 	args = (duk__pcall_method_args *) udata;
@@ -14388,12 +15460,12 @@ DUK_LOCAL duk_ret_t duk__pcall_prop_raw(duk_hthread *thr, void *udata) {
 	duk_idx_t obj_idx;
 	duk_int_t ret;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	DUK_ASSERT(udata != NULL);
 
 	args = (duk__pcall_prop_args *) udata;
 
-	obj_idx = duk_require_normalize_index(thr, args->obj_idx);  /* make absolute */
+	obj_idx = duk_require_normalize_index(thr, args->obj_idx); /* make absolute */
 	duk__call_prop_prep_stack(thr, obj_idx, args->nargs);
 
 	ret = duk_handle_call_unprotected_nargs(thr, args->nargs, args->call_flags);
@@ -14431,30 +15503,30 @@ DUK_EXTERNAL duk_int_t duk_safe_call(duk_hthread *thr, duk_safe_call_function fu
 	 */
 	/* XXX: check for any reserve? */
 
-	if (DUK_UNLIKELY((nargs | nrets) < 0 ||  /* nargs < 0 || nrets < 0; OR sign bits */
-	                 thr->valstack_top < thr->valstack_bottom + nargs ||        /* nargs too large compared to top */
-	                 thr->valstack_end + nargs < thr->valstack_top + nrets)) {  /* nrets too large compared to reserve */
+	if (DUK_UNLIKELY((nargs | nrets) < 0 || /* nargs < 0 || nrets < 0; OR sign bits */
+	                 thr->valstack_top < thr->valstack_bottom + nargs || /* nargs too large compared to top */
+	                 thr->valstack_end + nargs < thr->valstack_top + nrets)) { /* nrets too large compared to reserve */
 		DUK_D(DUK_DPRINT("not enough stack reserve for safe call or invalid arguments: "
 		                 "nargs=%ld < 0 (?), nrets=%ld < 0 (?), top=%ld < bottom=%ld + nargs=%ld (?), "
 		                 "end=%ld + nargs=%ld < top=%ld + nrets=%ld (?)",
-		                  (long) nargs,
-		                  (long) nrets,
-		                  (long) (thr->valstack_top - thr->valstack),
-		                  (long) (thr->valstack_bottom - thr->valstack),
-		                  (long) nargs,
-		                  (long) (thr->valstack_end - thr->valstack),
-		                  (long) nargs,
-		                  (long) (thr->valstack_top - thr->valstack),
-		                  (long) nrets));
+		                 (long) nargs,
+		                 (long) nrets,
+		                 (long) (thr->valstack_top - thr->valstack),
+		                 (long) (thr->valstack_bottom - thr->valstack),
+		                 (long) nargs,
+		                 (long) (thr->valstack_end - thr->valstack),
+		                 (long) nargs,
+		                 (long) (thr->valstack_top - thr->valstack),
+		                 (long) nrets));
 		DUK_ERROR_TYPE_INVALID_ARGS(thr);
 		DUK_WO_NORETURN(return DUK_EXEC_ERROR;);
 	}
 
-	rc = duk_handle_safe_call(thr,           /* thread */
-	                          func,          /* func */
-	                          udata,         /* udata */
-	                          nargs,         /* num_stack_args */
-	                          nrets);        /* num_stack_res */
+	rc = duk_handle_safe_call(thr, /* thread */
+	                          func, /* func */
+	                          udata, /* udata */
+	                          nargs, /* num_stack_args */
+	                          nrets); /* num_stack_res */
 
 	return rc;
 }
@@ -14467,7 +15539,7 @@ DUK_EXTERNAL void duk_new(duk_hthread *thr, duk_idx_t nargs) {
 	idx_func = duk__call_get_idx_func(thr, nargs, 1);
 	DUK_ASSERT(duk_is_valid_index(thr, idx_func));
 
-	duk_push_object(thr);  /* default instance; internal proto updated by call handling */
+	duk_push_object(thr); /* default instance; internal proto updated by call handling */
 	duk_insert(thr, idx_func + 1);
 
 	duk_handle_call_unprotected(thr, idx_func, DUK_CALL_FLAG_CONSTRUCT);
@@ -14514,10 +15586,7 @@ DUK_EXTERNAL duk_bool_t duk_is_constructor_call(duk_hthread *thr) {
 	return 0;
 }
 
-/* XXX: Make this obsolete by adding a function flag for rejecting a
- * non-constructor call automatically?
- */
-DUK_INTERNAL void duk_require_constructor_call(duk_hthread *thr) {
+DUK_EXTERNAL void duk_require_constructor_call(duk_hthread *thr) {
 	DUK_ASSERT_API_ENTRY(thr);
 
 	if (!duk_is_constructor_call(thr)) {
@@ -14598,7 +15667,7 @@ DUK_EXTERNAL duk_int_t duk_get_magic(duk_hthread *thr, duk_idx_t idx) {
 	}
 
 	/* fall through */
- type_error:
+type_error:
 	DUK_ERROR_TYPE(thr, DUK_STR_UNEXPECTED_TYPE);
 	DUK_WO_NORETURN(return 0;);
 }
@@ -14623,7 +15692,7 @@ DUK_EXTERNAL void duk_set_magic(duk_hthread *thr, duk_idx_t idx, duk_int_t magic
 DUK_INTERNAL void duk_resolve_nonbound_function(duk_hthread *thr) {
 	duk_tval *tv;
 
-	DUK_ASSERT_HTHREAD_VALID(thr);
+	DUK_HTHREAD_ASSERT_VALID(thr);
 
 	tv = DUK_GET_TVAL_NEGIDX(thr, -1);
 	if (DUK_TVAL_IS_OBJECT(tv)) {
@@ -14668,23 +15737,35 @@ DUK_INTERNAL void duk_resolve_nonbound_function(duk_hthread *thr) {
 
 /* Shared handling for encode/decode argument.  Fast path handling for
  * buffer and string values because they're the most common.  In particular,
- * avoid creating a temporary string or buffer when possible.
+ * avoid creating a temporary string or buffer when possible.  Return value
+ * is guaranteed to be non-NULL, even for zero length input.
  */
 DUK_LOCAL const duk_uint8_t *duk__prep_codec_arg(duk_hthread *thr, duk_idx_t idx, duk_size_t *out_len) {
-	void *ptr;
+	const void *def_ptr = (const void *) out_len; /* Any non-NULL pointer will do. */
+	const void *ptr;
 	duk_bool_t isbuffer;
 
-	DUK_ASSERT(duk_is_valid_index(thr, idx));  /* checked by caller */
+	DUK_ASSERT(out_len != NULL);
+	DUK_ASSERT(def_ptr != NULL);
+	DUK_ASSERT(duk_is_valid_index(thr, idx)); /* checked by caller */
 
-	/* XXX: with def_ptr set to a stack related pointer, isbuffer could
-	 * be removed from the helper?
-	 */
-	ptr = duk_get_buffer_data_raw(thr, idx, out_len, NULL /*def_ptr*/, 0 /*def_size*/, 0 /*throw_flag*/, &isbuffer);
+	ptr = (const void *)
+	    duk_get_buffer_data_raw(thr, idx, out_len, NULL /*def_ptr*/, 0 /*def_size*/, 0 /*throw_flag*/, &isbuffer);
 	if (isbuffer) {
-		DUK_ASSERT(*out_len == 0 || ptr != NULL);
-		return (const duk_uint8_t *) ptr;
+		DUK_ASSERT(ptr != NULL || *out_len == 0U);
+		if (DUK_UNLIKELY(ptr == NULL)) {
+			ptr = def_ptr;
+		}
+		DUK_ASSERT(ptr != NULL);
+	} else {
+		/* For strings a non-NULL pointer is always guaranteed because
+		 * at least a NUL will be present.
+		 */
+		ptr = (const void *) duk_to_lstring(thr, idx, out_len);
+		DUK_ASSERT(ptr != NULL);
 	}
-	return (const duk_uint8_t *) duk_to_lstring(thr, idx, out_len);
+	DUK_ASSERT(ptr != NULL);
+	return (const duk_uint8_t *) ptr;
 }
 
 /*
@@ -14694,21 +15775,21 @@ DUK_LOCAL const duk_uint8_t *duk__prep_codec_arg(duk_hthread *thr, duk_idx_t idx
 #if defined(DUK_USE_BASE64_SUPPORT)
 /* Bytes emitted for number of padding characters in range [0,4]. */
 DUK_LOCAL const duk_int8_t duk__base64_decode_nequal_step[5] = {
-	3,   /* #### -> 24 bits, emit 3 bytes */
-	2,   /* ###= -> 18 bits, emit 2 bytes */
-	1,   /* ##== -> 12 bits, emit 1 byte */
-	-1,  /* #=== -> 6 bits, error */
-	0,   /* ==== -> 0 bits, emit 0 bytes */
+	3, /* #### -> 24 bits, emit 3 bytes */
+	2, /* ###= -> 18 bits, emit 2 bytes */
+	1, /* ##== -> 12 bits, emit 1 byte */
+	-1, /* #=== -> 6 bits, error */
+	0, /* ==== -> 0 bits, emit 0 bytes */
 };
 
 #if defined(DUK_USE_BASE64_FASTPATH)
 DUK_LOCAL const duk_uint8_t duk__base64_enctab_fast[64] = {
-	0x41U, 0x42U, 0x43U, 0x44U, 0x45U, 0x46U, 0x47U, 0x48U, 0x49U, 0x4aU, 0x4bU, 0x4cU, 0x4dU, 0x4eU, 0x4fU, 0x50U,  /* A...P */
-	0x51U, 0x52U, 0x53U, 0x54U, 0x55U, 0x56U, 0x57U, 0x58U, 0x59U, 0x5aU, 0x61U, 0x62U, 0x63U, 0x64U, 0x65U, 0x66U,  /* Q...f */
-	0x67U, 0x68U, 0x69U, 0x6aU, 0x6bU, 0x6cU, 0x6dU, 0x6eU, 0x6fU, 0x70U, 0x71U, 0x72U, 0x73U, 0x74U, 0x75U, 0x76U,  /* g...v */
-	0x77U, 0x78U, 0x79U, 0x7aU, 0x30U, 0x31U, 0x32U, 0x33U, 0x34U, 0x35U, 0x36U, 0x37U, 0x38U, 0x39U, 0x2bU, 0x2fU   /* w.../ */
+	0x41U, 0x42U, 0x43U, 0x44U, 0x45U, 0x46U, 0x47U, 0x48U, 0x49U, 0x4aU, 0x4bU, 0x4cU, 0x4dU, 0x4eU, 0x4fU, 0x50U, /* A...P */
+	0x51U, 0x52U, 0x53U, 0x54U, 0x55U, 0x56U, 0x57U, 0x58U, 0x59U, 0x5aU, 0x61U, 0x62U, 0x63U, 0x64U, 0x65U, 0x66U, /* Q...f */
+	0x67U, 0x68U, 0x69U, 0x6aU, 0x6bU, 0x6cU, 0x6dU, 0x6eU, 0x6fU, 0x70U, 0x71U, 0x72U, 0x73U, 0x74U, 0x75U, 0x76U, /* g...v */
+	0x77U, 0x78U, 0x79U, 0x7aU, 0x30U, 0x31U, 0x32U, 0x33U, 0x34U, 0x35U, 0x36U, 0x37U, 0x38U, 0x39U, 0x2bU, 0x2fU /* w.../ */
 };
-#endif  /* DUK_USE_BASE64_FASTPATH */
+#endif /* DUK_USE_BASE64_FASTPATH */
 
 #if defined(DUK_USE_BASE64_FASTPATH)
 /* Decode table for one byte of input:
@@ -14718,24 +15799,24 @@ DUK_LOCAL const duk_uint8_t duk__base64_enctab_fast[64] = {
  *    0...63 decoded bytes
  */
 DUK_LOCAL const duk_int8_t duk__base64_dectab_fast[256] = {
-	-3, -3, -3, -3, -3, -3, -3, -3, -3, -1, -1, -3, -3, -1, -3, -3,  /* 0x00...0x0f */
-	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,  /* 0x10...0x1f */
-	-1, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, 62, -3, -3, -3, 63,  /* 0x20...0x2f */
-	52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -3, -3, -3, -2, -3, -3,  /* 0x30...0x3f */
-	-3,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,  /* 0x40...0x4f */
-	15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -3, -3, -3, -3, -3,  /* 0x50...0x5f */
-	-3, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,  /* 0x60...0x6f */
-	41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -3, -3, -3, -3, -3,  /* 0x70...0x7f */
-	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,  /* 0x80...0x8f */
-	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,  /* 0x90...0x9f */
-	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,  /* 0xa0...0xaf */
-	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,  /* 0xb0...0xbf */
-	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,  /* 0xc0...0xcf */
-	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,  /* 0xd0...0xdf */
-	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,  /* 0xe0...0xef */
-	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3   /* 0xf0...0xff */
+	-3, -3, -3, -3, -3, -3, -3, -3, -3, -1, -1, -3, -3, -1, -3, -3, /* 0x00...0x0f */
+	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, /* 0x10...0x1f */
+	-1, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, 62, -3, -3, -3, 63, /* 0x20...0x2f */
+	52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -3, -3, -3, -2, -3, -3, /* 0x30...0x3f */
+	-3, 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, /* 0x40...0x4f */
+	15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -3, -3, -3, -3, -3, /* 0x50...0x5f */
+	-3, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, /* 0x60...0x6f */
+	41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -3, -3, -3, -3, -3, /* 0x70...0x7f */
+	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, /* 0x80...0x8f */
+	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, /* 0x90...0x9f */
+	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, /* 0xa0...0xaf */
+	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, /* 0xb0...0xbf */
+	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, /* 0xc0...0xcf */
+	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, /* 0xd0...0xdf */
+	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, /* 0xe0...0xef */
+	-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3 /* 0xf0...0xff */
 };
-#endif  /* DUK_USE_BASE64_FASTPATH */
+#endif /* DUK_USE_BASE64_FASTPATH */
 
 #if defined(DUK_USE_BASE64_FASTPATH)
 DUK_LOCAL DUK_ALWAYS_INLINE void duk__base64_encode_fast_3(const duk_uint8_t *src, duk_uint8_t *dst) {
@@ -14767,9 +15848,9 @@ DUK_LOCAL DUK_ALWAYS_INLINE void duk__base64_encode_fast_2(const duk_uint8_t *sr
 
 	t = (duk_uint_t) src[0];
 	t = (t << 8) + (duk_uint_t) src[1];
-	dst[0] = duk__base64_enctab_fast[t >> 10];           /* XXXXXX-- -------- */
-	dst[1] = duk__base64_enctab_fast[(t >> 4) & 0x3fU];  /* ------XX XXXX---- */
-	dst[2] = duk__base64_enctab_fast[(t << 2) & 0x3fU];  /* -------- ----XXXX */
+	dst[0] = duk__base64_enctab_fast[t >> 10]; /* XXXXXX-- -------- */
+	dst[1] = duk__base64_enctab_fast[(t >> 4) & 0x3fU]; /* ------XX XXXX---- */
+	dst[2] = duk__base64_enctab_fast[(t << 2) & 0x3fU]; /* -------- ----XXXX */
 	dst[3] = DUK_ASC_EQUALS;
 }
 
@@ -14777,8 +15858,8 @@ DUK_LOCAL DUK_ALWAYS_INLINE void duk__base64_encode_fast_1(const duk_uint8_t *sr
 	duk_uint_t t;
 
 	t = (duk_uint_t) src[0];
-	dst[0] = duk__base64_enctab_fast[t >> 2];            /* XXXXXX-- */
-	dst[1] = duk__base64_enctab_fast[(t << 4) & 0x3fU];  /* ------XX */
+	dst[0] = duk__base64_enctab_fast[t >> 2]; /* XXXXXX-- */
+	dst[1] = duk__base64_enctab_fast[(t << 4) & 0x3fU]; /* ------XX */
 	dst[2] = DUK_ASC_EQUALS;
 	dst[3] = DUK_ASC_EQUALS;
 }
@@ -14826,24 +15907,24 @@ DUK_LOCAL void duk__base64_encode_helper(const duk_uint8_t *src, duk_size_t srcl
 	DUK_ASSERT(n == 0U || n == 1U || n == 2U);
 	if (n == 1U) {
 		duk__base64_encode_fast_1(p, q);
-#if 0  /* Unnecessary. */
+#if 0 /* Unnecessary. */
 		p += 1;
 		q += 4;
 		n -= 1U;
 #endif
 	} else if (n == 2U) {
 		duk__base64_encode_fast_2(p, q);
-#if 0  /* Unnecessary. */
+#if 0 /* Unnecessary. */
 		p += 2;
 		q += 4;
 		n -= 2U;
 #endif
 	} else {
-		DUK_ASSERT(n == 0U);  /* nothing to do */
+		DUK_ASSERT(n == 0U); /* nothing to do */
 		;
 	}
 }
-#else  /* DUK_USE_BASE64_FASTPATH */
+#else /* DUK_USE_BASE64_FASTPATH */
 DUK_LOCAL void duk__base64_encode_helper(const duk_uint8_t *src, duk_size_t srclen, duk_uint8_t *dst) {
 	duk_small_uint_t i, npad;
 	duk_uint_t t, x, y;
@@ -14915,10 +15996,13 @@ DUK_LOCAL void duk__base64_encode_helper(const duk_uint8_t *src, duk_size_t srcl
 		npad--;
 	}
 }
-#endif  /* DUK_USE_BASE64_FASTPATH */
+#endif /* DUK_USE_BASE64_FASTPATH */
 
 #if defined(DUK_USE_BASE64_FASTPATH)
-DUK_LOCAL duk_bool_t duk__base64_decode_helper(const duk_uint8_t *src, duk_size_t srclen, duk_uint8_t *dst, duk_uint8_t **out_dst_final) {
+DUK_LOCAL duk_bool_t duk__base64_decode_helper(const duk_uint8_t *src,
+                                               duk_size_t srclen,
+                                               duk_uint8_t *dst,
+                                               duk_uint8_t **out_dst_final) {
 	duk_int_t x;
 	duk_uint_t t;
 	duk_small_uint_t n_equal;
@@ -14928,9 +16012,11 @@ DUK_LOCAL duk_bool_t duk__base64_decode_helper(const duk_uint8_t *src, duk_size_
 	const duk_uint8_t *p_end_safe;
 	duk_uint8_t *q;
 
+	DUK_ASSERT(src != NULL); /* Required by pointer arithmetic below, which fails for NULL. */
+
 	p = src;
 	p_end = src + srclen;
-	p_end_safe = p_end - 8;  /* If 'src <= src_end_safe', safe to read 8 bytes. */
+	p_end_safe = p_end - 8; /* If 'src <= src_end_safe', safe to read 8 bytes. */
 	q = dst;
 
 	/* Alternate between a fast path which processes clean groups with no
@@ -14960,7 +16046,9 @@ DUK_LOCAL duk_bool_t duk__base64_decode_helper(const duk_uint8_t *src, duk_size_
 			 * bytes to minimize aliasing.
 			 */
 			DUK_DDD(DUK_DDDPRINT("fast loop: p=%p, p_end_safe=%p, p_end=%p",
-			                     (const void *) p, (const void *) p_end_safe, (const void *) p_end));
+			                     (const void *) p,
+			                     (const void *) p_end_safe,
+			                     (const void *) p_end));
 
 			t1 = (duk_int_t) duk__base64_dectab_fast[p[0]];
 			t1 = (duk_int_t) ((duk_uint_t) t1 << 6) | (duk_int_t) duk__base64_dectab_fast[p[1]];
@@ -14985,17 +16073,19 @@ DUK_LOCAL duk_bool_t duk__base64_decode_helper(const duk_uint8_t *src, duk_size_
 				p += 8;
 				q += 6;
 			} else if (t1 >= 0) {
-				DUK_DDD(DUK_DDDPRINT("fast loop first group was clean, second was not, process one slow path group"));
+				DUK_DDD(
+				    DUK_DDDPRINT("fast loop first group was clean, second was not, process one slow path group"));
 				DUK_ASSERT(t2 < 0);
 				p += 4;
 				q += 3;
 				break;
 			} else {
-				DUK_DDD(DUK_DDDPRINT("fast loop first group was not clean, second does not matter, process one slow path group"));
+				DUK_DDD(DUK_DDDPRINT(
+				    "fast loop first group was not clean, second does not matter, process one slow path group"));
 				DUK_ASSERT(t1 < 0);
 				break;
 			}
-		}  /* fast path */
+		} /* fast path */
 
 		/* Slow path step 1: try to scan a 4-character encoded group,
 		 * end-of-input, or start-of-padding.  We exit with:
@@ -15010,7 +16100,9 @@ DUK_LOCAL duk_bool_t duk__base64_decode_helper(const duk_uint8_t *src, duk_size_
 		t = 1UL;
 		for (;;) {
 			DUK_DDD(DUK_DDDPRINT("slow loop: p=%p, p_end=%p, t=%lu",
-			                     (const void *) p, (const void *) p_end, (unsigned long) t));
+			                     (const void *) p,
+			                     (const void *) p_end,
+			                     (unsigned long) t));
 
 			if (DUK_LIKELY(p < p_end)) {
 				x = duk__base64_dectab_fast[*p++];
@@ -15021,18 +16113,18 @@ DUK_LOCAL duk_bool_t duk__base64_decode_helper(const duk_uint8_t *src, duk_size_
 						break;
 					}
 				} else if (x == -1) {
-					continue;  /* allowed ascii whitespace */
+					continue; /* allowed ascii whitespace */
 				} else if (x == -2) {
 					p--;
-					break;  /* start of padding */
+					break; /* start of padding */
 				} else {
 					DUK_ASSERT(x == -3);
 					goto decode_error;
 				}
 			} else {
-				break;  /* end of input */
+				break; /* end of input */
 			}
-		}  /* slow path step 1 */
+		} /* slow path step 1 */
 
 		/* Complete the padding by simulating pad characters,
 		 * regardless of actual input padding chars.
@@ -15091,28 +16183,30 @@ DUK_LOCAL duk_bool_t duk__base64_decode_helper(const duk_uint8_t *src, duk_size_
 			}
 			x = duk__base64_dectab_fast[*p++];
 			if (x == -1 || x == -2) {
-				;  /* padding or whitespace, keep eating */
+				; /* padding or whitespace, keep eating */
 			} else {
 				p--;
-				break;  /* backtrack and go back to fast path, even for -1 */
+				break; /* backtrack and go back to fast path, even for -1 */
 			}
-		}  /* slow path step 3 */
-	}  /* outer fast+slow path loop */
+		} /* slow path step 3 */
+	} /* outer fast+slow path loop */
 
- done:
-	DUK_DDD(DUK_DDDPRINT("done; p=%p, p_end=%p",
-	                     (const void *) p, (const void *) p_end));
+done:
+	DUK_DDD(DUK_DDDPRINT("done; p=%p, p_end=%p", (const void *) p, (const void *) p_end));
 
 	DUK_ASSERT(p == p_end);
 
 	*out_dst_final = q;
 	return 1;
 
- decode_error:
+decode_error:
 	return 0;
 }
-#else  /* DUK_USE_BASE64_FASTPATH */
-DUK_LOCAL duk_bool_t duk__base64_decode_helper(const duk_uint8_t *src, duk_size_t srclen, duk_uint8_t *dst, duk_uint8_t **out_dst_final) {
+#else /* DUK_USE_BASE64_FASTPATH */
+DUK_LOCAL duk_bool_t duk__base64_decode_helper(const duk_uint8_t *src,
+                                               duk_size_t srclen,
+                                               duk_uint8_t *dst,
+                                               duk_uint8_t **out_dst_final) {
 	duk_uint_t t, x;
 	duk_int_t y;
 	duk_int8_t step;
@@ -15198,7 +16292,7 @@ DUK_LOCAL duk_bool_t duk__base64_decode_helper(const duk_uint8_t *src, duk_size_
 		} else {
 			/* Valid: whitespace. */
 			duk_uint32_t m;
-			DUK_ASSERT(x < 0x20U);  /* 0x00 to 0x1f */
+			DUK_ASSERT(x < 0x20U); /* 0x00 to 0x1f */
 			m = (1U << x);
 			if (mask_white & m) {
 				/* Allow basic ASCII whitespace. */
@@ -15215,7 +16309,7 @@ DUK_LOCAL duk_bool_t duk__base64_decode_helper(const duk_uint8_t *src, duk_size_
 		}
 		/* fall through; no padding will be added */
 
-	 simulate_padding:
+	simulate_padding:
 		n_equal = 0;
 		while (t < 0x1000000UL) {
 			t = (t << 6) + 0U;
@@ -15247,10 +16341,10 @@ DUK_LOCAL duk_bool_t duk__base64_decode_helper(const duk_uint8_t *src, duk_size_
 	*out_dst_final = q;
 	return 1;
 
- decode_error:
+decode_error:
 	return 0;
 }
-#endif  /* DUK_USE_BASE64_FASTPATH */
+#endif /* DUK_USE_BASE64_FASTPATH */
 
 DUK_EXTERNAL const char *duk_base64_encode(duk_hthread *thr, duk_idx_t idx) {
 	const duk_uint8_t *src;
@@ -15263,7 +16357,7 @@ DUK_EXTERNAL const char *duk_base64_encode(duk_hthread *thr, duk_idx_t idx) {
 
 	idx = duk_require_normalize_index(thr, idx);
 	src = duk__prep_codec_arg(thr, idx, &srclen);
-	/* Note: for srclen=0, src may be NULL */
+	DUK_ASSERT(src != NULL);
 
 	/* Compute exact output length.  Computation must not wrap; this
 	 * limit works for 32-bit size_t:
@@ -15279,11 +16373,11 @@ DUK_EXTERNAL const char *duk_base64_encode(duk_hthread *thr, duk_idx_t idx) {
 
 	duk__base64_encode_helper((const duk_uint8_t *) src, srclen, dst);
 
-	ret = duk_buffer_to_string(thr, -1);  /* Safe, result is ASCII. */
+	ret = duk_buffer_to_string(thr, -1); /* Safe, result is ASCII. */
 	duk_replace(thr, idx);
 	return ret;
 
- type_error:
+type_error:
 	DUK_ERROR_TYPE(thr, DUK_STR_BASE64_ENCODE_FAILED);
 	DUK_WO_NORETURN(return NULL;);
 }
@@ -15299,6 +16393,7 @@ DUK_EXTERNAL void duk_base64_decode(duk_hthread *thr, duk_idx_t idx) {
 
 	idx = duk_require_normalize_index(thr, idx);
 	src = duk__prep_codec_arg(thr, idx, &srclen);
+	DUK_ASSERT(src != NULL);
 
 	/* Round up and add safety margin.  Avoid addition before division to
 	 * avoid possibility of wrapping.  Margin includes +3 for rounding up,
@@ -15307,7 +16402,7 @@ DUK_EXTERNAL void duk_base64_decode(duk_hthread *thr, duk_idx_t idx) {
 	 * Similarly, 'xx' may ecause 1+3 = bytes to be emitted and then
 	 * backtracked.
 	 */
-	dstlen = (srclen / 4) * 3 + 6;  /* upper limit, assuming no whitespace etc */
+	dstlen = (srclen / 4) * 3 + 6; /* upper limit, assuming no whitespace etc */
 	dst = (duk_uint8_t *) duk_push_dynamic_buffer(thr, dstlen);
 	/* Note: for dstlen=0, dst may be NULL */
 
@@ -15320,15 +16415,15 @@ DUK_EXTERNAL void duk_base64_decode(duk_hthread *thr, duk_idx_t idx) {
 	duk_replace(thr, idx);
 	return;
 
- type_error:
+type_error:
 	DUK_ERROR_TYPE(thr, DUK_STR_BASE64_DECODE_FAILED);
 	DUK_WO_NORETURN(return;);
 }
-#else  /* DUK_USE_BASE64_SUPPORT */
+#else /* DUK_USE_BASE64_SUPPORT */
 DUK_EXTERNAL const char *duk_base64_encode(duk_hthread *thr, duk_idx_t idx) {
 	DUK_UNREF(idx);
 	DUK_ERROR_UNSUPPORTED(thr);
-	DUK_WO_NORETURN(return;);
+	DUK_WO_NORETURN(return NULL;);
 }
 
 DUK_EXTERNAL void duk_base64_decode(duk_hthread *thr, duk_idx_t idx) {
@@ -15336,7 +16431,7 @@ DUK_EXTERNAL void duk_base64_decode(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ERROR_UNSUPPORTED(thr);
 	DUK_WO_NORETURN(return;);
 }
-#endif  /* DUK_USE_BASE64_SUPPORT */
+#endif /* DUK_USE_BASE64_SUPPORT */
 
 /*
  *  Hex
@@ -15358,14 +16453,14 @@ DUK_EXTERNAL const char *duk_hex_encode(duk_hthread *thr, duk_idx_t idx) {
 
 	idx = duk_require_normalize_index(thr, idx);
 	inp = duk__prep_codec_arg(thr, idx, &len);
-	DUK_ASSERT(inp != NULL || len == 0);
+	DUK_ASSERT(inp != NULL);
 
 	/* Fixed buffer, no zeroing because we'll fill all the data. */
 	buf = (duk_uint8_t *) duk_push_fixed_buffer_nozero(thr, len * 2);
 	DUK_ASSERT(buf != NULL);
 
 #if defined(DUK_USE_HEX_FASTPATH)
-	DUK_ASSERT((((duk_size_t) buf) & 0x01U) == 0);   /* pointer is aligned, guaranteed for fixed buffer */
+	DUK_ASSERT((((duk_size_t) buf) & 0x01U) == 0); /* pointer is aligned, guaranteed for fixed buffer */
 	p16 = (duk_uint16_t *) (void *) buf;
 	len_safe = len & ~0x03U;
 	for (i = 0; i < len_safe; i += 4) {
@@ -15378,14 +16473,14 @@ DUK_EXTERNAL const char *duk_hex_encode(duk_hthread *thr, duk_idx_t idx) {
 	for (; i < len; i++) {
 		*p16++ = duk_hex_enctab[inp[i]];
 	}
-#else  /* DUK_USE_HEX_FASTPATH */
+#else /* DUK_USE_HEX_FASTPATH */
 	for (i = 0; i < len; i++) {
 		duk_small_uint_t t;
 		t = (duk_small_uint_t) inp[i];
-		buf[i*2 + 0] = duk_lc_digits[t >> 4];
-		buf[i*2 + 1] = duk_lc_digits[t & 0x0f];
+		buf[i * 2 + 0] = duk_lc_digits[t >> 4];
+		buf[i * 2 + 1] = duk_lc_digits[t & 0x0f];
 	}
-#endif  /* DUK_USE_HEX_FASTPATH */
+#endif /* DUK_USE_HEX_FASTPATH */
 
 	/* XXX: Using a string return value forces a string intern which is
 	 * not always necessary.  As a rough performance measure, hex encode
@@ -15394,7 +16489,7 @@ DUK_EXTERNAL const char *duk_hex_encode(duk_hthread *thr, duk_idx_t idx) {
 	 * caller coerce to string if necessary?
 	 */
 
-	ret = duk_buffer_to_string(thr, -1);  /* Safe, result is ASCII. */
+	ret = duk_buffer_to_string(thr, -1); /* Safe, result is ASCII. */
 	duk_replace(thr, idx);
 	return ret;
 }
@@ -15415,7 +16510,7 @@ DUK_EXTERNAL void duk_hex_decode(duk_hthread *thr, duk_idx_t idx) {
 
 	idx = duk_require_normalize_index(thr, idx);
 	inp = duk__prep_codec_arg(thr, idx, &len);
-	DUK_ASSERT(inp != NULL || len == 0);
+	DUK_ASSERT(inp != NULL);
 
 	if (len & 0x01) {
 		goto type_error;
@@ -15429,20 +16524,16 @@ DUK_EXTERNAL void duk_hex_decode(duk_hthread *thr, duk_idx_t idx) {
 	p = buf;
 	len_safe = len & ~0x07U;
 	for (i = 0; i < len_safe; i += 8) {
-		t = ((duk_int_t) duk_hex_dectab_shift4[inp[i]]) |
-		    ((duk_int_t) duk_hex_dectab[inp[i + 1]]);
+		t = ((duk_int_t) duk_hex_dectab_shift4[inp[i]]) | ((duk_int_t) duk_hex_dectab[inp[i + 1]]);
 		chk = t;
 		p[0] = (duk_uint8_t) t;
-		t = ((duk_int_t) duk_hex_dectab_shift4[inp[i + 2]]) |
-		    ((duk_int_t) duk_hex_dectab[inp[i + 3]]);
+		t = ((duk_int_t) duk_hex_dectab_shift4[inp[i + 2]]) | ((duk_int_t) duk_hex_dectab[inp[i + 3]]);
 		chk |= t;
 		p[1] = (duk_uint8_t) t;
-		t = ((duk_int_t) duk_hex_dectab_shift4[inp[i + 4]]) |
-		    ((duk_int_t) duk_hex_dectab[inp[i + 5]]);
+		t = ((duk_int_t) duk_hex_dectab_shift4[inp[i + 4]]) | ((duk_int_t) duk_hex_dectab[inp[i + 5]]);
 		chk |= t;
 		p[2] = (duk_uint8_t) t;
-		t = ((duk_int_t) duk_hex_dectab_shift4[inp[i + 6]]) |
-		    ((duk_int_t) duk_hex_dectab[inp[i + 7]]);
+		t = ((duk_int_t) duk_hex_dectab_shift4[inp[i + 6]]) | ((duk_int_t) duk_hex_dectab[inp[i + 7]]);
 		chk |= t;
 		p[3] = (duk_uint8_t) t;
 		p += 4;
@@ -15464,7 +16555,7 @@ DUK_EXTERNAL void duk_hex_decode(duk_hthread *thr, duk_idx_t idx) {
 		}
 		*p++ = (duk_uint8_t) t;
 	}
-#else  /* DUK_USE_HEX_FASTPATH */
+#else /* DUK_USE_HEX_FASTPATH */
 	for (i = 0; i < len; i += 2) {
 		/* For invalid characters the value -1 gets extended to
 		 * at least 16 bits.  If either nybble is invalid, the
@@ -15477,27 +16568,27 @@ DUK_EXTERNAL void duk_hex_decode(duk_hthread *thr, duk_idx_t idx) {
 		}
 		buf[i >> 1] = (duk_uint8_t) t;
 	}
-#endif  /* DUK_USE_HEX_FASTPATH */
+#endif /* DUK_USE_HEX_FASTPATH */
 
 	duk_replace(thr, idx);
 	return;
 
- type_error:
+type_error:
 	DUK_ERROR_TYPE(thr, DUK_STR_HEX_DECODE_FAILED);
 	DUK_WO_NORETURN(return;);
 }
-#else  /* DUK_USE_HEX_SUPPORT */
+#else /* DUK_USE_HEX_SUPPORT */
 DUK_EXTERNAL const char *duk_hex_encode(duk_hthread *thr, duk_idx_t idx) {
 	DUK_UNREF(idx);
 	DUK_ERROR_UNSUPPORTED(thr);
-	DUK_WO_NORETURN(return;);
+	DUK_WO_NORETURN(return NULL;);
 }
 DUK_EXTERNAL void duk_hex_decode(duk_hthread *thr, duk_idx_t idx) {
 	DUK_UNREF(idx);
 	DUK_ERROR_UNSUPPORTED(thr);
 	DUK_WO_NORETURN(return;);
 }
-#endif  /* DUK_USE_HEX_SUPPORT */
+#endif /* DUK_USE_HEX_SUPPORT */
 
 /*
  *  JSON
@@ -15541,15 +16632,12 @@ DUK_EXTERNAL void duk_json_decode(duk_hthread *thr, duk_idx_t idx) {
 #endif
 
 	idx = duk_require_normalize_index(thr, idx);
-	duk_bi_json_parse_helper(thr,
-	                         idx /*idx_value*/,
-	                         DUK_INVALID_INDEX /*idx_reviver*/,
-	                         0 /*flags*/);
+	duk_bi_json_parse_helper(thr, idx /*idx_value*/, DUK_INVALID_INDEX /*idx_reviver*/, 0 /*flags*/);
 	duk_replace(thr, idx);
 
 	DUK_ASSERT(duk_get_top(thr) == top_at_entry);
 }
-#else  /* DUK_USE_JSON_SUPPORT */
+#else /* DUK_USE_JSON_SUPPORT */
 DUK_EXTERNAL const char *duk_json_encode(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ASSERT_API_ENTRY(thr);
 	DUK_UNREF(idx);
@@ -15563,7 +16651,7 @@ DUK_EXTERNAL void duk_json_decode(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ERROR_UNSUPPORTED(thr);
 	DUK_WO_NORETURN(return;);
 }
-#endif  /* DUK_USE_JSON_SUPPORT */
+#endif /* DUK_USE_JSON_SUPPORT */
 /*
  *  Compilation and evaluation
  */
@@ -15572,7 +16660,7 @@ DUK_EXTERNAL void duk_json_decode(duk_hthread *thr, duk_idx_t idx) {
 
 typedef struct duk__compile_raw_args duk__compile_raw_args;
 struct duk__compile_raw_args {
-	duk_size_t src_length;  /* should be first on 64-bit platforms */
+	duk_size_t src_length; /* should be first on 64-bit platforms */
 	const duk_uint8_t *src_buffer;
 	duk_uint_t flags;
 };
@@ -15592,7 +16680,10 @@ DUK_EXTERNAL duk_int_t duk_eval_raw(duk_hthread *thr, const char *src_buffer, du
 
 	/* [ ... source? filename? ] (depends on flags) */
 
-	rc = duk_compile_raw(thr, src_buffer, src_length, flags | DUK_COMPILE_EVAL);  /* may be safe, or non-safe depending on flags */
+	rc = duk_compile_raw(thr,
+	                     src_buffer,
+	                     src_length,
+	                     flags | DUK_COMPILE_EVAL); /* may be safe, or non-safe depending on flags */
 
 	/* [ ... closure/error ] */
 
@@ -15601,7 +16692,7 @@ DUK_EXTERNAL duk_int_t duk_eval_raw(duk_hthread *thr, const char *src_buffer, du
 		goto got_rc;
 	}
 
-	duk_push_global_object(thr);  /* explicit 'this' binding, see GH-164 */
+	duk_push_global_object(thr); /* explicit 'this' binding, see GH-164 */
 
 	if (flags & DUK_COMPILE_SAFE) {
 		rc = duk_pcall_method(thr, 0);
@@ -15612,7 +16703,7 @@ DUK_EXTERNAL duk_int_t duk_eval_raw(duk_hthread *thr, const char *src_buffer, du
 
 	/* [ ... result/error ] */
 
- got_rc:
+got_rc:
 	if (flags & DUK_COMPILE_NORESULT) {
 		duk_pop(thr);
 	}
@@ -15626,7 +16717,7 @@ DUK_LOCAL duk_ret_t duk__do_compile(duk_hthread *thr, void *udata) {
 	duk_uint_t flags;
 	duk_hcompfunc *h_templ;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	DUK_ASSERT(udata != NULL);
 
 	/* Note: strictness is not inherited from the current Duktape/C
@@ -15652,8 +16743,8 @@ DUK_LOCAL duk_ret_t duk__do_compile(duk_hthread *thr, void *udata) {
 		duk_hstring *h_sourcecode;
 
 		h_sourcecode = duk_get_hstring(thr, -2);
-		if ((flags & DUK_COMPILE_NOSOURCE) ||  /* args incorrect */
-		    (h_sourcecode == NULL)) {          /* e.g. duk_push_string_file_raw() pushed undefined */
+		if ((flags & DUK_COMPILE_NOSOURCE) || /* args incorrect */
+		    (h_sourcecode == NULL)) { /* e.g. duk_push_string_file_raw() pushed undefined */
 			DUK_ERROR_TYPE(thr, DUK_STR_NO_SOURCECODE);
 			DUK_WO_NORETURN(return 0;);
 		}
@@ -15683,11 +16774,11 @@ DUK_LOCAL duk_ret_t duk__do_compile(duk_hthread *thr, void *udata) {
 
 	h_templ = (duk_hcompfunc *) duk_known_hobject(thr, -1);
 	duk_js_push_closure(thr,
-	                   h_templ,
-	                   thr->builtins[DUK_BIDX_GLOBAL_ENV],
-	                   thr->builtins[DUK_BIDX_GLOBAL_ENV],
-	                   1 /*add_auto_proto*/);
-	duk_remove_m2(thr);   /* -> [ ... closure ] */
+	                    h_templ,
+	                    thr->builtins[DUK_BIDX_GLOBAL_ENV],
+	                    thr->builtins[DUK_BIDX_GLOBAL_ENV],
+	                    1 /*add_auto_proto*/);
+	duk_remove_m2(thr); /* -> [ ... closure ] */
 
 	/* [ ... closure ] */
 
@@ -15723,8 +16814,7 @@ DUK_EXTERNAL duk_int_t duk_compile_raw(duk_hthread *thr, const char *src_buffer,
 		 * directly into flags.
 		 */
 		nargs = flags & 0x07;
-		DUK_ASSERT(nargs == ((flags & DUK_COMPILE_NOSOURCE) ? 0 : 1) +
-		                    ((flags & DUK_COMPILE_NOFILENAME) ? 0 : 1));
+		DUK_ASSERT(nargs == ((flags & DUK_COMPILE_NOSOURCE) ? 0 : 1) + ((flags & DUK_COMPILE_NOFILENAME) ? 0 : 1));
 		rc = duk_safe_call(thr, duk__do_compile, (void *) comp_args, nargs, nrets);
 
 		/* [ ... closure ] */
@@ -15754,7 +16844,7 @@ DUK_EXTERNAL void duk_push_context_dump(duk_hthread *thr) {
 	 */
 
 	top = duk_get_top(thr);
-	duk_push_array(thr);
+	duk_push_bare_array(thr);
 	for (idx = 0; idx < top; idx++) {
 		duk_dup(thr, idx);
 		duk_put_prop_index(thr, -2, (duk_uarridx_t) idx);
@@ -15764,25 +16854,24 @@ DUK_EXTERNAL void duk_push_context_dump(duk_hthread *thr) {
 	 * Perhaps values need to be coerced individually?
 	 */
 	duk_bi_json_stringify_helper(thr,
-	                             duk_get_top_index(thr),  /*idx_value*/
-	                             DUK_INVALID_INDEX,  /*idx_replacer*/
-	                             DUK_INVALID_INDEX,  /*idx_space*/
-	                             DUK_JSON_FLAG_EXT_CUSTOM |
-	                             DUK_JSON_FLAG_ASCII_ONLY |
-	                             DUK_JSON_FLAG_AVOID_KEY_QUOTES /*flags*/);
+	                             duk_get_top_index(thr), /*idx_value*/
+	                             DUK_INVALID_INDEX, /*idx_replacer*/
+	                             DUK_INVALID_INDEX, /*idx_space*/
+	                             DUK_JSON_FLAG_EXT_CUSTOM | DUK_JSON_FLAG_ASCII_ONLY |
+	                                 DUK_JSON_FLAG_AVOID_KEY_QUOTES /*flags*/);
 
 	duk_push_sprintf(thr, "ctx: top=%ld, stack=%s", (long) top, (const char *) duk_safe_to_string(thr, -1));
-	duk_replace(thr, -3);  /* [ ... arr jsonx(arr) res ] -> [ ... res jsonx(arr) ] */
+	duk_replace(thr, -3); /* [ ... arr jsonx(arr) res ] -> [ ... res jsonx(arr) ] */
 	duk_pop(thr);
 	DUK_ASSERT(duk_is_string(thr, -1));
 }
-#else  /* DUK_USE_JSON_SUPPORT */
+#else /* DUK_USE_JSON_SUPPORT */
 DUK_EXTERNAL void duk_push_context_dump(duk_hthread *thr) {
 	DUK_ASSERT_API_ENTRY(thr);
 	DUK_ERROR_UNSUPPORTED(thr);
 	DUK_WO_NORETURN(return;);
 }
-#endif  /* DUK_USE_JSON_SUPPORT */
+#endif /* DUK_USE_JSON_SUPPORT */
 
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
 
@@ -15831,12 +16920,13 @@ DUK_EXTERNAL void duk_debugger_attach(duk_hthread *thr,
 	heap->dbg_exec_counter = 0;
 	heap->dbg_last_counter = 0;
 	heap->dbg_last_time = 0.0;
-	duk_debug_set_paused(heap);  /* XXX: overlap with fields above */
+	duk_debug_set_paused(heap); /* XXX: overlap with fields above */
 
 	/* Send version identification and flush right afterwards.  Note that
 	 * we must write raw, unframed bytes here.
 	 */
-	duk_push_sprintf(thr, "%ld %ld %s %s\n",
+	duk_push_sprintf(thr,
+	                 "%ld %ld %s %s\n",
 	                 (long) DUK_DEBUG_PROTOCOL_VERSION,
 	                 (long) DUK_VERSION,
 	                 (const char *) DUK_GIT_DESCRIBE,
@@ -15938,7 +17028,7 @@ DUK_EXTERNAL void duk_debugger_pause(duk_hthread *thr) {
 	}
 }
 
-#else  /* DUK_USE_DEBUGGER_SUPPORT */
+#else /* DUK_USE_DEBUGGER_SUPPORT */
 
 DUK_EXTERNAL void duk_debugger_attach(duk_hthread *thr,
                                       duk_debug_read_function read_cb,
@@ -15996,7 +17086,7 @@ DUK_EXTERNAL void duk_debugger_pause(duk_hthread *thr) {
 	DUK_UNREF(thr);
 }
 
-#endif  /* DUK_USE_DEBUGGER_SUPPORT */
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
 /*
  *  Heap creation and destruction
  */
@@ -16009,6 +17099,7 @@ struct duk_internal_thread_state {
 	duk_ljstate lj;
 	duk_bool_t creating_error;
 	duk_hthread *curr_thread;
+	duk_uint8_t thread_state;
 	duk_int_t call_recursion_depth;
 };
 
@@ -16083,7 +17174,7 @@ DUK_EXTERNAL void duk_suspend(duk_hthread *thr, duk_thread_state *state) {
 
 	DUK_ASSERT_API_ENTRY(thr);
 	DUK_ASSERT(thr->heap != NULL);
-	DUK_ASSERT(state != NULL);  /* unvalidated */
+	DUK_ASSERT(state != NULL); /* unvalidated */
 
 	/* Currently not supported when called from within a finalizer.
 	 * If that is done, the finalizer will remain running indefinitely,
@@ -16107,6 +17198,7 @@ DUK_EXTERNAL void duk_suspend(duk_hthread *thr, duk_thread_state *state) {
 	duk_memcpy((void *) &snapshot->lj, (const void *) lj, sizeof(duk_ljstate));
 	snapshot->creating_error = heap->creating_error;
 	snapshot->curr_thread = heap->curr_thread;
+	snapshot->thread_state = thr->state;
 	snapshot->call_recursion_depth = heap->call_recursion_depth;
 
 	lj->jmpbuf_ptr = NULL;
@@ -16116,6 +17208,8 @@ DUK_EXTERNAL void duk_suspend(duk_hthread *thr, duk_thread_state *state) {
 	heap->creating_error = 0;
 	heap->curr_thread = NULL;
 	heap->call_recursion_depth = 0;
+
+	thr->state = DUK_HTHREAD_STATE_INACTIVE;
 }
 
 DUK_EXTERNAL void duk_resume(duk_hthread *thr, const duk_thread_state *state) {
@@ -16124,7 +17218,7 @@ DUK_EXTERNAL void duk_resume(duk_hthread *thr, const duk_thread_state *state) {
 
 	DUK_ASSERT_API_ENTRY(thr);
 	DUK_ASSERT(thr->heap != NULL);
-	DUK_ASSERT(state != NULL);  /* unvalidated */
+	DUK_ASSERT(state != NULL); /* unvalidated */
 
 	/* Shouldn't be necessary if duk_suspend() is called before
 	 * duk_resume(), but assert in case API sequence is incorrect.
@@ -16132,6 +17226,8 @@ DUK_EXTERNAL void duk_resume(duk_hthread *thr, const duk_thread_state *state) {
 	DUK_ASSERT(thr->heap->pf_prevent_count == 0);
 	DUK_ASSERT(thr->heap->creating_error == 0);
 
+	thr->state = snapshot->thread_state;
+
 	heap = thr->heap;
 
 	duk_memcpy((void *) &heap->lj, (const void *) &snapshot->lj, sizeof(duk_ljstate));
@@ -16164,7 +17260,7 @@ DUK_EXTERNAL void duk_set_global_object(duk_hthread *thr) {
 	DUK_UNREF(h_prev_glob);
 	thr->builtins[DUK_BIDX_GLOBAL] = h_glob;
 	DUK_HOBJECT_INCREF(thr, h_glob);
-	DUK_HOBJECT_DECREF_ALLOWNULL(thr, h_prev_glob);  /* side effects, in theory (referenced by global env) */
+	DUK_HOBJECT_DECREF_ALLOWNULL(thr, h_prev_glob); /* side effects, in theory (referenced by global env) */
 
 	/*
 	 *  Replace lexical environment for global scope
@@ -16175,9 +17271,7 @@ DUK_EXTERNAL void duk_set_global_object(duk_hthread *thr) {
 	 *  same (initial) built-ins.
 	 */
 
-	h_env = duk_hobjenv_alloc(thr,
-	                          DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                          DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJENV));
+	h_env = duk_hobjenv_alloc(thr, DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJENV));
 	DUK_ASSERT(h_env != NULL);
 	DUK_ASSERT(DUK_HOBJECT_GET_PROTOTYPE(thr->heap, (duk_hobject *) h_env) == NULL);
 
@@ -16192,8 +17286,8 @@ DUK_EXTERNAL void duk_set_global_object(duk_hthread *thr) {
 	h_prev_env = thr->builtins[DUK_BIDX_GLOBAL_ENV];
 	thr->builtins[DUK_BIDX_GLOBAL_ENV] = (duk_hobject *) h_env;
 	DUK_HOBJECT_INCREF(thr, (duk_hobject *) h_env);
-	DUK_HOBJECT_DECREF_ALLOWNULL(thr, h_prev_env);  /* side effects */
-	DUK_UNREF(h_env);  /* without refcounts */
+	DUK_HOBJECT_DECREF_ALLOWNULL(thr, h_prev_env); /* side effects */
+	DUK_UNREF(h_env); /* without refcounts */
 	DUK_UNREF(h_prev_env);
 
 	/* [ ... new_glob ] */
@@ -16243,20 +17337,20 @@ DUK_LOCAL void duk__inspect_multiple_uint(duk_hthread *thr, const char *fmt, duk
  * be security implications.
  */
 
-#define DUK__IDX_TYPE     0
-#define DUK__IDX_ITAG     1
-#define DUK__IDX_REFC     2
-#define DUK__IDX_HBYTES   3
-#define DUK__IDX_CLASS    4
-#define DUK__IDX_PBYTES   5
-#define DUK__IDX_ESIZE    6
-#define DUK__IDX_ENEXT    7
-#define DUK__IDX_ASIZE    8
-#define DUK__IDX_HSIZE    9
-#define DUK__IDX_BCBYTES  10
-#define DUK__IDX_DBYTES   11
-#define DUK__IDX_TSTATE   12
-#define DUK__IDX_VARIANT  13
+#define DUK__IDX_TYPE    0
+#define DUK__IDX_ITAG    1
+#define DUK__IDX_REFC    2
+#define DUK__IDX_HBYTES  3
+#define DUK__IDX_CLASS   4
+#define DUK__IDX_PBYTES  5
+#define DUK__IDX_ESIZE   6
+#define DUK__IDX_ENEXT   7
+#define DUK__IDX_ASIZE   8
+#define DUK__IDX_HSIZE   9
+#define DUK__IDX_BCBYTES 10
+#define DUK__IDX_DBYTES  11
+#define DUK__IDX_TSTATE  12
+#define DUK__IDX_VARIANT 13
 
 DUK_EXTERNAL void duk_inspect_value(duk_hthread *thr, duk_idx_t idx) {
 	duk_tval *tv;
@@ -16271,7 +17365,7 @@ DUK_EXTERNAL void duk_inspect_value(duk_hthread *thr, duk_idx_t idx) {
 
 	/* Assume two's complement and set everything to -1. */
 	duk_memset((void *) &vals, (int) 0xff, sizeof(vals));
-	DUK_ASSERT(vals[DUK__IDX_TYPE] == -1);  /* spot check one */
+	DUK_ASSERT(vals[DUK__IDX_TYPE] == -1); /* spot check one */
 
 	tv = duk_get_tval_or_unused(thr, idx);
 	h = (DUK_TVAL_IS_HEAP_ALLOCATED(tv) ? DUK_TVAL_GET_HEAPHDR(tv) : NULL);
@@ -16279,7 +17373,7 @@ DUK_EXTERNAL void duk_inspect_value(duk_hthread *thr, duk_idx_t idx) {
 	vals[DUK__IDX_TYPE] = duk_get_type_tval(tv);
 	vals[DUK__IDX_ITAG] = (duk_int_t) DUK_TVAL_GET_TAG(tv);
 
-	duk_push_bare_object(thr);  /* Invalidates 'tv'. */
+	duk_push_bare_object(thr); /* Invalidates 'tv'. */
 	tv = NULL;
 
 	if (h == NULL) {
@@ -16361,30 +17455,56 @@ DUK_EXTERNAL void duk_inspect_value(duk_hthread *thr, duk_idx_t idx) {
 
 		if (DUK_HBUFFER_HAS_DYNAMIC(h_buf)) {
 			if (DUK_HBUFFER_HAS_EXTERNAL(h_buf)) {
-				vals[DUK__IDX_VARIANT] = 2;  /* buffer variant 2: external */
+				vals[DUK__IDX_VARIANT] = 2; /* buffer variant 2: external */
 				vals[DUK__IDX_HBYTES] = (duk_uint_t) (sizeof(duk_hbuffer_external));
 			} else {
 				/* When alloc_size == 0 the second allocation may not
 				 * actually exist.
 				 */
-				vals[DUK__IDX_VARIANT] = 1;  /* buffer variant 1: dynamic */
+				vals[DUK__IDX_VARIANT] = 1; /* buffer variant 1: dynamic */
 				vals[DUK__IDX_HBYTES] = (duk_uint_t) (sizeof(duk_hbuffer_dynamic));
 			}
 			vals[DUK__IDX_DBYTES] = (duk_int_t) (DUK_HBUFFER_GET_SIZE(h_buf));
 		} else {
-			DUK_ASSERT(vals[DUK__IDX_VARIANT] == 0);  /* buffer variant 0: fixed */
+			DUK_ASSERT(vals[DUK__IDX_VARIANT] == 0); /* buffer variant 0: fixed */
 			vals[DUK__IDX_HBYTES] = (duk_int_t) (sizeof(duk_hbuffer_fixed) + DUK_HBUFFER_GET_SIZE(h_buf));
 		}
 		break;
 	}
 	}
 
- finish:
+finish:
 	duk__inspect_multiple_uint(thr,
-	    "type" "\x00" "itag" "\x00" "refc" "\x00" "hbytes" "\x00" "class" "\x00"
-	    "pbytes" "\x00" "esize" "\x00" "enext" "\x00" "asize" "\x00" "hsize" "\x00"
-	    "bcbytes" "\x00" "dbytes" "\x00" "tstate" "\x00" "variant" "\x00" "\x00",
-	    (duk_int_t *) &vals);
+	                           "type"
+	                           "\x00"
+	                           "itag"
+	                           "\x00"
+	                           "refc"
+	                           "\x00"
+	                           "hbytes"
+	                           "\x00"
+	                           "class"
+	                           "\x00"
+	                           "pbytes"
+	                           "\x00"
+	                           "esize"
+	                           "\x00"
+	                           "enext"
+	                           "\x00"
+	                           "asize"
+	                           "\x00"
+	                           "hsize"
+	                           "\x00"
+	                           "bcbytes"
+	                           "\x00"
+	                           "dbytes"
+	                           "\x00"
+	                           "tstate"
+	                           "\x00"
+	                           "variant"
+	                           "\x00"
+	                           "\x00",
+	                           (duk_int_t *) &vals);
 }
 
 DUK_EXTERNAL void duk_inspect_callstack_entry(duk_hthread *thr, duk_int_t level) {
@@ -16523,7 +17643,7 @@ DUK_EXTERNAL void duk_gc(duk_hthread *thr, duk_uint_t flags) {
 	DUK_ASSERT(heap != NULL);
 
 	DUK_D(DUK_DPRINT("mark-and-sweep requested by application"));
-	DUK_ASSERT(DUK_GC_COMPACT == DUK_MS_FLAG_EMERGENCY);  /* Compact flag is 1:1 with emergency flag which forces compaction. */
+	DUK_ASSERT(DUK_GC_COMPACT == DUK_MS_FLAG_EMERGENCY); /* Compact flag is 1:1 with emergency flag which forces compaction. */
 	ms_flags = (duk_small_uint_t) flags;
 	duk_heap_mark_and_sweep(heap, ms_flags);
 }
@@ -16559,9 +17679,9 @@ DUK_EXTERNAL duk_bool_t duk_get_prop(duk_hthread *thr, duk_idx_t obj_idx) {
 	DUK_ASSERT(rc == 0 || rc == 1);
 	/* a value is left on stack regardless of rc */
 
-	duk_remove_m2(thr);  /* remove key */
+	duk_remove_m2(thr); /* remove key */
 	DUK_ASSERT(duk_is_undefined(thr, -1) || rc == 1);
-	return rc;  /* 1 if property found, 0 otherwise */
+	return rc; /* 1 if property found, 0 otherwise */
 }
 
 DUK_EXTERNAL duk_bool_t duk_get_prop_string(duk_hthread *thr, duk_idx_t obj_idx, const char *key) {
@@ -16606,7 +17726,7 @@ DUK_EXTERNAL duk_bool_t duk_get_prop_heapptr(duk_hthread *thr, duk_idx_t obj_idx
 	DUK_ASSERT_API_ENTRY(thr);
 
 	obj_idx = duk_require_normalize_index(thr, obj_idx);
-	(void) duk_push_heapptr(thr, ptr);  /* NULL -> 'undefined' */
+	(void) duk_push_heapptr(thr, ptr); /* NULL -> 'undefined' */
 	return duk_get_prop(thr, obj_idx);
 }
 
@@ -16620,11 +17740,13 @@ DUK_INTERNAL duk_bool_t duk_get_prop_stridx(duk_hthread *thr, duk_idx_t obj_idx,
 }
 
 DUK_INTERNAL duk_bool_t duk_get_prop_stridx_short_raw(duk_hthread *thr, duk_uint_t packed_args) {
-	return duk_get_prop_stridx(thr, (duk_idx_t) (duk_int16_t) (packed_args >> 16),
-	                                (duk_small_uint_t) (packed_args & 0xffffUL));
+	return duk_get_prop_stridx(thr, (duk_idx_t) (duk_int16_t) (packed_args >> 16), (duk_small_uint_t) (packed_args & 0xffffUL));
 }
 
-DUK_INTERNAL duk_bool_t duk_get_prop_stridx_boolean(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx, duk_bool_t *out_has_prop) {
+DUK_INTERNAL duk_bool_t duk_get_prop_stridx_boolean(duk_hthread *thr,
+                                                    duk_idx_t obj_idx,
+                                                    duk_small_uint_t stridx,
+                                                    duk_bool_t *out_has_prop) {
 	duk_bool_t rc;
 
 	DUK_ASSERT_API_ENTRY(thr);
@@ -16637,6 +17759,58 @@ DUK_INTERNAL duk_bool_t duk_get_prop_stridx_boolean(duk_hthread *thr, duk_idx_t
 	return duk_to_boolean_top_pop(thr);
 }
 
+/* This get variant is for internal use, it differs from standard
+ * duk_get_prop() in that:
+ *   - Object argument must be an object (primitive values not supported).
+ *   - Key argument must be a string (no coercion).
+ *   - Only own properties are checked (no inheritance).  Only "entry part"
+ *     properties are checked (not array index properties).
+ *   - Property must be a plain data property, not a getter.
+ *   - Proxy traps are not triggered.
+ */
+DUK_INTERNAL duk_bool_t duk_xget_owndataprop(duk_hthread *thr, duk_idx_t obj_idx) {
+	duk_hobject *h_obj;
+	duk_hstring *h_key;
+	duk_tval *tv_val;
+
+	DUK_ASSERT_API_ENTRY(thr);
+
+	/* Note: copying tv_obj and tv_key to locals to shield against a valstack
+	 * resize is not necessary for a property get right now.
+	 */
+
+	h_obj = duk_get_hobject(thr, obj_idx);
+	if (h_obj == NULL) {
+		return 0;
+	}
+	h_key = duk_require_hstring(thr, -1);
+
+	tv_val = duk_hobject_find_entry_tval_ptr(thr->heap, h_obj, h_key);
+	if (tv_val == NULL) {
+		return 0;
+	}
+
+	duk_push_tval(thr, tv_val);
+	duk_remove_m2(thr); /* remove key */
+
+	return 1;
+}
+
+DUK_INTERNAL duk_bool_t duk_xget_owndataprop_stridx(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx) {
+	DUK_ASSERT_API_ENTRY(thr);
+	DUK_ASSERT_STRIDX_VALID(stridx);
+
+	obj_idx = duk_require_normalize_index(thr, obj_idx);
+	(void) duk_push_hstring(thr, DUK_HTHREAD_GET_STRING(thr, stridx));
+	return duk_xget_owndataprop(thr, obj_idx);
+}
+
+DUK_INTERNAL duk_bool_t duk_xget_owndataprop_stridx_short_raw(duk_hthread *thr, duk_uint_t packed_args) {
+	return duk_xget_owndataprop_stridx(thr,
+	                                   (duk_idx_t) (duk_int16_t) (packed_args >> 16),
+	                                   (duk_small_uint_t) (packed_args & 0xffffUL));
+}
+
 DUK_LOCAL duk_bool_t duk__put_prop_shared(duk_hthread *thr, duk_idx_t obj_idx, duk_idx_t idx_key) {
 	duk_tval *tv_obj;
 	duk_tval *tv_key;
@@ -16652,8 +17826,7 @@ DUK_LOCAL duk_bool_t duk__put_prop_shared(duk_hthread *thr, duk_idx_t obj_idx, d
 	/* Key and value indices are either (-2, -1) or (-1, -2).  Given idx_key,
 	 * idx_val is always (idx_key ^ 0x01).
 	 */
-	DUK_ASSERT((idx_key == -2 && (idx_key ^ 1) == -1) ||
-	           (idx_key == -1 && (idx_key ^ 1) == -2));
+	DUK_ASSERT((idx_key == -2 && (idx_key ^ 1) == -1) || (idx_key == -1 && (idx_key ^ 1) == -2));
 	/* XXX: Direct access; faster validation. */
 	tv_obj = duk_require_tval(thr, obj_idx);
 	tv_key = duk_require_tval(thr, idx_key);
@@ -16663,8 +17836,8 @@ DUK_LOCAL duk_bool_t duk__put_prop_shared(duk_hthread *thr, duk_idx_t obj_idx, d
 	rc = duk_hobject_putprop(thr, tv_obj, tv_key, tv_val, throw_flag);
 	DUK_ASSERT(rc == 0 || rc == 1);
 
-	duk_pop_2(thr);  /* remove key and value */
-	return rc;  /* 1 if property found, 0 otherwise */
+	duk_pop_2(thr); /* remove key and value */
+	return rc; /* 1 if property found, 0 otherwise */
 }
 
 DUK_EXTERNAL duk_bool_t duk_put_prop(duk_hthread *thr, duk_idx_t obj_idx) {
@@ -16718,11 +17891,10 @@ DUK_EXTERNAL duk_bool_t duk_put_prop_heapptr(duk_hthread *thr, duk_idx_t obj_idx
 	DUK_ASSERT_API_ENTRY(thr);
 
 	obj_idx = duk_require_normalize_index(thr, obj_idx);
-	(void) duk_push_heapptr(thr, ptr);  /* NULL -> 'undefined' */
+	(void) duk_push_heapptr(thr, ptr); /* NULL -> 'undefined' */
 	return duk__put_prop_shared(thr, obj_idx, -1);
 }
 
-
 DUK_INTERNAL duk_bool_t duk_put_prop_stridx(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx) {
 	DUK_ASSERT_API_ENTRY(thr);
 	DUK_ASSERT_STRIDX_VALID(stridx);
@@ -16733,8 +17905,7 @@ DUK_INTERNAL duk_bool_t duk_put_prop_stridx(duk_hthread *thr, duk_idx_t obj_idx,
 }
 
 DUK_INTERNAL duk_bool_t duk_put_prop_stridx_short_raw(duk_hthread *thr, duk_uint_t packed_args) {
-	return duk_put_prop_stridx(thr, (duk_idx_t) (duk_int16_t) (packed_args >> 16),
-	                                (duk_small_uint_t) (packed_args & 0xffffUL));
+	return duk_put_prop_stridx(thr, (duk_idx_t) (duk_int16_t) (packed_args >> 16), (duk_small_uint_t) (packed_args & 0xffffUL));
 }
 
 DUK_EXTERNAL duk_bool_t duk_del_prop(duk_hthread *thr, duk_idx_t obj_idx) {
@@ -16756,7 +17927,7 @@ DUK_EXTERNAL duk_bool_t duk_del_prop(duk_hthread *thr, duk_idx_t obj_idx) {
 	rc = duk_hobject_delprop(thr, tv_obj, tv_key, throw_flag);
 	DUK_ASSERT(rc == 0 || rc == 1);
 
-	duk_pop(thr);  /* remove key */
+	duk_pop(thr); /* remove key */
 	return rc;
 }
 
@@ -16802,7 +17973,7 @@ DUK_EXTERNAL duk_bool_t duk_del_prop_heapptr(duk_hthread *thr, duk_idx_t obj_idx
 	DUK_ASSERT_API_ENTRY(thr);
 
 	obj_idx = duk_require_normalize_index(thr, obj_idx);
-	(void) duk_push_heapptr(thr, ptr);  /* NULL -> 'undefined' */
+	(void) duk_push_heapptr(thr, ptr); /* NULL -> 'undefined' */
 	return duk_del_prop(thr, obj_idx);
 }
 
@@ -16839,8 +18010,8 @@ DUK_EXTERNAL duk_bool_t duk_has_prop(duk_hthread *thr, duk_idx_t obj_idx) {
 	rc = duk_hobject_hasprop(thr, tv_obj, tv_key);
 	DUK_ASSERT(rc == 0 || rc == 1);
 
-	duk_pop(thr);  /* remove key */
-	return rc;  /* 1 if property found, 0 otherwise */
+	duk_pop(thr); /* remove key */
+	return rc; /* 1 if property found, 0 otherwise */
 }
 
 DUK_EXTERNAL duk_bool_t duk_has_prop_string(duk_hthread *thr, duk_idx_t obj_idx, const char *key) {
@@ -16885,7 +18056,7 @@ DUK_EXTERNAL duk_bool_t duk_has_prop_heapptr(duk_hthread *thr, duk_idx_t obj_idx
 	DUK_ASSERT_API_ENTRY(thr);
 
 	obj_idx = duk_require_normalize_index(thr, obj_idx);
-	(void) duk_push_heapptr(thr, ptr);  /* NULL -> 'undefined' */
+	(void) duk_push_heapptr(thr, ptr); /* NULL -> 'undefined' */
 	return duk_has_prop(thr, obj_idx);
 }
 
@@ -16924,7 +18095,7 @@ DUK_INTERNAL void duk_xdef_prop(duk_hthread *thr, duk_idx_t obj_idx, duk_small_u
 
 	duk_hobject_define_property_internal(thr, obj, key, desc_flags);
 
-	duk_pop(thr);  /* pop key */
+	duk_pop(thr); /* pop key */
 }
 
 DUK_INTERNAL void duk_xdef_prop_index(duk_hthread *thr, duk_idx_t obj_idx, duk_uarridx_t arr_idx, duk_small_uint_t desc_flags) {
@@ -16957,12 +18128,13 @@ DUK_INTERNAL void duk_xdef_prop_stridx(duk_hthread *thr, duk_idx_t obj_idx, duk_
 }
 
 DUK_INTERNAL void duk_xdef_prop_stridx_short_raw(duk_hthread *thr, duk_uint_t packed_args) {
-	duk_xdef_prop_stridx(thr, (duk_idx_t) (duk_int8_t) (packed_args >> 24),
-	                          (duk_small_uint_t) (packed_args >> 8) & 0xffffUL,
-	                          (duk_small_uint_t) (packed_args & 0xffL));
+	duk_xdef_prop_stridx(thr,
+	                     (duk_idx_t) (duk_int8_t) (packed_args >> 24),
+	                     (duk_small_uint_t) (packed_args >> 8) & 0xffffUL,
+	                     (duk_small_uint_t) (packed_args & 0xffL));
 }
 
-#if 0  /*unused*/
+#if 0 /*unused*/
 DUK_INTERNAL void duk_xdef_prop_stridx_builtin(duk_hthread *thr, duk_idx_t obj_idx, duk_small_uint_t stridx, duk_small_int_t builtin_idx, duk_small_uint_t desc_flags) {
 	duk_hobject *obj;
 	duk_hstring *key;
@@ -16994,15 +18166,15 @@ DUK_INTERNAL void duk_xdef_prop_stridx_thrower(duk_hthread *thr, duk_idx_t obj_i
 	duk_push_hstring_stridx(thr, stridx);
 	duk_push_hobject_bidx(thr, DUK_BIDX_TYPE_ERROR_THROWER);
 	duk_dup_top(thr);
-	duk_def_prop(thr, obj_idx, DUK_DEFPROP_HAVE_SETTER | DUK_DEFPROP_HAVE_GETTER | DUK_DEFPROP_FORCE);  /* attributes always 0 */
+	duk_def_prop(thr, obj_idx, DUK_DEFPROP_HAVE_SETTER | DUK_DEFPROP_HAVE_GETTER | DUK_DEFPROP_FORCE); /* attributes always 0 */
 }
 
 /* Object.getOwnPropertyDescriptor() equivalent C binding. */
 DUK_EXTERNAL void duk_get_prop_desc(duk_hthread *thr, duk_idx_t obj_idx, duk_uint_t flags) {
 	DUK_ASSERT_API_ENTRY(thr);
-	DUK_UNREF(flags);  /* no flags defined yet */
+	DUK_UNREF(flags); /* no flags defined yet */
 
-	duk_hobject_object_get_own_property_descriptor(thr, obj_idx);  /* [ ... key ] -> [ ... desc ] */
+	duk_hobject_object_get_own_property_descriptor(thr, obj_idx); /* [ ... key ] -> [ ... desc ] */
 }
 
 /* Object.defineProperty() equivalent C binding. */
@@ -17032,9 +18204,7 @@ DUK_EXTERNAL void duk_def_prop(duk_hthread *thr, duk_idx_t obj_idx, duk_uint_t f
 
 	idx_base = duk_get_top_index(thr);
 	if (flags & DUK_DEFPROP_HAVE_SETTER) {
-		duk_require_type_mask(thr, idx_base, DUK_TYPE_MASK_UNDEFINED |
-		                                     DUK_TYPE_MASK_OBJECT |
-		                                     DUK_TYPE_MASK_LIGHTFUNC);
+		duk_require_type_mask(thr, idx_base, DUK_TYPE_MASK_UNDEFINED | DUK_TYPE_MASK_OBJECT | DUK_TYPE_MASK_LIGHTFUNC);
 		set = duk_get_hobject_promote_lfunc(thr, idx_base);
 		if (set != NULL && !DUK_HOBJECT_IS_CALLABLE(set)) {
 			goto fail_not_callable;
@@ -17044,9 +18214,7 @@ DUK_EXTERNAL void duk_def_prop(duk_hthread *thr, duk_idx_t obj_idx, duk_uint_t f
 		set = NULL;
 	}
 	if (flags & DUK_DEFPROP_HAVE_GETTER) {
-		duk_require_type_mask(thr, idx_base, DUK_TYPE_MASK_UNDEFINED |
-		                                     DUK_TYPE_MASK_OBJECT |
-		                                     DUK_TYPE_MASK_LIGHTFUNC);
+		duk_require_type_mask(thr, idx_base, DUK_TYPE_MASK_UNDEFINED | DUK_TYPE_MASK_OBJECT | DUK_TYPE_MASK_LIGHTFUNC);
 		get = duk_get_hobject_promote_lfunc(thr, idx_base);
 		if (get != NULL && !DUK_HOBJECT_IS_CALLABLE(get)) {
 			goto fail_not_callable;
@@ -17066,14 +18234,7 @@ DUK_EXTERNAL void duk_def_prop(duk_hthread *thr, duk_idx_t obj_idx, duk_uint_t f
 
 	duk_require_valid_index(thr, idx_base);
 
-	duk_hobject_define_property_helper(thr,
-	                                   flags /*defprop_flags*/,
-	                                   obj,
-	                                   key,
-	                                   idx_value,
-	                                   get,
-	                                   set,
-	                                   1 /*throw_flag*/);
+	duk_hobject_define_property_helper(thr, flags /*defprop_flags*/, obj, key, idx_value, get, set, 1 /*throw_flag*/);
 
 	/* Clean up stack */
 
@@ -17083,20 +18244,17 @@ DUK_EXTERNAL void duk_def_prop(duk_hthread *thr, duk_idx_t obj_idx, duk_uint_t f
 
 	return;
 
- fail_invalid_desc:
+fail_invalid_desc:
 	DUK_ERROR_TYPE(thr, DUK_STR_INVALID_DESCRIPTOR);
 	DUK_WO_NORETURN(return;);
 
- fail_not_callable:
+fail_not_callable:
 	DUK_ERROR_TYPE(thr, DUK_STR_NOT_CALLABLE);
 	DUK_WO_NORETURN(return;);
 }
 
 /*
  *  Object related
- *
- *  Note: seal() and freeze() are accessible through ECMAScript bindings,
- *  and are not exposed through the API.
  */
 
 DUK_EXTERNAL void duk_compact(duk_hthread *thr, duk_idx_t obj_idx) {
@@ -17124,7 +18282,7 @@ DUK_EXTERNAL void duk_enum(duk_hthread *thr, duk_idx_t obj_idx, duk_uint_t enum_
 
 	duk_dup(thr, obj_idx);
 	duk_require_hobject_promote_mask(thr, -1, DUK_TYPE_MASK_LIGHTFUNC | DUK_TYPE_MASK_BUFFER);
-	duk_hobject_enumerator_create(thr, enum_flags);   /* [target] -> [enum] */
+	duk_hobject_enumerator_create(thr, enum_flags); /* [target] -> [enum] */
 }
 
 DUK_EXTERNAL duk_bool_t duk_next(duk_hthread *thr, duk_idx_t enum_index, duk_bool_t get_value) {
@@ -17185,8 +18343,8 @@ DUK_INTERNAL void duk_seal_freeze_raw(duk_hthread *thr, duk_idx_t obj_idx, duk_b
 	}
 	return;
 
- fail_cannot_freeze:
-	DUK_ERROR_TYPE_INVALID_ARGS(thr);  /* XXX: proper error message */
+fail_cannot_freeze:
+	DUK_ERROR_TYPE_INVALID_ARGS(thr); /* XXX: proper error message */
 	DUK_WO_NORETURN(return;);
 }
 
@@ -17231,8 +18389,8 @@ DUK_EXTERNAL void duk_put_number_list(duk_hthread *thr, duk_idx_t obj_idx, const
 	if (ent != NULL) {
 		while (ent->key != NULL) {
 			tv = thr->valstack_top++;
-			DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(tv));  /* value stack init policy */
-			DUK_TVAL_SET_NUMBER_CHKFAST_SLOW(tv, ent->value);  /* no need for decref/incref */
+			DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(tv)); /* value stack init policy */
+			DUK_TVAL_SET_NUMBER_CHKFAST_SLOW(tv, ent->value); /* no need for decref/incref */
 			duk_put_prop_string(thr, obj_idx, ent->key);
 			ent++;
 		}
@@ -17302,7 +18460,6 @@ DUK_EXTERNAL duk_bool_t duk_get_global_heapptr(duk_hthread *thr, void *ptr) {
 	return ret;
 }
 
-
 DUK_EXTERNAL duk_bool_t duk_put_global_string(duk_hthread *thr, const char *key) {
 	duk_bool_t ret;
 
@@ -17313,7 +18470,7 @@ DUK_EXTERNAL duk_bool_t duk_put_global_string(duk_hthread *thr, const char *key)
 
 	duk_push_hobject(thr, thr->builtins[DUK_BIDX_GLOBAL]);
 	duk_insert(thr, -2);
-	ret = duk_put_prop_string(thr, -2, key);  /* [ ... global val ] -> [ ... global ] */
+	ret = duk_put_prop_string(thr, -2, key); /* [ ... global val ] -> [ ... global ] */
 	duk_pop(thr);
 	return ret;
 }
@@ -17328,7 +18485,7 @@ DUK_EXTERNAL duk_bool_t duk_put_global_lstring(duk_hthread *thr, const char *key
 
 	duk_push_hobject(thr, thr->builtins[DUK_BIDX_GLOBAL]);
 	duk_insert(thr, -2);
-	ret = duk_put_prop_lstring(thr, -2, key, key_len);  /* [ ... global val ] -> [ ... global ] */
+	ret = duk_put_prop_lstring(thr, -2, key, key_len); /* [ ... global val ] -> [ ... global ] */
 	duk_pop(thr);
 	return ret;
 }
@@ -17345,7 +18502,7 @@ DUK_EXTERNAL duk_bool_t duk_put_global_literal_raw(duk_hthread *thr, const char
 
 	duk_push_hobject(thr, thr->builtins[DUK_BIDX_GLOBAL]);
 	duk_insert(thr, -2);
-	ret = duk_put_prop_literal_raw(thr, -2, key, key_len);  /* [ ... global val ] -> [ ... global ] */
+	ret = duk_put_prop_literal_raw(thr, -2, key, key_len); /* [ ... global val ] -> [ ... global ] */
 	duk_pop(thr);
 	return ret;
 }
@@ -17361,7 +18518,7 @@ DUK_EXTERNAL duk_bool_t duk_put_global_heapptr(duk_hthread *thr, void *ptr) {
 
 	duk_push_hobject(thr, thr->builtins[DUK_BIDX_GLOBAL]);
 	duk_insert(thr, -2);
-	ret = duk_put_prop_heapptr(thr, -2, ptr);  /* [ ... global val ] -> [ ... global ] */
+	ret = duk_put_prop_heapptr(thr, -2, ptr); /* [ ... global val ] -> [ ... global ] */
 	duk_pop(thr);
 	return ret;
 }
@@ -17413,14 +18570,13 @@ DUK_EXTERNAL void duk_set_prototype(duk_hthread *thr, duk_idx_t idx) {
 
 	obj = duk_require_hobject(thr, idx);
 	DUK_ASSERT(obj != NULL);
-	duk_require_type_mask(thr, -1, DUK_TYPE_MASK_UNDEFINED |
-	                               DUK_TYPE_MASK_OBJECT);
+	duk_require_type_mask(thr, -1, DUK_TYPE_MASK_UNDEFINED | DUK_TYPE_MASK_OBJECT);
 	proto = duk_get_hobject(thr, -1);
 	/* proto can also be NULL here (allowed explicitly) */
 
 #if defined(DUK_USE_ROM_OBJECTS)
 	if (DUK_HEAPHDR_HAS_READONLY((duk_heaphdr *) obj)) {
-		DUK_ERROR_TYPE(thr, DUK_STR_NOT_CONFIGURABLE);  /* XXX: "read only object"? */
+		DUK_ERROR_TYPE(thr, DUK_STR_NOT_CONFIGURABLE); /* XXX: "read only object"? */
 		DUK_WO_NORETURN(return;);
 	}
 #endif
@@ -17430,6 +18586,37 @@ DUK_EXTERNAL void duk_set_prototype(duk_hthread *thr, duk_idx_t idx) {
 	duk_pop(thr);
 }
 
+DUK_INTERNAL void duk_clear_prototype(duk_hthread *thr, duk_idx_t idx) {
+	duk_hobject *obj;
+
+	DUK_ASSERT_API_ENTRY(thr);
+
+	obj = duk_require_hobject(thr, idx);
+	DUK_ASSERT(obj != NULL);
+
+#if defined(DUK_USE_ROM_OBJECTS)
+	if (DUK_HEAPHDR_HAS_READONLY((duk_heaphdr *) obj)) {
+		DUK_ERROR_TYPE(thr, DUK_STR_NOT_CONFIGURABLE); /* XXX: "read only object"? */
+		DUK_WO_NORETURN(return;);
+	}
+#endif
+
+	DUK_HOBJECT_SET_PROTOTYPE_UPDREF(thr, obj, NULL);
+}
+
+DUK_INTERNAL duk_bool_t duk_is_bare_object(duk_hthread *thr, duk_idx_t idx) {
+	duk_hobject *obj;
+	duk_hobject *proto;
+
+	DUK_ASSERT_API_ENTRY(thr);
+
+	obj = duk_require_hobject(thr, idx);
+	DUK_ASSERT(obj != NULL);
+
+	proto = DUK_HOBJECT_GET_PROTOTYPE(thr->heap, obj);
+	return (proto == NULL);
+}
+
 /*
  *  Object finalizer
  */
@@ -17443,6 +18630,10 @@ DUK_EXTERNAL void duk_set_prototype(duk_hthread *thr, duk_idx_t idx) {
 DUK_EXTERNAL void duk_get_finalizer(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ASSERT_API_ENTRY(thr);
 
+	/* This get intentionally walks the inheritance chain at present,
+	 * which matches how the effective finalizer property is also
+	 * looked up in GC.
+	 */
 	duk_get_prop_stridx(thr, idx, DUK_STRIDX_INT_FINALIZER);
 }
 
@@ -17452,8 +18643,14 @@ DUK_EXTERNAL void duk_set_finalizer(duk_hthread *thr, duk_idx_t idx) {
 
 	DUK_ASSERT_API_ENTRY(thr);
 
-	h = duk_require_hobject(thr, idx);  /* Get before 'put' so that 'idx' is correct. */
+	h = duk_require_hobject(thr, idx); /* Get before 'put' so that 'idx' is correct. */
 	callable = duk_is_callable(thr, -1);
+
+	/* At present finalizer is stored as a hidden Symbol, with normal
+	 * inheritance and access control.  As a result, finalizer cannot
+	 * currently be set on a non-extensible (sealed or frozen) object.
+	 * It might be useful to allow it.
+	 */
 	duk_put_prop_stridx(thr, idx, DUK_STRIDX_INT_FINALIZER);
 
 	/* In addition to setting the finalizer property, keep a "have
@@ -17473,7 +18670,7 @@ DUK_EXTERNAL void duk_set_finalizer(duk_hthread *thr, duk_idx_t idx) {
 		DUK_HOBJECT_CLEAR_HAVE_FINALIZER(h);
 	}
 }
-#else  /* DUK_USE_FINALIZER_SUPPORT */
+#else /* DUK_USE_FINALIZER_SUPPORT */
 DUK_EXTERNAL void duk_get_finalizer(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ASSERT_API_ENTRY(thr);
 	DUK_UNREF(idx);
@@ -17487,7 +18684,7 @@ DUK_EXTERNAL void duk_set_finalizer(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ERROR_UNSUPPORTED(thr);
 	DUK_WO_NORETURN(return;);
 }
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 /*
  *  Random numbers
  */
@@ -17495,7 +18692,7 @@ DUK_EXTERNAL void duk_set_finalizer(duk_hthread *thr, duk_idx_t idx) {
 /* #include duk_internal.h -> already included */
 
 DUK_EXTERNAL duk_double_t duk_random(duk_hthread *thr) {
-	return (duk_double_t) DUK_UTIL_GET_RANDOM_DOUBLE(thr);
+	return (duk_double_t) duk_util_get_random_double(thr);
 }
 /*
  *  API calls related to general value stack manipulation: resizing the value
@@ -17515,7 +18712,8 @@ DUK_EXTERNAL duk_double_t duk_random(duk_hthread *thr) {
  *  Forward declarations
  */
 
-DUK_LOCAL_DECL duk_idx_t duk__push_c_function_raw(duk_hthread *thr, duk_c_function func, duk_idx_t nargs, duk_uint_t flags, duk_small_uint_t proto_bidx);
+DUK_LOCAL_DECL duk_idx_t
+duk__push_c_function_raw(duk_hthread *thr, duk_c_function func, duk_idx_t nargs, duk_uint_t flags, duk_small_uint_t proto_bidx);
 
 /*
  *  Global state for working around missing variadic macros
@@ -17530,41 +18728,24 @@ DUK_EXTERNAL duk_int_t duk_api_global_line = 0;
  *  Misc helpers
  */
 
-DUK_LOCAL const char * const duk__symbol_type_strings[4] = {
-	"hidden", "global", "local", "wellknown"
-};
+DUK_LOCAL const char * const duk__symbol_type_strings[4] = { "hidden", "global", "local", "wellknown" };
 
 #if !defined(DUK_USE_PACKED_TVAL)
 DUK_LOCAL const duk_uint_t duk__type_from_tag[] = {
-	DUK_TYPE_NUMBER,
-	DUK_TYPE_NUMBER,  /* fastint */
-	DUK_TYPE_UNDEFINED,
-	DUK_TYPE_NULL,
-	DUK_TYPE_BOOLEAN,
-	DUK_TYPE_POINTER,
-	DUK_TYPE_LIGHTFUNC,
-	DUK_TYPE_NONE,
-	DUK_TYPE_STRING,
-	DUK_TYPE_OBJECT,
-	DUK_TYPE_BUFFER,
+	DUK_TYPE_NUMBER,    DUK_TYPE_NUMBER, /* fastint */
+	DUK_TYPE_UNDEFINED, DUK_TYPE_NULL,   DUK_TYPE_BOOLEAN, DUK_TYPE_POINTER, DUK_TYPE_LIGHTFUNC,
+	DUK_TYPE_NONE,      DUK_TYPE_STRING, DUK_TYPE_OBJECT,  DUK_TYPE_BUFFER,
 };
 DUK_LOCAL const duk_uint_t duk__type_mask_from_tag[] = {
-	DUK_TYPE_MASK_NUMBER,
-	DUK_TYPE_MASK_NUMBER,  /* fastint */
-	DUK_TYPE_MASK_UNDEFINED,
-	DUK_TYPE_MASK_NULL,
-	DUK_TYPE_MASK_BOOLEAN,
-	DUK_TYPE_MASK_POINTER,
-	DUK_TYPE_MASK_LIGHTFUNC,
-	DUK_TYPE_MASK_NONE,
-	DUK_TYPE_MASK_STRING,
-	DUK_TYPE_MASK_OBJECT,
-	DUK_TYPE_MASK_BUFFER,
+	DUK_TYPE_MASK_NUMBER,    DUK_TYPE_MASK_NUMBER, /* fastint */
+	DUK_TYPE_MASK_UNDEFINED, DUK_TYPE_MASK_NULL,   DUK_TYPE_MASK_BOOLEAN, DUK_TYPE_MASK_POINTER, DUK_TYPE_MASK_LIGHTFUNC,
+	DUK_TYPE_MASK_NONE,      DUK_TYPE_MASK_STRING, DUK_TYPE_MASK_OBJECT,  DUK_TYPE_MASK_BUFFER,
 };
-#endif  /* !DUK_USE_PACKED_TVAL */
+#endif /* !DUK_USE_PACKED_TVAL */
 
 /* Assert that there's room for one value. */
-#define DUK__ASSERT_SPACE() do { \
+#define DUK__ASSERT_SPACE() \
+	do { \
 		DUK_ASSERT(!(thr->valstack_top >= thr->valstack_end)); \
 	} while (0)
 
@@ -17573,7 +18754,8 @@ DUK_LOCAL const duk_uint_t duk__type_mask_from_tag[] = {
 /* Faster but value stack overruns are memory unsafe. */
 #define DUK__CHECK_SPACE() DUK__ASSERT_SPACE()
 #else
-#define DUK__CHECK_SPACE() do { \
+#define DUK__CHECK_SPACE() \
+	do { \
 		if (DUK_UNLIKELY(thr->valstack_top >= thr->valstack_end)) { \
 			DUK_ERROR_RANGE_PUSH_BEYOND(thr); \
 		} \
@@ -17586,7 +18768,7 @@ DUK_LOCAL duk_small_uint_t duk__get_symbol_type(duk_hstring *h) {
 
 	DUK_ASSERT(h != NULL);
 	DUK_ASSERT(DUK_HSTRING_HAS_SYMBOL(h));
-	DUK_ASSERT(DUK_HSTRING_GET_BYTELEN(h) >= 1);  /* always true, symbol prefix */
+	DUK_ASSERT(DUK_HSTRING_GET_BYTELEN(h) >= 1); /* always true, symbol prefix */
 
 	data = (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h);
 	len = DUK_HSTRING_GET_BYTELEN(h);
@@ -17753,7 +18935,7 @@ DUK_EXTERNAL duk_idx_t duk_normalize_index(duk_hthread *thr, duk_idx_t idx) {
 	/* Assume value stack sizes (in elements) fits into duk_idx_t. */
 	DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
 	vs_size = (duk_uidx_t) (thr->valstack_top - thr->valstack_bottom);
-	DUK_ASSERT_DISABLE(vs_size >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(vs_size >= 0); /* unsigned */
 
 	if (idx < 0) {
 		uidx = vs_size + (duk_uidx_t) idx;
@@ -17781,7 +18963,7 @@ DUK_EXTERNAL duk_idx_t duk_require_normalize_index(duk_hthread *thr, duk_idx_t i
 
 	DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
 	vs_size = (duk_uidx_t) (thr->valstack_top - thr->valstack_bottom);
-	DUK_ASSERT_DISABLE(vs_size >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(vs_size >= 0); /* unsigned */
 
 	if (idx < 0) {
 		uidx = vs_size + (duk_uidx_t) idx;
@@ -17809,7 +18991,7 @@ DUK_INTERNAL duk_tval *duk_get_tval(duk_hthread *thr, duk_idx_t idx) {
 
 	DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
 	vs_size = (duk_uidx_t) (thr->valstack_top - thr->valstack_bottom);
-	DUK_ASSERT_DISABLE(vs_size >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(vs_size >= 0); /* unsigned */
 
 	if (idx < 0) {
 		uidx = vs_size + (duk_uidx_t) idx;
@@ -17856,7 +19038,7 @@ DUK_INTERNAL duk_tval *duk_require_tval(duk_hthread *thr, duk_idx_t idx) {
 
 	DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
 	vs_size = (duk_uidx_t) (thr->valstack_top - thr->valstack_bottom);
-	DUK_ASSERT_DISABLE(vs_size >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(vs_size >= 0); /* unsigned */
 
 	/* Use unsigned arithmetic to optimize comparison. */
 	if (idx < 0) {
@@ -17995,7 +19177,7 @@ DUK_EXTERNAL void duk_set_top(duk_hthread *thr, duk_idx_t idx) {
 		DUK_ASSERT(count > 0);
 		tv = thr->valstack_top;
 		tv_end = tv - count;
-		DUK_ASSERT(tv > tv_end);  /* Because count > 0. */
+		DUK_ASSERT(tv > tv_end); /* Because count > 0. */
 		do {
 			tv--;
 			DUK_ASSERT(tv >= thr->valstack_bottom);
@@ -18003,7 +19185,7 @@ DUK_EXTERNAL void duk_set_top(duk_hthread *thr, duk_idx_t idx) {
 		} while (tv != tv_end);
 		thr->valstack_top = tv_end;
 		DUK_REFZERO_CHECK_FAST(thr);
-#else  /* DUK_USE_REFERENCE_COUNTING */
+#else /* DUK_USE_REFERENCE_COUNTING */
 		duk_uidx_t count;
 		duk_tval *tv_end;
 
@@ -18016,7 +19198,7 @@ DUK_EXTERNAL void duk_set_top(duk_hthread *thr, duk_idx_t idx) {
 			DUK_TVAL_SET_UNDEFINED(tv);
 		} while (tv != tv_end);
 		thr->valstack_top = tv_end;
-#endif  /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_REFERENCE_COUNTING */
 	}
 }
 
@@ -18027,7 +19209,7 @@ DUK_INTERNAL void duk_set_top_unsafe(duk_hthread *thr, duk_idx_t idx) {
 
 	duk_set_top(thr, idx);
 }
-#else  /* DUK_USE_PREFER_SIZE */
+#else /* DUK_USE_PREFER_SIZE */
 DUK_INTERNAL void duk_set_top_unsafe(duk_hthread *thr, duk_idx_t idx) {
 	duk_uidx_t uidx;
 	duk_uidx_t vs_size;
@@ -18066,7 +19248,7 @@ DUK_INTERNAL void duk_set_top_unsafe(duk_hthread *thr, duk_idx_t idx) {
 		DUK_ASSERT(count > 0);
 		tv = thr->valstack_top;
 		tv_end = tv - count;
-		DUK_ASSERT(tv > tv_end);  /* Because count > 0. */
+		DUK_ASSERT(tv > tv_end); /* Because count > 0. */
 		do {
 			tv--;
 			DUK_ASSERT(tv >= thr->valstack_bottom);
@@ -18074,7 +19256,7 @@ DUK_INTERNAL void duk_set_top_unsafe(duk_hthread *thr, duk_idx_t idx) {
 		} while (tv != tv_end);
 		thr->valstack_top = tv_end;
 		DUK_REFZERO_CHECK_FAST(thr);
-#else  /* DUK_USE_REFERENCE_COUNTING */
+#else /* DUK_USE_REFERENCE_COUNTING */
 		duk_uidx_t count;
 		duk_tval *tv_end;
 
@@ -18087,10 +19269,10 @@ DUK_INTERNAL void duk_set_top_unsafe(duk_hthread *thr, duk_idx_t idx) {
 			DUK_TVAL_SET_UNDEFINED(tv);
 		} while (tv != tv_end);
 		thr->valstack_top = tv_end;
-#endif  /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_REFERENCE_COUNTING */
 	}
 }
-#endif  /* DUK_USE_PREFER_SIZE */
+#endif /* DUK_USE_PREFER_SIZE */
 
 /* Internal helper: set top to 'top', and set [idx_wipe_start,top[ to
  * 'undefined' (doing nothing if idx_wipe_start == top).  Indices are
@@ -18185,14 +19367,14 @@ DUK_LOCAL DUK_COLD DUK_NOINLINE duk_bool_t duk__resize_valstack(duk_hthread *thr
 	duk_tval *tv_prev_alloc_end;
 	duk_tval *p;
 
-	DUK_ASSERT_HTHREAD_VALID(thr);
+	DUK_HTHREAD_ASSERT_VALID(thr);
 	DUK_ASSERT(thr->valstack_bottom >= thr->valstack);
 	DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
 	DUK_ASSERT(thr->valstack_end >= thr->valstack_top);
 	DUK_ASSERT(thr->valstack_alloc_end >= thr->valstack_end);
-	DUK_ASSERT((duk_size_t) (thr->valstack_top - thr->valstack) <= new_size);  /* can't resize below 'top' */
-	DUK_ASSERT(new_size <= DUK_USE_VALSTACK_LIMIT);  /* valstack limit caller has check, prevents wrapping */
-	DUK_ASSERT(new_size <= DUK_SIZE_MAX / sizeof(duk_tval));  /* specific assert for wrapping */
+	DUK_ASSERT((duk_size_t) (thr->valstack_top - thr->valstack) <= new_size); /* can't resize below 'top' */
+	DUK_ASSERT(new_size <= DUK_USE_VALSTACK_LIMIT); /* valstack limit caller has check, prevents wrapping */
+	DUK_ASSERT(new_size <= DUK_SIZE_MAX / sizeof(duk_tval)); /* specific assert for wrapping */
 
 	/* Pre-realloc pointer copies for asserts and debug logs. */
 	pre_valstack = thr->valstack;
@@ -18227,7 +19409,8 @@ DUK_LOCAL DUK_COLD DUK_NOINLINE duk_bool_t duk__resize_valstack(duk_hthread *thr
 		 */
 		DUK_ASSERT(new_size != 0);
 		DUK_D(DUK_DPRINT("failed to resize valstack to %lu entries (%lu bytes)",
-		                 (unsigned long) new_size, (unsigned long) new_alloc_size));
+		                 (unsigned long) new_size,
+		                 (unsigned long) new_alloc_size));
 		return 0;
 	}
 
@@ -18238,23 +19421,28 @@ DUK_LOCAL DUK_COLD DUK_NOINLINE duk_bool_t duk__resize_valstack(duk_hthread *thr
 #if defined(DUK_USE_DEBUG)
 	if (thr->valstack != pre_valstack) {
 		DUK_D(DUK_DPRINT("valstack base pointer changed during valstack resize: %p -> %p",
-		                 (void *) pre_valstack, (void *) thr->valstack));
+		                 (void *) pre_valstack,
+		                 (void *) thr->valstack));
 	}
 	if (thr->valstack_bottom != pre_bottom) {
 		DUK_D(DUK_DPRINT("valstack bottom pointer changed during valstack resize: %p -> %p",
-		                 (void *) pre_bottom, (void *) thr->valstack_bottom));
+		                 (void *) pre_bottom,
+		                 (void *) thr->valstack_bottom));
 	}
 	if (thr->valstack_top != pre_top) {
 		DUK_D(DUK_DPRINT("valstack top pointer changed during valstack resize: %p -> %p",
-		                 (void *) pre_top, (void *) thr->valstack_top));
+		                 (void *) pre_top,
+		                 (void *) thr->valstack_top));
 	}
 	if (thr->valstack_end != pre_end) {
 		DUK_D(DUK_DPRINT("valstack end pointer changed during valstack resize: %p -> %p",
-		                 (void *) pre_end, (void *) thr->valstack_end));
+		                 (void *) pre_end,
+		                 (void *) thr->valstack_end));
 	}
 	if (thr->valstack_alloc_end != pre_alloc_end) {
 		DUK_D(DUK_DPRINT("valstack alloc_end pointer changed during valstack resize: %p -> %p",
-		                 (void *) pre_alloc_end, (void *) thr->valstack_alloc_end));
+		                 (void *) pre_alloc_end,
+		                 (void *) thr->valstack_alloc_end));
 	}
 #endif
 
@@ -18293,12 +19481,22 @@ DUK_LOCAL DUK_COLD DUK_NOINLINE duk_bool_t duk__resize_valstack(duk_hthread *thr
 	                 (unsigned long) new_size,
 	                 (unsigned long) ((duk_uint8_t *) pre_alloc_end - (duk_uint8_t *) pre_valstack),
 	                 (unsigned long) new_alloc_size,
-	                 (void *) pre_valstack, (void *) thr->valstack,
-	                 (void *) pre_bottom, (void *) thr->valstack_bottom, (long) (thr->valstack_bottom - thr->valstack),
-	                 (void *) pre_top, (void *) thr->valstack_top, (long) (thr->valstack_top - thr->valstack),
-	                 (void *) pre_end, (void *) thr->valstack_end, (long) (thr->valstack_end - thr->valstack),
-	                 (void *) pre_alloc_end, (void *) thr->valstack_alloc_end, (long) (thr->valstack_alloc_end - thr->valstack),
-	                 (void *) tv_prev_alloc_end, (long) (thr->valstack_alloc_end - tv_prev_alloc_end)));
+	                 (void *) pre_valstack,
+	                 (void *) thr->valstack,
+	                 (void *) pre_bottom,
+	                 (void *) thr->valstack_bottom,
+	                 (long) (thr->valstack_bottom - thr->valstack),
+	                 (void *) pre_top,
+	                 (void *) thr->valstack_top,
+	                 (long) (thr->valstack_top - thr->valstack),
+	                 (void *) pre_end,
+	                 (void *) thr->valstack_end,
+	                 (long) (thr->valstack_end - thr->valstack),
+	                 (void *) pre_alloc_end,
+	                 (void *) thr->valstack_alloc_end,
+	                 (long) (thr->valstack_alloc_end - thr->valstack),
+	                 (void *) tv_prev_alloc_end,
+	                 (long) (thr->valstack_alloc_end - tv_prev_alloc_end)));
 
 	/* If allocation grew, init any new slots to 'undefined'. */
 	p = tv_prev_alloc_end;
@@ -18325,7 +19523,7 @@ DUK_LOCAL DUK_COLD DUK_NOINLINE duk_bool_t duk__valstack_grow(duk_hthread *thr,
 	duk_size_t new_size;
 
 	DUK_ASSERT(min_bytes / sizeof(duk_tval) * sizeof(duk_tval) == min_bytes);
-	min_size = min_bytes / sizeof(duk_tval);  /* from bytes to slots */
+	min_size = min_bytes / sizeof(duk_tval); /* from bytes to slots */
 
 #if defined(DUK_USE_VALSTACK_GROW_SHIFT)
 	/* New size is minimum size plus a proportional slack, e.g. shift of
@@ -18442,17 +19640,18 @@ DUK_INTERNAL void duk_valstack_shrink_check_nothrow(duk_hthread *thr, duk_bool_t
 #else
 		slack = 0;
 #endif
-		shrink_bytes = reserve_bytes +
-		               slack / sizeof(duk_tval) * sizeof(duk_tval);  /* multiple of duk_tval */
+		shrink_bytes = reserve_bytes + slack / sizeof(duk_tval) * sizeof(duk_tval); /* multiple of duk_tval */
 	}
-#else  /* DUK_USE_VALSTACK_SHRINK_CHECK_SHIFT */
+#else /* DUK_USE_VALSTACK_SHRINK_CHECK_SHIFT */
 	/* Always snug, useful in some low memory environments. */
 	DUK_UNREF(snug);
 	shrink_bytes = reserve_bytes;
-#endif  /* DUK_USE_VALSTACK_SHRINK_CHECK_SHIFT */
+#endif /* DUK_USE_VALSTACK_SHRINK_CHECK_SHIFT */
 
 	DUK_D(DUK_DPRINT("valstack shrink check: alloc_bytes=%ld, reserve_bytes=%ld, shrink_bytes=%ld (unvalidated)",
-	                 (long) alloc_bytes, (long) reserve_bytes, (long) shrink_bytes));
+	                 (long) alloc_bytes,
+	                 (long) reserve_bytes,
+	                 (long) shrink_bytes));
 	DUK_ASSERT(shrink_bytes >= reserve_bytes);
 	if (shrink_bytes >= alloc_bytes) {
 		/* Skip if shrink target is same as current one (or higher,
@@ -18599,7 +19798,7 @@ DUK_EXTERNAL void duk_dup(duk_hthread *thr, duk_idx_t from_idx) {
 	DUK_ASSERT(tv_from != NULL);
 	DUK_ASSERT(tv_to != NULL);
 	DUK_TVAL_SET_TVAL(tv_to, tv_from);
-	DUK_TVAL_INCREF(thr, tv_to);  /* no side effects */
+	DUK_TVAL_INCREF(thr, tv_to); /* no side effects */
 }
 
 DUK_EXTERNAL void duk_dup_top(duk_hthread *thr) {
@@ -18621,7 +19820,7 @@ DUK_EXTERNAL void duk_dup_top(duk_hthread *thr) {
 	DUK_ASSERT(tv_from != NULL);
 	DUK_ASSERT(tv_to != NULL);
 	DUK_TVAL_SET_TVAL(tv_to, tv_from);
-	DUK_TVAL_INCREF(thr, tv_to);  /* no side effects */
+	DUK_TVAL_INCREF(thr, tv_to); /* no side effects */
 #endif
 }
 
@@ -18671,10 +19870,13 @@ DUK_EXTERNAL void duk_insert(duk_hthread *thr, duk_idx_t to_idx) {
 	 * => [ ... | q | p | x | x ]
 	 */
 
-	nbytes = (duk_size_t) (((duk_uint8_t *) q) - ((duk_uint8_t *) p));  /* Note: 'q' is top-1 */
+	nbytes = (duk_size_t) (((duk_uint8_t *) q) - ((duk_uint8_t *) p));
 
 	DUK_DDD(DUK_DDDPRINT("duk_insert: to_idx=%ld, p=%p, q=%p, nbytes=%lu",
-	                     (long) to_idx, (void *) p, (void *) q, (unsigned long) nbytes));
+	                     (long) to_idx,
+	                     (void *) p,
+	                     (void *) q,
+	                     (unsigned long) nbytes));
 
 	/* No net refcount changes.  No need to special case nbytes == 0
 	 * (p == q).
@@ -18686,7 +19888,7 @@ DUK_EXTERNAL void duk_insert(duk_hthread *thr, duk_idx_t to_idx) {
 
 DUK_INTERNAL void duk_insert_undefined(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ASSERT_API_ENTRY(thr);
-	DUK_ASSERT(idx >= 0);  /* Doesn't support negative indices. */
+	DUK_ASSERT(idx >= 0); /* Doesn't support negative indices. */
 
 	duk_push_undefined(thr);
 	duk_insert(thr, idx);
@@ -18696,7 +19898,7 @@ DUK_INTERNAL void duk_insert_undefined_n(duk_hthread *thr, duk_idx_t idx, duk_id
 	duk_tval *tv, *tv_end;
 
 	DUK_ASSERT_API_ENTRY(thr);
-	DUK_ASSERT(idx >= 0);  /* Doesn't support negative indices or count. */
+	DUK_ASSERT(idx >= 0); /* Doesn't support negative indices or count. */
 	DUK_ASSERT(count >= 0);
 
 	tv = duk_reserve_gap(thr, idx, count);
@@ -18707,6 +19909,43 @@ DUK_INTERNAL void duk_insert_undefined_n(duk_hthread *thr, duk_idx_t idx, duk_id
 	}
 }
 
+DUK_EXTERNAL void duk_pull(duk_hthread *thr, duk_idx_t from_idx) {
+	duk_tval *p;
+	duk_tval *q;
+	duk_tval tv_tmp;
+	duk_size_t nbytes;
+
+	DUK_ASSERT_API_ENTRY(thr);
+
+	/*                         nbytes
+	 *                       <--------->
+	 *    [ ... | x | x | p | y | y | q ]
+	 * => [ ... | x | x | y | y | q | p ]
+	 */
+
+	p = duk_require_tval(thr, from_idx);
+	DUK_ASSERT(p != NULL);
+	q = duk_require_tval(thr, -1);
+	DUK_ASSERT(q != NULL);
+
+	DUK_ASSERT(q >= p);
+
+	nbytes = (duk_size_t) (((duk_uint8_t *) q) - ((duk_uint8_t *) p));
+
+	DUK_DDD(DUK_DDDPRINT("duk_pull: from_idx=%ld, p=%p, q=%p, nbytes=%lu",
+	                     (long) from_idx,
+	                     (void *) p,
+	                     (void *) q,
+	                     (unsigned long) nbytes));
+
+	/* No net refcount changes.  No need to special case nbytes == 0
+	 * (p == q).
+	 */
+	DUK_TVAL_SET_TVAL(&tv_tmp, p);
+	duk_memmove((void *) p, (const void *) (p + 1), (size_t) nbytes);
+	DUK_TVAL_SET_TVAL(q, &tv_tmp);
+}
+
 DUK_EXTERNAL void duk_replace(duk_hthread *thr, duk_idx_t to_idx) {
 	duk_tval *tv1;
 	duk_tval *tv2;
@@ -18726,7 +19965,7 @@ DUK_EXTERNAL void duk_replace(duk_hthread *thr, duk_idx_t to_idx) {
 	DUK_TVAL_SET_TVAL(tv2, tv1);
 	DUK_TVAL_SET_UNDEFINED(tv1);
 	thr->valstack_top--;
-	DUK_TVAL_DECREF(thr, &tv_tmp);  /* side effects */
+	DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
 }
 
 DUK_EXTERNAL void duk_copy(duk_hthread *thr, duk_idx_t from_idx, duk_idx_t to_idx) {
@@ -18741,7 +19980,7 @@ DUK_EXTERNAL void duk_copy(duk_hthread *thr, duk_idx_t from_idx, duk_idx_t to_id
 	DUK_ASSERT(tv2 != NULL);
 
 	/* For tv1 == tv2, this is a no-op (no explicit check needed). */
-	DUK_TVAL_SET_TVAL_UPDREF(thr, tv2, tv1);  /* side effects */
+	DUK_TVAL_SET_TVAL_UPDREF(thr, tv2, tv1); /* side effects */
 }
 
 DUK_EXTERNAL void duk_remove(duk_hthread *thr, duk_idx_t idx) {
@@ -18772,21 +20011,21 @@ DUK_EXTERNAL void duk_remove(duk_hthread *thr, duk_idx_t idx) {
 	DUK_TVAL_SET_TVAL(&tv_tmp, p);
 #endif
 
-	nbytes = (duk_size_t) (((duk_uint8_t *) q) - ((duk_uint8_t *) p));  /* Note: 'q' is top-1 */
+	nbytes = (duk_size_t) (((duk_uint8_t *) q) - ((duk_uint8_t *) p)); /* Note: 'q' is top-1 */
 	duk_memmove((void *) p, (const void *) (p + 1), (size_t) nbytes);
 
 	DUK_TVAL_SET_UNDEFINED(q);
 	thr->valstack_top--;
 
 #if defined(DUK_USE_REFERENCE_COUNTING)
-	DUK_TVAL_DECREF(thr, &tv_tmp);  /* side effects */
+	DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
 #endif
 }
 
 DUK_INTERNAL void duk_remove_unsafe(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ASSERT_API_ENTRY(thr);
 
-	duk_remove(thr, idx);  /* XXX: no optimization for now */
+	duk_remove(thr, idx); /* XXX: no optimization for now */
 }
 
 DUK_INTERNAL void duk_remove_m2(duk_hthread *thr) {
@@ -18805,7 +20044,7 @@ DUK_INTERNAL void duk_remove_n(duk_hthread *thr, duk_idx_t idx, duk_idx_t count)
 	while (count-- > 0) {
 		duk_remove(thr, idx);
 	}
-#else  /* DUK_USE_PREFER_SIZE */
+#else /* DUK_USE_PREFER_SIZE */
 	duk_tval *tv_src;
 	duk_tval *tv_dst;
 	duk_tval *tv_newtop;
@@ -18837,13 +20076,13 @@ DUK_INTERNAL void duk_remove_n(duk_hthread *thr, duk_idx_t idx, duk_idx_t count)
 	/* When not preferring size, only NORZ macros are used; caller
 	 * is expected to DUK_REFZERO_CHECK().
 	 */
-#endif  /* DUK_USE_PREFER_SIZE */
+#endif /* DUK_USE_PREFER_SIZE */
 }
 
 DUK_INTERNAL void duk_remove_n_unsafe(duk_hthread *thr, duk_idx_t idx, duk_idx_t count) {
 	DUK_ASSERT_API_ENTRY(thr);
 
-	duk_remove_n(thr, idx, count);  /* XXX: no optimization for now */
+	duk_remove_n(thr, idx, count); /* XXX: no optimization for now */
 }
 
 /*
@@ -18859,8 +20098,8 @@ DUK_EXTERNAL void duk_xcopymove_raw(duk_hthread *to_thr, duk_hthread *from_thr,
 	/* XXX: several pointer comparison issues here */
 
 	DUK_ASSERT_API_ENTRY(to_thr);
-	DUK_ASSERT_CTX_VALID(to_thr);
-	DUK_ASSERT_CTX_VALID(from_thr);
+	DUK_CTX_ASSERT_VALID(to_thr);
+	DUK_CTX_ASSERT_VALID(from_thr);
 	DUK_ASSERT(to_thr->heap == from_thr->heap);
 
 	if (DUK_UNLIKELY(to_thr == from_thr)) {
@@ -18904,7 +20143,7 @@ DUK_EXTERNAL void duk_xcopymove_raw(duk_hthread *to_thr, duk_hthread *from_thr,
 		/* Incref copies, keep originals. */
 		q = to_thr->valstack_top;
 		while (p < q) {
-			DUK_TVAL_INCREF(to_thr, p);  /* no side effects */
+			DUK_TVAL_INCREF(to_thr, p); /* no side effects */
 			p++;
 		}
 	} else {
@@ -18986,7 +20225,7 @@ DUK_LOCAL DUK_ALWAYS_INLINE duk_bool_t duk__get_boolean_raw(duk_hthread *thr, du
 	duk_bool_t ret;
 	duk_tval *tv;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 
 	tv = duk_get_tval_or_unused(thr, idx);
 	DUK_ASSERT(tv != NULL);
@@ -19004,7 +20243,7 @@ DUK_LOCAL DUK_ALWAYS_INLINE duk_bool_t duk__get_boolean_raw(duk_hthread *thr, du
 DUK_EXTERNAL duk_bool_t duk_get_boolean(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ASSERT_API_ENTRY(thr);
 
-	return duk__get_boolean_raw(thr, idx, 0);  /* default: false */
+	return duk__get_boolean_raw(thr, idx, 0); /* default: false */
 }
 
 DUK_EXTERNAL duk_bool_t duk_get_boolean_default(duk_hthread *thr, duk_idx_t idx, duk_bool_t def_value) {
@@ -19044,17 +20283,16 @@ DUK_LOCAL DUK_ALWAYS_INLINE duk_double_t duk__get_number_raw(duk_hthread *thr, d
 	duk_double_union ret;
 	duk_tval *tv;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 
 	tv = duk_get_tval_or_unused(thr, idx);
 	DUK_ASSERT(tv != NULL);
 #if defined(DUK_USE_FASTINT)
 	if (DUK_TVAL_IS_FASTINT(tv)) {
-		ret.d = (duk_double_t) DUK_TVAL_GET_FASTINT(tv);  /* XXX: cast trick */
-	}
-	else
+		ret.d = (duk_double_t) DUK_TVAL_GET_FASTINT(tv); /* XXX: cast trick */
+	} else
 #endif
-	if (DUK_TVAL_IS_DOUBLE(tv)) {
+	    if (DUK_TVAL_IS_DOUBLE(tv)) {
 		/* When using packed duk_tval, number must be in NaN-normalized form
 		 * for it to be a duk_tval, so no need to normalize.  NOP for unpacked
 		 * duk_tval.
@@ -19071,7 +20309,7 @@ DUK_LOCAL DUK_ALWAYS_INLINE duk_double_t duk__get_number_raw(duk_hthread *thr, d
 
 DUK_EXTERNAL duk_double_t duk_get_number(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ASSERT_API_ENTRY(thr);
-	return duk__get_number_raw(thr, idx, DUK_DOUBLE_NAN);  /* default: NaN */
+	return duk__get_number_raw(thr, idx, DUK_DOUBLE_NAN); /* default: NaN */
 }
 
 DUK_EXTERNAL duk_double_t duk_get_number_default(duk_hthread *thr, duk_idx_t idx, duk_double_t def_value) {
@@ -19227,7 +20465,11 @@ DUK_EXTERNAL const char *duk_get_string(duk_hthread *thr, duk_idx_t idx) {
 	}
 }
 
-DUK_EXTERNAL const char *duk_opt_lstring(duk_hthread *thr, duk_idx_t idx, duk_size_t *out_len, const char *def_ptr, duk_size_t def_len) {
+DUK_EXTERNAL const char *duk_opt_lstring(duk_hthread *thr,
+                                         duk_idx_t idx,
+                                         duk_size_t *out_len,
+                                         const char *def_ptr,
+                                         duk_size_t def_len) {
 	DUK_ASSERT_API_ENTRY(thr);
 
 	if (duk_check_type_mask(thr, idx, DUK_TYPE_MASK_NONE | DUK_TYPE_MASK_UNDEFINED)) {
@@ -19248,7 +20490,11 @@ DUK_EXTERNAL const char *duk_opt_string(duk_hthread *thr, duk_idx_t idx, const c
 	return duk_require_string(thr, idx);
 }
 
-DUK_EXTERNAL const char *duk_get_lstring_default(duk_hthread *thr, duk_idx_t idx, duk_size_t *out_len, const char *def_ptr, duk_size_t def_len) {
+DUK_EXTERNAL const char *duk_get_lstring_default(duk_hthread *thr,
+                                                 duk_idx_t idx,
+                                                 duk_size_t *out_len,
+                                                 const char *def_ptr,
+                                                 duk_size_t def_len) {
 	duk_hstring *h;
 	const char *ret;
 	duk_size_t len;
@@ -19329,7 +20575,7 @@ DUK_LOCAL void *duk__get_pointer_raw(duk_hthread *thr, duk_idx_t idx, void *def_
 	duk_tval *tv;
 	void *p;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 
 	tv = duk_get_tval_or_unused(thr, idx);
 	DUK_ASSERT(tv != NULL);
@@ -19337,7 +20583,7 @@ DUK_LOCAL void *duk__get_pointer_raw(duk_hthread *thr, duk_idx_t idx, void *def_
 		return def_value;
 	}
 
-	p = DUK_TVAL_GET_POINTER(tv);  /* may be NULL */
+	p = DUK_TVAL_GET_POINTER(tv); /* may be NULL */
 	return p;
 }
 
@@ -19375,11 +20621,11 @@ DUK_EXTERNAL void *duk_require_pointer(duk_hthread *thr, duk_idx_t idx) {
 		DUK_ERROR_REQUIRE_TYPE_INDEX(thr, idx, "pointer", DUK_STR_NOT_POINTER);
 		DUK_WO_NORETURN(return NULL;);
 	}
-	p = DUK_TVAL_GET_POINTER(tv);  /* may be NULL */
+	p = DUK_TVAL_GET_POINTER(tv); /* may be NULL */
 	return p;
 }
 
-#if 0  /*unused*/
+#if 0 /*unused*/
 DUK_INTERNAL void *duk_get_voidptr(duk_hthread *thr, duk_idx_t idx) {
 	duk_tval *tv;
 	duk_heaphdr *h;
@@ -19398,13 +20644,18 @@ DUK_INTERNAL void *duk_get_voidptr(duk_hthread *thr, duk_idx_t idx) {
 }
 #endif
 
-DUK_LOCAL void *duk__get_buffer_helper(duk_hthread *thr, duk_idx_t idx, duk_size_t *out_size, void *def_ptr, duk_size_t def_size, duk_bool_t throw_flag) {
+DUK_LOCAL void *duk__get_buffer_helper(duk_hthread *thr,
+                                       duk_idx_t idx,
+                                       duk_size_t *out_size,
+                                       void *def_ptr,
+                                       duk_size_t def_size,
+                                       duk_bool_t throw_flag) {
 	duk_hbuffer *h;
 	void *ret;
 	duk_size_t len;
 	duk_tval *tv;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 
 	if (out_size != NULL) {
 		*out_size = 0;
@@ -19451,7 +20702,11 @@ DUK_EXTERNAL void *duk_opt_buffer(duk_hthread *thr, duk_idx_t idx, duk_size_t *o
 	return duk_require_buffer(thr, idx, out_size);
 }
 
-DUK_EXTERNAL void *duk_get_buffer_default(duk_hthread *thr, duk_idx_t idx, duk_size_t *out_size, void *def_ptr, duk_size_t def_len) {
+DUK_EXTERNAL void *duk_get_buffer_default(duk_hthread *thr,
+                                          duk_idx_t idx,
+                                          duk_size_t *out_size,
+                                          void *def_ptr,
+                                          duk_size_t def_len) {
 	DUK_ASSERT_API_ENTRY(thr);
 
 	return duk__get_buffer_helper(thr, idx, out_size, def_ptr, def_len, 0 /*throw_flag*/);
@@ -19468,7 +20723,13 @@ DUK_EXTERNAL void *duk_require_buffer(duk_hthread *thr, duk_idx_t idx, duk_size_
  * have a NULL data pointer when its size is zero, the optional 'out_isbuffer'
  * argument allows caller to detect this reliably.
  */
-DUK_INTERNAL void *duk_get_buffer_data_raw(duk_hthread *thr, duk_idx_t idx, duk_size_t *out_size, void *def_ptr, duk_size_t def_size, duk_bool_t throw_flag, duk_bool_t *out_isbuffer) {
+DUK_INTERNAL void *duk_get_buffer_data_raw(duk_hthread *thr,
+                                           duk_idx_t idx,
+                                           duk_size_t *out_size,
+                                           void *def_ptr,
+                                           duk_size_t def_size,
+                                           duk_bool_t throw_flag,
+                                           duk_bool_t *out_isbuffer) {
 	duk_tval *tv;
 
 	DUK_ASSERT_API_ENTRY(thr);
@@ -19492,7 +20753,7 @@ DUK_INTERNAL void *duk_get_buffer_data_raw(duk_hthread *thr, duk_idx_t idx, duk_
 		if (out_isbuffer != NULL) {
 			*out_isbuffer = 1;
 		}
-		return (void *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h);  /* may be NULL (but only if size is 0) */
+		return (void *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h); /* may be NULL (but only if size is 0) */
 	}
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
 	else if (DUK_TVAL_IS_OBJECT(tv)) {
@@ -19503,10 +20764,9 @@ DUK_INTERNAL void *duk_get_buffer_data_raw(duk_hthread *thr, duk_idx_t idx, duk_
 			 * duk_hbufobj, get a validated buffer pointer/length.
 			 */
 			duk_hbufobj *h_bufobj = (duk_hbufobj *) h;
-			DUK_ASSERT_HBUFOBJ_VALID(h_bufobj);
+			DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
 
-			if (h_bufobj->buf != NULL &&
-			    DUK_HBUFOBJ_VALID_SLICE(h_bufobj)) {
+			if (h_bufobj->buf != NULL && DUK_HBUFOBJ_VALID_SLICE(h_bufobj)) {
 				duk_uint8_t *p;
 
 				p = (duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h_bufobj->buf);
@@ -19521,7 +20781,7 @@ DUK_INTERNAL void *duk_get_buffer_data_raw(duk_hthread *thr, duk_idx_t idx, duk_
 			/* if slice not fully valid, treat as error */
 		}
 	}
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 	if (throw_flag) {
 		DUK_ERROR_REQUIRE_TYPE_INDEX(thr, idx, "buffer", DUK_STR_NOT_BUFFER);
@@ -19535,7 +20795,11 @@ DUK_EXTERNAL void *duk_get_buffer_data(duk_hthread *thr, duk_idx_t idx, duk_size
 	return duk_get_buffer_data_raw(thr, idx, out_size, NULL /*def_ptr*/, 0 /*def_size*/, 0 /*throw_flag*/, NULL);
 }
 
-DUK_EXTERNAL void *duk_get_buffer_data_default(duk_hthread *thr, duk_idx_t idx, duk_size_t *out_size, void *def_ptr, duk_size_t def_size) {
+DUK_EXTERNAL void *duk_get_buffer_data_default(duk_hthread *thr,
+                                               duk_idx_t idx,
+                                               duk_size_t *out_size,
+                                               void *def_ptr,
+                                               duk_size_t def_size) {
 	DUK_ASSERT_API_ENTRY(thr);
 	return duk_get_buffer_data_raw(thr, idx, out_size, def_ptr, def_size, 0 /*throw_flag*/, NULL);
 }
@@ -19566,7 +20830,7 @@ DUK_LOCAL duk_heaphdr *duk__get_tagged_heaphdr_raw(duk_hthread *thr, duk_idx_t i
 	duk_tval *tv;
 	duk_heaphdr *ret;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 
 	tv = duk_get_tval_or_unused(thr, idx);
 	DUK_ASSERT(tv != NULL);
@@ -19575,9 +20839,8 @@ DUK_LOCAL duk_heaphdr *duk__get_tagged_heaphdr_raw(duk_hthread *thr, duk_idx_t i
 	}
 
 	ret = DUK_TVAL_GET_HEAPHDR(tv);
-	DUK_ASSERT(ret != NULL);  /* tagged null pointers should never occur */
+	DUK_ASSERT(ret != NULL); /* tagged null pointers should never occur */
 	return ret;
-
 }
 
 DUK_INTERNAL duk_hstring *duk_get_hstring(duk_hthread *thr, duk_idx_t idx) {
@@ -19801,7 +21064,7 @@ DUK_EXTERNAL void duk_require_function(duk_hthread *thr, duk_idx_t idx) {
 	}
 }
 
-DUK_INTERNAL void duk_require_constructable(duk_hthread *thr, duk_idx_t idx) {
+DUK_EXTERNAL void duk_require_constructable(duk_hthread *thr, duk_idx_t idx) {
 	duk_hobject *h;
 
 	DUK_ASSERT_API_ENTRY(thr);
@@ -19910,9 +21173,9 @@ DUK_LOCAL duk_hobject *duk__get_hobject_promote_mask_raw(duk_hthread *thr, duk_i
 	duk_uint_t val_mask;
 	duk_hobject *res;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 
-	res = duk_get_hobject(thr, idx);  /* common case, not promoted */
+	res = duk_get_hobject(thr, idx); /* common case, not promoted */
 	if (DUK_LIKELY(res != NULL)) {
 		DUK_ASSERT(res != NULL);
 		return res;
@@ -19925,7 +21188,7 @@ DUK_LOCAL duk_hobject *duk__get_hobject_promote_mask_raw(duk_hthread *thr, duk_i
 			DUK_ASSERT(res != NULL);
 			return res;
 		} else {
-			return NULL;  /* accept without promoting */
+			return NULL; /* accept without promoting */
 		}
 	}
 
@@ -19968,7 +21231,7 @@ DUK_INTERNAL duk_hobject *duk_get_hobject_with_class(duk_hthread *thr, duk_idx_t
 	duk_hobject *h;
 
 	DUK_ASSERT_API_ENTRY(thr);
-	DUK_ASSERT_DISABLE(classnum >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(classnum >= 0); /* unsigned */
 	DUK_ASSERT(classnum <= DUK_HOBJECT_CLASS_MAX);
 
 	h = (duk_hobject *) duk__get_tagged_heaphdr_raw(thr, idx, DUK_TAG_OBJECT);
@@ -19982,7 +21245,7 @@ DUK_INTERNAL duk_hobject *duk_require_hobject_with_class(duk_hthread *thr, duk_i
 	duk_hobject *h;
 
 	DUK_ASSERT_API_ENTRY(thr);
-	DUK_ASSERT_DISABLE(classnum >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(classnum >= 0); /* unsigned */
 	DUK_ASSERT(classnum <= DUK_HOBJECT_CLASS_MAX);
 
 	h = (duk_hobject *) duk__get_tagged_heaphdr_raw(thr, idx, DUK_TAG_OBJECT);
@@ -20028,7 +21291,7 @@ DUK_EXTERNAL duk_size_t duk_get_length(duk_hthread *thr, duk_idx_t idx) {
 		duk_pop_unsafe(thr);
 		return ret;
 	}
-#else  /* DUK_USE_PREFER_SIZE */
+#else /* DUK_USE_PREFER_SIZE */
 	case DUK_TAG_STRING: {
 		duk_hstring *h = DUK_TVAL_GET_STRING(tv);
 		DUK_ASSERT(h != NULL);
@@ -20054,7 +21317,7 @@ DUK_EXTERNAL duk_size_t duk_get_length(duk_hthread *thr, duk_idx_t idx) {
 		duk_pop_unsafe(thr);
 		return ret;
 	}
-#endif  /* DUK_USE_PREFER_SIZE */
+#endif /* DUK_USE_PREFER_SIZE */
 	case DUK_TAG_OBJECT: {
 		duk_hobject *h = DUK_TVAL_GET_OBJECT(tv);
 		DUK_ASSERT(h != NULL);
@@ -20086,7 +21349,7 @@ DUK_LOCAL duk_heaphdr *duk__known_heaphdr(duk_hthread *thr, duk_idx_t idx) {
 	duk_tval *tv;
 	duk_heaphdr *h;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	if (idx < 0) {
 		tv = thr->valstack_top + idx;
 	} else {
@@ -20151,8 +21414,8 @@ DUK_LOCAL duk_bool_t duk__defaultvalue_coerce_attempt(duk_hthread *thr, duk_idx_
 	if (duk_get_prop_stridx(thr, idx, func_stridx)) {
 		/* [ ... func ] */
 		if (duk_is_callable(thr, -1)) {
-			duk_dup(thr, idx);         /* -> [ ... func this ] */
-			duk_call_method(thr, 0);     /* -> [ ... retval ] */
+			duk_dup(thr, idx); /* -> [ ... func this ] */
+			duk_call_method(thr, 0); /* -> [ ... retval ] */
 			if (duk_is_primitive(thr, -1)) {
 				duk_replace(thr, idx);
 				return 1;
@@ -20160,7 +21423,7 @@ DUK_LOCAL duk_bool_t duk__defaultvalue_coerce_attempt(duk_hthread *thr, duk_idx_
 			/* [ ... retval ]; popped below */
 		}
 	}
-	duk_pop_unsafe(thr);  /* [ ... func/retval ] -> [ ... ] */
+	duk_pop_unsafe(thr); /* [ ... func/retval ] -> [ ... ] */
 	return 0;
 }
 
@@ -20171,7 +21434,7 @@ DUK_EXTERNAL void duk_to_undefined(duk_hthread *thr, duk_idx_t idx) {
 
 	tv = duk_require_tval(thr, idx);
 	DUK_ASSERT(tv != NULL);
-	DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv);  /* side effects */
+	DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv); /* side effects */
 }
 
 DUK_EXTERNAL void duk_to_null(duk_hthread *thr, duk_idx_t idx) {
@@ -20181,13 +21444,11 @@ DUK_EXTERNAL void duk_to_null(duk_hthread *thr, duk_idx_t idx) {
 
 	tv = duk_require_tval(thr, idx);
 	DUK_ASSERT(tv != NULL);
-	DUK_TVAL_SET_NULL_UPDREF(thr, tv);  /* side effects */
+	DUK_TVAL_SET_NULL_UPDREF(thr, tv); /* side effects */
 }
 
 /* E5 Section 9.1 */
-DUK_LOCAL const char * const duk__toprim_hint_strings[3] = {
-	"default", "string", "number"
-};
+DUK_LOCAL const char * const duk__toprim_hint_strings[3] = { "default", "string", "number" };
 DUK_LOCAL void duk__to_primitive_helper(duk_hthread *thr, duk_idx_t idx, duk_int_t hint, duk_bool_t check_symbol) {
 	/* Inline initializer for coercers[] is not allowed by old compilers like BCC. */
 	duk_small_uint_t coercers[2];
@@ -20198,10 +21459,8 @@ DUK_LOCAL void duk__to_primitive_helper(duk_hthread *thr, duk_idx_t idx, duk_int
 	idx = duk_require_normalize_index(thr, idx);
 
 	/* If already primitive, return as is. */
-	if (!duk_check_type_mask(thr, idx, DUK_TYPE_MASK_OBJECT |
-	                                   DUK_TYPE_MASK_LIGHTFUNC |
-	                                   DUK_TYPE_MASK_BUFFER)) {
-		DUK_ASSERT(!duk_is_buffer(thr, idx));  /* duk_to_string() relies on this behavior */
+	if (!duk_check_type_mask(thr, idx, DUK_TYPE_MASK_OBJECT | DUK_TYPE_MASK_LIGHTFUNC | DUK_TYPE_MASK_BUFFER)) {
+		DUK_ASSERT(!duk_is_buffer(thr, idx)); /* duk_to_string() relies on this behavior */
 		return;
 	}
 
@@ -20212,10 +21471,8 @@ DUK_LOCAL void duk__to_primitive_helper(duk_hthread *thr, duk_idx_t idx, duk_int
 		DUK_ASSERT(hint >= 0 && (duk_size_t) hint < sizeof(duk__toprim_hint_strings) / sizeof(const char *));
 		duk_dup(thr, idx);
 		duk_push_string(thr, duk__toprim_hint_strings[hint]);
-		duk_call_method(thr, 1);  /* [ ... method value hint ] -> [ ... res] */
-		if (duk_check_type_mask(thr, -1, DUK_TYPE_MASK_OBJECT |
-	                                         DUK_TYPE_MASK_LIGHTFUNC |
-		                                 DUK_TYPE_MASK_BUFFER)) {
+		duk_call_method(thr, 1); /* [ ... method value hint ] -> [ ... res] */
+		if (duk_check_type_mask(thr, -1, DUK_TYPE_MASK_OBJECT | DUK_TYPE_MASK_LIGHTFUNC | DUK_TYPE_MASK_BUFFER)) {
 			goto fail;
 		}
 		duk_replace(thr, idx);
@@ -20237,7 +21494,7 @@ DUK_LOCAL void duk__to_primitive_helper(duk_hthread *thr, duk_idx_t idx, duk_int
 	if (hint == DUK_HINT_NONE) {
 		hint = DUK_HINT_NUMBER;
 	}
-#else  /* DUK_USE_SYMBOL_BUILTIN */
+#else /* DUK_USE_SYMBOL_BUILTIN */
 	if (hint == DUK_HINT_NONE) {
 		duk_small_uint_t class_number;
 
@@ -20248,7 +21505,7 @@ DUK_LOCAL void duk__to_primitive_helper(duk_hthread *thr, duk_idx_t idx, duk_int
 			hint = DUK_HINT_NUMBER;
 		}
 	}
-#endif  /* DUK_USE_SYMBOL_BUILTIN */
+#endif /* DUK_USE_SYMBOL_BUILTIN */
 
 	coercers[0] = DUK_STRIDX_VALUE_OF;
 	coercers[1] = DUK_STRIDX_TO_STRING;
@@ -20258,16 +21515,16 @@ DUK_LOCAL void duk__to_primitive_helper(duk_hthread *thr, duk_idx_t idx, duk_int
 	}
 
 	if (duk__defaultvalue_coerce_attempt(thr, idx, coercers[0])) {
-		DUK_ASSERT(!duk_is_buffer(thr, idx));  /* duk_to_string() relies on this behavior */
+		DUK_ASSERT(!duk_is_buffer(thr, idx)); /* duk_to_string() relies on this behavior */
 		return;
 	}
 
 	if (duk__defaultvalue_coerce_attempt(thr, idx, coercers[1])) {
-		DUK_ASSERT(!duk_is_buffer(thr, idx));  /* duk_to_string() relies on this behavior */
+		DUK_ASSERT(!duk_is_buffer(thr, idx)); /* duk_to_string() relies on this behavior */
 		return;
 	}
 
- fail:
+fail:
 	DUK_ERROR_TYPE(thr, DUK_STR_TOPRIMITIVE_FAILED);
 	DUK_WO_NORETURN(return;);
 }
@@ -20298,7 +21555,7 @@ DUK_EXTERNAL duk_bool_t duk_to_boolean(duk_hthread *thr, duk_idx_t idx) {
 
 	/* Note: no need to re-lookup tv, conversion is side effect free. */
 	DUK_ASSERT(tv != NULL);
-	DUK_TVAL_SET_BOOLEAN_UPDREF(thr, tv, val);  /* side effects */
+	DUK_TVAL_SET_BOOLEAN_UPDREF(thr, tv, val); /* side effects */
 	return val;
 }
 
@@ -20330,11 +21587,11 @@ DUK_EXTERNAL duk_double_t duk_to_number(duk_hthread *thr, duk_idx_t idx) {
 	idx = duk_require_normalize_index(thr, idx);
 	tv = DUK_GET_TVAL_POSIDX(thr, idx);
 	DUK_ASSERT(tv != NULL);
-	d = duk_js_tonumber(thr, tv);  /* XXX: fastint coercion? now result will always be a non-fastint */
+	d = duk_js_tonumber(thr, tv); /* XXX: fastint coercion? now result will always be a non-fastint */
 
 	/* ToNumber() may have side effects so must relookup 'tv'. */
 	tv = DUK_GET_TVAL_POSIDX(thr, idx);
-	DUK_TVAL_SET_NUMBER_UPDREF(thr, tv, d);  /* side effects */
+	DUK_TVAL_SET_NUMBER_UPDREF(thr, tv, d); /* side effects */
 	return d;
 }
 
@@ -20366,13 +21623,13 @@ DUK_INTERNAL duk_double_t duk_to_number_tval(duk_hthread *thr, duk_tval *tv) {
 
 	tv_dst = thr->valstack_top++;
 	DUK_TVAL_SET_TVAL(tv_dst, tv);
-	DUK_TVAL_INCREF(thr, tv_dst);  /* decref not necessary */
-	res = duk_to_number_m1(thr);  /* invalidates tv_dst */
+	DUK_TVAL_INCREF(thr, tv_dst); /* decref not necessary */
+	res = duk_to_number_m1(thr); /* invalidates tv_dst */
 
 	tv_dst = --thr->valstack_top;
 	DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv_dst));
-	DUK_ASSERT(!DUK_TVAL_NEEDS_REFCOUNT_UPDATE(tv_dst));  /* plain number */
-	DUK_TVAL_SET_UNDEFINED(tv_dst);  /* valstack init policy */
+	DUK_ASSERT(!DUK_TVAL_NEEDS_REFCOUNT_UPDATE(tv_dst)); /* plain number */
+	DUK_TVAL_SET_UNDEFINED(tv_dst); /* valstack init policy */
 
 	return res;
 #endif
@@ -20388,7 +21645,7 @@ DUK_LOCAL duk_double_t duk__to_int_uint_helper(duk_hthread *thr, duk_idx_t idx,
 	duk_tval *tv;
 	duk_double_t d;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 
 	tv = duk_require_tval(thr, idx);
 	DUK_ASSERT(tv != NULL);
@@ -20408,7 +21665,7 @@ DUK_LOCAL duk_double_t duk__to_int_uint_helper(duk_hthread *thr, duk_idx_t idx,
 
 	/* Relookup in case coerce_func() has side effects, e.g. ends up coercing an object */
 	tv = duk_require_tval(thr, idx);
-	DUK_TVAL_SET_NUMBER_UPDREF(thr, tv, d);  /* side effects */
+	DUK_TVAL_SET_NUMBER_UPDREF(thr, tv, d); /* side effects */
 	return d;
 }
 
@@ -20442,7 +21699,7 @@ DUK_EXTERNAL duk_int32_t duk_to_int32(duk_hthread *thr, duk_idx_t idx) {
 
 	/* Relookup in case coerce_func() has side effects, e.g. ends up coercing an object */
 	tv = duk_require_tval(thr, idx);
-	DUK_TVAL_SET_I32_UPDREF(thr, tv, ret);  /* side effects */
+	DUK_TVAL_SET_I32_UPDREF(thr, tv, ret); /* side effects */
 	return ret;
 }
 
@@ -20458,7 +21715,7 @@ DUK_EXTERNAL duk_uint32_t duk_to_uint32(duk_hthread *thr, duk_idx_t idx) {
 
 	/* Relookup in case coerce_func() has side effects, e.g. ends up coercing an object */
 	tv = duk_require_tval(thr, idx);
-	DUK_TVAL_SET_U32_UPDREF(thr, tv, ret);  /* side effects */
+	DUK_TVAL_SET_U32_UPDREF(thr, tv, ret); /* side effects */
 	return ret;
 }
 
@@ -20474,7 +21731,7 @@ DUK_EXTERNAL duk_uint16_t duk_to_uint16(duk_hthread *thr, duk_idx_t idx) {
 
 	/* Relookup in case coerce_func() has side effects, e.g. ends up coercing an object */
 	tv = duk_require_tval(thr, idx);
-	DUK_TVAL_SET_U32_UPDREF(thr, tv, ret);  /* side effects */
+	DUK_TVAL_SET_U32_UPDREF(thr, tv, ret); /* side effects */
 	return ret;
 }
 
@@ -20503,19 +21760,19 @@ DUK_INTERNAL duk_uint8_t duk_to_uint8clamped(duk_hthread *thr, duk_idx_t idx) {
 	}
 
 	t = d - DUK_FLOOR(d);
-	if (t == 0.5) {
+	if (duk_double_equals(t, 0.5)) {
 		/* Exact halfway, round to even. */
 		ret = (duk_uint8_t) d;
-		ret = (ret + 1) & 0xfe;  /* Example: d=3.5, t=0.5 -> ret = (3 + 1) & 0xfe = 4 & 0xfe = 4
-		                          * Example: d=4.5, t=0.5 -> ret = (4 + 1) & 0xfe = 5 & 0xfe = 4
-		                          */
+		ret = (ret + 1) & 0xfe; /* Example: d=3.5, t=0.5 -> ret = (3 + 1) & 0xfe = 4 & 0xfe = 4
+		                         * Example: d=4.5, t=0.5 -> ret = (4 + 1) & 0xfe = 5 & 0xfe = 4
+		                         */
 	} else {
 		/* Not halfway, round to nearest. */
 		ret = (duk_uint8_t) (d + 0.5);
 	}
 	return ret;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 DUK_EXTERNAL const char *duk_to_lstring(duk_hthread *thr, duk_idx_t idx, duk_size_t *out_len) {
 	DUK_ASSERT_API_ENTRY(thr);
@@ -20526,10 +21783,10 @@ DUK_EXTERNAL const char *duk_to_lstring(duk_hthread *thr, duk_idx_t idx, duk_siz
 }
 
 DUK_LOCAL duk_ret_t duk__safe_to_string_raw(duk_hthread *thr, void *udata) {
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	DUK_UNREF(udata);
 
-	duk_to_string(thr, -1);
+	(void) duk_to_string(thr, -1);
 	return 1;
 }
 
@@ -20566,12 +21823,66 @@ DUK_EXTERNAL const char *duk_safe_to_lstring(duk_hthread *thr, duk_idx_t idx, du
 	return duk_get_lstring(thr, idx, out_len);
 }
 
+DUK_EXTERNAL const char *duk_to_stacktrace(duk_hthread *thr, duk_idx_t idx) {
+	DUK_ASSERT_API_ENTRY(thr);
+	idx = duk_require_normalize_index(thr, idx);
+
+	/* The expected argument to the call is an Error object.  The stack
+	 * trace is extracted without an inheritance-based instanceof check
+	 * so that one can also extract the stack trace of a foreign error
+	 * created in another Realm.  Accept only a string .stack property.
+	 */
+	if (duk_is_object(thr, idx)) {
+		(void) duk_get_prop_string(thr, idx, "stack");
+		if (duk_is_string(thr, -1)) {
+			duk_replace(thr, idx);
+		} else {
+			duk_pop(thr);
+		}
+	}
+
+	return duk_to_string(thr, idx);
+}
+
+DUK_LOCAL duk_ret_t duk__safe_to_stacktrace_raw(duk_hthread *thr, void *udata) {
+	DUK_CTX_ASSERT_VALID(thr);
+	DUK_UNREF(udata);
+
+	(void) duk_to_stacktrace(thr, -1);
+
+	return 1;
+}
+
+DUK_EXTERNAL const char *duk_safe_to_stacktrace(duk_hthread *thr, duk_idx_t idx) {
+	duk_int_t rc;
+
+	DUK_ASSERT_API_ENTRY(thr);
+	idx = duk_require_normalize_index(thr, idx);
+
+	duk_dup(thr, idx);
+	rc = duk_safe_call(thr, duk__safe_to_stacktrace_raw, NULL /*udata*/, 1 /*nargs*/, 1 /*nrets*/);
+	if (rc != 0) {
+		/* Coercion failed.  Try to coerce the coercion itself error
+		 * to a stack trace once.  If that also fails, return a fixed,
+		 * preallocated 'Error' string to avoid potential infinite loop.
+		 */
+		rc = duk_safe_call(thr, duk__safe_to_stacktrace_raw, NULL /*udata*/, 1 /*nargs*/, 1 /*nrets*/);
+		if (rc != 0) {
+			duk_pop_unsafe(thr);
+			duk_push_hstring_stridx(thr, DUK_STRIDX_UC_ERROR);
+		}
+	}
+	duk_replace(thr, idx);
+
+	return duk_get_string(thr, idx);
+}
+
 DUK_INTERNAL duk_hstring *duk_to_property_key_hstring(duk_hthread *thr, duk_idx_t idx) {
 	duk_hstring *h;
 
 	DUK_ASSERT_API_ENTRY(thr);
 
-	duk_to_primitive(thr, idx, DUK_HINT_STRING);  /* needed for e.g. Symbol objects */
+	duk_to_primitive(thr, idx, DUK_HINT_STRING); /* needed for e.g. Symbol objects */
 	h = duk_get_hstring(thr, idx);
 	if (h == NULL) {
 		/* The "is string?" check may seem unnecessary, but as things
@@ -20585,7 +21896,7 @@ DUK_INTERNAL duk_hstring *duk_to_property_key_hstring(duk_hthread *thr, duk_idx_
 	return h;
 }
 
-#if defined(DUK_USE_DEBUGGER_SUPPORT)  /* only needed by debugger for now */
+#if defined(DUK_USE_DEBUGGER_SUPPORT) /* only needed by debugger for now */
 DUK_INTERNAL duk_hstring *duk_safe_to_hstring(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ASSERT_API_ENTRY(thr);
 
@@ -20597,134 +21908,6 @@ DUK_INTERNAL duk_hstring *duk_safe_to_hstring(duk_hthread *thr, duk_idx_t idx) {
 #endif
 
 /* Push Object.prototype.toString() output for 'tv'. */
-#if 0  /* See XXX note why this variant doesn't work. */
-DUK_INTERNAL void duk_push_class_string_tval(duk_hthread *thr, duk_tval *tv, duk_bool_t avoid_side_effects) {
-	duk_uint_t stridx_bidx = 0;  /* (prototype_bidx << 16) + default_tag_stridx */
-
-	DUK_ASSERT_API_ENTRY(thr);
-
-	/* Conceptually for any non-undefined/null value we should do a
-	 * ToObject() coercion and look up @@toStringTag (from the object
-	 * prototype) to see if a custom tag should be used.  Avoid the
-	 * actual conversion by doing a prototype lookup without the object
-	 * coercion.  However, see problem below.
-	 */
-
-	duk_push_literal(thr, "[object ");  /* -> [ ... "[object" ] */
-
-	switch (DUK_TVAL_GET_TAG(tv)) {
-	case DUK_TAG_UNUSED:  /* Treat like 'undefined', shouldn't happen. */
-	case DUK_TAG_UNDEFINED: {
-		stridx_bidx = DUK_STRIDX_UC_UNDEFINED;
-		goto use_stridx;
-	}
-	case DUK_TAG_NULL: {
-		stridx_bidx = DUK_STRIDX_UC_NULL;
-		goto use_stridx;
-	}
-	case DUK_TAG_BOOLEAN: {
-		stridx_bidx = (DUK_BIDX_BOOLEAN_PROTOTYPE << 16) + DUK_STRIDX_UC_BOOLEAN;
-		goto use_proto_bidx;
-	}
-	case DUK_TAG_POINTER: {
-		stridx_bidx = (DUK_BIDX_POINTER_PROTOTYPE << 16) + DUK_STRIDX_UC_POINTER;
-		goto use_proto_bidx;
-	}
-	case DUK_TAG_LIGHTFUNC: {
-		stridx_bidx = (DUK_BIDX_FUNCTION_PROTOTYPE << 16) + DUK_STRIDX_UC_FUNCTION;
-		goto use_proto_bidx;
-	}
-	case DUK_TAG_STRING: {
-		duk_hstring *h;
-		h = DUK_TVAL_GET_STRING(tv);
-		DUK_ASSERT(h != NULL);
-		if (DUK_UNLIKELY(DUK_HSTRING_HAS_SYMBOL(h))) {
-			/* Even without DUK_USE_SYMBOL_BUILTIN the Symbol
-			 * prototype exists so we can lookup @@toStringTag
-			 * and provide [object Symbol] for symbol values
-			 * created from C code.
-			 */
-			stridx_bidx = (DUK_BIDX_SYMBOL_PROTOTYPE << 16) + DUK_STRIDX_UC_SYMBOL;
-		} else {
-			stridx_bidx = (DUK_BIDX_STRING_PROTOTYPE << 16) + DUK_STRIDX_UC_STRING;
-		}
-		goto use_proto_bidx;
-	}
-	case DUK_TAG_OBJECT: {
-		duk_push_tval(thr, tv);
-		stridx_bidx = 0xffffffffUL;  /* Marker value. */
-		goto use_pushed_object;
-	}
-	case DUK_TAG_BUFFER: {
-		stridx_bidx = (DUK_BIDX_UINT8ARRAY_PROTOTYPE << 16) + DUK_STRIDX_UINT8_ARRAY;
-		goto use_proto_bidx;
-	}
-#if defined(DUK_USE_FASTINT)
-	case DUK_TAG_FASTINT:
-		/* Fall through to generic number case. */
-#endif
-	default: {
-		DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));  /* number (maybe fastint) */
-		stridx_bidx = (DUK_BIDX_NUMBER_PROTOTYPE << 16) + DUK_STRIDX_UC_NUMBER;
-		goto use_proto_bidx;
-	}
-	}
-	DUK_ASSERT(0);  /* Never here. */
-
- use_proto_bidx:
-	DUK_ASSERT_BIDX_VALID((stridx_bidx >> 16) & 0xffffUL);
-	duk_push_hobject(thr, thr->builtins[(stridx_bidx >> 16) & 0xffffUL]);
-	/* Fall through. */
-
- use_pushed_object:
-	/* [ ... "[object" obj ] */
-
-#if defined(DUK_USE_SYMBOL_BUILTIN)
-	/* XXX: better handling with avoid_side_effects == 1; lookup tval
-	 * without Proxy or getter side effects, and use it in sanitized
-	 * form if it's a string.
-	 */
-	if (!avoid_side_effects) {
-		/* XXX: The problem with using the prototype object as the
-		 * lookup base is that if @@toStringTag is a getter, its
-		 * 'this' binding must be the ToObject() coerced input value,
-		 * not the prototype object of the type.
-		 */
-		(void) duk_get_prop_stridx(thr, -1, DUK_STRIDX_WELLKNOWN_SYMBOL_TO_STRING_TAG);
-		if (duk_is_string_notsymbol(thr, -1)) {
-			duk_remove_m2(thr);
-			goto finish;
-		}
-		duk_pop_unsafe(thr);
-	}
-#endif
-
-	if (stridx_bidx == 0xffffffffUL) {
-		duk_hobject *h_obj;
-		duk_small_uint_t classnum;
-
-		h_obj = duk_known_hobject(thr, -1);
-		DUK_ASSERT(h_obj != NULL);
-		classnum = DUK_HOBJECT_GET_CLASS_NUMBER(h_obj);
-		stridx_bidx = DUK_HOBJECT_CLASS_NUMBER_TO_STRIDX(classnum);
-	} else {
-		/* stridx_bidx already has the desired fallback stridx. */
-		;
-	}
-	duk_pop_unsafe(thr);
-	/* Fall through. */
-
- use_stridx:
-	/* [ ... "[object" ] */
-	duk_push_hstring_stridx(thr, stridx_bidx & 0xffffUL);
-
- finish:
-	/* [ ... "[object" tag ] */
-	duk_push_literal(thr, "]");
-	duk_concat(thr, 3);  /* [ ... "[object" tag "]" ] -> [ ... res ] */
-}
-#endif  /* 0 */
-
 DUK_INTERNAL void duk_push_class_string_tval(duk_hthread *thr, duk_tval *tv, duk_bool_t avoid_side_effects) {
 	duk_hobject *h_obj;
 	duk_small_uint_t classnum;
@@ -20740,11 +21923,13 @@ DUK_INTERNAL void duk_push_class_string_tval(duk_hthread *thr, duk_tval *tv, duk
 
 	/* Conceptually for any non-undefined/null value we should do a
 	 * ToObject() coercion and look up @@toStringTag (from the object
-	 * prototype) to see if a custom result should be used.  We'd like to
-	 * avoid the actual conversion, but even for primitive types the
-	 * prototype may have @@toStringTag.  What's worse, the @@toStringTag
-	 * property may be a getter that must get the object coerced value
-	 * (not the prototype) as its 'this' binding.
+	 * prototype) to see if a custom result should be used, with the
+	 * exception of Arrays which are handled specially first.
+	 *
+	 * We'd like to avoid the actual conversion, but even for primitive
+	 * types the prototype may have @@toStringTag.  What's worse, the
+	 * @@toStringTag property may be a getter that must get the object
+	 * coerced value (not the prototype) as its 'this' binding.
 	 *
 	 * For now, do an actual object coercion.  This could be avoided by
 	 * doing a side effect free lookup to see if a getter would be invoked.
@@ -20753,10 +21938,10 @@ DUK_INTERNAL void duk_push_class_string_tval(duk_hthread *thr, duk_tval *tv, duk
 	 * Object.prototype.toString() is usually not performance critical.
 	 */
 
-	duk_push_literal(thr, "[object ");  /* -> [ ... "[object" ] */
+	duk_push_literal(thr, "[object "); /* -> [ ... "[object" ] */
 
 	switch (DUK_TVAL_GET_TAG(tv)) {
-	case DUK_TAG_UNUSED:  /* Treat like 'undefined', shouldn't happen. */
+	case DUK_TAG_UNUSED: /* Treat like 'undefined', shouldn't happen. */
 	case DUK_TAG_UNDEFINED: {
 		duk_push_hstring_stridx(thr, DUK_STRIDX_UC_UNDEFINED);
 		goto finish;
@@ -20768,43 +21953,46 @@ DUK_INTERNAL void duk_push_class_string_tval(duk_hthread *thr, duk_tval *tv, duk
 	}
 
 	duk_push_tval(thr, tv);
-	tv = NULL;  /* Invalidated by ToObject(). */
-	duk_to_object(thr, -1);
-
-	/* [ ... "[object" obj ] */
+	tv = NULL; /* Invalidated by ToObject(). */
+	h_obj = duk_to_hobject(thr, -1);
+	DUK_ASSERT(h_obj != NULL);
+	if (duk_js_isarray_hobject(h_obj)) {
+		stridx = DUK_STRIDX_UC_ARRAY;
+	} else {
+		/* [ ... "[object" obj ] */
 
 #if defined(DUK_USE_SYMBOL_BUILTIN)
-	/* XXX: better handling with avoid_side_effects == 1; lookup tval
-	 * without Proxy or getter side effects, and use it in sanitized
-	 * form if it's a string.
-	 */
-	if (!avoid_side_effects) {
-		(void) duk_get_prop_stridx(thr, -1, DUK_STRIDX_WELLKNOWN_SYMBOL_TO_STRING_TAG);
-		if (duk_is_string_notsymbol(thr, -1)) {
-			duk_remove_m2(thr);
-			goto finish;
+		/* XXX: better handling with avoid_side_effects == 1; lookup tval
+		 * without Proxy or getter side effects, and use it in sanitized
+		 * form if it's a string.
+		 */
+		if (!avoid_side_effects) {
+			(void) duk_get_prop_stridx(thr, -1, DUK_STRIDX_WELLKNOWN_SYMBOL_TO_STRING_TAG);
+			if (duk_is_string_notsymbol(thr, -1)) {
+				duk_remove_m2(thr);
+				goto finish;
+			}
+			duk_pop_unsafe(thr);
 		}
-		duk_pop_unsafe(thr);
-	}
 #else
-	DUK_UNREF(avoid_side_effects);
+		DUK_UNREF(avoid_side_effects);
 #endif
 
-	h_obj = duk_known_hobject(thr, -1);
-	DUK_ASSERT(h_obj != NULL);
-	classnum = DUK_HOBJECT_GET_CLASS_NUMBER(h_obj);
-	stridx = DUK_HOBJECT_CLASS_NUMBER_TO_STRIDX(classnum);
+		classnum = DUK_HOBJECT_GET_CLASS_NUMBER(h_obj);
+		stridx = DUK_HOBJECT_CLASS_NUMBER_TO_STRIDX(classnum);
+	}
 	duk_pop_unsafe(thr);
 	duk_push_hstring_stridx(thr, stridx);
 
- finish:
+finish:
 	/* [ ... "[object" tag ] */
 	duk_push_literal(thr, "]");
-	duk_concat(thr, 3);  /* [ ... "[object" tag "]" ] -> [ ... res ] */
+	duk_concat(thr, 3); /* [ ... "[object" tag "]" ] -> [ ... res ] */
 }
 
 /* XXX: other variants like uint, u32 etc */
-DUK_INTERNAL duk_int_t duk_to_int_clamped_raw(duk_hthread *thr, duk_idx_t idx, duk_int_t minval, duk_int_t maxval, duk_bool_t *out_clamped) {
+DUK_INTERNAL duk_int_t
+duk_to_int_clamped_raw(duk_hthread *thr, duk_idx_t idx, duk_int_t minval, duk_int_t maxval, duk_bool_t *out_clamped) {
 	duk_tval *tv;
 	duk_tval tv_tmp;
 	duk_double_t d, dmin, dmax;
@@ -20815,7 +22003,7 @@ DUK_INTERNAL duk_int_t duk_to_int_clamped_raw(duk_hthread *thr, duk_idx_t idx, d
 
 	tv = duk_require_tval(thr, idx);
 	DUK_ASSERT(tv != NULL);
-	d = duk_js_tointeger(thr, tv);  /* E5 Section 9.4, ToInteger() */
+	d = duk_js_tointeger(thr, tv); /* E5 Section 9.4, ToInteger() */
 
 	dmin = (duk_double_t) minval;
 	dmax = (duk_double_t) maxval;
@@ -20831,12 +22019,12 @@ DUK_INTERNAL duk_int_t duk_to_int_clamped_raw(duk_hthread *thr, duk_idx_t idx, d
 	} else {
 		res = (duk_int_t) d;
 	}
-	DUK_UNREF(d);  /* SCANBUILD: with suitable dmin/dmax limits 'd' is unused */
+	DUK_UNREF(d); /* SCANBUILD: with suitable dmin/dmax limits 'd' is unused */
 	/* 'd' and 'res' agree here */
 
 	/* Relookup in case duk_js_tointeger() ends up e.g. coercing an object. */
 	tv = duk_get_tval(thr, idx);
-	DUK_ASSERT(tv != NULL);  /* not popped by side effect */
+	DUK_ASSERT(tv != NULL); /* not popped by side effect */
 	DUK_TVAL_SET_TVAL(&tv_tmp, tv);
 #if defined(DUK_USE_FASTINT)
 #if (DUK_INT_MAX <= 0x7fffffffL)
@@ -20850,9 +22038,9 @@ DUK_INTERNAL duk_int_t duk_to_int_clamped_raw(duk_hthread *thr, duk_idx_t idx, d
 	}
 #endif
 #else
-	DUK_TVAL_SET_NUMBER(tv, d);  /* no need to incref */
+	DUK_TVAL_SET_NUMBER(tv, d); /* no need to incref */
 #endif
-	DUK_TVAL_DECREF(thr, &tv_tmp);  /* side effects */
+	DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */
 
 	if (out_clamped) {
 		*out_clamped = clamped;
@@ -20877,7 +22065,7 @@ DUK_INTERNAL duk_int_t duk_to_int_clamped(duk_hthread *thr, duk_idx_t idx, duk_i
 
 DUK_INTERNAL duk_int_t duk_to_int_check_range(duk_hthread *thr, duk_idx_t idx, duk_int_t minval, duk_int_t maxval) {
 	DUK_ASSERT_API_ENTRY(thr);
-	return duk_to_int_clamped_raw(thr, idx, minval, maxval, NULL);  /* out_clamped==NULL -> RangeError if outside range */
+	return duk_to_int_clamped_raw(thr, idx, minval, maxval, NULL); /* out_clamped==NULL -> RangeError if outside range */
 }
 
 DUK_EXTERNAL const char *duk_to_string(duk_hthread *thr, duk_idx_t idx) {
@@ -20936,9 +22124,9 @@ DUK_EXTERNAL const char *duk_to_string(duk_hthread *thr, duk_idx_t idx) {
 		 * value, and duk_to_string() then causes a TypeError.
 		 */
 		duk_to_primitive(thr, idx, DUK_HINT_STRING);
-		DUK_ASSERT(!duk_is_buffer(thr, idx));  /* ToPrimitive() must guarantee */
+		DUK_ASSERT(!duk_is_buffer(thr, idx)); /* ToPrimitive() must guarantee */
 		DUK_ASSERT(!duk_is_object(thr, idx));
-		return duk_to_string(thr, idx);  /* Note: recursive call */
+		return duk_to_string(thr, idx); /* Note: recursive call */
 	}
 	case DUK_TAG_POINTER: {
 		void *ptr = DUK_TVAL_GET_POINTER(tv);
@@ -20966,17 +22154,14 @@ DUK_EXTERNAL const char *duk_to_string(duk_hthread *thr, duk_idx_t idx) {
 		DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv));
 		DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
 		duk_push_tval(thr, tv);
-		duk_numconv_stringify(thr,
-		                      10 /*radix*/,
-		                      0 /*precision:shortest*/,
-		                      0 /*force_exponential*/);
+		duk_numconv_stringify(thr, 10 /*radix*/, 0 /*precision:shortest*/, 0 /*force_exponential*/);
 		break;
 	}
 	}
 
 	duk_replace(thr, idx);
 
- skip_replace:
+skip_replace:
 	DUK_ASSERT(duk_is_string(thr, idx));
 	return duk_require_string(thr, idx);
 }
@@ -21058,8 +22243,7 @@ DUK_EXTERNAL void *duk_to_buffer_raw(duk_hthread *thr, duk_idx_t idx, duk_size_t
 		src_size = DUK_HBUFFER_GET_SIZE(h_buf);
 
 		tmp = (DUK_HBUFFER_HAS_DYNAMIC(h_buf) ? DUK_BUF_MODE_DYNAMIC : DUK_BUF_MODE_FIXED);
-		if ((tmp == mode && !DUK_HBUFFER_HAS_EXTERNAL(h_buf)) ||
-		    mode == DUK_BUF_MODE_DONTCARE) {
+		if ((tmp == mode && !DUK_HBUFFER_HAS_EXTERNAL(h_buf)) || mode == DUK_BUF_MODE_DONTCARE) {
 			/* Note: src_data may be NULL if input is a zero-size
 			 * dynamic buffer.
 			 */
@@ -21080,7 +22264,7 @@ DUK_EXTERNAL void *duk_to_buffer_raw(duk_hthread *thr, duk_idx_t idx, duk_size_t
 	duk_memcpy_unsafe((void *) dst_data, (const void *) src_data, (size_t) src_size);
 
 	duk_replace(thr, idx);
- skip_copy:
+skip_copy:
 
 	if (out_size) {
 		*out_size = src_size;
@@ -21140,7 +22324,7 @@ DUK_EXTERNAL void *duk_to_pointer(duk_hthread *thr, duk_idx_t idx) {
 
 DUK_LOCAL void duk__push_func_from_lightfunc(duk_hthread *thr, duk_c_function func, duk_small_uint_t lf_flags) {
 	duk_idx_t nargs;
-	duk_uint_t flags = 0;   /* shared flags for a subset of types */
+	duk_uint_t flags = 0; /* shared flags for a subset of types */
 	duk_small_uint_t lf_len;
 	duk_hnatfunc *nf;
 
@@ -21149,15 +22333,9 @@ DUK_LOCAL void duk__push_func_from_lightfunc(duk_hthread *thr, duk_c_function fu
 		nargs = (duk_idx_t) DUK_VARARGS;
 	}
 
-	flags = DUK_HOBJECT_FLAG_EXTENSIBLE |
-	        DUK_HOBJECT_FLAG_CONSTRUCTABLE |
-	        DUK_HOBJECT_FLAG_CALLABLE |
-	        DUK_HOBJECT_FLAG_FASTREFS |
-	        DUK_HOBJECT_FLAG_NATFUNC |
-	        DUK_HOBJECT_FLAG_NEWENV |
-	        DUK_HOBJECT_FLAG_STRICT |
-	        DUK_HOBJECT_FLAG_NOTAIL |
-	        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_FUNCTION);
+	flags = DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_CONSTRUCTABLE | DUK_HOBJECT_FLAG_CALLABLE |
+	        DUK_HOBJECT_FLAG_FASTREFS | DUK_HOBJECT_FLAG_NATFUNC | DUK_HOBJECT_FLAG_NEWENV | DUK_HOBJECT_FLAG_STRICT |
+	        DUK_HOBJECT_FLAG_NOTAIL | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_FUNCTION);
 	(void) duk__push_c_function_raw(thr, func, nargs, flags, DUK_BIDX_NATIVE_FUNCTION_PROTOTYPE);
 
 	lf_len = DUK_LFUNC_FLAGS_GET_LENGTH(lf_flags);
@@ -21178,7 +22356,7 @@ DUK_LOCAL void duk__push_func_from_lightfunc(duk_hthread *thr, duk_c_function fu
 
 DUK_EXTERNAL void duk_to_object(duk_hthread *thr, duk_idx_t idx) {
 	duk_tval *tv;
-	duk_uint_t flags = 0;   /* shared flags for a subset of types */
+	duk_uint_t flags = 0; /* shared flags for a subset of types */
 	duk_small_int_t proto = 0;
 
 	DUK_ASSERT_API_ENTRY(thr);
@@ -21189,7 +22367,7 @@ DUK_EXTERNAL void duk_to_object(duk_hthread *thr, duk_idx_t idx) {
 
 	switch (DUK_TVAL_GET_TAG(tv)) {
 #if !defined(DUK_USE_BUFFEROBJECT_SUPPORT)
-	case DUK_TAG_BUFFER:  /* With no bufferobject support, don't object coerce. */
+	case DUK_TAG_BUFFER: /* With no bufferobject support, don't object coerce. */
 #endif
 	case DUK_TAG_UNDEFINED:
 	case DUK_TAG_NULL: {
@@ -21198,9 +22376,8 @@ DUK_EXTERNAL void duk_to_object(duk_hthread *thr, duk_idx_t idx) {
 		break;
 	}
 	case DUK_TAG_BOOLEAN: {
-		flags = DUK_HOBJECT_FLAG_EXTENSIBLE |
-		        DUK_HOBJECT_FLAG_FASTREFS |
-		        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_BOOLEAN);
+		flags =
+		    DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_BOOLEAN);
 		proto = DUK_BIDX_BOOLEAN_PROTOTYPE;
 		goto create_object;
 	}
@@ -21209,14 +22386,11 @@ DUK_EXTERNAL void duk_to_object(duk_hthread *thr, duk_idx_t idx) {
 		h = DUK_TVAL_GET_STRING(tv);
 		DUK_ASSERT(h != NULL);
 		if (DUK_UNLIKELY(DUK_HSTRING_HAS_SYMBOL(h))) {
-			flags = DUK_HOBJECT_FLAG_EXTENSIBLE |
-			        DUK_HOBJECT_FLAG_FASTREFS |
+			flags = DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS |
 			        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_SYMBOL);
 			proto = DUK_BIDX_SYMBOL_PROTOTYPE;
 		} else {
-			flags = DUK_HOBJECT_FLAG_EXTENSIBLE |
-			        DUK_HOBJECT_FLAG_FASTREFS |
-			        DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ |
+			flags = DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS | DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ |
 			        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_STRING);
 			proto = DUK_BIDX_STRING_PROTOTYPE;
 		}
@@ -21242,11 +22416,10 @@ DUK_EXTERNAL void duk_to_object(duk_hthread *thr, duk_idx_t idx) {
 		duk_hbufobj_push_uint8array_from_plain(thr, h_buf);
 		goto replace_value;
 	}
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 	case DUK_TAG_POINTER: {
-		flags = DUK_HOBJECT_FLAG_EXTENSIBLE |
-		        DUK_HOBJECT_FLAG_FASTREFS |
-		        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_POINTER);
+		flags =
+		    DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_POINTER);
 		proto = DUK_BIDX_POINTER_PROTOTYPE;
 		goto create_object;
 	}
@@ -21273,9 +22446,8 @@ DUK_EXTERNAL void duk_to_object(duk_hthread *thr, duk_idx_t idx) {
 	default: {
 		DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv));
 		DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
-		flags = DUK_HOBJECT_FLAG_EXTENSIBLE |
-		        DUK_HOBJECT_FLAG_FASTREFS |
-		        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_NUMBER);
+		flags =
+		    DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_NUMBER);
 		proto = DUK_BIDX_NUMBER_PROTOTYPE;
 		goto create_object;
 	}
@@ -21283,7 +22455,7 @@ DUK_EXTERNAL void duk_to_object(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ASSERT(duk_is_object(thr, idx));
 	return;
 
- create_object:
+create_object:
 	(void) duk_push_object_helper(thr, flags, proto);
 
 	/* Note: Boolean prototype's internal value property is not writable,
@@ -21296,7 +22468,7 @@ DUK_EXTERNAL void duk_to_object(duk_hthread *thr, duk_idx_t idx) {
 	duk_dup(thr, idx);
 	duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_INT_VALUE, DUK_PROPDESC_FLAGS_NONE);
 
- replace_value:
+replace_value:
 	duk_replace(thr, idx);
 	DUK_ASSERT(duk_is_object(thr, idx));
 }
@@ -21367,11 +22539,11 @@ DUK_INTERNAL duk_int_t duk_get_type_tval(duk_tval *tv) {
 		DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
 		return DUK_TYPE_NUMBER;
 	}
-#else  /* DUK_USE_PACKED_TVAL */
+#else /* DUK_USE_PACKED_TVAL */
 	DUK_ASSERT(DUK_TVAL_IS_VALID_TAG(tv));
 	DUK_ASSERT(sizeof(duk__type_from_tag) / sizeof(duk_uint_t) == DUK_TAG_MAX - DUK_TAG_MIN + 1);
 	return (duk_int_t) duk__type_from_tag[DUK_TVAL_GET_TAG(tv) - DUK_TAG_MIN];
-#endif  /* DUK_USE_PACKED_TVAL */
+#endif /* DUK_USE_PACKED_TVAL */
 }
 
 DUK_EXTERNAL duk_int_t duk_get_type(duk_hthread *thr, duk_idx_t idx) {
@@ -21386,18 +22558,8 @@ DUK_EXTERNAL duk_int_t duk_get_type(duk_hthread *thr, duk_idx_t idx) {
 }
 
 #if defined(DUK_USE_VERBOSE_ERRORS) && defined(DUK_USE_PARANOID_ERRORS)
-DUK_LOCAL const char * const duk__type_names[] = {
-	"none",
-	"undefined",
-	"null",
-	"boolean",
-	"number",
-	"string",
-	"object",
-	"buffer",
-	"pointer",
-	"lightfunc"
-};
+DUK_LOCAL const char * const duk__type_names[] = { "none",   "undefined", "null",   "boolean", "number",
+	                                           "string", "object",    "buffer", "pointer", "lightfunc" };
 
 DUK_INTERNAL const char *duk_get_type_name(duk_hthread *thr, duk_idx_t idx) {
 	duk_int_t type_tag;
@@ -21410,7 +22572,7 @@ DUK_INTERNAL const char *duk_get_type_name(duk_hthread *thr, duk_idx_t idx) {
 
 	return duk__type_names[type_tag];
 }
-#endif  /* DUK_USE_VERBOSE_ERRORS && DUK_USE_PARANOID_ERRORS */
+#endif /* DUK_USE_VERBOSE_ERRORS && DUK_USE_PARANOID_ERRORS */
 
 DUK_INTERNAL duk_small_uint_t duk_get_class_number(duk_hthread *thr, duk_idx_t idx) {
 	duk_tval *tv;
@@ -21476,11 +22638,11 @@ DUK_INTERNAL duk_uint_t duk_get_type_mask_tval(duk_tval *tv) {
 		DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
 		return DUK_TYPE_MASK_NUMBER;
 	}
-#else  /* DUK_USE_PACKED_TVAL */
+#else /* DUK_USE_PACKED_TVAL */
 	DUK_ASSERT(DUK_TVAL_IS_VALID_TAG(tv));
 	DUK_ASSERT(sizeof(duk__type_mask_from_tag) / sizeof(duk_uint_t) == DUK_TAG_MAX - DUK_TAG_MIN + 1);
 	return duk__type_mask_from_tag[DUK_TVAL_GET_TAG(tv) - DUK_TAG_MIN];
-#endif  /* DUK_USE_PACKED_TVAL */
+#endif /* DUK_USE_PACKED_TVAL */
 }
 
 DUK_EXTERNAL duk_uint_t duk_get_type_mask(duk_hthread *thr, duk_idx_t idx) {
@@ -21599,14 +22761,14 @@ DUK_EXTERNAL duk_bool_t duk_is_buffer_data(duk_hthread *thr, duk_idx_t idx) {
 	}
 	return 0;
 }
-#else  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
 DUK_EXTERNAL duk_bool_t duk_is_buffer_data(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ASSERT_API_ENTRY(thr);
 
 	return duk_is_buffer(thr, idx);
 }
 
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 DUK_EXTERNAL duk_bool_t duk_is_pointer(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ASSERT_API_ENTRY(thr);
@@ -21632,14 +22794,15 @@ DUK_EXTERNAL duk_bool_t duk_is_symbol(duk_hthread *thr, duk_idx_t idx) {
 	return 0;
 }
 
+/* IsArray(), returns true for Array instance or Proxy of Array instance. */
 DUK_EXTERNAL duk_bool_t duk_is_array(duk_hthread *thr, duk_idx_t idx) {
-	duk_hobject *obj;
+	duk_tval *tv;
 
 	DUK_ASSERT_API_ENTRY(thr);
 
-	obj = duk_get_hobject(thr, idx);
-	if (obj) {
-		return (DUK_HOBJECT_GET_CLASS_NUMBER(obj) == DUK_HOBJECT_CLASS_ARRAY ? 1 : 0);
+	tv = duk_get_tval(thr, idx);
+	if (tv) {
+		return duk_js_isarray(tv);
 	}
 	return 0;
 }
@@ -21699,23 +22862,17 @@ DUK_EXTERNAL duk_bool_t duk_is_constructable(duk_hthread *thr, duk_idx_t idx) {
 
 DUK_EXTERNAL duk_bool_t duk_is_c_function(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ASSERT_API_ENTRY(thr);
-	return duk__obj_flag_any_default_false(thr,
-	                                       idx,
-	                                       DUK_HOBJECT_FLAG_NATFUNC);
+	return duk__obj_flag_any_default_false(thr, idx, DUK_HOBJECT_FLAG_NATFUNC);
 }
 
 DUK_EXTERNAL duk_bool_t duk_is_ecmascript_function(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ASSERT_API_ENTRY(thr);
-	return duk__obj_flag_any_default_false(thr,
-	                                       idx,
-	                                       DUK_HOBJECT_FLAG_COMPFUNC);
+	return duk__obj_flag_any_default_false(thr, idx, DUK_HOBJECT_FLAG_COMPFUNC);
 }
 
 DUK_EXTERNAL duk_bool_t duk_is_bound_function(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ASSERT_API_ENTRY(thr);
-	return duk__obj_flag_any_default_false(thr,
-	                                       idx,
-	                                       DUK_HOBJECT_FLAG_BOUNDFUNC);
+	return duk__obj_flag_any_default_false(thr, idx, DUK_HOBJECT_FLAG_BOUNDFUNC);
 }
 
 DUK_EXTERNAL duk_bool_t duk_is_thread(duk_hthread *thr, duk_idx_t idx) {
@@ -21832,7 +22989,7 @@ DUK_INTERNAL void duk_push_tval(duk_hthread *thr, duk_tval *tv) {
 	DUK__CHECK_SPACE();
 	tv_slot = thr->valstack_top++;
 	DUK_TVAL_SET_TVAL(tv_slot, tv);
-	DUK_TVAL_INCREF(thr, tv);  /* no side effects */
+	DUK_TVAL_INCREF(thr, tv); /* no side effects */
 }
 
 DUK_EXTERNAL void duk_push_undefined(duk_hthread *thr) {
@@ -21862,7 +23019,7 @@ DUK_EXTERNAL void duk_push_boolean(duk_hthread *thr, duk_bool_t val) {
 
 	DUK_ASSERT_API_ENTRY(thr);
 	DUK__CHECK_SPACE();
-	b = (val ? 1 : 0);  /* ensure value is 1 or 0 (not other non-zero) */
+	b = (val ? 1 : 0); /* ensure value is 1 or 0 (not other non-zero) */
 	tv_slot = thr->valstack_top++;
 	DUK_TVAL_SET_BOOLEAN(tv_slot, b);
 }
@@ -21915,7 +23072,7 @@ DUK_EXTERNAL void duk_push_int(duk_hthread *thr, duk_int_t val) {
 		DUK_TVAL_SET_NUMBER(tv_slot, d);
 	}
 #endif
-#else  /* DUK_USE_FASTINT */
+#else /* DUK_USE_FASTINT */
 	duk_tval *tv_slot;
 	duk_double_t d;
 
@@ -21924,7 +23081,7 @@ DUK_EXTERNAL void duk_push_int(duk_hthread *thr, duk_int_t val) {
 	d = (duk_double_t) val;
 	tv_slot = thr->valstack_top++;
 	DUK_TVAL_SET_NUMBER(tv_slot, d);
-#endif  /* DUK_USE_FASTINT */
+#endif /* DUK_USE_FASTINT */
 }
 
 DUK_EXTERNAL void duk_push_uint(duk_hthread *thr, duk_uint_t val) {
@@ -21937,7 +23094,7 @@ DUK_EXTERNAL void duk_push_uint(duk_hthread *thr, duk_uint_t val) {
 #if DUK_UINT_MAX <= 0xffffffffUL
 	DUK_TVAL_SET_U32(tv_slot, (duk_uint32_t) val);
 #else
-	if (val <= DUK_FASTINT_MAX) {  /* val is unsigned so >= 0 */
+	if (val <= DUK_FASTINT_MAX) { /* val is unsigned so >= 0 */
 		/* XXX: take advantage of val being unsigned, no need to mask */
 		DUK_TVAL_SET_FASTINT(tv_slot, (duk_int64_t) val);
 	} else {
@@ -21945,7 +23102,7 @@ DUK_EXTERNAL void duk_push_uint(duk_hthread *thr, duk_uint_t val) {
 		DUK_TVAL_SET_NUMBER(tv_slot, d);
 	}
 #endif
-#else  /* DUK_USE_FASTINT */
+#else /* DUK_USE_FASTINT */
 	duk_tval *tv_slot;
 	duk_double_t d;
 
@@ -21954,7 +23111,7 @@ DUK_EXTERNAL void duk_push_uint(duk_hthread *thr, duk_uint_t val) {
 	d = (duk_double_t) val;
 	tv_slot = thr->valstack_top++;
 	DUK_TVAL_SET_NUMBER(tv_slot, d);
-#endif  /* DUK_USE_FASTINT */
+#endif /* DUK_USE_FASTINT */
 }
 
 DUK_EXTERNAL void duk_push_nan(duk_hthread *thr) {
@@ -21998,7 +23155,7 @@ DUK_EXTERNAL const char *duk_push_lstring(duk_hthread *thr, const char *str, duk
 
 	tv_slot = thr->valstack_top++;
 	DUK_TVAL_SET_STRING(tv_slot, h);
-	DUK_HSTRING_INCREF(thr, h);  /* no side effects */
+	DUK_HSTRING_INCREF(thr, h); /* no side effects */
 
 	return (const char *) DUK_HSTRING_GET_DATA(h);
 }
@@ -22035,11 +23192,11 @@ DUK_EXTERNAL const char *duk_push_literal_raw(duk_hthread *thr, const char *str,
 
 	tv_slot = thr->valstack_top++;
 	DUK_TVAL_SET_STRING(tv_slot, h);
-	DUK_HSTRING_INCREF(thr, h);  /* no side effects */
+	DUK_HSTRING_INCREF(thr, h); /* no side effects */
 
 	return (const char *) DUK_HSTRING_GET_DATA(h);
 }
-#else  /* DUK_USE_LITCACHE_SIZE */
+#else /* DUK_USE_LITCACHE_SIZE */
 DUK_EXTERNAL const char *duk_push_literal_raw(duk_hthread *thr, const char *str, duk_size_t len) {
 	DUK_ASSERT_API_ENTRY(thr);
 	DUK_ASSERT(str != NULL);
@@ -22047,8 +23204,8 @@ DUK_EXTERNAL const char *duk_push_literal_raw(duk_hthread *thr, const char *str,
 
 	return duk_push_lstring(thr, str, len);
 }
-#endif  /* DUK_USE_LITCACHE_SIZE */
-#endif  /* !DUK_USE_PREFER_SIZE */
+#endif /* DUK_USE_LITCACHE_SIZE */
+#endif /* !DUK_USE_PREFER_SIZE */
 
 DUK_EXTERNAL void duk_push_pointer(duk_hthread *thr, void *val) {
 	duk_tval *tv_slot;
@@ -22076,7 +23233,7 @@ DUK_LOCAL void duk__push_this_helper(duk_hthread *thr, duk_small_uint_t check_ob
 
 	DUK__CHECK_SPACE();
 
-	DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(thr->valstack_top));  /* because of valstack init policy */
+	DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(thr->valstack_top)); /* because of valstack init policy */
 	tv_slot = thr->valstack_top++;
 
 	if (DUK_UNLIKELY(thr->callstack_curr == NULL)) {
@@ -22090,8 +23247,7 @@ DUK_LOCAL void duk__push_this_helper(duk_hthread *thr, duk_small_uint_t check_ob
 		/* 'this' binding is just before current activation's bottom */
 		DUK_ASSERT(thr->valstack_bottom > thr->valstack);
 		tv = thr->valstack_bottom - 1;
-		if (check_object_coercible &&
-		    (DUK_TVAL_IS_UNDEFINED(tv) || DUK_TVAL_IS_NULL(tv))) {
+		if (check_object_coercible && (DUK_TVAL_IS_UNDEFINED(tv) || DUK_TVAL_IS_NULL(tv))) {
 			/* XXX: better macro for DUK_TVAL_IS_UNDEFINED_OR_NULL(tv) */
 			goto type_error;
 		}
@@ -22101,7 +23257,7 @@ DUK_LOCAL void duk__push_this_helper(duk_hthread *thr, duk_small_uint_t check_ob
 	}
 	return;
 
- type_error:
+type_error:
 	DUK_ERROR_TYPE(thr, DUK_STR_NOT_OBJECT_COERCIBLE);
 	DUK_WO_NORETURN(return;);
 }
@@ -22133,16 +23289,16 @@ DUK_INTERNAL duk_hstring *duk_push_this_coercible_to_string(duk_hthread *thr) {
 	DUK_ASSERT_API_ENTRY(thr);
 
 	duk__push_this_helper(thr, 1 /*check_object_coercible*/);
-	return duk_to_hstring_m1(thr);  /* This will reject all Symbol values; accepts Symbol objects. */
+	return duk_to_hstring_m1(thr); /* This will reject all Symbol values; accepts Symbol objects. */
 }
 
 DUK_INTERNAL duk_tval *duk_get_borrowed_this_tval(duk_hthread *thr) {
 	DUK_ASSERT_API_ENTRY(thr);
 
-	DUK_ASSERT(thr->callstack_top > 0);  /* caller required to know */
-	DUK_ASSERT(thr->callstack_curr != NULL);  /* caller required to know */
-	DUK_ASSERT(thr->valstack_bottom > thr->valstack);  /* consequence of above */
-	DUK_ASSERT(thr->valstack_bottom - 1 >= thr->valstack);  /* 'this' binding exists */
+	DUK_ASSERT(thr->callstack_top > 0); /* caller required to know */
+	DUK_ASSERT(thr->callstack_curr != NULL); /* caller required to know */
+	DUK_ASSERT(thr->valstack_bottom > thr->valstack); /* consequence of above */
+	DUK_ASSERT(thr->valstack_bottom - 1 >= thr->valstack); /* 'this' binding exists */
 
 	return thr->valstack_bottom - 1;
 }
@@ -22218,12 +23374,15 @@ DUK_EXTERNAL void duk_push_global_object(duk_hthread *thr) {
 
 /* XXX: size optimize */
 DUK_LOCAL void duk__push_stash(duk_hthread *thr) {
-	if (!duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_INT_VALUE)) {
+	if (!duk_xget_owndataprop_stridx_short(thr, -1, DUK_STRIDX_INT_VALUE)) {
 		DUK_DDD(DUK_DDDPRINT("creating heap/global/thread stash on first use"));
 		duk_pop_unsafe(thr);
 		duk_push_bare_object(thr);
 		duk_dup_top(thr);
-		duk_xdef_prop_stridx_short(thr, -3, DUK_STRIDX_INT_VALUE, DUK_PROPDESC_FLAGS_C);  /* [ ... parent stash stash ] -> [ ... parent stash ] */
+		duk_xdef_prop_stridx_short(thr,
+		                           -3,
+		                           DUK_STRIDX_INT_VALUE,
+		                           DUK_PROPDESC_FLAGS_C); /* [ ... parent stash stash ] -> [ ... parent stash ] */
 	}
 	duk_remove_m2(thr);
 }
@@ -22257,7 +23416,7 @@ DUK_EXTERNAL void duk_push_thread_stash(duk_hthread *thr, duk_hthread *target_th
 DUK_LOCAL duk_int_t duk__try_push_vsprintf(duk_hthread *thr, void *buf, duk_size_t sz, const char *fmt, va_list ap) {
 	duk_int_t len;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	DUK_UNREF(thr);
 
 	/* NUL terminator handling doesn't matter here */
@@ -22276,7 +23435,7 @@ DUK_EXTERNAL const char *duk_push_vsprintf(duk_hthread *thr, const char *fmt, va
 	duk_size_t sz = DUK_PUSH_SPRINTF_INITIAL_SIZE;
 	duk_bool_t pushed_buf = 0;
 	void *buf;
-	duk_int_t len;  /* XXX: duk_ssize_t */
+	duk_int_t len; /* XXX: duk_ssize_t */
 	const char *res;
 
 	DUK_ASSERT_API_ENTRY(thr);
@@ -22290,7 +23449,7 @@ DUK_EXTERNAL const char *duk_push_vsprintf(duk_hthread *thr, const char *fmt, va
 	}
 
 	/* initial estimate based on format string */
-	sz = DUK_STRLEN(fmt) + 16;  /* format plus something to avoid just missing */
+	sz = DUK_STRLEN(fmt) + 16; /* format plus something to avoid just missing */
 	if (sz < DUK_PUSH_SPRINTF_INITIAL_SIZE) {
 		sz = DUK_PUSH_SPRINTF_INITIAL_SIZE;
 	}
@@ -22300,7 +23459,7 @@ DUK_EXTERNAL const char *duk_push_vsprintf(duk_hthread *thr, const char *fmt, va
 	 * This works 99% of the time which is quite nice.
 	 */
 	for (;;) {
-		va_list ap_copy;  /* copied so that 'ap' can be reused */
+		va_list ap_copy; /* copied so that 'ap' can be reused */
 
 		if (sz <= sizeof(stack_buf)) {
 			buf = stack_buf;
@@ -22330,7 +23489,7 @@ DUK_EXTERNAL const char *duk_push_vsprintf(duk_hthread *thr, const char *fmt, va
 	/* Cannot use duk_buffer_to_string() on the buffer because it is
 	 * usually larger than 'len'; 'buf' is also usually a stack buffer.
 	 */
-	res = duk_push_lstring(thr, (const char *) buf, (duk_size_t) len);  /* [ buf? res ] */
+	res = duk_push_lstring(thr, (const char *) buf, (duk_size_t) len); /* [ buf? res ] */
 	if (pushed_buf) {
 		duk_remove_m2(thr);
 	}
@@ -22351,13 +23510,14 @@ DUK_EXTERNAL const char *duk_push_sprintf(duk_hthread *thr, const char *fmt, ...
 	return ret;
 }
 
-DUK_INTERNAL duk_hobject *duk_push_object_helper(duk_hthread *thr, duk_uint_t hobject_flags_and_class, duk_small_int_t prototype_bidx) {
+DUK_INTERNAL duk_hobject *duk_push_object_helper(duk_hthread *thr,
+                                                 duk_uint_t hobject_flags_and_class,
+                                                 duk_small_int_t prototype_bidx) {
 	duk_tval *tv_slot;
 	duk_hobject *h;
 
 	DUK_ASSERT_API_ENTRY(thr);
-	DUK_ASSERT(prototype_bidx == -1 ||
-	           (prototype_bidx >= 0 && prototype_bidx < DUK_NUM_BUILTINS));
+	DUK_ASSERT(prototype_bidx == -1 || (prototype_bidx >= 0 && prototype_bidx < DUK_NUM_BUILTINS));
 
 	DUK__CHECK_SPACE();
 
@@ -22368,7 +23528,7 @@ DUK_INTERNAL duk_hobject *duk_push_object_helper(duk_hthread *thr, duk_uint_t ho
 
 	tv_slot = thr->valstack_top;
 	DUK_TVAL_SET_OBJECT(tv_slot, h);
-	DUK_HOBJECT_INCREF(thr, h);  /* no side effects */
+	DUK_HOBJECT_INCREF(thr, h); /* no side effects */
 	thr->valstack_top++;
 
 	/* object is now reachable */
@@ -22398,9 +23558,8 @@ DUK_EXTERNAL duk_idx_t duk_push_object(duk_hthread *thr) {
 	DUK_ASSERT_API_ENTRY(thr);
 
 	(void) duk_push_object_helper(thr,
-	                              DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                              DUK_HOBJECT_FLAG_FASTREFS |
-	                              DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJECT),
+	                              DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS |
+	                                  DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJECT),
 	                              DUK_BIDX_OBJECT_PROTOTYPE);
 	return duk_get_top_index_unsafe(thr);
 }
@@ -22413,11 +23572,8 @@ DUK_EXTERNAL duk_idx_t duk_push_array(duk_hthread *thr) {
 
 	DUK_ASSERT_API_ENTRY(thr);
 
-	flags = DUK_HOBJECT_FLAG_EXTENSIBLE |
-	        DUK_HOBJECT_FLAG_FASTREFS |
-	        DUK_HOBJECT_FLAG_ARRAY_PART |
-	        DUK_HOBJECT_FLAG_EXOTIC_ARRAY |
-	        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ARRAY);
+	flags = DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS | DUK_HOBJECT_FLAG_ARRAY_PART |
+	        DUK_HOBJECT_FLAG_EXOTIC_ARRAY | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ARRAY);
 
 	obj = duk_harray_alloc(thr, flags);
 	DUK_ASSERT(obj != NULL);
@@ -22426,11 +23582,35 @@ DUK_EXTERNAL duk_idx_t duk_push_array(duk_hthread *thr) {
 
 	tv_slot = thr->valstack_top;
 	DUK_TVAL_SET_OBJECT(tv_slot, (duk_hobject *) obj);
-	DUK_HOBJECT_INCREF(thr, obj);  /* XXX: could preallocate with refcount = 1 */
+	DUK_HOBJECT_INCREF(thr, obj); /* XXX: could preallocate with refcount = 1 */
+	ret = (duk_idx_t) (thr->valstack_top - thr->valstack_bottom);
+	thr->valstack_top++;
+
+	DUK_ASSERT(obj->length == 0); /* Array .length starts at zero. */
+	return ret;
+}
+
+DUK_EXTERNAL duk_idx_t duk_push_bare_array(duk_hthread *thr) {
+	duk_uint_t flags;
+	duk_harray *obj;
+	duk_idx_t ret;
+	duk_tval *tv_slot;
+
+	DUK_ASSERT_API_ENTRY(thr);
+
+	flags = DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS | DUK_HOBJECT_FLAG_ARRAY_PART |
+	        DUK_HOBJECT_FLAG_EXOTIC_ARRAY | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ARRAY);
+
+	obj = duk_harray_alloc(thr, flags);
+	DUK_ASSERT(obj != NULL);
+
+	tv_slot = thr->valstack_top;
+	DUK_TVAL_SET_OBJECT(tv_slot, (duk_hobject *) obj);
+	DUK_HOBJECT_INCREF(thr, obj); /* XXX: could preallocate with refcount = 1 */
 	ret = (duk_idx_t) (thr->valstack_top - thr->valstack_bottom);
 	thr->valstack_top++;
 
-	DUK_ASSERT(obj->length == 0);  /* Array .length starts at zero. */
+	DUK_ASSERT(obj->length == 0); /* Array .length starts at zero. */
 	return ret;
 }
 
@@ -22457,12 +23637,7 @@ DUK_INTERNAL duk_harray *duk_push_harray_with_size(duk_hthread *thr, duk_uint32_
 
 	a = duk_push_harray(thr);
 
-	duk_hobject_realloc_props(thr,
-	                          (duk_hobject *) a,
-	                          0,
-	                          size,
-	                          0,
-	                          0);
+	duk_hobject_realloc_props(thr, (duk_hobject *) a, 0, size, 0, 0);
 	a->length = size;
 	return a;
 }
@@ -22486,9 +23661,7 @@ DUK_EXTERNAL duk_idx_t duk_push_thread_raw(duk_hthread *thr, duk_uint_t flags) {
 
 	DUK__CHECK_SPACE();
 
-	obj = duk_hthread_alloc(thr,
-	                        DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_THREAD));
+	obj = duk_hthread_alloc(thr, DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_THREAD));
 	DUK_ASSERT(obj != NULL);
 	obj->state = DUK_HTHREAD_STATE_INACTIVE;
 #if defined(DUK_USE_ROM_STRINGS)
@@ -22528,8 +23701,7 @@ DUK_EXTERNAL duk_idx_t duk_push_thread_raw(duk_hthread *thr, duk_uint_t flags) {
 	/* Initial stack size satisfies the stack slack constraints so there
 	 * is no need to require stack here.
 	 */
-	DUK_ASSERT(DUK_VALSTACK_INITIAL_SIZE >=
-	           DUK_VALSTACK_API_ENTRY_MINIMUM + DUK_VALSTACK_INTERNAL_EXTRA);
+	DUK_ASSERT(DUK_VALSTACK_INITIAL_SIZE >= DUK_VALSTACK_API_ENTRY_MINIMUM + DUK_VALSTACK_INTERNAL_EXTRA);
 
 	return ret;
 }
@@ -22548,10 +23720,8 @@ DUK_INTERNAL duk_hcompfunc *duk_push_hcompfunc(duk_hthread *thr) {
 	 */
 
 	obj = duk_hcompfunc_alloc(thr,
-	                          DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                          DUK_HOBJECT_FLAG_CALLABLE |
-	                          DUK_HOBJECT_FLAG_COMPFUNC |
-	                          DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_FUNCTION));
+	                          DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_CALLABLE | DUK_HOBJECT_FLAG_COMPFUNC |
+	                              DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_FUNCTION));
 	if (DUK_UNLIKELY(obj == NULL)) {
 		DUK_ERROR_ALLOC_FAILED(thr);
 		DUK_WO_NORETURN(return NULL;);
@@ -22579,11 +23749,8 @@ DUK_INTERNAL duk_hboundfunc *duk_push_hboundfunc(duk_hthread *thr) {
 
 	DUK__CHECK_SPACE();
 	obj = duk_hboundfunc_alloc(thr->heap,
-	                           DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                           DUK_HOBJECT_FLAG_BOUNDFUNC |
-	                           DUK_HOBJECT_FLAG_CONSTRUCTABLE |
-	                           DUK_HOBJECT_FLAG_CALLABLE |
-	                           DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_FUNCTION));
+	                           DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_BOUNDFUNC | DUK_HOBJECT_FLAG_CONSTRUCTABLE |
+	                               DUK_HOBJECT_FLAG_CALLABLE | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_FUNCTION));
 	if (!obj) {
 		DUK_ERROR_ALLOC_FAILED(thr);
 		DUK_WO_NORETURN(return NULL;);
@@ -22601,13 +23768,14 @@ DUK_INTERNAL duk_hboundfunc *duk_push_hboundfunc(duk_hthread *thr) {
 	return obj;
 }
 
-DUK_LOCAL duk_idx_t duk__push_c_function_raw(duk_hthread *thr, duk_c_function func, duk_idx_t nargs, duk_uint_t flags, duk_small_uint_t proto_bidx) {
+DUK_LOCAL duk_idx_t
+duk__push_c_function_raw(duk_hthread *thr, duk_c_function func, duk_idx_t nargs, duk_uint_t flags, duk_small_uint_t proto_bidx) {
 	duk_hnatfunc *obj;
 	duk_idx_t ret;
 	duk_tval *tv_slot;
 	duk_int16_t func_nargs;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 
 	DUK__CHECK_SPACE();
 
@@ -22629,7 +23797,8 @@ DUK_LOCAL duk_idx_t duk__push_c_function_raw(duk_hthread *thr, duk_c_function fu
 	obj->nargs = func_nargs;
 
 	DUK_DDD(DUK_DDDPRINT("created native function object with flags: 0x%08lx, nargs=%ld",
-	                     (unsigned long) obj->obj.hdr.h_flags, (long) obj->nargs));
+	                     (unsigned long) obj->obj.hdr.h_flags,
+	                     (long) obj->nargs));
 
 	tv_slot = thr->valstack_top;
 	DUK_TVAL_SET_OBJECT(tv_slot, (duk_hobject *) obj);
@@ -22641,7 +23810,7 @@ DUK_LOCAL duk_idx_t duk__push_c_function_raw(duk_hthread *thr, duk_c_function fu
 	DUK_HOBJECT_SET_PROTOTYPE_INIT_INCREF(thr, (duk_hobject *) obj, thr->builtins[proto_bidx]);
 	return ret;
 
- api_error:
+api_error:
 	DUK_ERROR_TYPE_INVALID_ARGS(thr);
 	DUK_WO_NORETURN(return 0;);
 }
@@ -22651,15 +23820,9 @@ DUK_EXTERNAL duk_idx_t duk_push_c_function(duk_hthread *thr, duk_c_function func
 
 	DUK_ASSERT_API_ENTRY(thr);
 
-	flags = DUK_HOBJECT_FLAG_EXTENSIBLE |
-	        DUK_HOBJECT_FLAG_CONSTRUCTABLE |
-	        DUK_HOBJECT_FLAG_CALLABLE |
-	        DUK_HOBJECT_FLAG_FASTREFS |
-	        DUK_HOBJECT_FLAG_NATFUNC |
-	        DUK_HOBJECT_FLAG_NEWENV |
-	        DUK_HOBJECT_FLAG_STRICT |
-	        DUK_HOBJECT_FLAG_NOTAIL |
-	        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_FUNCTION);
+	flags = DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_CONSTRUCTABLE | DUK_HOBJECT_FLAG_CALLABLE |
+	        DUK_HOBJECT_FLAG_FASTREFS | DUK_HOBJECT_FLAG_NATFUNC | DUK_HOBJECT_FLAG_NEWENV | DUK_HOBJECT_FLAG_STRICT |
+	        DUK_HOBJECT_FLAG_NOTAIL | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_FUNCTION);
 
 	/* Default prototype is a Duktape specific %NativeFunctionPrototype%
 	 * which provides .length and .name getters.
@@ -22672,15 +23835,9 @@ DUK_INTERNAL void duk_push_c_function_builtin(duk_hthread *thr, duk_c_function f
 
 	DUK_ASSERT_API_ENTRY(thr);
 
-	flags = DUK_HOBJECT_FLAG_EXTENSIBLE |
-	        DUK_HOBJECT_FLAG_CONSTRUCTABLE |
-	        DUK_HOBJECT_FLAG_CALLABLE |
-	        DUK_HOBJECT_FLAG_FASTREFS |
-	        DUK_HOBJECT_FLAG_NATFUNC |
-	        DUK_HOBJECT_FLAG_NEWENV |
-	        DUK_HOBJECT_FLAG_STRICT |
-	        DUK_HOBJECT_FLAG_NOTAIL |
-	        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_FUNCTION);
+	flags = DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_CONSTRUCTABLE | DUK_HOBJECT_FLAG_CALLABLE |
+	        DUK_HOBJECT_FLAG_FASTREFS | DUK_HOBJECT_FLAG_NATFUNC | DUK_HOBJECT_FLAG_NEWENV | DUK_HOBJECT_FLAG_STRICT |
+	        DUK_HOBJECT_FLAG_NOTAIL | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_FUNCTION);
 
 	/* Must use Function.prototype for standard built-in functions. */
 	(void) duk__push_c_function_raw(thr, func, nargs, flags, DUK_BIDX_FUNCTION_PROTOTYPE);
@@ -22691,20 +23848,16 @@ DUK_INTERNAL void duk_push_c_function_builtin_noconstruct(duk_hthread *thr, duk_
 
 	DUK_ASSERT_API_ENTRY(thr);
 
-	flags = DUK_HOBJECT_FLAG_EXTENSIBLE |
-	        DUK_HOBJECT_FLAG_CALLABLE |
-	        DUK_HOBJECT_FLAG_FASTREFS |
-	        DUK_HOBJECT_FLAG_NATFUNC |
-	        DUK_HOBJECT_FLAG_NEWENV |
-	        DUK_HOBJECT_FLAG_STRICT |
-	        DUK_HOBJECT_FLAG_NOTAIL |
+	flags = DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_CALLABLE | DUK_HOBJECT_FLAG_FASTREFS | DUK_HOBJECT_FLAG_NATFUNC |
+	        DUK_HOBJECT_FLAG_NEWENV | DUK_HOBJECT_FLAG_STRICT | DUK_HOBJECT_FLAG_NOTAIL |
 	        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_FUNCTION);
 
 	/* Must use Function.prototype for standard built-in functions. */
 	(void) duk__push_c_function_raw(thr, func, nargs, flags, DUK_BIDX_FUNCTION_PROTOTYPE);
 }
 
-DUK_EXTERNAL duk_idx_t duk_push_c_lightfunc(duk_hthread *thr, duk_c_function func, duk_idx_t nargs, duk_idx_t length, duk_int_t magic) {
+DUK_EXTERNAL duk_idx_t
+duk_push_c_lightfunc(duk_hthread *thr, duk_c_function func, duk_idx_t nargs, duk_idx_t length, duk_int_t magic) {
 	duk_small_uint_t lf_flags;
 	duk_tval *tv_slot;
 
@@ -22733,13 +23886,15 @@ DUK_EXTERNAL duk_idx_t duk_push_c_lightfunc(duk_hthread *thr, duk_c_function fun
 	DUK_ASSERT(tv_slot >= thr->valstack_bottom);
 	return (duk_idx_t) (tv_slot - thr->valstack_bottom);
 
- api_error:
+api_error:
 	DUK_ERROR_TYPE_INVALID_ARGS(thr);
 	DUK_WO_NORETURN(return 0;);
 }
 
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
-DUK_INTERNAL duk_hbufobj *duk_push_bufobj_raw(duk_hthread *thr, duk_uint_t hobject_flags_and_class, duk_small_int_t prototype_bidx) {
+DUK_INTERNAL duk_hbufobj *duk_push_bufobj_raw(duk_hthread *thr,
+                                              duk_uint_t hobject_flags_and_class,
+                                              duk_small_int_t prototype_bidx) {
 	duk_hbufobj *obj;
 	duk_tval *tv_slot;
 
@@ -22752,7 +23907,7 @@ DUK_INTERNAL duk_hbufobj *duk_push_bufobj_raw(duk_hthread *thr, duk_uint_t hobje
 	DUK_ASSERT(obj != NULL);
 
 	DUK_HOBJECT_SET_PROTOTYPE_INIT_INCREF(thr, (duk_hobject *) obj, thr->builtins[prototype_bidx]);
-	DUK_ASSERT_HBUFOBJ_VALID(obj);
+	DUK_HBUFOBJ_ASSERT_VALID(obj);
 
 	tv_slot = thr->valstack_top;
 	DUK_TVAL_SET_OBJECT(tv_slot, (duk_hobject *) obj);
@@ -22761,34 +23916,86 @@ DUK_INTERNAL duk_hbufobj *duk_push_bufobj_raw(duk_hthread *thr, duk_uint_t hobje
 
 	return obj;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /* XXX: There's quite a bit of overlap with buffer creation handling in
  * duk_bi_buffer.c.  Look for overlap and refactor.
  */
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
-#define DUK__PACK_ARGS(classnum,protobidx,elemtype,elemshift,istypedarray) \
+#define DUK__PACK_ARGS(classnum, protobidx, elemtype, elemshift, istypedarray) \
 	(((classnum) << 24) | ((protobidx) << 16) | ((elemtype) << 8) | ((elemshift) << 4) | (istypedarray))
 
 static const duk_uint32_t duk__bufobj_flags_lookup[] = {
 	/* Node.js Buffers are Uint8Array instances which inherit from Buffer.prototype. */
-	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_ARRAYBUFFER,       DUK_BIDX_ARRAYBUFFER_PROTOTYPE,       DUK_HBUFOBJ_ELEM_UINT8,        0, 0),  /* DUK_BUFOBJ_ARRAYBUFFER */
-	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_UINT8ARRAY,        DUK_BIDX_NODEJS_BUFFER_PROTOTYPE,     DUK_HBUFOBJ_ELEM_UINT8,        0, 1),  /* DUK_BUFOBJ_NODEJS_BUFFER */
-	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_DATAVIEW,          DUK_BIDX_DATAVIEW_PROTOTYPE,          DUK_HBUFOBJ_ELEM_UINT8,        0, 0),  /* DUK_BUFOBJ_DATAVIEW */
-	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_INT8ARRAY,         DUK_BIDX_INT8ARRAY_PROTOTYPE,         DUK_HBUFOBJ_ELEM_INT8,         0, 1),  /* DUK_BUFOBJ_INT8ARRAY */
-	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_UINT8ARRAY,        DUK_BIDX_UINT8ARRAY_PROTOTYPE,        DUK_HBUFOBJ_ELEM_UINT8,        0, 1),  /* DUK_BUFOBJ_UINT8ARRAY */
-	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_UINT8CLAMPEDARRAY, DUK_BIDX_UINT8CLAMPEDARRAY_PROTOTYPE, DUK_HBUFOBJ_ELEM_UINT8CLAMPED, 0, 1),  /* DUK_BUFOBJ_UINT8CLAMPEDARRAY */
-	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_INT16ARRAY,        DUK_BIDX_INT16ARRAY_PROTOTYPE,        DUK_HBUFOBJ_ELEM_INT16,        1, 1),  /* DUK_BUFOBJ_INT16ARRAY */
-	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_UINT16ARRAY,       DUK_BIDX_UINT16ARRAY_PROTOTYPE,       DUK_HBUFOBJ_ELEM_UINT16,       1, 1),  /* DUK_BUFOBJ_UINT16ARRAY */
-	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_INT32ARRAY,        DUK_BIDX_INT32ARRAY_PROTOTYPE,        DUK_HBUFOBJ_ELEM_INT32,        2, 1),  /* DUK_BUFOBJ_INT32ARRAY */
-	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_UINT32ARRAY,       DUK_BIDX_UINT32ARRAY_PROTOTYPE,       DUK_HBUFOBJ_ELEM_UINT32,       2, 1),  /* DUK_BUFOBJ_UINT32ARRAY */
-	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_FLOAT32ARRAY,      DUK_BIDX_FLOAT32ARRAY_PROTOTYPE,      DUK_HBUFOBJ_ELEM_FLOAT32,      2, 1),  /* DUK_BUFOBJ_FLOAT32ARRAY */
-	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_FLOAT64ARRAY,      DUK_BIDX_FLOAT64ARRAY_PROTOTYPE,      DUK_HBUFOBJ_ELEM_FLOAT64,      3, 1)   /* DUK_BUFOBJ_FLOAT64ARRAY */
+	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_ARRAYBUFFER,
+	               DUK_BIDX_ARRAYBUFFER_PROTOTYPE,
+	               DUK_HBUFOBJ_ELEM_UINT8,
+	               0,
+	               0), /* DUK_BUFOBJ_ARRAYBUFFER */
+	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_UINT8ARRAY,
+	               DUK_BIDX_NODEJS_BUFFER_PROTOTYPE,
+	               DUK_HBUFOBJ_ELEM_UINT8,
+	               0,
+	               1), /* DUK_BUFOBJ_NODEJS_BUFFER */
+	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_DATAVIEW,
+	               DUK_BIDX_DATAVIEW_PROTOTYPE,
+	               DUK_HBUFOBJ_ELEM_UINT8,
+	               0,
+	               0), /* DUK_BUFOBJ_DATAVIEW */
+	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_INT8ARRAY,
+	               DUK_BIDX_INT8ARRAY_PROTOTYPE,
+	               DUK_HBUFOBJ_ELEM_INT8,
+	               0,
+	               1), /* DUK_BUFOBJ_INT8ARRAY */
+	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_UINT8ARRAY,
+	               DUK_BIDX_UINT8ARRAY_PROTOTYPE,
+	               DUK_HBUFOBJ_ELEM_UINT8,
+	               0,
+	               1), /* DUK_BUFOBJ_UINT8ARRAY */
+	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_UINT8CLAMPEDARRAY,
+	               DUK_BIDX_UINT8CLAMPEDARRAY_PROTOTYPE,
+	               DUK_HBUFOBJ_ELEM_UINT8CLAMPED,
+	               0,
+	               1), /* DUK_BUFOBJ_UINT8CLAMPEDARRAY */
+	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_INT16ARRAY,
+	               DUK_BIDX_INT16ARRAY_PROTOTYPE,
+	               DUK_HBUFOBJ_ELEM_INT16,
+	               1,
+	               1), /* DUK_BUFOBJ_INT16ARRAY */
+	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_UINT16ARRAY,
+	               DUK_BIDX_UINT16ARRAY_PROTOTYPE,
+	               DUK_HBUFOBJ_ELEM_UINT16,
+	               1,
+	               1), /* DUK_BUFOBJ_UINT16ARRAY */
+	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_INT32ARRAY,
+	               DUK_BIDX_INT32ARRAY_PROTOTYPE,
+	               DUK_HBUFOBJ_ELEM_INT32,
+	               2,
+	               1), /* DUK_BUFOBJ_INT32ARRAY */
+	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_UINT32ARRAY,
+	               DUK_BIDX_UINT32ARRAY_PROTOTYPE,
+	               DUK_HBUFOBJ_ELEM_UINT32,
+	               2,
+	               1), /* DUK_BUFOBJ_UINT32ARRAY */
+	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_FLOAT32ARRAY,
+	               DUK_BIDX_FLOAT32ARRAY_PROTOTYPE,
+	               DUK_HBUFOBJ_ELEM_FLOAT32,
+	               2,
+	               1), /* DUK_BUFOBJ_FLOAT32ARRAY */
+	DUK__PACK_ARGS(DUK_HOBJECT_CLASS_FLOAT64ARRAY,
+	               DUK_BIDX_FLOAT64ARRAY_PROTOTYPE,
+	               DUK_HBUFOBJ_ELEM_FLOAT64,
+	               3,
+	               1) /* DUK_BUFOBJ_FLOAT64ARRAY */
 };
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
-DUK_EXTERNAL void duk_push_buffer_object(duk_hthread *thr, duk_idx_t idx_buffer, duk_size_t byte_offset, duk_size_t byte_length, duk_uint_t flags) {
+DUK_EXTERNAL void duk_push_buffer_object(duk_hthread *thr,
+                                         duk_idx_t idx_buffer,
+                                         duk_size_t byte_offset,
+                                         duk_size_t byte_length,
+                                         duk_uint_t flags) {
 	duk_hbufobj *h_bufobj;
 	duk_hbuffer *h_val;
 	duk_hobject *h_arraybuf;
@@ -22811,7 +24018,7 @@ DUK_EXTERNAL void duk_push_buffer_object(duk_hthread *thr, duk_idx_t idx_buffer,
 		}
 	}
 
-	DUK_ASSERT_DISABLE(flags >= 0);  /* flags is unsigned */
+	DUK_ASSERT_DISABLE(flags >= 0); /* flags is unsigned */
 	lookupidx = flags;
 	if (DUK_UNLIKELY(lookupidx >= sizeof(duk__bufobj_flags_lookup) / sizeof(duk_uint32_t))) {
 		goto arg_error;
@@ -22821,12 +24028,12 @@ DUK_EXTERNAL void duk_push_buffer_object(duk_hthread *thr, duk_idx_t idx_buffer,
 	protobidx = (tmp >> 16) & 0xff;
 
 	h_arraybuf = duk_get_hobject(thr, idx_buffer);
-	if (h_arraybuf != NULL &&  /* argument is an object */
-	    flags != DUK_BUFOBJ_ARRAYBUFFER &&  /* creating a view */
-	    DUK_HOBJECT_GET_CLASS_NUMBER(h_arraybuf) == DUK_HOBJECT_CLASS_ARRAYBUFFER  /* argument is ArrayBuffer */) {
+	if (h_arraybuf != NULL && /* argument is an object */
+	    flags != DUK_BUFOBJ_ARRAYBUFFER && /* creating a view */
+	    DUK_HOBJECT_GET_CLASS_NUMBER(h_arraybuf) == DUK_HOBJECT_CLASS_ARRAYBUFFER /* argument is ArrayBuffer */) {
 		duk_uint_t tmp_offset;
 
-		DUK_ASSERT_HBUFOBJ_VALID((duk_hbufobj *) h_arraybuf);
+		DUK_HBUFOBJ_ASSERT_VALID((duk_hbufobj *) h_arraybuf);
 		h_val = ((duk_hbufobj *) h_arraybuf)->buf;
 		if (DUK_UNLIKELY(h_val == NULL)) {
 			goto arg_error;
@@ -22860,9 +24067,7 @@ DUK_EXTERNAL void duk_push_buffer_object(duk_hthread *thr, duk_idx_t idx_buffer,
 	DUK_ASSERT(h_val != NULL);
 
 	h_bufobj = duk_push_bufobj_raw(thr,
-	                               DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                               DUK_HOBJECT_FLAG_BUFOBJ |
-	                               DUK_HOBJECT_CLASS_AS_FLAGS(classnum),
+	                               DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_BUFOBJ | DUK_HOBJECT_CLASS_AS_FLAGS(classnum),
 	                               (duk_small_int_t) protobidx);
 	DUK_ASSERT(h_bufobj != NULL);
 
@@ -22875,7 +24080,7 @@ DUK_EXTERNAL void duk_push_buffer_object(duk_hthread *thr, duk_idx_t idx_buffer,
 	h_bufobj->shift = (tmp >> 4) & 0x0f;
 	h_bufobj->elem_type = (tmp >> 8) & 0xff;
 	h_bufobj->is_typedarray = tmp & 0x0f;
-	DUK_ASSERT_HBUFOBJ_VALID(h_bufobj);
+	DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
 
 	/* TypedArray views need an automatic ArrayBuffer which must be
 	 * provided as .buffer property of the view.  The ArrayBuffer is
@@ -22885,16 +24090,20 @@ DUK_EXTERNAL void duk_push_buffer_object(duk_hthread *thr, duk_idx_t idx_buffer,
 	 */
 	return;
 
- range_error:
+range_error:
 	DUK_ERROR_RANGE(thr, DUK_STR_INVALID_ARGS);
 	DUK_WO_NORETURN(return;);
 
- arg_error:
+arg_error:
 	DUK_ERROR_TYPE(thr, DUK_STR_INVALID_ARGS);
 	DUK_WO_NORETURN(return;);
 }
-#else  /* DUK_USE_BUFFEROBJECT_SUPPORT */
-DUK_EXTERNAL void duk_push_buffer_object(duk_hthread *thr, duk_idx_t idx_buffer, duk_size_t byte_offset, duk_size_t byte_length, duk_uint_t flags) {
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
+DUK_EXTERNAL void duk_push_buffer_object(duk_hthread *thr,
+                                         duk_idx_t idx_buffer,
+                                         duk_size_t byte_offset,
+                                         duk_size_t byte_length,
+                                         duk_uint_t flags) {
 	DUK_ASSERT_API_ENTRY(thr);
 	DUK_UNREF(idx_buffer);
 	DUK_UNREF(byte_offset);
@@ -22903,9 +24112,14 @@ DUK_EXTERNAL void duk_push_buffer_object(duk_hthread *thr, duk_idx_t idx_buffer,
 	DUK_ERROR_UNSUPPORTED(thr);
 	DUK_WO_NORETURN(return;);
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
-DUK_EXTERNAL duk_idx_t duk_push_error_object_va_raw(duk_hthread *thr, duk_errcode_t err_code, const char *filename, duk_int_t line, const char *fmt, va_list ap) {
+DUK_EXTERNAL duk_idx_t duk_push_error_object_va_raw(duk_hthread *thr,
+                                                    duk_errcode_t err_code,
+                                                    const char *filename,
+                                                    duk_int_t line,
+                                                    const char *fmt,
+                                                    va_list ap) {
 	duk_hobject *proto;
 #if defined(DUK_USE_AUGMENT_ERROR_CREATE)
 	duk_small_uint_t augment_flags;
@@ -22928,9 +24142,8 @@ DUK_EXTERNAL duk_idx_t duk_push_error_object_va_raw(duk_hthread *thr, duk_errcod
 	/* error gets its 'name' from the prototype */
 	proto = duk_error_prototype_from_code(thr, err_code);
 	(void) duk_push_object_helper_proto(thr,
-	                                    DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                                    DUK_HOBJECT_FLAG_FASTREFS |
-	                                    DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ERROR),
+	                                    DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS |
+	                                        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ERROR),
 	                                    proto);
 
 	/* ... and its 'message' from an instance property */
@@ -22953,13 +24166,14 @@ DUK_EXTERNAL duk_idx_t duk_push_error_object_va_raw(duk_hthread *thr, duk_errcod
 	/* Creation time error augmentation */
 #if defined(DUK_USE_AUGMENT_ERROR_CREATE)
 	/* filename may be NULL in which case file/line is not recorded */
-	duk_err_augment_error_create(thr, thr, filename, line, augment_flags);  /* may throw an error */
+	duk_err_augment_error_create(thr, thr, filename, line, augment_flags); /* may throw an error */
 #endif
 
 	return duk_get_top_index_unsafe(thr);
 }
 
-DUK_EXTERNAL duk_idx_t duk_push_error_object_raw(duk_hthread *thr, duk_errcode_t err_code, const char *filename, duk_int_t line, const char *fmt, ...) {
+DUK_EXTERNAL duk_idx_t
+duk_push_error_object_raw(duk_hthread *thr, duk_errcode_t err_code, const char *filename, duk_int_t line, const char *fmt, ...) {
 	va_list ap;
 	duk_idx_t ret;
 
@@ -22987,7 +24201,7 @@ DUK_EXTERNAL duk_idx_t duk_push_error_object_stash(duk_hthread *thr, duk_errcode
 	va_end(ap);
 	return ret;
 }
-#endif  /* DUK_USE_VARIADIC_MACROS */
+#endif /* DUK_USE_VARIADIC_MACROS */
 
 DUK_EXTERNAL void *duk_push_buffer_raw(duk_hthread *thr, duk_size_t size, duk_small_uint_t flags) {
 	duk_tval *tv_slot;
@@ -23090,13 +24304,10 @@ DUK_EXTERNAL duk_idx_t duk_push_proxy(duk_hthread *thr, duk_uint_t proxy_flags)
 	/* CALLABLE and CONSTRUCTABLE flags are copied from the (initial)
 	 * target, see ES2015 Sections 9.5.15 and 9.5.13.
 	 */
-	flags = DUK_HEAPHDR_GET_FLAGS((duk_heaphdr *) h_target) &
-	        (DUK_HOBJECT_FLAG_CALLABLE | DUK_HOBJECT_FLAG_CONSTRUCTABLE);
-	flags |= DUK_HOBJECT_FLAG_EXTENSIBLE |
-	         DUK_HOBJECT_FLAG_EXOTIC_PROXYOBJ;
+	flags = DUK_HEAPHDR_GET_FLAGS((duk_heaphdr *) h_target) & (DUK_HOBJECT_FLAG_CALLABLE | DUK_HOBJECT_FLAG_CONSTRUCTABLE);
+	flags |= DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_EXOTIC_PROXYOBJ;
 	if (flags & DUK_HOBJECT_FLAG_CALLABLE) {
-		flags |= DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_FUNCTION) |
-		         DUK_HOBJECT_FLAG_SPECIAL_CALL;
+		flags |= DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_FUNCTION) | DUK_HOBJECT_FLAG_SPECIAL_CALL;
 	} else {
 		flags |= DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJECT);
 	}
@@ -23113,7 +24324,7 @@ DUK_EXTERNAL duk_idx_t duk_push_proxy(duk_hthread *thr, duk_uint_t proxy_flags)
 	h_proxy->target = h_target;
 	DUK_ASSERT(h_handler != NULL);
 	h_proxy->handler = h_handler;
-	DUK_ASSERT_HPROXY_VALID(h_proxy);
+	DUK_HPROXY_ASSERT_VALID(h_proxy);
 
 	DUK_ASSERT(duk_get_hobject(thr, -2) == h_target);
 	DUK_ASSERT(duk_get_hobject(thr, -1) == h_handler);
@@ -23122,25 +24333,25 @@ DUK_EXTERNAL duk_idx_t duk_push_proxy(duk_hthread *thr, duk_uint_t proxy_flags)
 	DUK_TVAL_SET_OBJECT(tv_slot, (duk_hobject *) h_proxy);
 	DUK_HOBJECT_INCREF(thr, (duk_hobject *) h_proxy);
 	tv_slot++;
-	DUK_TVAL_SET_UNDEFINED(tv_slot);  /* [ ... target handler ] -> [ ... proxy undefined ] */
-	thr->valstack_top = tv_slot;      /* -> [ ... proxy ] */
+	DUK_TVAL_SET_UNDEFINED(tv_slot); /* [ ... target handler ] -> [ ... proxy undefined ] */
+	thr->valstack_top = tv_slot; /* -> [ ... proxy ] */
 
 	DUK_DD(DUK_DDPRINT("created Proxy: %!iT", duk_get_tval(thr, -1)));
 
 	return (duk_idx_t) (thr->valstack_top - thr->valstack_bottom - 1);
 
- fail_args:
+fail_args:
 	DUK_ERROR_TYPE_INVALID_ARGS(thr);
 	DUK_WO_NORETURN(return 0;);
 }
-#else  /* DUK_USE_ES6_PROXY */
+#else /* DUK_USE_ES6_PROXY */
 DUK_EXTERNAL duk_idx_t duk_push_proxy(duk_hthread *thr, duk_uint_t proxy_flags) {
 	DUK_ASSERT_API_ENTRY(thr);
 	DUK_UNREF(proxy_flags);
 	DUK_ERROR_UNSUPPORTED(thr);
 	DUK_WO_NORETURN(return 0;);
 }
-#endif  /* DUK_USE_ES6_PROXY */
+#endif /* DUK_USE_ES6_PROXY */
 
 #if defined(DUK_USE_ASSERTIONS)
 DUK_LOCAL void duk__validate_push_heapptr(duk_hthread *thr, void *ptr) {
@@ -23167,9 +24378,7 @@ DUK_LOCAL void duk__validate_push_heapptr(duk_hthread *thr, void *ptr) {
 	 * the finalizer starts executing).
 	 */
 #if defined(DUK_USE_FINALIZER_SUPPORT)
-	for (curr = thr->heap->finalize_list;
-	     curr != NULL;
-	     curr = DUK_HEAPHDR_GET_NEXT(thr->heap, curr)) {
+	for (curr = thr->heap->finalize_list; curr != NULL; curr = DUK_HEAPHDR_GET_NEXT(thr->heap, curr)) {
 		/* FINALIZABLE is set for all objects on finalize_list
 		 * except for an object being finalized right now.  So
 		 * can't assert here.
@@ -23181,18 +24390,18 @@ DUK_LOCAL void duk__validate_push_heapptr(duk_hthread *thr, void *ptr) {
 		if (curr == h) {
 			if (DUK_HEAPHDR_HAS_FINALIZED((duk_heaphdr *) h)) {
 				/* Object is currently being finalized. */
-				DUK_ASSERT(found == 0);  /* Would indicate corrupted lists. */
+				DUK_ASSERT(found == 0); /* Would indicate corrupted lists. */
 				found = 1;
 			} else {
 				/* Not being finalized but on finalize_list,
 				 * allowed since Duktape 2.1.
 				 */
-				DUK_ASSERT(found == 0);  /* Would indicate corrupted lists. */
+				DUK_ASSERT(found == 0); /* Would indicate corrupted lists. */
 				found = 1;
 			}
 		}
 	}
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 
 #if defined(DUK_USE_REFERENCE_COUNTING)
 	/* Because refzero_list is now processed to completion inline with
@@ -23218,7 +24427,7 @@ DUK_LOCAL void duk__validate_push_heapptr(duk_hthread *thr, void *ptr) {
 #endif
 			while (str != NULL) {
 				if (str == (duk_hstring *) h) {
-					DUK_ASSERT(found == 0);  /* Would indicate corrupted lists. */
+					DUK_ASSERT(found == 0); /* Would indicate corrupted lists. */
 					found = 1;
 					break;
 				}
@@ -23227,18 +24436,16 @@ DUK_LOCAL void duk__validate_push_heapptr(duk_hthread *thr, void *ptr) {
 		}
 		DUK_ASSERT(found != 0);
 	} else {
-		for (curr = thr->heap->heap_allocated;
-		     curr != NULL;
-		     curr = DUK_HEAPHDR_GET_NEXT(thr->heap, curr)) {
+		for (curr = thr->heap->heap_allocated; curr != NULL; curr = DUK_HEAPHDR_GET_NEXT(thr->heap, curr)) {
 			if (curr == h) {
-				DUK_ASSERT(found == 0);  /* Would indicate corrupted lists. */
+				DUK_ASSERT(found == 0); /* Would indicate corrupted lists. */
 				found = 1;
 			}
 		}
 		DUK_ASSERT(found != 0);
 	}
 }
-#endif  /* DUK_USE_ASSERTIONS */
+#endif /* DUK_USE_ASSERTIONS */
 
 DUK_EXTERNAL duk_idx_t duk_push_heapptr(duk_hthread *thr, void *ptr) {
 	duk_idx_t ret;
@@ -23267,7 +24474,7 @@ DUK_EXTERNAL duk_idx_t duk_push_heapptr(duk_hthread *thr, void *ptr) {
 		return ret;
 	}
 
-	DUK_ASSERT_HEAPHDR_VALID((duk_heaphdr *) ptr);
+	DUK_HEAPHDR_ASSERT_VALID((duk_heaphdr *) ptr);
 
 	/* If the argument is on finalize_list it has technically been
 	 * unreachable before duk_push_heapptr() but it's still safe to
@@ -23304,7 +24511,7 @@ DUK_EXTERNAL duk_idx_t duk_push_heapptr(duk_hthread *thr, void *ptr) {
 		 * heap_allocated.
 		 */
 #if defined(DUK_USE_REFERENCE_COUNTING)
-		DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT(curr) >= 1);  /* Preincremented on finalize_list insert. */
+		DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT(curr) >= 1); /* Preincremented on finalize_list insert. */
 		DUK_HEAPHDR_PREDEC_REFCOUNT(curr);
 #endif
 		DUK_HEAP_REMOVE_FROM_FINALIZE_LIST(thr->heap, curr);
@@ -23336,10 +24543,9 @@ DUK_EXTERNAL duk_idx_t duk_push_bare_object(duk_hthread *thr) {
 	DUK_ASSERT_API_ENTRY(thr);
 
 	(void) duk_push_object_helper(thr,
-	                              DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                              DUK_HOBJECT_FLAG_FASTREFS |
-	                              DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJECT),
-	                              -1);  /* no prototype */
+	                              DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS |
+	                                  DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJECT),
+	                              -1); /* no prototype */
 	return duk_get_top_index_unsafe(thr);
 }
 
@@ -23402,7 +24608,7 @@ DUK_LOCAL DUK_ALWAYS_INLINE void duk__pop_n_unsafe_raw(duk_hthread *thr, duk_idx
 	duk_tval *tv_end;
 #endif
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	DUK_ASSERT(count >= 0);
 	DUK_ASSERT((duk_size_t) (thr->valstack_top - thr->valstack_bottom) >= (duk_size_t) count);
 
@@ -23448,12 +24654,12 @@ DUK_INTERNAL void duk_pop_n_unsafe(duk_hthread *thr, duk_idx_t count) {
 	DUK_ASSERT_API_ENTRY(thr);
 	duk_pop_n(thr, count);
 }
-#else  /* DUK_USE_PREFER_SIZE */
+#else /* DUK_USE_PREFER_SIZE */
 DUK_INTERNAL void duk_pop_n_unsafe(duk_hthread *thr, duk_idx_t count) {
 	DUK_ASSERT_API_ENTRY(thr);
 	duk__pop_n_unsafe_raw(thr, count);
 }
-#endif  /* DUK_USE_PREFER_SIZE */
+#endif /* DUK_USE_PREFER_SIZE */
 
 /* Pop N elements without DECREF (in effect "stealing" any actual refcounts). */
 #if defined(DUK_USE_REFERENCE_COUNTING)
@@ -23476,12 +24682,12 @@ DUK_INTERNAL void duk_pop_n_nodecref_unsafe(duk_hthread *thr, duk_idx_t count) {
 
 	DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
 }
-#else  /* DUK_USE_REFERENCE_COUNTING */
+#else /* DUK_USE_REFERENCE_COUNTING */
 DUK_INTERNAL void duk_pop_n_nodecref_unsafe(duk_hthread *thr, duk_idx_t count) {
 	DUK_ASSERT_API_ENTRY(thr);
 	duk_pop_n_unsafe(thr, count);
 }
-#endif  /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_REFERENCE_COUNTING */
 
 /* Popping one element is called so often that when footprint is not an issue,
  * compile a specialized function for it.
@@ -23499,11 +24705,11 @@ DUK_INTERNAL void duk_pop_nodecref_unsafe(duk_hthread *thr) {
 	DUK_ASSERT_API_ENTRY(thr);
 	duk_pop_n_nodecref_unsafe(thr, 1);
 }
-#else  /* DUK_USE_PREFER_SIZE */
+#else /* DUK_USE_PREFER_SIZE */
 DUK_LOCAL DUK_ALWAYS_INLINE void duk__pop_unsafe_raw(duk_hthread *thr) {
 	duk_tval *tv;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	DUK_ASSERT(thr->valstack_top != thr->valstack_bottom);
 	DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
 	DUK_ASSERT((duk_size_t) (thr->valstack_top - thr->valstack_bottom) >= (duk_size_t) 1);
@@ -23511,7 +24717,7 @@ DUK_LOCAL DUK_ALWAYS_INLINE void duk__pop_unsafe_raw(duk_hthread *thr) {
 	tv = --thr->valstack_top;
 	DUK_ASSERT(tv >= thr->valstack_bottom);
 #if defined(DUK_USE_REFERENCE_COUNTING)
-	DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv);  /* side effects */
+	DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv); /* side effects */
 #else
 	DUK_TVAL_SET_UNDEFINED(tv);
 #endif
@@ -23547,14 +24753,14 @@ DUK_INTERNAL void duk_pop_nodecref_unsafe(duk_hthread *thr) {
 
 	DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
 }
-#endif  /* !DUK_USE_PREFER_SIZE */
+#endif /* !DUK_USE_PREFER_SIZE */
 
 #if defined(DUK_USE_PREFER_SIZE)
 DUK_INTERNAL void duk_pop_undefined(duk_hthread *thr) {
 	DUK_ASSERT_API_ENTRY(thr);
 	duk_pop_nodecref_unsafe(thr);
 }
-#else  /* DUK_USE_PREFER_SIZE */
+#else /* DUK_USE_PREFER_SIZE */
 DUK_INTERNAL void duk_pop_undefined(duk_hthread *thr) {
 	DUK_ASSERT_API_ENTRY(thr);
 	DUK_ASSERT(thr->valstack_top != thr->valstack_bottom);
@@ -23566,7 +24772,7 @@ DUK_INTERNAL void duk_pop_undefined(duk_hthread *thr) {
 
 	DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
 }
-#endif  /* !DUK_USE_PREFER_SIZE */
+#endif /* !DUK_USE_PREFER_SIZE */
 
 #if defined(DUK_USE_PREFER_SIZE)
 DUK_EXTERNAL void duk_pop_2(duk_hthread *thr) {
@@ -23585,7 +24791,7 @@ DUK_INTERNAL void duk_pop_2_nodecref_unsafe(duk_hthread *thr) {
 DUK_LOCAL DUK_ALWAYS_INLINE void duk__pop_2_unsafe_raw(duk_hthread *thr) {
 	duk_tval *tv;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	DUK_ASSERT(thr->valstack_top != thr->valstack_bottom);
 	DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
 	DUK_ASSERT((duk_size_t) (thr->valstack_top - thr->valstack_bottom) >= (duk_size_t) 2);
@@ -23593,14 +24799,14 @@ DUK_LOCAL DUK_ALWAYS_INLINE void duk__pop_2_unsafe_raw(duk_hthread *thr) {
 	tv = --thr->valstack_top;
 	DUK_ASSERT(tv >= thr->valstack_bottom);
 #if defined(DUK_USE_REFERENCE_COUNTING)
-	DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv);  /* side effects */
+	DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv); /* side effects */
 #else
 	DUK_TVAL_SET_UNDEFINED(tv);
 #endif
 	tv = --thr->valstack_top;
 	DUK_ASSERT(tv >= thr->valstack_bottom);
 #if defined(DUK_USE_REFERENCE_COUNTING)
-	DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv);  /* side effects */
+	DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv); /* side effects */
 #else
 	DUK_TVAL_SET_UNDEFINED(tv);
 #endif
@@ -23634,7 +24840,7 @@ DUK_INTERNAL void duk_pop_2_nodecref_unsafe(duk_hthread *thr) {
 
 	DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
 }
-#endif  /* !DUK_USE_PREFER_SIZE */
+#endif /* !DUK_USE_PREFER_SIZE */
 
 DUK_EXTERNAL void duk_pop_3(duk_hthread *thr) {
 	DUK_ASSERT_API_ENTRY(thr);
@@ -23656,6 +24862,7 @@ DUK_INTERNAL void duk_pop_3_nodecref_unsafe(duk_hthread *thr) {
  */
 
 /* XXX: pack index range? array index offset? */
+/* XXX: need ability to pack into a bare array? */
 DUK_INTERNAL void duk_pack(duk_hthread *thr, duk_idx_t count) {
 	duk_tval *tv_src;
 	duk_tval *tv_dst;
@@ -23680,10 +24887,11 @@ DUK_INTERNAL void duk_pack(duk_hthread *thr, duk_idx_t count) {
 	 * multiplying with sizeof(duk_tval) won't wrap.
 	 */
 	DUK_ASSERT(count >= 0 && count <= (duk_idx_t) DUK_USE_VALSTACK_LIMIT);
-	DUK_ASSERT((duk_size_t) count <= DUK_SIZE_MAX / sizeof(duk_tval));  /* no wrapping */
+	DUK_ASSERT((duk_size_t) count <= DUK_SIZE_MAX / sizeof(duk_tval)); /* no wrapping */
 
-	tv_dst = duk_push_harray_with_size_outptr(thr, (duk_uint32_t) count);  /* XXX: uninitialized would be OK */
+	tv_dst = duk_push_harray_with_size_outptr(thr, (duk_uint32_t) count); /* XXX: uninitialized would be OK */
 	DUK_ASSERT(count == 0 || tv_dst != NULL);
+	DUK_ASSERT(!duk_is_bare_object(thr, -1));
 
 	/* Copy value stack values directly to the array part without
 	 * any refcount updates: net refcount changes are zero.
@@ -23695,7 +24903,7 @@ DUK_INTERNAL void duk_pack(duk_hthread *thr, duk_idx_t count) {
 	 * the rest; no refcount operations needed.
 	 */
 
-	tv_dst = tv_src;  /* when count == 0, same as tv_src (OK) */
+	tv_dst = tv_src; /* when count == 0, same as tv_src (OK) */
 	tv_src = thr->valstack_top - 1;
 	DUK_TVAL_SET_TVAL(tv_dst, tv_src);
 
@@ -23725,9 +24933,8 @@ DUK_INTERNAL duk_idx_t duk_unpack_array_like(duk_hthread *thr, duk_idx_t idx) {
 		DUK_ASSERT(h != NULL);
 		DUK_UNREF(h);
 
-#if defined(DUK_USE_ARRAY_FASTPATH)  /* close enough */
-		if (DUK_LIKELY(DUK_HOBJECT_IS_ARRAY(h) &&
-		               ((duk_harray *) h)->length <= DUK_HOBJECT_GET_ASIZE(h))) {
+#if defined(DUK_USE_ARRAY_FASTPATH) /* close enough */
+		if (DUK_LIKELY(DUK_HOBJECT_IS_ARRAY(h) && ((duk_harray *) h)->length <= DUK_HOBJECT_GET_ASIZE(h))) {
 			duk_harray *h_arr;
 			duk_tval *tv_src;
 			duk_tval *tv_dst;
@@ -23748,8 +24955,7 @@ DUK_INTERNAL duk_idx_t duk_unpack_array_like(duk_hthread *thr, duk_idx_t idx) {
 			 * XXX: alternatively, could prevent finalizers for the
 			 * duration.
 			 */
-			if (DUK_UNLIKELY(len != h_arr->length ||
-			                 h_arr->length > DUK_HOBJECT_GET_ASIZE((duk_hobject *) h_arr))) {
+			if (DUK_UNLIKELY(len != h_arr->length || h_arr->length > DUK_HOBJECT_GET_ASIZE((duk_hobject *) h_arr))) {
 				goto skip_fast;
 			}
 
@@ -23768,7 +24974,7 @@ DUK_INTERNAL duk_idx_t duk_unpack_array_like(duk_hthread *thr, duk_idx_t idx) {
 					 * without an ancestor lookup (technically
 					 * not compliant).
 					 */
-					DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(tv_dst));  /* valstack policy */
+					DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(tv_dst)); /* valstack policy */
 				} else {
 					DUK_TVAL_SET_TVAL(tv_dst, tv_src);
 					DUK_TVAL_INCREF(thr, tv_dst);
@@ -23780,8 +24986,8 @@ DUK_INTERNAL duk_idx_t duk_unpack_array_like(duk_hthread *thr, duk_idx_t idx) {
 			thr->valstack_top = tv_dst;
 			return (duk_idx_t) h_arr->length;
 		}
-	 skip_fast:
-#endif  /* DUK_USE_ARRAY_FASTPATH */
+	skip_fast:
+#endif /* DUK_USE_ARRAY_FASTPATH */
 
 		/* Slow path: actual lookups.  The initial 'length' lookup
 		 * decides the output length, regardless of side effects that
@@ -23790,7 +24996,7 @@ DUK_INTERNAL duk_idx_t duk_unpack_array_like(duk_hthread *thr, duk_idx_t idx) {
 		 */
 		idx = duk_normalize_index(thr, idx);
 		duk_get_prop_stridx(thr, idx, DUK_STRIDX_LENGTH);
-		len = duk_to_uint32(thr, -1);  /* ToUint32() coercion required */
+		len = duk_to_uint32(thr, -1); /* ToUint32() coercion required */
 		if (DUK_UNLIKELY(len >= 0x80000000UL)) {
 			goto fail_over_2g;
 		}
@@ -23809,7 +25015,7 @@ DUK_INTERNAL duk_idx_t duk_unpack_array_like(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ERROR_TYPE_INVALID_ARGS(thr);
 	DUK_WO_NORETURN(return 0;);
 
- fail_over_2g:
+fail_over_2g:
 	DUK_ERROR_RANGE_INVALID_LENGTH(thr);
 	DUK_WO_NORETURN(return 0;);
 }
@@ -23818,6 +25024,13 @@ DUK_INTERNAL duk_idx_t duk_unpack_array_like(duk_hthread *thr, duk_idx_t idx) {
  *  Error throwing
  */
 
+#if defined(DUK_USE_GCC_PRAGMAS)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsuggest-attribute=noreturn"
+#elif defined(DUK_USE_CLANG_PRAGMAS)
+#pragma clang diagnostic push
+#endif
+
 DUK_EXTERNAL void duk_throw_raw(duk_hthread *thr) {
 	duk_tval *tv_val;
 
@@ -23887,7 +25100,12 @@ DUK_EXTERNAL void duk_fatal_raw(duk_hthread *thr, const char *err_msg) {
 	}
 }
 
-DUK_EXTERNAL void duk_error_va_raw(duk_hthread *thr, duk_errcode_t err_code, const char *filename, duk_int_t line, const char *fmt, va_list ap) {
+DUK_EXTERNAL void duk_error_va_raw(duk_hthread *thr,
+                                   duk_errcode_t err_code,
+                                   const char *filename,
+                                   duk_int_t line,
+                                   const char *fmt,
+                                   va_list ap) {
 	DUK_ASSERT_API_ENTRY(thr);
 
 	duk_push_error_object_va_raw(thr, err_code, filename, line, fmt, ap);
@@ -23895,7 +25113,12 @@ DUK_EXTERNAL void duk_error_va_raw(duk_hthread *thr, duk_errcode_t err_code, con
 	DUK_WO_NORETURN(return;);
 }
 
-DUK_EXTERNAL void duk_error_raw(duk_hthread *thr, duk_errcode_t err_code, const char *filename, duk_int_t line, const char *fmt, ...) {
+DUK_EXTERNAL void duk_error_raw(duk_hthread *thr,
+                                duk_errcode_t err_code,
+                                const char *filename,
+                                duk_int_t line,
+                                const char *fmt,
+                                ...) {
 	va_list ap;
 
 	DUK_ASSERT_API_ENTRY(thr);
@@ -23907,14 +25130,21 @@ DUK_EXTERNAL void duk_error_raw(duk_hthread *thr, duk_errcode_t err_code, const
 	DUK_WO_NORETURN(return;);
 }
 
+#if defined(DUK_USE_GCC_PRAGMAS)
+#pragma GCC diagnostic pop
+#elif defined(DUK_USE_CLANG_PRAGMAS)
+#pragma clang diagnostic pop
+#endif
+
 #if !defined(DUK_USE_VARIADIC_MACROS)
-DUK_NORETURN(DUK_LOCAL_DECL void duk__throw_error_from_stash(duk_hthread *thr, duk_errcode_t err_code, const char *fmt, va_list ap));
+DUK_NORETURN(
+    DUK_LOCAL_DECL void duk__throw_error_from_stash(duk_hthread *thr, duk_errcode_t err_code, const char *fmt, va_list ap));
 
 DUK_LOCAL void duk__throw_error_from_stash(duk_hthread *thr, duk_errcode_t err_code, const char *fmt, va_list ap) {
 	const char *filename;
 	duk_int_t line;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 
 	filename = duk_api_global_filename;
 	line = duk_api_global_line;
@@ -23926,7 +25156,8 @@ DUK_LOCAL void duk__throw_error_from_stash(duk_hthread *thr, duk_errcode_t err_c
 	DUK_WO_NORETURN(return;);
 }
 
-#define DUK__ERROR_STASH_SHARED(code) do { \
+#define DUK__ERROR_STASH_SHARED(code) \
+	do { \
 		va_list ap; \
 		va_start(ap, fmt); \
 		duk__throw_error_from_stash(thr, (code), fmt, ap); \
@@ -23966,7 +25197,7 @@ DUK_EXTERNAL duk_ret_t duk_uri_error_stash(duk_hthread *thr, const char *fmt, ..
 	DUK_ASSERT_API_ENTRY(thr);
 	DUK__ERROR_STASH_SHARED(DUK_ERR_URI_ERROR);
 }
-#endif  /* DUK_USE_VARIADIC_MACROS */
+#endif /* DUK_USE_VARIADIC_MACROS */
 
 /*
  *  Comparison
@@ -24085,7 +25316,7 @@ DUK_INTERNAL void duk_push_lightfunc_tostring(duk_hthread *thr, duk_tval *tv) {
 	DUK_ASSERT_API_ENTRY(thr);
 	DUK_ASSERT(DUK_TVAL_IS_LIGHTFUNC(tv));
 
-	DUK_TVAL_GET_LIGHTFUNC(tv, func, lf_flags);  /* read before 'tv' potentially invalidated */
+	DUK_TVAL_GET_LIGHTFUNC(tv, func, lf_flags); /* read before 'tv' potentially invalidated */
 	duk_push_literal(thr, "function ");
 	duk_push_lightfunc_name_raw(thr, func, lf_flags);
 	duk_push_literal(thr, "() { [lightfunc code] }");
@@ -24106,7 +25337,7 @@ DUK_INTERNAL void duk_push_string_funcptr(duk_hthread *thr, duk_uint8_t *ptr, du
 	duk_small_uint_t t;
 
 	DUK_ASSERT_API_ENTRY(thr);
-	DUK_ASSERT(sz <= 32);  /* sanity limit for function pointer size */
+	DUK_ASSERT(sz <= 32); /* sanity limit for function pointer size */
 
 	p = buf;
 #if defined(DUK_USE_INTEGER_LE)
@@ -24135,9 +25366,9 @@ DUK_INTERNAL void duk_push_string_funcptr(duk_hthread *thr, duk_uint8_t *ptr, du
  */
 
 /* String limits for summary strings. */
-#define DUK__READABLE_SUMMARY_MAXCHARS 96  /* maximum supported by helper */
-#define DUK__READABLE_STRING_MAXCHARS  32  /* for strings/symbols */
-#define DUK__READABLE_ERRMSG_MAXCHARS  96  /* for error messages */
+#define DUK__READABLE_SUMMARY_MAXCHARS 96 /* maximum supported by helper */
+#define DUK__READABLE_STRING_MAXCHARS  32 /* for strings/symbols */
+#define DUK__READABLE_ERRMSG_MAXCHARS  96 /* for error messages */
 
 /* String sanitizer which escapes ASCII control characters and a few other
  * ASCII characters, passes Unicode as is, and replaces invalid UTF-8 with
@@ -24146,13 +25377,12 @@ DUK_INTERNAL void duk_push_string_funcptr(duk_hthread *thr, duk_uint8_t *ptr, du
  */
 DUK_LOCAL void duk__push_hstring_readable_unicode(duk_hthread *thr, duk_hstring *h_input, duk_small_uint_t maxchars) {
 	const duk_uint8_t *p, *p_start, *p_end;
-	duk_uint8_t buf[DUK_UNICODE_MAX_XUTF8_LENGTH * DUK__READABLE_SUMMARY_MAXCHARS +
-	                2 /*quotes*/ + 3 /*periods*/];
+	duk_uint8_t buf[DUK_UNICODE_MAX_XUTF8_LENGTH * DUK__READABLE_SUMMARY_MAXCHARS + 2 /*quotes*/ + 3 /*periods*/];
 	duk_uint8_t *q;
 	duk_ucodepoint_t cp;
 	duk_small_uint_t nchars;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	DUK_ASSERT(h_input != NULL);
 	DUK_ASSERT(maxchars <= DUK__READABLE_SUMMARY_MAXCHARS);
 
@@ -24175,7 +25405,7 @@ DUK_LOCAL void duk__push_hstring_readable_unicode(duk_hthread *thr, duk_hstring
 		}
 		if (duk_unicode_decode_xutf8(thr, &p, p_start, p_end, &cp)) {
 			if (cp < 0x20 || cp == 0x7f || cp == DUK_ASC_SINGLEQUOTE || cp == DUK_ASC_BACKSLASH) {
-				DUK_ASSERT(DUK_UNICODE_MAX_XUTF8_LENGTH >= 4);  /* estimate is valid */
+				DUK_ASSERT(DUK_UNICODE_MAX_XUTF8_LENGTH >= 4); /* estimate is valid */
 				DUK_ASSERT((cp >> 4) <= 0x0f);
 				*q++ = (duk_uint8_t) DUK_ASC_BACKSLASH;
 				*q++ = (duk_uint8_t) DUK_ASC_LC_X;
@@ -24185,7 +25415,7 @@ DUK_LOCAL void duk__push_hstring_readable_unicode(duk_hthread *thr, duk_hstring
 				q += duk_unicode_encode_xutf8(cp, q);
 			}
 		} else {
-			p++;  /* advance manually */
+			p++; /* advance manually */
 			*q++ = (duk_uint8_t) DUK_ASC_QUESTION;
 		}
 		nchars++;
@@ -24196,7 +25426,7 @@ DUK_LOCAL void duk__push_hstring_readable_unicode(duk_hthread *thr, duk_hstring
 }
 
 DUK_LOCAL const char *duk__push_string_tval_readable(duk_hthread *thr, duk_tval *tv, duk_bool_t error_aware) {
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	/* 'tv' may be NULL */
 
 	if (tv == NULL) {
@@ -24224,8 +25454,10 @@ DUK_LOCAL const char *duk__push_string_tval_readable(duk_hthread *thr, duk_tval
 			duk_hobject *h = DUK_TVAL_GET_OBJECT(tv);
 			DUK_ASSERT(h != NULL);
 
-			if (error_aware &&
-			    duk_hobject_prototype_chain_contains(thr, h, thr->builtins[DUK_BIDX_ERROR_PROTOTYPE], 1 /*ignore_loop*/)) {
+			if (error_aware && duk_hobject_prototype_chain_contains(thr,
+			                                                        h,
+			                                                        thr->builtins[DUK_BIDX_ERROR_PROTOTYPE],
+			                                                        1 /*ignore_loop*/)) {
 				/* Get error message in a side effect free way if
 				 * possible; if not, summarize as a generic object.
 				 * Error message currently gets quoted.
@@ -24234,12 +25466,14 @@ DUK_LOCAL const char *duk__push_string_tval_readable(duk_hthread *thr, duk_tval
 				 * but traverse inheritance chain.
 				 */
 				duk_tval *tv_msg;
-				tv_msg = duk_hobject_find_existing_entry_tval_ptr(thr->heap, h, DUK_HTHREAD_STRING_MESSAGE(thr));
+				tv_msg = duk_hobject_find_entry_tval_ptr_stridx(thr->heap, h, DUK_STRIDX_MESSAGE);
 				if (tv_msg != NULL && DUK_TVAL_IS_STRING(tv_msg)) {
 					/* It's critical to avoid recursion so
 					 * only summarize a string .message.
 					 */
-					duk__push_hstring_readable_unicode(thr, DUK_TVAL_GET_STRING(tv_msg), DUK__READABLE_ERRMSG_MAXCHARS);
+					duk__push_hstring_readable_unicode(thr,
+					                                   DUK_TVAL_GET_STRING(tv_msg),
+					                                   DUK__READABLE_ERRMSG_MAXCHARS);
 					break;
 				}
 			}
@@ -24322,7 +25556,7 @@ DUK_INTERNAL void duk_push_symbol_descriptive_string(duk_hthread *thr, duk_hstri
  *  Functions
  */
 
-#if 0  /* not used yet */
+#if 0 /* not used yet */
 DUK_INTERNAL void duk_push_hnatfunc_name(duk_hthread *thr, duk_hnatfunc *h) {
 	duk_c_function func;
 
@@ -24349,7 +25583,7 @@ DUK_INTERNAL void duk_copy_tvals_incref(duk_hthread *thr, duk_tval *tv_dst, duk_
 
 	DUK_ASSERT_API_ENTRY(thr);
 	DUK_UNREF(thr);
-	DUK_ASSERT(count * sizeof(duk_tval) >= count);  /* no wrap */
+	DUK_ASSERT(count * sizeof(duk_tval) >= count); /* no wrap */
 
 	duk_memcpy_unsafe((void *) tv_dst, (const void *) tv_src, count * sizeof(duk_tval));
 
@@ -24382,7 +25616,7 @@ DUK_LOCAL void duk__concat_and_join_helper(duk_hthread *thr, duk_idx_t count_in,
 	duk_hstring *h;
 	duk_uint8_t *buf;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 
 	if (DUK_UNLIKELY(count_in <= 0)) {
 		if (count_in < 0) {
@@ -24421,15 +25655,14 @@ DUK_LOCAL void duk__concat_and_join_helper(duk_hthread *thr, duk_idx_t count_in,
 		/* Impose a string maximum length, need to handle overflow
 		 * correctly.
 		 */
-		if (new_len < len ||  /* wrapped */
+		if (new_len < len || /* wrapped */
 		    new_len > (duk_size_t) DUK_HSTRING_MAX_BYTELEN) {
 			goto error_overflow;
 		}
 		len = new_len;
 	}
 
-	DUK_DDD(DUK_DDDPRINT("join/concat %lu strings, total length %lu bytes",
-	                     (unsigned long) count, (unsigned long) len));
+	DUK_DDD(DUK_DDDPRINT("join/concat %lu strings, total length %lu bytes", (unsigned long) count, (unsigned long) len));
 
 	/* Use stack allocated buffer to ensure reachability in errors
 	 * (e.g. intern error).
@@ -24442,11 +25675,11 @@ DUK_LOCAL void duk__concat_and_join_helper(duk_hthread *thr, duk_idx_t count_in,
 	idx = 0;
 	for (i = count; i >= 1; i--) {
 		if (is_join && i != count) {
-			h = duk_require_hstring(thr, -((duk_idx_t) count) - 2);  /* extra -1 for buffer */
+			h = duk_require_hstring(thr, -((duk_idx_t) count) - 2); /* extra -1 for buffer */
 			duk_memcpy(buf + idx, DUK_HSTRING_GET_DATA(h), DUK_HSTRING_GET_BYTELEN(h));
 			idx += DUK_HSTRING_GET_BYTELEN(h);
 		}
-		h = duk_require_hstring(thr, -((duk_idx_t) i) - 1);  /* extra -1 for buffer */
+		h = duk_require_hstring(thr, -((duk_idx_t) i) - 1); /* extra -1 for buffer */
 		duk_memcpy(buf + idx, DUK_HSTRING_GET_DATA(h), DUK_HSTRING_GET_BYTELEN(h));
 		idx += DUK_HSTRING_GET_BYTELEN(h);
 	}
@@ -24458,21 +25691,21 @@ DUK_LOCAL void duk__concat_and_join_helper(duk_hthread *thr, duk_idx_t count_in,
 	/* Get rid of the strings early to minimize memory use before intern. */
 
 	if (is_join) {
-		duk_replace(thr, -((duk_idx_t) count) - 2);  /* overwrite sep */
+		duk_replace(thr, -((duk_idx_t) count) - 2); /* overwrite sep */
 		duk_pop_n(thr, (duk_idx_t) count);
 	} else {
-		duk_replace(thr, -((duk_idx_t) count) - 1);  /* overwrite str1 */
+		duk_replace(thr, -((duk_idx_t) count) - 1); /* overwrite str1 */
 		duk_pop_n(thr, (duk_idx_t) (count - 1));
 	}
 
 	/* [ ... buf ] */
 
-	(void) duk_buffer_to_string(thr, -1);  /* Safe if inputs are safe. */
+	(void) duk_buffer_to_string(thr, -1); /* Safe if inputs are safe. */
 
 	/* [ ... res ] */
 	return;
 
- error_overflow:
+error_overflow:
 	DUK_ERROR_RANGE(thr, DUK_STR_RESULT_TOO_LONG);
 	DUK_WO_NORETURN(return;);
 }
@@ -24488,7 +25721,7 @@ DUK_INTERNAL void duk_concat_2(duk_hthread *thr) {
 	DUK_ASSERT_API_ENTRY(thr);
 	duk_concat(thr, 2);
 }
-#else  /* DUK_USE_PREFER_SIZE */
+#else /* DUK_USE_PREFER_SIZE */
 DUK_INTERNAL void duk_concat_2(duk_hthread *thr) {
 	duk_hstring *h1;
 	duk_hstring *h2;
@@ -24498,14 +25731,14 @@ DUK_INTERNAL void duk_concat_2(duk_hthread *thr) {
 	duk_size_t len;
 
 	DUK_ASSERT_API_ENTRY(thr);
-	DUK_ASSERT(duk_get_top(thr) >= 2);  /* Trusted caller. */
+	DUK_ASSERT(duk_get_top(thr) >= 2); /* Trusted caller. */
 
 	h1 = duk_to_hstring(thr, -2);
 	h2 = duk_to_hstring(thr, -1);
 	len1 = (duk_size_t) DUK_HSTRING_GET_BYTELEN(h1);
 	len2 = (duk_size_t) DUK_HSTRING_GET_BYTELEN(h2);
 	len = len1 + len2;
-	if (DUK_UNLIKELY(len < len1 ||  /* wrapped */
+	if (DUK_UNLIKELY(len < len1 || /* wrapped */
 	                 len > (duk_size_t) DUK_HSTRING_MAX_BYTELEN)) {
 		goto error_overflow;
 	}
@@ -24514,7 +25747,7 @@ DUK_INTERNAL void duk_concat_2(duk_hthread *thr) {
 
 	duk_memcpy((void *) buf, (const void *) DUK_HSTRING_GET_DATA(h1), (size_t) len1);
 	duk_memcpy((void *) (buf + len1), (const void *) DUK_HSTRING_GET_DATA(h2), (size_t) len2);
-	(void) duk_buffer_to_string(thr, -1);  /* Safe if inputs are safe. */
+	(void) duk_buffer_to_string(thr, -1); /* Safe if inputs are safe. */
 
 	/* [ ... str1 str2 buf ] */
 
@@ -24522,11 +25755,11 @@ DUK_INTERNAL void duk_concat_2(duk_hthread *thr) {
 	duk_pop_unsafe(thr);
 	return;
 
- error_overflow:
+error_overflow:
 	DUK_ERROR_RANGE(thr, DUK_STR_RESULT_TOO_LONG);
 	DUK_WO_NORETURN(return;);
 }
-#endif  /* DUK_USE_PREFER_SIZE */
+#endif /* DUK_USE_PREFER_SIZE */
 
 DUK_EXTERNAL void duk_join(duk_hthread *thr, duk_idx_t count) {
 	DUK_ASSERT_API_ENTRY(thr);
@@ -24545,7 +25778,7 @@ DUK_EXTERNAL void duk_decode_string(duk_hthread *thr, duk_idx_t idx, duk_decode_
 
 	DUK_ASSERT_API_ENTRY(thr);
 
-	h_input = duk_require_hstring(thr, idx);  /* Accept symbols. */
+	h_input = duk_require_hstring(thr, idx); /* Accept symbols. */
 	DUK_ASSERT(h_input != NULL);
 
 	p_start = (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h_input);
@@ -24572,11 +25805,11 @@ DUK_EXTERNAL void duk_map_string(duk_hthread *thr, duk_idx_t idx, duk_map_char_f
 
 	idx = duk_normalize_index(thr, idx);
 
-	h_input = duk_require_hstring(thr, idx);  /* Accept symbols. */
+	h_input = duk_require_hstring(thr, idx); /* Accept symbols. */
 	DUK_ASSERT(h_input != NULL);
 
 	bw = &bw_alloc;
-	DUK_BW_INIT_PUSHBUF(thr, bw, DUK_HSTRING_GET_BYTELEN(h_input));  /* Reasonable output estimate. */
+	DUK_BW_INIT_PUSHBUF(thr, bw, DUK_HSTRING_GET_BYTELEN(h_input)); /* Reasonable output estimate. */
 
 	p_start = (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h_input);
 	p_end = p_start + DUK_HSTRING_GET_BYTELEN(h_input);
@@ -24597,7 +25830,7 @@ DUK_EXTERNAL void duk_map_string(duk_hthread *thr, duk_idx_t idx, duk_map_char_f
 	}
 
 	DUK_BW_COMPACT(thr, bw);
-	(void) duk_buffer_to_string(thr, -1);  /* Safe, extended UTF-8 encoded. */
+	(void) duk_buffer_to_string(thr, -1); /* Safe, extended UTF-8 encoded. */
 	duk_replace(thr, idx);
 }
 
@@ -24610,7 +25843,7 @@ DUK_EXTERNAL void duk_substring(duk_hthread *thr, duk_idx_t idx, duk_size_t star
 
 	DUK_ASSERT_API_ENTRY(thr);
 
-	idx = duk_require_normalize_index(thr, idx);  /* Accept symbols. */
+	idx = duk_require_normalize_index(thr, idx); /* Accept symbols. */
 	h = duk_require_hstring(thr, idx);
 	DUK_ASSERT(h != NULL);
 
@@ -24635,7 +25868,7 @@ DUK_EXTERNAL void duk_substring(duk_hthread *thr, duk_idx_t idx, duk_size_t star
 	end_byte_offset = (duk_size_t) duk_heap_strcache_offset_char2byte(thr, h, (duk_uint_fast32_t) end_offset);
 
 	DUK_ASSERT(end_byte_offset >= start_byte_offset);
-	DUK_ASSERT(end_byte_offset - start_byte_offset <= DUK_UINT32_MAX);  /* Guaranteed by string limits. */
+	DUK_ASSERT(end_byte_offset - start_byte_offset <= DUK_UINT32_MAX); /* Guaranteed by string limits. */
 
 	/* No size check is necessary. */
 	res = duk_heap_strtable_intern_checked(thr,
@@ -24651,13 +25884,13 @@ DUK_EXTERNAL void duk_substring(duk_hthread *thr, duk_idx_t idx, duk_size_t star
  */
 DUK_EXTERNAL void duk_trim(duk_hthread *thr, duk_idx_t idx) {
 	duk_hstring *h;
-	const duk_uint8_t *p, *p_start, *p_end, *p_tmp1, *p_tmp2;  /* pointers for scanning */
-	const duk_uint8_t *q_start, *q_end;  /* start (incl) and end (excl) of trimmed part */
+	const duk_uint8_t *p, *p_start, *p_end, *p_tmp1, *p_tmp2; /* pointers for scanning */
+	const duk_uint8_t *q_start, *q_end; /* start (incl) and end (excl) of trimmed part */
 	duk_codepoint_t cp;
 
 	DUK_ASSERT_API_ENTRY(thr);
 
-	idx = duk_require_normalize_index(thr, idx);  /* Accept symbols. */
+	idx = duk_require_normalize_index(thr, idx); /* Accept symbols. */
 	h = duk_require_hstring(thr, idx);
 	DUK_ASSERT(h != NULL);
 
@@ -24699,7 +25932,7 @@ DUK_EXTERNAL void duk_trim(duk_hthread *thr, duk_idx_t idx) {
 	}
 	q_end = p;
 
- scan_done:
+scan_done:
 	/* This may happen when forward and backward scanning disagree
 	 * (possible for non-extended-UTF-8 strings).
 	 */
@@ -24712,8 +25945,10 @@ DUK_EXTERNAL void duk_trim(duk_hthread *thr, duk_idx_t idx) {
 	DUK_ASSERT(q_end >= q_start);
 
 	DUK_DDD(DUK_DDDPRINT("trim: p_start=%p, p_end=%p, q_start=%p, q_end=%p",
-	                     (const void *) p_start, (const void *) p_end,
-	                     (const void *) q_start, (const void *) q_end));
+	                     (const void *) p_start,
+	                     (const void *) p_end,
+	                     (const void *) q_start,
+	                     (const void *) q_end));
 
 	if (q_start == p_start && q_end == p_end) {
 		DUK_DDD(DUK_DDDPRINT("nothing was trimmed: avoid interning (hashing etc)"));
@@ -24734,15 +25969,15 @@ DUK_EXTERNAL duk_codepoint_t duk_char_code_at(duk_hthread *thr, duk_idx_t idx, d
 	 * is handling of clamped offsets.
 	 */
 
-	h = duk_require_hstring(thr, idx);  /* Accept symbols. */
+	h = duk_require_hstring(thr, idx); /* Accept symbols. */
 	DUK_ASSERT(h != NULL);
 
-	DUK_ASSERT_DISABLE(char_offset >= 0);  /* Always true, arg is unsigned. */
+	DUK_ASSERT_DISABLE(char_offset >= 0); /* Always true, arg is unsigned. */
 	if (char_offset >= DUK_HSTRING_GET_CHARLEN(h)) {
 		return 0;
 	}
 
-	DUK_ASSERT(char_offset <= DUK_UINT_MAX);  /* Guaranteed by string limits. */
+	DUK_ASSERT(char_offset <= DUK_UINT_MAX); /* Guaranteed by string limits. */
 	cp = duk_hstring_char_code_at_raw(thr, h, (duk_uint_t) char_offset, 0 /*surrogate_aware*/);
 	return (duk_codepoint_t) cp;
 }
@@ -24785,7 +26020,7 @@ DUK_EXTERNAL duk_double_t duk_get_now(duk_hthread *thr) {
 	return duk_time_get_ecmascript_time(thr);
 }
 
-#if 0  /* XXX: worth exposing? */
+#if 0 /* XXX: worth exposing? */
 DUK_EXTERNAL duk_double_t duk_get_monotonic_time(duk_hthread *thr) {
 	DUK_ASSERT_API_ENTRY(thr);
 	DUK_UNREF(thr);
@@ -24800,7 +26035,7 @@ DUK_EXTERNAL void duk_time_to_components(duk_hthread *thr, duk_double_t timeval,
 	duk_uint_t flags;
 
 	DUK_ASSERT_API_ENTRY(thr);
-	DUK_ASSERT(comp != NULL);  /* XXX: or check? */
+	DUK_ASSERT(comp != NULL); /* XXX: or check? */
 	DUK_UNREF(thr);
 
 	/* Convert as one-based, but change month to zero-based to match the
@@ -24829,7 +26064,7 @@ DUK_EXTERNAL duk_double_t duk_components_to_time(duk_hthread *thr, duk_time_comp
 	duk_uint_t flags;
 
 	DUK_ASSERT_API_ENTRY(thr);
-	DUK_ASSERT(comp != NULL);  /* XXX: or check? */
+	DUK_ASSERT(comp != NULL); /* XXX: or check? */
 	DUK_UNREF(thr);
 
 	/* Match Date constructor behavior (with UTC time).  Month is given
@@ -24850,7 +26085,7 @@ DUK_EXTERNAL duk_double_t duk_components_to_time(duk_hthread *thr, duk_time_comp
 	dparts[DUK_DATE_IDX_MINUTE] = comp->minutes;
 	dparts[DUK_DATE_IDX_SECOND] = comp->seconds;
 	dparts[DUK_DATE_IDX_MILLISECOND] = comp->milliseconds;
-	dparts[DUK_DATE_IDX_WEEKDAY] = 0;  /* ignored */
+	dparts[DUK_DATE_IDX_WEEKDAY] = 0; /* ignored */
 
 	d = duk_bi_date_get_timeval_from_dparts(dparts, flags);
 
@@ -24901,7 +26136,7 @@ DUK_EXTERNAL duk_double_t duk_components_to_time(duk_hthread *thr, duk_time_comp
 /* Perform an intermediate join when this many elements have been pushed
  * on the value stack.
  */
-#define  DUK__ARRAY_MID_JOIN_LIMIT  4096
+#define DUK__ARRAY_MID_JOIN_LIMIT 4096
 
 #if defined(DUK_USE_ARRAY_BUILTIN)
 
@@ -24919,7 +26154,7 @@ DUK_LOCAL duk_uint32_t duk__push_this_obj_len_u32(duk_hthread *thr) {
 
 	/* XXX: push more directly? */
 	(void) duk_push_this_coercible_to_object(thr);
-	DUK_ASSERT_HOBJECT_VALID(duk_get_hobject(thr, -1));
+	DUK_HOBJECT_ASSERT_VALID(duk_get_hobject(thr, -1));
 	duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_LENGTH);
 	len = duk_to_uint32(thr, -1);
 
@@ -24952,7 +26187,7 @@ DUK_LOCAL duk_harray *duk__arraypart_fastpath_this(duk_hthread *thr) {
 	duk_hobject *h;
 	duk_uint_t flags_mask, flags_bits, flags_value;
 
-	DUK_ASSERT(thr->valstack_bottom > thr->valstack);  /* because call in progress */
+	DUK_ASSERT(thr->valstack_bottom > thr->valstack); /* because call in progress */
 	tv = DUK_GET_THIS_TVAL_PTR(thr);
 
 	/* Fast path requires that 'this' is a duk_harray.  Read only arrays
@@ -24964,11 +26199,8 @@ DUK_LOCAL duk_harray *duk__arraypart_fastpath_this(duk_hthread *thr) {
 	}
 	h = DUK_TVAL_GET_OBJECT(tv);
 	DUK_ASSERT(h != NULL);
-	flags_mask = DUK_HOBJECT_FLAG_ARRAY_PART | \
-	             DUK_HOBJECT_FLAG_EXOTIC_ARRAY | \
-	             DUK_HEAPHDR_FLAG_READONLY;
-	flags_bits = DUK_HOBJECT_FLAG_ARRAY_PART | \
-	             DUK_HOBJECT_FLAG_EXOTIC_ARRAY;
+	flags_mask = DUK_HOBJECT_FLAG_ARRAY_PART | DUK_HOBJECT_FLAG_EXOTIC_ARRAY | DUK_HEAPHDR_FLAG_READONLY;
+	flags_bits = DUK_HOBJECT_FLAG_ARRAY_PART | DUK_HOBJECT_FLAG_EXOTIC_ARRAY;
 	flags_value = DUK_HEAPHDR_GET_FLAGS_RAW((duk_heaphdr *) h);
 	if ((flags_value & flags_mask) != flags_bits) {
 		DUK_DD(DUK_DDPRINT("reject array fast path: object flag check failed"));
@@ -24994,7 +26226,7 @@ DUK_LOCAL duk_harray *duk__arraypart_fastpath_this(duk_hthread *thr) {
 	DUK_DD(DUK_DDPRINT("array fast path allowed for: %!O", (duk_heaphdr *) h));
 	return (duk_harray *) h;
 }
-#endif  /* DUK_USE_ARRAY_FASTPATH */
+#endif /* DUK_USE_ARRAY_FASTPATH */
 
 /*
  *  Constructor
@@ -25013,7 +26245,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_constructor(duk_hthread *thr) {
 		/* XXX: expensive check (also shared elsewhere - so add a shared internal API call?) */
 		d = duk_get_number(thr, 0);
 		len = duk_to_uint32(thr, 0);
-		if (((duk_double_t) len) != d) {
+		if (!duk_double_equals((duk_double_t) len, d)) {
 			DUK_DCERROR_RANGE_INVALID_LENGTH(thr);
 		}
 
@@ -25023,6 +26255,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_constructor(duk_hthread *thr) {
 		len_prealloc = len < 64 ? len : 64;
 		a = duk_push_harray_with_size(thr, len_prealloc);
 		DUK_ASSERT(a != NULL);
+		DUK_ASSERT(!duk_is_bare_object(thr, -1));
 		a->length = len;
 		return 1;
 	}
@@ -25036,10 +26269,8 @@ DUK_INTERNAL duk_ret_t duk_bi_array_constructor(duk_hthread *thr) {
  */
 
 DUK_INTERNAL duk_ret_t duk_bi_array_constructor_is_array(duk_hthread *thr) {
-	duk_hobject *h;
-
-	h = duk_get_hobject_with_class(thr, 0, DUK_HOBJECT_CLASS_ARRAY);
-	duk_push_boolean(thr, (h != NULL));
+	DUK_ASSERT_TOP(thr, 1);
+	duk_push_boolean(thr, duk_js_isarray(DUK_GET_TVAL_POSIDX(thr, 0)));
 	return 1;
 }
 
@@ -25065,7 +26296,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_to_string(duk_hthread *thr) {
 		 */
 		DUK_DDD(DUK_DDDPRINT("this.join is not callable, fall back to (original) Object.toString"));
 		duk_set_top(thr, 0);
-		return duk_bi_object_prototype_to_string(thr);  /* has access to 'this' binding */
+		return duk_bi_object_prototype_to_string(thr); /* has access to 'this' binding */
 	}
 
 	/* [ ... this func ] */
@@ -25074,9 +26305,8 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_to_string(duk_hthread *thr) {
 
 	/* [ ... func this ] */
 
-	DUK_DDD(DUK_DDDPRINT("calling: func=%!iT, this=%!iT",
-	                     (duk_tval *) duk_get_tval(thr, -2),
-	                     (duk_tval *) duk_get_tval(thr, -1)));
+	DUK_DDD(
+	    DUK_DDDPRINT("calling: func=%!iT, this=%!iT", (duk_tval *) duk_get_tval(thr, -2), (duk_tval *) duk_get_tval(thr, -1)));
 	duk_call_method(thr, 0);
 
 	return 1;
@@ -25106,7 +26336,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_concat(duk_hthread *thr) {
 	(void) duk_push_this_coercible_to_object(thr);
 	duk_insert(thr, 0);
 	n = duk_get_top(thr);
-	duk_push_array(thr);  /* -> [ ToObject(this) item1 ... itemN arr ] */
+	duk_push_array(thr); /* -> [ ToObject(this) item1 ... itemN arr ] */
 
 	/* NOTE: The Array special behaviors are NOT invoked by duk_xdef_prop_index()
 	 * (which differs from the official algorithm).  If no error is thrown, this
@@ -25132,13 +26362,13 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_concat(duk_hthread *thr) {
 #if defined(DUK_USE_SYMBOL_BUILTIN)
 			duk_get_prop_stridx(thr, i, DUK_STRIDX_WELLKNOWN_SYMBOL_IS_CONCAT_SPREADABLE);
 			if (duk_is_undefined(thr, -1)) {
-				spreadable = (DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_ARRAY);
+				spreadable = duk_js_isarray_hobject(h);
 			} else {
 				spreadable = duk_to_boolean(thr, -1);
 			}
 			duk_pop_nodecref_unsafe(thr);
 #else
-			spreadable = (DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_ARRAY);
+			spreadable = duk_js_isarray_hobject(h);
 #endif
 		}
 
@@ -25157,7 +26387,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_concat(duk_hthread *thr) {
 		}
 
 		DUK_ASSERT(duk_is_object(thr, i));
-		need_has_check = (DUK_HOBJECT_IS_PROXY(h) != 0);  /* Always 0 w/o Proxy support. */
+		need_has_check = (DUK_HOBJECT_IS_PROXY(h) != 0); /* Always 0 w/o Proxy support. */
 
 		/* [ ToObject(this) item1 ... itemN arr ] */
 
@@ -25189,7 +26419,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_concat(duk_hthread *thr) {
 				}
 			}
 			idx++;
-			DUK_ASSERT(idx != 0U);  /* Wrap check above. */
+			DUK_ASSERT(idx != 0U); /* Wrap check above. */
 		}
 	}
 
@@ -25204,7 +26434,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_concat(duk_hthread *thr) {
 	DUK_ASSERT_TOP(thr, n + 1);
 	return 1;
 
- fail_wrap:
+fail_wrap:
 	DUK_ERROR_RANGE_INVALID_LENGTH(thr);
 	DUK_WO_NORETURN(return 0;);
 }
@@ -25250,8 +26480,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_join_shared(duk_hthread *thr) {
 	                     (unsigned long) len));
 
 	/* The extra (+4) is tight. */
-	valstack_required = (duk_idx_t) ((len >= DUK__ARRAY_MID_JOIN_LIMIT ?
-	                                  DUK__ARRAY_MID_JOIN_LIMIT : len) + 4);
+	valstack_required = (duk_idx_t) ((len >= DUK__ARRAY_MID_JOIN_LIMIT ? DUK__ARRAY_MID_JOIN_LIMIT : len) + 4);
 	duk_require_stack(thr, valstack_required);
 
 	duk_dup_0(thr);
@@ -25262,14 +26491,13 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_join_shared(duk_hthread *thr) {
 	idx = 0;
 	for (;;) {
 		DUK_DDD(DUK_DDDPRINT("join idx=%ld", (long) idx));
-		if (count >= DUK__ARRAY_MID_JOIN_LIMIT ||   /* intermediate join to avoid valstack overflow */
+		if (count >= DUK__ARRAY_MID_JOIN_LIMIT || /* intermediate join to avoid valstack overflow */
 		    idx >= len) { /* end of loop (careful with len==0) */
 			/* [ sep ToObject(this) len sep str0 ... str(count-1) ] */
-			DUK_DDD(DUK_DDDPRINT("mid/final join, count=%ld, idx=%ld, len=%ld",
-			                     (long) count, (long) idx, (long) len));
-			duk_join(thr, (duk_idx_t) count);  /* -> [ sep ToObject(this) len str ] */
-			duk_dup_0(thr);                    /* -> [ sep ToObject(this) len str sep ] */
-			duk_insert(thr, -2);               /* -> [ sep ToObject(this) len sep str ] */
+			DUK_DDD(DUK_DDDPRINT("mid/final join, count=%ld, idx=%ld, len=%ld", (long) count, (long) idx, (long) len));
+			duk_join(thr, (duk_idx_t) count); /* -> [ sep ToObject(this) len str ] */
+			duk_dup_0(thr); /* -> [ sep ToObject(this) len str sep ] */
+			duk_insert(thr, -2); /* -> [ sep ToObject(this) len sep str ] */
 			count = 1;
 		}
 		if (idx >= len) {
@@ -25285,7 +26513,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_join_shared(duk_hthread *thr) {
 			if (to_locale_string) {
 				duk_to_object(thr, -1);
 				duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_TO_LOCALE_STRING);
-				duk_insert(thr, -2);  /* -> [ ... toLocaleString ToObject(val) ] */
+				duk_insert(thr, -2); /* -> [ ... toLocaleString ToObject(val) ] */
 				duk_call_method(thr, 0);
 			}
 			duk_to_string(thr, -1);
@@ -25343,7 +26571,7 @@ DUK_LOCAL duk_ret_t duk__array_pop_fastpath(duk_hthread *thr, duk_harray *h_arr)
 
 	return 1;
 }
-#endif  /* DUK_USE_ARRAY_FASTPATH */
+#endif /* DUK_USE_ARRAY_FASTPATH */
 
 DUK_INTERNAL duk_ret_t duk_bi_array_prototype_pop(duk_hthread *thr) {
 	duk_uint32_t len;
@@ -25394,7 +26622,7 @@ DUK_LOCAL duk_ret_t duk__array_push_fastpath(duk_hthread *thr, duk_harray *h_arr
 	DUK_ASSERT((duk_uint32_t) n <= DUK_UINT32_MAX);
 	if (DUK_UNLIKELY(len + (duk_uint32_t) n < len)) {
 		DUK_D(DUK_DPRINT("Array.prototype.push() would go beyond 32-bit length, throw"));
-		DUK_DCERROR_RANGE_INVALID_LENGTH(thr);  /* != 0 return value returned as is by caller */
+		DUK_DCERROR_RANGE_INVALID_LENGTH(thr); /* != 0 return value returned as is by caller */
 	}
 	if (len + (duk_uint32_t) n > DUK_HOBJECT_GET_ASIZE((duk_hobject *) h_arr)) {
 		/* Array part would need to be extended.  Rely on slow path
@@ -25424,7 +26652,7 @@ DUK_LOCAL duk_ret_t duk__array_push_fastpath(duk_hthread *thr, duk_harray *h_arr
 	duk_push_uint(thr, (duk_uint_t) len);
 	return 1;
 }
-#endif  /* DUK_USE_ARRAY_FASTPATH */
+#endif /* DUK_USE_ARRAY_FASTPATH */
 
 DUK_INTERNAL duk_ret_t duk_bi_array_prototype_push(duk_hthread *thr) {
 	/* Note: 'this' is not necessarily an Array object.  The push()
@@ -25499,7 +26727,7 @@ DUK_LOCAL duk_small_int_t duk__array_sort_compare(duk_hthread *thr, duk_int_t id
 	duk_bool_t have1, have2;
 	duk_bool_t undef1, undef2;
 	duk_small_int_t ret;
-	duk_idx_t idx_obj = 1;  /* fixed offsets in valstack */
+	duk_idx_t idx_obj = 1; /* fixed offsets in valstack */
 	duk_idx_t idx_fn = 0;
 	duk_hstring *h1, *h2;
 
@@ -25520,7 +26748,8 @@ DUK_LOCAL duk_small_int_t duk__array_sort_compare(duk_hthread *thr, duk_int_t id
 
 	if (idx1 == idx2) {
 		DUK_DDD(DUK_DDDPRINT("duk__array_sort_compare: idx1=%ld, idx2=%ld -> indices identical, quick exit",
-		                     (long) idx1, (long) idx2));
+		                     (long) idx1,
+		                     (long) idx2));
 		return 0;
 	}
 
@@ -25528,8 +26757,12 @@ DUK_LOCAL duk_small_int_t duk__array_sort_compare(duk_hthread *thr, duk_int_t id
 	have2 = duk_get_prop_index(thr, idx_obj, (duk_uarridx_t) idx2);
 
 	DUK_DDD(DUK_DDDPRINT("duk__array_sort_compare: idx1=%ld, idx2=%ld, have1=%ld, have2=%ld, val1=%!T, val2=%!T",
-	                     (long) idx1, (long) idx2, (long) have1, (long) have2,
-	                     (duk_tval *) duk_get_tval(thr, -2), (duk_tval *) duk_get_tval(thr, -1)));
+	                     (long) idx1,
+	                     (long) idx2,
+	                     (long) have1,
+	                     (long) have2,
+	                     (duk_tval *) duk_get_tval(thr, -2),
+	                     (duk_tval *) duk_get_tval(thr, -1)));
 
 	if (have1) {
 		if (have2) {
@@ -25571,9 +26804,9 @@ DUK_LOCAL duk_small_int_t duk__array_sort_compare(duk_hthread *thr, duk_int_t id
 		duk_double_t d;
 
 		/* No need to check callable; duk_call() will do that. */
-		duk_dup(thr, idx_fn);    /* -> [ ... x y fn ] */
-		duk_insert(thr, -3);     /* -> [ ... fn x y ] */
-		duk_call(thr, 2);        /* -> [ ... res ] */
+		duk_dup(thr, idx_fn); /* -> [ ... x y fn ] */
+		duk_insert(thr, -3); /* -> [ ... fn x y ] */
+		duk_call(thr, 2); /* -> [ ... res ] */
 
 		/* ES5 is a bit vague about what to do if the return value is
 		 * not a number.  ES2015 provides a concrete description:
@@ -25605,10 +26838,10 @@ DUK_LOCAL duk_small_int_t duk__array_sort_compare(duk_hthread *thr, duk_int_t id
 	DUK_ASSERT(h1 != NULL);
 	DUK_ASSERT(h2 != NULL);
 
-	ret = duk_js_string_compare(h1, h2);  /* retval is directly usable */
+	ret = duk_js_string_compare(h1, h2); /* retval is directly usable */
 	goto pop_ret;
 
- pop_ret:
+pop_ret:
 	duk_pop_2_unsafe(thr);
 	DUK_DDD(DUK_DDDPRINT("-> result %ld", (long) ret));
 	return ret;
@@ -25616,7 +26849,7 @@ DUK_LOCAL duk_small_int_t duk__array_sort_compare(duk_hthread *thr, duk_int_t id
 
 DUK_LOCAL void duk__array_sort_swap(duk_hthread *thr, duk_int_t l, duk_int_t r) {
 	duk_bool_t have_l, have_r;
-	duk_idx_t idx_obj = 1;  /* fixed offset in valstack */
+	duk_idx_t idx_obj = 1; /* fixed offset in valstack */
 
 	if (l == r) {
 		return;
@@ -25669,8 +26902,7 @@ DUK_LOCAL void duk__debuglog_qsort_state(duk_hthread *thr, duk_int_t lo, duk_int
 	*ptr++ = ']';
 	*ptr++ = '\0';
 
-	DUK_DDD(DUK_DDDPRINT("%s   (lo=%ld, hi=%ld, pivot=%ld)",
-	                     (const char *) buf, (long) lo, (long) hi, (long) pivot));
+	DUK_DDD(DUK_DDDPRINT("%s   (lo=%ld, hi=%ld, pivot=%ld)", (const char *) buf, (long) lo, (long) hi, (long) pivot));
 }
 #endif
 
@@ -25679,8 +26911,7 @@ DUK_LOCAL void duk__array_qsort(duk_hthread *thr, duk_int_t lo, duk_int_t hi) {
 
 	/* The lo/hi indices may be crossed and hi < 0 is possible at entry. */
 
-	DUK_DDD(DUK_DDDPRINT("duk__array_qsort: lo=%ld, hi=%ld, obj=%!T",
-	                     (long) lo, (long) hi, (duk_tval *) duk_get_tval(thr, 1)));
+	DUK_DDD(DUK_DDDPRINT("duk__array_qsort: lo=%ld, hi=%ld, obj=%!T", (long) lo, (long) hi, (duk_tval *) duk_get_tval(thr, 1)));
 
 	DUK_ASSERT_TOP(thr, 3);
 
@@ -25698,7 +26929,7 @@ DUK_LOCAL void duk__array_qsort(duk_hthread *thr, duk_int_t lo, duk_int_t hi) {
 	DUK_ASSERT(hi - lo + 1 >= 2);
 
 	/* randomized pivot selection */
-	p = lo + (duk_int_t) (DUK_UTIL_GET_RANDOM_DOUBLE(thr) * (duk_double_t) (hi - lo + 1));
+	p = lo + (duk_int_t) (duk_util_get_random_double(thr) * (duk_double_t) (hi - lo + 1));
 	DUK_ASSERT(p >= lo && p <= hi);
 	DUK_DDD(DUK_DDDPRINT("lo=%ld, hi=%ld, chose pivot p=%ld", (long) lo, (long) hi, (long) p));
 
@@ -25712,23 +26943,21 @@ DUK_LOCAL void duk__array_qsort(duk_hthread *thr, duk_int_t lo, duk_int_t hi) {
 	for (;;) {
 		/* find elements to swap */
 		for (;;) {
-			DUK_DDD(DUK_DDDPRINT("left scan: l=%ld, r=%ld, p=%ld",
-			                     (long) l, (long) r, (long) p));
+			DUK_DDD(DUK_DDDPRINT("left scan: l=%ld, r=%ld, p=%ld", (long) l, (long) r, (long) p));
 			if (l >= hi) {
 				break;
 			}
-			if (duk__array_sort_compare(thr, l, p) >= 0) {  /* !(l < p) */
+			if (duk__array_sort_compare(thr, l, p) >= 0) { /* !(l < p) */
 				break;
 			}
 			l++;
 		}
 		for (;;) {
-			DUK_DDD(DUK_DDDPRINT("right scan: l=%ld, r=%ld, p=%ld",
-			                     (long) l, (long) r, (long) p));
+			DUK_DDD(DUK_DDDPRINT("right scan: l=%ld, r=%ld, p=%ld", (long) l, (long) r, (long) p));
 			if (r <= lo) {
 				break;
 			}
-			if (duk__array_sort_compare(thr, p, r) >= 0) {  /* !(p < r) */
+			if (duk__array_sort_compare(thr, p, r) >= 0) { /* !(p < r) */
 				break;
 			}
 			r--;
@@ -25746,7 +26975,7 @@ DUK_LOCAL void duk__array_qsort(duk_hthread *thr, duk_int_t lo, duk_int_t hi) {
 		l++;
 		r--;
 	}
- done:
+done:
 	/* Note that 'l' and 'r' may cross, i.e. r < l */
 	DUK_ASSERT(l >= lo && l <= hi);
 	DUK_ASSERT(r >= lo && r <= hi);
@@ -25790,7 +27019,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_sort(duk_hthread *thr) {
 
 	DUK_ASSERT_TOP(thr, 3);
 	duk_pop_nodecref_unsafe(thr);
-	return 1;  /* return ToObject(this) */
+	return 1; /* return ToObject(this) */
 }
 
 /*
@@ -25883,7 +27112,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_splice(duk_hthread *thr) {
 
 	for (i = 0; i < del_count; i++) {
 		if (duk_get_prop_index(thr, -3, (duk_uarridx_t) (act_start + i))) {
-			duk_xdef_prop_index_wec(thr, -2, (duk_uarridx_t) i);  /* throw flag irrelevant (false in std alg) */
+			duk_xdef_prop_index_wec(thr, -2, (duk_uarridx_t) i); /* throw flag irrelevant (false in std alg) */
 		} else {
 			duk_pop_undefined(thr);
 		}
@@ -25953,7 +27182,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_splice(duk_hthread *thr) {
 	/* Step 15: insert itemCount elements into the hole made above */
 
 	for (i = 0; i < item_count; i++) {
-		duk_dup(thr, i + 2);  /* args start at index 2 */
+		duk_dup(thr, i + 2); /* args start at index 2 */
 		duk_put_prop_index(thr, -4, (duk_uarridx_t) (act_start + i));
 	}
 
@@ -26016,7 +27245,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_reverse(duk_hthread *thr) {
 	}
 
 	DUK_ASSERT_TOP(thr, 2);
-	duk_pop_unsafe(thr);  /* -> [ ToObject(this) ] */
+	duk_pop_unsafe(thr); /* -> [ ToObject(this) ] */
 	return 1;
 }
 
@@ -26166,26 +27395,32 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_unshift(duk_hthread *thr) {
 		if (duk_get_prop_index(thr, -2, (duk_uarridx_t) i)) {
 			/* fromPresent = true */
 			/* [ ... ToObject(this) ToUint32(length) val ] */
-			duk_put_prop_index(thr, -3, (duk_uarridx_t) (i + (duk_uint32_t) nargs));  /* -> [ ... ToObject(this) ToUint32(length) ] */
+			duk_put_prop_index(
+			    thr,
+			    -3,
+			    (duk_uarridx_t) (i + (duk_uint32_t) nargs)); /* -> [ ... ToObject(this) ToUint32(length) ] */
 		} else {
 			/* fromPresent = false */
 			/* [ ... ToObject(this) ToUint32(length) val ] */
 			duk_pop_undefined(thr);
-			duk_del_prop_index(thr, -2, (duk_uarridx_t) (i + (duk_uint32_t) nargs));  /* -> [ ... ToObject(this) ToUint32(length) ] */
+			duk_del_prop_index(
+			    thr,
+			    -2,
+			    (duk_uarridx_t) (i + (duk_uint32_t) nargs)); /* -> [ ... ToObject(this) ToUint32(length) ] */
 		}
 		DUK_ASSERT_TOP(thr, nargs + 2);
 	}
 
 	for (i = 0; i < (duk_uint32_t) nargs; i++) {
 		DUK_ASSERT_TOP(thr, nargs + 2);
-		duk_dup(thr, (duk_idx_t) i);  /* -> [ ... ToObject(this) ToUint32(length) arg[i] ] */
+		duk_dup(thr, (duk_idx_t) i); /* -> [ ... ToObject(this) ToUint32(length) arg[i] ] */
 		duk_put_prop_index(thr, -3, (duk_uarridx_t) i);
 		DUK_ASSERT_TOP(thr, nargs + 2);
 	}
 
 	DUK_ASSERT_TOP(thr, nargs + 2);
 	duk_push_u32(thr, len + (duk_uint32_t) nargs);
-	duk_dup_top(thr);  /* -> [ ... ToObject(this) ToUint32(length) final_len final_len ] */
+	duk_dup_top(thr); /* -> [ ... ToObject(this) ToUint32(length) final_len final_len ] */
 	duk_put_prop_stridx_short(thr, -4, DUK_STRIDX_LENGTH);
 	return 1;
 }
@@ -26198,7 +27433,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_indexof_shared(duk_hthread *thr) {
 	duk_idx_t nargs;
 	duk_int_t i, len;
 	duk_int_t from_idx;
-	duk_small_int_t idx_step = duk_get_current_magic(thr);  /* idx_step is +1 for indexOf, -1 for lastIndexOf */
+	duk_small_int_t idx_step = duk_get_current_magic(thr); /* idx_step is +1 for indexOf, -1 for lastIndexOf */
 
 	/* lastIndexOf() needs to be a vararg function because we must distinguish
 	 * between an undefined fromIndex and a "not given" fromIndex; indexOf() is
@@ -26236,10 +27471,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_indexof_shared(duk_hthread *thr) {
 		 * lastIndexOf: clamp fromIndex to [-len - 1, len - 1]
 		 * (if clamped to -len-1 -> fromIndex becomes -1, terminates for-loop directly)
 		 */
-		from_idx = duk_to_int_clamped(thr,
-		                              1,
-		                              (idx_step > 0 ? -len : -len - 1),
-		                              (idx_step > 0 ? len : len - 1));
+		from_idx = duk_to_int_clamped(thr, 1, (idx_step > 0 ? -len : -len - 1), (idx_step > 0 ? len : len - 1));
 		if (from_idx < 0) {
 			/* for lastIndexOf, result may be -1 (mark immediate termination) */
 			from_idx = len + from_idx;
@@ -26275,7 +27507,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_indexof_shared(duk_hthread *thr) {
 		duk_pop_unsafe(thr);
 	}
 
- not_found:
+not_found:
 	duk_push_int(thr, -1);
 	return 1;
 }
@@ -26284,11 +27516,11 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_indexof_shared(duk_hthread *thr) {
  *  every(), some(), forEach(), map(), filter()
  */
 
-#define DUK__ITER_EVERY    0
-#define DUK__ITER_SOME     1
-#define DUK__ITER_FOREACH  2
-#define DUK__ITER_MAP      3
-#define DUK__ITER_FILTER   4
+#define DUK__ITER_EVERY   0
+#define DUK__ITER_SOME    1
+#define DUK__ITER_FOREACH 2
+#define DUK__ITER_MAP     3
+#define DUK__ITER_FILTER  4
 
 /* XXX: This helper is a bit awkward because the handling for the different iteration
  * callers is quite different.  This now compiles to a bit less than 500 bytes, so with
@@ -26323,7 +27555,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_iter_shared(duk_hthread *thr) {
 	 * stack[4] = result array (or undefined)
 	 */
 
-	k = 0;  /* result index for filter() */
+	k = 0; /* result index for filter() */
 	for (i = 0; i < len; i++) {
 		DUK_ASSERT_TOP(thr, 5);
 
@@ -26347,7 +27579,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_iter_shared(duk_hthread *thr) {
 		duk_dup_1(thr);
 		duk_dup_m3(thr);
 		duk_push_u32(thr, i);
-		duk_dup_2(thr);  /* [ ... val callback thisArg val i obj ] */
+		duk_dup_2(thr); /* [ ... val callback thisArg val i obj ] */
 		duk_call_method(thr, 3); /* -> [ ... val retval ] */
 
 		switch (iter_type) {
@@ -26370,13 +27602,13 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_iter_shared(duk_hthread *thr) {
 			break;
 		case DUK__ITER_MAP:
 			duk_dup_top(thr);
-			duk_xdef_prop_index_wec(thr, 4, (duk_uarridx_t) i);  /* retval to result[i] */
+			duk_xdef_prop_index_wec(thr, 4, (duk_uarridx_t) i); /* retval to result[i] */
 			res_length = i + 1;
 			break;
 		case DUK__ITER_FILTER:
 			bval = duk_to_boolean(thr, -1);
 			if (bval) {
-				duk_dup_m2(thr);  /* orig value */
+				duk_dup_m2(thr); /* orig value */
 				duk_xdef_prop_index_wec(thr, 4, (duk_uarridx_t) k);
 				k++;
 				res_length = k;
@@ -26404,7 +27636,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_iter_shared(duk_hthread *thr) {
 	case DUK__ITER_MAP:
 	case DUK__ITER_FILTER:
 		DUK_ASSERT_TOP(thr, 5);
-		DUK_ASSERT(duk_is_array(thr, -1));  /* topmost element is the result array already */
+		DUK_ASSERT(duk_is_array(thr, -1)); /* topmost element is the result array already */
 		duk_push_u32(thr, res_length);
 		duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_LENGTH, DUK_PROPDESC_FLAGS_W);
 		break;
@@ -26424,7 +27656,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_reduce_shared(duk_hthread *thr) {
 	duk_idx_t nargs;
 	duk_bool_t have_acc;
 	duk_uint32_t i, len;
-	duk_small_int_t idx_step = duk_get_current_magic(thr);  /* idx_step is +1 for reduce, -1 for reduceRight */
+	duk_small_int_t idx_step = duk_get_current_magic(thr); /* idx_step is +1 for reduce, -1 for reduceRight */
 
 	/* We're a varargs function because we need to detect whether
 	 * initialValue was given or not.
@@ -26448,8 +27680,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_reduce_shared(duk_hthread *thr) {
 		duk_dup_1(thr);
 		have_acc = 1;
 	}
-	DUK_DDD(DUK_DDDPRINT("have_acc=%ld, acc=%!T",
-	                     (long) have_acc, (duk_tval *) duk_get_tval(thr, 3)));
+	DUK_DDD(DUK_DDDPRINT("have_acc=%ld, acc=%!T", (long) have_acc, (duk_tval *) duk_get_tval(thr, 3)));
 
 	/* For len == 0, i is initialized to len - 1 which underflows.
 	 * The condition (i < len) will then exit the for-loop on the
@@ -26457,16 +27688,16 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_reduce_shared(duk_hthread *thr) {
 	 * happens by i underflowing.
 	 */
 
-	for (i = (idx_step >= 0 ? 0 : len - 1);
-	     i < len;  /* i >= 0 would always be true */
+	for (i = (idx_step >= 0 ? 0 : len - 1); i < len; /* i >= 0 would always be true */
 	     i += (duk_uint32_t) idx_step) {
 		DUK_DDD(DUK_DDDPRINT("i=%ld, len=%ld, have_acc=%ld, top=%ld, acc=%!T",
-		                     (long) i, (long) len, (long) have_acc,
+		                     (long) i,
+		                     (long) len,
+		                     (long) have_acc,
 		                     (long) duk_get_top(thr),
 		                     (duk_tval *) duk_get_tval(thr, 4)));
 
-		DUK_ASSERT((have_acc && duk_get_top(thr) == 5) ||
-		           (!have_acc && duk_get_top(thr) == 4));
+		DUK_ASSERT((have_acc && duk_get_top(thr) == 5) || (!have_acc && duk_get_top(thr) == 4));
 
 		if (!duk_has_prop_index(thr, 2, (duk_uarridx_t) i)) {
 			continue;
@@ -26485,8 +27716,10 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_reduce_shared(duk_hthread *thr) {
 			duk_push_u32(thr, i);
 			duk_dup_2(thr);
 			DUK_DDD(DUK_DDDPRINT("calling reduce function: func=%!T, prev=%!T, curr=%!T, idx=%!T, obj=%!T",
-			                     (duk_tval *) duk_get_tval(thr, -5), (duk_tval *) duk_get_tval(thr, -4),
-			                     (duk_tval *) duk_get_tval(thr, -3), (duk_tval *) duk_get_tval(thr, -2),
+			                     (duk_tval *) duk_get_tval(thr, -5),
+			                     (duk_tval *) duk_get_tval(thr, -4),
+			                     (duk_tval *) duk_get_tval(thr, -3),
+			                     (duk_tval *) duk_get_tval(thr, -2),
 			                     (duk_tval *) duk_get_tval(thr, -1)));
 			duk_call(thr, 4);
 			DUK_DDD(DUK_DDDPRINT("-> result: %!T", (duk_tval *) duk_get_tval(thr, -1)));
@@ -26503,7 +27736,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_reduce_shared(duk_hthread *thr) {
 	return 1;
 }
 
-#endif  /* DUK_USE_ARRAY_BUILTIN */
+#endif /* DUK_USE_ARRAY_BUILTIN */
 
 /* automatic undefs */
 #undef DUK__ARRAY_MID_JOIN_LIMIT
@@ -26544,7 +27777,7 @@ DUK_INTERNAL duk_ret_t duk_bi_boolean_prototype_tostring_shared(duk_hthread *thr
 		DUK_ASSERT(h != NULL);
 
 		if (DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_BOOLEAN) {
-			duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_INT_VALUE);
+			duk_xget_owndataprop_stridx_short(thr, -1, DUK_STRIDX_INT_VALUE);
 			DUK_ASSERT(duk_is_boolean(thr, -1));
 			goto type_ok;
 		}
@@ -26553,7 +27786,7 @@ DUK_INTERNAL duk_ret_t duk_bi_boolean_prototype_tostring_shared(duk_hthread *thr
 	DUK_DCERROR_TYPE_INVALID_ARGS(thr);
 	/* never here */
 
- type_ok:
+type_ok:
 	if (coerce_tostring) {
 		duk_to_string(thr, -1);
 	}
@@ -26573,14 +27806,14 @@ DUK_INTERNAL duk_ret_t duk_bi_boolean_constructor(duk_hthread *thr) {
 
 		DUK_HOBJECT_SET_CLASS_NUMBER(h_this, DUK_HOBJECT_CLASS_BOOLEAN);
 
-		duk_dup_0(thr);  /* -> [ val obj val ] */
-		duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_INT_VALUE, DUK_PROPDESC_FLAGS_NONE);  /* XXX: proper flags? */
-	}  /* unbalanced stack */
+		duk_dup_0(thr); /* -> [ val obj val ] */
+		duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_INT_VALUE, DUK_PROPDESC_FLAGS_NONE); /* XXX: proper flags? */
+	} /* unbalanced stack */
 
 	return 1;
 }
 
-#endif  /* DUK_USE_BOOLEAN_BUILTIN */
+#endif /* DUK_USE_BOOLEAN_BUILTIN */
 /*
  *  ES2015 TypedArray and Node.js Buffer built-ins
  */
@@ -26596,57 +27829,38 @@ DUK_INTERNAL duk_ret_t duk_bi_boolean_constructor(duk_hthread *thr) {
  * default internal prototype.
  */
 static const duk_uint8_t duk__buffer_proto_from_classnum[] = {
-	DUK_BIDX_ARRAYBUFFER_PROTOTYPE,
-	DUK_BIDX_DATAVIEW_PROTOTYPE,
-	DUK_BIDX_INT8ARRAY_PROTOTYPE,
-	DUK_BIDX_UINT8ARRAY_PROTOTYPE,
-	DUK_BIDX_UINT8CLAMPEDARRAY_PROTOTYPE,
-	DUK_BIDX_INT16ARRAY_PROTOTYPE,
-	DUK_BIDX_UINT16ARRAY_PROTOTYPE,
-	DUK_BIDX_INT32ARRAY_PROTOTYPE,
-	DUK_BIDX_UINT32ARRAY_PROTOTYPE,
-	DUK_BIDX_FLOAT32ARRAY_PROTOTYPE,
-	DUK_BIDX_FLOAT64ARRAY_PROTOTYPE
+	DUK_BIDX_ARRAYBUFFER_PROTOTYPE,  DUK_BIDX_DATAVIEW_PROTOTYPE,          DUK_BIDX_INT8ARRAY_PROTOTYPE,
+	DUK_BIDX_UINT8ARRAY_PROTOTYPE,   DUK_BIDX_UINT8CLAMPEDARRAY_PROTOTYPE, DUK_BIDX_INT16ARRAY_PROTOTYPE,
+	DUK_BIDX_UINT16ARRAY_PROTOTYPE,  DUK_BIDX_INT32ARRAY_PROTOTYPE,        DUK_BIDX_UINT32ARRAY_PROTOTYPE,
+	DUK_BIDX_FLOAT32ARRAY_PROTOTYPE, DUK_BIDX_FLOAT64ARRAY_PROTOTYPE
 };
 
 /* Map DUK_HBUFOBJ_ELEM_xxx to duk_hobject class number.
  * Sync with duk_hbufobj.h and duk_hobject.h.
  */
-static const duk_uint8_t duk__buffer_class_from_elemtype[9] = {
-	DUK_HOBJECT_CLASS_UINT8ARRAY,
-	DUK_HOBJECT_CLASS_UINT8CLAMPEDARRAY,
-	DUK_HOBJECT_CLASS_INT8ARRAY,
-	DUK_HOBJECT_CLASS_UINT16ARRAY,
-	DUK_HOBJECT_CLASS_INT16ARRAY,
-	DUK_HOBJECT_CLASS_UINT32ARRAY,
-	DUK_HOBJECT_CLASS_INT32ARRAY,
-	DUK_HOBJECT_CLASS_FLOAT32ARRAY,
-	DUK_HOBJECT_CLASS_FLOAT64ARRAY
-};
+static const duk_uint8_t duk__buffer_class_from_elemtype[9] = { DUK_HOBJECT_CLASS_UINT8ARRAY,  DUK_HOBJECT_CLASS_UINT8CLAMPEDARRAY,
+	                                                        DUK_HOBJECT_CLASS_INT8ARRAY,   DUK_HOBJECT_CLASS_UINT16ARRAY,
+	                                                        DUK_HOBJECT_CLASS_INT16ARRAY,  DUK_HOBJECT_CLASS_UINT32ARRAY,
+	                                                        DUK_HOBJECT_CLASS_INT32ARRAY,  DUK_HOBJECT_CLASS_FLOAT32ARRAY,
+	                                                        DUK_HOBJECT_CLASS_FLOAT64ARRAY };
 
 /* Map DUK_HBUFOBJ_ELEM_xxx to prototype object built-in index.
  * Sync with duk_hbufobj.h.
  */
 static const duk_uint8_t duk__buffer_proto_from_elemtype[9] = {
-	DUK_BIDX_UINT8ARRAY_PROTOTYPE,
-	DUK_BIDX_UINT8CLAMPEDARRAY_PROTOTYPE,
-	DUK_BIDX_INT8ARRAY_PROTOTYPE,
-	DUK_BIDX_UINT16ARRAY_PROTOTYPE,
-	DUK_BIDX_INT16ARRAY_PROTOTYPE,
-	DUK_BIDX_UINT32ARRAY_PROTOTYPE,
-	DUK_BIDX_INT32ARRAY_PROTOTYPE,
-	DUK_BIDX_FLOAT32ARRAY_PROTOTYPE,
-	DUK_BIDX_FLOAT64ARRAY_PROTOTYPE
+	DUK_BIDX_UINT8ARRAY_PROTOTYPE,  DUK_BIDX_UINT8CLAMPEDARRAY_PROTOTYPE, DUK_BIDX_INT8ARRAY_PROTOTYPE,
+	DUK_BIDX_UINT16ARRAY_PROTOTYPE, DUK_BIDX_INT16ARRAY_PROTOTYPE,        DUK_BIDX_UINT32ARRAY_PROTOTYPE,
+	DUK_BIDX_INT32ARRAY_PROTOTYPE,  DUK_BIDX_FLOAT32ARRAY_PROTOTYPE,      DUK_BIDX_FLOAT64ARRAY_PROTOTYPE
 };
 
 /* Map DUK__FLD_xxx to byte size. */
 static const duk_uint8_t duk__buffer_nbytes_from_fldtype[6] = {
-	1,  /* DUK__FLD_8BIT */
-	2,  /* DUK__FLD_16BIT */
-	4,  /* DUK__FLD_32BIT */
-	4,  /* DUK__FLD_FLOAT */
-	8,  /* DUK__FLD_DOUBLE */
-	0   /* DUK__FLD_VARINT; not relevant here */
+	1, /* DUK__FLD_8BIT */
+	2, /* DUK__FLD_16BIT */
+	4, /* DUK__FLD_32BIT */
+	4, /* DUK__FLD_FLOAT */
+	8, /* DUK__FLD_DOUBLE */
+	0 /* DUK__FLD_VARINT; not relevant here */
 };
 
 /* Bitfield for each DUK_HBUFOBJ_ELEM_xxx indicating which element types
@@ -26658,36 +27872,27 @@ static const duk_uint8_t duk__buffer_nbytes_from_fldtype[6] = {
 #if !defined(DUK_USE_PREFER_SIZE)
 static duk_uint16_t duk__buffer_elemtype_copy_compatible[9] = {
 	/* xxx -> DUK_HBUFOBJ_ELEM_UINT8 */
-	(1U << DUK_HBUFOBJ_ELEM_UINT8) |
-		(1U << DUK_HBUFOBJ_ELEM_UINT8CLAMPED) |
-		(1U << DUK_HBUFOBJ_ELEM_INT8),
+	(1U << DUK_HBUFOBJ_ELEM_UINT8) | (1U << DUK_HBUFOBJ_ELEM_UINT8CLAMPED) | (1U << DUK_HBUFOBJ_ELEM_INT8),
 
 	/* xxx -> DUK_HBUFOBJ_ELEM_UINT8CLAMPED
 	 * Note: INT8 is -not- copy compatible, e.g. -1 would coerce to 0x00.
 	 */
-	(1U << DUK_HBUFOBJ_ELEM_UINT8) |
-		(1U << DUK_HBUFOBJ_ELEM_UINT8CLAMPED),
+	(1U << DUK_HBUFOBJ_ELEM_UINT8) | (1U << DUK_HBUFOBJ_ELEM_UINT8CLAMPED),
 
 	/* xxx -> DUK_HBUFOBJ_ELEM_INT8 */
-	(1U << DUK_HBUFOBJ_ELEM_UINT8) |
-		(1U << DUK_HBUFOBJ_ELEM_UINT8CLAMPED) |
-		(1U << DUK_HBUFOBJ_ELEM_INT8),
+	(1U << DUK_HBUFOBJ_ELEM_UINT8) | (1U << DUK_HBUFOBJ_ELEM_UINT8CLAMPED) | (1U << DUK_HBUFOBJ_ELEM_INT8),
 
 	/* xxx -> DUK_HBUFOBJ_ELEM_UINT16 */
-	(1U << DUK_HBUFOBJ_ELEM_UINT16) |
-		(1U << DUK_HBUFOBJ_ELEM_INT16),
+	(1U << DUK_HBUFOBJ_ELEM_UINT16) | (1U << DUK_HBUFOBJ_ELEM_INT16),
 
 	/* xxx -> DUK_HBUFOBJ_ELEM_INT16 */
-	(1U << DUK_HBUFOBJ_ELEM_UINT16) |
-		(1U << DUK_HBUFOBJ_ELEM_INT16),
+	(1U << DUK_HBUFOBJ_ELEM_UINT16) | (1U << DUK_HBUFOBJ_ELEM_INT16),
 
 	/* xxx -> DUK_HBUFOBJ_ELEM_UINT32 */
-	(1U << DUK_HBUFOBJ_ELEM_UINT32) |
-		(1U << DUK_HBUFOBJ_ELEM_INT32),
+	(1U << DUK_HBUFOBJ_ELEM_UINT32) | (1U << DUK_HBUFOBJ_ELEM_INT32),
 
 	/* xxx -> DUK_HBUFOBJ_ELEM_INT32 */
-	(1U << DUK_HBUFOBJ_ELEM_UINT32) |
-		(1U << DUK_HBUFOBJ_ELEM_INT32),
+	(1U << DUK_HBUFOBJ_ELEM_UINT32) | (1U << DUK_HBUFOBJ_ELEM_INT32),
 
 	/* xxx -> DUK_HBUFOBJ_ELEM_FLOAT32 */
 	(1U << DUK_HBUFOBJ_ELEM_FLOAT32),
@@ -26695,7 +27900,7 @@ static duk_uint16_t duk__buffer_elemtype_copy_compatible[9] = {
 	/* xxx -> DUK_HBUFOBJ_ELEM_FLOAT64 */
 	(1U << DUK_HBUFOBJ_ELEM_FLOAT64)
 };
-#endif  /* !DUK_USE_PREFER_SIZE */
+#endif /* !DUK_USE_PREFER_SIZE */
 
 DUK_LOCAL duk_hbufobj *duk__hbufobj_promote_this(duk_hthread *thr) {
 	duk_tval *tv_dst;
@@ -26704,7 +27909,7 @@ DUK_LOCAL duk_hbufobj *duk__hbufobj_promote_this(duk_hthread *thr) {
 	duk_push_this(thr);
 	DUK_ASSERT(duk_is_buffer(thr, -1));
 	res = (duk_hbufobj *) duk_to_hobject(thr, -1);
-	DUK_ASSERT_HBUFOBJ_VALID(res);
+	DUK_HBUFOBJ_ASSERT_VALID(res);
 	DUK_DD(DUK_DDPRINT("promoted 'this' automatically to an ArrayBuffer: %!iT", duk_get_tval(thr, -1)));
 
 	tv_dst = duk_get_borrowed_this_tval(thr);
@@ -26714,8 +27919,8 @@ DUK_LOCAL duk_hbufobj *duk__hbufobj_promote_this(duk_hthread *thr) {
 	return res;
 }
 
-#define DUK__BUFOBJ_FLAG_THROW    (1 << 0)
-#define DUK__BUFOBJ_FLAG_PROMOTE  (1 << 1)
+#define DUK__BUFOBJ_FLAG_THROW   (1 << 0)
+#define DUK__BUFOBJ_FLAG_PROMOTE (1 << 1)
 
 /* Shared helper.  When DUK__BUFOBJ_FLAG_PROMOTE is given, the return value is
  * always a duk_hbufobj *.  Without the flag the return value can also be a
@@ -26734,7 +27939,7 @@ DUK_LOCAL duk_heaphdr *duk__getrequire_bufobj_this(duk_hthread *thr, duk_small_u
 		h_this = (duk_hbufobj *) DUK_TVAL_GET_OBJECT(tv);
 		DUK_ASSERT(h_this != NULL);
 		if (DUK_HOBJECT_IS_BUFOBJ((duk_hobject *) h_this)) {
-			DUK_ASSERT_HBUFOBJ_VALID(h_this);
+			DUK_HBUFOBJ_ASSERT_VALID(h_this);
 			return (duk_heaphdr *) h_this;
 		}
 	} else if (DUK_TVAL_IS_BUFFER(tv)) {
@@ -26748,7 +27953,7 @@ DUK_LOCAL duk_heaphdr *duk__getrequire_bufobj_this(duk_hthread *thr, duk_small_u
 			/* XXX: make this conditional to a flag if call sites need it? */
 			h_this = duk__hbufobj_promote_this(thr);
 			DUK_ASSERT(h_this != NULL);
-			DUK_ASSERT_HBUFOBJ_VALID(h_this);
+			DUK_HBUFOBJ_ASSERT_VALID(h_this);
 			return (duk_heaphdr *) h_this;
 		} else {
 			/* XXX: ugly, share return pointer for duk_hbuffer. */
@@ -26789,13 +27994,13 @@ DUK_LOCAL duk_hbufobj *duk__require_bufobj_value(duk_hthread *thr, duk_idx_t idx
 		h_obj = (duk_hbufobj *) DUK_TVAL_GET_OBJECT(tv);
 		DUK_ASSERT(h_obj != NULL);
 		if (DUK_HOBJECT_IS_BUFOBJ((duk_hobject *) h_obj)) {
-			DUK_ASSERT_HBUFOBJ_VALID(h_obj);
+			DUK_HBUFOBJ_ASSERT_VALID(h_obj);
 			return h_obj;
 		}
 	} else if (DUK_TVAL_IS_BUFFER(tv)) {
 		h_obj = (duk_hbufobj *) duk_to_hobject(thr, idx);
 		DUK_ASSERT(h_obj != NULL);
-		DUK_ASSERT_HBUFOBJ_VALID(h_obj);
+		DUK_HBUFOBJ_ASSERT_VALID(h_obj);
 		return h_obj;
 	}
 
@@ -26806,9 +28011,9 @@ DUK_LOCAL duk_hbufobj *duk__require_bufobj_value(duk_hthread *thr, duk_idx_t idx
 DUK_LOCAL void duk__set_bufobj_buffer(duk_hthread *thr, duk_hbufobj *h_bufobj, duk_hbuffer *h_val) {
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(h_bufobj != NULL);
-	DUK_ASSERT(h_bufobj->buf == NULL);  /* no need to decref */
+	DUK_ASSERT(h_bufobj->buf == NULL); /* no need to decref */
 	DUK_ASSERT(h_val != NULL);
-	DUK_ASSERT_HBUFOBJ_VALID(h_bufobj);
+	DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
 	DUK_UNREF(thr);
 
 	h_bufobj->buf = h_val;
@@ -26818,7 +28023,7 @@ DUK_LOCAL void duk__set_bufobj_buffer(duk_hthread *thr, duk_hbufobj *h_bufobj, d
 	DUK_ASSERT(h_bufobj->elem_type == DUK_HBUFOBJ_ELEM_UINT8);
 	DUK_ASSERT(h_bufobj->is_typedarray == 0);
 
-	DUK_ASSERT_HBUFOBJ_VALID(h_bufobj);
+	DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
 }
 
 /* Shared offset/length coercion helper. */
@@ -26842,12 +28047,12 @@ DUK_LOCAL void duk__resolve_offset_opt_length(duk_hthread *thr,
 	if (offset > h_bufarg->length) {
 		goto fail_range;
 	}
-	DUK_ASSERT_DISABLE(offset >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(offset >= 0); /* unsigned */
 	DUK_ASSERT(offset <= h_bufarg->length);
 
 	if (duk_is_undefined(thr, idx_length)) {
 		DUK_ASSERT(h_bufarg->length >= offset);
-		length = h_bufarg->length - offset;  /* >= 0 */
+		length = h_bufarg->length - offset; /* >= 0 */
 	} else {
 		length_signed = duk_to_int(thr, idx_length);
 		if (length_signed < 0) {
@@ -26866,14 +28071,14 @@ DUK_LOCAL void duk__resolve_offset_opt_length(duk_hthread *thr,
 			}
 		}
 	}
-	DUK_ASSERT_DISABLE(length >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(length >= 0); /* unsigned */
 	DUK_ASSERT(offset + length <= h_bufarg->length);
 
 	*out_offset = offset;
 	*out_length = length;
 	return;
 
- fail_range:
+fail_range:
 	DUK_ERROR_RANGE(thr, DUK_STR_INVALID_ARGS);
 	DUK_WO_NORETURN(return;);
 }
@@ -26931,7 +28136,7 @@ DUK_LOCAL void duk__clamp_startend_negidx_shifted(duk_hthread *thr,
 	DUK_ASSERT(out_start_offset != NULL);
 	DUK_ASSERT(out_end_offset != NULL);
 
-	buffer_length >>= buffer_shift;  /* as (full) elements */
+	buffer_length >>= buffer_shift; /* as (full) elements */
 
 	/* Resolve start/end offset as element indices first; arguments
 	 * at idx_start/idx_end are element offsets.  Working with element
@@ -27002,7 +28207,7 @@ DUK_INTERNAL void duk_hbufobj_push_uint8array_from_plain(duk_hthread *thr, duk_h
 	DUK_ASSERT(h_bufobj != NULL);
 	duk__set_bufobj_buffer(thr, h_bufobj, h_buf);
 	h_bufobj->is_typedarray = 1;
-	DUK_ASSERT_HBUFOBJ_VALID(h_bufobj);
+	DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
 
 	h_arrbuf = duk_push_bufobj_raw(thr,
 	                               DUK_HOBJECT_FLAG_EXTENSIBLE |
@@ -27012,7 +28217,7 @@ DUK_INTERNAL void duk_hbufobj_push_uint8array_from_plain(duk_hthread *thr, duk_h
 	DUK_ASSERT(h_arrbuf != NULL);
 	duk__set_bufobj_buffer(thr, h_arrbuf, h_buf);
 	DUK_ASSERT(h_arrbuf->is_typedarray == 0);
-	DUK_ASSERT_HBUFOBJ_VALID(h_arrbuf);
+	DUK_HBUFOBJ_ASSERT_VALID(h_arrbuf);
 
 	DUK_ASSERT(h_bufobj->buf_prop == NULL);
 	h_bufobj->buf_prop = (duk_hobject *) h_arrbuf;
@@ -27023,7 +28228,10 @@ DUK_INTERNAL void duk_hbufobj_push_uint8array_from_plain(duk_hthread *thr, duk_h
 }
 
 /* Indexed read helper for buffer objects, also called from outside this file. */
-DUK_INTERNAL void duk_hbufobj_push_validated_read(duk_hthread *thr, duk_hbufobj *h_bufobj, duk_uint8_t *p, duk_small_uint_t elem_size) {
+DUK_INTERNAL void duk_hbufobj_push_validated_read(duk_hthread *thr,
+                                                  duk_hbufobj *h_bufobj,
+                                                  duk_uint8_t *p,
+                                                  duk_small_uint_t elem_size) {
 	duk_double_union du;
 
 	DUK_ASSERT(elem_size > 0);
@@ -27171,17 +28379,17 @@ DUK_LOCAL duk_hbuffer *duk__hbufobj_fixed_from_argvalue(duk_hthread *thr) {
 		DUK_WO_NORETURN(return NULL;);
 	}
 
- done:
+done:
 	DUK_ASSERT(duk_is_buffer(thr, -1));
 	return duk_known_hbuffer(thr, -1);
 
- slow_copy:
+slow_copy:
 	/* XXX: fast path for typed arrays and other buffer objects? */
 
 	(void) duk_get_prop_stridx_short(thr, 0, DUK_STRIDX_LENGTH);
 	len = duk_to_int_clamped(thr, -1, 0, DUK_INT_MAX);
 	duk_pop(thr);
-	buf = (duk_uint8_t *) duk_push_fixed_buffer_nozero(thr, (duk_size_t) len);  /* no zeroing, all indices get initialized */
+	buf = (duk_uint8_t *) duk_push_fixed_buffer_nozero(thr, (duk_size_t) len); /* no zeroing, all indices get initialized */
 	for (i = 0; i < len; i++) {
 		/* XXX: fast path for array or buffer arguments? */
 		duk_get_prop_index(thr, 0, (duk_uarridx_t) i);
@@ -27190,7 +28398,7 @@ DUK_LOCAL duk_hbuffer *duk__hbufobj_fixed_from_argvalue(duk_hthread *thr) {
 	}
 	goto done;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Node.js Buffer constructor
@@ -27207,11 +28415,7 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_constructor(duk_hthread *thr) {
 	h_buf = duk__hbufobj_fixed_from_argvalue(thr);
 	DUK_ASSERT(h_buf != NULL);
 
-	duk_push_buffer_object(thr,
-	                       -1,
-	                       0,
-	                       DUK_HBUFFER_FIXED_GET_SIZE((duk_hbuffer_fixed *) (void *) h_buf),
-	                       DUK_BUFOBJ_UINT8ARRAY);
+	duk_push_buffer_object(thr, -1, 0, DUK_HBUFFER_FIXED_GET_SIZE((duk_hbuffer_fixed *) (void *) h_buf), DUK_BUFOBJ_UINT8ARRAY);
 	duk_push_hobject_bidx(thr, DUK_BIDX_NODEJS_BUFFER_PROTOTYPE);
 	duk_set_prototype(thr, -2);
 
@@ -27219,7 +28423,7 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_constructor(duk_hthread *thr) {
 
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  ArrayBuffer, DataView, and TypedArray constructors
@@ -27231,7 +28435,7 @@ DUK_INTERNAL duk_ret_t duk_bi_arraybuffer_constructor(duk_hthread *thr) {
 	duk_hbuffer *h_val;
 	duk_int_t len;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 
 	duk_require_constructor_call(thr);
 
@@ -27243,22 +28447,20 @@ DUK_INTERNAL duk_ret_t duk_bi_arraybuffer_constructor(duk_hthread *thr) {
 	h_val = (duk_hbuffer *) duk_known_hbuffer(thr, -1);
 
 	h_bufobj = duk_push_bufobj_raw(thr,
-	                               DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                               DUK_HOBJECT_FLAG_BUFOBJ |
-	                               DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ARRAYBUFFER),
+	                               DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_BUFOBJ |
+	                                   DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ARRAYBUFFER),
 	                               DUK_BIDX_ARRAYBUFFER_PROTOTYPE);
 	DUK_ASSERT(h_bufobj != NULL);
 
 	duk__set_bufobj_buffer(thr, h_bufobj, h_val);
-	DUK_ASSERT_HBUFOBJ_VALID(h_bufobj);
+	DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
 
 	return 1;
 
- fail_length:
+fail_length:
 	DUK_DCERROR_RANGE_INVALID_LENGTH(thr);
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
-
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /* Format of magic, bits:
  *   0...1: elem size shift (0-3)
@@ -27298,8 +28500,8 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 	 * element type.
 	 */
 	magic = (duk_small_uint_t) duk_get_current_magic(thr);
-	shift = magic & 0x03U;               /* bits 0...1: shift */
-	elem_type = (magic >> 2) & 0x0fU;    /* bits 2...5: type */
+	shift = magic & 0x03U; /* bits 0...1: shift */
+	elem_type = (magic >> 2) & 0x0fU; /* bits 2...5: type */
 	elem_size = 1U << shift;
 	align_mask = elem_size - 1;
 	DUK_ASSERT(elem_type < sizeof(duk__buffer_proto_from_elemtype) / sizeof(duk_uint8_t));
@@ -27310,8 +28512,12 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 
 	DUK_DD(DUK_DDPRINT("typedarray constructor, magic=%d, shift=%d, elem_type=%d, "
 	                   "elem_size=%d, proto_bidx=%d, class_num=%d",
-	                   (int) magic, (int) shift, (int) elem_type, (int) elem_size,
-	                   (int) proto_bidx, (int) class_num));
+	                   (int) magic,
+	                   (int) shift,
+	                   (int) elem_type,
+	                   (int) elem_size,
+	                   (int) proto_bidx,
+	                   (int) class_num));
 
 	/* Argument variants.  When the argument is an ArrayBuffer a view to
 	 * the same buffer is created; otherwise a new ArrayBuffer is always
@@ -27325,7 +28531,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 	duk_hbufobj_promote_plain(thr, 0);
 
 	tv = duk_get_tval(thr, 0);
-	DUK_ASSERT(tv != NULL);  /* arg count */
+	DUK_ASSERT(tv != NULL); /* arg count */
 	if (DUK_TVAL_IS_OBJECT(tv)) {
 		h_obj = DUK_TVAL_GET_OBJECT(tv);
 		DUK_ASSERT(h_obj != NULL);
@@ -27345,8 +28551,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 				goto fail_arguments;
 			}
 			byte_offset = (duk_uint_t) byte_offset_signed;
-			if (byte_offset > h_bufarg->length ||
-			    (byte_offset & align_mask) != 0) {
+			if (byte_offset > h_bufarg->length || (byte_offset & align_mask) != 0) {
 				/* Must be >= 0 and multiple of element size. */
 				goto fail_arguments;
 			}
@@ -27386,9 +28591,8 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 			DUK_ASSERT((elem_length << shift) == byte_length);
 
 			h_bufobj = duk_push_bufobj_raw(thr,
-			                               DUK_HOBJECT_FLAG_EXTENSIBLE |
-			                               DUK_HOBJECT_FLAG_BUFOBJ |
-			                               DUK_HOBJECT_CLASS_AS_FLAGS(class_num),
+			                               DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_BUFOBJ |
+			                                   DUK_HOBJECT_CLASS_AS_FLAGS(class_num),
 			                               (duk_small_int_t) proto_bidx);
 			h_val = h_bufarg->buf;
 			if (h_val == NULL) {
@@ -27401,7 +28605,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 			h_bufobj->shift = (duk_uint8_t) shift;
 			h_bufobj->elem_type = (duk_uint8_t) elem_type;
 			h_bufobj->is_typedarray = 1;
-			DUK_ASSERT_HBUFOBJ_VALID(h_bufobj);
+			DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
 
 			/* Set .buffer to the argument ArrayBuffer. */
 			DUK_ASSERT(h_bufobj->buf_prop == NULL);
@@ -27416,7 +28620,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 			 */
 
 			h_bufarg = (duk_hbufobj *) h_obj;
-			DUK_ASSERT_HBUFOBJ_VALID(h_bufarg);
+			DUK_HBUFOBJ_ASSERT_VALID(h_bufarg);
 			elem_length_signed = (duk_int_t) (h_bufarg->length >> h_bufarg->shift);
 			if (h_bufarg->buf == NULL) {
 				DUK_DCERROR_TYPE_INVALID_ARGS(thr);
@@ -27431,11 +28635,13 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 			                     "src byte_length=%ld, src shift=%d, "
 			                     "src/dst elem_length=%ld; "
 			                     "dst shift=%d -> dst byte_length=%ld",
-			                     (long) h_bufarg->length, (int) h_bufarg->shift,
-			                     (long) elem_length_signed, (int) shift,
+			                     (long) h_bufarg->length,
+			                     (int) h_bufarg->shift,
+			                     (long) elem_length_signed,
+			                     (int) shift,
 			                     (long) (elem_length_signed << shift)));
 
-			copy_mode = 2;  /* default is explicit index read/write copy */
+			copy_mode = 2; /* default is explicit index read/write copy */
 #if !defined(DUK_USE_PREFER_SIZE)
 			/* With a size optimized build copy_mode 2 is enough.
 			 * Modes 0 and 1 are faster but conceptually the same.
@@ -27444,14 +28650,14 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 			if (DUK_HBUFOBJ_VALID_SLICE(h_bufarg)) {
 				if ((duk__buffer_elemtype_copy_compatible[elem_type] & (1 << h_bufarg->elem_type)) != 0) {
 					DUK_DDD(DUK_DDDPRINT("source/target are copy compatible, memcpy"));
-					DUK_ASSERT(shift == h_bufarg->shift);  /* byte sizes will match */
+					DUK_ASSERT(shift == h_bufarg->shift); /* byte sizes will match */
 					copy_mode = 0;
 				} else {
 					DUK_DDD(DUK_DDDPRINT("source/target not copy compatible but valid, fast copy"));
 					copy_mode = 1;
 				}
 			}
-#endif  /* !DUK_USE_PREFER_SIZE */
+#endif /* !DUK_USE_PREFER_SIZE */
 		} else {
 			/* Array or Array-like */
 			elem_length_signed = (duk_int_t) duk_get_length(thr, 0);
@@ -27476,8 +28682,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 		goto fail_arguments;
 	}
 
-	DUK_DDD(DUK_DDDPRINT("elem_length=%ld, byte_length=%ld",
-	                     (long) elem_length, (long) byte_length));
+	DUK_DDD(DUK_DDDPRINT("elem_length=%ld, byte_length=%ld", (long) elem_length, (long) byte_length));
 
 	/* ArrayBuffer argument is handled specially above; the rest of the
 	 * argument variants are handled by shared code below.
@@ -27492,11 +28697,10 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 	h_val = duk_known_hbuffer(thr, -1);
 	DUK_ASSERT(h_val != NULL);
 
-	h_bufobj = duk_push_bufobj_raw(thr,
-	                               DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                               DUK_HOBJECT_FLAG_BUFOBJ |
-	                               DUK_HOBJECT_CLASS_AS_FLAGS(class_num),
-	                               (duk_small_int_t) proto_bidx);
+	h_bufobj =
+	    duk_push_bufobj_raw(thr,
+	                        DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_BUFOBJ | DUK_HOBJECT_CLASS_AS_FLAGS(class_num),
+	                        (duk_small_int_t) proto_bidx);
 
 	h_bufobj->buf = h_val;
 	DUK_HBUFFER_INCREF(thr, h_val);
@@ -27505,7 +28709,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 	h_bufobj->shift = (duk_uint8_t) shift;
 	h_bufobj->elem_type = (duk_uint8_t) elem_type;
 	h_bufobj->is_typedarray = 1;
-	DUK_ASSERT_HBUFOBJ_VALID(h_bufobj);
+	DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
 
 	/* Copy values, the copy method depends on the arguments.
 	 *
@@ -27536,7 +28740,9 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 		p_src = DUK_HBUFOBJ_GET_SLICE_BASE(thr->heap, h_bufarg);
 
 		DUK_DDD(DUK_DDDPRINT("using memcpy: p_src=%p, p_dst=%p, byte_length=%ld",
-		                     (void *) p_src, (void *) p_dst, (long) byte_length));
+		                     (void *) p_src,
+		                     (void *) p_dst,
+		                     (long) byte_length));
 
 		duk_memcpy_unsafe((void *) p_dst, (const void *) p_src, (size_t) byte_length);
 		break;
@@ -27566,13 +28772,18 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 
 		DUK_DDD(DUK_DDDPRINT("using fast copy: p_src=%p, p_src_end=%p, p_dst=%p, "
 		                     "src_elem_size=%d, dst_elem_size=%d",
-		                     (void *) p_src, (void *) p_src_end, (void *) p_dst,
-		                     (int) src_elem_size, (int) dst_elem_size));
+		                     (void *) p_src,
+		                     (void *) p_src_end,
+		                     (void *) p_dst,
+		                     (int) src_elem_size,
+		                     (int) dst_elem_size));
 
 		while (p_src != p_src_end) {
 			DUK_DDD(DUK_DDDPRINT("fast path per element copy loop: "
 			                     "p_src=%p, p_src_end=%p, p_dst=%p",
-			                     (void *) p_src, (void *) p_src_end, (void *) p_dst));
+			                     (void *) p_src,
+			                     (void *) p_src_end,
+			                     (void *) p_dst));
 			/* A validated read() is always a number, so it's write coercion
 			 * is always side effect free an won't invalidate pointers etc.
 			 */
@@ -27584,7 +28795,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 		}
 		break;
 	}
-#endif  /* !DUK_USE_PREFER_SIZE */
+#endif /* !DUK_USE_PREFER_SIZE */
 	case 2: {
 		/* Copy values by index reads and writes.  Let virtual
 		 * property handling take care of coercion.
@@ -27613,10 +28824,10 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
 
 	return 1;
 
- fail_arguments:
+fail_arguments:
 	DUK_DCERROR_RANGE_INVALID_ARGS(thr);
 }
-#else  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
 /* When bufferobject support is disabled, new Uint8Array() could still be
  * supported to create a plain fixed buffer.  Disabled for now.
  */
@@ -27643,8 +28854,8 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_constructor(duk_hthread *thr) {
  fail_arguments:
 	DUK_DCERROR_RANGE_INVALID_ARGS(thr);
 }
-#endif  /* 0 */
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* 0 */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
 DUK_INTERNAL duk_ret_t duk_bi_dataview_constructor(duk_hthread *thr) {
@@ -27667,9 +28878,8 @@ DUK_INTERNAL duk_ret_t duk_bi_dataview_constructor(duk_hthread *thr) {
 	DUK_ASSERT(offset + length <= h_bufarg->length);
 
 	h_bufobj = duk_push_bufobj_raw(thr,
-	                               DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                               DUK_HOBJECT_FLAG_BUFOBJ |
-	                               DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DATAVIEW),
+	                               DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_BUFOBJ |
+	                                   DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DATAVIEW),
 	                               DUK_BIDX_DATAVIEW_PROTOTYPE);
 
 	h_val = h_bufarg->buf;
@@ -27689,10 +28899,10 @@ DUK_INTERNAL duk_ret_t duk_bi_dataview_constructor(duk_hthread *thr) {
 	DUK_ASSERT(h_bufarg != NULL);
 	DUK_HBUFOBJ_INCREF(thr, h_bufarg);
 
-	DUK_ASSERT_HBUFOBJ_VALID(h_bufobj);
+	DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  ArrayBuffer.isView()
@@ -27718,7 +28928,7 @@ DUK_INTERNAL duk_ret_t duk_bi_arraybuffer_isview(duk_hthread *thr) {
 	duk_push_boolean(thr, ret);
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Uint8Array.allocPlain()
@@ -27729,7 +28939,7 @@ DUK_INTERNAL duk_ret_t duk_bi_uint8array_allocplain(duk_hthread *thr) {
 	duk__hbufobj_fixed_from_argvalue(thr);
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Uint8Array.plainOf()
@@ -27758,7 +28968,7 @@ DUK_INTERNAL duk_ret_t duk_bi_uint8array_plainof(duk_hthread *thr) {
 	}
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Node.js Buffer: toString([encoding], [start], [end])
@@ -27777,7 +28987,7 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_tostring(duk_hthread *thr) {
 		duk_push_literal(thr, "[object Object]");
 		return 1;
 	}
-	DUK_ASSERT_HBUFOBJ_VALID(h_this);
+	DUK_HBUFOBJ_ASSERT_VALID(h_this);
 
 	/* Ignore encoding for now. */
 
@@ -27789,12 +28999,11 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_tostring(duk_hthread *thr) {
 	                                     &end_offset);
 
 	slice_length = (duk_size_t) (end_offset - start_offset);
-	buf_slice = (duk_uint8_t *) duk_push_fixed_buffer_nozero(thr, slice_length);  /* all bytes initialized below */
+	buf_slice = (duk_uint8_t *) duk_push_fixed_buffer_nozero(thr, slice_length); /* all bytes initialized below */
 	DUK_ASSERT(buf_slice != NULL);
 
 	/* Neutered or uncovered, TypeError. */
-	if (h_this->buf == NULL ||
-	    !DUK_HBUFOBJ_VALID_BYTEOFFSET_EXCL(h_this, (duk_size_t) start_offset + slice_length)) {
+	if (h_this->buf == NULL || !DUK_HBUFOBJ_VALID_BYTEOFFSET_EXCL(h_this, (duk_size_t) start_offset + slice_length)) {
 		DUK_DCERROR_TYPE_INVALID_ARGS(thr);
 	}
 
@@ -27817,7 +29026,7 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_tostring(duk_hthread *thr) {
 	duk_set_top(thr, 1);
 	return duk_textdecoder_decode_utf8_nodejs(thr);
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Node.js Buffer.prototype: toJSON()
@@ -27847,18 +29056,19 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_tojson(duk_hthread *thr) {
 
 	/* XXX: uninitialized would be OK */
 	DUK_ASSERT_DISABLE((duk_size_t) h_this->length <= (duk_size_t) DUK_UINT32_MAX);
-	tv = duk_push_harray_with_size_outptr(thr, (duk_uint32_t) h_this->length);  /* XXX: needs revision with >4G buffers */
+	tv = duk_push_harray_with_size_outptr(thr, (duk_uint32_t) h_this->length); /* XXX: needs revision with >4G buffers */
+	DUK_ASSERT(!duk_is_bare_object(thr, -1));
 
 	DUK_ASSERT(h_this->buf != NULL);
 	buf = DUK_HBUFOBJ_GET_SLICE_BASE(thr->heap, h_this);
 	for (i = 0, n = h_this->length; i < n; i++) {
-		DUK_TVAL_SET_U32(tv + i, (duk_uint32_t) buf[i]);  /* no need for decref or incref */
+		DUK_TVAL_SET_U32(tv + i, (duk_uint32_t) buf[i]); /* no need for decref or incref */
 	}
 	duk_put_prop_stridx_short(thr, -2, DUK_STRIDX_DATA);
 
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Node.js Buffer.prototype.equals()
@@ -27893,14 +29103,14 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_compare_shared(duk_hthread *thr) {
 	 * matters is to be memory safe.
 	 */
 
-	if (DUK_HBUFOBJ_VALID_SLICE(h_bufarg1) &&
-	    DUK_HBUFOBJ_VALID_SLICE(h_bufarg2)) {
-		comp_res = duk_js_data_compare((const duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h_bufarg1->buf) + h_bufarg1->offset,
-		                               (const duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h_bufarg2->buf) + h_bufarg2->offset,
-		                               (duk_size_t) h_bufarg1->length,
-		                               (duk_size_t) h_bufarg2->length);
+	if (DUK_HBUFOBJ_VALID_SLICE(h_bufarg1) && DUK_HBUFOBJ_VALID_SLICE(h_bufarg2)) {
+		comp_res = duk_js_data_compare(
+		    (const duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h_bufarg1->buf) + h_bufarg1->offset,
+		    (const duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h_bufarg2->buf) + h_bufarg2->offset,
+		    (duk_size_t) h_bufarg1->length,
+		    (duk_size_t) h_bufarg2->length);
 	} else {
-		comp_res = -1;  /* either nonzero value is ok */
+		comp_res = -1; /* either nonzero value is ok */
 	}
 
 	if (magic & 0x01U) {
@@ -27913,7 +29123,7 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_compare_shared(duk_hthread *thr) {
 
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Node.js Buffer.prototype.fill()
@@ -27958,7 +29168,10 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_fill(duk_hthread *thr) {
 	                                     &fill_end);
 
 	DUK_DDD(DUK_DDDPRINT("fill: fill_value=%02x, fill_offset=%ld, fill_end=%ld, view length=%ld",
-	                     (unsigned int) fill_value, (long) fill_offset, (long) fill_end, (long) h_this->length));
+	                     (unsigned int) fill_value,
+	                     (long) fill_offset,
+	                     (long) fill_end,
+	                     (long) h_this->length));
 
 	DUK_ASSERT(fill_end - fill_offset >= 0);
 	DUK_ASSERT(h_this->buf != NULL);
@@ -27987,7 +29200,7 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_fill(duk_hthread *thr) {
 	duk_push_this(thr);
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Node.js Buffer.prototype.write(string, [offset], [length], [encoding])
@@ -28030,7 +29243,7 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_write(duk_hthread *thr) {
 	duk_push_uint(thr, length);
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Node.js Buffer.prototype.copy()
@@ -28065,8 +29278,11 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_copy(duk_hthread *thr) {
 
 	DUK_DDD(DUK_DDDPRINT("checking copy args: target_start=%ld, target_length=%ld, "
 	                     "source_start=%ld, source_end=%ld, source_length=%ld",
-	                     (long) target_start, (long) h_bufarg->length,
-	                     (long) source_start, (long) source_end, (long) source_length));
+	                     (long) target_start,
+	                     (long) h_bufarg->length,
+	                     (long) source_start,
+	                     (long) source_end,
+	                     (long) source_length));
 
 	/* This behavior mostly mimics Node.js now. */
 
@@ -28077,9 +29293,9 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_copy(duk_hthread *thr) {
 	source_ustart = (duk_uint_t) source_start;
 	source_uend = (duk_uint_t) source_end;
 	target_ustart = (duk_uint_t) target_start;
-	if (source_ustart >= source_uend ||  /* crossed offsets or zero size */
-	    source_ustart >= (duk_uint_t) source_length ||  /* source out-of-bounds (but positive) */
-	    target_ustart >= (duk_uint_t) target_length) {  /* target out-of-bounds (but positive) */
+	if (source_ustart >= source_uend || /* crossed offsets or zero size */
+	    source_ustart >= (duk_uint_t) source_length || /* source out-of-bounds (but positive) */
+	    target_ustart >= (duk_uint_t) target_length) { /* target out-of-bounds (but positive) */
 		goto silent_ignore;
 	}
 	if (source_uend >= (duk_uint_t) source_length) {
@@ -28095,13 +29311,14 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_copy(duk_hthread *thr) {
 		 * values in duk_int_t range.  Adding them as duk_uint_t
 		 * values is then guaranteed not to overflow.
 		 */
-		DUK_ASSERT(target_ustart + copy_size >= target_ustart);  /* no overflow */
-		DUK_ASSERT(target_ustart + copy_size >= copy_size);  /* no overflow */
+		DUK_ASSERT(target_ustart + copy_size >= target_ustart); /* no overflow */
+		DUK_ASSERT(target_ustart + copy_size >= copy_size); /* no overflow */
 		copy_size = (duk_uint_t) target_length - target_ustart;
 	}
 
 	DUK_DDD(DUK_DDDPRINT("making copy: target_ustart=%lu source_ustart=%lu copy_size=%lu",
-	                     (unsigned long) target_ustart, (unsigned long) source_ustart,
+	                     (unsigned long) target_ustart,
+	                     (unsigned long) source_ustart,
 	                     (unsigned long) copy_size));
 
 	DUK_ASSERT(copy_size >= 1);
@@ -28111,8 +29328,8 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_copy(duk_hthread *thr) {
 	DUK_ASSERT(target_ustart + copy_size <= (duk_uint_t) target_length);
 
 	/* Ensure copy is covered by underlying buffers. */
-	DUK_ASSERT(h_bufarg->buf != NULL);  /* length check */
-	DUK_ASSERT(h_this->buf != NULL);    /* length check */
+	DUK_ASSERT(h_bufarg->buf != NULL); /* length check */
+	DUK_ASSERT(h_this->buf != NULL); /* length check */
 	if (DUK_HBUFOBJ_VALID_BYTEOFFSET_EXCL(h_bufarg, target_ustart + copy_size) &&
 	    DUK_HBUFOBJ_VALID_BYTEOFFSET_EXCL(h_this, source_ustart + copy_size)) {
 		/* Must use memmove() because copy area may overlap (source and target
@@ -28125,18 +29342,18 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_copy(duk_hthread *thr) {
 		DUK_DDD(DUK_DDDPRINT("buffer copy not covered by underlying buffer(s), ignoring"));
 	}
 
- silent_ignore:
+silent_ignore:
 	/* Return value is like write(), number of bytes written.
 	 * The return value matters because of code like:
 	 * "off += buf.copy(...)".
-         */
+	 */
 	duk_push_uint(thr, copy_size);
 	return 1;
 
- fail_bounds:
+fail_bounds:
 	DUK_DCERROR_RANGE_INVALID_ARGS(thr);
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  TypedArray.prototype.set()
@@ -28185,7 +29402,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_set(duk_hthread *thr) {
 
 	h_this = duk__require_bufobj_this(thr);
 	DUK_ASSERT(h_this != NULL);
-	DUK_ASSERT_HBUFOBJ_VALID(h_this);
+	DUK_HBUFOBJ_ASSERT_VALID(h_this);
 
 	if (h_this->buf == NULL) {
 		DUK_DDD(DUK_DDDPRINT("source neutered, skip copy"));
@@ -28240,7 +29457,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_set(duk_hthread *thr) {
 		duk_small_uint_t dst_elem_size;
 
 		h_bufarg = (duk_hbufobj *) h_obj;
-		DUK_ASSERT_HBUFOBJ_VALID(h_bufarg);
+		DUK_HBUFOBJ_ASSERT_VALID(h_bufarg);
 
 		if (h_bufarg->buf == NULL) {
 			DUK_DDD(DUK_DDDPRINT("target neutered, skip copy"));
@@ -28248,16 +29465,15 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_set(duk_hthread *thr) {
 		}
 
 		/* Nominal size check. */
-		src_length = h_bufarg->length;  /* bytes in source */
-		dst_length_elems = (src_length >> h_bufarg->shift);  /* elems in source and dest */
-		dst_length = dst_length_elems << h_this->shift;  /* bytes in dest */
+		src_length = h_bufarg->length; /* bytes in source */
+		dst_length_elems = (src_length >> h_bufarg->shift); /* elems in source and dest */
+		dst_length = dst_length_elems << h_this->shift; /* bytes in dest */
 		if ((dst_length >> h_this->shift) != dst_length_elems) {
 			/* Byte length would overflow. */
 			/* XXX: easier check with less code? */
 			goto fail_args;
 		}
-		DUK_DDD(DUK_DDDPRINT("nominal size check: src_length=%ld, dst_length=%ld",
-		                     (long) src_length, (long) dst_length));
+		DUK_DDD(DUK_DDDPRINT("nominal size check: src_length=%ld, dst_length=%ld", (long) src_length, (long) dst_length));
 		DUK_ASSERT(offset_bytes <= h_this->length);
 		if (dst_length > h_this->length - offset_bytes) {
 			/* Overflow not an issue because subtraction is used on the right
@@ -28278,8 +29494,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_set(duk_hthread *thr) {
 		 * cover the copy.  No side effects are allowed after the check
 		 * so that the validity status doesn't change.
 		 */
-		if (!DUK_HBUFOBJ_VALID_SLICE(h_this) ||
-		    !DUK_HBUFOBJ_VALID_SLICE(h_bufarg)) {
+		if (!DUK_HBUFOBJ_VALID_SLICE(h_this) || !DUK_HBUFOBJ_VALID_SLICE(h_bufarg)) {
 			/* The condition could be more narrow and check for the
 			 * copy area only, but there's no need for fine grained
 			 * behavior when the underlying buffer is misconfigured.
@@ -28310,7 +29525,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_set(duk_hthread *thr) {
 			return 0;
 		}
 		DUK_DDD(DUK_DDDPRINT("fast path: views are not compatible with a byte copy, copy by item"));
-#endif  /* !DUK_USE_PREFER_SIZE */
+#endif /* !DUK_USE_PREFER_SIZE */
 
 		/* We want to avoid making a copy to process set() but that's
 		 * not always possible: the source and the target may overlap
@@ -28330,11 +29545,13 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_set(duk_hthread *thr) {
 
 		DUK_DDD(DUK_DDDPRINT("overlap check: p_src_base=%p, src_length=%ld, "
 		                     "p_dst_base=%p, dst_length=%ld",
-		                     (void *) p_src_base, (long) src_length,
-		                     (void *) p_dst_base, (long) dst_length));
+		                     (void *) p_src_base,
+		                     (long) src_length,
+		                     (void *) p_dst_base,
+		                     (long) dst_length));
 
-		if (p_src_base >= p_dst_base + dst_length ||  /* source starts after dest ends */
-		    p_src_base + src_length <= p_dst_base) {   /* source ends before dest starts */
+		if (p_src_base >= p_dst_base + dst_length || /* source starts after dest ends */
+		    p_src_base + src_length <= p_dst_base) { /* source ends before dest starts */
 			no_overlap = 1;
 		}
 
@@ -28351,14 +29568,16 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_set(duk_hthread *thr) {
 			DUK_ASSERT(p_src_copy != NULL);
 			duk_memcpy_unsafe((void *) p_src_copy, (const void *) p_src_base, (size_t) src_length);
 
-			p_src_base = p_src_copy;  /* use p_src_base from now on */
+			p_src_base = p_src_copy; /* use p_src_base from now on */
 		}
 		/* Value stack intentionally mixed size here. */
 
 		DUK_DDD(DUK_DDDPRINT("after overlap check: p_src_base=%p, src_length=%ld, "
 		                     "p_dst_base=%p, dst_length=%ld, valstack top=%ld",
-		                     (void *) p_src_base, (long) src_length,
-		                     (void *) p_dst_base, (long) dst_length,
+		                     (void *) p_src_base,
+		                     (long) src_length,
+		                     (void *) p_dst_base,
+		                     (long) dst_length,
 		                     (long) duk_get_top(thr)));
 
 		/* Ready to make the copy.  We must proceed element by element
@@ -28378,7 +29597,9 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_set(duk_hthread *thr) {
 		while (p_src != p_src_end) {
 			DUK_DDD(DUK_DDDPRINT("fast path per element copy loop: "
 			                     "p_src=%p, p_src_end=%p, p_dst=%p",
-			                     (void *) p_src, (void *) p_src_end, (void *) p_dst));
+			                     (void *) p_src,
+			                     (void *) p_src_end,
+			                     (void *) p_dst));
 			/* A validated read() is always a number, so it's write coercion
 			 * is always side effect free an won't invalidate pointers etc.
 			 */
@@ -28428,10 +29649,10 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_set(duk_hthread *thr) {
 
 	return 0;
 
- fail_args:
+fail_args:
 	DUK_DCERROR_RANGE_INVALID_ARGS(thr);
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Node.js Buffer.prototype.slice([start], [end])
@@ -28526,7 +29747,7 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_slice_shared(duk_hthread *thr) {
 			/* fall through */
 		}
 	}
-	tv = NULL;  /* No longer valid nor needed. */
+	tv = NULL; /* No longer valid nor needed. */
 
 	h_this = duk__require_bufobj_this(thr);
 
@@ -28564,22 +29785,21 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_slice_shared(duk_hthread *thr) {
 	 * be an Uint8Array but inherit from Buffer.prototype.
 	 */
 	res_class_num = DUK_HOBJECT_GET_CLASS_NUMBER((duk_hobject *) h_this);
-	DUK_ASSERT(res_class_num >= DUK_HOBJECT_CLASS_BUFOBJ_MIN);  /* type check guarantees */
+	DUK_ASSERT(res_class_num >= DUK_HOBJECT_CLASS_BUFOBJ_MIN); /* type check guarantees */
 	DUK_ASSERT(res_class_num <= DUK_HOBJECT_CLASS_BUFOBJ_MAX);
 	res_proto_bidx = duk__buffer_proto_from_classnum[res_class_num - DUK_HOBJECT_CLASS_BUFOBJ_MIN];
 	if (magic & 0x04) {
 		res_proto_bidx = DUK_BIDX_NODEJS_BUFFER_PROTOTYPE;
 	}
-	h_bufobj = duk_push_bufobj_raw(thr,
-	                               DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                               DUK_HOBJECT_FLAG_BUFOBJ |
-	                               DUK_HOBJECT_CLASS_AS_FLAGS(res_class_num),
-	                               res_proto_bidx);
+	h_bufobj =
+	    duk_push_bufobj_raw(thr,
+	                        DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_BUFOBJ | DUK_HOBJECT_CLASS_AS_FLAGS(res_class_num),
+	                        res_proto_bidx);
 	DUK_ASSERT(h_bufobj != NULL);
 
 	DUK_ASSERT(h_bufobj->length == 0);
-	h_bufobj->shift = h_this->shift;  /* inherit */
-	h_bufobj->elem_type = h_this->elem_type;  /* inherit */
+	h_bufobj->shift = h_this->shift; /* inherit */
+	h_bufobj->elem_type = h_this->elem_type; /* inherit */
 	h_bufobj->is_typedarray = magic & 0x01;
 	DUK_ASSERT(h_bufobj->is_typedarray == 0 || h_bufobj->is_typedarray == 1);
 
@@ -28593,7 +29813,9 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_slice_shared(duk_hthread *thr) {
 		duk_uint8_t *p_copy;
 		duk_size_t copy_length;
 
-		p_copy = (duk_uint8_t *) duk_push_fixed_buffer_zero(thr, (duk_size_t) slice_length);  /* must be zeroed, not all bytes always copied */
+		p_copy = (duk_uint8_t *) duk_push_fixed_buffer_zero(
+		    thr,
+		    (duk_size_t) slice_length); /* must be zeroed, not all bytes always copied */
 		DUK_ASSERT(p_copy != NULL);
 
 		/* Copy slice, respecting underlying buffer limits; remainder
@@ -28611,7 +29833,7 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_slice_shared(duk_hthread *thr) {
 		h_bufobj->length = slice_length;
 		DUK_ASSERT(h_bufobj->offset == 0);
 
-		duk_pop(thr);  /* reachable so pop OK */
+		duk_pop(thr); /* reachable so pop OK */
 	} else {
 		h_bufobj->buf = h_val;
 		DUK_HBUFFER_INCREF(thr, h_val);
@@ -28624,15 +29846,15 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_slice_shared(duk_hthread *thr) {
 		 */
 
 		DUK_ASSERT(h_bufobj->buf_prop == NULL);
-		h_bufobj->buf_prop = h_this->buf_prop;  /* may be NULL */
+		h_bufobj->buf_prop = h_this->buf_prop; /* may be NULL */
 		DUK_HOBJECT_INCREF_ALLOWNULL(thr, (duk_hobject *) h_bufobj->buf_prop);
 	}
 	/* unbalanced stack on purpose */
 
-	DUK_ASSERT_HBUFOBJ_VALID(h_bufobj);
+	DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Node.js Buffer.isEncoding()
@@ -28645,11 +29867,11 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_is_encoding(duk_hthread *thr) {
 	/* only accept lowercase 'utf8' now. */
 
 	encoding = duk_to_string(thr, 0);
-	DUK_ASSERT(duk_is_string(thr, 0));  /* guaranteed by duk_to_string() */
+	DUK_ASSERT(duk_is_string(thr, 0)); /* guaranteed by duk_to_string() */
 	duk_push_boolean(thr, DUK_STRCMP(encoding, "utf8") == 0);
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Node.js Buffer.isBuffer()
@@ -28661,7 +29883,7 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_is_buffer(duk_hthread *thr) {
 	duk_hobject *h_proto;
 	duk_bool_t ret = 0;
 
-	DUK_ASSERT(duk_get_top(thr) >= 1);  /* nargs */
+	DUK_ASSERT(duk_get_top(thr) >= 1); /* nargs */
 	h = duk_get_hobject(thr, 0);
 	if (h != NULL) {
 		h_proto = thr->builtins[DUK_BIDX_NODEJS_BUFFER_PROTOTYPE];
@@ -28676,7 +29898,7 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_is_buffer(duk_hthread *thr) {
 	duk_push_boolean(thr, ret);
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Node.js Buffer.byteLength()
@@ -28707,7 +29929,7 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_byte_length(duk_hthread *thr) {
 	duk_push_size_t(thr, len);
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Node.js Buffer.concat()
@@ -28738,13 +29960,13 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_concat(duk_hthread *thr) {
 		/* Neutered checks not necessary here: neutered buffers have
 		 * zero 'length' so we'll effectively skip them.
 		 */
-		DUK_ASSERT_TOP(thr, 2);  /* [ array totalLength ] */
-		duk_get_prop_index(thr, 0, (duk_uarridx_t) i);  /* -> [ array totalLength buf ] */
+		DUK_ASSERT_TOP(thr, 2); /* [ array totalLength ] */
+		duk_get_prop_index(thr, 0, (duk_uarridx_t) i); /* -> [ array totalLength buf ] */
 		h_bufobj = duk__require_bufobj_value(thr, 2);
 		DUK_ASSERT(h_bufobj != NULL);
 		total_length += h_bufobj->length;
 		if (DUK_UNLIKELY(total_length < h_bufobj->length)) {
-			DUK_DCERROR_RANGE_INVALID_ARGS(thr);  /* Wrapped. */
+			DUK_DCERROR_RANGE_INVALID_ARGS(thr); /* Wrapped. */
 		}
 		duk_pop(thr);
 	}
@@ -28770,18 +29992,18 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_concat(duk_hthread *thr) {
 	}
 
 	h_bufres = duk_push_bufobj_raw(thr,
-	                               DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                               DUK_HOBJECT_FLAG_BUFOBJ |
-	                               DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_UINT8ARRAY),
+	                               DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_BUFOBJ |
+	                                   DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_UINT8ARRAY),
 	                               DUK_BIDX_NODEJS_BUFFER_PROTOTYPE);
 	DUK_ASSERT(h_bufres != NULL);
 
-	p = (duk_uint8_t *) duk_push_fixed_buffer_zero(thr, total_length);  /* must be zeroed, all bytes not necessarily written over */
+	p = (duk_uint8_t *) duk_push_fixed_buffer_zero(thr,
+	                                               total_length); /* must be zeroed, all bytes not necessarily written over */
 	DUK_ASSERT(p != NULL);
 	space_left = (duk_size_t) total_length;
 
 	for (i = 0; i < n; i++) {
-		DUK_ASSERT_TOP(thr, 4);  /* [ array totalLength bufres buf ] */
+		DUK_ASSERT_TOP(thr, 4); /* [ array totalLength bufres buf ] */
 
 		duk_get_prop_index(thr, 0, (duk_uarridx_t) i);
 		h_bufobj = duk__require_bufobj_value(thr, 4);
@@ -28792,11 +30014,8 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_concat(duk_hthread *thr) {
 			copy_size = space_left;
 		}
 
-		if (h_bufobj->buf != NULL &&
-		    DUK_HBUFOBJ_VALID_SLICE(h_bufobj)) {
-			duk_memcpy_unsafe((void *) p,
-			                  (const void *) DUK_HBUFOBJ_GET_SLICE_BASE(thr->heap, h_bufobj),
-			                  copy_size);
+		if (h_bufobj->buf != NULL && DUK_HBUFOBJ_VALID_SLICE(h_bufobj)) {
+			duk_memcpy_unsafe((void *) p, (const void *) DUK_HBUFOBJ_GET_SLICE_BASE(thr->heap, h_bufobj), copy_size);
 		} else {
 			/* Just skip, leaving zeroes in the result. */
 			;
@@ -28811,13 +30030,13 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_concat(duk_hthread *thr) {
 
 	duk__set_bufobj_buffer(thr, h_bufres, h_val);
 	h_bufres->is_typedarray = 1;
-	DUK_ASSERT_HBUFOBJ_VALID(h_bufres);
+	DUK_HBUFOBJ_ASSERT_VALID(h_bufres);
 
-	duk_pop(thr);  /* pop plain buffer, now reachable through h_bufres */
+	duk_pop(thr); /* pop plain buffer, now reachable through h_bufres */
 
-	return 1;  /* return h_bufres */
+	return 1; /* return h_bufres */
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Shared readfield and writefield methods
@@ -28833,24 +30052,24 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_concat(duk_hthread *thr) {
  *       4: signed: 1=yes, 0=no
  *       5: typedarray: 1=yes, 0=no
  */
-#define  DUK__FLD_8BIT         0
-#define  DUK__FLD_16BIT        1
-#define  DUK__FLD_32BIT        2
-#define  DUK__FLD_FLOAT        3
-#define  DUK__FLD_DOUBLE       4
-#define  DUK__FLD_VARINT       5
-#define  DUK__FLD_BIGENDIAN    (1 << 3)
-#define  DUK__FLD_SIGNED       (1 << 4)
-#define  DUK__FLD_TYPEDARRAY   (1 << 5)
+#define DUK__FLD_8BIT       0
+#define DUK__FLD_16BIT      1
+#define DUK__FLD_32BIT      2
+#define DUK__FLD_FLOAT      3
+#define DUK__FLD_DOUBLE     4
+#define DUK__FLD_VARINT     5
+#define DUK__FLD_BIGENDIAN  (1 << 3)
+#define DUK__FLD_SIGNED     (1 << 4)
+#define DUK__FLD_TYPEDARRAY (1 << 5)
 
 /* XXX: split into separate functions for each field type? */
 DUK_INTERNAL duk_ret_t duk_bi_buffer_readfield(duk_hthread *thr) {
-	duk_small_int_t magic = (duk_small_int_t) duk_get_current_magic(thr);
-	duk_small_int_t magic_ftype;
-	duk_small_int_t magic_bigendian;
-	duk_small_int_t magic_signed;
-	duk_small_int_t magic_typedarray;
-	duk_small_int_t endswap;
+	duk_small_uint_t magic = (duk_small_uint_t) duk_get_current_magic(thr);
+	duk_small_uint_t magic_ftype;
+	duk_small_uint_t magic_bigendian;
+	duk_small_uint_t magic_signed;
+	duk_small_uint_t magic_typedarray;
+	duk_small_uint_t endswap;
 	duk_hbufobj *h_this;
 	duk_bool_t no_assert;
 	duk_int_t offset_signed;
@@ -28860,12 +30079,12 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_readfield(duk_hthread *thr) {
 	duk_uint8_t *buf;
 	duk_double_union du;
 
-	magic_ftype = magic & 0x0007;
-	magic_bigendian = magic & 0x0008;
-	magic_signed = magic & 0x0010;
-	magic_typedarray = magic & 0x0020;
+	magic_ftype = magic & 0x0007U;
+	magic_bigendian = magic & 0x0008U;
+	magic_signed = magic & 0x0010U;
+	magic_typedarray = magic & 0x0020U;
 
-	h_this = duk__require_bufobj_this(thr);  /* XXX: very inefficient for plain buffers */
+	h_this = duk__require_bufobj_this(thr); /* XXX: very inefficient for plain buffers */
 	DUK_ASSERT(h_this != NULL);
 	buffer_length = h_this->length;
 
@@ -28877,9 +30096,9 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_readfield(duk_hthread *thr) {
 	if (magic_typedarray) {
 		no_assert = 0;
 #if defined(DUK_USE_INTEGER_LE)
-		endswap = !duk_to_boolean(thr, 1);  /* 1=little endian */
+		endswap = !duk_to_boolean(thr, 1); /* 1=little endian */
 #else
-		endswap = duk_to_boolean(thr, 1);  /* 1=little endian */
+		endswap = duk_to_boolean(thr, 1); /* 1=little endian */
 #endif
 	} else {
 		no_assert = duk_to_boolean(thr, (magic_ftype == DUK__FLD_VARINT) ? 2 : 1);
@@ -28902,18 +30121,22 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_readfield(duk_hthread *thr) {
 
 	DUK_DDD(DUK_DDDPRINT("readfield, buffer_length=%ld, offset=%ld, no_assert=%d, "
 	                     "magic=%04x, magic_fieldtype=%d, magic_bigendian=%d, magic_signed=%d, "
-	                     "endswap=%d",
-	                     (long) buffer_length, (long) offset, (int) no_assert,
-	                     (unsigned int) magic, (int) magic_ftype, (int) (magic_bigendian >> 3),
-	                     (int) (magic_signed >> 4), (int) endswap));
+	                     "endswap=%u",
+	                     (long) buffer_length,
+	                     (long) offset,
+	                     (int) no_assert,
+	                     (unsigned int) magic,
+	                     (int) magic_ftype,
+	                     (int) (magic_bigendian >> 3),
+	                     (int) (magic_signed >> 4),
+	                     (int) endswap));
 
 	/* Update 'buffer_length' to be the effective, safe limit which
 	 * takes into account the underlying buffer.  This value will be
 	 * potentially invalidated by any side effect.
 	 */
 	check_length = DUK_HBUFOBJ_CLAMP_BYTELENGTH(h_this, buffer_length);
-	DUK_DDD(DUK_DDDPRINT("buffer_length=%ld, check_length=%ld",
-	                     (long) buffer_length, (long) check_length));
+	DUK_DDD(DUK_DDDPRINT("buffer_length=%ld, check_length=%ld", (long) buffer_length, (long) check_length));
 
 	if (h_this->buf) {
 		buf = DUK_HBUFOBJ_GET_SLICE_BASE(thr->heap, h_this);
@@ -29015,7 +30238,7 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_readfield(duk_hthread *thr) {
 #endif
 		const duk_uint8_t *p;
 
-		field_bytelen = duk_get_int(thr, 1);  /* avoid side effects! */
+		field_bytelen = duk_get_int(thr, 1); /* avoid side effects! */
 		if (field_bytelen < 1 || field_bytelen > 6) {
 			goto fail_field_length;
 		}
@@ -29033,12 +30256,12 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_readfield(duk_hthread *thr) {
 			/* Gather in big endian */
 			i = 0;
 			i_step = 1;
-			i_end = field_bytelen;  /* one i_step over */
+			i_end = field_bytelen; /* one i_step over */
 		} else {
 			/* Gather in little endian */
 			i = field_bytelen - 1;
 			i_step = -1;
-			i_end = -1;  /* one i_step over */
+			i_end = -1; /* one i_step over */
 		}
 
 #if defined(DUK_USE_64BIT_OPS)
@@ -29080,16 +30303,16 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_readfield(duk_hthread *thr) {
 #endif
 		break;
 	}
-	default: {  /* should never happen but default here */
+	default: { /* should never happen but default here */
 		goto fail_bounds;
 	}
 	}
 
 	return 1;
 
- fail_neutered:
- fail_field_length:
- fail_bounds:
+fail_neutered:
+fail_field_length:
+fail_bounds:
 	if (no_assert) {
 		/* Node.js return value for noAssert out-of-bounds reads is
 		 * usually (but not always) NaN.  Return NaN consistently.
@@ -29099,17 +30322,17 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_readfield(duk_hthread *thr) {
 	}
 	DUK_DCERROR_RANGE_INVALID_ARGS(thr);
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
 /* XXX: split into separate functions for each field type? */
 DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_hthread *thr) {
-	duk_small_int_t magic = (duk_small_int_t) duk_get_current_magic(thr);
-	duk_small_int_t magic_ftype;
-	duk_small_int_t magic_bigendian;
-	duk_small_int_t magic_signed;
-	duk_small_int_t magic_typedarray;
-	duk_small_int_t endswap;
+	duk_small_uint_t magic = (duk_small_uint_t) duk_get_current_magic(thr);
+	duk_small_uint_t magic_ftype;
+	duk_small_uint_t magic_bigendian;
+	duk_small_uint_t magic_signed;
+	duk_small_uint_t magic_typedarray;
+	duk_small_uint_t endswap;
 	duk_hbufobj *h_this;
 	duk_bool_t no_assert;
 	duk_int_t offset_signed;
@@ -29120,13 +30343,13 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_hthread *thr) {
 	duk_double_union du;
 	duk_int_t nbytes = 0;
 
-	magic_ftype = magic & 0x0007;
-	magic_bigendian = magic & 0x0008;
-	magic_signed = magic & 0x0010;
-	magic_typedarray = magic & 0x0020;
+	magic_ftype = magic & 0x0007U;
+	magic_bigendian = magic & 0x0008U;
+	magic_signed = magic & 0x0010U;
+	magic_typedarray = magic & 0x0020U;
 	DUK_UNREF(magic_signed);
 
-	h_this = duk__require_bufobj_this(thr);  /* XXX: very inefficient for plain buffers */
+	h_this = duk__require_bufobj_this(thr); /* XXX: very inefficient for plain buffers */
 	DUK_ASSERT(h_this != NULL);
 	buffer_length = h_this->length;
 
@@ -29138,11 +30361,11 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_hthread *thr) {
 	if (magic_typedarray) {
 		no_assert = 0;
 #if defined(DUK_USE_INTEGER_LE)
-		endswap = !duk_to_boolean(thr, 2);  /* 1=little endian */
+		endswap = !duk_to_boolean(thr, 2); /* 1=little endian */
 #else
-		endswap = duk_to_boolean(thr, 2);  /* 1=little endian */
+		endswap = duk_to_boolean(thr, 2); /* 1=little endian */
 #endif
-		duk_swap(thr, 0, 1);  /* offset/value order different from Node.js */
+		duk_swap(thr, 0, 1); /* offset/value order different from Node.js */
 	} else {
 		no_assert = duk_to_boolean(thr, (magic_ftype == DUK__FLD_VARINT) ? 3 : 2);
 #if defined(DUK_USE_INTEGER_LE)
@@ -29163,7 +30386,7 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_hthread *thr) {
 	 * (offset + nbytes) even when write fails due to invalid offset.
 	 */
 	if (magic_ftype != DUK__FLD_VARINT) {
-		DUK_ASSERT(magic_ftype >= 0 && magic_ftype < (duk_small_int_t) (sizeof(duk__buffer_nbytes_from_fldtype) / sizeof(duk_uint8_t)));
+		DUK_ASSERT(magic_ftype < (duk_small_uint_t) (sizeof(duk__buffer_nbytes_from_fldtype) / sizeof(duk_uint8_t)));
 		nbytes = duk__buffer_nbytes_from_fldtype[magic_ftype];
 	} else {
 		nbytes = duk_get_int(thr, 2);
@@ -29180,10 +30403,16 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_hthread *thr) {
 
 	DUK_DDD(DUK_DDDPRINT("writefield, value=%!T, buffer_length=%ld, offset=%ld, no_assert=%d, "
 	                     "magic=%04x, magic_fieldtype=%d, magic_bigendian=%d, magic_signed=%d, "
-	                     "endswap=%d",
-	                     duk_get_tval(thr, 0), (long) buffer_length, (long) offset, (int) no_assert,
-	                     (unsigned int) magic, (int) magic_ftype, (int) (magic_bigendian >> 3),
-	                     (int) (magic_signed >> 4), (int) endswap));
+	                     "endswap=%u",
+	                     duk_get_tval(thr, 0),
+	                     (long) buffer_length,
+	                     (long) offset,
+	                     (int) no_assert,
+	                     (unsigned int) magic,
+	                     (int) magic_ftype,
+	                     (int) (magic_bigendian >> 3),
+	                     (int) (magic_signed >> 4),
+	                     (int) endswap));
 
 	/* Coerce value to a number before computing check_length, so that
 	 * the field type specific coercion below can't have side effects
@@ -29196,8 +30425,7 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_hthread *thr) {
 	 * potentially invalidated by any side effect.
 	 */
 	check_length = DUK_HBUFOBJ_CLAMP_BYTELENGTH(h_this, buffer_length);
-	DUK_DDD(DUK_DDDPRINT("buffer_length=%ld, check_length=%ld",
-	                     (long) buffer_length, (long) check_length));
+	DUK_DDD(DUK_DDDPRINT("buffer_length=%ld, check_length=%ld", (long) buffer_length, (long) check_length));
 
 	if (h_this->buf) {
 		buf = DUK_HBUFOBJ_GET_SLICE_BASE(thr->heap, h_this);
@@ -29300,12 +30528,12 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_hthread *thr) {
 
 		if (magic_bigendian) {
 			/* Write in big endian */
-			i = field_bytelen;  /* one i_step added at top of loop */
+			i = field_bytelen; /* one i_step added at top of loop */
 			i_step = -1;
 			i_end = 0;
 		} else {
 			/* Write in little endian */
-			i = -1;  /* one i_step added at top of loop */
+			i = -1; /* one i_step added at top of loop */
 			i_step = 1;
 			i_end = field_bytelen - 1;
 		}
@@ -29323,7 +30551,7 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_hthread *thr) {
 			i += i_step;
 			DUK_ASSERT(i >= 0 && i < field_bytelen);
 			p[i] = (duk_uint8_t) (tmp & 0xff);
-			tmp = tmp >> 8;  /* unnecessary shift for last byte */
+			tmp = tmp >> 8; /* unnecessary shift for last byte */
 		} while (i != i_end);
 #else
 		tmp = duk_to_number(thr, 0);
@@ -29333,12 +30561,12 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_hthread *thr) {
 			tmp = DUK_FLOOR(tmp);
 			DUK_ASSERT(i >= 0 && i < field_bytelen);
 			p[i] = (duk_uint8_t) (DUK_FMOD(tmp, 256.0));
-			tmp = tmp / 256.0;  /* unnecessary div for last byte */
+			tmp = tmp / 256.0; /* unnecessary div for last byte */
 		} while (i != i_end);
 #endif
 		break;
 	}
-	default: {  /* should never happen but default here */
+	default: { /* should never happen but default here */
 		goto fail_bounds;
 	}
 	}
@@ -29355,9 +30583,9 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_hthread *thr) {
 	duk_push_uint(thr, offset + (duk_uint_t) nbytes);
 	return 1;
 
- fail_neutered:
- fail_field_length:
- fail_bounds:
+fail_neutered:
+fail_field_length:
+fail_bounds:
 	if (no_assert) {
 		/* Node.js return value for failed writes is offset + #bytes
 		 * that would have been written.
@@ -29373,7 +30601,7 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_hthread *thr) {
 	}
 	DUK_DCERROR_RANGE_INVALID_ARGS(thr);
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  Accessors for .buffer, .byteLength, .byteOffset
@@ -29384,15 +30612,14 @@ DUK_LOCAL duk_hbufobj *duk__autospawn_arraybuffer(duk_hthread *thr, duk_hbuffer
 	duk_hbufobj *h_res;
 
 	h_res = duk_push_bufobj_raw(thr,
-	                            DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                            DUK_HOBJECT_FLAG_BUFOBJ |
-	                            DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ARRAYBUFFER),
+	                            DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_BUFOBJ |
+	                                DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ARRAYBUFFER),
 	                            DUK_BIDX_ARRAYBUFFER_PROTOTYPE);
 	DUK_ASSERT(h_res != NULL);
 	DUK_UNREF(h_res);
 
 	duk__set_bufobj_buffer(thr, h_res, h_buf);
-	DUK_ASSERT_HBUFOBJ_VALID(h_res);
+	DUK_HBUFOBJ_ASSERT_VALID(h_res);
 	DUK_ASSERT(h_res->buf_prop == NULL);
 	return h_res;
 }
@@ -29426,13 +30653,13 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_buffer_getter(duk_hthread *thr) {
 				 * matches view[0].
 				 */
 				h_arrbuf->offset = 0;
-				DUK_ASSERT(h_bufobj->offset + h_bufobj->length >= h_bufobj->offset);  /* Wrap check on creation. */
+				DUK_ASSERT(h_bufobj->offset + h_bufobj->length >= h_bufobj->offset); /* Wrap check on creation. */
 				h_arrbuf->length = h_bufobj->offset + h_bufobj->length;
 				DUK_ASSERT(h_arrbuf->buf_prop == NULL);
 
 				DUK_ASSERT(h_bufobj->buf_prop == NULL);
 				h_bufobj->buf_prop = (duk_hobject *) h_arrbuf;
-				DUK_HBUFOBJ_INCREF(thr, h_arrbuf);  /* Now reachable and accounted for. */
+				DUK_HBUFOBJ_INCREF(thr, h_arrbuf); /* Now reachable and accounted for. */
 			}
 
 			/* Left on stack; pushed for the second time below (OK). */
@@ -29470,7 +30697,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_bytelength_getter(duk_hthread *thr) {
 		duk_hbuffer *h_buf;
 
 		h_buf = (duk_hbuffer *) h_bufobj;
-		DUK_ASSERT(DUK_HBUFFER_GET_SIZE(h_buf) <= DUK_UINT_MAX);  /* Buffer limits. */
+		DUK_ASSERT(DUK_HBUFFER_GET_SIZE(h_buf) <= DUK_UINT_MAX); /* Buffer limits. */
 		duk_push_uint(thr, (duk_uint_t) DUK_HBUFFER_GET_SIZE(h_buf));
 	} else {
 		/* If neutered must return 0; length is zeroed during
@@ -29480,7 +30707,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_bytelength_getter(duk_hthread *thr) {
 	}
 	return 1;
 }
-#else  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#else /* DUK_USE_BUFFEROBJECT_SUPPORT */
 /* No .buffer getter without ArrayBuffer support. */
 #if 0
 DUK_INTERNAL duk_ret_t duk_bi_typedarray_buffer_getter(duk_hthread *thr) {
@@ -29502,7 +30729,7 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_bytelength_getter(duk_hthread *thr) {
 	duk_push_uint(thr, DUK_HBUFFER_GET_SIZE(h_buf));
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /* automatic undefs */
 #undef DUK__BUFOBJ_FLAG_PROMOTE
@@ -29517,6 +30744,1929 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_bytelength_getter(duk_hthread *thr) {
 #undef DUK__FLD_TYPEDARRAY
 #undef DUK__FLD_VARINT
 /*
+ *  CBOR bindings.
+ *
+ *  http://cbor.io/
+ *  https://tools.ietf.org/html/rfc7049
+ */
+
+/* #include duk_internal.h -> already included */
+
+#if defined(DUK_USE_CBOR_SUPPORT)
+
+/* #define DUK_CBOR_STRESS */
+
+/* Default behavior for encoding strings: use CBOR text string if string
+ * is UTF-8 compatible, otherwise use CBOR byte string.  These defines
+ * can be used to force either type for all strings.  Using text strings
+ * for non-UTF-8 data is technically invalid CBOR.
+ */
+/* #define DUK_CBOR_TEXT_STRINGS */
+/* #define DUK_CBOR_BYTE_STRINGS */
+
+/* Misc. defines. */
+/* #define DUK_CBOR_PREFER_SIZE */
+/* #define DUK_CBOR_DOUBLE_AS_IS */
+/* #define DUK_CBOR_DECODE_FASTPATH */
+
+typedef struct {
+	duk_hthread *thr;
+	duk_uint8_t *ptr;
+	duk_uint8_t *buf;
+	duk_uint8_t *buf_end;
+	duk_size_t len;
+	duk_idx_t idx_buf;
+	duk_uint_t recursion_depth;
+	duk_uint_t recursion_limit;
+} duk_cbor_encode_context;
+
+typedef struct {
+	duk_hthread *thr;
+	const duk_uint8_t *buf;
+	duk_size_t off;
+	duk_size_t len;
+	duk_uint_t recursion_depth;
+	duk_uint_t recursion_limit;
+} duk_cbor_decode_context;
+
+DUK_LOCAL void duk__cbor_encode_value(duk_cbor_encode_context *enc_ctx);
+DUK_LOCAL void duk__cbor_decode_value(duk_cbor_decode_context *dec_ctx);
+
+/*
+ *  Misc
+ */
+
+DUK_LOCAL duk_uint32_t duk__cbor_double_to_uint32(double d) {
+	/* Out of range casts are undefined behavior, so caller must avoid. */
+	DUK_ASSERT(d >= 0.0 && d <= 4294967295.0);
+	return (duk_uint32_t) d;
+}
+
+/*
+ *  Encoding
+ */
+
+DUK_LOCAL void duk__cbor_encode_error(duk_cbor_encode_context *enc_ctx) {
+	(void) duk_type_error(enc_ctx->thr, "cbor encode error");
+}
+
+DUK_LOCAL void duk__cbor_encode_req_stack(duk_cbor_encode_context *enc_ctx) {
+	duk_require_stack(enc_ctx->thr, 4);
+}
+
+DUK_LOCAL void duk__cbor_encode_objarr_entry(duk_cbor_encode_context *enc_ctx) {
+	duk_hthread *thr = enc_ctx->thr;
+
+	/* Native stack check in object/array recursion. */
+	duk_native_stack_check(thr);
+
+	/* When working with deeply recursive structures, this is important
+	 * to ensure there's no effective depth limit.
+	 */
+	duk__cbor_encode_req_stack(enc_ctx);
+
+	DUK_ASSERT(enc_ctx->recursion_depth <= enc_ctx->recursion_limit);
+	if (enc_ctx->recursion_depth >= enc_ctx->recursion_limit) {
+		DUK_ERROR_RANGE(thr, DUK_STR_ENC_RECLIMIT);
+		DUK_WO_NORETURN(return;);
+	}
+	enc_ctx->recursion_depth++;
+}
+
+DUK_LOCAL void duk__cbor_encode_objarr_exit(duk_cbor_encode_context *enc_ctx) {
+	DUK_ASSERT(enc_ctx->recursion_depth > 0);
+	enc_ctx->recursion_depth--;
+}
+
+/* Check that a size_t is in uint32 range to avoid out-of-range casts. */
+DUK_LOCAL void duk__cbor_encode_sizet_uint32_check(duk_cbor_encode_context *enc_ctx, duk_size_t len) {
+	if (DUK_UNLIKELY(sizeof(duk_size_t) > sizeof(duk_uint32_t) && len > (duk_size_t) DUK_UINT32_MAX)) {
+		duk__cbor_encode_error(enc_ctx);
+	}
+}
+
+DUK_LOCAL DUK_NOINLINE void duk__cbor_encode_ensure_slowpath(duk_cbor_encode_context *enc_ctx, duk_size_t len) {
+	duk_size_t oldlen;
+	duk_size_t minlen;
+	duk_size_t newlen;
+	duk_uint8_t *p_new;
+	duk_size_t old_data_len;
+
+	DUK_ASSERT(enc_ctx->ptr >= enc_ctx->buf);
+	DUK_ASSERT(enc_ctx->buf_end >= enc_ctx->ptr);
+	DUK_ASSERT(enc_ctx->buf_end >= enc_ctx->buf);
+
+	/* Overflow check.
+	 *
+	 * Limit example: 0xffffffffUL / 2U = 0x7fffffffUL, we reject >= 0x80000000UL.
+	 */
+	oldlen = enc_ctx->len;
+	minlen = oldlen + len;
+	if (DUK_UNLIKELY(oldlen > DUK_SIZE_MAX / 2U || minlen < oldlen)) {
+		duk__cbor_encode_error(enc_ctx);
+	}
+
+#if defined(DUK_CBOR_STRESS)
+	newlen = oldlen + 1U;
+#else
+	newlen = oldlen * 2U;
+#endif
+	DUK_ASSERT(newlen >= oldlen);
+
+	if (minlen > newlen) {
+		newlen = minlen;
+	}
+	DUK_ASSERT(newlen >= oldlen);
+	DUK_ASSERT(newlen >= minlen);
+	DUK_ASSERT(newlen > 0U);
+
+	DUK_DD(DUK_DDPRINT("cbor encode buffer resized to %ld", (long) newlen));
+
+	p_new = (duk_uint8_t *) duk_resize_buffer(enc_ctx->thr, enc_ctx->idx_buf, newlen);
+	DUK_ASSERT(p_new != NULL);
+	old_data_len = (duk_size_t) (enc_ctx->ptr - enc_ctx->buf);
+	enc_ctx->buf = p_new;
+	enc_ctx->buf_end = p_new + newlen;
+	enc_ctx->ptr = p_new + old_data_len;
+	enc_ctx->len = newlen;
+}
+
+DUK_LOCAL DUK_INLINE void duk__cbor_encode_ensure(duk_cbor_encode_context *enc_ctx, duk_size_t len) {
+	if (DUK_LIKELY((duk_size_t) (enc_ctx->buf_end - enc_ctx->ptr) >= len)) {
+		return;
+	}
+	duk__cbor_encode_ensure_slowpath(enc_ctx, len);
+}
+
+DUK_LOCAL duk_size_t duk__cbor_get_reserve(duk_cbor_encode_context *enc_ctx) {
+	DUK_ASSERT(enc_ctx->ptr >= enc_ctx->buf);
+	DUK_ASSERT(enc_ctx->ptr <= enc_ctx->buf_end);
+	return (duk_size_t) (enc_ctx->buf_end - enc_ctx->ptr);
+}
+
+DUK_LOCAL void duk__cbor_encode_uint32(duk_cbor_encode_context *enc_ctx, duk_uint32_t u, duk_uint8_t base) {
+	duk_uint8_t *p;
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 4);
+
+	p = enc_ctx->ptr;
+	if (DUK_LIKELY(u <= 23U)) {
+		*p++ = (duk_uint8_t) (base + (duk_uint8_t) u);
+	} else if (u <= 0xffUL) {
+		*p++ = base + 0x18U;
+		*p++ = (duk_uint8_t) u;
+	} else if (u <= 0xffffUL) {
+		*p++ = base + 0x19U;
+		DUK_RAW_WRITEINC_U16_BE(p, (duk_uint16_t) u);
+	} else {
+		*p++ = base + 0x1aU;
+		DUK_RAW_WRITEINC_U32_BE(p, u);
+	}
+	enc_ctx->ptr = p;
+}
+
+#if defined(DUK_CBOR_DOUBLE_AS_IS)
+DUK_LOCAL void duk__cbor_encode_double(duk_cbor_encode_context *enc_ctx, double d) {
+	duk_uint8_t *p;
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 8);
+
+	p = enc_ctx->ptr;
+	*p++ = 0xfbU;
+	DUK_RAW_WRITEINC_DOUBLE_BE(p, d);
+	p += 8;
+	enc_ctx->ptr = p;
+}
+#else /* DUK_CBOR_DOUBLE_AS_IS */
+DUK_LOCAL void duk__cbor_encode_double_fp(duk_cbor_encode_context *enc_ctx, double d) {
+	duk_double_union u;
+	duk_uint16_t u16;
+	duk_int16_t expt;
+	duk_uint8_t *p;
+
+	DUK_ASSERT(DUK_FPCLASSIFY(d) != DUK_FP_ZERO);
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 8);
+
+	/* Organize into little endian (no-op if platform is little endian). */
+	u.d = d;
+	duk_dblunion_host_to_little(&u);
+
+	/* Check if 'd' can represented as a normal half-float.
+	 * Denormal half-floats could also be used, but that check
+	 * isn't done now (denormal half-floats are decoded of course).
+	 * So just check exponent range and that at most 10 significant
+	 * bits (excluding implicit leading 1) are used in 'd'.
+	 */
+	u16 = (((duk_uint16_t) u.uc[7]) << 8) | ((duk_uint16_t) u.uc[6]);
+	expt = (duk_int16_t) ((u16 & 0x7ff0U) >> 4) - 1023;
+
+	if (expt >= -14 && expt <= 15) {
+		/* Half-float normal exponents (excl. denormals).
+		 *
+		 *          7        6        5        4        3        2        1        0  (LE index)
+		 * double: seeeeeee eeeemmmm mmmmmmmm mmmmmmmm mmmmmmmm mmmmmmmm mmmmmmmm mmmmmmmm
+		 * half:         seeeee mmmm mmmmmm00 00000000 00000000 00000000 00000000 00000000
+		 */
+		duk_bool_t use_half_float;
+
+		use_half_float =
+		    (u.uc[0] == 0 && u.uc[1] == 0 && u.uc[2] == 0 && u.uc[3] == 0 && u.uc[4] == 0 && (u.uc[5] & 0x03U) == 0);
+
+		if (use_half_float) {
+			duk_uint32_t t;
+
+			expt += 15;
+			t = (duk_uint32_t) (u.uc[7] & 0x80U) << 8;
+			t += (duk_uint32_t) expt << 10;
+			t += ((duk_uint32_t) u.uc[6] & 0x0fU) << 6;
+			t += ((duk_uint32_t) u.uc[5]) >> 2;
+
+			/* seeeeemm mmmmmmmm */
+			p = enc_ctx->ptr;
+			*p++ = 0xf9U;
+			DUK_RAW_WRITEINC_U16_BE(p, (duk_uint16_t) t);
+			enc_ctx->ptr = p;
+			return;
+		}
+	}
+
+	/* Same check for plain float.  Also no denormal support here. */
+	if (expt >= -126 && expt <= 127) {
+		/* Float normal exponents (excl. denormals).
+		 *
+		 * double: seeeeeee eeeemmmm mmmmmmmm mmmmmmmm mmmmmmmm mmmmmmmm mmmmmmmm mmmmmmmm
+		 * float:     seeee eeeemmmm mmmmmmmm mmmmmmmm mmm00000 00000000 00000000 00000000
+		 */
+		duk_bool_t use_float;
+		duk_float_t d_float;
+
+		/* We could do this explicit mantissa check, but doing
+		 * a double-float-double cast is fine because we've
+		 * already verified that the exponent is in range so
+		 * that the narrower cast is not undefined behavior.
+		 */
+#if 0
+		use_float =
+		    (u.uc[0] == 0 && u.uc[1] == 0 && u.uc[2] == 0 && (u.uc[3] & 0xe0U) == 0);
+#endif
+		d_float = (duk_float_t) d;
+		use_float = duk_double_equals((duk_double_t) d_float, d);
+		if (use_float) {
+			p = enc_ctx->ptr;
+			*p++ = 0xfaU;
+			DUK_RAW_WRITEINC_FLOAT_BE(p, d_float);
+			enc_ctx->ptr = p;
+			return;
+		}
+	}
+
+	/* Special handling for NaN and Inf which we want to encode as
+	 * half-floats.  They share the same (maximum) exponent.
+	 */
+	if (expt == 1024) {
+		DUK_ASSERT(DUK_ISNAN(d) || DUK_ISINF(d));
+		p = enc_ctx->ptr;
+		*p++ = 0xf9U;
+		if (DUK_ISNAN(d)) {
+			/* Shortest NaN encoding is using a half-float.  Lose the
+			 * exact NaN bits in the process.  IEEE double would be
+			 * 7ff8 0000 0000 0000, i.e. a quiet NaN in most architectures
+			 * (https://en.wikipedia.org/wiki/NaN#Encoding).  The
+			 * equivalent half float is 7e00.
+			 */
+			*p++ = 0x7eU;
+		} else {
+			/* Shortest +/- Infinity encoding is using a half-float. */
+			if (DUK_SIGNBIT(d)) {
+				*p++ = 0xfcU;
+			} else {
+				*p++ = 0x7cU;
+			}
+		}
+		*p++ = 0x00U;
+		enc_ctx->ptr = p;
+		return;
+	}
+
+	/* Cannot use half-float or float, encode as full IEEE double. */
+	p = enc_ctx->ptr;
+	*p++ = 0xfbU;
+	DUK_RAW_WRITEINC_DOUBLE_BE(p, d);
+	enc_ctx->ptr = p;
+}
+
+DUK_LOCAL void duk__cbor_encode_double(duk_cbor_encode_context *enc_ctx, double d) {
+	duk_uint8_t *p;
+	double d_floor;
+
+	/* Integers and floating point values of all types are conceptually
+	 * equivalent in CBOR.  Try to always choose the shortest encoding
+	 * which is not always immediately obvious.  For example, NaN and Inf
+	 * can be most compactly represented as a half-float (assuming NaN
+	 * bits are not preserved), and 0x1'0000'0000 as a single precision
+	 * float.  Shortest forms in preference order (prefer integer over
+	 * float when equal length):
+	 *
+	 *   uint        1 byte    [0,23] (not -0)
+	 *   sint        1 byte    [-24,-1]
+	 *   uint+1      2 bytes   [24,255]
+	 *   sint+1      2 bytes   [-256,-25]
+	 *   uint+2      3 bytes   [256,65535]
+	 *   sint+2      3 bytes   [-65536,-257]
+	 *   half-float  3 bytes   -0, NaN, +/- Infinity, range [-65504,65504]
+	 *   uint+4      5 bytes   [65536,4294967295]
+	 *   sint+4      5 bytes   [-4294967296,-258]
+	 *   float       5 bytes   range [-(1 - 2^(-24)) * 2^128, (1 - 2^(-24)) * 2^128]
+	 *   uint+8      9 bytes   [4294967296,18446744073709551615]
+	 *   sint+8      9 bytes   [-18446744073709551616,-4294967297]
+	 *   double      9 bytes
+	 *
+	 * For whole numbers (compatible with integers):
+	 *   - 1-byte or 2-byte uint/sint representation is preferred for
+	 *     [-256,255].
+	 *   - 3-byte uint/sint is preferred for [-65536,65535].  Half floats
+	 *     are never preferred because they have the same length.
+	 *   - 5-byte uint/sint is preferred for [-4294967296,4294967295].
+	 *     Single precision floats are never preferred, and half-floats
+	 *     don't reach above the 3-byte uint/sint range so they're never
+	 *     preferred.
+	 *   - So, for all integers up to signed/unsigned 32-bit range the
+	 *     preferred encoding is always an integer uint/sint.
+	 *   - For integers above 32 bits the situation is more complicated.
+	 *     Half-floats are never useful for them because of their limited
+	 *     range, but IEEE single precision floats (5 bytes encoded) can
+	 *     represent some integers between the 32-bit and 64-bit ranges
+	 *     which require 9 bytes as a uint/sint.
+	 *
+	 * For floating point values not compatible with integers, the
+	 * preferred encoding is quite clear:
+	 *   - For +Inf/-Inf use half-float.
+	 *   - For NaN use a half-float, assuming NaN bits ("payload") is
+	 *     not worth preserving.  Duktape doesn't in general guarantee
+	 *     preservation of the NaN payload so using a half-float seems
+	 *     consistent with that.
+	 *   - For remaining values, prefer the shortest form which doesn't
+	 *     lose any precision.  For normal half-floats and single precision
+	 *     floats this is simple: just check exponent and mantissa bits
+	 *     using a fixed mask.  For denormal half-floats and single
+	 *     precision floats the check is a bit more complicated: a normal
+	 *     IEEE double can sometimes be represented as a denormal
+	 *     half-float or single precision float.
+	 *
+	 * https://en.wikipedia.org/wiki/Half-precision_floating-point_format#IEEE_754_half-precision_binary_floating-point_format:_binary16
+	 */
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 8);
+
+	/* Most important path is integers.  The floor() test will be true
+	 * for Inf too (but not NaN).
+	 */
+	d_floor = DUK_FLOOR(d); /* identity if d is +/- 0.0, NaN, or +/- Infinity */
+	if (DUK_LIKELY(duk_double_equals(d_floor, d) != 0)) {
+		DUK_ASSERT(!DUK_ISNAN(d)); /* NaN == NaN compares false. */
+		if (DUK_SIGNBIT(d)) {
+			if (d >= -4294967296.0) {
+				d = -1.0 - d;
+				if (d >= 0.0) {
+					DUK_ASSERT(d >= 0.0);
+					duk__cbor_encode_uint32(enc_ctx, duk__cbor_double_to_uint32(d), 0x20U);
+					return;
+				}
+
+				/* Input was negative zero, d == -1.0 < 0.0.
+				 * Shortest -0 is using half-float.
+				 */
+				p = enc_ctx->ptr;
+				*p++ = 0xf9U;
+				*p++ = 0x80U;
+				*p++ = 0x00U;
+				enc_ctx->ptr = p;
+				return;
+			}
+		} else {
+			if (d <= 4294967295.0) {
+				/* Positive zero needs no special handling. */
+				DUK_ASSERT(d >= 0.0);
+				duk__cbor_encode_uint32(enc_ctx, duk__cbor_double_to_uint32(d), 0x00U);
+				return;
+			}
+		}
+	}
+
+	/* 64-bit integers are not supported at present.  So
+	 * we also don't need to deal with choosing between a
+	 * 64-bit uint/sint representation vs. IEEE double or
+	 * float.
+	 */
+
+	DUK_ASSERT(DUK_FPCLASSIFY(d) != DUK_FP_ZERO);
+	duk__cbor_encode_double_fp(enc_ctx, d);
+}
+#endif /* DUK_CBOR_DOUBLE_AS_IS */
+
+DUK_LOCAL void duk__cbor_encode_string_top(duk_cbor_encode_context *enc_ctx) {
+	const duk_uint8_t *str;
+	duk_size_t len;
+	duk_uint8_t *p;
+
+	/* CBOR differentiates between UTF-8 text strings and byte strings.
+	 * Text strings MUST be valid UTF-8, so not all Duktape strings can
+	 * be encoded as valid CBOR text strings.  Possible behaviors:
+	 *
+	 *   1. Use text string when input is valid UTF-8, otherwise use
+	 *      byte string (maybe tagged to indicate it was an extended
+	 *      UTF-8 string).
+	 *   2. Always use text strings, but sanitize input string so that
+	 *      invalid UTF-8 is replaced with U+FFFD for example.  Combine
+	 *      surrogates whenever possible.
+	 *   3. Always use byte strings.  This is simple and produces valid
+	 *      CBOR, but isn't ideal for interoperability.
+	 *   4. Always use text strings, even for invalid UTF-8 such as
+	 *      codepoints in the surrogate pair range.  This is simple but
+	 *      produces technically invalid CBOR for non-UTF-8 strings which
+	 *      may affect interoperability.
+	 *
+	 * Current default is 1; can be changed with defines.
+	 */
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 8);
+
+	str = (const duk_uint8_t *) duk_require_lstring(enc_ctx->thr, -1, &len);
+	if (duk_is_symbol(enc_ctx->thr, -1)) {
+		/* Symbols, encode as an empty table for now.  This matches
+		 * the behavior of cbor-js.
+		 *
+		 * XXX: Maybe encode String() coercion with a tag?
+		 * XXX: Option to keep enough information to recover
+		 * Symbols when decoding (this is not always desirable).
+		 */
+		p = enc_ctx->ptr;
+		*p++ = 0xa0U;
+		enc_ctx->ptr = p;
+		return;
+	}
+
+	duk__cbor_encode_sizet_uint32_check(enc_ctx, len);
+#if defined(DUK_CBOR_TEXT_STRINGS)
+	duk__cbor_encode_uint32(enc_ctx, (duk_uint32_t) len, 0x60U);
+#elif defined(DUK_CBOR_BYTE_STRINGS)
+	duk__cbor_encode_uint32(enc_ctx, (duk_uint32_t) len, 0x40U);
+#else
+	duk__cbor_encode_uint32(enc_ctx,
+	                        (duk_uint32_t) len,
+	                        (DUK_LIKELY(duk_unicode_is_utf8_compatible(str, len) != 0) ? 0x60U : 0x40U));
+#endif
+	duk__cbor_encode_ensure(enc_ctx, len);
+	p = enc_ctx->ptr;
+	duk_memcpy((void *) p, (const void *) str, len);
+	p += len;
+	enc_ctx->ptr = p;
+}
+
+DUK_LOCAL void duk__cbor_encode_object(duk_cbor_encode_context *enc_ctx) {
+	duk_uint8_t *buf;
+	duk_size_t len;
+	duk_uint8_t *p;
+	duk_size_t i;
+	duk_size_t off_ib;
+	duk_uint32_t count;
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 8);
+
+	duk__cbor_encode_objarr_entry(enc_ctx);
+
+	/* XXX: Support for specific built-ins like Date and RegExp. */
+	if (duk_is_array(enc_ctx->thr, -1)) {
+		/* Shortest encoding for arrays >= 256 in length is actually
+		 * the indefinite length one (3 or more bytes vs. 2 bytes).
+		 * We still use the definite length version because it is
+		 * more decoding friendly.
+		 */
+		len = duk_get_length(enc_ctx->thr, -1);
+		duk__cbor_encode_sizet_uint32_check(enc_ctx, len);
+		duk__cbor_encode_uint32(enc_ctx, (duk_uint32_t) len, 0x80U);
+		for (i = 0; i < len; i++) {
+			duk_get_prop_index(enc_ctx->thr, -1, (duk_uarridx_t) i);
+			duk__cbor_encode_value(enc_ctx);
+		}
+	} else if (duk_is_buffer_data(enc_ctx->thr, -1)) {
+		/* XXX: Tag buffer data?
+		 * XXX: Encode typed arrays as integer arrays rather
+		 * than buffer data as is?
+		 */
+		buf = (duk_uint8_t *) duk_require_buffer_data(enc_ctx->thr, -1, &len);
+		duk__cbor_encode_sizet_uint32_check(enc_ctx, len);
+		duk__cbor_encode_uint32(enc_ctx, (duk_uint32_t) len, 0x40U);
+		duk__cbor_encode_ensure(enc_ctx, len);
+		p = enc_ctx->ptr;
+		duk_memcpy_unsafe((void *) p, (const void *) buf, len);
+		p += len;
+		enc_ctx->ptr = p;
+	} else {
+		/* We don't know the number of properties in advance
+		 * but would still like to encode at least small
+		 * objects without indefinite length.  Emit an
+		 * indefinite length byte initially, and if the final
+		 * property count is small enough to also fit in one
+		 * byte, backpatch it later.  Otherwise keep the
+		 * indefinite length.  This works well up to 23
+		 * properties which is practical and good enough.
+		 */
+		off_ib = (duk_size_t) (enc_ctx->ptr - enc_ctx->buf); /* XXX: get_offset? */
+		count = 0U;
+		p = enc_ctx->ptr;
+		*p++ = 0xa0U + 0x1fU; /* indefinite length */
+		enc_ctx->ptr = p;
+		duk_enum(enc_ctx->thr, -1, DUK_ENUM_OWN_PROPERTIES_ONLY);
+		while (duk_next(enc_ctx->thr, -1, 1 /*get_value*/)) {
+			duk_insert(enc_ctx->thr, -2); /* [ ... key value ] -> [ ... value key ] */
+			duk__cbor_encode_value(enc_ctx);
+			duk__cbor_encode_value(enc_ctx);
+			count++;
+			if (count == 0U) {
+				duk__cbor_encode_error(enc_ctx);
+			}
+		}
+		duk_pop(enc_ctx->thr);
+		if (count <= 0x17U) {
+			DUK_ASSERT(off_ib < enc_ctx->len);
+			enc_ctx->buf[off_ib] = 0xa0U + (duk_uint8_t) count;
+		} else {
+			duk__cbor_encode_ensure(enc_ctx, 1);
+			p = enc_ctx->ptr;
+			*p++ = 0xffU; /* break */
+			enc_ctx->ptr = p;
+		}
+	}
+
+	duk__cbor_encode_objarr_exit(enc_ctx);
+}
+
+DUK_LOCAL void duk__cbor_encode_buffer(duk_cbor_encode_context *enc_ctx) {
+	duk_uint8_t *buf;
+	duk_size_t len;
+	duk_uint8_t *p;
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 8);
+
+	/* Tag buffer data? */
+	buf = (duk_uint8_t *) duk_require_buffer(enc_ctx->thr, -1, &len);
+	duk__cbor_encode_sizet_uint32_check(enc_ctx, len);
+	duk__cbor_encode_uint32(enc_ctx, (duk_uint32_t) len, 0x40U);
+	duk__cbor_encode_ensure(enc_ctx, len);
+	p = enc_ctx->ptr;
+	duk_memcpy_unsafe((void *) p, (const void *) buf, len);
+	p += len;
+	enc_ctx->ptr = p;
+}
+
+DUK_LOCAL void duk__cbor_encode_pointer(duk_cbor_encode_context *enc_ctx) {
+	/* Pointers (void *) are challenging to encode.  They can't
+	 * be relied to be even 64-bit integer compatible (there are
+	 * pointer models larger than that), nor can floats encode
+	 * them.  They could be encoded as strings (%p format) but
+	 * that's not portable.  They could be encoded as direct memory
+	 * representations.  Recovering pointers is non-portable in any
+	 * case but it would be nice to be able to detect and recover
+	 * compatible pointers.
+	 *
+	 * For now, encode as "(%p)" string, matching JX.  There doesn't
+	 * seem to be an appropriate tag, so pointers don't currently
+	 * survive a CBOR encode/decode roundtrip intact.
+	 */
+	const char *ptr;
+
+	ptr = duk_to_string(enc_ctx->thr, -1);
+	DUK_ASSERT(ptr != NULL);
+	duk_push_sprintf(enc_ctx->thr, "(%s)", ptr);
+	duk_remove(enc_ctx->thr, -2);
+	duk__cbor_encode_string_top(enc_ctx);
+}
+
+DUK_LOCAL void duk__cbor_encode_lightfunc(duk_cbor_encode_context *enc_ctx) {
+	duk_uint8_t *p;
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 8);
+
+	/* For now encode as an empty object. */
+	p = enc_ctx->ptr;
+	*p++ = 0xa0U;
+	enc_ctx->ptr = p;
+}
+
+DUK_LOCAL void duk__cbor_encode_value(duk_cbor_encode_context *enc_ctx) {
+	duk_uint8_t *p;
+
+	/* Encode/decode cycle currently loses some type information.
+	 * This can be improved by registering custom tags with IANA.
+	 */
+
+	/* Reserve space for up to 64-bit types (1 initial byte + 8
+	 * followup bytes).  This allows encoding of integers, floats,
+	 * string/buffer length fields, etc without separate checks
+	 * in each code path.
+	 */
+	duk__cbor_encode_ensure(enc_ctx, 1 + 8);
+
+	switch (duk_get_type(enc_ctx->thr, -1)) {
+	case DUK_TYPE_UNDEFINED: {
+		p = enc_ctx->ptr;
+		*p++ = 0xf7;
+		enc_ctx->ptr = p;
+		break;
+	}
+	case DUK_TYPE_NULL: {
+		p = enc_ctx->ptr;
+		*p++ = 0xf6;
+		enc_ctx->ptr = p;
+		break;
+	}
+	case DUK_TYPE_BOOLEAN: {
+		duk_uint8_t u8 = duk_get_boolean(enc_ctx->thr, -1) ? 0xf5U : 0xf4U;
+		p = enc_ctx->ptr;
+		*p++ = u8;
+		enc_ctx->ptr = p;
+		break;
+	}
+	case DUK_TYPE_NUMBER: {
+		duk__cbor_encode_double(enc_ctx, duk_get_number(enc_ctx->thr, -1));
+		break;
+	}
+	case DUK_TYPE_STRING: {
+		duk__cbor_encode_string_top(enc_ctx);
+		break;
+	}
+	case DUK_TYPE_OBJECT: {
+		duk__cbor_encode_object(enc_ctx);
+		break;
+	}
+	case DUK_TYPE_BUFFER: {
+		duk__cbor_encode_buffer(enc_ctx);
+		break;
+	}
+	case DUK_TYPE_POINTER: {
+		duk__cbor_encode_pointer(enc_ctx);
+		break;
+	}
+	case DUK_TYPE_LIGHTFUNC: {
+		duk__cbor_encode_lightfunc(enc_ctx);
+		break;
+	}
+	case DUK_TYPE_NONE:
+	default:
+		goto fail;
+	}
+
+	duk_pop(enc_ctx->thr);
+	return;
+
+fail:
+	duk__cbor_encode_error(enc_ctx);
+}
+
+/*
+ *  Decoding
+ */
+
+DUK_LOCAL void duk__cbor_decode_error(duk_cbor_decode_context *dec_ctx) {
+	(void) duk_type_error(dec_ctx->thr, "cbor decode error");
+}
+
+DUK_LOCAL void duk__cbor_decode_req_stack(duk_cbor_decode_context *dec_ctx) {
+	duk_require_stack(dec_ctx->thr, 4);
+}
+
+DUK_LOCAL void duk__cbor_decode_objarr_entry(duk_cbor_decode_context *dec_ctx) {
+	duk_hthread *thr = dec_ctx->thr;
+
+	/* Native stack check in object/array recursion. */
+	duk_native_stack_check(thr);
+
+	duk__cbor_decode_req_stack(dec_ctx);
+
+	DUK_ASSERT(dec_ctx->recursion_depth <= dec_ctx->recursion_limit);
+	if (dec_ctx->recursion_depth >= dec_ctx->recursion_limit) {
+		DUK_ERROR_RANGE(thr, DUK_STR_DEC_RECLIMIT);
+		DUK_WO_NORETURN(return;);
+	}
+	dec_ctx->recursion_depth++;
+}
+
+DUK_LOCAL void duk__cbor_decode_objarr_exit(duk_cbor_decode_context *dec_ctx) {
+	DUK_ASSERT(dec_ctx->recursion_depth > 0);
+	dec_ctx->recursion_depth--;
+}
+
+DUK_LOCAL duk_uint8_t duk__cbor_decode_readbyte(duk_cbor_decode_context *dec_ctx) {
+	DUK_ASSERT(dec_ctx->off <= dec_ctx->len);
+	if (DUK_UNLIKELY(dec_ctx->len - dec_ctx->off < 1U)) {
+		duk__cbor_decode_error(dec_ctx);
+	}
+	return dec_ctx->buf[dec_ctx->off++];
+}
+
+DUK_LOCAL duk_uint16_t duk__cbor_decode_read_u16(duk_cbor_decode_context *dec_ctx) {
+	duk_uint16_t res;
+
+	DUK_ASSERT(dec_ctx->off <= dec_ctx->len);
+	if (DUK_UNLIKELY(dec_ctx->len - dec_ctx->off < 2U)) {
+		duk__cbor_decode_error(dec_ctx);
+	}
+	res = DUK_RAW_READ_U16_BE(dec_ctx->buf + dec_ctx->off);
+	dec_ctx->off += 2;
+	return res;
+}
+
+DUK_LOCAL duk_uint32_t duk__cbor_decode_read_u32(duk_cbor_decode_context *dec_ctx) {
+	duk_uint32_t res;
+
+	DUK_ASSERT(dec_ctx->off <= dec_ctx->len);
+	if (DUK_UNLIKELY(dec_ctx->len - dec_ctx->off < 4U)) {
+		duk__cbor_decode_error(dec_ctx);
+	}
+	res = DUK_RAW_READ_U32_BE(dec_ctx->buf + dec_ctx->off);
+	dec_ctx->off += 4;
+	return res;
+}
+
+DUK_LOCAL duk_uint8_t duk__cbor_decode_peekbyte(duk_cbor_decode_context *dec_ctx) {
+	if (DUK_UNLIKELY(dec_ctx->off >= dec_ctx->len)) {
+		duk__cbor_decode_error(dec_ctx);
+	}
+	return dec_ctx->buf[dec_ctx->off];
+}
+
+DUK_LOCAL void duk__cbor_decode_rewind(duk_cbor_decode_context *dec_ctx, duk_size_t len) {
+	DUK_ASSERT(len <= dec_ctx->off); /* Caller must ensure. */
+	dec_ctx->off -= len;
+}
+
+#if 0
+DUK_LOCAL void duk__cbor_decode_ensure(duk_cbor_decode_context *dec_ctx, duk_size_t len) {
+	if (dec_ctx->off + len > dec_ctx->len) {
+		duk__cbor_decode_error(dec_ctx);
+	}
+}
+#endif
+
+DUK_LOCAL const duk_uint8_t *duk__cbor_decode_consume(duk_cbor_decode_context *dec_ctx, duk_size_t len) {
+	DUK_ASSERT(dec_ctx->off <= dec_ctx->len);
+	if (DUK_LIKELY(dec_ctx->len - dec_ctx->off >= len)) {
+		const duk_uint8_t *res = dec_ctx->buf + dec_ctx->off;
+		dec_ctx->off += len;
+		return res;
+	}
+
+	duk__cbor_decode_error(dec_ctx); /* Not enough input. */
+	return NULL;
+}
+
+DUK_LOCAL int duk__cbor_decode_checkbreak(duk_cbor_decode_context *dec_ctx) {
+	if (duk__cbor_decode_peekbyte(dec_ctx) == 0xffU) {
+		DUK_ASSERT(dec_ctx->off < dec_ctx->len);
+		dec_ctx->off++;
+#if 0
+		(void) duk__cbor_decode_readbyte(dec_ctx);
+#endif
+		return 1;
+	}
+	return 0;
+}
+
+DUK_LOCAL void duk__cbor_decode_push_aival_int(duk_cbor_decode_context *dec_ctx, duk_uint8_t ib, duk_bool_t negative) {
+	duk_uint8_t ai;
+	duk_uint32_t t, t1, t2;
+#if 0
+	duk_uint64_t t3;
+#endif
+	duk_double_t d1, d2;
+	duk_double_t d;
+
+	ai = ib & 0x1fU;
+	if (ai <= 0x17U) {
+		t = ai;
+		goto shared_exit;
+	}
+
+	switch (ai) {
+	case 0x18U: /* 1 byte */
+		t = (duk_uint32_t) duk__cbor_decode_readbyte(dec_ctx);
+		goto shared_exit;
+	case 0x19U: /* 2 byte */
+		t = (duk_uint32_t) duk__cbor_decode_read_u16(dec_ctx);
+		goto shared_exit;
+	case 0x1aU: /* 4 byte */
+		t = (duk_uint32_t) duk__cbor_decode_read_u32(dec_ctx);
+		goto shared_exit;
+	case 0x1bU: /* 8 byte */
+		/* For uint64 it's important to handle the -1.0 part before
+		 * casting to double: otherwise the adjustment might be lost
+		 * in the cast.  Uses: -1.0 - d <=> -(d + 1.0).
+		 */
+		t = (duk_uint32_t) duk__cbor_decode_read_u32(dec_ctx);
+		t2 = t;
+		t = (duk_uint32_t) duk__cbor_decode_read_u32(dec_ctx);
+		t1 = t;
+#if 0
+		t3 = (duk_uint64_t) t2 * DUK_U64_CONSTANT(0x100000000) + (duk_uint64_t) t1;
+		if (negative) {
+			if (t3 == DUK_UINT64_MAX) {
+				/* -(0xffff'ffff'ffff'ffffULL + 1) =
+				 * -0x1'0000'0000'0000'0000
+				 *
+				 * >>> -0x10000000000000000
+				 * -18446744073709551616L
+				 */
+				return -18446744073709551616.0;
+			} else {
+				return -((duk_double_t) (t3 + DUK_U64_CONSTANT(1)));
+			}
+		} else {
+			return (duk_double_t) t3;  /* XXX: cast helper */
+		}
+#endif
+#if 0
+		t3 = (duk_uint64_t) t2 * DUK_U64_CONSTANT(0x100000000) + (duk_uint64_t) t1;
+		if (negative) {
+			/* Simpler version: take advantage of the fact that
+			 * 0xffff'ffff'ffff'ffff and 0x1'0000'0000'0000'0000
+			 * both round to 0x1'0000'0000'0000'0000:
+			 * > (0xffffffffffffffff).toString(16)
+			 * '10000000000000000'
+			 * > (0x10000000000000000).toString(16)
+			 * '10000000000000000'
+			 *
+			 * For the DUK_UINT64_MAX case we just skip the +1
+			 * increment to avoid wrapping; the result still
+			 * comes out right for an IEEE double cast.
+			 */
+			if (t3 != DUK_UINT64_MAX) {
+				t3++;
+			}
+			return -((duk_double_t) t3);
+		} else {
+			return (duk_double_t) t3;  /* XXX: cast helper */
+		}
+#endif
+#if 1
+		/* Use two double parts, avoids dependency on 64-bit type.
+		 * Avoid precision loss carefully, especially when dealing
+		 * with the required +1 for negative values.
+		 *
+		 * No fastint check for this path at present.
+		 */
+		d1 = (duk_double_t) t1; /* XXX: cast helpers */
+		d2 = (duk_double_t) t2 * 4294967296.0;
+		if (negative) {
+			d1 += 1.0;
+		}
+		d = d2 + d1;
+		if (negative) {
+			d = -d;
+		}
+#endif
+		/* XXX: a push and check for fastint API would be nice */
+		duk_push_number(dec_ctx->thr, d);
+		return;
+	}
+
+	duk__cbor_decode_error(dec_ctx);
+	return;
+
+shared_exit:
+	if (negative) {
+		/* XXX: a push and check for fastint API would be nice */
+		if ((duk_uint_t) t <= (duk_uint_t) - (DUK_INT_MIN + 1)) {
+			duk_push_int(dec_ctx->thr, -1 - ((duk_int_t) t));
+		} else {
+			duk_push_number(dec_ctx->thr, -1.0 - (duk_double_t) t);
+		}
+	} else {
+		duk_push_uint(dec_ctx->thr, (duk_uint_t) t);
+	}
+}
+
+DUK_LOCAL void duk__cbor_decode_skip_aival_int(duk_cbor_decode_context *dec_ctx, duk_uint8_t ib) {
+	const duk_int8_t skips[32] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,
+		                       0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 4, 8, -1, -1, -1, -1 };
+	duk_uint8_t ai;
+	duk_int8_t skip;
+
+	ai = ib & 0x1fU;
+	skip = skips[ai];
+	if (DUK_UNLIKELY(skip < 0)) {
+		duk__cbor_decode_error(dec_ctx);
+	}
+	duk__cbor_decode_consume(dec_ctx, (duk_size_t) skip);
+	return;
+}
+
+DUK_LOCAL duk_uint32_t duk__cbor_decode_aival_uint32(duk_cbor_decode_context *dec_ctx, duk_uint8_t ib) {
+	duk_uint8_t ai;
+	duk_uint32_t t;
+
+	ai = ib & 0x1fU;
+	if (ai <= 0x17U) {
+		return (duk_uint32_t) ai;
+	}
+
+	switch (ai) {
+	case 0x18U: /* 1 byte */
+		t = (duk_uint32_t) duk__cbor_decode_readbyte(dec_ctx);
+		return t;
+	case 0x19U: /* 2 byte */
+		t = (duk_uint32_t) duk__cbor_decode_read_u16(dec_ctx);
+		return t;
+	case 0x1aU: /* 4 byte */
+		t = (duk_uint32_t) duk__cbor_decode_read_u32(dec_ctx);
+		return t;
+	case 0x1bU: /* 8 byte */
+		t = (duk_uint32_t) duk__cbor_decode_read_u32(dec_ctx);
+		if (t != 0U) {
+			break;
+		}
+		t = (duk_uint32_t) duk__cbor_decode_read_u32(dec_ctx);
+		return t;
+	}
+
+	duk__cbor_decode_error(dec_ctx);
+	return 0U;
+}
+
+DUK_LOCAL void duk__cbor_decode_buffer(duk_cbor_decode_context *dec_ctx, duk_uint8_t expected_base) {
+	duk_uint32_t len;
+	duk_uint8_t *buf;
+	const duk_uint8_t *inp;
+	duk_uint8_t ib;
+
+	ib = duk__cbor_decode_readbyte(dec_ctx);
+	if ((ib & 0xe0U) != expected_base) {
+		duk__cbor_decode_error(dec_ctx);
+	}
+	/* Indefinite format is rejected by the following on purpose. */
+	len = duk__cbor_decode_aival_uint32(dec_ctx, ib);
+	inp = duk__cbor_decode_consume(dec_ctx, len);
+	/* XXX: duk_push_fixed_buffer_with_data() would be a nice API addition. */
+	buf = (duk_uint8_t *) duk_push_fixed_buffer(dec_ctx->thr, (duk_size_t) len);
+	duk_memcpy((void *) buf, (const void *) inp, (size_t) len);
+}
+
+DUK_LOCAL void duk__cbor_decode_join_buffers(duk_cbor_decode_context *dec_ctx, duk_idx_t count) {
+	duk_size_t total_size = 0;
+	duk_idx_t top = duk_get_top(dec_ctx->thr);
+	duk_idx_t base = top - count; /* count is >= 1 */
+	duk_idx_t idx;
+	duk_uint8_t *p = NULL;
+
+	DUK_ASSERT(count >= 1);
+	DUK_ASSERT(top >= count);
+
+	for (;;) {
+		/* First round: compute total size.
+		 * Second round: copy into place.
+		 */
+		for (idx = base; idx < top; idx++) {
+			duk_uint8_t *buf_data;
+			duk_size_t buf_size;
+
+			buf_data = (duk_uint8_t *) duk_require_buffer(dec_ctx->thr, idx, &buf_size);
+			if (p != NULL) {
+				duk_memcpy_unsafe((void *) p, (const void *) buf_data, buf_size);
+				p += buf_size;
+			} else {
+				total_size += buf_size;
+				if (DUK_UNLIKELY(total_size < buf_size)) { /* Wrap check. */
+					duk__cbor_decode_error(dec_ctx);
+				}
+			}
+		}
+
+		if (p != NULL) {
+			break;
+		} else {
+			p = (duk_uint8_t *) duk_push_fixed_buffer(dec_ctx->thr, total_size);
+			DUK_ASSERT(p != NULL);
+		}
+	}
+
+	duk_replace(dec_ctx->thr, base);
+	duk_pop_n(dec_ctx->thr, count - 1);
+}
+
+DUK_LOCAL void duk__cbor_decode_and_join_strbuf(duk_cbor_decode_context *dec_ctx, duk_uint8_t expected_base) {
+	duk_idx_t count = 0;
+	for (;;) {
+		if (duk__cbor_decode_checkbreak(dec_ctx)) {
+			break;
+		}
+		duk_require_stack(dec_ctx->thr, 1);
+		duk__cbor_decode_buffer(dec_ctx, expected_base);
+		count++;
+		if (DUK_UNLIKELY(count <= 0)) { /* Wrap check. */
+			duk__cbor_decode_error(dec_ctx);
+		}
+	}
+	if (count == 0) {
+		(void) duk_push_fixed_buffer(dec_ctx->thr, 0);
+	} else if (count > 1) {
+		duk__cbor_decode_join_buffers(dec_ctx, count);
+	}
+}
+
+DUK_LOCAL duk_double_t duk__cbor_decode_half_float(duk_cbor_decode_context *dec_ctx) {
+	duk_double_union u;
+	const duk_uint8_t *inp;
+	duk_int_t expt;
+	duk_uint_t u16;
+	duk_uint_t tmp;
+	duk_double_t res;
+
+	inp = duk__cbor_decode_consume(dec_ctx, 2);
+	u16 = ((duk_uint_t) inp[0] << 8) + (duk_uint_t) inp[1];
+	expt = (duk_int_t) ((u16 >> 10) & 0x1fU) - 15;
+
+	/* Reconstruct IEEE double into little endian order first, then convert
+	 * to host order.
+	 */
+
+	duk_memzero((void *) &u, sizeof(u));
+
+	if (expt == -15) {
+		/* Zero or denormal; but note that half float
+		 * denormals become double normals.
+		 */
+		if ((u16 & 0x03ffU) == 0) {
+			u.uc[7] = inp[0] & 0x80U;
+		} else {
+			/* Create denormal by first creating a double that
+			 * contains the denormal bits and a leading implicit
+			 * 1-bit.  Then subtract away the implicit 1-bit.
+			 *
+			 *    0.mmmmmmmmmm * 2^-14
+			 *    1.mmmmmmmmmm 0.... * 2^-14
+			 *   -1.0000000000 0.... * 2^-14
+			 *
+			 * Double exponent: -14 + 1023 = 0x3f1
+			 */
+			u.uc[7] = 0x3fU;
+			u.uc[6] = 0x10U + (duk_uint8_t) ((u16 >> 6) & 0x0fU);
+			u.uc[5] = (duk_uint8_t) ((u16 << 2) & 0xffU); /* Mask is really 0xfcU */
+
+			duk_dblunion_little_to_host(&u);
+			res = u.d - 0.00006103515625; /* 2^(-14) */
+			if (u16 & 0x8000U) {
+				res = -res;
+			}
+			return res;
+		}
+	} else if (expt == 16) {
+		/* +/- Inf or NaN. */
+		if ((u16 & 0x03ffU) == 0) {
+			u.uc[7] = (inp[0] & 0x80U) + 0x7fU;
+			u.uc[6] = 0xf0U;
+		} else {
+			/* Create a 'quiet NaN' with highest
+			 * bit set (there are some platforms
+			 * where the NaN payload convention is
+			 * the opposite).  Keep sign.
+			 */
+			u.uc[7] = (inp[0] & 0x80U) + 0x7fU;
+			u.uc[6] = 0xf8U;
+		}
+	} else {
+		/* Normal. */
+		tmp = (inp[0] & 0x80U) ? 0x80000000UL : 0UL;
+		tmp += (duk_uint_t) (expt + 1023) << 20;
+		tmp += (duk_uint_t) (inp[0] & 0x03U) << 18;
+		tmp += (duk_uint_t) (inp[1] & 0xffU) << 10;
+		u.uc[7] = (tmp >> 24) & 0xffU;
+		u.uc[6] = (tmp >> 16) & 0xffU;
+		u.uc[5] = (tmp >> 8) & 0xffU;
+		u.uc[4] = (tmp >> 0) & 0xffU;
+	}
+
+	duk_dblunion_little_to_host(&u);
+	return u.d;
+}
+
+DUK_LOCAL void duk__cbor_decode_string(duk_cbor_decode_context *dec_ctx, duk_uint8_t ib, duk_uint8_t ai) {
+	/* If the CBOR string data is not valid UTF-8 it is technically
+	 * invalid CBOR.  Possible behaviors at least:
+	 *
+	 *   1. Reject the input, i.e. throw TypeError.
+	 *
+	 *   2. Accept the input, but sanitize non-UTF-8 data into UTF-8
+	 *      using U+FFFD replacements.  Also it might make sense to
+	 *      decode non-BMP codepoints into surrogates for better
+	 *      ECMAScript compatibility.
+	 *
+	 *   3. Accept the input as a Duktape string (which are not always
+	 *      valid UTF-8), but reject any input that would create a
+	 *      Symbol representation.
+	 *
+	 * Current behavior is 3.
+	 */
+
+	if (ai == 0x1fU) {
+		duk_uint8_t *buf_data;
+		duk_size_t buf_size;
+
+		duk__cbor_decode_and_join_strbuf(dec_ctx, 0x60U);
+		buf_data = (duk_uint8_t *) duk_require_buffer(dec_ctx->thr, -1, &buf_size);
+		(void) duk_push_lstring(dec_ctx->thr, (const char *) buf_data, buf_size);
+		duk_remove(dec_ctx->thr, -2);
+	} else {
+		duk_uint32_t len;
+		const duk_uint8_t *inp;
+
+		len = duk__cbor_decode_aival_uint32(dec_ctx, ib);
+		inp = duk__cbor_decode_consume(dec_ctx, len);
+		(void) duk_push_lstring(dec_ctx->thr, (const char *) inp, (duk_size_t) len);
+	}
+	if (duk_is_symbol(dec_ctx->thr, -1)) {
+		/* Refuse to create Symbols when decoding. */
+		duk__cbor_decode_error(dec_ctx);
+	}
+
+	/* XXX: Here a Duktape API call to convert input -> utf-8 with
+	 * replacements would be nice.
+	 */
+}
+
+DUK_LOCAL duk_bool_t duk__cbor_decode_array(duk_cbor_decode_context *dec_ctx, duk_uint8_t ib, duk_uint8_t ai) {
+	duk_uint32_t idx, len;
+
+	duk__cbor_decode_objarr_entry(dec_ctx);
+
+	/* Support arrays up to 0xfffffffeU in length.  0xffffffff is
+	 * used as an indefinite length marker.
+	 */
+	if (ai == 0x1fU) {
+		len = 0xffffffffUL;
+	} else {
+		len = duk__cbor_decode_aival_uint32(dec_ctx, ib);
+		if (len == 0xffffffffUL) {
+			goto failure;
+		}
+	}
+
+	/* XXX: use bare array? */
+	duk_push_array(dec_ctx->thr);
+	for (idx = 0U;;) {
+		if (len == 0xffffffffUL && duk__cbor_decode_checkbreak(dec_ctx)) {
+			break;
+		}
+		if (idx == len) {
+			if (ai == 0x1fU) {
+				goto failure;
+			}
+			break;
+		}
+		duk__cbor_decode_value(dec_ctx);
+		duk_put_prop_index(dec_ctx->thr, -2, (duk_uarridx_t) idx);
+		idx++;
+		if (idx == 0U) {
+			goto failure; /* wrapped */
+		}
+	}
+
+#if 0
+ success:
+#endif
+	duk__cbor_decode_objarr_exit(dec_ctx);
+	return 1;
+
+failure:
+	/* No need to unwind recursion checks, caller will throw. */
+	return 0;
+}
+
+DUK_LOCAL duk_bool_t duk__cbor_decode_map(duk_cbor_decode_context *dec_ctx, duk_uint8_t ib, duk_uint8_t ai) {
+	duk_uint32_t count;
+
+	duk__cbor_decode_objarr_entry(dec_ctx);
+
+	if (ai == 0x1fU) {
+		count = 0xffffffffUL;
+	} else {
+		count = duk__cbor_decode_aival_uint32(dec_ctx, ib);
+		if (count == 0xffffffffUL) {
+			goto failure;
+		}
+	}
+
+	/* XXX: use bare object? */
+	duk_push_object(dec_ctx->thr);
+	for (;;) {
+		if (count == 0xffffffffUL) {
+			if (duk__cbor_decode_checkbreak(dec_ctx)) {
+				break;
+			}
+		} else {
+			if (count == 0UL) {
+				break;
+			}
+			count--;
+		}
+
+		/* Non-string keys are coerced to strings,
+		 * possibly leading to overwriting previous
+		 * keys.  Last key of a certain coerced name
+		 * wins.  If key is an object, it will coerce
+		 * to '[object Object]' which is consistent
+		 * but potentially misleading.  One alternative
+		 * would be to skip non-string keys.
+		 */
+		duk__cbor_decode_value(dec_ctx);
+		duk__cbor_decode_value(dec_ctx);
+		duk_put_prop(dec_ctx->thr, -3);
+	}
+
+#if 0
+ success:
+#endif
+	duk__cbor_decode_objarr_exit(dec_ctx);
+	return 1;
+
+failure:
+	/* No need to unwind recursion checks, caller will throw. */
+	return 0;
+}
+
+DUK_LOCAL duk_double_t duk__cbor_decode_float(duk_cbor_decode_context *dec_ctx) {
+	duk_float_union u;
+	const duk_uint8_t *inp;
+	inp = duk__cbor_decode_consume(dec_ctx, 4);
+	duk_memcpy((void *) u.uc, (const void *) inp, 4);
+	duk_fltunion_big_to_host(&u);
+	return (duk_double_t) u.f;
+}
+
+DUK_LOCAL duk_double_t duk__cbor_decode_double(duk_cbor_decode_context *dec_ctx) {
+	duk_double_union u;
+	const duk_uint8_t *inp;
+	inp = duk__cbor_decode_consume(dec_ctx, 8);
+	duk_memcpy((void *) u.uc, (const void *) inp, 8);
+	duk_dblunion_big_to_host(&u);
+	return u.d;
+}
+
+#if defined(DUK_CBOR_DECODE_FASTPATH)
+#define DUK__CBOR_AI (ib & 0x1fU)
+
+DUK_LOCAL void duk__cbor_decode_value(duk_cbor_decode_context *dec_ctx) {
+	duk_uint8_t ib;
+
+	/* Any paths potentially recursing back to duk__cbor_decode_value()
+	 * must perform a Duktape value stack growth check.  Avoid the check
+	 * here for simple paths like primitive values.
+	 */
+
+reread_initial_byte:
+	DUK_DDD(DUK_DDDPRINT("cbor decode off=%ld len=%ld", (long) dec_ctx->off, (long) dec_ctx->len));
+
+	ib = duk__cbor_decode_readbyte(dec_ctx);
+
+	/* Full initial byte switch, footprint cost over baseline is ~+1kB. */
+	/* XXX: Force full switch with no range check. */
+
+	switch (ib) {
+	case 0x00U:
+	case 0x01U:
+	case 0x02U:
+	case 0x03U:
+	case 0x04U:
+	case 0x05U:
+	case 0x06U:
+	case 0x07U:
+	case 0x08U:
+	case 0x09U:
+	case 0x0aU:
+	case 0x0bU:
+	case 0x0cU:
+	case 0x0dU:
+	case 0x0eU:
+	case 0x0fU:
+	case 0x10U:
+	case 0x11U:
+	case 0x12U:
+	case 0x13U:
+	case 0x14U:
+	case 0x15U:
+	case 0x16U:
+	case 0x17U:
+		duk_push_uint(dec_ctx->thr, ib);
+		break;
+	case 0x18U:
+	case 0x19U:
+	case 0x1aU:
+	case 0x1bU:
+		duk__cbor_decode_push_aival_int(dec_ctx, ib, 0 /*negative*/);
+		break;
+	case 0x1cU:
+	case 0x1dU:
+	case 0x1eU:
+	case 0x1fU:
+		goto format_error;
+	case 0x20U:
+	case 0x21U:
+	case 0x22U:
+	case 0x23U:
+	case 0x24U:
+	case 0x25U:
+	case 0x26U:
+	case 0x27U:
+	case 0x28U:
+	case 0x29U:
+	case 0x2aU:
+	case 0x2bU:
+	case 0x2cU:
+	case 0x2dU:
+	case 0x2eU:
+	case 0x2fU:
+	case 0x30U:
+	case 0x31U:
+	case 0x32U:
+	case 0x33U:
+	case 0x34U:
+	case 0x35U:
+	case 0x36U:
+	case 0x37U:
+		duk_push_int(dec_ctx->thr, -((duk_int_t) ((ib - 0x20U) + 1U)));
+		break;
+	case 0x38U:
+	case 0x39U:
+	case 0x3aU:
+	case 0x3bU:
+		duk__cbor_decode_push_aival_int(dec_ctx, ib, 1 /*negative*/);
+		break;
+	case 0x3cU:
+	case 0x3dU:
+	case 0x3eU:
+	case 0x3fU:
+		goto format_error;
+	case 0x40U:
+	case 0x41U:
+	case 0x42U:
+	case 0x43U:
+	case 0x44U:
+	case 0x45U:
+	case 0x46U:
+	case 0x47U:
+	case 0x48U:
+	case 0x49U:
+	case 0x4aU:
+	case 0x4bU:
+	case 0x4cU:
+	case 0x4dU:
+	case 0x4eU:
+	case 0x4fU:
+	case 0x50U:
+	case 0x51U:
+	case 0x52U:
+	case 0x53U:
+	case 0x54U:
+	case 0x55U:
+	case 0x56U:
+	case 0x57U:
+		/* XXX: Avoid rewind, we know the length already. */
+		DUK_ASSERT(dec_ctx->off > 0U);
+		dec_ctx->off--;
+		duk__cbor_decode_buffer(dec_ctx, 0x40U);
+		break;
+	case 0x58U:
+	case 0x59U:
+	case 0x5aU:
+	case 0x5bU:
+		/* XXX: Avoid rewind, decode length inline. */
+		DUK_ASSERT(dec_ctx->off > 0U);
+		dec_ctx->off--;
+		duk__cbor_decode_buffer(dec_ctx, 0x40U);
+		break;
+	case 0x5cU:
+	case 0x5dU:
+	case 0x5eU:
+		goto format_error;
+	case 0x5fU:
+		duk__cbor_decode_and_join_strbuf(dec_ctx, 0x40U);
+		break;
+	case 0x60U:
+	case 0x61U:
+	case 0x62U:
+	case 0x63U:
+	case 0x64U:
+	case 0x65U:
+	case 0x66U:
+	case 0x67U:
+	case 0x68U:
+	case 0x69U:
+	case 0x6aU:
+	case 0x6bU:
+	case 0x6cU:
+	case 0x6dU:
+	case 0x6eU:
+	case 0x6fU:
+	case 0x70U:
+	case 0x71U:
+	case 0x72U:
+	case 0x73U:
+	case 0x74U:
+	case 0x75U:
+	case 0x76U:
+	case 0x77U:
+		/* XXX: Avoid double decode of length. */
+		duk__cbor_decode_string(dec_ctx, ib, DUK__CBOR_AI);
+		break;
+	case 0x78U:
+	case 0x79U:
+	case 0x7aU:
+	case 0x7bU:
+		/* XXX: Avoid double decode of length. */
+		duk__cbor_decode_string(dec_ctx, ib, DUK__CBOR_AI);
+		break;
+	case 0x7cU:
+	case 0x7dU:
+	case 0x7eU:
+		goto format_error;
+	case 0x7fU:
+		duk__cbor_decode_string(dec_ctx, ib, DUK__CBOR_AI);
+		break;
+	case 0x80U:
+	case 0x81U:
+	case 0x82U:
+	case 0x83U:
+	case 0x84U:
+	case 0x85U:
+	case 0x86U:
+	case 0x87U:
+	case 0x88U:
+	case 0x89U:
+	case 0x8aU:
+	case 0x8bU:
+	case 0x8cU:
+	case 0x8dU:
+	case 0x8eU:
+	case 0x8fU:
+	case 0x90U:
+	case 0x91U:
+	case 0x92U:
+	case 0x93U:
+	case 0x94U:
+	case 0x95U:
+	case 0x96U:
+	case 0x97U:
+		if (DUK_UNLIKELY(duk__cbor_decode_array(dec_ctx, ib, DUK__CBOR_AI) == 0)) {
+			goto format_error;
+		}
+		break;
+	case 0x98U:
+	case 0x99U:
+	case 0x9aU:
+	case 0x9bU:
+		if (DUK_UNLIKELY(duk__cbor_decode_array(dec_ctx, ib, DUK__CBOR_AI) == 0)) {
+			goto format_error;
+		}
+		break;
+	case 0x9cU:
+	case 0x9dU:
+	case 0x9eU:
+		goto format_error;
+	case 0x9fU:
+		if (DUK_UNLIKELY(duk__cbor_decode_array(dec_ctx, ib, DUK__CBOR_AI) == 0)) {
+			goto format_error;
+		}
+		break;
+	case 0xa0U:
+	case 0xa1U:
+	case 0xa2U:
+	case 0xa3U:
+	case 0xa4U:
+	case 0xa5U:
+	case 0xa6U:
+	case 0xa7U:
+	case 0xa8U:
+	case 0xa9U:
+	case 0xaaU:
+	case 0xabU:
+	case 0xacU:
+	case 0xadU:
+	case 0xaeU:
+	case 0xafU:
+	case 0xb0U:
+	case 0xb1U:
+	case 0xb2U:
+	case 0xb3U:
+	case 0xb4U:
+	case 0xb5U:
+	case 0xb6U:
+	case 0xb7U:
+		if (DUK_UNLIKELY(duk__cbor_decode_map(dec_ctx, ib, DUK__CBOR_AI) == 0)) {
+			goto format_error;
+		}
+		break;
+	case 0xb8U:
+	case 0xb9U:
+	case 0xbaU:
+	case 0xbbU:
+		if (DUK_UNLIKELY(duk__cbor_decode_map(dec_ctx, ib, DUK__CBOR_AI) == 0)) {
+			goto format_error;
+		}
+		break;
+	case 0xbcU:
+	case 0xbdU:
+	case 0xbeU:
+		goto format_error;
+	case 0xbfU:
+		if (DUK_UNLIKELY(duk__cbor_decode_map(dec_ctx, ib, DUK__CBOR_AI) == 0)) {
+			goto format_error;
+		}
+		break;
+	case 0xc0U:
+	case 0xc1U:
+	case 0xc2U:
+	case 0xc3U:
+	case 0xc4U:
+	case 0xc5U:
+	case 0xc6U:
+	case 0xc7U:
+	case 0xc8U:
+	case 0xc9U:
+	case 0xcaU:
+	case 0xcbU:
+	case 0xccU:
+	case 0xcdU:
+	case 0xceU:
+	case 0xcfU:
+	case 0xd0U:
+	case 0xd1U:
+	case 0xd2U:
+	case 0xd3U:
+	case 0xd4U:
+	case 0xd5U:
+	case 0xd6U:
+	case 0xd7U:
+		/* Tag 0-23: drop. */
+		goto reread_initial_byte;
+	case 0xd8U:
+	case 0xd9U:
+	case 0xdaU:
+	case 0xdbU:
+		duk__cbor_decode_skip_aival_int(dec_ctx, ib);
+		goto reread_initial_byte;
+	case 0xdcU:
+	case 0xddU:
+	case 0xdeU:
+	case 0xdfU:
+		goto format_error;
+	case 0xe0U:
+		goto format_error;
+	case 0xe1U:
+		goto format_error;
+	case 0xe2U:
+		goto format_error;
+	case 0xe3U:
+		goto format_error;
+	case 0xe4U:
+		goto format_error;
+	case 0xe5U:
+		goto format_error;
+	case 0xe6U:
+		goto format_error;
+	case 0xe7U:
+		goto format_error;
+	case 0xe8U:
+		goto format_error;
+	case 0xe9U:
+		goto format_error;
+	case 0xeaU:
+		goto format_error;
+	case 0xebU:
+		goto format_error;
+	case 0xecU:
+		goto format_error;
+	case 0xedU:
+		goto format_error;
+	case 0xeeU:
+		goto format_error;
+	case 0xefU:
+		goto format_error;
+	case 0xf0U:
+		goto format_error;
+	case 0xf1U:
+		goto format_error;
+	case 0xf2U:
+		goto format_error;
+	case 0xf3U:
+		goto format_error;
+	case 0xf4U:
+		duk_push_false(dec_ctx->thr);
+		break;
+	case 0xf5U:
+		duk_push_true(dec_ctx->thr);
+		break;
+	case 0xf6U:
+		duk_push_null(dec_ctx->thr);
+		break;
+	case 0xf7U:
+		duk_push_undefined(dec_ctx->thr);
+		break;
+	case 0xf8U:
+		/* Simple value 32-255, nothing defined yet, so reject. */
+		goto format_error;
+	case 0xf9U: {
+		duk_double_t d;
+		d = duk__cbor_decode_half_float(dec_ctx);
+		duk_push_number(dec_ctx->thr, d);
+		break;
+	}
+	case 0xfaU: {
+		duk_double_t d;
+		d = duk__cbor_decode_float(dec_ctx);
+		duk_push_number(dec_ctx->thr, d);
+		break;
+	}
+	case 0xfbU: {
+		duk_double_t d;
+		d = duk__cbor_decode_double(dec_ctx);
+		duk_push_number(dec_ctx->thr, d);
+		break;
+	}
+	case 0xfcU:
+	case 0xfdU:
+	case 0xfeU:
+	case 0xffU:
+		goto format_error;
+	} /* end switch */
+
+	return;
+
+format_error:
+	duk__cbor_decode_error(dec_ctx);
+}
+#else /* DUK_CBOR_DECODE_FASTPATH */
+DUK_LOCAL void duk__cbor_decode_value(duk_cbor_decode_context *dec_ctx) {
+	duk_uint8_t ib, mt, ai;
+
+	/* Any paths potentially recursing back to duk__cbor_decode_value()
+	 * must perform a Duktape value stack growth check.  Avoid the check
+	 * here for simple paths like primitive values.
+	 */
+
+reread_initial_byte:
+	DUK_DDD(DUK_DDDPRINT("cbor decode off=%ld len=%ld", (long) dec_ctx->off, (long) dec_ctx->len));
+
+	ib = duk__cbor_decode_readbyte(dec_ctx);
+	mt = ib >> 5U;
+	ai = ib & 0x1fU;
+
+	/* Additional information in [24,27] = [0x18,0x1b] has relatively
+	 * uniform handling for all major types: read 1/2/4/8 additional
+	 * bytes.  For major type 7 the 1-byte value is a 'simple type', and
+	 * 2/4/8-byte values are floats.  For other major types the 1/2/4/8
+	 * byte values are integers.  The lengths are uniform, but the typing
+	 * is not.
+	 */
+
+	switch (mt) {
+	case 0U: { /* unsigned integer */
+		duk__cbor_decode_push_aival_int(dec_ctx, ib, 0 /*negative*/);
+		break;
+	}
+	case 1U: { /* negative integer */
+		duk__cbor_decode_push_aival_int(dec_ctx, ib, 1 /*negative*/);
+		break;
+	}
+	case 2U: { /* byte string */
+		if (ai == 0x1fU) {
+			duk__cbor_decode_and_join_strbuf(dec_ctx, 0x40U);
+		} else {
+			duk__cbor_decode_rewind(dec_ctx, 1U);
+			duk__cbor_decode_buffer(dec_ctx, 0x40U);
+		}
+		break;
+	}
+	case 3U: { /* text string */
+		duk__cbor_decode_string(dec_ctx, ib, ai);
+		break;
+	}
+	case 4U: { /* array of data items */
+		if (DUK_UNLIKELY(duk__cbor_decode_array(dec_ctx, ib, ai) == 0)) {
+			goto format_error;
+		}
+		break;
+	}
+	case 5U: { /* map of pairs of data items */
+		if (DUK_UNLIKELY(duk__cbor_decode_map(dec_ctx, ib, ai) == 0)) {
+			goto format_error;
+		}
+		break;
+	}
+	case 6U: { /* semantic tagging */
+		/* Tags are ignored now, re-read initial byte.  A tagged
+		 * value may itself be tagged (an unlimited number of times)
+		 * so keep on peeling away tags.
+		 */
+		duk__cbor_decode_skip_aival_int(dec_ctx, ib);
+		goto reread_initial_byte;
+	}
+	case 7U: { /* floating point numbers, simple data types, break; other */
+		switch (ai) {
+		case 0x14U: {
+			duk_push_false(dec_ctx->thr);
+			break;
+		}
+		case 0x15U: {
+			duk_push_true(dec_ctx->thr);
+			break;
+		}
+		case 0x16U: {
+			duk_push_null(dec_ctx->thr);
+			break;
+		}
+		case 0x17U: {
+			duk_push_undefined(dec_ctx->thr);
+			break;
+		}
+		case 0x18U: { /* more simple values (1 byte) */
+			/* Simple value encoded in additional byte (none
+			 * are defined so far).  RFC 7049 states that the
+			 * follow-up byte must be 32-255 to minimize
+			 * confusion.  So, a non-shortest encoding like
+			 * f815 (= true, shortest encoding f5) must be
+			 * rejected.  cbor.me tester rejects f815, but
+			 * e.g. Python CBOR binding decodes it as true.
+			 */
+			goto format_error;
+		}
+		case 0x19U: { /* half-float (2 bytes) */
+			duk_double_t d;
+			d = duk__cbor_decode_half_float(dec_ctx);
+			duk_push_number(dec_ctx->thr, d);
+			break;
+		}
+		case 0x1aU: { /* float (4 bytes) */
+			duk_double_t d;
+			d = duk__cbor_decode_float(dec_ctx);
+			duk_push_number(dec_ctx->thr, d);
+			break;
+		}
+		case 0x1bU: { /* double (8 bytes) */
+			duk_double_t d;
+			d = duk__cbor_decode_double(dec_ctx);
+			duk_push_number(dec_ctx->thr, d);
+			break;
+		}
+		case 0xffU: /* unexpected break */
+		default: {
+			goto format_error;
+		}
+		} /* end switch */
+		break;
+	}
+	default: {
+		goto format_error; /* will never actually occur */
+	}
+	} /* end switch */
+
+	return;
+
+format_error:
+	duk__cbor_decode_error(dec_ctx);
+}
+#endif /* DUK_CBOR_DECODE_FASTPATH */
+
+DUK_LOCAL void duk__cbor_encode(duk_hthread *thr, duk_idx_t idx, duk_uint_t encode_flags) {
+	duk_cbor_encode_context enc_ctx;
+	duk_uint8_t *buf;
+
+	DUK_UNREF(encode_flags);
+
+	idx = duk_require_normalize_index(thr, idx);
+
+	enc_ctx.thr = thr;
+	enc_ctx.idx_buf = duk_get_top(thr);
+
+	enc_ctx.len = 64;
+	buf = (duk_uint8_t *) duk_push_dynamic_buffer(thr, enc_ctx.len);
+	enc_ctx.ptr = buf;
+	enc_ctx.buf = buf;
+	enc_ctx.buf_end = buf + enc_ctx.len;
+
+	enc_ctx.recursion_depth = 0;
+	enc_ctx.recursion_limit = DUK_USE_CBOR_ENC_RECLIMIT;
+
+	duk_dup(thr, idx);
+	duk__cbor_encode_req_stack(&enc_ctx);
+	duk__cbor_encode_value(&enc_ctx);
+	DUK_ASSERT(enc_ctx.recursion_depth == 0);
+	duk_resize_buffer(enc_ctx.thr, enc_ctx.idx_buf, (duk_size_t) (enc_ctx.ptr - enc_ctx.buf));
+	duk_replace(thr, idx);
+}
+
+DUK_LOCAL void duk__cbor_decode(duk_hthread *thr, duk_idx_t idx, duk_uint_t decode_flags) {
+	duk_cbor_decode_context dec_ctx;
+
+	DUK_UNREF(decode_flags);
+
+	/* Suppress compile warnings for functions only needed with e.g.
+	 * asserts enabled.
+	 */
+	DUK_UNREF(duk__cbor_get_reserve);
+
+	idx = duk_require_normalize_index(thr, idx);
+
+	dec_ctx.thr = thr;
+	dec_ctx.buf = (const duk_uint8_t *) duk_require_buffer_data(thr, idx, &dec_ctx.len);
+	dec_ctx.off = 0;
+	/* dec_ctx.len: set above */
+
+	dec_ctx.recursion_depth = 0;
+	dec_ctx.recursion_limit = DUK_USE_CBOR_DEC_RECLIMIT;
+
+	duk__cbor_decode_req_stack(&dec_ctx);
+	duk__cbor_decode_value(&dec_ctx);
+	DUK_ASSERT(dec_ctx.recursion_depth == 0);
+	if (dec_ctx.off != dec_ctx.len) {
+		(void) duk_type_error(thr, "trailing garbage");
+	}
+
+	duk_replace(thr, idx);
+}
+
+#else /* DUK_USE_CBOR_SUPPORT */
+
+DUK_LOCAL void duk__cbor_encode(duk_hthread *thr, duk_idx_t idx, duk_uint_t encode_flags) {
+	DUK_UNREF(idx);
+	DUK_UNREF(encode_flags);
+	DUK_ERROR_UNSUPPORTED(thr);
+}
+
+DUK_LOCAL void duk__cbor_decode(duk_hthread *thr, duk_idx_t idx, duk_uint_t decode_flags) {
+	DUK_UNREF(idx);
+	DUK_UNREF(decode_flags);
+	DUK_ERROR_UNSUPPORTED(thr);
+}
+
+#endif /* DUK_USE_CBOR_SUPPORT */
+
+/*
+ *  Public APIs
+ */
+
+DUK_EXTERNAL void duk_cbor_encode(duk_hthread *thr, duk_idx_t idx, duk_uint_t encode_flags) {
+	DUK_ASSERT_API_ENTRY(thr);
+	duk__cbor_encode(thr, idx, encode_flags);
+}
+DUK_EXTERNAL void duk_cbor_decode(duk_hthread *thr, duk_idx_t idx, duk_uint_t decode_flags) {
+	DUK_ASSERT_API_ENTRY(thr);
+	duk__cbor_decode(thr, idx, decode_flags);
+}
+
+#if defined(DUK_USE_CBOR_BUILTIN)
+#if defined(DUK_USE_CBOR_SUPPORT)
+DUK_INTERNAL duk_ret_t duk_bi_cbor_encode(duk_hthread *thr) {
+	DUK_ASSERT_TOP(thr, 1);
+
+	duk__cbor_encode(thr, -1, 0 /*flags*/);
+
+	/* Produce an ArrayBuffer by first decoding into a plain buffer which
+	 * mimics a Uint8Array and gettings its .buffer property.
+	 */
+	/* XXX: shortcut */
+	(void) duk_get_prop_stridx(thr, -1, DUK_STRIDX_LC_BUFFER);
+	return 1;
+}
+
+DUK_INTERNAL duk_ret_t duk_bi_cbor_decode(duk_hthread *thr) {
+	DUK_ASSERT_TOP(thr, 1);
+
+	duk__cbor_decode(thr, -1, 0 /*flags*/);
+	return 1;
+}
+#else /* DUK_USE_CBOR_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_cbor_encode(duk_hthread *thr) {
+	DUK_ERROR_UNSUPPORTED(thr);
+	DUK_WO_NORETURN(return 0;);
+}
+DUK_INTERNAL duk_ret_t duk_bi_cbor_decode(duk_hthread *thr) {
+	DUK_ERROR_UNSUPPORTED(thr);
+	DUK_WO_NORETURN(return 0;);
+}
+#endif /* DUK_USE_CBOR_SUPPORT */
+#endif /* DUK_USE_CBOR_BUILTIN */
+
+/* automatic undefs */
+#undef DUK__CBOR_AI
+/*
  *  Date built-ins
  *
  *  Unlike most built-ins, Date has some platform dependencies for getting
@@ -29547,30 +32697,49 @@ DUK_LOCAL_DECL duk_ret_t duk__set_this_timeval_from_dparts(duk_hthread *thr, duk
  */
 
 /* Debug macro to print all parts and dparts (used manually because of debug level). */
-#define  DUK__DPRINT_PARTS_AND_DPARTS(parts,dparts)  do { \
+#define DUK__DPRINT_PARTS_AND_DPARTS(parts, dparts) \
+	do { \
 		DUK_D(DUK_DPRINT("parts: %ld %ld %ld %ld %ld %ld %ld %ld, dparts: %lf %lf %lf %lf %lf %lf %lf %lf", \
-		                 (long) (parts)[0], (long) (parts)[1], \
-		                 (long) (parts)[2], (long) (parts)[3], \
-		                 (long) (parts)[4], (long) (parts)[5], \
-		                 (long) (parts)[6], (long) (parts)[7], \
-		                 (double) (dparts)[0], (double) (dparts)[1], \
-		                 (double) (dparts)[2], (double) (dparts)[3], \
-		                 (double) (dparts)[4], (double) (dparts)[5], \
-		                 (double) (dparts)[6], (double) (dparts)[7])); \
+		                 (long) (parts)[0], \
+		                 (long) (parts)[1], \
+		                 (long) (parts)[2], \
+		                 (long) (parts)[3], \
+		                 (long) (parts)[4], \
+		                 (long) (parts)[5], \
+		                 (long) (parts)[6], \
+		                 (long) (parts)[7], \
+		                 (double) (dparts)[0], \
+		                 (double) (dparts)[1], \
+		                 (double) (dparts)[2], \
+		                 (double) (dparts)[3], \
+		                 (double) (dparts)[4], \
+		                 (double) (dparts)[5], \
+		                 (double) (dparts)[6], \
+		                 (double) (dparts)[7])); \
 	} while (0)
-#define  DUK__DPRINT_PARTS(parts)  do { \
+#define DUK__DPRINT_PARTS(parts) \
+	do { \
 		DUK_D(DUK_DPRINT("parts: %ld %ld %ld %ld %ld %ld %ld %ld", \
-		                 (long) (parts)[0], (long) (parts)[1], \
-		                 (long) (parts)[2], (long) (parts)[3], \
-		                 (long) (parts)[4], (long) (parts)[5], \
-		                 (long) (parts)[6], (long) (parts)[7])); \
+		                 (long) (parts)[0], \
+		                 (long) (parts)[1], \
+		                 (long) (parts)[2], \
+		                 (long) (parts)[3], \
+		                 (long) (parts)[4], \
+		                 (long) (parts)[5], \
+		                 (long) (parts)[6], \
+		                 (long) (parts)[7])); \
 	} while (0)
-#define  DUK__DPRINT_DPARTS(dparts)  do { \
+#define DUK__DPRINT_DPARTS(dparts) \
+	do { \
 		DUK_D(DUK_DPRINT("dparts: %lf %lf %lf %lf %lf %lf %lf %lf", \
-		                 (double) (dparts)[0], (double) (dparts)[1], \
-		                 (double) (dparts)[2], (double) (dparts)[3], \
-		                 (double) (dparts)[4], (double) (dparts)[5], \
-		                 (double) (dparts)[6], (double) (dparts)[7])); \
+		                 (double) (dparts)[0], \
+		                 (double) (dparts)[1], \
+		                 (double) (dparts)[2], \
+		                 (double) (dparts)[3], \
+		                 (double) (dparts)[4], \
+		                 (double) (dparts)[5], \
+		                 (double) (dparts)[6], \
+		                 (double) (dparts)[7])); \
 	} while (0)
 
 /* Equivalent year for DST calculations outside [1970,2038[ range, see
@@ -29578,7 +32747,7 @@ DUK_LOCAL_DECL duk_ret_t duk__set_this_timeval_from_dparts(duk_hthread *thr, duk
  * starts with the same weekday on Jan 1.
  * https://bugzilla.mozilla.org/show_bug.cgi?id=351066
  */
-#define DUK__YEAR(x) ((duk_uint8_t) ((x) - 1970))
+#define DUK__YEAR(x) ((duk_uint8_t) ((x) -1970))
 DUK_LOCAL duk_uint8_t duk__date_equivyear[14] = {
 #if 1
 	/* This is based on V8 EquivalentYear() algorithm (see util/genequivyear.py):
@@ -29586,12 +32755,22 @@ DUK_LOCAL duk_uint8_t duk__date_equivyear[14] = {
 	 */
 
 	/* non-leap year: sunday, monday, ... */
-	DUK__YEAR(2023), DUK__YEAR(2035), DUK__YEAR(2019), DUK__YEAR(2031),
-	DUK__YEAR(2015), DUK__YEAR(2027), DUK__YEAR(2011),
+	DUK__YEAR(2023),
+	DUK__YEAR(2035),
+	DUK__YEAR(2019),
+	DUK__YEAR(2031),
+	DUK__YEAR(2015),
+	DUK__YEAR(2027),
+	DUK__YEAR(2011),
 
 	/* leap year: sunday, monday, ... */
-	DUK__YEAR(2012), DUK__YEAR(2024), DUK__YEAR(2008), DUK__YEAR(2020),
-	DUK__YEAR(2032), DUK__YEAR(2016), DUK__YEAR(2028)
+	DUK__YEAR(2012),
+	DUK__YEAR(2024),
+	DUK__YEAR(2008),
+	DUK__YEAR(2020),
+	DUK__YEAR(2032),
+	DUK__YEAR(2016),
+	DUK__YEAR(2028)
 #endif
 
 #if 0
@@ -29614,71 +32793,70 @@ DUK_LOCAL duk_uint8_t duk__date_equivyear[14] = {
  */
 
 /* Parser part count. */
-#define DUK__NUM_ISO8601_PARSER_PARTS  9
+#define DUK__NUM_ISO8601_PARSER_PARTS 9
 
 /* Parser part indices. */
-#define DUK__PI_YEAR         0
-#define DUK__PI_MONTH        1
-#define DUK__PI_DAY          2
-#define DUK__PI_HOUR         3
-#define DUK__PI_MINUTE       4
-#define DUK__PI_SECOND       5
-#define DUK__PI_MILLISECOND  6
-#define DUK__PI_TZHOUR       7
-#define DUK__PI_TZMINUTE     8
+#define DUK__PI_YEAR        0
+#define DUK__PI_MONTH       1
+#define DUK__PI_DAY         2
+#define DUK__PI_HOUR        3
+#define DUK__PI_MINUTE      4
+#define DUK__PI_SECOND      5
+#define DUK__PI_MILLISECOND 6
+#define DUK__PI_TZHOUR      7
+#define DUK__PI_TZMINUTE    8
 
 /* Parser part masks. */
-#define DUK__PM_YEAR         (1 << DUK__PI_YEAR)
-#define DUK__PM_MONTH        (1 << DUK__PI_MONTH)
-#define DUK__PM_DAY          (1 << DUK__PI_DAY)
-#define DUK__PM_HOUR         (1 << DUK__PI_HOUR)
-#define DUK__PM_MINUTE       (1 << DUK__PI_MINUTE)
-#define DUK__PM_SECOND       (1 << DUK__PI_SECOND)
-#define DUK__PM_MILLISECOND  (1 << DUK__PI_MILLISECOND)
-#define DUK__PM_TZHOUR       (1 << DUK__PI_TZHOUR)
-#define DUK__PM_TZMINUTE     (1 << DUK__PI_TZMINUTE)
+#define DUK__PM_YEAR        (1 << DUK__PI_YEAR)
+#define DUK__PM_MONTH       (1 << DUK__PI_MONTH)
+#define DUK__PM_DAY         (1 << DUK__PI_DAY)
+#define DUK__PM_HOUR        (1 << DUK__PI_HOUR)
+#define DUK__PM_MINUTE      (1 << DUK__PI_MINUTE)
+#define DUK__PM_SECOND      (1 << DUK__PI_SECOND)
+#define DUK__PM_MILLISECOND (1 << DUK__PI_MILLISECOND)
+#define DUK__PM_TZHOUR      (1 << DUK__PI_TZHOUR)
+#define DUK__PM_TZMINUTE    (1 << DUK__PI_TZMINUTE)
 
 /* Parser separator indices. */
-#define DUK__SI_PLUS         0
-#define DUK__SI_MINUS        1
-#define DUK__SI_T            2
-#define DUK__SI_SPACE        3
-#define DUK__SI_COLON        4
-#define DUK__SI_PERIOD       5
-#define DUK__SI_Z            6
-#define DUK__SI_NUL          7
+#define DUK__SI_PLUS   0
+#define DUK__SI_MINUS  1
+#define DUK__SI_T      2
+#define DUK__SI_SPACE  3
+#define DUK__SI_COLON  4
+#define DUK__SI_PERIOD 5
+#define DUK__SI_Z      6
+#define DUK__SI_NUL    7
 
 /* Parser separator masks. */
-#define DUK__SM_PLUS         (1 << DUK__SI_PLUS)
-#define DUK__SM_MINUS        (1 << DUK__SI_MINUS)
-#define DUK__SM_T            (1 << DUK__SI_T)
-#define DUK__SM_SPACE        (1 << DUK__SI_SPACE)
-#define DUK__SM_COLON        (1 << DUK__SI_COLON)
-#define DUK__SM_PERIOD       (1 << DUK__SI_PERIOD)
-#define DUK__SM_Z            (1 << DUK__SI_Z)
-#define DUK__SM_NUL          (1 << DUK__SI_NUL)
+#define DUK__SM_PLUS   (1 << DUK__SI_PLUS)
+#define DUK__SM_MINUS  (1 << DUK__SI_MINUS)
+#define DUK__SM_T      (1 << DUK__SI_T)
+#define DUK__SM_SPACE  (1 << DUK__SI_SPACE)
+#define DUK__SM_COLON  (1 << DUK__SI_COLON)
+#define DUK__SM_PERIOD (1 << DUK__SI_PERIOD)
+#define DUK__SM_Z      (1 << DUK__SI_Z)
+#define DUK__SM_NUL    (1 << DUK__SI_NUL)
 
 /* Rule control flags. */
-#define DUK__CF_NEG          (1 << 0)  /* continue matching, set neg_tzoffset flag */
-#define DUK__CF_ACCEPT       (1 << 1)  /* accept string */
-#define DUK__CF_ACCEPT_NUL   (1 << 2)  /* accept string if next char is NUL (otherwise reject) */
-
-#define DUK__PACK_RULE(partmask,sepmask,nextpart,flags)  \
-	((duk_uint32_t) (partmask) + \
-	 (((duk_uint32_t) (sepmask)) << 9) + \
-	 (((duk_uint32_t) (nextpart)) << 17) + \
+#define DUK__CF_NEG        (1 << 0) /* continue matching, set neg_tzoffset flag */
+#define DUK__CF_ACCEPT     (1 << 1) /* accept string */
+#define DUK__CF_ACCEPT_NUL (1 << 2) /* accept string if next char is NUL (otherwise reject) */
+
+#define DUK__PACK_RULE(partmask, sepmask, nextpart, flags) \
+	((duk_uint32_t) (partmask) + (((duk_uint32_t) (sepmask)) << 9) + (((duk_uint32_t) (nextpart)) << 17) + \
 	 (((duk_uint32_t) (flags)) << 21))
 
-#define DUK__UNPACK_RULE(rule,var_nextidx,var_flags)  do { \
+#define DUK__UNPACK_RULE(rule, var_nextidx, var_flags) \
+	do { \
 		(var_nextidx) = (duk_small_uint_t) (((rule) >> 17) & 0x0f); \
 		(var_flags) = (duk_small_uint_t) ((rule) >> 21); \
 	} while (0)
 
-#define DUK__RULE_MASK_PART_SEP  0x1ffffUL
+#define DUK__RULE_MASK_PART_SEP 0x1ffffUL
 
 /* Matching separator index is used in the control table */
 DUK_LOCAL const duk_uint8_t duk__parse_iso8601_seps[] = {
-	DUK_ASC_PLUS /*0*/, DUK_ASC_MINUS /*1*/, DUK_ASC_UC_T /*2*/, DUK_ASC_SPACE /*3*/,
+	DUK_ASC_PLUS /*0*/,  DUK_ASC_MINUS /*1*/,  DUK_ASC_UC_T /*2*/, DUK_ASC_SPACE /*3*/,
 	DUK_ASC_COLON /*4*/, DUK_ASC_PERIOD /*5*/, DUK_ASC_UC_Z /*6*/, DUK_ASC_NUL /*7*/
 };
 
@@ -29691,10 +32869,26 @@ DUK_LOCAL const duk_uint32_t duk__parse_iso8601_control[] = {
 	DUK__PACK_RULE(DUK__PM_MINUTE, DUK__SM_COLON, DUK__PI_SECOND, 0),
 	DUK__PACK_RULE(DUK__PM_SECOND, DUK__SM_PERIOD, DUK__PI_MILLISECOND, 0),
 	DUK__PACK_RULE(DUK__PM_TZHOUR, DUK__SM_COLON, DUK__PI_TZMINUTE, 0),
-	DUK__PACK_RULE(DUK__PM_YEAR | DUK__PM_MONTH | DUK__PM_DAY | DUK__PM_HOUR /*Note1*/ | DUK__PM_MINUTE | DUK__PM_SECOND | DUK__PM_MILLISECOND, DUK__SM_PLUS, DUK__PI_TZHOUR, 0),
-	DUK__PACK_RULE(DUK__PM_YEAR | DUK__PM_MONTH | DUK__PM_DAY | DUK__PM_HOUR /*Note1*/ | DUK__PM_MINUTE | DUK__PM_SECOND | DUK__PM_MILLISECOND, DUK__SM_MINUS, DUK__PI_TZHOUR, DUK__CF_NEG),
-	DUK__PACK_RULE(DUK__PM_YEAR | DUK__PM_MONTH | DUK__PM_DAY | DUK__PM_HOUR /*Note1*/ | DUK__PM_MINUTE | DUK__PM_SECOND | DUK__PM_MILLISECOND, DUK__SM_Z, 0, DUK__CF_ACCEPT_NUL),
-	DUK__PACK_RULE(DUK__PM_YEAR | DUK__PM_MONTH | DUK__PM_DAY | DUK__PM_HOUR /*Note1*/ | DUK__PM_MINUTE | DUK__PM_SECOND | DUK__PM_MILLISECOND | DUK__PM_TZHOUR /*Note2*/ | DUK__PM_TZMINUTE, DUK__SM_NUL, 0, DUK__CF_ACCEPT)
+	DUK__PACK_RULE(DUK__PM_YEAR | DUK__PM_MONTH | DUK__PM_DAY | DUK__PM_HOUR /*Note1*/ | DUK__PM_MINUTE | DUK__PM_SECOND |
+	                   DUK__PM_MILLISECOND,
+	               DUK__SM_PLUS,
+	               DUK__PI_TZHOUR,
+	               0),
+	DUK__PACK_RULE(DUK__PM_YEAR | DUK__PM_MONTH | DUK__PM_DAY | DUK__PM_HOUR /*Note1*/ | DUK__PM_MINUTE | DUK__PM_SECOND |
+	                   DUK__PM_MILLISECOND,
+	               DUK__SM_MINUS,
+	               DUK__PI_TZHOUR,
+	               DUK__CF_NEG),
+	DUK__PACK_RULE(DUK__PM_YEAR | DUK__PM_MONTH | DUK__PM_DAY | DUK__PM_HOUR /*Note1*/ | DUK__PM_MINUTE | DUK__PM_SECOND |
+	                   DUK__PM_MILLISECOND,
+	               DUK__SM_Z,
+	               0,
+	               DUK__CF_ACCEPT_NUL),
+	DUK__PACK_RULE(DUK__PM_YEAR | DUK__PM_MONTH | DUK__PM_DAY | DUK__PM_HOUR /*Note1*/ | DUK__PM_MINUTE | DUK__PM_SECOND |
+	                   DUK__PM_MILLISECOND | DUK__PM_TZHOUR /*Note2*/ | DUK__PM_TZMINUTE,
+	               DUK__SM_NUL,
+	               0,
+	               DUK__CF_ACCEPT)
 
 	/* Note1: the specification doesn't require matching a time form with
 	 *        just hours ("HH"), but we accept it here, e.g. "2012-01-02T12Z".
@@ -29719,7 +32913,7 @@ DUK_LOCAL duk_bool_t duk__parse_string_iso8601_subset(duk_hthread *thr, const ch
 
 	/* During parsing, month and day are one-based; set defaults here. */
 	duk_memzero(parts, sizeof(parts));
-	DUK_ASSERT(parts[DUK_DATE_IDX_YEAR] == 0);  /* don't care value, year is mandatory */
+	DUK_ASSERT(parts[DUK_DATE_IDX_YEAR] == 0); /* don't care value, year is mandatory */
 	parts[DUK_DATE_IDX_MONTH] = 1;
 	parts[DUK_DATE_IDX_DAY] = 1;
 
@@ -29736,7 +32930,8 @@ DUK_LOCAL duk_bool_t duk__parse_string_iso8601_subset(duk_hthread *thr, const ch
 	for (;;) {
 		ch = *p++;
 		DUK_DDD(DUK_DDDPRINT("parsing, part_idx=%ld, char=%ld ('%c')",
-		                     (long) part_idx, (long) ch,
+		                     (long) part_idx,
+		                     (long) ch,
 		                     (int) ((ch >= 0x20 && ch <= 0x7e) ? ch : DUK_ASC_QUESTION)));
 
 		if (ch >= DUK_ASC_0 && ch <= DUK_ASC_9) {
@@ -29781,7 +32976,7 @@ DUK_LOCAL duk_bool_t duk__parse_string_iso8601_subset(duk_hthread *thr, const ch
 			}
 
 			sep_idx = i;
-			match_val = (1UL << part_idx) + (1UL << (sep_idx + 9));  /* match against rule part/sep bits */
+			match_val = (1UL << part_idx) + (1UL << (sep_idx + 9)); /* match against rule part/sep bits */
 
 			for (i = 0; i < (duk_small_uint_t) (sizeof(duk__parse_iso8601_control) / sizeof(duk_uint32_t)); i++) {
 				duk_uint_fast32_t rule = duk__parse_iso8601_control[i];
@@ -29789,8 +32984,10 @@ DUK_LOCAL duk_bool_t duk__parse_string_iso8601_subset(duk_hthread *thr, const ch
 				duk_small_uint_t cflags;
 
 				DUK_DDD(DUK_DDDPRINT("part_idx=%ld, sep_idx=%ld, match_val=0x%08lx, considering rule=0x%08lx",
-				                     (long) part_idx, (long) sep_idx,
-				                     (unsigned long) match_val, (unsigned long) rule));
+				                     (long) part_idx,
+				                     (long) sep_idx,
+				                     (unsigned long) match_val,
+				                     (unsigned long) rule));
 
 				if ((rule & match_val) != match_val) {
 					continue;
@@ -29800,9 +32997,12 @@ DUK_LOCAL duk_bool_t duk__parse_string_iso8601_subset(duk_hthread *thr, const ch
 
 				DUK_DDD(DUK_DDDPRINT("rule match -> part_idx=%ld, sep_idx=%ld, match_val=0x%08lx, "
 				                     "rule=0x%08lx -> nextpart=%ld, cflags=0x%02lx",
-				                     (long) part_idx, (long) sep_idx,
-				                     (unsigned long) match_val, (unsigned long) rule,
-				                     (long) nextpart, (unsigned long) cflags));
+				                     (long) part_idx,
+				                     (long) sep_idx,
+				                     (unsigned long) match_val,
+				                     (unsigned long) rule,
+				                     (long) nextpart,
+				                     (unsigned long) cflags));
 
 				if (cflags & DUK__CF_NEG) {
 					neg_tzoffset = 1;
@@ -29822,7 +33022,7 @@ DUK_LOCAL duk_bool_t duk__parse_string_iso8601_subset(duk_hthread *thr, const ch
 
 				part_idx = nextpart;
 				break;
-			}  /* rule match */
+			} /* rule match */
 
 			if (i == (duk_small_uint_t) (sizeof(duk__parse_iso8601_control) / sizeof(duk_uint32_t))) {
 				DUK_DDD(DUK_DDDPRINT("no rule matches -> reject"));
@@ -29836,17 +33036,17 @@ DUK_LOCAL duk_bool_t duk__parse_string_iso8601_subset(duk_hthread *thr, const ch
 				DUK_DDD(DUK_DDDPRINT("NUL after rule matching (should not happen) -> reject"));
 				goto reject;
 			}
-		}  /* if-digit-else-ctrl */
-	}  /* char loop */
+		} /* if-digit-else-ctrl */
+	} /* char loop */
 
 	/* We should never exit the loop above. */
 	DUK_UNREACHABLE();
 
- reject:
+reject:
 	DUK_DDD(DUK_DDDPRINT("reject"));
 	return 0;
 
- accept:
+accept:
 	DUK_DDD(DUK_DDDPRINT("accept"));
 
 	/* Apply timezone offset to get the main parts in UTC */
@@ -29860,8 +33060,8 @@ DUK_LOCAL duk_bool_t duk__parse_string_iso8601_subset(duk_hthread *thr, const ch
 		parts[DUK__PI_HOUR] -= parts[DUK__PI_TZHOUR];
 		parts[DUK__PI_MINUTE] -= parts[DUK__PI_TZMINUTE];
 	}
-	parts[DUK__PI_MONTH] -= 1;  /* zero-based month */
-	parts[DUK__PI_DAY] -= 1;  /* zero-based day */
+	parts[DUK__PI_MONTH] -= 1; /* zero-based month */
+	parts[DUK__PI_DAY] -= 1; /* zero-based day */
 
 	/* Use double parts, they tolerate unnormalized time.
 	 *
@@ -29938,16 +33138,14 @@ DUK_LOCAL duk_ret_t duk__parse_string(duk_hthread *thr, const char *str) {
  *  out for non-finite numbers etc.
  */
 
-DUK_LOCAL duk_uint8_t duk__days_in_month[12] = {
-	(duk_uint8_t) 31, (duk_uint8_t) 28, (duk_uint8_t) 31, (duk_uint8_t) 30,
-	(duk_uint8_t) 31, (duk_uint8_t) 30, (duk_uint8_t) 31, (duk_uint8_t) 31,
-	(duk_uint8_t) 30, (duk_uint8_t) 31, (duk_uint8_t) 30, (duk_uint8_t) 31
-};
+DUK_LOCAL duk_uint8_t duk__days_in_month[12] = { (duk_uint8_t) 31, (duk_uint8_t) 28, (duk_uint8_t) 31, (duk_uint8_t) 30,
+	                                         (duk_uint8_t) 31, (duk_uint8_t) 30, (duk_uint8_t) 31, (duk_uint8_t) 31,
+	                                         (duk_uint8_t) 30, (duk_uint8_t) 31, (duk_uint8_t) 30, (duk_uint8_t) 31 };
 
 /* Maximum iteration count for computing UTC-to-local time offset when
  * creating an ECMAScript time value from local parts.
  */
-#define DUK__LOCAL_TZOFFSET_MAXITER   4
+#define DUK__LOCAL_TZOFFSET_MAXITER 4
 
 /* Because 'day since epoch' can be negative and is used to compute weekday
  * using a modulo operation, add this multiple of 7 to avoid negative values
@@ -29955,7 +33153,7 @@ DUK_LOCAL duk_uint8_t duk__days_in_month[12] = {
  * +/- 100 million days from epoch, so this adder fits nicely into 32 bits.
  * Round to a multiple of 7 (= floor(100000000 / 7) * 7) and add margin.
  */
-#define DUK__WEEKDAY_MOD_ADDER  (20000000 * 7)  /* 0x08583b00 */
+#define DUK__WEEKDAY_MOD_ADDER (20000000 * 7) /* 0x08583b00 */
 
 DUK_INTERNAL duk_bool_t duk_bi_date_is_leap_year(duk_int_t year) {
 	if ((year % 4) != 0) {
@@ -30016,10 +33214,8 @@ DUK_LOCAL duk_int_t duk__day_from_year(duk_int_t year) {
 	/* Note: in integer arithmetic, (x / 4) is same as floor(x / 4) for non-negative
 	 * values, but is incorrect for negative ones.
 	 */
-	return 365 * (year - 1970)
-	       + duk__div_floor(year - 1969, 4)
-	       - duk__div_floor(year - 1901, 100)
-	       + duk__div_floor(year - 1601, 400);
+	return 365 * (year - 1970) + duk__div_floor(year - 1969, 4) - duk__div_floor(year - 1901, 100) +
+	       duk__div_floor(year - 1601, 400);
 }
 
 /* Given a day number, determine year and day-within-year. */
@@ -30041,10 +33237,9 @@ DUK_LOCAL duk_int_t duk__year_from_day(duk_int_t day, duk_small_int_t *out_day_w
 		diff_days = duk__day_from_year(year) - day;
 		DUK_DDD(DUK_DDDPRINT("year=%ld day=%ld, diff_days=%ld", (long) year, (long) day, (long) diff_days));
 		if (diff_days <= 0) {
-			DUK_ASSERT(-diff_days < 366);  /* fits into duk_small_int_t */
+			DUK_ASSERT(-diff_days < 366); /* fits into duk_small_int_t */
 			*out_day_within_year = -diff_days;
-			DUK_DDD(DUK_DDDPRINT("--> year=%ld, day-within-year=%ld",
-			                     (long) year, (long) *out_day_within_year));
+			DUK_DDD(DUK_DDDPRINT("--> year=%ld, day-within-year=%ld", (long) year, (long) *out_day_within_year));
 			DUK_ASSERT(*out_day_within_year >= 0);
 			DUK_ASSERT(*out_day_within_year < (duk_bi_date_is_leap_year(year) ? 366 : 365));
 			return year;
@@ -30053,7 +33248,7 @@ DUK_LOCAL duk_int_t duk__year_from_day(duk_int_t day, duk_small_int_t *out_day_w
 		/* Note: this is very tricky; we must never 'overshoot' the
 		 * correction downwards.
 		 */
-		year -= 1 + (diff_days - 1) / 366;  /* conservative */
+		year -= 1 + (diff_days - 1) / 366; /* conservative */
 	}
 }
 
@@ -30126,7 +33321,7 @@ DUK_INTERNAL void duk_bi_date_timeval_to_parts(duk_double_t d, duk_int_t *parts,
 	duk_double_t d1, d2;
 	duk_int_t t1, t2;
 	duk_int_t day_since_epoch;
-	duk_int_t year;  /* does not fit into 16 bits */
+	duk_int_t year; /* does not fit into 16 bits */
 	duk_small_int_t day_in_year;
 	duk_small_int_t month;
 	duk_small_int_t day;
@@ -30138,9 +33333,9 @@ DUK_INTERNAL void duk_bi_date_timeval_to_parts(duk_double_t d, duk_int_t *parts,
 	duk_bool_t is_leap;
 	duk_small_int_t arridx;
 
-	DUK_ASSERT(DUK_ISFINITE(d));    /* caller checks */
-	d = DUK_FLOOR(d);  /* remove fractions if present */
-	DUK_ASSERT(DUK_FLOOR(d) == d);
+	DUK_ASSERT(DUK_ISFINITE(d)); /* caller checks */
+	d = DUK_FLOOR(d); /* remove fractions if present */
+	DUK_ASSERT(duk_double_equals(DUK_FLOOR(d), d));
 
 	/* The timevalue must be in valid ECMAScript range, but since a local
 	 * time offset can be applied, we need to allow a +/- 24h leeway to
@@ -30159,21 +33354,24 @@ DUK_INTERNAL void duk_bi_date_timeval_to_parts(duk_double_t d, duk_int_t *parts,
 		d1 += (duk_double_t) DUK_DATE_MSEC_DAY;
 	}
 	d2 = DUK_FLOOR((double) (d / (duk_double_t) DUK_DATE_MSEC_DAY));
-	DUK_ASSERT(d2 * ((duk_double_t) DUK_DATE_MSEC_DAY) + d1 == d);
+	DUK_ASSERT(duk_double_equals(d2 * ((duk_double_t) DUK_DATE_MSEC_DAY) + d1, d));
 	/* now expected to fit into a 32-bit integer */
 	t1 = (duk_int_t) d1;
 	t2 = (duk_int_t) d2;
 	day_since_epoch = t2;
-	DUK_ASSERT((duk_double_t) t1 == d1);
-	DUK_ASSERT((duk_double_t) t2 == d2);
+	DUK_ASSERT(duk_double_equals((duk_double_t) t1, d1));
+	DUK_ASSERT(duk_double_equals((duk_double_t) t2, d2));
 
 	/* t1 = milliseconds within day (fits 32 bit)
 	 * t2 = day number from epoch (fits 32 bit, may be negative)
 	 */
 
-	parts[DUK_DATE_IDX_MILLISECOND] = t1 % 1000; t1 /= 1000;
-	parts[DUK_DATE_IDX_SECOND] = t1 % 60; t1 /= 60;
-	parts[DUK_DATE_IDX_MINUTE] = t1 % 60; t1 /= 60;
+	parts[DUK_DATE_IDX_MILLISECOND] = t1 % 1000;
+	t1 /= 1000;
+	parts[DUK_DATE_IDX_SECOND] = t1 % 60;
+	t1 /= 60;
+	parts[DUK_DATE_IDX_MINUTE] = t1 % 60;
+	t1 /= 60;
 	parts[DUK_DATE_IDX_HOUR] = t1;
 	DUK_ASSERT(parts[DUK_DATE_IDX_MILLISECOND] >= 0 && parts[DUK_DATE_IDX_MILLISECOND] <= 999);
 	DUK_ASSERT(parts[DUK_DATE_IDX_SECOND] >= 0 && parts[DUK_DATE_IDX_SECOND] <= 59);
@@ -30181,7 +33379,11 @@ DUK_INTERNAL void duk_bi_date_timeval_to_parts(duk_double_t d, duk_int_t *parts,
 	DUK_ASSERT(parts[DUK_DATE_IDX_HOUR] >= 0 && parts[DUK_DATE_IDX_HOUR] <= 23);
 
 	DUK_DDD(DUK_DDDPRINT("d=%lf, d1=%lf, d2=%lf, t1=%ld, t2=%ld, parts: hour=%ld min=%ld sec=%ld msec=%ld",
-	                     (double) d, (double) d1, (double) d2, (long) t1, (long) t2,
+	                     (double) d,
+	                     (double) d1,
+	                     (double) d2,
+	                     (long) t1,
+	                     (long) t2,
 	                     (long) parts[DUK_DATE_IDX_HOUR],
 	                     (long) parts[DUK_DATE_IDX_MINUTE],
 	                     (long) parts[DUK_DATE_IDX_SECOND],
@@ -30191,7 +33393,7 @@ DUK_INTERNAL void duk_bi_date_timeval_to_parts(duk_double_t d, duk_int_t *parts,
 	 * the ECMAScript range.
 	 */
 	DUK_ASSERT(t2 + DUK__WEEKDAY_MOD_ADDER >= 0);
-	parts[DUK_DATE_IDX_WEEKDAY] = (t2 + 4 + DUK__WEEKDAY_MOD_ADDER) % 7;  /* E5.1 Section 15.9.1.6 */
+	parts[DUK_DATE_IDX_WEEKDAY] = (t2 + 4 + DUK__WEEKDAY_MOD_ADDER) % 7; /* E5.1 Section 15.9.1.6 */
 	DUK_ASSERT(parts[DUK_DATE_IDX_WEEKDAY] >= 0 && parts[DUK_DATE_IDX_WEEKDAY] <= 6);
 
 	year = duk__year_from_day(t2, &day_in_year);
@@ -30202,8 +33404,7 @@ DUK_INTERNAL void duk_bi_date_timeval_to_parts(duk_double_t d, duk_int_t *parts,
 		if (month == 1 && is_leap) {
 			dim++;
 		}
-		DUK_DDD(DUK_DDDPRINT("month=%ld, dim=%ld, day=%ld",
-		                     (long) month, (long) dim, (long) day));
+		DUK_DDD(DUK_DDDPRINT("month=%ld, dim=%ld, day=%ld", (long) month, (long) dim, (long) day));
 		if (day < dim) {
 			break;
 		}
@@ -30228,9 +33429,9 @@ DUK_INTERNAL void duk_bi_date_timeval_to_parts(duk_double_t d, duk_int_t *parts,
 	if ((flags & DUK_DATE_FLAG_EQUIVYEAR) && (year < 1971 || year > 2037)) {
 		DUK_ASSERT(is_leap == 0 || is_leap == 1);
 
-		jan1_since_epoch = day_since_epoch - day_in_year;  /* day number for Jan 1 since epoch */
+		jan1_since_epoch = day_since_epoch - day_in_year; /* day number for Jan 1 since epoch */
 		DUK_ASSERT(jan1_since_epoch + DUK__WEEKDAY_MOD_ADDER >= 0);
-		jan1_weekday = (jan1_since_epoch + 4 + DUK__WEEKDAY_MOD_ADDER) % 7;  /* E5.1 Section 15.9.1.6 */
+		jan1_weekday = (jan1_since_epoch + 4 + DUK__WEEKDAY_MOD_ADDER) % 7; /* E5.1 Section 15.9.1.6 */
 		DUK_ASSERT(jan1_weekday >= 0 && jan1_weekday <= 6);
 		arridx = jan1_weekday;
 		if (is_leap) {
@@ -30242,8 +33443,12 @@ DUK_INTERNAL void duk_bi_date_timeval_to_parts(duk_double_t d, duk_int_t *parts,
 		year = equiv_year;
 		DUK_DDD(DUK_DDDPRINT("equiv year mapping, year=%ld, day_in_year=%ld, day_since_epoch=%ld, "
 		                     "jan1_since_epoch=%ld, jan1_weekday=%ld -> equiv year %ld",
-		                     (long) year, (long) day_in_year, (long) day_since_epoch,
-		                     (long) jan1_since_epoch, (long) jan1_weekday, (long) equiv_year));
+		                     (long) year,
+		                     (long) day_in_year,
+		                     (long) day_since_epoch,
+		                     (long) jan1_since_epoch,
+		                     (long) jan1_weekday,
+		                     (long) equiv_year));
 	}
 
 	parts[DUK_DATE_IDX_YEAR] = year;
@@ -30251,8 +33456,8 @@ DUK_INTERNAL void duk_bi_date_timeval_to_parts(duk_double_t d, duk_int_t *parts,
 	parts[DUK_DATE_IDX_DAY] = day;
 
 	if (flags & DUK_DATE_FLAG_ONEBASED) {
-		parts[DUK_DATE_IDX_MONTH]++;  /* zero-based -> one-based */
-		parts[DUK_DATE_IDX_DAY]++;    /* -""- */
+		parts[DUK_DATE_IDX_MONTH]++; /* zero-based -> one-based */
+		parts[DUK_DATE_IDX_DAY]++; /* -""- */
 	}
 
 	if (dparts != NULL) {
@@ -30332,8 +33537,7 @@ DUK_INTERNAL duk_double_t duk_bi_date_get_timeval_from_dparts(duk_double_t *dpar
 	/* MakeDate */
 	d = tmp_day * ((duk_double_t) DUK_DATE_MSEC_DAY) + tmp_time;
 
-	DUK_DDD(DUK_DDDPRINT("time=%lf day=%lf --> timeval=%lf",
-	                     (double) tmp_time, (double) tmp_day, (double) d));
+	DUK_DDD(DUK_DDDPRINT("time=%lf day=%lf --> timeval=%lf", (double) tmp_time, (double) tmp_day, (double) d));
 
 	/* Optional UTC conversion. */
 	if (flags & DUK_DATE_FLAG_LOCALTIME) {
@@ -30363,16 +33567,22 @@ DUK_INTERNAL duk_double_t duk_bi_date_get_timeval_from_dparts(duk_double_t *dpar
 
 		/* Iteration solution */
 		tzoff = 0;
-		tzoffprev1 = 999999999L;  /* invalid value which never matches */
+		tzoffprev1 = 999999999L; /* invalid value which never matches */
 		for (i = 0; i < DUK__LOCAL_TZOFFSET_MAXITER; i++) {
 			tzoffprev2 = tzoffprev1;
 			tzoffprev1 = tzoff;
 			tzoff = DUK_USE_DATE_GET_LOCAL_TZOFFSET(d - tzoff * 1000L);
 			DUK_DDD(DUK_DDDPRINT("tzoffset iteration, i=%d, tzoff=%ld, tzoffprev1=%ld tzoffprev2=%ld",
-			                     (int) i, (long) tzoff, (long) tzoffprev1, (long) tzoffprev2));
+			                     (int) i,
+			                     (long) tzoff,
+			                     (long) tzoffprev1,
+			                     (long) tzoffprev2));
 			if (tzoff == tzoffprev1) {
 				DUK_DDD(DUK_DDDPRINT("tzoffset iteration finished, i=%d, tzoff=%ld, tzoffprev1=%ld, tzoffprev2=%ld",
-				                     (int) i, (long) tzoff, (long) tzoffprev1, (long) tzoffprev2));
+				                     (int) i,
+				                     (long) tzoff,
+				                     (long) tzoffprev1,
+				                     (long) tzoffprev2));
 				break;
 			} else if (tzoff == tzoffprev2) {
 				/* Two value cycle, see e.g. test-bi-date-tzoffset-basic-fi.js.
@@ -30380,8 +33590,12 @@ DUK_INTERNAL duk_double_t duk_bi_date_get_timeval_from_dparts(duk_double_t *dpar
 				 * result which is independent of iteration count.  Not sure if
 				 * this is a generically correct solution.
 				 */
-				DUK_DDD(DUK_DDDPRINT("tzoffset iteration two-value cycle, i=%d, tzoff=%ld, tzoffprev1=%ld, tzoffprev2=%ld",
-				                     (int) i, (long) tzoff, (long) tzoffprev1, (long) tzoffprev2));
+				DUK_DDD(DUK_DDDPRINT(
+				    "tzoffset iteration two-value cycle, i=%d, tzoff=%ld, tzoffprev1=%ld, tzoffprev2=%ld",
+				    (int) i,
+				    (long) tzoff,
+				    (long) tzoffprev1,
+				    (long) tzoffprev2));
 				if (tzoffprev1 > tzoff) {
 					tzoff = tzoffprev1;
 				}
@@ -30412,13 +33626,13 @@ DUK_LOCAL duk_double_t duk__push_this_get_timeval_tzoffset(duk_hthread *thr, duk
 	duk_int_t tzoffset = 0;
 
 	duk_push_this(thr);
-	h = duk_get_hobject(thr, -1);  /* XXX: getter with class check, useful in built-ins */
+	h = duk_get_hobject(thr, -1); /* XXX: getter with class check, useful in built-ins */
 	if (h == NULL || DUK_HOBJECT_GET_CLASS_NUMBER(h) != DUK_HOBJECT_CLASS_DATE) {
 		DUK_ERROR_TYPE(thr, "expected Date");
 		DUK_WO_NORETURN(return 0.0;);
 	}
 
-	duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_INT_VALUE);
+	duk_xget_owndataprop_stridx_short(thr, -1, DUK_STRIDX_INT_VALUE);
 	d = duk_to_number_m1(thr);
 	duk_pop(thr);
 
@@ -30438,7 +33652,7 @@ DUK_LOCAL duk_double_t duk__push_this_get_timeval_tzoffset(duk_hthread *thr, duk
 		/* Note: DST adjustment is determined using UTC time.
 		 * If 'd' is NaN, tzoffset will be 0.
 		 */
-		tzoffset = DUK_USE_DATE_GET_LOCAL_TZOFFSET(d);  /* seconds */
+		tzoffset = DUK_USE_DATE_GET_LOCAL_TZOFFSET(d); /* seconds */
 		d += tzoffset * 1000L;
 	}
 	if (out_tzoffset) {
@@ -30463,18 +33677,22 @@ DUK_LOCAL duk_ret_t duk__set_this_timeval_from_dparts(duk_hthread *thr, duk_doub
 	/* [ ... this ] */
 
 	d = duk_bi_date_get_timeval_from_dparts(dparts, flags);
-	duk_push_number(thr, d);  /* -> [ ... this timeval_new ] */
-	duk_dup_top(thr);         /* -> [ ... this timeval_new timeval_new ] */
-	duk_put_prop_stridx_short(thr, -3, DUK_STRIDX_INT_VALUE);
+	duk_push_number(thr, d); /* -> [ ... this timeval_new ] */
+	duk_dup_top(thr); /* -> [ ... this timeval_new timeval_new ] */
 
-	/* stack top: new time value, return 1 to allow tail calls */
+	/* Must force write because e.g. .setYear() must work even when
+	 * the Date instance is frozen.
+	 */
+	duk_xdef_prop_stridx_short(thr, -3, DUK_STRIDX_INT_VALUE, DUK_PROPDESC_FLAGS_W);
+
+	/* Stack top: new time value, return 1 to allow tail calls. */
 	return 1;
 }
 
 /* 'out_buf' must be at least DUK_BI_DATE_ISO8601_BUFSIZE long. */
 DUK_LOCAL void duk__format_parts_iso8601(duk_int_t *parts, duk_int_t tzoffset, duk_small_uint_t flags, duk_uint8_t *out_buf) {
-	char yearstr[8];   /* "-123456\0" */
-	char tzstr[8];     /* "+11:22\0" */
+	char yearstr[8]; /* "-123456\0" */
+	char tzstr[8]; /* "+11:22\0" */
 	char sep = (flags & DUK_DATE_FLAG_SEP_T) ? DUK_ASC_UC_T : DUK_ASC_SPACE;
 
 	DUK_ASSERT(parts[DUK_DATE_IDX_MONTH] >= 1 && parts[DUK_DATE_IDX_MONTH] <= 12);
@@ -30486,8 +33704,9 @@ DUK_LOCAL void duk__format_parts_iso8601(duk_int_t *parts, duk_int_t tzoffset, d
 	 */
 	DUK_SNPRINTF(yearstr,
 	             sizeof(yearstr),
-	             (parts[DUK_DATE_IDX_YEAR] >= 0 && parts[DUK_DATE_IDX_YEAR] <= 9999) ? "%04ld" :
-	                    ((parts[DUK_DATE_IDX_YEAR] >= 0) ? "+%06ld" : "%07ld"),
+	             (parts[DUK_DATE_IDX_YEAR] >= 0 && parts[DUK_DATE_IDX_YEAR] <= 9999) ?
+                         "%04ld" :
+                         ((parts[DUK_DATE_IDX_YEAR] >= 0) ? "+%06ld" : "%07ld"),
 	             (long) parts[DUK_DATE_IDX_YEAR]);
 	yearstr[sizeof(yearstr) - 1] = (char) 0;
 
@@ -30508,8 +33727,9 @@ DUK_LOCAL void duk__format_parts_iso8601(duk_int_t *parts, duk_int_t tzoffset, d
 		tmp = tmp / 60;
 		arg_hours = tmp / 60;
 		arg_minutes = tmp % 60;
-		DUK_ASSERT(arg_hours <= 24);  /* Even less is actually guaranteed for a valid tzoffset. */
-		arg_hours = arg_hours & 0x3f;  /* For [0,24] this is a no-op, but fixes GCC 7 warning, see https://github.com/svaarala/duktape/issues/1602. */
+		DUK_ASSERT(arg_hours <= 24); /* Even less is actually guaranteed for a valid tzoffset. */
+		arg_hours = arg_hours & 0x3f; /* For [0,24] this is a no-op, but fixes GCC 7 warning, see
+		                                 https://github.com/svaarala/duktape/issues/1602. */
 
 		DUK_SNPRINTF(tzstr, sizeof(tzstr), fmt, (int) arg_hours, (int) arg_minutes);
 		tzstr[sizeof(tzstr) - 1] = (char) 0;
@@ -30522,18 +33742,31 @@ DUK_LOCAL void duk__format_parts_iso8601(duk_int_t *parts, duk_int_t tzoffset, d
 	 * is portable.
 	 */
 	if ((flags & DUK_DATE_FLAG_TOSTRING_DATE) && (flags & DUK_DATE_FLAG_TOSTRING_TIME)) {
-		DUK_SPRINTF((char *) out_buf, "%s-%02d-%02d%c%02d:%02d:%02d.%03d%s",
-		            (const char *) yearstr, (int) parts[DUK_DATE_IDX_MONTH], (int) parts[DUK_DATE_IDX_DAY], (int) sep,
-		            (int) parts[DUK_DATE_IDX_HOUR], (int) parts[DUK_DATE_IDX_MINUTE],
-		            (int) parts[DUK_DATE_IDX_SECOND], (int) parts[DUK_DATE_IDX_MILLISECOND], (const char *) tzstr);
+		DUK_SPRINTF((char *) out_buf,
+		            "%s-%02d-%02d%c%02d:%02d:%02d.%03d%s",
+		            (const char *) yearstr,
+		            (int) parts[DUK_DATE_IDX_MONTH],
+		            (int) parts[DUK_DATE_IDX_DAY],
+		            (int) sep,
+		            (int) parts[DUK_DATE_IDX_HOUR],
+		            (int) parts[DUK_DATE_IDX_MINUTE],
+		            (int) parts[DUK_DATE_IDX_SECOND],
+		            (int) parts[DUK_DATE_IDX_MILLISECOND],
+		            (const char *) tzstr);
 	} else if (flags & DUK_DATE_FLAG_TOSTRING_DATE) {
-		DUK_SPRINTF((char *) out_buf, "%s-%02d-%02d",
-		            (const char *) yearstr, (int) parts[DUK_DATE_IDX_MONTH], (int) parts[DUK_DATE_IDX_DAY]);
+		DUK_SPRINTF((char *) out_buf,
+		            "%s-%02d-%02d",
+		            (const char *) yearstr,
+		            (int) parts[DUK_DATE_IDX_MONTH],
+		            (int) parts[DUK_DATE_IDX_DAY]);
 	} else {
 		DUK_ASSERT(flags & DUK_DATE_FLAG_TOSTRING_TIME);
-		DUK_SPRINTF((char *) out_buf, "%02d:%02d:%02d.%03d%s",
-		            (int) parts[DUK_DATE_IDX_HOUR], (int) parts[DUK_DATE_IDX_MINUTE],
-		            (int) parts[DUK_DATE_IDX_SECOND], (int) parts[DUK_DATE_IDX_MILLISECOND],
+		DUK_SPRINTF((char *) out_buf,
+		            "%02d:%02d:%02d.%03d%s",
+		            (int) parts[DUK_DATE_IDX_HOUR],
+		            (int) parts[DUK_DATE_IDX_MINUTE],
+		            (int) parts[DUK_DATE_IDX_SECOND],
+		            (int) parts[DUK_DATE_IDX_MILLISECOND],
 		            (const char *) tzstr);
 	}
 }
@@ -30545,11 +33778,11 @@ DUK_LOCAL void duk__format_parts_iso8601(duk_int_t *parts, duk_int_t tzoffset, d
 DUK_LOCAL duk_ret_t duk__to_string_helper(duk_hthread *thr, duk_small_uint_t flags) {
 	duk_double_t d;
 	duk_int_t parts[DUK_DATE_IDX_NUM_PARTS];
-	duk_int_t tzoffset;  /* seconds, doesn't fit into 16 bits */
+	duk_int_t tzoffset; /* seconds, doesn't fit into 16 bits */
 	duk_bool_t rc;
 	duk_uint8_t buf[DUK_BI_DATE_ISO8601_BUFSIZE];
 
-	DUK_UNREF(rc);  /* unreferenced with some options */
+	DUK_UNREF(rc); /* unreferenced with some options */
 
 	d = duk__push_this_get_timeval_tzoffset(thr, flags, &tzoffset);
 	if (DUK_ISNAN(d)) {
@@ -30601,9 +33834,9 @@ DUK_LOCAL duk_ret_t duk__to_string_helper(duk_hthread *thr, duk_small_uint_t fla
 DUK_LOCAL duk_ret_t duk__get_part_helper(duk_hthread *thr, duk_small_uint_t flags_and_idx) {
 	duk_double_t d;
 	duk_int_t parts[DUK_DATE_IDX_NUM_PARTS];
-	duk_small_uint_t idx_part = (duk_small_uint_t) (flags_and_idx >> DUK_DATE_FLAG_VALUE_SHIFT);  /* unpack args */
+	duk_small_uint_t idx_part = (duk_small_uint_t) (flags_and_idx >> DUK_DATE_FLAG_VALUE_SHIFT); /* unpack args */
 
-	DUK_ASSERT_DISABLE(idx_part >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(idx_part >= 0); /* unsigned */
 	DUK_ASSERT(idx_part < DUK_DATE_IDX_NUM_PARTS);
 
 	d = duk__push_this_get_timeval(thr, flags_and_idx);
@@ -30613,7 +33846,7 @@ DUK_LOCAL duk_ret_t duk__get_part_helper(duk_hthread *thr, duk_small_uint_t flag
 	}
 	DUK_ASSERT(DUK_ISFINITE(d));
 
-	duk_bi_date_timeval_to_parts(d, parts, NULL, flags_and_idx);  /* no need to mask idx portion */
+	duk_bi_date_timeval_to_parts(d, parts, NULL, flags_and_idx); /* no need to mask idx portion */
 
 	/* Setter APIs detect special year numbers (0...99) and apply a +1900
 	 * only in certain cases.  The legacy getYear() getter applies -1900
@@ -30635,7 +33868,7 @@ DUK_LOCAL duk_ret_t duk__set_part_helper(duk_hthread *thr, duk_small_uint_t flag
 	duk_int_t parts[DUK_DATE_IDX_NUM_PARTS];
 	duk_double_t dparts[DUK_DATE_IDX_NUM_PARTS];
 	duk_idx_t nargs;
-	duk_small_uint_t maxnargs = (duk_small_uint_t) (flags_and_maxnargs >> DUK_DATE_FLAG_VALUE_SHIFT);  /* unpack args */
+	duk_small_uint_t maxnargs = (duk_small_uint_t) (flags_and_maxnargs >> DUK_DATE_FLAG_VALUE_SHIFT); /* unpack args */
 	duk_small_uint_t idx_first, idx;
 	duk_small_uint_t i;
 
@@ -30682,7 +33915,7 @@ DUK_LOCAL duk_ret_t duk__set_part_helper(duk_hthread *thr, duk_small_uint_t flag
 		DUK_ASSERT(maxnargs >= 1 && maxnargs <= 3);
 		idx_first = DUK_DATE_IDX_DAY - (maxnargs - 1);
 	}
-	DUK_ASSERT_DISABLE(idx_first >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(idx_first >= 0); /* unsigned */
 	DUK_ASSERT(idx_first < DUK_DATE_IDX_NUM_PARTS);
 
 	for (i = 0; i < maxnargs; i++) {
@@ -30691,7 +33924,7 @@ DUK_LOCAL duk_ret_t duk__set_part_helper(duk_hthread *thr, duk_small_uint_t flag
 			break;
 		}
 		idx = idx_first + i;
-		DUK_ASSERT_DISABLE(idx >= 0);  /* unsigned */
+		DUK_ASSERT_DISABLE(idx >= 0); /* unsigned */
 		DUK_ASSERT(idx < DUK_DATE_IDX_NUM_PARTS);
 
 		if (idx == DUK_DATE_IDX_YEAR && (flags_and_maxnargs & DUK_DATE_FLAG_YEAR_FIXUP)) {
@@ -30743,7 +33976,7 @@ DUK_LOCAL void duk__twodigit_year_fixup(duk_hthread *thr, duk_idx_t idx_val) {
 	}
 	duk_dup(thr, idx_val);
 	duk_to_int(thr, -1);
-	d = duk_get_number(thr, -1);  /* get as double to handle huge numbers correctly */
+	d = duk_get_number(thr, -1); /* get as double to handle huge numbers correctly */
 	if (d >= 0.0 && d <= 99.0) {
 		d += 1900.0;
 		duk_push_number(thr, d);
@@ -30791,10 +34024,14 @@ DUK_LOCAL void duk__set_parts_from_args(duk_hthread *thr, duk_double_t *dparts,
 	}
 
 	DUK_DDD(DUK_DDDPRINT("parts from args -> %lf %lf %lf %lf %lf %lf %lf %lf",
-	                     (double) dparts[0], (double) dparts[1],
-	                     (double) dparts[2], (double) dparts[3],
-	                     (double) dparts[4], (double) dparts[5],
-	                     (double) dparts[6], (double) dparts[7]));
+	                     (double) dparts[0],
+	                     (double) dparts[1],
+	                     (double) dparts[2],
+	                     (double) dparts[3],
+	                     (double) dparts[4],
+	                     (double) dparts[5],
+	                     (double) dparts[6],
+	                     (double) dparts[7]));
 }
 
 /*
@@ -30950,9 +34187,8 @@ DUK_INTERNAL duk_ret_t duk_bi_date_constructor(duk_hthread *thr) {
 	DUK_DDD(DUK_DDDPRINT("Date constructor, nargs=%ld, is_cons=%ld", (long) nargs, (long) is_cons));
 
 	(void) duk_push_object_helper(thr,
-	                              DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                              DUK_HOBJECT_FLAG_FASTREFS |
-	                              DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DATE),
+	                              DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS |
+	                                  DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DATE),
 	                              DUK_BIDX_DATE_PROTOTYPE);
 
 	/* Unlike most built-ins, the internal [[PrimitiveValue]] of a Date
@@ -30974,9 +34210,9 @@ DUK_INTERNAL duk_ret_t duk_bi_date_constructor(duk_hthread *thr) {
 		str = duk_get_string_notsymbol(thr, 0);
 		if (str) {
 			duk__parse_string(thr, str);
-			duk_replace(thr, 0);  /* may be NaN */
+			duk_replace(thr, 0); /* may be NaN */
 		}
-		d = duk__timeclip(duk_to_number(thr, 0));  /* symbols fail here */
+		d = duk__timeclip(duk_to_number(thr, 0)); /* symbols fail here */
 		duk_push_number(thr, d);
 		duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_INT_VALUE, DUK_PROPDESC_FLAGS_W);
 		return 1;
@@ -30986,8 +34222,8 @@ DUK_INTERNAL duk_ret_t duk_bi_date_constructor(duk_hthread *thr) {
 
 	/* Parts are in local time, convert when setting. */
 
-	(void) duk__set_this_timeval_from_dparts(thr, dparts, DUK_DATE_FLAG_LOCALTIME /*flags*/);  /* -> [ ... this timeval ] */
-	duk_pop(thr);  /* -> [ ... this ] */
+	(void) duk__set_this_timeval_from_dparts(thr, dparts, DUK_DATE_FLAG_LOCALTIME /*flags*/); /* -> [ ... this timeval ] */
+	duk_pop(thr); /* -> [ ... this ] */
 	return 1;
 }
 
@@ -31018,7 +34254,7 @@ DUK_INTERNAL duk_ret_t duk_bi_date_constructor_now(duk_hthread *thr) {
 	duk_double_t d;
 
 	d = duk_time_get_ecmascript_time_nofrac(thr);
-	DUK_ASSERT(duk__timeclip(d) == d);  /* TimeClip() should never be necessary */
+	DUK_ASSERT(duk_double_equals(duk__timeclip(d), d)); /* TimeClip() should never be necessary */
 	duk_push_number(thr, d);
 	return 1;
 }
@@ -31067,7 +34303,7 @@ DUK_INTERNAL duk_ret_t duk_bi_date_prototype_value_of(duk_hthread *thr) {
 	 * as their behavior is identical.
 	 */
 
-	duk_double_t d = duk__push_this_get_timeval(thr, 0 /*flags*/);  /* -> [ this ] */
+	duk_double_t d = duk__push_this_get_timeval(thr, 0 /*flags*/); /* -> [ this ] */
 	DUK_ASSERT(DUK_ISFINITE(d) || DUK_ISNAN(d));
 	duk_push_number(thr, d);
 	return 1;
@@ -31093,7 +34329,7 @@ DUK_INTERNAL duk_ret_t duk_bi_date_prototype_to_json(duk_hthread *thr) {
 	duk_pop(thr);
 
 	duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_TO_ISO_STRING);
-	duk_dup_m2(thr);  /* -> [ O toIsoString O ] */
+	duk_dup_m2(thr); /* -> [ O toIsoString O ] */
 	duk_call_method(thr, 0);
 	return 1;
 }
@@ -31236,7 +34472,11 @@ DUK_INTERNAL duk_ret_t duk_bi_date_prototype_set_time(duk_hthread *thr) {
 	d = duk__timeclip(duk_to_number(thr, 0));
 	duk_push_number(thr, d);
 	duk_dup_top(thr);
-	duk_put_prop_stridx_short(thr, -3, DUK_STRIDX_INT_VALUE); /* -> [ timeval this timeval ] */
+	/* Must force write because .setTime() must work even when
+	 * the Date instance is frozen.
+	 */
+	duk_xdef_prop_stridx_short(thr, -3, DUK_STRIDX_INT_VALUE, DUK_PROPDESC_FLAGS_W);
+	/* -> [ timeval this timeval ] */
 
 	return 1;
 }
@@ -31262,8 +34502,7 @@ DUK_INTERNAL duk_ret_t duk_bi_date_prototype_toprimitive(duk_hthread *thr) {
 	DUK_ASSERT_TOP(thr, 2);
 
 	hintstr = duk_require_lstring(thr, 0, &hintlen);
-	if ((hintlen == 6 && DUK_STRCMP(hintstr, "string") == 0) ||
-	    (hintlen == 7 && DUK_STRCMP(hintstr, "default") == 0)) {
+	if ((hintlen == 6 && DUK_STRCMP(hintstr, "string") == 0) || (hintlen == 7 && DUK_STRCMP(hintstr, "default") == 0)) {
 		hint = DUK_HINT_STRING;
 	} else if (hintlen == 6 && DUK_STRCMP(hintstr, "number") == 0) {
 		hint = DUK_HINT_NUMBER;
@@ -31274,9 +34513,9 @@ DUK_INTERNAL duk_ret_t duk_bi_date_prototype_toprimitive(duk_hthread *thr) {
 	duk_to_primitive_ordinary(thr, -1, hint);
 	return 1;
 }
-#endif  /* DUK_USE_SYMBOL_BUILTIN */
+#endif /* DUK_USE_SYMBOL_BUILTIN */
 
-#endif  /* DUK_USE_DATE_BUILTIN */
+#endif /* DUK_USE_DATE_BUILTIN */
 
 /* automatic undefs */
 #undef DUK__CF_ACCEPT
@@ -31339,8 +34578,8 @@ DUK_INTERNAL duk_ret_t duk_bi_date_prototype_toprimitive(duk_hthread *thr) {
 /* Buffer sizes for some UNIX calls.  Larger than strictly necessary
  * to avoid Valgrind errors.
  */
-#define DUK__STRPTIME_BUF_SIZE  64
-#define DUK__STRFTIME_BUF_SIZE  64
+#define DUK__STRPTIME_BUF_SIZE 64
+#define DUK__STRFTIME_BUF_SIZE 64
 
 #if defined(DUK_USE_DATE_NOW_GETTIMEOFDAY)
 /* Get current ECMAScript time (= UNIX/Posix time, but in milliseconds). */
@@ -31354,12 +34593,11 @@ DUK_INTERNAL duk_double_t duk_bi_date_get_now_gettimeofday(void) {
 	}
 
 	/* As of Duktape 2.2.0 allow fractions. */
-	d = ((duk_double_t) tv.tv_sec) * 1000.0 +
-	    ((duk_double_t) tv.tv_usec) / 1000.0;
+	d = ((duk_double_t) tv.tv_sec) * 1000.0 + ((duk_double_t) tv.tv_usec) / 1000.0;
 
 	return d;
 }
-#endif  /* DUK_USE_DATE_NOW_GETTIMEOFDAY */
+#endif /* DUK_USE_DATE_NOW_GETTIMEOFDAY */
 
 #if defined(DUK_USE_DATE_NOW_TIME)
 /* Not a very good provider: only full seconds are available. */
@@ -31373,7 +34611,7 @@ DUK_INTERNAL duk_double_t duk_bi_date_get_now_time(void) {
 	}
 	return ((duk_double_t) t) * 1000.0;
 }
-#endif  /* DUK_USE_DATE_NOW_TIME */
+#endif /* DUK_USE_DATE_NOW_TIME */
 
 #if defined(DUK_USE_DATE_TZO_GMTIME) || defined(DUK_USE_DATE_TZO_GMTIME_R) || defined(DUK_USE_DATE_TZO_GMTIME_S)
 /* Get local time offset (in seconds) for a certain (UTC) instant 'd'. */
@@ -31456,7 +34694,7 @@ DUK_INTERNAL duk_int_t duk_bi_date_get_local_tzoffset_gmtime(duk_double_t d) {
 	DUK_ASSERT(parts[DUK_DATE_IDX_YEAR] >= 1970 && parts[DUK_DATE_IDX_YEAR] <= 2038);
 
 	d = duk_bi_date_get_timeval_from_dparts(dparts, 0 /*flags*/);
-	DUK_ASSERT(d >= 0 && d < 2147483648.0 * 1000.0);  /* unsigned 31-bit range */
+	DUK_ASSERT(d >= 0 && d < 2147483648.0 * 1000.0); /* unsigned 31-bit range */
 	t = (time_t) (d / 1000.0);
 	DUK_DDD(DUK_DDDPRINT("timeval: %lf -> time_t %ld", (double) d, (long) t));
 
@@ -31478,14 +34716,26 @@ DUK_INTERNAL duk_int_t duk_bi_date_get_local_tzoffset_gmtime(duk_double_t d) {
 #endif
 	DUK_DDD(DUK_DDDPRINT("gmtime result: tm={sec:%ld,min:%ld,hour:%ld,mday:%ld,mon:%ld,year:%ld,"
 	                     "wday:%ld,yday:%ld,isdst:%ld}",
-	                     (long) tms[0].tm_sec, (long) tms[0].tm_min, (long) tms[0].tm_hour,
-	                     (long) tms[0].tm_mday, (long) tms[0].tm_mon, (long) tms[0].tm_year,
-	                     (long) tms[0].tm_wday, (long) tms[0].tm_yday, (long) tms[0].tm_isdst));
+	                     (long) tms[0].tm_sec,
+	                     (long) tms[0].tm_min,
+	                     (long) tms[0].tm_hour,
+	                     (long) tms[0].tm_mday,
+	                     (long) tms[0].tm_mon,
+	                     (long) tms[0].tm_year,
+	                     (long) tms[0].tm_wday,
+	                     (long) tms[0].tm_yday,
+	                     (long) tms[0].tm_isdst));
 	DUK_DDD(DUK_DDDPRINT("localtime result: tm={sec:%ld,min:%ld,hour:%ld,mday:%ld,mon:%ld,year:%ld,"
 	                     "wday:%ld,yday:%ld,isdst:%ld}",
-	                     (long) tms[1].tm_sec, (long) tms[1].tm_min, (long) tms[1].tm_hour,
-	                     (long) tms[1].tm_mday, (long) tms[1].tm_mon, (long) tms[1].tm_year,
-	                     (long) tms[1].tm_wday, (long) tms[1].tm_yday, (long) tms[1].tm_isdst));
+	                     (long) tms[1].tm_sec,
+	                     (long) tms[1].tm_min,
+	                     (long) tms[1].tm_hour,
+	                     (long) tms[1].tm_mday,
+	                     (long) tms[1].tm_mon,
+	                     (long) tms[1].tm_year,
+	                     (long) tms[1].tm_wday,
+	                     (long) tms[1].tm_yday,
+	                     (long) tms[1].tm_isdst));
 
 	/* tm_isdst is both an input and an output to mktime(), use 0 to
 	 * avoid DST handling in mktime():
@@ -31494,8 +34744,8 @@ DUK_INTERNAL duk_int_t duk_bi_date_get_local_tzoffset_gmtime(duk_double_t d) {
 	 */
 	tms[0].tm_isdst = 0;
 	tms[1].tm_isdst = 0;
-	t1 = mktime(&tms[0]);  /* UTC */
-	t2 = mktime(&tms[1]);  /* local */
+	t1 = mktime(&tms[0]); /* UTC */
+	t2 = mktime(&tms[1]); /* local */
 	if (t1 == (time_t) -1 || t2 == (time_t) -1) {
 		/* This check used to be for (t < 0) but on some platforms
 		 * time_t is unsigned and apparently the proper way to detect
@@ -31518,12 +34768,12 @@ DUK_INTERNAL duk_int_t duk_bi_date_get_local_tzoffset_gmtime(duk_double_t d) {
 #endif
 	return (duk_int_t) difftime(t2, t1);
 
- mktime_error:
+mktime_error:
 	/* XXX: return something more useful, so that caller can throw? */
 	DUK_D(DUK_DPRINT("mktime() failed, d=%lf", (double) d));
 	return 0;
 }
-#endif  /* DUK_USE_DATE_TZO_GMTIME */
+#endif /* DUK_USE_DATE_TZO_GMTIME */
 
 #if defined(DUK_USE_DATE_PRS_STRPTIME)
 DUK_INTERNAL duk_bool_t duk_bi_date_parse_string_strptime(duk_hthread *thr, const char *str) {
@@ -31533,7 +34783,7 @@ DUK_INTERNAL duk_bool_t duk_bi_date_parse_string_strptime(duk_hthread *thr, cons
 
 	/* Copy to buffer with slack to avoid Valgrind gripes from strptime. */
 	DUK_ASSERT(str != NULL);
-	duk_memzero(buf, sizeof(buf));  /* valgrind whine without this */
+	duk_memzero(buf, sizeof(buf)); /* valgrind whine without this */
 	DUK_SNPRINTF(buf, sizeof(buf), "%s", (const char *) str);
 	buf[sizeof(buf) - 1] = (char) 0;
 
@@ -31543,10 +34793,16 @@ DUK_INTERNAL duk_bool_t duk_bi_date_parse_string_strptime(duk_hthread *thr, cons
 	if (strptime((const char *) buf, "%c", &tm) != NULL) {
 		DUK_DDD(DUK_DDDPRINT("before mktime: tm={sec:%ld,min:%ld,hour:%ld,mday:%ld,mon:%ld,year:%ld,"
 		                     "wday:%ld,yday:%ld,isdst:%ld}",
-		                     (long) tm.tm_sec, (long) tm.tm_min, (long) tm.tm_hour,
-		                     (long) tm.tm_mday, (long) tm.tm_mon, (long) tm.tm_year,
-		                     (long) tm.tm_wday, (long) tm.tm_yday, (long) tm.tm_isdst));
-		tm.tm_isdst = -1;  /* negative: dst info not available */
+		                     (long) tm.tm_sec,
+		                     (long) tm.tm_min,
+		                     (long) tm.tm_hour,
+		                     (long) tm.tm_mday,
+		                     (long) tm.tm_mon,
+		                     (long) tm.tm_year,
+		                     (long) tm.tm_wday,
+		                     (long) tm.tm_yday,
+		                     (long) tm.tm_isdst));
+		tm.tm_isdst = -1; /* negative: dst info not available */
 
 		t = mktime(&tm);
 		DUK_DDD(DUK_DDDPRINT("mktime() -> %ld", (long) t));
@@ -31558,7 +34814,7 @@ DUK_INTERNAL duk_bool_t duk_bi_date_parse_string_strptime(duk_hthread *thr, cons
 
 	return 0;
 }
-#endif  /* DUK_USE_DATE_PRS_STRPTIME */
+#endif /* DUK_USE_DATE_PRS_STRPTIME */
 
 #if defined(DUK_USE_DATE_PRS_GETDATE)
 DUK_INTERNAL duk_bool_t duk_bi_date_parse_string_getdate(duk_hthread *thr, const char *str) {
@@ -31585,10 +34841,13 @@ DUK_INTERNAL duk_bool_t duk_bi_date_parse_string_getdate(duk_hthread *thr, const
 
 	return 0;
 }
-#endif  /* DUK_USE_DATE_PRS_GETDATE */
+#endif /* DUK_USE_DATE_PRS_GETDATE */
 
 #if defined(DUK_USE_DATE_FMT_STRFTIME)
-DUK_INTERNAL duk_bool_t duk_bi_date_format_parts_strftime(duk_hthread *thr, duk_int_t *parts, duk_int_t tzoffset, duk_small_uint_t flags) {
+DUK_INTERNAL duk_bool_t duk_bi_date_format_parts_strftime(duk_hthread *thr,
+                                                          duk_int_t *parts,
+                                                          duk_int_t tzoffset,
+                                                          duk_small_uint_t flags) {
 	char buf[DUK__STRFTIME_BUF_SIZE];
 	struct tm tm;
 	const char *fmt;
@@ -31606,8 +34865,7 @@ DUK_INTERNAL duk_bool_t duk_bi_date_format_parts_strftime(duk_hthread *thr, duk_
 	 * probably not an accurate guarantee of strftime() supporting or not
 	 * supporting a large time range (the full ECMAScript range).
 	 */
-	if (sizeof(time_t) < 8 &&
-	    (parts[DUK_DATE_IDX_YEAR] < 1970 || parts[DUK_DATE_IDX_YEAR] > 2037)) {
+	if (sizeof(time_t) < 8 && (parts[DUK_DATE_IDX_YEAR] < 1970 || parts[DUK_DATE_IDX_YEAR] > 2037)) {
 		/* be paranoid for 32-bit time values (even avoiding negative ones) */
 		return 0;
 	}
@@ -31616,8 +34874,8 @@ DUK_INTERNAL duk_bool_t duk_bi_date_format_parts_strftime(duk_hthread *thr, duk_
 	tm.tm_sec = parts[DUK_DATE_IDX_SECOND];
 	tm.tm_min = parts[DUK_DATE_IDX_MINUTE];
 	tm.tm_hour = parts[DUK_DATE_IDX_HOUR];
-	tm.tm_mday = parts[DUK_DATE_IDX_DAY];       /* already one-based */
-	tm.tm_mon = parts[DUK_DATE_IDX_MONTH] - 1;  /* one-based -> zero-based */
+	tm.tm_mday = parts[DUK_DATE_IDX_DAY]; /* already one-based */
+	tm.tm_mon = parts[DUK_DATE_IDX_MONTH] - 1; /* one-based -> zero-based */
 	tm.tm_year = parts[DUK_DATE_IDX_YEAR] - 1900;
 	tm.tm_wday = parts[DUK_DATE_IDX_WEEKDAY];
 	tm.tm_isdst = 0;
@@ -31637,7 +34895,7 @@ DUK_INTERNAL duk_bool_t duk_bi_date_format_parts_strftime(duk_hthread *thr, duk_
 	duk_push_string(thr, buf);
 	return 1;
 }
-#endif  /* DUK_USE_DATE_FMT_STRFTIME */
+#endif /* DUK_USE_DATE_FMT_STRFTIME */
 
 #if defined(DUK_USE_GET_MONOTONIC_TIME_CLOCK_GETTIME)
 DUK_INTERNAL duk_double_t duk_bi_date_get_monotonic_time_clock_gettime(void) {
@@ -31685,20 +34943,20 @@ DUK_LOCAL void duk__convert_filetime_to_ularge(const FILETIME *ft, ULARGE_INTEGE
 	res->LowPart = ft->dwLowDateTime;
 	res->HighPart = ft->dwHighDateTime;
 }
-#endif  /* DUK_USE_DATE_NOW_WINDOWS_SUBMS */
+#endif /* DUK_USE_DATE_NOW_WINDOWS_SUBMS */
 
 DUK_LOCAL void duk__set_systime_jan1970(SYSTEMTIME *st) {
 	duk_memzero((void *) st, sizeof(*st));
 	st->wYear = 1970;
 	st->wMonth = 1;
-	st->wDayOfWeek = 4;  /* not sure whether or not needed; Thursday */
+	st->wDayOfWeek = 4; /* not sure whether or not needed; Thursday */
 	st->wDay = 1;
 	DUK_ASSERT(st->wHour == 0);
 	DUK_ASSERT(st->wMinute == 0);
 	DUK_ASSERT(st->wSecond == 0);
 	DUK_ASSERT(st->wMilliseconds == 0);
 }
-#endif  /* defined(DUK_USE_DATE_NOW_WINDOWS) || defined(DUK_USE_DATE_TZO_WINDOWS) */
+#endif /* defined(DUK_USE_DATE_NOW_WINDOWS) || defined(DUK_USE_DATE_TZO_WINDOWS) */
 
 #if defined(DUK_USE_DATE_NOW_WINDOWS)
 DUK_INTERNAL duk_double_t duk_bi_date_get_now_windows(void) {
@@ -31720,7 +34978,7 @@ DUK_INTERNAL duk_double_t duk_bi_date_get_now_windows(void) {
 	 */
 	return (duk_double_t) ((LONGLONG) tmp1.QuadPart - (LONGLONG) tmp2.QuadPart) / 10000.0;
 }
-#endif  /* DUK_USE_DATE_NOW_WINDOWS */
+#endif /* DUK_USE_DATE_NOW_WINDOWS */
 
 #if defined(DUK_USE_DATE_NOW_WINDOWS_SUBMS)
 DUK_INTERNAL duk_double_t duk_bi_date_get_now_windows_subms(void) {
@@ -31742,7 +35000,7 @@ DUK_INTERNAL duk_double_t duk_bi_date_get_now_windows_subms(void) {
 	 */
 	return (duk_double_t) ((LONGLONG) tmp1.QuadPart - (LONGLONG) tmp2.QuadPart) / 10000.0;
 }
-#endif  /* DUK_USE_DATE_NOW_WINDOWS */
+#endif /* DUK_USE_DATE_NOW_WINDOWS */
 
 #if defined(DUK_USE_DATE_TZO_WINDOWS)
 DUK_INTERNAL duk_int_t duk_bi_date_get_local_tzoffset_windows(duk_double_t d) {
@@ -31753,7 +35011,6 @@ DUK_INTERNAL duk_int_t duk_bi_date_get_local_tzoffset_windows(duk_double_t d) {
 	ULARGE_INTEGER tmp2;
 	ULARGE_INTEGER tmp3;
 	FILETIME ft1;
-	BOOL ret;
 
 	/* XXX: handling of timestamps outside Windows supported range.
 	 * How does Windows deal with dates before 1600?  Does windows
@@ -31768,13 +35025,12 @@ DUK_INTERNAL duk_int_t duk_bi_date_get_local_tzoffset_windows(duk_double_t d) {
 
 	duk__set_systime_jan1970(&st1);
 	duk__convert_systime_to_ularge((const SYSTEMTIME *) &st1, &tmp1);
-	tmp2.QuadPart = (ULONGLONG) (d * 10000.0);  /* millisec -> 100ns units since jan 1, 1970 */
-	tmp2.QuadPart += tmp1.QuadPart;             /* input 'd' in Windows UTC, 100ns units */
+	tmp2.QuadPart = (ULONGLONG) (d * 10000.0); /* millisec -> 100ns units since jan 1, 1970 */
+	tmp2.QuadPart += tmp1.QuadPart; /* input 'd' in Windows UTC, 100ns units */
 
 	ft1.dwLowDateTime = tmp2.LowPart;
 	ft1.dwHighDateTime = tmp2.HighPart;
-	ret = FileTimeToSystemTime((const FILETIME *) &ft1, &st2);
-	if (!ret) {
+	if (FileTimeToSystemTime((const FILETIME *) &ft1, &st2) == 0) {
 		DUK_D(DUK_DPRINT("FileTimeToSystemTime() failed, return tzoffset 0"));
 		return 0;
 	}
@@ -31785,9 +35041,9 @@ DUK_INTERNAL duk_int_t duk_bi_date_get_local_tzoffset_windows(duk_double_t d) {
 	duk__convert_systime_to_ularge((const SYSTEMTIME *) &st3, &tmp3);
 
 	/* Positive if local time ahead of UTC. */
-	return (duk_int_t) (((LONGLONG) tmp3.QuadPart - (LONGLONG) tmp2.QuadPart) / DUK_I64_CONSTANT(10000000));  /* seconds */
+	return (duk_int_t) (((LONGLONG) tmp3.QuadPart - (LONGLONG) tmp2.QuadPart) / DUK_I64_CONSTANT(10000000)); /* seconds */
 }
-#endif  /* DUK_USE_DATE_TZO_WINDOWS */
+#endif /* DUK_USE_DATE_TZO_WINDOWS */
 
 #if defined(DUK_USE_DATE_TZO_WINDOWS_NO_DST)
 DUK_INTERNAL duk_int_t duk_bi_date_get_local_tzoffset_windows_no_dst(duk_double_t d) {
@@ -31797,7 +35053,6 @@ DUK_INTERNAL duk_int_t duk_bi_date_get_local_tzoffset_windows_no_dst(duk_double_
 	FILETIME ft2;
 	ULARGE_INTEGER tmp1;
 	ULARGE_INTEGER tmp2;
-	BOOL ret;
 
 	/* Do a similar computation to duk_bi_date_get_local_tzoffset_windows
 	 * but without accounting for daylight savings time.  Use this on
@@ -31813,30 +35068,29 @@ DUK_INTERNAL duk_int_t duk_bi_date_get_local_tzoffset_windows_no_dst(duk_double_
 
 	ft1.dwLowDateTime = tmp1.LowPart;
 	ft1.dwHighDateTime = tmp1.HighPart;
-	ret = FileTimeToLocalFileTime((const FILETIME *) &ft1, &ft2);
-	if (!ret) {
+	if (FileTimeToLocalFileTime((const FILETIME *) &ft1, &ft2) == 0) {
 		DUK_D(DUK_DPRINT("FileTimeToLocalFileTime() failed, return tzoffset 0"));
 		return 0;
 	}
-
-	ret = FileTimeToSystemTime((const FILETIME *) &ft2, &st2);
-	if (!ret) {
+	if (FileTimeToSystemTime((const FILETIME *) &ft2, &st2) == 0) {
 		DUK_D(DUK_DPRINT("FileTimeToSystemTime() failed, return tzoffset 0"));
 		return 0;
 	}
 	duk__convert_systime_to_ularge((const SYSTEMTIME *) &st2, &tmp2);
 
-	return (duk_int_t) (((LONGLONG) tmp2.QuadPart - (LONGLONG) tmp1.QuadPart) / DUK_I64_CONSTANT(10000000));  /* seconds */
+	return (duk_int_t) (((LONGLONG) tmp2.QuadPart - (LONGLONG) tmp1.QuadPart) / DUK_I64_CONSTANT(10000000)); /* seconds */
 }
-#endif  /* DUK_USE_DATE_TZO_WINDOWS_NO_DST */
+#endif /* DUK_USE_DATE_TZO_WINDOWS_NO_DST */
 
 #if defined(DUK_USE_GET_MONOTONIC_TIME_WINDOWS_QPC)
 DUK_INTERNAL duk_double_t duk_bi_date_get_monotonic_time_windows_qpc(void) {
 	LARGE_INTEGER count, freq;
 
 	/* There are legacy issues with QueryPerformanceCounter():
-	 * - Potential jumps: https://support.microsoft.com/en-us/help/274323/performance-counter-value-may-unexpectedly-leap-forward
-	 * - Differences between cores (XP): https://msdn.microsoft.com/en-us/library/windows/desktop/dn553408(v=vs.85).aspx#qpc_support_in_windows_versions
+	 * - Potential jumps:
+	 * https://support.microsoft.com/en-us/help/274323/performance-counter-value-may-unexpectedly-leap-forward
+	 * - Differences between cores (XP):
+	 * https://msdn.microsoft.com/en-us/library/windows/desktop/dn553408(v=vs.85).aspx#qpc_support_in_windows_versions
 	 *
 	 * We avoid these by enabling QPC by default only for Vista or later.
 	 */
@@ -31853,7 +35107,7 @@ DUK_INTERNAL duk_double_t duk_bi_date_get_monotonic_time_windows_qpc(void) {
 		return 0.0;
 	}
 }
-#endif  /* DUK_USE_GET_MONOTONIC_TIME_WINDOWS_QPC */
+#endif /* DUK_USE_GET_MONOTONIC_TIME_WINDOWS_QPC */
 /*
  *  Duktape built-ins
  *
@@ -31916,7 +35170,7 @@ DUK_INTERNAL duk_ret_t duk_bi_duktape_object_fin(duk_hthread *thr) {
 		return 1;
 	}
 }
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 
 DUK_INTERNAL duk_ret_t duk_bi_duktape_object_enc(duk_hthread *thr) {
 	duk_hstring *h_str;
@@ -31926,7 +35180,7 @@ DUK_INTERNAL duk_ret_t duk_bi_duktape_object_enc(duk_hthread *thr) {
 	 * non-existent optional parameters.
 	 */
 
-	h_str = duk_require_hstring(thr, 0);  /* Could reject symbols, but no point: won't match comparisons. */
+	h_str = duk_require_hstring(thr, 0); /* Could reject symbols, but no point: won't match comparisons. */
 	duk_require_valid_index(thr, 1);
 
 	if (h_str == DUK_HTHREAD_STRING_HEX(thr)) {
@@ -31943,9 +35197,8 @@ DUK_INTERNAL duk_ret_t duk_bi_duktape_object_enc(duk_hthread *thr) {
 		                             1 /*idx_value*/,
 		                             2 /*idx_replacer*/,
 		                             3 /*idx_space*/,
-		                             DUK_JSON_FLAG_EXT_CUSTOM |
-		                             DUK_JSON_FLAG_ASCII_ONLY |
-		                             DUK_JSON_FLAG_AVOID_KEY_QUOTES /*flags*/);
+		                             DUK_JSON_FLAG_EXT_CUSTOM | DUK_JSON_FLAG_ASCII_ONLY |
+		                                 DUK_JSON_FLAG_AVOID_KEY_QUOTES /*flags*/);
 #endif
 #if defined(DUK_USE_JSON_SUPPORT) && defined(DUK_USE_JC)
 	} else if (h_str == DUK_HTHREAD_STRING_JC(thr)) {
@@ -31953,8 +35206,7 @@ DUK_INTERNAL duk_ret_t duk_bi_duktape_object_enc(duk_hthread *thr) {
 		                             1 /*idx_value*/,
 		                             2 /*idx_replacer*/,
 		                             3 /*idx_space*/,
-		                             DUK_JSON_FLAG_EXT_COMPATIBLE |
-		                             DUK_JSON_FLAG_ASCII_ONLY /*flags*/);
+		                             DUK_JSON_FLAG_EXT_COMPATIBLE | DUK_JSON_FLAG_ASCII_ONLY /*flags*/);
 #endif
 	} else {
 		DUK_DCERROR_TYPE_INVALID_ARGS(thr);
@@ -31970,7 +35222,7 @@ DUK_INTERNAL duk_ret_t duk_bi_duktape_object_dec(duk_hthread *thr) {
 	 * non-existent optional parameters.
 	 */
 
-	h_str = duk_require_hstring(thr, 0);  /* Could reject symbols, but no point: won't match comparisons */
+	h_str = duk_require_hstring(thr, 0); /* Could reject symbols, but no point: won't match comparisons */
 	duk_require_valid_index(thr, 1);
 
 	if (h_str == DUK_HTHREAD_STRING_HEX(thr)) {
@@ -31983,17 +35235,11 @@ DUK_INTERNAL duk_ret_t duk_bi_duktape_object_dec(duk_hthread *thr) {
 		DUK_ASSERT_TOP(thr, 2);
 #if defined(DUK_USE_JSON_SUPPORT) && defined(DUK_USE_JX)
 	} else if (h_str == DUK_HTHREAD_STRING_JX(thr)) {
-		duk_bi_json_parse_helper(thr,
-		                         1 /*idx_value*/,
-		                         2 /*idx_replacer*/,
-		                         DUK_JSON_FLAG_EXT_CUSTOM /*flags*/);
+		duk_bi_json_parse_helper(thr, 1 /*idx_value*/, 2 /*idx_replacer*/, DUK_JSON_FLAG_EXT_CUSTOM /*flags*/);
 #endif
 #if defined(DUK_USE_JSON_SUPPORT) && defined(DUK_USE_JC)
 	} else if (h_str == DUK_HTHREAD_STRING_JC(thr)) {
-		duk_bi_json_parse_helper(thr,
-		                         1 /*idx_value*/,
-		                         2 /*idx_replacer*/,
-		                         DUK_JSON_FLAG_EXT_COMPATIBLE /*flags*/);
+		duk_bi_json_parse_helper(thr, 1 /*idx_value*/, 2 /*idx_replacer*/, DUK_JSON_FLAG_EXT_COMPATIBLE /*flags*/);
 #endif
 	} else {
 		DUK_DCERROR_TYPE_INVALID_ARGS(thr);
@@ -32008,10 +35254,10 @@ DUK_INTERNAL duk_ret_t duk_bi_duktape_object_dec(duk_hthread *thr) {
 DUK_INTERNAL duk_ret_t duk_bi_duktape_object_compact(duk_hthread *thr) {
 	DUK_ASSERT_TOP(thr, 1);
 	duk_compact(thr, 0);
-	return 1;  /* return the argument object */
+	return 1; /* return the argument object */
 }
 
-#endif  /* DUK_USE_DUKTAPE_BUILTIN */
+#endif /* DUK_USE_DUKTAPE_BUILTIN */
 /*
  *  WHATWG Encoding API built-ins
  *
@@ -32026,17 +35272,17 @@ DUK_INTERNAL duk_ret_t duk_bi_duktape_object_compact(duk_hthread *thr) {
  */
 
 typedef struct {
-	duk_uint8_t *out;      /* where to write next byte(s) */
-	duk_codepoint_t lead;  /* lead surrogate */
+	duk_uint8_t *out; /* where to write next byte(s) */
+	duk_codepoint_t lead; /* lead surrogate */
 } duk__encode_context;
 
 typedef struct {
 	/* UTF-8 decoding state */
-	duk_codepoint_t codepoint;  /* built up incrementally */
-	duk_uint8_t upper;          /* max value of next byte (decode error otherwise) */
-	duk_uint8_t lower;          /* min value of next byte (ditto) */
-	duk_uint8_t needed;         /* how many more bytes we need */
-	duk_uint8_t bom_handled;    /* BOM seen or no longer expected */
+	duk_codepoint_t codepoint; /* built up incrementally */
+	duk_uint8_t upper; /* max value of next byte (decode error otherwise) */
+	duk_uint8_t lower; /* min value of next byte (ditto) */
+	duk_uint8_t needed; /* how many more bytes we need */
+	duk_uint8_t bom_handled; /* BOM seen or no longer expected */
 
 	/* Decoder configuration */
 	duk_uint8_t fatal;
@@ -32046,9 +35292,9 @@ typedef struct {
 /* The signed duk_codepoint_t type is used to signal a decoded codepoint
  * (>= 0) or various other states using negative values.
  */
-#define DUK__CP_CONTINUE   (-1)  /* continue to next byte, no completed codepoint */
-#define DUK__CP_ERROR      (-2)  /* decoding error */
-#define DUK__CP_RETRY      (-3)  /* decoding error; retry last byte */
+#define DUK__CP_CONTINUE (-1) /* continue to next byte, no completed codepoint */
+#define DUK__CP_ERROR    (-2) /* decoding error */
+#define DUK__CP_RETRY    (-3) /* decoding error; retry last byte */
 
 /*
  *  Raw helpers for encoding/decoding
@@ -32135,7 +35381,7 @@ DUK_LOCAL duk_codepoint_t duk__utf8_decode_next(duk__decode_context *dec_ctx, du
 			} else {
 				/* got a codepoint */
 				duk_codepoint_t ret;
-				DUK_ASSERT(dec_ctx->codepoint <= 0x10ffffL);  /* Decoding rules guarantee. */
+				DUK_ASSERT(dec_ctx->codepoint <= 0x10ffffL); /* Decoding rules guarantee. */
 				ret = dec_ctx->codepoint;
 				dec_ctx->codepoint = 0x0000L;
 				dec_ctx->needed = 0;
@@ -32191,7 +35437,8 @@ DUK_LOCAL void duk__utf8_encode_char(void *udata, duk_codepoint_t codepoint) {
 		} else {
 			/* low surrogate */
 			if (enc_ctx->lead != 0x0000L) {
-				codepoint = (duk_codepoint_t) (0x010000L + ((enc_ctx->lead - 0xd800L) << 10) + (codepoint - 0xdc00L));
+				codepoint =
+				    (duk_codepoint_t) (0x010000L + ((enc_ctx->lead - 0xd800L) << 10) + (codepoint - 0xdc00L));
 				enc_ctx->lead = 0x0000L;
 			} else {
 				/* unpaired low surrogate */
@@ -32212,7 +35459,7 @@ DUK_LOCAL void duk__utf8_encode_char(void *udata, duk_codepoint_t codepoint) {
 	 */
 	enc_ctx->out += duk_unicode_encode_xutf8((duk_ucodepoint_t) codepoint, enc_ctx->out);
 }
-#endif  /* DUK_USE_ENCODING_BUILTINS */
+#endif /* DUK_USE_ENCODING_BUILTINS */
 
 /* Shared helper for buffer-to-string using a TextDecoder() compatible UTF-8
  * decoder.
@@ -32241,18 +35488,15 @@ DUK_LOCAL duk_ret_t duk__decode_helper(duk_hthread *thr, duk__decode_context *de
 		duk_push_fixed_buffer_nozero(thr, 0);
 		duk_replace(thr, 0);
 	}
-	(void) duk_require_buffer_data(thr, 0, &len);  /* Need 'len', avoid pointer. */
+	(void) duk_require_buffer_data(thr, 0, &len); /* Need 'len', avoid pointer. */
 
-	if (duk_check_type_mask(thr, 1, DUK_TYPE_MASK_UNDEFINED |
-	                                DUK_TYPE_MASK_NULL |
-	                                DUK_TYPE_MASK_NONE)) {
+	if (duk_check_type_mask(thr, 1, DUK_TYPE_MASK_UNDEFINED | DUK_TYPE_MASK_NULL | DUK_TYPE_MASK_NONE)) {
 		/* Use defaults, treat missing value like undefined. */
 	} else {
-		duk_require_type_mask(thr, 1, DUK_TYPE_MASK_UNDEFINED |
-	                                      DUK_TYPE_MASK_NULL |
-	                                      DUK_TYPE_MASK_LIGHTFUNC |
-	                                      DUK_TYPE_MASK_BUFFER |
-		                              DUK_TYPE_MASK_OBJECT);
+		duk_require_type_mask(thr,
+		                      1,
+		                      DUK_TYPE_MASK_UNDEFINED | DUK_TYPE_MASK_NULL | DUK_TYPE_MASK_LIGHTFUNC |
+		                          DUK_TYPE_MASK_BUFFER | DUK_TYPE_MASK_OBJECT);
 		if (duk_get_prop_literal(thr, 1, "stream")) {
 			stream = duk_to_boolean(thr, -1);
 		}
@@ -32270,7 +35514,8 @@ DUK_LOCAL duk_ret_t duk__decode_helper(duk_hthread *thr, duk__decode_context *de
 		DUK_ERROR_TYPE(thr, DUK_STR_RESULT_TOO_LONG);
 		DUK_WO_NORETURN(return 0;);
 	}
-	output = (duk_uint8_t *) duk_push_fixed_buffer_nozero(thr, 3 + (3 * len));  /* used parts will be always manually written over */
+	output =
+	    (duk_uint8_t *) duk_push_fixed_buffer_nozero(thr, 3 + (3 * len)); /* used parts will be always manually written over */
 
 	input = (const duk_uint8_t *) duk_get_buffer_data(thr, 0, &len_tmp);
 	DUK_ASSERT(input != NULL || len == 0);
@@ -32302,7 +35547,7 @@ DUK_LOCAL duk_ret_t duk__decode_helper(duk_hthread *thr, duk__decode_context *de
 			/* Decoding error with or without retry. */
 			DUK_ASSERT(codepoint == DUK__CP_ERROR || codepoint == DUK__CP_RETRY);
 			if (codepoint == DUK__CP_RETRY) {
-				--in;  /* retry last byte */
+				--in; /* retry last byte */
 			}
 			/* replacement mode: replace with U+FFFD */
 			codepoint = DUK_UNICODE_CP_REPLACEMENT_CHARACTER;
@@ -32335,7 +35580,7 @@ DUK_LOCAL duk_ret_t duk__decode_helper(duk_hthread *thr, duk__decode_context *de
 				DUK_ASSERT(out <= output + (3 + (3 * len)));
 			}
 		}
-		duk__utf8_decode_init(dec_ctx);  /* Initialize decoding state for potential reuse. */
+		duk__utf8_decode_init(dec_ctx); /* Initialize decoding state for potential reuse. */
 	}
 
 	/* Output buffer is fixed and thus stable even if there had been
@@ -32344,7 +35589,7 @@ DUK_LOCAL duk_ret_t duk__decode_helper(duk_hthread *thr, duk__decode_context *de
 	duk_push_lstring(thr, (const char *) output, (duk_size_t) (out - output));
 	return 1;
 
- fail_type:
+fail_type:
 	DUK_ERROR_TYPE(thr, DUK_STR_UTF8_DECODE_FAILED);
 	DUK_WO_NORETURN(return 0;);
 }
@@ -32403,7 +35648,7 @@ DUK_INTERNAL duk_ret_t duk_bi_textencoder_prototype_encode(duk_hthread *thr) {
 	output = (duk_uint8_t *) duk_push_dynamic_buffer(thr, 3 * len);
 
 	if (len > 0) {
-		DUK_ASSERT(duk_is_string(thr, 0));  /* True if len > 0. */
+		DUK_ASSERT(duk_is_string(thr, 0)); /* True if len > 0. */
 
 		/* XXX: duk_decode_string() is used to process the input
 		 * string.  For standard ECMAScript strings, represented
@@ -32479,7 +35724,7 @@ DUK_INTERNAL duk_ret_t duk_bi_textdecoder_constructor(duk_hthread *thr) {
 	dec_ctx = (duk__decode_context *) duk_push_fixed_buffer(thr, sizeof(duk__decode_context));
 	dec_ctx->fatal = (duk_uint8_t) fatal;
 	dec_ctx->ignore_bom = (duk_uint8_t) ignore_bom;
-	duk__utf8_decode_init(dec_ctx);  /* Initializes remaining fields. */
+	duk__utf8_decode_init(dec_ctx); /* Initializes remaining fields. */
 
 	duk_put_prop_literal(thr, -2, DUK_INTERNAL_SYMBOL("Context"));
 	return 0;
@@ -32525,7 +35770,7 @@ DUK_INTERNAL duk_ret_t duk_bi_textdecoder_prototype_decode(duk_hthread *thr) {
 	dec_ctx = duk__get_textdecoder_context(thr);
 	return duk__decode_helper(thr, dec_ctx);
 }
-#endif  /* DUK_USE_ENCODING_BUILTINS */
+#endif /* DUK_USE_ENCODING_BUILTINS */
 
 /*
  *  Internal helper for Node.js Buffer
@@ -32539,8 +35784,8 @@ DUK_INTERNAL duk_ret_t duk_bi_textdecoder_prototype_decode(duk_hthread *thr) {
 DUK_INTERNAL duk_ret_t duk_textdecoder_decode_utf8_nodejs(duk_hthread *thr) {
 	duk__decode_context dec_ctx;
 
-	dec_ctx.fatal = 0;  /* use replacement chars */
-	dec_ctx.ignore_bom = 1;  /* ignore BOMs (matches Node.js Buffer .toString()) */
+	dec_ctx.fatal = 0; /* use replacement chars */
+	dec_ctx.ignore_bom = 1; /* ignore BOMs (matches Node.js Buffer .toString()) */
 	duk__utf8_decode_init(&dec_ctx);
 
 	return duk__decode_helper(thr, &dec_ctx);
@@ -32567,9 +35812,8 @@ DUK_INTERNAL duk_ret_t duk_bi_error_constructor_shared(duk_hthread *thr) {
 	duk_small_int_t bidx_prototype = duk_get_current_magic(thr);
 
 	/* same for both error and each subclass like TypeError */
-	duk_uint_t flags_and_class = DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                             DUK_HOBJECT_FLAG_FASTREFS |
-	                             DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ERROR);
+	duk_uint_t flags_and_class =
+	    DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ERROR);
 
 	(void) duk_push_object_helper(thr, flags_and_class, bidx_prototype);
 
@@ -32578,7 +35822,7 @@ DUK_INTERNAL duk_ret_t duk_bi_error_constructor_shared(duk_hthread *thr) {
 	 */
 	if (!duk_is_undefined(thr, 0)) {
 		duk_to_string(thr, 0);
-		duk_dup_0(thr);  /* [ message error message ] */
+		duk_dup_0(thr); /* [ message error message ] */
 		duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_MESSAGE, DUK_PROPDESC_FLAGS_WC);
 	}
 
@@ -32637,7 +35881,7 @@ DUK_INTERNAL duk_ret_t duk_bi_error_prototype_to_string(duk_hthread *thr) {
 		return 1;
 	}
 	duk_push_literal(thr, ": ");
-	duk_insert(thr, -2);  /* ... name ': ' message */
+	duk_insert(thr, -2); /* ... name ': ' message */
 	duk_concat(thr, 3);
 
 	return 1;
@@ -32660,15 +35904,15 @@ DUK_INTERNAL duk_ret_t duk_bi_error_prototype_to_string(duk_hthread *thr) {
  */
 
 /* constants arbitrary, chosen for small loads */
-#define DUK__OUTPUT_TYPE_TRACEBACK   (-1)
-#define DUK__OUTPUT_TYPE_FILENAME    0
-#define DUK__OUTPUT_TYPE_LINENUMBER  1
+#define DUK__OUTPUT_TYPE_TRACEBACK  (-1)
+#define DUK__OUTPUT_TYPE_FILENAME   0
+#define DUK__OUTPUT_TYPE_LINENUMBER 1
 
 DUK_LOCAL duk_ret_t duk__error_getter_helper(duk_hthread *thr, duk_small_int_t output_type) {
 	duk_idx_t idx_td;
-	duk_small_int_t i;  /* traceback depth fits into 16 bits */
-	duk_small_int_t t;  /* stack type fits into 16 bits */
-	duk_small_int_t count_func = 0;  /* traceback depth ensures fits into 16 bits */
+	duk_small_int_t i; /* traceback depth fits into 16 bits */
+	duk_small_int_t t; /* stack type fits into 16 bits */
+	duk_small_int_t count_func = 0; /* traceback depth ensures fits into 16 bits */
 	const char *str_tailcall = " tailcall";
 	const char *str_strict = " strict";
 	const char *str_construct = " construct";
@@ -32676,10 +35920,10 @@ DUK_LOCAL duk_ret_t duk__error_getter_helper(duk_hthread *thr, duk_small_int_t o
 	const char *str_directeval = " directeval";
 	const char *str_empty = "";
 
-	DUK_ASSERT_TOP(thr, 0);  /* fixed arg count */
+	DUK_ASSERT_TOP(thr, 0); /* fixed arg count */
 
 	duk_push_this(thr);
-	duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_INT_TRACEDATA);
+	duk_xget_owndataprop_stridx_short(thr, -1, DUK_STRIDX_INT_TRACEDATA);
 	idx_td = duk_get_top_index(thr);
 
 	duk_push_hstring_stridx(thr, DUK_STRIDX_NEWLINE_4SPACE);
@@ -32691,7 +35935,7 @@ DUK_LOCAL duk_ret_t duk__error_getter_helper(duk_hthread *thr, duk_small_int_t o
 
 	if (duk_check_type(thr, idx_td, DUK_TYPE_OBJECT)) {
 		/* Current tracedata contains 2 entries per callstack entry. */
-		for (i = 0; ; i += 2) {
+		for (i = 0;; i += 2) {
 			duk_int_t pc;
 			duk_uint_t line;
 			duk_uint_t flags;
@@ -32747,46 +35991,53 @@ DUK_LOCAL duk_ret_t duk__error_getter_helper(duk_hthread *thr, duk_small_int_t o
 
 				/* XXX: Change 'anon' handling here too, to use empty string for anonymous functions? */
 				/* XXX: Could be improved by coercing to a readable duk_tval (especially string escaping) */
-				h_name = duk_get_hstring_notsymbol(thr, -2);  /* may be NULL */
+				h_name = duk_get_hstring_notsymbol(thr, -2); /* may be NULL */
 				funcname = (h_name == NULL || h_name == DUK_HTHREAD_STRING_EMPTY_STRING(thr)) ?
-				           "[anon]" : (const char *) DUK_HSTRING_GET_DATA(h_name);
+                                               "[anon]" :
+                                               (const char *) DUK_HSTRING_GET_DATA(h_name);
 				filename = duk_get_string_notsymbol(thr, -1);
 				filename = filename ? filename : "";
 				DUK_ASSERT(funcname != NULL);
 				DUK_ASSERT(filename != NULL);
 
-				h_func = duk_get_hobject(thr, -4);  /* NULL for lightfunc */
+				h_func = duk_get_hobject(thr, -4); /* NULL for lightfunc */
 
 				if (h_func == NULL) {
-					duk_push_sprintf(thr, "at %s light%s%s%s%s%s",
-					                 (const char *) funcname,
-					                 (const char *) ((flags & DUK_ACT_FLAG_STRICT) ? str_strict : str_empty),
-					                 (const char *) ((flags & DUK_ACT_FLAG_TAILCALLED) ? str_tailcall : str_empty),
-					                 (const char *) ((flags & DUK_ACT_FLAG_CONSTRUCT) ? str_construct : str_empty),
-					                 (const char *) ((flags & DUK_ACT_FLAG_DIRECT_EVAL) ? str_directeval : str_empty),
-					                 (const char *) ((flags & DUK_ACT_FLAG_PREVENT_YIELD) ? str_prevyield : str_empty));
+					duk_push_sprintf(
+					    thr,
+					    "at %s light%s%s%s%s%s",
+					    (const char *) funcname,
+					    (const char *) ((flags & DUK_ACT_FLAG_STRICT) ? str_strict : str_empty),
+					    (const char *) ((flags & DUK_ACT_FLAG_TAILCALLED) ? str_tailcall : str_empty),
+					    (const char *) ((flags & DUK_ACT_FLAG_CONSTRUCT) ? str_construct : str_empty),
+					    (const char *) ((flags & DUK_ACT_FLAG_DIRECT_EVAL) ? str_directeval : str_empty),
+					    (const char *) ((flags & DUK_ACT_FLAG_PREVENT_YIELD) ? str_prevyield : str_empty));
 				} else if (DUK_HOBJECT_HAS_NATFUNC(h_func)) {
-					duk_push_sprintf(thr, "at %s (%s) native%s%s%s%s%s",
-					                 (const char *) funcname,
-					                 (const char *) filename,
-					                 (const char *) ((flags & DUK_ACT_FLAG_STRICT) ? str_strict : str_empty),
-					                 (const char *) ((flags & DUK_ACT_FLAG_TAILCALLED) ? str_tailcall : str_empty),
-					                 (const char *) ((flags & DUK_ACT_FLAG_CONSTRUCT) ? str_construct : str_empty),
-					                 (const char *) ((flags & DUK_ACT_FLAG_DIRECT_EVAL) ? str_directeval : str_empty),
-					                 (const char *) ((flags & DUK_ACT_FLAG_PREVENT_YIELD) ? str_prevyield : str_empty));
+					duk_push_sprintf(
+					    thr,
+					    "at %s (%s) native%s%s%s%s%s",
+					    (const char *) funcname,
+					    (const char *) filename,
+					    (const char *) ((flags & DUK_ACT_FLAG_STRICT) ? str_strict : str_empty),
+					    (const char *) ((flags & DUK_ACT_FLAG_TAILCALLED) ? str_tailcall : str_empty),
+					    (const char *) ((flags & DUK_ACT_FLAG_CONSTRUCT) ? str_construct : str_empty),
+					    (const char *) ((flags & DUK_ACT_FLAG_DIRECT_EVAL) ? str_directeval : str_empty),
+					    (const char *) ((flags & DUK_ACT_FLAG_PREVENT_YIELD) ? str_prevyield : str_empty));
 				} else {
-					duk_push_sprintf(thr, "at %s (%s:%lu)%s%s%s%s%s",
-					                 (const char *) funcname,
-					                 (const char *) filename,
-					                 (unsigned long) line,
-					                 (const char *) ((flags & DUK_ACT_FLAG_STRICT) ? str_strict : str_empty),
-					                 (const char *) ((flags & DUK_ACT_FLAG_TAILCALLED) ? str_tailcall : str_empty),
-					                 (const char *) ((flags & DUK_ACT_FLAG_CONSTRUCT) ? str_construct : str_empty),
-					                 (const char *) ((flags & DUK_ACT_FLAG_DIRECT_EVAL) ? str_directeval : str_empty),
-					                 (const char *) ((flags & DUK_ACT_FLAG_PREVENT_YIELD) ? str_prevyield : str_empty));
+					duk_push_sprintf(
+					    thr,
+					    "at %s (%s:%lu)%s%s%s%s%s",
+					    (const char *) funcname,
+					    (const char *) filename,
+					    (unsigned long) line,
+					    (const char *) ((flags & DUK_ACT_FLAG_STRICT) ? str_strict : str_empty),
+					    (const char *) ((flags & DUK_ACT_FLAG_TAILCALLED) ? str_tailcall : str_empty),
+					    (const char *) ((flags & DUK_ACT_FLAG_CONSTRUCT) ? str_construct : str_empty),
+					    (const char *) ((flags & DUK_ACT_FLAG_DIRECT_EVAL) ? str_directeval : str_empty),
+					    (const char *) ((flags & DUK_ACT_FLAG_PREVENT_YIELD) ? str_prevyield : str_empty));
 				}
-				duk_replace(thr, -5);   /* [ ... v1 v2 name filename str ] -> [ ... str v2 name filename ] */
-				duk_pop_3(thr);         /* -> [ ... str ] */
+				duk_replace(thr, -5); /* [ ... v1 v2 name filename str ] -> [ ... str v2 name filename ] */
+				duk_pop_3(thr); /* -> [ ... str ] */
 			} else if (t == DUK_TYPE_STRING) {
 				const char *str_file;
 
@@ -32817,10 +36068,12 @@ DUK_LOCAL duk_ret_t duk__error_getter_helper(duk_hthread *thr, duk_small_int_t o
 				 * safety issues.
 				 */
 				str_file = (const char *) duk_get_string(thr, -2);
-				duk_push_sprintf(thr, "at [anon] (%s:%ld) internal",
-				                 (const char *) (str_file ? str_file : "null"), (long) pc);
-				duk_replace(thr, -3);  /* [ ... v1 v2 str ] -> [ ... str v2 ] */
-				duk_pop(thr);          /* -> [ ... str ] */
+				duk_push_sprintf(thr,
+				                 "at [anon] (%s:%ld) internal",
+				                 (const char *) (str_file ? str_file : "null"),
+				                 (long) pc);
+				duk_replace(thr, -3); /* [ ... v1 v2 str ] -> [ ... str v2 ] */
+				duk_pop(thr); /* -> [ ... str ] */
 			} else {
 				/* unknown, ignore */
 				duk_pop_2(thr);
@@ -32867,7 +36120,7 @@ DUK_INTERNAL duk_ret_t duk_bi_error_prototype_linenumber_getter(duk_hthread *thr
 	return duk__error_getter_helper(thr, DUK__OUTPUT_TYPE_LINENUMBER);
 }
 
-#else  /* DUK_USE_TRACEBACKS */
+#else /* DUK_USE_TRACEBACKS */
 
 /*
  *  Traceback handling when tracebacks disabled.
@@ -32898,7 +36151,7 @@ DUK_INTERNAL duk_ret_t duk_bi_error_prototype_linenumber_getter(duk_hthread *thr
 	return 0;
 }
 
-#endif  /* DUK_USE_TRACEBACKS */
+#endif /* DUK_USE_TRACEBACKS */
 
 DUK_LOCAL duk_ret_t duk__error_setter_helper(duk_hthread *thr, duk_small_uint_t stridx_key) {
 	/* Attempt to write 'stack', 'fileName', 'lineNumber' works as if
@@ -32908,7 +36161,7 @@ DUK_LOCAL duk_ret_t duk__error_setter_helper(duk_hthread *thr, duk_small_uint_t
 	 * See https://github.com/svaarala/duktape/issues/387.
 	 */
 
-	DUK_ASSERT_TOP(thr, 1);  /* fixed arg count: value */
+	DUK_ASSERT_TOP(thr, 1); /* fixed arg count: value */
 
 	duk_push_this(thr);
 	duk_push_hstring_stridx(thr, stridx_key);
@@ -32916,13 +36169,13 @@ DUK_LOCAL duk_ret_t duk__error_setter_helper(duk_hthread *thr, duk_small_uint_t
 
 	/* [ ... obj key value ] */
 
-	DUK_DD(DUK_DDPRINT("error setter: %!T %!T %!T",
-	                   duk_get_tval(thr, -3), duk_get_tval(thr, -2), duk_get_tval(thr, -1)));
+	DUK_DD(DUK_DDPRINT("error setter: %!T %!T %!T", duk_get_tval(thr, -3), duk_get_tval(thr, -2), duk_get_tval(thr, -1)));
 
-	duk_def_prop(thr, -3, DUK_DEFPROP_HAVE_VALUE |
-	                      DUK_DEFPROP_HAVE_WRITABLE | DUK_DEFPROP_WRITABLE |
-	                      DUK_DEFPROP_HAVE_ENUMERABLE | /*not enumerable*/
-	                      DUK_DEFPROP_HAVE_CONFIGURABLE | DUK_DEFPROP_CONFIGURABLE);
+	duk_def_prop(thr,
+	             -3,
+	             DUK_DEFPROP_HAVE_VALUE | DUK_DEFPROP_HAVE_WRITABLE | DUK_DEFPROP_WRITABLE |
+	                 DUK_DEFPROP_HAVE_ENUMERABLE | /*not enumerable*/
+	                 DUK_DEFPROP_HAVE_CONFIGURABLE | DUK_DEFPROP_CONFIGURABLE);
 	return 0;
 }
 
@@ -32969,7 +36222,7 @@ DUK_INTERNAL duk_ret_t duk_bi_function_constructor(duk_hthread *thr) {
 
 	nargs = duk_get_top(thr);
 	for (i = 0; i < nargs; i++) {
-		duk_to_string(thr, i);  /* Rejects Symbols during coercion. */
+		duk_to_string(thr, i); /* Rejects Symbols during coercion. */
 	}
 
 	if (nargs == 0) {
@@ -32979,7 +36232,7 @@ DUK_INTERNAL duk_ret_t duk_bi_function_constructor(duk_hthread *thr) {
 		/* XXX: cover this with the generic >1 case? */
 		duk_push_hstring_empty(thr);
 	} else {
-		duk_insert(thr, 0);   /* [ arg1 ... argN-1 body] -> [body arg1 ... argN-1] */
+		duk_insert(thr, 0); /* [ arg1 ... argN-1 body] -> [body arg1 ... argN-1] */
 		duk_push_literal(thr, ",");
 		duk_insert(thr, 1);
 		duk_join(thr, nargs - 1);
@@ -32996,7 +36249,7 @@ DUK_INTERNAL duk_ret_t duk_bi_function_constructor(duk_hthread *thr) {
 	duk_dup_1(thr);
 	duk_push_literal(thr, "){");
 	duk_dup_0(thr);
-	duk_push_literal(thr, "\n}");  /* Newline is important to handle trailing // comment. */
+	duk_push_literal(thr, "\n}"); /* Newline is important to handle trailing // comment. */
 	duk_concat(thr, 5);
 
 	/* [ body formals source ] */
@@ -33006,8 +36259,8 @@ DUK_INTERNAL duk_ret_t duk_bi_function_constructor(duk_hthread *thr) {
 	/* strictness is not inherited, intentional */
 	comp_flags = DUK_COMPILE_FUNCEXPR;
 
-	duk_push_hstring_stridx(thr, DUK_STRIDX_COMPILE);  /* XXX: copy from caller? */  /* XXX: ignored now */
-	h_sourcecode = duk_require_hstring(thr, -2);  /* no symbol check needed; -2 is concat'd code */
+	duk_push_hstring_stridx(thr, DUK_STRIDX_COMPILE); /* XXX: copy from caller? */ /* XXX: ignored now */
+	h_sourcecode = duk_require_hstring(thr, -2); /* no symbol check needed; -2 is concat'd code */
 	duk_js_compile(thr,
 	               (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h_sourcecode),
 	               (duk_size_t) DUK_HSTRING_GET_BYTELEN(h_sourcecode),
@@ -33036,7 +36289,7 @@ DUK_INTERNAL duk_ret_t duk_bi_function_constructor(duk_hthread *thr) {
 
 	return 1;
 }
-#endif  /* DUK_USE_FUNCTION_BUILTIN */
+#endif /* DUK_USE_FUNCTION_BUILTIN */
 
 #if defined(DUK_USE_FUNCTION_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_function_prototype_to_string(duk_hthread *thr) {
@@ -33102,7 +36355,7 @@ DUK_INTERNAL duk_ret_t duk_bi_function_prototype_to_string(duk_hthread *thr) {
 
 	return 1;
 
- type_error:
+type_error:
 	DUK_DCERROR_TYPE_INVALID_ARGS(thr);
 }
 #endif
@@ -33144,7 +36397,7 @@ DUK_INTERNAL duk_ret_t duk_bi_reflect_construct(duk_hthread *thr) {
  */
 DUK_INTERNAL duk_ret_t duk_bi_function_prototype_bind(duk_hthread *thr) {
 	duk_hboundfunc *h_bound;
-	duk_idx_t nargs;  /* bound args, not counting 'this' binding */
+	duk_idx_t nargs; /* bound args, not counting 'this' binding */
 	duk_idx_t bound_nargs;
 	duk_int_t bound_len;
 	duk_tval *tv_prevbound;
@@ -33157,7 +36410,7 @@ DUK_INTERNAL duk_ret_t duk_bi_function_prototype_bind(duk_hthread *thr) {
 	/* Vararg function, careful arg handling, e.g. thisArg may not
 	 * be present.
 	 */
-	nargs = duk_get_top(thr) - 1;  /* actual args, not counting 'this' binding */
+	nargs = duk_get_top(thr) - 1; /* actual args, not counting 'this' binding */
 	if (nargs < 0) {
 		nargs++;
 		duk_push_undefined(thr);
@@ -33252,7 +36505,7 @@ DUK_INTERNAL duk_ret_t duk_bi_function_prototype_bind(duk_hthread *thr) {
 		DUK_HOBJECT_SET_PROTOTYPE_INIT_INCREF(thr, (duk_hobject *) h_bound, bound_proto);
 	}
 
-	DUK_TVAL_INCREF(thr, &h_bound->target);  /* old values undefined, no decref needed */
+	DUK_TVAL_INCREF(thr, &h_bound->target); /* old values undefined, no decref needed */
 	DUK_TVAL_INCREF(thr, &h_bound->this_binding);
 
 	bound_nargs = n_prevbound + nargs;
@@ -33277,7 +36530,7 @@ DUK_INTERNAL duk_ret_t duk_bi_function_prototype_bind(duk_hthread *thr) {
 	 * For lightfuncs, simply read the virtual property.
 	 */
 	duk_get_prop_stridx_short(thr, -2, DUK_STRIDX_LENGTH);
-	bound_len = duk_get_int(thr, -1);  /* ES2015: no coercion */
+	bound_len = duk_get_int(thr, -1); /* ES2015: no coercion */
 	if (bound_len < nargs) {
 		bound_len = 0;
 	} else {
@@ -33291,8 +36544,8 @@ DUK_INTERNAL duk_ret_t duk_bi_function_prototype_bind(duk_hthread *thr) {
 	tv_tmp = thr->valstack_top++;
 	DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(tv_tmp));
 	DUK_ASSERT(!DUK_TVAL_NEEDS_REFCOUNT_UPDATE(tv_tmp));
-	DUK_TVAL_SET_U32(tv_tmp, (duk_uint32_t) bound_len);  /* in-place update, fastint */
-	duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_LENGTH, DUK_PROPDESC_FLAGS_C);  /* attrs in E6 Section 9.2.4 */
+	DUK_TVAL_SET_U32(tv_tmp, (duk_uint32_t) bound_len); /* in-place update, fastint */
+	duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_LENGTH, DUK_PROPDESC_FLAGS_C); /* attrs in E6 Section 9.2.4 */
 
 	/* XXX: could these be virtual? */
 	/* Caller and arguments must use the same thrower, [[ThrowTypeError]]. */
@@ -33300,7 +36553,7 @@ DUK_INTERNAL duk_ret_t duk_bi_function_prototype_bind(duk_hthread *thr) {
 	duk_xdef_prop_stridx_thrower(thr, -1, DUK_STRIDX_LC_ARGUMENTS);
 
 	/* Function name and fileName (non-standard). */
-	duk_push_literal(thr, "bound ");  /* ES2015 19.2.3.2. */
+	duk_push_literal(thr, "bound "); /* ES2015 19.2.3.2. */
 	duk_get_prop_stridx(thr, -3, DUK_STRIDX_NAME);
 	if (!duk_is_string_notsymbol(thr, -1)) {
 		/* ES2015 has requirement to check that .name of target is a string
@@ -33321,7 +36574,7 @@ DUK_INTERNAL duk_ret_t duk_bi_function_prototype_bind(duk_hthread *thr) {
 
 	return 1;
 }
-#endif  /* DUK_USE_FUNCTION_BUILTIN */
+#endif /* DUK_USE_FUNCTION_BUILTIN */
 
 /* %NativeFunctionPrototype% .length getter. */
 DUK_INTERNAL duk_ret_t duk_bi_native_function_length(duk_hthread *thr) {
@@ -33352,7 +36605,7 @@ DUK_INTERNAL duk_ret_t duk_bi_native_function_length(duk_hthread *thr) {
 	}
 	return 1;
 
- fail_type:
+fail_type:
 	DUK_DCERROR_TYPE_INVALID_ARGS(thr);
 }
 
@@ -33381,7 +36634,7 @@ DUK_INTERNAL duk_ret_t duk_bi_native_function_name(duk_hthread *thr) {
 	}
 	return 1;
 
- fail_type:
+fail_type:
 	DUK_DCERROR_TYPE_INVALID_ARGS(thr);
 }
 
@@ -33394,7 +36647,7 @@ DUK_INTERNAL duk_ret_t duk_bi_function_prototype_hasinstance(duk_hthread *thr) {
 	duk_push_boolean(thr, ret);
 	return 1;
 }
-#endif  /* DUK_USE_SYMBOL_BUILTIN */
+#endif /* DUK_USE_SYMBOL_BUILTIN */
 /*
  *  Global object built-ins
  */
@@ -33413,73 +36666,71 @@ DUK_INTERNAL duk_ret_t duk_bi_function_prototype_hasinstance(duk_hthread *thr) {
 /* Macros for creating and checking bitmasks for character encoding.
  * Bit number is a bit counterintuitive, but minimizes code size.
  */
-#define DUK__MKBITS(a,b,c,d,e,f,g,h)  ((duk_uint8_t) ( \
-	((a) << 0) | ((b) << 1) | ((c) << 2) | ((d) << 3) | \
-	((e) << 4) | ((f) << 5) | ((g) << 6) | ((h) << 7) \
-	))
-#define DUK__CHECK_BITMASK(table,cp)  ((table)[(cp) >> 3] & (1 << ((cp) & 0x07)))
+#define DUK__MKBITS(a, b, c, d, e, f, g, h) \
+	((duk_uint8_t) (((a) << 0) | ((b) << 1) | ((c) << 2) | ((d) << 3) | ((e) << 4) | ((f) << 5) | ((g) << 6) | ((h) << 7)))
+#define DUK__CHECK_BITMASK(table, cp) ((table)[(cp) >> 3] & (1 << ((cp) &0x07)))
 
 /* E5.1 Section 15.1.3.3: uriReserved + uriUnescaped + '#' */
 DUK_LOCAL const duk_uint8_t duk__encode_uriunescaped_table[16] = {
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x00-0x0f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x10-0x1f */
-	DUK__MKBITS(0, 1, 0, 1, 1, 0, 1, 1), DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1),  /* 0x20-0x2f */
-	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 1, 0, 1, 0, 1),  /* 0x30-0x3f */
-	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1),  /* 0x40-0x4f */
-	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 0, 0, 0, 0, 1),  /* 0x50-0x5f */
-	DUK__MKBITS(0, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1),  /* 0x60-0x6f */
-	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 0, 0, 0, 1, 0),  /* 0x70-0x7f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x00-0x0f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x10-0x1f */
+	DUK__MKBITS(0, 1, 0, 1, 1, 0, 1, 1), DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), /* 0x20-0x2f */
+	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 1, 0, 1, 0, 1), /* 0x30-0x3f */
+	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), /* 0x40-0x4f */
+	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 0, 0, 0, 0, 1), /* 0x50-0x5f */
+	DUK__MKBITS(0, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), /* 0x60-0x6f */
+	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 0, 0, 0, 1, 0), /* 0x70-0x7f */
 };
 
 /* E5.1 Section 15.1.3.4: uriUnescaped */
 DUK_LOCAL const duk_uint8_t duk__encode_uricomponent_unescaped_table[16] = {
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x00-0x0f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x10-0x1f */
-	DUK__MKBITS(0, 1, 0, 0, 0, 0, 0, 1), DUK__MKBITS(1, 1, 1, 0, 0, 1, 1, 0),  /* 0x20-0x2f */
-	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 0, 0, 0, 0, 0, 0),  /* 0x30-0x3f */
-	DUK__MKBITS(0, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1),  /* 0x40-0x4f */
-	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 0, 0, 0, 0, 1),  /* 0x50-0x5f */
-	DUK__MKBITS(0, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1),  /* 0x60-0x6f */
-	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 0, 0, 0, 1, 0),  /* 0x70-0x7f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x00-0x0f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x10-0x1f */
+	DUK__MKBITS(0, 1, 0, 0, 0, 0, 0, 1), DUK__MKBITS(1, 1, 1, 0, 0, 1, 1, 0), /* 0x20-0x2f */
+	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 0, 0, 0, 0, 0, 0), /* 0x30-0x3f */
+	DUK__MKBITS(0, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), /* 0x40-0x4f */
+	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 0, 0, 0, 0, 1), /* 0x50-0x5f */
+	DUK__MKBITS(0, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), /* 0x60-0x6f */
+	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 0, 0, 0, 1, 0), /* 0x70-0x7f */
 };
 
 /* E5.1 Section 15.1.3.1: uriReserved + '#' */
 DUK_LOCAL const duk_uint8_t duk__decode_uri_reserved_table[16] = {
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x00-0x0f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x10-0x1f */
-	DUK__MKBITS(0, 0, 0, 1, 1, 0, 1, 0), DUK__MKBITS(0, 0, 0, 1, 1, 0, 0, 1),  /* 0x20-0x2f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 1, 1, 0, 1, 0, 1),  /* 0x30-0x3f */
-	DUK__MKBITS(1, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x40-0x4f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x50-0x5f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x60-0x6f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x70-0x7f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x00-0x0f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x10-0x1f */
+	DUK__MKBITS(0, 0, 0, 1, 1, 0, 1, 0), DUK__MKBITS(0, 0, 0, 1, 1, 0, 0, 1), /* 0x20-0x2f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 1, 1, 0, 1, 0, 1), /* 0x30-0x3f */
+	DUK__MKBITS(1, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x40-0x4f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x50-0x5f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x60-0x6f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x70-0x7f */
 };
 
 /* E5.1 Section 15.1.3.2: empty */
 DUK_LOCAL const duk_uint8_t duk__decode_uri_component_reserved_table[16] = {
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x00-0x0f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x10-0x1f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x20-0x2f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x30-0x3f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x40-0x4f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x50-0x5f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x60-0x6f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x70-0x7f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x00-0x0f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x10-0x1f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x20-0x2f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x30-0x3f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x40-0x4f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x50-0x5f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x60-0x6f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x70-0x7f */
 };
 
 #if defined(DUK_USE_SECTION_B)
 /* E5.1 Section B.2.2, step 7. */
 DUK_LOCAL const duk_uint8_t duk__escape_unescaped_table[16] = {
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x00-0x0f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0),  /* 0x10-0x1f */
-	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 1, 1, 0, 1, 1, 1),  /* 0x20-0x2f */
-	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 0, 0, 0, 0, 0, 0),  /* 0x30-0x3f */
-	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1),  /* 0x40-0x4f */
-	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 0, 0, 0, 0, 1),  /* 0x50-0x5f */
-	DUK__MKBITS(0, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1),  /* 0x60-0x6f */
-	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 0, 0, 0, 0, 0)   /* 0x70-0x7f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x00-0x0f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), /* 0x10-0x1f */
+	DUK__MKBITS(0, 0, 0, 0, 0, 0, 0, 0), DUK__MKBITS(0, 0, 1, 1, 0, 1, 1, 1), /* 0x20-0x2f */
+	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 0, 0, 0, 0, 0, 0), /* 0x30-0x3f */
+	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), /* 0x40-0x4f */
+	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 0, 0, 0, 0, 1), /* 0x50-0x5f */
+	DUK__MKBITS(0, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), /* 0x60-0x6f */
+	DUK__MKBITS(1, 1, 1, 1, 1, 1, 1, 1), DUK__MKBITS(1, 1, 1, 0, 0, 0, 0, 0) /* 0x70-0x7f */
 };
-#endif  /* DUK_USE_SECTION_B */
+#endif /* DUK_USE_SECTION_B */
 
 typedef struct {
 	duk_hthread *thr;
@@ -33520,7 +36771,7 @@ DUK_LOCAL int duk__transform_helper(duk_hthread *thr, duk__transform_callback ca
 	tfm_ctx->h_str = duk_to_hstring(thr, 0);
 	DUK_ASSERT(tfm_ctx->h_str != NULL);
 
-	DUK_BW_INIT_PUSHBUF(thr, &tfm_ctx->bw, DUK_HSTRING_GET_BYTELEN(tfm_ctx->h_str));  /* initial size guess */
+	DUK_BW_INIT_PUSHBUF(thr, &tfm_ctx->bw, DUK_HSTRING_GET_BYTELEN(tfm_ctx->h_str)); /* initial size guess */
 
 	tfm_ctx->p_start = DUK_HSTRING_GET_DATA(tfm_ctx->h_str);
 	tfm_ctx->p_end = tfm_ctx->p_start + DUK_HSTRING_GET_BYTELEN(tfm_ctx->h_str);
@@ -33533,7 +36784,7 @@ DUK_LOCAL int duk__transform_helper(duk_hthread *thr, duk__transform_callback ca
 
 	DUK_BW_COMPACT(thr, &tfm_ctx->bw);
 
-	(void) duk_buffer_to_string(thr, -1);  /* Safe if transform is safe. */
+	(void) duk_buffer_to_string(thr, -1); /* Safe if transform is safe. */
 	return 1;
 }
 
@@ -33559,7 +36810,11 @@ DUK_LOCAL void duk__transform_callback_encode_uri(duk__transform_context *tfm_ct
 		goto uri_error;
 	} else if (cp >= 0xd800L && cp <= 0xdbffL) {
 		/* Needs lookahead */
-		if (duk_unicode_decode_xutf8(tfm_ctx->thr, &tfm_ctx->p, tfm_ctx->p_start, tfm_ctx->p_end, (duk_ucodepoint_t *) &cp2) == 0) {
+		if (duk_unicode_decode_xutf8(tfm_ctx->thr,
+		                             &tfm_ctx->p,
+		                             tfm_ctx->p_start,
+		                             tfm_ctx->p_end,
+		                             (duk_ucodepoint_t *) &cp2) == 0) {
 			goto uri_error;
 		}
 		if (!(cp2 >= 0xdc00L && cp2 <= 0xdfffL)) {
@@ -33590,12 +36845,12 @@ DUK_LOCAL void duk__transform_callback_encode_uri(duk__transform_context *tfm_ct
 		                      &tfm_ctx->bw,
 		                      DUK_ASC_PERCENT,
 		                      (duk_uint8_t) duk_uc_nybbles[t >> 4],
-                                      (duk_uint8_t) duk_uc_nybbles[t & 0x0f]);
+		                      (duk_uint8_t) duk_uc_nybbles[t & 0x0f]);
 	}
 
 	return;
 
- uri_error:
+uri_error:
 	DUK_ERROR_URI(tfm_ctx->thr, DUK_STR_INVALID_INPUT);
 	DUK_WO_NORETURN(return;);
 }
@@ -33604,7 +36859,7 @@ DUK_LOCAL void duk__transform_callback_decode_uri(duk__transform_context *tfm_ct
 	const duk_uint8_t *reserved_table = (const duk_uint8_t *) udata;
 	duk_small_uint_t utf8_blen;
 	duk_codepoint_t min_cp;
-	duk_small_int_t t;  /* must be signed */
+	duk_small_int_t t; /* must be signed */
 	duk_small_uint_t i;
 
 	/* Maximum write size: XUTF8 path writes max DUK_UNICODE_MAX_XUTF8_LENGTH,
@@ -33612,12 +36867,12 @@ DUK_LOCAL void duk__transform_callback_decode_uri(duk__transform_context *tfm_ct
 	 */
 	DUK_BW_ENSURE(tfm_ctx->thr,
 	              &tfm_ctx->bw,
-	              (DUK_UNICODE_MAX_XUTF8_LENGTH >= 2 * DUK_UNICODE_MAX_CESU8_BMP_LENGTH ?
-	              DUK_UNICODE_MAX_XUTF8_LENGTH : DUK_UNICODE_MAX_CESU8_BMP_LENGTH));
+	              (DUK_UNICODE_MAX_XUTF8_LENGTH >= 2 * DUK_UNICODE_MAX_CESU8_BMP_LENGTH ? DUK_UNICODE_MAX_XUTF8_LENGTH :
+                                                                                              DUK_UNICODE_MAX_CESU8_BMP_LENGTH));
 
 	if (cp == (duk_codepoint_t) '%') {
 		const duk_uint8_t *p = tfm_ctx->p;
-		duk_size_t left = (duk_size_t) (tfm_ctx->p_end - p);  /* bytes left */
+		duk_size_t left = (duk_size_t) (tfm_ctx->p_end - p); /* bytes left */
 
 		DUK_DDD(DUK_DDDPRINT("percent encoding, left=%ld", (long) left));
 
@@ -33635,11 +36890,7 @@ DUK_LOCAL void duk__transform_callback_decode_uri(duk__transform_context *tfm_ct
 			if (DUK__CHECK_BITMASK(reserved_table, t)) {
 				/* decode '%xx' to '%xx' if decoded char in reserved set */
 				DUK_ASSERT(tfm_ctx->p - 1 >= tfm_ctx->p_start);
-				DUK_BW_WRITE_RAW_U8_3(tfm_ctx->thr,
-				                      &tfm_ctx->bw,
-				                      DUK_ASC_PERCENT,
-				                      p[0],
-				                      p[1]);
+				DUK_BW_WRITE_RAW_U8_3(tfm_ctx->thr, &tfm_ctx->bw, DUK_ASC_PERCENT, p[0], p[1]);
 			} else {
 				DUK_BW_WRITE_RAW_U8(tfm_ctx->thr, &tfm_ctx->bw, (duk_uint8_t) t);
 			}
@@ -33690,7 +36941,10 @@ DUK_LOCAL void duk__transform_callback_decode_uri(duk__transform_context *tfm_ct
 			/* p points to digit part ('%xy', p points to 'x') */
 			t = duk__decode_hex_escape(p, 2);
 			DUK_DDD(DUK_DDDPRINT("i=%ld utf8_blen=%ld cp=%ld t=0x%02lx",
-			                     (long) i, (long) utf8_blen, (long) cp, (unsigned long) t));
+			                     (long) i,
+			                     (long) utf8_blen,
+			                     (long) cp,
+			                     (unsigned long) t));
 			if (t < 0) {
 				goto uri_error;
 			}
@@ -33700,7 +36954,7 @@ DUK_LOCAL void duk__transform_callback_decode_uri(duk__transform_context *tfm_ct
 			cp = (cp << 6) + (t & 0x3f);
 			p += 3;
 		}
-		p--;  /* p overshoots */
+		p--; /* p overshoots */
 		tfm_ctx->p = p;
 
 		DUK_DDD(DUK_DDDPRINT("final cp=%ld, min_cp=%ld", (long) cp, (long) min_cp));
@@ -33734,7 +36988,7 @@ DUK_LOCAL void duk__transform_callback_decode_uri(duk__transform_context *tfm_ct
 	}
 	return;
 
- uri_error:
+uri_error:
 	DUK_ERROR_URI(tfm_ctx->thr, DUK_STR_INVALID_INPUT);
 	DUK_WO_NORETURN(return;);
 }
@@ -33775,7 +37029,7 @@ DUK_LOCAL void duk__transform_callback_escape(duk__transform_context *tfm_ctx, c
 
 	return;
 
- esc_error:
+esc_error:
 	DUK_ERROR_TYPE(tfm_ctx->thr, DUK_STR_INVALID_INPUT);
 	DUK_WO_NORETURN(return;);
 }
@@ -33787,14 +37041,12 @@ DUK_LOCAL void duk__transform_callback_unescape(duk__transform_context *tfm_ctx,
 
 	if (cp == (duk_codepoint_t) '%') {
 		const duk_uint8_t *p = tfm_ctx->p;
-		duk_size_t left = (duk_size_t) (tfm_ctx->p_end - p);  /* bytes left */
+		duk_size_t left = (duk_size_t) (tfm_ctx->p_end - p); /* bytes left */
 
-		if (left >= 5 && p[0] == 'u' &&
-		    ((t = duk__decode_hex_escape(p + 1, 4)) >= 0)) {
+		if (left >= 5 && p[0] == 'u' && ((t = duk__decode_hex_escape(p + 1, 4)) >= 0)) {
 			cp = (duk_codepoint_t) t;
 			tfm_ctx->p += 5;
-		} else if (left >= 2 &&
-		           ((t = duk__decode_hex_escape(p, 2)) >= 0)) {
+		} else if (left >= 2 && ((t = duk__decode_hex_escape(p, 2)) >= 0)) {
 			cp = (duk_codepoint_t) t;
 			tfm_ctx->p += 2;
 		}
@@ -33802,7 +37054,7 @@ DUK_LOCAL void duk__transform_callback_unescape(duk__transform_context *tfm_ctx,
 
 	DUK_BW_WRITE_ENSURE_XUTF8(tfm_ctx->thr, &tfm_ctx->bw, cp);
 }
-#endif  /* DUK_USE_SECTION_B */
+#endif /* DUK_USE_SECTION_B */
 
 /*
  *  Eval
@@ -33827,11 +37079,11 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_eval(duk_hthread *thr) {
 	duk_int_t level = -2;
 	duk_small_uint_t call_flags;
 
-	DUK_ASSERT(duk_get_top(thr) == 1 || duk_get_top(thr) == 2);  /* 2 when called by debugger */
-	DUK_ASSERT(thr->callstack_top >= 1);  /* at least this function exists */
+	DUK_ASSERT(duk_get_top(thr) == 1 || duk_get_top(thr) == 2); /* 2 when called by debugger */
+	DUK_ASSERT(thr->callstack_top >= 1); /* at least this function exists */
 	DUK_ASSERT(thr->callstack_curr != NULL);
 	DUK_ASSERT((thr->callstack_curr->flags & DUK_ACT_FLAG_DIRECT_EVAL) == 0 || /* indirect eval */
-	           (thr->callstack_top >= 2));  /* if direct eval, calling activation must exist */
+	           (thr->callstack_top >= 2)); /* if direct eval, calling activation must exist */
 
 	/*
 	 *  callstack_top - 1 --> this function
@@ -33844,32 +37096,31 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_eval(duk_hthread *thr) {
 	h = duk_get_hstring_notsymbol(thr, 0);
 	if (!h) {
 		/* Symbol must be returned as is, like any non-string values. */
-		return 1;  /* return arg as-is */
+		return 1; /* return arg as-is */
 	}
 
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
 	/* NOTE: level is used only by the debugger and should never be present
 	 * for an ECMAScript eval().
 	 */
-	DUK_ASSERT(level == -2);  /* by default, use caller's environment */
+	DUK_ASSERT(level == -2); /* by default, use caller's environment */
 	if (duk_get_top(thr) >= 2 && duk_is_number(thr, 1)) {
 		level = duk_get_int(thr, 1);
 	}
-	DUK_ASSERT(level <= -2);  /* This is guaranteed by debugger code. */
+	DUK_ASSERT(level <= -2); /* This is guaranteed by debugger code. */
 #endif
 
 	/* [ source ] */
 
 	comp_flags = DUK_COMPILE_EVAL;
-	act_eval = thr->callstack_curr;  /* this function */
+	act_eval = thr->callstack_curr; /* this function */
 	DUK_ASSERT(act_eval != NULL);
 	act_caller = duk_hthread_get_activation_for_level(thr, level);
 	if (act_caller != NULL) {
 		/* Have a calling activation, check for direct eval (otherwise
 		 * assume indirect eval.
 		 */
-		if ((act_caller->flags & DUK_ACT_FLAG_STRICT) &&
-		    (act_eval->flags & DUK_ACT_FLAG_DIRECT_EVAL)) {
+		if ((act_caller->flags & DUK_ACT_FLAG_STRICT) && (act_eval->flags & DUK_ACT_FLAG_DIRECT_EVAL)) {
 			/* Only direct eval inherits strictness from calling code
 			 * (E5.1 Section 10.1.1).
 			 */
@@ -33879,11 +37130,8 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_eval(duk_hthread *thr) {
 		DUK_ASSERT((act_eval->flags & DUK_ACT_FLAG_DIRECT_EVAL) == 0);
 	}
 
-	duk_push_hstring_stridx(thr, DUK_STRIDX_INPUT);  /* XXX: copy from caller? */
-	duk_js_compile(thr,
-	               (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h),
-	               (duk_size_t) DUK_HSTRING_GET_BYTELEN(h),
-	               comp_flags);
+	duk_push_hstring_stridx(thr, DUK_STRIDX_INPUT); /* XXX: copy from caller? */
+	duk_js_compile(thr, (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h), (duk_size_t) DUK_HSTRING_GET_BYTELEN(h), comp_flags);
 	func = (duk_hcompfunc *) duk_known_hobject(thr, -1);
 	DUK_ASSERT(DUK_HOBJECT_IS_COMPFUNC((duk_hobject *) func));
 
@@ -33916,9 +37164,9 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_eval(duk_hthread *thr) {
 
 			act_lex_env = act_caller->lex_env;
 
-			new_env = duk_hdecenv_alloc(thr,
-			                            DUK_HOBJECT_FLAG_EXTENSIBLE |
-			                            DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DECENV));
+			new_env =
+			    duk_hdecenv_alloc(thr,
+			                      DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DECENV));
 			DUK_ASSERT(new_env != NULL);
 			duk_push_hobject(thr, (duk_hobject *) new_env);
 
@@ -33930,7 +37178,7 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_eval(duk_hthread *thr) {
 			outer_lex_env = (duk_hobject *) new_env;
 			outer_var_env = (duk_hobject *) new_env;
 
-			duk_insert(thr, 0);  /* stash to bottom of value stack to keep new_env reachable for duration of eval */
+			duk_insert(thr, 0); /* stash to bottom of value stack to keep new_env reachable for duration of eval */
 
 			/* compiler's responsibility */
 			DUK_ASSERT(DUK_HOBJECT_HAS_NEWENV((duk_hobject *) func));
@@ -33966,7 +37214,8 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_eval(duk_hthread *thr) {
 		duk_tval *tv;
 		DUK_ASSERT(thr->callstack_top >= 2);
 		DUK_ASSERT(act_caller != NULL);
-		tv = (duk_tval *) (void *) ((duk_uint8_t *) thr->valstack + act_caller->bottom_byteoff - sizeof(duk_tval));  /* this is just beneath bottom */
+		tv = (duk_tval *) (void *) ((duk_uint8_t *) thr->valstack + act_caller->bottom_byteoff -
+		                            sizeof(duk_tval)); /* this is just beneath bottom */
 		DUK_ASSERT(tv >= thr->valstack);
 		duk_push_tval(thr, tv);
 	}
@@ -34005,19 +37254,15 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_parse_int(duk_hthread *thr) {
 	duk_small_uint_t s2n_flags;
 
 	DUK_ASSERT_TOP(thr, 2);
-	duk_to_string(thr, 0);  /* Reject symbols. */
+	duk_to_string(thr, 0); /* Reject symbols. */
 
 	radix = duk_to_int32(thr, 1);
 
 	/* While parseInt() recognizes 0xdeadbeef, it doesn't recognize
 	 * ES2015 0o123 or 0b10001.
 	 */
-	s2n_flags = DUK_S2N_FLAG_TRIM_WHITE |
-	            DUK_S2N_FLAG_ALLOW_GARBAGE |
-	            DUK_S2N_FLAG_ALLOW_PLUS |
-	            DUK_S2N_FLAG_ALLOW_MINUS |
-	            DUK_S2N_FLAG_ALLOW_LEADING_ZERO |
-	            DUK_S2N_FLAG_ALLOW_AUTO_HEX_INT;
+	s2n_flags = DUK_S2N_FLAG_TRIM_WHITE | DUK_S2N_FLAG_ALLOW_GARBAGE | DUK_S2N_FLAG_ALLOW_PLUS | DUK_S2N_FLAG_ALLOW_MINUS |
+	            DUK_S2N_FLAG_ALLOW_LEADING_ZERO | DUK_S2N_FLAG_ALLOW_AUTO_HEX_INT;
 
 	/* Specification stripPrefix maps to DUK_S2N_FLAG_ALLOW_AUTO_HEX_INT.
 	 *
@@ -34041,35 +37286,28 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_parse_int(duk_hthread *thr) {
 	duk_numconv_parse(thr, (duk_small_int_t) radix, s2n_flags);
 	return 1;
 
- ret_nan:
+ret_nan:
 	duk_push_nan(thr);
 	return 1;
 }
-#endif  /* DUK_USE_GLOBAL_BUILTIN */
+#endif /* DUK_USE_GLOBAL_BUILTIN */
 
 #if defined(DUK_USE_GLOBAL_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_global_object_parse_float(duk_hthread *thr) {
 	duk_small_uint_t s2n_flags;
 
 	DUK_ASSERT_TOP(thr, 1);
-	duk_to_string(thr, 0);  /* Reject symbols. */
+	duk_to_string(thr, 0); /* Reject symbols. */
 
 	/* XXX: check flags */
-	s2n_flags = DUK_S2N_FLAG_TRIM_WHITE |
-	            DUK_S2N_FLAG_ALLOW_EXP |
-	            DUK_S2N_FLAG_ALLOW_GARBAGE |
-	            DUK_S2N_FLAG_ALLOW_PLUS |
-	            DUK_S2N_FLAG_ALLOW_MINUS |
-	            DUK_S2N_FLAG_ALLOW_INF |
-	            DUK_S2N_FLAG_ALLOW_FRAC |
-	            DUK_S2N_FLAG_ALLOW_NAKED_FRAC |
-	            DUK_S2N_FLAG_ALLOW_EMPTY_FRAC |
-	            DUK_S2N_FLAG_ALLOW_LEADING_ZERO;
+	s2n_flags = DUK_S2N_FLAG_TRIM_WHITE | DUK_S2N_FLAG_ALLOW_EXP | DUK_S2N_FLAG_ALLOW_GARBAGE | DUK_S2N_FLAG_ALLOW_PLUS |
+	            DUK_S2N_FLAG_ALLOW_MINUS | DUK_S2N_FLAG_ALLOW_INF | DUK_S2N_FLAG_ALLOW_FRAC | DUK_S2N_FLAG_ALLOW_NAKED_FRAC |
+	            DUK_S2N_FLAG_ALLOW_EMPTY_FRAC | DUK_S2N_FLAG_ALLOW_LEADING_ZERO;
 
 	duk_numconv_parse(thr, 10 /*radix*/, s2n_flags);
 	return 1;
 }
-#endif  /* DUK_USE_GLOBAL_BUILTIN */
+#endif /* DUK_USE_GLOBAL_BUILTIN */
 
 /*
  *  Number checkers
@@ -34081,7 +37319,7 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_is_nan(duk_hthread *thr) {
 	duk_push_boolean(thr, (duk_bool_t) DUK_ISNAN(d));
 	return 1;
 }
-#endif  /* DUK_USE_GLOBAL_BUILTIN */
+#endif /* DUK_USE_GLOBAL_BUILTIN */
 
 #if defined(DUK_USE_GLOBAL_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_global_object_is_finite(duk_hthread *thr) {
@@ -34089,7 +37327,7 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_is_finite(duk_hthread *thr) {
 	duk_push_boolean(thr, (duk_bool_t) DUK_ISFINITE(d));
 	return 1;
 }
-#endif  /* DUK_USE_GLOBAL_BUILTIN */
+#endif /* DUK_USE_GLOBAL_BUILTIN */
 
 /*
  *  URI handling
@@ -34101,7 +37339,9 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_decode_uri(duk_hthread *thr) {
 }
 
 DUK_INTERNAL duk_ret_t duk_bi_global_object_decode_uri_component(duk_hthread *thr) {
-	return duk__transform_helper(thr, duk__transform_callback_decode_uri, (const void *) duk__decode_uri_component_reserved_table);
+	return duk__transform_helper(thr,
+	                             duk__transform_callback_decode_uri,
+	                             (const void *) duk__decode_uri_component_reserved_table);
 }
 
 DUK_INTERNAL duk_ret_t duk_bi_global_object_encode_uri(duk_hthread *thr) {
@@ -34109,7 +37349,9 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_encode_uri(duk_hthread *thr) {
 }
 
 DUK_INTERNAL duk_ret_t duk_bi_global_object_encode_uri_component(duk_hthread *thr) {
-	return duk__transform_helper(thr, duk__transform_callback_encode_uri, (const void *) duk__encode_uricomponent_unescaped_table);
+	return duk__transform_helper(thr,
+	                             duk__transform_callback_encode_uri,
+	                             (const void *) duk__encode_uricomponent_unescaped_table);
 }
 
 #if defined(DUK_USE_SECTION_B)
@@ -34120,8 +37362,8 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_escape(duk_hthread *thr) {
 DUK_INTERNAL duk_ret_t duk_bi_global_object_unescape(duk_hthread *thr) {
 	return duk__transform_helper(thr, duk__transform_callback_unescape, (const void *) NULL);
 }
-#endif  /* DUK_USE_SECTION_B */
-#endif  /* DUK_USE_GLOBAL_BUILTIN */
+#endif /* DUK_USE_SECTION_B */
+#endif /* DUK_USE_GLOBAL_BUILTIN */
 
 /* automatic undefs */
 #undef DUK__CHECK_BITMASK
@@ -34150,34 +37392,34 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_unescape(duk_hthread *thr) {
  *  Local defines and forward declarations.
  */
 
-#define DUK__JSON_DECSTR_BUFSIZE 128
-#define DUK__JSON_DECSTR_CHUNKSIZE 64
-#define DUK__JSON_ENCSTR_CHUNKSIZE 64
+#define DUK__JSON_DECSTR_BUFSIZE    128
+#define DUK__JSON_DECSTR_CHUNKSIZE  64
+#define DUK__JSON_ENCSTR_CHUNKSIZE  64
 #define DUK__JSON_STRINGIFY_BUFSIZE 128
-#define DUK__JSON_MAX_ESC_LEN 10  /* '\Udeadbeef' */
+#define DUK__JSON_MAX_ESC_LEN       10 /* '\Udeadbeef' */
 
-DUK_LOCAL_DECL void duk__dec_syntax_error(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_eat_white(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_syntax_error(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_eat_white(duk_json_dec_ctx *js_ctx);
 #if defined(DUK_USE_JX)
-DUK_LOCAL_DECL duk_uint8_t duk__dec_peek(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL duk_uint8_t duk__json_dec_peek(duk_json_dec_ctx *js_ctx);
 #endif
-DUK_LOCAL_DECL duk_uint8_t duk__dec_get(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL duk_uint8_t duk__dec_get_nonwhite(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL duk_uint_fast32_t duk__dec_decode_hex_escape(duk_json_dec_ctx *js_ctx, duk_small_uint_t n);
-DUK_LOCAL_DECL void duk__dec_req_stridx(duk_json_dec_ctx *js_ctx, duk_small_uint_t stridx);
-DUK_LOCAL_DECL void duk__dec_string(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL duk_uint8_t duk__json_dec_get(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL duk_uint8_t duk__json_dec_get_nonwhite(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL duk_uint_fast32_t duk__json_dec_decode_hex_escape(duk_json_dec_ctx *js_ctx, duk_small_uint_t n);
+DUK_LOCAL_DECL void duk__json_dec_req_stridx(duk_json_dec_ctx *js_ctx, duk_small_uint_t stridx);
+DUK_LOCAL_DECL void duk__json_dec_string(duk_json_dec_ctx *js_ctx);
 #if defined(DUK_USE_JX)
-DUK_LOCAL_DECL void duk__dec_plain_string(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_pointer(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_buffer(duk_json_dec_ctx *js_ctx);
-#endif
-DUK_LOCAL_DECL void duk__dec_number(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_objarr_entry(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_objarr_exit(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_object(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_array(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_value(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_reviver_walk(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_plain_string(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_pointer(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_buffer(duk_json_dec_ctx *js_ctx);
+#endif
+DUK_LOCAL_DECL void duk__json_dec_number(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_objarr_entry(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_objarr_exit(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_object(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_array(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_value(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_reviver_walk(duk_json_dec_ctx *js_ctx);
 
 DUK_LOCAL_DECL void duk__emit_1(duk_json_enc_ctx *js_ctx, duk_uint_fast8_t ch);
 DUK_LOCAL_DECL void duk__emit_2(duk_json_enc_ctx *js_ctx, duk_uint_fast8_t ch1, duk_uint_fast8_t ch2);
@@ -34188,29 +37430,29 @@ DUK_LOCAL_DECL void duk__emit_cstring(duk_json_enc_ctx *js_ctx, const char *p);
 #endif
 DUK_LOCAL_DECL void duk__emit_stridx(duk_json_enc_ctx *js_ctx, duk_small_uint_t stridx);
 DUK_LOCAL_DECL duk_uint8_t *duk__emit_esc_auto_fast(duk_json_enc_ctx *js_ctx, duk_uint_fast32_t cp, duk_uint8_t *q);
-DUK_LOCAL_DECL void duk__enc_key_autoquote(duk_json_enc_ctx *js_ctx, duk_hstring *k);
-DUK_LOCAL_DECL void duk__enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_str);
-DUK_LOCAL_DECL void duk__enc_objarr_entry(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top);
-DUK_LOCAL_DECL void duk__enc_objarr_exit(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top);
-DUK_LOCAL_DECL void duk__enc_object(duk_json_enc_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__enc_array(duk_json_enc_ctx *js_ctx);
-DUK_LOCAL_DECL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_holder);
-DUK_LOCAL_DECL duk_bool_t duk__enc_allow_into_proplist(duk_tval *tv);
-DUK_LOCAL_DECL void duk__enc_double(duk_json_enc_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_enc_key_autoquote(duk_json_enc_ctx *js_ctx, duk_hstring *k);
+DUK_LOCAL_DECL void duk__json_enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_str);
+DUK_LOCAL_DECL void duk__json_enc_objarr_entry(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top);
+DUK_LOCAL_DECL void duk__json_enc_objarr_exit(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top);
+DUK_LOCAL_DECL void duk__json_enc_object(duk_json_enc_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_enc_array(duk_json_enc_ctx *js_ctx);
+DUK_LOCAL_DECL duk_bool_t duk__json_enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_holder);
+DUK_LOCAL_DECL duk_bool_t duk__json_enc_allow_into_proplist(duk_tval *tv);
+DUK_LOCAL_DECL void duk__json_enc_double(duk_json_enc_ctx *js_ctx);
 #if defined(DUK_USE_FASTINT)
-DUK_LOCAL_DECL void duk__enc_fastint_tval(duk_json_enc_ctx *js_ctx, duk_tval *tv);
+DUK_LOCAL_DECL void duk__json_enc_fastint_tval(duk_json_enc_ctx *js_ctx, duk_tval *tv);
 #endif
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
-DUK_LOCAL_DECL void duk__enc_buffer_jx_jc(duk_json_enc_ctx *js_ctx, duk_hbuffer *h);
-DUK_LOCAL_DECL void duk__enc_pointer(duk_json_enc_ctx *js_ctx, void *ptr);
+DUK_LOCAL_DECL void duk__json_enc_buffer_jx_jc(duk_json_enc_ctx *js_ctx, duk_hbuffer *h);
+DUK_LOCAL_DECL void duk__json_enc_pointer(duk_json_enc_ctx *js_ctx, void *ptr);
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
-DUK_LOCAL_DECL void duk__enc_bufobj(duk_json_enc_ctx *js_ctx, duk_hbufobj *h_bufobj);
+DUK_LOCAL_DECL void duk__json_enc_bufobj(duk_json_enc_ctx *js_ctx, duk_hbufobj *h_bufobj);
 #endif
 #endif
 #if defined(DUK_USE_JSON_STRINGIFY_FASTPATH)
-DUK_LOCAL_DECL void duk__enc_buffer_json_fastpath(duk_json_enc_ctx *js_ctx, duk_hbuffer *h);
+DUK_LOCAL_DECL void duk__json_enc_buffer_json_fastpath(duk_json_enc_ctx *js_ctx, duk_hbuffer *h);
 #endif
-DUK_LOCAL_DECL void duk__enc_newline_indent(duk_json_enc_ctx *js_ctx, duk_uint_t depth);
+DUK_LOCAL_DECL void duk__json_enc_newline_indent(duk_json_enc_ctx *js_ctx, duk_uint_t depth);
 
 /*
  *  Helper tables
@@ -34224,103 +37466,88 @@ DUK_LOCAL const duk_uint8_t duk__json_quotestr_lookup[256] = {
 	 * 0xa0 ... 0xff: backslash + one char
 	 */
 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xe2, 0xf4, 0xee, 0x80, 0xe6, 0xf2, 0x80, 0x80,
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-	0x20, 0x21, 0xa2, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0xdc, 0x5d, 0x5e, 0x5f,
-	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x81,
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xe2, 0xf4, 0xee, 0x80, 0xe6, 0xf2, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x20, 0x21, 0xa2, 0x23, 0x24, 0x25, 0x26, 0x27,
+	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,
+	0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0xdc, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63,
+	0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
 	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81
 };
-#else  /* DUK_USE_JSON_QUOTESTRING_FASTPATH */
-DUK_LOCAL const duk_uint8_t duk__json_quotestr_esc[14] = {
-	DUK_ASC_NUL, DUK_ASC_NUL, DUK_ASC_NUL, DUK_ASC_NUL,
-	DUK_ASC_NUL, DUK_ASC_NUL, DUK_ASC_NUL, DUK_ASC_NUL,
-	DUK_ASC_LC_B, DUK_ASC_LC_T, DUK_ASC_LC_N, DUK_ASC_NUL,
-	DUK_ASC_LC_F, DUK_ASC_LC_R
-};
-#endif  /* DUK_USE_JSON_QUOTESTRING_FASTPATH */
+#else /* DUK_USE_JSON_QUOTESTRING_FASTPATH */
+DUK_LOCAL const duk_uint8_t duk__json_quotestr_esc[14] = { DUK_ASC_NUL,  DUK_ASC_NUL, DUK_ASC_NUL,  DUK_ASC_NUL,  DUK_ASC_NUL,
+	                                                   DUK_ASC_NUL,  DUK_ASC_NUL, DUK_ASC_NUL,  DUK_ASC_LC_B, DUK_ASC_LC_T,
+	                                                   DUK_ASC_LC_N, DUK_ASC_NUL, DUK_ASC_LC_F, DUK_ASC_LC_R };
+#endif /* DUK_USE_JSON_QUOTESTRING_FASTPATH */
 
 #if defined(DUK_USE_JSON_DECSTRING_FASTPATH)
 DUK_LOCAL const duk_uint8_t duk__json_decstr_lookup[256] = {
 	/* 0x00: slow path
 	 * other: as is
 	 */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x20, 0x21, 0x00, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x00, 0x5d, 0x5e, 0x5f,
-	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
-	0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-	0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-	0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-	0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
-	0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-	0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-	0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x21, 0x00, 0x23, 0x24, 0x25, 0x26, 0x27,
+	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,
+	0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x00, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63,
+	0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b,
+	0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+	0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3,
+	0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+	0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb,
+	0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
 	0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
 };
-#endif  /* DUK_USE_JSON_DECSTRING_FASTPATH */
+#endif /* DUK_USE_JSON_DECSTRING_FASTPATH */
 
 #if defined(DUK_USE_JSON_EATWHITE_FASTPATH)
 DUK_LOCAL const duk_uint8_t duk__json_eatwhite_lookup[256] = {
 	/* 0x00: finish (non-white)
 	 * 0x01: continue
 	 */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
-#endif  /* DUK_USE_JSON_EATWHITE_FASTPATH */
+#endif /* DUK_USE_JSON_EATWHITE_FASTPATH */
 
 #if defined(DUK_USE_JSON_DECNUMBER_FASTPATH)
 DUK_LOCAL const duk_uint8_t duk__json_decnumber_lookup[256] = {
 	/* 0x00: finish (not part of number)
 	 * 0x01: continue
 	 */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
-#endif  /* DUK_USE_JSON_DECNUMBER_FASTPATH */
+#endif /* DUK_USE_JSON_DECNUMBER_FASTPATH */
 
 /*
  *  Parsing implementation.
@@ -34335,17 +37562,16 @@ DUK_LOCAL const duk_uint8_t duk__json_decnumber_lookup[256] = {
  *  CESU-8 encodings.
  */
 
-DUK_LOCAL void duk__dec_syntax_error(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_syntax_error(duk_json_dec_ctx *js_ctx) {
 	/* Shared handler to minimize parser size.  Cause will be
 	 * hidden, unfortunately, but we'll have an offset which
 	 * is often quite enough.
 	 */
-	DUK_ERROR_FMT1(js_ctx->thr, DUK_ERR_SYNTAX_ERROR, DUK_STR_FMT_INVALID_JSON,
-	               (long) (js_ctx->p - js_ctx->p_start));
+	DUK_ERROR_FMT1(js_ctx->thr, DUK_ERR_SYNTAX_ERROR, DUK_STR_FMT_INVALID_JSON, (long) (js_ctx->p - js_ctx->p_start));
 	DUK_WO_NORETURN(return;);
 }
 
-DUK_LOCAL void duk__dec_eat_white(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_eat_white(duk_json_dec_ctx *js_ctx) {
 	const duk_uint8_t *p;
 	duk_uint8_t t;
 
@@ -34358,42 +37584,42 @@ DUK_LOCAL void duk__dec_eat_white(duk_json_dec_ctx *js_ctx) {
 		/* This fast path is pretty marginal in practice.
 		 * XXX: candidate for removal.
 		 */
-		DUK_ASSERT(duk__json_eatwhite_lookup[0x00] == 0x00);  /* end-of-input breaks */
+		DUK_ASSERT(duk__json_eatwhite_lookup[0x00] == 0x00); /* end-of-input breaks */
 		if (duk__json_eatwhite_lookup[t] == 0) {
 			break;
 		}
-#else  /* DUK_USE_JSON_EATWHITE_FASTPATH */
+#else /* DUK_USE_JSON_EATWHITE_FASTPATH */
 		if (!(t == 0x20 || t == 0x0a || t == 0x0d || t == 0x09)) {
 			/* NUL also comes here.  Comparison order matters, 0x20
 			 * is most common whitespace.
 			 */
 			break;
 		}
-#endif  /* DUK_USE_JSON_EATWHITE_FASTPATH */
+#endif /* DUK_USE_JSON_EATWHITE_FASTPATH */
 		p++;
 	}
 	js_ctx->p = p;
 }
 
 #if defined(DUK_USE_JX)
-DUK_LOCAL duk_uint8_t duk__dec_peek(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL duk_uint8_t duk__json_dec_peek(duk_json_dec_ctx *js_ctx) {
 	DUK_ASSERT(js_ctx->p <= js_ctx->p_end);
 	return *js_ctx->p;
 }
 #endif
 
-DUK_LOCAL duk_uint8_t duk__dec_get(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL duk_uint8_t duk__json_dec_get(duk_json_dec_ctx *js_ctx) {
 	DUK_ASSERT(js_ctx->p <= js_ctx->p_end);
 	return *js_ctx->p++;
 }
 
-DUK_LOCAL duk_uint8_t duk__dec_get_nonwhite(duk_json_dec_ctx *js_ctx) {
-	duk__dec_eat_white(js_ctx);
-	return duk__dec_get(js_ctx);
+DUK_LOCAL duk_uint8_t duk__json_dec_get_nonwhite(duk_json_dec_ctx *js_ctx) {
+	duk__json_dec_eat_white(js_ctx);
+	return duk__json_dec_get(js_ctx);
 }
 
 /* For JX, expressing the whole unsigned 32-bit range matters. */
-DUK_LOCAL duk_uint_fast32_t duk__dec_decode_hex_escape(duk_json_dec_ctx *js_ctx, duk_small_uint_t n) {
+DUK_LOCAL duk_uint_fast32_t duk__json_dec_decode_hex_escape(duk_json_dec_ctx *js_ctx, duk_small_uint_t n) {
 	duk_small_uint_t i;
 	duk_uint_fast32_t res = 0;
 	duk_uint8_t x;
@@ -34402,9 +37628,8 @@ DUK_LOCAL duk_uint_fast32_t duk__dec_decode_hex_escape(duk_json_dec_ctx *js_ctx,
 	for (i = 0; i < n; i++) {
 		/* XXX: share helper from lexer; duk_lexer.c / hexval(). */
 
-		x = duk__dec_get(js_ctx);
-		DUK_DDD(DUK_DDDPRINT("decode_hex_escape: i=%ld, n=%ld, res=%ld, x=%ld",
-		                     (long) i, (long) n, (long) res, (long) x));
+		x = duk__json_dec_get(js_ctx);
+		DUK_DDD(DUK_DDDPRINT("decode_hex_escape: i=%ld, n=%ld, res=%ld, x=%ld", (long) i, (long) n, (long) res, (long) x));
 
 		/* x == 0x00 (EOF) causes syntax_error */
 		DUK_ASSERT(duk_hex_dectab[0] == -1);
@@ -34420,13 +37645,13 @@ DUK_LOCAL duk_uint_fast32_t duk__dec_decode_hex_escape(duk_json_dec_ctx *js_ctx,
 	DUK_DDD(DUK_DDDPRINT("final hex decoded value: %ld", (long) res));
 	return res;
 
- syntax_error:
-	duk__dec_syntax_error(js_ctx);
+syntax_error:
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 	return 0;
 }
 
-DUK_LOCAL void duk__dec_req_stridx(duk_json_dec_ctx *js_ctx, duk_small_uint_t stridx) {
+DUK_LOCAL void duk__json_dec_req_stridx(duk_json_dec_ctx *js_ctx, duk_small_uint_t stridx) {
 	duk_hstring *h;
 	const duk_uint8_t *p;
 	duk_uint8_t x, y;
@@ -34441,14 +37666,14 @@ DUK_LOCAL void duk__dec_req_stridx(duk_json_dec_ctx *js_ctx, duk_small_uint_t st
 	DUK_ASSERT(h != NULL);
 
 	p = (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h) + 1;
-	DUK_ASSERT(*(js_ctx->p - 1) == *(p - 1));  /* first character has been matched */
+	DUK_ASSERT(*(js_ctx->p - 1) == *(p - 1)); /* first character has been matched */
 
 	for (;;) {
 		x = *p;
 		if (x == 0) {
 			break;
 		}
-		y = duk__dec_get(js_ctx);
+		y = duk__json_dec_get(js_ctx);
 		if (x != y) {
 			/* Catches EOF of JSON input. */
 			goto syntax_error;
@@ -34458,61 +37683,74 @@ DUK_LOCAL void duk__dec_req_stridx(duk_json_dec_ctx *js_ctx, duk_small_uint_t st
 
 	return;
 
- syntax_error:
-	duk__dec_syntax_error(js_ctx);
+syntax_error:
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 }
 
-DUK_LOCAL duk_small_int_t duk__dec_string_escape(duk_json_dec_ctx *js_ctx, duk_uint8_t **ext_p) {
+DUK_LOCAL duk_small_int_t duk__json_dec_string_escape(duk_json_dec_ctx *js_ctx, duk_uint8_t **ext_p) {
 	duk_uint_fast32_t cp;
 
 	/* EOF (-1) will be cast to an unsigned value first
 	 * and then re-cast for the switch.  In any case, it
 	 * will match the default case (syntax error).
 	 */
-	cp = (duk_uint_fast32_t) duk__dec_get(js_ctx);
+	cp = (duk_uint_fast32_t) duk__json_dec_get(js_ctx);
 	switch (cp) {
-	case DUK_ASC_BACKSLASH: break;
-	case DUK_ASC_DOUBLEQUOTE: break;
-	case DUK_ASC_SLASH: break;
-	case DUK_ASC_LC_T: cp = 0x09; break;
-	case DUK_ASC_LC_N: cp = 0x0a; break;
-	case DUK_ASC_LC_R: cp = 0x0d; break;
-	case DUK_ASC_LC_F: cp = 0x0c; break;
-	case DUK_ASC_LC_B: cp = 0x08; break;
+	case DUK_ASC_BACKSLASH:
+		break;
+	case DUK_ASC_DOUBLEQUOTE:
+		break;
+	case DUK_ASC_SLASH:
+		break;
+	case DUK_ASC_LC_T:
+		cp = 0x09;
+		break;
+	case DUK_ASC_LC_N:
+		cp = 0x0a;
+		break;
+	case DUK_ASC_LC_R:
+		cp = 0x0d;
+		break;
+	case DUK_ASC_LC_F:
+		cp = 0x0c;
+		break;
+	case DUK_ASC_LC_B:
+		cp = 0x08;
+		break;
 	case DUK_ASC_LC_U: {
-		cp = duk__dec_decode_hex_escape(js_ctx, 4);
+		cp = duk__json_dec_decode_hex_escape(js_ctx, 4);
 		break;
 	}
 #if defined(DUK_USE_JX)
 	case DUK_ASC_UC_U: {
 		if (js_ctx->flag_ext_custom) {
-			cp = duk__dec_decode_hex_escape(js_ctx, 8);
+			cp = duk__json_dec_decode_hex_escape(js_ctx, 8);
 		} else {
-			return 1;  /* syntax error */
+			return 1; /* syntax error */
 		}
 		break;
 	}
 	case DUK_ASC_LC_X: {
 		if (js_ctx->flag_ext_custom) {
-			cp = duk__dec_decode_hex_escape(js_ctx, 2);
+			cp = duk__json_dec_decode_hex_escape(js_ctx, 2);
 		} else {
-			return 1;  /* syntax error */
+			return 1; /* syntax error */
 		}
 		break;
 	}
-#endif  /* DUK_USE_JX */
+#endif /* DUK_USE_JX */
 	default:
 		/* catches EOF (0x00) */
-		return 1;  /* syntax error */
+		return 1; /* syntax error */
 	}
 
-	DUK_RAW_WRITE_XUTF8(*ext_p, cp);
+	DUK_RAW_WRITEINC_XUTF8(*ext_p, cp);
 
 	return 0;
 }
 
-DUK_LOCAL void duk__dec_string(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_string(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_bufwriter_ctx bw_alloc;
 	duk_bufwriter_ctx *bw;
@@ -34546,7 +37784,7 @@ DUK_LOCAL void duk__dec_string(duk_json_dec_ctx *js_ctx) {
 		/* Ensure space for 1:1 output plus one escape. */
 		q = DUK_BW_ENSURE_RAW(js_ctx->thr, bw, safe + DUK_UNICODE_MAX_XUTF8_LENGTH, q);
 
-		p = js_ctx->p;  /* temp copy, write back for next loop */
+		p = js_ctx->p; /* temp copy, write back for next loop */
 		for (;;) {
 			if (safe == 0) {
 				js_ctx->p = p;
@@ -34571,7 +37809,7 @@ DUK_LOCAL void duk__dec_string(duk_json_dec_ctx *js_ctx) {
 				 * quite slow but it's uncommon).
 				 */
 				js_ctx->p = p;
-				if (duk__dec_string_escape(js_ctx, &q) != 0) {
+				if (duk__json_dec_string_escape(js_ctx, &q) != 0) {
 					goto syntax_error;
 				}
 				break;
@@ -34581,19 +37819,19 @@ DUK_LOCAL void duk__dec_string(duk_json_dec_ctx *js_ctx) {
 			}
 		}
 	}
- found_quote:
-#else  /* DUK_USE_JSON_DECSTRING_FASTPATH */
+found_quote:
+#else /* DUK_USE_JSON_DECSTRING_FASTPATH */
 	for (;;) {
 		duk_uint8_t x;
 
 		q = DUK_BW_ENSURE_RAW(js_ctx->thr, bw, DUK_UNICODE_MAX_XUTF8_LENGTH, q);
 
-		x = duk__dec_get(js_ctx);
+		x = duk__json_dec_get(js_ctx);
 
 		if (x == DUK_ASC_DOUBLEQUOTE) {
 			break;
 		} else if (x == DUK_ASC_BACKSLASH) {
-			if (duk__dec_string_escape(js_ctx, &q) != 0) {
+			if (duk__json_dec_string_escape(js_ctx, &q) != 0) {
 				goto syntax_error;
 			}
 		} else if (x < 0x20) {
@@ -34603,17 +37841,17 @@ DUK_LOCAL void duk__dec_string(duk_json_dec_ctx *js_ctx) {
 			*q++ = (duk_uint8_t) x;
 		}
 	}
-#endif  /* DUK_USE_JSON_DECSTRING_FASTPATH */
+#endif /* DUK_USE_JSON_DECSTRING_FASTPATH */
 
 	DUK_BW_SETPTR_AND_COMPACT(js_ctx->thr, bw, q);
-	(void) duk_buffer_to_string(thr, -1);  /* Safe if input string is safe. */
+	(void) duk_buffer_to_string(thr, -1); /* Safe if input string is safe. */
 
 	/* [ ... str ] */
 
 	return;
 
- syntax_error:
-	duk__dec_syntax_error(js_ctx);
+syntax_error:
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 }
 
@@ -34621,14 +37859,14 @@ DUK_LOCAL void duk__dec_string(duk_json_dec_ctx *js_ctx) {
 /* Decode a plain string consisting entirely of identifier characters.
  * Used to parse plain keys (e.g. "foo: 123").
  */
-DUK_LOCAL void duk__dec_plain_string(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_plain_string(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	const duk_uint8_t *p;
 	duk_small_int_t x;
 
 	/* Caller has already eaten the first char so backtrack one byte. */
 
-	js_ctx->p--;  /* safe */
+	js_ctx->p--; /* safe */
 	p = js_ctx->p;
 
 	/* Here again we parse bytes, and non-ASCII UTF-8 will cause end of
@@ -34660,10 +37898,10 @@ DUK_LOCAL void duk__dec_plain_string(duk_json_dec_ctx *js_ctx) {
 
 	/* [ ... str ] */
 }
-#endif  /* DUK_USE_JX */
+#endif /* DUK_USE_JX */
 
 #if defined(DUK_USE_JX)
-DUK_LOCAL void duk__dec_pointer(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_pointer(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	const duk_uint8_t *p;
 	duk_small_int_t x;
@@ -34703,20 +37941,20 @@ DUK_LOCAL void duk__dec_pointer(duk_json_dec_ctx *js_ctx) {
 	voidptr = NULL;
 	(void) DUK_SSCANF((const char *) js_ctx->p, DUK_STR_FMT_PTR, &voidptr);
 	duk_push_pointer(thr, voidptr);
-	js_ctx->p = p + 1;  /* skip ')' */
+	js_ctx->p = p + 1; /* skip ')' */
 
 	/* [ ... ptr ] */
 
 	return;
 
- syntax_error:
-	duk__dec_syntax_error(js_ctx);
+syntax_error:
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 }
-#endif  /* DUK_USE_JX */
+#endif /* DUK_USE_JX */
 
 #if defined(DUK_USE_JX)
-DUK_LOCAL void duk__dec_buffer(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_buffer(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	const duk_uint8_t *p;
 	duk_uint8_t *buf;
@@ -34761,20 +37999,20 @@ DUK_LOCAL void duk__dec_buffer(duk_json_dec_ctx *js_ctx) {
 	duk_memcpy((void *) buf, (const void *) js_ctx->p, src_len);
 	duk_hex_decode(thr, -1);
 
-	js_ctx->p = p + 1;  /* skip '|' */
+	js_ctx->p = p + 1; /* skip '|' */
 
 	/* [ ... buf ] */
 
 	return;
 
- syntax_error:
-	duk__dec_syntax_error(js_ctx);
+syntax_error:
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 }
-#endif  /* DUK_USE_JX */
+#endif /* DUK_USE_JX */
 
 /* Parse a number, other than NaN or +/- Infinity */
-DUK_LOCAL void duk__dec_number(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_number(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	const duk_uint8_t *p_start;
 	const duk_uint8_t *p;
@@ -34794,67 +38032,67 @@ DUK_LOCAL void duk__dec_number(duk_json_dec_ctx *js_ctx) {
 		x = *p;
 
 		DUK_DDD(DUK_DDDPRINT("parse_number: p_start=%p, p=%p, p_end=%p, x=%ld",
-		                     (const void *) p_start, (const void *) p,
-		                     (const void *) js_ctx->p_end, (long) x));
+		                     (const void *) p_start,
+		                     (const void *) p,
+		                     (const void *) js_ctx->p_end,
+		                     (long) x));
 
 #if defined(DUK_USE_JSON_DECNUMBER_FASTPATH)
 		/* This fast path is pretty marginal in practice.
 		 * XXX: candidate for removal.
 		 */
-		DUK_ASSERT(duk__json_decnumber_lookup[0x00] == 0x00);  /* end-of-input breaks */
+		DUK_ASSERT(duk__json_decnumber_lookup[0x00] == 0x00); /* end-of-input breaks */
 		if (duk__json_decnumber_lookup[x] == 0) {
 			break;
 		}
-#else  /* DUK_USE_JSON_DECNUMBER_FASTPATH */
+#else /* DUK_USE_JSON_DECNUMBER_FASTPATH */
 		if (!((x >= DUK_ASC_0 && x <= DUK_ASC_9) ||
-		      (x == DUK_ASC_PERIOD || x == DUK_ASC_LC_E ||
-		       x == DUK_ASC_UC_E || x == DUK_ASC_MINUS || x == DUK_ASC_PLUS))) {
+		      (x == DUK_ASC_PERIOD || x == DUK_ASC_LC_E || x == DUK_ASC_UC_E || x == DUK_ASC_MINUS || x == DUK_ASC_PLUS))) {
 			/* Plus sign must be accepted for positive exponents
 			 * (e.g. '1.5e+2').  This clause catches NULs.
 			 */
 			break;
 		}
-#endif  /* DUK_USE_JSON_DECNUMBER_FASTPATH */
-		p++;  /* safe, because matched (NUL causes a break) */
+#endif /* DUK_USE_JSON_DECNUMBER_FASTPATH */
+		p++; /* safe, because matched (NUL causes a break) */
 	}
 	js_ctx->p = p;
 
 	DUK_ASSERT(js_ctx->p > p_start);
 	duk_push_lstring(thr, (const char *) p_start, (duk_size_t) (p - p_start));
 
-	s2n_flags = DUK_S2N_FLAG_ALLOW_EXP |
-	            DUK_S2N_FLAG_ALLOW_MINUS |  /* but don't allow leading plus */
+	s2n_flags = DUK_S2N_FLAG_ALLOW_EXP | DUK_S2N_FLAG_ALLOW_MINUS | /* but don't allow leading plus */
 	            DUK_S2N_FLAG_ALLOW_FRAC;
 
-	DUK_DDD(DUK_DDDPRINT("parse_number: string before parsing: %!T",
-	                     (duk_tval *) duk_get_tval(thr, -1)));
+	DUK_DDD(DUK_DDDPRINT("parse_number: string before parsing: %!T", (duk_tval *) duk_get_tval(thr, -1)));
 	duk_numconv_parse(thr, 10 /*radix*/, s2n_flags);
 	if (duk_is_nan(thr, -1)) {
-		duk__dec_syntax_error(js_ctx);
+		duk__json_dec_syntax_error(js_ctx);
 	}
 	DUK_ASSERT(duk_is_number(thr, -1));
-	DUK_DDD(DUK_DDDPRINT("parse_number: final number: %!T",
-	                     (duk_tval *) duk_get_tval(thr, -1)));
+	DUK_DDD(DUK_DDDPRINT("parse_number: final number: %!T", (duk_tval *) duk_get_tval(thr, -1)));
 
 	/* [ ... num ] */
 }
 
-DUK_LOCAL void duk__dec_objarr_entry(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_objarr_entry(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_require_stack(thr, DUK_JSON_DEC_REQSTACK);
 
 	/* c recursion check */
 
-	DUK_ASSERT_DISABLE(js_ctx->recursion_depth >= 0);  /* unsigned */
+	duk_native_stack_check(thr);
+
+	DUK_ASSERT_DISABLE(js_ctx->recursion_depth >= 0); /* unsigned */
 	DUK_ASSERT(js_ctx->recursion_depth <= js_ctx->recursion_limit);
 	if (js_ctx->recursion_depth >= js_ctx->recursion_limit) {
-		DUK_ERROR_RANGE(thr, DUK_STR_JSONDEC_RECLIMIT);
+		DUK_ERROR_RANGE(thr, DUK_STR_DEC_RECLIMIT);
 		DUK_WO_NORETURN(return;);
 	}
 	js_ctx->recursion_depth++;
 }
 
-DUK_LOCAL void duk__dec_objarr_exit(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_objarr_exit(duk_json_dec_ctx *js_ctx) {
 	/* c recursion check */
 
 	DUK_ASSERT(js_ctx->recursion_depth > 0);
@@ -34862,14 +38100,14 @@ DUK_LOCAL void duk__dec_objarr_exit(duk_json_dec_ctx *js_ctx) {
 	js_ctx->recursion_depth--;
 }
 
-DUK_LOCAL void duk__dec_object(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_object(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
-	duk_int_t key_count;  /* XXX: a "first" flag would suffice */
+	duk_int_t key_count; /* XXX: a "first" flag would suffice */
 	duk_uint8_t x;
 
 	DUK_DDD(DUK_DDDPRINT("parse_object"));
 
-	duk__dec_objarr_entry(js_ctx);
+	duk__json_dec_objarr_entry(js_ctx);
 
 	duk_push_object(thr);
 
@@ -34877,17 +38115,18 @@ DUK_LOCAL void duk__dec_object(duk_json_dec_ctx *js_ctx) {
 
 	key_count = 0;
 	for (;;) {
-		x = duk__dec_get_nonwhite(js_ctx);
+		x = duk__json_dec_get_nonwhite(js_ctx);
 
 		DUK_DDD(DUK_DDDPRINT("parse_object: obj=%!T, x=%ld, key_count=%ld",
 		                     (duk_tval *) duk_get_tval(thr, -1),
-		                     (long) x, (long) key_count));
+		                     (long) x,
+		                     (long) key_count));
 
 		/* handle comma and closing brace */
 
 		if (x == DUK_ASC_COMMA && key_count > 0) {
 			/* accept comma, expect new value */
-			x = duk__dec_get_nonwhite(js_ctx);
+			x = duk__json_dec_get_nonwhite(js_ctx);
 		} else if (x == DUK_ASC_RCURLY) {
 			/* eat closing brace */
 			break;
@@ -34904,11 +38143,10 @@ DUK_LOCAL void duk__dec_object(duk_json_dec_ctx *js_ctx) {
 		/* parse key and value */
 
 		if (x == DUK_ASC_DOUBLEQUOTE) {
-			duk__dec_string(js_ctx);
+			duk__json_dec_string(js_ctx);
 #if defined(DUK_USE_JX)
-		} else if (js_ctx->flag_ext_custom &&
-		           duk_unicode_is_identifier_start((duk_codepoint_t) x)) {
-			duk__dec_plain_string(js_ctx);
+		} else if (js_ctx->flag_ext_custom && duk_unicode_is_identifier_start((duk_codepoint_t) x)) {
+			duk__json_dec_plain_string(js_ctx);
 #endif
 		} else {
 			goto syntax_error;
@@ -34916,12 +38154,12 @@ DUK_LOCAL void duk__dec_object(duk_json_dec_ctx *js_ctx) {
 
 		/* [ ... obj key ] */
 
-		x = duk__dec_get_nonwhite(js_ctx);
+		x = duk__json_dec_get_nonwhite(js_ctx);
 		if (x != DUK_ASC_COLON) {
 			goto syntax_error;
 		}
 
-		duk__dec_value(js_ctx);
+		duk__json_dec_value(js_ctx);
 
 		/* [ ... obj key val ] */
 
@@ -34934,25 +38172,24 @@ DUK_LOCAL void duk__dec_object(duk_json_dec_ctx *js_ctx) {
 
 	/* [ ... obj ] */
 
-	DUK_DDD(DUK_DDDPRINT("parse_object: final object is %!T",
-	                     (duk_tval *) duk_get_tval(thr, -1)));
+	DUK_DDD(DUK_DDDPRINT("parse_object: final object is %!T", (duk_tval *) duk_get_tval(thr, -1)));
 
-	duk__dec_objarr_exit(js_ctx);
+	duk__json_dec_objarr_exit(js_ctx);
 	return;
 
- syntax_error:
-	duk__dec_syntax_error(js_ctx);
+syntax_error:
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 }
 
-DUK_LOCAL void duk__dec_array(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_array(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_uarridx_t arr_idx;
 	duk_uint8_t x;
 
 	DUK_DDD(DUK_DDDPRINT("parse_array"));
 
-	duk__dec_objarr_entry(js_ctx);
+	duk__json_dec_objarr_entry(js_ctx);
 
 	duk_push_array(thr);
 
@@ -34960,11 +38197,12 @@ DUK_LOCAL void duk__dec_array(duk_json_dec_ctx *js_ctx) {
 
 	arr_idx = 0;
 	for (;;) {
-		x = duk__dec_get_nonwhite(js_ctx);
+		x = duk__json_dec_get_nonwhite(js_ctx);
 
 		DUK_DDD(DUK_DDDPRINT("parse_array: arr=%!T, x=%ld, arr_idx=%ld",
 		                     (duk_tval *) duk_get_tval(thr, -1),
-		                     (long) x, (long) arr_idx));
+		                     (long) x,
+		                     (long) arr_idx));
 
 		/* handle comma and closing bracket */
 
@@ -34976,9 +38214,9 @@ DUK_LOCAL void duk__dec_array(duk_json_dec_ctx *js_ctx) {
 			break;
 		} else if (arr_idx == 0) {
 			/* accept anything, expect first value (EOF will be
-			 * caught by duk__dec_value() below.
+			 * caught by duk__json_dec_value() below.
 			 */
-			js_ctx->p--;  /* backtrack (safe) */
+			js_ctx->p--; /* backtrack (safe) */
 		} else {
 			/* catches EOF (NUL) and initial comma */
 			goto syntax_error;
@@ -34986,7 +38224,7 @@ DUK_LOCAL void duk__dec_array(duk_json_dec_ctx *js_ctx) {
 
 		/* parse value */
 
-		duk__dec_value(js_ctx);
+		duk__json_dec_value(js_ctx);
 
 		/* [ ... arr val ] */
 
@@ -35002,117 +38240,123 @@ DUK_LOCAL void duk__dec_array(duk_json_dec_ctx *js_ctx) {
 
 	/* [ ... arr ] */
 
-	DUK_DDD(DUK_DDDPRINT("parse_array: final array is %!T",
-	                     (duk_tval *) duk_get_tval(thr, -1)));
+	DUK_DDD(DUK_DDDPRINT("parse_array: final array is %!T", (duk_tval *) duk_get_tval(thr, -1)));
 
-	duk__dec_objarr_exit(js_ctx);
+	duk__json_dec_objarr_exit(js_ctx);
 	return;
 
- syntax_error:
-	duk__dec_syntax_error(js_ctx);
+syntax_error:
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 }
 
-DUK_LOCAL void duk__dec_value(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_value(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_uint8_t x;
 
-	x = duk__dec_get_nonwhite(js_ctx);
+	x = duk__json_dec_get_nonwhite(js_ctx);
 
 	DUK_DDD(DUK_DDDPRINT("parse_value: initial x=%ld", (long) x));
 
-	/* Note: duk__dec_req_stridx() backtracks one char */
+	/* Note: duk__json_dec_req_stridx() backtracks one char */
 
 	if (x == DUK_ASC_DOUBLEQUOTE) {
-		duk__dec_string(js_ctx);
+		duk__json_dec_string(js_ctx);
 	} else if ((x >= DUK_ASC_0 && x <= DUK_ASC_9) || (x == DUK_ASC_MINUS)) {
 #if defined(DUK_USE_JX)
-		if (js_ctx->flag_ext_custom && x == DUK_ASC_MINUS && duk__dec_peek(js_ctx) == DUK_ASC_UC_I) {
-			duk__dec_req_stridx(js_ctx, DUK_STRIDX_MINUS_INFINITY);  /* "-Infinity", '-' has been eaten */
+		if (js_ctx->flag_ext_custom && x == DUK_ASC_MINUS && duk__json_dec_peek(js_ctx) == DUK_ASC_UC_I) {
+			duk__json_dec_req_stridx(js_ctx, DUK_STRIDX_MINUS_INFINITY); /* "-Infinity", '-' has been eaten */
 			duk_push_number(thr, -DUK_DOUBLE_INFINITY);
 		} else {
 #else
-		{  /* unconditional block */
+		{ /* unconditional block */
 #endif
 			/* We already ate 'x', so backup one byte. */
-			js_ctx->p--;  /* safe */
-			duk__dec_number(js_ctx);
+			js_ctx->p--; /* safe */
+			duk__json_dec_number(js_ctx);
 		}
 	} else if (x == DUK_ASC_LC_T) {
-		duk__dec_req_stridx(js_ctx, DUK_STRIDX_TRUE);
+		duk__json_dec_req_stridx(js_ctx, DUK_STRIDX_TRUE);
 		duk_push_true(thr);
 	} else if (x == DUK_ASC_LC_F) {
-		duk__dec_req_stridx(js_ctx, DUK_STRIDX_FALSE);
+		duk__json_dec_req_stridx(js_ctx, DUK_STRIDX_FALSE);
 		duk_push_false(thr);
 	} else if (x == DUK_ASC_LC_N) {
-		duk__dec_req_stridx(js_ctx, DUK_STRIDX_LC_NULL);
+		duk__json_dec_req_stridx(js_ctx, DUK_STRIDX_LC_NULL);
 		duk_push_null(thr);
 #if defined(DUK_USE_JX)
 	} else if (js_ctx->flag_ext_custom && x == DUK_ASC_LC_U) {
-		duk__dec_req_stridx(js_ctx, DUK_STRIDX_LC_UNDEFINED);
+		duk__json_dec_req_stridx(js_ctx, DUK_STRIDX_LC_UNDEFINED);
 		duk_push_undefined(thr);
 	} else if (js_ctx->flag_ext_custom && x == DUK_ASC_UC_N) {
-		duk__dec_req_stridx(js_ctx, DUK_STRIDX_NAN);
+		duk__json_dec_req_stridx(js_ctx, DUK_STRIDX_NAN);
 		duk_push_nan(thr);
 	} else if (js_ctx->flag_ext_custom && x == DUK_ASC_UC_I) {
-		duk__dec_req_stridx(js_ctx, DUK_STRIDX_INFINITY);
+		duk__json_dec_req_stridx(js_ctx, DUK_STRIDX_INFINITY);
 		duk_push_number(thr, DUK_DOUBLE_INFINITY);
 	} else if (js_ctx->flag_ext_custom && x == DUK_ASC_LPAREN) {
-		duk__dec_pointer(js_ctx);
+		duk__json_dec_pointer(js_ctx);
 	} else if (js_ctx->flag_ext_custom && x == DUK_ASC_PIPE) {
-		duk__dec_buffer(js_ctx);
+		duk__json_dec_buffer(js_ctx);
 #endif
 	} else if (x == DUK_ASC_LCURLY) {
-		duk__dec_object(js_ctx);
+		duk__json_dec_object(js_ctx);
 	} else if (x == DUK_ASC_LBRACKET) {
-		duk__dec_array(js_ctx);
+		duk__json_dec_array(js_ctx);
 	} else {
 		/* catches EOF (NUL) */
 		goto syntax_error;
 	}
 
-	duk__dec_eat_white(js_ctx);
+	duk__json_dec_eat_white(js_ctx);
 
 	/* [ ... val ] */
 	return;
 
- syntax_error:
-	duk__dec_syntax_error(js_ctx);
+syntax_error:
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 }
 
-/* Recursive value reviver, implements the Walk() algorithm.  No C recursion
- * check is done here because the initial parsing step will already ensure
- * there is a reasonable limit on C recursion depth and hence object depth.
+/* Recursive value reviver, implements the Walk() algorithm.  The parsing
+ * step ensures there is a reasonable depth limit to the input.  However,
+ * the reviver may create more depth by editing object or array entries, so
+ * we have both C recursion limit and native stack checks here.
  */
-DUK_LOCAL void duk__dec_reviver_walk(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_reviver_walk(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_hobject *h;
 	duk_uarridx_t i, arr_len;
 
+	duk__json_dec_objarr_entry(js_ctx);
+
 	DUK_DDD(DUK_DDDPRINT("walk: top=%ld, holder=%!T, name=%!T",
 	                     (long) duk_get_top(thr),
 	                     (duk_tval *) duk_get_tval(thr, -2),
 	                     (duk_tval *) duk_get_tval(thr, -1)));
 
 	duk_dup_top(thr);
-	duk_get_prop(thr, -3);  /* -> [ ... holder name val ] */
+	duk_get_prop(thr, -3); /* -> [ ... holder name val ] */
 
 	h = duk_get_hobject(thr, -1);
 	if (h != NULL) {
-		if (DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_ARRAY) {
+		if (duk_js_isarray_hobject(h)) {
 			arr_len = (duk_uarridx_t) duk_get_length(thr, -1);
 			for (i = 0; i < arr_len; i++) {
 				/* [ ... holder name val ] */
 
 				DUK_DDD(DUK_DDDPRINT("walk: array, top=%ld, i=%ld, arr_len=%ld, holder=%!T, name=%!T, val=%!T",
-				                     (long) duk_get_top(thr), (long) i, (long) arr_len,
-				                     (duk_tval *) duk_get_tval(thr, -3), (duk_tval *) duk_get_tval(thr, -2),
+				                     (long) duk_get_top(thr),
+				                     (long) i,
+				                     (long) arr_len,
+				                     (duk_tval *) duk_get_tval(thr, -3),
+				                     (duk_tval *) duk_get_tval(thr, -2),
 				                     (duk_tval *) duk_get_tval(thr, -1)));
 
 				duk_dup_top(thr);
-				(void) duk_push_uint_to_hstring(thr, (duk_uint_t) i);  /* -> [ ... holder name val val ToString(i) ] */
-				duk__dec_reviver_walk(js_ctx);  /* -> [ ... holder name val new_elem ] */
+				(void) duk_push_uint_to_hstring(thr,
+				                                (duk_uint_t) i); /* -> [ ... holder name val val ToString(i) ] */
+				duk__json_dec_reviver_walk(js_ctx); /* -> [ ... holder name val new_elem ] */
 
 				if (duk_is_undefined(thr, -1)) {
 					duk_pop(thr);
@@ -35130,16 +38374,19 @@ DUK_LOCAL void duk__dec_reviver_walk(duk_json_dec_ctx *js_ctx) {
 			duk_enum(thr, -1, DUK_ENUM_OWN_PROPERTIES_ONLY /*flags*/);
 			while (duk_next(thr, -1 /*enum_index*/, 0 /*get_value*/)) {
 				DUK_DDD(DUK_DDDPRINT("walk: object, top=%ld, holder=%!T, name=%!T, val=%!T, enum=%!iT, obj_key=%!T",
-				                     (long) duk_get_top(thr), (duk_tval *) duk_get_tval(thr, -5),
-				                     (duk_tval *) duk_get_tval(thr, -4), (duk_tval *) duk_get_tval(thr, -3),
-				                     (duk_tval *) duk_get_tval(thr, -2), (duk_tval *) duk_get_tval(thr, -1)));
+				                     (long) duk_get_top(thr),
+				                     (duk_tval *) duk_get_tval(thr, -5),
+				                     (duk_tval *) duk_get_tval(thr, -4),
+				                     (duk_tval *) duk_get_tval(thr, -3),
+				                     (duk_tval *) duk_get_tval(thr, -2),
+				                     (duk_tval *) duk_get_tval(thr, -1)));
 
 				/* [ ... holder name val enum obj_key ] */
 				duk_dup_m3(thr);
 				duk_dup_m2(thr);
 
 				/* [ ... holder name val enum obj_key val obj_key ] */
-				duk__dec_reviver_walk(js_ctx);
+				duk__json_dec_reviver_walk(js_ctx);
 
 				/* [ ... holder name val enum obj_key new_elem ] */
 				if (duk_is_undefined(thr, -1)) {
@@ -35158,32 +38405,33 @@ DUK_LOCAL void duk__dec_reviver_walk(duk_json_dec_ctx *js_ctx) {
 					duk_put_prop(thr, -4);
 				}
 			}
-			duk_pop(thr);  /* pop enum */
+			duk_pop(thr); /* pop enum */
 		}
 	}
 
 	/* [ ... holder name val ] */
 
 	duk_dup(thr, js_ctx->idx_reviver);
-	duk_insert(thr, -4);  /* -> [ ... reviver holder name val ] */
-	duk_call_method(thr, 2);  /* -> [ ... res ] */
+	duk_insert(thr, -4); /* -> [ ... reviver holder name val ] */
+	duk_call_method(thr, 2); /* -> [ ... res ] */
+
+	duk__json_dec_objarr_exit(js_ctx);
 
-	DUK_DDD(DUK_DDDPRINT("walk: top=%ld, result=%!T",
-	                     (long) duk_get_top(thr), (duk_tval *) duk_get_tval(thr, -1)));
+	DUK_DDD(DUK_DDDPRINT("walk: top=%ld, result=%!T", (long) duk_get_top(thr), (duk_tval *) duk_get_tval(thr, -1)));
 }
 
 /*
  *  Stringify implementation.
  */
 
-#define DUK__EMIT_1(js_ctx,ch)          duk__emit_1((js_ctx), (duk_uint_fast8_t) (ch))
-#define DUK__EMIT_2(js_ctx,ch1,ch2)     duk__emit_2((js_ctx), (duk_uint_fast8_t) (ch1), (duk_uint_fast8_t) (ch2))
-#define DUK__EMIT_HSTR(js_ctx,h)        duk__emit_hstring((js_ctx), (h))
+#define DUK__EMIT_1(js_ctx, ch)       duk__emit_1((js_ctx), (duk_uint_fast8_t) (ch))
+#define DUK__EMIT_2(js_ctx, ch1, ch2) duk__emit_2((js_ctx), (duk_uint_fast8_t) (ch1), (duk_uint_fast8_t) (ch2))
+#define DUK__EMIT_HSTR(js_ctx, h)     duk__emit_hstring((js_ctx), (h))
 #if defined(DUK_USE_FASTINT) || defined(DUK_USE_JX) || defined(DUK_USE_JC)
-#define DUK__EMIT_CSTR(js_ctx,p)        duk__emit_cstring((js_ctx), (p))
+#define DUK__EMIT_CSTR(js_ctx, p) duk__emit_cstring((js_ctx), (p))
 #endif
-#define DUK__EMIT_STRIDX(js_ctx,i)      duk__emit_stridx((js_ctx), (i))
-#define DUK__UNEMIT_1(js_ctx)           duk__unemit_1((js_ctx))
+#define DUK__EMIT_STRIDX(js_ctx, i) duk__emit_stridx((js_ctx), (i))
+#define DUK__UNEMIT_1(js_ctx)       duk__unemit_1((js_ctx))
 
 DUK_LOCAL void duk__emit_1(duk_json_enc_ctx *js_ctx, duk_uint_fast8_t ch) {
 	DUK_BW_WRITE_ENSURE_U8(js_ctx->thr, &js_ctx->bw, ch);
@@ -35218,10 +38466,8 @@ DUK_LOCAL void duk__unemit_1(duk_json_enc_ctx *js_ctx) {
 	DUK_BW_ADD_PTR(js_ctx->thr, &js_ctx->bw, -1);
 }
 
-#define DUK__MKESC(nybbles,esc1,esc2)  \
-	(((duk_uint_fast32_t) (nybbles)) << 16) | \
-	(((duk_uint_fast32_t) (esc1)) << 8) | \
-	((duk_uint_fast32_t) (esc2))
+#define DUK__MKESC(nybbles, esc1, esc2) \
+	(((duk_uint_fast32_t) (nybbles)) << 16) | (((duk_uint_fast32_t) (esc1)) << 8) | ((duk_uint_fast32_t) (esc2))
 
 DUK_LOCAL duk_uint8_t *duk__emit_esc_auto_fast(duk_json_enc_ctx *js_ctx, duk_uint_fast32_t cp, duk_uint8_t *q) {
 	duk_uint_fast32_t tmp;
@@ -35246,7 +38492,7 @@ DUK_LOCAL duk_uint8_t *duk__emit_esc_auto_fast(duk_json_enc_ctx *js_ctx, duk_uin
 		}
 	} else
 #endif
-	if (DUK_LIKELY(cp < 0x10000UL)) {
+	    if (DUK_LIKELY(cp < 0x10000UL)) {
 		tmp = DUK__MKESC(4, DUK_ASC_BACKSLASH, DUK_ASC_LC_U);
 	} else {
 #if defined(DUK_USE_JX)
@@ -35277,8 +38523,8 @@ DUK_LOCAL duk_uint8_t *duk__emit_esc_auto_fast(duk_json_enc_ctx *js_ctx, duk_uin
 	return q;
 }
 
-DUK_LOCAL void duk__enc_key_autoquote(duk_json_enc_ctx *js_ctx, duk_hstring *k) {
-	const duk_int8_t *p, *p_start, *p_end;  /* Note: intentionally signed. */
+DUK_LOCAL void duk__json_enc_key_autoquote(duk_json_enc_ctx *js_ctx, duk_hstring *k) {
+	const duk_int8_t *p, *p_start, *p_end; /* Note: intentionally signed. */
 	duk_size_t k_len;
 	duk_codepoint_t cp;
 
@@ -35319,8 +38565,8 @@ DUK_LOCAL void duk__enc_key_autoquote(duk_json_enc_ctx *js_ctx, duk_hstring *k)
 		return;
 	}
 
- quote_normally:
-	duk__enc_quote_string(js_ctx, k);
+quote_normally:
+	duk__json_enc_quote_string(js_ctx, k);
 }
 
 /* The Quote(value) operation: quote a string.
@@ -35328,13 +38574,13 @@ DUK_LOCAL void duk__enc_key_autoquote(duk_json_enc_ctx *js_ctx, duk_hstring *k)
  * Stack policy: [ ] -> [ ].
  */
 
-DUK_LOCAL void duk__enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_str) {
+DUK_LOCAL void duk__json_enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_str) {
 	duk_hthread *thr = js_ctx->thr;
 	const duk_uint8_t *p, *p_start, *p_end, *p_now, *p_tmp;
 	duk_uint8_t *q;
-	duk_ucodepoint_t cp;  /* typed for duk_unicode_decode_xutf8() */
+	duk_ucodepoint_t cp; /* typed for duk_unicode_decode_xutf8() */
 
-	DUK_DDD(DUK_DDDPRINT("duk__enc_quote_string: h_str=%!O", (duk_heaphdr *) h_str));
+	DUK_DDD(DUK_DDDPRINT("duk__json_enc_quote_string: h_str=%!O", (duk_heaphdr *) h_str));
 
 	DUK_ASSERT(h_str != NULL);
 	p_start = DUK_HSTRING_GET_DATA(h_str);
@@ -35351,8 +38597,7 @@ DUK_LOCAL void duk__enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_st
 		duk_size_t left, now, space;
 
 		left = (duk_size_t) (p_end - p);
-		now = (left > DUK__JSON_ENCSTR_CHUNKSIZE ?
-		       DUK__JSON_ENCSTR_CHUNKSIZE : left);
+		now = (left > DUK__JSON_ENCSTR_CHUNKSIZE ? DUK__JSON_ENCSTR_CHUNKSIZE : left);
 
 		/* Maximum expansion per input byte is 6:
 		 *   - invalid UTF-8 byte causes "\uXXXX" to be emitted (6/1 = 6).
@@ -35388,7 +38633,7 @@ DUK_LOCAL void duk__enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_st
 				p--;
 
 				/* slow path is shared */
-#else  /* DUK_USE_JSON_QUOTESTRING_FASTPATH */
+#else /* DUK_USE_JSON_QUOTESTRING_FASTPATH */
 			cp = *p;
 
 			if (DUK_LIKELY(cp <= 0x7f)) {
@@ -35419,7 +38664,7 @@ DUK_LOCAL void duk__enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_st
 				}
 			} else {
 				/* slow path is shared */
-#endif  /* DUK_USE_JSON_QUOTESTRING_FASTPATH */
+#endif /* DUK_USE_JSON_QUOTESTRING_FASTPATH */
 
 				/* slow path decode */
 
@@ -35451,7 +38696,7 @@ DUK_LOCAL void duk__enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_st
 					q = duk__emit_esc_auto_fast(js_ctx, cp, q);
 				} else {
 					/* as is */
-					DUK_RAW_WRITE_XUTF8(q, cp);
+					DUK_RAW_WRITEINC_XUTF8(q, cp);
 				}
 			}
 		}
@@ -35465,7 +38710,7 @@ DUK_LOCAL void duk__enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_st
 /* Encode a double (checked by caller) from stack top.  Stack top may be
  * replaced by serialized string but is not popped (caller does that).
  */
-DUK_LOCAL void duk__enc_double(duk_json_enc_ctx *js_ctx) {
+DUK_LOCAL void duk__json_enc_double(duk_json_enc_ctx *js_ctx) {
 	duk_hthread *thr;
 	duk_tval *tv;
 	duk_double_t d;
@@ -35495,11 +38740,10 @@ DUK_LOCAL void duk__enc_double(duk_json_enc_ctx *js_ctx) {
 		/* Negative zero needs special handling in JX/JC because
 		 * it would otherwise serialize to '0', not '-0'.
 		 */
-		if (DUK_UNLIKELY(c == DUK_FP_ZERO && s != 0 &&
-		                 (js_ctx->flag_ext_custom_or_compatible))) {
-			duk_push_hstring_stridx(thr, DUK_STRIDX_MINUS_ZERO);  /* '-0' */
+		if (DUK_UNLIKELY(c == DUK_FP_ZERO && s != 0 && (js_ctx->flag_ext_custom_or_compatible))) {
+			duk_push_hstring_stridx(thr, DUK_STRIDX_MINUS_ZERO); /* '-0' */
 		} else
-#endif  /* DUK_USE_JX || DUK_USE_JC */
+#endif /* DUK_USE_JX || DUK_USE_JC */
 		{
 			n2s_flags = 0;
 			/* [ ... number ] -> [ ... string ] */
@@ -35511,8 +38755,7 @@ DUK_LOCAL void duk__enc_double(duk_json_enc_ctx *js_ctx) {
 	}
 
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
-	if (!(js_ctx->flags & (DUK_JSON_FLAG_EXT_CUSTOM |
-	                       DUK_JSON_FLAG_EXT_COMPATIBLE))) {
+	if (!(js_ctx->flags & (DUK_JSON_FLAG_EXT_CUSTOM | DUK_JSON_FLAG_EXT_COMPATIBLE))) {
 		stridx = DUK_STRIDX_LC_NULL;
 	} else if (c == DUK_FP_NAN) {
 		stridx = js_ctx->stridx_custom_nan;
@@ -35529,7 +38772,7 @@ DUK_LOCAL void duk__enc_double(duk_json_enc_ctx *js_ctx) {
 
 #if defined(DUK_USE_FASTINT)
 /* Encode a fastint from duk_tval ptr, no value stack effects. */
-DUK_LOCAL void duk__enc_fastint_tval(duk_json_enc_ctx *js_ctx, duk_tval *tv) {
+DUK_LOCAL void duk__json_enc_fastint_tval(duk_json_enc_ctx *js_ctx, duk_tval *tv) {
 	duk_int64_t v;
 
 	/* Fastint range is signed 48-bit so longest value is -2^47 = -140737488355328
@@ -35547,15 +38790,14 @@ DUK_LOCAL void duk__enc_fastint_tval(duk_json_enc_ctx *js_ctx, duk_tval *tv) {
 	 * "long long" type exists.  Could also rely on C99 directly but that
 	 * won't work for older MSVC.
 	 */
-	/*DUK_SPRINTF((char *) buf, "%lld", (long long) v);*/
-	DUK_SPRINTF((char *) buf, "%"PRIsizet, (size_t) v);
+	DUK_SPRINTF((char *) buf, "%lld", (long long) v);
 	DUK__EMIT_CSTR(js_ctx, (const char *) buf);
 }
 #endif
 
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
 #if defined(DUK_USE_HEX_FASTPATH)
-DUK_LOCAL duk_uint8_t *duk__enc_buffer_data_hex(const duk_uint8_t *src, duk_size_t src_len, duk_uint8_t *dst) {
+DUK_LOCAL duk_uint8_t *duk__json_enc_buffer_data_hex(const duk_uint8_t *src, duk_size_t src_len, duk_uint8_t *dst) {
 	duk_uint8_t *q;
 	duk_uint16_t *q16;
 	duk_small_uint_t x;
@@ -35612,8 +38854,8 @@ DUK_LOCAL duk_uint8_t *duk__enc_buffer_data_hex(const duk_uint8_t *src, duk_size
 
 	return q;
 }
-#else  /* DUK_USE_HEX_FASTPATH */
-DUK_LOCAL duk_uint8_t *duk__enc_buffer_data_hex(const duk_uint8_t *src, duk_size_t src_len, duk_uint8_t *dst) {
+#else /* DUK_USE_HEX_FASTPATH */
+DUK_LOCAL duk_uint8_t *duk__json_enc_buffer_data_hex(const duk_uint8_t *src, duk_size_t src_len, duk_uint8_t *dst) {
 	const duk_uint8_t *p;
 	const duk_uint8_t *p_end;
 	duk_uint8_t *q;
@@ -35630,16 +38872,16 @@ DUK_LOCAL duk_uint8_t *duk__enc_buffer_data_hex(const duk_uint8_t *src, duk_size
 
 	return q;
 }
-#endif  /* DUK_USE_HEX_FASTPATH */
+#endif /* DUK_USE_HEX_FASTPATH */
 
-DUK_LOCAL void duk__enc_buffer_data(duk_json_enc_ctx *js_ctx, duk_uint8_t *buf_data, duk_size_t buf_len) {
+DUK_LOCAL void duk__json_enc_buffer_data(duk_json_enc_ctx *js_ctx, duk_uint8_t *buf_data, duk_size_t buf_len) {
 	duk_hthread *thr;
 	duk_uint8_t *q;
 	duk_size_t space;
 
 	thr = js_ctx->thr;
 
-	DUK_ASSERT(js_ctx->flag_ext_custom || js_ctx->flag_ext_compatible);  /* caller checks */
+	DUK_ASSERT(js_ctx->flag_ext_custom || js_ctx->flag_ext_compatible); /* caller checks */
 	DUK_ASSERT(js_ctx->flag_ext_custom_or_compatible);
 
 	/* Buffer values are encoded in (lowercase) hex to make the
@@ -35655,7 +38897,7 @@ DUK_LOCAL void duk__enc_buffer_data(duk_json_enc_ctx *js_ctx, duk_uint8_t *buf_d
 	/* Note: space must cater for both JX and JC. */
 	space = 9 + buf_len * 2 + 2;
 	DUK_ASSERT(DUK_HBUFFER_MAX_BYTELEN <= 0x7ffffffeUL);
-	DUK_ASSERT((space - 2) / 2 >= buf_len);  /* overflow not possible, buffer limits */
+	DUK_ASSERT((space - 2) / 2 >= buf_len); /* overflow not possible, buffer limits */
 	q = DUK_BW_ENSURE_GETPTR(thr, &js_ctx->bw, space);
 
 #if defined(DUK_USE_JX) && defined(DUK_USE_JC)
@@ -35664,7 +38906,7 @@ DUK_LOCAL void duk__enc_buffer_data(duk_json_enc_ctx *js_ctx, duk_uint8_t *buf_d
 #if defined(DUK_USE_JX)
 	{
 		*q++ = DUK_ASC_PIPE;
-		q = duk__enc_buffer_data_hex(buf_data, buf_len, q);
+		q = duk__json_enc_buffer_data_hex(buf_data, buf_len, q);
 		*q++ = DUK_ASC_PIPE;
 
 	}
@@ -35675,9 +38917,9 @@ DUK_LOCAL void duk__enc_buffer_data(duk_json_enc_ctx *js_ctx, duk_uint8_t *buf_d
 #if defined(DUK_USE_JC)
 	{
 		DUK_ASSERT(js_ctx->flag_ext_compatible);
-		duk_memcpy((void *) q, (const void *) "{\"_buf\":\"", 9);  /* len: 9 */
+		duk_memcpy((void *) q, (const void *) "{\"_buf\":\"", 9); /* len: 9 */
 		q += 9;
-		q = duk__enc_buffer_data_hex(buf_data, buf_len, q);
+		q = duk__json_enc_buffer_data_hex(buf_data, buf_len, q);
 		*q++ = DUK_ASC_DOUBLEQUOTE;
 		*q++ = DUK_ASC_RCURLY;
 	}
@@ -35686,15 +38928,15 @@ DUK_LOCAL void duk__enc_buffer_data(duk_json_enc_ctx *js_ctx, duk_uint8_t *buf_d
 	DUK_BW_SET_PTR(thr, &js_ctx->bw, q);
 }
 
-DUK_LOCAL void duk__enc_buffer_jx_jc(duk_json_enc_ctx *js_ctx, duk_hbuffer *h) {
-	duk__enc_buffer_data(js_ctx,
-	                     (duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(js_ctx->thr->heap, h),
-	                     (duk_size_t) DUK_HBUFFER_GET_SIZE(h));
+DUK_LOCAL void duk__json_enc_buffer_jx_jc(duk_json_enc_ctx *js_ctx, duk_hbuffer *h) {
+	duk__json_enc_buffer_data(js_ctx,
+	                          (duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(js_ctx->thr->heap, h),
+	                          (duk_size_t) DUK_HBUFFER_GET_SIZE(h));
 }
-#endif  /* DUK_USE_JX || DUK_USE_JC */
+#endif /* DUK_USE_JX || DUK_USE_JC */
 
 #if defined(DUK_USE_JSON_STRINGIFY_FASTPATH)
-DUK_LOCAL void duk__enc_buffer_json_fastpath(duk_json_enc_ctx *js_ctx, duk_hbuffer *h) {
+DUK_LOCAL void duk__json_enc_buffer_json_fastpath(duk_json_enc_ctx *js_ctx, duk_hbuffer *h) {
 	duk_size_t i, n;
 	const duk_uint8_t *buf;
 	duk_uint8_t *q;
@@ -35718,7 +38960,7 @@ DUK_LOCAL void duk__enc_buffer_json_fastpath(duk_json_enc_ctx *js_ctx, duk_hbuff
 	buf = (const duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(js_ctx->thr->heap, h);
 	if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
 		for (i = 0; i < n; i++) {
-			duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth + 1);
+			duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth + 1);
 			q = DUK_BW_ENSURE_GETPTR(js_ctx->thr, &js_ctx->bw, 32);
 			q += DUK_SPRINTF((char *) q, "\"%lu\": %u,", (unsigned long) i, (unsigned int) buf[i]);
 			DUK_BW_SET_PTR(js_ctx->thr, &js_ctx->bw, q);
@@ -35731,21 +38973,21 @@ DUK_LOCAL void duk__enc_buffer_json_fastpath(duk_json_enc_ctx *js_ctx, duk_hbuff
 		}
 		DUK_BW_SET_PTR(js_ctx->thr, &js_ctx->bw, q);
 	}
-	DUK__UNEMIT_1(js_ctx);  /* eat trailing comma */
+	DUK__UNEMIT_1(js_ctx); /* eat trailing comma */
 
 	if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
-		duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth);
+		duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth);
 	}
 	DUK__EMIT_1(js_ctx, DUK_ASC_RCURLY);
 }
-#endif  /* DUK_USE_JSON_STRINGIFY_FASTPATH */
+#endif /* DUK_USE_JSON_STRINGIFY_FASTPATH */
 
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
-DUK_LOCAL void duk__enc_pointer(duk_json_enc_ctx *js_ctx, void *ptr) {
-	char buf[64];  /* XXX: how to figure correct size? */
+DUK_LOCAL void duk__json_enc_pointer(duk_json_enc_ctx *js_ctx, void *ptr) {
+	char buf[64]; /* XXX: how to figure correct size? */
 	const char *fmt;
 
-	DUK_ASSERT(js_ctx->flag_ext_custom || js_ctx->flag_ext_compatible);  /* caller checks */
+	DUK_ASSERT(js_ctx->flag_ext_custom || js_ctx->flag_ext_compatible); /* caller checks */
 	DUK_ASSERT(js_ctx->flag_ext_custom_or_compatible);
 
 	duk_memzero(buf, sizeof(buf));
@@ -35772,52 +39014,52 @@ DUK_LOCAL void duk__enc_pointer(duk_json_enc_ctx *js_ctx, void *ptr) {
 #endif
 
 	/* When ptr == NULL, the format argument is unused. */
-	DUK_SNPRINTF(buf, sizeof(buf) - 1, fmt, ptr);  /* must not truncate */
+	DUK_SNPRINTF(buf, sizeof(buf) - 1, fmt, ptr); /* must not truncate */
 	DUK__EMIT_CSTR(js_ctx, buf);
 }
-#endif  /* DUK_USE_JX || DUK_USE_JC */
+#endif /* DUK_USE_JX || DUK_USE_JC */
 
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
-DUK_LOCAL void duk__enc_bufobj(duk_json_enc_ctx *js_ctx, duk_hbufobj *h_bufobj) {
-	DUK_ASSERT_HBUFOBJ_VALID(h_bufobj);
+DUK_LOCAL void duk__json_enc_bufobj(duk_json_enc_ctx *js_ctx, duk_hbufobj *h_bufobj) {
+	DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
 
 	if (h_bufobj->buf == NULL || !DUK_HBUFOBJ_VALID_SLICE(h_bufobj)) {
 		DUK__EMIT_STRIDX(js_ctx, DUK_STRIDX_LC_NULL);
 	} else {
 		/* Handle both full and partial slice (as long as covered). */
-		duk__enc_buffer_data(js_ctx,
-		                     (duk_uint8_t *) DUK_HBUFOBJ_GET_SLICE_BASE(js_ctx->thr->heap, h_bufobj),
-		                     (duk_size_t) h_bufobj->length);
+		duk__json_enc_buffer_data(js_ctx,
+		                          (duk_uint8_t *) DUK_HBUFOBJ_GET_SLICE_BASE(js_ctx->thr->heap, h_bufobj),
+		                          (duk_size_t) h_bufobj->length);
 	}
 }
-#endif  /* DUK_USE_JX || DUK_USE_JC */
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_JX || DUK_USE_JC */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /* Indent helper.  Calling code relies on js_ctx->recursion_depth also being
  * directly related to indent depth.
  */
 #if defined(DUK_USE_PREFER_SIZE)
-DUK_LOCAL void duk__enc_newline_indent(duk_json_enc_ctx *js_ctx, duk_uint_t depth) {
+DUK_LOCAL void duk__json_enc_newline_indent(duk_json_enc_ctx *js_ctx, duk_uint_t depth) {
 	DUK_ASSERT(js_ctx->h_gap != NULL);
-	DUK_ASSERT(DUK_HSTRING_GET_BYTELEN(js_ctx->h_gap) > 0);  /* caller guarantees */
+	DUK_ASSERT(DUK_HSTRING_GET_BYTELEN(js_ctx->h_gap) > 0); /* caller guarantees */
 
 	DUK__EMIT_1(js_ctx, 0x0a);
 	while (depth-- > 0) {
 		DUK__EMIT_HSTR(js_ctx, js_ctx->h_gap);
 	}
 }
-#else  /* DUK_USE_PREFER_SIZE */
-DUK_LOCAL void duk__enc_newline_indent(duk_json_enc_ctx *js_ctx, duk_uint_t depth) {
+#else /* DUK_USE_PREFER_SIZE */
+DUK_LOCAL void duk__json_enc_newline_indent(duk_json_enc_ctx *js_ctx, duk_uint_t depth) {
 	const duk_uint8_t *gap_data;
 	duk_size_t gap_len;
-	duk_size_t avail_bytes;   /* bytes of indent available for copying */
-	duk_size_t need_bytes;    /* bytes of indent still needed */
+	duk_size_t avail_bytes; /* bytes of indent available for copying */
+	duk_size_t need_bytes; /* bytes of indent still needed */
 	duk_uint8_t *p_start;
 	duk_uint8_t *p;
 
 	DUK_ASSERT(js_ctx->h_gap != NULL);
-	DUK_ASSERT(DUK_HSTRING_GET_BYTELEN(js_ctx->h_gap) > 0);  /* caller guarantees */
+	DUK_ASSERT(DUK_HSTRING_GET_BYTELEN(js_ctx->h_gap) > 0); /* caller guarantees */
 
 	DUK__EMIT_1(js_ctx, 0x0a);
 	if (DUK_UNLIKELY(depth == 0)) {
@@ -35851,30 +39093,31 @@ DUK_LOCAL void duk__enc_newline_indent(duk_json_enc_ctx *js_ctx, duk_uint_t dept
 		avail_bytes <<= 1;
 	}
 
-	DUK_ASSERT(need_bytes < avail_bytes);  /* need_bytes may be zero */
+	DUK_ASSERT(need_bytes < avail_bytes); /* need_bytes may be zero */
 	duk_memcpy((void *) p, (const void *) p_start, (size_t) need_bytes);
 	p += need_bytes;
 	/*avail_bytes += need_bytes*/
 
 	DUK_BW_SET_PTR(js_ctx->thr, &js_ctx->bw, p);
 }
-#endif  /* DUK_USE_PREFER_SIZE */
+#endif /* DUK_USE_PREFER_SIZE */
 
 /* Shared entry handling for object/array serialization. */
-DUK_LOCAL void duk__enc_objarr_entry(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top) {
+DUK_LOCAL void duk__json_enc_objarr_entry(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_hobject *h_target;
 	duk_uint_fast32_t i, n;
 
 	*entry_top = duk_get_top(thr);
 
+	duk_native_stack_check(thr);
 	duk_require_stack(thr, DUK_JSON_ENC_REQSTACK);
 
 	/* Loop check using a hybrid approach: a fixed-size visited[] array
 	 * with overflow in a loop check object.
 	 */
 
-	h_target = duk_known_hobject(thr, -1);  /* object or array */
+	h_target = duk_known_hobject(thr, -1); /* object or array */
 
 	n = js_ctx->recursion_depth;
 	if (DUK_UNLIKELY(n > DUK_JSON_ENC_LOOPARRAY)) {
@@ -35891,31 +39134,32 @@ DUK_LOCAL void duk__enc_objarr_entry(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_
 		js_ctx->visiting[js_ctx->recursion_depth] = h_target;
 	} else {
 		duk_push_sprintf(thr, DUK_STR_FMT_PTR, (void *) h_target);
-		duk_dup_top(thr);  /* -> [ ... voidp voidp ] */
+		duk_dup_top(thr); /* -> [ ... voidp voidp ] */
 		if (duk_has_prop(thr, js_ctx->idx_loop)) {
 			DUK_ERROR_TYPE(thr, DUK_STR_CYCLIC_INPUT);
 			DUK_WO_NORETURN(return;);
 		}
-		duk_push_true(thr);  /* -> [ ... voidp true ] */
-		duk_put_prop(thr, js_ctx->idx_loop);  /* -> [ ... ] */
+		duk_push_true(thr); /* -> [ ... voidp true ] */
+		duk_put_prop(thr, js_ctx->idx_loop); /* -> [ ... ] */
 	}
 
 	/* C recursion check. */
 
-	DUK_ASSERT_DISABLE(js_ctx->recursion_depth >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(js_ctx->recursion_depth >= 0); /* unsigned */
 	DUK_ASSERT(js_ctx->recursion_depth <= js_ctx->recursion_limit);
 	if (js_ctx->recursion_depth >= js_ctx->recursion_limit) {
-		DUK_ERROR_RANGE(thr, DUK_STR_JSONENC_RECLIMIT);
+		DUK_ERROR_RANGE(thr, DUK_STR_ENC_RECLIMIT);
 		DUK_WO_NORETURN(return;);
 	}
 	js_ctx->recursion_depth++;
 
 	DUK_DDD(DUK_DDDPRINT("shared entry finished: top=%ld, loop=%!T",
-	                     (long) duk_get_top(thr), (duk_tval *) duk_get_tval(thr, js_ctx->idx_loop)));
+	                     (long) duk_get_top(thr),
+	                     (duk_tval *) duk_get_tval(thr, js_ctx->idx_loop)));
 }
 
 /* Shared exit handling for object/array serialization. */
-DUK_LOCAL void duk__enc_objarr_exit(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top) {
+DUK_LOCAL void duk__json_enc_objarr_exit(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_hobject *h_target;
 
@@ -35927,27 +39171,28 @@ DUK_LOCAL void duk__enc_objarr_exit(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_t
 
 	/* Loop check. */
 
-	h_target = duk_known_hobject(thr, *entry_top - 1);  /* original target at entry_top - 1 */
+	h_target = duk_known_hobject(thr, *entry_top - 1); /* original target at entry_top - 1 */
 
 	if (js_ctx->recursion_depth < DUK_JSON_ENC_LOOPARRAY) {
 		/* Previous entry was inside visited[], nothing to do. */
 	} else {
 		duk_push_sprintf(thr, DUK_STR_FMT_PTR, (void *) h_target);
-		duk_del_prop(thr, js_ctx->idx_loop);  /* -> [ ... ] */
+		duk_del_prop(thr, js_ctx->idx_loop); /* -> [ ... ] */
 	}
 
 	/* Restore stack top after unbalanced code paths. */
 	duk_set_top(thr, *entry_top);
 
 	DUK_DDD(DUK_DDDPRINT("shared entry finished: top=%ld, loop=%!T",
-	                     (long) duk_get_top(thr), (duk_tval *) duk_get_tval(thr, js_ctx->idx_loop)));
+	                     (long) duk_get_top(thr),
+	                     (duk_tval *) duk_get_tval(thr, js_ctx->idx_loop)));
 }
 
 /* The JO(value) operation: encode object.
  *
  * Stack policy: [ object ] -> [ object ].
  */
-DUK_LOCAL void duk__enc_object(duk_json_enc_ctx *js_ctx) {
+DUK_LOCAL void duk__json_enc_object(duk_json_enc_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_hstring *h_key;
 	duk_idx_t entry_top;
@@ -35957,9 +39202,9 @@ DUK_LOCAL void duk__enc_object(duk_json_enc_ctx *js_ctx) {
 	duk_uarridx_t arr_len, i;
 	duk_size_t prev_size;
 
-	DUK_DDD(DUK_DDDPRINT("duk__enc_object: obj=%!T", (duk_tval *) duk_get_tval(thr, -1)));
+	DUK_DDD(DUK_DDDPRINT("duk__json_enc_object: obj=%!T", (duk_tval *) duk_get_tval(thr, -1)));
 
-	duk__enc_objarr_entry(js_ctx, &entry_top);
+	duk__json_enc_objarr_entry(js_ctx, &entry_top);
 
 	idx_obj = entry_top - 1;
 
@@ -35968,13 +39213,14 @@ DUK_LOCAL void duk__enc_object(duk_json_enc_ctx *js_ctx) {
 	} else {
 		/* XXX: would be nice to enumerate an object at specified index */
 		duk_dup(thr, idx_obj);
-		(void) duk_hobject_get_enumerated_keys(thr, DUK_ENUM_OWN_PROPERTIES_ONLY /*flags*/);  /* [ ... target ] -> [ ... target keys ] */
+		(void) duk_hobject_get_enumerated_keys(
+		    thr,
+		    DUK_ENUM_OWN_PROPERTIES_ONLY /*flags*/); /* [ ... target ] -> [ ... target keys ] */
 		idx_keys = duk_require_normalize_index(thr, -1);
 		/* leave stack unbalanced on purpose */
 	}
 
-	DUK_DDD(DUK_DDDPRINT("idx_keys=%ld, h_keys=%!T",
-	                     (long) idx_keys, (duk_tval *) duk_get_tval(thr, idx_keys)));
+	DUK_DDD(DUK_DDDPRINT("idx_keys=%ld, h_keys=%!T", (long) idx_keys, (duk_tval *) duk_get_tval(thr, idx_keys)));
 
 	/* Steps 8-10 have been merged to avoid a "partial" variable. */
 
@@ -35989,7 +39235,7 @@ DUK_LOCAL void duk__enc_object(duk_json_enc_ctx *js_ctx) {
 	arr_len = (duk_uarridx_t) duk_get_length(thr, idx_keys);
 	emitted = 0;
 	for (i = 0; i < arr_len; i++) {
-		duk_get_prop_index(thr, idx_keys, i);  /* -> [ ... key ] */
+		duk_get_prop_index(thr, idx_keys, i); /* -> [ ... key ] */
 
 		DUK_DDD(DUK_DDDPRINT("object property loop: holder=%!T, key=%!T",
 		                     (duk_tval *) duk_get_tval(thr, idx_obj),
@@ -35997,21 +39243,21 @@ DUK_LOCAL void duk__enc_object(duk_json_enc_ctx *js_ctx) {
 
 		h_key = duk_known_hstring(thr, -1);
 		DUK_ASSERT(h_key != NULL);
-		DUK_ASSERT(!DUK_HSTRING_HAS_SYMBOL(h_key));  /* proplist filtering; enum options */
+		DUK_ASSERT(!DUK_HSTRING_HAS_SYMBOL(h_key)); /* proplist filtering; enum options */
 
 		prev_size = DUK_BW_GET_SIZE(js_ctx->thr, &js_ctx->bw);
 		if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
-			duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth);
-			duk__enc_key_autoquote(js_ctx, h_key);
+			duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth);
+			duk__json_enc_key_autoquote(js_ctx, h_key);
 			DUK__EMIT_2(js_ctx, DUK_ASC_COLON, DUK_ASC_SPACE);
 		} else {
-			duk__enc_key_autoquote(js_ctx, h_key);
+			duk__json_enc_key_autoquote(js_ctx, h_key);
 			DUK__EMIT_1(js_ctx, DUK_ASC_COLON);
 		}
 
 		/* [ ... key ] */
 
-		if (DUK_UNLIKELY(duk__enc_value(js_ctx, idx_obj) == 0)) {
+		if (DUK_UNLIKELY(duk__json_enc_value(js_ctx, idx_obj) == 0)) {
 			/* Value would yield 'undefined', so skip key altogether.
 			 * Side effects have already happened.
 			 */
@@ -36026,15 +39272,15 @@ DUK_LOCAL void duk__enc_object(duk_json_enc_ctx *js_ctx) {
 
 	if (emitted) {
 		DUK_ASSERT(*((duk_uint8_t *) DUK_BW_GET_PTR(js_ctx->thr, &js_ctx->bw) - 1) == DUK_ASC_COMMA);
-		DUK__UNEMIT_1(js_ctx);  /* eat trailing comma */
+		DUK__UNEMIT_1(js_ctx); /* eat trailing comma */
 		if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
 			DUK_ASSERT(js_ctx->recursion_depth >= 1);
-			duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
+			duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
 		}
 	}
 	DUK__EMIT_1(js_ctx, DUK_ASC_RCURLY);
 
-	duk__enc_objarr_exit(js_ctx, &entry_top);
+	duk__json_enc_objarr_exit(js_ctx, &entry_top);
 
 	DUK_ASSERT_TOP(thr, entry_top);
 }
@@ -36043,17 +39289,16 @@ DUK_LOCAL void duk__enc_object(duk_json_enc_ctx *js_ctx) {
  *
  * Stack policy: [ array ] -> [ array ].
  */
-DUK_LOCAL void duk__enc_array(duk_json_enc_ctx *js_ctx) {
+DUK_LOCAL void duk__json_enc_array(duk_json_enc_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_idx_t entry_top;
 	duk_idx_t idx_arr;
 	duk_bool_t emitted;
 	duk_uarridx_t i, arr_len;
 
-	DUK_DDD(DUK_DDDPRINT("duk__enc_array: array=%!T",
-	                     (duk_tval *) duk_get_tval(thr, -1)));
+	DUK_DDD(DUK_DDDPRINT("duk__json_enc_array: array=%!T", (duk_tval *) duk_get_tval(thr, -1)));
 
-	duk__enc_objarr_entry(js_ctx, &entry_top);
+	duk__json_enc_objarr_entry(js_ctx, &entry_top);
 
 	idx_arr = entry_top - 1;
 
@@ -36066,18 +39311,19 @@ DUK_LOCAL void duk__enc_array(duk_json_enc_ctx *js_ctx) {
 	for (i = 0; i < arr_len; i++) {
 		DUK_DDD(DUK_DDDPRINT("array entry loop: array=%!T, index=%ld, arr_len=%ld",
 		                     (duk_tval *) duk_get_tval(thr, idx_arr),
-		                     (long) i, (long) arr_len));
+		                     (long) i,
+		                     (long) arr_len));
 
 		if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
 			DUK_ASSERT(js_ctx->recursion_depth >= 1);
-			duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth);
+			duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth);
 		}
 
-		(void) duk_push_uint_to_hstring(thr, (duk_uint_t) i);  /* -> [ ... key ] */
+		(void) duk_push_uint_to_hstring(thr, (duk_uint_t) i); /* -> [ ... key ] */
 
 		/* [ ... key ] */
 
-		if (DUK_UNLIKELY(duk__enc_value(js_ctx, idx_arr) == 0)) {
+		if (DUK_UNLIKELY(duk__json_enc_value(js_ctx, idx_arr) == 0)) {
 			/* Value would normally be omitted, replace with 'null'. */
 			DUK__EMIT_STRIDX(js_ctx, DUK_STRIDX_LC_NULL);
 		} else {
@@ -36092,15 +39338,15 @@ DUK_LOCAL void duk__enc_array(duk_json_enc_ctx *js_ctx) {
 
 	if (emitted) {
 		DUK_ASSERT(*((duk_uint8_t *) DUK_BW_GET_PTR(js_ctx->thr, &js_ctx->bw) - 1) == DUK_ASC_COMMA);
-		DUK__UNEMIT_1(js_ctx);  /* eat trailing comma */
+		DUK__UNEMIT_1(js_ctx); /* eat trailing comma */
 		if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
 			DUK_ASSERT(js_ctx->recursion_depth >= 1);
-			duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
+			duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
 		}
 	}
 	DUK__EMIT_1(js_ctx, DUK_ASC_RBRACKET);
 
-	duk__enc_objarr_exit(js_ctx, &entry_top);
+	duk__json_enc_objarr_exit(js_ctx, &entry_top);
 
 	DUK_ASSERT_TOP(thr, entry_top);
 }
@@ -36109,22 +39355,23 @@ DUK_LOCAL void duk__enc_array(duk_json_enc_ctx *js_ctx) {
  *
  * Stack policy: [ ... key ] -> [ ... ]
  */
-DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_holder) {
+DUK_LOCAL duk_bool_t duk__json_enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_holder) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_tval *tv;
 	duk_tval *tv_holder;
 	duk_tval *tv_key;
 	duk_small_int_t c;
 
-	DUK_DDD(DUK_DDDPRINT("duk__enc_value: idx_holder=%ld, holder=%!T, key=%!T",
-	                     (long) idx_holder, (duk_tval *) duk_get_tval(thr, idx_holder),
+	DUK_DDD(DUK_DDDPRINT("duk__json_enc_value: idx_holder=%ld, holder=%!T, key=%!T",
+	                     (long) idx_holder,
+	                     (duk_tval *) duk_get_tval(thr, idx_holder),
 	                     (duk_tval *) duk_get_tval(thr, -1)));
 
 	tv_holder = DUK_GET_TVAL_POSIDX(thr, idx_holder);
 	DUK_ASSERT(DUK_TVAL_IS_OBJECT(tv_holder));
 	tv_key = DUK_GET_TVAL_NEGIDX(thr, -1);
 	DUK_ASSERT(DUK_TVAL_IS_STRING(tv_key));
-	DUK_ASSERT(!DUK_HSTRING_HAS_SYMBOL(DUK_TVAL_GET_STRING(tv_key)));  /* Caller responsible. */
+	DUK_ASSERT(!DUK_HSTRING_HAS_SYMBOL(DUK_TVAL_GET_STRING(tv_key))); /* Caller responsible. */
 	(void) duk_hobject_getprop(thr, tv_holder, tv_key);
 
 	/* -> [ ... key val ] */
@@ -36136,19 +39383,17 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 	 * number won't invoke the .toJSON() method.  However, lightfuncs and
 	 * plain buffers mimic objects so we check for their .toJSON() method.
 	 */
-	if (duk_check_type_mask(thr, -1, DUK_TYPE_MASK_OBJECT |
-	                                 DUK_TYPE_MASK_LIGHTFUNC |
-	                                 DUK_TYPE_MASK_BUFFER)) {
+	if (duk_check_type_mask(thr, -1, DUK_TYPE_MASK_OBJECT | DUK_TYPE_MASK_LIGHTFUNC | DUK_TYPE_MASK_BUFFER)) {
 		duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_TO_JSON);
-		if (duk_is_callable(thr, -1)) {  /* toJSON() can also be a lightfunc */
+		if (duk_is_callable(thr, -1)) { /* toJSON() can also be a lightfunc */
 			DUK_DDD(DUK_DDDPRINT("value is object, has callable toJSON() -> call it"));
 			/* XXX: duk_dup_unvalidated(thr, -2) etc. */
-			duk_dup_m2(thr);          /* -> [ ... key val toJSON val ] */
-			duk_dup_m4(thr);          /* -> [ ... key val toJSON val key ] */
-			duk_call_method(thr, 1);  /* -> [ ... key val val' ] */
-			duk_remove_m2(thr);       /* -> [ ... key val' ] */
+			duk_dup_m2(thr); /* -> [ ... key val toJSON val ] */
+			duk_dup_m4(thr); /* -> [ ... key val toJSON val key ] */
+			duk_call_method(thr, 1); /* -> [ ... key val val' ] */
+			duk_remove_m2(thr); /* -> [ ... key val' ] */
 		} else {
-			duk_pop(thr);             /* -> [ ... key val ] */
+			duk_pop(thr); /* -> [ ... key val ] */
 		}
 	}
 
@@ -36159,12 +39404,12 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 	if (js_ctx->h_replacer) {
 		/* XXX: Here a "slice copy" would be useful. */
 		DUK_DDD(DUK_DDDPRINT("replacer is set, call replacer"));
-		duk_push_hobject(thr, js_ctx->h_replacer);  /* -> [ ... key val replacer ] */
-		duk_dup(thr, idx_holder);                   /* -> [ ... key val replacer holder ] */
-		duk_dup_m4(thr);                            /* -> [ ... key val replacer holder key ] */
-		duk_dup_m4(thr);                            /* -> [ ... key val replacer holder key val ] */
-		duk_call_method(thr, 2);                    /* -> [ ... key val val' ] */
-		duk_remove_m2(thr);                         /* -> [ ... key val' ] */
+		duk_push_hobject(thr, js_ctx->h_replacer); /* -> [ ... key val replacer ] */
+		duk_dup(thr, idx_holder); /* -> [ ... key val replacer holder ] */
+		duk_dup_m4(thr); /* -> [ ... key val replacer holder key ] */
+		duk_dup_m4(thr); /* -> [ ... key val replacer holder key val ] */
+		duk_call_method(thr, 2); /* -> [ ... key val val' ] */
+		duk_remove_m2(thr); /* -> [ ... key val' ] */
 	}
 
 	/* [ ... key val ] */
@@ -36180,18 +39425,17 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
-		if (DUK_HOBJECT_IS_BUFOBJ(h) &&
-		    js_ctx->flags & (DUK_JSON_FLAG_EXT_CUSTOM | DUK_JSON_FLAG_EXT_COMPATIBLE)) {
+		if (DUK_HOBJECT_IS_BUFOBJ(h) && js_ctx->flags & (DUK_JSON_FLAG_EXT_CUSTOM | DUK_JSON_FLAG_EXT_COMPATIBLE)) {
 			/* With JX/JC a bufferobject gets serialized specially. */
 			duk_hbufobj *h_bufobj;
 			h_bufobj = (duk_hbufobj *) h;
-			DUK_ASSERT_HBUFOBJ_VALID(h_bufobj);
-			duk__enc_bufobj(js_ctx, h_bufobj);
+			DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
+			duk__json_enc_bufobj(js_ctx, h_bufobj);
 			goto pop2_emitted;
 		}
 		/* Otherwise bufferobjects get serialized as normal objects. */
-#endif  /* JX || JC */
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* JX || JC */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 		c = (duk_small_int_t) DUK_HOBJECT_GET_CLASS_NUMBER(h);
 		switch (c) {
 		case DUK_HOBJECT_CLASS_NUMBER: {
@@ -36216,7 +39460,7 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 #endif
 		case DUK_HOBJECT_CLASS_BOOLEAN: {
 			DUK_DDD(DUK_DDDPRINT("value is a Boolean/Buffer/Pointer object -> get internal value"));
-			duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_INT_VALUE);
+			duk_xget_owndataprop_stridx_short(thr, -1, DUK_STRIDX_INT_VALUE);
 			duk_remove_m2(thr);
 			break;
 		}
@@ -36231,8 +39475,7 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 			DUK_ASSERT(h != NULL);
 			if (DUK_HOBJECT_IS_CALLABLE(h)) {
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
-				if (js_ctx->flags & (DUK_JSON_FLAG_EXT_CUSTOM |
-				                     DUK_JSON_FLAG_EXT_COMPATIBLE)) {
+				if (js_ctx->flags & (DUK_JSON_FLAG_EXT_CUSTOM | DUK_JSON_FLAG_EXT_COMPATIBLE)) {
 					/* We only get here when doing non-standard JSON encoding */
 					DUK_DDD(DUK_DDDPRINT("-> function allowed, serialize to custom format"));
 					DUK_ASSERT(js_ctx->flag_ext_custom || js_ctx->flag_ext_compatible);
@@ -36242,13 +39485,13 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 					DUK_DDD(DUK_DDDPRINT("-> will result in undefined (function)"));
 					goto pop2_undef;
 				}
-#else  /* DUK_USE_JX || DUK_USE_JC */
+#else /* DUK_USE_JX || DUK_USE_JC */
 				DUK_DDD(DUK_DDDPRINT("-> will result in undefined (function)"));
 				goto pop2_undef;
-#endif  /* DUK_USE_JX || DUK_USE_JC */
+#endif /* DUK_USE_JX || DUK_USE_JC */
 			}
 		}
-		}  /* end switch */
+		} /* end switch */
 	}
 
 	/* [ ... key val ] */
@@ -36275,24 +39518,23 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 		break;
 	}
 	case DUK_TAG_BOOLEAN: {
-		DUK__EMIT_STRIDX(js_ctx, DUK_TVAL_GET_BOOLEAN(tv) ?
-		                 DUK_STRIDX_TRUE : DUK_STRIDX_FALSE);
+		DUK__EMIT_STRIDX(js_ctx, DUK_TVAL_GET_BOOLEAN(tv) ? DUK_STRIDX_TRUE : DUK_STRIDX_FALSE);
 		break;
 	}
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
 	/* When JX/JC not in use, the type mask above will avoid this case if needed. */
 	case DUK_TAG_POINTER: {
-		duk__enc_pointer(js_ctx, DUK_TVAL_GET_POINTER(tv));
+		duk__json_enc_pointer(js_ctx, DUK_TVAL_GET_POINTER(tv));
 		break;
 	}
-#endif  /* DUK_USE_JX || DUK_USE_JC */
+#endif /* DUK_USE_JX || DUK_USE_JC */
 	case DUK_TAG_STRING: {
 		duk_hstring *h = DUK_TVAL_GET_STRING(tv);
 		DUK_ASSERT(h != NULL);
 		if (DUK_UNLIKELY(DUK_HSTRING_HAS_SYMBOL(h))) {
 			goto pop2_undef;
 		}
-		duk__enc_quote_string(js_ctx, h);
+		duk__json_enc_quote_string(js_ctx, h);
 		break;
 	}
 	case DUK_TAG_OBJECT: {
@@ -36304,10 +39546,10 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 		 */
 		DUK_ASSERT(!DUK_HOBJECT_IS_CALLABLE(h));
 
-		if (DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_ARRAY) {
-			duk__enc_array(js_ctx);
+		if (duk_js_isarray_hobject(h)) {
+			duk__json_enc_array(js_ctx);
 		} else {
-			duk__enc_object(js_ctx);
+			duk__json_enc_object(js_ctx);
 		}
 		break;
 	}
@@ -36320,7 +39562,7 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 	case DUK_TAG_BUFFER: {
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
 		if (js_ctx->flag_ext_custom_or_compatible) {
-			duk__enc_buffer_jx_jc(js_ctx, DUK_TVAL_GET_BUFFER(tv));
+			duk__json_enc_buffer_jx_jc(js_ctx, DUK_TVAL_GET_BUFFER(tv));
 			break;
 		}
 #endif
@@ -36329,7 +39571,7 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 		 * to handle realloc side effects correctly.
 		 */
 		duk_to_object(thr, -1);
-		duk__enc_object(js_ctx);
+		duk__json_enc_object(js_ctx);
 		break;
 	}
 	case DUK_TAG_LIGHTFUNC: {
@@ -36348,7 +39590,7 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 		/* Number serialization has a significant impact relative to
 		 * other fast path code, so careful fast path for fastints.
 		 */
-		duk__enc_fastint_tval(js_ctx, tv);
+		duk__json_enc_fastint_tval(js_ctx, tv);
 		break;
 #endif
 	default: {
@@ -36358,24 +39600,24 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 		/* XXX: A fast path for usual integers would be useful when
 		 * fastint support is not enabled.
 		 */
-		duk__enc_double(js_ctx);
+		duk__json_enc_double(js_ctx);
 		break;
 	}
 	}
 
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
- pop2_emitted:
+pop2_emitted:
 #endif
 	duk_pop_2(thr); /* [ ... key val ] -> [ ... ] */
-	return 1;  /* emitted */
+	return 1; /* emitted */
 
- pop2_undef:
-	duk_pop_2(thr);  /* [ ... key val ] -> [ ... ] */
-	return 0;  /* not emitted */
+pop2_undef:
+	duk_pop_2(thr); /* [ ... key val ] -> [ ... ] */
+	return 0; /* not emitted */
 }
 
 /* E5 Section 15.12.3, main algorithm, step 4.b.ii steps 1-4. */
-DUK_LOCAL duk_bool_t duk__enc_allow_into_proplist(duk_tval *tv) {
+DUK_LOCAL duk_bool_t duk__json_enc_allow_into_proplist(duk_tval *tv) {
 	duk_small_int_t c;
 
 	/* XXX: some kind of external internal type checker?
@@ -36447,8 +39689,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 		break;
 	}
 	case DUK_TAG_BOOLEAN: {
-		DUK__EMIT_STRIDX(js_ctx, DUK_TVAL_GET_BOOLEAN(tv) ?
-		                 DUK_STRIDX_TRUE : DUK_STRIDX_FALSE);
+		DUK__EMIT_STRIDX(js_ctx, DUK_TVAL_GET_BOOLEAN(tv) ? DUK_STRIDX_TRUE : DUK_STRIDX_FALSE);
 		break;
 	}
 	case DUK_TAG_STRING: {
@@ -36458,15 +39699,14 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 		if (DUK_UNLIKELY(DUK_HSTRING_HAS_SYMBOL(h))) {
 			goto emit_undefined;
 		}
-		duk__enc_quote_string(js_ctx, h);
+		duk__json_enc_quote_string(js_ctx, h);
 		break;
 	}
 	case DUK_TAG_OBJECT: {
 		duk_hobject *obj;
 		duk_tval *tv_val;
 		duk_bool_t emitted = 0;
-		duk_uint32_t c_bit, c_all, c_array, c_unbox, c_undef,
-		             c_func, c_bufobj, c_object, c_abort;
+		duk_uint32_t c_bit, c_all, c_array, c_unbox, c_undef, c_func, c_bufobj, c_object, c_abort;
 
 		/* For objects JSON.stringify() only looks for own, enumerable
 		 * properties which is nice for the fast path here.
@@ -36493,17 +39733,17 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 
 		obj = DUK_TVAL_GET_OBJECT(tv);
 		DUK_ASSERT(obj != NULL);
-		DUK_ASSERT_HOBJECT_VALID(obj);
+		DUK_HOBJECT_ASSERT_VALID(obj);
 
 		/* Once recursion depth is increased, exit path must decrease
 		 * it (though it's OK to abort the fast path).
 		 */
 
-		DUK_ASSERT_DISABLE(js_ctx->recursion_depth >= 0);  /* unsigned */
+		DUK_ASSERT_DISABLE(js_ctx->recursion_depth >= 0); /* unsigned */
 		DUK_ASSERT(js_ctx->recursion_depth <= js_ctx->recursion_limit);
 		if (js_ctx->recursion_depth >= js_ctx->recursion_limit) {
 			DUK_DD(DUK_DDPRINT("fast path recursion limit"));
-			DUK_ERROR_RANGE(js_ctx->thr, DUK_STR_JSONDEC_RECLIMIT);
+			DUK_ERROR_RANGE(js_ctx->thr, DUK_STR_DEC_RECLIMIT);
 			DUK_WO_NORETURN(return 0;);
 		}
 
@@ -36551,28 +39791,23 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 		if (js_ctx->flag_ext_custom_or_compatible) {
 			c_all = DUK_HOBJECT_CMASK_ALL;
 			c_array = DUK_HOBJECT_CMASK_ARRAY;
-			c_unbox = DUK_HOBJECT_CMASK_NUMBER |
-			          DUK_HOBJECT_CMASK_STRING |
-			          DUK_HOBJECT_CMASK_BOOLEAN |
-			          DUK_HOBJECT_CMASK_POINTER;  /* Symbols are not unboxed. */
+			c_unbox = DUK_HOBJECT_CMASK_NUMBER | DUK_HOBJECT_CMASK_STRING | DUK_HOBJECT_CMASK_BOOLEAN |
+			          DUK_HOBJECT_CMASK_POINTER; /* Symbols are not unboxed. */
 			c_func = DUK_HOBJECT_CMASK_FUNCTION;
 			c_bufobj = DUK_HOBJECT_CMASK_ALL_BUFOBJS;
 			c_undef = 0;
 			c_abort = 0;
 			c_object = c_all & ~(c_array | c_unbox | c_func | c_bufobj | c_undef | c_abort);
-		}
-		else
+		} else
 #endif
 		{
 			c_all = DUK_HOBJECT_CMASK_ALL;
 			c_array = DUK_HOBJECT_CMASK_ARRAY;
-			c_unbox = DUK_HOBJECT_CMASK_NUMBER |
-			          DUK_HOBJECT_CMASK_STRING |
-			          DUK_HOBJECT_CMASK_BOOLEAN;  /* Symbols are not unboxed. */
+			c_unbox = DUK_HOBJECT_CMASK_NUMBER | DUK_HOBJECT_CMASK_STRING |
+			          DUK_HOBJECT_CMASK_BOOLEAN; /* Symbols are not unboxed. */
 			c_func = 0;
 			c_bufobj = 0;
-			c_undef = DUK_HOBJECT_CMASK_FUNCTION |
-			          DUK_HOBJECT_CMASK_POINTER;
+			c_undef = DUK_HOBJECT_CMASK_FUNCTION | DUK_HOBJECT_CMASK_POINTER;
 			/* As the fast path doesn't currently properly support
 			 * duk_hbufobj virtual properties, abort fast path if
 			 * we encounter them in plain JSON mode.
@@ -36630,11 +39865,11 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 
 				prev_size = DUK_BW_GET_SIZE(js_ctx->thr, &js_ctx->bw);
 				if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
-					duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth);
-					duk__enc_key_autoquote(js_ctx, k);
+					duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth);
+					duk__json_enc_key_autoquote(js_ctx, k);
 					DUK__EMIT_2(js_ctx, DUK_ASC_COLON, DUK_ASC_SPACE);
 				} else {
-					duk__enc_key_autoquote(js_ctx, k);
+					duk__json_enc_key_autoquote(js_ctx, k);
 					DUK__EMIT_1(js_ctx, DUK_ASC_COLON);
 				}
 
@@ -36654,10 +39889,10 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 
 			if (emitted) {
 				DUK_ASSERT(*((duk_uint8_t *) DUK_BW_GET_PTR(js_ctx->thr, &js_ctx->bw) - 1) == DUK_ASC_COMMA);
-				DUK__UNEMIT_1(js_ctx);  /* eat trailing comma */
+				DUK__UNEMIT_1(js_ctx); /* eat trailing comma */
 				if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
 					DUK_ASSERT(js_ctx->recursion_depth >= 1);
-					duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
+					duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
 				}
 			}
 			DUK__EMIT_1(js_ctx, DUK_ASC_RCURLY);
@@ -36685,7 +39920,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 				duk_bool_t has_inherited;
 
 				if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
-					duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth);
+					duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth);
 				}
 
 				if (DUK_LIKELY(i < asize)) {
@@ -36724,17 +39959,17 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 #endif
 				/* fall through */
 
-			 elem_done:
+			elem_done:
 				DUK__EMIT_1(js_ctx, DUK_ASC_COMMA);
 				emitted = 1;
 			}
 
 			if (emitted) {
 				DUK_ASSERT(*((duk_uint8_t *) DUK_BW_GET_PTR(js_ctx->thr, &js_ctx->bw) - 1) == DUK_ASC_COMMA);
-				DUK__UNEMIT_1(js_ctx);  /* eat trailing comma */
+				DUK__UNEMIT_1(js_ctx); /* eat trailing comma */
 				if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
 					DUK_ASSERT(js_ctx->recursion_depth >= 1);
-					duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
+					duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
 				}
 			}
 			DUK__EMIT_1(js_ctx, DUK_ASC_RBRACKET);
@@ -36743,7 +39978,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 			 * automatic unboxing.  Rely on internal value being
 			 * sane (to avoid infinite recursion).
 			 */
-			DUK_ASSERT((c_bit & DUK_HOBJECT_CMASK_SYMBOL) == 0);  /* Symbols are not unboxed. */
+			DUK_ASSERT((c_bit & DUK_HOBJECT_CMASK_SYMBOL) == 0); /* Symbols are not unboxed. */
 
 #if 1
 			/* The code below is incorrect if .toString() or .valueOf() have
@@ -36753,7 +39988,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 			 * Unimplemented for now, abort fast path for boxed values.
 			 */
 			goto abort_fastpath;
-#else  /* disabled */
+#else /* disabled */
 			/* Disabled until fixed, see above. */
 			duk_tval *tv_internal;
 
@@ -36761,22 +39996,20 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 
 			tv_internal = duk_hobject_get_internal_value_tval_ptr(js_ctx->thr->heap, obj);
 			DUK_ASSERT(tv_internal != NULL);
-			DUK_ASSERT(DUK_TVAL_IS_STRING(tv_internal) ||
-			           DUK_TVAL_IS_NUMBER(tv_internal) ||
-			           DUK_TVAL_IS_BOOLEAN(tv_internal) ||
-			           DUK_TVAL_IS_POINTER(tv_internal));
+			DUK_ASSERT(DUK_TVAL_IS_STRING(tv_internal) || DUK_TVAL_IS_NUMBER(tv_internal) ||
+			           DUK_TVAL_IS_BOOLEAN(tv_internal) || DUK_TVAL_IS_POINTER(tv_internal));
 
 			tv = tv_internal;
 			DUK_ASSERT(js_ctx->recursion_depth > 0);
-			js_ctx->recursion_depth--;  /* required to keep recursion depth correct */
+			js_ctx->recursion_depth--; /* required to keep recursion depth correct */
 			goto restart_match;
-#endif  /* disabled */
+#endif /* disabled */
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
 		} else if (c_bit & c_func) {
 			DUK__EMIT_STRIDX(js_ctx, js_ctx->stridx_custom_function);
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
 		} else if (c_bit & c_bufobj) {
-			duk__enc_bufobj(js_ctx, (duk_hbufobj *) obj);
+			duk__json_enc_bufobj(js_ctx, (duk_hbufobj *) obj);
 #endif
 #endif
 		} else if (c_bit & c_abort) {
@@ -36816,7 +40049,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
 		if (js_ctx->flag_ext_custom_or_compatible) {
-			duk__enc_buffer_jx_jc(js_ctx, DUK_TVAL_GET_BUFFER(tv));
+			duk__json_enc_buffer_jx_jc(js_ctx, DUK_TVAL_GET_BUFFER(tv));
 			break;
 		}
 #endif
@@ -36824,13 +40057,13 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 		/* Plain buffers mimic Uint8Arrays, and have enumerable index
 		 * properties.
 		 */
-		duk__enc_buffer_json_fastpath(js_ctx, DUK_TVAL_GET_BUFFER(tv));
+		duk__json_enc_buffer_json_fastpath(js_ctx, DUK_TVAL_GET_BUFFER(tv));
 		break;
 	}
 	case DUK_TAG_POINTER: {
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
 		if (js_ctx->flag_ext_custom_or_compatible) {
-			duk__enc_pointer(js_ctx, DUK_TVAL_GET_POINTER(tv));
+			duk__json_enc_pointer(js_ctx, DUK_TVAL_GET_POINTER(tv));
 			break;
 		} else {
 			goto emit_undefined;
@@ -36852,7 +40085,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 		/* Number serialization has a significant impact relative to
 		 * other fast path code, so careful fast path for fastints.
 		 */
-		duk__enc_fastint_tval(js_ctx, tv);
+		duk__json_enc_fastint_tval(js_ctx, tv);
 		break;
 	}
 #endif
@@ -36865,7 +40098,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 
 		/* XXX: Stack discipline is annoying, could be changed in numconv. */
 		duk_push_tval(js_ctx->thr, tv);
-		duk__enc_double(js_ctx);
+		duk__json_enc_double(js_ctx);
 		duk_pop(js_ctx->thr);
 
 #if 0
@@ -36883,12 +40116,12 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 #endif
 	}
 	}
-	return 1;  /* not undefined */
+	return 1; /* not undefined */
 
- emit_undefined:
-	return 0;  /* value was undefined/unsupported */
+emit_undefined:
+	return 0; /* value was undefined/unsupported */
 
- abort_fastpath:
+abort_fastpath:
 	/* Error message doesn't matter: the error is ignored anyway. */
 	DUK_DD(DUK_DDPRINT("aborting fast path"));
 	DUK_ERROR_INTERNAL(js_ctx->thr);
@@ -36908,22 +40141,19 @@ DUK_LOCAL duk_ret_t duk__json_stringify_fast(duk_hthread *thr, void *udata) {
 	tv = DUK_GET_TVAL_NEGIDX(thr, -1);
 	if (duk__json_stringify_fast_value(js_ctx, tv) == 0) {
 		DUK_DD(DUK_DDPRINT("top level value not supported, fail fast path"));
-		DUK_DCERROR_TYPE_INVALID_ARGS(thr);  /* Error message is ignored, so doesn't matter. */
+		DUK_DCERROR_TYPE_INVALID_ARGS(thr); /* Error message is ignored, so doesn't matter. */
 	}
 
 	return 0;
 }
-#endif  /* DUK_USE_JSON_STRINGIFY_FASTPATH */
+#endif /* DUK_USE_JSON_STRINGIFY_FASTPATH */
 
 /*
  *  Top level wrappers
  */
 
 DUK_INTERNAL
-void duk_bi_json_parse_helper(duk_hthread *thr,
-                              duk_idx_t idx_value,
-                              duk_idx_t idx_reviver,
-                              duk_small_uint_t flags) {
+void duk_bi_json_parse_helper(duk_hthread *thr, duk_idx_t idx_value, duk_idx_t idx_reviver, duk_small_uint_t flags) {
 	duk_json_dec_ctx js_ctx_alloc;
 	duk_json_dec_ctx *js_ctx = &js_ctx_alloc;
 	duk_hstring *h_text;
@@ -36964,7 +40194,7 @@ void duk_bi_json_parse_helper(duk_hthread *thr,
 	js_ctx->flag_ext_custom_or_compatible = flags & (DUK_JSON_FLAG_EXT_CUSTOM | DUK_JSON_FLAG_EXT_COMPATIBLE);
 #endif
 
-	h_text = duk_to_hstring(thr, idx_value);  /* coerce in-place; rejects Symbols */
+	h_text = duk_to_hstring(thr, idx_value); /* coerce in-place; rejects Symbols */
 	DUK_ASSERT(h_text != NULL);
 
 	/* JSON parsing code is allowed to read [p_start,p_end]: p_end is
@@ -36973,40 +40203,41 @@ void duk_bi_json_parse_helper(duk_hthread *thr,
 	 */
 	js_ctx->p_start = (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h_text);
 	js_ctx->p = js_ctx->p_start;
-	js_ctx->p_end = ((const duk_uint8_t *) DUK_HSTRING_GET_DATA(h_text)) +
-	                DUK_HSTRING_GET_BYTELEN(h_text);
+	js_ctx->p_end = ((const duk_uint8_t *) DUK_HSTRING_GET_DATA(h_text)) + DUK_HSTRING_GET_BYTELEN(h_text);
 	DUK_ASSERT(*(js_ctx->p_end) == 0x00);
 
-	duk__dec_value(js_ctx);  /* -> [ ... value ] */
+	duk__json_dec_value(js_ctx); /* -> [ ... value ] */
+	DUK_ASSERT(js_ctx->recursion_depth == 0);
 
-	/* Trailing whitespace has been eaten by duk__dec_value(), so if
+	/* Trailing whitespace has been eaten by duk__json_dec_value(), so if
 	 * we're not at end of input here, it's a SyntaxError.
 	 */
 
 	if (js_ctx->p != js_ctx->p_end) {
-		duk__dec_syntax_error(js_ctx);
+		duk__json_dec_syntax_error(js_ctx);
 	}
 
 	if (duk_is_callable(thr, idx_reviver)) {
-		DUK_DDD(DUK_DDDPRINT("applying reviver: %!T",
-		                     (duk_tval *) duk_get_tval(thr, idx_reviver)));
+		DUK_DDD(DUK_DDDPRINT("applying reviver: %!T", (duk_tval *) duk_get_tval(thr, idx_reviver)));
 
 		js_ctx->idx_reviver = idx_reviver;
 
 		duk_push_object(thr);
-		duk_dup_m2(thr);  /* -> [ ... val root val ] */
-		duk_put_prop_stridx_short(thr, -2, DUK_STRIDX_EMPTY_STRING);  /* default attrs ok */
-		duk_push_hstring_stridx(thr, DUK_STRIDX_EMPTY_STRING);  /* -> [ ... val root "" ] */
+		duk_dup_m2(thr); /* -> [ ... val root val ] */
+		duk_put_prop_stridx_short(thr, -2, DUK_STRIDX_EMPTY_STRING); /* default attrs ok */
+		duk_push_hstring_stridx(thr, DUK_STRIDX_EMPTY_STRING); /* -> [ ... val root "" ] */
 
 		DUK_DDD(DUK_DDDPRINT("start reviver walk, root=%!T, name=%!T",
 		                     (duk_tval *) duk_get_tval(thr, -2),
 		                     (duk_tval *) duk_get_tval(thr, -1)));
 
-		duk__dec_reviver_walk(js_ctx);  /* [ ... val root "" ] -> [ ... val val' ] */
-		duk_remove_m2(thr);             /* -> [ ... val' ] */
+		DUK_ASSERT(js_ctx->recursion_depth == 0);
+		duk__json_dec_reviver_walk(js_ctx); /* [ ... val root "" ] -> [ ... val val' ] */
+		DUK_ASSERT(js_ctx->recursion_depth == 0);
+		duk_remove_m2(thr); /* -> [ ... val' ] */
 	} else {
-		DUK_DDD(DUK_DDDPRINT("reviver does not exist or is not callable: %!T",
-		                     (duk_tval *) duk_get_tval(thr, idx_reviver)));
+		DUK_DDD(
+		    DUK_DDDPRINT("reviver does not exist or is not callable: %!T", (duk_tval *) duk_get_tval(thr, idx_reviver)));
 	}
 
 	/* Final result is at stack top. */
@@ -37080,7 +40311,7 @@ void duk_bi_json_stringify_helper(duk_hthread *thr,
 	 * combinations properly.
 	 */
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
-	js_ctx->stridx_custom_undefined = DUK_STRIDX_LC_NULL;  /* standard JSON; array gaps */
+	js_ctx->stridx_custom_undefined = DUK_STRIDX_LC_NULL; /* standard JSON; array gaps */
 #if defined(DUK_USE_JX)
 	if (flags & DUK_JSON_FLAG_EXT_CUSTOM) {
 		js_ctx->stridx_custom_undefined = DUK_STRIDX_LC_UNDEFINED;
@@ -37088,41 +40319,35 @@ void duk_bi_json_stringify_helper(duk_hthread *thr,
 		js_ctx->stridx_custom_neginf = DUK_STRIDX_MINUS_INFINITY;
 		js_ctx->stridx_custom_posinf = DUK_STRIDX_INFINITY;
 		js_ctx->stridx_custom_function =
-		        (flags & DUK_JSON_FLAG_AVOID_KEY_QUOTES) ?
-		                DUK_STRIDX_JSON_EXT_FUNCTION2 :
-		                DUK_STRIDX_JSON_EXT_FUNCTION1;
+		    (flags & DUK_JSON_FLAG_AVOID_KEY_QUOTES) ? DUK_STRIDX_JSON_EXT_FUNCTION2 : DUK_STRIDX_JSON_EXT_FUNCTION1;
 	}
-#endif  /* DUK_USE_JX */
+#endif /* DUK_USE_JX */
 #if defined(DUK_USE_JX) && defined(DUK_USE_JC)
 	else
-#endif  /* DUK_USE_JX && DUK_USE_JC */
+#endif /* DUK_USE_JX && DUK_USE_JC */
 #if defined(DUK_USE_JC)
-	if (js_ctx->flags & DUK_JSON_FLAG_EXT_COMPATIBLE) {
+	    if (js_ctx->flags & DUK_JSON_FLAG_EXT_COMPATIBLE) {
 		js_ctx->stridx_custom_undefined = DUK_STRIDX_JSON_EXT_UNDEFINED;
 		js_ctx->stridx_custom_nan = DUK_STRIDX_JSON_EXT_NAN;
 		js_ctx->stridx_custom_neginf = DUK_STRIDX_JSON_EXT_NEGINF;
 		js_ctx->stridx_custom_posinf = DUK_STRIDX_JSON_EXT_POSINF;
 		js_ctx->stridx_custom_function = DUK_STRIDX_JSON_EXT_FUNCTION1;
 	}
-#endif  /* DUK_USE_JC */
-#endif  /* DUK_USE_JX || DUK_USE_JC */
+#endif /* DUK_USE_JC */
+#endif /* DUK_USE_JX || DUK_USE_JC */
 
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
-	if (js_ctx->flags & (DUK_JSON_FLAG_EXT_CUSTOM |
-	                     DUK_JSON_FLAG_EXT_COMPATIBLE)) {
-		DUK_ASSERT(js_ctx->mask_for_undefined == 0);  /* already zero */
-	}
-	else
-#endif  /* DUK_USE_JX || DUK_USE_JC */
+	if (js_ctx->flags & (DUK_JSON_FLAG_EXT_CUSTOM | DUK_JSON_FLAG_EXT_COMPATIBLE)) {
+		DUK_ASSERT(js_ctx->mask_for_undefined == 0); /* already zero */
+	} else
+#endif /* DUK_USE_JX || DUK_USE_JC */
 	{
 		/* Plain buffer is treated like ArrayBuffer and serialized.
 		 * Lightfuncs are treated like objects, but JSON explicitly
 		 * skips serializing Function objects so we can just reject
 		 * lightfuncs here.
 		 */
-		js_ctx->mask_for_undefined = DUK_TYPE_MASK_UNDEFINED |
-		                             DUK_TYPE_MASK_POINTER |
-		                             DUK_TYPE_MASK_LIGHTFUNC;
+		js_ctx->mask_for_undefined = DUK_TYPE_MASK_UNDEFINED | DUK_TYPE_MASK_POINTER | DUK_TYPE_MASK_LIGHTFUNC;
 	}
 
 	DUK_BW_INIT_PUSHBUF(thr, &js_ctx->bw, DUK__JSON_STRINGIFY_BUFSIZE);
@@ -37140,7 +40365,7 @@ void duk_bi_json_stringify_helper(duk_hthread *thr,
 	if (h != NULL) {
 		if (DUK_HOBJECT_IS_CALLABLE(h)) {
 			js_ctx->h_replacer = h;
-		} else if (DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_ARRAY) {
+		} else if (duk_js_isarray_hobject(h)) {
 			/* Here the specification requires correct array index enumeration
 			 * which is a bit tricky for sparse arrays (it is handled by the
 			 * enum setup code).  We now enumerate ancestors too, although the
@@ -37150,20 +40375,19 @@ void duk_bi_json_stringify_helper(duk_hthread *thr,
 			duk_uarridx_t plist_idx = 0;
 			duk_small_uint_t enum_flags;
 
-			js_ctx->idx_proplist = duk_push_array(thr);  /* XXX: array internal? */
+			js_ctx->idx_proplist = duk_push_bare_array(thr);
 
-			enum_flags = DUK_ENUM_ARRAY_INDICES_ONLY |
-			             DUK_ENUM_SORT_ARRAY_INDICES;  /* expensive flag */
+			enum_flags = DUK_ENUM_ARRAY_INDICES_ONLY | DUK_ENUM_SORT_ARRAY_INDICES; /* expensive flag */
 			duk_enum(thr, idx_replacer, enum_flags);
 			while (duk_next(thr, -1 /*enum_index*/, 1 /*get_value*/)) {
 				/* [ ... proplist enum_obj key val ] */
-				if (duk__enc_allow_into_proplist(duk_get_tval(thr, -1))) {
+				if (duk__json_enc_allow_into_proplist(duk_get_tval(thr, -1))) {
 					/* XXX: duplicates should be eliminated here */
 					DUK_DDD(DUK_DDDPRINT("proplist enum: key=%!T, val=%!T --> accept",
 					                     (duk_tval *) duk_get_tval(thr, -2),
 					                     (duk_tval *) duk_get_tval(thr, -1)));
-					duk_to_string(thr, -1);  /* extra coercion of strings is OK */
-					duk_put_prop_index(thr, -4, plist_idx);  /* -> [ ... proplist enum_obj key ] */
+					duk_to_string(thr, -1); /* extra coercion of strings is OK */
+					duk_put_prop_index(thr, -4, plist_idx); /* -> [ ... proplist enum_obj key ] */
 					plist_idx++;
 					duk_pop(thr);
 				} else {
@@ -37172,8 +40396,8 @@ void duk_bi_json_stringify_helper(duk_hthread *thr,
 					                     (duk_tval *) duk_get_tval(thr, -1)));
 					duk_pop_2(thr);
 				}
-                        }
-                        duk_pop(thr);  /* pop enum */
+			}
+			duk_pop(thr); /* pop enum */
 
 			/* [ ... proplist ] */
 		}
@@ -37199,10 +40423,9 @@ void duk_bi_json_stringify_helper(duk_hthread *thr,
 		duk_small_int_t nspace;
 		/* spaces[] must be static to allow initializer with old compilers like BCC */
 		static const char spaces[10] = {
-			DUK_ASC_SPACE, DUK_ASC_SPACE, DUK_ASC_SPACE, DUK_ASC_SPACE,
-			DUK_ASC_SPACE, DUK_ASC_SPACE, DUK_ASC_SPACE, DUK_ASC_SPACE,
-			DUK_ASC_SPACE, DUK_ASC_SPACE
-		};  /* XXX: helper */
+			DUK_ASC_SPACE, DUK_ASC_SPACE, DUK_ASC_SPACE, DUK_ASC_SPACE, DUK_ASC_SPACE,
+			DUK_ASC_SPACE, DUK_ASC_SPACE, DUK_ASC_SPACE, DUK_ASC_SPACE, DUK_ASC_SPACE
+		}; /* XXX: helper */
 
 		/* ToInteger() coercion; NaN -> 0, infinities are clamped to 0 and 10 */
 		nspace = (duk_small_int_t) duk_to_int_clamped(thr, idx_space, 0 /*minval*/, 10 /*maxval*/);
@@ -37213,7 +40436,7 @@ void duk_bi_json_stringify_helper(duk_hthread *thr,
 		DUK_ASSERT(js_ctx->h_gap != NULL);
 	} else if (duk_is_string_notsymbol(thr, idx_space)) {
 		duk_dup(thr, idx_space);
-		duk_substring(thr, -1, 0, 10);  /* clamp to 10 chars */
+		duk_substring(thr, -1, 0, 10); /* clamp to 10 chars */
 		js_ctx->h_gap = duk_known_hstring(thr, -1);
 	} else {
 		/* nop */
@@ -37237,8 +40460,8 @@ void duk_bi_json_stringify_helper(duk_hthread *thr,
 	 */
 
 #if defined(DUK_USE_JSON_STRINGIFY_FASTPATH)
-	if (js_ctx->h_replacer == NULL &&  /* replacer is a mutation risk */
-	    js_ctx->idx_proplist == -1) {  /* proplist is very rare */
+	if (js_ctx->h_replacer == NULL && /* replacer is a mutation risk */
+	    js_ctx->idx_proplist == -1) { /* proplist is very rare */
 		duk_int_t pcall_rc;
 		duk_small_uint_t prev_ms_base_flags;
 
@@ -37263,10 +40486,9 @@ void duk_bi_json_stringify_helper(duk_hthread *thr,
 
 		/* Must prevent finalizers which may have arbitrary side effects. */
 		prev_ms_base_flags = thr->heap->ms_base_flags;
-		thr->heap->ms_base_flags |=
-		        DUK_MS_FLAG_NO_OBJECT_COMPACTION;      /* Avoid attempt to compact any objects. */
-		thr->heap->pf_prevent_count++;                 /* Prevent finalizers. */
-		DUK_ASSERT(thr->heap->pf_prevent_count != 0);  /* Wrap. */
+		thr->heap->ms_base_flags |= DUK_MS_FLAG_NO_OBJECT_COMPACTION; /* Avoid attempt to compact any objects. */
+		thr->heap->pf_prevent_count++; /* Prevent finalizers. */
+		DUK_ASSERT(thr->heap->pf_prevent_count != 0); /* Wrap. */
 
 		pcall_rc = duk_safe_call(thr, duk__json_stringify_fast, (void *) js_ctx /*udata*/, 1 /*nargs*/, 0 /*nret*/);
 
@@ -37317,7 +40539,7 @@ void duk_bi_json_stringify_helper(duk_hthread *thr,
 	js_ctx->recursion_limit = DUK_USE_JSON_ENC_RECLIMIT;
 	DUK_ASSERT(js_ctx->recursion_depth == 0);
 
-	if (DUK_UNLIKELY(duk__enc_value(js_ctx, idx_holder) == 0)) {  /* [ ... holder key ] -> [ ... holder ] */
+	if (DUK_UNLIKELY(duk__json_enc_value(js_ctx, idx_holder) == 0)) { /* [ ... holder key ] -> [ ... holder ] */
 		/* Result is undefined. */
 		duk_push_undefined(thr);
 	} else {
@@ -37339,7 +40561,7 @@ void duk_bi_json_stringify_helper(duk_hthread *thr,
 	 */
 
 #if defined(DUK_USE_JSON_STRINGIFY_FASTPATH)
- replace_finished:
+replace_finished:
 #endif
 	duk_replace(thr, entry_top);
 	duk_set_top(thr, entry_top + 1);
@@ -37363,25 +40585,18 @@ void duk_bi_json_stringify_helper(duk_hthread *thr,
  */
 
 DUK_INTERNAL duk_ret_t duk_bi_json_object_parse(duk_hthread *thr) {
-	duk_bi_json_parse_helper(thr,
-	                         0 /*idx_value*/,
-	                         1 /*idx_replacer*/,
-	                         0 /*flags*/);
+	duk_bi_json_parse_helper(thr, 0 /*idx_value*/, 1 /*idx_replacer*/, 0 /*flags*/);
 	return 1;
 }
 
 DUK_INTERNAL duk_ret_t duk_bi_json_object_stringify(duk_hthread *thr) {
-	duk_bi_json_stringify_helper(thr,
-	                             0 /*idx_value*/,
-	                             1 /*idx_replacer*/,
-	                             2 /*idx_space*/,
-	                             0 /*flags*/);
+	duk_bi_json_stringify_helper(thr, 0 /*idx_value*/, 1 /*idx_replacer*/, 2 /*idx_space*/, 0 /*flags*/);
 	return 1;
 }
 
-#endif  /* DUK_USE_JSON_BUILTIN */
+#endif /* DUK_USE_JSON_BUILTIN */
 
-#endif  /* DUK_USE_JSON_SUPPORT */
+#endif /* DUK_USE_JSON_SUPPORT */
 
 /* automatic undefs */
 #undef DUK__EMIT_1
@@ -37451,7 +40666,7 @@ DUK_LOCAL double duk__fmin_fixed(double x, double y) {
 	/* fmin() with args -0 and +0 is not guaranteed to return
 	 * -0 as ECMAScript requires.
 	 */
-	if (x == 0 && y == 0) {
+	if (duk_double_equals(x, 0.0) && duk_double_equals(y, 0.0)) {
 		duk_double_union du1, du2;
 		du1.d = x;
 		du2.d = y;
@@ -37478,7 +40693,7 @@ DUK_LOCAL double duk__fmax_fixed(double x, double y) {
 	/* fmax() with args -0 and +0 is not guaranteed to return
 	 * +0 as ECMAScript requires.
 	 */
-	if (x == 0 && y == 0) {
+	if (duk_double_equals(x, 0.0) && duk_double_equals(y, 0.0)) {
 		if (DUK_SIGNBIT(x) == 0 || DUK_SIGNBIT(y) == 0) {
 			return +0.0;
 		} else {
@@ -37539,7 +40754,7 @@ DUK_LOCAL double duk__trunc(double x) {
 	return x >= 0.0 ? DUK_FLOOR(x) : DUK_CEIL(x);
 #endif
 }
-#endif  /* DUK_USE_ES6 */
+#endif /* DUK_USE_ES6 */
 
 DUK_LOCAL double duk__round_fixed(double x) {
 	/* Numbers half-way between integers must be rounded towards +Infinity,
@@ -37645,59 +40860,32 @@ DUK_LOCAL double duk__atan2_fixed(double x, double y) {
 	}
 #else
 	/* Some ISO C assumptions. */
-	DUK_ASSERT(DUK_ATAN2(DUK_DOUBLE_INFINITY, DUK_DOUBLE_INFINITY) == 0.7853981633974483);
-	DUK_ASSERT(DUK_ATAN2(-DUK_DOUBLE_INFINITY, DUK_DOUBLE_INFINITY) == -0.7853981633974483);
-	DUK_ASSERT(DUK_ATAN2(DUK_DOUBLE_INFINITY, -DUK_DOUBLE_INFINITY) == 2.356194490192345);
-	DUK_ASSERT(DUK_ATAN2(-DUK_DOUBLE_INFINITY, -DUK_DOUBLE_INFINITY) == -2.356194490192345);
+
+	DUK_ASSERT(duk_double_equals(DUK_ATAN2(DUK_DOUBLE_INFINITY, DUK_DOUBLE_INFINITY), 0.7853981633974483));
+	DUK_ASSERT(duk_double_equals(DUK_ATAN2(-DUK_DOUBLE_INFINITY, DUK_DOUBLE_INFINITY), -0.7853981633974483));
+	DUK_ASSERT(duk_double_equals(DUK_ATAN2(DUK_DOUBLE_INFINITY, -DUK_DOUBLE_INFINITY), 2.356194490192345));
+	DUK_ASSERT(duk_double_equals(DUK_ATAN2(-DUK_DOUBLE_INFINITY, -DUK_DOUBLE_INFINITY), -2.356194490192345));
 #endif
 
 	return DUK_ATAN2(x, y);
 }
-#endif  /* DUK_USE_AVOID_PLATFORM_FUNCPTRS */
+#endif /* DUK_USE_AVOID_PLATFORM_FUNCPTRS */
 
 /* order must match constants in genbuiltins.py */
 DUK_LOCAL const duk__one_arg_func duk__one_arg_funcs[] = {
 #if defined(DUK_USE_AVOID_PLATFORM_FUNCPTRS)
-	duk__fabs,
-	duk__acos,
-	duk__asin,
-	duk__atan,
-	duk__ceil,
-	duk__cos,
-	duk__exp,
-	duk__floor,
-	duk__log,
-	duk__round_fixed,
-	duk__sin,
-	duk__sqrt,
-	duk__tan,
+	duk__fabs,  duk__acos, duk__asin,        duk__atan, duk__ceil, duk__cos, duk__exp,
+	duk__floor, duk__log,  duk__round_fixed, duk__sin,  duk__sqrt, duk__tan,
 #if defined(DUK_USE_ES6)
-	duk__cbrt,
-	duk__log2,
-	duk__log10,
-	duk__trunc
-#endif
-#else  /* DUK_USE_AVOID_PLATFORM_FUNCPTRS */
-	DUK_FABS,
-	DUK_ACOS,
-	DUK_ASIN,
-	DUK_ATAN,
-	DUK_CEIL,
-	DUK_COS,
-	DUK_EXP,
-	DUK_FLOOR,
-	DUK_LOG,
-	duk__round_fixed,
-	DUK_SIN,
-	DUK_SQRT,
-	DUK_TAN,
+	duk__cbrt,  duk__log2, duk__log10,       duk__trunc
+#endif
+#else /* DUK_USE_AVOID_PLATFORM_FUNCPTRS */
+	DUK_FABS,  DUK_ACOS,  DUK_ASIN,         DUK_ATAN,  DUK_CEIL, DUK_COS, DUK_EXP,
+	DUK_FLOOR, DUK_LOG,   duk__round_fixed, DUK_SIN,   DUK_SQRT, DUK_TAN,
 #if defined(DUK_USE_ES6)
-	duk__cbrt,
-	duk__log2,
-	duk__log10,
-	duk__trunc
+	duk__cbrt, duk__log2, duk__log10,       duk__trunc
 #endif
-#endif  /* DUK_USE_AVOID_PLATFORM_FUNCPTRS */
+#endif /* DUK_USE_AVOID_PLATFORM_FUNCPTRS */
 };
 
 /* order must match constants in genbuiltins.py */
@@ -37732,7 +40920,7 @@ DUK_INTERNAL duk_ret_t duk_bi_math_object_twoarg_shared(duk_hthread *thr) {
 
 	DUK_ASSERT(fun_idx >= 0);
 	DUK_ASSERT(fun_idx < (duk_small_int_t) (sizeof(duk__two_arg_funcs) / sizeof(duk__two_arg_func)));
-	arg1 = duk_to_number(thr, 0);  /* explicit ordered evaluation to match coercion semantics */
+	arg1 = duk_to_number(thr, 0); /* explicit ordered evaluation to match coercion semantics */
 	arg2 = duk_to_number(thr, 1);
 	fun = duk__two_arg_funcs[fun_idx];
 	duk_push_number(thr, (duk_double_t) fun((double) arg1, (double) arg2));
@@ -37748,7 +40936,7 @@ DUK_INTERNAL duk_ret_t duk_bi_math_object_min(duk_hthread *thr) {
 }
 
 DUK_INTERNAL duk_ret_t duk_bi_math_object_random(duk_hthread *thr) {
-	duk_push_number(thr, (duk_double_t) DUK_UTIL_GET_RANDOM_DOUBLE(thr));
+	duk_push_number(thr, (duk_double_t) duk_util_get_random_double(thr));
 	return 1;
 }
 
@@ -37788,13 +40976,13 @@ DUK_INTERNAL duk_ret_t duk_bi_math_object_hypot(duk_hthread *thr) {
 	}
 
 	/* Early return cases. */
-	if (max == DUK_DOUBLE_INFINITY) {
+	if (duk_double_equals(max, DUK_DOUBLE_INFINITY)) {
 		duk_push_number(thr, DUK_DOUBLE_INFINITY);
 		return 1;
 	} else if (found_nan) {
 		duk_push_number(thr, DUK_DOUBLE_NAN);
 		return 1;
-	} else if (max == 0.0) {
+	} else if (duk_double_equals(max, 0.0)) {
 		duk_push_number(thr, 0.0);
 		/* Otherwise we'd divide by zero. */
 		return 1;
@@ -37818,7 +41006,7 @@ DUK_INTERNAL duk_ret_t duk_bi_math_object_hypot(duk_hthread *thr) {
 	duk_push_number(thr, (duk_double_t) DUK_SQRT(sum) * max);
 	return 1;
 }
-#endif  /* DUK_USE_ES6 */
+#endif /* DUK_USE_ES6 */
 
 #if defined(DUK_USE_ES6)
 DUK_INTERNAL duk_ret_t duk_bi_math_object_sign(duk_hthread *thr) {
@@ -37827,16 +41015,16 @@ DUK_INTERNAL duk_ret_t duk_bi_math_object_sign(duk_hthread *thr) {
 	d = duk_to_number(thr, 0);
 	if (duk_double_is_nan(d)) {
 		DUK_ASSERT(duk_is_nan(thr, -1));
-		return 1;  /* NaN input -> return NaN */
+		return 1; /* NaN input -> return NaN */
 	}
-	if (d == 0.0) {
+	if (duk_double_equals(d, 0.0)) {
 		/* Zero sign kept, i.e. -0 -> -0, +0 -> +0. */
 		return 1;
 	}
 	duk_push_int(thr, (d > 0.0 ? 1 : -1));
 	return 1;
 }
-#endif  /* DUK_USE_ES6 */
+#endif /* DUK_USE_ES6 */
 
 #if defined(DUK_USE_ES6)
 DUK_INTERNAL duk_ret_t duk_bi_math_object_clz32(duk_hthread *thr) {
@@ -37856,7 +41044,7 @@ DUK_INTERNAL duk_ret_t duk_bi_math_object_clz32(duk_hthread *thr) {
 	DUK_ASSERT(i <= 32);
 	duk_push_uint(thr, i);
 	return 1;
-#else  /* DUK_USE_PREFER_SIZE */
+#else /* DUK_USE_PREFER_SIZE */
 	i = 0;
 	x = duk_to_uint32(thr, 0);
 	if (x & 0xffff0000UL) {
@@ -37892,9 +41080,9 @@ DUK_INTERNAL duk_ret_t duk_bi_math_object_clz32(duk_hthread *thr) {
 	DUK_ASSERT(i <= 32);
 	duk_push_uint(thr, i);
 	return 1;
-#endif  /* DUK_USE_PREFER_SIZE */
+#endif /* DUK_USE_PREFER_SIZE */
 }
-#endif  /* DUK_USE_ES6 */
+#endif /* DUK_USE_ES6 */
 
 #if defined(DUK_USE_ES6)
 DUK_INTERNAL duk_ret_t duk_bi_math_object_imul(duk_hthread *thr) {
@@ -37911,9 +41099,9 @@ DUK_INTERNAL duk_ret_t duk_bi_math_object_imul(duk_hthread *thr) {
 	duk_push_i32(thr, (duk_int32_t) z);
 	return 1;
 }
-#endif  /* DUK_USE_ES6 */
+#endif /* DUK_USE_ES6 */
 
-#endif  /* DUK_USE_MATH_BUILTIN */
+#endif /* DUK_USE_MATH_BUILTIN */
 /*
  *  Number built-ins
  */
@@ -37935,19 +41123,19 @@ DUK_LOCAL duk_double_t duk__push_this_number_plain(duk_hthread *thr) {
 		goto done;
 	}
 	h = duk_get_hobject(thr, -1);
-	if (!h ||
-	    (DUK_HOBJECT_GET_CLASS_NUMBER(h) != DUK_HOBJECT_CLASS_NUMBER)) {
+	if (!h || (DUK_HOBJECT_GET_CLASS_NUMBER(h) != DUK_HOBJECT_CLASS_NUMBER)) {
 		DUK_DDD(DUK_DDDPRINT("unacceptable this value: %!T", (duk_tval *) duk_get_tval(thr, -1)));
 		DUK_ERROR_TYPE(thr, "number expected");
 		DUK_WO_NORETURN(return 0.0;);
 	}
-	duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_INT_VALUE);
+	duk_xget_owndataprop_stridx_short(thr, -1, DUK_STRIDX_INT_VALUE);
 	DUK_ASSERT(duk_is_number(thr, -1));
 	DUK_DDD(DUK_DDDPRINT("number object: %!T, internal value: %!T",
-	                     (duk_tval *) duk_get_tval(thr, -2), (duk_tval *) duk_get_tval(thr, -1)));
+	                     (duk_tval *) duk_get_tval(thr, -2),
+	                     (duk_tval *) duk_get_tval(thr, -1)));
 	duk_remove_m2(thr);
 
- done:
+done:
 	return duk_get_number(thr, -1);
 }
 
@@ -37996,9 +41184,9 @@ DUK_INTERNAL duk_ret_t duk_bi_number_constructor(duk_hthread *thr) {
 	DUK_ASSERT(DUK_HOBJECT_GET_CLASS_NUMBER(h_this) == DUK_HOBJECT_CLASS_NUMBER);
 	DUK_ASSERT(DUK_HOBJECT_HAS_EXTENSIBLE(h_this));
 
-	duk_dup_0(thr);  /* -> [ val obj val ] */
+	duk_dup_0(thr); /* -> [ val obj val ] */
 	duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_INT_VALUE, DUK_PROPDESC_FLAGS_NONE);
-	return 0;  /* no return value -> don't replace created value */
+	return 0; /* no return value -> don't replace created value */
 }
 
 DUK_INTERNAL duk_ret_t duk_bi_number_prototype_value_of(duk_hthread *thr) {
@@ -38020,10 +41208,7 @@ DUK_INTERNAL duk_ret_t duk_bi_number_prototype_to_string(duk_hthread *thr) {
 
 	n2s_flags = 0;
 
-	duk_numconv_stringify(thr,
-	                      radix /*radix*/,
-	                      0 /*digits*/,
-	                      n2s_flags /*flags*/);
+	duk_numconv_stringify(thr, radix /*radix*/, 0 /*digits*/, n2s_flags /*flags*/);
 	return 1;
 }
 
@@ -38061,16 +41246,12 @@ DUK_INTERNAL duk_ret_t duk_bi_number_prototype_to_fixed(duk_hthread *thr) {
 		goto use_to_string;
 	}
 
-	n2s_flags = DUK_N2S_FLAG_FIXED_FORMAT |
-	            DUK_N2S_FLAG_FRACTION_DIGITS;
+	n2s_flags = DUK_N2S_FLAG_FIXED_FORMAT | DUK_N2S_FLAG_FRACTION_DIGITS;
 
-	duk_numconv_stringify(thr,
-	                      10 /*radix*/,
-	                      frac_digits /*digits*/,
-	                      n2s_flags /*flags*/);
+	duk_numconv_stringify(thr, 10 /*radix*/, frac_digits /*digits*/, n2s_flags /*flags*/);
 	return 1;
 
- use_to_string:
+use_to_string:
 	DUK_ASSERT_TOP(thr, 2);
 	duk_to_string(thr, -1);
 	return 1;
@@ -38086,7 +41267,7 @@ DUK_INTERNAL duk_ret_t duk_bi_number_prototype_to_exponential(duk_hthread *thr)
 	d = duk__push_this_number_plain(thr);
 
 	frac_undefined = duk_is_undefined(thr, 0);
-	duk_to_int(thr, 0);  /* for side effects */
+	duk_to_int(thr, 0); /* for side effects */
 
 	c = (duk_small_int_t) DUK_FPCLASSIFY(d);
 	if (c == DUK_FP_NAN || c == DUK_FP_INFINITE) {
@@ -38095,16 +41276,12 @@ DUK_INTERNAL duk_ret_t duk_bi_number_prototype_to_exponential(duk_hthread *thr)
 
 	frac_digits = (duk_small_int_t) duk_to_int_check_range(thr, 0, 0, 20);
 
-	n2s_flags = DUK_N2S_FLAG_FORCE_EXP |
-	           (frac_undefined ? 0 : DUK_N2S_FLAG_FIXED_FORMAT);
+	n2s_flags = DUK_N2S_FLAG_FORCE_EXP | (frac_undefined ? 0 : DUK_N2S_FLAG_FIXED_FORMAT);
 
-	duk_numconv_stringify(thr,
-	                      10 /*radix*/,
-	                      frac_digits + 1 /*leading digit + fractions*/,
-	                      n2s_flags /*flags*/);
+	duk_numconv_stringify(thr, 10 /*radix*/, frac_digits + 1 /*leading digit + fractions*/, n2s_flags /*flags*/);
 	return 1;
 
- use_to_string:
+use_to_string:
 	DUK_ASSERT_TOP(thr, 2);
 	duk_to_string(thr, -1);
 	return 1;
@@ -38129,7 +41306,7 @@ DUK_INTERNAL duk_ret_t duk_bi_number_prototype_to_precision(duk_hthread *thr) {
 	}
 	DUK_ASSERT_TOP(thr, 2);
 
-	duk_to_int(thr, 0);  /* for side effects */
+	duk_to_int(thr, 0); /* for side effects */
 
 	c = (duk_small_int_t) DUK_FPCLASSIFY(d);
 	if (c == DUK_FP_NAN || c == DUK_FP_INFINITE) {
@@ -38138,16 +41315,12 @@ DUK_INTERNAL duk_ret_t duk_bi_number_prototype_to_precision(duk_hthread *thr) {
 
 	prec = (duk_small_int_t) duk_to_int_check_range(thr, 0, 1, 21);
 
-	n2s_flags = DUK_N2S_FLAG_FIXED_FORMAT |
-	            DUK_N2S_FLAG_NO_ZERO_PAD;
+	n2s_flags = DUK_N2S_FLAG_FIXED_FORMAT | DUK_N2S_FLAG_NO_ZERO_PAD;
 
-	duk_numconv_stringify(thr,
-	                      10 /*radix*/,
-	                      prec /*digits*/,
-	                      n2s_flags /*flags*/);
+	duk_numconv_stringify(thr, 10 /*radix*/, prec /*digits*/, n2s_flags /*flags*/);
 	return 1;
 
- use_to_string:
+use_to_string:
 	/* Used when precision is undefined; also used for NaN (-> "NaN"),
 	 * and +/- infinity (-> "Infinity", "-Infinity").
 	 */
@@ -38173,16 +41346,16 @@ DUK_INTERNAL duk_ret_t duk_bi_number_check_shared(duk_hthread *thr) {
 		d = duk_get_number(thr, 0);
 
 		switch (magic) {
-		case 0:  /* isFinite() */
+		case 0: /* isFinite() */
 			ret = duk_double_is_finite(d);
 			break;
-		case 1:  /* isInteger() */
+		case 1: /* isInteger() */
 			ret = duk_double_is_integer(d);
 			break;
-		case 2:  /* isNaN() */
+		case 2: /* isNaN() */
 			ret = duk_double_is_nan(d);
 			break;
-		default:  /* isSafeInteger() */
+		default: /* isSafeInteger() */
 			DUK_ASSERT(magic == 3);
 			ret = duk_double_is_safe_integer(d);
 		}
@@ -38191,9 +41364,9 @@ DUK_INTERNAL duk_ret_t duk_bi_number_check_shared(duk_hthread *thr) {
 	duk_push_boolean(thr, ret);
 	return 1;
 }
-#endif  /* DUK_USE_ES6 */
+#endif /* DUK_USE_ES6 */
 
-#endif  /* DUK_USE_NUMBER_BUILTIN */
+#endif /* DUK_USE_NUMBER_BUILTIN */
 /*
  *  Object built-ins
  */
@@ -38215,8 +41388,8 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor(duk_hthread *thr) {
 
 	arg_mask = duk_get_type_mask(thr, 0);
 
-	if (!duk_is_constructor_call(thr) &&  /* not a constructor call */
-	    ((arg_mask & (DUK_TYPE_MASK_NULL | DUK_TYPE_MASK_UNDEFINED)) == 0)) {  /* and argument not null or undefined */
+	if (!duk_is_constructor_call(thr) && /* not a constructor call */
+	    ((arg_mask & (DUK_TYPE_MASK_NULL | DUK_TYPE_MASK_UNDEFINED)) == 0)) { /* and argument not null or undefined */
 		duk_to_object(thr, 0);
 		return 1;
 	}
@@ -38226,13 +41399,8 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor(duk_hthread *thr) {
 	 * promote to an object value.  Lightfuncs and plain buffers are
 	 * coerced with ToObject() even they could also be returned as is.
 	 */
-	if (arg_mask & (DUK_TYPE_MASK_OBJECT |
-	                DUK_TYPE_MASK_STRING |
-	                DUK_TYPE_MASK_BOOLEAN |
-	                DUK_TYPE_MASK_NUMBER |
-	                DUK_TYPE_MASK_POINTER |
-	                DUK_TYPE_MASK_BUFFER |
-	                DUK_TYPE_MASK_LIGHTFUNC)) {
+	if (arg_mask & (DUK_TYPE_MASK_OBJECT | DUK_TYPE_MASK_STRING | DUK_TYPE_MASK_BOOLEAN | DUK_TYPE_MASK_NUMBER |
+	                DUK_TYPE_MASK_POINTER | DUK_TYPE_MASK_BUFFER | DUK_TYPE_MASK_LIGHTFUNC)) {
 		/* For DUK_TYPE_OBJECT the coercion is a no-op and could
 		 * be checked for explicitly, but Object(obj) calls are
 		 * not very common so opt for minimal footprint.
@@ -38242,13 +41410,12 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor(duk_hthread *thr) {
 	}
 
 	(void) duk_push_object_helper(thr,
-	                              DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                              DUK_HOBJECT_FLAG_FASTREFS |
-	                              DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJECT),
+	                              DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS |
+	                                  DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJECT),
 	                              DUK_BIDX_OBJECT_PROTOTYPE);
 	return 1;
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN) && defined(DUK_USE_ES6)
 DUK_INTERNAL duk_ret_t duk_bi_object_constructor_assign(duk_hthread *thr) {
@@ -38305,9 +41472,8 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_create(duk_hthread *thr) {
 	DUK_ASSERT(proto != NULL || duk_is_null(thr, 0));
 
 	(void) duk_push_object_helper_proto(thr,
-	                                    DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                                    DUK_HOBJECT_FLAG_FASTREFS |
-	                                    DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJECT),
+	                                    DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS |
+	                                        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJECT),
 	                                    proto);
 
 	if (!duk_is_undefined(thr, 1)) {
@@ -38328,7 +41494,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_create(duk_hthread *thr) {
 
 	return 1;
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_object_constructor_define_properties(duk_hthread *thr) {
@@ -38343,11 +41509,9 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_define_properties(duk_hthread *
 	obj = duk_require_hobject_promote_mask(thr, 0, DUK_TYPE_MASK_LIGHTFUNC | DUK_TYPE_MASK_BUFFER);
 	DUK_ASSERT(obj != NULL);
 
-	duk_to_object(thr, 1);        /* properties object */
+	duk_to_object(thr, 1); /* properties object */
 
-	DUK_DDD(DUK_DDDPRINT("target=%!iT, properties=%!iT",
-	                     (duk_tval *) duk_get_tval(thr, 0),
-	                     (duk_tval *) duk_get_tval(thr, 1)));
+	DUK_DDD(DUK_DDDPRINT("target=%!iT, properties=%!iT", (duk_tval *) duk_get_tval(thr, 0), (duk_tval *) duk_get_tval(thr, 1)));
 
 	/*
 	 *  Two pass approach to processing the property descriptors.
@@ -38360,7 +41524,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_define_properties(duk_hthread *
 	 */
 
 	for (pass = 0; pass < 2; pass++) {
-		duk_set_top(thr, 2);  /* -> [ hobject props ] */
+		duk_set_top(thr, 2); /* -> [ hobject props ] */
 		duk_enum(thr, 1, DUK_ENUM_OWN_PROPERTIES_ONLY | DUK_ENUM_INCLUDE_SYMBOLS /*enum_flags*/);
 
 		for (;;) {
@@ -38380,12 +41544,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_define_properties(duk_hthread *
 
 			/* [ hobject props enum(props) key desc ] */
 
-			duk_hobject_prepare_property_descriptor(thr,
-			                                        4 /*idx_desc*/,
-			                                        &defprop_flags,
-			                                        &idx_value,
-			                                        &get,
-			                                        &set);
+			duk_hobject_prepare_property_descriptor(thr, 4 /*idx_desc*/, &defprop_flags, &idx_value, &get, &set);
 
 			/* [ hobject props enum(props) key desc [multiple values] ] */
 
@@ -38397,14 +41556,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_define_properties(duk_hthread *
 			key = duk_known_hstring(thr, 3);
 			DUK_ASSERT(key != NULL);
 
-			duk_hobject_define_property_helper(thr,
-			                                   defprop_flags,
-			                                   obj,
-			                                   key,
-			                                   idx_value,
-			                                   get,
-			                                   set,
-			                                   1 /*throw_flag*/);
+			duk_hobject_define_property_helper(thr, defprop_flags, obj, key, idx_value, get, set, 1 /*throw_flag*/);
 		}
 	}
 
@@ -38415,7 +41567,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_define_properties(duk_hthread *
 	duk_dup_0(thr);
 	return 1;
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_object_constructor_seal_freeze_shared(duk_hthread *thr) {
@@ -38424,7 +41576,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_seal_freeze_shared(duk_hthread
 	duk_seal_freeze_raw(thr, 0, (duk_bool_t) duk_get_current_magic(thr) /*is_freeze*/);
 	return 1;
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_object_constructor_is_sealed_frozen_shared(duk_hthread *thr) {
@@ -38436,34 +41588,33 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_is_sealed_frozen_shared(duk_hth
 	mask = duk_get_type_mask(thr, 0);
 	if (mask & (DUK_TYPE_MASK_LIGHTFUNC | DUK_TYPE_MASK_BUFFER)) {
 		DUK_ASSERT(is_frozen == 0 || is_frozen == 1);
-		duk_push_boolean(thr, (mask & DUK_TYPE_MASK_LIGHTFUNC) ?
-		                          1 :               /* lightfunc always frozen and sealed */
-		                          (is_frozen ^ 1)); /* buffer sealed but not frozen (index props writable) */
+		duk_push_boolean(thr,
+		                 (mask & DUK_TYPE_MASK_LIGHTFUNC) ? 1 : /* lightfunc always frozen and sealed */
+                                     (is_frozen ^ 1)); /* buffer sealed but not frozen (index props writable) */
 	} else {
 		/* ES2015 Sections 19.1.2.12, 19.1.2.13: anything other than an object
 		 * is considered to be already sealed and frozen.
 		 */
 		h = duk_get_hobject(thr, 0);
-		duk_push_boolean(thr, (h == NULL) ||
-		                      duk_hobject_object_is_sealed_frozen_helper(thr, h, is_frozen /*is_frozen*/));
+		duk_push_boolean(thr, (h == NULL) || duk_hobject_object_is_sealed_frozen_helper(thr, h, is_frozen /*is_frozen*/));
 	}
 	return 1;
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_object_prototype_to_locale_string(duk_hthread *thr) {
 	DUK_ASSERT_TOP(thr, 0);
 	(void) duk_push_this_coercible_to_object(thr);
 	duk_get_prop_stridx_short(thr, 0, DUK_STRIDX_TO_STRING);
-#if 0  /* This is mentioned explicitly in the E5.1 spec, but duk_call_method() checks for it in practice. */
+#if 0 /* This is mentioned explicitly in the E5.1 spec, but duk_call_method() checks for it in practice. */
 	duk_require_callable(thr, 1);
 #endif
-	duk_dup_0(thr);  /* -> [ O toString O ] */
-	duk_call_method(thr, 0);  /* XXX: call method tail call? */
+	duk_dup_0(thr); /* -> [ O toString O ] */
+	duk_call_method(thr, 0); /* XXX: call method tail call? */
 	return 1;
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_object_prototype_value_of(duk_hthread *thr) {
@@ -38471,7 +41622,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_prototype_value_of(duk_hthread *thr) {
 	(void) duk_push_this_coercible_to_object(thr);
 	return 1;
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_object_prototype_is_prototype_of(duk_hthread *thr) {
@@ -38482,7 +41633,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_prototype_is_prototype_of(duk_hthread *thr)
 
 	h_v = duk_get_hobject(thr, 0);
 	if (!h_v) {
-		duk_push_false(thr);  /* XXX: tail call: return duk_push_false(thr) */
+		duk_push_false(thr); /* XXX: tail call: return duk_push_false(thr) */
 		return 1;
 	}
 
@@ -38492,22 +41643,24 @@ DUK_INTERNAL duk_ret_t duk_bi_object_prototype_is_prototype_of(duk_hthread *thr)
 	/* E5.1 Section 15.2.4.6, step 3.a, lookup proto once before compare.
 	 * Prototype loops should cause an error to be thrown.
 	 */
-	duk_push_boolean(thr, duk_hobject_prototype_chain_contains(thr, DUK_HOBJECT_GET_PROTOTYPE(thr->heap, h_v), h_obj, 0 /*ignore_loop*/));
+	duk_push_boolean(
+	    thr,
+	    duk_hobject_prototype_chain_contains(thr, DUK_HOBJECT_GET_PROTOTYPE(thr->heap, h_v), h_obj, 0 /*ignore_loop*/));
 	return 1;
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_object_prototype_has_own_property(duk_hthread *thr) {
 	return (duk_ret_t) duk_hobject_object_ownprop_helper(thr, 0 /*required_desc_flags*/);
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_object_prototype_property_is_enumerable(duk_hthread *thr) {
 	return (duk_ret_t) duk_hobject_object_ownprop_helper(thr, DUK_PROPDESC_FLAG_ENUMERABLE /*required_desc_flags*/);
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN) || defined(DUK_USE_REFLECT_BUILTIN)
 /* Shared helper to implement Object.getPrototypeOf,
@@ -38564,7 +41717,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_getprototype_shared(duk_hthread *thr) {
 	}
 	return 1;
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN || DUK_USE_REFLECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN || DUK_USE_REFLECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN) || defined(DUK_USE_REFLECT_BUILTIN)
 /* Shared helper to implement ES2015 Object.setPrototypeOf,
@@ -38583,7 +41736,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_setprototype_shared(duk_hthread *thr) {
 	duk_hobject *h_obj;
 	duk_hobject *h_new_proto;
 	duk_hobject *h_curr;
-	duk_ret_t ret_success = 1;  /* retval for success path */
+	duk_ret_t ret_success = 1; /* retval for success path */
 	duk_uint_t mask;
 	duk_int_t magic;
 
@@ -38604,9 +41757,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_setprototype_shared(duk_hthread *thr) {
 		if (magic == 1) {
 			duk_require_object_coercible(thr, 0);
 		} else {
-			duk_require_hobject_accept_mask(thr, 0,
-			                                DUK_TYPE_MASK_LIGHTFUNC |
-			                                DUK_TYPE_MASK_BUFFER);
+			duk_require_hobject_accept_mask(thr, 0, DUK_TYPE_MASK_LIGHTFUNC | DUK_TYPE_MASK_BUFFER);
 		}
 		duk_require_type_mask(thr, 1, DUK_TYPE_MASK_NULL | DUK_TYPE_MASK_OBJECT);
 	}
@@ -38617,9 +41768,8 @@ DUK_INTERNAL duk_ret_t duk_bi_object_setprototype_shared(duk_hthread *thr) {
 	mask = duk_get_type_mask(thr, 0);
 	if (mask & (DUK_TYPE_MASK_LIGHTFUNC | DUK_TYPE_MASK_BUFFER)) {
 		duk_hobject *curr_proto;
-		curr_proto = thr->builtins[(mask & DUK_TYPE_MASK_LIGHTFUNC) ?
-		                               DUK_BIDX_FUNCTION_PROTOTYPE :
-		                               DUK_BIDX_UINT8ARRAY_PROTOTYPE];
+		curr_proto =
+		    thr->builtins[(mask & DUK_TYPE_MASK_LIGHTFUNC) ? DUK_BIDX_FUNCTION_PROTOTYPE : DUK_BIDX_UINT8ARRAY_PROTOTYPE];
 		if (h_new_proto == curr_proto) {
 			goto skip;
 		}
@@ -38649,15 +41799,15 @@ DUK_INTERNAL duk_ret_t duk_bi_object_setprototype_shared(duk_hthread *thr) {
 	DUK_HOBJECT_SET_PROTOTYPE_UPDREF(thr, h_obj, h_new_proto);
 	/* fall thru */
 
- skip:
+skip:
 	duk_set_top(thr, 1);
 	if (magic == 2) {
 		duk_push_true(thr);
 	}
 	return ret_success;
 
- fail_nonextensible:
- fail_loop:
+fail_nonextensible:
+fail_loop:
 	if (magic != 2) {
 		DUK_DCERROR_TYPE_INVALID_ARGS(thr);
 	} else {
@@ -38665,7 +41815,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_setprototype_shared(duk_hthread *thr) {
 		return 1;
 	}
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN || DUK_USE_REFLECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN || DUK_USE_REFLECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN) || defined(DUK_USE_REFLECT_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_object_constructor_define_property(duk_hthread *thr) {
@@ -38717,12 +41867,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_define_property(duk_hthread *th
 	 *  Lightfunc set/get values are coerced to full Functions.
 	 */
 
-	duk_hobject_prepare_property_descriptor(thr,
-	                                        2 /*idx_desc*/,
-	                                        &defprop_flags,
-	                                        &idx_value,
-	                                        &get,
-	                                        &set);
+	duk_hobject_prepare_property_descriptor(thr, 2 /*idx_desc*/, &defprop_flags, &idx_value, &get, &set);
 
 	/*
 	 *  Use Object.defineProperty() helper for the actual operation.
@@ -38730,14 +41875,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_define_property(duk_hthread *th
 
 	DUK_ASSERT(magic == 0U || magic == 1U);
 	throw_flag = magic ^ 1U;
-	ret = duk_hobject_define_property_helper(thr,
-	                                         defprop_flags,
-	                                         obj,
-	                                         key,
-	                                         idx_value,
-	                                         get,
-	                                         set,
-	                                         throw_flag);
+	ret = duk_hobject_define_property_helper(thr, defprop_flags, obj, key, idx_value, get, set, throw_flag);
 
 	/* Ignore the normalize/validate helper outputs on the value stack,
 	 * they're popped automatically.
@@ -38752,7 +41890,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_define_property(duk_hthread *th
 	}
 	return 1;
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN || DUK_USE_REFLECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN || DUK_USE_REFLECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN) || defined(DUK_USE_REFLECT_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_object_constructor_get_own_property_descriptor(duk_hthread *thr) {
@@ -38768,7 +41906,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_get_own_property_descriptor(duk
 	duk_hobject_object_get_own_property_descriptor(thr, -2);
 	return 1;
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN || DUK_USE_REFLECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN || DUK_USE_REFLECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN) || defined(DUK_USE_REFLECT_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_object_constructor_is_extensible(duk_hthread *thr) {
@@ -38791,7 +41929,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_is_extensible(duk_hthread *thr)
 	duk_push_boolean(thr, (h != NULL) && DUK_HOBJECT_HAS_EXTENSIBLE(h));
 	return 1;
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN || DUK_USE_REFLECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN || DUK_USE_REFLECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN) || defined(DUK_USE_REFLECT_BUILTIN)
 /* Shared helper for various key/symbol listings, magic:
@@ -38802,26 +41940,17 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_is_extensible(duk_hthread *thr)
  */
 DUK_LOCAL const duk_small_uint_t duk__object_keys_enum_flags[4] = {
 	/* Object.keys() */
-	DUK_ENUM_OWN_PROPERTIES_ONLY |
-	    DUK_ENUM_NO_PROXY_BEHAVIOR,
+	DUK_ENUM_OWN_PROPERTIES_ONLY | DUK_ENUM_NO_PROXY_BEHAVIOR,
 
 	/* Object.getOwnPropertyNames() */
-	DUK_ENUM_INCLUDE_NONENUMERABLE |
-	    DUK_ENUM_OWN_PROPERTIES_ONLY |
-	    DUK_ENUM_NO_PROXY_BEHAVIOR,
+	DUK_ENUM_INCLUDE_NONENUMERABLE | DUK_ENUM_OWN_PROPERTIES_ONLY | DUK_ENUM_NO_PROXY_BEHAVIOR,
 
 	/* Object.getOwnPropertySymbols() */
-	DUK_ENUM_INCLUDE_SYMBOLS |
-	    DUK_ENUM_OWN_PROPERTIES_ONLY |
-	    DUK_ENUM_EXCLUDE_STRINGS |
-	    DUK_ENUM_INCLUDE_NONENUMERABLE |
+	DUK_ENUM_INCLUDE_SYMBOLS | DUK_ENUM_OWN_PROPERTIES_ONLY | DUK_ENUM_EXCLUDE_STRINGS | DUK_ENUM_INCLUDE_NONENUMERABLE |
 	    DUK_ENUM_NO_PROXY_BEHAVIOR,
 
 	/* Reflect.ownKeys() */
-	DUK_ENUM_INCLUDE_SYMBOLS |
-	    DUK_ENUM_OWN_PROPERTIES_ONLY |
-	    DUK_ENUM_INCLUDE_NONENUMERABLE |
-	    DUK_ENUM_NO_PROXY_BEHAVIOR
+	DUK_ENUM_INCLUDE_SYMBOLS | DUK_ENUM_OWN_PROPERTIES_ONLY | DUK_ENUM_INCLUDE_NONENUMERABLE | DUK_ENUM_NO_PROXY_BEHAVIOR
 };
 
 DUK_INTERNAL duk_ret_t duk_bi_object_constructor_keys_shared(duk_hthread *thr) {
@@ -38853,9 +41982,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_keys_shared(duk_hthread *thr) {
 
 #if defined(DUK_USE_ES6_PROXY)
 	/* XXX: better sharing of code between proxy target call sites */
-	if (DUK_LIKELY(!duk_hobject_proxy_check(obj,
-	                                        &h_proxy_target,
-	                                        &h_proxy_handler))) {
+	if (DUK_LIKELY(!duk_hobject_proxy_check(obj, &h_proxy_target, &h_proxy_handler))) {
 		goto skip_proxy;
 	}
 
@@ -38874,8 +42001,8 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_keys_shared(duk_hthread *thr) {
 
 	/* [ obj handler trap ] */
 	duk_insert(thr, -2);
-	duk_push_hobject(thr, h_proxy_target);  /* -> [ obj trap handler target ] */
-	duk_call_method(thr, 1 /*nargs*/);      /* -> [ obj trap_result ] */
+	duk_push_hobject(thr, h_proxy_target); /* -> [ obj trap handler target ] */
+	duk_call_method(thr, 1 /*nargs*/); /* -> [ obj trap_result ] */
 	h_trap_result = duk_require_hobject(thr, -1);
 	DUK_UNREF(h_trap_result);
 
@@ -38886,8 +42013,8 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_keys_shared(duk_hthread *thr) {
 	duk_proxy_ownkeys_postprocess(thr, h_proxy_target, enum_flags);
 	return 1;
 
- skip_proxy:
-#endif  /* DUK_USE_ES6_PROXY */
+skip_proxy:
+#endif /* DUK_USE_ES6_PROXY */
 
 	DUK_ASSERT_TOP(thr, 1);
 	magic = duk_get_current_magic(thr);
@@ -38895,7 +42022,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_keys_shared(duk_hthread *thr) {
 	enum_flags = duk__object_keys_enum_flags[magic];
 	return duk_hobject_get_enumerated_keys(thr, enum_flags);
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN || DUK_USE_REFLECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN || DUK_USE_REFLECT_BUILTIN */
 
 #if defined(DUK_USE_OBJECT_BUILTIN) || defined(DUK_USE_REFLECT_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_object_constructor_prevent_extensions(duk_hthread *thr) {
@@ -38915,12 +42042,8 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_prevent_extensions(duk_hthread
 
 	/* Object.preventExtensions() silent success for non-object. */
 	if (magic == 0) {
-		mask |= DUK_TYPE_MASK_UNDEFINED |
-		        DUK_TYPE_MASK_NULL |
-		        DUK_TYPE_MASK_BOOLEAN |
-		        DUK_TYPE_MASK_NUMBER |
-		        DUK_TYPE_MASK_STRING |
-		        DUK_TYPE_MASK_POINTER;
+		mask |= DUK_TYPE_MASK_UNDEFINED | DUK_TYPE_MASK_NULL | DUK_TYPE_MASK_BOOLEAN | DUK_TYPE_MASK_NUMBER |
+		        DUK_TYPE_MASK_STRING | DUK_TYPE_MASK_POINTER;
 	}
 
 	if (duk_check_type_mask(thr, 0, mask)) {
@@ -38937,13 +42060,13 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_prevent_extensions(duk_hthread
 	 */
 	duk_hobject_compact_props(thr, h);
 
- done:
+done:
 	if (magic == 1) {
 		duk_push_true(thr);
 	}
 	return 1;
 }
-#endif  /* DUK_USE_OBJECT_BUILTIN || DUK_USE_REFLECT_BUILTIN */
+#endif /* DUK_USE_OBJECT_BUILTIN || DUK_USE_REFLECT_BUILTIN */
 
 /*
  *  __defineGetter__, __defineSetter__, __lookupGetter__, __lookupSetter__
@@ -38959,9 +42082,10 @@ DUK_INTERNAL duk_ret_t duk_bi_object_prototype_defineaccessor(duk_hthread *thr)
 	/* [ ToObject(this) key getter/setter ] */
 
 	/* ToPropertyKey() coercion is not needed, duk_def_prop() does it. */
-	duk_def_prop(thr, 0, DUK_DEFPROP_SET_ENUMERABLE |
-	                     DUK_DEFPROP_SET_CONFIGURABLE |
-	                     (duk_get_current_magic(thr) ? DUK_DEFPROP_HAVE_SETTER : DUK_DEFPROP_HAVE_GETTER));
+	duk_def_prop(thr,
+	             0,
+	             DUK_DEFPROP_SET_ENUMERABLE | DUK_DEFPROP_SET_CONFIGURABLE |
+	                 (duk_get_current_magic(thr) ? DUK_DEFPROP_HAVE_SETTER : DUK_DEFPROP_HAVE_GETTER));
 	return 0;
 }
 DUK_INTERNAL duk_ret_t duk_bi_object_prototype_lookupaccessor(duk_hthread *thr) {
@@ -38996,7 +42120,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_prototype_lookupaccessor(duk_hthread *thr)
 	}
 	return 1;
 }
-#endif  /* DUK_USE_ES8 */
+#endif /* DUK_USE_ES8 */
 /*
  *  High resolution time API (performance.now() et al)
  *
@@ -39017,7 +42141,7 @@ DUK_INTERNAL duk_ret_t duk_bi_performance_now(duk_hthread *thr) {
 	return 1;
 }
 
-#if 0  /* Missing until semantics decided. */
+#if 0 /* Missing until semantics decided. */
 DUK_INTERNAL duk_ret_t duk_bi_performance_timeorigin_getter(duk_hthread *thr) {
 	/* No decision yet how to handle timeOrigins, e.g. should one be
 	 * initialized per heap, or per global object set.  See
@@ -39026,8 +42150,8 @@ DUK_INTERNAL duk_ret_t duk_bi_performance_timeorigin_getter(duk_hthread *thr) {
 	duk_push_uint(thr, 0);
 	return 1;
 }
-#endif  /* 0 */
-#endif  /* DUK_USE_PERFORMANCE_BUILTIN */
+#endif /* 0 */
+#endif /* DUK_USE_PERFORMANCE_BUILTIN */
 /*
  *  Pointer built-ins
  */
@@ -39053,12 +42177,11 @@ DUK_INTERNAL duk_ret_t duk_bi_pointer_constructor(duk_hthread *thr) {
 
 	if (duk_is_constructor_call(thr)) {
 		(void) duk_push_object_helper(thr,
-		                              DUK_HOBJECT_FLAG_EXTENSIBLE |
-		                              DUK_HOBJECT_FLAG_FASTREFS |
-		                              DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_POINTER),
+		                              DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS |
+		                                  DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_POINTER),
 		                              DUK_BIDX_POINTER_PROTOTYPE);
 
-		/* Pointer object internal value is immutable */
+		/* Pointer object internal value is immutable. */
 		duk_dup_0(thr);
 		duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_INT_VALUE, DUK_PROPDESC_FLAGS_NONE);
 	}
@@ -39090,7 +42213,7 @@ DUK_INTERNAL duk_ret_t duk_bi_pointer_prototype_tostring_shared(duk_hthread *thr
 			goto type_error;
 		}
 
-		duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_INT_VALUE);
+		duk_xget_owndataprop_stridx_short(thr, -1, DUK_STRIDX_INT_VALUE);
 	} else {
 		goto type_error;
 	}
@@ -39100,7 +42223,7 @@ DUK_INTERNAL duk_ret_t duk_bi_pointer_prototype_tostring_shared(duk_hthread *thr
 	}
 	return 1;
 
- type_error:
+type_error:
 	DUK_DCERROR_TYPE_INVALID_ARGS(thr);
 }
 /*
@@ -39146,7 +42269,7 @@ DUK_INTERNAL duk_ret_t duk_bi_promise_then(duk_hthread *thr) {
 	DUK_WO_NORETURN(return 0;);
 }
 
-#endif  /* DUK_USE_PROMISE_BUILTIN */
+#endif /* DUK_USE_PROMISE_BUILTIN */
 /*
  *  Proxy built-in (ES2015)
  */
@@ -39162,7 +42285,7 @@ DUK_INTERNAL void duk_proxy_ownkeys_postprocess(duk_hthread *thr, duk_hobject *h
 	duk_uarridx_t i, len, idx;
 	duk_propdesc desc;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	DUK_ASSERT(h_proxy_target != NULL);
 
 	len = (duk_uarridx_t) duk_get_length(thr, -1);
@@ -39212,10 +42335,12 @@ DUK_INTERNAL void duk_proxy_ownkeys_postprocess(duk_hthread *thr, duk_hobject *h
 		}
 
 		/* [ obj trap_result res_arr propname ] */
-		duk_put_prop_index(thr, -2, idx++);
+		duk_push_uarridx(thr, idx++);
+		duk_insert(thr, -2);
+		duk_def_prop(thr, -3, DUK_DEFPROP_HAVE_VALUE | DUK_DEFPROP_SET_WEC);
 		continue;
 
-	 skip_key:
+	skip_key:
 		duk_pop(thr);
 		continue;
 	}
@@ -39232,17 +42357,17 @@ DUK_INTERNAL void duk_proxy_ownkeys_postprocess(duk_hthread *thr, duk_hobject *h
 	 * handled above.
 	 */
 }
-#endif  /* DUK_USE_ES6_PROXY */
+#endif /* DUK_USE_ES6_PROXY */
 
 #if defined(DUK_USE_ES6_PROXY)
 DUK_INTERNAL duk_ret_t duk_bi_proxy_constructor(duk_hthread *thr) {
-	DUK_ASSERT_TOP(thr, 2);  /* [ target handler ] */
+	DUK_ASSERT_TOP(thr, 2); /* [ target handler ] */
 
 	duk_require_constructor_call(thr);
-	duk_push_proxy(thr, 0 /*flags*/);  /* [ target handler ] -> [ proxy ] */
-	return 1;  /* replacement */
+	duk_push_proxy(thr, 0 /*flags*/); /* [ target handler ] -> [ proxy ] */
+	return 1; /* replacement */
 }
-#endif  /* DUK_USE_ES6_PROXY */
+#endif /* DUK_USE_ES6_PROXY */
 /*
  *  'Reflect' built-in (ES2016 Section 26.1)
  *  http://www.ecma-international.org/ecma-262/7.0/#sec-reflect-object
@@ -39292,7 +42417,7 @@ DUK_INTERNAL duk_ret_t duk_bi_reflect_object_get(duk_hthread *thr) {
 
 	tv_obj = DUK_GET_TVAL_POSIDX(thr, 0);
 	tv_key = DUK_GET_TVAL_POSIDX(thr, 1);
-	(void) duk_hobject_getprop(thr, tv_obj, tv_key);  /* This could also be a duk_get_prop(). */
+	(void) duk_hobject_getprop(thr, tv_obj, tv_key); /* This could also be a duk_get_prop(). */
 	return 1;
 }
 
@@ -39341,7 +42466,7 @@ DUK_INTERNAL duk_ret_t duk_bi_reflect_object_set(duk_hthread *thr) {
 	duk_push_boolean(thr, ret);
 	return 1;
 }
-#endif  /* DUK_USE_REFLECT_BUILTIN */
+#endif /* DUK_USE_REFLECT_BUILTIN */
 /*
  *  RegExp built-ins
  */
@@ -39357,7 +42482,7 @@ DUK_LOCAL void duk__get_this_regexp(duk_hthread *thr) {
 	h = duk_require_hobject_with_class(thr, -1, DUK_HOBJECT_CLASS_REGEXP);
 	DUK_ASSERT(h != NULL);
 	DUK_UNREF(h);
-	duk_insert(thr, 0);  /* prepend regexp to valstack 0 index */
+	duk_insert(thr, 0); /* prepend regexp to valstack 0 index */
 }
 
 /* XXX: much to improve (code size) */
@@ -39367,10 +42492,8 @@ DUK_INTERNAL duk_ret_t duk_bi_regexp_constructor(duk_hthread *thr) {
 	DUK_ASSERT_TOP(thr, 2);
 	h_pattern = duk_get_hobject(thr, 0);
 
-	if (!duk_is_constructor_call(thr) &&
-	    h_pattern != NULL &&
-	    DUK_HOBJECT_GET_CLASS_NUMBER(h_pattern) == DUK_HOBJECT_CLASS_REGEXP &&
-	    duk_is_undefined(thr, 1)) {
+	if (!duk_is_constructor_call(thr) && h_pattern != NULL &&
+	    DUK_HOBJECT_GET_CLASS_NUMBER(h_pattern) == DUK_HOBJECT_CLASS_REGEXP && duk_is_undefined(thr, 1)) {
 		/* Called as a function, pattern has [[Class]] "RegExp" and
 		 * flags is undefined -> return object as is.
 		 */
@@ -39385,8 +42508,7 @@ DUK_INTERNAL duk_ret_t duk_bi_regexp_constructor(duk_hthread *thr) {
 	 * call.
 	 */
 
-	if (h_pattern != NULL &&
-	    DUK_HOBJECT_GET_CLASS_NUMBER(h_pattern) == DUK_HOBJECT_CLASS_REGEXP) {
+	if (h_pattern != NULL && DUK_HOBJECT_GET_CLASS_NUMBER(h_pattern) == DUK_HOBJECT_CLASS_REGEXP) {
 		duk_get_prop_stridx_short(thr, 0, DUK_STRIDX_SOURCE);
 		if (duk_is_undefined(thr, 1)) {
 			/* In ES5 one would need to read the flags individually;
@@ -39402,20 +42524,21 @@ DUK_INTERNAL duk_ret_t duk_bi_regexp_constructor(duk_hthread *thr) {
 			duk_push_hstring_empty(thr);
 		} else {
 			duk_dup_0(thr);
-			duk_to_string(thr, -1);  /* Rejects Symbols. */
+			duk_to_string(thr, -1); /* Rejects Symbols. */
 		}
 		if (duk_is_undefined(thr, 1)) {
 			duk_push_hstring_empty(thr);
 		} else {
 			duk_dup_1(thr);
-			duk_to_string(thr, -1);  /* Rejects Symbols. */
+			duk_to_string(thr, -1); /* Rejects Symbols. */
 		}
 
 		/* [ ... pattern flags ] */
 	}
 
 	DUK_DDD(DUK_DDDPRINT("RegExp constructor/function call, pattern=%!T, flags=%!T",
-	                     (duk_tval *) duk_get_tval(thr, -2), (duk_tval *) duk_get_tval(thr, -1)));
+	                     (duk_tval *) duk_get_tval(thr, -2),
+	                     (duk_tval *) duk_get_tval(thr, -1)));
 
 	/* [ ... pattern flags ] (both uncoerced) */
 
@@ -39465,7 +42588,7 @@ DUK_INTERNAL duk_ret_t duk_bi_regexp_prototype_tostring(duk_hthread *thr) {
 	duk_push_this(thr);
 	duk_push_literal(thr, "/");
 	duk_get_prop_stridx(thr, 0, DUK_STRIDX_SOURCE);
-	duk_dup_m2(thr);  /* another "/" */
+	duk_dup_m2(thr); /* another "/" */
 	duk_get_prop_stridx(thr, 0, DUK_STRIDX_FLAGS);
 	duk_concat(thr, 4);
 	return 1;
@@ -39475,7 +42598,7 @@ DUK_INTERNAL duk_ret_t duk_bi_regexp_prototype_flags(duk_hthread *thr) {
 	/* .flags is ES2015 but present even when ES2015 bindings are
 	 * disabled because the constructor relies on it.
 	 */
-	duk_uint8_t buf[8];  /* enough for all flags + NUL */
+	duk_uint8_t buf[8]; /* enough for all flags + NUL */
 	duk_uint8_t *p = buf;
 
 	/* .flags is generic and works on any object. */
@@ -39513,10 +42636,10 @@ DUK_INTERNAL duk_ret_t duk_bi_regexp_prototype_shared_getter(duk_hthread *thr) {
 	magic = duk_get_current_magic(thr);
 
 	if (DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_REGEXP) {
-		duk_get_prop_stridx_short(thr, 0, DUK_STRIDX_INT_SOURCE);
-		duk_get_prop_stridx_short(thr, 0, DUK_STRIDX_INT_BYTECODE);
+		duk_xget_owndataprop_stridx_short(thr, 0, DUK_STRIDX_INT_SOURCE);
+		duk_xget_owndataprop_stridx_short(thr, 0, DUK_STRIDX_INT_BYTECODE);
 		h_bc = duk_require_hstring(thr, -1);
-		re_flags = (duk_small_uint_t) DUK_HSTRING_GET_DATA(h_bc)[0];  /* Safe even if h_bc length is 0 (= NUL) */
+		re_flags = (duk_small_uint_t) DUK_HSTRING_GET_DATA(h_bc)[0]; /* Safe even if h_bc length is 0 (= NUL) */
 		duk_pop(thr);
 	} else if (h == thr->builtins[DUK_BIDX_REGEXP_PROTOTYPE]) {
 		/* In ES2015 and ES2016 a TypeError would be thrown here.
@@ -39527,7 +42650,7 @@ DUK_INTERNAL duk_ret_t duk_bi_regexp_prototype_shared_getter(duk_hthread *thr) {
 		if (magic != 16 /* .source */) {
 			return 0;
 		}
-		duk_push_literal(thr, "(?:)");  /* .source handled by switch-case */
+		duk_push_literal(thr, "(?:)"); /* .source handled by switch-case */
 		re_flags = 0;
 	} else {
 		DUK_DCERROR_TYPE_INVALID_ARGS(thr);
@@ -39536,15 +42659,15 @@ DUK_INTERNAL duk_ret_t duk_bi_regexp_prototype_shared_getter(duk_hthread *thr) {
 	/* [ regexp source ] */
 
 	switch (magic) {
-	case 0: {  /* global */
+	case 0: { /* global */
 		duk_push_boolean(thr, (re_flags & DUK_RE_FLAG_GLOBAL));
 		break;
 	}
-	case 1: {  /* ignoreCase */
+	case 1: { /* ignoreCase */
 		duk_push_boolean(thr, (re_flags & DUK_RE_FLAG_IGNORE_CASE));
 		break;
 	}
-	case 2: {  /* multiline */
+	case 2: { /* multiline */
 		duk_push_boolean(thr, (re_flags & DUK_RE_FLAG_MULTILINE));
 		break;
 	}
@@ -39558,7 +42681,7 @@ DUK_INTERNAL duk_ret_t duk_bi_regexp_prototype_shared_getter(duk_hthread *thr) {
 		break;
 	}
 #endif
-	default: {  /* source */
+	default: { /* source */
 		/* leave 'source' on top */
 		break;
 	}
@@ -39567,7 +42690,7 @@ DUK_INTERNAL duk_ret_t duk_bi_regexp_prototype_shared_getter(duk_hthread *thr) {
 	return 1;
 }
 
-#endif  /* DUK_USE_REGEXP_SUPPORT */
+#endif /* DUK_USE_REGEXP_SUPPORT */
 /*
  *  String built-ins
  *
@@ -39606,7 +42729,8 @@ DUK_LOCAL duk_hstring *duk__str_tostring_notregexp(duk_hthread *thr, duk_idx_t i
 	return h;
 }
 
-DUK_LOCAL duk_int_t duk__str_search_shared(duk_hthread *thr, duk_hstring *h_this, duk_hstring *h_search, duk_int_t start_cpos, duk_bool_t backwards) {
+DUK_LOCAL duk_int_t
+duk__str_search_shared(duk_hthread *thr, duk_hstring *h_this, duk_hstring *h_search, duk_int_t start_cpos, duk_bool_t backwards) {
 	duk_int_t cpos;
 	duk_int_t bpos;
 	const duk_uint8_t *p_start, *p_end, *p;
@@ -39641,7 +42765,7 @@ DUK_LOCAL duk_int_t duk__str_search_shared(duk_hthread *thr, duk_hstring *h_this
 	 * must be updated if 'p' is wound back (backward scanning).
 	 */
 
-	firstbyte = q_start[0];  /* leading byte of match string */
+	firstbyte = q_start[0]; /* leading byte of match string */
 	while (p <= p_end && p >= p_start) {
 		t = *p;
 
@@ -39707,15 +42831,13 @@ DUK_INTERNAL duk_ret_t duk_bi_string_constructor(duk_hthread *thr) {
 			duk_replace(thr, 0);
 		}
 	}
-	duk_to_string(thr, 0);  /* catches symbol argument for constructor call */
+	duk_to_string(thr, 0); /* catches symbol argument for constructor call */
 	DUK_ASSERT(duk_is_string(thr, 0));
-	duk_set_top(thr, 1);  /* Top may be 1 or larger. */
+	duk_set_top(thr, 1); /* Top may be 1 or larger. */
 
 	if (duk_is_constructor_call(thr)) {
 		/* String object internal value is immutable */
-		flags = DUK_HOBJECT_FLAG_EXTENSIBLE |
-		        DUK_HOBJECT_FLAG_FASTREFS |
-		        DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ |
+		flags = DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS | DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ |
 		        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_STRING);
 		duk_push_object_helper(thr, flags, DUK_BIDX_STRING_PROTOTYPE);
 		duk_dup_0(thr);
@@ -39741,7 +42863,7 @@ DUK_LOCAL duk_ret_t duk__construct_from_codepoints(duk_hthread *thr, duk_bool_t
 	n = duk_get_top(thr);
 
 	bw = &bw_alloc;
-	DUK_BW_INIT_PUSHBUF(thr, bw, (duk_size_t) n);  /* initial estimate for ASCII only codepoints */
+	DUK_BW_INIT_PUSHBUF(thr, bw, (duk_size_t) n); /* initial estimate for ASCII only codepoints */
 
 	for (i = 0; i < n; i++) {
 		/* XXX: could improve bufwriter handling to write multiple codepoints
@@ -39755,8 +42877,7 @@ DUK_LOCAL duk_ret_t duk__construct_from_codepoints(duk_hthread *thr, duk_bool_t
 			 * the same.
 			 */
 			duk_int32_t i32 = 0;
-			if (!duk_is_whole_get_int32(duk_to_number(thr, i), &i32) ||
-			    i32 < 0 || i32 > 0x10ffffL) {
+			if (!duk_is_whole_get_int32(duk_to_number(thr, i), &i32) || i32 < 0 || i32 > 0x10ffffL) {
 				DUK_DCERROR_RANGE_INVALID_ARGS(thr);
 			}
 			DUK_ASSERT(i32 >= 0 && i32 <= 0x10ffffL);
@@ -39780,7 +42901,7 @@ DUK_LOCAL duk_ret_t duk__construct_from_codepoints(duk_hthread *thr, duk_bool_t
 	}
 
 	DUK_BW_COMPACT(thr, bw);
-	(void) duk_buffer_to_string(thr, -1);  /* Safe, extended UTF-8 or CESU-8 encoded. */
+	(void) duk_buffer_to_string(thr, -1); /* Safe, extended UTF-8 or CESU-8 encoded. */
 	return 1;
 }
 
@@ -39816,16 +42937,16 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_to_string(duk_hthread *thr) {
 			goto type_error;
 		}
 
-		duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_INT_VALUE);
+		duk_xget_owndataprop_stridx_short(thr, -1, DUK_STRIDX_INT_VALUE);
 		DUK_ASSERT(duk_is_string(thr, -1));
 	} else {
 		goto type_error;
 	}
 
-	(void) duk_require_hstring_notsymbol(thr, -1);  /* Reject symbols (and wrapped symbols). */
+	(void) duk_require_hstring_notsymbol(thr, -1); /* Reject symbols (and wrapped symbols). */
 	return 1;
 
- type_error:
+type_error:
 	DUK_DCERROR_TYPE_INVALID_ARGS(thr);
 }
 
@@ -39961,7 +43082,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_substr(duk_hthread *thr) {
 	 * ("undefined" and "null").
 	 */
 	duk_push_this(thr);
-	h = duk_to_hstring_m1(thr);  /* Reject Symbols. */
+	h = duk_to_hstring_m1(thr); /* Reject Symbols. */
 	DUK_ASSERT(h != NULL);
 	len = (duk_int_t) DUK_HSTRING_GET_CHARLEN(h);
 
@@ -39993,7 +43114,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_substr(duk_hthread *thr) {
 	duk_substring(thr, -1, (duk_size_t) start_pos, (duk_size_t) end_pos);
 	return 1;
 }
-#endif  /* DUK_USE_SECTION_B */
+#endif /* DUK_USE_SECTION_B */
 
 DUK_INTERNAL duk_ret_t duk_bi_string_prototype_slice(duk_hthread *thr) {
 	duk_hstring *h;
@@ -40052,7 +43173,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_indexof_shared(duk_hthread *thr)
 	duk_hstring *h_search;
 	duk_int_t clen_this;
 	duk_int_t cpos;
-	duk_small_uint_t is_lastindexof = (duk_small_uint_t) duk_get_current_magic(thr);  /* 0=indexOf, 1=lastIndexOf */
+	duk_small_uint_t is_lastindexof = (duk_small_uint_t) duk_get_current_magic(thr); /* 0=indexOf, 1=lastIndexOf */
 
 	h_this = duk_push_this_coercible_to_string(thr);
 	DUK_ASSERT(h_this != NULL);
@@ -40109,7 +43230,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 	duk_int_t match_caps;
 #endif
 	duk_uint32_t prev_match_end_boff;
-	const duk_uint8_t *r_start, *r_end, *r;   /* repl string scan */
+	const duk_uint8_t *r_start, *r_end, *r; /* repl string scan */
 	duk_size_t tmp_sz;
 
 	DUK_ASSERT_TOP(thr, 2);
@@ -40117,7 +43238,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 	DUK_ASSERT(h_input != NULL);
 
 	bw = &bw_alloc;
-	DUK_BW_INIT_PUSHBUF(thr, bw, DUK_HSTRING_GET_BYTELEN(h_input));  /* input size is good output starting point */
+	DUK_BW_INIT_PUSHBUF(thr, bw, DUK_HSTRING_GET_BYTELEN(h_input)); /* input size is good output starting point */
 
 	DUK_ASSERT_TOP(thr, 4);
 
@@ -40138,11 +43259,11 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 			duk_push_int(thr, 0);
 			duk_put_prop_stridx_short(thr, 0, DUK_STRIDX_LAST_INDEX);
 		}
-#else  /* DUK_USE_REGEXP_SUPPORT */
+#else /* DUK_USE_REGEXP_SUPPORT */
 		DUK_DCERROR_UNSUPPORTED(thr);
-#endif  /* DUK_USE_REGEXP_SUPPORT */
+#endif /* DUK_USE_REGEXP_SUPPORT */
 	} else {
-		duk_to_string(thr, 0);  /* rejects symbols */
+		duk_to_string(thr, 0); /* rejects symbols */
 #if defined(DUK_USE_REGEXP_SUPPORT)
 		is_regexp = 0;
 		is_global = 0;
@@ -40157,7 +43278,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 		duk_hstring *h_repl;
 
 		is_repl_func = 0;
-		h_repl = duk_to_hstring(thr, 1);  /* reject symbols */
+		h_repl = duk_to_hstring(thr, 1); /* reject symbols */
 		DUK_ASSERT(h_repl != NULL);
 		r_start = DUK_HSTRING_GET_DATA(h_repl);
 		r_end = r_start + DUK_HSTRING_GET_BYTELEN(h_repl);
@@ -40195,7 +43316,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 		if (is_regexp) {
 			duk_dup_0(thr);
 			duk_dup_2(thr);
-			duk_regexp_match(thr);  /* [ ... regexp input ] -> [ res_obj ] */
+			duk_regexp_match(thr); /* [ ... regexp input ] -> [ res_obj ] */
 			if (!duk_is_object(thr, -1)) {
 				duk_pop(thr);
 				break;
@@ -40209,7 +43330,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 			duk_get_prop_index(thr, -1, 0);
 			DUK_ASSERT(duk_is_string(thr, -1));
 			h_match = duk_known_hstring(thr, -1);
-			duk_pop(thr);  /* h_match is borrowed, remains reachable through match_obj */
+			duk_pop(thr); /* h_match is borrowed, remains reachable through match_obj */
 
 			if (DUK_HSTRING_GET_BYTELEN(h_match) == 0) {
 				/* This should be equivalent to match() algorithm step 8.f.iii.2:
@@ -40220,35 +43341,43 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 				duk_get_prop_stridx_short(thr, 0, DUK_STRIDX_LAST_INDEX);
 				last_index = (duk_uint32_t) duk_get_uint(thr, -1);
 				DUK_DDD(DUK_DDDPRINT("empty match, bump lastIndex: %ld -> %ld",
-				                     (long) last_index, (long) (last_index + 1)));
+				                     (long) last_index,
+				                     (long) (last_index + 1)));
 				duk_pop(thr);
 				duk_push_uint(thr, (duk_uint_t) (last_index + 1));
 				duk_put_prop_stridx_short(thr, 0, DUK_STRIDX_LAST_INDEX);
 			}
 
-			DUK_ASSERT(duk_get_length(thr, -1) <= DUK_INT_MAX);  /* string limits */
+			DUK_ASSERT(duk_get_length(thr, -1) <= DUK_INT_MAX); /* string limits */
 			match_caps = (duk_int_t) duk_get_length(thr, -1);
 		} else {
-#else  /* DUK_USE_REGEXP_SUPPORT */
-		{  /* unconditionally */
-#endif  /* DUK_USE_REGEXP_SUPPORT */
-			const duk_uint8_t *p_start, *p_end, *p;   /* input string scan */
-			const duk_uint8_t *q_start;               /* match string */
+#else /* DUK_USE_REGEXP_SUPPORT */
+		{ /* unconditionally */
+#endif /* DUK_USE_REGEXP_SUPPORT */
+			const duk_uint8_t *p_start, *p_end, *p; /* input string scan */
+			const duk_uint8_t *q_start; /* match string */
+			duk_size_t p_blen;
 			duk_size_t q_blen;
 
 #if defined(DUK_USE_REGEXP_SUPPORT)
-			DUK_ASSERT(!is_global);  /* single match always */
+			DUK_ASSERT(!is_global); /* single match always */
 #endif
 
 			p_start = DUK_HSTRING_GET_DATA(h_input);
 			p_end = p_start + DUK_HSTRING_GET_BYTELEN(h_input);
+			p_blen = (duk_size_t) DUK_HSTRING_GET_BYTELEN(h_input);
 			p = p_start;
 
 			h_search = duk_known_hstring(thr, 0);
 			q_start = DUK_HSTRING_GET_DATA(h_search);
 			q_blen = (duk_size_t) DUK_HSTRING_GET_BYTELEN(h_search);
 
-			p_end -= q_blen;  /* ensure full memcmp() fits in while */
+			if (q_blen > p_blen) {
+				break; /* no match */
+			}
+
+			p_end -= q_blen; /* ensure full memcmp() fits in while */
+			DUK_ASSERT(p_end >= p);
 
 			match_start_coff = 0;
 
@@ -40273,7 +43402,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 			/* not found */
 			break;
 		}
-	 found:
+	found:
 
 		/* stack[0] = search value
 		 * stack[1] = replace value
@@ -40307,9 +43436,9 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 					duk_get_prop_index(thr, 4, (duk_uarridx_t) idx);
 				}
 			} else {
-#else  /* DUK_USE_REGEXP_SUPPORT */
-			{  /* unconditionally */
-#endif  /* DUK_USE_REGEXP_SUPPORT */
+#else /* DUK_USE_REGEXP_SUPPORT */
+			{ /* unconditionally */
+#endif /* DUK_USE_REGEXP_SUPPORT */
 				/* match == search string, by definition */
 				duk_dup_0(thr);
 			}
@@ -40319,12 +43448,12 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 			/* [ ... replacer match [captures] match_char_offset input ] */
 
 			duk_call(thr, duk_get_top(thr) - idx_args);
-			h_repl = duk_to_hstring_m1(thr);  /* -> [ ... repl_value ] */
+			h_repl = duk_to_hstring_m1(thr); /* -> [ ... repl_value ] */
 			DUK_ASSERT(h_repl != NULL);
 
 			DUK_BW_WRITE_ENSURE_HSTRING(thr, bw, h_repl);
 
-			duk_pop(thr);  /* repl_value */
+			duk_pop(thr); /* repl_value */
 		} else {
 			r = r_start;
 
@@ -40371,9 +43500,10 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 					 * match codepoint encodings would have different lengths.
 					 */
 					/* XXX: charlen computed here, and also in char2byte helper. */
-					match_end_boff = (duk_uint32_t) duk_heap_strcache_offset_char2byte(thr,
-					                                                                   h_input,
-					                                                                   match_start_coff + (duk_uint_fast32_t) DUK_HSTRING_GET_CHARLEN(h_match));
+					match_end_boff = (duk_uint32_t) duk_heap_strcache_offset_char2byte(
+					    thr,
+					    h_input,
+					    match_start_coff + (duk_uint_fast32_t) DUK_HSTRING_GET_CHARLEN(h_match));
 
 					tmp_sz = (duk_size_t) (DUK_HSTRING_GET_BYTELEN(h_input) - match_end_boff);
 					DUK_BW_WRITE_ENSURE_BYTES(thr, bw, DUK_HSTRING_GET_DATA(h_input) + match_end_boff, tmp_sz);
@@ -40409,7 +43539,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 					}
 
 					if (capnum > 0 && capnum < match_caps) {
-						DUK_ASSERT(is_regexp != 0);  /* match_caps == 0 without regexps */
+						DUK_ASSERT(is_regexp != 0); /* match_caps == 0 without regexps */
 
 						/* regexp res_obj is at offset 4 */
 						duk_get_prop_index(thr, 4, (duk_uarridx_t) capnum);
@@ -40428,26 +43558,26 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 					} else {
 						goto repl_write;
 					}
-#else  /* DUK_USE_REGEXP_SUPPORT */
-					goto repl_write;  /* unconditionally */
-#endif  /* DUK_USE_REGEXP_SUPPORT */
-				}  /* default case */
-				}  /* switch (ch2) */
+#else /* DUK_USE_REGEXP_SUPPORT */
+					goto repl_write; /* unconditionally */
+#endif /* DUK_USE_REGEXP_SUPPORT */
+				} /* default case */
+				} /* switch (ch2) */
 
-			 repl_write:
+			repl_write:
 				/* ch1 = (r_increment << 8) + byte */
 
 				DUK_BW_WRITE_ENSURE_U8(thr, bw, (duk_uint8_t) (ch1 & 0xff));
 				r += ch1 >> 8;
-			}  /* while repl */
-		}  /* if (is_repl_func) */
+			} /* while repl */
+		} /* if (is_repl_func) */
 
-		duk_pop(thr);  /* pop regexp res_obj or match string */
+		duk_pop(thr); /* pop regexp res_obj or match string */
 
 #if defined(DUK_USE_REGEXP_SUPPORT)
 		if (!is_global) {
 #else
-		{  /* unconditionally; is_global==0 */
+		{ /* unconditionally; is_global==0 */
 #endif
 			break;
 		}
@@ -40459,7 +43589,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 
 	DUK_ASSERT_TOP(thr, 4);
 	DUK_BW_COMPACT(thr, bw);
-	(void) duk_buffer_to_string(thr, -1);  /* Safe if inputs are safe. */
+	(void) duk_buffer_to_string(thr, -1); /* Safe if inputs are safe. */
 	return 1;
 }
 
@@ -40479,7 +43609,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_split(duk_hthread *thr) {
 #if defined(DUK_USE_REGEXP_SUPPORT)
 	duk_bool_t is_regexp;
 #endif
-	duk_bool_t matched;  /* set to 1 if any match exists (needed for empty input special case) */
+	duk_bool_t matched; /* set to 1 if any match exists (needed for empty input special case) */
 	duk_uint32_t prev_match_end_coff, prev_match_end_boff;
 	duk_uint32_t match_start_boff, match_start_coff;
 	duk_uint32_t match_end_boff, match_end_coff;
@@ -40517,7 +43647,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_split(duk_hthread *thr) {
 #if defined(DUK_USE_REGEXP_SUPPORT)
 		duk_push_hobject_bidx(thr, DUK_BIDX_REGEXP_CONSTRUCTOR);
 		duk_dup_0(thr);
-		duk_new(thr, 1);  /* [ ... RegExp val ] -> [ ... res ] */
+		duk_new(thr, 1); /* [ ... RegExp val ] -> [ ... res ] */
 		duk_replace(thr, 0);
 		/* lastIndex is initialized to zero by new RegExp() */
 		is_regexp = 1;
@@ -40556,7 +43686,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_split(duk_hthread *thr) {
 		if (is_regexp) {
 			duk_dup_0(thr);
 			duk_dup_2(thr);
-			duk_regexp_match_force_global(thr);  /* [ ... regexp input ] -> [ res_obj ] */
+			duk_regexp_match_force_global(thr); /* [ ... regexp input ] -> [ res_obj ] */
 			if (!duk_is_object(thr, -1)) {
 				duk_pop(thr);
 				break;
@@ -40589,23 +43719,23 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_split(duk_hthread *thr) {
 				continue;
 			}
 		} else {
-#else  /* DUK_USE_REGEXP_SUPPORT */
-		{  /* unconditionally */
-#endif  /* DUK_USE_REGEXP_SUPPORT */
-			const duk_uint8_t *p_start, *p_end, *p;   /* input string scan */
-			const duk_uint8_t *q_start;               /* match string */
+#else /* DUK_USE_REGEXP_SUPPORT */
+		{ /* unconditionally */
+#endif /* DUK_USE_REGEXP_SUPPORT */
+			const duk_uint8_t *p_start, *p_end, *p; /* input string scan */
+			const duk_uint8_t *q_start; /* match string */
 			duk_size_t q_blen, q_clen;
 
 			p_start = DUK_HSTRING_GET_DATA(h_input);
 			p_end = p_start + DUK_HSTRING_GET_BYTELEN(h_input);
 			p = p_start + prev_match_end_boff;
 
-			h_sep = duk_known_hstring(thr, 0);  /* symbol already rejected above */
+			h_sep = duk_known_hstring(thr, 0); /* symbol already rejected above */
 			q_start = DUK_HSTRING_GET_DATA(h_sep);
 			q_blen = (duk_size_t) DUK_HSTRING_GET_BYTELEN(h_sep);
 			q_clen = (duk_size_t) DUK_HSTRING_GET_CHARLEN(h_sep);
 
-			p_end -= q_blen;  /* ensure full memcmp() fits in while */
+			p_end -= q_blen; /* ensure full memcmp() fits in while */
 
 			match_start_coff = prev_match_end_coff;
 
@@ -40618,7 +43748,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_split(duk_hthread *thr) {
 				 * Don't allow an empty string to match at the end of the input.
 				 */
 
-				matched = 1;  /* empty separator can always match */
+				matched = 1; /* empty separator can always match */
 
 				match_start_coff++;
 				p++;
@@ -40634,7 +43764,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_split(duk_hthread *thr) {
 			DUK_ASSERT(q_blen > 0 && q_clen > 0);
 			while (p <= p_end) {
 				DUK_ASSERT(p + q_blen <= DUK_HSTRING_GET_DATA(h_input) + DUK_HSTRING_GET_BYTELEN(h_input));
-				DUK_ASSERT(q_blen > 0);  /* no issues with empty memcmp() */
+				DUK_ASSERT(q_blen > 0); /* no issues with empty memcmp() */
 				if (duk_memcmp((const void *) p, (const void *) q_start, (size_t) q_blen) == 0) {
 					/* never an empty match, so step 13.c.iii can't be triggered */
 					goto found;
@@ -40647,15 +43777,15 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_split(duk_hthread *thr) {
 				p++;
 			}
 
-		 not_found:
+		not_found:
 			/* not found */
 			break;
 
-		 found:
+		found:
 			matched = 1;
 			match_start_boff = (duk_uint32_t) (p - p_start);
-			match_end_coff = (duk_uint32_t) (match_start_coff + q_clen);  /* constrained by string length */
-			match_end_boff = (duk_uint32_t) (match_start_boff + q_blen);  /* ditto */
+			match_end_coff = (duk_uint32_t) (match_start_coff + q_clen); /* constrained by string length */
+			match_end_boff = (duk_uint32_t) (match_start_boff + q_blen); /* ditto */
 
 			/* empty match (may happen with empty separator) -> bump and continue */
 			if (prev_match_end_boff == match_end_boff) {
@@ -40663,7 +43793,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_split(duk_hthread *thr) {
 				prev_match_end_coff++;
 				continue;
 			}
-		}  /* if (is_regexp) */
+		} /* if (is_regexp) */
 
 		/* stack[0] = separator (string or regexp)
 		 * stack[1] = limit
@@ -40673,9 +43803,12 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_split(duk_hthread *thr) {
 		 */
 
 		DUK_DDD(DUK_DDDPRINT("split; match_start b=%ld,c=%ld, match_end b=%ld,c=%ld, prev_end b=%ld,c=%ld",
-		                     (long) match_start_boff, (long) match_start_coff,
-		                     (long) match_end_boff, (long) match_end_coff,
-		                     (long) prev_match_end_boff, (long) prev_match_end_coff));
+		                     (long) match_start_boff,
+		                     (long) match_start_coff,
+		                     (long) match_end_boff,
+		                     (long) match_end_coff,
+		                     (long) prev_match_end_boff,
+		                     (long) prev_match_end_coff));
 
 		duk_push_lstring(thr,
 		                 (const char *) (DUK_HSTRING_GET_DATA(h_input) + prev_match_end_boff),
@@ -40692,7 +43825,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_split(duk_hthread *thr) {
 
 			len = duk_get_length(thr, 4);
 			for (i = 1; i < len; i++) {
-				DUK_ASSERT(i <= DUK_UARRIDX_MAX);  /* cannot have >4G captures */
+				DUK_ASSERT(i <= DUK_UARRIDX_MAX); /* cannot have >4G captures */
 				duk_get_prop_index(thr, 4, (duk_uarridx_t) i);
 				duk_put_prop_index(thr, 3, arr_idx);
 				arr_idx++;
@@ -40704,21 +43837,21 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_split(duk_hthread *thr) {
 			duk_pop(thr);
 			/* lastIndex already set up for next match */
 		} else {
-#else  /* DUK_USE_REGEXP_SUPPORT */
-		{  /* unconditionally */
-#endif  /* DUK_USE_REGEXP_SUPPORT */
+#else /* DUK_USE_REGEXP_SUPPORT */
+		{
+		/* unconditionally */
+#endif /* DUK_USE_REGEXP_SUPPORT */
 			/* no action */
 		}
 
 		prev_match_end_boff = match_end_boff;
 		prev_match_end_coff = match_end_coff;
 		continue;
-	}  /* for */
+	} /* for */
 
 	/* Combined step 11 (empty string special case) and 14-15. */
 
-	DUK_DDD(DUK_DDDPRINT("split trailer; prev_end b=%ld,c=%ld",
-	                     (long) prev_match_end_boff, (long) prev_match_end_coff));
+	DUK_DDD(DUK_DDDPRINT("split trailer; prev_end b=%ld,c=%ld", (long) prev_match_end_boff, (long) prev_match_end_coff));
 
 	if (DUK_HSTRING_GET_BYTELEN(h_input) > 0 || !matched) {
 		/* Add trailer if:
@@ -40735,7 +43868,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_split(duk_hthread *thr) {
 
 	return 1;
 
- hit_limit:
+hit_limit:
 #if defined(DUK_USE_REGEXP_SUPPORT)
 	if (is_regexp) {
 		duk_pop(thr);
@@ -40767,13 +43900,13 @@ DUK_LOCAL void duk__to_regexp_helper(duk_hthread *thr, duk_idx_t idx, duk_bool_t
 	}
 	return;
 
- do_new:
+do_new:
 	duk_push_hobject_bidx(thr, DUK_BIDX_REGEXP_CONSTRUCTOR);
 	duk_dup(thr, idx);
-	duk_new(thr, 1);  /* [ ... RegExp val ] -> [ ... res ] */
+	duk_new(thr, 1); /* [ ... RegExp val ] -> [ ... res ] */
 	duk_replace(thr, idx);
 }
-#endif  /* DUK_USE_REGEXP_SUPPORT */
+#endif /* DUK_USE_REGEXP_SUPPORT */
 
 #if defined(DUK_USE_REGEXP_SUPPORT)
 DUK_INTERNAL duk_ret_t duk_bi_string_prototype_search(duk_hthread *thr) {
@@ -40788,7 +43921,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_search(duk_hthread *thr) {
 	 */
 
 	DUK_ASSERT_TOP(thr, 1);
-	(void) duk_push_this_coercible_to_string(thr);  /* at index 1 */
+	(void) duk_push_this_coercible_to_string(thr); /* at index 1 */
 	duk__to_regexp_helper(thr, 0 /*index*/, 1 /*force_new*/);
 
 	/* stack[0] = regexp
@@ -40800,8 +43933,8 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_search(duk_hthread *thr) {
 	 */
 
 	duk_dup_0(thr);
-	duk_dup_1(thr);  /* [ ... re_obj input ] */
-	duk_regexp_match(thr);  /* -> [ ... res_obj ] */
+	duk_dup_1(thr); /* [ ... re_obj input ] */
+	duk_regexp_match(thr); /* -> [ ... res_obj ] */
 
 	if (!duk_is_object(thr, -1)) {
 		duk_push_int(thr, -1);
@@ -40812,7 +43945,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_search(duk_hthread *thr) {
 	DUK_ASSERT(duk_is_number(thr, -1));
 	return 1;
 }
-#endif  /* DUK_USE_REGEXP_SUPPORT */
+#endif /* DUK_USE_REGEXP_SUPPORT */
 
 #if defined(DUK_USE_REGEXP_SUPPORT)
 DUK_INTERNAL duk_ret_t duk_bi_string_prototype_match(duk_hthread *thr) {
@@ -40832,8 +43965,8 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_match(duk_hthread *thr) {
 	 */
 
 	if (!global) {
-		duk_regexp_match(thr);  /* -> [ res_obj ] */
-		return 1;  /* return 'res_obj' */
+		duk_regexp_match(thr); /* -> [ res_obj ] */
+		return 1; /* return 'res_obj' */
 	}
 
 	/* Global case is more complex. */
@@ -40854,7 +43987,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_match(duk_hthread *thr) {
 
 		duk_dup_0(thr);
 		duk_dup_1(thr);
-		duk_regexp_match(thr);  /* -> [ ... regexp string ] -> [ ... res_obj ] */
+		duk_regexp_match(thr); /* -> [ ... regexp string ] -> [ ... res_obj ] */
 
 		if (!duk_is_object(thr, -1)) {
 			duk_pop(thr);
@@ -40873,24 +44006,24 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_match(duk_hthread *thr) {
 		}
 		prev_last_index = this_index;
 
-		duk_get_prop_index(thr, -1, 0);  /* match string */
+		duk_get_prop_index(thr, -1, 0); /* match string */
 		duk_put_prop_index(thr, 2, (duk_uarridx_t) arr_idx);
 		arr_idx++;
-		duk_pop(thr);  /* res_obj */
+		duk_pop(thr); /* res_obj */
 	}
 
 	if (arr_idx == 0) {
 		duk_push_null(thr);
 	}
 
-	return 1;  /* return 'res_arr' or 'null' */
+	return 1; /* return 'res_arr' or 'null' */
 }
-#endif  /* DUK_USE_REGEXP_SUPPORT */
+#endif /* DUK_USE_REGEXP_SUPPORT */
 
 DUK_INTERNAL duk_ret_t duk_bi_string_prototype_concat(duk_hthread *thr) {
 	/* duk_concat() coerces arguments with ToString() in correct order */
 	(void) duk_push_this_coercible_to_string(thr);
-	duk_insert(thr, 0);  /* this is relatively expensive */
+	duk_insert(thr, 0); /* this is relatively expensive */
 	duk_concat(thr, duk_get_top(thr));
 	return 1;
 }
@@ -40955,10 +44088,10 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_repeat(duk_hthread *thr) {
 #if defined(DUK_USE_PREFER_SIZE)
 	p = buf;
 	while (count-- > 0) {
-		duk_memcpy((void *) p, (const void *) src, input_blen);  /* copy size may be zero, but pointers are valid */
+		duk_memcpy((void *) p, (const void *) src, input_blen); /* copy size may be zero, but pointers are valid */
 		p += input_blen;
 	}
-#else  /* DUK_USE_PREFER_SIZE */
+#else /* DUK_USE_PREFER_SIZE */
 	/* Take advantage of already copied pieces to speed up the process
 	 * especially for small repeated strings.
 	 */
@@ -40968,7 +44101,9 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_repeat(duk_hthread *thr) {
 	for (;;) {
 		duk_size_t remain = (duk_size_t) (p_end - p);
 		DUK_DDD(DUK_DDDPRINT("remain=%ld, copy_size=%ld, input_blen=%ld, result_len=%ld",
-		                     (long) remain, (long) copy_size, (long) input_blen,
+		                     (long) remain,
+		                     (long) copy_size,
+		                     (long) input_blen,
 		                     (long) result_len));
 		if (remain <= copy_size) {
 			/* If result_len is zero, this case is taken and does
@@ -40981,10 +44116,10 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_repeat(duk_hthread *thr) {
 			p += copy_size;
 		}
 
-		src = (const duk_uint8_t *) buf;  /* Use buf as source for larger copies. */
+		src = (const duk_uint8_t *) buf; /* Use buf as source for larger copies. */
 		copy_size = (duk_size_t) (p - buf);
 	}
-#endif  /* DUK_USE_PREFER_SIZE */
+#endif /* DUK_USE_PREFER_SIZE */
 
 	/* XXX: It would be useful to be able to create a duk_hstring with
 	 * a certain byte size whose data area wasn't initialized and which
@@ -40995,13 +44130,13 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_repeat(duk_hthread *thr) {
 	 * intern table (they are not in heap_allocated).
 	 */
 
-	duk_buffer_to_string(thr, -1);  /* Safe if input is safe. */
+	duk_buffer_to_string(thr, -1); /* Safe if input is safe. */
 	return 1;
 
- fail_range:
+fail_range:
 	DUK_DCERROR_RANGE_INVALID_ARGS(thr);
 }
-#endif  /* DUK_USE_ES6 */
+#endif /* DUK_USE_ES6 */
 
 DUK_INTERNAL duk_ret_t duk_bi_string_prototype_locale_compare(duk_hthread *thr) {
 	duk_hstring *h1;
@@ -41055,7 +44190,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_locale_compare(duk_hthread *thr)
 	ret = -1;
 	goto done;
 
- done:
+done:
 	duk_push_int(thr, (duk_int_t) ret);
 	return 1;
 }
@@ -41063,44 +44198,65 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_locale_compare(duk_hthread *thr)
 #if defined(DUK_USE_ES6)
 DUK_INTERNAL duk_ret_t duk_bi_string_prototype_startswith_endswith(duk_hthread *thr) {
 	duk_int_t magic;
-	duk_hstring *h;
+	duk_hstring *h_target;
+	duk_size_t blen_target;
 	duk_hstring *h_search;
 	duk_size_t blen_search;
-	const duk_uint8_t *p_cmp_start;
-	duk_bool_t result;
+	duk_int_t off;
+	duk_bool_t result = 0;
+	duk_size_t blen_left;
 
-	h = duk_push_this_coercible_to_string(thr);
-	DUK_ASSERT(h != NULL);
+	/* Because string byte lengths are in [0,DUK_INT_MAX] it's safe to
+	 * subtract two string lengths without overflow.
+	 */
+	DUK_ASSERT(DUK_HSTRING_MAX_BYTELEN <= DUK_INT_MAX);
+
+	h_target = duk_push_this_coercible_to_string(thr);
+	DUK_ASSERT(h_target != NULL);
 
 	h_search = duk__str_tostring_notregexp(thr, 0);
 	DUK_ASSERT(h_search != NULL);
 
 	magic = duk_get_current_magic(thr);
 
-	p_cmp_start = (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h);
+	/* Careful to avoid pointer overflows in the matching logic. */
+
+	blen_target = DUK_HSTRING_GET_BYTELEN(h_target);
 	blen_search = DUK_HSTRING_GET_BYTELEN(h_search);
 
+#if 0
+	/* If search string is longer than the target string, we can
+	 * never match.  Could check explicitly, but should be handled
+	 * correctly below.
+	 */
+	if (blen_search > blen_target) {
+		goto finish;
+	}
+#endif
+
+	off = 0;
 	if (duk_is_undefined(thr, 1)) {
 		if (magic) {
-			p_cmp_start = p_cmp_start + DUK_HSTRING_GET_BYTELEN(h) - blen_search;
+			off = (duk_int_t) blen_target - (duk_int_t) blen_search;
 		} else {
-			/* p_cmp_start already OK */
+			DUK_ASSERT(off == 0);
 		}
 	} else {
 		duk_int_t len;
 		duk_int_t pos;
 
 		DUK_ASSERT(DUK_HSTRING_MAX_BYTELEN <= DUK_INT_MAX);
-		len = (duk_int_t) DUK_HSTRING_GET_CHARLEN(h);
+		len = (duk_int_t) DUK_HSTRING_GET_CHARLEN(h_target);
 		pos = duk_to_int_clamped(thr, 1, 0, len);
 		DUK_ASSERT(pos >= 0 && pos <= len);
 
+		off = (duk_int_t) duk_heap_strcache_offset_char2byte(thr, h_target, (duk_uint_fast32_t) pos);
 		if (magic) {
-			p_cmp_start -= blen_search;  /* Conceptually subtracted last, but do already here. */
+			off -= (duk_int_t) blen_search;
 		}
-		DUK_ASSERT(pos >= 0 && pos <= len);
-
-		p_cmp_start += duk_heap_strcache_offset_char2byte(thr, h, (duk_uint_fast32_t) pos);
+	}
+	if (off < 0 || off > (duk_int_t) blen_target) {
+		goto finish;
 	}
 
 	/* The main comparison can be done using a memcmp() rather than
@@ -41110,20 +44266,22 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_startswith_endswith(duk_hthread *
 	 * comparison range.
 	 */
 
-	result = 0;
-	if (p_cmp_start >= DUK_HSTRING_GET_DATA(h) &&
-	    (duk_size_t) (p_cmp_start - (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h)) + blen_search <= DUK_HSTRING_GET_BYTELEN(h)) {
-		if (duk_memcmp((const void *) p_cmp_start,
-		               (const void *) DUK_HSTRING_GET_DATA(h_search),
-		               (size_t) blen_search) == 0) {
+	DUK_ASSERT(off >= 0);
+	DUK_ASSERT((duk_size_t) off <= blen_target);
+	blen_left = blen_target - (duk_size_t) off;
+	if (blen_left >= blen_search) {
+		const duk_uint8_t *p_cmp_start = (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h_target) + off;
+		const duk_uint8_t *p_search = (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h_search);
+		if (duk_memcmp_unsafe((const void *) p_cmp_start, (const void *) p_search, (size_t) blen_search) == 0) {
 			result = 1;
 		}
 	}
 
+finish:
 	duk_push_boolean(thr, result);
 	return 1;
 }
-#endif  /* DUK_USE_ES6 */
+#endif /* DUK_USE_ES6 */
 
 #if defined(DUK_USE_ES6)
 DUK_INTERNAL duk_ret_t duk_bi_string_prototype_includes(duk_hthread *thr) {
@@ -41146,8 +44304,8 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_includes(duk_hthread *thr) {
 	duk_push_boolean(thr, pos >= 0);
 	return 1;
 }
-#endif  /* DUK_USE_ES6 */
-#endif  /* DUK_USE_STRING_BUILTIN */
+#endif /* DUK_USE_ES6 */
+#endif /* DUK_USE_STRING_BUILTIN */
 /*
  *  Symbol built-in
  */
@@ -41189,7 +44347,7 @@ DUK_INTERNAL duk_ret_t duk_bi_symbol_constructor_shared(duk_hthread *thr) {
 	buf = (duk_uint8_t *) duk_push_fixed_buffer(thr, 1 + len + 1 + 17 + 1);
 	DUK_ASSERT(buf != NULL);
 	p = buf + 1;
-	DUK_ASSERT(desc != NULL || len == 0);  /* may be NULL if len is 0 */
+	DUK_ASSERT(desc != NULL || len == 0); /* may be NULL if len is 0 */
 	duk_memcpy_unsafe((void *) p, (const void *) desc, len);
 	p += len;
 	if (magic == 0) {
@@ -41200,7 +44358,9 @@ DUK_INTERNAL duk_ret_t duk_bi_symbol_constructor_shared(duk_hthread *thr) {
 		if (++thr->heap->sym_counter[0] == 0) {
 			thr->heap->sym_counter[1]++;
 		}
-		p += DUK_SPRINTF((char *) p, "\xFF" "%lx-%lx",
+		p += DUK_SPRINTF((char *) p,
+		                 "\xFF"
+		                 "%lx-%lx",
 		                 (unsigned long) thr->heap->sym_counter[1],
 		                 (unsigned long) thr->heap->sym_counter[0]);
 		if (desc == NULL) {
@@ -41223,7 +44383,6 @@ DUK_INTERNAL duk_ret_t duk_bi_symbol_constructor_shared(duk_hthread *thr) {
 
 DUK_LOCAL duk_hstring *duk__auto_unbox_symbol(duk_hthread *thr, duk_tval *tv_arg) {
 	duk_tval *tv;
-	duk_tval tv_val;
 	duk_hobject *h_obj;
 	duk_hstring *h_str;
 
@@ -41237,10 +44396,10 @@ DUK_LOCAL duk_hstring *duk__auto_unbox_symbol(duk_hthread *thr, duk_tval *tv_arg
 		h_obj = DUK_TVAL_GET_OBJECT(tv);
 		DUK_ASSERT(h_obj != NULL);
 		if (DUK_HOBJECT_GET_CLASS_NUMBER(h_obj) == DUK_HOBJECT_CLASS_SYMBOL) {
-			if (!duk_hobject_get_internal_value(thr->heap, h_obj, &tv_val)) {
+			tv = duk_hobject_get_internal_value_tval_ptr(thr->heap, h_obj);
+			if (tv == NULL) {
 				return NULL;
 			}
-			tv = &tv_val;
 		} else {
 			return NULL;
 		}
@@ -41318,7 +44477,7 @@ DUK_INTERNAL duk_ret_t duk_bi_symbol_toprimitive(duk_hthread *thr) {
 	return 1;
 }
 
-#endif  /* DUK_USE_SYMBOL_BUILTIN */
+#endif /* DUK_USE_SYMBOL_BUILTIN */
 /*
  *  Thread builtins
  */
@@ -41352,7 +44511,7 @@ DUK_INTERNAL duk_ret_t duk_bi_thread_constructor(duk_hthread *thr) {
 	 */
 	duk_push_hobject(new_thr, func);
 
-	return 1;  /* return thread */
+	return 1; /* return thread */
 }
 #endif
 
@@ -41398,14 +44557,15 @@ DUK_INTERNAL duk_ret_t duk_bi_thread_resume(duk_hthread *ctx) {
 	 */
 
 	if (thr->callstack_top < 2) {
-		DUK_DD(DUK_DDPRINT("resume state invalid: callstack should contain at least 2 entries (caller and Duktape.Thread.resume)"));
+		DUK_DD(DUK_DDPRINT(
+		    "resume state invalid: callstack should contain at least 2 entries (caller and Duktape.Thread.resume)"));
 		goto state_error;
 	}
 	DUK_ASSERT(thr->callstack_curr != NULL);
 	DUK_ASSERT(thr->callstack_curr->parent != NULL);
-	DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack_curr) != NULL);  /* us */
+	DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack_curr) != NULL); /* us */
 	DUK_ASSERT(DUK_HOBJECT_IS_NATFUNC(DUK_ACT_GET_FUNC(thr->callstack_curr)));
-	DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack_curr->parent) != NULL);  /* caller */
+	DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack_curr->parent) != NULL); /* caller */
 
 	caller_func = DUK_ACT_GET_FUNC(thr->callstack_curr->parent);
 	if (!DUK_HOBJECT_IS_COMPFUNC(caller_func)) {
@@ -41417,14 +44577,12 @@ DUK_INTERNAL duk_ret_t duk_bi_thread_resume(duk_hthread *ctx) {
 	 * like for yield.
 	 */
 
-	if (thr_resume->state != DUK_HTHREAD_STATE_INACTIVE &&
-	    thr_resume->state != DUK_HTHREAD_STATE_YIELDED) {
+	if (thr_resume->state != DUK_HTHREAD_STATE_INACTIVE && thr_resume->state != DUK_HTHREAD_STATE_YIELDED) {
 		DUK_DD(DUK_DDPRINT("resume state invalid: target thread must be INACTIVE or YIELDED"));
 		goto state_error;
 	}
 
-	DUK_ASSERT(thr_resume->state == DUK_HTHREAD_STATE_INACTIVE ||
-	           thr_resume->state == DUK_HTHREAD_STATE_YIELDED);
+	DUK_ASSERT(thr_resume->state == DUK_HTHREAD_STATE_INACTIVE || thr_resume->state == DUK_HTHREAD_STATE_YIELDED);
 
 	/* Further state-dependent pre-checks */
 
@@ -41442,20 +44600,31 @@ DUK_INTERNAL duk_ret_t duk_bi_thread_resume(duk_hthread *ctx) {
 		 * because an error in the RESUME handler call processing will
 		 * not be handled very cleanly.
 		 */
-		if ((thr_resume->callstack_top != 0) ||
-		    (thr_resume->valstack_top - thr_resume->valstack != 1)) {
+		if ((thr_resume->callstack_top != 0) || (thr_resume->valstack_top - thr_resume->valstack != 1)) {
 			goto state_error;
 		}
 
 		duk_push_tval(thr, DUK_GET_TVAL_NEGIDX(thr_resume, -1));
 		duk_resolve_nonbound_function(thr);
-		h_fun = duk_require_hobject(thr, -1);  /* reject lightfuncs on purpose */
+		h_fun = duk_require_hobject(thr, -1); /* reject lightfuncs on purpose */
 		if (!DUK_HOBJECT_IS_CALLABLE(h_fun) || !DUK_HOBJECT_IS_COMPFUNC(h_fun)) {
 			goto state_error;
 		}
 		duk_pop(thr);
 	}
 
+#if 0
+	/* This check would prevent a heap destruction time finalizer from
+	 * launching a coroutine, which would ensure that during finalization
+	 * 'thr' would always equal heap_thread.  Normal runtime finalizers
+	 * run with ms_running == 0, i.e. outside mark-and-sweep.  See GH-2030.
+	 */
+	if (thr->heap->ms_running) {
+		DUK_D(DUK_DPRINT("refuse Duktape.Thread.resume() when ms_running != 0"));
+		goto state_error;
+	}
+#endif
+
 	/*
 	 *  The error object has been augmented with a traceback and other
 	 *  info from its creation point -- usually another thread.  The
@@ -41466,8 +44635,8 @@ DUK_INTERNAL duk_ret_t duk_bi_thread_resume(duk_hthread *ctx) {
 
 #if defined(DUK_USE_AUGMENT_ERROR_THROW)
 	if (is_error) {
-		DUK_ASSERT_TOP(thr, 2);  /* value (error) is at stack top */
-		duk_err_augment_error_throw(thr);  /* in resumer's context */
+		DUK_ASSERT_TOP(thr, 2); /* value (error) is at stack top */
+		duk_err_augment_error_throw(thr); /* in resumer's context */
 	}
 #endif
 
@@ -41491,21 +44660,21 @@ DUK_INTERNAL duk_ret_t duk_bi_thread_resume(duk_hthread *ctx) {
 
 	/* lj value2: thread */
 	DUK_ASSERT(thr->valstack_bottom < thr->valstack_top);
-	DUK_TVAL_SET_TVAL_UPDREF(thr, &thr->heap->lj.value2, &thr->valstack_bottom[0]);  /* side effects */
+	DUK_TVAL_SET_TVAL_UPDREF(thr, &thr->heap->lj.value2, &thr->valstack_bottom[0]); /* side effects */
 
 	/* lj value1: value */
 	DUK_ASSERT(thr->valstack_bottom + 1 < thr->valstack_top);
-	DUK_TVAL_SET_TVAL_UPDREF(thr, &thr->heap->lj.value1, &thr->valstack_bottom[1]);  /* side effects */
+	DUK_TVAL_SET_TVAL_UPDREF(thr, &thr->heap->lj.value1, &thr->valstack_bottom[1]); /* side effects */
 	DUK_TVAL_CHKFAST_INPLACE_SLOW(&thr->heap->lj.value1);
 
 	thr->heap->lj.iserror = is_error;
 
-	DUK_ASSERT(thr->heap->lj.jmpbuf_ptr != NULL);  /* call is from executor, so we know we have a jmpbuf */
-	duk_err_longjmp(thr);  /* execution resumes in bytecode executor */
+	DUK_ASSERT(thr->heap->lj.jmpbuf_ptr != NULL); /* call is from executor, so we know we have a jmpbuf */
+	duk_err_longjmp(thr); /* execution resumes in bytecode executor */
 	DUK_UNREACHABLE();
 	/* Never here, fall through to error (from compiler point of view). */
 
- state_error:
+state_error:
 	DUK_DCERROR_TYPE_INVALID_STATE(thr);
 }
 #endif
@@ -41554,14 +44723,15 @@ DUK_INTERNAL duk_ret_t duk_bi_thread_yield(duk_hthread *thr) {
 	DUK_ASSERT(thr->resumer->state == DUK_HTHREAD_STATE_RESUMED);
 
 	if (thr->callstack_top < 2) {
-		DUK_DD(DUK_DDPRINT("yield state invalid: callstack should contain at least 2 entries (caller and Duktape.Thread.yield)"));
+		DUK_DD(DUK_DDPRINT(
+		    "yield state invalid: callstack should contain at least 2 entries (caller and Duktape.Thread.yield)"));
 		goto state_error;
 	}
 	DUK_ASSERT(thr->callstack_curr != NULL);
 	DUK_ASSERT(thr->callstack_curr->parent != NULL);
-	DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack_curr) != NULL);  /* us */
+	DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack_curr) != NULL); /* us */
 	DUK_ASSERT(DUK_HOBJECT_IS_NATFUNC(DUK_ACT_GET_FUNC(thr->callstack_curr)));
-	DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack_curr->parent) != NULL);  /* caller */
+	DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack_curr->parent) != NULL); /* caller */
 
 	caller_func = DUK_ACT_GET_FUNC(thr->callstack_curr->parent);
 	if (!DUK_HOBJECT_IS_COMPFUNC(caller_func)) {
@@ -41569,10 +44739,11 @@ DUK_INTERNAL duk_ret_t duk_bi_thread_yield(duk_hthread *thr) {
 		goto state_error;
 	}
 
-	DUK_ASSERT(thr->callstack_preventcount >= 1);  /* should never be zero, because we (Duktape.Thread.yield) are on the stack */
+	DUK_ASSERT(thr->callstack_preventcount >= 1); /* should never be zero, because we (Duktape.Thread.yield) are on the stack */
 	if (thr->callstack_preventcount != 1) {
 		/* Note: the only yield-preventing call is Duktape.Thread.yield(), hence check for 1, not 0 */
-		DUK_DD(DUK_DDPRINT("yield state invalid: there must be no yield-preventing calls in current thread callstack (preventcount is %ld)",
+		DUK_DD(DUK_DDPRINT("yield state invalid: there must be no yield-preventing calls in current thread callstack "
+		                   "(preventcount is %ld)",
 		                   (long) thr->callstack_preventcount));
 		goto state_error;
 	}
@@ -41586,18 +44757,16 @@ DUK_INTERNAL duk_ret_t duk_bi_thread_yield(duk_hthread *thr) {
 
 #if defined(DUK_USE_AUGMENT_ERROR_THROW)
 	if (is_error) {
-		DUK_ASSERT_TOP(thr, 1);  /* value (error) is at stack top */
-		duk_err_augment_error_throw(thr);  /* in yielder's context */
+		DUK_ASSERT_TOP(thr, 1); /* value (error) is at stack top */
+		duk_err_augment_error_throw(thr); /* in yielder's context */
 	}
 #endif
 
 #if defined(DUK_USE_DEBUG)
 	if (is_error) {
-		DUK_DDD(DUK_DDDPRINT("YIELD ERROR: value=%!T",
-		                     (duk_tval *) duk_get_tval(thr, 0)));
+		DUK_DDD(DUK_DDDPRINT("YIELD ERROR: value=%!T", (duk_tval *) duk_get_tval(thr, 0)));
 	} else {
-		DUK_DDD(DUK_DDDPRINT("YIELD NORMAL: value=%!T",
-		                     (duk_tval *) duk_get_tval(thr, 0)));
+		DUK_DDD(DUK_DDDPRINT("YIELD NORMAL: value=%!T", (duk_tval *) duk_get_tval(thr, 0)));
 	}
 #endif
 
@@ -41612,17 +44781,17 @@ DUK_INTERNAL duk_ret_t duk_bi_thread_yield(duk_hthread *thr) {
 
 	/* lj value1: value */
 	DUK_ASSERT(thr->valstack_bottom < thr->valstack_top);
-	DUK_TVAL_SET_TVAL_UPDREF(thr, &thr->heap->lj.value1, &thr->valstack_bottom[0]);  /* side effects */
+	DUK_TVAL_SET_TVAL_UPDREF(thr, &thr->heap->lj.value1, &thr->valstack_bottom[0]); /* side effects */
 	DUK_TVAL_CHKFAST_INPLACE_SLOW(&thr->heap->lj.value1);
 
 	thr->heap->lj.iserror = is_error;
 
-	DUK_ASSERT(thr->heap->lj.jmpbuf_ptr != NULL);  /* call is from executor, so we know we have a jmpbuf */
-	duk_err_longjmp(thr);  /* execution resumes in bytecode executor */
+	DUK_ASSERT(thr->heap->lj.jmpbuf_ptr != NULL); /* call is from executor, so we know we have a jmpbuf */
+	duk_err_longjmp(thr); /* execution resumes in bytecode executor */
 	DUK_UNREACHABLE();
 	/* Never here, fall through to error (from compiler point of view). */
 
- state_error:
+state_error:
 	DUK_DCERROR_TYPE_INVALID_STATE(thr);
 }
 #endif
@@ -41700,7 +44869,7 @@ DUK_INTERNAL void duk_fb_sprintf(duk_fixedbuffer *fb, const char *fmt, ...) {
 }
 
 DUK_INTERNAL void duk_fb_put_funcptr(duk_fixedbuffer *fb, duk_uint8_t *fptr, duk_size_t fptr_size) {
-	char buf[64+1];
+	char buf[64 + 1];
 	duk_debug_format_funcptr(buf, sizeof(buf), fptr, fptr_size);
 	buf[sizeof(buf) - 1] = (char) 0;
 	duk_fb_put_cstring(fb, buf);
@@ -41710,7 +44879,7 @@ DUK_INTERNAL duk_bool_t duk_fb_is_full(duk_fixedbuffer *fb) {
 	return (fb->offset >= fb->length);
 }
 
-#endif  /* DUK_USE_DEBUG */
+#endif /* DUK_USE_DEBUG */
 /*
  *  Custom formatter for debug printing, allowing Duktape specific data
  *  structures (such as tagged values and heap objects) to be printed with
@@ -41724,7 +44893,9 @@ DUK_INTERNAL duk_bool_t duk_fb_is_full(duk_fixedbuffer *fb) {
  *     %!T    tagged value (duk_tval *)
  *     %!O    heap object (duk_heaphdr *)
  *     %!I    decoded bytecode instruction
- *     %!C    bytecode instruction opcode name (arg is long)
+ *     %!X    bytecode instruction opcode name (arg is long)
+ *     %!C    catcher (duk_catcher *)
+ *     %!A    activation (duk_activation *)
  *
  *  Everything is serialized in a JSON-like manner.  The default depth is one
  *  level, internal prototype is not followed, and internal properties are not
@@ -41774,58 +44945,58 @@ DUK_INTERNAL duk_bool_t duk_fb_is_full(duk_fixedbuffer *fb) {
 /* list of conversion specifiers that terminate a format tag;
  * this is unfortunately guesswork.
  */
-#define DUK__ALLOWED_STANDARD_SPECIFIERS  "diouxXeEfFgGaAcsCSpnm"
+#define DUK__ALLOWED_STANDARD_SPECIFIERS "diouxXeEfFgGaAcsCSpnm"
 
 /* maximum length of standard format tag that we support */
-#define DUK__MAX_FORMAT_TAG_LENGTH  32
+#define DUK__MAX_FORMAT_TAG_LENGTH 32
 
 /* heapobj recursion depth when deep printing is selected */
-#define DUK__DEEP_DEPTH_LIMIT  8
+#define DUK__DEEP_DEPTH_LIMIT 8
 
 /* maximum recursion depth for loop detection stacks */
-#define DUK__LOOP_STACK_DEPTH  256
+#define DUK__LOOP_STACK_DEPTH 256
 
 /* must match bytecode defines now; build autogenerate? */
 DUK_LOCAL const char * const duk__bc_optab[256] = {
-	"LDREG", "STREG", "JUMP", "LDCONST", "LDINT", "LDINTX", "LDTHIS", "LDUNDEF",
-	"LDNULL", "LDTRUE", "LDFALSE", "GETVAR", "BNOT", "LNOT", "UNM", "UNP",
-	"EQ_RR", "EQ_CR", "EQ_RC", "EQ_CC", "NEQ_RR", "NEQ_CR", "NEQ_RC", "NEQ_CC",
-	"SEQ_RR", "SEQ_CR", "SEQ_RC", "SEQ_CC", "SNEQ_RR", "SNEQ_CR", "SNEQ_RC", "SNEQ_CC",
-
-	"GT_RR", "GT_CR", "GT_RC", "GT_CC", "GE_RR", "GE_CR", "GE_RC", "GE_CC",
-	"LT_RR", "LT_CR", "LT_RC", "LT_CC", "LE_RR", "LE_CR", "LE_RC", "LE_CC",
-	"IFTRUE_R", "IFTRUE_C", "IFFALSE_R", "IFFALSE_C", "ADD_RR", "ADD_CR", "ADD_RC", "ADD_CC",
-	"SUB_RR", "SUB_CR", "SUB_RC", "SUB_CC", "MUL_RR", "MUL_CR", "MUL_RC", "MUL_CC",
-
-	"DIV_RR", "DIV_CR", "DIV_RC", "DIV_CC", "MOD_RR", "MOD_CR", "MOD_RC", "MOD_CC",
-	"EXP_RR", "EXP_CR", "EXP_RC", "EXP_CC", "BAND_RR", "BAND_CR", "BAND_RC", "BAND_CC",
-	"BOR_RR", "BOR_CR", "BOR_RC", "BOR_CC", "BXOR_RR", "BXOR_CR", "BXOR_RC", "BXOR_CC",
-	"BASL_RR", "BASL_CR", "BASL_RC", "BASL_CC", "BLSR_RR", "BLSR_CR", "BLSR_RC", "BLSR_CC",
-
-	"BASR_RR", "BASR_CR", "BASR_RC", "BASR_CC", "INSTOF_RR", "INSTOF_CR", "INSTOF_RC", "INSTOF_CC",
-	"IN_RR", "IN_CR", "IN_RC", "IN_CC", "GETPROP_RR", "GETPROP_CR", "GETPROP_RC", "GETPROP_CC",
-	"PUTPROP_RR", "PUTPROP_CR", "PUTPROP_RC", "PUTPROP_CC", "DELPROP_RR", "DELPROP_CR", "DELPROP_RC", "DELPROP_CC",
-	"PREINCR", "PREDECR", "POSTINCR", "POSTDECR", "PREINCV", "PREDECV", "POSTINCV", "POSTDECV",
-
-	"PREINCP_RR", "PREINCP_CR", "PREINCP_RC", "PREINCP_CC", "PREDECP_RR", "PREDECP_CR", "PREDECP_RC", "PREDECP_CC",
+	"LDREG",       "STREG",       "JUMP",        "LDCONST",     "LDINT",       "LDINTX",      "LDTHIS",      "LDUNDEF",
+	"LDNULL",      "LDTRUE",      "LDFALSE",     "GETVAR",      "BNOT",        "LNOT",        "UNM",         "UNP",
+	"EQ_RR",       "EQ_CR",       "EQ_RC",       "EQ_CC",       "NEQ_RR",      "NEQ_CR",      "NEQ_RC",      "NEQ_CC",
+	"SEQ_RR",      "SEQ_CR",      "SEQ_RC",      "SEQ_CC",      "SNEQ_RR",     "SNEQ_CR",     "SNEQ_RC",     "SNEQ_CC",
+
+	"GT_RR",       "GT_CR",       "GT_RC",       "GT_CC",       "GE_RR",       "GE_CR",       "GE_RC",       "GE_CC",
+	"LT_RR",       "LT_CR",       "LT_RC",       "LT_CC",       "LE_RR",       "LE_CR",       "LE_RC",       "LE_CC",
+	"IFTRUE_R",    "IFTRUE_C",    "IFFALSE_R",   "IFFALSE_C",   "ADD_RR",      "ADD_CR",      "ADD_RC",      "ADD_CC",
+	"SUB_RR",      "SUB_CR",      "SUB_RC",      "SUB_CC",      "MUL_RR",      "MUL_CR",      "MUL_RC",      "MUL_CC",
+
+	"DIV_RR",      "DIV_CR",      "DIV_RC",      "DIV_CC",      "MOD_RR",      "MOD_CR",      "MOD_RC",      "MOD_CC",
+	"EXP_RR",      "EXP_CR",      "EXP_RC",      "EXP_CC",      "BAND_RR",     "BAND_CR",     "BAND_RC",     "BAND_CC",
+	"BOR_RR",      "BOR_CR",      "BOR_RC",      "BOR_CC",      "BXOR_RR",     "BXOR_CR",     "BXOR_RC",     "BXOR_CC",
+	"BASL_RR",     "BASL_CR",     "BASL_RC",     "BASL_CC",     "BLSR_RR",     "BLSR_CR",     "BLSR_RC",     "BLSR_CC",
+
+	"BASR_RR",     "BASR_CR",     "BASR_RC",     "BASR_CC",     "INSTOF_RR",   "INSTOF_CR",   "INSTOF_RC",   "INSTOF_CC",
+	"IN_RR",       "IN_CR",       "IN_RC",       "IN_CC",       "GETPROP_RR",  "GETPROP_CR",  "GETPROP_RC",  "GETPROP_CC",
+	"PUTPROP_RR",  "PUTPROP_CR",  "PUTPROP_RC",  "PUTPROP_CC",  "DELPROP_RR",  "DELPROP_CR",  "DELPROP_RC",  "DELPROP_CC",
+	"PREINCR",     "PREDECR",     "POSTINCR",    "POSTDECR",    "PREINCV",     "PREDECV",     "POSTINCV",    "POSTDECV",
+
+	"PREINCP_RR",  "PREINCP_CR",  "PREINCP_RC",  "PREINCP_CC",  "PREDECP_RR",  "PREDECP_CR",  "PREDECP_RC",  "PREDECP_CC",
 	"POSTINCP_RR", "POSTINCP_CR", "POSTINCP_RC", "POSTINCP_CC", "POSTDECP_RR", "POSTDECP_CR", "POSTDECP_RC", "POSTDECP_CC",
-	"DECLVAR_RR", "DECLVAR_CR", "DECLVAR_RC", "DECLVAR_CC", "REGEXP_RR", "REGEXP_RC", "REGEXP_CR", "REGEXP_CC",
-	"CLOSURE", "TYPEOF", "TYPEOFID", "PUTVAR", "DELVAR", "RETREG", "RETUNDEF", "RETCONST",
-
-	"RETCONSTN", "LABEL", "ENDLABEL", "BREAK", "CONTINUE", "TRYCATCH", "ENDTRY", "ENDCATCH",
-	"ENDFIN", "THROW", "INVLHS", "CSREG", "CSVAR_RR", "CSVAR_CR", "CSVAR_RC", "CSVAR_CC",
-	"CALL0", "CALL1", "CALL2", "CALL3", "CALL4", "CALL5", "CALL6", "CALL7",
-	"CALL8", "CALL9", "CALL10", "CALL11", "CALL12", "CALL13", "CALL14", "CALL15",
-
-	"NEWOBJ", "NEWARR", "MPUTOBJ", "MPUTOBJI", "INITSET", "INITGET", "MPUTARR", "MPUTARRI",
-	"SETALEN", "INITENUM", "NEXTENUM", "NEWTARGET", "DEBUGGER", "NOP", "INVALID", "UNUSED207",
-	"GETPROPC_RR", "GETPROPC_CR", "GETPROPC_RC", "GETPROPC_CC", "UNUSED212", "UNUSED213", "UNUSED214", "UNUSED215",
-	"UNUSED216", "UNUSED217", "UNUSED218", "UNUSED219", "UNUSED220", "UNUSED221", "UNUSED222", "UNUSED223",
-
-	"UNUSED224", "UNUSED225", "UNUSED226", "UNUSED227", "UNUSED228", "UNUSED229", "UNUSED230", "UNUSED231",
-	"UNUSED232", "UNUSED233", "UNUSED234", "UNUSED235", "UNUSED236", "UNUSED237", "UNUSED238", "UNUSED239",
-	"UNUSED240", "UNUSED241", "UNUSED242", "UNUSED243", "UNUSED244", "UNUSED245", "UNUSED246", "UNUSED247",
-	"UNUSED248", "UNUSED249", "UNUSED250", "UNUSED251", "UNUSED252", "UNUSED253", "UNUSED254", "UNUSED255"
+	"DECLVAR_RR",  "DECLVAR_CR",  "DECLVAR_RC",  "DECLVAR_CC",  "REGEXP_RR",   "REGEXP_RC",   "REGEXP_CR",   "REGEXP_CC",
+	"CLOSURE",     "TYPEOF",      "TYPEOFID",    "PUTVAR",      "DELVAR",      "RETREG",      "RETUNDEF",    "RETCONST",
+
+	"RETCONSTN",   "LABEL",       "ENDLABEL",    "BREAK",       "CONTINUE",    "TRYCATCH",    "ENDTRY",      "ENDCATCH",
+	"ENDFIN",      "THROW",       "INVLHS",      "CSREG",       "CSVAR_RR",    "CSVAR_CR",    "CSVAR_RC",    "CSVAR_CC",
+	"CALL0",       "CALL1",       "CALL2",       "CALL3",       "CALL4",       "CALL5",       "CALL6",       "CALL7",
+	"CALL8",       "CALL9",       "CALL10",      "CALL11",      "CALL12",      "CALL13",      "CALL14",      "CALL15",
+
+	"NEWOBJ",      "NEWARR",      "MPUTOBJ",     "MPUTOBJI",    "INITSET",     "INITGET",     "MPUTARR",     "MPUTARRI",
+	"SETALEN",     "INITENUM",    "NEXTENUM",    "NEWTARGET",   "DEBUGGER",    "NOP",         "INVALID",     "UNUSED207",
+	"GETPROPC_RR", "GETPROPC_CR", "GETPROPC_RC", "GETPROPC_CC", "UNUSED212",   "UNUSED213",   "UNUSED214",   "UNUSED215",
+	"UNUSED216",   "UNUSED217",   "UNUSED218",   "UNUSED219",   "UNUSED220",   "UNUSED221",   "UNUSED222",   "UNUSED223",
+
+	"UNUSED224",   "UNUSED225",   "UNUSED226",   "UNUSED227",   "UNUSED228",   "UNUSED229",   "UNUSED230",   "UNUSED231",
+	"UNUSED232",   "UNUSED233",   "UNUSED234",   "UNUSED235",   "UNUSED236",   "UNUSED237",   "UNUSED238",   "UNUSED239",
+	"UNUSED240",   "UNUSED241",   "UNUSED242",   "UNUSED243",   "UNUSED244",   "UNUSED245",   "UNUSED246",   "UNUSED247",
+	"UNUSED248",   "UNUSED249",   "UNUSED250",   "UNUSED251",   "UNUSED252",   "UNUSED253",   "UNUSED254",   "UNUSED255"
 };
 
 typedef struct duk__dprint_state duk__dprint_state;
@@ -41875,14 +45046,15 @@ DUK_LOCAL void duk__print_shared_heaphdr(duk__dprint_state *st, duk_heaphdr *h)
 		duk_size_t i;
 		duk_fb_put_byte(fb, (duk_uint8_t) DUK_ASC_LBRACKET);
 		for (i = 0; i < (duk_size_t) sizeof(*h); i++) {
-			duk_fb_sprintf(fb, "%02lx", (unsigned long) ((duk_uint8_t *)h)[i]);
+			duk_fb_sprintf(fb, "%02lx", (unsigned long) ((duk_uint8_t *) h)[i]);
 		}
 		duk_fb_put_byte(fb, (duk_uint8_t) DUK_ASC_RBRACKET);
 	}
 
-#if defined(DUK_USE_REFERENCE_COUNTING)  /* currently implicitly also DUK_USE_DOUBLE_LINKED_HEAP */
+#if defined(DUK_USE_REFERENCE_COUNTING) /* currently implicitly also DUK_USE_DOUBLE_LINKED_HEAP */
 	if (st->heavy) {
-		duk_fb_sprintf(fb, "[h_next=%p,h_prev=%p,h_refcount=%lu,h_flags=%08lx,type=%ld,"
+		duk_fb_sprintf(fb,
+		               "[h_next=%p,h_prev=%p,h_refcount=%lu,h_flags=%08lx,type=%ld,"
 		               "reachable=%ld,temproot=%ld,finalizable=%ld,finalized=%ld]",
 		               (void *) DUK_HEAPHDR_GET_NEXT(NULL, h),
 		               (void *) DUK_HEAPHDR_GET_PREV(NULL, h),
@@ -41896,7 +45068,8 @@ DUK_LOCAL void duk__print_shared_heaphdr(duk__dprint_state *st, duk_heaphdr *h)
 	}
 #else
 	if (st->heavy) {
-		duk_fb_sprintf(fb, "[h_next=%p,h_flags=%08lx,type=%ld,reachable=%ld,temproot=%ld,finalizable=%ld,finalized=%ld]",
+		duk_fb_sprintf(fb,
+		               "[h_next=%p,h_flags=%08lx,type=%ld,reachable=%ld,temproot=%ld,finalizable=%ld,finalized=%ld]",
 		               (void *) DUK_HEAPHDR_GET_NEXT(NULL, h),
 		               (unsigned long) DUK_HEAPHDR_GET_FLAGS(h),
 		               (long) DUK_HEAPHDR_GET_TYPE(h),
@@ -41923,14 +45096,15 @@ DUK_LOCAL void duk__print_shared_heaphdr_string(duk__dprint_state *st, duk_heaph
 		duk_size_t i;
 		duk_fb_put_byte(fb, (duk_uint8_t) DUK_ASC_LBRACKET);
 		for (i = 0; i < (duk_size_t) sizeof(*h); i++) {
-			duk_fb_sprintf(fb, "%02lx", (unsigned long) ((duk_uint8_t *)h)[i]);
+			duk_fb_sprintf(fb, "%02lx", (unsigned long) ((duk_uint8_t *) h)[i]);
 		}
 		duk_fb_put_byte(fb, (duk_uint8_t) DUK_ASC_RBRACKET);
 	}
 
 #if defined(DUK_USE_REFERENCE_COUNTING)
 	if (st->heavy) {
-		duk_fb_sprintf(fb, "[h_refcount=%lu,h_flags=%08lx,type=%ld,reachable=%ld,temproot=%ld,finalizable=%ld,finalized=%ld]",
+		duk_fb_sprintf(fb,
+		               "[h_refcount=%lu,h_flags=%08lx,type=%ld,reachable=%ld,temproot=%ld,finalizable=%ld,finalized=%ld]",
 		               (unsigned long) DUK_HEAPHDR_GET_REFCOUNT((duk_heaphdr *) h),
 		               (unsigned long) DUK_HEAPHDR_GET_FLAGS((duk_heaphdr *) h),
 		               (long) DUK_HEAPHDR_GET_TYPE((duk_heaphdr *) h),
@@ -41941,7 +45115,8 @@ DUK_LOCAL void duk__print_shared_heaphdr_string(duk__dprint_state *st, duk_heaph
 	}
 #else
 	if (st->heavy) {
-		duk_fb_sprintf(fb, "[h_flags=%08lx,type=%ld,reachable=%ld,temproot=%ld,finalizable=%ld,finalized=%ld]",
+		duk_fb_sprintf(fb,
+		               "[h_flags=%08lx,type=%ld,reachable=%ld,temproot=%ld,finalizable=%ld,finalized=%ld]",
 		               (unsigned long) DUK_HEAPHDR_GET_FLAGS((duk_heaphdr *) h),
 		               (long) DUK_HEAPHDR_GET_TYPE((duk_heaphdr *) h),
 		               (long) (DUK_HEAPHDR_HAS_REACHABLE((duk_heaphdr *) h) ? 1 : 0),
@@ -42012,7 +45187,8 @@ DUK_LOCAL void duk__print_hstring(duk__dprint_state *st, duk_hstring *h, duk_boo
 #endif
 }
 
-#define DUK__COMMA()  do { \
+#define DUK__COMMA() \
+	do { \
 		if (first) { \
 			first = 0; \
 		} else { \
@@ -42125,7 +45301,8 @@ DUK_LOCAL void duk__print_hobject(duk__dprint_state *st, duk_hobject *h) {
 			duk__print_hstring(st, key, 0);
 			duk_fb_put_byte(fb, (duk_uint8_t) DUK_ASC_COLON);
 			if (DUK_HOBJECT_E_SLOT_IS_ACCESSOR(NULL, h, i)) {
-				duk_fb_sprintf(fb, "[get:%p,set:%p]",
+				duk_fb_sprintf(fb,
+				               "[get:%p,set:%p]",
 				               (void *) DUK_HOBJECT_E_GET_VALUE(NULL, h, i).a.get,
 				               (void *) DUK_HOBJECT_E_GET_VALUE(NULL, h, i).a.set);
 			} else {
@@ -42139,158 +45316,238 @@ DUK_LOCAL void duk__print_hobject(duk__dprint_state *st, duk_hobject *h) {
 	}
 	if (st->internal) {
 		if (DUK_HOBJECT_IS_ARRAY(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__array:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__array:true");
 		}
 		if (DUK_HOBJECT_HAS_EXTENSIBLE(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__extensible:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__extensible:true");
 		}
 		if (DUK_HOBJECT_HAS_CONSTRUCTABLE(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__constructable:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__constructable:true");
 		}
 		if (DUK_HOBJECT_HAS_BOUNDFUNC(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__boundfunc:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__boundfunc:true");
 		}
 		if (DUK_HOBJECT_HAS_COMPFUNC(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__compfunc:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__compfunc:true");
 		}
 		if (DUK_HOBJECT_HAS_NATFUNC(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__natfunc:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__natfunc:true");
 		}
 		if (DUK_HOBJECT_HAS_BUFOBJ(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__bufobj:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__bufobj:true");
 		}
 		if (DUK_HOBJECT_IS_THREAD(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__thread:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__thread:true");
 		}
 		if (DUK_HOBJECT_HAS_ARRAY_PART(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__array_part:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__array_part:true");
 		}
 		if (DUK_HOBJECT_HAS_STRICT(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__strict:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__strict:true");
 		}
 		if (DUK_HOBJECT_HAS_NOTAIL(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__notail:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__notail:true");
 		}
 		if (DUK_HOBJECT_HAS_NEWENV(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__newenv:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__newenv:true");
 		}
 		if (DUK_HOBJECT_HAS_NAMEBINDING(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__namebinding:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__namebinding:true");
 		}
 		if (DUK_HOBJECT_HAS_CREATEARGS(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__createargs:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__createargs:true");
 		}
 		if (DUK_HOBJECT_HAS_EXOTIC_ARRAY(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__exotic_array:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__exotic_array:true");
 		}
 		if (DUK_HOBJECT_HAS_EXOTIC_STRINGOBJ(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__exotic_stringobj:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__exotic_stringobj:true");
 		}
 		if (DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__exotic_arguments:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__exotic_arguments:true");
 		}
 		if (DUK_HOBJECT_IS_BUFOBJ(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__exotic_bufobj:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__exotic_bufobj:true");
 		}
 		if (DUK_HOBJECT_HAS_EXOTIC_PROXYOBJ(h)) {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__exotic_proxyobj:true");
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__exotic_proxyobj:true");
 		}
 	}
 
 	if (st->internal && DUK_HOBJECT_IS_ARRAY(h)) {
 		duk_harray *a = (duk_harray *) h;
-		DUK__COMMA(); duk_fb_sprintf(fb, "__length:%ld", (long) a->length);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__length_nonwritable:%ld", (long) a->length_nonwritable);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__length:%ld", (long) a->length);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__length_nonwritable:%ld", (long) a->length_nonwritable);
 	} else if (st->internal && DUK_HOBJECT_IS_COMPFUNC(h)) {
 		duk_hcompfunc *f = (duk_hcompfunc *) h;
-		DUK__COMMA(); duk_fb_put_cstring(fb, "__data:");
+		DUK__COMMA();
+		duk_fb_put_cstring(fb, "__data:");
 		duk__print_hbuffer(st, (duk_hbuffer *) DUK_HCOMPFUNC_GET_DATA(NULL, f));
-		DUK__COMMA(); duk_fb_put_cstring(fb, "__lexenv:"); duk__print_hobject(st, DUK_HCOMPFUNC_GET_LEXENV(NULL, f));
-		DUK__COMMA(); duk_fb_put_cstring(fb, "__varenv:"); duk__print_hobject(st, DUK_HCOMPFUNC_GET_VARENV(NULL, f));
-		DUK__COMMA(); duk_fb_sprintf(fb, "__nregs:%ld", (long) f->nregs);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__nargs:%ld", (long) f->nargs);
+		DUK__COMMA();
+		duk_fb_put_cstring(fb, "__lexenv:");
+		duk__print_hobject(st, DUK_HCOMPFUNC_GET_LEXENV(NULL, f));
+		DUK__COMMA();
+		duk_fb_put_cstring(fb, "__varenv:");
+		duk__print_hobject(st, DUK_HCOMPFUNC_GET_VARENV(NULL, f));
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__nregs:%ld", (long) f->nregs);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__nargs:%ld", (long) f->nargs);
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
-		DUK__COMMA(); duk_fb_sprintf(fb, "__start_line:%ld", (long) f->start_line);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__end_line:%ld", (long) f->end_line);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__start_line:%ld", (long) f->start_line);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__end_line:%ld", (long) f->end_line);
 #endif
-		DUK__COMMA(); duk_fb_put_cstring(fb, "__data:");
+		DUK__COMMA();
+		duk_fb_put_cstring(fb, "__data:");
 		duk__print_hbuffer(st, (duk_hbuffer *) DUK_HCOMPFUNC_GET_DATA(NULL, f));
 	} else if (st->internal && DUK_HOBJECT_IS_NATFUNC(h)) {
 		duk_hnatfunc *f = (duk_hnatfunc *) h;
-		DUK__COMMA(); duk_fb_sprintf(fb, "__func:");
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__func:");
 		duk_fb_put_funcptr(fb, (duk_uint8_t *) &f->func, sizeof(f->func));
-		DUK__COMMA(); duk_fb_sprintf(fb, "__nargs:%ld", (long) f->nargs);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__magic:%ld", (long) f->magic);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__nargs:%ld", (long) f->nargs);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__magic:%ld", (long) f->magic);
 	} else if (st->internal && DUK_HOBJECT_IS_DECENV(h)) {
 		duk_hdecenv *e = (duk_hdecenv *) h;
-		DUK__COMMA(); duk_fb_sprintf(fb, "__thread:"); duk__print_hobject(st, (duk_hobject *) e->thread);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__varmap:"); duk__print_hobject(st, (duk_hobject *) e->varmap);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__regbase_byteoff:%ld", (long) e->regbase_byteoff);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__thread:");
+		duk__print_hobject(st, (duk_hobject *) e->thread);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__varmap:");
+		duk__print_hobject(st, (duk_hobject *) e->varmap);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__regbase_byteoff:%ld", (long) e->regbase_byteoff);
 	} else if (st->internal && DUK_HOBJECT_IS_OBJENV(h)) {
 		duk_hobjenv *e = (duk_hobjenv *) h;
-		DUK__COMMA(); duk_fb_sprintf(fb, "__target:"); duk__print_hobject(st, (duk_hobject *) e->target);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__has_this:%ld", (long) e->has_this);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__target:");
+		duk__print_hobject(st, (duk_hobject *) e->target);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__has_this:%ld", (long) e->has_this);
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
 	} else if (st->internal && DUK_HOBJECT_IS_BUFOBJ(h)) {
 		duk_hbufobj *b = (duk_hbufobj *) h;
-		DUK__COMMA(); duk_fb_sprintf(fb, "__buf:");
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__buf:");
 		duk__print_hbuffer(st, (duk_hbuffer *) b->buf);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__buf_prop:");
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__buf_prop:");
 		duk__print_hobject(st, (duk_hobject *) b->buf_prop);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__offset:%ld", (long) b->offset);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__length:%ld", (long) b->length);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__shift:%ld", (long) b->shift);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__elemtype:%ld", (long) b->elem_type);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__offset:%ld", (long) b->offset);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__length:%ld", (long) b->length);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__shift:%ld", (long) b->shift);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__elemtype:%ld", (long) b->elem_type);
 #endif
 	} else if (st->internal && DUK_HOBJECT_IS_PROXY(h)) {
 		duk_hproxy *p = (duk_hproxy *) h;
-		DUK__COMMA(); duk_fb_sprintf(fb, "__target:");
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__target:");
 		duk__print_hobject(st, p->target);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__handler:");
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__handler:");
 		duk__print_hobject(st, p->handler);
 	} else if (st->internal && DUK_HOBJECT_IS_THREAD(h)) {
 		duk_hthread *t = (duk_hthread *) h;
-		DUK__COMMA(); duk_fb_sprintf(fb, "__ptr_curr_pc:%p", (void *) t->ptr_curr_pc);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__heap:%p", (void *) t->heap);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__strict:%ld", (long) t->strict);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__state:%ld", (long) t->state);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__unused1:%ld", (long) t->unused1);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__unused2:%ld", (long) t->unused2);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__valstack:%p", (void *) t->valstack);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__valstack_end:%p/%ld", (void *) t->valstack_end, (long) (t->valstack_end - t->valstack));
-		DUK__COMMA(); duk_fb_sprintf(fb, "__valstack_alloc_end:%p/%ld", (void *) t->valstack_alloc_end, (long) (t->valstack_alloc_end - t->valstack));
-		DUK__COMMA(); duk_fb_sprintf(fb, "__valstack_bottom:%p/%ld", (void *) t->valstack_bottom, (long) (t->valstack_bottom - t->valstack));
-		DUK__COMMA(); duk_fb_sprintf(fb, "__valstack_top:%p/%ld", (void *) t->valstack_top, (long) (t->valstack_top - t->valstack));
-		DUK__COMMA(); duk_fb_sprintf(fb, "__callstack_curr:%p", (void *) t->callstack_curr);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__callstack_top:%ld", (long) t->callstack_top);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__callstack_preventcount:%ld", (long) t->callstack_preventcount);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__resumer:"); duk__print_hobject(st, (duk_hobject *) t->resumer);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__compile_ctx:%p", (void *) t->compile_ctx);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__ptr_curr_pc:%p", (void *) t->ptr_curr_pc);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__heap:%p", (void *) t->heap);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__strict:%ld", (long) t->strict);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__state:%ld", (long) t->state);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__unused1:%ld", (long) t->unused1);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__unused2:%ld", (long) t->unused2);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__valstack:%p", (void *) t->valstack);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__valstack_end:%p/%ld", (void *) t->valstack_end, (long) (t->valstack_end - t->valstack));
+		DUK__COMMA();
+		duk_fb_sprintf(fb,
+		               "__valstack_alloc_end:%p/%ld",
+		               (void *) t->valstack_alloc_end,
+		               (long) (t->valstack_alloc_end - t->valstack));
+		DUK__COMMA();
+		duk_fb_sprintf(fb,
+		               "__valstack_bottom:%p/%ld",
+		               (void *) t->valstack_bottom,
+		               (long) (t->valstack_bottom - t->valstack));
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__valstack_top:%p/%ld", (void *) t->valstack_top, (long) (t->valstack_top - t->valstack));
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__callstack_curr:%p", (void *) t->callstack_curr);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__callstack_top:%ld", (long) t->callstack_top);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__callstack_preventcount:%ld", (long) t->callstack_preventcount);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__resumer:");
+		duk__print_hobject(st, (duk_hobject *) t->resumer);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__compile_ctx:%p", (void *) t->compile_ctx);
 #if defined(DUK_USE_INTERRUPT_COUNTER)
-		DUK__COMMA(); duk_fb_sprintf(fb, "__interrupt_counter:%ld", (long) t->interrupt_counter);
-		DUK__COMMA(); duk_fb_sprintf(fb, "__interrupt_init:%ld", (long) t->interrupt_init);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__interrupt_counter:%ld", (long) t->interrupt_counter);
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__interrupt_init:%ld", (long) t->interrupt_init);
 #endif
 
 		/* XXX: print built-ins array? */
-
 	}
 #if defined(DUK_USE_REFERENCE_COUNTING)
 	if (st->internal) {
-		DUK__COMMA(); duk_fb_sprintf(fb, "__refcount:%lu", (unsigned long) DUK_HEAPHDR_GET_REFCOUNT((duk_heaphdr *) h));
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__refcount:%lu", (unsigned long) DUK_HEAPHDR_GET_REFCOUNT((duk_heaphdr *) h));
 	}
 #endif
 	if (st->internal) {
-		DUK__COMMA(); duk_fb_sprintf(fb, "__class:%ld", (long) DUK_HOBJECT_GET_CLASS_NUMBER(h));
+		DUK__COMMA();
+		duk_fb_sprintf(fb, "__class:%ld", (long) DUK_HOBJECT_GET_CLASS_NUMBER(h));
 	}
 
-	DUK__COMMA(); duk_fb_sprintf(fb, "__heapptr:%p", (void *) h);  /* own pointer */
+	DUK__COMMA();
+	duk_fb_sprintf(fb, "__heapptr:%p", (void *) h); /* own pointer */
 
 	/* prototype should be last, for readability */
 	if (DUK_HOBJECT_GET_PROTOTYPE(NULL, h)) {
 		if (st->follow_proto) {
-			DUK__COMMA(); duk_fb_put_cstring(fb, "__prototype:"); duk__print_hobject(st, DUK_HOBJECT_GET_PROTOTYPE(NULL, h));
+			DUK__COMMA();
+			duk_fb_put_cstring(fb, "__prototype:");
+			duk__print_hobject(st, DUK_HOBJECT_GET_PROTOTYPE(NULL, h));
 		} else {
-			DUK__COMMA(); duk_fb_sprintf(fb, "__prototype:%p", (void *) DUK_HOBJECT_GET_PROTOTYPE(NULL, h));
+			DUK__COMMA();
+			duk_fb_sprintf(fb, "__prototype:%p", (void *) DUK_HOBJECT_GET_PROTOTYPE(NULL, h));
 		}
 	}
 
@@ -42316,7 +45573,7 @@ DUK_LOCAL void duk__print_hobject(duk__dprint_state *st, duk_hobject *h) {
 	}
 #endif
 
- finished:
+finished:
 	st->depth--;
 	if (pushed_loopstack) {
 		st->loop_stack_index--;
@@ -42343,12 +45600,14 @@ DUK_LOCAL void duk__print_hbuffer(duk__dprint_state *st, duk_hbuffer *h) {
 	if (DUK_HBUFFER_HAS_DYNAMIC(h)) {
 		if (DUK_HBUFFER_HAS_EXTERNAL(h)) {
 			duk_hbuffer_external *g = (duk_hbuffer_external *) h;
-			duk_fb_sprintf(fb, "buffer:external:%p:%ld",
+			duk_fb_sprintf(fb,
+			               "buffer:external:%p:%ld",
 			               (void *) DUK_HBUFFER_EXTERNAL_GET_DATA_PTR(NULL, g),
 			               (long) DUK_HBUFFER_EXTERNAL_GET_SIZE(g));
 		} else {
 			duk_hbuffer_dynamic *g = (duk_hbuffer_dynamic *) h;
-			duk_fb_sprintf(fb, "buffer:dynamic:%p:%ld",
+			duk_fb_sprintf(fb,
+			               "buffer:dynamic:%p:%ld",
 			               (void *) DUK_HBUFFER_DYNAMIC_GET_DATA_PTR(NULL, g),
 			               (long) DUK_HBUFFER_DYNAMIC_GET_SIZE(g));
 		}
@@ -42421,7 +45680,7 @@ DUK_LOCAL void duk__print_tval(duk__dprint_state *st, duk_tval *tv) {
 		duk_size_t i;
 		duk_fb_put_byte(fb, (duk_uint8_t) DUK_ASC_LBRACKET);
 		for (i = 0; i < (duk_size_t) sizeof(*tv); i++) {
-			duk_fb_sprintf(fb, "%02lx", (unsigned long) ((duk_uint8_t *)tv)[i]);
+			duk_fb_sprintf(fb, "%02lx", (unsigned long) ((duk_uint8_t *) tv)[i]);
 		}
 		duk_fb_put_byte(fb, (duk_uint8_t) DUK_ASC_RBRACKET);
 	}
@@ -42504,17 +45763,22 @@ DUK_LOCAL void duk__print_instr(duk__dprint_state *st, duk_instr_t ins) {
 	/* XXX: option to fix opcode length so it lines up nicely */
 
 	if (op == DUK_OP_JUMP) {
-		duk_int_t diff1 = (duk_int_t) (DUK_DEC_ABC(ins) - DUK_BC_JUMP_BIAS);  /* from next pc */
-		duk_int_t diff2 = diff1 + 1;                                          /* from curr pc */
-
-		duk_fb_sprintf(fb, "%s %ld (to pc%c%ld)",
-		               (const char *) op_name, (long) diff1,
-		               (int) (diff2 >= 0 ? '+' : '-'),  /* char format: use int */
+		duk_int_t diff1 = (duk_int_t) (DUK_DEC_ABC(ins) - DUK_BC_JUMP_BIAS); /* from next pc */
+		duk_int_t diff2 = diff1 + 1; /* from curr pc */
+
+		duk_fb_sprintf(fb,
+		               "%s %ld (to pc%c%ld)",
+		               (const char *) op_name,
+		               (long) diff1,
+		               (int) (diff2 >= 0 ? '+' : '-'), /* char format: use int */
 		               (long) (diff2 >= 0 ? diff2 : -diff2));
 	} else {
-		duk_fb_sprintf(fb, "%s %ld, %ld, %ld",
-		               (const char *) op_name, (long) DUK_DEC_A(ins),
-		               (long) DUK_DEC_B(ins), (long) DUK_DEC_C(ins));
+		duk_fb_sprintf(fb,
+		               "%s %ld, %ld, %ld",
+		               (const char *) op_name,
+		               (long) DUK_DEC_A(ins),
+		               (long) DUK_DEC_B(ins),
+		               (long) DUK_DEC_C(ins));
 	}
 }
 
@@ -42528,6 +45792,58 @@ DUK_LOCAL void duk__print_opcode(duk__dprint_state *st, duk_small_int_t opcode)
 	}
 }
 
+DUK_LOCAL void duk__print_catcher(duk__dprint_state *st, duk_catcher *cat) {
+	duk_fixedbuffer *fb = st->fb;
+
+	if (duk_fb_is_full(fb)) {
+		return;
+	}
+
+	if (!cat) {
+		duk_fb_put_cstring(fb, "NULL");
+		return;
+	}
+
+	duk_fb_sprintf(fb,
+	               "[catcher ptr=%p parent=%p varname=%p pc_base=%p, idx_base=%ld, flags=0x%08lx]",
+	               (void *) cat,
+	               (void *) cat->parent,
+	               (void *) cat->h_varname,
+	               (void *) cat->pc_base,
+	               (long) cat->idx_base,
+	               (unsigned long) cat->flags);
+}
+
+DUK_LOCAL void duk__print_activation(duk__dprint_state *st, duk_activation *act) {
+	duk_fixedbuffer *fb = st->fb;
+
+	if (duk_fb_is_full(fb)) {
+		return;
+	}
+
+	if (!act) {
+		duk_fb_put_cstring(fb, "NULL");
+		return;
+	}
+
+	/* prev_caller: conditional, omitted on purpose, it's rarely used. */
+	/* prev_line: conditional, omitted on purpose (but would be nice). */
+	duk_fb_sprintf(fb,
+	               "[activation ptr=%p tv_func=<omit> func=%p parent=%p var_env=%p lex_env=%p cat=%p curr_pc=%p "
+	               "bottom_byteoff=%ld retval_byteoff=%ld reserve_byteoff=%ld flags=%ld]",
+	               (void *) act,
+	               (void *) act->func,
+	               (void *) act->parent,
+	               (void *) act->var_env,
+	               (void *) act->lex_env,
+	               (void *) act->cat,
+	               (void *) act->curr_pc,
+	               (long) act->bottom_byteoff,
+	               (long) act->retval_byteoff,
+	               (long) act->reserve_byteoff,
+	               (long) act->flags);
+}
+
 DUK_INTERNAL duk_int_t duk_debug_vsnprintf(char *str, duk_size_t size, const char *format, va_list ap) {
 	duk_fixedbuffer fb;
 	const char *p = format;
@@ -42544,7 +45860,7 @@ DUK_INTERNAL duk_int_t duk_debug_vsnprintf(char *str, duk_size_t size, const cha
 		char ch = *p++;
 		const char *p_begfmt = NULL;
 		duk_bool_t got_exclamation = 0;
-		duk_bool_t got_long = 0;  /* %lf, %ld etc */
+		duk_bool_t got_long = 0; /* %lf, %ld etc */
 		duk__dprint_state st;
 
 		if (ch != DUK_ASC_PERCENT) {
@@ -42612,10 +45928,18 @@ DUK_INTERNAL duk_int_t duk_debug_vsnprintf(char *str, duk_size_t size, const cha
 				duk_instr_t t = va_arg(ap, duk_instr_t);
 				duk__print_instr(&st, t);
 				break;
-			} else if (got_exclamation && ch == DUK_ASC_UC_C) {
+			} else if (got_exclamation && ch == DUK_ASC_UC_X) {
 				long t = va_arg(ap, long);
 				duk__print_opcode(&st, (duk_small_int_t) t);
 				break;
+			} else if (got_exclamation && ch == DUK_ASC_UC_C) {
+				duk_catcher *t = va_arg(ap, duk_catcher *);
+				duk__print_catcher(&st, t);
+				break;
+			} else if (got_exclamation && ch == DUK_ASC_UC_A) {
+				duk_activation *t = va_arg(ap, duk_activation *);
+				duk__print_activation(&st, t);
+				break;
 			} else if (!got_exclamation && strchr(DUK__ALLOWED_STANDARD_SPECIFIERS, (int) ch)) {
 				char fmtbuf[DUK__MAX_FORMAT_TAG_LENGTH];
 				duk_size_t fmtlen;
@@ -42699,11 +46023,11 @@ DUK_INTERNAL duk_int_t duk_debug_vsnprintf(char *str, duk_size_t size, const cha
 	}
 	goto done;
 
- format_error:
+format_error:
 	duk_fb_put_cstring(&fb, "FMTERR");
 	/* fall through */
 
- done:
+done:
 	retval = (duk_int_t) fb.offset;
 	duk_fb_put_byte(&fb, (duk_uint8_t) 0);
 
@@ -42711,7 +46035,7 @@ DUK_INTERNAL duk_int_t duk_debug_vsnprintf(char *str, duk_size_t size, const cha
 	return retval;
 }
 
-#if 0  /*unused*/
+#if 0 /*unused*/
 DUK_INTERNAL duk_int_t duk_debug_snprintf(char *str, duk_size_t size, const char *format, ...) {
 	duk_int_t retval;
 	va_list ap;
@@ -42752,7 +46076,7 @@ DUK_INTERNAL void duk_debug_format_funcptr(char *buf, duk_size_t buf_size, duk_u
 	}
 }
 
-#endif  /* DUK_USE_DEBUG */
+#endif /* DUK_USE_DEBUG */
 
 /* automatic undefs */
 #undef DUK__ALLOWED_STANDARD_SPECIFIERS
@@ -42773,17 +46097,23 @@ DUK_INTERNAL void duk_debug_format_funcptr(char *buf, duk_size_t buf_size, duk_u
  */
 
 #if defined(DUK_USE_ASSERTIONS)
-#define DUK__DBG_TPORT_ENTER() do { \
+#define DUK__DBG_TPORT_ENTER() \
+	do { \
 		DUK_ASSERT(heap->dbg_calling_transport == 0); \
 		heap->dbg_calling_transport = 1; \
 	} while (0)
-#define DUK__DBG_TPORT_EXIT() do { \
+#define DUK__DBG_TPORT_EXIT() \
+	do { \
 		DUK_ASSERT(heap->dbg_calling_transport == 1); \
 		heap->dbg_calling_transport = 0; \
 	} while (0)
 #else
-#define DUK__DBG_TPORT_ENTER() do {} while (0)
-#define DUK__DBG_TPORT_EXIT() do {} while (0)
+#define DUK__DBG_TPORT_ENTER() \
+	do { \
+	} while (0)
+#define DUK__DBG_TPORT_EXIT() \
+	do { \
+	} while (0)
 #endif
 
 /*
@@ -42803,7 +46133,8 @@ typedef union {
  *  Detach handling
  */
 
-#define DUK__SET_CONN_BROKEN(thr,reason) do { \
+#define DUK__SET_CONN_BROKEN(thr, reason) \
+	do { \
 		/* For now shared handler is fine. */ \
 		duk__debug_do_detach1((thr)->heap, (reason)); \
 	} while (0)
@@ -42824,7 +46155,7 @@ DUK_LOCAL void duk__debug_do_detach1(duk_heap *heap, duk_int_t reason) {
 
 	DUK_D(DUK_DPRINT("debugger transport detaching, marking transport broken"));
 
-	heap->dbg_detaching = 1;  /* prevent multiple in-progress detaches */
+	heap->dbg_detaching = 1; /* prevent multiple in-progress detaches */
 
 	if (heap->dbg_write_cb != NULL) {
 		duk_hthread *thr;
@@ -42852,8 +46183,8 @@ DUK_LOCAL void duk__debug_do_detach1(duk_heap *heap, duk_int_t reason) {
 	heap->dbg_pause_act = NULL;
 	heap->dbg_pause_startline = 0;
 	heap->dbg_have_next_byte = 0;
-	duk_debug_clear_paused(heap);  /* XXX: some overlap with field inits above */
-	heap->dbg_state_dirty = 0;     /* XXX: clear_paused sets dirty; rework? */
+	duk_debug_clear_paused(heap); /* XXX: some overlap with field inits above */
+	heap->dbg_state_dirty = 0; /* XXX: clear_paused sets dirty; rework? */
 
 	/* Ensure there are no stale active breakpoint pointers.
 	 * Breakpoint list is currently kept - we could empty it
@@ -42913,7 +46244,7 @@ DUK_LOCAL void duk__debug_null_most_callbacks(duk_hthread *thr) {
 	heap = thr->heap;
 	DUK_D(DUK_DPRINT("transport read/write error, NULL all callbacks expected detached"));
 	heap->dbg_read_cb = NULL;
-	heap->dbg_write_cb = NULL;  /* this is especially critical to avoid another write call in detach1() */
+	heap->dbg_write_cb = NULL; /* this is especially critical to avoid another write call in detach1() */
 	heap->dbg_peek_cb = NULL;
 	heap->dbg_read_flush_cb = NULL;
 	heap->dbg_write_flush_cb = NULL;
@@ -42935,7 +46266,8 @@ DUK_LOCAL void duk__debug_set_pause_state(duk_hthread *thr, duk_heap *heap, duk_
 
 		updated_flags = pause_flags & ~(DUK_PAUSE_FLAG_LINE_CHANGE);
 		DUK_D(DUK_DPRINT("no line info for current activation, disable line-based pause flags: 0x%08lx -> 0x%08lx",
-		                 (long) pause_flags, (long) updated_flags));
+		                 (long) pause_flags,
+		                 (long) updated_flags));
 		pause_flags = updated_flags;
 	}
 
@@ -42945,7 +46277,8 @@ DUK_LOCAL void duk__debug_set_pause_state(duk_hthread *thr, duk_heap *heap, duk_
 	heap->dbg_state_dirty = 1;
 
 	DUK_D(DUK_DPRINT("set state for automatic pause triggers, flags=0x%08lx, act=%p, startline=%ld",
-	                 (long) heap->dbg_pause_flags, (void *) heap->dbg_pause_act,
+	                 (long) heap->dbg_pause_flags,
+	                 (void *) heap->dbg_pause_act,
 	                 (long) heap->dbg_pause_startline));
 }
 
@@ -43100,7 +46433,7 @@ DUK_INTERNAL void duk_debug_read_bytes(duk_hthread *thr, duk_uint8_t *data, duk_
 
 		if (got == 0 || got > left) {
 			DUK_D(DUK_DPRINT("connection error during read, return zero data"));
-			duk__debug_null_most_callbacks(thr);  /* avoid calling write callback in detach1() */
+			duk__debug_null_most_callbacks(thr); /* avoid calling write callback in detach1() */
 			DUK__SET_CONN_BROKEN(thr, 1);
 			goto fail;
 		}
@@ -43108,14 +46441,14 @@ DUK_INTERNAL void duk_debug_read_bytes(duk_hthread *thr, duk_uint8_t *data, duk_
 	}
 	return;
 
- fail:
+fail:
 	duk_memzero((void *) data, (size_t) length);
 }
 
 DUK_INTERNAL duk_uint8_t duk_debug_read_byte(duk_hthread *thr) {
 	duk_uint8_t x;
 
-	x = 0;  /* just in case callback is broken and won't write 'x' */
+	x = 0; /* just in case callback is broken and won't write 'x' */
 	duk_debug_read_bytes(thr, &x, 1);
 	return x;
 }
@@ -43126,10 +46459,7 @@ DUK_LOCAL duk_uint32_t duk__debug_read_uint32_raw(duk_hthread *thr) {
 	DUK_ASSERT(thr != NULL);
 
 	duk_debug_read_bytes(thr, buf, 4);
-	return ((duk_uint32_t) buf[0] << 24) |
-	       ((duk_uint32_t) buf[1] << 16) |
-	       ((duk_uint32_t) buf[2] << 8) |
-	       (duk_uint32_t) buf[3];
+	return ((duk_uint32_t) buf[0] << 24) | ((duk_uint32_t) buf[1] << 16) | ((duk_uint32_t) buf[2] << 8) | (duk_uint32_t) buf[3];
 }
 
 DUK_LOCAL duk_int32_t duk__debug_read_int32_raw(duk_hthread *thr) {
@@ -43142,8 +46472,7 @@ DUK_LOCAL duk_uint16_t duk__debug_read_uint16_raw(duk_hthread *thr) {
 	DUK_ASSERT(thr != NULL);
 
 	duk_debug_read_bytes(thr, buf, 2);
-	return ((duk_uint16_t) buf[0] << 8) |
-	       (duk_uint16_t) buf[1];
+	return ((duk_uint16_t) buf[0] << 8) | (duk_uint16_t) buf[1];
 }
 
 DUK_INTERNAL duk_int32_t duk_debug_read_int(duk_hthread *thr) {
@@ -43175,10 +46504,10 @@ DUK_LOCAL duk_hstring *duk__debug_read_hstring_raw(duk_hthread *thr, duk_uint32_
 		duk_debug_read_bytes(thr, buf, (duk_size_t) len);
 		duk_push_lstring(thr, (const char *) buf, (duk_size_t) len);
 	} else {
-		p = (duk_uint8_t *) duk_push_fixed_buffer(thr, (duk_size_t) len);  /* zero for paranoia */
+		p = (duk_uint8_t *) duk_push_fixed_buffer(thr, (duk_size_t) len); /* zero for paranoia */
 		DUK_ASSERT(p != NULL);
 		duk_debug_read_bytes(thr, p, (duk_size_t) len);
-		(void) duk_buffer_to_string(thr, -1);  /* Safety relies on debug client, which is OK. */
+		(void) duk_buffer_to_string(thr, -1); /* Safety relies on debug client, which is OK. */
 	}
 
 	return duk_require_hstring(thr, -1);
@@ -43204,17 +46533,17 @@ DUK_INTERNAL duk_hstring *duk_debug_read_hstring(duk_hthread *thr) {
 
 	return duk__debug_read_hstring_raw(thr, len);
 
- fail:
+fail:
 	DUK_D(DUK_DPRINT("debug connection error: failed to decode int"));
 	DUK__SET_CONN_BROKEN(thr, 1);
-	duk_push_hstring_empty(thr);  /* always push some string */
+	duk_push_hstring_empty(thr); /* always push some string */
 	return duk_require_hstring(thr, -1);
 }
 
 DUK_LOCAL duk_hbuffer *duk__debug_read_hbuffer_raw(duk_hthread *thr, duk_uint32_t len) {
 	duk_uint8_t *p;
 
-	p = (duk_uint8_t *) duk_push_fixed_buffer(thr, (duk_size_t) len);  /* zero for paranoia */
+	p = (duk_uint8_t *) duk_push_fixed_buffer(thr, (duk_size_t) len); /* zero for paranoia */
 	DUK_ASSERT(p != NULL);
 	duk_debug_read_bytes(thr, p, (duk_size_t) len);
 
@@ -43237,7 +46566,7 @@ DUK_LOCAL void *duk__debug_read_pointer_raw(duk_hthread *thr) {
 #endif
 	return (void *) pu.p;
 
- fail:
+fail:
 	DUK_D(DUK_DPRINT("debug connection error: failed to decode pointer"));
 	DUK__SET_CONN_BROKEN(thr, 1);
 	return (void *) NULL;
@@ -43295,7 +46624,7 @@ DUK_INTERNAL duk_heaphdr *duk_debug_read_any_ptr(duk_hthread *thr) {
 
 	return (duk_heaphdr *) duk__debug_read_pointer_raw(thr);
 
- fail:
+fail:
 	DUK_D(DUK_DPRINT("debug connection error: failed to decode any pointer (object, pointer, heapptr)"));
 	DUK__SET_CONN_BROKEN(thr, 1);
 	return NULL;
@@ -43401,15 +46730,15 @@ DUK_INTERNAL duk_tval *duk_debug_read_tval(duk_hthread *thr) {
 		duk_push_heapptr(thr, (void *) h);
 		break;
 	}
-	case DUK_DBG_IB_UNUSED:  /* unused: not accepted in inbound messages */
+	case DUK_DBG_IB_UNUSED: /* unused: not accepted in inbound messages */
 	default:
 		goto fail;
 	}
 
- return_ptr:
+return_ptr:
 	return DUK_GET_TVAL_NEGIDX(thr, -1);
 
- fail:
+fail:
 	DUK_D(DUK_DPRINT("debug connection error: failed to decode tval"));
 	DUK__SET_CONN_BROKEN(thr, 1);
 	return NULL;
@@ -43459,7 +46788,7 @@ DUK_INTERNAL void duk_debug_write_bytes(duk_hthread *thr, const duk_uint8_t *dat
 		DUK__DBG_TPORT_EXIT();
 
 		if (got == 0 || got > left) {
-			duk__debug_null_most_callbacks(thr);  /* avoid calling write callback in detach1() */
+			duk__debug_null_most_callbacks(thr); /* avoid calling write callback in detach1() */
 			DUK_D(DUK_DPRINT("connection error during write"));
 			DUK__SET_CONN_BROKEN(thr, 1);
 			return;
@@ -43526,8 +46855,7 @@ DUK_INTERNAL void duk_debug_write_uint(duk_hthread *thr, duk_uint32_t x) {
 	 * unsigned 32-bit dvalue.
 	 */
 	if (x >= 0x80000000UL) {
-		DUK_D(DUK_DPRINT("writing unsigned integer 0x%08lx as signed integer",
-		                 (long) x));
+		DUK_D(DUK_DPRINT("writing unsigned integer 0x%08lx as signed integer", (long) x));
 	}
 	duk_debug_write_int(thr, (duk_int32_t) x);
 }
@@ -43568,9 +46896,7 @@ DUK_INTERNAL void duk_debug_write_string(duk_hthread *thr, const char *data, duk
 DUK_INTERNAL void duk_debug_write_cstring(duk_hthread *thr, const char *data) {
 	DUK_ASSERT(thr != NULL);
 
-	duk_debug_write_string(thr,
-	                       data,
-	                       data ? DUK_STRLEN(data) : 0);
+	duk_debug_write_string(thr, data, data ? DUK_STRLEN(data) : 0);
 }
 
 DUK_INTERNAL void duk_debug_write_hstring(duk_hthread *thr, duk_hstring *h) {
@@ -43624,7 +46950,7 @@ DUK_INTERNAL void duk_debug_write_pointer(duk_hthread *thr, void *ptr) {
 DUK_INTERNAL void duk_debug_write_heapptr(duk_hthread *thr, duk_heaphdr *h) {
 	duk__debug_write_pointer_raw(thr, (void *) h, DUK_DBG_IB_HEAPPTR);
 }
-#endif  /* DUK_USE_DEBUGGER_DUMPHEAP || DUK_USE_DEBUGGER_INSPECT */
+#endif /* DUK_USE_DEBUGGER_DUMPHEAP || DUK_USE_DEBUGGER_INSPECT */
 
 DUK_INTERNAL void duk_debug_write_hobject(duk_hthread *thr, duk_hobject *obj) {
 	duk_uint8_t buf[3];
@@ -43667,8 +46993,7 @@ DUK_INTERNAL void duk_debug_write_tval(duk_hthread *thr, duk_tval *tv) {
 		duk_debug_write_byte(thr, DUK_DBG_IB_NULL);
 		break;
 	case DUK_TAG_BOOLEAN:
-		DUK_ASSERT(DUK_TVAL_GET_BOOLEAN(tv) == 0 ||
-		           DUK_TVAL_GET_BOOLEAN(tv) == 1);
+		DUK_ASSERT(DUK_TVAL_GET_BOOLEAN(tv) == 0 || DUK_TVAL_GET_BOOLEAN(tv) == 1);
 		duk_debug_write_boolean(thr, DUK_TVAL_GET_BOOLEAN(tv));
 		break;
 	case DUK_TAG_POINTER:
@@ -43713,14 +47038,22 @@ DUK_INTERNAL void duk_debug_write_tval(duk_hthread *thr, duk_tval *tv) {
 		DUK_DD(DUK_DDPRINT("i32=%ld du1=%02x%02x%02x%02x%02x%02x%02x%02x "
 		                   "du2=%02x%02x%02x%02x%02x%02x%02x%02x",
 		                   (long) i32,
-		                   (unsigned int) du1.uc[0], (unsigned int) du1.uc[1],
-		                   (unsigned int) du1.uc[2], (unsigned int) du1.uc[3],
-		                   (unsigned int) du1.uc[4], (unsigned int) du1.uc[5],
-		                   (unsigned int) du1.uc[6], (unsigned int) du1.uc[7],
-		                   (unsigned int) du2.uc[0], (unsigned int) du2.uc[1],
-		                   (unsigned int) du2.uc[2], (unsigned int) du2.uc[3],
-		                   (unsigned int) du2.uc[4], (unsigned int) du2.uc[5],
-		                   (unsigned int) du2.uc[6], (unsigned int) du2.uc[7]));
+		                   (unsigned int) du1.uc[0],
+		                   (unsigned int) du1.uc[1],
+		                   (unsigned int) du1.uc[2],
+		                   (unsigned int) du1.uc[3],
+		                   (unsigned int) du1.uc[4],
+		                   (unsigned int) du1.uc[5],
+		                   (unsigned int) du1.uc[6],
+		                   (unsigned int) du1.uc[7],
+		                   (unsigned int) du2.uc[0],
+		                   (unsigned int) du2.uc[1],
+		                   (unsigned int) du2.uc[2],
+		                   (unsigned int) du2.uc[3],
+		                   (unsigned int) du2.uc[4],
+		                   (unsigned int) du2.uc[5],
+		                   (unsigned int) du2.uc[6],
+		                   (unsigned int) du2.uc[7]));
 
 		if (duk_memcmp((const void *) du1.uc, (const void *) du2.uc, sizeof(du1.uc)) == 0) {
 			duk_debug_write_int(thr, i32);
@@ -43744,13 +47077,13 @@ DUK_LOCAL void duk__debug_write_tval_heapptr(duk_hthread *thr, duk_tval *tv) {
 		duk_debug_write_tval(thr, tv);
 	}
 }
-#endif  /* DUK_USE_DEBUGGER_DUMPHEAP */
+#endif /* DUK_USE_DEBUGGER_DUMPHEAP */
 
 /*
  *  Debug connection message write helpers
  */
 
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_INTERNAL void duk_debug_write_request(duk_hthread *thr, duk_small_uint_t command) {
 	duk_debug_write_byte(thr, DUK_DBG_IB_REQUEST);
 	duk_debug_write_int(thr, command);
@@ -43853,7 +47186,7 @@ DUK_INTERNAL void duk_debug_send_throw(duk_hthread *thr, duk_bool_t fatal) {
 	duk_activation *act;
 	duk_uint32_t pc;
 
-	DUK_ASSERT(thr->valstack_top > thr->valstack);  /* At least: ... [err] */
+	DUK_ASSERT(thr->valstack_top > thr->valstack); /* At least: ... [err] */
 
 	duk_debug_write_notify(thr, DUK_DBG_CMD_THROW);
 	duk_debug_write_int(thr, (duk_int32_t) fatal);
@@ -43894,7 +47227,7 @@ DUK_INTERNAL void duk_debug_send_throw(duk_hthread *thr, duk_bool_t fatal) {
 
 	duk_debug_write_eom(thr);
 }
-#endif  /* DUK_USE_DEBUGGER_THROW_NOTIFY */
+#endif /* DUK_USE_DEBUGGER_THROW_NOTIFY */
 
 /*
  *  Debug message processing
@@ -43918,9 +47251,9 @@ DUK_LOCAL duk_bool_t duk__debug_skip_dvalue(duk_hthread *thr) {
 		duk_debug_skip_bytes(thr, (duk_size_t) (x - 0x60));
 		return 0;
 	}
-	switch(x) {
+	switch (x) {
 	case DUK_DBG_IB_EOM:
-		return 1;  /* Return 1: got EOM */
+		return 1; /* Return 1: got EOM */
 	case DUK_DBG_IB_REQUEST:
 	case DUK_DBG_IB_REPLY:
 	case DUK_DBG_IB_ERROR:
@@ -43969,9 +47302,9 @@ DUK_LOCAL duk_bool_t duk__debug_skip_dvalue(duk_hthread *thr) {
 
 	return 0;
 
- fail:
+fail:
 	DUK__SET_CONN_BROKEN(thr, 1);
-	return 1;  /* Pretend like we got EOM */
+	return 1; /* Pretend like we got EOM */
 }
 
 /* Skip dvalues to EOM. */
@@ -43991,7 +47324,7 @@ DUK_LOCAL duk_int32_t duk__debug_read_validate_csindex(duk_hthread *thr) {
 	level = duk_debug_read_int(thr);
 	if (level >= 0 || -level > (duk_int32_t) thr->callstack_top) {
 		duk_debug_write_error_eom(thr, DUK_DBG_ERR_NOTFOUND, "invalid callstack index");
-		return 0;  /* zero indicates failure */
+		return 0; /* zero indicates failure */
 	}
 	return level;
 }
@@ -44060,7 +47393,7 @@ DUK_LOCAL void duk__debug_handle_resume(duk_hthread *thr, duk_heap *heap) {
 	duk_debug_clear_paused(heap);
 
 	pause_flags = 0;
-#if 0  /* manual testing */
+#if 0 /* manual testing */
 	pause_flags |= DUK_PAUSE_FLAG_ONE_OPCODE;
 	pause_flags |= DUK_PAUSE_FLAG_CAUGHT_ERROR;
 	pause_flags |= DUK_PAUSE_FLAG_UNCAUGHT_ERROR;
@@ -44081,12 +47414,9 @@ DUK_LOCAL void duk__debug_handle_step(duk_hthread *thr, duk_heap *heap, duk_int3
 	DUK_D(DUK_DPRINT("debug command StepInto/StepOver/StepOut: %d", (int) cmd));
 
 	if (cmd == DUK_DBG_CMD_STEPINTO) {
-		pause_flags = DUK_PAUSE_FLAG_LINE_CHANGE |
-		              DUK_PAUSE_FLAG_FUNC_ENTRY |
-		              DUK_PAUSE_FLAG_FUNC_EXIT;
+		pause_flags = DUK_PAUSE_FLAG_LINE_CHANGE | DUK_PAUSE_FLAG_FUNC_ENTRY | DUK_PAUSE_FLAG_FUNC_EXIT;
 	} else if (cmd == DUK_DBG_CMD_STEPOVER) {
-		pause_flags = DUK_PAUSE_FLAG_LINE_CHANGE |
-		              DUK_PAUSE_FLAG_FUNC_EXIT;
+		pause_flags = DUK_PAUSE_FLAG_LINE_CHANGE | DUK_PAUSE_FLAG_FUNC_EXIT;
 	} else {
 		DUK_ASSERT(cmd == DUK_DBG_CMD_STEPOUT);
 		pause_flags = DUK_PAUSE_FLAG_FUNC_EXIT;
@@ -44165,7 +47495,7 @@ DUK_LOCAL void duk__debug_handle_get_var(duk_hthread *thr, duk_heap *heap) {
 	if (act == NULL) {
 		return;
 	}
-	str = duk_debug_read_hstring(thr);  /* push to stack */
+	str = duk_debug_read_hstring(thr); /* push to stack */
 	DUK_ASSERT(str != NULL);
 
 	rc = duk_js_getvar_activation(thr, act, str, 0);
@@ -44194,7 +47524,7 @@ DUK_LOCAL void duk__debug_handle_put_var(duk_hthread *thr, duk_heap *heap) {
 	if (act == NULL) {
 		return;
 	}
-	str = duk_debug_read_hstring(thr);  /* push to stack */
+	str = duk_debug_read_hstring(thr); /* push to stack */
 	DUK_ASSERT(str != NULL);
 	tv = duk_debug_read_tval(thr);
 	if (tv == NULL) {
@@ -44277,18 +47607,25 @@ DUK_LOCAL void duk__debug_handle_get_locals(duk_hthread *thr, duk_heap *heap) {
 	 *   - If side effects are possible, add error catching
 	 */
 
-	duk_push_tval(thr, &act->tv_func);
-	duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_INT_VARMAP);
-	if (duk_is_object(thr, -1)) {
-		duk_enum(thr, -1, 0 /*enum_flags*/);
-		while (duk_next(thr, -1 /*enum_index*/, 0 /*get_value*/)) {
-			varname = duk_known_hstring(thr, -1);
-
-			duk_js_getvar_activation(thr, act, varname, 0 /*throw_flag*/);
-			/* [ ... func varmap enum key value this ] */
-			duk_debug_write_hstring(thr, duk_get_hstring(thr, -3));
-			duk_debug_write_tval(thr, duk_get_tval(thr, -2));
-			duk_pop_3(thr);  /* -> [ ... func varmap enum ] */
+	if (DUK_TVAL_IS_OBJECT(&act->tv_func)) {
+		duk_hobject *h_func = DUK_TVAL_GET_OBJECT(&act->tv_func);
+		duk_hobject *h_varmap;
+
+		h_varmap = duk_hobject_get_varmap(thr, h_func);
+		if (h_varmap != NULL) {
+			duk_push_hobject(thr, h_varmap);
+			duk_enum(thr, -1, 0 /*enum_flags*/);
+			while (duk_next(thr, -1 /*enum_index*/, 0 /*get_value*/)) {
+				varname = duk_known_hstring(thr, -1);
+
+				duk_js_getvar_activation(thr, act, varname, 0 /*throw_flag*/);
+				/* [ ... func varmap enum key value this ] */
+				duk_debug_write_hstring(thr, duk_get_hstring(thr, -3));
+				duk_debug_write_tval(thr, duk_get_tval(thr, -2));
+				duk_pop_3(thr); /* -> [ ... func varmap enum ] */
+			}
+		} else {
+			DUK_D(DUK_DPRINT("varmap missing in GetLocals, ignore"));
 		}
 	} else {
 		DUK_D(DUK_DPRINT("varmap is not an object in GetLocals, ignore"));
@@ -44320,12 +47657,12 @@ DUK_LOCAL void duk__debug_handle_eval(duk_hthread *thr, duk_heap *heap) {
 	/* nargs == 2 so we can pass a callstack index to eval(). */
 	idx_func = duk_get_top(thr);
 	duk_push_c_function(thr, duk_bi_global_object_eval, 2 /*nargs*/);
-	duk_push_undefined(thr);  /* 'this' binding shouldn't matter here */
+	duk_push_undefined(thr); /* 'this' binding shouldn't matter here */
 
 	/* Read callstack index, if non-null. */
 	if (duk_debug_peek_byte(thr) == DUK_DBG_IB_NULL) {
 		direct_eval = 0;
-		level = -1;  /* Not needed, but silences warning. */
+		level = -1; /* Not needed, but silences warning. */
 		(void) duk_debug_read_byte(thr);
 	} else {
 		direct_eval = 1;
@@ -44335,12 +47672,11 @@ DUK_LOCAL void duk__debug_handle_eval(duk_hthread *thr, duk_heap *heap) {
 		}
 	}
 
-	DUK_ASSERT(!direct_eval ||
-	           (level < 0 && -level <= (duk_int32_t) thr->callstack_top));
+	DUK_ASSERT(!direct_eval || (level < 0 && -level <= (duk_int32_t) thr->callstack_top));
 
 	(void) duk_debug_read_hstring(thr);
 	if (direct_eval) {
-		duk_push_int(thr, level - 1);  /* compensate for eval() call */
+		duk_push_int(thr, level - 1); /* compensate for eval() call */
 	}
 
 	/* [ ... eval "eval" eval_input level? ] */
@@ -44395,7 +47731,7 @@ DUK_LOCAL void duk__debug_handle_detach(duk_hthread *thr, duk_heap *heap) {
 	duk_debug_write_eom(thr);
 
 	DUK_D(DUK_DPRINT("debug connection detached, mark broken"));
-	DUK__SET_CONN_BROKEN(thr, 0);  /* not an error */
+	DUK__SET_CONN_BROKEN(thr, 0); /* not an error */
 }
 
 DUK_LOCAL void duk__debug_handle_apprequest(duk_hthread *thr, duk_heap *heap) {
@@ -44403,7 +47739,7 @@ DUK_LOCAL void duk__debug_handle_apprequest(duk_hthread *thr, duk_heap *heap) {
 
 	DUK_D(DUK_DPRINT("debug command AppRequest"));
 
-	old_top = duk_get_top(thr);  /* save stack top */
+	old_top = duk_get_top(thr); /* save stack top */
 
 	if (heap->dbg_request_cb != NULL) {
 		duk_idx_t nrets;
@@ -44419,7 +47755,7 @@ DUK_LOCAL void duk__debug_handle_apprequest(duk_hthread *thr, duk_heap *heap) {
 				DUK_D(DUK_DPRINT("failed to allocate space for request dvalue(s)"));
 				goto fail;
 			}
-			tv = duk_debug_read_tval(thr);  /* push to stack */
+			tv = duk_debug_read_tval(thr); /* push to stack */
 			if (tv == NULL) {
 				/* detached */
 				return;
@@ -44430,17 +47766,24 @@ DUK_LOCAL void duk__debug_handle_apprequest(duk_hthread *thr, duk_heap *heap) {
 
 		/* Request callback should push values for reply to client onto valstack */
 		DUK_D(DUK_DPRINT("calling into AppRequest request_cb with nvalues=%ld, old_top=%ld, top=%ld",
-		                 (long) nvalues, (long) old_top, (long) duk_get_top(thr)));
+		                 (long) nvalues,
+		                 (long) old_top,
+		                 (long) duk_get_top(thr)));
 		nrets = heap->dbg_request_cb(thr, heap->dbg_udata, nvalues);
 		DUK_D(DUK_DPRINT("returned from AppRequest request_cb; nvalues=%ld -> nrets=%ld, old_top=%ld, top=%ld",
-		                 (long) nvalues, (long) nrets, (long) old_top, (long) duk_get_top(thr)));
+		                 (long) nvalues,
+		                 (long) nrets,
+		                 (long) old_top,
+		                 (long) duk_get_top(thr)));
 		if (nrets >= 0) {
 			DUK_ASSERT(duk_get_top(thr) >= old_top + nrets);
 			if (duk_get_top(thr) < old_top + nrets) {
 				DUK_D(DUK_DPRINT("AppRequest callback doesn't match value stack configuration, "
 				                 "top=%ld < old_top=%ld + nrets=%ld; "
 				                 "this might mean it's unsafe to continue!",
-				                 (long) duk_get_top(thr), (long) old_top, (long) nrets));
+				                 (long) duk_get_top(thr),
+				                 (long) old_top,
+				                 (long) nrets));
 				goto fail;
 			}
 
@@ -44460,7 +47803,7 @@ DUK_LOCAL void duk__debug_handle_apprequest(duk_hthread *thr, duk_heap *heap) {
 			duk_debug_write_error_eom(thr, DUK_DBG_ERR_APPLICATION, duk_get_string(thr, -1));
 		}
 
-		duk_set_top(thr, old_top);  /* restore stack top */
+		duk_set_top(thr, old_top); /* restore stack top */
 	} else {
 		DUK_D(DUK_DPRINT("no request callback, treat AppRequest as unsupported"));
 		duk_debug_write_error_eom(thr, DUK_DBG_ERR_UNSUPPORTED, "AppRequest unsupported by target");
@@ -44468,8 +47811,8 @@ DUK_LOCAL void duk__debug_handle_apprequest(duk_hthread *thr, duk_heap *heap) {
 
 	return;
 
- fail:
-	duk_set_top(thr, old_top);  /* restore stack top */
+fail:
+	duk_set_top(thr, old_top); /* restore stack top */
 	DUK__SET_CONN_BROKEN(thr, 1);
 }
 
@@ -44520,16 +47863,16 @@ DUK_LOCAL void duk__debug_dump_heaphdr(duk_hthread *thr, duk_heap *heap, duk_hea
 			k = DUK_HOBJECT_E_GET_KEY(heap, h, i);
 			duk_debug_write_heapptr(thr, (duk_heaphdr *) k);
 			if (k == NULL) {
-				duk_debug_write_int(thr, 0);  /* isAccessor */
+				duk_debug_write_int(thr, 0); /* isAccessor */
 				duk_debug_write_unused(thr);
 				continue;
 			}
 			if (DUK_HOBJECT_E_SLOT_IS_ACCESSOR(heap, h, i)) {
-				duk_debug_write_int(thr, 1);  /* isAccessor */
+				duk_debug_write_int(thr, 1); /* isAccessor */
 				duk_debug_write_heapptr(thr, (duk_heaphdr *) DUK_HOBJECT_E_GET_VALUE_PTR(heap, h, i)->a.get);
 				duk_debug_write_heapptr(thr, (duk_heaphdr *) DUK_HOBJECT_E_GET_VALUE_PTR(heap, h, i)->a.set);
 			} else {
-				duk_debug_write_int(thr, 0);  /* isAccessor */
+				duk_debug_write_int(thr, 0); /* isAccessor */
 
 				duk__debug_write_tval_heapptr(thr, &DUK_HOBJECT_E_GET_VALUE_PTR(heap, h, i)->v);
 			}
@@ -44591,7 +47934,7 @@ DUK_LOCAL void duk__debug_handle_dump_heap(duk_hthread *thr, duk_heap *heap) {
 	duk__debug_dump_strtab(thr, heap);
 	duk_debug_write_eom(thr);
 }
-#endif  /* DUK_USE_DEBUGGER_DUMPHEAP */
+#endif /* DUK_USE_DEBUGGER_DUMPHEAP */
 
 DUK_LOCAL void duk__debug_handle_get_bytecode(duk_hthread *thr, duk_heap *heap) {
 	duk_activation *act;
@@ -44660,11 +48003,11 @@ DUK_LOCAL void duk__debug_handle_get_bytecode(duk_hthread *thr, duk_heap *heap)
 	duk_debug_write_eom(thr);
 	return;
 
- fail_args:
+fail_args:
 	duk_debug_write_error_eom(thr, DUK_DBG_ERR_UNKNOWN, "invalid argument");
 	return;
 
- fail_index:
+fail_index:
 	duk_debug_write_error_eom(thr, DUK_DBG_ERR_NOTFOUND, "invalid callstack index");
 	return;
 }
@@ -44716,53 +48059,22 @@ DUK_LOCAL duk_uint_t duk__debug_getinfo_hstring_masks[] = {
 	DUK_HSTRING_FLAG_EVAL_OR_ARGUMENTS,
 #endif
 	DUK_HSTRING_FLAG_EXTDATA,
-	0  /* terminator */
+	0 /* terminator */
 };
 DUK_LOCAL const char * const duk__debug_getinfo_hobject_keys[] = {
-	"extensible",
-	"constructable",
-	"callable",
-	"boundfunc",
-	"compfunc",
-	"natfunc",
-	"bufobj",
-	"fastrefs",
-	"array_part",
-	"strict",
-	"notail",
-	"newenv",
-	"namebinding",
-	"createargs",
-	"have_finalizer",
-	"exotic_array",
-	"exotic_stringobj",
-	"exotic_arguments",
-	"exotic_proxyobj",
-	"special_call"
+	"extensible",     "constructable", "callable",         "boundfunc",        "compfunc",        "natfunc",     "bufobj",
+	"fastrefs",       "array_part",    "strict",           "notail",           "newenv",          "namebinding", "createargs",
+	"have_finalizer", "exotic_array",  "exotic_stringobj", "exotic_arguments", "exotic_proxyobj", "special_call"
 	/* NULL not needed here */
 };
 DUK_LOCAL duk_uint_t duk__debug_getinfo_hobject_masks[] = {
-	DUK_HOBJECT_FLAG_EXTENSIBLE,
-	DUK_HOBJECT_FLAG_CONSTRUCTABLE,
-	DUK_HOBJECT_FLAG_CALLABLE,
-	DUK_HOBJECT_FLAG_BOUNDFUNC,
-	DUK_HOBJECT_FLAG_COMPFUNC,
-	DUK_HOBJECT_FLAG_NATFUNC,
-	DUK_HOBJECT_FLAG_BUFOBJ,
-	DUK_HOBJECT_FLAG_FASTREFS,
-	DUK_HOBJECT_FLAG_ARRAY_PART,
-	DUK_HOBJECT_FLAG_STRICT,
-	DUK_HOBJECT_FLAG_NOTAIL,
-	DUK_HOBJECT_FLAG_NEWENV,
-	DUK_HOBJECT_FLAG_NAMEBINDING,
-	DUK_HOBJECT_FLAG_CREATEARGS,
-	DUK_HOBJECT_FLAG_HAVE_FINALIZER,
-	DUK_HOBJECT_FLAG_EXOTIC_ARRAY,
-	DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ,
-	DUK_HOBJECT_FLAG_EXOTIC_ARGUMENTS,
-	DUK_HOBJECT_FLAG_EXOTIC_PROXYOBJ,
-	DUK_HOBJECT_FLAG_SPECIAL_CALL,
-	0  /* terminator */
+	DUK_HOBJECT_FLAG_EXTENSIBLE,      DUK_HOBJECT_FLAG_CONSTRUCTABLE,    DUK_HOBJECT_FLAG_CALLABLE,
+	DUK_HOBJECT_FLAG_BOUNDFUNC,       DUK_HOBJECT_FLAG_COMPFUNC,         DUK_HOBJECT_FLAG_NATFUNC,
+	DUK_HOBJECT_FLAG_BUFOBJ,          DUK_HOBJECT_FLAG_FASTREFS,         DUK_HOBJECT_FLAG_ARRAY_PART,
+	DUK_HOBJECT_FLAG_STRICT,          DUK_HOBJECT_FLAG_NOTAIL,           DUK_HOBJECT_FLAG_NEWENV,
+	DUK_HOBJECT_FLAG_NAMEBINDING,     DUK_HOBJECT_FLAG_CREATEARGS,       DUK_HOBJECT_FLAG_HAVE_FINALIZER,
+	DUK_HOBJECT_FLAG_EXOTIC_ARRAY,    DUK_HOBJECT_FLAG_EXOTIC_STRINGOBJ, DUK_HOBJECT_FLAG_EXOTIC_ARGUMENTS,
+	DUK_HOBJECT_FLAG_EXOTIC_PROXYOBJ, DUK_HOBJECT_FLAG_SPECIAL_CALL,     0 /* terminator */
 };
 DUK_LOCAL const char * const duk__debug_getinfo_hbuffer_keys[] = {
 	"dynamic",
@@ -44772,7 +48084,7 @@ DUK_LOCAL const char * const duk__debug_getinfo_hbuffer_keys[] = {
 DUK_LOCAL duk_uint_t duk__debug_getinfo_hbuffer_masks[] = {
 	DUK_HBUFFER_FLAG_DYNAMIC,
 	DUK_HBUFFER_FLAG_EXTERNAL,
-	0  /* terminator */
+	0 /* terminator */
 };
 
 DUK_LOCAL void duk__debug_getinfo_flags_key(duk_hthread *thr, const char *key) {
@@ -44798,7 +48110,7 @@ DUK_LOCAL void duk__debug_getinfo_prop_bool(duk_hthread *thr, const char *key, d
 	duk_debug_write_boolean(thr, val);
 }
 
-DUK_LOCAL void duk__debug_getinfo_bitmask(duk_hthread *thr, const char * const * keys, duk_uint_t *masks, duk_uint_t flags) {
+DUK_LOCAL void duk__debug_getinfo_bitmask(duk_hthread *thr, const char * const *keys, duk_uint_t *masks, duk_uint_t flags) {
 	const char *key;
 	duk_uint_t mask;
 
@@ -44810,7 +48122,10 @@ DUK_LOCAL void duk__debug_getinfo_bitmask(duk_hthread *thr, const char * const *
 		key = *keys++;
 		DUK_ASSERT(key != NULL);
 
-		DUK_DD(DUK_DDPRINT("inspect bitmask: key=%s, mask=0x%08lx, flags=0x%08lx", key, (unsigned long) mask, (unsigned long) flags));
+		DUK_DD(DUK_DDPRINT("inspect bitmask: key=%s, mask=0x%08lx, flags=0x%08lx",
+		                   key,
+		                   (unsigned long) mask,
+		                   (unsigned long) flags));
 		duk__debug_getinfo_prop_bool(thr, key, flags & mask);
 	}
 }
@@ -44886,9 +48201,12 @@ DUK_LOCAL void duk__debug_handle_get_heap_obj_info(duk_hthread *thr, duk_heap *h
 	DUK_D(DUK_DPRINT("debug command GetHeapObjInfo"));
 	DUK_UNREF(heap);
 
-	DUK_ASSERT(sizeof(duk__debug_getinfo_hstring_keys) / sizeof(const char *) == sizeof(duk__debug_getinfo_hstring_masks) / sizeof(duk_uint_t) - 1);
-	DUK_ASSERT(sizeof(duk__debug_getinfo_hobject_keys) / sizeof(const char *) == sizeof(duk__debug_getinfo_hobject_masks) / sizeof(duk_uint_t) - 1);
-	DUK_ASSERT(sizeof(duk__debug_getinfo_hbuffer_keys) / sizeof(const char *) == sizeof(duk__debug_getinfo_hbuffer_masks) / sizeof(duk_uint_t) - 1);
+	DUK_ASSERT(sizeof(duk__debug_getinfo_hstring_keys) / sizeof(const char *) ==
+	           sizeof(duk__debug_getinfo_hstring_masks) / sizeof(duk_uint_t) - 1);
+	DUK_ASSERT(sizeof(duk__debug_getinfo_hobject_keys) / sizeof(const char *) ==
+	           sizeof(duk__debug_getinfo_hobject_masks) / sizeof(duk_uint_t) - 1);
+	DUK_ASSERT(sizeof(duk__debug_getinfo_hbuffer_keys) / sizeof(const char *) ==
+	           sizeof(duk__debug_getinfo_hbuffer_masks) / sizeof(duk_uint_t) - 1);
 
 	h = duk_debug_read_any_ptr(thr);
 	if (!h) {
@@ -45076,7 +48394,7 @@ DUK_LOCAL void duk__debug_handle_get_heap_obj_info(duk_hthread *thr, duk_heap *h
 				duk_debug_write_heapptr(thr, (duk_heaphdr *) h_bufobj->buf);
 			}
 		}
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 		break;
 	}
 	case DUK_HTYPE_BUFFER: {
@@ -45091,7 +48409,7 @@ DUK_LOCAL void duk__debug_handle_get_heap_obj_info(duk_hthread *thr, duk_heap *h
 		duk__debug_getinfo_flags_key(thr, "dataptr");
 		duk_debug_write_pointer(thr, (void *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h_buf));
 		duk__debug_getinfo_flags_key(thr, "data");
-		duk_debug_write_hbuffer(thr, h_buf);  /* tolerates NULL h_buf */
+		duk_debug_write_hbuffer(thr, h_buf); /* tolerates NULL h_buf */
 		break;
 	}
 	default: {
@@ -45129,8 +48447,7 @@ DUK_LOCAL void duk__debug_handle_get_obj_prop_desc(duk_hthread *thr, duk_heap *h
 
 		/* To use the shared helper need the virtual index. */
 		DUK_ASSERT(desc.e_idx >= 0 || desc.a_idx >= 0);
-		virtual_idx = (desc.a_idx >= 0 ? desc.a_idx :
-		               (duk_int_t) DUK_HOBJECT_GET_ASIZE(h_obj) + desc.e_idx);
+		virtual_idx = (desc.a_idx >= 0 ? desc.a_idx : (duk_int_t) DUK_HOBJECT_GET_ASIZE(h_obj) + desc.e_idx);
 
 		duk_debug_write_reply(thr);
 		rc = duk__debug_getprop_index(thr, heap, h_obj, (duk_uint_t) virtual_idx);
@@ -45142,7 +48459,7 @@ DUK_LOCAL void duk__debug_handle_get_obj_prop_desc(duk_hthread *thr, duk_heap *h
 	}
 	return;
 
- fail_args:
+fail_args:
 	duk_debug_write_error_eom(thr, DUK_DBG_ERR_UNKNOWN, "invalid args");
 }
 
@@ -45178,11 +48495,11 @@ DUK_LOCAL void duk__debug_handle_get_obj_prop_desc_range(duk_hthread *thr, duk_h
 	duk_debug_write_eom(thr);
 	return;
 
- fail_args:
+fail_args:
 	duk_debug_write_error_eom(thr, DUK_DBG_ERR_UNKNOWN, "invalid args");
 }
 
-#endif  /* DUK_USE_DEBUGGER_INSPECT */
+#endif /* DUK_USE_DEBUGGER_INSPECT */
 
 /*
  *  Process incoming debug requests
@@ -45280,7 +48597,7 @@ DUK_LOCAL void duk__debug_process_message(duk_hthread *thr) {
 			duk__debug_handle_dump_heap(thr, heap);
 			break;
 		}
-#endif  /* DUK_USE_DEBUGGER_DUMPHEAP */
+#endif /* DUK_USE_DEBUGGER_DUMPHEAP */
 		case DUK_DBG_CMD_GETBYTECODE: {
 			duk__debug_handle_get_bytecode(thr, heap);
 			break;
@@ -45302,12 +48619,12 @@ DUK_LOCAL void duk__debug_process_message(duk_hthread *thr) {
 			duk__debug_handle_get_obj_prop_desc_range(thr, heap);
 			break;
 		}
-#endif  /* DUK_USE_DEBUGGER_INSPECT */
+#endif /* DUK_USE_DEBUGGER_INSPECT */
 		default: {
 			DUK_D(DUK_DPRINT("debug command unsupported: %d", (int) cmd));
 			duk_debug_write_error_eom(thr, DUK_DBG_ERR_UNSUPPORTED, "unsupported command");
 		}
-		}  /* switch cmd */
+		} /* switch cmd */
 		break;
 	}
 	case DUK_DBG_IB_REPLY: {
@@ -45326,14 +48643,14 @@ DUK_LOCAL void duk__debug_process_message(duk_hthread *thr) {
 		DUK_D(DUK_DPRINT("invalid initial byte, drop connection: %d", (int) x));
 		goto fail;
 	}
-	}  /* switch initial byte */
+	} /* switch initial byte */
 
 	DUK_ASSERT(duk_get_top(thr) >= entry_top);
 	duk_set_top(thr, entry_top);
 	duk__debug_skip_to_eom(thr);
 	return;
 
- fail:
+fail:
 	DUK_ASSERT(duk_get_top(thr) >= entry_top);
 	duk_set_top(thr, entry_top);
 	DUK__SET_CONN_BROKEN(thr, 1);
@@ -45360,8 +48677,10 @@ DUK_INTERNAL duk_bool_t duk_debug_process_messages(duk_hthread *thr, duk_bool_t
 #endif
 
 	DUK_D(DUK_DPRINT("process debug messages: read_cb=%s, no_block=%ld, detaching=%ld, processing=%ld",
-	                 thr->heap->dbg_read_cb ? "not NULL" : "NULL", (long) no_block,
-	                 (long) thr->heap->dbg_detaching, (long) thr->heap->dbg_processing));
+	                 thr->heap->dbg_read_cb ? "not NULL" : "NULL",
+	                 (long) no_block,
+	                 (long) thr->heap->dbg_detaching,
+	                 (long) thr->heap->dbg_processing));
 	DUK_DD(DUK_DDPRINT("top at entry: %ld", (long) duk_get_top(thr)));
 
 	/* thr->heap->dbg_detaching may be != 0 if a debugger write outside
@@ -45408,13 +48727,14 @@ DUK_INTERNAL duk_bool_t duk_debug_process_messages(duk_hthread *thr, duk_bool_t
 			DUK_D(DUK_DPRINT("detach pending (dbg_read_cb == NULL, dbg_detaching != 0), call detach2"));
 
 			duk__debug_do_detach2(thr->heap);
-			thr->heap->dbg_processing = 1;  /* may be set to 0 by duk_debugger_attach() inside callback */
+			thr->heap->dbg_processing = 1; /* may be set to 0 by duk_debugger_attach() inside callback */
 
 			DUK_D(DUK_DPRINT("after detach2 (and possible reattach): dbg_read_cb=%s, dbg_detaching=%ld",
-			                 thr->heap->dbg_read_cb ? "not NULL" : "NULL", (long) thr->heap->dbg_detaching));
+			                 thr->heap->dbg_read_cb ? "not NULL" : "NULL",
+			                 (long) thr->heap->dbg_detaching));
 		}
-		DUK_ASSERT(thr->heap->dbg_detaching == 0);  /* true even with reattach */
-		DUK_ASSERT(thr->heap->dbg_processing == 1);  /* even after a detach and possible reattach */
+		DUK_ASSERT(thr->heap->dbg_detaching == 0); /* true even with reattach */
+		DUK_ASSERT(thr->heap->dbg_processing == 1); /* even after a detach and possible reattach */
 
 		if (thr->heap->dbg_read_cb == NULL) {
 			DUK_D(DUK_DPRINT("debug connection broken (and not detaching), stop processing messages"));
@@ -45439,7 +48759,7 @@ DUK_INTERNAL duk_bool_t duk_debug_process_messages(duk_hthread *thr, duk_bool_t
 		duk__debug_process_message(thr);
 		duk__check_resend_status(thr);
 
-		retval = 1;  /* processed one or more messages */
+		retval = 1; /* processed one or more messages */
 	}
 
 	DUK_ASSERT(thr->heap->dbg_detaching == 0);
@@ -45449,7 +48769,7 @@ DUK_INTERNAL duk_bool_t duk_debug_process_messages(duk_hthread *thr, duk_bool_t
 	/* As an initial implementation, read flush after exiting the message
 	 * loop.  If transport is broken, this is a no-op (with debug logs).
 	 */
-	duk_debug_read_flush(thr);  /* this cannot initiate a detach */
+	duk_debug_read_flush(thr); /* this cannot initiate a detach */
 	DUK_ASSERT(thr->heap->dbg_detaching == 0);
 
 	DUK_DD(DUK_DDPRINT("top at exit: %ld", (long) duk_get_top(thr)));
@@ -45500,11 +48820,8 @@ DUK_INTERNAL void duk_debug_halt_execution(duk_hthread *thr, duk_bool_t use_prev
 		/* Short circuit if is safe: if act->curr_pc != NULL, 'fun' is
 		 * guaranteed to be a non-NULL ECMAScript function.
 		 */
-		DUK_ASSERT(act->curr_pc == NULL ||
-		           (fun != NULL && DUK_HOBJECT_IS_COMPFUNC((duk_hobject *) fun)));
-		if (use_prev_pc &&
-		    act->curr_pc != NULL &&
-		    act->curr_pc > DUK_HCOMPFUNC_GET_CODE_BASE(thr->heap, fun)) {
+		DUK_ASSERT(act->curr_pc == NULL || (fun != NULL && DUK_HOBJECT_IS_COMPFUNC((duk_hobject *) fun)));
+		if (use_prev_pc && act->curr_pc != NULL && act->curr_pc > DUK_HCOMPFUNC_GET_CODE_BASE(thr->heap, fun)) {
 			act->curr_pc--;
 		}
 	}
@@ -45531,7 +48848,7 @@ DUK_INTERNAL void duk_debug_halt_execution(duk_hthread *thr, duk_bool_t use_prev
 	 * with PC values.
 	 */
 	if (act != NULL) {
-		act->curr_pc = old_pc;  /* restore PC */
+		act->curr_pc = old_pc; /* restore PC */
 	}
 }
 
@@ -45555,7 +48872,8 @@ DUK_INTERNAL duk_small_int_t duk_debug_add_breakpoint(duk_hthread *thr, duk_hstr
 
 	if (heap->dbg_breakpoint_count >= DUK_HEAP_MAX_BREAKPOINTS) {
 		DUK_D(DUK_DPRINT("failed to add breakpoint for %O:%ld, all breakpoint slots used",
-		                 (duk_heaphdr *) filename, (long) line));
+		                 (duk_heaphdr *) filename,
+		                 (long) line));
 		return -1;
 	}
 	heap->dbg_breakpoints_active[0] = (duk_breakpoint *) NULL;
@@ -45564,7 +48882,7 @@ DUK_INTERNAL duk_small_int_t duk_debug_add_breakpoint(duk_hthread *thr, duk_hstr
 	b->line = line;
 	DUK_HSTRING_INCREF(thr, filename);
 
-	return (duk_small_int_t) (heap->dbg_breakpoint_count - 1);  /* index */
+	return (duk_small_int_t) (heap->dbg_breakpoint_count - 1); /* index */
 }
 
 DUK_INTERNAL duk_bool_t duk_debug_remove_breakpoint(duk_hthread *thr, duk_small_uint_t breakpoint_index) {
@@ -45582,7 +48900,7 @@ DUK_INTERNAL duk_bool_t duk_debug_remove_breakpoint(duk_hthread *thr, duk_small_
 	heap = thr->heap;
 	DUK_ASSERT(heap != NULL);
 	DUK_ASSERT(duk_debug_is_attached(thr->heap));
-	DUK_ASSERT_DISABLE(breakpoint_index >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(breakpoint_index >= 0); /* unsigned */
 
 	if (breakpoint_index >= heap->dbg_breakpoint_count) {
 		DUK_D(DUK_DPRINT("invalid breakpoint index: %ld", (long) breakpoint_index));
@@ -45594,15 +48912,13 @@ DUK_INTERNAL duk_bool_t duk_debug_remove_breakpoint(duk_hthread *thr, duk_small_
 	DUK_ASSERT(h != NULL);
 
 	move_size = sizeof(duk_breakpoint) * (heap->dbg_breakpoint_count - breakpoint_index - 1);
-	duk_memmove((void *) b,
-	            (const void *) (b + 1),
-	            (size_t) move_size);
+	duk_memmove((void *) b, (const void *) (b + 1), (size_t) move_size);
 
 	heap->dbg_breakpoint_count--;
 	heap->dbg_breakpoints_active[0] = (duk_breakpoint *) NULL;
 
-	DUK_HSTRING_DECREF(thr, h);  /* side effects */
-	DUK_UNREF(h);  /* w/o refcounting */
+	DUK_HSTRING_DECREF(thr, h); /* side effects */
+	DUK_UNREF(h); /* w/o refcounting */
 
 	/* Breakpoint entries above the used area are left as garbage. */
 
@@ -45628,10 +48944,10 @@ DUK_INTERNAL void duk_debug_set_paused(duk_heap *heap) {
 		DUK_HEAP_SET_DEBUGGER_PAUSED(heap);
 		heap->dbg_state_dirty = 1;
 		duk_debug_clear_pause_state(heap);
-		DUK_ASSERT(heap->ms_running == 0);  /* debugger can't be triggered within mark-and-sweep */
-		heap->ms_running = 1;  /* prevent mark-and-sweep, prevent refzero queueing */
+		DUK_ASSERT(heap->ms_running == 0); /* debugger can't be triggered within mark-and-sweep */
+		heap->ms_running = 2; /* prevent mark-and-sweep, prevent refzero queueing */
 		heap->ms_prevent_count++;
-		DUK_ASSERT(heap->ms_prevent_count != 0);  /* Wrap. */
+		DUK_ASSERT(heap->ms_prevent_count != 0); /* Wrap. */
 		DUK_ASSERT(heap->heap_thread != NULL);
 	}
 }
@@ -45641,7 +48957,7 @@ DUK_INTERNAL void duk_debug_clear_paused(duk_heap *heap) {
 		DUK_HEAP_CLEAR_DEBUGGER_PAUSED(heap);
 		heap->dbg_state_dirty = 1;
 		duk_debug_clear_pause_state(heap);
-		DUK_ASSERT(heap->ms_running == 1);
+		DUK_ASSERT(heap->ms_running == 2);
 		DUK_ASSERT(heap->ms_prevent_count > 0);
 		heap->ms_prevent_count--;
 		heap->ms_running = 0;
@@ -45657,11 +48973,11 @@ DUK_INTERNAL void duk_debug_clear_pause_state(duk_heap *heap) {
 	heap->dbg_pause_startline = 0;
 }
 
-#else  /* DUK_USE_DEBUGGER_SUPPORT */
+#else /* DUK_USE_DEBUGGER_SUPPORT */
 
 /* No debugger support. */
 
-#endif  /* DUK_USE_DEBUGGER_SUPPORT */
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
 
 /* automatic undefs */
 #undef DUK__DBG_TPORT_ENTER
@@ -45751,7 +49067,7 @@ DUK_LOCAL void duk__err_augment_user(duk_hthread *thr, duk_small_uint_t stridx_c
 	 *  when it is called and that error replaces the original one.
 	 */
 
-	DUK_ASSERT_VALSTACK_SPACE(thr, 4);  /* 3 entries actually needed below */
+	DUK_ASSERT_VALSTACK_SPACE(thr, 4); /* 3 entries actually needed below */
 
 	/* [ ... errval ] */
 
@@ -45762,23 +49078,19 @@ DUK_LOCAL void duk__err_augment_user(duk_hthread *thr, duk_small_uint_t stridx_c
 		DUK_DD(DUK_DDPRINT("error occurred when DUK_BIDX_DUKTAPE is NULL, ignoring"));
 		return;
 	}
-	tv_hnd = duk_hobject_find_existing_entry_tval_ptr(thr->heap,
-	                                                  thr->builtins[DUK_BIDX_DUKTAPE],
-	                                                  DUK_HTHREAD_GET_STRING(thr, stridx_cb));
+	tv_hnd = duk_hobject_find_entry_tval_ptr_stridx(thr->heap, thr->builtins[DUK_BIDX_DUKTAPE], stridx_cb);
 	if (tv_hnd == NULL) {
-		DUK_DD(DUK_DDPRINT("error handler does not exist or is not a plain value: %!T",
-		                   (duk_tval *) tv_hnd));
+		DUK_DD(DUK_DDPRINT("error handler does not exist or is not a plain value: %!T", (duk_tval *) tv_hnd));
 		return;
 	}
-	DUK_DDD(DUK_DDDPRINT("error handler dump (callability not checked): %!T",
-	                     (duk_tval *) tv_hnd));
+	DUK_DDD(DUK_DDDPRINT("error handler dump (callability not checked): %!T", (duk_tval *) tv_hnd));
 	duk_push_tval(thr, tv_hnd);
 
 	/* [ ... errval errhandler ] */
 
-	duk_insert(thr, -2);  /* -> [ ... errhandler errval ] */
+	duk_insert(thr, -2); /* -> [ ... errhandler errval ] */
 	duk_push_undefined(thr);
-	duk_insert(thr, -2);  /* -> [ ... errhandler undefined(= this) errval ] */
+	duk_insert(thr, -2); /* -> [ ... errhandler undefined(= this) errval ] */
 
 	/* [ ... errhandler undefined errval ] */
 
@@ -45795,21 +49107,25 @@ DUK_LOCAL void duk__err_augment_user(duk_hthread *thr, duk_small_uint_t stridx_c
 	thr->heap->augmenting_error = 1;
 
 	rc = duk_pcall_method(thr, 1);
-	DUK_UNREF(rc);  /* no need to check now: both success and error are OK */
+	DUK_UNREF(rc); /* no need to check now: both success and error are OK */
 
 	DUK_ASSERT(thr->heap->augmenting_error == 1);
 	thr->heap->augmenting_error = 0;
 
 	/* [ ... errval ] */
 }
-#endif  /* DUK_USE_ERRTHROW || DUK_USE_ERRCREATE */
+#endif /* DUK_USE_ERRTHROW || DUK_USE_ERRCREATE */
 
 /*
  *  Add ._Tracedata to an error on the stack top.
  */
 
 #if defined(DUK_USE_TRACEBACKS)
-DUK_LOCAL void duk__add_traceback(duk_hthread *thr, duk_hthread *thr_callstack, const char *c_filename, duk_int_t c_line, duk_small_uint_t flags) {
+DUK_LOCAL void duk__add_traceback(duk_hthread *thr,
+                                  duk_hthread *thr_callstack,
+                                  const char *c_filename,
+                                  duk_int_t c_line,
+                                  duk_small_uint_t flags) {
 	duk_activation *act;
 	duk_int_t depth;
 	duk_int_t arr_size;
@@ -45831,15 +49147,14 @@ DUK_LOCAL void duk__add_traceback(duk_hthread *thr, duk_hthread *thr_callstack,
 	 *  See doc/error-objects.rst.
 	 */
 
-	DUK_DDD(DUK_DDDPRINT("adding traceback to object: %!T",
-	                     (duk_tval *) duk_get_tval(thr, -1)));
+	DUK_DDD(DUK_DDDPRINT("adding traceback to object: %!T", (duk_tval *) duk_get_tval(thr, -1)));
 
 	/* Preallocate array to correct size, so that we can just write out
 	 * the _Tracedata values into the array part.
 	 */
 	act = thr->callstack_curr;
 	depth = DUK_USE_TRACEBACK_DEPTH;
-	DUK_ASSERT(thr_callstack->callstack_top <= DUK_INT_MAX);  /* callstack limits */
+	DUK_ASSERT(thr_callstack->callstack_top <= DUK_INT_MAX); /* callstack limits */
 	if (depth > (duk_int_t) thr_callstack->callstack_top) {
 		depth = (duk_int_t) thr_callstack->callstack_top;
 	}
@@ -45863,9 +49178,13 @@ DUK_LOCAL void duk__add_traceback(duk_hthread *thr, duk_hthread *thr_callstack,
 		arr_size += 2;
 	}
 
-	/* XXX: uninitialized would be OK */
+	/* XXX: Uninitialized would be OK.  Maybe add internal primitive to
+	 * push bare duk_harray with size?
+	 */
 	DUK_D(DUK_DPRINT("preallocated _Tracedata to %ld items", (long) arr_size));
 	tv = duk_push_harray_with_size_outptr(thr, (duk_uint32_t) arr_size);
+	duk_clear_prototype(thr, -1);
+	DUK_ASSERT(duk_is_bare_object(thr, -1));
 	DUK_ASSERT(arr_size == 0 || tv != NULL);
 
 	/* Compiler SyntaxErrors (and other errors) come first, and are
@@ -45877,7 +49196,7 @@ DUK_LOCAL void duk__add_traceback(duk_hthread *thr, duk_hthread *thr_callstack,
 		DUK_HSTRING_INCREF(thr, s);
 		tv++;
 
-		u32 = (duk_uint32_t) thr->compile_ctx->curr_token.start_line;  /* (flags<<32) + (line), flags = 0 */
+		u32 = (duk_uint32_t) thr->compile_ctx->curr_token.start_line; /* (flags<<32) + (line), flags = 0 */
 		DUK_TVAL_SET_U32(tv, u32);
 		tv++;
 	}
@@ -45891,13 +49210,15 @@ DUK_LOCAL void duk__add_traceback(duk_hthread *thr, duk_hthread *thr_callstack,
 
 	if (c_filename) {
 		DUK_ASSERT(DUK_TVAL_IS_STRING(thr->valstack_top - 2));
-		s = DUK_TVAL_GET_STRING(thr->valstack_top - 2);  /* interned c_filename */
+		s = DUK_TVAL_GET_STRING(thr->valstack_top - 2); /* interned c_filename */
 		DUK_ASSERT(s != NULL);
 		DUK_TVAL_SET_STRING(tv, s);
 		DUK_HSTRING_INCREF(thr, s);
 		tv++;
 
-		d = ((flags & DUK_AUGMENT_FLAG_NOBLAME_FILELINE) ? ((duk_double_t) DUK_TB_FLAG_NOBLAME_FILELINE) * DUK_DOUBLE_2TO32 : 0.0) +
+		d = ((flags & DUK_AUGMENT_FLAG_NOBLAME_FILELINE) ?
+                         ((duk_double_t) DUK_TB_FLAG_NOBLAME_FILELINE) * DUK_DOUBLE_2TO32 :
+                         0.0) +
 		    (duk_double_t) c_line;
 		DUK_TVAL_SET_DOUBLE(tv, d);
 		tv++;
@@ -45912,11 +49233,11 @@ DUK_LOCAL void duk__add_traceback(duk_hthread *thr, duk_hthread *thr_callstack,
 
 		/* [... arr] */
 
-		DUK_ASSERT(act != NULL);  /* depth check above, assumes book-keeping is correct */
-		DUK_ASSERT_DISABLE(act->pc >= 0);  /* unsigned */
+		DUK_ASSERT(act != NULL); /* depth check above, assumes book-keeping is correct */
+		DUK_ASSERT_DISABLE(act->pc >= 0); /* unsigned */
 
 		/* Add function object. */
-		tv_src = &act->tv_func;  /* object (function) or lightfunc */
+		tv_src = &act->tv_func; /* object (function) or lightfunc */
 		DUK_ASSERT(DUK_TVAL_IS_OBJECT(tv_src) || DUK_TVAL_IS_LIGHTFUNC(tv_src));
 		DUK_TVAL_SET_TVAL(tv, tv_src);
 		DUK_TVAL_INCREF(thr, tv);
@@ -45928,8 +49249,8 @@ DUK_LOCAL void duk__add_traceback(duk_hthread *thr, duk_hthread *thr_callstack,
 		 * PC == 0 for native code.
 		 */
 		pc = (duk_uint32_t) duk_hthread_get_act_prev_pc(thr_callstack, act);
-		DUK_ASSERT_DISABLE(pc >= 0);  /* unsigned */
-		DUK_ASSERT((duk_double_t) pc < DUK_DOUBLE_2TO32);  /* assume PC is at most 32 bits and non-negative */
+		DUK_ASSERT_DISABLE(pc >= 0); /* unsigned */
+		DUK_ASSERT((duk_double_t) pc < DUK_DOUBLE_2TO32); /* assume PC is at most 32 bits and non-negative */
 		d = ((duk_double_t) act->flags) * DUK_DOUBLE_2TO32 + (duk_double_t) pc;
 		DUK_TVAL_SET_DOUBLE(tv, d);
 		tv++;
@@ -45942,6 +49263,7 @@ DUK_LOCAL void duk__add_traceback(duk_hthread *thr, duk_hthread *thr_callstack,
 		DUK_ASSERT(a != NULL);
 		DUK_ASSERT((duk_uint32_t) (tv - DUK_HOBJECT_A_GET_BASE(thr->heap, (duk_hobject *) a)) == a->length);
 		DUK_ASSERT(a->length == (duk_uint32_t) arr_size);
+		DUK_ASSERT(duk_is_bare_object(thr, -1));
 	}
 #endif
 
@@ -45953,16 +49275,20 @@ DUK_LOCAL void duk__add_traceback(duk_hthread *thr, duk_hthread *thr_callstack,
 
 	/* [ ... error arr ] */
 
-	duk_xdef_prop_stridx_short_wec(thr, -2, DUK_STRIDX_INT_TRACEDATA);  /* -> [ ... error ] */
+	duk_xdef_prop_stridx_short_wec(thr, -2, DUK_STRIDX_INT_TRACEDATA); /* -> [ ... error ] */
 }
-#endif  /* DUK_USE_TRACEBACKS */
+#endif /* DUK_USE_TRACEBACKS */
 
 /*
  *  Add .fileName and .lineNumber to an error on the stack top.
  */
 
 #if defined(DUK_USE_AUGMENT_ERROR_CREATE) && !defined(DUK_USE_TRACEBACKS)
-DUK_LOCAL void duk__add_fileline(duk_hthread *thr, duk_hthread *thr_callstack, const char *c_filename, duk_int_t c_line, duk_small_uint_t flags) {
+DUK_LOCAL void duk__add_fileline(duk_hthread *thr,
+                                 duk_hthread *thr_callstack,
+                                 const char *c_filename,
+                                 duk_int_t c_line,
+                                 duk_small_uint_t flags) {
 #if defined(DUK_USE_ASSERTIONS)
 	duk_int_t entry_top;
 #endif
@@ -46000,7 +49326,7 @@ DUK_LOCAL void duk__add_fileline(duk_hthread *thr, duk_hthread *thr_callstack, c
 		duk_uint32_t ecma_line;
 		duk_activation *act;
 
-		DUK_ASSERT(thr_callstack->callstack_top <= DUK_INT_MAX);  /* callstack limits */
+		DUK_ASSERT(thr_callstack->callstack_top <= DUK_INT_MAX); /* callstack limits */
 		depth = DUK_USE_TRACEBACK_DEPTH;
 		if (depth > thr_callstack->callstack_top) {
 			depth = thr_callstack->callstack_top;
@@ -46019,10 +49345,12 @@ DUK_LOCAL void duk__add_fileline(duk_hthread *thr, duk_hthread *thr_callstack, c
 			/* PC points to next instruction, find offending PC,
 			 * PC == 0 for native code.
 			 */
-			pc = duk_hthread_get_act_prev_pc(thr, act);  /* thr argument only used for thr->heap, so specific thread doesn't matter */
+			pc = duk_hthread_get_act_prev_pc(
+			    thr,
+			    act); /* thr argument only used for thr->heap, so specific thread doesn't matter */
 			DUK_UNREF(pc);
-			DUK_ASSERT_DISABLE(pc >= 0);  /* unsigned */
-			DUK_ASSERT((duk_double_t) pc < DUK_DOUBLE_2TO32);  /* assume PC is at most 32 bits and non-negative */
+			DUK_ASSERT_DISABLE(pc >= 0); /* unsigned */
+			DUK_ASSERT((duk_double_t) pc < DUK_DOUBLE_2TO32); /* assume PC is at most 32 bits and non-negative */
 
 			duk_push_hobject(thr, func);
 
@@ -46043,7 +49371,7 @@ DUK_LOCAL void duk__add_fileline(duk_hthread *thr, duk_hthread *thr_callstack, c
 			} else {
 				/* Native function, no relevant lineNumber. */
 			}
-#endif  /* DUK_USE_PC2LINE */
+#endif /* DUK_USE_PC2LINE */
 			duk_push_u32(thr, ecma_line);
 
 			/* [ ... error func fileName lineNumber ] */
@@ -46062,7 +49390,7 @@ DUK_LOCAL void duk__add_fileline(duk_hthread *thr, duk_hthread *thr_callstack, c
 		duk_push_undefined(thr);
 	}
 
- define_props:
+define_props:
 	/* [ ... error lineNumber fileName ] */
 #if defined(DUK_USE_ASSERTIONS)
 	DUK_ASSERT(duk_get_top(thr) == entry_top + 2);
@@ -46070,7 +49398,7 @@ DUK_LOCAL void duk__add_fileline(duk_hthread *thr, duk_hthread *thr_callstack, c
 	duk_xdef_prop_stridx_short(thr, -3, DUK_STRIDX_FILE_NAME, DUK_PROPDESC_FLAGS_C | DUK_PROPDESC_FLAG_NO_OVERWRITE);
 	duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_LINE_NUMBER, DUK_PROPDESC_FLAGS_C | DUK_PROPDESC_FLAG_NO_OVERWRITE);
 }
-#endif  /* DUK_USE_AUGMENT_ERROR_CREATE && !DUK_USE_TRACEBACKS */
+#endif /* DUK_USE_AUGMENT_ERROR_CREATE && !DUK_USE_TRACEBACKS */
 
 /*
  *  Add line number to a compiler error.
@@ -46078,7 +49406,6 @@ DUK_LOCAL void duk__add_fileline(duk_hthread *thr, duk_hthread *thr_callstack, c
 
 #if defined(DUK_USE_AUGMENT_ERROR_CREATE)
 DUK_LOCAL void duk__add_compiler_error_line(duk_hthread *thr) {
-
 	/* Append a "(line NNN)" to the "message" property of any error
 	 * thrown during compilation.  Usually compilation errors are
 	 * SyntaxErrors but they can also be out-of-memory errors and
@@ -46093,21 +49420,41 @@ DUK_LOCAL void duk__add_compiler_error_line(duk_hthread *thr) {
 		return;
 	}
 
-	DUK_DDD(DUK_DDDPRINT("compile error, before adding line info: %!T",
-	                     (duk_tval *) duk_get_tval(thr, -1)));
+	DUK_DDD(DUK_DDDPRINT("compile error, before adding line info: %!T", (duk_tval *) duk_get_tval(thr, -1)));
 
 	if (duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_MESSAGE)) {
-		duk_push_sprintf(thr, " (line %ld)", (long) thr->compile_ctx->curr_token.start_line);
+		duk_bool_t at_end;
+
+		/* Best guesstimate that error occurred at end of input, token
+		 * truncated by end of input, etc.
+		 */
+#if 0
+		at_end = (thr->compile_ctx->curr_token.start_offset + 1 >= thr->compile_ctx->lex.input_length);
+		at_end = (thr->compile_ctx->lex.window[0].codepoint < 0 || thr->compile_ctx->lex.window[1].codepoint < 0);
+#endif
+		at_end = (thr->compile_ctx->lex.window[0].codepoint < 0);
+
+		DUK_D(DUK_DPRINT("syntax error, determined at_end=%ld; curr_token.start_offset=%ld, "
+		                 "lex.input_length=%ld, window[0].codepoint=%ld, window[1].codepoint=%ld",
+		                 (long) at_end,
+		                 (long) thr->compile_ctx->curr_token.start_offset,
+		                 (long) thr->compile_ctx->lex.input_length,
+		                 (long) thr->compile_ctx->lex.window[0].codepoint,
+		                 (long) thr->compile_ctx->lex.window[1].codepoint));
+
+		duk_push_sprintf(thr,
+		                 " (line %ld%s)",
+		                 (long) thr->compile_ctx->curr_token.start_line,
+		                 at_end ? ", end of input" : "");
 		duk_concat(thr, 2);
 		duk_put_prop_stridx_short(thr, -2, DUK_STRIDX_MESSAGE);
 	} else {
 		duk_pop(thr);
 	}
 
-	DUK_DDD(DUK_DDDPRINT("compile error, after adding line info: %!T",
-	                     (duk_tval *) duk_get_tval(thr, -1)));
+	DUK_DDD(DUK_DDDPRINT("compile error, after adding line info: %!T", (duk_tval *) duk_get_tval(thr, -1)));
 }
-#endif  /* DUK_USE_AUGMENT_ERROR_CREATE */
+#endif /* DUK_USE_AUGMENT_ERROR_CREATE */
 
 /*
  *  Augment an error being created using Duktape specific properties
@@ -46115,7 +49462,12 @@ DUK_LOCAL void duk__add_compiler_error_line(duk_hthread *thr) {
  */
 
 #if defined(DUK_USE_AUGMENT_ERROR_CREATE)
-DUK_LOCAL void duk__err_augment_builtin_create(duk_hthread *thr, duk_hthread *thr_callstack, const char *c_filename, duk_int_t c_line, duk_hobject *obj, duk_small_uint_t flags) {
+DUK_LOCAL void duk__err_augment_builtin_create(duk_hthread *thr,
+                                               duk_hthread *thr_callstack,
+                                               const char *c_filename,
+                                               duk_int_t c_line,
+                                               duk_hobject *obj,
+                                               duk_small_uint_t flags) {
 #if defined(DUK_USE_ASSERTIONS)
 	duk_int_t entry_top;
 #endif
@@ -46125,16 +49477,16 @@ DUK_LOCAL void duk__err_augment_builtin_create(duk_hthread *thr, duk_hthread *th
 #endif
 	DUK_ASSERT(obj != NULL);
 
-	DUK_UNREF(obj);  /* unreferenced w/o tracebacks */
+	DUK_UNREF(obj); /* unreferenced w/o tracebacks */
 
 	duk__add_compiler_error_line(thr);
 
 #if defined(DUK_USE_TRACEBACKS)
 	/* If tracebacks are enabled, the '_Tracedata' property is the only
 	 * thing we need: 'fileName' and 'lineNumber' are virtual properties
-	 * which use '_Tracedata'.
+	 * which use '_Tracedata'.  (Check _Tracedata only as own property.)
 	 */
-	if (duk_hobject_hasprop_raw(thr, obj, DUK_HTHREAD_STRING_INT_TRACEDATA(thr))) {
+	if (duk_hobject_find_entry_tval_ptr_stridx(thr->heap, obj, DUK_STRIDX_INT_TRACEDATA) != NULL) {
 		DUK_DDD(DUK_DDDPRINT("error value already has a '_Tracedata' property, not modifying it"));
 	} else {
 		duk__add_traceback(thr, thr_callstack, c_filename, c_line, flags);
@@ -46150,7 +49502,7 @@ DUK_LOCAL void duk__err_augment_builtin_create(duk_hthread *thr, duk_hthread *th
 	DUK_ASSERT(duk_get_top(thr) == entry_top);
 #endif
 }
-#endif  /* DUK_USE_AUGMENT_ERROR_CREATE */
+#endif /* DUK_USE_AUGMENT_ERROR_CREATE */
 
 /*
  *  Augment an error at creation time with _Tracedata/fileName/lineNumber
@@ -46168,7 +49520,11 @@ DUK_LOCAL void duk__err_augment_builtin_create(duk_hthread *thr, duk_hthread *th
  */
 
 #if defined(DUK_USE_AUGMENT_ERROR_CREATE)
-DUK_INTERNAL void duk_err_augment_error_create(duk_hthread *thr, duk_hthread *thr_callstack, const char *c_filename, duk_int_t c_line, duk_small_uint_t flags) {
+DUK_INTERNAL void duk_err_augment_error_create(duk_hthread *thr,
+                                               duk_hthread *thr_callstack,
+                                               const char *c_filename,
+                                               duk_int_t c_line,
+                                               duk_small_uint_t flags) {
 	duk_hobject *obj;
 
 	DUK_ASSERT(thr != NULL);
@@ -46214,7 +49570,7 @@ DUK_INTERNAL void duk_err_augment_error_create(duk_hthread *thr, duk_hthread *th
 	duk__err_augment_user(thr, DUK_STRIDX_ERR_CREATE);
 #endif
 }
-#endif  /* DUK_USE_AUGMENT_ERROR_CREATE */
+#endif /* DUK_USE_AUGMENT_ERROR_CREATE */
 
 /*
  *  Augment an error at throw time; allow a user error handler (if defined)
@@ -46226,9 +49582,9 @@ DUK_INTERNAL void duk_err_augment_error_create(duk_hthread *thr, duk_hthread *th
 DUK_INTERNAL void duk_err_augment_error_throw(duk_hthread *thr) {
 #if defined(DUK_USE_ERRTHROW)
 	duk__err_augment_user(thr, DUK_STRIDX_ERR_THROW);
-#endif  /* DUK_USE_ERRTHROW */
+#endif /* DUK_USE_ERRTHROW */
 }
-#endif  /* DUK_USE_AUGMENT_ERROR_THROW */
+#endif /* DUK_USE_AUGMENT_ERROR_THROW */
 /*
  *  Do a longjmp call, calling the fatal error handler if no
  *  catchpoint exists.
@@ -46278,8 +49634,10 @@ DUK_INTERNAL void duk_err_longjmp(duk_hthread *thr) {
 	DUK_ASSERT(thr->heap != NULL);
 
 	DUK_DD(DUK_DDPRINT("longjmp error: type=%d iserror=%d value1=%!T value2=%!T",
-	                   (int) thr->heap->lj.type, (int) thr->heap->lj.iserror,
-	                   &thr->heap->lj.value1, &thr->heap->lj.value2));
+	                   (int) thr->heap->lj.type,
+	                   (int) thr->heap->lj.iserror,
+	                   &thr->heap->lj.value1,
+	                   &thr->heap->lj.value2));
 
 	/* Prevent finalizer execution during error handling.  All error
 	 * handling sites will process pending finalizers once error handling
@@ -46297,11 +49655,11 @@ DUK_INTERNAL void duk_err_longjmp(duk_hthread *thr) {
 	DUK_ASSERT_LJSTATE_SET(thr->heap);
 
 	thr->heap->pf_prevent_count++;
-	DUK_ASSERT(thr->heap->pf_prevent_count != 0);  /* Wrap. */
+	DUK_ASSERT(thr->heap->pf_prevent_count != 0); /* Wrap. */
 
 #if defined(DUK_USE_ASSERTIONS)
 	/* XXX: set this immediately when longjmp state is set */
-	DUK_ASSERT(thr->heap->error_not_allowed == 0);  /* Detect error within critical section. */
+	DUK_ASSERT(thr->heap->error_not_allowed == 0); /* Detect error within critical section. */
 	thr->heap->error_not_allowed = 1;
 #endif
 
@@ -46313,8 +49671,10 @@ DUK_INTERNAL void duk_err_longjmp(duk_hthread *thr) {
 	 */
 	if (!thr->heap->lj.jmpbuf_ptr) {
 		DUK_D(DUK_DPRINT("uncaught error: type=%d iserror=%d value1=%!T value2=%!T",
-		                 (int) thr->heap->lj.type, (int) thr->heap->lj.iserror,
-		                 &thr->heap->lj.value1, &thr->heap->lj.value2));
+		                 (int) thr->heap->lj.type,
+		                 (int) thr->heap->lj.iserror,
+		                 &thr->heap->lj.value1,
+		                 &thr->heap->lj.value2));
 
 #if defined(DUK_USE_PREFER_SIZE)
 		duk__uncaught_minimal(thr);
@@ -46325,7 +49685,7 @@ DUK_INTERNAL void duk_err_longjmp(duk_hthread *thr) {
 	}
 
 #if defined(DUK_USE_CPP_EXCEPTIONS)
-	throw duk_internal_exception();  /* dummy */
+	throw duk_internal_exception(); /* dummy */
 #else
 	DUK_LONGJMP(thr->heap->lj.jmpbuf_ptr->jb);
 #endif
@@ -46360,14 +49720,14 @@ DUK_LOCAL duk_bool_t duk__have_active_catcher(duk_hthread *thr) {
 		for (act = thr->callstack_curr; act != NULL; act = act->parent) {
 			for (cat = act->cat; cat != NULL; cat = cat->parent) {
 				if (DUK_CAT_HAS_CATCH_ENABLED(cat)) {
-					return 1;  /* all we need to know */
+					return 1; /* all we need to know */
 				}
 			}
 		}
 	}
 	return 0;
 }
-#endif  /* DUK_USE_DEBUGGER_SUPPORT */
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
 
 /*
  *  Get prototype object for an integer error code.
@@ -46417,11 +49777,10 @@ DUK_INTERNAL void duk_err_check_debugger_integration(duk_hthread *thr) {
 	 * config options.
 	 */
 
-	if (!duk_debug_is_attached(thr->heap) ||
-	    thr->heap->dbg_processing ||
-	    thr->heap->lj.type != DUK_LJ_TYPE_THROW ||
+	if (!duk_debug_is_attached(thr->heap) || thr->heap->dbg_processing || thr->heap->lj.type != DUK_LJ_TYPE_THROW ||
 	    thr->heap->creating_error) {
-		DUK_D(DUK_DPRINT("skip debugger error integration; not attached, debugger processing, not THROW, or error thrown while creating error"));
+		DUK_D(DUK_DPRINT("skip debugger error integration; not attached, debugger processing, not THROW, or error thrown "
+		                 "while creating error"));
 		return;
 	}
 
@@ -46449,7 +49808,7 @@ DUK_INTERNAL void duk_err_check_debugger_integration(duk_hthread *thr) {
 	/* Store and reset longjmp state. */
 	DUK_ASSERT_LJSTATE_SET(thr->heap);
 	DUK_TVAL_DECREF_NORZ(thr, tv_obj);
-	DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(&thr->heap->lj.value2));  /* Always for THROW type. */
+	DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(&thr->heap->lj.value2)); /* Always for THROW type. */
 	DUK_TVAL_SET_UNDEFINED(tv_obj);
 	thr->heap->lj.type = DUK_LJ_TYPE_UNKNOWN;
 	DUK_ASSERT_LJSTATE_UNSET(thr->heap);
@@ -46484,7 +49843,7 @@ DUK_INTERNAL void duk_err_check_debugger_integration(duk_hthread *thr) {
 
 	duk_pop(thr);
 }
-#endif  /* DUK_USE_DEBUGGER_SUPPORT */
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
 
 /*
  *  Helpers for setting up heap longjmp state.
@@ -46529,14 +49888,20 @@ DUK_INTERNAL void duk_err_setup_ljstate1(duk_hthread *thr, duk_small_uint_t lj_t
  */
 
 #if defined(DUK_USE_VERBOSE_ERRORS)
-DUK_INTERNAL void duk_err_create_and_throw(duk_hthread *thr, duk_errcode_t code, const char *msg, const char *filename, duk_int_t line) {
+DUK_INTERNAL void duk_err_create_and_throw(duk_hthread *thr,
+                                           duk_errcode_t code,
+                                           const char *msg,
+                                           const char *filename,
+                                           duk_int_t line) {
 #else
 DUK_INTERNAL void duk_err_create_and_throw(duk_hthread *thr, duk_errcode_t code) {
 #endif
 #if defined(DUK_USE_VERBOSE_ERRORS)
 	DUK_DD(DUK_DDPRINT("duk_err_create_and_throw(): code=%ld, msg=%s, filename=%s, line=%ld",
-	                   (long) code, (const char *) msg,
-	                   (const char *) filename, (long) line));
+	                   (long) code,
+	                   (const char *) msg,
+	                   (const char *) filename,
+	                   (long) line));
 #else
 	DUK_DD(DUK_DDPRINT("duk_err_create_and_throw(): code=%ld", (long) code));
 #endif
@@ -46596,18 +49961,9 @@ DUK_INTERNAL void duk_err_create_and_throw(duk_hthread *thr, duk_errcode_t code)
 		 * use 'msg' as a format string directly.
 		 */
 #if defined(DUK_USE_VERBOSE_ERRORS)
-		duk_push_error_object_raw(thr,
-		                          code | DUK_ERRCODE_FLAG_NOBLAME_FILELINE,
-		                          filename,
-		                          line,
-		                          "%s",
-		                          (const char *) msg);
+		duk_push_error_object_raw(thr, code | DUK_ERRCODE_FLAG_NOBLAME_FILELINE, filename, line, "%s", (const char *) msg);
 #else
-		duk_push_error_object_raw(thr,
-		                          code | DUK_ERRCODE_FLAG_NOBLAME_FILELINE,
-		                          NULL,
-		                          0,
-		                          NULL);
+		duk_push_error_object_raw(thr, code | DUK_ERRCODE_FLAG_NOBLAME_FILELINE, NULL, 0, NULL);
 #endif
 
 		/* Note that an alloc error may happen during error augmentation.
@@ -46617,8 +49973,7 @@ DUK_INTERNAL void duk_err_create_and_throw(duk_hthread *thr, duk_errcode_t code)
 		 * avoiding it for alloc errors (this differs from Duktape 1.x).
 		 */
 #if defined(DUK_USE_AUGMENT_ERROR_THROW)
-		DUK_DDD(DUK_DDDPRINT("THROW ERROR (INTERNAL): %!iT (before throw augment)",
-		                     (duk_tval *) duk_get_tval(thr, -1)));
+		DUK_DDD(DUK_DDDPRINT("THROW ERROR (INTERNAL): %!iT (before throw augment)", (duk_tval *) duk_get_tval(thr, -1)));
 		duk_err_augment_error_throw(thr);
 #endif
 
@@ -46641,7 +49996,8 @@ DUK_INTERNAL void duk_err_create_and_throw(duk_hthread *thr, duk_errcode_t code)
 	 */
 
 	DUK_DDD(DUK_DDDPRINT("THROW ERROR (INTERNAL): %!iT, %!iT (after throw augment)",
-	                     (duk_tval *) &thr->heap->lj.value1, (duk_tval *) &thr->heap->lj.value2));
+	                     (duk_tval *) &thr->heap->lj.value1,
+	                     (duk_tval *) &thr->heap->lj.value2));
 
 	duk_err_longjmp(thr);
 	DUK_UNREACHABLE();
@@ -46695,7 +50051,7 @@ DUK_INTERNAL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk
 	 */
 	if (size > DUK_HBUFFER_MAX_BYTELEN) {
 		DUK_D(DUK_DPRINT("hbuffer alloc failed: size too large: %ld", (long) size));
-		return NULL;  /* no need to write 'out_bufdata' */
+		return NULL; /* no need to write 'out_bufdata' */
 	}
 
 	if (flags & DUK_BUF_FLAG_EXTERNAL) {
@@ -46707,7 +50063,7 @@ DUK_INTERNAL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk
 	} else {
 		header_size = sizeof(duk_hbuffer_fixed);
 		alloc_size = sizeof(duk_hbuffer_fixed) + size;
-		DUK_ASSERT(alloc_size >= sizeof(duk_hbuffer_fixed));  /* no wrapping */
+		DUK_ASSERT(alloc_size >= sizeof(duk_hbuffer_fixed)); /* no wrapping */
 	}
 
 	res = (duk_hbuffer *) DUK_ALLOC(heap, alloc_size);
@@ -46717,8 +50073,7 @@ DUK_INTERNAL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk
 
 	/* zero everything unless requested not to do so */
 #if defined(DUK_USE_ZERO_BUFFER_DATA)
-	duk_memzero((void *) res,
-	            (flags & DUK_BUF_FLAG_NOZERO) ? header_size : alloc_size);
+	duk_memzero((void *) res, (flags & DUK_BUF_FLAG_NOZERO) ? header_size : alloc_size);
 #else
 	duk_memzero((void *) res, header_size);
 #endif
@@ -46741,7 +50096,7 @@ DUK_INTERNAL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk
 		void *ptr;
 
 		if (size > 0) {
-			DUK_ASSERT(!(flags & DUK_BUF_FLAG_EXTERNAL));  /* alloc external with size zero */
+			DUK_ASSERT(!(flags & DUK_BUF_FLAG_EXTERNAL)); /* alloc external with size zero */
 			DUK_DDD(DUK_DDDPRINT("dynamic buffer with nonzero size, alloc actual buffer"));
 #if defined(DUK_USE_ZERO_BUFFER_DATA)
 			ptr = DUK_ALLOC_ZEROED(heap, size);
@@ -46781,16 +50136,16 @@ DUK_INTERNAL duk_hbuffer *duk_hbuffer_alloc(duk_heap *heap, duk_size_t size, duk
 	} else {
 		DUK_ASSERT(!(flags & DUK_BUF_FLAG_EXTERNAL));
 	}
-        DUK_HEAP_INSERT_INTO_HEAP_ALLOCATED(heap, &res->hdr);
+	DUK_HEAP_INSERT_INTO_HEAP_ALLOCATED(heap, &res->hdr);
 
 	DUK_DDD(DUK_DDDPRINT("allocated hbuffer: %p", (void *) res));
 	return res;
 
- alloc_error:
+alloc_error:
 	DUK_DD(DUK_DDPRINT("hbuffer allocation failed"));
 
 	DUK_FREE(heap, res);
-	return NULL;  /* no need to write 'out_bufdata' */
+	return NULL; /* no need to write 'out_bufdata' */
 }
 
 /* For indirect allocs. */
@@ -46801,6 +50156,19 @@ DUK_INTERNAL void *duk_hbuffer_get_dynalloc_ptr(duk_heap *heap, void *ud) {
 	return (void *) DUK_HBUFFER_DYNAMIC_GET_DATA_PTR(heap, buf);
 }
 /*
+ *  duk_hbuffer assertion helpers
+ */
+
+/* #include duk_internal.h -> already included */
+
+#if defined(DUK_USE_ASSERTIONS)
+
+DUK_INTERNAL void duk_hbuffer_assert_valid(duk_hbuffer *h) {
+	DUK_ASSERT(h != NULL);
+}
+
+#endif /* DUK_USE_ASSERTIONS */
+/*
  *  duk_hbuffer operations such as resizing and inserting/appending data to
  *  a dynamic buffer.
  */
@@ -46855,8 +50223,7 @@ DUK_INTERNAL void duk_hbuffer_resize(duk_hthread *thr, duk_hbuffer_dynamic *buf,
 		if (new_size > prev_size) {
 			DUK_ASSERT(new_size - prev_size > 0);
 #if defined(DUK_USE_ZERO_BUFFER_DATA)
-			duk_memzero((void *) ((char *) res + prev_size),
-			            (duk_size_t) (new_size - prev_size));
+			duk_memzero((void *) ((char *) res + prev_size), (duk_size_t) (new_size - prev_size));
 #endif
 		}
 
@@ -46897,7 +50264,7 @@ DUK_INTERNAL duk_uint_t duk_hbufobj_clamp_bytelength(duk_hbufobj *h_bufobj, duk_
 
 	return buf_avail >= len ? len : buf_avail;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 /*
  *  duk_heap allocation and freeing.
  */
@@ -46906,7 +50273,7 @@ DUK_INTERNAL duk_uint_t duk_hbufobj_clamp_bytelength(duk_hbufobj *h_bufobj, duk_
 
 #if defined(DUK_USE_ROM_STRINGS)
 /* Fixed seed value used with ROM strings. */
-#define DUK__FIXED_HASH_SEED       0xabcd1234
+#define DUK__FIXED_HASH_SEED 0xabcd1234
 #endif
 
 /*
@@ -46995,8 +50362,8 @@ DUK_INTERNAL void duk_free_hstring(duk_heap *heap, duk_hstring *h) {
 
 #if defined(DUK_USE_HSTRING_EXTDATA) && defined(DUK_USE_EXTSTR_FREE)
 	if (DUK_HSTRING_HAS_EXTDATA(h)) {
-		DUK_DDD(DUK_DDDPRINT("free extstr: hstring %!O, extdata: %p",
-		                     h, DUK_HSTRING_GET_EXTDATA((duk_hstring_external *) h)));
+		DUK_DDD(
+		    DUK_DDDPRINT("free extstr: hstring %!O, extdata: %p", h, DUK_HSTRING_GET_EXTDATA((duk_hstring_external *) h)));
 		DUK_USE_EXTSTR_FREE(heap->heap_udata, (const void *) DUK_HSTRING_GET_EXTDATA((duk_hstring_external *) h));
 	}
 #endif
@@ -47020,7 +50387,6 @@ DUK_INTERNAL void duk_heap_free_heaphdr_raw(duk_heap *heap, duk_heaphdr *hdr) {
 		DUK_ASSERT(DUK_HEAPHDR_GET_TYPE(hdr) == DUK_HTYPE_BUFFER);
 		duk_free_hbuffer(heap, (duk_hbuffer *) hdr);
 	}
-
 }
 
 /*
@@ -47050,10 +50416,10 @@ DUK_LOCAL duk_size_t duk__heap_free_activation_freelist(duk_heap *heap) {
 		count_act++;
 #endif
 	}
-	heap->activation_free = NULL;  /* needed when called from mark-and-sweep */
+	heap->activation_free = NULL; /* needed when called from mark-and-sweep */
 	return count_act;
 }
-#endif  /* DUK_USE_CACHE_ACTIVATION */
+#endif /* DUK_USE_CACHE_ACTIVATION */
 
 #if defined(DUK_USE_CACHE_CATCHER)
 DUK_LOCAL duk_size_t duk__heap_free_catcher_freelist(duk_heap *heap) {
@@ -47069,11 +50435,11 @@ DUK_LOCAL duk_size_t duk__heap_free_catcher_freelist(duk_heap *heap) {
 		count_cat++;
 #endif
 	}
-	heap->catcher_free = NULL;  /* needed when called from mark-and-sweep */
+	heap->catcher_free = NULL; /* needed when called from mark-and-sweep */
 
 	return count_cat;
 }
-#endif  /* DUK_USE_CACHE_CATCHER */
+#endif /* DUK_USE_CACHE_CATCHER */
 
 DUK_INTERNAL void duk_heap_free_freelists(duk_heap *heap) {
 	duk_size_t count_act = 0;
@@ -47089,8 +50455,8 @@ DUK_INTERNAL void duk_heap_free_freelists(duk_heap *heap) {
 	DUK_UNREF(count_act);
 	DUK_UNREF(count_cat);
 
-	DUK_D(DUK_DPRINT("freed %ld activation freelist entries, %ld catcher freelist entries",
-	                 (long) count_act, (long) count_cat));
+	DUK_D(
+	    DUK_DPRINT("freed %ld activation freelist entries, %ld catcher freelist entries", (long) count_act, (long) count_cat));
 }
 
 DUK_LOCAL void duk__free_allocated(duk_heap *heap) {
@@ -47103,8 +50469,7 @@ DUK_LOCAL void duk__free_allocated(duk_heap *heap) {
 		 * because they may happen with finalizer processing.
 		 */
 
-		DUK_DDD(DUK_DDDPRINT("FINALFREE (allocated): %!iO",
-		                     (duk_heaphdr *) curr));
+		DUK_DDD(DUK_DDDPRINT("FINALFREE (allocated): %!iO", (duk_heaphdr *) curr));
 		next = DUK_HEAPHDR_GET_NEXT(heap, curr);
 		duk_heap_free_heaphdr_raw(heap, curr);
 		curr = next;
@@ -47118,14 +50483,13 @@ DUK_LOCAL void duk__free_finalize_list(duk_heap *heap) {
 
 	curr = heap->finalize_list;
 	while (curr) {
-		DUK_DDD(DUK_DDDPRINT("FINALFREE (finalize_list): %!iO",
-		                     (duk_heaphdr *) curr));
+		DUK_DDD(DUK_DDDPRINT("FINALFREE (finalize_list): %!iO", (duk_heaphdr *) curr));
 		next = DUK_HEAPHDR_GET_NEXT(heap, curr);
 		duk_heap_free_heaphdr_raw(heap, curr);
 		curr = next;
 	}
 }
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 
 DUK_LOCAL void duk__free_stringtable(duk_heap *heap) {
 	/* strings are only tracked by stringtable */
@@ -47143,9 +50507,9 @@ DUK_LOCAL void duk__free_run_finalizers(duk_heap *heap) {
 	DUK_ASSERT(heap != NULL);
 
 #if defined(DUK_USE_REFERENCE_COUNTING)
-	DUK_ASSERT(heap->refzero_list == NULL);  /* refzero not running -> must be empty */
+	DUK_ASSERT(heap->refzero_list == NULL); /* refzero not running -> must be empty */
 #endif
-	DUK_ASSERT(heap->finalize_list == NULL);  /* mark-and-sweep last pass */
+	DUK_ASSERT(heap->finalize_list == NULL); /* mark-and-sweep last pass */
 
 	if (heap->heap_thread == NULL) {
 		/* May happen when heap allocation fails right off.  There
@@ -47156,19 +50520,23 @@ DUK_LOCAL void duk__free_run_finalizers(duk_heap *heap) {
 	}
 
 	/* Prevent finalize_list processing and mark-and-sweep entirely.
-	 * Setting ms_running = 1 also prevents refzero handling from moving
-	 * objects away from the heap_allocated list (the flag name is a bit
-	 * misleading here).
+	 * Setting ms_running != 0 also prevents refzero handling from moving
+	 * objects away from the heap_allocated list.  The flag name is a bit
+	 * misleading here.
+	 *
+	 * Use a distinct value for ms_running here (== 2) so that assertions
+	 * can detect this situation separate from the normal runtime
+	 * mark-and-sweep case.  This allows better assertions (GH-2030).
 	 */
 	DUK_ASSERT(heap->pf_prevent_count == 0);
-	heap->pf_prevent_count = 1;
 	DUK_ASSERT(heap->ms_running == 0);
-	heap->ms_running = 1;
 	DUK_ASSERT(heap->ms_prevent_count == 0);
-	heap->ms_prevent_count = 1;  /* Bump, because mark-and-sweep assumes it's bumped when ms_running is set. */
+	heap->pf_prevent_count = 1;
+	heap->ms_running = 2; /* Use distinguishable value. */
+	heap->ms_prevent_count = 1; /* Bump, because mark-and-sweep assumes it's bumped when ms_running is set. */
 
-	curr_limit = 0;  /* suppress warning, not used */
-	for (round_no = 0; ; round_no++) {
+	curr_limit = 0; /* suppress warning, not used */
+	for (round_no = 0;; round_no++) {
 		curr = heap->heap_allocated;
 		count_all = 0;
 		count_finalized = 0;
@@ -47183,7 +50551,8 @@ DUK_LOCAL void duk__free_run_finalizers(duk_heap *heap) {
 
 				if (DUK_HOBJECT_HAS_FINALIZER_FAST(heap, (duk_hobject *) curr)) {
 					if (!DUK_HEAPHDR_HAS_FINALIZED((duk_heaphdr *) curr)) {
-						DUK_ASSERT(DUK_HEAP_HAS_FINALIZER_NORESCUE(heap));  /* maps to finalizer 2nd argument */
+						DUK_ASSERT(
+						    DUK_HEAP_HAS_FINALIZER_NORESCUE(heap)); /* maps to finalizer 2nd argument */
 						duk_heap_run_finalizer(heap, (duk_hobject *) curr);
 						count_finalized++;
 					}
@@ -47210,10 +50579,13 @@ DUK_LOCAL void duk__free_run_finalizers(duk_heap *heap) {
 			 */
 			curr_limit = count_all * 2;
 		} else {
-			curr_limit = (curr_limit * 3) / 4;   /* Decrease by 25% every round */
+			curr_limit = (curr_limit * 3) / 4; /* Decrease by 25% every round */
 		}
 		DUK_D(DUK_DPRINT("finalizer round %ld complete, %ld objects, tried to execute %ld finalizers, current limit is %ld",
-		                 (long) round_no, (long) count_all, (long) count_finalized, (long) curr_limit));
+		                 (long) round_no,
+		                 (long) count_all,
+		                 (long) count_finalized,
+		                 (long) curr_limit));
 
 		if (count_finalized == 0) {
 			DUK_D(DUK_DPRINT("no more finalizable objects, forced finalization finished"));
@@ -47225,12 +50597,12 @@ DUK_LOCAL void duk__free_run_finalizers(duk_heap *heap) {
 		}
 	}
 
-	DUK_ASSERT(heap->ms_running == 1);
-	heap->ms_running = 0;
+	DUK_ASSERT(heap->ms_running == 2);
 	DUK_ASSERT(heap->pf_prevent_count == 1);
+	heap->ms_running = 0;
 	heap->pf_prevent_count = 0;
 }
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 
 DUK_INTERNAL void duk_heap_free(duk_heap *heap) {
 	DUK_D(DUK_DPRINT("free heap: %p", (void *) heap));
@@ -47273,7 +50645,7 @@ DUK_INTERNAL void duk_heap_free(duk_heap *heap) {
 	duk_heap_mark_and_sweep(heap, 0);
 	DUK_D(DUK_DPRINT("forced gc #3 in heap destruction (don't run finalizers)"));
 	heap->pf_skip_finalizers = 1;
-	duk_heap_mark_and_sweep(heap, 0);  /* Skip finalizers; queue finalizable objects to heap_allocated. */
+	duk_heap_mark_and_sweep(heap, 0); /* Skip finalizers; queue finalizable objects to heap_allocated. */
 
 	/* There are never objects in refzero_list at this point, or at any
 	 * point beyond a DECREF (even a DECREF_NORZ).  Since Duktape 2.1
@@ -47282,17 +50654,17 @@ DUK_INTERNAL void duk_heap_free(duk_heap *heap) {
 	 * refcount.
 	 */
 #if defined(DUK_USE_REFERENCE_COUNTING)
-	DUK_ASSERT(heap->refzero_list == NULL);  /* Always processed to completion inline. */
+	DUK_ASSERT(heap->refzero_list == NULL); /* Always processed to completion inline. */
 #endif
 #if defined(DUK_USE_FINALIZER_SUPPORT)
-	DUK_ASSERT(heap->finalize_list == NULL);  /* Last mark-and-sweep with skip_finalizers. */
+	DUK_ASSERT(heap->finalize_list == NULL); /* Last mark-and-sweep with skip_finalizers. */
 #endif
 
 #if defined(DUK_USE_FINALIZER_SUPPORT)
 	DUK_D(DUK_DPRINT("run finalizers for remaining finalizable objects"));
-	DUK_HEAP_SET_FINALIZER_NORESCUE(heap);  /* Rescue no longer supported. */
+	DUK_HEAP_SET_FINALIZER_NORESCUE(heap); /* Rescue no longer supported. */
 	duk__free_run_finalizers(heap);
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 
 	/* Note: heap->heap_thread, heap->curr_thread, and heap->heap_object
 	 * are on the heap allocated list.
@@ -47305,7 +50677,7 @@ DUK_INTERNAL void duk_heap_free(duk_heap *heap) {
 	duk__free_allocated(heap);
 
 #if defined(DUK_USE_REFERENCE_COUNTING)
-	DUK_ASSERT(heap->refzero_list == NULL);  /* Always processed to completion inline. */
+	DUK_ASSERT(heap->refzero_list == NULL); /* Always processed to completion inline. */
 #endif
 
 #if defined(DUK_USE_FINALIZER_SUPPORT)
@@ -47348,7 +50720,9 @@ DUK_LOCAL duk_bool_t duk__init_heap_strings(duk_heap *heap) {
 		while (h != NULL) {
 			hash = duk_heap_hashstring(heap, (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h), DUK_HSTRING_GET_BYTELEN(h));
 			DUK_DD(DUK_DDPRINT("duk_rom_strings_lookup[%d] -> hash 0x%08lx, computed 0x%08lx",
-			                   (int) i, (unsigned long) DUK_HSTRING_GET_HASH(h), (unsigned long) hash));
+			                   (int) i,
+			                   (unsigned long) DUK_HSTRING_GET_HASH(h),
+			                   (unsigned long) hash));
 			DUK_ASSERT(hash == (duk_uint32_t) DUK_HSTRING_GET_HASH(h));
 
 			h = (const duk_hstring *) h->hdr.h_next;
@@ -47357,11 +50731,11 @@ DUK_LOCAL duk_bool_t duk__init_heap_strings(duk_heap *heap) {
 #endif
 	return 1;
 }
-#else  /* DUK_USE_ROM_STRINGS */
+#else /* DUK_USE_ROM_STRINGS */
 
 DUK_LOCAL duk_bool_t duk__init_heap_strings(duk_heap *heap) {
 	duk_bitdecoder_ctx bd_ctx;
-	duk_bitdecoder_ctx *bd = &bd_ctx;  /* convenience */
+	duk_bitdecoder_ctx *bd = &bd_ctx; /* convenience */
 	duk_small_uint_t i;
 
 	duk_memzero(&bd_ctx, sizeof(bd_ctx));
@@ -47417,18 +50791,16 @@ DUK_LOCAL duk_bool_t duk__init_heap_strings(duk_heap *heap) {
 
 	return 1;
 
- failed:
+failed:
 	return 0;
 }
-#endif  /* DUK_USE_ROM_STRINGS */
+#endif /* DUK_USE_ROM_STRINGS */
 
 DUK_LOCAL duk_bool_t duk__init_heap_thread(duk_heap *heap) {
 	duk_hthread *thr;
 
 	DUK_D(DUK_DPRINT("heap init: alloc heap thread"));
-	thr = duk_hthread_alloc_unchecked(heap,
-	                                  DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                                  DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_THREAD));
+	thr = duk_hthread_alloc_unchecked(heap, DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_THREAD));
 	if (thr == NULL) {
 		DUK_D(DUK_DPRINT("failed to alloc heap_thread"));
 		return 0;
@@ -47436,16 +50808,16 @@ DUK_LOCAL duk_bool_t duk__init_heap_thread(duk_heap *heap) {
 	thr->state = DUK_HTHREAD_STATE_INACTIVE;
 #if defined(DUK_USE_ROM_STRINGS)
 	/* No strs[] pointer. */
-#else  /* DUK_USE_ROM_STRINGS */
+#else /* DUK_USE_ROM_STRINGS */
 #if defined(DUK_USE_HEAPPTR16)
 	thr->strs16 = heap->strs16;
 #else
 	thr->strs = heap->strs;
 #endif
-#endif  /* DUK_USE_ROM_STRINGS */
+#endif /* DUK_USE_ROM_STRINGS */
 
 	heap->heap_thread = thr;
-	DUK_HTHREAD_INCREF(thr, thr);  /* Note: first argument not really used */
+	DUK_HTHREAD_INCREF(thr, thr); /* Note: first argument not really used */
 
 	/* 'thr' is now reachable */
 
@@ -47464,7 +50836,8 @@ DUK_LOCAL duk_bool_t duk__init_heap_thread(duk_heap *heap) {
 }
 
 #if defined(DUK_USE_DEBUG)
-#define DUK__DUMPSZ(t)  do { \
+#define DUK__DUMPSZ(t) \
+	do { \
 		DUK_D(DUK_DPRINT("" #t "=%ld", (long) sizeof(t))); \
 	} while (0)
 
@@ -47473,20 +50846,20 @@ DUK_LOCAL duk_bool_t duk__init_heap_thread(duk_heap *heap) {
  * enough; the limits will then not be printed accurately but the magnitude
  * will be correct.
  */
-#define DUK__DUMPLM_SIGNED_RAW(t,a,b)  do { \
-		DUK_D(DUK_DPRINT(t "=[%ld,%ld]=[%lf,%lf]", \
-		                 (long) (a), (long) (b), \
-		                 (double) (a), (double) (b))); \
+#define DUK__DUMPLM_SIGNED_RAW(t, a, b) \
+	do { \
+		DUK_D(DUK_DPRINT(t "=[%ld,%ld]=[%lf,%lf]", (long) (a), (long) (b), (double) (a), (double) (b))); \
 	} while (0)
-#define DUK__DUMPLM_UNSIGNED_RAW(t,a,b)  do { \
-		DUK_D(DUK_DPRINT(t "=[%lu,%lu]=[%lf,%lf]", \
-		                 (unsigned long) (a), (unsigned long) (b), \
-		                 (double) (a), (double) (b))); \
+#define DUK__DUMPLM_UNSIGNED_RAW(t, a, b) \
+	do { \
+		DUK_D(DUK_DPRINT(t "=[%lu,%lu]=[%lf,%lf]", (unsigned long) (a), (unsigned long) (b), (double) (a), (double) (b))); \
 	} while (0)
-#define DUK__DUMPLM_SIGNED(t)  do { \
+#define DUK__DUMPLM_SIGNED(t) \
+	do { \
 		DUK__DUMPLM_SIGNED_RAW("DUK_" #t "_{MIN,MAX}", DUK_##t##_MIN, DUK_##t##_MAX); \
 	} while (0)
-#define DUK__DUMPLM_UNSIGNED(t)  do { \
+#define DUK__DUMPLM_UNSIGNED(t) \
+	do { \
 		DUK__DUMPLM_UNSIGNED_RAW("DUK_" #t "_{MIN,MAX}", DUK_##t##_MIN, DUK_##t##_MAX); \
 	} while (0)
 
@@ -47559,7 +50932,7 @@ DUK_LOCAL void duk__dump_type_sizes(void) {
 	DUK__DUMPSZ(duk_tval);
 
 	/* structs from duk_forwdecl.h */
-	DUK__DUMPSZ(duk_jmpbuf);  /* just one 'int' for C++ exceptions */
+	DUK__DUMPSZ(duk_jmpbuf); /* just one 'int' for C++ exceptions */
 	DUK__DUMPSZ(duk_heaphdr);
 	DUK__DUMPSZ(duk_heaphdr_string);
 	DUK__DUMPSZ(duk_hstring);
@@ -47683,7 +51056,7 @@ DUK_LOCAL void duk__dump_misc_options(void) {
 	DUK_D(DUK_DPRINT("IEEE double endianness: ???"));
 #endif
 }
-#endif  /* DUK_USE_DEBUG */
+#endif /* DUK_USE_DEBUG */
 
 DUK_INTERNAL
 duk_heap *duk_heap_alloc(duk_alloc_function alloc_func,
@@ -47704,7 +51077,7 @@ duk_heap *duk_heap_alloc(duk_alloc_function alloc_func,
 
 	DUK_ASSERT((DUK_HTYPE_STRING & 0x01U) == 0);
 	DUK_ASSERT((DUK_HTYPE_BUFFER & 0x01U) == 0);
-	DUK_ASSERT((DUK_HTYPE_OBJECT & 0x01U) == 1);  /* DUK_HEAPHDR_IS_OBJECT() relies ont his. */
+	DUK_ASSERT((DUK_HTYPE_OBJECT & 0x01U) == 1); /* DUK_HEAPHDR_IS_OBJECT() relies ont his. */
 
 	/*
 	 *  Debug dump type sizes
@@ -47745,7 +51118,7 @@ duk_heap *duk_heap_alloc(duk_alloc_function alloc_func,
 #endif
 		fatal_func(heap_udata, "sizeof(duk_tval) not 8 or 16, cannot use DUK_USE_EXEC_REGCONST_OPTIMIZE option");
 	}
-#endif  /* DUK_USE_EXEC_REGCONST_OPTIMIZE */
+#endif /* DUK_USE_EXEC_REGCONST_OPTIMIZE */
 
 	/*
 	 *  Computed values (e.g. INFINITY)
@@ -47829,18 +51202,18 @@ duk_heap *duk_heap_alloc(duk_alloc_function alloc_func,
 #endif
 #if defined(DUK_USE_ROM_STRINGS)
 	/* no res->strs[] */
-#else  /* DUK_USE_ROM_STRINGS */
+#else /* DUK_USE_ROM_STRINGS */
 #if defined(DUK_USE_HEAPPTR16)
 	/* res->strs16[] is zeroed and zero decodes to NULL, so no NULL inits. */
 #else
 	{
 		duk_small_uint_t i;
-	        for (i = 0; i < DUK_HEAP_NUM_STRINGS; i++) {
+		for (i = 0; i < DUK_HEAP_NUM_STRINGS; i++) {
 			res->strs[i] = NULL;
-	        }
+		}
 	}
 #endif
-#endif  /* DUK_USE_ROM_STRINGS */
+#endif /* DUK_USE_ROM_STRINGS */
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
 	res->dbg_read_cb = NULL;
 	res->dbg_write_cb = NULL;
@@ -47851,7 +51224,7 @@ duk_heap *duk_heap_alloc(duk_alloc_function alloc_func,
 	res->dbg_udata = NULL;
 	res->dbg_pause_act = NULL;
 #endif
-#endif  /* DUK_USE_EXPLICIT_NULL_INIT */
+#endif /* DUK_USE_EXPLICIT_NULL_INIT */
 
 	res->alloc_func = alloc_func;
 	res->realloc_func = realloc_func;
@@ -47890,17 +51263,17 @@ duk_heap *duk_heap_alloc(duk_alloc_function alloc_func,
 	/* XXX: make a common DUK_USE_ option, and allow custom fixed seed? */
 	DUK_D(DUK_DPRINT("using rom strings, force heap hash_seed to fixed value 0x%08lx", (long) DUK__FIXED_HASH_SEED));
 	res->hash_seed = (duk_uint32_t) DUK__FIXED_HASH_SEED;
-#else  /* DUK_USE_ROM_STRINGS */
+#else /* DUK_USE_ROM_STRINGS */
 	res->hash_seed = (duk_uint32_t) (duk_uintptr_t) res;
 #if !defined(DUK_USE_STRHASH_DENSE)
-	res->hash_seed ^= 5381;  /* Bernstein hash init value is normally 5381; XOR it in in case pointer low bits are 0 */
+	res->hash_seed ^= 5381; /* Bernstein hash init value is normally 5381; XOR it in in case pointer low bits are 0 */
 #endif
-#endif  /* DUK_USE_ROM_STRINGS */
+#endif /* DUK_USE_ROM_STRINGS */
 
 #if defined(DUK_USE_EXPLICIT_NULL_INIT)
 	res->lj.jmpbuf_ptr = NULL;
 #endif
-	DUK_ASSERT(res->lj.type == DUK_LJ_TYPE_UNKNOWN);  /* zero */
+	DUK_ASSERT(res->lj.type == DUK_LJ_TYPE_UNKNOWN); /* zero */
 	DUK_ASSERT(res->lj.iserror == 0);
 	DUK_TVAL_SET_UNDEFINED(&res->lj.value1);
 	DUK_TVAL_SET_UNDEFINED(&res->lj.value2);
@@ -47936,14 +51309,14 @@ duk_heap *duk_heap_alloc(duk_alloc_function alloc_func,
 #if defined(DUK_USE_EXPLICIT_NULL_INIT)
 	{
 		duk_uint32_t i;
-	        for (i = 0; i < st_initsize; i++) {
+		for (i = 0; i < st_initsize; i++) {
 			res->strtable[i] = NULL;
-	        }
+		}
 	}
 #else
 	duk_memzero(res->strtable, sizeof(duk_hstring *) * st_initsize);
-#endif  /* DUK_USE_EXPLICIT_NULL_INIT */
-#endif  /* DUK_USE_STRTAB_PTRCOMP */
+#endif /* DUK_USE_EXPLICIT_NULL_INIT */
+#endif /* DUK_USE_STRTAB_PTRCOMP */
 
 	/*
 	 *  Init stringcache
@@ -47973,7 +51346,7 @@ duk_heap *duk_heap_alloc(duk_alloc_function alloc_func,
 		}
 	}
 #endif
-#endif  /* DUK_USE_LITCACHE_SIZE */
+#endif /* DUK_USE_LITCACHE_SIZE */
 
 	/* XXX: error handling is incomplete.  It would be cleanest if
 	 * there was a setjmp catchpoint, so that all init code could
@@ -48014,9 +51387,9 @@ duk_heap *duk_heap_alloc(duk_alloc_function alloc_func,
 #endif
 	DUK_D(DUK_DPRINT("heap init: initialize heap object"));
 	DUK_ASSERT(res->heap_thread != NULL);
-	res->heap_object = duk_hobject_alloc_unchecked(res, DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                                                    DUK_HOBJECT_FLAG_FASTREFS |
-	                                                    DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJECT));
+	res->heap_object = duk_hobject_alloc_unchecked(res,
+	                                               DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS |
+	                                                   DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJECT));
 	if (res->heap_object == NULL) {
 		goto failed;
 	}
@@ -48032,8 +51405,8 @@ duk_heap *duk_heap_alloc(duk_alloc_function alloc_func,
 	duk_util_tinyrandom_prepare_seed(res->heap_thread);
 #else
 	res->rnd_state[0] = (duk_uint64_t) duk_time_get_ecmascript_time(res->heap_thread);
-	DUK_ASSERT(res->rnd_state[1] == 0);  /* Not filled here, filled in by seed preparation. */
-#if 0  /* Manual test values matching misc/xoroshiro128plus_test.c. */
+	DUK_ASSERT(res->rnd_state[1] == 0); /* Not filled here, filled in by seed preparation. */
+#if 0 /* Manual test values matching misc/xoroshiro128plus_test.c. */
 	res->rnd_state[0] = DUK_U64_CONSTANT(0xdeadbeef12345678);
 	res->rnd_state[1] = DUK_U64_CONSTANT(0xcafed00d12345678);
 #endif
@@ -48085,7 +51458,7 @@ duk_heap *duk_heap_alloc(duk_alloc_function alloc_func,
 	DUK_D(DUK_DPRINT("allocated heap: %p", (void *) res));
 	return res;
 
- failed:
+failed:
 	DUK_D(DUK_DPRINT("heap allocation failed"));
 
 	if (res != NULL) {
@@ -48145,14 +51518,14 @@ DUK_LOCAL duk_ret_t duk__fake_global_finalizer(duk_hthread *thr) {
 
 	/* Inner function call, error throw. */
 	duk_eval_string_noresult(thr,
-		"(function dummy() {\n"
-		"    dummy.prototype = null;  /* break reference loop */\n"
-		"    try {\n"
-		"        throw 'fake-finalizer-dummy-error';\n"
-		"    } catch (e) {\n"
-		"        void e;\n"
-		"    }\n"
-		"})()");
+	                         "(function dummy() {\n"
+	                         "    dummy.prototype = null;  /* break reference loop */\n"
+	                         "    try {\n"
+	                         "        throw 'fake-finalizer-dummy-error';\n"
+	                         "    } catch (e) {\n"
+	                         "        void e;\n"
+	                         "    }\n"
+	                         "})()");
 
 	/* The above creates garbage (e.g. a function instance).  Because
 	 * the function/prototype reference loop is broken, it gets collected
@@ -48184,7 +51557,7 @@ DUK_LOCAL void duk__run_global_torture_finalizer(duk_hthread *thr) {
 	(void) duk_pcall(thr, 0 /*nargs*/);
 	duk_pop(thr);
 }
-#endif  /* DUK_USE_FINALIZER_TORTURE */
+#endif /* DUK_USE_FINALIZER_TORTURE */
 
 /*
  *  Process the finalize_list to completion.
@@ -48296,12 +51669,13 @@ DUK_INTERNAL void duk_heap_process_finalize_list(duk_heap *heap) {
 
 		DUK_DD(DUK_DDPRINT("processing finalize_list entry: %p -> %!iO", (void *) curr, curr));
 
-		DUK_ASSERT(DUK_HEAPHDR_GET_TYPE(curr) == DUK_HTYPE_OBJECT);  /* Only objects have finalizers. */
+		DUK_ASSERT(DUK_HEAPHDR_GET_TYPE(curr) == DUK_HTYPE_OBJECT); /* Only objects have finalizers. */
 		DUK_ASSERT(!DUK_HEAPHDR_HAS_REACHABLE(curr));
 		DUK_ASSERT(!DUK_HEAPHDR_HAS_TEMPROOT(curr));
-		DUK_ASSERT(DUK_HEAPHDR_HAS_FINALIZABLE(curr));  /* All objects on finalize_list will have this flag (except object being finalized right now). */
-		DUK_ASSERT(!DUK_HEAPHDR_HAS_FINALIZED(curr));   /* Queueing code ensures. */
-		DUK_ASSERT(!DUK_HEAPHDR_HAS_READONLY(curr));  /* ROM objects never get freed (or finalized). */
+		DUK_ASSERT(DUK_HEAPHDR_HAS_FINALIZABLE(
+		    curr)); /* All objects on finalize_list will have this flag (except object being finalized right now). */
+		DUK_ASSERT(!DUK_HEAPHDR_HAS_FINALIZED(curr)); /* Queueing code ensures. */
+		DUK_ASSERT(!DUK_HEAPHDR_HAS_READONLY(curr)); /* ROM objects never get freed (or finalized). */
 
 #if defined(DUK_USE_ASSERTIONS)
 		DUK_ASSERT(heap->currently_finalizing == NULL);
@@ -48329,11 +51703,11 @@ DUK_INTERNAL void duk_heap_process_finalize_list(duk_heap *heap) {
 			 */
 #if defined(DUK_USE_REFERENCE_COUNTING)
 			DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT(curr) >= 1);
-			had_zero_refcount = (DUK_HEAPHDR_GET_REFCOUNT(curr) == 1);  /* Preincremented on finalize_list insert. */
+			had_zero_refcount = (DUK_HEAPHDR_GET_REFCOUNT(curr) == 1); /* Preincremented on finalize_list insert. */
 #endif
 
 			DUK_ASSERT(!DUK_HEAPHDR_HAS_FINALIZED(curr));
-			duk_heap_run_finalizer(heap, (duk_hobject *) curr);  /* must never longjmp */
+			duk_heap_run_finalizer(heap, (duk_hobject *) curr); /* must never longjmp */
 			DUK_ASSERT(DUK_HEAPHDR_HAS_FINALIZED(curr));
 			/* XXX: assert that object is still in finalize_list
 			 * when duk_push_heapptr() allows automatic rescue.
@@ -48341,12 +51715,14 @@ DUK_INTERNAL void duk_heap_process_finalize_list(duk_heap *heap) {
 
 #if defined(DUK_USE_REFERENCE_COUNTING)
 			DUK_DD(DUK_DDPRINT("refcount after finalizer (includes bump): %ld", (long) DUK_HEAPHDR_GET_REFCOUNT(curr)));
-			if (DUK_HEAPHDR_GET_REFCOUNT(curr) == 1) {  /* Only artificial bump in refcount? */
+			if (DUK_HEAPHDR_GET_REFCOUNT(curr) == 1) { /* Only artificial bump in refcount? */
 #if defined(DUK_USE_DEBUG)
 				if (had_zero_refcount) {
-					DUK_DD(DUK_DDPRINT("finalized object's refcount is zero -> free immediately (refcount queued)"));
+					DUK_DD(DUK_DDPRINT(
+					    "finalized object's refcount is zero -> free immediately (refcount queued)"));
 				} else {
-					DUK_DD(DUK_DDPRINT("finalized object's refcount is zero -> free immediately (mark-and-sweep queued)"));
+					DUK_DD(DUK_DDPRINT(
+					    "finalized object's refcount is zero -> free immediately (mark-and-sweep queued)"));
 				}
 #endif
 				queue_back = 0;
@@ -48396,21 +51772,21 @@ DUK_INTERNAL void duk_heap_process_finalize_list(duk_heap *heap) {
 			 * decision.
 			 */
 			DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT(curr) >= 1);
-			DUK_HEAPHDR_PREDEC_REFCOUNT(curr);  /* Remove artificial refcount bump. */
+			DUK_HEAPHDR_PREDEC_REFCOUNT(curr); /* Remove artificial refcount bump. */
 			DUK_HEAPHDR_CLEAR_FINALIZABLE(curr);
 			DUK_HEAP_INSERT_INTO_HEAP_ALLOCATED(heap, curr);
 		} else {
 			/* No need to remove the refcount bump here. */
-			DUK_ASSERT(DUK_HEAPHDR_GET_TYPE(curr) == DUK_HTYPE_OBJECT);  /* currently, always the case */
+			DUK_ASSERT(DUK_HEAPHDR_GET_TYPE(curr) == DUK_HTYPE_OBJECT); /* currently, always the case */
 			DUK_DD(DUK_DDPRINT("refcount finalize after finalizer call: %!O", curr));
 			duk_hobject_refcount_finalize_norz(heap, (duk_hobject *) curr);
 			duk_free_hobject(heap, (duk_hobject *) curr);
 			DUK_DD(DUK_DDPRINT("freed hobject after finalization: %p", (void *) curr));
 		}
-#else  /* DUK_USE_REFERENCE_COUNTING */
+#else /* DUK_USE_REFERENCE_COUNTING */
 		DUK_HEAPHDR_CLEAR_FINALIZABLE(curr);
 		DUK_HEAP_INSERT_INTO_HEAP_ALLOCATED(heap, curr);
-#endif  /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_REFERENCE_COUNTING */
 
 #if defined(DUK_USE_DEBUG)
 		count++;
@@ -48476,11 +51852,11 @@ DUK_LOCAL duk_ret_t duk__finalize_helper(duk_hthread *thr, void *udata) {
 	 * caller must ensure that this function is not called if the target is
 	 * a Proxy.
 	 */
-	duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_INT_FINALIZER);  /* -> [... obj finalizer] */
+	duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_INT_FINALIZER); /* -> [... obj finalizer] */
 	duk_dup_m2(thr);
 	duk_push_boolean(thr, DUK_HEAP_HAS_FINALIZER_NORESCUE(thr->heap));
 	DUK_DDD(DUK_DDDPRINT("calling finalizer"));
-	duk_call(thr, 2);  /* [ ... obj finalizer obj heapDestruct ]  -> [ ... obj retval ] */
+	duk_call(thr, 2); /* [ ... obj finalizer obj heapDestruct ]  -> [ ... obj retval ] */
 	DUK_DDD(DUK_DDDPRINT("finalizer returned successfully"));
 	return 0;
 
@@ -48529,7 +51905,7 @@ DUK_INTERNAL void duk_heap_run_finalizer(duk_heap *heap, duk_hobject *obj) {
 		return;
 	}
 #endif
-	DUK_HEAPHDR_SET_FINALIZED((duk_heaphdr *) obj);  /* ensure never re-entered until rescue cycle complete */
+	DUK_HEAPHDR_SET_FINALIZED((duk_heaphdr *) obj); /* ensure never re-entered until rescue cycle complete */
 
 #if defined(DUK_USE_ES6_PROXY)
 	if (DUK_HOBJECT_IS_PROXY(obj)) {
@@ -48541,29 +51917,30 @@ DUK_INTERNAL void duk_heap_run_finalizer(duk_heap *heap, duk_hobject *obj) {
 		DUK_D(DUK_DPRINT("object is a Proxy, skip finalizer call"));
 		return;
 	}
-#endif  /* DUK_USE_ES6_PROXY */
+#endif /* DUK_USE_ES6_PROXY */
 
-	duk_push_hobject(thr, obj);  /* this also increases refcount by one */
-	rc = duk_safe_call(thr, duk__finalize_helper, NULL /*udata*/, 0 /*nargs*/, 1 /*nrets*/);  /* -> [... obj retval/error] */
-	DUK_ASSERT_TOP(thr, entry_top + 2);  /* duk_safe_call discipline */
+	duk_push_hobject(thr, obj); /* this also increases refcount by one */
+	rc = duk_safe_call(thr, duk__finalize_helper, NULL /*udata*/, 0 /*nargs*/, 1 /*nrets*/); /* -> [... obj retval/error] */
+	DUK_ASSERT_TOP(thr, entry_top + 2); /* duk_safe_call discipline */
 
 	if (rc != DUK_EXEC_SUCCESS) {
 		/* Note: we ask for one return value from duk_safe_call to get this
 		 * error debugging here.
 		 */
 		DUK_D(DUK_DPRINT("wrapped finalizer call failed for object %p (ignored); error: %!T",
-		                 (void *) obj, (duk_tval *) duk_get_tval(thr, -1)));
+		                 (void *) obj,
+		                 (duk_tval *) duk_get_tval(thr, -1)));
 	}
-	duk_pop_2(thr);  /* -> [...] */
+	duk_pop_2(thr); /* -> [...] */
 
 	DUK_ASSERT_TOP(thr, entry_top);
 }
 
-#else  /* DUK_USE_FINALIZER_SUPPORT */
+#else /* DUK_USE_FINALIZER_SUPPORT */
 
 /* nothing */
 
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 /*
  *  String hash computation (interning).
  *
@@ -48587,9 +51964,9 @@ DUK_INTERNAL void duk_heap_run_finalizer(duk_heap *heap, duk_hobject *obj) {
 
 #if defined(DUK_USE_STRHASH_DENSE)
 /* Constants for duk_hashstring(). */
-#define DUK__STRHASH_SHORTSTRING   4096L
-#define DUK__STRHASH_MEDIUMSTRING  (256L * 1024L)
-#define DUK__STRHASH_BLOCKSIZE     256L
+#define DUK__STRHASH_SHORTSTRING  4096L
+#define DUK__STRHASH_MEDIUMSTRING (256L * 1024L)
+#define DUK__STRHASH_BLOCKSIZE    256L
 
 DUK_INTERNAL duk_uint32_t duk_heap_hashstring(duk_heap *heap, const duk_uint8_t *str, duk_size_t len) {
 	duk_uint32_t hash;
@@ -48646,7 +52023,7 @@ DUK_INTERNAL duk_uint32_t duk_heap_hashstring(duk_heap *heap, const duk_uint8_t
 #endif
 	return hash;
 }
-#else  /* DUK_USE_STRHASH_DENSE */
+#else /* DUK_USE_STRHASH_DENSE */
 DUK_INTERNAL duk_uint32_t duk_heap_hashstring(duk_heap *heap, const duk_uint8_t *str, duk_size_t len) {
 	duk_uint32_t hash;
 	duk_size_t step;
@@ -48664,10 +52041,10 @@ DUK_INTERNAL duk_uint32_t duk_heap_hashstring(duk_heap *heap, const duk_uint8_t
 	 * more often in the suffix than in the prefix.
 	 */
 
-	hash = heap->hash_seed ^ ((duk_uint32_t) len);  /* Bernstein hash init value is normally 5381 */
+	hash = heap->hash_seed ^ ((duk_uint32_t) len); /* Bernstein hash init value is normally 5381 */
 	step = (len >> DUK_USE_STRHASH_SKIP_SHIFT) + 1;
 	for (off = len; off >= step; off -= step) {
-		DUK_ASSERT(off >= 1);  /* off >= step, and step >= 1 */
+		DUK_ASSERT(off >= 1); /* off >= step, and step >= 1 */
 		hash = (hash * 33) + str[off - 1];
 	}
 
@@ -48679,7 +52056,7 @@ DUK_INTERNAL duk_uint32_t duk_heap_hashstring(duk_heap *heap, const duk_uint8_t
 #endif
 	return hash;
 }
-#endif  /* DUK_USE_STRHASH_DENSE */
+#endif /* DUK_USE_STRHASH_DENSE */
 
 /* automatic undefs */
 #undef DUK__STRHASH_BLOCKSIZE
@@ -48706,6 +52083,7 @@ DUK_LOCAL void duk__mark_hstring(duk_heap *heap, duk_hstring *h) {
 
 	DUK_DDD(DUK_DDDPRINT("duk__mark_hstring: %p", (void *) h));
 	DUK_ASSERT(h);
+	DUK_HSTRING_ASSERT_VALID(h);
 
 	/* nothing to process */
 }
@@ -48716,6 +52094,7 @@ DUK_LOCAL void duk__mark_hobject(duk_heap *heap, duk_hobject *h) {
 	DUK_DDD(DUK_DDDPRINT("duk__mark_hobject: %p", (void *) h));
 
 	DUK_ASSERT(h);
+	DUK_HOBJECT_ASSERT_VALID(h);
 
 	/* XXX: use advancing pointers instead of index macros -> faster and smaller? */
 
@@ -48756,7 +52135,7 @@ DUK_LOCAL void duk__mark_hobject(duk_heap *heap, duk_hobject *h) {
 		duk_tval *tv, *tv_end;
 		duk_hobject **fn, **fn_end;
 
-		DUK_ASSERT_HCOMPFUNC_VALID(f);
+		DUK_HCOMPFUNC_ASSERT_VALID(f);
 
 		/* 'data' is reachable through every compiled function which
 		 * contains a reference.
@@ -48786,39 +52165,39 @@ DUK_LOCAL void duk__mark_hobject(duk_heap *heap, duk_hobject *h) {
 		}
 	} else if (DUK_HOBJECT_IS_DECENV(h)) {
 		duk_hdecenv *e = (duk_hdecenv *) h;
-		DUK_ASSERT_HDECENV_VALID(e);
+		DUK_HDECENV_ASSERT_VALID(e);
 		duk__mark_heaphdr(heap, (duk_heaphdr *) e->thread);
 		duk__mark_heaphdr(heap, (duk_heaphdr *) e->varmap);
 	} else if (DUK_HOBJECT_IS_OBJENV(h)) {
 		duk_hobjenv *e = (duk_hobjenv *) h;
-		DUK_ASSERT_HOBJENV_VALID(e);
+		DUK_HOBJENV_ASSERT_VALID(e);
 		duk__mark_heaphdr_nonnull(heap, (duk_heaphdr *) e->target);
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
 	} else if (DUK_HOBJECT_IS_BUFOBJ(h)) {
 		duk_hbufobj *b = (duk_hbufobj *) h;
-		DUK_ASSERT_HBUFOBJ_VALID(b);
+		DUK_HBUFOBJ_ASSERT_VALID(b);
 		duk__mark_heaphdr(heap, (duk_heaphdr *) b->buf);
 		duk__mark_heaphdr(heap, (duk_heaphdr *) b->buf_prop);
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 	} else if (DUK_HOBJECT_IS_BOUNDFUNC(h)) {
 		duk_hboundfunc *f = (duk_hboundfunc *) (void *) h;
-		DUK_ASSERT_HBOUNDFUNC_VALID(f);
+		DUK_HBOUNDFUNC_ASSERT_VALID(f);
 		duk__mark_tval(heap, &f->target);
 		duk__mark_tval(heap, &f->this_binding);
 		duk__mark_tvals(heap, f->args, f->nargs);
 #if defined(DUK_USE_ES6_PROXY)
 	} else if (DUK_HOBJECT_IS_PROXY(h)) {
 		duk_hproxy *p = (duk_hproxy *) h;
-		DUK_ASSERT_HPROXY_VALID(p);
+		DUK_HPROXY_ASSERT_VALID(p);
 		duk__mark_heaphdr_nonnull(heap, (duk_heaphdr *) p->target);
 		duk__mark_heaphdr_nonnull(heap, (duk_heaphdr *) p->handler);
-#endif  /* DUK_USE_ES6_PROXY */
+#endif /* DUK_USE_ES6_PROXY */
 	} else if (DUK_HOBJECT_IS_THREAD(h)) {
 		duk_hthread *t = (duk_hthread *) h;
 		duk_activation *act;
 		duk_tval *tv;
 
-		DUK_ASSERT_HTHREAD_VALID(t);
+		DUK_HTHREAD_ASSERT_VALID(t);
 
 		tv = t->valstack;
 		while (tv < t->valstack_top) {
@@ -48833,7 +52212,7 @@ DUK_LOCAL void duk__mark_hobject(duk_heap *heap, duk_hobject *h) {
 #if defined(DUK_USE_NONSTD_FUNC_CALLER_PROPERTY)
 			duk__mark_heaphdr(heap, (duk_heaphdr *) act->prev_caller);
 #endif
-#if 0  /* nothing now */
+#if 0 /* nothing now */
 			for (cat = act->cat; cat != NULL; cat = cat->parent) {
 			}
 #endif
@@ -48856,20 +52235,20 @@ DUK_LOCAL void duk__mark_hobject(duk_heap *heap, duk_hobject *h) {
 
 /* Mark any duk_heaphdr type.  Recursion tracking happens only here. */
 DUK_LOCAL void duk__mark_heaphdr(duk_heap *heap, duk_heaphdr *h) {
-	DUK_DDD(DUK_DDDPRINT("duk__mark_heaphdr %p, type %ld",
-	                     (void *) h,
-	                     (h != NULL ? (long) DUK_HEAPHDR_GET_TYPE(h) : (long) -1)));
+	DUK_DDD(
+	    DUK_DDDPRINT("duk__mark_heaphdr %p, type %ld", (void *) h, (h != NULL ? (long) DUK_HEAPHDR_GET_TYPE(h) : (long) -1)));
 
 	/* XXX: add non-null variant? */
 	if (h == NULL) {
 		return;
 	}
 
+	DUK_HEAPHDR_ASSERT_VALID(h);
 	DUK_ASSERT(!DUK_HEAPHDR_HAS_READONLY(h) || DUK_HEAPHDR_HAS_REACHABLE(h));
 
 #if defined(DUK_USE_ASSERTIONS) && defined(DUK_USE_REFERENCE_COUNTING)
 	if (!DUK_HEAPHDR_HAS_READONLY(h)) {
-		h->h_assert_refcount++;  /* Comparison refcount: bump even if already reachable. */
+		h->h_assert_refcount++; /* Comparison refcount: bump even if already reachable. */
 	}
 #endif
 	if (DUK_HEAPHDR_HAS_REACHABLE(h)) {
@@ -48893,7 +52272,7 @@ DUK_LOCAL void duk__mark_heaphdr(duk_heap *heap, duk_heaphdr *h) {
 	}
 
 	heap->ms_recursion_depth++;
-	DUK_ASSERT(heap->ms_recursion_depth != 0);  /* Wrap. */
+	DUK_ASSERT(heap->ms_recursion_depth != 0); /* Wrap. */
 
 	switch (DUK_HEAPHDR_GET_TYPE(h)) {
 	case DUK_HTYPE_STRING:
@@ -48919,6 +52298,7 @@ DUK_LOCAL void duk__mark_tval(duk_heap *heap, duk_tval *tv) {
 	if (tv == NULL) {
 		return;
 	}
+	DUK_TVAL_ASSERT_VALID(tv);
 	if (DUK_TVAL_IS_HEAP_ALLOCATED(tv)) {
 		duk_heaphdr *h;
 		h = DUK_TVAL_GET_HEAPHDR(tv);
@@ -48931,6 +52311,7 @@ DUK_LOCAL void duk__mark_tvals(duk_heap *heap, duk_tval *tv, duk_idx_t count) {
 	DUK_ASSERT(count == 0 || tv != NULL);
 
 	while (count-- > 0) {
+		DUK_TVAL_ASSERT_VALID(tv);
 		if (DUK_TVAL_IS_HEAP_ALLOCATED(tv)) {
 			duk_heaphdr *h;
 			h = DUK_TVAL_GET_HEAPHDR(tv);
@@ -49006,9 +52387,7 @@ DUK_LOCAL void duk__mark_finalizable(duk_heap *heap) {
 		 * of a _Finalizer hidden symbol.
 		 */
 
-		if (!DUK_HEAPHDR_HAS_REACHABLE(hdr) &&
-		    DUK_HEAPHDR_IS_OBJECT(hdr) &&
-		    !DUK_HEAPHDR_HAS_FINALIZED(hdr) &&
+		if (!DUK_HEAPHDR_HAS_REACHABLE(hdr) && DUK_HEAPHDR_IS_OBJECT(hdr) && !DUK_HEAPHDR_HAS_FINALIZED(hdr) &&
 		    DUK_HOBJECT_HAS_FINALIZER_FAST(heap, (duk_hobject *) hdr)) {
 			/* heaphdr:
 			 *  - is not reachable
@@ -49033,8 +52412,7 @@ DUK_LOCAL void duk__mark_finalizable(duk_heap *heap) {
 		return;
 	}
 
-	DUK_DD(DUK_DDPRINT("marked %ld heap objects as finalizable, now mark them reachable",
-	                   (long) count_finalizable));
+	DUK_DD(DUK_DDPRINT("marked %ld heap objects as finalizable, now mark them reachable", (long) count_finalizable));
 
 	hdr = heap->heap_allocated;
 	while (hdr != NULL) {
@@ -49047,7 +52425,7 @@ DUK_LOCAL void duk__mark_finalizable(duk_heap *heap) {
 
 	/* Caller will finish the marking process if we hit a recursion limit. */
 }
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 
 /*
  *  Mark objects on finalize_list.
@@ -49078,7 +52456,7 @@ DUK_LOCAL void duk__mark_finalize_list(duk_heap *heap) {
 	}
 #endif
 }
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 
 /*
  *  Fallback marking handler if recursion limit is reached.
@@ -49111,9 +52489,9 @@ DUK_LOCAL void duk__handle_temproot(duk_heap *heap, duk_heaphdr *hdr) {
 
 	DUK_DDD(DUK_DDDPRINT("found a temp root: %p", (void *) hdr));
 	DUK_HEAPHDR_CLEAR_TEMPROOT(hdr);
-	DUK_HEAPHDR_CLEAR_REACHABLE(hdr);  /* Done so that duk__mark_heaphdr() works correctly. */
+	DUK_HEAPHDR_CLEAR_REACHABLE(hdr); /* Done so that duk__mark_heaphdr() works correctly. */
 #if defined(DUK_USE_ASSERTIONS) && defined(DUK_USE_REFERENCE_COUNTING)
-	hdr->h_assert_refcount--;  /* Same node visited twice. */
+	hdr->h_assert_refcount--; /* Same node visited twice. */
 #endif
 	duk__mark_heaphdr_nonnull(heap, hdr);
 
@@ -49208,7 +52586,7 @@ DUK_LOCAL void duk__finalize_refcounts(duk_heap *heap) {
 		hdr = DUK_HEAPHDR_GET_NEXT(heap, hdr);
 	}
 }
-#endif  /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_REFERENCE_COUNTING */
 
 /*
  *  Clear (reachable) flags of finalize_list.
@@ -49231,15 +52609,14 @@ DUK_LOCAL void duk__clear_finalize_list_flags(duk_heap *heap) {
 	while (hdr) {
 		DUK_HEAPHDR_CLEAR_REACHABLE(hdr);
 #if defined(DUK_USE_ASSERTIONS)
-		DUK_ASSERT(DUK_HEAPHDR_HAS_FINALIZABLE(hdr) || \
-		           (heap->currently_finalizing == hdr));
+		DUK_ASSERT(DUK_HEAPHDR_HAS_FINALIZABLE(hdr) || (heap->currently_finalizing == hdr));
 #endif
 		/* DUK_HEAPHDR_FLAG_FINALIZED may be set. */
 		DUK_ASSERT(!DUK_HEAPHDR_HAS_TEMPROOT(hdr));
 		hdr = DUK_HEAPHDR_GET_NEXT(heap, hdr);
 	}
 }
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 
 /*
  *  Sweep stringtable.
@@ -49275,8 +52652,7 @@ DUK_LOCAL void duk__sweep_stringtable(duk_heap *heap, duk_size_t *out_count_keep
 			duk_hstring *next;
 			next = h->hdr.h_next;
 
-			if (DUK_HEAPHDR_HAS_REACHABLE((duk_heaphdr *) h))
-			{
+			if (DUK_HEAPHDR_HAS_REACHABLE((duk_heaphdr *) h)) {
 				DUK_HEAPHDR_CLEAR_REACHABLE((duk_heaphdr *) h);
 				count_keep++;
 				prev = h;
@@ -49303,8 +52679,8 @@ DUK_LOCAL void duk__sweep_stringtable(duk_heap *heap, duk_size_t *out_count_keep
 				 * should have decreased unreachable string refcounts to zero
 				 * (even for cycles).  However, pinned strings have a +1 bump.
 				 */
-				DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT((duk_heaphdr *) h) ==
-				           DUK_HSTRING_HAS_PINNED_LITERAL(h) ? 1U : 0U);
+				DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT((duk_heaphdr *) h) == DUK_HSTRING_HAS_PINNED_LITERAL(h) ? 1U :
+                                                                                                                              0U);
 #endif
 
 				/* Deal with weak references first. */
@@ -49325,10 +52701,9 @@ DUK_LOCAL void duk__sweep_stringtable(duk_heap *heap, duk_size_t *out_count_keep
 		}
 	}
 
- done:
+done:
 #if defined(DUK_USE_DEBUG)
-	DUK_D(DUK_DPRINT("mark-and-sweep sweep stringtable: %ld freed, %ld kept",
-	                 (long) count_free, (long) count_keep));
+	DUK_D(DUK_DPRINT("mark-and-sweep sweep stringtable: %ld freed, %ld kept", (long) count_free, (long) count_keep));
 #endif
 	*out_count_keep = count_keep;
 }
@@ -49338,7 +52713,7 @@ DUK_LOCAL void duk__sweep_stringtable(duk_heap *heap, duk_size_t *out_count_keep
  */
 
 DUK_LOCAL void duk__sweep_heap(duk_heap *heap, duk_small_uint_t flags, duk_size_t *out_count_keep) {
-	duk_heaphdr *prev;  /* last element that was left in the heap */
+	duk_heaphdr *prev; /* last element that was left in the heap */
 	duk_heaphdr *curr;
 	duk_heaphdr *next;
 #if defined(DUK_USE_DEBUG)
@@ -49381,25 +52756,28 @@ DUK_LOCAL void duk__sweep_heap(duk_heap *heap, duk_small_uint_t flags, duk_size_
 				DUK_DD(DUK_DDPRINT("sweep; reachable, finalizable --> move to finalize_list: %p", (void *) curr));
 
 #if defined(DUK_USE_REFERENCE_COUNTING)
-				DUK_HEAPHDR_PREINC_REFCOUNT(curr);  /* Bump refcount so that refzero never occurs when pending a finalizer call. */
+				DUK_HEAPHDR_PREINC_REFCOUNT(
+				    curr); /* Bump refcount so that refzero never occurs when pending a finalizer call. */
 #endif
 				DUK_HEAP_INSERT_INTO_FINALIZE_LIST(heap, curr);
 #if defined(DUK_USE_DEBUG)
 				count_finalize++;
 #endif
-			}
-			else
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+			} else
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 			{
 				if (DUK_UNLIKELY(DUK_HEAPHDR_HAS_FINALIZED(curr))) {
 					DUK_ASSERT(!DUK_HEAPHDR_HAS_FINALIZABLE(curr));
 					DUK_ASSERT(DUK_HEAPHDR_GET_TYPE(curr) == DUK_HTYPE_OBJECT);
 
 					if (flags & DUK_MS_FLAG_POSTPONE_RESCUE) {
-						DUK_DD(DUK_DDPRINT("sweep; reachable, finalized, but postponing rescue decisions --> keep object (with FINALIZED set): %!iO", curr));
+						DUK_DD(DUK_DDPRINT("sweep; reachable, finalized, but postponing rescue decisions "
+						                   "--> keep object (with FINALIZED set): %!iO",
+						                   curr));
 						count_keep++;
 					} else {
-						DUK_DD(DUK_DDPRINT("sweep; reachable, finalized --> rescued after finalization: %p", (void *) curr));
+						DUK_DD(DUK_DDPRINT("sweep; reachable, finalized --> rescued after finalization: %p",
+						                   (void *) curr));
 #if defined(DUK_USE_FINALIZER_SUPPORT)
 						DUK_HEAPHDR_CLEAR_FINALIZED(curr);
 #endif
@@ -49422,8 +52800,8 @@ DUK_LOCAL void duk__sweep_heap(duk_heap *heap, duk_small_uint_t flags, duk_size_
 #if defined(DUK_USE_DOUBLE_LINKED_HEAP)
 				DUK_HEAPHDR_SET_PREV(heap, curr, prev);
 #endif
-				DUK_ASSERT_HEAPHDR_LINKS(heap, prev);
-				DUK_ASSERT_HEAPHDR_LINKS(heap, curr);
+				DUK_HEAPHDR_ASSERT_LINKS(heap, prev);
+				DUK_HEAPHDR_ASSERT_LINKS(heap, curr);
 				prev = curr;
 			}
 
@@ -49468,7 +52846,8 @@ DUK_LOCAL void duk__sweep_heap(duk_heap *heap, duk_small_uint_t flags, duk_size_
 
 #if defined(DUK_USE_DEBUG)
 			if (DUK_HEAPHDR_HAS_FINALIZED(curr)) {
-				DUK_DD(DUK_DDPRINT("sweep; unreachable, finalized --> finalized object not rescued: %p", (void *) curr));
+				DUK_DD(DUK_DDPRINT("sweep; unreachable, finalized --> finalized object not rescued: %p",
+				                   (void *) curr));
 			} else {
 				DUK_DD(DUK_DDPRINT("sweep; not reachable --> free: %p", (void *) curr));
 			}
@@ -49498,11 +52877,14 @@ DUK_LOCAL void duk__sweep_heap(duk_heap *heap, duk_small_uint_t flags, duk_size_
 	if (prev != NULL) {
 		DUK_HEAPHDR_SET_NEXT(heap, prev, NULL);
 	}
-	DUK_ASSERT_HEAPHDR_LINKS(heap, prev);
+	DUK_HEAPHDR_ASSERT_LINKS(heap, prev);
 
 #if defined(DUK_USE_DEBUG)
 	DUK_D(DUK_DPRINT("mark-and-sweep sweep objects (non-string): %ld freed, %ld kept, %ld rescued, %ld queued for finalization",
-	                 (long) count_free, (long) count_keep, (long) count_rescue, (long) count_finalize));
+	                 (long) count_free,
+	                 (long) count_keep,
+	                 (long) count_rescue,
+	                 (long) count_finalize));
 #endif
 	*out_count_keep = count_keep;
 }
@@ -49525,7 +52907,7 @@ DUK_LOCAL void duk__wipe_litcache(duk_heap *heap) {
 		e++;
 	}
 }
-#endif  /* DUK_USE_LITCACHE_SIZE */
+#endif /* DUK_USE_LITCACHE_SIZE */
 
 /*
  *  Object compaction.
@@ -49544,7 +52926,12 @@ DUK_LOCAL int duk__protected_compact_object(duk_hthread *thr, void *udata) {
 }
 
 #if defined(DUK_USE_DEBUG)
-DUK_LOCAL void duk__compact_object_list(duk_heap *heap, duk_hthread *thr, duk_heaphdr *start, duk_size_t *p_count_check, duk_size_t *p_count_compact, duk_size_t *p_count_bytes_saved) {
+DUK_LOCAL void duk__compact_object_list(duk_heap *heap,
+                                        duk_hthread *thr,
+                                        duk_heaphdr *start,
+                                        duk_size_t *p_count_check,
+                                        duk_size_t *p_count_compact,
+                                        duk_size_t *p_count_bytes_saved) {
 #else
 DUK_LOCAL void duk__compact_object_list(duk_heap *heap, duk_hthread *thr, duk_heaphdr *start) {
 #endif
@@ -49566,9 +52953,8 @@ DUK_LOCAL void duk__compact_object_list(duk_heap *heap, duk_hthread *thr, duk_he
 		obj = (duk_hobject *) curr;
 
 #if defined(DUK_USE_DEBUG)
-		old_size = DUK_HOBJECT_P_COMPUTE_SIZE(DUK_HOBJECT_GET_ESIZE(obj),
-		                                      DUK_HOBJECT_GET_ASIZE(obj),
-		                                      DUK_HOBJECT_GET_HSIZE(obj));
+		old_size =
+		    DUK_HOBJECT_P_COMPUTE_SIZE(DUK_HOBJECT_GET_ESIZE(obj), DUK_HOBJECT_GET_ASIZE(obj), DUK_HOBJECT_GET_HSIZE(obj));
 #endif
 
 		DUK_DD(DUK_DDPRINT("compact object: %p", (void *) obj));
@@ -49577,9 +52963,8 @@ DUK_LOCAL void duk__compact_object_list(duk_heap *heap, duk_hthread *thr, duk_he
 		duk_safe_call(thr, duk__protected_compact_object, NULL, 1, 0);
 
 #if defined(DUK_USE_DEBUG)
-		new_size = DUK_HOBJECT_P_COMPUTE_SIZE(DUK_HOBJECT_GET_ESIZE(obj),
-		                                      DUK_HOBJECT_GET_ASIZE(obj),
-		                                      DUK_HOBJECT_GET_HSIZE(obj));
+		new_size =
+		    DUK_HOBJECT_P_COMPUTE_SIZE(DUK_HOBJECT_GET_ESIZE(obj), DUK_HOBJECT_GET_ASIZE(obj), DUK_HOBJECT_GET_HSIZE(obj));
 #endif
 
 #if defined(DUK_USE_DEBUG)
@@ -49587,7 +52972,7 @@ DUK_LOCAL void duk__compact_object_list(duk_heap *heap, duk_hthread *thr, duk_he
 		(*p_count_bytes_saved) += (duk_size_t) (old_size - new_size);
 #endif
 
-	 next:
+	next:
 		curr = DUK_HEAPHDR_GET_NEXT(heap, curr);
 #if defined(DUK_USE_DEBUG)
 		(*p_count_check)++;
@@ -49619,12 +53004,14 @@ DUK_LOCAL void duk__compact_objects(duk_heap *heap) {
 #endif
 #endif
 #if defined(DUK_USE_REFERENCE_COUNTING)
-	DUK_ASSERT(heap->refzero_list == NULL);  /* Always handled to completion inline in DECREF. */
+	DUK_ASSERT(heap->refzero_list == NULL); /* Always handled to completion inline in DECREF. */
 #endif
 
 #if defined(DUK_USE_DEBUG)
 	DUK_D(DUK_DPRINT("mark-and-sweep compact objects: %ld checked, %ld compaction attempts, %ld bytes saved by compaction",
-	                 (long) count_check, (long) count_compact, (long) count_bytes_saved));
+	                 (long) count_check,
+	                 (long) count_compact,
+	                 (long) count_bytes_saved));
 #endif
 }
 
@@ -49633,67 +53020,19 @@ DUK_LOCAL void duk__compact_objects(duk_heap *heap) {
  */
 
 #if defined(DUK_USE_ASSERTIONS)
-DUK_LOCAL void duk__assert_heaphdr_flags(duk_heap *heap) {
-	duk_heaphdr *hdr;
-
-	hdr = heap->heap_allocated;
-	while (hdr) {
-		DUK_ASSERT(!DUK_HEAPHDR_HAS_REACHABLE(hdr));
-		DUK_ASSERT(!DUK_HEAPHDR_HAS_TEMPROOT(hdr));
-		DUK_ASSERT(!DUK_HEAPHDR_HAS_FINALIZABLE(hdr));
-		/* may have FINALIZED */
-		hdr = DUK_HEAPHDR_GET_NEXT(heap, hdr);
-	}
-
-#if defined(DUK_USE_REFERENCE_COUNTING)
-	DUK_ASSERT(heap->refzero_list == NULL);  /* Always handled to completion inline in DECREF. */
-#endif
-}
+typedef void (*duk__gc_heaphdr_assert)(duk_heap *heap, duk_heaphdr *h);
+typedef void (*duk__gc_hstring_assert)(duk_heap *heap, duk_hstring *h);
 
-#if defined(DUK_USE_REFERENCE_COUNTING)
-DUK_LOCAL void duk__assert_valid_refcounts(duk_heap *heap) {
-	duk_heaphdr *hdr = heap->heap_allocated;
-	while (hdr) {
-		/* Cannot really assert much w.r.t. refcounts now. */
-
-		if (DUK_HEAPHDR_GET_REFCOUNT(hdr) == 0 &&
-		    DUK_HEAPHDR_HAS_FINALIZED(hdr)) {
-			/* An object may be in heap_allocated list with a zero
-			 * refcount if it has just been finalized and is waiting
-			 * to be collected by the next cycle.
-			 * (This doesn't currently happen however.)
-			 */
-		} else if (DUK_HEAPHDR_GET_REFCOUNT(hdr) == 0) {
-			/* An object may be in heap_allocated list with a zero
-			 * refcount also if it is a temporary object created
-			 * during debugger paused state.  It will get collected
-			 * by mark-and-sweep based on its reachability status
-			 * (presumably not reachable because refcount is 0).
-			 */
-		}
-		DUK_ASSERT_DISABLE(DUK_HEAPHDR_GET_REFCOUNT(hdr) >= 0);  /* Unsigned. */
-		hdr = DUK_HEAPHDR_GET_NEXT(heap, hdr);
+DUK_LOCAL void duk__assert_walk_list(duk_heap *heap, duk_heaphdr *start, duk__gc_heaphdr_assert func) {
+	duk_heaphdr *curr;
+	for (curr = start; curr != NULL; curr = DUK_HEAPHDR_GET_NEXT(heap, curr)) {
+		func(heap, curr);
 	}
 }
 
-DUK_LOCAL void duk__clear_assert_refcounts(duk_heap *heap) {
-	duk_heaphdr *curr;
+DUK_LOCAL void duk__assert_walk_strtable(duk_heap *heap, duk__gc_hstring_assert func) {
 	duk_uint32_t i;
 
-	for (curr = heap->heap_allocated; curr != NULL; curr = DUK_HEAPHDR_GET_NEXT(heap, curr)) {
-		curr->h_assert_refcount = 0;
-	}
-#if defined(DUK_USE_FINALIZER_SUPPORT)
-	for (curr = heap->finalize_list; curr != NULL; curr = DUK_HEAPHDR_GET_NEXT(heap, curr)) {
-		curr->h_assert_refcount = 0;
-	}
-#endif
-#if defined(DUK_USE_REFERENCE_COUNTING)
-	for (curr = heap->refzero_list; curr != NULL; curr = DUK_HEAPHDR_GET_NEXT(heap, curr)) {
-		curr->h_assert_refcount = 0;
-	}
-#endif
-
 	for (i = 0; i < heap->st_size; i++) {
 		duk_hstring *h;
 
@@ -49703,12 +53042,92 @@ DUK_LOCAL void duk__clear_assert_refcounts(duk_heap *heap) {
 		h = heap->strtable[i];
 #endif
 		while (h != NULL) {
-			((duk_heaphdr *) h)->h_assert_refcount = 0;
+			func(heap, h);
 			h = h->hdr.h_next;
 		}
 	}
 }
 
+DUK_LOCAL void duk__assert_heaphdr_flags_cb(duk_heap *heap, duk_heaphdr *h) {
+	DUK_UNREF(heap);
+	DUK_ASSERT(!DUK_HEAPHDR_HAS_REACHABLE(h));
+	DUK_ASSERT(!DUK_HEAPHDR_HAS_TEMPROOT(h));
+	DUK_ASSERT(!DUK_HEAPHDR_HAS_FINALIZABLE(h));
+	/* may have FINALIZED */
+}
+DUK_LOCAL void duk__assert_heaphdr_flags(duk_heap *heap) {
+	duk__assert_walk_list(heap, heap->heap_allocated, duk__assert_heaphdr_flags_cb);
+#if defined(DUK_USE_REFERENCE_COUNTING)
+	DUK_ASSERT(heap->refzero_list == NULL); /* Always handled to completion inline in DECREF. */
+#endif
+	/* XXX: Assertions for finalize_list? */
+}
+
+DUK_LOCAL void duk__assert_validity_cb1(duk_heap *heap, duk_heaphdr *h) {
+	DUK_UNREF(heap);
+	DUK_ASSERT(DUK_HEAPHDR_IS_OBJECT(h) || DUK_HEAPHDR_IS_BUFFER(h));
+	duk_heaphdr_assert_valid_subclassed(h);
+}
+DUK_LOCAL void duk__assert_validity_cb2(duk_heap *heap, duk_hstring *h) {
+	DUK_UNREF(heap);
+	DUK_ASSERT(DUK_HEAPHDR_IS_STRING((duk_heaphdr *) h));
+	duk_heaphdr_assert_valid_subclassed((duk_heaphdr *) h);
+}
+DUK_LOCAL void duk__assert_validity(duk_heap *heap) {
+	duk__assert_walk_list(heap, heap->heap_allocated, duk__assert_validity_cb1);
+#if defined(DUK_USE_FINALIZER_SUPPORT)
+	duk__assert_walk_list(heap, heap->finalize_list, duk__assert_validity_cb1);
+#endif
+#if defined(DUK_USE_REFERENCE_COUNTING)
+	duk__assert_walk_list(heap, heap->refzero_list, duk__assert_validity_cb1);
+#endif
+	duk__assert_walk_strtable(heap, duk__assert_validity_cb2);
+}
+
+#if defined(DUK_USE_REFERENCE_COUNTING)
+DUK_LOCAL void duk__assert_valid_refcounts_cb(duk_heap *heap, duk_heaphdr *h) {
+	/* Cannot really assert much w.r.t. refcounts now. */
+
+	DUK_UNREF(heap);
+	if (DUK_HEAPHDR_GET_REFCOUNT(h) == 0 && DUK_HEAPHDR_HAS_FINALIZED(h)) {
+		/* An object may be in heap_allocated list with a zero
+		 * refcount if it has just been finalized and is waiting
+		 * to be collected by the next cycle.
+		 * (This doesn't currently happen however.)
+		 */
+	} else if (DUK_HEAPHDR_GET_REFCOUNT(h) == 0) {
+		/* An object may be in heap_allocated list with a zero
+		 * refcount also if it is a temporary object created
+		 * during debugger paused state.  It will get collected
+		 * by mark-and-sweep based on its reachability status
+		 * (presumably not reachable because refcount is 0).
+		 */
+	}
+	DUK_ASSERT_DISABLE(DUK_HEAPHDR_GET_REFCOUNT(h) >= 0); /* Unsigned. */
+}
+DUK_LOCAL void duk__assert_valid_refcounts(duk_heap *heap) {
+	duk__assert_walk_list(heap, heap->heap_allocated, duk__assert_valid_refcounts_cb);
+}
+
+DUK_LOCAL void duk__clear_assert_refcounts_cb1(duk_heap *heap, duk_heaphdr *h) {
+	DUK_UNREF(heap);
+	h->h_assert_refcount = 0;
+}
+DUK_LOCAL void duk__clear_assert_refcounts_cb2(duk_heap *heap, duk_hstring *h) {
+	DUK_UNREF(heap);
+	((duk_heaphdr *) h)->h_assert_refcount = 0;
+}
+DUK_LOCAL void duk__clear_assert_refcounts(duk_heap *heap) {
+	duk__assert_walk_list(heap, heap->heap_allocated, duk__clear_assert_refcounts_cb1);
+#if defined(DUK_USE_FINALIZER_SUPPORT)
+	duk__assert_walk_list(heap, heap->finalize_list, duk__clear_assert_refcounts_cb1);
+#endif
+#if defined(DUK_USE_REFERENCE_COUNTING)
+	duk__assert_walk_list(heap, heap->refzero_list, duk__clear_assert_refcounts_cb1);
+#endif
+	duk__assert_walk_strtable(heap, duk__clear_assert_refcounts_cb2);
+}
+
 DUK_LOCAL void duk__check_refcount_heaphdr(duk_heaphdr *hdr) {
 	duk_bool_t count_ok;
 	duk_size_t expect_refc;
@@ -49735,40 +53154,31 @@ DUK_LOCAL void duk__check_refcount_heaphdr(duk_heaphdr *hdr) {
 	count_ok = ((duk_size_t) DUK_HEAPHDR_GET_REFCOUNT(hdr) == expect_refc);
 	if (!count_ok) {
 		DUK_D(DUK_DPRINT("refcount mismatch for: %p: header=%ld counted=%ld --> %!iO",
-		                 (void *) hdr, (long) DUK_HEAPHDR_GET_REFCOUNT(hdr),
-		                 (long) hdr->h_assert_refcount, hdr));
+		                 (void *) hdr,
+		                 (long) DUK_HEAPHDR_GET_REFCOUNT(hdr),
+		                 (long) hdr->h_assert_refcount,
+		                 hdr));
 		DUK_ASSERT(0);
 	}
 }
 
+DUK_LOCAL void duk__check_assert_refcounts_cb1(duk_heap *heap, duk_heaphdr *h) {
+	DUK_UNREF(heap);
+	duk__check_refcount_heaphdr(h);
+}
+DUK_LOCAL void duk__check_assert_refcounts_cb2(duk_heap *heap, duk_hstring *h) {
+	DUK_UNREF(heap);
+	duk__check_refcount_heaphdr((duk_heaphdr *) h);
+}
 DUK_LOCAL void duk__check_assert_refcounts(duk_heap *heap) {
-	duk_heaphdr *curr;
-	duk_uint32_t i;
-
-	for (curr = heap->heap_allocated; curr != NULL; curr = DUK_HEAPHDR_GET_NEXT(heap, curr)) {
-		duk__check_refcount_heaphdr(curr);
-	}
+	duk__assert_walk_list(heap, heap->heap_allocated, duk__check_assert_refcounts_cb1);
 #if defined(DUK_USE_FINALIZER_SUPPORT)
-	for (curr = heap->finalize_list; curr != NULL; curr = DUK_HEAPHDR_GET_NEXT(heap, curr)) {
-		duk__check_refcount_heaphdr(curr);
-	}
+	duk__assert_walk_list(heap, heap->finalize_list, duk__check_assert_refcounts_cb1);
 #endif
-
-	for (i = 0; i < heap->st_size; i++) {
-		duk_hstring *h;
-
-#if defined(DUK_USE_STRTAB_PTRCOMP)
-		h = DUK_USE_HEAPPTR_DEC16(heap->heap_udata, heap->strtable16[i]);
-#else
-		h = heap->strtable[i];
-#endif
-		while (h != NULL) {
-			duk__check_refcount_heaphdr((duk_heaphdr *) h);
-			h = h->hdr.h_next;
-		}
-	}
+	/* XXX: Assert anything for refzero_list? */
+	duk__assert_walk_strtable(heap, duk__check_assert_refcounts_cb2);
 }
-#endif  /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_REFERENCE_COUNTING */
 
 #if defined(DUK_USE_LITCACHE_SIZE)
 DUK_LOCAL void duk__assert_litcache_nulls(duk_heap *heap) {
@@ -49784,8 +53194,8 @@ DUK_LOCAL void duk__assert_litcache_nulls(duk_heap *heap) {
 		DUK_ASSERT(e->addr == NULL);
 	}
 }
-#endif  /* DUK_USE_LITCACHE_SIZE */
-#endif  /* DUK_USE_ASSERTIONS */
+#endif /* DUK_USE_LITCACHE_SIZE */
+#endif /* DUK_USE_ASSERTIONS */
 
 /*
  *  Stats dump.
@@ -49794,51 +53204,72 @@ DUK_LOCAL void duk__assert_litcache_nulls(duk_heap *heap) {
 #if defined(DUK_USE_DEBUG)
 DUK_LOCAL void duk__dump_stats(duk_heap *heap) {
 	DUK_D(DUK_DPRINT("stats executor: opcodes=%ld, interrupt=%ld, throw=%ld",
-	                 (long) heap->stats_exec_opcodes, (long) heap->stats_exec_interrupt,
+	                 (long) heap->stats_exec_opcodes,
+	                 (long) heap->stats_exec_interrupt,
 	                 (long) heap->stats_exec_throw));
 	DUK_D(DUK_DPRINT("stats call: all=%ld, tailcall=%ld, ecmatoecma=%ld",
-	                 (long) heap->stats_call_all, (long) heap->stats_call_tailcall,
+	                 (long) heap->stats_call_all,
+	                 (long) heap->stats_call_tailcall,
 	                 (long) heap->stats_call_ecmatoecma));
 	DUK_D(DUK_DPRINT("stats safecall: all=%ld, nothrow=%ld, throw=%ld",
-	                 (long) heap->stats_safecall_all, (long) heap->stats_safecall_nothrow,
+	                 (long) heap->stats_safecall_all,
+	                 (long) heap->stats_safecall_nothrow,
 	                 (long) heap->stats_safecall_throw));
 	DUK_D(DUK_DPRINT("stats mark-and-sweep: try_count=%ld, skip_count=%ld, emergency_count=%ld",
-	                 (long) heap->stats_ms_try_count, (long) heap->stats_ms_skip_count,
+	                 (long) heap->stats_ms_try_count,
+	                 (long) heap->stats_ms_skip_count,
 	                 (long) heap->stats_ms_emergency_count));
 	DUK_D(DUK_DPRINT("stats stringtable: intern_hit=%ld, intern_miss=%ld, "
 	                 "resize_check=%ld, resize_grow=%ld, resize_shrink=%ld, "
 	                 "litcache_hit=%ld, litcache_miss=%ld, litcache_pin=%ld",
-	                 (long) heap->stats_strtab_intern_hit, (long) heap->stats_strtab_intern_miss,
-	                 (long) heap->stats_strtab_resize_check, (long) heap->stats_strtab_resize_grow,
-	                 (long) heap->stats_strtab_resize_shrink, (long) heap->stats_strtab_litcache_hit,
-	                 (long) heap->stats_strtab_litcache_miss, (long) heap->stats_strtab_litcache_pin));
+	                 (long) heap->stats_strtab_intern_hit,
+	                 (long) heap->stats_strtab_intern_miss,
+	                 (long) heap->stats_strtab_resize_check,
+	                 (long) heap->stats_strtab_resize_grow,
+	                 (long) heap->stats_strtab_resize_shrink,
+	                 (long) heap->stats_strtab_litcache_hit,
+	                 (long) heap->stats_strtab_litcache_miss,
+	                 (long) heap->stats_strtab_litcache_pin));
 	DUK_D(DUK_DPRINT("stats object: realloc_props=%ld, abandon_array=%ld",
-	                 (long) heap->stats_object_realloc_props, (long) heap->stats_object_abandon_array));
+	                 (long) heap->stats_object_realloc_props,
+	                 (long) heap->stats_object_abandon_array));
 	DUK_D(DUK_DPRINT("stats getownpropdesc: count=%ld, hit=%ld, miss=%ld",
-	                 (long) heap->stats_getownpropdesc_count, (long) heap->stats_getownpropdesc_hit,
+	                 (long) heap->stats_getownpropdesc_count,
+	                 (long) heap->stats_getownpropdesc_hit,
 	                 (long) heap->stats_getownpropdesc_miss));
 	DUK_D(DUK_DPRINT("stats getpropdesc: count=%ld, hit=%ld, miss=%ld",
-	                 (long) heap->stats_getpropdesc_count, (long) heap->stats_getpropdesc_hit,
+	                 (long) heap->stats_getpropdesc_count,
+	                 (long) heap->stats_getpropdesc_hit,
 	                 (long) heap->stats_getpropdesc_miss));
 	DUK_D(DUK_DPRINT("stats getprop: all=%ld, arrayidx=%ld, bufobjidx=%ld, "
 	                 "bufferidx=%ld, bufferlen=%ld, stringidx=%ld, stringlen=%ld, "
 	                 "proxy=%ld, arguments=%ld",
-	                 (long) heap->stats_getprop_all, (long) heap->stats_getprop_arrayidx,
-	                 (long) heap->stats_getprop_bufobjidx, (long) heap->stats_getprop_bufferidx,
-	                 (long) heap->stats_getprop_bufferlen, (long) heap->stats_getprop_stringidx,
-	                 (long) heap->stats_getprop_stringlen, (long) heap->stats_getprop_proxy,
+	                 (long) heap->stats_getprop_all,
+	                 (long) heap->stats_getprop_arrayidx,
+	                 (long) heap->stats_getprop_bufobjidx,
+	                 (long) heap->stats_getprop_bufferidx,
+	                 (long) heap->stats_getprop_bufferlen,
+	                 (long) heap->stats_getprop_stringidx,
+	                 (long) heap->stats_getprop_stringlen,
+	                 (long) heap->stats_getprop_proxy,
 	                 (long) heap->stats_getprop_arguments));
 	DUK_D(DUK_DPRINT("stats putprop: all=%ld, arrayidx=%ld, bufobjidx=%ld, "
 	                 "bufferidx=%ld, proxy=%ld",
-	                 (long) heap->stats_putprop_all, (long) heap->stats_putprop_arrayidx,
-	                 (long) heap->stats_putprop_bufobjidx, (long) heap->stats_putprop_bufferidx,
+	                 (long) heap->stats_putprop_all,
+	                 (long) heap->stats_putprop_arrayidx,
+	                 (long) heap->stats_putprop_bufobjidx,
+	                 (long) heap->stats_putprop_bufferidx,
 	                 (long) heap->stats_putprop_proxy));
-	DUK_D(DUK_DPRINT("stats getvar: all=%ld",
-	                 (long) heap->stats_getvar_all));
-	DUK_D(DUK_DPRINT("stats putvar: all=%ld",
-	                 (long) heap->stats_putvar_all));
+	DUK_D(DUK_DPRINT("stats getvar: all=%ld", (long) heap->stats_getvar_all));
+	DUK_D(DUK_DPRINT("stats putvar: all=%ld", (long) heap->stats_putvar_all));
+	DUK_D(DUK_DPRINT("stats envrec: delayedcreate=%ld, create=%ld, newenv=%ld, oldenv=%ld, pushclosure=%ld",
+	                 (long) heap->stats_envrec_delayedcreate,
+	                 (long) heap->stats_envrec_create,
+	                 (long) heap->stats_envrec_newenv,
+	                 (long) heap->stats_envrec_oldenv,
+	                 (long) heap->stats_envrec_pushclosure));
 }
-#endif  /* DUK_USE_DEBUG */
+#endif /* DUK_USE_DEBUG */
 
 /*
  *  Main mark-and-sweep function.
@@ -49854,6 +53285,7 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 #if defined(DUK_USE_VOLUNTARY_GC)
 	duk_size_t tmp;
 #endif
+	duk_bool_t entry_creating_error;
 
 	DUK_STATS_INC(heap, stats_ms_try_count);
 #if defined(DUK_USE_DEBUG)
@@ -49876,7 +53308,7 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 		DUK_STATS_INC(heap, stats_ms_skip_count);
 		return;
 	}
-	DUK_ASSERT(heap->ms_running == 0);  /* ms_prevent_count is bumped when ms_running is set */
+	DUK_ASSERT(heap->ms_running == 0); /* ms_prevent_count is bumped when ms_running is set */
 
 	/* Heap_thread is used during mark-and-sweep for refcount finalization
 	 * (it's also used for finalizer execution once mark-and-sweep is
@@ -49887,7 +53319,8 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 	DUK_ASSERT(heap->heap_thread->valstack != NULL);
 
 	DUK_D(DUK_DPRINT("garbage collect (mark-and-sweep) starting, requested flags: 0x%08lx, effective flags: 0x%08lx",
-	                 (unsigned long) flags, (unsigned long) (flags | heap->ms_base_flags)));
+	                 (unsigned long) flags,
+	                 (unsigned long) (flags | heap->ms_base_flags)));
 
 	flags |= heap->ms_base_flags;
 #if defined(DUK_USE_FINALIZER_SUPPORT)
@@ -49907,13 +53340,14 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 	DUK_ASSERT(!DUK_HEAP_HAS_MARKANDSWEEP_RECLIMIT_REACHED(heap));
 	DUK_ASSERT(heap->ms_recursion_depth == 0);
 	duk__assert_heaphdr_flags(heap);
+	duk__assert_validity(heap);
 #if defined(DUK_USE_REFERENCE_COUNTING)
 	/* Note: heap->refzero_free_running may be true; a refcount
 	 * finalizer may trigger a mark-and-sweep.
 	 */
 	duk__assert_valid_refcounts(heap);
-#endif  /* DUK_USE_REFERENCE_COUNTING */
-#endif  /* DUK_USE_ASSERTIONS */
+#endif /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_ASSERTIONS */
 
 	/*
 	 *  Begin
@@ -49923,6 +53357,8 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 	DUK_ASSERT(heap->ms_running == 0);
 	heap->ms_prevent_count = 1;
 	heap->ms_running = 1;
+	entry_creating_error = heap->creating_error;
+	heap->creating_error = 0;
 
 	/*
 	 *  Free activation/catcher freelists on every mark-and-sweep for now.
@@ -49955,17 +53391,17 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 #if defined(DUK_USE_LITCACHE_SIZE)
 	duk__wipe_litcache(heap);
 #endif
-	duk__mark_roots_heap(heap);               /* Mark main reachability roots. */
+	duk__mark_roots_heap(heap); /* Mark main reachability roots. */
 #if defined(DUK_USE_REFERENCE_COUNTING)
-	DUK_ASSERT(heap->refzero_list == NULL);   /* Always handled to completion inline in DECREF. */
+	DUK_ASSERT(heap->refzero_list == NULL); /* Always handled to completion inline in DECREF. */
 #endif
-	duk__mark_temproots_by_heap_scan(heap);   /* Temproots. */
+	duk__mark_temproots_by_heap_scan(heap); /* Temproots. */
 
 #if defined(DUK_USE_FINALIZER_SUPPORT)
-	duk__mark_finalizable(heap);              /* Mark finalizable as reachability roots. */
-	duk__mark_finalize_list(heap);            /* Mark finalizer work list as reachability roots. */
+	duk__mark_finalizable(heap); /* Mark finalizable as reachability roots. */
+	duk__mark_finalize_list(heap); /* Mark finalizer work list as reachability roots. */
 #endif
-	duk__mark_temproots_by_heap_scan(heap);   /* Temproots. */
+	duk__mark_temproots_by_heap_scan(heap); /* Temproots. */
 
 	/*
 	 *  Sweep garbage and remove marking flags, and move objects with
@@ -49992,7 +53428,7 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 	duk__check_assert_refcounts(heap);
 #endif
 #if defined(DUK_USE_REFERENCE_COUNTING)
-	DUK_ASSERT(heap->refzero_list == NULL);   /* Always handled to completion inline in DECREF. */
+	DUK_ASSERT(heap->refzero_list == NULL); /* Always handled to completion inline in DECREF. */
 #endif
 #if defined(DUK_USE_FINALIZER_SUPPORT)
 	duk__clear_finalize_list_flags(heap);
@@ -50013,11 +53449,19 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 	 *
 	 *  The object insertions go to the front of the list, so they do not
 	 *  cause an infinite loop (they are not compacted).
+	 *
+	 *  At present compaction is not allowed when mark-and-sweep runs
+	 *  during error handling because it involves a duk_safe_call()
+	 *  interfering with error state.
 	 */
 
-	if ((flags & DUK_MS_FLAG_EMERGENCY) &&
-	    !(flags & DUK_MS_FLAG_NO_OBJECT_COMPACTION)) {
-		duk__compact_objects(heap);
+	if ((flags & DUK_MS_FLAG_EMERGENCY) && !(flags & DUK_MS_FLAG_NO_OBJECT_COMPACTION)) {
+		if (heap->lj.type != DUK_LJ_TYPE_UNKNOWN) {
+			DUK_D(DUK_DPRINT("lj.type (%ld) not DUK_LJ_TYPE_UNKNOWN, skip object compaction", (long) heap->lj.type));
+		} else {
+			DUK_D(DUK_DPRINT("object compaction"));
+			duk__compact_objects(heap);
+		}
 	}
 
 	/*
@@ -50041,9 +53485,10 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 	 */
 
 	DUK_ASSERT(heap->ms_prevent_count == 1);
-	heap->ms_prevent_count = 0;
 	DUK_ASSERT(heap->ms_running == 1);
+	heap->ms_prevent_count = 0;
 	heap->ms_running = 0;
+	heap->creating_error = entry_creating_error; /* for nested error handling, see GH-2278 */
 
 	/*
 	 *  Assertions after
@@ -50054,16 +53499,17 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 	DUK_ASSERT(!DUK_HEAP_HAS_MARKANDSWEEP_RECLIMIT_REACHED(heap));
 	DUK_ASSERT(heap->ms_recursion_depth == 0);
 	duk__assert_heaphdr_flags(heap);
+	duk__assert_validity(heap);
 #if defined(DUK_USE_REFERENCE_COUNTING)
 	/* Note: heap->refzero_free_running may be true; a refcount
 	 * finalizer may trigger a mark-and-sweep.
 	 */
 	duk__assert_valid_refcounts(heap);
-#endif  /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_REFERENCE_COUNTING */
 #if defined(DUK_USE_LITCACHE_SIZE)
 	duk__assert_litcache_nulls(heap);
-#endif  /* DUK_USE_LITCACHE_SIZE */
-#endif  /* DUK_USE_ASSERTIONS */
+#endif /* DUK_USE_LITCACHE_SIZE */
+#endif /* DUK_USE_ASSERTIONS */
 
 	/*
 	 *  Reset trigger counter
@@ -50071,14 +53517,15 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 
 #if defined(DUK_USE_VOLUNTARY_GC)
 	tmp = (count_keep_obj + count_keep_str) / 256;
-	heap->ms_trigger_counter = (duk_int_t) (
-	    (tmp * DUK_HEAP_MARK_AND_SWEEP_TRIGGER_MULT) +
-	    DUK_HEAP_MARK_AND_SWEEP_TRIGGER_ADD);
+	heap->ms_trigger_counter = (duk_int_t) ((tmp * DUK_HEAP_MARK_AND_SWEEP_TRIGGER_MULT) + DUK_HEAP_MARK_AND_SWEEP_TRIGGER_ADD);
 	DUK_D(DUK_DPRINT("garbage collect (mark-and-sweep) finished: %ld objects kept, %ld strings kept, trigger reset to %ld",
-	                 (long) count_keep_obj, (long) count_keep_str, (long) heap->ms_trigger_counter));
+	                 (long) count_keep_obj,
+	                 (long) count_keep_str,
+	                 (long) heap->ms_trigger_counter));
 #else
 	DUK_D(DUK_DPRINT("garbage collect (mark-and-sweep) finished: %ld objects kept, %ld strings kept, no voluntary trigger",
-	                 (long) count_keep_obj, (long) count_keep_str));
+	                 (long) count_keep_obj,
+	                 (long) count_keep_str));
 #endif
 
 	/*
@@ -50121,7 +53568,7 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 	 * is inside the target.
 	 */
 	duk_heap_process_finalize_list(heap);
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 }
 /*
  *  Memory allocation handling.
@@ -50130,84 +53577,31 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 /* #include duk_internal.h -> already included */
 
 /*
- *  Voluntary GC check
- */
-
-#if defined(DUK_USE_VOLUNTARY_GC)
-DUK_LOCAL DUK_INLINE void duk__check_voluntary_gc(duk_heap *heap) {
-	if (DUK_UNLIKELY(--(heap)->ms_trigger_counter < 0)) {
-#if defined(DUK_USE_DEBUG)
-		if (heap->ms_prevent_count == 0) {
-			DUK_D(DUK_DPRINT("triggering voluntary mark-and-sweep"));
-		} else {
-			DUK_DD(DUK_DDPRINT("gc blocked -> skip voluntary mark-and-sweep now"));
-		}
-#endif
-
-		/* Prevention checks in the call target handle cases where
-		 * voluntary GC is not allowed.  The voluntary GC trigger
-		 * counter is only rewritten if mark-and-sweep actually runs.
-		 */
-		duk_heap_mark_and_sweep(heap, DUK_MS_FLAG_VOLUNTARY /*flags*/);
-	}
-}
-#define DUK__VOLUNTARY_PERIODIC_GC(heap)  do { duk__check_voluntary_gc((heap)); } while (0)
-#else
-#define DUK__VOLUNTARY_PERIODIC_GC(heap)  /* no voluntary gc */
-#endif  /* DUK_USE_VOLUNTARY_GC */
-
-/*
- *  Allocate memory with garbage collection
+ *  Allocate memory with garbage collection.
  */
 
-DUK_INTERNAL void *duk_heap_mem_alloc(duk_heap *heap, duk_size_t size) {
+/* Slow path: voluntary GC triggered, first alloc attempt failed, or zero size. */
+DUK_LOCAL DUK_NOINLINE_PERF DUK_COLD void *duk__heap_mem_alloc_slowpath(duk_heap *heap, duk_size_t size) {
 	void *res;
 	duk_small_int_t i;
 
 	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->alloc_func != NULL);
 	DUK_ASSERT_DISABLE(size >= 0);
 
-	/*
-	 *  Voluntary periodic GC (if enabled)
-	 */
-
-	DUK__VOLUNTARY_PERIODIC_GC(heap);
-
-	/*
-	 *  First attempt
-	 */
-
-#if defined(DUK_USE_GC_TORTURE)
-	/* Simulate alloc failure on every alloc, except when mark-and-sweep
-	 * is running.
-	 */
-	if (heap->ms_prevent_count == 0) {
-		DUK_DDD(DUK_DDDPRINT("gc torture enabled, pretend that first alloc attempt fails"));
-		res = NULL;
-		DUK_UNREF(res);
-		goto skip_attempt;
-	}
-#endif
-	res = heap->alloc_func(heap->heap_udata, size);
-	if (DUK_LIKELY(res || size == 0)) {
-		/* For zero size allocations NULL is allowed. */
-		return res;
+	if (size == 0) {
+		DUK_D(DUK_DPRINT("zero size alloc in slow path, return NULL"));
+		return NULL;
 	}
-#if defined(DUK_USE_GC_TORTURE)
- skip_attempt:
-#endif
 
-	DUK_D(DUK_DPRINT("first alloc attempt failed, attempt to gc and retry"));
+	DUK_D(DUK_DPRINT("first alloc attempt failed or voluntary GC limit reached, attempt to gc and retry"));
 
 #if 0
 	/*
-	 *  Avoid a GC if GC is already running.  This can happen at a late
-	 *  stage in a GC when we try to e.g. resize the stringtable
-	 *  or compact objects.
-	 *
-	 *  NOTE: explicit handling isn't actually be needed: if the GC is
-	 *  not allowed, duk_heap_mark_and_sweep() will reject it for every
-	 *  attempt in the loop below, resulting in a NULL same as here.
+	 *  If GC is already running there is no point in attempting a GC
+	 *  because it will be skipped.  This could be checked for explicitly,
+	 *  but it isn't actually needed: the loop below will eventually
+	 *  fail resulting in a NULL.
 	 */
 
 	if (heap->ms_prevent_count != 0) {
@@ -50232,10 +53626,12 @@ DUK_INTERNAL void *duk_heap_mem_alloc(duk_heap *heap, duk_size_t size) {
 
 		duk_heap_mark_and_sweep(heap, flags);
 
+		DUK_ASSERT(size > 0);
 		res = heap->alloc_func(heap->heap_udata, size);
-		if (res) {
+		if (res != NULL) {
 			DUK_D(DUK_DPRINT("duk_heap_mem_alloc() succeeded after gc (pass %ld), alloc size %ld",
-			                 (long) (i + 1), (long) size));
+			                 (long) (i + 1),
+			                 (long) size));
 			return res;
 		}
 	}
@@ -50244,10 +53640,56 @@ DUK_INTERNAL void *duk_heap_mem_alloc(duk_heap *heap, duk_size_t size) {
 	return NULL;
 }
 
-DUK_INTERNAL void *duk_heap_mem_alloc_zeroed(duk_heap *heap, duk_size_t size) {
+DUK_INTERNAL DUK_INLINE_PERF DUK_HOT void *duk_heap_mem_alloc(duk_heap *heap, duk_size_t size) {
 	void *res;
 
 	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->alloc_func != NULL);
+	DUK_ASSERT_DISABLE(size >= 0);
+
+#if defined(DUK_USE_VOLUNTARY_GC)
+	/* Voluntary periodic GC (if enabled). */
+	if (DUK_UNLIKELY(--(heap)->ms_trigger_counter < 0)) {
+		goto slowpath;
+	}
+#endif
+
+#if defined(DUK_USE_GC_TORTURE)
+	/* Simulate alloc failure on every alloc, except when mark-and-sweep
+	 * is running.
+	 */
+	if (heap->ms_prevent_count == 0) {
+		DUK_DDD(DUK_DDDPRINT("gc torture enabled, pretend that first alloc attempt fails"));
+		res = NULL;
+		DUK_UNREF(res);
+		goto slowpath;
+	}
+#endif
+
+	/* Zero-size allocation should happen very rarely (if at all), so
+	 * don't check zero size on NULL; handle it in the slow path
+	 * instead.  This reduces size of inlined code.
+	 */
+	res = heap->alloc_func(heap->heap_udata, size);
+	if (DUK_LIKELY(res != NULL)) {
+		return res;
+	}
+
+slowpath:
+
+	if (size == 0) {
+		DUK_D(DUK_DPRINT("first alloc attempt returned NULL for zero size alloc, use slow path to deal with it"));
+	} else {
+		DUK_D(DUK_DPRINT("first alloc attempt failed, attempt to gc and retry"));
+	}
+	return duk__heap_mem_alloc_slowpath(heap, size);
+}
+
+DUK_INTERNAL DUK_INLINE_PERF DUK_HOT void *duk_heap_mem_alloc_zeroed(duk_heap *heap, duk_size_t size) {
+	void *res;
+
+	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->alloc_func != NULL);
 	DUK_ASSERT_DISABLE(size >= 0);
 
 	res = DUK_ALLOC(heap, size);
@@ -50257,24 +53699,37 @@ DUK_INTERNAL void *duk_heap_mem_alloc_zeroed(duk_heap *heap, duk_size_t size) {
 	return res;
 }
 
-DUK_INTERNAL void *duk_heap_mem_alloc_checked(duk_hthread *thr, duk_size_t size) {
+DUK_INTERNAL DUK_INLINE_PERF DUK_HOT void *duk_heap_mem_alloc_checked(duk_hthread *thr, duk_size_t size) {
 	void *res;
 
 	DUK_ASSERT(thr != NULL);
+	DUK_ASSERT(thr->heap != NULL);
+	DUK_ASSERT(thr->heap->alloc_func != NULL);
+
 	res = duk_heap_mem_alloc(thr->heap, size);
-	if (DUK_LIKELY(res != NULL || size == 0)) {
+	if (DUK_LIKELY(res != NULL)) {
+		return res;
+	} else if (size == 0) {
+		DUK_ASSERT(res == NULL);
 		return res;
 	}
 	DUK_ERROR_ALLOC_FAILED(thr);
 	DUK_WO_NORETURN(return NULL;);
 }
 
-DUK_INTERNAL void *duk_heap_mem_alloc_checked_zeroed(duk_hthread *thr, duk_size_t size) {
+DUK_INTERNAL DUK_INLINE_PERF DUK_HOT void *duk_heap_mem_alloc_checked_zeroed(duk_hthread *thr, duk_size_t size) {
 	void *res;
 
 	DUK_ASSERT(thr != NULL);
-	res = duk_heap_mem_alloc_zeroed(thr->heap, size);
-	if (DUK_LIKELY(res != NULL || size == 0)) {
+	DUK_ASSERT(thr->heap != NULL);
+	DUK_ASSERT(thr->heap->alloc_func != NULL);
+
+	res = duk_heap_mem_alloc(thr->heap, size);
+	if (DUK_LIKELY(res != NULL)) {
+		duk_memzero(res, size);
+		return res;
+	} else if (size == 0) {
+		DUK_ASSERT(res == NULL);
 		return res;
 	}
 	DUK_ERROR_ALLOC_FAILED(thr);
@@ -50282,46 +53737,20 @@ DUK_INTERNAL void *duk_heap_mem_alloc_checked_zeroed(duk_hthread *thr, duk_size_
 }
 
 /*
- *  Reallocate memory with garbage collection
+ *  Reallocate memory with garbage collection.
  */
 
-DUK_INTERNAL void *duk_heap_mem_realloc(duk_heap *heap, void *ptr, duk_size_t newsize) {
+/* Slow path: voluntary GC triggered, first realloc attempt failed, or zero size. */
+DUK_LOCAL DUK_NOINLINE_PERF DUK_COLD void *duk__heap_mem_realloc_slowpath(duk_heap *heap, void *ptr, duk_size_t newsize) {
 	void *res;
 	duk_small_int_t i;
 
 	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->realloc_func != NULL);
 	/* ptr may be NULL */
 	DUK_ASSERT_DISABLE(newsize >= 0);
 
-	/*
-	 *  Voluntary periodic GC (if enabled)
-	 */
-
-	DUK__VOLUNTARY_PERIODIC_GC(heap);
-
-	/*
-	 *  First attempt
-	 */
-
-#if defined(DUK_USE_GC_TORTURE)
-	/* Simulate alloc failure on every realloc, except when mark-and-sweep
-	 * is running.
-	 */
-	if (heap->ms_prevent_count == 0) {
-		DUK_DDD(DUK_DDDPRINT("gc torture enabled, pretend that first realloc attempt fails"));
-		res = NULL;
-		DUK_UNREF(res);
-		goto skip_attempt;
-	}
-#endif
-	res = heap->realloc_func(heap->heap_udata, ptr, newsize);
-	if (DUK_LIKELY(res || newsize == 0)) {
-		/* For zero size allocations NULL is allowed. */
-		return res;
-	}
-#if defined(DUK_USE_GC_TORTURE)
- skip_attempt:
-#endif
+	/* Unlike for malloc(), zero size NULL result check happens at the call site. */
 
 	DUK_D(DUK_DPRINT("first realloc attempt failed, attempt to gc and retry"));
 
@@ -50353,9 +53782,10 @@ DUK_INTERNAL void *duk_heap_mem_realloc(duk_heap *heap, void *ptr, duk_size_t ne
 		duk_heap_mark_and_sweep(heap, flags);
 
 		res = heap->realloc_func(heap->heap_udata, ptr, newsize);
-		if (res || newsize == 0) {
+		if (res != NULL || newsize == 0) {
 			DUK_D(DUK_DPRINT("duk_heap_mem_realloc() succeeded after gc (pass %ld), alloc size %ld",
-			                 (long) (i + 1), (long) newsize));
+			                 (long) (i + 1),
+			                 (long) newsize));
 			return res;
 		}
 	}
@@ -50364,48 +53794,67 @@ DUK_INTERNAL void *duk_heap_mem_realloc(duk_heap *heap, void *ptr, duk_size_t ne
 	return NULL;
 }
 
-/*
- *  Reallocate memory with garbage collection, using a callback to provide
- *  the current allocated pointer.  This variant is used when a mark-and-sweep
- *  (e.g. finalizers) might change the original pointer.
- */
-
-DUK_INTERNAL void *duk_heap_mem_realloc_indirect(duk_heap *heap, duk_mem_getptr cb, void *ud, duk_size_t newsize) {
+DUK_INTERNAL DUK_INLINE_PERF DUK_HOT void *duk_heap_mem_realloc(duk_heap *heap, void *ptr, duk_size_t newsize) {
 	void *res;
-	duk_small_int_t i;
 
 	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->realloc_func != NULL);
+	/* ptr may be NULL */
 	DUK_ASSERT_DISABLE(newsize >= 0);
 
-	/*
-	 *  Voluntary periodic GC (if enabled)
-	 */
-
-	DUK__VOLUNTARY_PERIODIC_GC(heap);
-
-	/*
-	 *  First attempt
-	 */
+#if defined(DUK_USE_VOLUNTARY_GC)
+	/* Voluntary periodic GC (if enabled). */
+	if (DUK_UNLIKELY(--(heap)->ms_trigger_counter < 0)) {
+		goto gc_retry;
+	}
+#endif
 
 #if defined(DUK_USE_GC_TORTURE)
 	/* Simulate alloc failure on every realloc, except when mark-and-sweep
 	 * is running.
 	 */
 	if (heap->ms_prevent_count == 0) {
-		DUK_DDD(DUK_DDDPRINT("gc torture enabled, pretend that first indirect realloc attempt fails"));
+		DUK_DDD(DUK_DDDPRINT("gc torture enabled, pretend that first realloc attempt fails"));
 		res = NULL;
 		DUK_UNREF(res);
-		goto skip_attempt;
+		goto gc_retry;
 	}
 #endif
-	res = heap->realloc_func(heap->heap_udata, cb(heap, ud), newsize);
-	if (DUK_LIKELY(res || newsize == 0)) {
-		/* For zero size allocations NULL is allowed. */
+
+	res = heap->realloc_func(heap->heap_udata, ptr, newsize);
+	if (DUK_LIKELY(res != NULL) || newsize == 0) {
+		if (res != NULL && newsize == 0) {
+			DUK_DD(DUK_DDPRINT("first realloc attempt returned NULL for zero size realloc, accept and return NULL"));
+		}
 		return res;
+	} else {
+		goto gc_retry;
 	}
-#if defined(DUK_USE_GC_TORTURE)
- skip_attempt:
-#endif
+	/* Never here. */
+
+gc_retry:
+	return duk__heap_mem_realloc_slowpath(heap, ptr, newsize);
+}
+
+/*
+ *  Reallocate memory with garbage collection, using a callback to provide
+ *  the current allocated pointer.  This variant is used when a mark-and-sweep
+ *  (e.g. finalizers) might change the original pointer.
+ */
+
+/* Slow path: voluntary GC triggered, first realloc attempt failed, or zero size. */
+DUK_LOCAL DUK_NOINLINE_PERF DUK_COLD void *duk__heap_mem_realloc_indirect_slowpath(duk_heap *heap,
+                                                                                   duk_mem_getptr cb,
+                                                                                   void *ud,
+                                                                                   duk_size_t newsize) {
+	void *res;
+	duk_small_int_t i;
+
+	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->realloc_func != NULL);
+	DUK_ASSERT_DISABLE(newsize >= 0);
+
+	/* Unlike for malloc(), zero size NULL result check happens at the call site. */
 
 	DUK_D(DUK_DPRINT("first indirect realloc attempt failed, attempt to gc and retry"));
 
@@ -50447,7 +53896,8 @@ DUK_INTERNAL void *duk_heap_mem_realloc_indirect(duk_heap *heap, duk_mem_getptr
 		ptr_post = cb(heap, ud);
 		if (ptr_pre != ptr_post) {
 			DUK_DD(DUK_DDPRINT("realloc base pointer changed by mark-and-sweep: %p -> %p",
-			                   (void *) ptr_pre, (void *) ptr_post));
+			                   (void *) ptr_pre,
+			                   (void *) ptr_post));
 		}
 #endif
 
@@ -50456,9 +53906,10 @@ DUK_INTERNAL void *duk_heap_mem_realloc_indirect(duk_heap *heap, duk_mem_getptr
 		 */
 
 		res = heap->realloc_func(heap->heap_udata, cb(heap, ud), newsize);
-		if (res || newsize == 0) {
+		if (res != NULL || newsize == 0) {
 			DUK_D(DUK_DPRINT("duk_heap_mem_realloc_indirect() succeeded after gc (pass %ld), alloc size %ld",
-			                 (long) (i + 1), (long) newsize));
+			                 (long) (i + 1),
+			                 (long) newsize));
 			return res;
 		}
 	}
@@ -50467,12 +53918,58 @@ DUK_INTERNAL void *duk_heap_mem_realloc_indirect(duk_heap *heap, duk_mem_getptr
 	return NULL;
 }
 
+DUK_INTERNAL DUK_INLINE_PERF DUK_HOT void *duk_heap_mem_realloc_indirect(duk_heap *heap,
+                                                                         duk_mem_getptr cb,
+                                                                         void *ud,
+                                                                         duk_size_t newsize) {
+	void *res;
+
+	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->realloc_func != NULL);
+	DUK_ASSERT_DISABLE(newsize >= 0);
+
+#if defined(DUK_USE_VOLUNTARY_GC)
+	/* Voluntary periodic GC (if enabled). */
+	if (DUK_UNLIKELY(--(heap)->ms_trigger_counter < 0)) {
+		goto gc_retry;
+	}
+#endif
+
+#if defined(DUK_USE_GC_TORTURE)
+	/* Simulate alloc failure on every realloc, except when mark-and-sweep
+	 * is running.
+	 */
+	if (heap->ms_prevent_count == 0) {
+		DUK_DDD(DUK_DDDPRINT("gc torture enabled, pretend that first indirect realloc attempt fails"));
+		res = NULL;
+		DUK_UNREF(res);
+		goto gc_retry;
+	}
+#endif
+
+	res = heap->realloc_func(heap->heap_udata, cb(heap, ud), newsize);
+	if (DUK_LIKELY(res != NULL) || newsize == 0) {
+		if (res != NULL && newsize == 0) {
+			DUK_DD(DUK_DDPRINT(
+			    "first indirect realloc attempt returned NULL for zero size realloc, accept and return NULL"));
+		}
+		return res;
+	} else {
+		goto gc_retry;
+	}
+	/* Never here. */
+
+gc_retry:
+	return duk__heap_mem_realloc_indirect_slowpath(heap, cb, ud, newsize);
+}
+
 /*
  *  Free memory
  */
 
-DUK_INTERNAL void duk_heap_mem_free(duk_heap *heap, void *ptr) {
+DUK_INTERNAL DUK_INLINE_PERF DUK_HOT void duk_heap_mem_free(duk_heap *heap, void *ptr) {
 	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->free_func != NULL);
 	/* ptr may be NULL */
 
 	/* Must behave like a no-op with NULL and any pointer returned from
@@ -50485,9 +53982,6 @@ DUK_INTERNAL void duk_heap_mem_free(duk_heap *heap, void *ptr) {
 	 * No need to update voluntary GC counter either.
 	 */
 }
-
-/* automatic undefs */
-#undef DUK__VOLUNTARY_PERIODIC_GC
 /*
  *  Support functions for duk_heap.
  */
@@ -50508,8 +54002,8 @@ DUK_INTERNAL void duk_heap_insert_into_heap_allocated(duk_heap *heap, duk_heaphd
 	DUK_HEAPHDR_SET_PREV(heap, hdr, NULL);
 #endif
 	DUK_HEAPHDR_SET_NEXT(heap, hdr, root);
-	DUK_ASSERT_HEAPHDR_LINKS(heap, hdr);
-	DUK_ASSERT_HEAPHDR_LINKS(heap, root);
+	DUK_HEAPHDR_ASSERT_LINKS(heap, hdr);
+	DUK_HEAPHDR_ASSERT_LINKS(heap, root);
 	heap->heap_allocated = hdr;
 }
 
@@ -50554,7 +54048,7 @@ DUK_INTERNAL void duk_heap_remove_from_heap_allocated(duk_heap *heap, duk_heaphd
 		;
 	}
 }
-#endif  /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_REFERENCE_COUNTING */
 
 #if defined(DUK_USE_FINALIZER_SUPPORT)
 DUK_INTERNAL void duk_heap_insert_into_finalize_list(duk_heap *heap, duk_heaphdr *hdr) {
@@ -50569,11 +54063,11 @@ DUK_INTERNAL void duk_heap_insert_into_finalize_list(duk_heap *heap, duk_heaphdr
 	}
 #endif
 	DUK_HEAPHDR_SET_NEXT(heap, hdr, root);
-	DUK_ASSERT_HEAPHDR_LINKS(heap, hdr);
-	DUK_ASSERT_HEAPHDR_LINKS(heap, root);
+	DUK_HEAPHDR_ASSERT_LINKS(heap, hdr);
+	DUK_HEAPHDR_ASSERT_LINKS(heap, root);
 	heap->finalize_list = hdr;
 }
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 
 #if defined(DUK_USE_FINALIZER_SUPPORT)
 DUK_INTERNAL void duk_heap_remove_from_finalize_list(duk_heap *heap, duk_heaphdr *hdr) {
@@ -50607,7 +54101,7 @@ DUK_INTERNAL void duk_heap_remove_from_finalize_list(duk_heap *heap, duk_heaphdr
 	} else {
 		DUK_ASSERT(hdr != heap->finalize_list);
 		for (;;) {
-			DUK_ASSERT(curr != NULL);  /* Caller responsibility. */
+			DUK_ASSERT(curr != NULL); /* Caller responsibility. */
 
 			next = DUK_HEAPHDR_GET_NEXT(heap, curr);
 			if (next == hdr) {
@@ -50619,7 +54113,7 @@ DUK_INTERNAL void duk_heap_remove_from_finalize_list(duk_heap *heap, duk_heaphdr
 	}
 #endif
 }
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 
 #if defined(DUK_USE_ASSERTIONS)
 DUK_INTERNAL duk_bool_t duk_heap_in_heap_allocated(duk_heap *heap, duk_heaphdr *ptr) {
@@ -50633,7 +54127,7 @@ DUK_INTERNAL duk_bool_t duk_heap_in_heap_allocated(duk_heap *heap, duk_heaphdr *
 	}
 	return 0;
 }
-#endif  /* DUK_USE_ASSERTIONS */
+#endif /* DUK_USE_ASSERTIONS */
 
 #if defined(DUK_USE_INTERRUPT_COUNTER)
 DUK_INTERNAL void duk_heap_switch_thread(duk_heap *heap, duk_hthread *new_thr) {
@@ -50666,9 +54160,15 @@ DUK_INTERNAL void duk_heap_switch_thread(duk_heap *heap, duk_hthread *new_thr) {
 		DUK_DD(DUK_DDPRINT("switch thread, new thread is NULL, no interrupt counter changes"));
 	}
 
-	heap->curr_thread = new_thr;  /* may be NULL */
+	heap->curr_thread = new_thr; /* may be NULL */
 }
-#endif  /* DUK_USE_INTERRUPT_COUNTER */
+#endif /* DUK_USE_INTERRUPT_COUNTER */
+
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL void duk_heap_assert_valid(duk_heap *heap) {
+	DUK_ASSERT(heap != NULL);
+}
+#endif
 /*
  *  Reference counting implementation.
  *
@@ -50795,7 +54295,7 @@ DUK_INTERNAL void duk_hobject_refcount_finalize_norz(duk_heap *heap, duk_hobject
 		duk_tval *tv, *tv_end;
 		duk_hobject **funcs, **funcs_end;
 
-		DUK_ASSERT_HCOMPFUNC_VALID(f);
+		DUK_HCOMPFUNC_ASSERT_VALID(f);
 
 		if (DUK_LIKELY(DUK_HCOMPFUNC_GET_DATA(heap, f) != NULL)) {
 			tv = DUK_HCOMPFUNC_GET_CONSTS_BASE(heap, f);
@@ -50825,40 +54325,40 @@ DUK_INTERNAL void duk_hobject_refcount_finalize_norz(duk_heap *heap, duk_hobject
 		DUK_HEAPHDR_DECREF_ALLOWNULL(thr, (duk_hbuffer *) DUK_HCOMPFUNC_GET_DATA(heap, f));
 	} else if (DUK_HOBJECT_IS_DECENV(h)) {
 		duk_hdecenv *e = (duk_hdecenv *) h;
-		DUK_ASSERT_HDECENV_VALID(e);
+		DUK_HDECENV_ASSERT_VALID(e);
 		DUK_HTHREAD_DECREF_NORZ_ALLOWNULL(thr, e->thread);
 		DUK_HOBJECT_DECREF_NORZ_ALLOWNULL(thr, e->varmap);
 	} else if (DUK_HOBJECT_IS_OBJENV(h)) {
 		duk_hobjenv *e = (duk_hobjenv *) h;
-		DUK_ASSERT_HOBJENV_VALID(e);
-		DUK_ASSERT(e->target != NULL);  /* Required for object environments. */
+		DUK_HOBJENV_ASSERT_VALID(e);
+		DUK_ASSERT(e->target != NULL); /* Required for object environments. */
 		DUK_HOBJECT_DECREF_NORZ(thr, e->target);
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
 	} else if (DUK_HOBJECT_IS_BUFOBJ(h)) {
 		duk_hbufobj *b = (duk_hbufobj *) h;
-		DUK_ASSERT_HBUFOBJ_VALID(b);
+		DUK_HBUFOBJ_ASSERT_VALID(b);
 		DUK_HBUFFER_DECREF_NORZ_ALLOWNULL(thr, (duk_hbuffer *) b->buf);
 		DUK_HOBJECT_DECREF_NORZ_ALLOWNULL(thr, (duk_hobject *) b->buf_prop);
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 	} else if (DUK_HOBJECT_IS_BOUNDFUNC(h)) {
 		duk_hboundfunc *f = (duk_hboundfunc *) (void *) h;
-		DUK_ASSERT_HBOUNDFUNC_VALID(f);
+		DUK_HBOUNDFUNC_ASSERT_VALID(f);
 		DUK_TVAL_DECREF_NORZ(thr, &f->target);
 		DUK_TVAL_DECREF_NORZ(thr, &f->this_binding);
 		duk__decref_tvals_norz(thr, f->args, f->nargs);
 #if defined(DUK_USE_ES6_PROXY)
 	} else if (DUK_HOBJECT_IS_PROXY(h)) {
 		duk_hproxy *p = (duk_hproxy *) h;
-		DUK_ASSERT_HPROXY_VALID(p);
+		DUK_HPROXY_ASSERT_VALID(p);
 		DUK_HOBJECT_DECREF_NORZ(thr, p->target);
 		DUK_HOBJECT_DECREF_NORZ(thr, p->handler);
-#endif  /* DUK_USE_ES6_PROXY */
+#endif /* DUK_USE_ES6_PROXY */
 	} else if (DUK_HOBJECT_IS_THREAD(h)) {
 		duk_hthread *t = (duk_hthread *) h;
 		duk_activation *act;
 		duk_tval *tv;
 
-		DUK_ASSERT_HTHREAD_VALID(t);
+		DUK_HTHREAD_ASSERT_VALID(t);
 
 		tv = t->valstack;
 		while (tv < t->valstack_top) {
@@ -50873,13 +54373,12 @@ DUK_INTERNAL void duk_hobject_refcount_finalize_norz(duk_heap *heap, duk_hobject
 #if defined(DUK_USE_NONSTD_FUNC_CALLER_PROPERTY)
 			DUK_HOBJECT_DECREF_NORZ_ALLOWNULL(thr, (duk_hobject *) act->prev_caller);
 #endif
-#if 0  /* nothing now */
+#if 0 /* nothing now */
 			for (cat = act->cat; cat != NULL; cat = cat->parent) {
 			}
 #endif
 		}
 
-
 		for (i = 0; i < DUK_NUM_BUILTINS; i++) {
 			DUK_HOBJECT_DECREF_NORZ_ALLOWNULL(thr, (duk_hobject *) t->builtins[i]);
 		}
@@ -50964,7 +54463,7 @@ DUK_LOCAL void duk__refcount_free_pending(duk_heap *heap) {
 
 	curr = heap->refzero_list;
 	DUK_ASSERT(curr != NULL);
-	DUK_ASSERT(DUK_HEAPHDR_GET_PREV(heap, curr) == NULL);  /* We're called on initial insert only. */
+	DUK_ASSERT(DUK_HEAPHDR_GET_PREV(heap, curr) == NULL); /* We're called on initial insert only. */
 	/* curr->next is GARBAGE. */
 
 	do {
@@ -50977,7 +54476,7 @@ DUK_LOCAL void duk__refcount_free_pending(duk_heap *heap) {
 #endif
 
 		DUK_ASSERT(curr != NULL);
-		DUK_ASSERT(DUK_HEAPHDR_GET_TYPE(curr) == DUK_HTYPE_OBJECT);  /* currently, always the case */
+		DUK_ASSERT(DUK_HEAPHDR_GET_TYPE(curr) == DUK_HTYPE_OBJECT); /* currently, always the case */
 		/* FINALIZED may be set; don't care about flags here. */
 
 		/* Refcount finalize 'curr'.  Refzero_list must be non-NULL
@@ -50987,11 +54486,10 @@ DUK_LOCAL void duk__refcount_free_pending(duk_heap *heap) {
 		duk_hobject_refcount_finalize_norz(heap, (duk_hobject *) curr);
 
 		prev = DUK_HEAPHDR_GET_PREV(heap, curr);
-		DUK_ASSERT((prev == NULL && heap->refzero_list == curr) || \
-		           (prev != NULL && heap->refzero_list != curr));
+		DUK_ASSERT((prev == NULL && heap->refzero_list == curr) || (prev != NULL && heap->refzero_list != curr));
 		/* prev->next is intentionally not updated and is garbage. */
 
-		duk_free_hobject(heap, (duk_hobject *) curr);  /* Invalidates 'curr'. */
+		duk_free_hobject(heap, (duk_hobject *) curr); /* Invalidates 'curr'. */
 
 		curr = prev;
 	} while (curr != NULL);
@@ -51067,7 +54565,7 @@ DUK_LOCAL DUK_INLINE void duk__refcount_refzero_hobject(duk_heap *heap, duk_hobj
 			return;
 		}
 	}
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 
 	/* No need to finalize, free object via refzero_list. */
 
@@ -51111,7 +54609,7 @@ DUK_LOCAL DUK_INLINE void duk__refcount_refzero_hobject(duk_heap *heap, duk_hobj
 DUK_INTERNAL DUK_ALWAYS_INLINE void duk_refzero_check_fast(duk_hthread *thr) {
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(thr->heap != NULL);
-	DUK_ASSERT(thr->heap->refzero_list == NULL);  /* Processed to completion inline. */
+	DUK_ASSERT(thr->heap->refzero_list == NULL); /* Processed to completion inline. */
 
 	if (DUK_UNLIKELY(thr->heap->finalize_list != NULL)) {
 		duk_heap_process_finalize_list(thr->heap);
@@ -51121,13 +54619,13 @@ DUK_INTERNAL DUK_ALWAYS_INLINE void duk_refzero_check_fast(duk_hthread *thr) {
 DUK_INTERNAL void duk_refzero_check_slow(duk_hthread *thr) {
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(thr->heap != NULL);
-	DUK_ASSERT(thr->heap->refzero_list == NULL);  /* Processed to completion inline. */
+	DUK_ASSERT(thr->heap->refzero_list == NULL); /* Processed to completion inline. */
 
 	if (DUK_UNLIKELY(thr->heap->finalize_list != NULL)) {
 		duk_heap_process_finalize_list(thr->heap);
 	}
 }
-#endif  /* DUK_USE_FINALIZER_SUPPORT */
+#endif /* DUK_USE_FINALIZER_SUPPORT */
 
 /*
  *  Refzero processing for duk_hstring.
@@ -51187,16 +54685,20 @@ DUK_LOCAL DUK_INLINE void duk__refcount_refzero_hbuffer(duk_heap *heap, duk_hbuf
  *  The suppress condition is important to performance.
  */
 
-#define DUK__RZ_SUPPRESS_ASSERT1() do { \
+#define DUK__RZ_SUPPRESS_ASSERT1() \
+	do { \
 		DUK_ASSERT(thr != NULL); \
 		DUK_ASSERT(thr->heap != NULL); \
 		/* When mark-and-sweep runs, heap_thread must exist. */ \
 		DUK_ASSERT(thr->heap->ms_running == 0 || thr->heap->heap_thread != NULL); \
-		/* When mark-and-sweep runs, the 'thr' argument always matches heap_thread. \
-		 * This could be used to e.g. suppress check against 'thr' directly (and \
-		 * knowing it would be heap_thread); not really used now. \
+		/* In normal operation finalizers are executed with ms_running == 0 \
+		 * so we should never see ms_running == 1 and thr != heap_thread. \
+		 * In heap destruction finalizers are executed with ms_running != 0 \
+		 * to e.g. prevent refzero; a special value ms_running == 2 is used \
+		 * in that case so it can be distinguished from the normal runtime \
+		 * case, and allows a stronger assertion here (GH-2030). \
 		 */ \
-		DUK_ASSERT(thr->heap->ms_running == 0 || thr == thr->heap->heap_thread); \
+		DUK_ASSERT(!(thr->heap->ms_running == 1 && thr != thr->heap->heap_thread)); \
 		/* We may be called when the heap is initializing and we process \
 		 * refzeros normally, but mark-and-sweep and finalizers are prevented \
 		 * if that's the case. \
@@ -51206,32 +54708,41 @@ DUK_LOCAL DUK_INLINE void duk__refcount_refzero_hbuffer(duk_heap *heap, duk_hbuf
 	} while (0)
 
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
-#define DUK__RZ_SUPPRESS_ASSERT2() do { \
+#define DUK__RZ_SUPPRESS_ASSERT2() \
+	do { \
 		/* When debugger is paused, ms_running is set. */ \
 		DUK_ASSERT(!DUK_HEAP_HAS_DEBUGGER_PAUSED(thr->heap) || thr->heap->ms_running != 0); \
 	} while (0)
-#define DUK__RZ_SUPPRESS_COND()  (heap->ms_running != 0)
+#define DUK__RZ_SUPPRESS_COND() (heap->ms_running != 0)
 #else
-#define DUK__RZ_SUPPRESS_ASSERT2() do { } while (0)
-#define DUK__RZ_SUPPRESS_COND()  (heap->ms_running != 0)
-#endif  /* DUK_USE_DEBUGGER_SUPPORT */
+#define DUK__RZ_SUPPRESS_ASSERT2() \
+	do { \
+	} while (0)
+#define DUK__RZ_SUPPRESS_COND() (heap->ms_running != 0)
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
 
-#define DUK__RZ_SUPPRESS_CHECK() do { \
+#define DUK__RZ_SUPPRESS_CHECK() \
+	do { \
 		DUK__RZ_SUPPRESS_ASSERT1(); \
 		DUK__RZ_SUPPRESS_ASSERT2(); \
 		if (DUK_UNLIKELY(DUK__RZ_SUPPRESS_COND())) { \
-			DUK_DDD(DUK_DDDPRINT("refzero handling suppressed (not even queued) when mark-and-sweep running, object: %p", (void *) h)); \
+			DUK_DDD( \
+			    DUK_DDDPRINT("refzero handling suppressed (not even queued) when mark-and-sweep running, object: %p", \
+			                 (void *) h)); \
 			return; \
 		} \
 	} while (0)
 
-#define DUK__RZ_STRING() do { \
+#define DUK__RZ_STRING() \
+	do { \
 		duk__refcount_refzero_hstring(heap, (duk_hstring *) h); \
 	} while (0)
-#define DUK__RZ_BUFFER() do { \
+#define DUK__RZ_BUFFER() \
+	do { \
 		duk__refcount_refzero_hbuffer(heap, (duk_hbuffer *) h); \
 	} while (0)
-#define DUK__RZ_OBJECT() do { \
+#define DUK__RZ_OBJECT() \
+	do { \
 		duk__refcount_refzero_hobject(heap, (duk_hobject *) h, skip_free_pending); \
 	} while (0)
 
@@ -51284,6 +54795,7 @@ DUK_LOCAL DUK__RZ_INLINE void duk__heaphdr_refzero_helper(duk_hthread *thr, duk_
 	heap = thr->heap;
 
 	htype = (duk_small_uint_t) DUK_HEAPHDR_GET_TYPE(h);
+	DUK_DDD(DUK_DDDPRINT("ms_running=%ld, heap_thread=%p", (long) thr->heap->ms_running, thr->heap->heap_thread));
 	DUK__RZ_SUPPRESS_CHECK();
 
 	switch (htype) {
@@ -51351,7 +54863,7 @@ DUK_INTERNAL void duk_tval_incref(duk_tval *tv) {
 		DUK_ASSERT(DUK_HEAPHDR_HTYPE_VALID(h));
 		DUK_ASSERT_DISABLE(h->h_refcount >= 0);
 		DUK_HEAPHDR_PREINC_REFCOUNT(h);
-		DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT(h) != 0);  /* No wrapping. */
+		DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT(h) != 0); /* No wrapping. */
 	}
 }
 
@@ -51394,9 +54906,10 @@ DUK_INTERNAL void duk_tval_decref_norz(duk_hthread *thr, duk_tval *tv) {
 #endif
 	}
 }
-#endif  /* !DUK_USE_FAST_REFCOUNT_DEFAULT */
+#endif /* !DUK_USE_FAST_REFCOUNT_DEFAULT */
 
-#define DUK__DECREF_ASSERTS() do { \
+#define DUK__DECREF_ASSERTS() \
+	do { \
 		DUK_ASSERT(thr != NULL); \
 		DUK_ASSERT(thr->heap != NULL); \
 		DUK_ASSERT(h != NULL); \
@@ -51404,14 +54917,16 @@ DUK_INTERNAL void duk_tval_decref_norz(duk_hthread *thr, duk_tval *tv) {
 		DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT((duk_heaphdr *) h) >= 1); \
 	} while (0)
 #if defined(DUK_USE_ROM_OBJECTS)
-#define DUK__INCREF_SHARED() do { \
+#define DUK__INCREF_SHARED() \
+	do { \
 		if (DUK_HEAPHDR_HAS_READONLY((duk_heaphdr *) h)) { \
 			return; \
 		} \
 		DUK_HEAPHDR_PREINC_REFCOUNT((duk_heaphdr *) h); \
-		DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT((duk_heaphdr *) h) != 0);  /* No wrapping. */ \
+		DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT((duk_heaphdr *) h) != 0); /* No wrapping. */ \
 	} while (0)
-#define DUK__DECREF_SHARED() do { \
+#define DUK__DECREF_SHARED() \
+	do { \
 		if (DUK_HEAPHDR_HAS_READONLY((duk_heaphdr *) h)) { \
 			return; \
 		} \
@@ -51420,11 +54935,13 @@ DUK_INTERNAL void duk_tval_decref_norz(duk_hthread *thr, duk_tval *tv) {
 		} \
 	} while (0)
 #else
-#define DUK__INCREF_SHARED() do { \
+#define DUK__INCREF_SHARED() \
+	do { \
 		DUK_HEAPHDR_PREINC_REFCOUNT((duk_heaphdr *) h); \
-		DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT((duk_heaphdr *) h) != 0);  /* No wrapping. */ \
+		DUK_ASSERT(DUK_HEAPHDR_GET_REFCOUNT((duk_heaphdr *) h) != 0); /* No wrapping. */ \
 	} while (0)
-#define DUK__DECREF_SHARED() do { \
+#define DUK__DECREF_SHARED() \
+	do { \
 		if (DUK_HEAPHDR_PREDEC_REFCOUNT((duk_heaphdr *) h) != 0) { \
 			return; \
 		} \
@@ -51458,9 +54975,9 @@ DUK_INTERNAL void duk_heaphdr_decref_norz(duk_hthread *thr, duk_heaphdr *h) {
 	DUK__DECREF_SHARED();
 	duk_heaphdr_refzero_norz(thr, h);
 }
-#endif  /* !DUK_USE_FAST_REFCOUNT_DEFAULT */
+#endif /* !DUK_USE_FAST_REFCOUNT_DEFAULT */
 
-#if 0  /* Not needed. */
+#if 0 /* Not needed. */
 DUK_INTERNAL void duk_hstring_decref(duk_hthread *thr, duk_hstring *h) {
 	DUK__DECREF_ASSERTS();
 	DUK__DECREF_SHARED();
@@ -51493,11 +55010,11 @@ DUK_INTERNAL void duk_hobject_decref_norz(duk_hthread *thr, duk_hobject *h) {
 }
 #endif
 
-#else  /* DUK_USE_REFERENCE_COUNTING */
+#else /* DUK_USE_REFERENCE_COUNTING */
 
 /* no refcounting */
 
-#endif  /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_REFERENCE_COUNTING */
 
 /* automatic undefs */
 #undef DUK__DECREF_ASSERTS
@@ -51535,8 +55052,8 @@ DUK_INTERNAL void duk_heap_strcache_string_remove(duk_heap *heap, duk_hstring *h
 	for (i = 0; i < DUK_HEAP_STRCACHE_SIZE; i++) {
 		duk_strcache_entry *c = heap->strcache + i;
 		if (c->h == h) {
-			DUK_DD(DUK_DDPRINT("deleting weak strcache reference to hstring %p from heap %p",
-			                   (void *) h, (void *) heap));
+			DUK_DD(
+			    DUK_DDPRINT("deleting weak strcache reference to hstring %p from heap %p", (void *) h, (void *) heap));
 			c->h = NULL;
 
 			/* XXX: the string shouldn't appear twice, but we now loop to the
@@ -51646,7 +55163,8 @@ DUK_INTERNAL duk_uint_fast32_t duk_heap_strcache_offset_char2byte(duk_hthread *t
 	 */
 
 	DUK_DDD(DUK_DDDPRINT("non-ascii string %p, char_offset=%ld, clen=%ld, blen=%ld",
-	                     (void *) h, (long) char_offset,
+	                     (void *) h,
+	                     (long) char_offset,
 	                     (long) DUK_HSTRING_GET_CHARLEN(h),
 	                     (long) DUK_HSTRING_GET_BYTELEN(h)));
 
@@ -51660,7 +55178,10 @@ DUK_INTERNAL duk_uint_fast32_t duk_heap_strcache_offset_char2byte(duk_hthread *t
 		for (i = 0; i < DUK_HEAP_STRCACHE_SIZE; i++) {
 			duk_strcache_entry *c = heap->strcache + i;
 			DUK_DDD(DUK_DDDPRINT("  [%ld] -> h=%p, cidx=%ld, bidx=%ld",
-			                     (long) i, (void *) c->h, (long) c->cidx, (long) c->bidx));
+			                     (long) i,
+			                     (void *) c->h,
+			                     (long) c->cidx,
+			                     (long) c->bidx));
 		}
 #endif
 
@@ -51684,7 +55205,8 @@ DUK_INTERNAL duk_uint_fast32_t duk_heap_strcache_offset_char2byte(duk_hthread *t
 	DUK_ASSERT(DUK_HSTRING_GET_CHARLEN(h) >= char_offset);
 	dist_start = char_offset;
 	dist_end = char_length - char_offset;
-	dist_sce = 0; DUK_UNREF(dist_sce);  /* initialize for debug prints, needed if sce==NULL */
+	dist_sce = 0;
+	DUK_UNREF(dist_sce); /* initialize for debug prints, needed if sce==NULL */
 
 	p_start = (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h);
 	p_end = (const duk_uint8_t *) (p_start + DUK_HSTRING_GET_BYTELEN(h));
@@ -51697,14 +55219,15 @@ DUK_INTERNAL duk_uint_fast32_t duk_heap_strcache_offset_char2byte(duk_hthread *t
 				DUK_DDD(DUK_DDDPRINT("non-ascii string, use_cache=%ld, sce=%p:%ld:%ld, "
 				                     "dist_start=%ld, dist_end=%ld, dist_sce=%ld => "
 				                     "scan forwards from sce",
-				                     (long) use_cache, (void *) (sce ? sce->h : NULL),
+				                     (long) use_cache,
+				                     (void *) (sce ? sce->h : NULL),
 				                     (sce ? (long) sce->cidx : (long) -1),
 				                     (sce ? (long) sce->bidx : (long) -1),
-				                     (long) dist_start, (long) dist_end, (long) dist_sce));
+				                     (long) dist_start,
+				                     (long) dist_end,
+				                     (long) dist_sce));
 
-				p_found = duk__scan_forwards(p_start + sce->bidx,
-				                             p_end,
-				                             dist_sce);
+				p_found = duk__scan_forwards(p_start + sce->bidx, p_end, dist_sce);
 				goto scan_done;
 			}
 		} else {
@@ -51713,14 +55236,15 @@ DUK_INTERNAL duk_uint_fast32_t duk_heap_strcache_offset_char2byte(duk_hthread *t
 				DUK_DDD(DUK_DDDPRINT("non-ascii string, use_cache=%ld, sce=%p:%ld:%ld, "
 				                     "dist_start=%ld, dist_end=%ld, dist_sce=%ld => "
 				                     "scan backwards from sce",
-				                     (long) use_cache, (void *) (sce ? sce->h : NULL),
+				                     (long) use_cache,
+				                     (void *) (sce ? sce->h : NULL),
 				                     (sce ? (long) sce->cidx : (long) -1),
 				                     (sce ? (long) sce->bidx : (long) -1),
-				                     (long) dist_start, (long) dist_end, (long) dist_sce));
+				                     (long) dist_start,
+				                     (long) dist_end,
+				                     (long) dist_sce));
 
-				p_found = duk__scan_backwards(p_start + sce->bidx,
-				                              p_start,
-				                              dist_sce);
+				p_found = duk__scan_backwards(p_start + sce->bidx, p_start, dist_sce);
 				goto scan_done;
 			}
 		}
@@ -51732,29 +55256,31 @@ DUK_INTERNAL duk_uint_fast32_t duk_heap_strcache_offset_char2byte(duk_hthread *t
 		DUK_DDD(DUK_DDDPRINT("non-ascii string, use_cache=%ld, sce=%p:%ld:%ld, "
 		                     "dist_start=%ld, dist_end=%ld, dist_sce=%ld => "
 		                     "scan forwards from string start",
-		                     (long) use_cache, (void *) (sce ? sce->h : NULL),
+		                     (long) use_cache,
+		                     (void *) (sce ? sce->h : NULL),
 		                     (sce ? (long) sce->cidx : (long) -1),
 		                     (sce ? (long) sce->bidx : (long) -1),
-		                     (long) dist_start, (long) dist_end, (long) dist_sce));
+		                     (long) dist_start,
+		                     (long) dist_end,
+		                     (long) dist_sce));
 
-		p_found = duk__scan_forwards(p_start,
-		                             p_end,
-		                             dist_start);
+		p_found = duk__scan_forwards(p_start, p_end, dist_start);
 	} else {
 		DUK_DDD(DUK_DDDPRINT("non-ascii string, use_cache=%ld, sce=%p:%ld:%ld, "
 		                     "dist_start=%ld, dist_end=%ld, dist_sce=%ld => "
 		                     "scan backwards from string end",
-		                     (long) use_cache, (void *) (sce ? sce->h : NULL),
+		                     (long) use_cache,
+		                     (void *) (sce ? sce->h : NULL),
 		                     (sce ? (long) sce->cidx : (long) -1),
 		                     (sce ? (long) sce->bidx : (long) -1),
-		                     (long) dist_start, (long) dist_end, (long) dist_sce));
+		                     (long) dist_start,
+		                     (long) dist_end,
+		                     (long) dist_sce));
 
-		p_found = duk__scan_backwards(p_end,
-		                              p_start,
-		                              dist_end);
+		p_found = duk__scan_backwards(p_end, p_start, dist_end);
 	}
 
- scan_done:
+scan_done:
 
 	if (DUK_UNLIKELY(p_found == NULL)) {
 		/* Scan error: this shouldn't normally happen; it could happen if
@@ -51765,11 +55291,10 @@ DUK_INTERNAL duk_uint_fast32_t duk_heap_strcache_offset_char2byte(duk_hthread *t
 	}
 
 	DUK_ASSERT(p_found >= p_start);
-	DUK_ASSERT(p_found <= p_end);  /* may be equal */
+	DUK_ASSERT(p_found <= p_end); /* may be equal */
 	byte_offset = (duk_uint32_t) (p_found - p_start);
 
-	DUK_DDD(DUK_DDDPRINT("-> string %p, cidx %ld -> bidx %ld",
-	                     (void *) h, (long) char_offset, (long) byte_offset));
+	DUK_DDD(DUK_DDDPRINT("-> string %p, cidx %ld -> bidx %ld", (void *) h, (long) char_offset, (long) byte_offset));
 
 	/*
 	 *  Update cache entry (allocating if necessary), and move the
@@ -51779,7 +55304,7 @@ DUK_INTERNAL duk_uint_fast32_t duk_heap_strcache_offset_char2byte(duk_hthread *t
 	if (use_cache) {
 		/* update entry, allocating if necessary */
 		if (!sce) {
-			sce = heap->strcache + DUK_HEAP_STRCACHE_SIZE - 1;  /* take last entry */
+			sce = heap->strcache + DUK_HEAP_STRCACHE_SIZE - 1; /* take last entry */
 			sce->h = h;
 		}
 		DUK_ASSERT(sce != NULL);
@@ -51809,14 +55334,17 @@ DUK_INTERNAL duk_uint_fast32_t duk_heap_strcache_offset_char2byte(duk_hthread *t
 		for (i = 0; i < DUK_HEAP_STRCACHE_SIZE; i++) {
 			duk_strcache_entry *c = heap->strcache + i;
 			DUK_DDD(DUK_DDDPRINT("  [%ld] -> h=%p, cidx=%ld, bidx=%ld",
-			                     (long) i, (void *) c->h, (long) c->cidx, (long) c->bidx));
+			                     (long) i,
+			                     (void *) c->h,
+			                     (long) c->cidx,
+			                     (long) c->bidx));
 		}
 #endif
 	}
 
 	return byte_offset;
 
- scan_error:
+scan_error:
 	DUK_ERROR_INTERNAL(thr);
 	DUK_WO_NORETURN(return 0;);
 }
@@ -51835,16 +55363,16 @@ DUK_INTERNAL duk_uint_fast32_t duk_heap_strcache_offset_char2byte(duk_hthread *t
 #endif
 
 #if defined(DUK_USE_STRTAB_PTRCOMP)
-#define DUK__HEAPPTR_ENC16(heap,ptr)    DUK_USE_HEAPPTR_ENC16((heap)->heap_udata, (ptr))
-#define DUK__HEAPPTR_DEC16(heap,val)    DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (val))
-#define DUK__GET_STRTABLE(heap)         ((heap)->strtable16)
+#define DUK__HEAPPTR_ENC16(heap, ptr) DUK_USE_HEAPPTR_ENC16((heap)->heap_udata, (ptr))
+#define DUK__HEAPPTR_DEC16(heap, val) DUK_USE_HEAPPTR_DEC16((heap)->heap_udata, (val))
+#define DUK__GET_STRTABLE(heap)       ((heap)->strtable16)
 #else
-#define DUK__HEAPPTR_ENC16(heap,ptr)    (ptr)
-#define DUK__HEAPPTR_DEC16(heap,val)    (val)
-#define DUK__GET_STRTABLE(heap)         ((heap)->strtable)
+#define DUK__HEAPPTR_ENC16(heap, ptr) (ptr)
+#define DUK__HEAPPTR_DEC16(heap, val) (val)
+#define DUK__GET_STRTABLE(heap)       ((heap)->strtable)
 #endif
 
-#define DUK__STRTAB_U32_MAX_STRLEN      10               /* 4'294'967'295 */
+#define DUK__STRTAB_U32_MAX_STRLEN 10 /* 4'294'967'295 */
 
 /*
  *  Debug dump stringtable.
@@ -51863,7 +55391,7 @@ DUK_INTERNAL void duk_heap_strtable_dump(duk_heap *heap) {
 	duk_size_t count_chain;
 	duk_size_t count_chain_min = DUK_SIZE_MAX;
 	duk_size_t count_chain_max = 0;
-	duk_size_t count_len[8];  /* chain lengths from 0 to 7 */
+	duk_size_t count_len[8]; /* chain lengths from 0 to 7 */
 
 	if (heap == NULL) {
 		DUK_D(DUK_DPRINT("string table, heap=NULL"));
@@ -51894,15 +55422,21 @@ DUK_INTERNAL void duk_heap_strtable_dump(duk_heap *heap) {
 
 	DUK_D(DUK_DPRINT("string table, strtab=%p, count=%lu, chain min=%lu max=%lu avg=%lf: "
 	                 "counts: %lu %lu %lu %lu %lu %lu %lu %lu ...",
-	                 (void *) heap->strtable, (unsigned long) count_total,
-	                 (unsigned long) count_chain_min, (unsigned long) count_chain_max,
+	                 (void *) heap->strtable,
+	                 (unsigned long) count_total,
+	                 (unsigned long) count_chain_min,
+	                 (unsigned long) count_chain_max,
 	                 (double) count_total / (double) heap->st_size,
-	                 (unsigned long) count_len[0], (unsigned long) count_len[1],
-	                 (unsigned long) count_len[2], (unsigned long) count_len[3],
-	                 (unsigned long) count_len[4], (unsigned long) count_len[5],
-	                 (unsigned long) count_len[6], (unsigned long) count_len[7]));
+	                 (unsigned long) count_len[0],
+	                 (unsigned long) count_len[1],
+	                 (unsigned long) count_len[2],
+	                 (unsigned long) count_len[3],
+	                 (unsigned long) count_len[4],
+	                 (unsigned long) count_len[5],
+	                 (unsigned long) count_len[6],
+	                 (unsigned long) count_len[7]));
 }
-#endif  /* DUK_USE_DEBUG */
+#endif /* DUK_USE_DEBUG */
 
 /*
  *  Assertion helper to ensure strtable is populated correctly.
@@ -51943,7 +55477,7 @@ DUK_LOCAL void duk__strtable_assert_checks(duk_heap *heap) {
 	DUK_ASSERT(count == (duk_size_t) heap->st_count);
 #endif
 }
-#endif  /* DUK_USE_ASSERTIONS */
+#endif /* DUK_USE_ASSERTIONS */
 
 /*
  *  Allocate and initialize a duk_hstring.
@@ -51994,16 +55528,16 @@ DUK_LOCAL duk_hstring *duk__strtable_alloc_hstring(duk_heap *heap,
 #endif
 		DUK_HEAPHDR_SET_TYPE_AND_FLAGS(&res->hdr, DUK_HTYPE_STRING, DUK_HSTRING_FLAG_EXTDATA);
 
-		DUK_ASSERT(extdata[blen] == 0);  /* Application responsibility. */
+		DUK_ASSERT(extdata[blen] == 0); /* Application responsibility. */
 		data = extdata;
 		((duk_hstring_external *) res)->extdata = extdata;
 	} else
-#endif  /* DUK_USE_HSTRING_EXTDATA && DUK_USE_EXTSTR_INTERN_CHECK */
+#endif /* DUK_USE_HSTRING_EXTDATA && DUK_USE_EXTSTR_INTERN_CHECK */
 	{
 		duk_uint8_t *data_tmp;
 
 		/* NUL terminate for convenient C access */
-		DUK_ASSERT(sizeof(duk_hstring) + blen + 1 > blen);  /* No wrap, limits ensure. */
+		DUK_ASSERT(sizeof(duk_hstring) + blen + 1 > blen); /* No wrap, limits ensure. */
 		res = (duk_hstring *) DUK_ALLOC(heap, sizeof(duk_hstring) + blen + 1);
 		if (DUK_UNLIKELY(res == NULL)) {
 			goto alloc_error;
@@ -52062,7 +55596,7 @@ DUK_LOCAL duk_hstring *duk__strtable_alloc_hstring(duk_heap *heap,
 #if defined(DUK_USE_HSTRING_LAZY_CLEN)
 		/* Charlen initialized to 0, updated on-the-fly. */
 #else
-		duk_hstring_init_charlen(res);  /* Also sets ASCII flag. */
+		duk_hstring_init_charlen(res); /* Also sets ASCII flag. */
 #endif
 	}
 
@@ -52075,7 +55609,7 @@ DUK_LOCAL duk_hstring *duk__strtable_alloc_hstring(duk_heap *heap,
 	DUK_ASSERT(res != NULL);
 	return res;
 
- alloc_error:
+alloc_error:
 	return NULL;
 }
 
@@ -52104,13 +55638,13 @@ DUK_LOCAL void duk__strtable_grow_inplace(duk_heap *heap) {
 	DUK_ASSERT(heap != NULL);
 	DUK_ASSERT(heap->st_resizing == 1);
 	DUK_ASSERT(heap->st_size >= 2);
-	DUK_ASSERT((heap->st_size & (heap->st_size - 1)) == 0);  /* 2^N */
+	DUK_ASSERT((heap->st_size & (heap->st_size - 1)) == 0); /* 2^N */
 	DUK_ASSERT(DUK__GET_STRTABLE(heap) != NULL);
 
 	DUK_STATS_INC(heap, stats_strtab_resize_grow);
 
 	new_st_size = heap->st_size << 1U;
-	DUK_ASSERT(new_st_size > heap->st_size);  /* No overflow. */
+	DUK_ASSERT(new_st_size > heap->st_size); /* No overflow. */
 
 	/* Reallocate the strtable first and then work in-place to rehash
 	 * strings.  We don't need an indirect allocation here: even if GC
@@ -52194,7 +55728,7 @@ DUK_LOCAL void duk__strtable_grow_inplace(duk_heap *heap) {
 	duk__strtable_assert_checks(heap);
 #endif
 }
-#endif  /* DUK__STRTAB_RESIZE_CHECK */
+#endif /* DUK__STRTAB_RESIZE_CHECK */
 
 /*
  *  Shrink strtable allocation in-place.
@@ -52222,7 +55756,7 @@ DUK_LOCAL void duk__strtable_shrink_inplace(duk_heap *heap) {
 	DUK_ASSERT(heap != NULL);
 	DUK_ASSERT(heap->st_resizing == 1);
 	DUK_ASSERT(heap->st_size >= 2);
-	DUK_ASSERT((heap->st_size & (heap->st_size - 1)) == 0);  /* 2^N */
+	DUK_ASSERT((heap->st_size & (heap->st_size - 1)) == 0); /* 2^N */
 	DUK_ASSERT(DUK__GET_STRTABLE(heap) != NULL);
 
 	DUK_STATS_INC(heap, stats_strtab_resize_shrink);
@@ -52280,7 +55814,7 @@ DUK_LOCAL void duk__strtable_shrink_inplace(duk_heap *heap) {
 	duk__strtable_assert_checks(heap);
 #endif
 }
-#endif  /* DUK__STRTAB_RESIZE_CHECK */
+#endif /* DUK__STRTAB_RESIZE_CHECK */
 
 /*
  *  Grow/shrink check.
@@ -52288,7 +55822,7 @@ DUK_LOCAL void duk__strtable_shrink_inplace(duk_heap *heap) {
 
 #if defined(DUK__STRTAB_RESIZE_CHECK)
 DUK_LOCAL DUK_COLD DUK_NOINLINE void duk__strtable_resize_check(duk_heap *heap) {
-	duk_uint32_t load_factor;  /* fixed point */
+	duk_uint32_t load_factor; /* fixed point */
 
 	DUK_ASSERT(heap != NULL);
 #if defined(DUK_USE_STRTAB_PTRCOMP)
@@ -52312,7 +55846,8 @@ DUK_LOCAL DUK_COLD DUK_NOINLINE void duk__strtable_resize_check(duk_heap *heap)
 	load_factor = heap->st_count / (heap->st_size >> 4U);
 
 	DUK_DD(DUK_DDPRINT("resize check string table: size=%lu, count=%lu, load_factor=%lu (fixed point .4; float %lf)",
-	                   (unsigned long) heap->st_size, (unsigned long) heap->st_count,
+	                   (unsigned long) heap->st_size,
+	                   (unsigned long) heap->st_count,
 	                   (unsigned long) load_factor,
 	                   (double) heap->st_count / (double) heap->st_size));
 
@@ -52320,7 +55855,9 @@ DUK_LOCAL DUK_COLD DUK_NOINLINE void duk__strtable_resize_check(duk_heap *heap)
 		if (heap->st_size >= DUK_USE_STRTAB_MAXSIZE) {
 			DUK_DD(DUK_DDPRINT("want to grow strtable (based on load factor) but already maximum size"));
 		} else {
-			DUK_D(DUK_DPRINT("grow string table: %lu -> %lu", (unsigned long) heap->st_size, (unsigned long) heap->st_size * 2));
+			DUK_D(DUK_DPRINT("grow string table: %lu -> %lu",
+			                 (unsigned long) heap->st_size,
+			                 (unsigned long) heap->st_size * 2));
 #if defined(DUK_USE_DEBUG)
 			duk_heap_strtable_dump(heap);
 #endif
@@ -52330,7 +55867,9 @@ DUK_LOCAL DUK_COLD DUK_NOINLINE void duk__strtable_resize_check(duk_heap *heap)
 		if (heap->st_size <= DUK_USE_STRTAB_MINSIZE) {
 			DUK_DD(DUK_DDPRINT("want to shrink strtable (based on load factor) but already minimum size"));
 		} else {
-			DUK_D(DUK_DPRINT("shrink string table: %lu -> %lu", (unsigned long) heap->st_size, (unsigned long) heap->st_size / 2));
+			DUK_D(DUK_DPRINT("shrink string table: %lu -> %lu",
+			                 (unsigned long) heap->st_size,
+			                 (unsigned long) heap->st_size / 2));
 #if defined(DUK_USE_DEBUG)
 			duk_heap_strtable_dump(heap);
 #endif
@@ -52342,7 +55881,7 @@ DUK_LOCAL DUK_COLD DUK_NOINLINE void duk__strtable_resize_check(duk_heap *heap)
 
 	heap->st_resizing = 0;
 }
-#endif  /* DUK__STRTAB_RESIZE_CHECK */
+#endif /* DUK__STRTAB_RESIZE_CHECK */
 
 /*
  *  Torture grow/shrink: unconditionally grow and shrink back.
@@ -52366,7 +55905,7 @@ DUK_LOCAL void duk__strtable_resize_torture(duk_heap *heap) {
 	}
 	heap->st_resizing = 0;
 }
-#endif  /* DUK_USE_STRTAB_TORTURE && DUK__STRTAB_RESIZE_CHECK */
+#endif /* DUK_USE_STRTAB_TORTURE && DUK__STRTAB_RESIZE_CHECK */
 
 /*
  *  Raw intern; string already checked not to be present.
@@ -52382,8 +55921,12 @@ DUK_LOCAL duk_hstring *duk__strtable_do_intern(duk_heap *heap, const duk_uint8_t
 #endif
 
 	DUK_DDD(DUK_DDDPRINT("do_intern: heap=%p, str=%p, blen=%lu, strhash=%lx, st_size=%lu, st_count=%lu, load=%lf",
-	                     (void *) heap, (const void *) str, (unsigned long) blen, (unsigned long) strhash,
-	                     (unsigned long) heap->st_size, (unsigned long) heap->st_count,
+	                     (void *) heap,
+	                     (const void *) str,
+	                     (unsigned long) blen,
+	                     (unsigned long) strhash,
+	                     (unsigned long) heap->st_size,
+	                     (unsigned long) heap->st_count,
 	                     (double) heap->st_count / (double) heap->st_size));
 
 	DUK_ASSERT(heap != NULL);
@@ -52399,7 +55942,7 @@ DUK_LOCAL duk_hstring *duk__strtable_do_intern(duk_heap *heap, const duk_uint8_t
 	 */
 
 	heap->pf_prevent_count++;
-	DUK_ASSERT(heap->pf_prevent_count != 0);  /* Wrap. */
+	DUK_ASSERT(heap->pf_prevent_count != 0); /* Wrap. */
 
 #if defined(DUK_USE_STRTAB_TORTURE) && defined(DUK__STRTAB_RESIZE_CHECK)
 	duk__strtable_resize_torture(heap);
@@ -52426,7 +55969,8 @@ DUK_LOCAL duk_hstring *duk__strtable_do_intern(duk_heap *heap, const duk_uint8_t
 	/* External string check (low memory optimization). */
 
 #if defined(DUK_USE_HSTRING_EXTDATA) && defined(DUK_USE_EXTSTR_INTERN_CHECK)
-	extdata = (const duk_uint8_t *) DUK_USE_EXTSTR_INTERN_CHECK(heap->heap_udata, (void *) DUK_LOSE_CONST(str), (duk_size_t) blen);
+	extdata =
+	    (const duk_uint8_t *) DUK_USE_EXTSTR_INTERN_CHECK(heap->heap_udata, (void *) DUK_LOSE_CONST(str), (duk_size_t) blen);
 #else
 	extdata = (const duk_uint8_t *) NULL;
 #endif
@@ -52464,7 +56008,7 @@ DUK_LOCAL duk_hstring *duk__strtable_do_intern(duk_heap *heap, const duk_uint8_t
 #else
 	slot = heap->strtable + (strhash & heap->st_mask);
 #endif
-	DUK_ASSERT(res->hdr.h_next == NULL);  /* This is the case now, but unnecessary zeroing/NULLing. */
+	DUK_ASSERT(res->hdr.h_next == NULL); /* This is the case now, but unnecessary zeroing/NULLing. */
 	res->hdr.h_next = DUK__HEAPPTR_DEC16(heap, *slot);
 	*slot = DUK__HEAPPTR_ENC16(heap, res);
 
@@ -52511,11 +56055,12 @@ DUK_LOCAL duk_hstring *duk__strtab_romstring_lookup(duk_heap *heap, const duk_ui
 	curr = (duk_hstring *) DUK_LOSE_CONST(duk_rom_strings_lookup[lookup_hash]);
 	while (curr != NULL) {
 		/* Unsafe memcmp() because for zero blen, str may be NULL. */
-		if (strhash == DUK_HSTRING_GET_HASH(curr) &&
-		    blen == DUK_HSTRING_GET_BYTELEN(curr) &&
+		if (strhash == DUK_HSTRING_GET_HASH(curr) && blen == DUK_HSTRING_GET_BYTELEN(curr) &&
 		    duk_memcmp_unsafe((const void *) str, (const void *) DUK_HSTRING_GET_DATA(curr), blen) == 0) {
 			DUK_DDD(DUK_DDDPRINT("intern check: rom string: %!O, computed hash 0x%08lx, rom hash 0x%08lx",
-			                     curr, (unsigned long) strhash, (unsigned long) DUK_HSTRING_GET_HASH(curr)));
+			                     curr,
+			                     (unsigned long) strhash,
+			                     (unsigned long) DUK_HSTRING_GET_HASH(curr)));
 			return curr;
 		}
 		curr = curr->hdr.h_next;
@@ -52523,7 +56068,7 @@ DUK_LOCAL duk_hstring *duk__strtab_romstring_lookup(duk_heap *heap, const duk_ui
 
 	return NULL;
 }
-#endif  /* DUK_USE_ROM_STRINGS */
+#endif /* DUK_USE_ROM_STRINGS */
 
 DUK_INTERNAL duk_hstring *duk_heap_strtable_intern(duk_heap *heap, const duk_uint8_t *str, duk_uint32_t blen) {
 	duk_uint32_t strhash;
@@ -52536,7 +56081,7 @@ DUK_INTERNAL duk_hstring *duk_heap_strtable_intern(duk_heap *heap, const duk_uin
 	/* XXX: maybe just require 'str != NULL' even for zero size? */
 	DUK_ASSERT(heap != NULL);
 	DUK_ASSERT(blen == 0 || str != NULL);
-	DUK_ASSERT(blen <= DUK_HSTRING_MAX_BYTELEN);  /* Caller is responsible for ensuring this. */
+	DUK_ASSERT(blen <= DUK_HSTRING_MAX_BYTELEN); /* Caller is responsible for ensuring this. */
 	strhash = duk_heap_hashstring(heap, str, (duk_size_t) blen);
 
 	/* String table lookup. */
@@ -52550,8 +56095,7 @@ DUK_INTERNAL duk_hstring *duk_heap_strtable_intern(duk_heap *heap, const duk_uin
 	h = heap->strtable[strhash & heap->st_mask];
 #endif
 	while (h != NULL) {
-		if (DUK_HSTRING_GET_HASH(h) == strhash &&
-		    DUK_HSTRING_GET_BYTELEN(h) == blen &&
+		if (DUK_HSTRING_GET_HASH(h) == strhash && DUK_HSTRING_GET_BYTELEN(h) == blen &&
 		    duk_memcmp_unsafe((const void *) str, (const void *) DUK_HSTRING_GET_DATA(h), (size_t) blen) == 0) {
 			/* Found existing entry. */
 			DUK_STATS_INC(heap, stats_strtab_intern_hit);
@@ -52577,7 +56121,7 @@ DUK_INTERNAL duk_hstring *duk_heap_strtable_intern(duk_heap *heap, const duk_uin
 
 	DUK_STATS_INC(heap, stats_strtab_intern_miss);
 	h = duk__strtable_do_intern(heap, str, blen, strhash);
-	return h;  /* may be NULL */
+	return h; /* may be NULL */
 }
 
 /*
@@ -52600,7 +56144,7 @@ DUK_INTERNAL duk_hstring *duk_heap_strtable_intern_u32(duk_heap *heap, duk_uint3
 		p--;
 		*p = duk_lc_digits[val % 10];
 		val = val / 10;
-	} while (val != 0);  /* For val == 0, emit exactly one '0'. */
+	} while (val != 0); /* For val == 0, emit exactly one '0'. */
 	DUK_ASSERT(p >= buf);
 
 	return duk_heap_strtable_intern(heap, (const duk_uint8_t *) p, (duk_uint32_t) ((buf + sizeof(buf)) - p));
@@ -52638,7 +56182,7 @@ DUK_LOCAL duk_uint_t duk__strtable_litcache_key(const duk_uint8_t *str, duk_uint
 	DUK_ASSERT(DUK_IS_POWER_OF_TWO((duk_uint_t) DUK_USE_LITCACHE_SIZE));
 
 	key = (duk_uintptr_t) blen ^ (duk_uintptr_t) str;
-	key &= (duk_uintptr_t) (DUK_USE_LITCACHE_SIZE - 1);  /* Assumes size is power of 2. */
+	key &= (duk_uintptr_t) (DUK_USE_LITCACHE_SIZE - 1); /* Assumes size is power of 2. */
 	/* Due to masking, cast is in 32-bit range. */
 	DUK_ASSERT(key <= DUK_UINT_MAX);
 	return (duk_uint_t) key;
@@ -52654,7 +56198,9 @@ DUK_INTERNAL duk_hstring *duk_heap_strtable_intern_literal_checked(duk_hthread *
 	ent = thr->heap->litcache + key;
 	if (ent->addr == str) {
 		DUK_DD(DUK_DDPRINT("intern check for cached, pinned literal: str=%p, blen=%ld -> duk_hstring %!O",
-		                   (const void *) str, (long) blen, (duk_heaphdr *) ent->h));
+		                   (const void *) str,
+		                   (long) blen,
+		                   (duk_heaphdr *) ent->h));
 		DUK_ASSERT(ent->h != NULL);
 		DUK_ASSERT(DUK_HSTRING_HAS_PINNED_LITERAL(ent->h));
 		DUK_STATS_INC(thr->heap, stats_strtab_litcache_hit);
@@ -52684,7 +56230,7 @@ DUK_INTERNAL duk_hstring *duk_heap_strtable_intern_literal_checked(duk_hthread *
 
 	return h;
 }
-#endif  /* DUK_USE_LITCACHE_SIZE */
+#endif /* DUK_USE_LITCACHE_SIZE */
 
 DUK_INTERNAL duk_hstring *duk_heap_strtable_intern_u32_checked(duk_hthread *thr, duk_uint32_t val) {
 	duk_hstring *res;
@@ -52719,7 +56265,8 @@ DUK_INTERNAL void duk_heap_strtable_unlink(duk_heap *heap, duk_hstring *h) {
 	duk_hstring *prev;
 
 	DUK_DDD(DUK_DDDPRINT("remove: heap=%p, h=%p, blen=%lu, strhash=%lx",
-	                     (void *) heap, (void *) h,
+	                     (void *) heap,
+	                     (void *) h,
 	                     (unsigned long) (h != NULL ? DUK_HSTRING_GET_BYTELEN(h) : 0),
 	                     (unsigned long) (h != NULL ? DUK_HSTRING_GET_HASH(h) : 0)));
 
@@ -52737,13 +56284,13 @@ DUK_INTERNAL void duk_heap_strtable_unlink(duk_heap *heap, duk_hstring *h) {
 	slot = heap->strtable + (DUK_HSTRING_GET_HASH(h) & heap->st_mask);
 #endif
 	other = DUK__HEAPPTR_DEC16(heap, *slot);
-	DUK_ASSERT(other != NULL);  /* At least argument string is in the chain. */
+	DUK_ASSERT(other != NULL); /* At least argument string is in the chain. */
 
 	prev = NULL;
 	while (other != h) {
 		prev = other;
 		other = other->hdr.h_next;
-		DUK_ASSERT(other != NULL);  /* We'll eventually find 'h'. */
+		DUK_ASSERT(other != NULL); /* We'll eventually find 'h'. */
 	}
 	if (prev != NULL) {
 		/* Middle of list. */
@@ -52757,7 +56304,7 @@ DUK_INTERNAL void duk_heap_strtable_unlink(duk_heap *heap, duk_hstring *h) {
 	 * intern will do one.
 	 */
 }
-#endif  /* DUK_USE_REFERENCE_COUNTING */
+#endif /* DUK_USE_REFERENCE_COUNTING */
 
 /* Unlink with a 'prev' pointer. */
 DUK_INTERNAL void duk_heap_strtable_unlink_prev(duk_heap *heap, duk_hstring *h, duk_hstring *prev) {
@@ -52768,7 +56315,9 @@ DUK_INTERNAL void duk_heap_strtable_unlink_prev(duk_heap *heap, duk_hstring *h,
 #endif
 
 	DUK_DDD(DUK_DDDPRINT("remove: heap=%p, prev=%p, h=%p, blen=%lu, strhash=%lx",
-	                     (void *) heap, (void *) prev, (void *) h,
+	                     (void *) heap,
+	                     (void *) prev,
+	                     (void *) h,
 	                     (unsigned long) (h != NULL ? DUK_HSTRING_GET_BYTELEN(h) : 0),
 	                     (unsigned long) (h != NULL ? DUK_HSTRING_GET_HASH(h) : 0)));
 
@@ -52870,6 +56419,84 @@ DUK_INTERNAL void duk_heap_strtable_free(duk_heap *heap) {
 #undef DUK__HEAPPTR_ENC16
 #undef DUK__STRTAB_U32_MAX_STRLEN
 /*
+ *  duk_heaphdr assertion helpers
+ */
+
+/* #include duk_internal.h -> already included */
+
+#if defined(DUK_USE_ASSERTIONS)
+
+#if defined(DUK_USE_DOUBLE_LINKED_HEAP)
+DUK_INTERNAL void duk_heaphdr_assert_links(duk_heap *heap, duk_heaphdr *h) {
+	DUK_UNREF(heap);
+	if (h != NULL) {
+		duk_heaphdr *h_prev, *h_next;
+		h_prev = DUK_HEAPHDR_GET_PREV(heap, h);
+		h_next = DUK_HEAPHDR_GET_NEXT(heap, h);
+		DUK_ASSERT(h_prev == NULL || (DUK_HEAPHDR_GET_NEXT(heap, h_prev) == h));
+		DUK_ASSERT(h_next == NULL || (DUK_HEAPHDR_GET_PREV(heap, h_next) == h));
+	}
+}
+#else
+DUK_INTERNAL void duk_heaphdr_assert_links(duk_heap *heap, duk_heaphdr *h) {
+	DUK_UNREF(heap);
+	DUK_UNREF(h);
+}
+#endif
+
+DUK_INTERNAL void duk_heaphdr_assert_valid(duk_heaphdr *h) {
+	DUK_ASSERT(h != NULL);
+	DUK_ASSERT(DUK_HEAPHDR_HTYPE_VALID(h));
+}
+
+/* Assert validity of a heaphdr, including all subclasses. */
+DUK_INTERNAL void duk_heaphdr_assert_valid_subclassed(duk_heaphdr *h) {
+	switch (DUK_HEAPHDR_GET_TYPE(h)) {
+	case DUK_HTYPE_OBJECT: {
+		duk_hobject *h_obj = (duk_hobject *) h;
+		DUK_HOBJECT_ASSERT_VALID(h_obj);
+		if (DUK_HOBJECT_IS_COMPFUNC(h_obj)) {
+			DUK_HCOMPFUNC_ASSERT_VALID((duk_hcompfunc *) h_obj);
+		} else if (DUK_HOBJECT_IS_NATFUNC(h_obj)) {
+			DUK_HNATFUNC_ASSERT_VALID((duk_hnatfunc *) h_obj);
+		} else if (DUK_HOBJECT_IS_DECENV(h_obj)) {
+			DUK_HDECENV_ASSERT_VALID((duk_hdecenv *) h_obj);
+		} else if (DUK_HOBJECT_IS_OBJENV(h_obj)) {
+			DUK_HOBJENV_ASSERT_VALID((duk_hobjenv *) h_obj);
+		} else if (DUK_HOBJECT_IS_BUFOBJ(h_obj)) {
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
+			DUK_HBUFOBJ_ASSERT_VALID((duk_hbufobj *) h_obj);
+#endif
+		} else if (DUK_HOBJECT_IS_BOUNDFUNC(h_obj)) {
+			DUK_HBOUNDFUNC_ASSERT_VALID((duk_hboundfunc *) h_obj);
+		} else if (DUK_HOBJECT_IS_PROXY(h_obj)) {
+			DUK_HPROXY_ASSERT_VALID((duk_hproxy *) h_obj);
+		} else if (DUK_HOBJECT_IS_THREAD(h_obj)) {
+			DUK_HTHREAD_ASSERT_VALID((duk_hthread *) h_obj);
+		} else {
+			/* Just a plain object. */
+			;
+		}
+		break;
+	}
+	case DUK_HTYPE_STRING: {
+		duk_hstring *h_str = (duk_hstring *) h;
+		DUK_HSTRING_ASSERT_VALID(h_str);
+		break;
+	}
+	case DUK_HTYPE_BUFFER: {
+		duk_hbuffer *h_buf = (duk_hbuffer *) h;
+		DUK_HBUFFER_ASSERT_VALID(h_buf);
+		break;
+	}
+	default: {
+		DUK_ASSERT(0);
+	}
+	}
+}
+
+#endif /* DUK_USE_ASSERTIONS */
+/*
  *  Hobject allocation.
  *
  *  Provides primitive allocation functions for all object types (plain object,
@@ -52892,7 +56519,7 @@ DUK_LOCAL void duk__init_object_parts(duk_heap *heap, duk_uint_t hobject_flags,
 	/* Zeroed by caller. */
 
 	obj->hdr.h_flags = hobject_flags | DUK_HTYPE_OBJECT;
-	DUK_ASSERT(DUK_HEAPHDR_GET_TYPE(&obj->hdr) == DUK_HTYPE_OBJECT);  /* Assume zero shift. */
+	DUK_ASSERT(DUK_HEAPHDR_GET_TYPE(&obj->hdr) == DUK_HTYPE_OBJECT); /* Assume zero shift. */
 
 #if defined(DUK_USE_EXPLICIT_NULL_INIT)
 	DUK_HOBJECT_SET_PROTOTYPE(heap, obj, NULL);
@@ -52905,7 +56532,7 @@ DUK_LOCAL void duk__init_object_parts(duk_heap *heap, duk_uint_t hobject_flags,
 	DUK_HEAPHDR_SET_PREV(heap, &obj->hdr, NULL);
 #endif
 #endif
-	DUK_ASSERT_HEAPHDR_LINKS(heap, &obj->hdr);
+	DUK_HEAPHDR_ASSERT_LINKS(heap, &obj->hdr);
 	DUK_HEAP_INSERT_INTO_HEAP_ALLOCATED(heap, &obj->hdr);
 
 	/* obj->props is intentionally left as NULL, and duk_hobject_props.c must deal
@@ -53025,10 +56652,10 @@ DUK_INTERNAL duk_hbufobj *duk_hbufobj_alloc(duk_hthread *thr, duk_uint_t hobject
 	res->buf_prop = NULL;
 #endif
 
-	DUK_ASSERT_HBUFOBJ_VALID(res);
+	DUK_HBUFOBJ_ASSERT_VALID(res);
 	return res;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /* Allocate a new thread.
  *
@@ -53141,6 +56768,130 @@ DUK_INTERNAL duk_hproxy *duk_hproxy_alloc(duk_hthread *thr, duk_uint_t hobject_f
 	return res;
 }
 /*
+ *  duk_hobject and subclass assertion helpers
+ */
+
+/* #include duk_internal.h -> already included */
+
+#if defined(DUK_USE_ASSERTIONS)
+
+DUK_INTERNAL void duk_hobject_assert_valid(duk_hobject *h) {
+	DUK_ASSERT(h != NULL);
+	DUK_ASSERT(!DUK_HOBJECT_IS_CALLABLE(h) || DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_FUNCTION);
+	DUK_ASSERT(!DUK_HOBJECT_IS_BUFOBJ(h) || (DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_ARRAYBUFFER ||
+	                                         DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_DATAVIEW ||
+	                                         DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_INT8ARRAY ||
+	                                         DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_UINT8ARRAY ||
+	                                         DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_UINT8CLAMPEDARRAY ||
+	                                         DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_INT16ARRAY ||
+	                                         DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_UINT16ARRAY ||
+	                                         DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_INT32ARRAY ||
+	                                         DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_UINT32ARRAY ||
+	                                         DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_FLOAT32ARRAY ||
+	                                         DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_FLOAT64ARRAY));
+	/* Object is an Array <=> object has exotic array behavior */
+	DUK_ASSERT((DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_ARRAY && DUK_HOBJECT_HAS_EXOTIC_ARRAY(h)) ||
+	           (DUK_HOBJECT_GET_CLASS_NUMBER(h) != DUK_HOBJECT_CLASS_ARRAY && !DUK_HOBJECT_HAS_EXOTIC_ARRAY(h)));
+}
+
+DUK_INTERNAL void duk_harray_assert_valid(duk_harray *h) {
+	DUK_ASSERT(h != NULL);
+	DUK_ASSERT(DUK_HOBJECT_IS_ARRAY((duk_hobject *) h));
+	DUK_ASSERT(DUK_HOBJECT_HAS_EXOTIC_ARRAY((duk_hobject *) h));
+}
+
+DUK_INTERNAL void duk_hboundfunc_assert_valid(duk_hboundfunc *h) {
+	DUK_ASSERT(h != NULL);
+	DUK_ASSERT(DUK_HOBJECT_IS_BOUNDFUNC((duk_hobject *) h));
+	DUK_ASSERT(DUK_TVAL_IS_LIGHTFUNC(&h->target) ||
+	           (DUK_TVAL_IS_OBJECT(&h->target) && DUK_HOBJECT_IS_CALLABLE(DUK_TVAL_GET_OBJECT(&h->target))));
+	DUK_ASSERT(!DUK_TVAL_IS_UNUSED(&h->this_binding));
+	DUK_ASSERT(h->nargs == 0 || h->args != NULL);
+}
+
+#if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
+DUK_INTERNAL void duk_hbufobj_assert_valid(duk_hbufobj *h) {
+	DUK_ASSERT(h != NULL);
+	DUK_ASSERT(h->shift <= 3);
+	DUK_ASSERT(h->elem_type <= DUK_HBUFOBJ_ELEM_MAX);
+	DUK_ASSERT((h->shift == 0 && h->elem_type == DUK_HBUFOBJ_ELEM_UINT8) ||
+	           (h->shift == 0 && h->elem_type == DUK_HBUFOBJ_ELEM_UINT8CLAMPED) ||
+	           (h->shift == 0 && h->elem_type == DUK_HBUFOBJ_ELEM_INT8) ||
+	           (h->shift == 1 && h->elem_type == DUK_HBUFOBJ_ELEM_UINT16) ||
+	           (h->shift == 1 && h->elem_type == DUK_HBUFOBJ_ELEM_INT16) ||
+	           (h->shift == 2 && h->elem_type == DUK_HBUFOBJ_ELEM_UINT32) ||
+	           (h->shift == 2 && h->elem_type == DUK_HBUFOBJ_ELEM_INT32) ||
+	           (h->shift == 2 && h->elem_type == DUK_HBUFOBJ_ELEM_FLOAT32) ||
+	           (h->shift == 3 && h->elem_type == DUK_HBUFOBJ_ELEM_FLOAT64));
+	DUK_ASSERT(h->is_typedarray == 0 || h->is_typedarray == 1);
+	DUK_ASSERT(DUK_HOBJECT_IS_BUFOBJ((duk_hobject *) h));
+	if (h->buf == NULL) {
+		DUK_ASSERT(h->offset == 0);
+		DUK_ASSERT(h->length == 0);
+	} else {
+		/* No assertions for offset or length; in particular,
+		 * it's OK for length to be longer than underlying
+		 * buffer.  Just ensure they don't wrap when added.
+		 */
+		DUK_ASSERT(h->offset + h->length >= h->offset);
+	}
+}
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
+
+DUK_INTERNAL void duk_hcompfunc_assert_valid(duk_hcompfunc *h) {
+	DUK_ASSERT(h != NULL);
+}
+
+DUK_INTERNAL void duk_hnatfunc_assert_valid(duk_hnatfunc *h) {
+	DUK_ASSERT(h != NULL);
+}
+
+DUK_INTERNAL void duk_hdecenv_assert_valid(duk_hdecenv *h) {
+	DUK_ASSERT(h != NULL);
+	DUK_ASSERT(DUK_HOBJECT_IS_DECENV((duk_hobject *) h));
+	DUK_ASSERT(h->thread == NULL || h->varmap != NULL);
+}
+
+DUK_INTERNAL void duk_hobjenv_assert_valid(duk_hobjenv *h) {
+	DUK_ASSERT(h != NULL);
+	DUK_ASSERT(DUK_HOBJECT_IS_OBJENV((duk_hobject *) h));
+	DUK_ASSERT(h->target != NULL);
+	DUK_ASSERT(h->has_this == 0 || h->has_this == 1);
+}
+
+DUK_INTERNAL void duk_hproxy_assert_valid(duk_hproxy *h) {
+	DUK_ASSERT(h != NULL);
+	DUK_ASSERT(h->target != NULL);
+	DUK_ASSERT(h->handler != NULL);
+	DUK_ASSERT(DUK_HOBJECT_HAS_EXOTIC_PROXYOBJ((duk_hobject *) h));
+}
+
+DUK_INTERNAL void duk_hthread_assert_valid(duk_hthread *thr) {
+	DUK_ASSERT(thr != NULL);
+	DUK_ASSERT(DUK_HEAPHDR_GET_TYPE((duk_heaphdr *) thr) == DUK_HTYPE_OBJECT);
+	DUK_ASSERT(DUK_HOBJECT_IS_THREAD((duk_hobject *) thr));
+	DUK_ASSERT(thr->unused1 == 0);
+	DUK_ASSERT(thr->unused2 == 0);
+}
+
+DUK_INTERNAL void duk_ctx_assert_valid(duk_hthread *thr) {
+	DUK_ASSERT(thr != NULL);
+	DUK_HTHREAD_ASSERT_VALID(thr);
+	DUK_ASSERT(thr->valstack != NULL);
+	DUK_ASSERT(thr->valstack_bottom != NULL);
+	DUK_ASSERT(thr->valstack_top != NULL);
+	DUK_ASSERT(thr->valstack_end != NULL);
+	DUK_ASSERT(thr->valstack_alloc_end != NULL);
+	DUK_ASSERT(thr->valstack_alloc_end >= thr->valstack);
+	DUK_ASSERT(thr->valstack_end >= thr->valstack);
+	DUK_ASSERT(thr->valstack_top >= thr->valstack);
+	DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
+	DUK_ASSERT(thr->valstack_end >= thr->valstack_top);
+	DUK_ASSERT(thr->valstack_alloc_end >= thr->valstack_end);
+}
+
+#endif /* DUK_USE_ASSERTIONS */
+/*
  *  Object enumeration support.
  *
  *  Creates an internal enumeration state object to be used e.g. with for-in
@@ -53166,7 +56917,7 @@ DUK_INTERNAL duk_hproxy *duk_hproxy_alloc(duk_hthread *thr, duk_uint_t hobject_f
 /* First enumerated key index in enumerator object, must match exactly the
  * number of control properties inserted to the enumerator.
  */
-#define DUK__ENUM_START_INDEX  2
+#define DUK__ENUM_START_INDEX 2
 
 /* Current implementation suffices for ES2015 for now because there's no symbol
  * sorting, so commented out for now.
@@ -53235,7 +56986,7 @@ DUK_LOCAL duk_bool_t duk__sort_compare_es6(duk_hstring *a, duk_hstring *b, duk__
 
 	DUK_ASSERT(a != NULL);
 	DUK_ASSERT(b != NULL);
-	DUK_UNREF(b);  /* Not actually needed now, val_b suffices. */
+	DUK_UNREF(b); /* Not actually needed now, val_b suffices. */
 
 	val_a = duk__hstring_sort_key(a);
 
@@ -53256,7 +57007,7 @@ DUK_LOCAL void duk__sort_enum_keys_es6(duk_hthread *thr, duk_hobject *h_obj, duk
 	DUK_UNREF(thr);
 
 	if (idx_end <= idx_start + 1) {
-		return;  /* Zero or one element(s). */
+		return; /* Zero or one element(s). */
 	}
 
 	keys = DUK_HOBJECT_E_GET_KEY_BASE(thr->heap, h_obj);
@@ -53274,7 +57025,7 @@ DUK_LOCAL void duk__sort_enum_keys_es6(duk_hthread *thr, duk_hobject *h_obj, duk
 		 * (and optimized for) case.
 		 */
 
-		val_curr = duk__hstring_sort_key(h_curr);  /* Remains same during scanning. */
+		val_curr = duk__hstring_sort_key(h_curr); /* Remains same during scanning. */
 		for (idx_insert = idx - 1; idx_insert >= idx_start; idx_insert--) {
 			duk_hstring *h_insert;
 			h_insert = keys[idx_insert];
@@ -53307,6 +57058,13 @@ DUK_LOCAL void duk__sort_enum_keys_es6(duk_hthread *thr, duk_hobject *h_obj, duk
 			keys[idx_insert] = h_curr;
 		}
 	}
+
+	/* Entry part has been reordered now with no side effects.
+	 * If the object has a hash part, it will now be incorrect
+	 * and we need to rehash.  Do that by forcing a resize to
+	 * the current size.
+	 */
+	duk_hobject_resize_entrypart(thr, h_obj, DUK_HOBJECT_GET_ESIZE(h_obj));
 }
 
 /*
@@ -53340,7 +57098,7 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_hthread *thr, duk_small_uint
 	duk_hobject *h_proxy_handler;
 	duk_hobject *h_trap_result;
 #endif
-	duk_uint_fast32_t i, len;  /* used for array, stack, and entry indices */
+	duk_uint_fast32_t i, len; /* used for array, stack, and entry indices */
 	duk_uint_fast32_t sort_start_index;
 
 	DUK_ASSERT(thr != NULL);
@@ -53359,11 +57117,11 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_hthread *thr, duk_small_uint
 	 * real object to check against.
 	 */
 	duk_push_hobject(thr, enum_target);
-	duk_put_prop_stridx_short(thr, -2, DUK_STRIDX_INT_TARGET);
+	duk_put_prop_stridx_short(thr, -2, DUK_STRIDX_INT_TARGET); /* Target is bare, plain put OK. */
 
 	/* Initialize index so that we skip internal control keys. */
 	duk_push_int(thr, DUK__ENUM_START_INDEX);
-	duk_put_prop_stridx_short(thr, -2, DUK_STRIDX_INT_NEXT);
+	duk_put_prop_stridx_short(thr, -2, DUK_STRIDX_INT_NEXT); /* Target is bare, plain put OK. */
 
 	/*
 	 *  Proxy object handling
@@ -53373,9 +57131,7 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_hthread *thr, duk_small_uint
 	if (DUK_LIKELY((enum_flags & DUK_ENUM_NO_PROXY_BEHAVIOR) != 0)) {
 		goto skip_proxy;
 	}
-	if (DUK_LIKELY(!duk_hobject_proxy_check(enum_target,
-	                                        &h_proxy_target,
-	                                        &h_proxy_handler))) {
+	if (DUK_LIKELY(!duk_hobject_proxy_check(enum_target, &h_proxy_target, &h_proxy_handler))) {
 		goto skip_proxy;
 	}
 
@@ -53396,17 +57152,17 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_hthread *thr, duk_small_uint
 		DUK_DDD(DUK_DDDPRINT("h_proxy_target=%!O", (duk_heaphdr *) h_proxy_target));
 		enum_target = h_proxy_target;
 
-		duk_push_hobject(thr, enum_target);  /* -> [ ... enum_target res handler undefined target ] */
-		duk_put_prop_stridx_short(thr, -4, DUK_STRIDX_INT_TARGET);
+		duk_push_hobject(thr, enum_target); /* -> [ ... enum_target res handler undefined target ] */
+		duk_put_prop_stridx_short(thr, -4, DUK_STRIDX_INT_TARGET); /* Target is bare, plain put OK. */
 
-		duk_pop_2(thr);  /* -> [ ... enum_target res ] */
+		duk_pop_2(thr); /* -> [ ... enum_target res ] */
 		goto skip_proxy;
 	}
 
 	/* [ ... enum_target res handler trap ] */
 	duk_insert(thr, -2);
-	duk_push_hobject(thr, h_proxy_target);    /* -> [ ... enum_target res trap handler target ] */
-	duk_call_method(thr, 1 /*nargs*/);        /* -> [ ... enum_target res trap_result ] */
+	duk_push_hobject(thr, h_proxy_target); /* -> [ ... enum_target res trap handler target ] */
+	duk_call_method(thr, 1 /*nargs*/); /* -> [ ... enum_target res trap_result ] */
 	h_trap_result = duk_require_hobject(thr, -1);
 	DUK_UNREF(h_trap_result);
 
@@ -53419,7 +57175,7 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_hthread *thr, duk_small_uint
 	len = (duk_uint_fast32_t) duk_get_length(thr, -1);
 	for (i = 0; i < len; i++) {
 		(void) duk_get_prop_index(thr, -1, (duk_uarridx_t) i);
-		DUK_ASSERT(duk_is_string(thr, -1));  /* postprocess cleaned up */
+		DUK_ASSERT(duk_is_string(thr, -1)); /* postprocess cleaned up */
 		/* [ ... enum_target res trap_result keys_array val ] */
 		duk_push_true(thr);
 		/* [ ... enum_target res trap_result keys_array val true ] */
@@ -53440,8 +57196,8 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_hthread *thr, duk_small_uint
 	DUK_DDD(DUK_DDDPRINT("proxy enumeration, final res: %!O", (duk_heaphdr *) res));
 	goto compact_and_return;
 
- skip_proxy:
-#endif  /* DUK_USE_ES6_PROXY */
+skip_proxy:
+#endif /* DUK_USE_ES6_PROXY */
 
 	curr = enum_target;
 	sort_start_index = DUK__ENUM_START_INDEX;
@@ -53451,6 +57207,7 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_hthread *thr, duk_small_uint
 #if !defined(DUK_USE_PREFER_SIZE)
 		duk_bool_t need_sort = 0;
 #endif
+		duk_bool_t cond;
 
 		/* Enumeration proceeds by inheritance level.  Virtual
 		 * properties need to be handled specially, followed by
@@ -53477,10 +57234,12 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_hthread *thr, duk_small_uint
 		 */
 
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
-		if (DUK_HOBJECT_HAS_EXOTIC_STRINGOBJ(curr) || DUK_HOBJECT_IS_BUFOBJ(curr)) {
+		cond = DUK_HOBJECT_HAS_EXOTIC_STRINGOBJ(curr) || DUK_HOBJECT_IS_BUFOBJ(curr);
 #else
-		if (DUK_HOBJECT_HAS_EXOTIC_STRINGOBJ(curr)) {
+		cond = DUK_HOBJECT_HAS_EXOTIC_STRINGOBJ(curr);
 #endif
+		cond = cond && !(enum_flags & DUK_ENUM_EXCLUDE_STRINGS);
+		if (cond) {
 			duk_bool_t have_length = 1;
 
 			/* String and buffer enumeration behavior is identical now,
@@ -53489,7 +57248,7 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_hthread *thr, duk_small_uint
 			if (DUK_HOBJECT_HAS_EXOTIC_STRINGOBJ(curr)) {
 				duk_hstring *h_val;
 				h_val = duk_hobject_get_internal_value_string(thr->heap, curr);
-				DUK_ASSERT(h_val != NULL);  /* string objects must not created without internal value */
+				DUK_ASSERT(h_val != NULL); /* string objects must not created without internal value */
 				len = (duk_uint_fast32_t) DUK_HSTRING_GET_CHARLEN(h_val);
 			}
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
@@ -53512,7 +57271,7 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_hthread *thr, duk_small_uint
 					len = (duk_uint_fast32_t) (h_bufobj->length >> h_bufobj->shift);
 				}
 			}
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 			for (i = 0; i < len; i++) {
 				duk_hstring *k;
@@ -53542,26 +57301,29 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_hthread *thr, duk_small_uint
 		 *  Array part
 		 */
 
-		for (i = 0; i < (duk_uint_fast32_t) DUK_HOBJECT_GET_ASIZE(curr); i++) {
-			duk_hstring *k;
-			duk_tval *tv;
+		cond = !(enum_flags & DUK_ENUM_EXCLUDE_STRINGS);
+		if (cond) {
+			for (i = 0; i < (duk_uint_fast32_t) DUK_HOBJECT_GET_ASIZE(curr); i++) {
+				duk_hstring *k;
+				duk_tval *tv;
 
-			tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, curr, i);
-			if (DUK_TVAL_IS_UNUSED(tv)) {
-				continue;
-			}
-			k = duk_heap_strtable_intern_u32_checked(thr, (duk_uint32_t) i);  /* Fragile reachability. */
-			DUK_ASSERT(k);
+				tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, curr, i);
+				if (DUK_TVAL_IS_UNUSED(tv)) {
+					continue;
+				}
+				k = duk_heap_strtable_intern_u32_checked(thr, (duk_uint32_t) i); /* Fragile reachability. */
+				DUK_ASSERT(k);
 
-			duk__add_enum_key(thr, k);
+				duk__add_enum_key(thr, k);
 
-			/* [enum_target res] */
-		}
+				/* [enum_target res] */
+			}
 
-		if (DUK_HOBJECT_HAS_EXOTIC_ARRAY(curr)) {
-			/* Array .length comes after numeric indices. */
-			if (enum_flags & DUK_ENUM_INCLUDE_NONENUMERABLE) {
-				duk__add_enum_key_stridx(thr, DUK_STRIDX_LENGTH);
+			if (DUK_HOBJECT_HAS_EXOTIC_ARRAY(curr)) {
+				/* Array .length comes after numeric indices. */
+				if (enum_flags & DUK_ENUM_INCLUDE_NONENUMERABLE) {
+					duk__add_enum_key_stridx(thr, DUK_STRIDX_LENGTH);
+				}
 			}
 		}
 
@@ -53581,8 +57343,7 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_hthread *thr, duk_small_uint
 				continue;
 			}
 			if (DUK_UNLIKELY(DUK_HSTRING_HAS_SYMBOL(k))) {
-				if (!(enum_flags & DUK_ENUM_INCLUDE_HIDDEN) &&
-				    DUK_HSTRING_HAS_HIDDEN(k)) {
+				if (!(enum_flags & DUK_ENUM_INCLUDE_HIDDEN) && DUK_HSTRING_HAS_HIDDEN(k)) {
 					continue;
 				}
 				if (!(enum_flags & DUK_ENUM_INCLUDE_SYMBOLS)) {
@@ -53592,7 +57353,7 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_hthread *thr, duk_small_uint
 				need_sort = 1;
 #endif
 			} else {
-				DUK_ASSERT(!DUK_HSTRING_HAS_HIDDEN(k));  /* would also have symbol flag */
+				DUK_ASSERT(!DUK_HSTRING_HAS_HIDDEN(k)); /* would also have symbol flag */
 				if (enum_flags & DUK_ENUM_EXCLUDE_STRINGS) {
 					continue;
 				}
@@ -53641,7 +57402,10 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_hthread *thr, duk_small_uint
 #else
 			if (need_sort) {
 				DUK_DDD(DUK_DDDPRINT("need to sort"));
-				duk__sort_enum_keys_es6(thr, res, (duk_int_fast32_t) sort_start_index, (duk_int_fast32_t) sort_end_index);
+				duk__sort_enum_keys_es6(thr,
+				                        res,
+				                        (duk_int_fast32_t) sort_start_index,
+				                        (duk_int_fast32_t) sort_end_index);
 			} else {
 				DUK_DDD(DUK_DDDPRINT("no need to sort"));
 			}
@@ -53674,11 +57438,14 @@ DUK_INTERNAL void duk_hobject_enumerator_create(duk_hthread *thr, duk_small_uint
 		/* Sort to ES2015 order which works for pure array incides but
 		 * also for mixed keys.
 		 */
-		duk__sort_enum_keys_es6(thr, res, (duk_int_fast32_t) DUK__ENUM_START_INDEX, (duk_int_fast32_t) DUK_HOBJECT_GET_ENEXT(res));
+		duk__sort_enum_keys_es6(thr,
+		                        res,
+		                        (duk_int_fast32_t) DUK__ENUM_START_INDEX,
+		                        (duk_int_fast32_t) DUK_HOBJECT_GET_ENEXT(res));
 	}
 
 #if defined(DUK_USE_ES6_PROXY)
- compact_and_return:
+compact_and_return:
 #endif
 	/* compact; no need to seal because object is internal */
 	duk_hobject_compact_props(thr, res);
@@ -53718,7 +57485,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_enumerator_next(duk_hthread *thr, duk_bool_t
 	 * be the proxy, and checking key existence against the proxy is not
 	 * required (or sensible, as the keys may be fully virtual).
 	 */
-	duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_INT_TARGET);
+	duk_xget_owndataprop_stridx_short(thr, -1, DUK_STRIDX_INT_TARGET);
 	enum_target = duk_require_hobject(thr, -1);
 	DUK_ASSERT(enum_target != NULL);
 #if defined(DUK_USE_ES6_PROXY)
@@ -53726,10 +57493,11 @@ DUK_INTERNAL duk_bool_t duk_hobject_enumerator_next(duk_hthread *thr, duk_bool_t
 #else
 	check_existence = 1;
 #endif
-	duk_pop(thr);  /* still reachable */
+	duk_pop(thr); /* still reachable */
 
 	DUK_DDD(DUK_DDDPRINT("getting next enum value, enum_target=%!iO, enumerator=%!iT",
-	                     (duk_heaphdr *) enum_target, (duk_tval *) duk_get_tval(thr, -1)));
+	                     (duk_heaphdr *) enum_target,
+	                     (duk_tval *) duk_get_tval(thr, -1)));
 
 	/* no array part */
 	for (;;) {
@@ -53770,16 +57538,16 @@ DUK_INTERNAL duk_bool_t duk_hobject_enumerator_next(duk_hthread *thr, duk_bool_t
 		duk_push_hstring(thr, res);
 		if (get_value) {
 			duk_push_hobject(thr, enum_target);
-			duk_dup_m2(thr);       /* -> [... enum key enum_target key] */
+			duk_dup_m2(thr); /* -> [... enum key enum_target key] */
 			duk_get_prop(thr, -2); /* -> [... enum key enum_target val] */
-			duk_remove_m2(thr);    /* -> [... enum key val] */
-			duk_remove(thr, -3);   /* -> [... key val] */
+			duk_remove_m2(thr); /* -> [... enum key val] */
+			duk_remove(thr, -3); /* -> [... key val] */
 		} else {
-			duk_remove_m2(thr);    /* -> [... key] */
+			duk_remove_m2(thr); /* -> [... key] */
 		}
 		return 1;
 	} else {
-		duk_pop(thr);  /* -> [...] */
+		duk_pop(thr); /* -> [...] */
 		return 0;
 	}
 }
@@ -53815,6 +57583,7 @@ DUK_INTERNAL duk_ret_t duk_hobject_get_enumerated_keys(duk_hthread *thr, duk_sma
 	/* XXX: uninit would be OK */
 	tv = duk_push_harray_with_size_outptr(thr, (duk_uint32_t) count);
 	DUK_ASSERT(count == 0 || tv != NULL);
+	DUK_ASSERT(!duk_is_bare_object(thr, -1));
 
 	/* Fill result array, no side effects. */
 
@@ -53825,7 +57594,7 @@ DUK_INTERNAL duk_ret_t duk_hobject_get_enumerated_keys(duk_hthread *thr, duk_sma
 		duk_hstring *k;
 
 		k = *keys++;
-		DUK_ASSERT(k != NULL);  /* enumerator must have no keys deleted */
+		DUK_ASSERT(k != NULL); /* enumerator must have no keys deleted */
 
 		DUK_TVAL_SET_STRING(tv, k);
 		tv++;
@@ -53837,7 +57606,7 @@ DUK_INTERNAL duk_ret_t duk_hobject_get_enumerated_keys(duk_hthread *thr, duk_sma
 
 	/* [enum_target res] */
 
-	return 1;  /* return 1 to allow callers to tail call */
+	return 1; /* return 1 to allow callers to tail call */
 }
 
 /* automatic undefs */
@@ -53848,7 +57617,10 @@ DUK_INTERNAL duk_ret_t duk_hobject_get_enumerated_keys(duk_hthread *thr, duk_sma
 
 /* #include duk_internal.h -> already included */
 
-DUK_INTERNAL duk_bool_t duk_hobject_prototype_chain_contains(duk_hthread *thr, duk_hobject *h, duk_hobject *p, duk_bool_t ignore_loop) {
+DUK_INTERNAL duk_bool_t duk_hobject_prototype_chain_contains(duk_hthread *thr,
+                                                             duk_hobject *h,
+                                                             duk_hobject *p,
+                                                             duk_bool_t ignore_loop) {
 	duk_uint_t sanity;
 
 	DUK_ASSERT(thr != NULL);
@@ -53887,7 +57659,7 @@ DUK_INTERNAL void duk_hobject_set_prototype_updref(duk_hthread *thr, duk_hobject
 	DUK_ASSERT(h);
 	tmp = DUK_HOBJECT_GET_PROTOTYPE(thr->heap, h);
 	DUK_HOBJECT_SET_PROTOTYPE(thr->heap, h, p);
-	DUK_HOBJECT_INCREF_ALLOWNULL(thr, p);  /* avoid problems if p == h->prototype */
+	DUK_HOBJECT_INCREF_ALLOWNULL(thr, p); /* avoid problems if p == h->prototype */
 	DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp);
 #else
 	DUK_ASSERT(h);
@@ -53932,7 +57704,7 @@ DUK_INTERNAL void duk_hobject_pc2line_pack(duk_hthread *thr, duk_compiler_instr
 
 	hdr = (duk_uint32_t *) DUK_HBUFFER_DYNAMIC_GET_DATA_PTR(thr->heap, h_buf);
 	DUK_ASSERT(hdr != NULL);
-	hdr[0] = (duk_uint32_t) length;  /* valid pc range is [0, length[ */
+	hdr[0] = (duk_uint32_t) length; /* valid pc range is [0, length[ */
 
 	curr_pc = 0U;
 	while (curr_pc < length) {
@@ -53961,8 +57733,8 @@ DUK_INTERNAL void duk_hobject_pc2line_pack(duk_hthread *thr, duk_compiler_instr
 
 		for (;;) {
 			curr_pc++;
-			if ( ((curr_pc % DUK_PC2LINE_SKIP) == 0) ||  /* end of diff run */
-			     (curr_pc >= length) ) {                 /* end of bytecode */
+			if (((curr_pc % DUK_PC2LINE_SKIP) == 0) || /* end of diff run */
+			    (curr_pc >= length)) { /* end of bytecode */
 				break;
 			}
 			DUK_ASSERT(curr_pc < length);
@@ -54009,7 +57781,9 @@ DUK_INTERNAL void duk_hobject_pc2line_pack(duk_hthread *thr, duk_compiler_instr
 	(void) duk_to_fixed_buffer(thr, -1, NULL);
 
 	DUK_DDD(DUK_DDDPRINT("final pc2line data: pc_limit=%ld, length=%ld, %lf bits/opcode --> %!ixT",
-	                     (long) length, (long) new_size, (double) new_size * 8.0 / (double) length,
+	                     (long) length,
+	                     (long) new_size,
+	                     (double) new_size * 8.0 / (double) length,
 	                     (duk_tval *) duk_get_tval(thr, -1)));
 }
 
@@ -54049,8 +57823,7 @@ DUK_LOCAL duk_uint_fast32_t duk__hobject_pc2line_query_raw(duk_hthread *thr, duk
 	pc_limit = hdr[0];
 	if (pc >= pc_limit) {
 		/* Note: pc is unsigned and cannot be negative */
-		DUK_DD(DUK_DDPRINT("pc2line lookup failed: pc out of bounds (pc=%ld, limit=%ld)",
-		                   (long) pc, (long) pc_limit));
+		DUK_DD(DUK_DDPRINT("pc2line lookup failed: pc out of bounds (pc=%ld, limit=%ld)", (long) pc, (long) pc_limit));
 		goto pc2line_error;
 	}
 
@@ -54058,7 +57831,8 @@ DUK_LOCAL duk_uint_fast32_t duk__hobject_pc2line_query_raw(duk_hthread *thr, duk
 	start_offset = hdr[1 + hdr_index * 2 + 1];
 	if ((duk_size_t) start_offset > DUK_HBUFFER_FIXED_GET_SIZE(buf)) {
 		DUK_DD(DUK_DDPRINT("pc2line lookup failed: start_offset out of bounds (start_offset=%ld, buffer_size=%ld)",
-		                   (long) start_offset, (long) DUK_HBUFFER_GET_SIZE((duk_hbuffer *) buf)));
+		                   (long) start_offset,
+		                   (long) DUK_HBUFFER_GET_SIZE((duk_hbuffer *) buf)));
 		goto pc2line_error;
 	}
 
@@ -54085,7 +57859,7 @@ DUK_LOCAL duk_uint_fast32_t duk__hobject_pc2line_query_raw(duk_hthread *thr, duk
 				if (duk_bd_decode_flag(bd_ctx)) {
 					/* 1 1 1 <32 bits> */
 					duk_uint_fast32_t t;
-					t = duk_bd_decode(bd_ctx, 16);  /* workaround: max nbits = 24 now */
+					t = duk_bd_decode(bd_ctx, 16); /* workaround: max nbits = 24 now */
 					t = (t << 16) + duk_bd_decode(bd_ctx, 16);
 					curr_line = t;
 				} else {
@@ -54110,7 +57884,7 @@ DUK_LOCAL duk_uint_fast32_t duk__hobject_pc2line_query_raw(duk_hthread *thr, duk
 	DUK_DDD(DUK_DDDPRINT("pc2line lookup result: pc %ld -> line %ld", (long) pc, (long) curr_line));
 	return curr_line;
 
- pc2line_error:
+pc2line_error:
 	DUK_D(DUK_DPRINT("pc2line conversion failed for pc=%ld", (long) pc));
 	return 0;
 }
@@ -54125,7 +57899,7 @@ DUK_INTERNAL duk_uint_fast32_t duk_hobject_pc2line_query(duk_hthread *thr, duk_i
 	 * future work in debugger.rst).
 	 */
 
-	duk_get_prop_stridx(thr, idx_func, DUK_STRIDX_INT_PC2LINE);
+	duk_xget_owndataprop_stridx_short(thr, idx_func, DUK_STRIDX_INT_PC2LINE);
 	pc2line = (duk_hbuffer_fixed *) (void *) duk_get_hbuffer(thr, -1);
 	if (pc2line != NULL) {
 		DUK_ASSERT(!DUK_HBUFFER_HAS_DYNAMIC((duk_hbuffer *) pc2line) && !DUK_HBUFFER_HAS_EXTERNAL((duk_hbuffer *) pc2line));
@@ -54138,7 +57912,7 @@ DUK_INTERNAL duk_uint_fast32_t duk_hobject_pc2line_query(duk_hthread *thr, duk_i
 	return line;
 }
 
-#endif  /* DUK_USE_PC2LINE */
+#endif /* DUK_USE_PC2LINE */
 /*
  *  duk_hobject property access functionality.
  *
@@ -54187,35 +57961,59 @@ DUK_INTERNAL duk_uint_fast32_t duk_hobject_pc2line_query(duk_hthread *thr, duk_i
  *  Local defines
  */
 
-#define DUK__NO_ARRAY_INDEX             DUK_HSTRING_NO_ARRAY_INDEX
+#define DUK__NO_ARRAY_INDEX DUK_HSTRING_NO_ARRAY_INDEX
 
 /* Marker values for hash part. */
-#define DUK__HASH_UNUSED                DUK_HOBJECT_HASHIDX_UNUSED
-#define DUK__HASH_DELETED               DUK_HOBJECT_HASHIDX_DELETED
+#define DUK__HASH_UNUSED  DUK_HOBJECT_HASHIDX_UNUSED
+#define DUK__HASH_DELETED DUK_HOBJECT_HASHIDX_DELETED
 
 /* Valstack space that suffices for all local calls, excluding any recursion
  * into ECMAScript or Duktape/C calls (Proxy, getters, etc).
  */
-#define DUK__VALSTACK_SPACE             10
+#define DUK__VALSTACK_SPACE 10
 
 /* Valstack space allocated especially for proxy lookup which does a
  * recursive property lookup.
  */
-#define DUK__VALSTACK_PROXY_LOOKUP      20
+#define DUK__VALSTACK_PROXY_LOOKUP 20
 
 /*
  *  Local prototypes
  */
 
-DUK_LOCAL_DECL duk_bool_t duk__check_arguments_map_for_get(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_propdesc *temp_desc);
-DUK_LOCAL_DECL void duk__check_arguments_map_for_put(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_propdesc *temp_desc, duk_bool_t throw_flag);
-DUK_LOCAL_DECL void duk__check_arguments_map_for_delete(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_propdesc *temp_desc);
-
-DUK_LOCAL_DECL duk_bool_t duk__handle_put_array_length_smaller(duk_hthread *thr, duk_hobject *obj, duk_uint32_t old_len, duk_uint32_t new_len, duk_bool_t force_flag, duk_uint32_t *out_result_len);
+DUK_LOCAL_DECL duk_bool_t duk__check_arguments_map_for_get(duk_hthread *thr,
+                                                           duk_hobject *obj,
+                                                           duk_hstring *key,
+                                                           duk_propdesc *temp_desc);
+DUK_LOCAL_DECL void duk__check_arguments_map_for_put(duk_hthread *thr,
+                                                     duk_hobject *obj,
+                                                     duk_hstring *key,
+                                                     duk_propdesc *temp_desc,
+                                                     duk_bool_t throw_flag);
+DUK_LOCAL_DECL void duk__check_arguments_map_for_delete(duk_hthread *thr,
+                                                        duk_hobject *obj,
+                                                        duk_hstring *key,
+                                                        duk_propdesc *temp_desc);
+
+DUK_LOCAL_DECL duk_bool_t duk__handle_put_array_length_smaller(duk_hthread *thr,
+                                                               duk_hobject *obj,
+                                                               duk_uint32_t old_len,
+                                                               duk_uint32_t new_len,
+                                                               duk_bool_t force_flag,
+                                                               duk_uint32_t *out_result_len);
 DUK_LOCAL_DECL duk_bool_t duk__handle_put_array_length(duk_hthread *thr, duk_hobject *obj);
 
-DUK_LOCAL_DECL duk_bool_t duk__get_propdesc(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_propdesc *out_desc, duk_small_uint_t flags);
-DUK_LOCAL_DECL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_uint32_t arr_idx, duk_propdesc *out_desc, duk_small_uint_t flags);
+DUK_LOCAL_DECL duk_bool_t
+duk__get_propdesc(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_propdesc *out_desc, duk_small_uint_t flags);
+DUK_LOCAL_DECL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr,
+                                                    duk_hobject *obj,
+                                                    duk_hstring *key,
+                                                    duk_uint32_t arr_idx,
+                                                    duk_propdesc *out_desc,
+                                                    duk_small_uint_t flags);
+
+DUK_LOCAL_DECL void duk__abandon_array_part(duk_hthread *thr, duk_hobject *obj);
+DUK_LOCAL_DECL void duk__grow_props_for_array_item(duk_hthread *thr, duk_hobject *obj, duk_uint32_t highest_arr_idx);
 
 /*
  *  Misc helpers
@@ -54240,8 +58038,8 @@ DUK_LOCAL duk_uint32_t duk__tval_number_to_arr_idx(duk_tval *tv) {
 	 */
 	dbl = DUK_TVAL_GET_NUMBER(tv);
 	idx = (duk_uint32_t) dbl;
-	if ((duk_double_t) idx == dbl) {
-	        /* Is whole and within 32 bit range.  If the value happens to be 0xFFFFFFFF,
+	if (duk_double_equals((duk_double_t) idx, dbl)) {
+		/* Is whole and within 32 bit range.  If the value happens to be 0xFFFFFFFF,
 		 * it's not a valid array index but will then match DUK__NO_ARRAY_INDEX.
 		 */
 		return idx;
@@ -54268,7 +58066,7 @@ DUK_LOCAL duk_uint32_t duk__tval_fastint_to_arr_idx(duk_tval *tv) {
 	 */
 	return (duk_uint32_t) t;
 }
-#endif  /* DUK_USE_FASTINT */
+#endif /* DUK_USE_FASTINT */
 
 /* Convert a duk_tval on the value stack (in a trusted index we don't validate)
  * to a string or symbol using ES2015 ToPropertyKey():
@@ -54293,7 +58091,7 @@ DUK_LOCAL duk_uint32_t duk__to_property_key(duk_hthread *thr, duk_idx_t idx, duk
 	 * but still be compliant and share code.
 	 */
 
-	tv_dst = DUK_GET_TVAL_NEGIDX(thr, idx);  /* intentionally unvalidated */
+	tv_dst = DUK_GET_TVAL_NEGIDX(thr, idx); /* intentionally unvalidated */
 	if (DUK_TVAL_IS_STRING(tv_dst)) {
 		/* Most important path: strings and plain symbols are used as
 		 * is.  For symbols the array index check below is unnecessary
@@ -54313,7 +58111,7 @@ DUK_LOCAL duk_uint32_t duk__to_property_key(duk_hthread *thr, duk_idx_t idx, duk
 }
 
 DUK_LOCAL duk_uint32_t duk__push_tval_to_property_key(duk_hthread *thr, duk_tval *tv_key, duk_hstring **out_h) {
-	duk_push_tval(thr, tv_key);  /* XXX: could use an unsafe push here */
+	duk_push_tval(thr, tv_key); /* XXX: could use an unsafe push here */
 	return duk__to_property_key(thr, -1, out_h);
 }
 
@@ -54353,7 +58151,7 @@ DUK_LOCAL duk_uint32_t duk__get_default_h_size(duk_uint32_t e_size) {
 		 * is relatively sparse.
 		 */
 		tmp = e_size;
-		res = 2;  /* Result will be 2 ** (N + 1). */
+		res = 2; /* Result will be 2 ** (N + 1). */
 		while (tmp >= 0x40) {
 			tmp >>= 6;
 			res <<= 6;
@@ -54362,23 +58160,21 @@ DUK_LOCAL duk_uint32_t duk__get_default_h_size(duk_uint32_t e_size) {
 			tmp >>= 1;
 			res <<= 1;
 		}
-		DUK_ASSERT((DUK_HOBJECT_MAX_PROPERTIES << 2U) > DUK_HOBJECT_MAX_PROPERTIES);  /* Won't wrap, even shifted by 2. */
+		DUK_ASSERT((DUK_HOBJECT_MAX_PROPERTIES << 2U) > DUK_HOBJECT_MAX_PROPERTIES); /* Won't wrap, even shifted by 2. */
 		DUK_ASSERT(res > e_size);
 		return res;
 	} else {
 		return 0;
 	}
 }
-#endif  /* USE_PROP_HASH_PART */
+#endif /* USE_PROP_HASH_PART */
 
 /* Get minimum entry part growth for a certain size. */
 DUK_LOCAL duk_uint32_t duk__get_min_grow_e(duk_uint32_t e_size) {
 	duk_uint32_t res;
 
-	DUK_ASSERT(e_size <= DUK_HOBJECT_MAX_PROPERTIES);
-
 	res = (e_size + DUK_USE_HOBJECT_ENTRY_MINGROW_ADD) / DUK_USE_HOBJECT_ENTRY_MINGROW_DIVISOR;
-	DUK_ASSERT(res >= 1);  /* important for callers */
+	DUK_ASSERT(res >= 1); /* important for callers */
 	return res;
 }
 
@@ -54386,10 +58182,8 @@ DUK_LOCAL duk_uint32_t duk__get_min_grow_e(duk_uint32_t e_size) {
 DUK_LOCAL duk_uint32_t duk__get_min_grow_a(duk_uint32_t a_size) {
 	duk_uint32_t res;
 
-	DUK_ASSERT((duk_size_t) a_size <= DUK_HOBJECT_MAX_PROPERTIES);
-
 	res = (a_size + DUK_USE_HOBJECT_ARRAY_MINGROW_ADD) / DUK_USE_HOBJECT_ARRAY_MINGROW_DIVISOR;
-	DUK_ASSERT(res >= 1);  /* important for callers */
+	DUK_ASSERT(res >= 1); /* important for callers */
 	return res;
 }
 
@@ -54419,7 +58213,7 @@ DUK_LOCAL duk_uint32_t duk__count_used_e_keys(duk_hthread *thr, duk_hobject *obj
 DUK_LOCAL void duk__compute_a_stats(duk_hthread *thr, duk_hobject *obj, duk_uint32_t *out_used, duk_uint32_t *out_min_size) {
 	duk_uint_fast32_t i;
 	duk_uint_fast32_t used = 0;
-	duk_uint_fast32_t highest_idx = (duk_uint_fast32_t) -1;  /* see below */
+	duk_uint_fast32_t highest_idx = (duk_uint_fast32_t) -1; /* see below */
 	duk_tval *a;
 
 	DUK_ASSERT(obj != NULL);
@@ -54442,7 +58236,7 @@ DUK_LOCAL void duk__compute_a_stats(duk_hthread *thr, duk_hobject *obj, duk_uint
 	 */
 
 	*out_used = (duk_uint32_t) used;
-	*out_min_size = (duk_uint32_t) (highest_idx + 1);  /* 0 if no used entries */
+	*out_min_size = (duk_uint32_t) (highest_idx + 1); /* 0 if no used entries */
 }
 
 /* Check array density and indicate whether or not the array part should be abandoned. */
@@ -54468,6 +58262,8 @@ DUK_LOCAL duk_bool_t duk__abandon_array_density_check(duk_uint32_t a_used, duk_u
 
 /* Fast check for extending array: check whether or not a slow density check is required. */
 DUK_LOCAL duk_bool_t duk__abandon_array_slow_check_required(duk_uint32_t arr_idx, duk_uint32_t old_size) {
+	duk_uint32_t new_size_min;
+
 	/*
 	 *  In a fast check we assume old_size equals old_used (i.e., existing
 	 *  array is fully dense).
@@ -54489,7 +58285,111 @@ DUK_LOCAL duk_bool_t duk__abandon_array_slow_check_required(duk_uint32_t arr_idx
 	 *    arr_idx > limit'' * ((old_size + 7) / 8)
 	 */
 
-	return (arr_idx > DUK_USE_HOBJECT_ARRAY_FAST_RESIZE_LIMIT * ((old_size + 7) >> 3));
+	new_size_min = arr_idx + 1;
+	return (new_size_min >= DUK_USE_HOBJECT_ARRAY_ABANDON_MINSIZE) &&
+	       (arr_idx > DUK_USE_HOBJECT_ARRAY_FAST_RESIZE_LIMIT * ((old_size + 7) >> 3));
+}
+
+DUK_LOCAL duk_bool_t duk__abandon_array_check(duk_hthread *thr, duk_uint32_t arr_idx, duk_hobject *obj) {
+	duk_uint32_t min_size;
+	duk_uint32_t old_used;
+	duk_uint32_t old_size;
+
+	if (!duk__abandon_array_slow_check_required(arr_idx, DUK_HOBJECT_GET_ASIZE(obj))) {
+		DUK_DDD(DUK_DDDPRINT("=> fast resize is OK"));
+		return 0;
+	}
+
+	duk__compute_a_stats(thr, obj, &old_used, &old_size);
+
+	DUK_DDD(DUK_DDDPRINT("abandon check, array stats: old_used=%ld, old_size=%ld, arr_idx=%ld",
+	                     (long) old_used,
+	                     (long) old_size,
+	                     (long) arr_idx));
+
+	min_size = arr_idx + 1;
+#if defined(DUK_USE_OBJSIZES16)
+	if (min_size > DUK_UINT16_MAX) {
+		goto do_abandon;
+	}
+#endif
+	DUK_UNREF(min_size);
+
+	/* Note: intentionally use approximations to shave a few instructions:
+	 *   a_used = old_used  (accurate: old_used + 1)
+	 *   a_size = arr_idx   (accurate: arr_idx + 1)
+	 */
+	if (duk__abandon_array_density_check(old_used, arr_idx)) {
+		DUK_DD(DUK_DDPRINT("write to new array entry beyond current length, "
+		                   "decided to abandon array part (would become too sparse)"));
+
+		/* Abandoning requires a props allocation resize and
+		 * 'rechecks' the valstack, invalidating any existing
+		 * valstack value pointers.
+		 */
+		goto do_abandon;
+	}
+
+	DUK_DDD(DUK_DDDPRINT("=> decided to keep array part"));
+	return 0;
+
+do_abandon:
+	duk__abandon_array_part(thr, obj);
+	DUK_ASSERT(!DUK_HOBJECT_HAS_ARRAY_PART(obj));
+	return 1;
+}
+
+DUK_LOCAL duk_tval *duk__obtain_arridx_slot_slowpath(duk_hthread *thr, duk_uint32_t arr_idx, duk_hobject *obj) {
+	/*
+	 *  Array needs to grow, but we don't want it becoming too sparse.
+	 *  If it were to become sparse, abandon array part, moving all
+	 *  array entries into the entries part (for good).
+	 *
+	 *  Since we don't keep track of actual density (used vs. size) of
+	 *  the array part, we need to estimate somehow.  The check is made
+	 *  in two parts:
+	 *
+	 *    - Check whether the resize need is small compared to the
+	 *      current size (relatively); if so, resize without further
+	 *      checking (essentially we assume that the original part is
+	 *      "dense" so that the result would be dense enough).
+	 *
+	 *    - Otherwise, compute the resize using an actual density
+	 *      measurement based on counting the used array entries.
+	 */
+
+	DUK_DDD(DUK_DDDPRINT("write to new array requires array resize, decide whether to do a "
+	                     "fast resize without abandon check (arr_idx=%ld, old_size=%ld)",
+	                     (long) arr_idx,
+	                     (long) DUK_HOBJECT_GET_ASIZE(obj)));
+
+	if (DUK_UNLIKELY(duk__abandon_array_check(thr, arr_idx, obj) != 0)) {
+		DUK_ASSERT(!DUK_HOBJECT_HAS_ARRAY_PART(obj));
+		return NULL;
+	}
+
+	DUK_DD(DUK_DDPRINT("write to new array entry beyond current length, "
+	                   "decided to extend current allocation"));
+
+	/* In principle it's possible to run out of memory extending the
+	 * array but with the allocation going through if we were to abandon
+	 * the array part and try again.  In practice this should be rare
+	 * because abandoned arrays have a higher per-entry footprint.
+	 */
+
+	duk__grow_props_for_array_item(thr, obj, arr_idx);
+
+	DUK_ASSERT(DUK_HOBJECT_HAS_ARRAY_PART(obj));
+	DUK_ASSERT(arr_idx < DUK_HOBJECT_GET_ASIZE(obj));
+	return DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, arr_idx);
+}
+
+DUK_LOCAL DUK_INLINE duk_tval *duk__obtain_arridx_slot(duk_hthread *thr, duk_uint32_t arr_idx, duk_hobject *obj) {
+	if (DUK_LIKELY(arr_idx < DUK_HOBJECT_GET_ASIZE(obj))) {
+		return DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, arr_idx);
+	} else {
+		return duk__obtain_arridx_slot_slowpath(thr, arr_idx, obj);
+	}
 }
 
 /*
@@ -54511,7 +58411,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_proxy_check(duk_hobject *obj, duk_hobject **
 		return 0;
 	}
 	h_proxy = (duk_hproxy *) obj;
-	DUK_ASSERT_HPROXY_VALID(h_proxy);
+	DUK_HPROXY_ASSERT_VALID(h_proxy);
 
 	DUK_ASSERT(h_proxy->handler != NULL);
 	DUK_ASSERT(h_proxy->target != NULL);
@@ -54520,7 +58420,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_proxy_check(duk_hobject *obj, duk_hobject **
 
 	return 1;
 }
-#endif  /* DUK_USE_ES6_PROXY */
+#endif /* DUK_USE_ES6_PROXY */
 
 /* Get Proxy target object.  If the argument is not a Proxy, return it as is.
  * If a Proxy is revoked, an error is thrown.
@@ -54538,7 +58438,7 @@ DUK_INTERNAL duk_hobject *duk_hobject_resolve_proxy_target(duk_hobject *obj) {
 		duk_hproxy *h_proxy;
 
 		h_proxy = (duk_hproxy *) obj;
-		DUK_ASSERT_HPROXY_VALID(h_proxy);
+		DUK_HPROXY_ASSERT_VALID(h_proxy);
 		obj = h_proxy->target;
 		DUK_ASSERT(obj != NULL);
 	}
@@ -54546,10 +58446,14 @@ DUK_INTERNAL duk_hobject *duk_hobject_resolve_proxy_target(duk_hobject *obj) {
 	DUK_ASSERT(obj != NULL);
 	return obj;
 }
-#endif  /* DUK_USE_ES6_PROXY */
+#endif /* DUK_USE_ES6_PROXY */
 
 #if defined(DUK_USE_ES6_PROXY)
-DUK_LOCAL duk_bool_t duk__proxy_check_prop(duk_hthread *thr, duk_hobject *obj, duk_small_uint_t stridx_trap, duk_tval *tv_key, duk_hobject **out_target) {
+DUK_LOCAL duk_bool_t duk__proxy_check_prop(duk_hthread *thr,
+                                           duk_hobject *obj,
+                                           duk_small_uint_t stridx_trap,
+                                           duk_tval *tv_key,
+                                           duk_hobject **out_target) {
 	duk_hobject *h_handler;
 
 	DUK_ASSERT(thr != NULL);
@@ -54603,7 +58507,7 @@ DUK_LOCAL duk_bool_t duk__proxy_check_prop(duk_hthread *thr, duk_hobject *obj, d
 	duk_push_hobject(thr, h_handler);
 	if (duk_get_prop_stridx_short(thr, -1, stridx_trap)) {
 		/* -> [ ... handler trap ] */
-		duk_insert(thr, -2);  /* -> [ ... trap handler ] */
+		duk_insert(thr, -2); /* -> [ ... trap handler ] */
 
 		/* stack prepped for func call: [ ... trap handler ] */
 		return 1;
@@ -54612,7 +58516,7 @@ DUK_LOCAL duk_bool_t duk__proxy_check_prop(duk_hthread *thr, duk_hobject *obj, d
 		return 0;
 	}
 }
-#endif  /* DUK_USE_ES6_PROXY */
+#endif /* DUK_USE_ES6_PROXY */
 
 /*
  *  Reallocate property allocation, moving properties to the new allocation.
@@ -54667,11 +58571,12 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(obj != NULL);
-	DUK_ASSERT(!abandon_array || new_a_size == 0);  /* if abandon_array, new_a_size must be 0 */
-	DUK_ASSERT(DUK_HOBJECT_GET_PROPS(thr->heap, obj) != NULL || (DUK_HOBJECT_GET_ESIZE(obj) == 0 && DUK_HOBJECT_GET_ASIZE(obj) == 0));
-	DUK_ASSERT(new_h_size == 0 || new_h_size >= new_e_size);  /* required to guarantee success of rehashing,
-	                                                           * intentionally use unadjusted new_e_size
-	                                                           */
+	DUK_ASSERT(!abandon_array || new_a_size == 0); /* if abandon_array, new_a_size must be 0 */
+	DUK_ASSERT(DUK_HOBJECT_GET_PROPS(thr->heap, obj) != NULL ||
+	           (DUK_HOBJECT_GET_ESIZE(obj) == 0 && DUK_HOBJECT_GET_ASIZE(obj) == 0));
+	DUK_ASSERT(new_h_size == 0 || new_h_size >= new_e_size); /* required to guarantee success of rehashing,
+	                                                          * intentionally use unadjusted new_e_size
+	                                                          */
 	DUK_ASSERT(!DUK_HEAPHDR_HAS_READONLY((duk_heaphdr *) obj));
 	DUK_ASSERT_VALSTACK_SPACE(thr, DUK__VALSTACK_SPACE);
 
@@ -54701,10 +58606,12 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 	DUK_DDD(DUK_DDDPRINT("using layout 1, but no need to pad e_size: %ld", (long) new_e_size));
 	new_e_size_adjusted = new_e_size;
 #elif defined(DUK_USE_HOBJECT_LAYOUT_1) && ((DUK_HOBJECT_ALIGN_TARGET == 4) || (DUK_HOBJECT_ALIGN_TARGET == 8))
-	new_e_size_adjusted = (new_e_size + (duk_uint32_t) DUK_HOBJECT_ALIGN_TARGET - 1U) &
-	                      (~((duk_uint32_t) DUK_HOBJECT_ALIGN_TARGET - 1U));
+	new_e_size_adjusted =
+	    (new_e_size + (duk_uint32_t) DUK_HOBJECT_ALIGN_TARGET - 1U) & (~((duk_uint32_t) DUK_HOBJECT_ALIGN_TARGET - 1U));
 	DUK_DDD(DUK_DDDPRINT("using layout 1, and alignment target is %ld, adjusted e_size: %ld -> %ld",
-	                     (long) DUK_HOBJECT_ALIGN_TARGET, (long) new_e_size, (long) new_e_size_adjusted));
+	                     (long) DUK_HOBJECT_ALIGN_TARGET,
+	                     (long) new_e_size,
+	                     (long) new_e_size_adjusted));
 	DUK_ASSERT(new_e_size_adjusted >= new_e_size);
 #else
 #error invalid hobject layout defines
@@ -54714,23 +58621,22 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 	 *  Debug logging after adjustment.
 	 */
 
-	DUK_DDD(DUK_DDDPRINT("attempt to resize hobject %p props (%ld -> %ld bytes), from {p=%p,e_size=%ld,e_next=%ld,a_size=%ld,h_size=%ld} to "
-	                     "{e_size=%ld,a_size=%ld,h_size=%ld}, abandon_array=%ld, unadjusted new_e_size=%ld",
-	                     (void *) obj,
-	                     (long) DUK_HOBJECT_P_COMPUTE_SIZE(DUK_HOBJECT_GET_ESIZE(obj),
-	                                                       DUK_HOBJECT_GET_ASIZE(obj),
-	                                                       DUK_HOBJECT_GET_HSIZE(obj)),
-	                     (long) DUK_HOBJECT_P_COMPUTE_SIZE(new_e_size_adjusted, new_a_size, new_h_size),
-	                     (void *) DUK_HOBJECT_GET_PROPS(thr->heap, obj),
-	                     (long) DUK_HOBJECT_GET_ESIZE(obj),
-	                     (long) DUK_HOBJECT_GET_ENEXT(obj),
-	                     (long) DUK_HOBJECT_GET_ASIZE(obj),
-	                     (long) DUK_HOBJECT_GET_HSIZE(obj),
-	                     (long) new_e_size_adjusted,
-	                     (long) new_a_size,
-	                     (long) new_h_size,
-	                     (long) abandon_array,
-	                     (long) new_e_size));
+	DUK_DDD(DUK_DDDPRINT(
+	    "attempt to resize hobject %p props (%ld -> %ld bytes), from {p=%p,e_size=%ld,e_next=%ld,a_size=%ld,h_size=%ld} to "
+	    "{e_size=%ld,a_size=%ld,h_size=%ld}, abandon_array=%ld, unadjusted new_e_size=%ld",
+	    (void *) obj,
+	    (long) DUK_HOBJECT_P_COMPUTE_SIZE(DUK_HOBJECT_GET_ESIZE(obj), DUK_HOBJECT_GET_ASIZE(obj), DUK_HOBJECT_GET_HSIZE(obj)),
+	    (long) DUK_HOBJECT_P_COMPUTE_SIZE(new_e_size_adjusted, new_a_size, new_h_size),
+	    (void *) DUK_HOBJECT_GET_PROPS(thr->heap, obj),
+	    (long) DUK_HOBJECT_GET_ESIZE(obj),
+	    (long) DUK_HOBJECT_GET_ENEXT(obj),
+	    (long) DUK_HOBJECT_GET_ASIZE(obj),
+	    (long) DUK_HOBJECT_GET_HSIZE(obj),
+	    (long) new_e_size_adjusted,
+	    (long) new_a_size,
+	    (long) new_h_size,
+	    (long) abandon_array,
+	    (long) new_e_size));
 
 	/*
 	 *  Property count check.  This is the only point where we ensure that
@@ -54746,6 +58652,16 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 		DUK_ERROR_ALLOC_FAILED(thr);
 		DUK_WO_NORETURN(return;);
 	}
+#if defined(DUK_USE_OBJSIZES16)
+	if (new_e_size_adjusted > DUK_UINT16_MAX || new_a_size > DUK_UINT16_MAX) {
+		/* If caller gave us sizes larger than what we can store,
+		 * fail memory safely with an internal error rather than
+		 * truncating the sizes.
+		 */
+		DUK_ERROR_INTERNAL(thr);
+		DUK_WO_NORETURN(return;);
+	}
+#endif
 
 	/*
 	 *  Compute new alloc size and alloc new area.
@@ -54763,9 +58679,9 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 #endif
 	prev_ms_base_flags = thr->heap->ms_base_flags;
 	thr->heap->ms_base_flags |=
-	        DUK_MS_FLAG_NO_OBJECT_COMPACTION;      /* Avoid attempt to compact the current object (all objects really). */
-	thr->heap->pf_prevent_count++;                 /* Avoid finalizers. */
-	DUK_ASSERT(thr->heap->pf_prevent_count != 0);  /* Wrap. */
+	    DUK_MS_FLAG_NO_OBJECT_COMPACTION; /* Avoid attempt to compact the current object (all objects really). */
+	thr->heap->pf_prevent_count++; /* Avoid finalizers. */
+	DUK_ASSERT(thr->heap->pf_prevent_count != 0); /* Wrap. */
 
 	new_alloc_size = DUK_HOBJECT_P_COMPUTE_SIZE(new_e_size_adjusted, new_a_size, new_h_size);
 	DUK_DDD(DUK_DDDPRINT("new hobject allocation size is %ld", (long) new_alloc_size));
@@ -54778,7 +58694,7 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 		/* Alloc may trigger mark-and-sweep but no compaction, and
 		 * cannot throw.
 		 */
-#if 0  /* XXX: inject test */
+#if 0 /* XXX: inject test */
 		if (1) {
 			new_p = NULL;
 			goto alloc_failed;
@@ -54796,19 +58712,28 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 	/* Set up pointers to the new property area: this is hidden behind a macro
 	 * because it is memory layout specific.
 	 */
-	DUK_HOBJECT_P_SET_REALLOC_PTRS(new_p, new_e_k, new_e_pv, new_e_f, new_a, new_h,
-	                               new_e_size_adjusted, new_a_size, new_h_size);
-	DUK_UNREF(new_h);  /* happens when hash part dropped */
+	DUK_HOBJECT_P_SET_REALLOC_PTRS(new_p,
+	                               new_e_k,
+	                               new_e_pv,
+	                               new_e_f,
+	                               new_a,
+	                               new_h,
+	                               new_e_size_adjusted,
+	                               new_a_size,
+	                               new_h_size);
+	DUK_UNREF(new_h); /* happens when hash part dropped */
 	new_e_next = 0;
 
 	/* if new_p == NULL, all of these pointers are NULL */
-	DUK_ASSERT((new_p != NULL) ||
-	           (new_e_k == NULL && new_e_pv == NULL && new_e_f == NULL &&
-	            new_a == NULL && new_h == NULL));
+	DUK_ASSERT((new_p != NULL) || (new_e_k == NULL && new_e_pv == NULL && new_e_f == NULL && new_a == NULL && new_h == NULL));
 
 	DUK_DDD(DUK_DDDPRINT("new alloc size %ld, new_e_k=%p, new_e_pv=%p, new_e_f=%p, new_a=%p, new_h=%p",
-	                     (long) new_alloc_size, (void *) new_e_k, (void *) new_e_pv, (void *) new_e_f,
-	                     (void *) new_a, (void *) new_h));
+	                     (long) new_alloc_size,
+	                     (void *) new_e_k,
+	                     (void *) new_e_pv,
+	                     (void *) new_e_f,
+	                     (void *) new_a,
+	                     (void *) new_h));
 
 	/*
 	 *  Migrate array part to start of entries if requested.
@@ -54849,8 +58774,7 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 				continue;
 			}
 
-			DUK_ASSERT(new_p != NULL && new_e_k != NULL &&
-			           new_e_pv != NULL && new_e_f != NULL);
+			DUK_ASSERT(new_p != NULL && new_e_k != NULL && new_e_pv != NULL && new_e_f != NULL);
 
 			/*
 			 *  Intern key via the valstack to ensure reachability behaves
@@ -54862,7 +58786,7 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 			 *  must be careful.
 			 */
 
-#if 0  /* XXX: inject test */
+#if 0 /* XXX: inject test */
 			if (1) {
 				goto abandon_error;
 			}
@@ -54878,7 +58802,7 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 			if (key == NULL) {
 				goto abandon_error;
 			}
-			duk_push_hstring(thr, key);  /* keep key reachable for GC etc; guaranteed not to fail */
+			duk_push_hstring(thr, key); /* keep key reachable for GC etc; guaranteed not to fail */
 
 			/* Key is now reachable in the valstack, don't INCREF
 			 * the new allocation yet (we'll steal the refcounts
@@ -54886,11 +58810,10 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 			 */
 
 			new_e_k[new_e_next] = key;
-			tv2 = &new_e_pv[new_e_next].v;  /* array entries are all plain values */
+			tv2 = &new_e_pv[new_e_next].v; /* array entries are all plain values */
 			DUK_TVAL_SET_TVAL(tv2, tv1);
-			new_e_f[new_e_next] = DUK_PROPDESC_FLAG_WRITABLE |
-			                      DUK_PROPDESC_FLAG_ENUMERABLE |
-			                      DUK_PROPDESC_FLAG_CONFIGURABLE;
+			new_e_f[new_e_next] =
+			    DUK_PROPDESC_FLAG_WRITABLE | DUK_PROPDESC_FLAG_ENUMERABLE | DUK_PROPDESC_FLAG_CONFIGURABLE;
 			new_e_next++;
 
 			/* Note: new_e_next matches pushed temp key count, and nothing can
@@ -54917,8 +58840,7 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 			continue;
 		}
 
-		DUK_ASSERT(new_p != NULL && new_e_k != NULL &&
-		           new_e_pv != NULL && new_e_f != NULL);
+		DUK_ASSERT(new_p != NULL && new_e_k != NULL && new_e_pv != NULL && new_e_f != NULL);
 
 		new_e_k[new_e_next] = key;
 		new_e_pv[new_e_next] = DUK_HOBJECT_E_GET_VALUE(thr->heap, obj, i);
@@ -54952,9 +58874,7 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 	DUK_ASSERT(new_a != NULL || array_copy_size == 0U);
 	DUK_ASSERT(DUK_HOBJECT_GET_PROPS(thr->heap, obj) != NULL || array_copy_size == 0U);
 	DUK_ASSERT(DUK_HOBJECT_GET_ASIZE(obj) > 0 || array_copy_size == 0U);
-	duk_memcpy_unsafe((void *) new_a,
-	                  (const void *) DUK_HOBJECT_A_GET_BASE(thr->heap, obj),
-	                  array_copy_size);
+	duk_memcpy_unsafe((void *) new_a, (const void *) DUK_HOBJECT_A_GET_BASE(thr->heap, obj), array_copy_size);
 
 	for (i = DUK_HOBJECT_GET_ASIZE(obj); i < new_a_size; i++) {
 		duk_tval *tv = &new_a[i];
@@ -54982,7 +58902,7 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 		DUK_ASSERT(new_h_size > 0);
 		duk_memset(new_h, 0xff, sizeof(duk_uint32_t) * new_h_size);
 
-		DUK_ASSERT(new_e_next <= new_h_size);  /* equality not actually possible */
+		DUK_ASSERT(new_e_next <= new_h_size); /* equality not actually possible */
 
 		mask = new_h_size - 1;
 		for (i = 0; i < new_e_next; i++) {
@@ -54991,10 +58911,10 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 
 			DUK_ASSERT(key != NULL);
 			j = DUK_HSTRING_GET_HASH(key) & mask;
-			step = 1;  /* Cache friendly but clustering prone. */
+			step = 1; /* Cache friendly but clustering prone. */
 
 			for (;;) {
-				DUK_ASSERT(new_h[j] != DUK__HASH_DELETED);  /* should never happen */
+				DUK_ASSERT(new_h[j] != DUK__HASH_DELETED); /* should never happen */
 				if (new_h[j] == DUK__HASH_UNUSED) {
 					DUK_DDD(DUK_DDDPRINT("rebuild hit %ld -> %ld", (long) j, (long) i));
 					new_h[j] = (duk_uint32_t) i;
@@ -55007,37 +58927,36 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 			}
 		}
 	}
-#endif  /* DUK_USE_HOBJECT_HASH_PART */
+#endif /* DUK_USE_HOBJECT_HASH_PART */
 
 	/*
 	 *  Nice debug log.
 	 */
 
-	DUK_DD(DUK_DDPRINT("resized hobject %p props (%ld -> %ld bytes), from {p=%p,e_size=%ld,e_next=%ld,a_size=%ld,h_size=%ld} to "
-	                   "{p=%p,e_size=%ld,e_next=%ld,a_size=%ld,h_size=%ld}, abandon_array=%ld, unadjusted new_e_size=%ld",
-	                   (void *) obj,
-	                   (long) DUK_HOBJECT_P_COMPUTE_SIZE(DUK_HOBJECT_GET_ESIZE(obj),
-	                                                     DUK_HOBJECT_GET_ASIZE(obj),
-	                                                     DUK_HOBJECT_GET_HSIZE(obj)),
-	                   (long) new_alloc_size,
-	                   (void *) DUK_HOBJECT_GET_PROPS(thr->heap, obj),
-	                   (long) DUK_HOBJECT_GET_ESIZE(obj),
-	                   (long) DUK_HOBJECT_GET_ENEXT(obj),
-	                   (long) DUK_HOBJECT_GET_ASIZE(obj),
-	                   (long) DUK_HOBJECT_GET_HSIZE(obj),
-	                   (void *) new_p,
-	                   (long) new_e_size_adjusted,
-	                   (long) new_e_next,
-	                   (long) new_a_size,
-	                   (long) new_h_size,
-	                   (long) abandon_array,
-	                   (long) new_e_size));
+	DUK_DD(DUK_DDPRINT(
+	    "resized hobject %p props (%ld -> %ld bytes), from {p=%p,e_size=%ld,e_next=%ld,a_size=%ld,h_size=%ld} to "
+	    "{p=%p,e_size=%ld,e_next=%ld,a_size=%ld,h_size=%ld}, abandon_array=%ld, unadjusted new_e_size=%ld",
+	    (void *) obj,
+	    (long) DUK_HOBJECT_P_COMPUTE_SIZE(DUK_HOBJECT_GET_ESIZE(obj), DUK_HOBJECT_GET_ASIZE(obj), DUK_HOBJECT_GET_HSIZE(obj)),
+	    (long) new_alloc_size,
+	    (void *) DUK_HOBJECT_GET_PROPS(thr->heap, obj),
+	    (long) DUK_HOBJECT_GET_ESIZE(obj),
+	    (long) DUK_HOBJECT_GET_ENEXT(obj),
+	    (long) DUK_HOBJECT_GET_ASIZE(obj),
+	    (long) DUK_HOBJECT_GET_HSIZE(obj),
+	    (void *) new_p,
+	    (long) new_e_size_adjusted,
+	    (long) new_e_next,
+	    (long) new_a_size,
+	    (long) new_h_size,
+	    (long) abandon_array,
+	    (long) new_e_size));
 
 	/*
 	 *  All done, switch properties ('p') allocation to new one.
 	 */
 
-	DUK_FREE_CHECKED(thr, DUK_HOBJECT_GET_PROPS(thr->heap, obj));  /* NULL obj->p is OK */
+	DUK_FREE_CHECKED(thr, DUK_HOBJECT_GET_PROPS(thr->heap, obj)); /* NULL obj->p is OK */
 	DUK_HOBJECT_SET_PROPS(thr->heap, obj, new_p);
 	DUK_HOBJECT_SET_ESIZE(obj, new_e_size_adjusted);
 	DUK_HOBJECT_SET_ENEXT(obj, new_e_next);
@@ -55076,11 +58995,11 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
 	 *  unwind.
 	 */
 
- abandon_error:
- alloc_failed:
+abandon_error:
+alloc_failed:
 	DUK_D(DUK_DPRINT("object property table resize failed"));
 
-	DUK_FREE_CHECKED(thr, new_p);  /* OK for NULL. */
+	DUK_FREE_CHECKED(thr, new_p); /* OK for NULL. */
 
 	thr->heap->pf_prevent_count--;
 	thr->heap->ms_base_flags = prev_ms_base_flags;
@@ -55097,9 +59016,7 @@ DUK_INTERNAL void duk_hobject_realloc_props(duk_hthread *thr,
  *  Helpers to resize properties allocation on specific needs.
  */
 
-DUK_INTERNAL void duk_hobject_resize_entrypart(duk_hthread *thr,
-                                               duk_hobject *obj,
-                                               duk_uint32_t new_e_size) {
+DUK_INTERNAL void duk_hobject_resize_entrypart(duk_hthread *thr, duk_hobject *obj, duk_uint32_t new_e_size) {
 	duk_uint32_t old_e_size;
 	duk_uint32_t new_a_size;
 	duk_uint32_t new_h_size;
@@ -55121,34 +59038,10 @@ DUK_INTERNAL void duk_hobject_resize_entrypart(duk_hthread *thr,
 	duk_hobject_realloc_props(thr, obj, new_e_size, new_a_size, new_h_size, 0);
 }
 
-#if 0  /*unused */
-DUK_INTERNAL void duk_hobject_resize_arraypart(duk_hthread *thr,
-                                               duk_hobject *obj,
-                                               duk_uint32_t new_a_size) {
-	duk_uint32_t old_a_size;
-	duk_uint32_t new_e_size;
-	duk_uint32_t new_h_size;
-
-	DUK_ASSERT(thr != NULL);
-	DUK_ASSERT(obj != NULL);
-
-	if (!DUK_HOBJECT_HAS_ARRAY_PART(obj)) {
-		return;
-	}
-	old_a_size = DUK_HOBJECT_GET_ASIZE(obj);
-	if (old_a_size > new_a_size) {
-		new_a_size = old_a_size;
-	}
-	new_e_size = DUK_HOBJECT_GET_ESIZE(obj);
-	new_h_size = DUK_HOBJECT_GET_HSIZE(obj);
-
-	duk_hobject_realloc_props(thr, obj, new_e_size, new_a_size, new_h_size, 0);
-}
-#endif
-
 /* Grow entry part allocation for one additional entry. */
 DUK_LOCAL void duk__grow_props_for_new_entry_item(duk_hthread *thr, duk_hobject *obj) {
-	duk_uint32_t old_e_used;  /* actually used, non-NULL entries */
+	duk_uint32_t old_e_used; /* actually used, non-NULL entries */
+	duk_uint32_t new_e_size_minimum;
 	duk_uint32_t new_e_size;
 	duk_uint32_t new_a_size;
 	duk_uint32_t new_h_size;
@@ -55164,6 +59057,7 @@ DUK_LOCAL void duk__grow_props_for_new_entry_item(duk_hthread *thr, duk_hobject
 	 */
 
 	old_e_used = duk__count_used_e_keys(thr, obj);
+	new_e_size_minimum = old_e_used + 1;
 	new_e_size = old_e_used + duk__get_min_grow_e(old_e_used);
 #if defined(DUK_USE_HOBJECT_HASH_PART)
 	new_h_size = duk__get_default_h_size(new_e_size);
@@ -55171,7 +59065,24 @@ DUK_LOCAL void duk__grow_props_for_new_entry_item(duk_hthread *thr, duk_hobject
 	new_h_size = 0;
 #endif
 	new_a_size = DUK_HOBJECT_GET_ASIZE(obj);
-	DUK_ASSERT(new_e_size >= old_e_used + 1);  /* duk__get_min_grow_e() is always >= 1 */
+
+#if defined(DUK_USE_OBJSIZES16)
+	if (new_e_size > DUK_UINT16_MAX) {
+		new_e_size = DUK_UINT16_MAX;
+	}
+	if (new_h_size > DUK_UINT16_MAX) {
+		new_h_size = DUK_UINT16_MAX;
+	}
+	if (new_a_size > DUK_UINT16_MAX) {
+		new_a_size = DUK_UINT16_MAX;
+	}
+#endif
+	DUK_ASSERT(new_h_size == 0 || new_h_size >= new_e_size);
+
+	if (!(new_e_size >= new_e_size_minimum)) {
+		DUK_ERROR_ALLOC_FAILED(thr);
+		DUK_WO_NORETURN(return;);
+	}
 
 	duk_hobject_realloc_props(thr, obj, new_e_size, new_a_size, new_h_size, 0);
 }
@@ -55180,18 +59091,35 @@ DUK_LOCAL void duk__grow_props_for_new_entry_item(duk_hthread *thr, duk_hobject
 DUK_LOCAL void duk__grow_props_for_array_item(duk_hthread *thr, duk_hobject *obj, duk_uint32_t highest_arr_idx) {
 	duk_uint32_t new_e_size;
 	duk_uint32_t new_a_size;
+	duk_uint32_t new_a_size_minimum;
 	duk_uint32_t new_h_size;
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(obj != NULL);
 	DUK_ASSERT(highest_arr_idx >= DUK_HOBJECT_GET_ASIZE(obj));
 
-	/* minimum new length is highest_arr_idx + 1 */
-
 	new_e_size = DUK_HOBJECT_GET_ESIZE(obj);
 	new_h_size = DUK_HOBJECT_GET_HSIZE(obj);
+	new_a_size_minimum = highest_arr_idx + 1;
 	new_a_size = highest_arr_idx + duk__get_min_grow_a(highest_arr_idx);
-	DUK_ASSERT(new_a_size >= highest_arr_idx + 1);  /* duk__get_min_grow_a() is always >= 1 */
+	DUK_ASSERT(new_a_size >= highest_arr_idx + 1); /* duk__get_min_grow_a() is always >= 1 */
+
+#if defined(DUK_USE_OBJSIZES16)
+	if (new_e_size > DUK_UINT16_MAX) {
+		new_e_size = DUK_UINT16_MAX;
+	}
+	if (new_h_size > DUK_UINT16_MAX) {
+		new_h_size = DUK_UINT16_MAX;
+	}
+	if (new_a_size > DUK_UINT16_MAX) {
+		new_a_size = DUK_UINT16_MAX;
+	}
+#endif
+
+	if (!(new_a_size >= new_a_size_minimum)) {
+		DUK_ERROR_ALLOC_FAILED(thr);
+		DUK_WO_NORETURN(return;);
+	}
 
 	duk_hobject_realloc_props(thr, obj, new_e_size, new_a_size, new_h_size, 0);
 }
@@ -55201,11 +59129,12 @@ DUK_LOCAL void duk__grow_props_for_array_item(duk_hthread *thr, duk_hobject *obj
  * We also compact the entries part while we're at it, although
  * this is not strictly required.
  */
-DUK_LOCAL void duk__abandon_array_checked(duk_hthread *thr, duk_hobject *obj) {
+DUK_LOCAL void duk__abandon_array_part(duk_hthread *thr, duk_hobject *obj) {
+	duk_uint32_t new_e_size_minimum;
 	duk_uint32_t new_e_size;
 	duk_uint32_t new_a_size;
 	duk_uint32_t new_h_size;
-	duk_uint32_t e_used;  /* actually used, non-NULL keys */
+	duk_uint32_t e_used; /* actually used, non-NULL keys */
 	duk_uint32_t a_used;
 	duk_uint32_t a_size;
 
@@ -55221,8 +59150,8 @@ DUK_LOCAL void duk__abandon_array_checked(duk_hthread *thr, duk_hobject *obj) {
 	 *  of space right away.
 	 */
 
-	new_e_size = e_used + a_used;
-	new_e_size = new_e_size + duk__get_min_grow_e(new_e_size);
+	new_e_size_minimum = e_used + a_used;
+	new_e_size = new_e_size_minimum + duk__get_min_grow_e(new_e_size_minimum);
 	new_a_size = 0;
 #if defined(DUK_USE_HOBJECT_HASH_PART)
 	new_h_size = duk__get_default_h_size(new_e_size);
@@ -55230,11 +59159,33 @@ DUK_LOCAL void duk__abandon_array_checked(duk_hthread *thr, duk_hobject *obj) {
 	new_h_size = 0;
 #endif
 
+#if defined(DUK_USE_OBJSIZES16)
+	if (new_e_size > DUK_UINT16_MAX) {
+		new_e_size = DUK_UINT16_MAX;
+	}
+	if (new_h_size > DUK_UINT16_MAX) {
+		new_h_size = DUK_UINT16_MAX;
+	}
+	if (new_a_size > DUK_UINT16_MAX) {
+		new_a_size = DUK_UINT16_MAX;
+	}
+#endif
+
+	if (!(new_e_size >= new_e_size_minimum)) {
+		DUK_ERROR_ALLOC_FAILED(thr);
+		DUK_WO_NORETURN(return;);
+	}
+
 	DUK_DD(DUK_DDPRINT("abandon array part for hobject %p, "
 	                   "array stats before: e_used=%ld, a_used=%ld, a_size=%ld; "
 	                   "resize to e_size=%ld, a_size=%ld, h_size=%ld",
-	                   (void *) obj, (long) e_used, (long) a_used, (long) a_size,
-	                   (long) new_e_size, (long) new_a_size, (long) new_h_size));
+	                   (void *) obj,
+	                   (long) e_used,
+	                   (long) a_used,
+	                   (long) a_size,
+	                   (long) new_e_size,
+	                   (long) new_a_size,
+	                   (long) new_h_size));
 
 	duk_hobject_realloc_props(thr, obj, new_e_size, new_a_size, new_h_size, 1);
 }
@@ -55252,9 +59203,9 @@ DUK_LOCAL void duk__abandon_array_checked(duk_hthread *thr, duk_hobject *obj) {
  */
 
 DUK_INTERNAL void duk_hobject_compact_props(duk_hthread *thr, duk_hobject *obj) {
-	duk_uint32_t e_size;       /* currently used -> new size */
-	duk_uint32_t a_size;       /* currently required */
-	duk_uint32_t a_used;       /* actually used */
+	duk_uint32_t e_size; /* currently used -> new size */
+	duk_uint32_t a_size; /* currently required */
+	duk_uint32_t a_used; /* actually used */
 	duk_uint32_t h_size;
 	duk_bool_t abandon_array;
 
@@ -55273,13 +59224,17 @@ DUK_INTERNAL void duk_hobject_compact_props(duk_hthread *thr, duk_hobject *obj)
 
 	DUK_DD(DUK_DDPRINT("compacting hobject, used e keys %ld, used a keys %ld, min a size %ld, "
 	                   "resized array density would be: %ld/%ld = %lf",
-	                   (long) e_size, (long) a_used, (long) a_size,
-	                   (long) a_used, (long) a_size,
+	                   (long) e_size,
+	                   (long) a_used,
+	                   (long) a_size,
+	                   (long) a_used,
+	                   (long) a_size,
 	                   (double) a_used / (double) a_size));
 
 	if (duk__abandon_array_density_check(a_used, a_size)) {
 		DUK_DD(DUK_DDPRINT("decided to abandon array during compaction, a_used=%ld, a_size=%ld",
-		                   (long) a_used, (long) a_size));
+		                   (long) a_used,
+		                   (long) a_size));
 		abandon_array = 1;
 		e_size += a_used;
 		a_size = 0;
@@ -55299,7 +59254,10 @@ DUK_INTERNAL void duk_hobject_compact_props(duk_hthread *thr, duk_hobject *obj)
 #endif
 
 	DUK_DD(DUK_DDPRINT("compacting hobject -> new e_size %ld, new a_size=%ld, new h_size=%ld, abandon_array=%ld",
-	                   (long) e_size, (long) a_size, (long) h_size, (long) abandon_array));
+	                   (long) e_size,
+	                   (long) a_size,
+	                   (long) h_size,
+	                   (long) abandon_array));
 
 	duk_hobject_realloc_props(thr, obj, e_size, a_size, h_size, abandon_array);
 }
@@ -55314,15 +59272,15 @@ DUK_INTERNAL void duk_hobject_compact_props(duk_hthread *thr, duk_hobject *obj)
  *  but there is no hash part, h_idx is set to -1.
  */
 
-DUK_INTERNAL duk_bool_t duk_hobject_find_existing_entry(duk_heap *heap, duk_hobject *obj, duk_hstring *key, duk_int_t *e_idx, duk_int_t *h_idx) {
+DUK_INTERNAL duk_bool_t
+duk_hobject_find_entry(duk_heap *heap, duk_hobject *obj, duk_hstring *key, duk_int_t *e_idx, duk_int_t *h_idx) {
 	DUK_ASSERT(obj != NULL);
 	DUK_ASSERT(key != NULL);
 	DUK_ASSERT(e_idx != NULL);
 	DUK_ASSERT(h_idx != NULL);
 	DUK_UNREF(heap);
 
-	if (DUK_LIKELY(DUK_HOBJECT_GET_HSIZE(obj) == 0))
-	{
+	if (DUK_LIKELY(DUK_HOBJECT_GET_HSIZE(obj) == 0)) {
 		/* Linear scan: more likely because most objects are small.
 		 * This is an important fast path.
 		 *
@@ -55331,7 +59289,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_find_existing_entry(duk_heap *heap, duk_hobj
 		duk_uint_fast32_t i;
 		duk_uint_fast32_t n;
 		duk_hstring **h_keys_base;
-		DUK_DDD(DUK_DDDPRINT("duk_hobject_find_existing_entry() using linear scan for lookup"));
+		DUK_DDD(DUK_DDDPRINT("duk_hobject_find_entry() using linear scan for lookup"));
 
 		h_keys_base = DUK_HOBJECT_E_GET_KEY_BASE(heap, obj);
 		n = DUK_HOBJECT_GET_ENEXT(obj);
@@ -55344,61 +59302,58 @@ DUK_INTERNAL duk_bool_t duk_hobject_find_existing_entry(duk_heap *heap, duk_hobj
 		}
 	}
 #if defined(DUK_USE_HOBJECT_HASH_PART)
-	else
-	{
+	else {
 		/* hash lookup */
 		duk_uint32_t n;
 		duk_uint32_t i, step;
 		duk_uint32_t *h_base;
 		duk_uint32_t mask;
 
-		DUK_DDD(DUK_DDDPRINT("duk_hobject_find_existing_entry() using hash part for lookup"));
+		DUK_DDD(DUK_DDDPRINT("duk_hobject_find_entry() using hash part for lookup"));
 
 		h_base = DUK_HOBJECT_H_GET_BASE(heap, obj);
 		n = DUK_HOBJECT_GET_HSIZE(obj);
 		mask = n - 1;
 		i = DUK_HSTRING_GET_HASH(key) & mask;
-		step = 1;  /* Cache friendly but clustering prone. */
+		step = 1; /* Cache friendly but clustering prone. */
 
 		for (;;) {
 			duk_uint32_t t;
 
-			DUK_ASSERT_DISABLE(i >= 0);  /* unsigned */
+			DUK_ASSERT_DISABLE(i >= 0); /* unsigned */
 			DUK_ASSERT(i < DUK_HOBJECT_GET_HSIZE(obj));
 			t = h_base[i];
 			DUK_ASSERT(t == DUK__HASH_UNUSED || t == DUK__HASH_DELETED ||
-			           (t < DUK_HOBJECT_GET_ESIZE(obj)));  /* t >= 0 always true, unsigned */
+			           (t < DUK_HOBJECT_GET_ESIZE(obj))); /* t >= 0 always true, unsigned */
 
 			if (t == DUK__HASH_UNUSED) {
 				break;
 			} else if (t == DUK__HASH_DELETED) {
-				DUK_DDD(DUK_DDDPRINT("lookup miss (deleted) i=%ld, t=%ld",
-				                     (long) i, (long) t));
+				DUK_DDD(DUK_DDDPRINT("lookup miss (deleted) i=%ld, t=%ld", (long) i, (long) t));
 			} else {
 				DUK_ASSERT(t < DUK_HOBJECT_GET_ESIZE(obj));
 				if (DUK_HOBJECT_E_GET_KEY(heap, obj, t) == key) {
-					DUK_DDD(DUK_DDDPRINT("lookup hit i=%ld, t=%ld -> key %p",
-					                     (long) i, (long) t, (void *) key));
+					DUK_DDD(
+					    DUK_DDDPRINT("lookup hit i=%ld, t=%ld -> key %p", (long) i, (long) t, (void *) key));
 					*e_idx = (duk_int_t) t;
 					*h_idx = (duk_int_t) i;
 					return 1;
 				}
-				DUK_DDD(DUK_DDDPRINT("lookup miss i=%ld, t=%ld",
-				                     (long) i, (long) t));
+				DUK_DDD(DUK_DDDPRINT("lookup miss i=%ld, t=%ld", (long) i, (long) t));
 			}
 			i = (i + step) & mask;
 
 			/* Guaranteed to finish (hash is larger than #props). */
 		}
 	}
-#endif  /* DUK_USE_HOBJECT_HASH_PART */
+#endif /* DUK_USE_HOBJECT_HASH_PART */
 
 	/* Not found, leave e_idx and h_idx unset. */
 	return 0;
 }
 
 /* For internal use: get non-accessor entry value */
-DUK_INTERNAL duk_tval *duk_hobject_find_existing_entry_tval_ptr(duk_heap *heap, duk_hobject *obj, duk_hstring *key) {
+DUK_INTERNAL duk_tval *duk_hobject_find_entry_tval_ptr(duk_heap *heap, duk_hobject *obj, duk_hstring *key) {
 	duk_int_t e_idx;
 	duk_int_t h_idx;
 
@@ -55406,7 +59361,7 @@ DUK_INTERNAL duk_tval *duk_hobject_find_existing_entry_tval_ptr(duk_heap *heap,
 	DUK_ASSERT(key != NULL);
 	DUK_UNREF(heap);
 
-	if (duk_hobject_find_existing_entry(heap, obj, key, &e_idx, &h_idx)) {
+	if (duk_hobject_find_entry(heap, obj, key, &e_idx, &h_idx)) {
 		DUK_ASSERT(e_idx >= 0);
 		if (!DUK_HOBJECT_E_SLOT_IS_ACCESSOR(heap, obj, e_idx)) {
 			return DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(heap, obj, e_idx);
@@ -55415,8 +59370,15 @@ DUK_INTERNAL duk_tval *duk_hobject_find_existing_entry_tval_ptr(duk_heap *heap,
 	return NULL;
 }
 
+DUK_INTERNAL duk_tval *duk_hobject_find_entry_tval_ptr_stridx(duk_heap *heap, duk_hobject *obj, duk_small_uint_t stridx) {
+	return duk_hobject_find_entry_tval_ptr(heap, obj, DUK_HEAP_GET_STRING(heap, stridx));
+}
+
 /* For internal use: get non-accessor entry value and attributes */
-DUK_INTERNAL duk_tval *duk_hobject_find_existing_entry_tval_ptr_and_attrs(duk_heap *heap, duk_hobject *obj, duk_hstring *key, duk_uint_t *out_attrs) {
+DUK_INTERNAL duk_tval *duk_hobject_find_entry_tval_ptr_and_attrs(duk_heap *heap,
+                                                                 duk_hobject *obj,
+                                                                 duk_hstring *key,
+                                                                 duk_uint_t *out_attrs) {
 	duk_int_t e_idx;
 	duk_int_t h_idx;
 
@@ -55425,7 +59387,7 @@ DUK_INTERNAL duk_tval *duk_hobject_find_existing_entry_tval_ptr_and_attrs(duk_he
 	DUK_ASSERT(out_attrs != NULL);
 	DUK_UNREF(heap);
 
-	if (duk_hobject_find_existing_entry(heap, obj, key, &e_idx, &h_idx)) {
+	if (duk_hobject_find_entry(heap, obj, key, &e_idx, &h_idx)) {
 		DUK_ASSERT(e_idx >= 0);
 		if (!DUK_HOBJECT_E_SLOT_IS_ACCESSOR(heap, obj, e_idx)) {
 			*out_attrs = DUK_HOBJECT_E_GET_FLAGS(heap, obj, e_idx);
@@ -55437,7 +59399,7 @@ DUK_INTERNAL duk_tval *duk_hobject_find_existing_entry_tval_ptr_and_attrs(duk_he
 }
 
 /* For internal use: get array part value */
-DUK_INTERNAL duk_tval *duk_hobject_find_existing_array_entry_tval_ptr(duk_heap *heap, duk_hobject *obj, duk_uarridx_t i) {
+DUK_INTERNAL duk_tval *duk_hobject_find_array_entry_tval_ptr(duk_heap *heap, duk_hobject *obj, duk_uarridx_t i) {
 	duk_tval *tv;
 
 	DUK_ASSERT(obj != NULL);
@@ -55501,14 +59463,15 @@ DUK_LOCAL duk_int_t duk__hobject_alloc_entry_checked(duk_hthread *thr, duk_hobje
 		n = DUK_HOBJECT_GET_HSIZE(obj);
 		mask = n - 1;
 		i = DUK_HSTRING_GET_HASH(key) & mask;
-		step = 1;  /* Cache friendly but clustering prone. */
+		step = 1; /* Cache friendly but clustering prone. */
 
 		for (;;) {
 			duk_uint32_t t = h_base[i];
 			if (t == DUK__HASH_UNUSED || t == DUK__HASH_DELETED) {
 				DUK_DDD(DUK_DDDPRINT("duk__hobject_alloc_entry_checked() inserted key into hash part, %ld -> %ld",
-				                     (long) i, (long) idx));
-				DUK_ASSERT_DISABLE(i >= 0);  /* unsigned */
+				                     (long) i,
+				                     (long) idx));
+				DUK_ASSERT_DISABLE(i >= 0); /* unsigned */
 				DUK_ASSERT(i < DUK_HOBJECT_GET_HSIZE(obj));
 				DUK_ASSERT_DISABLE(idx >= 0);
 				DUK_ASSERT(idx < DUK_HOBJECT_GET_ESIZE(obj));
@@ -55521,7 +59484,7 @@ DUK_LOCAL duk_int_t duk__hobject_alloc_entry_checked(duk_hthread *thr, duk_hobje
 			/* Guaranteed to finish (hash is larger than #props). */
 		}
 	}
-#endif  /* DUK_USE_HOBJECT_HASH_PART */
+#endif /* DUK_USE_HOBJECT_HASH_PART */
 
 	/* Note: we could return the hash index here too, but it's not
 	 * needed right now.
@@ -55540,47 +59503,67 @@ DUK_LOCAL duk_int_t duk__hobject_alloc_entry_checked(duk_hthread *thr, duk_hobje
  *  to incref OR decref.  No proxies or accessors are invoked, no prototype walk.
  */
 
-DUK_INTERNAL duk_bool_t duk_hobject_get_internal_value(duk_heap *heap, duk_hobject *obj, duk_tval *tv_out) {
-	duk_int_t e_idx;
-	duk_int_t h_idx;
+DUK_INTERNAL duk_tval *duk_hobject_get_internal_value_tval_ptr(duk_heap *heap, duk_hobject *obj) {
+	return duk_hobject_find_entry_tval_ptr_stridx(heap, obj, DUK_STRIDX_INT_VALUE);
+}
+
+DUK_LOCAL duk_heaphdr *duk_hobject_get_internal_value_heaphdr(duk_heap *heap, duk_hobject *obj) {
+	duk_tval *tv;
 
 	DUK_ASSERT(heap != NULL);
 	DUK_ASSERT(obj != NULL);
-	DUK_ASSERT(tv_out != NULL);
 
-	/* Always in entry part, no need to look up parents etc. */
-	if (duk_hobject_find_existing_entry(heap, obj, DUK_HEAP_STRING_INT_VALUE(heap), &e_idx, &h_idx)) {
-		DUK_ASSERT(e_idx >= 0);
-		DUK_ASSERT(!DUK_HOBJECT_E_SLOT_IS_ACCESSOR(heap, obj, e_idx));
-		DUK_TVAL_SET_TVAL(tv_out, DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(heap, obj, e_idx));
-		return 1;
+	tv = duk_hobject_get_internal_value_tval_ptr(heap, obj);
+	if (tv != NULL) {
+		duk_heaphdr *h = DUK_TVAL_GET_HEAPHDR(tv);
+		DUK_ASSERT(h != NULL);
+		return h;
 	}
-	DUK_TVAL_SET_UNDEFINED(tv_out);
-	return 0;
+
+	return NULL;
 }
 
 DUK_INTERNAL duk_hstring *duk_hobject_get_internal_value_string(duk_heap *heap, duk_hobject *obj) {
-	duk_tval tv;
+	duk_hstring *h;
 
-	DUK_ASSERT(heap != NULL);
-	DUK_ASSERT(obj != NULL);
+	h = (duk_hstring *) duk_hobject_get_internal_value_heaphdr(heap, obj);
+	if (h != NULL) {
+		DUK_ASSERT(DUK_HEAPHDR_IS_STRING((duk_heaphdr *) h));
+	}
+	return h;
+}
 
-	/* This is not strictly necessary, but avoids compiler warnings; e.g.
-	 * gcc won't reliably detect that no uninitialized data is read below.
-	 */
-	duk_memzero((void *) &tv, sizeof(duk_tval));
+DUK_LOCAL duk_hobject *duk__hobject_get_entry_object_stridx(duk_heap *heap, duk_hobject *obj, duk_small_uint_t stridx) {
+	duk_tval *tv;
+	duk_hobject *h;
 
-	if (duk_hobject_get_internal_value(heap, obj, &tv)) {
-		duk_hstring *h;
-		DUK_ASSERT(DUK_TVAL_IS_STRING(&tv));
-		h = DUK_TVAL_GET_STRING(&tv);
-		/* No explicit check for string vs. symbol, accept both. */
+	tv = duk_hobject_find_entry_tval_ptr_stridx(heap, obj, stridx);
+	if (tv != NULL && DUK_TVAL_IS_OBJECT(tv)) {
+		h = DUK_TVAL_GET_OBJECT(tv);
+		DUK_ASSERT(h != NULL);
 		return h;
 	}
-
 	return NULL;
 }
 
+DUK_INTERNAL duk_harray *duk_hobject_get_formals(duk_hthread *thr, duk_hobject *obj) {
+	duk_harray *h;
+
+	h = (duk_harray *) duk__hobject_get_entry_object_stridx(thr->heap, obj, DUK_STRIDX_INT_FORMALS);
+	if (h != NULL) {
+		DUK_ASSERT(DUK_HOBJECT_IS_ARRAY((duk_hobject *) h));
+		DUK_ASSERT(h->length <= DUK_HOBJECT_GET_ASIZE((duk_hobject *) h));
+	}
+	return h;
+}
+
+DUK_INTERNAL duk_hobject *duk_hobject_get_varmap(duk_hthread *thr, duk_hobject *obj) {
+	duk_hobject *h;
+
+	h = duk__hobject_get_entry_object_stridx(thr->heap, obj, DUK_STRIDX_INT_VARMAP);
+	return h;
+}
+
 /*
  *  Arguments handling helpers (argument map mainly).
  *
@@ -55609,8 +59592,12 @@ duk_bool_t duk__lookup_arguments_map(duk_hthread *thr,
 
 	DUK_DDD(DUK_DDDPRINT("arguments map lookup: thr=%p, obj=%p, key=%p, temp_desc=%p "
 	                     "(obj -> %!O, key -> %!O)",
-	                     (void *) thr, (void *) obj, (void *) key, (void *) temp_desc,
-	                     (duk_heaphdr *) obj, (duk_heaphdr *) key));
+	                     (void *) thr,
+	                     (void *) obj,
+	                     (void *) key,
+	                     (void *) temp_desc,
+	                     (duk_heaphdr *) obj,
+	                     (duk_heaphdr *) key));
 
 	if (!duk_hobject_get_own_propdesc(thr, obj, DUK_HTHREAD_STRING_INT_MAP(thr), temp_desc, DUK_GETDESC_FLAG_PUSH_VALUE)) {
 		DUK_DDD(DUK_DDDPRINT("-> no 'map'"));
@@ -55619,7 +59606,7 @@ duk_bool_t duk__lookup_arguments_map(duk_hthread *thr,
 
 	map = duk_require_hobject(thr, -1);
 	DUK_ASSERT(map != NULL);
-	duk_pop_unsafe(thr);  /* map is reachable through obj */
+	duk_pop_unsafe(thr); /* map is reachable through obj */
 
 	if (!duk_hobject_get_own_propdesc(thr, map, key, temp_desc, DUK_GETDESC_FLAG_PUSH_VALUE)) {
 		DUK_DDD(DUK_DDDPRINT("-> 'map' exists, but key not in map"));
@@ -55629,29 +59616,32 @@ duk_bool_t duk__lookup_arguments_map(duk_hthread *thr,
 	/* [... varname] */
 	DUK_DDD(DUK_DDDPRINT("-> 'map' exists, and contains key, key is mapped to argument/variable binding %!T",
 	                     (duk_tval *) duk_get_tval(thr, -1)));
-	DUK_ASSERT(duk_is_string(thr, -1));  /* guaranteed when building arguments */
+	DUK_ASSERT(duk_is_string(thr, -1)); /* guaranteed when building arguments */
 
 	/* get varenv for varname (callee's declarative lexical environment) */
 	rc = duk_hobject_get_own_propdesc(thr, obj, DUK_HTHREAD_STRING_INT_VARENV(thr), temp_desc, DUK_GETDESC_FLAG_PUSH_VALUE);
 	DUK_UNREF(rc);
-	DUK_ASSERT(rc != 0);  /* arguments MUST have an initialized lexical environment reference */
+	DUK_ASSERT(rc != 0); /* arguments MUST have an initialized lexical environment reference */
 	varenv = duk_require_hobject(thr, -1);
 	DUK_ASSERT(varenv != NULL);
-	duk_pop_unsafe(thr);  /* varenv remains reachable through 'obj' */
+	duk_pop_unsafe(thr); /* varenv remains reachable through 'obj' */
 
 	DUK_DDD(DUK_DDDPRINT("arguments varenv is: %!dO", (duk_heaphdr *) varenv));
 
 	/* success: leave varname in stack */
 	*out_map = map;
 	*out_varenv = varenv;
-	return 1;  /* [... varname] */
+	return 1; /* [... varname] */
 }
 
 /* Lookup 'key' from arguments internal 'map', and leave replacement value
  * on stack top if mapped (and return non-zero).
  * Used in E5 Section 10.6 algorithm for [[GetOwnProperty]] (used by [[Get]]).
  */
-DUK_LOCAL duk_bool_t duk__check_arguments_map_for_get(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_propdesc *temp_desc) {
+DUK_LOCAL duk_bool_t duk__check_arguments_map_for_get(duk_hthread *thr,
+                                                      duk_hobject *obj,
+                                                      duk_hstring *key,
+                                                      duk_propdesc *temp_desc) {
 	duk_hobject *map;
 	duk_hobject *varenv;
 	duk_hstring *varname;
@@ -55667,7 +59657,7 @@ DUK_LOCAL duk_bool_t duk__check_arguments_map_for_get(duk_hthread *thr, duk_hobj
 
 	varname = duk_require_hstring(thr, -1);
 	DUK_ASSERT(varname != NULL);
-	duk_pop_unsafe(thr);  /* varname is still reachable */
+	duk_pop_unsafe(thr); /* varname is still reachable */
 
 	DUK_DDD(DUK_DDDPRINT("arguments object automatic getvar for a bound variable; "
 	                     "key=%!O, varname=%!O",
@@ -55688,7 +59678,11 @@ DUK_LOCAL duk_bool_t duk__check_arguments_map_for_get(duk_hthread *thr, duk_hobj
  * Used in E5 Section 10.6 algorithm for [[DefineOwnProperty]] (used by [[Put]]).
  * Assumes stack top contains 'put' value (which is NOT popped).
  */
-DUK_LOCAL void duk__check_arguments_map_for_put(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_propdesc *temp_desc, duk_bool_t throw_flag) {
+DUK_LOCAL void duk__check_arguments_map_for_put(duk_hthread *thr,
+                                                duk_hobject *obj,
+                                                duk_hstring *key,
+                                                duk_propdesc *temp_desc,
+                                                duk_bool_t throw_flag) {
 	duk_hobject *map;
 	duk_hobject *varenv;
 	duk_hstring *varname;
@@ -55704,7 +59698,7 @@ DUK_LOCAL void duk__check_arguments_map_for_put(duk_hthread *thr, duk_hobject *o
 
 	varname = duk_require_hstring(thr, -1);
 	DUK_ASSERT(varname != NULL);
-	duk_pop_unsafe(thr);  /* varname is still reachable */
+	duk_pop_unsafe(thr); /* varname is still reachable */
 
 	DUK_DDD(DUK_DDDPRINT("arguments object automatic putvar for a bound variable; "
 	                     "key=%!O, varname=%!O, value=%!T",
@@ -55743,15 +59737,14 @@ DUK_LOCAL void duk__check_arguments_map_for_delete(duk_hthread *thr, duk_hobject
 
 	map = duk_require_hobject(thr, -1);
 	DUK_ASSERT(map != NULL);
-	duk_pop_unsafe(thr);  /* map is reachable through obj */
+	duk_pop_unsafe(thr); /* map is reachable through obj */
 
-	DUK_DDD(DUK_DDDPRINT("-> have 'map', delete key %!O from map (if exists)); ignore result",
-	                     (duk_heaphdr *) key));
+	DUK_DDD(DUK_DDDPRINT("-> have 'map', delete key %!O from map (if exists)); ignore result", (duk_heaphdr *) key));
 
 	/* Note: no recursion issue, we can trust 'map' to behave */
 	DUK_ASSERT(!DUK_HOBJECT_HAS_EXOTIC_BEHAVIOR(map));
 	DUK_DDD(DUK_DDDPRINT("map before deletion: %!O", (duk_heaphdr *) map));
-	(void) duk_hobject_delprop_raw(thr, map, key, 0);  /* ignore result */
+	(void) duk_hobject_delprop_raw(thr, map, key, 0); /* ignore result */
 	DUK_DDD(DUK_DDDPRINT("map after deletion: %!O", (duk_heaphdr *) map));
 }
 
@@ -55794,14 +59787,24 @@ DUK_LOCAL void duk__check_arguments_map_for_delete(duk_hthread *thr, duk_hobject
  *      accessor properties later, this would need to change.
  */
 
-DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_uint32_t arr_idx, duk_propdesc *out_desc, duk_small_uint_t flags) {
+DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr,
+                                               duk_hobject *obj,
+                                               duk_hstring *key,
+                                               duk_uint32_t arr_idx,
+                                               duk_propdesc *out_desc,
+                                               duk_small_uint_t flags) {
 	duk_tval *tv;
 
 	DUK_DDD(DUK_DDDPRINT("duk_hobject_get_own_propdesc: thr=%p, obj=%p, key=%p, out_desc=%p, flags=%lx, "
 	                     "arr_idx=%ld (obj -> %!O, key -> %!O)",
-	                     (void *) thr, (void *) obj, (void *) key, (void *) out_desc,
-	                     (long) flags, (long) arr_idx,
-	                     (duk_heaphdr *) obj, (duk_heaphdr *) key));
+	                     (void *) thr,
+	                     (void *) obj,
+	                     (void *) key,
+	                     (void *) out_desc,
+	                     (long) flags,
+	                     (long) arr_idx,
+	                     (duk_heaphdr *) obj,
+	                     (duk_heaphdr *) key));
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(thr->heap != NULL);
@@ -55835,7 +59838,7 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 	 *  same keys so the entry part vs. array part order doesn't matter.
 	 */
 
-	if (duk_hobject_find_existing_entry(thr->heap, obj, key, &out_desc->e_idx, &out_desc->h_idx)) {
+	if (duk_hobject_find_entry(thr->heap, obj, key, &out_desc->e_idx, &out_desc->h_idx)) {
 		duk_int_t e_idx = out_desc->e_idx;
 		DUK_ASSERT(out_desc->e_idx >= 0);
 		out_desc->a_idx = -1;
@@ -55875,14 +59878,13 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 					duk_push_tval(thr, tv);
 				}
 				/* implicit attributes */
-				out_desc->flags = DUK_PROPDESC_FLAG_WRITABLE |
-				                  DUK_PROPDESC_FLAG_CONFIGURABLE |
-				                  DUK_PROPDESC_FLAG_ENUMERABLE;
+				out_desc->flags =
+				    DUK_PROPDESC_FLAG_WRITABLE | DUK_PROPDESC_FLAG_CONFIGURABLE | DUK_PROPDESC_FLAG_ENUMERABLE;
 				out_desc->get = NULL;
 				out_desc->set = NULL;
 				out_desc->e_idx = -1;
 				out_desc->h_idx = -1;
-				out_desc->a_idx = (duk_int_t) arr_idx;  /* XXX: limit 2G due to being signed */
+				out_desc->a_idx = (duk_int_t) arr_idx; /* XXX: limit 2G due to being signed */
 				goto prop_found;
 			}
 		}
@@ -55903,10 +59905,11 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 		duk_harray *a;
 
 		DUK_DDD(DUK_DDDPRINT("array object exotic property get for key: %!O, arr_idx: %ld",
-		                     (duk_heaphdr *) key, (long) arr_idx));
+		                     (duk_heaphdr *) key,
+		                     (long) arr_idx));
 
 		a = (duk_harray *) obj;
-		DUK_ASSERT_HARRAY_VALID(a);
+		DUK_HARRAY_ASSERT_VALID(a);
 
 		if (key == DUK_HTHREAD_STRING_LENGTH(thr)) {
 			DUK_DDD(DUK_DDDPRINT("-> found, key is 'length', length exotic behavior"));
@@ -55925,11 +59928,12 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 			out_desc->a_idx = -1;
 
 			DUK_ASSERT(!DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(obj));
-			goto prop_found_noexotic;  /* cannot be arguments exotic */
+			goto prop_found_noexotic; /* cannot be arguments exotic */
 		}
 	} else if (DUK_HOBJECT_HAS_EXOTIC_STRINGOBJ(obj)) {
 		DUK_DDD(DUK_DDDPRINT("string object exotic property get for key: %!O, arr_idx: %ld",
-		                     (duk_heaphdr *) key, (long) arr_idx));
+		                     (duk_heaphdr *) key,
+		                     (long) arr_idx));
 
 		/* XXX: charlen; avoid multiple lookups? */
 
@@ -55944,9 +59948,9 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 				DUK_DDD(DUK_DDDPRINT("-> found, array index inside string"));
 				if (flags & DUK_GETDESC_FLAG_PUSH_VALUE) {
 					duk_push_hstring(thr, h_val);
-					duk_substring(thr, -1, arr_idx, arr_idx + 1);  /* [str] -> [substr] */
+					duk_substring(thr, -1, arr_idx, arr_idx + 1); /* [str] -> [substr] */
 				}
-				out_desc->flags = DUK_PROPDESC_FLAG_ENUMERABLE |  /* E5 Section 15.5.5.2 */
+				out_desc->flags = DUK_PROPDESC_FLAG_ENUMERABLE | /* E5 Section 15.5.5.2 */
 				                  DUK_PROPDESC_FLAG_VIRTUAL;
 				out_desc->get = NULL;
 				out_desc->set = NULL;
@@ -55955,7 +59959,7 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 				out_desc->a_idx = -1;
 
 				DUK_ASSERT(!DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(obj));
-				goto prop_found_noexotic;  /* cannot be arguments exotic */
+				goto prop_found_noexotic; /* cannot be arguments exotic */
 			} else {
 				/* index is above internal string length -> property is fully normal */
 				DUK_DDD(DUK_DDDPRINT("array index outside string -> normal property"));
@@ -55970,7 +59974,7 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 			if (flags & DUK_GETDESC_FLAG_PUSH_VALUE) {
 				duk_push_uint(thr, (duk_uint_t) DUK_HSTRING_GET_CHARLEN(h_val));
 			}
-			out_desc->flags = DUK_PROPDESC_FLAG_VIRTUAL;  /* E5 Section 15.5.5.1 */
+			out_desc->flags = DUK_PROPDESC_FLAG_VIRTUAL; /* E5 Section 15.5.5.1 */
 			out_desc->get = NULL;
 			out_desc->set = NULL;
 			out_desc->e_idx = -1;
@@ -55978,7 +59982,7 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 			out_desc->a_idx = -1;
 
 			DUK_ASSERT(!DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(obj));
-			goto prop_found_noexotic;  /* cannot be arguments exotic */
+			goto prop_found_noexotic; /* cannot be arguments exotic */
 		}
 	}
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
@@ -55988,9 +59992,8 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 		duk_small_uint_t elem_size;
 
 		h_bufobj = (duk_hbufobj *) obj;
-		DUK_ASSERT_HBUFOBJ_VALID(h_bufobj);
-		DUK_DDD(DUK_DDDPRINT("bufobj property get for key: %!O, arr_idx: %ld",
-		                     (duk_heaphdr *) key, (long) arr_idx));
+		DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
+		DUK_DDD(DUK_DDDPRINT("bufobj property get for key: %!O, arr_idx: %ld", (duk_heaphdr *) key, (long) arr_idx));
 
 		if (arr_idx != DUK__NO_ARRAY_INDEX && DUK_HBUFOBJ_HAS_VIRTUAL_INDICES(h_bufobj)) {
 			DUK_DDD(DUK_DDDPRINT("array index exists"));
@@ -55999,21 +60002,22 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 			 * length downshift won't.
 			 */
 			if (arr_idx < (h_bufobj->length >> h_bufobj->shift)) {
-				byte_off = arr_idx << h_bufobj->shift;  /* no wrap assuming h_bufobj->length is valid */
+				byte_off = arr_idx << h_bufobj->shift; /* no wrap assuming h_bufobj->length is valid */
 				elem_size = (duk_small_uint_t) (1U << h_bufobj->shift);
 				if (flags & DUK_GETDESC_FLAG_PUSH_VALUE) {
 					duk_uint8_t *data;
 
-					if (h_bufobj->buf != NULL && DUK_HBUFOBJ_VALID_BYTEOFFSET_EXCL(h_bufobj, byte_off + elem_size)) {
-						data = (duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h_bufobj->buf) + h_bufobj->offset + byte_off;
+					if (h_bufobj->buf != NULL &&
+					    DUK_HBUFOBJ_VALID_BYTEOFFSET_EXCL(h_bufobj, byte_off + elem_size)) {
+						data = (duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h_bufobj->buf) +
+						       h_bufobj->offset + byte_off;
 						duk_hbufobj_push_validated_read(thr, h_bufobj, data, elem_size);
 					} else {
 						DUK_D(DUK_DPRINT("bufobj access out of underlying buffer, ignoring (read zero)"));
 						duk_push_uint(thr, 0);
 					}
 				}
-				out_desc->flags = DUK_PROPDESC_FLAG_WRITABLE |
-				                  DUK_PROPDESC_FLAG_VIRTUAL;
+				out_desc->flags = DUK_PROPDESC_FLAG_WRITABLE | DUK_PROPDESC_FLAG_VIRTUAL;
 				if (DUK_HOBJECT_GET_CLASS_NUMBER(obj) != DUK_HOBJECT_CLASS_ARRAYBUFFER) {
 					/* ArrayBuffer indices are non-standard and are
 					 * non-enumerable to avoid their serialization.
@@ -56027,7 +60031,8 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 				out_desc->a_idx = -1;
 
 				DUK_ASSERT(!DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(obj));
-				goto prop_found_noexotic;  /* cannot be e.g. arguments exotic, since exotic 'traits' are mutually exclusive */
+				goto prop_found_noexotic; /* cannot be e.g. arguments exotic, since exotic 'traits' are mutually
+				                             exclusive */
 			} else {
 				/* index is above internal buffer length -> property is fully normal */
 				DUK_DDD(DUK_DDDPRINT("array index outside buffer -> normal property"));
@@ -56049,10 +60054,10 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 			out_desc->a_idx = -1;
 
 			DUK_ASSERT(!DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(obj));
-			goto prop_found_noexotic;  /* cannot be arguments exotic */
+			goto prop_found_noexotic; /* cannot be arguments exotic */
 		}
 	}
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 	/* Array properties have exotic behavior but they are concrete,
 	 * so no special handling here.
@@ -56066,7 +60071,7 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 	 *  Not found as concrete or virtual.
 	 */
 
- prop_not_found:
+prop_not_found:
 	DUK_DDD(DUK_DDDPRINT("-> not found (virtual, entry part, or array part)"));
 	DUK_STATS_INC(thr->heap, stats_getownpropdesc_miss);
 	return 0;
@@ -56078,7 +60083,7 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 	 *  description of [[GetOwnProperty]] variant for arguments.
 	 */
 
- prop_found:
+prop_found:
 	DUK_DDD(DUK_DDDPRINT("-> property found, checking for arguments exotic post-behavior"));
 
 	/* Notes:
@@ -56088,8 +60093,7 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 	 *    DUK_GETDESC_FLAG_PUSH_VALUE is not set.
 	 */
 
-	if (DUK_UNLIKELY(DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(obj) &&
-	                 arr_idx != DUK__NO_ARRAY_INDEX &&
+	if (DUK_UNLIKELY(DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(obj) && arr_idx != DUK__NO_ARRAY_INDEX &&
 	                 (flags & DUK_GETDESC_FLAG_PUSH_VALUE))) {
 		duk_propdesc temp_desc;
 
@@ -56115,12 +60119,13 @@ DUK_LOCAL duk_bool_t duk__get_own_propdesc_raw(duk_hthread *thr, duk_hobject *ob
 		}
 	}
 
- prop_found_noexotic:
+prop_found_noexotic:
 	DUK_STATS_INC(thr->heap, stats_getownpropdesc_hit);
 	return 1;
 }
 
-DUK_INTERNAL duk_bool_t duk_hobject_get_own_propdesc(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_propdesc *out_desc, duk_small_uint_t flags) {
+DUK_INTERNAL duk_bool_t
+duk_hobject_get_own_propdesc(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_propdesc *out_desc, duk_small_uint_t flags) {
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(obj != NULL);
 	DUK_ASSERT(key != NULL);
@@ -56149,7 +60154,8 @@ DUK_INTERNAL duk_bool_t duk_hobject_get_own_propdesc(duk_hthread *thr, duk_hobje
  *  pointers.
  */
 
-DUK_LOCAL duk_bool_t duk__get_propdesc(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_propdesc *out_desc, duk_small_uint_t flags) {
+DUK_LOCAL duk_bool_t
+duk__get_propdesc(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_propdesc *out_desc, duk_small_uint_t flags) {
 	duk_hobject *curr;
 	duk_uint32_t arr_idx;
 	duk_uint_t sanity;
@@ -56167,9 +60173,14 @@ DUK_LOCAL duk_bool_t duk__get_propdesc(duk_hthread *thr, duk_hobject *obj, duk_h
 
 	DUK_DDD(DUK_DDDPRINT("duk__get_propdesc: thr=%p, obj=%p, key=%p, out_desc=%p, flags=%lx, "
 	                     "arr_idx=%ld (obj -> %!O, key -> %!O)",
-	                     (void *) thr, (void *) obj, (void *) key, (void *) out_desc,
-	                     (long) flags, (long) arr_idx,
-	                     (duk_heaphdr *) obj, (duk_heaphdr *) key));
+	                     (void *) thr,
+	                     (void *) obj,
+	                     (void *) key,
+	                     (void *) out_desc,
+	                     (long) flags,
+	                     (long) arr_idx,
+	                     (duk_heaphdr *) obj,
+	                     (duk_heaphdr *) key));
 
 	curr = obj;
 	DUK_ASSERT(curr != NULL);
@@ -56229,11 +60240,8 @@ DUK_LOCAL duk_tval *duk__getprop_shallow_fastpath_array_tval(duk_hthread *thr, d
 
 	DUK_UNREF(thr);
 
-	if (!(DUK_HOBJECT_HAS_ARRAY_PART(obj) &&
-	     !DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(obj) &&
-	     !DUK_HOBJECT_HAS_EXOTIC_STRINGOBJ(obj) &&
-	     !DUK_HOBJECT_IS_BUFOBJ(obj) &&
-	     !DUK_HOBJECT_IS_PROXY(obj))) {
+	if (!(DUK_HOBJECT_HAS_ARRAY_PART(obj) && !DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(obj) && !DUK_HOBJECT_HAS_EXOTIC_STRINGOBJ(obj) &&
+	      !DUK_HOBJECT_IS_BUFOBJ(obj) && !DUK_HOBJECT_IS_PROXY(obj))) {
 		/* Must have array part and no conflicting exotic behaviors.
 		 * Doesn't need to have array special behavior, e.g. Arguments
 		 * object has array part.
@@ -56251,7 +60259,7 @@ DUK_LOCAL duk_tval *duk__getprop_shallow_fastpath_array_tval(duk_hthread *thr, d
 		idx = duk__tval_fastint_to_arr_idx(tv_key);
 	} else
 #endif
-	if (DUK_TVAL_IS_DOUBLE(tv_key)) {
+	    if (DUK_TVAL_IS_DOUBLE(tv_key)) {
 		idx = duk__tval_number_to_arr_idx(tv_key);
 	} else {
 		DUK_DDD(DUK_DDDPRINT("key is not a number"));
@@ -56285,28 +60293,29 @@ DUK_LOCAL duk_tval *duk__getprop_shallow_fastpath_array_tval(duk_hthread *thr, d
 	return NULL;
 }
 
-DUK_LOCAL duk_bool_t duk__putprop_shallow_fastpath_array_tval(duk_hthread *thr, duk_hobject *obj, duk_tval *tv_key, duk_tval *tv_val) {
+DUK_LOCAL duk_bool_t duk__putprop_shallow_fastpath_array_tval(duk_hthread *thr,
+                                                              duk_hobject *obj,
+                                                              duk_tval *tv_key,
+                                                              duk_tval *tv_val) {
 	duk_tval *tv;
 	duk_harray *a;
 	duk_uint32_t idx;
 	duk_uint32_t old_len, new_len;
 
-	if (!(DUK_HOBJECT_HAS_EXOTIC_ARRAY(obj) &&
-	      DUK_HOBJECT_HAS_ARRAY_PART(obj) &&
-	      DUK_HOBJECT_HAS_EXTENSIBLE(obj))) {
+	if (!(DUK_HOBJECT_HAS_EXOTIC_ARRAY(obj) && DUK_HOBJECT_HAS_ARRAY_PART(obj) && DUK_HOBJECT_HAS_EXTENSIBLE(obj))) {
 		return 0;
 	}
-	DUK_ASSERT(!DUK_HEAPHDR_HAS_READONLY((duk_heaphdr *) obj));  /* caller ensures */
+	DUK_ASSERT(!DUK_HEAPHDR_HAS_READONLY((duk_heaphdr *) obj)); /* caller ensures */
 
 	a = (duk_harray *) obj;
-	DUK_ASSERT_HARRAY_VALID(a);
+	DUK_HARRAY_ASSERT_VALID(a);
 
 #if defined(DUK_USE_FASTINT)
 	if (DUK_TVAL_IS_FASTINT(tv_key)) {
 		idx = duk__tval_fastint_to_arr_idx(tv_key);
 	} else
 #endif
-	if (DUK_TVAL_IS_DOUBLE(tv_key)) {
+	    if (DUK_TVAL_IS_DOUBLE(tv_key)) {
 		idx = duk__tval_number_to_arr_idx(tv_key);
 	} else {
 		DUK_DDD(DUK_DDDPRINT("key is not a number"));
@@ -56318,7 +60327,7 @@ DUK_LOCAL duk_bool_t duk__putprop_shallow_fastpath_array_tval(duk_hthread *thr,
 	 * because 0xffffffffUL will never be inside object 'a_size'.
 	 */
 
-	if (idx >= DUK_HOBJECT_GET_ASIZE(obj)) {  /* for resizing of array part, use slow path */
+	if (idx >= DUK_HOBJECT_GET_ASIZE(obj)) { /* for resizing of array part, use slow path */
 		return 0;
 	}
 	DUK_ASSERT(idx != 0xffffffffUL);
@@ -56329,7 +60338,8 @@ DUK_LOCAL duk_bool_t duk__putprop_shallow_fastpath_array_tval(duk_hthread *thr,
 	if (idx >= old_len) {
 		DUK_DDD(DUK_DDDPRINT("write new array entry requires length update "
 		                     "(arr_idx=%ld, old_len=%ld)",
-		                     (long) idx, (long) old_len));
+		                     (long) idx,
+		                     (long) old_len));
 		if (DUK_HARRAY_LENGTH_NONWRITABLE(a)) {
 			/* The correct behavior here is either a silent error
 			 * or a TypeError, depending on strictness.  Fall back
@@ -56343,12 +60353,12 @@ DUK_LOCAL duk_bool_t duk__putprop_shallow_fastpath_array_tval(duk_hthread *thr,
 	}
 
 	tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, idx);
-	DUK_TVAL_SET_TVAL_UPDREF(thr, tv, tv_val);  /* side effects */
+	DUK_TVAL_SET_TVAL_UPDREF(thr, tv, tv_val); /* side effects */
 
 	DUK_DDD(DUK_DDDPRINT("array fast path success for index %ld", (long) idx));
 	return 1;
 }
-#endif  /* DUK_USE_ARRAY_PROP_FASTPATH */
+#endif /* DUK_USE_ARRAY_PROP_FASTPATH */
 
 /*
  *  Fast path for bufobj getprop/putprop
@@ -56375,7 +60385,7 @@ DUK_LOCAL duk_bool_t duk__getprop_fastpath_bufobj_tval(duk_hthread *thr, duk_hob
 		idx = duk__tval_fastint_to_arr_idx(tv_key);
 	} else
 #endif
-	if (DUK_TVAL_IS_DOUBLE(tv_key)) {
+	    if (DUK_TVAL_IS_DOUBLE(tv_key)) {
 		idx = duk__tval_number_to_arr_idx(tv_key);
 	} else {
 		return 0;
@@ -56392,7 +60402,7 @@ DUK_LOCAL duk_bool_t duk__getprop_fastpath_bufobj_tval(duk_hthread *thr, duk_hob
 	}
 	DUK_ASSERT(idx != DUK__NO_ARRAY_INDEX);
 
-	byte_off = idx << h_bufobj->shift;  /* no wrap assuming h_bufobj->length is valid */
+	byte_off = idx << h_bufobj->shift; /* no wrap assuming h_bufobj->length is valid */
 	elem_size = (duk_small_uint_t) (1U << h_bufobj->shift);
 
 	if (h_bufobj->buf != NULL && DUK_HBUFOBJ_VALID_BYTEOFFSET_EXCL(h_bufobj, byte_off + elem_size)) {
@@ -56405,7 +60415,7 @@ DUK_LOCAL duk_bool_t duk__getprop_fastpath_bufobj_tval(duk_hthread *thr, duk_hob
 
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
 DUK_LOCAL duk_bool_t duk__putprop_fastpath_bufobj_tval(duk_hthread *thr, duk_hobject *obj, duk_tval *tv_key, duk_tval *tv_val) {
@@ -56415,11 +60425,10 @@ DUK_LOCAL duk_bool_t duk__putprop_fastpath_bufobj_tval(duk_hthread *thr, duk_hob
 	duk_small_uint_t elem_size;
 	duk_uint8_t *data;
 
-	if (!(DUK_HOBJECT_IS_BUFOBJ(obj) &&
-	      DUK_TVAL_IS_NUMBER(tv_val))) {
+	if (!(DUK_HOBJECT_IS_BUFOBJ(obj) && DUK_TVAL_IS_NUMBER(tv_val))) {
 		return 0;
 	}
-	DUK_ASSERT(!DUK_HEAPHDR_HAS_READONLY((duk_heaphdr *) obj));  /* caller ensures; rom objects are never bufobjs now */
+	DUK_ASSERT(!DUK_HEAPHDR_HAS_READONLY((duk_heaphdr *) obj)); /* caller ensures; rom objects are never bufobjs now */
 
 	h_bufobj = (duk_hbufobj *) obj;
 	if (!DUK_HBUFOBJ_HAS_VIRTUAL_INDICES(h_bufobj)) {
@@ -56431,7 +60440,7 @@ DUK_LOCAL duk_bool_t duk__putprop_fastpath_bufobj_tval(duk_hthread *thr, duk_hob
 		idx = duk__tval_fastint_to_arr_idx(tv_key);
 	} else
 #endif
-	if (DUK_TVAL_IS_DOUBLE(tv_key)) {
+	    if (DUK_TVAL_IS_DOUBLE(tv_key)) {
 		idx = duk__tval_number_to_arr_idx(tv_key);
 	} else {
 		return 0;
@@ -56448,7 +60457,7 @@ DUK_LOCAL duk_bool_t duk__putprop_fastpath_bufobj_tval(duk_hthread *thr, duk_hob
 	}
 	DUK_ASSERT(idx != DUK__NO_ARRAY_INDEX);
 
-	byte_off = idx << h_bufobj->shift;  /* no wrap assuming h_bufobj->length is valid */
+	byte_off = idx << h_bufobj->shift; /* no wrap assuming h_bufobj->length is valid */
 	elem_size = (duk_small_uint_t) (1U << h_bufobj->shift);
 
 	/* Value is required to be a number in the fast path so there
@@ -56467,7 +60476,7 @@ DUK_LOCAL duk_bool_t duk__putprop_fastpath_bufobj_tval(duk_hthread *thr, duk_hob
 	duk_pop_unsafe(thr);
 	return 1;
 }
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 /*
  *  GETPROP: ECMAScript property read.
@@ -56483,8 +60492,11 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 	duk_uint_t sanity;
 
 	DUK_DDD(DUK_DDDPRINT("getprop: thr=%p, obj=%p, key=%p (obj -> %!T, key -> %!T)",
-	                     (void *) thr, (void *) tv_obj, (void *) tv_key,
-	                     (duk_tval *) tv_obj, (duk_tval *) tv_key));
+	                     (void *) thr,
+	                     (void *) tv_obj,
+	                     (void *) tv_key,
+	                     (duk_tval *) tv_obj,
+	                     (duk_tval *) tv_key));
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(thr->heap != NULL);
@@ -56521,8 +60533,11 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 #if defined(DUK_USE_PARANOID_ERRORS)
 		DUK_ERROR_TYPE(thr, DUK_STR_INVALID_BASE);
 #else
-		DUK_ERROR_FMT2(thr, DUK_ERR_TYPE_ERROR, "cannot read property %s of %s",
-		               duk_push_string_tval_readable(thr, tv_key), duk_push_string_tval_readable(thr, tv_obj));
+		DUK_ERROR_FMT2(thr,
+		               DUK_ERR_TYPE_ERROR,
+		               "cannot read property %s of %s",
+		               duk_push_string_tval_readable(thr, tv_key),
+		               duk_push_string_tval_readable(thr, tv_obj));
 #endif
 		DUK_WO_NORETURN(return 0;);
 		break;
@@ -56552,7 +60567,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 			pop_count = 0;
 		} else
 #endif
-		if (DUK_TVAL_IS_NUMBER(tv_key)) {
+		    if (DUK_TVAL_IS_NUMBER(tv_key)) {
 			arr_idx = duk__tval_number_to_arr_idx(tv_key);
 			DUK_DDD(DUK_DDDPRINT("base object string, key is a fast-path number; arr_idx %ld", (long) arr_idx));
 			pop_count = 0;
@@ -56561,15 +60576,15 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 			DUK_ASSERT(key != NULL);
 			DUK_DDD(DUK_DDDPRINT("base object string, key is a non-fast-path number; after "
 			                     "coercion key is %!T, arr_idx %ld",
-			                     (duk_tval *) duk_get_tval(thr, -1), (long) arr_idx));
+			                     (duk_tval *) duk_get_tval(thr, -1),
+			                     (long) arr_idx));
 			pop_count = 1;
 		}
 
-		if (arr_idx != DUK__NO_ARRAY_INDEX &&
-		    arr_idx < DUK_HSTRING_GET_CHARLEN(h)) {
+		if (arr_idx != DUK__NO_ARRAY_INDEX && arr_idx < DUK_HSTRING_GET_CHARLEN(h)) {
 			duk_pop_n_unsafe(thr, pop_count);
 			duk_push_hstring(thr, h);
-			duk_substring(thr, -1, arr_idx, arr_idx + 1);  /* [str] -> [substr] */
+			duk_substring(thr, -1, arr_idx, arr_idx + 1); /* [str] -> [substr] */
 
 			DUK_STATS_INC(thr->heap, stats_getprop_stringidx);
 			DUK_DDD(DUK_DDDPRINT("-> %!T (base is string, key is an index inside string length "
@@ -56586,12 +60601,13 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 			DUK_ASSERT(key != NULL);
 			DUK_DDD(DUK_DDDPRINT("base object string, key is a non-fast-path number; after "
 			                     "coercion key is %!T, arr_idx %ld",
-			                     (duk_tval *) duk_get_tval(thr, -1), (long) arr_idx));
+			                     (duk_tval *) duk_get_tval(thr, -1),
+			                     (long) arr_idx));
 		}
 
 		if (key == DUK_HTHREAD_STRING_LENGTH(thr)) {
-			duk_pop_unsafe(thr);  /* [key] -> [] */
-			duk_push_uint(thr, (duk_uint_t) DUK_HSTRING_GET_CHARLEN(h));  /* [] -> [res] */
+			duk_pop_unsafe(thr); /* [key] -> [] */
+			duk_push_uint(thr, (duk_uint_t) DUK_HSTRING_GET_CHARLEN(h)); /* [] -> [res] */
 
 			DUK_STATS_INC(thr->heap, stats_getprop_stringlen);
 			DUK_DDD(DUK_DDDPRINT("-> %!T (base is string, key is 'length' after coercion -> "
@@ -56602,7 +60618,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 
 		DUK_DDD(DUK_DDDPRINT("base object is a string, start lookup from string prototype"));
 		curr = thr->builtins[DUK_BIDX_STRING_PROTOTYPE];
-		goto lookup;  /* avoid double coercion */
+		goto lookup; /* avoid double coercion */
 	}
 
 	case DUK_TAG_OBJECT: {
@@ -56647,9 +60663,9 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 				/* -> [ ... trap handler ] */
 				DUK_DDD(DUK_DDDPRINT("-> proxy object 'get' for key %!T", (duk_tval *) tv_key));
 				DUK_STATS_INC(thr->heap, stats_getprop_proxy);
-				duk_push_hobject(thr, h_target);  /* target */
-				duk_push_tval(thr, tv_key);       /* P */
-				duk_push_tval(thr, tv_obj);       /* Receiver: Proxy object */
+				duk_push_hobject(thr, h_target); /* target */
+				duk_push_tval(thr, tv_key); /* P */
+				duk_push_tval(thr, tv_obj); /* Receiver: Proxy object */
 				duk_call_method(thr, 3 /*nargs*/);
 
 				/* Target object must be checked for a conflicting
@@ -56659,25 +60675,27 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 				DUK_ASSERT(key != NULL);
 
 				if (duk__get_own_propdesc_raw(thr, h_target, key, arr_idx, &desc, DUK_GETDESC_FLAG_PUSH_VALUE)) {
-					duk_tval *tv_hook = duk_require_tval(thr, -3);  /* value from hook */
-					duk_tval *tv_targ = duk_require_tval(thr, -1);  /* value from target */
+					duk_tval *tv_hook = duk_require_tval(thr, -3); /* value from hook */
+					duk_tval *tv_targ = duk_require_tval(thr, -1); /* value from target */
 					duk_bool_t datadesc_reject;
 					duk_bool_t accdesc_reject;
 
 					DUK_DDD(DUK_DDDPRINT("proxy 'get': target has matching property %!O, check for "
 					                     "conflicting property; tv_hook=%!T, tv_targ=%!T, desc.flags=0x%08lx, "
 					                     "desc.get=%p, desc.set=%p",
-					                     (duk_heaphdr *) key, (duk_tval *) tv_hook, (duk_tval *) tv_targ,
+					                     (duk_heaphdr *) key,
+					                     (duk_tval *) tv_hook,
+					                     (duk_tval *) tv_targ,
 					                     (unsigned long) desc.flags,
-					                     (void *) desc.get, (void *) desc.set));
+					                     (void *) desc.get,
+					                     (void *) desc.set));
 
 					datadesc_reject = !(desc.flags & DUK_PROPDESC_FLAG_ACCESSOR) &&
 					                  !(desc.flags & DUK_PROPDESC_FLAG_CONFIGURABLE) &&
 					                  !(desc.flags & DUK_PROPDESC_FLAG_WRITABLE) &&
 					                  !duk_js_samevalue(tv_hook, tv_targ);
 					accdesc_reject = (desc.flags & DUK_PROPDESC_FLAG_ACCESSOR) &&
-					                 !(desc.flags & DUK_PROPDESC_FLAG_CONFIGURABLE) &&
-					                 (desc.get == NULL) &&
+					                 !(desc.flags & DUK_PROPDESC_FLAG_CONFIGURABLE) && (desc.get == NULL) &&
 					                 !DUK_TVAL_IS_UNDEFINED(tv_hook);
 					if (datadesc_reject || accdesc_reject) {
 						DUK_ERROR_TYPE(thr, DUK_STR_PROXY_REJECTED);
@@ -56688,13 +60706,13 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 				} else {
 					duk_pop_unsafe(thr);
 				}
-				return 1;  /* return value */
+				return 1; /* return value */
 			}
 
-			curr = h_target;  /* resume lookup from target */
+			curr = h_target; /* resume lookup from target */
 			DUK_TVAL_SET_OBJECT(tv_obj, curr);
 		}
-#endif  /* DUK_USE_ES6_PROXY */
+#endif /* DUK_USE_ES6_PROXY */
 
 		if (DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(curr)) {
 			arr_idx = duk__push_tval_to_property_key(thr, tv_key, &key);
@@ -56709,11 +60727,11 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 
 				/* no need for 'caller' post-check, because 'key' must be an array index */
 
-				duk_remove_m2(thr);  /* [key result] -> [result] */
+				duk_remove_m2(thr); /* [key result] -> [result] */
 				return 1;
 			}
 
-			goto lookup;  /* avoid double coercion */
+			goto lookup; /* avoid double coercion */
 		}
 		break;
 	}
@@ -56735,10 +60753,9 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 			arr_idx = duk__tval_fastint_to_arr_idx(tv_key);
 			DUK_DDD(DUK_DDDPRINT("base object buffer, key is a fast-path fastint; arr_idx %ld", (long) arr_idx));
 			pop_count = 0;
-		}
-		else
+		} else
 #endif
-		if (DUK_TVAL_IS_NUMBER(tv_key)) {
+		    if (DUK_TVAL_IS_NUMBER(tv_key)) {
 			arr_idx = duk__tval_number_to_arr_idx(tv_key);
 			DUK_DDD(DUK_DDDPRINT("base object buffer, key is a fast-path number; arr_idx %ld", (long) arr_idx));
 			pop_count = 0;
@@ -56747,12 +60764,12 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 			DUK_ASSERT(key != NULL);
 			DUK_DDD(DUK_DDDPRINT("base object buffer, key is a non-fast-path number; after "
 			                     "coercion key is %!T, arr_idx %ld",
-			                     (duk_tval *) duk_get_tval(thr, -1), (long) arr_idx));
+			                     (duk_tval *) duk_get_tval(thr, -1),
+			                     (long) arr_idx));
 			pop_count = 1;
 		}
 
-		if (arr_idx != DUK__NO_ARRAY_INDEX &&
-		    arr_idx < DUK_HBUFFER_GET_SIZE(h)) {
+		if (arr_idx != DUK__NO_ARRAY_INDEX && arr_idx < DUK_HBUFFER_GET_SIZE(h)) {
 			duk_pop_n_unsafe(thr, pop_count);
 			duk_push_uint(thr, ((duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h))[arr_idx]);
 			DUK_STATS_INC(thr->heap, stats_getprop_bufferidx);
@@ -56770,12 +60787,13 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 			DUK_ASSERT(key != NULL);
 			DUK_DDD(DUK_DDDPRINT("base object buffer, key is a non-fast-path number; after "
 			                     "coercion key is %!T, arr_idx %ld",
-			                     (duk_tval *) duk_get_tval(thr, -1), (long) arr_idx));
+			                     (duk_tval *) duk_get_tval(thr, -1),
+			                     (long) arr_idx));
 		}
 
 		if (key == DUK_HTHREAD_STRING_LENGTH(thr)) {
-			duk_pop_unsafe(thr);  /* [key] -> [] */
-			duk_push_uint(thr, (duk_uint_t) DUK_HBUFFER_GET_SIZE(h));  /* [] -> [res] */
+			duk_pop_unsafe(thr); /* [key] -> [] */
+			duk_push_uint(thr, (duk_uint_t) DUK_HBUFFER_GET_SIZE(h)); /* [] -> [res] */
 			DUK_STATS_INC(thr->heap, stats_getprop_bufferlen);
 
 			DUK_DDD(DUK_DDDPRINT("-> %!T (base is buffer, key is 'length' "
@@ -56786,7 +60804,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 
 		DUK_DDD(DUK_DDDPRINT("base object is a buffer, start lookup from Uint8Array prototype"));
 		curr = thr->builtins[DUK_BIDX_UINT8ARRAY_PROTOTYPE];
-		goto lookup;  /* avoid double coercion */
+		goto lookup; /* avoid double coercion */
 	}
 
 	case DUK_TAG_POINTER: {
@@ -56823,7 +60841,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 	 *  Property lookup
 	 */
 
- lookup:
+lookup:
 	/* [key] (coerced) */
 	DUK_ASSERT(curr != NULL);
 	DUK_ASSERT(key != NULL);
@@ -56838,25 +60856,23 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 			/* accessor with defined getter */
 			DUK_ASSERT((desc.flags & DUK_PROPDESC_FLAG_ACCESSOR) != 0);
 
-			duk_pop_unsafe(thr);              /* [key undefined] -> [key] */
+			duk_pop_unsafe(thr); /* [key undefined] -> [key] */
 			duk_push_hobject(thr, desc.get);
-			duk_push_tval(thr, tv_obj);       /* note: original, uncoerced base */
+			duk_push_tval(thr, tv_obj); /* note: original, uncoerced base */
 #if defined(DUK_USE_NONSTD_GETTER_KEY_ARGUMENT)
 			duk_dup_m3(thr);
-			duk_call_method(thr, 1);          /* [key getter this key] -> [key retval] */
+			duk_call_method(thr, 1); /* [key getter this key] -> [key retval] */
 #else
-			duk_call_method(thr, 0);          /* [key getter this] -> [key retval] */
+			duk_call_method(thr, 0); /* [key getter this] -> [key retval] */
 #endif
 		} else {
 			/* [key value] or [key undefined] */
 
 			/* data property or accessor without getter */
-			DUK_ASSERT(((desc.flags & DUK_PROPDESC_FLAG_ACCESSOR) == 0) ||
-			           (desc.get == NULL));
+			DUK_ASSERT(((desc.flags & DUK_PROPDESC_FLAG_ACCESSOR) == 0) || (desc.get == NULL));
 
 			/* if accessor without getter, return value is undefined */
-			DUK_ASSERT(((desc.flags & DUK_PROPDESC_FLAG_ACCESSOR) == 0) ||
-			           duk_is_undefined(thr, -1));
+			DUK_ASSERT(((desc.flags & DUK_PROPDESC_FLAG_ACCESSOR) == 0) || duk_is_undefined(thr, -1));
 
 			/* Note: for an accessor without getter, falling through to
 			 * check for "caller" exotic behavior is unnecessary as
@@ -56865,9 +60881,9 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 			 */
 		}
 
-		goto found;  /* [key result] */
+		goto found; /* [key result] */
 
-	 next_in_chain:
+	next_in_chain:
 		/* XXX: option to pretend property doesn't exist if sanity limit is
 		 * hit might be useful.
 		 */
@@ -56882,7 +60898,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 	 *  Not found
 	 */
 
-	duk_to_undefined(thr, -1);  /* [key] -> [undefined] (default value) */
+	duk_to_undefined(thr, -1); /* [key] -> [undefined] (default value) */
 
 	DUK_DDD(DUK_DDDPRINT("-> %!T (not found)", (duk_tval *) duk_get_tval(thr, -1)));
 	return 0;
@@ -56891,7 +60907,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 	 *  Found; post-processing (Function and arguments objects)
 	 */
 
- found:
+found:
 	/* [key result] */
 
 #if !defined(DUK_USE_NONSTD_FUNC_CALLER_PROPERTY)
@@ -56921,13 +60937,11 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 	 * This exotic behavior is disabled when the non-standard 'caller' property
 	 * is enabled, as it conflicts with the free use of 'caller'.
 	 */
-	if (key == DUK_HTHREAD_STRING_CALLER(thr) &&
-	    DUK_TVAL_IS_OBJECT(tv_obj)) {
+	if (key == DUK_HTHREAD_STRING_CALLER(thr) && DUK_TVAL_IS_OBJECT(tv_obj)) {
 		duk_hobject *orig = DUK_TVAL_GET_OBJECT(tv_obj);
 		DUK_ASSERT(orig != NULL);
 
-		if (DUK_HOBJECT_IS_NONBOUND_FUNCTION(orig) ||
-		    DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(orig)) {
+		if (DUK_HOBJECT_IS_NONBOUND_FUNCTION(orig) || DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(orig)) {
 			duk_hobject *h;
 
 			/* XXX: The TypeError is currently not applied to bound
@@ -56938,19 +60952,17 @@ DUK_INTERNAL duk_bool_t duk_hobject_getprop(duk_hthread *thr, duk_tval *tv_obj,
 			 */
 			DUK_ASSERT(!DUK_HOBJECT_HAS_BOUNDFUNC(orig));
 
-			h = duk_get_hobject(thr, -1);  /* NULL if not an object */
-			if (h &&
-			    DUK_HOBJECT_IS_FUNCTION(h) &&
-			    DUK_HOBJECT_HAS_STRICT(h)) {
+			h = duk_get_hobject(thr, -1); /* NULL if not an object */
+			if (h && DUK_HOBJECT_IS_FUNCTION(h) && DUK_HOBJECT_HAS_STRICT(h)) {
 				/* XXX: sufficient to check 'strict', assert for 'is function' */
 				DUK_ERROR_TYPE(thr, DUK_STR_STRICT_CALLER_READ);
 				DUK_WO_NORETURN(return 0;);
 			}
 		}
 	}
-#endif   /* !DUK_USE_NONSTD_FUNC_CALLER_PROPERTY */
+#endif /* !DUK_USE_NONSTD_FUNC_CALLER_PROPERTY */
 
-	duk_remove_m2(thr);  /* [key result] -> [result] */
+	duk_remove_m2(thr); /* [key result] -> [result] */
 
 	DUK_DDD(DUK_DDDPRINT("-> %!T (found)", (duk_tval *) duk_get_tval(thr, -1)));
 	return 1;
@@ -56972,8 +60984,11 @@ DUK_INTERNAL duk_bool_t duk_hobject_hasprop(duk_hthread *thr, duk_tval *tv_obj,
 	duk_propdesc desc;
 
 	DUK_DDD(DUK_DDDPRINT("hasprop: thr=%p, obj=%p, key=%p (obj -> %!T, key -> %!T)",
-	                     (void *) thr, (void *) tv_obj, (void *) tv_key,
-	                     (duk_tval *) tv_obj, (duk_tval *) tv_key));
+	                     (void *) thr,
+	                     (void *) tv_obj,
+	                     (void *) tv_key,
+	                     (duk_tval *) tv_obj,
+	                     (duk_tval *) tv_key));
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(thr->heap != NULL);
@@ -57045,8 +61060,8 @@ DUK_INTERNAL duk_bool_t duk_hobject_hasprop(duk_hthread *thr, duk_tval *tv_obj,
 		if (duk__proxy_check_prop(thr, obj, DUK_STRIDX_HAS, tv_key, &h_target)) {
 			/* [ ... key trap handler ] */
 			DUK_DDD(DUK_DDDPRINT("-> proxy object 'has' for key %!T", (duk_tval *) tv_key));
-			duk_push_hobject(thr, h_target);  /* target */
-			duk_push_tval(thr, tv_key);       /* P */
+			duk_push_hobject(thr, h_target); /* target */
+			duk_push_tval(thr, tv_key); /* P */
 			duk_call_method(thr, 2 /*nargs*/);
 			tmp_bool = duk_to_boolean_top_pop(thr);
 			if (!tmp_bool) {
@@ -57054,39 +61069,42 @@ DUK_INTERNAL duk_bool_t duk_hobject_hasprop(duk_hthread *thr, duk_tval *tv_obj,
 				 * non-configurable property.
 				 */
 
-				if (duk__get_own_propdesc_raw(thr, h_target, key, arr_idx, &desc, 0 /*flags*/)) {  /* don't push value */
+				if (duk__get_own_propdesc_raw(thr, h_target, key, arr_idx, &desc, 0 /*flags*/)) { /* don't push
+					                                                                             value */
 					DUK_DDD(DUK_DDDPRINT("proxy 'has': target has matching property %!O, check for "
 					                     "conflicting property; desc.flags=0x%08lx, "
 					                     "desc.get=%p, desc.set=%p",
-					                     (duk_heaphdr *) key, (unsigned long) desc.flags,
-					                     (void *) desc.get, (void *) desc.set));
+					                     (duk_heaphdr *) key,
+					                     (unsigned long) desc.flags,
+					                     (void *) desc.get,
+					                     (void *) desc.set));
 					/* XXX: Extensibility check for target uses IsExtensible().  If we
 					 * implemented the isExtensible trap and didn't reject proxies as
 					 * proxy targets, it should be respected here.
 					 */
-					if (!((desc.flags & DUK_PROPDESC_FLAG_CONFIGURABLE) &&  /* property is configurable and */
-					      DUK_HOBJECT_HAS_EXTENSIBLE(h_target))) {          /* ... target is extensible */
+					if (!((desc.flags & DUK_PROPDESC_FLAG_CONFIGURABLE) && /* property is configurable and */
+					      DUK_HOBJECT_HAS_EXTENSIBLE(h_target))) { /* ... target is extensible */
 						DUK_ERROR_TYPE(thr, DUK_STR_PROXY_REJECTED);
 						DUK_WO_NORETURN(return 0;);
 					}
 				}
 			}
 
-			duk_pop_unsafe(thr);  /* [ key ] -> [] */
+			duk_pop_unsafe(thr); /* [ key ] -> [] */
 			return tmp_bool;
 		}
 
-		obj = h_target;  /* resume check from proxy target */
+		obj = h_target; /* resume check from proxy target */
 	}
-#endif  /* DUK_USE_ES6_PROXY */
+#endif /* DUK_USE_ES6_PROXY */
 
 	/* XXX: inline into a prototype walking loop? */
 
-	rc = duk__get_propdesc(thr, obj, key, &desc, 0 /*flags*/);  /* don't push value */
+	rc = duk__get_propdesc(thr, obj, key, &desc, 0 /*flags*/); /* don't push value */
 	/* fall through */
 
- pop_and_return:
-	duk_pop_unsafe(thr);  /* [ key ] -> [] */
+pop_and_return:
+	duk_pop_unsafe(thr); /* [ key ] -> [] */
 	return rc;
 }
 
@@ -57112,7 +61130,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_hasprop_raw(duk_hthread *thr, duk_hobject *o
 
 	DUK_ASSERT_VALSTACK_SPACE(thr, DUK__VALSTACK_SPACE);
 
-	return duk__get_propdesc(thr, obj, key, &dummy, DUK_GETDESC_FLAG_IGNORE_PROTOLOOP);  /* don't push value */
+	return duk__get_propdesc(thr, obj, key, &dummy, DUK_GETDESC_FLAG_IGNORE_PROTOLOOP); /* don't push value */
 }
 
 /*
@@ -57144,16 +61162,16 @@ DUK_LOCAL duk_uint32_t duk__to_new_array_length_checked(duk_hthread *thr, duk_tv
 		}
 		return (duk_uint32_t) fi;
 	}
-#else  /* DUK_USE_FASTINT */
+#else /* DUK_USE_FASTINT */
 	/* When fastints are not enabled, the most interesting case is any
 	 * number.
 	 */
 	if (DUK_TVAL_IS_DOUBLE(tv)) {
 		d = DUK_TVAL_GET_NUMBER(tv);
 	}
-#endif  /* DUK_USE_FASTINT */
+#endif /* DUK_USE_FASTINT */
 	else
-#endif  /* !DUK_USE_PREFER_SIZE */
+#endif /* !DUK_USE_PREFER_SIZE */
 	{
 		/* In all other cases, and when doing a size optimized build,
 		 * fall back to the comprehensive handler.
@@ -57165,13 +61183,13 @@ DUK_LOCAL duk_uint32_t duk__to_new_array_length_checked(duk_hthread *thr, duk_tv
 	 * 32-bit range.  Negative zero is accepted as zero.
 	 */
 	res = duk_double_to_uint32_t(d);
-	if ((duk_double_t) res != d) {
+	if (!duk_double_equals((duk_double_t) res, d)) {
 		goto fail_range;
 	}
 
 	return res;
 
- fail_range:
+fail_range:
 	DUK_ERROR_RANGE(thr, DUK_STR_INVALID_ARRAY_LENGTH);
 	DUK_WO_NORETURN(return 0;);
 }
@@ -57199,7 +61217,8 @@ duk_bool_t duk__handle_put_array_length_smaller(duk_hthread *thr,
 
 	DUK_DDD(DUK_DDDPRINT("new array length smaller than old (%ld -> %ld), "
 	                     "probably need to remove elements",
-	                     (long) old_len, (long) new_len));
+	                     (long) old_len,
+	                     (long) new_len));
 
 	/*
 	 *  New length is smaller than old length, need to delete properties above
@@ -57245,7 +61264,7 @@ duk_bool_t duk__handle_put_array_length_smaller(duk_hthread *thr,
 		while (i > new_len) {
 			i--;
 			tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, i);
-			DUK_TVAL_SET_UNUSED_UPDREF(thr, tv);  /* side effects */
+			DUK_TVAL_SET_UNUSED_UPDREF(thr, tv); /* side effects */
 		}
 
 		*out_result_len = new_len;
@@ -57280,19 +61299,22 @@ duk_bool_t duk__handle_put_array_length_smaller(duk_hthread *thr,
 				continue;
 			}
 
-			DUK_ASSERT(DUK_HSTRING_HAS_ARRIDX(key));  /* XXX: macro checks for array index flag, which is unnecessary here */
+			DUK_ASSERT(
+			    DUK_HSTRING_HAS_ARRIDX(key)); /* XXX: macro checks for array index flag, which is unnecessary here */
 			arr_idx = DUK_HSTRING_GET_ARRIDX_SLOW(key);
 			DUK_ASSERT(arr_idx != DUK__NO_ARRAY_INDEX);
-			DUK_ASSERT(arr_idx < old_len);  /* consistency requires this */
+			DUK_ASSERT(arr_idx < old_len); /* consistency requires this */
 
 			if (arr_idx < new_len) {
 				DUK_DDD(DUK_DDDPRINT("skip entry index %ld: key is array index %ld, below new_len",
-				                     (long) i, (long) arr_idx));
+				                     (long) i,
+				                     (long) arr_idx));
 				continue;
 			}
 			if (DUK_HOBJECT_E_SLOT_IS_CONFIGURABLE(thr->heap, obj, i)) {
 				DUK_DDD(DUK_DDDPRINT("skip entry index %ld: key is a relevant array index %ld, but configurable",
-				                     (long) i, (long) arr_idx));
+				                     (long) i,
+				                     (long) arr_idx));
 				continue;
 			}
 
@@ -57300,17 +61322,19 @@ duk_bool_t duk__handle_put_array_length_smaller(duk_hthread *thr,
 			if (arr_idx >= target_len) {
 				DUK_DDD(DUK_DDDPRINT("entry at index %ld has arr_idx %ld, is not configurable, "
 				                     "update target_len %ld -> %ld",
-				                     (long) i, (long) arr_idx, (long) target_len,
+				                     (long) i,
+				                     (long) arr_idx,
+				                     (long) target_len,
 				                     (long) (arr_idx + 1)));
 				target_len = arr_idx + 1;
 			}
 		}
-	 skip_stage1:
+	skip_stage1:
 
 		/* stage 2: delete configurable entries above target length */
 
-		DUK_DDD(DUK_DDDPRINT("old_len=%ld, new_len=%ld, target_len=%ld",
-		                     (long) old_len, (long) new_len, (long) target_len));
+		DUK_DDD(
+		    DUK_DDDPRINT("old_len=%ld, new_len=%ld, target_len=%ld", (long) old_len, (long) new_len, (long) target_len));
 
 		DUK_DDD(DUK_DDDPRINT("array length write, no array part, stage 2: remove "
 		                     "entries >= target_len"));
@@ -57326,20 +61350,21 @@ duk_bool_t duk__handle_put_array_length_smaller(duk_hthread *thr,
 				continue;
 			}
 
-			DUK_ASSERT(DUK_HSTRING_HAS_ARRIDX(key));  /* XXX: macro checks for array index flag, which is unnecessary here */
+			DUK_ASSERT(
+			    DUK_HSTRING_HAS_ARRIDX(key)); /* XXX: macro checks for array index flag, which is unnecessary here */
 			arr_idx = DUK_HSTRING_GET_ARRIDX_SLOW(key);
 			DUK_ASSERT(arr_idx != DUK__NO_ARRAY_INDEX);
-			DUK_ASSERT(arr_idx < old_len);  /* consistency requires this */
+			DUK_ASSERT(arr_idx < old_len); /* consistency requires this */
 
 			if (arr_idx < target_len) {
 				DUK_DDD(DUK_DDDPRINT("skip entry index %ld: key is array index %ld, below target_len",
-				                     (long) i, (long) arr_idx));
+				                     (long) i,
+				                     (long) arr_idx));
 				continue;
 			}
-			DUK_ASSERT(force_flag || DUK_HOBJECT_E_SLOT_IS_CONFIGURABLE(thr->heap, obj, i));  /* stage 1 guarantees */
+			DUK_ASSERT(force_flag || DUK_HOBJECT_E_SLOT_IS_CONFIGURABLE(thr->heap, obj, i)); /* stage 1 guarantees */
 
-			DUK_DDD(DUK_DDDPRINT("delete entry index %ld: key is array index %ld",
-			                     (long) i, (long) arr_idx));
+			DUK_DDD(DUK_DDDPRINT("delete entry index %ld: key is array index %ld", (long) i, (long) arr_idx));
 
 			/*
 			 *  Slow delete, but we don't care as we're already in a very slow path.
@@ -57389,7 +61414,7 @@ DUK_LOCAL duk_bool_t duk__handle_put_array_length(duk_hthread *thr, duk_hobject
 	DUK_ASSERT(DUK_HOBJECT_HAS_EXOTIC_ARRAY(obj));
 	DUK_ASSERT(DUK_HOBJECT_IS_ARRAY(obj));
 	a = (duk_harray *) obj;
-	DUK_ASSERT_HARRAY_VALID(a);
+	DUK_HARRAY_ASSERT_VALID(a);
 
 	DUK_ASSERT(duk_is_valid_index(thr, -1));
 
@@ -57470,11 +61495,12 @@ DUK_LOCAL duk_bool_t duk__handle_put_array_length(duk_hthread *thr, duk_hobject
  *      (We currently make a copy of all of the input values to avoid issues.)
  */
 
-DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj, duk_tval *tv_key, duk_tval *tv_val, duk_bool_t throw_flag) {
+DUK_INTERNAL duk_bool_t
+duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj, duk_tval *tv_key, duk_tval *tv_val, duk_bool_t throw_flag) {
 	duk_tval tv_obj_copy;
 	duk_tval tv_key_copy;
 	duk_tval tv_val_copy;
-	duk_hobject *orig = NULL;  /* NULL if tv_obj is primitive */
+	duk_hobject *orig = NULL; /* NULL if tv_obj is primitive */
 	duk_hobject *curr;
 	duk_hstring *key = NULL;
 	duk_propdesc desc;
@@ -57483,12 +61509,18 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 	duk_bool_t rc;
 	duk_int_t e_idx;
 	duk_uint_t sanity;
-	duk_uint32_t new_array_length = 0;  /* 0 = no update */
+	duk_uint32_t new_array_length = 0; /* 0 = no update */
 
 	DUK_DDD(DUK_DDDPRINT("putprop: thr=%p, obj=%p, key=%p, val=%p, throw=%ld "
 	                     "(obj -> %!T, key -> %!T, val -> %!T)",
-	                     (void *) thr, (void *) tv_obj, (void *) tv_key, (void *) tv_val,
-	                     (long) throw_flag, (duk_tval *) tv_obj, (duk_tval *) tv_key, (duk_tval *) tv_val));
+	                     (void *) thr,
+	                     (void *) tv_obj,
+	                     (void *) tv_key,
+	                     (void *) tv_val,
+	                     (long) throw_flag,
+	                     (duk_tval *) tv_obj,
+	                     (duk_tval *) tv_key,
+	                     (duk_tval *) tv_val));
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(thr->heap != NULL);
@@ -57523,13 +61555,15 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 	case DUK_TAG_UNDEFINED:
 	case DUK_TAG_NULL: {
 		/* Note: unconditional throw */
-		DUK_DDD(DUK_DDDPRINT("base object is undefined or null -> reject (object=%!iT)",
-		                     (duk_tval *) tv_obj));
+		DUK_DDD(DUK_DDDPRINT("base object is undefined or null -> reject (object=%!iT)", (duk_tval *) tv_obj));
 #if defined(DUK_USE_PARANOID_ERRORS)
 		DUK_ERROR_TYPE(thr, DUK_STR_INVALID_BASE);
 #else
-		DUK_ERROR_FMT2(thr, DUK_ERR_TYPE_ERROR, "cannot write property %s of %s",
-		               duk_push_string_tval_readable(thr, tv_key), duk_push_string_tval_readable(thr, tv_obj));
+		DUK_ERROR_FMT2(thr,
+		               DUK_ERR_TYPE_ERROR,
+		               "cannot write property %s of %s",
+		               duk_push_string_tval_readable(thr, tv_key),
+		               duk_push_string_tval_readable(thr, tv_obj));
 #endif
 		DUK_WO_NORETURN(return 0;);
 		break;
@@ -57563,14 +61597,13 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 			goto fail_not_writable;
 		}
 
-		if (arr_idx != DUK__NO_ARRAY_INDEX &&
-		    arr_idx < DUK_HSTRING_GET_CHARLEN(h)) {
+		if (arr_idx != DUK__NO_ARRAY_INDEX && arr_idx < DUK_HSTRING_GET_CHARLEN(h)) {
 			goto fail_not_writable;
 		}
 
 		DUK_DDD(DUK_DDDPRINT("base object is a string, start lookup from string prototype"));
 		curr = thr->builtins[DUK_BIDX_STRING_PROTOTYPE];
-		goto lookup;  /* avoid double coercion */
+		goto lookup; /* avoid double coercion */
 	}
 
 	case DUK_TAG_OBJECT: {
@@ -57585,7 +61618,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 		 */
 		if (DUK_HEAPHDR_HAS_READONLY((duk_heaphdr *) orig)) {
 			DUK_DD(DUK_DDPRINT("attempt to putprop on read-only target object"));
-			goto fail_not_writable_no_pop;  /* Must avoid duk_pop() in exit path */
+			goto fail_not_writable_no_pop; /* Must avoid duk_pop() in exit path */
 		}
 #endif
 
@@ -57631,10 +61664,10 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 				/* -> [ ... trap handler ] */
 				DUK_DDD(DUK_DDDPRINT("-> proxy object 'set' for key %!T", (duk_tval *) tv_key));
 				DUK_STATS_INC(thr->heap, stats_putprop_proxy);
-				duk_push_hobject(thr, h_target);  /* target */
-				duk_push_tval(thr, tv_key);       /* P */
-				duk_push_tval(thr, tv_val);       /* V */
-				duk_push_tval(thr, tv_obj);       /* Receiver: Proxy object */
+				duk_push_hobject(thr, h_target); /* target */
+				duk_push_tval(thr, tv_key); /* P */
+				duk_push_tval(thr, tv_val); /* V */
+				duk_push_tval(thr, tv_obj); /* Receiver: Proxy object */
 				duk_call_method(thr, 4 /*nargs*/);
 				tmp_bool = duk_to_boolean_top_pop(thr);
 				if (!tmp_bool) {
@@ -57655,17 +61688,19 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 					DUK_DDD(DUK_DDDPRINT("proxy 'set': target has matching property %!O, check for "
 					                     "conflicting property; tv_val=%!T, tv_targ=%!T, desc.flags=0x%08lx, "
 					                     "desc.get=%p, desc.set=%p",
-					                     (duk_heaphdr *) key, (duk_tval *) tv_val, (duk_tval *) tv_targ,
+					                     (duk_heaphdr *) key,
+					                     (duk_tval *) tv_val,
+					                     (duk_tval *) tv_targ,
 					                     (unsigned long) desc.flags,
-					                     (void *) desc.get, (void *) desc.set));
+					                     (void *) desc.get,
+					                     (void *) desc.set));
 
 					datadesc_reject = !(desc.flags & DUK_PROPDESC_FLAG_ACCESSOR) &&
 					                  !(desc.flags & DUK_PROPDESC_FLAG_CONFIGURABLE) &&
 					                  !(desc.flags & DUK_PROPDESC_FLAG_WRITABLE) &&
 					                  !duk_js_samevalue(tv_val, tv_targ);
 					accdesc_reject = (desc.flags & DUK_PROPDESC_FLAG_ACCESSOR) &&
-					                 !(desc.flags & DUK_PROPDESC_FLAG_CONFIGURABLE) &&
-					                 (desc.set == NULL);
+					                 !(desc.flags & DUK_PROPDESC_FLAG_CONFIGURABLE) && (desc.set == NULL);
 					if (datadesc_reject || accdesc_reject) {
 						DUK_ERROR_TYPE(thr, DUK_STR_PROXY_REJECTED);
 						DUK_WO_NORETURN(return 0;);
@@ -57675,13 +61710,13 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 				} else {
 					duk_pop_unsafe(thr);
 				}
-				return 1;  /* success */
+				return 1; /* success */
 			}
 
-			orig = h_target;  /* resume write to target */
+			orig = h_target; /* resume write to target */
 			DUK_TVAL_SET_OBJECT(tv_obj, orig);
 		}
-#endif  /* DUK_USE_ES6_PROXY */
+#endif /* DUK_USE_ES6_PROXY */
 
 		curr = orig;
 		break;
@@ -57703,7 +61738,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 			pop_count = 0;
 		} else
 #endif
-		if (DUK_TVAL_IS_NUMBER(tv_key)) {
+		    if (DUK_TVAL_IS_NUMBER(tv_key)) {
 			arr_idx = duk__tval_number_to_arr_idx(tv_key);
 			DUK_DDD(DUK_DDDPRINT("base object buffer, key is a fast-path number; arr_idx %ld", (long) arr_idx));
 			pop_count = 0;
@@ -57712,12 +61747,12 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 			DUK_ASSERT(key != NULL);
 			DUK_DDD(DUK_DDDPRINT("base object buffer, key is a non-fast-path number; after "
 			                     "coercion key is %!T, arr_idx %ld",
-			                     (duk_tval *) duk_get_tval(thr, -1), (long) arr_idx));
+			                     (duk_tval *) duk_get_tval(thr, -1),
+			                     (long) arr_idx));
 			pop_count = 1;
 		}
 
-		if (arr_idx != DUK__NO_ARRAY_INDEX &&
-		    arr_idx < DUK_HBUFFER_GET_SIZE(h)) {
+		if (arr_idx != DUK__NO_ARRAY_INDEX && arr_idx < DUK_HBUFFER_GET_SIZE(h)) {
 			duk_uint8_t *data;
 			DUK_DDD(DUK_DDDPRINT("writing to buffer data at index %ld", (long) arr_idx));
 			data = (duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h);
@@ -57729,8 +61764,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 			/* Buffer writes are often integers. */
 			if (DUK_TVAL_IS_FASTINT(tv_val)) {
 				data[arr_idx] = (duk_uint8_t) DUK_TVAL_GET_FASTINT_U32(tv_val);
-			}
-			else
+			} else
 #endif
 			{
 				duk_push_tval(thr, tv_val);
@@ -57752,7 +61786,8 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 			DUK_ASSERT(key != NULL);
 			DUK_DDD(DUK_DDDPRINT("base object buffer, key is a non-fast-path number; after "
 			                     "coercion key is %!T, arr_idx %ld",
-			                     (duk_tval *) duk_get_tval(thr, -1), (long) arr_idx));
+			                     (duk_tval *) duk_get_tval(thr, -1),
+			                     (long) arr_idx));
 		}
 
 		if (key == DUK_HTHREAD_STRING_LENGTH(thr)) {
@@ -57761,7 +61796,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 
 		DUK_DDD(DUK_DDDPRINT("base object is a buffer, start lookup from Uint8Array prototype"));
 		curr = thr->builtins[DUK_BIDX_UINT8ARRAY_PROTOTYPE];
-		goto lookup;  /* avoid double coercion */
+		goto lookup; /* avoid double coercion */
 	}
 
 	case DUK_TAG_POINTER: {
@@ -57796,7 +61831,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 	arr_idx = duk__push_tval_to_property_key(thr, tv_key, &key);
 	DUK_ASSERT(key != NULL);
 
- lookup:
+lookup:
 
 	/*
 	 *  Check whether the property already exists in the prototype chain.
@@ -57809,7 +61844,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 	DUK_ASSERT(curr != NULL);
 	sanity = DUK_HOBJECT_PROTOTYPE_CHAIN_SANITY;
 	do {
-		if (!duk__get_own_propdesc_raw(thr, curr, key, arr_idx, &desc, 0 /*flags*/)) {  /* don't push value */
+		if (!duk__get_own_propdesc_raw(thr, curr, key, arr_idx, &desc, 0 /*flags*/)) { /* don't push value */
 			goto next_in_chain;
 		}
 
@@ -57832,15 +61867,15 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 				goto fail_no_setter;
 			}
 			duk_push_hobject(thr, setter);
-			duk_push_tval(thr, tv_obj);  /* note: original, uncoerced base */
-			duk_push_tval(thr, tv_val);  /* [key setter this val] */
+			duk_push_tval(thr, tv_obj); /* note: original, uncoerced base */
+			duk_push_tval(thr, tv_val); /* [key setter this val] */
 #if defined(DUK_USE_NONSTD_SETTER_KEY_ARGUMENT)
 			duk_dup_m4(thr);
-			duk_call_method(thr, 2);     /* [key setter this val key] -> [key retval] */
+			duk_call_method(thr, 2); /* [key setter this val key] -> [key retval] */
 #else
-			duk_call_method(thr, 1);     /* [key setter this val] -> [key retval] */
+			duk_call_method(thr, 1); /* [key setter this val] -> [key retval] */
 #endif
-			duk_pop_unsafe(thr);         /* ignore retval -> [key] */
+			duk_pop_unsafe(thr); /* ignore retval -> [key] */
 			goto success_no_arguments_exotic;
 		}
 
@@ -57860,11 +61895,13 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 			 *  new property to 'orig'.
 			 */
 			if (!DUK_HOBJECT_HAS_EXTENSIBLE(orig)) {
-				DUK_DD(DUK_DDPRINT("found existing inherited plain property, but original object is not extensible"));
+				DUK_DD(
+				    DUK_DDPRINT("found existing inherited plain property, but original object is not extensible"));
 				goto fail_not_extensible;
 			}
 			if (!(desc.flags & DUK_PROPDESC_FLAG_WRITABLE)) {
-				DUK_DD(DUK_DDPRINT("found existing inherited plain property, original object is extensible, but inherited property is not writable"));
+				DUK_DD(DUK_DDPRINT("found existing inherited plain property, original object is extensible, but "
+				                   "inherited property is not writable"));
 				goto fail_not_writable;
 			}
 			DUK_DD(DUK_DDPRINT("put to new property, object extensible, inherited property found and is writable"));
@@ -57876,7 +61913,8 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 			 */
 
 			if (!(desc.flags & DUK_PROPDESC_FLAG_WRITABLE)) {
-				DUK_DD(DUK_DDPRINT("found existing own (non-inherited) plain property, but property is not writable"));
+				DUK_DD(
+				    DUK_DDPRINT("found existing own (non-inherited) plain property, but property is not writable"));
 				goto fail_not_writable;
 			}
 			if (desc.flags & DUK_PROPDESC_FLAG_VIRTUAL) {
@@ -57893,18 +61931,19 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 					 *  Note: the helper has an unnecessary writability check
 					 *  for 'length', we already know it is writable.
 					 */
-					DUK_ASSERT(key == DUK_HTHREAD_STRING_LENGTH(thr));  /* only virtual array property */
+					DUK_ASSERT(key == DUK_HTHREAD_STRING_LENGTH(thr)); /* only virtual array property */
 
-					DUK_DDD(DUK_DDDPRINT("writing existing 'length' property to array exotic, invoke complex helper"));
+					DUK_DDD(DUK_DDDPRINT(
+					    "writing existing 'length' property to array exotic, invoke complex helper"));
 
 					/* XXX: the helper currently assumes stack top contains new
 					 * 'length' value and the whole calling convention is not very
 					 * compatible with what we need.
 					 */
 
-					duk_push_tval(thr, tv_val);  /* [key val] */
+					duk_push_tval(thr, tv_val); /* [key val] */
 					rc = duk__handle_put_array_length(thr, orig);
-					duk_pop_unsafe(thr);  /* [key val] -> [key] */
+					duk_pop_unsafe(thr); /* [key val] -> [key] */
 					if (!rc) {
 						goto fail_array_length_partial;
 					}
@@ -57919,19 +61958,21 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 					duk_small_uint_t elem_size;
 
 					h_bufobj = (duk_hbufobj *) curr;
-					DUK_ASSERT_HBUFOBJ_VALID(h_bufobj);
+					DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
 
 					DUK_DD(DUK_DDPRINT("writable virtual property is in buffer object"));
 
 					/* Careful with wrapping: arr_idx upshift may easily wrap, whereas
 					 * length downshift won't.
 					 */
-					if (arr_idx < (h_bufobj->length >> h_bufobj->shift) && DUK_HBUFOBJ_HAS_VIRTUAL_INDICES(h_bufobj)) {
+					if (arr_idx < (h_bufobj->length >> h_bufobj->shift) &&
+					    DUK_HBUFOBJ_HAS_VIRTUAL_INDICES(h_bufobj)) {
 						duk_uint8_t *data;
 						DUK_DDD(DUK_DDDPRINT("writing to buffer data at index %ld", (long) arr_idx));
 
-						DUK_ASSERT(arr_idx != DUK__NO_ARRAY_INDEX);  /* index/length check guarantees */
-						byte_off = arr_idx << h_bufobj->shift;       /* no wrap assuming h_bufobj->length is valid */
+						DUK_ASSERT(arr_idx != DUK__NO_ARRAY_INDEX); /* index/length check guarantees */
+						byte_off = arr_idx
+						           << h_bufobj->shift; /* no wrap assuming h_bufobj->length is valid */
 						elem_size = (duk_small_uint_t) (1U << h_bufobj->shift);
 
 						/* Coerce to number before validating pointers etc so that the
@@ -57942,27 +61983,30 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 						duk_push_tval(thr, tv_val);
 						(void) duk_to_number_m1(thr);
 
-						if (h_bufobj->buf != NULL && DUK_HBUFOBJ_VALID_BYTEOFFSET_EXCL(h_bufobj, byte_off + elem_size)) {
-							data = (duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h_bufobj->buf) + h_bufobj->offset + byte_off;
+						if (h_bufobj->buf != NULL &&
+						    DUK_HBUFOBJ_VALID_BYTEOFFSET_EXCL(h_bufobj, byte_off + elem_size)) {
+							data = (duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h_bufobj->buf) +
+							       h_bufobj->offset + byte_off;
 							duk_hbufobj_validated_write(thr, h_bufobj, data, elem_size);
 						} else {
-							DUK_D(DUK_DPRINT("bufobj access out of underlying buffer, ignoring (write skipped)"));
+							DUK_D(DUK_DPRINT(
+							    "bufobj access out of underlying buffer, ignoring (write skipped)"));
 						}
 						duk_pop_unsafe(thr);
 						goto success_no_arguments_exotic;
 					}
 				}
-#endif  /* DUK_USE_BUFFEROBJECT_SUPPORT */
+#endif /* DUK_USE_BUFFEROBJECT_SUPPORT */
 
 				DUK_D(DUK_DPRINT("should not happen, key %!O", key));
-				goto fail_internal;  /* should not happen */
+				goto fail_internal; /* should not happen */
 			}
 			DUK_DD(DUK_DDPRINT("put to existing own plain property, property is writable"));
 			goto update_old;
 		}
 		DUK_UNREACHABLE();
 
-	 next_in_chain:
+	next_in_chain:
 		/* XXX: option to pretend property doesn't exist if sanity limit is
 		 * hit might be useful.
 		 */
@@ -57991,7 +62035,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 
 	goto create_new;
 
- update_old:
+update_old:
 
 	/*
 	 *  Update an existing property of the base object.
@@ -58024,10 +62068,9 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 	if (desc.e_idx >= 0) {
 		tv = DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, orig, desc.e_idx);
 		DUK_DDD(DUK_DDDPRINT("previous entry value: %!iT", (duk_tval *) tv));
-		DUK_TVAL_SET_TVAL_UPDREF(thr, tv, tv_val);  /* side effects; e_idx may be invalidated */
+		DUK_TVAL_SET_TVAL_UPDREF(thr, tv, tv_val); /* side effects; e_idx may be invalidated */
 		/* don't touch property attributes or hash part */
-		DUK_DD(DUK_DDPRINT("put to an existing entry at index %ld -> new value %!iT",
-		                   (long) desc.e_idx, (duk_tval *) tv));
+		DUK_DD(DUK_DDPRINT("put to an existing entry at index %ld -> new value %!iT", (long) desc.e_idx, (duk_tval *) tv));
 	} else {
 		/* Note: array entries are always writable, so the writability check
 		 * above is pointless for them.  The check could be avoided with some
@@ -58037,9 +62080,10 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 		DUK_ASSERT(desc.a_idx >= 0);
 		tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, orig, desc.a_idx);
 		DUK_DDD(DUK_DDDPRINT("previous array value: %!iT", (duk_tval *) tv));
-		DUK_TVAL_SET_TVAL_UPDREF(thr, tv, tv_val);  /* side effects; a_idx may be invalidated */
+		DUK_TVAL_SET_TVAL_UPDREF(thr, tv, tv_val); /* side effects; a_idx may be invalidated */
 		DUK_DD(DUK_DDPRINT("put to an existing array entry at index %ld -> new value %!iT",
-		                   (long) desc.a_idx, (duk_tval *) tv));
+		                   (long) desc.a_idx,
+		                   (duk_tval *) tv));
 	}
 
 	/* Regardless of whether property is found in entry or array part,
@@ -58048,7 +62092,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 	 */
 	goto success_with_arguments_exotic;
 
- create_new:
+create_new:
 
 	/*
 	 *  Create a new property in the original object.
@@ -58081,24 +62125,23 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 	 * from its creation and cannot be deleted, and is thus
 	 * caught as an existing property above.
 	 */
-	DUK_ASSERT(!(DUK_HOBJECT_HAS_EXOTIC_ARRAY(orig) &&
-	             key == DUK_HTHREAD_STRING_LENGTH(thr)));
+	DUK_ASSERT(!(DUK_HOBJECT_HAS_EXOTIC_ARRAY(orig) && key == DUK_HTHREAD_STRING_LENGTH(thr)));
 
-	if (DUK_HOBJECT_HAS_EXOTIC_ARRAY(orig) &&
-	    arr_idx != DUK__NO_ARRAY_INDEX) {
+	if (DUK_HOBJECT_HAS_EXOTIC_ARRAY(orig) && arr_idx != DUK__NO_ARRAY_INDEX) {
 		/* automatic length update */
 		duk_uint32_t old_len;
 		duk_harray *a;
 
 		a = (duk_harray *) orig;
-		DUK_ASSERT_HARRAY_VALID(a);
+		DUK_HARRAY_ASSERT_VALID(a);
 
 		old_len = a->length;
 
 		if (arr_idx >= old_len) {
 			DUK_DDD(DUK_DDDPRINT("write new array entry requires length update "
 			                     "(arr_idx=%ld, old_len=%ld)",
-			                     (long) arr_idx, (long) old_len));
+			                     (long) arr_idx,
+			                     (long) old_len));
 
 			if (DUK_HARRAY_LENGTH_NONWRITABLE(a)) {
 				DUK_DD(DUK_DDPRINT("attempt to extend array, but array 'length' is not writable"));
@@ -58112,15 +62155,16 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 			 */
 
 			DUK_ASSERT(arr_idx != 0xffffffffUL);
-			new_array_length = arr_idx + 1;  /* flag for later write */
+			new_array_length = arr_idx + 1; /* flag for later write */
 		} else {
 			DUK_DDD(DUK_DDDPRINT("write new array entry does not require length update "
 			                     "(arr_idx=%ld, old_len=%ld)",
-			                     (long) arr_idx, (long) old_len));
+			                     (long) arr_idx,
+			                     (long) old_len));
 		}
 	}
 
- /* write_to_array_part: */
+	/* write_to_array_part: */
 
 	/*
 	 *  Write to array part?
@@ -58131,90 +62175,18 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 	 *  tv_obj, tv_key, and tv_val are copies of the original inputs.
 	 */
 
-	if (arr_idx != DUK__NO_ARRAY_INDEX &&
-	    DUK_HOBJECT_HAS_ARRAY_PART(orig)) {
-		if (arr_idx < DUK_HOBJECT_GET_ASIZE(orig)) {
-			goto no_array_growth;
-		}
-
-		/*
-		 *  Array needs to grow, but we don't want it becoming too sparse.
-		 *  If it were to become sparse, abandon array part, moving all
-		 *  array entries into the entries part (for good).
-		 *
-		 *  Since we don't keep track of actual density (used vs. size) of
-		 *  the array part, we need to estimate somehow.  The check is made
-		 *  in two parts:
-		 *
-		 *    - Check whether the resize need is small compared to the
-		 *      current size (relatively); if so, resize without further
-		 *      checking (essentially we assume that the original part is
-		 *      "dense" so that the result would be dense enough).
-		 *
-		 *    - Otherwise, compute the resize using an actual density
-		 *      measurement based on counting the used array entries.
-		 */
-
-		DUK_DDD(DUK_DDDPRINT("write to new array requires array resize, decide whether to do a "
-		                     "fast resize without abandon check (arr_idx=%ld, old_size=%ld)",
-		                     (long) arr_idx, (long) DUK_HOBJECT_GET_ASIZE(orig)));
-
-		if (duk__abandon_array_slow_check_required(arr_idx, DUK_HOBJECT_GET_ASIZE(orig))) {
-			duk_uint32_t old_used;
-			duk_uint32_t old_size;
-
-			DUK_DDD(DUK_DDDPRINT("=> fast check is NOT OK, do slow check for array abandon"));
-
-			duk__compute_a_stats(thr, orig, &old_used, &old_size);
-
-			DUK_DDD(DUK_DDDPRINT("abandon check, array stats: old_used=%ld, old_size=%ld, arr_idx=%ld",
-			                     (long) old_used, (long) old_size, (long) arr_idx));
-
-			/* Note: intentionally use approximations to shave a few instructions:
-			 *   a_used = old_used  (accurate: old_used + 1)
-			 *   a_size = arr_idx   (accurate: arr_idx + 1)
-			 */
-			if (duk__abandon_array_density_check(old_used, arr_idx)) {
-				DUK_DD(DUK_DDPRINT("write to new array entry beyond current length, "
-				                   "decided to abandon array part (would become too sparse)"));
-
-				/* abandoning requires a props allocation resize and
-				 * 'rechecks' the valstack, invalidating any existing
-				 * valstack value pointers!
-				 */
-				duk__abandon_array_checked(thr, orig);
-				DUK_ASSERT(!DUK_HOBJECT_HAS_ARRAY_PART(orig));
-
-				goto write_to_entry_part;
-			}
-
-			DUK_DDD(DUK_DDDPRINT("=> decided to keep array part"));
-		} else {
-			DUK_DDD(DUK_DDDPRINT("=> fast resize is OK"));
+	if (arr_idx != DUK__NO_ARRAY_INDEX && DUK_HOBJECT_HAS_ARRAY_PART(orig)) {
+		tv = duk__obtain_arridx_slot(thr, arr_idx, orig);
+		if (tv == NULL) {
+			DUK_ASSERT(!DUK_HOBJECT_HAS_ARRAY_PART(orig));
+			goto write_to_entry_part;
 		}
 
-		DUK_DD(DUK_DDPRINT("write to new array entry beyond current length, "
-		                   "decided to extend current allocation"));
-
-		duk__grow_props_for_array_item(thr, orig, arr_idx);
-
-	 no_array_growth:
-
-		/* Note: assume array part is comprehensive, so that either
-		 * the write goes to the array part, or we've abandoned the
-		 * array above (and will not come here).
-		 */
-
-		DUK_ASSERT(DUK_HOBJECT_HAS_ARRAY_PART(orig));
-		DUK_ASSERT(arr_idx < DUK_HOBJECT_GET_ASIZE(orig));
-
-		tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, orig, arr_idx);
 		/* prev value must be unused, no decref */
 		DUK_ASSERT(DUK_TVAL_IS_UNUSED(tv));
 		DUK_TVAL_SET_TVAL(tv, tv_val);
 		DUK_TVAL_INCREF(thr, tv);
-		DUK_DD(DUK_DDPRINT("put to new array entry: %ld -> %!T",
-		                   (long) arr_idx, (duk_tval *) tv));
+		DUK_DD(DUK_DDPRINT("put to new array entry: %ld -> %!T", (long) arr_idx, (duk_tval *) tv));
 
 		/* Note: array part values are [[Writable]], [[Enumerable]],
 		 * and [[Configurable]] which matches the required attributes
@@ -58223,7 +62195,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 		goto entry_updated;
 	}
 
- write_to_entry_part:
+write_to_entry_part:
 
 	/*
 	 *  Write to entry part
@@ -58243,7 +62215,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 	DUK_HOBJECT_E_SET_FLAGS(thr->heap, orig, e_idx, DUK_PROPDESC_FLAGS_WEC);
 	goto entry_updated;
 
- entry_updated:
+entry_updated:
 
 	/*
 	 *  Possible pending array length update, which must only be done
@@ -58257,8 +62229,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 
 		DUK_ASSERT(DUK_HOBJECT_HAS_EXOTIC_ARRAY(orig));
 
-		DUK_DDD(DUK_DDDPRINT("write successful, pending array length update to: %ld",
-		                     (long) new_array_length));
+		DUK_DDD(DUK_DDDPRINT("write successful, pending array length update to: %ld", (long) new_array_length));
 
 		((duk_harray *) orig)->length = new_array_length;
 	}
@@ -58272,7 +62243,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 
 	goto success_no_arguments_exotic;
 
- success_with_arguments_exotic:
+success_with_arguments_exotic:
 
 	/*
 	 *  Arguments objects have exotic [[DefineOwnProperty]] which updates
@@ -58287,8 +62258,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 	 *  we end up in step 5.b.i.
 	 */
 
-	if (arr_idx != DUK__NO_ARRAY_INDEX &&
-	    DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(orig)) {
+	if (arr_idx != DUK__NO_ARRAY_INDEX && DUK_HOBJECT_HAS_EXOTIC_ARGUMENTS(orig)) {
 		/* Note: only numbered indices are relevant, so arr_idx fast reject
 		 * is good (this is valid unless there are more than 4**32-1 arguments).
 		 */
@@ -58307,14 +62277,14 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 	}
 	/* fall thru */
 
- success_no_arguments_exotic:
+success_no_arguments_exotic:
 	/* shared exit path now */
 	DUK_DDD(DUK_DDDPRINT("result: success"));
-	duk_pop_unsafe(thr);  /* remove key */
+	duk_pop_unsafe(thr); /* remove key */
 	return 1;
 
 #if defined(DUK_USE_ES6_PROXY)
- fail_proxy_rejected:
+fail_proxy_rejected:
 	DUK_DDD(DUK_DDDPRINT("result: error, proxy rejects"));
 	if (throw_flag) {
 		DUK_ERROR_TYPE(thr, DUK_STR_PROXY_REJECTED);
@@ -58324,40 +62294,43 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 	return 0;
 #endif
 
- fail_base_primitive:
+fail_base_primitive:
 	DUK_DDD(DUK_DDDPRINT("result: error, base primitive"));
 	if (throw_flag) {
 #if defined(DUK_USE_PARANOID_ERRORS)
 		DUK_ERROR_TYPE(thr, DUK_STR_INVALID_BASE);
 #else
-		DUK_ERROR_FMT2(thr, DUK_ERR_TYPE_ERROR, "cannot write property %s of %s",
-		               duk_push_string_tval_readable(thr, tv_key), duk_push_string_tval_readable(thr, tv_obj));
+		DUK_ERROR_FMT2(thr,
+		               DUK_ERR_TYPE_ERROR,
+		               "cannot write property %s of %s",
+		               duk_push_string_tval_readable(thr, tv_key),
+		               duk_push_string_tval_readable(thr, tv_obj));
 #endif
 		DUK_WO_NORETURN(return 0;);
 	}
-	duk_pop_unsafe(thr);  /* remove key */
+	duk_pop_unsafe(thr); /* remove key */
 	return 0;
 
- fail_not_extensible:
+fail_not_extensible:
 	DUK_DDD(DUK_DDDPRINT("result: error, not extensible"));
 	if (throw_flag) {
 		DUK_ERROR_TYPE(thr, DUK_STR_NOT_EXTENSIBLE);
 		DUK_WO_NORETURN(return 0;);
 	}
-	duk_pop_unsafe(thr);  /* remove key */
+	duk_pop_unsafe(thr); /* remove key */
 	return 0;
 
- fail_not_writable:
+fail_not_writable:
 	DUK_DDD(DUK_DDDPRINT("result: error, not writable"));
 	if (throw_flag) {
 		DUK_ERROR_TYPE(thr, DUK_STR_NOT_WRITABLE);
 		DUK_WO_NORETURN(return 0;);
 	}
-	duk_pop_unsafe(thr);  /* remove key */
+	duk_pop_unsafe(thr); /* remove key */
 	return 0;
 
 #if defined(DUK_USE_ROM_OBJECTS)
- fail_not_writable_no_pop:
+fail_not_writable_no_pop:
 	DUK_DDD(DUK_DDDPRINT("result: error, not writable"));
 	if (throw_flag) {
 		DUK_ERROR_TYPE(thr, DUK_STR_NOT_WRITABLE);
@@ -58366,31 +62339,31 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj,
 	return 0;
 #endif
 
- fail_array_length_partial:
+fail_array_length_partial:
 	DUK_DD(DUK_DDPRINT("result: error, array length write only partially successful"));
 	if (throw_flag) {
 		DUK_ERROR_TYPE(thr, DUK_STR_NOT_CONFIGURABLE);
 		DUK_WO_NORETURN(return 0;);
 	}
-	duk_pop_unsafe(thr);  /* remove key */
+	duk_pop_unsafe(thr); /* remove key */
 	return 0;
 
- fail_no_setter:
+fail_no_setter:
 	DUK_DDD(DUK_DDDPRINT("result: error, accessor property without setter"));
 	if (throw_flag) {
 		DUK_ERROR_TYPE(thr, DUK_STR_SETTER_UNDEFINED);
 		DUK_WO_NORETURN(return 0;);
 	}
-	duk_pop_unsafe(thr);  /* remove key */
+	duk_pop_unsafe(thr); /* remove key */
 	return 0;
 
- fail_internal:
+fail_internal:
 	DUK_DDD(DUK_DDDPRINT("result: error, internal"));
 	if (throw_flag) {
 		DUK_ERROR_INTERNAL(thr);
 		DUK_WO_NORETURN(return 0;);
 	}
-	duk_pop_unsafe(thr);  /* remove key */
+	duk_pop_unsafe(thr); /* remove key */
 	return 0;
 }
 
@@ -58409,8 +62382,13 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop_raw(duk_hthread *thr, duk_hobject *o
 	force_flag = (flags & DUK_DELPROP_FLAG_FORCE);
 
 	DUK_DDD(DUK_DDDPRINT("delprop_raw: thr=%p, obj=%p, key=%p, throw=%ld, force=%ld (obj -> %!O, key -> %!O)",
-	                     (void *) thr, (void *) obj, (void *) key, (long) throw_flag, (long) force_flag,
-	                     (duk_heaphdr *) obj, (duk_heaphdr *) key));
+	                     (void *) thr,
+	                     (void *) obj,
+	                     (void *) key,
+	                     (long) throw_flag,
+	                     (long) force_flag,
+	                     (duk_heaphdr *) obj,
+	                     (duk_heaphdr *) key));
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(thr->heap != NULL);
@@ -58422,7 +62400,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop_raw(duk_hthread *thr, duk_hobject *o
 	arr_idx = DUK_HSTRING_GET_ARRIDX_FAST(key);
 
 	/* 0 = don't push current value */
-	if (!duk__get_own_propdesc_raw(thr, obj, key, arr_idx, &desc, 0 /*flags*/)) {  /* don't push value */
+	if (!duk__get_own_propdesc_raw(thr, obj, key, arr_idx, &desc, 0 /*flags*/)) { /* don't push value */
 		DUK_DDD(DUK_DDDPRINT("property not found, succeed always"));
 		goto success;
 	}
@@ -58449,7 +62427,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop_raw(duk_hthread *thr, duk_hobject *o
 		DUK_ASSERT(desc.e_idx < 0);
 
 		tv = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, desc.a_idx);
-		DUK_TVAL_SET_UNUSED_UPDREF(thr, tv);  /* side effects */
+		DUK_TVAL_SET_UNUSED_UPDREF(thr, tv); /* side effects */
 		goto success;
 	} else {
 		DUK_ASSERT(desc.a_idx < 0);
@@ -58475,7 +62453,9 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop_raw(duk_hthread *thr, duk_hobject *o
 		 * invalidated.
 		 */
 		DUK_DDD(DUK_DDDPRINT("before removing value, e_idx %ld, key %p, key at slot %p",
-		                     (long) desc.e_idx, (void *) key, (void *) DUK_HOBJECT_E_GET_KEY(thr->heap, obj, desc.e_idx)));
+		                     (long) desc.e_idx,
+		                     (void *) key,
+		                     (void *) DUK_HOBJECT_E_GET_KEY(thr->heap, obj, desc.e_idx)));
 		DUK_DDD(DUK_DDDPRINT("removing value at e_idx %ld", (long) desc.e_idx));
 		if (DUK_HOBJECT_E_SLOT_IS_ACCESSOR(thr->heap, obj, desc.e_idx)) {
 			duk_hobject *tmp;
@@ -58500,7 +62480,9 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop_raw(duk_hthread *thr, duk_hobject *o
 
 		/* Remove key. */
 		DUK_DDD(DUK_DDDPRINT("before removing key, e_idx %ld, key %p, key at slot %p",
-		                     (long) desc.e_idx, (void *) key, (void *) DUK_HOBJECT_E_GET_KEY(thr->heap, obj, desc.e_idx)));
+		                     (long) desc.e_idx,
+		                     (void *) key,
+		                     (void *) DUK_HOBJECT_E_GET_KEY(thr->heap, obj, desc.e_idx)));
 		DUK_DDD(DUK_DDDPRINT("removing key at e_idx %ld", (long) desc.e_idx));
 		DUK_ASSERT(key == DUK_HOBJECT_E_GET_KEY(thr->heap, obj, desc.e_idx));
 		DUK_HOBJECT_E_SET_KEY(thr->heap, obj, desc.e_idx, NULL);
@@ -58516,7 +62498,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop_raw(duk_hthread *thr, duk_hobject *o
 
 	DUK_UNREACHABLE();
 
- success:
+success:
 	/*
 	 *  Argument exotic [[Delete]] behavior (E5 Section 10.6) is
 	 *  a post-check, keeping arguments internal 'map' in sync with
@@ -58543,8 +62525,8 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop_raw(duk_hthread *thr, duk_hobject *o
 	DUK_DDD(DUK_DDDPRINT("delete successful"));
 	return 1;
 
- fail_virtual:  /* just use the same "not configurable" error message */
- fail_not_configurable:
+fail_virtual: /* just use the same "not configurable" error message */
+fail_not_configurable:
 	DUK_DDD(DUK_DDDPRINT("delete failed: property found, not configurable"));
 
 	if (throw_flag) {
@@ -58568,8 +62550,11 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop(duk_hthread *thr, duk_tval *tv_obj,
 	duk_bool_t rc;
 
 	DUK_DDD(DUK_DDDPRINT("delprop: thr=%p, obj=%p, key=%p (obj -> %!T, key -> %!T)",
-	                     (void *) thr, (void *) tv_obj, (void *) tv_key,
-	                     (duk_tval *) tv_obj, (duk_tval *) tv_key));
+	                     (void *) thr,
+	                     (void *) tv_obj,
+	                     (void *) tv_key,
+	                     (duk_tval *) tv_obj,
+	                     (duk_tval *) tv_key));
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(thr->heap != NULL);
@@ -58583,8 +62568,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop(duk_hthread *thr, duk_tval *tv_obj,
 	 */
 	entry_top = duk_get_top(thr);
 
-	if (DUK_TVAL_IS_UNDEFINED(tv_obj) ||
-	    DUK_TVAL_IS_NULL(tv_obj)) {
+	if (DUK_TVAL_IS_UNDEFINED(tv_obj) || DUK_TVAL_IS_NULL(tv_obj)) {
 		DUK_DDD(DUK_DDDPRINT("base object is undefined or null -> reject"));
 		goto fail_invalid_base_uncond;
 	}
@@ -58607,12 +62591,12 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop(duk_hthread *thr, duk_tval *tv_obj,
 			if (duk__proxy_check_prop(thr, obj, DUK_STRIDX_DELETE_PROPERTY, tv_key, &h_target)) {
 				/* -> [ ... obj key trap handler ] */
 				DUK_DDD(DUK_DDDPRINT("-> proxy object 'deleteProperty' for key %!T", (duk_tval *) tv_key));
-				duk_push_hobject(thr, h_target);  /* target */
-				duk_dup_m4(thr);  /* P */
+				duk_push_hobject(thr, h_target); /* target */
+				duk_dup_m4(thr); /* P */
 				duk_call_method(thr, 2 /*nargs*/);
 				tmp_bool = duk_to_boolean_top_pop(thr);
 				if (!tmp_bool) {
-					goto fail_proxy_rejected;  /* retval indicates delete failed */
+					goto fail_proxy_rejected; /* retval indicates delete failed */
 				}
 
 				/* Target object must be checked for a conflicting
@@ -58622,14 +62606,17 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop(duk_hthread *thr, duk_tval *tv_obj,
 				arr_idx = duk__push_tval_to_property_key(thr, tv_key, &key);
 				DUK_ASSERT(key != NULL);
 
-				if (duk__get_own_propdesc_raw(thr, h_target, key, arr_idx, &desc, 0 /*flags*/)) {  /* don't push value */
+				if (duk__get_own_propdesc_raw(thr, h_target, key, arr_idx, &desc, 0 /*flags*/)) { /* don't push
+					                                                                             value */
 					duk_small_int_t desc_reject;
 
 					DUK_DDD(DUK_DDDPRINT("proxy 'deleteProperty': target has matching property %!O, check for "
 					                     "conflicting property; desc.flags=0x%08lx, "
 					                     "desc.get=%p, desc.set=%p",
-					                     (duk_heaphdr *) key, (unsigned long) desc.flags,
-					                     (void *) desc.get, (void *) desc.set));
+					                     (duk_heaphdr *) key,
+					                     (unsigned long) desc.flags,
+					                     (void *) desc.get,
+					                     (void *) desc.set));
 
 					desc_reject = !(desc.flags & DUK_PROPDESC_FLAG_CONFIGURABLE);
 					if (desc_reject) {
@@ -58638,13 +62625,13 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop(duk_hthread *thr, duk_tval *tv_obj,
 						DUK_WO_NORETURN(return 0;);
 					}
 				}
-				rc = 1;  /* success */
+				rc = 1; /* success */
 				goto done_rc;
 			}
 
-			obj = h_target;  /* resume delete to target */
+			obj = h_target; /* resume delete to target */
 		}
-#endif  /* DUK_USE_ES6_PROXY */
+#endif /* DUK_USE_ES6_PROXY */
 
 		arr_idx = duk__to_property_key(thr, -1, &key);
 		DUK_ASSERT(key != NULL);
@@ -58669,8 +62656,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop(duk_hthread *thr, duk_tval *tv_obj,
 			goto fail_not_configurable;
 		}
 
-		if (arr_idx != DUK__NO_ARRAY_INDEX &&
-		    arr_idx < DUK_HSTRING_GET_CHARLEN(h)) {
+		if (arr_idx != DUK__NO_ARRAY_INDEX && arr_idx < DUK_HSTRING_GET_CHARLEN(h)) {
 			goto fail_not_configurable;
 		}
 	} else if (DUK_TVAL_IS_BUFFER(tv_obj)) {
@@ -58688,8 +62674,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop(duk_hthread *thr, duk_tval *tv_obj,
 			goto fail_not_configurable;
 		}
 
-		if (arr_idx != DUK__NO_ARRAY_INDEX &&
-		    arr_idx < DUK_HBUFFER_GET_SIZE(h)) {
+		if (arr_idx != DUK__NO_ARRAY_INDEX && arr_idx < DUK_HBUFFER_GET_SIZE(h)) {
 			goto fail_not_configurable;
 		}
 	} else if (DUK_TVAL_IS_LIGHTFUNC(tv_obj)) {
@@ -58706,23 +62691,26 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop(duk_hthread *thr, duk_tval *tv_obj,
 	rc = 1;
 	goto done_rc;
 
- done_rc:
+done_rc:
 	duk_set_top_unsafe(thr, entry_top);
 	return rc;
 
- fail_invalid_base_uncond:
+fail_invalid_base_uncond:
 	/* Note: unconditional throw */
 	DUK_ASSERT(duk_get_top(thr) == entry_top);
 #if defined(DUK_USE_PARANOID_ERRORS)
 	DUK_ERROR_TYPE(thr, DUK_STR_INVALID_BASE);
 #else
-	DUK_ERROR_FMT2(thr, DUK_ERR_TYPE_ERROR, "cannot delete property %s of %s",
-	               duk_push_string_tval_readable(thr, tv_key), duk_push_string_tval_readable(thr, tv_obj));
+	DUK_ERROR_FMT2(thr,
+	               DUK_ERR_TYPE_ERROR,
+	               "cannot delete property %s of %s",
+	               duk_push_string_tval_readable(thr, tv_key),
+	               duk_push_string_tval_readable(thr, tv_obj));
 #endif
 	DUK_WO_NORETURN(return 0;);
 
 #if defined(DUK_USE_ES6_PROXY)
- fail_proxy_rejected:
+fail_proxy_rejected:
 	if (throw_flag) {
 		DUK_ERROR_TYPE(thr, DUK_STR_PROXY_REJECTED);
 		DUK_WO_NORETURN(return 0;);
@@ -58731,7 +62719,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop(duk_hthread *thr, duk_tval *tv_obj,
 	return 0;
 #endif
 
- fail_not_configurable:
+fail_not_configurable:
 	if (throw_flag) {
 		DUK_ERROR_TYPE(thr, DUK_STR_NOT_CONFIGURABLE);
 		DUK_WO_NORETURN(return 0;);
@@ -58759,17 +62747,23 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop(duk_hthread *thr, duk_tval *tv_obj,
  *  operations.
  */
 
-DUK_INTERNAL void duk_hobject_define_property_internal(duk_hthread *thr, duk_hobject *obj, duk_hstring *key, duk_small_uint_t flags) {
+DUK_INTERNAL void duk_hobject_define_property_internal(duk_hthread *thr,
+                                                       duk_hobject *obj,
+                                                       duk_hstring *key,
+                                                       duk_small_uint_t flags) {
 	duk_propdesc desc;
 	duk_uint32_t arr_idx;
 	duk_int_t e_idx;
 	duk_tval *tv1 = NULL;
 	duk_tval *tv2 = NULL;
-	duk_small_uint_t propflags = flags & DUK_PROPDESC_FLAGS_MASK;  /* mask out flags not actually stored */
+	duk_small_uint_t propflags = flags & DUK_PROPDESC_FLAGS_MASK; /* mask out flags not actually stored */
 
 	DUK_DDD(DUK_DDDPRINT("define new property (internal): thr=%p, obj=%!O, key=%!O, flags=0x%02lx, val=%!T",
-	                     (void *) thr, (duk_heaphdr *) obj, (duk_heaphdr *) key,
-	                     (unsigned long) flags, (duk_tval *) duk_get_tval(thr, -1)));
+	                     (void *) thr,
+	                     (duk_heaphdr *) obj,
+	                     (duk_heaphdr *) key,
+	                     (unsigned long) flags,
+	                     (duk_tval *) duk_get_tval(thr, -1)));
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(thr->heap != NULL);
@@ -58777,11 +62771,11 @@ DUK_INTERNAL void duk_hobject_define_property_internal(duk_hthread *thr, duk_hob
 	DUK_ASSERT(key != NULL);
 	DUK_ASSERT(!DUK_HEAPHDR_HAS_READONLY((duk_heaphdr *) obj));
 	DUK_ASSERT_VALSTACK_SPACE(thr, DUK__VALSTACK_SPACE);
-	DUK_ASSERT(duk_is_valid_index(thr, -1));  /* contains value */
+	DUK_ASSERT(duk_is_valid_index(thr, -1)); /* contains value */
 
 	arr_idx = DUK_HSTRING_GET_ARRIDX_SLOW(key);
 
-	if (duk__get_own_propdesc_raw(thr, obj, key, arr_idx, &desc, 0 /*flags*/)) {  /* don't push value */
+	if (duk__get_own_propdesc_raw(thr, obj, key, arr_idx, &desc, 0 /*flags*/)) { /* don't push value */
 		if (desc.e_idx >= 0) {
 			if (flags & DUK_PROPDESC_FLAG_NO_OVERWRITE) {
 				DUK_DDD(DUK_DDDPRINT("property already exists in the entry part -> skip as requested"));
@@ -58821,8 +62815,9 @@ DUK_INTERNAL void duk_hobject_define_property_internal(duk_hthread *thr, duk_hob
 #endif
 				new_len = duk__to_new_array_length_checked(thr, DUK_GET_TVAL_NEGIDX(thr, -1));
 				((duk_harray *) obj)->length = new_len;
-				DUK_D(DUK_DPRINT("internal define property for array .length: %ld -> %ld",
-				                 (long) prev_len, (long) ((duk_harray *) obj)->length));
+				DUK_DD(DUK_DDPRINT("internal define property for array .length: %ld -> %ld",
+				                   (long) prev_len,
+				                   (long) ((duk_harray *) obj)->length));
 				goto pop_exit;
 			}
 			DUK_DD(DUK_DDPRINT("property already exists but is virtual -> failure"));
@@ -58834,22 +62829,25 @@ DUK_INTERNAL void duk_hobject_define_property_internal(duk_hthread *thr, duk_hob
 
 	if (DUK_HOBJECT_HAS_ARRAY_PART(obj)) {
 		if (arr_idx != DUK__NO_ARRAY_INDEX) {
-			DUK_DDD(DUK_DDDPRINT("property does not exist, object has array part -> possibly extend array part and write value (assert attributes)"));
+			DUK_DDD(DUK_DDDPRINT("property does not exist, object has array part -> possibly extend array part and "
+			                     "write value (assert attributes)"));
 			DUK_ASSERT(propflags == DUK_PROPDESC_FLAGS_WEC);
 
-			/* always grow the array, no sparse / abandon support here */
-			if (arr_idx >= DUK_HOBJECT_GET_ASIZE(obj)) {
-				duk__grow_props_for_array_item(thr, obj, arr_idx);
+			tv1 = duk__obtain_arridx_slot(thr, arr_idx, obj);
+			if (tv1 == NULL) {
+				DUK_ASSERT(!DUK_HOBJECT_HAS_ARRAY_PART(obj));
+				goto write_to_entry_part;
 			}
 
-			DUK_ASSERT(arr_idx < DUK_HOBJECT_GET_ASIZE(obj));
 			tv1 = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, arr_idx);
 			goto write_value;
 		}
 	}
 
-	DUK_DDD(DUK_DDDPRINT("property does not exist, object belongs in entry part -> allocate new entry and write value and attributes"));
-	e_idx = duk__hobject_alloc_entry_checked(thr, obj, key);  /* increases key refcount */
+write_to_entry_part:
+	DUK_DDD(DUK_DDDPRINT(
+	    "property does not exist, object belongs in entry part -> allocate new entry and write value and attributes"));
+	e_idx = duk__hobject_alloc_entry_checked(thr, obj, key); /* increases key refcount */
 	DUK_ASSERT(e_idx >= 0);
 	DUK_HOBJECT_E_SET_FLAGS(thr->heap, obj, e_idx, propflags);
 	tv1 = DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, obj, e_idx);
@@ -58857,22 +62855,21 @@ DUK_INTERNAL void duk_hobject_define_property_internal(duk_hthread *thr, duk_hob
 	DUK_TVAL_SET_UNDEFINED(tv1);
 	goto write_value;
 
- write_value:
+write_value:
 	/* tv1 points to value storage */
 
-	tv2 = duk_require_tval(thr, -1);  /* late lookup, avoid side effects */
-	DUK_DDD(DUK_DDDPRINT("writing/updating value: %!T -> %!T",
-	                     (duk_tval *) tv1, (duk_tval *) tv2));
+	tv2 = duk_require_tval(thr, -1); /* late lookup, avoid side effects */
+	DUK_DDD(DUK_DDDPRINT("writing/updating value: %!T -> %!T", (duk_tval *) tv1, (duk_tval *) tv2));
 
-	DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2);  /* side effects */
+	DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2); /* side effects */
 	goto pop_exit;
 
- pop_exit:
-	duk_pop_unsafe(thr);  /* remove in_val */
+pop_exit:
+	duk_pop_unsafe(thr); /* remove in_val */
 	return;
 
- error_virtual:  /* share error message */
- error_internal:
+error_virtual: /* share error message */
+error_internal:
 	DUK_ERROR_INTERNAL(thr);
 	DUK_WO_NORETURN(return;);
 }
@@ -58883,13 +62880,19 @@ DUK_INTERNAL void duk_hobject_define_property_internal(duk_hthread *thr, duk_hob
  *  must avoid interning.
  */
 
-DUK_INTERNAL void duk_hobject_define_property_internal_arridx(duk_hthread *thr, duk_hobject *obj, duk_uarridx_t arr_idx, duk_small_uint_t flags) {
+DUK_INTERNAL void duk_hobject_define_property_internal_arridx(duk_hthread *thr,
+                                                              duk_hobject *obj,
+                                                              duk_uarridx_t arr_idx,
+                                                              duk_small_uint_t flags) {
 	duk_hstring *key;
 	duk_tval *tv1, *tv2;
 
 	DUK_DDD(DUK_DDDPRINT("define new property (internal) arr_idx fast path: thr=%p, obj=%!O, "
 	                     "arr_idx=%ld, flags=0x%02lx, val=%!T",
-	                     (void *) thr, obj, (long) arr_idx, (unsigned long) flags,
+	                     (void *) thr,
+	                     obj,
+	                     (long) arr_idx,
+	                     (unsigned long) flags,
 	                     (duk_tval *) duk_get_tval(thr, -1)));
 
 	DUK_ASSERT(thr != NULL);
@@ -58897,37 +62900,34 @@ DUK_INTERNAL void duk_hobject_define_property_internal_arridx(duk_hthread *thr,
 	DUK_ASSERT(obj != NULL);
 	DUK_ASSERT(!DUK_HEAPHDR_HAS_READONLY((duk_heaphdr *) obj));
 
-	if (DUK_HOBJECT_HAS_ARRAY_PART(obj) &&
-	    arr_idx != DUK__NO_ARRAY_INDEX &&
-	    flags == DUK_PROPDESC_FLAGS_WEC) {
-		DUK_ASSERT((flags & DUK_PROPDESC_FLAG_NO_OVERWRITE) == 0);  /* covered by comparison */
+	if (DUK_HOBJECT_HAS_ARRAY_PART(obj) && arr_idx != DUK__NO_ARRAY_INDEX && flags == DUK_PROPDESC_FLAGS_WEC) {
+		DUK_ASSERT((flags & DUK_PROPDESC_FLAG_NO_OVERWRITE) == 0); /* covered by comparison */
 
 		DUK_DDD(DUK_DDDPRINT("define property to array part (property may or may not exist yet)"));
 
-		/* always grow the array, no sparse / abandon support here */
-		if (arr_idx >= DUK_HOBJECT_GET_ASIZE(obj)) {
-			duk__grow_props_for_array_item(thr, obj, arr_idx);
+		tv1 = duk__obtain_arridx_slot(thr, arr_idx, obj);
+		if (tv1 == NULL) {
+			DUK_ASSERT(!DUK_HOBJECT_HAS_ARRAY_PART(obj));
+			goto write_slow;
 		}
-
-		DUK_ASSERT(arr_idx < DUK_HOBJECT_GET_ASIZE(obj));
-		tv1 = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, arr_idx);
 		tv2 = duk_require_tval(thr, -1);
 
-		DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2);  /* side effects */
+		DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2); /* side effects */
 
-		duk_pop_unsafe(thr);  /* [ ...val ] -> [ ... ] */
+		duk_pop_unsafe(thr); /* [ ...val ] -> [ ... ] */
 		return;
 	}
 
+write_slow:
 	DUK_DDD(DUK_DDDPRINT("define property fast path didn't work, use slow path"));
 
 	key = duk_push_uint_to_hstring(thr, (duk_uint_t) arr_idx);
 	DUK_ASSERT(key != NULL);
-	duk_insert(thr, -2);  /* [ ... val key ] -> [ ... key val ] */
+	duk_insert(thr, -2); /* [ ... val key ] -> [ ... key val ] */
 
 	duk_hobject_define_property_internal(thr, obj, key, flags);
 
-	duk_pop_unsafe(thr);  /* [ ... key ] -> [ ... ] */
+	duk_pop_unsafe(thr); /* [ ... key ] -> [ ... ] */
 }
 
 /*
@@ -58937,7 +62937,7 @@ DUK_INTERNAL void duk_hobject_define_property_internal_arridx(duk_hthread *thr,
 DUK_INTERNAL duk_size_t duk_hobject_get_length(duk_hthread *thr, duk_hobject *obj) {
 	duk_double_t val;
 
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	DUK_ASSERT(obj != NULL);
 
 	/* Fast path for Arrays. */
@@ -58948,9 +62948,7 @@ DUK_INTERNAL duk_size_t duk_hobject_get_length(duk_hthread *thr, duk_hobject *ob
 	/* Slow path, .length can be e.g. accessor, obj can be a Proxy, etc. */
 	duk_push_hobject(thr, obj);
 	duk_push_hstring_stridx(thr, DUK_STRIDX_LENGTH);
-	(void) duk_hobject_getprop(thr,
-	                           DUK_GET_TVAL_NEGIDX(thr, -2),
-	                           DUK_GET_TVAL_NEGIDX(thr, -1));
+	(void) duk_hobject_getprop(thr, DUK_GET_TVAL_NEGIDX(thr, -2), DUK_GET_TVAL_NEGIDX(thr, -1));
 	val = duk_to_number_m1(thr);
 	duk_pop_3_unsafe(thr);
 
@@ -58991,7 +62989,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_has_finalizer_fast_raw(duk_hobject *obj) {
 		DUK_ASSERT(heap != NULL);
 		obj = DUK_HOBJECT_GET_PROTOTYPE(heap, obj);
 #else
-		obj = DUK_HOBJECT_GET_PROTOTYPE(NULL, obj);  /* 'heap' arg ignored */
+		obj = DUK_HOBJECT_GET_PROTOTYPE(NULL, obj); /* 'heap' arg ignored */
 #endif
 	} while (obj != NULL);
 
@@ -59058,7 +63056,7 @@ DUK_INTERNAL void duk_hobject_object_get_own_property_descriptor(duk_hthread *th
 	/* [ ... key value desc ] */
 
 	duk_replace(thr, -3);
-	duk_pop_unsafe(thr);  /* -> [ ... desc ] */
+	duk_pop_unsafe(thr); /* -> [ ... desc ] */
 }
 
 /*
@@ -59095,7 +63093,7 @@ void duk_hobject_prepare_property_descriptor(duk_hthread *thr,
 	DUK_ASSERT(out_idx_value != NULL);
 	DUK_ASSERT(out_getter != NULL);
 	DUK_ASSERT(out_setter != NULL);
-	DUK_ASSERT(idx_in <= 0x7fffL);  /* short variants would be OK, but not used to avoid shifts */
+	DUK_ASSERT(idx_in <= 0x7fffL); /* short variants would be OK, but not used to avoid shifts */
 
 	/* Must be an object, otherwise TypeError (E5.1 Section 8.10.5, step 1). */
 	idx_in = duk_require_normalize_index(thr, idx_in);
@@ -59151,7 +63149,7 @@ void duk_hobject_prepare_property_descriptor(duk_hthread *thr,
 		if (DUK_TVAL_IS_UNDEFINED(tv)) {
 			/* undefined is accepted */
 			DUK_ASSERT(setter == NULL);
-		}  else {
+		} else {
 			/* NOTE: lightfuncs are coerced to full functions because
 			 * lightfuncs don't fit into a property value slot.  This
 			 * has some side effects, see test-dev-lightfunc-accessor.js.
@@ -59194,7 +63192,7 @@ void duk_hobject_prepare_property_descriptor(duk_hthread *thr,
 	/* [ ... [multiple values] ] */
 	return;
 
- type_error:
+type_error:
 	DUK_ERROR_TYPE(thr, DUK_STR_INVALID_DESCRIPTOR);
 	DUK_WO_NORETURN(return;);
 }
@@ -59242,7 +63240,7 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 	duk_bool_t force_flag;
 	duk_small_uint_t new_flags;
 	duk_propdesc curr;
-	duk_uint32_t arridx_new_array_length;  /* != 0 => post-update for array 'length' (used when key is an array index) */
+	duk_uint32_t arridx_new_array_length; /* != 0 => post-update for array 'length' (used when key is an array index) */
 	duk_uint32_t arrlen_old_len;
 	duk_uint32_t arrlen_new_len;
 	duk_bool_t pending_write_protect;
@@ -59282,13 +63280,22 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 	                     "has_get=%ld get=%p=%!O "
 	                     "has_set=%ld set=%p=%!O "
 	                     "arr_idx=%ld throw_flag=!%ld",
-	                     (long) has_enumerable, (long) is_enumerable,
-	                     (long) has_configurable, (long) is_configurable,
-	                     (long) has_writable, (long) is_writable,
-	                     (long) has_value, (duk_tval *) (idx_value >= 0 ? duk_get_tval(thr, idx_value) : NULL),
-	                     (long) has_get, (void *) get, (duk_heaphdr *) get,
-	                     (long) has_set, (void *) set, (duk_heaphdr *) set,
-	                     (long) arr_idx, (long) throw_flag));
+	                     (long) has_enumerable,
+	                     (long) is_enumerable,
+	                     (long) has_configurable,
+	                     (long) is_configurable,
+	                     (long) has_writable,
+	                     (long) is_writable,
+	                     (long) has_value,
+	                     (duk_tval *) (idx_value >= 0 ? duk_get_tval(thr, idx_value) : NULL),
+	                     (long) has_get,
+	                     (void *) get,
+	                     (duk_heaphdr *) get,
+	                     (long) has_set,
+	                     (void *) set,
+	                     (duk_heaphdr *) set,
+	                     (long) arr_idx,
+	                     (long) throw_flag));
 
 	/*
 	 *  Array exotic behaviors can be implemented at this point.  The local variables
@@ -59316,13 +63323,13 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 		 */
 
 		a = (duk_harray *) obj;
-		DUK_ASSERT_HARRAY_VALID(a);
+		DUK_HARRAY_ASSERT_VALID(a);
 		arrlen_old_len = a->length;
 
 		DUK_ASSERT(idx_value >= 0);
 		arrlen_new_len = duk__to_new_array_length_checked(thr, DUK_GET_TVAL_POSIDX(thr, idx_value));
 		duk_push_u32(thr, arrlen_new_len);
-		duk_replace(thr, idx_value);  /* step 3.e: replace 'Desc.[[Value]]' */
+		duk_replace(thr, idx_value); /* step 3.e: replace 'Desc.[[Value]]' */
 
 		DUK_DDD(DUK_DDDPRINT("old_len=%ld, new_len=%ld", (long) arrlen_old_len, (long) arrlen_new_len));
 
@@ -59357,14 +63364,15 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 		duk_harray *a;
 
 		a = (duk_harray *) obj;
-		DUK_ASSERT_HARRAY_VALID(a);
+		DUK_HARRAY_ASSERT_VALID(a);
 
 		old_len = a->length;
 
 		if (arr_idx >= old_len) {
 			DUK_DDD(DUK_DDDPRINT("defineProperty requires array length update "
 			                     "(arr_idx=%ld, old_len=%ld)",
-			                     (long) arr_idx, (long) old_len));
+			                     (long) arr_idx,
+			                     (long) old_len));
 
 			if (DUK_HARRAY_LENGTH_NONWRITABLE(a) && !force_flag) {
 				/* Array .length is always non-configurable, so
@@ -59382,10 +63390,11 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 		} else {
 			DUK_DDD(DUK_DDDPRINT("defineProperty does not require length update "
 			                     "(arr_idx=%ld, old_len=%ld) -> standard behavior",
-			                     (long) arr_idx, (long) old_len));
+			                     (long) arr_idx,
+			                     (long) old_len));
 		}
 	}
- skip_array_exotic:
+skip_array_exotic:
 
 	/* XXX: There is currently no support for writing buffer object
 	 * indexed elements here.  Attempt to do so will succeed and
@@ -59437,7 +63446,7 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 			DUK_ASSERT(!has_value);
 			DUK_ASSERT(!has_writable);
 
-			new_flags = DUK_PROPDESC_FLAG_ACCESSOR;  /* defaults, E5 Section 8.6.1, Table 7 */
+			new_flags = DUK_PROPDESC_FLAG_ACCESSOR; /* defaults, E5 Section 8.6.1, Table 7 */
 			if (has_enumerable && is_enumerable) {
 				new_flags |= DUK_PROPDESC_FLAG_ENUMERABLE;
 			}
@@ -59447,7 +63456,7 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 
 			if (arr_idx != DUK__NO_ARRAY_INDEX && DUK_HOBJECT_HAS_ARRAY_PART(obj)) {
 				DUK_DDD(DUK_DDDPRINT("accessor cannot go to array part, abandon array"));
-				duk__abandon_array_checked(thr, obj);
+				duk__abandon_array_part(thr, obj);
 			}
 
 			/* write to entry part */
@@ -59470,7 +63479,7 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 			DUK_ASSERT(!has_set);
 			DUK_ASSERT(!has_get);
 
-			new_flags = 0;  /* defaults, E5 Section 8.6.1, Table 7 */
+			new_flags = 0; /* defaults, E5 Section 8.6.1, Table 7 */
 			if (has_writable && is_writable) {
 				new_flags |= DUK_PROPDESC_FLAG_WRITABLE;
 			}
@@ -59484,22 +63493,28 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 				duk_tval *tv_tmp = duk_require_tval(thr, idx_value);
 				DUK_TVAL_SET_TVAL(&tv, tv_tmp);
 			} else {
-				DUK_TVAL_SET_UNDEFINED(&tv);  /* default value */
+				DUK_TVAL_SET_UNDEFINED(&tv); /* default value */
 			}
 
 			if (arr_idx != DUK__NO_ARRAY_INDEX && DUK_HOBJECT_HAS_ARRAY_PART(obj)) {
 				if (new_flags == DUK_PROPDESC_FLAGS_WEC) {
-#if 0
-					DUK_DDD(DUK_DDDPRINT("new data property attributes match array defaults, attempt to write to array part"));
-					/* may become sparse...*/
-#endif
-					/* XXX: handling for array part missing now; this doesn't affect
-					 * compliance but causes array entry writes using defineProperty()
-					 * to always abandon array part.
-					 */
+					DUK_DDD(DUK_DDDPRINT(
+					    "new data property attributes match array defaults, attempt to write to array part"));
+					tv2 = duk__obtain_arridx_slot(thr, arr_idx, obj);
+					if (tv2 == NULL) {
+						DUK_DDD(DUK_DDDPRINT("failed writing to array part, abandoned array"));
+					} else {
+						DUK_DDD(DUK_DDDPRINT("success in writing to array part"));
+						DUK_ASSERT(DUK_HOBJECT_HAS_ARRAY_PART(obj));
+						DUK_ASSERT(DUK_TVAL_IS_UNUSED(tv2));
+						DUK_TVAL_SET_TVAL(tv2, &tv);
+						DUK_TVAL_INCREF(thr, tv2);
+						goto success_exotics;
+					}
+				} else {
+					DUK_DDD(DUK_DDDPRINT("new data property cannot go to array part, abandon array"));
+					duk__abandon_array_part(thr, obj);
 				}
-				DUK_DDD(DUK_DDDPRINT("new data property cannot go to array part, abandon array"));
-				duk__abandon_array_checked(thr, obj);
 				/* fall through */
 			}
 
@@ -59557,8 +63572,8 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 			goto need_check;
 		}
 
-		tmp1 = duk_require_tval(thr, -1);         /* curr value */
-		tmp2 = duk_require_tval(thr, idx_value);  /* new value */
+		tmp1 = duk_require_tval(thr, -1); /* curr value */
+		tmp2 = duk_require_tval(thr, idx_value); /* new value */
 		if (!duk_js_samevalue(tmp1, tmp2)) {
 			goto need_check;
 		}
@@ -59603,7 +63618,7 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 	 */
 	goto success_no_exotics;
 
- need_check:
+need_check:
 
 	/*
 	 *  Some change(s) need to be made.  Steps 7-11.
@@ -59675,9 +63690,10 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 
 			DUK_DDD(DUK_DDDPRINT("convert property to accessor property"));
 			if (curr.a_idx >= 0) {
-				DUK_DDD(DUK_DDDPRINT("property to convert is stored in an array entry, abandon array and re-lookup"));
-				duk__abandon_array_checked(thr, obj);
-				duk_pop_unsafe(thr);  /* remove old value */
+				DUK_DDD(
+				    DUK_DDDPRINT("property to convert is stored in an array entry, abandon array and re-lookup"));
+				duk__abandon_array_part(thr, obj);
+				duk_pop_unsafe(thr); /* remove old value */
 				rc = duk__get_own_propdesc_raw(thr, obj, key, arr_idx, &curr, DUK_GETDESC_FLAG_PUSH_VALUE);
 				DUK_UNREF(rc);
 				DUK_ASSERT(rc != 0);
@@ -59685,14 +63701,14 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 			}
 			if (curr.e_idx < 0) {
 				DUK_ASSERT(curr.a_idx < 0 && curr.e_idx < 0);
-				goto fail_virtual;  /* safeguard for virtual property */
+				goto fail_virtual; /* safeguard for virtual property */
 			}
 
 			DUK_ASSERT(curr.e_idx >= 0);
 			DUK_ASSERT(!DUK_HOBJECT_E_SLOT_IS_ACCESSOR(thr->heap, obj, curr.e_idx));
 
 			tv1 = DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, obj, curr.e_idx);
-			DUK_TVAL_SET_UNDEFINED_UPDREF_NORZ(thr, tv1);  /* XXX: just decref */
+			DUK_TVAL_SET_UNDEFINED_UPDREF_NORZ(thr, tv1); /* XXX: just decref */
 
 			DUK_HOBJECT_E_SET_VALUE_GETTER(thr->heap, obj, curr.e_idx, NULL);
 			DUK_HOBJECT_E_SET_VALUE_SETTER(thr->heap, obj, curr.e_idx, NULL);
@@ -59721,7 +63737,7 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 			/* curr is accessor -> cannot be in array part. */
 			DUK_ASSERT(curr.a_idx < 0);
 			if (curr.e_idx < 0) {
-				goto fail_virtual;  /* safeguard; no virtual accessors now */
+				goto fail_virtual; /* safeguard; no virtual accessors now */
 			}
 
 			DUK_DDD(DUK_DDDPRINT("convert property to data property"));
@@ -59753,8 +63769,8 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 				}
 				/* Note: changing from writable to non-writable is OK */
 				if (!(curr.flags & DUK_PROPDESC_FLAG_WRITABLE) && has_value) {
-					duk_tval *tmp1 = duk_require_tval(thr, -1);         /* curr value */
-					duk_tval *tmp2 = duk_require_tval(thr, idx_value);  /* new value */
+					duk_tval *tmp1 = duk_require_tval(thr, -1); /* curr value */
+					duk_tval *tmp2 = duk_require_tval(thr, idx_value); /* new value */
 					if (!duk_js_samevalue(tmp1, tmp2)) {
 						goto fail_not_configurable;
 					}
@@ -59803,8 +63819,7 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 
 	/* XXX: write protect after flag? -> any chance of handling it here? */
 
-	DUK_DDD(DUK_DDDPRINT("new flags that we want to write: 0x%02lx",
-	                     (unsigned long) new_flags));
+	DUK_DDD(DUK_DDDPRINT("new flags that we want to write: 0x%02lx", (unsigned long) new_flags));
 
 	/*
 	 *  Check whether we need to abandon an array part (if it exists)
@@ -59820,20 +63835,23 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 
 			DUK_DDD(DUK_DDDPRINT("array index, new property attributes match array defaults, update in-place"));
 
-			DUK_ASSERT(curr.flags == DUK_PROPDESC_FLAGS_WEC);  /* must have been, since in array part */
+			DUK_ASSERT(curr.flags == DUK_PROPDESC_FLAGS_WEC); /* must have been, since in array part */
 			DUK_ASSERT(!has_set);
 			DUK_ASSERT(!has_get);
-			DUK_ASSERT(idx_value >= 0);  /* must be: if attributes match and we get here the value must differ (otherwise no change) */
+			DUK_ASSERT(
+			    idx_value >=
+			    0); /* must be: if attributes match and we get here the value must differ (otherwise no change) */
 
 			tv2 = duk_require_tval(thr, idx_value);
 			tv1 = DUK_HOBJECT_A_GET_VALUE_PTR(thr->heap, obj, curr.a_idx);
-			DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2);  /* side effects; may invalidate a_idx */
+			DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2); /* side effects; may invalidate a_idx */
 			goto success_exotics;
 		}
 
-		DUK_DDD(DUK_DDDPRINT("array index, new property attributes do not match array defaults, abandon array and re-lookup"));
-		duk__abandon_array_checked(thr, obj);
-		duk_pop_unsafe(thr);  /* remove old value */
+		DUK_DDD(
+		    DUK_DDDPRINT("array index, new property attributes do not match array defaults, abandon array and re-lookup"));
+		duk__abandon_array_part(thr, obj);
+		duk_pop_unsafe(thr); /* remove old value */
 		rc = duk__get_own_propdesc_raw(thr, obj, key, arr_idx, &curr, DUK_GETDESC_FLAG_PUSH_VALUE);
 		DUK_UNREF(rc);
 		DUK_ASSERT(rc != 0);
@@ -59857,10 +63875,12 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 		if (key == DUK_HTHREAD_STRING_LENGTH(thr) && DUK_HOBJECT_HAS_EXOTIC_ARRAY(obj)) {
 			duk_harray *a;
 			a = (duk_harray *) obj;
-			DUK_DD(DUK_DDPRINT("Object.defineProperty() attribute update for duk_harray .length -> %02lx", (unsigned long) new_flags));
-			DUK_ASSERT_HARRAY_VALID(a);
+			DUK_DD(DUK_DDPRINT("Object.defineProperty() attribute update for duk_harray .length -> %02lx",
+			                   (unsigned long) new_flags));
+			DUK_HARRAY_ASSERT_VALID(a);
 			if ((new_flags & DUK_PROPDESC_FLAGS_EC) != (curr.flags & DUK_PROPDESC_FLAGS_EC)) {
-				DUK_D(DUK_DPRINT("Object.defineProperty() attempt to change virtual array .length enumerable or configurable attribute, fail"));
+				DUK_D(DUK_DPRINT("Object.defineProperty() attempt to change virtual array .length enumerable or "
+				                 "configurable attribute, fail"));
 				goto fail_virtual;
 			}
 			if (new_flags & DUK_PROPDESC_FLAG_WRITABLE) {
@@ -59888,7 +63908,7 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 		DUK_UNREF(tmp);
 		DUK_HOBJECT_E_SET_VALUE_SETTER(thr->heap, obj, curr.e_idx, set);
 		DUK_HOBJECT_INCREF_ALLOWNULL(thr, set);
-		DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp);  /* side effects; may invalidate e_idx */
+		DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp); /* side effects; may invalidate e_idx */
 	}
 	if (has_get) {
 		duk_hobject *tmp;
@@ -59904,7 +63924,7 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 		DUK_UNREF(tmp);
 		DUK_HOBJECT_E_SET_VALUE_GETTER(thr->heap, obj, curr.e_idx, get);
 		DUK_HOBJECT_INCREF_ALLOWNULL(thr, get);
-		DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp);  /* side effects; may invalidate e_idx */
+		DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp); /* side effects; may invalidate e_idx */
 	}
 	if (has_value) {
 		duk_tval *tv1, *tv2;
@@ -59915,9 +63935,9 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 			DUK_ASSERT(!DUK_HOBJECT_E_SLOT_IS_ACCESSOR(thr->heap, obj, curr.e_idx));
 			tv2 = duk_require_tval(thr, idx_value);
 			tv1 = DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, obj, curr.e_idx);
-			DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2);  /* side effects; may invalidate e_idx */
+			DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2); /* side effects; may invalidate e_idx */
 		} else {
-			DUK_ASSERT(curr.a_idx < 0);  /* array part case handled comprehensively previously */
+			DUK_ASSERT(curr.a_idx < 0); /* array part case handled comprehensively previously */
 
 			DUK_DD(DUK_DDPRINT("Object.defineProperty(), value update for virtual property"));
 			/* XXX: Uint8Array and other typed array virtual writes not currently
@@ -59926,11 +63946,12 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 			if (key == DUK_HTHREAD_STRING_LENGTH(thr) && DUK_HOBJECT_HAS_EXOTIC_ARRAY(obj)) {
 				duk_harray *a;
 				a = (duk_harray *) obj;
-				DUK_DD(DUK_DDPRINT("Object.defineProperty() value update for duk_harray .length -> %ld", (long) arrlen_new_len));
-				DUK_ASSERT_HARRAY_VALID(a);
+				DUK_DD(DUK_DDPRINT("Object.defineProperty() value update for duk_harray .length -> %ld",
+				                   (long) arrlen_new_len));
+				DUK_HARRAY_ASSERT_VALID(a);
 				a->length = arrlen_new_len;
 			} else {
-				goto fail_virtual;  /* should not happen */
+				goto fail_virtual; /* should not happen */
 			}
 		}
 	}
@@ -59947,7 +63968,7 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 	 *    - for 'length' key the element deletion and 'length' update occurs here
 	 */
 
- success_exotics:
+success_exotics:
 
 	/* curr.a_idx or curr.e_idx may have been invalidated by side effects
 	 * above.
@@ -59959,7 +63980,7 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 		duk_harray *a;
 
 		a = (duk_harray *) obj;
-		DUK_ASSERT_HARRAY_VALID(a);
+		DUK_HARRAY_ASSERT_VALID(a);
 
 		if (arridx_new_array_length > 0) {
 			/*
@@ -59991,7 +64012,8 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 			DUK_DDD(DUK_DDDPRINT("defineProperty successful, key is 'length', exotic array behavior, "
 			                     "doing array element deletion and length update"));
 
-			rc = duk__handle_put_array_length_smaller(thr, obj, arrlen_old_len, arrlen_new_len, force_flag, &result_len);
+			rc =
+			    duk__handle_put_array_length_smaller(thr, obj, arrlen_old_len, arrlen_new_len, force_flag, &result_len);
 
 			/* update length (curr points to length, and we assume it's still valid) */
 			DUK_ASSERT(result_len >= arrlen_new_len && result_len <= arrlen_old_len);
@@ -60014,7 +64036,7 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 		duk_hobject *varenv;
 
 		DUK_ASSERT(arridx_new_array_length == 0);
-		DUK_ASSERT(!DUK_HOBJECT_HAS_EXOTIC_ARRAY(obj));  /* traits are separate; in particular, arguments not an array */
+		DUK_ASSERT(!DUK_HOBJECT_HAS_EXOTIC_ARRAY(obj)); /* traits are separate; in particular, arguments not an array */
 
 		map = NULL;
 		varenv = NULL;
@@ -60031,7 +64053,7 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 			DUK_DDD(DUK_DDDPRINT("defineProperty successful, key mapped to arguments 'map' "
 			                     "changed to an accessor, delete arguments binding"));
 
-			(void) duk_hobject_delprop_raw(thr, map, key, 0);  /* ignore result */
+			(void) duk_hobject_delprop_raw(thr, map, key, 0); /* ignore result */
 		} else {
 			/* Note: this order matters (final value before deleting map entry must be done) */
 			DUK_DDD(DUK_DDDPRINT("defineProperty successful, key mapped to arguments 'map', "
@@ -60059,7 +64081,7 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 				DUK_DDD(DUK_DDDPRINT("defineProperty successful, key mapped to arguments 'map', "
 				                     "changed to non-writable, delete arguments binding"));
 
-				(void) duk_hobject_delprop_raw(thr, map, key, 0);  /* ignore result */
+				(void) duk_hobject_delprop_raw(thr, map, key, 0); /* ignore result */
 			}
 		}
 
@@ -60068,22 +64090,22 @@ duk_bool_t duk_hobject_define_property_helper(duk_hthread *thr,
 		 */
 	}
 
- success_no_exotics:
+success_no_exotics:
 	/* Some code paths use NORZ macros for simplicity, ensure refzero
 	 * handling is completed.
 	 */
 	DUK_REFZERO_CHECK_SLOW(thr);
 	return 1;
 
- fail_not_extensible:
+fail_not_extensible:
 	if (throw_flag) {
 		DUK_ERROR_TYPE(thr, DUK_STR_NOT_EXTENSIBLE);
 		DUK_WO_NORETURN(return 0;);
 	}
 	return 0;
 
- fail_virtual:  /* just use the same "not configurable" error message" */
- fail_not_configurable:
+fail_virtual: /* just use the same "not configurable" error message" */
+fail_not_configurable:
 	if (throw_flag) {
 		DUK_ERROR_TYPE(thr, DUK_STR_NOT_CONFIGURABLE);
 		DUK_WO_NORETURN(return 0;);
@@ -60108,7 +64130,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_object_ownprop_helper(duk_hthread *thr, duk_
 	h_obj = duk_push_this_coercible_to_object(thr);
 	DUK_ASSERT(h_obj != NULL);
 
-	ret = duk_hobject_get_own_propdesc(thr, h_obj, h_v, &desc, 0 /*flags*/);  /* don't push value */
+	ret = duk_hobject_get_own_propdesc(thr, h_obj, h_v, &desc, 0 /*flags*/); /* don't push value */
 
 	duk_push_boolean(thr, ret && ((desc.flags & required_desc_flags) == required_desc_flags));
 	return 1;
@@ -60153,13 +64175,13 @@ DUK_INTERNAL void duk_hobject_object_seal_freeze_helper(duk_hthread *thr, duk_ho
 	 *  for the same object; not likely).
 	 */
 
-	duk__abandon_array_checked(thr, obj);
+	duk__abandon_array_part(thr, obj);
 	DUK_ASSERT(DUK_HOBJECT_GET_ASIZE(obj) == 0);
 
 	for (i = 0; i < DUK_HOBJECT_GET_ENEXT(obj); i++) {
 		duk_uint8_t *fp;
 
-		/* since duk__abandon_array_checked() causes a resize, there should be no gaps in keys */
+		/* since duk__abandon_array_part() causes a resize, there should be no gaps in keys */
 		DUK_ASSERT(DUK_HOBJECT_E_GET_KEY(thr->heap, obj, i) != NULL);
 
 		/* avoid multiple computations of flags address; bypasses macros */
@@ -60173,7 +64195,7 @@ DUK_INTERNAL void duk_hobject_object_seal_freeze_helper(duk_hthread *thr, duk_ho
 
 	DUK_HOBJECT_CLEAR_EXTENSIBLE(obj);
 
-	/* no need to compact since we already did that in duk__abandon_array_checked()
+	/* no need to compact since we already did that in duk__abandon_array_part()
 	 * (regardless of whether an array part existed or not.
 	 */
 
@@ -60222,9 +64244,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_object_is_sealed_frozen_helper(duk_hthread *
 		if (flags & DUK_PROPDESC_FLAG_CONFIGURABLE) {
 			return 0;
 		}
-		if (is_frozen &&
-		    !(flags & DUK_PROPDESC_FLAG_ACCESSOR) &&
-		    (flags & DUK_PROPDESC_FLAG_WRITABLE)) {
+		if (is_frozen && !(flags & DUK_PROPDESC_FLAG_ACCESSOR) && (flags & DUK_PROPDESC_FLAG_WRITABLE)) {
 			return 0;
 		}
 	}
@@ -60256,6 +64276,19 @@ DUK_INTERNAL duk_bool_t duk_hobject_object_is_sealed_frozen_helper(duk_hthread *
 #undef DUK__VALSTACK_PROXY_LOOKUP
 #undef DUK__VALSTACK_SPACE
 /*
+ *  duk_hstring assertion helpers.
+ */
+
+/* #include duk_internal.h -> already included */
+
+#if defined(DUK_USE_ASSERTIONS)
+
+DUK_INTERNAL void duk_hstring_assert_valid(duk_hstring *h) {
+	DUK_ASSERT(h != NULL);
+}
+
+#endif /* DUK_USE_ASSERTIONS */
+/*
  *  Misc support functions
  */
 
@@ -60265,7 +64298,10 @@ DUK_INTERNAL duk_bool_t duk_hobject_object_is_sealed_frozen_helper(duk_hthread *
  *  duk_hstring charCodeAt, with and without surrogate awareness
  */
 
-DUK_INTERNAL duk_ucodepoint_t duk_hstring_char_code_at_raw(duk_hthread *thr, duk_hstring *h, duk_uint_t pos, duk_bool_t surrogate_aware) {
+DUK_INTERNAL duk_ucodepoint_t duk_hstring_char_code_at_raw(duk_hthread *thr,
+                                                           duk_hstring *h,
+                                                           duk_uint_t pos,
+                                                           duk_bool_t surrogate_aware) {
 	duk_uint32_t boff;
 	const duk_uint8_t *p, *p_start, *p_end;
 	duk_ucodepoint_t cp1;
@@ -60274,21 +64310,18 @@ DUK_INTERNAL duk_ucodepoint_t duk_hstring_char_code_at_raw(duk_hthread *thr, duk
 	/* Caller must check character offset to be inside the string. */
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(h != NULL);
-	DUK_ASSERT_DISABLE(pos >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(pos >= 0); /* unsigned */
 	DUK_ASSERT(pos < (duk_uint_t) DUK_HSTRING_GET_CHARLEN(h));
 
 	boff = (duk_uint32_t) duk_heap_strcache_offset_char2byte(thr, h, (duk_uint32_t) pos);
-	DUK_DDD(DUK_DDDPRINT("charCodeAt: pos=%ld -> boff=%ld, str=%!O",
-	                     (long) pos, (long) boff, (duk_heaphdr *) h));
+	DUK_DDD(DUK_DDDPRINT("charCodeAt: pos=%ld -> boff=%ld, str=%!O", (long) pos, (long) boff, (duk_heaphdr *) h));
 	DUK_ASSERT_DISABLE(boff >= 0);
 	DUK_ASSERT(boff < DUK_HSTRING_GET_BYTELEN(h));
 
 	p_start = DUK_HSTRING_GET_DATA(h);
 	p_end = p_start + DUK_HSTRING_GET_BYTELEN(h);
 	p = p_start + boff;
-	DUK_DDD(DUK_DDDPRINT("p_start=%p, p_end=%p, p=%p",
-	                     (const void *) p_start, (const void *) p_end,
-	                     (const void *) p));
+	DUK_DDD(DUK_DDDPRINT("p_start=%p, p_end=%p, p=%p", (const void *) p_start, (const void *) p_end, (const void *) p));
 
 	/* For invalid UTF-8 (never happens for standard ECMAScript strings)
 	 * return U+FFFD replacement character.
@@ -60299,7 +64332,7 @@ DUK_INTERNAL duk_ucodepoint_t duk_hstring_char_code_at_raw(duk_hthread *thr, duk
 			 * decoded at the end of the string and 'p' is no longer
 			 * within string memory range.
 			 */
-			cp2 = 0;  /* If call fails, this is left untouched and won't match cp2 check. */
+			cp2 = 0; /* If call fails, this is left untouched and won't match cp2 check. */
 			(void) duk_unicode_decode_xutf8(thr, &p, p_start, p_end, &cp2);
 			if (cp2 >= 0xdc00UL && cp2 <= 0xdfffUL) {
 				cp1 = (duk_ucodepoint_t) (((cp1 - 0xd800UL) << 10) + (cp2 - 0xdc00UL) + 0x10000UL);
@@ -60329,7 +64362,7 @@ DUK_INTERNAL void duk_hstring_init_charlen(duk_hstring *h) {
 
 	clen = duk_unicode_unvalidated_utf8_length(DUK_HSTRING_GET_DATA(h), DUK_HSTRING_GET_BYTELEN(h));
 #if defined(DUK_USE_STRLEN16)
-	DUK_ASSERT(clen <= 0xffffUL);  /* Bytelength checked during interning. */
+	DUK_ASSERT(clen <= 0xffffUL); /* Bytelength checked during interning. */
 	h->clen16 = (duk_uint16_t) clen;
 #else
 	h->clen = (duk_uint32_t) clen;
@@ -60346,7 +64379,7 @@ DUK_INTERNAL DUK_HOT duk_size_t duk_hstring_get_charlen(duk_hstring *h) {
 	return h->clen;
 #endif
 }
-#endif  /* !DUK_USE_HSTRING_LAZY_CLEN */
+#endif /* !DUK_USE_HSTRING_LAZY_CLEN */
 
 /*
  *  duk_hstring charlen, when lazy charlen enabled
@@ -60357,7 +64390,7 @@ DUK_INTERNAL DUK_HOT duk_size_t duk_hstring_get_charlen(duk_hstring *h) {
 DUK_LOCAL DUK_COLD duk_size_t duk__hstring_get_charlen_slowpath(duk_hstring *h) {
 	duk_size_t res;
 
-	DUK_ASSERT(h->clen == 0);  /* Checked by caller. */
+	DUK_ASSERT(h->clen == 0); /* Checked by caller. */
 
 #if defined(DUK_USE_ROM_STRINGS)
 	/* ROM strings have precomputed clen, but if the computed clen is zero
@@ -60370,7 +64403,7 @@ DUK_LOCAL DUK_COLD duk_size_t duk__hstring_get_charlen_slowpath(duk_hstring *h)
 
 	res = duk_unicode_unvalidated_utf8_length(DUK_HSTRING_GET_DATA(h), DUK_HSTRING_GET_BYTELEN(h));
 #if defined(DUK_USE_STRLEN16)
-	DUK_ASSERT(res <= 0xffffUL);  /* Bytelength checked during interning. */
+	DUK_ASSERT(res <= 0xffffUL); /* Bytelength checked during interning. */
 	h->clen16 = (duk_uint16_t) res;
 #else
 	h->clen = (duk_uint32_t) res;
@@ -60380,7 +64413,7 @@ DUK_LOCAL DUK_COLD duk_size_t duk__hstring_get_charlen_slowpath(duk_hstring *h)
 	}
 	return res;
 }
-#else  /* DUK_USE_HSTRING_CLEN */
+#else /* DUK_USE_HSTRING_CLEN */
 DUK_LOCAL duk_size_t duk__hstring_get_charlen_slowpath(duk_hstring *h) {
 	if (DUK_LIKELY(DUK_HSTRING_HAS_ASCII(h))) {
 		/* Most practical strings will go here. */
@@ -60409,7 +64442,7 @@ DUK_LOCAL duk_size_t duk__hstring_get_charlen_slowpath(duk_hstring *h) {
 		return res;
 	}
 }
-#endif  /* DUK_USE_HSTRING_CLEN */
+#endif /* DUK_USE_HSTRING_CLEN */
 
 #if defined(DUK_USE_HSTRING_CLEN)
 DUK_INTERNAL DUK_HOT duk_size_t duk_hstring_get_charlen(duk_hstring *h) {
@@ -60424,13 +64457,13 @@ DUK_INTERNAL DUK_HOT duk_size_t duk_hstring_get_charlen(duk_hstring *h) {
 #endif
 	return duk__hstring_get_charlen_slowpath(h);
 }
-#else  /* DUK_USE_HSTRING_CLEN */
+#else /* DUK_USE_HSTRING_CLEN */
 DUK_INTERNAL DUK_HOT duk_size_t duk_hstring_get_charlen(duk_hstring *h) {
 	/* Always use slow path. */
 	return duk__hstring_get_charlen_slowpath(h);
 }
-#endif  /* DUK_USE_HSTRING_CLEN */
-#endif  /* DUK_USE_HSTRING_LAZY_CLEN */
+#endif /* DUK_USE_HSTRING_CLEN */
+#endif /* DUK_USE_HSTRING_LAZY_CLEN */
 
 /*
  *  Compare duk_hstring to an ASCII cstring.
@@ -60495,7 +64528,7 @@ DUK_INTERNAL duk_bool_t duk_hthread_init_stacks(duk_heap *heap, duk_hthread *thr
 
 	return 1;
 
- fail:
+fail:
 	DUK_FREE(heap, thr->valstack);
 	DUK_ASSERT(thr->callstack_curr == NULL);
 
@@ -60522,21 +64555,21 @@ DUK_INTERNAL void *duk_hthread_get_valstack_ptr(duk_heap *heap, void *ud) {
  *  Encoding constants, must match genbuiltins.py
  */
 
-#define DUK__PROP_FLAGS_BITS             3
-#define DUK__LENGTH_PROP_BITS            3
-#define DUK__NARGS_BITS                  3
-#define DUK__PROP_TYPE_BITS              3
+#define DUK__PROP_FLAGS_BITS  3
+#define DUK__LENGTH_PROP_BITS 3
+#define DUK__NARGS_BITS       3
+#define DUK__PROP_TYPE_BITS   3
 
-#define DUK__NARGS_VARARGS_MARKER        0x07
+#define DUK__NARGS_VARARGS_MARKER 0x07
 
-#define DUK__PROP_TYPE_DOUBLE            0
-#define DUK__PROP_TYPE_STRING            1
-#define DUK__PROP_TYPE_STRIDX            2
-#define DUK__PROP_TYPE_BUILTIN           3
-#define DUK__PROP_TYPE_UNDEFINED         4
-#define DUK__PROP_TYPE_BOOLEAN_TRUE      5
-#define DUK__PROP_TYPE_BOOLEAN_FALSE     6
-#define DUK__PROP_TYPE_ACCESSOR          7
+#define DUK__PROP_TYPE_DOUBLE        0
+#define DUK__PROP_TYPE_STRING        1
+#define DUK__PROP_TYPE_STRIDX        2
+#define DUK__PROP_TYPE_BUILTIN       3
+#define DUK__PROP_TYPE_UNDEFINED     4
+#define DUK__PROP_TYPE_BOOLEAN_TRUE  5
+#define DUK__PROP_TYPE_BOOLEAN_FALSE 6
+#define DUK__PROP_TYPE_ACCESSOR      7
 
 /*
  *  Create built-in objects by parsing an init bitstream generated
@@ -60559,9 +64592,8 @@ DUK_LOCAL void duk__duplicate_ram_global_object(duk_hthread *thr) {
 #if defined(DUK_USE_ROM_GLOBAL_INHERIT)
 	/* Inherit from ROM-based global object: less RAM usage, less transparent. */
 	h_global = duk_push_object_helper(thr,
-	                                  DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                                  DUK_HOBJECT_FLAG_FASTREFS |
-	                                  DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_GLOBAL),
+	                                  DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS |
+	                                      DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_GLOBAL),
 	                                  DUK_BIDX_GLOBAL);
 	DUK_ASSERT(h_global != NULL);
 #elif defined(DUK_USE_ROM_GLOBAL_CLONE)
@@ -60570,9 +64602,8 @@ DUK_LOCAL void duk__duplicate_ram_global_object(duk_hthread *thr) {
 	 * model but more compliant.
 	 */
 	h_global = duk_push_object_helper(thr,
-	                                  DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                                  DUK_HOBJECT_FLAG_FASTREFS |
-	                                  DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_GLOBAL),
+	                                  DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS |
+	                                      DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_GLOBAL),
 	                                  DUK_BIDX_OBJECT_PROTOTYPE);
 	DUK_ASSERT(h_global != NULL);
 	h_oldglobal = thr->builtins[DUK_BIDX_GLOBAL];
@@ -60606,7 +64637,8 @@ DUK_LOCAL void duk__duplicate_ram_global_object(duk_hthread *thr) {
 
 	duk_hobject_compact_props(thr, h_global);
 	DUK_ASSERT(thr->builtins[DUK_BIDX_GLOBAL] != NULL);
-	DUK_ASSERT(!DUK_HEAPHDR_NEEDS_REFCOUNT_UPDATE((duk_heaphdr *) thr->builtins[DUK_BIDX_GLOBAL]));  /* no need to decref: ROM object */
+	DUK_ASSERT(
+	    !DUK_HEAPHDR_NEEDS_REFCOUNT_UPDATE((duk_heaphdr *) thr->builtins[DUK_BIDX_GLOBAL])); /* no need to decref: ROM object */
 	thr->builtins[DUK_BIDX_GLOBAL] = h_global;
 	DUK_HOBJECT_INCREF(thr, h_global);
 	DUK_D(DUK_DPRINT("duplicated global object: %!O", h_global));
@@ -60615,9 +64647,9 @@ DUK_LOCAL void duk__duplicate_ram_global_object(duk_hthread *thr) {
 	 * needed so that the global scope points to the newly created RAM-based
 	 * global object.
 	 */
-	h_objenv = (duk_hobject *) duk_hobjenv_alloc(thr,
-	                                             DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                                             DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJENV));
+	h_objenv =
+	    (duk_hobject *) duk_hobjenv_alloc(thr,
+	                                      DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJENV));
 	DUK_ASSERT(h_objenv != NULL);
 	DUK_ASSERT(DUK_HOBJECT_GET_PROTOTYPE(thr->heap, h_objenv) == NULL);
 	duk_push_hobject(thr, h_objenv);
@@ -60628,16 +64660,17 @@ DUK_LOCAL void duk__duplicate_ram_global_object(duk_hthread *thr) {
 	DUK_ASSERT(((duk_hobjenv *) h_objenv)->has_this == 0);
 
 	DUK_ASSERT(thr->builtins[DUK_BIDX_GLOBAL_ENV] != NULL);
-	DUK_ASSERT(!DUK_HEAPHDR_NEEDS_REFCOUNT_UPDATE((duk_heaphdr *) thr->builtins[DUK_BIDX_GLOBAL_ENV]));  /* no need to decref: ROM object */
+	DUK_ASSERT(!DUK_HEAPHDR_NEEDS_REFCOUNT_UPDATE(
+	    (duk_heaphdr *) thr->builtins[DUK_BIDX_GLOBAL_ENV])); /* no need to decref: ROM object */
 	thr->builtins[DUK_BIDX_GLOBAL_ENV] = h_objenv;
 	DUK_HOBJECT_INCREF(thr, h_objenv);
 	DUK_D(DUK_DPRINT("duplicated global env: %!O", h_objenv));
 
-	DUK_ASSERT_HOBJENV_VALID((duk_hobjenv *) h_objenv);
+	DUK_HOBJENV_ASSERT_VALID((duk_hobjenv *) h_objenv);
 
-	duk_pop_2(thr);  /* Pop global object and global env. */
+	duk_pop_2(thr); /* Pop global object and global env. */
 }
-#endif  /* DUK_USE_ROM_GLOBAL_CLONE || DUK_USE_ROM_GLOBAL_INHERIT */
+#endif /* DUK_USE_ROM_GLOBAL_CLONE || DUK_USE_ROM_GLOBAL_INHERIT */
 
 DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 	/* Setup builtins from ROM objects.  All heaps/threads will share
@@ -60661,12 +64694,12 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 	duk__duplicate_ram_global_object(thr);
 #endif
 }
-#else  /* DUK_USE_ROM_OBJECTS */
+#else /* DUK_USE_ROM_OBJECTS */
 DUK_LOCAL void duk__push_stridx(duk_hthread *thr, duk_bitdecoder_ctx *bd) {
 	duk_small_uint_t n;
 
 	n = (duk_small_uint_t) duk_bd_decode_varuint(bd);
-	DUK_ASSERT_DISABLE(n >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(n >= 0); /* unsigned */
 	DUK_ASSERT(n < DUK_HEAP_NUM_STRINGS);
 	duk_push_hstring_stridx(thr, n);
 }
@@ -60703,16 +64736,18 @@ DUK_LOCAL void duk__push_double(duk_hthread *thr, duk_bitdecoder_ctx *bd) {
 		du.uc[i] = (duk_uint8_t) duk_bd_decode(bd, 8);
 	}
 
-	duk_push_number(thr, du.d);  /* push operation normalizes NaNs */
+	duk_push_number(thr, du.d); /* push operation normalizes NaNs */
 }
 
 DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 	duk_bitdecoder_ctx bd_ctx;
-	duk_bitdecoder_ctx *bd = &bd_ctx;  /* convenience */
+	duk_bitdecoder_ctx *bd = &bd_ctx; /* convenience */
 	duk_hobject *h;
 	duk_small_uint_t i, j;
 
-	DUK_D(DUK_DPRINT("INITBUILTINS BEGIN: DUK_NUM_BUILTINS=%d, DUK_NUM_BUILTINS_ALL=%d", (int) DUK_NUM_BUILTINS, (int) DUK_NUM_ALL_BUILTINS));
+	DUK_D(DUK_DPRINT("INITBUILTINS BEGIN: DUK_NUM_BUILTINS=%d, DUK_NUM_BUILTINS_ALL=%d",
+	                 (int) DUK_NUM_BUILTINS,
+	                 (int) DUK_NUM_ALL_BUILTINS));
 
 	duk_memzero(&bd_ctx, sizeof(bd_ctx));
 	bd->data = (const duk_uint8_t *) duk_builtins_data;
@@ -60739,14 +64774,14 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 	DUK_ASSERT_TOP(thr, 0);
 	for (i = 0; i < DUK_NUM_ALL_BUILTINS; i++) {
 		duk_small_uint_t class_num;
-		duk_small_int_t len = -1;  /* must be signed */
+		duk_small_int_t len = -1; /* must be signed */
 
 		class_num = (duk_small_uint_t) duk_bd_decode_varuint(bd);
 		len = (duk_small_int_t) duk_bd_decode_flagged_signed(bd, DUK__LENGTH_PROP_BITS, (duk_int32_t) -1 /*def_value*/);
 
 		if (class_num == DUK_HOBJECT_CLASS_FUNCTION) {
 			duk_small_uint_t natidx;
-			duk_small_int_t c_nargs;  /* must hold DUK_VARARGS */
+			duk_small_int_t c_nargs; /* must hold DUK_VARARGS */
 			duk_c_function c_func;
 			duk_int16_t magic;
 
@@ -60777,12 +64812,9 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 
 			duk__push_stridx_or_string(thr, bd);
 #if defined(DUK_USE_FUNC_NAME_PROPERTY)
-			duk_xdef_prop_stridx_short(thr,
-			                           -2,
-			                           DUK_STRIDX_NAME,
-			                           DUK_PROPDESC_FLAGS_C);
+			duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_NAME, DUK_PROPDESC_FLAGS_C);
 #else
-			duk_pop(thr);  /* Not very ideal but good enough for now. */
+			duk_pop(thr); /* Not very ideal but good enough for now. */
 #endif
 
 			/* Almost all global level Function objects are constructable
@@ -60808,8 +64840,7 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 			DUK_ASSERT(DUK_BIDX_GLOBAL_ENV > DUK_BIDX_GLOBAL);
 
 			env = duk_hobjenv_alloc(thr,
-	                                        DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                                        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJENV));
+			                        DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJENV));
 			DUK_ASSERT(env->target == NULL);
 			duk_push_hobject(thr, (duk_hobject *) env);
 
@@ -60819,15 +64850,13 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 			DUK_HOBJECT_INCREF(thr, global);
 			DUK_ASSERT(env->has_this == 0);
 
-			DUK_ASSERT_HOBJENV_VALID(env);
+			DUK_HOBJENV_ASSERT_VALID(env);
 		} else {
 			DUK_ASSERT(class_num != DUK_HOBJECT_CLASS_DECENV);
 
 			(void) duk_push_object_helper(thr,
-			                              DUK_HOBJECT_FLAG_FASTREFS |
-			                              DUK_HOBJECT_FLAG_EXTENSIBLE,
-			                              -1);  /* no prototype or class yet */
-
+			                              DUK_HOBJECT_FLAG_FASTREFS | DUK_HOBJECT_FLAG_EXTENSIBLE,
+			                              -1); /* no prototype or class yet */
 		}
 
 		h = duk_known_hobject(thr, -1);
@@ -60849,18 +64878,15 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 			 * not encoded explicitly in init data.
 			 */
 
-			DUK_ASSERT(class_num != DUK_HOBJECT_CLASS_ARRAY);  /* .length is virtual */
+			DUK_ASSERT(class_num != DUK_HOBJECT_CLASS_ARRAY); /* .length is virtual */
 			duk_push_int(thr, len);
-			duk_xdef_prop_stridx_short(thr,
-			                           -2,
-			                           DUK_STRIDX_LENGTH,
-			                           DUK_PROPDESC_FLAGS_C);
+			duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_LENGTH, DUK_PROPDESC_FLAGS_C);
 		}
 
 		/* enable exotic behaviors last */
 
 		if (class_num == DUK_HOBJECT_CLASS_ARRAY) {
-			DUK_ASSERT(DUK_HOBJECT_HAS_EXOTIC_ARRAY(h));  /* set by duk_push_array() */
+			DUK_ASSERT(DUK_HOBJECT_HAS_EXOTIC_ARRAY(h)); /* set by duk_push_array() */
 		}
 		if (class_num == DUK_HOBJECT_CLASS_STRING) {
 			DUK_HOBJECT_SET_EXOTIC_STRINGOBJ(h);
@@ -60874,9 +64900,10 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 		DUK_ASSERT(!DUK_HOBJECT_HAS_COMPFUNC(h));
 		/* DUK_HOBJECT_FLAG_NATFUNC varies */
 		DUK_ASSERT(!DUK_HOBJECT_IS_THREAD(h));
+		DUK_ASSERT(!DUK_HOBJECT_IS_PROXY(h));
 		DUK_ASSERT(!DUK_HOBJECT_HAS_ARRAY_PART(h) || class_num == DUK_HOBJECT_CLASS_ARRAY);
 		/* DUK_HOBJECT_FLAG_STRICT varies */
-		DUK_ASSERT(!DUK_HOBJECT_HAS_NATFUNC(h) ||  /* all native functions have NEWENV */
+		DUK_ASSERT(!DUK_HOBJECT_HAS_NATFUNC(h) || /* all native functions have NEWENV */
 		           DUK_HOBJECT_HAS_NEWENV(h));
 		DUK_ASSERT(!DUK_HOBJECT_HAS_NAMEBINDING(h));
 		DUK_ASSERT(!DUK_HOBJECT_HAS_CREATEARGS(h));
@@ -60959,11 +64986,9 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 			defprop_flags = (duk_small_uint_t) duk_bd_decode_flagged(bd,
 			                                                         DUK__PROP_FLAGS_BITS,
 			                                                         (duk_uint32_t) DUK_PROPDESC_FLAGS_WC);
-			defprop_flags |= DUK_DEFPROP_FORCE |
-			                 DUK_DEFPROP_HAVE_VALUE |
-			                 DUK_DEFPROP_HAVE_WRITABLE |
+			defprop_flags |= DUK_DEFPROP_FORCE | DUK_DEFPROP_HAVE_VALUE | DUK_DEFPROP_HAVE_WRITABLE |
 			                 DUK_DEFPROP_HAVE_ENUMERABLE |
-			                 DUK_DEFPROP_HAVE_CONFIGURABLE;  /* Defaults for data properties. */
+			                 DUK_DEFPROP_HAVE_CONFIGURABLE; /* Defaults for data properties. */
 
 			/* The writable, enumerable, configurable flags in prop_flags
 			 * match both duk_def_prop() and internal property flags.
@@ -60975,7 +65000,11 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 			t = (duk_small_uint_t) duk_bd_decode(bd, DUK__PROP_TYPE_BITS);
 
 			DUK_DDD(DUK_DDDPRINT("built-in %ld, normal-valued property %ld, key %!T, flags 0x%02lx, type %ld",
-			                     (long) i, (long) j, duk_get_tval(thr, -1), (unsigned long) defprop_flags, (long) t));
+			                     (long) i,
+			                     (long) j,
+			                     duk_get_tval(thr, -1),
+			                     (unsigned long) defprop_flags,
+			                     (long) t));
 
 			switch (t) {
 			case DUK__PROP_TYPE_DOUBLE: {
@@ -61016,24 +65045,29 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 				duk_c_function c_func_getter;
 				duk_c_function c_func_setter;
 
-				DUK_DDD(DUK_DDDPRINT("built-in accessor property: objidx=%ld, key=%!T, getteridx=%ld, setteridx=%ld, flags=0x%04lx",
-				                     (long) i, duk_get_tval(thr, -1), (long) natidx_getter, (long) natidx_setter, (unsigned long) defprop_flags));
+				DUK_DDD(DUK_DDDPRINT(
+				    "built-in accessor property: objidx=%ld, key=%!T, getteridx=%ld, setteridx=%ld, flags=0x%04lx",
+				    (long) i,
+				    duk_get_tval(thr, -1),
+				    (long) natidx_getter,
+				    (long) natidx_setter,
+				    (unsigned long) defprop_flags));
 
 				c_func_getter = duk_bi_native_functions[natidx_getter];
 				if (c_func_getter != NULL) {
-					duk_push_c_function_builtin_noconstruct(thr, c_func_getter, 0);  /* always 0 args */
+					duk_push_c_function_builtin_noconstruct(thr, c_func_getter, 0); /* always 0 args */
 					duk_set_magic(thr, -1, (duk_int_t) accessor_magic);
 					defprop_flags |= DUK_DEFPROP_HAVE_GETTER;
 				}
 				c_func_setter = duk_bi_native_functions[natidx_setter];
 				if (c_func_setter != NULL) {
-					duk_push_c_function_builtin_noconstruct(thr, c_func_setter, 1);  /* always 1 arg */
+					duk_push_c_function_builtin_noconstruct(thr, c_func_setter, 1); /* always 1 arg */
 					duk_set_magic(thr, -1, (duk_int_t) accessor_magic);
 					defprop_flags |= DUK_DEFPROP_HAVE_SETTER;
 				}
 
 				/* Writable flag doesn't make sense for an accessor. */
-				DUK_ASSERT((defprop_flags & DUK_PROPDESC_FLAG_WRITABLE) == 0);  /* genbuiltins.py ensures */
+				DUK_ASSERT((defprop_flags & DUK_PROPDESC_FLAG_WRITABLE) == 0); /* genbuiltins.py ensures */
 
 				defprop_flags &= ~(DUK_DEFPROP_HAVE_VALUE | DUK_DEFPROP_HAVE_WRITABLE);
 				defprop_flags |= DUK_DEFPROP_HAVE_ENUMERABLE | DUK_DEFPROP_HAVE_CONFIGURABLE;
@@ -61055,7 +65089,7 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 		for (j = 0; j < num; j++) {
 			duk_hstring *h_key;
 			duk_small_uint_t natidx;
-			duk_int_t c_nargs;  /* must hold DUK_VARARGS */
+			duk_int_t c_nargs; /* must hold DUK_VARARGS */
 			duk_small_uint_t c_length;
 			duk_int16_t magic;
 			duk_c_function c_func;
@@ -61078,51 +65112,66 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 
 			c_func = duk_bi_native_functions[natidx];
 
-			DUK_DDD(DUK_DDDPRINT("built-in %ld, function-valued property %ld, key %!O, natidx %ld, length %ld, nargs %ld",
-			                     (long) i, (long) j, (duk_heaphdr *) h_key, (long) natidx, (long) c_length,
-			                     (c_nargs == DUK_VARARGS ? (long) -1 : (long) c_nargs)));
+			DUK_DDD(
+			    DUK_DDDPRINT("built-in %ld, function-valued property %ld, key %!O, natidx %ld, length %ld, nargs %ld",
+			                 (long) i,
+			                 (long) j,
+			                 (duk_heaphdr *) h_key,
+			                 (long) natidx,
+			                 (long) c_length,
+			                 (c_nargs == DUK_VARARGS ? (long) -1 : (long) c_nargs)));
 
 			/* Cast converts magic to 16-bit signed value */
 			magic = (duk_int16_t) duk_bd_decode_varuint(bd);
 
 #if defined(DUK_USE_LIGHTFUNC_BUILTINS)
 			lightfunc_eligible =
-				((c_nargs >= DUK_LFUNC_NARGS_MIN && c_nargs <= DUK_LFUNC_NARGS_MAX) || (c_nargs == DUK_VARARGS)) &&
-				(c_length <= DUK_LFUNC_LENGTH_MAX) &&
-				(magic >= DUK_LFUNC_MAGIC_MIN && magic <= DUK_LFUNC_MAGIC_MAX);
+			    ((c_nargs >= DUK_LFUNC_NARGS_MIN && c_nargs <= DUK_LFUNC_NARGS_MAX) || (c_nargs == DUK_VARARGS)) &&
+			    (c_length <= DUK_LFUNC_LENGTH_MAX) && (magic >= DUK_LFUNC_MAGIC_MIN && magic <= DUK_LFUNC_MAGIC_MAX);
 
 			/* These functions have trouble working as lightfuncs.
 			 * Some of them have specific asserts and some may have
-		         * additional properties (e.g. 'require.id' may be written).
+			 * additional properties (e.g. 'require.id' may be written).
 			 */
 			if (c_func == duk_bi_global_object_eval) {
 				lightfunc_eligible = 0;
 			}
 #if defined(DUK_USE_COROUTINE_SUPPORT)
-			if (c_func == duk_bi_thread_yield ||
-			    c_func == duk_bi_thread_resume) {
+			if (c_func == duk_bi_thread_yield || c_func == duk_bi_thread_resume) {
 				lightfunc_eligible = 0;
 			}
 #endif
-			if (c_func == duk_bi_function_prototype_call ||
-			    c_func == duk_bi_function_prototype_apply ||
-			    c_func == duk_bi_reflect_apply ||
-			    c_func == duk_bi_reflect_construct) {
+			if (c_func == duk_bi_function_prototype_call || c_func == duk_bi_function_prototype_apply ||
+			    c_func == duk_bi_reflect_apply || c_func == duk_bi_reflect_construct) {
 				lightfunc_eligible = 0;
 			}
 
 			if (lightfunc_eligible) {
 				duk_tval tv_lfunc;
-				duk_small_uint_t lf_nargs = (duk_small_uint_t) (c_nargs == DUK_VARARGS ? DUK_LFUNC_NARGS_VARARGS : c_nargs);
+				duk_small_uint_t lf_nargs =
+				    (duk_small_uint_t) (c_nargs == DUK_VARARGS ? DUK_LFUNC_NARGS_VARARGS : c_nargs);
 				duk_small_uint_t lf_flags = DUK_LFUNC_FLAGS_PACK(magic, c_length, lf_nargs);
 				DUK_TVAL_SET_LIGHTFUNC(&tv_lfunc, c_func, lf_flags);
 				duk_push_tval(thr, &tv_lfunc);
-				DUK_D(DUK_DPRINT("built-in function eligible as light function: i=%d, j=%d c_length=%ld, c_nargs=%ld, magic=%ld -> %!iT", (int) i, (int) j, (long) c_length, (long) c_nargs, (long) magic, duk_get_tval(thr, -1)));
+				DUK_D(DUK_DPRINT("built-in function eligible as light function: i=%d, j=%d c_length=%ld, "
+				                 "c_nargs=%ld, magic=%ld -> %!iT",
+				                 (int) i,
+				                 (int) j,
+				                 (long) c_length,
+				                 (long) c_nargs,
+				                 (long) magic,
+				                 duk_get_tval(thr, -1)));
 				goto lightfunc_skip;
 			}
 
-			DUK_D(DUK_DPRINT("built-in function NOT ELIGIBLE as light function: i=%d, j=%d c_length=%ld, c_nargs=%ld, magic=%ld", (int) i, (int) j, (long) c_length, (long) c_nargs, (long) magic));
-#endif  /* DUK_USE_LIGHTFUNC_BUILTINS */
+			DUK_D(DUK_DPRINT(
+			    "built-in function NOT ELIGIBLE as light function: i=%d, j=%d c_length=%ld, c_nargs=%ld, magic=%ld",
+			    (int) i,
+			    (int) j,
+			    (long) c_length,
+			    (long) c_nargs,
+			    (long) magic));
+#endif /* DUK_USE_LIGHTFUNC_BUILTINS */
 
 			/* [ (builtin objects) name ] */
 
@@ -61133,10 +65182,8 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 			/* XXX: add into init data? */
 
 			/* Special call handling, not described in init data. */
-			if (c_func == duk_bi_global_object_eval ||
-			    c_func == duk_bi_function_prototype_call ||
-			    c_func == duk_bi_function_prototype_apply ||
-			    c_func == duk_bi_reflect_apply ||
+			if (c_func == duk_bi_global_object_eval || c_func == duk_bi_function_prototype_call ||
+			    c_func == duk_bi_function_prototype_apply || c_func == duk_bi_reflect_apply ||
 			    c_func == duk_bi_reflect_construct) {
 				DUK_HOBJECT_SET_SPECIAL_CALL((duk_hobject *) h_func);
 			}
@@ -61170,7 +65217,9 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 			/* XXX: other properties of function instances; 'arguments', 'caller'. */
 
 			DUK_DD(DUK_DDPRINT("built-in object %ld, function property %ld -> %!T",
-			                   (long) i, (long) j, (duk_tval *) duk_get_tval(thr, -1)));
+			                   (long) i,
+			                   (long) j,
+			                   (duk_tval *) duk_get_tval(thr, -1)));
 
 			/* [ (builtin objects) name func ] */
 
@@ -61180,17 +65229,14 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 			 */
 
 #if defined(DUK_USE_LIGHTFUNC_BUILTINS)
-		 lightfunc_skip:
+		lightfunc_skip:
 #endif
 
 			defprop_flags = (duk_small_uint_t) duk_bd_decode_flagged(bd,
 			                                                         DUK__PROP_FLAGS_BITS,
 			                                                         (duk_uint32_t) DUK_PROPDESC_FLAGS_WC);
-			defprop_flags |= DUK_DEFPROP_FORCE |
-			                 DUK_DEFPROP_HAVE_VALUE |
-			                 DUK_DEFPROP_HAVE_WRITABLE |
-			                 DUK_DEFPROP_HAVE_ENUMERABLE |
-			                 DUK_DEFPROP_HAVE_CONFIGURABLE;
+			defprop_flags |= DUK_DEFPROP_FORCE | DUK_DEFPROP_HAVE_VALUE | DUK_DEFPROP_HAVE_WRITABLE |
+			                 DUK_DEFPROP_HAVE_ENUMERABLE | DUK_DEFPROP_HAVE_CONFIGURABLE;
 			DUK_ASSERT(DUK_PROPDESC_FLAG_WRITABLE == DUK_DEFPROP_WRITABLE);
 			DUK_ASSERT(DUK_PROPDESC_FLAG_ENUMERABLE == DUK_DEFPROP_ENUMERABLE);
 			DUK_ASSERT(DUK_PROPDESC_FLAG_CONFIGURABLE == DUK_DEFPROP_CONFIGURABLE);
@@ -61228,22 +65274,28 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 
 #if !defined(DUK_USE_ES6_OBJECT_PROTO_PROPERTY)
 	DUK_DD(DUK_DDPRINT("delete Object.prototype.__proto__ built-in which is not enabled in features"));
-	(void) duk_hobject_delprop_raw(thr, thr->builtins[DUK_BIDX_OBJECT_PROTOTYPE], DUK_HTHREAD_STRING___PROTO__(thr), DUK_DELPROP_FLAG_THROW);
+	(void) duk_hobject_delprop_raw(thr,
+	                               thr->builtins[DUK_BIDX_OBJECT_PROTOTYPE],
+	                               DUK_HTHREAD_STRING___PROTO__(thr),
+	                               DUK_DELPROP_FLAG_THROW);
 #endif
 
 #if !defined(DUK_USE_ES6_OBJECT_SETPROTOTYPEOF)
 	DUK_DD(DUK_DDPRINT("delete Object.setPrototypeOf built-in which is not enabled in features"));
-	(void) duk_hobject_delprop_raw(thr, thr->builtins[DUK_BIDX_OBJECT_CONSTRUCTOR], DUK_HTHREAD_STRING_SET_PROTOTYPE_OF(thr), DUK_DELPROP_FLAG_THROW);
+	(void) duk_hobject_delprop_raw(thr,
+	                               thr->builtins[DUK_BIDX_OBJECT_CONSTRUCTOR],
+	                               DUK_HTHREAD_STRING_SET_PROTOTYPE_OF(thr),
+	                               DUK_DELPROP_FLAG_THROW);
 #endif
 
 	/* XXX: relocate */
 	duk_push_string(thr,
-			/* Endianness indicator */
+	/* Endianness indicator */
 #if defined(DUK_USE_INTEGER_LE)
 	                "l"
 #elif defined(DUK_USE_INTEGER_BE)
 	                "b"
-#elif defined(DUK_USE_INTEGER_ME)  /* integer mixed endian not really used now */
+#elif defined(DUK_USE_INTEGER_ME) /* integer mixed endian not really used now */
 	                "m"
 #else
 	                "?"
@@ -61258,89 +65310,85 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 	                "?"
 #endif
 	                " "
-			/* Packed or unpacked tval */
+	/* Packed or unpacked tval */
 #if defined(DUK_USE_PACKED_TVAL)
 	                "p"
 #else
 	                "u"
 #endif
 #if defined(DUK_USE_FASTINT)
-			"f"
+	                "f"
 #endif
-			" "
-			/* Low memory/performance options */
+	                " "
+	/* Low memory/performance options */
 #if defined(DUK_USE_STRTAB_PTRCOMP)
-			"s"
+	                "s"
 #endif
 #if !defined(DUK_USE_HEAPPTR16) && !defined(DUK_DATAPTR16) && !defined(DUK_FUNCPTR16)
-			"n"
+	                "n"
 #endif
 #if defined(DUK_USE_HEAPPTR16)
-			"h"
+	                "h"
 #endif
 #if defined(DUK_USE_DATAPTR16)
-			"d"
+	                "d"
 #endif
 #if defined(DUK_USE_FUNCPTR16)
-			"f"
+	                "f"
 #endif
 #if defined(DUK_USE_REFCOUNT16)
-			"R"
+	                "R"
 #endif
 #if defined(DUK_USE_STRHASH16)
-			"H"
+	                "H"
 #endif
 #if defined(DUK_USE_STRLEN16)
-			"S"
+	                "S"
 #endif
 #if defined(DUK_USE_BUFLEN16)
-			"B"
+	                "B"
 #endif
 #if defined(DUK_USE_OBJSIZES16)
-			"O"
+	                "O"
 #endif
 #if defined(DUK_USE_LIGHTFUNC_BUILTINS)
-			"L"
+	                "L"
 #endif
 #if defined(DUK_USE_ROM_STRINGS) || defined(DUK_USE_ROM_OBJECTS)
-			/* XXX: This won't be shown in practice now
-			 * because this code is not run when builtins
-			 * are in ROM.
-			 */
-			"Z"
+	                /* XXX: This won't be shown in practice now
+	                 * because this code is not run when builtins
+	                 * are in ROM.
+	                 */
+	                "Z"
 #endif
 #if defined(DUK_USE_LITCACHE_SIZE)
-			"l"
+	                "l"
 #endif
 	                " "
-			/* Object property allocation layout */
+	/* Object property allocation layout */
 #if defined(DUK_USE_HOBJECT_LAYOUT_1)
-			"p1"
+	                "p1"
 #elif defined(DUK_USE_HOBJECT_LAYOUT_2)
-			"p2"
+	                "p2"
 #elif defined(DUK_USE_HOBJECT_LAYOUT_3)
-			"p3"
+	                "p3"
 #else
-			"p?"
+	                "p?"
 #endif
-			" "
-			/* Alignment guarantee */
+	                " "
+	/* Alignment guarantee */
 #if (DUK_USE_ALIGN_BY == 4)
-			"a4"
+	                "a4"
 #elif (DUK_USE_ALIGN_BY == 8)
-			"a8"
+	                "a8"
 #elif (DUK_USE_ALIGN_BY == 1)
-			"a1"
+	                "a1"
 #else
 #error invalid DUK_USE_ALIGN_BY
 #endif
-			" "
-			/* Architecture, OS, and compiler strings */
-	                DUK_USE_ARCH_STRING
-			" "
-	                DUK_USE_OS_STRING
-			" "
-	                DUK_USE_COMPILER_STRING);
+	                " "
+	                /* Architecture, OS, and compiler strings */
+	                DUK_USE_ARCH_STRING " " DUK_USE_OS_STRING " " DUK_USE_COMPILER_STRING);
 	duk_xdef_prop_stridx_short(thr, DUK_BIDX_DUKTAPE, DUK_STRIDX_ENV, DUK_PROPDESC_FLAGS_WC);
 
 	/*
@@ -61357,7 +65405,8 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 #if defined(DUK_USE_DEBUG_LEVEL) && (DUK_USE_DEBUG_LEVEL >= 1)
 	for (i = 0; i < DUK_NUM_ALL_BUILTINS; i++) {
 		DUK_DD(DUK_DDPRINT("built-in object %ld after initialization and compacting: %!@iO",
-		                   (long) i, (duk_heaphdr *) duk_require_hobject(thr, i)));
+		                   (long) i,
+		                   (duk_heaphdr *) duk_require_hobject(thr, (duk_idx_t) i)));
 	}
 #endif
 
@@ -61370,14 +65419,14 @@ DUK_INTERNAL void duk_hthread_create_builtin_objects(duk_hthread *thr) {
 	duk_set_top(thr, 0);
 	DUK_ASSERT_TOP(thr, 0);
 }
-#endif  /* DUK_USE_ROM_OBJECTS */
+#endif /* DUK_USE_ROM_OBJECTS */
 
 DUK_INTERNAL void duk_hthread_copy_builtin_objects(duk_hthread *thr_from, duk_hthread *thr_to) {
 	duk_small_uint_t i;
 
 	for (i = 0; i < DUK_NUM_BUILTINS; i++) {
 		thr_to->builtins[i] = thr_from->builtins[i];
-		DUK_HOBJECT_INCREF_ALLOWNULL(thr_to, thr_to->builtins[i]);  /* side effect free */
+		DUK_HOBJECT_INCREF_ALLOWNULL(thr_to, thr_to->builtins[i]); /* side effect free */
 	}
 }
 
@@ -61409,7 +65458,7 @@ DUK_INTERNAL void duk_hthread_terminate(duk_hthread *thr) {
 	}
 
 	thr->valstack_bottom = thr->valstack;
-	duk_set_top(thr, 0);  /* unwinds valstack, updating refcounts */
+	duk_set_top(thr, 0); /* unwinds valstack, updating refcounts */
 
 	thr->state = DUK_HTHREAD_STATE_TERMINATED;
 
@@ -61440,7 +65489,7 @@ DUK_INTERNAL duk_uint_fast32_t duk_hthread_get_act_curr_pc(duk_hthread *thr, duk
 	}
 	return 0;
 }
-#endif  /* DUK_USE_DEBUGGER_SUPPORT */
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
 
 DUK_INTERNAL duk_uint_fast32_t duk_hthread_get_act_prev_pc(duk_hthread *thr, duk_activation *act) {
 	duk_instr_t *bcode;
@@ -61509,7 +65558,7 @@ DUK_INTERNAL void duk_hthread_catcher_unwind_norz(duk_hthread *thr, duk_activati
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(act != NULL);
-	DUK_ASSERT(act->cat != NULL);  /* caller must check */
+	DUK_ASSERT(act->cat != NULL); /* caller must check */
 	cat = act->cat;
 	DUK_ASSERT(cat != NULL);
 
@@ -61518,9 +65567,9 @@ DUK_INTERNAL void duk_hthread_catcher_unwind_norz(duk_hthread *thr, duk_activati
 	if (DUK_CAT_HAS_LEXENV_ACTIVE(cat)) {
 		duk_hobject *env;
 
-		env = act->lex_env;             /* current lex_env of the activation (created for catcher) */
-		DUK_ASSERT(env != NULL);        /* must be, since env was created when catcher was created */
-		act->lex_env = DUK_HOBJECT_GET_PROTOTYPE(thr->heap, env);  /* prototype is lex_env before catcher created */
+		env = act->lex_env; /* current lex_env of the activation (created for catcher) */
+		DUK_ASSERT(env != NULL); /* must be, since env was created when catcher was created */
+		act->lex_env = DUK_HOBJECT_GET_PROTOTYPE(thr->heap, env); /* prototype is lex_env before catcher created */
 		DUK_HOBJECT_INCREF(thr, act->lex_env);
 		DUK_HOBJECT_DECREF_NORZ(thr, env);
 
@@ -61539,7 +65588,7 @@ DUK_INTERNAL void duk_hthread_catcher_unwind_nolexenv_norz(duk_hthread *thr, duk
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(act != NULL);
-	DUK_ASSERT(act->cat != NULL);  /* caller must check */
+	DUK_ASSERT(act->cat != NULL); /* caller must check */
 	cat = act->cat;
 	DUK_ASSERT(cat != NULL);
 
@@ -61577,11 +65626,11 @@ DUK_INTERNAL DUK_INLINE duk_catcher *duk_hthread_catcher_alloc(duk_hthread *thr)
 
 	return duk__hthread_catcher_alloc_slow(thr);
 }
-#else  /* DUK_USE_CACHE_CATCHER */
+#else /* DUK_USE_CACHE_CATCHER */
 DUK_INTERNAL duk_catcher *duk_hthread_catcher_alloc(duk_hthread *thr) {
 	return duk__hthread_catcher_alloc_slow(thr);
 }
-#endif  /* DUK_USE_CACHE_CATCHER */
+#endif /* DUK_USE_CACHE_CATCHER */
 
 DUK_INTERNAL void duk_hthread_catcher_free(duk_hthread *thr, duk_catcher *cat) {
 	DUK_ASSERT(thr != NULL);
@@ -61622,12 +65671,11 @@ DUK_INTERNAL DUK_INLINE duk_activation *duk_hthread_activation_alloc(duk_hthread
 
 	return duk__hthread_activation_alloc_slow(thr);
 }
-#else  /* DUK_USE_CACHE_ACTIVATION */
+#else /* DUK_USE_CACHE_ACTIVATION */
 DUK_INTERNAL duk_activation *duk_hthread_activation_alloc(duk_hthread *thr) {
 	return duk__hthread_activation_alloc_slow(thr);
 }
-#endif  /* DUK_USE_CACHE_ACTIVATION */
-
+#endif /* DUK_USE_CACHE_ACTIVATION */
 
 DUK_INTERNAL void duk_hthread_activation_free(duk_hthread *thr, duk_activation *act) {
 	DUK_ASSERT(thr != NULL);
@@ -61654,7 +65702,7 @@ DUK_LOCAL void duk__activation_unwind_nofree_norz(duk_hthread *thr) {
 	duk_hobject *tmp;
 
 	DUK_ASSERT(thr != NULL);
-	DUK_ASSERT(thr->callstack_curr != NULL);  /* caller must check */
+	DUK_ASSERT(thr->callstack_curr != NULL); /* caller must check */
 	DUK_ASSERT(thr->callstack_top > 0);
 	act = thr->callstack_curr;
 	DUK_ASSERT(act != NULL);
@@ -61675,7 +65723,7 @@ DUK_LOCAL void duk__activation_unwind_nofree_norz(duk_hthread *thr) {
 		duk_tval tv_tmp;
 		duk_hobject *h_tmp;
 
-		tv_caller = duk_hobject_find_existing_entry_tval_ptr(thr->heap, func, DUK_HTHREAD_STRING_CALLER(thr));
+		tv_caller = duk_hobject_find_entry_tval_ptr_stridx(thr->heap, func, DUK_STRIDX_CALLER);
 
 		/* The act->prev_caller should only be set if the entry for 'caller'
 		 * exists (as it is only set in that case, and the property is not
@@ -61691,7 +65739,7 @@ DUK_LOCAL void duk__activation_unwind_nofree_norz(duk_hthread *thr) {
 				DUK_TVAL_SET_OBJECT(tv_caller, act->prev_caller);
 				act->prev_caller = NULL;
 			} else {
-				DUK_TVAL_SET_NULL(tv_caller);   /* no incref needed */
+				DUK_TVAL_SET_NULL(tv_caller); /* no incref needed */
 				DUK_ASSERT(act->prev_caller == NULL);
 			}
 			DUK_TVAL_DECREF_NORZ(thr, &tv_tmp);
@@ -61720,7 +65768,7 @@ DUK_LOCAL void duk__activation_unwind_nofree_norz(duk_hthread *thr) {
 			duk_debug_set_paused(heap);
 		} else {
 			DUK_D(DUK_DPRINT("unwound past dbg_pause_act, set to NULL"));
-			heap->dbg_pause_act = NULL;  /* avoid stale pointers */
+			heap->dbg_pause_act = NULL; /* avoid stale pointers */
 		}
 		DUK_ASSERT(heap->dbg_pause_act == NULL);
 	}
@@ -61769,12 +65817,11 @@ DUK_LOCAL void duk__activation_unwind_nofree_norz(duk_hthread *thr) {
 	 * fixed e.g. by preallocating the scope property slots.
 	 */
 	if (act->var_env != NULL) {
-		DUK_DDD(DUK_DDDPRINT("closing var_env record %p -> %!O",
-		                     (void *) act->var_env, (duk_heaphdr *) act->var_env));
+		DUK_DDD(DUK_DDDPRINT("closing var_env record %p -> %!O", (void *) act->var_env, (duk_heaphdr *) act->var_env));
 		duk_js_close_environment_record(thr, act->var_env);
 	}
 
- skip_env_close:
+skip_env_close:
 
 	/*
 	 *  Update preventcount
@@ -61898,7 +65945,7 @@ DUK_INTERNAL void duk_hthread_valstack_torture_realloc(duk_hthread *thr) {
 		DUK_D(DUK_DPRINT("failed to realloc valstack for torture, ignore"));
 	}
 }
-#endif  /* DUK_USE_FINALIZER_TORTURE */
+#endif /* DUK_USE_FINALIZER_TORTURE */
 /*
  *  Shared helpers for arithmetic operations
  */
@@ -61920,11 +65967,11 @@ DUK_INTERNAL double duk_js_arith_mod(double d1, double d2) {
 		} else {
 			return d1;
 		}
-	} else if (d1 == 0.0) {
+	} else if (duk_double_equals(d1, 0.0)) {
 		/* d1 +/-0 is returned as is (preserving sign) except when
 		 * d2 is zero or NaN.
 		 */
-		if (d2 == 0.0 || DUK_ISNAN(d2)) {
+		if (duk_double_equals(d2, 0.0) || DUK_ISNAN(d2)) {
 			return DUK_DOUBLE_NAN;
 		} else {
 			return d1;
@@ -61932,20 +65979,24 @@ DUK_INTERNAL double duk_js_arith_mod(double d1, double d2) {
 	}
 #else
 	/* Some ISO C assumptions. */
-	DUK_ASSERT(DUK_FMOD(1.0, DUK_DOUBLE_INFINITY) == 1.0);
-	DUK_ASSERT(DUK_FMOD(-1.0, DUK_DOUBLE_INFINITY) == -1.0);
-	DUK_ASSERT(DUK_FMOD(1.0, -DUK_DOUBLE_INFINITY) == 1.0);
-	DUK_ASSERT(DUK_FMOD(-1.0, -DUK_DOUBLE_INFINITY) == -1.0);
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(1.0, DUK_DOUBLE_INFINITY), 1.0));
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(-1.0, DUK_DOUBLE_INFINITY), -1.0));
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(1.0, -DUK_DOUBLE_INFINITY), 1.0));
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(-1.0, -DUK_DOUBLE_INFINITY), -1.0));
 	DUK_ASSERT(DUK_ISNAN(DUK_FMOD(DUK_DOUBLE_INFINITY, DUK_DOUBLE_INFINITY)));
 	DUK_ASSERT(DUK_ISNAN(DUK_FMOD(DUK_DOUBLE_INFINITY, -DUK_DOUBLE_INFINITY)));
 	DUK_ASSERT(DUK_ISNAN(DUK_FMOD(-DUK_DOUBLE_INFINITY, DUK_DOUBLE_INFINITY)));
 	DUK_ASSERT(DUK_ISNAN(DUK_FMOD(-DUK_DOUBLE_INFINITY, -DUK_DOUBLE_INFINITY)));
-	DUK_ASSERT(DUK_FMOD(0.0, 1.0) == 0.0 && DUK_SIGNBIT(DUK_FMOD(0.0, 1.0)) == 0);
-	DUK_ASSERT(DUK_FMOD(-0.0, 1.0) == 0.0 && DUK_SIGNBIT(DUK_FMOD(-0.0, 1.0)) != 0);
-	DUK_ASSERT(DUK_FMOD(0.0, DUK_DOUBLE_INFINITY) == 0.0 && DUK_SIGNBIT(DUK_FMOD(0.0, DUK_DOUBLE_INFINITY)) == 0);
-	DUK_ASSERT(DUK_FMOD(-0.0, DUK_DOUBLE_INFINITY) == 0.0 && DUK_SIGNBIT(DUK_FMOD(-0.0, DUK_DOUBLE_INFINITY)) != 0);
-	DUK_ASSERT(DUK_FMOD(0.0, -DUK_DOUBLE_INFINITY) == 0.0 && DUK_SIGNBIT(DUK_FMOD(0.0, DUK_DOUBLE_INFINITY)) == 0);
-	DUK_ASSERT(DUK_FMOD(-0.0, -DUK_DOUBLE_INFINITY) == 0.0 && DUK_SIGNBIT(DUK_FMOD(-0.0, -DUK_DOUBLE_INFINITY)) != 0);
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(0.0, 1.0), 0.0) && DUK_SIGNBIT(DUK_FMOD(0.0, 1.0)) == 0);
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(-0.0, 1.0), 0.0) && DUK_SIGNBIT(DUK_FMOD(-0.0, 1.0)) != 0);
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(0.0, DUK_DOUBLE_INFINITY), 0.0) &&
+	           DUK_SIGNBIT(DUK_FMOD(0.0, DUK_DOUBLE_INFINITY)) == 0);
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(-0.0, DUK_DOUBLE_INFINITY), 0.0) &&
+	           DUK_SIGNBIT(DUK_FMOD(-0.0, DUK_DOUBLE_INFINITY)) != 0);
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(0.0, -DUK_DOUBLE_INFINITY), 0.0) &&
+	           DUK_SIGNBIT(DUK_FMOD(0.0, DUK_DOUBLE_INFINITY)) == 0);
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(-0.0, -DUK_DOUBLE_INFINITY), 0.0) &&
+	           DUK_SIGNBIT(DUK_FMOD(-0.0, -DUK_DOUBLE_INFINITY)) != 0);
 	DUK_ASSERT(DUK_ISNAN(DUK_FMOD(0.0, 0.0)));
 	DUK_ASSERT(DUK_ISNAN(DUK_FMOD(-0.0, 0.0)));
 	DUK_ASSERT(DUK_ISNAN(DUK_FMOD(0.0, -0.0)));
@@ -61974,7 +66025,7 @@ DUK_INTERNAL double duk_js_arith_pow(double x, double y) {
 	if (cy == DUK_FP_NAN) {
 		goto ret_nan;
 	}
-	if (DUK_FABS(x) == 1.0 && cy == DUK_FP_INFINITE) {
+	if (duk_double_equals(DUK_FABS(x), 1.0) && cy == DUK_FP_INFINITE) {
 		goto ret_nan;
 	}
 
@@ -62016,7 +66067,7 @@ DUK_INTERNAL double duk_js_arith_pow(double x, double y) {
 			}
 		}
 	} else if (cx == DUK_FP_NAN) {
-		if (y == 0.0) {
+		if (duk_double_equals(y, 0.0)) {
 			/* NaN ** +/- 0 should always be 1, but is NaN on
 			 * at least some Cygwin/MinGW versions.
 			 */
@@ -62025,7 +66076,7 @@ DUK_INTERNAL double duk_js_arith_pow(double x, double y) {
 	}
 #else
 	/* Some ISO C assumptions. */
-	DUK_ASSERT(DUK_POW(DUK_DOUBLE_NAN, 0.0) == 1.0);
+	DUK_ASSERT(duk_double_equals(DUK_POW(DUK_DOUBLE_NAN, 0.0), 1.0));
 	DUK_ASSERT(DUK_ISINF(DUK_POW(0.0, -1.0)) && DUK_SIGNBIT(DUK_POW(0.0, -1.0)) == 0);
 	DUK_ASSERT(DUK_ISINF(DUK_POW(-0.0, -2.0)) && DUK_SIGNBIT(DUK_POW(-0.0, -2.0)) == 0);
 	DUK_ASSERT(DUK_ISINF(DUK_POW(-0.0, -3.0)) && DUK_SIGNBIT(DUK_POW(-0.0, -3.0)) != 0);
@@ -62033,7 +66084,7 @@ DUK_INTERNAL double duk_js_arith_pow(double x, double y) {
 
 	return DUK_POW(x, y);
 
- ret_nan:
+ret_nan:
 	return DUK_DOUBLE_NAN;
 }
 /*
@@ -62073,12 +66124,26 @@ DUK_INTERNAL double duk_js_arith_pow(double x, double y) {
  *  Limit check helpers.
  */
 
+/* Check native stack space if DUK_USE_NATIVE_STACK_CHECK() defined. */
+DUK_INTERNAL void duk_native_stack_check(duk_hthread *thr) {
+#if defined(DUK_USE_NATIVE_STACK_CHECK)
+	if (DUK_USE_NATIVE_STACK_CHECK() != 0) {
+		DUK_ERROR_RANGE(thr, DUK_STR_NATIVE_STACK_LIMIT);
+	}
+#else
+	DUK_UNREF(thr);
+#endif
+}
+
 /* Allow headroom for calls during error augmentation (see GH-191).
  * We allow space for 10 additional recursions, with one extra
  * for, e.g. a print() call at the deepest level, and an extra
  * +1 for protected call wrapping.
  */
-#define DUK__AUGMENT_CALL_RELAX_COUNT  (10 + 2)
+#define DUK__AUGMENT_CALL_RELAX_COUNT (10 + 2)
+
+/* Stack space required by call handling entry. */
+#define DUK__CALL_HANDLING_REQUIRE_STACK 8
 
 DUK_LOCAL DUK_NOINLINE void duk__call_c_recursion_limit_check_slowpath(duk_hthread *thr) {
 	/* When augmenting an error, the effective limit is a bit higher.
@@ -62094,7 +66159,7 @@ DUK_LOCAL DUK_NOINLINE void duk__call_c_recursion_limit_check_slowpath(duk_hthre
 #endif
 
 	DUK_D(DUK_DPRINT("call prevented because C recursion limit reached"));
-	DUK_ERROR_RANGE(thr, DUK_STR_C_CALLSTACK_LIMIT);
+	DUK_ERROR_RANGE(thr, DUK_STR_NATIVE_STACK_LIMIT);
 	DUK_WO_NORETURN(return;);
 }
 
@@ -62102,6 +66167,8 @@ DUK_LOCAL DUK_ALWAYS_INLINE void duk__call_c_recursion_limit_check(duk_hthread *
 	DUK_ASSERT(thr->heap->call_recursion_depth >= 0);
 	DUK_ASSERT(thr->heap->call_recursion_depth <= thr->heap->call_recursion_limit);
 
+	duk_native_stack_check(thr);
+
 	/* This check is forcibly inlined because it's very cheap and almost
 	 * always passes.  The slow path is forcibly noinline.
 	 */
@@ -62170,7 +66237,8 @@ DUK_LOCAL void duk__interrupt_fixup(duk_hthread *thr, duk_hthread *entry_curr_th
 		thr->heap->inst_count_interrupt += thr->interrupt_init;
 		DUK_DD(DUK_DDPRINT("debug test: updated interrupt count on exit to "
 		                   "user code, instruction counts: executor=%ld, interrupt=%ld",
-		                   (long) thr->heap->inst_count_exec, (long) thr->heap->inst_count_interrupt));
+		                   (long) thr->heap->inst_count_exec,
+		                   (long) thr->heap->inst_count_interrupt));
 		DUK_ASSERT(thr->heap->inst_count_exec == thr->heap->inst_count_interrupt);
 	}
 #else
@@ -62189,12 +66257,9 @@ DUK_LOCAL void duk__interrupt_fixup(duk_hthread *thr, duk_hthread *entry_curr_th
  *  object flag DUK_HOBJECT_FLAG_EXOTIC_ARGUMENTS.
  */
 
-DUK_LOCAL void duk__create_arguments_object(duk_hthread *thr,
-                                            duk_hobject *func,
-                                            duk_hobject *varenv,
-                                            duk_idx_t idx_args) {
-	duk_hobject *arg;          /* 'arguments' */
-	duk_hobject *formals;      /* formals for 'func' (may be NULL if func is a C function) */
+DUK_LOCAL void duk__create_arguments_object(duk_hthread *thr, duk_hobject *func, duk_hobject *varenv, duk_idx_t idx_args) {
+	duk_hobject *arg; /* 'arguments' */
+	duk_hobject *formals; /* formals for 'func' (may be NULL if func is a C function) */
 	duk_idx_t i_arg;
 	duk_idx_t i_map;
 	duk_idx_t i_mappednames;
@@ -62221,11 +66286,10 @@ DUK_LOCAL void duk__create_arguments_object(duk_hthread *thr,
 	DUK_ASSERT(i_argbase >= 0);
 	DUK_ASSERT(num_stack_args >= 0);
 
-	duk_push_hobject(thr, func);
-	duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_INT_FORMALS);
-	formals = duk_get_hobject(thr, -1);
+	formals = (duk_hobject *) duk_hobject_get_formals(thr, (duk_hobject *) func);
 	if (formals) {
-		n_formals = (duk_idx_t) duk_get_length(thr, -1);
+		n_formals = (duk_idx_t) ((duk_harray *) formals)->length;
+		duk_push_hobject(thr, formals);
 	} else {
 		/* This shouldn't happen without tampering of internal
 		 * properties: if a function accesses 'arguments', _Formals
@@ -62234,46 +66298,44 @@ DUK_LOCAL void duk__create_arguments_object(duk_hthread *thr,
 		 */
 		DUK_D(DUK_DPRINT("_Formals is undefined when creating arguments, use n_formals == 0"));
 		n_formals = 0;
+		duk_push_undefined(thr);
 	}
-	duk_remove_m2(thr);  /* leave formals on stack for later use */
 	i_formals = duk_require_top_index(thr);
 
 	DUK_ASSERT(n_formals >= 0);
 	DUK_ASSERT(formals != NULL || n_formals == 0);
 
-	DUK_DDD(DUK_DDDPRINT("func=%!O, formals=%!O, n_formals=%ld",
-	                     (duk_heaphdr *) func, (duk_heaphdr *) formals,
-	                     (long) n_formals));
+	DUK_DDD(
+	    DUK_DDDPRINT("func=%!O, formals=%!O, n_formals=%ld", (duk_heaphdr *) func, (duk_heaphdr *) formals, (long) n_formals));
 
 	/* [ ... formals ] */
 
 	/*
 	 *  Create required objects:
 	 *    - 'arguments' object: array-like, but not an array
-	 *    - 'map' object: internal object, tied to 'arguments'
-	 *    - 'mappedNames' object: temporary value used during construction
+	 *    - 'map' object: internal object, tied to 'arguments' (bare)
+	 *    - 'mappedNames' object: temporary value used during construction (bare)
 	 */
 
 	arg = duk_push_object_helper(thr,
-	                             DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                             DUK_HOBJECT_FLAG_FASTREFS |
-	                             DUK_HOBJECT_FLAG_ARRAY_PART |
-	                             DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ARGUMENTS),
+	                             DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS | DUK_HOBJECT_FLAG_ARRAY_PART |
+	                                 DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_ARGUMENTS),
 	                             DUK_BIDX_OBJECT_PROTOTYPE);
 	DUK_ASSERT(arg != NULL);
 	(void) duk_push_object_helper(thr,
-	                              DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                              DUK_HOBJECT_FLAG_FASTREFS |
-	                              DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJECT),
-	                              -1);  /* no prototype */
+	                              DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS |
+	                                  DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJECT),
+	                              -1); /* no prototype */
 	(void) duk_push_object_helper(thr,
-	                              DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                              DUK_HOBJECT_FLAG_FASTREFS |
-	                              DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJECT),
-	                              -1);  /* no prototype */
+	                              DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_FLAG_FASTREFS |
+	                                  DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJECT),
+	                              -1); /* no prototype */
 	i_arg = duk_get_top(thr) - 3;
 	i_map = i_arg + 1;
 	i_mappednames = i_arg + 2;
+	DUK_ASSERT(!duk_is_bare_object(thr, -3)); /* arguments */
+	DUK_ASSERT(duk_is_bare_object(thr, -2)); /* map */
+	DUK_ASSERT(duk_is_bare_object(thr, -1)); /* mappedNames */
 
 	/* [ ... formals arguments map mappedNames ] */
 
@@ -62281,9 +66343,12 @@ DUK_LOCAL void duk__create_arguments_object(duk_hthread *thr,
 	                     "arguments at index %ld -> %!O "
 	                     "map at index %ld -> %!O "
 	                     "mappednames at index %ld -> %!O",
-	                     (long) i_arg, (duk_heaphdr *) duk_get_hobject(thr, i_arg),
-	                     (long) i_map, (duk_heaphdr *) duk_get_hobject(thr, i_map),
-	                     (long) i_mappednames, (duk_heaphdr *) duk_get_hobject(thr, i_mappednames)));
+	                     (long) i_arg,
+	                     (duk_heaphdr *) duk_get_hobject(thr, i_arg),
+	                     (long) i_map,
+	                     (duk_heaphdr *) duk_get_hobject(thr, i_map),
+	                     (long) i_mappednames,
+	                     (duk_heaphdr *) duk_get_hobject(thr, i_mappednames)));
 
 	/*
 	 *  Init arguments properties, map, etc.
@@ -62299,8 +66364,8 @@ DUK_LOCAL void duk__create_arguments_object(duk_hthread *thr,
 	/* step 11 */
 	idx = num_stack_args - 1;
 	while (idx >= 0) {
-		DUK_DDD(DUK_DDDPRINT("arg idx %ld, argbase=%ld, argidx=%ld",
-		                     (long) idx, (long) i_argbase, (long) (i_argbase + idx)));
+		DUK_DDD(
+		    DUK_DDDPRINT("arg idx %ld, argbase=%ld, argidx=%ld", (long) idx, (long) i_argbase, (long) (i_argbase + idx)));
 
 		DUK_DDD(DUK_DDDPRINT("define arguments[%ld]=arg", (long) idx));
 		duk_dup(thr, i_argbase + idx);
@@ -62311,13 +66376,12 @@ DUK_LOCAL void duk__create_arguments_object(duk_hthread *thr,
 		if (!DUK_HOBJECT_HAS_STRICT(func) && idx < n_formals) {
 			DUK_ASSERT(formals != NULL);
 
-			DUK_DDD(DUK_DDDPRINT("strict function, index within formals (%ld < %ld)",
-			                     (long) idx, (long) n_formals));
+			DUK_DDD(DUK_DDDPRINT("strict function, index within formals (%ld < %ld)", (long) idx, (long) n_formals));
 
 			duk_get_prop_index(thr, i_formals, (duk_uarridx_t) idx);
 			DUK_ASSERT(duk_is_string(thr, -1));
 
-			duk_dup_top(thr);  /* [ ... name name ] */
+			duk_dup_top(thr); /* [ ... name name ] */
 
 			if (!duk_has_prop(thr, i_mappednames)) {
 				/* steps 11.c.ii.1 - 11.c.ii.4, but our internal book-keeping
@@ -62328,24 +66392,21 @@ DUK_LOCAL void duk__create_arguments_object(duk_hthread *thr,
 
 				need_map = 1;
 
-				DUK_DDD(DUK_DDDPRINT("set mappednames[%s]=%ld",
-				                     (const char *) duk_get_string(thr, -1),
-				                     (long) idx));
-				duk_dup_top(thr);                      /* name */
-				(void) duk_push_uint_to_hstring(thr, (duk_uint_t) idx);  /* index */
-				duk_xdef_prop_wec(thr, i_mappednames);  /* out of spec, must be configurable */
+				DUK_DDD(
+				    DUK_DDDPRINT("set mappednames[%s]=%ld", (const char *) duk_get_string(thr, -1), (long) idx));
+				duk_dup_top(thr); /* name */
+				(void) duk_push_uint_to_hstring(thr, (duk_uint_t) idx); /* index */
+				duk_xdef_prop_wec(thr, i_mappednames); /* out of spec, must be configurable */
 
-				DUK_DDD(DUK_DDDPRINT("set map[%ld]=%s",
-				                     (long) idx,
-				                     duk_get_string(thr, -1)));
-				duk_dup_top(thr);         /* name */
-				duk_xdef_prop_index_wec(thr, i_map, (duk_uarridx_t) idx);  /* out of spec, must be configurable */
+				DUK_DDD(DUK_DDDPRINT("set map[%ld]=%s", (long) idx, duk_get_string(thr, -1)));
+				duk_dup_top(thr); /* name */
+				duk_xdef_prop_index_wec(thr, i_map, (duk_uarridx_t) idx); /* out of spec, must be configurable */
 			} else {
 				/* duk_has_prop() popped the second 'name' */
 			}
 
 			/* [ ... name ] */
-			duk_pop(thr);  /* pop 'name' */
+			duk_pop(thr); /* pop 'name' */
 		}
 
 		idx--;
@@ -62361,7 +66422,7 @@ DUK_LOCAL void duk__create_arguments_object(duk_hthread *thr,
 		DUK_ASSERT(!DUK_HOBJECT_HAS_STRICT(func));
 
 		duk_dup(thr, i_map);
-		duk_xdef_prop_stridx(thr, i_arg, DUK_STRIDX_INT_MAP, DUK_PROPDESC_FLAGS_NONE);  /* out of spec, don't care */
+		duk_xdef_prop_stridx(thr, i_arg, DUK_STRIDX_INT_MAP, DUK_PROPDESC_FLAGS_NONE); /* out of spec, don't care */
 
 		/* The variable environment for magic variable bindings needs to be
 		 * given by the caller and recorded in the arguments object.
@@ -62373,7 +66434,7 @@ DUK_LOCAL void duk__create_arguments_object(duk_hthread *thr,
 		 */
 
 		duk_push_hobject(thr, varenv);
-		duk_xdef_prop_stridx(thr, i_arg, DUK_STRIDX_INT_VARENV, DUK_PROPDESC_FLAGS_NONE);  /* out of spec, don't care */
+		duk_xdef_prop_stridx(thr, i_arg, DUK_STRIDX_INT_VARENV, DUK_PROPDESC_FLAGS_NONE); /* out of spec, don't care */
 	}
 
 	/* steps 13-14 */
@@ -62393,7 +66454,7 @@ DUK_LOCAL void duk__create_arguments_object(duk_hthread *thr,
 
 		DUK_DDD(DUK_DDDPRINT("strict function, setting caller/callee to throwers"));
 
-		duk_xdef_prop_stridx_thrower(thr, i_arg, DUK_STRIDX_CALLER);
+		/* In ES2017 .caller is no longer set at all. */
 		duk_xdef_prop_stridx_thrower(thr, i_arg, DUK_STRIDX_CALLEE);
 	} else {
 		DUK_DDD(DUK_DDDPRINT("non-strict function, setting callee to actual value"));
@@ -62426,9 +66487,12 @@ DUK_LOCAL void duk__create_arguments_object(duk_hthread *thr,
 	                     "arguments at index %ld -> %!O "
 	                     "map at index %ld -> %!O "
 	                     "mappednames at index %ld -> %!O",
-	                     (long) i_arg, (duk_heaphdr *) duk_get_hobject(thr, i_arg),
-	                     (long) i_map, (duk_heaphdr *) duk_get_hobject(thr, i_map),
-	                     (long) i_mappednames, (duk_heaphdr *) duk_get_hobject(thr, i_mappednames)));
+	                     (long) i_arg,
+	                     (duk_heaphdr *) duk_get_hobject(thr, i_arg),
+	                     (long) i_map,
+	                     (duk_heaphdr *) duk_get_hobject(thr, i_map),
+	                     (long) i_mappednames,
+	                     (duk_heaphdr *) duk_get_hobject(thr, i_mappednames)));
 
 	/* [ args(n) envobj formals arguments map mappednames ] */
 
@@ -62441,10 +66505,7 @@ DUK_LOCAL void duk__create_arguments_object(duk_hthread *thr,
 /* Helper for creating the arguments object and adding it to the env record
  * on top of the value stack.
  */
-DUK_LOCAL void duk__handle_createargs_for_call(duk_hthread *thr,
-                                               duk_hobject *func,
-                                               duk_hobject *env,
-                                               duk_idx_t idx_args) {
+DUK_LOCAL void duk__handle_createargs_for_call(duk_hthread *thr, duk_hobject *func, duk_hobject *env, duk_idx_t idx_args) {
 	DUK_DDD(DUK_DDDPRINT("creating arguments object for function call"));
 
 	DUK_ASSERT(thr != NULL);
@@ -62454,18 +66515,15 @@ DUK_LOCAL void duk__handle_createargs_for_call(duk_hthread *thr,
 
 	/* [ ... arg1 ... argN envobj ] */
 
-	duk__create_arguments_object(thr,
-	                             func,
-	                             env,
-	                             idx_args);
+	duk__create_arguments_object(thr, func, env, idx_args);
 
 	/* [ ... arg1 ... argN envobj argobj ] */
 
 	duk_xdef_prop_stridx_short(thr,
 	                           -2,
 	                           DUK_STRIDX_LC_ARGUMENTS,
-	                           DUK_HOBJECT_HAS_STRICT(func) ? DUK_PROPDESC_FLAGS_E :   /* strict: non-deletable, non-writable */
-	                                                          DUK_PROPDESC_FLAGS_WE);  /* non-strict: non-deletable, writable */
+	                           DUK_HOBJECT_HAS_STRICT(func) ? DUK_PROPDESC_FLAGS_E : /* strict: non-deletable, non-writable */
+                                                                  DUK_PROPDESC_FLAGS_WE); /* non-strict: non-deletable, writable */
 	/* [ ... arg1 ... argN envobj ] */
 }
 
@@ -62515,7 +66573,8 @@ DUK_LOCAL void duk__update_default_instance_proto(duk_hthread *thr, duk_idx_t id
 		                     "-> leave standard Object prototype as fallback prototype"));
 	} else {
 		DUK_DDD(DUK_DDDPRINT("constructor has 'prototype' property with object value "
-		                     "-> set fallback prototype to that value: %!iO", (duk_heaphdr *) proto));
+		                     "-> set fallback prototype to that value: %!iO",
+		                     (duk_heaphdr *) proto));
 		/* Original fallback (default instance) is untouched when
 		 * resolving bound functions etc.
 		 */
@@ -62537,9 +66596,7 @@ DUK_INTERNAL void duk_call_construct_postprocess(duk_hthread *thr, duk_small_uin
 	 * Object (we accept object-like values like buffers and
 	 * lightfuncs too).  If not, TypeError.
 	 */
-	if (duk_check_type_mask(thr, -1, DUK_TYPE_MASK_OBJECT |
-	                                 DUK_TYPE_MASK_BUFFER |
-	                                 DUK_TYPE_MASK_LIGHTFUNC)) {
+	if (duk_check_type_mask(thr, -1, DUK_TYPE_MASK_OBJECT | DUK_TYPE_MASK_BUFFER | DUK_TYPE_MASK_LIGHTFUNC)) {
 		DUK_DDD(DUK_DDDPRINT("replacement value"));
 	} else {
 		if (DUK_UNLIKELY(proxy_invariant != 0U)) {
@@ -62561,8 +66618,7 @@ DUK_INTERNAL void duk_call_construct_postprocess(duk_hthread *thr, duk_small_uin
 	 * out right; however it is always synced here so just assert for it.
 	 */
 	DUK_ASSERT(thr->ptr_curr_pc == NULL);
-	duk_err_augment_error_create(thr, thr, NULL, 0, DUK_AUGMENT_FLAG_NOBLAME_FILELINE |
-	                                                DUK_AUGMENT_FLAG_SKIP_ONE);
+	duk_err_augment_error_create(thr, thr, NULL, 0, DUK_AUGMENT_FLAG_NOBLAME_FILELINE | DUK_AUGMENT_FLAG_SKIP_ONE);
 #endif
 }
 
@@ -62579,9 +66635,7 @@ DUK_INTERNAL void duk_call_construct_postprocess(duk_hthread *thr, duk_small_uin
  *  [[BoundThis]].
  */
 
-DUK_LOCAL void duk__handle_bound_chain_for_call(duk_hthread *thr,
-                                                duk_idx_t idx_func,
-                                                duk_bool_t is_constructor_call) {
+DUK_LOCAL void duk__handle_bound_chain_for_call(duk_hthread *thr, duk_idx_t idx_func, duk_bool_t is_constructor_call) {
 	duk_tval *tv_func;
 	duk_hobject *func;
 	duk_idx_t len;
@@ -62612,7 +66666,8 @@ DUK_LOCAL void duk__handle_bound_chain_for_call(duk_hthread *thr,
 			DUK_ASSERT(len == 0 || tv_args != NULL);
 
 			DUK_DDD(DUK_DDDPRINT("bound function encountered, ptr=%p: %!T",
-			                     (void *) DUK_TVAL_GET_OBJECT(tv_func), tv_func));
+			                     (void *) DUK_TVAL_GET_OBJECT(tv_func),
+			                     tv_func));
 
 			/* [ ... func this arg1 ... argN ] */
 
@@ -62622,7 +66677,7 @@ DUK_LOCAL void duk__handle_bound_chain_for_call(duk_hthread *thr,
 			} else {
 				/* XXX: duk_replace_tval */
 				duk_push_tval(thr, &h_bound->this_binding);
-				duk_replace(thr, idx_func + 1);  /* idx_this = idx_func + 1 */
+				duk_replace(thr, idx_func + 1); /* idx_this = idx_func + 1 */
 			}
 
 			/* [ ... func this arg1 ... argN ] */
@@ -62635,10 +66690,11 @@ DUK_LOCAL void duk__handle_bound_chain_for_call(duk_hthread *thr,
 			/* [ ... func this <bound args> arg1 ... argN ] */
 
 			duk_push_tval(thr, &h_bound->target);
-			duk_replace(thr, idx_func);  /* replace in stack */
+			duk_replace(thr, idx_func); /* replace in stack */
 
 			DUK_DDD(DUK_DDDPRINT("bound function handled, idx_func=%ld, curr func=%!T",
-			                     (long) idx_func, duk_get_tval(thr, idx_func)));
+			                     (long) idx_func,
+			                     duk_get_tval(thr, idx_func)));
 		}
 	} else if (DUK_TVAL_IS_LIGHTFUNC(tv_func)) {
 		/* Lightweight function: never bound, so terminate. */
@@ -62660,8 +66716,7 @@ DUK_LOCAL void duk__handle_bound_chain_for_call(duk_hthread *thr,
 		func = DUK_TVAL_GET_OBJECT(tv_func);
 		DUK_ASSERT(func != NULL);
 		DUK_ASSERT(!DUK_HOBJECT_HAS_BOUNDFUNC(func));
-		DUK_ASSERT(DUK_HOBJECT_HAS_COMPFUNC(func) ||
-		           DUK_HOBJECT_HAS_NATFUNC(func));
+		DUK_ASSERT(DUK_HOBJECT_HAS_COMPFUNC(func) || DUK_HOBJECT_HAS_NATFUNC(func) || DUK_HOBJECT_IS_PROXY(func));
 	}
 #endif
 }
@@ -62670,14 +66725,18 @@ DUK_LOCAL void duk__handle_bound_chain_for_call(duk_hthread *thr,
  *  Helper for inline handling of .call(), .apply(), and .construct().
  */
 
-DUK_LOCAL duk_bool_t duk__handle_specialfuncs_for_call(duk_hthread *thr, duk_idx_t idx_func, duk_hobject *func, duk_small_uint_t *call_flags, duk_bool_t first) {
+DUK_LOCAL duk_bool_t duk__handle_specialfuncs_for_call(duk_hthread *thr,
+                                                       duk_idx_t idx_func,
+                                                       duk_hobject *func,
+                                                       duk_small_uint_t *call_flags,
+                                                       duk_bool_t first) {
 #if defined(DUK_USE_ASSERTIONS)
 	duk_c_function natfunc;
 #endif
 	duk_tval *tv_args;
 
 	DUK_ASSERT(func != NULL);
-	DUK_ASSERT((*call_flags & DUK_CALL_FLAG_CONSTRUCT) == 0);  /* Caller. */
+	DUK_ASSERT((*call_flags & DUK_CALL_FLAG_CONSTRUCT) == 0); /* Caller. */
 
 #if defined(DUK_USE_ASSERTIONS)
 	natfunc = ((duk_hnatfunc *) func)->func;
@@ -62705,7 +66764,7 @@ DUK_LOCAL duk_bool_t duk__handle_specialfuncs_for_call(duk_hthread *thr, duk_idx
 			*call_flags = (*call_flags & ~DUK_CALL_FLAG_CALLED_AS_EVAL) | DUK_CALL_FLAG_DIRECT_EVAL;
 		}
 		DUK_ASSERT(duk_get_top(thr) >= idx_func + 2);
-		return 1;  /* stop resolving */
+		return 1; /* stop resolving */
 	}
 
 	/* Handle special functions based on the DUK_HOBJECT_FLAG_SPECIAL_CALL
@@ -62715,7 +66774,7 @@ DUK_LOCAL duk_bool_t duk__handle_specialfuncs_for_call(duk_hthread *thr, duk_idx
 	 * for the result values (unlike most other value stack calls).
 	 */
 	switch (((duk_hnatfunc *) func)->magic) {
-	case 0: {  /* 0=Function.prototype.call() */
+	case 0: { /* 0=Function.prototype.call() */
 		/* Value stack:
 		 * idx_func + 0: Function.prototype.call()  [removed]
 		 * idx_func + 1: this binding for .call (target function)
@@ -62734,11 +66793,11 @@ DUK_LOCAL duk_bool_t duk__handle_specialfuncs_for_call(duk_hthread *thr, duk_idx
 		tv_args = thr->valstack_bottom + idx_func + 2;
 		if (thr->valstack_top < tv_args) {
 			DUK_ASSERT(tv_args <= thr->valstack_end);
-			thr->valstack_top = tv_args;  /* at least target function and 'this' binding present */
+			thr->valstack_top = tv_args; /* at least target function and 'this' binding present */
 		}
 		break;
 	}
-	case 1: {  /* 1=Function.prototype.apply() */
+	case 1: { /* 1=Function.prototype.apply() */
 		/* Value stack:
 		 * idx_func + 0: Function.prototype.apply()  [removed]
 		 * idx_func + 1: this binding for .apply (target function)
@@ -62757,7 +66816,7 @@ DUK_LOCAL duk_bool_t duk__handle_specialfuncs_for_call(duk_hthread *thr, duk_idx
 		goto apply_shared;
 	}
 #if defined(DUK_USE_REFLECT_BUILTIN)
-	case 2: {  /* 2=Reflect.apply() */
+	case 2: { /* 2=Reflect.apply() */
 		/* Value stack:
 		 * idx_func + 0: Reflect.apply()  [removed]
 		 * idx_func + 1: this binding for .apply (ignored, usually Reflect)  [removed]
@@ -62776,7 +66835,7 @@ DUK_LOCAL duk_bool_t duk__handle_specialfuncs_for_call(duk_hthread *thr, duk_idx
 		duk_remove_n_unsafe(thr, idx_func, 2);
 		goto apply_shared;
 	}
-	case 3: {  /* 3=Reflect.construct() */
+	case 3: { /* 3=Reflect.construct() */
 		/* Value stack:
 		 * idx_func + 0: Reflect.construct()  [removed]
 		 * idx_func + 1: this binding for .construct (ignored, usually Reflect)  [removed]
@@ -62810,11 +66869,11 @@ DUK_LOCAL duk_bool_t duk__handle_specialfuncs_for_call(duk_hthread *thr, duk_idx
 			 * unpacking argArray (which may cause side effects).
 			 * Just return; caller will throw the error.
 			 */
-			duk_set_top_unsafe(thr, idx_func + 2);  /* satisfy asserts */
+			duk_set_top_unsafe(thr, idx_func + 2); /* satisfy asserts */
 			break;
 		}
 		duk_push_object(thr);
-		duk_insert(thr, idx_func + 1);  /* default instance */
+		duk_insert(thr, idx_func + 1); /* default instance */
 
 		/* [ ... func default_instance argArray newTarget? ] */
 
@@ -62830,16 +66889,17 @@ DUK_LOCAL duk_bool_t duk__handle_specialfuncs_for_call(duk_hthread *thr, duk_idx
 				DUK_ERROR_UNSUPPORTED(thr);
 				DUK_WO_NORETURN(return 0;);
 			}
-			duk_set_top_unsafe(thr, idx_func + 3);  /* remove any args beyond argArray */
+			duk_set_top_unsafe(thr, idx_func + 3); /* remove any args beyond argArray */
 		}
 		DUK_ASSERT(duk_get_top(thr) == idx_func + 3);
 		DUK_ASSERT(duk_is_valid_index(thr, idx_func + 2));
-		(void) duk_unpack_array_like(thr, idx_func + 2);  /* XXX: should also remove target to be symmetric with duk_pack()? */
+		(void) duk_unpack_array_like(thr,
+		                             idx_func + 2); /* XXX: should also remove target to be symmetric with duk_pack()? */
 		duk_remove(thr, idx_func + 2);
 		DUK_ASSERT(duk_get_top(thr) >= idx_func + 2);
 		break;
 	}
-#endif  /* DUK_USE_REFLECT_BUILTIN */
+#endif /* DUK_USE_REFLECT_BUILTIN */
 	default: {
 		DUK_ASSERT(0);
 		DUK_UNREACHABLE();
@@ -62847,18 +66907,18 @@ DUK_LOCAL duk_bool_t duk__handle_specialfuncs_for_call(duk_hthread *thr, duk_idx
 	}
 
 	DUK_ASSERT(duk_get_top(thr) >= idx_func + 2);
-	return 0;  /* keep resolving */
+	return 0; /* keep resolving */
 
- apply_shared:
+apply_shared:
 	tv_args = thr->valstack_bottom + idx_func + 2;
 	if (thr->valstack_top <= tv_args) {
 		DUK_ASSERT(tv_args <= thr->valstack_end);
-		thr->valstack_top = tv_args;  /* at least target func and 'this' binding present */
+		thr->valstack_top = tv_args; /* at least target func and 'this' binding present */
 		/* No need to check for argArray. */
 	} else {
-		DUK_ASSERT(duk_get_top(thr) >= idx_func + 3);  /* idx_func + 2 covered above */
+		DUK_ASSERT(duk_get_top(thr) >= idx_func + 3); /* idx_func + 2 covered above */
 		if (thr->valstack_top > tv_args + 1) {
-			duk_set_top_unsafe(thr, idx_func + 3);  /* remove any args beyond argArray */
+			duk_set_top_unsafe(thr, idx_func + 3); /* remove any args beyond argArray */
 		}
 		DUK_ASSERT(duk_is_valid_index(thr, idx_func + 2));
 		if (!duk_is_callable(thr, idx_func)) {
@@ -62871,7 +66931,7 @@ DUK_LOCAL duk_bool_t duk__handle_specialfuncs_for_call(duk_hthread *thr, duk_idx
 		}
 	}
 	DUK_ASSERT(duk_get_top(thr) >= idx_func + 2);
-	return 0;  /* keep resolving */
+	return 0; /* keep resolving */
 }
 
 /*
@@ -62956,6 +67016,7 @@ DUK_LOCAL void duk__handle_proxy_for_call(duk_hthread *thr, duk_idx_t idx_func,
 	duk_push_hobject(thr, h_proxy->target);
 	duk_insert(thr, idx_func + 3);
 	duk_pack(thr, duk_get_top(thr) - (idx_func + 5));
+	DUK_ASSERT(!duk_is_bare_object(thr, -1));
 
 	/* Here:
 	 * idx_func + 0: Proxy object
@@ -62968,8 +67029,8 @@ DUK_LOCAL void duk__handle_proxy_for_call(duk_hthread *thr, duk_idx_t idx_func,
 	DUK_ASSERT(duk_get_top(thr) == idx_func + 6);
 
 	if (*call_flags & DUK_CALL_FLAG_CONSTRUCT) {
-		*call_flags |= DUK_CALL_FLAG_CONSTRUCT_PROXY;  /* Enable 'construct' trap return invariant check. */
-		*call_flags &= ~(DUK_CALL_FLAG_CONSTRUCT);     /* Resume as non-constructor call to the trap. */
+		*call_flags |= DUK_CALL_FLAG_CONSTRUCT_PROXY; /* Enable 'construct' trap return invariant check. */
+		*call_flags &= ~(DUK_CALL_FLAG_CONSTRUCT); /* Resume as non-constructor call to the trap. */
 
 		/* 'apply' args: target, thisArg, argArray
 		 * 'construct' args: target, argArray, newTarget
@@ -62980,19 +67041,17 @@ DUK_LOCAL void duk__handle_proxy_for_call(duk_hthread *thr, duk_idx_t idx_func,
 
 	/* Finalize value stack layout by removing Proxy reference. */
 	duk_remove(thr, idx_func);
-	h_proxy = NULL;  /* invalidated */
+	h_proxy = NULL; /* invalidated */
 	DUK_ASSERT(duk_get_top(thr) == idx_func + 5);
 }
-#endif  /* DUK_USE_ES6_PROXY */
+#endif /* DUK_USE_ES6_PROXY */
 
 /*
  *  Helper for setting up var_env and lex_env of an activation,
  *  assuming it does NOT have the DUK_HOBJECT_FLAG_NEWENV flag.
  */
 
-DUK_LOCAL void duk__handle_oldenv_for_call(duk_hthread *thr,
-                                           duk_hobject *func,
-                                           duk_activation *act) {
+DUK_LOCAL void duk__handle_oldenv_for_call(duk_hthread *thr, duk_hobject *func, duk_activation *act) {
 	duk_hcompfunc *f;
 	duk_hobject *h_lex;
 	duk_hobject *h_var;
@@ -63008,7 +67067,7 @@ DUK_LOCAL void duk__handle_oldenv_for_call(duk_hthread *thr,
 	f = (duk_hcompfunc *) func;
 	h_lex = DUK_HCOMPFUNC_GET_LEXENV(thr->heap, f);
 	h_var = DUK_HCOMPFUNC_GET_VARENV(thr->heap, f);
-	DUK_ASSERT(h_lex != NULL);  /* Always true for closures (not for templates) */
+	DUK_ASSERT(h_lex != NULL); /* Always true for closures (not for templates) */
 	DUK_ASSERT(h_var != NULL);
 	act->lex_env = h_lex;
 	act->var_env = h_var;
@@ -63029,7 +67088,7 @@ DUK_LOCAL void duk__update_func_caller_prop(duk_hthread *thr, duk_hobject *func)
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(func != NULL);
-	DUK_ASSERT(!DUK_HOBJECT_HAS_BOUNDFUNC(func));  /* bound chain resolved */
+	DUK_ASSERT(!DUK_HOBJECT_HAS_BOUNDFUNC(func)); /* bound chain resolved */
 	DUK_ASSERT(thr->callstack_top >= 1);
 
 	if (DUK_HOBJECT_HAS_STRICT(func)) {
@@ -63045,7 +67104,7 @@ DUK_LOCAL void duk__update_func_caller_prop(duk_hthread *thr, duk_hobject *func)
 	/* XXX: check .caller writability? */
 
 	/* Backup 'caller' property and update its value. */
-	tv_caller = duk_hobject_find_existing_entry_tval_ptr(thr->heap, func, DUK_HTHREAD_STRING_CALLER(thr));
+	tv_caller = duk_hobject_find_entry_tval_ptr_stridx(thr->heap, func, DUK_STRIDX_CALLER);
 	if (tv_caller) {
 		/* If caller is global/eval code, 'caller' should be set to
 		 * 'null'.
@@ -63083,7 +67142,7 @@ DUK_LOCAL void duk__update_func_caller_prop(duk_hthread *thr, duk_hobject *func)
 				DUK_TVAL_SET_OBJECT(tv_caller, act_caller->func);
 				DUK_TVAL_INCREF(thr, tv_caller);
 			} else {
-				DUK_TVAL_SET_NULL(tv_caller);  /* no incref */
+				DUK_TVAL_SET_NULL(tv_caller); /* no incref */
 			}
 		} else {
 			/* 'caller' must only take on 'null' or function value */
@@ -63096,12 +67155,12 @@ DUK_LOCAL void duk__update_func_caller_prop(duk_hthread *thr, duk_hobject *func)
 				DUK_TVAL_SET_OBJECT(tv_caller, act_caller->func);
 				DUK_TVAL_INCREF(thr, tv_caller);
 			} else {
-				DUK_TVAL_SET_NULL(tv_caller);  /* no incref */
+				DUK_TVAL_SET_NULL(tv_caller); /* no incref */
 			}
 		}
 	}
 }
-#endif  /* DUK_USE_NONSTD_FUNC_CALLER_PROPERTY */
+#endif /* DUK_USE_NONSTD_FUNC_CALLER_PROPERTY */
 
 /*
  *  Shared helpers for resolving the final, non-bound target function of the
@@ -63147,7 +67206,7 @@ DUK_LOCAL DUK_INLINE void duk__coerce_nonstrict_this_binding(duk_hthread *thr, d
 		obj_global = thr->builtins[DUK_BIDX_GLOBAL];
 		/* XXX: avoid this check somehow */
 		if (DUK_LIKELY(obj_global != NULL)) {
-			DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv_this));  /* no need to decref previous value */
+			DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv_this)); /* no need to decref previous value */
 			DUK_TVAL_SET_OBJECT(tv_this, obj_global);
 			DUK_HOBJECT_INCREF(thr, obj_global);
 		} else {
@@ -63155,8 +67214,8 @@ DUK_LOCAL DUK_INLINE void duk__coerce_nonstrict_this_binding(duk_hthread *thr, d
 			 * This behavior is out of specification scope.
 			 */
 			DUK_D(DUK_DPRINT("this binding: wanted to use global object, but it is NULL -> using undefined instead"));
-			DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv_this));  /* no need to decref previous value */
-			DUK_TVAL_SET_UNDEFINED(tv_this);  /* nothing to incref */
+			DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv_this)); /* no need to decref previous value */
+			DUK_TVAL_SET_UNDEFINED(tv_this); /* nothing to incref */
 		}
 		break;
 	default:
@@ -63167,18 +67226,21 @@ DUK_LOCAL DUK_INLINE void duk__coerce_nonstrict_this_binding(duk_hthread *thr, d
 		 */
 		DUK_ASSERT(!DUK_TVAL_IS_UNUSED(tv_this));
 		DUK_DDD(DUK_DDDPRINT("this binding: non-strict, not object/undefined/null -> use ToObject(value)"));
-		duk_to_object(thr, idx_this);  /* may have side effects */
+		duk_to_object(thr, idx_this); /* may have side effects */
 		break;
 	}
 }
 
-DUK_LOCAL DUK_ALWAYS_INLINE duk_bool_t duk__resolve_target_fastpath_check(duk_hthread *thr, duk_idx_t idx_func, duk_hobject **out_func, duk_small_uint_t call_flags) {
+DUK_LOCAL DUK_ALWAYS_INLINE duk_bool_t duk__resolve_target_fastpath_check(duk_hthread *thr,
+                                                                          duk_idx_t idx_func,
+                                                                          duk_hobject **out_func,
+                                                                          duk_small_uint_t call_flags) {
 #if defined(DUK_USE_PREFER_SIZE)
 	DUK_UNREF(thr);
 	DUK_UNREF(idx_func);
 	DUK_UNREF(out_func);
 	DUK_UNREF(call_flags);
-#else  /* DUK_USE_PREFER_SIZE */
+#else /* DUK_USE_PREFER_SIZE */
 	duk_tval *tv_func;
 	duk_hobject *func;
 
@@ -63191,9 +67253,7 @@ DUK_LOCAL DUK_ALWAYS_INLINE duk_bool_t duk__resolve_target_fastpath_check(duk_ht
 
 	if (DUK_LIKELY(DUK_TVAL_IS_OBJECT(tv_func))) {
 		func = DUK_TVAL_GET_OBJECT(tv_func);
-		if (DUK_HOBJECT_IS_CALLABLE(func) &&
-		    !DUK_HOBJECT_HAS_BOUNDFUNC(func) &&
-		    !DUK_HOBJECT_HAS_SPECIAL_CALL(func)) {
+		if (DUK_HOBJECT_IS_CALLABLE(func) && !DUK_HOBJECT_HAS_BOUNDFUNC(func) && !DUK_HOBJECT_HAS_SPECIAL_CALL(func)) {
 			*out_func = func;
 
 			if (DUK_HOBJECT_HAS_STRICT(func)) {
@@ -63213,8 +67273,8 @@ DUK_LOCAL DUK_ALWAYS_INLINE duk_bool_t duk__resolve_target_fastpath_check(duk_ht
 		 */
 		return 1;
 	}
-#endif  /* DUK_USE_PREFER_SIZE */
-	return 0;  /* let slow path deal with it */
+#endif /* DUK_USE_PREFER_SIZE */
+	return 0; /* let slow path deal with it */
 }
 
 DUK_LOCAL duk_hobject *duk__resolve_target_func_and_this_binding(duk_hthread *thr,
@@ -63232,6 +67292,8 @@ DUK_LOCAL duk_hobject *duk__resolve_target_func_and_this_binding(duk_hthread *th
 		tv_func = DUK_GET_TVAL_POSIDX(thr, idx_func);
 		DUK_ASSERT(tv_func != NULL);
 
+		DUK_DD(DUK_DDPRINT("target func: %!iT", tv_func));
+
 		if (DUK_TVAL_IS_OBJECT(tv_func)) {
 			func = DUK_TVAL_GET_OBJECT(tv_func);
 
@@ -63245,8 +67307,7 @@ DUK_LOCAL duk_hobject *duk__resolve_target_func_and_this_binding(duk_hthread *th
 				}
 			}
 
-			if (DUK_LIKELY(!DUK_HOBJECT_HAS_BOUNDFUNC(func) &&
-			               !DUK_HOBJECT_HAS_SPECIAL_CALL(func) &&
+			if (DUK_LIKELY(!DUK_HOBJECT_HAS_BOUNDFUNC(func) && !DUK_HOBJECT_HAS_SPECIAL_CALL(func) &&
 			               !DUK_HOBJECT_HAS_EXOTIC_PROXYOBJ(func))) {
 				/* Common case, so test for using a single bitfield test.
 				 * Break out to handle this coercion etc.
@@ -63282,8 +67343,7 @@ DUK_LOCAL duk_hobject *duk__resolve_target_func_and_this_binding(duk_hthread *th
 					 * the trap may be bound.
 					 */
 					duk__handle_proxy_for_call(thr, idx_func, (duk_hproxy *) func, call_flags);
-				}
-				else
+				} else
 #endif
 				{
 					DUK_ASSERT(DUK_HOBJECT_IS_NATFUNC(func));
@@ -63330,40 +67390,41 @@ DUK_LOCAL duk_hobject *duk__resolve_target_func_and_this_binding(duk_hthread *th
 		}
 	}
 
- finished:
-
+finished :
 #if defined(DUK_USE_ASSERTIONS)
-	{
-		duk_tval *tv_tmp;
+{
+	duk_tval *tv_tmp;
 
-		tv_tmp = duk_get_tval(thr, idx_func);
-		DUK_ASSERT(tv_tmp != NULL);
+	tv_tmp = duk_get_tval(thr, idx_func);
+	DUK_ASSERT(tv_tmp != NULL);
 
-		DUK_ASSERT((DUK_TVAL_IS_OBJECT(tv_tmp) && DUK_HOBJECT_IS_CALLABLE(DUK_TVAL_GET_OBJECT(tv_tmp))) ||
-		           DUK_TVAL_IS_LIGHTFUNC(tv_tmp));
-		DUK_ASSERT(func == NULL || !DUK_HOBJECT_HAS_BOUNDFUNC(func));
-		DUK_ASSERT(func == NULL || (DUK_HOBJECT_IS_COMPFUNC(func) ||
-		                            DUK_HOBJECT_IS_NATFUNC(func)));
-		DUK_ASSERT(func == NULL || (DUK_HOBJECT_HAS_CONSTRUCTABLE(func) ||
-		                            (*call_flags & DUK_CALL_FLAG_CONSTRUCT) == 0));
-	}
+	DUK_ASSERT((DUK_TVAL_IS_OBJECT(tv_tmp) && DUK_HOBJECT_IS_CALLABLE(DUK_TVAL_GET_OBJECT(tv_tmp))) ||
+	           DUK_TVAL_IS_LIGHTFUNC(tv_tmp));
+	DUK_ASSERT(func == NULL || !DUK_HOBJECT_HAS_BOUNDFUNC(func));
+	DUK_ASSERT(func == NULL || (DUK_HOBJECT_IS_COMPFUNC(func) || DUK_HOBJECT_IS_NATFUNC(func)));
+	DUK_ASSERT(func == NULL || (DUK_HOBJECT_HAS_CONSTRUCTABLE(func) || (*call_flags & DUK_CALL_FLAG_CONSTRUCT) == 0));
+}
 #endif
 
 	return func;
 
- not_callable:
+not_callable:
 	DUK_ASSERT(tv_func != NULL);
 
 #if defined(DUK_USE_VERBOSE_ERRORS)
 	/* GETPROPC delayed error handling: when target is not callable,
-	 * GETPROPC replaces idx_func+0 with an Error (non-callable) with
-	 * a hidden Symbol to signify it's to be thrown as is here.  The
+	 * GETPROPC replaces idx_func+0 with a non-callable wrapper object
+	 * with a hidden Symbol to signify it's to be handled here.  If
+	 * found, unwrap the original Error and throw it as is here.  The
 	 * hidden Symbol is only checked as an own property, not inherited
 	 * (which would be dangerous).
 	 */
 	if (DUK_TVAL_IS_OBJECT(tv_func)) {
-		if (duk_hobject_find_existing_entry_tval_ptr(thr->heap, DUK_TVAL_GET_OBJECT(tv_func), DUK_HTHREAD_STRING_INT_TARGET(thr)) != NULL) {
-			duk_push_tval(thr, tv_func);
+		duk_tval *tv_wrap =
+		    duk_hobject_find_entry_tval_ptr_stridx(thr->heap, DUK_TVAL_GET_OBJECT(tv_func), DUK_STRIDX_INT_TARGET);
+		if (tv_wrap != NULL) {
+			DUK_DD(DUK_DDPRINT("delayed error from GETPROPC: %!T", tv_wrap));
+			duk_push_tval(thr, tv_wrap);
 			(void) duk_throw(thr);
 			DUK_WO_NORETURN(return NULL;);
 		}
@@ -63381,7 +67442,7 @@ DUK_LOCAL duk_hobject *duk__resolve_target_func_and_this_binding(duk_hthread *th
 #endif
 	DUK_WO_NORETURN(return NULL;);
 
- not_constructable:
+not_constructable:
 	/* For now GETPROPC delayed error not needed for constructor calls. */
 #if defined(DUK_USE_VERBOSE_ERRORS)
 #if defined(DUK_USE_PARANOID_ERRORS)
@@ -63405,7 +67466,10 @@ DUK_LOCAL duk_hobject *duk__resolve_target_func_and_this_binding(duk_hthread *th
  *  empty (below idx_retbase).
  */
 
-DUK_LOCAL void duk__safe_call_adjust_valstack(duk_hthread *thr, duk_idx_t idx_retbase, duk_idx_t num_stack_rets, duk_idx_t num_actual_rets) {
+DUK_LOCAL void duk__safe_call_adjust_valstack(duk_hthread *thr,
+                                              duk_idx_t idx_retbase,
+                                              duk_idx_t num_stack_rets,
+                                              duk_idx_t num_actual_rets) {
 	duk_idx_t idx_rcbase;
 
 	DUK_ASSERT(thr != NULL);
@@ -63413,7 +67477,7 @@ DUK_LOCAL void duk__safe_call_adjust_valstack(duk_hthread *thr, duk_idx_t idx_re
 	DUK_ASSERT(num_stack_rets >= 0);
 	DUK_ASSERT(num_actual_rets >= 0);
 
-	idx_rcbase = duk_get_top(thr) - num_actual_rets;  /* base of known return values */
+	idx_rcbase = duk_get_top(thr) - num_actual_rets; /* base of known return values */
 	if (DUK_UNLIKELY(idx_rcbase < 0)) {
 		DUK_ERROR_TYPE(thr, DUK_STR_INVALID_CFUNC_RC);
 		DUK_WO_NORETURN(return;);
@@ -63421,10 +67485,13 @@ DUK_LOCAL void duk__safe_call_adjust_valstack(duk_hthread *thr, duk_idx_t idx_re
 
 	DUK_DDD(DUK_DDDPRINT("adjust valstack after func call: "
 	                     "num_stack_rets=%ld, num_actual_rets=%ld, stack_top=%ld, idx_retbase=%ld, idx_rcbase=%ld",
-	                     (long) num_stack_rets, (long) num_actual_rets, (long) duk_get_top(thr),
-	                     (long) idx_retbase, (long) idx_rcbase));
+	                     (long) num_stack_rets,
+	                     (long) num_actual_rets,
+	                     (long) duk_get_top(thr),
+	                     (long) idx_retbase,
+	                     (long) idx_rcbase));
 
-	DUK_ASSERT(idx_rcbase >= 0);  /* caller must check */
+	DUK_ASSERT(idx_rcbase >= 0); /* caller must check */
 
 	/* Space for num_stack_rets was reserved before the safe call.
 	 * Because value stack reserve cannot shrink except in call returns,
@@ -63439,24 +67506,28 @@ DUK_LOCAL void duk__safe_call_adjust_valstack(duk_hthread *thr, duk_idx_t idx_re
 		duk_idx_t count = idx_rcbase - idx_retbase;
 
 		DUK_DDD(DUK_DDDPRINT("elements at/after idx_retbase have enough to cover func retvals "
-		                     "(idx_retbase=%ld, idx_rcbase=%ld)", (long) idx_retbase, (long) idx_rcbase));
+		                     "(idx_retbase=%ld, idx_rcbase=%ld)",
+		                     (long) idx_retbase,
+		                     (long) idx_rcbase));
 
 		/* Remove values between irc_rcbase (start of intended return
 		 * values) and idx_retbase to lower return values to idx_retbase.
 		 */
 		DUK_ASSERT(count > 0);
-		duk_remove_n(thr, idx_retbase, count);  /* may be NORZ */
+		duk_remove_n(thr, idx_retbase, count); /* may be NORZ */
 	} else {
 		duk_idx_t count = idx_retbase - idx_rcbase;
 
 		DUK_DDD(DUK_DDDPRINT("not enough elements at/after idx_retbase to cover func retvals "
-		                     "(idx_retbase=%ld, idx_rcbase=%ld)", (long) idx_retbase, (long) idx_rcbase));
+		                     "(idx_retbase=%ld, idx_rcbase=%ld)",
+		                     (long) idx_retbase,
+		                     (long) idx_rcbase));
 
 		/* Insert 'undefined' at idx_rcbase (start of intended return
 		 * values) to lift return values to idx_retbase.
 		 */
 		DUK_ASSERT(count >= 0);
-		DUK_ASSERT(thr->valstack_end - thr->valstack_top >= count);  /* reserve cannot shrink */
+		DUK_ASSERT(thr->valstack_end - thr->valstack_top >= count); /* reserve cannot shrink */
 		duk_insert_undefined_n(thr, idx_rcbase, count);
 	}
 
@@ -63517,12 +67588,12 @@ DUK_LOCAL duk_small_uint_t duk__call_setup_act_attempt_tailcall(duk_hthread *thr
 #if defined(DUK_USE_ES6_PROXY)
 	         | (duk_small_uint_t) ((act->flags & DUK_ACT_FLAG_CONSTRUCT_PROXY) ? 2 : 0)
 #endif
-	         ;
+	    ;
 	flags2 = (duk_small_uint_t) ((call_flags & DUK_CALL_FLAG_CONSTRUCT) ? 1 : 0)
 #if defined(DUK_USE_ES6_PROXY)
 	         | (duk_small_uint_t) ((call_flags & DUK_CALL_FLAG_CONSTRUCT_PROXY) ? 2 : 0);
 #endif
-	         ;
+	;
 	if (flags1 != flags2) {
 		DUK_DDD(DUK_DDDPRINT("tail call prevented by incompatible return value handling"));
 		return 0;
@@ -63560,8 +67631,7 @@ DUK_LOCAL duk_small_uint_t duk__call_setup_act_attempt_tailcall(duk_hthread *thr
 	 *      https://github.com/svaarala/duktape/issues/1726.
 	 */
 
-	DUK_DDD(DUK_DDDPRINT("is tail call, reusing activation at callstack top, at index %ld",
-                             (long) (thr->callstack_top - 1)));
+	DUK_DDD(DUK_DDDPRINT("is tail call, reusing activation at callstack top, at index %ld", (long) (thr->callstack_top - 1)));
 
 	DUK_ASSERT(!DUK_HOBJECT_HAS_BOUNDFUNC(func));
 	DUK_ASSERT(!DUK_HOBJECT_HAS_NATFUNC(func));
@@ -63605,7 +67675,7 @@ DUK_LOCAL duk_small_uint_t duk__call_setup_act_attempt_tailcall(duk_hthread *thr
 	act->lex_env = NULL;
 	DUK_ASSERT(func != NULL);
 	DUK_ASSERT(DUK_HOBJECT_HAS_COMPFUNC(func));
-	act->func = func;  /* don't want an intermediate exposed state with func == NULL */
+	act->func = func; /* don't want an intermediate exposed state with func == NULL */
 #if defined(DUK_USE_NONSTD_FUNC_CALLER_PROPERTY)
 	act->prev_caller = NULL;
 #endif
@@ -63614,7 +67684,7 @@ DUK_LOCAL duk_small_uint_t duk__call_setup_act_attempt_tailcall(duk_hthread *thr
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
 	act->prev_line = 0;
 #endif
-	DUK_TVAL_SET_OBJECT(&act->tv_func, func);  /* borrowed, no refcount */
+	DUK_TVAL_SET_OBJECT(&act->tv_func, func); /* borrowed, no refcount */
 	DUK_HOBJECT_INCREF(thr, func);
 
 	act->flags = DUK_ACT_FLAG_TAILCALLED;
@@ -63630,10 +67700,10 @@ DUK_LOCAL duk_small_uint_t duk__call_setup_act_attempt_tailcall(duk_hthread *thr
 	}
 #endif
 
-	DUK_ASSERT(DUK_ACT_GET_FUNC(act) == func);      /* already updated */
+	DUK_ASSERT(DUK_ACT_GET_FUNC(act) == func); /* already updated */
 	DUK_ASSERT(act->var_env == NULL);
 	DUK_ASSERT(act->lex_env == NULL);
-	act->bottom_byteoff = entry_valstack_bottom_byteoff;  /* tail call -> reuse current "frame" */
+	act->bottom_byteoff = entry_valstack_bottom_byteoff; /* tail call -> reuse current "frame" */
 #if 0
 	/* Topmost activation retval_byteoff is considered garbage, no need to init. */
 	act->retval_byteoff = 0;
@@ -63658,22 +67728,23 @@ DUK_LOCAL duk_small_uint_t duk__call_setup_act_attempt_tailcall(duk_hthread *thr
 
 	tv1 = thr->valstack_bottom - 1;
 	tv2 = thr->valstack_bottom + idx_func + 1;
-	DUK_ASSERT(tv1 >= thr->valstack && tv1 < thr->valstack_top);  /* tv1 is -below- valstack_bottom */
+	DUK_ASSERT(tv1 >= thr->valstack && tv1 < thr->valstack_top); /* tv1 is -below- valstack_bottom */
 	DUK_ASSERT(tv2 >= thr->valstack_bottom && tv2 < thr->valstack_top);
-	DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2);  /* side effects */
+	DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2); /* side effects */
 
 	idx_args = idx_func + 2;
-	duk_remove_n(thr, 0, idx_args);  /* may be NORZ */
+	duk_remove_n(thr, 0, idx_args); /* may be NORZ */
 
-	idx_func = 0; DUK_UNREF(idx_func);  /* really 'not applicable' anymore, should not be referenced after this */
+	idx_func = 0;
+	DUK_UNREF(idx_func); /* really 'not applicable' anymore, should not be referenced after this */
 	idx_args = 0;
 
 	*out_nargs = ((duk_hcompfunc *) func)->nargs;
 	*out_nregs = ((duk_hcompfunc *) func)->nregs;
 	DUK_ASSERT(*out_nregs >= 0);
 	DUK_ASSERT(*out_nregs >= *out_nargs);
-	*out_vs_min_bytes = entry_valstack_bottom_byteoff + sizeof(duk_tval) * ((duk_size_t) *out_nregs + DUK_VALSTACK_INTERNAL_EXTRA);
-
+	*out_vs_min_bytes =
+	    entry_valstack_bottom_byteoff + sizeof(duk_tval) * ((duk_size_t) *out_nregs + DUK_VALSTACK_INTERNAL_EXTRA);
 
 #if defined(DUK_USE_NONSTD_FUNC_CALLER_PROPERTY)
 #if defined(DUK_USE_TAILCALL)
@@ -63690,7 +67761,7 @@ DUK_LOCAL duk_small_uint_t duk__call_setup_act_attempt_tailcall(duk_hthread *thr
 
 	return 1;
 }
-#endif  /* DUK_USE_TAILCALL */
+#endif /* DUK_USE_TAILCALL */
 
 DUK_LOCAL void duk__call_setup_act_not_tailcall(duk_hthread *thr,
                                                 duk_small_uint_t call_flags,
@@ -63707,8 +67778,7 @@ DUK_LOCAL void duk__call_setup_act_not_tailcall(duk_hthread *thr,
 
 	DUK_UNREF(entry_valstack_end_byteoff);
 
-	DUK_DDD(DUK_DDDPRINT("not a tail call, pushing a new activation to callstack, to index %ld",
-	                     (long) (thr->callstack_top)));
+	DUK_DDD(DUK_DDDPRINT("not a tail call, pushing a new activation to callstack, to index %ld", (long) (thr->callstack_top)));
 
 	duk__call_callstack_limit_check(thr);
 	new_act = duk_hthread_activation_alloc(thr);
@@ -63735,7 +67805,7 @@ DUK_LOCAL void duk__call_setup_act_not_tailcall(duk_hthread *thr,
 	act = new_act;
 	*out_act = act;
 
-	DUK_ASSERT(thr->valstack_top > thr->valstack_bottom);  /* at least effective 'this' */
+	DUK_ASSERT(thr->valstack_top > thr->valstack_bottom); /* at least effective 'this' */
 	DUK_ASSERT(func == NULL || !DUK_HOBJECT_HAS_BOUNDFUNC(func));
 
 	act->cat = NULL;
@@ -63754,9 +67824,9 @@ DUK_LOCAL void duk__call_setup_act_not_tailcall(duk_hthread *thr,
 	}
 
 	/* start of arguments: idx_func + 2. */
-	act->func = func;  /* NULL for lightfunc */
+	act->func = func; /* NULL for lightfunc */
 	if (DUK_LIKELY(func != NULL)) {
-		DUK_TVAL_SET_OBJECT(&act->tv_func, func);  /* borrowed, no refcount */
+		DUK_TVAL_SET_OBJECT(&act->tv_func, func); /* borrowed, no refcount */
 		if (DUK_HOBJECT_HAS_STRICT(func)) {
 			act->flags |= DUK_ACT_FLAG_STRICT;
 		}
@@ -63765,8 +67835,9 @@ DUK_LOCAL void duk__call_setup_act_not_tailcall(duk_hthread *thr,
 			*out_nregs = ((duk_hcompfunc *) func)->nregs;
 			DUK_ASSERT(*out_nregs >= 0);
 			DUK_ASSERT(*out_nregs >= *out_nargs);
-			*out_vs_min_bytes = entry_valstack_bottom_byteoff +
-				sizeof(duk_tval) * ((duk_size_t) idx_func + 2U + (duk_size_t) *out_nregs + DUK_VALSTACK_INTERNAL_EXTRA);
+			*out_vs_min_bytes =
+			    entry_valstack_bottom_byteoff +
+			    sizeof(duk_tval) * ((duk_size_t) idx_func + 2U + (duk_size_t) *out_nregs + DUK_VALSTACK_INTERNAL_EXTRA);
 		} else {
 			/* True because of call target lookup checks. */
 			DUK_ASSERT(DUK_HOBJECT_IS_NATFUNC(func));
@@ -63774,13 +67845,16 @@ DUK_LOCAL void duk__call_setup_act_not_tailcall(duk_hthread *thr,
 			*out_nargs = ((duk_hnatfunc *) func)->nargs;
 			*out_nregs = *out_nargs;
 			if (*out_nargs >= 0) {
-				*out_vs_min_bytes = entry_valstack_bottom_byteoff +
-					sizeof(duk_tval) * ((duk_size_t) idx_func + 2U + (duk_size_t) *out_nregs + DUK_VALSTACK_API_ENTRY_MINIMUM + DUK_VALSTACK_INTERNAL_EXTRA);
+				*out_vs_min_bytes =
+				    entry_valstack_bottom_byteoff +
+				    sizeof(duk_tval) * ((duk_size_t) idx_func + 2U + (duk_size_t) *out_nregs +
+				                        DUK_VALSTACK_API_ENTRY_MINIMUM + DUK_VALSTACK_INTERNAL_EXTRA);
 			} else {
 				/* Vararg function. */
-				duk_size_t valstack_top_byteoff = (duk_size_t) ((duk_uint8_t *) thr->valstack_top - ((duk_uint8_t *) thr->valstack));
-				*out_vs_min_bytes = valstack_top_byteoff +
-					sizeof(duk_tval) * (DUK_VALSTACK_API_ENTRY_MINIMUM + DUK_VALSTACK_INTERNAL_EXTRA);
+				duk_size_t valstack_top_byteoff =
+				    (duk_size_t) ((duk_uint8_t *) thr->valstack_top - ((duk_uint8_t *) thr->valstack));
+				*out_vs_min_bytes = valstack_top_byteoff + sizeof(duk_tval) * (DUK_VALSTACK_API_ENTRY_MINIMUM +
+				                                                               DUK_VALSTACK_INTERNAL_EXTRA);
 			}
 		}
 	} else {
@@ -63791,18 +67865,20 @@ DUK_LOCAL void duk__call_setup_act_not_tailcall(duk_hthread *thr,
 
 		tv_func = DUK_GET_TVAL_POSIDX(thr, idx_func);
 		DUK_ASSERT(DUK_TVAL_IS_LIGHTFUNC(tv_func));
-		DUK_TVAL_SET_TVAL(&act->tv_func, tv_func);  /* borrowed, no refcount */
+		DUK_TVAL_SET_TVAL(&act->tv_func, tv_func); /* borrowed, no refcount */
 
 		lf_flags = DUK_TVAL_GET_LIGHTFUNC_FLAGS(tv_func);
 		*out_nargs = DUK_LFUNC_FLAGS_GET_NARGS(lf_flags);
 		if (*out_nargs != DUK_LFUNC_NARGS_VARARGS) {
 			*out_vs_min_bytes = entry_valstack_bottom_byteoff +
-				sizeof(duk_tval) * ((duk_size_t) idx_func + 2U + (duk_size_t) *out_nargs + DUK_VALSTACK_API_ENTRY_MINIMUM + DUK_VALSTACK_INTERNAL_EXTRA);
+			                    sizeof(duk_tval) * ((duk_size_t) idx_func + 2U + (duk_size_t) *out_nargs +
+			                                        DUK_VALSTACK_API_ENTRY_MINIMUM + DUK_VALSTACK_INTERNAL_EXTRA);
 		} else {
-			duk_size_t valstack_top_byteoff = (duk_size_t) ((duk_uint8_t *) thr->valstack_top - ((duk_uint8_t *) thr->valstack));
+			duk_size_t valstack_top_byteoff =
+			    (duk_size_t) ((duk_uint8_t *) thr->valstack_top - ((duk_uint8_t *) thr->valstack));
 			*out_vs_min_bytes = valstack_top_byteoff +
-				sizeof(duk_tval) * (DUK_VALSTACK_API_ENTRY_MINIMUM + DUK_VALSTACK_INTERNAL_EXTRA);
-			*out_nargs = -1;  /* vararg */
+			                    sizeof(duk_tval) * (DUK_VALSTACK_API_ENTRY_MINIMUM + DUK_VALSTACK_INTERNAL_EXTRA);
+			*out_nargs = -1; /* vararg */
 		}
 		*out_nregs = *out_nargs;
 	}
@@ -63824,13 +67900,13 @@ DUK_LOCAL void duk__call_setup_act_not_tailcall(duk_hthread *thr,
 	 * even in error unwind because reserve_byteoff is only used when
 	 * returning to -this- activation.
 	 */
-	act->reserve_byteoff = 0;  /* filled in by caller */
+	act->reserve_byteoff = 0; /* filled in by caller */
 
 	/* XXX: Is this INCREF necessary? 'func' is always a borrowed
 	 * reference reachable through the value stack?  If changed, stack
 	 * unwind code also needs to be fixed to match.
 	 */
-	DUK_HOBJECT_INCREF_ALLOWNULL(thr, func);  /* act->func */
+	DUK_HOBJECT_INCREF_ALLOWNULL(thr, func); /* act->func */
 
 #if defined(DUK_USE_NONSTD_FUNC_CALLER_PROPERTY)
 	if (func) {
@@ -63846,10 +67922,11 @@ DUK_LOCAL void duk__call_setup_act_not_tailcall(duk_hthread *thr,
 DUK_LOCAL void duk__call_env_setup(duk_hthread *thr, duk_hobject *func, duk_activation *act, duk_idx_t idx_args) {
 	duk_hobject *env;
 
-	DUK_ASSERT(func == NULL || !DUK_HOBJECT_HAS_BOUNDFUNC(func));  /* bound function has already been resolved */
+	DUK_ASSERT(func == NULL || !DUK_HOBJECT_HAS_BOUNDFUNC(func)); /* bound function has already been resolved */
 
 	if (DUK_LIKELY(func != NULL)) {
 		if (DUK_LIKELY(DUK_HOBJECT_HAS_NEWENV(func))) {
+			DUK_STATS_INC(thr->heap, stats_envrec_newenv);
 			if (DUK_LIKELY(!DUK_HOBJECT_HAS_CREATEARGS(func))) {
 				/* Use a new environment but there's no 'arguments' object;
 				 * delayed environment initialization.  This is the most
@@ -63876,7 +67953,7 @@ DUK_LOCAL void duk__call_env_setup(duk_hthread *thr, duk_hobject *func, duk_acti
 				act->lex_env = env;
 				act->var_env = env;
 				DUK_HOBJECT_INCREF(thr, env);
-				DUK_HOBJECT_INCREF(thr, env);  /* XXX: incref by count (2) directly */
+				DUK_HOBJECT_INCREF(thr, env); /* XXX: incref by count (2) directly */
 				duk_pop(thr);
 			}
 		} else {
@@ -63886,6 +67963,7 @@ DUK_LOCAL void duk__call_env_setup(duk_hthread *thr, duk_hobject *func, duk_acti
 
 			DUK_ASSERT(!DUK_HOBJECT_HAS_CREATEARGS(func));
 
+			DUK_STATS_INC(thr->heap, stats_envrec_oldenv);
 			duk__handle_oldenv_for_call(thr, func, act);
 
 			DUK_ASSERT(act->lex_env != NULL);
@@ -63895,6 +67973,7 @@ DUK_LOCAL void duk__call_env_setup(duk_hthread *thr, duk_hobject *func, duk_acti
 		/* Lightfuncs are always native functions and have "newenv". */
 		DUK_ASSERT(act->lex_env == NULL);
 		DUK_ASSERT(act->var_env == NULL);
+		DUK_STATS_INC(thr->heap, stats_envrec_newenv);
 	}
 }
 
@@ -63912,8 +67991,7 @@ DUK_LOCAL void duk__call_thread_state_update(duk_hthread *thr) {
 			goto thread_state_error;
 		}
 	} else {
-		DUK_ASSERT(thr->heap->curr_thread == NULL ||
-		           thr->heap->curr_thread->state == DUK_HTHREAD_STATE_RUNNING);
+		DUK_ASSERT(thr->heap->curr_thread == NULL || thr->heap->curr_thread->state == DUK_HTHREAD_STATE_RUNNING);
 		if (DUK_UNLIKELY(thr->state != DUK_HTHREAD_STATE_INACTIVE)) {
 			goto thread_state_error;
 		}
@@ -63928,7 +68006,7 @@ DUK_LOCAL void duk__call_thread_state_update(duk_hthread *thr) {
 	DUK_ASSERT(thr->state == DUK_HTHREAD_STATE_RUNNING);
 	return;
 
- thread_state_error:
+thread_state_error:
 	DUK_ERROR_FMT1(thr, DUK_ERR_TYPE_ERROR, "invalid thread state (%ld)", (long) thr->state);
 	DUK_WO_NORETURN(return;);
 }
@@ -63954,9 +68032,7 @@ DUK_LOCAL void duk__call_thread_state_update(duk_hthread *thr) {
  *  place; the only guarantee is that the state is consistent for unwinding.
  */
 
-DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
-                                         duk_idx_t idx_func,
-                                         duk_small_uint_t call_flags) {
+DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr, duk_idx_t idx_func, duk_small_uint_t call_flags) {
 #if defined(DUK_USE_ASSERTIONS)
 	duk_activation *entry_act;
 	duk_size_t entry_callstack_top;
@@ -63968,10 +68044,10 @@ DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
 	duk_uint_fast8_t entry_thread_state;
 	duk_instr_t **entry_ptr_curr_pc;
 	duk_idx_t idx_args;
-	duk_idx_t nargs;            /* # argument registers target function wants (< 0 => "as is") */
-	duk_idx_t nregs;            /* # total registers target function wants on entry (< 0 => "as is") */
-	duk_size_t vs_min_bytes;    /* minimum value stack size (bytes) for handling call */
-	duk_hobject *func;          /* 'func' on stack (borrowed reference) */
+	duk_idx_t nargs; /* # argument registers target function wants (< 0 => "as is") */
+	duk_idx_t nregs; /* # total registers target function wants on entry (< 0 => "as is") */
+	duk_size_t vs_min_bytes; /* minimum value stack size (bytes) for handling call */
+	duk_hobject *func; /* 'func' on stack (borrowed reference) */
 	duk_activation *act;
 	duk_ret_t rc;
 	duk_small_uint_t use_tailcall;
@@ -63981,7 +68057,7 @@ DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
 	/* Asserts for heap->curr_thread omitted: it may be NULL, 'thr', or
 	 * any other thread (e.g. when heap thread is used to run finalizers).
 	 */
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	DUK_ASSERT(duk_is_valid_index(thr, idx_func));
 	DUK_ASSERT(idx_func >= 0);
 
@@ -64012,7 +68088,7 @@ DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
 			DUK_ASSERT(DUK_CAT_GET_TYPE(tmp_cat) == DUK_CAT_TYPE_LABEL); /* a non-catching entry */
 		}
 	}
-#endif  /* DUK_USE_ASSERTIONS */
+#endif /* DUK_USE_ASSERTIONS */
 
 	/*
 	 *  Store entry state.
@@ -64025,9 +68101,9 @@ DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
 	entry_valstack_bottom_byteoff = (duk_size_t) ((duk_uint8_t *) thr->valstack_bottom - (duk_uint8_t *) thr->valstack);
 	entry_valstack_end_byteoff = (duk_size_t) ((duk_uint8_t *) thr->valstack_end - (duk_uint8_t *) thr->valstack);
 	entry_call_recursion_depth = thr->heap->call_recursion_depth;
-	entry_curr_thread = thr->heap->curr_thread;  /* may be NULL if first call */
+	entry_curr_thread = thr->heap->curr_thread; /* may be NULL if first call */
 	entry_thread_state = thr->state;
-	entry_ptr_curr_pc = thr->ptr_curr_pc;  /* may be NULL */
+	entry_ptr_curr_pc = thr->ptr_curr_pc; /* may be NULL */
 
 	/* If thr->ptr_curr_pc is set, sync curr_pc to act->pc.  Then NULL
 	 * thr->ptr_curr_pc so that it's not accidentally used with an incorrect
@@ -64064,6 +68140,26 @@ DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
 	duk__call_thread_state_update(thr);
 
 	/*
+	 *  Increase call recursion depth as early as possible so that if we
+	 *  enter a recursive call for any reason there's a backstop to native
+	 *  recursion.  This can happen e.g. for almost any property read
+	 *  because it may cause a getter call or a Proxy trap (GC and finalizers
+	 *  are not an issue because they are not recursive).  If we end up
+	 *  doing an Ecma-to-Ecma call, revert the increase.  (See GH-2032.)
+	 *
+	 *  For similar reasons, ensure there is a known value stack spare
+	 *  even before we actually prepare the value stack for the target
+	 *  function.  If this isn't done, early recursion may consume the
+	 *  value stack space.
+	 *
+	 *  XXX: Should bump yield preventcount early, for the same reason.
+	 */
+
+	duk__call_c_recursion_limit_check(thr);
+	thr->heap->call_recursion_depth++;
+	duk_require_stack(thr, DUK__CALL_HANDLING_REQUIRE_STACK);
+
+	/*
 	 *  Resolve final target function; handle bound functions and special
 	 *  functions like .call() and .apply().  Also figure out the effective
 	 *  'this' binding, which replaces the current value at idx_func + 1.
@@ -64075,11 +68171,10 @@ DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
 		DUK_DDD(DUK_DDDPRINT("slow path target resolve"));
 		func = duk__resolve_target_func_and_this_binding(thr, idx_func, &call_flags);
 	}
-	DUK_ASSERT(duk_get_top(thr) - idx_func >= 2);  /* at least func and this present */
+	DUK_ASSERT(duk_get_top(thr) - idx_func >= 2); /* at least func and this present */
 
 	DUK_ASSERT(func == NULL || !DUK_HOBJECT_HAS_BOUNDFUNC(func));
-	DUK_ASSERT(func == NULL || (DUK_HOBJECT_IS_COMPFUNC(func) ||
-	                            DUK_HOBJECT_IS_NATFUNC(func)));
+	DUK_ASSERT(func == NULL || (DUK_HOBJECT_IS_COMPFUNC(func) || DUK_HOBJECT_IS_NATFUNC(func)));
 
 	/* [ ... func this arg1 ... argN ] */
 
@@ -64114,7 +68209,7 @@ DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
 		                                                    &act);
 	}
 #else
-	DUK_ASSERT((call_flags & DUK_CALL_FLAG_TAILCALL) == 0);  /* compiler ensures this */
+	DUK_ASSERT((call_flags & DUK_CALL_FLAG_TAILCALL) == 0); /* compiler ensures this */
 	use_tailcall = 0;
 #endif
 
@@ -64141,6 +68236,15 @@ DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
 	/* [ ... func this arg1 ... argN ] */
 
 	/*
+	 *  Grow value stack to required size before env setup.  This
+	 *  must happen before env setup to handle some corner cases
+	 *  correctly, e.g. test-bug-scope-segv-gh2448.js.
+	 */
+
+	duk_valstack_grow_check_throw(thr, vs_min_bytes);
+	act->reserve_byteoff = (duk_size_t) ((duk_uint8_t *) thr->valstack_end - (duk_uint8_t *) thr->valstack);
+
+	/*
 	 *  Environment record creation and 'arguments' object creation.
 	 *  Named function expression name binding is handled by the
 	 *  compiler; the compiled function's parent env will contain
@@ -64161,13 +68265,8 @@ DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
 	 *  Setup value stack: clamp to 'nargs', fill up to 'nregs',
 	 *  ensure value stack size matches target requirements, and
 	 *  switch value stack bottom.  Valstack top is kept.
-	 *
-	 *  Value stack can only grow here.
 	 */
 
-	duk_valstack_grow_check_throw(thr, vs_min_bytes);
-	act->reserve_byteoff = (duk_size_t) ((duk_uint8_t *) thr->valstack_end - (duk_uint8_t *) thr->valstack);
-
 	if (use_tailcall) {
 		DUK_ASSERT(nregs >= 0);
 		DUK_ASSERT(nregs >= nargs);
@@ -64206,7 +68305,8 @@ DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
 			DUK_ASSERT((act->flags & DUK_ACT_FLAG_PREVENT_YIELD) == 0);
 			DUK_REFZERO_CHECK_FAST(thr);
 			DUK_ASSERT(thr->ptr_curr_pc == NULL);
-			return 1;  /* 1=reuse executor */
+			thr->heap->call_recursion_depth--; /* No recursion increase for this case. */
+			return 1; /* 1=reuse executor */
 		}
 		DUK_ASSERT(use_tailcall == 0);
 
@@ -64215,12 +68315,6 @@ DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
 		act->flags |= DUK_ACT_FLAG_PREVENT_YIELD;
 		thr->callstack_preventcount++;
 
-		/* XXX: we could just do this on entry regardless of reuse, as long
-		 * as recursion depth is decreased for e2e case.
-		 */
-		duk__call_c_recursion_limit_check(thr);
-		thr->heap->call_recursion_depth++;
-
 		/* [ ... func this | arg1 ... argN ] ('this' must precede new bottom) */
 
 		/*
@@ -64255,12 +68349,6 @@ DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
 		act->flags |= DUK_ACT_FLAG_PREVENT_YIELD;
 		thr->callstack_preventcount++;
 
-		/* XXX: we could just do this on entry regardless of reuse, as long
-		 * as recursion depth is decreased for e2e case.
-		 */
-		duk__call_c_recursion_limit_check(thr);
-		thr->heap->call_recursion_depth++;
-
 		/* For native calls must be NULL so we don't sync back */
 		DUK_ASSERT(thr->ptr_curr_pc == NULL);
 
@@ -64342,7 +68430,7 @@ DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
 		/* Explicit check for fastint downgrade. */
 		DUK_TVAL_CHKFAST_INPLACE_FAST(tv_funret);
 #endif
-		DUK_TVAL_SET_TVAL_UPDREF(thr, tv_ret, tv_funret);  /* side effects */
+		DUK_TVAL_SET_TVAL_UPDREF(thr, tv_ret, tv_funret); /* side effects */
 	}
 
 	duk_set_top_unsafe(thr, idx_func + 1);
@@ -64361,7 +68449,7 @@ DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
 	/* Restore entry thread executor curr_pc stack frame pointer. */
 	thr->ptr_curr_pc = entry_ptr_curr_pc;
 
-	DUK_HEAP_SWITCH_THREAD(thr->heap, entry_curr_thread);  /* may be NULL */
+	DUK_HEAP_SWITCH_THREAD(thr->heap, entry_curr_thread); /* may be NULL */
 	thr->state = (duk_uint8_t) entry_thread_state;
 
 	/* Disabled assert: triggered with some torture tests. */
@@ -64402,12 +68490,10 @@ DUK_LOCAL duk_int_t duk__handle_call_raw(duk_hthread *thr,
 
 	DUK_REFZERO_CHECK_FAST(thr);
 
-	return 0;  /* 0=call handled inline */
+	return 0; /* 0=call handled inline */
 }
 
-DUK_INTERNAL duk_int_t duk_handle_call_unprotected_nargs(duk_hthread *thr,
-                                                         duk_idx_t nargs,
-                                                         duk_small_uint_t call_flags) {
+DUK_INTERNAL duk_int_t duk_handle_call_unprotected_nargs(duk_hthread *thr, duk_idx_t nargs, duk_small_uint_t call_flags) {
 	duk_idx_t idx_func;
 	DUK_ASSERT(duk_get_top(thr) >= nargs + 2);
 	idx_func = duk_get_top(thr) - (nargs + 2);
@@ -64415,9 +68501,7 @@ DUK_INTERNAL duk_int_t duk_handle_call_unprotected_nargs(duk_hthread *thr,
 	return duk_handle_call_unprotected(thr, idx_func, call_flags);
 }
 
-DUK_INTERNAL duk_int_t duk_handle_call_unprotected(duk_hthread *thr,
-                                                   duk_idx_t idx_func,
-                                                   duk_small_uint_t call_flags) {
+DUK_INTERNAL duk_int_t duk_handle_call_unprotected(duk_hthread *thr, duk_idx_t idx_func, duk_small_uint_t call_flags) {
 	DUK_ASSERT(duk_is_valid_index(thr, idx_func));
 	DUK_ASSERT(idx_func >= 0);
 	return duk__handle_call_raw(thr, idx_func, call_flags);
@@ -64454,7 +68538,7 @@ DUK_LOCAL void duk__handle_safe_call_inner(duk_hthread *thr,
 	duk_ret_t rc;
 
 	DUK_ASSERT(thr != NULL);
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 
 	/*
 	 *  Thread state check and book-keeping.
@@ -64484,7 +68568,8 @@ DUK_LOCAL void duk__handle_safe_call_inner(duk_hthread *thr,
 	/* we're running inside the caller's activation, so no change in call/catch stack or valstack bottom */
 	DUK_ASSERT(thr->callstack_top == entry_callstack_top);
 	DUK_ASSERT(thr->valstack_bottom >= thr->valstack);
-	DUK_ASSERT((duk_size_t) ((duk_uint8_t *) thr->valstack_bottom - (duk_uint8_t *) thr->valstack) == entry_valstack_bottom_byteoff);
+	DUK_ASSERT((duk_size_t) ((duk_uint8_t *) thr->valstack_bottom - (duk_uint8_t *) thr->valstack) ==
+	           entry_valstack_bottom_byteoff);
 	DUK_ASSERT(thr->valstack_top >= thr->valstack_bottom);
 	DUK_ASSERT(thr->valstack_end >= thr->valstack_top);
 
@@ -64494,9 +68579,9 @@ DUK_LOCAL void duk__handle_safe_call_inner(duk_hthread *thr,
 	}
 	DUK_ASSERT(rc >= 0);
 
-	duk__safe_call_adjust_valstack(thr, idx_retbase, num_stack_rets, rc);  /* throws for insane rc */
+	duk__safe_call_adjust_valstack(thr, idx_retbase, num_stack_rets, rc); /* throws for insane rc */
 
-	DUK_HEAP_SWITCH_THREAD(thr->heap, entry_curr_thread);  /* may be NULL */
+	DUK_HEAP_SWITCH_THREAD(thr->heap, entry_curr_thread); /* may be NULL */
 	thr->state = (duk_uint8_t) entry_thread_state;
 }
 
@@ -64512,7 +68597,7 @@ DUK_LOCAL void duk__handle_safe_call_error(duk_hthread *thr,
                                            duk_size_t entry_valstack_bottom_byteoff,
                                            duk_jmpbuf *old_jmpbuf_ptr) {
 	DUK_ASSERT(thr != NULL);
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 
 	/*
 	 *  Error during call.  The error value is at heap->lj.value1.
@@ -64549,7 +68634,7 @@ DUK_LOCAL void duk__handle_safe_call_error(duk_hthread *thr,
 	/* Switch active thread before any side effects to avoid a
 	 * dangling curr_thread pointer.
 	 */
-	DUK_HEAP_SWITCH_THREAD(thr->heap, entry_curr_thread);  /* may be NULL */
+	DUK_HEAP_SWITCH_THREAD(thr->heap, entry_curr_thread); /* may be NULL */
 	thr->state = (duk_uint8_t) entry_thread_state;
 
 	DUK_ASSERT(thr->heap->curr_thread == entry_curr_thread);
@@ -64565,9 +68650,9 @@ DUK_LOCAL void duk__handle_safe_call_error(duk_hthread *thr,
 
 	/* [ ... | (crud) errobj ] */
 
-	DUK_ASSERT(duk_get_top(thr) >= 1);  /* at least errobj must be on stack */
+	DUK_ASSERT(duk_get_top(thr) >= 1); /* at least errobj must be on stack */
 
-	duk__safe_call_adjust_valstack(thr, idx_retbase, num_stack_rets, 1);  /* 1 = num actual 'return values' */
+	duk__safe_call_adjust_valstack(thr, idx_retbase, num_stack_rets, 1); /* 1 = num actual 'return values' */
 
 	/* [ ... | ] or [ ... | errobj (M * undefined)] where M = num_stack_rets - 1 */
 
@@ -64604,7 +68689,7 @@ DUK_LOCAL void duk__handle_safe_call_shared_unwind(duk_hthread *thr,
                                                    duk_hthread *entry_curr_thread,
                                                    duk_instr_t **entry_ptr_curr_pc) {
 	DUK_ASSERT(thr != NULL);
-	DUK_ASSERT_CTX_VALID(thr);
+	DUK_CTX_ASSERT_VALID(thr);
 	DUK_UNREF(idx_retbase);
 	DUK_UNREF(num_stack_rets);
 	DUK_UNREF(entry_curr_thread);
@@ -64653,7 +68738,7 @@ DUK_INTERNAL duk_int_t duk_handle_safe_call(duk_hthread *thr,
 	duk_int_t retval;
 
 	DUK_ASSERT(thr != NULL);
-	DUK_ASSERT(duk_get_top(thr) >= num_stack_args);  /* Caller ensures. */
+	DUK_ASSERT(duk_get_top(thr) >= num_stack_args); /* Caller ensures. */
 
 	DUK_STATS_INC(thr->heap, stats_safecall_all);
 
@@ -64672,14 +68757,14 @@ DUK_INTERNAL duk_int_t duk_handle_safe_call(duk_hthread *thr,
 	entry_callstack_preventcount = thr->callstack_preventcount;
 #endif
 	entry_call_recursion_depth = thr->heap->call_recursion_depth;
-	entry_curr_thread = thr->heap->curr_thread;  /* may be NULL if first call */
+	entry_curr_thread = thr->heap->curr_thread; /* may be NULL if first call */
 	entry_thread_state = thr->state;
-	entry_ptr_curr_pc = thr->ptr_curr_pc;  /* may be NULL */
-	idx_retbase = duk_get_top(thr) - num_stack_args;  /* not a valid stack index if num_stack_args == 0 */
+	entry_ptr_curr_pc = thr->ptr_curr_pc; /* may be NULL */
+	idx_retbase = duk_get_top(thr) - num_stack_args; /* not a valid stack index if num_stack_args == 0 */
 	DUK_ASSERT(idx_retbase >= 0);
 
-	DUK_ASSERT((duk_idx_t) (thr->valstack_top - thr->valstack_bottom) >= num_stack_args);  /* Caller ensures. */
-	DUK_ASSERT((duk_idx_t) (thr->valstack_end - (thr->valstack_bottom + idx_retbase)) >= num_stack_rets);  /* Caller ensures. */
+	DUK_ASSERT((duk_idx_t) (thr->valstack_top - thr->valstack_bottom) >= num_stack_args); /* Caller ensures. */
+	DUK_ASSERT((duk_idx_t) (thr->valstack_end - (thr->valstack_bottom + idx_retbase)) >= num_stack_rets); /* Caller ensures. */
 
 	/* Cannot portably debug print a function pointer, hence 'func' not printed! */
 	DUK_DD(DUK_DDPRINT("duk_handle_safe_call: thr=%p, num_stack_args=%ld, num_stack_rets=%ld, "
@@ -64739,7 +68824,8 @@ DUK_INTERNAL duk_int_t duk_handle_safe_call(duk_hthread *thr,
 		 * whatever calls are made.  Reserve cannot decrease.
 		 */
 		DUK_ASSERT(thr->callstack_curr == entry_act);
-		DUK_ASSERT((duk_size_t) ((duk_uint8_t *) thr->valstack_end - (duk_uint8_t *) thr->valstack) >= entry_valstack_end_byteoff);
+		DUK_ASSERT((duk_size_t) ((duk_uint8_t *) thr->valstack_end - (duk_uint8_t *) thr->valstack) >=
+		           entry_valstack_end_byteoff);
 
 		retval = DUK_EXEC_SUCCESS;
 #if defined(DUK_USE_CPP_EXCEPTIONS)
@@ -64749,7 +68835,8 @@ DUK_INTERNAL duk_int_t duk_handle_safe_call(duk_hthread *thr,
 	} else {
 		/* Error path. */
 #endif
-		DUK_ASSERT((duk_size_t) ((duk_uint8_t *) thr->valstack_end - (duk_uint8_t *) thr->valstack) >= entry_valstack_end_byteoff);
+		DUK_ASSERT((duk_size_t) ((duk_uint8_t *) thr->valstack_end - (duk_uint8_t *) thr->valstack) >=
+		           entry_valstack_end_byteoff);
 
 		DUK_STATS_INC(thr->heap, stats_safecall_throw);
 
@@ -64770,17 +68857,22 @@ DUK_INTERNAL duk_int_t duk_handle_safe_call(duk_hthread *thr,
 #if defined(DUK_USE_CPP_EXCEPTIONS)
 	catch (duk_fatal_exception &exc) {
 		DUK_D(DUK_DPRINT("rethrow duk_fatal_exception"));
+		DUK_UNREF(exc);
 		throw;
 	} catch (std::exception &exc) {
 		const char *what = exc.what();
-		DUK_ASSERT((duk_size_t) ((duk_uint8_t *) thr->valstack_end - (duk_uint8_t *) thr->valstack) >= entry_valstack_end_byteoff);
+		DUK_ASSERT((duk_size_t) ((duk_uint8_t *) thr->valstack_end - (duk_uint8_t *) thr->valstack) >=
+		           entry_valstack_end_byteoff);
 		DUK_STATS_INC(thr->heap, stats_safecall_throw);
 		if (!what) {
 			what = "unknown";
 		}
 		DUK_D(DUK_DPRINT("unexpected c++ std::exception (perhaps thrown by user code)"));
 		try {
-			DUK_ERROR_FMT1(thr, DUK_ERR_TYPE_ERROR, "caught invalid c++ std::exception '%s' (perhaps thrown by user code)", what);
+			DUK_ERROR_FMT1(thr,
+			               DUK_ERR_TYPE_ERROR,
+			               "caught invalid c++ std::exception '%s' (perhaps thrown by user code)",
+			               what);
 			DUK_WO_NORETURN(return 0;);
 		} catch (duk_internal_exception exc) {
 			DUK_D(DUK_DPRINT("caught api error thrown from unexpected c++ std::exception"));
@@ -64800,7 +68892,8 @@ DUK_INTERNAL duk_int_t duk_handle_safe_call(duk_hthread *thr,
 		}
 	} catch (...) {
 		DUK_D(DUK_DPRINT("unexpected c++ exception (perhaps thrown by user code)"));
-		DUK_ASSERT((duk_size_t) ((duk_uint8_t *) thr->valstack_end - (duk_uint8_t *) thr->valstack) >= entry_valstack_end_byteoff);
+		DUK_ASSERT((duk_size_t) ((duk_uint8_t *) thr->valstack_end - (duk_uint8_t *) thr->valstack) >=
+		           entry_valstack_end_byteoff);
 		DUK_STATS_INC(thr->heap, stats_safecall_throw);
 		try {
 			DUK_ERROR_TYPE(thr, "caught invalid c++ exception (perhaps thrown by user code)");
@@ -64824,7 +68917,7 @@ DUK_INTERNAL duk_int_t duk_handle_safe_call(duk_hthread *thr,
 	}
 #endif
 
-	DUK_ASSERT(thr->heap->lj.jmpbuf_ptr == old_jmpbuf_ptr);  /* success/error path both do this */
+	DUK_ASSERT(thr->heap->lj.jmpbuf_ptr == old_jmpbuf_ptr); /* success/error path both do this */
 
 	DUK_ASSERT_LJSTATE_UNSET(thr->heap);
 
@@ -64845,7 +68938,8 @@ DUK_INTERNAL duk_int_t duk_handle_safe_call(duk_hthread *thr,
 
 	/* Final asserts. */
 	DUK_ASSERT(thr->callstack_curr == entry_act);
-	DUK_ASSERT((duk_size_t) ((duk_uint8_t *) thr->valstack_bottom - (duk_uint8_t *) thr->valstack) == entry_valstack_bottom_byteoff);
+	DUK_ASSERT((duk_size_t) ((duk_uint8_t *) thr->valstack_bottom - (duk_uint8_t *) thr->valstack) ==
+	           entry_valstack_bottom_byteoff);
 	DUK_ASSERT((duk_size_t) ((duk_uint8_t *) thr->valstack_end - (duk_uint8_t *) thr->valstack) >= entry_valstack_end_byteoff);
 	DUK_ASSERT(thr->callstack_top == entry_callstack_top);
 	DUK_ASSERT(thr->heap->call_recursion_depth == entry_call_recursion_depth);
@@ -64863,64 +68957,84 @@ DUK_INTERNAL duk_int_t duk_handle_safe_call(duk_hthread *thr,
 
 /*
  *  Property-based call (foo.noSuch()) error setup: replace target function
- *  on stack top with a specially tagged (hidden Symbol) error which gets
- *  thrown in call handling at the proper spot to follow ECMAScript semantics.
+ *  on stack top with a hidden Symbol tagged non-callable wrapper object
+ *  holding the error.  The error gets thrown in call handling at the
+ *  proper spot to follow ECMAScript semantics.
  */
 
 #if defined(DUK_USE_VERBOSE_ERRORS)
-DUK_INTERNAL DUK_NOINLINE DUK_COLD void duk_call_setup_propcall_error(duk_hthread *thr, duk_tval *tv_targ, duk_tval *tv_base, duk_tval *tv_key) {
-	const char *str1, *str2, *str3;
+DUK_INTERNAL DUK_NOINLINE DUK_COLD void duk_call_setup_propcall_error(duk_hthread *thr, duk_tval *tv_base, duk_tval *tv_key) {
+	const char *str_targ, *str_key, *str_base;
 	duk_idx_t entry_top;
 
 	entry_top = duk_get_top(thr);
 
-	/* Must stabilize pointers first.  Argument convention is a bit awkward,
-	 * it comes from the executor call site where some arguments may not be
-	 * on the value stack (consts).
-	 */
+	/* [ <nargs> target ] */
+
+	/* Must stabilize pointers first.  tv_targ is already on stack top. */
 	duk_push_tval(thr, tv_base);
 	duk_push_tval(thr, tv_key);
-	duk_push_tval(thr, tv_targ);
 
 	DUK_GC_TORTURE(thr->heap);
 
-	/* We only push an error, replacing the call target (at idx_func)
-	 * with the error to ensure side effects come out correctly:
+	duk_push_bare_object(thr);
+
+	/* [ <nargs> target base key {} ] */
+
+	/* We only push a wrapped error, replacing the call target (at
+	 * idx_func) with the error to ensure side effects come out
+	 * correctly:
 	 * - Property read
 	 * - Call argument evaluation
-	 * - Callability check and error thrown.
+	 * - Callability check and error thrown
 	 *
-	 * A hidden Symbol on the error object pushed here is used by
+	 * A hidden Symbol on the wrapper object pushed above is used by
 	 * call handling to figure out the error is to be thrown as is.
 	 * It is CRITICAL that the hidden Symbol can never occur on a
 	 * user visible object that may get thrown.
 	 */
 
 #if defined(DUK_USE_PARANOID_ERRORS)
-	str1 = duk_get_type_name(thr, -1);
-	str2 = duk_get_type_name(thr, -2);
-	str3 = duk_get_type_name(thr, -3);
-	duk_push_error_object(thr, DUK_ERR_TYPE_ERROR | DUK_ERRCODE_FLAG_NOBLAME_FILELINE, "%s not callable (property %s of %s)", str1, str2, str3);
-#else
-	str1 = duk_push_string_readable(thr, -1);
-	str2 = duk_push_string_readable(thr, -3);
-	str3 = duk_push_string_readable(thr, -5);
-	duk_push_error_object(thr, DUK_ERR_TYPE_ERROR | DUK_ERRCODE_FLAG_NOBLAME_FILELINE, "%s not callable (property %s of %s)", str1, str2, str3);
-#endif
-
-	duk_push_true(thr);
-	duk_put_prop_stridx(thr, -2, DUK_STRIDX_INT_TARGET);  /* Marker property, reuse _Target. */
-
-	/* [ <nregs> propValue <variable> error ] */
+	str_targ = duk_get_type_name(thr, -4);
+	str_key = duk_get_type_name(thr, -2);
+	str_base = duk_get_type_name(thr, -3);
+	duk_push_error_object(thr,
+	                      DUK_ERR_TYPE_ERROR | DUK_ERRCODE_FLAG_NOBLAME_FILELINE,
+	                      "%s not callable (property %s of %s)",
+	                      str_targ,
+	                      str_key,
+	                      str_base);
+	duk_xdef_prop_stridx(thr, -2, DUK_STRIDX_INT_TARGET, DUK_PROPDESC_FLAGS_NONE); /* Marker property, reuse _Target. */
+	/* [ <nargs> target base key { _Target: error } ] */
 	duk_replace(thr, entry_top - 1);
+#else
+	str_targ = duk_push_string_readable(thr, -4);
+	str_key = duk_push_string_readable(thr, -3);
+	str_base = duk_push_string_readable(thr, -5);
+	duk_push_error_object(thr,
+	                      DUK_ERR_TYPE_ERROR | DUK_ERRCODE_FLAG_NOBLAME_FILELINE,
+	                      "%s not callable (property %s of %s)",
+	                      str_targ,
+	                      str_key,
+	                      str_base);
+	/* [ <nargs> target base key {} str_targ str_key str_base error ] */
+	duk_xdef_prop_stridx(thr, -5, DUK_STRIDX_INT_TARGET, DUK_PROPDESC_FLAGS_NONE); /* Marker property, reuse _Target. */
+	/* [ <nargs> target base key { _Target: error } str_targ str_key str_base ] */
+	duk_swap(thr, -4, entry_top - 1);
+	/* [ <nargs> { _Target: error } base key target str_targ str_key str_base ] */
+#endif
+
+	/* [ <nregs> { _Target: error } <variable> */
 	duk_set_top(thr, entry_top);
 
-	DUK_ASSERT(!duk_is_callable(thr, -1));  /* Critical so that call handling will throw the error. */
+	/* [ <nregs> { _Target: error } */
+	DUK_ASSERT(!duk_is_callable(thr, -1)); /* Critical so that call handling will throw the error. */
 }
-#endif  /* DUK_USE_VERBOSE_ERRORS */
+#endif /* DUK_USE_VERBOSE_ERRORS */
 
 /* automatic undefs */
 #undef DUK__AUGMENT_CALL_RELAX_COUNT
+#undef DUK__CALL_HANDLING_REQUIRE_STACK
 /*
  *  ECMAScript compiler.
  *
@@ -64957,45 +69071,51 @@ DUK_INTERNAL DUK_NOINLINE DUK_COLD void duk_call_setup_propcall_error(duk_hthrea
  * uses this approach to avoid an explicit DUK__ISREG() check (the condition is
  * logically "'x' is a register AND 'x' >= temp_first").
  */
-#define DUK__CONST_MARKER                   DUK_REGCONST_CONST_MARKER
-#define DUK__REMOVECONST(x)                 ((x) & ~DUK__CONST_MARKER)
-#define DUK__ISREG(x)                       ((x) >= 0)
-#define DUK__ISCONST(x)                     ((x) < 0)
-#define DUK__ISREG_TEMP(comp_ctx,x)         ((duk_int32_t) (x) >= (duk_int32_t) ((comp_ctx)->curr_func.temp_first))   /* Check for x >= temp_first && x >= 0 by comparing as signed. */
-#define DUK__ISREG_NOTTEMP(comp_ctx,x)      ((duk_uint32_t) (x) < (duk_uint32_t) ((comp_ctx)->curr_func.temp_first))  /* Check for x >= 0 && x < temp_first by interpreting as unsigned. */
-#define DUK__GETTEMP(comp_ctx)              ((comp_ctx)->curr_func.temp_next)
-#define DUK__SETTEMP(comp_ctx,x)            ((comp_ctx)->curr_func.temp_next = (x))  /* dangerous: must only lower (temp_max not updated) */
-#define DUK__SETTEMP_CHECKMAX(comp_ctx,x)   duk__settemp_checkmax((comp_ctx),(x))
-#define DUK__ALLOCTEMP(comp_ctx)            duk__alloctemp((comp_ctx))
-#define DUK__ALLOCTEMPS(comp_ctx,count)     duk__alloctemps((comp_ctx),(count))
+#define DUK__CONST_MARKER   DUK_REGCONST_CONST_MARKER
+#define DUK__REMOVECONST(x) ((x) & ~DUK__CONST_MARKER)
+#define DUK__ISREG(x)       ((x) >= 0)
+#define DUK__ISCONST(x)     ((x) < 0)
+#define DUK__ISREG_TEMP(comp_ctx, x) \
+	((duk_int32_t) (x) >= \
+	 (duk_int32_t) ((comp_ctx)->curr_func.temp_first)) /* Check for x >= temp_first && x >= 0 by comparing as signed. */
+#define DUK__ISREG_NOTTEMP(comp_ctx, x) \
+	((duk_uint32_t) (x) < \
+	 (duk_uint32_t) ((comp_ctx)->curr_func.temp_first)) /* Check for x >= 0 && x < temp_first by interpreting as unsigned. */
+#define DUK__GETTEMP(comp_ctx)             ((comp_ctx)->curr_func.temp_next)
+#define DUK__SETTEMP(comp_ctx, x)          ((comp_ctx)->curr_func.temp_next = (x)) /* dangerous: must only lower (temp_max not updated) */
+#define DUK__SETTEMP_CHECKMAX(comp_ctx, x) duk__settemp_checkmax((comp_ctx), (x))
+#define DUK__ALLOCTEMP(comp_ctx)           duk__alloctemp((comp_ctx))
+#define DUK__ALLOCTEMPS(comp_ctx, count)   duk__alloctemps((comp_ctx), (count))
 
 /* Init value set size for array and object literals. */
-#define DUK__MAX_ARRAY_INIT_VALUES        20
-#define DUK__MAX_OBJECT_INIT_PAIRS        10
+#define DUK__MAX_ARRAY_INIT_VALUES 20
+#define DUK__MAX_OBJECT_INIT_PAIRS 10
 
 /* XXX: hack, remove when const lookup is not O(n) */
-#define DUK__GETCONST_MAX_CONSTS_CHECK    256
+#define DUK__GETCONST_MAX_CONSTS_CHECK 256
 
 /* These limits are based on bytecode limits.  Max temps is limited
  * by duk_hcompfunc nargs/nregs fields being 16 bits.
  */
-#define DUK__MAX_CONSTS                   DUK_BC_BC_MAX
-#define DUK__MAX_FUNCS                    DUK_BC_BC_MAX
-#define DUK__MAX_TEMPS                    0xffffL
+#define DUK__MAX_CONSTS DUK_BC_BC_MAX
+#define DUK__MAX_FUNCS  DUK_BC_BC_MAX
+#define DUK__MAX_TEMPS  0xffffL
 
 /* Initial bytecode size allocation. */
 #if defined(DUK_USE_PREFER_SIZE)
-#define DUK__BC_INITIAL_INSTS             16
+#define DUK__BC_INITIAL_INSTS 16
 #else
-#define DUK__BC_INITIAL_INSTS             256
+#define DUK__BC_INITIAL_INSTS 256
 #endif
 
-#define DUK__RECURSION_INCREASE(comp_ctx,thr)  do { \
+#define DUK__RECURSION_INCREASE(comp_ctx, thr) \
+	do { \
 		DUK_DDD(DUK_DDDPRINT("RECURSION INCREASE: %s:%ld", (const char *) DUK_FILE_MACRO, (long) DUK_LINE_MACRO)); \
 		duk__comp_recursion_increase((comp_ctx)); \
 	} while (0)
 
-#define DUK__RECURSION_DECREASE(comp_ctx,thr)  do { \
+#define DUK__RECURSION_DECREASE(comp_ctx, thr) \
+	do { \
 		DUK_DDD(DUK_DDDPRINT("RECURSION DECREASE: %s:%ld", (const char *) DUK_FILE_MACRO, (long) DUK_LINE_MACRO)); \
 		duk__comp_recursion_decrease((comp_ctx)); \
 	} while (0)
@@ -65003,11 +69123,11 @@ DUK_INTERNAL DUK_NOINLINE DUK_COLD void duk_call_setup_propcall_error(duk_hthrea
 /* Value stack slot limits: these are quite approximate right now, and
  * because they overlap in control flow, some could be eliminated.
  */
-#define DUK__COMPILE_ENTRY_SLOTS          8
-#define DUK__FUNCTION_INIT_REQUIRE_SLOTS  16
-#define DUK__FUNCTION_BODY_REQUIRE_SLOTS  16
-#define DUK__PARSE_STATEMENTS_SLOTS       16
-#define DUK__PARSE_EXPR_SLOTS             16
+#define DUK__COMPILE_ENTRY_SLOTS         8
+#define DUK__FUNCTION_INIT_REQUIRE_SLOTS 16
+#define DUK__FUNCTION_BODY_REQUIRE_SLOTS 16
+#define DUK__PARSE_STATEMENTS_SLOTS      16
+#define DUK__PARSE_EXPR_SLOTS            16
 
 /* Temporary structure used to pass a stack allocated region through
  * duk_safe_call().
@@ -65039,10 +69159,14 @@ DUK_LOCAL_DECL duk_int_t duk__get_current_pc(duk_compiler_ctx *comp_ctx);
 DUK_LOCAL_DECL duk_compiler_instr *duk__get_instr_ptr(duk_compiler_ctx *comp_ctx, duk_int_t pc);
 DUK_LOCAL_DECL void duk__emit(duk_compiler_ctx *comp_ctx, duk_instr_t ins);
 DUK_LOCAL_DECL void duk__emit_op_only(duk_compiler_ctx *comp_ctx, duk_small_uint_t op);
-DUK_LOCAL_DECL void duk__emit_a_b_c(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_flags, duk_regconst_t a, duk_regconst_t b, duk_regconst_t c);
+DUK_LOCAL_DECL void duk__emit_a_b_c(duk_compiler_ctx *comp_ctx,
+                                    duk_small_uint_t op_flags,
+                                    duk_regconst_t a,
+                                    duk_regconst_t b,
+                                    duk_regconst_t c);
 DUK_LOCAL_DECL void duk__emit_a_b(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_flags, duk_regconst_t a, duk_regconst_t b);
 DUK_LOCAL_DECL void duk__emit_b_c(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_flags, duk_regconst_t b, duk_regconst_t c);
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL_DECL void duk__emit_a(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_flags, duk_regconst_t a);
 DUK_LOCAL_DECL void duk__emit_b(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_flags, duk_regconst_t b);
 #endif
@@ -65056,7 +69180,12 @@ DUK_LOCAL_DECL duk_int_t duk__emit_jump_empty(duk_compiler_ctx *comp_ctx);
 DUK_LOCAL_DECL void duk__insert_jump_entry(duk_compiler_ctx *comp_ctx, duk_int_t jump_pc);
 DUK_LOCAL_DECL void duk__patch_jump(duk_compiler_ctx *comp_ctx, duk_int_t jump_pc, duk_int_t target_pc);
 DUK_LOCAL_DECL void duk__patch_jump_here(duk_compiler_ctx *comp_ctx, duk_int_t jump_pc);
-DUK_LOCAL_DECL void duk__patch_trycatch(duk_compiler_ctx *comp_ctx, duk_int_t ldconst_pc, duk_int_t trycatch_pc, duk_regconst_t reg_catch, duk_regconst_t const_varname, duk_small_uint_t flags);
+DUK_LOCAL_DECL void duk__patch_trycatch(duk_compiler_ctx *comp_ctx,
+                                        duk_int_t ldconst_pc,
+                                        duk_int_t trycatch_pc,
+                                        duk_regconst_t reg_catch,
+                                        duk_regconst_t const_varname,
+                                        duk_small_uint_t flags);
 DUK_LOCAL_DECL void duk__emit_if_false_skip(duk_compiler_ctx *comp_ctx, duk_regconst_t regconst);
 DUK_LOCAL_DECL void duk__emit_if_true_skip(duk_compiler_ctx *comp_ctx, duk_regconst_t regconst);
 DUK_LOCAL_DECL void duk__emit_invalid(duk_compiler_ctx *comp_ctx);
@@ -65087,7 +69216,7 @@ duk_regconst_t duk__ivalue_toregconst_raw(duk_compiler_ctx *comp_ctx,
                                           duk_regconst_t forced_reg,
                                           duk_small_uint_t flags);
 DUK_LOCAL_DECL duk_regconst_t duk__ivalue_toreg(duk_compiler_ctx *comp_ctx, duk_ivalue *x);
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL_DECL duk_regconst_t duk__ivalue_totemp(duk_compiler_ctx *comp_ctx, duk_ivalue *x);
 #endif
 DUK_LOCAL_DECL void duk__ivalue_toforcedreg(duk_compiler_ctx *comp_ctx, duk_ivalue *x, duk_int_t forced_reg);
@@ -65101,7 +69230,13 @@ DUK_LOCAL_DECL duk_bool_t duk__lookup_lhs(duk_compiler_ctx *ctx, duk_regconst_t
 /* label handling */
 DUK_LOCAL_DECL void duk__add_label(duk_compiler_ctx *comp_ctx, duk_hstring *h_label, duk_int_t pc_label, duk_int_t label_id);
 DUK_LOCAL_DECL void duk__update_label_flags(duk_compiler_ctx *comp_ctx, duk_int_t label_id, duk_small_uint_t flags);
-DUK_LOCAL_DECL void duk__lookup_active_label(duk_compiler_ctx *comp_ctx, duk_hstring *h_label, duk_bool_t is_break, duk_int_t *out_label_id, duk_int_t *out_label_catch_depth, duk_int_t *out_label_pc, duk_bool_t *out_is_closest);
+DUK_LOCAL_DECL void duk__lookup_active_label(duk_compiler_ctx *comp_ctx,
+                                             duk_hstring *h_label,
+                                             duk_bool_t is_break,
+                                             duk_int_t *out_label_id,
+                                             duk_int_t *out_label_catch_depth,
+                                             duk_int_t *out_label_pc,
+                                             duk_bool_t *out_is_closest);
 DUK_LOCAL_DECL void duk__reset_labels_to_length(duk_compiler_ctx *comp_ctx, duk_size_t len);
 
 /* top-down expression parser */
@@ -65115,26 +69250,32 @@ DUK_LOCAL_DECL void duk__expr(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_s
 DUK_LOCAL_DECL void duk__exprtop(duk_compiler_ctx *ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
 
 /* convenience helpers */
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL_DECL duk_regconst_t duk__expr_toreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
 #endif
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL_DECL duk_regconst_t duk__expr_totemp(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
 #endif
-DUK_LOCAL_DECL void duk__expr_toforcedreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags, duk_regconst_t forced_reg);
+DUK_LOCAL_DECL void duk__expr_toforcedreg(duk_compiler_ctx *comp_ctx,
+                                          duk_ivalue *res,
+                                          duk_small_uint_t rbp_flags,
+                                          duk_regconst_t forced_reg);
 DUK_LOCAL_DECL duk_regconst_t duk__expr_toregconst(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL_DECL duk_regconst_t duk__expr_totempconst(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
 #endif
 DUK_LOCAL_DECL void duk__expr_toplain(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
 DUK_LOCAL_DECL void duk__expr_toplain_ignore(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
 DUK_LOCAL_DECL duk_regconst_t duk__exprtop_toreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL_DECL duk_regconst_t duk__exprtop_totemp(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
 #endif
-DUK_LOCAL_DECL void duk__exprtop_toforcedreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags, duk_regconst_t forced_reg);
+DUK_LOCAL_DECL void duk__exprtop_toforcedreg(duk_compiler_ctx *comp_ctx,
+                                             duk_ivalue *res,
+                                             duk_small_uint_t rbp_flags,
+                                             duk_regconst_t forced_reg);
 DUK_LOCAL_DECL duk_regconst_t duk__exprtop_toregconst(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL_DECL void duk__exprtop_toplain_ignore(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags);
 #endif
 
@@ -65144,7 +69285,11 @@ DUK_LOCAL_DECL void duk__nud_array_literal(duk_compiler_ctx *comp_ctx, duk_ivalu
 DUK_LOCAL_DECL void duk__nud_object_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *res);
 
 /* statement parsing */
-DUK_LOCAL_DECL void duk__parse_var_decl(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t expr_flags, duk_regconst_t *out_reg_varbind, duk_regconst_t *out_rc_varname);
+DUK_LOCAL_DECL void duk__parse_var_decl(duk_compiler_ctx *comp_ctx,
+                                        duk_ivalue *res,
+                                        duk_small_uint_t expr_flags,
+                                        duk_regconst_t *out_reg_varbind,
+                                        duk_regconst_t *out_rc_varname);
 DUK_LOCAL_DECL void duk__parse_var_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t expr_flags);
 DUK_LOCAL_DECL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_int_t pc_label_site);
 DUK_LOCAL_DECL void duk__parse_switch_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_int_t pc_label_site);
@@ -65158,18 +69303,25 @@ DUK_LOCAL_DECL void duk__parse_try_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *
 DUK_LOCAL_DECL void duk__parse_with_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res);
 DUK_LOCAL_DECL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_bool_t allow_source_elem);
 DUK_LOCAL_DECL duk_int_t duk__stmt_label_site(duk_compiler_ctx *comp_ctx, duk_int_t label_id);
-DUK_LOCAL_DECL void duk__parse_stmts(duk_compiler_ctx *comp_ctx, duk_bool_t allow_source_elem, duk_bool_t expect_eof, duk_bool_t regexp_after);
-
-DUK_LOCAL_DECL void duk__parse_func_body(duk_compiler_ctx *comp_ctx, duk_bool_t expect_eof, duk_bool_t implicit_return_value, duk_bool_t regexp_after, duk_small_int_t expect_token);
+DUK_LOCAL_DECL void duk__parse_stmts(duk_compiler_ctx *comp_ctx,
+                                     duk_bool_t allow_source_elem,
+                                     duk_bool_t expect_eof,
+                                     duk_bool_t regexp_after);
+
+DUK_LOCAL_DECL void duk__parse_func_body(duk_compiler_ctx *comp_ctx,
+                                         duk_bool_t expect_eof,
+                                         duk_bool_t implicit_return_value,
+                                         duk_bool_t regexp_after,
+                                         duk_small_int_t expect_token);
 DUK_LOCAL_DECL void duk__parse_func_formals(duk_compiler_ctx *comp_ctx);
 DUK_LOCAL_DECL void duk__parse_func_like_raw(duk_compiler_ctx *comp_ctx, duk_small_uint_t flags);
 DUK_LOCAL_DECL duk_int_t duk__parse_func_like_fnum(duk_compiler_ctx *comp_ctx, duk_small_uint_t flags);
 
-#define DUK__FUNC_FLAG_DECL            (1 << 0)   /* Parsing a function declaration. */
-#define DUK__FUNC_FLAG_GETSET          (1 << 1)   /* Parsing an object literal getter/setter. */
-#define DUK__FUNC_FLAG_METDEF          (1 << 2)   /* Parsing an object literal method definition shorthand. */
-#define DUK__FUNC_FLAG_PUSHNAME_PASS1  (1 << 3)   /* Push function name when creating template (first pass only). */
-#define DUK__FUNC_FLAG_USE_PREVTOKEN   (1 << 4)   /* Use prev_token to start function parsing (workaround for object literal). */
+#define DUK__FUNC_FLAG_DECL           (1 << 0) /* Parsing a function declaration. */
+#define DUK__FUNC_FLAG_GETSET         (1 << 1) /* Parsing an object literal getter/setter. */
+#define DUK__FUNC_FLAG_METDEF         (1 << 2) /* Parsing an object literal method definition shorthand. */
+#define DUK__FUNC_FLAG_PUSHNAME_PASS1 (1 << 3) /* Push function name when creating template (first pass only). */
+#define DUK__FUNC_FLAG_USE_PREVTOKEN  (1 << 4) /* Use prev_token to start function parsing (workaround for object literal). */
 
 /*
  *  Parser control values for tokens.  The token table is ordered by the
@@ -65186,141 +69338,141 @@ DUK_LOCAL_DECL duk_int_t duk__parse_func_like_fnum(duk_compiler_ctx *comp_ctx, d
 /* XXX: actually single step levels would work just fine, clean up */
 
 /* binding power "levels" (see doc/compiler.rst) */
-#define DUK__BP_INVALID                0             /* always terminates led() */
-#define DUK__BP_EOF                    2
-#define DUK__BP_CLOSING                4             /* token closes expression, e.g. ')', ']' */
-#define DUK__BP_FOR_EXPR               DUK__BP_CLOSING    /* bp to use when parsing a top level Expression */
-#define DUK__BP_COMMA                  6
-#define DUK__BP_ASSIGNMENT             8
-#define DUK__BP_CONDITIONAL            10
-#define DUK__BP_LOR                    12
-#define DUK__BP_LAND                   14
-#define DUK__BP_BOR                    16
-#define DUK__BP_BXOR                   18
-#define DUK__BP_BAND                   20
-#define DUK__BP_EQUALITY               22
-#define DUK__BP_RELATIONAL             24
-#define DUK__BP_SHIFT                  26
-#define DUK__BP_ADDITIVE               28
-#define DUK__BP_MULTIPLICATIVE         30
-#define DUK__BP_EXPONENTIATION         32
-#define DUK__BP_POSTFIX                34
-#define DUK__BP_CALL                   36
-#define DUK__BP_MEMBER                 38
+#define DUK__BP_INVALID        0 /* always terminates led() */
+#define DUK__BP_EOF            2
+#define DUK__BP_CLOSING        4 /* token closes expression, e.g. ')', ']' */
+#define DUK__BP_FOR_EXPR       DUK__BP_CLOSING /* bp to use when parsing a top level Expression */
+#define DUK__BP_COMMA          6
+#define DUK__BP_ASSIGNMENT     8
+#define DUK__BP_CONDITIONAL    10
+#define DUK__BP_LOR            12
+#define DUK__BP_LAND           14
+#define DUK__BP_BOR            16
+#define DUK__BP_BXOR           18
+#define DUK__BP_BAND           20
+#define DUK__BP_EQUALITY       22
+#define DUK__BP_RELATIONAL     24
+#define DUK__BP_SHIFT          26
+#define DUK__BP_ADDITIVE       28
+#define DUK__BP_MULTIPLICATIVE 30
+#define DUK__BP_EXPONENTIATION 32
+#define DUK__BP_POSTFIX        34
+#define DUK__BP_CALL           36
+#define DUK__BP_MEMBER         38
 
 #define DUK__TOKEN_LBP_BP_MASK         0x1f
-#define DUK__TOKEN_LBP_FLAG_NO_REGEXP  (1 << 5)   /* regexp literal must not follow this token */
-#define DUK__TOKEN_LBP_FLAG_TERMINATES (1 << 6)   /* terminates expression; e.g. post-increment/-decrement */
-#define DUK__TOKEN_LBP_FLAG_UNUSED     (1 << 7)   /* unused */
+#define DUK__TOKEN_LBP_FLAG_NO_REGEXP  (1 << 5) /* regexp literal must not follow this token */
+#define DUK__TOKEN_LBP_FLAG_TERMINATES (1 << 6) /* terminates expression; e.g. post-increment/-decrement */
+#define DUK__TOKEN_LBP_FLAG_UNUSED     (1 << 7) /* unused */
 
-#define DUK__TOKEN_LBP_GET_BP(x)       ((duk_small_uint_t) (((x) & DUK__TOKEN_LBP_BP_MASK) * 2))
+#define DUK__TOKEN_LBP_GET_BP(x) ((duk_small_uint_t) (((x) &DUK__TOKEN_LBP_BP_MASK) * 2))
 
-#define DUK__MK_LBP(bp)                ((bp) >> 1)    /* bp is assumed to be even */
-#define DUK__MK_LBP_FLAGS(bp,flags)    (((bp) >> 1) | (flags))
+#define DUK__MK_LBP(bp)              ((bp) >> 1) /* bp is assumed to be even */
+#define DUK__MK_LBP_FLAGS(bp, flags) (((bp) >> 1) | (flags))
 
 DUK_LOCAL const duk_uint8_t duk__token_lbp[] = {
-	DUK__MK_LBP(DUK__BP_EOF),                                 /* DUK_TOK_EOF */
-	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP),  /* DUK_TOK_IDENTIFIER */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_BREAK */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_CASE */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_CATCH */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_CONTINUE */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_DEBUGGER */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_DEFAULT */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_DELETE */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_DO */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_ELSE */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_FINALLY */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_FOR */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_FUNCTION */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_IF */
-	DUK__MK_LBP(DUK__BP_RELATIONAL),                          /* DUK_TOK_IN */
-	DUK__MK_LBP(DUK__BP_RELATIONAL),                          /* DUK_TOK_INSTANCEOF */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_NEW */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_RETURN */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_SWITCH */
-	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP),  /* DUK_TOK_THIS */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_THROW */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_TRY */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_TYPEOF */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_VAR */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_CONST */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_VOID */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_WHILE */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_WITH */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_CLASS */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_ENUM */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_EXPORT */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_EXTENDS */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_IMPORT */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_SUPER */
-	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP),  /* DUK_TOK_NULL */
-	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP),  /* DUK_TOK_TRUE */
-	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP),  /* DUK_TOK_FALSE */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_GET */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_SET */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_IMPLEMENTS */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_INTERFACE */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_LET */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_PACKAGE */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_PRIVATE */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_PROTECTED */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_PUBLIC */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_STATIC */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_YIELD */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_LCURLY */
-	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP),  /* DUK_TOK_RCURLY */
-	DUK__MK_LBP(DUK__BP_MEMBER),                              /* DUK_TOK_LBRACKET */
-	DUK__MK_LBP_FLAGS(DUK__BP_CLOSING, DUK__TOKEN_LBP_FLAG_NO_REGEXP),  /* DUK_TOK_RBRACKET */
-	DUK__MK_LBP(DUK__BP_CALL),                                /* DUK_TOK_LPAREN */
-	DUK__MK_LBP_FLAGS(DUK__BP_CLOSING, DUK__TOKEN_LBP_FLAG_NO_REGEXP),  /* DUK_TOK_RPAREN */
-	DUK__MK_LBP(DUK__BP_MEMBER),                              /* DUK_TOK_PERIOD */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_SEMICOLON */
-	DUK__MK_LBP(DUK__BP_COMMA),                               /* DUK_TOK_COMMA */
-	DUK__MK_LBP(DUK__BP_RELATIONAL),                          /* DUK_TOK_LT */
-	DUK__MK_LBP(DUK__BP_RELATIONAL),                          /* DUK_TOK_GT */
-	DUK__MK_LBP(DUK__BP_RELATIONAL),                          /* DUK_TOK_LE */
-	DUK__MK_LBP(DUK__BP_RELATIONAL),                          /* DUK_TOK_GE */
-	DUK__MK_LBP(DUK__BP_EQUALITY),                            /* DUK_TOK_EQ */
-	DUK__MK_LBP(DUK__BP_EQUALITY),                            /* DUK_TOK_NEQ */
-	DUK__MK_LBP(DUK__BP_EQUALITY),                            /* DUK_TOK_SEQ */
-	DUK__MK_LBP(DUK__BP_EQUALITY),                            /* DUK_TOK_SNEQ */
-	DUK__MK_LBP(DUK__BP_ADDITIVE),                            /* DUK_TOK_ADD */
-	DUK__MK_LBP(DUK__BP_ADDITIVE),                            /* DUK_TOK_SUB */
-	DUK__MK_LBP(DUK__BP_MULTIPLICATIVE),                      /* DUK_TOK_MUL */
-	DUK__MK_LBP(DUK__BP_MULTIPLICATIVE),                      /* DUK_TOK_DIV */
-	DUK__MK_LBP(DUK__BP_MULTIPLICATIVE),                      /* DUK_TOK_MOD */
-	DUK__MK_LBP(DUK__BP_EXPONENTIATION),                      /* DUK_TOK_EXP */
-	DUK__MK_LBP(DUK__BP_POSTFIX),                             /* DUK_TOK_INCREMENT */
-	DUK__MK_LBP(DUK__BP_POSTFIX),                             /* DUK_TOK_DECREMENT */
-	DUK__MK_LBP(DUK__BP_SHIFT),                               /* DUK_TOK_ALSHIFT */
-	DUK__MK_LBP(DUK__BP_SHIFT),                               /* DUK_TOK_ARSHIFT */
-	DUK__MK_LBP(DUK__BP_SHIFT),                               /* DUK_TOK_RSHIFT */
-	DUK__MK_LBP(DUK__BP_BAND),                                /* DUK_TOK_BAND */
-	DUK__MK_LBP(DUK__BP_BOR),                                 /* DUK_TOK_BOR */
-	DUK__MK_LBP(DUK__BP_BXOR),                                /* DUK_TOK_BXOR */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_LNOT */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_BNOT */
-	DUK__MK_LBP(DUK__BP_LAND),                                /* DUK_TOK_LAND */
-	DUK__MK_LBP(DUK__BP_LOR),                                 /* DUK_TOK_LOR */
-	DUK__MK_LBP(DUK__BP_CONDITIONAL),                         /* DUK_TOK_QUESTION */
-	DUK__MK_LBP(DUK__BP_INVALID),                             /* DUK_TOK_COLON */
-	DUK__MK_LBP(DUK__BP_ASSIGNMENT),                          /* DUK_TOK_EQUALSIGN */
-	DUK__MK_LBP(DUK__BP_ASSIGNMENT),                          /* DUK_TOK_ADD_EQ */
-	DUK__MK_LBP(DUK__BP_ASSIGNMENT),                          /* DUK_TOK_SUB_EQ */
-	DUK__MK_LBP(DUK__BP_ASSIGNMENT),                          /* DUK_TOK_MUL_EQ */
-	DUK__MK_LBP(DUK__BP_ASSIGNMENT),                          /* DUK_TOK_DIV_EQ */
-	DUK__MK_LBP(DUK__BP_ASSIGNMENT),                          /* DUK_TOK_MOD_EQ */
-	DUK__MK_LBP(DUK__BP_ASSIGNMENT),                          /* DUK_TOK_EXP_EQ */
-	DUK__MK_LBP(DUK__BP_ASSIGNMENT),                          /* DUK_TOK_ALSHIFT_EQ */
-	DUK__MK_LBP(DUK__BP_ASSIGNMENT),                          /* DUK_TOK_ARSHIFT_EQ */
-	DUK__MK_LBP(DUK__BP_ASSIGNMENT),                          /* DUK_TOK_RSHIFT_EQ */
-	DUK__MK_LBP(DUK__BP_ASSIGNMENT),                          /* DUK_TOK_BAND_EQ */
-	DUK__MK_LBP(DUK__BP_ASSIGNMENT),                          /* DUK_TOK_BOR_EQ */
-	DUK__MK_LBP(DUK__BP_ASSIGNMENT),                          /* DUK_TOK_BXOR_EQ */
-	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP),  /* DUK_TOK_NUMBER */
-	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP),  /* DUK_TOK_STRING */
-	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP),  /* DUK_TOK_REGEXP */
+	DUK__MK_LBP(DUK__BP_EOF), /* DUK_TOK_EOF */
+	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP), /* DUK_TOK_IDENTIFIER */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_BREAK */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_CASE */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_CATCH */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_CONTINUE */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_DEBUGGER */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_DEFAULT */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_DELETE */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_DO */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_ELSE */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_FINALLY */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_FOR */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_FUNCTION */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_IF */
+	DUK__MK_LBP(DUK__BP_RELATIONAL), /* DUK_TOK_IN */
+	DUK__MK_LBP(DUK__BP_RELATIONAL), /* DUK_TOK_INSTANCEOF */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_NEW */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_RETURN */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_SWITCH */
+	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP), /* DUK_TOK_THIS */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_THROW */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_TRY */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_TYPEOF */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_VAR */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_CONST */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_VOID */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_WHILE */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_WITH */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_CLASS */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_ENUM */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_EXPORT */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_EXTENDS */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_IMPORT */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_SUPER */
+	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP), /* DUK_TOK_NULL */
+	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP), /* DUK_TOK_TRUE */
+	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP), /* DUK_TOK_FALSE */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_GET */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_SET */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_IMPLEMENTS */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_INTERFACE */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_LET */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_PACKAGE */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_PRIVATE */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_PROTECTED */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_PUBLIC */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_STATIC */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_YIELD */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_LCURLY */
+	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP), /* DUK_TOK_RCURLY */
+	DUK__MK_LBP(DUK__BP_MEMBER), /* DUK_TOK_LBRACKET */
+	DUK__MK_LBP_FLAGS(DUK__BP_CLOSING, DUK__TOKEN_LBP_FLAG_NO_REGEXP), /* DUK_TOK_RBRACKET */
+	DUK__MK_LBP(DUK__BP_CALL), /* DUK_TOK_LPAREN */
+	DUK__MK_LBP_FLAGS(DUK__BP_CLOSING, DUK__TOKEN_LBP_FLAG_NO_REGEXP), /* DUK_TOK_RPAREN */
+	DUK__MK_LBP(DUK__BP_MEMBER), /* DUK_TOK_PERIOD */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_SEMICOLON */
+	DUK__MK_LBP(DUK__BP_COMMA), /* DUK_TOK_COMMA */
+	DUK__MK_LBP(DUK__BP_RELATIONAL), /* DUK_TOK_LT */
+	DUK__MK_LBP(DUK__BP_RELATIONAL), /* DUK_TOK_GT */
+	DUK__MK_LBP(DUK__BP_RELATIONAL), /* DUK_TOK_LE */
+	DUK__MK_LBP(DUK__BP_RELATIONAL), /* DUK_TOK_GE */
+	DUK__MK_LBP(DUK__BP_EQUALITY), /* DUK_TOK_EQ */
+	DUK__MK_LBP(DUK__BP_EQUALITY), /* DUK_TOK_NEQ */
+	DUK__MK_LBP(DUK__BP_EQUALITY), /* DUK_TOK_SEQ */
+	DUK__MK_LBP(DUK__BP_EQUALITY), /* DUK_TOK_SNEQ */
+	DUK__MK_LBP(DUK__BP_ADDITIVE), /* DUK_TOK_ADD */
+	DUK__MK_LBP(DUK__BP_ADDITIVE), /* DUK_TOK_SUB */
+	DUK__MK_LBP(DUK__BP_MULTIPLICATIVE), /* DUK_TOK_MUL */
+	DUK__MK_LBP(DUK__BP_MULTIPLICATIVE), /* DUK_TOK_DIV */
+	DUK__MK_LBP(DUK__BP_MULTIPLICATIVE), /* DUK_TOK_MOD */
+	DUK__MK_LBP(DUK__BP_EXPONENTIATION), /* DUK_TOK_EXP */
+	DUK__MK_LBP_FLAGS(DUK__BP_POSTFIX, DUK__TOKEN_LBP_FLAG_NO_REGEXP), /* DUK_TOK_INCREMENT */
+	DUK__MK_LBP_FLAGS(DUK__BP_POSTFIX, DUK__TOKEN_LBP_FLAG_NO_REGEXP), /* DUK_TOK_DECREMENT */
+	DUK__MK_LBP(DUK__BP_SHIFT), /* DUK_TOK_ALSHIFT */
+	DUK__MK_LBP(DUK__BP_SHIFT), /* DUK_TOK_ARSHIFT */
+	DUK__MK_LBP(DUK__BP_SHIFT), /* DUK_TOK_RSHIFT */
+	DUK__MK_LBP(DUK__BP_BAND), /* DUK_TOK_BAND */
+	DUK__MK_LBP(DUK__BP_BOR), /* DUK_TOK_BOR */
+	DUK__MK_LBP(DUK__BP_BXOR), /* DUK_TOK_BXOR */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_LNOT */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_BNOT */
+	DUK__MK_LBP(DUK__BP_LAND), /* DUK_TOK_LAND */
+	DUK__MK_LBP(DUK__BP_LOR), /* DUK_TOK_LOR */
+	DUK__MK_LBP(DUK__BP_CONDITIONAL), /* DUK_TOK_QUESTION */
+	DUK__MK_LBP(DUK__BP_INVALID), /* DUK_TOK_COLON */
+	DUK__MK_LBP(DUK__BP_ASSIGNMENT), /* DUK_TOK_EQUALSIGN */
+	DUK__MK_LBP(DUK__BP_ASSIGNMENT), /* DUK_TOK_ADD_EQ */
+	DUK__MK_LBP(DUK__BP_ASSIGNMENT), /* DUK_TOK_SUB_EQ */
+	DUK__MK_LBP(DUK__BP_ASSIGNMENT), /* DUK_TOK_MUL_EQ */
+	DUK__MK_LBP(DUK__BP_ASSIGNMENT), /* DUK_TOK_DIV_EQ */
+	DUK__MK_LBP(DUK__BP_ASSIGNMENT), /* DUK_TOK_MOD_EQ */
+	DUK__MK_LBP(DUK__BP_ASSIGNMENT), /* DUK_TOK_EXP_EQ */
+	DUK__MK_LBP(DUK__BP_ASSIGNMENT), /* DUK_TOK_ALSHIFT_EQ */
+	DUK__MK_LBP(DUK__BP_ASSIGNMENT), /* DUK_TOK_ARSHIFT_EQ */
+	DUK__MK_LBP(DUK__BP_ASSIGNMENT), /* DUK_TOK_RSHIFT_EQ */
+	DUK__MK_LBP(DUK__BP_ASSIGNMENT), /* DUK_TOK_BAND_EQ */
+	DUK__MK_LBP(DUK__BP_ASSIGNMENT), /* DUK_TOK_BOR_EQ */
+	DUK__MK_LBP(DUK__BP_ASSIGNMENT), /* DUK_TOK_BXOR_EQ */
+	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP), /* DUK_TOK_NUMBER */
+	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP), /* DUK_TOK_STRING */
+	DUK__MK_LBP_FLAGS(DUK__BP_INVALID, DUK__TOKEN_LBP_FLAG_NO_REGEXP), /* DUK_TOK_REGEXP */
 };
 
 /*
@@ -65351,8 +69503,7 @@ DUK_LOCAL duk_bool_t duk__hstring_is_eval_or_arguments(duk_compiler_ctx *comp_ct
 
 DUK_LOCAL duk_bool_t duk__hstring_is_eval_or_arguments_in_strict_mode(duk_compiler_ctx *comp_ctx, duk_hstring *h) {
 	DUK_ASSERT(h != NULL);
-	return (comp_ctx->curr_func.is_strict &&
-	        DUK_HSTRING_HAS_EVAL_OR_ARGUMENTS(h));
+	return (comp_ctx->curr_func.is_strict && DUK_HSTRING_HAS_EVAL_OR_ARGUMENTS(h));
 }
 
 /*
@@ -65367,8 +69518,8 @@ DUK_LOCAL void duk__advance_helper(duk_compiler_ctx *comp_ctx, duk_small_int_t e
 	duk_hthread *thr = comp_ctx->thr;
 	duk_bool_t regexp;
 
-	DUK_ASSERT_DISABLE(comp_ctx->curr_token.t >= 0);  /* unsigned */
-	DUK_ASSERT(comp_ctx->curr_token.t <= DUK_TOK_MAXVAL);  /* MAXVAL is inclusive */
+	DUK_ASSERT_DISABLE(comp_ctx->curr_token.t >= 0); /* unsigned */
+	DUK_ASSERT(comp_ctx->curr_token.t <= DUK_TOK_MAXVAL); /* MAXVAL is inclusive */
 
 	/*
 	 *  Use current token to decide whether a RegExp can follow.
@@ -65393,8 +69544,7 @@ DUK_LOCAL void duk__advance_helper(duk_compiler_ctx *comp_ctx, duk_small_int_t e
 	}
 
 	if (expect >= 0 && comp_ctx->curr_token.t != (duk_small_uint_t) expect) {
-		DUK_D(DUK_DPRINT("parse error: expect=%ld, got=%ld",
-		                 (long) expect, (long) comp_ctx->curr_token.t));
+		DUK_D(DUK_DPRINT("parse error: expect=%ld, got=%ld", (long) expect, (long) comp_ctx->curr_token.t));
 		DUK_ERROR_SYNTAX(thr, DUK_STR_PARSE_ERROR);
 		DUK_WO_NORETURN(return;);
 	}
@@ -65405,10 +69555,7 @@ DUK_LOCAL void duk__advance_helper(duk_compiler_ctx *comp_ctx, duk_small_int_t e
 	duk_copy(thr, comp_ctx->tok12_idx, comp_ctx->tok22_idx);
 
 	/* parse new token */
-	duk_lexer_parse_js_input_element(&comp_ctx->lex,
-	                                 &comp_ctx->curr_token,
-	                                 comp_ctx->curr_func.is_strict,
-	                                 regexp);
+	duk_lexer_parse_js_input_element(&comp_ctx->lex, &comp_ctx->curr_token, comp_ctx->curr_func.is_strict, regexp);
 
 	DUK_DDD(DUK_DDDPRINT("advance: curr: tok=%ld/%ld,%ld,term=%ld,%!T,%!T "
 	                     "prev: tok=%ld/%ld,%ld,term=%ld,%!T,%!T",
@@ -65448,7 +69595,7 @@ DUK_LOCAL void duk__init_func_valstack_slots(duk_compiler_ctx *comp_ctx) {
 
 	entry_top = duk_get_top(thr);
 
-	duk_memzero(func, sizeof(*func));  /* intentional overlap with earlier memzero */
+	duk_memzero(func, sizeof(*func)); /* intentional overlap with earlier memzero */
 #if defined(DUK_USE_EXPLICIT_NULL_INIT)
 	func->h_name = NULL;
 	func->h_consts = NULL;
@@ -65465,23 +69612,23 @@ DUK_LOCAL void duk__init_func_valstack_slots(duk_compiler_ctx *comp_ctx) {
 	DUK_BW_INIT_PUSHBUF(thr, &func->bw_code, DUK__BC_INITIAL_INSTS * sizeof(duk_compiler_instr));
 	/* code_idx = entry_top + 0 */
 
-	duk_push_array(thr);
+	duk_push_bare_array(thr);
 	func->consts_idx = entry_top + 1;
 	func->h_consts = DUK_GET_HOBJECT_POSIDX(thr, entry_top + 1);
 	DUK_ASSERT(func->h_consts != NULL);
 
-	duk_push_array(thr);
+	duk_push_bare_array(thr);
 	func->funcs_idx = entry_top + 2;
 	func->h_funcs = DUK_GET_HOBJECT_POSIDX(thr, entry_top + 2);
 	DUK_ASSERT(func->h_funcs != NULL);
 	DUK_ASSERT(func->fnum_next == 0);
 
-	duk_push_array(thr);
+	duk_push_bare_array(thr);
 	func->decls_idx = entry_top + 3;
 	func->h_decls = DUK_GET_HOBJECT_POSIDX(thr, entry_top + 3);
 	DUK_ASSERT(func->h_decls != NULL);
 
-	duk_push_array(thr);
+	duk_push_bare_array(thr);
 	func->labelnames_idx = entry_top + 4;
 	func->h_labelnames = DUK_GET_HOBJECT_POSIDX(thr, entry_top + 4);
 	DUK_ASSERT(func->h_labelnames != NULL);
@@ -65492,7 +69639,7 @@ DUK_LOCAL void duk__init_func_valstack_slots(duk_compiler_ctx *comp_ctx) {
 	DUK_ASSERT(func->h_labelinfos != NULL);
 	DUK_ASSERT(DUK_HBUFFER_HAS_DYNAMIC(func->h_labelinfos) && !DUK_HBUFFER_HAS_EXTERNAL(func->h_labelinfos));
 
-	duk_push_array(thr);
+	duk_push_bare_array(thr);
 	func->argnames_idx = entry_top + 6;
 	func->h_argnames = DUK_GET_HOBJECT_POSIDX(thr, entry_top + 6);
 	DUK_ASSERT(func->h_argnames != NULL);
@@ -65614,7 +69761,7 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 	h_res = duk_push_hcompfunc(thr);
 	DUK_ASSERT(h_res != NULL);
 	DUK_ASSERT(DUK_HOBJECT_GET_PROTOTYPE(thr->heap, (duk_hobject *) h_res) == thr->builtins[DUK_BIDX_FUNCTION_PROTOTYPE]);
-	DUK_HOBJECT_SET_PROTOTYPE_UPDREF(thr, (duk_hobject *) h_res, NULL);  /* Function templates are "bare objects". */
+	DUK_HOBJECT_SET_PROTOTYPE_UPDREF(thr, (duk_hobject *) h_res, NULL); /* Function templates are "bare objects". */
 
 	if (func->is_function) {
 		DUK_DDD(DUK_DDDPRINT("function -> set NEWENV"));
@@ -65683,16 +69830,19 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 	code_count = DUK_BW_GET_SIZE(thr, &func->bw_code) / sizeof(duk_compiler_instr);
 	code_size = code_count * sizeof(duk_instr_t);
 
-	data_size = consts_count * sizeof(duk_tval) +
-	            funcs_count * sizeof(duk_hobject *) +
-	            code_size;
+	data_size = consts_count * sizeof(duk_tval) + funcs_count * sizeof(duk_hobject *) + code_size;
 
 	DUK_DDD(DUK_DDDPRINT("consts_count=%ld, funcs_count=%ld, code_size=%ld -> "
 	                     "data_size=%ld*%ld + %ld*%ld + %ld = %ld",
-	                     (long) consts_count, (long) funcs_count, (long) code_size,
-	                     (long) consts_count, (long) sizeof(duk_tval),
-	                     (long) funcs_count, (long) sizeof(duk_hobject *),
-	                     (long) code_size, (long) data_size));
+	                     (long) consts_count,
+	                     (long) funcs_count,
+	                     (long) code_size,
+	                     (long) consts_count,
+	                     (long) sizeof(duk_tval),
+	                     (long) funcs_count,
+	                     (long) sizeof(duk_hobject *),
+	                     (long) code_size,
+	                     (long) data_size));
 
 	duk_push_fixed_buffer_nozero(thr, data_size);
 	h_data = (duk_hbuffer_fixed *) (void *) duk_known_hbuffer(thr, -1);
@@ -65702,12 +69852,12 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 
 	p_const = (duk_tval *) (void *) DUK_HBUFFER_FIXED_GET_DATA_PTR(thr->heap, h_data);
 	for (i = 0; i < consts_count; i++) {
-		DUK_ASSERT(i <= DUK_UARRIDX_MAX);  /* const limits */
-		tv = duk_hobject_find_existing_array_entry_tval_ptr(thr->heap, func->h_consts, (duk_uarridx_t) i);
+		DUK_ASSERT(i <= DUK_UARRIDX_MAX); /* const limits */
+		tv = duk_hobject_find_array_entry_tval_ptr(thr->heap, func->h_consts, (duk_uarridx_t) i);
 		DUK_ASSERT(tv != NULL);
 		DUK_TVAL_SET_TVAL(p_const, tv);
 		p_const++;
-		DUK_TVAL_INCREF(thr, tv);  /* may be a string constant */
+		DUK_TVAL_INCREF(thr, tv); /* may be a string constant */
 
 		DUK_DDD(DUK_DDDPRINT("constant: %!T", (duk_tval *) tv));
 	}
@@ -65716,8 +69866,8 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 	DUK_HCOMPFUNC_SET_FUNCS(thr->heap, h_res, p_func);
 	for (i = 0; i < funcs_count; i++) {
 		duk_hobject *h;
-		DUK_ASSERT(i * 3 <= DUK_UARRIDX_MAX);  /* func limits */
-		tv = duk_hobject_find_existing_array_entry_tval_ptr(thr->heap, func->h_funcs, (duk_uarridx_t) (i * 3));
+		DUK_ASSERT(i * 3 <= DUK_UARRIDX_MAX); /* func limits */
+		tv = duk_hobject_find_array_entry_tval_ptr(thr->heap, func->h_funcs, (duk_uarridx_t) (i * 3));
 		DUK_ASSERT(tv != NULL);
 		DUK_ASSERT(DUK_TVAL_IS_OBJECT(tv));
 		h = DUK_TVAL_GET_OBJECT(tv);
@@ -65726,8 +69876,7 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 		*p_func++ = h;
 		DUK_HOBJECT_INCREF(thr, h);
 
-		DUK_DDD(DUK_DDDPRINT("inner function: %p -> %!iO",
-		                     (void *) h, (duk_heaphdr *) h));
+		DUK_DDD(DUK_DDDPRINT("inner function: %p -> %!iO", (void *) h, (duk_heaphdr *) h));
 	}
 
 	p_instr = (duk_instr_t *) p_func;
@@ -65742,7 +69891,7 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 
 	DUK_ASSERT((duk_uint8_t *) (p_instr + code_count) == DUK_HBUFFER_FIXED_GET_DATA_PTR(thr->heap, h_data) + data_size);
 
-	duk_pop(thr);  /* 'data' (and everything in it) is reachable through h_res now */
+	duk_pop(thr); /* 'data' (and everything in it) is reachable through h_res now */
 
 	/*
 	 *  Init non-property result fields
@@ -65757,7 +69906,7 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 	DUK_ASSERT(func->temp_max >= 0);
 	h_res->nregs = (duk_uint16_t) func->temp_max;
 	h_res->nargs = (duk_uint16_t) duk_hobject_get_length(thr, func->h_argnames);
-	DUK_ASSERT(h_res->nregs >= h_res->nargs);  /* pass2 allocation handles this */
+	DUK_ASSERT(h_res->nregs >= h_res->nargs); /* pass2 allocation handles this */
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
 	h_res->start_line = (duk_uint32_t) func->min_line;
 	h_res->end_line = (duk_uint32_t) func->max_line;
@@ -65785,11 +69934,13 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 	DUK_DD(DUK_DDPRINT("keeping _Varmap because debugger support is enabled"));
 	keep_varmap = 1;
 #else
-	if (func->id_access_slow_own ||   /* directly uses slow accesses that may match own variables */
-	    func->id_access_arguments ||  /* accesses 'arguments' directly */
-	    func->may_direct_eval ||      /* may indirectly slow access through a direct eval */
-	    funcs_count > 0) {            /* has inner functions which may slow access (XXX: this can be optimized by looking at the inner functions) */
-		DUK_DD(DUK_DDPRINT("keeping _Varmap because of direct eval, slow path access that may match local variables, or presence of inner functions"));
+	if (func->id_access_slow_own || /* directly uses slow accesses that may match own variables */
+	    func->id_access_arguments || /* accesses 'arguments' directly */
+	    func->may_direct_eval || /* may indirectly slow access through a direct eval */
+	    funcs_count >
+	        0) { /* has inner functions which may slow access (XXX: this can be optimized by looking at the inner functions) */
+		DUK_DD(DUK_DDPRINT("keeping _Varmap because of direct eval, slow path access that may match local variables, or "
+		                   "presence of inner functions"));
 		keep_varmap = 1;
 	} else {
 		DUK_DD(DUK_DDPRINT("dropping _Varmap"));
@@ -65801,8 +69952,7 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 		duk_int_t num_used;
 		duk_dup(thr, func->varmap_idx);
 		num_used = duk__cleanup_varmap(comp_ctx);
-		DUK_DDD(DUK_DDDPRINT("cleaned up varmap: %!T (num_used=%ld)",
-		                     (duk_tval *) duk_get_tval(thr, -1), (long) num_used));
+		DUK_DDD(DUK_DDDPRINT("cleaned up varmap: %!T (num_used=%ld)", (duk_tval *) duk_get_tval(thr, -1), (long) num_used));
 
 		if (num_used > 0) {
 			duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_INT_VARMAP, DUK_PROPDESC_FLAGS_NONE);
@@ -65831,12 +69981,12 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 		 */
 		DUK_DD(DUK_DDPRINT("keeping _Formals because _Formals.length != nargs"));
 		keep_formals = 1;
-	} else if ((func->id_access_arguments || func->may_direct_eval) &&
-	           (formals_length > 0)) {
+	} else if ((func->id_access_arguments || func->may_direct_eval) && (formals_length > 0)) {
 		/* Direct eval (may access 'arguments') or accesses 'arguments'
 		 * explicitly: keep _Formals unless it is zero length.
 		 */
-		DUK_DD(DUK_DDPRINT("keeping _Formals because of direct eval or explicit access to 'arguments', and _Formals.length != 0"));
+		DUK_DD(DUK_DDPRINT(
+		    "keeping _Formals because of direct eval or explicit access to 'arguments', and _Formals.length != 0"));
 		keep_formals = 1;
 	} else {
 		DUK_DD(DUK_DDPRINT("omitting _Formals, nargs matches _Formals.length, so no properties added"));
@@ -65856,7 +70006,7 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 		DUK_DD(DUK_DDPRINT("setting function template .name to %!T", duk_get_tval(thr, -1)));
 		duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_NAME, DUK_PROPDESC_FLAGS_NONE);
 	}
-#endif  /* DUK_USE_FUNC_NAME_PROPERTY */
+#endif /* DUK_USE_FUNC_NAME_PROPERTY */
 
 	/* _Source */
 #if defined(DUK_USE_NONSTD_FUNC_SOURCE_PROPERTY)
@@ -65904,7 +70054,7 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 		duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_INT_SOURCE, DUK_PROPDESC_FLAGS_NONE);
 #endif
 	}
-#endif  /* DUK_USE_NONSTD_FUNC_SOURCE_PROPERTY */
+#endif /* DUK_USE_NONSTD_FUNC_SOURCE_PROPERTY */
 
 	/* _Pc2line */
 #if defined(DUK_USE_PC2LINE)
@@ -65914,14 +70064,14 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 		 */
 
 		DUK_ASSERT(code_count <= DUK_COMPILER_MAX_BYTECODE_LENGTH);
-		duk_hobject_pc2line_pack(thr, q_instr, (duk_uint_fast32_t) code_count);  /* -> pushes fixed buffer */
+		duk_hobject_pc2line_pack(thr, q_instr, (duk_uint_fast32_t) code_count); /* -> pushes fixed buffer */
 		duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_INT_PC2LINE, DUK_PROPDESC_FLAGS_NONE);
 
 		/* XXX: if assertions enabled, walk through all valid PCs
 		 * and check line mapping.
 		 */
 	}
-#endif  /* DUK_USE_PC2LINE */
+#endif /* DUK_USE_PC2LINE */
 
 	/* fileName */
 #if defined(DUK_USE_FUNC_FILENAME_PROPERTY)
@@ -65935,8 +70085,7 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 	}
 #endif
 
-	DUK_DD(DUK_DDPRINT("converted function: %!ixT",
-	                   (duk_tval *) duk_get_tval(thr, -1)));
+	DUK_DD(DUK_DDPRINT("converted function: %!ixT", (duk_tval *) duk_get_tval(thr, -1)));
 
 	/*
 	 *  Compact the function template.
@@ -65959,7 +70108,7 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 
 		p = p_start;
 		while (p < p_end) {
-			DUK_DDD(DUK_DDDPRINT("BC %04ld: %!I        ; 0x%08lx op=%ld (%!C) a=%ld b=%ld c=%ld",
+			DUK_DDD(DUK_DDDPRINT("BC %04ld: %!I        ; 0x%08lx op=%ld (%!X) a=%ld b=%ld c=%ld",
 			                     (long) (p - p_start),
 			                     (duk_instr_t) (*p),
 			                     (unsigned long) (*p),
@@ -66008,14 +70157,14 @@ DUK_LOCAL void duk__convert_to_func_template(duk_compiler_ctx *comp_ctx) {
 /* Code emission flags, passed in the 'opcode' field.  Opcode + flags
  * fit into 16 bits for now, so use duk_small_uint_t.
  */
-#define DUK__EMIT_FLAG_NO_SHUFFLE_A      (1 << 8)
-#define DUK__EMIT_FLAG_NO_SHUFFLE_B      (1 << 9)
-#define DUK__EMIT_FLAG_NO_SHUFFLE_C      (1 << 10)
-#define DUK__EMIT_FLAG_A_IS_SOURCE       (1 << 11)  /* slot A is a source (default: target) */
-#define DUK__EMIT_FLAG_B_IS_TARGET       (1 << 12)  /* slot B is a target (default: source) */
-#define DUK__EMIT_FLAG_C_IS_TARGET       (1 << 13)  /* slot C is a target (default: source) */
-#define DUK__EMIT_FLAG_BC_REGCONST       (1 << 14)  /* slots B and C are reg/const */
-#define DUK__EMIT_FLAG_RESERVE_JUMPSLOT  (1 << 15)  /* reserve a jumpslot after instr before target spilling, used for NEXTENUM */
+#define DUK__EMIT_FLAG_NO_SHUFFLE_A     (1 << 8)
+#define DUK__EMIT_FLAG_NO_SHUFFLE_B     (1 << 9)
+#define DUK__EMIT_FLAG_NO_SHUFFLE_C     (1 << 10)
+#define DUK__EMIT_FLAG_A_IS_SOURCE      (1 << 11) /* slot A is a source (default: target) */
+#define DUK__EMIT_FLAG_B_IS_TARGET      (1 << 12) /* slot B is a target (default: source) */
+#define DUK__EMIT_FLAG_C_IS_TARGET      (1 << 13) /* slot C is a target (default: source) */
+#define DUK__EMIT_FLAG_BC_REGCONST      (1 << 14) /* slots B and C are reg/const */
+#define DUK__EMIT_FLAG_RESERVE_JUMPSLOT (1 << 15) /* reserve a jumpslot after instr before target spilling, used for NEXTENUM */
 
 /* XXX: macro smaller than call? */
 DUK_LOCAL duk_int_t duk__get_current_pc(duk_compiler_ctx *comp_ctx) {
@@ -66026,7 +70175,8 @@ DUK_LOCAL duk_int_t duk__get_current_pc(duk_compiler_ctx *comp_ctx) {
 
 DUK_LOCAL duk_compiler_instr *duk__get_instr_ptr(duk_compiler_ctx *comp_ctx, duk_int_t pc) {
 	DUK_ASSERT(pc >= 0);
-	DUK_ASSERT((duk_size_t) pc < (duk_size_t) (DUK_BW_GET_SIZE(comp_ctx->thr, &comp_ctx->curr_func.bw_code) / sizeof(duk_compiler_instr)));
+	DUK_ASSERT((duk_size_t) pc <
+	           (duk_size_t) (DUK_BW_GET_SIZE(comp_ctx->thr, &comp_ctx->curr_func.bw_code) / sizeof(duk_compiler_instr)));
 	return ((duk_compiler_instr *) (void *) DUK_BW_GET_BASEPTR(comp_ctx->thr, &comp_ctx->curr_func.bw_code)) + pc;
 }
 
@@ -66046,7 +70196,9 @@ DUK_LOCAL void duk__emit(duk_compiler_ctx *comp_ctx, duk_instr_t ins) {
 	                     (long) duk__get_current_pc(comp_ctx),
 	                     (duk_instr_t) ins));
 
-	instr = (duk_compiler_instr *) (void *) DUK_BW_ENSURE_GETPTR(comp_ctx->thr, &comp_ctx->curr_func.bw_code, sizeof(duk_compiler_instr));
+	instr = (duk_compiler_instr *) (void *) DUK_BW_ENSURE_GETPTR(comp_ctx->thr,
+	                                                             &comp_ctx->curr_func.bw_code,
+	                                                             sizeof(duk_compiler_instr));
 	DUK_BW_ADD_PTR(comp_ctx->thr, &comp_ctx->curr_func.bw_code, sizeof(duk_compiler_instr));
 
 #if defined(DUK_USE_PC2LINE)
@@ -66097,7 +70249,7 @@ DUK_LOCAL void duk__emit(duk_compiler_ctx *comp_ctx, duk_instr_t ins) {
 
 	return;
 
-  fail_bc_limit:
+fail_bc_limit:
 	DUK_ERROR_RANGE(comp_ctx->thr, DUK_STR_BYTECODE_LIMIT);
 	DUK_WO_NORETURN(return;);
 }
@@ -66131,7 +70283,11 @@ DUK_LOCAL void duk__emit_op_only(duk_compiler_ctx *comp_ctx, duk_small_uint_t op
 }
 
 /* Important main primitive. */
-DUK_LOCAL void duk__emit_a_b_c(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_flags, duk_regconst_t a, duk_regconst_t b, duk_regconst_t c) {
+DUK_LOCAL void duk__emit_a_b_c(duk_compiler_ctx *comp_ctx,
+                               duk_small_uint_t op_flags,
+                               duk_regconst_t a,
+                               duk_regconst_t b,
+                               duk_regconst_t c) {
 	duk_instr_t ins = 0;
 	duk_int_t a_out = -1;
 	duk_int_t b_out = -1;
@@ -66139,8 +70295,7 @@ DUK_LOCAL void duk__emit_a_b_c(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_f
 	duk_int_t tmp;
 	duk_small_uint_t op = op_flags & 0xffU;
 
-	DUK_DDD(DUK_DDDPRINT("emit: op_flags=%04lx, a=%ld, b=%ld, c=%ld",
-	                     (unsigned long) op_flags, (long) a, (long) b, (long) c));
+	DUK_DDD(DUK_DDDPRINT("emit: op_flags=%04lx, a=%ld, b=%ld, c=%ld", (unsigned long) op_flags, (long) a, (long) b, (long) c));
 
 	/* We could rely on max temp/const checks: if they don't exceed BC
 	 * limit, nothing here can either (just asserts would be enough).
@@ -66149,11 +70304,11 @@ DUK_LOCAL void duk__emit_a_b_c(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_f
 	 * bugs.
 	 */
 
-	DUK_ASSERT_DISABLE((op_flags & 0xff) >= DUK_BC_OP_MIN);  /* unsigned */
+	DUK_ASSERT_DISABLE((op_flags & 0xff) >= DUK_BC_OP_MIN); /* unsigned */
 	DUK_ASSERT((op_flags & 0xff) <= DUK_BC_OP_MAX);
 	DUK_ASSERT(DUK__ISREG(a));
-	DUK_ASSERT(b != -1);  /* Not 'none'. */
-	DUK_ASSERT(c != -1);  /* Not 'none'. */
+	DUK_ASSERT(b != -1); /* Not 'none'. */
+	DUK_ASSERT(c != -1); /* Not 'none'. */
 
 	/* Input shuffling happens before the actual operation, while output
 	 * shuffling happens afterwards.  Output shuffling decisions are still
@@ -66215,7 +70370,7 @@ DUK_LOCAL void duk__emit_a_b_c(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_f
 			if (op_flags & DUK__EMIT_FLAG_BC_REGCONST) {
 				/* Opcode follows B/C reg/const convention. */
 				DUK_ASSERT((op & 0x01) == 0);
-				ins |= DUK_ENC_OP_A_B_C(0x01, 0, 0, 0);  /* const flag for B */
+				ins |= DUK_ENC_OP_A_B_C(0x01, 0, 0, 0); /* const flag for B */
 			} else {
 				DUK_D(DUK_DPRINT("B is const, opcode is not B/C reg/const: %x", op_flags));
 			}
@@ -66238,7 +70393,8 @@ DUK_LOCAL void duk__emit_a_b_c(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_f
 		} else if (op_flags & DUK__EMIT_FLAG_NO_SHUFFLE_B) {
 			if (b > DUK_BC_B_MAX) {
 				/* Note: 0xff != DUK_BC_B_MAX */
-				DUK_D(DUK_DPRINT("out of regs: 'b' (reg) needs shuffling but shuffle prohibited, b: %ld", (long) b));
+				DUK_D(
+				    DUK_DPRINT("out of regs: 'b' (reg) needs shuffling but shuffle prohibited, b: %ld", (long) b));
 				goto error_outofregs;
 			}
 		} else if (b <= DUK_BC_BC_MAX) {
@@ -66259,7 +70415,7 @@ DUK_LOCAL void duk__emit_a_b_c(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_f
 					duk__emit_load_int32_noshuffle(comp_ctx, tmp, b);
 					DUK_ASSERT(DUK_OP_MPUTOBJI == DUK_OP_MPUTOBJ + 1);
 					DUK_ASSERT(DUK_OP_MPUTARRI == DUK_OP_MPUTARR + 1);
-					op_flags++;  /* indirect opcode follows direct */
+					op_flags++; /* indirect opcode follows direct */
 				} else {
 					duk__emit(comp_ctx, DUK_ENC_OP_A_BC(DUK_OP_LDREG, tmp, b));
 				}
@@ -66285,7 +70441,7 @@ DUK_LOCAL void duk__emit_a_b_c(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_f
 			if (op_flags & DUK__EMIT_FLAG_BC_REGCONST) {
 				/* Opcode follows B/C reg/const convention. */
 				DUK_ASSERT((op & 0x02) == 0);
-				ins |= DUK_ENC_OP_A_B_C(0x02, 0, 0, 0);  /* const flag for C */
+				ins |= DUK_ENC_OP_A_B_C(0x02, 0, 0, 0); /* const flag for C */
 			} else {
 				DUK_D(DUK_DPRINT("C is const, opcode is not B/C reg/const: %x", op_flags));
 			}
@@ -66308,7 +70464,8 @@ DUK_LOCAL void duk__emit_a_b_c(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_f
 		} else if (op_flags & DUK__EMIT_FLAG_NO_SHUFFLE_C) {
 			if (c > DUK_BC_C_MAX) {
 				/* Note: 0xff != DUK_BC_C_MAX */
-				DUK_D(DUK_DPRINT("out of regs: 'c' (reg) needs shuffling but shuffle prohibited, c: %ld", (long) c));
+				DUK_D(
+				    DUK_DPRINT("out of regs: 'c' (reg) needs shuffling but shuffle prohibited, c: %ld", (long) c));
 				goto error_outofregs;
 			}
 		} else if (c <= DUK_BC_BC_MAX) {
@@ -66382,7 +70539,7 @@ DUK_LOCAL void duk__emit_a_b_c(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_f
 
 	return;
 
- error_outofregs:
+error_outofregs:
 	DUK_ERROR_RANGE(comp_ctx->thr, DUK_STR_REG_LIMIT);
 	DUK_WO_NORETURN(return;);
 }
@@ -66410,7 +70567,7 @@ DUK_LOCAL void duk__emit_b_c(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_fla
 	duk__emit_a_b_c(comp_ctx, op_flags, 0, b, c);
 }
 
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL void duk__emit_a(duk_compiler_ctx *comp_ctx, int op_flags, int a) {
 #if defined(DUK_USE_SHUFFLE_TORTURE)
 	op_flags |= DUK__EMIT_FLAG_NO_SHUFFLE_B | DUK__EMIT_FLAG_NO_SHUFFLE_C;
@@ -66419,7 +70576,7 @@ DUK_LOCAL void duk__emit_a(duk_compiler_ctx *comp_ctx, int op_flags, int a) {
 }
 #endif
 
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL void duk__emit_b(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_flags, duk_regconst_t b) {
 #if defined(DUK_USE_SHUFFLE_TORTURE)
 	op_flags |= DUK__EMIT_FLAG_NO_SHUFFLE_A | DUK__EMIT_FLAG_NO_SHUFFLE_C;
@@ -66433,10 +70590,10 @@ DUK_LOCAL void duk__emit_a_bc(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_fl
 	duk_int_t tmp;
 
 	/* allow caller to give a const number with the DUK__CONST_MARKER */
-	DUK_ASSERT(bc != -1);  /* Not 'none'. */
+	DUK_ASSERT(bc != -1); /* Not 'none'. */
 	bc = bc & (~DUK__CONST_MARKER);
 
-	DUK_ASSERT_DISABLE((op_flags & 0xff) >= DUK_BC_OP_MIN);  /* unsigned */
+	DUK_ASSERT_DISABLE((op_flags & 0xff) >= DUK_BC_OP_MIN); /* unsigned */
 	DUK_ASSERT((op_flags & 0xff) <= DUK_BC_OP_MAX);
 	DUK_ASSERT(bc >= DUK_BC_BC_MIN);
 	DUK_ASSERT(bc <= DUK_BC_BC_MAX);
@@ -66481,7 +70638,7 @@ DUK_LOCAL void duk__emit_a_bc(duk_compiler_ctx *comp_ctx, duk_small_uint_t op_fl
 	}
 	return;
 
- error_outofregs:
+error_outofregs:
 	DUK_ERROR_RANGE(comp_ctx->thr, DUK_STR_REG_LIMIT);
 	DUK_WO_NORETURN(return;);
 }
@@ -66496,12 +70653,12 @@ DUK_LOCAL void duk__emit_bc(duk_compiler_ctx *comp_ctx, duk_small_uint_t op, duk
 DUK_LOCAL void duk__emit_abc(duk_compiler_ctx *comp_ctx, duk_small_uint_t op, duk_regconst_t abc) {
 	duk_instr_t ins;
 
-	DUK_ASSERT_DISABLE(op >= DUK_BC_OP_MIN);  /* unsigned */
+	DUK_ASSERT_DISABLE(op >= DUK_BC_OP_MIN); /* unsigned */
 	DUK_ASSERT(op <= DUK_BC_OP_MAX);
-	DUK_ASSERT_DISABLE(abc >= DUK_BC_ABC_MIN);  /* unsigned */
+	DUK_ASSERT_DISABLE(abc >= DUK_BC_ABC_MIN); /* unsigned */
 	DUK_ASSERT(abc <= DUK_BC_ABC_MAX);
 	DUK_ASSERT((abc & DUK__CONST_MARKER) == 0);
-	DUK_ASSERT(abc != -1);  /* Not 'none'. */
+	DUK_ASSERT(abc != -1); /* Not 'none'. */
 
 	if (abc <= DUK_BC_ABC_MAX) {
 		;
@@ -66509,19 +70666,26 @@ DUK_LOCAL void duk__emit_abc(duk_compiler_ctx *comp_ctx, duk_small_uint_t op, du
 		goto error_outofregs;
 	}
 	ins = DUK_ENC_OP_ABC(op, abc);
-	DUK_DDD(DUK_DDDPRINT("duk__emit_abc: 0x%08lx line=%ld pc=%ld op=%ld (%!C) abc=%ld (%!I)",
-	                     (unsigned long) ins, (long) comp_ctx->curr_token.start_line,
-	                     (long) duk__get_current_pc(comp_ctx), (long) op, (long) op,
-	                     (long) abc, (duk_instr_t) ins));
+	DUK_DDD(DUK_DDDPRINT("duk__emit_abc: 0x%08lx line=%ld pc=%ld op=%ld (%!X) abc=%ld (%!I)",
+	                     (unsigned long) ins,
+	                     (long) comp_ctx->curr_token.start_line,
+	                     (long) duk__get_current_pc(comp_ctx),
+	                     (long) op,
+	                     (long) op,
+	                     (long) abc,
+	                     (duk_instr_t) ins));
 	duk__emit(comp_ctx, ins);
 	return;
 
- error_outofregs:
+error_outofregs:
 	DUK_ERROR_RANGE(comp_ctx->thr, DUK_STR_REG_LIMIT);
 	DUK_WO_NORETURN(return;);
 }
 
-DUK_LOCAL void duk__emit_load_int32_raw(duk_compiler_ctx *comp_ctx, duk_regconst_t reg, duk_int32_t val, duk_small_uint_t op_flags) {
+DUK_LOCAL void duk__emit_load_int32_raw(duk_compiler_ctx *comp_ctx,
+                                        duk_regconst_t reg,
+                                        duk_int32_t val,
+                                        duk_small_uint_t op_flags) {
 	/* XXX: Shuffling support could be implemented here so that LDINT+LDINTX
 	 * would only shuffle once (instead of twice).  The current code works
 	 * though, and has a smaller compiler footprint.
@@ -66536,7 +70700,10 @@ DUK_LOCAL void duk__emit_load_int32_raw(duk_compiler_ctx *comp_ctx, duk_regconst
 		duk_int32_t lo = val & ((((duk_int32_t) 1) << DUK_BC_LDINTX_SHIFT) - 1);
 		DUK_ASSERT(lo >= 0);
 		DUK_DDD(DUK_DDDPRINT("emit LDINT+LDINTX to reg %ld for %ld -> hi %ld, lo %ld",
-		                     (long) reg, (long) val, (long) hi, (long) lo));
+		                     (long) reg,
+		                     (long) val,
+		                     (long) hi,
+		                     (long) lo));
 		duk__emit_a_bc(comp_ctx, DUK_OP_LDINT | op_flags, reg, (duk_regconst_t) (hi + (duk_int32_t) DUK_BC_LDINT_BIAS));
 		duk__emit_a_bc(comp_ctx, DUK_OP_LDINTX | op_flags, reg, (duk_regconst_t) lo);
 	}
@@ -66577,7 +70744,7 @@ DUK_LOCAL void duk__emit_jump(duk_compiler_ctx *comp_ctx, duk_int_t target_pc) {
 DUK_LOCAL duk_int_t duk__emit_jump_empty(duk_compiler_ctx *comp_ctx) {
 	duk_int_t ret;
 
-	ret = duk__get_current_pc(comp_ctx);  /* useful for patching jumps later */
+	ret = duk__get_current_pc(comp_ctx); /* useful for patching jumps later */
 	duk__emit_op_only(comp_ctx, DUK_OP_JUMP);
 	return ret;
 }
@@ -66595,13 +70762,10 @@ DUK_LOCAL void duk__insert_jump_entry(duk_compiler_ctx *comp_ctx, duk_int_t jump
 	DUK_ASSERT(jump_pc >= 0);
 	offset = (duk_size_t) jump_pc * sizeof(duk_compiler_instr);
 	instr = (duk_compiler_instr *) (void *)
-	        DUK_BW_INSERT_ENSURE_AREA(comp_ctx->thr,
-	                                  &comp_ctx->curr_func.bw_code,
-	                                  offset,
-	                                  sizeof(duk_compiler_instr));
+	    DUK_BW_INSERT_ENSURE_AREA(comp_ctx->thr, &comp_ctx->curr_func.bw_code, offset, sizeof(duk_compiler_instr));
 
 #if defined(DUK_USE_PC2LINE)
-	line = comp_ctx->curr_token.start_line;  /* approximation, close enough */
+	line = comp_ctx->curr_token.start_line; /* approximation, close enough */
 #endif
 	instr->ins = DUK_ENC_OP_ABC(DUK_OP_JUMP, 0);
 #if defined(DUK_USE_PC2LINE)
@@ -66614,7 +70778,7 @@ DUK_LOCAL void duk__insert_jump_entry(duk_compiler_ctx *comp_ctx, duk_int_t jump
 	}
 	return;
 
-  fail_bc_limit:
+fail_bc_limit:
 	DUK_ERROR_RANGE(comp_ctx->thr, DUK_STR_BYTECODE_LIMIT);
 	DUK_WO_NORETURN(return;);
 }
@@ -66628,8 +70792,8 @@ DUK_LOCAL void duk__patch_jump(duk_compiler_ctx *comp_ctx, duk_int_t jump_pc, du
 
 	/* allow negative PCs, behave as a no-op */
 	if (jump_pc < 0) {
-		DUK_DDD(DUK_DDDPRINT("duk__patch_jump(): nop call, jump_pc=%ld (<0), target_pc=%ld",
-		                     (long) jump_pc, (long) target_pc));
+		DUK_DDD(
+		    DUK_DDDPRINT("duk__patch_jump(): nop call, jump_pc=%ld (<0), target_pc=%ld", (long) jump_pc, (long) target_pc));
 		return;
 	}
 	DUK_ASSERT(jump_pc >= 0);
@@ -66643,14 +70807,21 @@ DUK_LOCAL void duk__patch_jump(duk_compiler_ctx *comp_ctx, duk_int_t jump_pc, du
 
 	instr->ins = DUK_ENC_OP_ABC(DUK_OP_JUMP, offset + DUK_BC_JUMP_BIAS);
 	DUK_DDD(DUK_DDDPRINT("duk__patch_jump(): jump_pc=%ld, target_pc=%ld, offset=%ld",
-	                     (long) jump_pc, (long) target_pc, (long) offset));
+	                     (long) jump_pc,
+	                     (long) target_pc,
+	                     (long) offset));
 }
 
 DUK_LOCAL void duk__patch_jump_here(duk_compiler_ctx *comp_ctx, duk_int_t jump_pc) {
 	duk__patch_jump(comp_ctx, jump_pc, duk__get_current_pc(comp_ctx));
 }
 
-DUK_LOCAL void duk__patch_trycatch(duk_compiler_ctx *comp_ctx, duk_int_t ldconst_pc, duk_int_t trycatch_pc, duk_regconst_t reg_catch, duk_regconst_t const_varname, duk_small_uint_t flags) {
+DUK_LOCAL void duk__patch_trycatch(duk_compiler_ctx *comp_ctx,
+                                   duk_int_t ldconst_pc,
+                                   duk_int_t trycatch_pc,
+                                   duk_regconst_t reg_catch,
+                                   duk_regconst_t const_varname,
+                                   duk_small_uint_t flags) {
 	duk_compiler_instr *instr;
 
 	DUK_ASSERT(DUK__ISREG(reg_catch));
@@ -66670,7 +70841,10 @@ DUK_LOCAL void duk__patch_trycatch(duk_compiler_ctx *comp_ctx, duk_int_t ldconst
 			 * See: test-bug-trycatch-many-constants.js.
 			 */
 			DUK_D(DUK_DPRINT("failed to patch trycatch: flags=%ld, reg_catch=%ld, const_varname=%ld (0x%08lx)",
-			                 (long) flags, (long) reg_catch, (long) const_varname, (long) const_varname));
+			                 (long) flags,
+			                 (long) reg_catch,
+			                 (long) const_varname,
+			                 (long) const_varname));
 			DUK_ERROR_RANGE(comp_ctx->thr, DUK_STR_REG_LIMIT);
 			DUK_WO_NORETURN(return;);
 		}
@@ -66693,14 +70867,14 @@ DUK_LOCAL void duk__emit_if_false_skip(duk_compiler_ctx *comp_ctx, duk_regconst_
 	duk_small_uint_t op;
 
 	op = DUK__ISREG(regconst) ? DUK_OP_IFFALSE_R : DUK_OP_IFFALSE_C;
-	duk__emit_bc(comp_ctx, op, regconst);  /* helper will remove const flag */
+	duk__emit_bc(comp_ctx, op, regconst); /* helper will remove const flag */
 }
 
 DUK_LOCAL void duk__emit_if_true_skip(duk_compiler_ctx *comp_ctx, duk_regconst_t regconst) {
 	duk_small_uint_t op;
 
 	op = DUK__ISREG(regconst) ? DUK_OP_IFTRUE_R : DUK_OP_IFTRUE_C;
-	duk__emit_bc(comp_ctx, op, regconst);  /* helper will remove const flag */
+	duk__emit_bc(comp_ctx, op, regconst); /* helper will remove const flag */
 }
 
 DUK_LOCAL void duk__emit_invalid(duk_compiler_ctx *comp_ctx) {
@@ -66724,7 +70898,8 @@ DUK_LOCAL void duk__peephole_optimize_bytecode(duk_compiler_ctx *comp_ctx) {
 #if defined(DUK_USE_BUFLEN16)
 	/* No need to assert, buffer size maximum is 0xffff. */
 #else
-	DUK_ASSERT((duk_size_t) DUK_BW_GET_SIZE(comp_ctx->thr, &comp_ctx->curr_func.bw_code) / sizeof(duk_compiler_instr) <= (duk_size_t) DUK_INT_MAX);  /* bytecode limits */
+	DUK_ASSERT((duk_size_t) DUK_BW_GET_SIZE(comp_ctx->thr, &comp_ctx->curr_func.bw_code) / sizeof(duk_compiler_instr) <=
+	           (duk_size_t) DUK_INT_MAX); /* bytecode limits */
 #endif
 	n = (duk_int_t) (DUK_BW_GET_SIZE(comp_ctx->thr, &comp_ctx->curr_func.bw_code) / sizeof(duk_compiler_instr));
 
@@ -66759,7 +70934,9 @@ DUK_LOCAL void duk__peephole_optimize_bytecode(duk_compiler_ctx *comp_ctx) {
 			target_pc2 = target_pc1 + 1 + (duk_int_t) DUK_DEC_ABC(ins) - (duk_int_t) DUK_BC_JUMP_BIAS;
 
 			DUK_DDD(DUK_DDDPRINT("optimizing jump at pc %ld; old target is %ld -> new target is %ld",
-			                     (long) i, (long) target_pc1, (long) target_pc2));
+			                     (long) i,
+			                     (long) target_pc1,
+			                     (long) target_pc2));
 
 			bc[i].ins = DUK_ENC_OP_ABC(DUK_OP_JUMP, target_pc2 - (i + 1) + DUK_BC_JUMP_BIAS);
 
@@ -66785,15 +70962,21 @@ DUK_LOCAL void duk__peephole_optimize_bytecode(duk_compiler_ctx *comp_ctx) {
 /* XXX: DUK__IVAL_FLAG_REQUIRE_SHORT is passed but not currently implemented
  * by ispec/ivalue operations.
  */
-#define DUK__IVAL_FLAG_ALLOW_CONST          (1 << 0)  /* allow a constant to be returned */
-#define DUK__IVAL_FLAG_REQUIRE_TEMP         (1 << 1)  /* require a (mutable) temporary as a result (or a const if allowed) */
-#define DUK__IVAL_FLAG_REQUIRE_SHORT        (1 << 2)  /* require a short (8-bit) reg/const which fits into bytecode B/C slot */
+#define DUK__IVAL_FLAG_ALLOW_CONST   (1 << 0) /* allow a constant to be returned */
+#define DUK__IVAL_FLAG_REQUIRE_TEMP  (1 << 1) /* require a (mutable) temporary as a result (or a const if allowed) */
+#define DUK__IVAL_FLAG_REQUIRE_SHORT (1 << 2) /* require a short (8-bit) reg/const which fits into bytecode B/C slot */
 
 /* XXX: some code might benefit from DUK__SETTEMP_IFTEMP(thr,x) */
 
-#if 0  /* enable manually for dumping */
-#define DUK__DUMP_ISPEC(compctx,ispec) do { duk__dump_ispec((compctx), (ispec)); } while (0)
-#define DUK__DUMP_IVALUE(compctx,ivalue) do { duk__dump_ivalue((compctx), (ivalue)); } while (0)
+#if 0 /* enable manually for dumping */
+#define DUK__DUMP_ISPEC(compctx, ispec) \
+	do { \
+		duk__dump_ispec((compctx), (ispec)); \
+	} while (0)
+#define DUK__DUMP_IVALUE(compctx, ivalue) \
+	do { \
+		duk__dump_ivalue((compctx), (ivalue)); \
+	} while (0)
 
 DUK_LOCAL void duk__dump_ispec(duk_compiler_ctx *comp_ctx, duk_ispec *x) {
 	DUK_D(DUK_DPRINT("ispec dump: t=%ld regconst=0x%08lx, valstack_idx=%ld, value=%!T",
@@ -66811,8 +70994,12 @@ DUK_LOCAL void duk__dump_ivalue(duk_compiler_ctx *comp_ctx, duk_ivalue *x) {
 	                 duk_get_tval(comp_ctx->thr, x->x2.valstack_idx)));
 }
 #else
-#define DUK__DUMP_ISPEC(comp_ctx,x) do {} while (0)
-#define DUK__DUMP_IVALUE(comp_ctx,x) do {} while (0)
+#define DUK__DUMP_ISPEC(comp_ctx, x) \
+	do { \
+	} while (0)
+#define DUK__DUMP_IVALUE(comp_ctx, x) \
+	do { \
+	} while (0)
 #endif
 
 DUK_LOCAL void duk__ivalue_regconst(duk_ivalue *x, duk_regconst_t regconst) {
@@ -66862,7 +71049,7 @@ DUK_LOCAL duk_regconst_t duk__alloctemps(duk_compiler_ctx *comp_ctx, duk_small_i
 	res = comp_ctx->curr_func.temp_next;
 	comp_ctx->curr_func.temp_next += num;
 
-	if (comp_ctx->curr_func.temp_next > DUK__MAX_TEMPS) {  /* == DUK__MAX_TEMPS is OK */
+	if (comp_ctx->curr_func.temp_next > DUK__MAX_TEMPS) { /* == DUK__MAX_TEMPS is OK */
 		DUK_ERROR_RANGE(comp_ctx->thr, DUK_STR_TEMP_LIMIT);
 		DUK_WO_NORETURN(return 0;);
 	}
@@ -66915,8 +71102,7 @@ DUK_LOCAL duk_regconst_t duk__getconst(duk_compiler_ctx *comp_ctx) {
 		 * constant for e.g. +0 and -0.
 		 */
 		if (duk_js_samevalue(tv1, tv2)) {
-			DUK_DDD(DUK_DDDPRINT("reused existing constant for %!T -> const index %ld",
-			                     (duk_tval *) tv1, (long) i));
+			DUK_DDD(DUK_DDDPRINT("reused existing constant for %!T -> const index %ld", (duk_tval *) tv1, (long) i));
 			duk_pop(thr);
 			return (duk_regconst_t) i | (duk_regconst_t) DUK__CONST_MARKER;
 		}
@@ -66927,9 +71113,8 @@ DUK_LOCAL duk_regconst_t duk__getconst(duk_compiler_ctx *comp_ctx) {
 		DUK_WO_NORETURN(return 0;);
 	}
 
-	DUK_DDD(DUK_DDDPRINT("allocating new constant for %!T -> const index %ld",
-	                     (duk_tval *) tv1, (long) n));
-	(void) duk_put_prop_index(thr, f->consts_idx, (duk_uarridx_t) n);  /* invalidates tv1, tv2 */
+	DUK_DDD(DUK_DDDPRINT("allocating new constant for %!T -> const index %ld", (duk_tval *) tv1, (long) n));
+	(void) duk_put_prop_index(thr, f->consts_idx, (duk_uarridx_t) n); /* invalidates tv1, tv2 */
 	return (duk_regconst_t) n | (duk_regconst_t) DUK__CONST_MARKER;
 }
 
@@ -66938,15 +71123,15 @@ DUK_LOCAL duk_bool_t duk__const_needs_refcount(duk_compiler_ctx *comp_ctx, duk_r
 	duk_compiler_func *f = &comp_ctx->curr_func;
 	duk_bool_t ret;
 
-	DUK_ASSERT((rc & DUK__CONST_MARKER) == 0);  /* caller removes const marker */
+	DUK_ASSERT((rc & DUK__CONST_MARKER) == 0); /* caller removes const marker */
 	(void) duk_get_prop_index(comp_ctx->thr, f->consts_idx, (duk_uarridx_t) rc);
-	ret = !duk_is_number(comp_ctx->thr, -1);  /* now only number/string, so conservative check */
+	ret = !duk_is_number(comp_ctx->thr, -1); /* now only number/string, so conservative check */
 	duk_pop(comp_ctx->thr);
 	return ret;
 #else
 	DUK_UNREF(comp_ctx);
 	DUK_UNREF(rc);
-	DUK_ASSERT((rc & DUK__CONST_MARKER) == 0);  /* caller removes const marker */
+	DUK_ASSERT((rc & DUK__CONST_MARKER) == 0); /* caller removes const marker */
 	return 0;
 #endif
 }
@@ -67009,9 +71194,7 @@ duk_regconst_t duk__ispec_toregconst_raw(duk_compiler_ctx *comp_ctx,
 		}
 		case DUK_TAG_BOOLEAN: {
 			duk_regconst_t dest = (forced_reg >= 0 ? forced_reg : DUK__ALLOCTEMP(comp_ctx));
-			duk__emit_bc(comp_ctx,
-			             (DUK_TVAL_GET_BOOLEAN(tv) ? DUK_OP_LDTRUE : DUK_OP_LDFALSE),
-			             dest);
+			duk__emit_bc(comp_ctx, (DUK_TVAL_GET_BOOLEAN(tv) ? DUK_OP_LDTRUE : DUK_OP_LDFALSE), dest);
 			return dest;
 		}
 		case DUK_TAG_POINTER: {
@@ -67027,7 +71210,7 @@ duk_regconst_t duk__ispec_toregconst_raw(duk_compiler_ctx *comp_ctx,
 			DUK_UNREF(h);
 			DUK_ASSERT(h != NULL);
 
-#if 0  /* XXX: to be implemented? */
+#if 0 /* XXX: to be implemented? */
 			/* Use special opcodes to load short strings */
 			if (DUK_HSTRING_GET_BYTELEN(h) <= 2) {
 				/* Encode into a single opcode (18 bits can encode 1-2 bytes + length indicator) */
@@ -67097,8 +71280,8 @@ duk_regconst_t duk__ispec_toregconst_raw(duk_compiler_ctx *comp_ctx,
 				return dest;
 			}
 		}
-		}  /* end switch */
-		goto fail_internal;  /* never here */
+		} /* end switch */
+		goto fail_internal; /* never here */
 	}
 	case DUK_ISPEC_REGCONST: {
 		if (forced_reg >= 0) {
@@ -67131,11 +71314,11 @@ duk_regconst_t duk__ispec_toregconst_raw(duk_compiler_ctx *comp_ctx,
 		return x->regconst;
 	}
 	default: {
-		break;  /* never here */
+		break; /* never here */
 	}
 	}
 
- fail_internal:
+fail_internal:
 	DUK_ERROR_INTERNAL(thr);
 	DUK_WO_NORETURN(return 0;);
 }
@@ -67155,10 +71338,13 @@ DUK_LOCAL void duk__ivalue_toplain_raw(duk_compiler_ctx *comp_ctx, duk_ivalue *x
 
 	DUK_DDD(DUK_DDDPRINT("duk__ivalue_toplain_raw(): x={t=%ld,op=%ld,x1={%ld:%ld:%!T},x2={%ld:%ld:%!T}}, "
 	                     "forced_reg=%ld",
-	                     (long) x->t, (long) x->op,
-	                     (long) x->x1.t, (long) x->x1.regconst,
+	                     (long) x->t,
+	                     (long) x->op,
+	                     (long) x->x1.t,
+	                     (long) x->x1.regconst,
 	                     (duk_tval *) duk_get_tval(thr, x->x1.valstack_idx),
-	                     (long) x->x2.t, (long) x->x2.regconst,
+	                     (long) x->x2.t,
+	                     (long) x->x2.regconst,
 	                     (duk_tval *) duk_get_tval(thr, x->x2.valstack_idx),
 	                     (long) forced_reg));
 
@@ -67184,9 +71370,7 @@ DUK_LOCAL void duk__ivalue_toplain_raw(duk_compiler_ctx *comp_ctx, duk_ivalue *x
 			DUK_ASSERT(tv1 != NULL);
 			DUK_ASSERT(tv2 != NULL);
 
-			DUK_DDD(DUK_DDDPRINT("arith: tv1=%!T, tv2=%!T",
-			                     (duk_tval *) tv1,
-			                     (duk_tval *) tv2));
+			DUK_DDD(DUK_DDDPRINT("arith: tv1=%!T, tv2=%!T", (duk_tval *) tv1, (duk_tval *) tv2));
 
 			if (DUK_TVAL_IS_NUMBER(tv1) && DUK_TVAL_IS_NUMBER(tv2)) {
 				duk_double_t d1 = DUK_TVAL_GET_NUMBER(tv1);
@@ -67195,7 +71379,9 @@ DUK_LOCAL void duk__ivalue_toplain_raw(duk_compiler_ctx *comp_ctx, duk_ivalue *x
 				duk_bool_t accept_fold = 1;
 
 				DUK_DDD(DUK_DDDPRINT("arith inline check: d1=%lf, d2=%lf, op=%ld",
-				                     (double) d1, (double) d2, (long) x->op));
+				                     (double) d1,
+				                     (double) d2,
+				                     (long) x->op));
 				switch (x->op) {
 				case DUK_OP_ADD: {
 					d3 = d1 + d2;
@@ -67221,7 +71407,7 @@ DUK_LOCAL void duk__ivalue_toplain_raw(duk_compiler_ctx *comp_ctx, duk_ivalue *x
 					break;
 				}
 				default: {
-					d3 = 0.0;  /* Won't be used, but silence MSVC /W4 warning. */
+					d3 = 0.0; /* Won't be used, but silence MSVC /W4 warning. */
 					accept_fold = 0;
 					break;
 				}
@@ -67235,7 +71421,7 @@ DUK_LOCAL void duk__ivalue_toplain_raw(duk_compiler_ctx *comp_ctx, duk_ivalue *x
 
 					x->t = DUK_IVAL_PLAIN;
 					DUK_ASSERT(x->x1.t == DUK_ISPEC_VALUE);
-					DUK_TVAL_SET_NUMBER(tv1, d3);  /* old value is number: no refcount */
+					DUK_TVAL_SET_NUMBER(tv1, d3); /* old value is number: no refcount */
 					return;
 				}
 			} else if (x->op == DUK_OP_ADD && DUK_TVAL_IS_STRING(tv1) && DUK_TVAL_IS_STRING(tv2)) {
@@ -67252,8 +71438,14 @@ DUK_LOCAL void duk__ivalue_toplain_raw(duk_compiler_ctx *comp_ctx, duk_ivalue *x
 			}
 		}
 
-		arg1 = duk__ispec_toregconst_raw(comp_ctx, &x->x1, -1, DUK__IVAL_FLAG_ALLOW_CONST | DUK__IVAL_FLAG_REQUIRE_SHORT /*flags*/);
-		arg2 = duk__ispec_toregconst_raw(comp_ctx, &x->x2, -1, DUK__IVAL_FLAG_ALLOW_CONST | DUK__IVAL_FLAG_REQUIRE_SHORT /*flags*/);
+		arg1 = duk__ispec_toregconst_raw(comp_ctx,
+		                                 &x->x1,
+		                                 -1,
+		                                 DUK__IVAL_FLAG_ALLOW_CONST | DUK__IVAL_FLAG_REQUIRE_SHORT /*flags*/);
+		arg2 = duk__ispec_toregconst_raw(comp_ctx,
+		                                 &x->x2,
+		                                 -1,
+		                                 DUK__IVAL_FLAG_ALLOW_CONST | DUK__IVAL_FLAG_REQUIRE_SHORT /*flags*/);
 
 		/* If forced reg, use it as destination.  Otherwise try to
 		 * use either coerced ispec if it is a temporary.
@@ -67281,8 +71473,14 @@ DUK_LOCAL void duk__ivalue_toplain_raw(duk_compiler_ctx *comp_ctx, duk_ivalue *x
 		duk_regconst_t dest;
 
 		/* Need a short reg/const, does not have to be a mutable temp. */
-		arg1 = duk__ispec_toregconst_raw(comp_ctx, &x->x1, -1, DUK__IVAL_FLAG_ALLOW_CONST | DUK__IVAL_FLAG_REQUIRE_SHORT /*flags*/);
-		arg2 = duk__ispec_toregconst_raw(comp_ctx, &x->x2, -1, DUK__IVAL_FLAG_ALLOW_CONST | DUK__IVAL_FLAG_REQUIRE_SHORT /*flags*/);
+		arg1 = duk__ispec_toregconst_raw(comp_ctx,
+		                                 &x->x1,
+		                                 -1,
+		                                 DUK__IVAL_FLAG_ALLOW_CONST | DUK__IVAL_FLAG_REQUIRE_SHORT /*flags*/);
+		arg2 = duk__ispec_toregconst_raw(comp_ctx,
+		                                 &x->x2,
+		                                 -1,
+		                                 DUK__IVAL_FLAG_ALLOW_CONST | DUK__IVAL_FLAG_REQUIRE_SHORT /*flags*/);
 
 		/* Pick a destination register.  If either base value or key
 		 * happens to be a temp value, reuse it as the destination.
@@ -67303,11 +71501,7 @@ DUK_LOCAL void duk__ivalue_toplain_raw(duk_compiler_ctx *comp_ctx, duk_ivalue *x
 			dest = DUK__ALLOCTEMP(comp_ctx);
 		}
 
-		duk__emit_a_b_c(comp_ctx,
-		                DUK_OP_GETPROP | DUK__EMIT_FLAG_BC_REGCONST,
-		                dest,
-		                arg1,
-		                arg2);
+		duk__emit_a_b_c(comp_ctx, DUK_OP_GETPROP | DUK__EMIT_FLAG_BC_REGCONST, dest, arg1, arg2);
 
 		duk__ivalue_regconst(x, dest);
 		return;
@@ -67375,10 +71569,13 @@ duk_regconst_t duk__ivalue_toregconst_raw(duk_compiler_ctx *comp_ctx,
 
 	DUK_DDD(DUK_DDDPRINT("duk__ivalue_toregconst_raw(): x={t=%ld,op=%ld,x1={%ld:%ld:%!T},x2={%ld:%ld:%!T}}, "
 	                     "forced_reg=%ld, flags 0x%08lx: allow_const=%ld require_temp=%ld require_short=%ld",
-	                     (long) x->t, (long) x->op,
-	                     (long) x->x1.t, (long) x->x1.regconst,
+	                     (long) x->t,
+	                     (long) x->op,
+	                     (long) x->x1.t,
+	                     (long) x->x1.regconst,
 	                     (duk_tval *) duk_get_tval(thr, x->x1.valstack_idx),
-	                     (long) x->x2.t, (long) x->x2.regconst,
+	                     (long) x->x2.t,
+	                     (long) x->x2.regconst,
 	                     (duk_tval *) duk_get_tval(thr, x->x2.valstack_idx),
 	                     (long) forced_reg,
 	                     (unsigned long) flags,
@@ -67401,7 +71598,7 @@ DUK_LOCAL duk_regconst_t duk__ivalue_toreg(duk_compiler_ctx *comp_ctx, duk_ivalu
 	return duk__ivalue_toregconst_raw(comp_ctx, x, -1, 0 /*flags*/);
 }
 
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL duk_regconst_t duk__ivalue_totemp(duk_compiler_ctx *comp_ctx, duk_ivalue *x) {
 	return duk__ivalue_toregconst_raw(comp_ctx, x, -1, DUK__IVAL_FLAG_REQUIRE_TEMP /*flags*/);
 }
@@ -67437,8 +71634,7 @@ DUK_LOCAL duk_regconst_t duk__lookup_active_register_binding(duk_compiler_ctx *c
 	duk_hstring *h_varname;
 	duk_regconst_t ret;
 
-	DUK_DDD(DUK_DDDPRINT("resolving identifier reference to '%!T'",
-	                     (duk_tval *) duk_get_tval(thr, -1)));
+	DUK_DDD(DUK_DDDPRINT("resolving identifier reference to '%!T'", (duk_tval *) duk_get_tval(thr, -1)));
 
 	/*
 	 *  Special name handling
@@ -67491,13 +71687,13 @@ DUK_LOCAL duk_regconst_t duk__lookup_active_register_binding(duk_compiler_ctx *c
 	DUK_DDD(DUK_DDDPRINT("identifier lookup -> reg %ld", (long) ret));
 	return ret;
 
- slow_path_notown:
+slow_path_notown:
 	DUK_DDD(DUK_DDDPRINT("identifier lookup -> slow path, not own variable"));
 
 	comp_ctx->curr_func.id_access_slow = 1;
 	return (duk_regconst_t) -1;
 
- slow_path_own:
+slow_path_own:
 	DUK_DDD(DUK_DDDPRINT("identifier lookup -> slow path, may be own variable"));
 
 	comp_ctx->curr_func.id_access_slow = 1;
@@ -67525,7 +71721,7 @@ DUK_LOCAL duk_bool_t duk__lookup_lhs(duk_compiler_ctx *comp_ctx, duk_regconst_t
 
 	if (reg_varbind >= 0) {
 		*out_reg_varbind = reg_varbind;
-		*out_rc_varname = 0;  /* duk_regconst_t is unsigned, so use 0 as dummy value (ignored by caller) */
+		*out_rc_varname = 0; /* duk_regconst_t is unsigned, so use 0 as dummy value (ignored by caller) */
 		duk_pop(thr);
 		return 1;
 	} else {
@@ -67575,7 +71771,7 @@ DUK_LOCAL void duk__add_label(duk_compiler_ctx *comp_ctx, duk_hstring *h_label,
 	}
 
 	duk_push_hstring(thr, h_label);
-	DUK_ASSERT(n <= DUK_UARRIDX_MAX);  /* label limits */
+	DUK_ASSERT(n <= DUK_UARRIDX_MAX); /* label limits */
 	(void) duk_put_prop_index(thr, comp_ctx->curr_func.labelnames_idx, (duk_uarridx_t) n);
 
 	new_size = (n + 1) * sizeof(duk_labelinfo);
@@ -67585,7 +71781,7 @@ DUK_LOCAL void duk__add_label(duk_compiler_ctx *comp_ctx, duk_hstring *h_label,
 	/* relookup after possible realloc */
 	p = (duk_uint8_t *) DUK_HBUFFER_DYNAMIC_GET_DATA_PTR(thr->heap, comp_ctx->curr_func.h_labelinfos);
 	li_start = (duk_labelinfo *) (void *) p;
-	DUK_UNREF(li_start);  /* silence scan-build warning */
+	DUK_UNREF(li_start); /* silence scan-build warning */
 	li = (duk_labelinfo *) (void *) (p + DUK_HBUFFER_GET_SIZE(comp_ctx->curr_func.h_labelinfos));
 	li--;
 
@@ -67599,12 +71795,15 @@ DUK_LOCAL void duk__add_label(duk_compiler_ctx *comp_ctx, duk_hstring *h_label,
 	li->flags = DUK_LABEL_FLAG_ALLOW_BREAK;
 	li->label_id = label_id;
 	li->h_label = h_label;
-	li->catch_depth = comp_ctx->curr_func.catch_depth;   /* catch depth from current func */
+	li->catch_depth = comp_ctx->curr_func.catch_depth; /* catch depth from current func */
 	li->pc_label = pc_label;
 
 	DUK_DDD(DUK_DDDPRINT("registered label: flags=0x%08lx, id=%ld, name=%!O, catch_depth=%ld, pc_label=%ld",
-	                     (unsigned long) li->flags, (long) li->label_id, (duk_heaphdr *) li->h_label,
-	                     (long) li->catch_depth, (long) li->pc_label));
+	                     (unsigned long) li->flags,
+	                     (long) li->label_id,
+	                     (duk_heaphdr *) li->h_label,
+	                     (long) li->catch_depth,
+	                     (long) li->pc_label));
 }
 
 /* Update all labels with matching label_id. */
@@ -67628,7 +71827,9 @@ DUK_LOCAL void duk__update_label_flags(duk_compiler_ctx *comp_ctx, duk_int_t lab
 		}
 
 		DUK_DDD(DUK_DDDPRINT("updating (overwriting) label flags for li=%p, label_id=%ld, flags=%ld",
-		                     (void *) li, (long) label_id, (long) flags));
+		                     (void *) li,
+		                     (long) label_id,
+		                     (long) flags));
 
 		li->flags = flags;
 	}
@@ -67649,14 +71850,19 @@ DUK_LOCAL void duk__update_label_flags(duk_compiler_ctx *comp_ctx, duk_int_t lab
  */
 
 /* XXX: awkward, especially the bunch of separate output values -> output struct? */
-DUK_LOCAL void duk__lookup_active_label(duk_compiler_ctx *comp_ctx, duk_hstring *h_label, duk_bool_t is_break, duk_int_t *out_label_id, duk_int_t *out_label_catch_depth, duk_int_t *out_label_pc, duk_bool_t *out_is_closest) {
+DUK_LOCAL void duk__lookup_active_label(duk_compiler_ctx *comp_ctx,
+                                        duk_hstring *h_label,
+                                        duk_bool_t is_break,
+                                        duk_int_t *out_label_id,
+                                        duk_int_t *out_label_catch_depth,
+                                        duk_int_t *out_label_pc,
+                                        duk_bool_t *out_is_closest) {
 	duk_hthread *thr = comp_ctx->thr;
 	duk_uint8_t *p;
 	duk_labelinfo *li_start, *li_end, *li;
 	duk_bool_t match = 0;
 
-	DUK_DDD(DUK_DDDPRINT("looking up active label: label='%!O', is_break=%ld",
-	                     (duk_heaphdr *) h_label, (long) is_break));
+	DUK_DDD(DUK_DDDPRINT("looking up active label: label='%!O', is_break=%ld", (duk_heaphdr *) h_label, (long) is_break));
 
 	DUK_UNREF(thr);
 
@@ -67680,7 +71886,8 @@ DUK_LOCAL void duk__lookup_active_label(duk_compiler_ctx *comp_ctx, duk_hstring
 		}
 
 		DUK_DDD(DUK_DDDPRINT("labelinfo[%ld] -> '%!O' label name matches (still need to check type)",
-		                     (long) (li - li_start), (duk_heaphdr *) h_label));
+		                     (long) (li - li_start),
+		                     (duk_heaphdr *) h_label));
 
 		/* currently all labels accept a break, so no explicit check for it now */
 		DUK_ASSERT(li->flags & DUK_LABEL_FLAG_ALLOW_BREAK);
@@ -67714,8 +71921,10 @@ DUK_LOCAL void duk__lookup_active_label(duk_compiler_ctx *comp_ctx, duk_hstring
 	}
 
 	DUK_DDD(DUK_DDDPRINT("label match: %!O -> label_id %ld, catch_depth=%ld, pc_label=%ld",
-	                     (duk_heaphdr *) h_label, (long) li->label_id,
-	                     (long) li->catch_depth, (long) li->pc_label));
+	                     (duk_heaphdr *) h_label,
+	                     (long) li->label_id,
+	                     (long) li->catch_depth,
+	                     (long) li->pc_label));
 
 	*out_label_id = li->label_id;
 	*out_label_catch_depth = li->catch_depth;
@@ -67739,21 +71948,21 @@ DUK_LOCAL void duk__reset_labels_to_length(duk_compiler_ctx *comp_ctx, duk_size_
  */
 
 /* object literal key tracking flags */
-#define DUK__OBJ_LIT_KEY_PLAIN  (1 << 0)  /* key encountered as a plain property */
-#define DUK__OBJ_LIT_KEY_GET    (1 << 1)  /* key encountered as a getter */
-#define DUK__OBJ_LIT_KEY_SET    (1 << 2)  /* key encountered as a setter */
+#define DUK__OBJ_LIT_KEY_PLAIN (1 << 0) /* key encountered as a plain property */
+#define DUK__OBJ_LIT_KEY_GET   (1 << 1) /* key encountered as a getter */
+#define DUK__OBJ_LIT_KEY_SET   (1 << 2) /* key encountered as a setter */
 
 DUK_LOCAL void duk__nud_array_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 	duk_hthread *thr = comp_ctx->thr;
-	duk_regconst_t reg_obj;                 /* result reg */
-	duk_regconst_t reg_temp;                /* temp reg */
-	duk_regconst_t temp_start;              /* temp reg value for start of loop */
-	duk_small_uint_t max_init_values;  /* max # of values initialized in one MPUTARR set */
-	duk_small_uint_t num_values;       /* number of values in current MPUTARR set */
-	duk_uarridx_t curr_idx;            /* current (next) array index */
-	duk_uarridx_t start_idx;           /* start array index of current MPUTARR set */
-	duk_uarridx_t init_idx;            /* last array index explicitly initialized, +1 */
-	duk_bool_t require_comma;          /* next loop requires a comma */
+	duk_regconst_t reg_obj; /* result reg */
+	duk_regconst_t reg_temp; /* temp reg */
+	duk_regconst_t temp_start; /* temp reg value for start of loop */
+	duk_small_uint_t max_init_values; /* max # of values initialized in one MPUTARR set */
+	duk_small_uint_t num_values; /* number of values in current MPUTARR set */
+	duk_uarridx_t curr_idx; /* current (next) array index */
+	duk_uarridx_t start_idx; /* start array index of current MPUTARR set */
+	duk_uarridx_t init_idx; /* last array index explicitly initialized, +1 */
+	duk_bool_t require_comma; /* next loop requires a comma */
 #if !defined(DUK_USE_PREFER_SIZE)
 	duk_int_t pc_newarr;
 	duk_compiler_instr *instr;
@@ -67762,13 +71971,13 @@ DUK_LOCAL void duk__nud_array_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 	/* DUK_TOK_LBRACKET already eaten, current token is right after that */
 	DUK_ASSERT(comp_ctx->prev_token.t == DUK_TOK_LBRACKET);
 
-	max_init_values = DUK__MAX_ARRAY_INIT_VALUES;  /* XXX: depend on available temps? */
+	max_init_values = DUK__MAX_ARRAY_INIT_VALUES; /* XXX: depend on available temps? */
 
 	reg_obj = DUK__ALLOCTEMP(comp_ctx);
 #if !defined(DUK_USE_PREFER_SIZE)
 	pc_newarr = duk__get_current_pc(comp_ctx);
 #endif
-	duk__emit_bc(comp_ctx, DUK_OP_NEWARR, reg_obj);  /* XXX: patch initial size hint afterwards? */
+	duk__emit_bc(comp_ctx, DUK_OP_NEWARR, reg_obj); /* XXX: patch initial size hint afterwards? */
 	temp_start = DUK__GETTEMP(comp_ctx);
 
 	/*
@@ -67784,7 +71993,7 @@ DUK_LOCAL void duk__nud_array_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 	 */
 
 	curr_idx = 0;
-	init_idx = 0;         /* tracks maximum initialized index + 1 */
+	init_idx = 0; /* tracks maximum initialized index + 1 */
 	start_idx = 0;
 	require_comma = 0;
 
@@ -67830,7 +72039,7 @@ DUK_LOCAL void duk__nud_array_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 				duk__emit_load_int32(comp_ctx, reg_temp, (duk_int32_t) start_idx);
 			}
 
-			reg_temp = DUK__ALLOCTEMP(comp_ctx);   /* alloc temp just in case, to update max temp */
+			reg_temp = DUK__ALLOCTEMP(comp_ctx); /* alloc temp just in case, to update max temp */
 			DUK__SETTEMP(comp_ctx, reg_temp);
 			duk__expr_toforcedreg(comp_ctx, res, DUK__BP_COMMA /*rbp_flags*/, reg_temp /*forced_reg*/);
 			DUK__SETTEMP(comp_ctx, reg_temp + 1);
@@ -67855,9 +72064,7 @@ DUK_LOCAL void duk__nud_array_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 			 *   never needs to be.
 			 */
 			duk__emit_a_b_c(comp_ctx,
-			                DUK_OP_MPUTARR |
-			                    DUK__EMIT_FLAG_NO_SHUFFLE_C |
-			                    DUK__EMIT_FLAG_A_IS_SOURCE,
+			                DUK_OP_MPUTARR | DUK__EMIT_FLAG_NO_SHUFFLE_C | DUK__EMIT_FLAG_A_IS_SOURCE,
 			                reg_obj,
 			                temp_start,
 			                (duk_regconst_t) (num_values + 1));
@@ -67878,8 +72085,7 @@ DUK_LOCAL void duk__nud_array_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 	DUK_ASSERT(comp_ctx->curr_token.t == DUK_TOK_RBRACKET);
 	duk__advance(comp_ctx);
 
-	DUK_DDD(DUK_DDDPRINT("array literal done, curridx=%ld, initidx=%ld",
-	                     (long) curr_idx, (long) init_idx));
+	DUK_DDD(DUK_DDDPRINT("array literal done, curridx=%ld, initidx=%ld", (long) curr_idx, (long) init_idx));
 
 	/* trailing elisions? */
 	if (curr_idx > init_idx) {
@@ -67887,10 +72093,7 @@ DUK_LOCAL void duk__nud_array_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 		DUK_DDD(DUK_DDDPRINT("array literal has trailing elisions which affect its length"));
 		reg_temp = DUK__ALLOCTEMP(comp_ctx);
 		duk__emit_load_int32(comp_ctx, reg_temp, (duk_int_t) curr_idx);
-		duk__emit_a_bc(comp_ctx,
-		               DUK_OP_SETALEN | DUK__EMIT_FLAG_A_IS_SOURCE,
-		               reg_obj,
-		               reg_temp);
+		duk__emit_a_bc(comp_ctx, DUK_OP_SETALEN | DUK__EMIT_FLAG_A_IS_SOURCE, reg_obj, reg_temp);
 	}
 
 	DUK__SETTEMP(comp_ctx, temp_start);
@@ -67898,7 +72101,7 @@ DUK_LOCAL void duk__nud_array_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 	duk__ivalue_regconst(res, reg_obj);
 	return;
 
- syntax_error:
+syntax_error:
 	DUK_ERROR_SYNTAX(thr, DUK_STR_INVALID_ARRAY_LITERAL);
 	DUK_WO_NORETURN(return;);
 }
@@ -67922,9 +72125,7 @@ DUK_LOCAL void duk__objlit_flush_keys(duk_compiler_ctx *comp_ctx, duk__objlit_st
 		 */
 		DUK_ASSERT(st->num_pairs > 0);
 		duk__emit_a_b_c(comp_ctx,
-		                DUK_OP_MPUTOBJ |
-		                    DUK__EMIT_FLAG_NO_SHUFFLE_C |
-		                    DUK__EMIT_FLAG_A_IS_SOURCE,
+		                DUK_OP_MPUTOBJ | DUK__EMIT_FLAG_NO_SHUFFLE_C | DUK__EMIT_FLAG_A_IS_SOURCE,
 		                st->reg_obj,
 		                st->temp_start,
 		                (duk_regconst_t) (st->num_pairs * 2));
@@ -67943,7 +72144,7 @@ DUK_LOCAL duk_bool_t duk__objlit_load_key(duk_compiler_ctx *comp_ctx, duk_ivalue
 		/* numbers can be loaded as numbers and coerced on the fly */
 		duk_push_number(comp_ctx->thr, tok->num);
 	} else {
-		return 1;  /* error */
+		return 1; /* error */
 	}
 
 	duk__ivalue_plain_fromstack(comp_ctx, res);
@@ -67956,10 +72157,10 @@ DUK_LOCAL duk_bool_t duk__objlit_load_key(duk_compiler_ctx *comp_ctx, duk_ivalue
 DUK_LOCAL void duk__nud_object_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 	duk_hthread *thr = comp_ctx->thr;
 	duk__objlit_state st;
-	duk_regconst_t reg_temp;          /* temp reg */
-	duk_small_uint_t max_init_pairs;  /* max # of key-value pairs initialized in one MPUTOBJ set */
-	duk_bool_t first;                 /* first value: comma must not precede the value */
-	duk_bool_t is_set, is_get;        /* temps */
+	duk_regconst_t reg_temp; /* temp reg */
+	duk_small_uint_t max_init_pairs; /* max # of key-value pairs initialized in one MPUTOBJ set */
+	duk_bool_t first; /* first value: comma must not precede the value */
+	duk_bool_t is_set, is_get; /* temps */
 #if !defined(DUK_USE_PREFER_SIZE)
 	duk_int_t pc_newobj;
 	duk_compiler_instr *instr;
@@ -67967,12 +72168,12 @@ DUK_LOCAL void duk__nud_object_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *r
 
 	DUK_ASSERT(comp_ctx->prev_token.t == DUK_TOK_LCURLY);
 
-	max_init_pairs = DUK__MAX_OBJECT_INIT_PAIRS;  /* XXX: depend on available temps? */
+	max_init_pairs = DUK__MAX_OBJECT_INIT_PAIRS; /* XXX: depend on available temps? */
 
-	st.reg_obj = DUK__ALLOCTEMP(comp_ctx);    /* target object */
-	st.temp_start = DUK__GETTEMP(comp_ctx);   /* start of MPUTOBJ argument list */
-	st.num_pairs = 0;                         /* number of key/value pairs emitted for current MPUTOBJ set */
-	st.num_total_pairs = 0;                   /* number of key/value pairs emitted overall */
+	st.reg_obj = DUK__ALLOCTEMP(comp_ctx); /* target object */
+	st.temp_start = DUK__GETTEMP(comp_ctx); /* start of MPUTOBJ argument list */
+	st.num_pairs = 0; /* number of key/value pairs emitted for current MPUTOBJ set */
+	st.num_total_pairs = 0; /* number of key/value pairs emitted overall */
 
 #if !defined(DUK_USE_PREFER_SIZE)
 	pc_newobj = duk__get_current_pc(comp_ctx);
@@ -68011,8 +72212,7 @@ DUK_LOCAL void duk__nud_object_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *r
 		 *  worth the effort and would increase code size.
 		 */
 
-		DUK_DDD(DUK_DDDPRINT("object literal loop, curr_token->t = %ld",
-		                     (long) comp_ctx->curr_token.t));
+		DUK_DDD(DUK_DDDPRINT("object literal loop, curr_token->t = %ld", (long) comp_ctx->curr_token.t));
 
 		if (comp_ctx->curr_token.t == DUK_TOK_RCURLY) {
 			break;
@@ -68052,16 +72252,15 @@ DUK_LOCAL void duk__nud_object_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *r
 		 * identifier string content.
 		 */
 
-		is_get = (comp_ctx->prev_token.t == DUK_TOK_IDENTIFIER &&
-		          comp_ctx->prev_token.str1 == DUK_HTHREAD_STRING_GET(thr));
-		is_set = (comp_ctx->prev_token.t == DUK_TOK_IDENTIFIER &&
-		          comp_ctx->prev_token.str1 == DUK_HTHREAD_STRING_SET(thr));
+		is_get = (comp_ctx->prev_token.t == DUK_TOK_IDENTIFIER && comp_ctx->prev_token.str1 == DUK_HTHREAD_STRING_GET(thr));
+		is_set = (comp_ctx->prev_token.t == DUK_TOK_IDENTIFIER && comp_ctx->prev_token.str1 == DUK_HTHREAD_STRING_SET(thr));
 		if ((is_get || is_set) && comp_ctx->curr_token.t != DUK_TOK_COLON) {
 			/* getter/setter */
 			duk_int_t fnum;
 
 			duk__objlit_flush_keys(comp_ctx, &st);
-			DUK_ASSERT(DUK__GETTEMP(comp_ctx) == st.temp_start);  /* 2 regs are guaranteed to be allocated w.r.t. temp_max */
+			DUK_ASSERT(DUK__GETTEMP(comp_ctx) ==
+			           st.temp_start); /* 2 regs are guaranteed to be allocated w.r.t. temp_max */
 			reg_temp = DUK__ALLOCTEMPS(comp_ctx, 2);
 
 			if (duk__objlit_load_key(comp_ctx, res, &comp_ctx->curr_token, reg_temp) != 0) {
@@ -68071,21 +72270,18 @@ DUK_LOCAL void duk__nud_object_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *r
 			/* curr_token = get/set name */
 			fnum = duk__parse_func_like_fnum(comp_ctx, DUK__FUNC_FLAG_GETSET);
 
-			duk__emit_a_bc(comp_ctx,
-			               DUK_OP_CLOSURE,
-			               st.temp_start + 1,
-			               (duk_regconst_t) fnum);
+			duk__emit_a_bc(comp_ctx, DUK_OP_CLOSURE, st.temp_start + 1, (duk_regconst_t) fnum);
 
 			/* Slot C is used in a non-standard fashion (range of regs),
 			 * emitter code has special handling for it (must not set the
 			 * "no shuffle" flag).
 			 */
 			duk__emit_a_bc(comp_ctx,
-			              (is_get ? DUK_OP_INITGET : DUK_OP_INITSET) | DUK__EMIT_FLAG_A_IS_SOURCE,
-			              st.reg_obj,
-			              st.temp_start);   /* temp_start+0 = key, temp_start+1 = closure */
+			               (is_get ? DUK_OP_INITGET : DUK_OP_INITSET) | DUK__EMIT_FLAG_A_IS_SOURCE,
+			               st.reg_obj,
+			               st.temp_start); /* temp_start+0 = key, temp_start+1 = closure */
 
-			DUK_ASSERT(st.num_pairs == 0);  /* temp state is reset on next loop */
+			DUK_ASSERT(st.num_pairs == 0); /* temp state is reset on next loop */
 #if defined(DUK_USE_ES6)
 		} else if (comp_ctx->prev_token.t == DUK_TOK_IDENTIFIER &&
 		           (comp_ctx->curr_token.t == DUK_TOK_COMMA || comp_ctx->curr_token.t == DUK_TOK_RCURLY)) {
@@ -68093,15 +72289,14 @@ DUK_LOCAL void duk__nud_object_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *r
 
 			load_rc = duk__objlit_load_key(comp_ctx, res, &comp_ctx->prev_token, reg_temp);
 			DUK_UNREF(load_rc);
-			DUK_ASSERT(load_rc == 0);  /* always succeeds because token is identifier */
+			DUK_ASSERT(load_rc == 0); /* always succeeds because token is identifier */
 
 			duk__ivalue_var_hstring(comp_ctx, res, comp_ctx->prev_token.str1);
 			DUK_ASSERT(DUK__GETTEMP(comp_ctx) == reg_temp + 1);
 			duk__ivalue_toforcedreg(comp_ctx, res, reg_temp + 1);
 
 			st.num_pairs++;
-		} else if ((comp_ctx->prev_token.t == DUK_TOK_IDENTIFIER ||
-		            comp_ctx->prev_token.t == DUK_TOK_STRING ||
+		} else if ((comp_ctx->prev_token.t == DUK_TOK_IDENTIFIER || comp_ctx->prev_token.t == DUK_TOK_STRING ||
 		            comp_ctx->prev_token.t == DUK_TOK_NUMBER) &&
 		           comp_ctx->curr_token.t == DUK_TOK_LPAREN) {
 			duk_int_t fnum;
@@ -68119,13 +72314,10 @@ DUK_LOCAL void duk__nud_object_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *r
 
 			fnum = duk__parse_func_like_fnum(comp_ctx, DUK__FUNC_FLAG_USE_PREVTOKEN | DUK__FUNC_FLAG_METDEF);
 
-			duk__emit_a_bc(comp_ctx,
-			               DUK_OP_CLOSURE,
-			               reg_temp + 1,
-			               (duk_regconst_t) fnum);
+			duk__emit_a_bc(comp_ctx, DUK_OP_CLOSURE, reg_temp + 1, (duk_regconst_t) fnum);
 
 			st.num_pairs++;
-#endif  /* DUK_USE_ES6 */
+#endif /* DUK_USE_ES6 */
 		} else {
 #if defined(DUK_USE_ES6)
 			if (comp_ctx->prev_token.t == DUK_TOK_LBRACKET) {
@@ -68142,9 +72334,8 @@ DUK_LOCAL void duk__nud_object_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *r
 				 * form is not yet supported and causes a
 				 * SyntaxError on the DUK_TOK_COLON check below.
 				 */
-			}
-			else
-#endif  /* DUK_USE_ES6 */
+			} else
+#endif /* DUK_USE_ES6 */
 			{
 				if (duk__objlit_load_key(comp_ctx, res, &comp_ctx->prev_token, reg_temp) != 0) {
 					goto syntax_error;
@@ -68158,7 +72349,7 @@ DUK_LOCAL void duk__nud_object_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *r
 
 			st.num_pairs++;
 		}
-	}  /* property loop */
+	} /* property loop */
 
 	/* Flush remaining properties. */
 	duk__objlit_flush_keys(comp_ctx, &st);
@@ -68177,12 +72368,12 @@ DUK_LOCAL void duk__nud_object_literal(duk_compiler_ctx *comp_ctx, duk_ivalue *r
 #endif
 
 	DUK_ASSERT(comp_ctx->curr_token.t == DUK_TOK_RCURLY);
-	duk__advance(comp_ctx);  /* No RegExp after object literal. */
+	duk__advance(comp_ctx); /* No RegExp after object literal. */
 
 	duk__ivalue_regconst(res, st.reg_obj);
 	return;
 
- syntax_error:
+syntax_error:
 	DUK_ERROR_SYNTAX(thr, DUK_STR_INVALID_OBJECT_LITERAL);
 	DUK_WO_NORETURN(return;);
 }
@@ -68198,7 +72389,8 @@ DUK_LOCAL duk_int_t duk__parse_arguments(duk_compiler_ctx *comp_ctx, duk_ivalue
 	/* Note: expect that caller has already eaten the left paren */
 
 	DUK_DDD(DUK_DDDPRINT("start parsing arguments, prev_token.t=%ld, curr_token.t=%ld",
-	                     (long) comp_ctx->prev_token.t, (long) comp_ctx->curr_token.t));
+	                     (long) comp_ctx->prev_token.t,
+	                     (long) comp_ctx->curr_token.t));
 
 	for (;;) {
 		if (comp_ctx->curr_token.t == DUK_TOK_RPAREN) {
@@ -68215,11 +72407,14 @@ DUK_LOCAL duk_int_t duk__parse_arguments(duk_compiler_ctx *comp_ctx, duk_ivalue
 		 * This is not the cleanest possible approach.
 		 */
 
-		reg_temp = DUK__ALLOCTEMP(comp_ctx);  /* bump up "allocated" reg count, just in case */
+		reg_temp = DUK__ALLOCTEMP(comp_ctx); /* bump up "allocated" reg count, just in case */
 		DUK__SETTEMP(comp_ctx, reg_temp);
 
 		/* binding power must be high enough to NOT allow comma expressions directly */
-		duk__expr_toforcedreg(comp_ctx, res, DUK__BP_COMMA /*rbp_flags*/, reg_temp);  /* always allow 'in', coerce to 'tr' just in case */
+		duk__expr_toforcedreg(comp_ctx,
+		                      res,
+		                      DUK__BP_COMMA /*rbp_flags*/,
+		                      reg_temp); /* always allow 'in', coerce to 'tr' just in case */
 
 		DUK__SETTEMP(comp_ctx, reg_temp + 1);
 		nargs++;
@@ -68228,7 +72423,7 @@ DUK_LOCAL duk_int_t duk__parse_arguments(duk_compiler_ctx *comp_ctx, duk_ivalue
 	}
 
 	/* eat the right paren */
-	duk__advance_expect(comp_ctx, DUK_TOK_RPAREN);  /* RegExp mode does not matter. */
+	duk__advance_expect(comp_ctx, DUK_TOK_RPAREN); /* RegExp mode does not matter. */
 
 	DUK_DDD(DUK_DDDPRINT("end parsing arguments"));
 
@@ -68237,8 +72432,7 @@ DUK_LOCAL duk_int_t duk__parse_arguments(duk_compiler_ctx *comp_ctx, duk_ivalue
 
 DUK_LOCAL duk_bool_t duk__expr_is_empty(duk_compiler_ctx *comp_ctx) {
 	/* empty expressions can be detected conveniently with nud/led counts */
-	return (comp_ctx->curr_func.nud_count == 0) &&
-	       (comp_ctx->curr_func.led_count == 0);
+	return (comp_ctx->curr_func.nud_count == 0) && (comp_ctx->curr_func.led_count == 0);
 }
 
 DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
@@ -68246,7 +72440,7 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 	duk_token *tk;
 	duk_regconst_t temp_at_entry;
 	duk_small_uint_t tok;
-	duk_uint32_t args;  /* temp variable to pass constants and flags to shared code */
+	duk_uint32_t args; /* temp variable to pass constants and flags to shared code */
 
 	/*
 	 *  ctx->prev_token     token to process with duk__expr_nud()
@@ -68264,18 +72458,17 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 	res->t = DUK_IVAL_NONE;
 
 	DUK_DDD(DUK_DDDPRINT("duk__expr_nud(), prev_token.t=%ld, allow_in=%ld, paren_level=%ld",
-	                     (long) tk->t, (long) comp_ctx->curr_func.allow_in, (long) comp_ctx->curr_func.paren_level));
+	                     (long) tk->t,
+	                     (long) comp_ctx->curr_func.allow_in,
+	                     (long) comp_ctx->curr_func.paren_level));
 
 	switch (tok) {
-
-	/* PRIMARY EXPRESSIONS */
+		/* PRIMARY EXPRESSIONS */
 
 	case DUK_TOK_THIS: {
 		duk_regconst_t reg_temp;
 		reg_temp = DUK__ALLOCTEMP(comp_ctx);
-		duk__emit_bc(comp_ctx,
-		             DUK_OP_LDTHIS,
-		             reg_temp);
+		duk__emit_bc(comp_ctx, DUK_OP_LDTHIS, reg_temp);
 		duk__ivalue_regconst(res, reg_temp);
 		return;
 	}
@@ -68307,15 +72500,13 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 	case DUK_TOK_REGEXP: {
 #if defined(DUK_USE_REGEXP_SUPPORT)
 		duk_regconst_t reg_temp;
-		duk_regconst_t rc_re_bytecode;  /* const */
-		duk_regconst_t rc_re_source;    /* const */
+		duk_regconst_t rc_re_bytecode; /* const */
+		duk_regconst_t rc_re_source; /* const */
 
 		DUK_ASSERT(tk->str1 != NULL);
 		DUK_ASSERT(tk->str2 != NULL);
 
-		DUK_DDD(DUK_DDDPRINT("emitting regexp op, str1=%!O, str2=%!O",
-		                     (duk_heaphdr *) tk->str1,
-		                     (duk_heaphdr *) tk->str2));
+		DUK_DDD(DUK_DDDPRINT("emitting regexp op, str1=%!O, str2=%!O", (duk_heaphdr *) tk->str1, (duk_heaphdr *) tk->str2));
 
 		reg_temp = DUK__ALLOCTEMP(comp_ctx);
 		duk_push_hstring(thr, tk->str1);
@@ -68338,9 +72529,9 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 
 		duk__ivalue_regconst(res, reg_temp);
 		return;
-#else  /* DUK_USE_REGEXP_SUPPORT */
+#else /* DUK_USE_REGEXP_SUPPORT */
 		goto syntax_error;
-#endif  /* DUK_USE_REGEXP_SUPPORT */
+#endif /* DUK_USE_REGEXP_SUPPORT */
 	}
 	case DUK_TOK_LBRACKET: {
 		DUK_DDD(DUK_DDDPRINT("parsing array literal"));
@@ -68359,15 +72550,15 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 		prev_allow_in = comp_ctx->curr_func.allow_in;
 		comp_ctx->curr_func.allow_in = 1; /* reset 'allow_in' for parenthesized expression */
 
-		duk__expr(comp_ctx, res, DUK__BP_FOR_EXPR /*rbp_flags*/);  /* Expression, terminates at a ')' */
+		duk__expr(comp_ctx, res, DUK__BP_FOR_EXPR /*rbp_flags*/); /* Expression, terminates at a ')' */
 
-		duk__advance_expect(comp_ctx, DUK_TOK_RPAREN);  /* No RegExp after parenthesized expression. */
+		duk__advance_expect(comp_ctx, DUK_TOK_RPAREN); /* No RegExp after parenthesized expression. */
 		comp_ctx->curr_func.allow_in = prev_allow_in;
 		comp_ctx->curr_func.paren_level--;
 		return;
 	}
 
-	/* MEMBER/NEW/CALL EXPRESSIONS */
+		/* MEMBER/NEW/CALL EXPRESSIONS */
 
 	case DUK_TOK_NEW: {
 		/*
@@ -68404,16 +72595,14 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 				goto syntax_error_newtarget;
 			}
 			duk__advance(comp_ctx);
-			duk__emit_bc(comp_ctx,
-			             DUK_OP_NEWTARGET,
-			             reg_target);
+			duk__emit_bc(comp_ctx, DUK_OP_NEWTARGET, reg_target);
 			duk__ivalue_regconst(res, reg_target);
 			return;
 		}
-#endif  /* DUK_USE_ES6 */
+#endif /* DUK_USE_ES6 */
 
 		duk__expr_toforcedreg(comp_ctx, res, DUK__BP_CALL /*rbp_flags*/, reg_target /*forced_reg*/);
-		duk__emit_bc(comp_ctx, DUK_OP_NEWOBJ, reg_target + 1);  /* default instance */
+		duk__emit_bc(comp_ctx, DUK_OP_NEWOBJ, reg_target + 1); /* default instance */
 		DUK__SETTEMP(comp_ctx, reg_target + 2);
 
 		/* XXX: 'new obj.noSuch()' doesn't use GETPROPC now which
@@ -68424,7 +72613,7 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 			/* 'new' MemberExpression Arguments */
 			DUK_DDD(DUK_DDDPRINT("new expression has argument list"));
 			duk__advance(comp_ctx);
-			nargs = duk__parse_arguments(comp_ctx, res);  /* parse args starting from "next temp", reg_target + 1 */
+			nargs = duk__parse_arguments(comp_ctx, res); /* parse args starting from "next temp", reg_target + 1 */
 			/* right paren eaten */
 		} else {
 			/* 'new' MemberExpression */
@@ -68432,10 +72621,7 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 			nargs = 0;
 		}
 
-		duk__emit_a_bc(comp_ctx,
-		              DUK_OP_CALL0 | DUK_BC_CALL_FLAG_CONSTRUCT,
-		              nargs /*num_args*/,
-		              reg_target /*target*/);
+		duk__emit_a_bc(comp_ctx, DUK_OP_CALL0 | DUK_BC_CALL_FLAG_CONSTRUCT, nargs /*num_args*/, reg_target /*target*/);
 
 		DUK_DDD(DUK_DDDPRINT("end parsing new expression"));
 
@@ -68443,7 +72629,7 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 		return;
 	}
 
-	/* FUNCTION EXPRESSIONS */
+		/* FUNCTION EXPRESSIONS */
 
 	case DUK_TOK_FUNCTION: {
 		/* Function expression.  Note that any statement beginning with 'function'
@@ -68466,16 +72652,13 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 		fnum = duk__parse_func_like_fnum(comp_ctx, 0 /*flags*/);
 		DUK_DDD(DUK_DDDPRINT("parsed inner function -> fnum %ld", (long) fnum));
 
-		duk__emit_a_bc(comp_ctx,
-		               DUK_OP_CLOSURE,
-		               reg_temp /*a*/,
-		               (duk_regconst_t) fnum /*bc*/);
+		duk__emit_a_bc(comp_ctx, DUK_OP_CLOSURE, reg_temp /*a*/, (duk_regconst_t) fnum /*bc*/);
 
 		duk__ivalue_regconst(res, reg_temp);
 		return;
 	}
 
-	/* UNARY EXPRESSIONS */
+		/* UNARY EXPRESSIONS */
 
 	case DUK_TOK_DELETE: {
 		/* Delete semantics are a bit tricky.  The description in E5 specification
@@ -68483,7 +72666,7 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 		 * a reference (which is only known at runtime) seemingly at compile time
 		 * (= SyntaxError throwing).
 		 */
-		duk__expr(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/);  /* UnaryExpression */
+		duk__expr(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/); /* UnaryExpression */
 		if (res->t == DUK_IVAL_VAR) {
 			/* not allowed in strict mode, regardless of whether resolves;
 			 * in non-strict mode DELVAR handles both non-resolving and
@@ -68505,16 +72688,11 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 			duk_dup(thr, res->x1.valstack_idx);
 			if (duk__lookup_lhs(comp_ctx, &reg_varbind, &rc_varname)) {
 				/* register bound variables are non-configurable -> always false */
-				duk__emit_bc(comp_ctx,
-				             DUK_OP_LDFALSE,
-				             reg_temp);
+				duk__emit_bc(comp_ctx, DUK_OP_LDFALSE, reg_temp);
 			} else {
 				duk_dup(thr, res->x1.valstack_idx);
 				rc_varname = duk__getconst(comp_ctx);
-				duk__emit_a_bc(comp_ctx,
-				               DUK_OP_DELVAR,
-				               reg_temp,
-				               rc_varname);
+				duk__emit_a_bc(comp_ctx, DUK_OP_DELVAR, reg_temp, rc_varname);
 			}
 			duk__ivalue_regconst(res, reg_temp);
 		} else if (res->t == DUK_IVAL_PROP) {
@@ -68524,13 +72702,11 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 
 			DUK__SETTEMP(comp_ctx, temp_at_entry);
 			reg_temp = DUK__ALLOCTEMP(comp_ctx);
-			reg_obj = duk__ispec_toregconst_raw(comp_ctx, &res->x1, -1 /*forced_reg*/, 0 /*flags*/);  /* don't allow const */
-			rc_key = duk__ispec_toregconst_raw(comp_ctx, &res->x2, -1 /*forced_reg*/, DUK__IVAL_FLAG_ALLOW_CONST /*flags*/);
-			duk__emit_a_b_c(comp_ctx,
-			                DUK_OP_DELPROP | DUK__EMIT_FLAG_BC_REGCONST,
-			                reg_temp,
-			                reg_obj,
-			                rc_key);
+			reg_obj =
+			    duk__ispec_toregconst_raw(comp_ctx, &res->x1, -1 /*forced_reg*/, 0 /*flags*/); /* don't allow const */
+			rc_key =
+			    duk__ispec_toregconst_raw(comp_ctx, &res->x2, -1 /*forced_reg*/, DUK__IVAL_FLAG_ALLOW_CONST /*flags*/);
+			duk__emit_a_b_c(comp_ctx, DUK_OP_DELPROP | DUK__EMIT_FLAG_BC_REGCONST, reg_temp, reg_obj, rc_key);
 
 			duk__ivalue_regconst(res, reg_temp);
 		} else {
@@ -68541,7 +72717,7 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 		return;
 	}
 	case DUK_TOK_VOID: {
-		duk__expr_toplain_ignore(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/);  /* UnaryExpression */
+		duk__expr_toplain_ignore(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/); /* UnaryExpression */
 		duk_push_undefined(thr);
 		goto plain_value;
 	}
@@ -68551,7 +72727,7 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 		 * will never be unresolvable so special handling is only required
 		 * when an identifier is a "slow path" one.
 		 */
-		duk__expr(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/);  /* UnaryExpression */
+		duk__expr(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/); /* UnaryExpression */
 
 		if (res->t == DUK_IVAL_VAR) {
 			duk_regconst_t reg_varbind;
@@ -68563,10 +72739,7 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 				DUK_DDD(DUK_DDDPRINT("typeof for an identifier name which could not be resolved "
 				                     "at compile time, need to use special run-time handling"));
 				reg_temp = DUK__ALLOCTEMP(comp_ctx);
-				duk__emit_a_bc(comp_ctx,
-				               DUK_OP_TYPEOFID,
-				               reg_temp,
-				               rc_varname);
+				duk__emit_a_bc(comp_ctx, DUK_OP_TYPEOFID, reg_temp, rc_varname);
 				duk__ivalue_regconst(res, reg_temp);
 				return;
 			}
@@ -68585,9 +72758,8 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 	}
 	case DUK_TOK_ADD: {
 		/* unary plus */
-		duk__expr(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/);  /* UnaryExpression */
-		if (res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_VALUE &&
-		    duk_is_number(thr, res->x1.valstack_idx)) {
+		duk__expr(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/); /* UnaryExpression */
+		if (res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_VALUE && duk_is_number(thr, res->x1.valstack_idx)) {
 			/* unary plus of a number is identity */
 			return;
 		}
@@ -68596,9 +72768,8 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 	}
 	case DUK_TOK_SUB: {
 		/* unary minus */
-		duk__expr(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/);  /* UnaryExpression */
-		if (res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_VALUE &&
-		    duk_is_number(thr, res->x1.valstack_idx)) {
+		duk__expr(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/); /* UnaryExpression */
+		if (res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_VALUE && duk_is_number(thr, res->x1.valstack_idx)) {
 			/* this optimization is important to handle negative literals
 			 * (which are not directly provided by the lexical grammar)
 			 */
@@ -68618,12 +72789,12 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 		goto unary;
 	}
 	case DUK_TOK_BNOT: {
-		duk__expr(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/);  /* UnaryExpression */
+		duk__expr(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/); /* UnaryExpression */
 		args = DUK_OP_BNOT;
 		goto unary;
 	}
 	case DUK_TOK_LNOT: {
-		duk__expr(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/);  /* UnaryExpression */
+		duk__expr(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/); /* UnaryExpression */
 		if (res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_VALUE) {
 			/* Very minimal inlining to handle common idioms '!0' and '!1',
 			 * and also boolean arguments like '!false' and '!true'.
@@ -68635,12 +72806,12 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 			if (DUK_TVAL_IS_NUMBER(tv_val)) {
 				duk_double_t d;
 				d = DUK_TVAL_GET_NUMBER(tv_val);
-				if (d == 0.0) {
+				if (duk_double_equals(d, 0.0)) {
 					/* Matches both +0 and -0 on purpose. */
 					DUK_DDD(DUK_DDDPRINT("inlined lnot: !0 -> true"));
 					DUK_TVAL_SET_BOOLEAN_TRUE(tv_val);
 					return;
-				} else if (d == 1.0) {
+				} else if (duk_double_equals(d, 1.0)) {
 					DUK_DDD(DUK_DDDPRINT("inlined lnot: !1 -> false"));
 					DUK_TVAL_SET_BOOLEAN_FALSE(tv_val);
 					return;
@@ -68658,117 +72829,110 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 		goto unary;
 	}
 
-	}  /* end switch */
+	} /* end switch */
 
 	DUK_ERROR_SYNTAX(thr, DUK_STR_PARSE_ERROR);
 	DUK_WO_NORETURN(return;);
 
- unary:
-	{
-		/* Unary opcodes use just the 'BC' register source because it
-		 * matches current shuffle limits, and maps cleanly to 16 high
-		 * bits of the opcode.
-		 */
+unary : {
+	/* Unary opcodes use just the 'BC' register source because it
+	 * matches current shuffle limits, and maps cleanly to 16 high
+	 * bits of the opcode.
+	 */
 
-		duk_regconst_t reg_src, reg_res;
+	duk_regconst_t reg_src, reg_res;
 
-		reg_src = duk__ivalue_toregconst_raw(comp_ctx, res, -1 /*forced_reg*/, 0 /*flags*/);
-		if (DUK__ISREG_TEMP(comp_ctx, reg_src)) {
-			reg_res = reg_src;
-		} else {
-			reg_res = DUK__ALLOCTEMP(comp_ctx);
-		}
-		duk__emit_a_bc(comp_ctx,
-		             args,
-		             reg_res,
-		             reg_src);
-		duk__ivalue_regconst(res, reg_res);
-		return;
+	reg_src = duk__ivalue_toregconst_raw(comp_ctx, res, -1 /*forced_reg*/, 0 /*flags*/);
+	if (DUK__ISREG_TEMP(comp_ctx, reg_src)) {
+		reg_res = reg_src;
+	} else {
+		reg_res = DUK__ALLOCTEMP(comp_ctx);
 	}
+	duk__emit_a_bc(comp_ctx, args, reg_res, reg_src);
+	duk__ivalue_regconst(res, reg_res);
+	return;
+}
 
- preincdec:
-	{
-		/* preincrement and predecrement */
-		duk_regconst_t reg_res;
-		duk_small_uint_t args_op1 = args & 0xff;  /* DUK_OP_PREINCR/DUK_OP_PREDECR */
-		duk_small_uint_t args_op2 = args >> 8;    /* DUK_OP_PREINCP_RR/DUK_OP_PREDECP_RR */
-
-		/* Specific assumptions for opcode numbering. */
-		DUK_ASSERT(DUK_OP_PREINCR + 4 == DUK_OP_PREINCV);
-		DUK_ASSERT(DUK_OP_PREDECR + 4 == DUK_OP_PREDECV);
+preincdec : {
+	/* preincrement and predecrement */
+	duk_regconst_t reg_res;
+	duk_small_uint_t args_op1 = args & 0xff; /* DUK_OP_PREINCR/DUK_OP_PREDECR */
+	duk_small_uint_t args_op2 = args >> 8; /* DUK_OP_PREINCP_RR/DUK_OP_PREDECP_RR */
 
-		reg_res = DUK__ALLOCTEMP(comp_ctx);
+	/* Specific assumptions for opcode numbering. */
+	DUK_ASSERT(DUK_OP_PREINCR + 4 == DUK_OP_PREINCV);
+	DUK_ASSERT(DUK_OP_PREDECR + 4 == DUK_OP_PREDECV);
 
-		duk__expr(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/);  /* UnaryExpression */
-		if (res->t == DUK_IVAL_VAR) {
-			duk_hstring *h_varname;
-			duk_regconst_t reg_varbind;
-			duk_regconst_t rc_varname;
+	reg_res = DUK__ALLOCTEMP(comp_ctx);
 
-			h_varname = duk_known_hstring(thr, res->x1.valstack_idx);
+	duk__expr(comp_ctx, res, DUK__BP_MULTIPLICATIVE /*rbp_flags*/); /* UnaryExpression */
+	if (res->t == DUK_IVAL_VAR) {
+		duk_hstring *h_varname;
+		duk_regconst_t reg_varbind;
+		duk_regconst_t rc_varname;
 
-			if (duk__hstring_is_eval_or_arguments_in_strict_mode(comp_ctx, h_varname)) {
-				goto syntax_error;
-			}
+		h_varname = duk_known_hstring(thr, res->x1.valstack_idx);
 
-			duk_dup(thr, res->x1.valstack_idx);
-			if (duk__lookup_lhs(comp_ctx, &reg_varbind, &rc_varname)) {
-				duk__emit_a_bc(comp_ctx,
-				               args_op1,  /* e.g. DUK_OP_PREINCR */
-				               reg_res,
-				               reg_varbind);
-			} else {
-				duk__emit_a_bc(comp_ctx,
-				                args_op1 + 4,  /* e.g. DUK_OP_PREINCV */
-				                reg_res,
-				                rc_varname);
-			}
+		if (duk__hstring_is_eval_or_arguments_in_strict_mode(comp_ctx, h_varname)) {
+			goto syntax_error;
+		}
 
-			DUK_DDD(DUK_DDDPRINT("preincdec to '%!O' -> reg_varbind=%ld, rc_varname=%ld",
-			                     (duk_heaphdr *) h_varname, (long) reg_varbind, (long) rc_varname));
-		} else if (res->t == DUK_IVAL_PROP) {
-			duk_regconst_t reg_obj;  /* allocate to reg only (not const) */
-			duk_regconst_t rc_key;
-			reg_obj = duk__ispec_toregconst_raw(comp_ctx, &res->x1, -1 /*forced_reg*/, 0 /*flags*/);  /* don't allow const */
-			rc_key = duk__ispec_toregconst_raw(comp_ctx, &res->x2, -1 /*forced_reg*/, DUK__IVAL_FLAG_ALLOW_CONST /*flags*/);
-			duk__emit_a_b_c(comp_ctx,
-			                args_op2 | DUK__EMIT_FLAG_BC_REGCONST,  /* e.g. DUK_OP_PREINCP */
-			                reg_res,
-			                reg_obj,
-			                rc_key);
+		duk_dup(thr, res->x1.valstack_idx);
+		if (duk__lookup_lhs(comp_ctx, &reg_varbind, &rc_varname)) {
+			duk__emit_a_bc(comp_ctx,
+			               args_op1, /* e.g. DUK_OP_PREINCR */
+			               reg_res,
+			               reg_varbind);
 		} else {
-			/* Technically return value is not needed because INVLHS will
-			 * unconditially throw a ReferenceError.  Coercion is necessary
-			 * for proper semantics (consider ToNumber() called for an object).
-			 * Use DUK_OP_UNP with a dummy register to get ToNumber().
-			 */
-
-			duk__ivalue_toforcedreg(comp_ctx, res, reg_res);
-			duk__emit_bc(comp_ctx,
-			             DUK_OP_UNP,
-			             reg_res);  /* for side effects, result ignored */
-			duk__emit_op_only(comp_ctx,
-			                  DUK_OP_INVLHS);
+			duk__emit_a_bc(comp_ctx,
+			               args_op1 + 4, /* e.g. DUK_OP_PREINCV */
+			               reg_res,
+			               rc_varname);
 		}
-		DUK__SETTEMP(comp_ctx, reg_res + 1);
-		duk__ivalue_regconst(res, reg_res);
-		return;
-	}
 
- plain_value:
-	{
-		/* Stack top contains plain value */
-		duk__ivalue_plain_fromstack(comp_ctx, res);
-		return;
+		DUK_DDD(DUK_DDDPRINT("preincdec to '%!O' -> reg_varbind=%ld, rc_varname=%ld",
+		                     (duk_heaphdr *) h_varname,
+		                     (long) reg_varbind,
+		                     (long) rc_varname));
+	} else if (res->t == DUK_IVAL_PROP) {
+		duk_regconst_t reg_obj; /* allocate to reg only (not const) */
+		duk_regconst_t rc_key;
+		reg_obj = duk__ispec_toregconst_raw(comp_ctx, &res->x1, -1 /*forced_reg*/, 0 /*flags*/); /* don't allow const */
+		rc_key = duk__ispec_toregconst_raw(comp_ctx, &res->x2, -1 /*forced_reg*/, DUK__IVAL_FLAG_ALLOW_CONST /*flags*/);
+		duk__emit_a_b_c(comp_ctx,
+		                args_op2 | DUK__EMIT_FLAG_BC_REGCONST, /* e.g. DUK_OP_PREINCP */
+		                reg_res,
+		                reg_obj,
+		                rc_key);
+	} else {
+		/* Technically return value is not needed because INVLHS will
+		 * unconditially throw a ReferenceError.  Coercion is necessary
+		 * for proper semantics (consider ToNumber() called for an object).
+		 * Use DUK_OP_UNP with a dummy register to get ToNumber().
+		 */
+
+		duk__ivalue_toforcedreg(comp_ctx, res, reg_res);
+		duk__emit_bc(comp_ctx, DUK_OP_UNP, reg_res); /* for side effects, result ignored */
+		duk__emit_op_only(comp_ctx, DUK_OP_INVLHS);
 	}
+	DUK__SETTEMP(comp_ctx, reg_res + 1);
+	duk__ivalue_regconst(res, reg_res);
+	return;
+}
+
+plain_value : {
+	/* Stack top contains plain value */
+	duk__ivalue_plain_fromstack(comp_ctx, res);
+	return;
+}
 
 #if defined(DUK_USE_ES6)
- syntax_error_newtarget:
+syntax_error_newtarget:
 	DUK_ERROR_SYNTAX(thr, DUK_STR_INVALID_NEWTARGET);
 	DUK_WO_NORETURN(return;);
 #endif
 
- syntax_error:
+syntax_error:
 	DUK_ERROR_SYNTAX(thr, DUK_STR_INVALID_EXPRESSION);
 	DUK_WO_NORETURN(return;);
 }
@@ -68781,7 +72945,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 	duk_hthread *thr = comp_ctx->thr;
 	duk_token *tk;
 	duk_small_uint_t tok;
-	duk_uint32_t args;  /* temp variable to pass constants and flags to shared code */
+	duk_uint32_t args; /* temp variable to pass constants and flags to shared code */
 
 	/*
 	 *  ctx->prev_token     token to process with duk__expr_led()
@@ -68795,13 +72959,14 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 	tok = tk->t;
 
 	DUK_DDD(DUK_DDDPRINT("duk__expr_led(), prev_token.t=%ld, allow_in=%ld, paren_level=%ld",
-	                     (long) tk->t, (long) comp_ctx->curr_func.allow_in, (long) comp_ctx->curr_func.paren_level));
+	                     (long) tk->t,
+	                     (long) comp_ctx->curr_func.allow_in,
+	                     (long) comp_ctx->curr_func.paren_level));
 
 	/* XXX: default priority for infix operators is duk__expr_lbp(tok) -> get it here? */
 
 	switch (tok) {
-
-	/* PRIMARY EXPRESSIONS */
+		/* PRIMARY EXPRESSIONS */
 
 	case DUK_TOK_PERIOD: {
 		/* Property access expressions are critical for correct LHS ordering,
@@ -68829,7 +72994,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		}
 
 		res->t = DUK_IVAL_PROP;
-		duk__copy_ispec(comp_ctx, &left->x1, &res->x1);  /* left.x1 -> res.x1 */
+		duk__copy_ispec(comp_ctx, &left->x1, &res->x1); /* left.x1 -> res.x1 */
 		DUK_ASSERT(comp_ctx->curr_token.str1 != NULL);
 		duk_push_hstring(thr, comp_ctx->curr_token.str1);
 		duk_replace(thr, res->x2.valstack_idx);
@@ -68864,12 +73029,12 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		 * See: test-bug-nested-prop-mutate.js.
 		 */
 		duk__ivalue_totempconst(comp_ctx, left);
-		duk__expr_toplain(comp_ctx, res, DUK__BP_FOR_EXPR /*rbp_flags*/);  /* Expression, ']' terminates */
+		duk__expr_toplain(comp_ctx, res, DUK__BP_FOR_EXPR /*rbp_flags*/); /* Expression, ']' terminates */
 		duk__advance_expect(comp_ctx, DUK_TOK_RBRACKET);
 
 		res->t = DUK_IVAL_PROP;
-		duk__copy_ispec(comp_ctx, &res->x1, &res->x2);   /* res.x1 -> res.x2 */
-		duk__copy_ispec(comp_ctx, &left->x1, &res->x1);  /* left.x1 -> res.x1 */
+		duk__copy_ispec(comp_ctx, &res->x1, &res->x2); /* res.x1 -> res.x2 */
+		duk__copy_ispec(comp_ctx, &left->x1, &res->x1); /* left.x1 -> res.x1 */
 		return;
 	}
 	case DUK_TOK_LPAREN: {
@@ -68913,19 +73078,13 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 
 			duk_dup(thr, left->x1.valstack_idx);
 			if (duk__lookup_lhs(comp_ctx, &reg_varbind, &rc_varname)) {
-				duk__emit_a_bc(comp_ctx,
-				              DUK_OP_CSREG | DUK__EMIT_FLAG_A_IS_SOURCE,
-				              reg_varbind,
-				              reg_cs + 0);
+				duk__emit_a_bc(comp_ctx, DUK_OP_CSREG | DUK__EMIT_FLAG_A_IS_SOURCE, reg_varbind, reg_cs + 0);
 			} else {
 				/* XXX: expand target register or constant field to
 				 * reduce shuffling.
 				 */
 				DUK_ASSERT(DUK__ISCONST(rc_varname));
-				duk__emit_a_b(comp_ctx,
-				              DUK_OP_CSVAR | DUK__EMIT_FLAG_BC_REGCONST,
-				              reg_cs + 0,
-				              rc_varname);
+				duk__emit_a_b(comp_ctx, DUK_OP_CSVAR | DUK__EMIT_FLAG_BC_REGCONST, reg_cs + 0, rc_varname);
 			}
 		} else if (left->t == DUK_IVAL_PROP) {
 			/* Call through a property lookup, E5 Section 11.2.3, step 6.a.i,
@@ -68947,16 +73106,12 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 			 * and reuse, but it would still be in the wrong position
 			 * (reg_cs + 0 rather than reg_cs + 1).
 			 */
-			duk__ispec_toforcedreg(comp_ctx, &left->x1, reg_cs + 1);  /* base */
+			duk__ispec_toforcedreg(comp_ctx, &left->x1, reg_cs + 1); /* base */
 #if defined(DUK_USE_VERBOSE_ERRORS)
 			reg_key = duk__ispec_toregconst_raw(comp_ctx, &left->x2, -1, DUK__IVAL_FLAG_ALLOW_CONST /*flags*/);
-			duk__emit_a_b_c(comp_ctx,
-			                DUK_OP_GETPROPC | DUK__EMIT_FLAG_BC_REGCONST,
-			                reg_cs + 0,
-			                reg_cs + 1,
-			                reg_key);
+			duk__emit_a_b_c(comp_ctx, DUK_OP_GETPROPC | DUK__EMIT_FLAG_BC_REGCONST, reg_cs + 0, reg_cs + 1, reg_key);
 #else
-			duk__ivalue_toforcedreg(comp_ctx, left, reg_cs + 0);  /* base[key] */
+			duk__ivalue_toforcedreg(comp_ctx, left, reg_cs + 0); /* base[key] */
 #endif
 		} else {
 			DUK_DDD(DUK_DDDPRINT("function call with register base"));
@@ -68975,23 +73130,20 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		}
 
 		DUK__SETTEMP(comp_ctx, reg_cs + 2);
-		nargs = duk__parse_arguments(comp_ctx, res);  /* parse args starting from "next temp" */
+		nargs = duk__parse_arguments(comp_ctx, res); /* parse args starting from "next temp" */
 
 		/* Tailcalls are handled by back-patching the already emitted opcode
 		 * later in return statement parser.
 		 */
 
-		duk__emit_a_bc(comp_ctx,
-		               call_op,
-		               (duk_regconst_t) nargs /*numargs*/,
-		               reg_cs /*basereg*/);
-		DUK__SETTEMP(comp_ctx, reg_cs + 1);    /* result in csreg */
+		duk__emit_a_bc(comp_ctx, call_op, (duk_regconst_t) nargs /*numargs*/, reg_cs /*basereg*/);
+		DUK__SETTEMP(comp_ctx, reg_cs + 1); /* result in csreg */
 
 		duk__ivalue_regconst(res, reg_cs);
 		return;
 	}
 
-	/* POSTFIX EXPRESSION */
+		/* POSTFIX EXPRESSION */
 
 	case DUK_TOK_INCREMENT: {
 		args = (DUK_OP_POSTINCP_RR << 16) + (DUK_OP_POSTINCR << 8) + 0;
@@ -69006,38 +73158,38 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 
 #if defined(DUK_USE_ES7_EXP_OPERATOR)
 	case DUK_TOK_EXP: {
-		args = (DUK_OP_EXP << 8) + DUK__BP_EXPONENTIATION - 1;  /* UnaryExpression */
+		args = (DUK_OP_EXP << 8) + DUK__BP_EXPONENTIATION - 1; /* UnaryExpression */
 		goto binary;
 	}
 #endif
 
-	/* MULTIPLICATIVE EXPRESSION */
+		/* MULTIPLICATIVE EXPRESSION */
 
 	case DUK_TOK_MUL: {
-		args = (DUK_OP_MUL << 8) + DUK__BP_MULTIPLICATIVE;  /* ExponentiationExpression */
+		args = (DUK_OP_MUL << 8) + DUK__BP_MULTIPLICATIVE; /* ExponentiationExpression */
 		goto binary;
 	}
 	case DUK_TOK_DIV: {
-		args = (DUK_OP_DIV << 8) + DUK__BP_MULTIPLICATIVE;  /* ExponentiationExpression */
+		args = (DUK_OP_DIV << 8) + DUK__BP_MULTIPLICATIVE; /* ExponentiationExpression */
 		goto binary;
 	}
 	case DUK_TOK_MOD: {
-		args = (DUK_OP_MOD << 8) + DUK__BP_MULTIPLICATIVE;  /* ExponentiationExpression */
+		args = (DUK_OP_MOD << 8) + DUK__BP_MULTIPLICATIVE; /* ExponentiationExpression */
 		goto binary;
 	}
 
-	/* ADDITIVE EXPRESSION */
+		/* ADDITIVE EXPRESSION */
 
 	case DUK_TOK_ADD: {
-		args = (DUK_OP_ADD << 8) + DUK__BP_ADDITIVE;  /* MultiplicativeExpression */
+		args = (DUK_OP_ADD << 8) + DUK__BP_ADDITIVE; /* MultiplicativeExpression */
 		goto binary;
 	}
 	case DUK_TOK_SUB: {
-		args = (DUK_OP_SUB << 8) + DUK__BP_ADDITIVE;  /* MultiplicativeExpression */
+		args = (DUK_OP_SUB << 8) + DUK__BP_ADDITIVE; /* MultiplicativeExpression */
 		goto binary;
 	}
 
-	/* SHIFT EXPRESSION */
+		/* SHIFT EXPRESSION */
 
 	case DUK_TOK_ALSHIFT: {
 		/* << */
@@ -69055,7 +73207,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		goto binary;
 	}
 
-	/* RELATIONAL EXPRESSION */
+		/* RELATIONAL EXPRESSION */
 
 	case DUK_TOK_LT: {
 		/* < */
@@ -69083,7 +73235,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		goto binary;
 	}
 
-	/* EQUALITY EXPRESSION */
+		/* EQUALITY EXPRESSION */
 
 	case DUK_TOK_EQ: {
 		args = (DUK_OP_EQ << 8) + DUK__BP_EQUALITY;
@@ -69102,7 +73254,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		goto binary;
 	}
 
-	/* BITWISE EXPRESSIONS */
+		/* BITWISE EXPRESSIONS */
 
 	case DUK_TOK_BAND: {
 		args = (DUK_OP_BAND << 8) + DUK__BP_BAND;
@@ -69117,7 +73269,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		goto binary;
 	}
 
-	/* LOGICAL EXPRESSIONS */
+		/* LOGICAL EXPRESSIONS */
 
 	case DUK_TOK_LAND: {
 		/* syntactically left-associative but parsed as right-associative */
@@ -69130,7 +73282,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		goto binary_logical;
 	}
 
-	/* CONDITIONAL EXPRESSION */
+		/* CONDITIONAL EXPRESSION */
 
 	case DUK_TOK_QUESTION: {
 		/* XXX: common reg allocation need is to reuse a sub-expression's temp reg,
@@ -69143,12 +73295,18 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		reg_temp = DUK__ALLOCTEMP(comp_ctx);
 		duk__ivalue_toforcedreg(comp_ctx, left, reg_temp);
 		duk__emit_if_true_skip(comp_ctx, reg_temp);
-		pc_jump1 = duk__emit_jump_empty(comp_ctx);  /* jump to false */
-		duk__expr_toforcedreg(comp_ctx, res, DUK__BP_COMMA /*rbp_flags*/, reg_temp /*forced_reg*/);  /* AssignmentExpression */
+		pc_jump1 = duk__emit_jump_empty(comp_ctx); /* jump to false */
+		duk__expr_toforcedreg(comp_ctx,
+		                      res,
+		                      DUK__BP_COMMA /*rbp_flags*/,
+		                      reg_temp /*forced_reg*/); /* AssignmentExpression */
 		duk__advance_expect(comp_ctx, DUK_TOK_COLON);
-		pc_jump2 = duk__emit_jump_empty(comp_ctx);  /* jump to end */
+		pc_jump2 = duk__emit_jump_empty(comp_ctx); /* jump to end */
 		duk__patch_jump_here(comp_ctx, pc_jump1);
-		duk__expr_toforcedreg(comp_ctx, res, DUK__BP_COMMA /*rbp_flags*/, reg_temp /*forced_reg*/);  /* AssignmentExpression */
+		duk__expr_toforcedreg(comp_ctx,
+		                      res,
+		                      DUK__BP_COMMA /*rbp_flags*/,
+		                      reg_temp /*forced_reg*/); /* AssignmentExpression */
 		duk__patch_jump_here(comp_ctx, pc_jump2);
 
 		DUK__SETTEMP(comp_ctx, reg_temp + 1);
@@ -69156,7 +73314,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		return;
 	}
 
-	/* ASSIGNMENT EXPRESSION */
+		/* ASSIGNMENT EXPRESSION */
 
 	case DUK_TOK_EQUALSIGN: {
 		/*
@@ -69170,7 +73328,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		 *
 		 *  XXX: just use DUK__BP_COMMA (i.e. no need for 2-step bp levels)?
 		 */
-		args = (DUK_OP_NONE << 8) + DUK__BP_ASSIGNMENT - 1;   /* DUK_OP_NONE marks a 'plain' assignment */
+		args = (DUK_OP_NONE << 8) + DUK__BP_ASSIGNMENT - 1; /* DUK_OP_NONE marks a 'plain' assignment */
 		goto assign;
 	}
 	case DUK_TOK_ADD_EQ: {
@@ -69236,12 +73394,12 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		goto assign;
 	}
 
-	/* COMMA */
+		/* COMMA */
 
 	case DUK_TOK_COMMA: {
 		/* right associative */
 
-		duk__ivalue_toplain_ignore(comp_ctx, left);  /* need side effects, not value */
+		duk__ivalue_toplain_ignore(comp_ctx, left); /* need side effects, not value */
 		duk__expr_toplain(comp_ctx, res, DUK__BP_COMMA - 1 /*rbp_flags*/);
 
 		/* return 'res' (of right part) as our result */
@@ -69264,7 +73422,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 	}
 #endif
 
- binary:
+binary:
 	/*
 	 *  Shared handling of binary operations
 	 *
@@ -69290,11 +73448,15 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		duk_copy(thr, left->x1.valstack_idx, res->x1.valstack_idx);
 
 		DUK_DDD(DUK_DDDPRINT("binary op, res: t=%ld, x1.t=%ld, x1.regconst=0x%08lx, x2.t=%ld, x2.regconst=0x%08lx",
-		                     (long) res->t, (long) res->x1.t, (unsigned long) res->x1.regconst, (long) res->x2.t, (unsigned long) res->x2.regconst));
+		                     (long) res->t,
+		                     (long) res->x1.t,
+		                     (unsigned long) res->x1.regconst,
+		                     (long) res->x2.t,
+		                     (unsigned long) res->x2.regconst));
 		return;
 	}
 
- binary_logical:
+binary_logical:
 	/*
 	 *  Shared handling for logical AND and logical OR.
 	 *
@@ -69327,8 +73489,8 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		duk__ivalue_toforcedreg(comp_ctx, left, reg_temp);
 		DUK_ASSERT(DUK__ISREG(reg_temp));
 		duk__emit_bc(comp_ctx,
-		            (args_truthval ? DUK_OP_IFTRUE_R : DUK_OP_IFFALSE_R),
-		            reg_temp);  /* skip jump conditionally */
+		             (args_truthval ? DUK_OP_IFTRUE_R : DUK_OP_IFFALSE_R),
+		             reg_temp); /* skip jump conditionally */
 		pc_jump = duk__emit_jump_empty(comp_ctx);
 		duk__expr_toforcedreg(comp_ctx, res, args_rbp /*rbp_flags*/, reg_temp /*forced_reg*/);
 		duk__patch_jump_here(comp_ctx, pc_jump);
@@ -69337,7 +73499,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		return;
 	}
 
- assign:
+assign:
 	/*
 	 *  Shared assignment expression handling
 	 *
@@ -69390,7 +73552,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		 * is relevant for e.g. eval code.
 		 */
 		toplevel_assign = (comp_ctx->curr_func.nud_count == 1 && /* one token before */
-		                   comp_ctx->curr_func.led_count == 1);  /* one operator (= assign) */
+		                   comp_ctx->curr_func.led_count == 1); /* one operator (= assign) */
 		DUK_DDD(DUK_DDDPRINT("assignment: nud_count=%ld, led_count=%ld, toplevel_assign=%ld",
 		                     (long) comp_ctx->curr_func.nud_count,
 		                     (long) comp_ctx->curr_func.led_count,
@@ -69401,7 +73563,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 			duk_regconst_t reg_varbind;
 			duk_regconst_t rc_varname;
 
-			DUK_ASSERT(left->x1.t == DUK_ISPEC_VALUE);  /* LHS is already side effect free */
+			DUK_ASSERT(left->x1.t == DUK_ISPEC_VALUE); /* LHS is already side effect free */
 
 			h_varname = duk_known_hstring(thr, left->x1.valstack_idx);
 			if (duk__hstring_is_eval_or_arguments_in_strict_mode(comp_ctx, h_varname)) {
@@ -69418,9 +73580,10 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 					DUK_DDD(DUK_DDDPRINT("plain assignment, toplevel assign, use as is"));
 				} else {
 					/* 'res' must be a plain ivalue, and not register-bound variable. */
-					DUK_DDD(DUK_DDDPRINT("plain assignment, not toplevel assign, ensure not a reg-bound identifier"));
-					if (res->t != DUK_IVAL_PLAIN || (res->x1.t == DUK_ISPEC_REGCONST &&
-					                                 DUK__ISREG_NOTTEMP(comp_ctx, res->x1.regconst))) {
+					DUK_DDD(DUK_DDDPRINT(
+					    "plain assignment, not toplevel assign, ensure not a reg-bound identifier"));
+					if (res->t != DUK_IVAL_PLAIN ||
+					    (res->x1.t == DUK_ISPEC_REGCONST && DUK__ISREG_NOTTEMP(comp_ctx, res->x1.regconst))) {
 						duk__ivalue_totempconst(comp_ctx, res);
 					}
 				}
@@ -69453,7 +73616,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 						 * value, so go through a temp.
 						 */
 						DUK_DD(DUK_DDPRINT("<op>= expression is not top level, write to reg_temp"));
-						reg_res = reg_temp;  /* reg_res should be smallest possible */
+						reg_res = reg_temp; /* reg_res should be smallest possible */
 						reg_temp = DUK__ALLOCTEMP(comp_ctx);
 					}
 
@@ -69465,10 +73628,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 					 */
 
 					pc_temp_load = duk__get_current_pc(comp_ctx);
-					duk__emit_a_bc(comp_ctx,
-					               DUK_OP_LDREG,
-					               reg_temp,
-					               reg_varbind);
+					duk__emit_a_bc(comp_ctx, DUK_OP_LDREG, reg_temp, reg_varbind);
 
 					pc_before_rhs = duk__get_current_pc(comp_ctx);
 					duk__expr_toregconst(comp_ctx, res, args_rbp /*rbp_flags*/);
@@ -69476,7 +73636,8 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 					pc_after_rhs = duk__get_current_pc(comp_ctx);
 
 					DUK_DD(DUK_DDPRINT("pc_temp_load=%ld, pc_before_rhs=%ld, pc_after_rhs=%ld",
-					                   (long) pc_temp_load, (long) pc_before_rhs,
+					                   (long) pc_temp_load,
+					                   (long) pc_before_rhs,
 					                   (long) pc_after_rhs));
 
 					if (pc_after_rhs == pc_before_rhs) {
@@ -69484,11 +73645,16 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 						 * instructions, we may need to rewind more than
 						 * one instruction, so use explicit PC computation.
 						 */
-						DUK_DD(DUK_DDPRINT("rhs is side effect free, rewind and avoid unnecessary temp for reg-based <op>="));
-						DUK_BW_ADD_PTR(comp_ctx->thr, &comp_ctx->curr_func.bw_code, (pc_temp_load - pc_before_rhs) * (duk_int_t) sizeof(duk_compiler_instr));
+						DUK_DD(DUK_DDPRINT("rhs is side effect free, rewind and avoid unnecessary temp for "
+						                   "reg-based <op>="));
+						DUK_BW_ADD_PTR(comp_ctx->thr,
+						               &comp_ctx->curr_func.bw_code,
+						               (pc_temp_load - pc_before_rhs) *
+						                   (duk_int_t) sizeof(duk_compiler_instr));
 						reg_src = reg_varbind;
 					} else {
-						DUK_DD(DUK_DDPRINT("rhs evaluation emitted code, not sure if rhs is side effect free; use temp reg for LHS"));
+						DUK_DD(DUK_DDPRINT("rhs evaluation emitted code, not sure if rhs is side effect "
+						                   "free; use temp reg for LHS"));
 						reg_src = reg_temp;
 					}
 
@@ -69509,10 +73675,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 					 * temporary.  No optimization for top level assignment.
 					 */
 
-					duk__emit_a_bc(comp_ctx,
-					               DUK_OP_GETVAR,
-					               reg_temp,
-					               rc_varname);
+					duk__emit_a_bc(comp_ctx, DUK_OP_GETVAR, reg_temp, rc_varname);
 
 					duk__expr_toregconst(comp_ctx, res, args_rbp /*rbp_flags*/);
 					DUK_ASSERT(res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_REGCONST);
@@ -69545,7 +73708,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 						duk__ivalue_toforcedreg(comp_ctx, res, (duk_int_t) reg_varbind);
 					} else {
 						duk__ivalue_totempconst(comp_ctx, res);
-						duk__copy_ivalue(comp_ctx, res, left);  /* use 'left' as a temp */
+						duk__copy_ivalue(comp_ctx, res, left); /* use 'left' as a temp */
 						duk__ivalue_toforcedreg(comp_ctx, left, (duk_int_t) reg_varbind);
 					}
 				} else {
@@ -69553,7 +73716,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 					 * free and may be a plain value, a register, or a
 					 * constant) and write it to the LHS binding too.
 					 */
-					duk__copy_ivalue(comp_ctx, res, left);  /* use 'left' as a temp */
+					duk__copy_ivalue(comp_ctx, res, left); /* use 'left' as a temp */
 					duk__ivalue_toforcedreg(comp_ctx, left, (duk_int_t) reg_varbind);
 				}
 			} else {
@@ -69566,10 +73729,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 				 */
 
 				duk__ivalue_toreg(comp_ctx, res);
-				duk__emit_a_bc(comp_ctx,
-				               DUK_OP_PUTVAR | DUK__EMIT_FLAG_A_IS_SOURCE,
-				               res->x1.regconst,
-				               rc_varname);
+				duk__emit_a_bc(comp_ctx, DUK_OP_PUTVAR | DUK__EMIT_FLAG_A_IS_SOURCE, res->x1.regconst, rc_varname);
 			}
 
 			/* 'res' contains expression value */
@@ -69609,11 +73769,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 				rc_res = res->x1.regconst;
 			} else {
 				reg_temp = DUK__ALLOCTEMP(comp_ctx);
-				duk__emit_a_b_c(comp_ctx,
-				                DUK_OP_GETPROP | DUK__EMIT_FLAG_BC_REGCONST,
-				                reg_temp,
-				                reg_obj,
-				                rc_key);
+				duk__emit_a_b_c(comp_ctx, DUK_OP_GETPROP | DUK__EMIT_FLAG_BC_REGCONST, reg_temp, reg_obj, rc_key);
 
 				duk__expr_toregconst(comp_ctx, res, args_rbp /*rbp_flags*/);
 				DUK_ASSERT(res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_REGCONST);
@@ -69664,90 +73820,88 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 		return;
 	}
 
- postincdec:
-	{
-		/*
-		 *  Post-increment/decrement will return the original value as its
-		 *  result value.  However, even that value will be coerced using
-		 *  ToNumber() which is quite awkward.  Specific bytecode opcodes
-		 *  are used to handle these semantics.
-		 *
-		 *  Note that post increment/decrement has a "no LineTerminator here"
-		 *  restriction.  This is handled by duk__expr_lbp(), which forcibly terminates
-		 *  the previous expression if a LineTerminator occurs before '++'/'--'.
-		 */
-
-		duk_regconst_t reg_res;
-		duk_small_uint_t args_op1 = (args >> 8) & 0xff;  /* DUK_OP_POSTINCR/DUK_OP_POSTDECR */
-		duk_small_uint_t args_op2 = args >> 16;          /* DUK_OP_POSTINCP_RR/DUK_OP_POSTDECP_RR */
+postincdec : {
+	/*
+	 *  Post-increment/decrement will return the original value as its
+	 *  result value.  However, even that value will be coerced using
+	 *  ToNumber() which is quite awkward.  Specific bytecode opcodes
+	 *  are used to handle these semantics.
+	 *
+	 *  Note that post increment/decrement has a "no LineTerminator here"
+	 *  restriction.  This is handled by duk__expr_lbp(), which forcibly terminates
+	 *  the previous expression if a LineTerminator occurs before '++'/'--'.
+	 */
 
-		/* Specific assumptions for opcode numbering. */
-		DUK_ASSERT(DUK_OP_POSTINCR + 4 == DUK_OP_POSTINCV);
-		DUK_ASSERT(DUK_OP_POSTDECR + 4 == DUK_OP_POSTDECV);
+	duk_regconst_t reg_res;
+	duk_small_uint_t args_op1 = (args >> 8) & 0xff; /* DUK_OP_POSTINCR/DUK_OP_POSTDECR */
+	duk_small_uint_t args_op2 = args >> 16; /* DUK_OP_POSTINCP_RR/DUK_OP_POSTDECP_RR */
 
-		reg_res = DUK__ALLOCTEMP(comp_ctx);
+	/* Specific assumptions for opcode numbering. */
+	DUK_ASSERT(DUK_OP_POSTINCR + 4 == DUK_OP_POSTINCV);
+	DUK_ASSERT(DUK_OP_POSTDECR + 4 == DUK_OP_POSTDECV);
 
-		if (left->t == DUK_IVAL_VAR) {
-			duk_hstring *h_varname;
-			duk_regconst_t reg_varbind;
-			duk_regconst_t rc_varname;
+	reg_res = DUK__ALLOCTEMP(comp_ctx);
 
-			h_varname = duk_known_hstring(thr, left->x1.valstack_idx);
-
-			if (duk__hstring_is_eval_or_arguments_in_strict_mode(comp_ctx, h_varname)) {
-				goto syntax_error;
-			}
+	if (left->t == DUK_IVAL_VAR) {
+		duk_hstring *h_varname;
+		duk_regconst_t reg_varbind;
+		duk_regconst_t rc_varname;
 
-			duk_dup(thr, left->x1.valstack_idx);
-			if (duk__lookup_lhs(comp_ctx, &reg_varbind, &rc_varname)) {
-				duk__emit_a_bc(comp_ctx,
-				               args_op1,  /* e.g. DUK_OP_POSTINCR */
-				               reg_res,
-				               reg_varbind);
-			} else {
-				duk__emit_a_bc(comp_ctx,
-				               args_op1 + 4,  /* e.g. DUK_OP_POSTINCV */
-				               reg_res,
-				               rc_varname);
-			}
+		h_varname = duk_known_hstring(thr, left->x1.valstack_idx);
 
-			DUK_DDD(DUK_DDDPRINT("postincdec to '%!O' -> reg_varbind=%ld, rc_varname=%ld",
-			                     (duk_heaphdr *) h_varname, (long) reg_varbind, (long) rc_varname));
-		} else if (left->t == DUK_IVAL_PROP) {
-			duk_regconst_t reg_obj;  /* allocate to reg only (not const) */
-			duk_regconst_t rc_key;
+		if (duk__hstring_is_eval_or_arguments_in_strict_mode(comp_ctx, h_varname)) {
+			goto syntax_error;
+		}
 
-			reg_obj = duk__ispec_toregconst_raw(comp_ctx, &left->x1, -1 /*forced_reg*/, 0 /*flags*/);  /* don't allow const */
-			rc_key = duk__ispec_toregconst_raw(comp_ctx, &left->x2, -1 /*forced_reg*/, DUK__IVAL_FLAG_ALLOW_CONST /*flags*/);
-			duk__emit_a_b_c(comp_ctx,
-			                args_op2 | DUK__EMIT_FLAG_BC_REGCONST,  /* e.g. DUK_OP_POSTINCP */
-			                reg_res,
-			                reg_obj,
-			                rc_key);
+		duk_dup(thr, left->x1.valstack_idx);
+		if (duk__lookup_lhs(comp_ctx, &reg_varbind, &rc_varname)) {
+			duk__emit_a_bc(comp_ctx,
+			               args_op1, /* e.g. DUK_OP_POSTINCR */
+			               reg_res,
+			               reg_varbind);
 		} else {
-			/* Technically return value is not needed because INVLHS will
-			 * unconditially throw a ReferenceError.  Coercion is necessary
-			 * for proper semantics (consider ToNumber() called for an object).
-			 * Use DUK_OP_UNP with a dummy register to get ToNumber().
-			 */
-			duk__ivalue_toforcedreg(comp_ctx, left, reg_res);
-			duk__emit_bc(comp_ctx,
-			             DUK_OP_UNP,
-			             reg_res);  /* for side effects, result ignored */
-			duk__emit_op_only(comp_ctx,
-			                  DUK_OP_INVLHS);
+			duk__emit_a_bc(comp_ctx,
+			               args_op1 + 4, /* e.g. DUK_OP_POSTINCV */
+			               reg_res,
+			               rc_varname);
 		}
 
-		DUK__SETTEMP(comp_ctx, reg_res + 1);
-		duk__ivalue_regconst(res, reg_res);
-		return;
+		DUK_DDD(DUK_DDDPRINT("postincdec to '%!O' -> reg_varbind=%ld, rc_varname=%ld",
+		                     (duk_heaphdr *) h_varname,
+		                     (long) reg_varbind,
+		                     (long) rc_varname));
+	} else if (left->t == DUK_IVAL_PROP) {
+		duk_regconst_t reg_obj; /* allocate to reg only (not const) */
+		duk_regconst_t rc_key;
+
+		reg_obj = duk__ispec_toregconst_raw(comp_ctx, &left->x1, -1 /*forced_reg*/, 0 /*flags*/); /* don't allow const */
+		rc_key = duk__ispec_toregconst_raw(comp_ctx, &left->x2, -1 /*forced_reg*/, DUK__IVAL_FLAG_ALLOW_CONST /*flags*/);
+		duk__emit_a_b_c(comp_ctx,
+		                args_op2 | DUK__EMIT_FLAG_BC_REGCONST, /* e.g. DUK_OP_POSTINCP */
+		                reg_res,
+		                reg_obj,
+		                rc_key);
+	} else {
+		/* Technically return value is not needed because INVLHS will
+		 * unconditially throw a ReferenceError.  Coercion is necessary
+		 * for proper semantics (consider ToNumber() called for an object).
+		 * Use DUK_OP_UNP with a dummy register to get ToNumber().
+		 */
+		duk__ivalue_toforcedreg(comp_ctx, left, reg_res);
+		duk__emit_bc(comp_ctx, DUK_OP_UNP, reg_res); /* for side effects, result ignored */
+		duk__emit_op_only(comp_ctx, DUK_OP_INVLHS);
 	}
 
- syntax_error:
+	DUK__SETTEMP(comp_ctx, reg_res + 1);
+	duk__ivalue_regconst(res, reg_res);
+	return;
+}
+
+syntax_error:
 	DUK_ERROR_SYNTAX(thr, DUK_STR_INVALID_EXPRESSION);
 	DUK_WO_NORETURN(return;);
 
- syntax_error_lvalue:
+syntax_error_lvalue:
 	DUK_ERROR_SYNTAX(thr, DUK_STR_INVALID_LVALUE);
 	DUK_WO_NORETURN(return;);
 }
@@ -69755,7 +73909,7 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i
 DUK_LOCAL duk_small_uint_t duk__expr_lbp(duk_compiler_ctx *comp_ctx) {
 	duk_small_uint_t tok = comp_ctx->curr_token.t;
 
-	DUK_ASSERT_DISABLE(tok >= DUK_TOK_MINVAL);  /* unsigned */
+	DUK_ASSERT_DISABLE(tok >= DUK_TOK_MINVAL); /* unsigned */
 	DUK_ASSERT(tok <= DUK_TOK_MAXVAL);
 	DUK_ASSERT(sizeof(duk__token_lbp) == DUK_TOK_MAXVAL + 1);
 
@@ -69768,8 +73922,7 @@ DUK_LOCAL duk_small_uint_t duk__expr_lbp(duk_compiler_ctx *comp_ctx) {
 		return 0;
 	}
 
-	if ((tok == DUK_TOK_DECREMENT || tok == DUK_TOK_INCREMENT) &&
-	    (comp_ctx->curr_token.lineterm)) {
+	if ((tok == DUK_TOK_DECREMENT || tok == DUK_TOK_INCREMENT) && (comp_ctx->curr_token.lineterm)) {
 		/* '++' or '--' in a post-increment/decrement position,
 		 * and a LineTerminator occurs between the operator and
 		 * the preceding expression.  Force the previous expr
@@ -69779,7 +73932,7 @@ DUK_LOCAL duk_small_uint_t duk__expr_lbp(duk_compiler_ctx *comp_ctx) {
 		return 0;
 	}
 
-	return DUK__TOKEN_LBP_GET_BP(duk__token_lbp[tok]);  /* format is bit packed */
+	return DUK__TOKEN_LBP_GET_BP(duk__token_lbp[tok]); /* format is bit packed */
 }
 
 /*
@@ -69791,15 +73944,15 @@ DUK_LOCAL duk_small_uint_t duk__expr_lbp(duk_compiler_ctx *comp_ctx) {
  *  statement).
  */
 
-#define DUK__EXPR_RBP_MASK           0xff
-#define DUK__EXPR_FLAG_REJECT_IN     (1 << 8)   /* reject 'in' token (used for for-in) */
-#define DUK__EXPR_FLAG_ALLOW_EMPTY   (1 << 9)   /* allow empty expression */
-#define DUK__EXPR_FLAG_REQUIRE_INIT  (1 << 10)  /* require initializer for var/const */
+#define DUK__EXPR_RBP_MASK          0xff
+#define DUK__EXPR_FLAG_REJECT_IN    (1 << 8) /* reject 'in' token (used for for-in) */
+#define DUK__EXPR_FLAG_ALLOW_EMPTY  (1 << 9) /* allow empty expression */
+#define DUK__EXPR_FLAG_REQUIRE_INIT (1 << 10) /* require initializer for var/const */
 
 /* main expression parser function */
 DUK_LOCAL void duk__expr(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags) {
 	duk_hthread *thr = comp_ctx->thr;
-	duk_ivalue tmp_alloc;   /* 'res' is used for "left", and 'tmp' for "right" */
+	duk_ivalue tmp_alloc; /* 'res' is used for "left", and 'tmp' for "right" */
 	duk_ivalue *tmp = &tmp_alloc;
 	duk_small_uint_t rbp;
 
@@ -69811,7 +73964,9 @@ DUK_LOCAL void duk__expr(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_
 	rbp = rbp_flags & DUK__EXPR_RBP_MASK;
 
 	DUK_DDD(DUK_DDDPRINT("duk__expr(), rbp_flags=%ld, rbp=%ld, allow_in=%ld, paren_level=%ld",
-	                     (long) rbp_flags, (long) rbp, (long) comp_ctx->curr_func.allow_in,
+	                     (long) rbp_flags,
+	                     (long) rbp,
+	                     (long) comp_ctx->curr_func.allow_in,
 	                     (long) comp_ctx->curr_func.paren_level));
 
 	duk_memzero(&tmp_alloc, sizeof(tmp_alloc));
@@ -69842,14 +73997,14 @@ DUK_LOCAL void duk__expr(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_
 	}
 
 	duk__advance(comp_ctx);
-	duk__expr_nud(comp_ctx, res);  /* reuse 'res' as 'left' */
+	duk__expr_nud(comp_ctx, res); /* reuse 'res' as 'left' */
 	while (rbp < duk__expr_lbp(comp_ctx)) {
 		duk__advance(comp_ctx);
 		duk__expr_led(comp_ctx, res, tmp);
-		duk__copy_ivalue(comp_ctx, tmp, res);  /* tmp -> res */
+		duk__copy_ivalue(comp_ctx, tmp, res); /* tmp -> res */
 	}
 
- cleanup:
+cleanup:
 	/* final result is already in 'res' */
 
 	duk_pop_2(thr);
@@ -69883,21 +74038,24 @@ DUK_LOCAL void duk__exprtop(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_sma
  * Each helper needs at least 2-3 calls to make it worth while to wrap.
  */
 
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL duk_regconst_t duk__expr_toreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags) {
 	duk__expr(comp_ctx, res, rbp_flags);
 	return duk__ivalue_toreg(comp_ctx, res);
 }
 #endif
 
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL duk_regconst_t duk__expr_totemp(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags) {
 	duk__expr(comp_ctx, res, rbp_flags);
 	return duk__ivalue_totemp(comp_ctx, res);
 }
 #endif
 
-DUK_LOCAL void duk__expr_toforcedreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags, duk_regconst_t forced_reg) {
+DUK_LOCAL void duk__expr_toforcedreg(duk_compiler_ctx *comp_ctx,
+                                     duk_ivalue *res,
+                                     duk_small_uint_t rbp_flags,
+                                     duk_regconst_t forced_reg) {
 	DUK_ASSERT(forced_reg >= 0);
 	duk__expr(comp_ctx, res, rbp_flags);
 	duk__ivalue_toforcedreg(comp_ctx, res, forced_reg);
@@ -69908,7 +74066,7 @@ DUK_LOCAL duk_regconst_t duk__expr_toregconst(duk_compiler_ctx *comp_ctx, duk_iv
 	return duk__ivalue_toregconst(comp_ctx, res);
 }
 
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL duk_regconst_t duk__expr_totempconst(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags) {
 	duk__expr(comp_ctx, res, rbp_flags);
 	return duk__ivalue_totempconst(comp_ctx, res);
@@ -69930,14 +74088,17 @@ DUK_LOCAL duk_regconst_t duk__exprtop_toreg(duk_compiler_ctx *comp_ctx, duk_ival
 	return duk__ivalue_toreg(comp_ctx, res);
 }
 
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL duk_regconst_t duk__exprtop_totemp(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags) {
 	duk__exprtop(comp_ctx, res, rbp_flags);
 	return duk__ivalue_totemp(comp_ctx, res);
 }
 #endif
 
-DUK_LOCAL void duk__exprtop_toforcedreg(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t rbp_flags, duk_regconst_t forced_reg) {
+DUK_LOCAL void duk__exprtop_toforcedreg(duk_compiler_ctx *comp_ctx,
+                                        duk_ivalue *res,
+                                        duk_small_uint_t rbp_flags,
+                                        duk_regconst_t forced_reg) {
 	DUK_ASSERT(forced_reg >= 0);
 	duk__exprtop(comp_ctx, res, rbp_flags);
 	duk__ivalue_toforcedreg(comp_ctx, res, forced_reg);
@@ -69948,7 +74109,7 @@ DUK_LOCAL duk_regconst_t duk__exprtop_toregconst(duk_compiler_ctx *comp_ctx, duk
 	return duk__ivalue_toregconst(comp_ctx, res);
 }
 
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL void duk__exprtop_toplain_ignore(duk_compiler_ctx *comp_ctx, duk_ivalue *res, int rbp_flags) {
 	duk__exprtop(comp_ctx, res, rbp_flags);
 	duk__ivalue_toplain_ignore(comp_ctx, res);
@@ -69967,11 +74128,11 @@ DUK_LOCAL void duk__exprtop_toplain_ignore(duk_compiler_ctx *comp_ctx, duk_ivalu
  *  the token after the terminator).
  */
 
-#define DUK__HAS_VAL                  (1 << 0)  /* stmt has non-empty value */
-#define DUK__HAS_TERM                 (1 << 1)  /* stmt has explicit/implicit semicolon terminator */
-#define DUK__ALLOW_AUTO_SEMI_ALWAYS   (1 << 2)  /* allow automatic semicolon even without lineterm (compatibility) */
-#define DUK__STILL_PROLOGUE           (1 << 3)  /* statement does not terminate directive prologue */
-#define DUK__IS_TERMINAL              (1 << 4)  /* statement is guaranteed to be terminal (control doesn't flow to next statement) */
+#define DUK__HAS_VAL                (1 << 0) /* stmt has non-empty value */
+#define DUK__HAS_TERM               (1 << 1) /* stmt has explicit/implicit semicolon terminator */
+#define DUK__ALLOW_AUTO_SEMI_ALWAYS (1 << 2) /* allow automatic semicolon even without lineterm (compatibility) */
+#define DUK__STILL_PROLOGUE         (1 << 3) /* statement does not terminate directive prologue */
+#define DUK__IS_TERMINAL            (1 << 4) /* statement is guaranteed to be terminal (control doesn't flow to next statement) */
 
 /* Parse a single variable declaration (e.g. "i" or "i=10").  A leading 'var'
  * has already been eaten.  These is no return value in 'res', it is used only
@@ -69991,7 +74152,11 @@ DUK_LOCAL void duk__exprtop_toplain_ignore(duk_compiler_ctx *comp_ctx, duk_ivalu
  * as is done in 'for-in' parsing.
  */
 
-DUK_LOCAL void duk__parse_var_decl(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_small_uint_t expr_flags, duk_regconst_t *out_reg_varbind, duk_regconst_t *out_rc_varname) {
+DUK_LOCAL void duk__parse_var_decl(duk_compiler_ctx *comp_ctx,
+                                   duk_ivalue *res,
+                                   duk_small_uint_t expr_flags,
+                                   duk_regconst_t *out_reg_varbind,
+                                   duk_regconst_t *out_rc_varname) {
 	duk_hthread *thr = comp_ctx->thr;
 	duk_hstring *h_varname;
 	duk_regconst_t reg_varbind;
@@ -70015,8 +74180,7 @@ DUK_LOCAL void duk__parse_var_decl(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 	/* register declarations in first pass */
 	if (comp_ctx->curr_func.in_scanning) {
 		duk_uarridx_t n;
-		DUK_DDD(DUK_DDDPRINT("register variable declaration %!O in pass 1",
-		                     (duk_heaphdr *) h_varname));
+		DUK_DDD(DUK_DDDPRINT("register variable declaration %!O in pass 1", (duk_heaphdr *) h_varname));
 		n = (duk_uarridx_t) duk_get_length(thr, comp_ctx->curr_func.decls_idx);
 		duk_push_hstring(thr, h_varname);
 		duk_put_prop_index(thr, comp_ctx->curr_func.decls_idx, n);
@@ -70024,31 +74188,30 @@ DUK_LOCAL void duk__parse_var_decl(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 		duk_put_prop_index(thr, comp_ctx->curr_func.decls_idx, n + 1);
 	}
 
-	duk_push_hstring(thr, h_varname);  /* push before advancing to keep reachable */
+	duk_push_hstring(thr, h_varname); /* push before advancing to keep reachable */
 
 	/* register binding lookup is based on varmap (even in first pass) */
 	duk_dup_top(thr);
 	(void) duk__lookup_lhs(comp_ctx, &reg_varbind, &rc_varname);
 
-	duk__advance(comp_ctx);  /* eat identifier */
+	duk__advance(comp_ctx); /* eat identifier */
 
 	if (comp_ctx->curr_token.t == DUK_TOK_EQUALSIGN) {
 		duk__advance(comp_ctx);
 
 		DUK_DDD(DUK_DDDPRINT("vardecl, assign to '%!O' -> reg_varbind=%ld, rc_varname=%ld",
-		                     (duk_heaphdr *) h_varname, (long) reg_varbind, (long) rc_varname));
+		                     (duk_heaphdr *) h_varname,
+		                     (long) reg_varbind,
+		                     (long) rc_varname));
 
-		duk__exprtop(comp_ctx, res, DUK__BP_COMMA | expr_flags /*rbp_flags*/);  /* AssignmentExpression */
+		duk__exprtop(comp_ctx, res, DUK__BP_COMMA | expr_flags /*rbp_flags*/); /* AssignmentExpression */
 
 		if (reg_varbind >= 0) {
 			duk__ivalue_toforcedreg(comp_ctx, res, reg_varbind);
 		} else {
 			duk_regconst_t reg_val;
 			reg_val = duk__ivalue_toreg(comp_ctx, res);
-			duk__emit_a_bc(comp_ctx,
-			               DUK_OP_PUTVAR | DUK__EMIT_FLAG_A_IS_SOURCE,
-			               reg_val,
-			               rc_varname);
+			duk__emit_a_bc(comp_ctx, DUK_OP_PUTVAR | DUK__EMIT_FLAG_A_IS_SOURCE, reg_val, rc_varname);
 		}
 	} else {
 		if (expr_flags & DUK__EXPR_FLAG_REQUIRE_INIT) {
@@ -70057,14 +74220,14 @@ DUK_LOCAL void duk__parse_var_decl(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 		}
 	}
 
-	duk_pop(thr);  /* pop varname */
+	duk_pop(thr); /* pop varname */
 
 	*out_rc_varname = rc_varname;
 	*out_reg_varbind = reg_varbind;
 
 	return;
 
- syntax_error:
+syntax_error:
 	DUK_ERROR_SYNTAX(thr, DUK_STR_INVALID_VAR_DECLARATION);
 	DUK_WO_NORETURN(return;);
 }
@@ -70073,7 +74236,7 @@ DUK_LOCAL void duk__parse_var_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 	duk_regconst_t reg_varbind;
 	duk_regconst_t rc_varname;
 
-	duk__advance(comp_ctx);  /* eat 'var' */
+	duk__advance(comp_ctx); /* eat 'var' */
 
 	for (;;) {
 		/* rc_varname and reg_varbind are ignored here */
@@ -70088,9 +74251,9 @@ DUK_LOCAL void duk__parse_var_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 
 DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_int_t pc_label_site) {
 	duk_hthread *thr = comp_ctx->thr;
-	duk_int_t pc_v34_lhs;         /* start variant 3/4 left-hand-side code (L1 in doc/compiler.rst example) */
-	duk_regconst_t temp_reset;    /* knock back "next temp" to this whenever possible */
-	duk_regconst_t reg_temps;     /* preallocated temporaries (2) for variants 3 and 4 */
+	duk_int_t pc_v34_lhs; /* start variant 3/4 left-hand-side code (L1 in doc/compiler.rst example) */
+	duk_regconst_t temp_reset; /* knock back "next temp" to this whenever possible */
+	duk_regconst_t reg_temps; /* preallocated temporaries (2) for variants 3 and 4 */
 
 	DUK_DDD(DUK_DDDPRINT("start parsing a for/for-in statement"));
 
@@ -70119,7 +74282,7 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 	 *  issues, evaluation order issues, etc.
 	 */
 
-	duk__advance(comp_ctx);  /* eat 'for' */
+	duk__advance(comp_ctx); /* eat 'for' */
 	duk__advance_expect(comp_ctx, DUK_TOK_LPAREN);
 
 	DUK_DDD(DUK_DDDPRINT("detecting for/for-in loop variant, pc=%ld", (long) duk__get_current_pc(comp_ctx)));
@@ -70133,10 +74296,10 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 		 *  Variant 2 or 4
 		 */
 
-		duk_regconst_t reg_varbind;  /* variable binding register if register-bound (otherwise < 0) */
-		duk_regconst_t rc_varname;   /* variable name reg/const, if variable not register-bound */
+		duk_regconst_t reg_varbind; /* variable binding register if register-bound (otherwise < 0) */
+		duk_regconst_t rc_varname; /* variable name reg/const, if variable not register-bound */
 
-		duk__advance(comp_ctx);  /* eat 'var' */
+		duk__advance(comp_ctx); /* eat 'var' */
 		duk__parse_var_decl(comp_ctx, res, DUK__EXPR_FLAG_REJECT_IN, &reg_varbind, &rc_varname);
 		DUK__SETTEMP(comp_ctx, temp_reset);
 
@@ -70146,17 +74309,11 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 			 */
 
 			DUK_DDD(DUK_DDDPRINT("detected for variant 4: for (var VariableDeclarationNoIn in Expression) Statement"));
-			pc_v34_lhs = duk__get_current_pc(comp_ctx);  /* jump is inserted here */
+			pc_v34_lhs = duk__get_current_pc(comp_ctx); /* jump is inserted here */
 			if (reg_varbind >= 0) {
-				duk__emit_a_bc(comp_ctx,
-				               DUK_OP_LDREG,
-				               reg_varbind,
-				               reg_temps + 0);
+				duk__emit_a_bc(comp_ctx, DUK_OP_LDREG, reg_varbind, reg_temps + 0);
 			} else {
-				duk__emit_a_bc(comp_ctx,
-				               DUK_OP_PUTVAR | DUK__EMIT_FLAG_A_IS_SOURCE,
-				               reg_temps + 0,
-				               rc_varname);
+				duk__emit_a_bc(comp_ctx, DUK_OP_PUTVAR | DUK__EMIT_FLAG_A_IS_SOURCE, reg_temps + 0, rc_varname);
 			}
 			goto parse_3_or_4;
 		} else {
@@ -70164,7 +74321,8 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 			 *  Variant 2
 			 */
 
-			DUK_DDD(DUK_DDDPRINT("detected for variant 2: for (var VariableDeclarationNoIn; Expression_opt; Expression_opt) Statement"));
+			DUK_DDD(DUK_DDDPRINT(
+			    "detected for variant 2: for (var VariableDeclarationNoIn; Expression_opt; Expression_opt) Statement"));
 			for (;;) {
 				/* more initializers */
 				if (comp_ctx->curr_token.t != DUK_TOK_COMMA) {
@@ -70172,7 +74330,7 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 				}
 				DUK_DDD(DUK_DDDPRINT("variant 2 has another variable initializer"));
 
-				duk__advance(comp_ctx);  /* eat comma */
+				duk__advance(comp_ctx); /* eat comma */
 				duk__parse_var_decl(comp_ctx, res, DUK__EXPR_FLAG_REJECT_IN, &reg_varbind, &rc_varname);
 			}
 			goto parse_1_or_2;
@@ -70182,14 +74340,17 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 		 *  Variant 1 or 3
 		 */
 
-		pc_v34_lhs = duk__get_current_pc(comp_ctx);  /* jump is inserted here (variant 3) */
+		pc_v34_lhs = duk__get_current_pc(comp_ctx); /* jump is inserted here (variant 3) */
 
 		/* Note that duk__exprtop() here can clobber any reg above current temp_next,
 		 * so any loop variables (e.g. enumerator) must be "preallocated".
 		 */
 
 		/* don't coerce yet to a plain value (variant 3 needs special handling) */
-		duk__exprtop(comp_ctx, res, DUK__BP_FOR_EXPR | DUK__EXPR_FLAG_REJECT_IN | DUK__EXPR_FLAG_ALLOW_EMPTY /*rbp_flags*/);  /* Expression */
+		duk__exprtop(comp_ctx,
+		             res,
+		             DUK__BP_FOR_EXPR | DUK__EXPR_FLAG_REJECT_IN |
+		                 DUK__EXPR_FLAG_ALLOW_EMPTY /*rbp_flags*/); /* Expression */
 		if (comp_ctx->curr_token.t == DUK_TOK_IN) {
 			/*
 			 *  Variant 3
@@ -70198,7 +74359,7 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 			/* XXX: need to determine LHS type, and check that it is LHS compatible */
 			DUK_DDD(DUK_DDDPRINT("detected for variant 3: for (LeftHandSideExpression in Expression) Statement"));
 			if (duk__expr_is_empty(comp_ctx)) {
-				goto syntax_error;  /* LeftHandSideExpression does not allow empty expression */
+				goto syntax_error; /* LeftHandSideExpression does not allow empty expression */
 			}
 
 			if (res->t == DUK_IVAL_VAR) {
@@ -70207,10 +74368,7 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 
 				duk_dup(thr, res->x1.valstack_idx);
 				if (duk__lookup_lhs(comp_ctx, &reg_varbind, &rc_varname)) {
-					duk__emit_a_bc(comp_ctx,
-					               DUK_OP_LDREG,
-					               reg_varbind,
-					               reg_temps + 0);
+					duk__emit_a_bc(comp_ctx, DUK_OP_LDREG, reg_varbind, reg_temps + 0);
 				} else {
 					duk__emit_a_bc(comp_ctx,
 					               DUK_OP_PUTVAR | DUK__EMIT_FLAG_A_IS_SOURCE,
@@ -70223,17 +74381,22 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 				 */
 				duk_regconst_t reg_obj;
 				duk_regconst_t rc_key;
-				reg_obj = duk__ispec_toregconst_raw(comp_ctx, &res->x1, -1 /*forced_reg*/, 0 /*flags*/);  /* don't allow const */
-				rc_key = duk__ispec_toregconst_raw(comp_ctx, &res->x2, -1 /*forced_reg*/, DUK__IVAL_FLAG_ALLOW_CONST /*flags*/);
+				reg_obj = duk__ispec_toregconst_raw(comp_ctx,
+				                                    &res->x1,
+				                                    -1 /*forced_reg*/,
+				                                    0 /*flags*/); /* don't allow const */
+				rc_key = duk__ispec_toregconst_raw(comp_ctx,
+				                                   &res->x2,
+				                                   -1 /*forced_reg*/,
+				                                   DUK__IVAL_FLAG_ALLOW_CONST /*flags*/);
 				duk__emit_a_b_c(comp_ctx,
 				                DUK_OP_PUTPROP | DUK__EMIT_FLAG_A_IS_SOURCE | DUK__EMIT_FLAG_BC_REGCONST,
 				                reg_obj,
 				                rc_key,
 				                reg_temps + 0);
 			} else {
-				duk__ivalue_toplain_ignore(comp_ctx, res);  /* just in case */
-				duk__emit_op_only(comp_ctx,
-				                  DUK_OP_INVLHS);
+				duk__ivalue_toplain_ignore(comp_ctx, res); /* just in case */
+				duk__emit_op_only(comp_ctx, DUK_OP_INVLHS);
 			}
 			goto parse_3_or_4;
 		} else {
@@ -70241,13 +74404,14 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 			 *  Variant 1
 			 */
 
-			DUK_DDD(DUK_DDDPRINT("detected for variant 1: for (ExpressionNoIn_opt; Expression_opt; Expression_opt) Statement"));
+			DUK_DDD(DUK_DDDPRINT(
+			    "detected for variant 1: for (ExpressionNoIn_opt; Expression_opt; Expression_opt) Statement"));
 			duk__ivalue_toplain_ignore(comp_ctx, res);
 			goto parse_1_or_2;
 		}
 	}
 
- parse_1_or_2:
+parse_1_or_2:
 	/*
 	 *  Parse variant 1 or 2.  The first part expression (which differs
 	 *  in the variants) has already been parsed and its code emitted.
@@ -70270,23 +74434,23 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 		duk__advance_expect(comp_ctx, DUK_TOK_SEMICOLON);
 
 		pc_l1 = duk__get_current_pc(comp_ctx);
-		duk__exprtop(comp_ctx, res, DUK__BP_FOR_EXPR | DUK__EXPR_FLAG_ALLOW_EMPTY /*rbp_flags*/);  /* Expression_opt */
+		duk__exprtop(comp_ctx, res, DUK__BP_FOR_EXPR | DUK__EXPR_FLAG_ALLOW_EMPTY /*rbp_flags*/); /* Expression_opt */
 		if (duk__expr_is_empty(comp_ctx)) {
 			/* no need to coerce */
-			pc_jumpto_l3 = duk__emit_jump_empty(comp_ctx);  /* to body */
-			pc_jumpto_l4 = -1;  /* omitted */
+			pc_jumpto_l3 = duk__emit_jump_empty(comp_ctx); /* to body */
+			pc_jumpto_l4 = -1; /* omitted */
 		} else {
 			rc_cond = duk__ivalue_toregconst(comp_ctx, res);
 			duk__emit_if_false_skip(comp_ctx, rc_cond);
-			pc_jumpto_l3 = duk__emit_jump_empty(comp_ctx);  /* to body */
-			pc_jumpto_l4 = duk__emit_jump_empty(comp_ctx);  /* to exit */
+			pc_jumpto_l3 = duk__emit_jump_empty(comp_ctx); /* to body */
+			pc_jumpto_l4 = duk__emit_jump_empty(comp_ctx); /* to exit */
 		}
 		DUK__SETTEMP(comp_ctx, temp_reset);
 
 		duk__advance_expect(comp_ctx, DUK_TOK_SEMICOLON);
 
 		pc_l2 = duk__get_current_pc(comp_ctx);
-		duk__exprtop(comp_ctx, res, DUK__BP_FOR_EXPR | DUK__EXPR_FLAG_ALLOW_EMPTY /*rbp_flags*/);  /* Expression_opt */
+		duk__exprtop(comp_ctx, res, DUK__BP_FOR_EXPR | DUK__EXPR_FLAG_ALLOW_EMPTY /*rbp_flags*/); /* Expression_opt */
 		if (duk__expr_is_empty(comp_ctx)) {
 			/* no need to coerce */
 			expr_c_empty = 1;
@@ -70299,7 +74463,7 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 		DUK__SETTEMP(comp_ctx, temp_reset);
 
 		comp_ctx->curr_func.allow_regexp_in_adv = 1;
-		duk__advance_expect(comp_ctx, DUK_TOK_RPAREN);  /* Allow RegExp as part of next stmt. */
+		duk__advance_expect(comp_ctx, DUK_TOK_RPAREN); /* Allow RegExp as part of next stmt. */
 
 		pc_l3 = duk__get_current_pc(comp_ctx);
 		duk__parse_stmt(comp_ctx, res, 0 /*allow_source_elem*/);
@@ -70314,21 +74478,23 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 
 		DUK_DDD(DUK_DDDPRINT("patching jumps: jumpto_l3: %ld->%ld, jumpto_l4: %ld->%ld, "
 		                     "break: %ld->%ld, continue: %ld->%ld",
-			             (long) pc_jumpto_l3, (long) pc_l3, (long) pc_jumpto_l4, (long) pc_l4,
-		                     (long) (pc_label_site + 1), (long) pc_l4, (long) (pc_label_site + 2), (long) pc_l2));
+		                     (long) pc_jumpto_l3,
+		                     (long) pc_l3,
+		                     (long) pc_jumpto_l4,
+		                     (long) pc_l4,
+		                     (long) (pc_label_site + 1),
+		                     (long) pc_l4,
+		                     (long) (pc_label_site + 2),
+		                     (long) pc_l2));
 
 		duk__patch_jump(comp_ctx, pc_jumpto_l3, pc_l3);
 		duk__patch_jump(comp_ctx, pc_jumpto_l4, pc_l4);
-		duk__patch_jump(comp_ctx,
-		                pc_label_site + 1,
-		                pc_l4);                         /* break jump */
-		duk__patch_jump(comp_ctx,
-		                pc_label_site + 2,
-		                expr_c_empty ? pc_l1 : pc_l2);  /* continue jump */
+		duk__patch_jump(comp_ctx, pc_label_site + 1, pc_l4); /* break jump */
+		duk__patch_jump(comp_ctx, pc_label_site + 2, expr_c_empty ? pc_l1 : pc_l2); /* continue jump */
 	}
 	goto finished;
 
- parse_3_or_4:
+parse_3_or_4:
 	/*
 	 *  Parse variant 3 or 4.
 	 *
@@ -70364,16 +74530,16 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 		 */
 
 		duk__insert_jump_entry(comp_ctx, pc_v34_lhs);
-		pc_jumpto_l2 = pc_v34_lhs;  /* inserted jump */
-		pc_l1 = pc_v34_lhs + 1;     /* +1, right after inserted jump */
+		pc_jumpto_l2 = pc_v34_lhs; /* inserted jump */
+		pc_l1 = pc_v34_lhs + 1; /* +1, right after inserted jump */
 
 		/* The code for writing reg_temps + 0 to the left hand side has already
 		 * been emitted.
 		 */
 
-		pc_jumpto_l3 = duk__emit_jump_empty(comp_ctx);  /* -> loop body */
+		pc_jumpto_l3 = duk__emit_jump_empty(comp_ctx); /* -> loop body */
 
-		duk__advance(comp_ctx);  /* eat 'in' */
+		duk__advance(comp_ctx); /* eat 'in' */
 
 		/* Parse enumeration target and initialize enumerator.  For 'null' and 'undefined',
 		 * INITENUM will creates a 'null' enumerator which works like an empty enumerator
@@ -70382,16 +74548,13 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 		 */
 
 		pc_l2 = duk__get_current_pc(comp_ctx);
-		reg_target = duk__exprtop_toreg(comp_ctx, res, DUK__BP_FOR_EXPR /*rbp_flags*/);  /* Expression */
-		duk__emit_b_c(comp_ctx,
-		              DUK_OP_INITENUM | DUK__EMIT_FLAG_B_IS_TARGET,
-		              reg_temps + 1,
-		              reg_target);
+		reg_target = duk__exprtop_toreg(comp_ctx, res, DUK__BP_FOR_EXPR /*rbp_flags*/); /* Expression */
+		duk__emit_b_c(comp_ctx, DUK_OP_INITENUM | DUK__EMIT_FLAG_B_IS_TARGET, reg_temps + 1, reg_target);
 		pc_jumpto_l4 = duk__emit_jump_empty(comp_ctx);
 		DUK__SETTEMP(comp_ctx, temp_reset);
 
 		comp_ctx->curr_func.allow_regexp_in_adv = 1;
-		duk__advance_expect(comp_ctx, DUK_TOK_RPAREN);  /* Allow RegExp as part of next stmt. */
+		duk__advance_expect(comp_ctx, DUK_TOK_RPAREN); /* Allow RegExp as part of next stmt. */
 
 		pc_l3 = duk__get_current_pc(comp_ctx);
 		duk__parse_stmt(comp_ctx, res, 0 /*allow_source_elem*/);
@@ -70408,8 +74571,8 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 		              DUK_OP_NEXTENUM | DUK__EMIT_FLAG_B_IS_TARGET | DUK__EMIT_FLAG_RESERVE_JUMPSLOT,
 		              reg_temps + 0,
 		              reg_temps + 1);
-		pc_jumpto_l5 = comp_ctx->emit_jumpslot_pc;  /* NEXTENUM jump slot: executed when enum finished */
-		duk__emit_jump(comp_ctx, pc_l1);  /* jump to next loop, using reg_v34_iter as iterated value */
+		pc_jumpto_l5 = comp_ctx->emit_jumpslot_pc; /* NEXTENUM jump slot: executed when enum finished */
+		duk__emit_jump(comp_ctx, pc_l1); /* jump to next loop, using reg_v34_iter as iterated value */
 
 		pc_l5 = duk__get_current_pc(comp_ctx);
 
@@ -70421,24 +74584,33 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 		DUK_DDD(DUK_DDDPRINT("patching jumps: jumpto_l2: %ld->%ld, jumpto_l3: %ld->%ld, "
 		                     "jumpto_l4: %ld->%ld, jumpto_l5: %ld->%ld, "
 		                     "break: %ld->%ld, continue: %ld->%ld",
-			             (long) pc_jumpto_l2, (long) pc_l2, (long) pc_jumpto_l3, (long) pc_l3,
-			             (long) pc_jumpto_l4, (long) pc_l4, (long) pc_jumpto_l5, (long) pc_l5,
-		                     (long) (pc_label_site + 1), (long) pc_l5, (long) (pc_label_site + 2), (long) pc_l4));
+		                     (long) pc_jumpto_l2,
+		                     (long) pc_l2,
+		                     (long) pc_jumpto_l3,
+		                     (long) pc_l3,
+		                     (long) pc_jumpto_l4,
+		                     (long) pc_l4,
+		                     (long) pc_jumpto_l5,
+		                     (long) pc_l5,
+		                     (long) (pc_label_site + 1),
+		                     (long) pc_l5,
+		                     (long) (pc_label_site + 2),
+		                     (long) pc_l4));
 
 		duk__patch_jump(comp_ctx, pc_jumpto_l2, pc_l2);
 		duk__patch_jump(comp_ctx, pc_jumpto_l3, pc_l3);
 		duk__patch_jump(comp_ctx, pc_jumpto_l4, pc_l4);
 		duk__patch_jump(comp_ctx, pc_jumpto_l5, pc_l5);
-		duk__patch_jump(comp_ctx, pc_label_site + 1, pc_l5);  /* break jump */
-		duk__patch_jump(comp_ctx, pc_label_site + 2, pc_l4);  /* continue jump */
+		duk__patch_jump(comp_ctx, pc_label_site + 1, pc_l5); /* break jump */
+		duk__patch_jump(comp_ctx, pc_label_site + 2, pc_l4); /* continue jump */
 	}
 	goto finished;
 
- finished:
+finished:
 	DUK_DDD(DUK_DDDPRINT("end parsing a for/for-in statement"));
 	return;
 
- syntax_error:
+syntax_error:
 	DUK_ERROR_SYNTAX(thr, DUK_STR_INVALID_FOR);
 	DUK_WO_NORETURN(return;);
 }
@@ -70446,12 +74618,12 @@ DUK_LOCAL void duk__parse_for_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res,
 DUK_LOCAL void duk__parse_switch_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_int_t pc_label_site) {
 	duk_hthread *thr = comp_ctx->thr;
 	duk_regconst_t temp_at_loop;
-	duk_regconst_t rc_switch;    /* reg/const for switch value */
-	duk_regconst_t rc_case;      /* reg/const for case value */
-	duk_regconst_t reg_temp;     /* general temp register */
+	duk_regconst_t rc_switch; /* reg/const for switch value */
+	duk_regconst_t rc_case; /* reg/const for case value */
+	duk_regconst_t reg_temp; /* general temp register */
 	duk_int_t pc_prevcase = -1;
 	duk_int_t pc_prevstmt = -1;
-	duk_int_t pc_default = -1;   /* -1 == not set, -2 == pending (next statement list) */
+	duk_int_t pc_default = -1; /* -1 == not set, -2 == pending (next statement list) */
 
 	/* Note: negative pc values are ignored when patching jumps, so no explicit checks needed */
 
@@ -70482,7 +74654,7 @@ DUK_LOCAL void duk__parse_switch_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 	duk__advance(comp_ctx);
 	duk__advance_expect(comp_ctx, DUK_TOK_LPAREN);
 	rc_switch = duk__exprtop_toregconst(comp_ctx, res, DUK__BP_FOR_EXPR /*rbp_flags*/);
-	duk__advance_expect(comp_ctx, DUK_TOK_RPAREN);  /* RegExp mode does not matter. */
+	duk__advance_expect(comp_ctx, DUK_TOK_RPAREN); /* RegExp mode does not matter. */
 	duk__advance_expect(comp_ctx, DUK_TOK_LCURLY);
 
 	DUK_DDD(DUK_DDDPRINT("switch value in register %ld", (long) rc_switch));
@@ -70512,24 +74684,20 @@ DUK_LOCAL void duk__parse_switch_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 			 *  because it may be a constant.
 			 */
 
-			duk__patch_jump_here(comp_ctx, pc_prevcase);  /* chain jumps for case
-			                                               * evaluation and checking
-			                                               */
+			duk__patch_jump_here(comp_ctx, pc_prevcase); /* chain jumps for case
+			                                              * evaluation and checking
+			                                              */
 
 			duk__advance(comp_ctx);
 			rc_case = duk__exprtop_toregconst(comp_ctx, res, DUK__BP_FOR_EXPR /*rbp_flags*/);
 			duk__advance_expect(comp_ctx, DUK_TOK_COLON);
 
 			reg_temp = DUK__ALLOCTEMP(comp_ctx);
-			duk__emit_a_b_c(comp_ctx,
-			                DUK_OP_SEQ | DUK__EMIT_FLAG_BC_REGCONST,
-			                reg_temp,
-			                rc_switch,
-			                rc_case);
+			duk__emit_a_b_c(comp_ctx, DUK_OP_SEQ | DUK__EMIT_FLAG_BC_REGCONST, reg_temp, rc_switch, rc_case);
 			duk__emit_if_true_skip(comp_ctx, reg_temp);
 
 			/* jump to next case clause */
-			pc_prevcase = duk__emit_jump_empty(comp_ctx);  /* no match, next case */
+			pc_prevcase = duk__emit_jump_empty(comp_ctx); /* no match, next case */
 
 			/* statements go here (if any) on next loop */
 		} else if (comp_ctx->curr_token.t == DUK_TOK_DEFAULT) {
@@ -70578,14 +74746,13 @@ DUK_LOCAL void duk__parse_switch_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 		 * they participate in 'fall-through' behavior even if the
 		 * default clause is in the middle.
 		 */
-		duk__patch_jump_here(comp_ctx, pc_prevstmt);  /* chain jumps for 'fall-through'
-		                                               * after a case matches.
-		                                               */
+		duk__patch_jump_here(comp_ctx, pc_prevstmt); /* chain jumps for 'fall-through'
+		                                              * after a case matches.
+		                                              */
 
 		for (;;) {
 			tok = comp_ctx->curr_token.t;
-			if (tok == DUK_TOK_CASE || tok == DUK_TOK_DEFAULT ||
-			    tok == DUK_TOK_RCURLY) {
+			if (tok == DUK_TOK_CASE || tok == DUK_TOK_DEFAULT || tok == DUK_TOK_RCURLY) {
 				break;
 			}
 			num_stmts++;
@@ -70608,7 +74775,7 @@ DUK_LOCAL void duk__parse_switch_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 
 	DUK_ASSERT(comp_ctx->curr_token.t == DUK_TOK_RCURLY);
 	comp_ctx->curr_func.allow_regexp_in_adv = 1;
-	duk__advance(comp_ctx);  /* Allow RegExp as part of next stmt. */
+	duk__advance(comp_ctx); /* Allow RegExp as part of next stmt. */
 
 	/* default case control flow patchup; note that if pc_prevcase < 0
 	 * (i.e. no case clauses), control enters default case automatically.
@@ -70629,7 +74796,7 @@ DUK_LOCAL void duk__parse_switch_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 	duk__patch_jump_here(comp_ctx, pc_prevstmt);
 
 	/* continue jump not patched, an INVALID opcode remains there */
-	duk__patch_jump_here(comp_ctx, pc_label_site + 1);  /* break jump */
+	duk__patch_jump_here(comp_ctx, pc_label_site + 1); /* break jump */
 
 	/* Note: 'fast' breaks will jump to pc_label_site + 1, which will
 	 * then jump here.  The double jump will be eliminated by a
@@ -70639,7 +74806,7 @@ DUK_LOCAL void duk__parse_switch_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 
 	return;
 
- syntax_error:
+syntax_error:
 	DUK_ERROR_SYNTAX(thr, DUK_STR_INVALID_SWITCH);
 	DUK_WO_NORETURN(return;);
 }
@@ -70653,16 +74820,16 @@ DUK_LOCAL void duk__parse_if_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 
 	temp_reset = DUK__GETTEMP(comp_ctx);
 
-	duk__advance(comp_ctx);  /* eat 'if' */
+	duk__advance(comp_ctx); /* eat 'if' */
 	duk__advance_expect(comp_ctx, DUK_TOK_LPAREN);
 
 	rc_cond = duk__exprtop_toregconst(comp_ctx, res, DUK__BP_FOR_EXPR /*rbp_flags*/);
 	duk__emit_if_true_skip(comp_ctx, rc_cond);
-	pc_jump_false = duk__emit_jump_empty(comp_ctx);  /* jump to end or else part */
+	pc_jump_false = duk__emit_jump_empty(comp_ctx); /* jump to end or else part */
 	DUK__SETTEMP(comp_ctx, temp_reset);
 
 	comp_ctx->curr_func.allow_regexp_in_adv = 1;
-	duk__advance_expect(comp_ctx, DUK_TOK_RPAREN);  /* Allow RegExp as part of next stmt. */
+	duk__advance_expect(comp_ctx, DUK_TOK_RPAREN); /* Allow RegExp as part of next stmt. */
 
 	duk__parse_stmt(comp_ctx, res, 0 /*allow_source_elem*/);
 
@@ -70677,7 +74844,7 @@ DUK_LOCAL void duk__parse_if_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 
 		duk__advance(comp_ctx);
 
-		pc_jump_end = duk__emit_jump_empty(comp_ctx);  /* jump from true part to end */
+		pc_jump_end = duk__emit_jump_empty(comp_ctx); /* jump from true part to end */
 		duk__patch_jump_here(comp_ctx, pc_jump_false);
 
 		duk__parse_stmt(comp_ctx, res, 0 /*allow_source_elem*/);
@@ -70698,11 +74865,11 @@ DUK_LOCAL void duk__parse_do_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, d
 
 	DUK_DDD(DUK_DDDPRINT("begin parsing do statement"));
 
-	duk__advance(comp_ctx);  /* Eat 'do'; allow RegExp as part of next stmt. */
+	duk__advance(comp_ctx); /* Eat 'do'; allow RegExp as part of next stmt. */
 
 	pc_start = duk__get_current_pc(comp_ctx);
 	duk__parse_stmt(comp_ctx, res, 0 /*allow_source_elem*/);
-	duk__patch_jump_here(comp_ctx, pc_label_site + 2);  /* continue jump */
+	duk__patch_jump_here(comp_ctx, pc_label_site + 2); /* continue jump */
 
 	duk__advance_expect(comp_ctx, DUK_TOK_WHILE);
 	duk__advance_expect(comp_ctx, DUK_TOK_LPAREN);
@@ -70712,10 +74879,10 @@ DUK_LOCAL void duk__parse_do_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, d
 	duk__emit_jump(comp_ctx, pc_start);
 	/* no need to reset temps, as we're finished emitting code */
 
-	comp_ctx->curr_func.allow_regexp_in_adv = 1;  /* Allow RegExp as part of next stmt. */
+	comp_ctx->curr_func.allow_regexp_in_adv = 1; /* Allow RegExp as part of next stmt. */
 	duk__advance_expect(comp_ctx, DUK_TOK_RPAREN);
 
-	duk__patch_jump_here(comp_ctx, pc_label_site + 1);  /* break jump */
+	duk__patch_jump_here(comp_ctx, pc_label_site + 1); /* break jump */
 
 	DUK_DDD(DUK_DDDPRINT("end parsing do statement"));
 }
@@ -70730,12 +74897,12 @@ DUK_LOCAL void duk__parse_while_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res
 
 	temp_reset = DUK__GETTEMP(comp_ctx);
 
-	duk__advance(comp_ctx);  /* eat 'while' */
+	duk__advance(comp_ctx); /* eat 'while' */
 
 	duk__advance_expect(comp_ctx, DUK_TOK_LPAREN);
 
 	pc_start = duk__get_current_pc(comp_ctx);
-	duk__patch_jump_here(comp_ctx, pc_label_site + 2);  /* continue jump */
+	duk__patch_jump_here(comp_ctx, pc_label_site + 2); /* continue jump */
 
 	rc_cond = duk__exprtop_toregconst(comp_ctx, res, DUK__BP_FOR_EXPR /*rbp_flags*/);
 	duk__emit_if_true_skip(comp_ctx, rc_cond);
@@ -70743,13 +74910,13 @@ DUK_LOCAL void duk__parse_while_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res
 	DUK__SETTEMP(comp_ctx, temp_reset);
 
 	comp_ctx->curr_func.allow_regexp_in_adv = 1;
-	duk__advance_expect(comp_ctx, DUK_TOK_RPAREN);  /* Allow RegExp as part of next stmt. */
+	duk__advance_expect(comp_ctx, DUK_TOK_RPAREN); /* Allow RegExp as part of next stmt. */
 
 	duk__parse_stmt(comp_ctx, res, 0 /*allow_source_elem*/);
 	duk__emit_jump(comp_ctx, pc_start);
 
 	duk__patch_jump_here(comp_ctx, pc_jump_false);
-	duk__patch_jump_here(comp_ctx, pc_label_site + 1);  /* break jump */
+	duk__patch_jump_here(comp_ctx, pc_label_site + 1); /* break jump */
 
 	DUK_DDD(DUK_DDDPRINT("end parsing while statement"));
 }
@@ -70759,23 +74926,35 @@ DUK_LOCAL void duk__parse_break_or_continue_stmt(duk_compiler_ctx *comp_ctx, duk
 	duk_bool_t is_break = (comp_ctx->curr_token.t == DUK_TOK_BREAK);
 	duk_int_t label_id;
 	duk_int_t label_catch_depth;
-	duk_int_t label_pc;  /* points to LABEL; pc+1 = jump site for break; pc+2 = jump site for continue */
+	duk_int_t label_pc; /* points to LABEL; pc+1 = jump site for break; pc+2 = jump site for continue */
 	duk_bool_t label_is_closest;
 
 	DUK_UNREF(res);
 
-	duk__advance(comp_ctx);  /* eat 'break' or 'continue' */
+	duk__advance(comp_ctx); /* eat 'break' or 'continue' */
 
-	if (comp_ctx->curr_token.t == DUK_TOK_SEMICOLON ||  /* explicit semi follows */
-	    comp_ctx->curr_token.lineterm ||                /* automatic semi will be inserted */
-	    comp_ctx->curr_token.allow_auto_semi) {         /* automatic semi will be inserted */
+	if (comp_ctx->curr_token.t == DUK_TOK_SEMICOLON || /* explicit semi follows */
+	    comp_ctx->curr_token.lineterm || /* automatic semi will be inserted */
+	    comp_ctx->curr_token.allow_auto_semi) { /* automatic semi will be inserted */
 		/* break/continue without label */
 
-		duk__lookup_active_label(comp_ctx, DUK_HTHREAD_STRING_EMPTY_STRING(thr), is_break, &label_id, &label_catch_depth, &label_pc, &label_is_closest);
+		duk__lookup_active_label(comp_ctx,
+		                         DUK_HTHREAD_STRING_EMPTY_STRING(thr),
+		                         is_break,
+		                         &label_id,
+		                         &label_catch_depth,
+		                         &label_pc,
+		                         &label_is_closest);
 	} else if (comp_ctx->curr_token.t == DUK_TOK_IDENTIFIER) {
 		/* break/continue with label (label cannot be a reserved word, production is 'Identifier' */
 		DUK_ASSERT(comp_ctx->curr_token.str1 != NULL);
-		duk__lookup_active_label(comp_ctx, comp_ctx->curr_token.str1, is_break, &label_id, &label_catch_depth, &label_pc, &label_is_closest);
+		duk__lookup_active_label(comp_ctx,
+		                         comp_ctx->curr_token.str1,
+		                         is_break,
+		                         &label_id,
+		                         &label_catch_depth,
+		                         &label_pc,
+		                         &label_is_closest);
 		duk__advance(comp_ctx);
 	} else {
 		DUK_ERROR_SYNTAX(thr, DUK_STR_INVALID_BREAK_CONT_LABEL);
@@ -70788,25 +74967,28 @@ DUK_LOCAL void duk__parse_break_or_continue_stmt(duk_compiler_ctx *comp_ctx, duk
 	 * The peephole optimizer will optimize the jump to a direct one.
 	 */
 
-	if (label_catch_depth == comp_ctx->curr_func.catch_depth &&
-	    label_is_closest) {
+	if (label_catch_depth == comp_ctx->curr_func.catch_depth && label_is_closest) {
 		DUK_DDD(DUK_DDDPRINT("break/continue: is_break=%ld, label_id=%ld, label_is_closest=%ld, "
 		                     "label_catch_depth=%ld, catch_depth=%ld "
 		                     "-> use fast variant (direct jump)",
-		                     (long) is_break, (long) label_id, (long) label_is_closest,
-		                     (long) label_catch_depth, (long) comp_ctx->curr_func.catch_depth));
+		                     (long) is_break,
+		                     (long) label_id,
+		                     (long) label_is_closest,
+		                     (long) label_catch_depth,
+		                     (long) comp_ctx->curr_func.catch_depth));
 
 		duk__emit_jump(comp_ctx, label_pc + (is_break ? 1 : 2));
 	} else {
 		DUK_DDD(DUK_DDDPRINT("break/continue: is_break=%ld, label_id=%ld, label_is_closest=%ld, "
 		                     "label_catch_depth=%ld, catch_depth=%ld "
 		                     "-> use slow variant (longjmp)",
-		                     (long) is_break, (long) label_id, (long) label_is_closest,
-		                     (long) label_catch_depth, (long) comp_ctx->curr_func.catch_depth));
+		                     (long) is_break,
+		                     (long) label_id,
+		                     (long) label_is_closest,
+		                     (long) label_catch_depth,
+		                     (long) comp_ctx->curr_func.catch_depth));
 
-		duk__emit_bc(comp_ctx,
-		             is_break ? DUK_OP_BREAK : DUK_OP_CONTINUE,
-		             (duk_regconst_t) label_id);
+		duk__emit_bc(comp_ctx, is_break ? DUK_OP_BREAK : DUK_OP_CONTINUE, (duk_regconst_t) label_id);
 	}
 }
 
@@ -70814,7 +74996,7 @@ DUK_LOCAL void duk__parse_return_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 	duk_hthread *thr = comp_ctx->thr;
 	duk_regconst_t rc_val;
 
-	duk__advance(comp_ctx);  /* eat 'return' */
+	duk__advance(comp_ctx); /* eat 'return' */
 
 	/* A 'return' statement is only allowed inside an actual function body,
 	 * not as part of eval or global code.
@@ -70824,9 +75006,9 @@ DUK_LOCAL void duk__parse_return_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 		DUK_WO_NORETURN(return;);
 	}
 
-	if (comp_ctx->curr_token.t == DUK_TOK_SEMICOLON ||  /* explicit semi follows */
-	    comp_ctx->curr_token.lineterm ||                /* automatic semi will be inserted */
-	    comp_ctx->curr_token.allow_auto_semi) {         /* automatic semi will be inserted */
+	if (comp_ctx->curr_token.t == DUK_TOK_SEMICOLON || /* explicit semi follows */
+	    comp_ctx->curr_token.lineterm || /* automatic semi will be inserted */
+	    comp_ctx->curr_token.allow_auto_semi) { /* automatic semi will be inserted */
 		DUK_DDD(DUK_DDDPRINT("empty return value -> undefined"));
 		duk__emit_op_only(comp_ctx, DUK_OP_RETUNDEF);
 	} else {
@@ -70878,8 +75060,8 @@ DUK_LOCAL void duk__parse_return_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 		 */
 
 #if defined(DUK_USE_TAILCALL)
-		if (comp_ctx->curr_func.catch_depth == 0 &&   /* no catchers */
-		    pc_after_expr > pc_before_expr) {         /* at least one opcode emitted */
+		if (comp_ctx->curr_func.catch_depth == 0 && /* no catchers */
+		    pc_after_expr > pc_before_expr) { /* at least one opcode emitted */
 			duk_compiler_instr *instr;
 			duk_instr_t ins;
 			duk_small_uint_t op;
@@ -70889,8 +75071,7 @@ DUK_LOCAL void duk__parse_return_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 
 			ins = instr->ins;
 			op = (duk_small_uint_t) DUK_DEC_OP(ins);
-			if ((op & ~0x0fU) == DUK_OP_CALL0 &&
-			    DUK__ISREG_TEMP(comp_ctx, rc_val) /* see above */) {
+			if ((op & ~0x0fU) == DUK_OP_CALL0 && DUK__ISREG_TEMP(comp_ctx, rc_val) /* see above */) {
 				DUK_DDD(DUK_DDDPRINT("return statement detected a tail call opportunity: "
 				                     "catch depth is 0, duk__exprtop() emitted >= 1 instructions, "
 				                     "and last instruction is a CALL "
@@ -70899,7 +75080,7 @@ DUK_LOCAL void duk__parse_return_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 				instr->ins = ins;
 			}
 		}
-#endif  /* DUK_USE_TAILCALL */
+#endif /* DUK_USE_TAILCALL */
 
 		if (DUK__ISREG(rc_val)) {
 			duk__emit_bc(comp_ctx, DUK_OP_RETREG, rc_val);
@@ -70917,7 +75098,7 @@ DUK_LOCAL void duk__parse_return_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *re
 DUK_LOCAL void duk__parse_throw_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 	duk_regconst_t reg_val;
 
-	duk__advance(comp_ctx);  /* eat 'throw' */
+	duk__advance(comp_ctx); /* eat 'throw' */
 
 	/* Unlike break/continue, throw statement does not allow an empty value. */
 
@@ -70927,14 +75108,12 @@ DUK_LOCAL void duk__parse_throw_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res
 	}
 
 	reg_val = duk__exprtop_toreg(comp_ctx, res, DUK__BP_FOR_EXPR /*rbp_flags*/);
-	duk__emit_bc(comp_ctx,
-	             DUK_OP_THROW,
-	             reg_val);
+	duk__emit_bc(comp_ctx, DUK_OP_THROW, reg_val);
 }
 
 DUK_LOCAL void duk__parse_try_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 	duk_hthread *thr = comp_ctx->thr;
-	duk_regconst_t reg_catch;      /* reg_catch+0 and reg_catch+1 are reserved for TRYCATCH */
+	duk_regconst_t reg_catch; /* reg_catch+0 and reg_catch+1 are reserved for TRYCATCH */
 	duk_regconst_t rc_varname = 0;
 	duk_small_uint_t trycatch_flags = 0;
 	duk_int_t pc_ldconst = -1;
@@ -70961,7 +75140,7 @@ DUK_LOCAL void duk__parse_try_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res)
 
 	comp_ctx->curr_func.catch_depth++;
 
-	duk__advance(comp_ctx);  /* eat 'try' */
+	duk__advance(comp_ctx); /* eat 'try' */
 
 	reg_catch = DUK__ALLOCTEMPS(comp_ctx, 2);
 
@@ -70974,9 +75153,9 @@ DUK_LOCAL void duk__parse_try_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res)
 	duk__emit_a_bc(comp_ctx, DUK_OP_LDCONST, reg_catch, 0 /*patched later*/);
 
 	pc_trycatch = duk__get_current_pc(comp_ctx);
-	duk__emit_invalid(comp_ctx);  /* TRYCATCH, cannot emit now (not enough info) */
-	duk__emit_invalid(comp_ctx);  /* jump for 'catch' case */
-	duk__emit_invalid(comp_ctx);  /* jump for 'finally' case or end (if no finally) */
+	duk__emit_invalid(comp_ctx); /* TRYCATCH, cannot emit now (not enough info) */
+	duk__emit_invalid(comp_ctx); /* jump for 'catch' case */
+	duk__emit_invalid(comp_ctx); /* jump for 'finally' case or end (if no finally) */
 
 	/* try part */
 	duk__advance_expect(comp_ctx, DUK_TOK_LCURLY);
@@ -71005,7 +75184,7 @@ DUK_LOCAL void duk__parse_try_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res)
 		 */
 
 		duk_hstring *h_var;
-		duk_int_t varmap_value;  /* for storing/restoring the varmap binding for catch variable */
+		duk_int_t varmap_value; /* for storing/restoring the varmap binding for catch variable */
 
 		DUK_DDD(DUK_DDDPRINT("stack top at start of catch clause: %ld", (long) duk_get_top(thr)));
 
@@ -71023,19 +75202,17 @@ DUK_LOCAL void duk__parse_try_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res)
 		h_var = comp_ctx->curr_token.str1;
 		DUK_ASSERT(h_var != NULL);
 
-		duk_push_hstring(thr, h_var);  /* keep in on valstack, use borrowed ref below */
+		duk_push_hstring(thr, h_var); /* keep in on valstack, use borrowed ref below */
 
 		if (comp_ctx->curr_func.is_strict &&
-		    ((h_var == DUK_HTHREAD_STRING_EVAL(thr)) ||
-		     (h_var == DUK_HTHREAD_STRING_LC_ARGUMENTS(thr)))) {
+		    ((h_var == DUK_HTHREAD_STRING_EVAL(thr)) || (h_var == DUK_HTHREAD_STRING_LC_ARGUMENTS(thr)))) {
 			DUK_DDD(DUK_DDDPRINT("catch identifier 'eval' or 'arguments' in strict mode -> SyntaxError"));
 			goto syntax_error;
 		}
 
 		duk_dup_top(thr);
 		rc_varname = duk__getconst(comp_ctx);
-		DUK_DDD(DUK_DDDPRINT("catch clause, rc_varname=0x%08lx (%ld)",
-		                     (unsigned long) rc_varname, (long) rc_varname));
+		DUK_DDD(DUK_DDDPRINT("catch clause, rc_varname=0x%08lx (%ld)", (unsigned long) rc_varname, (long) rc_varname));
 
 		duk__advance(comp_ctx);
 		duk__advance_expect(comp_ctx, DUK_TOK_RPAREN);
@@ -71098,8 +75275,7 @@ DUK_LOCAL void duk__parse_try_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res)
 		DUK_DDD(DUK_DDDPRINT("varmap after restore catch clause: %!iT",
 		                     (duk_tval *) duk_get_tval(thr, comp_ctx->curr_func.varmap_idx)));
 
-		duk__emit_op_only(comp_ctx,
-		                  DUK_OP_ENDCATCH);
+		duk__emit_op_only(comp_ctx, DUK_OP_ENDCATCH);
 
 		/*
 		 *  XXX: for now, indicate that an expensive catch binding
@@ -71122,13 +75298,10 @@ DUK_LOCAL void duk__parse_try_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res)
 		duk__advance_expect(comp_ctx, DUK_TOK_LCURLY);
 		duk__parse_stmts(comp_ctx, 0 /*allow_source_elem*/, 0 /*expect_eof*/, 1 /*regexp_after*/);
 		/* the DUK_TOK_RCURLY is eaten by duk__parse_stmts() */
-		duk__emit_abc(comp_ctx,
-		              DUK_OP_ENDFIN,
-		              reg_catch);  /* rethrow */
+		duk__emit_abc(comp_ctx, DUK_OP_ENDFIN, reg_catch); /* rethrow */
 	}
 
-	if (!(trycatch_flags & DUK_BC_TRYCATCH_FLAG_HAVE_CATCH) &&
-	    !(trycatch_flags & DUK_BC_TRYCATCH_FLAG_HAVE_FINALLY)) {
+	if (!(trycatch_flags & DUK_BC_TRYCATCH_FLAG_HAVE_CATCH) && !(trycatch_flags & DUK_BC_TRYCATCH_FLAG_HAVE_FINALLY)) {
 		/* must have catch and/or finally */
 		goto syntax_error;
 	}
@@ -71138,12 +75311,7 @@ DUK_LOCAL void duk__parse_try_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res)
 	 * constant 0) the DUK__CONST_MARKER flag will be set in rc_varname.
 	 */
 
-	duk__patch_trycatch(comp_ctx,
-	                    pc_ldconst,
-	                    pc_trycatch,
-	                    reg_catch,
-	                    rc_varname,
-	                    trycatch_flags);
+	duk__patch_trycatch(comp_ctx, pc_ldconst, pc_trycatch, reg_catch, rc_varname, trycatch_flags);
 
 	if (trycatch_flags & DUK_BC_TRYCATCH_FLAG_HAVE_CATCH) {
 		DUK_ASSERT(pc_catch >= 0);
@@ -71161,7 +75329,7 @@ DUK_LOCAL void duk__parse_try_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res)
 	comp_ctx->curr_func.catch_depth--;
 	return;
 
- syntax_error:
+syntax_error:
 	DUK_ERROR_SYNTAX(thr, DUK_STR_INVALID_TRY);
 	DUK_WO_NORETURN(return;);
 }
@@ -71179,23 +75347,23 @@ DUK_LOCAL void duk__parse_with_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res)
 
 	comp_ctx->curr_func.catch_depth++;
 
-	duk__advance(comp_ctx);  /* eat 'with' */
+	duk__advance(comp_ctx); /* eat 'with' */
 
 	reg_catch = DUK__ALLOCTEMPS(comp_ctx, 2);
 
 	duk__advance_expect(comp_ctx, DUK_TOK_LPAREN);
 	duk__exprtop_toforcedreg(comp_ctx, res, DUK__BP_FOR_EXPR /*rbp_flags*/, reg_catch);
 	comp_ctx->curr_func.allow_regexp_in_adv = 1;
-	duk__advance_expect(comp_ctx, DUK_TOK_RPAREN);  /* Allow RegExp as part of next stmt. */
+	duk__advance_expect(comp_ctx, DUK_TOK_RPAREN); /* Allow RegExp as part of next stmt. */
 
 	pc_trycatch = duk__get_current_pc(comp_ctx);
 	trycatch_flags = DUK_BC_TRYCATCH_FLAG_WITH_BINDING;
 	duk__emit_a_bc(comp_ctx,
-	                DUK_OP_TRYCATCH | DUK__EMIT_FLAG_NO_SHUFFLE_A,
-	                (duk_regconst_t) trycatch_flags /*a*/,
-	                reg_catch /*bc*/);
-	duk__emit_invalid(comp_ctx);  /* catch jump */
-	duk__emit_invalid(comp_ctx);  /* finished jump */
+	               DUK_OP_TRYCATCH | DUK__EMIT_FLAG_NO_SHUFFLE_A,
+	               (duk_regconst_t) trycatch_flags /*a*/,
+	               reg_catch /*bc*/);
+	duk__emit_invalid(comp_ctx); /* catch jump */
+	duk__emit_invalid(comp_ctx); /* finished jump */
 
 	duk__parse_stmt(comp_ctx, res, 0 /*allow_source_elem*/);
 	duk__emit_op_only(comp_ctx, DUK_OP_ENDTRY);
@@ -71216,9 +75384,7 @@ DUK_LOCAL duk_int_t duk__stmt_label_site(duk_compiler_ctx *comp_ctx, duk_int_t l
 	label_id = comp_ctx->curr_func.label_next++;
 	DUK_DDD(DUK_DDDPRINT("allocated new label id for label site: %ld", (long) label_id));
 
-	duk__emit_bc(comp_ctx,
-	             DUK_OP_LABEL,
-	             (duk_regconst_t) label_id);
+	duk__emit_bc(comp_ctx, DUK_OP_LABEL, (duk_regconst_t) label_id);
 	duk__emit_invalid(comp_ctx);
 	duk__emit_invalid(comp_ctx);
 
@@ -71232,10 +75398,10 @@ DUK_LOCAL duk_int_t duk__stmt_label_site(duk_compiler_ctx *comp_ctx, duk_int_t l
  */
 DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_bool_t allow_source_elem) {
 	duk_hthread *thr = comp_ctx->thr;
-	duk_bool_t dir_prol_at_entry;    /* directive prologue status at entry */
+	duk_bool_t dir_prol_at_entry; /* directive prologue status at entry */
 	duk_regconst_t temp_at_entry;
 	duk_size_t labels_len_at_entry;
-	duk_int_t pc_at_entry;           /* assumed to also be PC of "LABEL" */
+	duk_int_t pc_at_entry; /* assumed to also be PC of "LABEL" */
 	duk_int_t stmt_id;
 	duk_small_uint_t stmt_flags = 0;
 	duk_int_t label_id = -1;
@@ -71254,8 +75420,11 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 
 	DUK_DDD(DUK_DDDPRINT("parsing a statement, stmt_id=%ld, temp_at_entry=%ld, labels_len_at_entry=%ld, "
 	                     "is_strict=%ld, in_directive_prologue=%ld, catch_depth=%ld",
-	                     (long) stmt_id, (long) temp_at_entry, (long) labels_len_at_entry,
-	                     (long) comp_ctx->curr_func.is_strict, (long) comp_ctx->curr_func.in_directive_prologue,
+	                     (long) stmt_id,
+	                     (long) temp_at_entry,
+	                     (long) labels_len_at_entry,
+	                     (long) comp_ctx->curr_func.is_strict,
+	                     (long) comp_ctx->curr_func.in_directive_prologue,
 	                     (long) comp_ctx->curr_func.catch_depth));
 
 	/* The directive prologue flag is cleared by default so that it is
@@ -71265,10 +75434,12 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 	 */
 	comp_ctx->curr_func.in_directive_prologue = 0;
 
- retry_parse:
+retry_parse:
 
 	DUK_DDD(DUK_DDDPRINT("try stmt parse, stmt_id=%ld, label_id=%ld, allow_source_elem=%ld, catch_depth=%ld",
-	                     (long) stmt_id, (long) label_id, (long) allow_source_elem,
+	                     (long) stmt_id,
+	                     (long) label_id,
+	                     (long) allow_source_elem,
 	                     (long) comp_ctx->curr_func.catch_depth));
 
 	/*
@@ -71277,15 +75448,11 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 	 */
 
 	tok = comp_ctx->curr_token.t;
-	if (tok == DUK_TOK_FOR || tok == DUK_TOK_DO || tok == DUK_TOK_WHILE ||
-	    tok == DUK_TOK_SWITCH) {
+	if (tok == DUK_TOK_FOR || tok == DUK_TOK_DO || tok == DUK_TOK_WHILE || tok == DUK_TOK_SWITCH) {
 		DUK_DDD(DUK_DDDPRINT("iteration/switch statement -> add empty label"));
 
 		label_id = duk__stmt_label_site(comp_ctx, label_id);
-		duk__add_label(comp_ctx,
-		               DUK_HTHREAD_STRING_EMPTY_STRING(thr),
-		               pc_at_entry /*pc_label*/,
-		               label_id);
+		duk__add_label(comp_ctx, DUK_HTHREAD_STRING_EMPTY_STRING(thr), pc_at_entry /*pc_label*/, label_id);
 	}
 
 	/*
@@ -71308,11 +75475,12 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 		 */
 		test_func_decl = allow_source_elem;
 #if defined(DUK_USE_NONSTD_FUNC_STMT)
-		/* Lenient: allow function declarations outside top level in
-		 * non-strict mode but reject them in strict mode.
+		/* Lenient: allow function declarations outside top level in both
+		 * strict and non-strict modes.  However, don't allow labelled
+		 * function declarations in strict mode.
 		 */
-		test_func_decl = test_func_decl || !comp_ctx->curr_func.is_strict;
-#endif  /* DUK_USE_NONSTD_FUNC_STMT */
+		test_func_decl = test_func_decl || !comp_ctx->curr_func.is_strict || label_id < 0;
+#endif /* DUK_USE_NONSTD_FUNC_STMT */
 		/* Strict: never allow function declarations outside top level. */
 		if (test_func_decl) {
 			/* FunctionDeclaration: not strictly a statement but handled as such.
@@ -71334,7 +75502,7 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 			top_before = duk_get_top(thr);
 #endif
 
-			duk__advance(comp_ctx);  /* eat 'function' */
+			duk__advance(comp_ctx); /* eat 'function' */
 			fnum = duk__parse_func_like_fnum(comp_ctx, DUK__FUNC_FLAG_DECL | DUK__FUNC_FLAG_PUSHNAME_PASS1);
 
 			/* The value stack convention here is a bit odd: the function
@@ -71348,7 +75516,8 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 				DUK_ASSERT(duk_get_top(thr) == top_before + 1);
 #endif
 				DUK_DDD(DUK_DDDPRINT("register function declaration %!T in pass 1, fnum %ld",
-				                     duk_get_tval(thr, -1), (long) fnum));
+				                     duk_get_tval(thr, -1),
+				                     (long) fnum));
 				n = (duk_uarridx_t) duk_get_length(thr, comp_ctx->curr_func.decls_idx);
 				/* funcname is at index -1 */
 				duk_put_prop_index(thr, comp_ctx->curr_func.decls_idx, n);
@@ -71375,7 +75544,7 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 		duk__parse_stmts(comp_ctx, 0 /*allow_source_elem*/, 0 /*expect_eof*/, 1 /*regexp_after*/);
 		/* the DUK_TOK_RCURLY is eaten by duk__parse_stmts() */
 		if (label_id >= 0) {
-			duk__patch_jump_here(comp_ctx, pc_at_entry + 1);  /* break jump */
+			duk__patch_jump_here(comp_ctx, pc_at_entry + 1); /* break jump */
 		}
 		stmt_flags = 0;
 		break;
@@ -71402,7 +75571,7 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 		DUK_DDD(DUK_DDDPRINT("if statement"));
 		duk__parse_if_stmt(comp_ctx, res);
 		if (label_id >= 0) {
-			duk__patch_jump_here(comp_ctx, pc_at_entry + 1);  /* break jump */
+			duk__patch_jump_here(comp_ctx, pc_at_entry + 1); /* break jump */
 		}
 		stmt_flags = 0;
 		break;
@@ -71419,19 +75588,15 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 		 */
 		DUK_DDD(DUK_DDDPRINT("do statement"));
 		DUK_ASSERT(label_id >= 0);
-		duk__update_label_flags(comp_ctx,
-		                        label_id,
-		                        DUK_LABEL_FLAG_ALLOW_BREAK | DUK_LABEL_FLAG_ALLOW_CONTINUE);
+		duk__update_label_flags(comp_ctx, label_id, DUK_LABEL_FLAG_ALLOW_BREAK | DUK_LABEL_FLAG_ALLOW_CONTINUE);
 		duk__parse_do_stmt(comp_ctx, res, pc_at_entry);
-		stmt_flags = DUK__HAS_TERM | DUK__ALLOW_AUTO_SEMI_ALWAYS;  /* DUK__ALLOW_AUTO_SEMI_ALWAYS workaround */
+		stmt_flags = DUK__HAS_TERM | DUK__ALLOW_AUTO_SEMI_ALWAYS; /* DUK__ALLOW_AUTO_SEMI_ALWAYS workaround */
 		break;
 	}
 	case DUK_TOK_WHILE: {
 		DUK_DDD(DUK_DDDPRINT("while statement"));
 		DUK_ASSERT(label_id >= 0);
-		duk__update_label_flags(comp_ctx,
-		                        label_id,
-		                        DUK_LABEL_FLAG_ALLOW_BREAK | DUK_LABEL_FLAG_ALLOW_CONTINUE);
+		duk__update_label_flags(comp_ctx, label_id, DUK_LABEL_FLAG_ALLOW_BREAK | DUK_LABEL_FLAG_ALLOW_CONTINUE);
 		duk__parse_while_stmt(comp_ctx, res, pc_at_entry);
 		stmt_flags = 0;
 		break;
@@ -71446,9 +75611,7 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 		 */
 		DUK_DDD(DUK_DDDPRINT("for/for-in statement"));
 		DUK_ASSERT(label_id >= 0);
-		duk__update_label_flags(comp_ctx,
-		                        label_id,
-		                        DUK_LABEL_FLAG_ALLOW_BREAK | DUK_LABEL_FLAG_ALLOW_CONTINUE);
+		duk__update_label_flags(comp_ctx, label_id, DUK_LABEL_FLAG_ALLOW_BREAK | DUK_LABEL_FLAG_ALLOW_CONTINUE);
 		duk__parse_for_stmt(comp_ctx, res, pc_at_entry);
 		stmt_flags = 0;
 		break;
@@ -71471,7 +75634,7 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 		comp_ctx->curr_func.with_depth++;
 		duk__parse_with_stmt(comp_ctx, res);
 		if (label_id >= 0) {
-			duk__patch_jump_here(comp_ctx, pc_at_entry + 1);  /* break jump */
+			duk__patch_jump_here(comp_ctx, pc_at_entry + 1); /* break jump */
 		}
 		comp_ctx->curr_func.with_depth--;
 		stmt_flags = 0;
@@ -71484,9 +75647,7 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 		 */
 		DUK_DDD(DUK_DDDPRINT("switch statement"));
 		DUK_ASSERT(label_id >= 0);
-		duk__update_label_flags(comp_ctx,
-		                        label_id,
-		                        DUK_LABEL_FLAG_ALLOW_BREAK);  /* don't allow continue */
+		duk__update_label_flags(comp_ctx, label_id, DUK_LABEL_FLAG_ALLOW_BREAK); /* don't allow continue */
 		duk__parse_switch_stmt(comp_ctx, res, pc_at_entry);
 		stmt_flags = 0;
 		break;
@@ -71553,12 +75714,10 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 		DUK_DDD(DUK_DDDPRINT("expression statement"));
 		duk__exprtop(comp_ctx, res, DUK__BP_FOR_EXPR /*rbp_flags*/);
 
-		single_token = (comp_ctx->curr_func.nud_count == 1 &&  /* one token */
-		                comp_ctx->curr_func.led_count == 0);   /* no operators */
+		single_token = (comp_ctx->curr_func.nud_count == 1 && /* one token */
+		                comp_ctx->curr_func.led_count == 0); /* no operators */
 
-		if (single_token &&
-		    comp_ctx->prev_token.t == DUK_TOK_IDENTIFIER &&
-		    comp_ctx->curr_token.t == DUK_TOK_COLON) {
+		if (single_token && comp_ctx->prev_token.t == DUK_TOK_IDENTIFIER && comp_ctx->curr_token.t == DUK_TOK_COLON) {
 			/*
 			 *  Detected label
 			 */
@@ -71572,17 +75731,13 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 			h_lab = comp_ctx->prev_token.str1;
 			DUK_ASSERT(h_lab != NULL);
 
-			DUK_DDD(DUK_DDDPRINT("explicit label site for label '%!O'",
-			                     (duk_heaphdr *) h_lab));
+			DUK_DDD(DUK_DDDPRINT("explicit label site for label '%!O'", (duk_heaphdr *) h_lab));
 
-			duk__advance(comp_ctx);  /* eat colon */
+			duk__advance(comp_ctx); /* eat colon */
 
 			label_id = duk__stmt_label_site(comp_ctx, label_id);
 
-			duk__add_label(comp_ctx,
-			               h_lab,
-			               pc_at_entry /*pc_label*/,
-			               label_id);
+			duk__add_label(comp_ctx, h_lab, pc_at_entry /*pc_label*/, label_id);
 
 			/* a statement following a label cannot be a source element
 			 * (a function declaration).
@@ -71595,8 +75750,8 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 
 		stmt_flags = 0;
 
-		if (dir_prol_at_entry &&                           /* still in prologue */
-		    single_token &&                                /* single string token */
+		if (dir_prol_at_entry && /* still in prologue */
+		    single_token && /* single string token */
 		    comp_ctx->prev_token.t == DUK_TOK_STRING) {
 			/*
 			 *  Detected a directive
@@ -71629,7 +75784,8 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 				    DUK_STRCMP((const char *) DUK_HSTRING_GET_DATA(h_dir), "use strict") == 0) {
 #if defined(DUK_USE_STRICT_DECL)
 					DUK_DDD(DUK_DDDPRINT("use strict directive detected: strict flag %ld -> %ld",
-					                     (long) comp_ctx->curr_func.is_strict, (long) 1));
+					                     (long) comp_ctx->curr_func.is_strict,
+					                     (long) 1));
 					comp_ctx->curr_func.is_strict = 1;
 #else
 					DUK_DDD(DUK_DDDPRINT("use strict detected but strict declarations disabled, ignoring"));
@@ -71637,21 +75793,23 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 				} else if (DUK_HSTRING_GET_BYTELEN(h_dir) == 14 &&
 				           DUK_STRCMP((const char *) DUK_HSTRING_GET_DATA(h_dir), "use duk notail") == 0) {
 					DUK_DDD(DUK_DDDPRINT("use duk notail directive detected: notail flag %ld -> %ld",
-					                     (long) comp_ctx->curr_func.is_notail, (long) 1));
+					                     (long) comp_ctx->curr_func.is_notail,
+					                     (long) 1));
 					comp_ctx->curr_func.is_notail = 1;
 				} else {
 					DUK_DD(DUK_DDPRINT("unknown directive: '%!O', ignoring but not terminating "
-					                   "directive prologue", (duk_hobject *) h_dir));
+					                   "directive prologue",
+					                   (duk_hobject *) h_dir));
 				}
 			}
 		} else {
 			DUK_DDD(DUK_DDDPRINT("non-directive expression statement or no longer in prologue; "
 			                     "prologue terminated if still active"));
-                }
+		}
 
 		stmt_flags |= DUK__HAS_VAL | DUK__HAS_TERM;
 	}
-	}  /* end switch (tok) */
+	} /* end switch (tok) */
 
 	/*
 	 *  Statement value handling.
@@ -71727,9 +75885,7 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 	 */
 
 	if (label_id >= 0) {
-		duk__emit_bc(comp_ctx,
-		             DUK_OP_ENDLABEL,
-		             (duk_regconst_t) label_id);
+		duk__emit_bc(comp_ctx, DUK_OP_ENDLABEL, (duk_regconst_t) label_id);
 	}
 
 	DUK__SETTEMP(comp_ctx, temp_at_entry);
@@ -71752,7 +75908,10 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
  *  (EOF or closing brace).
  */
 
-DUK_LOCAL void duk__parse_stmts(duk_compiler_ctx *comp_ctx, duk_bool_t allow_source_elem, duk_bool_t expect_eof, duk_bool_t regexp_after) {
+DUK_LOCAL void duk__parse_stmts(duk_compiler_ctx *comp_ctx,
+                                duk_bool_t allow_source_elem,
+                                duk_bool_t expect_eof,
+                                duk_bool_t regexp_after) {
 	duk_hthread *thr = comp_ctx->thr;
 	duk_ivalue res_alloc;
 	duk_ivalue *res = &res_alloc;
@@ -71918,7 +76077,7 @@ DUK_LOCAL void duk__init_varmap_and_prologue_for_pass2(duk_compiler_ctx *comp_ct
 
 		/* only functions can have arguments */
 		DUK_ASSERT(comp_ctx->curr_func.is_function);
-		duk_push_uarridx(thr, i);  /* -> [ ... name index ] */
+		duk_push_uarridx(thr, i); /* -> [ ... name index ] */
 		duk_put_prop(thr, comp_ctx->curr_func.varmap_idx); /* -> [ ... ] */
 
 		/* no code needs to be emitted, the regs already have values */
@@ -71954,16 +76113,15 @@ DUK_LOCAL void duk__init_varmap_and_prologue_for_pass2(duk_compiler_ctx *comp_ct
 	 */
 
 	num_decls = (duk_uarridx_t) duk_get_length(thr, comp_ctx->curr_func.decls_idx);
-	DUK_DDD(DUK_DDDPRINT("num_decls=%ld -> %!T",
-	                     (long) num_decls,
-	                     (duk_tval *) duk_get_tval(thr, comp_ctx->curr_func.decls_idx)));
+	DUK_DDD(
+	    DUK_DDDPRINT("num_decls=%ld -> %!T", (long) num_decls, (duk_tval *) duk_get_tval(thr, comp_ctx->curr_func.decls_idx)));
 	for (i = 0; i < num_decls; i += 2) {
 		duk_int_t decl_type;
 		duk_int_t fnum;
 
-		duk_get_prop_index(thr, comp_ctx->curr_func.decls_idx, i + 1);  /* decl type */
+		duk_get_prop_index(thr, comp_ctx->curr_func.decls_idx, i + 1); /* decl type */
 		decl_type = duk_to_int(thr, -1);
-		fnum = decl_type >> 8;  /* XXX: macros */
+		fnum = decl_type >> 8; /* XXX: macros */
 		decl_type = decl_type & 0xff;
 		duk_pop(thr);
 
@@ -71971,7 +76129,7 @@ DUK_LOCAL void duk__init_varmap_and_prologue_for_pass2(duk_compiler_ctx *comp_ct
 			continue;
 		}
 
-		duk_get_prop_index(thr, comp_ctx->curr_func.decls_idx, i);  /* decl name */
+		duk_get_prop_index(thr, comp_ctx->curr_func.decls_idx, i); /* decl name */
 
 		/* XXX: spilling */
 		if (comp_ctx->curr_func.is_function) {
@@ -71981,18 +76139,12 @@ DUK_LOCAL void duk__init_varmap_and_prologue_for_pass2(duk_compiler_ctx *comp_ct
 				/* shadowed; update value */
 				duk_dup_top(thr);
 				duk_get_prop(thr, comp_ctx->curr_func.varmap_idx);
-				reg_bind = duk_to_int(thr, -1);  /* [ ... name reg_bind ] */
-				duk__emit_a_bc(comp_ctx,
-				               DUK_OP_CLOSURE,
-				               reg_bind,
-				               (duk_regconst_t) fnum);
+				reg_bind = duk_to_int(thr, -1); /* [ ... name reg_bind ] */
+				duk__emit_a_bc(comp_ctx, DUK_OP_CLOSURE, reg_bind, (duk_regconst_t) fnum);
 			} else {
 				/* function: always register bound */
 				reg_bind = DUK__ALLOCTEMP(comp_ctx);
-				duk__emit_a_bc(comp_ctx,
-				               DUK_OP_CLOSURE,
-				               reg_bind,
-				               (duk_regconst_t) fnum);
+				duk__emit_a_bc(comp_ctx, DUK_OP_CLOSURE, reg_bind, (duk_regconst_t) fnum);
 				duk_push_int(thr, (duk_int_t) reg_bind);
 			}
 		} else {
@@ -72009,14 +76161,9 @@ DUK_LOCAL void duk__init_varmap_and_prologue_for_pass2(duk_compiler_ctx *comp_ct
 			rc_name = duk__getconst(comp_ctx);
 			duk_push_null(thr);
 
-			duk__emit_a_bc(comp_ctx,
-			               DUK_OP_CLOSURE,
-			               reg_temp,
-			               (duk_regconst_t) fnum);
+			duk__emit_a_bc(comp_ctx, DUK_OP_CLOSURE, reg_temp, (duk_regconst_t) fnum);
 
-			declvar_flags = DUK_PROPDESC_FLAG_WRITABLE |
-			                DUK_PROPDESC_FLAG_ENUMERABLE |
-			                DUK_BC_DECLVAR_FLAG_FUNC_DECL;
+			declvar_flags = DUK_PROPDESC_FLAG_WRITABLE | DUK_PROPDESC_FLAG_ENUMERABLE | DUK_BC_DECLVAR_FLAG_FUNC_DECL;
 
 			if (configurable_bindings) {
 				declvar_flags |= DUK_PROPDESC_FLAG_CONFIGURABLE;
@@ -72028,7 +76175,7 @@ DUK_LOCAL void duk__init_varmap_and_prologue_for_pass2(duk_compiler_ctx *comp_ct
 			                rc_name /*name*/,
 			                reg_temp /*value*/);
 
-			DUK__SETTEMP(comp_ctx, reg_temp);  /* forget temp */
+			DUK__SETTEMP(comp_ctx, reg_temp); /* forget temp */
 		}
 
 		DUK_DDD(DUK_DDDPRINT("function declaration to varmap: %!T -> %!T",
@@ -72038,7 +76185,7 @@ DUK_LOCAL void duk__init_varmap_and_prologue_for_pass2(duk_compiler_ctx *comp_ct
 #if defined(DUK_USE_FASTINT)
 		DUK_ASSERT(DUK_TVAL_IS_NULL(duk_get_tval(thr, -1)) || DUK_TVAL_IS_FASTINT(duk_get_tval(thr, -1)));
 #endif
-		duk_put_prop(thr, comp_ctx->curr_func.varmap_idx);  /* [ ... name reg/null ] -> [ ... ] */
+		duk_put_prop(thr, comp_ctx->curr_func.varmap_idx); /* [ ... name reg/null ] -> [ ... ] */
 	}
 
 	/*
@@ -72065,7 +76212,7 @@ DUK_LOCAL void duk__init_varmap_and_prologue_for_pass2(duk_compiler_ctx *comp_ct
 	for (i = 0; i < num_decls; i += 2) {
 		duk_int_t decl_type;
 
-		duk_get_prop_index(thr, comp_ctx->curr_func.decls_idx, i + 1);  /* decl type */
+		duk_get_prop_index(thr, comp_ctx->curr_func.decls_idx, i + 1); /* decl type */
 		decl_type = duk_to_int(thr, -1);
 		decl_type = decl_type & 0xff;
 		duk_pop(thr);
@@ -72074,16 +76221,15 @@ DUK_LOCAL void duk__init_varmap_and_prologue_for_pass2(duk_compiler_ctx *comp_ct
 			continue;
 		}
 
-		duk_get_prop_index(thr, comp_ctx->curr_func.decls_idx, i);  /* decl name */
+		duk_get_prop_index(thr, comp_ctx->curr_func.decls_idx, i); /* decl name */
 
 		if (duk_has_prop(thr, comp_ctx->curr_func.varmap_idx)) {
 			/* shadowed, ignore */
 		} else {
-			duk_get_prop_index(thr, comp_ctx->curr_func.decls_idx, i);  /* decl name */
+			duk_get_prop_index(thr, comp_ctx->curr_func.decls_idx, i); /* decl name */
 			h_name = duk_known_hstring(thr, -1);
 
-			if (h_name == DUK_HTHREAD_STRING_LC_ARGUMENTS(thr) &&
-			    !comp_ctx->curr_func.is_arguments_shadowed) {
+			if (h_name == DUK_HTHREAD_STRING_LC_ARGUMENTS(thr) && !comp_ctx->curr_func.is_arguments_shadowed) {
 				/* E5 Section steps 7-8 */
 				DUK_DDD(DUK_DDDPRINT("'arguments' not shadowed by a function declaration, "
 				                     "but appears as a variable declaration -> treat as "
@@ -72102,8 +76248,7 @@ DUK_LOCAL void duk__init_varmap_and_prologue_for_pass2(duk_compiler_ctx *comp_ct
 				rc_name = duk__getconst(comp_ctx);
 				duk_push_null(thr);
 
-				declvar_flags = DUK_PROPDESC_FLAG_WRITABLE |
-			                        DUK_PROPDESC_FLAG_ENUMERABLE;
+				declvar_flags = DUK_PROPDESC_FLAG_WRITABLE | DUK_PROPDESC_FLAG_ENUMERABLE;
 				if (configurable_bindings) {
 					declvar_flags |= DUK_PROPDESC_FLAG_CONFIGURABLE;
 				}
@@ -72115,7 +76260,7 @@ DUK_LOCAL void duk__init_varmap_and_prologue_for_pass2(duk_compiler_ctx *comp_ct
 				                0 /*value*/);
 			}
 
-			duk_put_prop(thr, comp_ctx->curr_func.varmap_idx);  /* [ ... name reg/null ] -> [ ... ] */
+			duk_put_prop(thr, comp_ctx->curr_func.varmap_idx); /* [ ... name reg/null ] -> [ ... ] */
 		}
 	}
 
@@ -72130,11 +76275,11 @@ DUK_LOCAL void duk__init_varmap_and_prologue_for_pass2(duk_compiler_ctx *comp_ct
 	DUK_ASSERT_TOP(thr, entry_top);
 	return;
 
- error_outofregs:
+error_outofregs:
 	DUK_ERROR_RANGE(thr, DUK_STR_REG_LIMIT);
 	DUK_WO_NORETURN(return;);
 
- error_argname:
+error_argname:
 	DUK_ERROR_SYNTAX(thr, DUK_STR_INVALID_ARG_NAME);
 	DUK_WO_NORETURN(return;);
 }
@@ -72173,7 +76318,11 @@ DUK_LOCAL void duk__init_varmap_and_prologue_for_pass2(duk_compiler_ctx *comp_ct
  *  token (EOF or closing brace).
  */
 
-DUK_LOCAL void duk__parse_func_body(duk_compiler_ctx *comp_ctx, duk_bool_t expect_eof, duk_bool_t implicit_return_value, duk_bool_t regexp_after, duk_small_int_t expect_token) {
+DUK_LOCAL void duk__parse_func_body(duk_compiler_ctx *comp_ctx,
+                                    duk_bool_t expect_eof,
+                                    duk_bool_t implicit_return_value,
+                                    duk_bool_t regexp_after,
+                                    duk_small_int_t expect_token) {
 	duk_compiler_func *func;
 	duk_hthread *thr;
 	duk_regconst_t reg_stmt_value = -1;
@@ -72265,8 +76414,8 @@ DUK_LOCAL void duk__parse_func_body(duk_compiler_ctx *comp_ctx, duk_bool_t expec
 
 	DUK_DDD(DUK_DDDPRINT("begin 1st pass"));
 	duk__parse_stmts(comp_ctx,
-	                 1,             /* allow source elements */
-	                 expect_eof,    /* expect EOF instead of } */
+	                 1, /* allow source elements */
+	                 expect_eof, /* expect EOF instead of } */
 	                 regexp_after); /* regexp after */
 	DUK_DDD(DUK_DDDPRINT("end 1st pass"));
 
@@ -72295,8 +76444,8 @@ DUK_LOCAL void duk__parse_func_body(duk_compiler_ctx *comp_ctx, duk_bool_t expec
 
 		DUK_DDD(DUK_DDDPRINT("rewind lexer"));
 		DUK_LEXER_SETPOINT(&comp_ctx->lex, &lex_pt);
-		comp_ctx->curr_token.t = 0;  /* this is needed for regexp mode */
-		comp_ctx->curr_token.start_line = 0;  /* needed for line number tracking (becomes prev_token.start_line) */
+		comp_ctx->curr_token.t = 0; /* this is needed for regexp mode */
+		comp_ctx->curr_token.start_line = 0; /* needed for line number tracking (becomes prev_token.start_line) */
 		duk__advance(comp_ctx);
 
 		/*
@@ -72317,8 +76466,7 @@ DUK_LOCAL void duk__parse_func_body(duk_compiler_ctx *comp_ctx, duk_bool_t expec
 
 		/* must be able to emit code, alloc consts, etc. */
 
-		duk__init_varmap_and_prologue_for_pass2(comp_ctx,
-		                                        (implicit_return_value ? &reg_stmt_value : NULL));
+		duk__init_varmap_and_prologue_for_pass2(comp_ctx, (implicit_return_value ? &reg_stmt_value : NULL));
 		func->reg_stmt_value = reg_stmt_value;
 
 		temp_first = DUK__GETTEMP(comp_ctx);
@@ -72366,15 +76514,13 @@ DUK_LOCAL void duk__parse_func_body(duk_compiler_ctx *comp_ctx, duk_bool_t expec
 
 		if (implicit_return_value) {
 			/* Default implicit return value. */
-			duk__emit_bc(comp_ctx,
-			             DUK_OP_LDUNDEF,
-			             0);
+			duk__emit_bc(comp_ctx, DUK_OP_LDUNDEF, 0);
 		}
 
 		DUK_DDD(DUK_DDDPRINT("begin 2nd pass"));
 		duk__parse_stmts(comp_ctx,
-		                 1,             /* allow source elements */
-		                 expect_eof,    /* expect EOF instead of } */
+		                 1, /* allow source elements */
+		                 expect_eof, /* expect EOF instead of } */
 		                 regexp_after); /* regexp after */
 		DUK_DDD(DUK_DDDPRINT("end 2nd pass"));
 
@@ -72430,7 +76576,7 @@ DUK_LOCAL void duk__parse_func_body(duk_compiler_ctx *comp_ctx, duk_bool_t expec
 	DUK__RECURSION_DECREASE(comp_ctx, thr);
 	return;
 
- error_funcname:
+error_funcname:
 	DUK_ERROR_SYNTAX(thr, DUK_STR_INVALID_FUNC_NAME);
 	DUK_WO_NORETURN(return;);
 }
@@ -72485,15 +76631,14 @@ DUK_LOCAL void duk__parse_func_formals(duk_compiler_ctx *comp_ctx) {
 		}
 		DUK_ASSERT(comp_ctx->curr_token.t == DUK_TOK_IDENTIFIER);
 		DUK_ASSERT(comp_ctx->curr_token.str1 != NULL);
-		DUK_DDD(DUK_DDDPRINT("formal argument: %!O",
-		                     (duk_heaphdr *) comp_ctx->curr_token.str1));
+		DUK_DDD(DUK_DDDPRINT("formal argument: %!O", (duk_heaphdr *) comp_ctx->curr_token.str1));
 
 		/* XXX: append primitive */
 		duk_push_hstring(thr, comp_ctx->curr_token.str1);
 		n = (duk_uarridx_t) duk_get_length(thr, comp_ctx->curr_func.argnames_idx);
 		duk_put_prop_index(thr, comp_ctx->curr_func.argnames_idx, n);
 
-		duk__advance(comp_ctx);  /* eat identifier */
+		duk__advance(comp_ctx); /* eat identifier */
 	}
 }
 
@@ -72541,7 +76686,7 @@ DUK_LOCAL void duk__parse_func_like_raw(duk_compiler_ctx *comp_ctx, duk_small_ui
 	if (flags & DUK__FUNC_FLAG_GETSET) {
 		/* PropertyName -> IdentifierName | StringLiteral | NumericLiteral */
 		if (tok->t_nores == DUK_TOK_IDENTIFIER || tok->t == DUK_TOK_STRING) {
-			duk_push_hstring(thr, tok->str1);       /* keep in valstack */
+			duk_push_hstring(thr, tok->str1); /* keep in valstack */
 		} else if (tok->t == DUK_TOK_NUMBER) {
 			duk_push_number(thr, tok->num);
 			duk_to_string(thr, -1);
@@ -72549,15 +76694,15 @@ DUK_LOCAL void duk__parse_func_like_raw(duk_compiler_ctx *comp_ctx, duk_small_ui
 			DUK_ERROR_SYNTAX(thr, DUK_STR_INVALID_GETSET_NAME);
 			DUK_WO_NORETURN(return;);
 		}
-		comp_ctx->curr_func.h_name = duk_known_hstring(thr, -1);  /* borrowed reference */
+		comp_ctx->curr_func.h_name = duk_known_hstring(thr, -1); /* borrowed reference */
 	} else {
 		/* Function name is an Identifier (not IdentifierName), but we get
 		 * the raw name (not recognizing keywords) here and perform the name
 		 * checks only after pass 1.
 		 */
 		if (tok->t_nores == DUK_TOK_IDENTIFIER) {
-			duk_push_hstring(thr, tok->str1);       /* keep in valstack */
-			comp_ctx->curr_func.h_name = duk_known_hstring(thr, -1);  /* borrowed reference */
+			duk_push_hstring(thr, tok->str1); /* keep in valstack */
+			comp_ctx->curr_func.h_name = duk_known_hstring(thr, -1); /* borrowed reference */
 		} else {
 			/* valstack will be unbalanced, which is OK */
 			DUK_ASSERT((flags & DUK__FUNC_FLAG_GETSET) == 0);
@@ -72570,8 +76715,7 @@ DUK_LOCAL void duk__parse_func_like_raw(duk_compiler_ctx *comp_ctx, duk_small_ui
 		}
 	}
 
-	DUK_DD(DUK_DDPRINT("function name: %!O",
-	                   (duk_heaphdr *) comp_ctx->curr_func.h_name));
+	DUK_DD(DUK_DDPRINT("function name: %!O", (duk_heaphdr *) comp_ctx->curr_func.h_name));
 
 	if (!no_advance) {
 		duk__advance(comp_ctx);
@@ -72597,17 +76741,17 @@ DUK_LOCAL void duk__parse_func_like_raw(duk_compiler_ctx *comp_ctx, duk_small_ui
 	 */
 
 	duk__parse_func_body(comp_ctx,
-	                     0,   /* expect_eof */
-	                     0,   /* implicit_return_value */
+	                     0, /* expect_eof */
+	                     0, /* implicit_return_value */
 	                     flags & DUK__FUNC_FLAG_DECL, /* regexp_after */
-	                     DUK_TOK_LCURLY);  /* expect_token */
+	                     DUK_TOK_LCURLY); /* expect_token */
 
 	/*
 	 *  Convert duk_compiler_func to a function template and add it
 	 *  to the parent function table.
 	 */
 
-	duk__convert_to_func_template(comp_ctx);  /* -> [ ... func ] */
+	duk__convert_to_func_template(comp_ctx); /* -> [ ... func ] */
 }
 
 /* Parse an inner function, adding the function template to the current function's
@@ -72645,12 +76789,14 @@ DUK_LOCAL duk_int_t duk__parse_func_like_fnum(duk_compiler_ctx *comp_ctx, duk_sm
 		lex_pt.line = duk_to_int(thr, -1);
 		duk_pop(thr);
 
-		DUK_DDD(DUK_DDDPRINT("second pass of an inner func, skip the function, reparse closing brace; lex offset=%ld, line=%ld",
-		                     (long) lex_pt.offset, (long) lex_pt.line));
+		DUK_DDD(
+		    DUK_DDDPRINT("second pass of an inner func, skip the function, reparse closing brace; lex offset=%ld, line=%ld",
+		                 (long) lex_pt.offset,
+		                 (long) lex_pt.line));
 
 		DUK_LEXER_SETPOINT(&comp_ctx->lex, &lex_pt);
-		comp_ctx->curr_token.t = 0;  /* this is needed for regexp mode */
-		comp_ctx->curr_token.start_line = 0;  /* needed for line number tracking (becomes prev_token.start_line) */
+		comp_ctx->curr_token.t = 0; /* this is needed for regexp mode */
+		comp_ctx->curr_token.start_line = 0; /* needed for line number tracking (becomes prev_token.start_line) */
 		duk__advance(comp_ctx);
 
 		/* RegExp is not allowed after a function expression, e.g. in
@@ -72672,7 +76818,8 @@ DUK_LOCAL duk_int_t duk__parse_func_like_fnum(duk_compiler_ctx *comp_ctx, duk_sm
 
 	entry_top = duk_get_top(thr);
 	DUK_DDD(DUK_DDDPRINT("before func: entry_top=%ld, curr_tok.start_offset=%ld",
-	                     (long) entry_top, (long) comp_ctx->curr_token.start_offset));
+	                     (long) entry_top,
+	                     (long) comp_ctx->curr_token.start_offset));
 
 	duk_memcpy(&old_func, &comp_ctx->curr_func, sizeof(duk_compiler_func));
 
@@ -72692,24 +76839,25 @@ DUK_LOCAL duk_int_t duk__parse_func_like_fnum(duk_compiler_ctx *comp_ctx, duk_sm
 	DUK_ASSERT(comp_ctx->curr_func.is_eval == 0);
 	DUK_ASSERT(comp_ctx->curr_func.is_global == 0);
 	comp_ctx->curr_func.is_setget = ((flags & DUK__FUNC_FLAG_GETSET) != 0);
-	comp_ctx->curr_func.is_namebinding = !(flags & (DUK__FUNC_FLAG_GETSET |
-	                                                DUK__FUNC_FLAG_METDEF |
-	                                                DUK__FUNC_FLAG_DECL));  /* no name binding for: declarations, objlit getset, objlit method def */
-	comp_ctx->curr_func.is_constructable = !(flags & (DUK__FUNC_FLAG_GETSET |
-	                                                  DUK__FUNC_FLAG_METDEF));  /* not constructable: objlit getset, objlit method def */
+	comp_ctx->curr_func.is_namebinding =
+	    !(flags & (DUK__FUNC_FLAG_GETSET | DUK__FUNC_FLAG_METDEF |
+	               DUK__FUNC_FLAG_DECL)); /* no name binding for: declarations, objlit getset, objlit method def */
+	comp_ctx->curr_func.is_constructable =
+	    !(flags & (DUK__FUNC_FLAG_GETSET | DUK__FUNC_FLAG_METDEF)); /* not constructable: objlit getset, objlit method def */
 
 	/*
 	 *  Parse inner function
 	 */
 
-	duk__parse_func_like_raw(comp_ctx, flags);  /* pushes function template */
+	duk__parse_func_like_raw(comp_ctx, flags); /* pushes function template */
 
 	/* prev_token.start_offset points to the closing brace here; when skipping
 	 * we're going to reparse the closing brace to ensure semicolon insertion
 	 * etc work as expected.
 	 */
 	DUK_DDD(DUK_DDDPRINT("after func: prev_tok.start_offset=%ld, curr_tok.start_offset=%ld",
-	                     (long) comp_ctx->prev_token.start_offset, (long) comp_ctx->curr_token.start_offset));
+	                     (long) comp_ctx->prev_token.start_offset,
+	                     (long) comp_ctx->curr_token.start_offset));
 	DUK_ASSERT(comp_ctx->lex.input[comp_ctx->prev_token.start_offset] == (duk_uint8_t) DUK_ASC_RCURLY);
 
 	/* XXX: append primitive */
@@ -72795,7 +76943,7 @@ DUK_LOCAL duk_ret_t duk__js_compile_raw(duk_hthread *thr, void *udata) {
 	is_strict = (flags & DUK_COMPILE_STRICT ? 1 : 0);
 	is_funcexpr = (flags & DUK_COMPILE_FUNCEXPR ? 1 : 0);
 
-	h_filename = duk_get_hstring(thr, -1);  /* may be undefined */
+	h_filename = duk_get_hstring(thr, -1); /* may be undefined */
 
 	/*
 	 *  Init compiler and lexer contexts
@@ -72813,11 +76961,11 @@ DUK_LOCAL duk_ret_t duk__js_compile_raw(duk_hthread *thr, void *udata) {
 
 	duk_require_stack(thr, DUK__COMPILE_ENTRY_SLOTS);
 
-	duk_push_dynamic_buffer(thr, 0);       /* entry_top + 0 */
-	duk_push_undefined(thr);               /* entry_top + 1 */
-	duk_push_undefined(thr);               /* entry_top + 2 */
-	duk_push_undefined(thr);               /* entry_top + 3 */
-	duk_push_undefined(thr);               /* entry_top + 4 */
+	duk_push_dynamic_buffer(thr, 0); /* entry_top + 0 */
+	duk_push_undefined(thr); /* entry_top + 1 */
+	duk_push_undefined(thr); /* entry_top + 2 */
+	duk_push_undefined(thr); /* entry_top + 3 */
+	duk_push_undefined(thr); /* entry_top + 4 */
 
 	comp_ctx->thr = thr;
 	comp_ctx->h_filename = h_filename;
@@ -72841,8 +76989,8 @@ DUK_LOCAL duk_ret_t duk__js_compile_raw(duk_hthread *thr, void *udata) {
 
 	lex_pt->offset = 0;
 	lex_pt->line = 1;
-	DUK_LEXER_SETPOINT(&comp_ctx->lex, lex_pt);    /* fills window */
-	comp_ctx->curr_token.start_line = 0;  /* needed for line number tracking (becomes prev_token.start_line) */
+	DUK_LEXER_SETPOINT(&comp_ctx->lex, lex_pt); /* fills window */
+	comp_ctx->curr_token.start_line = 0; /* needed for line number tracking (becomes prev_token.start_line) */
 
 	/*
 	 *  Initialize function state for a zero-argument function
@@ -72858,8 +77006,7 @@ DUK_LOCAL duk_ret_t duk__js_compile_raw(duk_hthread *thr, void *udata) {
 		 */
 		DUK_ASSERT(func->h_name == NULL);
 	} else {
-		duk_push_hstring_stridx(thr, (is_eval ? DUK_STRIDX_EVAL :
-		                                        DUK_STRIDX_GLOBAL));
+		duk_push_hstring_stridx(thr, (is_eval ? DUK_STRIDX_EVAL : DUK_STRIDX_GLOBAL));
 		func->h_name = duk_get_hstring(thr, -1);
 	}
 
@@ -72879,7 +77026,7 @@ DUK_LOCAL duk_ret_t duk__js_compile_raw(duk_hthread *thr, void *udata) {
 		func->is_namebinding = 1;
 		func->is_constructable = 1;
 
-		duk__advance(comp_ctx);  /* init 'curr_token' */
+		duk__advance(comp_ctx); /* init 'curr_token' */
 		duk__advance_expect(comp_ctx, DUK_TOK_FUNCTION);
 		(void) duk__parse_func_like_raw(comp_ctx, 0 /*flags*/);
 	} else {
@@ -72891,10 +77038,10 @@ DUK_LOCAL duk_ret_t duk__js_compile_raw(duk_hthread *thr, void *udata) {
 		DUK_ASSERT(func->is_constructable == 0);
 
 		duk__parse_func_body(comp_ctx,
-		                     1,             /* expect_eof */
-		                     1,             /* implicit_return_value */
-		                     1,             /* regexp_after (does not matter) */
-		                     -1);           /* expect_token */
+		                     1, /* expect_eof */
+		                     1, /* implicit_return_value */
+		                     1, /* regexp_after (does not matter) */
+		                     -1); /* expect_token */
 	}
 
 	/*
@@ -72926,14 +77073,14 @@ DUK_INTERNAL void duk_js_compile(duk_hthread *thr, const duk_uint8_t *src_buffer
 	DUK_LEXER_INITCTX(&comp_stk.comp_ctx_alloc.lex);
 	comp_stk.comp_ctx_alloc.lex.input = src_buffer;
 	comp_stk.comp_ctx_alloc.lex.input_length = src_length;
-	comp_stk.comp_ctx_alloc.lex.flags = flags;  /* Forward flags directly for now. */
+	comp_stk.comp_ctx_alloc.lex.flags = flags; /* Forward flags directly for now. */
 
 	/* [ ... filename ] */
 
 	prev_ctx = thr->compile_ctx;
-	thr->compile_ctx = &comp_stk.comp_ctx_alloc;  /* for duk_error_augment.c */
+	thr->compile_ctx = &comp_stk.comp_ctx_alloc; /* for duk_error_augment.c */
 	safe_rc = duk_safe_call(thr, duk__js_compile_raw, (void *) &comp_stk /*udata*/, 1 /*nargs*/, 1 /*nrets*/);
-	thr->compile_ctx = prev_ctx;  /* must restore reliably before returning */
+	thr->compile_ctx = prev_ctx; /* must restore reliably before returning */
 
 	if (safe_rc != DUK_EXEC_SUCCESS) {
 		DUK_D(DUK_DPRINT("compilation failed: %!T", duk_get_tval(thr, -1)));
@@ -73044,19 +77191,11 @@ DUK_LOCAL_DECL void duk__js_execute_bytecode_inner(duk_hthread *entry_thread, du
  *  Misc helpers.
  */
 
-/* Forced inline declaration, only applied for performance oriented build. */
-#if defined(DUK_USE_EXEC_PREFER_SIZE)
-#define DUK__INLINE_PERF
-#define DUK__NOINLINE_PERF
-#else
-#define DUK__INLINE_PERF DUK_ALWAYS_INLINE
-#define DUK__NOINLINE_PERF DUK_NOINLINE
-#endif
-
 /* Replace value stack top to value at 'tv_ptr'.  Optimize for
  * performance by only applying the net refcount change.
  */
-#define DUK__REPLACE_TO_TVPTR(thr,tv_ptr) do { \
+#define DUK__REPLACE_TO_TVPTR(thr, tv_ptr) \
+	do { \
 		duk_hthread *duk__thr; \
 		duk_tval *duk__tvsrc; \
 		duk_tval *duk__tvdst; \
@@ -73066,13 +77205,13 @@ DUK_LOCAL_DECL void duk__js_execute_bytecode_inner(duk_hthread *entry_thread, du
 		duk__tvdst = (tv_ptr); \
 		DUK_TVAL_SET_TVAL(&duk__tvtmp, duk__tvdst); \
 		DUK_TVAL_SET_TVAL(duk__tvdst, duk__tvsrc); \
-		DUK_TVAL_SET_UNDEFINED(duk__tvsrc);  /* value stack init policy */ \
+		DUK_TVAL_SET_UNDEFINED(duk__tvsrc); /* value stack init policy */ \
 		duk__thr->valstack_top = duk__tvsrc; \
 		DUK_TVAL_DECREF(duk__thr, &duk__tvtmp); \
 	} while (0)
 
 /* XXX: candidate of being an internal shared API call */
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL void duk__push_tvals_incref_only(duk_hthread *thr, duk_tval *tv_src, duk_small_uint_fast_t count) {
 	duk_tval *tv_dst;
 	duk_size_t copy_size;
@@ -73104,17 +77243,20 @@ DUK_LOCAL void duk__push_tvals_incref_only(duk_hthread *thr, duk_tval *tv_src, d
  *  possible.
  */
 
-DUK_LOCAL DUK__INLINE_PERF duk_double_t duk__compute_mod(duk_double_t d1, duk_double_t d2) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF duk_double_t duk__compute_mod(duk_double_t d1, duk_double_t d2) {
 	return (duk_double_t) duk_js_arith_mod((double) d1, (double) d2);
 }
 
 #if defined(DUK_USE_ES7_EXP_OPERATOR)
-DUK_LOCAL DUK__INLINE_PERF duk_double_t duk__compute_exp(duk_double_t d1, duk_double_t d2) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF duk_double_t duk__compute_exp(duk_double_t d1, duk_double_t d2) {
 	return (duk_double_t) duk_js_arith_pow((double) d1, (double) d2);
 }
 #endif
 
-DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_add(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y, duk_small_uint_fast_t idx_z) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__vm_arith_add(duk_hthread *thr,
+                                                             duk_tval *tv_x,
+                                                             duk_tval *tv_y,
+                                                             duk_small_uint_fast_t idx_z) {
 	/*
 	 *  Addition operator is different from other arithmetic
 	 *  operations in that it also provides string concatenation.
@@ -73134,9 +77276,9 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_add(duk_hthread *thr, duk_tval *tv
 	duk_double_union du;
 
 	DUK_ASSERT(thr != NULL);
-	DUK_ASSERT(tv_x != NULL);  /* may be reg or const */
-	DUK_ASSERT(tv_y != NULL);  /* may be reg or const */
-	DUK_ASSERT_DISABLE(idx_z >= 0);  /* unsigned */
+	DUK_ASSERT(tv_x != NULL); /* may be reg or const */
+	DUK_ASSERT(tv_y != NULL); /* may be reg or const */
+	DUK_ASSERT_DISABLE(idx_z >= 0); /* unsigned */
 	DUK_ASSERT((duk_uint_t) idx_z < (duk_uint_t) duk_get_top(thr));
 
 	/*
@@ -73159,14 +77301,14 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_add(duk_hthread *thr, duk_tval *tv
 		v3_hi = (duk_int32_t) (v3 >> 32);
 		if (DUK_LIKELY(v3_hi >= DUK_I64_CONSTANT(-0x8000) && v3_hi <= DUK_I64_CONSTANT(0x7fff))) {
 			tv_z = thr->valstack_bottom + idx_z;
-			DUK_TVAL_SET_FASTINT_UPDREF(thr, tv_z, v3);  /* side effects */
+			DUK_TVAL_SET_FASTINT_UPDREF(thr, tv_z, v3); /* side effects */
 			return;
 		} else {
 			/* overflow, fall through */
 			;
 		}
 	}
-#endif  /* DUK_USE_FASTINT */
+#endif /* DUK_USE_FASTINT */
 
 	if (DUK_TVAL_IS_NUMBER(tv_x) && DUK_TVAL_IS_NUMBER(tv_y)) {
 #if !defined(DUK_USE_EXEC_PREFER_SIZE)
@@ -73175,14 +77317,14 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_add(duk_hthread *thr, duk_tval *tv
 
 		du.d = DUK_TVAL_GET_NUMBER(tv_x) + DUK_TVAL_GET_NUMBER(tv_y);
 #if defined(DUK_USE_EXEC_PREFER_SIZE)
-		duk_push_number(thr, du.d);  /* will NaN normalize result */
+		duk_push_number(thr, du.d); /* will NaN normalize result */
 		duk_replace(thr, (duk_idx_t) idx_z);
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 		DUK_DBLUNION_NORMALIZE_NAN_CHECK(&du);
 		DUK_ASSERT(DUK_DBLUNION_IS_NORMALIZED(&du));
 		tv_z = thr->valstack_bottom + idx_z;
-		DUK_TVAL_SET_NUMBER_UPDREF(thr, tv_z, du.d);  /* side effects */
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+		DUK_TVAL_SET_NUMBER_UPDREF(thr, tv_z, du.d); /* side effects */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 		return;
 	}
 
@@ -73192,7 +77334,7 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_add(duk_hthread *thr, duk_tval *tv
 
 	duk_push_tval(thr, tv_x);
 	duk_push_tval(thr, tv_y);
-	duk_to_primitive(thr, -2, DUK_HINT_NONE);  /* side effects -> don't use tv_x, tv_y after */
+	duk_to_primitive(thr, -2, DUK_HINT_NONE); /* side effects -> don't use tv_x, tv_y after */
 	duk_to_primitive(thr, -1, DUK_HINT_NONE);
 
 	/* Since Duktape 2.x plain buffers are treated like ArrayBuffer. */
@@ -73203,7 +77345,7 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_add(duk_hthread *thr, duk_tval *tv
 		 * in duk_concat_2() which also fails with TypeError so no
 		 * explicit check is needed.
 		 */
-		duk_concat_2(thr);  /* [... s1 s2] -> [... s1+s2] */
+		duk_concat_2(thr); /* [... s1 s2] -> [... s1+s2] */
 	} else {
 		duk_double_t d1, d2;
 
@@ -73216,12 +77358,16 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_add(duk_hthread *thr, duk_tval *tv
 
 		du.d = d1 + d2;
 		duk_pop_2_unsafe(thr);
-		duk_push_number(thr, du.d);  /* will NaN normalize result */
+		duk_push_number(thr, du.d); /* will NaN normalize result */
 	}
-	duk_replace(thr, (duk_idx_t) idx_z);  /* side effects */
+	duk_replace(thr, (duk_idx_t) idx_z); /* side effects */
 }
 
-DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_binary_op(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y, duk_uint_fast_t idx_z, duk_small_uint_fast_t opcode) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__vm_arith_binary_op(duk_hthread *thr,
+                                                                   duk_tval *tv_x,
+                                                                   duk_tval *tv_y,
+                                                                   duk_uint_fast_t idx_z,
+                                                                   duk_small_uint_fast_t opcode) {
 	/*
 	 *  Arithmetic operations other than '+' have number-only semantics
 	 *  and are implemented here.  The separate switch-case here means a
@@ -73238,12 +77384,12 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_binary_op(duk_hthread *thr, duk_tv
 #endif
 
 	DUK_ASSERT(thr != NULL);
-	DUK_ASSERT(tv_x != NULL);  /* may be reg or const */
-	DUK_ASSERT(tv_y != NULL);  /* may be reg or const */
-	DUK_ASSERT_DISABLE(idx_z >= 0);  /* unsigned */
+	DUK_ASSERT(tv_x != NULL); /* may be reg or const */
+	DUK_ASSERT(tv_y != NULL); /* may be reg or const */
+	DUK_ASSERT_DISABLE(idx_z >= 0); /* unsigned */
 	DUK_ASSERT((duk_uint_t) idx_z < (duk_uint_t) duk_get_top(thr));
 
-	opcode_shifted = opcode >> 2;  /* Get base opcode without reg/const modifiers. */
+	opcode_shifted = opcode >> 2; /* Get base opcode without reg/const modifiers. */
 
 #if defined(DUK_USE_FASTINT)
 	if (DUK_TVAL_IS_FASTINT(tv_x) && DUK_TVAL_IS_FASTINT(tv_y)) {
@@ -73310,13 +77456,13 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_binary_op(duk_hthread *thr, duk_tv
 		v3_hi = (duk_int32_t) (v3 >> 32);
 		if (DUK_LIKELY(v3_hi >= DUK_I64_CONSTANT(-0x8000) && v3_hi <= DUK_I64_CONSTANT(0x7fff))) {
 			tv_z = thr->valstack_bottom + idx_z;
-			DUK_TVAL_SET_FASTINT_UPDREF(thr, tv_z, v3);  /* side effects */
+			DUK_TVAL_SET_FASTINT_UPDREF(thr, tv_z, v3); /* side effects */
 			return;
 		}
 		/* fall through if overflow etc */
 	}
- skip_fastint:
-#endif  /* DUK_USE_FASTINT */
+skip_fastint:
+#endif /* DUK_USE_FASTINT */
 
 	if (DUK_TVAL_IS_NUMBER(tv_x) && DUK_TVAL_IS_NUMBER(tv_y)) {
 		/* fast path */
@@ -73325,7 +77471,7 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_binary_op(duk_hthread *thr, duk_tv
 	} else {
 		duk_push_tval(thr, tv_x);
 		duk_push_tval(thr, tv_y);
-		d1 = duk_to_number_m2(thr);  /* side effects */
+		d1 = duk_to_number_m2(thr); /* side effects */
 		d2 = duk_to_number_m1(thr);
 		DUK_ASSERT(duk_is_number(thr, -2));
 		DUK_ASSERT(duk_is_number(thr, -1));
@@ -73362,24 +77508,28 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_binary_op(duk_hthread *thr, duk_tv
 #endif
 	default: {
 		DUK_UNREACHABLE();
-		du.d = DUK_DOUBLE_NAN;  /* should not happen */
+		du.d = DUK_DOUBLE_NAN; /* should not happen */
 		break;
 	}
 	}
 
 #if defined(DUK_USE_EXEC_PREFER_SIZE)
-	duk_push_number(thr, du.d);  /* will NaN normalize result */
+	duk_push_number(thr, du.d); /* will NaN normalize result */
 	duk_replace(thr, (duk_idx_t) idx_z);
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 	/* important to use normalized NaN with 8-byte tagged types */
 	DUK_DBLUNION_NORMALIZE_NAN_CHECK(&du);
 	DUK_ASSERT(DUK_DBLUNION_IS_NORMALIZED(&du));
 	tv_z = thr->valstack_bottom + idx_z;
-	DUK_TVAL_SET_NUMBER_UPDREF(thr, tv_z, du.d);  /* side effects */
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+	DUK_TVAL_SET_NUMBER_UPDREF(thr, tv_z, du.d); /* side effects */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 }
 
-DUK_LOCAL DUK__INLINE_PERF void duk__vm_bitwise_binary_op(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y, duk_small_uint_fast_t idx_z, duk_small_uint_fast_t opcode) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__vm_bitwise_binary_op(duk_hthread *thr,
+                                                                     duk_tval *tv_x,
+                                                                     duk_tval *tv_y,
+                                                                     duk_small_uint_fast_t idx_z,
+                                                                     duk_small_uint_fast_t opcode) {
 	/*
 	 *  Binary bitwise operations use different coercions (ToInt32, ToUint32)
 	 *  depending on the operation.  We coerce the arguments first using
@@ -73403,20 +77553,19 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_bitwise_binary_op(duk_hthread *thr, duk_
 #endif
 
 	DUK_ASSERT(thr != NULL);
-	DUK_ASSERT(tv_x != NULL);  /* may be reg or const */
-	DUK_ASSERT(tv_y != NULL);  /* may be reg or const */
-	DUK_ASSERT_DISABLE(idx_z >= 0);  /* unsigned */
+	DUK_ASSERT(tv_x != NULL); /* may be reg or const */
+	DUK_ASSERT(tv_y != NULL); /* may be reg or const */
+	DUK_ASSERT_DISABLE(idx_z >= 0); /* unsigned */
 	DUK_ASSERT((duk_uint_t) idx_z < (duk_uint_t) duk_get_top(thr));
 
-	opcode_shifted = opcode >> 2;  /* Get base opcode without reg/const modifiers. */
+	opcode_shifted = opcode >> 2; /* Get base opcode without reg/const modifiers. */
 
 #if defined(DUK_USE_FASTINT)
 	if (DUK_TVAL_IS_FASTINT(tv_x) && DUK_TVAL_IS_FASTINT(tv_y)) {
 		i1 = (duk_int32_t) DUK_TVAL_GET_FASTINT_I32(tv_x);
 		i2 = (duk_int32_t) DUK_TVAL_GET_FASTINT_I32(tv_y);
-	}
-	else
-#endif  /* DUK_USE_FASTINT */
+	} else
+#endif /* DUK_USE_FASTINT */
 	{
 		duk_push_tval(thr, tv_x);
 		duk_push_tval(thr, tv_y);
@@ -73445,15 +77594,15 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_bitwise_binary_op(duk_hthread *thr, duk_
 		 */
 
 		u2 = ((duk_uint32_t) i2) & 0xffffffffUL;
-		i3 = (duk_int32_t) (((duk_uint32_t) i1) << (u2 & 0x1fUL));  /* E5 Section 11.7.1, steps 7 and 8 */
-		i3 = i3 & ((duk_int32_t) 0xffffffffUL);                     /* Note: left shift, should mask */
+		i3 = (duk_int32_t) (((duk_uint32_t) i1) << (u2 & 0x1fUL)); /* E5 Section 11.7.1, steps 7 and 8 */
+		i3 = i3 & ((duk_int32_t) 0xffffffffUL); /* Note: left shift, should mask */
 		break;
 	}
 	case DUK_OP_BASR >> 2: {
 		/* signed shift */
 
 		u2 = ((duk_uint32_t) i2) & 0xffffffffUL;
-		i3 = i1 >> (u2 & 0x1fUL);                      /* E5 Section 11.7.2, steps 7 and 8 */
+		i3 = i1 >> (u2 & 0x1fUL); /* E5 Section 11.7.2, steps 7 and 8 */
 		break;
 	}
 	case DUK_OP_BLSR >> 2: {
@@ -73463,7 +77612,7 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_bitwise_binary_op(duk_hthread *thr, duk_
 		u2 = ((duk_uint32_t) i2) & 0xffffffffUL;
 
 		/* special result value handling */
-		u3 = u1 >> (u2 & 0x1fUL);     /* E5 Section 11.7.2, steps 7 and 8 */
+		u3 = u1 >> (u2 & 0x1fUL); /* E5 Section 11.7.2, steps 7 and 8 */
 #if defined(DUK_USE_FASTINT)
 		fi3 = (duk_int64_t) u3;
 		goto fastint_result_set;
@@ -73474,7 +77623,7 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_bitwise_binary_op(duk_hthread *thr, duk_
 	}
 	default: {
 		DUK_UNREACHABLE();
-		i3 = 0;  /* should not happen */
+		i3 = 0; /* should not happen */
 		break;
 	}
 	}
@@ -73486,28 +77635,31 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_bitwise_binary_op(duk_hthread *thr, duk_
 	 */
 	fi3 = (duk_int64_t) i3;
 
- fastint_result_set:
+fastint_result_set:
 	tv_z = thr->valstack_bottom + idx_z;
-	DUK_TVAL_SET_FASTINT_UPDREF(thr, tv_z, fi3);  /* side effects */
-#else  /* DUK_USE_FASTINT */
+	DUK_TVAL_SET_FASTINT_UPDREF(thr, tv_z, fi3); /* side effects */
+#else /* DUK_USE_FASTINT */
 	d3 = (duk_double_t) i3;
 
- result_set:
-	DUK_ASSERT(!DUK_ISNAN(d3));            /* 'd3' is never NaN, so no need to normalize */
-	DUK_ASSERT_DOUBLE_IS_NORMALIZED(d3);   /* always normalized */
+result_set:
+	DUK_ASSERT(!DUK_ISNAN(d3)); /* 'd3' is never NaN, so no need to normalize */
+	DUK_ASSERT_DOUBLE_IS_NORMALIZED(d3); /* always normalized */
 
 #if defined(DUK_USE_EXEC_PREFER_SIZE)
-	duk_push_number(thr, d3);  /* would NaN normalize result, but unnecessary */
+	duk_push_number(thr, d3); /* would NaN normalize result, but unnecessary */
 	duk_replace(thr, (duk_idx_t) idx_z);
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 	tv_z = thr->valstack_bottom + idx_z;
-	DUK_TVAL_SET_NUMBER_UPDREF(thr, tv_z, d3);  /* side effects */
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
-#endif  /* DUK_USE_FASTINT */
+	DUK_TVAL_SET_NUMBER_UPDREF(thr, tv_z, d3); /* side effects */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_FASTINT */
 }
 
 /* In-place unary operation. */
-DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_unary_op(duk_hthread *thr, duk_uint_fast_t idx_src, duk_uint_fast_t idx_dst, duk_small_uint_fast_t opcode) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__vm_arith_unary_op(duk_hthread *thr,
+                                                                  duk_uint_fast_t idx_src,
+                                                                  duk_uint_fast_t idx_dst,
+                                                                  duk_small_uint_fast_t opcode) {
 	/*
 	 *  Arithmetic operations other than '+' have number-only semantics
 	 *  and are implemented here.  The separate switch-case here means a
@@ -73553,12 +77705,12 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_unary_op(duk_hthread *thr, duk_uin
 		}
 		/* fall through if overflow etc */
 	}
-#endif  /* DUK_USE_FASTINT */
+#endif /* DUK_USE_FASTINT */
 
 	if (DUK_TVAL_IS_NUMBER(tv)) {
 		d1 = DUK_TVAL_GET_NUMBER(tv);
 	} else {
-		d1 = duk_to_number_tval(thr, tv);  /* side effects */
+		d1 = duk_to_number_tval(thr, tv); /* side effects */
 	}
 
 	if (opcode == DUK_OP_UNP) {
@@ -73569,13 +77721,13 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_unary_op(duk_hthread *thr, duk_uin
 		DUK_ASSERT(DUK_DBLUNION_IS_NORMALIZED(&du));
 #if defined(DUK_USE_FASTINT)
 		tv = DUK_GET_TVAL_POSIDX(thr, (duk_idx_t) idx_dst);
-		DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF(thr, tv, du.d);  /* always 'fast', i.e. inlined */
+		DUK_TVAL_SET_NUMBER_CHKFAST_UPDREF(thr, tv, du.d); /* always 'fast', i.e. inlined */
 		return;
 #endif
 	} else {
 		DUK_ASSERT(opcode == DUK_OP_UNM);
 		du.d = -d1;
-		DUK_DBLUNION_NORMALIZE_NAN_CHECK(&du);  /* mandatory if du.d is a NaN */
+		DUK_DBLUNION_NORMALIZE_NAN_CHECK(&du); /* mandatory if du.d is a NaN */
 		DUK_ASSERT(DUK_DBLUNION_IS_NORMALIZED(&du));
 	}
 
@@ -73584,7 +77736,7 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_unary_op(duk_hthread *thr, duk_uin
 	DUK_TVAL_SET_NUMBER_UPDREF(thr, tv, du.d);
 }
 
-DUK_LOCAL DUK__INLINE_PERF void duk__vm_bitwise_not(duk_hthread *thr, duk_uint_fast_t idx_src, duk_uint_fast_t idx_dst) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__vm_bitwise_not(duk_hthread *thr, duk_uint_fast_t idx_src, duk_uint_fast_t idx_dst) {
 	/*
 	 *  E5 Section 11.4.8
 	 */
@@ -73603,22 +77755,21 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_bitwise_not(duk_hthread *thr, duk_uint_f
 #if defined(DUK_USE_FASTINT)
 	if (DUK_TVAL_IS_FASTINT(tv)) {
 		i1 = (duk_int32_t) DUK_TVAL_GET_FASTINT_I32(tv);
-	}
-	else
-#endif  /* DUK_USE_FASTINT */
+	} else
+#endif /* DUK_USE_FASTINT */
 	{
 		duk_push_tval(thr, tv);
-		i1 = duk_to_int32(thr, -1);  /* side effects */
+		i1 = duk_to_int32(thr, -1); /* side effects */
 		duk_pop_unsafe(thr);
 	}
 
 	/* Result is always fastint compatible. */
 	i2 = ~i1;
 	tv = DUK_GET_TVAL_POSIDX(thr, (duk_idx_t) idx_dst);
-	DUK_TVAL_SET_I32_UPDREF(thr, tv, i2);  /* side effects */
+	DUK_TVAL_SET_I32_UPDREF(thr, tv, i2); /* side effects */
 }
 
-DUK_LOCAL DUK__INLINE_PERF void duk__vm_logical_not(duk_hthread *thr, duk_uint_fast_t idx_src, duk_uint_fast_t idx_dst) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__vm_logical_not(duk_hthread *thr, duk_uint_fast_t idx_src, duk_uint_fast_t idx_dst) {
 	/*
 	 *  E5 Section 11.4.9
 	 */
@@ -73637,16 +77788,19 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_logical_not(duk_hthread *thr, duk_uint_f
 	 * duk_js_toboolean() and then push+replace to the result slot.
 	 */
 	tv = DUK_GET_TVAL_POSIDX(thr, (duk_idx_t) idx_src);
-	res = duk_js_toboolean(tv);  /* does not modify 'tv' */
+	res = duk_js_toboolean(tv); /* does not modify 'tv' */
 	DUK_ASSERT(res == 0 || res == 1);
 	res ^= 1;
 	tv = DUK_GET_TVAL_POSIDX(thr, (duk_idx_t) idx_dst);
 	/* XXX: size optimize: push+replace? */
-	DUK_TVAL_SET_BOOLEAN_UPDREF(thr, tv, res);  /* side effects */
+	DUK_TVAL_SET_BOOLEAN_UPDREF(thr, tv, res); /* side effects */
 }
 
 /* XXX: size optimized variant */
-DUK_LOCAL DUK__INLINE_PERF void duk__prepost_incdec_reg_helper(duk_hthread *thr, duk_tval *tv_dst, duk_tval *tv_src, duk_small_uint_t op) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__prepost_incdec_reg_helper(duk_hthread *thr,
+                                                                          duk_tval *tv_dst,
+                                                                          duk_tval *tv_src,
+                                                                          duk_small_uint_t op) {
 	duk_double_t x, y, z;
 
 	/* Two lowest bits of opcode are used to distinguish
@@ -73673,13 +77827,13 @@ DUK_LOCAL DUK__INLINE_PERF void duk__prepost_incdec_reg_helper(duk_hthread *thr,
 			y_fi = x_fi + 1;
 		}
 
-		DUK_TVAL_SET_FASTINT(tv_src, y_fi);  /* no need for refcount update */
+		DUK_TVAL_SET_FASTINT(tv_src, y_fi); /* no need for refcount update */
 
 		z_fi = (op & 0x02) ? x_fi : y_fi;
-		DUK_TVAL_SET_FASTINT_UPDREF(thr, tv_dst, z_fi);  /* side effects */
+		DUK_TVAL_SET_FASTINT_UPDREF(thr, tv_dst, z_fi); /* side effects */
 		return;
 	}
- skip_fastint:
+skip_fastint:
 #endif
 	if (DUK_TVAL_IS_NUMBER(tv_src)) {
 		/* Fast path for the case where the register
@@ -73693,7 +77847,7 @@ DUK_LOCAL DUK__INLINE_PERF void duk__prepost_incdec_reg_helper(duk_hthread *thr,
 			y = x + 1.0;
 		}
 
-		DUK_TVAL_SET_NUMBER(tv_src, y);  /* no need for refcount update */
+		DUK_TVAL_SET_NUMBER(tv_src, y); /* no need for refcount update */
 	} else {
 		/* Preserve duk_tval pointer(s) across a potential valstack
 		 * resize by converting them into offsets temporarily.
@@ -73702,8 +77856,8 @@ DUK_LOCAL DUK__INLINE_PERF void duk__prepost_incdec_reg_helper(duk_hthread *thr,
 		duk_size_t off_dst;
 
 		off_dst = (duk_size_t) ((duk_uint8_t *) tv_dst - (duk_uint8_t *) thr->valstack_bottom);
-		bc = (duk_idx_t) (tv_src - thr->valstack_bottom);  /* XXX: pass index explicitly? */
-		tv_src = NULL;  /* no longer referenced */
+		bc = (duk_idx_t) (tv_src - thr->valstack_bottom); /* XXX: pass index explicitly? */
+		tv_src = NULL; /* no longer referenced */
 
 		x = duk_to_number(thr, bc);
 		if (op & 0x01) {
@@ -73719,10 +77873,14 @@ DUK_LOCAL DUK__INLINE_PERF void duk__prepost_incdec_reg_helper(duk_hthread *thr,
 	}
 
 	z = (op & 0x02) ? x : y;
-	DUK_TVAL_SET_NUMBER_UPDREF(thr, tv_dst, z);  /* side effects */
+	DUK_TVAL_SET_NUMBER_UPDREF(thr, tv_dst, z); /* side effects */
 }
 
-DUK_LOCAL DUK__INLINE_PERF void duk__prepost_incdec_var_helper(duk_hthread *thr, duk_small_uint_t idx_dst, duk_tval *tv_id, duk_small_uint_t op, duk_small_uint_t is_strict) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__prepost_incdec_var_helper(duk_hthread *thr,
+                                                                          duk_small_uint_t idx_dst,
+                                                                          duk_tval *tv_id,
+                                                                          duk_small_uint_t op,
+                                                                          duk_small_uint_t is_strict) {
 	duk_activation *act;
 	duk_double_t x, y;
 	duk_hstring *name;
@@ -73748,7 +77906,7 @@ DUK_LOCAL DUK__INLINE_PERF void duk__prepost_incdec_var_helper(duk_hthread *thr,
 	name = DUK_TVAL_GET_STRING(tv_id);
 	DUK_ASSERT(name != NULL);
 	act = thr->callstack_curr;
-	(void) duk_js_getvar_activation(thr, act, name, 1 /*throw*/);  /* -> [ ... val this ] */
+	(void) duk_js_getvar_activation(thr, act, name, 1 /*throw*/); /* -> [ ... val this ] */
 
 	/* XXX: Fastint fast path would be useful here.  Also fastints
 	 * now lose their fastint status in current handling which is
@@ -73765,22 +77923,22 @@ DUK_LOCAL DUK__INLINE_PERF void duk__prepost_incdec_var_helper(duk_hthread *thr,
 	/* [... x this] */
 
 	if (op & 0x02) {
-		duk_push_number(thr, y);  /* -> [ ... x this y ] */
+		duk_push_number(thr, y); /* -> [ ... x this y ] */
 		DUK_ASSERT(act == thr->callstack_curr);
 		duk_js_putvar_activation(thr, act, name, DUK_GET_TVAL_NEGIDX(thr, -1), is_strict);
-		duk_pop_2_unsafe(thr);  /* -> [ ... x ] */
+		duk_pop_2_unsafe(thr); /* -> [ ... x ] */
 	} else {
-		duk_pop_2_unsafe(thr);  /* -> [ ... ] */
-		duk_push_number(thr, y);  /* -> [ ... y ] */
+		duk_pop_2_unsafe(thr); /* -> [ ... ] */
+		duk_push_number(thr, y); /* -> [ ... y ] */
 		DUK_ASSERT(act == thr->callstack_curr);
 		duk_js_putvar_activation(thr, act, name, DUK_GET_TVAL_NEGIDX(thr, -1), is_strict);
 	}
 
 #if defined(DUK_USE_EXEC_PREFER_SIZE)
 	duk_replace(thr, (duk_idx_t) idx_dst);
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 	DUK__REPLACE_TO_TVPTR(thr, DUK_GET_TVAL_POSIDX(thr, (duk_idx_t) idx_dst));
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 }
 
 /*
@@ -73794,11 +77952,11 @@ DUK_LOCAL DUK__INLINE_PERF void duk__prepost_incdec_var_helper(duk_hthread *thr,
  *  handled recursively.
  */
 
-#define DUK__LONGJMP_RESTART   0  /* state updated, restart bytecode execution */
-#define DUK__LONGJMP_RETHROW   1  /* exit bytecode executor by rethrowing an error to caller */
+#define DUK__LONGJMP_RESTART 0 /* state updated, restart bytecode execution */
+#define DUK__LONGJMP_RETHROW 1 /* exit bytecode executor by rethrowing an error to caller */
 
-#define DUK__RETHAND_RESTART   0  /* state updated, restart bytecode execution */
-#define DUK__RETHAND_FINISHED  1  /* exit bytecode execution with return value */
+#define DUK__RETHAND_RESTART  0 /* state updated, restart bytecode execution */
+#define DUK__RETHAND_FINISHED 1 /* exit bytecode execution with return value */
 
 /* XXX: optimize reconfig valstack operations so that resize, clamp, and setting
  * top are combined into one pass.
@@ -73827,7 +77985,8 @@ DUK_LOCAL void duk__reconfig_valstack_ecma_return(duk_hthread *thr) {
 
 	thr->valstack_bottom = (duk_tval *) (void *) ((duk_uint8_t *) thr->valstack + act->bottom_byteoff);
 	DUK_ASSERT(act->retval_byteoff >= act->bottom_byteoff);
-	clamp_top = (duk_idx_t) ((act->retval_byteoff - act->bottom_byteoff + sizeof(duk_tval)) / sizeof(duk_tval));  /* +1 = one retval */
+	clamp_top =
+	    (duk_idx_t) ((act->retval_byteoff - act->bottom_byteoff + sizeof(duk_tval)) / sizeof(duk_tval)); /* +1 = one retval */
 	duk_set_top_and_wipe(thr, h_func->nregs, clamp_top);
 
 	DUK_ASSERT((duk_uint8_t *) thr->valstack_end >= (duk_uint8_t *) thr->valstack + act->reserve_byteoff);
@@ -73857,7 +78016,7 @@ DUK_LOCAL void duk__reconfig_valstack_ecma_catcher(duk_hthread *thr, duk_activat
 	thr->valstack_bottom = (duk_tval *) (void *) ((duk_uint8_t *) thr->valstack + act->bottom_byteoff);
 	idx_bottom = (duk_size_t) (thr->valstack_bottom - thr->valstack);
 	DUK_ASSERT(cat->idx_base >= idx_bottom);
-	clamp_top = (duk_idx_t) (cat->idx_base - idx_bottom + 2);  /* +2 = catcher value, catcher lj_type */
+	clamp_top = (duk_idx_t) (cat->idx_base - idx_bottom + 2); /* +2 = catcher value, catcher lj_type */
 	duk_set_top_and_wipe(thr, h_func->nregs, clamp_top);
 
 	DUK_ASSERT((duk_uint8_t *) thr->valstack_end >= (duk_uint8_t *) thr->valstack + act->reserve_byteoff);
@@ -73885,7 +78044,10 @@ DUK_LOCAL void duk__set_catcher_regs_norz(duk_hthread *thr, duk_catcher *cat, du
 	DUK_TVAL_SET_U32_UPDREF_NORZ(thr, tv1, (duk_uint32_t) lj_type);
 }
 
-DUK_LOCAL void duk__handle_catch(duk_hthread *thr, duk_tval *tv_val_unstable, duk_small_uint_t lj_type) {
+DUK_LOCAL void duk__handle_catch_part1(duk_hthread *thr,
+                                       duk_tval *tv_val_unstable,
+                                       duk_small_uint_t lj_type,
+                                       volatile duk_bool_t *out_delayed_catch_setup) {
 	duk_activation *act;
 	duk_catcher *cat;
 
@@ -73894,9 +78056,17 @@ DUK_LOCAL void duk__handle_catch(duk_hthread *thr, duk_tval *tv_val_unstable, du
 
 	act = thr->callstack_curr;
 	DUK_ASSERT(act != NULL);
+	DUK_DD(DUK_DDPRINT("handle catch, part 1; act=%!A, cat=%!C", act, act->cat));
+
 	DUK_ASSERT(act->cat != NULL);
 	DUK_ASSERT(DUK_CAT_GET_TYPE(act->cat) == DUK_CAT_TYPE_TCF);
 
+	/* The part1/part2 split could also be made here at the very top
+	 * of catch handling.  Value stack would be reconfigured inside
+	 * part2's protection.  Value stack reconfiguration should be free
+	 * of allocs, however.
+	 */
+
 	duk__set_catcher_regs_norz(thr, act->cat, tv_val_unstable, lj_type);
 
 	DUK_ASSERT(thr->callstack_top >= 1);
@@ -73915,11 +78085,47 @@ DUK_LOCAL void duk__handle_catch(duk_hthread *thr, duk_tval *tv_val_unstable, du
 	cat = act->cat;
 	DUK_ASSERT(cat != NULL);
 
-	act->curr_pc = cat->pc_base + 0;  /* +0 = catch */
+	act->curr_pc = cat->pc_base + 0; /* +0 = catch */
+
+	/*
+	 *  If the catch block has an automatic catch variable binding,
+	 *  we need to create a lexical environment for it which requires
+	 *  allocations.  Move out of "error handling state" before the
+	 *  allocations to avoid e.g. out-of-memory errors (leading to
+	 *  GH-2022 or similar).
+	 */
+
+	if (DUK_CAT_HAS_CATCH_BINDING_ENABLED(cat)) {
+		DUK_DDD(DUK_DDDPRINT("catcher has an automatic catch binding, handle in part 2"));
+		*out_delayed_catch_setup = 1;
+	} else {
+		DUK_DDD(DUK_DDDPRINT("catcher has no catch binding"));
+	}
+
+	DUK_CAT_CLEAR_CATCH_ENABLED(cat);
+}
+
+DUK_LOCAL void duk__handle_catch_part2(duk_hthread *thr) {
+	duk_activation *act;
+	duk_catcher *cat;
+	duk_hdecenv *new_env;
+
+	DUK_ASSERT(thr != NULL);
+
+	act = thr->callstack_curr;
+	DUK_ASSERT(act != NULL);
+	DUK_DD(DUK_DDPRINT("handle catch, part 2; act=%!A, cat=%!C", act, act->cat));
+
+	DUK_ASSERT(act->cat != NULL);
+	cat = act->cat;
+	DUK_ASSERT(cat != NULL);
+	DUK_ASSERT(DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_TCF);
+	DUK_ASSERT(DUK_CAT_HAS_CATCH_BINDING_ENABLED(cat));
+	DUK_ASSERT(thr->valstack + cat->idx_base < thr->valstack_top);
 
 	/*
-	 *  If entering a 'catch' block which requires an automatic
-	 *  catch variable binding, create the lexical environment.
+	 *  Create lexical environment for the catch clause, containing
+	 *  a binding for the caught value.
 	 *
 	 *  The binding is mutable (= writable) but not deletable.
 	 *  Step 4 for the catch production in E5 Section 12.14;
@@ -73927,70 +78133,54 @@ DUK_LOCAL void duk__handle_catch(duk_hthread *thr, duk_tval *tv_val_unstable, du
 	 *  which implies the binding is not deletable.
 	 */
 
-	if (DUK_CAT_HAS_CATCH_BINDING_ENABLED(cat)) {
-		duk_hdecenv *new_env;
-
-		DUK_DDD(DUK_DDDPRINT("catcher has an automatic catch binding"));
+	if (act->lex_env == NULL) {
+		DUK_ASSERT(act->var_env == NULL);
+		DUK_DDD(DUK_DDDPRINT("delayed environment initialization"));
 
-		DUK_ASSERT(thr->callstack_top >= 1);
+		duk_js_init_activation_environment_records_delayed(thr, act);
 		DUK_ASSERT(act == thr->callstack_curr);
 		DUK_ASSERT(act != NULL);
+	}
+	DUK_ASSERT(act->lex_env != NULL);
+	DUK_ASSERT(act->var_env != NULL);
+	DUK_ASSERT(DUK_ACT_GET_FUNC(act) != NULL);
 
-		if (act->lex_env == NULL) {
-			DUK_ASSERT(act->var_env == NULL);
-			DUK_DDD(DUK_DDDPRINT("delayed environment initialization"));
-
-			duk_js_init_activation_environment_records_delayed(thr, act);
-			DUK_ASSERT(act == thr->callstack_curr);
-			DUK_ASSERT(act != NULL);
-		}
-		DUK_ASSERT(act->lex_env != NULL);
-		DUK_ASSERT(act->var_env != NULL);
-		DUK_ASSERT(DUK_ACT_GET_FUNC(act) != NULL);
+	new_env = duk_hdecenv_alloc(thr, DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DECENV));
+	DUK_ASSERT(new_env != NULL);
+	duk_push_hobject(thr, (duk_hobject *) new_env);
+	DUK_ASSERT(DUK_HOBJECT_GET_PROTOTYPE(thr->heap, (duk_hobject *) new_env) == NULL);
+	DUK_DDD(DUK_DDDPRINT("new_env allocated: %!iO", (duk_heaphdr *) new_env));
 
-		/* XXX: If an out-of-memory happens here, longjmp state asserts
-		 * will be triggered at present and a try-catch fails to catch.
-		 * That's not sandboxing fatal (C API protected calls are what
-		 * matters), and script catch code can immediately throw anyway
-		 * for almost any operation.
-		 */
-		new_env = duk_hdecenv_alloc(thr,
-		                            DUK_HOBJECT_FLAG_EXTENSIBLE |
-		                            DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DECENV));
-		DUK_ASSERT(new_env != NULL);
-		duk_push_hobject(thr, (duk_hobject *) new_env);
-		DUK_ASSERT(DUK_HOBJECT_GET_PROTOTYPE(thr->heap, (duk_hobject *) new_env) == NULL);
-		DUK_DDD(DUK_DDDPRINT("new_env allocated: %!iO", (duk_heaphdr *) new_env));
+	/* Note: currently the catch binding is handled without a register
+	 * binding because we don't support dynamic register bindings (they
+	 * must be fixed for an entire function).  So, there is no need to
+	 * record regbases etc.
+	 */
 
-		/* Note: currently the catch binding is handled without a register
-		 * binding because we don't support dynamic register bindings (they
-		 * must be fixed for an entire function).  So, there is no need to
-		 * record regbases etc.
-		 */
+	/* [ ...env ] */
 
-		/* XXX: duk_xdef_prop() may cause an out-of-memory, see above. */
-		DUK_ASSERT(cat->h_varname != NULL);
-		duk_push_hstring(thr, cat->h_varname);
-		duk_push_tval(thr, thr->valstack + cat->idx_base);
-		duk_xdef_prop(thr, -3, DUK_PROPDESC_FLAGS_W);  /* writable, not configurable */
+	DUK_ASSERT(cat->h_varname != NULL);
+	duk_push_hstring(thr, cat->h_varname);
+	DUK_ASSERT(thr->valstack + cat->idx_base < thr->valstack_top);
+	duk_push_tval(thr, thr->valstack + cat->idx_base);
+	duk_xdef_prop(thr, -3, DUK_PROPDESC_FLAGS_W); /* writable, not configurable */
 
-		DUK_ASSERT(act == thr->callstack_curr);
-		DUK_ASSERT(act != NULL);
-		DUK_HOBJECT_SET_PROTOTYPE(thr->heap, (duk_hobject *) new_env, act->lex_env);
-		act->lex_env = (duk_hobject *) new_env;
-		DUK_HOBJECT_INCREF(thr, (duk_hobject *) new_env);  /* reachable through activation */
-		/* Net refcount change to act->lex_env is 0: incref for new_env's
-		 * prototype, decref for act->lex_env overwrite.
-		 */
+	/* [ ... env ] */
 
-		DUK_CAT_SET_LEXENV_ACTIVE(cat);
+	DUK_ASSERT(act == thr->callstack_curr);
+	DUK_ASSERT(act != NULL);
+	DUK_HOBJECT_SET_PROTOTYPE(thr->heap, (duk_hobject *) new_env, act->lex_env);
+	act->lex_env = (duk_hobject *) new_env;
+	DUK_HOBJECT_INCREF(thr, (duk_hobject *) new_env); /* reachable through activation */
+	/* Net refcount change to act->lex_env is 0: incref for new_env's
+	 * prototype, decref for act->lex_env overwrite.
+	 */
 
-		duk_pop_unsafe(thr);
+	DUK_CAT_SET_LEXENV_ACTIVE(cat);
 
-		DUK_DDD(DUK_DDDPRINT("new_env finished: %!iO", (duk_heaphdr *) new_env));
-	}
+	duk_pop_unsafe(thr);
 
-	DUK_CAT_CLEAR_CATCH_ENABLED(cat);
+	DUK_DDD(DUK_DDDPRINT("new_env finished: %!iO", (duk_heaphdr *) new_env));
 }
 
 DUK_LOCAL void duk__handle_finally(duk_hthread *thr, duk_tval *tv_val_unstable, duk_small_uint_t lj_type) {
@@ -74023,7 +78213,7 @@ DUK_LOCAL void duk__handle_finally(duk_hthread *thr, duk_tval *tv_val_unstable,
 	cat = act->cat;
 	DUK_ASSERT(cat != NULL);
 
-	act->curr_pc = cat->pc_base + 1;  /* +1 = finally */
+	act->curr_pc = cat->pc_base + 1; /* +1 = finally */
 
 	DUK_CAT_CLEAR_FINALLY_ENABLED(cat);
 }
@@ -74072,18 +78262,21 @@ DUK_LOCAL void duk__handle_yield(duk_hthread *thr, duk_hthread *resumer, duk_tva
 	act_resumer = resumer->callstack_curr;
 	DUK_ASSERT(act_resumer != NULL);
 	DUK_ASSERT(DUK_ACT_GET_FUNC(act_resumer) != NULL);
-	DUK_ASSERT(DUK_HOBJECT_IS_COMPFUNC(DUK_ACT_GET_FUNC(act_resumer)));  /* resume caller must be an ECMAScript func */
+	DUK_ASSERT(DUK_HOBJECT_IS_COMPFUNC(DUK_ACT_GET_FUNC(act_resumer))); /* resume caller must be an ECMAScript func */
 
-	tv1 = (duk_tval *) (void *) ((duk_uint8_t *) resumer->valstack + act_resumer->retval_byteoff);  /* return value from Duktape.Thread.resume() */
-	DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv_val_unstable);  /* side effects */  /* XXX: avoid side effects */
+	tv1 = (duk_tval *) (void *) ((duk_uint8_t *) resumer->valstack +
+	                             act_resumer->retval_byteoff); /* return value from Duktape.Thread.resume() */
+	DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv_val_unstable); /* side effects */ /* XXX: avoid side effects */
 
 	duk__reconfig_valstack_ecma_return(resumer);
 
 	/* caller must change active thread, and set thr->resumer to NULL */
 }
-#endif  /* DUK_USE_COROUTINE_SUPPORT */
+#endif /* DUK_USE_COROUTINE_SUPPORT */
 
-DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation *entry_act) {
+DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr,
+                                               duk_activation *entry_act,
+                                               volatile duk_bool_t *out_delayed_catch_setup) {
 	duk_small_uint_t retval = DUK__LONGJMP_RESTART;
 
 	DUK_ASSERT(thr != NULL);
@@ -74104,16 +78297,16 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
 	 *    - 'thr' must reflect the "throwing" thread
 	 */
 
- check_longjmp:
+check_longjmp:
 
-	DUK_DD(DUK_DDPRINT("handling longjmp: type=%ld, value1=%!T, value2=%!T, iserror=%ld",
+	DUK_DD(DUK_DDPRINT("handling longjmp: type=%ld, value1=%!T, value2=%!T, iserror=%ld, top=%ld",
 	                   (long) thr->heap->lj.type,
 	                   (duk_tval *) &thr->heap->lj.value1,
 	                   (duk_tval *) &thr->heap->lj.value2,
-	                   (long) thr->heap->lj.iserror));
+	                   (long) thr->heap->lj.iserror,
+	                   (long) duk_get_top(thr)));
 
 	switch (thr->heap->lj.type) {
-
 #if defined(DUK_USE_COROUTINE_SUPPORT)
 	case DUK_LJ_TYPE_RESUME: {
 		/*
@@ -74127,15 +78320,15 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
 
 		/* duk_bi_duk_object_yield() and duk_bi_duk_object_resume() ensure all of these are met */
 
-		DUK_ASSERT(thr->state == DUK_HTHREAD_STATE_RUNNING);                                                         /* unchanged by Duktape.Thread.resume() */
-		DUK_ASSERT(thr->callstack_top >= 2);                                                                         /* ECMAScript activation + Duktape.Thread.resume() activation */
+		DUK_ASSERT(thr->state == DUK_HTHREAD_STATE_RUNNING); /* unchanged by Duktape.Thread.resume() */
+		DUK_ASSERT(thr->callstack_top >= 2); /* ECMAScript activation + Duktape.Thread.resume() activation */
 		DUK_ASSERT(thr->callstack_curr != NULL);
 		DUK_ASSERT(thr->callstack_curr->parent != NULL);
 		DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack_curr) != NULL &&
 		           DUK_HOBJECT_IS_NATFUNC(DUK_ACT_GET_FUNC(thr->callstack_curr)) &&
 		           ((duk_hnatfunc *) DUK_ACT_GET_FUNC(thr->callstack_curr))->func == duk_bi_thread_resume);
 
-		tv = &thr->heap->lj.value2;  /* resumee */
+		tv = &thr->heap->lj.value2; /* resumee */
 		DUK_ASSERT(DUK_TVAL_IS_OBJECT(tv));
 		DUK_ASSERT(DUK_TVAL_GET_OBJECT(tv) != NULL);
 		DUK_ASSERT(DUK_HOBJECT_IS_THREAD(DUK_TVAL_GET_OBJECT(tv)));
@@ -74144,15 +78337,15 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
 		DUK_ASSERT(resumee != NULL);
 		DUK_ASSERT(resumee->resumer == NULL);
 		DUK_ASSERT(resumee->state == DUK_HTHREAD_STATE_INACTIVE ||
-		           resumee->state == DUK_HTHREAD_STATE_YIELDED);                                                     /* checked by Duktape.Thread.resume() */
+		           resumee->state == DUK_HTHREAD_STATE_YIELDED); /* checked by Duktape.Thread.resume() */
 		DUK_ASSERT(resumee->state != DUK_HTHREAD_STATE_YIELDED ||
-		           resumee->callstack_top >= 2);                                                                     /* YIELDED: ECMAScript activation + Duktape.Thread.yield() activation */
+		           resumee->callstack_top >= 2); /* YIELDED: ECMAScript activation + Duktape.Thread.yield() activation */
 		DUK_ASSERT(resumee->state != DUK_HTHREAD_STATE_YIELDED ||
 		           (DUK_ACT_GET_FUNC(resumee->callstack_curr) != NULL &&
 		            DUK_HOBJECT_IS_NATFUNC(DUK_ACT_GET_FUNC(resumee->callstack_curr)) &&
 		            ((duk_hnatfunc *) DUK_ACT_GET_FUNC(resumee->callstack_curr))->func == duk_bi_thread_yield));
 		DUK_ASSERT(resumee->state != DUK_HTHREAD_STATE_INACTIVE ||
-		           resumee->callstack_top == 0);                                                                     /* INACTIVE: no activation, single function value on valstack */
+		           resumee->callstack_top == 0); /* INACTIVE: no activation, single function value on valstack */
 
 		if (thr->heap->lj.iserror) {
 			/*
@@ -74178,7 +78371,7 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
 			/* thr->heap->lj.value1 is already the value to throw */
 			/* thr->heap->lj.value2 is 'thread', will be wiped out at the end */
 
-			DUK_ASSERT(thr->heap->lj.iserror);  /* already set */
+			DUK_ASSERT(thr->heap->lj.iserror); /* already set */
 
 			DUK_DD(DUK_DDPRINT("-> resume with an error, converted to a throw in the resumee, propagate"));
 			goto check_longjmp;
@@ -74191,17 +78384,18 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
 			duk_activation *act_resumee;
 
 			DUK_ASSERT(resumee->callstack_top >= 2);
-			act_resumee = resumee->callstack_curr;  /* Duktape.Thread.yield() */
+			act_resumee = resumee->callstack_curr; /* Duktape.Thread.yield() */
 			DUK_ASSERT(act_resumee != NULL);
-			act_resumee = act_resumee->parent;      /* ECMAScript call site for yield() */
+			act_resumee = act_resumee->parent; /* ECMAScript call site for yield() */
 			DUK_ASSERT(act_resumee != NULL);
 
-			tv = (duk_tval *) (void *) ((duk_uint8_t *) resumee->valstack + act_resumee->retval_byteoff);  /* return value from Duktape.Thread.yield() */
+			tv = (duk_tval *) (void *) ((duk_uint8_t *) resumee->valstack +
+			                            act_resumee->retval_byteoff); /* return value from Duktape.Thread.yield() */
 			DUK_ASSERT(tv >= resumee->valstack && tv < resumee->valstack_top);
 			tv2 = &thr->heap->lj.value1;
-			DUK_TVAL_SET_TVAL_UPDREF(thr, tv, tv2);  /* side effects */  /* XXX: avoid side effects */
+			DUK_TVAL_SET_TVAL_UPDREF(thr, tv, tv2); /* side effects */ /* XXX: avoid side effects */
 
-			duk_hthread_activation_unwind_norz(resumee);  /* unwind to 'yield' caller */
+			duk_hthread_activation_unwind_norz(resumee); /* unwind to 'yield' caller */
 			/* no need to unwind catch stack */
 
 			duk__reconfig_valstack_ecma_return(resumee);
@@ -74231,7 +78425,7 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
 
 			/* resumee: [... initial_func undefined(= this) resume_value ] */
 
-			call_flags = DUK_CALL_FLAG_ALLOW_ECMATOECMA;  /* not tailcall, ecma-to-ecma (assumed to succeed) */
+			call_flags = DUK_CALL_FLAG_ALLOW_ECMATOECMA; /* not tailcall, ecma-to-ecma (assumed to succeed) */
 
 			setup_rc = duk_handle_call_unprotected_nargs(resumee, 1 /*nargs*/, call_flags);
 			if (setup_rc == 0) {
@@ -74258,7 +78452,7 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
 			goto wipe_and_return;
 		}
 		DUK_UNREACHABLE();
-		break;  /* never here */
+		break; /* never here */
 	}
 
 	case DUK_LJ_TYPE_YIELD: {
@@ -74276,31 +78470,31 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
 
 		/* duk_bi_duk_object_yield() and duk_bi_duk_object_resume() ensure all of these are met */
 
-#if 0  /* entry_thread not available for assert */
+#if 0 /* entry_thread not available for assert */
 		DUK_ASSERT(thr != entry_thread);                                                                             /* Duktape.Thread.yield() should prevent */
 #endif
-		DUK_ASSERT(thr->state == DUK_HTHREAD_STATE_RUNNING);                                                         /* unchanged from Duktape.Thread.yield() */
-		DUK_ASSERT(thr->callstack_top >= 2);                                                                         /* ECMAScript activation + Duktape.Thread.yield() activation */
+		DUK_ASSERT(thr->state == DUK_HTHREAD_STATE_RUNNING); /* unchanged from Duktape.Thread.yield() */
+		DUK_ASSERT(thr->callstack_top >= 2); /* ECMAScript activation + Duktape.Thread.yield() activation */
 		DUK_ASSERT(thr->callstack_curr != NULL);
 		DUK_ASSERT(thr->callstack_curr->parent != NULL);
 		DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack_curr) != NULL &&
 		           DUK_HOBJECT_IS_NATFUNC(DUK_ACT_GET_FUNC(thr->callstack_curr)) &&
 		           ((duk_hnatfunc *) DUK_ACT_GET_FUNC(thr->callstack_curr))->func == duk_bi_thread_yield);
 		DUK_ASSERT(DUK_ACT_GET_FUNC(thr->callstack_curr->parent) != NULL &&
-		           DUK_HOBJECT_IS_COMPFUNC(DUK_ACT_GET_FUNC(thr->callstack_curr->parent)));                              /* an ECMAScript function */
+		           DUK_HOBJECT_IS_COMPFUNC(DUK_ACT_GET_FUNC(thr->callstack_curr->parent))); /* an ECMAScript function */
 
 		resumer = thr->resumer;
 
 		DUK_ASSERT(resumer != NULL);
-		DUK_ASSERT(resumer->state == DUK_HTHREAD_STATE_RESUMED);                                                     /* written by a previous RESUME handling */
-		DUK_ASSERT(resumer->callstack_top >= 2);                                                                     /* ECMAScript activation + Duktape.Thread.resume() activation */
+		DUK_ASSERT(resumer->state == DUK_HTHREAD_STATE_RESUMED); /* written by a previous RESUME handling */
+		DUK_ASSERT(resumer->callstack_top >= 2); /* ECMAScript activation + Duktape.Thread.resume() activation */
 		DUK_ASSERT(resumer->callstack_curr != NULL);
 		DUK_ASSERT(resumer->callstack_curr->parent != NULL);
 		DUK_ASSERT(DUK_ACT_GET_FUNC(resumer->callstack_curr) != NULL &&
 		           DUK_HOBJECT_IS_NATFUNC(DUK_ACT_GET_FUNC(resumer->callstack_curr)) &&
 		           ((duk_hnatfunc *) DUK_ACT_GET_FUNC(resumer->callstack_curr))->func == duk_bi_thread_resume);
 		DUK_ASSERT(DUK_ACT_GET_FUNC(resumer->callstack_curr->parent) != NULL &&
-		           DUK_HOBJECT_IS_COMPFUNC(DUK_ACT_GET_FUNC(resumer->callstack_curr->parent)));                            /* an ECMAScript function */
+		           DUK_HOBJECT_IS_COMPFUNC(DUK_ACT_GET_FUNC(resumer->callstack_curr->parent))); /* an ECMAScript function */
 
 		if (thr->heap->lj.iserror) {
 			thr->state = DUK_HTHREAD_STATE_YIELDED;
@@ -74312,31 +78506,35 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
 
 			thr->heap->lj.type = DUK_LJ_TYPE_THROW;
 			/* lj.value1 is already set */
-			DUK_ASSERT(thr->heap->lj.iserror);  /* already set */
+			DUK_ASSERT(thr->heap->lj.iserror); /* already set */
 
 			DUK_DD(DUK_DDPRINT("-> yield an error, converted to a throw in the resumer, propagate"));
 			goto check_longjmp;
 		} else {
-			duk_hthread_activation_unwind_norz(resumer);
-			duk__handle_yield(thr, resumer, &thr->heap->lj.value1);
+			/* When handling the yield, the last reference to
+			 * 'thr' may disappear.
+			 */
 
+			DUK_GC_TORTURE(resumer->heap);
+			duk_hthread_activation_unwind_norz(resumer);
+			DUK_GC_TORTURE(resumer->heap);
 			thr->state = DUK_HTHREAD_STATE_YIELDED;
 			thr->resumer = NULL;
 			DUK_HTHREAD_DECREF_NORZ(thr, resumer);
 			resumer->state = DUK_HTHREAD_STATE_RUNNING;
 			DUK_HEAP_SWITCH_THREAD(thr->heap, resumer);
-#if 0
-			thr = resumer;  /* not needed, as we exit right away */
-#endif
+			duk__handle_yield(thr, resumer, &thr->heap->lj.value1);
+			thr = resumer;
+			DUK_GC_TORTURE(resumer->heap);
 
 			DUK_DD(DUK_DDPRINT("-> yield a value, restart execution in resumer"));
 			retval = DUK__LONGJMP_RESTART;
 			goto wipe_and_return;
 		}
 		DUK_UNREACHABLE();
-		break;  /* never here */
+		break; /* never here */
 	}
-#endif  /* DUK_USE_COROUTINE_SUPPORT */
+#endif /* DUK_USE_COROUTINE_SUPPORT */
 
 	case DUK_LJ_TYPE_THROW: {
 		/*
@@ -74376,9 +78574,14 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
 				if (DUK_CAT_HAS_CATCH_ENABLED(cat)) {
 					DUK_ASSERT(DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_TCF);
 
-					duk__handle_catch(thr,
-					                  &thr->heap->lj.value1,
-					                  DUK_LJ_TYPE_THROW);
+					DUK_DDD(DUK_DDDPRINT("before catch part 1: thr=%p, act=%p, cat=%p",
+					                     (void *) thr,
+					                     (void *) act,
+					                     (void *) act->cat));
+					duk__handle_catch_part1(thr,
+					                        &thr->heap->lj.value1,
+					                        DUK_LJ_TYPE_THROW,
+					                        out_delayed_catch_setup);
 
 					DUK_DD(DUK_DDPRINT("-> throw caught by a 'catch' clause, restart execution"));
 					retval = DUK__LONGJMP_RESTART;
@@ -74389,9 +78592,7 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
 					DUK_ASSERT(DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_TCF);
 					DUK_ASSERT(!DUK_CAT_HAS_CATCH_ENABLED(cat));
 
-					duk__handle_finally(thr,
-					                    &thr->heap->lj.value1,
-					                    DUK_LJ_TYPE_THROW);
+					duk__handle_finally(thr, &thr->heap->lj.value1, DUK_LJ_TYPE_THROW);
 
 					DUK_DD(DUK_DDPRINT("-> throw caught by a 'finally' clause, restart execution"));
 					retval = DUK__LONGJMP_RESTART;
@@ -74421,20 +78622,21 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
 		 */
 
 		DUK_ASSERT(thr->resumer != NULL);
-		DUK_ASSERT(thr->resumer->callstack_top >= 2);  /* ECMAScript activation + Duktape.Thread.resume() activation */
+		DUK_ASSERT(thr->resumer->callstack_top >= 2); /* ECMAScript activation + Duktape.Thread.resume() activation */
 		DUK_ASSERT(thr->resumer->callstack_curr != NULL);
 		DUK_ASSERT(thr->resumer->callstack_curr->parent != NULL);
-		DUK_ASSERT(DUK_ACT_GET_FUNC(thr->resumer->callstack_curr->parent) != NULL &&
-		           DUK_HOBJECT_IS_COMPFUNC(DUK_ACT_GET_FUNC(thr->resumer->callstack_curr->parent)));  /* an ECMAScript function */
+		DUK_ASSERT(
+		    DUK_ACT_GET_FUNC(thr->resumer->callstack_curr->parent) != NULL &&
+		    DUK_HOBJECT_IS_COMPFUNC(DUK_ACT_GET_FUNC(thr->resumer->callstack_curr->parent))); /* an ECMAScript function */
 
 		resumer = thr->resumer;
 
 		/* reset longjmp */
 
-		DUK_ASSERT(thr->heap->lj.type == DUK_LJ_TYPE_THROW);  /* already set */
+		DUK_ASSERT(thr->heap->lj.type == DUK_LJ_TYPE_THROW); /* already set */
 		/* lj.value1 already set */
 
-		duk_hthread_terminate(thr);  /* updates thread state, minimizes its allocations */
+		duk_hthread_terminate(thr); /* updates thread state, minimizes its allocations */
 		DUK_ASSERT(thr->state == DUK_HTHREAD_STATE_TERMINATED);
 
 		thr->resumer = NULL;
@@ -74445,7 +78647,7 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
 		goto check_longjmp;
 	}
 
-	case DUK_LJ_TYPE_BREAK:  /* pseudotypes, not used in actual longjmps */
+	case DUK_LJ_TYPE_BREAK: /* pseudotypes, not used in actual longjmps */
 	case DUK_LJ_TYPE_CONTINUE:
 	case DUK_LJ_TYPE_RETURN:
 	case DUK_LJ_TYPE_NORMAL:
@@ -74455,24 +78657,24 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
 		goto convert_to_internal_error;
 	}
 
-	}  /* end switch */
+	} /* end switch */
 
 	DUK_UNREACHABLE();
 
- wipe_and_return:
-	/* this is not strictly necessary, but helps debugging */
+wipe_and_return:
+	DUK_DD(DUK_DDPRINT("handling longjmp done, wipe-and-return, top=%ld", (long) duk_get_top(thr)));
 	thr->heap->lj.type = DUK_LJ_TYPE_UNKNOWN;
 	thr->heap->lj.iserror = 0;
 
-	DUK_TVAL_SET_UNDEFINED_UPDREF(thr, &thr->heap->lj.value1);  /* side effects */
-	DUK_TVAL_SET_UNDEFINED_UPDREF(thr, &thr->heap->lj.value2);  /* side effects */
+	DUK_TVAL_SET_UNDEFINED_UPDREF(thr, &thr->heap->lj.value1); /* side effects */
+	DUK_TVAL_SET_UNDEFINED_UPDREF(thr, &thr->heap->lj.value2); /* side effects */
 
 	DUK_GC_TORTURE(thr->heap);
 
- just_return:
+just_return:
 	return retval;
 
- convert_to_internal_error:
+convert_to_internal_error:
 	/* This could also be thrown internally (set the error, goto check_longjmp),
 	 * but it's better for internal errors to bubble outwards so that we won't
 	 * infinite loop in this catchpoint.
@@ -74485,9 +78687,9 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
  * handling because it has a measurable performance impact in ordinary
  * environments and an extreme impact in Emscripten (GH-342).
  */
-DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_break_or_continue(duk_hthread *thr,
-                                                                duk_uint_t label_id,
-                                                                duk_small_uint_t lj_type) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF void duk__handle_break_or_continue(duk_hthread *thr,
+                                                                    duk_uint_t label_id,
+                                                                    duk_small_uint_t lj_type) {
 	duk_activation *act;
 	duk_catcher *cat;
 
@@ -74518,8 +78720,7 @@ DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_break_or_continue(duk_hthread *thr
 
 		/* XXX: bit mask test; FINALLY <-> TCF, single bit mask would suffice? */
 
-		if (DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_TCF &&
-		    DUK_CAT_HAS_FINALLY_ENABLED(cat)) {
+		if (DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_TCF && DUK_CAT_HAS_FINALLY_ENABLED(cat)) {
 			duk_tval tv_tmp;
 
 			DUK_TVAL_SET_U32(&tv_tmp, (duk_uint32_t) label_id);
@@ -74528,11 +78729,11 @@ DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_break_or_continue(duk_hthread *thr
 			DUK_DD(DUK_DDPRINT("-> break/continue caught by 'finally', restart execution"));
 			return;
 		}
-		if (DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_LABEL &&
-		    (duk_uint_t) DUK_CAT_GET_LABEL(cat) == label_id) {
+		if (DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_LABEL && (duk_uint_t) DUK_CAT_GET_LABEL(cat) == label_id) {
 			duk__handle_label(thr, lj_type);
 
-			DUK_DD(DUK_DDPRINT("-> break/continue caught by a label catcher (in the same function), restart execution"));
+			DUK_DD(
+			    DUK_DDPRINT("-> break/continue caught by a label catcher (in the same function), restart execution"));
 			return;
 		}
 
@@ -74540,7 +78741,8 @@ DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_break_or_continue(duk_hthread *thr
 	}
 
 	/* Should never happen, but be robust. */
-	DUK_D(DUK_DPRINT("-> break/continue not caught by anything in the current function (should never happen), throw internal error"));
+	DUK_D(DUK_DPRINT(
+	    "-> break/continue not caught by anything in the current function (should never happen), throw internal error"));
 	DUK_ERROR_INTERNAL(thr);
 	DUK_WO_NORETURN(return;);
 }
@@ -74564,7 +78766,7 @@ DUK_LOCAL duk_small_uint_t duk__handle_return(duk_hthread *thr, duk_activation *
 	DUK_ASSERT(entry_act != NULL);
 	DUK_ASSERT(thr->valstack_top - 1 >= thr->valstack_bottom);
 	tv1 = thr->valstack_top - 1;
-	DUK_TVAL_CHKFAST_INPLACE_FAST(tv1);  /* fastint downgrade check for return values */
+	DUK_TVAL_CHKFAST_INPLACE_FAST(tv1); /* fastint downgrade check for return values */
 
 	/*
 	 *  Four possible outcomes:
@@ -74599,8 +78801,7 @@ DUK_LOCAL duk_small_uint_t duk__handle_return(duk_hthread *thr, duk_activation *
 			break;
 		}
 
-		if (DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_TCF &&
-		    DUK_CAT_HAS_FINALLY_ENABLED(cat)) {
+		if (DUK_CAT_GET_TYPE(cat) == DUK_CAT_TYPE_TCF && DUK_CAT_HAS_FINALLY_ENABLED(cat)) {
 			DUK_ASSERT(thr->valstack_top - 1 >= thr->valstack_bottom);
 			duk__handle_finally(thr, thr->valstack_top - 1, DUK_LJ_TYPE_RETURN);
 
@@ -74631,22 +78832,24 @@ DUK_LOCAL duk_small_uint_t duk__handle_return(duk_hthread *thr, duk_activation *
 
 		DUK_ASSERT(thr->callstack_curr != NULL);
 		DUK_ASSERT(thr->callstack_curr->parent != NULL);
-		DUK_ASSERT(DUK_HOBJECT_IS_COMPFUNC(DUK_ACT_GET_FUNC(thr->callstack_curr->parent)));   /* must be ECMAScript */
+		DUK_ASSERT(DUK_HOBJECT_IS_COMPFUNC(DUK_ACT_GET_FUNC(thr->callstack_curr->parent))); /* must be ECMAScript */
 
 #if defined(DUK_USE_ES6_PROXY)
 		if (thr->callstack_curr->flags & (DUK_ACT_FLAG_CONSTRUCT | DUK_ACT_FLAG_CONSTRUCT_PROXY)) {
-			duk_call_construct_postprocess(thr, thr->callstack_curr->flags & DUK_ACT_FLAG_CONSTRUCT_PROXY);  /* side effects */
+			duk_call_construct_postprocess(thr,
+			                               thr->callstack_curr->flags &
+			                                   DUK_ACT_FLAG_CONSTRUCT_PROXY); /* side effects */
 		}
 #else
 		if (thr->callstack_curr->flags & DUK_ACT_FLAG_CONSTRUCT) {
-			duk_call_construct_postprocess(thr, 0);  /* side effects */
+			duk_call_construct_postprocess(thr, 0); /* side effects */
 		}
 #endif
 
 		tv1 = (duk_tval *) (void *) ((duk_uint8_t *) thr->valstack + thr->callstack_curr->parent->retval_byteoff);
 		DUK_ASSERT(thr->valstack_top - 1 >= thr->valstack_bottom);
 		tv2 = thr->valstack_top - 1;
-		DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2);  /* side effects */
+		DUK_TVAL_SET_TVAL_UPDREF(thr, tv1, tv2); /* side effects */
 
 		/* Catch stack unwind happens inline in callstack unwind. */
 		duk_hthread_activation_unwind_norz(thr);
@@ -74661,14 +78864,15 @@ DUK_LOCAL duk_small_uint_t duk__handle_return(duk_hthread *thr, duk_activation *
 	DUK_DD(DUK_DDPRINT("no calling activation, thread finishes (similar to yield)"));
 
 	DUK_ASSERT(thr->resumer != NULL);
-	DUK_ASSERT(thr->resumer->callstack_top >= 2);  /* ECMAScript activation + Duktape.Thread.resume() activation */
+	DUK_ASSERT(thr->resumer->callstack_top >= 2); /* ECMAScript activation + Duktape.Thread.resume() activation */
 	DUK_ASSERT(thr->resumer->callstack_curr != NULL);
 	DUK_ASSERT(thr->resumer->callstack_curr->parent != NULL);
 	DUK_ASSERT(DUK_ACT_GET_FUNC(thr->resumer->callstack_curr) != NULL &&
-			DUK_HOBJECT_IS_NATFUNC(DUK_ACT_GET_FUNC(thr->resumer->callstack_curr)) &&
-			((duk_hnatfunc *) DUK_ACT_GET_FUNC(thr->resumer->callstack_curr))->func == duk_bi_thread_resume);  /* Duktape.Thread.resume() */
+	           DUK_HOBJECT_IS_NATFUNC(DUK_ACT_GET_FUNC(thr->resumer->callstack_curr)) &&
+	           ((duk_hnatfunc *) DUK_ACT_GET_FUNC(thr->resumer->callstack_curr))->func ==
+	               duk_bi_thread_resume); /* Duktape.Thread.resume() */
 	DUK_ASSERT(DUK_ACT_GET_FUNC(thr->resumer->callstack_curr->parent) != NULL &&
-			DUK_HOBJECT_IS_COMPFUNC(DUK_ACT_GET_FUNC(thr->resumer->callstack_curr->parent)));  /* an ECMAScript function */
+	           DUK_HOBJECT_IS_COMPFUNC(DUK_ACT_GET_FUNC(thr->resumer->callstack_curr->parent))); /* an ECMAScript function */
 	DUK_ASSERT(thr->state == DUK_HTHREAD_STATE_RUNNING);
 	DUK_ASSERT(thr->resumer->state == DUK_HTHREAD_STATE_RESUMED);
 
@@ -74690,11 +78894,11 @@ DUK_LOCAL duk_small_uint_t duk__handle_return(duk_hthread *thr, duk_activation *
 	 */
 
 	DUK_ASSERT(thr->valstack_top - 1 >= thr->valstack_bottom);
-	duk_hthread_activation_unwind_norz(resumer);  /* May remove last reference to 'thr', but is NORZ. */
-	duk_push_tval(resumer, thr->valstack_top - 1);  /* Capture return value, side effect free. */
-	duk_push_hthread(resumer, thr);  /* Make 'thr' reachable again, before side effects. */
+	duk_hthread_activation_unwind_norz(resumer); /* May remove last reference to 'thr', but is NORZ. */
+	duk_push_tval(resumer, thr->valstack_top - 1); /* Capture return value, side effect free. */
+	duk_push_hthread(resumer, thr); /* Make 'thr' reachable again, before side effects. */
 
-	duk_hthread_terminate(thr);  /* Updates thread state, minimizes its allocations. */
+	duk_hthread_terminate(thr); /* Updates thread state, minimizes its allocations. */
 	thr->resumer = NULL;
 	DUK_HTHREAD_DECREF(thr, resumer);
 	DUK_ASSERT(thr->state == DUK_HTHREAD_STATE_TERMINATED);
@@ -74704,7 +78908,7 @@ DUK_LOCAL duk_small_uint_t duk__handle_return(duk_hthread *thr, duk_activation *
 
 	DUK_ASSERT(resumer->valstack_top - 2 >= resumer->valstack_bottom);
 	duk__handle_yield(thr, resumer, resumer->valstack_top - 2);
-	thr = NULL;  /* 'thr' invalidated by call */
+	thr = NULL; /* 'thr' invalidated by call */
 
 #if 0
 	thr = resumer;  /* not needed */
@@ -74746,8 +78950,8 @@ DUK_LOCAL duk_small_uint_t duk__handle_return(duk_hthread *thr, duk_activation *
 
 #if defined(DUK_USE_INTERRUPT_COUNTER)
 
-#define DUK__INT_NOACTION    0    /* no specific action, resume normal execution */
-#define DUK__INT_RESTART     1    /* must "goto restart_execution", e.g. breakpoints changed */
+#define DUK__INT_NOACTION 0 /* no specific action, resume normal execution */
+#define DUK__INT_RESTART  1 /* must "goto restart_execution", e.g. breakpoints changed */
 
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
 DUK_LOCAL void duk__interrupt_handle_debugger(duk_hthread *thr, duk_bool_t *out_immediate, duk_small_uint_t *out_interrupt_retval) {
@@ -74758,7 +78962,7 @@ DUK_LOCAL void duk__interrupt_handle_debugger(duk_hthread *thr, duk_bool_t *out_
 	duk_bool_t process_messages;
 	duk_bool_t processed_messages = 0;
 
-	DUK_ASSERT(thr->heap->dbg_processing == 0);  /* don't re-enter e.g. during Eval */
+	DUK_ASSERT(thr->heap->dbg_processing == 0); /* don't re-enter e.g. during Eval */
 
 	act = thr->callstack_curr;
 	DUK_ASSERT(act != NULL);
@@ -74781,17 +78985,14 @@ DUK_LOCAL void duk__interrupt_handle_debugger(duk_hthread *thr, duk_bool_t *out_
 	 *  Breakpoint and step state checks
 	 */
 
-	if (act->flags & DUK_ACT_FLAG_BREAKPOINT_ACTIVE ||
-	    (thr->heap->dbg_pause_act == thr->callstack_curr)) {
+	if (act->flags & DUK_ACT_FLAG_BREAKPOINT_ACTIVE || (thr->heap->dbg_pause_act == thr->callstack_curr)) {
 		line = duk_debug_curr_line(thr);
 
 		if (act->prev_line != line) {
 			/* Stepped?  Step out is handled by callstack unwind. */
 			if ((thr->heap->dbg_pause_flags & DUK_PAUSE_FLAG_LINE_CHANGE) &&
-			    (thr->heap->dbg_pause_act == thr->callstack_curr) &&
-			    (line != thr->heap->dbg_pause_startline)) {
-				DUK_D(DUK_DPRINT("PAUSE TRIGGERED by line change, at line %ld",
-				                 (long) line));
+			    (thr->heap->dbg_pause_act == thr->callstack_curr) && (line != thr->heap->dbg_pause_startline)) {
+				DUK_D(DUK_DPRINT("PAUSE TRIGGERED by line change, at line %ld", (long) line));
 				duk_debug_set_paused(thr->heap);
 			}
 
@@ -74817,7 +79018,8 @@ DUK_LOCAL void duk__interrupt_handle_debugger(duk_hthread *thr, duk_bool_t *out_
 				DUK_ASSERT(bp->filename != NULL);
 				if (act->prev_line != bp->line && line == bp->line) {
 					DUK_D(DUK_DPRINT("PAUSE TRIGGERED by breakpoint at %!O:%ld",
-					                 (duk_heaphdr *) bp->filename, (long) bp->line));
+					                 (duk_heaphdr *) bp->filename,
+					                 (long) bp->line));
 					duk_debug_set_paused(thr->heap);
 				}
 			}
@@ -74910,11 +79112,10 @@ DUK_LOCAL void duk__interrupt_handle_debugger(duk_hthread *thr, duk_bool_t *out_
 	if (duk_debug_is_attached(thr->heap)) {
 		DUK_ASSERT(act == thr->callstack_curr);
 		DUK_ASSERT(act != NULL);
-		if (act->flags & DUK_ACT_FLAG_BREAKPOINT_ACTIVE ||
-		    (thr->heap->dbg_pause_flags & DUK_PAUSE_FLAG_ONE_OPCODE) ||
+		if (act->flags & DUK_ACT_FLAG_BREAKPOINT_ACTIVE || (thr->heap->dbg_pause_flags & DUK_PAUSE_FLAG_ONE_OPCODE) ||
 		    ((thr->heap->dbg_pause_flags & DUK_PAUSE_FLAG_LINE_CHANGE) &&
 		     thr->heap->dbg_pause_act == thr->callstack_curr) ||
-		     DUK_HEAP_HAS_DEBUGGER_PAUSED(thr->heap)) {
+		    DUK_HEAP_HAS_DEBUGGER_PAUSED(thr->heap)) {
 			*out_immediate = 1;
 		}
 
@@ -74936,9 +79137,9 @@ DUK_LOCAL void duk__interrupt_handle_debugger(duk_hthread *thr, duk_bool_t *out_
 		DUK_D(DUK_DPRINT("debugger became detached, resume normal execution"));
 	}
 }
-#endif  /* DUK_USE_DEBUGGER_SUPPORT */
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
 
-DUK_LOCAL DUK__NOINLINE_PERF DUK_COLD duk_small_uint_t duk__executor_interrupt(duk_hthread *thr) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF DUK_COLD duk_small_uint_t duk__executor_interrupt(duk_hthread *thr) {
 	duk_int_t ctr;
 	duk_activation *act;
 	duk_hcompfunc *fun;
@@ -74953,8 +79154,10 @@ DUK_LOCAL DUK__NOINLINE_PERF DUK_COLD duk_small_uint_t duk__executor_interrupt(d
 	thr->heap->inst_count_interrupt += thr->interrupt_init;
 	DUK_DD(DUK_DDPRINT("execution interrupt, counter=%ld, init=%ld, "
 	                   "instruction counts: executor=%ld, interrupt=%ld",
-	                   (long) thr->interrupt_counter, (long) thr->interrupt_init,
-	                   (long) thr->heap->inst_count_exec, (long) thr->heap->inst_count_interrupt));
+	                   (long) thr->interrupt_counter,
+	                   (long) thr->interrupt_init,
+	                   (long) thr->heap->inst_count_exec,
+	                   (long) thr->heap->inst_count_interrupt));
 #endif
 
 	retval = DUK__INT_NOACTION;
@@ -75016,18 +79219,17 @@ DUK_LOCAL DUK__NOINLINE_PERF DUK_COLD duk_small_uint_t duk__executor_interrupt(d
 		DUK_ERROR_RANGE(thr, "execution timeout");
 		DUK_WO_NORETURN(return 0;);
 	}
-#endif  /* DUK_USE_EXEC_TIMEOUT_CHECK */
+#endif /* DUK_USE_EXEC_TIMEOUT_CHECK */
 
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
-	if (!thr->heap->dbg_processing &&
-	    (thr->heap->dbg_read_cb != NULL || thr->heap->dbg_detaching)) {
+	if (!thr->heap->dbg_processing && (thr->heap->dbg_read_cb != NULL || thr->heap->dbg_detaching)) {
 		/* Avoid recursive re-entry; enter when we're attached or
 		 * detaching (to finish off the pending detach).
 		 */
 		duk__interrupt_handle_debugger(thr, &immediate, &retval);
 		DUK_ASSERT(act == thr->callstack_curr);
 	}
-#endif  /* DUK_USE_DEBUGGER_SUPPORT */
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
 
 	/*
 	 *  Update the interrupt counter
@@ -75050,7 +79252,7 @@ DUK_LOCAL DUK__NOINLINE_PERF DUK_COLD duk_small_uint_t duk__executor_interrupt(d
 
 	return retval;
 }
-#endif  /* DUK_USE_INTERRUPT_COUNTER */
+#endif /* DUK_USE_INTERRUPT_COUNTER */
 
 /*
  *  Debugger handling for executor restart
@@ -75078,7 +79280,7 @@ DUK_LOCAL void duk__executor_recheck_debugger(duk_hthread *thr, duk_activation *
 	bp_active = heap->dbg_breakpoints_active;
 	act->flags &= ~DUK_ACT_FLAG_BREAKPOINT_ACTIVE;
 
-	tv_tmp = duk_hobject_find_existing_entry_tval_ptr(thr->heap, (duk_hobject *) fun, DUK_HTHREAD_STRING_FILE_NAME(thr));
+	tv_tmp = duk_hobject_find_entry_tval_ptr_stridx(thr->heap, (duk_hobject *) fun, DUK_STRIDX_FILE_NAME);
 	if (tv_tmp && DUK_TVAL_IS_STRING(tv_tmp)) {
 		filename = DUK_TVAL_GET_STRING(tv_tmp);
 
@@ -75118,8 +79320,7 @@ DUK_LOCAL void duk__executor_recheck_debugger(duk_hthread *thr, duk_activation *
 			duk_hcompfunc *inner_fun;
 			duk_bool_t bp_match;
 
-			if (bp->filename == filename &&
-			    bp->line >= fun->start_line && bp->line <= fun->end_line) {
+			if (bp->filename == filename && bp->line >= fun->start_line && bp->line <= fun->end_line) {
 				bp_match = 1;
 				DUK_DD(DUK_DDPRINT("breakpoint filename and line match: "
 				                   "%s:%ld vs. %s (line %ld vs. %ld-%ld)",
@@ -75156,13 +79357,12 @@ DUK_LOCAL void duk__executor_recheck_debugger(duk_hthread *thr, duk_activation *
 		}
 	}
 
-	*bp_active = NULL;  /* terminate */
+	*bp_active = NULL; /* terminate */
 
 	DUK_DD(DUK_DDPRINT("ACTIVE BREAKPOINTS: %ld", (long) (bp_active - thr->heap->dbg_breakpoints_active)));
 
 	/* Force pause if we were doing "step into" in another activation. */
-	if ((thr->heap->dbg_pause_flags & DUK_PAUSE_FLAG_FUNC_ENTRY) &&
-	    thr->heap->dbg_pause_act != thr->callstack_curr) {
+	if ((thr->heap->dbg_pause_flags & DUK_PAUSE_FLAG_FUNC_ENTRY) && thr->heap->dbg_pause_act != thr->callstack_curr) {
 		DUK_D(DUK_DPRINT("PAUSE TRIGGERED by function entry"));
 		duk_debug_set_paused(thr->heap);
 	}
@@ -75170,10 +79370,8 @@ DUK_LOCAL void duk__executor_recheck_debugger(duk_hthread *thr, duk_activation *
 	/* Force interrupt right away if we're paused or in "checked mode".
 	 * Step out is handled by callstack unwind.
 	 */
-	if ((act->flags & DUK_ACT_FLAG_BREAKPOINT_ACTIVE) ||
-	    DUK_HEAP_HAS_DEBUGGER_PAUSED(thr->heap) ||
-	    ((thr->heap->dbg_pause_flags & DUK_PAUSE_FLAG_LINE_CHANGE) &&
-	     thr->heap->dbg_pause_act == thr->callstack_curr)) {
+	if ((act->flags & DUK_ACT_FLAG_BREAKPOINT_ACTIVE) || DUK_HEAP_HAS_DEBUGGER_PAUSED(thr->heap) ||
+	    ((thr->heap->dbg_pause_flags & DUK_PAUSE_FLAG_LINE_CHANGE) && thr->heap->dbg_pause_act == thr->callstack_curr)) {
 		/* We'll need to interrupt early so recompute the init
 		 * counter to reflect the number of bytecode instructions
 		 * executed so that step counts for e.g. debugger rate
@@ -75184,14 +79382,14 @@ DUK_LOCAL void duk__executor_recheck_debugger(duk_hthread *thr, duk_activation *
 		thr->interrupt_counter = 0;
 	}
 }
-#endif  /* DUK_USE_DEBUGGER_SUPPORT */
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
 
 /*
  *  Opcode handlers for opcodes with a lot of code and which are relatively
  *  rare; NOINLINE to reduce amount of code in main bytecode dispatcher.
  */
 
-DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_initset_initget(duk_hthread *thr, duk_uint_fast32_t ins) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF void duk__handle_op_initset_initget(duk_hthread *thr, duk_uint_fast32_t ins) {
 	duk_bool_t is_set = (DUK_DEC_OP(ins) == DUK_OP_INITSET);
 	duk_uint_fast_t idx;
 	duk_uint_t defprop_flags;
@@ -75208,23 +79406,19 @@ DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_initset_initget(duk_hthread *th
 	/* This could be made more optimal by accessing internals directly. */
 
 	idx = (duk_uint_fast_t) DUK_DEC_BC(ins);
-	duk_dup(thr, (duk_idx_t) (idx + 0));  /* key */
-	duk_dup(thr, (duk_idx_t) (idx + 1));  /* getter/setter */
+	duk_dup(thr, (duk_idx_t) (idx + 0)); /* key */
+	duk_dup(thr, (duk_idx_t) (idx + 1)); /* getter/setter */
 	if (is_set) {
-	        defprop_flags = DUK_DEFPROP_HAVE_SETTER |
-	                        DUK_DEFPROP_FORCE |
-	                        DUK_DEFPROP_SET_ENUMERABLE |
-	                        DUK_DEFPROP_SET_CONFIGURABLE;
+		defprop_flags =
+		    DUK_DEFPROP_HAVE_SETTER | DUK_DEFPROP_FORCE | DUK_DEFPROP_SET_ENUMERABLE | DUK_DEFPROP_SET_CONFIGURABLE;
 	} else {
-	        defprop_flags = DUK_DEFPROP_HAVE_GETTER |
-	                        DUK_DEFPROP_FORCE |
-	                        DUK_DEFPROP_SET_ENUMERABLE |
-	                        DUK_DEFPROP_SET_CONFIGURABLE;
+		defprop_flags =
+		    DUK_DEFPROP_HAVE_GETTER | DUK_DEFPROP_FORCE | DUK_DEFPROP_SET_ENUMERABLE | DUK_DEFPROP_SET_CONFIGURABLE;
 	}
 	duk_def_prop(thr, (duk_idx_t) DUK_DEC_A(ins), defprop_flags);
 }
 
-DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_trycatch(duk_hthread *thr, duk_uint_fast32_t ins, duk_instr_t *curr_pc) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF void duk__handle_op_trycatch(duk_hthread *thr, duk_uint_fast32_t ins, duk_instr_t *curr_pc) {
 	duk_activation *act;
 	duk_catcher *cat;
 	duk_tval *tv1;
@@ -75284,7 +79478,7 @@ DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_trycatch(duk_hthread *thr, duk_
 	 * error handling, so there's no side effect problem even if the
 	 * error value has a finalizer.
 	 */
-	duk_dup(thr, (duk_idx_t) bc);  /* Stabilize value. */
+	duk_dup(thr, (duk_idx_t) bc); /* Stabilize value. */
 	duk_to_undefined(thr, (duk_idx_t) bc);
 	duk_to_undefined(thr, (duk_idx_t) (bc + 1));
 
@@ -75299,7 +79493,7 @@ DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_trycatch(duk_hthread *thr, duk_
 
 	cat->flags = DUK_CAT_TYPE_TCF;
 	cat->h_varname = NULL;
-	cat->pc_base = (duk_instr_t *) curr_pc;  /* pre-incremented, points to first jump slot */
+	cat->pc_base = (duk_instr_t *) curr_pc; /* pre-incremented, points to first jump slot */
 	cat->idx_base = (duk_size_t) (thr->valstack_bottom - thr->valstack) + bc;
 
 	act = thr->callstack_curr;
@@ -75338,7 +79532,7 @@ DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_trycatch(duk_hthread *thr, duk_
 
 			duk_js_init_activation_environment_records_delayed(thr, act);
 			DUK_ASSERT(act == thr->callstack_curr);
-			DUK_UNREF(act);  /* 'act' is no longer accessed, scanbuild fix */
+			DUK_UNREF(act); /* 'act' is no longer accessed, scanbuild fix */
 		}
 		DUK_ASSERT(act->lex_env != NULL);
 		DUK_ASSERT(act->var_env != NULL);
@@ -75351,22 +79545,20 @@ DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_trycatch(duk_hthread *thr, duk_
 		 * so avoid side effects very carefully until it is
 		 * referenced.
 		 */
-		env = duk_hobjenv_alloc(thr,
-		                        DUK_HOBJECT_FLAG_EXTENSIBLE |
-		                        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJENV));
+		env = duk_hobjenv_alloc(thr, DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_OBJENV));
 		DUK_ASSERT(env != NULL);
 		DUK_ASSERT(DUK_HOBJECT_GET_PROTOTYPE(thr->heap, (duk_hobject *) env) == NULL);
-		env->target = target;  /* always provideThis=true */
+		env->target = target; /* always provideThis=true */
 		DUK_HOBJECT_INCREF(thr, target);
 		env->has_this = 1;
-		DUK_ASSERT_HOBJENV_VALID(env);
+		DUK_HOBJENV_ASSERT_VALID(env);
 		DUK_DDD(DUK_DDDPRINT("environment for with binding: %!iO", env));
 
 		DUK_ASSERT(act == thr->callstack_curr);
 		DUK_ASSERT(DUK_HOBJECT_GET_PROTOTYPE(thr->heap, (duk_hobject *) env) == NULL);
 		DUK_ASSERT(act->lex_env != NULL);
 		DUK_HOBJECT_SET_PROTOTYPE(thr->heap, (duk_hobject *) env, act->lex_env);
-		act->lex_env = (duk_hobject *) env;  /* Now reachable. */
+		act->lex_env = (duk_hobject *) env; /* Now reachable. */
 		DUK_HOBJECT_INCREF(thr, (duk_hobject *) env);
 		/* Net refcount change to act->lex_env is 0: incref for env's
 		 * prototype, decref for act->lex_env overwrite.
@@ -75375,7 +79567,7 @@ DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_trycatch(duk_hthread *thr, duk_
 		/* Set catcher lex_env active (affects unwind)
 		 * only when the whole setup is complete.
 		 */
-		cat = act->cat;  /* XXX: better to relookup? not mandatory because 'cat' is stable */
+		cat = act->cat; /* XXX: better to relookup? not mandatory because 'cat' is stable */
 		cat->flags |= DUK_CAT_FLAG_LEXENV_ACTIVE;
 	} else {
 		;
@@ -75384,12 +79576,14 @@ DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_trycatch(duk_hthread *thr, duk_
 	DUK_DDD(DUK_DDDPRINT("TRYCATCH catcher: flags=0x%08lx, pc_base=%ld, "
 	                     "idx_base=%ld, h_varname=%!O",
 	                     (unsigned long) cat->flags,
-	                     (long) cat->pc_base, (long) cat->idx_base, (duk_heaphdr *) cat->h_varname));
+	                     (long) cat->pc_base,
+	                     (long) cat->idx_base,
+	                     (duk_heaphdr *) cat->h_varname));
 
 	duk_pop_unsafe(thr);
 }
 
-DUK_LOCAL DUK__NOINLINE_PERF duk_instr_t *duk__handle_op_endtry(duk_hthread *thr, duk_uint_fast32_t ins) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF duk_instr_t *duk__handle_op_endtry(duk_hthread *thr, duk_uint_fast32_t ins) {
 	duk_activation *act;
 	duk_catcher *cat;
 	duk_tval *tv1;
@@ -75414,26 +79608,27 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_instr_t *duk__handle_op_endtry(duk_hthread *thr
 
 		tv1 = thr->valstack + cat->idx_base;
 		DUK_ASSERT(tv1 >= thr->valstack && tv1 < thr->valstack_top);
-		DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv1);  /* side effects */
+		DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv1); /* side effects */
 		tv1 = NULL;
 
 		tv1 = thr->valstack + cat->idx_base + 1;
 		DUK_ASSERT(tv1 >= thr->valstack && tv1 < thr->valstack_top);
-		DUK_TVAL_SET_U32_UPDREF(thr, tv1, (duk_uint32_t) DUK_LJ_TYPE_NORMAL);  /* side effects */
+		DUK_TVAL_SET_U32_UPDREF(thr, tv1, (duk_uint32_t) DUK_LJ_TYPE_NORMAL); /* side effects */
 		tv1 = NULL;
 
 		DUK_CAT_CLEAR_FINALLY_ENABLED(cat);
 	} else {
-		DUK_DDD(DUK_DDDPRINT("ENDTRY: no finally part, dismantle catcher, jump through 2nd jump slot (to end of statement)"));
+		DUK_DDD(
+		    DUK_DDDPRINT("ENDTRY: no finally part, dismantle catcher, jump through 2nd jump slot (to end of statement)"));
 
-		duk_hthread_catcher_unwind_norz(thr, act);  /* lexenv may be set for 'with' binding */
+		duk_hthread_catcher_unwind_norz(thr, act); /* lexenv may be set for 'with' binding */
 		/* no need to unwind callstack */
 	}
 
-	return pc_base + 1;  /* new curr_pc value */
+	return pc_base + 1; /* new curr_pc value */
 }
 
-DUK_LOCAL DUK__NOINLINE_PERF duk_instr_t *duk__handle_op_endcatch(duk_hthread *thr, duk_uint_fast32_t ins) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF duk_instr_t *duk__handle_op_endcatch(duk_hthread *thr, duk_uint_fast32_t ins) {
 	duk_activation *act;
 	duk_catcher *cat;
 	duk_tval *tv1;
@@ -75446,7 +79641,7 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_instr_t *duk__handle_op_endcatch(duk_hthread *t
 	DUK_ASSERT(act != NULL);
 	cat = act->cat;
 	DUK_ASSERT(cat != NULL);
-	DUK_ASSERT(!DUK_CAT_HAS_CATCH_ENABLED(cat));  /* cleared before entering catch part */
+	DUK_ASSERT(!DUK_CAT_HAS_CATCH_ENABLED(cat)); /* cleared before entering catch part */
 
 	if (DUK_CAT_HAS_LEXENV_ACTIVE(cat)) {
 		duk_hobject *prev_env;
@@ -75462,7 +79657,7 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_instr_t *duk__handle_op_endcatch(duk_hthread *t
 		act->lex_env = DUK_HOBJECT_GET_PROTOTYPE(thr->heap, prev_env);
 		DUK_CAT_CLEAR_LEXENV_ACTIVE(cat);
 		DUK_HOBJECT_INCREF(thr, act->lex_env);
-		DUK_HOBJECT_DECREF(thr, prev_env);  /* side effects */
+		DUK_HOBJECT_DECREF(thr, prev_env); /* side effects */
 
 		DUK_ASSERT(act == thr->callstack_curr);
 		DUK_ASSERT(act != NULL);
@@ -75475,26 +79670,29 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_instr_t *duk__handle_op_endcatch(duk_hthread *t
 
 		tv1 = thr->valstack + cat->idx_base;
 		DUK_ASSERT(tv1 >= thr->valstack && tv1 < thr->valstack_top);
-		DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv1);  /* side effects */
+		DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv1); /* side effects */
 		tv1 = NULL;
 
 		tv1 = thr->valstack + cat->idx_base + 1;
 		DUK_ASSERT(tv1 >= thr->valstack && tv1 < thr->valstack_top);
-		DUK_TVAL_SET_U32_UPDREF(thr, tv1, (duk_uint32_t) DUK_LJ_TYPE_NORMAL);  /* side effects */
+		DUK_TVAL_SET_U32_UPDREF(thr, tv1, (duk_uint32_t) DUK_LJ_TYPE_NORMAL); /* side effects */
 		tv1 = NULL;
 
 		DUK_CAT_CLEAR_FINALLY_ENABLED(cat);
 	} else {
-		DUK_DDD(DUK_DDDPRINT("ENDCATCH: no finally part, dismantle catcher, jump through 2nd jump slot (to end of statement)"));
+		DUK_DDD(
+		    DUK_DDDPRINT("ENDCATCH: no finally part, dismantle catcher, jump through 2nd jump slot (to end of statement)"));
 
 		duk_hthread_catcher_unwind_norz(thr, act);
 		/* no need to unwind callstack */
 	}
 
-	return pc_base + 1;  /* new curr_pc value */
+	return pc_base + 1; /* new curr_pc value */
 }
 
-DUK_LOCAL DUK__NOINLINE_PERF duk_small_uint_t duk__handle_op_endfin(duk_hthread *thr, duk_uint_fast32_t ins, duk_activation *entry_act) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF duk_small_uint_t duk__handle_op_endfin(duk_hthread *thr,
+                                                                        duk_uint_fast32_t ins,
+                                                                        duk_activation *entry_act) {
 	duk_activation *act;
 	duk_tval *tv1;
 	duk_uint_t reg_catch;
@@ -75516,7 +79714,7 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_small_uint_t duk__handle_op_endfin(duk_hthread
 	                     (duk_tval *) (thr->valstack_bottom + reg_catch + 0),
 	                     (duk_tval *) (thr->valstack_bottom + reg_catch + 1)));
 
-	tv1 = thr->valstack_bottom + reg_catch + 1;  /* type */
+	tv1 = thr->valstack_bottom + reg_catch + 1; /* type */
 	DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv1));
 #if defined(DUK_USE_FASTINT)
 	DUK_ASSERT(DUK_TVAL_IS_FASTINT(tv1));
@@ -75525,7 +79723,7 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_small_uint_t duk__handle_op_endfin(duk_hthread
 	cont_type = (duk_small_uint_t) DUK_TVAL_GET_NUMBER(tv1);
 #endif
 
-	tv1--;  /* value */
+	tv1--; /* value */
 
 	switch (cont_type) {
 	case DUK_LJ_TYPE_NORMAL: {
@@ -75534,11 +79732,12 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_small_uint_t duk__handle_op_endfin(duk_hthread
 
 		duk_hthread_catcher_unwind_norz(thr, act);
 		/* no need to unwind callstack */
-		return 0;  /* restart execution */
+		return 0; /* restart execution */
 	}
 	case DUK_LJ_TYPE_RETURN: {
 		DUK_DDD(DUK_DDDPRINT("ENDFIN: finally part finishing with 'return' complation -> dismantle "
-		                     "catcher, handle return, lj.value1=%!T", tv1));
+		                     "catcher, handle return, lj.value1=%!T",
+		                     tv1));
 
 		/* Not necessary to unwind catch stack: return handling will
 		 * do it.  The finally flag of 'cat' is no longer set.  The
@@ -75548,12 +79747,12 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_small_uint_t duk__handle_op_endfin(duk_hthread
 		duk_push_tval(thr, tv1);
 		ret_result = duk__handle_return(thr, entry_act);
 		if (ret_result == DUK__RETHAND_RESTART) {
-			return 0;  /* restart execution */
+			return 0; /* restart execution */
 		}
 		DUK_ASSERT(ret_result == DUK__RETHAND_FINISHED);
 
 		DUK_DDD(DUK_DDDPRINT("exiting executor after ENDFIN and RETURN (pseudo) longjmp type"));
-		return 1;  /* exit executor */
+		return 1; /* exit executor */
 	}
 	case DUK_LJ_TYPE_BREAK:
 	case DUK_LJ_TYPE_CONTINUE: {
@@ -75575,7 +79774,7 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_small_uint_t duk__handle_op_endfin(duk_hthread
 #endif
 		lj_type = cont_type;
 		duk__handle_break_or_continue(thr, label_id, lj_type);
-		return 0;  /* restart execution */
+		return 0; /* restart execution */
 	}
 	default: {
 		DUK_DDD(DUK_DDDPRINT("ENDFIN: finally part finishing with abrupt completion, lj_type=%ld -> "
@@ -75585,7 +79784,7 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_small_uint_t duk__handle_op_endfin(duk_hthread
 		duk_err_setup_ljstate1(thr, (duk_small_uint_t) cont_type, tv1);
 		/* No debugger Throw notify check on purpose (rethrow). */
 
-		DUK_ASSERT(thr->heap->lj.jmpbuf_ptr != NULL);  /* always in executor */
+		DUK_ASSERT(thr->heap->lj.jmpbuf_ptr != NULL); /* always in executor */
 		duk_err_longjmp(thr);
 		DUK_UNREACHABLE();
 	}
@@ -75595,7 +79794,7 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_small_uint_t duk__handle_op_endfin(duk_hthread
 	return 0;
 }
 
-DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_initenum(duk_hthread *thr, duk_uint_fast32_t ins) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF void duk__handle_op_initenum(duk_hthread *thr, duk_uint_fast32_t ins) {
 	duk_small_uint_t b;
 	duk_small_uint_t c;
 
@@ -75618,12 +79817,12 @@ DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_initenum(duk_hthread *thr, duk_
 	} else {
 		duk_dup(thr, (duk_idx_t) c);
 		duk_to_object(thr, -1);
-		duk_hobject_enumerator_create(thr, 0 /*enum_flags*/);  /* [ ... val ] --> [ ... enum ] */
+		duk_hobject_enumerator_create(thr, 0 /*enum_flags*/); /* [ ... val ] --> [ ... enum ] */
 		duk_replace(thr, (duk_idx_t) b);
 	}
 }
 
-DUK_LOCAL DUK__NOINLINE_PERF duk_small_uint_t duk__handle_op_nextenum(duk_hthread *thr, duk_uint_fast32_t ins) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF duk_small_uint_t duk__handle_op_nextenum(duk_hthread *thr, duk_uint_fast32_t ins) {
 	duk_small_uint_t b;
 	duk_small_uint_t c;
 	duk_small_uint_t pc_skip = 0;
@@ -75650,13 +79849,12 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_small_uint_t duk__handle_op_nextenum(duk_hthrea
 		duk_dup(thr, (duk_idx_t) c);
 		if (duk_hobject_enumerator_next(thr, 0 /*get_value*/)) {
 			/* [ ... enum ] -> [ ... next_key ] */
-			DUK_DDD(DUK_DDDPRINT("enum active, next key is %!T, skip jump slot ",
-			                     (duk_tval *) duk_get_tval(thr, -1)));
+			DUK_DDD(DUK_DDDPRINT("enum active, next key is %!T, skip jump slot ", (duk_tval *) duk_get_tval(thr, -1)));
 			pc_skip = 1;
 		} else {
 			/* [ ... enum ] -> [ ... ] */
 			DUK_DDD(DUK_DDDPRINT("enum finished, execute jump slot"));
-			DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(thr->valstack_top));  /* valstack policy */
+			DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(thr->valstack_top)); /* valstack policy */
 			thr->valstack_top++;
 		}
 		duk_replace(thr, (duk_idx_t) b);
@@ -75676,7 +79874,7 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_small_uint_t duk__handle_op_nextenum(duk_hthrea
 DUK_LOCAL duk_bool_t duk__executor_handle_call(duk_hthread *thr, duk_idx_t idx, duk_idx_t nargs, duk_small_uint_t call_flags) {
 	duk_bool_t rc;
 
-	duk_set_top_unsafe(thr, (duk_idx_t) (idx + nargs + 2));   /* [ ... func this arg1 ... argN ] */
+	duk_set_top_unsafe(thr, (duk_idx_t) (idx + nargs + 2)); /* [ ... func this arg1 ... argN ] */
 
 	/* Attempt an Ecma-to-Ecma call setup.  If the call
 	 * target is (directly or indirectly) Reflect.construct(),
@@ -75730,22 +79928,22 @@ DUK_LOCAL duk_bool_t duk__executor_handle_call(duk_hthread *thr, duk_idx_t idx,
  * difference and the best option is architecture dependent.
  */
 #if defined(DUK_USE_EXEC_FUN_LOCAL)
-#define DUK__FUN()          fun
+#define DUK__FUN() fun
 #else
-#define DUK__FUN()          ((duk_hcompfunc *) DUK_ACT_GET_FUNC((thr)->callstack_curr))
+#define DUK__FUN() ((duk_hcompfunc *) DUK_ACT_GET_FUNC((thr)->callstack_curr))
 #endif
 
 /* Strict flag. */
-#define DUK__STRICT()       ((duk_small_uint_t) DUK_HOBJECT_HAS_STRICT((duk_hobject *) DUK__FUN()))
+#define DUK__STRICT() ((duk_small_uint_t) DUK_HOBJECT_HAS_STRICT((duk_hobject *) DUK__FUN()))
 
 /* Reg/const access macros: these are very footprint and performance sensitive
  * so modify with care.  Arguments are sometimes evaluated multiple times which
  * is not ideal.
  */
-#define DUK__REG(x)         (*(thr->valstack_bottom + (x)))
-#define DUK__REGP(x)        (thr->valstack_bottom + (x))
-#define DUK__CONST(x)       (*(consts + (x)))
-#define DUK__CONSTP(x)      (consts + (x))
+#define DUK__REG(x)    (*(thr->valstack_bottom + (x)))
+#define DUK__REGP(x)   (thr->valstack_bottom + (x))
+#define DUK__CONST(x)  (*(consts + (x)))
+#define DUK__CONSTP(x) (consts + (x))
 
 /* Reg/const access macros which take the 32-bit instruction and avoid an
  * explicit field decoding step by using shifts and masks.  These must be
@@ -75754,68 +79952,74 @@ DUK_LOCAL duk_bool_t duk__executor_handle_call(duk_hthread *thr, duk_idx_t idx,
  * instead of a duk_tval offset which needs further shifting (which is an
  * issue on some, but not all, CPUs).
  */
-#define DUK__RCBIT_B           DUK_BC_REGCONST_B
-#define DUK__RCBIT_C           DUK_BC_REGCONST_C
+#define DUK__RCBIT_B DUK_BC_REGCONST_B
+#define DUK__RCBIT_C DUK_BC_REGCONST_C
 #if defined(DUK_USE_EXEC_REGCONST_OPTIMIZE)
 #if defined(DUK_USE_PACKED_TVAL)
-#define DUK__TVAL_SHIFT        3  /* sizeof(duk_tval) == 8 */
+#define DUK__TVAL_SHIFT 3 /* sizeof(duk_tval) == 8 */
 #else
-#define DUK__TVAL_SHIFT        4  /* sizeof(duk_tval) == 16; not always the case so also asserted for */
-#endif
-#define DUK__SHIFT_A           (DUK_BC_SHIFT_A - DUK__TVAL_SHIFT)
-#define DUK__SHIFT_B           (DUK_BC_SHIFT_B - DUK__TVAL_SHIFT)
-#define DUK__SHIFT_C           (DUK_BC_SHIFT_C - DUK__TVAL_SHIFT)
-#define DUK__SHIFT_BC          (DUK_BC_SHIFT_BC - DUK__TVAL_SHIFT)
-#define DUK__MASK_A            (DUK_BC_UNSHIFTED_MASK_A << DUK__TVAL_SHIFT)
-#define DUK__MASK_B            (DUK_BC_UNSHIFTED_MASK_B << DUK__TVAL_SHIFT)
-#define DUK__MASK_C            (DUK_BC_UNSHIFTED_MASK_C << DUK__TVAL_SHIFT)
-#define DUK__MASK_BC           (DUK_BC_UNSHIFTED_MASK_BC << DUK__TVAL_SHIFT)
-#define DUK__BYTEOFF_A(ins)    (((ins) >> DUK__SHIFT_A) & DUK__MASK_A)
-#define DUK__BYTEOFF_B(ins)    (((ins) >> DUK__SHIFT_B) & DUK__MASK_B)
-#define DUK__BYTEOFF_C(ins)    (((ins) >> DUK__SHIFT_C) & DUK__MASK_C)
-#define DUK__BYTEOFF_BC(ins)   (((ins) >> DUK__SHIFT_BC) & DUK__MASK_BC)
-
-#define DUK__REGP_A(ins)       ((duk_tval *) (void *) ((duk_uint8_t *) thr->valstack_bottom + DUK__BYTEOFF_A((ins))))
-#define DUK__REGP_B(ins)       ((duk_tval *) (void *) ((duk_uint8_t *) thr->valstack_bottom + DUK__BYTEOFF_B((ins))))
-#define DUK__REGP_C(ins)       ((duk_tval *) (void *) ((duk_uint8_t *) thr->valstack_bottom + DUK__BYTEOFF_C((ins))))
-#define DUK__REGP_BC(ins)      ((duk_tval *) (void *) ((duk_uint8_t *) thr->valstack_bottom + DUK__BYTEOFF_BC((ins))))
-#define DUK__CONSTP_A(ins)     ((duk_tval *) (void *) ((duk_uint8_t *) consts + DUK__BYTEOFF_A((ins))))
-#define DUK__CONSTP_B(ins)     ((duk_tval *) (void *) ((duk_uint8_t *) consts + DUK__BYTEOFF_B((ins))))
-#define DUK__CONSTP_C(ins)     ((duk_tval *) (void *) ((duk_uint8_t *) consts + DUK__BYTEOFF_C((ins))))
-#define DUK__CONSTP_BC(ins)    ((duk_tval *) (void *) ((duk_uint8_t *) consts + DUK__BYTEOFF_BC((ins))))
-#define DUK__REGCONSTP_B(ins)  ((duk_tval *) (void *) ((duk_uint8_t *) (((ins) & DUK__RCBIT_B) ? consts : thr->valstack_bottom) + DUK__BYTEOFF_B((ins))))
-#define DUK__REGCONSTP_C(ins)  ((duk_tval *) (void *) ((duk_uint8_t *) (((ins) & DUK__RCBIT_C) ? consts : thr->valstack_bottom) + DUK__BYTEOFF_C((ins))))
-#else  /* DUK_USE_EXEC_REGCONST_OPTIMIZE */
+#define DUK__TVAL_SHIFT 4 /* sizeof(duk_tval) == 16; not always the case so also asserted for */
+#endif
+#define DUK__SHIFT_A         (DUK_BC_SHIFT_A - DUK__TVAL_SHIFT)
+#define DUK__SHIFT_B         (DUK_BC_SHIFT_B - DUK__TVAL_SHIFT)
+#define DUK__SHIFT_C         (DUK_BC_SHIFT_C - DUK__TVAL_SHIFT)
+#define DUK__SHIFT_BC        (DUK_BC_SHIFT_BC - DUK__TVAL_SHIFT)
+#define DUK__MASK_A          (DUK_BC_UNSHIFTED_MASK_A << DUK__TVAL_SHIFT)
+#define DUK__MASK_B          (DUK_BC_UNSHIFTED_MASK_B << DUK__TVAL_SHIFT)
+#define DUK__MASK_C          (DUK_BC_UNSHIFTED_MASK_C << DUK__TVAL_SHIFT)
+#define DUK__MASK_BC         (DUK_BC_UNSHIFTED_MASK_BC << DUK__TVAL_SHIFT)
+#define DUK__BYTEOFF_A(ins)  (((ins) >> DUK__SHIFT_A) & DUK__MASK_A)
+#define DUK__BYTEOFF_B(ins)  (((ins) >> DUK__SHIFT_B) & DUK__MASK_B)
+#define DUK__BYTEOFF_C(ins)  (((ins) >> DUK__SHIFT_C) & DUK__MASK_C)
+#define DUK__BYTEOFF_BC(ins) (((ins) >> DUK__SHIFT_BC) & DUK__MASK_BC)
+
+#define DUK__REGP_A(ins)    ((duk_tval *) (void *) ((duk_uint8_t *) thr->valstack_bottom + DUK__BYTEOFF_A((ins))))
+#define DUK__REGP_B(ins)    ((duk_tval *) (void *) ((duk_uint8_t *) thr->valstack_bottom + DUK__BYTEOFF_B((ins))))
+#define DUK__REGP_C(ins)    ((duk_tval *) (void *) ((duk_uint8_t *) thr->valstack_bottom + DUK__BYTEOFF_C((ins))))
+#define DUK__REGP_BC(ins)   ((duk_tval *) (void *) ((duk_uint8_t *) thr->valstack_bottom + DUK__BYTEOFF_BC((ins))))
+#define DUK__CONSTP_A(ins)  ((duk_tval *) (void *) ((duk_uint8_t *) consts + DUK__BYTEOFF_A((ins))))
+#define DUK__CONSTP_B(ins)  ((duk_tval *) (void *) ((duk_uint8_t *) consts + DUK__BYTEOFF_B((ins))))
+#define DUK__CONSTP_C(ins)  ((duk_tval *) (void *) ((duk_uint8_t *) consts + DUK__BYTEOFF_C((ins))))
+#define DUK__CONSTP_BC(ins) ((duk_tval *) (void *) ((duk_uint8_t *) consts + DUK__BYTEOFF_BC((ins))))
+#define DUK__REGCONSTP_B(ins) \
+	((duk_tval *) (void *) ((duk_uint8_t *) (((ins) &DUK__RCBIT_B) ? consts : thr->valstack_bottom) + DUK__BYTEOFF_B((ins))))
+#define DUK__REGCONSTP_C(ins) \
+	((duk_tval *) (void *) ((duk_uint8_t *) (((ins) &DUK__RCBIT_C) ? consts : thr->valstack_bottom) + DUK__BYTEOFF_C((ins))))
+#else /* DUK_USE_EXEC_REGCONST_OPTIMIZE */
 /* Safe alternatives, no assumption about duk_tval size. */
-#define DUK__REGP_A(ins)       DUK__REGP(DUK_DEC_A((ins)))
-#define DUK__REGP_B(ins)       DUK__REGP(DUK_DEC_B((ins)))
-#define DUK__REGP_C(ins)       DUK__REGP(DUK_DEC_C((ins)))
-#define DUK__REGP_BC(ins)      DUK__REGP(DUK_DEC_BC((ins)))
-#define DUK__CONSTP_A(ins)     DUK__CONSTP(DUK_DEC_A((ins)))
-#define DUK__CONSTP_B(ins)     DUK__CONSTP(DUK_DEC_B((ins)))
-#define DUK__CONSTP_C(ins)     DUK__CONSTP(DUK_DEC_C((ins)))
-#define DUK__CONSTP_BC(ins)    DUK__CONSTP(DUK_DEC_BC((ins)))
-#define DUK__REGCONSTP_B(ins)  ((((ins) & DUK__RCBIT_B) ? consts : thr->valstack_bottom) + DUK_DEC_B((ins)))
-#define DUK__REGCONSTP_C(ins)  ((((ins) & DUK__RCBIT_C) ? consts : thr->valstack_bottom) + DUK_DEC_C((ins)))
-#endif  /* DUK_USE_EXEC_REGCONST_OPTIMIZE */
+#define DUK__REGP_A(ins)      DUK__REGP(DUK_DEC_A((ins)))
+#define DUK__REGP_B(ins)      DUK__REGP(DUK_DEC_B((ins)))
+#define DUK__REGP_C(ins)      DUK__REGP(DUK_DEC_C((ins)))
+#define DUK__REGP_BC(ins)     DUK__REGP(DUK_DEC_BC((ins)))
+#define DUK__CONSTP_A(ins)    DUK__CONSTP(DUK_DEC_A((ins)))
+#define DUK__CONSTP_B(ins)    DUK__CONSTP(DUK_DEC_B((ins)))
+#define DUK__CONSTP_C(ins)    DUK__CONSTP(DUK_DEC_C((ins)))
+#define DUK__CONSTP_BC(ins)   DUK__CONSTP(DUK_DEC_BC((ins)))
+#define DUK__REGCONSTP_B(ins) ((((ins) &DUK__RCBIT_B) ? consts : thr->valstack_bottom) + DUK_DEC_B((ins)))
+#define DUK__REGCONSTP_C(ins) ((((ins) &DUK__RCBIT_C) ? consts : thr->valstack_bottom) + DUK_DEC_C((ins)))
+#endif /* DUK_USE_EXEC_REGCONST_OPTIMIZE */
 
 #if defined(DUK_USE_VERBOSE_EXECUTOR_ERRORS)
-#define DUK__INTERNAL_ERROR(msg)  do { \
+#define DUK__INTERNAL_ERROR(msg) \
+	do { \
 		DUK_ERROR_ERROR(thr, (msg)); \
 		DUK_WO_NORETURN(return;); \
 	} while (0)
 #else
-#define DUK__INTERNAL_ERROR(msg)  do { \
+#define DUK__INTERNAL_ERROR(msg) \
+	do { \
 		goto internal_error; \
 	} while (0)
 #endif
 
-#define DUK__SYNC_CURR_PC()  do { \
+#define DUK__SYNC_CURR_PC() \
+	do { \
 		duk_activation *duk__act; \
 		duk__act = thr->callstack_curr; \
 		duk__act->curr_pc = curr_pc; \
 	} while (0)
-#define DUK__SYNC_AND_NULL_CURR_PC()  do { \
+#define DUK__SYNC_AND_NULL_CURR_PC() \
+	do { \
 		duk_activation *duk__act; \
 		duk__act = thr->callstack_curr; \
 		duk__act->curr_pc = curr_pc; \
@@ -75823,19 +80027,22 @@ DUK_LOCAL duk_bool_t duk__executor_handle_call(duk_hthread *thr, duk_idx_t idx,
 	} while (0)
 
 #if defined(DUK_USE_EXEC_PREFER_SIZE)
-#define DUK__LOOKUP_INDIRECT(idx) do { \
+#define DUK__LOOKUP_INDIRECT(idx) \
+	do { \
 		(idx) = (duk_uint_fast_t) duk_get_uint(thr, (duk_idx_t) (idx)); \
 	} while (0)
 #elif defined(DUK_USE_FASTINT)
-#define DUK__LOOKUP_INDIRECT(idx) do { \
+#define DUK__LOOKUP_INDIRECT(idx) \
+	do { \
 		duk_tval *tv_ind; \
 		tv_ind = DUK__REGP((idx)); \
 		DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv_ind)); \
-		DUK_ASSERT(DUK_TVAL_IS_FASTINT(tv_ind));  /* compiler guarantees */ \
+		DUK_ASSERT(DUK_TVAL_IS_FASTINT(tv_ind)); /* compiler guarantees */ \
 		(idx) = (duk_uint_fast_t) DUK_TVAL_GET_FASTINT_U32(tv_ind); \
 	} while (0)
 #else
-#define DUK__LOOKUP_INDIRECT(idx) do { \
+#define DUK__LOOKUP_INDIRECT(idx) \
+	do { \
 		duk_tval *tv_ind; \
 		tv_ind = DUK__REGP(idx); \
 		DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv_ind)); \
@@ -75846,7 +80053,8 @@ DUK_LOCAL duk_bool_t duk__executor_handle_call(duk_hthread *thr, duk_idx_t idx,
 DUK_LOCAL void duk__handle_executor_error(duk_heap *heap,
                                           duk_activation *entry_act,
                                           duk_int_t entry_call_recursion_depth,
-                                          duk_jmpbuf *entry_jmpbuf_ptr) {
+                                          duk_jmpbuf *entry_jmpbuf_ptr,
+                                          volatile duk_bool_t *out_delayed_catch_setup) {
 	duk_small_uint_t lj_ret;
 
 	/* Longjmp callers are required to sync-and-null thr->ptr_curr_pc
@@ -75866,7 +80074,7 @@ DUK_LOCAL void duk__handle_executor_error(duk_heap *heap,
 	 */
 	heap->lj.jmpbuf_ptr = (duk_jmpbuf *) entry_jmpbuf_ptr;
 
-	lj_ret = duk__handle_longjmp(heap->curr_thread, entry_act);
+	lj_ret = duk__handle_longjmp(heap->curr_thread, entry_act, out_delayed_catch_setup);
 
 	/* Error handling complete, remove side effect protections.
 	 */
@@ -75887,8 +80095,8 @@ DUK_LOCAL void duk__handle_executor_error(duk_heap *heap,
 		 * will be re-bumped by the longjmp.
 		 */
 
-		DUK_ASSERT(lj_ret == DUK__LONGJMP_RETHROW);  /* Rethrow error to calling state. */
-		DUK_ASSERT(heap->lj.jmpbuf_ptr == entry_jmpbuf_ptr);  /* Longjmp handling has restored jmpbuf_ptr. */
+		DUK_ASSERT(lj_ret == DUK__LONGJMP_RETHROW); /* Rethrow error to calling state. */
+		DUK_ASSERT(heap->lj.jmpbuf_ptr == entry_jmpbuf_ptr); /* Longjmp handling has restored jmpbuf_ptr. */
 
 		/* Thread may have changed, e.g. YIELD converted to THROW. */
 		duk_err_longjmp(heap->curr_thread);
@@ -75905,12 +80113,13 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
 	duk_jmpbuf *entry_jmpbuf_ptr;
 	duk_jmpbuf our_jmpbuf;
 	duk_heap *heap;
+	volatile duk_bool_t delayed_catch_setup = 0;
 
 	DUK_ASSERT(exec_thr != NULL);
 	DUK_ASSERT(exec_thr->heap != NULL);
 	DUK_ASSERT(exec_thr->heap->curr_thread != NULL);
 	DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR((duk_heaphdr *) exec_thr);
-	DUK_ASSERT(exec_thr->callstack_top >= 1);  /* at least one activation, ours */
+	DUK_ASSERT(exec_thr->callstack_top >= 1); /* at least one activation, ours */
 	DUK_ASSERT(exec_thr->callstack_curr != NULL);
 	DUK_ASSERT(DUK_ACT_GET_FUNC(exec_thr->callstack_curr) != NULL);
 	DUK_ASSERT(DUK_HOBJECT_IS_COMPFUNC(DUK_ACT_GET_FUNC(exec_thr->callstack_curr)));
@@ -75943,6 +80152,17 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
 		DUK_ASSERT(heap->lj.jmpbuf_ptr == &our_jmpbuf);
 		if (DUK_SETJMP(our_jmpbuf.jb) == 0) {
 #endif
+			DUK_DDD(DUK_DDDPRINT("after setjmp, delayed catch setup: %ld\n", (long) delayed_catch_setup));
+
+			if (DUK_UNLIKELY(delayed_catch_setup != 0)) {
+				duk_hthread *thr = entry_thread->heap->curr_thread;
+
+				delayed_catch_setup = 0;
+				duk__handle_catch_part2(thr);
+				DUK_ASSERT(delayed_catch_setup == 0);
+				DUK_DDD(DUK_DDDPRINT("top after delayed catch setup: %ld", (long) duk_get_top(entry_thread)));
+			}
+
 			/* Execute bytecode until returned or longjmp(). */
 			duk__js_execute_bytecode_inner(entry_thread, entry_act);
 
@@ -75964,11 +80184,13 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
 			duk__handle_executor_error(heap,
 			                           entry_act,
 			                           entry_call_recursion_depth,
-			                           entry_jmpbuf_ptr);
+			                           entry_jmpbuf_ptr,
+			                           &delayed_catch_setup);
 		}
 #if defined(DUK_USE_CPP_EXCEPTIONS)
 		catch (duk_fatal_exception &exc) {
 			DUK_D(DUK_DPRINT("rethrow duk_fatal_exception"));
+			DUK_UNREF(exc);
 			throw;
 		} catch (std::exception &exc) {
 			const char *what = exc.what();
@@ -75979,7 +80201,10 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
 			DUK_STATS_INC(exec_thr->heap, stats_exec_throw);
 			try {
 				DUK_ASSERT(heap->curr_thread != NULL);
-				DUK_ERROR_FMT1(heap->curr_thread, DUK_ERR_TYPE_ERROR, "caught invalid c++ std::exception '%s' (perhaps thrown by user code)", what);
+				DUK_ERROR_FMT1(heap->curr_thread,
+				               DUK_ERR_TYPE_ERROR,
+				               "caught invalid c++ std::exception '%s' (perhaps thrown by user code)",
+				               what);
 				DUK_WO_NORETURN(return;);
 			} catch (duk_internal_exception exc) {
 				DUK_D(DUK_DPRINT("caught api error thrown from unexpected c++ std::exception"));
@@ -75987,7 +80212,8 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
 				duk__handle_executor_error(heap,
 				                           entry_act,
 				                           entry_call_recursion_depth,
-				                           entry_jmpbuf_ptr);
+				                           entry_jmpbuf_ptr,
+				                           &delayed_catch_setup);
 			}
 		} catch (...) {
 			DUK_D(DUK_DPRINT("unexpected c++ exception (perhaps thrown by user code)"));
@@ -76002,7 +80228,8 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
 				duk__handle_executor_error(heap,
 				                           entry_act,
 				                           entry_call_recursion_depth,
-				                           entry_jmpbuf_ptr);
+				                           entry_jmpbuf_ptr,
+				                           &delayed_catch_setup);
 			}
 		}
 #endif
@@ -76018,13 +80245,13 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 	 * but that eliminates performance benefits; aliasing guarantees
 	 * should be enough though.
 	 */
-	duk_instr_t *curr_pc;         /* bytecode has a stable pointer */
+	duk_instr_t *curr_pc; /* bytecode has a stable pointer */
 
 	/* Hot variables for interpretation.  Critical for performance,
 	 * but must add sparingly to minimize register shuffling.
 	 */
-	duk_hthread *thr;             /* stable */
-	duk_tval *consts;             /* stable */
+	duk_hthread *thr; /* stable */
+	duk_tval *consts; /* stable */
 	duk_uint_fast32_t ins;
 	/* 'funcs' is quite rarely used, so no local for it */
 #if defined(DUK_USE_EXEC_FUN_LOCAL)
@@ -76038,7 +80265,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 #endif
 
 #if defined(DUK_USE_ASSERTIONS)
-	duk_size_t valstack_top_base;    /* valstack top, should match before interpreting each op (no leftovers) */
+	duk_size_t valstack_top_base; /* valstack top, should match before interpreting each op (no leftovers) */
 #endif
 
 	/* Optimized reg/const access macros assume sizeof(duk_tval) to be
@@ -76094,7 +80321,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 	 *  See execution.rst for discussion.
 	 */
 
- restart_execution:
+restart_execution:
 
 	/* Lookup current thread; use the stable 'entry_thread' for this to
 	 * avoid clobber warnings.  Any valid, reachable 'thr' value would be
@@ -76135,7 +80362,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			DUK_ASSERT(act == thr->callstack_curr);
 			DUK_ASSERT(act != NULL);
 		}
-#endif  /* DUK_USE_DEBUGGER_SUPPORT */
+#endif /* DUK_USE_DEBUGGER_SUPPORT */
 
 #if defined(DUK_USE_ASSERTIONS)
 		valstack_top_base = (duk_size_t) (thr->valstack_top - thr->valstack);
@@ -76199,7 +80426,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			 */
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
 			if (thr->heap->dbg_force_restart) {
-				DUK_DD(DUK_DDPRINT("dbg_force_restart flag forced restart execution"));  /* GH-303 */
+				DUK_DD(DUK_DDPRINT("dbg_force_restart flag forced restart execution")); /* GH-303 */
 				thr->heap->dbg_force_restart = 0;
 				goto restart_execution;
 			}
@@ -76211,7 +80438,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 				goto restart_execution;
 			}
 		}
-#endif  /* DUK_USE_INTERRUPT_COUNTER */
+#endif /* DUK_USE_INTERRUPT_COUNTER */
 #if defined(DUK_USE_INTERRUPT_COUNTER) && defined(DUK_USE_DEBUG)
 		/* For cross-checking during development: ensure dispatch count
 		 * matches cumulative interrupt counter init value sums.
@@ -76225,16 +80452,17 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			act = thr->callstack_curr;
 			DUK_ASSERT(curr_pc >= DUK_HCOMPFUNC_GET_CODE_BASE(thr->heap, DUK__FUN()));
 			DUK_ASSERT(curr_pc < DUK_HCOMPFUNC_GET_CODE_END(thr->heap, DUK__FUN()));
-			DUK_UNREF(act);  /* if debugging disabled */
+			DUK_UNREF(act); /* if debugging disabled */
 
-			DUK_DDD(DUK_DDDPRINT("executing bytecode: pc=%ld, ins=0x%08lx, op=%ld, valstack_top=%ld/%ld, nregs=%ld  -->  %!I",
-			                     (long) (curr_pc - DUK_HCOMPFUNC_GET_CODE_BASE(thr->heap, DUK__FUN())),
-			                     (unsigned long) *curr_pc,
-			                     (long) DUK_DEC_OP(*curr_pc),
-			                     (long) (thr->valstack_top - thr->valstack),
-			                     (long) (thr->valstack_end - thr->valstack),
-			                     (long) (DUK__FUN() ? DUK__FUN()->nregs : -1),
-			                     (duk_instr_t) *curr_pc));
+			DUK_DDD(DUK_DDDPRINT(
+			    "executing bytecode: pc=%ld, ins=0x%08lx, op=%ld, valstack_top=%ld/%ld, nregs=%ld  -->  %!I",
+			    (long) (curr_pc - DUK_HCOMPFUNC_GET_CODE_BASE(thr->heap, DUK__FUN())),
+			    (unsigned long) *curr_pc,
+			    (long) DUK_DEC_OP(*curr_pc),
+			    (long) (thr->valstack_top - thr->valstack),
+			    (long) (thr->valstack_end - thr->valstack),
+			    (long) (DUK__FUN() ? DUK__FUN()->nregs : -1),
+			    (duk_instr_t) *curr_pc));
 		}
 #endif
 
@@ -76271,14 +80499,16 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 		 */
 		op = (duk_uint8_t) DUK_DEC_OP(ins);
 		switch (op) {
-
-		/* Some useful macros.  These access inner executor variables
-		 * directly so they only apply within the executor.
-		 */
+			/* Some useful macros.  These access inner executor variables
+			 * directly so they only apply within the executor.
+			 */
 #if defined(DUK_USE_EXEC_PREFER_SIZE)
-#define DUK__REPLACE_TOP_A_BREAK() { goto replace_top_a; }
-#define DUK__REPLACE_TOP_BC_BREAK() { goto replace_top_bc; }
-#define DUK__REPLACE_BOOL_A_BREAK(bval) { \
+#define DUK__REPLACE_TOP_A_BREAK() \
+	{ goto replace_top_a; }
+#define DUK__REPLACE_TOP_BC_BREAK() \
+	{ goto replace_top_bc; }
+#define DUK__REPLACE_BOOL_A_BREAK(bval) \
+	{ \
 		duk_bool_t duk__bval; \
 		duk__bval = (bval); \
 		DUK_ASSERT(duk__bval == 0 || duk__bval == 1); \
@@ -76286,9 +80516,18 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 		DUK__REPLACE_TOP_A_BREAK(); \
 	}
 #else
-#define DUK__REPLACE_TOP_A_BREAK() { DUK__REPLACE_TO_TVPTR(thr, DUK__REGP_A(ins)); break; }
-#define DUK__REPLACE_TOP_BC_BREAK() { DUK__REPLACE_TO_TVPTR(thr, DUK__REGP_BC(ins)); break; }
-#define DUK__REPLACE_BOOL_A_BREAK(bval) { \
+#define DUK__REPLACE_TOP_A_BREAK() \
+	{ \
+		DUK__REPLACE_TO_TVPTR(thr, DUK__REGP_A(ins)); \
+		break; \
+	}
+#define DUK__REPLACE_TOP_BC_BREAK() \
+	{ \
+		DUK__REPLACE_TO_TVPTR(thr, DUK__REGP_BC(ins)); \
+		break; \
+	}
+#define DUK__REPLACE_BOOL_A_BREAK(bval) \
+	{ \
 		duk_bool_t duk__bval; \
 		duk_tval *duk__tvdst; \
 		duk__bval = (bval); \
@@ -76312,7 +80551,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 
 			tv1 = DUK__REGP_A(ins);
 			tv2 = DUK__REGP_BC(ins);
-			DUK_TVAL_SET_TVAL_UPDREF_FAST(thr, tv1, tv2);  /* side effects */
+			DUK_TVAL_SET_TVAL_UPDREF_FAST(thr, tv1, tv2); /* side effects */
 			break;
 		}
 
@@ -76321,7 +80560,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 
 			tv1 = DUK__REGP_A(ins);
 			tv2 = DUK__REGP_BC(ins);
-			DUK_TVAL_SET_TVAL_UPDREF_FAST(thr, tv2, tv1);  /* side effects */
+			DUK_TVAL_SET_TVAL_UPDREF_FAST(thr, tv2, tv1); /* side effects */
 			break;
 		}
 
@@ -76330,7 +80569,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 
 			tv1 = DUK__REGP_A(ins);
 			tv2 = DUK__CONSTP_BC(ins);
-			DUK_TVAL_SET_TVAL_UPDREF_FAST(thr, tv1, tv2);  /* side effects */
+			DUK_TVAL_SET_TVAL_UPDREF_FAST(thr, tv1, tv2); /* side effects */
 			break;
 		}
 
@@ -76350,18 +80589,18 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			duk_int32_t val;
 
 			val = (duk_int32_t) duk_get_int(thr, DUK_DEC_A(ins));
-			val = (val << DUK_BC_LDINTX_SHIFT) + (duk_int32_t) DUK_DEC_BC(ins);  /* no bias */
+			val = (val << DUK_BC_LDINTX_SHIFT) + (duk_int32_t) DUK_DEC_BC(ins); /* no bias */
 			duk_push_int(thr, val);
 			DUK__REPLACE_TOP_A_BREAK();
 		}
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 		case DUK_OP_LDINT: {
 			duk_tval *tv1;
 			duk_int32_t val;
 
 			val = (duk_int32_t) DUK_DEC_BC(ins) - (duk_int32_t) DUK_BC_LDINT_BIAS;
 			tv1 = DUK__REGP_A(ins);
-			DUK_TVAL_SET_I32_UPDREF(thr, tv1, val);  /* side effects */
+			DUK_TVAL_SET_I32_UPDREF(thr, tv1, val); /* side effects */
 			break;
 		}
 		case DUK_OP_LDINTX: {
@@ -76377,11 +80616,12 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			/* XXX: fast double-to-int conversion, we know number is integer in [-0x80000000,0xffffffff]. */
 			val = (duk_int32_t) DUK_TVAL_GET_NUMBER(tv1);
 #endif
-			val = (duk_int32_t) ((duk_uint32_t) val << DUK_BC_LDINTX_SHIFT) + (duk_int32_t) DUK_DEC_BC(ins);  /* no bias */
-			DUK_TVAL_SET_I32_UPDREF(thr, tv1, val);  /* side effects */
+			val =
+			    (duk_int32_t) ((duk_uint32_t) val << DUK_BC_LDINTX_SHIFT) + (duk_int32_t) DUK_DEC_BC(ins); /* no bias */
+			DUK_TVAL_SET_I32_UPDREF(thr, tv1, val); /* side effects */
 			break;
 		}
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 
 #if defined(DUK_USE_EXEC_PREFER_SIZE)
 		case DUK_OP_LDTHIS: {
@@ -76404,46 +80644,46 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			duk_push_false(thr);
 			DUK__REPLACE_TOP_BC_BREAK();
 		}
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 		case DUK_OP_LDTHIS: {
 			/* Note: 'this' may be bound to any value, not just an object */
 			duk_tval *tv1, *tv2;
 
 			tv1 = DUK__REGP_BC(ins);
-			tv2 = thr->valstack_bottom - 1;  /* 'this binding' is just under bottom */
+			tv2 = thr->valstack_bottom - 1; /* 'this binding' is just under bottom */
 			DUK_ASSERT(tv2 >= thr->valstack);
-			DUK_TVAL_SET_TVAL_UPDREF_FAST(thr, tv1, tv2);  /* side effects */
+			DUK_TVAL_SET_TVAL_UPDREF_FAST(thr, tv1, tv2); /* side effects */
 			break;
 		}
 		case DUK_OP_LDUNDEF: {
 			duk_tval *tv1;
 
 			tv1 = DUK__REGP_BC(ins);
-			DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv1);  /* side effects */
+			DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv1); /* side effects */
 			break;
 		}
 		case DUK_OP_LDNULL: {
 			duk_tval *tv1;
 
 			tv1 = DUK__REGP_BC(ins);
-			DUK_TVAL_SET_NULL_UPDREF(thr, tv1);  /* side effects */
+			DUK_TVAL_SET_NULL_UPDREF(thr, tv1); /* side effects */
 			break;
 		}
 		case DUK_OP_LDTRUE: {
 			duk_tval *tv1;
 
 			tv1 = DUK__REGP_BC(ins);
-			DUK_TVAL_SET_BOOLEAN_UPDREF(thr, tv1, 1);  /* side effects */
+			DUK_TVAL_SET_BOOLEAN_UPDREF(thr, tv1, 1); /* side effects */
 			break;
 		}
 		case DUK_OP_LDFALSE: {
 			duk_tval *tv1;
 
 			tv1 = DUK__REGP_BC(ins);
-			DUK_TVAL_SET_BOOLEAN_UPDREF(thr, tv1, 0);  /* side effects */
+			DUK_TVAL_SET_BOOLEAN_UPDREF(thr, tv1, 0); /* side effects */
 			break;
 		}
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 
 		case DUK_OP_BNOT: {
 			duk__vm_bitwise_not(thr, DUK_DEC_BC(ins), DUK_DEC_A(ins));
@@ -76461,7 +80701,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			duk__vm_arith_unary_op(thr, DUK_DEC_BC(ins), DUK_DEC_A(ins), op);
 			break;
 		}
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 		case DUK_OP_UNM: {
 			duk__vm_arith_unary_op(thr, DUK_DEC_BC(ins), DUK_DEC_A(ins), DUK_OP_UNM);
 			break;
@@ -76470,7 +80710,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			duk__vm_arith_unary_op(thr, DUK_DEC_BC(ins), DUK_DEC_A(ins), DUK_OP_UNP);
 			break;
 		}
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 
 #if defined(DUK_USE_EXEC_PREFER_SIZE)
 		case DUK_OP_TYPEOF: {
@@ -76481,7 +80721,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			duk_push_hstring_stridx(thr, stridx);
 			DUK__REPLACE_TOP_A_BREAK();
 		}
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 		case DUK_OP_TYPEOF: {
 			duk_tval *tv;
 			duk_small_uint_t stridx;
@@ -76495,7 +80735,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			DUK_TVAL_SET_STRING_UPDREF(thr, tv, h_str);
 			break;
 		}
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 
 		case DUK_OP_TYPEOFID: {
 			duk_small_uint_t stridx;
@@ -76513,13 +80753,13 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			tv = DUK__CONSTP_BC(ins);
 			DUK_ASSERT(DUK_TVAL_IS_STRING(tv));
 			name = DUK_TVAL_GET_STRING(tv);
-			tv = NULL;  /* lookup has side effects */
+			tv = NULL; /* lookup has side effects */
 			act = thr->callstack_curr;
 			if (duk_js_getvar_activation(thr, act, name, 0 /*throw*/)) {
 				/* -> [... val this] */
 				tv = DUK_GET_TVAL_NEGIDX(thr, -2);
 				stridx = duk_js_typeof_stridx(tv);
-				tv = NULL;  /* no longer needed */
+				tv = NULL; /* no longer needed */
 				duk_pop_2_unsafe(thr);
 			} else {
 				/* unresolvable, no stack changes */
@@ -76529,36 +80769,40 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 #if defined(DUK_USE_EXEC_PREFER_SIZE)
 			duk_push_hstring_stridx(thr, stridx);
 			DUK__REPLACE_TOP_A_BREAK();
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 			h_str = DUK_HTHREAD_GET_STRING(thr, stridx);
 			tv = DUK__REGP_A(ins);
 			DUK_TVAL_SET_STRING_UPDREF(thr, tv, h_str);
 			break;
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 		}
 
 		/* Equality: E5 Sections 11.9.1, 11.9.3 */
 
-#define DUK__EQ_BODY(barg,carg) { \
+#define DUK__EQ_BODY(barg, carg) \
+	{ \
 		duk_bool_t tmp; \
 		tmp = duk_js_equals(thr, (barg), (carg)); \
 		DUK_ASSERT(tmp == 0 || tmp == 1); \
 		DUK__REPLACE_BOOL_A_BREAK(tmp); \
 	}
-#define DUK__NEQ_BODY(barg,carg) { \
+#define DUK__NEQ_BODY(barg, carg) \
+	{ \
 		duk_bool_t tmp; \
 		tmp = duk_js_equals(thr, (barg), (carg)); \
 		DUK_ASSERT(tmp == 0 || tmp == 1); \
 		tmp ^= 1; \
 		DUK__REPLACE_BOOL_A_BREAK(tmp); \
 	}
-#define DUK__SEQ_BODY(barg,carg) { \
+#define DUK__SEQ_BODY(barg, carg) \
+	{ \
 		duk_bool_t tmp; \
 		tmp = duk_js_strict_equals((barg), (carg)); \
 		DUK_ASSERT(tmp == 0 || tmp == 1); \
 		DUK__REPLACE_BOOL_A_BREAK(tmp); \
 	}
-#define DUK__SNEQ_BODY(barg,carg) { \
+#define DUK__SNEQ_BODY(barg, carg) \
+	{ \
 		duk_bool_t tmp; \
 		tmp = duk_js_strict_equals((barg), (carg)); \
 		DUK_ASSERT(tmp == 0 || tmp == 1); \
@@ -76586,7 +80830,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 		case DUK_OP_SNEQ_RC:
 		case DUK_OP_SNEQ_CC:
 			DUK__SNEQ_BODY(DUK__REGCONSTP_B(ins), DUK__REGCONSTP_C(ins));
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 		case DUK_OP_EQ_RR:
 			DUK__EQ_BODY(DUK__REGP_B(ins), DUK__REGP_C(ins));
 		case DUK_OP_EQ_CR:
@@ -76619,18 +80863,19 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			DUK__SNEQ_BODY(DUK__REGP_B(ins), DUK__CONSTP_C(ins));
 		case DUK_OP_SNEQ_CC:
 			DUK__SNEQ_BODY(DUK__CONSTP_B(ins), DUK__CONSTP_C(ins));
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 
-#define DUK__COMPARE_BODY(arg1,arg2,flags) { \
+#define DUK__COMPARE_BODY(arg1, arg2, flags) \
+	{ \
 		duk_bool_t tmp; \
 		tmp = duk_js_compare_helper(thr, (arg1), (arg2), (flags)); \
 		DUK_ASSERT(tmp == 0 || tmp == 1); \
 		DUK__REPLACE_BOOL_A_BREAK(tmp); \
 	}
-#define DUK__GT_BODY(barg,carg) DUK__COMPARE_BODY((carg), (barg), 0)
-#define DUK__GE_BODY(barg,carg) DUK__COMPARE_BODY((barg), (carg), DUK_COMPARE_FLAG_EVAL_LEFT_FIRST | DUK_COMPARE_FLAG_NEGATE)
-#define DUK__LT_BODY(barg,carg) DUK__COMPARE_BODY((barg), (carg), DUK_COMPARE_FLAG_EVAL_LEFT_FIRST)
-#define DUK__LE_BODY(barg,carg) DUK__COMPARE_BODY((carg), (barg), DUK_COMPARE_FLAG_NEGATE)
+#define DUK__GT_BODY(barg, carg) DUK__COMPARE_BODY((carg), (barg), 0)
+#define DUK__GE_BODY(barg, carg) DUK__COMPARE_BODY((barg), (carg), DUK_COMPARE_FLAG_EVAL_LEFT_FIRST | DUK_COMPARE_FLAG_NEGATE)
+#define DUK__LT_BODY(barg, carg) DUK__COMPARE_BODY((barg), (carg), DUK_COMPARE_FLAG_EVAL_LEFT_FIRST)
+#define DUK__LE_BODY(barg, carg) DUK__COMPARE_BODY((carg), (barg), DUK_COMPARE_FLAG_NEGATE)
 #if defined(DUK_USE_EXEC_PREFER_SIZE)
 		case DUK_OP_GT_RR:
 		case DUK_OP_GT_CR:
@@ -76652,7 +80897,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 		case DUK_OP_LE_RC:
 		case DUK_OP_LE_CC:
 			DUK__LE_BODY(DUK__REGCONSTP_B(ins), DUK__REGCONSTP_C(ins));
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 		case DUK_OP_GT_RR:
 			DUK__GT_BODY(DUK__REGP_B(ins), DUK__REGP_C(ins));
 		case DUK_OP_GT_CR:
@@ -76685,7 +80930,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			DUK__LE_BODY(DUK__REGP_B(ins), DUK__CONSTP_C(ins));
 		case DUK_OP_LE_CC:
 			DUK__LE_BODY(DUK__CONSTP_B(ins), DUK__CONSTP_C(ins));
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 
 		/* No size optimized variant at present for IF. */
 		case DUK_OP_IFTRUE_R: {
@@ -76722,7 +80967,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			duk__vm_arith_add(thr, DUK__REGCONSTP_B(ins), DUK__REGCONSTP_C(ins), DUK_DEC_A(ins));
 			break;
 		}
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 		case DUK_OP_ADD_RR: {
 			duk__vm_arith_add(thr, DUK__REGP_B(ins), DUK__REGP_C(ins), DUK_DEC_A(ins));
 			break;
@@ -76739,7 +80984,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			duk__vm_arith_add(thr, DUK__CONSTP_B(ins), DUK__CONSTP_C(ins), DUK_DEC_A(ins));
 			break;
 		}
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 
 #if defined(DUK_USE_EXEC_PREFER_SIZE)
 		case DUK_OP_SUB_RR:
@@ -76763,13 +81008,13 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 		case DUK_OP_EXP_CR:
 		case DUK_OP_EXP_RC:
 		case DUK_OP_EXP_CC:
-#endif  /* DUK_USE_ES7_EXP_OPERATOR */
+#endif /* DUK_USE_ES7_EXP_OPERATOR */
 		{
 			/* XXX: could leave value on stack top and goto replace_top_a; */
 			duk__vm_arith_binary_op(thr, DUK__REGCONSTP_B(ins), DUK__REGCONSTP_C(ins), DUK_DEC_A(ins), op);
 			break;
 		}
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 		case DUK_OP_SUB_RR: {
 			duk__vm_arith_binary_op(thr, DUK__REGP_B(ins), DUK__REGP_C(ins), DUK_DEC_A(ins), DUK_OP_SUB);
 			break;
@@ -76851,8 +81096,8 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			duk__vm_arith_binary_op(thr, DUK__CONSTP_B(ins), DUK__CONSTP_C(ins), DUK_DEC_A(ins), DUK_OP_EXP);
 			break;
 		}
-#endif  /* DUK_USE_ES7_EXP_OPERATOR */
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_ES7_EXP_OPERATOR */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 
 #if defined(DUK_USE_EXEC_PREFER_SIZE)
 		case DUK_OP_BAND_RR:
@@ -76883,7 +81128,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			duk__vm_bitwise_binary_op(thr, DUK__REGCONSTP_B(ins), DUK__REGCONSTP_C(ins), DUK_DEC_A(ins), op);
 			break;
 		}
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 		case DUK_OP_BAND_RR: {
 			duk__vm_bitwise_binary_op(thr, DUK__REGP_B(ins), DUK__REGP_C(ins), DUK_DEC_A(ins), DUK_OP_BAND);
 			break;
@@ -76980,16 +81225,18 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			duk__vm_bitwise_binary_op(thr, DUK__CONSTP_B(ins), DUK__CONSTP_C(ins), DUK_DEC_A(ins), DUK_OP_BASR);
 			break;
 		}
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 
 		/* For INSTOF and IN, B is always a register. */
-#define DUK__INSTOF_BODY(barg,carg) { \
+#define DUK__INSTOF_BODY(barg, carg) \
+	{ \
 		duk_bool_t tmp; \
 		tmp = duk_js_instanceof(thr, (barg), (carg)); \
 		DUK_ASSERT(tmp == 0 || tmp == 1); \
 		DUK__REPLACE_BOOL_A_BREAK(tmp); \
 	}
-#define DUK__IN_BODY(barg,carg) { \
+#define DUK__IN_BODY(barg, carg) \
+	{ \
 		duk_bool_t tmp; \
 		tmp = duk_js_in(thr, (barg), (carg)); \
 		DUK_ASSERT(tmp == 0 || tmp == 1); \
@@ -77006,7 +81253,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 		case DUK_OP_IN_RC:
 		case DUK_OP_IN_CC:
 			DUK__IN_BODY(DUK__REGCONSTP_B(ins), DUK__REGCONSTP_C(ins));
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 		case DUK_OP_INSTOF_RR:
 			DUK__INSTOF_BODY(DUK__REGP_B(ins), DUK__REGP_C(ins));
 		case DUK_OP_INSTOF_CR:
@@ -77023,9 +81270,9 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			DUK__IN_BODY(DUK__REGP_B(ins), DUK__CONSTP_C(ins));
 		case DUK_OP_IN_CC:
 			DUK__IN_BODY(DUK__CONSTP_B(ins), DUK__CONSTP_C(ins));
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 
-		/* Pre/post inc/dec for register variables, important for loops. */
+			/* Pre/post inc/dec for register variables, important for loops. */
 #if defined(DUK_USE_EXEC_PREFER_SIZE)
 		case DUK_OP_PREINCR:
 		case DUK_OP_PREDECR:
@@ -77041,7 +81288,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			duk__prepost_incdec_var_helper(thr, DUK_DEC_A(ins), DUK__CONSTP_BC(ins), op, DUK__STRICT());
 			break;
 		}
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 		case DUK_OP_PREINCR: {
 			duk__prepost_incdec_reg_helper(thr, DUK__REGP_A(ins), DUK__REGP_BC(ins), DUK_OP_PREINCR);
 			break;
@@ -77074,7 +81321,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			duk__prepost_incdec_var_helper(thr, DUK_DEC_A(ins), DUK__CONSTP_BC(ins), DUK_OP_POSTDECV, DUK__STRICT());
 			break;
 		}
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 
 		/* XXX: Move to separate helper, optimize for perf/size separately. */
 		/* Preinc/predec for object properties. */
@@ -77101,7 +81348,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			duk_double_t x, y, z;
 #if !defined(DUK_USE_EXEC_PREFER_SIZE)
 			duk_tval *tv_dst;
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 
 			/* A -> target reg
 			 * B -> object reg/const (may be const e.g. in "'foo'[1]")
@@ -77119,10 +81366,10 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 
 			tv_obj = DUK__REGCONSTP_B(ins);
 			tv_key = DUK__REGCONSTP_C(ins);
-			rc = duk_hobject_getprop(thr, tv_obj, tv_key);  /* -> [val] */
-			DUK_UNREF(rc);  /* ignore */
-			tv_obj = NULL;  /* invalidated */
-			tv_key = NULL;  /* invalidated */
+			rc = duk_hobject_getprop(thr, tv_obj, tv_key); /* -> [val] */
+			DUK_UNREF(rc); /* ignore */
+			tv_obj = NULL; /* invalidated */
+			tv_key = NULL; /* invalidated */
 
 			/* XXX: Fastint fast path would be useful here.  Also fastints
 			 * now lose their fastint status in current handling which is
@@ -77143,9 +81390,9 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			tv_obj = DUK__REGCONSTP_B(ins);
 			tv_key = DUK__REGCONSTP_C(ins);
 			rc = duk_hobject_putprop(thr, tv_obj, tv_key, tv_val, DUK__STRICT());
-			DUK_UNREF(rc);  /* ignore */
-			tv_obj = NULL;  /* invalidated */
-			tv_key = NULL;  /* invalidated */
+			DUK_UNREF(rc); /* ignore */
+			tv_obj = NULL; /* invalidated */
+			tv_key = NULL; /* invalidated */
 			duk_pop_unsafe(thr);
 
 			z = (ins & DUK_BC_INCDECP_FLAG_POST) ? x : y;
@@ -77163,7 +81410,8 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 		 * Occurs relatively often in object oriented code.
 		 */
 
-#define DUK__GETPROP_BODY(barg,carg) { \
+#define DUK__GETPROP_BODY(barg, carg) \
+	{ \
 		/* A -> target reg \
 		 * B -> object reg/const (may be const e.g. in "'foo'[1]") \
 		 * C -> key reg/const \
@@ -77171,7 +81419,8 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 		(void) duk_hobject_getprop(thr, (barg), (carg)); \
 		DUK__REPLACE_TOP_A_BREAK(); \
 	}
-#define DUK__GETPROPC_BODY(barg,carg) { \
+#define DUK__GETPROPC_BODY(barg, carg) \
+	{ \
 		/* Same as GETPROP but callability check for property-based calls. */ \
 		duk_tval *tv__targ; \
 		(void) duk_hobject_getprop(thr, (barg), (carg)); \
@@ -77182,11 +81431,12 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			 * arguments to deal with potentially changed \
 			 * valstack base pointer! \
 			 */ \
-			duk_call_setup_propcall_error(thr, tv__targ, (barg), (carg)); \
+			duk_call_setup_propcall_error(thr, (barg), (carg)); \
 		} \
 		DUK__REPLACE_TOP_A_BREAK(); \
 	}
-#define DUK__PUTPROP_BODY(aarg,barg,carg) { \
+#define DUK__PUTPROP_BODY(aarg, barg, carg) \
+	{ \
 		/* A -> object reg \
 		 * B -> key reg/const \
 		 * C -> value reg/const \
@@ -77197,7 +81447,8 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 		(void) duk_hobject_putprop(thr, (aarg), (barg), (carg), DUK__STRICT()); \
 		break; \
 	}
-#define DUK__DELPROP_BODY(barg,carg) { \
+#define DUK__DELPROP_BODY(barg, carg) \
+	{ \
 		/* A -> result reg \
 		 * B -> object reg \
 		 * C -> key reg/const \
@@ -77226,9 +81477,9 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 		case DUK_OP_PUTPROP_CC:
 			DUK__PUTPROP_BODY(DUK__REGP_A(ins), DUK__REGCONSTP_B(ins), DUK__REGCONSTP_C(ins));
 		case DUK_OP_DELPROP_RR:
-		case DUK_OP_DELPROP_RC:  /* B is always reg */
+		case DUK_OP_DELPROP_RC: /* B is always reg */
 			DUK__DELPROP_BODY(DUK__REGP_B(ins), DUK__REGCONSTP_C(ins));
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 		case DUK_OP_GETPROP_RR:
 			DUK__GETPROP_BODY(DUK__REGP_B(ins), DUK__REGP_C(ins));
 		case DUK_OP_GETPROP_CR:
@@ -77255,11 +81506,11 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			DUK__PUTPROP_BODY(DUK__REGP_A(ins), DUK__REGP_B(ins), DUK__CONSTP_C(ins));
 		case DUK_OP_PUTPROP_CC:
 			DUK__PUTPROP_BODY(DUK__REGP_A(ins), DUK__CONSTP_B(ins), DUK__CONSTP_C(ins));
-		case DUK_OP_DELPROP_RR:  /* B is always reg */
+		case DUK_OP_DELPROP_RR: /* B is always reg */
 			DUK__DELPROP_BODY(DUK__REGP_B(ins), DUK__REGP_C(ins));
 		case DUK_OP_DELPROP_RC:
 			DUK__DELPROP_BODY(DUK__REGP_B(ins), DUK__CONSTP_C(ins));
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 
 		/* No fast path for DECLVAR now, it's quite a rare instruction. */
 		case DUK_OP_DECLVAR_RR:
@@ -77292,7 +81543,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			if (is_func_decl) {
 				duk_push_tval(thr, DUK__REGCONSTP_C(ins));
 			} else {
-				DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(thr->valstack_top));  /* valstack policy */
+				DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(thr->valstack_top)); /* valstack policy */
 				thr->valstack_top++;
 			}
 			tv1 = DUK_GET_TVAL_NEGIDX(thr, -1);
@@ -77328,11 +81579,11 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			 */
 
 			duk_push_tval(thr, DUK__REGCONSTP_C(ins));
-			duk_push_tval(thr, DUK__REGCONSTP_B(ins));  /* -> [ ... escaped_source bytecode ] */
-			duk_regexp_create_instance(thr);   /* -> [ ... regexp_instance ] */
+			duk_push_tval(thr, DUK__REGCONSTP_B(ins)); /* -> [ ... escaped_source bytecode ] */
+			duk_regexp_create_instance(thr); /* -> [ ... regexp_instance ] */
 			DUK__REPLACE_TOP_A_BREAK();
 		}
-#endif  /* DUK_USE_REGEXP_SUPPORT */
+#endif /* DUK_USE_REGEXP_SUPPORT */
 
 		/* XXX: 'c' is unused, use whole BC, etc. */
 		case DUK_OP_CSVAR_RR:
@@ -77361,13 +81612,13 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			name = DUK_TVAL_GET_STRING(tv1);
 			DUK_ASSERT(name != NULL);
 			act = thr->callstack_curr;
-			(void) duk_js_getvar_activation(thr, act, name, 1 /*throw*/);  /* -> [... val this] */
+			(void) duk_js_getvar_activation(thr, act, name, 1 /*throw*/); /* -> [... val this] */
 
 			idx = (duk_uint_fast_t) DUK_DEC_A(ins);
 
 			/* Could add direct value stack handling. */
-			duk_replace(thr, (duk_idx_t) (idx + 1));  /* 'this' binding */
-			duk_replace(thr, (duk_idx_t) idx);        /* variable value (function, we hope, not checked here) */
+			duk_replace(thr, (duk_idx_t) (idx + 1)); /* 'this' binding */
+			duk_replace(thr, (duk_idx_t) idx); /* variable value (function, we hope, not checked here) */
 			break;
 		}
 
@@ -77382,7 +81633,9 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			 */
 
 			DUK_DDD(DUK_DDDPRINT("CLOSURE to target register %ld, fnum %ld (count %ld)",
-			                     (long) DUK_DEC_A(ins), (long) DUK_DEC_BC(ins), (long) DUK_HCOMPFUNC_GET_FUNCS_COUNT(thr->heap, DUK__FUN())));
+			                     (long) DUK_DEC_A(ins),
+			                     (long) DUK_DEC_BC(ins),
+			                     (long) DUK_HCOMPFUNC_GET_FUNCS_COUNT(thr->heap, DUK__FUN())));
 
 			DUK_ASSERT_DISABLE(bc >= 0); /* unsigned */
 			DUK_ASSERT((duk_uint_t) bc < (duk_uint_t) DUK_HCOMPFUNC_GET_FUNCS_COUNT(thr->heap, DUK__FUN()));
@@ -77393,8 +81646,8 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			DUK_ASSERT(fun_temp != NULL);
 			DUK_ASSERT(DUK_HOBJECT_IS_COMPFUNC(fun_temp));
 
-			DUK_DDD(DUK_DDDPRINT("CLOSURE: function template is: %p -> %!O",
-			                     (void *) fun_temp, (duk_heaphdr *) fun_temp));
+			DUK_DDD(
+			    DUK_DDDPRINT("CLOSURE: function template is: %p -> %!O", (void *) fun_temp, (duk_heaphdr *) fun_temp));
 
 			if (act->lex_env == NULL) {
 				DUK_ASSERT(act->var_env == NULL);
@@ -77408,11 +81661,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			 * new variable declaration environment, so only lex_env
 			 * matters here.
 			 */
-			duk_js_push_closure(thr,
-			                    (duk_hcompfunc *) fun_temp,
-			                    act->var_env,
-			                    act->lex_env,
-			                    1 /*add_auto_proto*/);
+			duk_js_push_closure(thr, (duk_hcompfunc *) fun_temp, act->var_env, act->lex_env, 1 /*add_auto_proto*/);
 			DUK__REPLACE_TOP_A_BREAK();
 		}
 
@@ -77427,8 +81676,8 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			DUK_ASSERT(name != NULL);
 			act = thr->callstack_curr;
 			DUK_ASSERT(act != NULL);
-			(void) duk_js_getvar_activation(thr, act, name, 1 /*throw*/);  /* -> [... val this] */
-			duk_pop_unsafe(thr);  /* 'this' binding is not needed here */
+			(void) duk_js_getvar_activation(thr, act, name, 1 /*throw*/); /* -> [... val this] */
+			duk_pop_unsafe(thr); /* 'this' binding is not needed here */
 			DUK__REPLACE_TOP_A_BREAK();
 		}
 
@@ -77446,7 +81695,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			 * should be reworked.
 			 */
 
-			tv1 = DUK__REGP_A(ins);  /* val */
+			tv1 = DUK__REGP_A(ins); /* val */
 			act = thr->callstack_curr;
 			duk_js_putvar_activation(thr, act, name, tv1, DUK__STRICT());
 			break;
@@ -77476,7 +81725,8 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			break;
 		}
 
-#define DUK__RETURN_SHARED() do { \
+#define DUK__RETURN_SHARED() \
+	do { \
 		duk_small_uint_t ret_result; \
 		/* duk__handle_return() is guaranteed never to throw, except \
 		 * for potential out-of-memory situations which will then \
@@ -77495,14 +81745,14 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 		case DUK_OP_RETCONST:
 		case DUK_OP_RETCONSTN:
 		case DUK_OP_RETUNDEF: {
-			 /* BC -> return value reg/const */
+			/* BC -> return value reg/const */
 
 			DUK__SYNC_AND_NULL_CURR_PC();
 
 			if (op == DUK_OP_RETREG) {
 				duk_push_tval(thr, DUK__REGP_BC(ins));
 			} else if (op == DUK_OP_RETUNDEF) {
-				DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(thr->valstack_top));  /* valstack policy */
+				DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(thr->valstack_top)); /* valstack policy */
 				thr->valstack_top++;
 			} else {
 				DUK_ASSERT(op == DUK_OP_RETCONST || op == DUK_OP_RETCONSTN);
@@ -77511,7 +81761,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 
 			DUK__RETURN_SHARED();
 		}
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 		case DUK_OP_RETREG: {
 			duk_tval *tv;
 
@@ -77541,18 +81791,18 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			DUK_TVAL_SET_TVAL(thr->valstack_top, tv);
 #if defined(DUK_USE_REFERENCE_COUNTING)
 			/* Without refcounting only RETCONSTN is used. */
-			DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv));  /* no INCREF for this constant */
+			DUK_ASSERT(!DUK_TVAL_IS_HEAP_ALLOCATED(tv)); /* no INCREF for this constant */
 #endif
 			thr->valstack_top++;
 			DUK__RETURN_SHARED();
 		}
 		case DUK_OP_RETUNDEF: {
 			DUK__SYNC_AND_NULL_CURR_PC();
-			thr->valstack_top++;  /* value at valstack top is already undefined by valstack policy */
+			thr->valstack_top++; /* value at valstack top is already undefined by valstack policy */
 			DUK_ASSERT(DUK_TVAL_IS_UNDEFINED(thr->valstack_top));
 			DUK__RETURN_SHARED();
 		}
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 
 		case DUK_OP_LABEL: {
 			duk_activation *act;
@@ -77565,8 +81815,8 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			DUK_ASSERT(cat != NULL);
 
 			cat->flags = (duk_uint32_t) (DUK_CAT_TYPE_LABEL | (bc << DUK_CAT_LABEL_SHIFT));
-			cat->pc_base = (duk_instr_t *) curr_pc;  /* pre-incremented, points to first jump slot */
-			cat->idx_base = 0;  /* unused for label */
+			cat->pc_base = (duk_instr_t *) curr_pc; /* pre-incremented, points to first jump slot */
+			cat->idx_base = 0; /* unused for label */
 			cat->h_varname = NULL;
 
 			act = thr->callstack_curr;
@@ -77576,10 +81826,13 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 
 			DUK_DDD(DUK_DDDPRINT("LABEL catcher: flags=0x%08lx, pc_base=%ld, "
 			                     "idx_base=%ld, h_varname=%!O, label_id=%ld",
-			                     (long) cat->flags, (long) cat->pc_base,
-			                     (long) cat->idx_base, (duk_heaphdr *) cat->h_varname, (long) DUK_CAT_GET_LABEL(cat)));
+			                     (long) cat->flags,
+			                     (long) cat->pc_base,
+			                     (long) cat->idx_base,
+			                     (duk_heaphdr *) cat->h_varname,
+			                     (long) DUK_CAT_GET_LABEL(cat)));
 
-			curr_pc += 2;  /* skip jump slots */
+			curr_pc += 2; /* skip jump slots */
 			break;
 		}
 
@@ -77621,7 +81874,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 		/* XXX: move to helper, too large to be inline here */
 		case DUK_OP_TRYCATCH: {
 			duk__handle_op_trycatch(thr, ins, curr_pc);
-			curr_pc += 2;  /* skip jump slots */
+			curr_pc += 2; /* skip jump slots */
 			break;
 		}
 
@@ -77666,8 +81919,8 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			                     (duk_tval *) duk_get_tval(thr, -1)));
 #if defined(DUK_USE_AUGMENT_ERROR_THROW)
 			duk_err_augment_error_throw(thr);
-			DUK_DDD(DUK_DDDPRINT("THROW ERROR (BYTECODE): %!dT (after throw augment)",
-			                     (duk_tval *) duk_get_tval(thr, -1)));
+			DUK_DDD(
+			    DUK_DDDPRINT("THROW ERROR (BYTECODE): %!dT (after throw augment)", (duk_tval *) duk_get_tval(thr, -1)));
 #endif
 
 			duk_err_setup_ljstate1(thr, DUK_LJ_TYPE_THROW, DUK_GET_TVAL_NEGIDX(thr, -1));
@@ -77675,7 +81928,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			duk_err_check_debugger_integration(thr);
 #endif
 
-			DUK_ASSERT(thr->heap->lj.jmpbuf_ptr != NULL);  /* always in executor */
+			DUK_ASSERT(thr->heap->lj.jmpbuf_ptr != NULL); /* always in executor */
 			duk_err_longjmp(thr);
 			DUK_UNREACHABLE();
 			break;
@@ -77712,20 +81965,19 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			DUK_TVAL_SET_TVAL(&tv_tmp2, tv2);
 			tv3 = DUK__REGP(a);
 			DUK_TVAL_SET_TVAL(tv1, tv3);
-			DUK_TVAL_INCREF(thr, tv1);  /* no side effects */
-			DUK_TVAL_SET_UNDEFINED(tv2);  /* no need for incref */
+			DUK_TVAL_INCREF(thr, tv1); /* no side effects */
+			DUK_TVAL_SET_UNDEFINED(tv2); /* no need for incref */
 			DUK_TVAL_DECREF(thr, &tv_tmp1);
 			DUK_TVAL_DECREF(thr, &tv_tmp2);
 #endif
 			break;
 		}
 
-
-		/* XXX: in some cases it's faster NOT to reuse the value
-		 * stack but rather copy the arguments on top of the stack
-		 * (mainly when the calling value stack is large and the value
-		 * stack resize would be large).
-		 */
+			/* XXX: in some cases it's faster NOT to reuse the value
+			 * stack but rather copy the arguments on top of the stack
+			 * (mainly when the calling value stack is large and the value
+			 * stack resize would be large).
+			 */
 
 		case DUK_OP_CALL0:
 		case DUK_OP_CALL1:
@@ -77886,7 +82138,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			}
 
 			count = (duk_small_uint_fast_t) DUK_DEC_C(ins);
-			DUK_ASSERT(count > 0);  /* compiler guarantees */
+			DUK_ASSERT(count > 0); /* compiler guarantees */
 			idx_end = idx + count;
 
 #if defined(DUK_USE_EXEC_INDIRECT_BOUND_CHECK)
@@ -77910,11 +82162,10 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 				/* XXX: faster initialization (direct access or better primitives) */
 				duk_dup(thr, (duk_idx_t) idx);
 				duk_dup(thr, (duk_idx_t) (idx + 1));
-				duk_def_prop(thr, obj_idx, DUK_DEFPROP_HAVE_VALUE |
-				                           DUK_DEFPROP_FORCE |
-				                           DUK_DEFPROP_SET_WRITABLE |
-				                           DUK_DEFPROP_SET_ENUMERABLE |
-				                           DUK_DEFPROP_SET_CONFIGURABLE);
+				duk_def_prop(thr,
+				             obj_idx,
+				             DUK_DEFPROP_HAVE_VALUE | DUK_DEFPROP_FORCE | DUK_DEFPROP_SET_WRITABLE |
+				                 DUK_DEFPROP_SET_ENUMERABLE | DUK_DEFPROP_SET_CONFIGURABLE);
 				idx += 2;
 			} while (idx < idx_end);
 			break;
@@ -77949,7 +82200,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			}
 
 			count = (duk_small_uint_fast_t) DUK_DEC_C(ins);
-			DUK_ASSERT(count > 0 + 1);  /* compiler guarantees */
+			DUK_ASSERT(count > 0 + 1); /* compiler guarantees */
 			idx_end = idx + count;
 
 #if defined(DUK_USE_EXEC_INDIRECT_BOUND_CHECK)
@@ -78076,7 +82327,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			duk_push_new_target(thr);
 			DUK__REPLACE_TOP_BC_BREAK();
 		}
-#endif  /* DUK_USE_ES6 */
+#endif /* DUK_USE_ES6 */
 
 #if !defined(DUK_USE_EXEC_PREFER_SIZE)
 #if !defined(DUK_USE_ES7_EXP_OPERATOR)
@@ -78139,16 +82390,16 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 		case DUK_OP_UNUSED253:
 		case DUK_OP_UNUSED254:
 		case DUK_OP_UNUSED255:
-		/* Force all case clauses to map to an actual handler
-		 * so that the compiler can emit a jump without a bounds
-		 * check: the switch argument is a duk_uint8_t so that
-		 * the compiler may be able to figure it out.  This is
-		 * a small detail and obviously compiler dependent.
-		 */
-		/* default: clause omitted on purpose */
-#else  /* DUK_USE_EXEC_PREFER_SIZE */
+			/* Force all case clauses to map to an actual handler
+			 * so that the compiler can emit a jump without a bounds
+			 * check: the switch argument is a duk_uint8_t so that
+			 * the compiler may be able to figure it out.  This is
+			 * a small detail and obviously compiler dependent.
+			 */
+			/* default: clause omitted on purpose */
+#else /* DUK_USE_EXEC_PREFER_SIZE */
 		default:
-#endif  /* DUK_USE_EXEC_PREFER_SIZE */
+#endif /* DUK_USE_EXEC_PREFER_SIZE */
 		{
 			/* Default case catches invalid/unsupported opcodes. */
 			DUK_D(DUK_DPRINT("invalid opcode: %ld - %!I", (long) op, ins));
@@ -78156,7 +82407,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 			break;
 		}
 
-		}  /* end switch */
+		} /* end switch */
 
 		continue;
 
@@ -78167,10 +82418,10 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 		 */
 
 #if defined(DUK_USE_EXEC_PREFER_SIZE)
-	 replace_top_a:
+	replace_top_a:
 		DUK__REPLACE_TO_TVPTR(thr, DUK__REGP_A(ins));
 		continue;
-	 replace_top_bc:
+	replace_top_bc:
 		DUK__REPLACE_TO_TVPTR(thr, DUK__REGP_BC(ins));
 		continue;
 #endif
@@ -78178,7 +82429,7 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 	DUK_WO_NORETURN(return;);
 
 #if !defined(DUK_USE_VERBOSE_EXECUTOR_ERRORS)
- internal_error:
+internal_error:
 	DUK_ERROR_INTERNAL(thr);
 	DUK_WO_NORETURN(return;);
 #endif
@@ -78203,7 +82454,6 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 #undef DUK__GETPROP_BODY
 #undef DUK__GE_BODY
 #undef DUK__GT_BODY
-#undef DUK__INLINE_PERF
 #undef DUK__INSTOF_BODY
 #undef DUK__INTERNAL_ERROR
 #undef DUK__INT_NOACTION
@@ -78219,7 +82469,6 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 #undef DUK__MASK_BC
 #undef DUK__MASK_C
 #undef DUK__NEQ_BODY
-#undef DUK__NOINLINE_PERF
 #undef DUK__PUTPROP_BODY
 #undef DUK__RCBIT_B
 #undef DUK__RCBIT_C
@@ -78369,6 +82618,7 @@ DUK_INTERNAL duk_bool_t duk_js_toboolean(duk_tval *tv) {
 	}
 	}
 	DUK_UNREACHABLE();
+	DUK_WO_UNREACHABLE(return 0;);
 }
 
 /*
@@ -78396,7 +82646,8 @@ DUK_INTERNAL duk_bool_t duk_js_toboolean(duk_tval *tv) {
  *      ("0x123") and infinities
  *
  *    - Unlike source code literals, ToNumber() coerces empty strings
- *      and strings with only whitespace to zero (not NaN).
+ *      and strings with only whitespace to zero (not NaN).  However,
+ *      while '' coerces to 0, '+' and '-' coerce to NaN.
  */
 
 /* E5 Section 9.3.1 */
@@ -78409,19 +82660,10 @@ DUK_LOCAL duk_double_t duk__tonumber_string_raw(duk_hthread *thr) {
 	/* Quite lenient, e.g. allow empty as zero, but don't allow trailing
 	 * garbage.
 	 */
-	s2n_flags = DUK_S2N_FLAG_TRIM_WHITE |
-	            DUK_S2N_FLAG_ALLOW_EXP |
-	            DUK_S2N_FLAG_ALLOW_PLUS |
-	            DUK_S2N_FLAG_ALLOW_MINUS |
-	            DUK_S2N_FLAG_ALLOW_INF |
-	            DUK_S2N_FLAG_ALLOW_FRAC |
-	            DUK_S2N_FLAG_ALLOW_NAKED_FRAC |
-	            DUK_S2N_FLAG_ALLOW_EMPTY_FRAC |
-	            DUK_S2N_FLAG_ALLOW_EMPTY_AS_ZERO |
-	            DUK_S2N_FLAG_ALLOW_LEADING_ZERO |
-	            DUK_S2N_FLAG_ALLOW_AUTO_HEX_INT |
-	            DUK_S2N_FLAG_ALLOW_AUTO_OCT_INT |
-	            DUK_S2N_FLAG_ALLOW_AUTO_BIN_INT;
+	s2n_flags = DUK_S2N_FLAG_TRIM_WHITE | DUK_S2N_FLAG_ALLOW_EXP | DUK_S2N_FLAG_ALLOW_PLUS | DUK_S2N_FLAG_ALLOW_MINUS |
+	            DUK_S2N_FLAG_ALLOW_INF | DUK_S2N_FLAG_ALLOW_FRAC | DUK_S2N_FLAG_ALLOW_NAKED_FRAC |
+	            DUK_S2N_FLAG_ALLOW_EMPTY_FRAC | DUK_S2N_FLAG_ALLOW_EMPTY_AS_ZERO | DUK_S2N_FLAG_ALLOW_LEADING_ZERO |
+	            DUK_S2N_FLAG_ALLOW_AUTO_HEX_INT | DUK_S2N_FLAG_ALLOW_AUTO_OCT_INT | DUK_S2N_FLAG_ALLOW_AUTO_BIN_INT;
 
 	duk_numconv_parse(thr, 10 /*radix*/, s2n_flags);
 
@@ -78431,9 +82673,9 @@ DUK_LOCAL duk_double_t duk__tonumber_string_raw(duk_hthread *thr) {
 #else
 	thr->valstack_top--;
 	DUK_ASSERT(DUK_TVAL_IS_NUMBER(thr->valstack_top));
-	DUK_ASSERT(DUK_TVAL_IS_DOUBLE(thr->valstack_top));  /* no fastint conversion in numconv now */
+	DUK_ASSERT(DUK_TVAL_IS_DOUBLE(thr->valstack_top)); /* no fastint conversion in numconv now */
 	DUK_ASSERT(!DUK_TVAL_NEEDS_REFCOUNT_UPDATE(thr->valstack_top));
-	d = DUK_TVAL_GET_DOUBLE(thr->valstack_top);  /* assumes not a fastint */
+	d = DUK_TVAL_GET_DOUBLE(thr->valstack_top); /* assumes not a fastint */
 	DUK_TVAL_SET_UNDEFINED(thr->valstack_top);
 #endif
 
@@ -78472,11 +82714,11 @@ DUK_INTERNAL duk_double_t duk_js_tonumber(duk_hthread *thr, duk_tval *tv) {
 		duk_push_hstring(thr, h);
 		return duk__tonumber_string_raw(thr);
 	}
-	case DUK_TAG_BUFFER:  /* plain buffer treated like object */
+	case DUK_TAG_BUFFER: /* plain buffer treated like object */
 	case DUK_TAG_OBJECT: {
 		duk_double_t d;
 		duk_push_tval(thr, tv);
-		duk_to_primitive(thr, -1, DUK_HINT_NUMBER);  /* 'tv' becomes invalid */
+		duk_to_primitive(thr, -1, DUK_HINT_NUMBER); /* 'tv' becomes invalid */
 
 		/* recursive call for a primitive value (guaranteed not to cause second
 		 * recursion).
@@ -78509,6 +82751,7 @@ DUK_INTERNAL duk_double_t duk_js_tonumber(duk_hthread *thr, duk_tval *tv) {
 	}
 
 	DUK_UNREACHABLE();
+	DUK_WO_UNREACHABLE(return 0.0;);
 }
 
 /*
@@ -78530,7 +82773,7 @@ DUK_INTERNAL duk_double_t duk_js_tointeger_number(duk_double_t x) {
 		 */
 		return duk_double_trunc_towards_zero(x);
 	}
-#else  /* DUK_USE_PREFER_SIZE */
+#else /* DUK_USE_PREFER_SIZE */
 	/* NaN and Infinity have the same exponent so it's a cheap
 	 * initial check for the rare path.
 	 */
@@ -78543,12 +82786,12 @@ DUK_INTERNAL duk_double_t duk_js_tointeger_number(duk_double_t x) {
 	} else {
 		return duk_double_trunc_towards_zero(x);
 	}
-#endif  /* DUK_USE_PREFER_SIZE */
+#endif /* DUK_USE_PREFER_SIZE */
 }
 
 DUK_INTERNAL duk_double_t duk_js_tointeger(duk_hthread *thr, duk_tval *tv) {
 	/* XXX: fastint */
-	duk_double_t d = duk_js_tonumber(thr, tv);  /* invalidates tv */
+	duk_double_t d = duk_js_tonumber(thr, tv); /* invalidates tv */
 	return duk_js_tointeger_number(d);
 }
 
@@ -78558,11 +82801,11 @@ DUK_INTERNAL duk_double_t duk_js_tointeger(duk_hthread *thr, duk_tval *tv) {
 
 /* combined algorithm matching E5 Sections 9.5 and 9.6 */
 DUK_LOCAL duk_double_t duk__toint32_touint32_helper(duk_double_t x, duk_bool_t is_toint32) {
-#if defined (DUK_USE_PREFER_SIZE)
+#if defined(DUK_USE_PREFER_SIZE)
 	duk_small_int_t c;
 #endif
 
-#if defined (DUK_USE_PREFER_SIZE)
+#if defined(DUK_USE_PREFER_SIZE)
 	c = (duk_small_int_t) DUK_FPCLASSIFY(x);
 	if (c == DUK_FP_NAN || c == DUK_FP_ZERO || c == DUK_FP_INFINITE) {
 		return 0.0;
@@ -78580,18 +82823,18 @@ DUK_LOCAL duk_double_t duk__toint32_touint32_helper(duk_double_t x, duk_bool_t i
 	 * differs from what Javascript wants (see Section 9.6).
 	 */
 
-	x = DUK_FMOD(x, DUK_DOUBLE_2TO32);    /* -> x in ]-2**32, 2**32[ */
+	x = DUK_FMOD(x, DUK_DOUBLE_2TO32); /* -> x in ]-2**32, 2**32[ */
 
 	if (x < 0.0) {
 		x += DUK_DOUBLE_2TO32;
 	}
-	DUK_ASSERT(x >= 0 && x < DUK_DOUBLE_2TO32);  /* -> x in [0, 2**32[ */
+	DUK_ASSERT(x >= 0 && x < DUK_DOUBLE_2TO32); /* -> x in [0, 2**32[ */
 
 	if (is_toint32) {
 		if (x >= DUK_DOUBLE_2TO31) {
 			/* x in [2**31, 2**32[ */
 
-			x -= DUK_DOUBLE_2TO32;  /* -> x in [-2**31,2**31[ */
+			x -= DUK_DOUBLE_2TO32; /* -> x in [-2**31,2**31[ */
 		}
 	}
 
@@ -78607,15 +82850,14 @@ DUK_INTERNAL duk_int32_t duk_js_toint32(duk_hthread *thr, duk_tval *tv) {
 	}
 #endif
 
-	d = duk_js_tonumber(thr, tv);  /* invalidates tv */
+	d = duk_js_tonumber(thr, tv); /* invalidates tv */
 	d = duk__toint32_touint32_helper(d, 1);
 	DUK_ASSERT(DUK_FPCLASSIFY(d) == DUK_FP_ZERO || DUK_FPCLASSIFY(d) == DUK_FP_NORMAL);
-	DUK_ASSERT(d >= -2147483648.0 && d <= 2147483647.0);  /* [-0x80000000,0x7fffffff] */
-	DUK_ASSERT(d == ((duk_double_t) ((duk_int32_t) d)));  /* whole, won't clip */
+	DUK_ASSERT(d >= -2147483648.0 && d <= 2147483647.0); /* [-0x80000000,0x7fffffff] */
+	DUK_ASSERT(duk_double_equals(d, (duk_double_t) ((duk_int32_t) d))); /* whole, won't clip */
 	return (duk_int32_t) d;
 }
 
-
 DUK_INTERNAL duk_uint32_t duk_js_touint32(duk_hthread *thr, duk_tval *tv) {
 	duk_double_t d;
 
@@ -78625,13 +82867,12 @@ DUK_INTERNAL duk_uint32_t duk_js_touint32(duk_hthread *thr, duk_tval *tv) {
 	}
 #endif
 
-	d = duk_js_tonumber(thr, tv);  /* invalidates tv */
+	d = duk_js_tonumber(thr, tv); /* invalidates tv */
 	d = duk__toint32_touint32_helper(d, 0);
 	DUK_ASSERT(DUK_FPCLASSIFY(d) == DUK_FP_ZERO || DUK_FPCLASSIFY(d) == DUK_FP_NORMAL);
-	DUK_ASSERT(d >= 0.0 && d <= 4294967295.0);  /* [0x00000000, 0xffffffff] */
-	DUK_ASSERT(d == ((duk_double_t) ((duk_uint32_t) d)));  /* whole, won't clip */
+	DUK_ASSERT(d >= 0.0 && d <= 4294967295.0); /* [0x00000000, 0xffffffff] */
+	DUK_ASSERT(duk_double_equals(d, (duk_double_t) ((duk_uint32_t) d))); /* whole, won't clip */
 	return (duk_uint32_t) d;
-
 }
 
 DUK_INTERNAL duk_uint16_t duk_js_touint16(duk_hthread *thr, duk_tval *tv) {
@@ -78681,14 +82922,14 @@ DUK_LOCAL duk_bool_t duk__js_equals_number(duk_double_t x, duk_double_t y) {
 		return 1;
 	}
 	return 0;
-#else  /* DUK_USE_PARANOID_MATH */
+#else /* DUK_USE_PARANOID_MATH */
 	/* Better equivalent algorithm.  If the compiler is compliant, C and
 	 * ECMAScript semantics are identical for this particular comparison.
 	 * In particular, NaNs must never compare equal and zeroes must compare
 	 * equal regardless of sign.  Could also use a macro, but this inlines
 	 * already nicely (no difference on gcc, for instance).
 	 */
-	if (x == y) {
+	if (duk_double_equals(x, y)) {
 		/* IEEE requires that NaNs compare false */
 		DUK_ASSERT(DUK_FPCLASSIFY(x) != DUK_FP_NAN);
 		DUK_ASSERT(DUK_FPCLASSIFY(y) != DUK_FP_NAN);
@@ -78701,7 +82942,7 @@ DUK_LOCAL duk_bool_t duk__js_equals_number(duk_double_t x, duk_double_t y) {
 		DUK_ASSERT(!(DUK_FPCLASSIFY(x) == DUK_FP_ZERO && DUK_FPCLASSIFY(y) == DUK_FP_ZERO));
 		return 0;
 	}
-#endif  /* DUK_USE_PARANOID_MATH */
+#endif /* DUK_USE_PARANOID_MATH */
 }
 
 DUK_LOCAL duk_bool_t duk__js_samevalue_number(duk_double_t x, duk_double_t y) {
@@ -78731,11 +82972,11 @@ DUK_LOCAL duk_bool_t duk__js_samevalue_number(duk_double_t x, duk_double_t y) {
 	 */
 
 	return (x == y);
-#else  /* DUK_USE_PARANOID_MATH */
+#else /* DUK_USE_PARANOID_MATH */
 	duk_small_int_t cx = (duk_small_int_t) DUK_FPCLASSIFY(x);
 	duk_small_int_t cy = (duk_small_int_t) DUK_FPCLASSIFY(y);
 
-	if (x == y) {
+	if (duk_double_equals(x, y)) {
 		/* IEEE requires that NaNs compare false */
 		DUK_ASSERT(DUK_FPCLASSIFY(x) != DUK_FP_NAN);
 		DUK_ASSERT(DUK_FPCLASSIFY(y) != DUK_FP_NAN);
@@ -78766,7 +83007,7 @@ DUK_LOCAL duk_bool_t duk__js_samevalue_number(duk_double_t x, duk_double_t y) {
 		}
 		return 0;
 	}
-#endif  /* DUK_USE_PARANOID_MATH */
+#endif /* DUK_USE_PARANOID_MATH */
 }
 
 DUK_INTERNAL duk_bool_t duk_js_equals_helper(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y, duk_small_uint_t flags) {
@@ -78792,10 +83033,9 @@ DUK_INTERNAL duk_bool_t duk_js_equals_helper(duk_hthread *thr, duk_tval *tv_x, d
 		} else {
 			return 0;
 		}
-	}
-	else
+	} else
 #endif
-	if (DUK_TVAL_IS_NUMBER(tv_x) && DUK_TVAL_IS_NUMBER(tv_y)) {
+	    if (DUK_TVAL_IS_NUMBER(tv_x) && DUK_TVAL_IS_NUMBER(tv_y)) {
 		duk_double_t d1, d2;
 
 		/* Catches both doubles and cases where only one argument is
@@ -78860,7 +83100,7 @@ DUK_INTERNAL duk_bool_t duk_js_equals_helper(duk_hthread *thr, duk_tval *tv_x, d
 			DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv_x));
 			DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv_y));
 			DUK_UNREACHABLE();
-			return 0;
+			DUK_WO_UNREACHABLE(return 0;);
 		}
 		}
 	}
@@ -78869,7 +83109,7 @@ DUK_INTERNAL duk_bool_t duk_js_equals_helper(duk_hthread *thr, duk_tval *tv_x, d
 		return 0;
 	}
 
-	DUK_ASSERT(flags == 0);  /* non-strict equality from here on */
+	DUK_ASSERT(flags == 0); /* non-strict equality from here on */
 
 	/*
 	 *  Types are different; various cases for non-strict comparison
@@ -78926,34 +83166,29 @@ DUK_INTERNAL duk_bool_t duk_js_equals_helper(duk_hthread *thr, duk_tval *tv_x, d
 	}
 
 	/* String-number-symbol/object -> coerce object to primitive (apparently without hint), then try again. */
-	if ((type_mask_x & (DUK_TYPE_MASK_STRING | DUK_TYPE_MASK_NUMBER)) &&
-	    (type_mask_y & DUK_TYPE_MASK_OBJECT)) {
+	if ((type_mask_x & (DUK_TYPE_MASK_STRING | DUK_TYPE_MASK_NUMBER)) && (type_mask_y & DUK_TYPE_MASK_OBJECT)) {
 		/* No symbol check needed because symbols and strings are accepted. */
 		duk_push_tval(thr, tv_x);
 		duk_push_tval(thr, tv_y);
-		duk_to_primitive(thr, -1, DUK_HINT_NONE);  /* apparently no hint? */
+		duk_to_primitive(thr, -1, DUK_HINT_NONE); /* apparently no hint? */
 		goto recursive_call;
 	}
-	if ((type_mask_x & DUK_TYPE_MASK_OBJECT) &&
-	    (type_mask_y & (DUK_TYPE_MASK_STRING | DUK_TYPE_MASK_NUMBER))) {
+	if ((type_mask_x & DUK_TYPE_MASK_OBJECT) && (type_mask_y & (DUK_TYPE_MASK_STRING | DUK_TYPE_MASK_NUMBER))) {
 		/* No symbol check needed because symbols and strings are accepted. */
 		duk_push_tval(thr, tv_x);
 		duk_push_tval(thr, tv_y);
-		duk_to_primitive(thr, -2, DUK_HINT_NONE);  /* apparently no hint? */
+		duk_to_primitive(thr, -2, DUK_HINT_NONE); /* apparently no hint? */
 		goto recursive_call;
 	}
 
 	/* Nothing worked -> not equal. */
 	return 0;
 
- recursive_call:
+recursive_call:
 	/* Shared code path to call the helper again with arguments on stack top. */
 	{
 		duk_bool_t rc;
-		rc = duk_js_equals_helper(thr,
-		                          DUK_GET_TVAL_NEGIDX(thr, -2),
-		                          DUK_GET_TVAL_NEGIDX(thr, -1),
-		                          0 /*flags:nonstrict*/);
+		rc = duk_js_equals_helper(thr, DUK_GET_TVAL_NEGIDX(thr, -2), DUK_GET_TVAL_NEGIDX(thr, -1), 0 /*flags:nonstrict*/);
 		duk_pop_2_unsafe(thr);
 		return rc;
 	}
@@ -78970,7 +83205,10 @@ DUK_INTERNAL duk_bool_t duk_js_equals_helper(duk_hthread *thr, duk_tval *tv_x, d
  * needs to push stuff on the stack anyway...
  */
 
-DUK_INTERNAL duk_small_int_t duk_js_data_compare(const duk_uint8_t *buf1, const duk_uint8_t *buf2, duk_size_t len1, duk_size_t len2) {
+DUK_INTERNAL duk_small_int_t duk_js_data_compare(const duk_uint8_t *buf1,
+                                                 const duk_uint8_t *buf2,
+                                                 duk_size_t len1,
+                                                 duk_size_t len2) {
 	duk_size_t prefix_len;
 	duk_small_int_t rc;
 
@@ -78979,9 +83217,7 @@ DUK_INTERNAL duk_small_int_t duk_js_data_compare(const duk_uint8_t *buf1, const
 	/* duk_memcmp() is guaranteed to return zero (equal) for zero length
 	 * inputs.
 	 */
-	rc = duk_memcmp_unsafe((const void *) buf1,
-	                       (const void *) buf2,
-	                       (size_t) prefix_len);
+	rc = duk_memcmp_unsafe((const void *) buf1, (const void *) buf2, (size_t) prefix_len);
 
 	if (rc < 0) {
 		return -1;
@@ -79023,7 +83259,7 @@ DUK_INTERNAL duk_small_int_t duk_js_string_compare(duk_hstring *h1, duk_hstring
 	                           (duk_size_t) DUK_HSTRING_GET_BYTELEN(h2));
 }
 
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_INTERNAL duk_small_int_t duk_js_buffer_compare(duk_heap *heap, duk_hbuffer *h1, duk_hbuffer *h2) {
 	/* Similar to String comparison. */
 
@@ -79060,47 +83296,47 @@ DUK_LOCAL duk_bool_t duk__compare_number(duk_bool_t retval, duk_double_t d1, duk
 	s2 = (duk_small_int_t) DUK_SIGNBIT(d2);
 
 	if (c1 == DUK_FP_NAN || c2 == DUK_FP_NAN) {
-		return 0;  /* Always false, regardless of negation. */
+		return 0; /* Always false, regardless of negation. */
 	}
 
 	if (c1 == DUK_FP_ZERO && c2 == DUK_FP_ZERO) {
 		/* For all combinations: +0 < +0, +0 < -0, -0 < +0, -0 < -0,
 		 * steps e, f, and g.
 		 */
-		return retval;  /* false */
+		return retval; /* false */
 	}
 
 	if (d1 == d2) {
-		return retval;  /* false */
+		return retval; /* false */
 	}
 
 	if (c1 == DUK_FP_INFINITE && s1 == 0) {
 		/* x == +Infinity */
-		return retval;  /* false */
+		return retval; /* false */
 	}
 
 	if (c2 == DUK_FP_INFINITE && s2 == 0) {
 		/* y == +Infinity */
-		return retval ^ 1;  /* true */
+		return retval ^ 1; /* true */
 	}
 
 	if (c2 == DUK_FP_INFINITE && s2 != 0) {
 		/* y == -Infinity */
-		return retval;  /* false */
+		return retval; /* false */
 	}
 
 	if (c1 == DUK_FP_INFINITE && s1 != 0) {
 		/* x == -Infinity */
-		return retval ^ 1;  /* true */
+		return retval ^ 1; /* true */
 	}
 
 	if (d1 < d2) {
-		return retval ^ 1;  /* true */
+		return retval ^ 1; /* true */
 	}
 
-	return retval;  /* false */
+	return retval; /* false */
 }
-#else  /* DUK_USE_PARANOID_MATH */
+#else /* DUK_USE_PARANOID_MATH */
 DUK_LOCAL duk_bool_t duk__compare_number(duk_bool_t retval, duk_double_t d1, duk_double_t d2) {
 	/* This comparison tree relies doesn't match the exact steps in
 	 * E5 Section 11.8.5 but should produce the same results.  The
@@ -79137,39 +83373,35 @@ DUK_LOCAL duk_bool_t duk__compare_number(duk_bool_t retval, duk_double_t d1, duk
 				 * results in false return (see e.g. Section
 				 * 11.8.3) - hence special treatment here.
 				 */
-				return 0;  /* zero regardless of negation */
+				return 0; /* zero regardless of negation */
 			} else {
 				return retval;
 			}
 		}
 	}
 }
-#endif  /* DUK_USE_PARANOID_MATH */
+#endif /* DUK_USE_PARANOID_MATH */
 
 DUK_INTERNAL duk_bool_t duk_js_compare_helper(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y, duk_small_uint_t flags) {
 	duk_double_t d1, d2;
 	duk_small_int_t rc;
 	duk_bool_t retval;
 
-	DUK_ASSERT(DUK_COMPARE_FLAG_NEGATE == 1);  /* Rely on this flag being lowest. */
+	DUK_ASSERT(DUK_COMPARE_FLAG_NEGATE == 1); /* Rely on this flag being lowest. */
 	retval = flags & DUK_COMPARE_FLAG_NEGATE;
 	DUK_ASSERT(retval == 0 || retval == 1);
 
 	/* Fast path for fastints */
 #if defined(DUK_USE_FASTINT)
 	if (DUK_LIKELY(DUK_TVAL_IS_FASTINT(tv_x) && DUK_TVAL_IS_FASTINT(tv_y))) {
-		return duk__compare_fastint(retval,
-		                            DUK_TVAL_GET_FASTINT(tv_x),
-		                            DUK_TVAL_GET_FASTINT(tv_y));
+		return duk__compare_fastint(retval, DUK_TVAL_GET_FASTINT(tv_x), DUK_TVAL_GET_FASTINT(tv_y));
 	}
-#endif  /* DUK_USE_FASTINT */
+#endif /* DUK_USE_FASTINT */
 
 	/* Fast path for numbers (one of which may be a fastint) */
 #if !defined(DUK_USE_PREFER_SIZE)
 	if (DUK_LIKELY(DUK_TVAL_IS_NUMBER(tv_x) && DUK_TVAL_IS_NUMBER(tv_y))) {
-		return duk__compare_number(retval,
-		                           DUK_TVAL_GET_NUMBER(tv_x),
-		                           DUK_TVAL_GET_NUMBER(tv_y));
+		return duk__compare_number(retval, DUK_TVAL_GET_NUMBER(tv_x), DUK_TVAL_GET_NUMBER(tv_y));
 	}
 #endif
 
@@ -79236,7 +83468,7 @@ DUK_INTERNAL duk_bool_t duk_js_compare_helper(duk_hthread *thr, duk_tval *tv_x,
 	thr->valstack_top -= 2;
 	tv_x = thr->valstack_top;
 	tv_y = tv_x + 1;
-	DUK_TVAL_SET_UNDEFINED(tv_x);  /* Value stack policy */
+	DUK_TVAL_SET_UNDEFINED(tv_x); /* Value stack policy */
 	DUK_TVAL_SET_UNDEFINED(tv_y);
 #endif
 
@@ -79290,8 +83522,8 @@ DUK_LOCAL duk_bool_t duk__js_instanceof_helper(duk_hthread *thr, duk_tval *tv_x,
 	if (!skip_sym_check) {
 		if (duk_get_method_stridx(thr, -1, DUK_STRIDX_WELLKNOWN_SYMBOL_HAS_INSTANCE)) {
 			/* [ ... lhs rhs func ] */
-			duk_insert(thr, -3);    /* -> [ ... func lhs rhs ] */
-			duk_swap_top(thr, -2);  /* -> [ ... func rhs(this) lhs ] */
+			duk_insert(thr, -3); /* -> [ ... func lhs rhs ] */
+			duk_swap_top(thr, -2); /* -> [ ... func rhs(this) lhs ] */
 			duk_call_method(thr, 1);
 			return duk_to_boolean_top_pop(thr);
 		}
@@ -79323,7 +83555,7 @@ DUK_LOCAL duk_bool_t duk__js_instanceof_helper(duk_hthread *thr, duk_tval *tv_x,
 	if (DUK_HOBJECT_HAS_BOUNDFUNC(func)) {
 		duk_push_tval(thr, &((duk_hboundfunc *) (void *) func)->target);
 		duk_replace(thr, -2);
-		func = duk_require_hobject(thr, -1);  /* lightfunc throws */
+		func = duk_require_hobject(thr, -1); /* lightfunc throws */
 
 		/* Rely on Function.prototype.bind() never creating bound
 		 * functions whose target is not proper.
@@ -79363,19 +83595,19 @@ DUK_LOCAL duk_bool_t duk__js_instanceof_helper(duk_hthread *thr, duk_tval *tv_x,
 		DUK_ASSERT(val != NULL);
 		break;
 	case DUK_TAG_OBJECT:
-		skip_first = 1;  /* Ignore object itself on first round. */
+		skip_first = 1; /* Ignore object itself on first round. */
 		val = DUK_TVAL_GET_OBJECT(tv);
 		DUK_ASSERT(val != NULL);
 		break;
 	default:
 		goto pop2_and_false;
 	}
-	DUK_ASSERT(val != NULL);  /* Loop doesn't actually rely on this. */
+	DUK_ASSERT(val != NULL); /* Loop doesn't actually rely on this. */
 
 	/* Look up .prototype of rval.  Leave it on the value stack in case it
 	 * has been virtualized (e.g. getter, Proxy trap).
 	 */
-	duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_PROTOTYPE);  /* -> [ ... lval rval rval.prototype ] */
+	duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_PROTOTYPE); /* -> [ ... lval rval rval.prototype ] */
 #if defined(DUK_USE_VERBOSE_ERRORS)
 	proto = duk_get_hobject(thr, -1);
 	if (proto == NULL) {
@@ -79424,30 +83656,28 @@ DUK_LOCAL duk_bool_t duk__js_instanceof_helper(duk_hthread *thr, duk_tval *tv_x,
 		val = DUK_HOBJECT_GET_PROTOTYPE(thr->heap, val);
 	} while (--sanity > 0);
 
-	if (DUK_UNLIKELY(sanity == 0)) {
-		DUK_ERROR_RANGE(thr, DUK_STR_PROTOTYPE_CHAIN_LIMIT);
-		DUK_WO_NORETURN(return 0;);
-	}
-	DUK_UNREACHABLE();
+	DUK_ASSERT(sanity == 0);
+	DUK_ERROR_RANGE(thr, DUK_STR_PROTOTYPE_CHAIN_LIMIT);
+	DUK_WO_NORETURN(return 0;);
 
- pop2_and_false:
+pop2_and_false:
 	duk_pop_2_unsafe(thr);
 	return 0;
 
- pop3_and_false:
+pop3_and_false:
 	duk_pop_3_unsafe(thr);
 	return 0;
 
- pop3_and_true:
+pop3_and_true:
 	duk_pop_3_unsafe(thr);
 	return 1;
 
- error_invalid_rval:
+error_invalid_rval:
 	DUK_ERROR_TYPE(thr, DUK_STR_INVALID_INSTANCEOF_RVAL);
 	DUK_WO_NORETURN(return 0;);
 
 #if defined(DUK_USE_VERBOSE_ERRORS)
- error_invalid_rval_noproto:
+error_invalid_rval_noproto:
 	DUK_ERROR_TYPE(thr, DUK_STR_INVALID_INSTANCEOF_RVAL_NOPROTO);
 	DUK_WO_NORETURN(return 0;);
 #endif
@@ -79499,9 +83729,7 @@ DUK_INTERNAL duk_bool_t duk_js_in(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv
 
 	(void) duk_to_property_key_hstring(thr, -2);
 
-	retval = duk_hobject_hasprop(thr,
-	                             DUK_GET_TVAL_NEGIDX(thr, -1),
-	                             DUK_GET_TVAL_NEGIDX(thr, -2));
+	retval = duk_hobject_hasprop(thr, DUK_GET_TVAL_NEGIDX(thr, -1), DUK_GET_TVAL_NEGIDX(thr, -2));
 
 	duk_pop_2_unsafe(thr);
 	return retval;
@@ -79595,6 +83823,26 @@ DUK_INTERNAL duk_small_uint_t duk_js_typeof_stridx(duk_tval *tv_x) {
 }
 
 /*
+ *  IsArray()
+ */
+
+DUK_INTERNAL duk_bool_t duk_js_isarray_hobject(duk_hobject *h) {
+	DUK_ASSERT(h != NULL);
+#if defined(DUK_USE_ES6_PROXY)
+	h = duk_hobject_resolve_proxy_target(h);
+#endif
+	return (DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_ARRAY ? 1 : 0);
+}
+
+DUK_INTERNAL duk_bool_t duk_js_isarray(duk_tval *tv) {
+	DUK_ASSERT(tv != NULL);
+	if (DUK_TVAL_IS_OBJECT(tv)) {
+		return duk_js_isarray_hobject(DUK_TVAL_GET_OBJECT(tv));
+	}
+	return 0;
+}
+
+/*
  *  Array index and length
  *
  *  Array index: E5 Section 15.4
@@ -79641,7 +83889,7 @@ DUK_INTERNAL duk_uarridx_t duk_js_to_arrayindex_string(const duk_uint8_t *str, d
 				}
 				res = 0xfffffffaUL + dig;
 				DUK_ASSERT(res >= 0xfffffffaUL);
-				DUK_ASSERT_DISABLE(res <= 0xffffffffUL);  /* range */
+				DUK_ASSERT_DISABLE(res <= 0xffffffffUL); /* range */
 			} else {
 				res = res * 10U + dig;
 				if (DUK_UNLIKELY(res == 0)) {
@@ -79666,7 +83914,7 @@ DUK_INTERNAL duk_uarridx_t duk_js_to_arrayindex_string(const duk_uint8_t *str, d
 
 	return res;
 
- parse_fail:
+parse_fail:
 	return DUK_HSTRING_NO_ARRAY_INDEX;
 }
 
@@ -79704,7 +83952,7 @@ DUK_INTERNAL duk_uarridx_t duk_js_to_arrayindex_hstring_fast(duk_hstring *h) {
 	}
 	return duk_js_to_arrayindex_hstring_fast_known(h);
 }
-#endif  /* DUK_USE_HSTRING_ARRIDX */
+#endif /* DUK_USE_HSTRING_ARRIDX */
 /*
  *  Identifier access and function closure handling.
  *
@@ -79745,10 +83993,10 @@ DUK_INTERNAL duk_uarridx_t duk_js_to_arrayindex_hstring_fast(duk_hstring *h) {
 
 typedef struct {
 	duk_hobject *env;
-	duk_hobject *holder;      /* for object-bound identifiers */
-	duk_tval *value;          /* for register-bound and declarative env identifiers */
-	duk_uint_t attrs;         /* property attributes for identifier (relevant if value != NULL) */
-	duk_bool_t has_this;      /* for object-bound identifiers: provide 'this' binding */
+	duk_hobject *holder; /* for object-bound identifiers */
+	duk_tval *value; /* for register-bound and declarative env identifiers */
+	duk_uint_t attrs; /* property attributes for identifier (relevant if value != NULL) */
+	duk_bool_t has_this; /* for object-bound identifiers: provide 'this' binding */
 } duk__id_lookup_result;
 
 /*
@@ -79834,6 +84082,7 @@ void duk_js_push_closure(duk_hthread *thr,
                          duk_hobject *outer_lex_env,
                          duk_bool_t add_auto_proto) {
 	duk_hcompfunc *fun_clos;
+	duk_harray *formals;
 	duk_small_uint_t i;
 	duk_uint_t len_value;
 
@@ -79845,11 +84094,13 @@ void duk_js_push_closure(duk_hthread *thr,
 	DUK_ASSERT(outer_lex_env != NULL);
 	DUK_UNREF(len_value);
 
+	DUK_STATS_INC(thr->heap, stats_envrec_pushclosure);
+
 	fun_clos = duk_push_hcompfunc(thr);
 	DUK_ASSERT(fun_clos != NULL);
 	DUK_ASSERT(DUK_HOBJECT_GET_PROTOTYPE(thr->heap, (duk_hobject *) fun_clos) == thr->builtins[DUK_BIDX_FUNCTION_PROTOTYPE]);
 
-	duk_push_hobject(thr, &fun_temp->obj);  /* -> [ ... closure template ] */
+	duk_push_hobject(thr, &fun_temp->obj); /* -> [ ... closure template ] */
 
 	DUK_ASSERT(DUK_HOBJECT_IS_COMPFUNC((duk_hobject *) fun_clos));
 	DUK_ASSERT(DUK_HCOMPFUNC_GET_DATA(thr->heap, fun_clos) == NULL);
@@ -79957,9 +84208,9 @@ void duk_js_push_closure(duk_hthread *thr,
 			}
 
 			/* -> [ ... closure template env ] */
-			new_env = duk_hdecenv_alloc(thr,
-			                            DUK_HOBJECT_FLAG_EXTENSIBLE |
-			                            DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DECENV));
+			new_env =
+			    duk_hdecenv_alloc(thr,
+			                      DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DECENV));
 			DUK_ASSERT(new_env != NULL);
 			duk_push_hobject(thr, (duk_hobject *) new_env);
 
@@ -79967,7 +84218,7 @@ void duk_js_push_closure(duk_hthread *thr,
 			DUK_HOBJECT_SET_PROTOTYPE(thr->heap, (duk_hobject *) new_env, proto);
 			DUK_HOBJECT_INCREF_ALLOWNULL(thr, proto);
 
-			DUK_ASSERT(new_env->thread == NULL);  /* Closed. */
+			DUK_ASSERT(new_env->thread == NULL); /* Closed. */
 			DUK_ASSERT(new_env->varmap == NULL);
 
 			/* It's important that duk_xdef_prop() is a 'raw define' so that any
@@ -79981,8 +84232,8 @@ void duk_js_push_closure(duk_hthread *thr,
 			 */
 			(void) duk_get_prop_stridx_short(thr, -2, DUK_STRIDX_NAME);
 			/* -> [ ... closure template env funcname ] */
-			duk_dup_m4(thr);                                           /* -> [ ... closure template env funcname closure ] */
-			duk_xdef_prop(thr, -3, DUK_PROPDESC_FLAGS_NONE);           /* -> [ ... closure template env ] */
+			duk_dup_m4(thr); /* -> [ ... closure template env funcname closure ] */
+			duk_xdef_prop(thr, -3, DUK_PROPDESC_FLAGS_NONE); /* -> [ ... closure template env ] */
 			/* env[funcname] = closure */
 
 			/* [ ... closure template env ] */
@@ -79994,9 +84245,8 @@ void duk_js_push_closure(duk_hthread *thr,
 			duk_pop_unsafe(thr);
 
 			/* [ ... closure template ] */
-		}
-		else
-#endif  /* DUK_USE_FUNC_NAME_PROPERTY */
+		} else
+#endif /* DUK_USE_FUNC_NAME_PROPERTY */
 		{
 			/*
 			 *  Other cases (function declaration, anonymous function expression,
@@ -80024,7 +84274,7 @@ void duk_js_push_closure(duk_hthread *thr,
 
 		DUK_HCOMPFUNC_SET_LEXENV(thr->heap, fun_clos, outer_lex_env);
 		DUK_HCOMPFUNC_SET_VARENV(thr->heap, fun_clos, outer_var_env);
-		DUK_HOBJECT_INCREF(thr, outer_lex_env);  /* NULLs not allowed; asserted on entry */
+		DUK_HOBJECT_INCREF(thr, outer_lex_env); /* NULLs not allowed; asserted on entry */
 		DUK_HOBJECT_INCREF(thr, outer_var_env);
 	}
 	DUK_DDD(DUK_DDDPRINT("closure varenv -> %!ipO, lexenv -> %!ipO",
@@ -80040,6 +84290,11 @@ void duk_js_push_closure(duk_hthread *thr,
 	 *
 	 *  The properties will be non-writable and non-enumerable, but
 	 *  configurable.
+	 *
+	 *  Function templates are bare objects, so inheritance of internal
+	 *  Symbols is not an issue here even when using ordinary property
+	 *  reads.  The function instance created is not bare, so internal
+	 *  Symbols must be defined without inheritance checks.
 	 */
 
 	/* [ ... closure template ] */
@@ -80050,7 +84305,7 @@ void duk_js_push_closure(duk_hthread *thr,
 
 	for (i = 0; i < (duk_small_uint_t) (sizeof(duk__closure_copy_proplist) / sizeof(duk_uint16_t)); i++) {
 		duk_small_int_t stridx = (duk_small_int_t) duk__closure_copy_proplist[i];
-		if (duk_get_prop_stridx_short(thr, -1, stridx)) {
+		if (duk_xget_owndataprop_stridx_short(thr, -1, stridx)) {
 			/* [ ... closure template val ] */
 			DUK_DDD(DUK_DDDPRINT("copying property, stridx=%ld -> found", (long) stridx));
 			duk_xdef_prop_stridx_short(thr, -3, stridx, DUK_PROPDESC_FLAGS_C);
@@ -80069,20 +84324,16 @@ void duk_js_push_closure(duk_hthread *thr,
 
 	/* [ ... closure template ] */
 
-	/* XXX: these lookups should be just own property lookups instead of
-	 * looking up the inheritance chain.
-	 */
-	if (duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_INT_FORMALS)) {
-		/* [ ... closure template formals ] */
-		len_value = (duk_uint_t) duk_get_length(thr, -1);  /* could access duk_harray directly, not important */
+	formals = duk_hobject_get_formals(thr, (duk_hobject *) fun_temp);
+	if (formals) {
+		len_value = (duk_uint_t) formals->length;
 		DUK_DD(DUK_DDPRINT("closure length from _Formals -> %ld", (long) len_value));
 	} else {
 		len_value = fun_temp->nargs;
 		DUK_DD(DUK_DDPRINT("closure length defaulted from nargs -> %ld", (long) len_value));
 	}
-	duk_pop_unsafe(thr);
 
-	duk_push_uint(thr, len_value);  /* [ ... closure template len_value ] */
+	duk_push_uint(thr, len_value); /* [ ... closure template len_value ] */
 	duk_xdef_prop_stridx_short(thr, -3, DUK_STRIDX_LENGTH, DUK_PROPDESC_FLAGS_C);
 
 	/*
@@ -80102,11 +84353,14 @@ void duk_js_push_closure(duk_hthread *thr,
 	/* [ ... closure template ] */
 
 	if (add_auto_proto) {
-		duk_push_object(thr);  /* -> [ ... closure template newobj ] */
-		duk_dup_m3(thr);       /* -> [ ... closure template newobj closure ] */
-		duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_CONSTRUCTOR, DUK_PROPDESC_FLAGS_WC);  /* -> [ ... closure template newobj ] */
-		duk_compact(thr, -1);  /* compact the prototype */
-		duk_xdef_prop_stridx_short(thr, -3, DUK_STRIDX_PROTOTYPE, DUK_PROPDESC_FLAGS_W);     /* -> [ ... closure template ] */
+		duk_push_object(thr); /* -> [ ... closure template newobj ] */
+		duk_dup_m3(thr); /* -> [ ... closure template newobj closure ] */
+		duk_xdef_prop_stridx_short(thr,
+		                           -2,
+		                           DUK_STRIDX_CONSTRUCTOR,
+		                           DUK_PROPDESC_FLAGS_WC); /* -> [ ... closure template newobj ] */
+		duk_compact(thr, -1); /* compact the prototype */
+		duk_xdef_prop_stridx_short(thr, -3, DUK_STRIDX_PROTOTYPE, DUK_PROPDESC_FLAGS_W); /* -> [ ... closure template ] */
 	}
 
 	/*
@@ -80147,7 +84401,7 @@ void duk_js_push_closure(duk_hthread *thr,
 		/* [ ... closure template name ] */
 		DUK_ASSERT(duk_is_string(thr, -1));
 		DUK_DD(DUK_DDPRINT("setting function instance name to %!T", duk_get_tval(thr, -1)));
-		duk_xdef_prop_stridx_short(thr, -3, DUK_STRIDX_NAME, DUK_PROPDESC_FLAGS_C);  /* -> [ ... closure template ] */
+		duk_xdef_prop_stridx_short(thr, -3, DUK_STRIDX_NAME, DUK_PROPDESC_FLAGS_C); /* -> [ ... closure template ] */
 	} else {
 		/* Anonymous functions don't have a .name in ES2015, so don't set
 		 * it on the instance either.  The instance will then inherit
@@ -80179,10 +84433,8 @@ void duk_js_push_closure(duk_hthread *thr,
 	DUK_ASSERT(duk_has_prop_stridx(thr, -2, DUK_STRIDX_LENGTH) != 0);
 	DUK_ASSERT(add_auto_proto == 0 || duk_has_prop_stridx(thr, -2, DUK_STRIDX_PROTOTYPE) != 0);
 	/* May be missing .name */
-	DUK_ASSERT(!DUK_HOBJECT_HAS_STRICT(&fun_clos->obj) ||
-	           duk_has_prop_stridx(thr, -2, DUK_STRIDX_CALLER) != 0);
-	DUK_ASSERT(!DUK_HOBJECT_HAS_STRICT(&fun_clos->obj) ||
-	           duk_has_prop_stridx(thr, -2, DUK_STRIDX_LC_ARGUMENTS) != 0);
+	DUK_ASSERT(!DUK_HOBJECT_HAS_STRICT(&fun_clos->obj) || duk_has_prop_stridx(thr, -2, DUK_STRIDX_CALLER) != 0);
+	DUK_ASSERT(!DUK_HOBJECT_HAS_STRICT(&fun_clos->obj) || duk_has_prop_stridx(thr, -2, DUK_STRIDX_LC_ARGUMENTS) != 0);
 
 	/*
 	 *  Finish
@@ -80206,11 +84458,32 @@ void duk_js_push_closure(duk_hthread *thr,
  *  The non-delayed initialization is handled by duk_handle_call().
  */
 
+DUK_LOCAL void duk__preallocate_env_entries(duk_hthread *thr, duk_hobject *varmap, duk_hobject *env) {
+	duk_uint_fast32_t i;
+
+	for (i = 0; i < (duk_uint_fast32_t) DUK_HOBJECT_GET_ENEXT(varmap); i++) {
+		duk_hstring *key;
+
+		key = DUK_HOBJECT_E_GET_KEY(thr->heap, varmap, i);
+		DUK_ASSERT(key != NULL); /* assume keys are compact in _Varmap */
+		DUK_ASSERT(!DUK_HOBJECT_E_SLOT_IS_ACCESSOR(thr->heap, varmap, i)); /* assume plain values */
+
+		/* Predefine as 'undefined' to reserve a property slot.
+		 * This makes the unwind process (where register values
+		 * are copied to the env object) safe against throwing.
+		 *
+		 * XXX: This could be made much faster by creating the
+		 * property table directly.
+		 */
+		duk_push_undefined(thr);
+		DUK_DDD(DUK_DDDPRINT("preallocate env entry for key %!O", key));
+		duk_hobject_define_property_internal(thr, env, key, DUK_PROPDESC_FLAGS_WE);
+	}
+}
+
 /* shared helper */
 DUK_INTERNAL
-duk_hobject *duk_create_activation_environment_record(duk_hthread *thr,
-                                                      duk_hobject *func,
-                                                      duk_size_t bottom_byteoff) {
+duk_hobject *duk_create_activation_environment_record(duk_hthread *thr, duk_hobject *func, duk_size_t bottom_byteoff) {
 	duk_hdecenv *env;
 	duk_hobject *parent;
 	duk_hcompfunc *f;
@@ -80218,21 +84491,21 @@ duk_hobject *duk_create_activation_environment_record(duk_hthread *thr,
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(func != NULL);
 
+	DUK_STATS_INC(thr->heap, stats_envrec_create);
+
 	f = (duk_hcompfunc *) func;
 	parent = DUK_HCOMPFUNC_GET_LEXENV(thr->heap, f);
 	if (!parent) {
 		parent = thr->builtins[DUK_BIDX_GLOBAL_ENV];
 	}
 
-	env = duk_hdecenv_alloc(thr,
-	                        DUK_HOBJECT_FLAG_EXTENSIBLE |
-	                        DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DECENV));
+	env = duk_hdecenv_alloc(thr, DUK_HOBJECT_FLAG_EXTENSIBLE | DUK_HOBJECT_CLASS_AS_FLAGS(DUK_HOBJECT_CLASS_DECENV));
 	DUK_ASSERT(env != NULL);
 	duk_push_hobject(thr, (duk_hobject *) env);
 
 	DUK_ASSERT(DUK_HOBJECT_GET_PROTOTYPE(thr->heap, (duk_hobject *) env) == NULL);
 	DUK_HOBJECT_SET_PROTOTYPE(thr->heap, (duk_hobject *) env, parent);
-	DUK_HOBJECT_INCREF_ALLOWNULL(thr, parent);  /* parent env is the prototype */
+	DUK_HOBJECT_INCREF_ALLOWNULL(thr, parent); /* parent env is the prototype */
 
 	/* open scope information, for compiled functions only */
 
@@ -80241,18 +84514,19 @@ duk_hobject *duk_create_activation_environment_record(duk_hthread *thr,
 	DUK_ASSERT(env->regbase_byteoff == 0);
 	if (DUK_HOBJECT_IS_COMPFUNC(func)) {
 		duk_hobject *varmap;
-		duk_tval *tv;
 
-		tv = duk_hobject_find_existing_entry_tval_ptr(thr->heap, func, DUK_HTHREAD_STRING_INT_VARMAP(thr));
-		if (tv != NULL && DUK_TVAL_IS_OBJECT(tv)) {
-			DUK_ASSERT(DUK_TVAL_IS_OBJECT(tv));
-			varmap = DUK_TVAL_GET_OBJECT(tv);
-			DUK_ASSERT(varmap != NULL);
+		varmap = duk_hobject_get_varmap(thr, func);
+		if (varmap != NULL) {
 			env->varmap = varmap;
 			DUK_HOBJECT_INCREF(thr, varmap);
 			env->thread = thr;
 			DUK_HTHREAD_INCREF(thr, thr);
 			env->regbase_byteoff = bottom_byteoff;
+
+			/* Preallocate env property table to avoid potential
+			 * for out-of-memory on unwind when the env is closed.
+			 */
+			duk__preallocate_env_entries(thr, varmap, (duk_hobject *) env);
 		} else {
 			/* If function has no _Varmap, leave the environment closed. */
 			DUK_ASSERT(env->thread == NULL);
@@ -80265,15 +84539,14 @@ duk_hobject *duk_create_activation_environment_record(duk_hthread *thr,
 }
 
 DUK_INTERNAL
-void duk_js_init_activation_environment_records_delayed(duk_hthread *thr,
-                                                        duk_activation *act) {
+void duk_js_init_activation_environment_records_delayed(duk_hthread *thr, duk_activation *act) {
 	duk_hobject *func;
 	duk_hobject *env;
 
 	DUK_ASSERT(thr != NULL);
 	func = DUK_ACT_GET_FUNC(act);
 	DUK_ASSERT(func != NULL);
-	DUK_ASSERT(!DUK_HOBJECT_HAS_BOUNDFUNC(func));  /* bound functions are never in act 'func' */
+	DUK_ASSERT(!DUK_HOBJECT_HAS_BOUNDFUNC(func)); /* bound functions are never in act 'func' */
 
 	/*
 	 *  Delayed initialization only occurs for 'NEWENV' functions.
@@ -80283,6 +84556,8 @@ void duk_js_init_activation_environment_records_delayed(duk_hthread *thr,
 	DUK_ASSERT(act->lex_env == NULL);
 	DUK_ASSERT(act->var_env == NULL);
 
+	DUK_STATS_INC(thr->heap, stats_envrec_delayedcreate);
+
 	env = duk_create_activation_environment_record(thr, func, act->bottom_byteoff);
 	DUK_ASSERT(env != NULL);
 	/* 'act' is a stable pointer, so still OK. */
@@ -80300,7 +84575,7 @@ void duk_js_init_activation_environment_records_delayed(duk_hthread *thr,
 
 	act->lex_env = env;
 	act->var_env = env;
-	DUK_HOBJECT_INCREF(thr, env);  /* XXX: incref by count (here 2 times) */
+	DUK_HOBJECT_INCREF(thr, env); /* XXX: incref by count (here 2 times) */
 	DUK_HOBJECT_INCREF(thr, env);
 
 	duk_pop_unsafe(thr);
@@ -80336,7 +84611,7 @@ DUK_INTERNAL void duk_js_close_environment_record(duk_hthread *thr, duk_hobject
 		return;
 	}
 	DUK_ASSERT(((duk_hdecenv *) env)->thread != NULL);
-	DUK_ASSERT_HDECENV_VALID((duk_hdecenv *) env);
+	DUK_HDECENV_ASSERT_VALID((duk_hdecenv *) env);
 
 	DUK_DDD(DUK_DDDPRINT("closing env: %!iO", (duk_heaphdr *) env));
 	DUK_DDD(DUK_DDDPRINT("varmap: %!O", (duk_heaphdr *) varmap));
@@ -80370,12 +84645,12 @@ DUK_INTERNAL void duk_js_close_environment_record(duk_hthread *thr, duk_hobject
 		duk_size_t regbase_byteoff;
 
 		key = DUK_HOBJECT_E_GET_KEY(thr->heap, varmap, i);
-		DUK_ASSERT(key != NULL);   /* assume keys are compact in _Varmap */
-		DUK_ASSERT(!DUK_HOBJECT_E_SLOT_IS_ACCESSOR(thr->heap, varmap, i));  /* assume plain values */
+		DUK_ASSERT(key != NULL); /* assume keys are compact in _Varmap */
+		DUK_ASSERT(!DUK_HOBJECT_E_SLOT_IS_ACCESSOR(thr->heap, varmap, i)); /* assume plain values */
 
 		tv = DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, varmap, i);
 		DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
-		DUK_ASSERT(DUK_TVAL_GET_NUMBER(tv) <= (duk_double_t) DUK_UINT32_MAX);  /* limits */
+		DUK_ASSERT(DUK_TVAL_GET_NUMBER(tv) <= (duk_double_t) DUK_UINT32_MAX); /* limits */
 #if defined(DUK_USE_FASTINT)
 		DUK_ASSERT(DUK_TVAL_IS_FASTINT(tv));
 		regnum = (duk_uint_t) DUK_TVAL_GET_FASTINT_U32(tv);
@@ -80384,14 +84659,25 @@ DUK_INTERNAL void duk_js_close_environment_record(duk_hthread *thr, duk_hobject
 #endif
 
 		regbase_byteoff = ((duk_hdecenv *) env)->regbase_byteoff;
-		DUK_ASSERT((duk_uint8_t *) thr->valstack + regbase_byteoff + sizeof(duk_tval) * regnum >= (duk_uint8_t *) thr->valstack);
-		DUK_ASSERT((duk_uint8_t *) thr->valstack + regbase_byteoff + sizeof(duk_tval) * regnum < (duk_uint8_t *) thr->valstack_top);
+		DUK_ASSERT((duk_uint8_t *) thr->valstack + regbase_byteoff + sizeof(duk_tval) * regnum >=
+		           (duk_uint8_t *) thr->valstack);
+		DUK_ASSERT((duk_uint8_t *) thr->valstack + regbase_byteoff + sizeof(duk_tval) * regnum <
+		           (duk_uint8_t *) thr->valstack_top);
 
-		/* If property already exists, overwrites silently.
+		/* Write register value into env as named properties.
+		 * If property already exists, overwrites silently.
 		 * Property is writable, but not deletable (not configurable
 		 * in terms of property attributes).
-		 */
-		duk_push_tval(thr, (duk_tval *) (void *) ((duk_uint8_t *) thr->valstack + regbase_byteoff + sizeof(duk_tval) * regnum));
+		 *
+		 * This property write must not throw because we're unwinding
+		 * and unwind code is not allowed to throw at present.  The
+		 * call itself has no such guarantees, but we've preallocated
+		 * entries for each property when the env was created, so no
+		 * out-of-memory error should be possible.  If this guarantee
+		 * is not provided, problems like GH-476 may happen.
+		 */
+		duk_push_tval(thr,
+		              (duk_tval *) (void *) ((duk_uint8_t *) thr->valstack + regbase_byteoff + sizeof(duk_tval) * regnum));
 		DUK_DDD(DUK_DDDPRINT("closing identifier %!O -> reg %ld, value %!T",
 		                     (duk_heaphdr *) key,
 		                     (long) regnum,
@@ -80433,10 +84719,7 @@ DUK_INTERNAL void duk_js_close_environment_record(duk_hthread *thr, duk_hobject
 
 /* lookup name from an open declarative record's registers */
 DUK_LOCAL
-duk_bool_t duk__getid_open_decl_env_regs(duk_hthread *thr,
-                                         duk_hstring *name,
-                                         duk_hdecenv *env,
-                                         duk__id_lookup_result *out) {
+duk_bool_t duk__getid_open_decl_env_regs(duk_hthread *thr, duk_hstring *name, duk_hdecenv *env, duk__id_lookup_result *out) {
 	duk_tval *tv;
 	duk_size_t reg_rel;
 
@@ -80446,7 +84729,7 @@ duk_bool_t duk__getid_open_decl_env_regs(duk_hthread *thr,
 	DUK_ASSERT(out != NULL);
 
 	DUK_ASSERT(DUK_HOBJECT_IS_DECENV((duk_hobject *) env));
-	DUK_ASSERT_HDECENV_VALID(env);
+	DUK_HDECENV_ASSERT_VALID(env);
 
 	if (env->thread == NULL) {
 		/* already closed */
@@ -80454,26 +84737,26 @@ duk_bool_t duk__getid_open_decl_env_regs(duk_hthread *thr,
 	}
 	DUK_ASSERT(env->varmap != NULL);
 
-	tv = duk_hobject_find_existing_entry_tval_ptr(thr->heap, env->varmap, name);
+	tv = duk_hobject_find_entry_tval_ptr(thr->heap, env->varmap, name);
 	if (DUK_UNLIKELY(tv == NULL)) {
 		return 0;
 	}
 
 	DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));
-	DUK_ASSERT(DUK_TVAL_GET_NUMBER(tv) <= (duk_double_t) DUK_UINT32_MAX);  /* limits */
+	DUK_ASSERT(DUK_TVAL_GET_NUMBER(tv) <= (duk_double_t) DUK_UINT32_MAX); /* limits */
 #if defined(DUK_USE_FASTINT)
 	DUK_ASSERT(DUK_TVAL_IS_FASTINT(tv));
 	reg_rel = (duk_size_t) DUK_TVAL_GET_FASTINT_U32(tv);
 #else
 	reg_rel = (duk_size_t) DUK_TVAL_GET_NUMBER(tv);
 #endif
-	DUK_ASSERT_DISABLE(reg_rel >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(reg_rel >= 0); /* unsigned */
 
 	tv = (duk_tval *) (void *) ((duk_uint8_t *) env->thread->valstack + env->regbase_byteoff + sizeof(duk_tval) * reg_rel);
-	DUK_ASSERT(tv >= env->thread->valstack && tv < env->thread->valstack_end);  /* XXX: more accurate? */
+	DUK_ASSERT(tv >= env->thread->valstack && tv < env->thread->valstack_end); /* XXX: more accurate? */
 
 	out->value = tv;
-	out->attrs = DUK_PROPDESC_FLAGS_W;  /* registers are mutable, non-deletable */
+	out->attrs = DUK_PROPDESC_FLAGS_W; /* registers are mutable, non-deletable */
 	out->env = (duk_hobject *) env;
 	out->holder = NULL;
 	out->has_this = 0;
@@ -80482,10 +84765,7 @@ duk_bool_t duk__getid_open_decl_env_regs(duk_hthread *thr,
 
 /* lookup name from current activation record's functions' registers */
 DUK_LOCAL
-duk_bool_t duk__getid_activation_regs(duk_hthread *thr,
-                                      duk_hstring *name,
-                                      duk_activation *act,
-                                      duk__id_lookup_result *out) {
+duk_bool_t duk__getid_activation_regs(duk_hthread *thr, duk_hstring *name, duk_activation *act, duk__id_lookup_result *out) {
 	duk_tval *tv;
 	duk_hobject *func;
 	duk_hobject *varmap;
@@ -80504,16 +84784,13 @@ duk_bool_t duk__getid_activation_regs(duk_hthread *thr,
 		return 0;
 	}
 
-	/* XXX: move varmap to duk_hcompfunc struct field. */
-	tv = duk_hobject_find_existing_entry_tval_ptr(thr->heap, func, DUK_HTHREAD_STRING_INT_VARMAP(thr));
-	if (!tv) {
+	/* XXX: move varmap to duk_hcompfunc struct field? */
+	varmap = duk_hobject_get_varmap(thr, func);
+	if (!varmap) {
 		return 0;
 	}
-	DUK_ASSERT(DUK_TVAL_IS_OBJECT(tv));
-	varmap = DUK_TVAL_GET_OBJECT(tv);
-	DUK_ASSERT(varmap != NULL);
 
-	tv = duk_hobject_find_existing_entry_tval_ptr(thr->heap, varmap, name);
+	tv = duk_hobject_find_entry_tval_ptr(thr->heap, varmap, name);
 	if (!tv) {
 		return 0;
 	}
@@ -80526,7 +84803,7 @@ duk_bool_t duk__getid_activation_regs(duk_hthread *thr,
 	tv += reg_rel;
 
 	out->value = tv;
-	out->attrs = DUK_PROPDESC_FLAGS_W;  /* registers are mutable, non-deletable */
+	out->attrs = DUK_PROPDESC_FLAGS_W; /* registers are mutable, non-deletable */
 	out->env = NULL;
 	out->holder = NULL;
 	out->has_this = 0;
@@ -80582,9 +84859,12 @@ duk_bool_t duk__get_identifier_reference(duk_hthread *thr,
 			DUK_DDD(DUK_DDDPRINT("duk__get_identifier_reference successful: "
 			                     "name=%!O -> value=%!T, attrs=%ld, has_this=%ld, env=%!O, holder=%!O "
 			                     "(found from register bindings when env=NULL)",
-			                     (duk_heaphdr *) name, (duk_tval *) out->value,
-			                     (long) out->attrs, (long) out->has_this,
-			                     (duk_heaphdr *) out->env, (duk_heaphdr *) out->holder));
+			                     (duk_heaphdr *) name,
+			                     (duk_tval *) out->value,
+			                     (long) out->attrs,
+			                     (long) out->has_this,
+			                     (duk_heaphdr *) out->env,
+			                     (duk_heaphdr *) out->holder));
 			return 1;
 		}
 
@@ -80621,8 +84901,7 @@ duk_bool_t duk__get_identifier_reference(duk_hthread *thr,
 			env = thr->builtins[DUK_BIDX_GLOBAL_ENV];
 		}
 
-		DUK_DDD(DUK_DDDPRINT("continue lookup from env: %!iO",
-		                     (duk_heaphdr *) env));
+		DUK_DDD(DUK_DDDPRINT("continue lookup from env: %!iO", (duk_heaphdr *) env));
 	}
 
 	/*
@@ -80660,18 +84939,21 @@ duk_bool_t duk__get_identifier_reference(duk_hthread *thr,
 			 *  register-bound variables.
 			 */
 
-			DUK_ASSERT_HDECENV_VALID((duk_hdecenv *) env);
+			DUK_HDECENV_ASSERT_VALID((duk_hdecenv *) env);
 			if (duk__getid_open_decl_env_regs(thr, name, (duk_hdecenv *) env, out)) {
 				DUK_DDD(DUK_DDDPRINT("duk__get_identifier_reference successful: "
 				                     "name=%!O -> value=%!T, attrs=%ld, has_this=%ld, env=%!O, holder=%!O "
 				                     "(declarative environment record, scope open, found in regs)",
-				                     (duk_heaphdr *) name, (duk_tval *) out->value,
-				                     (long) out->attrs, (long) out->has_this,
-				                     (duk_heaphdr *) out->env, (duk_heaphdr *) out->holder));
+				                     (duk_heaphdr *) name,
+				                     (duk_tval *) out->value,
+				                     (long) out->attrs,
+				                     (long) out->has_this,
+				                     (duk_heaphdr *) out->env,
+				                     (duk_heaphdr *) out->holder));
 				return 1;
 			}
 
-			tv = duk_hobject_find_existing_entry_tval_ptr_and_attrs(thr->heap, env, name, &attrs);
+			tv = duk_hobject_find_entry_tval_ptr_and_attrs(thr->heap, env, name, &attrs);
 			if (tv) {
 				out->value = tv;
 				out->attrs = attrs;
@@ -80682,9 +84964,12 @@ duk_bool_t duk__get_identifier_reference(duk_hthread *thr,
 				DUK_DDD(DUK_DDDPRINT("duk__get_identifier_reference successful: "
 				                     "name=%!O -> value=%!T, attrs=%ld, has_this=%ld, env=%!O, holder=%!O "
 				                     "(declarative environment record, found in properties)",
-				                     (duk_heaphdr *) name, (duk_tval *) out->value,
-				                     (long) out->attrs, (long) out->has_this,
-				                     (duk_heaphdr *) out->env, (duk_heaphdr *) out->holder));
+				                     (duk_heaphdr *) name,
+				                     (duk_tval *) out->value,
+				                     (long) out->attrs,
+				                     (long) out->has_this,
+				                     (duk_heaphdr *) out->env,
+				                     (duk_heaphdr *) out->holder));
 				return 1;
 			}
 		} else {
@@ -80706,7 +84991,7 @@ duk_bool_t duk__get_identifier_reference(duk_hthread *thr,
 			duk_bool_t found;
 
 			DUK_ASSERT(cl == DUK_HOBJECT_CLASS_OBJENV);
-			DUK_ASSERT_HOBJENV_VALID((duk_hobjenv *) env);
+			DUK_HOBJENV_ASSERT_VALID((duk_hobjenv *) env);
 
 			target = ((duk_hobjenv *) env)->target;
 			DUK_ASSERT(target != NULL);
@@ -80729,7 +85014,7 @@ duk_bool_t duk__get_identifier_reference(duk_hthread *thr,
 
 				found = duk_hobject_hasprop(thr, &tv_target_tmp, &tv_name);
 			} else
-#endif  /* DUK_USE_ES6_PROXY */
+#endif /* DUK_USE_ES6_PROXY */
 			{
 				/* XXX: duk_hobject_hasprop() would be correct for
 				 * non-Proxy objects too, but it is about ~20-25%
@@ -80740,8 +85025,8 @@ duk_bool_t duk__get_identifier_reference(duk_hthread *thr,
 			}
 
 			if (found) {
-				out->value = NULL;  /* can't get value, may be accessor */
-				out->attrs = 0;     /* irrelevant when out->value == NULL */
+				out->value = NULL; /* can't get value, may be accessor */
+				out->attrs = 0; /* irrelevant when out->value == NULL */
 				out->env = env;
 				out->holder = target;
 				out->has_this = ((duk_hobjenv *) env)->has_this;
@@ -80749,9 +85034,12 @@ duk_bool_t duk__get_identifier_reference(duk_hthread *thr,
 				DUK_DDD(DUK_DDDPRINT("duk__get_identifier_reference successful: "
 				                     "name=%!O -> value=%!T, attrs=%ld, has_this=%ld, env=%!O, holder=%!O "
 				                     "(object environment record)",
-				                     (duk_heaphdr *) name, (duk_tval *) out->value,
-				                     (long) out->attrs, (long) out->has_this,
-				                     (duk_heaphdr *) out->env, (duk_heaphdr *) out->holder));
+				                     (duk_heaphdr *) name,
+				                     (duk_tval *) out->value,
+				                     (long) out->attrs,
+				                     (long) out->has_this,
+				                     (duk_heaphdr *) out->env,
+				                     (duk_heaphdr *) out->holder));
 				return 1;
 			}
 		}
@@ -80762,10 +85050,10 @@ duk_bool_t duk__get_identifier_reference(duk_hthread *thr,
 			goto fail_not_found;
 		}
 
-                if (DUK_UNLIKELY(sanity-- == 0)) {
-                        DUK_ERROR_RANGE(thr, DUK_STR_PROTOTYPE_CHAIN_LIMIT);
+		if (DUK_UNLIKELY(sanity-- == 0)) {
+			DUK_ERROR_RANGE(thr, DUK_STR_PROTOTYPE_CHAIN_LIMIT);
 			DUK_WO_NORETURN(return 0;);
-                }
+		}
 		env = DUK_HOBJECT_GET_PROTOTYPE(thr->heap, env);
 	}
 
@@ -80773,7 +85061,7 @@ duk_bool_t duk__get_identifier_reference(duk_hthread *thr,
 	 *  Not found (even in global object)
 	 */
 
- fail_not_found:
+fail_not_found:
 	return 0;
 }
 
@@ -80792,7 +85080,7 @@ duk_bool_t duk__get_identifier_reference(duk_hthread *thr,
  *  a 'strict' parameter.
  */
 
-#if 0  /*unused*/
+#if 0 /*unused*/
 DUK_INTERNAL
 duk_bool_t duk_js_hasvar_envrec(duk_hthread *thr,
                                 duk_hobject *env,
@@ -80848,11 +85136,7 @@ duk_bool_t duk_js_hasvar_envrec(duk_hthread *thr,
  */
 
 DUK_LOCAL
-duk_bool_t duk__getvar_helper(duk_hthread *thr,
-                              duk_hobject *env,
-                              duk_activation *act,
-                              duk_hstring *name,
-                              duk_bool_t throw_flag) {
+duk_bool_t duk__getvar_helper(duk_hthread *thr, duk_hobject *env, duk_activation *act, duk_hstring *name, duk_bool_t throw_flag) {
 	duk__id_lookup_result ref;
 	duk_tval tv_tmp_obj;
 	duk_tval tv_tmp_key;
@@ -80860,8 +85144,11 @@ duk_bool_t duk__getvar_helper(duk_hthread *thr,
 
 	DUK_DDD(DUK_DDDPRINT("getvar: thr=%p, env=%p, act=%p, name=%!O "
 	                     "(env -> %!dO)",
-	                     (void *) thr, (void *) env, (void *) act,
-	                     (duk_heaphdr *) name, (duk_heaphdr *) env));
+	                     (void *) thr,
+	                     (void *) env,
+	                     (void *) act,
+	                     (duk_heaphdr *) name,
+	                     (duk_heaphdr *) env));
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(name != NULL);
@@ -80869,10 +85156,10 @@ duk_bool_t duk__getvar_helper(duk_hthread *thr,
 
 	DUK_STATS_INC(thr->heap, stats_getvar_all);
 
-        DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(env);
-        DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(name);
+	DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(env);
+	DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(name);
 
-	parents = 1;     /* follow parent chain */
+	parents = 1; /* follow parent chain */
 	if (duk__get_identifier_reference(thr, env, name, act, parents, &ref)) {
 		if (ref.value) {
 			duk_push_tval(thr, ref.value);
@@ -80887,7 +85174,7 @@ duk_bool_t duk__getvar_helper(duk_hthread *thr,
 
 			DUK_TVAL_SET_OBJECT(&tv_tmp_obj, ref.holder);
 			DUK_TVAL_SET_STRING(&tv_tmp_key, name);
-			(void) duk_hobject_getprop(thr, &tv_tmp_obj, &tv_tmp_key);  /* [value] */
+			(void) duk_hobject_getprop(thr, &tv_tmp_obj, &tv_tmp_key); /* [value] */
 
 			if (ref.has_this) {
 				duk_push_hobject(thr, ref.holder);
@@ -80901,7 +85188,8 @@ duk_bool_t duk__getvar_helper(duk_hthread *thr,
 		return 1;
 	} else {
 		if (throw_flag) {
-			DUK_ERROR_FMT1(thr, DUK_ERR_REFERENCE_ERROR,
+			DUK_ERROR_FMT1(thr,
+			               DUK_ERR_REFERENCE_ERROR,
 			               "identifier '%s' undefined",
 			               (const char *) DUK_HSTRING_GET_DATA(name));
 			DUK_WO_NORETURN(return 0;);
@@ -80912,18 +85200,12 @@ duk_bool_t duk__getvar_helper(duk_hthread *thr,
 }
 
 DUK_INTERNAL
-duk_bool_t duk_js_getvar_envrec(duk_hthread *thr,
-                                duk_hobject *env,
-                                duk_hstring *name,
-                                duk_bool_t throw_flag) {
+duk_bool_t duk_js_getvar_envrec(duk_hthread *thr, duk_hobject *env, duk_hstring *name, duk_bool_t throw_flag) {
 	return duk__getvar_helper(thr, env, NULL, name, throw_flag);
 }
 
 DUK_INTERNAL
-duk_bool_t duk_js_getvar_activation(duk_hthread *thr,
-                                    duk_activation *act,
-                                    duk_hstring *name,
-                                    duk_bool_t throw_flag) {
+duk_bool_t duk_js_getvar_activation(duk_hthread *thr, duk_activation *act, duk_hstring *name, duk_bool_t throw_flag) {
 	DUK_ASSERT(act != NULL);
 	return duk__getvar_helper(thr, act->lex_env, act, name, throw_flag);
 }
@@ -80951,6 +85233,7 @@ void duk__putvar_helper(duk_hthread *thr,
                         duk_tval *val,
                         duk_bool_t strict) {
 	duk__id_lookup_result ref;
+	duk_tval tv_tmp_val;
 	duk_tval tv_tmp_obj;
 	duk_tval tv_tmp_key;
 	duk_bool_t parents;
@@ -80959,19 +85242,27 @@ void duk__putvar_helper(duk_hthread *thr,
 
 	DUK_DDD(DUK_DDDPRINT("putvar: thr=%p, env=%p, act=%p, name=%!O, val=%p, strict=%ld "
 	                     "(env -> %!dO, val -> %!T)",
-	                     (void *) thr, (void *) env, (void *) act,
-	                     (duk_heaphdr *) name, (void *) val, (long) strict,
-	                     (duk_heaphdr *) env, (duk_tval *) val));
+	                     (void *) thr,
+	                     (void *) env,
+	                     (void *) act,
+	                     (duk_heaphdr *) name,
+	                     (void *) val,
+	                     (long) strict,
+	                     (duk_heaphdr *) env,
+	                     (duk_tval *) val));
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(name != NULL);
 	DUK_ASSERT(val != NULL);
 	/* env and act may be NULL */
 
-        DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(env);
-        DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(name);
+	DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(env);
+	DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(name);
 	DUK_ASSERT_REFCOUNT_NONZERO_TVAL(val);
 
+	DUK_TVAL_SET_TVAL(&tv_tmp_val, val); /* Stabilize. */
+	val = NULL;
+
 	/*
 	 *  In strict mode E5 protects 'eval' and 'arguments' from being
 	 *  assigned to (or even declared anywhere).  Attempt to do so
@@ -80982,15 +85273,13 @@ void duk__putvar_helper(duk_hthread *thr,
 	 *  and name 'eval' or 'arguments'.
 	 */
 
-	DUK_ASSERT(!strict ||
-	           (name != DUK_HTHREAD_STRING_EVAL(thr) &&
-	            name != DUK_HTHREAD_STRING_LC_ARGUMENTS(thr)));
+	DUK_ASSERT(!strict || (name != DUK_HTHREAD_STRING_EVAL(thr) && name != DUK_HTHREAD_STRING_LC_ARGUMENTS(thr)));
 
 	/*
 	 *  Lookup variable and update in-place if found.
 	 */
 
-	parents = 1;     /* follow parent chain */
+	parents = 1; /* follow parent chain */
 
 	if (duk__get_identifier_reference(thr, env, name, act, parents, &ref)) {
 		if (ref.value && (ref.attrs & DUK_PROPDESC_FLAG_WRITABLE)) {
@@ -81003,7 +85292,7 @@ void duk__putvar_helper(duk_hthread *thr,
 
 			tv_val = ref.value;
 			DUK_ASSERT(tv_val != NULL);
-			DUK_TVAL_SET_TVAL_UPDREF(thr, tv_val, val);  /* side effects */
+			DUK_TVAL_SET_TVAL_UPDREF(thr, tv_val, &tv_tmp_val); /* side effects */
 
 			/* ref.value invalidated here */
 		} else {
@@ -81011,7 +85300,7 @@ void duk__putvar_helper(duk_hthread *thr,
 
 			DUK_TVAL_SET_OBJECT(&tv_tmp_obj, ref.holder);
 			DUK_TVAL_SET_STRING(&tv_tmp_key, name);
-			(void) duk_hobject_putprop(thr, &tv_tmp_obj, &tv_tmp_key, val, strict);
+			(void) duk_hobject_putprop(thr, &tv_tmp_obj, &tv_tmp_key, &tv_tmp_val, strict);
 
 			/* ref.value invalidated here */
 		}
@@ -81026,7 +85315,8 @@ void duk__putvar_helper(duk_hthread *thr,
 
 	if (strict) {
 		DUK_DDD(DUK_DDDPRINT("identifier binding not found, strict => reference error"));
-		DUK_ERROR_FMT1(thr, DUK_ERR_REFERENCE_ERROR,
+		DUK_ERROR_FMT1(thr,
+		               DUK_ERR_REFERENCE_ERROR,
 		               "identifier '%s' undefined",
 		               (const char *) DUK_HSTRING_GET_DATA(name));
 		DUK_WO_NORETURN(return;);
@@ -81036,7 +85326,7 @@ void duk__putvar_helper(duk_hthread *thr,
 
 	DUK_TVAL_SET_OBJECT(&tv_tmp_obj, thr->builtins[DUK_BIDX_GLOBAL]);
 	DUK_TVAL_SET_STRING(&tv_tmp_key, name);
-	(void) duk_hobject_putprop(thr, &tv_tmp_obj, &tv_tmp_key, val, 0);  /* 0 = no throw */
+	(void) duk_hobject_putprop(thr, &tv_tmp_obj, &tv_tmp_key, &tv_tmp_val, 0); /* 0 = no throw */
 
 	/* NB: 'val' may be invalidated here because put_value may realloc valstack,
 	 * caller beware.
@@ -81044,20 +85334,12 @@ void duk__putvar_helper(duk_hthread *thr,
 }
 
 DUK_INTERNAL
-void duk_js_putvar_envrec(duk_hthread *thr,
-                          duk_hobject *env,
-                          duk_hstring *name,
-                          duk_tval *val,
-                          duk_bool_t strict) {
+void duk_js_putvar_envrec(duk_hthread *thr, duk_hobject *env, duk_hstring *name, duk_tval *val, duk_bool_t strict) {
 	duk__putvar_helper(thr, env, NULL, name, val, strict);
 }
 
 DUK_INTERNAL
-void duk_js_putvar_activation(duk_hthread *thr,
-                              duk_activation *act,
-                              duk_hstring *name,
-                              duk_tval *val,
-                              duk_bool_t strict) {
+void duk_js_putvar_activation(duk_hthread *thr, duk_activation *act, duk_hstring *name, duk_tval *val, duk_bool_t strict) {
 	DUK_ASSERT(act != NULL);
 	duk__putvar_helper(thr, act->lex_env, act, name, val, strict);
 }
@@ -81082,25 +85364,25 @@ void duk_js_putvar_activation(duk_hthread *thr,
  */
 
 DUK_LOCAL
-duk_bool_t duk__delvar_helper(duk_hthread *thr,
-                              duk_hobject *env,
-                              duk_activation *act,
-                              duk_hstring *name) {
+duk_bool_t duk__delvar_helper(duk_hthread *thr, duk_hobject *env, duk_activation *act, duk_hstring *name) {
 	duk__id_lookup_result ref;
 	duk_bool_t parents;
 
 	DUK_DDD(DUK_DDDPRINT("delvar: thr=%p, env=%p, act=%p, name=%!O "
 	                     "(env -> %!dO)",
-	                     (void *) thr, (void *) env, (void *) act,
-	                     (duk_heaphdr *) name, (duk_heaphdr *) env));
+	                     (void *) thr,
+	                     (void *) env,
+	                     (void *) act,
+	                     (duk_heaphdr *) name,
+	                     (duk_heaphdr *) env));
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(name != NULL);
 	/* env and act may be NULL */
 
-        DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(name);
+	DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(name);
 
-	parents = 1;     /* follow parent chain */
+	parents = 1; /* follow parent chain */
 
 	if (duk__get_identifier_reference(thr, env, name, act, parents, &ref)) {
 		if (ref.value && !(ref.attrs & DUK_PROPDESC_FLAG_CONFIGURABLE)) {
@@ -81128,7 +85410,7 @@ duk_bool_t duk__delvar_helper(duk_hthread *thr,
 	return 1;
 }
 
-#if 0  /*unused*/
+#if 0 /*unused*/
 DUK_INTERNAL
 duk_bool_t duk_js_delvar_envrec(duk_hthread *thr,
                                 duk_hobject *env,
@@ -81138,9 +85420,7 @@ duk_bool_t duk_js_delvar_envrec(duk_hthread *thr,
 #endif
 
 DUK_INTERNAL
-duk_bool_t duk_js_delvar_activation(duk_hthread *thr,
-                                    duk_activation *act,
-                                    duk_hstring *name) {
+duk_bool_t duk_js_delvar_activation(duk_hthread *thr, duk_activation *act, duk_hstring *name) {
 	DUK_ASSERT(act != NULL);
 	return duk__delvar_helper(thr, act->lex_env, act, name);
 }
@@ -81209,9 +85489,13 @@ duk_bool_t duk__declvar_helper(duk_hthread *thr,
 
 	DUK_DDD(DUK_DDDPRINT("declvar: thr=%p, env=%p, name=%!O, val=%!T, prop_flags=0x%08lx, is_func_decl=%ld "
 	                     "(env -> %!iO)",
-	                     (void *) thr, (void *) env, (duk_heaphdr *) name,
-	                     (duk_tval *) val, (unsigned long) prop_flags,
-	                     (unsigned int) is_func_decl, (duk_heaphdr *) env));
+	                     (void *) thr,
+	                     (void *) env,
+	                     (duk_heaphdr *) name,
+	                     (duk_tval *) val,
+	                     (unsigned long) prop_flags,
+	                     (unsigned int) is_func_decl,
+	                     (duk_heaphdr *) env));
 
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(env != NULL);
@@ -81238,7 +85522,7 @@ duk_bool_t duk__declvar_helper(duk_hthread *thr,
 	 *  environment target object.
 	 */
 
-	parents = 0;  /* just check 'env' */
+	parents = 0; /* just check 'env' */
 	if (duk__get_identifier_reference(thr, env, name, NULL, parents, &ref)) {
 		duk_int_t e_idx;
 		duk_int_t h_idx;
@@ -81253,7 +85537,7 @@ duk_bool_t duk__declvar_helper(duk_hthread *thr,
 
 		if (!(is_func_decl && env == thr->builtins[DUK_BIDX_GLOBAL_ENV])) {
 			DUK_DDD(DUK_DDDPRINT("re-declare a binding, ignoring"));
-			return 1;  /* 1 -> needs a PUTVAR */
+			return 1; /* 1 -> needs a PUTVAR */
 		}
 
 		/*
@@ -81283,13 +85567,13 @@ duk_bool_t duk__declvar_helper(duk_hthread *thr,
 		 * where the property was found (see duk__get_identifier_reference()).
 		 */
 		DUK_ASSERT(DUK_HOBJECT_GET_CLASS_NUMBER(holder) == DUK_HOBJECT_CLASS_GLOBAL);
-		DUK_ASSERT(!DUK_HOBJECT_HAS_EXOTIC_ARRAY(holder));  /* global object doesn't have array part */
+		DUK_ASSERT(!DUK_HOBJECT_HAS_EXOTIC_ARRAY(holder)); /* global object doesn't have array part */
 
 		/* XXX: use a helper for prototype traversal; no loop check here */
 		/* must be found: was found earlier, and cannot be inherited */
 		for (;;) {
 			DUK_ASSERT(holder != NULL);
-			if (duk_hobject_find_existing_entry(thr->heap, holder, name, &e_idx, &h_idx)) {
+			if (duk_hobject_find_entry(thr->heap, holder, name, &e_idx, &h_idx)) {
 				DUK_ASSERT(e_idx >= 0);
 				break;
 			}
@@ -81316,8 +85600,7 @@ duk_bool_t duk__declvar_helper(duk_hthread *thr,
 				                     "accessor -> reject"));
 				goto fail_existing_attributes;
 			}
-			if (!((flags & DUK_PROPDESC_FLAG_WRITABLE) &&
-			      (flags & DUK_PROPDESC_FLAG_ENUMERABLE))) {
+			if (!((flags & DUK_PROPDESC_FLAG_WRITABLE) && (flags & DUK_PROPDESC_FLAG_ENUMERABLE))) {
 				DUK_DDD(DUK_DDDPRINT("existing property is a non-configurable "
 				                     "plain property which is not writable and "
 				                     "enumerable -> reject"));
@@ -81386,10 +85669,10 @@ duk_bool_t duk__declvar_helper(duk_hthread *thr,
 	 */
 
 	if (DUK_HOBJECT_IS_DECENV(env)) {
-		DUK_ASSERT_HDECENV_VALID((duk_hdecenv *) env);
+		DUK_HDECENV_ASSERT_VALID((duk_hdecenv *) env);
 		holder = env;
 	} else {
-		DUK_ASSERT_HOBJENV_VALID((duk_hobjenv *) env);
+		DUK_HOBJENV_ASSERT_VALID((duk_hobjenv *) env);
 		holder = ((duk_hobjenv *) env)->target;
 		DUK_ASSERT(holder != NULL);
 	}
@@ -81412,13 +85695,13 @@ duk_bool_t duk__declvar_helper(duk_hthread *thr,
 	duk_push_hobject(thr, holder);
 	duk_push_hstring(thr, name);
 	duk_push_tval(thr, val);
-	duk_xdef_prop(thr, -3, prop_flags);  /* [holder name val] -> [holder] */
+	duk_xdef_prop(thr, -3, prop_flags); /* [holder name val] -> [holder] */
 	duk_pop_unsafe(thr);
 
 	return 0;
 
- fail_existing_attributes:
- fail_not_extensible:
+fail_existing_attributes:
+fail_not_extensible:
 	DUK_ERROR_TYPE(thr, "declaration failed");
 	DUK_WO_NORETURN(return 0;);
 }
@@ -81539,34 +85822,34 @@ duk_bool_t duk_js_declvar_activation(duk_hthread *thr,
  *  Various defines and file specific helper macros
  */
 
-#define DUK__MAX_RE_DECESC_DIGITS     9
-#define DUK__MAX_RE_QUANT_DIGITS      9   /* Does not allow e.g. 2**31-1, but one more would allow overflows of u32. */
+#define DUK__MAX_RE_DECESC_DIGITS 9
+#define DUK__MAX_RE_QUANT_DIGITS  9 /* Does not allow e.g. 2**31-1, but one more would allow overflows of u32. */
 
 /* whether to use macros or helper function depends on call count */
-#define DUK__ISDIGIT(x)          ((x) >= DUK_ASC_0 && (x) <= DUK_ASC_9)
-#define DUK__ISHEXDIGIT(x)       duk__is_hex_digit((x))
-#define DUK__ISOCTDIGIT(x)       ((x) >= DUK_ASC_0 && (x) <= DUK_ASC_7)
-#define DUK__ISDIGIT03(x)        ((x) >= DUK_ASC_0 && (x) <= DUK_ASC_3)
-#define DUK__ISDIGIT47(x)        ((x) >= DUK_ASC_4 && (x) <= DUK_ASC_7)
+#define DUK__ISDIGIT(x)    ((x) >= DUK_ASC_0 && (x) <= DUK_ASC_9)
+#define DUK__ISHEXDIGIT(x) duk__is_hex_digit((x))
+#define DUK__ISOCTDIGIT(x) ((x) >= DUK_ASC_0 && (x) <= DUK_ASC_7)
+#define DUK__ISDIGIT03(x)  ((x) >= DUK_ASC_0 && (x) <= DUK_ASC_3)
+#define DUK__ISDIGIT47(x)  ((x) >= DUK_ASC_4 && (x) <= DUK_ASC_7)
 
 /* lexer character window helpers */
-#define DUK__LOOKUP(lex_ctx,idx)            ((lex_ctx)->window[(idx)].codepoint)
-#define DUK__ADVANCECHARS(lex_ctx,count)    duk__advance_chars((lex_ctx), (count))
-#define DUK__ADVANCEBYTES(lex_ctx,count)    duk__advance_bytes((lex_ctx), (count))
+#define DUK__LOOKUP(lex_ctx, idx)           ((lex_ctx)->window[(idx)].codepoint)
+#define DUK__ADVANCECHARS(lex_ctx, count)   duk__advance_chars((lex_ctx), (count))
+#define DUK__ADVANCEBYTES(lex_ctx, count)   duk__advance_bytes((lex_ctx), (count))
 #define DUK__INITBUFFER(lex_ctx)            duk__initbuffer((lex_ctx))
-#define DUK__APPENDBUFFER(lex_ctx,x)        duk__appendbuffer((lex_ctx), (duk_codepoint_t) (x))
-#define DUK__APPENDBUFFER_ASCII(lex_ctx,x)  duk__appendbuffer_ascii((lex_ctx), (duk_codepoint_t) (x))
+#define DUK__APPENDBUFFER(lex_ctx, x)       duk__appendbuffer((lex_ctx), (duk_codepoint_t) (x))
+#define DUK__APPENDBUFFER_ASCII(lex_ctx, x) duk__appendbuffer_ascii((lex_ctx), (duk_codepoint_t) (x))
 
 /* lookup shorthands (note: assume context variable is named 'lex_ctx') */
-#define DUK__L0()  DUK__LOOKUP(lex_ctx, 0)
-#define DUK__L1()  DUK__LOOKUP(lex_ctx, 1)
-#define DUK__L2()  DUK__LOOKUP(lex_ctx, 2)
-#define DUK__L3()  DUK__LOOKUP(lex_ctx, 3)
-#define DUK__L4()  DUK__LOOKUP(lex_ctx, 4)
-#define DUK__L5()  DUK__LOOKUP(lex_ctx, 5)
+#define DUK__L0() DUK__LOOKUP(lex_ctx, 0)
+#define DUK__L1() DUK__LOOKUP(lex_ctx, 1)
+#define DUK__L2() DUK__LOOKUP(lex_ctx, 2)
+#define DUK__L3() DUK__LOOKUP(lex_ctx, 3)
+#define DUK__L4() DUK__LOOKUP(lex_ctx, 4)
+#define DUK__L5() DUK__LOOKUP(lex_ctx, 5)
 
 /* packed advance/token number macro used by multiple functions */
-#define DUK__ADVTOK(advbytes,tok)  ((((advbytes) * sizeof(duk_lexer_codepoint)) << 8) + (tok))
+#define DUK__ADVTOK(advbytes, tok) ((((advbytes) * sizeof(duk_lexer_codepoint)) << 8) + (tok))
 
 /*
  *  Advance lookup window by N characters, filling in new characters as
@@ -81676,10 +85959,9 @@ DUK_LOCAL void duk__fill_lexer_buffer(duk_lexer_ctx *lex_ctx, duk_small_uint_t s
 		/* Fast path. */
 
 		if (DUK_LIKELY(x < 0x80UL)) {
-			DUK_ASSERT(x != 0x2028UL && x != 0x2029UL);  /* not LS/PS */
+			DUK_ASSERT(x != 0x2028UL && x != 0x2029UL); /* not LS/PS */
 			if (DUK_UNLIKELY(x <= 0x000dUL)) {
-				if ((x == 0x000aUL) ||
-				    ((x == 0x000dUL) && (p >= p_end || *p != 0x000aUL))) {
+				if ((x == 0x000aUL) || ((x == 0x000dUL) && (p >= p_end || *p != 0x000aUL))) {
 					/* lookup for 0x000a above assumes shortest encoding now */
 
 					/* E5 Section 7.3, treat the following as newlines:
@@ -81770,8 +86052,8 @@ DUK_LOCAL void duk__fill_lexer_buffer(duk_lexer_ctx *lex_ctx, duk_small_uint_t s
 	lex_ctx->input_line = input_line;
 	return;
 
- error_clipped:   /* clipped codepoint */
- error_encoding:  /* invalid codepoint encoding or codepoint */
+error_clipped: /* clipped codepoint */
+error_encoding: /* invalid codepoint encoding or codepoint */
 	lex_ctx->input_offset = (duk_size_t) (p - lex_ctx->input);
 	lex_ctx->input_line = input_line;
 
@@ -81782,26 +86064,25 @@ DUK_LOCAL void duk__fill_lexer_buffer(duk_lexer_ctx *lex_ctx, duk_small_uint_t s
 DUK_LOCAL void duk__advance_bytes(duk_lexer_ctx *lex_ctx, duk_small_uint_t count_bytes) {
 	duk_small_uint_t used_bytes, avail_bytes;
 
-	DUK_ASSERT_DISABLE(count_bytes >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(count_bytes >= 0); /* unsigned */
 	DUK_ASSERT(count_bytes <= (duk_small_uint_t) (DUK_LEXER_WINDOW_SIZE * sizeof(duk_lexer_codepoint)));
 	DUK_ASSERT(lex_ctx->window >= lex_ctx->buffer);
 	DUK_ASSERT(lex_ctx->window < lex_ctx->buffer + DUK_LEXER_BUFFER_SIZE);
-	DUK_ASSERT((duk_uint8_t *) lex_ctx->window + count_bytes <= (duk_uint8_t *) lex_ctx->buffer + DUK_LEXER_BUFFER_SIZE * sizeof(duk_lexer_codepoint));
+	DUK_ASSERT((duk_uint8_t *) lex_ctx->window + count_bytes <=
+	           (duk_uint8_t *) lex_ctx->buffer + DUK_LEXER_BUFFER_SIZE * sizeof(duk_lexer_codepoint));
 
 	/* Zero 'count' is also allowed to make call sites easier.
 	 * Arithmetic in bytes generates better code in GCC.
 	 */
 
-	lex_ctx->window = (duk_lexer_codepoint *) (void *) ((duk_uint8_t *) lex_ctx->window + count_bytes);  /* avoid multiply */
+	lex_ctx->window = (duk_lexer_codepoint *) (void *) ((duk_uint8_t *) lex_ctx->window + count_bytes); /* avoid multiply */
 	used_bytes = (duk_small_uint_t) ((duk_uint8_t *) lex_ctx->window - (duk_uint8_t *) lex_ctx->buffer);
 	avail_bytes = DUK_LEXER_BUFFER_SIZE * sizeof(duk_lexer_codepoint) - used_bytes;
 	if (avail_bytes < (duk_small_uint_t) (DUK_LEXER_WINDOW_SIZE * sizeof(duk_lexer_codepoint))) {
 		/* Not enough data to provide a full window, so "scroll" window to
 		 * start of buffer and fill up the rest.
 		 */
-		duk_memmove((void *) lex_ctx->buffer,
-		            (const void *) lex_ctx->window,
-		            (size_t) avail_bytes);
+		duk_memmove((void *) lex_ctx->buffer, (const void *) lex_ctx->window, (size_t) avail_bytes);
 		lex_ctx->window = lex_ctx->buffer;
 		duk__fill_lexer_buffer(lex_ctx, avail_bytes);
 	}
@@ -81811,7 +86092,7 @@ DUK_LOCAL void duk__init_lexer_window(duk_lexer_ctx *lex_ctx) {
 	lex_ctx->window = lex_ctx->buffer;
 	duk__fill_lexer_buffer(lex_ctx, 0);
 }
-#else  /* DUK_USE_LEXER_SLIDING_WINDOW */
+#else /* DUK_USE_LEXER_SLIDING_WINDOW */
 DUK_LOCAL duk_codepoint_t duk__read_char(duk_lexer_ctx *lex_ctx) {
 	duk_ucodepoint_t x;
 	duk_small_uint_t len;
@@ -81841,11 +86122,10 @@ DUK_LOCAL duk_codepoint_t duk__read_char(duk_lexer_ctx *lex_ctx) {
 		/* input offset tracking */
 		lex_ctx->input_offset++;
 
-		DUK_ASSERT(x != 0x2028UL && x != 0x2029UL);  /* not LS/PS */
+		DUK_ASSERT(x != 0x2028UL && x != 0x2029UL); /* not LS/PS */
 		if (DUK_UNLIKELY(x <= 0x000dUL)) {
-			if ((x == 0x000aUL) ||
-			    ((x == 0x000dUL) && (lex_ctx->input_offset >= lex_ctx->input_length ||
-			                         lex_ctx->input[lex_ctx->input_offset] != 0x000aUL))) {
+			if ((x == 0x000aUL) || ((x == 0x000dUL) && (lex_ctx->input_offset >= lex_ctx->input_length ||
+			                                            lex_ctx->input[lex_ctx->input_offset] != 0x000aUL))) {
 				/* lookup for 0x000a above assumes shortest encoding now */
 
 				/* E5 Section 7.3, treat the following as newlines:
@@ -81934,8 +86214,8 @@ DUK_LOCAL duk_codepoint_t duk__read_char(duk_lexer_ctx *lex_ctx) {
 
 	return (duk_codepoint_t) x;
 
- error_clipped:   /* clipped codepoint */
- error_encoding:  /* invalid codepoint encoding or codepoint */
+error_clipped: /* clipped codepoint */
+error_encoding: /* invalid codepoint encoding or codepoint */
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_SOURCE_DECODE_FAILED);
 	DUK_WO_NORETURN(return 0;);
 }
@@ -81944,15 +86224,13 @@ DUK_LOCAL void duk__advance_bytes(duk_lexer_ctx *lex_ctx, duk_small_uint_t count
 	duk_small_uint_t keep_bytes;
 	duk_lexer_codepoint *cp, *cp_end;
 
-	DUK_ASSERT_DISABLE(count_bytes >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(count_bytes >= 0); /* unsigned */
 	DUK_ASSERT(count_bytes <= (duk_small_uint_t) (DUK_LEXER_WINDOW_SIZE * sizeof(duk_lexer_codepoint)));
 
 	/* Zero 'count' is also allowed to make call sites easier. */
 
 	keep_bytes = DUK_LEXER_WINDOW_SIZE * sizeof(duk_lexer_codepoint) - count_bytes;
-	duk_memmove((void *) lex_ctx->window,
-	            (const void *) ((duk_uint8_t *) lex_ctx->window + count_bytes),
-	            (size_t) keep_bytes);
+	duk_memmove((void *) lex_ctx->window, (const void *) ((duk_uint8_t *) lex_ctx->window + count_bytes), (size_t) keep_bytes);
 
 	cp = (duk_lexer_codepoint *) ((duk_uint8_t *) lex_ctx->window + keep_bytes);
 	cp_end = lex_ctx->window + DUK_LEXER_WINDOW_SIZE;
@@ -81965,9 +86243,9 @@ DUK_LOCAL void duk__advance_bytes(duk_lexer_ctx *lex_ctx, duk_small_uint_t count
 
 DUK_LOCAL void duk__init_lexer_window(duk_lexer_ctx *lex_ctx) {
 	/* Call with count == DUK_LEXER_WINDOW_SIZE to fill buffer initially. */
-	duk__advance_bytes(lex_ctx, DUK_LEXER_WINDOW_SIZE * sizeof(duk_lexer_codepoint));  /* fill window */
+	duk__advance_bytes(lex_ctx, DUK_LEXER_WINDOW_SIZE * sizeof(duk_lexer_codepoint)); /* fill window */
 }
-#endif  /* DUK_USE_LEXER_SLIDING_WINDOW */
+#endif /* DUK_USE_LEXER_SLIDING_WINDOW */
 
 DUK_LOCAL void duk__advance_chars(duk_lexer_ctx *lex_ctx, duk_small_uint_t count_chars) {
 	duk__advance_bytes(lex_ctx, count_chars * sizeof(duk_lexer_codepoint));
@@ -82060,7 +86338,7 @@ DUK_INTERNAL void duk_lexer_getpoint(duk_lexer_ctx *lex_ctx, duk_lexer_point *pt
 }
 
 DUK_INTERNAL void duk_lexer_setpoint(duk_lexer_ctx *lex_ctx, duk_lexer_point *pt) {
-	DUK_ASSERT_DISABLE(pt->offset >= 0);  /* unsigned */
+	DUK_ASSERT_DISABLE(pt->offset >= 0); /* unsigned */
 	DUK_ASSERT(pt->line >= 1);
 	lex_ctx->input_offset = pt->offset;
 	lex_ctx->input_line = pt->line;
@@ -82094,8 +86372,7 @@ DUK_LOCAL duk_codepoint_t duk__hexval_validate(duk_codepoint_t x) {
 DUK_LOCAL duk_codepoint_t duk__hexval(duk_codepoint_t x) {
 	duk_codepoint_t ret;
 
-	DUK_ASSERT((x >= DUK_ASC_0 && x <= DUK_ASC_9) ||
-	           (x >= DUK_ASC_LC_A && x <= DUK_ASC_LC_F) ||
+	DUK_ASSERT((x >= DUK_ASC_0 && x <= DUK_ASC_9) || (x >= DUK_ASC_LC_A && x <= DUK_ASC_LC_F) ||
 	           (x >= DUK_ASC_UC_A && x <= DUK_ASC_UC_F));
 	ret = duk__hexval_validate(x);
 	DUK_ASSERT(ret >= 0 && ret <= 15);
@@ -82114,12 +86391,12 @@ DUK_LOCAL duk_bool_t duk__is_hex_digit(duk_codepoint_t x) {
  * source and RegExp parsing.
  */
 DUK_LOCAL duk_codepoint_t duk__lexer_parse_escape(duk_lexer_ctx *lex_ctx, duk_bool_t allow_es6) {
-	duk_small_int_t digits;  /* Initial value 2 or 4 for fixed length escapes, 0 for ES2015 \u{H+}. */
+	duk_small_int_t digits; /* Initial value 2 or 4 for fixed length escapes, 0 for ES2015 \u{H+}. */
 	duk_codepoint_t escval;
 	duk_codepoint_t x;
 	duk_small_uint_t adv;
 
-	DUK_ASSERT(DUK__L0() == DUK_ASC_BACKSLASH);  /* caller responsibilities */
+	DUK_ASSERT(DUK__L0() == DUK_ASC_BACKSLASH); /* caller responsibilities */
 	DUK_ASSERT(DUK__L1() == DUK_ASC_LC_X || DUK__L1() == DUK_ASC_LC_U);
 	DUK_UNREF(allow_es6);
 
@@ -82193,16 +86470,16 @@ DUK_LOCAL duk_codepoint_t duk__lexer_parse_escape(duk_lexer_ctx *lex_ctx, duk_bo
 			} else {
 				goto fail_escape;
 			}
-			digits = -1;  /* Indicate we have at least one digit. */
-#else  /* DUK_USE_ES6_UNICODE_ESCAPE */
-			DUK_ASSERT(0);  /* Never happens if \u{H+} support disabled. */
-#endif  /* DUK_USE_ES6_UNICODE_ESCAPE */
+			digits = -1; /* Indicate we have at least one digit. */
+#else /* DUK_USE_ES6_UNICODE_ESCAPE */
+			DUK_ASSERT(0); /* Never happens if \u{H+} support disabled. */
+#endif /* DUK_USE_ES6_UNICODE_ESCAPE */
 		}
 	}
 
 	return escval;
 
- fail_escape:
+fail_escape:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_INVALID_ESCAPE);
 	DUK_WO_NORETURN(return 0;);
 }
@@ -82212,7 +86489,9 @@ DUK_LOCAL duk_codepoint_t duk__lexer_parse_escape(duk_lexer_ctx *lex_ctx, duk_bo
  * RegExp octal escape parsing.  Window[0] must be the slash '\' and the first
  * digit must already be validated to be in [0-9] by the caller.
  */
-DUK_LOCAL duk_codepoint_t duk__lexer_parse_legacy_octal(duk_lexer_ctx *lex_ctx, duk_small_uint_t *out_adv, duk_bool_t reject_annex_b) {
+DUK_LOCAL duk_codepoint_t duk__lexer_parse_legacy_octal(duk_lexer_ctx *lex_ctx,
+                                                        duk_small_uint_t *out_adv,
+                                                        duk_bool_t reject_annex_b) {
 	duk_codepoint_t cp;
 	duk_small_uint_t lookup_idx;
 	duk_small_uint_t adv;
@@ -82247,7 +86526,7 @@ DUK_LOCAL duk_codepoint_t duk__lexer_parse_legacy_octal(duk_lexer_ctx *lex_ctx,
 		DUK_DDD(DUK_DDDPRINT("\\8 or \\9 -> treat as literal, accept in strict mode too"));
 		DUK_ASSERT(tmp == DUK_ASC_8 || tmp == DUK_ASC_9);
 		cp = tmp;
-		adv++;  /* correction to above, eat offending character */
+		adv++; /* correction to above, eat offending character */
 	} else if (lookup_idx == 2 && cp == 0) {
 		/* Note: 'foo\0bar' is OK in strict mode, but 'foo\00bar' is not.
 		 * It won't be interpreted as 'foo\u{0}0bar' but as a SyntaxError.
@@ -82271,18 +86550,21 @@ DUK_LOCAL duk_codepoint_t duk__lexer_parse_legacy_octal(duk_lexer_ctx *lex_ctx,
 }
 
 /* XXX: move strict mode to lex_ctx? */
-DUK_LOCAL void duk__lexer_parse_string_literal(duk_lexer_ctx *lex_ctx, duk_token *out_token, duk_small_int_t quote, duk_bool_t strict_mode) {
+DUK_LOCAL void duk__lexer_parse_string_literal(duk_lexer_ctx *lex_ctx,
+                                               duk_token *out_token,
+                                               duk_small_int_t quote,
+                                               duk_bool_t strict_mode) {
 	duk_small_uint_t adv;
 
-	for (adv = 1 /* initial quote */ ;;) {
+	for (adv = 1 /* initial quote */;;) {
 		duk_codepoint_t x;
 
-		DUK__ADVANCECHARS(lex_ctx, adv);  /* eat opening quote on first loop */
+		DUK__ADVANCECHARS(lex_ctx, adv); /* eat opening quote on first loop */
 		x = DUK__L0();
 
 		adv = 1;
 		if (x == quote) {
-			DUK__ADVANCECHARS(lex_ctx, 1);  /* eat closing quote */
+			DUK__ADVANCECHARS(lex_ctx, 1); /* eat closing quote */
 			break;
 		} else if (x == '\\') {
 			/* DUK__L0        -> '\' char
@@ -82293,7 +86575,7 @@ DUK_LOCAL void duk__lexer_parse_string_literal(duk_lexer_ctx *lex_ctx, duk_token
 			x = DUK__L1();
 
 			/* How much to advance before next loop. */
-			adv = 2;  /* note: long live range */
+			adv = 2; /* note: long live range */
 
 			switch (x) {
 			case '\'':
@@ -82336,7 +86618,7 @@ DUK_LOCAL void duk__lexer_parse_string_literal(duk_lexer_ctx *lex_ctx, duk_token
 					/* line continuation */
 					if (x == 0x000d && DUK__L2() == 0x000a) {
 						/* CR LF again a special case */
-						adv = 3;  /* line terminator, CR, LF */
+						adv = 3; /* line terminator, CR, LF */
 					}
 				} else if (DUK__ISDIGIT(x)) {
 					/*
@@ -82365,8 +86647,8 @@ DUK_LOCAL void duk__lexer_parse_string_literal(duk_lexer_ctx *lex_ctx, duk_token
 					/* escaped NonEscapeCharacter */
 					DUK__APPENDBUFFER(lex_ctx, x);
 				}
-			}  /* end default clause */
-			}  /* end switch */
+			} /* end default clause */
+			} /* end switch */
 
 			/* Shared handling for single codepoint escapes. */
 			if (emitcp >= 0) {
@@ -82399,11 +86681,11 @@ DUK_LOCAL void duk__lexer_parse_string_literal(duk_lexer_ctx *lex_ctx, duk_token
 
 	return;
 
- fail_escape:
+fail_escape:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_INVALID_ESCAPE);
 	DUK_WO_NORETURN(return;);
 
- fail_unterminated:
+fail_unterminated:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_UNTERMINATED_STRING);
 	DUK_WO_NORETURN(return;);
 }
@@ -82490,19 +86772,19 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
                                       duk_token *out_token,
                                       duk_bool_t strict_mode,
                                       duk_bool_t regexp_mode) {
-	duk_codepoint_t x;           /* temporary, must be signed and 32-bit to hold Unicode code points */
+	duk_codepoint_t x; /* temporary, must be signed and 32-bit to hold Unicode code points */
 	duk_small_uint_t advtok = 0; /* (advance << 8) + token_type, updated at function end,
 	                              * init is unnecessary but suppresses "may be used uninitialized" warnings.
 	                              */
-	duk_bool_t got_lineterm = 0;  /* got lineterm preceding non-whitespace, non-lineterm token */
+	duk_bool_t got_lineterm = 0; /* got lineterm preceding non-whitespace, non-lineterm token */
 
 	if (++lex_ctx->token_count >= lex_ctx->token_limit) {
 		goto fail_token_limit;
 	}
 
 	out_token->t = DUK_TOK_EOF;
-	out_token->t_nores = DUK_TOK_INVALID;  /* marker: copy t if not changed */
-#if 0  /* not necessary to init, disabled for faster parsing */
+	out_token->t_nores = DUK_TOK_INVALID; /* marker: copy t if not changed */
+#if 0 /* not necessary to init, disabled for faster parsing */
 	out_token->num = DUK_DOUBLE_NAN;
 	out_token->str1 = NULL;
 	out_token->str2 = NULL;
@@ -82542,35 +86824,34 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 	 *  in the clauses, so it's not trivial to convert to a switch.
 	 */
 
- restart_lineupdate:
+restart_lineupdate:
 	out_token->start_line = lex_ctx->window[0].line;
 
- restart:
+restart:
 	out_token->start_offset = lex_ctx->window[0].offset;
 
 	x = DUK__L0();
 
 	switch (x) {
 	case DUK_ASC_SPACE:
-	case DUK_ASC_HT:  /* fast paths for space and tab */
+	case DUK_ASC_HT: /* fast paths for space and tab */
 		DUK__ADVANCECHARS(lex_ctx, 1);
 		goto restart;
-	case DUK_ASC_LF:  /* LF line terminator; CR LF and Unicode lineterms are handled in slow path */
+	case DUK_ASC_LF: /* LF line terminator; CR LF and Unicode lineterms are handled in slow path */
 		DUK__ADVANCECHARS(lex_ctx, 1);
 		got_lineterm = 1;
 		goto restart_lineupdate;
 #if defined(DUK_USE_SHEBANG_COMMENTS)
-	case DUK_ASC_HASH:  /* '#' */
-		if (DUK__L1() == DUK_ASC_EXCLAMATION && lex_ctx->window[0].offset == 0 &&
-		    (lex_ctx->flags & DUK_COMPILE_SHEBANG)) {
+	case DUK_ASC_HASH: /* '#' */
+		if (DUK__L1() == DUK_ASC_EXCLAMATION && lex_ctx->window[0].offset == 0 && (lex_ctx->flags & DUK_COMPILE_SHEBANG)) {
 			/* "Shebang" comment ('#! ...') on first line. */
 			/* DUK__ADVANCECHARS(lex_ctx, 2) would be correct here, but not necessary */
 			duk__lexer_skip_to_endofline(lex_ctx);
-			goto restart;  /* line terminator will be handled on next round */
+			goto restart; /* line terminator will be handled on next round */
 		}
 		goto fail_token;
-#endif  /* DUK_USE_SHEBANG_COMMENTS */
-	case DUK_ASC_SLASH:  /* '/' */
+#endif /* DUK_USE_SHEBANG_COMMENTS */
+	case DUK_ASC_SLASH: /* '/' */
 		if (DUK__L1() == DUK_ASC_SLASH) {
 			/*
 			 *  E5 Section 7.4, allow SourceCharacter (which is any 16-bit
@@ -82579,7 +86860,7 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 
 			/* DUK__ADVANCECHARS(lex_ctx, 2) would be correct here, but not necessary */
 			duk__lexer_skip_to_endofline(lex_ctx);
-			goto restart;  /* line terminator will be handled on next round */
+			goto restart; /* line terminator will be handled on next round */
 		} else if (DUK__L1() == DUK_ASC_STAR) {
 			/*
 			 *  E5 Section 7.4.  If the multi-line comment contains a newline,
@@ -82663,19 +86944,19 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 
 			/* first, parse regexp body roughly */
 
-			duk_small_int_t state = 0;  /* 0=base, 1=esc, 2=class, 3=class+esc */
+			duk_small_int_t state = 0; /* 0=base, 1=esc, 2=class, 3=class+esc */
 
 			DUK__INITBUFFER(lex_ctx);
 			for (;;) {
-				DUK__ADVANCECHARS(lex_ctx, 1);  /* skip opening slash on first loop */
+				DUK__ADVANCECHARS(lex_ctx, 1); /* skip opening slash on first loop */
 				x = DUK__L0();
 				if (x < 0 || duk_unicode_is_line_terminator(x)) {
 					goto fail_unterm_regexp;
 				}
-				x = DUK__L0();  /* re-read to avoid spill / fetch */
+				x = DUK__L0(); /* re-read to avoid spill / fetch */
 				if (state == 0) {
 					if (x == DUK_ASC_SLASH) {
-						DUK__ADVANCECHARS(lex_ctx, 1);  /* eat closing slash */
+						DUK__ADVANCECHARS(lex_ctx, 1); /* eat closing slash */
 						break;
 					} else if (x == DUK_ASC_BACKSLASH) {
 						state = 1;
@@ -82705,20 +86986,20 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 				if (!duk_unicode_is_identifier_part(x)) {
 					break;
 				}
-				x = DUK__L0();  /* re-read to avoid spill / fetch */
+				x = DUK__L0(); /* re-read to avoid spill / fetch */
 				DUK__APPENDBUFFER(lex_ctx, x);
 				DUK__ADVANCECHARS(lex_ctx, 1);
 			}
 			out_token->str2 = duk__internbuffer(lex_ctx, lex_ctx->slot2_idx);
 
-			DUK__INITBUFFER(lex_ctx);  /* free some memory */
+			DUK__INITBUFFER(lex_ctx); /* free some memory */
 
 			/* validation of the regexp is caller's responsibility */
 
 			advtok = DUK__ADVTOK(0, DUK_TOK_REGEXP);
-#else  /* DUK_USE_REGEXP_SUPPORT */
+#else /* DUK_USE_REGEXP_SUPPORT */
 			goto fail_regexp_support;
-#endif  /* DUK_USE_REGEXP_SUPPORT */
+#endif /* DUK_USE_REGEXP_SUPPORT */
 		} else if (DUK__L1() == DUK_ASC_EQUALS) {
 			/* "/=" and not in regexp mode */
 			advtok = DUK__ADVTOK(2, DUK_TOK_DIV_EQ);
@@ -82727,25 +87008,25 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 			advtok = DUK__ADVTOK(1, DUK_TOK_DIV);
 		}
 		break;
-	case DUK_ASC_LCURLY:  /* '{' */
+	case DUK_ASC_LCURLY: /* '{' */
 		advtok = DUK__ADVTOK(1, DUK_TOK_LCURLY);
 		break;
-	case DUK_ASC_RCURLY:  /* '}' */
+	case DUK_ASC_RCURLY: /* '}' */
 		advtok = DUK__ADVTOK(1, DUK_TOK_RCURLY);
 		break;
-	case DUK_ASC_LPAREN:  /* '(' */
+	case DUK_ASC_LPAREN: /* '(' */
 		advtok = DUK__ADVTOK(1, DUK_TOK_LPAREN);
 		break;
-	case DUK_ASC_RPAREN:  /* ')' */
+	case DUK_ASC_RPAREN: /* ')' */
 		advtok = DUK__ADVTOK(1, DUK_TOK_RPAREN);
 		break;
-	case DUK_ASC_LBRACKET:  /* '[' */
+	case DUK_ASC_LBRACKET: /* '[' */
 		advtok = DUK__ADVTOK(1, DUK_TOK_LBRACKET);
 		break;
-	case DUK_ASC_RBRACKET:  /* ']' */
+	case DUK_ASC_RBRACKET: /* ']' */
 		advtok = DUK__ADVTOK(1, DUK_TOK_RBRACKET);
 		break;
-	case DUK_ASC_PERIOD:  /* '.' */
+	case DUK_ASC_PERIOD: /* '.' */
 		if (DUK__ISDIGIT(DUK__L1())) {
 			/* Period followed by a digit can only start DecimalLiteral
 			 * (handled in slow path).  We could jump straight into the
@@ -82756,13 +87037,13 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 		}
 		advtok = DUK__ADVTOK(1, DUK_TOK_PERIOD);
 		break;
-	case DUK_ASC_SEMICOLON:  /* ';' */
+	case DUK_ASC_SEMICOLON: /* ';' */
 		advtok = DUK__ADVTOK(1, DUK_TOK_SEMICOLON);
 		break;
-	case DUK_ASC_COMMA:  /* ',' */
+	case DUK_ASC_COMMA: /* ',' */
 		advtok = DUK__ADVTOK(1, DUK_TOK_COMMA);
 		break;
-	case DUK_ASC_LANGLE:  /* '<' */
+	case DUK_ASC_LANGLE: /* '<' */
 #if defined(DUK_USE_HTML_COMMENTS)
 		if (DUK__L1() == DUK_ASC_EXCLAMATION && DUK__L2() == DUK_ASC_MINUS && DUK__L3() == DUK_ASC_MINUS) {
 			/*
@@ -82771,11 +87052,10 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 
 			/* DUK__ADVANCECHARS(lex_ctx, 4) would be correct here, but not necessary */
 			duk__lexer_skip_to_endofline(lex_ctx);
-			goto restart;  /* line terminator will be handled on next round */
-		}
-		else
-#endif  /* DUK_USE_HTML_COMMENTS */
-		if (DUK__L1() == DUK_ASC_LANGLE && DUK__L2() == DUK_ASC_EQUALS) {
+			goto restart; /* line terminator will be handled on next round */
+		} else
+#endif /* DUK_USE_HTML_COMMENTS */
+		    if (DUK__L1() == DUK_ASC_LANGLE && DUK__L2() == DUK_ASC_EQUALS) {
 			advtok = DUK__ADVTOK(3, DUK_TOK_ALSHIFT_EQ);
 		} else if (DUK__L1() == DUK_ASC_EQUALS) {
 			advtok = DUK__ADVTOK(2, DUK_TOK_LE);
@@ -82785,7 +87065,7 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 			advtok = DUK__ADVTOK(1, DUK_TOK_LT);
 		}
 		break;
-	case DUK_ASC_RANGLE:  /* '>' */
+	case DUK_ASC_RANGLE: /* '>' */
 		if (DUK__L1() == DUK_ASC_RANGLE && DUK__L2() == DUK_ASC_RANGLE && DUK__L3() == DUK_ASC_EQUALS) {
 			advtok = DUK__ADVTOK(4, DUK_TOK_RSHIFT_EQ);
 		} else if (DUK__L1() == DUK_ASC_RANGLE && DUK__L2() == DUK_ASC_RANGLE) {
@@ -82800,7 +87080,7 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 			advtok = DUK__ADVTOK(1, DUK_TOK_GT);
 		}
 		break;
-	case DUK_ASC_EQUALS:  /* '=' */
+	case DUK_ASC_EQUALS: /* '=' */
 		if (DUK__L1() == DUK_ASC_EQUALS && DUK__L2() == DUK_ASC_EQUALS) {
 			advtok = DUK__ADVTOK(3, DUK_TOK_SEQ);
 		} else if (DUK__L1() == DUK_ASC_EQUALS) {
@@ -82809,7 +87089,7 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 			advtok = DUK__ADVTOK(1, DUK_TOK_EQUALSIGN);
 		}
 		break;
-	case DUK_ASC_EXCLAMATION:  /* '!' */
+	case DUK_ASC_EXCLAMATION: /* '!' */
 		if (DUK__L1() == DUK_ASC_EQUALS && DUK__L2() == DUK_ASC_EQUALS) {
 			advtok = DUK__ADVTOK(3, DUK_TOK_SNEQ);
 		} else if (DUK__L1() == DUK_ASC_EQUALS) {
@@ -82818,7 +87098,7 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 			advtok = DUK__ADVTOK(1, DUK_TOK_LNOT);
 		}
 		break;
-	case DUK_ASC_PLUS:  /* '+' */
+	case DUK_ASC_PLUS: /* '+' */
 		if (DUK__L1() == DUK_ASC_PLUS) {
 			advtok = DUK__ADVTOK(2, DUK_TOK_INCREMENT);
 		} else if (DUK__L1() == DUK_ASC_EQUALS) {
@@ -82827,7 +87107,7 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 			advtok = DUK__ADVTOK(1, DUK_TOK_ADD);
 		}
 		break;
-	case DUK_ASC_MINUS:  /* '-' */
+	case DUK_ASC_MINUS: /* '-' */
 #if defined(DUK_USE_HTML_COMMENTS)
 		if (got_lineterm && DUK__L1() == DUK_ASC_MINUS && DUK__L2() == DUK_ASC_RANGLE) {
 			/*
@@ -82844,10 +87124,10 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 
 			/* DUK__ADVANCECHARS(lex_ctx, 3) would be correct here, but not necessary */
 			duk__lexer_skip_to_endofline(lex_ctx);
-			goto restart;  /* line terminator will be handled on next round */
+			goto restart; /* line terminator will be handled on next round */
 		} else
-#endif  /* DUK_USE_HTML_COMMENTS */
-		if (DUK__L1() == DUK_ASC_MINUS) {
+#endif /* DUK_USE_HTML_COMMENTS */
+		    if (DUK__L1() == DUK_ASC_MINUS) {
 			advtok = DUK__ADVTOK(2, DUK_TOK_DECREMENT);
 		} else if (DUK__L1() == DUK_ASC_EQUALS) {
 			advtok = DUK__ADVTOK(2, DUK_TOK_SUB_EQ);
@@ -82855,7 +87135,7 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 			advtok = DUK__ADVTOK(1, DUK_TOK_SUB);
 		}
 		break;
-	case DUK_ASC_STAR:  /* '*' */
+	case DUK_ASC_STAR: /* '*' */
 #if defined(DUK_USE_ES7_EXP_OPERATOR)
 		if (DUK__L1() == DUK_ASC_STAR && DUK__L2() == DUK_ASC_EQUALS) {
 			advtok = DUK__ADVTOK(3, DUK_TOK_EXP_EQ);
@@ -82863,20 +87143,20 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 			advtok = DUK__ADVTOK(2, DUK_TOK_EXP);
 		} else
 #endif
-		if (DUK__L1() == DUK_ASC_EQUALS) {
+		    if (DUK__L1() == DUK_ASC_EQUALS) {
 			advtok = DUK__ADVTOK(2, DUK_TOK_MUL_EQ);
 		} else {
 			advtok = DUK__ADVTOK(1, DUK_TOK_MUL);
 		}
 		break;
-	case DUK_ASC_PERCENT:  /* '%' */
+	case DUK_ASC_PERCENT: /* '%' */
 		if (DUK__L1() == DUK_ASC_EQUALS) {
 			advtok = DUK__ADVTOK(2, DUK_TOK_MOD_EQ);
 		} else {
 			advtok = DUK__ADVTOK(1, DUK_TOK_MOD);
 		}
 		break;
-	case DUK_ASC_AMP:  /* '&' */
+	case DUK_ASC_AMP: /* '&' */
 		if (DUK__L1() == DUK_ASC_AMP) {
 			advtok = DUK__ADVTOK(2, DUK_TOK_LAND);
 		} else if (DUK__L1() == DUK_ASC_EQUALS) {
@@ -82885,7 +87165,7 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 			advtok = DUK__ADVTOK(1, DUK_TOK_BAND);
 		}
 		break;
-	case DUK_ASC_PIPE:  /* '|' */
+	case DUK_ASC_PIPE: /* '|' */
 		if (DUK__L1() == DUK_ASC_PIPE) {
 			advtok = DUK__ADVTOK(2, DUK_TOK_LOR);
 		} else if (DUK__L1() == DUK_ASC_EQUALS) {
@@ -82894,41 +87174,41 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 			advtok = DUK__ADVTOK(1, DUK_TOK_BOR);
 		}
 		break;
-	case DUK_ASC_CARET:  /* '^' */
+	case DUK_ASC_CARET: /* '^' */
 		if (DUK__L1() == DUK_ASC_EQUALS) {
 			advtok = DUK__ADVTOK(2, DUK_TOK_BXOR_EQ);
 		} else {
 			advtok = DUK__ADVTOK(1, DUK_TOK_BXOR);
 		}
 		break;
-	case DUK_ASC_TILDE:  /* '~' */
+	case DUK_ASC_TILDE: /* '~' */
 		advtok = DUK__ADVTOK(1, DUK_TOK_BNOT);
 		break;
-	case DUK_ASC_QUESTION:  /* '?' */
+	case DUK_ASC_QUESTION: /* '?' */
 		advtok = DUK__ADVTOK(1, DUK_TOK_QUESTION);
 		break;
-	case DUK_ASC_COLON:  /* ':' */
+	case DUK_ASC_COLON: /* ':' */
 		advtok = DUK__ADVTOK(1, DUK_TOK_COLON);
 		break;
-	case DUK_ASC_DOUBLEQUOTE:    /* '"' */
-	case DUK_ASC_SINGLEQUOTE: {  /* '\'' */
+	case DUK_ASC_DOUBLEQUOTE: /* '"' */
+	case DUK_ASC_SINGLEQUOTE: { /* '\'' */
 		DUK__INITBUFFER(lex_ctx);
 		duk__lexer_parse_string_literal(lex_ctx, out_token, x /*quote*/, strict_mode);
 		duk__internbuffer(lex_ctx, lex_ctx->slot1_idx);
 		out_token->str1 = duk_known_hstring(lex_ctx->thr, lex_ctx->slot1_idx);
 
-		DUK__INITBUFFER(lex_ctx);  /* free some memory */
+		DUK__INITBUFFER(lex_ctx); /* free some memory */
 
 		advtok = DUK__ADVTOK(0, DUK_TOK_STRING);
 		break;
 	}
 	default:
 		goto slow_path;
-	}  /* switch */
+	} /* switch */
 
 	goto skip_slow_path;
 
- slow_path:
+slow_path:
 	if (duk_unicode_is_line_terminator(x)) {
 		if (x == 0x000d && DUK__L1() == 0x000a) {
 			/*
@@ -83019,7 +87299,7 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 		str = out_token->str1;
 		out_token->t_nores = DUK_TOK_IDENTIFIER;
 
-		DUK__INITBUFFER(lex_ctx);  /* free some memory */
+		DUK__INITBUFFER(lex_ctx); /* free some memory */
 
 		/*
 		 *  Interned identifier is compared against reserved words, which are
@@ -83046,7 +87326,7 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 		advtok = DUK__ADVTOK(0, DUK_TOK_IDENTIFIER);
 		if (out_token->num_escapes == 0) {
 			for (i = DUK_STRIDX_START_RESERVED; i < i_end; i++) {
-				DUK_ASSERT_DISABLE(i >= 0);  /* unsigned */
+				DUK_ASSERT_DISABLE(i >= 0); /* unsigned */
 				DUK_ASSERT(i < DUK_HEAP_NUM_STRINGS);
 				if (DUK_HTHREAD_GET_STRING(lex_ctx->thr, i) == str) {
 					advtok = DUK__ADVTOK(0, DUK_STRIDX_TO_TOK(i));
@@ -83081,11 +87361,11 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 
 		duk_double_t val;
 		duk_bool_t legacy_oct = 0;
-		duk_small_int_t state;  /* 0=before period/exp,
-		                         * 1=after period, before exp
-		                         * 2=after exp, allow '+' or '-'
-		                         * 3=after exp and exp sign
-		                         */
+		duk_small_int_t state; /* 0=before period/exp,
+		                        * 1=after period, before exp
+		                        * 2=after exp, allow '+' or '-'
+		                        * 3=after exp and exp sign
+		                        */
 		duk_small_uint_t s2n_flags;
 		duk_codepoint_t y, z;
 		duk_small_int_t s2n_radix = 10;
@@ -83097,7 +87377,7 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 		if (x == DUK_ASC_0) {
 			z = DUK_LOWERCASE_CHAR_ASCII(y);
 
-			pre_adv = 2;  /* default for 0xNNN, 0oNNN, 0bNNN. */
+			pre_adv = 2; /* default for 0xNNN, 0oNNN, 0bNNN. */
 			if (z == DUK_ASC_LC_X) {
 				s2n_radix = 16;
 			} else if (z == DUK_ASC_LC_O) {
@@ -83120,7 +87400,7 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 						DUK__APPENDBUFFER(lex_ctx, x);
 						pre_adv = 1;
 						legacy_oct = 1;
-						s2n_radix = 8;  /* tentative unless conflicting digits found */
+						s2n_radix = 8; /* tentative unless conflicting digits found */
 					}
 				}
 			}
@@ -83134,7 +87414,7 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 		 */
 		state = 0;
 		for (;;) {
-			x = DUK__L0();  /* re-lookup curr char on first round */
+			x = DUK__L0(); /* re-lookup curr char on first round */
 			if (DUK__ISDIGIT(x)) {
 				/* Note: intentionally allow leading zeroes here, as the
 				 * actual parser will check for them.
@@ -83187,11 +87467,8 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 			/* For bases other than 10, integer only. */
 			s2n_flags = DUK_S2N_FLAG_ALLOW_LEADING_ZERO;
 		} else {
-			s2n_flags = DUK_S2N_FLAG_ALLOW_EXP |
-			            DUK_S2N_FLAG_ALLOW_FRAC |
-			            DUK_S2N_FLAG_ALLOW_NAKED_FRAC |
-			            DUK_S2N_FLAG_ALLOW_EMPTY_FRAC |
-			            DUK_S2N_FLAG_ALLOW_LEADING_ZERO;
+			s2n_flags = DUK_S2N_FLAG_ALLOW_EXP | DUK_S2N_FLAG_ALLOW_FRAC | DUK_S2N_FLAG_ALLOW_NAKED_FRAC |
+			            DUK_S2N_FLAG_ALLOW_EMPTY_FRAC | DUK_S2N_FLAG_ALLOW_LEADING_ZERO;
 		}
 
 		duk_dup(lex_ctx->thr, lex_ctx->slot1_idx);
@@ -83200,9 +87477,9 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 		if (DUK_ISNAN(val)) {
 			goto fail_number_literal;
 		}
-		duk_replace(lex_ctx->thr, lex_ctx->slot1_idx);  /* could also just pop? */
+		duk_replace(lex_ctx->thr, lex_ctx->slot1_idx); /* could also just pop? */
 
-		DUK__INITBUFFER(lex_ctx);  /* free some memory */
+		DUK__INITBUFFER(lex_ctx); /* free some memory */
 
 		/* Section 7.8.3 (note): NumericLiteral must be followed by something other than
 		 * IdentifierStart or DecimalDigit.
@@ -83222,7 +87499,7 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 	} else {
 		goto fail_token;
 	}
- skip_slow_path:
+skip_slow_path:
 
 	/*
 	 *  Shared exit path
@@ -83247,32 +87524,32 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
 
 	return;
 
- fail_token_limit:
+fail_token_limit:
 	DUK_ERROR_RANGE(lex_ctx->thr, DUK_STR_TOKEN_LIMIT);
 	DUK_WO_NORETURN(return;);
 
- fail_token:
+fail_token:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_INVALID_TOKEN);
 	DUK_WO_NORETURN(return;);
 
- fail_number_literal:
+fail_number_literal:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_INVALID_NUMBER_LITERAL);
 	DUK_WO_NORETURN(return;);
 
- fail_escape:
+fail_escape:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_INVALID_ESCAPE);
 	DUK_WO_NORETURN(return;);
 
- fail_unterm_regexp:
+fail_unterm_regexp:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_UNTERMINATED_REGEXP);
 	DUK_WO_NORETURN(return;);
 
- fail_unterm_comment:
+fail_unterm_comment:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_UNTERMINATED_COMMENT);
 	DUK_WO_NORETURN(return;);
 
 #if !defined(DUK_USE_REGEXP_SUPPORT)
- fail_regexp_support:
+fail_regexp_support:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_REGEXP_SUPPORT_DISABLED);
 	DUK_WO_NORETURN(return;);
 #endif
@@ -83290,7 +87567,7 @@ void duk_lexer_parse_js_input_element(duk_lexer_ctx *lex_ctx,
  */
 
 DUK_INTERNAL void duk_lexer_parse_re_token(duk_lexer_ctx *lex_ctx, duk_re_token *out_token) {
-	duk_small_uint_t advtok = 0;  /* init is unnecessary but suppresses "may be used uninitialized" warnings */
+	duk_small_uint_t advtok = 0; /* init is unnecessary but suppresses "may be used uninitialized" warnings */
 	duk_codepoint_t x, y;
 
 	if (++lex_ctx->token_count >= lex_ctx->token_limit) {
@@ -83368,7 +87645,7 @@ DUK_INTERNAL void duk_lexer_parse_re_token(duk_lexer_ctx *lex_ctx, duk_re_token
 #endif
 
 		for (;;) {
-			DUK__ADVANCECHARS(lex_ctx, 1);  /* eat '{' on entry */
+			DUK__ADVANCECHARS(lex_ctx, 1); /* eat '{' on entry */
 			x = DUK__L0();
 			if (DUK__ISDIGIT(x)) {
 				digits++;
@@ -83392,7 +87669,7 @@ DUK_INTERNAL void duk_lexer_parse_re_token(duk_lexer_ctx *lex_ctx, duk_re_token
 				}
 				val2 = val1;
 				val1 = 0;
-				digits = 0;  /* not strictly necessary because of lookahead '}' above */
+				digits = 0; /* not strictly necessary because of lookahead '}' above */
 			} else if (x == DUK_ASC_RCURLY) {
 				if (digits > DUK__MAX_RE_QUANT_DIGITS) {
 					goto invalid_quantifier;
@@ -83423,7 +87700,7 @@ DUK_INTERNAL void duk_lexer_parse_re_token(duk_lexer_ctx *lex_ctx, duk_re_token
 		}
 		advtok = DUK__ADVTOK(0, DUK_RETOK_QUANTIFIER);
 		break;
- invalid_quantifier:
+	invalid_quantifier:
 #if defined(DUK_USE_ES6_REGEXP_SYNTAX)
 		/* Failed to match the quantifier, restore lexer and parse
 		 * opening brace as a literal.
@@ -83449,7 +87726,7 @@ DUK_INTERNAL void duk_lexer_parse_re_token(duk_lexer_ctx *lex_ctx, duk_re_token
 		 * ES2015 Annex B relaxes the rules to allow these (and other) real world forms.
 		 */
 
-		advtok = DUK__ADVTOK(2, DUK_RETOK_ATOM_CHAR);  /* default: char escape (two chars) */
+		advtok = DUK__ADVTOK(2, DUK_RETOK_ATOM_CHAR); /* default: char escape (two chars) */
 		if (y == DUK_ASC_LC_B) {
 			advtok = DUK__ADVTOK(2, DUK_RETOK_ASSERT_WORD_BOUNDARY);
 		} else if (y == DUK_ASC_UC_B) {
@@ -83466,8 +87743,7 @@ DUK_INTERNAL void duk_lexer_parse_re_token(duk_lexer_ctx *lex_ctx, duk_re_token
 			out_token->num = 0x000b;
 		} else if (y == DUK_ASC_LC_C) {
 			x = DUK__L2();
-			if ((x >= DUK_ASC_LC_A && x <= DUK_ASC_LC_Z) ||
-			    (x >= DUK_ASC_UC_A && x <= DUK_ASC_UC_Z)) {
+			if ((x >= DUK_ASC_LC_A && x <= DUK_ASC_LC_Z) || (x >= DUK_ASC_UC_A && x <= DUK_ASC_UC_Z)) {
 				out_token->num = (duk_uint32_t) (x % 32);
 				advtok = DUK__ADVTOK(3, DUK_RETOK_ATOM_CHAR);
 			} else {
@@ -83505,11 +87781,11 @@ DUK_INTERNAL void duk_lexer_parse_re_token(duk_lexer_ctx *lex_ctx, duk_re_token
 				/* XXX: shared parsing? */
 				duk_uint32_t val = 0;
 				duk_small_int_t i;
-				for (i = 0; ; i++) {
+				for (i = 0;; i++) {
 					if (i >= DUK__MAX_RE_DECESC_DIGITS) {
 						goto fail_escape;
 					}
-					DUK__ADVANCECHARS(lex_ctx, 1);  /* eat backslash on entry */
+					DUK__ADVANCECHARS(lex_ctx, 1); /* eat backslash on entry */
 					x = DUK__L0();
 					if (!DUK__ISDIGIT(x)) {
 						break;
@@ -83529,17 +87805,15 @@ DUK_INTERNAL void duk_lexer_parse_re_token(duk_lexer_ctx *lex_ctx, duk_re_token
 			 * This is not yet full ES2015 Annex B because cases above
 			 * (like hex escape) won't backtrack.
 			 */
-			DUK_ASSERT(y != DUK_ASC_LC_C);  /* covered above */
-#else  /* DUK_USE_ES6_REGEXP_SYNTAX */
-		} else if ((y >= 0 && !duk_unicode_is_identifier_part(y)) ||
-		           y == DUK_UNICODE_CP_ZWNJ ||
-		           y == DUK_UNICODE_CP_ZWJ) {
+			DUK_ASSERT(y != DUK_ASC_LC_C); /* covered above */
+#else /* DUK_USE_ES6_REGEXP_SYNTAX */
+		} else if ((y >= 0 && !duk_unicode_is_identifier_part(y)) || y == DUK_UNICODE_CP_ZWNJ || y == DUK_UNICODE_CP_ZWJ) {
 			/* For ES5.1 identity escapes are not allowed for identifier
 			 * parts.  This conflicts with a lot of real world code as this
 			 * doesn't e.g. allow escaping a dollar sign as /\$/, see
 			 * test-regexp-identity-escape-dollar.js.
 			 */
-#endif  /* DUK_USE_ES6_REGEXP_SYNTAX */
+#endif /* DUK_USE_ES6_REGEXP_SYNTAX */
 			out_token->num = (duk_uint32_t) y;
 		} else {
 			goto fail_escape;
@@ -83620,24 +87894,24 @@ DUK_INTERNAL void duk_lexer_parse_re_token(duk_lexer_ctx *lex_ctx, duk_re_token
 	out_token->t = advtok & 0xff;
 	return;
 
- fail_token_limit:
+fail_token_limit:
 	DUK_ERROR_RANGE(lex_ctx->thr, DUK_STR_TOKEN_LIMIT);
 	DUK_WO_NORETURN(return;);
 
- fail_escape:
+fail_escape:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_INVALID_REGEXP_ESCAPE);
 	DUK_WO_NORETURN(return;);
 
- fail_group:
+fail_group:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_INVALID_REGEXP_GROUP);
 	DUK_WO_NORETURN(return;);
 
 #if !defined(DUK_USE_ES6_REGEXP_SYNTAX)
- fail_invalid_char:
+fail_invalid_char:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_INVALID_REGEXP_CHARACTER);
 	DUK_WO_NORETURN(return;);
 
- fail_quantifier:
+fail_quantifier:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_INVALID_QUANTIFIER);
 	DUK_WO_NORETURN(return;);
 #endif
@@ -83696,7 +87970,7 @@ DUK_INTERNAL void duk_lexer_parse_re_ranges(duk_lexer_ctx *lex_ctx, duk_re_range
 
 		x = DUK__L0();
 
-		ch = -1;  /* not strictly necessary, but avoids "uninitialized variable" warnings */
+		ch = -1; /* not strictly necessary, but avoids "uninitialized variable" warnings */
 		DUK_UNREF(ch);
 
 		if (x < 0) {
@@ -83705,7 +87979,7 @@ DUK_INTERNAL void duk_lexer_parse_re_ranges(duk_lexer_ctx *lex_ctx, duk_re_range
 			if (start >= 0) {
 				gen_range(userdata, start, start, 0);
 			}
-			DUK__ADVANCECHARS(lex_ctx, 1);  /* eat ']' before finishing */
+			DUK__ADVANCECHARS(lex_ctx, 1); /* eat ']' before finishing */
 			break;
 		} else if (x == DUK_ASC_MINUS) {
 			if (start >= 0 && !dash && DUK__L1() != DUK_ASC_RBRACKET) {
@@ -83750,8 +88024,7 @@ DUK_INTERNAL void duk_lexer_parse_re_ranges(duk_lexer_ctx *lex_ctx, duk_re_range
 			} else if (x == DUK_ASC_LC_C) {
 				x = DUK__L2();
 				adv = 3;
-				if ((x >= DUK_ASC_LC_A && x <= DUK_ASC_LC_Z) ||
-				    (x >= DUK_ASC_UC_A && x <= DUK_ASC_UC_Z)) {
+				if ((x >= DUK_ASC_LC_A && x <= DUK_ASC_LC_Z) || (x >= DUK_ASC_UC_A && x <= DUK_ASC_UC_Z)) {
 					ch = (x % 32);
 				} else {
 					goto fail_escape;
@@ -83815,7 +88088,7 @@ DUK_INTERNAL void duk_lexer_parse_re_ranges(duk_lexer_ctx *lex_ctx, duk_re_range
 
 #if defined(DUK_USE_ES6_REGEXP_SYNTAX)
 				ch = duk__lexer_parse_legacy_octal(lex_ctx, &adv, 0 /*reject_annex_b*/);
-				DUK_ASSERT(ch >= 0);  /* no rejections */
+				DUK_ASSERT(ch >= 0); /* no rejections */
 #else
 				if (x == DUK_ASC_0 && !DUK__ISDIGIT(DUK__L2())) {
 					ch = 0x0000;
@@ -83830,7 +88103,7 @@ DUK_INTERNAL void duk_lexer_parse_re_ranges(duk_lexer_ctx *lex_ctx, duk_re_range
 				 * EOF here.
 				 */
 				ch = x;
-#else  /* DUK_USE_ES6_REGEXP_SYNTAX */
+#else /* DUK_USE_ES6_REGEXP_SYNTAX */
 			} else if (!duk_unicode_is_identifier_part(x)) {
 				/* IdentityEscape: ES5.1 doesn't allow identity escape
 				 * for identifier part characters, which conflicts with
@@ -83838,7 +88111,7 @@ DUK_INTERNAL void duk_lexer_parse_re_ranges(duk_lexer_ctx *lex_ctx, duk_re_range
 				 * /[\$]/ which is awkward.
 				 */
 				ch = x;
-#endif  /* DUK_USE_ES6_REGEXP_SYNTAX */
+#endif /* DUK_USE_ES6_REGEXP_SYNTAX */
 			} else {
 				goto fail_escape;
 			}
@@ -83886,20 +88159,20 @@ DUK_INTERNAL void duk_lexer_parse_re_ranges(duk_lexer_ctx *lex_ctx, duk_re_range
 
 	return;
 
- fail_escape:
+fail_escape:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_INVALID_REGEXP_ESCAPE);
 	DUK_WO_NORETURN(return;);
 
- fail_range:
+fail_range:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_INVALID_RANGE);
 	DUK_WO_NORETURN(return;);
 
- fail_unterm_charclass:
+fail_unterm_charclass:
 	DUK_ERROR_SYNTAX(lex_ctx->thr, DUK_STR_UNTERMINATED_CHARCLASS);
 	DUK_WO_NORETURN(return;);
 }
 
-#endif  /* DUK_USE_REGEXP_SUPPORT */
+#endif /* DUK_USE_REGEXP_SUPPORT */
 
 /* automatic undefs */
 #undef DUK__ADVANCEBYTES
@@ -83936,10 +88209,10 @@ DUK_INTERNAL void duk_lexer_parse_re_ranges(duk_lexer_ctx *lex_ctx, duk_re_range
 
 /* #include duk_internal.h -> already included */
 
-#define DUK__IEEE_DOUBLE_EXP_BIAS  1023
-#define DUK__IEEE_DOUBLE_EXP_MIN   (-1022)   /* biased exp == 0 -> denormal, exp -1022 */
+#define DUK__IEEE_DOUBLE_EXP_BIAS 1023
+#define DUK__IEEE_DOUBLE_EXP_MIN  (-1022) /* biased exp == 0 -> denormal, exp -1022 */
 
-#define DUK__DIGITCHAR(x)  duk_lc_digits[(x)]
+#define DUK__DIGITCHAR(x) duk_lc_digits[(x)]
 
 /*
  *  Tables generated with util/gennumdigits.py.
@@ -83957,10 +88230,10 @@ DUK_INTERNAL void duk_lexer_parse_re_ranges(duk_lexer_ctx *lex_ctx, duk_re_range
  */
 
 DUK_LOCAL const duk_uint8_t duk__str2num_digits_for_radix[] = {
-	69, 44, 35, 30, 27, 25, 23, 22, 20, 20,    /* 2 to 11 */
-	20, 19, 19, 18, 18, 17, 17, 17, 16, 16,    /* 12 to 21 */
-	16, 16, 16, 15, 15, 15, 15, 15, 15, 14,    /* 22 to 31 */
-	14, 14, 14, 14, 14                         /* 31 to 36 */
+	69, 44, 35, 30, 27, 25, 23, 22, 20, 20, /* 2 to 11 */
+	20, 19, 19, 18, 18, 17, 17, 17, 16, 16, /* 12 to 21 */
+	16, 16, 16, 15, 15, 15, 15, 15, 15, 14, /* 22 to 31 */
+	14, 14, 14, 14, 14 /* 31 to 36 */
 };
 
 typedef struct {
@@ -83969,15 +88242,11 @@ typedef struct {
 } duk__exp_limits;
 
 DUK_LOCAL const duk__exp_limits duk__str2num_exp_limits[] = {
-	{ 957, -1147 }, { 605, -725 },  { 479, -575 },  { 414, -496 },
-	{ 372, -446 },  { 342, -411 },  { 321, -384 },  { 304, -364 },
-	{ 291, -346 },  { 279, -334 },  { 268, -323 },  { 260, -312 },
-	{ 252, -304 },  { 247, -296 },  { 240, -289 },  { 236, -283 },
-	{ 231, -278 },  { 227, -273 },  { 223, -267 },  { 220, -263 },
-	{ 216, -260 },  { 213, -256 },  { 210, -253 },  { 208, -249 },
-	{ 205, -246 },  { 203, -244 },  { 201, -241 },  { 198, -239 },
-	{ 196, -237 },  { 195, -234 },  { 193, -232 },  { 191, -230 },
-	{ 190, -228 },  { 188, -226 },  { 187, -225 },
+	{ 957, -1147 }, { 605, -725 }, { 479, -575 }, { 414, -496 }, { 372, -446 }, { 342, -411 }, { 321, -384 },
+	{ 304, -364 },  { 291, -346 }, { 279, -334 }, { 268, -323 }, { 260, -312 }, { 252, -304 }, { 247, -296 },
+	{ 240, -289 },  { 236, -283 }, { 231, -278 }, { 227, -273 }, { 223, -267 }, { 220, -263 }, { 216, -260 },
+	{ 213, -256 },  { 210, -253 }, { 208, -249 }, { 205, -246 }, { 203, -244 }, { 201, -241 }, { 198, -239 },
+	{ 196, -237 },  { 195, -234 }, { 193, -232 }, { 191, -230 }, { 190, -228 }, { 188, -226 }, { 187, -225 },
 };
 
 /*
@@ -83995,18 +88264,18 @@ DUK_LOCAL const duk__exp_limits duk__str2num_exp_limits[] = {
 /* This upper value has been experimentally determined; debug build will check
  * bigint size with assertions.
  */
-#define DUK__BI_MAX_PARTS  37  /* 37x32 = 1184 bits */
+#define DUK__BI_MAX_PARTS 37 /* 37x32 = 1184 bits */
 
 #if defined(DUK_USE_DEBUG_LEVEL) && (DUK_USE_DEBUG_LEVEL >= 2)
-#define DUK__BI_PRINT(name,x)  duk__bi_print((name),(x))
+#define DUK__BI_PRINT(name, x) duk__bi_print((name), (x))
 #else
-#define DUK__BI_PRINT(name,x)
+#define DUK__BI_PRINT(name, x)
 #endif
 
 /* Current size is about 152 bytes. */
 typedef struct {
 	duk_small_int_t n;
-	duk_uint32_t v[DUK__BI_MAX_PARTS];  /* low to high */
+	duk_uint32_t v[DUK__BI_MAX_PARTS]; /* low to high */
 } duk__bigint;
 
 #if defined(DUK_USE_DEBUG_LEVEL) && (DUK_USE_DEBUG_LEVEL >= 2)
@@ -84031,9 +88300,8 @@ DUK_LOCAL void duk__bi_print(const char *name, duk__bigint *x) {
 
 #if defined(DUK_USE_ASSERTIONS)
 DUK_LOCAL duk_small_int_t duk__bi_is_valid(duk__bigint *x) {
-	return (duk_small_int_t)
-	       ( ((x->n >= 0) && (x->n <= DUK__BI_MAX_PARTS)) /* is valid size */ &&
-	         ((x->n == 0) || (x->v[x->n - 1] != 0)) /* is normalized */ );
+	return (duk_small_int_t) (((x->n >= 0) && (x->n <= DUK__BI_MAX_PARTS)) /* is valid size */ &&
+	                          ((x->n == 0) || (x->v[x->n - 1] != 0)) /* is normalized */);
 }
 #endif
 
@@ -84104,10 +88372,10 @@ DUK_LOCAL int duk__bi_compare(duk__bigint *x, duk__bigint *y) {
 
 	return 0;
 
- ret_gt:
+ret_gt:
 	return 1;
 
- ret_lt:
+ret_lt:
 	return -1;
 }
 
@@ -84122,11 +88390,14 @@ DUK_LOCAL void duk__bi_add(duk__bigint *x, duk__bigint *y, duk__bigint *z) {
 
 	if (z->n > y->n) {
 		duk__bigint *t;
-		t = y; y = z; z = t;
+		t = y;
+		y = z;
+		z = t;
 	}
 	DUK_ASSERT(y->n >= z->n);
 
-	ny = y->n; nz = z->n;
+	ny = y->n;
+	nz = z->n;
 	tmp = 0U;
 	for (i = 0; i < ny; i++) {
 		DUK_ASSERT(i < DUK__BI_MAX_PARTS);
@@ -84147,7 +88418,7 @@ DUK_LOCAL void duk__bi_add(duk__bigint *x, duk__bigint *y, duk__bigint *z) {
 	/* no need to normalize */
 	DUK_ASSERT(duk__bi_is_valid(x));
 }
-#else  /* DUK_USE_64BIT_OPS */
+#else /* DUK_USE_64BIT_OPS */
 DUK_LOCAL void duk__bi_add(duk__bigint *x, duk__bigint *y, duk__bigint *z) {
 	duk_uint32_t carry, tmp1, tmp2;
 	duk_small_int_t i, ny, nz;
@@ -84157,11 +88428,14 @@ DUK_LOCAL void duk__bi_add(duk__bigint *x, duk__bigint *y, duk__bigint *z) {
 
 	if (z->n > y->n) {
 		duk__bigint *t;
-		t = y; y = z; z = t;
+		t = y;
+		y = z;
+		z = t;
 	}
 	DUK_ASSERT(y->n >= z->n);
 
-	ny = y->n; nz = z->n;
+	ny = y->n;
+	nz = z->n;
 	carry = 0U;
 	for (i = 0; i < ny; i++) {
 		/* Carry is detected based on wrapping which relies on exact 32-bit
@@ -84198,7 +88472,7 @@ DUK_LOCAL void duk__bi_add(duk__bigint *x, duk__bigint *y, duk__bigint *z) {
 	/* no need to normalize */
 	DUK_ASSERT(duk__bi_is_valid(x));
 }
-#endif  /* DUK_USE_64BIT_OPS */
+#endif /* DUK_USE_64BIT_OPS */
 
 /* x <- y + z */
 DUK_LOCAL void duk__bi_add_small(duk__bigint *x, duk__bigint *y, duk_uint32_t z) {
@@ -84213,7 +88487,7 @@ DUK_LOCAL void duk__bi_add_small(duk__bigint *x, duk__bigint *y, duk_uint32_t z)
 	DUK_ASSERT(duk__bi_is_valid(x));
 }
 
-#if 0  /* unused */
+#if 0 /* unused */
 /* x <- x + y, use t as temp */
 DUK_LOCAL void duk__bi_add_copy(duk__bigint *x, duk__bigint *y, duk__bigint *t) {
 	duk__bi_add(t, x, y);
@@ -84233,7 +88507,8 @@ DUK_LOCAL void duk__bi_sub(duk__bigint *x, duk__bigint *y, duk__bigint *z) {
 	DUK_ASSERT(duk__bi_compare(y, z) >= 0);
 	DUK_ASSERT(y->n >= z->n);
 
-	ny = y->n; nz = z->n;
+	ny = y->n;
+	nz = z->n;
 	tmp = 0;
 	for (i = 0; i < ny; i++) {
 		ty = y->v[i];
@@ -84244,12 +88519,12 @@ DUK_LOCAL void duk__bi_sub(duk__bigint *x, duk__bigint *y, duk__bigint *z) {
 		}
 		tmp = (duk_int64_t) ty - (duk_int64_t) tz + tmp;
 		x->v[i] = (duk_uint32_t) ((duk_uint64_t) tmp & 0xffffffffUL);
-		tmp = tmp >> 32;  /* 0 or -1 */
+		tmp = tmp >> 32; /* 0 or -1 */
 	}
 	DUK_ASSERT(tmp == 0);
 
 	x->n = i;
-	duk__bi_normalize(x);  /* need to normalize, may even cancel to 0 */
+	duk__bi_normalize(x); /* need to normalize, may even cancel to 0 */
 	DUK_ASSERT(duk__bi_is_valid(x));
 }
 #else
@@ -84262,7 +88537,8 @@ DUK_LOCAL void duk__bi_sub(duk__bigint *x, duk__bigint *y, duk__bigint *z) {
 	DUK_ASSERT(duk__bi_compare(y, z) >= 0);
 	DUK_ASSERT(y->n >= z->n);
 
-	ny = y->n; nz = z->n;
+	ny = y->n;
+	nz = z->n;
 	borrow = 0U;
 	for (i = 0; i < ny; i++) {
 		/* Borrow is detected based on wrapping which relies on exact 32-bit
@@ -84290,12 +88566,12 @@ DUK_LOCAL void duk__bi_sub(duk__bigint *x, duk__bigint *y, duk__bigint *z) {
 	DUK_ASSERT(borrow == 0U);
 
 	x->n = i;
-	duk__bi_normalize(x);  /* need to normalize, may even cancel to 0 */
+	duk__bi_normalize(x); /* need to normalize, may even cancel to 0 */
 	DUK_ASSERT(duk__bi_is_valid(x));
 }
 #endif
 
-#if 0  /* unused */
+#if 0 /* unused */
 /* x <- y - z */
 DUK_LOCAL void duk__bi_sub_small(duk__bigint *x, duk__bigint *y, duk_uint32_t z) {
 	duk__bigint tmp;
@@ -84323,7 +88599,7 @@ DUK_LOCAL void duk__bi_mul(duk__bigint *x, duk__bigint *y, duk__bigint *z) {
 	DUK_ASSERT(duk__bi_is_valid(y));
 	DUK_ASSERT(duk__bi_is_valid(z));
 
-	nx = y->n + z->n;  /* max possible */
+	nx = y->n + z->n; /* max possible */
 	DUK_ASSERT(nx <= DUK__BI_MAX_PARTS);
 
 	if (nx == 0) {
@@ -84342,15 +88618,15 @@ DUK_LOCAL void duk__bi_mul(duk__bigint *x, duk__bigint *y, duk__bigint *z) {
 #if defined(DUK_USE_64BIT_OPS)
 		duk_uint64_t tmp = 0U;
 		for (j = 0; j < nz; j++) {
-			tmp += (duk_uint64_t) y->v[i] * (duk_uint64_t) z->v[j] + x->v[i+j];
-			x->v[i+j] = (duk_uint32_t) (tmp & 0xffffffffUL);
+			tmp += (duk_uint64_t) y->v[i] * (duk_uint64_t) z->v[j] + x->v[i + j];
+			x->v[i + j] = (duk_uint32_t) (tmp & 0xffffffffUL);
 			tmp = tmp >> 32;
 		}
 		if (tmp > 0) {
 			DUK_ASSERT(i + j < nx);
 			DUK_ASSERT(i + j < DUK__BI_MAX_PARTS);
-			DUK_ASSERT(x->v[i+j] == 0U);
-			x->v[i+j] = (duk_uint32_t) tmp;
+			DUK_ASSERT(x->v[i + j] == 0U);
+			x->v[i + j] = (duk_uint32_t) tmp;
 		}
 #else
 		/*
@@ -84370,12 +88646,16 @@ DUK_LOCAL void duk__bi_mul(duk__bigint *x, duk__bigint *y, duk__bigint *z) {
 		duk_uint32_t a, b, c, d, e, f;
 		duk_uint32_t r, s, t;
 
-		a = y->v[i]; b = a & 0xffffUL; a = a >> 16;
+		a = y->v[i];
+		b = a & 0xffffUL;
+		a = a >> 16;
 
 		f = 0;
 		for (j = 0; j < nz; j++) {
-			c = z->v[j]; d = c & 0xffffUL; c = c >> 16;
-			e = x->v[i+j];
+			c = z->v[j];
+			d = c & 0xffffUL;
+			c = c >> 16;
+			e = x->v[i + j];
 
 			/* build result as: (r << 32) + s: start with (BD + E + F) */
 			r = 0;
@@ -84383,26 +88663,34 @@ DUK_LOCAL void duk__bi_mul(duk__bigint *x, duk__bigint *y, duk__bigint *z) {
 
 			/* add E */
 			t = s + e;
-			if (t < s) { r++; }  /* carry */
+			if (t < s) {
+				r++;
+			} /* carry */
 			s = t;
 
 			/* add F */
 			t = s + f;
-			if (t < s) { r++; }  /* carry */
+			if (t < s) {
+				r++;
+			} /* carry */
 			s = t;
 
 			/* add BC*2^16 */
 			t = b * c;
 			r += (t >> 16);
 			t = s + ((t & 0xffffUL) << 16);
-			if (t < s) { r++; }  /* carry */
+			if (t < s) {
+				r++;
+			} /* carry */
 			s = t;
 
 			/* add AD*2^16 */
 			t = a * d;
 			r += (t >> 16);
 			t = s + ((t & 0xffffUL) << 16);
-			if (t < s) { r++; }  /* carry */
+			if (t < s) {
+				r++;
+			} /* carry */
 			s = t;
 
 			/* add AC*2^32 */
@@ -84410,20 +88698,22 @@ DUK_LOCAL void duk__bi_mul(duk__bigint *x, duk__bigint *y, duk__bigint *z) {
 			r += t;
 
 			DUK_DDD(DUK_DDDPRINT("ab=%08lx cd=%08lx ef=%08lx -> rs=%08lx %08lx",
-			                     (unsigned long) y->v[i], (unsigned long) z->v[j],
-			                     (unsigned long) x->v[i+j], (unsigned long) r,
+			                     (unsigned long) y->v[i],
+			                     (unsigned long) z->v[j],
+			                     (unsigned long) x->v[i + j],
+			                     (unsigned long) r,
 			                     (unsigned long) s));
 
-			x->v[i+j] = s;
+			x->v[i + j] = s;
 			f = r;
 		}
 		if (f > 0U) {
 			DUK_ASSERT(i + j < nx);
 			DUK_ASSERT(i + j < DUK__BI_MAX_PARTS);
-			DUK_ASSERT(x->v[i+j] == 0U);
-			x->v[i+j] = (duk_uint32_t) f;
+			DUK_ASSERT(x->v[i + j] == 0U);
+			x->v[i + j] = (duk_uint32_t) f;
 		}
-#endif  /* DUK_USE_64BIT_OPS */
+#endif /* DUK_USE_64BIT_OPS */
 	}
 
 	duk__bi_normalize(x);
@@ -84462,7 +88752,7 @@ DUK_LOCAL int duk__bi_is_even(duk__bigint *x) {
 
 DUK_LOCAL int duk__bi_is_zero(duk__bigint *x) {
 	DUK_ASSERT(duk__bi_is_valid(x));
-	return (x->n == 0);  /* this is the case for normalized numbers */
+	return (x->n == 0); /* this is the case for normalized numbers */
 }
 
 /* Bigint is 2^52.  Used to detect normalized IEEE double mantissa values
@@ -84473,8 +88763,7 @@ DUK_LOCAL int duk__bi_is_zero(duk__bigint *x) {
  */
 DUK_LOCAL duk_small_int_t duk__bi_is_2to52(duk__bigint *x) {
 	DUK_ASSERT(duk__bi_is_valid(x));
-	return (duk_small_int_t)
-	        (x->n == 2) && (x->v[0] == 0U) && (x->v[1] == (1U << (52-32)));
+	return (duk_small_int_t) (x->n == 2) && (x->v[0] == 0U) && (x->v[1] == (1U << (52 - 32)));
 }
 
 /* x <- (1<<y) */
@@ -84493,7 +88782,7 @@ DUK_LOCAL void duk__bi_twoexp(duk__bigint *x, duk_small_int_t y) {
 DUK_LOCAL void duk__bi_exp_small(duk__bigint *x, duk_small_int_t b, duk_small_int_t y, duk__bigint *t1, duk__bigint *t2) {
 	/* Fast path the binary case */
 
-	DUK_ASSERT(x != t1 && x != t2 && t1 != t2);  /* distinct bignums, easy mistake to make */
+	DUK_ASSERT(x != t1 && x != t2 && t1 != t2); /* distinct bignums, easy mistake to make */
 	DUK_ASSERT(b >= 0);
 	DUK_ASSERT(y >= 0);
 
@@ -84548,14 +88837,14 @@ DUK_LOCAL void duk__bi_exp_small(duk__bigint *x, duk_small_int_t b, duk_small_in
  */
 
 /* Maximum number of digits generated. */
-#define DUK__MAX_OUTPUT_DIGITS          1040  /* (Number.MAX_VALUE).toString(2).length == 1024, + slack */
+#define DUK__MAX_OUTPUT_DIGITS 1040 /* (Number.MAX_VALUE).toString(2).length == 1024, + slack */
 
 /* Maximum number of characters in formatted value. */
-#define DUK__MAX_FORMATTED_LENGTH       1040  /* (-Number.MAX_VALUE).toString(2).length == 1025, + slack */
+#define DUK__MAX_FORMATTED_LENGTH 1040 /* (-Number.MAX_VALUE).toString(2).length == 1025, + slack */
 
 /* Number and (minimum) size of bigints in the nc_ctx structure. */
-#define DUK__NUMCONV_CTX_NUM_BIGINTS    7
-#define DUK__NUMCONV_CTX_BIGINTS_SIZE   (sizeof(duk__bigint) * DUK__NUMCONV_CTX_NUM_BIGINTS)
+#define DUK__NUMCONV_CTX_NUM_BIGINTS  7
+#define DUK__NUMCONV_CTX_BIGINTS_SIZE (sizeof(duk__bigint) * DUK__NUMCONV_CTX_NUM_BIGINTS)
 
 typedef struct {
 	/* Currently about 7*152 = 1064 bytes.  The space for these
@@ -84565,31 +88854,32 @@ typedef struct {
 	 */
 	duk__bigint f, r, s, mp, mm, t1, t2;
 
-	duk_small_int_t is_s2n;        /* if 1, doing a string-to-number; else doing a number-to-string */
-	duk_small_int_t is_fixed;      /* if 1, doing a fixed format output (not free format) */
-	duk_small_int_t req_digits;    /* requested number of output digits; 0 = free-format */
-	duk_small_int_t abs_pos;       /* digit position is absolute, not relative */
-	duk_small_int_t e;             /* exponent for 'f' */
-	duk_small_int_t b;             /* input radix */
-	duk_small_int_t B;             /* output radix */
-	duk_small_int_t k;             /* see algorithm */
-	duk_small_int_t low_ok;        /* see algorithm */
-	duk_small_int_t high_ok;       /* see algorithm */
-	duk_small_int_t unequal_gaps;  /* m+ != m- (very rarely) */
+	duk_small_int_t is_s2n; /* if 1, doing a string-to-number; else doing a number-to-string */
+	duk_small_int_t is_fixed; /* if 1, doing a fixed format output (not free format) */
+	duk_small_int_t req_digits; /* requested number of output digits; 0 = free-format */
+	duk_small_int_t abs_pos; /* digit position is absolute, not relative */
+	duk_small_int_t e; /* exponent for 'f' */
+	duk_small_int_t b; /* input radix */
+	duk_small_int_t B; /* output radix */
+	duk_small_int_t k; /* see algorithm */
+	duk_small_int_t low_ok; /* see algorithm */
+	duk_small_int_t high_ok; /* see algorithm */
+	duk_small_int_t unequal_gaps; /* m+ != m- (very rarely) */
 
 	/* Buffer used for generated digits, values are in the range [0,B-1]. */
 	duk_uint8_t digits[DUK__MAX_OUTPUT_DIGITS];
-	duk_small_int_t count;  /* digit count */
+	duk_small_int_t count; /* digit count */
 } duk__numconv_stringify_ctx;
 
 /* Note: computes with 'idx' in assertions, so caller beware.
  * 'idx' is preincremented, i.e. '1' on first call, because it
  * is more convenient for the caller.
  */
-#define DUK__DRAGON4_OUTPUT_PREINC(nc_ctx,preinc_idx,x)  do { \
-		DUK_ASSERT((preinc_idx) - 1 >= 0); \
-		DUK_ASSERT((preinc_idx) - 1 < DUK__MAX_OUTPUT_DIGITS); \
-		((nc_ctx)->digits[(preinc_idx) - 1]) = (duk_uint8_t) (x); \
+#define DUK__DRAGON4_OUTPUT_PREINC(nc_ctx, preinc_idx, x) \
+	do { \
+		DUK_ASSERT((preinc_idx) -1 >= 0); \
+		DUK_ASSERT((preinc_idx) -1 < DUK__MAX_OUTPUT_DIGITS); \
+		((nc_ctx)->digits[(preinc_idx) -1]) = (duk_uint8_t) (x); \
 	} while (0)
 
 DUK_LOCAL duk_size_t duk__dragon4_format_uint32(duk_uint8_t *buf, duk_uint32_t x, duk_small_int_t radix) {
@@ -84688,11 +88978,11 @@ DUK_LOCAL void duk__dragon4_prepare(duk__numconv_stringify_ctx *nc_ctx) {
 			                     "lowest mantissa value for this exponent -> "
 			                     "unequal gaps"));
 
-			duk__bi_exp_small(&nc_ctx->mm, nc_ctx->b, nc_ctx->e, &nc_ctx->t1, &nc_ctx->t2);  /* mm <- b^e */
-			duk__bi_mul_small(&nc_ctx->mp, &nc_ctx->mm, (duk_uint32_t) nc_ctx->b);           /* mp <- b^(e+1) */
+			duk__bi_exp_small(&nc_ctx->mm, nc_ctx->b, nc_ctx->e, &nc_ctx->t1, &nc_ctx->t2); /* mm <- b^e */
+			duk__bi_mul_small(&nc_ctx->mp, &nc_ctx->mm, (duk_uint32_t) nc_ctx->b); /* mp <- b^(e+1) */
 			duk__bi_mul_small(&nc_ctx->t1, &nc_ctx->f, 2);
-			duk__bi_mul(&nc_ctx->r, &nc_ctx->t1, &nc_ctx->mp);              /* r <- (2 * f) * b^(e+1) */
-			duk__bi_set_small(&nc_ctx->s, (duk_uint32_t) (nc_ctx->b * 2));  /* s <- 2 * b */
+			duk__bi_mul(&nc_ctx->r, &nc_ctx->t1, &nc_ctx->mp); /* r <- (2 * f) * b^(e+1) */
+			duk__bi_set_small(&nc_ctx->s, (duk_uint32_t) (nc_ctx->b * 2)); /* s <- 2 * b */
 			nc_ctx->unequal_gaps = 1;
 		} else {
 			/* (>= e 0) AND (not (= f (expt b (- p 1))))
@@ -84712,11 +89002,11 @@ DUK_LOCAL void duk__dragon4_prepare(duk__numconv_stringify_ctx *nc_ctx) {
 			                     "not lowest mantissa for this exponent -> "
 			                     "equal gaps"));
 
-			duk__bi_exp_small(&nc_ctx->mm, nc_ctx->b, nc_ctx->e, &nc_ctx->t1, &nc_ctx->t2);  /* mm <- b^e */
-			duk__bi_copy(&nc_ctx->mp, &nc_ctx->mm);                /* mp <- b^e */
+			duk__bi_exp_small(&nc_ctx->mm, nc_ctx->b, nc_ctx->e, &nc_ctx->t1, &nc_ctx->t2); /* mm <- b^e */
+			duk__bi_copy(&nc_ctx->mp, &nc_ctx->mm); /* mp <- b^e */
 			duk__bi_mul_small(&nc_ctx->t1, &nc_ctx->f, 2);
-			duk__bi_mul(&nc_ctx->r, &nc_ctx->t1, &nc_ctx->mp);     /* r <- (2 * f) * b^e */
-			duk__bi_set_small(&nc_ctx->s, 2);                      /* s <- 2 */
+			duk__bi_mul(&nc_ctx->r, &nc_ctx->t1, &nc_ctx->mp); /* r <- (2 * f) * b^e */
+			duk__bi_set_small(&nc_ctx->s, 2); /* s <- 2 */
 		}
 	} else {
 		/* When doing string-to-number, lowest_mantissa is always 0 so
@@ -84738,9 +89028,13 @@ DUK_LOCAL void duk__dragon4_prepare(duk__numconv_stringify_ctx *nc_ctx) {
 			                     "lowest mantissa for this exponent -> "
 			                     "unequal gaps"));
 
-			duk__bi_mul_small(&nc_ctx->r, &nc_ctx->f, (duk_uint32_t) (nc_ctx->b * 2));  /* r <- (2 * b) * f */
-			duk__bi_exp_small(&nc_ctx->t1, nc_ctx->b, 1 - nc_ctx->e, &nc_ctx->s, &nc_ctx->t2);  /* NB: use 's' as temp on purpose */
-			duk__bi_mul_small(&nc_ctx->s, &nc_ctx->t1, 2);             /* s <- b^(1-e) * 2 */
+			duk__bi_mul_small(&nc_ctx->r, &nc_ctx->f, (duk_uint32_t) (nc_ctx->b * 2)); /* r <- (2 * b) * f */
+			duk__bi_exp_small(&nc_ctx->t1,
+			                  nc_ctx->b,
+			                  1 - nc_ctx->e,
+			                  &nc_ctx->s,
+			                  &nc_ctx->t2); /* NB: use 's' as temp on purpose */
+			duk__bi_mul_small(&nc_ctx->s, &nc_ctx->t1, 2); /* s <- b^(1-e) * 2 */
 			duk__bi_set_small(&nc_ctx->mp, 2);
 			duk__bi_set_small(&nc_ctx->mm, 1);
 			nc_ctx->unequal_gaps = 1;
@@ -84759,9 +89053,13 @@ DUK_LOCAL void duk__dragon4_prepare(duk__numconv_stringify_ctx *nc_ctx) {
 			                     "lowest mantissa for this exponent -> "
 			                     "equal gaps"));
 
-			duk__bi_mul_small(&nc_ctx->r, &nc_ctx->f, 2);            /* r <- 2 * f */
-			duk__bi_exp_small(&nc_ctx->t1, nc_ctx->b, -nc_ctx->e, &nc_ctx->s, &nc_ctx->t2);  /* NB: use 's' as temp on purpose */
-			duk__bi_mul_small(&nc_ctx->s, &nc_ctx->t1, 2);           /* s <- b^(-e) * 2 */
+			duk__bi_mul_small(&nc_ctx->r, &nc_ctx->f, 2); /* r <- 2 * f */
+			duk__bi_exp_small(&nc_ctx->t1,
+			                  nc_ctx->b,
+			                  -nc_ctx->e,
+			                  &nc_ctx->s,
+			                  &nc_ctx->t2); /* NB: use 's' as temp on purpose */
+			duk__bi_mul_small(&nc_ctx->s, &nc_ctx->t1, 2); /* s <- b^(-e) * 2 */
 			duk__bi_set_small(&nc_ctx->mp, 1);
 			duk__bi_set_small(&nc_ctx->mm, 1);
 		}
@@ -84793,8 +89091,8 @@ DUK_LOCAL void duk__dragon4_scale(duk__numconv_stringify_ctx *nc_ctx) {
 	 * impact for very large and very small numbers.
 	 */
 
-	DUK_DDD(DUK_DDDPRINT("scale: B=%ld, low_ok=%ld, high_ok=%ld",
-	                     (long) nc_ctx->B, (long) nc_ctx->low_ok, (long) nc_ctx->high_ok));
+	DUK_DDD(
+	    DUK_DDDPRINT("scale: B=%ld, low_ok=%ld, high_ok=%ld", (long) nc_ctx->B, (long) nc_ctx->low_ok, (long) nc_ctx->high_ok));
 	DUK__BI_PRINT("r(init)", &nc_ctx->r);
 	DUK__BI_PRINT("s(init)", &nc_ctx->s);
 	DUK__BI_PRINT("mp(init)", &nc_ctx->mp);
@@ -84807,7 +89105,7 @@ DUK_LOCAL void duk__dragon4_scale(duk__numconv_stringify_ctx *nc_ctx) {
 		DUK__BI_PRINT("m+", &nc_ctx->mp);
 		DUK__BI_PRINT("m-", &nc_ctx->mm);
 
-		duk__bi_add(&nc_ctx->t1, &nc_ctx->r, &nc_ctx->mp);  /* t1 = (+ r m+) */
+		duk__bi_add(&nc_ctx->t1, &nc_ctx->r, &nc_ctx->mp); /* t1 = (+ r m+) */
 		if (duk__bi_compare(&nc_ctx->t1, &nc_ctx->s) >= (nc_ctx->high_ok ? 0 : 1)) {
 			DUK_DDD(DUK_DDDPRINT("k is too low"));
 			/* r <- r
@@ -84836,8 +89134,8 @@ DUK_LOCAL void duk__dragon4_scale(duk__numconv_stringify_ctx *nc_ctx) {
 		DUK__BI_PRINT("m+", &nc_ctx->mp);
 		DUK__BI_PRINT("m-", &nc_ctx->mm);
 
-		duk__bi_add(&nc_ctx->t1, &nc_ctx->r, &nc_ctx->mp);  /* t1 = (+ r m+) */
-		duk__bi_mul_small(&nc_ctx->t2, &nc_ctx->t1, (duk_uint32_t) nc_ctx->B);   /* t2 = (* (+ r m+) B) */
+		duk__bi_add(&nc_ctx->t1, &nc_ctx->r, &nc_ctx->mp); /* t1 = (+ r m+) */
+		duk__bi_mul_small(&nc_ctx->t2, &nc_ctx->t1, (duk_uint32_t) nc_ctx->B); /* t2 = (* (+ r m+) B) */
 		if (duk__bi_compare(&nc_ctx->t2, &nc_ctx->s) <= (nc_ctx->high_ok ? -1 : 0)) {
 			DUK_DDD(DUK_DDDPRINT("k is too high"));
 			/* r <- (* r B)
@@ -84858,11 +89156,11 @@ DUK_LOCAL void duk__dragon4_scale(duk__numconv_stringify_ctx *nc_ctx) {
 		}
 	}
 
- skip_dec_k:
+skip_dec_k:
 
 	if (!nc_ctx->unequal_gaps) {
 		DUK_DDD(DUK_DDDPRINT("equal gaps, copy m- from m+"));
-		duk__bi_copy(&nc_ctx->mm, &nc_ctx->mp);  /* mm <- mp */
+		duk__bi_copy(&nc_ctx->mm, &nc_ctx->mp); /* mm <- mp */
 	}
 	nc_ctx->k = k;
 
@@ -84874,9 +89172,9 @@ DUK_LOCAL void duk__dragon4_scale(duk__numconv_stringify_ctx *nc_ctx) {
 }
 
 DUK_LOCAL void duk__dragon4_generate(duk__numconv_stringify_ctx *nc_ctx) {
-	duk_small_int_t tc1, tc2;    /* terminating conditions */
-	duk_small_int_t d;           /* current digit */
-	duk_small_int_t count = 0;   /* digit count */
+	duk_small_int_t tc1, tc2; /* terminating conditions */
+	duk_small_int_t d; /* current digit */
+	duk_small_int_t count = 0; /* digit count */
 
 	/*
 	 *  Digit generation loop.
@@ -84898,25 +89196,28 @@ DUK_LOCAL void duk__dragon4_generate(duk__numconv_stringify_ctx *nc_ctx) {
 
 	for (;;) {
 		DUK_DDD(DUK_DDDPRINT("generate loop, count=%ld, k=%ld, B=%ld, low_ok=%ld, high_ok=%ld",
-		                     (long) count, (long) nc_ctx->k, (long) nc_ctx->B,
-		                     (long) nc_ctx->low_ok, (long) nc_ctx->high_ok));
+		                     (long) count,
+		                     (long) nc_ctx->k,
+		                     (long) nc_ctx->B,
+		                     (long) nc_ctx->low_ok,
+		                     (long) nc_ctx->high_ok));
 		DUK__BI_PRINT("r", &nc_ctx->r);
 		DUK__BI_PRINT("s", &nc_ctx->s);
 		DUK__BI_PRINT("m+", &nc_ctx->mp);
 		DUK__BI_PRINT("m-", &nc_ctx->mm);
 
 		/* (quotient-remainder (* r B) s) using a dummy subtraction loop */
-		duk__bi_mul_small(&nc_ctx->t1, &nc_ctx->r, (duk_uint32_t) nc_ctx->B);       /* t1 <- (* r B) */
+		duk__bi_mul_small(&nc_ctx->t1, &nc_ctx->r, (duk_uint32_t) nc_ctx->B); /* t1 <- (* r B) */
 		d = 0;
 		for (;;) {
 			if (duk__bi_compare(&nc_ctx->t1, &nc_ctx->s) < 0) {
 				break;
 			}
-			duk__bi_sub_copy(&nc_ctx->t1, &nc_ctx->s, &nc_ctx->t2);  /* t1 <- t1 - s */
+			duk__bi_sub_copy(&nc_ctx->t1, &nc_ctx->s, &nc_ctx->t2); /* t1 <- t1 - s */
 			d++;
 		}
-		duk__bi_copy(&nc_ctx->r, &nc_ctx->t1);  /* r <- (remainder (* r B) s) */
-		                                        /* d <- (quotient (* r B) s)   (in range 0...B-1) */
+		duk__bi_copy(&nc_ctx->r, &nc_ctx->t1); /* r <- (remainder (* r B) s) */
+		/* d <- (quotient (* r B) s)   (in range 0...B-1) */
 		DUK_DDD(DUK_DDDPRINT("-> d(quot)=%ld", (long) d));
 		DUK__BI_PRINT("r(rem)", &nc_ctx->r);
 
@@ -84935,7 +89236,7 @@ DUK_LOCAL void duk__dragon4_generate(duk__numconv_stringify_ctx *nc_ctx) {
 			/* free-form */
 			tc1 = (duk__bi_compare(&nc_ctx->r, &nc_ctx->mm) <= (nc_ctx->low_ok ? 0 : -1));
 
-			duk__bi_add(&nc_ctx->t1, &nc_ctx->r, &nc_ctx->mp);  /* t1 <- (+ r m+) */
+			duk__bi_add(&nc_ctx->t1, &nc_ctx->r, &nc_ctx->mp); /* t1 <- (+ r m+) */
 			tc2 = (duk__bi_compare(&nc_ctx->t1, &nc_ctx->s) >= (nc_ctx->high_ok ? 0 : 1));
 
 			DUK_DDD(DUK_DDDPRINT("tc1=%ld, tc2=%ld", (long) tc1, (long) tc2));
@@ -84954,20 +89255,21 @@ DUK_LOCAL void duk__dragon4_generate(duk__numconv_stringify_ctx *nc_ctx) {
 			if (tc2) {
 				/* tc1 = true, tc2 = true */
 				duk__bi_mul_small(&nc_ctx->t1, &nc_ctx->r, 2);
-				if (duk__bi_compare(&nc_ctx->t1, &nc_ctx->s) < 0) {  /* (< (* r 2) s) */
+				if (duk__bi_compare(&nc_ctx->t1, &nc_ctx->s) < 0) { /* (< (* r 2) s) */
 					DUK_DDD(DUK_DDDPRINT("tc1=true, tc2=true, 2r > s: output d --> %ld (k=%ld)",
-					                     (long) d, (long) nc_ctx->k));
+					                     (long) d,
+					                     (long) nc_ctx->k));
 					DUK__DRAGON4_OUTPUT_PREINC(nc_ctx, count, d);
 				} else {
 					DUK_DDD(DUK_DDDPRINT("tc1=true, tc2=true, 2r <= s: output d+1 --> %ld (k=%ld)",
-					                     (long) (d + 1), (long) nc_ctx->k));
+					                     (long) (d + 1),
+					                     (long) nc_ctx->k));
 					DUK__DRAGON4_OUTPUT_PREINC(nc_ctx, count, d + 1);
 				}
 				break;
 			} else {
 				/* tc1 = true, tc2 = false */
-				DUK_DDD(DUK_DDDPRINT("tc1=true, tc2=false: output d --> %ld (k=%ld)",
-				                     (long) d, (long) nc_ctx->k));
+				DUK_DDD(DUK_DDDPRINT("tc1=true, tc2=false: output d --> %ld (k=%ld)", (long) d, (long) nc_ctx->k));
 				DUK__DRAGON4_OUTPUT_PREINC(nc_ctx, count, d);
 				break;
 			}
@@ -84975,13 +89277,13 @@ DUK_LOCAL void duk__dragon4_generate(duk__numconv_stringify_ctx *nc_ctx) {
 			if (tc2) {
 				/* tc1 = false, tc2 = true */
 				DUK_DDD(DUK_DDDPRINT("tc1=false, tc2=true: output d+1 --> %ld (k=%ld)",
-				                     (long) (d + 1), (long) nc_ctx->k));
+				                     (long) (d + 1),
+				                     (long) nc_ctx->k));
 				DUK__DRAGON4_OUTPUT_PREINC(nc_ctx, count, d + 1);
 				break;
 			} else {
 				/* tc1 = false, tc2 = false */
-				DUK_DDD(DUK_DDDPRINT("tc1=false, tc2=false: output d --> %ld (k=%ld)",
-				                     (long) d, (long) nc_ctx->k));
+				DUK_DDD(DUK_DDDPRINT("tc1=false, tc2=false: output d --> %ld (k=%ld)", (long) d, (long) nc_ctx->k));
 				DUK__DRAGON4_OUTPUT_PREINC(nc_ctx, count, d);
 
 				/* r <- r    (updated above: r <- (remainder (* r B) s)
@@ -84998,23 +89300,28 @@ DUK_LOCAL void duk__dragon4_generate(duk__numconv_stringify_ctx *nc_ctx) {
 		/* fixed-format termination conditions */
 		if (nc_ctx->is_fixed) {
 			if (nc_ctx->abs_pos) {
-				int pos = nc_ctx->k - count + 1;  /* count is already incremented, take into account */
+				int pos = nc_ctx->k - count + 1; /* count is already incremented, take into account */
 				DUK_DDD(DUK_DDDPRINT("fixed format, absolute: abs pos=%ld, k=%ld, count=%ld, req=%ld",
-				                     (long) pos, (long) nc_ctx->k, (long) count, (long) nc_ctx->req_digits));
+				                     (long) pos,
+				                     (long) nc_ctx->k,
+				                     (long) count,
+				                     (long) nc_ctx->req_digits));
 				if (pos <= nc_ctx->req_digits) {
 					DUK_DDD(DUK_DDDPRINT("digit position reached req_digits, end generate loop"));
 					break;
 				}
 			} else {
 				DUK_DDD(DUK_DDDPRINT("fixed format, relative: k=%ld, count=%ld, req=%ld",
-				                     (long) nc_ctx->k, (long) count, (long) nc_ctx->req_digits));
+				                     (long) nc_ctx->k,
+				                     (long) count,
+				                     (long) nc_ctx->req_digits));
 				if (count >= nc_ctx->req_digits) {
 					DUK_DDD(DUK_DDDPRINT("digit count reached req_digits, end generate loop"));
 					break;
 				}
 			}
 		}
-	}  /* for */
+	} /* for */
 
 	nc_ctx->count = count;
 
@@ -85033,8 +89340,7 @@ DUK_LOCAL void duk__dragon4_generate(duk__numconv_stringify_ctx *nc_ctx) {
 				buf[i] = (duk_uint8_t) DUK__DIGITCHAR(t);
 			}
 		}
-		DUK_DDD(DUK_DDDPRINT("-> generated digits; k=%ld, digits='%s'",
-		                     (long) nc_ctx->k, (const char *) buf));
+		DUK_DDD(DUK_DDDPRINT("-> generated digits; k=%ld, digits='%s'", (long) nc_ctx->k, (const char *) buf));
 	}
 #endif
 }
@@ -85063,11 +89369,11 @@ DUK_LOCAL duk_small_int_t duk__dragon4_fixed_format_round(duk__numconv_stringify
 
 	if (round_idx >= nc_ctx->count) {
 		DUK_DDD(DUK_DDDPRINT("round_idx out of bounds (%ld >= %ld (count)) -> no rounding",
-		                     (long) round_idx, (long) nc_ctx->count));
+		                     (long) round_idx,
+		                     (long) nc_ctx->count));
 		return 0;
 	} else if (round_idx < 0) {
-		DUK_DDD(DUK_DDDPRINT("round_idx out of bounds (%ld < 0) -> no rounding",
-		                     (long) round_idx));
+		DUK_DDD(DUK_DDDPRINT("round_idx out of bounds (%ld < 0) -> no rounding", (long) round_idx));
 		return 0;
 	}
 
@@ -85092,15 +89398,18 @@ DUK_LOCAL duk_small_int_t duk__dragon4_fixed_format_round(duk__numconv_stringify
 				duk_memmove((void *) (&nc_ctx->digits[1]),
 				            (const void *) (&nc_ctx->digits[0]),
 				            (size_t) (sizeof(char) * (size_t) nc_ctx->count));
-				nc_ctx->digits[0] = 1;  /* don't increase 'count' */
-				nc_ctx->k++;  /* position of highest digit changed */
-				nc_ctx->count++;  /* number of digits changed */
+				nc_ctx->digits[0] = 1; /* don't increase 'count' */
+				nc_ctx->k++; /* position of highest digit changed */
+				nc_ctx->count++; /* number of digits changed */
 				ret = 1;
 				break;
 			}
 
 			DUK_DDD(DUK_DDDPRINT("fixed-format rounding carry: B=%ld, roundup_limit=%ld, p=%p, digits=%p",
-			                     (long) nc_ctx->B, (long) roundup_limit, (void *) p, (void *) nc_ctx->digits));
+			                     (long) nc_ctx->B,
+			                     (long) roundup_limit,
+			                     (void *) p,
+			                     (void *) nc_ctx->digits));
 			p--;
 			t = *p;
 			DUK_DDD(DUK_DDDPRINT("digit before carry: %ld", (long) t));
@@ -85117,7 +89426,7 @@ DUK_LOCAL duk_small_int_t duk__dragon4_fixed_format_round(duk__numconv_stringify
 	return ret;
 }
 
-#define DUK__NO_EXP  (65536)  /* arbitrary marker, outside valid exp range */
+#define DUK__NO_EXP (65536) /* arbitrary marker, outside valid exp range */
 
 DUK_LOCAL void duk__dragon4_convert_and_push(duk__numconv_stringify_ctx *nc_ctx,
                                              duk_hthread *thr,
@@ -85160,7 +89469,7 @@ DUK_LOCAL void duk__dragon4_convert_and_push(duk__numconv_stringify_ctx *nc_ctx,
 	DUK_ASSERT(nc_ctx->count >= 1);
 
 	k = nc_ctx->k;
-	buf = (duk_uint8_t *) &nc_ctx->f;  /* XXX: union would be more correct */
+	buf = (duk_uint8_t *) &nc_ctx->f; /* XXX: union would be more correct */
 	q = buf;
 
 	/* Exponent handling: if exponent format is used, record exponent value and
@@ -85172,14 +89481,13 @@ DUK_LOCAL void duk__dragon4_convert_and_push(duk__numconv_stringify_ctx *nc_ctx,
 
 	expt = DUK__NO_EXP;
 	if (!nc_ctx->abs_pos /* toFixed() */) {
-		if ((flags & DUK_N2S_FLAG_FORCE_EXP) ||             /* exponential notation forced */
-		    ((flags & DUK_N2S_FLAG_NO_ZERO_PAD) &&          /* fixed precision and zero padding would be required */
-	             (k - digits >= 1)) ||                          /* (e.g. k=3, digits=2 -> "12X") */
-		    ((k > 21 || k <= -6) && (radix == 10))) {       /* toString() conditions */
-			DUK_DDD(DUK_DDDPRINT("use exponential notation: k=%ld -> expt=%ld",
-			                     (long) k, (long) (k - 1)));
-			expt = k - 1;  /* e.g. 12.3 -> digits="123" k=2 -> 1.23e1 */
-			k = 1;  /* generate mantissa with a single leading whole number digit */
+		if ((flags & DUK_N2S_FLAG_FORCE_EXP) || /* exponential notation forced */
+		    ((flags & DUK_N2S_FLAG_NO_ZERO_PAD) && /* fixed precision and zero padding would be required */
+		     (k - digits >= 1)) || /* (e.g. k=3, digits=2 -> "12X") */
+		    ((k > 21 || k <= -6) && (radix == 10))) { /* toString() conditions */
+			DUK_DDD(DUK_DDDPRINT("use exponential notation: k=%ld -> expt=%ld", (long) k, (long) (k - 1)));
+			expt = k - 1; /* e.g. 12.3 -> digits="123" k=2 -> 1.23e1 */
+			k = 1; /* generate mantissa with a single leading whole number digit */
 		}
 	}
 
@@ -85205,13 +89513,18 @@ DUK_LOCAL void duk__dragon4_convert_and_push(duk__numconv_stringify_ctx *nc_ctx,
 
 	DUK_DDD(DUK_DDDPRINT("expt=%ld, k=%ld, count=%ld, pos=%ld, pos_end=%ld, is_fixed=%ld, "
 	                     "digits=%ld, abs_pos=%ld",
-	                     (long) expt, (long) k, (long) nc_ctx->count, (long) pos, (long) pos_end,
-	                     (long) nc_ctx->is_fixed, (long) digits, (long) nc_ctx->abs_pos));
+	                     (long) expt,
+	                     (long) k,
+	                     (long) nc_ctx->count,
+	                     (long) pos,
+	                     (long) pos_end,
+	                     (long) nc_ctx->is_fixed,
+	                     (long) digits,
+	                     (long) nc_ctx->abs_pos));
 
 	/* Digit generation */
 	while (pos > pos_end) {
-		DUK_DDD(DUK_DDDPRINT("digit generation: pos=%ld, pos_end=%ld",
-		                     (long) pos, (long) pos_end));
+		DUK_DDD(DUK_DDDPRINT("digit generation: pos=%ld, pos_end=%ld", (long) pos, (long) pos_end));
 		if (pos == 0) {
 			*q++ = (duk_uint8_t) '.';
 		}
@@ -85304,7 +89617,7 @@ DUK_LOCAL void duk__dragon4_double_to_ctx(duk__numconv_stringify_ctx *nc_ctx, du
 		/* normal: implicit leading 1-bit */
 		nc_ctx->f.v[1] |= 0x00100000UL;
 		expt = expt - DUK__IEEE_DOUBLE_EXP_BIAS - 52;
-		DUK_ASSERT(duk__bi_is_valid(&nc_ctx->f));  /* true, because v[1] has at least one bit set */
+		DUK_ASSERT(duk__bi_is_valid(&nc_ctx->f)); /* true, because v[1] has at least one bit set */
 	}
 
 	DUK_ASSERT(duk__bi_is_valid(&nc_ctx->f));
@@ -85327,7 +89640,7 @@ DUK_LOCAL void duk__dragon4_ctx_to_double(duk__numconv_stringify_ctx *nc_ctx, du
 	/* Sometimes this assert is not true right now; it will be true after
 	 * rounding.  See: test-bug-numconv-mantissa-assert.js.
 	 */
-	DUK_ASSERT_DISABLE(nc_ctx->digits[0] == 1);  /* zero handled by caller */
+	DUK_ASSERT_DISABLE(nc_ctx->digits[0] == 1); /* zero handled by caller */
 
 	/* Should not be required because the code below always sets both high
 	 * and low parts, but at least gcc-4.4.5 fails to deduce this correctly
@@ -85372,31 +89685,30 @@ DUK_LOCAL void duk__dragon4_ctx_to_double(duk__numconv_stringify_ctx *nc_ctx, du
 
 	skip_round = 0;
 
- recheck_exp:
+recheck_exp:
 
-	expt = nc_ctx->k - 1;   /* IEEE exp without bias */
+	expt = nc_ctx->k - 1; /* IEEE exp without bias */
 	if (expt > 1023) {
 		/* Infinity */
-		bitstart = -255;  /* needed for inf: causes mantissa to become zero,
-		                   * and rounding to be skipped.
-		                   */
+		bitstart = -255; /* needed for inf: causes mantissa to become zero,
+		                  * and rounding to be skipped.
+		                  */
 		expt = 2047;
 	} else if (expt >= -1022) {
 		/* normal */
-		bitstart = 1;  /* skip leading digit */
+		bitstart = 1; /* skip leading digit */
 		expt += DUK__IEEE_DOUBLE_EXP_BIAS;
 		DUK_ASSERT(expt >= 1 && expt <= 2046);
 	} else {
 		/* denormal or zero */
-		bitstart = 1023 + expt;  /* expt==-1023 -> bitstart=0 (leading 1);
-		                          * expt==-1024 -> bitstart=-1 (one left of leading 1), etc
-		                          */
+		bitstart = 1023 + expt; /* expt==-1023 -> bitstart=0 (leading 1);
+		                         * expt==-1024 -> bitstart=-1 (one left of leading 1), etc
+		                         */
 		expt = 0;
 	}
 	bitround = bitstart + 52;
 
-	DUK_DDD(DUK_DDDPRINT("ieee expt=%ld, bitstart=%ld, bitround=%ld",
-	                     (long) expt, (long) bitstart, (long) bitround));
+	DUK_DDD(DUK_DDDPRINT("ieee expt=%ld, bitstart=%ld, bitround=%ld", (long) expt, (long) bitstart, (long) bitround));
 
 	if (!skip_round) {
 		if (duk__dragon4_fixed_format_round(nc_ctx, bitround)) {
@@ -85434,13 +89746,11 @@ DUK_LOCAL void duk__dragon4_ctx_to_double(duk__numconv_stringify_ctx *nc_ctx, du
 	}
 	/* t has high mantissa */
 
-	DUK_DDD(DUK_DDDPRINT("mantissa is complete: %08lx %08lx",
-	                     (unsigned long) t,
-	                     (unsigned long) DUK_DBLUNION_GET_LOW32(&u)));
+	DUK_DDD(DUK_DDDPRINT("mantissa is complete: %08lx %08lx", (unsigned long) t, (unsigned long) DUK_DBLUNION_GET_LOW32(&u)));
 
 	DUK_ASSERT(expt >= 0 && expt <= 0x7ffL);
 	t += ((duk_uint32_t) expt) << 20;
-#if 0  /* caller handles sign change */
+#if 0 /* caller handles sign change */
 	if (negative) {
 		t |= 0x80000000U;
 	}
@@ -85461,12 +89771,15 @@ DUK_LOCAL void duk__dragon4_ctx_to_double(duk__numconv_stringify_ctx *nc_ctx, du
  *  Output: [ string ]
  */
 
-DUK_INTERNAL void duk_numconv_stringify(duk_hthread *thr, duk_small_int_t radix, duk_small_int_t digits, duk_small_uint_t flags) {
+DUK_LOCAL DUK_NOINLINE void duk__numconv_stringify_raw(duk_hthread *thr,
+                                                       duk_small_int_t radix,
+                                                       duk_small_int_t digits,
+                                                       duk_small_uint_t flags) {
 	duk_double_t x;
 	duk_small_int_t c;
 	duk_small_int_t neg;
 	duk_uint32_t uval;
-	duk__numconv_stringify_ctx nc_ctx_alloc;  /* large context; around 2kB now */
+	duk__numconv_stringify_ctx nc_ctx_alloc; /* large context; around 2kB now */
 	duk__numconv_stringify_ctx *nc_ctx = &nc_ctx_alloc;
 
 	x = (duk_double_t) duk_require_number(thr, -1);
@@ -85518,13 +89831,13 @@ DUK_INTERNAL void duk_numconv_stringify(duk_hthread *thr, duk_small_int_t radix,
 	 */
 
 	uval = duk_double_to_uint32_t(x);
-	if (((double) uval) == x &&  /* integer number in range */
-	    flags == 0) {            /* no special formatting */
+	if (duk_double_equals((double) uval, x) && /* integer number in range */
+	    flags == 0) { /* no special formatting */
 		/* use bigint area as a temp */
 		duk_uint8_t *buf = (duk_uint8_t *) (&nc_ctx->f);
 		duk_uint8_t *p = buf;
 
-		DUK_ASSERT(DUK__NUMCONV_CTX_BIGINTS_SIZE >= 32 + 1);  /* max size: radix=2 + sign */
+		DUK_ASSERT(DUK__NUMCONV_CTX_BIGINTS_SIZE >= 32 + 1); /* max size: radix=2 + sign */
 		if (neg && uval != 0) {
 			/* no negative sign for zero */
 			*p++ = (duk_uint8_t) '-';
@@ -85580,9 +89893,9 @@ DUK_INTERNAL void duk_numconv_stringify(duk_hthread *thr, duk_small_int_t radix,
 		duk_small_int_t count;
 		if (nc_ctx->is_fixed) {
 			if (nc_ctx->abs_pos) {
-				count = digits + 2;  /* lead zero + 'digits' fractions + 1 for rounding */
+				count = digits + 2; /* lead zero + 'digits' fractions + 1 for rounding */
 			} else {
-				count = digits + 1;  /* + 1 for rounding */
+				count = digits + 1; /* + 1 for rounding */
 			}
 		} else {
 			count = 1;
@@ -85591,12 +89904,12 @@ DUK_INTERNAL void duk_numconv_stringify(duk_hthread *thr, duk_small_int_t radix,
 		DUK_ASSERT(count >= 1);
 		duk_memzero((void *) nc_ctx->digits, (size_t) count);
 		nc_ctx->count = count;
-		nc_ctx->k = 1;  /* 0.000... */
+		nc_ctx->k = 1; /* 0.000... */
 		neg = 0;
 		goto zero_skip;
 	}
 
-	duk__dragon4_double_to_ctx(nc_ctx, x);   /* -> sets 'f' and 'e' */
+	duk__dragon4_double_to_ctx(nc_ctx, x); /* -> sets 'f' and 'e' */
 	DUK__BI_PRINT("f", &nc_ctx->f);
 	DUK_DDD(DUK_DDDPRINT("e=%ld", (long) nc_ctx->e));
 
@@ -85604,7 +89917,7 @@ DUK_INTERNAL void duk_numconv_stringify(duk_hthread *thr, duk_small_int_t radix,
 	 *  Dragon4 slow path digit generation.
 	 */
 
-	duk__dragon4_prepare(nc_ctx);  /* setup many variables in nc_ctx */
+	duk__dragon4_prepare(nc_ctx); /* setup many variables in nc_ctx */
 
 	DUK_DDD(DUK_DDDPRINT("after prepare:"));
 	DUK__BI_PRINT("r", &nc_ctx->r);
@@ -85626,7 +89939,7 @@ DUK_INTERNAL void duk_numconv_stringify(duk_hthread *thr, duk_small_int_t radix,
 	 *  Convert and push final string.
 	 */
 
- zero_skip:
+zero_skip:
 
 	if (flags & DUK_N2S_FLAG_FIXED_FORMAT) {
 		/* Perform fixed-format rounding. */
@@ -85635,13 +89948,16 @@ DUK_INTERNAL void duk_numconv_stringify(duk_hthread *thr, duk_small_int_t radix,
 			/* 'roundpos' is relative to nc_ctx->k and increases to the right
 			 * (opposite of how 'k' changes).
 			 */
-			roundpos = -digits;  /* absolute position for digit considered for rounding */
+			roundpos = -digits; /* absolute position for digit considered for rounding */
 			roundpos = nc_ctx->k - roundpos;
 		} else {
 			roundpos = digits;
 		}
 		DUK_DDD(DUK_DDDPRINT("rounding: k=%ld, count=%ld, digits=%ld, roundpos=%ld",
-		                     (long) nc_ctx->k, (long) nc_ctx->count, (long) digits, (long) roundpos));
+		                     (long) nc_ctx->k,
+		                     (long) nc_ctx->count,
+		                     (long) digits,
+		                     (long) roundpos));
 		(void) duk__dragon4_fixed_format_round(nc_ctx, roundpos);
 
 		/* Note: 'count' is currently not adjusted by rounding (i.e. the
@@ -85654,6 +89970,11 @@ DUK_INTERNAL void duk_numconv_stringify(duk_hthread *thr, duk_small_int_t radix,
 	duk__dragon4_convert_and_push(nc_ctx, thr, radix, digits, flags, neg);
 }
 
+DUK_INTERNAL void duk_numconv_stringify(duk_hthread *thr, duk_small_int_t radix, duk_small_int_t digits, duk_small_uint_t flags) {
+	duk_native_stack_check(thr);
+	duk__numconv_stringify_raw(thr, radix, digits, flags);
+}
+
 /*
  *  Exposed string-to-number API
  *
@@ -85664,8 +89985,8 @@ DUK_INTERNAL void duk_numconv_stringify(duk_hthread *thr, duk_small_int_t radix,
  *  fails due to an internal error, an InternalError is thrown.
  */
 
-DUK_INTERNAL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk_small_uint_t flags) {
-	duk__numconv_stringify_ctx nc_ctx_alloc;  /* large context; around 2kB now */
+DUK_LOCAL DUK_NOINLINE void duk__numconv_parse_raw(duk_hthread *thr, duk_small_int_t radix, duk_small_uint_t flags) {
+	duk__numconv_stringify_ctx nc_ctx_alloc; /* large context; around 2kB now */
 	duk__numconv_stringify_ctx *nc_ctx = &nc_ctx_alloc;
 	duk_double_t res;
 	duk_hstring *h_str;
@@ -85685,7 +90006,8 @@ DUK_INTERNAL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk
 
 	DUK_DDD(DUK_DDDPRINT("parse number: %!T, radix=%ld, flags=0x%08lx",
 	                     (duk_tval *) duk_get_tval(thr, -1),
-	                     (long) radix, (unsigned long) flags));
+	                     (long) radix,
+	                     (unsigned long) flags));
 
 	DUK_ASSERT(radix >= 2 && radix <= 36);
 	DUK_ASSERT(radix - 2 < (duk_small_int_t) sizeof(duk__str2num_digits_for_radix));
@@ -85758,7 +90080,7 @@ DUK_INTERNAL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk
 	ch = *p;
 	if (ch == (duk_small_int_t) '0') {
 		duk_small_int_t detect_radix = 0;
-		ch = DUK_LOWERCASE_CHAR_ASCII(p[1]);  /* 'x' or 'X' -> 'x' */
+		ch = DUK_LOWERCASE_CHAR_ASCII(p[1]); /* 'x' or 'X' -> 'x' */
 		if ((flags & DUK_S2N_FLAG_ALLOW_AUTO_HEX_INT) && ch == DUK_ASC_LC_X) {
 			DUK_DDD(DUK_DDDPRINT("detected 0x/0X hex prefix, changing radix and preventing fractions and exponent"));
 			detect_radix = 16;
@@ -85785,10 +90107,9 @@ DUK_INTERNAL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk
 		if (detect_radix > 0) {
 			radix = detect_radix;
 			/* Clear empty as zero flag: interpret e.g. '0x' and '0xg' as a NaN (= parse error) */
-			flags &= ~(DUK_S2N_FLAG_ALLOW_EXP | DUK_S2N_FLAG_ALLOW_EMPTY_FRAC |
-			           DUK_S2N_FLAG_ALLOW_FRAC | DUK_S2N_FLAG_ALLOW_NAKED_FRAC |
-			           DUK_S2N_FLAG_ALLOW_EMPTY_AS_ZERO);
-			flags |= DUK_S2N_FLAG_ALLOW_LEADING_ZERO;  /* allow e.g. '0x0009' and '0b00010001' */
+			flags &= ~(DUK_S2N_FLAG_ALLOW_EXP | DUK_S2N_FLAG_ALLOW_EMPTY_FRAC | DUK_S2N_FLAG_ALLOW_FRAC |
+			           DUK_S2N_FLAG_ALLOW_NAKED_FRAC | DUK_S2N_FLAG_ALLOW_EMPTY_AS_ZERO);
+			flags |= DUK_S2N_FLAG_ALLOW_LEADING_ZERO; /* allow e.g. '0x0009' and '0b00010001' */
 			p += 2;
 		}
 	}
@@ -85846,16 +90167,23 @@ DUK_INTERNAL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk
 	dig_frac = -1;
 	dig_expt = -1;
 	expt = 0;
-	expt_adj = 0;  /* essentially tracks digit position of lowest 'f' digit */
+	expt_adj = 0; /* essentially tracks digit position of lowest 'f' digit */
 	expt_neg = 0;
 	for (;;) {
 		ch = *p++;
 
 		DUK_DDD(DUK_DDDPRINT("parse digits: p=%p, ch='%c' (%ld), expt=%ld, expt_adj=%ld, "
 		                     "dig_whole=%ld, dig_frac=%ld, dig_expt=%ld, dig_lzero=%ld, dig_prec=%ld",
-		                     (const void *) p, (int) ((ch >= 0x20 && ch <= 0x7e) ? ch : '?'), (long) ch,
-		                     (long) expt, (long) expt_adj, (long) dig_whole, (long) dig_frac,
-		                     (long) dig_expt, (long) dig_lzero, (long) dig_prec));
+		                     (const void *) p,
+		                     (int) ((ch >= 0x20 && ch <= 0x7e) ? ch : '?'),
+		                     (long) ch,
+		                     (long) expt,
+		                     (long) expt_adj,
+		                     (long) dig_whole,
+		                     (long) dig_frac,
+		                     (long) dig_expt,
+		                     (long) dig_lzero,
+		                     (long) dig_prec));
 		DUK__BI_PRINT("f", &nc_ctx->f);
 
 		/* Most common cases first. */
@@ -85894,8 +90222,8 @@ DUK_INTERNAL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk
 		} else if (ch == (duk_small_int_t) 0) {
 			DUK_DDD(DUK_DDDPRINT("NUL termination"));
 			break;
-		} else if ((flags & DUK_S2N_FLAG_ALLOW_EXP) &&
-		           dig_expt < 0 && (ch == (duk_small_int_t) 'e' || ch == (duk_small_int_t) 'E')) {
+		} else if ((flags & DUK_S2N_FLAG_ALLOW_EXP) && dig_expt < 0 &&
+		           (ch == (duk_small_int_t) 'e' || ch == (duk_small_int_t) 'E')) {
 			/* Note: we don't parse back exponent notation for anything else
 			 * than radix 10, so this is not an ambiguous check (e.g. hex
 			 * exponent values may have 'e' either as a significand digit
@@ -85925,7 +90253,7 @@ DUK_INTERNAL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk
 		} else if (ch >= (duk_small_int_t) 'A' && ch <= (duk_small_int_t) 'Z') {
 			dig = (duk_small_int_t) (ch - (duk_small_int_t) 'A' + 0x0a);
 		} else {
-			dig = 255;  /* triggers garbage digit check below */
+			dig = 255; /* triggers garbage digit check below */
 		}
 		DUK_ASSERT((dig >= 0 && dig <= 35) || dig == 255);
 
@@ -86014,10 +90342,17 @@ DUK_INTERNAL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk
 				goto parse_fail;
 			}
 		} else {
-			/* empty ("") is allowed in some formats (e.g. Number(''), as zero */
+			/* Empty ("") is allowed in some formats (e.g. Number(''), as zero,
+			 * but it must not have a leading +/- sign (GH-2019).  Note that
+			 * for Number(), h_str is already trimmed so we can check for zero
+			 * length and still get Number('  +  ') == NaN.
+			 */
 			if ((flags & DUK_S2N_FLAG_ALLOW_EMPTY_AS_ZERO) == 0) {
 				DUK_DDD(DUK_DDDPRINT("parse failed: empty string not allowed (as zero)"));
 				goto parse_fail;
+			} else if (DUK_HSTRING_GET_BYTELEN(h_str) != 0) {
+				DUK_DDD(DUK_DDDPRINT("parse failed: no digits, but not empty (had a +/- sign)"));
+				goto parse_fail;
 			}
 		}
 	} else {
@@ -86051,14 +90386,14 @@ DUK_INTERNAL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk
 	if (expt_neg) {
 		expt = -expt;
 	}
-	DUK_DDD(DUK_DDDPRINT("expt=%ld, expt_adj=%ld, net exponent -> %ld",
-	                     (long) expt, (long) expt_adj, (long) (expt + expt_adj)));
+	DUK_DDD(
+	    DUK_DDDPRINT("expt=%ld, expt_adj=%ld, net exponent -> %ld", (long) expt, (long) expt_adj, (long) (expt + expt_adj)));
 	expt += expt_adj;
 
 	/* Fast path check. */
 
-	if (nc_ctx->f.n <= 1 &&   /* 32-bit value */
-	    expt == 0    /* no net exponent */) {
+	if (nc_ctx->f.n <= 1 && /* 32-bit value */
+	    expt == 0 /* no net exponent */) {
 		/* Fast path is triggered for no exponent and also for balanced exponent
 		 * and fraction parts, e.g. for "1.23e2" == "123".  Remember to respect
 		 * zero sign.
@@ -86100,7 +90435,6 @@ DUK_INTERNAL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk
 		goto negcheck_and_ret;
 	}
 
-
 	/* Quick reject of too large or too small exponents.  This check
 	 * would be incorrect for zero (e.g. "0e1000" is zero, not Infinity)
 	 * so zero check must be above.
@@ -86133,7 +90467,7 @@ DUK_INTERNAL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk
 	 *  An extra digit is generated for rounding.
 	 */
 
-	duk__dragon4_prepare(nc_ctx);  /* setup many variables in nc_ctx */
+	duk__dragon4_prepare(nc_ctx); /* setup many variables in nc_ctx */
 
 	DUK_DDD(DUK_DDDPRINT("after prepare:"));
 	DUK__BI_PRINT("r", &nc_ctx->r);
@@ -86165,7 +90499,7 @@ DUK_INTERNAL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk
 	duk__dragon4_ctx_to_double(nc_ctx, &res);
 	goto negcheck_and_ret;
 
- negcheck_and_ret:
+negcheck_and_ret:
 	if (neg) {
 		res = -res;
 	}
@@ -86174,18 +90508,23 @@ DUK_INTERNAL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk
 	DUK_DDD(DUK_DDDPRINT("result: %!T", (duk_tval *) duk_get_tval(thr, -1)));
 	return;
 
- parse_fail:
+parse_fail:
 	DUK_DDD(DUK_DDDPRINT("parse failed"));
 	duk_pop(thr);
 	duk_push_nan(thr);
 	return;
 
- parse_explimit_error:
+parse_explimit_error:
 	DUK_DDD(DUK_DDDPRINT("parse failed, internal error, can't return a value"));
 	DUK_ERROR_RANGE(thr, "exponent too large");
 	DUK_WO_NORETURN(return;);
 }
 
+DUK_INTERNAL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk_small_uint_t flags) {
+	duk_native_stack_check(thr);
+	duk__numconv_parse_raw(thr, radix, flags);
+}
+
 /* automatic undefs */
 #undef DUK__BI_MAX_PARTS
 #undef DUK__BI_PRINT
@@ -86228,8 +90567,7 @@ DUK_INTERNAL void duk_numconv_parse(duk_hthread *thr, duk_small_int_t radix, duk
 
 #define DUK__RE_INITIAL_BUFSIZE 64
 
-#define DUK__RE_BUFLEN(re_ctx) \
-	DUK_BW_GET_SIZE(re_ctx->thr, &re_ctx->bw)
+#define DUK__RE_BUFLEN(re_ctx) DUK_BW_GET_SIZE(re_ctx->thr, &re_ctx->bw)
 
 /*
  *  Disjunction struct: result of parsing a disjunction
@@ -86319,7 +90657,7 @@ DUK_LOCAL void duk__append_reop(duk_re_compiler_ctx *re_ctx, duk_uint32_t reop)
 	(void) duk__append_7bit(re_ctx, reop);
 }
 
-#if 0  /* unused */
+#if 0 /* unused */
 DUK_LOCAL void duk__append_i32(duk_re_compiler_ctx *re_ctx, duk_int32_t x) {
 	duk__append_u32(re_ctx, duk__encode_i32(x));
 }
@@ -86333,7 +90671,10 @@ DUK_LOCAL void duk__append_u16_list(duk_re_compiler_ctx *re_ctx, const duk_uint1
 	}
 }
 
-DUK_LOCAL void duk__insert_slice(duk_re_compiler_ctx *re_ctx, duk_uint32_t offset, duk_uint32_t data_offset, duk_uint32_t data_length) {
+DUK_LOCAL void duk__insert_slice(duk_re_compiler_ctx *re_ctx,
+                                 duk_uint32_t offset,
+                                 duk_uint32_t data_offset,
+                                 duk_uint32_t data_length) {
 	DUK_BW_INSERT_ENSURE_SLICE(re_ctx->thr, &re_ctx->bw, offset, data_offset, data_length);
 }
 
@@ -86396,7 +90737,7 @@ DUK_LOCAL duk_uint32_t duk__insert_jump_offset(duk_re_compiler_ctx *re_ctx, duk_
 			skip--;
 		}
 	}
-#else  /* DUK_USE_PREFER_SIZE */
+#else /* DUK_USE_PREFER_SIZE */
 	/* Closed form solution, this produces fastest code.
 	 * See re_neg_jump_offset (closed1).
 	 */
@@ -86417,7 +90758,7 @@ DUK_LOCAL duk_uint32_t duk__insert_jump_offset(duk_re_compiler_ctx *re_ctx, duk_
 			skip -= 7;
 		}
 	}
-#endif  /* DUK_USE_PREFER_SIZE */
+#endif /* DUK_USE_PREFER_SIZE */
 
 	return duk__insert_i32(re_ctx, offset, skip);
 }
@@ -86550,10 +90891,10 @@ DUK_LOCAL duk_codepoint_t duk__re_canon_next_discontinuity(duk_codepoint_t start
 			}
 		}
 	}
-	DUK_ASSERT(blk == end_blk + 1);  /* Reached end block which is continuous. */
+	DUK_ASSERT(blk == end_blk + 1); /* Reached end block which is continuous. */
 	return end;
 }
-#else  /* DUK_USE_REGEXP_CANON_BITMAP */
+#else /* DUK_USE_REGEXP_CANON_BITMAP */
 DUK_LOCAL duk_codepoint_t duk__re_canon_next_discontinuity(duk_codepoint_t start, duk_codepoint_t end) {
 	DUK_ASSERT(start >= 0);
 	DUK_ASSERT(end >= 0);
@@ -86564,7 +90905,7 @@ DUK_LOCAL duk_codepoint_t duk__re_canon_next_discontinuity(duk_codepoint_t start
 	}
 	return start;
 }
-#endif  /* DUK_USE_REGEXP_CANON_BITMAP */
+#endif /* DUK_USE_REGEXP_CANON_BITMAP */
 
 DUK_LOCAL void duk__regexp_generate_ranges(void *userdata, duk_codepoint_t r1, duk_codepoint_t r2, duk_bool_t direct) {
 	duk_re_compiler_ctx *re_ctx = (duk_re_compiler_ctx *) userdata;
@@ -86575,9 +90916,12 @@ DUK_LOCAL void duk__regexp_generate_ranges(void *userdata, duk_codepoint_t r1, d
 	duk_codepoint_t r_disc;
 
 	DUK_DD(DUK_DDPRINT("duk__regexp_generate_ranges(): re_ctx=%p, range=[%ld,%ld] direct=%ld",
-	                   (void *) re_ctx, (long) r1, (long) r2, (long) direct));
+	                   (void *) re_ctx,
+	                   (long) r1,
+	                   (long) r2,
+	                   (long) direct));
 
-	DUK_ASSERT(r2 >= r1);  /* SyntaxError for out of order range. */
+	DUK_ASSERT(r2 >= r1); /* SyntaxError for out of order range. */
 
 	if (direct || (re_ctx->re_flags & DUK_RE_FLAG_IGNORE_CASE) == 0) {
 		DUK_DD(DUK_DDPRINT("direct or not case sensitive, emit range: [%ld,%ld]", (long) r1, (long) r2));
@@ -86599,7 +90943,7 @@ DUK_LOCAL void duk__regexp_generate_ranges(void *userdata, duk_codepoint_t r1, d
 		DUK_ASSERT(r_disc >= i);
 		DUK_ASSERT(r_disc <= r2);
 
-		r_end += r_disc - i;  /* May be zero. */
+		r_end += r_disc - i; /* May be zero. */
 		t = duk_unicode_re_canonicalize_char(re_ctx->thr, r_disc);
 		if (t == r_end + 1) {
 			/* Not actually a discontinuity, continue range
@@ -86611,11 +90955,11 @@ DUK_LOCAL void duk__regexp_generate_ranges(void *userdata, duk_codepoint_t r1, d
 			r_start = t;
 			r_end = t;
 		}
-		i = r_disc + 1;  /* Guarantees progress. */
+		i = r_disc + 1; /* Guarantees progress. */
 	}
 	duk__regexp_emit_range(re_ctx, r_start, r_end);
 
-#if 0  /* Exhaustive search, very slow. */
+#if 0 /* Exhaustive search, very slow. */
 	r_start = duk_unicode_re_canonicalize_char(re_ctx->thr, r1);
 	r_end = r_start;
 	for (i = r1 + 1; i <= r2; i++) {
@@ -86688,18 +91032,17 @@ DUK_LOCAL void duk__regexp_generate_ranges(void *userdata, duk_codepoint_t r1, d
  *      as complex though.
  */
 
-DUK_LOCAL const duk_uint16_t * const duk__re_range_lookup1[3] = {
-	duk_unicode_re_ranges_digit,
-	duk_unicode_re_ranges_white,
-	duk_unicode_re_ranges_wordchar
-};
-DUK_LOCAL const duk_uint8_t duk__re_range_lookup2[3] = {
-	sizeof(duk_unicode_re_ranges_digit) / (2 * sizeof(duk_uint16_t)),
-	sizeof(duk_unicode_re_ranges_white) / (2 * sizeof(duk_uint16_t)),
-	sizeof(duk_unicode_re_ranges_wordchar) / (2 * sizeof(duk_uint16_t))
-};
+DUK_LOCAL const duk_uint16_t * const duk__re_range_lookup1[3] = { duk_unicode_re_ranges_digit,
+	                                                          duk_unicode_re_ranges_white,
+	                                                          duk_unicode_re_ranges_wordchar };
+DUK_LOCAL const duk_uint8_t duk__re_range_lookup2[3] = { sizeof(duk_unicode_re_ranges_digit) / (2 * sizeof(duk_uint16_t)),
+	                                                 sizeof(duk_unicode_re_ranges_white) / (2 * sizeof(duk_uint16_t)),
+	                                                 sizeof(duk_unicode_re_ranges_wordchar) / (2 * sizeof(duk_uint16_t)) };
 
-DUK_LOCAL void duk__append_range_atom_matcher(duk_re_compiler_ctx *re_ctx, duk_small_uint_t re_op, const duk_uint16_t *ranges, duk_small_uint_t count) {
+DUK_LOCAL void duk__append_range_atom_matcher(duk_re_compiler_ctx *re_ctx,
+                                              duk_small_uint_t re_op,
+                                              const duk_uint16_t *ranges,
+                                              duk_small_uint_t count) {
 #if 0
 	DUK_ASSERT(re_op <= 0x7fUL);
 	DUK_ASSERT(count <= 0x7fUL);
@@ -86711,17 +91054,18 @@ DUK_LOCAL void duk__append_range_atom_matcher(duk_re_compiler_ctx *re_ctx, duk_s
 }
 
 DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t expect_eof, duk__re_disjunction_info *out_atom_info) {
-	duk_int32_t atom_start_offset = -1;                   /* negative -> no atom matched on previous round */
-	duk_int32_t atom_char_length = 0;                     /* negative -> complex atom */
-	duk_uint32_t atom_start_captures = re_ctx->captures;  /* value of re_ctx->captures at start of atom */
+	duk_int32_t atom_start_offset = -1; /* negative -> no atom matched on previous round */
+	duk_int32_t atom_char_length = 0; /* negative -> complex atom */
+	duk_uint32_t atom_start_captures = re_ctx->captures; /* value of re_ctx->captures at start of atom */
 	duk_int32_t unpatched_disjunction_split = -1;
 	duk_int32_t unpatched_disjunction_jump = -1;
 	duk_uint32_t entry_offset = (duk_uint32_t) DUK__RE_BUFLEN(re_ctx);
-	duk_int32_t res_charlen = 0;  /* -1 if disjunction is complex, char length if simple */
+	duk_int32_t res_charlen = 0; /* -1 if disjunction is complex, char length if simple */
 	duk__re_disjunction_info tmp_disj;
 
 	DUK_ASSERT(out_atom_info != NULL);
 
+	duk_native_stack_check(re_ctx->thr);
 	if (re_ctx->recursion_depth >= re_ctx->recursion_limit) {
 		DUK_ERROR_RANGE(re_ctx->thr, DUK_STR_REGEXP_COMPILER_RECURSION_LIMIT);
 		DUK_WO_NORETURN(return;);
@@ -86739,19 +91083,19 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 		 * new_atom_char_length etc are for the atom parsed on this round;
 		 * they're written to atom_char_length etc at the end of the round.
 		 */
-		duk_int32_t new_atom_char_length;   /* char length of the atom parsed in this loop */
-		duk_int32_t new_atom_start_offset;  /* bytecode start offset of the atom parsed in this loop
-		                                     * (allows quantifiers to copy the atom bytecode)
-		                                     */
-		duk_uint32_t new_atom_start_captures;  /* re_ctx->captures at the start of the atom parsed in this loop */
+		duk_int32_t new_atom_char_length; /* char length of the atom parsed in this loop */
+		duk_int32_t new_atom_start_offset; /* bytecode start offset of the atom parsed in this loop
+		                                    * (allows quantifiers to copy the atom bytecode)
+		                                    */
+		duk_uint32_t new_atom_start_captures; /* re_ctx->captures at the start of the atom parsed in this loop */
 
 		duk_lexer_parse_re_token(&re_ctx->lex, &re_ctx->curr_token);
 
-		DUK_DD(DUK_DDPRINT("re token: %ld (num=%ld, char=%c)",
-		                   (long) re_ctx->curr_token.t,
-		                   (long) re_ctx->curr_token.num,
-		                   (re_ctx->curr_token.num >= 0x20 && re_ctx->curr_token.num <= 0x7e) ?
-		                   (int) re_ctx->curr_token.num : (int) '?'));
+		DUK_DD(DUK_DDPRINT(
+		    "re token: %ld (num=%ld, char=%c)",
+		    (long) re_ctx->curr_token.t,
+		    (long) re_ctx->curr_token.num,
+		    (re_ctx->curr_token.num >= 0x20 && re_ctx->curr_token.num <= 0x7e) ? (int) re_ctx->curr_token.num : (int) '?'));
 
 		/* set by atom case clauses */
 		new_atom_start_offset = -1;
@@ -86772,9 +91116,7 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 
 				DUK_ASSERT(unpatched_disjunction_split >= 0);
 				offset = (duk_uint32_t) unpatched_disjunction_jump;
-				offset += duk__insert_jump_offset(re_ctx,
-				                                  offset,
-				                                  (duk_int32_t) (DUK__RE_BUFLEN(re_ctx) - offset));
+				offset += duk__insert_jump_offset(re_ctx, offset, (duk_int32_t) (DUK__RE_BUFLEN(re_ctx) - offset));
 				/* offset is now target of the pending split (right after jump) */
 				duk__insert_jump_offset(re_ctx,
 				                        (duk_uint32_t) unpatched_disjunction_split,
@@ -86782,10 +91124,8 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 			}
 
 			/* add a new pending split to the beginning of the entire disjunction */
-			(void) duk__insert_u32(re_ctx,
-			                       entry_offset,
-			                       DUK_REOP_SPLIT1);   /* prefer direct execution */
-			unpatched_disjunction_split = (duk_int32_t) (entry_offset + 1);   /* +1 for opcode */
+			(void) duk__insert_u32(re_ctx, entry_offset, DUK_REOP_SPLIT1); /* prefer direct execution */
+			unpatched_disjunction_split = (duk_int32_t) (entry_offset + 1); /* +1 for opcode */
 
 			/* add a new pending match jump for latest finished alternative */
 			duk__append_reop(re_ctx, DUK_REOP_JUMP);
@@ -86833,7 +91173,7 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 					}
 				}
 
-				duk__append_reop(re_ctx, DUK_REOP_MATCH);   /* complete 'sub atom' */
+				duk__append_reop(re_ctx, DUK_REOP_MATCH); /* complete 'sub atom' */
 				atom_code_length = (duk_int32_t) (DUK__RE_BUFLEN(re_ctx) - (duk_size_t) atom_start_offset);
 
 				offset = (duk_uint32_t) atom_start_offset;
@@ -86849,7 +91189,7 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 					offset += duk__insert_u32(re_ctx, offset, qmax);
 					offset += duk__insert_jump_offset(re_ctx, offset, atom_code_length);
 				}
-				DUK_UNREF(offset);  /* silence scan-build warning */
+				DUK_UNREF(offset); /* silence scan-build warning */
 			} else {
 				/*
 				 *  Complex atom
@@ -86867,8 +91207,8 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 				duk_uint32_t tmp_qmin, tmp_qmax;
 
 				/* pre-check how many atom copies we're willing to make (atom_copies not needed below) */
-				atom_copies = (re_ctx->curr_token.qmax == DUK_RE_QUANTIFIER_INFINITE) ?
-				              re_ctx->curr_token.qmin : re_ctx->curr_token.qmax;
+				atom_copies = (re_ctx->curr_token.qmax == DUK_RE_QUANTIFIER_INFINITE) ? re_ctx->curr_token.qmin :
+                                                                                                        re_ctx->curr_token.qmax;
 				if (atom_copies > DUK_RE_MAX_ATOM_COPIES) {
 					DUK_ERROR_RANGE(re_ctx->thr, DUK_STR_QUANTIFIER_TOO_MANY_COPIES);
 					DUK_WO_NORETURN(return;);
@@ -86879,15 +91219,19 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 				if (atom_start_captures != re_ctx->captures) {
 					DUK_ASSERT(atom_start_captures < re_ctx->captures);
 					DUK_DDD(DUK_DDDPRINT("must wipe ]atom_start_captures,re_ctx->captures]: ]%ld,%ld]",
-					                     (long) atom_start_captures, (long) re_ctx->captures));
+					                     (long) atom_start_captures,
+					                     (long) re_ctx->captures));
 
 					/* insert (DUK_REOP_WIPERANGE, start, count) in reverse order so the order ends up right */
-					duk__insert_u32(re_ctx, (duk_uint32_t) atom_start_offset, (re_ctx->captures - atom_start_captures) * 2U);
+					duk__insert_u32(re_ctx,
+					                (duk_uint32_t) atom_start_offset,
+					                (re_ctx->captures - atom_start_captures) * 2U);
 					duk__insert_u32(re_ctx, (duk_uint32_t) atom_start_offset, (atom_start_captures + 1) * 2);
 					duk__insert_u32(re_ctx, (duk_uint32_t) atom_start_offset, DUK_REOP_WIPERANGE);
 				} else {
-					DUK_DDD(DUK_DDDPRINT("no need to wipe captures: atom_start_captures == re_ctx->captures == %ld",
-					                     (long) atom_start_captures));
+					DUK_DDD(
+					    DUK_DDDPRINT("no need to wipe captures: atom_start_captures == re_ctx->captures == %ld",
+					                 (long) atom_start_captures));
 				}
 
 				atom_code_length = (duk_int32_t) DUK__RE_BUFLEN(re_ctx) - atom_start_offset;
@@ -86896,7 +91240,9 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 				tmp_qmin = re_ctx->curr_token.qmin;
 				tmp_qmax = re_ctx->curr_token.qmax;
 				while (tmp_qmin > 0) {
-					duk__append_slice(re_ctx, (duk_uint32_t) atom_start_offset, (duk_uint32_t) atom_code_length);
+					duk__append_slice(re_ctx,
+					                  (duk_uint32_t) atom_start_offset,
+					                  (duk_uint32_t) atom_code_length);
 					tmp_qmin--;
 					if (tmp_qmax != DUK_RE_QUANTIFIER_INFINITE) {
 						tmp_qmax--;
@@ -86914,14 +91260,16 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 						 */
 						duk__append_reop(re_ctx, DUK_REOP_JUMP);
 						duk__append_jump_offset(re_ctx, atom_code_length);
-						duk__append_slice(re_ctx, (duk_uint32_t) atom_start_offset, (duk_uint32_t) atom_code_length);
+						duk__append_slice(re_ctx,
+						                  (duk_uint32_t) atom_start_offset,
+						                  (duk_uint32_t) atom_code_length);
 					}
 					if (re_ctx->curr_token.greedy) {
-						duk__append_reop(re_ctx, DUK_REOP_SPLIT2);   /* prefer jump */
+						duk__append_reop(re_ctx, DUK_REOP_SPLIT2); /* prefer jump */
 					} else {
-						duk__append_reop(re_ctx, DUK_REOP_SPLIT1);   /* prefer direct */
+						duk__append_reop(re_ctx, DUK_REOP_SPLIT1); /* prefer direct */
 					}
-					duk__append_jump_offset(re_ctx, -atom_code_length - 1);  /* -1 for opcode */
+					duk__append_jump_offset(re_ctx, -atom_code_length - 1); /* -1 for opcode */
 				} else {
 					/*
 					 *  The remaining matches are emitted as sequence of SPLITs and atom
@@ -86941,14 +91289,17 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 					 */
 					duk_uint32_t offset = (duk_uint32_t) DUK__RE_BUFLEN(re_ctx);
 					while (tmp_qmax > 0) {
-						duk__insert_slice(re_ctx, offset, (duk_uint32_t) atom_start_offset, (duk_uint32_t) atom_code_length);
+						duk__insert_slice(re_ctx,
+						                  offset,
+						                  (duk_uint32_t) atom_start_offset,
+						                  (duk_uint32_t) atom_code_length);
 						if (re_ctx->curr_token.greedy) {
-							duk__insert_u32(re_ctx, offset, DUK_REOP_SPLIT1);   /* prefer direct */
+							duk__insert_u32(re_ctx, offset, DUK_REOP_SPLIT1); /* prefer direct */
 						} else {
-							duk__insert_u32(re_ctx, offset, DUK_REOP_SPLIT2);   /* prefer jump */
+							duk__insert_u32(re_ctx, offset, DUK_REOP_SPLIT2); /* prefer jump */
 						}
 						duk__insert_jump_offset(re_ctx,
-						                        offset + 1,   /* +1 for opcode */
+						                        offset + 1, /* +1 for opcode */
 						                        (duk_int32_t) (DUK__RE_BUFLEN(re_ctx) - (offset + 1)));
 						tmp_qmax--;
 					}
@@ -86981,8 +91332,8 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 		case DUK_RETOK_ASSERT_START_POS_LOOKAHEAD:
 		case DUK_RETOK_ASSERT_START_NEG_LOOKAHEAD: {
 			duk_uint32_t offset;
-			duk_uint32_t opcode = (re_ctx->curr_token.t == DUK_RETOK_ASSERT_START_POS_LOOKAHEAD) ?
-			                      DUK_REOP_LOOKPOS : DUK_REOP_LOOKNEG;
+			duk_uint32_t opcode =
+			    (re_ctx->curr_token.t == DUK_RETOK_ASSERT_START_POS_LOOKAHEAD) ? DUK_REOP_LOOKPOS : DUK_REOP_LOOKNEG;
 
 			offset = (duk_uint32_t) DUK__RE_BUFLEN(re_ctx);
 			duk__parse_disjunction(re_ctx, 0, &tmp_disj);
@@ -86990,7 +91341,7 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 
 			(void) duk__insert_u32(re_ctx, offset, opcode);
 			(void) duk__insert_jump_offset(re_ctx,
-			                               offset + 1,   /* +1 for opcode */
+			                               offset + 1, /* +1 for opcode */
 			                               (duk_int32_t) (DUK__RE_BUFLEN(re_ctx) - (offset + 1)));
 
 			/* 'taint' result as complex -- this is conservative,
@@ -87051,7 +91402,7 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 			DUK_ASSERT(DUK_RETOK_ATOM_WHITE == DUK_RETOK_ATOM_DIGIT + 2);
 			DUK_ASSERT(DUK_RETOK_ATOM_WORD_CHAR == DUK_RETOK_ATOM_DIGIT + 4);
 			idx = (duk_small_uint_t) ((re_ctx->curr_token.t - DUK_RETOK_ATOM_DIGIT) >> 1U);
-			DUK_ASSERT(idx <= 2U);  /* Assume continuous token numbers; also checks negative underflow. */
+			DUK_ASSERT(idx <= 2U); /* Assume continuous token numbers; also checks negative underflow. */
 
 			duk__append_range_atom_matcher(re_ctx, re_op, duk__re_range_lookup1[idx], duk__re_range_lookup2[idx]);
 			break;
@@ -87061,7 +91412,7 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 			if (backref > re_ctx->highest_backref) {
 				re_ctx->highest_backref = backref;
 			}
-			new_atom_char_length = -1;   /* mark as complex */
+			new_atom_char_length = -1; /* mark as complex */
 			new_atom_start_offset = (duk_int32_t) DUK__RE_BUFLEN(re_ctx);
 			duk__append_reop(re_ctx, DUK_REOP_BACKREFERENCE);
 			duk__append_u32(re_ctx, backref);
@@ -87070,12 +91421,14 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 		case DUK_RETOK_ATOM_START_CAPTURE_GROUP: {
 			duk_uint32_t cap;
 
-			new_atom_char_length = -1;   /* mark as complex (capture handling) */
+			new_atom_char_length = -1; /* mark as complex (capture handling) */
 			new_atom_start_offset = (duk_int32_t) DUK__RE_BUFLEN(re_ctx);
 			cap = ++re_ctx->captures;
 			duk__append_reop(re_ctx, DUK_REOP_SAVE);
 			duk__append_u32(re_ctx, cap * 2);
-			duk__parse_disjunction(re_ctx, 0, &tmp_disj);  /* retval (sub-atom char length) unused, tainted as complex above */
+			duk__parse_disjunction(re_ctx,
+			                       0,
+			                       &tmp_disj); /* retval (sub-atom char length) unused, tainted as complex above */
 			duk__append_reop(re_ctx, DUK_REOP_SAVE);
 			duk__append_u32(re_ctx, cap * 2 + 1);
 			break;
@@ -87120,12 +91473,12 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 			new_atom_char_length = 1;
 			new_atom_start_offset = (duk_int32_t) DUK__RE_BUFLEN(re_ctx);
 			duk__append_reop(re_ctx,
-			                 (re_ctx->curr_token.t == DUK_RETOK_ATOM_START_CHARCLASS) ?
-			                 DUK_REOP_RANGES : DUK_REOP_INVRANGES);
-			offset = (duk_uint32_t) DUK__RE_BUFLEN(re_ctx);    /* patch in range count later */
+			                 (re_ctx->curr_token.t == DUK_RETOK_ATOM_START_CHARCLASS) ? DUK_REOP_RANGES :
+                                                                                                    DUK_REOP_INVRANGES);
+			offset = (duk_uint32_t) DUK__RE_BUFLEN(re_ctx); /* patch in range count later */
 
 			/* parse ranges until character class ends */
-			re_ctx->nranges = 0;    /* note: ctx-wide temporary */
+			re_ctx->nranges = 0; /* note: ctx-wide temporary */
 			duk_lexer_parse_re_ranges(&re_ctx->lex, duk__regexp_generate_ranges, (void *) re_ctx);
 
 			/* insert range count */
@@ -87168,7 +91521,7 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 		atom_start_captures = new_atom_start_captures;
 	}
 
- done:
+done:
 
 	/* finish up pending jump and split for last alternative */
 	if (unpatched_disjunction_jump >= 0) {
@@ -87176,9 +91529,7 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 
 		DUK_ASSERT(unpatched_disjunction_split >= 0);
 		offset = (duk_uint32_t) unpatched_disjunction_jump;
-		offset += duk__insert_jump_offset(re_ctx,
-		                                  offset,
-		                                  (duk_int32_t) (DUK__RE_BUFLEN(re_ctx) - offset));
+		offset += duk__insert_jump_offset(re_ctx, offset, (duk_int32_t) (DUK__RE_BUFLEN(re_ctx) - offset));
 		/* offset is now target of the pending split (right after jump) */
 		duk__insert_jump_offset(re_ctx,
 		                        (duk_uint32_t) unpatched_disjunction_split,
@@ -87189,8 +91540,7 @@ DUK_LOCAL void duk__parse_disjunction(duk_re_compiler_ctx *re_ctx, duk_bool_t ex
 	out_atom_info->end_captures = re_ctx->captures;
 #endif
 	out_atom_info->charlen = res_charlen;
-	DUK_DDD(DUK_DDDPRINT("parse disjunction finished: charlen=%ld",
-	                     (long) out_atom_info->charlen));
+	DUK_DDD(DUK_DDDPRINT("parse disjunction finished: charlen=%ld", (long) out_atom_info->charlen));
 
 	re_ctx->recursion_depth--;
 }
@@ -87241,7 +91591,7 @@ DUK_LOCAL duk_uint32_t duk__parse_regexp_flags(duk_hthread *thr, duk_hstring *h)
 
 	return flags;
 
- flags_error:
+flags_error:
 	DUK_ERROR_SYNTAX(thr, DUK_STR_INVALID_REGEXP_FLAGS);
 	DUK_WO_NORETURN(return 0U;);
 }
@@ -87307,7 +91657,7 @@ DUK_LOCAL void duk__create_escaped_source(duk_hthread *thr, int idx_pattern) {
 	}
 
 	DUK_BW_SETPTR_AND_COMPACT(thr, bw, q);
-	(void) duk_buffer_to_string(thr, -1);  /* Safe if input is safe. */
+	(void) duk_buffer_to_string(thr, -1); /* Safe if input is safe. */
 
 	/* [ ... escaped_source ] */
 }
@@ -87361,7 +91711,7 @@ DUK_INTERNAL void duk_regexp_compile(duk_hthread *thr) {
 	/* [ ... pattern flags escaped_source buffer ] */
 
 	duk_memzero(&re_ctx, sizeof(re_ctx));
-	DUK_LEXER_INITCTX(&re_ctx.lex);  /* duplicate zeroing, expect for (possible) NULL inits */
+	DUK_LEXER_INITCTX(&re_ctx.lex); /* duplicate zeroing, expect for (possible) NULL inits */
 	re_ctx.thr = thr;
 	re_ctx.lex.thr = thr;
 	re_ctx.lex.input = DUK_HSTRING_GET_DATA(h_pattern);
@@ -87373,13 +91723,14 @@ DUK_INTERNAL void duk_regexp_compile(duk_hthread *thr) {
 	DUK_BW_INIT_PUSHBUF(thr, &re_ctx.bw, DUK__RE_INITIAL_BUFSIZE);
 
 	DUK_DD(DUK_DDPRINT("regexp compiler ctx initialized, flags=0x%08lx, recursion_limit=%ld",
-	                   (unsigned long) re_ctx.re_flags, (long) re_ctx.recursion_limit));
+	                   (unsigned long) re_ctx.re_flags,
+	                   (long) re_ctx.recursion_limit));
 
 	/*
 	 *  Init lexer
 	 */
 
-	lex_point.offset = 0;  /* expensive init, just want to fill window */
+	lex_point.offset = 0; /* expensive init, just want to fill window */
 	lex_point.line = 1;
 	DUK_LEXER_SETPOINT(&re_ctx.lex, &lex_point);
 
@@ -87421,7 +91772,7 @@ DUK_INTERNAL void duk_regexp_compile(duk_hthread *thr) {
 	/* [ ... pattern flags escaped_source buffer ] */
 
 	DUK_BW_COMPACT(thr, &re_ctx.bw);
-	(void) duk_buffer_to_string(thr, -1);  /* Safe because flags is at most 7 bit. */
+	(void) duk_buffer_to_string(thr, -1); /* Safe because flags is at most 7 bit. */
 
 	/* [ ... pattern flags escaped_source bytecode ] */
 
@@ -87429,11 +91780,12 @@ DUK_INTERNAL void duk_regexp_compile(duk_hthread *thr) {
 	 *  Finalize stack
 	 */
 
-	duk_remove(thr, -4);     /* -> [ ... flags escaped_source bytecode ] */
-	duk_remove(thr, -3);     /* -> [ ... escaped_source bytecode ] */
+	duk_remove(thr, -4); /* -> [ ... flags escaped_source bytecode ] */
+	duk_remove(thr, -3); /* -> [ ... escaped_source bytecode ] */
 
 	DUK_DD(DUK_DDPRINT("regexp compilation successful, bytecode: %!T, escaped source: %!T",
-	                   (duk_tval *) duk_get_tval(thr, -1), (duk_tval *) duk_get_tval(thr, -2)));
+	                   (duk_tval *) duk_get_tval(thr, -1),
+	                   (duk_tval *) duk_get_tval(thr, -2)));
 }
 
 /*
@@ -87479,11 +91831,11 @@ DUK_INTERNAL void duk_regexp_create_instance(duk_hthread *thr) {
 	/* [ ... regexp_object ] */
 }
 
-#else  /* DUK_USE_REGEXP_SUPPORT */
+#else /* DUK_USE_REGEXP_SUPPORT */
 
 /* regexp support disabled */
 
-#endif  /* DUK_USE_REGEXP_SUPPORT */
+#endif /* DUK_USE_REGEXP_SUPPORT */
 
 /* automatic undefs */
 #undef DUK__RE_BUFLEN
@@ -87531,7 +91883,11 @@ DUK_LOCAL duk_int32_t duk__bc_get_i32(duk_re_matcher_ctx *re_ctx, const duk_uint
 	}
 }
 
-DUK_LOCAL const duk_uint8_t *duk__utf8_backtrack(duk_hthread *thr, const duk_uint8_t **ptr, const duk_uint8_t *ptr_start, const duk_uint8_t *ptr_end, duk_uint_fast32_t count) {
+DUK_LOCAL const duk_uint8_t *duk__utf8_backtrack(duk_hthread *thr,
+                                                 const duk_uint8_t **ptr,
+                                                 const duk_uint8_t *ptr_start,
+                                                 const duk_uint8_t *ptr_end,
+                                                 duk_uint_fast32_t count) {
 	const duk_uint8_t *p;
 
 	/* Note: allow backtracking from p == ptr_end */
@@ -87556,12 +91912,16 @@ DUK_LOCAL const duk_uint8_t *duk__utf8_backtrack(duk_hthread *thr, const duk_uin
 	*ptr = p;
 	return p;
 
- fail:
+fail:
 	DUK_ERROR_INTERNAL(thr);
 	DUK_WO_NORETURN(return NULL;);
 }
 
-DUK_LOCAL const duk_uint8_t *duk__utf8_advance(duk_hthread *thr, const duk_uint8_t **ptr, const duk_uint8_t *ptr_start, const duk_uint8_t *ptr_end, duk_uint_fast32_t count) {
+DUK_LOCAL const duk_uint8_t *duk__utf8_advance(duk_hthread *thr,
+                                               const duk_uint8_t **ptr,
+                                               const duk_uint8_t *ptr_start,
+                                               const duk_uint8_t *ptr_end,
+                                               duk_uint_fast32_t count) {
 	const duk_uint8_t *p;
 
 	p = *ptr;
@@ -87587,7 +91947,7 @@ DUK_LOCAL const duk_uint8_t *duk__utf8_advance(duk_hthread *thr, const duk_uint8
 	*ptr = p;
 	return p;
 
- fail:
+fail:
 	DUK_ERROR_INTERNAL(thr);
 	DUK_WO_NORETURN(return NULL;);
 }
@@ -87636,6 +91996,7 @@ DUK_LOCAL duk_codepoint_t duk__inp_get_prev_cp(duk_re_matcher_ctx *re_ctx, const
  */
 
 DUK_LOCAL const duk_uint8_t *duk__match_regexp(duk_re_matcher_ctx *re_ctx, const duk_uint8_t *pc, const duk_uint8_t *sp) {
+	duk_native_stack_check(re_ctx->thr);
 	if (re_ctx->recursion_depth >= re_ctx->recursion_limit) {
 		DUK_ERROR_RANGE(re_ctx->thr, DUK_STR_REGEXP_EXECUTOR_RECURSION_LIMIT);
 		DUK_WO_NORETURN(return NULL;);
@@ -87690,7 +92051,7 @@ DUK_LOCAL const duk_uint8_t *duk__match_regexp(duk_re_matcher_ctx *re_ctx, const
 
 			c1 = (duk_codepoint_t) duk__bc_get_u32(re_ctx, &pc);
 			DUK_ASSERT(!(re_ctx->re_flags & DUK_RE_FLAG_IGNORE_CASE) ||
-			           c1 == duk_unicode_re_canonicalize_char(re_ctx->thr, c1));  /* canonicalized by compiler */
+			           c1 == duk_unicode_re_canonicalize_char(re_ctx->thr, c1)); /* canonicalized by compiler */
 			c2 = duk__inp_get_cp(re_ctx, &sp);
 			/* No need to check for c2 < 0 (end of input): because c1 >= 0, it
 			 * will fail the match below automatically and cause goto fail.
@@ -87736,7 +92097,10 @@ DUK_LOCAL const duk_uint8_t *duk__match_regexp(duk_re_matcher_ctx *re_ctx, const
 				r1 = (duk_codepoint_t) duk__bc_get_u32(re_ctx, &pc);
 				r2 = (duk_codepoint_t) duk__bc_get_u32(re_ctx, &pc);
 				DUK_DDD(DUK_DDDPRINT("matching ranges/invranges, n=%ld, r1=%ld, r2=%ld, c=%ld",
-				                     (long) n, (long) r1, (long) r2, (long) c));
+				                     (long) n,
+				                     (long) r1,
+				                     (long) r2,
+				                     (long) c));
 				if (c >= r1 && c <= r2) {
 					/* Note: don't bail out early, we must read all the ranges from
 					 * bytecode.  Another option is to skip them efficiently after
@@ -87805,16 +92169,16 @@ DUK_LOCAL const duk_uint8_t *duk__match_regexp(duk_re_matcher_ctx *re_ctx, const
 			duk_small_int_t w1, w2;
 
 			if (sp <= re_ctx->input) {
-				w1 = 0;  /* not a wordchar */
+				w1 = 0; /* not a wordchar */
 			} else {
 				duk_codepoint_t c;
 				c = duk__inp_get_prev_cp(re_ctx, sp);
 				w1 = duk_unicode_re_is_wordchar(c);
 			}
 			if (sp >= re_ctx->input_end) {
-				w2 = 0;  /* not a wordchar */
+				w2 = 0; /* not a wordchar */
 			} else {
-				const duk_uint8_t *tmp_sp = sp;  /* dummy so sp won't get updated */
+				const duk_uint8_t *tmp_sp = sp; /* dummy so sp won't get updated */
 				duk_codepoint_t c;
 				c = duk__inp_get_cp(re_ctx, &tmp_sp);
 				w2 = duk_unicode_re_is_wordchar(c);
@@ -87875,7 +92239,9 @@ DUK_LOCAL const duk_uint8_t *duk__match_regexp(duk_re_matcher_ctx *re_ctx, const
 			qmax = duk__bc_get_u32(re_ctx, &pc);
 			skip = duk__bc_get_i32(re_ctx, &pc);
 			DUK_DDD(DUK_DDDPRINT("minimal quantifier, qmin=%lu, qmax=%lu, skip=%ld",
-			                     (unsigned long) qmin, (unsigned long) qmax, (long) skip));
+			                     (unsigned long) qmin,
+			                     (unsigned long) qmax,
+			                     (long) skip));
 
 			q = 0;
 			while (q <= qmax) {
@@ -87905,7 +92271,10 @@ DUK_LOCAL const duk_uint8_t *duk__match_regexp(duk_re_matcher_ctx *re_ctx, const
 			atomlen = duk__bc_get_u32(re_ctx, &pc);
 			skip = duk__bc_get_i32(re_ctx, &pc);
 			DUK_DDD(DUK_DDDPRINT("greedy quantifier, qmin=%lu, qmax=%lu, atomlen=%lu, skip=%ld",
-			                     (unsigned long) qmin, (unsigned long) qmax, (unsigned long) atomlen, (long) skip));
+			                     (unsigned long) qmin,
+			                     (unsigned long) qmax,
+			                     (unsigned long) atomlen,
+			                     (long) skip));
 
 			q = 0;
 			while (q < qmax) {
@@ -87931,8 +92300,7 @@ DUK_LOCAL const duk_uint8_t *duk__match_regexp(duk_re_matcher_ctx *re_ctx, const
 				 * do not allow captures in their atom now, so this is not an issue.
 				 */
 
-				DUK_DDD(DUK_DDDPRINT("greedy quantifier, backtrack %ld characters (atomlen)",
-				                     (long) atomlen));
+				DUK_DDD(DUK_DDDPRINT("greedy quantifier, backtrack %ld characters (atomlen)", (long) atomlen));
 				sp = duk__inp_backtrack(re_ctx, &sp, (duk_uint_fast32_t) atomlen);
 				q--;
 			}
@@ -87978,20 +92346,23 @@ DUK_LOCAL const duk_uint8_t *duk__match_regexp(duk_re_matcher_ctx *re_ctx, const
 			idx_start = duk__bc_get_u32(re_ctx, &pc);
 			idx_count = duk__bc_get_u32(re_ctx, &pc);
 			DUK_DDD(DUK_DDDPRINT("wipe saved range: start=%ld, count=%ld -> [%ld,%ld] (captures [%ld,%ld])",
-			                     (long) idx_start, (long) idx_count,
-			                     (long) idx_start, (long) (idx_start + idx_count - 1),
-			                     (long) (idx_start / 2), (long) ((idx_start + idx_count - 1) / 2)));
+			                     (long) idx_start,
+			                     (long) idx_count,
+			                     (long) idx_start,
+			                     (long) (idx_start + idx_count - 1),
+			                     (long) (idx_start / 2),
+			                     (long) ((idx_start + idx_count - 1) / 2)));
 			if (idx_start + idx_count > re_ctx->nsaved || idx_count == 0) {
 				/* idx is unsigned, < 0 check is not necessary */
 				DUK_D(DUK_DPRINT("internal error, regexp wipe indices insane: idx_start=%ld, idx_count=%ld",
-				                 (long) idx_start, (long) idx_count));
+				                 (long) idx_start,
+				                 (long) idx_count));
 				goto internal_error;
 			}
 			DUK_ASSERT(idx_count > 0);
 
 			duk_require_stack(re_ctx->thr, 1);
-			range_save = (duk_uint8_t **) duk_push_fixed_buffer_nozero(re_ctx->thr,
-			                                                           sizeof(duk_uint8_t *) * idx_count);
+			range_save = (duk_uint8_t **) duk_push_fixed_buffer_nozero(re_ctx->thr, sizeof(duk_uint8_t *) * idx_count);
 			DUK_ASSERT(range_save != NULL);
 			duk_memcpy(range_save, re_ctx->saved + idx_start, sizeof(duk_uint8_t *) * idx_count);
 #if defined(DUK_USE_EXPLICIT_NULL_INIT)
@@ -88007,8 +92378,10 @@ DUK_LOCAL const duk_uint8_t *duk__match_regexp(duk_re_matcher_ctx *re_ctx, const
 			if (sub_sp) {
 				/* match: keep wiped/resaved values */
 				DUK_DDD(DUK_DDDPRINT("match: keep wiped/resaved values [%ld,%ld] (captures [%ld,%ld])",
-				                     (long) idx_start, (long) (idx_start + idx_count - 1),
-			                             (long) (idx_start / 2), (long) ((idx_start + idx_count - 1) / 2)));
+				                     (long) idx_start,
+				                     (long) (idx_start + idx_count - 1),
+				                     (long) (idx_start / 2),
+				                     (long) ((idx_start + idx_count - 1) / 2)));
 				duk_pop_unsafe(re_ctx->thr);
 				sp = sub_sp;
 				goto match;
@@ -88016,8 +92389,10 @@ DUK_LOCAL const duk_uint8_t *duk__match_regexp(duk_re_matcher_ctx *re_ctx, const
 
 			/* fail: restore saves */
 			DUK_DDD(DUK_DDDPRINT("fail: restore wiped/resaved values [%ld,%ld] (captures [%ld,%ld])",
-			                     (long) idx_start, (long) (idx_start + idx_count - 1),
-			                     (long) (idx_start / 2), (long) ((idx_start + idx_count - 1) / 2)));
+			                     (long) idx_start,
+			                     (long) (idx_start + idx_count - 1),
+			                     (long) (idx_start / 2),
+			                     (long) ((idx_start + idx_count - 1) / 2)));
 			duk_memcpy((void *) (re_ctx->saved + idx_start),
 			           (const void *) range_save,
 			           sizeof(duk_uint8_t *) * idx_count);
@@ -88047,8 +92422,8 @@ DUK_LOCAL const duk_uint8_t *duk__match_regexp(duk_re_matcher_ctx *re_ctx, const
 			DUK_ASSERT(re_ctx->nsaved > 0);
 
 			duk_require_stack(re_ctx->thr, 1);
-			full_save = (duk_uint8_t **) duk_push_fixed_buffer_nozero(re_ctx->thr,
-			                                                          sizeof(duk_uint8_t *) * re_ctx->nsaved);
+			full_save =
+			    (duk_uint8_t **) duk_push_fixed_buffer_nozero(re_ctx->thr, sizeof(duk_uint8_t *) * re_ctx->nsaved);
 			DUK_ASSERT(full_save != NULL);
 			duk_memcpy(full_save, re_ctx->saved, sizeof(duk_uint8_t *) * re_ctx->nsaved);
 
@@ -88073,11 +92448,9 @@ DUK_LOCAL const duk_uint8_t *duk__match_regexp(duk_re_matcher_ctx *re_ctx, const
 
 			/* fall through */
 
-		 lookahead_fail:
+		lookahead_fail:
 			/* fail: restore saves */
-			duk_memcpy((void *) re_ctx->saved,
-			           (const void *) full_save,
-			           sizeof(duk_uint8_t *) * re_ctx->nsaved);
+			duk_memcpy((void *) re_ctx->saved, (const void *) full_save, sizeof(duk_uint8_t *) * re_ctx->nsaved);
 			duk_pop_unsafe(re_ctx->thr);
 			goto fail;
 		}
@@ -88100,22 +92473,23 @@ DUK_LOCAL const duk_uint8_t *duk__match_regexp(duk_re_matcher_ctx *re_ctx, const
 			const duk_uint8_t *p;
 
 			idx = duk__bc_get_u32(re_ctx, &pc);
-			idx = idx << 1;  /* backref n -> saved indices [n*2, n*2+1] */
+			idx = idx << 1; /* backref n -> saved indices [n*2, n*2+1] */
 			if (idx < 2 || idx + 1 >= re_ctx->nsaved) {
 				/* regexp compiler should catch these */
 				DUK_D(DUK_DPRINT("internal error, backreference index insane"));
 				goto internal_error;
 			}
-			if (!re_ctx->saved[idx] || !re_ctx->saved[idx+1]) {
+			if (!re_ctx->saved[idx] || !re_ctx->saved[idx + 1]) {
 				/* capture is 'undefined', always matches! */
 				DUK_DDD(DUK_DDDPRINT("backreference: saved[%ld,%ld] not complete, always match",
-				                     (long) idx, (long) (idx + 1)));
+				                     (long) idx,
+				                     (long) (idx + 1)));
 				break;
 			}
 			DUK_DDD(DUK_DDDPRINT("backreference: match saved[%ld,%ld]", (long) idx, (long) (idx + 1)));
 
 			p = re_ctx->saved[idx];
-			while (p < re_ctx->saved[idx+1]) {
+			while (p < re_ctx->saved[idx + 1]) {
 				duk_codepoint_t c1, c2;
 
 				/* Note: not necessary to check p against re_ctx->input_end:
@@ -88147,15 +92521,15 @@ DUK_LOCAL const duk_uint8_t *duk__match_regexp(duk_re_matcher_ctx *re_ctx, const
 		}
 	}
 
- match:
+match:
 	re_ctx->recursion_depth--;
 	return sp;
 
- fail:
+fail:
 	re_ctx->recursion_depth--;
 	return NULL;
 
- internal_error:
+internal_error:
 	DUK_ERROR_INTERNAL(re_ctx->thr);
 	DUK_WO_NORETURN(return NULL;);
 }
@@ -88207,8 +92581,9 @@ DUK_LOCAL void duk__regexp_match_helper(duk_hthread *thr, duk_small_int_t force_
 	h_input = duk_to_hstring(thr, -1);
 	DUK_ASSERT(h_input != NULL);
 
-	duk_get_prop_stridx_short(thr, -2, DUK_STRIDX_INT_BYTECODE);  /* [ ... re_obj input ] -> [ ... re_obj input bc ] */
-	h_bytecode = duk_require_hstring(thr, -1);  /* no regexp instance should exist without a non-configurable bytecode property */
+	duk_xget_owndataprop_stridx_short(thr, -2, DUK_STRIDX_INT_BYTECODE); /* [ ... re_obj input ] -> [ ... re_obj input bc ] */
+	h_bytecode =
+	    duk_require_hstring(thr, -1); /* no regexp instance should exist without a non-configurable bytecode property */
 	DUK_ASSERT(h_bytecode != NULL);
 
 	/*
@@ -88240,13 +92615,13 @@ DUK_LOCAL void duk__regexp_match_helper(duk_hthread *thr, duk_small_int_t force_
 	re_ctx.nsaved = duk__bc_get_u32(&re_ctx, &pc);
 	re_ctx.bytecode = pc;
 
-	DUK_ASSERT(DUK_RE_FLAG_GLOBAL < 0x10000UL);  /* must fit into duk_small_int_t */
+	DUK_ASSERT(DUK_RE_FLAG_GLOBAL < 0x10000UL); /* must fit into duk_small_int_t */
 	global = (duk_small_int_t) (force_global | (duk_small_int_t) (re_ctx.re_flags & DUK_RE_FLAG_GLOBAL));
 
 	DUK_ASSERT(re_ctx.nsaved >= 2);
 	DUK_ASSERT((re_ctx.nsaved % 2) == 0);
 
-	p_buf = (duk_uint8_t *) duk_push_fixed_buffer(thr, sizeof(duk_uint8_t *) * re_ctx.nsaved);  /* rely on zeroing */
+	p_buf = (duk_uint8_t *) duk_push_fixed_buffer(thr, sizeof(duk_uint8_t *) * re_ctx.nsaved); /* rely on zeroing */
 	DUK_UNREF(p_buf);
 	re_ctx.saved = (const duk_uint8_t **) duk_get_buffer(thr, -1, NULL);
 	DUK_ASSERT(re_ctx.saved != NULL);
@@ -88264,7 +92639,9 @@ DUK_LOCAL void duk__regexp_match_helper(duk_hthread *thr, duk_small_int_t force_
 #endif
 
 	DUK_DDD(DUK_DDDPRINT("regexp ctx initialized, flags=0x%08lx, nsaved=%ld, recursion_limit=%ld, steps_limit=%ld",
-	                     (unsigned long) re_ctx.re_flags, (long) re_ctx.nsaved, (long) re_ctx.recursion_limit,
+	                     (unsigned long) re_ctx.re_flags,
+	                     (long) re_ctx.nsaved,
+	                     (long) re_ctx.recursion_limit,
 	                     (long) re_ctx.steps_limit));
 
 	/*
@@ -88286,15 +92663,15 @@ DUK_LOCAL void duk__regexp_match_helper(duk_hthread *thr, duk_small_int_t force_
 
 	/* [ ... re_obj input bc saved_buf ] */
 
-	duk_get_prop_stridx_short(thr, -4, DUK_STRIDX_LAST_INDEX);  /* -> [ ... re_obj input bc saved_buf lastIndex ] */
-	(void) duk_to_int(thr, -1);  /* ToInteger(lastIndex) */
-	d = duk_get_number(thr, -1);  /* integer, but may be +/- Infinite, +/- zero (not NaN, though) */
+	duk_get_prop_stridx_short(thr, -4, DUK_STRIDX_LAST_INDEX); /* -> [ ... re_obj input bc saved_buf lastIndex ] */
+	(void) duk_to_int(thr, -1); /* ToInteger(lastIndex) */
+	d = duk_get_number(thr, -1); /* integer, but may be +/- Infinite, +/- zero (not NaN, though) */
 	duk_pop_nodecref_unsafe(thr);
 
 	if (global) {
 		if (d < 0.0 || d > (double) DUK_HSTRING_GET_CHARLEN(h_input)) {
 			/* match fail */
-			char_offset = 0;   /* not really necessary */
+			char_offset = 0; /* not really necessary */
 			DUK_ASSERT(match == 0);
 			goto match_over;
 		}
@@ -88330,8 +92707,10 @@ DUK_LOCAL void duk__regexp_match_helper(duk_hthread *thr, duk_small_int_t force_
 		DUK_ASSERT(re_ctx.recursion_depth == 0);
 
 		DUK_DDD(DUK_DDDPRINT("attempt match at char offset %ld; %p [%p,%p]",
-		                     (long) char_offset, (const void *) sp,
-		                     (const void *) re_ctx.input, (const void *) re_ctx.input_end));
+		                     (long) char_offset,
+		                     (const void *) sp,
+		                     (const void *) re_ctx.input,
+		                     (const void *) re_ctx.input_end));
 
 		/*
 		 *  Note:
@@ -88378,7 +92757,7 @@ DUK_LOCAL void duk__regexp_match_helper(duk_hthread *thr, duk_small_int_t force_
 		(void) duk__utf8_advance(thr, &sp, re_ctx.input, re_ctx.input_end, (duk_uint_fast32_t) 1);
 	}
 
- match_over:
+match_over:
 
 	/*
 	 *  Matching complete, create result array or return a 'null'.  Update lastIndex
@@ -88404,8 +92783,8 @@ DUK_LOCAL void duk__regexp_match_helper(duk_hthread *thr, duk_small_int_t force_
 
 		DUK_DDD(DUK_DDDPRINT("regexp matches at char_offset %ld", (long) char_offset));
 
-		DUK_ASSERT(re_ctx.nsaved >= 2);        /* must have start and end */
-		DUK_ASSERT((re_ctx.nsaved % 2) == 0);  /* and even number */
+		DUK_ASSERT(re_ctx.nsaved >= 2); /* must have start and end */
+		DUK_ASSERT((re_ctx.nsaved % 2) == 0); /* and even number */
 
 		/* XXX: Array size is known before and (2 * re_ctx.nsaved) but not taken
 		 * advantage of now.  The array is not compacted either, as regexp match
@@ -88434,24 +92813,26 @@ DUK_LOCAL void duk__regexp_match_helper(duk_hthread *thr, duk_small_int_t force_
 			 * as 'undefined'.  The same is done when saved[] pointers are insane
 			 * (this should, of course, never happen in practice).
 			 */
+			duk_push_uarridx(thr, (duk_uarridx_t) (i / 2));
+
 			if (re_ctx.saved[i] && re_ctx.saved[i + 1] && re_ctx.saved[i + 1] >= re_ctx.saved[i]) {
 				duk_push_lstring(thr,
 				                 (const char *) re_ctx.saved[i],
-				                 (duk_size_t) (re_ctx.saved[i+1] - re_ctx.saved[i]));
+				                 (duk_size_t) (re_ctx.saved[i + 1] - re_ctx.saved[i]));
 				if (i == 0) {
 					/* Assumes that saved[0] and saved[1] are always
 					 * set by regexp bytecode (if not, char_end_offset
 					 * will be zero).  Also assumes clen reflects the
 					 * correct char length.
 					 */
-					char_end_offset = char_offset + (duk_uint32_t) duk_get_length(thr, -1);  /* add charlen */
+					char_end_offset = char_offset + (duk_uint32_t) duk_get_length(thr, -1); /* add charlen */
 				}
 			} else {
 				duk_push_undefined(thr);
 			}
 
-			/* [ ... re_obj input bc saved_buf res_obj val ] */
-			duk_put_prop_index(thr, -2, (duk_uarridx_t) (i / 2));
+			/* [ ... re_obj input bc saved_buf res_obj idx val ] */
+			duk_def_prop(thr, -3, DUK_DEFPROP_HAVE_VALUE | DUK_DEFPROP_SET_WEC);
 		}
 
 		/* [ ... re_obj input bc saved_buf res_obj ] */
@@ -88509,11 +92890,11 @@ DUK_INTERNAL void duk_regexp_match_force_global(duk_hthread *thr) {
 	duk__regexp_match_helper(thr, 1 /*force_global*/);
 }
 
-#else  /* DUK_USE_REGEXP_SUPPORT */
+#else /* DUK_USE_REGEXP_SUPPORT */
 
 /* regexp support disabled */
 
-#endif  /* DUK_USE_REGEXP_SUPPORT */
+#endif /* DUK_USE_REGEXP_SUPPORT */
 /*
  *  Self tests to ensure execution environment is sane.  Intended to catch
  *  compiler/platform problems which cannot be detected at compile time.
@@ -88533,18 +92914,21 @@ typedef union {
 } duk__test_double_union;
 
 /* Self test failed.  Expects a local variable 'error_count' to exist. */
-#define DUK__FAILED(msg)  do { \
+#define DUK__FAILED(msg) \
+	do { \
 		DUK_D(DUK_DPRINT("self test failed: " #msg " at " DUK_FILE_MACRO ":" DUK_MACRO_STRINGIFY(DUK_LINE_MACRO))); \
 		error_count++; \
 	} while (0)
 
-#define DUK__DBLUNION_CMP_TRUE(a,b)  do { \
+#define DUK__DBLUNION_CMP_TRUE(a, b) \
+	do { \
 		if (duk_memcmp((const void *) (a), (const void *) (b), sizeof(duk__test_double_union)) != 0) { \
 			DUK__FAILED("double union compares false (expected true)"); \
 		} \
 	} while (0)
 
-#define DUK__DBLUNION_CMP_FALSE(a,b)  do { \
+#define DUK__DBLUNION_CMP_FALSE(a, b) \
+	do { \
 		if (duk_memcmp((const void *) (a), (const void *) (b), sizeof(duk__test_double_union)) == 0) { \
 			DUK__FAILED("double union compares true (expected false)"); \
 		} \
@@ -88556,43 +92940,72 @@ typedef union {
 } duk__test_u32_union;
 
 #if defined(DUK_USE_INTEGER_LE)
-#define DUK__U32_INIT(u, a, b, c, d) do { \
-		(u)->x[0] = (d); (u)->x[1] = (c); (u)->x[2] = (b); (u)->x[3] = (a); \
+#define DUK__U32_INIT(u, a, b, c, d) \
+	do { \
+		(u)->x[0] = (d); \
+		(u)->x[1] = (c); \
+		(u)->x[2] = (b); \
+		(u)->x[3] = (a); \
 	} while (0)
 #elif defined(DUK_USE_INTEGER_ME)
 #error integer mixed endian not supported now
 #elif defined(DUK_USE_INTEGER_BE)
-#define DUK__U32_INIT(u, a, b, c, d) do { \
-		(u)->x[0] = (a); (u)->x[1] = (b); (u)->x[2] = (c); (u)->x[3] = (d); \
+#define DUK__U32_INIT(u, a, b, c, d) \
+	do { \
+		(u)->x[0] = (a); \
+		(u)->x[1] = (b); \
+		(u)->x[2] = (c); \
+		(u)->x[3] = (d); \
 	} while (0)
 #else
 #error unknown integer endianness
 #endif
 
 #if defined(DUK_USE_DOUBLE_LE)
-#define DUK__DOUBLE_INIT(u, a, b, c, d, e, f, g, h) do { \
-		(u)->x[0] = (h); (u)->x[1] = (g); (u)->x[2] = (f); (u)->x[3] = (e); \
-		(u)->x[4] = (d); (u)->x[5] = (c); (u)->x[6] = (b); (u)->x[7] = (a); \
+#define DUK__DOUBLE_INIT(u, a, b, c, d, e, f, g, h) \
+	do { \
+		(u)->x[0] = (h); \
+		(u)->x[1] = (g); \
+		(u)->x[2] = (f); \
+		(u)->x[3] = (e); \
+		(u)->x[4] = (d); \
+		(u)->x[5] = (c); \
+		(u)->x[6] = (b); \
+		(u)->x[7] = (a); \
 	} while (0)
 #define DUK__DOUBLE_COMPARE(u, a, b, c, d, e, f, g, h) \
-	((u)->x[0] == (h) && (u)->x[1] == (g) && (u)->x[2] == (f) && (u)->x[3] == (e) && \
-	 (u)->x[4] == (d) && (u)->x[5] == (c) && (u)->x[6] == (b) && (u)->x[7] == (a))
+	((u)->x[0] == (h) && (u)->x[1] == (g) && (u)->x[2] == (f) && (u)->x[3] == (e) && (u)->x[4] == (d) && (u)->x[5] == (c) && \
+	 (u)->x[6] == (b) && (u)->x[7] == (a))
 #elif defined(DUK_USE_DOUBLE_ME)
-#define DUK__DOUBLE_INIT(u, a, b, c, d, e, f, g, h) do { \
-		(u)->x[0] = (d); (u)->x[1] = (c); (u)->x[2] = (b); (u)->x[3] = (a); \
-		(u)->x[4] = (h); (u)->x[5] = (g); (u)->x[6] = (f); (u)->x[7] = (e); \
+#define DUK__DOUBLE_INIT(u, a, b, c, d, e, f, g, h) \
+	do { \
+		(u)->x[0] = (d); \
+		(u)->x[1] = (c); \
+		(u)->x[2] = (b); \
+		(u)->x[3] = (a); \
+		(u)->x[4] = (h); \
+		(u)->x[5] = (g); \
+		(u)->x[6] = (f); \
+		(u)->x[7] = (e); \
 	} while (0)
 #define DUK__DOUBLE_COMPARE(u, a, b, c, d, e, f, g, h) \
-	((u)->x[0] == (d) && (u)->x[1] == (c) && (u)->x[2] == (b) && (u)->x[3] == (a) && \
-	 (u)->x[4] == (h) && (u)->x[5] == (g) && (u)->x[6] == (f) && (u)->x[7] == (e))
+	((u)->x[0] == (d) && (u)->x[1] == (c) && (u)->x[2] == (b) && (u)->x[3] == (a) && (u)->x[4] == (h) && (u)->x[5] == (g) && \
+	 (u)->x[6] == (f) && (u)->x[7] == (e))
 #elif defined(DUK_USE_DOUBLE_BE)
-#define DUK__DOUBLE_INIT(u, a, b, c, d, e, f, g, h) do { \
-		(u)->x[0] = (a); (u)->x[1] = (b); (u)->x[2] = (c); (u)->x[3] = (d); \
-		(u)->x[4] = (e); (u)->x[5] = (f); (u)->x[6] = (g); (u)->x[7] = (h); \
+#define DUK__DOUBLE_INIT(u, a, b, c, d, e, f, g, h) \
+	do { \
+		(u)->x[0] = (a); \
+		(u)->x[1] = (b); \
+		(u)->x[2] = (c); \
+		(u)->x[3] = (d); \
+		(u)->x[4] = (e); \
+		(u)->x[5] = (f); \
+		(u)->x[6] = (g); \
+		(u)->x[7] = (h); \
 	} while (0)
 #define DUK__DOUBLE_COMPARE(u, a, b, c, d, e, f, g, h) \
-	((u)->x[0] == (a) && (u)->x[1] == (b) && (u)->x[2] == (c) && (u)->x[3] == (d) && \
-	 (u)->x[4] == (e) && (u)->x[5] == (f) && (u)->x[6] == (g) && (u)->x[7] == (h))
+	((u)->x[0] == (a) && (u)->x[1] == (b) && (u)->x[2] == (c) && (u)->x[3] == (d) && (u)->x[4] == (e) && (u)->x[5] == (f) && \
+	 (u)->x[6] == (g) && (u)->x[7] == (h))
 #else
 #error unknown double endianness
 #endif
@@ -88604,17 +93017,12 @@ typedef union {
 DUK_LOCAL duk_uint_t duk__selftest_types(void) {
 	duk_uint_t error_count = 0;
 
-	if (!(sizeof(duk_int8_t) == 1 &&
-	      sizeof(duk_uint8_t) == 1 &&
-	      sizeof(duk_int16_t) == 2 &&
-	      sizeof(duk_uint16_t) == 2 &&
-	      sizeof(duk_int32_t) == 4 &&
-	      sizeof(duk_uint32_t) == 4)) {
+	if (!(sizeof(duk_int8_t) == 1 && sizeof(duk_uint8_t) == 1 && sizeof(duk_int16_t) == 2 && sizeof(duk_uint16_t) == 2 &&
+	      sizeof(duk_int32_t) == 4 && sizeof(duk_uint32_t) == 4)) {
 		DUK__FAILED("duk_(u)int{8,16,32}_t size");
 	}
 #if defined(DUK_USE_64BIT_OPS)
-	if (!(sizeof(duk_int64_t) == 8 &&
-	      sizeof(duk_uint64_t) == 8)) {
+	if (!(sizeof(duk_int64_t) == 8 && sizeof(duk_uint64_t) == 8)) {
 		DUK__FAILED("duk_(u)int64_t size");
 	}
 #endif
@@ -88690,7 +93098,7 @@ DUK_LOCAL duk_uint_t duk__selftest_byte_order(void) {
 		DUK__FAILED("duk_uint32_t byte order");
 	}
 
-	if (u2.d != (double) 102030405060.0) {
+	if (!duk_double_equals(u2.d, 102030405060.0)) {
 		DUK__FAILED("double byte order");
 	}
 
@@ -88703,10 +93111,28 @@ DUK_LOCAL duk_uint_t duk__selftest_byte_order(void) {
 
 DUK_LOCAL duk_uint_t duk__selftest_bswap_macros(void) {
 	duk_uint_t error_count = 0;
+	volatile duk_uint32_t x32_input, x32_output;
 	duk_uint32_t x32;
+	volatile duk_uint16_t x16_input, x16_output;
 	duk_uint16_t x16;
 	duk_double_union du;
 	duk_double_t du_diff;
+#if defined(DUK_BSWAP64)
+	volatile duk_uint64_t x64_input, x64_output;
+	duk_uint64_t x64;
+#endif
+
+	/* Cover both compile time and runtime bswap operations, as these
+	 * may have different bugs.
+	 */
+
+	x16_input = 0xbeefUL;
+	x16 = x16_input;
+	x16 = DUK_BSWAP16(x16);
+	x16_output = x16;
+	if (x16_output != (duk_uint16_t) 0xefbeUL) {
+		DUK__FAILED("DUK_BSWAP16");
+	}
 
 	x16 = 0xbeefUL;
 	x16 = DUK_BSWAP16(x16);
@@ -88714,18 +93140,48 @@ DUK_LOCAL duk_uint_t duk__selftest_bswap_macros(void) {
 		DUK__FAILED("DUK_BSWAP16");
 	}
 
+	x32_input = 0xdeadbeefUL;
+	x32 = x32_input;
+	x32 = DUK_BSWAP32(x32);
+	x32_output = x32;
+	if (x32_output != (duk_uint32_t) 0xefbeaddeUL) {
+		DUK__FAILED("DUK_BSWAP32");
+	}
+
 	x32 = 0xdeadbeefUL;
 	x32 = DUK_BSWAP32(x32);
 	if (x32 != (duk_uint32_t) 0xefbeaddeUL) {
 		DUK__FAILED("DUK_BSWAP32");
 	}
 
+#if defined(DUK_BSWAP64)
+	x64_input = DUK_U64_CONSTANT(0x8899aabbccddeeff);
+	x64 = x64_input;
+	x64 = DUK_BSWAP64(x64);
+	x64_output = x64;
+	if (x64_output != (duk_uint64_t) DUK_U64_CONSTANT(0xffeeddccbbaa9988)) {
+		DUK__FAILED("DUK_BSWAP64");
+	}
+
+	x64 = DUK_U64_CONSTANT(0x8899aabbccddeeff);
+	x64 = DUK_BSWAP64(x64);
+	if (x64 != (duk_uint64_t) DUK_U64_CONSTANT(0xffeeddccbbaa9988)) {
+		DUK__FAILED("DUK_BSWAP64");
+	}
+#endif
+
 	/* >>> struct.unpack('>d', '4000112233445566'.decode('hex'))
 	 * (2.008366013071895,)
 	 */
 
-	du.uc[0] = 0x40; du.uc[1] = 0x00; du.uc[2] = 0x11; du.uc[3] = 0x22;
-	du.uc[4] = 0x33; du.uc[5] = 0x44; du.uc[6] = 0x55; du.uc[7] = 0x66;
+	du.uc[0] = 0x40;
+	du.uc[1] = 0x00;
+	du.uc[2] = 0x11;
+	du.uc[3] = 0x22;
+	du.uc[4] = 0x33;
+	du.uc[5] = 0x44;
+	du.uc[6] = 0x55;
+	du.uc[7] = 0x66;
 	DUK_DBLUNION_DOUBLE_NTOH(&du);
 	du_diff = du.d - 2.008366013071895;
 #if 0
@@ -88780,20 +93236,38 @@ DUK_LOCAL duk_uint_t duk__selftest_double_aliasing(void) {
 	 */
 
 	/* little endian */
-	a.x[0] = 0x11; a.x[1] = 0x22; a.x[2] = 0x33; a.x[3] = 0x44;
-	a.x[4] = 0x00; a.x[5] = 0x00; a.x[6] = 0xf1; a.x[7] = 0xff;
+	a.x[0] = 0x11;
+	a.x[1] = 0x22;
+	a.x[2] = 0x33;
+	a.x[3] = 0x44;
+	a.x[4] = 0x00;
+	a.x[5] = 0x00;
+	a.x[6] = 0xf1;
+	a.x[7] = 0xff;
 	b = a;
 	DUK__DBLUNION_CMP_TRUE(&a, &b);
 
 	/* big endian */
-	a.x[0] = 0xff; a.x[1] = 0xf1; a.x[2] = 0x00; a.x[3] = 0x00;
-	a.x[4] = 0x44; a.x[5] = 0x33; a.x[6] = 0x22; a.x[7] = 0x11;
+	a.x[0] = 0xff;
+	a.x[1] = 0xf1;
+	a.x[2] = 0x00;
+	a.x[3] = 0x00;
+	a.x[4] = 0x44;
+	a.x[5] = 0x33;
+	a.x[6] = 0x22;
+	a.x[7] = 0x11;
 	b = a;
 	DUK__DBLUNION_CMP_TRUE(&a, &b);
 
 	/* mixed endian */
-	a.x[0] = 0x00; a.x[1] = 0x00; a.x[2] = 0xf1; a.x[3] = 0xff;
-	a.x[4] = 0x11; a.x[5] = 0x22; a.x[6] = 0x33; a.x[7] = 0x44;
+	a.x[0] = 0x00;
+	a.x[1] = 0x00;
+	a.x[2] = 0xf1;
+	a.x[3] = 0xff;
+	a.x[4] = 0x11;
+	a.x[5] = 0x22;
+	a.x[6] = 0x33;
+	a.x[7] = 0x44;
 	b = a;
 	DUK__DBLUNION_CMP_TRUE(&a, &b);
 
@@ -88858,10 +93332,14 @@ DUK_LOCAL duk_uint_t duk__selftest_double_rounding(void) {
 	c.d = a.d + b.d;
 	if (!DUK__DOUBLE_COMPARE(&c, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)) {
 		DUK_D(DUK_DPRINT("broken result (native endiannesss): %02x %02x %02x %02x %02x %02x %02x %02x",
-		                 (unsigned int) c.x[0], (unsigned int) c.x[1],
-		                 (unsigned int) c.x[2], (unsigned int) c.x[3],
-		                 (unsigned int) c.x[4], (unsigned int) c.x[5],
-		                 (unsigned int) c.x[6], (unsigned int) c.x[7]));
+		                 (unsigned int) c.x[0],
+		                 (unsigned int) c.x[1],
+		                 (unsigned int) c.x[2],
+		                 (unsigned int) c.x[3],
+		                 (unsigned int) c.x[4],
+		                 (unsigned int) c.x[5],
+		                 (unsigned int) c.x[6],
+		                 (unsigned int) c.x[7]));
 		DUK__FAILED("invalid result from 1.0 + 0.5ulp");
 	}
 
@@ -88878,10 +93356,14 @@ DUK_LOCAL duk_uint_t duk__selftest_double_rounding(void) {
 	c.d = a.d + b.d;
 	if (!DUK__DOUBLE_COMPARE(&c, 0x3f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02)) {
 		DUK_D(DUK_DPRINT("broken result (native endiannesss): %02x %02x %02x %02x %02x %02x %02x %02x",
-		                 (unsigned int) c.x[0], (unsigned int) c.x[1],
-		                 (unsigned int) c.x[2], (unsigned int) c.x[3],
-		                 (unsigned int) c.x[4], (unsigned int) c.x[5],
-		                 (unsigned int) c.x[6], (unsigned int) c.x[7]));
+		                 (unsigned int) c.x[0],
+		                 (unsigned int) c.x[1],
+		                 (unsigned int) c.x[2],
+		                 (unsigned int) c.x[3],
+		                 (unsigned int) c.x[4],
+		                 (unsigned int) c.x[5],
+		                 (unsigned int) c.x[6],
+		                 (unsigned int) c.x[7]));
 		DUK__FAILED("invalid result from (1.0 + ulp) + 0.5ulp");
 	}
 
@@ -89023,7 +93505,7 @@ DUK_LOCAL duk_uint_t duk__selftest_cast_double_to_small_uint(void) {
 	u = (duk_small_uint_t) d1;
 	d2 = (duk_double_t) u;
 
-	if (!(d1 == 1.0 && u == 1 && d2 == 1.0 && d1 == d2)) {
+	if (!(duk_double_equals(d1, 1.0) && u == 1 && duk_double_equals(d2, 1.0) && duk_double_equals(d1, d2))) {
 		DUK__FAILED("double to duk_small_uint_t cast failed");
 	}
 
@@ -89033,7 +93515,7 @@ DUK_LOCAL duk_uint_t duk__selftest_cast_double_to_small_uint(void) {
 	uv = (duk_small_uint_t) d1v;
 	d2v = (duk_double_t) uv;
 
-	if (!(d1v == 1.0 && uv == 1 && d2v == 1.0 && d1v == d2v)) {
+	if (!(duk_double_equals(d1v, 1.0) && uv == 1 && duk_double_equals(d2v, 1.0) && duk_double_equals(d1v, d2v))) {
 		DUK__FAILED("double to duk_small_uint_t cast failed");
 	}
 
@@ -89052,7 +93534,7 @@ DUK_LOCAL duk_uint_t duk__selftest_cast_double_to_uint32(void) {
 	duk_double_t dv;
 	duk_uint32_t uv;
 
-	dv = 3735928559.0;  /* 0xdeadbeef in decimal */
+	dv = 3735928559.0; /* 0xdeadbeef in decimal */
 	uv = (duk_uint32_t) dv;
 
 	if (uv != 0xdeadbeefUL) {
@@ -89089,7 +93571,7 @@ DUK_LOCAL duk_uint_t duk__selftest_alloc_funcs(duk_alloc_function alloc_func,
 		ptr = alloc_func(udata, (duk_size_t) i);
 		if (ptr == NULL) {
 			DUK_D(DUK_DPRINT("alloc failed, ignore"));
-			continue;  /* alloc failed, ignore */
+			continue; /* alloc failed, ignore */
 		}
 		for (j = 0; j < i; j++) {
 			((unsigned char *) ptr)[j] = (unsigned char) (0x80 + j);
@@ -89098,14 +93580,15 @@ DUK_LOCAL duk_uint_t duk__selftest_alloc_funcs(duk_alloc_function alloc_func,
 		if (new_ptr == NULL) {
 			DUK_D(DUK_DPRINT("realloc failed, ignore"));
 			free_func(udata, ptr);
-			continue;  /* realloc failed, ignore */
+			continue; /* realloc failed, ignore */
 		}
 		ptr = new_ptr;
 		for (j = 0; j < i; j++) {
 			x = ((unsigned char *) ptr)[j];
 			if (x != (unsigned char) (0x80 + j)) {
 				DUK_D(DUK_DPRINT("byte at index %ld doesn't match after realloc: %02lx",
-				                 (long) j, (unsigned long) x));
+				                 (long) j,
+				                 (unsigned long) x));
 				DUK__FAILED("byte compare after realloc");
 				break;
 			}
@@ -89149,7 +93632,7 @@ DUK_INTERNAL duk_uint_t duk_selftest_run_tests(duk_alloc_function alloc_func,
 	return error_count;
 }
 
-#endif  /* DUK_USE_SELF_TESTS */
+#endif /* DUK_USE_SELF_TESTS */
 
 /* automatic undefs */
 #undef DUK__DBLUNION_CMP_FALSE
@@ -89192,11 +93675,11 @@ DUK_INTERNAL DUK_ALWAYS_INLINE void duk_tval_set_number_chkfast_fast(duk_tval *t
 	expt = (duk_small_int_t) ((i >> 52) & 0x07ff);
 	shift = expt - 1023;
 
-	if (shift >= 0 && shift <= 46) {  /* exponents 1023 to 1069 */
+	if (shift >= 0 && shift <= 46) { /* exponents 1023 to 1069 */
 		duk_int64_t t;
 
 		if (((DUK_I64_CONSTANT(0x000fffffffffffff) >> shift) & i) == 0) {
-			t = i | DUK_I64_CONSTANT(0x0010000000000000);  /* implicit leading one */
+			t = i | DUK_I64_CONSTANT(0x0010000000000000); /* implicit leading one */
 			t = t & DUK_I64_CONSTANT(0x001fffffffffffff);
 			t = t >> (52 - shift);
 			if (i < 0) {
@@ -89205,13 +93688,13 @@ DUK_INTERNAL DUK_ALWAYS_INLINE void duk_tval_set_number_chkfast_fast(duk_tval *t
 			DUK_TVAL_SET_FASTINT(tv, t);
 			return;
 		}
-	} else if (shift == -1023) {  /* exponent 0 */
+	} else if (shift == -1023) { /* exponent 0 */
 		if (i >= 0 && (i & DUK_I64_CONSTANT(0x000fffffffffffff)) == 0) {
 			/* Note: reject negative zero. */
 			DUK_TVAL_SET_FASTINT(tv, (duk_int64_t) 0);
 			return;
 		}
-	} else if (shift == 47) {  /* exponent 1070 */
+	} else if (shift == 47) { /* exponent 1070 */
 		if (i < 0 && (i & DUK_I64_CONSTANT(0x000fffffffffffff)) == 0) {
 			DUK_TVAL_SET_FASTINT(tv, (duk_int64_t) DUK_FASTINT_MIN);
 			return;
@@ -89239,23 +93722,23 @@ DUK_INTERNAL DUK_ALWAYS_INLINE duk_double_t duk_tval_get_number_packed(duk_tval
 	if ((t >> 48) != DUK_TAG_FASTINT) {
 		return tv->d;
 	} else if (t & DUK_U64_CONSTANT(0x0000800000000000)) {
-		t = (duk_uint64_t) (-((duk_int64_t) t));  /* avoid unary minus on unsigned */
-		t = t & DUK_U64_CONSTANT(0x0000ffffffffffff);  /* negative */
+		t = (duk_uint64_t) (-((duk_int64_t) t)); /* avoid unary minus on unsigned */
+		t = t & DUK_U64_CONSTANT(0x0000ffffffffffff); /* negative */
 		t |= DUK_U64_CONSTANT(0xc330000000000000);
 		DUK_DBLUNION_SET_UINT64(&du, t);
-		return du.d + 4503599627370496.0;  /* 1 << 52 */
+		return du.d + 4503599627370496.0; /* 1 << 52 */
 	} else if (t != 0) {
-		t &= DUK_U64_CONSTANT(0x0000ffffffffffff);  /* positive */
+		t &= DUK_U64_CONSTANT(0x0000ffffffffffff); /* positive */
 		t |= DUK_U64_CONSTANT(0x4330000000000000);
 		DUK_DBLUNION_SET_UINT64(&du, t);
-		return du.d - 4503599627370496.0;  /* 1 << 52 */
+		return du.d - 4503599627370496.0; /* 1 << 52 */
 	} else {
-		return 0.0;  /* zero */
+		return 0.0; /* zero */
 	}
 }
-#endif  /* DUK_USE_FASTINT && DUK_USE_PACKED_TVAL */
+#endif /* DUK_USE_FASTINT && DUK_USE_PACKED_TVAL */
 
-#if 0  /* unused */
+#if 0 /* unused */
 #if defined(DUK_USE_FASTINT) && !defined(DUK_USE_PACKED_TVAL)
 DUK_INTERNAL DUK_ALWAYS_INLINE duk_double_t duk_tval_get_number_unpacked(duk_tval *tv) {
 	duk_double_union du;
@@ -89277,8 +93760,8 @@ DUK_INTERNAL DUK_ALWAYS_INLINE duk_double_t duk_tval_get_number_unpacked(duk_tva
 		return tv->v.d;
 	}
 }
-#endif  /* DUK_USE_FASTINT && DUK_USE_PACKED_TVAL */
-#endif  /* 0 */
+#endif /* DUK_USE_FASTINT && DUK_USE_PACKED_TVAL */
+#endif /* 0 */
 
 #if defined(DUK_USE_FASTINT) && !defined(DUK_USE_PACKED_TVAL)
 DUK_INTERNAL DUK_ALWAYS_INLINE duk_double_t duk_tval_get_number_unpacked_fastint(duk_tval *tv) {
@@ -89290,16 +93773,26 @@ DUK_INTERNAL DUK_ALWAYS_INLINE duk_double_t duk_tval_get_number_unpacked_fastint
 	if (tv->v.fi >= 0) {
 		t = DUK_U64_CONSTANT(0x4330000000000000) | (duk_uint64_t) tv->v.fi;
 		DUK_DBLUNION_SET_UINT64(&du, t);
-		return du.d - 4503599627370496.0;  /* 1 << 52 */
+		return du.d - 4503599627370496.0; /* 1 << 52 */
 	} else {
 		t = DUK_U64_CONSTANT(0xc330000000000000) | (duk_uint64_t) (-tv->v.fi);
 		DUK_DBLUNION_SET_UINT64(&du, t);
-		return du.d + 4503599627370496.0;  /* 1 << 52 */
+		return du.d + 4503599627370496.0; /* 1 << 52 */
 	}
 }
-#endif  /* DUK_USE_FASTINT && DUK_USE_PACKED_TVAL */
+#endif /* DUK_USE_FASTINT && DUK_USE_PACKED_TVAL */
+
+#endif /* DUK_USE_FASTINT */
 
-#endif  /* DUK_USE_FASTINT */
+/*
+ *  Assertion helpers.
+ */
+
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL void duk_tval_assert_valid(duk_tval *tv) {
+	DUK_ASSERT(tv != NULL);
+}
+#endif
 /*
  *  Unicode support tables automatically generated during build.
  */
@@ -89325,55 +93818,57 @@ DUK_INTERNAL DUK_ALWAYS_INLINE duk_double_t duk_tval_get_number_unpacked_fastint
  *  Automatically generated by extract_chars.py, do not edit!
  */
 
-const duk_uint8_t duk_unicode_ids_noa[1063] = {
+const duk_uint8_t duk_unicode_ids_noa[1116] = {
 249,176,176,80,111,7,47,15,47,254,11,197,191,0,72,2,15,115,66,19,50,7,2,34,
-2,240,66,244,50,247,185,249,98,241,99,8,241,127,58,240,182,47,31,241,191,
+2,240,66,244,50,247,185,249,98,241,99,7,241,159,57,240,181,63,31,241,191,
 21,18,245,50,15,1,24,27,35,15,2,2,240,239,15,244,156,15,10,241,26,21,6,240,
 101,10,4,15,9,240,152,175,39,240,82,127,56,242,100,15,4,8,159,1,240,5,115,
 19,240,98,98,4,52,15,2,14,18,47,0,27,9,85,19,240,98,98,18,18,31,17,50,15,5,
 47,2,130,34,240,98,98,18,68,15,4,15,1,31,9,12,115,19,240,98,98,18,68,15,16,
 18,47,1,15,3,2,84,34,52,18,2,20,20,36,191,8,15,38,114,34,240,114,240,4,15,
 12,38,31,16,5,114,34,240,114,146,68,15,18,2,31,1,31,4,114,34,241,147,15,2,
-6,41,47,10,86,240,36,240,130,130,3,111,44,242,2,29,111,44,18,3,18,3,7,50,
-98,34,2,3,18,50,26,3,66,15,7,63,18,15,49,114,241,79,13,79,101,241,191,6,15,
-2,85,52,4,24,37,205,15,3,241,98,6,3,241,178,255,224,63,35,54,32,35,63,25,
-35,63,17,35,54,32,35,62,47,41,35,63,51,241,127,0,240,47,70,53,79,254,21,
-227,240,18,240,166,243,180,168,194,63,0,240,47,0,240,47,0,194,47,1,242,79,
-21,5,15,53,244,137,67,241,34,6,243,107,240,255,35,240,227,76,241,197,240,
-175,40,240,122,242,95,68,15,79,241,255,3,111,41,240,238,27,241,207,12,241,
-79,27,43,241,67,143,82,50,52,26,251,15,50,255,224,8,53,63,22,53,55,32,32,
-32,47,15,63,37,38,32,66,38,67,53,92,98,38,246,96,224,240,44,245,112,80,57,
-32,68,112,32,32,35,42,51,100,80,240,63,25,255,233,107,241,242,241,242,247,
-87,52,29,241,98,6,3,242,136,15,2,240,122,98,98,98,98,98,98,98,111,66,15,
-254,12,146,240,184,132,52,95,70,114,47,74,35,111,26,63,78,240,63,11,242,
-127,0,255,224,244,255,240,0,138,143,60,255,240,4,13,223,7,255,227,127,243,
-95,30,63,253,79,0,177,240,111,31,240,47,15,63,64,241,152,63,87,63,20,39,
-243,26,34,35,47,7,240,255,36,240,15,34,243,5,64,32,223,12,191,7,240,191,13,
-143,31,240,224,240,36,41,180,47,25,240,146,39,240,111,7,64,79,34,32,65,52,
-48,32,240,162,58,130,213,53,53,166,38,47,27,41,191,99,240,255,255,0,26,150,
-223,7,95,33,255,240,0,255,143,254,6,3,245,175,24,109,70,2,146,194,66,2,18,
-18,245,207,19,255,224,93,240,79,48,63,38,241,171,246,100,47,119,241,111,10,
-127,10,207,73,69,53,53,50,241,91,47,10,47,3,33,46,61,241,79,107,243,127,37,
-255,223,13,79,33,242,31,16,239,14,111,22,191,14,63,20,87,36,241,207,142,
-240,79,20,95,20,95,24,159,36,248,239,254,2,154,240,107,127,138,83,2,241,
-194,20,3,240,123,240,122,240,255,51,240,50,27,240,107,240,175,56,242,135,
-31,50,15,1,50,34,240,191,30,240,212,240,223,21,114,240,207,13,242,107,240,
-107,240,62,240,47,96,243,159,41,242,62,242,63,254,32,79,37,243,223,29,241,
-47,9,240,207,20,241,191,19,64,223,32,240,3,240,112,32,241,95,2,47,9,244,
-102,32,35,46,41,143,31,241,135,49,63,6,38,33,36,64,240,64,212,249,15,37,
-240,67,242,127,32,240,97,32,250,175,31,241,179,241,111,32,240,96,242,223,
-27,244,127,10,255,224,122,243,15,17,15,242,11,241,136,15,7,12,241,131,63,
-40,242,159,249,130,241,95,3,15,35,240,239,98,98,18,241,111,7,15,254,26,223,
-254,40,207,88,245,255,3,251,79,254,155,15,254,50,31,254,236,95,254,19,159,
-255,0,16,173,255,225,43,143,15,246,63,14,240,79,32,240,35,241,31,5,111,3,
-255,226,100,243,92,15,52,207,50,31,16,255,240,0,109,255,5,255,225,229,255,
-240,1,64,31,254,1,31,67,255,224,126,255,231,248,245,182,196,136,159,255,0,
-6,90,244,82,243,114,19,3,19,50,178,2,98,243,18,51,114,98,240,194,50,66,4,
-98,255,224,70,63,9,47,9,47,15,47,9,47,15,47,9,47,15,47,9,47,15,47,9,39,255,
-239,40,251,95,45,243,79,254,59,3,47,11,33,32,48,41,35,32,32,112,80,32,32,
-34,33,32,48,32,32,32,32,33,32,51,38,35,35,32,41,47,1,98,36,47,1,255,240,0,
-3,143,255,0,149,201,241,191,254,242,124,252,227,255,240,0,87,79,0,255,240,
-0,194,63,254,177,63,254,17,0,
+6,41,47,10,86,240,36,240,130,130,3,111,44,242,2,29,111,44,18,2,66,240,130,
+2,146,26,3,66,15,7,63,18,15,49,114,241,79,13,79,101,241,191,6,15,2,85,52,4,
+24,37,205,15,3,241,98,6,3,241,178,255,224,63,35,54,32,35,63,25,35,63,17,35,
+54,32,35,62,47,41,35,63,51,241,127,0,240,47,70,53,79,254,21,227,240,18,240,
+166,243,180,168,194,63,0,240,47,0,240,47,0,194,47,1,242,79,21,5,15,53,244,
+152,67,241,34,6,243,107,240,255,35,240,227,76,241,197,240,175,40,240,122,
+242,95,68,15,79,241,255,3,111,41,240,238,27,241,207,12,241,79,27,43,241,67,
+136,241,179,47,27,50,82,20,6,251,15,50,255,224,8,53,63,22,53,55,32,32,32,
+47,15,63,37,38,32,66,38,67,53,92,98,38,246,96,224,240,44,245,112,80,57,32,
+68,112,32,32,35,42,51,100,80,240,63,25,255,233,107,241,242,241,242,247,87,
+52,29,241,98,6,3,242,136,15,2,240,122,98,98,98,98,98,98,98,111,66,15,254,
+12,146,240,184,132,52,95,70,114,47,74,35,111,27,47,78,240,63,11,242,127,0,
+255,224,244,255,240,0,138,143,60,255,240,4,14,47,2,255,227,127,243,95,30,
+63,253,79,0,177,240,111,31,240,47,15,63,64,241,152,63,87,63,37,52,242,42,
+34,35,47,7,240,255,36,240,15,34,243,5,64,33,207,12,191,7,240,191,13,143,31,
+240,224,240,36,41,180,47,25,240,146,39,240,111,7,64,79,34,32,65,52,48,32,
+240,162,58,130,213,53,53,166,38,47,27,43,159,99,240,255,255,0,26,150,223,7,
+95,33,255,240,0,255,143,254,6,3,245,175,24,109,70,2,146,194,66,2,18,18,245,
+207,19,255,224,93,240,79,48,63,38,241,171,246,100,47,119,241,111,10,127,10,
+207,73,69,53,53,50,241,91,47,10,47,3,33,46,61,241,79,107,243,127,37,255,
+223,13,79,33,242,31,16,239,14,111,22,191,14,63,20,87,36,241,207,142,240,79,
+20,95,20,95,24,159,36,248,239,254,2,154,240,107,127,138,83,2,241,194,20,3,
+240,123,240,122,240,255,51,240,50,27,240,107,240,175,56,242,135,31,50,15,1,
+50,34,240,223,28,240,212,240,223,21,114,240,207,13,242,107,240,107,240,62,
+240,47,96,243,159,41,242,62,242,62,241,79,254,13,15,13,176,159,6,248,207,7,
+223,37,243,223,29,241,47,9,240,207,20,240,240,207,19,64,223,32,240,3,240,
+112,32,241,95,2,47,9,244,102,32,35,46,41,143,31,241,135,49,63,6,38,33,36,
+64,240,64,212,249,15,37,240,67,240,96,241,47,32,240,97,32,250,175,31,241,
+179,241,111,32,240,96,242,223,27,224,243,159,11,253,127,28,246,111,48,241,
+16,249,39,63,23,240,32,32,240,224,191,24,128,240,112,207,30,240,80,241,79,
+41,255,152,47,21,240,48,242,63,14,246,38,33,47,22,240,112,240,181,33,47,16,
+240,0,255,224,59,240,63,254,0,31,254,40,207,88,245,255,3,251,79,254,155,15,
+254,50,31,254,236,95,254,19,159,255,0,16,173,255,225,43,143,15,246,63,14,
+240,79,32,240,35,241,31,5,111,3,255,225,164,243,15,114,243,182,15,52,207,
+50,18,15,14,255,240,0,110,169,255,225,229,255,240,1,64,31,254,1,31,35,47,3,
+57,255,224,126,255,231,248,245,182,196,136,159,255,0,6,90,244,82,243,114,
+19,3,19,50,178,2,98,243,18,51,114,98,240,194,50,66,4,98,255,224,70,63,9,47,
+9,47,15,47,9,47,15,47,9,47,15,47,9,47,15,47,9,39,255,232,40,241,219,111,2,
+15,254,6,95,28,255,228,8,251,95,45,243,72,15,254,58,131,47,11,33,32,48,41,
+35,32,32,112,80,32,32,34,33,32,48,32,32,32,32,33,32,51,38,35,35,32,41,47,1,
+98,36,47,1,255,240,0,3,143,255,0,149,201,241,191,254,242,124,252,227,255,
+240,0,87,79,0,255,240,0,194,63,254,177,63,254,17,0,
 };
 #else
 /* IdentifierStart production with ASCII and non-BMP excluded */
@@ -89382,35 +93877,35 @@ const duk_uint8_t duk_unicode_ids_noa[1063] = {
  *  Automatically generated by extract_chars.py, do not edit!
  */
 
-const duk_uint8_t duk_unicode_ids_noabmp[626] = {
+const duk_uint8_t duk_unicode_ids_noabmp[625] = {
 249,176,176,80,111,7,47,15,47,254,11,197,191,0,72,2,15,115,66,19,50,7,2,34,
-2,240,66,244,50,247,185,249,98,241,99,8,241,127,58,240,182,47,31,241,191,
+2,240,66,244,50,247,185,249,98,241,99,7,241,159,57,240,181,63,31,241,191,
 21,18,245,50,15,1,24,27,35,15,2,2,240,239,15,244,156,15,10,241,26,21,6,240,
 101,10,4,15,9,240,152,175,39,240,82,127,56,242,100,15,4,8,159,1,240,5,115,
 19,240,98,98,4,52,15,2,14,18,47,0,27,9,85,19,240,98,98,18,18,31,17,50,15,5,
 47,2,130,34,240,98,98,18,68,15,4,15,1,31,9,12,115,19,240,98,98,18,68,15,16,
 18,47,1,15,3,2,84,34,52,18,2,20,20,36,191,8,15,38,114,34,240,114,240,4,15,
 12,38,31,16,5,114,34,240,114,146,68,15,18,2,31,1,31,4,114,34,241,147,15,2,
-6,41,47,10,86,240,36,240,130,130,3,111,44,242,2,29,111,44,18,3,18,3,7,50,
-98,34,2,3,18,50,26,3,66,15,7,63,18,15,49,114,241,79,13,79,101,241,191,6,15,
-2,85,52,4,24,37,205,15,3,241,98,6,3,241,178,255,224,63,35,54,32,35,63,25,
-35,63,17,35,54,32,35,62,47,41,35,63,51,241,127,0,240,47,70,53,79,254,21,
-227,240,18,240,166,243,180,168,194,63,0,240,47,0,240,47,0,194,47,1,242,79,
-21,5,15,53,244,137,67,241,34,6,243,107,240,255,35,240,227,76,241,197,240,
-175,40,240,122,242,95,68,15,79,241,255,3,111,41,240,238,27,241,207,12,241,
-79,27,43,241,67,143,82,50,52,26,251,15,50,255,224,8,53,63,22,53,55,32,32,
-32,47,15,63,37,38,32,66,38,67,53,92,98,38,246,96,224,240,44,245,112,80,57,
-32,68,112,32,32,35,42,51,100,80,240,63,25,255,233,107,241,242,241,242,247,
-87,52,29,241,98,6,3,242,136,15,2,240,122,98,98,98,98,98,98,98,111,66,15,
-254,12,146,240,184,132,52,95,70,114,47,74,35,111,26,63,78,240,63,11,242,
-127,0,255,224,244,255,240,0,138,143,60,255,240,4,13,223,7,255,227,127,243,
-95,30,63,253,79,0,177,240,111,31,240,47,15,63,64,241,152,63,87,63,20,39,
-243,26,34,35,47,7,240,255,36,240,15,34,243,5,64,32,223,12,191,7,240,191,13,
-143,31,240,224,240,36,41,180,47,25,240,146,39,240,111,7,64,79,34,32,65,52,
-48,32,240,162,58,130,213,53,53,166,38,47,27,41,191,99,240,255,255,0,26,150,
-223,7,95,33,255,240,0,255,143,254,6,3,245,175,24,109,70,2,146,194,66,2,18,
-18,245,207,19,255,224,93,240,79,48,63,38,241,171,246,100,47,119,241,111,10,
-127,10,207,73,69,53,53,50,0,
+6,41,47,10,86,240,36,240,130,130,3,111,44,242,2,29,111,44,18,2,66,240,130,
+2,146,26,3,66,15,7,63,18,15,49,114,241,79,13,79,101,241,191,6,15,2,85,52,4,
+24,37,205,15,3,241,98,6,3,241,178,255,224,63,35,54,32,35,63,25,35,63,17,35,
+54,32,35,62,47,41,35,63,51,241,127,0,240,47,70,53,79,254,21,227,240,18,240,
+166,243,180,168,194,63,0,240,47,0,240,47,0,194,47,1,242,79,21,5,15,53,244,
+152,67,241,34,6,243,107,240,255,35,240,227,76,241,197,240,175,40,240,122,
+242,95,68,15,79,241,255,3,111,41,240,238,27,241,207,12,241,79,27,43,241,67,
+136,241,179,47,27,50,82,20,6,251,15,50,255,224,8,53,63,22,53,55,32,32,32,
+47,15,63,37,38,32,66,38,67,53,92,98,38,246,96,224,240,44,245,112,80,57,32,
+68,112,32,32,35,42,51,100,80,240,63,25,255,233,107,241,242,241,242,247,87,
+52,29,241,98,6,3,242,136,15,2,240,122,98,98,98,98,98,98,98,111,66,15,254,
+12,146,240,184,132,52,95,70,114,47,74,35,111,27,47,78,240,63,11,242,127,0,
+255,224,244,255,240,0,138,143,60,255,240,4,14,47,2,255,227,127,243,95,30,
+63,253,79,0,177,240,111,31,240,47,15,63,64,241,152,63,87,63,37,52,242,42,
+34,35,47,7,240,255,36,240,15,34,243,5,64,33,207,12,191,7,240,191,13,143,31,
+240,224,240,36,41,180,47,25,240,146,39,240,111,7,64,79,34,32,65,52,48,32,
+240,162,58,130,213,53,53,166,38,47,27,43,159,99,240,255,255,0,26,150,223,7,
+95,33,255,240,0,255,143,254,6,3,245,175,24,109,70,2,146,194,66,2,18,18,245,
+207,19,255,224,93,240,79,48,63,38,241,171,246,100,47,119,241,111,10,127,10,
+207,73,69,53,53,50,0,
 };
 #endif
 
@@ -89445,33 +93940,35 @@ const duk_uint8_t duk_unicode_ids_m_let_noabmp[24] = {
  *  Automatically generated by extract_chars.py, do not edit!
  */
 
-const duk_uint8_t duk_unicode_idp_m_ids_noa[549] = {
+const duk_uint8_t duk_unicode_idp_m_ids_noa[576] = {
 255,225,243,246,15,254,0,116,255,191,29,32,33,33,32,243,170,242,47,15,112,
-245,118,53,49,35,57,240,144,241,15,11,244,218,240,25,241,56,241,67,40,34,
-36,241,210,246,173,47,17,242,130,47,2,38,177,57,240,50,242,160,38,49,50,
-160,177,57,240,50,242,160,36,81,50,64,240,107,64,194,242,160,39,34,34,240,
-97,57,181,34,242,160,38,49,50,145,177,57,240,64,242,212,66,35,160,240,9,
-240,35,242,198,34,35,129,193,57,240,50,242,160,38,34,35,129,193,57,240,35,
-242,145,38,34,35,160,177,57,240,65,243,128,85,32,39,121,49,242,240,54,215,
-41,244,144,53,33,197,57,243,1,121,192,32,32,81,242,63,4,33,106,47,20,160,
+245,118,53,49,35,57,240,144,241,15,11,244,218,240,25,241,56,160,240,163,40,
+34,36,241,210,246,158,47,17,242,130,47,2,38,177,57,240,50,242,160,38,49,50,
+160,177,57,240,0,50,242,160,36,81,50,64,240,107,64,194,242,160,39,34,34,
+240,97,57,181,34,242,160,38,49,50,145,177,57,240,64,242,212,66,35,160,240,
+9,240,36,242,182,34,35,129,193,57,240,50,242,160,38,34,35,129,193,57,240,
+35,242,145,38,34,35,160,177,57,240,65,243,128,85,32,39,121,49,242,240,54,
+215,41,244,144,56,197,57,243,1,121,192,32,32,81,242,63,4,33,106,47,20,160,
 245,111,4,41,211,82,34,54,67,235,46,255,225,179,47,254,42,98,240,242,240,
 241,241,1,243,47,16,160,57,241,50,57,245,209,241,64,246,139,91,185,247,41,
 242,244,242,185,47,13,58,121,240,141,243,68,242,31,1,201,240,56,210,241,12,
-57,241,237,242,47,4,153,121,246,130,47,5,80,82,50,251,143,42,36,255,225,0,
+57,241,237,242,47,4,153,121,246,130,47,5,80,112,50,251,143,42,36,255,225,0,
 31,35,31,5,15,109,197,4,191,254,175,34,247,240,245,47,16,255,225,30,95,91,
 31,255,0,100,121,159,55,5,159,18,31,66,31,254,0,64,64,80,240,148,244,161,
-242,79,2,185,127,2,240,9,240,231,240,188,241,227,242,29,240,25,192,185,242,
+242,79,2,185,127,2,234,240,231,240,188,241,227,242,29,240,25,192,185,242,
 29,208,145,57,241,50,242,64,34,49,97,32,241,180,97,253,231,33,57,255,240,3,
 225,128,255,225,213,240,15,2,240,4,31,10,47,178,159,23,15,254,27,16,253,64,
-248,116,255,224,25,159,254,68,178,33,99,241,162,80,249,113,255,228,13,47,
-39,239,17,159,1,63,31,175,39,151,47,22,210,159,37,13,47,34,218,36,159,68,
-183,15,146,182,151,63,42,2,99,19,42,11,19,100,79,178,240,42,159,72,240,77,
-159,199,99,143,13,31,68,240,31,1,159,67,201,159,69,229,159,254,9,169,255,
-224,11,159,26,98,57,10,175,32,240,15,254,8,151,39,240,41,242,175,6,45,246,
-197,64,33,38,32,153,255,240,3,191,169,247,132,242,214,240,185,255,226,235,
-241,239,2,63,255,0,59,254,31,255,0,3,186,68,89,115,111,16,63,134,47,254,71,
-223,34,255,224,244,242,117,242,41,15,0,15,8,66,239,254,68,70,47,1,54,33,36,
-255,231,153,111,95,102,159,255,12,6,154,254,0,
+248,116,255,224,25,159,254,68,178,33,99,241,162,80,249,113,255,225,49,57,
+159,254,16,10,250,18,242,126,241,25,240,19,241,250,242,121,114,241,109,41,
+97,241,224,210,242,45,147,73,244,75,112,249,43,105,115,242,145,38,49,50,
+160,177,54,68,251,47,2,169,80,244,63,4,217,252,118,56,240,209,244,79,1,240,
+25,244,60,153,244,94,89,254,78,249,121,253,150,54,64,240,233,241,166,35,
+144,170,242,15,0,255,224,137,114,127,2,159,42,240,98,223,108,84,2,18,98,9,
+159,34,66,18,73,159,254,3,211,255,240,3,165,217,247,132,242,214,240,185,
+255,226,233,2,242,120,63,255,0,59,254,31,255,0,3,186,68,89,115,111,16,63,
+134,47,254,71,223,34,255,224,244,242,117,242,41,15,0,15,8,66,239,254,68,70,
+47,1,54,33,36,255,118,169,255,224,150,223,254,76,166,245,246,105,255,240,
+192,105,175,224,0,
 };
 #else
 /* IdentifierPart production with IdentifierStart, ASCII, and non-BMP excluded */
@@ -89482,20 +93979,20 @@ const duk_uint8_t duk_unicode_idp_m_ids_noa[549] = {
 
 const duk_uint8_t duk_unicode_idp_m_ids_noabmp[358] = {
 255,225,243,246,15,254,0,116,255,191,29,32,33,33,32,243,170,242,47,15,112,
-245,118,53,49,35,57,240,144,241,15,11,244,218,240,25,241,56,241,67,40,34,
-36,241,210,246,173,47,17,242,130,47,2,38,177,57,240,50,242,160,38,49,50,
-160,177,57,240,50,242,160,36,81,50,64,240,107,64,194,242,160,39,34,34,240,
-97,57,181,34,242,160,38,49,50,145,177,57,240,64,242,212,66,35,160,240,9,
-240,35,242,198,34,35,129,193,57,240,50,242,160,38,34,35,129,193,57,240,35,
-242,145,38,34,35,160,177,57,240,65,243,128,85,32,39,121,49,242,240,54,215,
-41,244,144,53,33,197,57,243,1,121,192,32,32,81,242,63,4,33,106,47,20,160,
+245,118,53,49,35,57,240,144,241,15,11,244,218,240,25,241,56,160,240,163,40,
+34,36,241,210,246,158,47,17,242,130,47,2,38,177,57,240,50,242,160,38,49,50,
+160,177,57,240,0,50,242,160,36,81,50,64,240,107,64,194,242,160,39,34,34,
+240,97,57,181,34,242,160,38,49,50,145,177,57,240,64,242,212,66,35,160,240,
+9,240,36,242,182,34,35,129,193,57,240,50,242,160,38,34,35,129,193,57,240,
+35,242,145,38,34,35,160,177,57,240,65,243,128,85,32,39,121,49,242,240,54,
+215,41,244,144,56,197,57,243,1,121,192,32,32,81,242,63,4,33,106,47,20,160,
 245,111,4,41,211,82,34,54,67,235,46,255,225,179,47,254,42,98,240,242,240,
 241,241,1,243,47,16,160,57,241,50,57,245,209,241,64,246,139,91,185,247,41,
 242,244,242,185,47,13,58,121,240,141,243,68,242,31,1,201,240,56,210,241,12,
-57,241,237,242,47,4,153,121,246,130,47,5,80,82,50,251,143,42,36,255,225,0,
+57,241,237,242,47,4,153,121,246,130,47,5,80,112,50,251,143,42,36,255,225,0,
 31,35,31,5,15,109,197,4,191,254,175,34,247,240,245,47,16,255,225,30,95,91,
 31,255,0,100,121,159,55,5,159,18,31,66,31,254,0,64,64,80,240,148,244,161,
-242,79,2,185,127,2,240,9,240,231,240,188,241,227,242,29,240,25,192,185,242,
+242,79,2,185,127,2,234,240,231,240,188,241,227,242,29,240,25,192,185,242,
 29,208,145,57,241,50,242,64,34,49,97,32,241,180,97,253,231,33,57,255,240,3,
 225,128,255,225,213,240,15,2,240,4,31,10,47,178,159,23,0,
 };
@@ -89512,102 +94009,106 @@ const duk_uint8_t duk_unicode_idp_m_ids_noabmp[358] = {
  *  Automatically generated by extract_caseconv.py, do not edit!
  */
 
-const duk_uint8_t duk_unicode_caseconv_uc[1386] = {
-144,3,128,3,0,184,7,192,6,192,112,35,242,199,224,64,74,192,49,32,128,162,
+const duk_uint8_t duk_unicode_caseconv_uc[1411] = {
+152,3,128,3,0,184,7,192,6,192,112,35,242,199,224,64,74,192,49,32,128,162,
 128,108,65,1,189,129,254,131,3,173,3,136,6,7,98,7,34,68,15,12,14,140,72,30,
-104,28,112,32,67,0,65,4,0,138,0,128,4,1,88,65,76,83,9,252,9,248,6,28,131,4,
-33,4,62,0,62,16,32,124,64,124,96,48,249,0,249,64,129,243,1,243,129,3,232,3,
-233,1,135,216,7,218,4,15,184,15,221,2,31,114,31,200,8,62,236,63,180,8,125,
-224,127,224,16,251,208,255,80,33,247,193,255,160,67,246,3,247,0,135,244,7,
-246,1,15,240,15,244,2,33,112,33,96,32,73,160,73,108,104,176,192,176,1,121,
-104,0,133,2,106,183,1,58,10,31,232,63,228,38,162,1,1,1,0,48,2,102,2,100,12,
-4,232,4,228,64,10,88,10,81,112,23,160,23,144,96,48,96,48,64,128,104,64,104,
-1,128,218,0,217,130,1,206,1,205,16,3,190,3,188,36,7,228,7,224,160,17,24,17,
-16,144,36,112,36,96,160,110,32,110,0,128,246,64,246,6,2,48,130,48,17,4,139,
-4,138,54,9,132,9,130,28,19,68,19,65,128,240,8,240,4,177,234,17,234,6,3,234,
-35,235,33,11,26,11,25,193,150,64,150,64,50,44,236,44,235,5,76,131,76,128,
-94,154,6,154,0,117,57,29,57,16,122,115,58,115,35,244,239,84,239,32,169,223,
-233,223,130,211,200,211,200,2,167,151,167,150,21,79,107,79,104,8,112,26,
-208,26,192,64,56,160,56,128,192,113,128,113,1,128,249,0,248,130,2,128,1,
-166,4,7,240,7,238,8,177,204,177,200,16,96,49,0,48,224,128,110,64,110,1,1,
-51,83,213,2,0,48,35,192,35,176,64,77,32,50,192,139,73,196,49,193,127,48,2,
-212,14,112,3,252,5,224,4,196,1,36,5,252,1,76,6,0,9,12,6,72,6,68,6,84,7,216,
-6,100,6,96,6,104,8,244,6,120,8,128,6,160,6,156,6,252,7,220,7,116,6,56,7,
-204,7,196,9,64,177,188,9,68,177,180,9,72,177,192,9,76,6,4,9,80,6,24,9,100,
-6,60,9,108,6,64,9,114,158,172,9,128,6,76,9,134,158,176,9,140,6,80,9,150,
-158,52,9,160,6,92,9,172,177,136,9,178,158,180,9,196,177,184,9,200,6,116,9,
-212,6,124,9,244,177,144,10,30,158,196,10,32,6,184,10,36,9,16,10,48,9,20,10,
-72,6,220,10,118,158,200,10,122,158,192,13,20,14,100,13,220,13,216,14,176,
-14,24,15,8,14,140,15,48,14,48,15,64,14,72,15,68,14,96,15,84,14,152,15,88,
-14,128,15,92,15,60,15,192,14,104,15,196,14,132,15,200,15,228,15,204,13,252,
-15,212,14,84,19,60,19,0,114,0,16,72,114,4,16,80,114,8,16,120,114,20,16,136,
-114,24,16,168,114,28,17,136,114,34,153,40,117,230,157,244,117,244,177,140,
-122,108,121,128,126,248,14,100,127,148,127,176,133,56,132,200,134,16,134,
-12,177,132,177,128,177,148,8,232,177,152,8,248,179,204,179,202,158,50,158,
-46,173,78,158,207,48,6,252,0,166,0,166,2,147,1,94,0,39,0,248,64,9,64,97,
-128,114,24,28,200,24,64,24,8,29,134,7,74,6,16,6,2,11,15,2,154,130,169,15,
-75,64,9,0,102,35,210,240,2,160,24,64,244,196,0,174,6,20,61,51,0,44,129,133,
-15,77,64,8,32,87,195,234,16,29,40,24,152,250,150,7,74,6,38,6,0,62,169,129,
-210,129,137,129,128,143,171,96,116,160,98,96,104,67,240,16,248,64,28,200,
-252,12,62,18,7,50,63,5,15,133,1,204,143,193,195,225,96,115,35,240,144,248,
-96,28,200,252,44,62,26,7,50,63,13,15,135,1,204,143,195,195,225,224,115,35,
-241,16,248,64,28,200,252,76,62,18,7,50,63,21,15,133,1,204,143,197,195,225,
-96,115,35,241,144,248,96,28,200,252,108,62,26,7,50,63,29,15,135,1,204,143,
-199,195,225,224,115,35,242,16,249,64,28,200,252,140,62,82,7,50,63,37,15,
-149,1,204,143,201,195,229,96,115,35,242,144,249,96,28,200,252,172,62,90,7,
-50,63,45,15,151,1,204,143,203,195,229,224,115,35,243,16,249,64,28,200,252,
-204,62,82,7,50,63,53,15,149,1,204,143,205,195,229,96,115,35,243,144,249,96,
-28,200,252,236,62,90,7,50,63,61,15,151,1,204,143,207,195,229,224,115,35,
-244,16,251,64,28,200,253,12,62,210,7,50,63,69,15,181,1,204,143,209,195,237,
-96,115,35,244,144,251,96,28,200,253,44,62,218,7,50,63,77,15,183,1,204,143,
-211,195,237,224,115,35,245,16,251,64,28,200,253,76,62,210,7,50,63,85,15,
-181,1,204,143,213,195,237,96,115,35,245,144,251,96,28,200,253,108,62,218,7,
-50,63,93,15,183,1,204,143,215,195,237,224,115,35,246,80,253,208,28,200,253,
-156,7,34,7,50,63,105,1,195,1,204,143,219,64,114,32,104,67,246,248,28,136,
-26,16,28,200,253,228,7,34,7,50,63,133,15,229,1,204,143,225,192,114,224,115,
-35,248,144,28,72,28,200,254,52,7,46,6,132,63,143,129,203,129,161,1,204,143,
-230,64,114,224,115,35,250,88,28,200,24,64,24,0,254,158,7,50,6,16,6,2,63,
-173,1,204,129,161,15,235,224,115,32,97,0,104,67,252,88,29,40,24,64,24,0,
-255,30,7,74,6,16,6,2,63,201,1,208,129,137,143,243,64,116,160,104,67,252,
-248,29,40,24,64,26,16,255,148,63,244,7,50,63,231,1,212,129,204,143,250,64,
-113,224,115,35,254,208,29,72,26,16,255,190,7,82,6,132,7,50,63,249,1,212,
-129,204,253,128,64,8,192,8,223,96,48,2,48,2,79,216,20,0,140,0,153,246,7,
-128,35,0,35,0,36,253,130,96,8,192,8,192,9,159,96,176,2,152,2,167,216,52,0,
-166,0,169,246,39,2,162,2,163,125,138,64,168,128,166,191,98,176,42,32,41,
-223,216,180,10,156,10,141,246,47,2,162,2,158,128,
+104,28,112,32,67,0,65,4,0,138,0,128,4,1,88,65,76,83,8,104,14,72,43,16,253,
+28,189,6,39,240,39,224,24,114,12,16,132,16,248,0,248,64,129,241,1,241,128,
+195,228,3,229,2,7,204,7,206,4,15,160,15,164,6,31,96,31,104,16,62,224,63,
+116,8,125,200,127,32,32,251,176,254,208,33,247,129,255,128,67,239,67,253,
+64,135,223,7,254,129,15,216,15,220,2,31,208,31,216,4,63,192,63,208,8,133,
+192,133,128,129,38,129,37,177,162,195,2,192,5,229,160,2,20,9,170,220,4,232,
+40,127,160,255,144,154,136,4,4,4,0,192,9,152,9,144,48,19,160,19,145,0,41,
+96,41,69,192,94,128,94,65,128,193,128,193,2,1,161,1,160,6,3,104,3,102,8,7,
+56,7,52,64,14,248,14,240,144,31,144,31,130,128,68,96,68,66,64,145,192,145,
+130,129,184,129,184,2,3,217,3,216,24,8,194,8,192,68,18,44,18,40,216,38,16,
+38,8,112,77,16,77,6,3,192,35,192,18,199,168,71,168,24,15,168,143,172,132,
+44,104,44,103,6,89,2,89,0,200,179,176,179,172,21,50,13,50,1,122,104,26,104,
+1,212,228,116,228,65,233,204,233,204,143,211,189,83,188,130,167,127,167,
+126,11,79,35,79,32,10,158,94,158,88,85,61,173,61,160,97,192,107,64,107,1,0,
+226,128,226,3,1,198,1,196,6,3,228,3,226,8,10,0,6,152,16,31,192,31,184,34,
+199,50,199,32,65,128,196,0,195,130,1,185,1,184,4,4,205,79,84,8,0,192,143,0,
+142,193,1,52,128,203,2,45,39,16,199,5,253,0,11,80,57,192,15,240,23,128,19,
+16,4,144,23,240,5,48,24,0,36,48,25,32,25,16,25,80,31,96,25,144,25,128,25,
+160,35,208,25,224,34,0,26,128,26,112,27,240,31,112,29,208,24,224,31,48,31,
+16,37,2,198,240,37,18,198,208,37,34,199,0,37,48,24,16,37,64,24,96,37,144,
+24,240,37,176,25,0,37,202,122,176,38,0,25,48,38,26,122,192,38,48,25,64,38,
+90,120,208,38,128,25,112,38,178,198,32,38,202,122,208,39,18,198,224,39,32,
+25,208,39,80,25,240,39,210,198,64,40,42,124,80,40,122,123,16,40,128,26,224,
+40,144,36,64,40,192,36,80,41,32,27,112,41,218,123,32,41,234,123,0,52,80,57,
+144,55,112,55,96,58,192,56,96,60,32,58,48,60,192,56,192,61,0,57,32,61,16,
+57,128,61,80,58,96,61,96,58,0,61,112,60,240,63,0,57,160,63,16,58,16,63,32,
+63,144,63,48,55,240,63,80,57,80,76,240,76,1,200,0,65,33,200,16,65,65,200,
+32,65,225,200,80,66,33,200,96,66,161,200,112,70,33,200,138,100,161,215,154,
+119,209,215,210,198,49,216,234,124,97,233,177,230,1,251,224,57,145,254,81,
+254,194,20,226,19,34,24,66,24,50,198,18,198,2,198,80,35,162,198,96,35,226,
+207,50,207,42,120,202,120,186,121,74,124,74,124,58,124,42,181,58,123,60,
+192,27,240,2,152,2,152,10,76,5,120,0,156,3,225,0,37,1,134,1,200,96,115,32,
+97,0,96,32,118,24,29,40,24,64,24,8,44,60,10,106,10,164,61,45,0,36,1,152,
+143,75,192,10,128,97,3,211,16,2,184,24,80,244,204,0,178,6,20,61,53,0,32,
+129,95,15,168,64,116,160,98,99,234,88,29,40,24,152,24,0,250,166,7,74,6,38,
+6,2,62,173,129,210,129,137,129,161,15,192,67,225,0,115,35,240,48,248,72,28,
+200,252,20,62,20,7,50,63,7,15,133,129,204,143,194,67,225,128,115,35,240,
+176,248,104,28,200,252,52,62,28,7,50,63,15,15,135,129,204,143,196,67,225,0,
+115,35,241,48,248,72,28,200,252,84,62,20,7,50,63,23,15,133,129,204,143,198,
+67,225,128,115,35,241,176,248,104,28,200,252,116,62,28,7,50,63,31,15,135,
+129,204,143,200,67,229,0,115,35,242,48,249,72,28,200,252,148,62,84,7,50,63,
+39,15,149,129,204,143,202,67,229,128,115,35,242,176,249,104,28,200,252,180,
+62,92,7,50,63,47,15,151,129,204,143,204,67,229,0,115,35,243,48,249,72,28,
+200,252,212,62,84,7,50,63,55,15,149,129,204,143,206,67,229,128,115,35,243,
+176,249,104,28,200,252,244,62,92,7,50,63,63,15,151,129,204,143,208,67,237,
+0,115,35,244,48,251,72,28,200,253,20,62,212,7,50,63,71,15,181,129,204,143,
+210,67,237,128,115,35,244,176,251,104,28,200,253,52,62,220,7,50,63,79,15,
+183,129,204,143,212,67,237,0,115,35,245,48,251,72,28,200,253,84,62,212,7,
+50,63,87,15,181,129,204,143,214,67,237,128,115,35,245,176,251,104,28,200,
+253,116,62,220,7,50,63,95,15,183,129,204,143,217,67,247,64,115,35,246,112,
+28,136,28,200,253,164,7,12,7,50,63,109,1,200,129,161,15,219,224,114,32,104,
+64,115,35,247,144,28,136,28,200,254,20,63,148,7,50,63,135,1,203,129,204,
+143,226,64,113,32,115,35,248,208,28,184,26,16,254,62,7,46,6,132,7,50,63,
+153,1,203,129,204,143,233,96,115,32,97,0,96,3,250,120,28,200,24,64,24,8,
+254,180,7,50,6,132,63,175,129,204,129,132,1,161,15,241,96,116,160,97,0,96,
+3,252,120,29,40,24,64,24,8,255,36,7,66,6,38,63,205,1,210,129,161,15,243,
+224,116,160,97,0,104,67,254,80,255,208,28,200,255,156,7,82,7,50,63,233,1,
+199,129,204,143,251,64,117,32,104,67,254,248,29,72,26,16,28,200,255,228,7,
+82,7,51,246,1,0,35,0,35,125,128,192,8,192,9,63,96,80,2,48,2,103,216,30,0,
+140,0,140,0,147,246,9,128,35,0,35,0,38,125,130,192,10,96,10,159,96,208,2,
+152,2,167,216,156,10,136,10,141,246,41,2,162,2,154,253,138,192,168,128,167,
+127,98,208,42,112,42,55,216,188,10,136,10,122,
 };
-const duk_uint8_t duk_unicode_caseconv_lc[680] = {
-152,3,0,3,128,184,6,192,7,192,112,24,144,37,96,64,54,32,81,64,128,226,0,
+const duk_uint8_t duk_unicode_caseconv_lc[706] = {
+160,3,0,3,128,184,6,192,7,192,112,24,144,37,96,64,54,32,81,64,128,226,0,
 235,65,129,199,1,230,130,3,145,3,177,34,7,70,7,134,36,15,244,13,236,24,32,
 0,34,129,0,65,0,67,4,0,166,32,172,41,132,40,11,64,19,9,208,85,184,80,19,
-240,19,248,12,62,16,62,0,32,124,96,124,64,48,249,64,249,0,129,243,129,243,
-1,3,233,3,232,1,135,218,7,216,4,15,196,15,192,8,31,152,31,144,16,63,80,63,
-64,32,126,224,126,192,16,253,208,251,128,33,252,129,247,32,131,251,3,250,0,
-135,246,135,221,129,15,244,15,240,2,31,234,31,122,4,63,240,62,240,8,127,
-232,125,240,17,11,1,11,129,2,75,98,77,3,69,128,5,134,11,203,31,128,143,193,
-127,144,255,160,154,140,4,0,4,4,192,9,144,9,152,48,19,144,19,161,0,41,64,
-41,101,192,94,64,94,129,128,193,0,193,130,1,160,1,161,6,3,102,3,104,8,7,44,
-7,48,72,14,240,14,248,144,31,32,31,48,64,63,0,63,37,0,136,128,136,196,129,
-35,1,35,133,3,112,3,113,4,7,176,7,178,48,17,128,17,132,136,36,80,36,89,176,
-76,16,76,32,224,154,0,154,44,7,128,7,128,101,143,80,15,80,176,31,89,31,81,
-8,88,206,88,208,12,178,0,178,5,145,103,89,103,96,42,100,10,100,18,244,208,
-20,208,35,169,200,169,200,195,211,153,83,153,159,167,121,167,122,5,78,253,
-78,254,22,158,66,158,68,21,60,181,60,184,170,123,74,123,80,67,0,211,1,64,2,
-1,172,1,173,4,3,136,3,140,12,7,20,7,24,16,31,184,31,192,34,199,34,199,48,
-65,128,195,128,196,2,1,184,1,185,5,79,84,4,204,8,0,192,101,128,154,65,1,29,
-129,30,2,16,199,45,39,5,251,240,23,128,15,240,24,16,37,48,24,96,37,64,24,
-224,29,208,24,240,37,144,25,0,37,176,25,16,25,32,25,48,38,0,25,64,38,48,25,
-112,38,128,25,128,25,144,25,208,39,32,25,240,39,80,26,112,26,128,26,224,40,
-128,27,112,41,32,31,16,31,48,31,96,25,80,31,112,27,240,34,0,25,224,35,162,
-198,80,35,208,25,160,35,226,198,96,36,48,24,0,36,64,40,144,36,80,40,192,55,
-96,55,112,55,240,63,48,56,96,58,192,56,192,60,192,60,240,61,112,63,64,59,
-128,63,144,63,32,76,0,76,241,233,224,13,241,251,193,251,49,252,193,252,49,
-254,193,254,81,255,193,255,50,18,96,60,146,18,160,6,178,18,176,14,82,19,34,
-20,226,24,50,24,66,198,2,198,18,198,32,38,178,198,49,215,210,198,64,39,210,
-198,208,37,18,198,224,39,18,198,240,37,2,199,0,37,34,207,34,207,58,119,209,
-215,154,120,186,120,202,120,208,38,90,122,176,37,202,122,192,38,26,122,208,
-38,202,123,0,41,234,123,16,40,122,123,32,41,218,123,58,181,48,32,38,16,3,
-72,24,56,
+240,19,248,12,57,32,33,160,172,114,244,67,244,24,248,64,248,0,129,241,129,
+241,0,195,229,3,228,2,7,206,7,204,4,15,164,15,160,6,31,104,31,96,16,63,16,
+63,0,32,126,96,126,64,64,253,64,253,0,129,251,129,251,0,67,247,67,238,0,
+135,242,7,220,130,15,236,15,232,2,31,218,31,118,4,63,208,63,192,8,127,168,
+125,232,16,255,192,251,192,33,255,161,247,192,68,44,4,46,4,9,45,137,52,13,
+22,0,22,24,47,44,126,2,63,5,254,67,254,130,106,48,16,0,16,19,0,38,64,38,96,
+192,78,64,78,132,0,165,0,165,151,1,121,1,122,6,3,4,3,6,8,6,128,6,132,24,13,
+152,13,160,32,28,176,28,193,32,59,192,59,226,64,124,128,124,193,0,252,0,
+252,148,2,34,2,35,18,4,140,4,142,20,13,192,13,196,16,30,192,30,200,192,70,
+0,70,18,32,145,64,145,102,193,48,65,48,131,130,104,2,104,176,30,0,30,1,150,
+61,64,61,66,192,125,100,125,68,33,99,57,99,64,50,200,2,200,22,69,157,101,
+157,128,169,144,41,144,75,211,64,83,64,142,167,34,167,35,15,78,101,78,102,
+126,157,230,157,232,21,59,245,59,248,90,121,10,121,16,84,242,212,242,226,
+169,237,41,237,67,12,3,76,5,0,8,6,176,6,180,16,14,32,14,48,48,28,80,28,96,
+64,126,224,127,0,139,28,139,28,193,6,3,14,3,16,8,6,224,6,228,21,61,80,19,
+48,32,3,1,150,2,105,4,4,118,4,120,8,67,28,180,156,23,240,192,94,0,63,192,
+96,64,148,192,97,128,149,0,99,128,119,64,99,192,150,64,100,0,150,192,100,
+64,100,128,100,192,152,0,101,0,152,192,101,192,154,0,102,0,102,64,103,64,
+156,128,103,192,157,64,105,192,106,0,107,128,162,0,109,192,164,128,124,64,
+124,192,125,128,101,64,125,192,111,192,136,0,103,128,142,139,25,64,143,64,
+102,128,143,139,25,128,144,192,96,0,145,0,162,64,145,64,163,0,221,128,221,
+192,223,192,252,192,225,128,235,0,227,0,243,0,243,192,245,192,253,0,238,0,
+254,64,252,129,48,1,51,199,167,128,55,199,239,7,236,199,243,7,240,199,251,
+7,249,71,255,7,252,200,73,128,242,72,74,128,26,200,74,192,57,72,76,136,83,
+136,96,200,97,11,24,11,24,75,24,128,154,203,24,199,95,75,25,0,159,75,27,64,
+148,75,27,128,156,75,27,192,148,11,28,0,148,139,60,139,60,233,223,71,94,
+105,226,233,227,41,227,64,153,105,234,192,151,41,235,0,152,105,235,64,155,
+41,236,0,167,169,236,64,161,233,236,128,167,105,236,234,212,233,240,169,
+240,233,241,41,229,41,241,64,160,169,241,135,99,128,128,152,64,13,32,96,
+224,
 };
 
 #if defined(DUK_USE_REGEXP_CANON_WORKAROUND)
@@ -89650,5797 +94151,5798 @@ const duk_uint16_t duk_unicode_re_canon_lookup[65536] = {
 11373,11376,385,390,597,393,394,600,399,602,400,42923L,605,606,607,403,
 42924L,610,404,612,42893L,42922L,615,407,406,42926L,11362,42925L,621,622,
 412,624,11374,413,627,628,415,630,631,632,633,634,635,636,11364,638,639,
-422,641,642,425,644,645,646,42929L,430,580,433,434,581,653,654,655,656,657,
-439,659,660,661,662,663,664,665,666,667,668,42930L,42928L,671,672,673,674,
-675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,
-693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,710,
-711,712,713,714,715,716,717,718,719,720,721,722,723,724,725,726,727,728,
-729,730,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,
-747,748,749,750,751,752,753,754,755,756,757,758,759,760,761,762,763,764,
-765,766,767,768,769,770,771,772,773,774,775,776,777,778,779,780,781,782,
-783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,
-801,802,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,818,
-819,820,821,822,823,824,825,826,827,828,829,830,831,832,833,834,835,836,
-921,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,
-855,856,857,858,859,860,861,862,863,864,865,866,867,868,869,870,871,872,
-873,874,875,876,877,878,879,880,880,882,882,884,885,886,886,888,889,890,
-1021,1022,1023,894,895,896,897,898,899,900,901,902,903,904,905,906,907,908,
-909,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,925,926,
-927,928,929,930,931,932,933,934,935,936,937,938,939,902,904,905,906,944,
-913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,931,
-931,932,933,934,935,936,937,938,939,908,910,911,975,914,920,978,979,980,
-934,928,975,984,984,986,986,988,988,990,990,992,992,994,994,996,996,998,
-998,1000,1000,1002,1002,1004,1004,1006,1006,922,929,1017,895,1012,917,1014,
-1015,1015,1017,1018,1018,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,
-1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,
-1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,
-1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1040,1041,1042,
-1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,
-1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1024,
-1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,
-1120,1120,1122,1122,1124,1124,1126,1126,1128,1128,1130,1130,1132,1132,1134,
-1134,1136,1136,1138,1138,1140,1140,1142,1142,1144,1144,1146,1146,1148,1148,
-1150,1150,1152,1152,1154,1155,1156,1157,1158,1159,1160,1161,1162,1162,1164,
-1164,1166,1166,1168,1168,1170,1170,1172,1172,1174,1174,1176,1176,1178,1178,
-1180,1180,1182,1182,1184,1184,1186,1186,1188,1188,1190,1190,1192,1192,1194,
-1194,1196,1196,1198,1198,1200,1200,1202,1202,1204,1204,1206,1206,1208,1208,
-1210,1210,1212,1212,1214,1214,1216,1217,1217,1219,1219,1221,1221,1223,1223,
-1225,1225,1227,1227,1229,1229,1216,1232,1232,1234,1234,1236,1236,1238,1238,
-1240,1240,1242,1242,1244,1244,1246,1246,1248,1248,1250,1250,1252,1252,1254,
-1254,1256,1256,1258,1258,1260,1260,1262,1262,1264,1264,1266,1266,1268,1268,
-1270,1270,1272,1272,1274,1274,1276,1276,1278,1278,1280,1280,1282,1282,1284,
-1284,1286,1286,1288,1288,1290,1290,1292,1292,1294,1294,1296,1296,1298,1298,
-1300,1300,1302,1302,1304,1304,1306,1306,1308,1308,1310,1310,1312,1312,1314,
-1314,1316,1316,1318,1318,1320,1320,1322,1322,1324,1324,1326,1326,1328,1329,
-1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,
-1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,
-1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,
-1375,1376,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,
-1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,
-1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1415,1416,1417,1418,1419,
-1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,
-1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,
-1450,1451,1452,1453,1454,1455,1456,1457,1458,1459,1460,1461,1462,1463,1464,
-1465,1466,1467,1468,1469,1470,1471,1472,1473,1474,1475,1476,1477,1478,1479,
-1480,1481,1482,1483,1484,1485,1486,1487,1488,1489,1490,1491,1492,1493,1494,
-1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1509,
-1510,1511,1512,1513,1514,1515,1516,1517,1518,1519,1520,1521,1522,1523,1524,
-1525,1526,1527,1528,1529,1530,1531,1532,1533,1534,1535,1536,1537,1538,1539,
-1540,1541,1542,1543,1544,1545,1546,1547,1548,1549,1550,1551,1552,1553,1554,
-1555,1556,1557,1558,1559,1560,1561,1562,1563,1564,1565,1566,1567,1568,1569,
-1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,
-1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1595,1596,1597,1598,1599,
-1600,1601,1602,1603,1604,1605,1606,1607,1608,1609,1610,1611,1612,1613,1614,
-1615,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,1629,
-1630,1631,1632,1633,1634,1635,1636,1637,1638,1639,1640,1641,1642,1643,1644,
-1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,
-1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,
-1675,1676,1677,1678,1679,1680,1681,1682,1683,1684,1685,1686,1687,1688,1689,
-1690,1691,1692,1693,1694,1695,1696,1697,1698,1699,1700,1701,1702,1703,1704,
-1705,1706,1707,1708,1709,1710,1711,1712,1713,1714,1715,1716,1717,1718,1719,
-1720,1721,1722,1723,1724,1725,1726,1727,1728,1729,1730,1731,1732,1733,1734,
-1735,1736,1737,1738,1739,1740,1741,1742,1743,1744,1745,1746,1747,1748,1749,
-1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1761,1762,1763,1764,
-1765,1766,1767,1768,1769,1770,1771,1772,1773,1774,1775,1776,1777,1778,1779,
-1780,1781,1782,1783,1784,1785,1786,1787,1788,1789,1790,1791,1792,1793,1794,
-1795,1796,1797,1798,1799,1800,1801,1802,1803,1804,1805,1806,1807,1808,1809,
-1810,1811,1812,1813,1814,1815,1816,1817,1818,1819,1820,1821,1822,1823,1824,
-1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1837,1838,1839,
-1840,1841,1842,1843,1844,1845,1846,1847,1848,1849,1850,1851,1852,1853,1854,
-1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1868,1869,
-1870,1871,1872,1873,1874,1875,1876,1877,1878,1879,1880,1881,1882,1883,1884,
-1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,
-1900,1901,1902,1903,1904,1905,1906,1907,1908,1909,1910,1911,1912,1913,1914,
-1915,1916,1917,1918,1919,1920,1921,1922,1923,1924,1925,1926,1927,1928,1929,
-1930,1931,1932,1933,1934,1935,1936,1937,1938,1939,1940,1941,1942,1943,1944,
-1945,1946,1947,1948,1949,1950,1951,1952,1953,1954,1955,1956,1957,1958,1959,
-1960,1961,1962,1963,1964,1965,1966,1967,1968,1969,1970,1971,1972,1973,1974,
-1975,1976,1977,1978,1979,1980,1981,1982,1983,1984,1985,1986,1987,1988,1989,
-1990,1991,1992,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,
-2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,
-2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,
-2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,
-2050,2051,2052,2053,2054,2055,2056,2057,2058,2059,2060,2061,2062,2063,2064,
-2065,2066,2067,2068,2069,2070,2071,2072,2073,2074,2075,2076,2077,2078,2079,
-2080,2081,2082,2083,2084,2085,2086,2087,2088,2089,2090,2091,2092,2093,2094,
-2095,2096,2097,2098,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,
-2110,2111,2112,2113,2114,2115,2116,2117,2118,2119,2120,2121,2122,2123,2124,
-2125,2126,2127,2128,2129,2130,2131,2132,2133,2134,2135,2136,2137,2138,2139,
-2140,2141,2142,2143,2144,2145,2146,2147,2148,2149,2150,2151,2152,2153,2154,
-2155,2156,2157,2158,2159,2160,2161,2162,2163,2164,2165,2166,2167,2168,2169,
-2170,2171,2172,2173,2174,2175,2176,2177,2178,2179,2180,2181,2182,2183,2184,
-2185,2186,2187,2188,2189,2190,2191,2192,2193,2194,2195,2196,2197,2198,2199,
-2200,2201,2202,2203,2204,2205,2206,2207,2208,2209,2210,2211,2212,2213,2214,
-2215,2216,2217,2218,2219,2220,2221,2222,2223,2224,2225,2226,2227,2228,2229,
-2230,2231,2232,2233,2234,2235,2236,2237,2238,2239,2240,2241,2242,2243,2244,
-2245,2246,2247,2248,2249,2250,2251,2252,2253,2254,2255,2256,2257,2258,2259,
-2260,2261,2262,2263,2264,2265,2266,2267,2268,2269,2270,2271,2272,2273,2274,
-2275,2276,2277,2278,2279,2280,2281,2282,2283,2284,2285,2286,2287,2288,2289,
-2290,2291,2292,2293,2294,2295,2296,2297,2298,2299,2300,2301,2302,2303,2304,
-2305,2306,2307,2308,2309,2310,2311,2312,2313,2314,2315,2316,2317,2318,2319,
-2320,2321,2322,2323,2324,2325,2326,2327,2328,2329,2330,2331,2332,2333,2334,
-2335,2336,2337,2338,2339,2340,2341,2342,2343,2344,2345,2346,2347,2348,2349,
-2350,2351,2352,2353,2354,2355,2356,2357,2358,2359,2360,2361,2362,2363,2364,
-2365,2366,2367,2368,2369,2370,2371,2372,2373,2374,2375,2376,2377,2378,2379,
-2380,2381,2382,2383,2384,2385,2386,2387,2388,2389,2390,2391,2392,2393,2394,
-2395,2396,2397,2398,2399,2400,2401,2402,2403,2404,2405,2406,2407,2408,2409,
-2410,2411,2412,2413,2414,2415,2416,2417,2418,2419,2420,2421,2422,2423,2424,
-2425,2426,2427,2428,2429,2430,2431,2432,2433,2434,2435,2436,2437,2438,2439,
-2440,2441,2442,2443,2444,2445,2446,2447,2448,2449,2450,2451,2452,2453,2454,
-2455,2456,2457,2458,2459,2460,2461,2462,2463,2464,2465,2466,2467,2468,2469,
-2470,2471,2472,2473,2474,2475,2476,2477,2478,2479,2480,2481,2482,2483,2484,
-2485,2486,2487,2488,2489,2490,2491,2492,2493,2494,2495,2496,2497,2498,2499,
-2500,2501,2502,2503,2504,2505,2506,2507,2508,2509,2510,2511,2512,2513,2514,
-2515,2516,2517,2518,2519,2520,2521,2522,2523,2524,2525,2526,2527,2528,2529,
-2530,2531,2532,2533,2534,2535,2536,2537,2538,2539,2540,2541,2542,2543,2544,
-2545,2546,2547,2548,2549,2550,2551,2552,2553,2554,2555,2556,2557,2558,2559,
-2560,2561,2562,2563,2564,2565,2566,2567,2568,2569,2570,2571,2572,2573,2574,
-2575,2576,2577,2578,2579,2580,2581,2582,2583,2584,2585,2586,2587,2588,2589,
-2590,2591,2592,2593,2594,2595,2596,2597,2598,2599,2600,2601,2602,2603,2604,
-2605,2606,2607,2608,2609,2610,2611,2612,2613,2614,2615,2616,2617,2618,2619,
-2620,2621,2622,2623,2624,2625,2626,2627,2628,2629,2630,2631,2632,2633,2634,
-2635,2636,2637,2638,2639,2640,2641,2642,2643,2644,2645,2646,2647,2648,2649,
-2650,2651,2652,2653,2654,2655,2656,2657,2658,2659,2660,2661,2662,2663,2664,
-2665,2666,2667,2668,2669,2670,2671,2672,2673,2674,2675,2676,2677,2678,2679,
-2680,2681,2682,2683,2684,2685,2686,2687,2688,2689,2690,2691,2692,2693,2694,
-2695,2696,2697,2698,2699,2700,2701,2702,2703,2704,2705,2706,2707,2708,2709,
-2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,
-2725,2726,2727,2728,2729,2730,2731,2732,2733,2734,2735,2736,2737,2738,2739,
-2740,2741,2742,2743,2744,2745,2746,2747,2748,2749,2750,2751,2752,2753,2754,
-2755,2756,2757,2758,2759,2760,2761,2762,2763,2764,2765,2766,2767,2768,2769,
-2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2781,2782,2783,2784,
-2785,2786,2787,2788,2789,2790,2791,2792,2793,2794,2795,2796,2797,2798,2799,
-2800,2801,2802,2803,2804,2805,2806,2807,2808,2809,2810,2811,2812,2813,2814,
-2815,2816,2817,2818,2819,2820,2821,2822,2823,2824,2825,2826,2827,2828,2829,
-2830,2831,2832,2833,2834,2835,2836,2837,2838,2839,2840,2841,2842,2843,2844,
-2845,2846,2847,2848,2849,2850,2851,2852,2853,2854,2855,2856,2857,2858,2859,
-2860,2861,2862,2863,2864,2865,2866,2867,2868,2869,2870,2871,2872,2873,2874,
-2875,2876,2877,2878,2879,2880,2881,2882,2883,2884,2885,2886,2887,2888,2889,
-2890,2891,2892,2893,2894,2895,2896,2897,2898,2899,2900,2901,2902,2903,2904,
-2905,2906,2907,2908,2909,2910,2911,2912,2913,2914,2915,2916,2917,2918,2919,
-2920,2921,2922,2923,2924,2925,2926,2927,2928,2929,2930,2931,2932,2933,2934,
-2935,2936,2937,2938,2939,2940,2941,2942,2943,2944,2945,2946,2947,2948,2949,
-2950,2951,2952,2953,2954,2955,2956,2957,2958,2959,2960,2961,2962,2963,2964,
-2965,2966,2967,2968,2969,2970,2971,2972,2973,2974,2975,2976,2977,2978,2979,
-2980,2981,2982,2983,2984,2985,2986,2987,2988,2989,2990,2991,2992,2993,2994,
-2995,2996,2997,2998,2999,3000,3001,3002,3003,3004,3005,3006,3007,3008,3009,
-3010,3011,3012,3013,3014,3015,3016,3017,3018,3019,3020,3021,3022,3023,3024,
-3025,3026,3027,3028,3029,3030,3031,3032,3033,3034,3035,3036,3037,3038,3039,
-3040,3041,3042,3043,3044,3045,3046,3047,3048,3049,3050,3051,3052,3053,3054,
-3055,3056,3057,3058,3059,3060,3061,3062,3063,3064,3065,3066,3067,3068,3069,
-3070,3071,3072,3073,3074,3075,3076,3077,3078,3079,3080,3081,3082,3083,3084,
-3085,3086,3087,3088,3089,3090,3091,3092,3093,3094,3095,3096,3097,3098,3099,
-3100,3101,3102,3103,3104,3105,3106,3107,3108,3109,3110,3111,3112,3113,3114,
-3115,3116,3117,3118,3119,3120,3121,3122,3123,3124,3125,3126,3127,3128,3129,
-3130,3131,3132,3133,3134,3135,3136,3137,3138,3139,3140,3141,3142,3143,3144,
-3145,3146,3147,3148,3149,3150,3151,3152,3153,3154,3155,3156,3157,3158,3159,
-3160,3161,3162,3163,3164,3165,3166,3167,3168,3169,3170,3171,3172,3173,3174,
-3175,3176,3177,3178,3179,3180,3181,3182,3183,3184,3185,3186,3187,3188,3189,
-3190,3191,3192,3193,3194,3195,3196,3197,3198,3199,3200,3201,3202,3203,3204,
-3205,3206,3207,3208,3209,3210,3211,3212,3213,3214,3215,3216,3217,3218,3219,
-3220,3221,3222,3223,3224,3225,3226,3227,3228,3229,3230,3231,3232,3233,3234,
-3235,3236,3237,3238,3239,3240,3241,3242,3243,3244,3245,3246,3247,3248,3249,
-3250,3251,3252,3253,3254,3255,3256,3257,3258,3259,3260,3261,3262,3263,3264,
-3265,3266,3267,3268,3269,3270,3271,3272,3273,3274,3275,3276,3277,3278,3279,
-3280,3281,3282,3283,3284,3285,3286,3287,3288,3289,3290,3291,3292,3293,3294,
-3295,3296,3297,3298,3299,3300,3301,3302,3303,3304,3305,3306,3307,3308,3309,
-3310,3311,3312,3313,3314,3315,3316,3317,3318,3319,3320,3321,3322,3323,3324,
-3325,3326,3327,3328,3329,3330,3331,3332,3333,3334,3335,3336,3337,3338,3339,
-3340,3341,3342,3343,3344,3345,3346,3347,3348,3349,3350,3351,3352,3353,3354,
-3355,3356,3357,3358,3359,3360,3361,3362,3363,3364,3365,3366,3367,3368,3369,
-3370,3371,3372,3373,3374,3375,3376,3377,3378,3379,3380,3381,3382,3383,3384,
-3385,3386,3387,3388,3389,3390,3391,3392,3393,3394,3395,3396,3397,3398,3399,
-3400,3401,3402,3403,3404,3405,3406,3407,3408,3409,3410,3411,3412,3413,3414,
-3415,3416,3417,3418,3419,3420,3421,3422,3423,3424,3425,3426,3427,3428,3429,
-3430,3431,3432,3433,3434,3435,3436,3437,3438,3439,3440,3441,3442,3443,3444,
-3445,3446,3447,3448,3449,3450,3451,3452,3453,3454,3455,3456,3457,3458,3459,
-3460,3461,3462,3463,3464,3465,3466,3467,3468,3469,3470,3471,3472,3473,3474,
-3475,3476,3477,3478,3479,3480,3481,3482,3483,3484,3485,3486,3487,3488,3489,
-3490,3491,3492,3493,3494,3495,3496,3497,3498,3499,3500,3501,3502,3503,3504,
-3505,3506,3507,3508,3509,3510,3511,3512,3513,3514,3515,3516,3517,3518,3519,
-3520,3521,3522,3523,3524,3525,3526,3527,3528,3529,3530,3531,3532,3533,3534,
-3535,3536,3537,3538,3539,3540,3541,3542,3543,3544,3545,3546,3547,3548,3549,
-3550,3551,3552,3553,3554,3555,3556,3557,3558,3559,3560,3561,3562,3563,3564,
-3565,3566,3567,3568,3569,3570,3571,3572,3573,3574,3575,3576,3577,3578,3579,
-3580,3581,3582,3583,3584,3585,3586,3587,3588,3589,3590,3591,3592,3593,3594,
-3595,3596,3597,3598,3599,3600,3601,3602,3603,3604,3605,3606,3607,3608,3609,
-3610,3611,3612,3613,3614,3615,3616,3617,3618,3619,3620,3621,3622,3623,3624,
-3625,3626,3627,3628,3629,3630,3631,3632,3633,3634,3635,3636,3637,3638,3639,
-3640,3641,3642,3643,3644,3645,3646,3647,3648,3649,3650,3651,3652,3653,3654,
-3655,3656,3657,3658,3659,3660,3661,3662,3663,3664,3665,3666,3667,3668,3669,
-3670,3671,3672,3673,3674,3675,3676,3677,3678,3679,3680,3681,3682,3683,3684,
-3685,3686,3687,3688,3689,3690,3691,3692,3693,3694,3695,3696,3697,3698,3699,
-3700,3701,3702,3703,3704,3705,3706,3707,3708,3709,3710,3711,3712,3713,3714,
-3715,3716,3717,3718,3719,3720,3721,3722,3723,3724,3725,3726,3727,3728,3729,
-3730,3731,3732,3733,3734,3735,3736,3737,3738,3739,3740,3741,3742,3743,3744,
-3745,3746,3747,3748,3749,3750,3751,3752,3753,3754,3755,3756,3757,3758,3759,
-3760,3761,3762,3763,3764,3765,3766,3767,3768,3769,3770,3771,3772,3773,3774,
-3775,3776,3777,3778,3779,3780,3781,3782,3783,3784,3785,3786,3787,3788,3789,
-3790,3791,3792,3793,3794,3795,3796,3797,3798,3799,3800,3801,3802,3803,3804,
-3805,3806,3807,3808,3809,3810,3811,3812,3813,3814,3815,3816,3817,3818,3819,
-3820,3821,3822,3823,3824,3825,3826,3827,3828,3829,3830,3831,3832,3833,3834,
-3835,3836,3837,3838,3839,3840,3841,3842,3843,3844,3845,3846,3847,3848,3849,
-3850,3851,3852,3853,3854,3855,3856,3857,3858,3859,3860,3861,3862,3863,3864,
-3865,3866,3867,3868,3869,3870,3871,3872,3873,3874,3875,3876,3877,3878,3879,
-3880,3881,3882,3883,3884,3885,3886,3887,3888,3889,3890,3891,3892,3893,3894,
-3895,3896,3897,3898,3899,3900,3901,3902,3903,3904,3905,3906,3907,3908,3909,
-3910,3911,3912,3913,3914,3915,3916,3917,3918,3919,3920,3921,3922,3923,3924,
-3925,3926,3927,3928,3929,3930,3931,3932,3933,3934,3935,3936,3937,3938,3939,
-3940,3941,3942,3943,3944,3945,3946,3947,3948,3949,3950,3951,3952,3953,3954,
-3955,3956,3957,3958,3959,3960,3961,3962,3963,3964,3965,3966,3967,3968,3969,
-3970,3971,3972,3973,3974,3975,3976,3977,3978,3979,3980,3981,3982,3983,3984,
-3985,3986,3987,3988,3989,3990,3991,3992,3993,3994,3995,3996,3997,3998,3999,
-4000,4001,4002,4003,4004,4005,4006,4007,4008,4009,4010,4011,4012,4013,4014,
-4015,4016,4017,4018,4019,4020,4021,4022,4023,4024,4025,4026,4027,4028,4029,
-4030,4031,4032,4033,4034,4035,4036,4037,4038,4039,4040,4041,4042,4043,4044,
-4045,4046,4047,4048,4049,4050,4051,4052,4053,4054,4055,4056,4057,4058,4059,
-4060,4061,4062,4063,4064,4065,4066,4067,4068,4069,4070,4071,4072,4073,4074,
-4075,4076,4077,4078,4079,4080,4081,4082,4083,4084,4085,4086,4087,4088,4089,
-4090,4091,4092,4093,4094,4095,4096,4097,4098,4099,4100,4101,4102,4103,4104,
-4105,4106,4107,4108,4109,4110,4111,4112,4113,4114,4115,4116,4117,4118,4119,
-4120,4121,4122,4123,4124,4125,4126,4127,4128,4129,4130,4131,4132,4133,4134,
-4135,4136,4137,4138,4139,4140,4141,4142,4143,4144,4145,4146,4147,4148,4149,
-4150,4151,4152,4153,4154,4155,4156,4157,4158,4159,4160,4161,4162,4163,4164,
-4165,4166,4167,4168,4169,4170,4171,4172,4173,4174,4175,4176,4177,4178,4179,
-4180,4181,4182,4183,4184,4185,4186,4187,4188,4189,4190,4191,4192,4193,4194,
-4195,4196,4197,4198,4199,4200,4201,4202,4203,4204,4205,4206,4207,4208,4209,
-4210,4211,4212,4213,4214,4215,4216,4217,4218,4219,4220,4221,4222,4223,4224,
-4225,4226,4227,4228,4229,4230,4231,4232,4233,4234,4235,4236,4237,4238,4239,
-4240,4241,4242,4243,4244,4245,4246,4247,4248,4249,4250,4251,4252,4253,4254,
-4255,4256,4257,4258,4259,4260,4261,4262,4263,4264,4265,4266,4267,4268,4269,
-4270,4271,4272,4273,4274,4275,4276,4277,4278,4279,4280,4281,4282,4283,4284,
-4285,4286,4287,4288,4289,4290,4291,4292,4293,4294,4295,4296,4297,4298,4299,
-4300,4301,4302,4303,4304,4305,4306,4307,4308,4309,4310,4311,4312,4313,4314,
-4315,4316,4317,4318,4319,4320,4321,4322,4323,4324,4325,4326,4327,4328,4329,
-4330,4331,4332,4333,4334,4335,4336,4337,4338,4339,4340,4341,4342,4343,4344,
-4345,4346,4347,4348,4349,4350,4351,4352,4353,4354,4355,4356,4357,4358,4359,
-4360,4361,4362,4363,4364,4365,4366,4367,4368,4369,4370,4371,4372,4373,4374,
-4375,4376,4377,4378,4379,4380,4381,4382,4383,4384,4385,4386,4387,4388,4389,
-4390,4391,4392,4393,4394,4395,4396,4397,4398,4399,4400,4401,4402,4403,4404,
-4405,4406,4407,4408,4409,4410,4411,4412,4413,4414,4415,4416,4417,4418,4419,
-4420,4421,4422,4423,4424,4425,4426,4427,4428,4429,4430,4431,4432,4433,4434,
-4435,4436,4437,4438,4439,4440,4441,4442,4443,4444,4445,4446,4447,4448,4449,
-4450,4451,4452,4453,4454,4455,4456,4457,4458,4459,4460,4461,4462,4463,4464,
-4465,4466,4467,4468,4469,4470,4471,4472,4473,4474,4475,4476,4477,4478,4479,
-4480,4481,4482,4483,4484,4485,4486,4487,4488,4489,4490,4491,4492,4493,4494,
-4495,4496,4497,4498,4499,4500,4501,4502,4503,4504,4505,4506,4507,4508,4509,
-4510,4511,4512,4513,4514,4515,4516,4517,4518,4519,4520,4521,4522,4523,4524,
-4525,4526,4527,4528,4529,4530,4531,4532,4533,4534,4535,4536,4537,4538,4539,
-4540,4541,4542,4543,4544,4545,4546,4547,4548,4549,4550,4551,4552,4553,4554,
-4555,4556,4557,4558,4559,4560,4561,4562,4563,4564,4565,4566,4567,4568,4569,
-4570,4571,4572,4573,4574,4575,4576,4577,4578,4579,4580,4581,4582,4583,4584,
-4585,4586,4587,4588,4589,4590,4591,4592,4593,4594,4595,4596,4597,4598,4599,
-4600,4601,4602,4603,4604,4605,4606,4607,4608,4609,4610,4611,4612,4613,4614,
-4615,4616,4617,4618,4619,4620,4621,4622,4623,4624,4625,4626,4627,4628,4629,
-4630,4631,4632,4633,4634,4635,4636,4637,4638,4639,4640,4641,4642,4643,4644,
-4645,4646,4647,4648,4649,4650,4651,4652,4653,4654,4655,4656,4657,4658,4659,
-4660,4661,4662,4663,4664,4665,4666,4667,4668,4669,4670,4671,4672,4673,4674,
-4675,4676,4677,4678,4679,4680,4681,4682,4683,4684,4685,4686,4687,4688,4689,
-4690,4691,4692,4693,4694,4695,4696,4697,4698,4699,4700,4701,4702,4703,4704,
-4705,4706,4707,4708,4709,4710,4711,4712,4713,4714,4715,4716,4717,4718,4719,
-4720,4721,4722,4723,4724,4725,4726,4727,4728,4729,4730,4731,4732,4733,4734,
-4735,4736,4737,4738,4739,4740,4741,4742,4743,4744,4745,4746,4747,4748,4749,
-4750,4751,4752,4753,4754,4755,4756,4757,4758,4759,4760,4761,4762,4763,4764,
-4765,4766,4767,4768,4769,4770,4771,4772,4773,4774,4775,4776,4777,4778,4779,
-4780,4781,4782,4783,4784,4785,4786,4787,4788,4789,4790,4791,4792,4793,4794,
-4795,4796,4797,4798,4799,4800,4801,4802,4803,4804,4805,4806,4807,4808,4809,
-4810,4811,4812,4813,4814,4815,4816,4817,4818,4819,4820,4821,4822,4823,4824,
-4825,4826,4827,4828,4829,4830,4831,4832,4833,4834,4835,4836,4837,4838,4839,
-4840,4841,4842,4843,4844,4845,4846,4847,4848,4849,4850,4851,4852,4853,4854,
-4855,4856,4857,4858,4859,4860,4861,4862,4863,4864,4865,4866,4867,4868,4869,
-4870,4871,4872,4873,4874,4875,4876,4877,4878,4879,4880,4881,4882,4883,4884,
-4885,4886,4887,4888,4889,4890,4891,4892,4893,4894,4895,4896,4897,4898,4899,
-4900,4901,4902,4903,4904,4905,4906,4907,4908,4909,4910,4911,4912,4913,4914,
-4915,4916,4917,4918,4919,4920,4921,4922,4923,4924,4925,4926,4927,4928,4929,
-4930,4931,4932,4933,4934,4935,4936,4937,4938,4939,4940,4941,4942,4943,4944,
-4945,4946,4947,4948,4949,4950,4951,4952,4953,4954,4955,4956,4957,4958,4959,
-4960,4961,4962,4963,4964,4965,4966,4967,4968,4969,4970,4971,4972,4973,4974,
-4975,4976,4977,4978,4979,4980,4981,4982,4983,4984,4985,4986,4987,4988,4989,
-4990,4991,4992,4993,4994,4995,4996,4997,4998,4999,5000,5001,5002,5003,5004,
-5005,5006,5007,5008,5009,5010,5011,5012,5013,5014,5015,5016,5017,5018,5019,
-5020,5021,5022,5023,5024,5025,5026,5027,5028,5029,5030,5031,5032,5033,5034,
-5035,5036,5037,5038,5039,5040,5041,5042,5043,5044,5045,5046,5047,5048,5049,
-5050,5051,5052,5053,5054,5055,5056,5057,5058,5059,5060,5061,5062,5063,5064,
-5065,5066,5067,5068,5069,5070,5071,5072,5073,5074,5075,5076,5077,5078,5079,
-5080,5081,5082,5083,5084,5085,5086,5087,5088,5089,5090,5091,5092,5093,5094,
-5095,5096,5097,5098,5099,5100,5101,5102,5103,5104,5105,5106,5107,5108,5109,
-5110,5111,5104,5105,5106,5107,5108,5109,5118,5119,5120,5121,5122,5123,5124,
-5125,5126,5127,5128,5129,5130,5131,5132,5133,5134,5135,5136,5137,5138,5139,
-5140,5141,5142,5143,5144,5145,5146,5147,5148,5149,5150,5151,5152,5153,5154,
-5155,5156,5157,5158,5159,5160,5161,5162,5163,5164,5165,5166,5167,5168,5169,
-5170,5171,5172,5173,5174,5175,5176,5177,5178,5179,5180,5181,5182,5183,5184,
-5185,5186,5187,5188,5189,5190,5191,5192,5193,5194,5195,5196,5197,5198,5199,
-5200,5201,5202,5203,5204,5205,5206,5207,5208,5209,5210,5211,5212,5213,5214,
-5215,5216,5217,5218,5219,5220,5221,5222,5223,5224,5225,5226,5227,5228,5229,
-5230,5231,5232,5233,5234,5235,5236,5237,5238,5239,5240,5241,5242,5243,5244,
-5245,5246,5247,5248,5249,5250,5251,5252,5253,5254,5255,5256,5257,5258,5259,
-5260,5261,5262,5263,5264,5265,5266,5267,5268,5269,5270,5271,5272,5273,5274,
-5275,5276,5277,5278,5279,5280,5281,5282,5283,5284,5285,5286,5287,5288,5289,
-5290,5291,5292,5293,5294,5295,5296,5297,5298,5299,5300,5301,5302,5303,5304,
-5305,5306,5307,5308,5309,5310,5311,5312,5313,5314,5315,5316,5317,5318,5319,
-5320,5321,5322,5323,5324,5325,5326,5327,5328,5329,5330,5331,5332,5333,5334,
-5335,5336,5337,5338,5339,5340,5341,5342,5343,5344,5345,5346,5347,5348,5349,
-5350,5351,5352,5353,5354,5355,5356,5357,5358,5359,5360,5361,5362,5363,5364,
-5365,5366,5367,5368,5369,5370,5371,5372,5373,5374,5375,5376,5377,5378,5379,
-5380,5381,5382,5383,5384,5385,5386,5387,5388,5389,5390,5391,5392,5393,5394,
-5395,5396,5397,5398,5399,5400,5401,5402,5403,5404,5405,5406,5407,5408,5409,
-5410,5411,5412,5413,5414,5415,5416,5417,5418,5419,5420,5421,5422,5423,5424,
-5425,5426,5427,5428,5429,5430,5431,5432,5433,5434,5435,5436,5437,5438,5439,
-5440,5441,5442,5443,5444,5445,5446,5447,5448,5449,5450,5451,5452,5453,5454,
-5455,5456,5457,5458,5459,5460,5461,5462,5463,5464,5465,5466,5467,5468,5469,
-5470,5471,5472,5473,5474,5475,5476,5477,5478,5479,5480,5481,5482,5483,5484,
-5485,5486,5487,5488,5489,5490,5491,5492,5493,5494,5495,5496,5497,5498,5499,
-5500,5501,5502,5503,5504,5505,5506,5507,5508,5509,5510,5511,5512,5513,5514,
-5515,5516,5517,5518,5519,5520,5521,5522,5523,5524,5525,5526,5527,5528,5529,
-5530,5531,5532,5533,5534,5535,5536,5537,5538,5539,5540,5541,5542,5543,5544,
-5545,5546,5547,5548,5549,5550,5551,5552,5553,5554,5555,5556,5557,5558,5559,
-5560,5561,5562,5563,5564,5565,5566,5567,5568,5569,5570,5571,5572,5573,5574,
-5575,5576,5577,5578,5579,5580,5581,5582,5583,5584,5585,5586,5587,5588,5589,
-5590,5591,5592,5593,5594,5595,5596,5597,5598,5599,5600,5601,5602,5603,5604,
-5605,5606,5607,5608,5609,5610,5611,5612,5613,5614,5615,5616,5617,5618,5619,
-5620,5621,5622,5623,5624,5625,5626,5627,5628,5629,5630,5631,5632,5633,5634,
-5635,5636,5637,5638,5639,5640,5641,5642,5643,5644,5645,5646,5647,5648,5649,
-5650,5651,5652,5653,5654,5655,5656,5657,5658,5659,5660,5661,5662,5663,5664,
-5665,5666,5667,5668,5669,5670,5671,5672,5673,5674,5675,5676,5677,5678,5679,
-5680,5681,5682,5683,5684,5685,5686,5687,5688,5689,5690,5691,5692,5693,5694,
-5695,5696,5697,5698,5699,5700,5701,5702,5703,5704,5705,5706,5707,5708,5709,
-5710,5711,5712,5713,5714,5715,5716,5717,5718,5719,5720,5721,5722,5723,5724,
-5725,5726,5727,5728,5729,5730,5731,5732,5733,5734,5735,5736,5737,5738,5739,
-5740,5741,5742,5743,5744,5745,5746,5747,5748,5749,5750,5751,5752,5753,5754,
-5755,5756,5757,5758,5759,5760,5761,5762,5763,5764,5765,5766,5767,5768,5769,
-5770,5771,5772,5773,5774,5775,5776,5777,5778,5779,5780,5781,5782,5783,5784,
-5785,5786,5787,5788,5789,5790,5791,5792,5793,5794,5795,5796,5797,5798,5799,
-5800,5801,5802,5803,5804,5805,5806,5807,5808,5809,5810,5811,5812,5813,5814,
-5815,5816,5817,5818,5819,5820,5821,5822,5823,5824,5825,5826,5827,5828,5829,
-5830,5831,5832,5833,5834,5835,5836,5837,5838,5839,5840,5841,5842,5843,5844,
-5845,5846,5847,5848,5849,5850,5851,5852,5853,5854,5855,5856,5857,5858,5859,
-5860,5861,5862,5863,5864,5865,5866,5867,5868,5869,5870,5871,5872,5873,5874,
-5875,5876,5877,5878,5879,5880,5881,5882,5883,5884,5885,5886,5887,5888,5889,
-5890,5891,5892,5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904,
-5905,5906,5907,5908,5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,
-5920,5921,5922,5923,5924,5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,
-5935,5936,5937,5938,5939,5940,5941,5942,5943,5944,5945,5946,5947,5948,5949,
-5950,5951,5952,5953,5954,5955,5956,5957,5958,5959,5960,5961,5962,5963,5964,
-5965,5966,5967,5968,5969,5970,5971,5972,5973,5974,5975,5976,5977,5978,5979,
-5980,5981,5982,5983,5984,5985,5986,5987,5988,5989,5990,5991,5992,5993,5994,
-5995,5996,5997,5998,5999,6000,6001,6002,6003,6004,6005,6006,6007,6008,6009,
-6010,6011,6012,6013,6014,6015,6016,6017,6018,6019,6020,6021,6022,6023,6024,
-6025,6026,6027,6028,6029,6030,6031,6032,6033,6034,6035,6036,6037,6038,6039,
-6040,6041,6042,6043,6044,6045,6046,6047,6048,6049,6050,6051,6052,6053,6054,
-6055,6056,6057,6058,6059,6060,6061,6062,6063,6064,6065,6066,6067,6068,6069,
-6070,6071,6072,6073,6074,6075,6076,6077,6078,6079,6080,6081,6082,6083,6084,
-6085,6086,6087,6088,6089,6090,6091,6092,6093,6094,6095,6096,6097,6098,6099,
-6100,6101,6102,6103,6104,6105,6106,6107,6108,6109,6110,6111,6112,6113,6114,
-6115,6116,6117,6118,6119,6120,6121,6122,6123,6124,6125,6126,6127,6128,6129,
-6130,6131,6132,6133,6134,6135,6136,6137,6138,6139,6140,6141,6142,6143,6144,
-6145,6146,6147,6148,6149,6150,6151,6152,6153,6154,6155,6156,6157,6158,6159,
-6160,6161,6162,6163,6164,6165,6166,6167,6168,6169,6170,6171,6172,6173,6174,
-6175,6176,6177,6178,6179,6180,6181,6182,6183,6184,6185,6186,6187,6188,6189,
-6190,6191,6192,6193,6194,6195,6196,6197,6198,6199,6200,6201,6202,6203,6204,
-6205,6206,6207,6208,6209,6210,6211,6212,6213,6214,6215,6216,6217,6218,6219,
-6220,6221,6222,6223,6224,6225,6226,6227,6228,6229,6230,6231,6232,6233,6234,
-6235,6236,6237,6238,6239,6240,6241,6242,6243,6244,6245,6246,6247,6248,6249,
-6250,6251,6252,6253,6254,6255,6256,6257,6258,6259,6260,6261,6262,6263,6264,
-6265,6266,6267,6268,6269,6270,6271,6272,6273,6274,6275,6276,6277,6278,6279,
-6280,6281,6282,6283,6284,6285,6286,6287,6288,6289,6290,6291,6292,6293,6294,
-6295,6296,6297,6298,6299,6300,6301,6302,6303,6304,6305,6306,6307,6308,6309,
-6310,6311,6312,6313,6314,6315,6316,6317,6318,6319,6320,6321,6322,6323,6324,
-6325,6326,6327,6328,6329,6330,6331,6332,6333,6334,6335,6336,6337,6338,6339,
-6340,6341,6342,6343,6344,6345,6346,6347,6348,6349,6350,6351,6352,6353,6354,
-6355,6356,6357,6358,6359,6360,6361,6362,6363,6364,6365,6366,6367,6368,6369,
-6370,6371,6372,6373,6374,6375,6376,6377,6378,6379,6380,6381,6382,6383,6384,
-6385,6386,6387,6388,6389,6390,6391,6392,6393,6394,6395,6396,6397,6398,6399,
-6400,6401,6402,6403,6404,6405,6406,6407,6408,6409,6410,6411,6412,6413,6414,
-6415,6416,6417,6418,6419,6420,6421,6422,6423,6424,6425,6426,6427,6428,6429,
-6430,6431,6432,6433,6434,6435,6436,6437,6438,6439,6440,6441,6442,6443,6444,
-6445,6446,6447,6448,6449,6450,6451,6452,6453,6454,6455,6456,6457,6458,6459,
-6460,6461,6462,6463,6464,6465,6466,6467,6468,6469,6470,6471,6472,6473,6474,
-6475,6476,6477,6478,6479,6480,6481,6482,6483,6484,6485,6486,6487,6488,6489,
-6490,6491,6492,6493,6494,6495,6496,6497,6498,6499,6500,6501,6502,6503,6504,
-6505,6506,6507,6508,6509,6510,6511,6512,6513,6514,6515,6516,6517,6518,6519,
-6520,6521,6522,6523,6524,6525,6526,6527,6528,6529,6530,6531,6532,6533,6534,
-6535,6536,6537,6538,6539,6540,6541,6542,6543,6544,6545,6546,6547,6548,6549,
-6550,6551,6552,6553,6554,6555,6556,6557,6558,6559,6560,6561,6562,6563,6564,
-6565,6566,6567,6568,6569,6570,6571,6572,6573,6574,6575,6576,6577,6578,6579,
-6580,6581,6582,6583,6584,6585,6586,6587,6588,6589,6590,6591,6592,6593,6594,
-6595,6596,6597,6598,6599,6600,6601,6602,6603,6604,6605,6606,6607,6608,6609,
-6610,6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,6622,6623,6624,
-6625,6626,6627,6628,6629,6630,6631,6632,6633,6634,6635,6636,6637,6638,6639,
-6640,6641,6642,6643,6644,6645,6646,6647,6648,6649,6650,6651,6652,6653,6654,
-6655,6656,6657,6658,6659,6660,6661,6662,6663,6664,6665,6666,6667,6668,6669,
-6670,6671,6672,6673,6674,6675,6676,6677,6678,6679,6680,6681,6682,6683,6684,
-6685,6686,6687,6688,6689,6690,6691,6692,6693,6694,6695,6696,6697,6698,6699,
-6700,6701,6702,6703,6704,6705,6706,6707,6708,6709,6710,6711,6712,6713,6714,
-6715,6716,6717,6718,6719,6720,6721,6722,6723,6724,6725,6726,6727,6728,6729,
-6730,6731,6732,6733,6734,6735,6736,6737,6738,6739,6740,6741,6742,6743,6744,
-6745,6746,6747,6748,6749,6750,6751,6752,6753,6754,6755,6756,6757,6758,6759,
-6760,6761,6762,6763,6764,6765,6766,6767,6768,6769,6770,6771,6772,6773,6774,
-6775,6776,6777,6778,6779,6780,6781,6782,6783,6784,6785,6786,6787,6788,6789,
-6790,6791,6792,6793,6794,6795,6796,6797,6798,6799,6800,6801,6802,6803,6804,
-6805,6806,6807,6808,6809,6810,6811,6812,6813,6814,6815,6816,6817,6818,6819,
-6820,6821,6822,6823,6824,6825,6826,6827,6828,6829,6830,6831,6832,6833,6834,
-6835,6836,6837,6838,6839,6840,6841,6842,6843,6844,6845,6846,6847,6848,6849,
-6850,6851,6852,6853,6854,6855,6856,6857,6858,6859,6860,6861,6862,6863,6864,
-6865,6866,6867,6868,6869,6870,6871,6872,6873,6874,6875,6876,6877,6878,6879,
-6880,6881,6882,6883,6884,6885,6886,6887,6888,6889,6890,6891,6892,6893,6894,
-6895,6896,6897,6898,6899,6900,6901,6902,6903,6904,6905,6906,6907,6908,6909,
-6910,6911,6912,6913,6914,6915,6916,6917,6918,6919,6920,6921,6922,6923,6924,
-6925,6926,6927,6928,6929,6930,6931,6932,6933,6934,6935,6936,6937,6938,6939,
-6940,6941,6942,6943,6944,6945,6946,6947,6948,6949,6950,6951,6952,6953,6954,
-6955,6956,6957,6958,6959,6960,6961,6962,6963,6964,6965,6966,6967,6968,6969,
-6970,6971,6972,6973,6974,6975,6976,6977,6978,6979,6980,6981,6982,6983,6984,
-6985,6986,6987,6988,6989,6990,6991,6992,6993,6994,6995,6996,6997,6998,6999,
-7000,7001,7002,7003,7004,7005,7006,7007,7008,7009,7010,7011,7012,7013,7014,
-7015,7016,7017,7018,7019,7020,7021,7022,7023,7024,7025,7026,7027,7028,7029,
-7030,7031,7032,7033,7034,7035,7036,7037,7038,7039,7040,7041,7042,7043,7044,
-7045,7046,7047,7048,7049,7050,7051,7052,7053,7054,7055,7056,7057,7058,7059,
-7060,7061,7062,7063,7064,7065,7066,7067,7068,7069,7070,7071,7072,7073,7074,
-7075,7076,7077,7078,7079,7080,7081,7082,7083,7084,7085,7086,7087,7088,7089,
-7090,7091,7092,7093,7094,7095,7096,7097,7098,7099,7100,7101,7102,7103,7104,
-7105,7106,7107,7108,7109,7110,7111,7112,7113,7114,7115,7116,7117,7118,7119,
-7120,7121,7122,7123,7124,7125,7126,7127,7128,7129,7130,7131,7132,7133,7134,
-7135,7136,7137,7138,7139,7140,7141,7142,7143,7144,7145,7146,7147,7148,7149,
-7150,7151,7152,7153,7154,7155,7156,7157,7158,7159,7160,7161,7162,7163,7164,
-7165,7166,7167,7168,7169,7170,7171,7172,7173,7174,7175,7176,7177,7178,7179,
-7180,7181,7182,7183,7184,7185,7186,7187,7188,7189,7190,7191,7192,7193,7194,
-7195,7196,7197,7198,7199,7200,7201,7202,7203,7204,7205,7206,7207,7208,7209,
-7210,7211,7212,7213,7214,7215,7216,7217,7218,7219,7220,7221,7222,7223,7224,
-7225,7226,7227,7228,7229,7230,7231,7232,7233,7234,7235,7236,7237,7238,7239,
-7240,7241,7242,7243,7244,7245,7246,7247,7248,7249,7250,7251,7252,7253,7254,
-7255,7256,7257,7258,7259,7260,7261,7262,7263,7264,7265,7266,7267,7268,7269,
-7270,7271,7272,7273,7274,7275,7276,7277,7278,7279,7280,7281,7282,7283,7284,
-7285,7286,7287,7288,7289,7290,7291,7292,7293,7294,7295,1042,1044,1054,1057,
-1058,1058,1066,1122,42570L,7305,7306,7307,7308,7309,7310,7311,7312,7313,
-7314,7315,7316,7317,7318,7319,7320,7321,7322,7323,7324,7325,7326,7327,7328,
-7329,7330,7331,7332,7333,7334,7335,7336,7337,7338,7339,7340,7341,7342,7343,
-7344,7345,7346,7347,7348,7349,7350,7351,7352,7353,7354,7355,7356,7357,7358,
-7359,7360,7361,7362,7363,7364,7365,7366,7367,7368,7369,7370,7371,7372,7373,
-7374,7375,7376,7377,7378,7379,7380,7381,7382,7383,7384,7385,7386,7387,7388,
-7389,7390,7391,7392,7393,7394,7395,7396,7397,7398,7399,7400,7401,7402,7403,
-7404,7405,7406,7407,7408,7409,7410,7411,7412,7413,7414,7415,7416,7417,7418,
-7419,7420,7421,7422,7423,7424,7425,7426,7427,7428,7429,7430,7431,7432,7433,
-7434,7435,7436,7437,7438,7439,7440,7441,7442,7443,7444,7445,7446,7447,7448,
-7449,7450,7451,7452,7453,7454,7455,7456,7457,7458,7459,7460,7461,7462,7463,
-7464,7465,7466,7467,7468,7469,7470,7471,7472,7473,7474,7475,7476,7477,7478,
-7479,7480,7481,7482,7483,7484,7485,7486,7487,7488,7489,7490,7491,7492,7493,
-7494,7495,7496,7497,7498,7499,7500,7501,7502,7503,7504,7505,7506,7507,7508,
-7509,7510,7511,7512,7513,7514,7515,7516,7517,7518,7519,7520,7521,7522,7523,
-7524,7525,7526,7527,7528,7529,7530,7531,7532,7533,7534,7535,7536,7537,7538,
-7539,7540,7541,7542,7543,7544,42877L,7546,7547,7548,11363,7550,7551,7552,
-7553,7554,7555,7556,7557,7558,7559,7560,7561,7562,7563,7564,7565,7566,7567,
-7568,7569,7570,7571,7572,7573,7574,7575,7576,7577,7578,7579,7580,7581,7582,
-7583,7584,7585,7586,7587,7588,7589,7590,7591,7592,7593,7594,7595,7596,7597,
-7598,7599,7600,7601,7602,7603,7604,7605,7606,7607,7608,7609,7610,7611,7612,
-7613,7614,7615,7616,7617,7618,7619,7620,7621,7622,7623,7624,7625,7626,7627,
-7628,7629,7630,7631,7632,7633,7634,7635,7636,7637,7638,7639,7640,7641,7642,
-7643,7644,7645,7646,7647,7648,7649,7650,7651,7652,7653,7654,7655,7656,7657,
-7658,7659,7660,7661,7662,7663,7664,7665,7666,7667,7668,7669,7670,7671,7672,
-7673,7674,7675,7676,7677,7678,7679,7680,7680,7682,7682,7684,7684,7686,7686,
-7688,7688,7690,7690,7692,7692,7694,7694,7696,7696,7698,7698,7700,7700,7702,
-7702,7704,7704,7706,7706,7708,7708,7710,7710,7712,7712,7714,7714,7716,7716,
-7718,7718,7720,7720,7722,7722,7724,7724,7726,7726,7728,7728,7730,7730,7732,
-7732,7734,7734,7736,7736,7738,7738,7740,7740,7742,7742,7744,7744,7746,7746,
-7748,7748,7750,7750,7752,7752,7754,7754,7756,7756,7758,7758,7760,7760,7762,
-7762,7764,7764,7766,7766,7768,7768,7770,7770,7772,7772,7774,7774,7776,7776,
-7778,7778,7780,7780,7782,7782,7784,7784,7786,7786,7788,7788,7790,7790,7792,
-7792,7794,7794,7796,7796,7798,7798,7800,7800,7802,7802,7804,7804,7806,7806,
-7808,7808,7810,7810,7812,7812,7814,7814,7816,7816,7818,7818,7820,7820,7822,
-7822,7824,7824,7826,7826,7828,7828,7830,7831,7832,7833,7834,7776,7836,7837,
-7838,7839,7840,7840,7842,7842,7844,7844,7846,7846,7848,7848,7850,7850,7852,
-7852,7854,7854,7856,7856,7858,7858,7860,7860,7862,7862,7864,7864,7866,7866,
-7868,7868,7870,7870,7872,7872,7874,7874,7876,7876,7878,7878,7880,7880,7882,
-7882,7884,7884,7886,7886,7888,7888,7890,7890,7892,7892,7894,7894,7896,7896,
-7898,7898,7900,7900,7902,7902,7904,7904,7906,7906,7908,7908,7910,7910,7912,
-7912,7914,7914,7916,7916,7918,7918,7920,7920,7922,7922,7924,7924,7926,7926,
-7928,7928,7930,7930,7932,7932,7934,7934,7944,7945,7946,7947,7948,7949,7950,
-7951,7944,7945,7946,7947,7948,7949,7950,7951,7960,7961,7962,7963,7964,7965,
-7958,7959,7960,7961,7962,7963,7964,7965,7966,7967,7976,7977,7978,7979,7980,
-7981,7982,7983,7976,7977,7978,7979,7980,7981,7982,7983,7992,7993,7994,7995,
-7996,7997,7998,7999,7992,7993,7994,7995,7996,7997,7998,7999,8008,8009,8010,
-8011,8012,8013,8006,8007,8008,8009,8010,8011,8012,8013,8014,8015,8016,8025,
-8018,8027,8020,8029,8022,8031,8024,8025,8026,8027,8028,8029,8030,8031,8040,
-8041,8042,8043,8044,8045,8046,8047,8040,8041,8042,8043,8044,8045,8046,8047,
-8122,8123,8136,8137,8138,8139,8154,8155,8184,8185,8170,8171,8186,8187,8062,
-8063,8064,8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,
-8078,8079,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,
-8093,8094,8095,8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,
-8108,8109,8110,8111,8120,8121,8114,8115,8116,8117,8118,8119,8120,8121,8122,
-8123,8124,8125,921,8127,8128,8129,8130,8131,8132,8133,8134,8135,8136,8137,
-8138,8139,8140,8141,8142,8143,8152,8153,8146,8147,8148,8149,8150,8151,8152,
-8153,8154,8155,8156,8157,8158,8159,8168,8169,8162,8163,8164,8172,8166,8167,
-8168,8169,8170,8171,8172,8173,8174,8175,8176,8177,8178,8179,8180,8181,8182,
-8183,8184,8185,8186,8187,8188,8189,8190,8191,8192,8193,8194,8195,8196,8197,
-8198,8199,8200,8201,8202,8203,8204,8205,8206,8207,8208,8209,8210,8211,8212,
-8213,8214,8215,8216,8217,8218,8219,8220,8221,8222,8223,8224,8225,8226,8227,
-8228,8229,8230,8231,8232,8233,8234,8235,8236,8237,8238,8239,8240,8241,8242,
-8243,8244,8245,8246,8247,8248,8249,8250,8251,8252,8253,8254,8255,8256,8257,
-8258,8259,8260,8261,8262,8263,8264,8265,8266,8267,8268,8269,8270,8271,8272,
-8273,8274,8275,8276,8277,8278,8279,8280,8281,8282,8283,8284,8285,8286,8287,
-8288,8289,8290,8291,8292,8293,8294,8295,8296,8297,8298,8299,8300,8301,8302,
-8303,8304,8305,8306,8307,8308,8309,8310,8311,8312,8313,8314,8315,8316,8317,
-8318,8319,8320,8321,8322,8323,8324,8325,8326,8327,8328,8329,8330,8331,8332,
-8333,8334,8335,8336,8337,8338,8339,8340,8341,8342,8343,8344,8345,8346,8347,
-8348,8349,8350,8351,8352,8353,8354,8355,8356,8357,8358,8359,8360,8361,8362,
-8363,8364,8365,8366,8367,8368,8369,8370,8371,8372,8373,8374,8375,8376,8377,
-8378,8379,8380,8381,8382,8383,8384,8385,8386,8387,8388,8389,8390,8391,8392,
-8393,8394,8395,8396,8397,8398,8399,8400,8401,8402,8403,8404,8405,8406,8407,
-8408,8409,8410,8411,8412,8413,8414,8415,8416,8417,8418,8419,8420,8421,8422,
-8423,8424,8425,8426,8427,8428,8429,8430,8431,8432,8433,8434,8435,8436,8437,
-8438,8439,8440,8441,8442,8443,8444,8445,8446,8447,8448,8449,8450,8451,8452,
-8453,8454,8455,8456,8457,8458,8459,8460,8461,8462,8463,8464,8465,8466,8467,
-8468,8469,8470,8471,8472,8473,8474,8475,8476,8477,8478,8479,8480,8481,8482,
-8483,8484,8485,8486,8487,8488,8489,8490,8491,8492,8493,8494,8495,8496,8497,
-8498,8499,8500,8501,8502,8503,8504,8505,8506,8507,8508,8509,8510,8511,8512,
-8513,8514,8515,8516,8517,8518,8519,8520,8521,8522,8523,8524,8525,8498,8527,
-8528,8529,8530,8531,8532,8533,8534,8535,8536,8537,8538,8539,8540,8541,8542,
-8543,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554,8555,8556,8557,
-8558,8559,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554,8555,8556,
-8557,8558,8559,8576,8577,8578,8579,8579,8581,8582,8583,8584,8585,8586,8587,
-8588,8589,8590,8591,8592,8593,8594,8595,8596,8597,8598,8599,8600,8601,8602,
-8603,8604,8605,8606,8607,8608,8609,8610,8611,8612,8613,8614,8615,8616,8617,
-8618,8619,8620,8621,8622,8623,8624,8625,8626,8627,8628,8629,8630,8631,8632,
-8633,8634,8635,8636,8637,8638,8639,8640,8641,8642,8643,8644,8645,8646,8647,
-8648,8649,8650,8651,8652,8653,8654,8655,8656,8657,8658,8659,8660,8661,8662,
-8663,8664,8665,8666,8667,8668,8669,8670,8671,8672,8673,8674,8675,8676,8677,
-8678,8679,8680,8681,8682,8683,8684,8685,8686,8687,8688,8689,8690,8691,8692,
-8693,8694,8695,8696,8697,8698,8699,8700,8701,8702,8703,8704,8705,8706,8707,
-8708,8709,8710,8711,8712,8713,8714,8715,8716,8717,8718,8719,8720,8721,8722,
-8723,8724,8725,8726,8727,8728,8729,8730,8731,8732,8733,8734,8735,8736,8737,
-8738,8739,8740,8741,8742,8743,8744,8745,8746,8747,8748,8749,8750,8751,8752,
-8753,8754,8755,8756,8757,8758,8759,8760,8761,8762,8763,8764,8765,8766,8767,
-8768,8769,8770,8771,8772,8773,8774,8775,8776,8777,8778,8779,8780,8781,8782,
-8783,8784,8785,8786,8787,8788,8789,8790,8791,8792,8793,8794,8795,8796,8797,
-8798,8799,8800,8801,8802,8803,8804,8805,8806,8807,8808,8809,8810,8811,8812,
-8813,8814,8815,8816,8817,8818,8819,8820,8821,8822,8823,8824,8825,8826,8827,
-8828,8829,8830,8831,8832,8833,8834,8835,8836,8837,8838,8839,8840,8841,8842,
-8843,8844,8845,8846,8847,8848,8849,8850,8851,8852,8853,8854,8855,8856,8857,
-8858,8859,8860,8861,8862,8863,8864,8865,8866,8867,8868,8869,8870,8871,8872,
-8873,8874,8875,8876,8877,8878,8879,8880,8881,8882,8883,8884,8885,8886,8887,
-8888,8889,8890,8891,8892,8893,8894,8895,8896,8897,8898,8899,8900,8901,8902,
-8903,8904,8905,8906,8907,8908,8909,8910,8911,8912,8913,8914,8915,8916,8917,
-8918,8919,8920,8921,8922,8923,8924,8925,8926,8927,8928,8929,8930,8931,8932,
-8933,8934,8935,8936,8937,8938,8939,8940,8941,8942,8943,8944,8945,8946,8947,
-8948,8949,8950,8951,8952,8953,8954,8955,8956,8957,8958,8959,8960,8961,8962,
-8963,8964,8965,8966,8967,8968,8969,8970,8971,8972,8973,8974,8975,8976,8977,
-8978,8979,8980,8981,8982,8983,8984,8985,8986,8987,8988,8989,8990,8991,8992,
-8993,8994,8995,8996,8997,8998,8999,9000,9001,9002,9003,9004,9005,9006,9007,
-9008,9009,9010,9011,9012,9013,9014,9015,9016,9017,9018,9019,9020,9021,9022,
-9023,9024,9025,9026,9027,9028,9029,9030,9031,9032,9033,9034,9035,9036,9037,
-9038,9039,9040,9041,9042,9043,9044,9045,9046,9047,9048,9049,9050,9051,9052,
-9053,9054,9055,9056,9057,9058,9059,9060,9061,9062,9063,9064,9065,9066,9067,
-9068,9069,9070,9071,9072,9073,9074,9075,9076,9077,9078,9079,9080,9081,9082,
-9083,9084,9085,9086,9087,9088,9089,9090,9091,9092,9093,9094,9095,9096,9097,
-9098,9099,9100,9101,9102,9103,9104,9105,9106,9107,9108,9109,9110,9111,9112,
-9113,9114,9115,9116,9117,9118,9119,9120,9121,9122,9123,9124,9125,9126,9127,
-9128,9129,9130,9131,9132,9133,9134,9135,9136,9137,9138,9139,9140,9141,9142,
-9143,9144,9145,9146,9147,9148,9149,9150,9151,9152,9153,9154,9155,9156,9157,
-9158,9159,9160,9161,9162,9163,9164,9165,9166,9167,9168,9169,9170,9171,9172,
-9173,9174,9175,9176,9177,9178,9179,9180,9181,9182,9183,9184,9185,9186,9187,
-9188,9189,9190,9191,9192,9193,9194,9195,9196,9197,9198,9199,9200,9201,9202,
-9203,9204,9205,9206,9207,9208,9209,9210,9211,9212,9213,9214,9215,9216,9217,
-9218,9219,9220,9221,9222,9223,9224,9225,9226,9227,9228,9229,9230,9231,9232,
-9233,9234,9235,9236,9237,9238,9239,9240,9241,9242,9243,9244,9245,9246,9247,
-9248,9249,9250,9251,9252,9253,9254,9255,9256,9257,9258,9259,9260,9261,9262,
-9263,9264,9265,9266,9267,9268,9269,9270,9271,9272,9273,9274,9275,9276,9277,
-9278,9279,9280,9281,9282,9283,9284,9285,9286,9287,9288,9289,9290,9291,9292,
-9293,9294,9295,9296,9297,9298,9299,9300,9301,9302,9303,9304,9305,9306,9307,
-9308,9309,9310,9311,9312,9313,9314,9315,9316,9317,9318,9319,9320,9321,9322,
-9323,9324,9325,9326,9327,9328,9329,9330,9331,9332,9333,9334,9335,9336,9337,
-9338,9339,9340,9341,9342,9343,9344,9345,9346,9347,9348,9349,9350,9351,9352,
-9353,9354,9355,9356,9357,9358,9359,9360,9361,9362,9363,9364,9365,9366,9367,
-9368,9369,9370,9371,9372,9373,9374,9375,9376,9377,9378,9379,9380,9381,9382,
-9383,9384,9385,9386,9387,9388,9389,9390,9391,9392,9393,9394,9395,9396,9397,
-9398,9399,9400,9401,9402,9403,9404,9405,9406,9407,9408,9409,9410,9411,9412,
-9413,9414,9415,9416,9417,9418,9419,9420,9421,9422,9423,9398,9399,9400,9401,
-9402,9403,9404,9405,9406,9407,9408,9409,9410,9411,9412,9413,9414,9415,9416,
-9417,9418,9419,9420,9421,9422,9423,9450,9451,9452,9453,9454,9455,9456,9457,
-9458,9459,9460,9461,9462,9463,9464,9465,9466,9467,9468,9469,9470,9471,9472,
-9473,9474,9475,9476,9477,9478,9479,9480,9481,9482,9483,9484,9485,9486,9487,
-9488,9489,9490,9491,9492,9493,9494,9495,9496,9497,9498,9499,9500,9501,9502,
-9503,9504,9505,9506,9507,9508,9509,9510,9511,9512,9513,9514,9515,9516,9517,
-9518,9519,9520,9521,9522,9523,9524,9525,9526,9527,9528,9529,9530,9531,9532,
-9533,9534,9535,9536,9537,9538,9539,9540,9541,9542,9543,9544,9545,9546,9547,
-9548,9549,9550,9551,9552,9553,9554,9555,9556,9557,9558,9559,9560,9561,9562,
-9563,9564,9565,9566,9567,9568,9569,9570,9571,9572,9573,9574,9575,9576,9577,
-9578,9579,9580,9581,9582,9583,9584,9585,9586,9587,9588,9589,9590,9591,9592,
-9593,9594,9595,9596,9597,9598,9599,9600,9601,9602,9603,9604,9605,9606,9607,
-9608,9609,9610,9611,9612,9613,9614,9615,9616,9617,9618,9619,9620,9621,9622,
-9623,9624,9625,9626,9627,9628,9629,9630,9631,9632,9633,9634,9635,9636,9637,
-9638,9639,9640,9641,9642,9643,9644,9645,9646,9647,9648,9649,9650,9651,9652,
-9653,9654,9655,9656,9657,9658,9659,9660,9661,9662,9663,9664,9665,9666,9667,
-9668,9669,9670,9671,9672,9673,9674,9675,9676,9677,9678,9679,9680,9681,9682,
-9683,9684,9685,9686,9687,9688,9689,9690,9691,9692,9693,9694,9695,9696,9697,
-9698,9699,9700,9701,9702,9703,9704,9705,9706,9707,9708,9709,9710,9711,9712,
-9713,9714,9715,9716,9717,9718,9719,9720,9721,9722,9723,9724,9725,9726,9727,
-9728,9729,9730,9731,9732,9733,9734,9735,9736,9737,9738,9739,9740,9741,9742,
-9743,9744,9745,9746,9747,9748,9749,9750,9751,9752,9753,9754,9755,9756,9757,
-9758,9759,9760,9761,9762,9763,9764,9765,9766,9767,9768,9769,9770,9771,9772,
-9773,9774,9775,9776,9777,9778,9779,9780,9781,9782,9783,9784,9785,9786,9787,
-9788,9789,9790,9791,9792,9793,9794,9795,9796,9797,9798,9799,9800,9801,9802,
-9803,9804,9805,9806,9807,9808,9809,9810,9811,9812,9813,9814,9815,9816,9817,
-9818,9819,9820,9821,9822,9823,9824,9825,9826,9827,9828,9829,9830,9831,9832,
-9833,9834,9835,9836,9837,9838,9839,9840,9841,9842,9843,9844,9845,9846,9847,
-9848,9849,9850,9851,9852,9853,9854,9855,9856,9857,9858,9859,9860,9861,9862,
-9863,9864,9865,9866,9867,9868,9869,9870,9871,9872,9873,9874,9875,9876,9877,
-9878,9879,9880,9881,9882,9883,9884,9885,9886,9887,9888,9889,9890,9891,9892,
-9893,9894,9895,9896,9897,9898,9899,9900,9901,9902,9903,9904,9905,9906,9907,
-9908,9909,9910,9911,9912,9913,9914,9915,9916,9917,9918,9919,9920,9921,9922,
-9923,9924,9925,9926,9927,9928,9929,9930,9931,9932,9933,9934,9935,9936,9937,
-9938,9939,9940,9941,9942,9943,9944,9945,9946,9947,9948,9949,9950,9951,9952,
-9953,9954,9955,9956,9957,9958,9959,9960,9961,9962,9963,9964,9965,9966,9967,
-9968,9969,9970,9971,9972,9973,9974,9975,9976,9977,9978,9979,9980,9981,9982,
-9983,9984,9985,9986,9987,9988,9989,9990,9991,9992,9993,9994,9995,9996,9997,
-9998,9999,10000,10001,10002,10003,10004,10005,10006,10007,10008,10009,
-10010,10011,10012,10013,10014,10015,10016,10017,10018,10019,10020,10021,
-10022,10023,10024,10025,10026,10027,10028,10029,10030,10031,10032,10033,
-10034,10035,10036,10037,10038,10039,10040,10041,10042,10043,10044,10045,
-10046,10047,10048,10049,10050,10051,10052,10053,10054,10055,10056,10057,
-10058,10059,10060,10061,10062,10063,10064,10065,10066,10067,10068,10069,
-10070,10071,10072,10073,10074,10075,10076,10077,10078,10079,10080,10081,
-10082,10083,10084,10085,10086,10087,10088,10089,10090,10091,10092,10093,
-10094,10095,10096,10097,10098,10099,10100,10101,10102,10103,10104,10105,
-10106,10107,10108,10109,10110,10111,10112,10113,10114,10115,10116,10117,
-10118,10119,10120,10121,10122,10123,10124,10125,10126,10127,10128,10129,
-10130,10131,10132,10133,10134,10135,10136,10137,10138,10139,10140,10141,
-10142,10143,10144,10145,10146,10147,10148,10149,10150,10151,10152,10153,
-10154,10155,10156,10157,10158,10159,10160,10161,10162,10163,10164,10165,
-10166,10167,10168,10169,10170,10171,10172,10173,10174,10175,10176,10177,
-10178,10179,10180,10181,10182,10183,10184,10185,10186,10187,10188,10189,
-10190,10191,10192,10193,10194,10195,10196,10197,10198,10199,10200,10201,
-10202,10203,10204,10205,10206,10207,10208,10209,10210,10211,10212,10213,
-10214,10215,10216,10217,10218,10219,10220,10221,10222,10223,10224,10225,
-10226,10227,10228,10229,10230,10231,10232,10233,10234,10235,10236,10237,
-10238,10239,10240,10241,10242,10243,10244,10245,10246,10247,10248,10249,
-10250,10251,10252,10253,10254,10255,10256,10257,10258,10259,10260,10261,
-10262,10263,10264,10265,10266,10267,10268,10269,10270,10271,10272,10273,
-10274,10275,10276,10277,10278,10279,10280,10281,10282,10283,10284,10285,
-10286,10287,10288,10289,10290,10291,10292,10293,10294,10295,10296,10297,
-10298,10299,10300,10301,10302,10303,10304,10305,10306,10307,10308,10309,
-10310,10311,10312,10313,10314,10315,10316,10317,10318,10319,10320,10321,
-10322,10323,10324,10325,10326,10327,10328,10329,10330,10331,10332,10333,
-10334,10335,10336,10337,10338,10339,10340,10341,10342,10343,10344,10345,
-10346,10347,10348,10349,10350,10351,10352,10353,10354,10355,10356,10357,
-10358,10359,10360,10361,10362,10363,10364,10365,10366,10367,10368,10369,
-10370,10371,10372,10373,10374,10375,10376,10377,10378,10379,10380,10381,
-10382,10383,10384,10385,10386,10387,10388,10389,10390,10391,10392,10393,
-10394,10395,10396,10397,10398,10399,10400,10401,10402,10403,10404,10405,
-10406,10407,10408,10409,10410,10411,10412,10413,10414,10415,10416,10417,
-10418,10419,10420,10421,10422,10423,10424,10425,10426,10427,10428,10429,
-10430,10431,10432,10433,10434,10435,10436,10437,10438,10439,10440,10441,
-10442,10443,10444,10445,10446,10447,10448,10449,10450,10451,10452,10453,
-10454,10455,10456,10457,10458,10459,10460,10461,10462,10463,10464,10465,
-10466,10467,10468,10469,10470,10471,10472,10473,10474,10475,10476,10477,
-10478,10479,10480,10481,10482,10483,10484,10485,10486,10487,10488,10489,
-10490,10491,10492,10493,10494,10495,10496,10497,10498,10499,10500,10501,
-10502,10503,10504,10505,10506,10507,10508,10509,10510,10511,10512,10513,
-10514,10515,10516,10517,10518,10519,10520,10521,10522,10523,10524,10525,
-10526,10527,10528,10529,10530,10531,10532,10533,10534,10535,10536,10537,
-10538,10539,10540,10541,10542,10543,10544,10545,10546,10547,10548,10549,
-10550,10551,10552,10553,10554,10555,10556,10557,10558,10559,10560,10561,
-10562,10563,10564,10565,10566,10567,10568,10569,10570,10571,10572,10573,
-10574,10575,10576,10577,10578,10579,10580,10581,10582,10583,10584,10585,
-10586,10587,10588,10589,10590,10591,10592,10593,10594,10595,10596,10597,
-10598,10599,10600,10601,10602,10603,10604,10605,10606,10607,10608,10609,
-10610,10611,10612,10613,10614,10615,10616,10617,10618,10619,10620,10621,
-10622,10623,10624,10625,10626,10627,10628,10629,10630,10631,10632,10633,
-10634,10635,10636,10637,10638,10639,10640,10641,10642,10643,10644,10645,
-10646,10647,10648,10649,10650,10651,10652,10653,10654,10655,10656,10657,
-10658,10659,10660,10661,10662,10663,10664,10665,10666,10667,10668,10669,
-10670,10671,10672,10673,10674,10675,10676,10677,10678,10679,10680,10681,
-10682,10683,10684,10685,10686,10687,10688,10689,10690,10691,10692,10693,
-10694,10695,10696,10697,10698,10699,10700,10701,10702,10703,10704,10705,
-10706,10707,10708,10709,10710,10711,10712,10713,10714,10715,10716,10717,
-10718,10719,10720,10721,10722,10723,10724,10725,10726,10727,10728,10729,
-10730,10731,10732,10733,10734,10735,10736,10737,10738,10739,10740,10741,
-10742,10743,10744,10745,10746,10747,10748,10749,10750,10751,10752,10753,
-10754,10755,10756,10757,10758,10759,10760,10761,10762,10763,10764,10765,
-10766,10767,10768,10769,10770,10771,10772,10773,10774,10775,10776,10777,
-10778,10779,10780,10781,10782,10783,10784,10785,10786,10787,10788,10789,
-10790,10791,10792,10793,10794,10795,10796,10797,10798,10799,10800,10801,
-10802,10803,10804,10805,10806,10807,10808,10809,10810,10811,10812,10813,
-10814,10815,10816,10817,10818,10819,10820,10821,10822,10823,10824,10825,
-10826,10827,10828,10829,10830,10831,10832,10833,10834,10835,10836,10837,
-10838,10839,10840,10841,10842,10843,10844,10845,10846,10847,10848,10849,
-10850,10851,10852,10853,10854,10855,10856,10857,10858,10859,10860,10861,
-10862,10863,10864,10865,10866,10867,10868,10869,10870,10871,10872,10873,
-10874,10875,10876,10877,10878,10879,10880,10881,10882,10883,10884,10885,
-10886,10887,10888,10889,10890,10891,10892,10893,10894,10895,10896,10897,
-10898,10899,10900,10901,10902,10903,10904,10905,10906,10907,10908,10909,
-10910,10911,10912,10913,10914,10915,10916,10917,10918,10919,10920,10921,
-10922,10923,10924,10925,10926,10927,10928,10929,10930,10931,10932,10933,
-10934,10935,10936,10937,10938,10939,10940,10941,10942,10943,10944,10945,
-10946,10947,10948,10949,10950,10951,10952,10953,10954,10955,10956,10957,
-10958,10959,10960,10961,10962,10963,10964,10965,10966,10967,10968,10969,
-10970,10971,10972,10973,10974,10975,10976,10977,10978,10979,10980,10981,
-10982,10983,10984,10985,10986,10987,10988,10989,10990,10991,10992,10993,
-10994,10995,10996,10997,10998,10999,11000,11001,11002,11003,11004,11005,
-11006,11007,11008,11009,11010,11011,11012,11013,11014,11015,11016,11017,
-11018,11019,11020,11021,11022,11023,11024,11025,11026,11027,11028,11029,
-11030,11031,11032,11033,11034,11035,11036,11037,11038,11039,11040,11041,
-11042,11043,11044,11045,11046,11047,11048,11049,11050,11051,11052,11053,
-11054,11055,11056,11057,11058,11059,11060,11061,11062,11063,11064,11065,
-11066,11067,11068,11069,11070,11071,11072,11073,11074,11075,11076,11077,
-11078,11079,11080,11081,11082,11083,11084,11085,11086,11087,11088,11089,
-11090,11091,11092,11093,11094,11095,11096,11097,11098,11099,11100,11101,
-11102,11103,11104,11105,11106,11107,11108,11109,11110,11111,11112,11113,
-11114,11115,11116,11117,11118,11119,11120,11121,11122,11123,11124,11125,
-11126,11127,11128,11129,11130,11131,11132,11133,11134,11135,11136,11137,
-11138,11139,11140,11141,11142,11143,11144,11145,11146,11147,11148,11149,
-11150,11151,11152,11153,11154,11155,11156,11157,11158,11159,11160,11161,
-11162,11163,11164,11165,11166,11167,11168,11169,11170,11171,11172,11173,
-11174,11175,11176,11177,11178,11179,11180,11181,11182,11183,11184,11185,
-11186,11187,11188,11189,11190,11191,11192,11193,11194,11195,11196,11197,
-11198,11199,11200,11201,11202,11203,11204,11205,11206,11207,11208,11209,
-11210,11211,11212,11213,11214,11215,11216,11217,11218,11219,11220,11221,
-11222,11223,11224,11225,11226,11227,11228,11229,11230,11231,11232,11233,
-11234,11235,11236,11237,11238,11239,11240,11241,11242,11243,11244,11245,
-11246,11247,11248,11249,11250,11251,11252,11253,11254,11255,11256,11257,
-11258,11259,11260,11261,11262,11263,11264,11265,11266,11267,11268,11269,
-11270,11271,11272,11273,11274,11275,11276,11277,11278,11279,11280,11281,
-11282,11283,11284,11285,11286,11287,11288,11289,11290,11291,11292,11293,
-11294,11295,11296,11297,11298,11299,11300,11301,11302,11303,11304,11305,
-11306,11307,11308,11309,11310,11311,11264,11265,11266,11267,11268,11269,
-11270,11271,11272,11273,11274,11275,11276,11277,11278,11279,11280,11281,
-11282,11283,11284,11285,11286,11287,11288,11289,11290,11291,11292,11293,
-11294,11295,11296,11297,11298,11299,11300,11301,11302,11303,11304,11305,
-11306,11307,11308,11309,11310,11359,11360,11360,11362,11363,11364,570,574,
-11367,11367,11369,11369,11371,11371,11373,11374,11375,11376,11377,11378,
-11378,11380,11381,11381,11383,11384,11385,11386,11387,11388,11389,11390,
-11391,11392,11392,11394,11394,11396,11396,11398,11398,11400,11400,11402,
-11402,11404,11404,11406,11406,11408,11408,11410,11410,11412,11412,11414,
-11414,11416,11416,11418,11418,11420,11420,11422,11422,11424,11424,11426,
-11426,11428,11428,11430,11430,11432,11432,11434,11434,11436,11436,11438,
-11438,11440,11440,11442,11442,11444,11444,11446,11446,11448,11448,11450,
-11450,11452,11452,11454,11454,11456,11456,11458,11458,11460,11460,11462,
-11462,11464,11464,11466,11466,11468,11468,11470,11470,11472,11472,11474,
-11474,11476,11476,11478,11478,11480,11480,11482,11482,11484,11484,11486,
-11486,11488,11488,11490,11490,11492,11493,11494,11495,11496,11497,11498,
-11499,11499,11501,11501,11503,11504,11505,11506,11506,11508,11509,11510,
-11511,11512,11513,11514,11515,11516,11517,11518,11519,4256,4257,4258,4259,
-4260,4261,4262,4263,4264,4265,4266,4267,4268,4269,4270,4271,4272,4273,4274,
-4275,4276,4277,4278,4279,4280,4281,4282,4283,4284,4285,4286,4287,4288,4289,
-4290,4291,4292,4293,11558,4295,11560,11561,11562,11563,11564,4301,11566,
-11567,11568,11569,11570,11571,11572,11573,11574,11575,11576,11577,11578,
-11579,11580,11581,11582,11583,11584,11585,11586,11587,11588,11589,11590,
-11591,11592,11593,11594,11595,11596,11597,11598,11599,11600,11601,11602,
-11603,11604,11605,11606,11607,11608,11609,11610,11611,11612,11613,11614,
-11615,11616,11617,11618,11619,11620,11621,11622,11623,11624,11625,11626,
-11627,11628,11629,11630,11631,11632,11633,11634,11635,11636,11637,11638,
-11639,11640,11641,11642,11643,11644,11645,11646,11647,11648,11649,11650,
-11651,11652,11653,11654,11655,11656,11657,11658,11659,11660,11661,11662,
-11663,11664,11665,11666,11667,11668,11669,11670,11671,11672,11673,11674,
-11675,11676,11677,11678,11679,11680,11681,11682,11683,11684,11685,11686,
-11687,11688,11689,11690,11691,11692,11693,11694,11695,11696,11697,11698,
-11699,11700,11701,11702,11703,11704,11705,11706,11707,11708,11709,11710,
-11711,11712,11713,11714,11715,11716,11717,11718,11719,11720,11721,11722,
-11723,11724,11725,11726,11727,11728,11729,11730,11731,11732,11733,11734,
-11735,11736,11737,11738,11739,11740,11741,11742,11743,11744,11745,11746,
-11747,11748,11749,11750,11751,11752,11753,11754,11755,11756,11757,11758,
-11759,11760,11761,11762,11763,11764,11765,11766,11767,11768,11769,11770,
-11771,11772,11773,11774,11775,11776,11777,11778,11779,11780,11781,11782,
-11783,11784,11785,11786,11787,11788,11789,11790,11791,11792,11793,11794,
-11795,11796,11797,11798,11799,11800,11801,11802,11803,11804,11805,11806,
-11807,11808,11809,11810,11811,11812,11813,11814,11815,11816,11817,11818,
-11819,11820,11821,11822,11823,11824,11825,11826,11827,11828,11829,11830,
-11831,11832,11833,11834,11835,11836,11837,11838,11839,11840,11841,11842,
-11843,11844,11845,11846,11847,11848,11849,11850,11851,11852,11853,11854,
-11855,11856,11857,11858,11859,11860,11861,11862,11863,11864,11865,11866,
-11867,11868,11869,11870,11871,11872,11873,11874,11875,11876,11877,11878,
-11879,11880,11881,11882,11883,11884,11885,11886,11887,11888,11889,11890,
-11891,11892,11893,11894,11895,11896,11897,11898,11899,11900,11901,11902,
-11903,11904,11905,11906,11907,11908,11909,11910,11911,11912,11913,11914,
-11915,11916,11917,11918,11919,11920,11921,11922,11923,11924,11925,11926,
-11927,11928,11929,11930,11931,11932,11933,11934,11935,11936,11937,11938,
-11939,11940,11941,11942,11943,11944,11945,11946,11947,11948,11949,11950,
-11951,11952,11953,11954,11955,11956,11957,11958,11959,11960,11961,11962,
-11963,11964,11965,11966,11967,11968,11969,11970,11971,11972,11973,11974,
-11975,11976,11977,11978,11979,11980,11981,11982,11983,11984,11985,11986,
-11987,11988,11989,11990,11991,11992,11993,11994,11995,11996,11997,11998,
-11999,12000,12001,12002,12003,12004,12005,12006,12007,12008,12009,12010,
-12011,12012,12013,12014,12015,12016,12017,12018,12019,12020,12021,12022,
-12023,12024,12025,12026,12027,12028,12029,12030,12031,12032,12033,12034,
-12035,12036,12037,12038,12039,12040,12041,12042,12043,12044,12045,12046,
-12047,12048,12049,12050,12051,12052,12053,12054,12055,12056,12057,12058,
-12059,12060,12061,12062,12063,12064,12065,12066,12067,12068,12069,12070,
-12071,12072,12073,12074,12075,12076,12077,12078,12079,12080,12081,12082,
-12083,12084,12085,12086,12087,12088,12089,12090,12091,12092,12093,12094,
-12095,12096,12097,12098,12099,12100,12101,12102,12103,12104,12105,12106,
-12107,12108,12109,12110,12111,12112,12113,12114,12115,12116,12117,12118,
-12119,12120,12121,12122,12123,12124,12125,12126,12127,12128,12129,12130,
-12131,12132,12133,12134,12135,12136,12137,12138,12139,12140,12141,12142,
-12143,12144,12145,12146,12147,12148,12149,12150,12151,12152,12153,12154,
-12155,12156,12157,12158,12159,12160,12161,12162,12163,12164,12165,12166,
-12167,12168,12169,12170,12171,12172,12173,12174,12175,12176,12177,12178,
-12179,12180,12181,12182,12183,12184,12185,12186,12187,12188,12189,12190,
-12191,12192,12193,12194,12195,12196,12197,12198,12199,12200,12201,12202,
-12203,12204,12205,12206,12207,12208,12209,12210,12211,12212,12213,12214,
-12215,12216,12217,12218,12219,12220,12221,12222,12223,12224,12225,12226,
-12227,12228,12229,12230,12231,12232,12233,12234,12235,12236,12237,12238,
-12239,12240,12241,12242,12243,12244,12245,12246,12247,12248,12249,12250,
-12251,12252,12253,12254,12255,12256,12257,12258,12259,12260,12261,12262,
-12263,12264,12265,12266,12267,12268,12269,12270,12271,12272,12273,12274,
-12275,12276,12277,12278,12279,12280,12281,12282,12283,12284,12285,12286,
-12287,12288,12289,12290,12291,12292,12293,12294,12295,12296,12297,12298,
-12299,12300,12301,12302,12303,12304,12305,12306,12307,12308,12309,12310,
-12311,12312,12313,12314,12315,12316,12317,12318,12319,12320,12321,12322,
-12323,12324,12325,12326,12327,12328,12329,12330,12331,12332,12333,12334,
-12335,12336,12337,12338,12339,12340,12341,12342,12343,12344,12345,12346,
-12347,12348,12349,12350,12351,12352,12353,12354,12355,12356,12357,12358,
-12359,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,
-12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,
-12383,12384,12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,
-12395,12396,12397,12398,12399,12400,12401,12402,12403,12404,12405,12406,
-12407,12408,12409,12410,12411,12412,12413,12414,12415,12416,12417,12418,
-12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,
-12431,12432,12433,12434,12435,12436,12437,12438,12439,12440,12441,12442,
-12443,12444,12445,12446,12447,12448,12449,12450,12451,12452,12453,12454,
-12455,12456,12457,12458,12459,12460,12461,12462,12463,12464,12465,12466,
-12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477,12478,
-12479,12480,12481,12482,12483,12484,12485,12486,12487,12488,12489,12490,
-12491,12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,
-12503,12504,12505,12506,12507,12508,12509,12510,12511,12512,12513,12514,
-12515,12516,12517,12518,12519,12520,12521,12522,12523,12524,12525,12526,
-12527,12528,12529,12530,12531,12532,12533,12534,12535,12536,12537,12538,
-12539,12540,12541,12542,12543,12544,12545,12546,12547,12548,12549,12550,
-12551,12552,12553,12554,12555,12556,12557,12558,12559,12560,12561,12562,
-12563,12564,12565,12566,12567,12568,12569,12570,12571,12572,12573,12574,
-12575,12576,12577,12578,12579,12580,12581,12582,12583,12584,12585,12586,
-12587,12588,12589,12590,12591,12592,12593,12594,12595,12596,12597,12598,
-12599,12600,12601,12602,12603,12604,12605,12606,12607,12608,12609,12610,
-12611,12612,12613,12614,12615,12616,12617,12618,12619,12620,12621,12622,
-12623,12624,12625,12626,12627,12628,12629,12630,12631,12632,12633,12634,
-12635,12636,12637,12638,12639,12640,12641,12642,12643,12644,12645,12646,
-12647,12648,12649,12650,12651,12652,12653,12654,12655,12656,12657,12658,
-12659,12660,12661,12662,12663,12664,12665,12666,12667,12668,12669,12670,
-12671,12672,12673,12674,12675,12676,12677,12678,12679,12680,12681,12682,
-12683,12684,12685,12686,12687,12688,12689,12690,12691,12692,12693,12694,
-12695,12696,12697,12698,12699,12700,12701,12702,12703,12704,12705,12706,
-12707,12708,12709,12710,12711,12712,12713,12714,12715,12716,12717,12718,
-12719,12720,12721,12722,12723,12724,12725,12726,12727,12728,12729,12730,
-12731,12732,12733,12734,12735,12736,12737,12738,12739,12740,12741,12742,
-12743,12744,12745,12746,12747,12748,12749,12750,12751,12752,12753,12754,
-12755,12756,12757,12758,12759,12760,12761,12762,12763,12764,12765,12766,
-12767,12768,12769,12770,12771,12772,12773,12774,12775,12776,12777,12778,
-12779,12780,12781,12782,12783,12784,12785,12786,12787,12788,12789,12790,
-12791,12792,12793,12794,12795,12796,12797,12798,12799,12800,12801,12802,
-12803,12804,12805,12806,12807,12808,12809,12810,12811,12812,12813,12814,
-12815,12816,12817,12818,12819,12820,12821,12822,12823,12824,12825,12826,
-12827,12828,12829,12830,12831,12832,12833,12834,12835,12836,12837,12838,
-12839,12840,12841,12842,12843,12844,12845,12846,12847,12848,12849,12850,
-12851,12852,12853,12854,12855,12856,12857,12858,12859,12860,12861,12862,
-12863,12864,12865,12866,12867,12868,12869,12870,12871,12872,12873,12874,
-12875,12876,12877,12878,12879,12880,12881,12882,12883,12884,12885,12886,
-12887,12888,12889,12890,12891,12892,12893,12894,12895,12896,12897,12898,
-12899,12900,12901,12902,12903,12904,12905,12906,12907,12908,12909,12910,
-12911,12912,12913,12914,12915,12916,12917,12918,12919,12920,12921,12922,
-12923,12924,12925,12926,12927,12928,12929,12930,12931,12932,12933,12934,
-12935,12936,12937,12938,12939,12940,12941,12942,12943,12944,12945,12946,
-12947,12948,12949,12950,12951,12952,12953,12954,12955,12956,12957,12958,
-12959,12960,12961,12962,12963,12964,12965,12966,12967,12968,12969,12970,
-12971,12972,12973,12974,12975,12976,12977,12978,12979,12980,12981,12982,
-12983,12984,12985,12986,12987,12988,12989,12990,12991,12992,12993,12994,
-12995,12996,12997,12998,12999,13000,13001,13002,13003,13004,13005,13006,
-13007,13008,13009,13010,13011,13012,13013,13014,13015,13016,13017,13018,
-13019,13020,13021,13022,13023,13024,13025,13026,13027,13028,13029,13030,
-13031,13032,13033,13034,13035,13036,13037,13038,13039,13040,13041,13042,
-13043,13044,13045,13046,13047,13048,13049,13050,13051,13052,13053,13054,
-13055,13056,13057,13058,13059,13060,13061,13062,13063,13064,13065,13066,
-13067,13068,13069,13070,13071,13072,13073,13074,13075,13076,13077,13078,
-13079,13080,13081,13082,13083,13084,13085,13086,13087,13088,13089,13090,
-13091,13092,13093,13094,13095,13096,13097,13098,13099,13100,13101,13102,
-13103,13104,13105,13106,13107,13108,13109,13110,13111,13112,13113,13114,
-13115,13116,13117,13118,13119,13120,13121,13122,13123,13124,13125,13126,
-13127,13128,13129,13130,13131,13132,13133,13134,13135,13136,13137,13138,
-13139,13140,13141,13142,13143,13144,13145,13146,13147,13148,13149,13150,
-13151,13152,13153,13154,13155,13156,13157,13158,13159,13160,13161,13162,
-13163,13164,13165,13166,13167,13168,13169,13170,13171,13172,13173,13174,
-13175,13176,13177,13178,13179,13180,13181,13182,13183,13184,13185,13186,
-13187,13188,13189,13190,13191,13192,13193,13194,13195,13196,13197,13198,
-13199,13200,13201,13202,13203,13204,13205,13206,13207,13208,13209,13210,
-13211,13212,13213,13214,13215,13216,13217,13218,13219,13220,13221,13222,
-13223,13224,13225,13226,13227,13228,13229,13230,13231,13232,13233,13234,
-13235,13236,13237,13238,13239,13240,13241,13242,13243,13244,13245,13246,
-13247,13248,13249,13250,13251,13252,13253,13254,13255,13256,13257,13258,
-13259,13260,13261,13262,13263,13264,13265,13266,13267,13268,13269,13270,
-13271,13272,13273,13274,13275,13276,13277,13278,13279,13280,13281,13282,
-13283,13284,13285,13286,13287,13288,13289,13290,13291,13292,13293,13294,
-13295,13296,13297,13298,13299,13300,13301,13302,13303,13304,13305,13306,
-13307,13308,13309,13310,13311,13312,13313,13314,13315,13316,13317,13318,
-13319,13320,13321,13322,13323,13324,13325,13326,13327,13328,13329,13330,
-13331,13332,13333,13334,13335,13336,13337,13338,13339,13340,13341,13342,
-13343,13344,13345,13346,13347,13348,13349,13350,13351,13352,13353,13354,
-13355,13356,13357,13358,13359,13360,13361,13362,13363,13364,13365,13366,
-13367,13368,13369,13370,13371,13372,13373,13374,13375,13376,13377,13378,
-13379,13380,13381,13382,13383,13384,13385,13386,13387,13388,13389,13390,
-13391,13392,13393,13394,13395,13396,13397,13398,13399,13400,13401,13402,
-13403,13404,13405,13406,13407,13408,13409,13410,13411,13412,13413,13414,
-13415,13416,13417,13418,13419,13420,13421,13422,13423,13424,13425,13426,
-13427,13428,13429,13430,13431,13432,13433,13434,13435,13436,13437,13438,
-13439,13440,13441,13442,13443,13444,13445,13446,13447,13448,13449,13450,
-13451,13452,13453,13454,13455,13456,13457,13458,13459,13460,13461,13462,
-13463,13464,13465,13466,13467,13468,13469,13470,13471,13472,13473,13474,
-13475,13476,13477,13478,13479,13480,13481,13482,13483,13484,13485,13486,
-13487,13488,13489,13490,13491,13492,13493,13494,13495,13496,13497,13498,
-13499,13500,13501,13502,13503,13504,13505,13506,13507,13508,13509,13510,
-13511,13512,13513,13514,13515,13516,13517,13518,13519,13520,13521,13522,
-13523,13524,13525,13526,13527,13528,13529,13530,13531,13532,13533,13534,
-13535,13536,13537,13538,13539,13540,13541,13542,13543,13544,13545,13546,
-13547,13548,13549,13550,13551,13552,13553,13554,13555,13556,13557,13558,
-13559,13560,13561,13562,13563,13564,13565,13566,13567,13568,13569,13570,
-13571,13572,13573,13574,13575,13576,13577,13578,13579,13580,13581,13582,
-13583,13584,13585,13586,13587,13588,13589,13590,13591,13592,13593,13594,
-13595,13596,13597,13598,13599,13600,13601,13602,13603,13604,13605,13606,
-13607,13608,13609,13610,13611,13612,13613,13614,13615,13616,13617,13618,
-13619,13620,13621,13622,13623,13624,13625,13626,13627,13628,13629,13630,
-13631,13632,13633,13634,13635,13636,13637,13638,13639,13640,13641,13642,
-13643,13644,13645,13646,13647,13648,13649,13650,13651,13652,13653,13654,
-13655,13656,13657,13658,13659,13660,13661,13662,13663,13664,13665,13666,
-13667,13668,13669,13670,13671,13672,13673,13674,13675,13676,13677,13678,
-13679,13680,13681,13682,13683,13684,13685,13686,13687,13688,13689,13690,
-13691,13692,13693,13694,13695,13696,13697,13698,13699,13700,13701,13702,
-13703,13704,13705,13706,13707,13708,13709,13710,13711,13712,13713,13714,
-13715,13716,13717,13718,13719,13720,13721,13722,13723,13724,13725,13726,
-13727,13728,13729,13730,13731,13732,13733,13734,13735,13736,13737,13738,
-13739,13740,13741,13742,13743,13744,13745,13746,13747,13748,13749,13750,
-13751,13752,13753,13754,13755,13756,13757,13758,13759,13760,13761,13762,
-13763,13764,13765,13766,13767,13768,13769,13770,13771,13772,13773,13774,
-13775,13776,13777,13778,13779,13780,13781,13782,13783,13784,13785,13786,
-13787,13788,13789,13790,13791,13792,13793,13794,13795,13796,13797,13798,
-13799,13800,13801,13802,13803,13804,13805,13806,13807,13808,13809,13810,
-13811,13812,13813,13814,13815,13816,13817,13818,13819,13820,13821,13822,
-13823,13824,13825,13826,13827,13828,13829,13830,13831,13832,13833,13834,
-13835,13836,13837,13838,13839,13840,13841,13842,13843,13844,13845,13846,
-13847,13848,13849,13850,13851,13852,13853,13854,13855,13856,13857,13858,
-13859,13860,13861,13862,13863,13864,13865,13866,13867,13868,13869,13870,
-13871,13872,13873,13874,13875,13876,13877,13878,13879,13880,13881,13882,
-13883,13884,13885,13886,13887,13888,13889,13890,13891,13892,13893,13894,
-13895,13896,13897,13898,13899,13900,13901,13902,13903,13904,13905,13906,
-13907,13908,13909,13910,13911,13912,13913,13914,13915,13916,13917,13918,
-13919,13920,13921,13922,13923,13924,13925,13926,13927,13928,13929,13930,
-13931,13932,13933,13934,13935,13936,13937,13938,13939,13940,13941,13942,
-13943,13944,13945,13946,13947,13948,13949,13950,13951,13952,13953,13954,
-13955,13956,13957,13958,13959,13960,13961,13962,13963,13964,13965,13966,
-13967,13968,13969,13970,13971,13972,13973,13974,13975,13976,13977,13978,
-13979,13980,13981,13982,13983,13984,13985,13986,13987,13988,13989,13990,
-13991,13992,13993,13994,13995,13996,13997,13998,13999,14000,14001,14002,
-14003,14004,14005,14006,14007,14008,14009,14010,14011,14012,14013,14014,
-14015,14016,14017,14018,14019,14020,14021,14022,14023,14024,14025,14026,
-14027,14028,14029,14030,14031,14032,14033,14034,14035,14036,14037,14038,
-14039,14040,14041,14042,14043,14044,14045,14046,14047,14048,14049,14050,
-14051,14052,14053,14054,14055,14056,14057,14058,14059,14060,14061,14062,
-14063,14064,14065,14066,14067,14068,14069,14070,14071,14072,14073,14074,
-14075,14076,14077,14078,14079,14080,14081,14082,14083,14084,14085,14086,
-14087,14088,14089,14090,14091,14092,14093,14094,14095,14096,14097,14098,
-14099,14100,14101,14102,14103,14104,14105,14106,14107,14108,14109,14110,
-14111,14112,14113,14114,14115,14116,14117,14118,14119,14120,14121,14122,
-14123,14124,14125,14126,14127,14128,14129,14130,14131,14132,14133,14134,
-14135,14136,14137,14138,14139,14140,14141,14142,14143,14144,14145,14146,
-14147,14148,14149,14150,14151,14152,14153,14154,14155,14156,14157,14158,
-14159,14160,14161,14162,14163,14164,14165,14166,14167,14168,14169,14170,
-14171,14172,14173,14174,14175,14176,14177,14178,14179,14180,14181,14182,
-14183,14184,14185,14186,14187,14188,14189,14190,14191,14192,14193,14194,
-14195,14196,14197,14198,14199,14200,14201,14202,14203,14204,14205,14206,
-14207,14208,14209,14210,14211,14212,14213,14214,14215,14216,14217,14218,
-14219,14220,14221,14222,14223,14224,14225,14226,14227,14228,14229,14230,
-14231,14232,14233,14234,14235,14236,14237,14238,14239,14240,14241,14242,
-14243,14244,14245,14246,14247,14248,14249,14250,14251,14252,14253,14254,
-14255,14256,14257,14258,14259,14260,14261,14262,14263,14264,14265,14266,
-14267,14268,14269,14270,14271,14272,14273,14274,14275,14276,14277,14278,
-14279,14280,14281,14282,14283,14284,14285,14286,14287,14288,14289,14290,
-14291,14292,14293,14294,14295,14296,14297,14298,14299,14300,14301,14302,
-14303,14304,14305,14306,14307,14308,14309,14310,14311,14312,14313,14314,
-14315,14316,14317,14318,14319,14320,14321,14322,14323,14324,14325,14326,
-14327,14328,14329,14330,14331,14332,14333,14334,14335,14336,14337,14338,
-14339,14340,14341,14342,14343,14344,14345,14346,14347,14348,14349,14350,
-14351,14352,14353,14354,14355,14356,14357,14358,14359,14360,14361,14362,
-14363,14364,14365,14366,14367,14368,14369,14370,14371,14372,14373,14374,
-14375,14376,14377,14378,14379,14380,14381,14382,14383,14384,14385,14386,
-14387,14388,14389,14390,14391,14392,14393,14394,14395,14396,14397,14398,
-14399,14400,14401,14402,14403,14404,14405,14406,14407,14408,14409,14410,
-14411,14412,14413,14414,14415,14416,14417,14418,14419,14420,14421,14422,
-14423,14424,14425,14426,14427,14428,14429,14430,14431,14432,14433,14434,
-14435,14436,14437,14438,14439,14440,14441,14442,14443,14444,14445,14446,
-14447,14448,14449,14450,14451,14452,14453,14454,14455,14456,14457,14458,
-14459,14460,14461,14462,14463,14464,14465,14466,14467,14468,14469,14470,
-14471,14472,14473,14474,14475,14476,14477,14478,14479,14480,14481,14482,
-14483,14484,14485,14486,14487,14488,14489,14490,14491,14492,14493,14494,
-14495,14496,14497,14498,14499,14500,14501,14502,14503,14504,14505,14506,
-14507,14508,14509,14510,14511,14512,14513,14514,14515,14516,14517,14518,
-14519,14520,14521,14522,14523,14524,14525,14526,14527,14528,14529,14530,
-14531,14532,14533,14534,14535,14536,14537,14538,14539,14540,14541,14542,
-14543,14544,14545,14546,14547,14548,14549,14550,14551,14552,14553,14554,
-14555,14556,14557,14558,14559,14560,14561,14562,14563,14564,14565,14566,
-14567,14568,14569,14570,14571,14572,14573,14574,14575,14576,14577,14578,
-14579,14580,14581,14582,14583,14584,14585,14586,14587,14588,14589,14590,
-14591,14592,14593,14594,14595,14596,14597,14598,14599,14600,14601,14602,
-14603,14604,14605,14606,14607,14608,14609,14610,14611,14612,14613,14614,
-14615,14616,14617,14618,14619,14620,14621,14622,14623,14624,14625,14626,
-14627,14628,14629,14630,14631,14632,14633,14634,14635,14636,14637,14638,
-14639,14640,14641,14642,14643,14644,14645,14646,14647,14648,14649,14650,
-14651,14652,14653,14654,14655,14656,14657,14658,14659,14660,14661,14662,
-14663,14664,14665,14666,14667,14668,14669,14670,14671,14672,14673,14674,
-14675,14676,14677,14678,14679,14680,14681,14682,14683,14684,14685,14686,
-14687,14688,14689,14690,14691,14692,14693,14694,14695,14696,14697,14698,
-14699,14700,14701,14702,14703,14704,14705,14706,14707,14708,14709,14710,
-14711,14712,14713,14714,14715,14716,14717,14718,14719,14720,14721,14722,
-14723,14724,14725,14726,14727,14728,14729,14730,14731,14732,14733,14734,
-14735,14736,14737,14738,14739,14740,14741,14742,14743,14744,14745,14746,
-14747,14748,14749,14750,14751,14752,14753,14754,14755,14756,14757,14758,
-14759,14760,14761,14762,14763,14764,14765,14766,14767,14768,14769,14770,
-14771,14772,14773,14774,14775,14776,14777,14778,14779,14780,14781,14782,
-14783,14784,14785,14786,14787,14788,14789,14790,14791,14792,14793,14794,
-14795,14796,14797,14798,14799,14800,14801,14802,14803,14804,14805,14806,
-14807,14808,14809,14810,14811,14812,14813,14814,14815,14816,14817,14818,
-14819,14820,14821,14822,14823,14824,14825,14826,14827,14828,14829,14830,
-14831,14832,14833,14834,14835,14836,14837,14838,14839,14840,14841,14842,
-14843,14844,14845,14846,14847,14848,14849,14850,14851,14852,14853,14854,
-14855,14856,14857,14858,14859,14860,14861,14862,14863,14864,14865,14866,
-14867,14868,14869,14870,14871,14872,14873,14874,14875,14876,14877,14878,
-14879,14880,14881,14882,14883,14884,14885,14886,14887,14888,14889,14890,
-14891,14892,14893,14894,14895,14896,14897,14898,14899,14900,14901,14902,
-14903,14904,14905,14906,14907,14908,14909,14910,14911,14912,14913,14914,
-14915,14916,14917,14918,14919,14920,14921,14922,14923,14924,14925,14926,
-14927,14928,14929,14930,14931,14932,14933,14934,14935,14936,14937,14938,
-14939,14940,14941,14942,14943,14944,14945,14946,14947,14948,14949,14950,
-14951,14952,14953,14954,14955,14956,14957,14958,14959,14960,14961,14962,
-14963,14964,14965,14966,14967,14968,14969,14970,14971,14972,14973,14974,
-14975,14976,14977,14978,14979,14980,14981,14982,14983,14984,14985,14986,
-14987,14988,14989,14990,14991,14992,14993,14994,14995,14996,14997,14998,
-14999,15000,15001,15002,15003,15004,15005,15006,15007,15008,15009,15010,
-15011,15012,15013,15014,15015,15016,15017,15018,15019,15020,15021,15022,
-15023,15024,15025,15026,15027,15028,15029,15030,15031,15032,15033,15034,
-15035,15036,15037,15038,15039,15040,15041,15042,15043,15044,15045,15046,
-15047,15048,15049,15050,15051,15052,15053,15054,15055,15056,15057,15058,
-15059,15060,15061,15062,15063,15064,15065,15066,15067,15068,15069,15070,
-15071,15072,15073,15074,15075,15076,15077,15078,15079,15080,15081,15082,
-15083,15084,15085,15086,15087,15088,15089,15090,15091,15092,15093,15094,
-15095,15096,15097,15098,15099,15100,15101,15102,15103,15104,15105,15106,
-15107,15108,15109,15110,15111,15112,15113,15114,15115,15116,15117,15118,
-15119,15120,15121,15122,15123,15124,15125,15126,15127,15128,15129,15130,
-15131,15132,15133,15134,15135,15136,15137,15138,15139,15140,15141,15142,
-15143,15144,15145,15146,15147,15148,15149,15150,15151,15152,15153,15154,
-15155,15156,15157,15158,15159,15160,15161,15162,15163,15164,15165,15166,
-15167,15168,15169,15170,15171,15172,15173,15174,15175,15176,15177,15178,
-15179,15180,15181,15182,15183,15184,15185,15186,15187,15188,15189,15190,
-15191,15192,15193,15194,15195,15196,15197,15198,15199,15200,15201,15202,
-15203,15204,15205,15206,15207,15208,15209,15210,15211,15212,15213,15214,
-15215,15216,15217,15218,15219,15220,15221,15222,15223,15224,15225,15226,
-15227,15228,15229,15230,15231,15232,15233,15234,15235,15236,15237,15238,
-15239,15240,15241,15242,15243,15244,15245,15246,15247,15248,15249,15250,
-15251,15252,15253,15254,15255,15256,15257,15258,15259,15260,15261,15262,
-15263,15264,15265,15266,15267,15268,15269,15270,15271,15272,15273,15274,
-15275,15276,15277,15278,15279,15280,15281,15282,15283,15284,15285,15286,
-15287,15288,15289,15290,15291,15292,15293,15294,15295,15296,15297,15298,
-15299,15300,15301,15302,15303,15304,15305,15306,15307,15308,15309,15310,
-15311,15312,15313,15314,15315,15316,15317,15318,15319,15320,15321,15322,
-15323,15324,15325,15326,15327,15328,15329,15330,15331,15332,15333,15334,
-15335,15336,15337,15338,15339,15340,15341,15342,15343,15344,15345,15346,
-15347,15348,15349,15350,15351,15352,15353,15354,15355,15356,15357,15358,
-15359,15360,15361,15362,15363,15364,15365,15366,15367,15368,15369,15370,
-15371,15372,15373,15374,15375,15376,15377,15378,15379,15380,15381,15382,
-15383,15384,15385,15386,15387,15388,15389,15390,15391,15392,15393,15394,
-15395,15396,15397,15398,15399,15400,15401,15402,15403,15404,15405,15406,
-15407,15408,15409,15410,15411,15412,15413,15414,15415,15416,15417,15418,
-15419,15420,15421,15422,15423,15424,15425,15426,15427,15428,15429,15430,
-15431,15432,15433,15434,15435,15436,15437,15438,15439,15440,15441,15442,
-15443,15444,15445,15446,15447,15448,15449,15450,15451,15452,15453,15454,
-15455,15456,15457,15458,15459,15460,15461,15462,15463,15464,15465,15466,
-15467,15468,15469,15470,15471,15472,15473,15474,15475,15476,15477,15478,
-15479,15480,15481,15482,15483,15484,15485,15486,15487,15488,15489,15490,
-15491,15492,15493,15494,15495,15496,15497,15498,15499,15500,15501,15502,
-15503,15504,15505,15506,15507,15508,15509,15510,15511,15512,15513,15514,
-15515,15516,15517,15518,15519,15520,15521,15522,15523,15524,15525,15526,
-15527,15528,15529,15530,15531,15532,15533,15534,15535,15536,15537,15538,
-15539,15540,15541,15542,15543,15544,15545,15546,15547,15548,15549,15550,
-15551,15552,15553,15554,15555,15556,15557,15558,15559,15560,15561,15562,
-15563,15564,15565,15566,15567,15568,15569,15570,15571,15572,15573,15574,
-15575,15576,15577,15578,15579,15580,15581,15582,15583,15584,15585,15586,
-15587,15588,15589,15590,15591,15592,15593,15594,15595,15596,15597,15598,
-15599,15600,15601,15602,15603,15604,15605,15606,15607,15608,15609,15610,
-15611,15612,15613,15614,15615,15616,15617,15618,15619,15620,15621,15622,
-15623,15624,15625,15626,15627,15628,15629,15630,15631,15632,15633,15634,
-15635,15636,15637,15638,15639,15640,15641,15642,15643,15644,15645,15646,
-15647,15648,15649,15650,15651,15652,15653,15654,15655,15656,15657,15658,
-15659,15660,15661,15662,15663,15664,15665,15666,15667,15668,15669,15670,
-15671,15672,15673,15674,15675,15676,15677,15678,15679,15680,15681,15682,
-15683,15684,15685,15686,15687,15688,15689,15690,15691,15692,15693,15694,
-15695,15696,15697,15698,15699,15700,15701,15702,15703,15704,15705,15706,
-15707,15708,15709,15710,15711,15712,15713,15714,15715,15716,15717,15718,
-15719,15720,15721,15722,15723,15724,15725,15726,15727,15728,15729,15730,
-15731,15732,15733,15734,15735,15736,15737,15738,15739,15740,15741,15742,
-15743,15744,15745,15746,15747,15748,15749,15750,15751,15752,15753,15754,
-15755,15756,15757,15758,15759,15760,15761,15762,15763,15764,15765,15766,
-15767,15768,15769,15770,15771,15772,15773,15774,15775,15776,15777,15778,
-15779,15780,15781,15782,15783,15784,15785,15786,15787,15788,15789,15790,
-15791,15792,15793,15794,15795,15796,15797,15798,15799,15800,15801,15802,
-15803,15804,15805,15806,15807,15808,15809,15810,15811,15812,15813,15814,
-15815,15816,15817,15818,15819,15820,15821,15822,15823,15824,15825,15826,
-15827,15828,15829,15830,15831,15832,15833,15834,15835,15836,15837,15838,
-15839,15840,15841,15842,15843,15844,15845,15846,15847,15848,15849,15850,
-15851,15852,15853,15854,15855,15856,15857,15858,15859,15860,15861,15862,
-15863,15864,15865,15866,15867,15868,15869,15870,15871,15872,15873,15874,
-15875,15876,15877,15878,15879,15880,15881,15882,15883,15884,15885,15886,
-15887,15888,15889,15890,15891,15892,15893,15894,15895,15896,15897,15898,
-15899,15900,15901,15902,15903,15904,15905,15906,15907,15908,15909,15910,
-15911,15912,15913,15914,15915,15916,15917,15918,15919,15920,15921,15922,
-15923,15924,15925,15926,15927,15928,15929,15930,15931,15932,15933,15934,
-15935,15936,15937,15938,15939,15940,15941,15942,15943,15944,15945,15946,
-15947,15948,15949,15950,15951,15952,15953,15954,15955,15956,15957,15958,
-15959,15960,15961,15962,15963,15964,15965,15966,15967,15968,15969,15970,
-15971,15972,15973,15974,15975,15976,15977,15978,15979,15980,15981,15982,
-15983,15984,15985,15986,15987,15988,15989,15990,15991,15992,15993,15994,
-15995,15996,15997,15998,15999,16000,16001,16002,16003,16004,16005,16006,
-16007,16008,16009,16010,16011,16012,16013,16014,16015,16016,16017,16018,
-16019,16020,16021,16022,16023,16024,16025,16026,16027,16028,16029,16030,
-16031,16032,16033,16034,16035,16036,16037,16038,16039,16040,16041,16042,
-16043,16044,16045,16046,16047,16048,16049,16050,16051,16052,16053,16054,
-16055,16056,16057,16058,16059,16060,16061,16062,16063,16064,16065,16066,
-16067,16068,16069,16070,16071,16072,16073,16074,16075,16076,16077,16078,
-16079,16080,16081,16082,16083,16084,16085,16086,16087,16088,16089,16090,
-16091,16092,16093,16094,16095,16096,16097,16098,16099,16100,16101,16102,
-16103,16104,16105,16106,16107,16108,16109,16110,16111,16112,16113,16114,
-16115,16116,16117,16118,16119,16120,16121,16122,16123,16124,16125,16126,
-16127,16128,16129,16130,16131,16132,16133,16134,16135,16136,16137,16138,
-16139,16140,16141,16142,16143,16144,16145,16146,16147,16148,16149,16150,
-16151,16152,16153,16154,16155,16156,16157,16158,16159,16160,16161,16162,
-16163,16164,16165,16166,16167,16168,16169,16170,16171,16172,16173,16174,
-16175,16176,16177,16178,16179,16180,16181,16182,16183,16184,16185,16186,
-16187,16188,16189,16190,16191,16192,16193,16194,16195,16196,16197,16198,
-16199,16200,16201,16202,16203,16204,16205,16206,16207,16208,16209,16210,
-16211,16212,16213,16214,16215,16216,16217,16218,16219,16220,16221,16222,
-16223,16224,16225,16226,16227,16228,16229,16230,16231,16232,16233,16234,
-16235,16236,16237,16238,16239,16240,16241,16242,16243,16244,16245,16246,
-16247,16248,16249,16250,16251,16252,16253,16254,16255,16256,16257,16258,
-16259,16260,16261,16262,16263,16264,16265,16266,16267,16268,16269,16270,
-16271,16272,16273,16274,16275,16276,16277,16278,16279,16280,16281,16282,
-16283,16284,16285,16286,16287,16288,16289,16290,16291,16292,16293,16294,
-16295,16296,16297,16298,16299,16300,16301,16302,16303,16304,16305,16306,
-16307,16308,16309,16310,16311,16312,16313,16314,16315,16316,16317,16318,
-16319,16320,16321,16322,16323,16324,16325,16326,16327,16328,16329,16330,
-16331,16332,16333,16334,16335,16336,16337,16338,16339,16340,16341,16342,
-16343,16344,16345,16346,16347,16348,16349,16350,16351,16352,16353,16354,
-16355,16356,16357,16358,16359,16360,16361,16362,16363,16364,16365,16366,
-16367,16368,16369,16370,16371,16372,16373,16374,16375,16376,16377,16378,
-16379,16380,16381,16382,16383,16384,16385,16386,16387,16388,16389,16390,
-16391,16392,16393,16394,16395,16396,16397,16398,16399,16400,16401,16402,
-16403,16404,16405,16406,16407,16408,16409,16410,16411,16412,16413,16414,
-16415,16416,16417,16418,16419,16420,16421,16422,16423,16424,16425,16426,
-16427,16428,16429,16430,16431,16432,16433,16434,16435,16436,16437,16438,
-16439,16440,16441,16442,16443,16444,16445,16446,16447,16448,16449,16450,
-16451,16452,16453,16454,16455,16456,16457,16458,16459,16460,16461,16462,
-16463,16464,16465,16466,16467,16468,16469,16470,16471,16472,16473,16474,
-16475,16476,16477,16478,16479,16480,16481,16482,16483,16484,16485,16486,
-16487,16488,16489,16490,16491,16492,16493,16494,16495,16496,16497,16498,
-16499,16500,16501,16502,16503,16504,16505,16506,16507,16508,16509,16510,
-16511,16512,16513,16514,16515,16516,16517,16518,16519,16520,16521,16522,
-16523,16524,16525,16526,16527,16528,16529,16530,16531,16532,16533,16534,
-16535,16536,16537,16538,16539,16540,16541,16542,16543,16544,16545,16546,
-16547,16548,16549,16550,16551,16552,16553,16554,16555,16556,16557,16558,
-16559,16560,16561,16562,16563,16564,16565,16566,16567,16568,16569,16570,
-16571,16572,16573,16574,16575,16576,16577,16578,16579,16580,16581,16582,
-16583,16584,16585,16586,16587,16588,16589,16590,16591,16592,16593,16594,
-16595,16596,16597,16598,16599,16600,16601,16602,16603,16604,16605,16606,
-16607,16608,16609,16610,16611,16612,16613,16614,16615,16616,16617,16618,
-16619,16620,16621,16622,16623,16624,16625,16626,16627,16628,16629,16630,
-16631,16632,16633,16634,16635,16636,16637,16638,16639,16640,16641,16642,
-16643,16644,16645,16646,16647,16648,16649,16650,16651,16652,16653,16654,
-16655,16656,16657,16658,16659,16660,16661,16662,16663,16664,16665,16666,
-16667,16668,16669,16670,16671,16672,16673,16674,16675,16676,16677,16678,
-16679,16680,16681,16682,16683,16684,16685,16686,16687,16688,16689,16690,
-16691,16692,16693,16694,16695,16696,16697,16698,16699,16700,16701,16702,
-16703,16704,16705,16706,16707,16708,16709,16710,16711,16712,16713,16714,
-16715,16716,16717,16718,16719,16720,16721,16722,16723,16724,16725,16726,
-16727,16728,16729,16730,16731,16732,16733,16734,16735,16736,16737,16738,
-16739,16740,16741,16742,16743,16744,16745,16746,16747,16748,16749,16750,
-16751,16752,16753,16754,16755,16756,16757,16758,16759,16760,16761,16762,
-16763,16764,16765,16766,16767,16768,16769,16770,16771,16772,16773,16774,
-16775,16776,16777,16778,16779,16780,16781,16782,16783,16784,16785,16786,
-16787,16788,16789,16790,16791,16792,16793,16794,16795,16796,16797,16798,
-16799,16800,16801,16802,16803,16804,16805,16806,16807,16808,16809,16810,
-16811,16812,16813,16814,16815,16816,16817,16818,16819,16820,16821,16822,
-16823,16824,16825,16826,16827,16828,16829,16830,16831,16832,16833,16834,
-16835,16836,16837,16838,16839,16840,16841,16842,16843,16844,16845,16846,
-16847,16848,16849,16850,16851,16852,16853,16854,16855,16856,16857,16858,
-16859,16860,16861,16862,16863,16864,16865,16866,16867,16868,16869,16870,
-16871,16872,16873,16874,16875,16876,16877,16878,16879,16880,16881,16882,
-16883,16884,16885,16886,16887,16888,16889,16890,16891,16892,16893,16894,
-16895,16896,16897,16898,16899,16900,16901,16902,16903,16904,16905,16906,
-16907,16908,16909,16910,16911,16912,16913,16914,16915,16916,16917,16918,
-16919,16920,16921,16922,16923,16924,16925,16926,16927,16928,16929,16930,
-16931,16932,16933,16934,16935,16936,16937,16938,16939,16940,16941,16942,
-16943,16944,16945,16946,16947,16948,16949,16950,16951,16952,16953,16954,
-16955,16956,16957,16958,16959,16960,16961,16962,16963,16964,16965,16966,
-16967,16968,16969,16970,16971,16972,16973,16974,16975,16976,16977,16978,
-16979,16980,16981,16982,16983,16984,16985,16986,16987,16988,16989,16990,
-16991,16992,16993,16994,16995,16996,16997,16998,16999,17000,17001,17002,
-17003,17004,17005,17006,17007,17008,17009,17010,17011,17012,17013,17014,
-17015,17016,17017,17018,17019,17020,17021,17022,17023,17024,17025,17026,
-17027,17028,17029,17030,17031,17032,17033,17034,17035,17036,17037,17038,
-17039,17040,17041,17042,17043,17044,17045,17046,17047,17048,17049,17050,
-17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,17062,
-17063,17064,17065,17066,17067,17068,17069,17070,17071,17072,17073,17074,
-17075,17076,17077,17078,17079,17080,17081,17082,17083,17084,17085,17086,
-17087,17088,17089,17090,17091,17092,17093,17094,17095,17096,17097,17098,
-17099,17100,17101,17102,17103,17104,17105,17106,17107,17108,17109,17110,
-17111,17112,17113,17114,17115,17116,17117,17118,17119,17120,17121,17122,
-17123,17124,17125,17126,17127,17128,17129,17130,17131,17132,17133,17134,
-17135,17136,17137,17138,17139,17140,17141,17142,17143,17144,17145,17146,
-17147,17148,17149,17150,17151,17152,17153,17154,17155,17156,17157,17158,
-17159,17160,17161,17162,17163,17164,17165,17166,17167,17168,17169,17170,
-17171,17172,17173,17174,17175,17176,17177,17178,17179,17180,17181,17182,
-17183,17184,17185,17186,17187,17188,17189,17190,17191,17192,17193,17194,
-17195,17196,17197,17198,17199,17200,17201,17202,17203,17204,17205,17206,
-17207,17208,17209,17210,17211,17212,17213,17214,17215,17216,17217,17218,
-17219,17220,17221,17222,17223,17224,17225,17226,17227,17228,17229,17230,
-17231,17232,17233,17234,17235,17236,17237,17238,17239,17240,17241,17242,
-17243,17244,17245,17246,17247,17248,17249,17250,17251,17252,17253,17254,
-17255,17256,17257,17258,17259,17260,17261,17262,17263,17264,17265,17266,
-17267,17268,17269,17270,17271,17272,17273,17274,17275,17276,17277,17278,
-17279,17280,17281,17282,17283,17284,17285,17286,17287,17288,17289,17290,
-17291,17292,17293,17294,17295,17296,17297,17298,17299,17300,17301,17302,
-17303,17304,17305,17306,17307,17308,17309,17310,17311,17312,17313,17314,
-17315,17316,17317,17318,17319,17320,17321,17322,17323,17324,17325,17326,
-17327,17328,17329,17330,17331,17332,17333,17334,17335,17336,17337,17338,
-17339,17340,17341,17342,17343,17344,17345,17346,17347,17348,17349,17350,
-17351,17352,17353,17354,17355,17356,17357,17358,17359,17360,17361,17362,
-17363,17364,17365,17366,17367,17368,17369,17370,17371,17372,17373,17374,
-17375,17376,17377,17378,17379,17380,17381,17382,17383,17384,17385,17386,
-17387,17388,17389,17390,17391,17392,17393,17394,17395,17396,17397,17398,
-17399,17400,17401,17402,17403,17404,17405,17406,17407,17408,17409,17410,
-17411,17412,17413,17414,17415,17416,17417,17418,17419,17420,17421,17422,
-17423,17424,17425,17426,17427,17428,17429,17430,17431,17432,17433,17434,
-17435,17436,17437,17438,17439,17440,17441,17442,17443,17444,17445,17446,
-17447,17448,17449,17450,17451,17452,17453,17454,17455,17456,17457,17458,
-17459,17460,17461,17462,17463,17464,17465,17466,17467,17468,17469,17470,
-17471,17472,17473,17474,17475,17476,17477,17478,17479,17480,17481,17482,
-17483,17484,17485,17486,17487,17488,17489,17490,17491,17492,17493,17494,
-17495,17496,17497,17498,17499,17500,17501,17502,17503,17504,17505,17506,
-17507,17508,17509,17510,17511,17512,17513,17514,17515,17516,17517,17518,
-17519,17520,17521,17522,17523,17524,17525,17526,17527,17528,17529,17530,
-17531,17532,17533,17534,17535,17536,17537,17538,17539,17540,17541,17542,
-17543,17544,17545,17546,17547,17548,17549,17550,17551,17552,17553,17554,
-17555,17556,17557,17558,17559,17560,17561,17562,17563,17564,17565,17566,
-17567,17568,17569,17570,17571,17572,17573,17574,17575,17576,17577,17578,
-17579,17580,17581,17582,17583,17584,17585,17586,17587,17588,17589,17590,
-17591,17592,17593,17594,17595,17596,17597,17598,17599,17600,17601,17602,
-17603,17604,17605,17606,17607,17608,17609,17610,17611,17612,17613,17614,
-17615,17616,17617,17618,17619,17620,17621,17622,17623,17624,17625,17626,
-17627,17628,17629,17630,17631,17632,17633,17634,17635,17636,17637,17638,
-17639,17640,17641,17642,17643,17644,17645,17646,17647,17648,17649,17650,
-17651,17652,17653,17654,17655,17656,17657,17658,17659,17660,17661,17662,
-17663,17664,17665,17666,17667,17668,17669,17670,17671,17672,17673,17674,
-17675,17676,17677,17678,17679,17680,17681,17682,17683,17684,17685,17686,
-17687,17688,17689,17690,17691,17692,17693,17694,17695,17696,17697,17698,
-17699,17700,17701,17702,17703,17704,17705,17706,17707,17708,17709,17710,
-17711,17712,17713,17714,17715,17716,17717,17718,17719,17720,17721,17722,
-17723,17724,17725,17726,17727,17728,17729,17730,17731,17732,17733,17734,
-17735,17736,17737,17738,17739,17740,17741,17742,17743,17744,17745,17746,
-17747,17748,17749,17750,17751,17752,17753,17754,17755,17756,17757,17758,
-17759,17760,17761,17762,17763,17764,17765,17766,17767,17768,17769,17770,
-17771,17772,17773,17774,17775,17776,17777,17778,17779,17780,17781,17782,
-17783,17784,17785,17786,17787,17788,17789,17790,17791,17792,17793,17794,
-17795,17796,17797,17798,17799,17800,17801,17802,17803,17804,17805,17806,
-17807,17808,17809,17810,17811,17812,17813,17814,17815,17816,17817,17818,
-17819,17820,17821,17822,17823,17824,17825,17826,17827,17828,17829,17830,
-17831,17832,17833,17834,17835,17836,17837,17838,17839,17840,17841,17842,
-17843,17844,17845,17846,17847,17848,17849,17850,17851,17852,17853,17854,
-17855,17856,17857,17858,17859,17860,17861,17862,17863,17864,17865,17866,
-17867,17868,17869,17870,17871,17872,17873,17874,17875,17876,17877,17878,
-17879,17880,17881,17882,17883,17884,17885,17886,17887,17888,17889,17890,
-17891,17892,17893,17894,17895,17896,17897,17898,17899,17900,17901,17902,
-17903,17904,17905,17906,17907,17908,17909,17910,17911,17912,17913,17914,
-17915,17916,17917,17918,17919,17920,17921,17922,17923,17924,17925,17926,
-17927,17928,17929,17930,17931,17932,17933,17934,17935,17936,17937,17938,
-17939,17940,17941,17942,17943,17944,17945,17946,17947,17948,17949,17950,
-17951,17952,17953,17954,17955,17956,17957,17958,17959,17960,17961,17962,
-17963,17964,17965,17966,17967,17968,17969,17970,17971,17972,17973,17974,
-17975,17976,17977,17978,17979,17980,17981,17982,17983,17984,17985,17986,
-17987,17988,17989,17990,17991,17992,17993,17994,17995,17996,17997,17998,
-17999,18000,18001,18002,18003,18004,18005,18006,18007,18008,18009,18010,
-18011,18012,18013,18014,18015,18016,18017,18018,18019,18020,18021,18022,
-18023,18024,18025,18026,18027,18028,18029,18030,18031,18032,18033,18034,
-18035,18036,18037,18038,18039,18040,18041,18042,18043,18044,18045,18046,
-18047,18048,18049,18050,18051,18052,18053,18054,18055,18056,18057,18058,
-18059,18060,18061,18062,18063,18064,18065,18066,18067,18068,18069,18070,
-18071,18072,18073,18074,18075,18076,18077,18078,18079,18080,18081,18082,
-18083,18084,18085,18086,18087,18088,18089,18090,18091,18092,18093,18094,
-18095,18096,18097,18098,18099,18100,18101,18102,18103,18104,18105,18106,
-18107,18108,18109,18110,18111,18112,18113,18114,18115,18116,18117,18118,
-18119,18120,18121,18122,18123,18124,18125,18126,18127,18128,18129,18130,
-18131,18132,18133,18134,18135,18136,18137,18138,18139,18140,18141,18142,
-18143,18144,18145,18146,18147,18148,18149,18150,18151,18152,18153,18154,
-18155,18156,18157,18158,18159,18160,18161,18162,18163,18164,18165,18166,
-18167,18168,18169,18170,18171,18172,18173,18174,18175,18176,18177,18178,
-18179,18180,18181,18182,18183,18184,18185,18186,18187,18188,18189,18190,
-18191,18192,18193,18194,18195,18196,18197,18198,18199,18200,18201,18202,
-18203,18204,18205,18206,18207,18208,18209,18210,18211,18212,18213,18214,
-18215,18216,18217,18218,18219,18220,18221,18222,18223,18224,18225,18226,
-18227,18228,18229,18230,18231,18232,18233,18234,18235,18236,18237,18238,
-18239,18240,18241,18242,18243,18244,18245,18246,18247,18248,18249,18250,
-18251,18252,18253,18254,18255,18256,18257,18258,18259,18260,18261,18262,
-18263,18264,18265,18266,18267,18268,18269,18270,18271,18272,18273,18274,
-18275,18276,18277,18278,18279,18280,18281,18282,18283,18284,18285,18286,
-18287,18288,18289,18290,18291,18292,18293,18294,18295,18296,18297,18298,
-18299,18300,18301,18302,18303,18304,18305,18306,18307,18308,18309,18310,
-18311,18312,18313,18314,18315,18316,18317,18318,18319,18320,18321,18322,
-18323,18324,18325,18326,18327,18328,18329,18330,18331,18332,18333,18334,
-18335,18336,18337,18338,18339,18340,18341,18342,18343,18344,18345,18346,
-18347,18348,18349,18350,18351,18352,18353,18354,18355,18356,18357,18358,
-18359,18360,18361,18362,18363,18364,18365,18366,18367,18368,18369,18370,
-18371,18372,18373,18374,18375,18376,18377,18378,18379,18380,18381,18382,
-18383,18384,18385,18386,18387,18388,18389,18390,18391,18392,18393,18394,
-18395,18396,18397,18398,18399,18400,18401,18402,18403,18404,18405,18406,
-18407,18408,18409,18410,18411,18412,18413,18414,18415,18416,18417,18418,
-18419,18420,18421,18422,18423,18424,18425,18426,18427,18428,18429,18430,
-18431,18432,18433,18434,18435,18436,18437,18438,18439,18440,18441,18442,
-18443,18444,18445,18446,18447,18448,18449,18450,18451,18452,18453,18454,
-18455,18456,18457,18458,18459,18460,18461,18462,18463,18464,18465,18466,
-18467,18468,18469,18470,18471,18472,18473,18474,18475,18476,18477,18478,
-18479,18480,18481,18482,18483,18484,18485,18486,18487,18488,18489,18490,
-18491,18492,18493,18494,18495,18496,18497,18498,18499,18500,18501,18502,
-18503,18504,18505,18506,18507,18508,18509,18510,18511,18512,18513,18514,
-18515,18516,18517,18518,18519,18520,18521,18522,18523,18524,18525,18526,
-18527,18528,18529,18530,18531,18532,18533,18534,18535,18536,18537,18538,
-18539,18540,18541,18542,18543,18544,18545,18546,18547,18548,18549,18550,
-18551,18552,18553,18554,18555,18556,18557,18558,18559,18560,18561,18562,
-18563,18564,18565,18566,18567,18568,18569,18570,18571,18572,18573,18574,
-18575,18576,18577,18578,18579,18580,18581,18582,18583,18584,18585,18586,
-18587,18588,18589,18590,18591,18592,18593,18594,18595,18596,18597,18598,
-18599,18600,18601,18602,18603,18604,18605,18606,18607,18608,18609,18610,
-18611,18612,18613,18614,18615,18616,18617,18618,18619,18620,18621,18622,
-18623,18624,18625,18626,18627,18628,18629,18630,18631,18632,18633,18634,
-18635,18636,18637,18638,18639,18640,18641,18642,18643,18644,18645,18646,
-18647,18648,18649,18650,18651,18652,18653,18654,18655,18656,18657,18658,
-18659,18660,18661,18662,18663,18664,18665,18666,18667,18668,18669,18670,
-18671,18672,18673,18674,18675,18676,18677,18678,18679,18680,18681,18682,
-18683,18684,18685,18686,18687,18688,18689,18690,18691,18692,18693,18694,
-18695,18696,18697,18698,18699,18700,18701,18702,18703,18704,18705,18706,
-18707,18708,18709,18710,18711,18712,18713,18714,18715,18716,18717,18718,
-18719,18720,18721,18722,18723,18724,18725,18726,18727,18728,18729,18730,
-18731,18732,18733,18734,18735,18736,18737,18738,18739,18740,18741,18742,
-18743,18744,18745,18746,18747,18748,18749,18750,18751,18752,18753,18754,
-18755,18756,18757,18758,18759,18760,18761,18762,18763,18764,18765,18766,
-18767,18768,18769,18770,18771,18772,18773,18774,18775,18776,18777,18778,
-18779,18780,18781,18782,18783,18784,18785,18786,18787,18788,18789,18790,
-18791,18792,18793,18794,18795,18796,18797,18798,18799,18800,18801,18802,
-18803,18804,18805,18806,18807,18808,18809,18810,18811,18812,18813,18814,
-18815,18816,18817,18818,18819,18820,18821,18822,18823,18824,18825,18826,
-18827,18828,18829,18830,18831,18832,18833,18834,18835,18836,18837,18838,
-18839,18840,18841,18842,18843,18844,18845,18846,18847,18848,18849,18850,
-18851,18852,18853,18854,18855,18856,18857,18858,18859,18860,18861,18862,
-18863,18864,18865,18866,18867,18868,18869,18870,18871,18872,18873,18874,
-18875,18876,18877,18878,18879,18880,18881,18882,18883,18884,18885,18886,
-18887,18888,18889,18890,18891,18892,18893,18894,18895,18896,18897,18898,
-18899,18900,18901,18902,18903,18904,18905,18906,18907,18908,18909,18910,
-18911,18912,18913,18914,18915,18916,18917,18918,18919,18920,18921,18922,
-18923,18924,18925,18926,18927,18928,18929,18930,18931,18932,18933,18934,
-18935,18936,18937,18938,18939,18940,18941,18942,18943,18944,18945,18946,
-18947,18948,18949,18950,18951,18952,18953,18954,18955,18956,18957,18958,
-18959,18960,18961,18962,18963,18964,18965,18966,18967,18968,18969,18970,
-18971,18972,18973,18974,18975,18976,18977,18978,18979,18980,18981,18982,
-18983,18984,18985,18986,18987,18988,18989,18990,18991,18992,18993,18994,
-18995,18996,18997,18998,18999,19000,19001,19002,19003,19004,19005,19006,
-19007,19008,19009,19010,19011,19012,19013,19014,19015,19016,19017,19018,
-19019,19020,19021,19022,19023,19024,19025,19026,19027,19028,19029,19030,
-19031,19032,19033,19034,19035,19036,19037,19038,19039,19040,19041,19042,
-19043,19044,19045,19046,19047,19048,19049,19050,19051,19052,19053,19054,
-19055,19056,19057,19058,19059,19060,19061,19062,19063,19064,19065,19066,
-19067,19068,19069,19070,19071,19072,19073,19074,19075,19076,19077,19078,
-19079,19080,19081,19082,19083,19084,19085,19086,19087,19088,19089,19090,
-19091,19092,19093,19094,19095,19096,19097,19098,19099,19100,19101,19102,
-19103,19104,19105,19106,19107,19108,19109,19110,19111,19112,19113,19114,
-19115,19116,19117,19118,19119,19120,19121,19122,19123,19124,19125,19126,
-19127,19128,19129,19130,19131,19132,19133,19134,19135,19136,19137,19138,
-19139,19140,19141,19142,19143,19144,19145,19146,19147,19148,19149,19150,
-19151,19152,19153,19154,19155,19156,19157,19158,19159,19160,19161,19162,
-19163,19164,19165,19166,19167,19168,19169,19170,19171,19172,19173,19174,
-19175,19176,19177,19178,19179,19180,19181,19182,19183,19184,19185,19186,
-19187,19188,19189,19190,19191,19192,19193,19194,19195,19196,19197,19198,
-19199,19200,19201,19202,19203,19204,19205,19206,19207,19208,19209,19210,
-19211,19212,19213,19214,19215,19216,19217,19218,19219,19220,19221,19222,
-19223,19224,19225,19226,19227,19228,19229,19230,19231,19232,19233,19234,
-19235,19236,19237,19238,19239,19240,19241,19242,19243,19244,19245,19246,
-19247,19248,19249,19250,19251,19252,19253,19254,19255,19256,19257,19258,
-19259,19260,19261,19262,19263,19264,19265,19266,19267,19268,19269,19270,
-19271,19272,19273,19274,19275,19276,19277,19278,19279,19280,19281,19282,
-19283,19284,19285,19286,19287,19288,19289,19290,19291,19292,19293,19294,
-19295,19296,19297,19298,19299,19300,19301,19302,19303,19304,19305,19306,
-19307,19308,19309,19310,19311,19312,19313,19314,19315,19316,19317,19318,
-19319,19320,19321,19322,19323,19324,19325,19326,19327,19328,19329,19330,
-19331,19332,19333,19334,19335,19336,19337,19338,19339,19340,19341,19342,
-19343,19344,19345,19346,19347,19348,19349,19350,19351,19352,19353,19354,
-19355,19356,19357,19358,19359,19360,19361,19362,19363,19364,19365,19366,
-19367,19368,19369,19370,19371,19372,19373,19374,19375,19376,19377,19378,
-19379,19380,19381,19382,19383,19384,19385,19386,19387,19388,19389,19390,
-19391,19392,19393,19394,19395,19396,19397,19398,19399,19400,19401,19402,
-19403,19404,19405,19406,19407,19408,19409,19410,19411,19412,19413,19414,
-19415,19416,19417,19418,19419,19420,19421,19422,19423,19424,19425,19426,
-19427,19428,19429,19430,19431,19432,19433,19434,19435,19436,19437,19438,
-19439,19440,19441,19442,19443,19444,19445,19446,19447,19448,19449,19450,
-19451,19452,19453,19454,19455,19456,19457,19458,19459,19460,19461,19462,
-19463,19464,19465,19466,19467,19468,19469,19470,19471,19472,19473,19474,
-19475,19476,19477,19478,19479,19480,19481,19482,19483,19484,19485,19486,
-19487,19488,19489,19490,19491,19492,19493,19494,19495,19496,19497,19498,
-19499,19500,19501,19502,19503,19504,19505,19506,19507,19508,19509,19510,
-19511,19512,19513,19514,19515,19516,19517,19518,19519,19520,19521,19522,
-19523,19524,19525,19526,19527,19528,19529,19530,19531,19532,19533,19534,
-19535,19536,19537,19538,19539,19540,19541,19542,19543,19544,19545,19546,
-19547,19548,19549,19550,19551,19552,19553,19554,19555,19556,19557,19558,
-19559,19560,19561,19562,19563,19564,19565,19566,19567,19568,19569,19570,
-19571,19572,19573,19574,19575,19576,19577,19578,19579,19580,19581,19582,
-19583,19584,19585,19586,19587,19588,19589,19590,19591,19592,19593,19594,
-19595,19596,19597,19598,19599,19600,19601,19602,19603,19604,19605,19606,
-19607,19608,19609,19610,19611,19612,19613,19614,19615,19616,19617,19618,
-19619,19620,19621,19622,19623,19624,19625,19626,19627,19628,19629,19630,
-19631,19632,19633,19634,19635,19636,19637,19638,19639,19640,19641,19642,
-19643,19644,19645,19646,19647,19648,19649,19650,19651,19652,19653,19654,
-19655,19656,19657,19658,19659,19660,19661,19662,19663,19664,19665,19666,
-19667,19668,19669,19670,19671,19672,19673,19674,19675,19676,19677,19678,
-19679,19680,19681,19682,19683,19684,19685,19686,19687,19688,19689,19690,
-19691,19692,19693,19694,19695,19696,19697,19698,19699,19700,19701,19702,
-19703,19704,19705,19706,19707,19708,19709,19710,19711,19712,19713,19714,
-19715,19716,19717,19718,19719,19720,19721,19722,19723,19724,19725,19726,
-19727,19728,19729,19730,19731,19732,19733,19734,19735,19736,19737,19738,
-19739,19740,19741,19742,19743,19744,19745,19746,19747,19748,19749,19750,
-19751,19752,19753,19754,19755,19756,19757,19758,19759,19760,19761,19762,
-19763,19764,19765,19766,19767,19768,19769,19770,19771,19772,19773,19774,
-19775,19776,19777,19778,19779,19780,19781,19782,19783,19784,19785,19786,
-19787,19788,19789,19790,19791,19792,19793,19794,19795,19796,19797,19798,
-19799,19800,19801,19802,19803,19804,19805,19806,19807,19808,19809,19810,
-19811,19812,19813,19814,19815,19816,19817,19818,19819,19820,19821,19822,
-19823,19824,19825,19826,19827,19828,19829,19830,19831,19832,19833,19834,
-19835,19836,19837,19838,19839,19840,19841,19842,19843,19844,19845,19846,
-19847,19848,19849,19850,19851,19852,19853,19854,19855,19856,19857,19858,
-19859,19860,19861,19862,19863,19864,19865,19866,19867,19868,19869,19870,
-19871,19872,19873,19874,19875,19876,19877,19878,19879,19880,19881,19882,
-19883,19884,19885,19886,19887,19888,19889,19890,19891,19892,19893,19894,
-19895,19896,19897,19898,19899,19900,19901,19902,19903,19904,19905,19906,
-19907,19908,19909,19910,19911,19912,19913,19914,19915,19916,19917,19918,
-19919,19920,19921,19922,19923,19924,19925,19926,19927,19928,19929,19930,
-19931,19932,19933,19934,19935,19936,19937,19938,19939,19940,19941,19942,
-19943,19944,19945,19946,19947,19948,19949,19950,19951,19952,19953,19954,
-19955,19956,19957,19958,19959,19960,19961,19962,19963,19964,19965,19966,
-19967,19968,19969,19970,19971,19972,19973,19974,19975,19976,19977,19978,
-19979,19980,19981,19982,19983,19984,19985,19986,19987,19988,19989,19990,
-19991,19992,19993,19994,19995,19996,19997,19998,19999,20000,20001,20002,
-20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20013,20014,
-20015,20016,20017,20018,20019,20020,20021,20022,20023,20024,20025,20026,
-20027,20028,20029,20030,20031,20032,20033,20034,20035,20036,20037,20038,
-20039,20040,20041,20042,20043,20044,20045,20046,20047,20048,20049,20050,
-20051,20052,20053,20054,20055,20056,20057,20058,20059,20060,20061,20062,
-20063,20064,20065,20066,20067,20068,20069,20070,20071,20072,20073,20074,
-20075,20076,20077,20078,20079,20080,20081,20082,20083,20084,20085,20086,
-20087,20088,20089,20090,20091,20092,20093,20094,20095,20096,20097,20098,
-20099,20100,20101,20102,20103,20104,20105,20106,20107,20108,20109,20110,
-20111,20112,20113,20114,20115,20116,20117,20118,20119,20120,20121,20122,
-20123,20124,20125,20126,20127,20128,20129,20130,20131,20132,20133,20134,
-20135,20136,20137,20138,20139,20140,20141,20142,20143,20144,20145,20146,
-20147,20148,20149,20150,20151,20152,20153,20154,20155,20156,20157,20158,
-20159,20160,20161,20162,20163,20164,20165,20166,20167,20168,20169,20170,
-20171,20172,20173,20174,20175,20176,20177,20178,20179,20180,20181,20182,
-20183,20184,20185,20186,20187,20188,20189,20190,20191,20192,20193,20194,
-20195,20196,20197,20198,20199,20200,20201,20202,20203,20204,20205,20206,
-20207,20208,20209,20210,20211,20212,20213,20214,20215,20216,20217,20218,
-20219,20220,20221,20222,20223,20224,20225,20226,20227,20228,20229,20230,
-20231,20232,20233,20234,20235,20236,20237,20238,20239,20240,20241,20242,
-20243,20244,20245,20246,20247,20248,20249,20250,20251,20252,20253,20254,
-20255,20256,20257,20258,20259,20260,20261,20262,20263,20264,20265,20266,
-20267,20268,20269,20270,20271,20272,20273,20274,20275,20276,20277,20278,
-20279,20280,20281,20282,20283,20284,20285,20286,20287,20288,20289,20290,
-20291,20292,20293,20294,20295,20296,20297,20298,20299,20300,20301,20302,
-20303,20304,20305,20306,20307,20308,20309,20310,20311,20312,20313,20314,
-20315,20316,20317,20318,20319,20320,20321,20322,20323,20324,20325,20326,
-20327,20328,20329,20330,20331,20332,20333,20334,20335,20336,20337,20338,
-20339,20340,20341,20342,20343,20344,20345,20346,20347,20348,20349,20350,
-20351,20352,20353,20354,20355,20356,20357,20358,20359,20360,20361,20362,
-20363,20364,20365,20366,20367,20368,20369,20370,20371,20372,20373,20374,
-20375,20376,20377,20378,20379,20380,20381,20382,20383,20384,20385,20386,
-20387,20388,20389,20390,20391,20392,20393,20394,20395,20396,20397,20398,
-20399,20400,20401,20402,20403,20404,20405,20406,20407,20408,20409,20410,
-20411,20412,20413,20414,20415,20416,20417,20418,20419,20420,20421,20422,
-20423,20424,20425,20426,20427,20428,20429,20430,20431,20432,20433,20434,
-20435,20436,20437,20438,20439,20440,20441,20442,20443,20444,20445,20446,
-20447,20448,20449,20450,20451,20452,20453,20454,20455,20456,20457,20458,
-20459,20460,20461,20462,20463,20464,20465,20466,20467,20468,20469,20470,
-20471,20472,20473,20474,20475,20476,20477,20478,20479,20480,20481,20482,
-20483,20484,20485,20486,20487,20488,20489,20490,20491,20492,20493,20494,
-20495,20496,20497,20498,20499,20500,20501,20502,20503,20504,20505,20506,
-20507,20508,20509,20510,20511,20512,20513,20514,20515,20516,20517,20518,
-20519,20520,20521,20522,20523,20524,20525,20526,20527,20528,20529,20530,
-20531,20532,20533,20534,20535,20536,20537,20538,20539,20540,20541,20542,
-20543,20544,20545,20546,20547,20548,20549,20550,20551,20552,20553,20554,
-20555,20556,20557,20558,20559,20560,20561,20562,20563,20564,20565,20566,
-20567,20568,20569,20570,20571,20572,20573,20574,20575,20576,20577,20578,
-20579,20580,20581,20582,20583,20584,20585,20586,20587,20588,20589,20590,
-20591,20592,20593,20594,20595,20596,20597,20598,20599,20600,20601,20602,
-20603,20604,20605,20606,20607,20608,20609,20610,20611,20612,20613,20614,
-20615,20616,20617,20618,20619,20620,20621,20622,20623,20624,20625,20626,
-20627,20628,20629,20630,20631,20632,20633,20634,20635,20636,20637,20638,
-20639,20640,20641,20642,20643,20644,20645,20646,20647,20648,20649,20650,
-20651,20652,20653,20654,20655,20656,20657,20658,20659,20660,20661,20662,
-20663,20664,20665,20666,20667,20668,20669,20670,20671,20672,20673,20674,
-20675,20676,20677,20678,20679,20680,20681,20682,20683,20684,20685,20686,
-20687,20688,20689,20690,20691,20692,20693,20694,20695,20696,20697,20698,
-20699,20700,20701,20702,20703,20704,20705,20706,20707,20708,20709,20710,
-20711,20712,20713,20714,20715,20716,20717,20718,20719,20720,20721,20722,
-20723,20724,20725,20726,20727,20728,20729,20730,20731,20732,20733,20734,
-20735,20736,20737,20738,20739,20740,20741,20742,20743,20744,20745,20746,
-20747,20748,20749,20750,20751,20752,20753,20754,20755,20756,20757,20758,
-20759,20760,20761,20762,20763,20764,20765,20766,20767,20768,20769,20770,
-20771,20772,20773,20774,20775,20776,20777,20778,20779,20780,20781,20782,
-20783,20784,20785,20786,20787,20788,20789,20790,20791,20792,20793,20794,
-20795,20796,20797,20798,20799,20800,20801,20802,20803,20804,20805,20806,
-20807,20808,20809,20810,20811,20812,20813,20814,20815,20816,20817,20818,
-20819,20820,20821,20822,20823,20824,20825,20826,20827,20828,20829,20830,
-20831,20832,20833,20834,20835,20836,20837,20838,20839,20840,20841,20842,
-20843,20844,20845,20846,20847,20848,20849,20850,20851,20852,20853,20854,
-20855,20856,20857,20858,20859,20860,20861,20862,20863,20864,20865,20866,
-20867,20868,20869,20870,20871,20872,20873,20874,20875,20876,20877,20878,
-20879,20880,20881,20882,20883,20884,20885,20886,20887,20888,20889,20890,
-20891,20892,20893,20894,20895,20896,20897,20898,20899,20900,20901,20902,
-20903,20904,20905,20906,20907,20908,20909,20910,20911,20912,20913,20914,
-20915,20916,20917,20918,20919,20920,20921,20922,20923,20924,20925,20926,
-20927,20928,20929,20930,20931,20932,20933,20934,20935,20936,20937,20938,
-20939,20940,20941,20942,20943,20944,20945,20946,20947,20948,20949,20950,
-20951,20952,20953,20954,20955,20956,20957,20958,20959,20960,20961,20962,
-20963,20964,20965,20966,20967,20968,20969,20970,20971,20972,20973,20974,
-20975,20976,20977,20978,20979,20980,20981,20982,20983,20984,20985,20986,
-20987,20988,20989,20990,20991,20992,20993,20994,20995,20996,20997,20998,
-20999,21000,21001,21002,21003,21004,21005,21006,21007,21008,21009,21010,
-21011,21012,21013,21014,21015,21016,21017,21018,21019,21020,21021,21022,
-21023,21024,21025,21026,21027,21028,21029,21030,21031,21032,21033,21034,
-21035,21036,21037,21038,21039,21040,21041,21042,21043,21044,21045,21046,
-21047,21048,21049,21050,21051,21052,21053,21054,21055,21056,21057,21058,
-21059,21060,21061,21062,21063,21064,21065,21066,21067,21068,21069,21070,
-21071,21072,21073,21074,21075,21076,21077,21078,21079,21080,21081,21082,
-21083,21084,21085,21086,21087,21088,21089,21090,21091,21092,21093,21094,
-21095,21096,21097,21098,21099,21100,21101,21102,21103,21104,21105,21106,
-21107,21108,21109,21110,21111,21112,21113,21114,21115,21116,21117,21118,
-21119,21120,21121,21122,21123,21124,21125,21126,21127,21128,21129,21130,
-21131,21132,21133,21134,21135,21136,21137,21138,21139,21140,21141,21142,
-21143,21144,21145,21146,21147,21148,21149,21150,21151,21152,21153,21154,
-21155,21156,21157,21158,21159,21160,21161,21162,21163,21164,21165,21166,
-21167,21168,21169,21170,21171,21172,21173,21174,21175,21176,21177,21178,
-21179,21180,21181,21182,21183,21184,21185,21186,21187,21188,21189,21190,
-21191,21192,21193,21194,21195,21196,21197,21198,21199,21200,21201,21202,
-21203,21204,21205,21206,21207,21208,21209,21210,21211,21212,21213,21214,
-21215,21216,21217,21218,21219,21220,21221,21222,21223,21224,21225,21226,
-21227,21228,21229,21230,21231,21232,21233,21234,21235,21236,21237,21238,
-21239,21240,21241,21242,21243,21244,21245,21246,21247,21248,21249,21250,
-21251,21252,21253,21254,21255,21256,21257,21258,21259,21260,21261,21262,
-21263,21264,21265,21266,21267,21268,21269,21270,21271,21272,21273,21274,
-21275,21276,21277,21278,21279,21280,21281,21282,21283,21284,21285,21286,
-21287,21288,21289,21290,21291,21292,21293,21294,21295,21296,21297,21298,
-21299,21300,21301,21302,21303,21304,21305,21306,21307,21308,21309,21310,
-21311,21312,21313,21314,21315,21316,21317,21318,21319,21320,21321,21322,
-21323,21324,21325,21326,21327,21328,21329,21330,21331,21332,21333,21334,
-21335,21336,21337,21338,21339,21340,21341,21342,21343,21344,21345,21346,
-21347,21348,21349,21350,21351,21352,21353,21354,21355,21356,21357,21358,
-21359,21360,21361,21362,21363,21364,21365,21366,21367,21368,21369,21370,
-21371,21372,21373,21374,21375,21376,21377,21378,21379,21380,21381,21382,
-21383,21384,21385,21386,21387,21388,21389,21390,21391,21392,21393,21394,
-21395,21396,21397,21398,21399,21400,21401,21402,21403,21404,21405,21406,
-21407,21408,21409,21410,21411,21412,21413,21414,21415,21416,21417,21418,
-21419,21420,21421,21422,21423,21424,21425,21426,21427,21428,21429,21430,
-21431,21432,21433,21434,21435,21436,21437,21438,21439,21440,21441,21442,
-21443,21444,21445,21446,21447,21448,21449,21450,21451,21452,21453,21454,
-21455,21456,21457,21458,21459,21460,21461,21462,21463,21464,21465,21466,
-21467,21468,21469,21470,21471,21472,21473,21474,21475,21476,21477,21478,
-21479,21480,21481,21482,21483,21484,21485,21486,21487,21488,21489,21490,
-21491,21492,21493,21494,21495,21496,21497,21498,21499,21500,21501,21502,
-21503,21504,21505,21506,21507,21508,21509,21510,21511,21512,21513,21514,
-21515,21516,21517,21518,21519,21520,21521,21522,21523,21524,21525,21526,
-21527,21528,21529,21530,21531,21532,21533,21534,21535,21536,21537,21538,
-21539,21540,21541,21542,21543,21544,21545,21546,21547,21548,21549,21550,
-21551,21552,21553,21554,21555,21556,21557,21558,21559,21560,21561,21562,
-21563,21564,21565,21566,21567,21568,21569,21570,21571,21572,21573,21574,
-21575,21576,21577,21578,21579,21580,21581,21582,21583,21584,21585,21586,
-21587,21588,21589,21590,21591,21592,21593,21594,21595,21596,21597,21598,
-21599,21600,21601,21602,21603,21604,21605,21606,21607,21608,21609,21610,
-21611,21612,21613,21614,21615,21616,21617,21618,21619,21620,21621,21622,
-21623,21624,21625,21626,21627,21628,21629,21630,21631,21632,21633,21634,
-21635,21636,21637,21638,21639,21640,21641,21642,21643,21644,21645,21646,
-21647,21648,21649,21650,21651,21652,21653,21654,21655,21656,21657,21658,
-21659,21660,21661,21662,21663,21664,21665,21666,21667,21668,21669,21670,
-21671,21672,21673,21674,21675,21676,21677,21678,21679,21680,21681,21682,
-21683,21684,21685,21686,21687,21688,21689,21690,21691,21692,21693,21694,
-21695,21696,21697,21698,21699,21700,21701,21702,21703,21704,21705,21706,
-21707,21708,21709,21710,21711,21712,21713,21714,21715,21716,21717,21718,
-21719,21720,21721,21722,21723,21724,21725,21726,21727,21728,21729,21730,
-21731,21732,21733,21734,21735,21736,21737,21738,21739,21740,21741,21742,
-21743,21744,21745,21746,21747,21748,21749,21750,21751,21752,21753,21754,
-21755,21756,21757,21758,21759,21760,21761,21762,21763,21764,21765,21766,
-21767,21768,21769,21770,21771,21772,21773,21774,21775,21776,21777,21778,
-21779,21780,21781,21782,21783,21784,21785,21786,21787,21788,21789,21790,
-21791,21792,21793,21794,21795,21796,21797,21798,21799,21800,21801,21802,
-21803,21804,21805,21806,21807,21808,21809,21810,21811,21812,21813,21814,
-21815,21816,21817,21818,21819,21820,21821,21822,21823,21824,21825,21826,
-21827,21828,21829,21830,21831,21832,21833,21834,21835,21836,21837,21838,
-21839,21840,21841,21842,21843,21844,21845,21846,21847,21848,21849,21850,
-21851,21852,21853,21854,21855,21856,21857,21858,21859,21860,21861,21862,
-21863,21864,21865,21866,21867,21868,21869,21870,21871,21872,21873,21874,
-21875,21876,21877,21878,21879,21880,21881,21882,21883,21884,21885,21886,
-21887,21888,21889,21890,21891,21892,21893,21894,21895,21896,21897,21898,
-21899,21900,21901,21902,21903,21904,21905,21906,21907,21908,21909,21910,
-21911,21912,21913,21914,21915,21916,21917,21918,21919,21920,21921,21922,
-21923,21924,21925,21926,21927,21928,21929,21930,21931,21932,21933,21934,
-21935,21936,21937,21938,21939,21940,21941,21942,21943,21944,21945,21946,
-21947,21948,21949,21950,21951,21952,21953,21954,21955,21956,21957,21958,
-21959,21960,21961,21962,21963,21964,21965,21966,21967,21968,21969,21970,
-21971,21972,21973,21974,21975,21976,21977,21978,21979,21980,21981,21982,
-21983,21984,21985,21986,21987,21988,21989,21990,21991,21992,21993,21994,
-21995,21996,21997,21998,21999,22000,22001,22002,22003,22004,22005,22006,
-22007,22008,22009,22010,22011,22012,22013,22014,22015,22016,22017,22018,
-22019,22020,22021,22022,22023,22024,22025,22026,22027,22028,22029,22030,
-22031,22032,22033,22034,22035,22036,22037,22038,22039,22040,22041,22042,
-22043,22044,22045,22046,22047,22048,22049,22050,22051,22052,22053,22054,
-22055,22056,22057,22058,22059,22060,22061,22062,22063,22064,22065,22066,
-22067,22068,22069,22070,22071,22072,22073,22074,22075,22076,22077,22078,
-22079,22080,22081,22082,22083,22084,22085,22086,22087,22088,22089,22090,
-22091,22092,22093,22094,22095,22096,22097,22098,22099,22100,22101,22102,
-22103,22104,22105,22106,22107,22108,22109,22110,22111,22112,22113,22114,
-22115,22116,22117,22118,22119,22120,22121,22122,22123,22124,22125,22126,
-22127,22128,22129,22130,22131,22132,22133,22134,22135,22136,22137,22138,
-22139,22140,22141,22142,22143,22144,22145,22146,22147,22148,22149,22150,
-22151,22152,22153,22154,22155,22156,22157,22158,22159,22160,22161,22162,
-22163,22164,22165,22166,22167,22168,22169,22170,22171,22172,22173,22174,
-22175,22176,22177,22178,22179,22180,22181,22182,22183,22184,22185,22186,
-22187,22188,22189,22190,22191,22192,22193,22194,22195,22196,22197,22198,
-22199,22200,22201,22202,22203,22204,22205,22206,22207,22208,22209,22210,
-22211,22212,22213,22214,22215,22216,22217,22218,22219,22220,22221,22222,
-22223,22224,22225,22226,22227,22228,22229,22230,22231,22232,22233,22234,
-22235,22236,22237,22238,22239,22240,22241,22242,22243,22244,22245,22246,
-22247,22248,22249,22250,22251,22252,22253,22254,22255,22256,22257,22258,
-22259,22260,22261,22262,22263,22264,22265,22266,22267,22268,22269,22270,
-22271,22272,22273,22274,22275,22276,22277,22278,22279,22280,22281,22282,
-22283,22284,22285,22286,22287,22288,22289,22290,22291,22292,22293,22294,
-22295,22296,22297,22298,22299,22300,22301,22302,22303,22304,22305,22306,
-22307,22308,22309,22310,22311,22312,22313,22314,22315,22316,22317,22318,
-22319,22320,22321,22322,22323,22324,22325,22326,22327,22328,22329,22330,
-22331,22332,22333,22334,22335,22336,22337,22338,22339,22340,22341,22342,
-22343,22344,22345,22346,22347,22348,22349,22350,22351,22352,22353,22354,
-22355,22356,22357,22358,22359,22360,22361,22362,22363,22364,22365,22366,
-22367,22368,22369,22370,22371,22372,22373,22374,22375,22376,22377,22378,
-22379,22380,22381,22382,22383,22384,22385,22386,22387,22388,22389,22390,
-22391,22392,22393,22394,22395,22396,22397,22398,22399,22400,22401,22402,
-22403,22404,22405,22406,22407,22408,22409,22410,22411,22412,22413,22414,
-22415,22416,22417,22418,22419,22420,22421,22422,22423,22424,22425,22426,
-22427,22428,22429,22430,22431,22432,22433,22434,22435,22436,22437,22438,
-22439,22440,22441,22442,22443,22444,22445,22446,22447,22448,22449,22450,
-22451,22452,22453,22454,22455,22456,22457,22458,22459,22460,22461,22462,
-22463,22464,22465,22466,22467,22468,22469,22470,22471,22472,22473,22474,
-22475,22476,22477,22478,22479,22480,22481,22482,22483,22484,22485,22486,
-22487,22488,22489,22490,22491,22492,22493,22494,22495,22496,22497,22498,
-22499,22500,22501,22502,22503,22504,22505,22506,22507,22508,22509,22510,
-22511,22512,22513,22514,22515,22516,22517,22518,22519,22520,22521,22522,
-22523,22524,22525,22526,22527,22528,22529,22530,22531,22532,22533,22534,
-22535,22536,22537,22538,22539,22540,22541,22542,22543,22544,22545,22546,
-22547,22548,22549,22550,22551,22552,22553,22554,22555,22556,22557,22558,
-22559,22560,22561,22562,22563,22564,22565,22566,22567,22568,22569,22570,
-22571,22572,22573,22574,22575,22576,22577,22578,22579,22580,22581,22582,
-22583,22584,22585,22586,22587,22588,22589,22590,22591,22592,22593,22594,
-22595,22596,22597,22598,22599,22600,22601,22602,22603,22604,22605,22606,
-22607,22608,22609,22610,22611,22612,22613,22614,22615,22616,22617,22618,
-22619,22620,22621,22622,22623,22624,22625,22626,22627,22628,22629,22630,
-22631,22632,22633,22634,22635,22636,22637,22638,22639,22640,22641,22642,
-22643,22644,22645,22646,22647,22648,22649,22650,22651,22652,22653,22654,
-22655,22656,22657,22658,22659,22660,22661,22662,22663,22664,22665,22666,
-22667,22668,22669,22670,22671,22672,22673,22674,22675,22676,22677,22678,
-22679,22680,22681,22682,22683,22684,22685,22686,22687,22688,22689,22690,
-22691,22692,22693,22694,22695,22696,22697,22698,22699,22700,22701,22702,
-22703,22704,22705,22706,22707,22708,22709,22710,22711,22712,22713,22714,
-22715,22716,22717,22718,22719,22720,22721,22722,22723,22724,22725,22726,
-22727,22728,22729,22730,22731,22732,22733,22734,22735,22736,22737,22738,
-22739,22740,22741,22742,22743,22744,22745,22746,22747,22748,22749,22750,
-22751,22752,22753,22754,22755,22756,22757,22758,22759,22760,22761,22762,
-22763,22764,22765,22766,22767,22768,22769,22770,22771,22772,22773,22774,
-22775,22776,22777,22778,22779,22780,22781,22782,22783,22784,22785,22786,
-22787,22788,22789,22790,22791,22792,22793,22794,22795,22796,22797,22798,
-22799,22800,22801,22802,22803,22804,22805,22806,22807,22808,22809,22810,
-22811,22812,22813,22814,22815,22816,22817,22818,22819,22820,22821,22822,
-22823,22824,22825,22826,22827,22828,22829,22830,22831,22832,22833,22834,
-22835,22836,22837,22838,22839,22840,22841,22842,22843,22844,22845,22846,
-22847,22848,22849,22850,22851,22852,22853,22854,22855,22856,22857,22858,
-22859,22860,22861,22862,22863,22864,22865,22866,22867,22868,22869,22870,
-22871,22872,22873,22874,22875,22876,22877,22878,22879,22880,22881,22882,
-22883,22884,22885,22886,22887,22888,22889,22890,22891,22892,22893,22894,
-22895,22896,22897,22898,22899,22900,22901,22902,22903,22904,22905,22906,
-22907,22908,22909,22910,22911,22912,22913,22914,22915,22916,22917,22918,
-22919,22920,22921,22922,22923,22924,22925,22926,22927,22928,22929,22930,
-22931,22932,22933,22934,22935,22936,22937,22938,22939,22940,22941,22942,
-22943,22944,22945,22946,22947,22948,22949,22950,22951,22952,22953,22954,
-22955,22956,22957,22958,22959,22960,22961,22962,22963,22964,22965,22966,
-22967,22968,22969,22970,22971,22972,22973,22974,22975,22976,22977,22978,
-22979,22980,22981,22982,22983,22984,22985,22986,22987,22988,22989,22990,
-22991,22992,22993,22994,22995,22996,22997,22998,22999,23000,23001,23002,
-23003,23004,23005,23006,23007,23008,23009,23010,23011,23012,23013,23014,
-23015,23016,23017,23018,23019,23020,23021,23022,23023,23024,23025,23026,
-23027,23028,23029,23030,23031,23032,23033,23034,23035,23036,23037,23038,
-23039,23040,23041,23042,23043,23044,23045,23046,23047,23048,23049,23050,
-23051,23052,23053,23054,23055,23056,23057,23058,23059,23060,23061,23062,
-23063,23064,23065,23066,23067,23068,23069,23070,23071,23072,23073,23074,
-23075,23076,23077,23078,23079,23080,23081,23082,23083,23084,23085,23086,
-23087,23088,23089,23090,23091,23092,23093,23094,23095,23096,23097,23098,
-23099,23100,23101,23102,23103,23104,23105,23106,23107,23108,23109,23110,
-23111,23112,23113,23114,23115,23116,23117,23118,23119,23120,23121,23122,
-23123,23124,23125,23126,23127,23128,23129,23130,23131,23132,23133,23134,
-23135,23136,23137,23138,23139,23140,23141,23142,23143,23144,23145,23146,
-23147,23148,23149,23150,23151,23152,23153,23154,23155,23156,23157,23158,
-23159,23160,23161,23162,23163,23164,23165,23166,23167,23168,23169,23170,
-23171,23172,23173,23174,23175,23176,23177,23178,23179,23180,23181,23182,
-23183,23184,23185,23186,23187,23188,23189,23190,23191,23192,23193,23194,
-23195,23196,23197,23198,23199,23200,23201,23202,23203,23204,23205,23206,
-23207,23208,23209,23210,23211,23212,23213,23214,23215,23216,23217,23218,
-23219,23220,23221,23222,23223,23224,23225,23226,23227,23228,23229,23230,
-23231,23232,23233,23234,23235,23236,23237,23238,23239,23240,23241,23242,
-23243,23244,23245,23246,23247,23248,23249,23250,23251,23252,23253,23254,
-23255,23256,23257,23258,23259,23260,23261,23262,23263,23264,23265,23266,
-23267,23268,23269,23270,23271,23272,23273,23274,23275,23276,23277,23278,
-23279,23280,23281,23282,23283,23284,23285,23286,23287,23288,23289,23290,
-23291,23292,23293,23294,23295,23296,23297,23298,23299,23300,23301,23302,
-23303,23304,23305,23306,23307,23308,23309,23310,23311,23312,23313,23314,
-23315,23316,23317,23318,23319,23320,23321,23322,23323,23324,23325,23326,
-23327,23328,23329,23330,23331,23332,23333,23334,23335,23336,23337,23338,
-23339,23340,23341,23342,23343,23344,23345,23346,23347,23348,23349,23350,
-23351,23352,23353,23354,23355,23356,23357,23358,23359,23360,23361,23362,
-23363,23364,23365,23366,23367,23368,23369,23370,23371,23372,23373,23374,
-23375,23376,23377,23378,23379,23380,23381,23382,23383,23384,23385,23386,
-23387,23388,23389,23390,23391,23392,23393,23394,23395,23396,23397,23398,
-23399,23400,23401,23402,23403,23404,23405,23406,23407,23408,23409,23410,
-23411,23412,23413,23414,23415,23416,23417,23418,23419,23420,23421,23422,
-23423,23424,23425,23426,23427,23428,23429,23430,23431,23432,23433,23434,
-23435,23436,23437,23438,23439,23440,23441,23442,23443,23444,23445,23446,
-23447,23448,23449,23450,23451,23452,23453,23454,23455,23456,23457,23458,
-23459,23460,23461,23462,23463,23464,23465,23466,23467,23468,23469,23470,
-23471,23472,23473,23474,23475,23476,23477,23478,23479,23480,23481,23482,
-23483,23484,23485,23486,23487,23488,23489,23490,23491,23492,23493,23494,
-23495,23496,23497,23498,23499,23500,23501,23502,23503,23504,23505,23506,
-23507,23508,23509,23510,23511,23512,23513,23514,23515,23516,23517,23518,
-23519,23520,23521,23522,23523,23524,23525,23526,23527,23528,23529,23530,
-23531,23532,23533,23534,23535,23536,23537,23538,23539,23540,23541,23542,
-23543,23544,23545,23546,23547,23548,23549,23550,23551,23552,23553,23554,
-23555,23556,23557,23558,23559,23560,23561,23562,23563,23564,23565,23566,
-23567,23568,23569,23570,23571,23572,23573,23574,23575,23576,23577,23578,
-23579,23580,23581,23582,23583,23584,23585,23586,23587,23588,23589,23590,
-23591,23592,23593,23594,23595,23596,23597,23598,23599,23600,23601,23602,
-23603,23604,23605,23606,23607,23608,23609,23610,23611,23612,23613,23614,
-23615,23616,23617,23618,23619,23620,23621,23622,23623,23624,23625,23626,
-23627,23628,23629,23630,23631,23632,23633,23634,23635,23636,23637,23638,
-23639,23640,23641,23642,23643,23644,23645,23646,23647,23648,23649,23650,
-23651,23652,23653,23654,23655,23656,23657,23658,23659,23660,23661,23662,
-23663,23664,23665,23666,23667,23668,23669,23670,23671,23672,23673,23674,
-23675,23676,23677,23678,23679,23680,23681,23682,23683,23684,23685,23686,
-23687,23688,23689,23690,23691,23692,23693,23694,23695,23696,23697,23698,
-23699,23700,23701,23702,23703,23704,23705,23706,23707,23708,23709,23710,
-23711,23712,23713,23714,23715,23716,23717,23718,23719,23720,23721,23722,
-23723,23724,23725,23726,23727,23728,23729,23730,23731,23732,23733,23734,
-23735,23736,23737,23738,23739,23740,23741,23742,23743,23744,23745,23746,
-23747,23748,23749,23750,23751,23752,23753,23754,23755,23756,23757,23758,
-23759,23760,23761,23762,23763,23764,23765,23766,23767,23768,23769,23770,
-23771,23772,23773,23774,23775,23776,23777,23778,23779,23780,23781,23782,
-23783,23784,23785,23786,23787,23788,23789,23790,23791,23792,23793,23794,
-23795,23796,23797,23798,23799,23800,23801,23802,23803,23804,23805,23806,
-23807,23808,23809,23810,23811,23812,23813,23814,23815,23816,23817,23818,
-23819,23820,23821,23822,23823,23824,23825,23826,23827,23828,23829,23830,
-23831,23832,23833,23834,23835,23836,23837,23838,23839,23840,23841,23842,
-23843,23844,23845,23846,23847,23848,23849,23850,23851,23852,23853,23854,
-23855,23856,23857,23858,23859,23860,23861,23862,23863,23864,23865,23866,
-23867,23868,23869,23870,23871,23872,23873,23874,23875,23876,23877,23878,
-23879,23880,23881,23882,23883,23884,23885,23886,23887,23888,23889,23890,
-23891,23892,23893,23894,23895,23896,23897,23898,23899,23900,23901,23902,
-23903,23904,23905,23906,23907,23908,23909,23910,23911,23912,23913,23914,
-23915,23916,23917,23918,23919,23920,23921,23922,23923,23924,23925,23926,
-23927,23928,23929,23930,23931,23932,23933,23934,23935,23936,23937,23938,
-23939,23940,23941,23942,23943,23944,23945,23946,23947,23948,23949,23950,
-23951,23952,23953,23954,23955,23956,23957,23958,23959,23960,23961,23962,
-23963,23964,23965,23966,23967,23968,23969,23970,23971,23972,23973,23974,
-23975,23976,23977,23978,23979,23980,23981,23982,23983,23984,23985,23986,
-23987,23988,23989,23990,23991,23992,23993,23994,23995,23996,23997,23998,
-23999,24000,24001,24002,24003,24004,24005,24006,24007,24008,24009,24010,
-24011,24012,24013,24014,24015,24016,24017,24018,24019,24020,24021,24022,
-24023,24024,24025,24026,24027,24028,24029,24030,24031,24032,24033,24034,
-24035,24036,24037,24038,24039,24040,24041,24042,24043,24044,24045,24046,
-24047,24048,24049,24050,24051,24052,24053,24054,24055,24056,24057,24058,
-24059,24060,24061,24062,24063,24064,24065,24066,24067,24068,24069,24070,
-24071,24072,24073,24074,24075,24076,24077,24078,24079,24080,24081,24082,
-24083,24084,24085,24086,24087,24088,24089,24090,24091,24092,24093,24094,
-24095,24096,24097,24098,24099,24100,24101,24102,24103,24104,24105,24106,
-24107,24108,24109,24110,24111,24112,24113,24114,24115,24116,24117,24118,
-24119,24120,24121,24122,24123,24124,24125,24126,24127,24128,24129,24130,
-24131,24132,24133,24134,24135,24136,24137,24138,24139,24140,24141,24142,
-24143,24144,24145,24146,24147,24148,24149,24150,24151,24152,24153,24154,
-24155,24156,24157,24158,24159,24160,24161,24162,24163,24164,24165,24166,
-24167,24168,24169,24170,24171,24172,24173,24174,24175,24176,24177,24178,
-24179,24180,24181,24182,24183,24184,24185,24186,24187,24188,24189,24190,
-24191,24192,24193,24194,24195,24196,24197,24198,24199,24200,24201,24202,
-24203,24204,24205,24206,24207,24208,24209,24210,24211,24212,24213,24214,
-24215,24216,24217,24218,24219,24220,24221,24222,24223,24224,24225,24226,
-24227,24228,24229,24230,24231,24232,24233,24234,24235,24236,24237,24238,
-24239,24240,24241,24242,24243,24244,24245,24246,24247,24248,24249,24250,
-24251,24252,24253,24254,24255,24256,24257,24258,24259,24260,24261,24262,
-24263,24264,24265,24266,24267,24268,24269,24270,24271,24272,24273,24274,
-24275,24276,24277,24278,24279,24280,24281,24282,24283,24284,24285,24286,
-24287,24288,24289,24290,24291,24292,24293,24294,24295,24296,24297,24298,
-24299,24300,24301,24302,24303,24304,24305,24306,24307,24308,24309,24310,
-24311,24312,24313,24314,24315,24316,24317,24318,24319,24320,24321,24322,
-24323,24324,24325,24326,24327,24328,24329,24330,24331,24332,24333,24334,
-24335,24336,24337,24338,24339,24340,24341,24342,24343,24344,24345,24346,
-24347,24348,24349,24350,24351,24352,24353,24354,24355,24356,24357,24358,
-24359,24360,24361,24362,24363,24364,24365,24366,24367,24368,24369,24370,
-24371,24372,24373,24374,24375,24376,24377,24378,24379,24380,24381,24382,
-24383,24384,24385,24386,24387,24388,24389,24390,24391,24392,24393,24394,
-24395,24396,24397,24398,24399,24400,24401,24402,24403,24404,24405,24406,
-24407,24408,24409,24410,24411,24412,24413,24414,24415,24416,24417,24418,
-24419,24420,24421,24422,24423,24424,24425,24426,24427,24428,24429,24430,
-24431,24432,24433,24434,24435,24436,24437,24438,24439,24440,24441,24442,
-24443,24444,24445,24446,24447,24448,24449,24450,24451,24452,24453,24454,
-24455,24456,24457,24458,24459,24460,24461,24462,24463,24464,24465,24466,
-24467,24468,24469,24470,24471,24472,24473,24474,24475,24476,24477,24478,
-24479,24480,24481,24482,24483,24484,24485,24486,24487,24488,24489,24490,
-24491,24492,24493,24494,24495,24496,24497,24498,24499,24500,24501,24502,
-24503,24504,24505,24506,24507,24508,24509,24510,24511,24512,24513,24514,
-24515,24516,24517,24518,24519,24520,24521,24522,24523,24524,24525,24526,
-24527,24528,24529,24530,24531,24532,24533,24534,24535,24536,24537,24538,
-24539,24540,24541,24542,24543,24544,24545,24546,24547,24548,24549,24550,
-24551,24552,24553,24554,24555,24556,24557,24558,24559,24560,24561,24562,
-24563,24564,24565,24566,24567,24568,24569,24570,24571,24572,24573,24574,
-24575,24576,24577,24578,24579,24580,24581,24582,24583,24584,24585,24586,
-24587,24588,24589,24590,24591,24592,24593,24594,24595,24596,24597,24598,
-24599,24600,24601,24602,24603,24604,24605,24606,24607,24608,24609,24610,
-24611,24612,24613,24614,24615,24616,24617,24618,24619,24620,24621,24622,
-24623,24624,24625,24626,24627,24628,24629,24630,24631,24632,24633,24634,
-24635,24636,24637,24638,24639,24640,24641,24642,24643,24644,24645,24646,
-24647,24648,24649,24650,24651,24652,24653,24654,24655,24656,24657,24658,
-24659,24660,24661,24662,24663,24664,24665,24666,24667,24668,24669,24670,
-24671,24672,24673,24674,24675,24676,24677,24678,24679,24680,24681,24682,
-24683,24684,24685,24686,24687,24688,24689,24690,24691,24692,24693,24694,
-24695,24696,24697,24698,24699,24700,24701,24702,24703,24704,24705,24706,
-24707,24708,24709,24710,24711,24712,24713,24714,24715,24716,24717,24718,
-24719,24720,24721,24722,24723,24724,24725,24726,24727,24728,24729,24730,
-24731,24732,24733,24734,24735,24736,24737,24738,24739,24740,24741,24742,
-24743,24744,24745,24746,24747,24748,24749,24750,24751,24752,24753,24754,
-24755,24756,24757,24758,24759,24760,24761,24762,24763,24764,24765,24766,
-24767,24768,24769,24770,24771,24772,24773,24774,24775,24776,24777,24778,
-24779,24780,24781,24782,24783,24784,24785,24786,24787,24788,24789,24790,
-24791,24792,24793,24794,24795,24796,24797,24798,24799,24800,24801,24802,
-24803,24804,24805,24806,24807,24808,24809,24810,24811,24812,24813,24814,
-24815,24816,24817,24818,24819,24820,24821,24822,24823,24824,24825,24826,
-24827,24828,24829,24830,24831,24832,24833,24834,24835,24836,24837,24838,
-24839,24840,24841,24842,24843,24844,24845,24846,24847,24848,24849,24850,
-24851,24852,24853,24854,24855,24856,24857,24858,24859,24860,24861,24862,
-24863,24864,24865,24866,24867,24868,24869,24870,24871,24872,24873,24874,
-24875,24876,24877,24878,24879,24880,24881,24882,24883,24884,24885,24886,
-24887,24888,24889,24890,24891,24892,24893,24894,24895,24896,24897,24898,
-24899,24900,24901,24902,24903,24904,24905,24906,24907,24908,24909,24910,
-24911,24912,24913,24914,24915,24916,24917,24918,24919,24920,24921,24922,
-24923,24924,24925,24926,24927,24928,24929,24930,24931,24932,24933,24934,
-24935,24936,24937,24938,24939,24940,24941,24942,24943,24944,24945,24946,
-24947,24948,24949,24950,24951,24952,24953,24954,24955,24956,24957,24958,
-24959,24960,24961,24962,24963,24964,24965,24966,24967,24968,24969,24970,
-24971,24972,24973,24974,24975,24976,24977,24978,24979,24980,24981,24982,
-24983,24984,24985,24986,24987,24988,24989,24990,24991,24992,24993,24994,
-24995,24996,24997,24998,24999,25000,25001,25002,25003,25004,25005,25006,
-25007,25008,25009,25010,25011,25012,25013,25014,25015,25016,25017,25018,
-25019,25020,25021,25022,25023,25024,25025,25026,25027,25028,25029,25030,
-25031,25032,25033,25034,25035,25036,25037,25038,25039,25040,25041,25042,
-25043,25044,25045,25046,25047,25048,25049,25050,25051,25052,25053,25054,
-25055,25056,25057,25058,25059,25060,25061,25062,25063,25064,25065,25066,
-25067,25068,25069,25070,25071,25072,25073,25074,25075,25076,25077,25078,
-25079,25080,25081,25082,25083,25084,25085,25086,25087,25088,25089,25090,
-25091,25092,25093,25094,25095,25096,25097,25098,25099,25100,25101,25102,
-25103,25104,25105,25106,25107,25108,25109,25110,25111,25112,25113,25114,
-25115,25116,25117,25118,25119,25120,25121,25122,25123,25124,25125,25126,
-25127,25128,25129,25130,25131,25132,25133,25134,25135,25136,25137,25138,
-25139,25140,25141,25142,25143,25144,25145,25146,25147,25148,25149,25150,
-25151,25152,25153,25154,25155,25156,25157,25158,25159,25160,25161,25162,
-25163,25164,25165,25166,25167,25168,25169,25170,25171,25172,25173,25174,
-25175,25176,25177,25178,25179,25180,25181,25182,25183,25184,25185,25186,
-25187,25188,25189,25190,25191,25192,25193,25194,25195,25196,25197,25198,
-25199,25200,25201,25202,25203,25204,25205,25206,25207,25208,25209,25210,
-25211,25212,25213,25214,25215,25216,25217,25218,25219,25220,25221,25222,
-25223,25224,25225,25226,25227,25228,25229,25230,25231,25232,25233,25234,
-25235,25236,25237,25238,25239,25240,25241,25242,25243,25244,25245,25246,
-25247,25248,25249,25250,25251,25252,25253,25254,25255,25256,25257,25258,
-25259,25260,25261,25262,25263,25264,25265,25266,25267,25268,25269,25270,
-25271,25272,25273,25274,25275,25276,25277,25278,25279,25280,25281,25282,
-25283,25284,25285,25286,25287,25288,25289,25290,25291,25292,25293,25294,
-25295,25296,25297,25298,25299,25300,25301,25302,25303,25304,25305,25306,
-25307,25308,25309,25310,25311,25312,25313,25314,25315,25316,25317,25318,
-25319,25320,25321,25322,25323,25324,25325,25326,25327,25328,25329,25330,
-25331,25332,25333,25334,25335,25336,25337,25338,25339,25340,25341,25342,
-25343,25344,25345,25346,25347,25348,25349,25350,25351,25352,25353,25354,
-25355,25356,25357,25358,25359,25360,25361,25362,25363,25364,25365,25366,
-25367,25368,25369,25370,25371,25372,25373,25374,25375,25376,25377,25378,
-25379,25380,25381,25382,25383,25384,25385,25386,25387,25388,25389,25390,
-25391,25392,25393,25394,25395,25396,25397,25398,25399,25400,25401,25402,
-25403,25404,25405,25406,25407,25408,25409,25410,25411,25412,25413,25414,
-25415,25416,25417,25418,25419,25420,25421,25422,25423,25424,25425,25426,
-25427,25428,25429,25430,25431,25432,25433,25434,25435,25436,25437,25438,
-25439,25440,25441,25442,25443,25444,25445,25446,25447,25448,25449,25450,
-25451,25452,25453,25454,25455,25456,25457,25458,25459,25460,25461,25462,
-25463,25464,25465,25466,25467,25468,25469,25470,25471,25472,25473,25474,
-25475,25476,25477,25478,25479,25480,25481,25482,25483,25484,25485,25486,
-25487,25488,25489,25490,25491,25492,25493,25494,25495,25496,25497,25498,
-25499,25500,25501,25502,25503,25504,25505,25506,25507,25508,25509,25510,
-25511,25512,25513,25514,25515,25516,25517,25518,25519,25520,25521,25522,
-25523,25524,25525,25526,25527,25528,25529,25530,25531,25532,25533,25534,
-25535,25536,25537,25538,25539,25540,25541,25542,25543,25544,25545,25546,
-25547,25548,25549,25550,25551,25552,25553,25554,25555,25556,25557,25558,
-25559,25560,25561,25562,25563,25564,25565,25566,25567,25568,25569,25570,
-25571,25572,25573,25574,25575,25576,25577,25578,25579,25580,25581,25582,
-25583,25584,25585,25586,25587,25588,25589,25590,25591,25592,25593,25594,
-25595,25596,25597,25598,25599,25600,25601,25602,25603,25604,25605,25606,
-25607,25608,25609,25610,25611,25612,25613,25614,25615,25616,25617,25618,
-25619,25620,25621,25622,25623,25624,25625,25626,25627,25628,25629,25630,
-25631,25632,25633,25634,25635,25636,25637,25638,25639,25640,25641,25642,
-25643,25644,25645,25646,25647,25648,25649,25650,25651,25652,25653,25654,
-25655,25656,25657,25658,25659,25660,25661,25662,25663,25664,25665,25666,
-25667,25668,25669,25670,25671,25672,25673,25674,25675,25676,25677,25678,
-25679,25680,25681,25682,25683,25684,25685,25686,25687,25688,25689,25690,
-25691,25692,25693,25694,25695,25696,25697,25698,25699,25700,25701,25702,
-25703,25704,25705,25706,25707,25708,25709,25710,25711,25712,25713,25714,
-25715,25716,25717,25718,25719,25720,25721,25722,25723,25724,25725,25726,
-25727,25728,25729,25730,25731,25732,25733,25734,25735,25736,25737,25738,
-25739,25740,25741,25742,25743,25744,25745,25746,25747,25748,25749,25750,
-25751,25752,25753,25754,25755,25756,25757,25758,25759,25760,25761,25762,
-25763,25764,25765,25766,25767,25768,25769,25770,25771,25772,25773,25774,
-25775,25776,25777,25778,25779,25780,25781,25782,25783,25784,25785,25786,
-25787,25788,25789,25790,25791,25792,25793,25794,25795,25796,25797,25798,
-25799,25800,25801,25802,25803,25804,25805,25806,25807,25808,25809,25810,
-25811,25812,25813,25814,25815,25816,25817,25818,25819,25820,25821,25822,
-25823,25824,25825,25826,25827,25828,25829,25830,25831,25832,25833,25834,
-25835,25836,25837,25838,25839,25840,25841,25842,25843,25844,25845,25846,
-25847,25848,25849,25850,25851,25852,25853,25854,25855,25856,25857,25858,
-25859,25860,25861,25862,25863,25864,25865,25866,25867,25868,25869,25870,
-25871,25872,25873,25874,25875,25876,25877,25878,25879,25880,25881,25882,
-25883,25884,25885,25886,25887,25888,25889,25890,25891,25892,25893,25894,
-25895,25896,25897,25898,25899,25900,25901,25902,25903,25904,25905,25906,
-25907,25908,25909,25910,25911,25912,25913,25914,25915,25916,25917,25918,
-25919,25920,25921,25922,25923,25924,25925,25926,25927,25928,25929,25930,
-25931,25932,25933,25934,25935,25936,25937,25938,25939,25940,25941,25942,
-25943,25944,25945,25946,25947,25948,25949,25950,25951,25952,25953,25954,
-25955,25956,25957,25958,25959,25960,25961,25962,25963,25964,25965,25966,
-25967,25968,25969,25970,25971,25972,25973,25974,25975,25976,25977,25978,
-25979,25980,25981,25982,25983,25984,25985,25986,25987,25988,25989,25990,
-25991,25992,25993,25994,25995,25996,25997,25998,25999,26000,26001,26002,
-26003,26004,26005,26006,26007,26008,26009,26010,26011,26012,26013,26014,
-26015,26016,26017,26018,26019,26020,26021,26022,26023,26024,26025,26026,
-26027,26028,26029,26030,26031,26032,26033,26034,26035,26036,26037,26038,
-26039,26040,26041,26042,26043,26044,26045,26046,26047,26048,26049,26050,
-26051,26052,26053,26054,26055,26056,26057,26058,26059,26060,26061,26062,
-26063,26064,26065,26066,26067,26068,26069,26070,26071,26072,26073,26074,
-26075,26076,26077,26078,26079,26080,26081,26082,26083,26084,26085,26086,
-26087,26088,26089,26090,26091,26092,26093,26094,26095,26096,26097,26098,
-26099,26100,26101,26102,26103,26104,26105,26106,26107,26108,26109,26110,
-26111,26112,26113,26114,26115,26116,26117,26118,26119,26120,26121,26122,
-26123,26124,26125,26126,26127,26128,26129,26130,26131,26132,26133,26134,
-26135,26136,26137,26138,26139,26140,26141,26142,26143,26144,26145,26146,
-26147,26148,26149,26150,26151,26152,26153,26154,26155,26156,26157,26158,
-26159,26160,26161,26162,26163,26164,26165,26166,26167,26168,26169,26170,
-26171,26172,26173,26174,26175,26176,26177,26178,26179,26180,26181,26182,
-26183,26184,26185,26186,26187,26188,26189,26190,26191,26192,26193,26194,
-26195,26196,26197,26198,26199,26200,26201,26202,26203,26204,26205,26206,
-26207,26208,26209,26210,26211,26212,26213,26214,26215,26216,26217,26218,
-26219,26220,26221,26222,26223,26224,26225,26226,26227,26228,26229,26230,
-26231,26232,26233,26234,26235,26236,26237,26238,26239,26240,26241,26242,
-26243,26244,26245,26246,26247,26248,26249,26250,26251,26252,26253,26254,
-26255,26256,26257,26258,26259,26260,26261,26262,26263,26264,26265,26266,
-26267,26268,26269,26270,26271,26272,26273,26274,26275,26276,26277,26278,
-26279,26280,26281,26282,26283,26284,26285,26286,26287,26288,26289,26290,
-26291,26292,26293,26294,26295,26296,26297,26298,26299,26300,26301,26302,
-26303,26304,26305,26306,26307,26308,26309,26310,26311,26312,26313,26314,
-26315,26316,26317,26318,26319,26320,26321,26322,26323,26324,26325,26326,
-26327,26328,26329,26330,26331,26332,26333,26334,26335,26336,26337,26338,
-26339,26340,26341,26342,26343,26344,26345,26346,26347,26348,26349,26350,
-26351,26352,26353,26354,26355,26356,26357,26358,26359,26360,26361,26362,
-26363,26364,26365,26366,26367,26368,26369,26370,26371,26372,26373,26374,
-26375,26376,26377,26378,26379,26380,26381,26382,26383,26384,26385,26386,
-26387,26388,26389,26390,26391,26392,26393,26394,26395,26396,26397,26398,
-26399,26400,26401,26402,26403,26404,26405,26406,26407,26408,26409,26410,
-26411,26412,26413,26414,26415,26416,26417,26418,26419,26420,26421,26422,
-26423,26424,26425,26426,26427,26428,26429,26430,26431,26432,26433,26434,
-26435,26436,26437,26438,26439,26440,26441,26442,26443,26444,26445,26446,
-26447,26448,26449,26450,26451,26452,26453,26454,26455,26456,26457,26458,
-26459,26460,26461,26462,26463,26464,26465,26466,26467,26468,26469,26470,
-26471,26472,26473,26474,26475,26476,26477,26478,26479,26480,26481,26482,
-26483,26484,26485,26486,26487,26488,26489,26490,26491,26492,26493,26494,
-26495,26496,26497,26498,26499,26500,26501,26502,26503,26504,26505,26506,
-26507,26508,26509,26510,26511,26512,26513,26514,26515,26516,26517,26518,
-26519,26520,26521,26522,26523,26524,26525,26526,26527,26528,26529,26530,
-26531,26532,26533,26534,26535,26536,26537,26538,26539,26540,26541,26542,
-26543,26544,26545,26546,26547,26548,26549,26550,26551,26552,26553,26554,
-26555,26556,26557,26558,26559,26560,26561,26562,26563,26564,26565,26566,
-26567,26568,26569,26570,26571,26572,26573,26574,26575,26576,26577,26578,
-26579,26580,26581,26582,26583,26584,26585,26586,26587,26588,26589,26590,
-26591,26592,26593,26594,26595,26596,26597,26598,26599,26600,26601,26602,
-26603,26604,26605,26606,26607,26608,26609,26610,26611,26612,26613,26614,
-26615,26616,26617,26618,26619,26620,26621,26622,26623,26624,26625,26626,
-26627,26628,26629,26630,26631,26632,26633,26634,26635,26636,26637,26638,
-26639,26640,26641,26642,26643,26644,26645,26646,26647,26648,26649,26650,
-26651,26652,26653,26654,26655,26656,26657,26658,26659,26660,26661,26662,
-26663,26664,26665,26666,26667,26668,26669,26670,26671,26672,26673,26674,
-26675,26676,26677,26678,26679,26680,26681,26682,26683,26684,26685,26686,
-26687,26688,26689,26690,26691,26692,26693,26694,26695,26696,26697,26698,
-26699,26700,26701,26702,26703,26704,26705,26706,26707,26708,26709,26710,
-26711,26712,26713,26714,26715,26716,26717,26718,26719,26720,26721,26722,
-26723,26724,26725,26726,26727,26728,26729,26730,26731,26732,26733,26734,
-26735,26736,26737,26738,26739,26740,26741,26742,26743,26744,26745,26746,
-26747,26748,26749,26750,26751,26752,26753,26754,26755,26756,26757,26758,
-26759,26760,26761,26762,26763,26764,26765,26766,26767,26768,26769,26770,
-26771,26772,26773,26774,26775,26776,26777,26778,26779,26780,26781,26782,
-26783,26784,26785,26786,26787,26788,26789,26790,26791,26792,26793,26794,
-26795,26796,26797,26798,26799,26800,26801,26802,26803,26804,26805,26806,
-26807,26808,26809,26810,26811,26812,26813,26814,26815,26816,26817,26818,
-26819,26820,26821,26822,26823,26824,26825,26826,26827,26828,26829,26830,
-26831,26832,26833,26834,26835,26836,26837,26838,26839,26840,26841,26842,
-26843,26844,26845,26846,26847,26848,26849,26850,26851,26852,26853,26854,
-26855,26856,26857,26858,26859,26860,26861,26862,26863,26864,26865,26866,
-26867,26868,26869,26870,26871,26872,26873,26874,26875,26876,26877,26878,
-26879,26880,26881,26882,26883,26884,26885,26886,26887,26888,26889,26890,
-26891,26892,26893,26894,26895,26896,26897,26898,26899,26900,26901,26902,
-26903,26904,26905,26906,26907,26908,26909,26910,26911,26912,26913,26914,
-26915,26916,26917,26918,26919,26920,26921,26922,26923,26924,26925,26926,
-26927,26928,26929,26930,26931,26932,26933,26934,26935,26936,26937,26938,
-26939,26940,26941,26942,26943,26944,26945,26946,26947,26948,26949,26950,
-26951,26952,26953,26954,26955,26956,26957,26958,26959,26960,26961,26962,
-26963,26964,26965,26966,26967,26968,26969,26970,26971,26972,26973,26974,
-26975,26976,26977,26978,26979,26980,26981,26982,26983,26984,26985,26986,
-26987,26988,26989,26990,26991,26992,26993,26994,26995,26996,26997,26998,
-26999,27000,27001,27002,27003,27004,27005,27006,27007,27008,27009,27010,
-27011,27012,27013,27014,27015,27016,27017,27018,27019,27020,27021,27022,
-27023,27024,27025,27026,27027,27028,27029,27030,27031,27032,27033,27034,
-27035,27036,27037,27038,27039,27040,27041,27042,27043,27044,27045,27046,
-27047,27048,27049,27050,27051,27052,27053,27054,27055,27056,27057,27058,
-27059,27060,27061,27062,27063,27064,27065,27066,27067,27068,27069,27070,
-27071,27072,27073,27074,27075,27076,27077,27078,27079,27080,27081,27082,
-27083,27084,27085,27086,27087,27088,27089,27090,27091,27092,27093,27094,
-27095,27096,27097,27098,27099,27100,27101,27102,27103,27104,27105,27106,
-27107,27108,27109,27110,27111,27112,27113,27114,27115,27116,27117,27118,
-27119,27120,27121,27122,27123,27124,27125,27126,27127,27128,27129,27130,
-27131,27132,27133,27134,27135,27136,27137,27138,27139,27140,27141,27142,
-27143,27144,27145,27146,27147,27148,27149,27150,27151,27152,27153,27154,
-27155,27156,27157,27158,27159,27160,27161,27162,27163,27164,27165,27166,
-27167,27168,27169,27170,27171,27172,27173,27174,27175,27176,27177,27178,
-27179,27180,27181,27182,27183,27184,27185,27186,27187,27188,27189,27190,
-27191,27192,27193,27194,27195,27196,27197,27198,27199,27200,27201,27202,
-27203,27204,27205,27206,27207,27208,27209,27210,27211,27212,27213,27214,
-27215,27216,27217,27218,27219,27220,27221,27222,27223,27224,27225,27226,
-27227,27228,27229,27230,27231,27232,27233,27234,27235,27236,27237,27238,
-27239,27240,27241,27242,27243,27244,27245,27246,27247,27248,27249,27250,
-27251,27252,27253,27254,27255,27256,27257,27258,27259,27260,27261,27262,
-27263,27264,27265,27266,27267,27268,27269,27270,27271,27272,27273,27274,
-27275,27276,27277,27278,27279,27280,27281,27282,27283,27284,27285,27286,
-27287,27288,27289,27290,27291,27292,27293,27294,27295,27296,27297,27298,
-27299,27300,27301,27302,27303,27304,27305,27306,27307,27308,27309,27310,
-27311,27312,27313,27314,27315,27316,27317,27318,27319,27320,27321,27322,
-27323,27324,27325,27326,27327,27328,27329,27330,27331,27332,27333,27334,
-27335,27336,27337,27338,27339,27340,27341,27342,27343,27344,27345,27346,
-27347,27348,27349,27350,27351,27352,27353,27354,27355,27356,27357,27358,
-27359,27360,27361,27362,27363,27364,27365,27366,27367,27368,27369,27370,
-27371,27372,27373,27374,27375,27376,27377,27378,27379,27380,27381,27382,
-27383,27384,27385,27386,27387,27388,27389,27390,27391,27392,27393,27394,
-27395,27396,27397,27398,27399,27400,27401,27402,27403,27404,27405,27406,
-27407,27408,27409,27410,27411,27412,27413,27414,27415,27416,27417,27418,
-27419,27420,27421,27422,27423,27424,27425,27426,27427,27428,27429,27430,
-27431,27432,27433,27434,27435,27436,27437,27438,27439,27440,27441,27442,
-27443,27444,27445,27446,27447,27448,27449,27450,27451,27452,27453,27454,
-27455,27456,27457,27458,27459,27460,27461,27462,27463,27464,27465,27466,
-27467,27468,27469,27470,27471,27472,27473,27474,27475,27476,27477,27478,
-27479,27480,27481,27482,27483,27484,27485,27486,27487,27488,27489,27490,
-27491,27492,27493,27494,27495,27496,27497,27498,27499,27500,27501,27502,
-27503,27504,27505,27506,27507,27508,27509,27510,27511,27512,27513,27514,
-27515,27516,27517,27518,27519,27520,27521,27522,27523,27524,27525,27526,
-27527,27528,27529,27530,27531,27532,27533,27534,27535,27536,27537,27538,
-27539,27540,27541,27542,27543,27544,27545,27546,27547,27548,27549,27550,
-27551,27552,27553,27554,27555,27556,27557,27558,27559,27560,27561,27562,
-27563,27564,27565,27566,27567,27568,27569,27570,27571,27572,27573,27574,
-27575,27576,27577,27578,27579,27580,27581,27582,27583,27584,27585,27586,
-27587,27588,27589,27590,27591,27592,27593,27594,27595,27596,27597,27598,
-27599,27600,27601,27602,27603,27604,27605,27606,27607,27608,27609,27610,
-27611,27612,27613,27614,27615,27616,27617,27618,27619,27620,27621,27622,
-27623,27624,27625,27626,27627,27628,27629,27630,27631,27632,27633,27634,
-27635,27636,27637,27638,27639,27640,27641,27642,27643,27644,27645,27646,
-27647,27648,27649,27650,27651,27652,27653,27654,27655,27656,27657,27658,
-27659,27660,27661,27662,27663,27664,27665,27666,27667,27668,27669,27670,
-27671,27672,27673,27674,27675,27676,27677,27678,27679,27680,27681,27682,
-27683,27684,27685,27686,27687,27688,27689,27690,27691,27692,27693,27694,
-27695,27696,27697,27698,27699,27700,27701,27702,27703,27704,27705,27706,
-27707,27708,27709,27710,27711,27712,27713,27714,27715,27716,27717,27718,
-27719,27720,27721,27722,27723,27724,27725,27726,27727,27728,27729,27730,
-27731,27732,27733,27734,27735,27736,27737,27738,27739,27740,27741,27742,
-27743,27744,27745,27746,27747,27748,27749,27750,27751,27752,27753,27754,
-27755,27756,27757,27758,27759,27760,27761,27762,27763,27764,27765,27766,
-27767,27768,27769,27770,27771,27772,27773,27774,27775,27776,27777,27778,
-27779,27780,27781,27782,27783,27784,27785,27786,27787,27788,27789,27790,
-27791,27792,27793,27794,27795,27796,27797,27798,27799,27800,27801,27802,
-27803,27804,27805,27806,27807,27808,27809,27810,27811,27812,27813,27814,
-27815,27816,27817,27818,27819,27820,27821,27822,27823,27824,27825,27826,
-27827,27828,27829,27830,27831,27832,27833,27834,27835,27836,27837,27838,
-27839,27840,27841,27842,27843,27844,27845,27846,27847,27848,27849,27850,
-27851,27852,27853,27854,27855,27856,27857,27858,27859,27860,27861,27862,
-27863,27864,27865,27866,27867,27868,27869,27870,27871,27872,27873,27874,
-27875,27876,27877,27878,27879,27880,27881,27882,27883,27884,27885,27886,
-27887,27888,27889,27890,27891,27892,27893,27894,27895,27896,27897,27898,
-27899,27900,27901,27902,27903,27904,27905,27906,27907,27908,27909,27910,
-27911,27912,27913,27914,27915,27916,27917,27918,27919,27920,27921,27922,
-27923,27924,27925,27926,27927,27928,27929,27930,27931,27932,27933,27934,
-27935,27936,27937,27938,27939,27940,27941,27942,27943,27944,27945,27946,
-27947,27948,27949,27950,27951,27952,27953,27954,27955,27956,27957,27958,
-27959,27960,27961,27962,27963,27964,27965,27966,27967,27968,27969,27970,
-27971,27972,27973,27974,27975,27976,27977,27978,27979,27980,27981,27982,
-27983,27984,27985,27986,27987,27988,27989,27990,27991,27992,27993,27994,
-27995,27996,27997,27998,27999,28000,28001,28002,28003,28004,28005,28006,
-28007,28008,28009,28010,28011,28012,28013,28014,28015,28016,28017,28018,
-28019,28020,28021,28022,28023,28024,28025,28026,28027,28028,28029,28030,
-28031,28032,28033,28034,28035,28036,28037,28038,28039,28040,28041,28042,
-28043,28044,28045,28046,28047,28048,28049,28050,28051,28052,28053,28054,
-28055,28056,28057,28058,28059,28060,28061,28062,28063,28064,28065,28066,
-28067,28068,28069,28070,28071,28072,28073,28074,28075,28076,28077,28078,
-28079,28080,28081,28082,28083,28084,28085,28086,28087,28088,28089,28090,
-28091,28092,28093,28094,28095,28096,28097,28098,28099,28100,28101,28102,
-28103,28104,28105,28106,28107,28108,28109,28110,28111,28112,28113,28114,
-28115,28116,28117,28118,28119,28120,28121,28122,28123,28124,28125,28126,
-28127,28128,28129,28130,28131,28132,28133,28134,28135,28136,28137,28138,
-28139,28140,28141,28142,28143,28144,28145,28146,28147,28148,28149,28150,
-28151,28152,28153,28154,28155,28156,28157,28158,28159,28160,28161,28162,
-28163,28164,28165,28166,28167,28168,28169,28170,28171,28172,28173,28174,
-28175,28176,28177,28178,28179,28180,28181,28182,28183,28184,28185,28186,
-28187,28188,28189,28190,28191,28192,28193,28194,28195,28196,28197,28198,
-28199,28200,28201,28202,28203,28204,28205,28206,28207,28208,28209,28210,
-28211,28212,28213,28214,28215,28216,28217,28218,28219,28220,28221,28222,
-28223,28224,28225,28226,28227,28228,28229,28230,28231,28232,28233,28234,
-28235,28236,28237,28238,28239,28240,28241,28242,28243,28244,28245,28246,
-28247,28248,28249,28250,28251,28252,28253,28254,28255,28256,28257,28258,
-28259,28260,28261,28262,28263,28264,28265,28266,28267,28268,28269,28270,
-28271,28272,28273,28274,28275,28276,28277,28278,28279,28280,28281,28282,
-28283,28284,28285,28286,28287,28288,28289,28290,28291,28292,28293,28294,
-28295,28296,28297,28298,28299,28300,28301,28302,28303,28304,28305,28306,
-28307,28308,28309,28310,28311,28312,28313,28314,28315,28316,28317,28318,
-28319,28320,28321,28322,28323,28324,28325,28326,28327,28328,28329,28330,
-28331,28332,28333,28334,28335,28336,28337,28338,28339,28340,28341,28342,
-28343,28344,28345,28346,28347,28348,28349,28350,28351,28352,28353,28354,
-28355,28356,28357,28358,28359,28360,28361,28362,28363,28364,28365,28366,
-28367,28368,28369,28370,28371,28372,28373,28374,28375,28376,28377,28378,
-28379,28380,28381,28382,28383,28384,28385,28386,28387,28388,28389,28390,
-28391,28392,28393,28394,28395,28396,28397,28398,28399,28400,28401,28402,
-28403,28404,28405,28406,28407,28408,28409,28410,28411,28412,28413,28414,
-28415,28416,28417,28418,28419,28420,28421,28422,28423,28424,28425,28426,
-28427,28428,28429,28430,28431,28432,28433,28434,28435,28436,28437,28438,
-28439,28440,28441,28442,28443,28444,28445,28446,28447,28448,28449,28450,
-28451,28452,28453,28454,28455,28456,28457,28458,28459,28460,28461,28462,
-28463,28464,28465,28466,28467,28468,28469,28470,28471,28472,28473,28474,
-28475,28476,28477,28478,28479,28480,28481,28482,28483,28484,28485,28486,
-28487,28488,28489,28490,28491,28492,28493,28494,28495,28496,28497,28498,
-28499,28500,28501,28502,28503,28504,28505,28506,28507,28508,28509,28510,
-28511,28512,28513,28514,28515,28516,28517,28518,28519,28520,28521,28522,
-28523,28524,28525,28526,28527,28528,28529,28530,28531,28532,28533,28534,
-28535,28536,28537,28538,28539,28540,28541,28542,28543,28544,28545,28546,
-28547,28548,28549,28550,28551,28552,28553,28554,28555,28556,28557,28558,
-28559,28560,28561,28562,28563,28564,28565,28566,28567,28568,28569,28570,
-28571,28572,28573,28574,28575,28576,28577,28578,28579,28580,28581,28582,
-28583,28584,28585,28586,28587,28588,28589,28590,28591,28592,28593,28594,
-28595,28596,28597,28598,28599,28600,28601,28602,28603,28604,28605,28606,
-28607,28608,28609,28610,28611,28612,28613,28614,28615,28616,28617,28618,
-28619,28620,28621,28622,28623,28624,28625,28626,28627,28628,28629,28630,
-28631,28632,28633,28634,28635,28636,28637,28638,28639,28640,28641,28642,
-28643,28644,28645,28646,28647,28648,28649,28650,28651,28652,28653,28654,
-28655,28656,28657,28658,28659,28660,28661,28662,28663,28664,28665,28666,
-28667,28668,28669,28670,28671,28672,28673,28674,28675,28676,28677,28678,
-28679,28680,28681,28682,28683,28684,28685,28686,28687,28688,28689,28690,
-28691,28692,28693,28694,28695,28696,28697,28698,28699,28700,28701,28702,
-28703,28704,28705,28706,28707,28708,28709,28710,28711,28712,28713,28714,
-28715,28716,28717,28718,28719,28720,28721,28722,28723,28724,28725,28726,
-28727,28728,28729,28730,28731,28732,28733,28734,28735,28736,28737,28738,
-28739,28740,28741,28742,28743,28744,28745,28746,28747,28748,28749,28750,
-28751,28752,28753,28754,28755,28756,28757,28758,28759,28760,28761,28762,
-28763,28764,28765,28766,28767,28768,28769,28770,28771,28772,28773,28774,
-28775,28776,28777,28778,28779,28780,28781,28782,28783,28784,28785,28786,
-28787,28788,28789,28790,28791,28792,28793,28794,28795,28796,28797,28798,
-28799,28800,28801,28802,28803,28804,28805,28806,28807,28808,28809,28810,
-28811,28812,28813,28814,28815,28816,28817,28818,28819,28820,28821,28822,
-28823,28824,28825,28826,28827,28828,28829,28830,28831,28832,28833,28834,
-28835,28836,28837,28838,28839,28840,28841,28842,28843,28844,28845,28846,
-28847,28848,28849,28850,28851,28852,28853,28854,28855,28856,28857,28858,
-28859,28860,28861,28862,28863,28864,28865,28866,28867,28868,28869,28870,
-28871,28872,28873,28874,28875,28876,28877,28878,28879,28880,28881,28882,
-28883,28884,28885,28886,28887,28888,28889,28890,28891,28892,28893,28894,
-28895,28896,28897,28898,28899,28900,28901,28902,28903,28904,28905,28906,
-28907,28908,28909,28910,28911,28912,28913,28914,28915,28916,28917,28918,
-28919,28920,28921,28922,28923,28924,28925,28926,28927,28928,28929,28930,
-28931,28932,28933,28934,28935,28936,28937,28938,28939,28940,28941,28942,
-28943,28944,28945,28946,28947,28948,28949,28950,28951,28952,28953,28954,
-28955,28956,28957,28958,28959,28960,28961,28962,28963,28964,28965,28966,
-28967,28968,28969,28970,28971,28972,28973,28974,28975,28976,28977,28978,
-28979,28980,28981,28982,28983,28984,28985,28986,28987,28988,28989,28990,
-28991,28992,28993,28994,28995,28996,28997,28998,28999,29000,29001,29002,
-29003,29004,29005,29006,29007,29008,29009,29010,29011,29012,29013,29014,
-29015,29016,29017,29018,29019,29020,29021,29022,29023,29024,29025,29026,
-29027,29028,29029,29030,29031,29032,29033,29034,29035,29036,29037,29038,
-29039,29040,29041,29042,29043,29044,29045,29046,29047,29048,29049,29050,
-29051,29052,29053,29054,29055,29056,29057,29058,29059,29060,29061,29062,
-29063,29064,29065,29066,29067,29068,29069,29070,29071,29072,29073,29074,
-29075,29076,29077,29078,29079,29080,29081,29082,29083,29084,29085,29086,
-29087,29088,29089,29090,29091,29092,29093,29094,29095,29096,29097,29098,
-29099,29100,29101,29102,29103,29104,29105,29106,29107,29108,29109,29110,
-29111,29112,29113,29114,29115,29116,29117,29118,29119,29120,29121,29122,
-29123,29124,29125,29126,29127,29128,29129,29130,29131,29132,29133,29134,
-29135,29136,29137,29138,29139,29140,29141,29142,29143,29144,29145,29146,
-29147,29148,29149,29150,29151,29152,29153,29154,29155,29156,29157,29158,
-29159,29160,29161,29162,29163,29164,29165,29166,29167,29168,29169,29170,
-29171,29172,29173,29174,29175,29176,29177,29178,29179,29180,29181,29182,
-29183,29184,29185,29186,29187,29188,29189,29190,29191,29192,29193,29194,
-29195,29196,29197,29198,29199,29200,29201,29202,29203,29204,29205,29206,
-29207,29208,29209,29210,29211,29212,29213,29214,29215,29216,29217,29218,
-29219,29220,29221,29222,29223,29224,29225,29226,29227,29228,29229,29230,
-29231,29232,29233,29234,29235,29236,29237,29238,29239,29240,29241,29242,
-29243,29244,29245,29246,29247,29248,29249,29250,29251,29252,29253,29254,
-29255,29256,29257,29258,29259,29260,29261,29262,29263,29264,29265,29266,
-29267,29268,29269,29270,29271,29272,29273,29274,29275,29276,29277,29278,
-29279,29280,29281,29282,29283,29284,29285,29286,29287,29288,29289,29290,
-29291,29292,29293,29294,29295,29296,29297,29298,29299,29300,29301,29302,
-29303,29304,29305,29306,29307,29308,29309,29310,29311,29312,29313,29314,
-29315,29316,29317,29318,29319,29320,29321,29322,29323,29324,29325,29326,
-29327,29328,29329,29330,29331,29332,29333,29334,29335,29336,29337,29338,
-29339,29340,29341,29342,29343,29344,29345,29346,29347,29348,29349,29350,
-29351,29352,29353,29354,29355,29356,29357,29358,29359,29360,29361,29362,
-29363,29364,29365,29366,29367,29368,29369,29370,29371,29372,29373,29374,
-29375,29376,29377,29378,29379,29380,29381,29382,29383,29384,29385,29386,
-29387,29388,29389,29390,29391,29392,29393,29394,29395,29396,29397,29398,
-29399,29400,29401,29402,29403,29404,29405,29406,29407,29408,29409,29410,
-29411,29412,29413,29414,29415,29416,29417,29418,29419,29420,29421,29422,
-29423,29424,29425,29426,29427,29428,29429,29430,29431,29432,29433,29434,
-29435,29436,29437,29438,29439,29440,29441,29442,29443,29444,29445,29446,
-29447,29448,29449,29450,29451,29452,29453,29454,29455,29456,29457,29458,
-29459,29460,29461,29462,29463,29464,29465,29466,29467,29468,29469,29470,
-29471,29472,29473,29474,29475,29476,29477,29478,29479,29480,29481,29482,
-29483,29484,29485,29486,29487,29488,29489,29490,29491,29492,29493,29494,
-29495,29496,29497,29498,29499,29500,29501,29502,29503,29504,29505,29506,
-29507,29508,29509,29510,29511,29512,29513,29514,29515,29516,29517,29518,
-29519,29520,29521,29522,29523,29524,29525,29526,29527,29528,29529,29530,
-29531,29532,29533,29534,29535,29536,29537,29538,29539,29540,29541,29542,
-29543,29544,29545,29546,29547,29548,29549,29550,29551,29552,29553,29554,
-29555,29556,29557,29558,29559,29560,29561,29562,29563,29564,29565,29566,
-29567,29568,29569,29570,29571,29572,29573,29574,29575,29576,29577,29578,
-29579,29580,29581,29582,29583,29584,29585,29586,29587,29588,29589,29590,
-29591,29592,29593,29594,29595,29596,29597,29598,29599,29600,29601,29602,
-29603,29604,29605,29606,29607,29608,29609,29610,29611,29612,29613,29614,
-29615,29616,29617,29618,29619,29620,29621,29622,29623,29624,29625,29626,
-29627,29628,29629,29630,29631,29632,29633,29634,29635,29636,29637,29638,
-29639,29640,29641,29642,29643,29644,29645,29646,29647,29648,29649,29650,
-29651,29652,29653,29654,29655,29656,29657,29658,29659,29660,29661,29662,
-29663,29664,29665,29666,29667,29668,29669,29670,29671,29672,29673,29674,
-29675,29676,29677,29678,29679,29680,29681,29682,29683,29684,29685,29686,
-29687,29688,29689,29690,29691,29692,29693,29694,29695,29696,29697,29698,
-29699,29700,29701,29702,29703,29704,29705,29706,29707,29708,29709,29710,
-29711,29712,29713,29714,29715,29716,29717,29718,29719,29720,29721,29722,
-29723,29724,29725,29726,29727,29728,29729,29730,29731,29732,29733,29734,
-29735,29736,29737,29738,29739,29740,29741,29742,29743,29744,29745,29746,
-29747,29748,29749,29750,29751,29752,29753,29754,29755,29756,29757,29758,
-29759,29760,29761,29762,29763,29764,29765,29766,29767,29768,29769,29770,
-29771,29772,29773,29774,29775,29776,29777,29778,29779,29780,29781,29782,
-29783,29784,29785,29786,29787,29788,29789,29790,29791,29792,29793,29794,
-29795,29796,29797,29798,29799,29800,29801,29802,29803,29804,29805,29806,
-29807,29808,29809,29810,29811,29812,29813,29814,29815,29816,29817,29818,
-29819,29820,29821,29822,29823,29824,29825,29826,29827,29828,29829,29830,
-29831,29832,29833,29834,29835,29836,29837,29838,29839,29840,29841,29842,
-29843,29844,29845,29846,29847,29848,29849,29850,29851,29852,29853,29854,
-29855,29856,29857,29858,29859,29860,29861,29862,29863,29864,29865,29866,
-29867,29868,29869,29870,29871,29872,29873,29874,29875,29876,29877,29878,
-29879,29880,29881,29882,29883,29884,29885,29886,29887,29888,29889,29890,
-29891,29892,29893,29894,29895,29896,29897,29898,29899,29900,29901,29902,
-29903,29904,29905,29906,29907,29908,29909,29910,29911,29912,29913,29914,
-29915,29916,29917,29918,29919,29920,29921,29922,29923,29924,29925,29926,
-29927,29928,29929,29930,29931,29932,29933,29934,29935,29936,29937,29938,
-29939,29940,29941,29942,29943,29944,29945,29946,29947,29948,29949,29950,
-29951,29952,29953,29954,29955,29956,29957,29958,29959,29960,29961,29962,
-29963,29964,29965,29966,29967,29968,29969,29970,29971,29972,29973,29974,
-29975,29976,29977,29978,29979,29980,29981,29982,29983,29984,29985,29986,
-29987,29988,29989,29990,29991,29992,29993,29994,29995,29996,29997,29998,
-29999,30000,30001,30002,30003,30004,30005,30006,30007,30008,30009,30010,
-30011,30012,30013,30014,30015,30016,30017,30018,30019,30020,30021,30022,
-30023,30024,30025,30026,30027,30028,30029,30030,30031,30032,30033,30034,
-30035,30036,30037,30038,30039,30040,30041,30042,30043,30044,30045,30046,
-30047,30048,30049,30050,30051,30052,30053,30054,30055,30056,30057,30058,
-30059,30060,30061,30062,30063,30064,30065,30066,30067,30068,30069,30070,
-30071,30072,30073,30074,30075,30076,30077,30078,30079,30080,30081,30082,
-30083,30084,30085,30086,30087,30088,30089,30090,30091,30092,30093,30094,
-30095,30096,30097,30098,30099,30100,30101,30102,30103,30104,30105,30106,
-30107,30108,30109,30110,30111,30112,30113,30114,30115,30116,30117,30118,
-30119,30120,30121,30122,30123,30124,30125,30126,30127,30128,30129,30130,
-30131,30132,30133,30134,30135,30136,30137,30138,30139,30140,30141,30142,
-30143,30144,30145,30146,30147,30148,30149,30150,30151,30152,30153,30154,
-30155,30156,30157,30158,30159,30160,30161,30162,30163,30164,30165,30166,
-30167,30168,30169,30170,30171,30172,30173,30174,30175,30176,30177,30178,
-30179,30180,30181,30182,30183,30184,30185,30186,30187,30188,30189,30190,
-30191,30192,30193,30194,30195,30196,30197,30198,30199,30200,30201,30202,
-30203,30204,30205,30206,30207,30208,30209,30210,30211,30212,30213,30214,
-30215,30216,30217,30218,30219,30220,30221,30222,30223,30224,30225,30226,
-30227,30228,30229,30230,30231,30232,30233,30234,30235,30236,30237,30238,
-30239,30240,30241,30242,30243,30244,30245,30246,30247,30248,30249,30250,
-30251,30252,30253,30254,30255,30256,30257,30258,30259,30260,30261,30262,
-30263,30264,30265,30266,30267,30268,30269,30270,30271,30272,30273,30274,
-30275,30276,30277,30278,30279,30280,30281,30282,30283,30284,30285,30286,
-30287,30288,30289,30290,30291,30292,30293,30294,30295,30296,30297,30298,
-30299,30300,30301,30302,30303,30304,30305,30306,30307,30308,30309,30310,
-30311,30312,30313,30314,30315,30316,30317,30318,30319,30320,30321,30322,
-30323,30324,30325,30326,30327,30328,30329,30330,30331,30332,30333,30334,
-30335,30336,30337,30338,30339,30340,30341,30342,30343,30344,30345,30346,
-30347,30348,30349,30350,30351,30352,30353,30354,30355,30356,30357,30358,
-30359,30360,30361,30362,30363,30364,30365,30366,30367,30368,30369,30370,
-30371,30372,30373,30374,30375,30376,30377,30378,30379,30380,30381,30382,
-30383,30384,30385,30386,30387,30388,30389,30390,30391,30392,30393,30394,
-30395,30396,30397,30398,30399,30400,30401,30402,30403,30404,30405,30406,
-30407,30408,30409,30410,30411,30412,30413,30414,30415,30416,30417,30418,
-30419,30420,30421,30422,30423,30424,30425,30426,30427,30428,30429,30430,
-30431,30432,30433,30434,30435,30436,30437,30438,30439,30440,30441,30442,
-30443,30444,30445,30446,30447,30448,30449,30450,30451,30452,30453,30454,
-30455,30456,30457,30458,30459,30460,30461,30462,30463,30464,30465,30466,
-30467,30468,30469,30470,30471,30472,30473,30474,30475,30476,30477,30478,
-30479,30480,30481,30482,30483,30484,30485,30486,30487,30488,30489,30490,
-30491,30492,30493,30494,30495,30496,30497,30498,30499,30500,30501,30502,
-30503,30504,30505,30506,30507,30508,30509,30510,30511,30512,30513,30514,
-30515,30516,30517,30518,30519,30520,30521,30522,30523,30524,30525,30526,
-30527,30528,30529,30530,30531,30532,30533,30534,30535,30536,30537,30538,
-30539,30540,30541,30542,30543,30544,30545,30546,30547,30548,30549,30550,
-30551,30552,30553,30554,30555,30556,30557,30558,30559,30560,30561,30562,
-30563,30564,30565,30566,30567,30568,30569,30570,30571,30572,30573,30574,
-30575,30576,30577,30578,30579,30580,30581,30582,30583,30584,30585,30586,
-30587,30588,30589,30590,30591,30592,30593,30594,30595,30596,30597,30598,
-30599,30600,30601,30602,30603,30604,30605,30606,30607,30608,30609,30610,
-30611,30612,30613,30614,30615,30616,30617,30618,30619,30620,30621,30622,
-30623,30624,30625,30626,30627,30628,30629,30630,30631,30632,30633,30634,
-30635,30636,30637,30638,30639,30640,30641,30642,30643,30644,30645,30646,
-30647,30648,30649,30650,30651,30652,30653,30654,30655,30656,30657,30658,
-30659,30660,30661,30662,30663,30664,30665,30666,30667,30668,30669,30670,
-30671,30672,30673,30674,30675,30676,30677,30678,30679,30680,30681,30682,
-30683,30684,30685,30686,30687,30688,30689,30690,30691,30692,30693,30694,
-30695,30696,30697,30698,30699,30700,30701,30702,30703,30704,30705,30706,
-30707,30708,30709,30710,30711,30712,30713,30714,30715,30716,30717,30718,
-30719,30720,30721,30722,30723,30724,30725,30726,30727,30728,30729,30730,
-30731,30732,30733,30734,30735,30736,30737,30738,30739,30740,30741,30742,
-30743,30744,30745,30746,30747,30748,30749,30750,30751,30752,30753,30754,
-30755,30756,30757,30758,30759,30760,30761,30762,30763,30764,30765,30766,
-30767,30768,30769,30770,30771,30772,30773,30774,30775,30776,30777,30778,
-30779,30780,30781,30782,30783,30784,30785,30786,30787,30788,30789,30790,
-30791,30792,30793,30794,30795,30796,30797,30798,30799,30800,30801,30802,
-30803,30804,30805,30806,30807,30808,30809,30810,30811,30812,30813,30814,
-30815,30816,30817,30818,30819,30820,30821,30822,30823,30824,30825,30826,
-30827,30828,30829,30830,30831,30832,30833,30834,30835,30836,30837,30838,
-30839,30840,30841,30842,30843,30844,30845,30846,30847,30848,30849,30850,
-30851,30852,30853,30854,30855,30856,30857,30858,30859,30860,30861,30862,
-30863,30864,30865,30866,30867,30868,30869,30870,30871,30872,30873,30874,
-30875,30876,30877,30878,30879,30880,30881,30882,30883,30884,30885,30886,
-30887,30888,30889,30890,30891,30892,30893,30894,30895,30896,30897,30898,
-30899,30900,30901,30902,30903,30904,30905,30906,30907,30908,30909,30910,
-30911,30912,30913,30914,30915,30916,30917,30918,30919,30920,30921,30922,
-30923,30924,30925,30926,30927,30928,30929,30930,30931,30932,30933,30934,
-30935,30936,30937,30938,30939,30940,30941,30942,30943,30944,30945,30946,
-30947,30948,30949,30950,30951,30952,30953,30954,30955,30956,30957,30958,
-30959,30960,30961,30962,30963,30964,30965,30966,30967,30968,30969,30970,
-30971,30972,30973,30974,30975,30976,30977,30978,30979,30980,30981,30982,
-30983,30984,30985,30986,30987,30988,30989,30990,30991,30992,30993,30994,
-30995,30996,30997,30998,30999,31000,31001,31002,31003,31004,31005,31006,
-31007,31008,31009,31010,31011,31012,31013,31014,31015,31016,31017,31018,
-31019,31020,31021,31022,31023,31024,31025,31026,31027,31028,31029,31030,
-31031,31032,31033,31034,31035,31036,31037,31038,31039,31040,31041,31042,
-31043,31044,31045,31046,31047,31048,31049,31050,31051,31052,31053,31054,
-31055,31056,31057,31058,31059,31060,31061,31062,31063,31064,31065,31066,
-31067,31068,31069,31070,31071,31072,31073,31074,31075,31076,31077,31078,
-31079,31080,31081,31082,31083,31084,31085,31086,31087,31088,31089,31090,
-31091,31092,31093,31094,31095,31096,31097,31098,31099,31100,31101,31102,
-31103,31104,31105,31106,31107,31108,31109,31110,31111,31112,31113,31114,
-31115,31116,31117,31118,31119,31120,31121,31122,31123,31124,31125,31126,
-31127,31128,31129,31130,31131,31132,31133,31134,31135,31136,31137,31138,
-31139,31140,31141,31142,31143,31144,31145,31146,31147,31148,31149,31150,
-31151,31152,31153,31154,31155,31156,31157,31158,31159,31160,31161,31162,
-31163,31164,31165,31166,31167,31168,31169,31170,31171,31172,31173,31174,
-31175,31176,31177,31178,31179,31180,31181,31182,31183,31184,31185,31186,
-31187,31188,31189,31190,31191,31192,31193,31194,31195,31196,31197,31198,
-31199,31200,31201,31202,31203,31204,31205,31206,31207,31208,31209,31210,
-31211,31212,31213,31214,31215,31216,31217,31218,31219,31220,31221,31222,
-31223,31224,31225,31226,31227,31228,31229,31230,31231,31232,31233,31234,
-31235,31236,31237,31238,31239,31240,31241,31242,31243,31244,31245,31246,
-31247,31248,31249,31250,31251,31252,31253,31254,31255,31256,31257,31258,
-31259,31260,31261,31262,31263,31264,31265,31266,31267,31268,31269,31270,
-31271,31272,31273,31274,31275,31276,31277,31278,31279,31280,31281,31282,
-31283,31284,31285,31286,31287,31288,31289,31290,31291,31292,31293,31294,
-31295,31296,31297,31298,31299,31300,31301,31302,31303,31304,31305,31306,
-31307,31308,31309,31310,31311,31312,31313,31314,31315,31316,31317,31318,
-31319,31320,31321,31322,31323,31324,31325,31326,31327,31328,31329,31330,
-31331,31332,31333,31334,31335,31336,31337,31338,31339,31340,31341,31342,
-31343,31344,31345,31346,31347,31348,31349,31350,31351,31352,31353,31354,
-31355,31356,31357,31358,31359,31360,31361,31362,31363,31364,31365,31366,
-31367,31368,31369,31370,31371,31372,31373,31374,31375,31376,31377,31378,
-31379,31380,31381,31382,31383,31384,31385,31386,31387,31388,31389,31390,
-31391,31392,31393,31394,31395,31396,31397,31398,31399,31400,31401,31402,
-31403,31404,31405,31406,31407,31408,31409,31410,31411,31412,31413,31414,
-31415,31416,31417,31418,31419,31420,31421,31422,31423,31424,31425,31426,
-31427,31428,31429,31430,31431,31432,31433,31434,31435,31436,31437,31438,
-31439,31440,31441,31442,31443,31444,31445,31446,31447,31448,31449,31450,
-31451,31452,31453,31454,31455,31456,31457,31458,31459,31460,31461,31462,
-31463,31464,31465,31466,31467,31468,31469,31470,31471,31472,31473,31474,
-31475,31476,31477,31478,31479,31480,31481,31482,31483,31484,31485,31486,
-31487,31488,31489,31490,31491,31492,31493,31494,31495,31496,31497,31498,
-31499,31500,31501,31502,31503,31504,31505,31506,31507,31508,31509,31510,
-31511,31512,31513,31514,31515,31516,31517,31518,31519,31520,31521,31522,
-31523,31524,31525,31526,31527,31528,31529,31530,31531,31532,31533,31534,
-31535,31536,31537,31538,31539,31540,31541,31542,31543,31544,31545,31546,
-31547,31548,31549,31550,31551,31552,31553,31554,31555,31556,31557,31558,
-31559,31560,31561,31562,31563,31564,31565,31566,31567,31568,31569,31570,
-31571,31572,31573,31574,31575,31576,31577,31578,31579,31580,31581,31582,
-31583,31584,31585,31586,31587,31588,31589,31590,31591,31592,31593,31594,
-31595,31596,31597,31598,31599,31600,31601,31602,31603,31604,31605,31606,
-31607,31608,31609,31610,31611,31612,31613,31614,31615,31616,31617,31618,
-31619,31620,31621,31622,31623,31624,31625,31626,31627,31628,31629,31630,
-31631,31632,31633,31634,31635,31636,31637,31638,31639,31640,31641,31642,
-31643,31644,31645,31646,31647,31648,31649,31650,31651,31652,31653,31654,
-31655,31656,31657,31658,31659,31660,31661,31662,31663,31664,31665,31666,
-31667,31668,31669,31670,31671,31672,31673,31674,31675,31676,31677,31678,
-31679,31680,31681,31682,31683,31684,31685,31686,31687,31688,31689,31690,
-31691,31692,31693,31694,31695,31696,31697,31698,31699,31700,31701,31702,
-31703,31704,31705,31706,31707,31708,31709,31710,31711,31712,31713,31714,
-31715,31716,31717,31718,31719,31720,31721,31722,31723,31724,31725,31726,
-31727,31728,31729,31730,31731,31732,31733,31734,31735,31736,31737,31738,
-31739,31740,31741,31742,31743,31744,31745,31746,31747,31748,31749,31750,
-31751,31752,31753,31754,31755,31756,31757,31758,31759,31760,31761,31762,
-31763,31764,31765,31766,31767,31768,31769,31770,31771,31772,31773,31774,
-31775,31776,31777,31778,31779,31780,31781,31782,31783,31784,31785,31786,
-31787,31788,31789,31790,31791,31792,31793,31794,31795,31796,31797,31798,
-31799,31800,31801,31802,31803,31804,31805,31806,31807,31808,31809,31810,
-31811,31812,31813,31814,31815,31816,31817,31818,31819,31820,31821,31822,
-31823,31824,31825,31826,31827,31828,31829,31830,31831,31832,31833,31834,
-31835,31836,31837,31838,31839,31840,31841,31842,31843,31844,31845,31846,
-31847,31848,31849,31850,31851,31852,31853,31854,31855,31856,31857,31858,
-31859,31860,31861,31862,31863,31864,31865,31866,31867,31868,31869,31870,
-31871,31872,31873,31874,31875,31876,31877,31878,31879,31880,31881,31882,
-31883,31884,31885,31886,31887,31888,31889,31890,31891,31892,31893,31894,
-31895,31896,31897,31898,31899,31900,31901,31902,31903,31904,31905,31906,
-31907,31908,31909,31910,31911,31912,31913,31914,31915,31916,31917,31918,
-31919,31920,31921,31922,31923,31924,31925,31926,31927,31928,31929,31930,
-31931,31932,31933,31934,31935,31936,31937,31938,31939,31940,31941,31942,
-31943,31944,31945,31946,31947,31948,31949,31950,31951,31952,31953,31954,
-31955,31956,31957,31958,31959,31960,31961,31962,31963,31964,31965,31966,
-31967,31968,31969,31970,31971,31972,31973,31974,31975,31976,31977,31978,
-31979,31980,31981,31982,31983,31984,31985,31986,31987,31988,31989,31990,
-31991,31992,31993,31994,31995,31996,31997,31998,31999,32000,32001,32002,
-32003,32004,32005,32006,32007,32008,32009,32010,32011,32012,32013,32014,
-32015,32016,32017,32018,32019,32020,32021,32022,32023,32024,32025,32026,
-32027,32028,32029,32030,32031,32032,32033,32034,32035,32036,32037,32038,
-32039,32040,32041,32042,32043,32044,32045,32046,32047,32048,32049,32050,
-32051,32052,32053,32054,32055,32056,32057,32058,32059,32060,32061,32062,
-32063,32064,32065,32066,32067,32068,32069,32070,32071,32072,32073,32074,
-32075,32076,32077,32078,32079,32080,32081,32082,32083,32084,32085,32086,
-32087,32088,32089,32090,32091,32092,32093,32094,32095,32096,32097,32098,
-32099,32100,32101,32102,32103,32104,32105,32106,32107,32108,32109,32110,
-32111,32112,32113,32114,32115,32116,32117,32118,32119,32120,32121,32122,
-32123,32124,32125,32126,32127,32128,32129,32130,32131,32132,32133,32134,
-32135,32136,32137,32138,32139,32140,32141,32142,32143,32144,32145,32146,
-32147,32148,32149,32150,32151,32152,32153,32154,32155,32156,32157,32158,
-32159,32160,32161,32162,32163,32164,32165,32166,32167,32168,32169,32170,
-32171,32172,32173,32174,32175,32176,32177,32178,32179,32180,32181,32182,
-32183,32184,32185,32186,32187,32188,32189,32190,32191,32192,32193,32194,
-32195,32196,32197,32198,32199,32200,32201,32202,32203,32204,32205,32206,
-32207,32208,32209,32210,32211,32212,32213,32214,32215,32216,32217,32218,
-32219,32220,32221,32222,32223,32224,32225,32226,32227,32228,32229,32230,
-32231,32232,32233,32234,32235,32236,32237,32238,32239,32240,32241,32242,
-32243,32244,32245,32246,32247,32248,32249,32250,32251,32252,32253,32254,
-32255,32256,32257,32258,32259,32260,32261,32262,32263,32264,32265,32266,
-32267,32268,32269,32270,32271,32272,32273,32274,32275,32276,32277,32278,
-32279,32280,32281,32282,32283,32284,32285,32286,32287,32288,32289,32290,
-32291,32292,32293,32294,32295,32296,32297,32298,32299,32300,32301,32302,
-32303,32304,32305,32306,32307,32308,32309,32310,32311,32312,32313,32314,
-32315,32316,32317,32318,32319,32320,32321,32322,32323,32324,32325,32326,
-32327,32328,32329,32330,32331,32332,32333,32334,32335,32336,32337,32338,
-32339,32340,32341,32342,32343,32344,32345,32346,32347,32348,32349,32350,
-32351,32352,32353,32354,32355,32356,32357,32358,32359,32360,32361,32362,
-32363,32364,32365,32366,32367,32368,32369,32370,32371,32372,32373,32374,
-32375,32376,32377,32378,32379,32380,32381,32382,32383,32384,32385,32386,
-32387,32388,32389,32390,32391,32392,32393,32394,32395,32396,32397,32398,
-32399,32400,32401,32402,32403,32404,32405,32406,32407,32408,32409,32410,
-32411,32412,32413,32414,32415,32416,32417,32418,32419,32420,32421,32422,
-32423,32424,32425,32426,32427,32428,32429,32430,32431,32432,32433,32434,
-32435,32436,32437,32438,32439,32440,32441,32442,32443,32444,32445,32446,
-32447,32448,32449,32450,32451,32452,32453,32454,32455,32456,32457,32458,
-32459,32460,32461,32462,32463,32464,32465,32466,32467,32468,32469,32470,
-32471,32472,32473,32474,32475,32476,32477,32478,32479,32480,32481,32482,
-32483,32484,32485,32486,32487,32488,32489,32490,32491,32492,32493,32494,
-32495,32496,32497,32498,32499,32500,32501,32502,32503,32504,32505,32506,
-32507,32508,32509,32510,32511,32512,32513,32514,32515,32516,32517,32518,
-32519,32520,32521,32522,32523,32524,32525,32526,32527,32528,32529,32530,
-32531,32532,32533,32534,32535,32536,32537,32538,32539,32540,32541,32542,
-32543,32544,32545,32546,32547,32548,32549,32550,32551,32552,32553,32554,
-32555,32556,32557,32558,32559,32560,32561,32562,32563,32564,32565,32566,
-32567,32568,32569,32570,32571,32572,32573,32574,32575,32576,32577,32578,
-32579,32580,32581,32582,32583,32584,32585,32586,32587,32588,32589,32590,
-32591,32592,32593,32594,32595,32596,32597,32598,32599,32600,32601,32602,
-32603,32604,32605,32606,32607,32608,32609,32610,32611,32612,32613,32614,
-32615,32616,32617,32618,32619,32620,32621,32622,32623,32624,32625,32626,
-32627,32628,32629,32630,32631,32632,32633,32634,32635,32636,32637,32638,
-32639,32640,32641,32642,32643,32644,32645,32646,32647,32648,32649,32650,
-32651,32652,32653,32654,32655,32656,32657,32658,32659,32660,32661,32662,
-32663,32664,32665,32666,32667,32668,32669,32670,32671,32672,32673,32674,
-32675,32676,32677,32678,32679,32680,32681,32682,32683,32684,32685,32686,
-32687,32688,32689,32690,32691,32692,32693,32694,32695,32696,32697,32698,
-32699,32700,32701,32702,32703,32704,32705,32706,32707,32708,32709,32710,
-32711,32712,32713,32714,32715,32716,32717,32718,32719,32720,32721,32722,
-32723,32724,32725,32726,32727,32728,32729,32730,32731,32732,32733,32734,
-32735,32736,32737,32738,32739,32740,32741,32742,32743,32744,32745,32746,
-32747,32748,32749,32750,32751,32752,32753,32754,32755,32756,32757,32758,
-32759,32760,32761,32762,32763,32764,32765,32766,32767,32768L,32769L,32770L,
-32771L,32772L,32773L,32774L,32775L,32776L,32777L,32778L,32779L,32780L,
-32781L,32782L,32783L,32784L,32785L,32786L,32787L,32788L,32789L,32790L,
-32791L,32792L,32793L,32794L,32795L,32796L,32797L,32798L,32799L,32800L,
-32801L,32802L,32803L,32804L,32805L,32806L,32807L,32808L,32809L,32810L,
-32811L,32812L,32813L,32814L,32815L,32816L,32817L,32818L,32819L,32820L,
-32821L,32822L,32823L,32824L,32825L,32826L,32827L,32828L,32829L,32830L,
-32831L,32832L,32833L,32834L,32835L,32836L,32837L,32838L,32839L,32840L,
-32841L,32842L,32843L,32844L,32845L,32846L,32847L,32848L,32849L,32850L,
-32851L,32852L,32853L,32854L,32855L,32856L,32857L,32858L,32859L,32860L,
-32861L,32862L,32863L,32864L,32865L,32866L,32867L,32868L,32869L,32870L,
-32871L,32872L,32873L,32874L,32875L,32876L,32877L,32878L,32879L,32880L,
-32881L,32882L,32883L,32884L,32885L,32886L,32887L,32888L,32889L,32890L,
-32891L,32892L,32893L,32894L,32895L,32896L,32897L,32898L,32899L,32900L,
-32901L,32902L,32903L,32904L,32905L,32906L,32907L,32908L,32909L,32910L,
-32911L,32912L,32913L,32914L,32915L,32916L,32917L,32918L,32919L,32920L,
-32921L,32922L,32923L,32924L,32925L,32926L,32927L,32928L,32929L,32930L,
-32931L,32932L,32933L,32934L,32935L,32936L,32937L,32938L,32939L,32940L,
-32941L,32942L,32943L,32944L,32945L,32946L,32947L,32948L,32949L,32950L,
-32951L,32952L,32953L,32954L,32955L,32956L,32957L,32958L,32959L,32960L,
-32961L,32962L,32963L,32964L,32965L,32966L,32967L,32968L,32969L,32970L,
-32971L,32972L,32973L,32974L,32975L,32976L,32977L,32978L,32979L,32980L,
-32981L,32982L,32983L,32984L,32985L,32986L,32987L,32988L,32989L,32990L,
-32991L,32992L,32993L,32994L,32995L,32996L,32997L,32998L,32999L,33000L,
-33001L,33002L,33003L,33004L,33005L,33006L,33007L,33008L,33009L,33010L,
-33011L,33012L,33013L,33014L,33015L,33016L,33017L,33018L,33019L,33020L,
-33021L,33022L,33023L,33024L,33025L,33026L,33027L,33028L,33029L,33030L,
-33031L,33032L,33033L,33034L,33035L,33036L,33037L,33038L,33039L,33040L,
-33041L,33042L,33043L,33044L,33045L,33046L,33047L,33048L,33049L,33050L,
-33051L,33052L,33053L,33054L,33055L,33056L,33057L,33058L,33059L,33060L,
-33061L,33062L,33063L,33064L,33065L,33066L,33067L,33068L,33069L,33070L,
-33071L,33072L,33073L,33074L,33075L,33076L,33077L,33078L,33079L,33080L,
-33081L,33082L,33083L,33084L,33085L,33086L,33087L,33088L,33089L,33090L,
-33091L,33092L,33093L,33094L,33095L,33096L,33097L,33098L,33099L,33100L,
-33101L,33102L,33103L,33104L,33105L,33106L,33107L,33108L,33109L,33110L,
-33111L,33112L,33113L,33114L,33115L,33116L,33117L,33118L,33119L,33120L,
-33121L,33122L,33123L,33124L,33125L,33126L,33127L,33128L,33129L,33130L,
-33131L,33132L,33133L,33134L,33135L,33136L,33137L,33138L,33139L,33140L,
-33141L,33142L,33143L,33144L,33145L,33146L,33147L,33148L,33149L,33150L,
-33151L,33152L,33153L,33154L,33155L,33156L,33157L,33158L,33159L,33160L,
-33161L,33162L,33163L,33164L,33165L,33166L,33167L,33168L,33169L,33170L,
-33171L,33172L,33173L,33174L,33175L,33176L,33177L,33178L,33179L,33180L,
-33181L,33182L,33183L,33184L,33185L,33186L,33187L,33188L,33189L,33190L,
-33191L,33192L,33193L,33194L,33195L,33196L,33197L,33198L,33199L,33200L,
-33201L,33202L,33203L,33204L,33205L,33206L,33207L,33208L,33209L,33210L,
-33211L,33212L,33213L,33214L,33215L,33216L,33217L,33218L,33219L,33220L,
-33221L,33222L,33223L,33224L,33225L,33226L,33227L,33228L,33229L,33230L,
-33231L,33232L,33233L,33234L,33235L,33236L,33237L,33238L,33239L,33240L,
-33241L,33242L,33243L,33244L,33245L,33246L,33247L,33248L,33249L,33250L,
-33251L,33252L,33253L,33254L,33255L,33256L,33257L,33258L,33259L,33260L,
-33261L,33262L,33263L,33264L,33265L,33266L,33267L,33268L,33269L,33270L,
-33271L,33272L,33273L,33274L,33275L,33276L,33277L,33278L,33279L,33280L,
-33281L,33282L,33283L,33284L,33285L,33286L,33287L,33288L,33289L,33290L,
-33291L,33292L,33293L,33294L,33295L,33296L,33297L,33298L,33299L,33300L,
-33301L,33302L,33303L,33304L,33305L,33306L,33307L,33308L,33309L,33310L,
-33311L,33312L,33313L,33314L,33315L,33316L,33317L,33318L,33319L,33320L,
-33321L,33322L,33323L,33324L,33325L,33326L,33327L,33328L,33329L,33330L,
-33331L,33332L,33333L,33334L,33335L,33336L,33337L,33338L,33339L,33340L,
-33341L,33342L,33343L,33344L,33345L,33346L,33347L,33348L,33349L,33350L,
-33351L,33352L,33353L,33354L,33355L,33356L,33357L,33358L,33359L,33360L,
-33361L,33362L,33363L,33364L,33365L,33366L,33367L,33368L,33369L,33370L,
-33371L,33372L,33373L,33374L,33375L,33376L,33377L,33378L,33379L,33380L,
-33381L,33382L,33383L,33384L,33385L,33386L,33387L,33388L,33389L,33390L,
-33391L,33392L,33393L,33394L,33395L,33396L,33397L,33398L,33399L,33400L,
-33401L,33402L,33403L,33404L,33405L,33406L,33407L,33408L,33409L,33410L,
-33411L,33412L,33413L,33414L,33415L,33416L,33417L,33418L,33419L,33420L,
-33421L,33422L,33423L,33424L,33425L,33426L,33427L,33428L,33429L,33430L,
-33431L,33432L,33433L,33434L,33435L,33436L,33437L,33438L,33439L,33440L,
-33441L,33442L,33443L,33444L,33445L,33446L,33447L,33448L,33449L,33450L,
-33451L,33452L,33453L,33454L,33455L,33456L,33457L,33458L,33459L,33460L,
-33461L,33462L,33463L,33464L,33465L,33466L,33467L,33468L,33469L,33470L,
-33471L,33472L,33473L,33474L,33475L,33476L,33477L,33478L,33479L,33480L,
-33481L,33482L,33483L,33484L,33485L,33486L,33487L,33488L,33489L,33490L,
-33491L,33492L,33493L,33494L,33495L,33496L,33497L,33498L,33499L,33500L,
-33501L,33502L,33503L,33504L,33505L,33506L,33507L,33508L,33509L,33510L,
-33511L,33512L,33513L,33514L,33515L,33516L,33517L,33518L,33519L,33520L,
-33521L,33522L,33523L,33524L,33525L,33526L,33527L,33528L,33529L,33530L,
-33531L,33532L,33533L,33534L,33535L,33536L,33537L,33538L,33539L,33540L,
-33541L,33542L,33543L,33544L,33545L,33546L,33547L,33548L,33549L,33550L,
-33551L,33552L,33553L,33554L,33555L,33556L,33557L,33558L,33559L,33560L,
-33561L,33562L,33563L,33564L,33565L,33566L,33567L,33568L,33569L,33570L,
-33571L,33572L,33573L,33574L,33575L,33576L,33577L,33578L,33579L,33580L,
-33581L,33582L,33583L,33584L,33585L,33586L,33587L,33588L,33589L,33590L,
-33591L,33592L,33593L,33594L,33595L,33596L,33597L,33598L,33599L,33600L,
-33601L,33602L,33603L,33604L,33605L,33606L,33607L,33608L,33609L,33610L,
-33611L,33612L,33613L,33614L,33615L,33616L,33617L,33618L,33619L,33620L,
-33621L,33622L,33623L,33624L,33625L,33626L,33627L,33628L,33629L,33630L,
-33631L,33632L,33633L,33634L,33635L,33636L,33637L,33638L,33639L,33640L,
-33641L,33642L,33643L,33644L,33645L,33646L,33647L,33648L,33649L,33650L,
-33651L,33652L,33653L,33654L,33655L,33656L,33657L,33658L,33659L,33660L,
-33661L,33662L,33663L,33664L,33665L,33666L,33667L,33668L,33669L,33670L,
-33671L,33672L,33673L,33674L,33675L,33676L,33677L,33678L,33679L,33680L,
-33681L,33682L,33683L,33684L,33685L,33686L,33687L,33688L,33689L,33690L,
-33691L,33692L,33693L,33694L,33695L,33696L,33697L,33698L,33699L,33700L,
-33701L,33702L,33703L,33704L,33705L,33706L,33707L,33708L,33709L,33710L,
-33711L,33712L,33713L,33714L,33715L,33716L,33717L,33718L,33719L,33720L,
-33721L,33722L,33723L,33724L,33725L,33726L,33727L,33728L,33729L,33730L,
-33731L,33732L,33733L,33734L,33735L,33736L,33737L,33738L,33739L,33740L,
-33741L,33742L,33743L,33744L,33745L,33746L,33747L,33748L,33749L,33750L,
-33751L,33752L,33753L,33754L,33755L,33756L,33757L,33758L,33759L,33760L,
-33761L,33762L,33763L,33764L,33765L,33766L,33767L,33768L,33769L,33770L,
-33771L,33772L,33773L,33774L,33775L,33776L,33777L,33778L,33779L,33780L,
-33781L,33782L,33783L,33784L,33785L,33786L,33787L,33788L,33789L,33790L,
-33791L,33792L,33793L,33794L,33795L,33796L,33797L,33798L,33799L,33800L,
-33801L,33802L,33803L,33804L,33805L,33806L,33807L,33808L,33809L,33810L,
-33811L,33812L,33813L,33814L,33815L,33816L,33817L,33818L,33819L,33820L,
-33821L,33822L,33823L,33824L,33825L,33826L,33827L,33828L,33829L,33830L,
-33831L,33832L,33833L,33834L,33835L,33836L,33837L,33838L,33839L,33840L,
-33841L,33842L,33843L,33844L,33845L,33846L,33847L,33848L,33849L,33850L,
-33851L,33852L,33853L,33854L,33855L,33856L,33857L,33858L,33859L,33860L,
-33861L,33862L,33863L,33864L,33865L,33866L,33867L,33868L,33869L,33870L,
-33871L,33872L,33873L,33874L,33875L,33876L,33877L,33878L,33879L,33880L,
-33881L,33882L,33883L,33884L,33885L,33886L,33887L,33888L,33889L,33890L,
-33891L,33892L,33893L,33894L,33895L,33896L,33897L,33898L,33899L,33900L,
-33901L,33902L,33903L,33904L,33905L,33906L,33907L,33908L,33909L,33910L,
-33911L,33912L,33913L,33914L,33915L,33916L,33917L,33918L,33919L,33920L,
-33921L,33922L,33923L,33924L,33925L,33926L,33927L,33928L,33929L,33930L,
-33931L,33932L,33933L,33934L,33935L,33936L,33937L,33938L,33939L,33940L,
-33941L,33942L,33943L,33944L,33945L,33946L,33947L,33948L,33949L,33950L,
-33951L,33952L,33953L,33954L,33955L,33956L,33957L,33958L,33959L,33960L,
-33961L,33962L,33963L,33964L,33965L,33966L,33967L,33968L,33969L,33970L,
-33971L,33972L,33973L,33974L,33975L,33976L,33977L,33978L,33979L,33980L,
-33981L,33982L,33983L,33984L,33985L,33986L,33987L,33988L,33989L,33990L,
-33991L,33992L,33993L,33994L,33995L,33996L,33997L,33998L,33999L,34000L,
-34001L,34002L,34003L,34004L,34005L,34006L,34007L,34008L,34009L,34010L,
-34011L,34012L,34013L,34014L,34015L,34016L,34017L,34018L,34019L,34020L,
-34021L,34022L,34023L,34024L,34025L,34026L,34027L,34028L,34029L,34030L,
-34031L,34032L,34033L,34034L,34035L,34036L,34037L,34038L,34039L,34040L,
-34041L,34042L,34043L,34044L,34045L,34046L,34047L,34048L,34049L,34050L,
-34051L,34052L,34053L,34054L,34055L,34056L,34057L,34058L,34059L,34060L,
-34061L,34062L,34063L,34064L,34065L,34066L,34067L,34068L,34069L,34070L,
-34071L,34072L,34073L,34074L,34075L,34076L,34077L,34078L,34079L,34080L,
-34081L,34082L,34083L,34084L,34085L,34086L,34087L,34088L,34089L,34090L,
-34091L,34092L,34093L,34094L,34095L,34096L,34097L,34098L,34099L,34100L,
-34101L,34102L,34103L,34104L,34105L,34106L,34107L,34108L,34109L,34110L,
-34111L,34112L,34113L,34114L,34115L,34116L,34117L,34118L,34119L,34120L,
-34121L,34122L,34123L,34124L,34125L,34126L,34127L,34128L,34129L,34130L,
-34131L,34132L,34133L,34134L,34135L,34136L,34137L,34138L,34139L,34140L,
-34141L,34142L,34143L,34144L,34145L,34146L,34147L,34148L,34149L,34150L,
-34151L,34152L,34153L,34154L,34155L,34156L,34157L,34158L,34159L,34160L,
-34161L,34162L,34163L,34164L,34165L,34166L,34167L,34168L,34169L,34170L,
-34171L,34172L,34173L,34174L,34175L,34176L,34177L,34178L,34179L,34180L,
-34181L,34182L,34183L,34184L,34185L,34186L,34187L,34188L,34189L,34190L,
-34191L,34192L,34193L,34194L,34195L,34196L,34197L,34198L,34199L,34200L,
-34201L,34202L,34203L,34204L,34205L,34206L,34207L,34208L,34209L,34210L,
-34211L,34212L,34213L,34214L,34215L,34216L,34217L,34218L,34219L,34220L,
-34221L,34222L,34223L,34224L,34225L,34226L,34227L,34228L,34229L,34230L,
-34231L,34232L,34233L,34234L,34235L,34236L,34237L,34238L,34239L,34240L,
-34241L,34242L,34243L,34244L,34245L,34246L,34247L,34248L,34249L,34250L,
-34251L,34252L,34253L,34254L,34255L,34256L,34257L,34258L,34259L,34260L,
-34261L,34262L,34263L,34264L,34265L,34266L,34267L,34268L,34269L,34270L,
-34271L,34272L,34273L,34274L,34275L,34276L,34277L,34278L,34279L,34280L,
-34281L,34282L,34283L,34284L,34285L,34286L,34287L,34288L,34289L,34290L,
-34291L,34292L,34293L,34294L,34295L,34296L,34297L,34298L,34299L,34300L,
-34301L,34302L,34303L,34304L,34305L,34306L,34307L,34308L,34309L,34310L,
-34311L,34312L,34313L,34314L,34315L,34316L,34317L,34318L,34319L,34320L,
-34321L,34322L,34323L,34324L,34325L,34326L,34327L,34328L,34329L,34330L,
-34331L,34332L,34333L,34334L,34335L,34336L,34337L,34338L,34339L,34340L,
-34341L,34342L,34343L,34344L,34345L,34346L,34347L,34348L,34349L,34350L,
-34351L,34352L,34353L,34354L,34355L,34356L,34357L,34358L,34359L,34360L,
-34361L,34362L,34363L,34364L,34365L,34366L,34367L,34368L,34369L,34370L,
-34371L,34372L,34373L,34374L,34375L,34376L,34377L,34378L,34379L,34380L,
-34381L,34382L,34383L,34384L,34385L,34386L,34387L,34388L,34389L,34390L,
-34391L,34392L,34393L,34394L,34395L,34396L,34397L,34398L,34399L,34400L,
-34401L,34402L,34403L,34404L,34405L,34406L,34407L,34408L,34409L,34410L,
-34411L,34412L,34413L,34414L,34415L,34416L,34417L,34418L,34419L,34420L,
-34421L,34422L,34423L,34424L,34425L,34426L,34427L,34428L,34429L,34430L,
-34431L,34432L,34433L,34434L,34435L,34436L,34437L,34438L,34439L,34440L,
-34441L,34442L,34443L,34444L,34445L,34446L,34447L,34448L,34449L,34450L,
-34451L,34452L,34453L,34454L,34455L,34456L,34457L,34458L,34459L,34460L,
-34461L,34462L,34463L,34464L,34465L,34466L,34467L,34468L,34469L,34470L,
-34471L,34472L,34473L,34474L,34475L,34476L,34477L,34478L,34479L,34480L,
-34481L,34482L,34483L,34484L,34485L,34486L,34487L,34488L,34489L,34490L,
-34491L,34492L,34493L,34494L,34495L,34496L,34497L,34498L,34499L,34500L,
-34501L,34502L,34503L,34504L,34505L,34506L,34507L,34508L,34509L,34510L,
-34511L,34512L,34513L,34514L,34515L,34516L,34517L,34518L,34519L,34520L,
-34521L,34522L,34523L,34524L,34525L,34526L,34527L,34528L,34529L,34530L,
-34531L,34532L,34533L,34534L,34535L,34536L,34537L,34538L,34539L,34540L,
-34541L,34542L,34543L,34544L,34545L,34546L,34547L,34548L,34549L,34550L,
-34551L,34552L,34553L,34554L,34555L,34556L,34557L,34558L,34559L,34560L,
-34561L,34562L,34563L,34564L,34565L,34566L,34567L,34568L,34569L,34570L,
-34571L,34572L,34573L,34574L,34575L,34576L,34577L,34578L,34579L,34580L,
-34581L,34582L,34583L,34584L,34585L,34586L,34587L,34588L,34589L,34590L,
-34591L,34592L,34593L,34594L,34595L,34596L,34597L,34598L,34599L,34600L,
-34601L,34602L,34603L,34604L,34605L,34606L,34607L,34608L,34609L,34610L,
-34611L,34612L,34613L,34614L,34615L,34616L,34617L,34618L,34619L,34620L,
-34621L,34622L,34623L,34624L,34625L,34626L,34627L,34628L,34629L,34630L,
-34631L,34632L,34633L,34634L,34635L,34636L,34637L,34638L,34639L,34640L,
-34641L,34642L,34643L,34644L,34645L,34646L,34647L,34648L,34649L,34650L,
-34651L,34652L,34653L,34654L,34655L,34656L,34657L,34658L,34659L,34660L,
-34661L,34662L,34663L,34664L,34665L,34666L,34667L,34668L,34669L,34670L,
-34671L,34672L,34673L,34674L,34675L,34676L,34677L,34678L,34679L,34680L,
-34681L,34682L,34683L,34684L,34685L,34686L,34687L,34688L,34689L,34690L,
-34691L,34692L,34693L,34694L,34695L,34696L,34697L,34698L,34699L,34700L,
-34701L,34702L,34703L,34704L,34705L,34706L,34707L,34708L,34709L,34710L,
-34711L,34712L,34713L,34714L,34715L,34716L,34717L,34718L,34719L,34720L,
-34721L,34722L,34723L,34724L,34725L,34726L,34727L,34728L,34729L,34730L,
-34731L,34732L,34733L,34734L,34735L,34736L,34737L,34738L,34739L,34740L,
-34741L,34742L,34743L,34744L,34745L,34746L,34747L,34748L,34749L,34750L,
-34751L,34752L,34753L,34754L,34755L,34756L,34757L,34758L,34759L,34760L,
-34761L,34762L,34763L,34764L,34765L,34766L,34767L,34768L,34769L,34770L,
-34771L,34772L,34773L,34774L,34775L,34776L,34777L,34778L,34779L,34780L,
-34781L,34782L,34783L,34784L,34785L,34786L,34787L,34788L,34789L,34790L,
-34791L,34792L,34793L,34794L,34795L,34796L,34797L,34798L,34799L,34800L,
-34801L,34802L,34803L,34804L,34805L,34806L,34807L,34808L,34809L,34810L,
-34811L,34812L,34813L,34814L,34815L,34816L,34817L,34818L,34819L,34820L,
-34821L,34822L,34823L,34824L,34825L,34826L,34827L,34828L,34829L,34830L,
-34831L,34832L,34833L,34834L,34835L,34836L,34837L,34838L,34839L,34840L,
-34841L,34842L,34843L,34844L,34845L,34846L,34847L,34848L,34849L,34850L,
-34851L,34852L,34853L,34854L,34855L,34856L,34857L,34858L,34859L,34860L,
-34861L,34862L,34863L,34864L,34865L,34866L,34867L,34868L,34869L,34870L,
-34871L,34872L,34873L,34874L,34875L,34876L,34877L,34878L,34879L,34880L,
-34881L,34882L,34883L,34884L,34885L,34886L,34887L,34888L,34889L,34890L,
-34891L,34892L,34893L,34894L,34895L,34896L,34897L,34898L,34899L,34900L,
-34901L,34902L,34903L,34904L,34905L,34906L,34907L,34908L,34909L,34910L,
-34911L,34912L,34913L,34914L,34915L,34916L,34917L,34918L,34919L,34920L,
-34921L,34922L,34923L,34924L,34925L,34926L,34927L,34928L,34929L,34930L,
-34931L,34932L,34933L,34934L,34935L,34936L,34937L,34938L,34939L,34940L,
-34941L,34942L,34943L,34944L,34945L,34946L,34947L,34948L,34949L,34950L,
-34951L,34952L,34953L,34954L,34955L,34956L,34957L,34958L,34959L,34960L,
-34961L,34962L,34963L,34964L,34965L,34966L,34967L,34968L,34969L,34970L,
-34971L,34972L,34973L,34974L,34975L,34976L,34977L,34978L,34979L,34980L,
-34981L,34982L,34983L,34984L,34985L,34986L,34987L,34988L,34989L,34990L,
-34991L,34992L,34993L,34994L,34995L,34996L,34997L,34998L,34999L,35000L,
-35001L,35002L,35003L,35004L,35005L,35006L,35007L,35008L,35009L,35010L,
-35011L,35012L,35013L,35014L,35015L,35016L,35017L,35018L,35019L,35020L,
-35021L,35022L,35023L,35024L,35025L,35026L,35027L,35028L,35029L,35030L,
-35031L,35032L,35033L,35034L,35035L,35036L,35037L,35038L,35039L,35040L,
-35041L,35042L,35043L,35044L,35045L,35046L,35047L,35048L,35049L,35050L,
-35051L,35052L,35053L,35054L,35055L,35056L,35057L,35058L,35059L,35060L,
-35061L,35062L,35063L,35064L,35065L,35066L,35067L,35068L,35069L,35070L,
-35071L,35072L,35073L,35074L,35075L,35076L,35077L,35078L,35079L,35080L,
-35081L,35082L,35083L,35084L,35085L,35086L,35087L,35088L,35089L,35090L,
-35091L,35092L,35093L,35094L,35095L,35096L,35097L,35098L,35099L,35100L,
-35101L,35102L,35103L,35104L,35105L,35106L,35107L,35108L,35109L,35110L,
-35111L,35112L,35113L,35114L,35115L,35116L,35117L,35118L,35119L,35120L,
-35121L,35122L,35123L,35124L,35125L,35126L,35127L,35128L,35129L,35130L,
-35131L,35132L,35133L,35134L,35135L,35136L,35137L,35138L,35139L,35140L,
-35141L,35142L,35143L,35144L,35145L,35146L,35147L,35148L,35149L,35150L,
-35151L,35152L,35153L,35154L,35155L,35156L,35157L,35158L,35159L,35160L,
-35161L,35162L,35163L,35164L,35165L,35166L,35167L,35168L,35169L,35170L,
-35171L,35172L,35173L,35174L,35175L,35176L,35177L,35178L,35179L,35180L,
-35181L,35182L,35183L,35184L,35185L,35186L,35187L,35188L,35189L,35190L,
-35191L,35192L,35193L,35194L,35195L,35196L,35197L,35198L,35199L,35200L,
-35201L,35202L,35203L,35204L,35205L,35206L,35207L,35208L,35209L,35210L,
-35211L,35212L,35213L,35214L,35215L,35216L,35217L,35218L,35219L,35220L,
-35221L,35222L,35223L,35224L,35225L,35226L,35227L,35228L,35229L,35230L,
-35231L,35232L,35233L,35234L,35235L,35236L,35237L,35238L,35239L,35240L,
-35241L,35242L,35243L,35244L,35245L,35246L,35247L,35248L,35249L,35250L,
-35251L,35252L,35253L,35254L,35255L,35256L,35257L,35258L,35259L,35260L,
-35261L,35262L,35263L,35264L,35265L,35266L,35267L,35268L,35269L,35270L,
-35271L,35272L,35273L,35274L,35275L,35276L,35277L,35278L,35279L,35280L,
-35281L,35282L,35283L,35284L,35285L,35286L,35287L,35288L,35289L,35290L,
-35291L,35292L,35293L,35294L,35295L,35296L,35297L,35298L,35299L,35300L,
-35301L,35302L,35303L,35304L,35305L,35306L,35307L,35308L,35309L,35310L,
-35311L,35312L,35313L,35314L,35315L,35316L,35317L,35318L,35319L,35320L,
-35321L,35322L,35323L,35324L,35325L,35326L,35327L,35328L,35329L,35330L,
-35331L,35332L,35333L,35334L,35335L,35336L,35337L,35338L,35339L,35340L,
-35341L,35342L,35343L,35344L,35345L,35346L,35347L,35348L,35349L,35350L,
-35351L,35352L,35353L,35354L,35355L,35356L,35357L,35358L,35359L,35360L,
-35361L,35362L,35363L,35364L,35365L,35366L,35367L,35368L,35369L,35370L,
-35371L,35372L,35373L,35374L,35375L,35376L,35377L,35378L,35379L,35380L,
-35381L,35382L,35383L,35384L,35385L,35386L,35387L,35388L,35389L,35390L,
-35391L,35392L,35393L,35394L,35395L,35396L,35397L,35398L,35399L,35400L,
-35401L,35402L,35403L,35404L,35405L,35406L,35407L,35408L,35409L,35410L,
-35411L,35412L,35413L,35414L,35415L,35416L,35417L,35418L,35419L,35420L,
-35421L,35422L,35423L,35424L,35425L,35426L,35427L,35428L,35429L,35430L,
-35431L,35432L,35433L,35434L,35435L,35436L,35437L,35438L,35439L,35440L,
-35441L,35442L,35443L,35444L,35445L,35446L,35447L,35448L,35449L,35450L,
-35451L,35452L,35453L,35454L,35455L,35456L,35457L,35458L,35459L,35460L,
-35461L,35462L,35463L,35464L,35465L,35466L,35467L,35468L,35469L,35470L,
-35471L,35472L,35473L,35474L,35475L,35476L,35477L,35478L,35479L,35480L,
-35481L,35482L,35483L,35484L,35485L,35486L,35487L,35488L,35489L,35490L,
-35491L,35492L,35493L,35494L,35495L,35496L,35497L,35498L,35499L,35500L,
-35501L,35502L,35503L,35504L,35505L,35506L,35507L,35508L,35509L,35510L,
-35511L,35512L,35513L,35514L,35515L,35516L,35517L,35518L,35519L,35520L,
-35521L,35522L,35523L,35524L,35525L,35526L,35527L,35528L,35529L,35530L,
-35531L,35532L,35533L,35534L,35535L,35536L,35537L,35538L,35539L,35540L,
-35541L,35542L,35543L,35544L,35545L,35546L,35547L,35548L,35549L,35550L,
-35551L,35552L,35553L,35554L,35555L,35556L,35557L,35558L,35559L,35560L,
-35561L,35562L,35563L,35564L,35565L,35566L,35567L,35568L,35569L,35570L,
-35571L,35572L,35573L,35574L,35575L,35576L,35577L,35578L,35579L,35580L,
-35581L,35582L,35583L,35584L,35585L,35586L,35587L,35588L,35589L,35590L,
-35591L,35592L,35593L,35594L,35595L,35596L,35597L,35598L,35599L,35600L,
-35601L,35602L,35603L,35604L,35605L,35606L,35607L,35608L,35609L,35610L,
-35611L,35612L,35613L,35614L,35615L,35616L,35617L,35618L,35619L,35620L,
-35621L,35622L,35623L,35624L,35625L,35626L,35627L,35628L,35629L,35630L,
-35631L,35632L,35633L,35634L,35635L,35636L,35637L,35638L,35639L,35640L,
-35641L,35642L,35643L,35644L,35645L,35646L,35647L,35648L,35649L,35650L,
-35651L,35652L,35653L,35654L,35655L,35656L,35657L,35658L,35659L,35660L,
-35661L,35662L,35663L,35664L,35665L,35666L,35667L,35668L,35669L,35670L,
-35671L,35672L,35673L,35674L,35675L,35676L,35677L,35678L,35679L,35680L,
-35681L,35682L,35683L,35684L,35685L,35686L,35687L,35688L,35689L,35690L,
-35691L,35692L,35693L,35694L,35695L,35696L,35697L,35698L,35699L,35700L,
-35701L,35702L,35703L,35704L,35705L,35706L,35707L,35708L,35709L,35710L,
-35711L,35712L,35713L,35714L,35715L,35716L,35717L,35718L,35719L,35720L,
-35721L,35722L,35723L,35724L,35725L,35726L,35727L,35728L,35729L,35730L,
-35731L,35732L,35733L,35734L,35735L,35736L,35737L,35738L,35739L,35740L,
-35741L,35742L,35743L,35744L,35745L,35746L,35747L,35748L,35749L,35750L,
-35751L,35752L,35753L,35754L,35755L,35756L,35757L,35758L,35759L,35760L,
-35761L,35762L,35763L,35764L,35765L,35766L,35767L,35768L,35769L,35770L,
-35771L,35772L,35773L,35774L,35775L,35776L,35777L,35778L,35779L,35780L,
-35781L,35782L,35783L,35784L,35785L,35786L,35787L,35788L,35789L,35790L,
-35791L,35792L,35793L,35794L,35795L,35796L,35797L,35798L,35799L,35800L,
-35801L,35802L,35803L,35804L,35805L,35806L,35807L,35808L,35809L,35810L,
-35811L,35812L,35813L,35814L,35815L,35816L,35817L,35818L,35819L,35820L,
-35821L,35822L,35823L,35824L,35825L,35826L,35827L,35828L,35829L,35830L,
-35831L,35832L,35833L,35834L,35835L,35836L,35837L,35838L,35839L,35840L,
-35841L,35842L,35843L,35844L,35845L,35846L,35847L,35848L,35849L,35850L,
-35851L,35852L,35853L,35854L,35855L,35856L,35857L,35858L,35859L,35860L,
-35861L,35862L,35863L,35864L,35865L,35866L,35867L,35868L,35869L,35870L,
-35871L,35872L,35873L,35874L,35875L,35876L,35877L,35878L,35879L,35880L,
-35881L,35882L,35883L,35884L,35885L,35886L,35887L,35888L,35889L,35890L,
-35891L,35892L,35893L,35894L,35895L,35896L,35897L,35898L,35899L,35900L,
-35901L,35902L,35903L,35904L,35905L,35906L,35907L,35908L,35909L,35910L,
-35911L,35912L,35913L,35914L,35915L,35916L,35917L,35918L,35919L,35920L,
-35921L,35922L,35923L,35924L,35925L,35926L,35927L,35928L,35929L,35930L,
-35931L,35932L,35933L,35934L,35935L,35936L,35937L,35938L,35939L,35940L,
-35941L,35942L,35943L,35944L,35945L,35946L,35947L,35948L,35949L,35950L,
-35951L,35952L,35953L,35954L,35955L,35956L,35957L,35958L,35959L,35960L,
-35961L,35962L,35963L,35964L,35965L,35966L,35967L,35968L,35969L,35970L,
-35971L,35972L,35973L,35974L,35975L,35976L,35977L,35978L,35979L,35980L,
-35981L,35982L,35983L,35984L,35985L,35986L,35987L,35988L,35989L,35990L,
-35991L,35992L,35993L,35994L,35995L,35996L,35997L,35998L,35999L,36000L,
-36001L,36002L,36003L,36004L,36005L,36006L,36007L,36008L,36009L,36010L,
-36011L,36012L,36013L,36014L,36015L,36016L,36017L,36018L,36019L,36020L,
-36021L,36022L,36023L,36024L,36025L,36026L,36027L,36028L,36029L,36030L,
-36031L,36032L,36033L,36034L,36035L,36036L,36037L,36038L,36039L,36040L,
-36041L,36042L,36043L,36044L,36045L,36046L,36047L,36048L,36049L,36050L,
-36051L,36052L,36053L,36054L,36055L,36056L,36057L,36058L,36059L,36060L,
-36061L,36062L,36063L,36064L,36065L,36066L,36067L,36068L,36069L,36070L,
-36071L,36072L,36073L,36074L,36075L,36076L,36077L,36078L,36079L,36080L,
-36081L,36082L,36083L,36084L,36085L,36086L,36087L,36088L,36089L,36090L,
-36091L,36092L,36093L,36094L,36095L,36096L,36097L,36098L,36099L,36100L,
-36101L,36102L,36103L,36104L,36105L,36106L,36107L,36108L,36109L,36110L,
-36111L,36112L,36113L,36114L,36115L,36116L,36117L,36118L,36119L,36120L,
-36121L,36122L,36123L,36124L,36125L,36126L,36127L,36128L,36129L,36130L,
-36131L,36132L,36133L,36134L,36135L,36136L,36137L,36138L,36139L,36140L,
-36141L,36142L,36143L,36144L,36145L,36146L,36147L,36148L,36149L,36150L,
-36151L,36152L,36153L,36154L,36155L,36156L,36157L,36158L,36159L,36160L,
-36161L,36162L,36163L,36164L,36165L,36166L,36167L,36168L,36169L,36170L,
-36171L,36172L,36173L,36174L,36175L,36176L,36177L,36178L,36179L,36180L,
-36181L,36182L,36183L,36184L,36185L,36186L,36187L,36188L,36189L,36190L,
-36191L,36192L,36193L,36194L,36195L,36196L,36197L,36198L,36199L,36200L,
-36201L,36202L,36203L,36204L,36205L,36206L,36207L,36208L,36209L,36210L,
-36211L,36212L,36213L,36214L,36215L,36216L,36217L,36218L,36219L,36220L,
-36221L,36222L,36223L,36224L,36225L,36226L,36227L,36228L,36229L,36230L,
-36231L,36232L,36233L,36234L,36235L,36236L,36237L,36238L,36239L,36240L,
-36241L,36242L,36243L,36244L,36245L,36246L,36247L,36248L,36249L,36250L,
-36251L,36252L,36253L,36254L,36255L,36256L,36257L,36258L,36259L,36260L,
-36261L,36262L,36263L,36264L,36265L,36266L,36267L,36268L,36269L,36270L,
-36271L,36272L,36273L,36274L,36275L,36276L,36277L,36278L,36279L,36280L,
-36281L,36282L,36283L,36284L,36285L,36286L,36287L,36288L,36289L,36290L,
-36291L,36292L,36293L,36294L,36295L,36296L,36297L,36298L,36299L,36300L,
-36301L,36302L,36303L,36304L,36305L,36306L,36307L,36308L,36309L,36310L,
-36311L,36312L,36313L,36314L,36315L,36316L,36317L,36318L,36319L,36320L,
-36321L,36322L,36323L,36324L,36325L,36326L,36327L,36328L,36329L,36330L,
-36331L,36332L,36333L,36334L,36335L,36336L,36337L,36338L,36339L,36340L,
-36341L,36342L,36343L,36344L,36345L,36346L,36347L,36348L,36349L,36350L,
-36351L,36352L,36353L,36354L,36355L,36356L,36357L,36358L,36359L,36360L,
-36361L,36362L,36363L,36364L,36365L,36366L,36367L,36368L,36369L,36370L,
-36371L,36372L,36373L,36374L,36375L,36376L,36377L,36378L,36379L,36380L,
-36381L,36382L,36383L,36384L,36385L,36386L,36387L,36388L,36389L,36390L,
-36391L,36392L,36393L,36394L,36395L,36396L,36397L,36398L,36399L,36400L,
-36401L,36402L,36403L,36404L,36405L,36406L,36407L,36408L,36409L,36410L,
-36411L,36412L,36413L,36414L,36415L,36416L,36417L,36418L,36419L,36420L,
-36421L,36422L,36423L,36424L,36425L,36426L,36427L,36428L,36429L,36430L,
-36431L,36432L,36433L,36434L,36435L,36436L,36437L,36438L,36439L,36440L,
-36441L,36442L,36443L,36444L,36445L,36446L,36447L,36448L,36449L,36450L,
-36451L,36452L,36453L,36454L,36455L,36456L,36457L,36458L,36459L,36460L,
-36461L,36462L,36463L,36464L,36465L,36466L,36467L,36468L,36469L,36470L,
-36471L,36472L,36473L,36474L,36475L,36476L,36477L,36478L,36479L,36480L,
-36481L,36482L,36483L,36484L,36485L,36486L,36487L,36488L,36489L,36490L,
-36491L,36492L,36493L,36494L,36495L,36496L,36497L,36498L,36499L,36500L,
-36501L,36502L,36503L,36504L,36505L,36506L,36507L,36508L,36509L,36510L,
-36511L,36512L,36513L,36514L,36515L,36516L,36517L,36518L,36519L,36520L,
-36521L,36522L,36523L,36524L,36525L,36526L,36527L,36528L,36529L,36530L,
-36531L,36532L,36533L,36534L,36535L,36536L,36537L,36538L,36539L,36540L,
-36541L,36542L,36543L,36544L,36545L,36546L,36547L,36548L,36549L,36550L,
-36551L,36552L,36553L,36554L,36555L,36556L,36557L,36558L,36559L,36560L,
-36561L,36562L,36563L,36564L,36565L,36566L,36567L,36568L,36569L,36570L,
-36571L,36572L,36573L,36574L,36575L,36576L,36577L,36578L,36579L,36580L,
-36581L,36582L,36583L,36584L,36585L,36586L,36587L,36588L,36589L,36590L,
-36591L,36592L,36593L,36594L,36595L,36596L,36597L,36598L,36599L,36600L,
-36601L,36602L,36603L,36604L,36605L,36606L,36607L,36608L,36609L,36610L,
-36611L,36612L,36613L,36614L,36615L,36616L,36617L,36618L,36619L,36620L,
-36621L,36622L,36623L,36624L,36625L,36626L,36627L,36628L,36629L,36630L,
-36631L,36632L,36633L,36634L,36635L,36636L,36637L,36638L,36639L,36640L,
-36641L,36642L,36643L,36644L,36645L,36646L,36647L,36648L,36649L,36650L,
-36651L,36652L,36653L,36654L,36655L,36656L,36657L,36658L,36659L,36660L,
-36661L,36662L,36663L,36664L,36665L,36666L,36667L,36668L,36669L,36670L,
-36671L,36672L,36673L,36674L,36675L,36676L,36677L,36678L,36679L,36680L,
-36681L,36682L,36683L,36684L,36685L,36686L,36687L,36688L,36689L,36690L,
-36691L,36692L,36693L,36694L,36695L,36696L,36697L,36698L,36699L,36700L,
-36701L,36702L,36703L,36704L,36705L,36706L,36707L,36708L,36709L,36710L,
-36711L,36712L,36713L,36714L,36715L,36716L,36717L,36718L,36719L,36720L,
-36721L,36722L,36723L,36724L,36725L,36726L,36727L,36728L,36729L,36730L,
-36731L,36732L,36733L,36734L,36735L,36736L,36737L,36738L,36739L,36740L,
-36741L,36742L,36743L,36744L,36745L,36746L,36747L,36748L,36749L,36750L,
-36751L,36752L,36753L,36754L,36755L,36756L,36757L,36758L,36759L,36760L,
-36761L,36762L,36763L,36764L,36765L,36766L,36767L,36768L,36769L,36770L,
-36771L,36772L,36773L,36774L,36775L,36776L,36777L,36778L,36779L,36780L,
-36781L,36782L,36783L,36784L,36785L,36786L,36787L,36788L,36789L,36790L,
-36791L,36792L,36793L,36794L,36795L,36796L,36797L,36798L,36799L,36800L,
-36801L,36802L,36803L,36804L,36805L,36806L,36807L,36808L,36809L,36810L,
-36811L,36812L,36813L,36814L,36815L,36816L,36817L,36818L,36819L,36820L,
-36821L,36822L,36823L,36824L,36825L,36826L,36827L,36828L,36829L,36830L,
-36831L,36832L,36833L,36834L,36835L,36836L,36837L,36838L,36839L,36840L,
-36841L,36842L,36843L,36844L,36845L,36846L,36847L,36848L,36849L,36850L,
-36851L,36852L,36853L,36854L,36855L,36856L,36857L,36858L,36859L,36860L,
-36861L,36862L,36863L,36864L,36865L,36866L,36867L,36868L,36869L,36870L,
-36871L,36872L,36873L,36874L,36875L,36876L,36877L,36878L,36879L,36880L,
-36881L,36882L,36883L,36884L,36885L,36886L,36887L,36888L,36889L,36890L,
-36891L,36892L,36893L,36894L,36895L,36896L,36897L,36898L,36899L,36900L,
-36901L,36902L,36903L,36904L,36905L,36906L,36907L,36908L,36909L,36910L,
-36911L,36912L,36913L,36914L,36915L,36916L,36917L,36918L,36919L,36920L,
-36921L,36922L,36923L,36924L,36925L,36926L,36927L,36928L,36929L,36930L,
-36931L,36932L,36933L,36934L,36935L,36936L,36937L,36938L,36939L,36940L,
-36941L,36942L,36943L,36944L,36945L,36946L,36947L,36948L,36949L,36950L,
-36951L,36952L,36953L,36954L,36955L,36956L,36957L,36958L,36959L,36960L,
-36961L,36962L,36963L,36964L,36965L,36966L,36967L,36968L,36969L,36970L,
-36971L,36972L,36973L,36974L,36975L,36976L,36977L,36978L,36979L,36980L,
-36981L,36982L,36983L,36984L,36985L,36986L,36987L,36988L,36989L,36990L,
-36991L,36992L,36993L,36994L,36995L,36996L,36997L,36998L,36999L,37000L,
-37001L,37002L,37003L,37004L,37005L,37006L,37007L,37008L,37009L,37010L,
-37011L,37012L,37013L,37014L,37015L,37016L,37017L,37018L,37019L,37020L,
-37021L,37022L,37023L,37024L,37025L,37026L,37027L,37028L,37029L,37030L,
-37031L,37032L,37033L,37034L,37035L,37036L,37037L,37038L,37039L,37040L,
-37041L,37042L,37043L,37044L,37045L,37046L,37047L,37048L,37049L,37050L,
-37051L,37052L,37053L,37054L,37055L,37056L,37057L,37058L,37059L,37060L,
-37061L,37062L,37063L,37064L,37065L,37066L,37067L,37068L,37069L,37070L,
-37071L,37072L,37073L,37074L,37075L,37076L,37077L,37078L,37079L,37080L,
-37081L,37082L,37083L,37084L,37085L,37086L,37087L,37088L,37089L,37090L,
-37091L,37092L,37093L,37094L,37095L,37096L,37097L,37098L,37099L,37100L,
-37101L,37102L,37103L,37104L,37105L,37106L,37107L,37108L,37109L,37110L,
-37111L,37112L,37113L,37114L,37115L,37116L,37117L,37118L,37119L,37120L,
-37121L,37122L,37123L,37124L,37125L,37126L,37127L,37128L,37129L,37130L,
-37131L,37132L,37133L,37134L,37135L,37136L,37137L,37138L,37139L,37140L,
-37141L,37142L,37143L,37144L,37145L,37146L,37147L,37148L,37149L,37150L,
-37151L,37152L,37153L,37154L,37155L,37156L,37157L,37158L,37159L,37160L,
-37161L,37162L,37163L,37164L,37165L,37166L,37167L,37168L,37169L,37170L,
-37171L,37172L,37173L,37174L,37175L,37176L,37177L,37178L,37179L,37180L,
-37181L,37182L,37183L,37184L,37185L,37186L,37187L,37188L,37189L,37190L,
-37191L,37192L,37193L,37194L,37195L,37196L,37197L,37198L,37199L,37200L,
-37201L,37202L,37203L,37204L,37205L,37206L,37207L,37208L,37209L,37210L,
-37211L,37212L,37213L,37214L,37215L,37216L,37217L,37218L,37219L,37220L,
-37221L,37222L,37223L,37224L,37225L,37226L,37227L,37228L,37229L,37230L,
-37231L,37232L,37233L,37234L,37235L,37236L,37237L,37238L,37239L,37240L,
-37241L,37242L,37243L,37244L,37245L,37246L,37247L,37248L,37249L,37250L,
-37251L,37252L,37253L,37254L,37255L,37256L,37257L,37258L,37259L,37260L,
-37261L,37262L,37263L,37264L,37265L,37266L,37267L,37268L,37269L,37270L,
-37271L,37272L,37273L,37274L,37275L,37276L,37277L,37278L,37279L,37280L,
-37281L,37282L,37283L,37284L,37285L,37286L,37287L,37288L,37289L,37290L,
-37291L,37292L,37293L,37294L,37295L,37296L,37297L,37298L,37299L,37300L,
-37301L,37302L,37303L,37304L,37305L,37306L,37307L,37308L,37309L,37310L,
-37311L,37312L,37313L,37314L,37315L,37316L,37317L,37318L,37319L,37320L,
-37321L,37322L,37323L,37324L,37325L,37326L,37327L,37328L,37329L,37330L,
-37331L,37332L,37333L,37334L,37335L,37336L,37337L,37338L,37339L,37340L,
-37341L,37342L,37343L,37344L,37345L,37346L,37347L,37348L,37349L,37350L,
-37351L,37352L,37353L,37354L,37355L,37356L,37357L,37358L,37359L,37360L,
-37361L,37362L,37363L,37364L,37365L,37366L,37367L,37368L,37369L,37370L,
-37371L,37372L,37373L,37374L,37375L,37376L,37377L,37378L,37379L,37380L,
-37381L,37382L,37383L,37384L,37385L,37386L,37387L,37388L,37389L,37390L,
-37391L,37392L,37393L,37394L,37395L,37396L,37397L,37398L,37399L,37400L,
-37401L,37402L,37403L,37404L,37405L,37406L,37407L,37408L,37409L,37410L,
-37411L,37412L,37413L,37414L,37415L,37416L,37417L,37418L,37419L,37420L,
-37421L,37422L,37423L,37424L,37425L,37426L,37427L,37428L,37429L,37430L,
-37431L,37432L,37433L,37434L,37435L,37436L,37437L,37438L,37439L,37440L,
-37441L,37442L,37443L,37444L,37445L,37446L,37447L,37448L,37449L,37450L,
-37451L,37452L,37453L,37454L,37455L,37456L,37457L,37458L,37459L,37460L,
-37461L,37462L,37463L,37464L,37465L,37466L,37467L,37468L,37469L,37470L,
-37471L,37472L,37473L,37474L,37475L,37476L,37477L,37478L,37479L,37480L,
-37481L,37482L,37483L,37484L,37485L,37486L,37487L,37488L,37489L,37490L,
-37491L,37492L,37493L,37494L,37495L,37496L,37497L,37498L,37499L,37500L,
-37501L,37502L,37503L,37504L,37505L,37506L,37507L,37508L,37509L,37510L,
-37511L,37512L,37513L,37514L,37515L,37516L,37517L,37518L,37519L,37520L,
-37521L,37522L,37523L,37524L,37525L,37526L,37527L,37528L,37529L,37530L,
-37531L,37532L,37533L,37534L,37535L,37536L,37537L,37538L,37539L,37540L,
-37541L,37542L,37543L,37544L,37545L,37546L,37547L,37548L,37549L,37550L,
-37551L,37552L,37553L,37554L,37555L,37556L,37557L,37558L,37559L,37560L,
-37561L,37562L,37563L,37564L,37565L,37566L,37567L,37568L,37569L,37570L,
-37571L,37572L,37573L,37574L,37575L,37576L,37577L,37578L,37579L,37580L,
-37581L,37582L,37583L,37584L,37585L,37586L,37587L,37588L,37589L,37590L,
-37591L,37592L,37593L,37594L,37595L,37596L,37597L,37598L,37599L,37600L,
-37601L,37602L,37603L,37604L,37605L,37606L,37607L,37608L,37609L,37610L,
-37611L,37612L,37613L,37614L,37615L,37616L,37617L,37618L,37619L,37620L,
-37621L,37622L,37623L,37624L,37625L,37626L,37627L,37628L,37629L,37630L,
-37631L,37632L,37633L,37634L,37635L,37636L,37637L,37638L,37639L,37640L,
-37641L,37642L,37643L,37644L,37645L,37646L,37647L,37648L,37649L,37650L,
-37651L,37652L,37653L,37654L,37655L,37656L,37657L,37658L,37659L,37660L,
-37661L,37662L,37663L,37664L,37665L,37666L,37667L,37668L,37669L,37670L,
-37671L,37672L,37673L,37674L,37675L,37676L,37677L,37678L,37679L,37680L,
-37681L,37682L,37683L,37684L,37685L,37686L,37687L,37688L,37689L,37690L,
-37691L,37692L,37693L,37694L,37695L,37696L,37697L,37698L,37699L,37700L,
-37701L,37702L,37703L,37704L,37705L,37706L,37707L,37708L,37709L,37710L,
-37711L,37712L,37713L,37714L,37715L,37716L,37717L,37718L,37719L,37720L,
-37721L,37722L,37723L,37724L,37725L,37726L,37727L,37728L,37729L,37730L,
-37731L,37732L,37733L,37734L,37735L,37736L,37737L,37738L,37739L,37740L,
-37741L,37742L,37743L,37744L,37745L,37746L,37747L,37748L,37749L,37750L,
-37751L,37752L,37753L,37754L,37755L,37756L,37757L,37758L,37759L,37760L,
-37761L,37762L,37763L,37764L,37765L,37766L,37767L,37768L,37769L,37770L,
-37771L,37772L,37773L,37774L,37775L,37776L,37777L,37778L,37779L,37780L,
-37781L,37782L,37783L,37784L,37785L,37786L,37787L,37788L,37789L,37790L,
-37791L,37792L,37793L,37794L,37795L,37796L,37797L,37798L,37799L,37800L,
-37801L,37802L,37803L,37804L,37805L,37806L,37807L,37808L,37809L,37810L,
-37811L,37812L,37813L,37814L,37815L,37816L,37817L,37818L,37819L,37820L,
-37821L,37822L,37823L,37824L,37825L,37826L,37827L,37828L,37829L,37830L,
-37831L,37832L,37833L,37834L,37835L,37836L,37837L,37838L,37839L,37840L,
-37841L,37842L,37843L,37844L,37845L,37846L,37847L,37848L,37849L,37850L,
-37851L,37852L,37853L,37854L,37855L,37856L,37857L,37858L,37859L,37860L,
-37861L,37862L,37863L,37864L,37865L,37866L,37867L,37868L,37869L,37870L,
-37871L,37872L,37873L,37874L,37875L,37876L,37877L,37878L,37879L,37880L,
-37881L,37882L,37883L,37884L,37885L,37886L,37887L,37888L,37889L,37890L,
-37891L,37892L,37893L,37894L,37895L,37896L,37897L,37898L,37899L,37900L,
-37901L,37902L,37903L,37904L,37905L,37906L,37907L,37908L,37909L,37910L,
-37911L,37912L,37913L,37914L,37915L,37916L,37917L,37918L,37919L,37920L,
-37921L,37922L,37923L,37924L,37925L,37926L,37927L,37928L,37929L,37930L,
-37931L,37932L,37933L,37934L,37935L,37936L,37937L,37938L,37939L,37940L,
-37941L,37942L,37943L,37944L,37945L,37946L,37947L,37948L,37949L,37950L,
-37951L,37952L,37953L,37954L,37955L,37956L,37957L,37958L,37959L,37960L,
-37961L,37962L,37963L,37964L,37965L,37966L,37967L,37968L,37969L,37970L,
-37971L,37972L,37973L,37974L,37975L,37976L,37977L,37978L,37979L,37980L,
-37981L,37982L,37983L,37984L,37985L,37986L,37987L,37988L,37989L,37990L,
-37991L,37992L,37993L,37994L,37995L,37996L,37997L,37998L,37999L,38000L,
-38001L,38002L,38003L,38004L,38005L,38006L,38007L,38008L,38009L,38010L,
-38011L,38012L,38013L,38014L,38015L,38016L,38017L,38018L,38019L,38020L,
-38021L,38022L,38023L,38024L,38025L,38026L,38027L,38028L,38029L,38030L,
-38031L,38032L,38033L,38034L,38035L,38036L,38037L,38038L,38039L,38040L,
-38041L,38042L,38043L,38044L,38045L,38046L,38047L,38048L,38049L,38050L,
-38051L,38052L,38053L,38054L,38055L,38056L,38057L,38058L,38059L,38060L,
-38061L,38062L,38063L,38064L,38065L,38066L,38067L,38068L,38069L,38070L,
-38071L,38072L,38073L,38074L,38075L,38076L,38077L,38078L,38079L,38080L,
-38081L,38082L,38083L,38084L,38085L,38086L,38087L,38088L,38089L,38090L,
-38091L,38092L,38093L,38094L,38095L,38096L,38097L,38098L,38099L,38100L,
-38101L,38102L,38103L,38104L,38105L,38106L,38107L,38108L,38109L,38110L,
-38111L,38112L,38113L,38114L,38115L,38116L,38117L,38118L,38119L,38120L,
-38121L,38122L,38123L,38124L,38125L,38126L,38127L,38128L,38129L,38130L,
-38131L,38132L,38133L,38134L,38135L,38136L,38137L,38138L,38139L,38140L,
-38141L,38142L,38143L,38144L,38145L,38146L,38147L,38148L,38149L,38150L,
-38151L,38152L,38153L,38154L,38155L,38156L,38157L,38158L,38159L,38160L,
-38161L,38162L,38163L,38164L,38165L,38166L,38167L,38168L,38169L,38170L,
-38171L,38172L,38173L,38174L,38175L,38176L,38177L,38178L,38179L,38180L,
-38181L,38182L,38183L,38184L,38185L,38186L,38187L,38188L,38189L,38190L,
-38191L,38192L,38193L,38194L,38195L,38196L,38197L,38198L,38199L,38200L,
-38201L,38202L,38203L,38204L,38205L,38206L,38207L,38208L,38209L,38210L,
-38211L,38212L,38213L,38214L,38215L,38216L,38217L,38218L,38219L,38220L,
-38221L,38222L,38223L,38224L,38225L,38226L,38227L,38228L,38229L,38230L,
-38231L,38232L,38233L,38234L,38235L,38236L,38237L,38238L,38239L,38240L,
-38241L,38242L,38243L,38244L,38245L,38246L,38247L,38248L,38249L,38250L,
-38251L,38252L,38253L,38254L,38255L,38256L,38257L,38258L,38259L,38260L,
-38261L,38262L,38263L,38264L,38265L,38266L,38267L,38268L,38269L,38270L,
-38271L,38272L,38273L,38274L,38275L,38276L,38277L,38278L,38279L,38280L,
-38281L,38282L,38283L,38284L,38285L,38286L,38287L,38288L,38289L,38290L,
-38291L,38292L,38293L,38294L,38295L,38296L,38297L,38298L,38299L,38300L,
-38301L,38302L,38303L,38304L,38305L,38306L,38307L,38308L,38309L,38310L,
-38311L,38312L,38313L,38314L,38315L,38316L,38317L,38318L,38319L,38320L,
-38321L,38322L,38323L,38324L,38325L,38326L,38327L,38328L,38329L,38330L,
-38331L,38332L,38333L,38334L,38335L,38336L,38337L,38338L,38339L,38340L,
-38341L,38342L,38343L,38344L,38345L,38346L,38347L,38348L,38349L,38350L,
-38351L,38352L,38353L,38354L,38355L,38356L,38357L,38358L,38359L,38360L,
-38361L,38362L,38363L,38364L,38365L,38366L,38367L,38368L,38369L,38370L,
-38371L,38372L,38373L,38374L,38375L,38376L,38377L,38378L,38379L,38380L,
-38381L,38382L,38383L,38384L,38385L,38386L,38387L,38388L,38389L,38390L,
-38391L,38392L,38393L,38394L,38395L,38396L,38397L,38398L,38399L,38400L,
-38401L,38402L,38403L,38404L,38405L,38406L,38407L,38408L,38409L,38410L,
-38411L,38412L,38413L,38414L,38415L,38416L,38417L,38418L,38419L,38420L,
-38421L,38422L,38423L,38424L,38425L,38426L,38427L,38428L,38429L,38430L,
-38431L,38432L,38433L,38434L,38435L,38436L,38437L,38438L,38439L,38440L,
-38441L,38442L,38443L,38444L,38445L,38446L,38447L,38448L,38449L,38450L,
-38451L,38452L,38453L,38454L,38455L,38456L,38457L,38458L,38459L,38460L,
-38461L,38462L,38463L,38464L,38465L,38466L,38467L,38468L,38469L,38470L,
-38471L,38472L,38473L,38474L,38475L,38476L,38477L,38478L,38479L,38480L,
-38481L,38482L,38483L,38484L,38485L,38486L,38487L,38488L,38489L,38490L,
-38491L,38492L,38493L,38494L,38495L,38496L,38497L,38498L,38499L,38500L,
-38501L,38502L,38503L,38504L,38505L,38506L,38507L,38508L,38509L,38510L,
-38511L,38512L,38513L,38514L,38515L,38516L,38517L,38518L,38519L,38520L,
-38521L,38522L,38523L,38524L,38525L,38526L,38527L,38528L,38529L,38530L,
-38531L,38532L,38533L,38534L,38535L,38536L,38537L,38538L,38539L,38540L,
-38541L,38542L,38543L,38544L,38545L,38546L,38547L,38548L,38549L,38550L,
-38551L,38552L,38553L,38554L,38555L,38556L,38557L,38558L,38559L,38560L,
-38561L,38562L,38563L,38564L,38565L,38566L,38567L,38568L,38569L,38570L,
-38571L,38572L,38573L,38574L,38575L,38576L,38577L,38578L,38579L,38580L,
-38581L,38582L,38583L,38584L,38585L,38586L,38587L,38588L,38589L,38590L,
-38591L,38592L,38593L,38594L,38595L,38596L,38597L,38598L,38599L,38600L,
-38601L,38602L,38603L,38604L,38605L,38606L,38607L,38608L,38609L,38610L,
-38611L,38612L,38613L,38614L,38615L,38616L,38617L,38618L,38619L,38620L,
-38621L,38622L,38623L,38624L,38625L,38626L,38627L,38628L,38629L,38630L,
-38631L,38632L,38633L,38634L,38635L,38636L,38637L,38638L,38639L,38640L,
-38641L,38642L,38643L,38644L,38645L,38646L,38647L,38648L,38649L,38650L,
-38651L,38652L,38653L,38654L,38655L,38656L,38657L,38658L,38659L,38660L,
-38661L,38662L,38663L,38664L,38665L,38666L,38667L,38668L,38669L,38670L,
-38671L,38672L,38673L,38674L,38675L,38676L,38677L,38678L,38679L,38680L,
-38681L,38682L,38683L,38684L,38685L,38686L,38687L,38688L,38689L,38690L,
-38691L,38692L,38693L,38694L,38695L,38696L,38697L,38698L,38699L,38700L,
-38701L,38702L,38703L,38704L,38705L,38706L,38707L,38708L,38709L,38710L,
-38711L,38712L,38713L,38714L,38715L,38716L,38717L,38718L,38719L,38720L,
-38721L,38722L,38723L,38724L,38725L,38726L,38727L,38728L,38729L,38730L,
-38731L,38732L,38733L,38734L,38735L,38736L,38737L,38738L,38739L,38740L,
-38741L,38742L,38743L,38744L,38745L,38746L,38747L,38748L,38749L,38750L,
-38751L,38752L,38753L,38754L,38755L,38756L,38757L,38758L,38759L,38760L,
-38761L,38762L,38763L,38764L,38765L,38766L,38767L,38768L,38769L,38770L,
-38771L,38772L,38773L,38774L,38775L,38776L,38777L,38778L,38779L,38780L,
-38781L,38782L,38783L,38784L,38785L,38786L,38787L,38788L,38789L,38790L,
-38791L,38792L,38793L,38794L,38795L,38796L,38797L,38798L,38799L,38800L,
-38801L,38802L,38803L,38804L,38805L,38806L,38807L,38808L,38809L,38810L,
-38811L,38812L,38813L,38814L,38815L,38816L,38817L,38818L,38819L,38820L,
-38821L,38822L,38823L,38824L,38825L,38826L,38827L,38828L,38829L,38830L,
-38831L,38832L,38833L,38834L,38835L,38836L,38837L,38838L,38839L,38840L,
-38841L,38842L,38843L,38844L,38845L,38846L,38847L,38848L,38849L,38850L,
-38851L,38852L,38853L,38854L,38855L,38856L,38857L,38858L,38859L,38860L,
-38861L,38862L,38863L,38864L,38865L,38866L,38867L,38868L,38869L,38870L,
-38871L,38872L,38873L,38874L,38875L,38876L,38877L,38878L,38879L,38880L,
-38881L,38882L,38883L,38884L,38885L,38886L,38887L,38888L,38889L,38890L,
-38891L,38892L,38893L,38894L,38895L,38896L,38897L,38898L,38899L,38900L,
-38901L,38902L,38903L,38904L,38905L,38906L,38907L,38908L,38909L,38910L,
-38911L,38912L,38913L,38914L,38915L,38916L,38917L,38918L,38919L,38920L,
-38921L,38922L,38923L,38924L,38925L,38926L,38927L,38928L,38929L,38930L,
-38931L,38932L,38933L,38934L,38935L,38936L,38937L,38938L,38939L,38940L,
-38941L,38942L,38943L,38944L,38945L,38946L,38947L,38948L,38949L,38950L,
-38951L,38952L,38953L,38954L,38955L,38956L,38957L,38958L,38959L,38960L,
-38961L,38962L,38963L,38964L,38965L,38966L,38967L,38968L,38969L,38970L,
-38971L,38972L,38973L,38974L,38975L,38976L,38977L,38978L,38979L,38980L,
-38981L,38982L,38983L,38984L,38985L,38986L,38987L,38988L,38989L,38990L,
-38991L,38992L,38993L,38994L,38995L,38996L,38997L,38998L,38999L,39000L,
-39001L,39002L,39003L,39004L,39005L,39006L,39007L,39008L,39009L,39010L,
-39011L,39012L,39013L,39014L,39015L,39016L,39017L,39018L,39019L,39020L,
-39021L,39022L,39023L,39024L,39025L,39026L,39027L,39028L,39029L,39030L,
-39031L,39032L,39033L,39034L,39035L,39036L,39037L,39038L,39039L,39040L,
-39041L,39042L,39043L,39044L,39045L,39046L,39047L,39048L,39049L,39050L,
-39051L,39052L,39053L,39054L,39055L,39056L,39057L,39058L,39059L,39060L,
-39061L,39062L,39063L,39064L,39065L,39066L,39067L,39068L,39069L,39070L,
-39071L,39072L,39073L,39074L,39075L,39076L,39077L,39078L,39079L,39080L,
-39081L,39082L,39083L,39084L,39085L,39086L,39087L,39088L,39089L,39090L,
-39091L,39092L,39093L,39094L,39095L,39096L,39097L,39098L,39099L,39100L,
-39101L,39102L,39103L,39104L,39105L,39106L,39107L,39108L,39109L,39110L,
-39111L,39112L,39113L,39114L,39115L,39116L,39117L,39118L,39119L,39120L,
-39121L,39122L,39123L,39124L,39125L,39126L,39127L,39128L,39129L,39130L,
-39131L,39132L,39133L,39134L,39135L,39136L,39137L,39138L,39139L,39140L,
-39141L,39142L,39143L,39144L,39145L,39146L,39147L,39148L,39149L,39150L,
-39151L,39152L,39153L,39154L,39155L,39156L,39157L,39158L,39159L,39160L,
-39161L,39162L,39163L,39164L,39165L,39166L,39167L,39168L,39169L,39170L,
-39171L,39172L,39173L,39174L,39175L,39176L,39177L,39178L,39179L,39180L,
-39181L,39182L,39183L,39184L,39185L,39186L,39187L,39188L,39189L,39190L,
-39191L,39192L,39193L,39194L,39195L,39196L,39197L,39198L,39199L,39200L,
-39201L,39202L,39203L,39204L,39205L,39206L,39207L,39208L,39209L,39210L,
-39211L,39212L,39213L,39214L,39215L,39216L,39217L,39218L,39219L,39220L,
-39221L,39222L,39223L,39224L,39225L,39226L,39227L,39228L,39229L,39230L,
-39231L,39232L,39233L,39234L,39235L,39236L,39237L,39238L,39239L,39240L,
-39241L,39242L,39243L,39244L,39245L,39246L,39247L,39248L,39249L,39250L,
-39251L,39252L,39253L,39254L,39255L,39256L,39257L,39258L,39259L,39260L,
-39261L,39262L,39263L,39264L,39265L,39266L,39267L,39268L,39269L,39270L,
-39271L,39272L,39273L,39274L,39275L,39276L,39277L,39278L,39279L,39280L,
-39281L,39282L,39283L,39284L,39285L,39286L,39287L,39288L,39289L,39290L,
-39291L,39292L,39293L,39294L,39295L,39296L,39297L,39298L,39299L,39300L,
-39301L,39302L,39303L,39304L,39305L,39306L,39307L,39308L,39309L,39310L,
-39311L,39312L,39313L,39314L,39315L,39316L,39317L,39318L,39319L,39320L,
-39321L,39322L,39323L,39324L,39325L,39326L,39327L,39328L,39329L,39330L,
-39331L,39332L,39333L,39334L,39335L,39336L,39337L,39338L,39339L,39340L,
-39341L,39342L,39343L,39344L,39345L,39346L,39347L,39348L,39349L,39350L,
-39351L,39352L,39353L,39354L,39355L,39356L,39357L,39358L,39359L,39360L,
-39361L,39362L,39363L,39364L,39365L,39366L,39367L,39368L,39369L,39370L,
-39371L,39372L,39373L,39374L,39375L,39376L,39377L,39378L,39379L,39380L,
-39381L,39382L,39383L,39384L,39385L,39386L,39387L,39388L,39389L,39390L,
-39391L,39392L,39393L,39394L,39395L,39396L,39397L,39398L,39399L,39400L,
-39401L,39402L,39403L,39404L,39405L,39406L,39407L,39408L,39409L,39410L,
-39411L,39412L,39413L,39414L,39415L,39416L,39417L,39418L,39419L,39420L,
-39421L,39422L,39423L,39424L,39425L,39426L,39427L,39428L,39429L,39430L,
-39431L,39432L,39433L,39434L,39435L,39436L,39437L,39438L,39439L,39440L,
-39441L,39442L,39443L,39444L,39445L,39446L,39447L,39448L,39449L,39450L,
-39451L,39452L,39453L,39454L,39455L,39456L,39457L,39458L,39459L,39460L,
-39461L,39462L,39463L,39464L,39465L,39466L,39467L,39468L,39469L,39470L,
-39471L,39472L,39473L,39474L,39475L,39476L,39477L,39478L,39479L,39480L,
-39481L,39482L,39483L,39484L,39485L,39486L,39487L,39488L,39489L,39490L,
-39491L,39492L,39493L,39494L,39495L,39496L,39497L,39498L,39499L,39500L,
-39501L,39502L,39503L,39504L,39505L,39506L,39507L,39508L,39509L,39510L,
-39511L,39512L,39513L,39514L,39515L,39516L,39517L,39518L,39519L,39520L,
-39521L,39522L,39523L,39524L,39525L,39526L,39527L,39528L,39529L,39530L,
-39531L,39532L,39533L,39534L,39535L,39536L,39537L,39538L,39539L,39540L,
-39541L,39542L,39543L,39544L,39545L,39546L,39547L,39548L,39549L,39550L,
-39551L,39552L,39553L,39554L,39555L,39556L,39557L,39558L,39559L,39560L,
-39561L,39562L,39563L,39564L,39565L,39566L,39567L,39568L,39569L,39570L,
-39571L,39572L,39573L,39574L,39575L,39576L,39577L,39578L,39579L,39580L,
-39581L,39582L,39583L,39584L,39585L,39586L,39587L,39588L,39589L,39590L,
-39591L,39592L,39593L,39594L,39595L,39596L,39597L,39598L,39599L,39600L,
-39601L,39602L,39603L,39604L,39605L,39606L,39607L,39608L,39609L,39610L,
-39611L,39612L,39613L,39614L,39615L,39616L,39617L,39618L,39619L,39620L,
-39621L,39622L,39623L,39624L,39625L,39626L,39627L,39628L,39629L,39630L,
-39631L,39632L,39633L,39634L,39635L,39636L,39637L,39638L,39639L,39640L,
-39641L,39642L,39643L,39644L,39645L,39646L,39647L,39648L,39649L,39650L,
-39651L,39652L,39653L,39654L,39655L,39656L,39657L,39658L,39659L,39660L,
-39661L,39662L,39663L,39664L,39665L,39666L,39667L,39668L,39669L,39670L,
-39671L,39672L,39673L,39674L,39675L,39676L,39677L,39678L,39679L,39680L,
-39681L,39682L,39683L,39684L,39685L,39686L,39687L,39688L,39689L,39690L,
-39691L,39692L,39693L,39694L,39695L,39696L,39697L,39698L,39699L,39700L,
-39701L,39702L,39703L,39704L,39705L,39706L,39707L,39708L,39709L,39710L,
-39711L,39712L,39713L,39714L,39715L,39716L,39717L,39718L,39719L,39720L,
-39721L,39722L,39723L,39724L,39725L,39726L,39727L,39728L,39729L,39730L,
-39731L,39732L,39733L,39734L,39735L,39736L,39737L,39738L,39739L,39740L,
-39741L,39742L,39743L,39744L,39745L,39746L,39747L,39748L,39749L,39750L,
-39751L,39752L,39753L,39754L,39755L,39756L,39757L,39758L,39759L,39760L,
-39761L,39762L,39763L,39764L,39765L,39766L,39767L,39768L,39769L,39770L,
-39771L,39772L,39773L,39774L,39775L,39776L,39777L,39778L,39779L,39780L,
-39781L,39782L,39783L,39784L,39785L,39786L,39787L,39788L,39789L,39790L,
-39791L,39792L,39793L,39794L,39795L,39796L,39797L,39798L,39799L,39800L,
-39801L,39802L,39803L,39804L,39805L,39806L,39807L,39808L,39809L,39810L,
-39811L,39812L,39813L,39814L,39815L,39816L,39817L,39818L,39819L,39820L,
-39821L,39822L,39823L,39824L,39825L,39826L,39827L,39828L,39829L,39830L,
-39831L,39832L,39833L,39834L,39835L,39836L,39837L,39838L,39839L,39840L,
-39841L,39842L,39843L,39844L,39845L,39846L,39847L,39848L,39849L,39850L,
-39851L,39852L,39853L,39854L,39855L,39856L,39857L,39858L,39859L,39860L,
-39861L,39862L,39863L,39864L,39865L,39866L,39867L,39868L,39869L,39870L,
-39871L,39872L,39873L,39874L,39875L,39876L,39877L,39878L,39879L,39880L,
-39881L,39882L,39883L,39884L,39885L,39886L,39887L,39888L,39889L,39890L,
-39891L,39892L,39893L,39894L,39895L,39896L,39897L,39898L,39899L,39900L,
-39901L,39902L,39903L,39904L,39905L,39906L,39907L,39908L,39909L,39910L,
-39911L,39912L,39913L,39914L,39915L,39916L,39917L,39918L,39919L,39920L,
-39921L,39922L,39923L,39924L,39925L,39926L,39927L,39928L,39929L,39930L,
-39931L,39932L,39933L,39934L,39935L,39936L,39937L,39938L,39939L,39940L,
-39941L,39942L,39943L,39944L,39945L,39946L,39947L,39948L,39949L,39950L,
-39951L,39952L,39953L,39954L,39955L,39956L,39957L,39958L,39959L,39960L,
-39961L,39962L,39963L,39964L,39965L,39966L,39967L,39968L,39969L,39970L,
-39971L,39972L,39973L,39974L,39975L,39976L,39977L,39978L,39979L,39980L,
-39981L,39982L,39983L,39984L,39985L,39986L,39987L,39988L,39989L,39990L,
-39991L,39992L,39993L,39994L,39995L,39996L,39997L,39998L,39999L,40000L,
-40001L,40002L,40003L,40004L,40005L,40006L,40007L,40008L,40009L,40010L,
-40011L,40012L,40013L,40014L,40015L,40016L,40017L,40018L,40019L,40020L,
-40021L,40022L,40023L,40024L,40025L,40026L,40027L,40028L,40029L,40030L,
-40031L,40032L,40033L,40034L,40035L,40036L,40037L,40038L,40039L,40040L,
-40041L,40042L,40043L,40044L,40045L,40046L,40047L,40048L,40049L,40050L,
-40051L,40052L,40053L,40054L,40055L,40056L,40057L,40058L,40059L,40060L,
-40061L,40062L,40063L,40064L,40065L,40066L,40067L,40068L,40069L,40070L,
-40071L,40072L,40073L,40074L,40075L,40076L,40077L,40078L,40079L,40080L,
-40081L,40082L,40083L,40084L,40085L,40086L,40087L,40088L,40089L,40090L,
-40091L,40092L,40093L,40094L,40095L,40096L,40097L,40098L,40099L,40100L,
-40101L,40102L,40103L,40104L,40105L,40106L,40107L,40108L,40109L,40110L,
-40111L,40112L,40113L,40114L,40115L,40116L,40117L,40118L,40119L,40120L,
-40121L,40122L,40123L,40124L,40125L,40126L,40127L,40128L,40129L,40130L,
-40131L,40132L,40133L,40134L,40135L,40136L,40137L,40138L,40139L,40140L,
-40141L,40142L,40143L,40144L,40145L,40146L,40147L,40148L,40149L,40150L,
-40151L,40152L,40153L,40154L,40155L,40156L,40157L,40158L,40159L,40160L,
-40161L,40162L,40163L,40164L,40165L,40166L,40167L,40168L,40169L,40170L,
-40171L,40172L,40173L,40174L,40175L,40176L,40177L,40178L,40179L,40180L,
-40181L,40182L,40183L,40184L,40185L,40186L,40187L,40188L,40189L,40190L,
-40191L,40192L,40193L,40194L,40195L,40196L,40197L,40198L,40199L,40200L,
-40201L,40202L,40203L,40204L,40205L,40206L,40207L,40208L,40209L,40210L,
-40211L,40212L,40213L,40214L,40215L,40216L,40217L,40218L,40219L,40220L,
-40221L,40222L,40223L,40224L,40225L,40226L,40227L,40228L,40229L,40230L,
-40231L,40232L,40233L,40234L,40235L,40236L,40237L,40238L,40239L,40240L,
-40241L,40242L,40243L,40244L,40245L,40246L,40247L,40248L,40249L,40250L,
-40251L,40252L,40253L,40254L,40255L,40256L,40257L,40258L,40259L,40260L,
-40261L,40262L,40263L,40264L,40265L,40266L,40267L,40268L,40269L,40270L,
-40271L,40272L,40273L,40274L,40275L,40276L,40277L,40278L,40279L,40280L,
-40281L,40282L,40283L,40284L,40285L,40286L,40287L,40288L,40289L,40290L,
-40291L,40292L,40293L,40294L,40295L,40296L,40297L,40298L,40299L,40300L,
-40301L,40302L,40303L,40304L,40305L,40306L,40307L,40308L,40309L,40310L,
-40311L,40312L,40313L,40314L,40315L,40316L,40317L,40318L,40319L,40320L,
-40321L,40322L,40323L,40324L,40325L,40326L,40327L,40328L,40329L,40330L,
-40331L,40332L,40333L,40334L,40335L,40336L,40337L,40338L,40339L,40340L,
-40341L,40342L,40343L,40344L,40345L,40346L,40347L,40348L,40349L,40350L,
-40351L,40352L,40353L,40354L,40355L,40356L,40357L,40358L,40359L,40360L,
-40361L,40362L,40363L,40364L,40365L,40366L,40367L,40368L,40369L,40370L,
-40371L,40372L,40373L,40374L,40375L,40376L,40377L,40378L,40379L,40380L,
-40381L,40382L,40383L,40384L,40385L,40386L,40387L,40388L,40389L,40390L,
-40391L,40392L,40393L,40394L,40395L,40396L,40397L,40398L,40399L,40400L,
-40401L,40402L,40403L,40404L,40405L,40406L,40407L,40408L,40409L,40410L,
-40411L,40412L,40413L,40414L,40415L,40416L,40417L,40418L,40419L,40420L,
-40421L,40422L,40423L,40424L,40425L,40426L,40427L,40428L,40429L,40430L,
-40431L,40432L,40433L,40434L,40435L,40436L,40437L,40438L,40439L,40440L,
-40441L,40442L,40443L,40444L,40445L,40446L,40447L,40448L,40449L,40450L,
-40451L,40452L,40453L,40454L,40455L,40456L,40457L,40458L,40459L,40460L,
-40461L,40462L,40463L,40464L,40465L,40466L,40467L,40468L,40469L,40470L,
-40471L,40472L,40473L,40474L,40475L,40476L,40477L,40478L,40479L,40480L,
-40481L,40482L,40483L,40484L,40485L,40486L,40487L,40488L,40489L,40490L,
-40491L,40492L,40493L,40494L,40495L,40496L,40497L,40498L,40499L,40500L,
-40501L,40502L,40503L,40504L,40505L,40506L,40507L,40508L,40509L,40510L,
-40511L,40512L,40513L,40514L,40515L,40516L,40517L,40518L,40519L,40520L,
-40521L,40522L,40523L,40524L,40525L,40526L,40527L,40528L,40529L,40530L,
-40531L,40532L,40533L,40534L,40535L,40536L,40537L,40538L,40539L,40540L,
-40541L,40542L,40543L,40544L,40545L,40546L,40547L,40548L,40549L,40550L,
-40551L,40552L,40553L,40554L,40555L,40556L,40557L,40558L,40559L,40560L,
-40561L,40562L,40563L,40564L,40565L,40566L,40567L,40568L,40569L,40570L,
-40571L,40572L,40573L,40574L,40575L,40576L,40577L,40578L,40579L,40580L,
-40581L,40582L,40583L,40584L,40585L,40586L,40587L,40588L,40589L,40590L,
-40591L,40592L,40593L,40594L,40595L,40596L,40597L,40598L,40599L,40600L,
-40601L,40602L,40603L,40604L,40605L,40606L,40607L,40608L,40609L,40610L,
-40611L,40612L,40613L,40614L,40615L,40616L,40617L,40618L,40619L,40620L,
-40621L,40622L,40623L,40624L,40625L,40626L,40627L,40628L,40629L,40630L,
-40631L,40632L,40633L,40634L,40635L,40636L,40637L,40638L,40639L,40640L,
-40641L,40642L,40643L,40644L,40645L,40646L,40647L,40648L,40649L,40650L,
-40651L,40652L,40653L,40654L,40655L,40656L,40657L,40658L,40659L,40660L,
-40661L,40662L,40663L,40664L,40665L,40666L,40667L,40668L,40669L,40670L,
-40671L,40672L,40673L,40674L,40675L,40676L,40677L,40678L,40679L,40680L,
-40681L,40682L,40683L,40684L,40685L,40686L,40687L,40688L,40689L,40690L,
-40691L,40692L,40693L,40694L,40695L,40696L,40697L,40698L,40699L,40700L,
-40701L,40702L,40703L,40704L,40705L,40706L,40707L,40708L,40709L,40710L,
-40711L,40712L,40713L,40714L,40715L,40716L,40717L,40718L,40719L,40720L,
-40721L,40722L,40723L,40724L,40725L,40726L,40727L,40728L,40729L,40730L,
-40731L,40732L,40733L,40734L,40735L,40736L,40737L,40738L,40739L,40740L,
-40741L,40742L,40743L,40744L,40745L,40746L,40747L,40748L,40749L,40750L,
-40751L,40752L,40753L,40754L,40755L,40756L,40757L,40758L,40759L,40760L,
-40761L,40762L,40763L,40764L,40765L,40766L,40767L,40768L,40769L,40770L,
-40771L,40772L,40773L,40774L,40775L,40776L,40777L,40778L,40779L,40780L,
-40781L,40782L,40783L,40784L,40785L,40786L,40787L,40788L,40789L,40790L,
-40791L,40792L,40793L,40794L,40795L,40796L,40797L,40798L,40799L,40800L,
-40801L,40802L,40803L,40804L,40805L,40806L,40807L,40808L,40809L,40810L,
-40811L,40812L,40813L,40814L,40815L,40816L,40817L,40818L,40819L,40820L,
-40821L,40822L,40823L,40824L,40825L,40826L,40827L,40828L,40829L,40830L,
-40831L,40832L,40833L,40834L,40835L,40836L,40837L,40838L,40839L,40840L,
-40841L,40842L,40843L,40844L,40845L,40846L,40847L,40848L,40849L,40850L,
-40851L,40852L,40853L,40854L,40855L,40856L,40857L,40858L,40859L,40860L,
-40861L,40862L,40863L,40864L,40865L,40866L,40867L,40868L,40869L,40870L,
-40871L,40872L,40873L,40874L,40875L,40876L,40877L,40878L,40879L,40880L,
-40881L,40882L,40883L,40884L,40885L,40886L,40887L,40888L,40889L,40890L,
-40891L,40892L,40893L,40894L,40895L,40896L,40897L,40898L,40899L,40900L,
-40901L,40902L,40903L,40904L,40905L,40906L,40907L,40908L,40909L,40910L,
-40911L,40912L,40913L,40914L,40915L,40916L,40917L,40918L,40919L,40920L,
-40921L,40922L,40923L,40924L,40925L,40926L,40927L,40928L,40929L,40930L,
-40931L,40932L,40933L,40934L,40935L,40936L,40937L,40938L,40939L,40940L,
-40941L,40942L,40943L,40944L,40945L,40946L,40947L,40948L,40949L,40950L,
-40951L,40952L,40953L,40954L,40955L,40956L,40957L,40958L,40959L,40960L,
-40961L,40962L,40963L,40964L,40965L,40966L,40967L,40968L,40969L,40970L,
-40971L,40972L,40973L,40974L,40975L,40976L,40977L,40978L,40979L,40980L,
-40981L,40982L,40983L,40984L,40985L,40986L,40987L,40988L,40989L,40990L,
-40991L,40992L,40993L,40994L,40995L,40996L,40997L,40998L,40999L,41000L,
-41001L,41002L,41003L,41004L,41005L,41006L,41007L,41008L,41009L,41010L,
-41011L,41012L,41013L,41014L,41015L,41016L,41017L,41018L,41019L,41020L,
-41021L,41022L,41023L,41024L,41025L,41026L,41027L,41028L,41029L,41030L,
-41031L,41032L,41033L,41034L,41035L,41036L,41037L,41038L,41039L,41040L,
-41041L,41042L,41043L,41044L,41045L,41046L,41047L,41048L,41049L,41050L,
-41051L,41052L,41053L,41054L,41055L,41056L,41057L,41058L,41059L,41060L,
-41061L,41062L,41063L,41064L,41065L,41066L,41067L,41068L,41069L,41070L,
-41071L,41072L,41073L,41074L,41075L,41076L,41077L,41078L,41079L,41080L,
-41081L,41082L,41083L,41084L,41085L,41086L,41087L,41088L,41089L,41090L,
-41091L,41092L,41093L,41094L,41095L,41096L,41097L,41098L,41099L,41100L,
-41101L,41102L,41103L,41104L,41105L,41106L,41107L,41108L,41109L,41110L,
-41111L,41112L,41113L,41114L,41115L,41116L,41117L,41118L,41119L,41120L,
-41121L,41122L,41123L,41124L,41125L,41126L,41127L,41128L,41129L,41130L,
-41131L,41132L,41133L,41134L,41135L,41136L,41137L,41138L,41139L,41140L,
-41141L,41142L,41143L,41144L,41145L,41146L,41147L,41148L,41149L,41150L,
-41151L,41152L,41153L,41154L,41155L,41156L,41157L,41158L,41159L,41160L,
-41161L,41162L,41163L,41164L,41165L,41166L,41167L,41168L,41169L,41170L,
-41171L,41172L,41173L,41174L,41175L,41176L,41177L,41178L,41179L,41180L,
-41181L,41182L,41183L,41184L,41185L,41186L,41187L,41188L,41189L,41190L,
-41191L,41192L,41193L,41194L,41195L,41196L,41197L,41198L,41199L,41200L,
-41201L,41202L,41203L,41204L,41205L,41206L,41207L,41208L,41209L,41210L,
-41211L,41212L,41213L,41214L,41215L,41216L,41217L,41218L,41219L,41220L,
-41221L,41222L,41223L,41224L,41225L,41226L,41227L,41228L,41229L,41230L,
-41231L,41232L,41233L,41234L,41235L,41236L,41237L,41238L,41239L,41240L,
-41241L,41242L,41243L,41244L,41245L,41246L,41247L,41248L,41249L,41250L,
-41251L,41252L,41253L,41254L,41255L,41256L,41257L,41258L,41259L,41260L,
-41261L,41262L,41263L,41264L,41265L,41266L,41267L,41268L,41269L,41270L,
-41271L,41272L,41273L,41274L,41275L,41276L,41277L,41278L,41279L,41280L,
-41281L,41282L,41283L,41284L,41285L,41286L,41287L,41288L,41289L,41290L,
-41291L,41292L,41293L,41294L,41295L,41296L,41297L,41298L,41299L,41300L,
-41301L,41302L,41303L,41304L,41305L,41306L,41307L,41308L,41309L,41310L,
-41311L,41312L,41313L,41314L,41315L,41316L,41317L,41318L,41319L,41320L,
-41321L,41322L,41323L,41324L,41325L,41326L,41327L,41328L,41329L,41330L,
-41331L,41332L,41333L,41334L,41335L,41336L,41337L,41338L,41339L,41340L,
-41341L,41342L,41343L,41344L,41345L,41346L,41347L,41348L,41349L,41350L,
-41351L,41352L,41353L,41354L,41355L,41356L,41357L,41358L,41359L,41360L,
-41361L,41362L,41363L,41364L,41365L,41366L,41367L,41368L,41369L,41370L,
-41371L,41372L,41373L,41374L,41375L,41376L,41377L,41378L,41379L,41380L,
-41381L,41382L,41383L,41384L,41385L,41386L,41387L,41388L,41389L,41390L,
-41391L,41392L,41393L,41394L,41395L,41396L,41397L,41398L,41399L,41400L,
-41401L,41402L,41403L,41404L,41405L,41406L,41407L,41408L,41409L,41410L,
-41411L,41412L,41413L,41414L,41415L,41416L,41417L,41418L,41419L,41420L,
-41421L,41422L,41423L,41424L,41425L,41426L,41427L,41428L,41429L,41430L,
-41431L,41432L,41433L,41434L,41435L,41436L,41437L,41438L,41439L,41440L,
-41441L,41442L,41443L,41444L,41445L,41446L,41447L,41448L,41449L,41450L,
-41451L,41452L,41453L,41454L,41455L,41456L,41457L,41458L,41459L,41460L,
-41461L,41462L,41463L,41464L,41465L,41466L,41467L,41468L,41469L,41470L,
-41471L,41472L,41473L,41474L,41475L,41476L,41477L,41478L,41479L,41480L,
-41481L,41482L,41483L,41484L,41485L,41486L,41487L,41488L,41489L,41490L,
-41491L,41492L,41493L,41494L,41495L,41496L,41497L,41498L,41499L,41500L,
-41501L,41502L,41503L,41504L,41505L,41506L,41507L,41508L,41509L,41510L,
-41511L,41512L,41513L,41514L,41515L,41516L,41517L,41518L,41519L,41520L,
-41521L,41522L,41523L,41524L,41525L,41526L,41527L,41528L,41529L,41530L,
-41531L,41532L,41533L,41534L,41535L,41536L,41537L,41538L,41539L,41540L,
-41541L,41542L,41543L,41544L,41545L,41546L,41547L,41548L,41549L,41550L,
-41551L,41552L,41553L,41554L,41555L,41556L,41557L,41558L,41559L,41560L,
-41561L,41562L,41563L,41564L,41565L,41566L,41567L,41568L,41569L,41570L,
-41571L,41572L,41573L,41574L,41575L,41576L,41577L,41578L,41579L,41580L,
-41581L,41582L,41583L,41584L,41585L,41586L,41587L,41588L,41589L,41590L,
-41591L,41592L,41593L,41594L,41595L,41596L,41597L,41598L,41599L,41600L,
-41601L,41602L,41603L,41604L,41605L,41606L,41607L,41608L,41609L,41610L,
-41611L,41612L,41613L,41614L,41615L,41616L,41617L,41618L,41619L,41620L,
-41621L,41622L,41623L,41624L,41625L,41626L,41627L,41628L,41629L,41630L,
-41631L,41632L,41633L,41634L,41635L,41636L,41637L,41638L,41639L,41640L,
-41641L,41642L,41643L,41644L,41645L,41646L,41647L,41648L,41649L,41650L,
-41651L,41652L,41653L,41654L,41655L,41656L,41657L,41658L,41659L,41660L,
-41661L,41662L,41663L,41664L,41665L,41666L,41667L,41668L,41669L,41670L,
-41671L,41672L,41673L,41674L,41675L,41676L,41677L,41678L,41679L,41680L,
-41681L,41682L,41683L,41684L,41685L,41686L,41687L,41688L,41689L,41690L,
-41691L,41692L,41693L,41694L,41695L,41696L,41697L,41698L,41699L,41700L,
-41701L,41702L,41703L,41704L,41705L,41706L,41707L,41708L,41709L,41710L,
-41711L,41712L,41713L,41714L,41715L,41716L,41717L,41718L,41719L,41720L,
-41721L,41722L,41723L,41724L,41725L,41726L,41727L,41728L,41729L,41730L,
-41731L,41732L,41733L,41734L,41735L,41736L,41737L,41738L,41739L,41740L,
-41741L,41742L,41743L,41744L,41745L,41746L,41747L,41748L,41749L,41750L,
-41751L,41752L,41753L,41754L,41755L,41756L,41757L,41758L,41759L,41760L,
-41761L,41762L,41763L,41764L,41765L,41766L,41767L,41768L,41769L,41770L,
-41771L,41772L,41773L,41774L,41775L,41776L,41777L,41778L,41779L,41780L,
-41781L,41782L,41783L,41784L,41785L,41786L,41787L,41788L,41789L,41790L,
-41791L,41792L,41793L,41794L,41795L,41796L,41797L,41798L,41799L,41800L,
-41801L,41802L,41803L,41804L,41805L,41806L,41807L,41808L,41809L,41810L,
-41811L,41812L,41813L,41814L,41815L,41816L,41817L,41818L,41819L,41820L,
-41821L,41822L,41823L,41824L,41825L,41826L,41827L,41828L,41829L,41830L,
-41831L,41832L,41833L,41834L,41835L,41836L,41837L,41838L,41839L,41840L,
-41841L,41842L,41843L,41844L,41845L,41846L,41847L,41848L,41849L,41850L,
-41851L,41852L,41853L,41854L,41855L,41856L,41857L,41858L,41859L,41860L,
-41861L,41862L,41863L,41864L,41865L,41866L,41867L,41868L,41869L,41870L,
-41871L,41872L,41873L,41874L,41875L,41876L,41877L,41878L,41879L,41880L,
-41881L,41882L,41883L,41884L,41885L,41886L,41887L,41888L,41889L,41890L,
-41891L,41892L,41893L,41894L,41895L,41896L,41897L,41898L,41899L,41900L,
-41901L,41902L,41903L,41904L,41905L,41906L,41907L,41908L,41909L,41910L,
-41911L,41912L,41913L,41914L,41915L,41916L,41917L,41918L,41919L,41920L,
-41921L,41922L,41923L,41924L,41925L,41926L,41927L,41928L,41929L,41930L,
-41931L,41932L,41933L,41934L,41935L,41936L,41937L,41938L,41939L,41940L,
-41941L,41942L,41943L,41944L,41945L,41946L,41947L,41948L,41949L,41950L,
-41951L,41952L,41953L,41954L,41955L,41956L,41957L,41958L,41959L,41960L,
-41961L,41962L,41963L,41964L,41965L,41966L,41967L,41968L,41969L,41970L,
-41971L,41972L,41973L,41974L,41975L,41976L,41977L,41978L,41979L,41980L,
-41981L,41982L,41983L,41984L,41985L,41986L,41987L,41988L,41989L,41990L,
-41991L,41992L,41993L,41994L,41995L,41996L,41997L,41998L,41999L,42000L,
-42001L,42002L,42003L,42004L,42005L,42006L,42007L,42008L,42009L,42010L,
-42011L,42012L,42013L,42014L,42015L,42016L,42017L,42018L,42019L,42020L,
-42021L,42022L,42023L,42024L,42025L,42026L,42027L,42028L,42029L,42030L,
-42031L,42032L,42033L,42034L,42035L,42036L,42037L,42038L,42039L,42040L,
-42041L,42042L,42043L,42044L,42045L,42046L,42047L,42048L,42049L,42050L,
-42051L,42052L,42053L,42054L,42055L,42056L,42057L,42058L,42059L,42060L,
-42061L,42062L,42063L,42064L,42065L,42066L,42067L,42068L,42069L,42070L,
-42071L,42072L,42073L,42074L,42075L,42076L,42077L,42078L,42079L,42080L,
-42081L,42082L,42083L,42084L,42085L,42086L,42087L,42088L,42089L,42090L,
-42091L,42092L,42093L,42094L,42095L,42096L,42097L,42098L,42099L,42100L,
-42101L,42102L,42103L,42104L,42105L,42106L,42107L,42108L,42109L,42110L,
-42111L,42112L,42113L,42114L,42115L,42116L,42117L,42118L,42119L,42120L,
-42121L,42122L,42123L,42124L,42125L,42126L,42127L,42128L,42129L,42130L,
-42131L,42132L,42133L,42134L,42135L,42136L,42137L,42138L,42139L,42140L,
-42141L,42142L,42143L,42144L,42145L,42146L,42147L,42148L,42149L,42150L,
-42151L,42152L,42153L,42154L,42155L,42156L,42157L,42158L,42159L,42160L,
-42161L,42162L,42163L,42164L,42165L,42166L,42167L,42168L,42169L,42170L,
-42171L,42172L,42173L,42174L,42175L,42176L,42177L,42178L,42179L,42180L,
-42181L,42182L,42183L,42184L,42185L,42186L,42187L,42188L,42189L,42190L,
-42191L,42192L,42193L,42194L,42195L,42196L,42197L,42198L,42199L,42200L,
-42201L,42202L,42203L,42204L,42205L,42206L,42207L,42208L,42209L,42210L,
-42211L,42212L,42213L,42214L,42215L,42216L,42217L,42218L,42219L,42220L,
-42221L,42222L,42223L,42224L,42225L,42226L,42227L,42228L,42229L,42230L,
-42231L,42232L,42233L,42234L,42235L,42236L,42237L,42238L,42239L,42240L,
-42241L,42242L,42243L,42244L,42245L,42246L,42247L,42248L,42249L,42250L,
-42251L,42252L,42253L,42254L,42255L,42256L,42257L,42258L,42259L,42260L,
-42261L,42262L,42263L,42264L,42265L,42266L,42267L,42268L,42269L,42270L,
-42271L,42272L,42273L,42274L,42275L,42276L,42277L,42278L,42279L,42280L,
-42281L,42282L,42283L,42284L,42285L,42286L,42287L,42288L,42289L,42290L,
-42291L,42292L,42293L,42294L,42295L,42296L,42297L,42298L,42299L,42300L,
-42301L,42302L,42303L,42304L,42305L,42306L,42307L,42308L,42309L,42310L,
-42311L,42312L,42313L,42314L,42315L,42316L,42317L,42318L,42319L,42320L,
-42321L,42322L,42323L,42324L,42325L,42326L,42327L,42328L,42329L,42330L,
-42331L,42332L,42333L,42334L,42335L,42336L,42337L,42338L,42339L,42340L,
-42341L,42342L,42343L,42344L,42345L,42346L,42347L,42348L,42349L,42350L,
-42351L,42352L,42353L,42354L,42355L,42356L,42357L,42358L,42359L,42360L,
-42361L,42362L,42363L,42364L,42365L,42366L,42367L,42368L,42369L,42370L,
-42371L,42372L,42373L,42374L,42375L,42376L,42377L,42378L,42379L,42380L,
-42381L,42382L,42383L,42384L,42385L,42386L,42387L,42388L,42389L,42390L,
-42391L,42392L,42393L,42394L,42395L,42396L,42397L,42398L,42399L,42400L,
-42401L,42402L,42403L,42404L,42405L,42406L,42407L,42408L,42409L,42410L,
-42411L,42412L,42413L,42414L,42415L,42416L,42417L,42418L,42419L,42420L,
-42421L,42422L,42423L,42424L,42425L,42426L,42427L,42428L,42429L,42430L,
-42431L,42432L,42433L,42434L,42435L,42436L,42437L,42438L,42439L,42440L,
-42441L,42442L,42443L,42444L,42445L,42446L,42447L,42448L,42449L,42450L,
-42451L,42452L,42453L,42454L,42455L,42456L,42457L,42458L,42459L,42460L,
-42461L,42462L,42463L,42464L,42465L,42466L,42467L,42468L,42469L,42470L,
-42471L,42472L,42473L,42474L,42475L,42476L,42477L,42478L,42479L,42480L,
-42481L,42482L,42483L,42484L,42485L,42486L,42487L,42488L,42489L,42490L,
-42491L,42492L,42493L,42494L,42495L,42496L,42497L,42498L,42499L,42500L,
-42501L,42502L,42503L,42504L,42505L,42506L,42507L,42508L,42509L,42510L,
-42511L,42512L,42513L,42514L,42515L,42516L,42517L,42518L,42519L,42520L,
-42521L,42522L,42523L,42524L,42525L,42526L,42527L,42528L,42529L,42530L,
-42531L,42532L,42533L,42534L,42535L,42536L,42537L,42538L,42539L,42540L,
-42541L,42542L,42543L,42544L,42545L,42546L,42547L,42548L,42549L,42550L,
-42551L,42552L,42553L,42554L,42555L,42556L,42557L,42558L,42559L,42560L,
-42560L,42562L,42562L,42564L,42564L,42566L,42566L,42568L,42568L,42570L,
-42570L,42572L,42572L,42574L,42574L,42576L,42576L,42578L,42578L,42580L,
-42580L,42582L,42582L,42584L,42584L,42586L,42586L,42588L,42588L,42590L,
-42590L,42592L,42592L,42594L,42594L,42596L,42596L,42598L,42598L,42600L,
-42600L,42602L,42602L,42604L,42604L,42606L,42607L,42608L,42609L,42610L,
-42611L,42612L,42613L,42614L,42615L,42616L,42617L,42618L,42619L,42620L,
-42621L,42622L,42623L,42624L,42624L,42626L,42626L,42628L,42628L,42630L,
-42630L,42632L,42632L,42634L,42634L,42636L,42636L,42638L,42638L,42640L,
-42640L,42642L,42642L,42644L,42644L,42646L,42646L,42648L,42648L,42650L,
-42650L,42652L,42653L,42654L,42655L,42656L,42657L,42658L,42659L,42660L,
-42661L,42662L,42663L,42664L,42665L,42666L,42667L,42668L,42669L,42670L,
-42671L,42672L,42673L,42674L,42675L,42676L,42677L,42678L,42679L,42680L,
-42681L,42682L,42683L,42684L,42685L,42686L,42687L,42688L,42689L,42690L,
-42691L,42692L,42693L,42694L,42695L,42696L,42697L,42698L,42699L,42700L,
-42701L,42702L,42703L,42704L,42705L,42706L,42707L,42708L,42709L,42710L,
-42711L,42712L,42713L,42714L,42715L,42716L,42717L,42718L,42719L,42720L,
-42721L,42722L,42723L,42724L,42725L,42726L,42727L,42728L,42729L,42730L,
-42731L,42732L,42733L,42734L,42735L,42736L,42737L,42738L,42739L,42740L,
-42741L,42742L,42743L,42744L,42745L,42746L,42747L,42748L,42749L,42750L,
-42751L,42752L,42753L,42754L,42755L,42756L,42757L,42758L,42759L,42760L,
-42761L,42762L,42763L,42764L,42765L,42766L,42767L,42768L,42769L,42770L,
-42771L,42772L,42773L,42774L,42775L,42776L,42777L,42778L,42779L,42780L,
-42781L,42782L,42783L,42784L,42785L,42786L,42786L,42788L,42788L,42790L,
-42790L,42792L,42792L,42794L,42794L,42796L,42796L,42798L,42798L,42800L,
-42801L,42802L,42802L,42804L,42804L,42806L,42806L,42808L,42808L,42810L,
-42810L,42812L,42812L,42814L,42814L,42816L,42816L,42818L,42818L,42820L,
-42820L,42822L,42822L,42824L,42824L,42826L,42826L,42828L,42828L,42830L,
-42830L,42832L,42832L,42834L,42834L,42836L,42836L,42838L,42838L,42840L,
-42840L,42842L,42842L,42844L,42844L,42846L,42846L,42848L,42848L,42850L,
-42850L,42852L,42852L,42854L,42854L,42856L,42856L,42858L,42858L,42860L,
-42860L,42862L,42862L,42864L,42865L,42866L,42867L,42868L,42869L,42870L,
-42871L,42872L,42873L,42873L,42875L,42875L,42877L,42878L,42878L,42880L,
-42880L,42882L,42882L,42884L,42884L,42886L,42886L,42888L,42889L,42890L,
-42891L,42891L,42893L,42894L,42895L,42896L,42896L,42898L,42898L,42900L,
-42901L,42902L,42902L,42904L,42904L,42906L,42906L,42908L,42908L,42910L,
-42910L,42912L,42912L,42914L,42914L,42916L,42916L,42918L,42918L,42920L,
-42920L,42922L,42923L,42924L,42925L,42926L,42927L,42928L,42929L,42930L,
-42931L,42932L,42932L,42934L,42934L,42936L,42937L,42938L,42939L,42940L,
-42941L,42942L,42943L,42944L,42945L,42946L,42947L,42948L,42949L,42950L,
-42951L,42952L,42953L,42954L,42955L,42956L,42957L,42958L,42959L,42960L,
-42961L,42962L,42963L,42964L,42965L,42966L,42967L,42968L,42969L,42970L,
-42971L,42972L,42973L,42974L,42975L,42976L,42977L,42978L,42979L,42980L,
-42981L,42982L,42983L,42984L,42985L,42986L,42987L,42988L,42989L,42990L,
-42991L,42992L,42993L,42994L,42995L,42996L,42997L,42998L,42999L,43000L,
-43001L,43002L,43003L,43004L,43005L,43006L,43007L,43008L,43009L,43010L,
-43011L,43012L,43013L,43014L,43015L,43016L,43017L,43018L,43019L,43020L,
-43021L,43022L,43023L,43024L,43025L,43026L,43027L,43028L,43029L,43030L,
-43031L,43032L,43033L,43034L,43035L,43036L,43037L,43038L,43039L,43040L,
-43041L,43042L,43043L,43044L,43045L,43046L,43047L,43048L,43049L,43050L,
-43051L,43052L,43053L,43054L,43055L,43056L,43057L,43058L,43059L,43060L,
-43061L,43062L,43063L,43064L,43065L,43066L,43067L,43068L,43069L,43070L,
-43071L,43072L,43073L,43074L,43075L,43076L,43077L,43078L,43079L,43080L,
-43081L,43082L,43083L,43084L,43085L,43086L,43087L,43088L,43089L,43090L,
-43091L,43092L,43093L,43094L,43095L,43096L,43097L,43098L,43099L,43100L,
-43101L,43102L,43103L,43104L,43105L,43106L,43107L,43108L,43109L,43110L,
-43111L,43112L,43113L,43114L,43115L,43116L,43117L,43118L,43119L,43120L,
-43121L,43122L,43123L,43124L,43125L,43126L,43127L,43128L,43129L,43130L,
-43131L,43132L,43133L,43134L,43135L,43136L,43137L,43138L,43139L,43140L,
-43141L,43142L,43143L,43144L,43145L,43146L,43147L,43148L,43149L,43150L,
-43151L,43152L,43153L,43154L,43155L,43156L,43157L,43158L,43159L,43160L,
-43161L,43162L,43163L,43164L,43165L,43166L,43167L,43168L,43169L,43170L,
-43171L,43172L,43173L,43174L,43175L,43176L,43177L,43178L,43179L,43180L,
-43181L,43182L,43183L,43184L,43185L,43186L,43187L,43188L,43189L,43190L,
-43191L,43192L,43193L,43194L,43195L,43196L,43197L,43198L,43199L,43200L,
-43201L,43202L,43203L,43204L,43205L,43206L,43207L,43208L,43209L,43210L,
-43211L,43212L,43213L,43214L,43215L,43216L,43217L,43218L,43219L,43220L,
-43221L,43222L,43223L,43224L,43225L,43226L,43227L,43228L,43229L,43230L,
-43231L,43232L,43233L,43234L,43235L,43236L,43237L,43238L,43239L,43240L,
-43241L,43242L,43243L,43244L,43245L,43246L,43247L,43248L,43249L,43250L,
-43251L,43252L,43253L,43254L,43255L,43256L,43257L,43258L,43259L,43260L,
-43261L,43262L,43263L,43264L,43265L,43266L,43267L,43268L,43269L,43270L,
-43271L,43272L,43273L,43274L,43275L,43276L,43277L,43278L,43279L,43280L,
-43281L,43282L,43283L,43284L,43285L,43286L,43287L,43288L,43289L,43290L,
-43291L,43292L,43293L,43294L,43295L,43296L,43297L,43298L,43299L,43300L,
-43301L,43302L,43303L,43304L,43305L,43306L,43307L,43308L,43309L,43310L,
-43311L,43312L,43313L,43314L,43315L,43316L,43317L,43318L,43319L,43320L,
-43321L,43322L,43323L,43324L,43325L,43326L,43327L,43328L,43329L,43330L,
-43331L,43332L,43333L,43334L,43335L,43336L,43337L,43338L,43339L,43340L,
-43341L,43342L,43343L,43344L,43345L,43346L,43347L,43348L,43349L,43350L,
-43351L,43352L,43353L,43354L,43355L,43356L,43357L,43358L,43359L,43360L,
-43361L,43362L,43363L,43364L,43365L,43366L,43367L,43368L,43369L,43370L,
-43371L,43372L,43373L,43374L,43375L,43376L,43377L,43378L,43379L,43380L,
-43381L,43382L,43383L,43384L,43385L,43386L,43387L,43388L,43389L,43390L,
-43391L,43392L,43393L,43394L,43395L,43396L,43397L,43398L,43399L,43400L,
-43401L,43402L,43403L,43404L,43405L,43406L,43407L,43408L,43409L,43410L,
-43411L,43412L,43413L,43414L,43415L,43416L,43417L,43418L,43419L,43420L,
-43421L,43422L,43423L,43424L,43425L,43426L,43427L,43428L,43429L,43430L,
-43431L,43432L,43433L,43434L,43435L,43436L,43437L,43438L,43439L,43440L,
-43441L,43442L,43443L,43444L,43445L,43446L,43447L,43448L,43449L,43450L,
-43451L,43452L,43453L,43454L,43455L,43456L,43457L,43458L,43459L,43460L,
-43461L,43462L,43463L,43464L,43465L,43466L,43467L,43468L,43469L,43470L,
-43471L,43472L,43473L,43474L,43475L,43476L,43477L,43478L,43479L,43480L,
-43481L,43482L,43483L,43484L,43485L,43486L,43487L,43488L,43489L,43490L,
-43491L,43492L,43493L,43494L,43495L,43496L,43497L,43498L,43499L,43500L,
-43501L,43502L,43503L,43504L,43505L,43506L,43507L,43508L,43509L,43510L,
-43511L,43512L,43513L,43514L,43515L,43516L,43517L,43518L,43519L,43520L,
-43521L,43522L,43523L,43524L,43525L,43526L,43527L,43528L,43529L,43530L,
-43531L,43532L,43533L,43534L,43535L,43536L,43537L,43538L,43539L,43540L,
-43541L,43542L,43543L,43544L,43545L,43546L,43547L,43548L,43549L,43550L,
-43551L,43552L,43553L,43554L,43555L,43556L,43557L,43558L,43559L,43560L,
-43561L,43562L,43563L,43564L,43565L,43566L,43567L,43568L,43569L,43570L,
-43571L,43572L,43573L,43574L,43575L,43576L,43577L,43578L,43579L,43580L,
-43581L,43582L,43583L,43584L,43585L,43586L,43587L,43588L,43589L,43590L,
-43591L,43592L,43593L,43594L,43595L,43596L,43597L,43598L,43599L,43600L,
-43601L,43602L,43603L,43604L,43605L,43606L,43607L,43608L,43609L,43610L,
-43611L,43612L,43613L,43614L,43615L,43616L,43617L,43618L,43619L,43620L,
-43621L,43622L,43623L,43624L,43625L,43626L,43627L,43628L,43629L,43630L,
-43631L,43632L,43633L,43634L,43635L,43636L,43637L,43638L,43639L,43640L,
-43641L,43642L,43643L,43644L,43645L,43646L,43647L,43648L,43649L,43650L,
-43651L,43652L,43653L,43654L,43655L,43656L,43657L,43658L,43659L,43660L,
-43661L,43662L,43663L,43664L,43665L,43666L,43667L,43668L,43669L,43670L,
-43671L,43672L,43673L,43674L,43675L,43676L,43677L,43678L,43679L,43680L,
-43681L,43682L,43683L,43684L,43685L,43686L,43687L,43688L,43689L,43690L,
-43691L,43692L,43693L,43694L,43695L,43696L,43697L,43698L,43699L,43700L,
-43701L,43702L,43703L,43704L,43705L,43706L,43707L,43708L,43709L,43710L,
-43711L,43712L,43713L,43714L,43715L,43716L,43717L,43718L,43719L,43720L,
-43721L,43722L,43723L,43724L,43725L,43726L,43727L,43728L,43729L,43730L,
-43731L,43732L,43733L,43734L,43735L,43736L,43737L,43738L,43739L,43740L,
-43741L,43742L,43743L,43744L,43745L,43746L,43747L,43748L,43749L,43750L,
-43751L,43752L,43753L,43754L,43755L,43756L,43757L,43758L,43759L,43760L,
-43761L,43762L,43763L,43764L,43765L,43766L,43767L,43768L,43769L,43770L,
-43771L,43772L,43773L,43774L,43775L,43776L,43777L,43778L,43779L,43780L,
-43781L,43782L,43783L,43784L,43785L,43786L,43787L,43788L,43789L,43790L,
-43791L,43792L,43793L,43794L,43795L,43796L,43797L,43798L,43799L,43800L,
-43801L,43802L,43803L,43804L,43805L,43806L,43807L,43808L,43809L,43810L,
-43811L,43812L,43813L,43814L,43815L,43816L,43817L,43818L,43819L,43820L,
-43821L,43822L,43823L,43824L,43825L,43826L,43827L,43828L,43829L,43830L,
-43831L,43832L,43833L,43834L,43835L,43836L,43837L,43838L,43839L,43840L,
-43841L,43842L,43843L,43844L,43845L,43846L,43847L,43848L,43849L,43850L,
-43851L,43852L,43853L,43854L,43855L,43856L,43857L,43858L,42931L,43860L,
-43861L,43862L,43863L,43864L,43865L,43866L,43867L,43868L,43869L,43870L,
-43871L,43872L,43873L,43874L,43875L,43876L,43877L,43878L,43879L,43880L,
-43881L,43882L,43883L,43884L,43885L,43886L,43887L,5024,5025,5026,5027,5028,
-5029,5030,5031,5032,5033,5034,5035,5036,5037,5038,5039,5040,5041,5042,5043,
-5044,5045,5046,5047,5048,5049,5050,5051,5052,5053,5054,5055,5056,5057,5058,
-5059,5060,5061,5062,5063,5064,5065,5066,5067,5068,5069,5070,5071,5072,5073,
-5074,5075,5076,5077,5078,5079,5080,5081,5082,5083,5084,5085,5086,5087,5088,
-5089,5090,5091,5092,5093,5094,5095,5096,5097,5098,5099,5100,5101,5102,5103,
-43968L,43969L,43970L,43971L,43972L,43973L,43974L,43975L,43976L,43977L,
-43978L,43979L,43980L,43981L,43982L,43983L,43984L,43985L,43986L,43987L,
-43988L,43989L,43990L,43991L,43992L,43993L,43994L,43995L,43996L,43997L,
-43998L,43999L,44000L,44001L,44002L,44003L,44004L,44005L,44006L,44007L,
-44008L,44009L,44010L,44011L,44012L,44013L,44014L,44015L,44016L,44017L,
-44018L,44019L,44020L,44021L,44022L,44023L,44024L,44025L,44026L,44027L,
-44028L,44029L,44030L,44031L,44032L,44033L,44034L,44035L,44036L,44037L,
-44038L,44039L,44040L,44041L,44042L,44043L,44044L,44045L,44046L,44047L,
-44048L,44049L,44050L,44051L,44052L,44053L,44054L,44055L,44056L,44057L,
-44058L,44059L,44060L,44061L,44062L,44063L,44064L,44065L,44066L,44067L,
-44068L,44069L,44070L,44071L,44072L,44073L,44074L,44075L,44076L,44077L,
-44078L,44079L,44080L,44081L,44082L,44083L,44084L,44085L,44086L,44087L,
-44088L,44089L,44090L,44091L,44092L,44093L,44094L,44095L,44096L,44097L,
-44098L,44099L,44100L,44101L,44102L,44103L,44104L,44105L,44106L,44107L,
-44108L,44109L,44110L,44111L,44112L,44113L,44114L,44115L,44116L,44117L,
-44118L,44119L,44120L,44121L,44122L,44123L,44124L,44125L,44126L,44127L,
-44128L,44129L,44130L,44131L,44132L,44133L,44134L,44135L,44136L,44137L,
-44138L,44139L,44140L,44141L,44142L,44143L,44144L,44145L,44146L,44147L,
-44148L,44149L,44150L,44151L,44152L,44153L,44154L,44155L,44156L,44157L,
-44158L,44159L,44160L,44161L,44162L,44163L,44164L,44165L,44166L,44167L,
-44168L,44169L,44170L,44171L,44172L,44173L,44174L,44175L,44176L,44177L,
-44178L,44179L,44180L,44181L,44182L,44183L,44184L,44185L,44186L,44187L,
-44188L,44189L,44190L,44191L,44192L,44193L,44194L,44195L,44196L,44197L,
-44198L,44199L,44200L,44201L,44202L,44203L,44204L,44205L,44206L,44207L,
-44208L,44209L,44210L,44211L,44212L,44213L,44214L,44215L,44216L,44217L,
-44218L,44219L,44220L,44221L,44222L,44223L,44224L,44225L,44226L,44227L,
-44228L,44229L,44230L,44231L,44232L,44233L,44234L,44235L,44236L,44237L,
-44238L,44239L,44240L,44241L,44242L,44243L,44244L,44245L,44246L,44247L,
-44248L,44249L,44250L,44251L,44252L,44253L,44254L,44255L,44256L,44257L,
-44258L,44259L,44260L,44261L,44262L,44263L,44264L,44265L,44266L,44267L,
-44268L,44269L,44270L,44271L,44272L,44273L,44274L,44275L,44276L,44277L,
-44278L,44279L,44280L,44281L,44282L,44283L,44284L,44285L,44286L,44287L,
-44288L,44289L,44290L,44291L,44292L,44293L,44294L,44295L,44296L,44297L,
-44298L,44299L,44300L,44301L,44302L,44303L,44304L,44305L,44306L,44307L,
-44308L,44309L,44310L,44311L,44312L,44313L,44314L,44315L,44316L,44317L,
-44318L,44319L,44320L,44321L,44322L,44323L,44324L,44325L,44326L,44327L,
-44328L,44329L,44330L,44331L,44332L,44333L,44334L,44335L,44336L,44337L,
-44338L,44339L,44340L,44341L,44342L,44343L,44344L,44345L,44346L,44347L,
-44348L,44349L,44350L,44351L,44352L,44353L,44354L,44355L,44356L,44357L,
-44358L,44359L,44360L,44361L,44362L,44363L,44364L,44365L,44366L,44367L,
-44368L,44369L,44370L,44371L,44372L,44373L,44374L,44375L,44376L,44377L,
-44378L,44379L,44380L,44381L,44382L,44383L,44384L,44385L,44386L,44387L,
-44388L,44389L,44390L,44391L,44392L,44393L,44394L,44395L,44396L,44397L,
-44398L,44399L,44400L,44401L,44402L,44403L,44404L,44405L,44406L,44407L,
-44408L,44409L,44410L,44411L,44412L,44413L,44414L,44415L,44416L,44417L,
-44418L,44419L,44420L,44421L,44422L,44423L,44424L,44425L,44426L,44427L,
-44428L,44429L,44430L,44431L,44432L,44433L,44434L,44435L,44436L,44437L,
-44438L,44439L,44440L,44441L,44442L,44443L,44444L,44445L,44446L,44447L,
-44448L,44449L,44450L,44451L,44452L,44453L,44454L,44455L,44456L,44457L,
-44458L,44459L,44460L,44461L,44462L,44463L,44464L,44465L,44466L,44467L,
-44468L,44469L,44470L,44471L,44472L,44473L,44474L,44475L,44476L,44477L,
-44478L,44479L,44480L,44481L,44482L,44483L,44484L,44485L,44486L,44487L,
-44488L,44489L,44490L,44491L,44492L,44493L,44494L,44495L,44496L,44497L,
-44498L,44499L,44500L,44501L,44502L,44503L,44504L,44505L,44506L,44507L,
-44508L,44509L,44510L,44511L,44512L,44513L,44514L,44515L,44516L,44517L,
-44518L,44519L,44520L,44521L,44522L,44523L,44524L,44525L,44526L,44527L,
-44528L,44529L,44530L,44531L,44532L,44533L,44534L,44535L,44536L,44537L,
-44538L,44539L,44540L,44541L,44542L,44543L,44544L,44545L,44546L,44547L,
-44548L,44549L,44550L,44551L,44552L,44553L,44554L,44555L,44556L,44557L,
-44558L,44559L,44560L,44561L,44562L,44563L,44564L,44565L,44566L,44567L,
-44568L,44569L,44570L,44571L,44572L,44573L,44574L,44575L,44576L,44577L,
-44578L,44579L,44580L,44581L,44582L,44583L,44584L,44585L,44586L,44587L,
-44588L,44589L,44590L,44591L,44592L,44593L,44594L,44595L,44596L,44597L,
-44598L,44599L,44600L,44601L,44602L,44603L,44604L,44605L,44606L,44607L,
-44608L,44609L,44610L,44611L,44612L,44613L,44614L,44615L,44616L,44617L,
-44618L,44619L,44620L,44621L,44622L,44623L,44624L,44625L,44626L,44627L,
-44628L,44629L,44630L,44631L,44632L,44633L,44634L,44635L,44636L,44637L,
-44638L,44639L,44640L,44641L,44642L,44643L,44644L,44645L,44646L,44647L,
-44648L,44649L,44650L,44651L,44652L,44653L,44654L,44655L,44656L,44657L,
-44658L,44659L,44660L,44661L,44662L,44663L,44664L,44665L,44666L,44667L,
-44668L,44669L,44670L,44671L,44672L,44673L,44674L,44675L,44676L,44677L,
-44678L,44679L,44680L,44681L,44682L,44683L,44684L,44685L,44686L,44687L,
-44688L,44689L,44690L,44691L,44692L,44693L,44694L,44695L,44696L,44697L,
-44698L,44699L,44700L,44701L,44702L,44703L,44704L,44705L,44706L,44707L,
-44708L,44709L,44710L,44711L,44712L,44713L,44714L,44715L,44716L,44717L,
-44718L,44719L,44720L,44721L,44722L,44723L,44724L,44725L,44726L,44727L,
-44728L,44729L,44730L,44731L,44732L,44733L,44734L,44735L,44736L,44737L,
-44738L,44739L,44740L,44741L,44742L,44743L,44744L,44745L,44746L,44747L,
-44748L,44749L,44750L,44751L,44752L,44753L,44754L,44755L,44756L,44757L,
-44758L,44759L,44760L,44761L,44762L,44763L,44764L,44765L,44766L,44767L,
-44768L,44769L,44770L,44771L,44772L,44773L,44774L,44775L,44776L,44777L,
-44778L,44779L,44780L,44781L,44782L,44783L,44784L,44785L,44786L,44787L,
-44788L,44789L,44790L,44791L,44792L,44793L,44794L,44795L,44796L,44797L,
-44798L,44799L,44800L,44801L,44802L,44803L,44804L,44805L,44806L,44807L,
-44808L,44809L,44810L,44811L,44812L,44813L,44814L,44815L,44816L,44817L,
-44818L,44819L,44820L,44821L,44822L,44823L,44824L,44825L,44826L,44827L,
-44828L,44829L,44830L,44831L,44832L,44833L,44834L,44835L,44836L,44837L,
-44838L,44839L,44840L,44841L,44842L,44843L,44844L,44845L,44846L,44847L,
-44848L,44849L,44850L,44851L,44852L,44853L,44854L,44855L,44856L,44857L,
-44858L,44859L,44860L,44861L,44862L,44863L,44864L,44865L,44866L,44867L,
-44868L,44869L,44870L,44871L,44872L,44873L,44874L,44875L,44876L,44877L,
-44878L,44879L,44880L,44881L,44882L,44883L,44884L,44885L,44886L,44887L,
-44888L,44889L,44890L,44891L,44892L,44893L,44894L,44895L,44896L,44897L,
-44898L,44899L,44900L,44901L,44902L,44903L,44904L,44905L,44906L,44907L,
-44908L,44909L,44910L,44911L,44912L,44913L,44914L,44915L,44916L,44917L,
-44918L,44919L,44920L,44921L,44922L,44923L,44924L,44925L,44926L,44927L,
-44928L,44929L,44930L,44931L,44932L,44933L,44934L,44935L,44936L,44937L,
-44938L,44939L,44940L,44941L,44942L,44943L,44944L,44945L,44946L,44947L,
-44948L,44949L,44950L,44951L,44952L,44953L,44954L,44955L,44956L,44957L,
-44958L,44959L,44960L,44961L,44962L,44963L,44964L,44965L,44966L,44967L,
-44968L,44969L,44970L,44971L,44972L,44973L,44974L,44975L,44976L,44977L,
-44978L,44979L,44980L,44981L,44982L,44983L,44984L,44985L,44986L,44987L,
-44988L,44989L,44990L,44991L,44992L,44993L,44994L,44995L,44996L,44997L,
-44998L,44999L,45000L,45001L,45002L,45003L,45004L,45005L,45006L,45007L,
-45008L,45009L,45010L,45011L,45012L,45013L,45014L,45015L,45016L,45017L,
-45018L,45019L,45020L,45021L,45022L,45023L,45024L,45025L,45026L,45027L,
-45028L,45029L,45030L,45031L,45032L,45033L,45034L,45035L,45036L,45037L,
-45038L,45039L,45040L,45041L,45042L,45043L,45044L,45045L,45046L,45047L,
-45048L,45049L,45050L,45051L,45052L,45053L,45054L,45055L,45056L,45057L,
-45058L,45059L,45060L,45061L,45062L,45063L,45064L,45065L,45066L,45067L,
-45068L,45069L,45070L,45071L,45072L,45073L,45074L,45075L,45076L,45077L,
-45078L,45079L,45080L,45081L,45082L,45083L,45084L,45085L,45086L,45087L,
-45088L,45089L,45090L,45091L,45092L,45093L,45094L,45095L,45096L,45097L,
-45098L,45099L,45100L,45101L,45102L,45103L,45104L,45105L,45106L,45107L,
-45108L,45109L,45110L,45111L,45112L,45113L,45114L,45115L,45116L,45117L,
-45118L,45119L,45120L,45121L,45122L,45123L,45124L,45125L,45126L,45127L,
-45128L,45129L,45130L,45131L,45132L,45133L,45134L,45135L,45136L,45137L,
-45138L,45139L,45140L,45141L,45142L,45143L,45144L,45145L,45146L,45147L,
-45148L,45149L,45150L,45151L,45152L,45153L,45154L,45155L,45156L,45157L,
-45158L,45159L,45160L,45161L,45162L,45163L,45164L,45165L,45166L,45167L,
-45168L,45169L,45170L,45171L,45172L,45173L,45174L,45175L,45176L,45177L,
-45178L,45179L,45180L,45181L,45182L,45183L,45184L,45185L,45186L,45187L,
-45188L,45189L,45190L,45191L,45192L,45193L,45194L,45195L,45196L,45197L,
-45198L,45199L,45200L,45201L,45202L,45203L,45204L,45205L,45206L,45207L,
-45208L,45209L,45210L,45211L,45212L,45213L,45214L,45215L,45216L,45217L,
-45218L,45219L,45220L,45221L,45222L,45223L,45224L,45225L,45226L,45227L,
-45228L,45229L,45230L,45231L,45232L,45233L,45234L,45235L,45236L,45237L,
-45238L,45239L,45240L,45241L,45242L,45243L,45244L,45245L,45246L,45247L,
-45248L,45249L,45250L,45251L,45252L,45253L,45254L,45255L,45256L,45257L,
-45258L,45259L,45260L,45261L,45262L,45263L,45264L,45265L,45266L,45267L,
-45268L,45269L,45270L,45271L,45272L,45273L,45274L,45275L,45276L,45277L,
-45278L,45279L,45280L,45281L,45282L,45283L,45284L,45285L,45286L,45287L,
-45288L,45289L,45290L,45291L,45292L,45293L,45294L,45295L,45296L,45297L,
-45298L,45299L,45300L,45301L,45302L,45303L,45304L,45305L,45306L,45307L,
-45308L,45309L,45310L,45311L,45312L,45313L,45314L,45315L,45316L,45317L,
-45318L,45319L,45320L,45321L,45322L,45323L,45324L,45325L,45326L,45327L,
-45328L,45329L,45330L,45331L,45332L,45333L,45334L,45335L,45336L,45337L,
-45338L,45339L,45340L,45341L,45342L,45343L,45344L,45345L,45346L,45347L,
-45348L,45349L,45350L,45351L,45352L,45353L,45354L,45355L,45356L,45357L,
-45358L,45359L,45360L,45361L,45362L,45363L,45364L,45365L,45366L,45367L,
-45368L,45369L,45370L,45371L,45372L,45373L,45374L,45375L,45376L,45377L,
-45378L,45379L,45380L,45381L,45382L,45383L,45384L,45385L,45386L,45387L,
-45388L,45389L,45390L,45391L,45392L,45393L,45394L,45395L,45396L,45397L,
-45398L,45399L,45400L,45401L,45402L,45403L,45404L,45405L,45406L,45407L,
-45408L,45409L,45410L,45411L,45412L,45413L,45414L,45415L,45416L,45417L,
-45418L,45419L,45420L,45421L,45422L,45423L,45424L,45425L,45426L,45427L,
-45428L,45429L,45430L,45431L,45432L,45433L,45434L,45435L,45436L,45437L,
-45438L,45439L,45440L,45441L,45442L,45443L,45444L,45445L,45446L,45447L,
-45448L,45449L,45450L,45451L,45452L,45453L,45454L,45455L,45456L,45457L,
-45458L,45459L,45460L,45461L,45462L,45463L,45464L,45465L,45466L,45467L,
-45468L,45469L,45470L,45471L,45472L,45473L,45474L,45475L,45476L,45477L,
-45478L,45479L,45480L,45481L,45482L,45483L,45484L,45485L,45486L,45487L,
-45488L,45489L,45490L,45491L,45492L,45493L,45494L,45495L,45496L,45497L,
-45498L,45499L,45500L,45501L,45502L,45503L,45504L,45505L,45506L,45507L,
-45508L,45509L,45510L,45511L,45512L,45513L,45514L,45515L,45516L,45517L,
-45518L,45519L,45520L,45521L,45522L,45523L,45524L,45525L,45526L,45527L,
-45528L,45529L,45530L,45531L,45532L,45533L,45534L,45535L,45536L,45537L,
-45538L,45539L,45540L,45541L,45542L,45543L,45544L,45545L,45546L,45547L,
-45548L,45549L,45550L,45551L,45552L,45553L,45554L,45555L,45556L,45557L,
-45558L,45559L,45560L,45561L,45562L,45563L,45564L,45565L,45566L,45567L,
-45568L,45569L,45570L,45571L,45572L,45573L,45574L,45575L,45576L,45577L,
-45578L,45579L,45580L,45581L,45582L,45583L,45584L,45585L,45586L,45587L,
-45588L,45589L,45590L,45591L,45592L,45593L,45594L,45595L,45596L,45597L,
-45598L,45599L,45600L,45601L,45602L,45603L,45604L,45605L,45606L,45607L,
-45608L,45609L,45610L,45611L,45612L,45613L,45614L,45615L,45616L,45617L,
-45618L,45619L,45620L,45621L,45622L,45623L,45624L,45625L,45626L,45627L,
-45628L,45629L,45630L,45631L,45632L,45633L,45634L,45635L,45636L,45637L,
-45638L,45639L,45640L,45641L,45642L,45643L,45644L,45645L,45646L,45647L,
-45648L,45649L,45650L,45651L,45652L,45653L,45654L,45655L,45656L,45657L,
-45658L,45659L,45660L,45661L,45662L,45663L,45664L,45665L,45666L,45667L,
-45668L,45669L,45670L,45671L,45672L,45673L,45674L,45675L,45676L,45677L,
-45678L,45679L,45680L,45681L,45682L,45683L,45684L,45685L,45686L,45687L,
-45688L,45689L,45690L,45691L,45692L,45693L,45694L,45695L,45696L,45697L,
-45698L,45699L,45700L,45701L,45702L,45703L,45704L,45705L,45706L,45707L,
-45708L,45709L,45710L,45711L,45712L,45713L,45714L,45715L,45716L,45717L,
-45718L,45719L,45720L,45721L,45722L,45723L,45724L,45725L,45726L,45727L,
-45728L,45729L,45730L,45731L,45732L,45733L,45734L,45735L,45736L,45737L,
-45738L,45739L,45740L,45741L,45742L,45743L,45744L,45745L,45746L,45747L,
-45748L,45749L,45750L,45751L,45752L,45753L,45754L,45755L,45756L,45757L,
-45758L,45759L,45760L,45761L,45762L,45763L,45764L,45765L,45766L,45767L,
-45768L,45769L,45770L,45771L,45772L,45773L,45774L,45775L,45776L,45777L,
-45778L,45779L,45780L,45781L,45782L,45783L,45784L,45785L,45786L,45787L,
-45788L,45789L,45790L,45791L,45792L,45793L,45794L,45795L,45796L,45797L,
-45798L,45799L,45800L,45801L,45802L,45803L,45804L,45805L,45806L,45807L,
-45808L,45809L,45810L,45811L,45812L,45813L,45814L,45815L,45816L,45817L,
-45818L,45819L,45820L,45821L,45822L,45823L,45824L,45825L,45826L,45827L,
-45828L,45829L,45830L,45831L,45832L,45833L,45834L,45835L,45836L,45837L,
-45838L,45839L,45840L,45841L,45842L,45843L,45844L,45845L,45846L,45847L,
-45848L,45849L,45850L,45851L,45852L,45853L,45854L,45855L,45856L,45857L,
-45858L,45859L,45860L,45861L,45862L,45863L,45864L,45865L,45866L,45867L,
-45868L,45869L,45870L,45871L,45872L,45873L,45874L,45875L,45876L,45877L,
-45878L,45879L,45880L,45881L,45882L,45883L,45884L,45885L,45886L,45887L,
-45888L,45889L,45890L,45891L,45892L,45893L,45894L,45895L,45896L,45897L,
-45898L,45899L,45900L,45901L,45902L,45903L,45904L,45905L,45906L,45907L,
-45908L,45909L,45910L,45911L,45912L,45913L,45914L,45915L,45916L,45917L,
-45918L,45919L,45920L,45921L,45922L,45923L,45924L,45925L,45926L,45927L,
-45928L,45929L,45930L,45931L,45932L,45933L,45934L,45935L,45936L,45937L,
-45938L,45939L,45940L,45941L,45942L,45943L,45944L,45945L,45946L,45947L,
-45948L,45949L,45950L,45951L,45952L,45953L,45954L,45955L,45956L,45957L,
-45958L,45959L,45960L,45961L,45962L,45963L,45964L,45965L,45966L,45967L,
-45968L,45969L,45970L,45971L,45972L,45973L,45974L,45975L,45976L,45977L,
-45978L,45979L,45980L,45981L,45982L,45983L,45984L,45985L,45986L,45987L,
-45988L,45989L,45990L,45991L,45992L,45993L,45994L,45995L,45996L,45997L,
-45998L,45999L,46000L,46001L,46002L,46003L,46004L,46005L,46006L,46007L,
-46008L,46009L,46010L,46011L,46012L,46013L,46014L,46015L,46016L,46017L,
-46018L,46019L,46020L,46021L,46022L,46023L,46024L,46025L,46026L,46027L,
-46028L,46029L,46030L,46031L,46032L,46033L,46034L,46035L,46036L,46037L,
-46038L,46039L,46040L,46041L,46042L,46043L,46044L,46045L,46046L,46047L,
-46048L,46049L,46050L,46051L,46052L,46053L,46054L,46055L,46056L,46057L,
-46058L,46059L,46060L,46061L,46062L,46063L,46064L,46065L,46066L,46067L,
-46068L,46069L,46070L,46071L,46072L,46073L,46074L,46075L,46076L,46077L,
-46078L,46079L,46080L,46081L,46082L,46083L,46084L,46085L,46086L,46087L,
-46088L,46089L,46090L,46091L,46092L,46093L,46094L,46095L,46096L,46097L,
-46098L,46099L,46100L,46101L,46102L,46103L,46104L,46105L,46106L,46107L,
-46108L,46109L,46110L,46111L,46112L,46113L,46114L,46115L,46116L,46117L,
-46118L,46119L,46120L,46121L,46122L,46123L,46124L,46125L,46126L,46127L,
-46128L,46129L,46130L,46131L,46132L,46133L,46134L,46135L,46136L,46137L,
-46138L,46139L,46140L,46141L,46142L,46143L,46144L,46145L,46146L,46147L,
-46148L,46149L,46150L,46151L,46152L,46153L,46154L,46155L,46156L,46157L,
-46158L,46159L,46160L,46161L,46162L,46163L,46164L,46165L,46166L,46167L,
-46168L,46169L,46170L,46171L,46172L,46173L,46174L,46175L,46176L,46177L,
-46178L,46179L,46180L,46181L,46182L,46183L,46184L,46185L,46186L,46187L,
-46188L,46189L,46190L,46191L,46192L,46193L,46194L,46195L,46196L,46197L,
-46198L,46199L,46200L,46201L,46202L,46203L,46204L,46205L,46206L,46207L,
-46208L,46209L,46210L,46211L,46212L,46213L,46214L,46215L,46216L,46217L,
-46218L,46219L,46220L,46221L,46222L,46223L,46224L,46225L,46226L,46227L,
-46228L,46229L,46230L,46231L,46232L,46233L,46234L,46235L,46236L,46237L,
-46238L,46239L,46240L,46241L,46242L,46243L,46244L,46245L,46246L,46247L,
-46248L,46249L,46250L,46251L,46252L,46253L,46254L,46255L,46256L,46257L,
-46258L,46259L,46260L,46261L,46262L,46263L,46264L,46265L,46266L,46267L,
-46268L,46269L,46270L,46271L,46272L,46273L,46274L,46275L,46276L,46277L,
-46278L,46279L,46280L,46281L,46282L,46283L,46284L,46285L,46286L,46287L,
-46288L,46289L,46290L,46291L,46292L,46293L,46294L,46295L,46296L,46297L,
-46298L,46299L,46300L,46301L,46302L,46303L,46304L,46305L,46306L,46307L,
-46308L,46309L,46310L,46311L,46312L,46313L,46314L,46315L,46316L,46317L,
-46318L,46319L,46320L,46321L,46322L,46323L,46324L,46325L,46326L,46327L,
-46328L,46329L,46330L,46331L,46332L,46333L,46334L,46335L,46336L,46337L,
-46338L,46339L,46340L,46341L,46342L,46343L,46344L,46345L,46346L,46347L,
-46348L,46349L,46350L,46351L,46352L,46353L,46354L,46355L,46356L,46357L,
-46358L,46359L,46360L,46361L,46362L,46363L,46364L,46365L,46366L,46367L,
-46368L,46369L,46370L,46371L,46372L,46373L,46374L,46375L,46376L,46377L,
-46378L,46379L,46380L,46381L,46382L,46383L,46384L,46385L,46386L,46387L,
-46388L,46389L,46390L,46391L,46392L,46393L,46394L,46395L,46396L,46397L,
-46398L,46399L,46400L,46401L,46402L,46403L,46404L,46405L,46406L,46407L,
-46408L,46409L,46410L,46411L,46412L,46413L,46414L,46415L,46416L,46417L,
-46418L,46419L,46420L,46421L,46422L,46423L,46424L,46425L,46426L,46427L,
-46428L,46429L,46430L,46431L,46432L,46433L,46434L,46435L,46436L,46437L,
-46438L,46439L,46440L,46441L,46442L,46443L,46444L,46445L,46446L,46447L,
-46448L,46449L,46450L,46451L,46452L,46453L,46454L,46455L,46456L,46457L,
-46458L,46459L,46460L,46461L,46462L,46463L,46464L,46465L,46466L,46467L,
-46468L,46469L,46470L,46471L,46472L,46473L,46474L,46475L,46476L,46477L,
-46478L,46479L,46480L,46481L,46482L,46483L,46484L,46485L,46486L,46487L,
-46488L,46489L,46490L,46491L,46492L,46493L,46494L,46495L,46496L,46497L,
-46498L,46499L,46500L,46501L,46502L,46503L,46504L,46505L,46506L,46507L,
-46508L,46509L,46510L,46511L,46512L,46513L,46514L,46515L,46516L,46517L,
-46518L,46519L,46520L,46521L,46522L,46523L,46524L,46525L,46526L,46527L,
-46528L,46529L,46530L,46531L,46532L,46533L,46534L,46535L,46536L,46537L,
-46538L,46539L,46540L,46541L,46542L,46543L,46544L,46545L,46546L,46547L,
-46548L,46549L,46550L,46551L,46552L,46553L,46554L,46555L,46556L,46557L,
-46558L,46559L,46560L,46561L,46562L,46563L,46564L,46565L,46566L,46567L,
-46568L,46569L,46570L,46571L,46572L,46573L,46574L,46575L,46576L,46577L,
-46578L,46579L,46580L,46581L,46582L,46583L,46584L,46585L,46586L,46587L,
-46588L,46589L,46590L,46591L,46592L,46593L,46594L,46595L,46596L,46597L,
-46598L,46599L,46600L,46601L,46602L,46603L,46604L,46605L,46606L,46607L,
-46608L,46609L,46610L,46611L,46612L,46613L,46614L,46615L,46616L,46617L,
-46618L,46619L,46620L,46621L,46622L,46623L,46624L,46625L,46626L,46627L,
-46628L,46629L,46630L,46631L,46632L,46633L,46634L,46635L,46636L,46637L,
-46638L,46639L,46640L,46641L,46642L,46643L,46644L,46645L,46646L,46647L,
-46648L,46649L,46650L,46651L,46652L,46653L,46654L,46655L,46656L,46657L,
-46658L,46659L,46660L,46661L,46662L,46663L,46664L,46665L,46666L,46667L,
-46668L,46669L,46670L,46671L,46672L,46673L,46674L,46675L,46676L,46677L,
-46678L,46679L,46680L,46681L,46682L,46683L,46684L,46685L,46686L,46687L,
-46688L,46689L,46690L,46691L,46692L,46693L,46694L,46695L,46696L,46697L,
-46698L,46699L,46700L,46701L,46702L,46703L,46704L,46705L,46706L,46707L,
-46708L,46709L,46710L,46711L,46712L,46713L,46714L,46715L,46716L,46717L,
-46718L,46719L,46720L,46721L,46722L,46723L,46724L,46725L,46726L,46727L,
-46728L,46729L,46730L,46731L,46732L,46733L,46734L,46735L,46736L,46737L,
-46738L,46739L,46740L,46741L,46742L,46743L,46744L,46745L,46746L,46747L,
-46748L,46749L,46750L,46751L,46752L,46753L,46754L,46755L,46756L,46757L,
-46758L,46759L,46760L,46761L,46762L,46763L,46764L,46765L,46766L,46767L,
-46768L,46769L,46770L,46771L,46772L,46773L,46774L,46775L,46776L,46777L,
-46778L,46779L,46780L,46781L,46782L,46783L,46784L,46785L,46786L,46787L,
-46788L,46789L,46790L,46791L,46792L,46793L,46794L,46795L,46796L,46797L,
-46798L,46799L,46800L,46801L,46802L,46803L,46804L,46805L,46806L,46807L,
-46808L,46809L,46810L,46811L,46812L,46813L,46814L,46815L,46816L,46817L,
-46818L,46819L,46820L,46821L,46822L,46823L,46824L,46825L,46826L,46827L,
-46828L,46829L,46830L,46831L,46832L,46833L,46834L,46835L,46836L,46837L,
-46838L,46839L,46840L,46841L,46842L,46843L,46844L,46845L,46846L,46847L,
-46848L,46849L,46850L,46851L,46852L,46853L,46854L,46855L,46856L,46857L,
-46858L,46859L,46860L,46861L,46862L,46863L,46864L,46865L,46866L,46867L,
-46868L,46869L,46870L,46871L,46872L,46873L,46874L,46875L,46876L,46877L,
-46878L,46879L,46880L,46881L,46882L,46883L,46884L,46885L,46886L,46887L,
-46888L,46889L,46890L,46891L,46892L,46893L,46894L,46895L,46896L,46897L,
-46898L,46899L,46900L,46901L,46902L,46903L,46904L,46905L,46906L,46907L,
-46908L,46909L,46910L,46911L,46912L,46913L,46914L,46915L,46916L,46917L,
-46918L,46919L,46920L,46921L,46922L,46923L,46924L,46925L,46926L,46927L,
-46928L,46929L,46930L,46931L,46932L,46933L,46934L,46935L,46936L,46937L,
-46938L,46939L,46940L,46941L,46942L,46943L,46944L,46945L,46946L,46947L,
-46948L,46949L,46950L,46951L,46952L,46953L,46954L,46955L,46956L,46957L,
-46958L,46959L,46960L,46961L,46962L,46963L,46964L,46965L,46966L,46967L,
-46968L,46969L,46970L,46971L,46972L,46973L,46974L,46975L,46976L,46977L,
-46978L,46979L,46980L,46981L,46982L,46983L,46984L,46985L,46986L,46987L,
-46988L,46989L,46990L,46991L,46992L,46993L,46994L,46995L,46996L,46997L,
-46998L,46999L,47000L,47001L,47002L,47003L,47004L,47005L,47006L,47007L,
-47008L,47009L,47010L,47011L,47012L,47013L,47014L,47015L,47016L,47017L,
-47018L,47019L,47020L,47021L,47022L,47023L,47024L,47025L,47026L,47027L,
-47028L,47029L,47030L,47031L,47032L,47033L,47034L,47035L,47036L,47037L,
-47038L,47039L,47040L,47041L,47042L,47043L,47044L,47045L,47046L,47047L,
-47048L,47049L,47050L,47051L,47052L,47053L,47054L,47055L,47056L,47057L,
-47058L,47059L,47060L,47061L,47062L,47063L,47064L,47065L,47066L,47067L,
-47068L,47069L,47070L,47071L,47072L,47073L,47074L,47075L,47076L,47077L,
-47078L,47079L,47080L,47081L,47082L,47083L,47084L,47085L,47086L,47087L,
-47088L,47089L,47090L,47091L,47092L,47093L,47094L,47095L,47096L,47097L,
-47098L,47099L,47100L,47101L,47102L,47103L,47104L,47105L,47106L,47107L,
-47108L,47109L,47110L,47111L,47112L,47113L,47114L,47115L,47116L,47117L,
-47118L,47119L,47120L,47121L,47122L,47123L,47124L,47125L,47126L,47127L,
-47128L,47129L,47130L,47131L,47132L,47133L,47134L,47135L,47136L,47137L,
-47138L,47139L,47140L,47141L,47142L,47143L,47144L,47145L,47146L,47147L,
-47148L,47149L,47150L,47151L,47152L,47153L,47154L,47155L,47156L,47157L,
-47158L,47159L,47160L,47161L,47162L,47163L,47164L,47165L,47166L,47167L,
-47168L,47169L,47170L,47171L,47172L,47173L,47174L,47175L,47176L,47177L,
-47178L,47179L,47180L,47181L,47182L,47183L,47184L,47185L,47186L,47187L,
-47188L,47189L,47190L,47191L,47192L,47193L,47194L,47195L,47196L,47197L,
-47198L,47199L,47200L,47201L,47202L,47203L,47204L,47205L,47206L,47207L,
-47208L,47209L,47210L,47211L,47212L,47213L,47214L,47215L,47216L,47217L,
-47218L,47219L,47220L,47221L,47222L,47223L,47224L,47225L,47226L,47227L,
-47228L,47229L,47230L,47231L,47232L,47233L,47234L,47235L,47236L,47237L,
-47238L,47239L,47240L,47241L,47242L,47243L,47244L,47245L,47246L,47247L,
-47248L,47249L,47250L,47251L,47252L,47253L,47254L,47255L,47256L,47257L,
-47258L,47259L,47260L,47261L,47262L,47263L,47264L,47265L,47266L,47267L,
-47268L,47269L,47270L,47271L,47272L,47273L,47274L,47275L,47276L,47277L,
-47278L,47279L,47280L,47281L,47282L,47283L,47284L,47285L,47286L,47287L,
-47288L,47289L,47290L,47291L,47292L,47293L,47294L,47295L,47296L,47297L,
-47298L,47299L,47300L,47301L,47302L,47303L,47304L,47305L,47306L,47307L,
-47308L,47309L,47310L,47311L,47312L,47313L,47314L,47315L,47316L,47317L,
-47318L,47319L,47320L,47321L,47322L,47323L,47324L,47325L,47326L,47327L,
-47328L,47329L,47330L,47331L,47332L,47333L,47334L,47335L,47336L,47337L,
-47338L,47339L,47340L,47341L,47342L,47343L,47344L,47345L,47346L,47347L,
-47348L,47349L,47350L,47351L,47352L,47353L,47354L,47355L,47356L,47357L,
-47358L,47359L,47360L,47361L,47362L,47363L,47364L,47365L,47366L,47367L,
-47368L,47369L,47370L,47371L,47372L,47373L,47374L,47375L,47376L,47377L,
-47378L,47379L,47380L,47381L,47382L,47383L,47384L,47385L,47386L,47387L,
-47388L,47389L,47390L,47391L,47392L,47393L,47394L,47395L,47396L,47397L,
-47398L,47399L,47400L,47401L,47402L,47403L,47404L,47405L,47406L,47407L,
-47408L,47409L,47410L,47411L,47412L,47413L,47414L,47415L,47416L,47417L,
-47418L,47419L,47420L,47421L,47422L,47423L,47424L,47425L,47426L,47427L,
-47428L,47429L,47430L,47431L,47432L,47433L,47434L,47435L,47436L,47437L,
-47438L,47439L,47440L,47441L,47442L,47443L,47444L,47445L,47446L,47447L,
-47448L,47449L,47450L,47451L,47452L,47453L,47454L,47455L,47456L,47457L,
-47458L,47459L,47460L,47461L,47462L,47463L,47464L,47465L,47466L,47467L,
-47468L,47469L,47470L,47471L,47472L,47473L,47474L,47475L,47476L,47477L,
-47478L,47479L,47480L,47481L,47482L,47483L,47484L,47485L,47486L,47487L,
-47488L,47489L,47490L,47491L,47492L,47493L,47494L,47495L,47496L,47497L,
-47498L,47499L,47500L,47501L,47502L,47503L,47504L,47505L,47506L,47507L,
-47508L,47509L,47510L,47511L,47512L,47513L,47514L,47515L,47516L,47517L,
-47518L,47519L,47520L,47521L,47522L,47523L,47524L,47525L,47526L,47527L,
-47528L,47529L,47530L,47531L,47532L,47533L,47534L,47535L,47536L,47537L,
-47538L,47539L,47540L,47541L,47542L,47543L,47544L,47545L,47546L,47547L,
-47548L,47549L,47550L,47551L,47552L,47553L,47554L,47555L,47556L,47557L,
-47558L,47559L,47560L,47561L,47562L,47563L,47564L,47565L,47566L,47567L,
-47568L,47569L,47570L,47571L,47572L,47573L,47574L,47575L,47576L,47577L,
-47578L,47579L,47580L,47581L,47582L,47583L,47584L,47585L,47586L,47587L,
-47588L,47589L,47590L,47591L,47592L,47593L,47594L,47595L,47596L,47597L,
-47598L,47599L,47600L,47601L,47602L,47603L,47604L,47605L,47606L,47607L,
-47608L,47609L,47610L,47611L,47612L,47613L,47614L,47615L,47616L,47617L,
-47618L,47619L,47620L,47621L,47622L,47623L,47624L,47625L,47626L,47627L,
-47628L,47629L,47630L,47631L,47632L,47633L,47634L,47635L,47636L,47637L,
-47638L,47639L,47640L,47641L,47642L,47643L,47644L,47645L,47646L,47647L,
-47648L,47649L,47650L,47651L,47652L,47653L,47654L,47655L,47656L,47657L,
-47658L,47659L,47660L,47661L,47662L,47663L,47664L,47665L,47666L,47667L,
-47668L,47669L,47670L,47671L,47672L,47673L,47674L,47675L,47676L,47677L,
-47678L,47679L,47680L,47681L,47682L,47683L,47684L,47685L,47686L,47687L,
-47688L,47689L,47690L,47691L,47692L,47693L,47694L,47695L,47696L,47697L,
-47698L,47699L,47700L,47701L,47702L,47703L,47704L,47705L,47706L,47707L,
-47708L,47709L,47710L,47711L,47712L,47713L,47714L,47715L,47716L,47717L,
-47718L,47719L,47720L,47721L,47722L,47723L,47724L,47725L,47726L,47727L,
-47728L,47729L,47730L,47731L,47732L,47733L,47734L,47735L,47736L,47737L,
-47738L,47739L,47740L,47741L,47742L,47743L,47744L,47745L,47746L,47747L,
-47748L,47749L,47750L,47751L,47752L,47753L,47754L,47755L,47756L,47757L,
-47758L,47759L,47760L,47761L,47762L,47763L,47764L,47765L,47766L,47767L,
-47768L,47769L,47770L,47771L,47772L,47773L,47774L,47775L,47776L,47777L,
-47778L,47779L,47780L,47781L,47782L,47783L,47784L,47785L,47786L,47787L,
-47788L,47789L,47790L,47791L,47792L,47793L,47794L,47795L,47796L,47797L,
-47798L,47799L,47800L,47801L,47802L,47803L,47804L,47805L,47806L,47807L,
-47808L,47809L,47810L,47811L,47812L,47813L,47814L,47815L,47816L,47817L,
-47818L,47819L,47820L,47821L,47822L,47823L,47824L,47825L,47826L,47827L,
-47828L,47829L,47830L,47831L,47832L,47833L,47834L,47835L,47836L,47837L,
-47838L,47839L,47840L,47841L,47842L,47843L,47844L,47845L,47846L,47847L,
-47848L,47849L,47850L,47851L,47852L,47853L,47854L,47855L,47856L,47857L,
-47858L,47859L,47860L,47861L,47862L,47863L,47864L,47865L,47866L,47867L,
-47868L,47869L,47870L,47871L,47872L,47873L,47874L,47875L,47876L,47877L,
-47878L,47879L,47880L,47881L,47882L,47883L,47884L,47885L,47886L,47887L,
-47888L,47889L,47890L,47891L,47892L,47893L,47894L,47895L,47896L,47897L,
-47898L,47899L,47900L,47901L,47902L,47903L,47904L,47905L,47906L,47907L,
-47908L,47909L,47910L,47911L,47912L,47913L,47914L,47915L,47916L,47917L,
-47918L,47919L,47920L,47921L,47922L,47923L,47924L,47925L,47926L,47927L,
-47928L,47929L,47930L,47931L,47932L,47933L,47934L,47935L,47936L,47937L,
-47938L,47939L,47940L,47941L,47942L,47943L,47944L,47945L,47946L,47947L,
-47948L,47949L,47950L,47951L,47952L,47953L,47954L,47955L,47956L,47957L,
-47958L,47959L,47960L,47961L,47962L,47963L,47964L,47965L,47966L,47967L,
-47968L,47969L,47970L,47971L,47972L,47973L,47974L,47975L,47976L,47977L,
-47978L,47979L,47980L,47981L,47982L,47983L,47984L,47985L,47986L,47987L,
-47988L,47989L,47990L,47991L,47992L,47993L,47994L,47995L,47996L,47997L,
-47998L,47999L,48000L,48001L,48002L,48003L,48004L,48005L,48006L,48007L,
-48008L,48009L,48010L,48011L,48012L,48013L,48014L,48015L,48016L,48017L,
-48018L,48019L,48020L,48021L,48022L,48023L,48024L,48025L,48026L,48027L,
-48028L,48029L,48030L,48031L,48032L,48033L,48034L,48035L,48036L,48037L,
-48038L,48039L,48040L,48041L,48042L,48043L,48044L,48045L,48046L,48047L,
-48048L,48049L,48050L,48051L,48052L,48053L,48054L,48055L,48056L,48057L,
-48058L,48059L,48060L,48061L,48062L,48063L,48064L,48065L,48066L,48067L,
-48068L,48069L,48070L,48071L,48072L,48073L,48074L,48075L,48076L,48077L,
-48078L,48079L,48080L,48081L,48082L,48083L,48084L,48085L,48086L,48087L,
-48088L,48089L,48090L,48091L,48092L,48093L,48094L,48095L,48096L,48097L,
-48098L,48099L,48100L,48101L,48102L,48103L,48104L,48105L,48106L,48107L,
-48108L,48109L,48110L,48111L,48112L,48113L,48114L,48115L,48116L,48117L,
-48118L,48119L,48120L,48121L,48122L,48123L,48124L,48125L,48126L,48127L,
-48128L,48129L,48130L,48131L,48132L,48133L,48134L,48135L,48136L,48137L,
-48138L,48139L,48140L,48141L,48142L,48143L,48144L,48145L,48146L,48147L,
-48148L,48149L,48150L,48151L,48152L,48153L,48154L,48155L,48156L,48157L,
-48158L,48159L,48160L,48161L,48162L,48163L,48164L,48165L,48166L,48167L,
-48168L,48169L,48170L,48171L,48172L,48173L,48174L,48175L,48176L,48177L,
-48178L,48179L,48180L,48181L,48182L,48183L,48184L,48185L,48186L,48187L,
-48188L,48189L,48190L,48191L,48192L,48193L,48194L,48195L,48196L,48197L,
-48198L,48199L,48200L,48201L,48202L,48203L,48204L,48205L,48206L,48207L,
-48208L,48209L,48210L,48211L,48212L,48213L,48214L,48215L,48216L,48217L,
-48218L,48219L,48220L,48221L,48222L,48223L,48224L,48225L,48226L,48227L,
-48228L,48229L,48230L,48231L,48232L,48233L,48234L,48235L,48236L,48237L,
-48238L,48239L,48240L,48241L,48242L,48243L,48244L,48245L,48246L,48247L,
-48248L,48249L,48250L,48251L,48252L,48253L,48254L,48255L,48256L,48257L,
-48258L,48259L,48260L,48261L,48262L,48263L,48264L,48265L,48266L,48267L,
-48268L,48269L,48270L,48271L,48272L,48273L,48274L,48275L,48276L,48277L,
-48278L,48279L,48280L,48281L,48282L,48283L,48284L,48285L,48286L,48287L,
-48288L,48289L,48290L,48291L,48292L,48293L,48294L,48295L,48296L,48297L,
-48298L,48299L,48300L,48301L,48302L,48303L,48304L,48305L,48306L,48307L,
-48308L,48309L,48310L,48311L,48312L,48313L,48314L,48315L,48316L,48317L,
-48318L,48319L,48320L,48321L,48322L,48323L,48324L,48325L,48326L,48327L,
-48328L,48329L,48330L,48331L,48332L,48333L,48334L,48335L,48336L,48337L,
-48338L,48339L,48340L,48341L,48342L,48343L,48344L,48345L,48346L,48347L,
-48348L,48349L,48350L,48351L,48352L,48353L,48354L,48355L,48356L,48357L,
-48358L,48359L,48360L,48361L,48362L,48363L,48364L,48365L,48366L,48367L,
-48368L,48369L,48370L,48371L,48372L,48373L,48374L,48375L,48376L,48377L,
-48378L,48379L,48380L,48381L,48382L,48383L,48384L,48385L,48386L,48387L,
-48388L,48389L,48390L,48391L,48392L,48393L,48394L,48395L,48396L,48397L,
-48398L,48399L,48400L,48401L,48402L,48403L,48404L,48405L,48406L,48407L,
-48408L,48409L,48410L,48411L,48412L,48413L,48414L,48415L,48416L,48417L,
-48418L,48419L,48420L,48421L,48422L,48423L,48424L,48425L,48426L,48427L,
-48428L,48429L,48430L,48431L,48432L,48433L,48434L,48435L,48436L,48437L,
-48438L,48439L,48440L,48441L,48442L,48443L,48444L,48445L,48446L,48447L,
-48448L,48449L,48450L,48451L,48452L,48453L,48454L,48455L,48456L,48457L,
-48458L,48459L,48460L,48461L,48462L,48463L,48464L,48465L,48466L,48467L,
-48468L,48469L,48470L,48471L,48472L,48473L,48474L,48475L,48476L,48477L,
-48478L,48479L,48480L,48481L,48482L,48483L,48484L,48485L,48486L,48487L,
-48488L,48489L,48490L,48491L,48492L,48493L,48494L,48495L,48496L,48497L,
-48498L,48499L,48500L,48501L,48502L,48503L,48504L,48505L,48506L,48507L,
-48508L,48509L,48510L,48511L,48512L,48513L,48514L,48515L,48516L,48517L,
-48518L,48519L,48520L,48521L,48522L,48523L,48524L,48525L,48526L,48527L,
-48528L,48529L,48530L,48531L,48532L,48533L,48534L,48535L,48536L,48537L,
-48538L,48539L,48540L,48541L,48542L,48543L,48544L,48545L,48546L,48547L,
-48548L,48549L,48550L,48551L,48552L,48553L,48554L,48555L,48556L,48557L,
-48558L,48559L,48560L,48561L,48562L,48563L,48564L,48565L,48566L,48567L,
-48568L,48569L,48570L,48571L,48572L,48573L,48574L,48575L,48576L,48577L,
-48578L,48579L,48580L,48581L,48582L,48583L,48584L,48585L,48586L,48587L,
-48588L,48589L,48590L,48591L,48592L,48593L,48594L,48595L,48596L,48597L,
-48598L,48599L,48600L,48601L,48602L,48603L,48604L,48605L,48606L,48607L,
-48608L,48609L,48610L,48611L,48612L,48613L,48614L,48615L,48616L,48617L,
-48618L,48619L,48620L,48621L,48622L,48623L,48624L,48625L,48626L,48627L,
-48628L,48629L,48630L,48631L,48632L,48633L,48634L,48635L,48636L,48637L,
-48638L,48639L,48640L,48641L,48642L,48643L,48644L,48645L,48646L,48647L,
-48648L,48649L,48650L,48651L,48652L,48653L,48654L,48655L,48656L,48657L,
-48658L,48659L,48660L,48661L,48662L,48663L,48664L,48665L,48666L,48667L,
-48668L,48669L,48670L,48671L,48672L,48673L,48674L,48675L,48676L,48677L,
-48678L,48679L,48680L,48681L,48682L,48683L,48684L,48685L,48686L,48687L,
-48688L,48689L,48690L,48691L,48692L,48693L,48694L,48695L,48696L,48697L,
-48698L,48699L,48700L,48701L,48702L,48703L,48704L,48705L,48706L,48707L,
-48708L,48709L,48710L,48711L,48712L,48713L,48714L,48715L,48716L,48717L,
-48718L,48719L,48720L,48721L,48722L,48723L,48724L,48725L,48726L,48727L,
-48728L,48729L,48730L,48731L,48732L,48733L,48734L,48735L,48736L,48737L,
-48738L,48739L,48740L,48741L,48742L,48743L,48744L,48745L,48746L,48747L,
-48748L,48749L,48750L,48751L,48752L,48753L,48754L,48755L,48756L,48757L,
-48758L,48759L,48760L,48761L,48762L,48763L,48764L,48765L,48766L,48767L,
-48768L,48769L,48770L,48771L,48772L,48773L,48774L,48775L,48776L,48777L,
-48778L,48779L,48780L,48781L,48782L,48783L,48784L,48785L,48786L,48787L,
-48788L,48789L,48790L,48791L,48792L,48793L,48794L,48795L,48796L,48797L,
-48798L,48799L,48800L,48801L,48802L,48803L,48804L,48805L,48806L,48807L,
-48808L,48809L,48810L,48811L,48812L,48813L,48814L,48815L,48816L,48817L,
-48818L,48819L,48820L,48821L,48822L,48823L,48824L,48825L,48826L,48827L,
-48828L,48829L,48830L,48831L,48832L,48833L,48834L,48835L,48836L,48837L,
-48838L,48839L,48840L,48841L,48842L,48843L,48844L,48845L,48846L,48847L,
-48848L,48849L,48850L,48851L,48852L,48853L,48854L,48855L,48856L,48857L,
-48858L,48859L,48860L,48861L,48862L,48863L,48864L,48865L,48866L,48867L,
-48868L,48869L,48870L,48871L,48872L,48873L,48874L,48875L,48876L,48877L,
-48878L,48879L,48880L,48881L,48882L,48883L,48884L,48885L,48886L,48887L,
-48888L,48889L,48890L,48891L,48892L,48893L,48894L,48895L,48896L,48897L,
-48898L,48899L,48900L,48901L,48902L,48903L,48904L,48905L,48906L,48907L,
-48908L,48909L,48910L,48911L,48912L,48913L,48914L,48915L,48916L,48917L,
-48918L,48919L,48920L,48921L,48922L,48923L,48924L,48925L,48926L,48927L,
-48928L,48929L,48930L,48931L,48932L,48933L,48934L,48935L,48936L,48937L,
-48938L,48939L,48940L,48941L,48942L,48943L,48944L,48945L,48946L,48947L,
-48948L,48949L,48950L,48951L,48952L,48953L,48954L,48955L,48956L,48957L,
-48958L,48959L,48960L,48961L,48962L,48963L,48964L,48965L,48966L,48967L,
-48968L,48969L,48970L,48971L,48972L,48973L,48974L,48975L,48976L,48977L,
-48978L,48979L,48980L,48981L,48982L,48983L,48984L,48985L,48986L,48987L,
-48988L,48989L,48990L,48991L,48992L,48993L,48994L,48995L,48996L,48997L,
-48998L,48999L,49000L,49001L,49002L,49003L,49004L,49005L,49006L,49007L,
-49008L,49009L,49010L,49011L,49012L,49013L,49014L,49015L,49016L,49017L,
-49018L,49019L,49020L,49021L,49022L,49023L,49024L,49025L,49026L,49027L,
-49028L,49029L,49030L,49031L,49032L,49033L,49034L,49035L,49036L,49037L,
-49038L,49039L,49040L,49041L,49042L,49043L,49044L,49045L,49046L,49047L,
-49048L,49049L,49050L,49051L,49052L,49053L,49054L,49055L,49056L,49057L,
-49058L,49059L,49060L,49061L,49062L,49063L,49064L,49065L,49066L,49067L,
-49068L,49069L,49070L,49071L,49072L,49073L,49074L,49075L,49076L,49077L,
-49078L,49079L,49080L,49081L,49082L,49083L,49084L,49085L,49086L,49087L,
-49088L,49089L,49090L,49091L,49092L,49093L,49094L,49095L,49096L,49097L,
-49098L,49099L,49100L,49101L,49102L,49103L,49104L,49105L,49106L,49107L,
-49108L,49109L,49110L,49111L,49112L,49113L,49114L,49115L,49116L,49117L,
-49118L,49119L,49120L,49121L,49122L,49123L,49124L,49125L,49126L,49127L,
-49128L,49129L,49130L,49131L,49132L,49133L,49134L,49135L,49136L,49137L,
-49138L,49139L,49140L,49141L,49142L,49143L,49144L,49145L,49146L,49147L,
-49148L,49149L,49150L,49151L,49152L,49153L,49154L,49155L,49156L,49157L,
-49158L,49159L,49160L,49161L,49162L,49163L,49164L,49165L,49166L,49167L,
-49168L,49169L,49170L,49171L,49172L,49173L,49174L,49175L,49176L,49177L,
-49178L,49179L,49180L,49181L,49182L,49183L,49184L,49185L,49186L,49187L,
-49188L,49189L,49190L,49191L,49192L,49193L,49194L,49195L,49196L,49197L,
-49198L,49199L,49200L,49201L,49202L,49203L,49204L,49205L,49206L,49207L,
-49208L,49209L,49210L,49211L,49212L,49213L,49214L,49215L,49216L,49217L,
-49218L,49219L,49220L,49221L,49222L,49223L,49224L,49225L,49226L,49227L,
-49228L,49229L,49230L,49231L,49232L,49233L,49234L,49235L,49236L,49237L,
-49238L,49239L,49240L,49241L,49242L,49243L,49244L,49245L,49246L,49247L,
-49248L,49249L,49250L,49251L,49252L,49253L,49254L,49255L,49256L,49257L,
-49258L,49259L,49260L,49261L,49262L,49263L,49264L,49265L,49266L,49267L,
-49268L,49269L,49270L,49271L,49272L,49273L,49274L,49275L,49276L,49277L,
-49278L,49279L,49280L,49281L,49282L,49283L,49284L,49285L,49286L,49287L,
-49288L,49289L,49290L,49291L,49292L,49293L,49294L,49295L,49296L,49297L,
-49298L,49299L,49300L,49301L,49302L,49303L,49304L,49305L,49306L,49307L,
-49308L,49309L,49310L,49311L,49312L,49313L,49314L,49315L,49316L,49317L,
-49318L,49319L,49320L,49321L,49322L,49323L,49324L,49325L,49326L,49327L,
-49328L,49329L,49330L,49331L,49332L,49333L,49334L,49335L,49336L,49337L,
-49338L,49339L,49340L,49341L,49342L,49343L,49344L,49345L,49346L,49347L,
-49348L,49349L,49350L,49351L,49352L,49353L,49354L,49355L,49356L,49357L,
-49358L,49359L,49360L,49361L,49362L,49363L,49364L,49365L,49366L,49367L,
-49368L,49369L,49370L,49371L,49372L,49373L,49374L,49375L,49376L,49377L,
-49378L,49379L,49380L,49381L,49382L,49383L,49384L,49385L,49386L,49387L,
-49388L,49389L,49390L,49391L,49392L,49393L,49394L,49395L,49396L,49397L,
-49398L,49399L,49400L,49401L,49402L,49403L,49404L,49405L,49406L,49407L,
-49408L,49409L,49410L,49411L,49412L,49413L,49414L,49415L,49416L,49417L,
-49418L,49419L,49420L,49421L,49422L,49423L,49424L,49425L,49426L,49427L,
-49428L,49429L,49430L,49431L,49432L,49433L,49434L,49435L,49436L,49437L,
-49438L,49439L,49440L,49441L,49442L,49443L,49444L,49445L,49446L,49447L,
-49448L,49449L,49450L,49451L,49452L,49453L,49454L,49455L,49456L,49457L,
-49458L,49459L,49460L,49461L,49462L,49463L,49464L,49465L,49466L,49467L,
-49468L,49469L,49470L,49471L,49472L,49473L,49474L,49475L,49476L,49477L,
-49478L,49479L,49480L,49481L,49482L,49483L,49484L,49485L,49486L,49487L,
-49488L,49489L,49490L,49491L,49492L,49493L,49494L,49495L,49496L,49497L,
-49498L,49499L,49500L,49501L,49502L,49503L,49504L,49505L,49506L,49507L,
-49508L,49509L,49510L,49511L,49512L,49513L,49514L,49515L,49516L,49517L,
-49518L,49519L,49520L,49521L,49522L,49523L,49524L,49525L,49526L,49527L,
-49528L,49529L,49530L,49531L,49532L,49533L,49534L,49535L,49536L,49537L,
-49538L,49539L,49540L,49541L,49542L,49543L,49544L,49545L,49546L,49547L,
-49548L,49549L,49550L,49551L,49552L,49553L,49554L,49555L,49556L,49557L,
-49558L,49559L,49560L,49561L,49562L,49563L,49564L,49565L,49566L,49567L,
-49568L,49569L,49570L,49571L,49572L,49573L,49574L,49575L,49576L,49577L,
-49578L,49579L,49580L,49581L,49582L,49583L,49584L,49585L,49586L,49587L,
-49588L,49589L,49590L,49591L,49592L,49593L,49594L,49595L,49596L,49597L,
-49598L,49599L,49600L,49601L,49602L,49603L,49604L,49605L,49606L,49607L,
-49608L,49609L,49610L,49611L,49612L,49613L,49614L,49615L,49616L,49617L,
-49618L,49619L,49620L,49621L,49622L,49623L,49624L,49625L,49626L,49627L,
-49628L,49629L,49630L,49631L,49632L,49633L,49634L,49635L,49636L,49637L,
-49638L,49639L,49640L,49641L,49642L,49643L,49644L,49645L,49646L,49647L,
-49648L,49649L,49650L,49651L,49652L,49653L,49654L,49655L,49656L,49657L,
-49658L,49659L,49660L,49661L,49662L,49663L,49664L,49665L,49666L,49667L,
-49668L,49669L,49670L,49671L,49672L,49673L,49674L,49675L,49676L,49677L,
-49678L,49679L,49680L,49681L,49682L,49683L,49684L,49685L,49686L,49687L,
-49688L,49689L,49690L,49691L,49692L,49693L,49694L,49695L,49696L,49697L,
-49698L,49699L,49700L,49701L,49702L,49703L,49704L,49705L,49706L,49707L,
-49708L,49709L,49710L,49711L,49712L,49713L,49714L,49715L,49716L,49717L,
-49718L,49719L,49720L,49721L,49722L,49723L,49724L,49725L,49726L,49727L,
-49728L,49729L,49730L,49731L,49732L,49733L,49734L,49735L,49736L,49737L,
-49738L,49739L,49740L,49741L,49742L,49743L,49744L,49745L,49746L,49747L,
-49748L,49749L,49750L,49751L,49752L,49753L,49754L,49755L,49756L,49757L,
-49758L,49759L,49760L,49761L,49762L,49763L,49764L,49765L,49766L,49767L,
-49768L,49769L,49770L,49771L,49772L,49773L,49774L,49775L,49776L,49777L,
-49778L,49779L,49780L,49781L,49782L,49783L,49784L,49785L,49786L,49787L,
-49788L,49789L,49790L,49791L,49792L,49793L,49794L,49795L,49796L,49797L,
-49798L,49799L,49800L,49801L,49802L,49803L,49804L,49805L,49806L,49807L,
-49808L,49809L,49810L,49811L,49812L,49813L,49814L,49815L,49816L,49817L,
-49818L,49819L,49820L,49821L,49822L,49823L,49824L,49825L,49826L,49827L,
-49828L,49829L,49830L,49831L,49832L,49833L,49834L,49835L,49836L,49837L,
-49838L,49839L,49840L,49841L,49842L,49843L,49844L,49845L,49846L,49847L,
-49848L,49849L,49850L,49851L,49852L,49853L,49854L,49855L,49856L,49857L,
-49858L,49859L,49860L,49861L,49862L,49863L,49864L,49865L,49866L,49867L,
-49868L,49869L,49870L,49871L,49872L,49873L,49874L,49875L,49876L,49877L,
-49878L,49879L,49880L,49881L,49882L,49883L,49884L,49885L,49886L,49887L,
-49888L,49889L,49890L,49891L,49892L,49893L,49894L,49895L,49896L,49897L,
-49898L,49899L,49900L,49901L,49902L,49903L,49904L,49905L,49906L,49907L,
-49908L,49909L,49910L,49911L,49912L,49913L,49914L,49915L,49916L,49917L,
-49918L,49919L,49920L,49921L,49922L,49923L,49924L,49925L,49926L,49927L,
-49928L,49929L,49930L,49931L,49932L,49933L,49934L,49935L,49936L,49937L,
-49938L,49939L,49940L,49941L,49942L,49943L,49944L,49945L,49946L,49947L,
-49948L,49949L,49950L,49951L,49952L,49953L,49954L,49955L,49956L,49957L,
-49958L,49959L,49960L,49961L,49962L,49963L,49964L,49965L,49966L,49967L,
-49968L,49969L,49970L,49971L,49972L,49973L,49974L,49975L,49976L,49977L,
-49978L,49979L,49980L,49981L,49982L,49983L,49984L,49985L,49986L,49987L,
-49988L,49989L,49990L,49991L,49992L,49993L,49994L,49995L,49996L,49997L,
-49998L,49999L,50000L,50001L,50002L,50003L,50004L,50005L,50006L,50007L,
-50008L,50009L,50010L,50011L,50012L,50013L,50014L,50015L,50016L,50017L,
-50018L,50019L,50020L,50021L,50022L,50023L,50024L,50025L,50026L,50027L,
-50028L,50029L,50030L,50031L,50032L,50033L,50034L,50035L,50036L,50037L,
-50038L,50039L,50040L,50041L,50042L,50043L,50044L,50045L,50046L,50047L,
-50048L,50049L,50050L,50051L,50052L,50053L,50054L,50055L,50056L,50057L,
-50058L,50059L,50060L,50061L,50062L,50063L,50064L,50065L,50066L,50067L,
-50068L,50069L,50070L,50071L,50072L,50073L,50074L,50075L,50076L,50077L,
-50078L,50079L,50080L,50081L,50082L,50083L,50084L,50085L,50086L,50087L,
-50088L,50089L,50090L,50091L,50092L,50093L,50094L,50095L,50096L,50097L,
-50098L,50099L,50100L,50101L,50102L,50103L,50104L,50105L,50106L,50107L,
-50108L,50109L,50110L,50111L,50112L,50113L,50114L,50115L,50116L,50117L,
-50118L,50119L,50120L,50121L,50122L,50123L,50124L,50125L,50126L,50127L,
-50128L,50129L,50130L,50131L,50132L,50133L,50134L,50135L,50136L,50137L,
-50138L,50139L,50140L,50141L,50142L,50143L,50144L,50145L,50146L,50147L,
-50148L,50149L,50150L,50151L,50152L,50153L,50154L,50155L,50156L,50157L,
-50158L,50159L,50160L,50161L,50162L,50163L,50164L,50165L,50166L,50167L,
-50168L,50169L,50170L,50171L,50172L,50173L,50174L,50175L,50176L,50177L,
-50178L,50179L,50180L,50181L,50182L,50183L,50184L,50185L,50186L,50187L,
-50188L,50189L,50190L,50191L,50192L,50193L,50194L,50195L,50196L,50197L,
-50198L,50199L,50200L,50201L,50202L,50203L,50204L,50205L,50206L,50207L,
-50208L,50209L,50210L,50211L,50212L,50213L,50214L,50215L,50216L,50217L,
-50218L,50219L,50220L,50221L,50222L,50223L,50224L,50225L,50226L,50227L,
-50228L,50229L,50230L,50231L,50232L,50233L,50234L,50235L,50236L,50237L,
-50238L,50239L,50240L,50241L,50242L,50243L,50244L,50245L,50246L,50247L,
-50248L,50249L,50250L,50251L,50252L,50253L,50254L,50255L,50256L,50257L,
-50258L,50259L,50260L,50261L,50262L,50263L,50264L,50265L,50266L,50267L,
-50268L,50269L,50270L,50271L,50272L,50273L,50274L,50275L,50276L,50277L,
-50278L,50279L,50280L,50281L,50282L,50283L,50284L,50285L,50286L,50287L,
-50288L,50289L,50290L,50291L,50292L,50293L,50294L,50295L,50296L,50297L,
-50298L,50299L,50300L,50301L,50302L,50303L,50304L,50305L,50306L,50307L,
-50308L,50309L,50310L,50311L,50312L,50313L,50314L,50315L,50316L,50317L,
-50318L,50319L,50320L,50321L,50322L,50323L,50324L,50325L,50326L,50327L,
-50328L,50329L,50330L,50331L,50332L,50333L,50334L,50335L,50336L,50337L,
-50338L,50339L,50340L,50341L,50342L,50343L,50344L,50345L,50346L,50347L,
-50348L,50349L,50350L,50351L,50352L,50353L,50354L,50355L,50356L,50357L,
-50358L,50359L,50360L,50361L,50362L,50363L,50364L,50365L,50366L,50367L,
-50368L,50369L,50370L,50371L,50372L,50373L,50374L,50375L,50376L,50377L,
-50378L,50379L,50380L,50381L,50382L,50383L,50384L,50385L,50386L,50387L,
-50388L,50389L,50390L,50391L,50392L,50393L,50394L,50395L,50396L,50397L,
-50398L,50399L,50400L,50401L,50402L,50403L,50404L,50405L,50406L,50407L,
-50408L,50409L,50410L,50411L,50412L,50413L,50414L,50415L,50416L,50417L,
-50418L,50419L,50420L,50421L,50422L,50423L,50424L,50425L,50426L,50427L,
-50428L,50429L,50430L,50431L,50432L,50433L,50434L,50435L,50436L,50437L,
-50438L,50439L,50440L,50441L,50442L,50443L,50444L,50445L,50446L,50447L,
-50448L,50449L,50450L,50451L,50452L,50453L,50454L,50455L,50456L,50457L,
-50458L,50459L,50460L,50461L,50462L,50463L,50464L,50465L,50466L,50467L,
-50468L,50469L,50470L,50471L,50472L,50473L,50474L,50475L,50476L,50477L,
-50478L,50479L,50480L,50481L,50482L,50483L,50484L,50485L,50486L,50487L,
-50488L,50489L,50490L,50491L,50492L,50493L,50494L,50495L,50496L,50497L,
-50498L,50499L,50500L,50501L,50502L,50503L,50504L,50505L,50506L,50507L,
-50508L,50509L,50510L,50511L,50512L,50513L,50514L,50515L,50516L,50517L,
-50518L,50519L,50520L,50521L,50522L,50523L,50524L,50525L,50526L,50527L,
-50528L,50529L,50530L,50531L,50532L,50533L,50534L,50535L,50536L,50537L,
-50538L,50539L,50540L,50541L,50542L,50543L,50544L,50545L,50546L,50547L,
-50548L,50549L,50550L,50551L,50552L,50553L,50554L,50555L,50556L,50557L,
-50558L,50559L,50560L,50561L,50562L,50563L,50564L,50565L,50566L,50567L,
-50568L,50569L,50570L,50571L,50572L,50573L,50574L,50575L,50576L,50577L,
-50578L,50579L,50580L,50581L,50582L,50583L,50584L,50585L,50586L,50587L,
-50588L,50589L,50590L,50591L,50592L,50593L,50594L,50595L,50596L,50597L,
-50598L,50599L,50600L,50601L,50602L,50603L,50604L,50605L,50606L,50607L,
-50608L,50609L,50610L,50611L,50612L,50613L,50614L,50615L,50616L,50617L,
-50618L,50619L,50620L,50621L,50622L,50623L,50624L,50625L,50626L,50627L,
-50628L,50629L,50630L,50631L,50632L,50633L,50634L,50635L,50636L,50637L,
-50638L,50639L,50640L,50641L,50642L,50643L,50644L,50645L,50646L,50647L,
-50648L,50649L,50650L,50651L,50652L,50653L,50654L,50655L,50656L,50657L,
-50658L,50659L,50660L,50661L,50662L,50663L,50664L,50665L,50666L,50667L,
-50668L,50669L,50670L,50671L,50672L,50673L,50674L,50675L,50676L,50677L,
-50678L,50679L,50680L,50681L,50682L,50683L,50684L,50685L,50686L,50687L,
-50688L,50689L,50690L,50691L,50692L,50693L,50694L,50695L,50696L,50697L,
-50698L,50699L,50700L,50701L,50702L,50703L,50704L,50705L,50706L,50707L,
-50708L,50709L,50710L,50711L,50712L,50713L,50714L,50715L,50716L,50717L,
-50718L,50719L,50720L,50721L,50722L,50723L,50724L,50725L,50726L,50727L,
-50728L,50729L,50730L,50731L,50732L,50733L,50734L,50735L,50736L,50737L,
-50738L,50739L,50740L,50741L,50742L,50743L,50744L,50745L,50746L,50747L,
-50748L,50749L,50750L,50751L,50752L,50753L,50754L,50755L,50756L,50757L,
-50758L,50759L,50760L,50761L,50762L,50763L,50764L,50765L,50766L,50767L,
-50768L,50769L,50770L,50771L,50772L,50773L,50774L,50775L,50776L,50777L,
-50778L,50779L,50780L,50781L,50782L,50783L,50784L,50785L,50786L,50787L,
-50788L,50789L,50790L,50791L,50792L,50793L,50794L,50795L,50796L,50797L,
-50798L,50799L,50800L,50801L,50802L,50803L,50804L,50805L,50806L,50807L,
-50808L,50809L,50810L,50811L,50812L,50813L,50814L,50815L,50816L,50817L,
-50818L,50819L,50820L,50821L,50822L,50823L,50824L,50825L,50826L,50827L,
-50828L,50829L,50830L,50831L,50832L,50833L,50834L,50835L,50836L,50837L,
-50838L,50839L,50840L,50841L,50842L,50843L,50844L,50845L,50846L,50847L,
-50848L,50849L,50850L,50851L,50852L,50853L,50854L,50855L,50856L,50857L,
-50858L,50859L,50860L,50861L,50862L,50863L,50864L,50865L,50866L,50867L,
-50868L,50869L,50870L,50871L,50872L,50873L,50874L,50875L,50876L,50877L,
-50878L,50879L,50880L,50881L,50882L,50883L,50884L,50885L,50886L,50887L,
-50888L,50889L,50890L,50891L,50892L,50893L,50894L,50895L,50896L,50897L,
-50898L,50899L,50900L,50901L,50902L,50903L,50904L,50905L,50906L,50907L,
-50908L,50909L,50910L,50911L,50912L,50913L,50914L,50915L,50916L,50917L,
-50918L,50919L,50920L,50921L,50922L,50923L,50924L,50925L,50926L,50927L,
-50928L,50929L,50930L,50931L,50932L,50933L,50934L,50935L,50936L,50937L,
-50938L,50939L,50940L,50941L,50942L,50943L,50944L,50945L,50946L,50947L,
-50948L,50949L,50950L,50951L,50952L,50953L,50954L,50955L,50956L,50957L,
-50958L,50959L,50960L,50961L,50962L,50963L,50964L,50965L,50966L,50967L,
-50968L,50969L,50970L,50971L,50972L,50973L,50974L,50975L,50976L,50977L,
-50978L,50979L,50980L,50981L,50982L,50983L,50984L,50985L,50986L,50987L,
-50988L,50989L,50990L,50991L,50992L,50993L,50994L,50995L,50996L,50997L,
-50998L,50999L,51000L,51001L,51002L,51003L,51004L,51005L,51006L,51007L,
-51008L,51009L,51010L,51011L,51012L,51013L,51014L,51015L,51016L,51017L,
-51018L,51019L,51020L,51021L,51022L,51023L,51024L,51025L,51026L,51027L,
-51028L,51029L,51030L,51031L,51032L,51033L,51034L,51035L,51036L,51037L,
-51038L,51039L,51040L,51041L,51042L,51043L,51044L,51045L,51046L,51047L,
-51048L,51049L,51050L,51051L,51052L,51053L,51054L,51055L,51056L,51057L,
-51058L,51059L,51060L,51061L,51062L,51063L,51064L,51065L,51066L,51067L,
-51068L,51069L,51070L,51071L,51072L,51073L,51074L,51075L,51076L,51077L,
-51078L,51079L,51080L,51081L,51082L,51083L,51084L,51085L,51086L,51087L,
-51088L,51089L,51090L,51091L,51092L,51093L,51094L,51095L,51096L,51097L,
-51098L,51099L,51100L,51101L,51102L,51103L,51104L,51105L,51106L,51107L,
-51108L,51109L,51110L,51111L,51112L,51113L,51114L,51115L,51116L,51117L,
-51118L,51119L,51120L,51121L,51122L,51123L,51124L,51125L,51126L,51127L,
-51128L,51129L,51130L,51131L,51132L,51133L,51134L,51135L,51136L,51137L,
-51138L,51139L,51140L,51141L,51142L,51143L,51144L,51145L,51146L,51147L,
-51148L,51149L,51150L,51151L,51152L,51153L,51154L,51155L,51156L,51157L,
-51158L,51159L,51160L,51161L,51162L,51163L,51164L,51165L,51166L,51167L,
-51168L,51169L,51170L,51171L,51172L,51173L,51174L,51175L,51176L,51177L,
-51178L,51179L,51180L,51181L,51182L,51183L,51184L,51185L,51186L,51187L,
-51188L,51189L,51190L,51191L,51192L,51193L,51194L,51195L,51196L,51197L,
-51198L,51199L,51200L,51201L,51202L,51203L,51204L,51205L,51206L,51207L,
-51208L,51209L,51210L,51211L,51212L,51213L,51214L,51215L,51216L,51217L,
-51218L,51219L,51220L,51221L,51222L,51223L,51224L,51225L,51226L,51227L,
-51228L,51229L,51230L,51231L,51232L,51233L,51234L,51235L,51236L,51237L,
-51238L,51239L,51240L,51241L,51242L,51243L,51244L,51245L,51246L,51247L,
-51248L,51249L,51250L,51251L,51252L,51253L,51254L,51255L,51256L,51257L,
-51258L,51259L,51260L,51261L,51262L,51263L,51264L,51265L,51266L,51267L,
-51268L,51269L,51270L,51271L,51272L,51273L,51274L,51275L,51276L,51277L,
-51278L,51279L,51280L,51281L,51282L,51283L,51284L,51285L,51286L,51287L,
-51288L,51289L,51290L,51291L,51292L,51293L,51294L,51295L,51296L,51297L,
-51298L,51299L,51300L,51301L,51302L,51303L,51304L,51305L,51306L,51307L,
-51308L,51309L,51310L,51311L,51312L,51313L,51314L,51315L,51316L,51317L,
-51318L,51319L,51320L,51321L,51322L,51323L,51324L,51325L,51326L,51327L,
-51328L,51329L,51330L,51331L,51332L,51333L,51334L,51335L,51336L,51337L,
-51338L,51339L,51340L,51341L,51342L,51343L,51344L,51345L,51346L,51347L,
-51348L,51349L,51350L,51351L,51352L,51353L,51354L,51355L,51356L,51357L,
-51358L,51359L,51360L,51361L,51362L,51363L,51364L,51365L,51366L,51367L,
-51368L,51369L,51370L,51371L,51372L,51373L,51374L,51375L,51376L,51377L,
-51378L,51379L,51380L,51381L,51382L,51383L,51384L,51385L,51386L,51387L,
-51388L,51389L,51390L,51391L,51392L,51393L,51394L,51395L,51396L,51397L,
-51398L,51399L,51400L,51401L,51402L,51403L,51404L,51405L,51406L,51407L,
-51408L,51409L,51410L,51411L,51412L,51413L,51414L,51415L,51416L,51417L,
-51418L,51419L,51420L,51421L,51422L,51423L,51424L,51425L,51426L,51427L,
-51428L,51429L,51430L,51431L,51432L,51433L,51434L,51435L,51436L,51437L,
-51438L,51439L,51440L,51441L,51442L,51443L,51444L,51445L,51446L,51447L,
-51448L,51449L,51450L,51451L,51452L,51453L,51454L,51455L,51456L,51457L,
-51458L,51459L,51460L,51461L,51462L,51463L,51464L,51465L,51466L,51467L,
-51468L,51469L,51470L,51471L,51472L,51473L,51474L,51475L,51476L,51477L,
-51478L,51479L,51480L,51481L,51482L,51483L,51484L,51485L,51486L,51487L,
-51488L,51489L,51490L,51491L,51492L,51493L,51494L,51495L,51496L,51497L,
-51498L,51499L,51500L,51501L,51502L,51503L,51504L,51505L,51506L,51507L,
-51508L,51509L,51510L,51511L,51512L,51513L,51514L,51515L,51516L,51517L,
-51518L,51519L,51520L,51521L,51522L,51523L,51524L,51525L,51526L,51527L,
-51528L,51529L,51530L,51531L,51532L,51533L,51534L,51535L,51536L,51537L,
-51538L,51539L,51540L,51541L,51542L,51543L,51544L,51545L,51546L,51547L,
-51548L,51549L,51550L,51551L,51552L,51553L,51554L,51555L,51556L,51557L,
-51558L,51559L,51560L,51561L,51562L,51563L,51564L,51565L,51566L,51567L,
-51568L,51569L,51570L,51571L,51572L,51573L,51574L,51575L,51576L,51577L,
-51578L,51579L,51580L,51581L,51582L,51583L,51584L,51585L,51586L,51587L,
-51588L,51589L,51590L,51591L,51592L,51593L,51594L,51595L,51596L,51597L,
-51598L,51599L,51600L,51601L,51602L,51603L,51604L,51605L,51606L,51607L,
-51608L,51609L,51610L,51611L,51612L,51613L,51614L,51615L,51616L,51617L,
-51618L,51619L,51620L,51621L,51622L,51623L,51624L,51625L,51626L,51627L,
-51628L,51629L,51630L,51631L,51632L,51633L,51634L,51635L,51636L,51637L,
-51638L,51639L,51640L,51641L,51642L,51643L,51644L,51645L,51646L,51647L,
-51648L,51649L,51650L,51651L,51652L,51653L,51654L,51655L,51656L,51657L,
-51658L,51659L,51660L,51661L,51662L,51663L,51664L,51665L,51666L,51667L,
-51668L,51669L,51670L,51671L,51672L,51673L,51674L,51675L,51676L,51677L,
-51678L,51679L,51680L,51681L,51682L,51683L,51684L,51685L,51686L,51687L,
-51688L,51689L,51690L,51691L,51692L,51693L,51694L,51695L,51696L,51697L,
-51698L,51699L,51700L,51701L,51702L,51703L,51704L,51705L,51706L,51707L,
-51708L,51709L,51710L,51711L,51712L,51713L,51714L,51715L,51716L,51717L,
-51718L,51719L,51720L,51721L,51722L,51723L,51724L,51725L,51726L,51727L,
-51728L,51729L,51730L,51731L,51732L,51733L,51734L,51735L,51736L,51737L,
-51738L,51739L,51740L,51741L,51742L,51743L,51744L,51745L,51746L,51747L,
-51748L,51749L,51750L,51751L,51752L,51753L,51754L,51755L,51756L,51757L,
-51758L,51759L,51760L,51761L,51762L,51763L,51764L,51765L,51766L,51767L,
-51768L,51769L,51770L,51771L,51772L,51773L,51774L,51775L,51776L,51777L,
-51778L,51779L,51780L,51781L,51782L,51783L,51784L,51785L,51786L,51787L,
-51788L,51789L,51790L,51791L,51792L,51793L,51794L,51795L,51796L,51797L,
-51798L,51799L,51800L,51801L,51802L,51803L,51804L,51805L,51806L,51807L,
-51808L,51809L,51810L,51811L,51812L,51813L,51814L,51815L,51816L,51817L,
-51818L,51819L,51820L,51821L,51822L,51823L,51824L,51825L,51826L,51827L,
-51828L,51829L,51830L,51831L,51832L,51833L,51834L,51835L,51836L,51837L,
-51838L,51839L,51840L,51841L,51842L,51843L,51844L,51845L,51846L,51847L,
-51848L,51849L,51850L,51851L,51852L,51853L,51854L,51855L,51856L,51857L,
-51858L,51859L,51860L,51861L,51862L,51863L,51864L,51865L,51866L,51867L,
-51868L,51869L,51870L,51871L,51872L,51873L,51874L,51875L,51876L,51877L,
-51878L,51879L,51880L,51881L,51882L,51883L,51884L,51885L,51886L,51887L,
-51888L,51889L,51890L,51891L,51892L,51893L,51894L,51895L,51896L,51897L,
-51898L,51899L,51900L,51901L,51902L,51903L,51904L,51905L,51906L,51907L,
-51908L,51909L,51910L,51911L,51912L,51913L,51914L,51915L,51916L,51917L,
-51918L,51919L,51920L,51921L,51922L,51923L,51924L,51925L,51926L,51927L,
-51928L,51929L,51930L,51931L,51932L,51933L,51934L,51935L,51936L,51937L,
-51938L,51939L,51940L,51941L,51942L,51943L,51944L,51945L,51946L,51947L,
-51948L,51949L,51950L,51951L,51952L,51953L,51954L,51955L,51956L,51957L,
-51958L,51959L,51960L,51961L,51962L,51963L,51964L,51965L,51966L,51967L,
-51968L,51969L,51970L,51971L,51972L,51973L,51974L,51975L,51976L,51977L,
-51978L,51979L,51980L,51981L,51982L,51983L,51984L,51985L,51986L,51987L,
-51988L,51989L,51990L,51991L,51992L,51993L,51994L,51995L,51996L,51997L,
-51998L,51999L,52000L,52001L,52002L,52003L,52004L,52005L,52006L,52007L,
-52008L,52009L,52010L,52011L,52012L,52013L,52014L,52015L,52016L,52017L,
-52018L,52019L,52020L,52021L,52022L,52023L,52024L,52025L,52026L,52027L,
-52028L,52029L,52030L,52031L,52032L,52033L,52034L,52035L,52036L,52037L,
-52038L,52039L,52040L,52041L,52042L,52043L,52044L,52045L,52046L,52047L,
-52048L,52049L,52050L,52051L,52052L,52053L,52054L,52055L,52056L,52057L,
-52058L,52059L,52060L,52061L,52062L,52063L,52064L,52065L,52066L,52067L,
-52068L,52069L,52070L,52071L,52072L,52073L,52074L,52075L,52076L,52077L,
-52078L,52079L,52080L,52081L,52082L,52083L,52084L,52085L,52086L,52087L,
-52088L,52089L,52090L,52091L,52092L,52093L,52094L,52095L,52096L,52097L,
-52098L,52099L,52100L,52101L,52102L,52103L,52104L,52105L,52106L,52107L,
-52108L,52109L,52110L,52111L,52112L,52113L,52114L,52115L,52116L,52117L,
-52118L,52119L,52120L,52121L,52122L,52123L,52124L,52125L,52126L,52127L,
-52128L,52129L,52130L,52131L,52132L,52133L,52134L,52135L,52136L,52137L,
-52138L,52139L,52140L,52141L,52142L,52143L,52144L,52145L,52146L,52147L,
-52148L,52149L,52150L,52151L,52152L,52153L,52154L,52155L,52156L,52157L,
-52158L,52159L,52160L,52161L,52162L,52163L,52164L,52165L,52166L,52167L,
-52168L,52169L,52170L,52171L,52172L,52173L,52174L,52175L,52176L,52177L,
-52178L,52179L,52180L,52181L,52182L,52183L,52184L,52185L,52186L,52187L,
-52188L,52189L,52190L,52191L,52192L,52193L,52194L,52195L,52196L,52197L,
-52198L,52199L,52200L,52201L,52202L,52203L,52204L,52205L,52206L,52207L,
-52208L,52209L,52210L,52211L,52212L,52213L,52214L,52215L,52216L,52217L,
-52218L,52219L,52220L,52221L,52222L,52223L,52224L,52225L,52226L,52227L,
-52228L,52229L,52230L,52231L,52232L,52233L,52234L,52235L,52236L,52237L,
-52238L,52239L,52240L,52241L,52242L,52243L,52244L,52245L,52246L,52247L,
-52248L,52249L,52250L,52251L,52252L,52253L,52254L,52255L,52256L,52257L,
-52258L,52259L,52260L,52261L,52262L,52263L,52264L,52265L,52266L,52267L,
-52268L,52269L,52270L,52271L,52272L,52273L,52274L,52275L,52276L,52277L,
-52278L,52279L,52280L,52281L,52282L,52283L,52284L,52285L,52286L,52287L,
-52288L,52289L,52290L,52291L,52292L,52293L,52294L,52295L,52296L,52297L,
-52298L,52299L,52300L,52301L,52302L,52303L,52304L,52305L,52306L,52307L,
-52308L,52309L,52310L,52311L,52312L,52313L,52314L,52315L,52316L,52317L,
-52318L,52319L,52320L,52321L,52322L,52323L,52324L,52325L,52326L,52327L,
-52328L,52329L,52330L,52331L,52332L,52333L,52334L,52335L,52336L,52337L,
-52338L,52339L,52340L,52341L,52342L,52343L,52344L,52345L,52346L,52347L,
-52348L,52349L,52350L,52351L,52352L,52353L,52354L,52355L,52356L,52357L,
-52358L,52359L,52360L,52361L,52362L,52363L,52364L,52365L,52366L,52367L,
-52368L,52369L,52370L,52371L,52372L,52373L,52374L,52375L,52376L,52377L,
-52378L,52379L,52380L,52381L,52382L,52383L,52384L,52385L,52386L,52387L,
-52388L,52389L,52390L,52391L,52392L,52393L,52394L,52395L,52396L,52397L,
-52398L,52399L,52400L,52401L,52402L,52403L,52404L,52405L,52406L,52407L,
-52408L,52409L,52410L,52411L,52412L,52413L,52414L,52415L,52416L,52417L,
-52418L,52419L,52420L,52421L,52422L,52423L,52424L,52425L,52426L,52427L,
-52428L,52429L,52430L,52431L,52432L,52433L,52434L,52435L,52436L,52437L,
-52438L,52439L,52440L,52441L,52442L,52443L,52444L,52445L,52446L,52447L,
-52448L,52449L,52450L,52451L,52452L,52453L,52454L,52455L,52456L,52457L,
-52458L,52459L,52460L,52461L,52462L,52463L,52464L,52465L,52466L,52467L,
-52468L,52469L,52470L,52471L,52472L,52473L,52474L,52475L,52476L,52477L,
-52478L,52479L,52480L,52481L,52482L,52483L,52484L,52485L,52486L,52487L,
-52488L,52489L,52490L,52491L,52492L,52493L,52494L,52495L,52496L,52497L,
-52498L,52499L,52500L,52501L,52502L,52503L,52504L,52505L,52506L,52507L,
-52508L,52509L,52510L,52511L,52512L,52513L,52514L,52515L,52516L,52517L,
-52518L,52519L,52520L,52521L,52522L,52523L,52524L,52525L,52526L,52527L,
-52528L,52529L,52530L,52531L,52532L,52533L,52534L,52535L,52536L,52537L,
-52538L,52539L,52540L,52541L,52542L,52543L,52544L,52545L,52546L,52547L,
-52548L,52549L,52550L,52551L,52552L,52553L,52554L,52555L,52556L,52557L,
-52558L,52559L,52560L,52561L,52562L,52563L,52564L,52565L,52566L,52567L,
-52568L,52569L,52570L,52571L,52572L,52573L,52574L,52575L,52576L,52577L,
-52578L,52579L,52580L,52581L,52582L,52583L,52584L,52585L,52586L,52587L,
-52588L,52589L,52590L,52591L,52592L,52593L,52594L,52595L,52596L,52597L,
-52598L,52599L,52600L,52601L,52602L,52603L,52604L,52605L,52606L,52607L,
-52608L,52609L,52610L,52611L,52612L,52613L,52614L,52615L,52616L,52617L,
-52618L,52619L,52620L,52621L,52622L,52623L,52624L,52625L,52626L,52627L,
-52628L,52629L,52630L,52631L,52632L,52633L,52634L,52635L,52636L,52637L,
-52638L,52639L,52640L,52641L,52642L,52643L,52644L,52645L,52646L,52647L,
-52648L,52649L,52650L,52651L,52652L,52653L,52654L,52655L,52656L,52657L,
-52658L,52659L,52660L,52661L,52662L,52663L,52664L,52665L,52666L,52667L,
-52668L,52669L,52670L,52671L,52672L,52673L,52674L,52675L,52676L,52677L,
-52678L,52679L,52680L,52681L,52682L,52683L,52684L,52685L,52686L,52687L,
-52688L,52689L,52690L,52691L,52692L,52693L,52694L,52695L,52696L,52697L,
-52698L,52699L,52700L,52701L,52702L,52703L,52704L,52705L,52706L,52707L,
-52708L,52709L,52710L,52711L,52712L,52713L,52714L,52715L,52716L,52717L,
-52718L,52719L,52720L,52721L,52722L,52723L,52724L,52725L,52726L,52727L,
-52728L,52729L,52730L,52731L,52732L,52733L,52734L,52735L,52736L,52737L,
-52738L,52739L,52740L,52741L,52742L,52743L,52744L,52745L,52746L,52747L,
-52748L,52749L,52750L,52751L,52752L,52753L,52754L,52755L,52756L,52757L,
-52758L,52759L,52760L,52761L,52762L,52763L,52764L,52765L,52766L,52767L,
-52768L,52769L,52770L,52771L,52772L,52773L,52774L,52775L,52776L,52777L,
-52778L,52779L,52780L,52781L,52782L,52783L,52784L,52785L,52786L,52787L,
-52788L,52789L,52790L,52791L,52792L,52793L,52794L,52795L,52796L,52797L,
-52798L,52799L,52800L,52801L,52802L,52803L,52804L,52805L,52806L,52807L,
-52808L,52809L,52810L,52811L,52812L,52813L,52814L,52815L,52816L,52817L,
-52818L,52819L,52820L,52821L,52822L,52823L,52824L,52825L,52826L,52827L,
-52828L,52829L,52830L,52831L,52832L,52833L,52834L,52835L,52836L,52837L,
-52838L,52839L,52840L,52841L,52842L,52843L,52844L,52845L,52846L,52847L,
-52848L,52849L,52850L,52851L,52852L,52853L,52854L,52855L,52856L,52857L,
-52858L,52859L,52860L,52861L,52862L,52863L,52864L,52865L,52866L,52867L,
-52868L,52869L,52870L,52871L,52872L,52873L,52874L,52875L,52876L,52877L,
-52878L,52879L,52880L,52881L,52882L,52883L,52884L,52885L,52886L,52887L,
-52888L,52889L,52890L,52891L,52892L,52893L,52894L,52895L,52896L,52897L,
-52898L,52899L,52900L,52901L,52902L,52903L,52904L,52905L,52906L,52907L,
-52908L,52909L,52910L,52911L,52912L,52913L,52914L,52915L,52916L,52917L,
-52918L,52919L,52920L,52921L,52922L,52923L,52924L,52925L,52926L,52927L,
-52928L,52929L,52930L,52931L,52932L,52933L,52934L,52935L,52936L,52937L,
-52938L,52939L,52940L,52941L,52942L,52943L,52944L,52945L,52946L,52947L,
-52948L,52949L,52950L,52951L,52952L,52953L,52954L,52955L,52956L,52957L,
-52958L,52959L,52960L,52961L,52962L,52963L,52964L,52965L,52966L,52967L,
-52968L,52969L,52970L,52971L,52972L,52973L,52974L,52975L,52976L,52977L,
-52978L,52979L,52980L,52981L,52982L,52983L,52984L,52985L,52986L,52987L,
-52988L,52989L,52990L,52991L,52992L,52993L,52994L,52995L,52996L,52997L,
-52998L,52999L,53000L,53001L,53002L,53003L,53004L,53005L,53006L,53007L,
-53008L,53009L,53010L,53011L,53012L,53013L,53014L,53015L,53016L,53017L,
-53018L,53019L,53020L,53021L,53022L,53023L,53024L,53025L,53026L,53027L,
-53028L,53029L,53030L,53031L,53032L,53033L,53034L,53035L,53036L,53037L,
-53038L,53039L,53040L,53041L,53042L,53043L,53044L,53045L,53046L,53047L,
-53048L,53049L,53050L,53051L,53052L,53053L,53054L,53055L,53056L,53057L,
-53058L,53059L,53060L,53061L,53062L,53063L,53064L,53065L,53066L,53067L,
-53068L,53069L,53070L,53071L,53072L,53073L,53074L,53075L,53076L,53077L,
-53078L,53079L,53080L,53081L,53082L,53083L,53084L,53085L,53086L,53087L,
-53088L,53089L,53090L,53091L,53092L,53093L,53094L,53095L,53096L,53097L,
-53098L,53099L,53100L,53101L,53102L,53103L,53104L,53105L,53106L,53107L,
-53108L,53109L,53110L,53111L,53112L,53113L,53114L,53115L,53116L,53117L,
-53118L,53119L,53120L,53121L,53122L,53123L,53124L,53125L,53126L,53127L,
-53128L,53129L,53130L,53131L,53132L,53133L,53134L,53135L,53136L,53137L,
-53138L,53139L,53140L,53141L,53142L,53143L,53144L,53145L,53146L,53147L,
-53148L,53149L,53150L,53151L,53152L,53153L,53154L,53155L,53156L,53157L,
-53158L,53159L,53160L,53161L,53162L,53163L,53164L,53165L,53166L,53167L,
-53168L,53169L,53170L,53171L,53172L,53173L,53174L,53175L,53176L,53177L,
-53178L,53179L,53180L,53181L,53182L,53183L,53184L,53185L,53186L,53187L,
-53188L,53189L,53190L,53191L,53192L,53193L,53194L,53195L,53196L,53197L,
-53198L,53199L,53200L,53201L,53202L,53203L,53204L,53205L,53206L,53207L,
-53208L,53209L,53210L,53211L,53212L,53213L,53214L,53215L,53216L,53217L,
-53218L,53219L,53220L,53221L,53222L,53223L,53224L,53225L,53226L,53227L,
-53228L,53229L,53230L,53231L,53232L,53233L,53234L,53235L,53236L,53237L,
-53238L,53239L,53240L,53241L,53242L,53243L,53244L,53245L,53246L,53247L,
-53248L,53249L,53250L,53251L,53252L,53253L,53254L,53255L,53256L,53257L,
-53258L,53259L,53260L,53261L,53262L,53263L,53264L,53265L,53266L,53267L,
-53268L,53269L,53270L,53271L,53272L,53273L,53274L,53275L,53276L,53277L,
-53278L,53279L,53280L,53281L,53282L,53283L,53284L,53285L,53286L,53287L,
-53288L,53289L,53290L,53291L,53292L,53293L,53294L,53295L,53296L,53297L,
-53298L,53299L,53300L,53301L,53302L,53303L,53304L,53305L,53306L,53307L,
-53308L,53309L,53310L,53311L,53312L,53313L,53314L,53315L,53316L,53317L,
-53318L,53319L,53320L,53321L,53322L,53323L,53324L,53325L,53326L,53327L,
-53328L,53329L,53330L,53331L,53332L,53333L,53334L,53335L,53336L,53337L,
-53338L,53339L,53340L,53341L,53342L,53343L,53344L,53345L,53346L,53347L,
-53348L,53349L,53350L,53351L,53352L,53353L,53354L,53355L,53356L,53357L,
-53358L,53359L,53360L,53361L,53362L,53363L,53364L,53365L,53366L,53367L,
-53368L,53369L,53370L,53371L,53372L,53373L,53374L,53375L,53376L,53377L,
-53378L,53379L,53380L,53381L,53382L,53383L,53384L,53385L,53386L,53387L,
-53388L,53389L,53390L,53391L,53392L,53393L,53394L,53395L,53396L,53397L,
-53398L,53399L,53400L,53401L,53402L,53403L,53404L,53405L,53406L,53407L,
-53408L,53409L,53410L,53411L,53412L,53413L,53414L,53415L,53416L,53417L,
-53418L,53419L,53420L,53421L,53422L,53423L,53424L,53425L,53426L,53427L,
-53428L,53429L,53430L,53431L,53432L,53433L,53434L,53435L,53436L,53437L,
-53438L,53439L,53440L,53441L,53442L,53443L,53444L,53445L,53446L,53447L,
-53448L,53449L,53450L,53451L,53452L,53453L,53454L,53455L,53456L,53457L,
-53458L,53459L,53460L,53461L,53462L,53463L,53464L,53465L,53466L,53467L,
-53468L,53469L,53470L,53471L,53472L,53473L,53474L,53475L,53476L,53477L,
-53478L,53479L,53480L,53481L,53482L,53483L,53484L,53485L,53486L,53487L,
-53488L,53489L,53490L,53491L,53492L,53493L,53494L,53495L,53496L,53497L,
-53498L,53499L,53500L,53501L,53502L,53503L,53504L,53505L,53506L,53507L,
-53508L,53509L,53510L,53511L,53512L,53513L,53514L,53515L,53516L,53517L,
-53518L,53519L,53520L,53521L,53522L,53523L,53524L,53525L,53526L,53527L,
-53528L,53529L,53530L,53531L,53532L,53533L,53534L,53535L,53536L,53537L,
-53538L,53539L,53540L,53541L,53542L,53543L,53544L,53545L,53546L,53547L,
-53548L,53549L,53550L,53551L,53552L,53553L,53554L,53555L,53556L,53557L,
-53558L,53559L,53560L,53561L,53562L,53563L,53564L,53565L,53566L,53567L,
-53568L,53569L,53570L,53571L,53572L,53573L,53574L,53575L,53576L,53577L,
-53578L,53579L,53580L,53581L,53582L,53583L,53584L,53585L,53586L,53587L,
-53588L,53589L,53590L,53591L,53592L,53593L,53594L,53595L,53596L,53597L,
-53598L,53599L,53600L,53601L,53602L,53603L,53604L,53605L,53606L,53607L,
-53608L,53609L,53610L,53611L,53612L,53613L,53614L,53615L,53616L,53617L,
-53618L,53619L,53620L,53621L,53622L,53623L,53624L,53625L,53626L,53627L,
-53628L,53629L,53630L,53631L,53632L,53633L,53634L,53635L,53636L,53637L,
-53638L,53639L,53640L,53641L,53642L,53643L,53644L,53645L,53646L,53647L,
-53648L,53649L,53650L,53651L,53652L,53653L,53654L,53655L,53656L,53657L,
-53658L,53659L,53660L,53661L,53662L,53663L,53664L,53665L,53666L,53667L,
-53668L,53669L,53670L,53671L,53672L,53673L,53674L,53675L,53676L,53677L,
-53678L,53679L,53680L,53681L,53682L,53683L,53684L,53685L,53686L,53687L,
-53688L,53689L,53690L,53691L,53692L,53693L,53694L,53695L,53696L,53697L,
-53698L,53699L,53700L,53701L,53702L,53703L,53704L,53705L,53706L,53707L,
-53708L,53709L,53710L,53711L,53712L,53713L,53714L,53715L,53716L,53717L,
-53718L,53719L,53720L,53721L,53722L,53723L,53724L,53725L,53726L,53727L,
-53728L,53729L,53730L,53731L,53732L,53733L,53734L,53735L,53736L,53737L,
-53738L,53739L,53740L,53741L,53742L,53743L,53744L,53745L,53746L,53747L,
-53748L,53749L,53750L,53751L,53752L,53753L,53754L,53755L,53756L,53757L,
-53758L,53759L,53760L,53761L,53762L,53763L,53764L,53765L,53766L,53767L,
-53768L,53769L,53770L,53771L,53772L,53773L,53774L,53775L,53776L,53777L,
-53778L,53779L,53780L,53781L,53782L,53783L,53784L,53785L,53786L,53787L,
-53788L,53789L,53790L,53791L,53792L,53793L,53794L,53795L,53796L,53797L,
-53798L,53799L,53800L,53801L,53802L,53803L,53804L,53805L,53806L,53807L,
-53808L,53809L,53810L,53811L,53812L,53813L,53814L,53815L,53816L,53817L,
-53818L,53819L,53820L,53821L,53822L,53823L,53824L,53825L,53826L,53827L,
-53828L,53829L,53830L,53831L,53832L,53833L,53834L,53835L,53836L,53837L,
-53838L,53839L,53840L,53841L,53842L,53843L,53844L,53845L,53846L,53847L,
-53848L,53849L,53850L,53851L,53852L,53853L,53854L,53855L,53856L,53857L,
-53858L,53859L,53860L,53861L,53862L,53863L,53864L,53865L,53866L,53867L,
-53868L,53869L,53870L,53871L,53872L,53873L,53874L,53875L,53876L,53877L,
-53878L,53879L,53880L,53881L,53882L,53883L,53884L,53885L,53886L,53887L,
-53888L,53889L,53890L,53891L,53892L,53893L,53894L,53895L,53896L,53897L,
-53898L,53899L,53900L,53901L,53902L,53903L,53904L,53905L,53906L,53907L,
-53908L,53909L,53910L,53911L,53912L,53913L,53914L,53915L,53916L,53917L,
-53918L,53919L,53920L,53921L,53922L,53923L,53924L,53925L,53926L,53927L,
-53928L,53929L,53930L,53931L,53932L,53933L,53934L,53935L,53936L,53937L,
-53938L,53939L,53940L,53941L,53942L,53943L,53944L,53945L,53946L,53947L,
-53948L,53949L,53950L,53951L,53952L,53953L,53954L,53955L,53956L,53957L,
-53958L,53959L,53960L,53961L,53962L,53963L,53964L,53965L,53966L,53967L,
-53968L,53969L,53970L,53971L,53972L,53973L,53974L,53975L,53976L,53977L,
-53978L,53979L,53980L,53981L,53982L,53983L,53984L,53985L,53986L,53987L,
-53988L,53989L,53990L,53991L,53992L,53993L,53994L,53995L,53996L,53997L,
-53998L,53999L,54000L,54001L,54002L,54003L,54004L,54005L,54006L,54007L,
-54008L,54009L,54010L,54011L,54012L,54013L,54014L,54015L,54016L,54017L,
-54018L,54019L,54020L,54021L,54022L,54023L,54024L,54025L,54026L,54027L,
-54028L,54029L,54030L,54031L,54032L,54033L,54034L,54035L,54036L,54037L,
-54038L,54039L,54040L,54041L,54042L,54043L,54044L,54045L,54046L,54047L,
-54048L,54049L,54050L,54051L,54052L,54053L,54054L,54055L,54056L,54057L,
-54058L,54059L,54060L,54061L,54062L,54063L,54064L,54065L,54066L,54067L,
-54068L,54069L,54070L,54071L,54072L,54073L,54074L,54075L,54076L,54077L,
-54078L,54079L,54080L,54081L,54082L,54083L,54084L,54085L,54086L,54087L,
-54088L,54089L,54090L,54091L,54092L,54093L,54094L,54095L,54096L,54097L,
-54098L,54099L,54100L,54101L,54102L,54103L,54104L,54105L,54106L,54107L,
-54108L,54109L,54110L,54111L,54112L,54113L,54114L,54115L,54116L,54117L,
-54118L,54119L,54120L,54121L,54122L,54123L,54124L,54125L,54126L,54127L,
-54128L,54129L,54130L,54131L,54132L,54133L,54134L,54135L,54136L,54137L,
-54138L,54139L,54140L,54141L,54142L,54143L,54144L,54145L,54146L,54147L,
-54148L,54149L,54150L,54151L,54152L,54153L,54154L,54155L,54156L,54157L,
-54158L,54159L,54160L,54161L,54162L,54163L,54164L,54165L,54166L,54167L,
-54168L,54169L,54170L,54171L,54172L,54173L,54174L,54175L,54176L,54177L,
-54178L,54179L,54180L,54181L,54182L,54183L,54184L,54185L,54186L,54187L,
-54188L,54189L,54190L,54191L,54192L,54193L,54194L,54195L,54196L,54197L,
-54198L,54199L,54200L,54201L,54202L,54203L,54204L,54205L,54206L,54207L,
-54208L,54209L,54210L,54211L,54212L,54213L,54214L,54215L,54216L,54217L,
-54218L,54219L,54220L,54221L,54222L,54223L,54224L,54225L,54226L,54227L,
-54228L,54229L,54230L,54231L,54232L,54233L,54234L,54235L,54236L,54237L,
-54238L,54239L,54240L,54241L,54242L,54243L,54244L,54245L,54246L,54247L,
-54248L,54249L,54250L,54251L,54252L,54253L,54254L,54255L,54256L,54257L,
-54258L,54259L,54260L,54261L,54262L,54263L,54264L,54265L,54266L,54267L,
-54268L,54269L,54270L,54271L,54272L,54273L,54274L,54275L,54276L,54277L,
-54278L,54279L,54280L,54281L,54282L,54283L,54284L,54285L,54286L,54287L,
-54288L,54289L,54290L,54291L,54292L,54293L,54294L,54295L,54296L,54297L,
-54298L,54299L,54300L,54301L,54302L,54303L,54304L,54305L,54306L,54307L,
-54308L,54309L,54310L,54311L,54312L,54313L,54314L,54315L,54316L,54317L,
-54318L,54319L,54320L,54321L,54322L,54323L,54324L,54325L,54326L,54327L,
-54328L,54329L,54330L,54331L,54332L,54333L,54334L,54335L,54336L,54337L,
-54338L,54339L,54340L,54341L,54342L,54343L,54344L,54345L,54346L,54347L,
-54348L,54349L,54350L,54351L,54352L,54353L,54354L,54355L,54356L,54357L,
-54358L,54359L,54360L,54361L,54362L,54363L,54364L,54365L,54366L,54367L,
-54368L,54369L,54370L,54371L,54372L,54373L,54374L,54375L,54376L,54377L,
-54378L,54379L,54380L,54381L,54382L,54383L,54384L,54385L,54386L,54387L,
-54388L,54389L,54390L,54391L,54392L,54393L,54394L,54395L,54396L,54397L,
-54398L,54399L,54400L,54401L,54402L,54403L,54404L,54405L,54406L,54407L,
-54408L,54409L,54410L,54411L,54412L,54413L,54414L,54415L,54416L,54417L,
-54418L,54419L,54420L,54421L,54422L,54423L,54424L,54425L,54426L,54427L,
-54428L,54429L,54430L,54431L,54432L,54433L,54434L,54435L,54436L,54437L,
-54438L,54439L,54440L,54441L,54442L,54443L,54444L,54445L,54446L,54447L,
-54448L,54449L,54450L,54451L,54452L,54453L,54454L,54455L,54456L,54457L,
-54458L,54459L,54460L,54461L,54462L,54463L,54464L,54465L,54466L,54467L,
-54468L,54469L,54470L,54471L,54472L,54473L,54474L,54475L,54476L,54477L,
-54478L,54479L,54480L,54481L,54482L,54483L,54484L,54485L,54486L,54487L,
-54488L,54489L,54490L,54491L,54492L,54493L,54494L,54495L,54496L,54497L,
-54498L,54499L,54500L,54501L,54502L,54503L,54504L,54505L,54506L,54507L,
-54508L,54509L,54510L,54511L,54512L,54513L,54514L,54515L,54516L,54517L,
-54518L,54519L,54520L,54521L,54522L,54523L,54524L,54525L,54526L,54527L,
-54528L,54529L,54530L,54531L,54532L,54533L,54534L,54535L,54536L,54537L,
-54538L,54539L,54540L,54541L,54542L,54543L,54544L,54545L,54546L,54547L,
-54548L,54549L,54550L,54551L,54552L,54553L,54554L,54555L,54556L,54557L,
-54558L,54559L,54560L,54561L,54562L,54563L,54564L,54565L,54566L,54567L,
-54568L,54569L,54570L,54571L,54572L,54573L,54574L,54575L,54576L,54577L,
-54578L,54579L,54580L,54581L,54582L,54583L,54584L,54585L,54586L,54587L,
-54588L,54589L,54590L,54591L,54592L,54593L,54594L,54595L,54596L,54597L,
-54598L,54599L,54600L,54601L,54602L,54603L,54604L,54605L,54606L,54607L,
-54608L,54609L,54610L,54611L,54612L,54613L,54614L,54615L,54616L,54617L,
-54618L,54619L,54620L,54621L,54622L,54623L,54624L,54625L,54626L,54627L,
-54628L,54629L,54630L,54631L,54632L,54633L,54634L,54635L,54636L,54637L,
-54638L,54639L,54640L,54641L,54642L,54643L,54644L,54645L,54646L,54647L,
-54648L,54649L,54650L,54651L,54652L,54653L,54654L,54655L,54656L,54657L,
-54658L,54659L,54660L,54661L,54662L,54663L,54664L,54665L,54666L,54667L,
-54668L,54669L,54670L,54671L,54672L,54673L,54674L,54675L,54676L,54677L,
-54678L,54679L,54680L,54681L,54682L,54683L,54684L,54685L,54686L,54687L,
-54688L,54689L,54690L,54691L,54692L,54693L,54694L,54695L,54696L,54697L,
-54698L,54699L,54700L,54701L,54702L,54703L,54704L,54705L,54706L,54707L,
-54708L,54709L,54710L,54711L,54712L,54713L,54714L,54715L,54716L,54717L,
-54718L,54719L,54720L,54721L,54722L,54723L,54724L,54725L,54726L,54727L,
-54728L,54729L,54730L,54731L,54732L,54733L,54734L,54735L,54736L,54737L,
-54738L,54739L,54740L,54741L,54742L,54743L,54744L,54745L,54746L,54747L,
-54748L,54749L,54750L,54751L,54752L,54753L,54754L,54755L,54756L,54757L,
-54758L,54759L,54760L,54761L,54762L,54763L,54764L,54765L,54766L,54767L,
-54768L,54769L,54770L,54771L,54772L,54773L,54774L,54775L,54776L,54777L,
-54778L,54779L,54780L,54781L,54782L,54783L,54784L,54785L,54786L,54787L,
-54788L,54789L,54790L,54791L,54792L,54793L,54794L,54795L,54796L,54797L,
-54798L,54799L,54800L,54801L,54802L,54803L,54804L,54805L,54806L,54807L,
-54808L,54809L,54810L,54811L,54812L,54813L,54814L,54815L,54816L,54817L,
-54818L,54819L,54820L,54821L,54822L,54823L,54824L,54825L,54826L,54827L,
-54828L,54829L,54830L,54831L,54832L,54833L,54834L,54835L,54836L,54837L,
-54838L,54839L,54840L,54841L,54842L,54843L,54844L,54845L,54846L,54847L,
-54848L,54849L,54850L,54851L,54852L,54853L,54854L,54855L,54856L,54857L,
-54858L,54859L,54860L,54861L,54862L,54863L,54864L,54865L,54866L,54867L,
-54868L,54869L,54870L,54871L,54872L,54873L,54874L,54875L,54876L,54877L,
-54878L,54879L,54880L,54881L,54882L,54883L,54884L,54885L,54886L,54887L,
-54888L,54889L,54890L,54891L,54892L,54893L,54894L,54895L,54896L,54897L,
-54898L,54899L,54900L,54901L,54902L,54903L,54904L,54905L,54906L,54907L,
-54908L,54909L,54910L,54911L,54912L,54913L,54914L,54915L,54916L,54917L,
-54918L,54919L,54920L,54921L,54922L,54923L,54924L,54925L,54926L,54927L,
-54928L,54929L,54930L,54931L,54932L,54933L,54934L,54935L,54936L,54937L,
-54938L,54939L,54940L,54941L,54942L,54943L,54944L,54945L,54946L,54947L,
-54948L,54949L,54950L,54951L,54952L,54953L,54954L,54955L,54956L,54957L,
-54958L,54959L,54960L,54961L,54962L,54963L,54964L,54965L,54966L,54967L,
-54968L,54969L,54970L,54971L,54972L,54973L,54974L,54975L,54976L,54977L,
-54978L,54979L,54980L,54981L,54982L,54983L,54984L,54985L,54986L,54987L,
-54988L,54989L,54990L,54991L,54992L,54993L,54994L,54995L,54996L,54997L,
-54998L,54999L,55000L,55001L,55002L,55003L,55004L,55005L,55006L,55007L,
-55008L,55009L,55010L,55011L,55012L,55013L,55014L,55015L,55016L,55017L,
-55018L,55019L,55020L,55021L,55022L,55023L,55024L,55025L,55026L,55027L,
-55028L,55029L,55030L,55031L,55032L,55033L,55034L,55035L,55036L,55037L,
-55038L,55039L,55040L,55041L,55042L,55043L,55044L,55045L,55046L,55047L,
-55048L,55049L,55050L,55051L,55052L,55053L,55054L,55055L,55056L,55057L,
-55058L,55059L,55060L,55061L,55062L,55063L,55064L,55065L,55066L,55067L,
-55068L,55069L,55070L,55071L,55072L,55073L,55074L,55075L,55076L,55077L,
-55078L,55079L,55080L,55081L,55082L,55083L,55084L,55085L,55086L,55087L,
-55088L,55089L,55090L,55091L,55092L,55093L,55094L,55095L,55096L,55097L,
-55098L,55099L,55100L,55101L,55102L,55103L,55104L,55105L,55106L,55107L,
-55108L,55109L,55110L,55111L,55112L,55113L,55114L,55115L,55116L,55117L,
-55118L,55119L,55120L,55121L,55122L,55123L,55124L,55125L,55126L,55127L,
-55128L,55129L,55130L,55131L,55132L,55133L,55134L,55135L,55136L,55137L,
-55138L,55139L,55140L,55141L,55142L,55143L,55144L,55145L,55146L,55147L,
-55148L,55149L,55150L,55151L,55152L,55153L,55154L,55155L,55156L,55157L,
-55158L,55159L,55160L,55161L,55162L,55163L,55164L,55165L,55166L,55167L,
-55168L,55169L,55170L,55171L,55172L,55173L,55174L,55175L,55176L,55177L,
-55178L,55179L,55180L,55181L,55182L,55183L,55184L,55185L,55186L,55187L,
-55188L,55189L,55190L,55191L,55192L,55193L,55194L,55195L,55196L,55197L,
-55198L,55199L,55200L,55201L,55202L,55203L,55204L,55205L,55206L,55207L,
-55208L,55209L,55210L,55211L,55212L,55213L,55214L,55215L,55216L,55217L,
-55218L,55219L,55220L,55221L,55222L,55223L,55224L,55225L,55226L,55227L,
-55228L,55229L,55230L,55231L,55232L,55233L,55234L,55235L,55236L,55237L,
-55238L,55239L,55240L,55241L,55242L,55243L,55244L,55245L,55246L,55247L,
-55248L,55249L,55250L,55251L,55252L,55253L,55254L,55255L,55256L,55257L,
-55258L,55259L,55260L,55261L,55262L,55263L,55264L,55265L,55266L,55267L,
-55268L,55269L,55270L,55271L,55272L,55273L,55274L,55275L,55276L,55277L,
-55278L,55279L,55280L,55281L,55282L,55283L,55284L,55285L,55286L,55287L,
-55288L,55289L,55290L,55291L,55292L,55293L,55294L,55295L,55296L,55297L,
-55298L,55299L,55300L,55301L,55302L,55303L,55304L,55305L,55306L,55307L,
-55308L,55309L,55310L,55311L,55312L,55313L,55314L,55315L,55316L,55317L,
-55318L,55319L,55320L,55321L,55322L,55323L,55324L,55325L,55326L,55327L,
-55328L,55329L,55330L,55331L,55332L,55333L,55334L,55335L,55336L,55337L,
-55338L,55339L,55340L,55341L,55342L,55343L,55344L,55345L,55346L,55347L,
-55348L,55349L,55350L,55351L,55352L,55353L,55354L,55355L,55356L,55357L,
-55358L,55359L,55360L,55361L,55362L,55363L,55364L,55365L,55366L,55367L,
-55368L,55369L,55370L,55371L,55372L,55373L,55374L,55375L,55376L,55377L,
-55378L,55379L,55380L,55381L,55382L,55383L,55384L,55385L,55386L,55387L,
-55388L,55389L,55390L,55391L,55392L,55393L,55394L,55395L,55396L,55397L,
-55398L,55399L,55400L,55401L,55402L,55403L,55404L,55405L,55406L,55407L,
-55408L,55409L,55410L,55411L,55412L,55413L,55414L,55415L,55416L,55417L,
-55418L,55419L,55420L,55421L,55422L,55423L,55424L,55425L,55426L,55427L,
-55428L,55429L,55430L,55431L,55432L,55433L,55434L,55435L,55436L,55437L,
-55438L,55439L,55440L,55441L,55442L,55443L,55444L,55445L,55446L,55447L,
-55448L,55449L,55450L,55451L,55452L,55453L,55454L,55455L,55456L,55457L,
-55458L,55459L,55460L,55461L,55462L,55463L,55464L,55465L,55466L,55467L,
-55468L,55469L,55470L,55471L,55472L,55473L,55474L,55475L,55476L,55477L,
-55478L,55479L,55480L,55481L,55482L,55483L,55484L,55485L,55486L,55487L,
-55488L,55489L,55490L,55491L,55492L,55493L,55494L,55495L,55496L,55497L,
-55498L,55499L,55500L,55501L,55502L,55503L,55504L,55505L,55506L,55507L,
-55508L,55509L,55510L,55511L,55512L,55513L,55514L,55515L,55516L,55517L,
-55518L,55519L,55520L,55521L,55522L,55523L,55524L,55525L,55526L,55527L,
-55528L,55529L,55530L,55531L,55532L,55533L,55534L,55535L,55536L,55537L,
-55538L,55539L,55540L,55541L,55542L,55543L,55544L,55545L,55546L,55547L,
-55548L,55549L,55550L,55551L,55552L,55553L,55554L,55555L,55556L,55557L,
-55558L,55559L,55560L,55561L,55562L,55563L,55564L,55565L,55566L,55567L,
-55568L,55569L,55570L,55571L,55572L,55573L,55574L,55575L,55576L,55577L,
-55578L,55579L,55580L,55581L,55582L,55583L,55584L,55585L,55586L,55587L,
-55588L,55589L,55590L,55591L,55592L,55593L,55594L,55595L,55596L,55597L,
-55598L,55599L,55600L,55601L,55602L,55603L,55604L,55605L,55606L,55607L,
-55608L,55609L,55610L,55611L,55612L,55613L,55614L,55615L,55616L,55617L,
-55618L,55619L,55620L,55621L,55622L,55623L,55624L,55625L,55626L,55627L,
-55628L,55629L,55630L,55631L,55632L,55633L,55634L,55635L,55636L,55637L,
-55638L,55639L,55640L,55641L,55642L,55643L,55644L,55645L,55646L,55647L,
-55648L,55649L,55650L,55651L,55652L,55653L,55654L,55655L,55656L,55657L,
-55658L,55659L,55660L,55661L,55662L,55663L,55664L,55665L,55666L,55667L,
-55668L,55669L,55670L,55671L,55672L,55673L,55674L,55675L,55676L,55677L,
-55678L,55679L,55680L,55681L,55682L,55683L,55684L,55685L,55686L,55687L,
-55688L,55689L,55690L,55691L,55692L,55693L,55694L,55695L,55696L,55697L,
-55698L,55699L,55700L,55701L,55702L,55703L,55704L,55705L,55706L,55707L,
-55708L,55709L,55710L,55711L,55712L,55713L,55714L,55715L,55716L,55717L,
-55718L,55719L,55720L,55721L,55722L,55723L,55724L,55725L,55726L,55727L,
-55728L,55729L,55730L,55731L,55732L,55733L,55734L,55735L,55736L,55737L,
-55738L,55739L,55740L,55741L,55742L,55743L,55744L,55745L,55746L,55747L,
-55748L,55749L,55750L,55751L,55752L,55753L,55754L,55755L,55756L,55757L,
-55758L,55759L,55760L,55761L,55762L,55763L,55764L,55765L,55766L,55767L,
-55768L,55769L,55770L,55771L,55772L,55773L,55774L,55775L,55776L,55777L,
-55778L,55779L,55780L,55781L,55782L,55783L,55784L,55785L,55786L,55787L,
-55788L,55789L,55790L,55791L,55792L,55793L,55794L,55795L,55796L,55797L,
-55798L,55799L,55800L,55801L,55802L,55803L,55804L,55805L,55806L,55807L,
-55808L,55809L,55810L,55811L,55812L,55813L,55814L,55815L,55816L,55817L,
-55818L,55819L,55820L,55821L,55822L,55823L,55824L,55825L,55826L,55827L,
-55828L,55829L,55830L,55831L,55832L,55833L,55834L,55835L,55836L,55837L,
-55838L,55839L,55840L,55841L,55842L,55843L,55844L,55845L,55846L,55847L,
-55848L,55849L,55850L,55851L,55852L,55853L,55854L,55855L,55856L,55857L,
-55858L,55859L,55860L,55861L,55862L,55863L,55864L,55865L,55866L,55867L,
-55868L,55869L,55870L,55871L,55872L,55873L,55874L,55875L,55876L,55877L,
-55878L,55879L,55880L,55881L,55882L,55883L,55884L,55885L,55886L,55887L,
-55888L,55889L,55890L,55891L,55892L,55893L,55894L,55895L,55896L,55897L,
-55898L,55899L,55900L,55901L,55902L,55903L,55904L,55905L,55906L,55907L,
-55908L,55909L,55910L,55911L,55912L,55913L,55914L,55915L,55916L,55917L,
-55918L,55919L,55920L,55921L,55922L,55923L,55924L,55925L,55926L,55927L,
-55928L,55929L,55930L,55931L,55932L,55933L,55934L,55935L,55936L,55937L,
-55938L,55939L,55940L,55941L,55942L,55943L,55944L,55945L,55946L,55947L,
-55948L,55949L,55950L,55951L,55952L,55953L,55954L,55955L,55956L,55957L,
-55958L,55959L,55960L,55961L,55962L,55963L,55964L,55965L,55966L,55967L,
-55968L,55969L,55970L,55971L,55972L,55973L,55974L,55975L,55976L,55977L,
-55978L,55979L,55980L,55981L,55982L,55983L,55984L,55985L,55986L,55987L,
-55988L,55989L,55990L,55991L,55992L,55993L,55994L,55995L,55996L,55997L,
-55998L,55999L,56000L,56001L,56002L,56003L,56004L,56005L,56006L,56007L,
-56008L,56009L,56010L,56011L,56012L,56013L,56014L,56015L,56016L,56017L,
-56018L,56019L,56020L,56021L,56022L,56023L,56024L,56025L,56026L,56027L,
-56028L,56029L,56030L,56031L,56032L,56033L,56034L,56035L,56036L,56037L,
-56038L,56039L,56040L,56041L,56042L,56043L,56044L,56045L,56046L,56047L,
-56048L,56049L,56050L,56051L,56052L,56053L,56054L,56055L,56056L,56057L,
-56058L,56059L,56060L,56061L,56062L,56063L,56064L,56065L,56066L,56067L,
-56068L,56069L,56070L,56071L,56072L,56073L,56074L,56075L,56076L,56077L,
-56078L,56079L,56080L,56081L,56082L,56083L,56084L,56085L,56086L,56087L,
-56088L,56089L,56090L,56091L,56092L,56093L,56094L,56095L,56096L,56097L,
-56098L,56099L,56100L,56101L,56102L,56103L,56104L,56105L,56106L,56107L,
-56108L,56109L,56110L,56111L,56112L,56113L,56114L,56115L,56116L,56117L,
-56118L,56119L,56120L,56121L,56122L,56123L,56124L,56125L,56126L,56127L,
-56128L,56129L,56130L,56131L,56132L,56133L,56134L,56135L,56136L,56137L,
-56138L,56139L,56140L,56141L,56142L,56143L,56144L,56145L,56146L,56147L,
-56148L,56149L,56150L,56151L,56152L,56153L,56154L,56155L,56156L,56157L,
-56158L,56159L,56160L,56161L,56162L,56163L,56164L,56165L,56166L,56167L,
-56168L,56169L,56170L,56171L,56172L,56173L,56174L,56175L,56176L,56177L,
-56178L,56179L,56180L,56181L,56182L,56183L,56184L,56185L,56186L,56187L,
-56188L,56189L,56190L,56191L,56192L,56193L,56194L,56195L,56196L,56197L,
-56198L,56199L,56200L,56201L,56202L,56203L,56204L,56205L,56206L,56207L,
-56208L,56209L,56210L,56211L,56212L,56213L,56214L,56215L,56216L,56217L,
-56218L,56219L,56220L,56221L,56222L,56223L,56224L,56225L,56226L,56227L,
-56228L,56229L,56230L,56231L,56232L,56233L,56234L,56235L,56236L,56237L,
-56238L,56239L,56240L,56241L,56242L,56243L,56244L,56245L,56246L,56247L,
-56248L,56249L,56250L,56251L,56252L,56253L,56254L,56255L,56256L,56257L,
-56258L,56259L,56260L,56261L,56262L,56263L,56264L,56265L,56266L,56267L,
-56268L,56269L,56270L,56271L,56272L,56273L,56274L,56275L,56276L,56277L,
-56278L,56279L,56280L,56281L,56282L,56283L,56284L,56285L,56286L,56287L,
-56288L,56289L,56290L,56291L,56292L,56293L,56294L,56295L,56296L,56297L,
-56298L,56299L,56300L,56301L,56302L,56303L,56304L,56305L,56306L,56307L,
-56308L,56309L,56310L,56311L,56312L,56313L,56314L,56315L,56316L,56317L,
-56318L,56319L,56320L,56321L,56322L,56323L,56324L,56325L,56326L,56327L,
-56328L,56329L,56330L,56331L,56332L,56333L,56334L,56335L,56336L,56337L,
-56338L,56339L,56340L,56341L,56342L,56343L,56344L,56345L,56346L,56347L,
-56348L,56349L,56350L,56351L,56352L,56353L,56354L,56355L,56356L,56357L,
-56358L,56359L,56360L,56361L,56362L,56363L,56364L,56365L,56366L,56367L,
-56368L,56369L,56370L,56371L,56372L,56373L,56374L,56375L,56376L,56377L,
-56378L,56379L,56380L,56381L,56382L,56383L,56384L,56385L,56386L,56387L,
-56388L,56389L,56390L,56391L,56392L,56393L,56394L,56395L,56396L,56397L,
-56398L,56399L,56400L,56401L,56402L,56403L,56404L,56405L,56406L,56407L,
-56408L,56409L,56410L,56411L,56412L,56413L,56414L,56415L,56416L,56417L,
-56418L,56419L,56420L,56421L,56422L,56423L,56424L,56425L,56426L,56427L,
-56428L,56429L,56430L,56431L,56432L,56433L,56434L,56435L,56436L,56437L,
-56438L,56439L,56440L,56441L,56442L,56443L,56444L,56445L,56446L,56447L,
-56448L,56449L,56450L,56451L,56452L,56453L,56454L,56455L,56456L,56457L,
-56458L,56459L,56460L,56461L,56462L,56463L,56464L,56465L,56466L,56467L,
-56468L,56469L,56470L,56471L,56472L,56473L,56474L,56475L,56476L,56477L,
-56478L,56479L,56480L,56481L,56482L,56483L,56484L,56485L,56486L,56487L,
-56488L,56489L,56490L,56491L,56492L,56493L,56494L,56495L,56496L,56497L,
-56498L,56499L,56500L,56501L,56502L,56503L,56504L,56505L,56506L,56507L,
-56508L,56509L,56510L,56511L,56512L,56513L,56514L,56515L,56516L,56517L,
-56518L,56519L,56520L,56521L,56522L,56523L,56524L,56525L,56526L,56527L,
-56528L,56529L,56530L,56531L,56532L,56533L,56534L,56535L,56536L,56537L,
-56538L,56539L,56540L,56541L,56542L,56543L,56544L,56545L,56546L,56547L,
-56548L,56549L,56550L,56551L,56552L,56553L,56554L,56555L,56556L,56557L,
-56558L,56559L,56560L,56561L,56562L,56563L,56564L,56565L,56566L,56567L,
-56568L,56569L,56570L,56571L,56572L,56573L,56574L,56575L,56576L,56577L,
-56578L,56579L,56580L,56581L,56582L,56583L,56584L,56585L,56586L,56587L,
-56588L,56589L,56590L,56591L,56592L,56593L,56594L,56595L,56596L,56597L,
-56598L,56599L,56600L,56601L,56602L,56603L,56604L,56605L,56606L,56607L,
-56608L,56609L,56610L,56611L,56612L,56613L,56614L,56615L,56616L,56617L,
-56618L,56619L,56620L,56621L,56622L,56623L,56624L,56625L,56626L,56627L,
-56628L,56629L,56630L,56631L,56632L,56633L,56634L,56635L,56636L,56637L,
-56638L,56639L,56640L,56641L,56642L,56643L,56644L,56645L,56646L,56647L,
-56648L,56649L,56650L,56651L,56652L,56653L,56654L,56655L,56656L,56657L,
-56658L,56659L,56660L,56661L,56662L,56663L,56664L,56665L,56666L,56667L,
-56668L,56669L,56670L,56671L,56672L,56673L,56674L,56675L,56676L,56677L,
-56678L,56679L,56680L,56681L,56682L,56683L,56684L,56685L,56686L,56687L,
-56688L,56689L,56690L,56691L,56692L,56693L,56694L,56695L,56696L,56697L,
-56698L,56699L,56700L,56701L,56702L,56703L,56704L,56705L,56706L,56707L,
-56708L,56709L,56710L,56711L,56712L,56713L,56714L,56715L,56716L,56717L,
-56718L,56719L,56720L,56721L,56722L,56723L,56724L,56725L,56726L,56727L,
-56728L,56729L,56730L,56731L,56732L,56733L,56734L,56735L,56736L,56737L,
-56738L,56739L,56740L,56741L,56742L,56743L,56744L,56745L,56746L,56747L,
-56748L,56749L,56750L,56751L,56752L,56753L,56754L,56755L,56756L,56757L,
-56758L,56759L,56760L,56761L,56762L,56763L,56764L,56765L,56766L,56767L,
-56768L,56769L,56770L,56771L,56772L,56773L,56774L,56775L,56776L,56777L,
-56778L,56779L,56780L,56781L,56782L,56783L,56784L,56785L,56786L,56787L,
-56788L,56789L,56790L,56791L,56792L,56793L,56794L,56795L,56796L,56797L,
-56798L,56799L,56800L,56801L,56802L,56803L,56804L,56805L,56806L,56807L,
-56808L,56809L,56810L,56811L,56812L,56813L,56814L,56815L,56816L,56817L,
-56818L,56819L,56820L,56821L,56822L,56823L,56824L,56825L,56826L,56827L,
-56828L,56829L,56830L,56831L,56832L,56833L,56834L,56835L,56836L,56837L,
-56838L,56839L,56840L,56841L,56842L,56843L,56844L,56845L,56846L,56847L,
-56848L,56849L,56850L,56851L,56852L,56853L,56854L,56855L,56856L,56857L,
-56858L,56859L,56860L,56861L,56862L,56863L,56864L,56865L,56866L,56867L,
-56868L,56869L,56870L,56871L,56872L,56873L,56874L,56875L,56876L,56877L,
-56878L,56879L,56880L,56881L,56882L,56883L,56884L,56885L,56886L,56887L,
-56888L,56889L,56890L,56891L,56892L,56893L,56894L,56895L,56896L,56897L,
-56898L,56899L,56900L,56901L,56902L,56903L,56904L,56905L,56906L,56907L,
-56908L,56909L,56910L,56911L,56912L,56913L,56914L,56915L,56916L,56917L,
-56918L,56919L,56920L,56921L,56922L,56923L,56924L,56925L,56926L,56927L,
-56928L,56929L,56930L,56931L,56932L,56933L,56934L,56935L,56936L,56937L,
-56938L,56939L,56940L,56941L,56942L,56943L,56944L,56945L,56946L,56947L,
-56948L,56949L,56950L,56951L,56952L,56953L,56954L,56955L,56956L,56957L,
-56958L,56959L,56960L,56961L,56962L,56963L,56964L,56965L,56966L,56967L,
-56968L,56969L,56970L,56971L,56972L,56973L,56974L,56975L,56976L,56977L,
-56978L,56979L,56980L,56981L,56982L,56983L,56984L,56985L,56986L,56987L,
-56988L,56989L,56990L,56991L,56992L,56993L,56994L,56995L,56996L,56997L,
-56998L,56999L,57000L,57001L,57002L,57003L,57004L,57005L,57006L,57007L,
-57008L,57009L,57010L,57011L,57012L,57013L,57014L,57015L,57016L,57017L,
-57018L,57019L,57020L,57021L,57022L,57023L,57024L,57025L,57026L,57027L,
-57028L,57029L,57030L,57031L,57032L,57033L,57034L,57035L,57036L,57037L,
-57038L,57039L,57040L,57041L,57042L,57043L,57044L,57045L,57046L,57047L,
-57048L,57049L,57050L,57051L,57052L,57053L,57054L,57055L,57056L,57057L,
-57058L,57059L,57060L,57061L,57062L,57063L,57064L,57065L,57066L,57067L,
-57068L,57069L,57070L,57071L,57072L,57073L,57074L,57075L,57076L,57077L,
-57078L,57079L,57080L,57081L,57082L,57083L,57084L,57085L,57086L,57087L,
-57088L,57089L,57090L,57091L,57092L,57093L,57094L,57095L,57096L,57097L,
-57098L,57099L,57100L,57101L,57102L,57103L,57104L,57105L,57106L,57107L,
-57108L,57109L,57110L,57111L,57112L,57113L,57114L,57115L,57116L,57117L,
-57118L,57119L,57120L,57121L,57122L,57123L,57124L,57125L,57126L,57127L,
-57128L,57129L,57130L,57131L,57132L,57133L,57134L,57135L,57136L,57137L,
-57138L,57139L,57140L,57141L,57142L,57143L,57144L,57145L,57146L,57147L,
-57148L,57149L,57150L,57151L,57152L,57153L,57154L,57155L,57156L,57157L,
-57158L,57159L,57160L,57161L,57162L,57163L,57164L,57165L,57166L,57167L,
-57168L,57169L,57170L,57171L,57172L,57173L,57174L,57175L,57176L,57177L,
-57178L,57179L,57180L,57181L,57182L,57183L,57184L,57185L,57186L,57187L,
-57188L,57189L,57190L,57191L,57192L,57193L,57194L,57195L,57196L,57197L,
-57198L,57199L,57200L,57201L,57202L,57203L,57204L,57205L,57206L,57207L,
-57208L,57209L,57210L,57211L,57212L,57213L,57214L,57215L,57216L,57217L,
-57218L,57219L,57220L,57221L,57222L,57223L,57224L,57225L,57226L,57227L,
-57228L,57229L,57230L,57231L,57232L,57233L,57234L,57235L,57236L,57237L,
-57238L,57239L,57240L,57241L,57242L,57243L,57244L,57245L,57246L,57247L,
-57248L,57249L,57250L,57251L,57252L,57253L,57254L,57255L,57256L,57257L,
-57258L,57259L,57260L,57261L,57262L,57263L,57264L,57265L,57266L,57267L,
-57268L,57269L,57270L,57271L,57272L,57273L,57274L,57275L,57276L,57277L,
-57278L,57279L,57280L,57281L,57282L,57283L,57284L,57285L,57286L,57287L,
-57288L,57289L,57290L,57291L,57292L,57293L,57294L,57295L,57296L,57297L,
-57298L,57299L,57300L,57301L,57302L,57303L,57304L,57305L,57306L,57307L,
-57308L,57309L,57310L,57311L,57312L,57313L,57314L,57315L,57316L,57317L,
-57318L,57319L,57320L,57321L,57322L,57323L,57324L,57325L,57326L,57327L,
-57328L,57329L,57330L,57331L,57332L,57333L,57334L,57335L,57336L,57337L,
-57338L,57339L,57340L,57341L,57342L,57343L,57344L,57345L,57346L,57347L,
-57348L,57349L,57350L,57351L,57352L,57353L,57354L,57355L,57356L,57357L,
-57358L,57359L,57360L,57361L,57362L,57363L,57364L,57365L,57366L,57367L,
-57368L,57369L,57370L,57371L,57372L,57373L,57374L,57375L,57376L,57377L,
-57378L,57379L,57380L,57381L,57382L,57383L,57384L,57385L,57386L,57387L,
-57388L,57389L,57390L,57391L,57392L,57393L,57394L,57395L,57396L,57397L,
-57398L,57399L,57400L,57401L,57402L,57403L,57404L,57405L,57406L,57407L,
-57408L,57409L,57410L,57411L,57412L,57413L,57414L,57415L,57416L,57417L,
-57418L,57419L,57420L,57421L,57422L,57423L,57424L,57425L,57426L,57427L,
-57428L,57429L,57430L,57431L,57432L,57433L,57434L,57435L,57436L,57437L,
-57438L,57439L,57440L,57441L,57442L,57443L,57444L,57445L,57446L,57447L,
-57448L,57449L,57450L,57451L,57452L,57453L,57454L,57455L,57456L,57457L,
-57458L,57459L,57460L,57461L,57462L,57463L,57464L,57465L,57466L,57467L,
-57468L,57469L,57470L,57471L,57472L,57473L,57474L,57475L,57476L,57477L,
-57478L,57479L,57480L,57481L,57482L,57483L,57484L,57485L,57486L,57487L,
-57488L,57489L,57490L,57491L,57492L,57493L,57494L,57495L,57496L,57497L,
-57498L,57499L,57500L,57501L,57502L,57503L,57504L,57505L,57506L,57507L,
-57508L,57509L,57510L,57511L,57512L,57513L,57514L,57515L,57516L,57517L,
-57518L,57519L,57520L,57521L,57522L,57523L,57524L,57525L,57526L,57527L,
-57528L,57529L,57530L,57531L,57532L,57533L,57534L,57535L,57536L,57537L,
-57538L,57539L,57540L,57541L,57542L,57543L,57544L,57545L,57546L,57547L,
-57548L,57549L,57550L,57551L,57552L,57553L,57554L,57555L,57556L,57557L,
-57558L,57559L,57560L,57561L,57562L,57563L,57564L,57565L,57566L,57567L,
-57568L,57569L,57570L,57571L,57572L,57573L,57574L,57575L,57576L,57577L,
-57578L,57579L,57580L,57581L,57582L,57583L,57584L,57585L,57586L,57587L,
-57588L,57589L,57590L,57591L,57592L,57593L,57594L,57595L,57596L,57597L,
-57598L,57599L,57600L,57601L,57602L,57603L,57604L,57605L,57606L,57607L,
-57608L,57609L,57610L,57611L,57612L,57613L,57614L,57615L,57616L,57617L,
-57618L,57619L,57620L,57621L,57622L,57623L,57624L,57625L,57626L,57627L,
-57628L,57629L,57630L,57631L,57632L,57633L,57634L,57635L,57636L,57637L,
-57638L,57639L,57640L,57641L,57642L,57643L,57644L,57645L,57646L,57647L,
-57648L,57649L,57650L,57651L,57652L,57653L,57654L,57655L,57656L,57657L,
-57658L,57659L,57660L,57661L,57662L,57663L,57664L,57665L,57666L,57667L,
-57668L,57669L,57670L,57671L,57672L,57673L,57674L,57675L,57676L,57677L,
-57678L,57679L,57680L,57681L,57682L,57683L,57684L,57685L,57686L,57687L,
-57688L,57689L,57690L,57691L,57692L,57693L,57694L,57695L,57696L,57697L,
-57698L,57699L,57700L,57701L,57702L,57703L,57704L,57705L,57706L,57707L,
-57708L,57709L,57710L,57711L,57712L,57713L,57714L,57715L,57716L,57717L,
-57718L,57719L,57720L,57721L,57722L,57723L,57724L,57725L,57726L,57727L,
-57728L,57729L,57730L,57731L,57732L,57733L,57734L,57735L,57736L,57737L,
-57738L,57739L,57740L,57741L,57742L,57743L,57744L,57745L,57746L,57747L,
-57748L,57749L,57750L,57751L,57752L,57753L,57754L,57755L,57756L,57757L,
-57758L,57759L,57760L,57761L,57762L,57763L,57764L,57765L,57766L,57767L,
-57768L,57769L,57770L,57771L,57772L,57773L,57774L,57775L,57776L,57777L,
-57778L,57779L,57780L,57781L,57782L,57783L,57784L,57785L,57786L,57787L,
-57788L,57789L,57790L,57791L,57792L,57793L,57794L,57795L,57796L,57797L,
-57798L,57799L,57800L,57801L,57802L,57803L,57804L,57805L,57806L,57807L,
-57808L,57809L,57810L,57811L,57812L,57813L,57814L,57815L,57816L,57817L,
-57818L,57819L,57820L,57821L,57822L,57823L,57824L,57825L,57826L,57827L,
-57828L,57829L,57830L,57831L,57832L,57833L,57834L,57835L,57836L,57837L,
-57838L,57839L,57840L,57841L,57842L,57843L,57844L,57845L,57846L,57847L,
-57848L,57849L,57850L,57851L,57852L,57853L,57854L,57855L,57856L,57857L,
-57858L,57859L,57860L,57861L,57862L,57863L,57864L,57865L,57866L,57867L,
-57868L,57869L,57870L,57871L,57872L,57873L,57874L,57875L,57876L,57877L,
-57878L,57879L,57880L,57881L,57882L,57883L,57884L,57885L,57886L,57887L,
-57888L,57889L,57890L,57891L,57892L,57893L,57894L,57895L,57896L,57897L,
-57898L,57899L,57900L,57901L,57902L,57903L,57904L,57905L,57906L,57907L,
-57908L,57909L,57910L,57911L,57912L,57913L,57914L,57915L,57916L,57917L,
-57918L,57919L,57920L,57921L,57922L,57923L,57924L,57925L,57926L,57927L,
-57928L,57929L,57930L,57931L,57932L,57933L,57934L,57935L,57936L,57937L,
-57938L,57939L,57940L,57941L,57942L,57943L,57944L,57945L,57946L,57947L,
-57948L,57949L,57950L,57951L,57952L,57953L,57954L,57955L,57956L,57957L,
-57958L,57959L,57960L,57961L,57962L,57963L,57964L,57965L,57966L,57967L,
-57968L,57969L,57970L,57971L,57972L,57973L,57974L,57975L,57976L,57977L,
-57978L,57979L,57980L,57981L,57982L,57983L,57984L,57985L,57986L,57987L,
-57988L,57989L,57990L,57991L,57992L,57993L,57994L,57995L,57996L,57997L,
-57998L,57999L,58000L,58001L,58002L,58003L,58004L,58005L,58006L,58007L,
-58008L,58009L,58010L,58011L,58012L,58013L,58014L,58015L,58016L,58017L,
-58018L,58019L,58020L,58021L,58022L,58023L,58024L,58025L,58026L,58027L,
-58028L,58029L,58030L,58031L,58032L,58033L,58034L,58035L,58036L,58037L,
-58038L,58039L,58040L,58041L,58042L,58043L,58044L,58045L,58046L,58047L,
-58048L,58049L,58050L,58051L,58052L,58053L,58054L,58055L,58056L,58057L,
-58058L,58059L,58060L,58061L,58062L,58063L,58064L,58065L,58066L,58067L,
-58068L,58069L,58070L,58071L,58072L,58073L,58074L,58075L,58076L,58077L,
-58078L,58079L,58080L,58081L,58082L,58083L,58084L,58085L,58086L,58087L,
-58088L,58089L,58090L,58091L,58092L,58093L,58094L,58095L,58096L,58097L,
-58098L,58099L,58100L,58101L,58102L,58103L,58104L,58105L,58106L,58107L,
-58108L,58109L,58110L,58111L,58112L,58113L,58114L,58115L,58116L,58117L,
-58118L,58119L,58120L,58121L,58122L,58123L,58124L,58125L,58126L,58127L,
-58128L,58129L,58130L,58131L,58132L,58133L,58134L,58135L,58136L,58137L,
-58138L,58139L,58140L,58141L,58142L,58143L,58144L,58145L,58146L,58147L,
-58148L,58149L,58150L,58151L,58152L,58153L,58154L,58155L,58156L,58157L,
-58158L,58159L,58160L,58161L,58162L,58163L,58164L,58165L,58166L,58167L,
-58168L,58169L,58170L,58171L,58172L,58173L,58174L,58175L,58176L,58177L,
-58178L,58179L,58180L,58181L,58182L,58183L,58184L,58185L,58186L,58187L,
-58188L,58189L,58190L,58191L,58192L,58193L,58194L,58195L,58196L,58197L,
-58198L,58199L,58200L,58201L,58202L,58203L,58204L,58205L,58206L,58207L,
-58208L,58209L,58210L,58211L,58212L,58213L,58214L,58215L,58216L,58217L,
-58218L,58219L,58220L,58221L,58222L,58223L,58224L,58225L,58226L,58227L,
-58228L,58229L,58230L,58231L,58232L,58233L,58234L,58235L,58236L,58237L,
-58238L,58239L,58240L,58241L,58242L,58243L,58244L,58245L,58246L,58247L,
-58248L,58249L,58250L,58251L,58252L,58253L,58254L,58255L,58256L,58257L,
-58258L,58259L,58260L,58261L,58262L,58263L,58264L,58265L,58266L,58267L,
-58268L,58269L,58270L,58271L,58272L,58273L,58274L,58275L,58276L,58277L,
-58278L,58279L,58280L,58281L,58282L,58283L,58284L,58285L,58286L,58287L,
-58288L,58289L,58290L,58291L,58292L,58293L,58294L,58295L,58296L,58297L,
-58298L,58299L,58300L,58301L,58302L,58303L,58304L,58305L,58306L,58307L,
-58308L,58309L,58310L,58311L,58312L,58313L,58314L,58315L,58316L,58317L,
-58318L,58319L,58320L,58321L,58322L,58323L,58324L,58325L,58326L,58327L,
-58328L,58329L,58330L,58331L,58332L,58333L,58334L,58335L,58336L,58337L,
-58338L,58339L,58340L,58341L,58342L,58343L,58344L,58345L,58346L,58347L,
-58348L,58349L,58350L,58351L,58352L,58353L,58354L,58355L,58356L,58357L,
-58358L,58359L,58360L,58361L,58362L,58363L,58364L,58365L,58366L,58367L,
-58368L,58369L,58370L,58371L,58372L,58373L,58374L,58375L,58376L,58377L,
-58378L,58379L,58380L,58381L,58382L,58383L,58384L,58385L,58386L,58387L,
-58388L,58389L,58390L,58391L,58392L,58393L,58394L,58395L,58396L,58397L,
-58398L,58399L,58400L,58401L,58402L,58403L,58404L,58405L,58406L,58407L,
-58408L,58409L,58410L,58411L,58412L,58413L,58414L,58415L,58416L,58417L,
-58418L,58419L,58420L,58421L,58422L,58423L,58424L,58425L,58426L,58427L,
-58428L,58429L,58430L,58431L,58432L,58433L,58434L,58435L,58436L,58437L,
-58438L,58439L,58440L,58441L,58442L,58443L,58444L,58445L,58446L,58447L,
-58448L,58449L,58450L,58451L,58452L,58453L,58454L,58455L,58456L,58457L,
-58458L,58459L,58460L,58461L,58462L,58463L,58464L,58465L,58466L,58467L,
-58468L,58469L,58470L,58471L,58472L,58473L,58474L,58475L,58476L,58477L,
-58478L,58479L,58480L,58481L,58482L,58483L,58484L,58485L,58486L,58487L,
-58488L,58489L,58490L,58491L,58492L,58493L,58494L,58495L,58496L,58497L,
-58498L,58499L,58500L,58501L,58502L,58503L,58504L,58505L,58506L,58507L,
-58508L,58509L,58510L,58511L,58512L,58513L,58514L,58515L,58516L,58517L,
-58518L,58519L,58520L,58521L,58522L,58523L,58524L,58525L,58526L,58527L,
-58528L,58529L,58530L,58531L,58532L,58533L,58534L,58535L,58536L,58537L,
-58538L,58539L,58540L,58541L,58542L,58543L,58544L,58545L,58546L,58547L,
-58548L,58549L,58550L,58551L,58552L,58553L,58554L,58555L,58556L,58557L,
-58558L,58559L,58560L,58561L,58562L,58563L,58564L,58565L,58566L,58567L,
-58568L,58569L,58570L,58571L,58572L,58573L,58574L,58575L,58576L,58577L,
-58578L,58579L,58580L,58581L,58582L,58583L,58584L,58585L,58586L,58587L,
-58588L,58589L,58590L,58591L,58592L,58593L,58594L,58595L,58596L,58597L,
-58598L,58599L,58600L,58601L,58602L,58603L,58604L,58605L,58606L,58607L,
-58608L,58609L,58610L,58611L,58612L,58613L,58614L,58615L,58616L,58617L,
-58618L,58619L,58620L,58621L,58622L,58623L,58624L,58625L,58626L,58627L,
-58628L,58629L,58630L,58631L,58632L,58633L,58634L,58635L,58636L,58637L,
-58638L,58639L,58640L,58641L,58642L,58643L,58644L,58645L,58646L,58647L,
-58648L,58649L,58650L,58651L,58652L,58653L,58654L,58655L,58656L,58657L,
-58658L,58659L,58660L,58661L,58662L,58663L,58664L,58665L,58666L,58667L,
-58668L,58669L,58670L,58671L,58672L,58673L,58674L,58675L,58676L,58677L,
-58678L,58679L,58680L,58681L,58682L,58683L,58684L,58685L,58686L,58687L,
-58688L,58689L,58690L,58691L,58692L,58693L,58694L,58695L,58696L,58697L,
-58698L,58699L,58700L,58701L,58702L,58703L,58704L,58705L,58706L,58707L,
-58708L,58709L,58710L,58711L,58712L,58713L,58714L,58715L,58716L,58717L,
-58718L,58719L,58720L,58721L,58722L,58723L,58724L,58725L,58726L,58727L,
-58728L,58729L,58730L,58731L,58732L,58733L,58734L,58735L,58736L,58737L,
-58738L,58739L,58740L,58741L,58742L,58743L,58744L,58745L,58746L,58747L,
-58748L,58749L,58750L,58751L,58752L,58753L,58754L,58755L,58756L,58757L,
-58758L,58759L,58760L,58761L,58762L,58763L,58764L,58765L,58766L,58767L,
-58768L,58769L,58770L,58771L,58772L,58773L,58774L,58775L,58776L,58777L,
-58778L,58779L,58780L,58781L,58782L,58783L,58784L,58785L,58786L,58787L,
-58788L,58789L,58790L,58791L,58792L,58793L,58794L,58795L,58796L,58797L,
-58798L,58799L,58800L,58801L,58802L,58803L,58804L,58805L,58806L,58807L,
-58808L,58809L,58810L,58811L,58812L,58813L,58814L,58815L,58816L,58817L,
-58818L,58819L,58820L,58821L,58822L,58823L,58824L,58825L,58826L,58827L,
-58828L,58829L,58830L,58831L,58832L,58833L,58834L,58835L,58836L,58837L,
-58838L,58839L,58840L,58841L,58842L,58843L,58844L,58845L,58846L,58847L,
-58848L,58849L,58850L,58851L,58852L,58853L,58854L,58855L,58856L,58857L,
-58858L,58859L,58860L,58861L,58862L,58863L,58864L,58865L,58866L,58867L,
-58868L,58869L,58870L,58871L,58872L,58873L,58874L,58875L,58876L,58877L,
-58878L,58879L,58880L,58881L,58882L,58883L,58884L,58885L,58886L,58887L,
-58888L,58889L,58890L,58891L,58892L,58893L,58894L,58895L,58896L,58897L,
-58898L,58899L,58900L,58901L,58902L,58903L,58904L,58905L,58906L,58907L,
-58908L,58909L,58910L,58911L,58912L,58913L,58914L,58915L,58916L,58917L,
-58918L,58919L,58920L,58921L,58922L,58923L,58924L,58925L,58926L,58927L,
-58928L,58929L,58930L,58931L,58932L,58933L,58934L,58935L,58936L,58937L,
-58938L,58939L,58940L,58941L,58942L,58943L,58944L,58945L,58946L,58947L,
-58948L,58949L,58950L,58951L,58952L,58953L,58954L,58955L,58956L,58957L,
-58958L,58959L,58960L,58961L,58962L,58963L,58964L,58965L,58966L,58967L,
-58968L,58969L,58970L,58971L,58972L,58973L,58974L,58975L,58976L,58977L,
-58978L,58979L,58980L,58981L,58982L,58983L,58984L,58985L,58986L,58987L,
-58988L,58989L,58990L,58991L,58992L,58993L,58994L,58995L,58996L,58997L,
-58998L,58999L,59000L,59001L,59002L,59003L,59004L,59005L,59006L,59007L,
-59008L,59009L,59010L,59011L,59012L,59013L,59014L,59015L,59016L,59017L,
-59018L,59019L,59020L,59021L,59022L,59023L,59024L,59025L,59026L,59027L,
-59028L,59029L,59030L,59031L,59032L,59033L,59034L,59035L,59036L,59037L,
-59038L,59039L,59040L,59041L,59042L,59043L,59044L,59045L,59046L,59047L,
-59048L,59049L,59050L,59051L,59052L,59053L,59054L,59055L,59056L,59057L,
-59058L,59059L,59060L,59061L,59062L,59063L,59064L,59065L,59066L,59067L,
-59068L,59069L,59070L,59071L,59072L,59073L,59074L,59075L,59076L,59077L,
-59078L,59079L,59080L,59081L,59082L,59083L,59084L,59085L,59086L,59087L,
-59088L,59089L,59090L,59091L,59092L,59093L,59094L,59095L,59096L,59097L,
-59098L,59099L,59100L,59101L,59102L,59103L,59104L,59105L,59106L,59107L,
-59108L,59109L,59110L,59111L,59112L,59113L,59114L,59115L,59116L,59117L,
-59118L,59119L,59120L,59121L,59122L,59123L,59124L,59125L,59126L,59127L,
-59128L,59129L,59130L,59131L,59132L,59133L,59134L,59135L,59136L,59137L,
-59138L,59139L,59140L,59141L,59142L,59143L,59144L,59145L,59146L,59147L,
-59148L,59149L,59150L,59151L,59152L,59153L,59154L,59155L,59156L,59157L,
-59158L,59159L,59160L,59161L,59162L,59163L,59164L,59165L,59166L,59167L,
-59168L,59169L,59170L,59171L,59172L,59173L,59174L,59175L,59176L,59177L,
-59178L,59179L,59180L,59181L,59182L,59183L,59184L,59185L,59186L,59187L,
-59188L,59189L,59190L,59191L,59192L,59193L,59194L,59195L,59196L,59197L,
-59198L,59199L,59200L,59201L,59202L,59203L,59204L,59205L,59206L,59207L,
-59208L,59209L,59210L,59211L,59212L,59213L,59214L,59215L,59216L,59217L,
-59218L,59219L,59220L,59221L,59222L,59223L,59224L,59225L,59226L,59227L,
-59228L,59229L,59230L,59231L,59232L,59233L,59234L,59235L,59236L,59237L,
-59238L,59239L,59240L,59241L,59242L,59243L,59244L,59245L,59246L,59247L,
-59248L,59249L,59250L,59251L,59252L,59253L,59254L,59255L,59256L,59257L,
-59258L,59259L,59260L,59261L,59262L,59263L,59264L,59265L,59266L,59267L,
-59268L,59269L,59270L,59271L,59272L,59273L,59274L,59275L,59276L,59277L,
-59278L,59279L,59280L,59281L,59282L,59283L,59284L,59285L,59286L,59287L,
-59288L,59289L,59290L,59291L,59292L,59293L,59294L,59295L,59296L,59297L,
-59298L,59299L,59300L,59301L,59302L,59303L,59304L,59305L,59306L,59307L,
-59308L,59309L,59310L,59311L,59312L,59313L,59314L,59315L,59316L,59317L,
-59318L,59319L,59320L,59321L,59322L,59323L,59324L,59325L,59326L,59327L,
-59328L,59329L,59330L,59331L,59332L,59333L,59334L,59335L,59336L,59337L,
-59338L,59339L,59340L,59341L,59342L,59343L,59344L,59345L,59346L,59347L,
-59348L,59349L,59350L,59351L,59352L,59353L,59354L,59355L,59356L,59357L,
-59358L,59359L,59360L,59361L,59362L,59363L,59364L,59365L,59366L,59367L,
-59368L,59369L,59370L,59371L,59372L,59373L,59374L,59375L,59376L,59377L,
-59378L,59379L,59380L,59381L,59382L,59383L,59384L,59385L,59386L,59387L,
-59388L,59389L,59390L,59391L,59392L,59393L,59394L,59395L,59396L,59397L,
-59398L,59399L,59400L,59401L,59402L,59403L,59404L,59405L,59406L,59407L,
-59408L,59409L,59410L,59411L,59412L,59413L,59414L,59415L,59416L,59417L,
-59418L,59419L,59420L,59421L,59422L,59423L,59424L,59425L,59426L,59427L,
-59428L,59429L,59430L,59431L,59432L,59433L,59434L,59435L,59436L,59437L,
-59438L,59439L,59440L,59441L,59442L,59443L,59444L,59445L,59446L,59447L,
-59448L,59449L,59450L,59451L,59452L,59453L,59454L,59455L,59456L,59457L,
-59458L,59459L,59460L,59461L,59462L,59463L,59464L,59465L,59466L,59467L,
-59468L,59469L,59470L,59471L,59472L,59473L,59474L,59475L,59476L,59477L,
-59478L,59479L,59480L,59481L,59482L,59483L,59484L,59485L,59486L,59487L,
-59488L,59489L,59490L,59491L,59492L,59493L,59494L,59495L,59496L,59497L,
-59498L,59499L,59500L,59501L,59502L,59503L,59504L,59505L,59506L,59507L,
-59508L,59509L,59510L,59511L,59512L,59513L,59514L,59515L,59516L,59517L,
-59518L,59519L,59520L,59521L,59522L,59523L,59524L,59525L,59526L,59527L,
-59528L,59529L,59530L,59531L,59532L,59533L,59534L,59535L,59536L,59537L,
-59538L,59539L,59540L,59541L,59542L,59543L,59544L,59545L,59546L,59547L,
-59548L,59549L,59550L,59551L,59552L,59553L,59554L,59555L,59556L,59557L,
-59558L,59559L,59560L,59561L,59562L,59563L,59564L,59565L,59566L,59567L,
-59568L,59569L,59570L,59571L,59572L,59573L,59574L,59575L,59576L,59577L,
-59578L,59579L,59580L,59581L,59582L,59583L,59584L,59585L,59586L,59587L,
-59588L,59589L,59590L,59591L,59592L,59593L,59594L,59595L,59596L,59597L,
-59598L,59599L,59600L,59601L,59602L,59603L,59604L,59605L,59606L,59607L,
-59608L,59609L,59610L,59611L,59612L,59613L,59614L,59615L,59616L,59617L,
-59618L,59619L,59620L,59621L,59622L,59623L,59624L,59625L,59626L,59627L,
-59628L,59629L,59630L,59631L,59632L,59633L,59634L,59635L,59636L,59637L,
-59638L,59639L,59640L,59641L,59642L,59643L,59644L,59645L,59646L,59647L,
-59648L,59649L,59650L,59651L,59652L,59653L,59654L,59655L,59656L,59657L,
-59658L,59659L,59660L,59661L,59662L,59663L,59664L,59665L,59666L,59667L,
-59668L,59669L,59670L,59671L,59672L,59673L,59674L,59675L,59676L,59677L,
-59678L,59679L,59680L,59681L,59682L,59683L,59684L,59685L,59686L,59687L,
-59688L,59689L,59690L,59691L,59692L,59693L,59694L,59695L,59696L,59697L,
-59698L,59699L,59700L,59701L,59702L,59703L,59704L,59705L,59706L,59707L,
-59708L,59709L,59710L,59711L,59712L,59713L,59714L,59715L,59716L,59717L,
-59718L,59719L,59720L,59721L,59722L,59723L,59724L,59725L,59726L,59727L,
-59728L,59729L,59730L,59731L,59732L,59733L,59734L,59735L,59736L,59737L,
-59738L,59739L,59740L,59741L,59742L,59743L,59744L,59745L,59746L,59747L,
-59748L,59749L,59750L,59751L,59752L,59753L,59754L,59755L,59756L,59757L,
-59758L,59759L,59760L,59761L,59762L,59763L,59764L,59765L,59766L,59767L,
-59768L,59769L,59770L,59771L,59772L,59773L,59774L,59775L,59776L,59777L,
-59778L,59779L,59780L,59781L,59782L,59783L,59784L,59785L,59786L,59787L,
-59788L,59789L,59790L,59791L,59792L,59793L,59794L,59795L,59796L,59797L,
-59798L,59799L,59800L,59801L,59802L,59803L,59804L,59805L,59806L,59807L,
-59808L,59809L,59810L,59811L,59812L,59813L,59814L,59815L,59816L,59817L,
-59818L,59819L,59820L,59821L,59822L,59823L,59824L,59825L,59826L,59827L,
-59828L,59829L,59830L,59831L,59832L,59833L,59834L,59835L,59836L,59837L,
-59838L,59839L,59840L,59841L,59842L,59843L,59844L,59845L,59846L,59847L,
-59848L,59849L,59850L,59851L,59852L,59853L,59854L,59855L,59856L,59857L,
-59858L,59859L,59860L,59861L,59862L,59863L,59864L,59865L,59866L,59867L,
-59868L,59869L,59870L,59871L,59872L,59873L,59874L,59875L,59876L,59877L,
-59878L,59879L,59880L,59881L,59882L,59883L,59884L,59885L,59886L,59887L,
-59888L,59889L,59890L,59891L,59892L,59893L,59894L,59895L,59896L,59897L,
-59898L,59899L,59900L,59901L,59902L,59903L,59904L,59905L,59906L,59907L,
-59908L,59909L,59910L,59911L,59912L,59913L,59914L,59915L,59916L,59917L,
-59918L,59919L,59920L,59921L,59922L,59923L,59924L,59925L,59926L,59927L,
-59928L,59929L,59930L,59931L,59932L,59933L,59934L,59935L,59936L,59937L,
-59938L,59939L,59940L,59941L,59942L,59943L,59944L,59945L,59946L,59947L,
-59948L,59949L,59950L,59951L,59952L,59953L,59954L,59955L,59956L,59957L,
-59958L,59959L,59960L,59961L,59962L,59963L,59964L,59965L,59966L,59967L,
-59968L,59969L,59970L,59971L,59972L,59973L,59974L,59975L,59976L,59977L,
-59978L,59979L,59980L,59981L,59982L,59983L,59984L,59985L,59986L,59987L,
-59988L,59989L,59990L,59991L,59992L,59993L,59994L,59995L,59996L,59997L,
-59998L,59999L,60000L,60001L,60002L,60003L,60004L,60005L,60006L,60007L,
-60008L,60009L,60010L,60011L,60012L,60013L,60014L,60015L,60016L,60017L,
-60018L,60019L,60020L,60021L,60022L,60023L,60024L,60025L,60026L,60027L,
-60028L,60029L,60030L,60031L,60032L,60033L,60034L,60035L,60036L,60037L,
-60038L,60039L,60040L,60041L,60042L,60043L,60044L,60045L,60046L,60047L,
-60048L,60049L,60050L,60051L,60052L,60053L,60054L,60055L,60056L,60057L,
-60058L,60059L,60060L,60061L,60062L,60063L,60064L,60065L,60066L,60067L,
-60068L,60069L,60070L,60071L,60072L,60073L,60074L,60075L,60076L,60077L,
-60078L,60079L,60080L,60081L,60082L,60083L,60084L,60085L,60086L,60087L,
-60088L,60089L,60090L,60091L,60092L,60093L,60094L,60095L,60096L,60097L,
-60098L,60099L,60100L,60101L,60102L,60103L,60104L,60105L,60106L,60107L,
-60108L,60109L,60110L,60111L,60112L,60113L,60114L,60115L,60116L,60117L,
-60118L,60119L,60120L,60121L,60122L,60123L,60124L,60125L,60126L,60127L,
-60128L,60129L,60130L,60131L,60132L,60133L,60134L,60135L,60136L,60137L,
-60138L,60139L,60140L,60141L,60142L,60143L,60144L,60145L,60146L,60147L,
-60148L,60149L,60150L,60151L,60152L,60153L,60154L,60155L,60156L,60157L,
-60158L,60159L,60160L,60161L,60162L,60163L,60164L,60165L,60166L,60167L,
-60168L,60169L,60170L,60171L,60172L,60173L,60174L,60175L,60176L,60177L,
-60178L,60179L,60180L,60181L,60182L,60183L,60184L,60185L,60186L,60187L,
-60188L,60189L,60190L,60191L,60192L,60193L,60194L,60195L,60196L,60197L,
-60198L,60199L,60200L,60201L,60202L,60203L,60204L,60205L,60206L,60207L,
-60208L,60209L,60210L,60211L,60212L,60213L,60214L,60215L,60216L,60217L,
-60218L,60219L,60220L,60221L,60222L,60223L,60224L,60225L,60226L,60227L,
-60228L,60229L,60230L,60231L,60232L,60233L,60234L,60235L,60236L,60237L,
-60238L,60239L,60240L,60241L,60242L,60243L,60244L,60245L,60246L,60247L,
-60248L,60249L,60250L,60251L,60252L,60253L,60254L,60255L,60256L,60257L,
-60258L,60259L,60260L,60261L,60262L,60263L,60264L,60265L,60266L,60267L,
-60268L,60269L,60270L,60271L,60272L,60273L,60274L,60275L,60276L,60277L,
-60278L,60279L,60280L,60281L,60282L,60283L,60284L,60285L,60286L,60287L,
-60288L,60289L,60290L,60291L,60292L,60293L,60294L,60295L,60296L,60297L,
-60298L,60299L,60300L,60301L,60302L,60303L,60304L,60305L,60306L,60307L,
-60308L,60309L,60310L,60311L,60312L,60313L,60314L,60315L,60316L,60317L,
-60318L,60319L,60320L,60321L,60322L,60323L,60324L,60325L,60326L,60327L,
-60328L,60329L,60330L,60331L,60332L,60333L,60334L,60335L,60336L,60337L,
-60338L,60339L,60340L,60341L,60342L,60343L,60344L,60345L,60346L,60347L,
-60348L,60349L,60350L,60351L,60352L,60353L,60354L,60355L,60356L,60357L,
-60358L,60359L,60360L,60361L,60362L,60363L,60364L,60365L,60366L,60367L,
-60368L,60369L,60370L,60371L,60372L,60373L,60374L,60375L,60376L,60377L,
-60378L,60379L,60380L,60381L,60382L,60383L,60384L,60385L,60386L,60387L,
-60388L,60389L,60390L,60391L,60392L,60393L,60394L,60395L,60396L,60397L,
-60398L,60399L,60400L,60401L,60402L,60403L,60404L,60405L,60406L,60407L,
-60408L,60409L,60410L,60411L,60412L,60413L,60414L,60415L,60416L,60417L,
-60418L,60419L,60420L,60421L,60422L,60423L,60424L,60425L,60426L,60427L,
-60428L,60429L,60430L,60431L,60432L,60433L,60434L,60435L,60436L,60437L,
-60438L,60439L,60440L,60441L,60442L,60443L,60444L,60445L,60446L,60447L,
-60448L,60449L,60450L,60451L,60452L,60453L,60454L,60455L,60456L,60457L,
-60458L,60459L,60460L,60461L,60462L,60463L,60464L,60465L,60466L,60467L,
-60468L,60469L,60470L,60471L,60472L,60473L,60474L,60475L,60476L,60477L,
-60478L,60479L,60480L,60481L,60482L,60483L,60484L,60485L,60486L,60487L,
-60488L,60489L,60490L,60491L,60492L,60493L,60494L,60495L,60496L,60497L,
-60498L,60499L,60500L,60501L,60502L,60503L,60504L,60505L,60506L,60507L,
-60508L,60509L,60510L,60511L,60512L,60513L,60514L,60515L,60516L,60517L,
-60518L,60519L,60520L,60521L,60522L,60523L,60524L,60525L,60526L,60527L,
-60528L,60529L,60530L,60531L,60532L,60533L,60534L,60535L,60536L,60537L,
-60538L,60539L,60540L,60541L,60542L,60543L,60544L,60545L,60546L,60547L,
-60548L,60549L,60550L,60551L,60552L,60553L,60554L,60555L,60556L,60557L,
-60558L,60559L,60560L,60561L,60562L,60563L,60564L,60565L,60566L,60567L,
-60568L,60569L,60570L,60571L,60572L,60573L,60574L,60575L,60576L,60577L,
-60578L,60579L,60580L,60581L,60582L,60583L,60584L,60585L,60586L,60587L,
-60588L,60589L,60590L,60591L,60592L,60593L,60594L,60595L,60596L,60597L,
-60598L,60599L,60600L,60601L,60602L,60603L,60604L,60605L,60606L,60607L,
-60608L,60609L,60610L,60611L,60612L,60613L,60614L,60615L,60616L,60617L,
-60618L,60619L,60620L,60621L,60622L,60623L,60624L,60625L,60626L,60627L,
-60628L,60629L,60630L,60631L,60632L,60633L,60634L,60635L,60636L,60637L,
-60638L,60639L,60640L,60641L,60642L,60643L,60644L,60645L,60646L,60647L,
-60648L,60649L,60650L,60651L,60652L,60653L,60654L,60655L,60656L,60657L,
-60658L,60659L,60660L,60661L,60662L,60663L,60664L,60665L,60666L,60667L,
-60668L,60669L,60670L,60671L,60672L,60673L,60674L,60675L,60676L,60677L,
-60678L,60679L,60680L,60681L,60682L,60683L,60684L,60685L,60686L,60687L,
-60688L,60689L,60690L,60691L,60692L,60693L,60694L,60695L,60696L,60697L,
-60698L,60699L,60700L,60701L,60702L,60703L,60704L,60705L,60706L,60707L,
-60708L,60709L,60710L,60711L,60712L,60713L,60714L,60715L,60716L,60717L,
-60718L,60719L,60720L,60721L,60722L,60723L,60724L,60725L,60726L,60727L,
-60728L,60729L,60730L,60731L,60732L,60733L,60734L,60735L,60736L,60737L,
-60738L,60739L,60740L,60741L,60742L,60743L,60744L,60745L,60746L,60747L,
-60748L,60749L,60750L,60751L,60752L,60753L,60754L,60755L,60756L,60757L,
-60758L,60759L,60760L,60761L,60762L,60763L,60764L,60765L,60766L,60767L,
-60768L,60769L,60770L,60771L,60772L,60773L,60774L,60775L,60776L,60777L,
-60778L,60779L,60780L,60781L,60782L,60783L,60784L,60785L,60786L,60787L,
-60788L,60789L,60790L,60791L,60792L,60793L,60794L,60795L,60796L,60797L,
-60798L,60799L,60800L,60801L,60802L,60803L,60804L,60805L,60806L,60807L,
-60808L,60809L,60810L,60811L,60812L,60813L,60814L,60815L,60816L,60817L,
-60818L,60819L,60820L,60821L,60822L,60823L,60824L,60825L,60826L,60827L,
-60828L,60829L,60830L,60831L,60832L,60833L,60834L,60835L,60836L,60837L,
-60838L,60839L,60840L,60841L,60842L,60843L,60844L,60845L,60846L,60847L,
-60848L,60849L,60850L,60851L,60852L,60853L,60854L,60855L,60856L,60857L,
-60858L,60859L,60860L,60861L,60862L,60863L,60864L,60865L,60866L,60867L,
-60868L,60869L,60870L,60871L,60872L,60873L,60874L,60875L,60876L,60877L,
-60878L,60879L,60880L,60881L,60882L,60883L,60884L,60885L,60886L,60887L,
-60888L,60889L,60890L,60891L,60892L,60893L,60894L,60895L,60896L,60897L,
-60898L,60899L,60900L,60901L,60902L,60903L,60904L,60905L,60906L,60907L,
-60908L,60909L,60910L,60911L,60912L,60913L,60914L,60915L,60916L,60917L,
-60918L,60919L,60920L,60921L,60922L,60923L,60924L,60925L,60926L,60927L,
-60928L,60929L,60930L,60931L,60932L,60933L,60934L,60935L,60936L,60937L,
-60938L,60939L,60940L,60941L,60942L,60943L,60944L,60945L,60946L,60947L,
-60948L,60949L,60950L,60951L,60952L,60953L,60954L,60955L,60956L,60957L,
-60958L,60959L,60960L,60961L,60962L,60963L,60964L,60965L,60966L,60967L,
-60968L,60969L,60970L,60971L,60972L,60973L,60974L,60975L,60976L,60977L,
-60978L,60979L,60980L,60981L,60982L,60983L,60984L,60985L,60986L,60987L,
-60988L,60989L,60990L,60991L,60992L,60993L,60994L,60995L,60996L,60997L,
-60998L,60999L,61000L,61001L,61002L,61003L,61004L,61005L,61006L,61007L,
-61008L,61009L,61010L,61011L,61012L,61013L,61014L,61015L,61016L,61017L,
-61018L,61019L,61020L,61021L,61022L,61023L,61024L,61025L,61026L,61027L,
-61028L,61029L,61030L,61031L,61032L,61033L,61034L,61035L,61036L,61037L,
-61038L,61039L,61040L,61041L,61042L,61043L,61044L,61045L,61046L,61047L,
-61048L,61049L,61050L,61051L,61052L,61053L,61054L,61055L,61056L,61057L,
-61058L,61059L,61060L,61061L,61062L,61063L,61064L,61065L,61066L,61067L,
-61068L,61069L,61070L,61071L,61072L,61073L,61074L,61075L,61076L,61077L,
-61078L,61079L,61080L,61081L,61082L,61083L,61084L,61085L,61086L,61087L,
-61088L,61089L,61090L,61091L,61092L,61093L,61094L,61095L,61096L,61097L,
-61098L,61099L,61100L,61101L,61102L,61103L,61104L,61105L,61106L,61107L,
-61108L,61109L,61110L,61111L,61112L,61113L,61114L,61115L,61116L,61117L,
-61118L,61119L,61120L,61121L,61122L,61123L,61124L,61125L,61126L,61127L,
-61128L,61129L,61130L,61131L,61132L,61133L,61134L,61135L,61136L,61137L,
-61138L,61139L,61140L,61141L,61142L,61143L,61144L,61145L,61146L,61147L,
-61148L,61149L,61150L,61151L,61152L,61153L,61154L,61155L,61156L,61157L,
-61158L,61159L,61160L,61161L,61162L,61163L,61164L,61165L,61166L,61167L,
-61168L,61169L,61170L,61171L,61172L,61173L,61174L,61175L,61176L,61177L,
-61178L,61179L,61180L,61181L,61182L,61183L,61184L,61185L,61186L,61187L,
-61188L,61189L,61190L,61191L,61192L,61193L,61194L,61195L,61196L,61197L,
-61198L,61199L,61200L,61201L,61202L,61203L,61204L,61205L,61206L,61207L,
-61208L,61209L,61210L,61211L,61212L,61213L,61214L,61215L,61216L,61217L,
-61218L,61219L,61220L,61221L,61222L,61223L,61224L,61225L,61226L,61227L,
-61228L,61229L,61230L,61231L,61232L,61233L,61234L,61235L,61236L,61237L,
-61238L,61239L,61240L,61241L,61242L,61243L,61244L,61245L,61246L,61247L,
-61248L,61249L,61250L,61251L,61252L,61253L,61254L,61255L,61256L,61257L,
-61258L,61259L,61260L,61261L,61262L,61263L,61264L,61265L,61266L,61267L,
-61268L,61269L,61270L,61271L,61272L,61273L,61274L,61275L,61276L,61277L,
-61278L,61279L,61280L,61281L,61282L,61283L,61284L,61285L,61286L,61287L,
-61288L,61289L,61290L,61291L,61292L,61293L,61294L,61295L,61296L,61297L,
-61298L,61299L,61300L,61301L,61302L,61303L,61304L,61305L,61306L,61307L,
-61308L,61309L,61310L,61311L,61312L,61313L,61314L,61315L,61316L,61317L,
-61318L,61319L,61320L,61321L,61322L,61323L,61324L,61325L,61326L,61327L,
-61328L,61329L,61330L,61331L,61332L,61333L,61334L,61335L,61336L,61337L,
-61338L,61339L,61340L,61341L,61342L,61343L,61344L,61345L,61346L,61347L,
-61348L,61349L,61350L,61351L,61352L,61353L,61354L,61355L,61356L,61357L,
-61358L,61359L,61360L,61361L,61362L,61363L,61364L,61365L,61366L,61367L,
-61368L,61369L,61370L,61371L,61372L,61373L,61374L,61375L,61376L,61377L,
-61378L,61379L,61380L,61381L,61382L,61383L,61384L,61385L,61386L,61387L,
-61388L,61389L,61390L,61391L,61392L,61393L,61394L,61395L,61396L,61397L,
-61398L,61399L,61400L,61401L,61402L,61403L,61404L,61405L,61406L,61407L,
-61408L,61409L,61410L,61411L,61412L,61413L,61414L,61415L,61416L,61417L,
-61418L,61419L,61420L,61421L,61422L,61423L,61424L,61425L,61426L,61427L,
-61428L,61429L,61430L,61431L,61432L,61433L,61434L,61435L,61436L,61437L,
-61438L,61439L,61440L,61441L,61442L,61443L,61444L,61445L,61446L,61447L,
-61448L,61449L,61450L,61451L,61452L,61453L,61454L,61455L,61456L,61457L,
-61458L,61459L,61460L,61461L,61462L,61463L,61464L,61465L,61466L,61467L,
-61468L,61469L,61470L,61471L,61472L,61473L,61474L,61475L,61476L,61477L,
-61478L,61479L,61480L,61481L,61482L,61483L,61484L,61485L,61486L,61487L,
-61488L,61489L,61490L,61491L,61492L,61493L,61494L,61495L,61496L,61497L,
-61498L,61499L,61500L,61501L,61502L,61503L,61504L,61505L,61506L,61507L,
-61508L,61509L,61510L,61511L,61512L,61513L,61514L,61515L,61516L,61517L,
-61518L,61519L,61520L,61521L,61522L,61523L,61524L,61525L,61526L,61527L,
-61528L,61529L,61530L,61531L,61532L,61533L,61534L,61535L,61536L,61537L,
-61538L,61539L,61540L,61541L,61542L,61543L,61544L,61545L,61546L,61547L,
-61548L,61549L,61550L,61551L,61552L,61553L,61554L,61555L,61556L,61557L,
-61558L,61559L,61560L,61561L,61562L,61563L,61564L,61565L,61566L,61567L,
-61568L,61569L,61570L,61571L,61572L,61573L,61574L,61575L,61576L,61577L,
-61578L,61579L,61580L,61581L,61582L,61583L,61584L,61585L,61586L,61587L,
-61588L,61589L,61590L,61591L,61592L,61593L,61594L,61595L,61596L,61597L,
-61598L,61599L,61600L,61601L,61602L,61603L,61604L,61605L,61606L,61607L,
-61608L,61609L,61610L,61611L,61612L,61613L,61614L,61615L,61616L,61617L,
-61618L,61619L,61620L,61621L,61622L,61623L,61624L,61625L,61626L,61627L,
-61628L,61629L,61630L,61631L,61632L,61633L,61634L,61635L,61636L,61637L,
-61638L,61639L,61640L,61641L,61642L,61643L,61644L,61645L,61646L,61647L,
-61648L,61649L,61650L,61651L,61652L,61653L,61654L,61655L,61656L,61657L,
-61658L,61659L,61660L,61661L,61662L,61663L,61664L,61665L,61666L,61667L,
-61668L,61669L,61670L,61671L,61672L,61673L,61674L,61675L,61676L,61677L,
-61678L,61679L,61680L,61681L,61682L,61683L,61684L,61685L,61686L,61687L,
-61688L,61689L,61690L,61691L,61692L,61693L,61694L,61695L,61696L,61697L,
-61698L,61699L,61700L,61701L,61702L,61703L,61704L,61705L,61706L,61707L,
-61708L,61709L,61710L,61711L,61712L,61713L,61714L,61715L,61716L,61717L,
-61718L,61719L,61720L,61721L,61722L,61723L,61724L,61725L,61726L,61727L,
-61728L,61729L,61730L,61731L,61732L,61733L,61734L,61735L,61736L,61737L,
-61738L,61739L,61740L,61741L,61742L,61743L,61744L,61745L,61746L,61747L,
-61748L,61749L,61750L,61751L,61752L,61753L,61754L,61755L,61756L,61757L,
-61758L,61759L,61760L,61761L,61762L,61763L,61764L,61765L,61766L,61767L,
-61768L,61769L,61770L,61771L,61772L,61773L,61774L,61775L,61776L,61777L,
-61778L,61779L,61780L,61781L,61782L,61783L,61784L,61785L,61786L,61787L,
-61788L,61789L,61790L,61791L,61792L,61793L,61794L,61795L,61796L,61797L,
-61798L,61799L,61800L,61801L,61802L,61803L,61804L,61805L,61806L,61807L,
-61808L,61809L,61810L,61811L,61812L,61813L,61814L,61815L,61816L,61817L,
-61818L,61819L,61820L,61821L,61822L,61823L,61824L,61825L,61826L,61827L,
-61828L,61829L,61830L,61831L,61832L,61833L,61834L,61835L,61836L,61837L,
-61838L,61839L,61840L,61841L,61842L,61843L,61844L,61845L,61846L,61847L,
-61848L,61849L,61850L,61851L,61852L,61853L,61854L,61855L,61856L,61857L,
-61858L,61859L,61860L,61861L,61862L,61863L,61864L,61865L,61866L,61867L,
-61868L,61869L,61870L,61871L,61872L,61873L,61874L,61875L,61876L,61877L,
-61878L,61879L,61880L,61881L,61882L,61883L,61884L,61885L,61886L,61887L,
-61888L,61889L,61890L,61891L,61892L,61893L,61894L,61895L,61896L,61897L,
-61898L,61899L,61900L,61901L,61902L,61903L,61904L,61905L,61906L,61907L,
-61908L,61909L,61910L,61911L,61912L,61913L,61914L,61915L,61916L,61917L,
-61918L,61919L,61920L,61921L,61922L,61923L,61924L,61925L,61926L,61927L,
-61928L,61929L,61930L,61931L,61932L,61933L,61934L,61935L,61936L,61937L,
-61938L,61939L,61940L,61941L,61942L,61943L,61944L,61945L,61946L,61947L,
-61948L,61949L,61950L,61951L,61952L,61953L,61954L,61955L,61956L,61957L,
-61958L,61959L,61960L,61961L,61962L,61963L,61964L,61965L,61966L,61967L,
-61968L,61969L,61970L,61971L,61972L,61973L,61974L,61975L,61976L,61977L,
-61978L,61979L,61980L,61981L,61982L,61983L,61984L,61985L,61986L,61987L,
-61988L,61989L,61990L,61991L,61992L,61993L,61994L,61995L,61996L,61997L,
-61998L,61999L,62000L,62001L,62002L,62003L,62004L,62005L,62006L,62007L,
-62008L,62009L,62010L,62011L,62012L,62013L,62014L,62015L,62016L,62017L,
-62018L,62019L,62020L,62021L,62022L,62023L,62024L,62025L,62026L,62027L,
-62028L,62029L,62030L,62031L,62032L,62033L,62034L,62035L,62036L,62037L,
-62038L,62039L,62040L,62041L,62042L,62043L,62044L,62045L,62046L,62047L,
-62048L,62049L,62050L,62051L,62052L,62053L,62054L,62055L,62056L,62057L,
-62058L,62059L,62060L,62061L,62062L,62063L,62064L,62065L,62066L,62067L,
-62068L,62069L,62070L,62071L,62072L,62073L,62074L,62075L,62076L,62077L,
-62078L,62079L,62080L,62081L,62082L,62083L,62084L,62085L,62086L,62087L,
-62088L,62089L,62090L,62091L,62092L,62093L,62094L,62095L,62096L,62097L,
-62098L,62099L,62100L,62101L,62102L,62103L,62104L,62105L,62106L,62107L,
-62108L,62109L,62110L,62111L,62112L,62113L,62114L,62115L,62116L,62117L,
-62118L,62119L,62120L,62121L,62122L,62123L,62124L,62125L,62126L,62127L,
-62128L,62129L,62130L,62131L,62132L,62133L,62134L,62135L,62136L,62137L,
-62138L,62139L,62140L,62141L,62142L,62143L,62144L,62145L,62146L,62147L,
-62148L,62149L,62150L,62151L,62152L,62153L,62154L,62155L,62156L,62157L,
-62158L,62159L,62160L,62161L,62162L,62163L,62164L,62165L,62166L,62167L,
-62168L,62169L,62170L,62171L,62172L,62173L,62174L,62175L,62176L,62177L,
-62178L,62179L,62180L,62181L,62182L,62183L,62184L,62185L,62186L,62187L,
-62188L,62189L,62190L,62191L,62192L,62193L,62194L,62195L,62196L,62197L,
-62198L,62199L,62200L,62201L,62202L,62203L,62204L,62205L,62206L,62207L,
-62208L,62209L,62210L,62211L,62212L,62213L,62214L,62215L,62216L,62217L,
-62218L,62219L,62220L,62221L,62222L,62223L,62224L,62225L,62226L,62227L,
-62228L,62229L,62230L,62231L,62232L,62233L,62234L,62235L,62236L,62237L,
-62238L,62239L,62240L,62241L,62242L,62243L,62244L,62245L,62246L,62247L,
-62248L,62249L,62250L,62251L,62252L,62253L,62254L,62255L,62256L,62257L,
-62258L,62259L,62260L,62261L,62262L,62263L,62264L,62265L,62266L,62267L,
-62268L,62269L,62270L,62271L,62272L,62273L,62274L,62275L,62276L,62277L,
-62278L,62279L,62280L,62281L,62282L,62283L,62284L,62285L,62286L,62287L,
-62288L,62289L,62290L,62291L,62292L,62293L,62294L,62295L,62296L,62297L,
-62298L,62299L,62300L,62301L,62302L,62303L,62304L,62305L,62306L,62307L,
-62308L,62309L,62310L,62311L,62312L,62313L,62314L,62315L,62316L,62317L,
-62318L,62319L,62320L,62321L,62322L,62323L,62324L,62325L,62326L,62327L,
-62328L,62329L,62330L,62331L,62332L,62333L,62334L,62335L,62336L,62337L,
-62338L,62339L,62340L,62341L,62342L,62343L,62344L,62345L,62346L,62347L,
-62348L,62349L,62350L,62351L,62352L,62353L,62354L,62355L,62356L,62357L,
-62358L,62359L,62360L,62361L,62362L,62363L,62364L,62365L,62366L,62367L,
-62368L,62369L,62370L,62371L,62372L,62373L,62374L,62375L,62376L,62377L,
-62378L,62379L,62380L,62381L,62382L,62383L,62384L,62385L,62386L,62387L,
-62388L,62389L,62390L,62391L,62392L,62393L,62394L,62395L,62396L,62397L,
-62398L,62399L,62400L,62401L,62402L,62403L,62404L,62405L,62406L,62407L,
-62408L,62409L,62410L,62411L,62412L,62413L,62414L,62415L,62416L,62417L,
-62418L,62419L,62420L,62421L,62422L,62423L,62424L,62425L,62426L,62427L,
-62428L,62429L,62430L,62431L,62432L,62433L,62434L,62435L,62436L,62437L,
-62438L,62439L,62440L,62441L,62442L,62443L,62444L,62445L,62446L,62447L,
-62448L,62449L,62450L,62451L,62452L,62453L,62454L,62455L,62456L,62457L,
-62458L,62459L,62460L,62461L,62462L,62463L,62464L,62465L,62466L,62467L,
-62468L,62469L,62470L,62471L,62472L,62473L,62474L,62475L,62476L,62477L,
-62478L,62479L,62480L,62481L,62482L,62483L,62484L,62485L,62486L,62487L,
-62488L,62489L,62490L,62491L,62492L,62493L,62494L,62495L,62496L,62497L,
-62498L,62499L,62500L,62501L,62502L,62503L,62504L,62505L,62506L,62507L,
-62508L,62509L,62510L,62511L,62512L,62513L,62514L,62515L,62516L,62517L,
-62518L,62519L,62520L,62521L,62522L,62523L,62524L,62525L,62526L,62527L,
-62528L,62529L,62530L,62531L,62532L,62533L,62534L,62535L,62536L,62537L,
-62538L,62539L,62540L,62541L,62542L,62543L,62544L,62545L,62546L,62547L,
-62548L,62549L,62550L,62551L,62552L,62553L,62554L,62555L,62556L,62557L,
-62558L,62559L,62560L,62561L,62562L,62563L,62564L,62565L,62566L,62567L,
-62568L,62569L,62570L,62571L,62572L,62573L,62574L,62575L,62576L,62577L,
-62578L,62579L,62580L,62581L,62582L,62583L,62584L,62585L,62586L,62587L,
-62588L,62589L,62590L,62591L,62592L,62593L,62594L,62595L,62596L,62597L,
-62598L,62599L,62600L,62601L,62602L,62603L,62604L,62605L,62606L,62607L,
-62608L,62609L,62610L,62611L,62612L,62613L,62614L,62615L,62616L,62617L,
-62618L,62619L,62620L,62621L,62622L,62623L,62624L,62625L,62626L,62627L,
-62628L,62629L,62630L,62631L,62632L,62633L,62634L,62635L,62636L,62637L,
-62638L,62639L,62640L,62641L,62642L,62643L,62644L,62645L,62646L,62647L,
-62648L,62649L,62650L,62651L,62652L,62653L,62654L,62655L,62656L,62657L,
-62658L,62659L,62660L,62661L,62662L,62663L,62664L,62665L,62666L,62667L,
-62668L,62669L,62670L,62671L,62672L,62673L,62674L,62675L,62676L,62677L,
-62678L,62679L,62680L,62681L,62682L,62683L,62684L,62685L,62686L,62687L,
-62688L,62689L,62690L,62691L,62692L,62693L,62694L,62695L,62696L,62697L,
-62698L,62699L,62700L,62701L,62702L,62703L,62704L,62705L,62706L,62707L,
-62708L,62709L,62710L,62711L,62712L,62713L,62714L,62715L,62716L,62717L,
-62718L,62719L,62720L,62721L,62722L,62723L,62724L,62725L,62726L,62727L,
-62728L,62729L,62730L,62731L,62732L,62733L,62734L,62735L,62736L,62737L,
-62738L,62739L,62740L,62741L,62742L,62743L,62744L,62745L,62746L,62747L,
-62748L,62749L,62750L,62751L,62752L,62753L,62754L,62755L,62756L,62757L,
-62758L,62759L,62760L,62761L,62762L,62763L,62764L,62765L,62766L,62767L,
-62768L,62769L,62770L,62771L,62772L,62773L,62774L,62775L,62776L,62777L,
-62778L,62779L,62780L,62781L,62782L,62783L,62784L,62785L,62786L,62787L,
-62788L,62789L,62790L,62791L,62792L,62793L,62794L,62795L,62796L,62797L,
-62798L,62799L,62800L,62801L,62802L,62803L,62804L,62805L,62806L,62807L,
-62808L,62809L,62810L,62811L,62812L,62813L,62814L,62815L,62816L,62817L,
-62818L,62819L,62820L,62821L,62822L,62823L,62824L,62825L,62826L,62827L,
-62828L,62829L,62830L,62831L,62832L,62833L,62834L,62835L,62836L,62837L,
-62838L,62839L,62840L,62841L,62842L,62843L,62844L,62845L,62846L,62847L,
-62848L,62849L,62850L,62851L,62852L,62853L,62854L,62855L,62856L,62857L,
-62858L,62859L,62860L,62861L,62862L,62863L,62864L,62865L,62866L,62867L,
-62868L,62869L,62870L,62871L,62872L,62873L,62874L,62875L,62876L,62877L,
-62878L,62879L,62880L,62881L,62882L,62883L,62884L,62885L,62886L,62887L,
-62888L,62889L,62890L,62891L,62892L,62893L,62894L,62895L,62896L,62897L,
-62898L,62899L,62900L,62901L,62902L,62903L,62904L,62905L,62906L,62907L,
-62908L,62909L,62910L,62911L,62912L,62913L,62914L,62915L,62916L,62917L,
-62918L,62919L,62920L,62921L,62922L,62923L,62924L,62925L,62926L,62927L,
-62928L,62929L,62930L,62931L,62932L,62933L,62934L,62935L,62936L,62937L,
-62938L,62939L,62940L,62941L,62942L,62943L,62944L,62945L,62946L,62947L,
-62948L,62949L,62950L,62951L,62952L,62953L,62954L,62955L,62956L,62957L,
-62958L,62959L,62960L,62961L,62962L,62963L,62964L,62965L,62966L,62967L,
-62968L,62969L,62970L,62971L,62972L,62973L,62974L,62975L,62976L,62977L,
-62978L,62979L,62980L,62981L,62982L,62983L,62984L,62985L,62986L,62987L,
-62988L,62989L,62990L,62991L,62992L,62993L,62994L,62995L,62996L,62997L,
-62998L,62999L,63000L,63001L,63002L,63003L,63004L,63005L,63006L,63007L,
-63008L,63009L,63010L,63011L,63012L,63013L,63014L,63015L,63016L,63017L,
-63018L,63019L,63020L,63021L,63022L,63023L,63024L,63025L,63026L,63027L,
-63028L,63029L,63030L,63031L,63032L,63033L,63034L,63035L,63036L,63037L,
-63038L,63039L,63040L,63041L,63042L,63043L,63044L,63045L,63046L,63047L,
-63048L,63049L,63050L,63051L,63052L,63053L,63054L,63055L,63056L,63057L,
-63058L,63059L,63060L,63061L,63062L,63063L,63064L,63065L,63066L,63067L,
-63068L,63069L,63070L,63071L,63072L,63073L,63074L,63075L,63076L,63077L,
-63078L,63079L,63080L,63081L,63082L,63083L,63084L,63085L,63086L,63087L,
-63088L,63089L,63090L,63091L,63092L,63093L,63094L,63095L,63096L,63097L,
-63098L,63099L,63100L,63101L,63102L,63103L,63104L,63105L,63106L,63107L,
-63108L,63109L,63110L,63111L,63112L,63113L,63114L,63115L,63116L,63117L,
-63118L,63119L,63120L,63121L,63122L,63123L,63124L,63125L,63126L,63127L,
-63128L,63129L,63130L,63131L,63132L,63133L,63134L,63135L,63136L,63137L,
-63138L,63139L,63140L,63141L,63142L,63143L,63144L,63145L,63146L,63147L,
-63148L,63149L,63150L,63151L,63152L,63153L,63154L,63155L,63156L,63157L,
-63158L,63159L,63160L,63161L,63162L,63163L,63164L,63165L,63166L,63167L,
-63168L,63169L,63170L,63171L,63172L,63173L,63174L,63175L,63176L,63177L,
-63178L,63179L,63180L,63181L,63182L,63183L,63184L,63185L,63186L,63187L,
-63188L,63189L,63190L,63191L,63192L,63193L,63194L,63195L,63196L,63197L,
-63198L,63199L,63200L,63201L,63202L,63203L,63204L,63205L,63206L,63207L,
-63208L,63209L,63210L,63211L,63212L,63213L,63214L,63215L,63216L,63217L,
-63218L,63219L,63220L,63221L,63222L,63223L,63224L,63225L,63226L,63227L,
-63228L,63229L,63230L,63231L,63232L,63233L,63234L,63235L,63236L,63237L,
-63238L,63239L,63240L,63241L,63242L,63243L,63244L,63245L,63246L,63247L,
-63248L,63249L,63250L,63251L,63252L,63253L,63254L,63255L,63256L,63257L,
-63258L,63259L,63260L,63261L,63262L,63263L,63264L,63265L,63266L,63267L,
-63268L,63269L,63270L,63271L,63272L,63273L,63274L,63275L,63276L,63277L,
-63278L,63279L,63280L,63281L,63282L,63283L,63284L,63285L,63286L,63287L,
-63288L,63289L,63290L,63291L,63292L,63293L,63294L,63295L,63296L,63297L,
-63298L,63299L,63300L,63301L,63302L,63303L,63304L,63305L,63306L,63307L,
-63308L,63309L,63310L,63311L,63312L,63313L,63314L,63315L,63316L,63317L,
-63318L,63319L,63320L,63321L,63322L,63323L,63324L,63325L,63326L,63327L,
-63328L,63329L,63330L,63331L,63332L,63333L,63334L,63335L,63336L,63337L,
-63338L,63339L,63340L,63341L,63342L,63343L,63344L,63345L,63346L,63347L,
-63348L,63349L,63350L,63351L,63352L,63353L,63354L,63355L,63356L,63357L,
-63358L,63359L,63360L,63361L,63362L,63363L,63364L,63365L,63366L,63367L,
-63368L,63369L,63370L,63371L,63372L,63373L,63374L,63375L,63376L,63377L,
-63378L,63379L,63380L,63381L,63382L,63383L,63384L,63385L,63386L,63387L,
-63388L,63389L,63390L,63391L,63392L,63393L,63394L,63395L,63396L,63397L,
-63398L,63399L,63400L,63401L,63402L,63403L,63404L,63405L,63406L,63407L,
-63408L,63409L,63410L,63411L,63412L,63413L,63414L,63415L,63416L,63417L,
-63418L,63419L,63420L,63421L,63422L,63423L,63424L,63425L,63426L,63427L,
-63428L,63429L,63430L,63431L,63432L,63433L,63434L,63435L,63436L,63437L,
-63438L,63439L,63440L,63441L,63442L,63443L,63444L,63445L,63446L,63447L,
-63448L,63449L,63450L,63451L,63452L,63453L,63454L,63455L,63456L,63457L,
-63458L,63459L,63460L,63461L,63462L,63463L,63464L,63465L,63466L,63467L,
-63468L,63469L,63470L,63471L,63472L,63473L,63474L,63475L,63476L,63477L,
-63478L,63479L,63480L,63481L,63482L,63483L,63484L,63485L,63486L,63487L,
-63488L,63489L,63490L,63491L,63492L,63493L,63494L,63495L,63496L,63497L,
-63498L,63499L,63500L,63501L,63502L,63503L,63504L,63505L,63506L,63507L,
-63508L,63509L,63510L,63511L,63512L,63513L,63514L,63515L,63516L,63517L,
-63518L,63519L,63520L,63521L,63522L,63523L,63524L,63525L,63526L,63527L,
-63528L,63529L,63530L,63531L,63532L,63533L,63534L,63535L,63536L,63537L,
-63538L,63539L,63540L,63541L,63542L,63543L,63544L,63545L,63546L,63547L,
-63548L,63549L,63550L,63551L,63552L,63553L,63554L,63555L,63556L,63557L,
-63558L,63559L,63560L,63561L,63562L,63563L,63564L,63565L,63566L,63567L,
-63568L,63569L,63570L,63571L,63572L,63573L,63574L,63575L,63576L,63577L,
-63578L,63579L,63580L,63581L,63582L,63583L,63584L,63585L,63586L,63587L,
-63588L,63589L,63590L,63591L,63592L,63593L,63594L,63595L,63596L,63597L,
-63598L,63599L,63600L,63601L,63602L,63603L,63604L,63605L,63606L,63607L,
-63608L,63609L,63610L,63611L,63612L,63613L,63614L,63615L,63616L,63617L,
-63618L,63619L,63620L,63621L,63622L,63623L,63624L,63625L,63626L,63627L,
-63628L,63629L,63630L,63631L,63632L,63633L,63634L,63635L,63636L,63637L,
-63638L,63639L,63640L,63641L,63642L,63643L,63644L,63645L,63646L,63647L,
-63648L,63649L,63650L,63651L,63652L,63653L,63654L,63655L,63656L,63657L,
-63658L,63659L,63660L,63661L,63662L,63663L,63664L,63665L,63666L,63667L,
-63668L,63669L,63670L,63671L,63672L,63673L,63674L,63675L,63676L,63677L,
-63678L,63679L,63680L,63681L,63682L,63683L,63684L,63685L,63686L,63687L,
-63688L,63689L,63690L,63691L,63692L,63693L,63694L,63695L,63696L,63697L,
-63698L,63699L,63700L,63701L,63702L,63703L,63704L,63705L,63706L,63707L,
-63708L,63709L,63710L,63711L,63712L,63713L,63714L,63715L,63716L,63717L,
-63718L,63719L,63720L,63721L,63722L,63723L,63724L,63725L,63726L,63727L,
-63728L,63729L,63730L,63731L,63732L,63733L,63734L,63735L,63736L,63737L,
-63738L,63739L,63740L,63741L,63742L,63743L,63744L,63745L,63746L,63747L,
-63748L,63749L,63750L,63751L,63752L,63753L,63754L,63755L,63756L,63757L,
-63758L,63759L,63760L,63761L,63762L,63763L,63764L,63765L,63766L,63767L,
-63768L,63769L,63770L,63771L,63772L,63773L,63774L,63775L,63776L,63777L,
-63778L,63779L,63780L,63781L,63782L,63783L,63784L,63785L,63786L,63787L,
-63788L,63789L,63790L,63791L,63792L,63793L,63794L,63795L,63796L,63797L,
-63798L,63799L,63800L,63801L,63802L,63803L,63804L,63805L,63806L,63807L,
-63808L,63809L,63810L,63811L,63812L,63813L,63814L,63815L,63816L,63817L,
-63818L,63819L,63820L,63821L,63822L,63823L,63824L,63825L,63826L,63827L,
-63828L,63829L,63830L,63831L,63832L,63833L,63834L,63835L,63836L,63837L,
-63838L,63839L,63840L,63841L,63842L,63843L,63844L,63845L,63846L,63847L,
-63848L,63849L,63850L,63851L,63852L,63853L,63854L,63855L,63856L,63857L,
-63858L,63859L,63860L,63861L,63862L,63863L,63864L,63865L,63866L,63867L,
-63868L,63869L,63870L,63871L,63872L,63873L,63874L,63875L,63876L,63877L,
-63878L,63879L,63880L,63881L,63882L,63883L,63884L,63885L,63886L,63887L,
-63888L,63889L,63890L,63891L,63892L,63893L,63894L,63895L,63896L,63897L,
-63898L,63899L,63900L,63901L,63902L,63903L,63904L,63905L,63906L,63907L,
-63908L,63909L,63910L,63911L,63912L,63913L,63914L,63915L,63916L,63917L,
-63918L,63919L,63920L,63921L,63922L,63923L,63924L,63925L,63926L,63927L,
-63928L,63929L,63930L,63931L,63932L,63933L,63934L,63935L,63936L,63937L,
-63938L,63939L,63940L,63941L,63942L,63943L,63944L,63945L,63946L,63947L,
-63948L,63949L,63950L,63951L,63952L,63953L,63954L,63955L,63956L,63957L,
-63958L,63959L,63960L,63961L,63962L,63963L,63964L,63965L,63966L,63967L,
-63968L,63969L,63970L,63971L,63972L,63973L,63974L,63975L,63976L,63977L,
-63978L,63979L,63980L,63981L,63982L,63983L,63984L,63985L,63986L,63987L,
-63988L,63989L,63990L,63991L,63992L,63993L,63994L,63995L,63996L,63997L,
-63998L,63999L,64000L,64001L,64002L,64003L,64004L,64005L,64006L,64007L,
-64008L,64009L,64010L,64011L,64012L,64013L,64014L,64015L,64016L,64017L,
-64018L,64019L,64020L,64021L,64022L,64023L,64024L,64025L,64026L,64027L,
-64028L,64029L,64030L,64031L,64032L,64033L,64034L,64035L,64036L,64037L,
-64038L,64039L,64040L,64041L,64042L,64043L,64044L,64045L,64046L,64047L,
-64048L,64049L,64050L,64051L,64052L,64053L,64054L,64055L,64056L,64057L,
-64058L,64059L,64060L,64061L,64062L,64063L,64064L,64065L,64066L,64067L,
-64068L,64069L,64070L,64071L,64072L,64073L,64074L,64075L,64076L,64077L,
-64078L,64079L,64080L,64081L,64082L,64083L,64084L,64085L,64086L,64087L,
-64088L,64089L,64090L,64091L,64092L,64093L,64094L,64095L,64096L,64097L,
-64098L,64099L,64100L,64101L,64102L,64103L,64104L,64105L,64106L,64107L,
-64108L,64109L,64110L,64111L,64112L,64113L,64114L,64115L,64116L,64117L,
-64118L,64119L,64120L,64121L,64122L,64123L,64124L,64125L,64126L,64127L,
-64128L,64129L,64130L,64131L,64132L,64133L,64134L,64135L,64136L,64137L,
-64138L,64139L,64140L,64141L,64142L,64143L,64144L,64145L,64146L,64147L,
-64148L,64149L,64150L,64151L,64152L,64153L,64154L,64155L,64156L,64157L,
-64158L,64159L,64160L,64161L,64162L,64163L,64164L,64165L,64166L,64167L,
-64168L,64169L,64170L,64171L,64172L,64173L,64174L,64175L,64176L,64177L,
-64178L,64179L,64180L,64181L,64182L,64183L,64184L,64185L,64186L,64187L,
-64188L,64189L,64190L,64191L,64192L,64193L,64194L,64195L,64196L,64197L,
-64198L,64199L,64200L,64201L,64202L,64203L,64204L,64205L,64206L,64207L,
-64208L,64209L,64210L,64211L,64212L,64213L,64214L,64215L,64216L,64217L,
-64218L,64219L,64220L,64221L,64222L,64223L,64224L,64225L,64226L,64227L,
-64228L,64229L,64230L,64231L,64232L,64233L,64234L,64235L,64236L,64237L,
-64238L,64239L,64240L,64241L,64242L,64243L,64244L,64245L,64246L,64247L,
-64248L,64249L,64250L,64251L,64252L,64253L,64254L,64255L,64256L,64257L,
-64258L,64259L,64260L,64261L,64262L,64263L,64264L,64265L,64266L,64267L,
-64268L,64269L,64270L,64271L,64272L,64273L,64274L,64275L,64276L,64277L,
-64278L,64279L,64280L,64281L,64282L,64283L,64284L,64285L,64286L,64287L,
-64288L,64289L,64290L,64291L,64292L,64293L,64294L,64295L,64296L,64297L,
-64298L,64299L,64300L,64301L,64302L,64303L,64304L,64305L,64306L,64307L,
-64308L,64309L,64310L,64311L,64312L,64313L,64314L,64315L,64316L,64317L,
-64318L,64319L,64320L,64321L,64322L,64323L,64324L,64325L,64326L,64327L,
-64328L,64329L,64330L,64331L,64332L,64333L,64334L,64335L,64336L,64337L,
-64338L,64339L,64340L,64341L,64342L,64343L,64344L,64345L,64346L,64347L,
-64348L,64349L,64350L,64351L,64352L,64353L,64354L,64355L,64356L,64357L,
-64358L,64359L,64360L,64361L,64362L,64363L,64364L,64365L,64366L,64367L,
-64368L,64369L,64370L,64371L,64372L,64373L,64374L,64375L,64376L,64377L,
-64378L,64379L,64380L,64381L,64382L,64383L,64384L,64385L,64386L,64387L,
-64388L,64389L,64390L,64391L,64392L,64393L,64394L,64395L,64396L,64397L,
-64398L,64399L,64400L,64401L,64402L,64403L,64404L,64405L,64406L,64407L,
-64408L,64409L,64410L,64411L,64412L,64413L,64414L,64415L,64416L,64417L,
-64418L,64419L,64420L,64421L,64422L,64423L,64424L,64425L,64426L,64427L,
-64428L,64429L,64430L,64431L,64432L,64433L,64434L,64435L,64436L,64437L,
-64438L,64439L,64440L,64441L,64442L,64443L,64444L,64445L,64446L,64447L,
-64448L,64449L,64450L,64451L,64452L,64453L,64454L,64455L,64456L,64457L,
-64458L,64459L,64460L,64461L,64462L,64463L,64464L,64465L,64466L,64467L,
-64468L,64469L,64470L,64471L,64472L,64473L,64474L,64475L,64476L,64477L,
-64478L,64479L,64480L,64481L,64482L,64483L,64484L,64485L,64486L,64487L,
-64488L,64489L,64490L,64491L,64492L,64493L,64494L,64495L,64496L,64497L,
-64498L,64499L,64500L,64501L,64502L,64503L,64504L,64505L,64506L,64507L,
-64508L,64509L,64510L,64511L,64512L,64513L,64514L,64515L,64516L,64517L,
-64518L,64519L,64520L,64521L,64522L,64523L,64524L,64525L,64526L,64527L,
-64528L,64529L,64530L,64531L,64532L,64533L,64534L,64535L,64536L,64537L,
-64538L,64539L,64540L,64541L,64542L,64543L,64544L,64545L,64546L,64547L,
-64548L,64549L,64550L,64551L,64552L,64553L,64554L,64555L,64556L,64557L,
-64558L,64559L,64560L,64561L,64562L,64563L,64564L,64565L,64566L,64567L,
-64568L,64569L,64570L,64571L,64572L,64573L,64574L,64575L,64576L,64577L,
-64578L,64579L,64580L,64581L,64582L,64583L,64584L,64585L,64586L,64587L,
-64588L,64589L,64590L,64591L,64592L,64593L,64594L,64595L,64596L,64597L,
-64598L,64599L,64600L,64601L,64602L,64603L,64604L,64605L,64606L,64607L,
-64608L,64609L,64610L,64611L,64612L,64613L,64614L,64615L,64616L,64617L,
-64618L,64619L,64620L,64621L,64622L,64623L,64624L,64625L,64626L,64627L,
-64628L,64629L,64630L,64631L,64632L,64633L,64634L,64635L,64636L,64637L,
-64638L,64639L,64640L,64641L,64642L,64643L,64644L,64645L,64646L,64647L,
-64648L,64649L,64650L,64651L,64652L,64653L,64654L,64655L,64656L,64657L,
-64658L,64659L,64660L,64661L,64662L,64663L,64664L,64665L,64666L,64667L,
-64668L,64669L,64670L,64671L,64672L,64673L,64674L,64675L,64676L,64677L,
-64678L,64679L,64680L,64681L,64682L,64683L,64684L,64685L,64686L,64687L,
-64688L,64689L,64690L,64691L,64692L,64693L,64694L,64695L,64696L,64697L,
-64698L,64699L,64700L,64701L,64702L,64703L,64704L,64705L,64706L,64707L,
-64708L,64709L,64710L,64711L,64712L,64713L,64714L,64715L,64716L,64717L,
-64718L,64719L,64720L,64721L,64722L,64723L,64724L,64725L,64726L,64727L,
-64728L,64729L,64730L,64731L,64732L,64733L,64734L,64735L,64736L,64737L,
-64738L,64739L,64740L,64741L,64742L,64743L,64744L,64745L,64746L,64747L,
-64748L,64749L,64750L,64751L,64752L,64753L,64754L,64755L,64756L,64757L,
-64758L,64759L,64760L,64761L,64762L,64763L,64764L,64765L,64766L,64767L,
-64768L,64769L,64770L,64771L,64772L,64773L,64774L,64775L,64776L,64777L,
-64778L,64779L,64780L,64781L,64782L,64783L,64784L,64785L,64786L,64787L,
-64788L,64789L,64790L,64791L,64792L,64793L,64794L,64795L,64796L,64797L,
-64798L,64799L,64800L,64801L,64802L,64803L,64804L,64805L,64806L,64807L,
-64808L,64809L,64810L,64811L,64812L,64813L,64814L,64815L,64816L,64817L,
-64818L,64819L,64820L,64821L,64822L,64823L,64824L,64825L,64826L,64827L,
-64828L,64829L,64830L,64831L,64832L,64833L,64834L,64835L,64836L,64837L,
-64838L,64839L,64840L,64841L,64842L,64843L,64844L,64845L,64846L,64847L,
-64848L,64849L,64850L,64851L,64852L,64853L,64854L,64855L,64856L,64857L,
-64858L,64859L,64860L,64861L,64862L,64863L,64864L,64865L,64866L,64867L,
-64868L,64869L,64870L,64871L,64872L,64873L,64874L,64875L,64876L,64877L,
-64878L,64879L,64880L,64881L,64882L,64883L,64884L,64885L,64886L,64887L,
-64888L,64889L,64890L,64891L,64892L,64893L,64894L,64895L,64896L,64897L,
-64898L,64899L,64900L,64901L,64902L,64903L,64904L,64905L,64906L,64907L,
-64908L,64909L,64910L,64911L,64912L,64913L,64914L,64915L,64916L,64917L,
-64918L,64919L,64920L,64921L,64922L,64923L,64924L,64925L,64926L,64927L,
-64928L,64929L,64930L,64931L,64932L,64933L,64934L,64935L,64936L,64937L,
-64938L,64939L,64940L,64941L,64942L,64943L,64944L,64945L,64946L,64947L,
-64948L,64949L,64950L,64951L,64952L,64953L,64954L,64955L,64956L,64957L,
-64958L,64959L,64960L,64961L,64962L,64963L,64964L,64965L,64966L,64967L,
-64968L,64969L,64970L,64971L,64972L,64973L,64974L,64975L,64976L,64977L,
-64978L,64979L,64980L,64981L,64982L,64983L,64984L,64985L,64986L,64987L,
-64988L,64989L,64990L,64991L,64992L,64993L,64994L,64995L,64996L,64997L,
-64998L,64999L,65000L,65001L,65002L,65003L,65004L,65005L,65006L,65007L,
-65008L,65009L,65010L,65011L,65012L,65013L,65014L,65015L,65016L,65017L,
-65018L,65019L,65020L,65021L,65022L,65023L,65024L,65025L,65026L,65027L,
-65028L,65029L,65030L,65031L,65032L,65033L,65034L,65035L,65036L,65037L,
-65038L,65039L,65040L,65041L,65042L,65043L,65044L,65045L,65046L,65047L,
-65048L,65049L,65050L,65051L,65052L,65053L,65054L,65055L,65056L,65057L,
-65058L,65059L,65060L,65061L,65062L,65063L,65064L,65065L,65066L,65067L,
-65068L,65069L,65070L,65071L,65072L,65073L,65074L,65075L,65076L,65077L,
-65078L,65079L,65080L,65081L,65082L,65083L,65084L,65085L,65086L,65087L,
-65088L,65089L,65090L,65091L,65092L,65093L,65094L,65095L,65096L,65097L,
-65098L,65099L,65100L,65101L,65102L,65103L,65104L,65105L,65106L,65107L,
-65108L,65109L,65110L,65111L,65112L,65113L,65114L,65115L,65116L,65117L,
-65118L,65119L,65120L,65121L,65122L,65123L,65124L,65125L,65126L,65127L,
-65128L,65129L,65130L,65131L,65132L,65133L,65134L,65135L,65136L,65137L,
-65138L,65139L,65140L,65141L,65142L,65143L,65144L,65145L,65146L,65147L,
-65148L,65149L,65150L,65151L,65152L,65153L,65154L,65155L,65156L,65157L,
-65158L,65159L,65160L,65161L,65162L,65163L,65164L,65165L,65166L,65167L,
-65168L,65169L,65170L,65171L,65172L,65173L,65174L,65175L,65176L,65177L,
-65178L,65179L,65180L,65181L,65182L,65183L,65184L,65185L,65186L,65187L,
-65188L,65189L,65190L,65191L,65192L,65193L,65194L,65195L,65196L,65197L,
-65198L,65199L,65200L,65201L,65202L,65203L,65204L,65205L,65206L,65207L,
-65208L,65209L,65210L,65211L,65212L,65213L,65214L,65215L,65216L,65217L,
-65218L,65219L,65220L,65221L,65222L,65223L,65224L,65225L,65226L,65227L,
-65228L,65229L,65230L,65231L,65232L,65233L,65234L,65235L,65236L,65237L,
-65238L,65239L,65240L,65241L,65242L,65243L,65244L,65245L,65246L,65247L,
-65248L,65249L,65250L,65251L,65252L,65253L,65254L,65255L,65256L,65257L,
-65258L,65259L,65260L,65261L,65262L,65263L,65264L,65265L,65266L,65267L,
-65268L,65269L,65270L,65271L,65272L,65273L,65274L,65275L,65276L,65277L,
-65278L,65279L,65280L,65281L,65282L,65283L,65284L,65285L,65286L,65287L,
-65288L,65289L,65290L,65291L,65292L,65293L,65294L,65295L,65296L,65297L,
-65298L,65299L,65300L,65301L,65302L,65303L,65304L,65305L,65306L,65307L,
-65308L,65309L,65310L,65311L,65312L,65313L,65314L,65315L,65316L,65317L,
-65318L,65319L,65320L,65321L,65322L,65323L,65324L,65325L,65326L,65327L,
-65328L,65329L,65330L,65331L,65332L,65333L,65334L,65335L,65336L,65337L,
-65338L,65339L,65340L,65341L,65342L,65343L,65344L,65313L,65314L,65315L,
-65316L,65317L,65318L,65319L,65320L,65321L,65322L,65323L,65324L,65325L,
-65326L,65327L,65328L,65329L,65330L,65331L,65332L,65333L,65334L,65335L,
-65336L,65337L,65338L,65371L,65372L,65373L,65374L,65375L,65376L,65377L,
-65378L,65379L,65380L,65381L,65382L,65383L,65384L,65385L,65386L,65387L,
-65388L,65389L,65390L,65391L,65392L,65393L,65394L,65395L,65396L,65397L,
-65398L,65399L,65400L,65401L,65402L,65403L,65404L,65405L,65406L,65407L,
-65408L,65409L,65410L,65411L,65412L,65413L,65414L,65415L,65416L,65417L,
-65418L,65419L,65420L,65421L,65422L,65423L,65424L,65425L,65426L,65427L,
-65428L,65429L,65430L,65431L,65432L,65433L,65434L,65435L,65436L,65437L,
-65438L,65439L,65440L,65441L,65442L,65443L,65444L,65445L,65446L,65447L,
-65448L,65449L,65450L,65451L,65452L,65453L,65454L,65455L,65456L,65457L,
-65458L,65459L,65460L,65461L,65462L,65463L,65464L,65465L,65466L,65467L,
-65468L,65469L,65470L,65471L,65472L,65473L,65474L,65475L,65476L,65477L,
-65478L,65479L,65480L,65481L,65482L,65483L,65484L,65485L,65486L,65487L,
-65488L,65489L,65490L,65491L,65492L,65493L,65494L,65495L,65496L,65497L,
-65498L,65499L,65500L,65501L,65502L,65503L,65504L,65505L,65506L,65507L,
-65508L,65509L,65510L,65511L,65512L,65513L,65514L,65515L,65516L,65517L,
-65518L,65519L,65520L,65521L,65522L,65523L,65524L,65525L,65526L,65527L,
-65528L,65529L,65530L,65531L,65532L,65533L,65534L,65535L,
+422,641,42949L,425,644,645,646,42929L,430,580,433,434,581,653,654,655,656,
+657,439,659,660,661,662,663,664,665,666,667,668,42930L,42928L,671,672,673,
+674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,
+692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,
+710,711,712,713,714,715,716,717,718,719,720,721,722,723,724,725,726,727,
+728,729,730,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,
+746,747,748,749,750,751,752,753,754,755,756,757,758,759,760,761,762,763,
+764,765,766,767,768,769,770,771,772,773,774,775,776,777,778,779,780,781,
+782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,
+800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,
+818,819,820,821,822,823,824,825,826,827,828,829,830,831,832,833,834,835,
+836,921,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,
+854,855,856,857,858,859,860,861,862,863,864,865,866,867,868,869,870,871,
+872,873,874,875,876,877,878,879,880,880,882,882,884,885,886,886,888,889,
+890,1021,1022,1023,894,895,896,897,898,899,900,901,902,903,904,905,906,907,
+908,909,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,925,
+926,927,928,929,930,931,932,933,934,935,936,937,938,939,902,904,905,906,
+944,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,
+931,931,932,933,934,935,936,937,938,939,908,910,911,975,914,920,978,979,
+980,934,928,975,984,984,986,986,988,988,990,990,992,992,994,994,996,996,
+998,998,1000,1000,1002,1002,1004,1004,1006,1006,922,929,1017,895,1012,917,
+1014,1015,1015,1017,1018,1018,1020,1021,1022,1023,1024,1025,1026,1027,1028,
+1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,
+1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,
+1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1040,1041,
+1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,
+1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,
+1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,
+1039,1120,1120,1122,1122,1124,1124,1126,1126,1128,1128,1130,1130,1132,1132,
+1134,1134,1136,1136,1138,1138,1140,1140,1142,1142,1144,1144,1146,1146,1148,
+1148,1150,1150,1152,1152,1154,1155,1156,1157,1158,1159,1160,1161,1162,1162,
+1164,1164,1166,1166,1168,1168,1170,1170,1172,1172,1174,1174,1176,1176,1178,
+1178,1180,1180,1182,1182,1184,1184,1186,1186,1188,1188,1190,1190,1192,1192,
+1194,1194,1196,1196,1198,1198,1200,1200,1202,1202,1204,1204,1206,1206,1208,
+1208,1210,1210,1212,1212,1214,1214,1216,1217,1217,1219,1219,1221,1221,1223,
+1223,1225,1225,1227,1227,1229,1229,1216,1232,1232,1234,1234,1236,1236,1238,
+1238,1240,1240,1242,1242,1244,1244,1246,1246,1248,1248,1250,1250,1252,1252,
+1254,1254,1256,1256,1258,1258,1260,1260,1262,1262,1264,1264,1266,1266,1268,
+1268,1270,1270,1272,1272,1274,1274,1276,1276,1278,1278,1280,1280,1282,1282,
+1284,1284,1286,1286,1288,1288,1290,1290,1292,1292,1294,1294,1296,1296,1298,
+1298,1300,1300,1302,1302,1304,1304,1306,1306,1308,1308,1310,1310,1312,1312,
+1314,1314,1316,1316,1318,1318,1320,1320,1322,1322,1324,1324,1326,1326,1328,
+1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,
+1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,
+1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,
+1374,1375,1376,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,
+1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,
+1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1415,1416,1417,1418,
+1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,
+1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,
+1449,1450,1451,1452,1453,1454,1455,1456,1457,1458,1459,1460,1461,1462,1463,
+1464,1465,1466,1467,1468,1469,1470,1471,1472,1473,1474,1475,1476,1477,1478,
+1479,1480,1481,1482,1483,1484,1485,1486,1487,1488,1489,1490,1491,1492,1493,
+1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,
+1509,1510,1511,1512,1513,1514,1515,1516,1517,1518,1519,1520,1521,1522,1523,
+1524,1525,1526,1527,1528,1529,1530,1531,1532,1533,1534,1535,1536,1537,1538,
+1539,1540,1541,1542,1543,1544,1545,1546,1547,1548,1549,1550,1551,1552,1553,
+1554,1555,1556,1557,1558,1559,1560,1561,1562,1563,1564,1565,1566,1567,1568,
+1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,
+1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1595,1596,1597,1598,
+1599,1600,1601,1602,1603,1604,1605,1606,1607,1608,1609,1610,1611,1612,1613,
+1614,1615,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,
+1629,1630,1631,1632,1633,1634,1635,1636,1637,1638,1639,1640,1641,1642,1643,
+1644,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,
+1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,
+1674,1675,1676,1677,1678,1679,1680,1681,1682,1683,1684,1685,1686,1687,1688,
+1689,1690,1691,1692,1693,1694,1695,1696,1697,1698,1699,1700,1701,1702,1703,
+1704,1705,1706,1707,1708,1709,1710,1711,1712,1713,1714,1715,1716,1717,1718,
+1719,1720,1721,1722,1723,1724,1725,1726,1727,1728,1729,1730,1731,1732,1733,
+1734,1735,1736,1737,1738,1739,1740,1741,1742,1743,1744,1745,1746,1747,1748,
+1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1761,1762,1763,
+1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1774,1775,1776,1777,1778,
+1779,1780,1781,1782,1783,1784,1785,1786,1787,1788,1789,1790,1791,1792,1793,
+1794,1795,1796,1797,1798,1799,1800,1801,1802,1803,1804,1805,1806,1807,1808,
+1809,1810,1811,1812,1813,1814,1815,1816,1817,1818,1819,1820,1821,1822,1823,
+1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1837,1838,
+1839,1840,1841,1842,1843,1844,1845,1846,1847,1848,1849,1850,1851,1852,1853,
+1854,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1868,
+1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1879,1880,1881,1882,1883,
+1884,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,
+1899,1900,1901,1902,1903,1904,1905,1906,1907,1908,1909,1910,1911,1912,1913,
+1914,1915,1916,1917,1918,1919,1920,1921,1922,1923,1924,1925,1926,1927,1928,
+1929,1930,1931,1932,1933,1934,1935,1936,1937,1938,1939,1940,1941,1942,1943,
+1944,1945,1946,1947,1948,1949,1950,1951,1952,1953,1954,1955,1956,1957,1958,
+1959,1960,1961,1962,1963,1964,1965,1966,1967,1968,1969,1970,1971,1972,1973,
+1974,1975,1976,1977,1978,1979,1980,1981,1982,1983,1984,1985,1986,1987,1988,
+1989,1990,1991,1992,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002,2003,
+2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,
+2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,
+2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,
+2049,2050,2051,2052,2053,2054,2055,2056,2057,2058,2059,2060,2061,2062,2063,
+2064,2065,2066,2067,2068,2069,2070,2071,2072,2073,2074,2075,2076,2077,2078,
+2079,2080,2081,2082,2083,2084,2085,2086,2087,2088,2089,2090,2091,2092,2093,
+2094,2095,2096,2097,2098,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,
+2109,2110,2111,2112,2113,2114,2115,2116,2117,2118,2119,2120,2121,2122,2123,
+2124,2125,2126,2127,2128,2129,2130,2131,2132,2133,2134,2135,2136,2137,2138,
+2139,2140,2141,2142,2143,2144,2145,2146,2147,2148,2149,2150,2151,2152,2153,
+2154,2155,2156,2157,2158,2159,2160,2161,2162,2163,2164,2165,2166,2167,2168,
+2169,2170,2171,2172,2173,2174,2175,2176,2177,2178,2179,2180,2181,2182,2183,
+2184,2185,2186,2187,2188,2189,2190,2191,2192,2193,2194,2195,2196,2197,2198,
+2199,2200,2201,2202,2203,2204,2205,2206,2207,2208,2209,2210,2211,2212,2213,
+2214,2215,2216,2217,2218,2219,2220,2221,2222,2223,2224,2225,2226,2227,2228,
+2229,2230,2231,2232,2233,2234,2235,2236,2237,2238,2239,2240,2241,2242,2243,
+2244,2245,2246,2247,2248,2249,2250,2251,2252,2253,2254,2255,2256,2257,2258,
+2259,2260,2261,2262,2263,2264,2265,2266,2267,2268,2269,2270,2271,2272,2273,
+2274,2275,2276,2277,2278,2279,2280,2281,2282,2283,2284,2285,2286,2287,2288,
+2289,2290,2291,2292,2293,2294,2295,2296,2297,2298,2299,2300,2301,2302,2303,
+2304,2305,2306,2307,2308,2309,2310,2311,2312,2313,2314,2315,2316,2317,2318,
+2319,2320,2321,2322,2323,2324,2325,2326,2327,2328,2329,2330,2331,2332,2333,
+2334,2335,2336,2337,2338,2339,2340,2341,2342,2343,2344,2345,2346,2347,2348,
+2349,2350,2351,2352,2353,2354,2355,2356,2357,2358,2359,2360,2361,2362,2363,
+2364,2365,2366,2367,2368,2369,2370,2371,2372,2373,2374,2375,2376,2377,2378,
+2379,2380,2381,2382,2383,2384,2385,2386,2387,2388,2389,2390,2391,2392,2393,
+2394,2395,2396,2397,2398,2399,2400,2401,2402,2403,2404,2405,2406,2407,2408,
+2409,2410,2411,2412,2413,2414,2415,2416,2417,2418,2419,2420,2421,2422,2423,
+2424,2425,2426,2427,2428,2429,2430,2431,2432,2433,2434,2435,2436,2437,2438,
+2439,2440,2441,2442,2443,2444,2445,2446,2447,2448,2449,2450,2451,2452,2453,
+2454,2455,2456,2457,2458,2459,2460,2461,2462,2463,2464,2465,2466,2467,2468,
+2469,2470,2471,2472,2473,2474,2475,2476,2477,2478,2479,2480,2481,2482,2483,
+2484,2485,2486,2487,2488,2489,2490,2491,2492,2493,2494,2495,2496,2497,2498,
+2499,2500,2501,2502,2503,2504,2505,2506,2507,2508,2509,2510,2511,2512,2513,
+2514,2515,2516,2517,2518,2519,2520,2521,2522,2523,2524,2525,2526,2527,2528,
+2529,2530,2531,2532,2533,2534,2535,2536,2537,2538,2539,2540,2541,2542,2543,
+2544,2545,2546,2547,2548,2549,2550,2551,2552,2553,2554,2555,2556,2557,2558,
+2559,2560,2561,2562,2563,2564,2565,2566,2567,2568,2569,2570,2571,2572,2573,
+2574,2575,2576,2577,2578,2579,2580,2581,2582,2583,2584,2585,2586,2587,2588,
+2589,2590,2591,2592,2593,2594,2595,2596,2597,2598,2599,2600,2601,2602,2603,
+2604,2605,2606,2607,2608,2609,2610,2611,2612,2613,2614,2615,2616,2617,2618,
+2619,2620,2621,2622,2623,2624,2625,2626,2627,2628,2629,2630,2631,2632,2633,
+2634,2635,2636,2637,2638,2639,2640,2641,2642,2643,2644,2645,2646,2647,2648,
+2649,2650,2651,2652,2653,2654,2655,2656,2657,2658,2659,2660,2661,2662,2663,
+2664,2665,2666,2667,2668,2669,2670,2671,2672,2673,2674,2675,2676,2677,2678,
+2679,2680,2681,2682,2683,2684,2685,2686,2687,2688,2689,2690,2691,2692,2693,
+2694,2695,2696,2697,2698,2699,2700,2701,2702,2703,2704,2705,2706,2707,2708,
+2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,
+2724,2725,2726,2727,2728,2729,2730,2731,2732,2733,2734,2735,2736,2737,2738,
+2739,2740,2741,2742,2743,2744,2745,2746,2747,2748,2749,2750,2751,2752,2753,
+2754,2755,2756,2757,2758,2759,2760,2761,2762,2763,2764,2765,2766,2767,2768,
+2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2781,2782,2783,
+2784,2785,2786,2787,2788,2789,2790,2791,2792,2793,2794,2795,2796,2797,2798,
+2799,2800,2801,2802,2803,2804,2805,2806,2807,2808,2809,2810,2811,2812,2813,
+2814,2815,2816,2817,2818,2819,2820,2821,2822,2823,2824,2825,2826,2827,2828,
+2829,2830,2831,2832,2833,2834,2835,2836,2837,2838,2839,2840,2841,2842,2843,
+2844,2845,2846,2847,2848,2849,2850,2851,2852,2853,2854,2855,2856,2857,2858,
+2859,2860,2861,2862,2863,2864,2865,2866,2867,2868,2869,2870,2871,2872,2873,
+2874,2875,2876,2877,2878,2879,2880,2881,2882,2883,2884,2885,2886,2887,2888,
+2889,2890,2891,2892,2893,2894,2895,2896,2897,2898,2899,2900,2901,2902,2903,
+2904,2905,2906,2907,2908,2909,2910,2911,2912,2913,2914,2915,2916,2917,2918,
+2919,2920,2921,2922,2923,2924,2925,2926,2927,2928,2929,2930,2931,2932,2933,
+2934,2935,2936,2937,2938,2939,2940,2941,2942,2943,2944,2945,2946,2947,2948,
+2949,2950,2951,2952,2953,2954,2955,2956,2957,2958,2959,2960,2961,2962,2963,
+2964,2965,2966,2967,2968,2969,2970,2971,2972,2973,2974,2975,2976,2977,2978,
+2979,2980,2981,2982,2983,2984,2985,2986,2987,2988,2989,2990,2991,2992,2993,
+2994,2995,2996,2997,2998,2999,3000,3001,3002,3003,3004,3005,3006,3007,3008,
+3009,3010,3011,3012,3013,3014,3015,3016,3017,3018,3019,3020,3021,3022,3023,
+3024,3025,3026,3027,3028,3029,3030,3031,3032,3033,3034,3035,3036,3037,3038,
+3039,3040,3041,3042,3043,3044,3045,3046,3047,3048,3049,3050,3051,3052,3053,
+3054,3055,3056,3057,3058,3059,3060,3061,3062,3063,3064,3065,3066,3067,3068,
+3069,3070,3071,3072,3073,3074,3075,3076,3077,3078,3079,3080,3081,3082,3083,
+3084,3085,3086,3087,3088,3089,3090,3091,3092,3093,3094,3095,3096,3097,3098,
+3099,3100,3101,3102,3103,3104,3105,3106,3107,3108,3109,3110,3111,3112,3113,
+3114,3115,3116,3117,3118,3119,3120,3121,3122,3123,3124,3125,3126,3127,3128,
+3129,3130,3131,3132,3133,3134,3135,3136,3137,3138,3139,3140,3141,3142,3143,
+3144,3145,3146,3147,3148,3149,3150,3151,3152,3153,3154,3155,3156,3157,3158,
+3159,3160,3161,3162,3163,3164,3165,3166,3167,3168,3169,3170,3171,3172,3173,
+3174,3175,3176,3177,3178,3179,3180,3181,3182,3183,3184,3185,3186,3187,3188,
+3189,3190,3191,3192,3193,3194,3195,3196,3197,3198,3199,3200,3201,3202,3203,
+3204,3205,3206,3207,3208,3209,3210,3211,3212,3213,3214,3215,3216,3217,3218,
+3219,3220,3221,3222,3223,3224,3225,3226,3227,3228,3229,3230,3231,3232,3233,
+3234,3235,3236,3237,3238,3239,3240,3241,3242,3243,3244,3245,3246,3247,3248,
+3249,3250,3251,3252,3253,3254,3255,3256,3257,3258,3259,3260,3261,3262,3263,
+3264,3265,3266,3267,3268,3269,3270,3271,3272,3273,3274,3275,3276,3277,3278,
+3279,3280,3281,3282,3283,3284,3285,3286,3287,3288,3289,3290,3291,3292,3293,
+3294,3295,3296,3297,3298,3299,3300,3301,3302,3303,3304,3305,3306,3307,3308,
+3309,3310,3311,3312,3313,3314,3315,3316,3317,3318,3319,3320,3321,3322,3323,
+3324,3325,3326,3327,3328,3329,3330,3331,3332,3333,3334,3335,3336,3337,3338,
+3339,3340,3341,3342,3343,3344,3345,3346,3347,3348,3349,3350,3351,3352,3353,
+3354,3355,3356,3357,3358,3359,3360,3361,3362,3363,3364,3365,3366,3367,3368,
+3369,3370,3371,3372,3373,3374,3375,3376,3377,3378,3379,3380,3381,3382,3383,
+3384,3385,3386,3387,3388,3389,3390,3391,3392,3393,3394,3395,3396,3397,3398,
+3399,3400,3401,3402,3403,3404,3405,3406,3407,3408,3409,3410,3411,3412,3413,
+3414,3415,3416,3417,3418,3419,3420,3421,3422,3423,3424,3425,3426,3427,3428,
+3429,3430,3431,3432,3433,3434,3435,3436,3437,3438,3439,3440,3441,3442,3443,
+3444,3445,3446,3447,3448,3449,3450,3451,3452,3453,3454,3455,3456,3457,3458,
+3459,3460,3461,3462,3463,3464,3465,3466,3467,3468,3469,3470,3471,3472,3473,
+3474,3475,3476,3477,3478,3479,3480,3481,3482,3483,3484,3485,3486,3487,3488,
+3489,3490,3491,3492,3493,3494,3495,3496,3497,3498,3499,3500,3501,3502,3503,
+3504,3505,3506,3507,3508,3509,3510,3511,3512,3513,3514,3515,3516,3517,3518,
+3519,3520,3521,3522,3523,3524,3525,3526,3527,3528,3529,3530,3531,3532,3533,
+3534,3535,3536,3537,3538,3539,3540,3541,3542,3543,3544,3545,3546,3547,3548,
+3549,3550,3551,3552,3553,3554,3555,3556,3557,3558,3559,3560,3561,3562,3563,
+3564,3565,3566,3567,3568,3569,3570,3571,3572,3573,3574,3575,3576,3577,3578,
+3579,3580,3581,3582,3583,3584,3585,3586,3587,3588,3589,3590,3591,3592,3593,
+3594,3595,3596,3597,3598,3599,3600,3601,3602,3603,3604,3605,3606,3607,3608,
+3609,3610,3611,3612,3613,3614,3615,3616,3617,3618,3619,3620,3621,3622,3623,
+3624,3625,3626,3627,3628,3629,3630,3631,3632,3633,3634,3635,3636,3637,3638,
+3639,3640,3641,3642,3643,3644,3645,3646,3647,3648,3649,3650,3651,3652,3653,
+3654,3655,3656,3657,3658,3659,3660,3661,3662,3663,3664,3665,3666,3667,3668,
+3669,3670,3671,3672,3673,3674,3675,3676,3677,3678,3679,3680,3681,3682,3683,
+3684,3685,3686,3687,3688,3689,3690,3691,3692,3693,3694,3695,3696,3697,3698,
+3699,3700,3701,3702,3703,3704,3705,3706,3707,3708,3709,3710,3711,3712,3713,
+3714,3715,3716,3717,3718,3719,3720,3721,3722,3723,3724,3725,3726,3727,3728,
+3729,3730,3731,3732,3733,3734,3735,3736,3737,3738,3739,3740,3741,3742,3743,
+3744,3745,3746,3747,3748,3749,3750,3751,3752,3753,3754,3755,3756,3757,3758,
+3759,3760,3761,3762,3763,3764,3765,3766,3767,3768,3769,3770,3771,3772,3773,
+3774,3775,3776,3777,3778,3779,3780,3781,3782,3783,3784,3785,3786,3787,3788,
+3789,3790,3791,3792,3793,3794,3795,3796,3797,3798,3799,3800,3801,3802,3803,
+3804,3805,3806,3807,3808,3809,3810,3811,3812,3813,3814,3815,3816,3817,3818,
+3819,3820,3821,3822,3823,3824,3825,3826,3827,3828,3829,3830,3831,3832,3833,
+3834,3835,3836,3837,3838,3839,3840,3841,3842,3843,3844,3845,3846,3847,3848,
+3849,3850,3851,3852,3853,3854,3855,3856,3857,3858,3859,3860,3861,3862,3863,
+3864,3865,3866,3867,3868,3869,3870,3871,3872,3873,3874,3875,3876,3877,3878,
+3879,3880,3881,3882,3883,3884,3885,3886,3887,3888,3889,3890,3891,3892,3893,
+3894,3895,3896,3897,3898,3899,3900,3901,3902,3903,3904,3905,3906,3907,3908,
+3909,3910,3911,3912,3913,3914,3915,3916,3917,3918,3919,3920,3921,3922,3923,
+3924,3925,3926,3927,3928,3929,3930,3931,3932,3933,3934,3935,3936,3937,3938,
+3939,3940,3941,3942,3943,3944,3945,3946,3947,3948,3949,3950,3951,3952,3953,
+3954,3955,3956,3957,3958,3959,3960,3961,3962,3963,3964,3965,3966,3967,3968,
+3969,3970,3971,3972,3973,3974,3975,3976,3977,3978,3979,3980,3981,3982,3983,
+3984,3985,3986,3987,3988,3989,3990,3991,3992,3993,3994,3995,3996,3997,3998,
+3999,4000,4001,4002,4003,4004,4005,4006,4007,4008,4009,4010,4011,4012,4013,
+4014,4015,4016,4017,4018,4019,4020,4021,4022,4023,4024,4025,4026,4027,4028,
+4029,4030,4031,4032,4033,4034,4035,4036,4037,4038,4039,4040,4041,4042,4043,
+4044,4045,4046,4047,4048,4049,4050,4051,4052,4053,4054,4055,4056,4057,4058,
+4059,4060,4061,4062,4063,4064,4065,4066,4067,4068,4069,4070,4071,4072,4073,
+4074,4075,4076,4077,4078,4079,4080,4081,4082,4083,4084,4085,4086,4087,4088,
+4089,4090,4091,4092,4093,4094,4095,4096,4097,4098,4099,4100,4101,4102,4103,
+4104,4105,4106,4107,4108,4109,4110,4111,4112,4113,4114,4115,4116,4117,4118,
+4119,4120,4121,4122,4123,4124,4125,4126,4127,4128,4129,4130,4131,4132,4133,
+4134,4135,4136,4137,4138,4139,4140,4141,4142,4143,4144,4145,4146,4147,4148,
+4149,4150,4151,4152,4153,4154,4155,4156,4157,4158,4159,4160,4161,4162,4163,
+4164,4165,4166,4167,4168,4169,4170,4171,4172,4173,4174,4175,4176,4177,4178,
+4179,4180,4181,4182,4183,4184,4185,4186,4187,4188,4189,4190,4191,4192,4193,
+4194,4195,4196,4197,4198,4199,4200,4201,4202,4203,4204,4205,4206,4207,4208,
+4209,4210,4211,4212,4213,4214,4215,4216,4217,4218,4219,4220,4221,4222,4223,
+4224,4225,4226,4227,4228,4229,4230,4231,4232,4233,4234,4235,4236,4237,4238,
+4239,4240,4241,4242,4243,4244,4245,4246,4247,4248,4249,4250,4251,4252,4253,
+4254,4255,4256,4257,4258,4259,4260,4261,4262,4263,4264,4265,4266,4267,4268,
+4269,4270,4271,4272,4273,4274,4275,4276,4277,4278,4279,4280,4281,4282,4283,
+4284,4285,4286,4287,4288,4289,4290,4291,4292,4293,4294,4295,4296,4297,4298,
+4299,4300,4301,4302,4303,7312,7313,7314,7315,7316,7317,7318,7319,7320,7321,
+7322,7323,7324,7325,7326,7327,7328,7329,7330,7331,7332,7333,7334,7335,7336,
+7337,7338,7339,7340,7341,7342,7343,7344,7345,7346,7347,7348,7349,7350,7351,
+7352,7353,7354,4347,4348,7357,7358,7359,4352,4353,4354,4355,4356,4357,4358,
+4359,4360,4361,4362,4363,4364,4365,4366,4367,4368,4369,4370,4371,4372,4373,
+4374,4375,4376,4377,4378,4379,4380,4381,4382,4383,4384,4385,4386,4387,4388,
+4389,4390,4391,4392,4393,4394,4395,4396,4397,4398,4399,4400,4401,4402,4403,
+4404,4405,4406,4407,4408,4409,4410,4411,4412,4413,4414,4415,4416,4417,4418,
+4419,4420,4421,4422,4423,4424,4425,4426,4427,4428,4429,4430,4431,4432,4433,
+4434,4435,4436,4437,4438,4439,4440,4441,4442,4443,4444,4445,4446,4447,4448,
+4449,4450,4451,4452,4453,4454,4455,4456,4457,4458,4459,4460,4461,4462,4463,
+4464,4465,4466,4467,4468,4469,4470,4471,4472,4473,4474,4475,4476,4477,4478,
+4479,4480,4481,4482,4483,4484,4485,4486,4487,4488,4489,4490,4491,4492,4493,
+4494,4495,4496,4497,4498,4499,4500,4501,4502,4503,4504,4505,4506,4507,4508,
+4509,4510,4511,4512,4513,4514,4515,4516,4517,4518,4519,4520,4521,4522,4523,
+4524,4525,4526,4527,4528,4529,4530,4531,4532,4533,4534,4535,4536,4537,4538,
+4539,4540,4541,4542,4543,4544,4545,4546,4547,4548,4549,4550,4551,4552,4553,
+4554,4555,4556,4557,4558,4559,4560,4561,4562,4563,4564,4565,4566,4567,4568,
+4569,4570,4571,4572,4573,4574,4575,4576,4577,4578,4579,4580,4581,4582,4583,
+4584,4585,4586,4587,4588,4589,4590,4591,4592,4593,4594,4595,4596,4597,4598,
+4599,4600,4601,4602,4603,4604,4605,4606,4607,4608,4609,4610,4611,4612,4613,
+4614,4615,4616,4617,4618,4619,4620,4621,4622,4623,4624,4625,4626,4627,4628,
+4629,4630,4631,4632,4633,4634,4635,4636,4637,4638,4639,4640,4641,4642,4643,
+4644,4645,4646,4647,4648,4649,4650,4651,4652,4653,4654,4655,4656,4657,4658,
+4659,4660,4661,4662,4663,4664,4665,4666,4667,4668,4669,4670,4671,4672,4673,
+4674,4675,4676,4677,4678,4679,4680,4681,4682,4683,4684,4685,4686,4687,4688,
+4689,4690,4691,4692,4693,4694,4695,4696,4697,4698,4699,4700,4701,4702,4703,
+4704,4705,4706,4707,4708,4709,4710,4711,4712,4713,4714,4715,4716,4717,4718,
+4719,4720,4721,4722,4723,4724,4725,4726,4727,4728,4729,4730,4731,4732,4733,
+4734,4735,4736,4737,4738,4739,4740,4741,4742,4743,4744,4745,4746,4747,4748,
+4749,4750,4751,4752,4753,4754,4755,4756,4757,4758,4759,4760,4761,4762,4763,
+4764,4765,4766,4767,4768,4769,4770,4771,4772,4773,4774,4775,4776,4777,4778,
+4779,4780,4781,4782,4783,4784,4785,4786,4787,4788,4789,4790,4791,4792,4793,
+4794,4795,4796,4797,4798,4799,4800,4801,4802,4803,4804,4805,4806,4807,4808,
+4809,4810,4811,4812,4813,4814,4815,4816,4817,4818,4819,4820,4821,4822,4823,
+4824,4825,4826,4827,4828,4829,4830,4831,4832,4833,4834,4835,4836,4837,4838,
+4839,4840,4841,4842,4843,4844,4845,4846,4847,4848,4849,4850,4851,4852,4853,
+4854,4855,4856,4857,4858,4859,4860,4861,4862,4863,4864,4865,4866,4867,4868,
+4869,4870,4871,4872,4873,4874,4875,4876,4877,4878,4879,4880,4881,4882,4883,
+4884,4885,4886,4887,4888,4889,4890,4891,4892,4893,4894,4895,4896,4897,4898,
+4899,4900,4901,4902,4903,4904,4905,4906,4907,4908,4909,4910,4911,4912,4913,
+4914,4915,4916,4917,4918,4919,4920,4921,4922,4923,4924,4925,4926,4927,4928,
+4929,4930,4931,4932,4933,4934,4935,4936,4937,4938,4939,4940,4941,4942,4943,
+4944,4945,4946,4947,4948,4949,4950,4951,4952,4953,4954,4955,4956,4957,4958,
+4959,4960,4961,4962,4963,4964,4965,4966,4967,4968,4969,4970,4971,4972,4973,
+4974,4975,4976,4977,4978,4979,4980,4981,4982,4983,4984,4985,4986,4987,4988,
+4989,4990,4991,4992,4993,4994,4995,4996,4997,4998,4999,5000,5001,5002,5003,
+5004,5005,5006,5007,5008,5009,5010,5011,5012,5013,5014,5015,5016,5017,5018,
+5019,5020,5021,5022,5023,5024,5025,5026,5027,5028,5029,5030,5031,5032,5033,
+5034,5035,5036,5037,5038,5039,5040,5041,5042,5043,5044,5045,5046,5047,5048,
+5049,5050,5051,5052,5053,5054,5055,5056,5057,5058,5059,5060,5061,5062,5063,
+5064,5065,5066,5067,5068,5069,5070,5071,5072,5073,5074,5075,5076,5077,5078,
+5079,5080,5081,5082,5083,5084,5085,5086,5087,5088,5089,5090,5091,5092,5093,
+5094,5095,5096,5097,5098,5099,5100,5101,5102,5103,5104,5105,5106,5107,5108,
+5109,5110,5111,5104,5105,5106,5107,5108,5109,5118,5119,5120,5121,5122,5123,
+5124,5125,5126,5127,5128,5129,5130,5131,5132,5133,5134,5135,5136,5137,5138,
+5139,5140,5141,5142,5143,5144,5145,5146,5147,5148,5149,5150,5151,5152,5153,
+5154,5155,5156,5157,5158,5159,5160,5161,5162,5163,5164,5165,5166,5167,5168,
+5169,5170,5171,5172,5173,5174,5175,5176,5177,5178,5179,5180,5181,5182,5183,
+5184,5185,5186,5187,5188,5189,5190,5191,5192,5193,5194,5195,5196,5197,5198,
+5199,5200,5201,5202,5203,5204,5205,5206,5207,5208,5209,5210,5211,5212,5213,
+5214,5215,5216,5217,5218,5219,5220,5221,5222,5223,5224,5225,5226,5227,5228,
+5229,5230,5231,5232,5233,5234,5235,5236,5237,5238,5239,5240,5241,5242,5243,
+5244,5245,5246,5247,5248,5249,5250,5251,5252,5253,5254,5255,5256,5257,5258,
+5259,5260,5261,5262,5263,5264,5265,5266,5267,5268,5269,5270,5271,5272,5273,
+5274,5275,5276,5277,5278,5279,5280,5281,5282,5283,5284,5285,5286,5287,5288,
+5289,5290,5291,5292,5293,5294,5295,5296,5297,5298,5299,5300,5301,5302,5303,
+5304,5305,5306,5307,5308,5309,5310,5311,5312,5313,5314,5315,5316,5317,5318,
+5319,5320,5321,5322,5323,5324,5325,5326,5327,5328,5329,5330,5331,5332,5333,
+5334,5335,5336,5337,5338,5339,5340,5341,5342,5343,5344,5345,5346,5347,5348,
+5349,5350,5351,5352,5353,5354,5355,5356,5357,5358,5359,5360,5361,5362,5363,
+5364,5365,5366,5367,5368,5369,5370,5371,5372,5373,5374,5375,5376,5377,5378,
+5379,5380,5381,5382,5383,5384,5385,5386,5387,5388,5389,5390,5391,5392,5393,
+5394,5395,5396,5397,5398,5399,5400,5401,5402,5403,5404,5405,5406,5407,5408,
+5409,5410,5411,5412,5413,5414,5415,5416,5417,5418,5419,5420,5421,5422,5423,
+5424,5425,5426,5427,5428,5429,5430,5431,5432,5433,5434,5435,5436,5437,5438,
+5439,5440,5441,5442,5443,5444,5445,5446,5447,5448,5449,5450,5451,5452,5453,
+5454,5455,5456,5457,5458,5459,5460,5461,5462,5463,5464,5465,5466,5467,5468,
+5469,5470,5471,5472,5473,5474,5475,5476,5477,5478,5479,5480,5481,5482,5483,
+5484,5485,5486,5487,5488,5489,5490,5491,5492,5493,5494,5495,5496,5497,5498,
+5499,5500,5501,5502,5503,5504,5505,5506,5507,5508,5509,5510,5511,5512,5513,
+5514,5515,5516,5517,5518,5519,5520,5521,5522,5523,5524,5525,5526,5527,5528,
+5529,5530,5531,5532,5533,5534,5535,5536,5537,5538,5539,5540,5541,5542,5543,
+5544,5545,5546,5547,5548,5549,5550,5551,5552,5553,5554,5555,5556,5557,5558,
+5559,5560,5561,5562,5563,5564,5565,5566,5567,5568,5569,5570,5571,5572,5573,
+5574,5575,5576,5577,5578,5579,5580,5581,5582,5583,5584,5585,5586,5587,5588,
+5589,5590,5591,5592,5593,5594,5595,5596,5597,5598,5599,5600,5601,5602,5603,
+5604,5605,5606,5607,5608,5609,5610,5611,5612,5613,5614,5615,5616,5617,5618,
+5619,5620,5621,5622,5623,5624,5625,5626,5627,5628,5629,5630,5631,5632,5633,
+5634,5635,5636,5637,5638,5639,5640,5641,5642,5643,5644,5645,5646,5647,5648,
+5649,5650,5651,5652,5653,5654,5655,5656,5657,5658,5659,5660,5661,5662,5663,
+5664,5665,5666,5667,5668,5669,5670,5671,5672,5673,5674,5675,5676,5677,5678,
+5679,5680,5681,5682,5683,5684,5685,5686,5687,5688,5689,5690,5691,5692,5693,
+5694,5695,5696,5697,5698,5699,5700,5701,5702,5703,5704,5705,5706,5707,5708,
+5709,5710,5711,5712,5713,5714,5715,5716,5717,5718,5719,5720,5721,5722,5723,
+5724,5725,5726,5727,5728,5729,5730,5731,5732,5733,5734,5735,5736,5737,5738,
+5739,5740,5741,5742,5743,5744,5745,5746,5747,5748,5749,5750,5751,5752,5753,
+5754,5755,5756,5757,5758,5759,5760,5761,5762,5763,5764,5765,5766,5767,5768,
+5769,5770,5771,5772,5773,5774,5775,5776,5777,5778,5779,5780,5781,5782,5783,
+5784,5785,5786,5787,5788,5789,5790,5791,5792,5793,5794,5795,5796,5797,5798,
+5799,5800,5801,5802,5803,5804,5805,5806,5807,5808,5809,5810,5811,5812,5813,
+5814,5815,5816,5817,5818,5819,5820,5821,5822,5823,5824,5825,5826,5827,5828,
+5829,5830,5831,5832,5833,5834,5835,5836,5837,5838,5839,5840,5841,5842,5843,
+5844,5845,5846,5847,5848,5849,5850,5851,5852,5853,5854,5855,5856,5857,5858,
+5859,5860,5861,5862,5863,5864,5865,5866,5867,5868,5869,5870,5871,5872,5873,
+5874,5875,5876,5877,5878,5879,5880,5881,5882,5883,5884,5885,5886,5887,5888,
+5889,5890,5891,5892,5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,
+5904,5905,5906,5907,5908,5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,
+5919,5920,5921,5922,5923,5924,5925,5926,5927,5928,5929,5930,5931,5932,5933,
+5934,5935,5936,5937,5938,5939,5940,5941,5942,5943,5944,5945,5946,5947,5948,
+5949,5950,5951,5952,5953,5954,5955,5956,5957,5958,5959,5960,5961,5962,5963,
+5964,5965,5966,5967,5968,5969,5970,5971,5972,5973,5974,5975,5976,5977,5978,
+5979,5980,5981,5982,5983,5984,5985,5986,5987,5988,5989,5990,5991,5992,5993,
+5994,5995,5996,5997,5998,5999,6000,6001,6002,6003,6004,6005,6006,6007,6008,
+6009,6010,6011,6012,6013,6014,6015,6016,6017,6018,6019,6020,6021,6022,6023,
+6024,6025,6026,6027,6028,6029,6030,6031,6032,6033,6034,6035,6036,6037,6038,
+6039,6040,6041,6042,6043,6044,6045,6046,6047,6048,6049,6050,6051,6052,6053,
+6054,6055,6056,6057,6058,6059,6060,6061,6062,6063,6064,6065,6066,6067,6068,
+6069,6070,6071,6072,6073,6074,6075,6076,6077,6078,6079,6080,6081,6082,6083,
+6084,6085,6086,6087,6088,6089,6090,6091,6092,6093,6094,6095,6096,6097,6098,
+6099,6100,6101,6102,6103,6104,6105,6106,6107,6108,6109,6110,6111,6112,6113,
+6114,6115,6116,6117,6118,6119,6120,6121,6122,6123,6124,6125,6126,6127,6128,
+6129,6130,6131,6132,6133,6134,6135,6136,6137,6138,6139,6140,6141,6142,6143,
+6144,6145,6146,6147,6148,6149,6150,6151,6152,6153,6154,6155,6156,6157,6158,
+6159,6160,6161,6162,6163,6164,6165,6166,6167,6168,6169,6170,6171,6172,6173,
+6174,6175,6176,6177,6178,6179,6180,6181,6182,6183,6184,6185,6186,6187,6188,
+6189,6190,6191,6192,6193,6194,6195,6196,6197,6198,6199,6200,6201,6202,6203,
+6204,6205,6206,6207,6208,6209,6210,6211,6212,6213,6214,6215,6216,6217,6218,
+6219,6220,6221,6222,6223,6224,6225,6226,6227,6228,6229,6230,6231,6232,6233,
+6234,6235,6236,6237,6238,6239,6240,6241,6242,6243,6244,6245,6246,6247,6248,
+6249,6250,6251,6252,6253,6254,6255,6256,6257,6258,6259,6260,6261,6262,6263,
+6264,6265,6266,6267,6268,6269,6270,6271,6272,6273,6274,6275,6276,6277,6278,
+6279,6280,6281,6282,6283,6284,6285,6286,6287,6288,6289,6290,6291,6292,6293,
+6294,6295,6296,6297,6298,6299,6300,6301,6302,6303,6304,6305,6306,6307,6308,
+6309,6310,6311,6312,6313,6314,6315,6316,6317,6318,6319,6320,6321,6322,6323,
+6324,6325,6326,6327,6328,6329,6330,6331,6332,6333,6334,6335,6336,6337,6338,
+6339,6340,6341,6342,6343,6344,6345,6346,6347,6348,6349,6350,6351,6352,6353,
+6354,6355,6356,6357,6358,6359,6360,6361,6362,6363,6364,6365,6366,6367,6368,
+6369,6370,6371,6372,6373,6374,6375,6376,6377,6378,6379,6380,6381,6382,6383,
+6384,6385,6386,6387,6388,6389,6390,6391,6392,6393,6394,6395,6396,6397,6398,
+6399,6400,6401,6402,6403,6404,6405,6406,6407,6408,6409,6410,6411,6412,6413,
+6414,6415,6416,6417,6418,6419,6420,6421,6422,6423,6424,6425,6426,6427,6428,
+6429,6430,6431,6432,6433,6434,6435,6436,6437,6438,6439,6440,6441,6442,6443,
+6444,6445,6446,6447,6448,6449,6450,6451,6452,6453,6454,6455,6456,6457,6458,
+6459,6460,6461,6462,6463,6464,6465,6466,6467,6468,6469,6470,6471,6472,6473,
+6474,6475,6476,6477,6478,6479,6480,6481,6482,6483,6484,6485,6486,6487,6488,
+6489,6490,6491,6492,6493,6494,6495,6496,6497,6498,6499,6500,6501,6502,6503,
+6504,6505,6506,6507,6508,6509,6510,6511,6512,6513,6514,6515,6516,6517,6518,
+6519,6520,6521,6522,6523,6524,6525,6526,6527,6528,6529,6530,6531,6532,6533,
+6534,6535,6536,6537,6538,6539,6540,6541,6542,6543,6544,6545,6546,6547,6548,
+6549,6550,6551,6552,6553,6554,6555,6556,6557,6558,6559,6560,6561,6562,6563,
+6564,6565,6566,6567,6568,6569,6570,6571,6572,6573,6574,6575,6576,6577,6578,
+6579,6580,6581,6582,6583,6584,6585,6586,6587,6588,6589,6590,6591,6592,6593,
+6594,6595,6596,6597,6598,6599,6600,6601,6602,6603,6604,6605,6606,6607,6608,
+6609,6610,6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,6622,6623,
+6624,6625,6626,6627,6628,6629,6630,6631,6632,6633,6634,6635,6636,6637,6638,
+6639,6640,6641,6642,6643,6644,6645,6646,6647,6648,6649,6650,6651,6652,6653,
+6654,6655,6656,6657,6658,6659,6660,6661,6662,6663,6664,6665,6666,6667,6668,
+6669,6670,6671,6672,6673,6674,6675,6676,6677,6678,6679,6680,6681,6682,6683,
+6684,6685,6686,6687,6688,6689,6690,6691,6692,6693,6694,6695,6696,6697,6698,
+6699,6700,6701,6702,6703,6704,6705,6706,6707,6708,6709,6710,6711,6712,6713,
+6714,6715,6716,6717,6718,6719,6720,6721,6722,6723,6724,6725,6726,6727,6728,
+6729,6730,6731,6732,6733,6734,6735,6736,6737,6738,6739,6740,6741,6742,6743,
+6744,6745,6746,6747,6748,6749,6750,6751,6752,6753,6754,6755,6756,6757,6758,
+6759,6760,6761,6762,6763,6764,6765,6766,6767,6768,6769,6770,6771,6772,6773,
+6774,6775,6776,6777,6778,6779,6780,6781,6782,6783,6784,6785,6786,6787,6788,
+6789,6790,6791,6792,6793,6794,6795,6796,6797,6798,6799,6800,6801,6802,6803,
+6804,6805,6806,6807,6808,6809,6810,6811,6812,6813,6814,6815,6816,6817,6818,
+6819,6820,6821,6822,6823,6824,6825,6826,6827,6828,6829,6830,6831,6832,6833,
+6834,6835,6836,6837,6838,6839,6840,6841,6842,6843,6844,6845,6846,6847,6848,
+6849,6850,6851,6852,6853,6854,6855,6856,6857,6858,6859,6860,6861,6862,6863,
+6864,6865,6866,6867,6868,6869,6870,6871,6872,6873,6874,6875,6876,6877,6878,
+6879,6880,6881,6882,6883,6884,6885,6886,6887,6888,6889,6890,6891,6892,6893,
+6894,6895,6896,6897,6898,6899,6900,6901,6902,6903,6904,6905,6906,6907,6908,
+6909,6910,6911,6912,6913,6914,6915,6916,6917,6918,6919,6920,6921,6922,6923,
+6924,6925,6926,6927,6928,6929,6930,6931,6932,6933,6934,6935,6936,6937,6938,
+6939,6940,6941,6942,6943,6944,6945,6946,6947,6948,6949,6950,6951,6952,6953,
+6954,6955,6956,6957,6958,6959,6960,6961,6962,6963,6964,6965,6966,6967,6968,
+6969,6970,6971,6972,6973,6974,6975,6976,6977,6978,6979,6980,6981,6982,6983,
+6984,6985,6986,6987,6988,6989,6990,6991,6992,6993,6994,6995,6996,6997,6998,
+6999,7000,7001,7002,7003,7004,7005,7006,7007,7008,7009,7010,7011,7012,7013,
+7014,7015,7016,7017,7018,7019,7020,7021,7022,7023,7024,7025,7026,7027,7028,
+7029,7030,7031,7032,7033,7034,7035,7036,7037,7038,7039,7040,7041,7042,7043,
+7044,7045,7046,7047,7048,7049,7050,7051,7052,7053,7054,7055,7056,7057,7058,
+7059,7060,7061,7062,7063,7064,7065,7066,7067,7068,7069,7070,7071,7072,7073,
+7074,7075,7076,7077,7078,7079,7080,7081,7082,7083,7084,7085,7086,7087,7088,
+7089,7090,7091,7092,7093,7094,7095,7096,7097,7098,7099,7100,7101,7102,7103,
+7104,7105,7106,7107,7108,7109,7110,7111,7112,7113,7114,7115,7116,7117,7118,
+7119,7120,7121,7122,7123,7124,7125,7126,7127,7128,7129,7130,7131,7132,7133,
+7134,7135,7136,7137,7138,7139,7140,7141,7142,7143,7144,7145,7146,7147,7148,
+7149,7150,7151,7152,7153,7154,7155,7156,7157,7158,7159,7160,7161,7162,7163,
+7164,7165,7166,7167,7168,7169,7170,7171,7172,7173,7174,7175,7176,7177,7178,
+7179,7180,7181,7182,7183,7184,7185,7186,7187,7188,7189,7190,7191,7192,7193,
+7194,7195,7196,7197,7198,7199,7200,7201,7202,7203,7204,7205,7206,7207,7208,
+7209,7210,7211,7212,7213,7214,7215,7216,7217,7218,7219,7220,7221,7222,7223,
+7224,7225,7226,7227,7228,7229,7230,7231,7232,7233,7234,7235,7236,7237,7238,
+7239,7240,7241,7242,7243,7244,7245,7246,7247,7248,7249,7250,7251,7252,7253,
+7254,7255,7256,7257,7258,7259,7260,7261,7262,7263,7264,7265,7266,7267,7268,
+7269,7270,7271,7272,7273,7274,7275,7276,7277,7278,7279,7280,7281,7282,7283,
+7284,7285,7286,7287,7288,7289,7290,7291,7292,7293,7294,7295,1042,1044,1054,
+1057,1058,1058,1066,1122,42570L,7305,7306,7307,7308,7309,7310,7311,7312,
+7313,7314,7315,7316,7317,7318,7319,7320,7321,7322,7323,7324,7325,7326,7327,
+7328,7329,7330,7331,7332,7333,7334,7335,7336,7337,7338,7339,7340,7341,7342,
+7343,7344,7345,7346,7347,7348,7349,7350,7351,7352,7353,7354,7355,7356,7357,
+7358,7359,7360,7361,7362,7363,7364,7365,7366,7367,7368,7369,7370,7371,7372,
+7373,7374,7375,7376,7377,7378,7379,7380,7381,7382,7383,7384,7385,7386,7387,
+7388,7389,7390,7391,7392,7393,7394,7395,7396,7397,7398,7399,7400,7401,7402,
+7403,7404,7405,7406,7407,7408,7409,7410,7411,7412,7413,7414,7415,7416,7417,
+7418,7419,7420,7421,7422,7423,7424,7425,7426,7427,7428,7429,7430,7431,7432,
+7433,7434,7435,7436,7437,7438,7439,7440,7441,7442,7443,7444,7445,7446,7447,
+7448,7449,7450,7451,7452,7453,7454,7455,7456,7457,7458,7459,7460,7461,7462,
+7463,7464,7465,7466,7467,7468,7469,7470,7471,7472,7473,7474,7475,7476,7477,
+7478,7479,7480,7481,7482,7483,7484,7485,7486,7487,7488,7489,7490,7491,7492,
+7493,7494,7495,7496,7497,7498,7499,7500,7501,7502,7503,7504,7505,7506,7507,
+7508,7509,7510,7511,7512,7513,7514,7515,7516,7517,7518,7519,7520,7521,7522,
+7523,7524,7525,7526,7527,7528,7529,7530,7531,7532,7533,7534,7535,7536,7537,
+7538,7539,7540,7541,7542,7543,7544,42877L,7546,7547,7548,11363,7550,7551,
+7552,7553,7554,7555,7556,7557,7558,7559,7560,7561,7562,7563,7564,7565,
+42950L,7567,7568,7569,7570,7571,7572,7573,7574,7575,7576,7577,7578,7579,
+7580,7581,7582,7583,7584,7585,7586,7587,7588,7589,7590,7591,7592,7593,7594,
+7595,7596,7597,7598,7599,7600,7601,7602,7603,7604,7605,7606,7607,7608,7609,
+7610,7611,7612,7613,7614,7615,7616,7617,7618,7619,7620,7621,7622,7623,7624,
+7625,7626,7627,7628,7629,7630,7631,7632,7633,7634,7635,7636,7637,7638,7639,
+7640,7641,7642,7643,7644,7645,7646,7647,7648,7649,7650,7651,7652,7653,7654,
+7655,7656,7657,7658,7659,7660,7661,7662,7663,7664,7665,7666,7667,7668,7669,
+7670,7671,7672,7673,7674,7675,7676,7677,7678,7679,7680,7680,7682,7682,7684,
+7684,7686,7686,7688,7688,7690,7690,7692,7692,7694,7694,7696,7696,7698,7698,
+7700,7700,7702,7702,7704,7704,7706,7706,7708,7708,7710,7710,7712,7712,7714,
+7714,7716,7716,7718,7718,7720,7720,7722,7722,7724,7724,7726,7726,7728,7728,
+7730,7730,7732,7732,7734,7734,7736,7736,7738,7738,7740,7740,7742,7742,7744,
+7744,7746,7746,7748,7748,7750,7750,7752,7752,7754,7754,7756,7756,7758,7758,
+7760,7760,7762,7762,7764,7764,7766,7766,7768,7768,7770,7770,7772,7772,7774,
+7774,7776,7776,7778,7778,7780,7780,7782,7782,7784,7784,7786,7786,7788,7788,
+7790,7790,7792,7792,7794,7794,7796,7796,7798,7798,7800,7800,7802,7802,7804,
+7804,7806,7806,7808,7808,7810,7810,7812,7812,7814,7814,7816,7816,7818,7818,
+7820,7820,7822,7822,7824,7824,7826,7826,7828,7828,7830,7831,7832,7833,7834,
+7776,7836,7837,7838,7839,7840,7840,7842,7842,7844,7844,7846,7846,7848,7848,
+7850,7850,7852,7852,7854,7854,7856,7856,7858,7858,7860,7860,7862,7862,7864,
+7864,7866,7866,7868,7868,7870,7870,7872,7872,7874,7874,7876,7876,7878,7878,
+7880,7880,7882,7882,7884,7884,7886,7886,7888,7888,7890,7890,7892,7892,7894,
+7894,7896,7896,7898,7898,7900,7900,7902,7902,7904,7904,7906,7906,7908,7908,
+7910,7910,7912,7912,7914,7914,7916,7916,7918,7918,7920,7920,7922,7922,7924,
+7924,7926,7926,7928,7928,7930,7930,7932,7932,7934,7934,7944,7945,7946,7947,
+7948,7949,7950,7951,7944,7945,7946,7947,7948,7949,7950,7951,7960,7961,7962,
+7963,7964,7965,7958,7959,7960,7961,7962,7963,7964,7965,7966,7967,7976,7977,
+7978,7979,7980,7981,7982,7983,7976,7977,7978,7979,7980,7981,7982,7983,7992,
+7993,7994,7995,7996,7997,7998,7999,7992,7993,7994,7995,7996,7997,7998,7999,
+8008,8009,8010,8011,8012,8013,8006,8007,8008,8009,8010,8011,8012,8013,8014,
+8015,8016,8025,8018,8027,8020,8029,8022,8031,8024,8025,8026,8027,8028,8029,
+8030,8031,8040,8041,8042,8043,8044,8045,8046,8047,8040,8041,8042,8043,8044,
+8045,8046,8047,8122,8123,8136,8137,8138,8139,8154,8155,8184,8185,8170,8171,
+8186,8187,8062,8063,8064,8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,
+8075,8076,8077,8078,8079,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,
+8090,8091,8092,8093,8094,8095,8096,8097,8098,8099,8100,8101,8102,8103,8104,
+8105,8106,8107,8108,8109,8110,8111,8120,8121,8114,8115,8116,8117,8118,8119,
+8120,8121,8122,8123,8124,8125,921,8127,8128,8129,8130,8131,8132,8133,8134,
+8135,8136,8137,8138,8139,8140,8141,8142,8143,8152,8153,8146,8147,8148,8149,
+8150,8151,8152,8153,8154,8155,8156,8157,8158,8159,8168,8169,8162,8163,8164,
+8172,8166,8167,8168,8169,8170,8171,8172,8173,8174,8175,8176,8177,8178,8179,
+8180,8181,8182,8183,8184,8185,8186,8187,8188,8189,8190,8191,8192,8193,8194,
+8195,8196,8197,8198,8199,8200,8201,8202,8203,8204,8205,8206,8207,8208,8209,
+8210,8211,8212,8213,8214,8215,8216,8217,8218,8219,8220,8221,8222,8223,8224,
+8225,8226,8227,8228,8229,8230,8231,8232,8233,8234,8235,8236,8237,8238,8239,
+8240,8241,8242,8243,8244,8245,8246,8247,8248,8249,8250,8251,8252,8253,8254,
+8255,8256,8257,8258,8259,8260,8261,8262,8263,8264,8265,8266,8267,8268,8269,
+8270,8271,8272,8273,8274,8275,8276,8277,8278,8279,8280,8281,8282,8283,8284,
+8285,8286,8287,8288,8289,8290,8291,8292,8293,8294,8295,8296,8297,8298,8299,
+8300,8301,8302,8303,8304,8305,8306,8307,8308,8309,8310,8311,8312,8313,8314,
+8315,8316,8317,8318,8319,8320,8321,8322,8323,8324,8325,8326,8327,8328,8329,
+8330,8331,8332,8333,8334,8335,8336,8337,8338,8339,8340,8341,8342,8343,8344,
+8345,8346,8347,8348,8349,8350,8351,8352,8353,8354,8355,8356,8357,8358,8359,
+8360,8361,8362,8363,8364,8365,8366,8367,8368,8369,8370,8371,8372,8373,8374,
+8375,8376,8377,8378,8379,8380,8381,8382,8383,8384,8385,8386,8387,8388,8389,
+8390,8391,8392,8393,8394,8395,8396,8397,8398,8399,8400,8401,8402,8403,8404,
+8405,8406,8407,8408,8409,8410,8411,8412,8413,8414,8415,8416,8417,8418,8419,
+8420,8421,8422,8423,8424,8425,8426,8427,8428,8429,8430,8431,8432,8433,8434,
+8435,8436,8437,8438,8439,8440,8441,8442,8443,8444,8445,8446,8447,8448,8449,
+8450,8451,8452,8453,8454,8455,8456,8457,8458,8459,8460,8461,8462,8463,8464,
+8465,8466,8467,8468,8469,8470,8471,8472,8473,8474,8475,8476,8477,8478,8479,
+8480,8481,8482,8483,8484,8485,8486,8487,8488,8489,8490,8491,8492,8493,8494,
+8495,8496,8497,8498,8499,8500,8501,8502,8503,8504,8505,8506,8507,8508,8509,
+8510,8511,8512,8513,8514,8515,8516,8517,8518,8519,8520,8521,8522,8523,8524,
+8525,8498,8527,8528,8529,8530,8531,8532,8533,8534,8535,8536,8537,8538,8539,
+8540,8541,8542,8543,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554,
+8555,8556,8557,8558,8559,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,
+8554,8555,8556,8557,8558,8559,8576,8577,8578,8579,8579,8581,8582,8583,8584,
+8585,8586,8587,8588,8589,8590,8591,8592,8593,8594,8595,8596,8597,8598,8599,
+8600,8601,8602,8603,8604,8605,8606,8607,8608,8609,8610,8611,8612,8613,8614,
+8615,8616,8617,8618,8619,8620,8621,8622,8623,8624,8625,8626,8627,8628,8629,
+8630,8631,8632,8633,8634,8635,8636,8637,8638,8639,8640,8641,8642,8643,8644,
+8645,8646,8647,8648,8649,8650,8651,8652,8653,8654,8655,8656,8657,8658,8659,
+8660,8661,8662,8663,8664,8665,8666,8667,8668,8669,8670,8671,8672,8673,8674,
+8675,8676,8677,8678,8679,8680,8681,8682,8683,8684,8685,8686,8687,8688,8689,
+8690,8691,8692,8693,8694,8695,8696,8697,8698,8699,8700,8701,8702,8703,8704,
+8705,8706,8707,8708,8709,8710,8711,8712,8713,8714,8715,8716,8717,8718,8719,
+8720,8721,8722,8723,8724,8725,8726,8727,8728,8729,8730,8731,8732,8733,8734,
+8735,8736,8737,8738,8739,8740,8741,8742,8743,8744,8745,8746,8747,8748,8749,
+8750,8751,8752,8753,8754,8755,8756,8757,8758,8759,8760,8761,8762,8763,8764,
+8765,8766,8767,8768,8769,8770,8771,8772,8773,8774,8775,8776,8777,8778,8779,
+8780,8781,8782,8783,8784,8785,8786,8787,8788,8789,8790,8791,8792,8793,8794,
+8795,8796,8797,8798,8799,8800,8801,8802,8803,8804,8805,8806,8807,8808,8809,
+8810,8811,8812,8813,8814,8815,8816,8817,8818,8819,8820,8821,8822,8823,8824,
+8825,8826,8827,8828,8829,8830,8831,8832,8833,8834,8835,8836,8837,8838,8839,
+8840,8841,8842,8843,8844,8845,8846,8847,8848,8849,8850,8851,8852,8853,8854,
+8855,8856,8857,8858,8859,8860,8861,8862,8863,8864,8865,8866,8867,8868,8869,
+8870,8871,8872,8873,8874,8875,8876,8877,8878,8879,8880,8881,8882,8883,8884,
+8885,8886,8887,8888,8889,8890,8891,8892,8893,8894,8895,8896,8897,8898,8899,
+8900,8901,8902,8903,8904,8905,8906,8907,8908,8909,8910,8911,8912,8913,8914,
+8915,8916,8917,8918,8919,8920,8921,8922,8923,8924,8925,8926,8927,8928,8929,
+8930,8931,8932,8933,8934,8935,8936,8937,8938,8939,8940,8941,8942,8943,8944,
+8945,8946,8947,8948,8949,8950,8951,8952,8953,8954,8955,8956,8957,8958,8959,
+8960,8961,8962,8963,8964,8965,8966,8967,8968,8969,8970,8971,8972,8973,8974,
+8975,8976,8977,8978,8979,8980,8981,8982,8983,8984,8985,8986,8987,8988,8989,
+8990,8991,8992,8993,8994,8995,8996,8997,8998,8999,9000,9001,9002,9003,9004,
+9005,9006,9007,9008,9009,9010,9011,9012,9013,9014,9015,9016,9017,9018,9019,
+9020,9021,9022,9023,9024,9025,9026,9027,9028,9029,9030,9031,9032,9033,9034,
+9035,9036,9037,9038,9039,9040,9041,9042,9043,9044,9045,9046,9047,9048,9049,
+9050,9051,9052,9053,9054,9055,9056,9057,9058,9059,9060,9061,9062,9063,9064,
+9065,9066,9067,9068,9069,9070,9071,9072,9073,9074,9075,9076,9077,9078,9079,
+9080,9081,9082,9083,9084,9085,9086,9087,9088,9089,9090,9091,9092,9093,9094,
+9095,9096,9097,9098,9099,9100,9101,9102,9103,9104,9105,9106,9107,9108,9109,
+9110,9111,9112,9113,9114,9115,9116,9117,9118,9119,9120,9121,9122,9123,9124,
+9125,9126,9127,9128,9129,9130,9131,9132,9133,9134,9135,9136,9137,9138,9139,
+9140,9141,9142,9143,9144,9145,9146,9147,9148,9149,9150,9151,9152,9153,9154,
+9155,9156,9157,9158,9159,9160,9161,9162,9163,9164,9165,9166,9167,9168,9169,
+9170,9171,9172,9173,9174,9175,9176,9177,9178,9179,9180,9181,9182,9183,9184,
+9185,9186,9187,9188,9189,9190,9191,9192,9193,9194,9195,9196,9197,9198,9199,
+9200,9201,9202,9203,9204,9205,9206,9207,9208,9209,9210,9211,9212,9213,9214,
+9215,9216,9217,9218,9219,9220,9221,9222,9223,9224,9225,9226,9227,9228,9229,
+9230,9231,9232,9233,9234,9235,9236,9237,9238,9239,9240,9241,9242,9243,9244,
+9245,9246,9247,9248,9249,9250,9251,9252,9253,9254,9255,9256,9257,9258,9259,
+9260,9261,9262,9263,9264,9265,9266,9267,9268,9269,9270,9271,9272,9273,9274,
+9275,9276,9277,9278,9279,9280,9281,9282,9283,9284,9285,9286,9287,9288,9289,
+9290,9291,9292,9293,9294,9295,9296,9297,9298,9299,9300,9301,9302,9303,9304,
+9305,9306,9307,9308,9309,9310,9311,9312,9313,9314,9315,9316,9317,9318,9319,
+9320,9321,9322,9323,9324,9325,9326,9327,9328,9329,9330,9331,9332,9333,9334,
+9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345,9346,9347,9348,9349,
+9350,9351,9352,9353,9354,9355,9356,9357,9358,9359,9360,9361,9362,9363,9364,
+9365,9366,9367,9368,9369,9370,9371,9372,9373,9374,9375,9376,9377,9378,9379,
+9380,9381,9382,9383,9384,9385,9386,9387,9388,9389,9390,9391,9392,9393,9394,
+9395,9396,9397,9398,9399,9400,9401,9402,9403,9404,9405,9406,9407,9408,9409,
+9410,9411,9412,9413,9414,9415,9416,9417,9418,9419,9420,9421,9422,9423,9398,
+9399,9400,9401,9402,9403,9404,9405,9406,9407,9408,9409,9410,9411,9412,9413,
+9414,9415,9416,9417,9418,9419,9420,9421,9422,9423,9450,9451,9452,9453,9454,
+9455,9456,9457,9458,9459,9460,9461,9462,9463,9464,9465,9466,9467,9468,9469,
+9470,9471,9472,9473,9474,9475,9476,9477,9478,9479,9480,9481,9482,9483,9484,
+9485,9486,9487,9488,9489,9490,9491,9492,9493,9494,9495,9496,9497,9498,9499,
+9500,9501,9502,9503,9504,9505,9506,9507,9508,9509,9510,9511,9512,9513,9514,
+9515,9516,9517,9518,9519,9520,9521,9522,9523,9524,9525,9526,9527,9528,9529,
+9530,9531,9532,9533,9534,9535,9536,9537,9538,9539,9540,9541,9542,9543,9544,
+9545,9546,9547,9548,9549,9550,9551,9552,9553,9554,9555,9556,9557,9558,9559,
+9560,9561,9562,9563,9564,9565,9566,9567,9568,9569,9570,9571,9572,9573,9574,
+9575,9576,9577,9578,9579,9580,9581,9582,9583,9584,9585,9586,9587,9588,9589,
+9590,9591,9592,9593,9594,9595,9596,9597,9598,9599,9600,9601,9602,9603,9604,
+9605,9606,9607,9608,9609,9610,9611,9612,9613,9614,9615,9616,9617,9618,9619,
+9620,9621,9622,9623,9624,9625,9626,9627,9628,9629,9630,9631,9632,9633,9634,
+9635,9636,9637,9638,9639,9640,9641,9642,9643,9644,9645,9646,9647,9648,9649,
+9650,9651,9652,9653,9654,9655,9656,9657,9658,9659,9660,9661,9662,9663,9664,
+9665,9666,9667,9668,9669,9670,9671,9672,9673,9674,9675,9676,9677,9678,9679,
+9680,9681,9682,9683,9684,9685,9686,9687,9688,9689,9690,9691,9692,9693,9694,
+9695,9696,9697,9698,9699,9700,9701,9702,9703,9704,9705,9706,9707,9708,9709,
+9710,9711,9712,9713,9714,9715,9716,9717,9718,9719,9720,9721,9722,9723,9724,
+9725,9726,9727,9728,9729,9730,9731,9732,9733,9734,9735,9736,9737,9738,9739,
+9740,9741,9742,9743,9744,9745,9746,9747,9748,9749,9750,9751,9752,9753,9754,
+9755,9756,9757,9758,9759,9760,9761,9762,9763,9764,9765,9766,9767,9768,9769,
+9770,9771,9772,9773,9774,9775,9776,9777,9778,9779,9780,9781,9782,9783,9784,
+9785,9786,9787,9788,9789,9790,9791,9792,9793,9794,9795,9796,9797,9798,9799,
+9800,9801,9802,9803,9804,9805,9806,9807,9808,9809,9810,9811,9812,9813,9814,
+9815,9816,9817,9818,9819,9820,9821,9822,9823,9824,9825,9826,9827,9828,9829,
+9830,9831,9832,9833,9834,9835,9836,9837,9838,9839,9840,9841,9842,9843,9844,
+9845,9846,9847,9848,9849,9850,9851,9852,9853,9854,9855,9856,9857,9858,9859,
+9860,9861,9862,9863,9864,9865,9866,9867,9868,9869,9870,9871,9872,9873,9874,
+9875,9876,9877,9878,9879,9880,9881,9882,9883,9884,9885,9886,9887,9888,9889,
+9890,9891,9892,9893,9894,9895,9896,9897,9898,9899,9900,9901,9902,9903,9904,
+9905,9906,9907,9908,9909,9910,9911,9912,9913,9914,9915,9916,9917,9918,9919,
+9920,9921,9922,9923,9924,9925,9926,9927,9928,9929,9930,9931,9932,9933,9934,
+9935,9936,9937,9938,9939,9940,9941,9942,9943,9944,9945,9946,9947,9948,9949,
+9950,9951,9952,9953,9954,9955,9956,9957,9958,9959,9960,9961,9962,9963,9964,
+9965,9966,9967,9968,9969,9970,9971,9972,9973,9974,9975,9976,9977,9978,9979,
+9980,9981,9982,9983,9984,9985,9986,9987,9988,9989,9990,9991,9992,9993,9994,
+9995,9996,9997,9998,9999,10000,10001,10002,10003,10004,10005,10006,10007,
+10008,10009,10010,10011,10012,10013,10014,10015,10016,10017,10018,10019,
+10020,10021,10022,10023,10024,10025,10026,10027,10028,10029,10030,10031,
+10032,10033,10034,10035,10036,10037,10038,10039,10040,10041,10042,10043,
+10044,10045,10046,10047,10048,10049,10050,10051,10052,10053,10054,10055,
+10056,10057,10058,10059,10060,10061,10062,10063,10064,10065,10066,10067,
+10068,10069,10070,10071,10072,10073,10074,10075,10076,10077,10078,10079,
+10080,10081,10082,10083,10084,10085,10086,10087,10088,10089,10090,10091,
+10092,10093,10094,10095,10096,10097,10098,10099,10100,10101,10102,10103,
+10104,10105,10106,10107,10108,10109,10110,10111,10112,10113,10114,10115,
+10116,10117,10118,10119,10120,10121,10122,10123,10124,10125,10126,10127,
+10128,10129,10130,10131,10132,10133,10134,10135,10136,10137,10138,10139,
+10140,10141,10142,10143,10144,10145,10146,10147,10148,10149,10150,10151,
+10152,10153,10154,10155,10156,10157,10158,10159,10160,10161,10162,10163,
+10164,10165,10166,10167,10168,10169,10170,10171,10172,10173,10174,10175,
+10176,10177,10178,10179,10180,10181,10182,10183,10184,10185,10186,10187,
+10188,10189,10190,10191,10192,10193,10194,10195,10196,10197,10198,10199,
+10200,10201,10202,10203,10204,10205,10206,10207,10208,10209,10210,10211,
+10212,10213,10214,10215,10216,10217,10218,10219,10220,10221,10222,10223,
+10224,10225,10226,10227,10228,10229,10230,10231,10232,10233,10234,10235,
+10236,10237,10238,10239,10240,10241,10242,10243,10244,10245,10246,10247,
+10248,10249,10250,10251,10252,10253,10254,10255,10256,10257,10258,10259,
+10260,10261,10262,10263,10264,10265,10266,10267,10268,10269,10270,10271,
+10272,10273,10274,10275,10276,10277,10278,10279,10280,10281,10282,10283,
+10284,10285,10286,10287,10288,10289,10290,10291,10292,10293,10294,10295,
+10296,10297,10298,10299,10300,10301,10302,10303,10304,10305,10306,10307,
+10308,10309,10310,10311,10312,10313,10314,10315,10316,10317,10318,10319,
+10320,10321,10322,10323,10324,10325,10326,10327,10328,10329,10330,10331,
+10332,10333,10334,10335,10336,10337,10338,10339,10340,10341,10342,10343,
+10344,10345,10346,10347,10348,10349,10350,10351,10352,10353,10354,10355,
+10356,10357,10358,10359,10360,10361,10362,10363,10364,10365,10366,10367,
+10368,10369,10370,10371,10372,10373,10374,10375,10376,10377,10378,10379,
+10380,10381,10382,10383,10384,10385,10386,10387,10388,10389,10390,10391,
+10392,10393,10394,10395,10396,10397,10398,10399,10400,10401,10402,10403,
+10404,10405,10406,10407,10408,10409,10410,10411,10412,10413,10414,10415,
+10416,10417,10418,10419,10420,10421,10422,10423,10424,10425,10426,10427,
+10428,10429,10430,10431,10432,10433,10434,10435,10436,10437,10438,10439,
+10440,10441,10442,10443,10444,10445,10446,10447,10448,10449,10450,10451,
+10452,10453,10454,10455,10456,10457,10458,10459,10460,10461,10462,10463,
+10464,10465,10466,10467,10468,10469,10470,10471,10472,10473,10474,10475,
+10476,10477,10478,10479,10480,10481,10482,10483,10484,10485,10486,10487,
+10488,10489,10490,10491,10492,10493,10494,10495,10496,10497,10498,10499,
+10500,10501,10502,10503,10504,10505,10506,10507,10508,10509,10510,10511,
+10512,10513,10514,10515,10516,10517,10518,10519,10520,10521,10522,10523,
+10524,10525,10526,10527,10528,10529,10530,10531,10532,10533,10534,10535,
+10536,10537,10538,10539,10540,10541,10542,10543,10544,10545,10546,10547,
+10548,10549,10550,10551,10552,10553,10554,10555,10556,10557,10558,10559,
+10560,10561,10562,10563,10564,10565,10566,10567,10568,10569,10570,10571,
+10572,10573,10574,10575,10576,10577,10578,10579,10580,10581,10582,10583,
+10584,10585,10586,10587,10588,10589,10590,10591,10592,10593,10594,10595,
+10596,10597,10598,10599,10600,10601,10602,10603,10604,10605,10606,10607,
+10608,10609,10610,10611,10612,10613,10614,10615,10616,10617,10618,10619,
+10620,10621,10622,10623,10624,10625,10626,10627,10628,10629,10630,10631,
+10632,10633,10634,10635,10636,10637,10638,10639,10640,10641,10642,10643,
+10644,10645,10646,10647,10648,10649,10650,10651,10652,10653,10654,10655,
+10656,10657,10658,10659,10660,10661,10662,10663,10664,10665,10666,10667,
+10668,10669,10670,10671,10672,10673,10674,10675,10676,10677,10678,10679,
+10680,10681,10682,10683,10684,10685,10686,10687,10688,10689,10690,10691,
+10692,10693,10694,10695,10696,10697,10698,10699,10700,10701,10702,10703,
+10704,10705,10706,10707,10708,10709,10710,10711,10712,10713,10714,10715,
+10716,10717,10718,10719,10720,10721,10722,10723,10724,10725,10726,10727,
+10728,10729,10730,10731,10732,10733,10734,10735,10736,10737,10738,10739,
+10740,10741,10742,10743,10744,10745,10746,10747,10748,10749,10750,10751,
+10752,10753,10754,10755,10756,10757,10758,10759,10760,10761,10762,10763,
+10764,10765,10766,10767,10768,10769,10770,10771,10772,10773,10774,10775,
+10776,10777,10778,10779,10780,10781,10782,10783,10784,10785,10786,10787,
+10788,10789,10790,10791,10792,10793,10794,10795,10796,10797,10798,10799,
+10800,10801,10802,10803,10804,10805,10806,10807,10808,10809,10810,10811,
+10812,10813,10814,10815,10816,10817,10818,10819,10820,10821,10822,10823,
+10824,10825,10826,10827,10828,10829,10830,10831,10832,10833,10834,10835,
+10836,10837,10838,10839,10840,10841,10842,10843,10844,10845,10846,10847,
+10848,10849,10850,10851,10852,10853,10854,10855,10856,10857,10858,10859,
+10860,10861,10862,10863,10864,10865,10866,10867,10868,10869,10870,10871,
+10872,10873,10874,10875,10876,10877,10878,10879,10880,10881,10882,10883,
+10884,10885,10886,10887,10888,10889,10890,10891,10892,10893,10894,10895,
+10896,10897,10898,10899,10900,10901,10902,10903,10904,10905,10906,10907,
+10908,10909,10910,10911,10912,10913,10914,10915,10916,10917,10918,10919,
+10920,10921,10922,10923,10924,10925,10926,10927,10928,10929,10930,10931,
+10932,10933,10934,10935,10936,10937,10938,10939,10940,10941,10942,10943,
+10944,10945,10946,10947,10948,10949,10950,10951,10952,10953,10954,10955,
+10956,10957,10958,10959,10960,10961,10962,10963,10964,10965,10966,10967,
+10968,10969,10970,10971,10972,10973,10974,10975,10976,10977,10978,10979,
+10980,10981,10982,10983,10984,10985,10986,10987,10988,10989,10990,10991,
+10992,10993,10994,10995,10996,10997,10998,10999,11000,11001,11002,11003,
+11004,11005,11006,11007,11008,11009,11010,11011,11012,11013,11014,11015,
+11016,11017,11018,11019,11020,11021,11022,11023,11024,11025,11026,11027,
+11028,11029,11030,11031,11032,11033,11034,11035,11036,11037,11038,11039,
+11040,11041,11042,11043,11044,11045,11046,11047,11048,11049,11050,11051,
+11052,11053,11054,11055,11056,11057,11058,11059,11060,11061,11062,11063,
+11064,11065,11066,11067,11068,11069,11070,11071,11072,11073,11074,11075,
+11076,11077,11078,11079,11080,11081,11082,11083,11084,11085,11086,11087,
+11088,11089,11090,11091,11092,11093,11094,11095,11096,11097,11098,11099,
+11100,11101,11102,11103,11104,11105,11106,11107,11108,11109,11110,11111,
+11112,11113,11114,11115,11116,11117,11118,11119,11120,11121,11122,11123,
+11124,11125,11126,11127,11128,11129,11130,11131,11132,11133,11134,11135,
+11136,11137,11138,11139,11140,11141,11142,11143,11144,11145,11146,11147,
+11148,11149,11150,11151,11152,11153,11154,11155,11156,11157,11158,11159,
+11160,11161,11162,11163,11164,11165,11166,11167,11168,11169,11170,11171,
+11172,11173,11174,11175,11176,11177,11178,11179,11180,11181,11182,11183,
+11184,11185,11186,11187,11188,11189,11190,11191,11192,11193,11194,11195,
+11196,11197,11198,11199,11200,11201,11202,11203,11204,11205,11206,11207,
+11208,11209,11210,11211,11212,11213,11214,11215,11216,11217,11218,11219,
+11220,11221,11222,11223,11224,11225,11226,11227,11228,11229,11230,11231,
+11232,11233,11234,11235,11236,11237,11238,11239,11240,11241,11242,11243,
+11244,11245,11246,11247,11248,11249,11250,11251,11252,11253,11254,11255,
+11256,11257,11258,11259,11260,11261,11262,11263,11264,11265,11266,11267,
+11268,11269,11270,11271,11272,11273,11274,11275,11276,11277,11278,11279,
+11280,11281,11282,11283,11284,11285,11286,11287,11288,11289,11290,11291,
+11292,11293,11294,11295,11296,11297,11298,11299,11300,11301,11302,11303,
+11304,11305,11306,11307,11308,11309,11310,11311,11264,11265,11266,11267,
+11268,11269,11270,11271,11272,11273,11274,11275,11276,11277,11278,11279,
+11280,11281,11282,11283,11284,11285,11286,11287,11288,11289,11290,11291,
+11292,11293,11294,11295,11296,11297,11298,11299,11300,11301,11302,11303,
+11304,11305,11306,11307,11308,11309,11310,11359,11360,11360,11362,11363,
+11364,570,574,11367,11367,11369,11369,11371,11371,11373,11374,11375,11376,
+11377,11378,11378,11380,11381,11381,11383,11384,11385,11386,11387,11388,
+11389,11390,11391,11392,11392,11394,11394,11396,11396,11398,11398,11400,
+11400,11402,11402,11404,11404,11406,11406,11408,11408,11410,11410,11412,
+11412,11414,11414,11416,11416,11418,11418,11420,11420,11422,11422,11424,
+11424,11426,11426,11428,11428,11430,11430,11432,11432,11434,11434,11436,
+11436,11438,11438,11440,11440,11442,11442,11444,11444,11446,11446,11448,
+11448,11450,11450,11452,11452,11454,11454,11456,11456,11458,11458,11460,
+11460,11462,11462,11464,11464,11466,11466,11468,11468,11470,11470,11472,
+11472,11474,11474,11476,11476,11478,11478,11480,11480,11482,11482,11484,
+11484,11486,11486,11488,11488,11490,11490,11492,11493,11494,11495,11496,
+11497,11498,11499,11499,11501,11501,11503,11504,11505,11506,11506,11508,
+11509,11510,11511,11512,11513,11514,11515,11516,11517,11518,11519,4256,
+4257,4258,4259,4260,4261,4262,4263,4264,4265,4266,4267,4268,4269,4270,4271,
+4272,4273,4274,4275,4276,4277,4278,4279,4280,4281,4282,4283,4284,4285,4286,
+4287,4288,4289,4290,4291,4292,4293,11558,4295,11560,11561,11562,11563,
+11564,4301,11566,11567,11568,11569,11570,11571,11572,11573,11574,11575,
+11576,11577,11578,11579,11580,11581,11582,11583,11584,11585,11586,11587,
+11588,11589,11590,11591,11592,11593,11594,11595,11596,11597,11598,11599,
+11600,11601,11602,11603,11604,11605,11606,11607,11608,11609,11610,11611,
+11612,11613,11614,11615,11616,11617,11618,11619,11620,11621,11622,11623,
+11624,11625,11626,11627,11628,11629,11630,11631,11632,11633,11634,11635,
+11636,11637,11638,11639,11640,11641,11642,11643,11644,11645,11646,11647,
+11648,11649,11650,11651,11652,11653,11654,11655,11656,11657,11658,11659,
+11660,11661,11662,11663,11664,11665,11666,11667,11668,11669,11670,11671,
+11672,11673,11674,11675,11676,11677,11678,11679,11680,11681,11682,11683,
+11684,11685,11686,11687,11688,11689,11690,11691,11692,11693,11694,11695,
+11696,11697,11698,11699,11700,11701,11702,11703,11704,11705,11706,11707,
+11708,11709,11710,11711,11712,11713,11714,11715,11716,11717,11718,11719,
+11720,11721,11722,11723,11724,11725,11726,11727,11728,11729,11730,11731,
+11732,11733,11734,11735,11736,11737,11738,11739,11740,11741,11742,11743,
+11744,11745,11746,11747,11748,11749,11750,11751,11752,11753,11754,11755,
+11756,11757,11758,11759,11760,11761,11762,11763,11764,11765,11766,11767,
+11768,11769,11770,11771,11772,11773,11774,11775,11776,11777,11778,11779,
+11780,11781,11782,11783,11784,11785,11786,11787,11788,11789,11790,11791,
+11792,11793,11794,11795,11796,11797,11798,11799,11800,11801,11802,11803,
+11804,11805,11806,11807,11808,11809,11810,11811,11812,11813,11814,11815,
+11816,11817,11818,11819,11820,11821,11822,11823,11824,11825,11826,11827,
+11828,11829,11830,11831,11832,11833,11834,11835,11836,11837,11838,11839,
+11840,11841,11842,11843,11844,11845,11846,11847,11848,11849,11850,11851,
+11852,11853,11854,11855,11856,11857,11858,11859,11860,11861,11862,11863,
+11864,11865,11866,11867,11868,11869,11870,11871,11872,11873,11874,11875,
+11876,11877,11878,11879,11880,11881,11882,11883,11884,11885,11886,11887,
+11888,11889,11890,11891,11892,11893,11894,11895,11896,11897,11898,11899,
+11900,11901,11902,11903,11904,11905,11906,11907,11908,11909,11910,11911,
+11912,11913,11914,11915,11916,11917,11918,11919,11920,11921,11922,11923,
+11924,11925,11926,11927,11928,11929,11930,11931,11932,11933,11934,11935,
+11936,11937,11938,11939,11940,11941,11942,11943,11944,11945,11946,11947,
+11948,11949,11950,11951,11952,11953,11954,11955,11956,11957,11958,11959,
+11960,11961,11962,11963,11964,11965,11966,11967,11968,11969,11970,11971,
+11972,11973,11974,11975,11976,11977,11978,11979,11980,11981,11982,11983,
+11984,11985,11986,11987,11988,11989,11990,11991,11992,11993,11994,11995,
+11996,11997,11998,11999,12000,12001,12002,12003,12004,12005,12006,12007,
+12008,12009,12010,12011,12012,12013,12014,12015,12016,12017,12018,12019,
+12020,12021,12022,12023,12024,12025,12026,12027,12028,12029,12030,12031,
+12032,12033,12034,12035,12036,12037,12038,12039,12040,12041,12042,12043,
+12044,12045,12046,12047,12048,12049,12050,12051,12052,12053,12054,12055,
+12056,12057,12058,12059,12060,12061,12062,12063,12064,12065,12066,12067,
+12068,12069,12070,12071,12072,12073,12074,12075,12076,12077,12078,12079,
+12080,12081,12082,12083,12084,12085,12086,12087,12088,12089,12090,12091,
+12092,12093,12094,12095,12096,12097,12098,12099,12100,12101,12102,12103,
+12104,12105,12106,12107,12108,12109,12110,12111,12112,12113,12114,12115,
+12116,12117,12118,12119,12120,12121,12122,12123,12124,12125,12126,12127,
+12128,12129,12130,12131,12132,12133,12134,12135,12136,12137,12138,12139,
+12140,12141,12142,12143,12144,12145,12146,12147,12148,12149,12150,12151,
+12152,12153,12154,12155,12156,12157,12158,12159,12160,12161,12162,12163,
+12164,12165,12166,12167,12168,12169,12170,12171,12172,12173,12174,12175,
+12176,12177,12178,12179,12180,12181,12182,12183,12184,12185,12186,12187,
+12188,12189,12190,12191,12192,12193,12194,12195,12196,12197,12198,12199,
+12200,12201,12202,12203,12204,12205,12206,12207,12208,12209,12210,12211,
+12212,12213,12214,12215,12216,12217,12218,12219,12220,12221,12222,12223,
+12224,12225,12226,12227,12228,12229,12230,12231,12232,12233,12234,12235,
+12236,12237,12238,12239,12240,12241,12242,12243,12244,12245,12246,12247,
+12248,12249,12250,12251,12252,12253,12254,12255,12256,12257,12258,12259,
+12260,12261,12262,12263,12264,12265,12266,12267,12268,12269,12270,12271,
+12272,12273,12274,12275,12276,12277,12278,12279,12280,12281,12282,12283,
+12284,12285,12286,12287,12288,12289,12290,12291,12292,12293,12294,12295,
+12296,12297,12298,12299,12300,12301,12302,12303,12304,12305,12306,12307,
+12308,12309,12310,12311,12312,12313,12314,12315,12316,12317,12318,12319,
+12320,12321,12322,12323,12324,12325,12326,12327,12328,12329,12330,12331,
+12332,12333,12334,12335,12336,12337,12338,12339,12340,12341,12342,12343,
+12344,12345,12346,12347,12348,12349,12350,12351,12352,12353,12354,12355,
+12356,12357,12358,12359,12360,12361,12362,12363,12364,12365,12366,12367,
+12368,12369,12370,12371,12372,12373,12374,12375,12376,12377,12378,12379,
+12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391,
+12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,
+12404,12405,12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,
+12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,
+12428,12429,12430,12431,12432,12433,12434,12435,12436,12437,12438,12439,
+12440,12441,12442,12443,12444,12445,12446,12447,12448,12449,12450,12451,
+12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462,12463,
+12464,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,
+12476,12477,12478,12479,12480,12481,12482,12483,12484,12485,12486,12487,
+12488,12489,12490,12491,12492,12493,12494,12495,12496,12497,12498,12499,
+12500,12501,12502,12503,12504,12505,12506,12507,12508,12509,12510,12511,
+12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523,
+12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,12535,
+12536,12537,12538,12539,12540,12541,12542,12543,12544,12545,12546,12547,
+12548,12549,12550,12551,12552,12553,12554,12555,12556,12557,12558,12559,
+12560,12561,12562,12563,12564,12565,12566,12567,12568,12569,12570,12571,
+12572,12573,12574,12575,12576,12577,12578,12579,12580,12581,12582,12583,
+12584,12585,12586,12587,12588,12589,12590,12591,12592,12593,12594,12595,
+12596,12597,12598,12599,12600,12601,12602,12603,12604,12605,12606,12607,
+12608,12609,12610,12611,12612,12613,12614,12615,12616,12617,12618,12619,
+12620,12621,12622,12623,12624,12625,12626,12627,12628,12629,12630,12631,
+12632,12633,12634,12635,12636,12637,12638,12639,12640,12641,12642,12643,
+12644,12645,12646,12647,12648,12649,12650,12651,12652,12653,12654,12655,
+12656,12657,12658,12659,12660,12661,12662,12663,12664,12665,12666,12667,
+12668,12669,12670,12671,12672,12673,12674,12675,12676,12677,12678,12679,
+12680,12681,12682,12683,12684,12685,12686,12687,12688,12689,12690,12691,
+12692,12693,12694,12695,12696,12697,12698,12699,12700,12701,12702,12703,
+12704,12705,12706,12707,12708,12709,12710,12711,12712,12713,12714,12715,
+12716,12717,12718,12719,12720,12721,12722,12723,12724,12725,12726,12727,
+12728,12729,12730,12731,12732,12733,12734,12735,12736,12737,12738,12739,
+12740,12741,12742,12743,12744,12745,12746,12747,12748,12749,12750,12751,
+12752,12753,12754,12755,12756,12757,12758,12759,12760,12761,12762,12763,
+12764,12765,12766,12767,12768,12769,12770,12771,12772,12773,12774,12775,
+12776,12777,12778,12779,12780,12781,12782,12783,12784,12785,12786,12787,
+12788,12789,12790,12791,12792,12793,12794,12795,12796,12797,12798,12799,
+12800,12801,12802,12803,12804,12805,12806,12807,12808,12809,12810,12811,
+12812,12813,12814,12815,12816,12817,12818,12819,12820,12821,12822,12823,
+12824,12825,12826,12827,12828,12829,12830,12831,12832,12833,12834,12835,
+12836,12837,12838,12839,12840,12841,12842,12843,12844,12845,12846,12847,
+12848,12849,12850,12851,12852,12853,12854,12855,12856,12857,12858,12859,
+12860,12861,12862,12863,12864,12865,12866,12867,12868,12869,12870,12871,
+12872,12873,12874,12875,12876,12877,12878,12879,12880,12881,12882,12883,
+12884,12885,12886,12887,12888,12889,12890,12891,12892,12893,12894,12895,
+12896,12897,12898,12899,12900,12901,12902,12903,12904,12905,12906,12907,
+12908,12909,12910,12911,12912,12913,12914,12915,12916,12917,12918,12919,
+12920,12921,12922,12923,12924,12925,12926,12927,12928,12929,12930,12931,
+12932,12933,12934,12935,12936,12937,12938,12939,12940,12941,12942,12943,
+12944,12945,12946,12947,12948,12949,12950,12951,12952,12953,12954,12955,
+12956,12957,12958,12959,12960,12961,12962,12963,12964,12965,12966,12967,
+12968,12969,12970,12971,12972,12973,12974,12975,12976,12977,12978,12979,
+12980,12981,12982,12983,12984,12985,12986,12987,12988,12989,12990,12991,
+12992,12993,12994,12995,12996,12997,12998,12999,13000,13001,13002,13003,
+13004,13005,13006,13007,13008,13009,13010,13011,13012,13013,13014,13015,
+13016,13017,13018,13019,13020,13021,13022,13023,13024,13025,13026,13027,
+13028,13029,13030,13031,13032,13033,13034,13035,13036,13037,13038,13039,
+13040,13041,13042,13043,13044,13045,13046,13047,13048,13049,13050,13051,
+13052,13053,13054,13055,13056,13057,13058,13059,13060,13061,13062,13063,
+13064,13065,13066,13067,13068,13069,13070,13071,13072,13073,13074,13075,
+13076,13077,13078,13079,13080,13081,13082,13083,13084,13085,13086,13087,
+13088,13089,13090,13091,13092,13093,13094,13095,13096,13097,13098,13099,
+13100,13101,13102,13103,13104,13105,13106,13107,13108,13109,13110,13111,
+13112,13113,13114,13115,13116,13117,13118,13119,13120,13121,13122,13123,
+13124,13125,13126,13127,13128,13129,13130,13131,13132,13133,13134,13135,
+13136,13137,13138,13139,13140,13141,13142,13143,13144,13145,13146,13147,
+13148,13149,13150,13151,13152,13153,13154,13155,13156,13157,13158,13159,
+13160,13161,13162,13163,13164,13165,13166,13167,13168,13169,13170,13171,
+13172,13173,13174,13175,13176,13177,13178,13179,13180,13181,13182,13183,
+13184,13185,13186,13187,13188,13189,13190,13191,13192,13193,13194,13195,
+13196,13197,13198,13199,13200,13201,13202,13203,13204,13205,13206,13207,
+13208,13209,13210,13211,13212,13213,13214,13215,13216,13217,13218,13219,
+13220,13221,13222,13223,13224,13225,13226,13227,13228,13229,13230,13231,
+13232,13233,13234,13235,13236,13237,13238,13239,13240,13241,13242,13243,
+13244,13245,13246,13247,13248,13249,13250,13251,13252,13253,13254,13255,
+13256,13257,13258,13259,13260,13261,13262,13263,13264,13265,13266,13267,
+13268,13269,13270,13271,13272,13273,13274,13275,13276,13277,13278,13279,
+13280,13281,13282,13283,13284,13285,13286,13287,13288,13289,13290,13291,
+13292,13293,13294,13295,13296,13297,13298,13299,13300,13301,13302,13303,
+13304,13305,13306,13307,13308,13309,13310,13311,13312,13313,13314,13315,
+13316,13317,13318,13319,13320,13321,13322,13323,13324,13325,13326,13327,
+13328,13329,13330,13331,13332,13333,13334,13335,13336,13337,13338,13339,
+13340,13341,13342,13343,13344,13345,13346,13347,13348,13349,13350,13351,
+13352,13353,13354,13355,13356,13357,13358,13359,13360,13361,13362,13363,
+13364,13365,13366,13367,13368,13369,13370,13371,13372,13373,13374,13375,
+13376,13377,13378,13379,13380,13381,13382,13383,13384,13385,13386,13387,
+13388,13389,13390,13391,13392,13393,13394,13395,13396,13397,13398,13399,
+13400,13401,13402,13403,13404,13405,13406,13407,13408,13409,13410,13411,
+13412,13413,13414,13415,13416,13417,13418,13419,13420,13421,13422,13423,
+13424,13425,13426,13427,13428,13429,13430,13431,13432,13433,13434,13435,
+13436,13437,13438,13439,13440,13441,13442,13443,13444,13445,13446,13447,
+13448,13449,13450,13451,13452,13453,13454,13455,13456,13457,13458,13459,
+13460,13461,13462,13463,13464,13465,13466,13467,13468,13469,13470,13471,
+13472,13473,13474,13475,13476,13477,13478,13479,13480,13481,13482,13483,
+13484,13485,13486,13487,13488,13489,13490,13491,13492,13493,13494,13495,
+13496,13497,13498,13499,13500,13501,13502,13503,13504,13505,13506,13507,
+13508,13509,13510,13511,13512,13513,13514,13515,13516,13517,13518,13519,
+13520,13521,13522,13523,13524,13525,13526,13527,13528,13529,13530,13531,
+13532,13533,13534,13535,13536,13537,13538,13539,13540,13541,13542,13543,
+13544,13545,13546,13547,13548,13549,13550,13551,13552,13553,13554,13555,
+13556,13557,13558,13559,13560,13561,13562,13563,13564,13565,13566,13567,
+13568,13569,13570,13571,13572,13573,13574,13575,13576,13577,13578,13579,
+13580,13581,13582,13583,13584,13585,13586,13587,13588,13589,13590,13591,
+13592,13593,13594,13595,13596,13597,13598,13599,13600,13601,13602,13603,
+13604,13605,13606,13607,13608,13609,13610,13611,13612,13613,13614,13615,
+13616,13617,13618,13619,13620,13621,13622,13623,13624,13625,13626,13627,
+13628,13629,13630,13631,13632,13633,13634,13635,13636,13637,13638,13639,
+13640,13641,13642,13643,13644,13645,13646,13647,13648,13649,13650,13651,
+13652,13653,13654,13655,13656,13657,13658,13659,13660,13661,13662,13663,
+13664,13665,13666,13667,13668,13669,13670,13671,13672,13673,13674,13675,
+13676,13677,13678,13679,13680,13681,13682,13683,13684,13685,13686,13687,
+13688,13689,13690,13691,13692,13693,13694,13695,13696,13697,13698,13699,
+13700,13701,13702,13703,13704,13705,13706,13707,13708,13709,13710,13711,
+13712,13713,13714,13715,13716,13717,13718,13719,13720,13721,13722,13723,
+13724,13725,13726,13727,13728,13729,13730,13731,13732,13733,13734,13735,
+13736,13737,13738,13739,13740,13741,13742,13743,13744,13745,13746,13747,
+13748,13749,13750,13751,13752,13753,13754,13755,13756,13757,13758,13759,
+13760,13761,13762,13763,13764,13765,13766,13767,13768,13769,13770,13771,
+13772,13773,13774,13775,13776,13777,13778,13779,13780,13781,13782,13783,
+13784,13785,13786,13787,13788,13789,13790,13791,13792,13793,13794,13795,
+13796,13797,13798,13799,13800,13801,13802,13803,13804,13805,13806,13807,
+13808,13809,13810,13811,13812,13813,13814,13815,13816,13817,13818,13819,
+13820,13821,13822,13823,13824,13825,13826,13827,13828,13829,13830,13831,
+13832,13833,13834,13835,13836,13837,13838,13839,13840,13841,13842,13843,
+13844,13845,13846,13847,13848,13849,13850,13851,13852,13853,13854,13855,
+13856,13857,13858,13859,13860,13861,13862,13863,13864,13865,13866,13867,
+13868,13869,13870,13871,13872,13873,13874,13875,13876,13877,13878,13879,
+13880,13881,13882,13883,13884,13885,13886,13887,13888,13889,13890,13891,
+13892,13893,13894,13895,13896,13897,13898,13899,13900,13901,13902,13903,
+13904,13905,13906,13907,13908,13909,13910,13911,13912,13913,13914,13915,
+13916,13917,13918,13919,13920,13921,13922,13923,13924,13925,13926,13927,
+13928,13929,13930,13931,13932,13933,13934,13935,13936,13937,13938,13939,
+13940,13941,13942,13943,13944,13945,13946,13947,13948,13949,13950,13951,
+13952,13953,13954,13955,13956,13957,13958,13959,13960,13961,13962,13963,
+13964,13965,13966,13967,13968,13969,13970,13971,13972,13973,13974,13975,
+13976,13977,13978,13979,13980,13981,13982,13983,13984,13985,13986,13987,
+13988,13989,13990,13991,13992,13993,13994,13995,13996,13997,13998,13999,
+14000,14001,14002,14003,14004,14005,14006,14007,14008,14009,14010,14011,
+14012,14013,14014,14015,14016,14017,14018,14019,14020,14021,14022,14023,
+14024,14025,14026,14027,14028,14029,14030,14031,14032,14033,14034,14035,
+14036,14037,14038,14039,14040,14041,14042,14043,14044,14045,14046,14047,
+14048,14049,14050,14051,14052,14053,14054,14055,14056,14057,14058,14059,
+14060,14061,14062,14063,14064,14065,14066,14067,14068,14069,14070,14071,
+14072,14073,14074,14075,14076,14077,14078,14079,14080,14081,14082,14083,
+14084,14085,14086,14087,14088,14089,14090,14091,14092,14093,14094,14095,
+14096,14097,14098,14099,14100,14101,14102,14103,14104,14105,14106,14107,
+14108,14109,14110,14111,14112,14113,14114,14115,14116,14117,14118,14119,
+14120,14121,14122,14123,14124,14125,14126,14127,14128,14129,14130,14131,
+14132,14133,14134,14135,14136,14137,14138,14139,14140,14141,14142,14143,
+14144,14145,14146,14147,14148,14149,14150,14151,14152,14153,14154,14155,
+14156,14157,14158,14159,14160,14161,14162,14163,14164,14165,14166,14167,
+14168,14169,14170,14171,14172,14173,14174,14175,14176,14177,14178,14179,
+14180,14181,14182,14183,14184,14185,14186,14187,14188,14189,14190,14191,
+14192,14193,14194,14195,14196,14197,14198,14199,14200,14201,14202,14203,
+14204,14205,14206,14207,14208,14209,14210,14211,14212,14213,14214,14215,
+14216,14217,14218,14219,14220,14221,14222,14223,14224,14225,14226,14227,
+14228,14229,14230,14231,14232,14233,14234,14235,14236,14237,14238,14239,
+14240,14241,14242,14243,14244,14245,14246,14247,14248,14249,14250,14251,
+14252,14253,14254,14255,14256,14257,14258,14259,14260,14261,14262,14263,
+14264,14265,14266,14267,14268,14269,14270,14271,14272,14273,14274,14275,
+14276,14277,14278,14279,14280,14281,14282,14283,14284,14285,14286,14287,
+14288,14289,14290,14291,14292,14293,14294,14295,14296,14297,14298,14299,
+14300,14301,14302,14303,14304,14305,14306,14307,14308,14309,14310,14311,
+14312,14313,14314,14315,14316,14317,14318,14319,14320,14321,14322,14323,
+14324,14325,14326,14327,14328,14329,14330,14331,14332,14333,14334,14335,
+14336,14337,14338,14339,14340,14341,14342,14343,14344,14345,14346,14347,
+14348,14349,14350,14351,14352,14353,14354,14355,14356,14357,14358,14359,
+14360,14361,14362,14363,14364,14365,14366,14367,14368,14369,14370,14371,
+14372,14373,14374,14375,14376,14377,14378,14379,14380,14381,14382,14383,
+14384,14385,14386,14387,14388,14389,14390,14391,14392,14393,14394,14395,
+14396,14397,14398,14399,14400,14401,14402,14403,14404,14405,14406,14407,
+14408,14409,14410,14411,14412,14413,14414,14415,14416,14417,14418,14419,
+14420,14421,14422,14423,14424,14425,14426,14427,14428,14429,14430,14431,
+14432,14433,14434,14435,14436,14437,14438,14439,14440,14441,14442,14443,
+14444,14445,14446,14447,14448,14449,14450,14451,14452,14453,14454,14455,
+14456,14457,14458,14459,14460,14461,14462,14463,14464,14465,14466,14467,
+14468,14469,14470,14471,14472,14473,14474,14475,14476,14477,14478,14479,
+14480,14481,14482,14483,14484,14485,14486,14487,14488,14489,14490,14491,
+14492,14493,14494,14495,14496,14497,14498,14499,14500,14501,14502,14503,
+14504,14505,14506,14507,14508,14509,14510,14511,14512,14513,14514,14515,
+14516,14517,14518,14519,14520,14521,14522,14523,14524,14525,14526,14527,
+14528,14529,14530,14531,14532,14533,14534,14535,14536,14537,14538,14539,
+14540,14541,14542,14543,14544,14545,14546,14547,14548,14549,14550,14551,
+14552,14553,14554,14555,14556,14557,14558,14559,14560,14561,14562,14563,
+14564,14565,14566,14567,14568,14569,14570,14571,14572,14573,14574,14575,
+14576,14577,14578,14579,14580,14581,14582,14583,14584,14585,14586,14587,
+14588,14589,14590,14591,14592,14593,14594,14595,14596,14597,14598,14599,
+14600,14601,14602,14603,14604,14605,14606,14607,14608,14609,14610,14611,
+14612,14613,14614,14615,14616,14617,14618,14619,14620,14621,14622,14623,
+14624,14625,14626,14627,14628,14629,14630,14631,14632,14633,14634,14635,
+14636,14637,14638,14639,14640,14641,14642,14643,14644,14645,14646,14647,
+14648,14649,14650,14651,14652,14653,14654,14655,14656,14657,14658,14659,
+14660,14661,14662,14663,14664,14665,14666,14667,14668,14669,14670,14671,
+14672,14673,14674,14675,14676,14677,14678,14679,14680,14681,14682,14683,
+14684,14685,14686,14687,14688,14689,14690,14691,14692,14693,14694,14695,
+14696,14697,14698,14699,14700,14701,14702,14703,14704,14705,14706,14707,
+14708,14709,14710,14711,14712,14713,14714,14715,14716,14717,14718,14719,
+14720,14721,14722,14723,14724,14725,14726,14727,14728,14729,14730,14731,
+14732,14733,14734,14735,14736,14737,14738,14739,14740,14741,14742,14743,
+14744,14745,14746,14747,14748,14749,14750,14751,14752,14753,14754,14755,
+14756,14757,14758,14759,14760,14761,14762,14763,14764,14765,14766,14767,
+14768,14769,14770,14771,14772,14773,14774,14775,14776,14777,14778,14779,
+14780,14781,14782,14783,14784,14785,14786,14787,14788,14789,14790,14791,
+14792,14793,14794,14795,14796,14797,14798,14799,14800,14801,14802,14803,
+14804,14805,14806,14807,14808,14809,14810,14811,14812,14813,14814,14815,
+14816,14817,14818,14819,14820,14821,14822,14823,14824,14825,14826,14827,
+14828,14829,14830,14831,14832,14833,14834,14835,14836,14837,14838,14839,
+14840,14841,14842,14843,14844,14845,14846,14847,14848,14849,14850,14851,
+14852,14853,14854,14855,14856,14857,14858,14859,14860,14861,14862,14863,
+14864,14865,14866,14867,14868,14869,14870,14871,14872,14873,14874,14875,
+14876,14877,14878,14879,14880,14881,14882,14883,14884,14885,14886,14887,
+14888,14889,14890,14891,14892,14893,14894,14895,14896,14897,14898,14899,
+14900,14901,14902,14903,14904,14905,14906,14907,14908,14909,14910,14911,
+14912,14913,14914,14915,14916,14917,14918,14919,14920,14921,14922,14923,
+14924,14925,14926,14927,14928,14929,14930,14931,14932,14933,14934,14935,
+14936,14937,14938,14939,14940,14941,14942,14943,14944,14945,14946,14947,
+14948,14949,14950,14951,14952,14953,14954,14955,14956,14957,14958,14959,
+14960,14961,14962,14963,14964,14965,14966,14967,14968,14969,14970,14971,
+14972,14973,14974,14975,14976,14977,14978,14979,14980,14981,14982,14983,
+14984,14985,14986,14987,14988,14989,14990,14991,14992,14993,14994,14995,
+14996,14997,14998,14999,15000,15001,15002,15003,15004,15005,15006,15007,
+15008,15009,15010,15011,15012,15013,15014,15015,15016,15017,15018,15019,
+15020,15021,15022,15023,15024,15025,15026,15027,15028,15029,15030,15031,
+15032,15033,15034,15035,15036,15037,15038,15039,15040,15041,15042,15043,
+15044,15045,15046,15047,15048,15049,15050,15051,15052,15053,15054,15055,
+15056,15057,15058,15059,15060,15061,15062,15063,15064,15065,15066,15067,
+15068,15069,15070,15071,15072,15073,15074,15075,15076,15077,15078,15079,
+15080,15081,15082,15083,15084,15085,15086,15087,15088,15089,15090,15091,
+15092,15093,15094,15095,15096,15097,15098,15099,15100,15101,15102,15103,
+15104,15105,15106,15107,15108,15109,15110,15111,15112,15113,15114,15115,
+15116,15117,15118,15119,15120,15121,15122,15123,15124,15125,15126,15127,
+15128,15129,15130,15131,15132,15133,15134,15135,15136,15137,15138,15139,
+15140,15141,15142,15143,15144,15145,15146,15147,15148,15149,15150,15151,
+15152,15153,15154,15155,15156,15157,15158,15159,15160,15161,15162,15163,
+15164,15165,15166,15167,15168,15169,15170,15171,15172,15173,15174,15175,
+15176,15177,15178,15179,15180,15181,15182,15183,15184,15185,15186,15187,
+15188,15189,15190,15191,15192,15193,15194,15195,15196,15197,15198,15199,
+15200,15201,15202,15203,15204,15205,15206,15207,15208,15209,15210,15211,
+15212,15213,15214,15215,15216,15217,15218,15219,15220,15221,15222,15223,
+15224,15225,15226,15227,15228,15229,15230,15231,15232,15233,15234,15235,
+15236,15237,15238,15239,15240,15241,15242,15243,15244,15245,15246,15247,
+15248,15249,15250,15251,15252,15253,15254,15255,15256,15257,15258,15259,
+15260,15261,15262,15263,15264,15265,15266,15267,15268,15269,15270,15271,
+15272,15273,15274,15275,15276,15277,15278,15279,15280,15281,15282,15283,
+15284,15285,15286,15287,15288,15289,15290,15291,15292,15293,15294,15295,
+15296,15297,15298,15299,15300,15301,15302,15303,15304,15305,15306,15307,
+15308,15309,15310,15311,15312,15313,15314,15315,15316,15317,15318,15319,
+15320,15321,15322,15323,15324,15325,15326,15327,15328,15329,15330,15331,
+15332,15333,15334,15335,15336,15337,15338,15339,15340,15341,15342,15343,
+15344,15345,15346,15347,15348,15349,15350,15351,15352,15353,15354,15355,
+15356,15357,15358,15359,15360,15361,15362,15363,15364,15365,15366,15367,
+15368,15369,15370,15371,15372,15373,15374,15375,15376,15377,15378,15379,
+15380,15381,15382,15383,15384,15385,15386,15387,15388,15389,15390,15391,
+15392,15393,15394,15395,15396,15397,15398,15399,15400,15401,15402,15403,
+15404,15405,15406,15407,15408,15409,15410,15411,15412,15413,15414,15415,
+15416,15417,15418,15419,15420,15421,15422,15423,15424,15425,15426,15427,
+15428,15429,15430,15431,15432,15433,15434,15435,15436,15437,15438,15439,
+15440,15441,15442,15443,15444,15445,15446,15447,15448,15449,15450,15451,
+15452,15453,15454,15455,15456,15457,15458,15459,15460,15461,15462,15463,
+15464,15465,15466,15467,15468,15469,15470,15471,15472,15473,15474,15475,
+15476,15477,15478,15479,15480,15481,15482,15483,15484,15485,15486,15487,
+15488,15489,15490,15491,15492,15493,15494,15495,15496,15497,15498,15499,
+15500,15501,15502,15503,15504,15505,15506,15507,15508,15509,15510,15511,
+15512,15513,15514,15515,15516,15517,15518,15519,15520,15521,15522,15523,
+15524,15525,15526,15527,15528,15529,15530,15531,15532,15533,15534,15535,
+15536,15537,15538,15539,15540,15541,15542,15543,15544,15545,15546,15547,
+15548,15549,15550,15551,15552,15553,15554,15555,15556,15557,15558,15559,
+15560,15561,15562,15563,15564,15565,15566,15567,15568,15569,15570,15571,
+15572,15573,15574,15575,15576,15577,15578,15579,15580,15581,15582,15583,
+15584,15585,15586,15587,15588,15589,15590,15591,15592,15593,15594,15595,
+15596,15597,15598,15599,15600,15601,15602,15603,15604,15605,15606,15607,
+15608,15609,15610,15611,15612,15613,15614,15615,15616,15617,15618,15619,
+15620,15621,15622,15623,15624,15625,15626,15627,15628,15629,15630,15631,
+15632,15633,15634,15635,15636,15637,15638,15639,15640,15641,15642,15643,
+15644,15645,15646,15647,15648,15649,15650,15651,15652,15653,15654,15655,
+15656,15657,15658,15659,15660,15661,15662,15663,15664,15665,15666,15667,
+15668,15669,15670,15671,15672,15673,15674,15675,15676,15677,15678,15679,
+15680,15681,15682,15683,15684,15685,15686,15687,15688,15689,15690,15691,
+15692,15693,15694,15695,15696,15697,15698,15699,15700,15701,15702,15703,
+15704,15705,15706,15707,15708,15709,15710,15711,15712,15713,15714,15715,
+15716,15717,15718,15719,15720,15721,15722,15723,15724,15725,15726,15727,
+15728,15729,15730,15731,15732,15733,15734,15735,15736,15737,15738,15739,
+15740,15741,15742,15743,15744,15745,15746,15747,15748,15749,15750,15751,
+15752,15753,15754,15755,15756,15757,15758,15759,15760,15761,15762,15763,
+15764,15765,15766,15767,15768,15769,15770,15771,15772,15773,15774,15775,
+15776,15777,15778,15779,15780,15781,15782,15783,15784,15785,15786,15787,
+15788,15789,15790,15791,15792,15793,15794,15795,15796,15797,15798,15799,
+15800,15801,15802,15803,15804,15805,15806,15807,15808,15809,15810,15811,
+15812,15813,15814,15815,15816,15817,15818,15819,15820,15821,15822,15823,
+15824,15825,15826,15827,15828,15829,15830,15831,15832,15833,15834,15835,
+15836,15837,15838,15839,15840,15841,15842,15843,15844,15845,15846,15847,
+15848,15849,15850,15851,15852,15853,15854,15855,15856,15857,15858,15859,
+15860,15861,15862,15863,15864,15865,15866,15867,15868,15869,15870,15871,
+15872,15873,15874,15875,15876,15877,15878,15879,15880,15881,15882,15883,
+15884,15885,15886,15887,15888,15889,15890,15891,15892,15893,15894,15895,
+15896,15897,15898,15899,15900,15901,15902,15903,15904,15905,15906,15907,
+15908,15909,15910,15911,15912,15913,15914,15915,15916,15917,15918,15919,
+15920,15921,15922,15923,15924,15925,15926,15927,15928,15929,15930,15931,
+15932,15933,15934,15935,15936,15937,15938,15939,15940,15941,15942,15943,
+15944,15945,15946,15947,15948,15949,15950,15951,15952,15953,15954,15955,
+15956,15957,15958,15959,15960,15961,15962,15963,15964,15965,15966,15967,
+15968,15969,15970,15971,15972,15973,15974,15975,15976,15977,15978,15979,
+15980,15981,15982,15983,15984,15985,15986,15987,15988,15989,15990,15991,
+15992,15993,15994,15995,15996,15997,15998,15999,16000,16001,16002,16003,
+16004,16005,16006,16007,16008,16009,16010,16011,16012,16013,16014,16015,
+16016,16017,16018,16019,16020,16021,16022,16023,16024,16025,16026,16027,
+16028,16029,16030,16031,16032,16033,16034,16035,16036,16037,16038,16039,
+16040,16041,16042,16043,16044,16045,16046,16047,16048,16049,16050,16051,
+16052,16053,16054,16055,16056,16057,16058,16059,16060,16061,16062,16063,
+16064,16065,16066,16067,16068,16069,16070,16071,16072,16073,16074,16075,
+16076,16077,16078,16079,16080,16081,16082,16083,16084,16085,16086,16087,
+16088,16089,16090,16091,16092,16093,16094,16095,16096,16097,16098,16099,
+16100,16101,16102,16103,16104,16105,16106,16107,16108,16109,16110,16111,
+16112,16113,16114,16115,16116,16117,16118,16119,16120,16121,16122,16123,
+16124,16125,16126,16127,16128,16129,16130,16131,16132,16133,16134,16135,
+16136,16137,16138,16139,16140,16141,16142,16143,16144,16145,16146,16147,
+16148,16149,16150,16151,16152,16153,16154,16155,16156,16157,16158,16159,
+16160,16161,16162,16163,16164,16165,16166,16167,16168,16169,16170,16171,
+16172,16173,16174,16175,16176,16177,16178,16179,16180,16181,16182,16183,
+16184,16185,16186,16187,16188,16189,16190,16191,16192,16193,16194,16195,
+16196,16197,16198,16199,16200,16201,16202,16203,16204,16205,16206,16207,
+16208,16209,16210,16211,16212,16213,16214,16215,16216,16217,16218,16219,
+16220,16221,16222,16223,16224,16225,16226,16227,16228,16229,16230,16231,
+16232,16233,16234,16235,16236,16237,16238,16239,16240,16241,16242,16243,
+16244,16245,16246,16247,16248,16249,16250,16251,16252,16253,16254,16255,
+16256,16257,16258,16259,16260,16261,16262,16263,16264,16265,16266,16267,
+16268,16269,16270,16271,16272,16273,16274,16275,16276,16277,16278,16279,
+16280,16281,16282,16283,16284,16285,16286,16287,16288,16289,16290,16291,
+16292,16293,16294,16295,16296,16297,16298,16299,16300,16301,16302,16303,
+16304,16305,16306,16307,16308,16309,16310,16311,16312,16313,16314,16315,
+16316,16317,16318,16319,16320,16321,16322,16323,16324,16325,16326,16327,
+16328,16329,16330,16331,16332,16333,16334,16335,16336,16337,16338,16339,
+16340,16341,16342,16343,16344,16345,16346,16347,16348,16349,16350,16351,
+16352,16353,16354,16355,16356,16357,16358,16359,16360,16361,16362,16363,
+16364,16365,16366,16367,16368,16369,16370,16371,16372,16373,16374,16375,
+16376,16377,16378,16379,16380,16381,16382,16383,16384,16385,16386,16387,
+16388,16389,16390,16391,16392,16393,16394,16395,16396,16397,16398,16399,
+16400,16401,16402,16403,16404,16405,16406,16407,16408,16409,16410,16411,
+16412,16413,16414,16415,16416,16417,16418,16419,16420,16421,16422,16423,
+16424,16425,16426,16427,16428,16429,16430,16431,16432,16433,16434,16435,
+16436,16437,16438,16439,16440,16441,16442,16443,16444,16445,16446,16447,
+16448,16449,16450,16451,16452,16453,16454,16455,16456,16457,16458,16459,
+16460,16461,16462,16463,16464,16465,16466,16467,16468,16469,16470,16471,
+16472,16473,16474,16475,16476,16477,16478,16479,16480,16481,16482,16483,
+16484,16485,16486,16487,16488,16489,16490,16491,16492,16493,16494,16495,
+16496,16497,16498,16499,16500,16501,16502,16503,16504,16505,16506,16507,
+16508,16509,16510,16511,16512,16513,16514,16515,16516,16517,16518,16519,
+16520,16521,16522,16523,16524,16525,16526,16527,16528,16529,16530,16531,
+16532,16533,16534,16535,16536,16537,16538,16539,16540,16541,16542,16543,
+16544,16545,16546,16547,16548,16549,16550,16551,16552,16553,16554,16555,
+16556,16557,16558,16559,16560,16561,16562,16563,16564,16565,16566,16567,
+16568,16569,16570,16571,16572,16573,16574,16575,16576,16577,16578,16579,
+16580,16581,16582,16583,16584,16585,16586,16587,16588,16589,16590,16591,
+16592,16593,16594,16595,16596,16597,16598,16599,16600,16601,16602,16603,
+16604,16605,16606,16607,16608,16609,16610,16611,16612,16613,16614,16615,
+16616,16617,16618,16619,16620,16621,16622,16623,16624,16625,16626,16627,
+16628,16629,16630,16631,16632,16633,16634,16635,16636,16637,16638,16639,
+16640,16641,16642,16643,16644,16645,16646,16647,16648,16649,16650,16651,
+16652,16653,16654,16655,16656,16657,16658,16659,16660,16661,16662,16663,
+16664,16665,16666,16667,16668,16669,16670,16671,16672,16673,16674,16675,
+16676,16677,16678,16679,16680,16681,16682,16683,16684,16685,16686,16687,
+16688,16689,16690,16691,16692,16693,16694,16695,16696,16697,16698,16699,
+16700,16701,16702,16703,16704,16705,16706,16707,16708,16709,16710,16711,
+16712,16713,16714,16715,16716,16717,16718,16719,16720,16721,16722,16723,
+16724,16725,16726,16727,16728,16729,16730,16731,16732,16733,16734,16735,
+16736,16737,16738,16739,16740,16741,16742,16743,16744,16745,16746,16747,
+16748,16749,16750,16751,16752,16753,16754,16755,16756,16757,16758,16759,
+16760,16761,16762,16763,16764,16765,16766,16767,16768,16769,16770,16771,
+16772,16773,16774,16775,16776,16777,16778,16779,16780,16781,16782,16783,
+16784,16785,16786,16787,16788,16789,16790,16791,16792,16793,16794,16795,
+16796,16797,16798,16799,16800,16801,16802,16803,16804,16805,16806,16807,
+16808,16809,16810,16811,16812,16813,16814,16815,16816,16817,16818,16819,
+16820,16821,16822,16823,16824,16825,16826,16827,16828,16829,16830,16831,
+16832,16833,16834,16835,16836,16837,16838,16839,16840,16841,16842,16843,
+16844,16845,16846,16847,16848,16849,16850,16851,16852,16853,16854,16855,
+16856,16857,16858,16859,16860,16861,16862,16863,16864,16865,16866,16867,
+16868,16869,16870,16871,16872,16873,16874,16875,16876,16877,16878,16879,
+16880,16881,16882,16883,16884,16885,16886,16887,16888,16889,16890,16891,
+16892,16893,16894,16895,16896,16897,16898,16899,16900,16901,16902,16903,
+16904,16905,16906,16907,16908,16909,16910,16911,16912,16913,16914,16915,
+16916,16917,16918,16919,16920,16921,16922,16923,16924,16925,16926,16927,
+16928,16929,16930,16931,16932,16933,16934,16935,16936,16937,16938,16939,
+16940,16941,16942,16943,16944,16945,16946,16947,16948,16949,16950,16951,
+16952,16953,16954,16955,16956,16957,16958,16959,16960,16961,16962,16963,
+16964,16965,16966,16967,16968,16969,16970,16971,16972,16973,16974,16975,
+16976,16977,16978,16979,16980,16981,16982,16983,16984,16985,16986,16987,
+16988,16989,16990,16991,16992,16993,16994,16995,16996,16997,16998,16999,
+17000,17001,17002,17003,17004,17005,17006,17007,17008,17009,17010,17011,
+17012,17013,17014,17015,17016,17017,17018,17019,17020,17021,17022,17023,
+17024,17025,17026,17027,17028,17029,17030,17031,17032,17033,17034,17035,
+17036,17037,17038,17039,17040,17041,17042,17043,17044,17045,17046,17047,
+17048,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,
+17060,17061,17062,17063,17064,17065,17066,17067,17068,17069,17070,17071,
+17072,17073,17074,17075,17076,17077,17078,17079,17080,17081,17082,17083,
+17084,17085,17086,17087,17088,17089,17090,17091,17092,17093,17094,17095,
+17096,17097,17098,17099,17100,17101,17102,17103,17104,17105,17106,17107,
+17108,17109,17110,17111,17112,17113,17114,17115,17116,17117,17118,17119,
+17120,17121,17122,17123,17124,17125,17126,17127,17128,17129,17130,17131,
+17132,17133,17134,17135,17136,17137,17138,17139,17140,17141,17142,17143,
+17144,17145,17146,17147,17148,17149,17150,17151,17152,17153,17154,17155,
+17156,17157,17158,17159,17160,17161,17162,17163,17164,17165,17166,17167,
+17168,17169,17170,17171,17172,17173,17174,17175,17176,17177,17178,17179,
+17180,17181,17182,17183,17184,17185,17186,17187,17188,17189,17190,17191,
+17192,17193,17194,17195,17196,17197,17198,17199,17200,17201,17202,17203,
+17204,17205,17206,17207,17208,17209,17210,17211,17212,17213,17214,17215,
+17216,17217,17218,17219,17220,17221,17222,17223,17224,17225,17226,17227,
+17228,17229,17230,17231,17232,17233,17234,17235,17236,17237,17238,17239,
+17240,17241,17242,17243,17244,17245,17246,17247,17248,17249,17250,17251,
+17252,17253,17254,17255,17256,17257,17258,17259,17260,17261,17262,17263,
+17264,17265,17266,17267,17268,17269,17270,17271,17272,17273,17274,17275,
+17276,17277,17278,17279,17280,17281,17282,17283,17284,17285,17286,17287,
+17288,17289,17290,17291,17292,17293,17294,17295,17296,17297,17298,17299,
+17300,17301,17302,17303,17304,17305,17306,17307,17308,17309,17310,17311,
+17312,17313,17314,17315,17316,17317,17318,17319,17320,17321,17322,17323,
+17324,17325,17326,17327,17328,17329,17330,17331,17332,17333,17334,17335,
+17336,17337,17338,17339,17340,17341,17342,17343,17344,17345,17346,17347,
+17348,17349,17350,17351,17352,17353,17354,17355,17356,17357,17358,17359,
+17360,17361,17362,17363,17364,17365,17366,17367,17368,17369,17370,17371,
+17372,17373,17374,17375,17376,17377,17378,17379,17380,17381,17382,17383,
+17384,17385,17386,17387,17388,17389,17390,17391,17392,17393,17394,17395,
+17396,17397,17398,17399,17400,17401,17402,17403,17404,17405,17406,17407,
+17408,17409,17410,17411,17412,17413,17414,17415,17416,17417,17418,17419,
+17420,17421,17422,17423,17424,17425,17426,17427,17428,17429,17430,17431,
+17432,17433,17434,17435,17436,17437,17438,17439,17440,17441,17442,17443,
+17444,17445,17446,17447,17448,17449,17450,17451,17452,17453,17454,17455,
+17456,17457,17458,17459,17460,17461,17462,17463,17464,17465,17466,17467,
+17468,17469,17470,17471,17472,17473,17474,17475,17476,17477,17478,17479,
+17480,17481,17482,17483,17484,17485,17486,17487,17488,17489,17490,17491,
+17492,17493,17494,17495,17496,17497,17498,17499,17500,17501,17502,17503,
+17504,17505,17506,17507,17508,17509,17510,17511,17512,17513,17514,17515,
+17516,17517,17518,17519,17520,17521,17522,17523,17524,17525,17526,17527,
+17528,17529,17530,17531,17532,17533,17534,17535,17536,17537,17538,17539,
+17540,17541,17542,17543,17544,17545,17546,17547,17548,17549,17550,17551,
+17552,17553,17554,17555,17556,17557,17558,17559,17560,17561,17562,17563,
+17564,17565,17566,17567,17568,17569,17570,17571,17572,17573,17574,17575,
+17576,17577,17578,17579,17580,17581,17582,17583,17584,17585,17586,17587,
+17588,17589,17590,17591,17592,17593,17594,17595,17596,17597,17598,17599,
+17600,17601,17602,17603,17604,17605,17606,17607,17608,17609,17610,17611,
+17612,17613,17614,17615,17616,17617,17618,17619,17620,17621,17622,17623,
+17624,17625,17626,17627,17628,17629,17630,17631,17632,17633,17634,17635,
+17636,17637,17638,17639,17640,17641,17642,17643,17644,17645,17646,17647,
+17648,17649,17650,17651,17652,17653,17654,17655,17656,17657,17658,17659,
+17660,17661,17662,17663,17664,17665,17666,17667,17668,17669,17670,17671,
+17672,17673,17674,17675,17676,17677,17678,17679,17680,17681,17682,17683,
+17684,17685,17686,17687,17688,17689,17690,17691,17692,17693,17694,17695,
+17696,17697,17698,17699,17700,17701,17702,17703,17704,17705,17706,17707,
+17708,17709,17710,17711,17712,17713,17714,17715,17716,17717,17718,17719,
+17720,17721,17722,17723,17724,17725,17726,17727,17728,17729,17730,17731,
+17732,17733,17734,17735,17736,17737,17738,17739,17740,17741,17742,17743,
+17744,17745,17746,17747,17748,17749,17750,17751,17752,17753,17754,17755,
+17756,17757,17758,17759,17760,17761,17762,17763,17764,17765,17766,17767,
+17768,17769,17770,17771,17772,17773,17774,17775,17776,17777,17778,17779,
+17780,17781,17782,17783,17784,17785,17786,17787,17788,17789,17790,17791,
+17792,17793,17794,17795,17796,17797,17798,17799,17800,17801,17802,17803,
+17804,17805,17806,17807,17808,17809,17810,17811,17812,17813,17814,17815,
+17816,17817,17818,17819,17820,17821,17822,17823,17824,17825,17826,17827,
+17828,17829,17830,17831,17832,17833,17834,17835,17836,17837,17838,17839,
+17840,17841,17842,17843,17844,17845,17846,17847,17848,17849,17850,17851,
+17852,17853,17854,17855,17856,17857,17858,17859,17860,17861,17862,17863,
+17864,17865,17866,17867,17868,17869,17870,17871,17872,17873,17874,17875,
+17876,17877,17878,17879,17880,17881,17882,17883,17884,17885,17886,17887,
+17888,17889,17890,17891,17892,17893,17894,17895,17896,17897,17898,17899,
+17900,17901,17902,17903,17904,17905,17906,17907,17908,17909,17910,17911,
+17912,17913,17914,17915,17916,17917,17918,17919,17920,17921,17922,17923,
+17924,17925,17926,17927,17928,17929,17930,17931,17932,17933,17934,17935,
+17936,17937,17938,17939,17940,17941,17942,17943,17944,17945,17946,17947,
+17948,17949,17950,17951,17952,17953,17954,17955,17956,17957,17958,17959,
+17960,17961,17962,17963,17964,17965,17966,17967,17968,17969,17970,17971,
+17972,17973,17974,17975,17976,17977,17978,17979,17980,17981,17982,17983,
+17984,17985,17986,17987,17988,17989,17990,17991,17992,17993,17994,17995,
+17996,17997,17998,17999,18000,18001,18002,18003,18004,18005,18006,18007,
+18008,18009,18010,18011,18012,18013,18014,18015,18016,18017,18018,18019,
+18020,18021,18022,18023,18024,18025,18026,18027,18028,18029,18030,18031,
+18032,18033,18034,18035,18036,18037,18038,18039,18040,18041,18042,18043,
+18044,18045,18046,18047,18048,18049,18050,18051,18052,18053,18054,18055,
+18056,18057,18058,18059,18060,18061,18062,18063,18064,18065,18066,18067,
+18068,18069,18070,18071,18072,18073,18074,18075,18076,18077,18078,18079,
+18080,18081,18082,18083,18084,18085,18086,18087,18088,18089,18090,18091,
+18092,18093,18094,18095,18096,18097,18098,18099,18100,18101,18102,18103,
+18104,18105,18106,18107,18108,18109,18110,18111,18112,18113,18114,18115,
+18116,18117,18118,18119,18120,18121,18122,18123,18124,18125,18126,18127,
+18128,18129,18130,18131,18132,18133,18134,18135,18136,18137,18138,18139,
+18140,18141,18142,18143,18144,18145,18146,18147,18148,18149,18150,18151,
+18152,18153,18154,18155,18156,18157,18158,18159,18160,18161,18162,18163,
+18164,18165,18166,18167,18168,18169,18170,18171,18172,18173,18174,18175,
+18176,18177,18178,18179,18180,18181,18182,18183,18184,18185,18186,18187,
+18188,18189,18190,18191,18192,18193,18194,18195,18196,18197,18198,18199,
+18200,18201,18202,18203,18204,18205,18206,18207,18208,18209,18210,18211,
+18212,18213,18214,18215,18216,18217,18218,18219,18220,18221,18222,18223,
+18224,18225,18226,18227,18228,18229,18230,18231,18232,18233,18234,18235,
+18236,18237,18238,18239,18240,18241,18242,18243,18244,18245,18246,18247,
+18248,18249,18250,18251,18252,18253,18254,18255,18256,18257,18258,18259,
+18260,18261,18262,18263,18264,18265,18266,18267,18268,18269,18270,18271,
+18272,18273,18274,18275,18276,18277,18278,18279,18280,18281,18282,18283,
+18284,18285,18286,18287,18288,18289,18290,18291,18292,18293,18294,18295,
+18296,18297,18298,18299,18300,18301,18302,18303,18304,18305,18306,18307,
+18308,18309,18310,18311,18312,18313,18314,18315,18316,18317,18318,18319,
+18320,18321,18322,18323,18324,18325,18326,18327,18328,18329,18330,18331,
+18332,18333,18334,18335,18336,18337,18338,18339,18340,18341,18342,18343,
+18344,18345,18346,18347,18348,18349,18350,18351,18352,18353,18354,18355,
+18356,18357,18358,18359,18360,18361,18362,18363,18364,18365,18366,18367,
+18368,18369,18370,18371,18372,18373,18374,18375,18376,18377,18378,18379,
+18380,18381,18382,18383,18384,18385,18386,18387,18388,18389,18390,18391,
+18392,18393,18394,18395,18396,18397,18398,18399,18400,18401,18402,18403,
+18404,18405,18406,18407,18408,18409,18410,18411,18412,18413,18414,18415,
+18416,18417,18418,18419,18420,18421,18422,18423,18424,18425,18426,18427,
+18428,18429,18430,18431,18432,18433,18434,18435,18436,18437,18438,18439,
+18440,18441,18442,18443,18444,18445,18446,18447,18448,18449,18450,18451,
+18452,18453,18454,18455,18456,18457,18458,18459,18460,18461,18462,18463,
+18464,18465,18466,18467,18468,18469,18470,18471,18472,18473,18474,18475,
+18476,18477,18478,18479,18480,18481,18482,18483,18484,18485,18486,18487,
+18488,18489,18490,18491,18492,18493,18494,18495,18496,18497,18498,18499,
+18500,18501,18502,18503,18504,18505,18506,18507,18508,18509,18510,18511,
+18512,18513,18514,18515,18516,18517,18518,18519,18520,18521,18522,18523,
+18524,18525,18526,18527,18528,18529,18530,18531,18532,18533,18534,18535,
+18536,18537,18538,18539,18540,18541,18542,18543,18544,18545,18546,18547,
+18548,18549,18550,18551,18552,18553,18554,18555,18556,18557,18558,18559,
+18560,18561,18562,18563,18564,18565,18566,18567,18568,18569,18570,18571,
+18572,18573,18574,18575,18576,18577,18578,18579,18580,18581,18582,18583,
+18584,18585,18586,18587,18588,18589,18590,18591,18592,18593,18594,18595,
+18596,18597,18598,18599,18600,18601,18602,18603,18604,18605,18606,18607,
+18608,18609,18610,18611,18612,18613,18614,18615,18616,18617,18618,18619,
+18620,18621,18622,18623,18624,18625,18626,18627,18628,18629,18630,18631,
+18632,18633,18634,18635,18636,18637,18638,18639,18640,18641,18642,18643,
+18644,18645,18646,18647,18648,18649,18650,18651,18652,18653,18654,18655,
+18656,18657,18658,18659,18660,18661,18662,18663,18664,18665,18666,18667,
+18668,18669,18670,18671,18672,18673,18674,18675,18676,18677,18678,18679,
+18680,18681,18682,18683,18684,18685,18686,18687,18688,18689,18690,18691,
+18692,18693,18694,18695,18696,18697,18698,18699,18700,18701,18702,18703,
+18704,18705,18706,18707,18708,18709,18710,18711,18712,18713,18714,18715,
+18716,18717,18718,18719,18720,18721,18722,18723,18724,18725,18726,18727,
+18728,18729,18730,18731,18732,18733,18734,18735,18736,18737,18738,18739,
+18740,18741,18742,18743,18744,18745,18746,18747,18748,18749,18750,18751,
+18752,18753,18754,18755,18756,18757,18758,18759,18760,18761,18762,18763,
+18764,18765,18766,18767,18768,18769,18770,18771,18772,18773,18774,18775,
+18776,18777,18778,18779,18780,18781,18782,18783,18784,18785,18786,18787,
+18788,18789,18790,18791,18792,18793,18794,18795,18796,18797,18798,18799,
+18800,18801,18802,18803,18804,18805,18806,18807,18808,18809,18810,18811,
+18812,18813,18814,18815,18816,18817,18818,18819,18820,18821,18822,18823,
+18824,18825,18826,18827,18828,18829,18830,18831,18832,18833,18834,18835,
+18836,18837,18838,18839,18840,18841,18842,18843,18844,18845,18846,18847,
+18848,18849,18850,18851,18852,18853,18854,18855,18856,18857,18858,18859,
+18860,18861,18862,18863,18864,18865,18866,18867,18868,18869,18870,18871,
+18872,18873,18874,18875,18876,18877,18878,18879,18880,18881,18882,18883,
+18884,18885,18886,18887,18888,18889,18890,18891,18892,18893,18894,18895,
+18896,18897,18898,18899,18900,18901,18902,18903,18904,18905,18906,18907,
+18908,18909,18910,18911,18912,18913,18914,18915,18916,18917,18918,18919,
+18920,18921,18922,18923,18924,18925,18926,18927,18928,18929,18930,18931,
+18932,18933,18934,18935,18936,18937,18938,18939,18940,18941,18942,18943,
+18944,18945,18946,18947,18948,18949,18950,18951,18952,18953,18954,18955,
+18956,18957,18958,18959,18960,18961,18962,18963,18964,18965,18966,18967,
+18968,18969,18970,18971,18972,18973,18974,18975,18976,18977,18978,18979,
+18980,18981,18982,18983,18984,18985,18986,18987,18988,18989,18990,18991,
+18992,18993,18994,18995,18996,18997,18998,18999,19000,19001,19002,19003,
+19004,19005,19006,19007,19008,19009,19010,19011,19012,19013,19014,19015,
+19016,19017,19018,19019,19020,19021,19022,19023,19024,19025,19026,19027,
+19028,19029,19030,19031,19032,19033,19034,19035,19036,19037,19038,19039,
+19040,19041,19042,19043,19044,19045,19046,19047,19048,19049,19050,19051,
+19052,19053,19054,19055,19056,19057,19058,19059,19060,19061,19062,19063,
+19064,19065,19066,19067,19068,19069,19070,19071,19072,19073,19074,19075,
+19076,19077,19078,19079,19080,19081,19082,19083,19084,19085,19086,19087,
+19088,19089,19090,19091,19092,19093,19094,19095,19096,19097,19098,19099,
+19100,19101,19102,19103,19104,19105,19106,19107,19108,19109,19110,19111,
+19112,19113,19114,19115,19116,19117,19118,19119,19120,19121,19122,19123,
+19124,19125,19126,19127,19128,19129,19130,19131,19132,19133,19134,19135,
+19136,19137,19138,19139,19140,19141,19142,19143,19144,19145,19146,19147,
+19148,19149,19150,19151,19152,19153,19154,19155,19156,19157,19158,19159,
+19160,19161,19162,19163,19164,19165,19166,19167,19168,19169,19170,19171,
+19172,19173,19174,19175,19176,19177,19178,19179,19180,19181,19182,19183,
+19184,19185,19186,19187,19188,19189,19190,19191,19192,19193,19194,19195,
+19196,19197,19198,19199,19200,19201,19202,19203,19204,19205,19206,19207,
+19208,19209,19210,19211,19212,19213,19214,19215,19216,19217,19218,19219,
+19220,19221,19222,19223,19224,19225,19226,19227,19228,19229,19230,19231,
+19232,19233,19234,19235,19236,19237,19238,19239,19240,19241,19242,19243,
+19244,19245,19246,19247,19248,19249,19250,19251,19252,19253,19254,19255,
+19256,19257,19258,19259,19260,19261,19262,19263,19264,19265,19266,19267,
+19268,19269,19270,19271,19272,19273,19274,19275,19276,19277,19278,19279,
+19280,19281,19282,19283,19284,19285,19286,19287,19288,19289,19290,19291,
+19292,19293,19294,19295,19296,19297,19298,19299,19300,19301,19302,19303,
+19304,19305,19306,19307,19308,19309,19310,19311,19312,19313,19314,19315,
+19316,19317,19318,19319,19320,19321,19322,19323,19324,19325,19326,19327,
+19328,19329,19330,19331,19332,19333,19334,19335,19336,19337,19338,19339,
+19340,19341,19342,19343,19344,19345,19346,19347,19348,19349,19350,19351,
+19352,19353,19354,19355,19356,19357,19358,19359,19360,19361,19362,19363,
+19364,19365,19366,19367,19368,19369,19370,19371,19372,19373,19374,19375,
+19376,19377,19378,19379,19380,19381,19382,19383,19384,19385,19386,19387,
+19388,19389,19390,19391,19392,19393,19394,19395,19396,19397,19398,19399,
+19400,19401,19402,19403,19404,19405,19406,19407,19408,19409,19410,19411,
+19412,19413,19414,19415,19416,19417,19418,19419,19420,19421,19422,19423,
+19424,19425,19426,19427,19428,19429,19430,19431,19432,19433,19434,19435,
+19436,19437,19438,19439,19440,19441,19442,19443,19444,19445,19446,19447,
+19448,19449,19450,19451,19452,19453,19454,19455,19456,19457,19458,19459,
+19460,19461,19462,19463,19464,19465,19466,19467,19468,19469,19470,19471,
+19472,19473,19474,19475,19476,19477,19478,19479,19480,19481,19482,19483,
+19484,19485,19486,19487,19488,19489,19490,19491,19492,19493,19494,19495,
+19496,19497,19498,19499,19500,19501,19502,19503,19504,19505,19506,19507,
+19508,19509,19510,19511,19512,19513,19514,19515,19516,19517,19518,19519,
+19520,19521,19522,19523,19524,19525,19526,19527,19528,19529,19530,19531,
+19532,19533,19534,19535,19536,19537,19538,19539,19540,19541,19542,19543,
+19544,19545,19546,19547,19548,19549,19550,19551,19552,19553,19554,19555,
+19556,19557,19558,19559,19560,19561,19562,19563,19564,19565,19566,19567,
+19568,19569,19570,19571,19572,19573,19574,19575,19576,19577,19578,19579,
+19580,19581,19582,19583,19584,19585,19586,19587,19588,19589,19590,19591,
+19592,19593,19594,19595,19596,19597,19598,19599,19600,19601,19602,19603,
+19604,19605,19606,19607,19608,19609,19610,19611,19612,19613,19614,19615,
+19616,19617,19618,19619,19620,19621,19622,19623,19624,19625,19626,19627,
+19628,19629,19630,19631,19632,19633,19634,19635,19636,19637,19638,19639,
+19640,19641,19642,19643,19644,19645,19646,19647,19648,19649,19650,19651,
+19652,19653,19654,19655,19656,19657,19658,19659,19660,19661,19662,19663,
+19664,19665,19666,19667,19668,19669,19670,19671,19672,19673,19674,19675,
+19676,19677,19678,19679,19680,19681,19682,19683,19684,19685,19686,19687,
+19688,19689,19690,19691,19692,19693,19694,19695,19696,19697,19698,19699,
+19700,19701,19702,19703,19704,19705,19706,19707,19708,19709,19710,19711,
+19712,19713,19714,19715,19716,19717,19718,19719,19720,19721,19722,19723,
+19724,19725,19726,19727,19728,19729,19730,19731,19732,19733,19734,19735,
+19736,19737,19738,19739,19740,19741,19742,19743,19744,19745,19746,19747,
+19748,19749,19750,19751,19752,19753,19754,19755,19756,19757,19758,19759,
+19760,19761,19762,19763,19764,19765,19766,19767,19768,19769,19770,19771,
+19772,19773,19774,19775,19776,19777,19778,19779,19780,19781,19782,19783,
+19784,19785,19786,19787,19788,19789,19790,19791,19792,19793,19794,19795,
+19796,19797,19798,19799,19800,19801,19802,19803,19804,19805,19806,19807,
+19808,19809,19810,19811,19812,19813,19814,19815,19816,19817,19818,19819,
+19820,19821,19822,19823,19824,19825,19826,19827,19828,19829,19830,19831,
+19832,19833,19834,19835,19836,19837,19838,19839,19840,19841,19842,19843,
+19844,19845,19846,19847,19848,19849,19850,19851,19852,19853,19854,19855,
+19856,19857,19858,19859,19860,19861,19862,19863,19864,19865,19866,19867,
+19868,19869,19870,19871,19872,19873,19874,19875,19876,19877,19878,19879,
+19880,19881,19882,19883,19884,19885,19886,19887,19888,19889,19890,19891,
+19892,19893,19894,19895,19896,19897,19898,19899,19900,19901,19902,19903,
+19904,19905,19906,19907,19908,19909,19910,19911,19912,19913,19914,19915,
+19916,19917,19918,19919,19920,19921,19922,19923,19924,19925,19926,19927,
+19928,19929,19930,19931,19932,19933,19934,19935,19936,19937,19938,19939,
+19940,19941,19942,19943,19944,19945,19946,19947,19948,19949,19950,19951,
+19952,19953,19954,19955,19956,19957,19958,19959,19960,19961,19962,19963,
+19964,19965,19966,19967,19968,19969,19970,19971,19972,19973,19974,19975,
+19976,19977,19978,19979,19980,19981,19982,19983,19984,19985,19986,19987,
+19988,19989,19990,19991,19992,19993,19994,19995,19996,19997,19998,19999,
+20000,20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,
+20012,20013,20014,20015,20016,20017,20018,20019,20020,20021,20022,20023,
+20024,20025,20026,20027,20028,20029,20030,20031,20032,20033,20034,20035,
+20036,20037,20038,20039,20040,20041,20042,20043,20044,20045,20046,20047,
+20048,20049,20050,20051,20052,20053,20054,20055,20056,20057,20058,20059,
+20060,20061,20062,20063,20064,20065,20066,20067,20068,20069,20070,20071,
+20072,20073,20074,20075,20076,20077,20078,20079,20080,20081,20082,20083,
+20084,20085,20086,20087,20088,20089,20090,20091,20092,20093,20094,20095,
+20096,20097,20098,20099,20100,20101,20102,20103,20104,20105,20106,20107,
+20108,20109,20110,20111,20112,20113,20114,20115,20116,20117,20118,20119,
+20120,20121,20122,20123,20124,20125,20126,20127,20128,20129,20130,20131,
+20132,20133,20134,20135,20136,20137,20138,20139,20140,20141,20142,20143,
+20144,20145,20146,20147,20148,20149,20150,20151,20152,20153,20154,20155,
+20156,20157,20158,20159,20160,20161,20162,20163,20164,20165,20166,20167,
+20168,20169,20170,20171,20172,20173,20174,20175,20176,20177,20178,20179,
+20180,20181,20182,20183,20184,20185,20186,20187,20188,20189,20190,20191,
+20192,20193,20194,20195,20196,20197,20198,20199,20200,20201,20202,20203,
+20204,20205,20206,20207,20208,20209,20210,20211,20212,20213,20214,20215,
+20216,20217,20218,20219,20220,20221,20222,20223,20224,20225,20226,20227,
+20228,20229,20230,20231,20232,20233,20234,20235,20236,20237,20238,20239,
+20240,20241,20242,20243,20244,20245,20246,20247,20248,20249,20250,20251,
+20252,20253,20254,20255,20256,20257,20258,20259,20260,20261,20262,20263,
+20264,20265,20266,20267,20268,20269,20270,20271,20272,20273,20274,20275,
+20276,20277,20278,20279,20280,20281,20282,20283,20284,20285,20286,20287,
+20288,20289,20290,20291,20292,20293,20294,20295,20296,20297,20298,20299,
+20300,20301,20302,20303,20304,20305,20306,20307,20308,20309,20310,20311,
+20312,20313,20314,20315,20316,20317,20318,20319,20320,20321,20322,20323,
+20324,20325,20326,20327,20328,20329,20330,20331,20332,20333,20334,20335,
+20336,20337,20338,20339,20340,20341,20342,20343,20344,20345,20346,20347,
+20348,20349,20350,20351,20352,20353,20354,20355,20356,20357,20358,20359,
+20360,20361,20362,20363,20364,20365,20366,20367,20368,20369,20370,20371,
+20372,20373,20374,20375,20376,20377,20378,20379,20380,20381,20382,20383,
+20384,20385,20386,20387,20388,20389,20390,20391,20392,20393,20394,20395,
+20396,20397,20398,20399,20400,20401,20402,20403,20404,20405,20406,20407,
+20408,20409,20410,20411,20412,20413,20414,20415,20416,20417,20418,20419,
+20420,20421,20422,20423,20424,20425,20426,20427,20428,20429,20430,20431,
+20432,20433,20434,20435,20436,20437,20438,20439,20440,20441,20442,20443,
+20444,20445,20446,20447,20448,20449,20450,20451,20452,20453,20454,20455,
+20456,20457,20458,20459,20460,20461,20462,20463,20464,20465,20466,20467,
+20468,20469,20470,20471,20472,20473,20474,20475,20476,20477,20478,20479,
+20480,20481,20482,20483,20484,20485,20486,20487,20488,20489,20490,20491,
+20492,20493,20494,20495,20496,20497,20498,20499,20500,20501,20502,20503,
+20504,20505,20506,20507,20508,20509,20510,20511,20512,20513,20514,20515,
+20516,20517,20518,20519,20520,20521,20522,20523,20524,20525,20526,20527,
+20528,20529,20530,20531,20532,20533,20534,20535,20536,20537,20538,20539,
+20540,20541,20542,20543,20544,20545,20546,20547,20548,20549,20550,20551,
+20552,20553,20554,20555,20556,20557,20558,20559,20560,20561,20562,20563,
+20564,20565,20566,20567,20568,20569,20570,20571,20572,20573,20574,20575,
+20576,20577,20578,20579,20580,20581,20582,20583,20584,20585,20586,20587,
+20588,20589,20590,20591,20592,20593,20594,20595,20596,20597,20598,20599,
+20600,20601,20602,20603,20604,20605,20606,20607,20608,20609,20610,20611,
+20612,20613,20614,20615,20616,20617,20618,20619,20620,20621,20622,20623,
+20624,20625,20626,20627,20628,20629,20630,20631,20632,20633,20634,20635,
+20636,20637,20638,20639,20640,20641,20642,20643,20644,20645,20646,20647,
+20648,20649,20650,20651,20652,20653,20654,20655,20656,20657,20658,20659,
+20660,20661,20662,20663,20664,20665,20666,20667,20668,20669,20670,20671,
+20672,20673,20674,20675,20676,20677,20678,20679,20680,20681,20682,20683,
+20684,20685,20686,20687,20688,20689,20690,20691,20692,20693,20694,20695,
+20696,20697,20698,20699,20700,20701,20702,20703,20704,20705,20706,20707,
+20708,20709,20710,20711,20712,20713,20714,20715,20716,20717,20718,20719,
+20720,20721,20722,20723,20724,20725,20726,20727,20728,20729,20730,20731,
+20732,20733,20734,20735,20736,20737,20738,20739,20740,20741,20742,20743,
+20744,20745,20746,20747,20748,20749,20750,20751,20752,20753,20754,20755,
+20756,20757,20758,20759,20760,20761,20762,20763,20764,20765,20766,20767,
+20768,20769,20770,20771,20772,20773,20774,20775,20776,20777,20778,20779,
+20780,20781,20782,20783,20784,20785,20786,20787,20788,20789,20790,20791,
+20792,20793,20794,20795,20796,20797,20798,20799,20800,20801,20802,20803,
+20804,20805,20806,20807,20808,20809,20810,20811,20812,20813,20814,20815,
+20816,20817,20818,20819,20820,20821,20822,20823,20824,20825,20826,20827,
+20828,20829,20830,20831,20832,20833,20834,20835,20836,20837,20838,20839,
+20840,20841,20842,20843,20844,20845,20846,20847,20848,20849,20850,20851,
+20852,20853,20854,20855,20856,20857,20858,20859,20860,20861,20862,20863,
+20864,20865,20866,20867,20868,20869,20870,20871,20872,20873,20874,20875,
+20876,20877,20878,20879,20880,20881,20882,20883,20884,20885,20886,20887,
+20888,20889,20890,20891,20892,20893,20894,20895,20896,20897,20898,20899,
+20900,20901,20902,20903,20904,20905,20906,20907,20908,20909,20910,20911,
+20912,20913,20914,20915,20916,20917,20918,20919,20920,20921,20922,20923,
+20924,20925,20926,20927,20928,20929,20930,20931,20932,20933,20934,20935,
+20936,20937,20938,20939,20940,20941,20942,20943,20944,20945,20946,20947,
+20948,20949,20950,20951,20952,20953,20954,20955,20956,20957,20958,20959,
+20960,20961,20962,20963,20964,20965,20966,20967,20968,20969,20970,20971,
+20972,20973,20974,20975,20976,20977,20978,20979,20980,20981,20982,20983,
+20984,20985,20986,20987,20988,20989,20990,20991,20992,20993,20994,20995,
+20996,20997,20998,20999,21000,21001,21002,21003,21004,21005,21006,21007,
+21008,21009,21010,21011,21012,21013,21014,21015,21016,21017,21018,21019,
+21020,21021,21022,21023,21024,21025,21026,21027,21028,21029,21030,21031,
+21032,21033,21034,21035,21036,21037,21038,21039,21040,21041,21042,21043,
+21044,21045,21046,21047,21048,21049,21050,21051,21052,21053,21054,21055,
+21056,21057,21058,21059,21060,21061,21062,21063,21064,21065,21066,21067,
+21068,21069,21070,21071,21072,21073,21074,21075,21076,21077,21078,21079,
+21080,21081,21082,21083,21084,21085,21086,21087,21088,21089,21090,21091,
+21092,21093,21094,21095,21096,21097,21098,21099,21100,21101,21102,21103,
+21104,21105,21106,21107,21108,21109,21110,21111,21112,21113,21114,21115,
+21116,21117,21118,21119,21120,21121,21122,21123,21124,21125,21126,21127,
+21128,21129,21130,21131,21132,21133,21134,21135,21136,21137,21138,21139,
+21140,21141,21142,21143,21144,21145,21146,21147,21148,21149,21150,21151,
+21152,21153,21154,21155,21156,21157,21158,21159,21160,21161,21162,21163,
+21164,21165,21166,21167,21168,21169,21170,21171,21172,21173,21174,21175,
+21176,21177,21178,21179,21180,21181,21182,21183,21184,21185,21186,21187,
+21188,21189,21190,21191,21192,21193,21194,21195,21196,21197,21198,21199,
+21200,21201,21202,21203,21204,21205,21206,21207,21208,21209,21210,21211,
+21212,21213,21214,21215,21216,21217,21218,21219,21220,21221,21222,21223,
+21224,21225,21226,21227,21228,21229,21230,21231,21232,21233,21234,21235,
+21236,21237,21238,21239,21240,21241,21242,21243,21244,21245,21246,21247,
+21248,21249,21250,21251,21252,21253,21254,21255,21256,21257,21258,21259,
+21260,21261,21262,21263,21264,21265,21266,21267,21268,21269,21270,21271,
+21272,21273,21274,21275,21276,21277,21278,21279,21280,21281,21282,21283,
+21284,21285,21286,21287,21288,21289,21290,21291,21292,21293,21294,21295,
+21296,21297,21298,21299,21300,21301,21302,21303,21304,21305,21306,21307,
+21308,21309,21310,21311,21312,21313,21314,21315,21316,21317,21318,21319,
+21320,21321,21322,21323,21324,21325,21326,21327,21328,21329,21330,21331,
+21332,21333,21334,21335,21336,21337,21338,21339,21340,21341,21342,21343,
+21344,21345,21346,21347,21348,21349,21350,21351,21352,21353,21354,21355,
+21356,21357,21358,21359,21360,21361,21362,21363,21364,21365,21366,21367,
+21368,21369,21370,21371,21372,21373,21374,21375,21376,21377,21378,21379,
+21380,21381,21382,21383,21384,21385,21386,21387,21388,21389,21390,21391,
+21392,21393,21394,21395,21396,21397,21398,21399,21400,21401,21402,21403,
+21404,21405,21406,21407,21408,21409,21410,21411,21412,21413,21414,21415,
+21416,21417,21418,21419,21420,21421,21422,21423,21424,21425,21426,21427,
+21428,21429,21430,21431,21432,21433,21434,21435,21436,21437,21438,21439,
+21440,21441,21442,21443,21444,21445,21446,21447,21448,21449,21450,21451,
+21452,21453,21454,21455,21456,21457,21458,21459,21460,21461,21462,21463,
+21464,21465,21466,21467,21468,21469,21470,21471,21472,21473,21474,21475,
+21476,21477,21478,21479,21480,21481,21482,21483,21484,21485,21486,21487,
+21488,21489,21490,21491,21492,21493,21494,21495,21496,21497,21498,21499,
+21500,21501,21502,21503,21504,21505,21506,21507,21508,21509,21510,21511,
+21512,21513,21514,21515,21516,21517,21518,21519,21520,21521,21522,21523,
+21524,21525,21526,21527,21528,21529,21530,21531,21532,21533,21534,21535,
+21536,21537,21538,21539,21540,21541,21542,21543,21544,21545,21546,21547,
+21548,21549,21550,21551,21552,21553,21554,21555,21556,21557,21558,21559,
+21560,21561,21562,21563,21564,21565,21566,21567,21568,21569,21570,21571,
+21572,21573,21574,21575,21576,21577,21578,21579,21580,21581,21582,21583,
+21584,21585,21586,21587,21588,21589,21590,21591,21592,21593,21594,21595,
+21596,21597,21598,21599,21600,21601,21602,21603,21604,21605,21606,21607,
+21608,21609,21610,21611,21612,21613,21614,21615,21616,21617,21618,21619,
+21620,21621,21622,21623,21624,21625,21626,21627,21628,21629,21630,21631,
+21632,21633,21634,21635,21636,21637,21638,21639,21640,21641,21642,21643,
+21644,21645,21646,21647,21648,21649,21650,21651,21652,21653,21654,21655,
+21656,21657,21658,21659,21660,21661,21662,21663,21664,21665,21666,21667,
+21668,21669,21670,21671,21672,21673,21674,21675,21676,21677,21678,21679,
+21680,21681,21682,21683,21684,21685,21686,21687,21688,21689,21690,21691,
+21692,21693,21694,21695,21696,21697,21698,21699,21700,21701,21702,21703,
+21704,21705,21706,21707,21708,21709,21710,21711,21712,21713,21714,21715,
+21716,21717,21718,21719,21720,21721,21722,21723,21724,21725,21726,21727,
+21728,21729,21730,21731,21732,21733,21734,21735,21736,21737,21738,21739,
+21740,21741,21742,21743,21744,21745,21746,21747,21748,21749,21750,21751,
+21752,21753,21754,21755,21756,21757,21758,21759,21760,21761,21762,21763,
+21764,21765,21766,21767,21768,21769,21770,21771,21772,21773,21774,21775,
+21776,21777,21778,21779,21780,21781,21782,21783,21784,21785,21786,21787,
+21788,21789,21790,21791,21792,21793,21794,21795,21796,21797,21798,21799,
+21800,21801,21802,21803,21804,21805,21806,21807,21808,21809,21810,21811,
+21812,21813,21814,21815,21816,21817,21818,21819,21820,21821,21822,21823,
+21824,21825,21826,21827,21828,21829,21830,21831,21832,21833,21834,21835,
+21836,21837,21838,21839,21840,21841,21842,21843,21844,21845,21846,21847,
+21848,21849,21850,21851,21852,21853,21854,21855,21856,21857,21858,21859,
+21860,21861,21862,21863,21864,21865,21866,21867,21868,21869,21870,21871,
+21872,21873,21874,21875,21876,21877,21878,21879,21880,21881,21882,21883,
+21884,21885,21886,21887,21888,21889,21890,21891,21892,21893,21894,21895,
+21896,21897,21898,21899,21900,21901,21902,21903,21904,21905,21906,21907,
+21908,21909,21910,21911,21912,21913,21914,21915,21916,21917,21918,21919,
+21920,21921,21922,21923,21924,21925,21926,21927,21928,21929,21930,21931,
+21932,21933,21934,21935,21936,21937,21938,21939,21940,21941,21942,21943,
+21944,21945,21946,21947,21948,21949,21950,21951,21952,21953,21954,21955,
+21956,21957,21958,21959,21960,21961,21962,21963,21964,21965,21966,21967,
+21968,21969,21970,21971,21972,21973,21974,21975,21976,21977,21978,21979,
+21980,21981,21982,21983,21984,21985,21986,21987,21988,21989,21990,21991,
+21992,21993,21994,21995,21996,21997,21998,21999,22000,22001,22002,22003,
+22004,22005,22006,22007,22008,22009,22010,22011,22012,22013,22014,22015,
+22016,22017,22018,22019,22020,22021,22022,22023,22024,22025,22026,22027,
+22028,22029,22030,22031,22032,22033,22034,22035,22036,22037,22038,22039,
+22040,22041,22042,22043,22044,22045,22046,22047,22048,22049,22050,22051,
+22052,22053,22054,22055,22056,22057,22058,22059,22060,22061,22062,22063,
+22064,22065,22066,22067,22068,22069,22070,22071,22072,22073,22074,22075,
+22076,22077,22078,22079,22080,22081,22082,22083,22084,22085,22086,22087,
+22088,22089,22090,22091,22092,22093,22094,22095,22096,22097,22098,22099,
+22100,22101,22102,22103,22104,22105,22106,22107,22108,22109,22110,22111,
+22112,22113,22114,22115,22116,22117,22118,22119,22120,22121,22122,22123,
+22124,22125,22126,22127,22128,22129,22130,22131,22132,22133,22134,22135,
+22136,22137,22138,22139,22140,22141,22142,22143,22144,22145,22146,22147,
+22148,22149,22150,22151,22152,22153,22154,22155,22156,22157,22158,22159,
+22160,22161,22162,22163,22164,22165,22166,22167,22168,22169,22170,22171,
+22172,22173,22174,22175,22176,22177,22178,22179,22180,22181,22182,22183,
+22184,22185,22186,22187,22188,22189,22190,22191,22192,22193,22194,22195,
+22196,22197,22198,22199,22200,22201,22202,22203,22204,22205,22206,22207,
+22208,22209,22210,22211,22212,22213,22214,22215,22216,22217,22218,22219,
+22220,22221,22222,22223,22224,22225,22226,22227,22228,22229,22230,22231,
+22232,22233,22234,22235,22236,22237,22238,22239,22240,22241,22242,22243,
+22244,22245,22246,22247,22248,22249,22250,22251,22252,22253,22254,22255,
+22256,22257,22258,22259,22260,22261,22262,22263,22264,22265,22266,22267,
+22268,22269,22270,22271,22272,22273,22274,22275,22276,22277,22278,22279,
+22280,22281,22282,22283,22284,22285,22286,22287,22288,22289,22290,22291,
+22292,22293,22294,22295,22296,22297,22298,22299,22300,22301,22302,22303,
+22304,22305,22306,22307,22308,22309,22310,22311,22312,22313,22314,22315,
+22316,22317,22318,22319,22320,22321,22322,22323,22324,22325,22326,22327,
+22328,22329,22330,22331,22332,22333,22334,22335,22336,22337,22338,22339,
+22340,22341,22342,22343,22344,22345,22346,22347,22348,22349,22350,22351,
+22352,22353,22354,22355,22356,22357,22358,22359,22360,22361,22362,22363,
+22364,22365,22366,22367,22368,22369,22370,22371,22372,22373,22374,22375,
+22376,22377,22378,22379,22380,22381,22382,22383,22384,22385,22386,22387,
+22388,22389,22390,22391,22392,22393,22394,22395,22396,22397,22398,22399,
+22400,22401,22402,22403,22404,22405,22406,22407,22408,22409,22410,22411,
+22412,22413,22414,22415,22416,22417,22418,22419,22420,22421,22422,22423,
+22424,22425,22426,22427,22428,22429,22430,22431,22432,22433,22434,22435,
+22436,22437,22438,22439,22440,22441,22442,22443,22444,22445,22446,22447,
+22448,22449,22450,22451,22452,22453,22454,22455,22456,22457,22458,22459,
+22460,22461,22462,22463,22464,22465,22466,22467,22468,22469,22470,22471,
+22472,22473,22474,22475,22476,22477,22478,22479,22480,22481,22482,22483,
+22484,22485,22486,22487,22488,22489,22490,22491,22492,22493,22494,22495,
+22496,22497,22498,22499,22500,22501,22502,22503,22504,22505,22506,22507,
+22508,22509,22510,22511,22512,22513,22514,22515,22516,22517,22518,22519,
+22520,22521,22522,22523,22524,22525,22526,22527,22528,22529,22530,22531,
+22532,22533,22534,22535,22536,22537,22538,22539,22540,22541,22542,22543,
+22544,22545,22546,22547,22548,22549,22550,22551,22552,22553,22554,22555,
+22556,22557,22558,22559,22560,22561,22562,22563,22564,22565,22566,22567,
+22568,22569,22570,22571,22572,22573,22574,22575,22576,22577,22578,22579,
+22580,22581,22582,22583,22584,22585,22586,22587,22588,22589,22590,22591,
+22592,22593,22594,22595,22596,22597,22598,22599,22600,22601,22602,22603,
+22604,22605,22606,22607,22608,22609,22610,22611,22612,22613,22614,22615,
+22616,22617,22618,22619,22620,22621,22622,22623,22624,22625,22626,22627,
+22628,22629,22630,22631,22632,22633,22634,22635,22636,22637,22638,22639,
+22640,22641,22642,22643,22644,22645,22646,22647,22648,22649,22650,22651,
+22652,22653,22654,22655,22656,22657,22658,22659,22660,22661,22662,22663,
+22664,22665,22666,22667,22668,22669,22670,22671,22672,22673,22674,22675,
+22676,22677,22678,22679,22680,22681,22682,22683,22684,22685,22686,22687,
+22688,22689,22690,22691,22692,22693,22694,22695,22696,22697,22698,22699,
+22700,22701,22702,22703,22704,22705,22706,22707,22708,22709,22710,22711,
+22712,22713,22714,22715,22716,22717,22718,22719,22720,22721,22722,22723,
+22724,22725,22726,22727,22728,22729,22730,22731,22732,22733,22734,22735,
+22736,22737,22738,22739,22740,22741,22742,22743,22744,22745,22746,22747,
+22748,22749,22750,22751,22752,22753,22754,22755,22756,22757,22758,22759,
+22760,22761,22762,22763,22764,22765,22766,22767,22768,22769,22770,22771,
+22772,22773,22774,22775,22776,22777,22778,22779,22780,22781,22782,22783,
+22784,22785,22786,22787,22788,22789,22790,22791,22792,22793,22794,22795,
+22796,22797,22798,22799,22800,22801,22802,22803,22804,22805,22806,22807,
+22808,22809,22810,22811,22812,22813,22814,22815,22816,22817,22818,22819,
+22820,22821,22822,22823,22824,22825,22826,22827,22828,22829,22830,22831,
+22832,22833,22834,22835,22836,22837,22838,22839,22840,22841,22842,22843,
+22844,22845,22846,22847,22848,22849,22850,22851,22852,22853,22854,22855,
+22856,22857,22858,22859,22860,22861,22862,22863,22864,22865,22866,22867,
+22868,22869,22870,22871,22872,22873,22874,22875,22876,22877,22878,22879,
+22880,22881,22882,22883,22884,22885,22886,22887,22888,22889,22890,22891,
+22892,22893,22894,22895,22896,22897,22898,22899,22900,22901,22902,22903,
+22904,22905,22906,22907,22908,22909,22910,22911,22912,22913,22914,22915,
+22916,22917,22918,22919,22920,22921,22922,22923,22924,22925,22926,22927,
+22928,22929,22930,22931,22932,22933,22934,22935,22936,22937,22938,22939,
+22940,22941,22942,22943,22944,22945,22946,22947,22948,22949,22950,22951,
+22952,22953,22954,22955,22956,22957,22958,22959,22960,22961,22962,22963,
+22964,22965,22966,22967,22968,22969,22970,22971,22972,22973,22974,22975,
+22976,22977,22978,22979,22980,22981,22982,22983,22984,22985,22986,22987,
+22988,22989,22990,22991,22992,22993,22994,22995,22996,22997,22998,22999,
+23000,23001,23002,23003,23004,23005,23006,23007,23008,23009,23010,23011,
+23012,23013,23014,23015,23016,23017,23018,23019,23020,23021,23022,23023,
+23024,23025,23026,23027,23028,23029,23030,23031,23032,23033,23034,23035,
+23036,23037,23038,23039,23040,23041,23042,23043,23044,23045,23046,23047,
+23048,23049,23050,23051,23052,23053,23054,23055,23056,23057,23058,23059,
+23060,23061,23062,23063,23064,23065,23066,23067,23068,23069,23070,23071,
+23072,23073,23074,23075,23076,23077,23078,23079,23080,23081,23082,23083,
+23084,23085,23086,23087,23088,23089,23090,23091,23092,23093,23094,23095,
+23096,23097,23098,23099,23100,23101,23102,23103,23104,23105,23106,23107,
+23108,23109,23110,23111,23112,23113,23114,23115,23116,23117,23118,23119,
+23120,23121,23122,23123,23124,23125,23126,23127,23128,23129,23130,23131,
+23132,23133,23134,23135,23136,23137,23138,23139,23140,23141,23142,23143,
+23144,23145,23146,23147,23148,23149,23150,23151,23152,23153,23154,23155,
+23156,23157,23158,23159,23160,23161,23162,23163,23164,23165,23166,23167,
+23168,23169,23170,23171,23172,23173,23174,23175,23176,23177,23178,23179,
+23180,23181,23182,23183,23184,23185,23186,23187,23188,23189,23190,23191,
+23192,23193,23194,23195,23196,23197,23198,23199,23200,23201,23202,23203,
+23204,23205,23206,23207,23208,23209,23210,23211,23212,23213,23214,23215,
+23216,23217,23218,23219,23220,23221,23222,23223,23224,23225,23226,23227,
+23228,23229,23230,23231,23232,23233,23234,23235,23236,23237,23238,23239,
+23240,23241,23242,23243,23244,23245,23246,23247,23248,23249,23250,23251,
+23252,23253,23254,23255,23256,23257,23258,23259,23260,23261,23262,23263,
+23264,23265,23266,23267,23268,23269,23270,23271,23272,23273,23274,23275,
+23276,23277,23278,23279,23280,23281,23282,23283,23284,23285,23286,23287,
+23288,23289,23290,23291,23292,23293,23294,23295,23296,23297,23298,23299,
+23300,23301,23302,23303,23304,23305,23306,23307,23308,23309,23310,23311,
+23312,23313,23314,23315,23316,23317,23318,23319,23320,23321,23322,23323,
+23324,23325,23326,23327,23328,23329,23330,23331,23332,23333,23334,23335,
+23336,23337,23338,23339,23340,23341,23342,23343,23344,23345,23346,23347,
+23348,23349,23350,23351,23352,23353,23354,23355,23356,23357,23358,23359,
+23360,23361,23362,23363,23364,23365,23366,23367,23368,23369,23370,23371,
+23372,23373,23374,23375,23376,23377,23378,23379,23380,23381,23382,23383,
+23384,23385,23386,23387,23388,23389,23390,23391,23392,23393,23394,23395,
+23396,23397,23398,23399,23400,23401,23402,23403,23404,23405,23406,23407,
+23408,23409,23410,23411,23412,23413,23414,23415,23416,23417,23418,23419,
+23420,23421,23422,23423,23424,23425,23426,23427,23428,23429,23430,23431,
+23432,23433,23434,23435,23436,23437,23438,23439,23440,23441,23442,23443,
+23444,23445,23446,23447,23448,23449,23450,23451,23452,23453,23454,23455,
+23456,23457,23458,23459,23460,23461,23462,23463,23464,23465,23466,23467,
+23468,23469,23470,23471,23472,23473,23474,23475,23476,23477,23478,23479,
+23480,23481,23482,23483,23484,23485,23486,23487,23488,23489,23490,23491,
+23492,23493,23494,23495,23496,23497,23498,23499,23500,23501,23502,23503,
+23504,23505,23506,23507,23508,23509,23510,23511,23512,23513,23514,23515,
+23516,23517,23518,23519,23520,23521,23522,23523,23524,23525,23526,23527,
+23528,23529,23530,23531,23532,23533,23534,23535,23536,23537,23538,23539,
+23540,23541,23542,23543,23544,23545,23546,23547,23548,23549,23550,23551,
+23552,23553,23554,23555,23556,23557,23558,23559,23560,23561,23562,23563,
+23564,23565,23566,23567,23568,23569,23570,23571,23572,23573,23574,23575,
+23576,23577,23578,23579,23580,23581,23582,23583,23584,23585,23586,23587,
+23588,23589,23590,23591,23592,23593,23594,23595,23596,23597,23598,23599,
+23600,23601,23602,23603,23604,23605,23606,23607,23608,23609,23610,23611,
+23612,23613,23614,23615,23616,23617,23618,23619,23620,23621,23622,23623,
+23624,23625,23626,23627,23628,23629,23630,23631,23632,23633,23634,23635,
+23636,23637,23638,23639,23640,23641,23642,23643,23644,23645,23646,23647,
+23648,23649,23650,23651,23652,23653,23654,23655,23656,23657,23658,23659,
+23660,23661,23662,23663,23664,23665,23666,23667,23668,23669,23670,23671,
+23672,23673,23674,23675,23676,23677,23678,23679,23680,23681,23682,23683,
+23684,23685,23686,23687,23688,23689,23690,23691,23692,23693,23694,23695,
+23696,23697,23698,23699,23700,23701,23702,23703,23704,23705,23706,23707,
+23708,23709,23710,23711,23712,23713,23714,23715,23716,23717,23718,23719,
+23720,23721,23722,23723,23724,23725,23726,23727,23728,23729,23730,23731,
+23732,23733,23734,23735,23736,23737,23738,23739,23740,23741,23742,23743,
+23744,23745,23746,23747,23748,23749,23750,23751,23752,23753,23754,23755,
+23756,23757,23758,23759,23760,23761,23762,23763,23764,23765,23766,23767,
+23768,23769,23770,23771,23772,23773,23774,23775,23776,23777,23778,23779,
+23780,23781,23782,23783,23784,23785,23786,23787,23788,23789,23790,23791,
+23792,23793,23794,23795,23796,23797,23798,23799,23800,23801,23802,23803,
+23804,23805,23806,23807,23808,23809,23810,23811,23812,23813,23814,23815,
+23816,23817,23818,23819,23820,23821,23822,23823,23824,23825,23826,23827,
+23828,23829,23830,23831,23832,23833,23834,23835,23836,23837,23838,23839,
+23840,23841,23842,23843,23844,23845,23846,23847,23848,23849,23850,23851,
+23852,23853,23854,23855,23856,23857,23858,23859,23860,23861,23862,23863,
+23864,23865,23866,23867,23868,23869,23870,23871,23872,23873,23874,23875,
+23876,23877,23878,23879,23880,23881,23882,23883,23884,23885,23886,23887,
+23888,23889,23890,23891,23892,23893,23894,23895,23896,23897,23898,23899,
+23900,23901,23902,23903,23904,23905,23906,23907,23908,23909,23910,23911,
+23912,23913,23914,23915,23916,23917,23918,23919,23920,23921,23922,23923,
+23924,23925,23926,23927,23928,23929,23930,23931,23932,23933,23934,23935,
+23936,23937,23938,23939,23940,23941,23942,23943,23944,23945,23946,23947,
+23948,23949,23950,23951,23952,23953,23954,23955,23956,23957,23958,23959,
+23960,23961,23962,23963,23964,23965,23966,23967,23968,23969,23970,23971,
+23972,23973,23974,23975,23976,23977,23978,23979,23980,23981,23982,23983,
+23984,23985,23986,23987,23988,23989,23990,23991,23992,23993,23994,23995,
+23996,23997,23998,23999,24000,24001,24002,24003,24004,24005,24006,24007,
+24008,24009,24010,24011,24012,24013,24014,24015,24016,24017,24018,24019,
+24020,24021,24022,24023,24024,24025,24026,24027,24028,24029,24030,24031,
+24032,24033,24034,24035,24036,24037,24038,24039,24040,24041,24042,24043,
+24044,24045,24046,24047,24048,24049,24050,24051,24052,24053,24054,24055,
+24056,24057,24058,24059,24060,24061,24062,24063,24064,24065,24066,24067,
+24068,24069,24070,24071,24072,24073,24074,24075,24076,24077,24078,24079,
+24080,24081,24082,24083,24084,24085,24086,24087,24088,24089,24090,24091,
+24092,24093,24094,24095,24096,24097,24098,24099,24100,24101,24102,24103,
+24104,24105,24106,24107,24108,24109,24110,24111,24112,24113,24114,24115,
+24116,24117,24118,24119,24120,24121,24122,24123,24124,24125,24126,24127,
+24128,24129,24130,24131,24132,24133,24134,24135,24136,24137,24138,24139,
+24140,24141,24142,24143,24144,24145,24146,24147,24148,24149,24150,24151,
+24152,24153,24154,24155,24156,24157,24158,24159,24160,24161,24162,24163,
+24164,24165,24166,24167,24168,24169,24170,24171,24172,24173,24174,24175,
+24176,24177,24178,24179,24180,24181,24182,24183,24184,24185,24186,24187,
+24188,24189,24190,24191,24192,24193,24194,24195,24196,24197,24198,24199,
+24200,24201,24202,24203,24204,24205,24206,24207,24208,24209,24210,24211,
+24212,24213,24214,24215,24216,24217,24218,24219,24220,24221,24222,24223,
+24224,24225,24226,24227,24228,24229,24230,24231,24232,24233,24234,24235,
+24236,24237,24238,24239,24240,24241,24242,24243,24244,24245,24246,24247,
+24248,24249,24250,24251,24252,24253,24254,24255,24256,24257,24258,24259,
+24260,24261,24262,24263,24264,24265,24266,24267,24268,24269,24270,24271,
+24272,24273,24274,24275,24276,24277,24278,24279,24280,24281,24282,24283,
+24284,24285,24286,24287,24288,24289,24290,24291,24292,24293,24294,24295,
+24296,24297,24298,24299,24300,24301,24302,24303,24304,24305,24306,24307,
+24308,24309,24310,24311,24312,24313,24314,24315,24316,24317,24318,24319,
+24320,24321,24322,24323,24324,24325,24326,24327,24328,24329,24330,24331,
+24332,24333,24334,24335,24336,24337,24338,24339,24340,24341,24342,24343,
+24344,24345,24346,24347,24348,24349,24350,24351,24352,24353,24354,24355,
+24356,24357,24358,24359,24360,24361,24362,24363,24364,24365,24366,24367,
+24368,24369,24370,24371,24372,24373,24374,24375,24376,24377,24378,24379,
+24380,24381,24382,24383,24384,24385,24386,24387,24388,24389,24390,24391,
+24392,24393,24394,24395,24396,24397,24398,24399,24400,24401,24402,24403,
+24404,24405,24406,24407,24408,24409,24410,24411,24412,24413,24414,24415,
+24416,24417,24418,24419,24420,24421,24422,24423,24424,24425,24426,24427,
+24428,24429,24430,24431,24432,24433,24434,24435,24436,24437,24438,24439,
+24440,24441,24442,24443,24444,24445,24446,24447,24448,24449,24450,24451,
+24452,24453,24454,24455,24456,24457,24458,24459,24460,24461,24462,24463,
+24464,24465,24466,24467,24468,24469,24470,24471,24472,24473,24474,24475,
+24476,24477,24478,24479,24480,24481,24482,24483,24484,24485,24486,24487,
+24488,24489,24490,24491,24492,24493,24494,24495,24496,24497,24498,24499,
+24500,24501,24502,24503,24504,24505,24506,24507,24508,24509,24510,24511,
+24512,24513,24514,24515,24516,24517,24518,24519,24520,24521,24522,24523,
+24524,24525,24526,24527,24528,24529,24530,24531,24532,24533,24534,24535,
+24536,24537,24538,24539,24540,24541,24542,24543,24544,24545,24546,24547,
+24548,24549,24550,24551,24552,24553,24554,24555,24556,24557,24558,24559,
+24560,24561,24562,24563,24564,24565,24566,24567,24568,24569,24570,24571,
+24572,24573,24574,24575,24576,24577,24578,24579,24580,24581,24582,24583,
+24584,24585,24586,24587,24588,24589,24590,24591,24592,24593,24594,24595,
+24596,24597,24598,24599,24600,24601,24602,24603,24604,24605,24606,24607,
+24608,24609,24610,24611,24612,24613,24614,24615,24616,24617,24618,24619,
+24620,24621,24622,24623,24624,24625,24626,24627,24628,24629,24630,24631,
+24632,24633,24634,24635,24636,24637,24638,24639,24640,24641,24642,24643,
+24644,24645,24646,24647,24648,24649,24650,24651,24652,24653,24654,24655,
+24656,24657,24658,24659,24660,24661,24662,24663,24664,24665,24666,24667,
+24668,24669,24670,24671,24672,24673,24674,24675,24676,24677,24678,24679,
+24680,24681,24682,24683,24684,24685,24686,24687,24688,24689,24690,24691,
+24692,24693,24694,24695,24696,24697,24698,24699,24700,24701,24702,24703,
+24704,24705,24706,24707,24708,24709,24710,24711,24712,24713,24714,24715,
+24716,24717,24718,24719,24720,24721,24722,24723,24724,24725,24726,24727,
+24728,24729,24730,24731,24732,24733,24734,24735,24736,24737,24738,24739,
+24740,24741,24742,24743,24744,24745,24746,24747,24748,24749,24750,24751,
+24752,24753,24754,24755,24756,24757,24758,24759,24760,24761,24762,24763,
+24764,24765,24766,24767,24768,24769,24770,24771,24772,24773,24774,24775,
+24776,24777,24778,24779,24780,24781,24782,24783,24784,24785,24786,24787,
+24788,24789,24790,24791,24792,24793,24794,24795,24796,24797,24798,24799,
+24800,24801,24802,24803,24804,24805,24806,24807,24808,24809,24810,24811,
+24812,24813,24814,24815,24816,24817,24818,24819,24820,24821,24822,24823,
+24824,24825,24826,24827,24828,24829,24830,24831,24832,24833,24834,24835,
+24836,24837,24838,24839,24840,24841,24842,24843,24844,24845,24846,24847,
+24848,24849,24850,24851,24852,24853,24854,24855,24856,24857,24858,24859,
+24860,24861,24862,24863,24864,24865,24866,24867,24868,24869,24870,24871,
+24872,24873,24874,24875,24876,24877,24878,24879,24880,24881,24882,24883,
+24884,24885,24886,24887,24888,24889,24890,24891,24892,24893,24894,24895,
+24896,24897,24898,24899,24900,24901,24902,24903,24904,24905,24906,24907,
+24908,24909,24910,24911,24912,24913,24914,24915,24916,24917,24918,24919,
+24920,24921,24922,24923,24924,24925,24926,24927,24928,24929,24930,24931,
+24932,24933,24934,24935,24936,24937,24938,24939,24940,24941,24942,24943,
+24944,24945,24946,24947,24948,24949,24950,24951,24952,24953,24954,24955,
+24956,24957,24958,24959,24960,24961,24962,24963,24964,24965,24966,24967,
+24968,24969,24970,24971,24972,24973,24974,24975,24976,24977,24978,24979,
+24980,24981,24982,24983,24984,24985,24986,24987,24988,24989,24990,24991,
+24992,24993,24994,24995,24996,24997,24998,24999,25000,25001,25002,25003,
+25004,25005,25006,25007,25008,25009,25010,25011,25012,25013,25014,25015,
+25016,25017,25018,25019,25020,25021,25022,25023,25024,25025,25026,25027,
+25028,25029,25030,25031,25032,25033,25034,25035,25036,25037,25038,25039,
+25040,25041,25042,25043,25044,25045,25046,25047,25048,25049,25050,25051,
+25052,25053,25054,25055,25056,25057,25058,25059,25060,25061,25062,25063,
+25064,25065,25066,25067,25068,25069,25070,25071,25072,25073,25074,25075,
+25076,25077,25078,25079,25080,25081,25082,25083,25084,25085,25086,25087,
+25088,25089,25090,25091,25092,25093,25094,25095,25096,25097,25098,25099,
+25100,25101,25102,25103,25104,25105,25106,25107,25108,25109,25110,25111,
+25112,25113,25114,25115,25116,25117,25118,25119,25120,25121,25122,25123,
+25124,25125,25126,25127,25128,25129,25130,25131,25132,25133,25134,25135,
+25136,25137,25138,25139,25140,25141,25142,25143,25144,25145,25146,25147,
+25148,25149,25150,25151,25152,25153,25154,25155,25156,25157,25158,25159,
+25160,25161,25162,25163,25164,25165,25166,25167,25168,25169,25170,25171,
+25172,25173,25174,25175,25176,25177,25178,25179,25180,25181,25182,25183,
+25184,25185,25186,25187,25188,25189,25190,25191,25192,25193,25194,25195,
+25196,25197,25198,25199,25200,25201,25202,25203,25204,25205,25206,25207,
+25208,25209,25210,25211,25212,25213,25214,25215,25216,25217,25218,25219,
+25220,25221,25222,25223,25224,25225,25226,25227,25228,25229,25230,25231,
+25232,25233,25234,25235,25236,25237,25238,25239,25240,25241,25242,25243,
+25244,25245,25246,25247,25248,25249,25250,25251,25252,25253,25254,25255,
+25256,25257,25258,25259,25260,25261,25262,25263,25264,25265,25266,25267,
+25268,25269,25270,25271,25272,25273,25274,25275,25276,25277,25278,25279,
+25280,25281,25282,25283,25284,25285,25286,25287,25288,25289,25290,25291,
+25292,25293,25294,25295,25296,25297,25298,25299,25300,25301,25302,25303,
+25304,25305,25306,25307,25308,25309,25310,25311,25312,25313,25314,25315,
+25316,25317,25318,25319,25320,25321,25322,25323,25324,25325,25326,25327,
+25328,25329,25330,25331,25332,25333,25334,25335,25336,25337,25338,25339,
+25340,25341,25342,25343,25344,25345,25346,25347,25348,25349,25350,25351,
+25352,25353,25354,25355,25356,25357,25358,25359,25360,25361,25362,25363,
+25364,25365,25366,25367,25368,25369,25370,25371,25372,25373,25374,25375,
+25376,25377,25378,25379,25380,25381,25382,25383,25384,25385,25386,25387,
+25388,25389,25390,25391,25392,25393,25394,25395,25396,25397,25398,25399,
+25400,25401,25402,25403,25404,25405,25406,25407,25408,25409,25410,25411,
+25412,25413,25414,25415,25416,25417,25418,25419,25420,25421,25422,25423,
+25424,25425,25426,25427,25428,25429,25430,25431,25432,25433,25434,25435,
+25436,25437,25438,25439,25440,25441,25442,25443,25444,25445,25446,25447,
+25448,25449,25450,25451,25452,25453,25454,25455,25456,25457,25458,25459,
+25460,25461,25462,25463,25464,25465,25466,25467,25468,25469,25470,25471,
+25472,25473,25474,25475,25476,25477,25478,25479,25480,25481,25482,25483,
+25484,25485,25486,25487,25488,25489,25490,25491,25492,25493,25494,25495,
+25496,25497,25498,25499,25500,25501,25502,25503,25504,25505,25506,25507,
+25508,25509,25510,25511,25512,25513,25514,25515,25516,25517,25518,25519,
+25520,25521,25522,25523,25524,25525,25526,25527,25528,25529,25530,25531,
+25532,25533,25534,25535,25536,25537,25538,25539,25540,25541,25542,25543,
+25544,25545,25546,25547,25548,25549,25550,25551,25552,25553,25554,25555,
+25556,25557,25558,25559,25560,25561,25562,25563,25564,25565,25566,25567,
+25568,25569,25570,25571,25572,25573,25574,25575,25576,25577,25578,25579,
+25580,25581,25582,25583,25584,25585,25586,25587,25588,25589,25590,25591,
+25592,25593,25594,25595,25596,25597,25598,25599,25600,25601,25602,25603,
+25604,25605,25606,25607,25608,25609,25610,25611,25612,25613,25614,25615,
+25616,25617,25618,25619,25620,25621,25622,25623,25624,25625,25626,25627,
+25628,25629,25630,25631,25632,25633,25634,25635,25636,25637,25638,25639,
+25640,25641,25642,25643,25644,25645,25646,25647,25648,25649,25650,25651,
+25652,25653,25654,25655,25656,25657,25658,25659,25660,25661,25662,25663,
+25664,25665,25666,25667,25668,25669,25670,25671,25672,25673,25674,25675,
+25676,25677,25678,25679,25680,25681,25682,25683,25684,25685,25686,25687,
+25688,25689,25690,25691,25692,25693,25694,25695,25696,25697,25698,25699,
+25700,25701,25702,25703,25704,25705,25706,25707,25708,25709,25710,25711,
+25712,25713,25714,25715,25716,25717,25718,25719,25720,25721,25722,25723,
+25724,25725,25726,25727,25728,25729,25730,25731,25732,25733,25734,25735,
+25736,25737,25738,25739,25740,25741,25742,25743,25744,25745,25746,25747,
+25748,25749,25750,25751,25752,25753,25754,25755,25756,25757,25758,25759,
+25760,25761,25762,25763,25764,25765,25766,25767,25768,25769,25770,25771,
+25772,25773,25774,25775,25776,25777,25778,25779,25780,25781,25782,25783,
+25784,25785,25786,25787,25788,25789,25790,25791,25792,25793,25794,25795,
+25796,25797,25798,25799,25800,25801,25802,25803,25804,25805,25806,25807,
+25808,25809,25810,25811,25812,25813,25814,25815,25816,25817,25818,25819,
+25820,25821,25822,25823,25824,25825,25826,25827,25828,25829,25830,25831,
+25832,25833,25834,25835,25836,25837,25838,25839,25840,25841,25842,25843,
+25844,25845,25846,25847,25848,25849,25850,25851,25852,25853,25854,25855,
+25856,25857,25858,25859,25860,25861,25862,25863,25864,25865,25866,25867,
+25868,25869,25870,25871,25872,25873,25874,25875,25876,25877,25878,25879,
+25880,25881,25882,25883,25884,25885,25886,25887,25888,25889,25890,25891,
+25892,25893,25894,25895,25896,25897,25898,25899,25900,25901,25902,25903,
+25904,25905,25906,25907,25908,25909,25910,25911,25912,25913,25914,25915,
+25916,25917,25918,25919,25920,25921,25922,25923,25924,25925,25926,25927,
+25928,25929,25930,25931,25932,25933,25934,25935,25936,25937,25938,25939,
+25940,25941,25942,25943,25944,25945,25946,25947,25948,25949,25950,25951,
+25952,25953,25954,25955,25956,25957,25958,25959,25960,25961,25962,25963,
+25964,25965,25966,25967,25968,25969,25970,25971,25972,25973,25974,25975,
+25976,25977,25978,25979,25980,25981,25982,25983,25984,25985,25986,25987,
+25988,25989,25990,25991,25992,25993,25994,25995,25996,25997,25998,25999,
+26000,26001,26002,26003,26004,26005,26006,26007,26008,26009,26010,26011,
+26012,26013,26014,26015,26016,26017,26018,26019,26020,26021,26022,26023,
+26024,26025,26026,26027,26028,26029,26030,26031,26032,26033,26034,26035,
+26036,26037,26038,26039,26040,26041,26042,26043,26044,26045,26046,26047,
+26048,26049,26050,26051,26052,26053,26054,26055,26056,26057,26058,26059,
+26060,26061,26062,26063,26064,26065,26066,26067,26068,26069,26070,26071,
+26072,26073,26074,26075,26076,26077,26078,26079,26080,26081,26082,26083,
+26084,26085,26086,26087,26088,26089,26090,26091,26092,26093,26094,26095,
+26096,26097,26098,26099,26100,26101,26102,26103,26104,26105,26106,26107,
+26108,26109,26110,26111,26112,26113,26114,26115,26116,26117,26118,26119,
+26120,26121,26122,26123,26124,26125,26126,26127,26128,26129,26130,26131,
+26132,26133,26134,26135,26136,26137,26138,26139,26140,26141,26142,26143,
+26144,26145,26146,26147,26148,26149,26150,26151,26152,26153,26154,26155,
+26156,26157,26158,26159,26160,26161,26162,26163,26164,26165,26166,26167,
+26168,26169,26170,26171,26172,26173,26174,26175,26176,26177,26178,26179,
+26180,26181,26182,26183,26184,26185,26186,26187,26188,26189,26190,26191,
+26192,26193,26194,26195,26196,26197,26198,26199,26200,26201,26202,26203,
+26204,26205,26206,26207,26208,26209,26210,26211,26212,26213,26214,26215,
+26216,26217,26218,26219,26220,26221,26222,26223,26224,26225,26226,26227,
+26228,26229,26230,26231,26232,26233,26234,26235,26236,26237,26238,26239,
+26240,26241,26242,26243,26244,26245,26246,26247,26248,26249,26250,26251,
+26252,26253,26254,26255,26256,26257,26258,26259,26260,26261,26262,26263,
+26264,26265,26266,26267,26268,26269,26270,26271,26272,26273,26274,26275,
+26276,26277,26278,26279,26280,26281,26282,26283,26284,26285,26286,26287,
+26288,26289,26290,26291,26292,26293,26294,26295,26296,26297,26298,26299,
+26300,26301,26302,26303,26304,26305,26306,26307,26308,26309,26310,26311,
+26312,26313,26314,26315,26316,26317,26318,26319,26320,26321,26322,26323,
+26324,26325,26326,26327,26328,26329,26330,26331,26332,26333,26334,26335,
+26336,26337,26338,26339,26340,26341,26342,26343,26344,26345,26346,26347,
+26348,26349,26350,26351,26352,26353,26354,26355,26356,26357,26358,26359,
+26360,26361,26362,26363,26364,26365,26366,26367,26368,26369,26370,26371,
+26372,26373,26374,26375,26376,26377,26378,26379,26380,26381,26382,26383,
+26384,26385,26386,26387,26388,26389,26390,26391,26392,26393,26394,26395,
+26396,26397,26398,26399,26400,26401,26402,26403,26404,26405,26406,26407,
+26408,26409,26410,26411,26412,26413,26414,26415,26416,26417,26418,26419,
+26420,26421,26422,26423,26424,26425,26426,26427,26428,26429,26430,26431,
+26432,26433,26434,26435,26436,26437,26438,26439,26440,26441,26442,26443,
+26444,26445,26446,26447,26448,26449,26450,26451,26452,26453,26454,26455,
+26456,26457,26458,26459,26460,26461,26462,26463,26464,26465,26466,26467,
+26468,26469,26470,26471,26472,26473,26474,26475,26476,26477,26478,26479,
+26480,26481,26482,26483,26484,26485,26486,26487,26488,26489,26490,26491,
+26492,26493,26494,26495,26496,26497,26498,26499,26500,26501,26502,26503,
+26504,26505,26506,26507,26508,26509,26510,26511,26512,26513,26514,26515,
+26516,26517,26518,26519,26520,26521,26522,26523,26524,26525,26526,26527,
+26528,26529,26530,26531,26532,26533,26534,26535,26536,26537,26538,26539,
+26540,26541,26542,26543,26544,26545,26546,26547,26548,26549,26550,26551,
+26552,26553,26554,26555,26556,26557,26558,26559,26560,26561,26562,26563,
+26564,26565,26566,26567,26568,26569,26570,26571,26572,26573,26574,26575,
+26576,26577,26578,26579,26580,26581,26582,26583,26584,26585,26586,26587,
+26588,26589,26590,26591,26592,26593,26594,26595,26596,26597,26598,26599,
+26600,26601,26602,26603,26604,26605,26606,26607,26608,26609,26610,26611,
+26612,26613,26614,26615,26616,26617,26618,26619,26620,26621,26622,26623,
+26624,26625,26626,26627,26628,26629,26630,26631,26632,26633,26634,26635,
+26636,26637,26638,26639,26640,26641,26642,26643,26644,26645,26646,26647,
+26648,26649,26650,26651,26652,26653,26654,26655,26656,26657,26658,26659,
+26660,26661,26662,26663,26664,26665,26666,26667,26668,26669,26670,26671,
+26672,26673,26674,26675,26676,26677,26678,26679,26680,26681,26682,26683,
+26684,26685,26686,26687,26688,26689,26690,26691,26692,26693,26694,26695,
+26696,26697,26698,26699,26700,26701,26702,26703,26704,26705,26706,26707,
+26708,26709,26710,26711,26712,26713,26714,26715,26716,26717,26718,26719,
+26720,26721,26722,26723,26724,26725,26726,26727,26728,26729,26730,26731,
+26732,26733,26734,26735,26736,26737,26738,26739,26740,26741,26742,26743,
+26744,26745,26746,26747,26748,26749,26750,26751,26752,26753,26754,26755,
+26756,26757,26758,26759,26760,26761,26762,26763,26764,26765,26766,26767,
+26768,26769,26770,26771,26772,26773,26774,26775,26776,26777,26778,26779,
+26780,26781,26782,26783,26784,26785,26786,26787,26788,26789,26790,26791,
+26792,26793,26794,26795,26796,26797,26798,26799,26800,26801,26802,26803,
+26804,26805,26806,26807,26808,26809,26810,26811,26812,26813,26814,26815,
+26816,26817,26818,26819,26820,26821,26822,26823,26824,26825,26826,26827,
+26828,26829,26830,26831,26832,26833,26834,26835,26836,26837,26838,26839,
+26840,26841,26842,26843,26844,26845,26846,26847,26848,26849,26850,26851,
+26852,26853,26854,26855,26856,26857,26858,26859,26860,26861,26862,26863,
+26864,26865,26866,26867,26868,26869,26870,26871,26872,26873,26874,26875,
+26876,26877,26878,26879,26880,26881,26882,26883,26884,26885,26886,26887,
+26888,26889,26890,26891,26892,26893,26894,26895,26896,26897,26898,26899,
+26900,26901,26902,26903,26904,26905,26906,26907,26908,26909,26910,26911,
+26912,26913,26914,26915,26916,26917,26918,26919,26920,26921,26922,26923,
+26924,26925,26926,26927,26928,26929,26930,26931,26932,26933,26934,26935,
+26936,26937,26938,26939,26940,26941,26942,26943,26944,26945,26946,26947,
+26948,26949,26950,26951,26952,26953,26954,26955,26956,26957,26958,26959,
+26960,26961,26962,26963,26964,26965,26966,26967,26968,26969,26970,26971,
+26972,26973,26974,26975,26976,26977,26978,26979,26980,26981,26982,26983,
+26984,26985,26986,26987,26988,26989,26990,26991,26992,26993,26994,26995,
+26996,26997,26998,26999,27000,27001,27002,27003,27004,27005,27006,27007,
+27008,27009,27010,27011,27012,27013,27014,27015,27016,27017,27018,27019,
+27020,27021,27022,27023,27024,27025,27026,27027,27028,27029,27030,27031,
+27032,27033,27034,27035,27036,27037,27038,27039,27040,27041,27042,27043,
+27044,27045,27046,27047,27048,27049,27050,27051,27052,27053,27054,27055,
+27056,27057,27058,27059,27060,27061,27062,27063,27064,27065,27066,27067,
+27068,27069,27070,27071,27072,27073,27074,27075,27076,27077,27078,27079,
+27080,27081,27082,27083,27084,27085,27086,27087,27088,27089,27090,27091,
+27092,27093,27094,27095,27096,27097,27098,27099,27100,27101,27102,27103,
+27104,27105,27106,27107,27108,27109,27110,27111,27112,27113,27114,27115,
+27116,27117,27118,27119,27120,27121,27122,27123,27124,27125,27126,27127,
+27128,27129,27130,27131,27132,27133,27134,27135,27136,27137,27138,27139,
+27140,27141,27142,27143,27144,27145,27146,27147,27148,27149,27150,27151,
+27152,27153,27154,27155,27156,27157,27158,27159,27160,27161,27162,27163,
+27164,27165,27166,27167,27168,27169,27170,27171,27172,27173,27174,27175,
+27176,27177,27178,27179,27180,27181,27182,27183,27184,27185,27186,27187,
+27188,27189,27190,27191,27192,27193,27194,27195,27196,27197,27198,27199,
+27200,27201,27202,27203,27204,27205,27206,27207,27208,27209,27210,27211,
+27212,27213,27214,27215,27216,27217,27218,27219,27220,27221,27222,27223,
+27224,27225,27226,27227,27228,27229,27230,27231,27232,27233,27234,27235,
+27236,27237,27238,27239,27240,27241,27242,27243,27244,27245,27246,27247,
+27248,27249,27250,27251,27252,27253,27254,27255,27256,27257,27258,27259,
+27260,27261,27262,27263,27264,27265,27266,27267,27268,27269,27270,27271,
+27272,27273,27274,27275,27276,27277,27278,27279,27280,27281,27282,27283,
+27284,27285,27286,27287,27288,27289,27290,27291,27292,27293,27294,27295,
+27296,27297,27298,27299,27300,27301,27302,27303,27304,27305,27306,27307,
+27308,27309,27310,27311,27312,27313,27314,27315,27316,27317,27318,27319,
+27320,27321,27322,27323,27324,27325,27326,27327,27328,27329,27330,27331,
+27332,27333,27334,27335,27336,27337,27338,27339,27340,27341,27342,27343,
+27344,27345,27346,27347,27348,27349,27350,27351,27352,27353,27354,27355,
+27356,27357,27358,27359,27360,27361,27362,27363,27364,27365,27366,27367,
+27368,27369,27370,27371,27372,27373,27374,27375,27376,27377,27378,27379,
+27380,27381,27382,27383,27384,27385,27386,27387,27388,27389,27390,27391,
+27392,27393,27394,27395,27396,27397,27398,27399,27400,27401,27402,27403,
+27404,27405,27406,27407,27408,27409,27410,27411,27412,27413,27414,27415,
+27416,27417,27418,27419,27420,27421,27422,27423,27424,27425,27426,27427,
+27428,27429,27430,27431,27432,27433,27434,27435,27436,27437,27438,27439,
+27440,27441,27442,27443,27444,27445,27446,27447,27448,27449,27450,27451,
+27452,27453,27454,27455,27456,27457,27458,27459,27460,27461,27462,27463,
+27464,27465,27466,27467,27468,27469,27470,27471,27472,27473,27474,27475,
+27476,27477,27478,27479,27480,27481,27482,27483,27484,27485,27486,27487,
+27488,27489,27490,27491,27492,27493,27494,27495,27496,27497,27498,27499,
+27500,27501,27502,27503,27504,27505,27506,27507,27508,27509,27510,27511,
+27512,27513,27514,27515,27516,27517,27518,27519,27520,27521,27522,27523,
+27524,27525,27526,27527,27528,27529,27530,27531,27532,27533,27534,27535,
+27536,27537,27538,27539,27540,27541,27542,27543,27544,27545,27546,27547,
+27548,27549,27550,27551,27552,27553,27554,27555,27556,27557,27558,27559,
+27560,27561,27562,27563,27564,27565,27566,27567,27568,27569,27570,27571,
+27572,27573,27574,27575,27576,27577,27578,27579,27580,27581,27582,27583,
+27584,27585,27586,27587,27588,27589,27590,27591,27592,27593,27594,27595,
+27596,27597,27598,27599,27600,27601,27602,27603,27604,27605,27606,27607,
+27608,27609,27610,27611,27612,27613,27614,27615,27616,27617,27618,27619,
+27620,27621,27622,27623,27624,27625,27626,27627,27628,27629,27630,27631,
+27632,27633,27634,27635,27636,27637,27638,27639,27640,27641,27642,27643,
+27644,27645,27646,27647,27648,27649,27650,27651,27652,27653,27654,27655,
+27656,27657,27658,27659,27660,27661,27662,27663,27664,27665,27666,27667,
+27668,27669,27670,27671,27672,27673,27674,27675,27676,27677,27678,27679,
+27680,27681,27682,27683,27684,27685,27686,27687,27688,27689,27690,27691,
+27692,27693,27694,27695,27696,27697,27698,27699,27700,27701,27702,27703,
+27704,27705,27706,27707,27708,27709,27710,27711,27712,27713,27714,27715,
+27716,27717,27718,27719,27720,27721,27722,27723,27724,27725,27726,27727,
+27728,27729,27730,27731,27732,27733,27734,27735,27736,27737,27738,27739,
+27740,27741,27742,27743,27744,27745,27746,27747,27748,27749,27750,27751,
+27752,27753,27754,27755,27756,27757,27758,27759,27760,27761,27762,27763,
+27764,27765,27766,27767,27768,27769,27770,27771,27772,27773,27774,27775,
+27776,27777,27778,27779,27780,27781,27782,27783,27784,27785,27786,27787,
+27788,27789,27790,27791,27792,27793,27794,27795,27796,27797,27798,27799,
+27800,27801,27802,27803,27804,27805,27806,27807,27808,27809,27810,27811,
+27812,27813,27814,27815,27816,27817,27818,27819,27820,27821,27822,27823,
+27824,27825,27826,27827,27828,27829,27830,27831,27832,27833,27834,27835,
+27836,27837,27838,27839,27840,27841,27842,27843,27844,27845,27846,27847,
+27848,27849,27850,27851,27852,27853,27854,27855,27856,27857,27858,27859,
+27860,27861,27862,27863,27864,27865,27866,27867,27868,27869,27870,27871,
+27872,27873,27874,27875,27876,27877,27878,27879,27880,27881,27882,27883,
+27884,27885,27886,27887,27888,27889,27890,27891,27892,27893,27894,27895,
+27896,27897,27898,27899,27900,27901,27902,27903,27904,27905,27906,27907,
+27908,27909,27910,27911,27912,27913,27914,27915,27916,27917,27918,27919,
+27920,27921,27922,27923,27924,27925,27926,27927,27928,27929,27930,27931,
+27932,27933,27934,27935,27936,27937,27938,27939,27940,27941,27942,27943,
+27944,27945,27946,27947,27948,27949,27950,27951,27952,27953,27954,27955,
+27956,27957,27958,27959,27960,27961,27962,27963,27964,27965,27966,27967,
+27968,27969,27970,27971,27972,27973,27974,27975,27976,27977,27978,27979,
+27980,27981,27982,27983,27984,27985,27986,27987,27988,27989,27990,27991,
+27992,27993,27994,27995,27996,27997,27998,27999,28000,28001,28002,28003,
+28004,28005,28006,28007,28008,28009,28010,28011,28012,28013,28014,28015,
+28016,28017,28018,28019,28020,28021,28022,28023,28024,28025,28026,28027,
+28028,28029,28030,28031,28032,28033,28034,28035,28036,28037,28038,28039,
+28040,28041,28042,28043,28044,28045,28046,28047,28048,28049,28050,28051,
+28052,28053,28054,28055,28056,28057,28058,28059,28060,28061,28062,28063,
+28064,28065,28066,28067,28068,28069,28070,28071,28072,28073,28074,28075,
+28076,28077,28078,28079,28080,28081,28082,28083,28084,28085,28086,28087,
+28088,28089,28090,28091,28092,28093,28094,28095,28096,28097,28098,28099,
+28100,28101,28102,28103,28104,28105,28106,28107,28108,28109,28110,28111,
+28112,28113,28114,28115,28116,28117,28118,28119,28120,28121,28122,28123,
+28124,28125,28126,28127,28128,28129,28130,28131,28132,28133,28134,28135,
+28136,28137,28138,28139,28140,28141,28142,28143,28144,28145,28146,28147,
+28148,28149,28150,28151,28152,28153,28154,28155,28156,28157,28158,28159,
+28160,28161,28162,28163,28164,28165,28166,28167,28168,28169,28170,28171,
+28172,28173,28174,28175,28176,28177,28178,28179,28180,28181,28182,28183,
+28184,28185,28186,28187,28188,28189,28190,28191,28192,28193,28194,28195,
+28196,28197,28198,28199,28200,28201,28202,28203,28204,28205,28206,28207,
+28208,28209,28210,28211,28212,28213,28214,28215,28216,28217,28218,28219,
+28220,28221,28222,28223,28224,28225,28226,28227,28228,28229,28230,28231,
+28232,28233,28234,28235,28236,28237,28238,28239,28240,28241,28242,28243,
+28244,28245,28246,28247,28248,28249,28250,28251,28252,28253,28254,28255,
+28256,28257,28258,28259,28260,28261,28262,28263,28264,28265,28266,28267,
+28268,28269,28270,28271,28272,28273,28274,28275,28276,28277,28278,28279,
+28280,28281,28282,28283,28284,28285,28286,28287,28288,28289,28290,28291,
+28292,28293,28294,28295,28296,28297,28298,28299,28300,28301,28302,28303,
+28304,28305,28306,28307,28308,28309,28310,28311,28312,28313,28314,28315,
+28316,28317,28318,28319,28320,28321,28322,28323,28324,28325,28326,28327,
+28328,28329,28330,28331,28332,28333,28334,28335,28336,28337,28338,28339,
+28340,28341,28342,28343,28344,28345,28346,28347,28348,28349,28350,28351,
+28352,28353,28354,28355,28356,28357,28358,28359,28360,28361,28362,28363,
+28364,28365,28366,28367,28368,28369,28370,28371,28372,28373,28374,28375,
+28376,28377,28378,28379,28380,28381,28382,28383,28384,28385,28386,28387,
+28388,28389,28390,28391,28392,28393,28394,28395,28396,28397,28398,28399,
+28400,28401,28402,28403,28404,28405,28406,28407,28408,28409,28410,28411,
+28412,28413,28414,28415,28416,28417,28418,28419,28420,28421,28422,28423,
+28424,28425,28426,28427,28428,28429,28430,28431,28432,28433,28434,28435,
+28436,28437,28438,28439,28440,28441,28442,28443,28444,28445,28446,28447,
+28448,28449,28450,28451,28452,28453,28454,28455,28456,28457,28458,28459,
+28460,28461,28462,28463,28464,28465,28466,28467,28468,28469,28470,28471,
+28472,28473,28474,28475,28476,28477,28478,28479,28480,28481,28482,28483,
+28484,28485,28486,28487,28488,28489,28490,28491,28492,28493,28494,28495,
+28496,28497,28498,28499,28500,28501,28502,28503,28504,28505,28506,28507,
+28508,28509,28510,28511,28512,28513,28514,28515,28516,28517,28518,28519,
+28520,28521,28522,28523,28524,28525,28526,28527,28528,28529,28530,28531,
+28532,28533,28534,28535,28536,28537,28538,28539,28540,28541,28542,28543,
+28544,28545,28546,28547,28548,28549,28550,28551,28552,28553,28554,28555,
+28556,28557,28558,28559,28560,28561,28562,28563,28564,28565,28566,28567,
+28568,28569,28570,28571,28572,28573,28574,28575,28576,28577,28578,28579,
+28580,28581,28582,28583,28584,28585,28586,28587,28588,28589,28590,28591,
+28592,28593,28594,28595,28596,28597,28598,28599,28600,28601,28602,28603,
+28604,28605,28606,28607,28608,28609,28610,28611,28612,28613,28614,28615,
+28616,28617,28618,28619,28620,28621,28622,28623,28624,28625,28626,28627,
+28628,28629,28630,28631,28632,28633,28634,28635,28636,28637,28638,28639,
+28640,28641,28642,28643,28644,28645,28646,28647,28648,28649,28650,28651,
+28652,28653,28654,28655,28656,28657,28658,28659,28660,28661,28662,28663,
+28664,28665,28666,28667,28668,28669,28670,28671,28672,28673,28674,28675,
+28676,28677,28678,28679,28680,28681,28682,28683,28684,28685,28686,28687,
+28688,28689,28690,28691,28692,28693,28694,28695,28696,28697,28698,28699,
+28700,28701,28702,28703,28704,28705,28706,28707,28708,28709,28710,28711,
+28712,28713,28714,28715,28716,28717,28718,28719,28720,28721,28722,28723,
+28724,28725,28726,28727,28728,28729,28730,28731,28732,28733,28734,28735,
+28736,28737,28738,28739,28740,28741,28742,28743,28744,28745,28746,28747,
+28748,28749,28750,28751,28752,28753,28754,28755,28756,28757,28758,28759,
+28760,28761,28762,28763,28764,28765,28766,28767,28768,28769,28770,28771,
+28772,28773,28774,28775,28776,28777,28778,28779,28780,28781,28782,28783,
+28784,28785,28786,28787,28788,28789,28790,28791,28792,28793,28794,28795,
+28796,28797,28798,28799,28800,28801,28802,28803,28804,28805,28806,28807,
+28808,28809,28810,28811,28812,28813,28814,28815,28816,28817,28818,28819,
+28820,28821,28822,28823,28824,28825,28826,28827,28828,28829,28830,28831,
+28832,28833,28834,28835,28836,28837,28838,28839,28840,28841,28842,28843,
+28844,28845,28846,28847,28848,28849,28850,28851,28852,28853,28854,28855,
+28856,28857,28858,28859,28860,28861,28862,28863,28864,28865,28866,28867,
+28868,28869,28870,28871,28872,28873,28874,28875,28876,28877,28878,28879,
+28880,28881,28882,28883,28884,28885,28886,28887,28888,28889,28890,28891,
+28892,28893,28894,28895,28896,28897,28898,28899,28900,28901,28902,28903,
+28904,28905,28906,28907,28908,28909,28910,28911,28912,28913,28914,28915,
+28916,28917,28918,28919,28920,28921,28922,28923,28924,28925,28926,28927,
+28928,28929,28930,28931,28932,28933,28934,28935,28936,28937,28938,28939,
+28940,28941,28942,28943,28944,28945,28946,28947,28948,28949,28950,28951,
+28952,28953,28954,28955,28956,28957,28958,28959,28960,28961,28962,28963,
+28964,28965,28966,28967,28968,28969,28970,28971,28972,28973,28974,28975,
+28976,28977,28978,28979,28980,28981,28982,28983,28984,28985,28986,28987,
+28988,28989,28990,28991,28992,28993,28994,28995,28996,28997,28998,28999,
+29000,29001,29002,29003,29004,29005,29006,29007,29008,29009,29010,29011,
+29012,29013,29014,29015,29016,29017,29018,29019,29020,29021,29022,29023,
+29024,29025,29026,29027,29028,29029,29030,29031,29032,29033,29034,29035,
+29036,29037,29038,29039,29040,29041,29042,29043,29044,29045,29046,29047,
+29048,29049,29050,29051,29052,29053,29054,29055,29056,29057,29058,29059,
+29060,29061,29062,29063,29064,29065,29066,29067,29068,29069,29070,29071,
+29072,29073,29074,29075,29076,29077,29078,29079,29080,29081,29082,29083,
+29084,29085,29086,29087,29088,29089,29090,29091,29092,29093,29094,29095,
+29096,29097,29098,29099,29100,29101,29102,29103,29104,29105,29106,29107,
+29108,29109,29110,29111,29112,29113,29114,29115,29116,29117,29118,29119,
+29120,29121,29122,29123,29124,29125,29126,29127,29128,29129,29130,29131,
+29132,29133,29134,29135,29136,29137,29138,29139,29140,29141,29142,29143,
+29144,29145,29146,29147,29148,29149,29150,29151,29152,29153,29154,29155,
+29156,29157,29158,29159,29160,29161,29162,29163,29164,29165,29166,29167,
+29168,29169,29170,29171,29172,29173,29174,29175,29176,29177,29178,29179,
+29180,29181,29182,29183,29184,29185,29186,29187,29188,29189,29190,29191,
+29192,29193,29194,29195,29196,29197,29198,29199,29200,29201,29202,29203,
+29204,29205,29206,29207,29208,29209,29210,29211,29212,29213,29214,29215,
+29216,29217,29218,29219,29220,29221,29222,29223,29224,29225,29226,29227,
+29228,29229,29230,29231,29232,29233,29234,29235,29236,29237,29238,29239,
+29240,29241,29242,29243,29244,29245,29246,29247,29248,29249,29250,29251,
+29252,29253,29254,29255,29256,29257,29258,29259,29260,29261,29262,29263,
+29264,29265,29266,29267,29268,29269,29270,29271,29272,29273,29274,29275,
+29276,29277,29278,29279,29280,29281,29282,29283,29284,29285,29286,29287,
+29288,29289,29290,29291,29292,29293,29294,29295,29296,29297,29298,29299,
+29300,29301,29302,29303,29304,29305,29306,29307,29308,29309,29310,29311,
+29312,29313,29314,29315,29316,29317,29318,29319,29320,29321,29322,29323,
+29324,29325,29326,29327,29328,29329,29330,29331,29332,29333,29334,29335,
+29336,29337,29338,29339,29340,29341,29342,29343,29344,29345,29346,29347,
+29348,29349,29350,29351,29352,29353,29354,29355,29356,29357,29358,29359,
+29360,29361,29362,29363,29364,29365,29366,29367,29368,29369,29370,29371,
+29372,29373,29374,29375,29376,29377,29378,29379,29380,29381,29382,29383,
+29384,29385,29386,29387,29388,29389,29390,29391,29392,29393,29394,29395,
+29396,29397,29398,29399,29400,29401,29402,29403,29404,29405,29406,29407,
+29408,29409,29410,29411,29412,29413,29414,29415,29416,29417,29418,29419,
+29420,29421,29422,29423,29424,29425,29426,29427,29428,29429,29430,29431,
+29432,29433,29434,29435,29436,29437,29438,29439,29440,29441,29442,29443,
+29444,29445,29446,29447,29448,29449,29450,29451,29452,29453,29454,29455,
+29456,29457,29458,29459,29460,29461,29462,29463,29464,29465,29466,29467,
+29468,29469,29470,29471,29472,29473,29474,29475,29476,29477,29478,29479,
+29480,29481,29482,29483,29484,29485,29486,29487,29488,29489,29490,29491,
+29492,29493,29494,29495,29496,29497,29498,29499,29500,29501,29502,29503,
+29504,29505,29506,29507,29508,29509,29510,29511,29512,29513,29514,29515,
+29516,29517,29518,29519,29520,29521,29522,29523,29524,29525,29526,29527,
+29528,29529,29530,29531,29532,29533,29534,29535,29536,29537,29538,29539,
+29540,29541,29542,29543,29544,29545,29546,29547,29548,29549,29550,29551,
+29552,29553,29554,29555,29556,29557,29558,29559,29560,29561,29562,29563,
+29564,29565,29566,29567,29568,29569,29570,29571,29572,29573,29574,29575,
+29576,29577,29578,29579,29580,29581,29582,29583,29584,29585,29586,29587,
+29588,29589,29590,29591,29592,29593,29594,29595,29596,29597,29598,29599,
+29600,29601,29602,29603,29604,29605,29606,29607,29608,29609,29610,29611,
+29612,29613,29614,29615,29616,29617,29618,29619,29620,29621,29622,29623,
+29624,29625,29626,29627,29628,29629,29630,29631,29632,29633,29634,29635,
+29636,29637,29638,29639,29640,29641,29642,29643,29644,29645,29646,29647,
+29648,29649,29650,29651,29652,29653,29654,29655,29656,29657,29658,29659,
+29660,29661,29662,29663,29664,29665,29666,29667,29668,29669,29670,29671,
+29672,29673,29674,29675,29676,29677,29678,29679,29680,29681,29682,29683,
+29684,29685,29686,29687,29688,29689,29690,29691,29692,29693,29694,29695,
+29696,29697,29698,29699,29700,29701,29702,29703,29704,29705,29706,29707,
+29708,29709,29710,29711,29712,29713,29714,29715,29716,29717,29718,29719,
+29720,29721,29722,29723,29724,29725,29726,29727,29728,29729,29730,29731,
+29732,29733,29734,29735,29736,29737,29738,29739,29740,29741,29742,29743,
+29744,29745,29746,29747,29748,29749,29750,29751,29752,29753,29754,29755,
+29756,29757,29758,29759,29760,29761,29762,29763,29764,29765,29766,29767,
+29768,29769,29770,29771,29772,29773,29774,29775,29776,29777,29778,29779,
+29780,29781,29782,29783,29784,29785,29786,29787,29788,29789,29790,29791,
+29792,29793,29794,29795,29796,29797,29798,29799,29800,29801,29802,29803,
+29804,29805,29806,29807,29808,29809,29810,29811,29812,29813,29814,29815,
+29816,29817,29818,29819,29820,29821,29822,29823,29824,29825,29826,29827,
+29828,29829,29830,29831,29832,29833,29834,29835,29836,29837,29838,29839,
+29840,29841,29842,29843,29844,29845,29846,29847,29848,29849,29850,29851,
+29852,29853,29854,29855,29856,29857,29858,29859,29860,29861,29862,29863,
+29864,29865,29866,29867,29868,29869,29870,29871,29872,29873,29874,29875,
+29876,29877,29878,29879,29880,29881,29882,29883,29884,29885,29886,29887,
+29888,29889,29890,29891,29892,29893,29894,29895,29896,29897,29898,29899,
+29900,29901,29902,29903,29904,29905,29906,29907,29908,29909,29910,29911,
+29912,29913,29914,29915,29916,29917,29918,29919,29920,29921,29922,29923,
+29924,29925,29926,29927,29928,29929,29930,29931,29932,29933,29934,29935,
+29936,29937,29938,29939,29940,29941,29942,29943,29944,29945,29946,29947,
+29948,29949,29950,29951,29952,29953,29954,29955,29956,29957,29958,29959,
+29960,29961,29962,29963,29964,29965,29966,29967,29968,29969,29970,29971,
+29972,29973,29974,29975,29976,29977,29978,29979,29980,29981,29982,29983,
+29984,29985,29986,29987,29988,29989,29990,29991,29992,29993,29994,29995,
+29996,29997,29998,29999,30000,30001,30002,30003,30004,30005,30006,30007,
+30008,30009,30010,30011,30012,30013,30014,30015,30016,30017,30018,30019,
+30020,30021,30022,30023,30024,30025,30026,30027,30028,30029,30030,30031,
+30032,30033,30034,30035,30036,30037,30038,30039,30040,30041,30042,30043,
+30044,30045,30046,30047,30048,30049,30050,30051,30052,30053,30054,30055,
+30056,30057,30058,30059,30060,30061,30062,30063,30064,30065,30066,30067,
+30068,30069,30070,30071,30072,30073,30074,30075,30076,30077,30078,30079,
+30080,30081,30082,30083,30084,30085,30086,30087,30088,30089,30090,30091,
+30092,30093,30094,30095,30096,30097,30098,30099,30100,30101,30102,30103,
+30104,30105,30106,30107,30108,30109,30110,30111,30112,30113,30114,30115,
+30116,30117,30118,30119,30120,30121,30122,30123,30124,30125,30126,30127,
+30128,30129,30130,30131,30132,30133,30134,30135,30136,30137,30138,30139,
+30140,30141,30142,30143,30144,30145,30146,30147,30148,30149,30150,30151,
+30152,30153,30154,30155,30156,30157,30158,30159,30160,30161,30162,30163,
+30164,30165,30166,30167,30168,30169,30170,30171,30172,30173,30174,30175,
+30176,30177,30178,30179,30180,30181,30182,30183,30184,30185,30186,30187,
+30188,30189,30190,30191,30192,30193,30194,30195,30196,30197,30198,30199,
+30200,30201,30202,30203,30204,30205,30206,30207,30208,30209,30210,30211,
+30212,30213,30214,30215,30216,30217,30218,30219,30220,30221,30222,30223,
+30224,30225,30226,30227,30228,30229,30230,30231,30232,30233,30234,30235,
+30236,30237,30238,30239,30240,30241,30242,30243,30244,30245,30246,30247,
+30248,30249,30250,30251,30252,30253,30254,30255,30256,30257,30258,30259,
+30260,30261,30262,30263,30264,30265,30266,30267,30268,30269,30270,30271,
+30272,30273,30274,30275,30276,30277,30278,30279,30280,30281,30282,30283,
+30284,30285,30286,30287,30288,30289,30290,30291,30292,30293,30294,30295,
+30296,30297,30298,30299,30300,30301,30302,30303,30304,30305,30306,30307,
+30308,30309,30310,30311,30312,30313,30314,30315,30316,30317,30318,30319,
+30320,30321,30322,30323,30324,30325,30326,30327,30328,30329,30330,30331,
+30332,30333,30334,30335,30336,30337,30338,30339,30340,30341,30342,30343,
+30344,30345,30346,30347,30348,30349,30350,30351,30352,30353,30354,30355,
+30356,30357,30358,30359,30360,30361,30362,30363,30364,30365,30366,30367,
+30368,30369,30370,30371,30372,30373,30374,30375,30376,30377,30378,30379,
+30380,30381,30382,30383,30384,30385,30386,30387,30388,30389,30390,30391,
+30392,30393,30394,30395,30396,30397,30398,30399,30400,30401,30402,30403,
+30404,30405,30406,30407,30408,30409,30410,30411,30412,30413,30414,30415,
+30416,30417,30418,30419,30420,30421,30422,30423,30424,30425,30426,30427,
+30428,30429,30430,30431,30432,30433,30434,30435,30436,30437,30438,30439,
+30440,30441,30442,30443,30444,30445,30446,30447,30448,30449,30450,30451,
+30452,30453,30454,30455,30456,30457,30458,30459,30460,30461,30462,30463,
+30464,30465,30466,30467,30468,30469,30470,30471,30472,30473,30474,30475,
+30476,30477,30478,30479,30480,30481,30482,30483,30484,30485,30486,30487,
+30488,30489,30490,30491,30492,30493,30494,30495,30496,30497,30498,30499,
+30500,30501,30502,30503,30504,30505,30506,30507,30508,30509,30510,30511,
+30512,30513,30514,30515,30516,30517,30518,30519,30520,30521,30522,30523,
+30524,30525,30526,30527,30528,30529,30530,30531,30532,30533,30534,30535,
+30536,30537,30538,30539,30540,30541,30542,30543,30544,30545,30546,30547,
+30548,30549,30550,30551,30552,30553,30554,30555,30556,30557,30558,30559,
+30560,30561,30562,30563,30564,30565,30566,30567,30568,30569,30570,30571,
+30572,30573,30574,30575,30576,30577,30578,30579,30580,30581,30582,30583,
+30584,30585,30586,30587,30588,30589,30590,30591,30592,30593,30594,30595,
+30596,30597,30598,30599,30600,30601,30602,30603,30604,30605,30606,30607,
+30608,30609,30610,30611,30612,30613,30614,30615,30616,30617,30618,30619,
+30620,30621,30622,30623,30624,30625,30626,30627,30628,30629,30630,30631,
+30632,30633,30634,30635,30636,30637,30638,30639,30640,30641,30642,30643,
+30644,30645,30646,30647,30648,30649,30650,30651,30652,30653,30654,30655,
+30656,30657,30658,30659,30660,30661,30662,30663,30664,30665,30666,30667,
+30668,30669,30670,30671,30672,30673,30674,30675,30676,30677,30678,30679,
+30680,30681,30682,30683,30684,30685,30686,30687,30688,30689,30690,30691,
+30692,30693,30694,30695,30696,30697,30698,30699,30700,30701,30702,30703,
+30704,30705,30706,30707,30708,30709,30710,30711,30712,30713,30714,30715,
+30716,30717,30718,30719,30720,30721,30722,30723,30724,30725,30726,30727,
+30728,30729,30730,30731,30732,30733,30734,30735,30736,30737,30738,30739,
+30740,30741,30742,30743,30744,30745,30746,30747,30748,30749,30750,30751,
+30752,30753,30754,30755,30756,30757,30758,30759,30760,30761,30762,30763,
+30764,30765,30766,30767,30768,30769,30770,30771,30772,30773,30774,30775,
+30776,30777,30778,30779,30780,30781,30782,30783,30784,30785,30786,30787,
+30788,30789,30790,30791,30792,30793,30794,30795,30796,30797,30798,30799,
+30800,30801,30802,30803,30804,30805,30806,30807,30808,30809,30810,30811,
+30812,30813,30814,30815,30816,30817,30818,30819,30820,30821,30822,30823,
+30824,30825,30826,30827,30828,30829,30830,30831,30832,30833,30834,30835,
+30836,30837,30838,30839,30840,30841,30842,30843,30844,30845,30846,30847,
+30848,30849,30850,30851,30852,30853,30854,30855,30856,30857,30858,30859,
+30860,30861,30862,30863,30864,30865,30866,30867,30868,30869,30870,30871,
+30872,30873,30874,30875,30876,30877,30878,30879,30880,30881,30882,30883,
+30884,30885,30886,30887,30888,30889,30890,30891,30892,30893,30894,30895,
+30896,30897,30898,30899,30900,30901,30902,30903,30904,30905,30906,30907,
+30908,30909,30910,30911,30912,30913,30914,30915,30916,30917,30918,30919,
+30920,30921,30922,30923,30924,30925,30926,30927,30928,30929,30930,30931,
+30932,30933,30934,30935,30936,30937,30938,30939,30940,30941,30942,30943,
+30944,30945,30946,30947,30948,30949,30950,30951,30952,30953,30954,30955,
+30956,30957,30958,30959,30960,30961,30962,30963,30964,30965,30966,30967,
+30968,30969,30970,30971,30972,30973,30974,30975,30976,30977,30978,30979,
+30980,30981,30982,30983,30984,30985,30986,30987,30988,30989,30990,30991,
+30992,30993,30994,30995,30996,30997,30998,30999,31000,31001,31002,31003,
+31004,31005,31006,31007,31008,31009,31010,31011,31012,31013,31014,31015,
+31016,31017,31018,31019,31020,31021,31022,31023,31024,31025,31026,31027,
+31028,31029,31030,31031,31032,31033,31034,31035,31036,31037,31038,31039,
+31040,31041,31042,31043,31044,31045,31046,31047,31048,31049,31050,31051,
+31052,31053,31054,31055,31056,31057,31058,31059,31060,31061,31062,31063,
+31064,31065,31066,31067,31068,31069,31070,31071,31072,31073,31074,31075,
+31076,31077,31078,31079,31080,31081,31082,31083,31084,31085,31086,31087,
+31088,31089,31090,31091,31092,31093,31094,31095,31096,31097,31098,31099,
+31100,31101,31102,31103,31104,31105,31106,31107,31108,31109,31110,31111,
+31112,31113,31114,31115,31116,31117,31118,31119,31120,31121,31122,31123,
+31124,31125,31126,31127,31128,31129,31130,31131,31132,31133,31134,31135,
+31136,31137,31138,31139,31140,31141,31142,31143,31144,31145,31146,31147,
+31148,31149,31150,31151,31152,31153,31154,31155,31156,31157,31158,31159,
+31160,31161,31162,31163,31164,31165,31166,31167,31168,31169,31170,31171,
+31172,31173,31174,31175,31176,31177,31178,31179,31180,31181,31182,31183,
+31184,31185,31186,31187,31188,31189,31190,31191,31192,31193,31194,31195,
+31196,31197,31198,31199,31200,31201,31202,31203,31204,31205,31206,31207,
+31208,31209,31210,31211,31212,31213,31214,31215,31216,31217,31218,31219,
+31220,31221,31222,31223,31224,31225,31226,31227,31228,31229,31230,31231,
+31232,31233,31234,31235,31236,31237,31238,31239,31240,31241,31242,31243,
+31244,31245,31246,31247,31248,31249,31250,31251,31252,31253,31254,31255,
+31256,31257,31258,31259,31260,31261,31262,31263,31264,31265,31266,31267,
+31268,31269,31270,31271,31272,31273,31274,31275,31276,31277,31278,31279,
+31280,31281,31282,31283,31284,31285,31286,31287,31288,31289,31290,31291,
+31292,31293,31294,31295,31296,31297,31298,31299,31300,31301,31302,31303,
+31304,31305,31306,31307,31308,31309,31310,31311,31312,31313,31314,31315,
+31316,31317,31318,31319,31320,31321,31322,31323,31324,31325,31326,31327,
+31328,31329,31330,31331,31332,31333,31334,31335,31336,31337,31338,31339,
+31340,31341,31342,31343,31344,31345,31346,31347,31348,31349,31350,31351,
+31352,31353,31354,31355,31356,31357,31358,31359,31360,31361,31362,31363,
+31364,31365,31366,31367,31368,31369,31370,31371,31372,31373,31374,31375,
+31376,31377,31378,31379,31380,31381,31382,31383,31384,31385,31386,31387,
+31388,31389,31390,31391,31392,31393,31394,31395,31396,31397,31398,31399,
+31400,31401,31402,31403,31404,31405,31406,31407,31408,31409,31410,31411,
+31412,31413,31414,31415,31416,31417,31418,31419,31420,31421,31422,31423,
+31424,31425,31426,31427,31428,31429,31430,31431,31432,31433,31434,31435,
+31436,31437,31438,31439,31440,31441,31442,31443,31444,31445,31446,31447,
+31448,31449,31450,31451,31452,31453,31454,31455,31456,31457,31458,31459,
+31460,31461,31462,31463,31464,31465,31466,31467,31468,31469,31470,31471,
+31472,31473,31474,31475,31476,31477,31478,31479,31480,31481,31482,31483,
+31484,31485,31486,31487,31488,31489,31490,31491,31492,31493,31494,31495,
+31496,31497,31498,31499,31500,31501,31502,31503,31504,31505,31506,31507,
+31508,31509,31510,31511,31512,31513,31514,31515,31516,31517,31518,31519,
+31520,31521,31522,31523,31524,31525,31526,31527,31528,31529,31530,31531,
+31532,31533,31534,31535,31536,31537,31538,31539,31540,31541,31542,31543,
+31544,31545,31546,31547,31548,31549,31550,31551,31552,31553,31554,31555,
+31556,31557,31558,31559,31560,31561,31562,31563,31564,31565,31566,31567,
+31568,31569,31570,31571,31572,31573,31574,31575,31576,31577,31578,31579,
+31580,31581,31582,31583,31584,31585,31586,31587,31588,31589,31590,31591,
+31592,31593,31594,31595,31596,31597,31598,31599,31600,31601,31602,31603,
+31604,31605,31606,31607,31608,31609,31610,31611,31612,31613,31614,31615,
+31616,31617,31618,31619,31620,31621,31622,31623,31624,31625,31626,31627,
+31628,31629,31630,31631,31632,31633,31634,31635,31636,31637,31638,31639,
+31640,31641,31642,31643,31644,31645,31646,31647,31648,31649,31650,31651,
+31652,31653,31654,31655,31656,31657,31658,31659,31660,31661,31662,31663,
+31664,31665,31666,31667,31668,31669,31670,31671,31672,31673,31674,31675,
+31676,31677,31678,31679,31680,31681,31682,31683,31684,31685,31686,31687,
+31688,31689,31690,31691,31692,31693,31694,31695,31696,31697,31698,31699,
+31700,31701,31702,31703,31704,31705,31706,31707,31708,31709,31710,31711,
+31712,31713,31714,31715,31716,31717,31718,31719,31720,31721,31722,31723,
+31724,31725,31726,31727,31728,31729,31730,31731,31732,31733,31734,31735,
+31736,31737,31738,31739,31740,31741,31742,31743,31744,31745,31746,31747,
+31748,31749,31750,31751,31752,31753,31754,31755,31756,31757,31758,31759,
+31760,31761,31762,31763,31764,31765,31766,31767,31768,31769,31770,31771,
+31772,31773,31774,31775,31776,31777,31778,31779,31780,31781,31782,31783,
+31784,31785,31786,31787,31788,31789,31790,31791,31792,31793,31794,31795,
+31796,31797,31798,31799,31800,31801,31802,31803,31804,31805,31806,31807,
+31808,31809,31810,31811,31812,31813,31814,31815,31816,31817,31818,31819,
+31820,31821,31822,31823,31824,31825,31826,31827,31828,31829,31830,31831,
+31832,31833,31834,31835,31836,31837,31838,31839,31840,31841,31842,31843,
+31844,31845,31846,31847,31848,31849,31850,31851,31852,31853,31854,31855,
+31856,31857,31858,31859,31860,31861,31862,31863,31864,31865,31866,31867,
+31868,31869,31870,31871,31872,31873,31874,31875,31876,31877,31878,31879,
+31880,31881,31882,31883,31884,31885,31886,31887,31888,31889,31890,31891,
+31892,31893,31894,31895,31896,31897,31898,31899,31900,31901,31902,31903,
+31904,31905,31906,31907,31908,31909,31910,31911,31912,31913,31914,31915,
+31916,31917,31918,31919,31920,31921,31922,31923,31924,31925,31926,31927,
+31928,31929,31930,31931,31932,31933,31934,31935,31936,31937,31938,31939,
+31940,31941,31942,31943,31944,31945,31946,31947,31948,31949,31950,31951,
+31952,31953,31954,31955,31956,31957,31958,31959,31960,31961,31962,31963,
+31964,31965,31966,31967,31968,31969,31970,31971,31972,31973,31974,31975,
+31976,31977,31978,31979,31980,31981,31982,31983,31984,31985,31986,31987,
+31988,31989,31990,31991,31992,31993,31994,31995,31996,31997,31998,31999,
+32000,32001,32002,32003,32004,32005,32006,32007,32008,32009,32010,32011,
+32012,32013,32014,32015,32016,32017,32018,32019,32020,32021,32022,32023,
+32024,32025,32026,32027,32028,32029,32030,32031,32032,32033,32034,32035,
+32036,32037,32038,32039,32040,32041,32042,32043,32044,32045,32046,32047,
+32048,32049,32050,32051,32052,32053,32054,32055,32056,32057,32058,32059,
+32060,32061,32062,32063,32064,32065,32066,32067,32068,32069,32070,32071,
+32072,32073,32074,32075,32076,32077,32078,32079,32080,32081,32082,32083,
+32084,32085,32086,32087,32088,32089,32090,32091,32092,32093,32094,32095,
+32096,32097,32098,32099,32100,32101,32102,32103,32104,32105,32106,32107,
+32108,32109,32110,32111,32112,32113,32114,32115,32116,32117,32118,32119,
+32120,32121,32122,32123,32124,32125,32126,32127,32128,32129,32130,32131,
+32132,32133,32134,32135,32136,32137,32138,32139,32140,32141,32142,32143,
+32144,32145,32146,32147,32148,32149,32150,32151,32152,32153,32154,32155,
+32156,32157,32158,32159,32160,32161,32162,32163,32164,32165,32166,32167,
+32168,32169,32170,32171,32172,32173,32174,32175,32176,32177,32178,32179,
+32180,32181,32182,32183,32184,32185,32186,32187,32188,32189,32190,32191,
+32192,32193,32194,32195,32196,32197,32198,32199,32200,32201,32202,32203,
+32204,32205,32206,32207,32208,32209,32210,32211,32212,32213,32214,32215,
+32216,32217,32218,32219,32220,32221,32222,32223,32224,32225,32226,32227,
+32228,32229,32230,32231,32232,32233,32234,32235,32236,32237,32238,32239,
+32240,32241,32242,32243,32244,32245,32246,32247,32248,32249,32250,32251,
+32252,32253,32254,32255,32256,32257,32258,32259,32260,32261,32262,32263,
+32264,32265,32266,32267,32268,32269,32270,32271,32272,32273,32274,32275,
+32276,32277,32278,32279,32280,32281,32282,32283,32284,32285,32286,32287,
+32288,32289,32290,32291,32292,32293,32294,32295,32296,32297,32298,32299,
+32300,32301,32302,32303,32304,32305,32306,32307,32308,32309,32310,32311,
+32312,32313,32314,32315,32316,32317,32318,32319,32320,32321,32322,32323,
+32324,32325,32326,32327,32328,32329,32330,32331,32332,32333,32334,32335,
+32336,32337,32338,32339,32340,32341,32342,32343,32344,32345,32346,32347,
+32348,32349,32350,32351,32352,32353,32354,32355,32356,32357,32358,32359,
+32360,32361,32362,32363,32364,32365,32366,32367,32368,32369,32370,32371,
+32372,32373,32374,32375,32376,32377,32378,32379,32380,32381,32382,32383,
+32384,32385,32386,32387,32388,32389,32390,32391,32392,32393,32394,32395,
+32396,32397,32398,32399,32400,32401,32402,32403,32404,32405,32406,32407,
+32408,32409,32410,32411,32412,32413,32414,32415,32416,32417,32418,32419,
+32420,32421,32422,32423,32424,32425,32426,32427,32428,32429,32430,32431,
+32432,32433,32434,32435,32436,32437,32438,32439,32440,32441,32442,32443,
+32444,32445,32446,32447,32448,32449,32450,32451,32452,32453,32454,32455,
+32456,32457,32458,32459,32460,32461,32462,32463,32464,32465,32466,32467,
+32468,32469,32470,32471,32472,32473,32474,32475,32476,32477,32478,32479,
+32480,32481,32482,32483,32484,32485,32486,32487,32488,32489,32490,32491,
+32492,32493,32494,32495,32496,32497,32498,32499,32500,32501,32502,32503,
+32504,32505,32506,32507,32508,32509,32510,32511,32512,32513,32514,32515,
+32516,32517,32518,32519,32520,32521,32522,32523,32524,32525,32526,32527,
+32528,32529,32530,32531,32532,32533,32534,32535,32536,32537,32538,32539,
+32540,32541,32542,32543,32544,32545,32546,32547,32548,32549,32550,32551,
+32552,32553,32554,32555,32556,32557,32558,32559,32560,32561,32562,32563,
+32564,32565,32566,32567,32568,32569,32570,32571,32572,32573,32574,32575,
+32576,32577,32578,32579,32580,32581,32582,32583,32584,32585,32586,32587,
+32588,32589,32590,32591,32592,32593,32594,32595,32596,32597,32598,32599,
+32600,32601,32602,32603,32604,32605,32606,32607,32608,32609,32610,32611,
+32612,32613,32614,32615,32616,32617,32618,32619,32620,32621,32622,32623,
+32624,32625,32626,32627,32628,32629,32630,32631,32632,32633,32634,32635,
+32636,32637,32638,32639,32640,32641,32642,32643,32644,32645,32646,32647,
+32648,32649,32650,32651,32652,32653,32654,32655,32656,32657,32658,32659,
+32660,32661,32662,32663,32664,32665,32666,32667,32668,32669,32670,32671,
+32672,32673,32674,32675,32676,32677,32678,32679,32680,32681,32682,32683,
+32684,32685,32686,32687,32688,32689,32690,32691,32692,32693,32694,32695,
+32696,32697,32698,32699,32700,32701,32702,32703,32704,32705,32706,32707,
+32708,32709,32710,32711,32712,32713,32714,32715,32716,32717,32718,32719,
+32720,32721,32722,32723,32724,32725,32726,32727,32728,32729,32730,32731,
+32732,32733,32734,32735,32736,32737,32738,32739,32740,32741,32742,32743,
+32744,32745,32746,32747,32748,32749,32750,32751,32752,32753,32754,32755,
+32756,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,
+32768L,32769L,32770L,32771L,32772L,32773L,32774L,32775L,32776L,32777L,
+32778L,32779L,32780L,32781L,32782L,32783L,32784L,32785L,32786L,32787L,
+32788L,32789L,32790L,32791L,32792L,32793L,32794L,32795L,32796L,32797L,
+32798L,32799L,32800L,32801L,32802L,32803L,32804L,32805L,32806L,32807L,
+32808L,32809L,32810L,32811L,32812L,32813L,32814L,32815L,32816L,32817L,
+32818L,32819L,32820L,32821L,32822L,32823L,32824L,32825L,32826L,32827L,
+32828L,32829L,32830L,32831L,32832L,32833L,32834L,32835L,32836L,32837L,
+32838L,32839L,32840L,32841L,32842L,32843L,32844L,32845L,32846L,32847L,
+32848L,32849L,32850L,32851L,32852L,32853L,32854L,32855L,32856L,32857L,
+32858L,32859L,32860L,32861L,32862L,32863L,32864L,32865L,32866L,32867L,
+32868L,32869L,32870L,32871L,32872L,32873L,32874L,32875L,32876L,32877L,
+32878L,32879L,32880L,32881L,32882L,32883L,32884L,32885L,32886L,32887L,
+32888L,32889L,32890L,32891L,32892L,32893L,32894L,32895L,32896L,32897L,
+32898L,32899L,32900L,32901L,32902L,32903L,32904L,32905L,32906L,32907L,
+32908L,32909L,32910L,32911L,32912L,32913L,32914L,32915L,32916L,32917L,
+32918L,32919L,32920L,32921L,32922L,32923L,32924L,32925L,32926L,32927L,
+32928L,32929L,32930L,32931L,32932L,32933L,32934L,32935L,32936L,32937L,
+32938L,32939L,32940L,32941L,32942L,32943L,32944L,32945L,32946L,32947L,
+32948L,32949L,32950L,32951L,32952L,32953L,32954L,32955L,32956L,32957L,
+32958L,32959L,32960L,32961L,32962L,32963L,32964L,32965L,32966L,32967L,
+32968L,32969L,32970L,32971L,32972L,32973L,32974L,32975L,32976L,32977L,
+32978L,32979L,32980L,32981L,32982L,32983L,32984L,32985L,32986L,32987L,
+32988L,32989L,32990L,32991L,32992L,32993L,32994L,32995L,32996L,32997L,
+32998L,32999L,33000L,33001L,33002L,33003L,33004L,33005L,33006L,33007L,
+33008L,33009L,33010L,33011L,33012L,33013L,33014L,33015L,33016L,33017L,
+33018L,33019L,33020L,33021L,33022L,33023L,33024L,33025L,33026L,33027L,
+33028L,33029L,33030L,33031L,33032L,33033L,33034L,33035L,33036L,33037L,
+33038L,33039L,33040L,33041L,33042L,33043L,33044L,33045L,33046L,33047L,
+33048L,33049L,33050L,33051L,33052L,33053L,33054L,33055L,33056L,33057L,
+33058L,33059L,33060L,33061L,33062L,33063L,33064L,33065L,33066L,33067L,
+33068L,33069L,33070L,33071L,33072L,33073L,33074L,33075L,33076L,33077L,
+33078L,33079L,33080L,33081L,33082L,33083L,33084L,33085L,33086L,33087L,
+33088L,33089L,33090L,33091L,33092L,33093L,33094L,33095L,33096L,33097L,
+33098L,33099L,33100L,33101L,33102L,33103L,33104L,33105L,33106L,33107L,
+33108L,33109L,33110L,33111L,33112L,33113L,33114L,33115L,33116L,33117L,
+33118L,33119L,33120L,33121L,33122L,33123L,33124L,33125L,33126L,33127L,
+33128L,33129L,33130L,33131L,33132L,33133L,33134L,33135L,33136L,33137L,
+33138L,33139L,33140L,33141L,33142L,33143L,33144L,33145L,33146L,33147L,
+33148L,33149L,33150L,33151L,33152L,33153L,33154L,33155L,33156L,33157L,
+33158L,33159L,33160L,33161L,33162L,33163L,33164L,33165L,33166L,33167L,
+33168L,33169L,33170L,33171L,33172L,33173L,33174L,33175L,33176L,33177L,
+33178L,33179L,33180L,33181L,33182L,33183L,33184L,33185L,33186L,33187L,
+33188L,33189L,33190L,33191L,33192L,33193L,33194L,33195L,33196L,33197L,
+33198L,33199L,33200L,33201L,33202L,33203L,33204L,33205L,33206L,33207L,
+33208L,33209L,33210L,33211L,33212L,33213L,33214L,33215L,33216L,33217L,
+33218L,33219L,33220L,33221L,33222L,33223L,33224L,33225L,33226L,33227L,
+33228L,33229L,33230L,33231L,33232L,33233L,33234L,33235L,33236L,33237L,
+33238L,33239L,33240L,33241L,33242L,33243L,33244L,33245L,33246L,33247L,
+33248L,33249L,33250L,33251L,33252L,33253L,33254L,33255L,33256L,33257L,
+33258L,33259L,33260L,33261L,33262L,33263L,33264L,33265L,33266L,33267L,
+33268L,33269L,33270L,33271L,33272L,33273L,33274L,33275L,33276L,33277L,
+33278L,33279L,33280L,33281L,33282L,33283L,33284L,33285L,33286L,33287L,
+33288L,33289L,33290L,33291L,33292L,33293L,33294L,33295L,33296L,33297L,
+33298L,33299L,33300L,33301L,33302L,33303L,33304L,33305L,33306L,33307L,
+33308L,33309L,33310L,33311L,33312L,33313L,33314L,33315L,33316L,33317L,
+33318L,33319L,33320L,33321L,33322L,33323L,33324L,33325L,33326L,33327L,
+33328L,33329L,33330L,33331L,33332L,33333L,33334L,33335L,33336L,33337L,
+33338L,33339L,33340L,33341L,33342L,33343L,33344L,33345L,33346L,33347L,
+33348L,33349L,33350L,33351L,33352L,33353L,33354L,33355L,33356L,33357L,
+33358L,33359L,33360L,33361L,33362L,33363L,33364L,33365L,33366L,33367L,
+33368L,33369L,33370L,33371L,33372L,33373L,33374L,33375L,33376L,33377L,
+33378L,33379L,33380L,33381L,33382L,33383L,33384L,33385L,33386L,33387L,
+33388L,33389L,33390L,33391L,33392L,33393L,33394L,33395L,33396L,33397L,
+33398L,33399L,33400L,33401L,33402L,33403L,33404L,33405L,33406L,33407L,
+33408L,33409L,33410L,33411L,33412L,33413L,33414L,33415L,33416L,33417L,
+33418L,33419L,33420L,33421L,33422L,33423L,33424L,33425L,33426L,33427L,
+33428L,33429L,33430L,33431L,33432L,33433L,33434L,33435L,33436L,33437L,
+33438L,33439L,33440L,33441L,33442L,33443L,33444L,33445L,33446L,33447L,
+33448L,33449L,33450L,33451L,33452L,33453L,33454L,33455L,33456L,33457L,
+33458L,33459L,33460L,33461L,33462L,33463L,33464L,33465L,33466L,33467L,
+33468L,33469L,33470L,33471L,33472L,33473L,33474L,33475L,33476L,33477L,
+33478L,33479L,33480L,33481L,33482L,33483L,33484L,33485L,33486L,33487L,
+33488L,33489L,33490L,33491L,33492L,33493L,33494L,33495L,33496L,33497L,
+33498L,33499L,33500L,33501L,33502L,33503L,33504L,33505L,33506L,33507L,
+33508L,33509L,33510L,33511L,33512L,33513L,33514L,33515L,33516L,33517L,
+33518L,33519L,33520L,33521L,33522L,33523L,33524L,33525L,33526L,33527L,
+33528L,33529L,33530L,33531L,33532L,33533L,33534L,33535L,33536L,33537L,
+33538L,33539L,33540L,33541L,33542L,33543L,33544L,33545L,33546L,33547L,
+33548L,33549L,33550L,33551L,33552L,33553L,33554L,33555L,33556L,33557L,
+33558L,33559L,33560L,33561L,33562L,33563L,33564L,33565L,33566L,33567L,
+33568L,33569L,33570L,33571L,33572L,33573L,33574L,33575L,33576L,33577L,
+33578L,33579L,33580L,33581L,33582L,33583L,33584L,33585L,33586L,33587L,
+33588L,33589L,33590L,33591L,33592L,33593L,33594L,33595L,33596L,33597L,
+33598L,33599L,33600L,33601L,33602L,33603L,33604L,33605L,33606L,33607L,
+33608L,33609L,33610L,33611L,33612L,33613L,33614L,33615L,33616L,33617L,
+33618L,33619L,33620L,33621L,33622L,33623L,33624L,33625L,33626L,33627L,
+33628L,33629L,33630L,33631L,33632L,33633L,33634L,33635L,33636L,33637L,
+33638L,33639L,33640L,33641L,33642L,33643L,33644L,33645L,33646L,33647L,
+33648L,33649L,33650L,33651L,33652L,33653L,33654L,33655L,33656L,33657L,
+33658L,33659L,33660L,33661L,33662L,33663L,33664L,33665L,33666L,33667L,
+33668L,33669L,33670L,33671L,33672L,33673L,33674L,33675L,33676L,33677L,
+33678L,33679L,33680L,33681L,33682L,33683L,33684L,33685L,33686L,33687L,
+33688L,33689L,33690L,33691L,33692L,33693L,33694L,33695L,33696L,33697L,
+33698L,33699L,33700L,33701L,33702L,33703L,33704L,33705L,33706L,33707L,
+33708L,33709L,33710L,33711L,33712L,33713L,33714L,33715L,33716L,33717L,
+33718L,33719L,33720L,33721L,33722L,33723L,33724L,33725L,33726L,33727L,
+33728L,33729L,33730L,33731L,33732L,33733L,33734L,33735L,33736L,33737L,
+33738L,33739L,33740L,33741L,33742L,33743L,33744L,33745L,33746L,33747L,
+33748L,33749L,33750L,33751L,33752L,33753L,33754L,33755L,33756L,33757L,
+33758L,33759L,33760L,33761L,33762L,33763L,33764L,33765L,33766L,33767L,
+33768L,33769L,33770L,33771L,33772L,33773L,33774L,33775L,33776L,33777L,
+33778L,33779L,33780L,33781L,33782L,33783L,33784L,33785L,33786L,33787L,
+33788L,33789L,33790L,33791L,33792L,33793L,33794L,33795L,33796L,33797L,
+33798L,33799L,33800L,33801L,33802L,33803L,33804L,33805L,33806L,33807L,
+33808L,33809L,33810L,33811L,33812L,33813L,33814L,33815L,33816L,33817L,
+33818L,33819L,33820L,33821L,33822L,33823L,33824L,33825L,33826L,33827L,
+33828L,33829L,33830L,33831L,33832L,33833L,33834L,33835L,33836L,33837L,
+33838L,33839L,33840L,33841L,33842L,33843L,33844L,33845L,33846L,33847L,
+33848L,33849L,33850L,33851L,33852L,33853L,33854L,33855L,33856L,33857L,
+33858L,33859L,33860L,33861L,33862L,33863L,33864L,33865L,33866L,33867L,
+33868L,33869L,33870L,33871L,33872L,33873L,33874L,33875L,33876L,33877L,
+33878L,33879L,33880L,33881L,33882L,33883L,33884L,33885L,33886L,33887L,
+33888L,33889L,33890L,33891L,33892L,33893L,33894L,33895L,33896L,33897L,
+33898L,33899L,33900L,33901L,33902L,33903L,33904L,33905L,33906L,33907L,
+33908L,33909L,33910L,33911L,33912L,33913L,33914L,33915L,33916L,33917L,
+33918L,33919L,33920L,33921L,33922L,33923L,33924L,33925L,33926L,33927L,
+33928L,33929L,33930L,33931L,33932L,33933L,33934L,33935L,33936L,33937L,
+33938L,33939L,33940L,33941L,33942L,33943L,33944L,33945L,33946L,33947L,
+33948L,33949L,33950L,33951L,33952L,33953L,33954L,33955L,33956L,33957L,
+33958L,33959L,33960L,33961L,33962L,33963L,33964L,33965L,33966L,33967L,
+33968L,33969L,33970L,33971L,33972L,33973L,33974L,33975L,33976L,33977L,
+33978L,33979L,33980L,33981L,33982L,33983L,33984L,33985L,33986L,33987L,
+33988L,33989L,33990L,33991L,33992L,33993L,33994L,33995L,33996L,33997L,
+33998L,33999L,34000L,34001L,34002L,34003L,34004L,34005L,34006L,34007L,
+34008L,34009L,34010L,34011L,34012L,34013L,34014L,34015L,34016L,34017L,
+34018L,34019L,34020L,34021L,34022L,34023L,34024L,34025L,34026L,34027L,
+34028L,34029L,34030L,34031L,34032L,34033L,34034L,34035L,34036L,34037L,
+34038L,34039L,34040L,34041L,34042L,34043L,34044L,34045L,34046L,34047L,
+34048L,34049L,34050L,34051L,34052L,34053L,34054L,34055L,34056L,34057L,
+34058L,34059L,34060L,34061L,34062L,34063L,34064L,34065L,34066L,34067L,
+34068L,34069L,34070L,34071L,34072L,34073L,34074L,34075L,34076L,34077L,
+34078L,34079L,34080L,34081L,34082L,34083L,34084L,34085L,34086L,34087L,
+34088L,34089L,34090L,34091L,34092L,34093L,34094L,34095L,34096L,34097L,
+34098L,34099L,34100L,34101L,34102L,34103L,34104L,34105L,34106L,34107L,
+34108L,34109L,34110L,34111L,34112L,34113L,34114L,34115L,34116L,34117L,
+34118L,34119L,34120L,34121L,34122L,34123L,34124L,34125L,34126L,34127L,
+34128L,34129L,34130L,34131L,34132L,34133L,34134L,34135L,34136L,34137L,
+34138L,34139L,34140L,34141L,34142L,34143L,34144L,34145L,34146L,34147L,
+34148L,34149L,34150L,34151L,34152L,34153L,34154L,34155L,34156L,34157L,
+34158L,34159L,34160L,34161L,34162L,34163L,34164L,34165L,34166L,34167L,
+34168L,34169L,34170L,34171L,34172L,34173L,34174L,34175L,34176L,34177L,
+34178L,34179L,34180L,34181L,34182L,34183L,34184L,34185L,34186L,34187L,
+34188L,34189L,34190L,34191L,34192L,34193L,34194L,34195L,34196L,34197L,
+34198L,34199L,34200L,34201L,34202L,34203L,34204L,34205L,34206L,34207L,
+34208L,34209L,34210L,34211L,34212L,34213L,34214L,34215L,34216L,34217L,
+34218L,34219L,34220L,34221L,34222L,34223L,34224L,34225L,34226L,34227L,
+34228L,34229L,34230L,34231L,34232L,34233L,34234L,34235L,34236L,34237L,
+34238L,34239L,34240L,34241L,34242L,34243L,34244L,34245L,34246L,34247L,
+34248L,34249L,34250L,34251L,34252L,34253L,34254L,34255L,34256L,34257L,
+34258L,34259L,34260L,34261L,34262L,34263L,34264L,34265L,34266L,34267L,
+34268L,34269L,34270L,34271L,34272L,34273L,34274L,34275L,34276L,34277L,
+34278L,34279L,34280L,34281L,34282L,34283L,34284L,34285L,34286L,34287L,
+34288L,34289L,34290L,34291L,34292L,34293L,34294L,34295L,34296L,34297L,
+34298L,34299L,34300L,34301L,34302L,34303L,34304L,34305L,34306L,34307L,
+34308L,34309L,34310L,34311L,34312L,34313L,34314L,34315L,34316L,34317L,
+34318L,34319L,34320L,34321L,34322L,34323L,34324L,34325L,34326L,34327L,
+34328L,34329L,34330L,34331L,34332L,34333L,34334L,34335L,34336L,34337L,
+34338L,34339L,34340L,34341L,34342L,34343L,34344L,34345L,34346L,34347L,
+34348L,34349L,34350L,34351L,34352L,34353L,34354L,34355L,34356L,34357L,
+34358L,34359L,34360L,34361L,34362L,34363L,34364L,34365L,34366L,34367L,
+34368L,34369L,34370L,34371L,34372L,34373L,34374L,34375L,34376L,34377L,
+34378L,34379L,34380L,34381L,34382L,34383L,34384L,34385L,34386L,34387L,
+34388L,34389L,34390L,34391L,34392L,34393L,34394L,34395L,34396L,34397L,
+34398L,34399L,34400L,34401L,34402L,34403L,34404L,34405L,34406L,34407L,
+34408L,34409L,34410L,34411L,34412L,34413L,34414L,34415L,34416L,34417L,
+34418L,34419L,34420L,34421L,34422L,34423L,34424L,34425L,34426L,34427L,
+34428L,34429L,34430L,34431L,34432L,34433L,34434L,34435L,34436L,34437L,
+34438L,34439L,34440L,34441L,34442L,34443L,34444L,34445L,34446L,34447L,
+34448L,34449L,34450L,34451L,34452L,34453L,34454L,34455L,34456L,34457L,
+34458L,34459L,34460L,34461L,34462L,34463L,34464L,34465L,34466L,34467L,
+34468L,34469L,34470L,34471L,34472L,34473L,34474L,34475L,34476L,34477L,
+34478L,34479L,34480L,34481L,34482L,34483L,34484L,34485L,34486L,34487L,
+34488L,34489L,34490L,34491L,34492L,34493L,34494L,34495L,34496L,34497L,
+34498L,34499L,34500L,34501L,34502L,34503L,34504L,34505L,34506L,34507L,
+34508L,34509L,34510L,34511L,34512L,34513L,34514L,34515L,34516L,34517L,
+34518L,34519L,34520L,34521L,34522L,34523L,34524L,34525L,34526L,34527L,
+34528L,34529L,34530L,34531L,34532L,34533L,34534L,34535L,34536L,34537L,
+34538L,34539L,34540L,34541L,34542L,34543L,34544L,34545L,34546L,34547L,
+34548L,34549L,34550L,34551L,34552L,34553L,34554L,34555L,34556L,34557L,
+34558L,34559L,34560L,34561L,34562L,34563L,34564L,34565L,34566L,34567L,
+34568L,34569L,34570L,34571L,34572L,34573L,34574L,34575L,34576L,34577L,
+34578L,34579L,34580L,34581L,34582L,34583L,34584L,34585L,34586L,34587L,
+34588L,34589L,34590L,34591L,34592L,34593L,34594L,34595L,34596L,34597L,
+34598L,34599L,34600L,34601L,34602L,34603L,34604L,34605L,34606L,34607L,
+34608L,34609L,34610L,34611L,34612L,34613L,34614L,34615L,34616L,34617L,
+34618L,34619L,34620L,34621L,34622L,34623L,34624L,34625L,34626L,34627L,
+34628L,34629L,34630L,34631L,34632L,34633L,34634L,34635L,34636L,34637L,
+34638L,34639L,34640L,34641L,34642L,34643L,34644L,34645L,34646L,34647L,
+34648L,34649L,34650L,34651L,34652L,34653L,34654L,34655L,34656L,34657L,
+34658L,34659L,34660L,34661L,34662L,34663L,34664L,34665L,34666L,34667L,
+34668L,34669L,34670L,34671L,34672L,34673L,34674L,34675L,34676L,34677L,
+34678L,34679L,34680L,34681L,34682L,34683L,34684L,34685L,34686L,34687L,
+34688L,34689L,34690L,34691L,34692L,34693L,34694L,34695L,34696L,34697L,
+34698L,34699L,34700L,34701L,34702L,34703L,34704L,34705L,34706L,34707L,
+34708L,34709L,34710L,34711L,34712L,34713L,34714L,34715L,34716L,34717L,
+34718L,34719L,34720L,34721L,34722L,34723L,34724L,34725L,34726L,34727L,
+34728L,34729L,34730L,34731L,34732L,34733L,34734L,34735L,34736L,34737L,
+34738L,34739L,34740L,34741L,34742L,34743L,34744L,34745L,34746L,34747L,
+34748L,34749L,34750L,34751L,34752L,34753L,34754L,34755L,34756L,34757L,
+34758L,34759L,34760L,34761L,34762L,34763L,34764L,34765L,34766L,34767L,
+34768L,34769L,34770L,34771L,34772L,34773L,34774L,34775L,34776L,34777L,
+34778L,34779L,34780L,34781L,34782L,34783L,34784L,34785L,34786L,34787L,
+34788L,34789L,34790L,34791L,34792L,34793L,34794L,34795L,34796L,34797L,
+34798L,34799L,34800L,34801L,34802L,34803L,34804L,34805L,34806L,34807L,
+34808L,34809L,34810L,34811L,34812L,34813L,34814L,34815L,34816L,34817L,
+34818L,34819L,34820L,34821L,34822L,34823L,34824L,34825L,34826L,34827L,
+34828L,34829L,34830L,34831L,34832L,34833L,34834L,34835L,34836L,34837L,
+34838L,34839L,34840L,34841L,34842L,34843L,34844L,34845L,34846L,34847L,
+34848L,34849L,34850L,34851L,34852L,34853L,34854L,34855L,34856L,34857L,
+34858L,34859L,34860L,34861L,34862L,34863L,34864L,34865L,34866L,34867L,
+34868L,34869L,34870L,34871L,34872L,34873L,34874L,34875L,34876L,34877L,
+34878L,34879L,34880L,34881L,34882L,34883L,34884L,34885L,34886L,34887L,
+34888L,34889L,34890L,34891L,34892L,34893L,34894L,34895L,34896L,34897L,
+34898L,34899L,34900L,34901L,34902L,34903L,34904L,34905L,34906L,34907L,
+34908L,34909L,34910L,34911L,34912L,34913L,34914L,34915L,34916L,34917L,
+34918L,34919L,34920L,34921L,34922L,34923L,34924L,34925L,34926L,34927L,
+34928L,34929L,34930L,34931L,34932L,34933L,34934L,34935L,34936L,34937L,
+34938L,34939L,34940L,34941L,34942L,34943L,34944L,34945L,34946L,34947L,
+34948L,34949L,34950L,34951L,34952L,34953L,34954L,34955L,34956L,34957L,
+34958L,34959L,34960L,34961L,34962L,34963L,34964L,34965L,34966L,34967L,
+34968L,34969L,34970L,34971L,34972L,34973L,34974L,34975L,34976L,34977L,
+34978L,34979L,34980L,34981L,34982L,34983L,34984L,34985L,34986L,34987L,
+34988L,34989L,34990L,34991L,34992L,34993L,34994L,34995L,34996L,34997L,
+34998L,34999L,35000L,35001L,35002L,35003L,35004L,35005L,35006L,35007L,
+35008L,35009L,35010L,35011L,35012L,35013L,35014L,35015L,35016L,35017L,
+35018L,35019L,35020L,35021L,35022L,35023L,35024L,35025L,35026L,35027L,
+35028L,35029L,35030L,35031L,35032L,35033L,35034L,35035L,35036L,35037L,
+35038L,35039L,35040L,35041L,35042L,35043L,35044L,35045L,35046L,35047L,
+35048L,35049L,35050L,35051L,35052L,35053L,35054L,35055L,35056L,35057L,
+35058L,35059L,35060L,35061L,35062L,35063L,35064L,35065L,35066L,35067L,
+35068L,35069L,35070L,35071L,35072L,35073L,35074L,35075L,35076L,35077L,
+35078L,35079L,35080L,35081L,35082L,35083L,35084L,35085L,35086L,35087L,
+35088L,35089L,35090L,35091L,35092L,35093L,35094L,35095L,35096L,35097L,
+35098L,35099L,35100L,35101L,35102L,35103L,35104L,35105L,35106L,35107L,
+35108L,35109L,35110L,35111L,35112L,35113L,35114L,35115L,35116L,35117L,
+35118L,35119L,35120L,35121L,35122L,35123L,35124L,35125L,35126L,35127L,
+35128L,35129L,35130L,35131L,35132L,35133L,35134L,35135L,35136L,35137L,
+35138L,35139L,35140L,35141L,35142L,35143L,35144L,35145L,35146L,35147L,
+35148L,35149L,35150L,35151L,35152L,35153L,35154L,35155L,35156L,35157L,
+35158L,35159L,35160L,35161L,35162L,35163L,35164L,35165L,35166L,35167L,
+35168L,35169L,35170L,35171L,35172L,35173L,35174L,35175L,35176L,35177L,
+35178L,35179L,35180L,35181L,35182L,35183L,35184L,35185L,35186L,35187L,
+35188L,35189L,35190L,35191L,35192L,35193L,35194L,35195L,35196L,35197L,
+35198L,35199L,35200L,35201L,35202L,35203L,35204L,35205L,35206L,35207L,
+35208L,35209L,35210L,35211L,35212L,35213L,35214L,35215L,35216L,35217L,
+35218L,35219L,35220L,35221L,35222L,35223L,35224L,35225L,35226L,35227L,
+35228L,35229L,35230L,35231L,35232L,35233L,35234L,35235L,35236L,35237L,
+35238L,35239L,35240L,35241L,35242L,35243L,35244L,35245L,35246L,35247L,
+35248L,35249L,35250L,35251L,35252L,35253L,35254L,35255L,35256L,35257L,
+35258L,35259L,35260L,35261L,35262L,35263L,35264L,35265L,35266L,35267L,
+35268L,35269L,35270L,35271L,35272L,35273L,35274L,35275L,35276L,35277L,
+35278L,35279L,35280L,35281L,35282L,35283L,35284L,35285L,35286L,35287L,
+35288L,35289L,35290L,35291L,35292L,35293L,35294L,35295L,35296L,35297L,
+35298L,35299L,35300L,35301L,35302L,35303L,35304L,35305L,35306L,35307L,
+35308L,35309L,35310L,35311L,35312L,35313L,35314L,35315L,35316L,35317L,
+35318L,35319L,35320L,35321L,35322L,35323L,35324L,35325L,35326L,35327L,
+35328L,35329L,35330L,35331L,35332L,35333L,35334L,35335L,35336L,35337L,
+35338L,35339L,35340L,35341L,35342L,35343L,35344L,35345L,35346L,35347L,
+35348L,35349L,35350L,35351L,35352L,35353L,35354L,35355L,35356L,35357L,
+35358L,35359L,35360L,35361L,35362L,35363L,35364L,35365L,35366L,35367L,
+35368L,35369L,35370L,35371L,35372L,35373L,35374L,35375L,35376L,35377L,
+35378L,35379L,35380L,35381L,35382L,35383L,35384L,35385L,35386L,35387L,
+35388L,35389L,35390L,35391L,35392L,35393L,35394L,35395L,35396L,35397L,
+35398L,35399L,35400L,35401L,35402L,35403L,35404L,35405L,35406L,35407L,
+35408L,35409L,35410L,35411L,35412L,35413L,35414L,35415L,35416L,35417L,
+35418L,35419L,35420L,35421L,35422L,35423L,35424L,35425L,35426L,35427L,
+35428L,35429L,35430L,35431L,35432L,35433L,35434L,35435L,35436L,35437L,
+35438L,35439L,35440L,35441L,35442L,35443L,35444L,35445L,35446L,35447L,
+35448L,35449L,35450L,35451L,35452L,35453L,35454L,35455L,35456L,35457L,
+35458L,35459L,35460L,35461L,35462L,35463L,35464L,35465L,35466L,35467L,
+35468L,35469L,35470L,35471L,35472L,35473L,35474L,35475L,35476L,35477L,
+35478L,35479L,35480L,35481L,35482L,35483L,35484L,35485L,35486L,35487L,
+35488L,35489L,35490L,35491L,35492L,35493L,35494L,35495L,35496L,35497L,
+35498L,35499L,35500L,35501L,35502L,35503L,35504L,35505L,35506L,35507L,
+35508L,35509L,35510L,35511L,35512L,35513L,35514L,35515L,35516L,35517L,
+35518L,35519L,35520L,35521L,35522L,35523L,35524L,35525L,35526L,35527L,
+35528L,35529L,35530L,35531L,35532L,35533L,35534L,35535L,35536L,35537L,
+35538L,35539L,35540L,35541L,35542L,35543L,35544L,35545L,35546L,35547L,
+35548L,35549L,35550L,35551L,35552L,35553L,35554L,35555L,35556L,35557L,
+35558L,35559L,35560L,35561L,35562L,35563L,35564L,35565L,35566L,35567L,
+35568L,35569L,35570L,35571L,35572L,35573L,35574L,35575L,35576L,35577L,
+35578L,35579L,35580L,35581L,35582L,35583L,35584L,35585L,35586L,35587L,
+35588L,35589L,35590L,35591L,35592L,35593L,35594L,35595L,35596L,35597L,
+35598L,35599L,35600L,35601L,35602L,35603L,35604L,35605L,35606L,35607L,
+35608L,35609L,35610L,35611L,35612L,35613L,35614L,35615L,35616L,35617L,
+35618L,35619L,35620L,35621L,35622L,35623L,35624L,35625L,35626L,35627L,
+35628L,35629L,35630L,35631L,35632L,35633L,35634L,35635L,35636L,35637L,
+35638L,35639L,35640L,35641L,35642L,35643L,35644L,35645L,35646L,35647L,
+35648L,35649L,35650L,35651L,35652L,35653L,35654L,35655L,35656L,35657L,
+35658L,35659L,35660L,35661L,35662L,35663L,35664L,35665L,35666L,35667L,
+35668L,35669L,35670L,35671L,35672L,35673L,35674L,35675L,35676L,35677L,
+35678L,35679L,35680L,35681L,35682L,35683L,35684L,35685L,35686L,35687L,
+35688L,35689L,35690L,35691L,35692L,35693L,35694L,35695L,35696L,35697L,
+35698L,35699L,35700L,35701L,35702L,35703L,35704L,35705L,35706L,35707L,
+35708L,35709L,35710L,35711L,35712L,35713L,35714L,35715L,35716L,35717L,
+35718L,35719L,35720L,35721L,35722L,35723L,35724L,35725L,35726L,35727L,
+35728L,35729L,35730L,35731L,35732L,35733L,35734L,35735L,35736L,35737L,
+35738L,35739L,35740L,35741L,35742L,35743L,35744L,35745L,35746L,35747L,
+35748L,35749L,35750L,35751L,35752L,35753L,35754L,35755L,35756L,35757L,
+35758L,35759L,35760L,35761L,35762L,35763L,35764L,35765L,35766L,35767L,
+35768L,35769L,35770L,35771L,35772L,35773L,35774L,35775L,35776L,35777L,
+35778L,35779L,35780L,35781L,35782L,35783L,35784L,35785L,35786L,35787L,
+35788L,35789L,35790L,35791L,35792L,35793L,35794L,35795L,35796L,35797L,
+35798L,35799L,35800L,35801L,35802L,35803L,35804L,35805L,35806L,35807L,
+35808L,35809L,35810L,35811L,35812L,35813L,35814L,35815L,35816L,35817L,
+35818L,35819L,35820L,35821L,35822L,35823L,35824L,35825L,35826L,35827L,
+35828L,35829L,35830L,35831L,35832L,35833L,35834L,35835L,35836L,35837L,
+35838L,35839L,35840L,35841L,35842L,35843L,35844L,35845L,35846L,35847L,
+35848L,35849L,35850L,35851L,35852L,35853L,35854L,35855L,35856L,35857L,
+35858L,35859L,35860L,35861L,35862L,35863L,35864L,35865L,35866L,35867L,
+35868L,35869L,35870L,35871L,35872L,35873L,35874L,35875L,35876L,35877L,
+35878L,35879L,35880L,35881L,35882L,35883L,35884L,35885L,35886L,35887L,
+35888L,35889L,35890L,35891L,35892L,35893L,35894L,35895L,35896L,35897L,
+35898L,35899L,35900L,35901L,35902L,35903L,35904L,35905L,35906L,35907L,
+35908L,35909L,35910L,35911L,35912L,35913L,35914L,35915L,35916L,35917L,
+35918L,35919L,35920L,35921L,35922L,35923L,35924L,35925L,35926L,35927L,
+35928L,35929L,35930L,35931L,35932L,35933L,35934L,35935L,35936L,35937L,
+35938L,35939L,35940L,35941L,35942L,35943L,35944L,35945L,35946L,35947L,
+35948L,35949L,35950L,35951L,35952L,35953L,35954L,35955L,35956L,35957L,
+35958L,35959L,35960L,35961L,35962L,35963L,35964L,35965L,35966L,35967L,
+35968L,35969L,35970L,35971L,35972L,35973L,35974L,35975L,35976L,35977L,
+35978L,35979L,35980L,35981L,35982L,35983L,35984L,35985L,35986L,35987L,
+35988L,35989L,35990L,35991L,35992L,35993L,35994L,35995L,35996L,35997L,
+35998L,35999L,36000L,36001L,36002L,36003L,36004L,36005L,36006L,36007L,
+36008L,36009L,36010L,36011L,36012L,36013L,36014L,36015L,36016L,36017L,
+36018L,36019L,36020L,36021L,36022L,36023L,36024L,36025L,36026L,36027L,
+36028L,36029L,36030L,36031L,36032L,36033L,36034L,36035L,36036L,36037L,
+36038L,36039L,36040L,36041L,36042L,36043L,36044L,36045L,36046L,36047L,
+36048L,36049L,36050L,36051L,36052L,36053L,36054L,36055L,36056L,36057L,
+36058L,36059L,36060L,36061L,36062L,36063L,36064L,36065L,36066L,36067L,
+36068L,36069L,36070L,36071L,36072L,36073L,36074L,36075L,36076L,36077L,
+36078L,36079L,36080L,36081L,36082L,36083L,36084L,36085L,36086L,36087L,
+36088L,36089L,36090L,36091L,36092L,36093L,36094L,36095L,36096L,36097L,
+36098L,36099L,36100L,36101L,36102L,36103L,36104L,36105L,36106L,36107L,
+36108L,36109L,36110L,36111L,36112L,36113L,36114L,36115L,36116L,36117L,
+36118L,36119L,36120L,36121L,36122L,36123L,36124L,36125L,36126L,36127L,
+36128L,36129L,36130L,36131L,36132L,36133L,36134L,36135L,36136L,36137L,
+36138L,36139L,36140L,36141L,36142L,36143L,36144L,36145L,36146L,36147L,
+36148L,36149L,36150L,36151L,36152L,36153L,36154L,36155L,36156L,36157L,
+36158L,36159L,36160L,36161L,36162L,36163L,36164L,36165L,36166L,36167L,
+36168L,36169L,36170L,36171L,36172L,36173L,36174L,36175L,36176L,36177L,
+36178L,36179L,36180L,36181L,36182L,36183L,36184L,36185L,36186L,36187L,
+36188L,36189L,36190L,36191L,36192L,36193L,36194L,36195L,36196L,36197L,
+36198L,36199L,36200L,36201L,36202L,36203L,36204L,36205L,36206L,36207L,
+36208L,36209L,36210L,36211L,36212L,36213L,36214L,36215L,36216L,36217L,
+36218L,36219L,36220L,36221L,36222L,36223L,36224L,36225L,36226L,36227L,
+36228L,36229L,36230L,36231L,36232L,36233L,36234L,36235L,36236L,36237L,
+36238L,36239L,36240L,36241L,36242L,36243L,36244L,36245L,36246L,36247L,
+36248L,36249L,36250L,36251L,36252L,36253L,36254L,36255L,36256L,36257L,
+36258L,36259L,36260L,36261L,36262L,36263L,36264L,36265L,36266L,36267L,
+36268L,36269L,36270L,36271L,36272L,36273L,36274L,36275L,36276L,36277L,
+36278L,36279L,36280L,36281L,36282L,36283L,36284L,36285L,36286L,36287L,
+36288L,36289L,36290L,36291L,36292L,36293L,36294L,36295L,36296L,36297L,
+36298L,36299L,36300L,36301L,36302L,36303L,36304L,36305L,36306L,36307L,
+36308L,36309L,36310L,36311L,36312L,36313L,36314L,36315L,36316L,36317L,
+36318L,36319L,36320L,36321L,36322L,36323L,36324L,36325L,36326L,36327L,
+36328L,36329L,36330L,36331L,36332L,36333L,36334L,36335L,36336L,36337L,
+36338L,36339L,36340L,36341L,36342L,36343L,36344L,36345L,36346L,36347L,
+36348L,36349L,36350L,36351L,36352L,36353L,36354L,36355L,36356L,36357L,
+36358L,36359L,36360L,36361L,36362L,36363L,36364L,36365L,36366L,36367L,
+36368L,36369L,36370L,36371L,36372L,36373L,36374L,36375L,36376L,36377L,
+36378L,36379L,36380L,36381L,36382L,36383L,36384L,36385L,36386L,36387L,
+36388L,36389L,36390L,36391L,36392L,36393L,36394L,36395L,36396L,36397L,
+36398L,36399L,36400L,36401L,36402L,36403L,36404L,36405L,36406L,36407L,
+36408L,36409L,36410L,36411L,36412L,36413L,36414L,36415L,36416L,36417L,
+36418L,36419L,36420L,36421L,36422L,36423L,36424L,36425L,36426L,36427L,
+36428L,36429L,36430L,36431L,36432L,36433L,36434L,36435L,36436L,36437L,
+36438L,36439L,36440L,36441L,36442L,36443L,36444L,36445L,36446L,36447L,
+36448L,36449L,36450L,36451L,36452L,36453L,36454L,36455L,36456L,36457L,
+36458L,36459L,36460L,36461L,36462L,36463L,36464L,36465L,36466L,36467L,
+36468L,36469L,36470L,36471L,36472L,36473L,36474L,36475L,36476L,36477L,
+36478L,36479L,36480L,36481L,36482L,36483L,36484L,36485L,36486L,36487L,
+36488L,36489L,36490L,36491L,36492L,36493L,36494L,36495L,36496L,36497L,
+36498L,36499L,36500L,36501L,36502L,36503L,36504L,36505L,36506L,36507L,
+36508L,36509L,36510L,36511L,36512L,36513L,36514L,36515L,36516L,36517L,
+36518L,36519L,36520L,36521L,36522L,36523L,36524L,36525L,36526L,36527L,
+36528L,36529L,36530L,36531L,36532L,36533L,36534L,36535L,36536L,36537L,
+36538L,36539L,36540L,36541L,36542L,36543L,36544L,36545L,36546L,36547L,
+36548L,36549L,36550L,36551L,36552L,36553L,36554L,36555L,36556L,36557L,
+36558L,36559L,36560L,36561L,36562L,36563L,36564L,36565L,36566L,36567L,
+36568L,36569L,36570L,36571L,36572L,36573L,36574L,36575L,36576L,36577L,
+36578L,36579L,36580L,36581L,36582L,36583L,36584L,36585L,36586L,36587L,
+36588L,36589L,36590L,36591L,36592L,36593L,36594L,36595L,36596L,36597L,
+36598L,36599L,36600L,36601L,36602L,36603L,36604L,36605L,36606L,36607L,
+36608L,36609L,36610L,36611L,36612L,36613L,36614L,36615L,36616L,36617L,
+36618L,36619L,36620L,36621L,36622L,36623L,36624L,36625L,36626L,36627L,
+36628L,36629L,36630L,36631L,36632L,36633L,36634L,36635L,36636L,36637L,
+36638L,36639L,36640L,36641L,36642L,36643L,36644L,36645L,36646L,36647L,
+36648L,36649L,36650L,36651L,36652L,36653L,36654L,36655L,36656L,36657L,
+36658L,36659L,36660L,36661L,36662L,36663L,36664L,36665L,36666L,36667L,
+36668L,36669L,36670L,36671L,36672L,36673L,36674L,36675L,36676L,36677L,
+36678L,36679L,36680L,36681L,36682L,36683L,36684L,36685L,36686L,36687L,
+36688L,36689L,36690L,36691L,36692L,36693L,36694L,36695L,36696L,36697L,
+36698L,36699L,36700L,36701L,36702L,36703L,36704L,36705L,36706L,36707L,
+36708L,36709L,36710L,36711L,36712L,36713L,36714L,36715L,36716L,36717L,
+36718L,36719L,36720L,36721L,36722L,36723L,36724L,36725L,36726L,36727L,
+36728L,36729L,36730L,36731L,36732L,36733L,36734L,36735L,36736L,36737L,
+36738L,36739L,36740L,36741L,36742L,36743L,36744L,36745L,36746L,36747L,
+36748L,36749L,36750L,36751L,36752L,36753L,36754L,36755L,36756L,36757L,
+36758L,36759L,36760L,36761L,36762L,36763L,36764L,36765L,36766L,36767L,
+36768L,36769L,36770L,36771L,36772L,36773L,36774L,36775L,36776L,36777L,
+36778L,36779L,36780L,36781L,36782L,36783L,36784L,36785L,36786L,36787L,
+36788L,36789L,36790L,36791L,36792L,36793L,36794L,36795L,36796L,36797L,
+36798L,36799L,36800L,36801L,36802L,36803L,36804L,36805L,36806L,36807L,
+36808L,36809L,36810L,36811L,36812L,36813L,36814L,36815L,36816L,36817L,
+36818L,36819L,36820L,36821L,36822L,36823L,36824L,36825L,36826L,36827L,
+36828L,36829L,36830L,36831L,36832L,36833L,36834L,36835L,36836L,36837L,
+36838L,36839L,36840L,36841L,36842L,36843L,36844L,36845L,36846L,36847L,
+36848L,36849L,36850L,36851L,36852L,36853L,36854L,36855L,36856L,36857L,
+36858L,36859L,36860L,36861L,36862L,36863L,36864L,36865L,36866L,36867L,
+36868L,36869L,36870L,36871L,36872L,36873L,36874L,36875L,36876L,36877L,
+36878L,36879L,36880L,36881L,36882L,36883L,36884L,36885L,36886L,36887L,
+36888L,36889L,36890L,36891L,36892L,36893L,36894L,36895L,36896L,36897L,
+36898L,36899L,36900L,36901L,36902L,36903L,36904L,36905L,36906L,36907L,
+36908L,36909L,36910L,36911L,36912L,36913L,36914L,36915L,36916L,36917L,
+36918L,36919L,36920L,36921L,36922L,36923L,36924L,36925L,36926L,36927L,
+36928L,36929L,36930L,36931L,36932L,36933L,36934L,36935L,36936L,36937L,
+36938L,36939L,36940L,36941L,36942L,36943L,36944L,36945L,36946L,36947L,
+36948L,36949L,36950L,36951L,36952L,36953L,36954L,36955L,36956L,36957L,
+36958L,36959L,36960L,36961L,36962L,36963L,36964L,36965L,36966L,36967L,
+36968L,36969L,36970L,36971L,36972L,36973L,36974L,36975L,36976L,36977L,
+36978L,36979L,36980L,36981L,36982L,36983L,36984L,36985L,36986L,36987L,
+36988L,36989L,36990L,36991L,36992L,36993L,36994L,36995L,36996L,36997L,
+36998L,36999L,37000L,37001L,37002L,37003L,37004L,37005L,37006L,37007L,
+37008L,37009L,37010L,37011L,37012L,37013L,37014L,37015L,37016L,37017L,
+37018L,37019L,37020L,37021L,37022L,37023L,37024L,37025L,37026L,37027L,
+37028L,37029L,37030L,37031L,37032L,37033L,37034L,37035L,37036L,37037L,
+37038L,37039L,37040L,37041L,37042L,37043L,37044L,37045L,37046L,37047L,
+37048L,37049L,37050L,37051L,37052L,37053L,37054L,37055L,37056L,37057L,
+37058L,37059L,37060L,37061L,37062L,37063L,37064L,37065L,37066L,37067L,
+37068L,37069L,37070L,37071L,37072L,37073L,37074L,37075L,37076L,37077L,
+37078L,37079L,37080L,37081L,37082L,37083L,37084L,37085L,37086L,37087L,
+37088L,37089L,37090L,37091L,37092L,37093L,37094L,37095L,37096L,37097L,
+37098L,37099L,37100L,37101L,37102L,37103L,37104L,37105L,37106L,37107L,
+37108L,37109L,37110L,37111L,37112L,37113L,37114L,37115L,37116L,37117L,
+37118L,37119L,37120L,37121L,37122L,37123L,37124L,37125L,37126L,37127L,
+37128L,37129L,37130L,37131L,37132L,37133L,37134L,37135L,37136L,37137L,
+37138L,37139L,37140L,37141L,37142L,37143L,37144L,37145L,37146L,37147L,
+37148L,37149L,37150L,37151L,37152L,37153L,37154L,37155L,37156L,37157L,
+37158L,37159L,37160L,37161L,37162L,37163L,37164L,37165L,37166L,37167L,
+37168L,37169L,37170L,37171L,37172L,37173L,37174L,37175L,37176L,37177L,
+37178L,37179L,37180L,37181L,37182L,37183L,37184L,37185L,37186L,37187L,
+37188L,37189L,37190L,37191L,37192L,37193L,37194L,37195L,37196L,37197L,
+37198L,37199L,37200L,37201L,37202L,37203L,37204L,37205L,37206L,37207L,
+37208L,37209L,37210L,37211L,37212L,37213L,37214L,37215L,37216L,37217L,
+37218L,37219L,37220L,37221L,37222L,37223L,37224L,37225L,37226L,37227L,
+37228L,37229L,37230L,37231L,37232L,37233L,37234L,37235L,37236L,37237L,
+37238L,37239L,37240L,37241L,37242L,37243L,37244L,37245L,37246L,37247L,
+37248L,37249L,37250L,37251L,37252L,37253L,37254L,37255L,37256L,37257L,
+37258L,37259L,37260L,37261L,37262L,37263L,37264L,37265L,37266L,37267L,
+37268L,37269L,37270L,37271L,37272L,37273L,37274L,37275L,37276L,37277L,
+37278L,37279L,37280L,37281L,37282L,37283L,37284L,37285L,37286L,37287L,
+37288L,37289L,37290L,37291L,37292L,37293L,37294L,37295L,37296L,37297L,
+37298L,37299L,37300L,37301L,37302L,37303L,37304L,37305L,37306L,37307L,
+37308L,37309L,37310L,37311L,37312L,37313L,37314L,37315L,37316L,37317L,
+37318L,37319L,37320L,37321L,37322L,37323L,37324L,37325L,37326L,37327L,
+37328L,37329L,37330L,37331L,37332L,37333L,37334L,37335L,37336L,37337L,
+37338L,37339L,37340L,37341L,37342L,37343L,37344L,37345L,37346L,37347L,
+37348L,37349L,37350L,37351L,37352L,37353L,37354L,37355L,37356L,37357L,
+37358L,37359L,37360L,37361L,37362L,37363L,37364L,37365L,37366L,37367L,
+37368L,37369L,37370L,37371L,37372L,37373L,37374L,37375L,37376L,37377L,
+37378L,37379L,37380L,37381L,37382L,37383L,37384L,37385L,37386L,37387L,
+37388L,37389L,37390L,37391L,37392L,37393L,37394L,37395L,37396L,37397L,
+37398L,37399L,37400L,37401L,37402L,37403L,37404L,37405L,37406L,37407L,
+37408L,37409L,37410L,37411L,37412L,37413L,37414L,37415L,37416L,37417L,
+37418L,37419L,37420L,37421L,37422L,37423L,37424L,37425L,37426L,37427L,
+37428L,37429L,37430L,37431L,37432L,37433L,37434L,37435L,37436L,37437L,
+37438L,37439L,37440L,37441L,37442L,37443L,37444L,37445L,37446L,37447L,
+37448L,37449L,37450L,37451L,37452L,37453L,37454L,37455L,37456L,37457L,
+37458L,37459L,37460L,37461L,37462L,37463L,37464L,37465L,37466L,37467L,
+37468L,37469L,37470L,37471L,37472L,37473L,37474L,37475L,37476L,37477L,
+37478L,37479L,37480L,37481L,37482L,37483L,37484L,37485L,37486L,37487L,
+37488L,37489L,37490L,37491L,37492L,37493L,37494L,37495L,37496L,37497L,
+37498L,37499L,37500L,37501L,37502L,37503L,37504L,37505L,37506L,37507L,
+37508L,37509L,37510L,37511L,37512L,37513L,37514L,37515L,37516L,37517L,
+37518L,37519L,37520L,37521L,37522L,37523L,37524L,37525L,37526L,37527L,
+37528L,37529L,37530L,37531L,37532L,37533L,37534L,37535L,37536L,37537L,
+37538L,37539L,37540L,37541L,37542L,37543L,37544L,37545L,37546L,37547L,
+37548L,37549L,37550L,37551L,37552L,37553L,37554L,37555L,37556L,37557L,
+37558L,37559L,37560L,37561L,37562L,37563L,37564L,37565L,37566L,37567L,
+37568L,37569L,37570L,37571L,37572L,37573L,37574L,37575L,37576L,37577L,
+37578L,37579L,37580L,37581L,37582L,37583L,37584L,37585L,37586L,37587L,
+37588L,37589L,37590L,37591L,37592L,37593L,37594L,37595L,37596L,37597L,
+37598L,37599L,37600L,37601L,37602L,37603L,37604L,37605L,37606L,37607L,
+37608L,37609L,37610L,37611L,37612L,37613L,37614L,37615L,37616L,37617L,
+37618L,37619L,37620L,37621L,37622L,37623L,37624L,37625L,37626L,37627L,
+37628L,37629L,37630L,37631L,37632L,37633L,37634L,37635L,37636L,37637L,
+37638L,37639L,37640L,37641L,37642L,37643L,37644L,37645L,37646L,37647L,
+37648L,37649L,37650L,37651L,37652L,37653L,37654L,37655L,37656L,37657L,
+37658L,37659L,37660L,37661L,37662L,37663L,37664L,37665L,37666L,37667L,
+37668L,37669L,37670L,37671L,37672L,37673L,37674L,37675L,37676L,37677L,
+37678L,37679L,37680L,37681L,37682L,37683L,37684L,37685L,37686L,37687L,
+37688L,37689L,37690L,37691L,37692L,37693L,37694L,37695L,37696L,37697L,
+37698L,37699L,37700L,37701L,37702L,37703L,37704L,37705L,37706L,37707L,
+37708L,37709L,37710L,37711L,37712L,37713L,37714L,37715L,37716L,37717L,
+37718L,37719L,37720L,37721L,37722L,37723L,37724L,37725L,37726L,37727L,
+37728L,37729L,37730L,37731L,37732L,37733L,37734L,37735L,37736L,37737L,
+37738L,37739L,37740L,37741L,37742L,37743L,37744L,37745L,37746L,37747L,
+37748L,37749L,37750L,37751L,37752L,37753L,37754L,37755L,37756L,37757L,
+37758L,37759L,37760L,37761L,37762L,37763L,37764L,37765L,37766L,37767L,
+37768L,37769L,37770L,37771L,37772L,37773L,37774L,37775L,37776L,37777L,
+37778L,37779L,37780L,37781L,37782L,37783L,37784L,37785L,37786L,37787L,
+37788L,37789L,37790L,37791L,37792L,37793L,37794L,37795L,37796L,37797L,
+37798L,37799L,37800L,37801L,37802L,37803L,37804L,37805L,37806L,37807L,
+37808L,37809L,37810L,37811L,37812L,37813L,37814L,37815L,37816L,37817L,
+37818L,37819L,37820L,37821L,37822L,37823L,37824L,37825L,37826L,37827L,
+37828L,37829L,37830L,37831L,37832L,37833L,37834L,37835L,37836L,37837L,
+37838L,37839L,37840L,37841L,37842L,37843L,37844L,37845L,37846L,37847L,
+37848L,37849L,37850L,37851L,37852L,37853L,37854L,37855L,37856L,37857L,
+37858L,37859L,37860L,37861L,37862L,37863L,37864L,37865L,37866L,37867L,
+37868L,37869L,37870L,37871L,37872L,37873L,37874L,37875L,37876L,37877L,
+37878L,37879L,37880L,37881L,37882L,37883L,37884L,37885L,37886L,37887L,
+37888L,37889L,37890L,37891L,37892L,37893L,37894L,37895L,37896L,37897L,
+37898L,37899L,37900L,37901L,37902L,37903L,37904L,37905L,37906L,37907L,
+37908L,37909L,37910L,37911L,37912L,37913L,37914L,37915L,37916L,37917L,
+37918L,37919L,37920L,37921L,37922L,37923L,37924L,37925L,37926L,37927L,
+37928L,37929L,37930L,37931L,37932L,37933L,37934L,37935L,37936L,37937L,
+37938L,37939L,37940L,37941L,37942L,37943L,37944L,37945L,37946L,37947L,
+37948L,37949L,37950L,37951L,37952L,37953L,37954L,37955L,37956L,37957L,
+37958L,37959L,37960L,37961L,37962L,37963L,37964L,37965L,37966L,37967L,
+37968L,37969L,37970L,37971L,37972L,37973L,37974L,37975L,37976L,37977L,
+37978L,37979L,37980L,37981L,37982L,37983L,37984L,37985L,37986L,37987L,
+37988L,37989L,37990L,37991L,37992L,37993L,37994L,37995L,37996L,37997L,
+37998L,37999L,38000L,38001L,38002L,38003L,38004L,38005L,38006L,38007L,
+38008L,38009L,38010L,38011L,38012L,38013L,38014L,38015L,38016L,38017L,
+38018L,38019L,38020L,38021L,38022L,38023L,38024L,38025L,38026L,38027L,
+38028L,38029L,38030L,38031L,38032L,38033L,38034L,38035L,38036L,38037L,
+38038L,38039L,38040L,38041L,38042L,38043L,38044L,38045L,38046L,38047L,
+38048L,38049L,38050L,38051L,38052L,38053L,38054L,38055L,38056L,38057L,
+38058L,38059L,38060L,38061L,38062L,38063L,38064L,38065L,38066L,38067L,
+38068L,38069L,38070L,38071L,38072L,38073L,38074L,38075L,38076L,38077L,
+38078L,38079L,38080L,38081L,38082L,38083L,38084L,38085L,38086L,38087L,
+38088L,38089L,38090L,38091L,38092L,38093L,38094L,38095L,38096L,38097L,
+38098L,38099L,38100L,38101L,38102L,38103L,38104L,38105L,38106L,38107L,
+38108L,38109L,38110L,38111L,38112L,38113L,38114L,38115L,38116L,38117L,
+38118L,38119L,38120L,38121L,38122L,38123L,38124L,38125L,38126L,38127L,
+38128L,38129L,38130L,38131L,38132L,38133L,38134L,38135L,38136L,38137L,
+38138L,38139L,38140L,38141L,38142L,38143L,38144L,38145L,38146L,38147L,
+38148L,38149L,38150L,38151L,38152L,38153L,38154L,38155L,38156L,38157L,
+38158L,38159L,38160L,38161L,38162L,38163L,38164L,38165L,38166L,38167L,
+38168L,38169L,38170L,38171L,38172L,38173L,38174L,38175L,38176L,38177L,
+38178L,38179L,38180L,38181L,38182L,38183L,38184L,38185L,38186L,38187L,
+38188L,38189L,38190L,38191L,38192L,38193L,38194L,38195L,38196L,38197L,
+38198L,38199L,38200L,38201L,38202L,38203L,38204L,38205L,38206L,38207L,
+38208L,38209L,38210L,38211L,38212L,38213L,38214L,38215L,38216L,38217L,
+38218L,38219L,38220L,38221L,38222L,38223L,38224L,38225L,38226L,38227L,
+38228L,38229L,38230L,38231L,38232L,38233L,38234L,38235L,38236L,38237L,
+38238L,38239L,38240L,38241L,38242L,38243L,38244L,38245L,38246L,38247L,
+38248L,38249L,38250L,38251L,38252L,38253L,38254L,38255L,38256L,38257L,
+38258L,38259L,38260L,38261L,38262L,38263L,38264L,38265L,38266L,38267L,
+38268L,38269L,38270L,38271L,38272L,38273L,38274L,38275L,38276L,38277L,
+38278L,38279L,38280L,38281L,38282L,38283L,38284L,38285L,38286L,38287L,
+38288L,38289L,38290L,38291L,38292L,38293L,38294L,38295L,38296L,38297L,
+38298L,38299L,38300L,38301L,38302L,38303L,38304L,38305L,38306L,38307L,
+38308L,38309L,38310L,38311L,38312L,38313L,38314L,38315L,38316L,38317L,
+38318L,38319L,38320L,38321L,38322L,38323L,38324L,38325L,38326L,38327L,
+38328L,38329L,38330L,38331L,38332L,38333L,38334L,38335L,38336L,38337L,
+38338L,38339L,38340L,38341L,38342L,38343L,38344L,38345L,38346L,38347L,
+38348L,38349L,38350L,38351L,38352L,38353L,38354L,38355L,38356L,38357L,
+38358L,38359L,38360L,38361L,38362L,38363L,38364L,38365L,38366L,38367L,
+38368L,38369L,38370L,38371L,38372L,38373L,38374L,38375L,38376L,38377L,
+38378L,38379L,38380L,38381L,38382L,38383L,38384L,38385L,38386L,38387L,
+38388L,38389L,38390L,38391L,38392L,38393L,38394L,38395L,38396L,38397L,
+38398L,38399L,38400L,38401L,38402L,38403L,38404L,38405L,38406L,38407L,
+38408L,38409L,38410L,38411L,38412L,38413L,38414L,38415L,38416L,38417L,
+38418L,38419L,38420L,38421L,38422L,38423L,38424L,38425L,38426L,38427L,
+38428L,38429L,38430L,38431L,38432L,38433L,38434L,38435L,38436L,38437L,
+38438L,38439L,38440L,38441L,38442L,38443L,38444L,38445L,38446L,38447L,
+38448L,38449L,38450L,38451L,38452L,38453L,38454L,38455L,38456L,38457L,
+38458L,38459L,38460L,38461L,38462L,38463L,38464L,38465L,38466L,38467L,
+38468L,38469L,38470L,38471L,38472L,38473L,38474L,38475L,38476L,38477L,
+38478L,38479L,38480L,38481L,38482L,38483L,38484L,38485L,38486L,38487L,
+38488L,38489L,38490L,38491L,38492L,38493L,38494L,38495L,38496L,38497L,
+38498L,38499L,38500L,38501L,38502L,38503L,38504L,38505L,38506L,38507L,
+38508L,38509L,38510L,38511L,38512L,38513L,38514L,38515L,38516L,38517L,
+38518L,38519L,38520L,38521L,38522L,38523L,38524L,38525L,38526L,38527L,
+38528L,38529L,38530L,38531L,38532L,38533L,38534L,38535L,38536L,38537L,
+38538L,38539L,38540L,38541L,38542L,38543L,38544L,38545L,38546L,38547L,
+38548L,38549L,38550L,38551L,38552L,38553L,38554L,38555L,38556L,38557L,
+38558L,38559L,38560L,38561L,38562L,38563L,38564L,38565L,38566L,38567L,
+38568L,38569L,38570L,38571L,38572L,38573L,38574L,38575L,38576L,38577L,
+38578L,38579L,38580L,38581L,38582L,38583L,38584L,38585L,38586L,38587L,
+38588L,38589L,38590L,38591L,38592L,38593L,38594L,38595L,38596L,38597L,
+38598L,38599L,38600L,38601L,38602L,38603L,38604L,38605L,38606L,38607L,
+38608L,38609L,38610L,38611L,38612L,38613L,38614L,38615L,38616L,38617L,
+38618L,38619L,38620L,38621L,38622L,38623L,38624L,38625L,38626L,38627L,
+38628L,38629L,38630L,38631L,38632L,38633L,38634L,38635L,38636L,38637L,
+38638L,38639L,38640L,38641L,38642L,38643L,38644L,38645L,38646L,38647L,
+38648L,38649L,38650L,38651L,38652L,38653L,38654L,38655L,38656L,38657L,
+38658L,38659L,38660L,38661L,38662L,38663L,38664L,38665L,38666L,38667L,
+38668L,38669L,38670L,38671L,38672L,38673L,38674L,38675L,38676L,38677L,
+38678L,38679L,38680L,38681L,38682L,38683L,38684L,38685L,38686L,38687L,
+38688L,38689L,38690L,38691L,38692L,38693L,38694L,38695L,38696L,38697L,
+38698L,38699L,38700L,38701L,38702L,38703L,38704L,38705L,38706L,38707L,
+38708L,38709L,38710L,38711L,38712L,38713L,38714L,38715L,38716L,38717L,
+38718L,38719L,38720L,38721L,38722L,38723L,38724L,38725L,38726L,38727L,
+38728L,38729L,38730L,38731L,38732L,38733L,38734L,38735L,38736L,38737L,
+38738L,38739L,38740L,38741L,38742L,38743L,38744L,38745L,38746L,38747L,
+38748L,38749L,38750L,38751L,38752L,38753L,38754L,38755L,38756L,38757L,
+38758L,38759L,38760L,38761L,38762L,38763L,38764L,38765L,38766L,38767L,
+38768L,38769L,38770L,38771L,38772L,38773L,38774L,38775L,38776L,38777L,
+38778L,38779L,38780L,38781L,38782L,38783L,38784L,38785L,38786L,38787L,
+38788L,38789L,38790L,38791L,38792L,38793L,38794L,38795L,38796L,38797L,
+38798L,38799L,38800L,38801L,38802L,38803L,38804L,38805L,38806L,38807L,
+38808L,38809L,38810L,38811L,38812L,38813L,38814L,38815L,38816L,38817L,
+38818L,38819L,38820L,38821L,38822L,38823L,38824L,38825L,38826L,38827L,
+38828L,38829L,38830L,38831L,38832L,38833L,38834L,38835L,38836L,38837L,
+38838L,38839L,38840L,38841L,38842L,38843L,38844L,38845L,38846L,38847L,
+38848L,38849L,38850L,38851L,38852L,38853L,38854L,38855L,38856L,38857L,
+38858L,38859L,38860L,38861L,38862L,38863L,38864L,38865L,38866L,38867L,
+38868L,38869L,38870L,38871L,38872L,38873L,38874L,38875L,38876L,38877L,
+38878L,38879L,38880L,38881L,38882L,38883L,38884L,38885L,38886L,38887L,
+38888L,38889L,38890L,38891L,38892L,38893L,38894L,38895L,38896L,38897L,
+38898L,38899L,38900L,38901L,38902L,38903L,38904L,38905L,38906L,38907L,
+38908L,38909L,38910L,38911L,38912L,38913L,38914L,38915L,38916L,38917L,
+38918L,38919L,38920L,38921L,38922L,38923L,38924L,38925L,38926L,38927L,
+38928L,38929L,38930L,38931L,38932L,38933L,38934L,38935L,38936L,38937L,
+38938L,38939L,38940L,38941L,38942L,38943L,38944L,38945L,38946L,38947L,
+38948L,38949L,38950L,38951L,38952L,38953L,38954L,38955L,38956L,38957L,
+38958L,38959L,38960L,38961L,38962L,38963L,38964L,38965L,38966L,38967L,
+38968L,38969L,38970L,38971L,38972L,38973L,38974L,38975L,38976L,38977L,
+38978L,38979L,38980L,38981L,38982L,38983L,38984L,38985L,38986L,38987L,
+38988L,38989L,38990L,38991L,38992L,38993L,38994L,38995L,38996L,38997L,
+38998L,38999L,39000L,39001L,39002L,39003L,39004L,39005L,39006L,39007L,
+39008L,39009L,39010L,39011L,39012L,39013L,39014L,39015L,39016L,39017L,
+39018L,39019L,39020L,39021L,39022L,39023L,39024L,39025L,39026L,39027L,
+39028L,39029L,39030L,39031L,39032L,39033L,39034L,39035L,39036L,39037L,
+39038L,39039L,39040L,39041L,39042L,39043L,39044L,39045L,39046L,39047L,
+39048L,39049L,39050L,39051L,39052L,39053L,39054L,39055L,39056L,39057L,
+39058L,39059L,39060L,39061L,39062L,39063L,39064L,39065L,39066L,39067L,
+39068L,39069L,39070L,39071L,39072L,39073L,39074L,39075L,39076L,39077L,
+39078L,39079L,39080L,39081L,39082L,39083L,39084L,39085L,39086L,39087L,
+39088L,39089L,39090L,39091L,39092L,39093L,39094L,39095L,39096L,39097L,
+39098L,39099L,39100L,39101L,39102L,39103L,39104L,39105L,39106L,39107L,
+39108L,39109L,39110L,39111L,39112L,39113L,39114L,39115L,39116L,39117L,
+39118L,39119L,39120L,39121L,39122L,39123L,39124L,39125L,39126L,39127L,
+39128L,39129L,39130L,39131L,39132L,39133L,39134L,39135L,39136L,39137L,
+39138L,39139L,39140L,39141L,39142L,39143L,39144L,39145L,39146L,39147L,
+39148L,39149L,39150L,39151L,39152L,39153L,39154L,39155L,39156L,39157L,
+39158L,39159L,39160L,39161L,39162L,39163L,39164L,39165L,39166L,39167L,
+39168L,39169L,39170L,39171L,39172L,39173L,39174L,39175L,39176L,39177L,
+39178L,39179L,39180L,39181L,39182L,39183L,39184L,39185L,39186L,39187L,
+39188L,39189L,39190L,39191L,39192L,39193L,39194L,39195L,39196L,39197L,
+39198L,39199L,39200L,39201L,39202L,39203L,39204L,39205L,39206L,39207L,
+39208L,39209L,39210L,39211L,39212L,39213L,39214L,39215L,39216L,39217L,
+39218L,39219L,39220L,39221L,39222L,39223L,39224L,39225L,39226L,39227L,
+39228L,39229L,39230L,39231L,39232L,39233L,39234L,39235L,39236L,39237L,
+39238L,39239L,39240L,39241L,39242L,39243L,39244L,39245L,39246L,39247L,
+39248L,39249L,39250L,39251L,39252L,39253L,39254L,39255L,39256L,39257L,
+39258L,39259L,39260L,39261L,39262L,39263L,39264L,39265L,39266L,39267L,
+39268L,39269L,39270L,39271L,39272L,39273L,39274L,39275L,39276L,39277L,
+39278L,39279L,39280L,39281L,39282L,39283L,39284L,39285L,39286L,39287L,
+39288L,39289L,39290L,39291L,39292L,39293L,39294L,39295L,39296L,39297L,
+39298L,39299L,39300L,39301L,39302L,39303L,39304L,39305L,39306L,39307L,
+39308L,39309L,39310L,39311L,39312L,39313L,39314L,39315L,39316L,39317L,
+39318L,39319L,39320L,39321L,39322L,39323L,39324L,39325L,39326L,39327L,
+39328L,39329L,39330L,39331L,39332L,39333L,39334L,39335L,39336L,39337L,
+39338L,39339L,39340L,39341L,39342L,39343L,39344L,39345L,39346L,39347L,
+39348L,39349L,39350L,39351L,39352L,39353L,39354L,39355L,39356L,39357L,
+39358L,39359L,39360L,39361L,39362L,39363L,39364L,39365L,39366L,39367L,
+39368L,39369L,39370L,39371L,39372L,39373L,39374L,39375L,39376L,39377L,
+39378L,39379L,39380L,39381L,39382L,39383L,39384L,39385L,39386L,39387L,
+39388L,39389L,39390L,39391L,39392L,39393L,39394L,39395L,39396L,39397L,
+39398L,39399L,39400L,39401L,39402L,39403L,39404L,39405L,39406L,39407L,
+39408L,39409L,39410L,39411L,39412L,39413L,39414L,39415L,39416L,39417L,
+39418L,39419L,39420L,39421L,39422L,39423L,39424L,39425L,39426L,39427L,
+39428L,39429L,39430L,39431L,39432L,39433L,39434L,39435L,39436L,39437L,
+39438L,39439L,39440L,39441L,39442L,39443L,39444L,39445L,39446L,39447L,
+39448L,39449L,39450L,39451L,39452L,39453L,39454L,39455L,39456L,39457L,
+39458L,39459L,39460L,39461L,39462L,39463L,39464L,39465L,39466L,39467L,
+39468L,39469L,39470L,39471L,39472L,39473L,39474L,39475L,39476L,39477L,
+39478L,39479L,39480L,39481L,39482L,39483L,39484L,39485L,39486L,39487L,
+39488L,39489L,39490L,39491L,39492L,39493L,39494L,39495L,39496L,39497L,
+39498L,39499L,39500L,39501L,39502L,39503L,39504L,39505L,39506L,39507L,
+39508L,39509L,39510L,39511L,39512L,39513L,39514L,39515L,39516L,39517L,
+39518L,39519L,39520L,39521L,39522L,39523L,39524L,39525L,39526L,39527L,
+39528L,39529L,39530L,39531L,39532L,39533L,39534L,39535L,39536L,39537L,
+39538L,39539L,39540L,39541L,39542L,39543L,39544L,39545L,39546L,39547L,
+39548L,39549L,39550L,39551L,39552L,39553L,39554L,39555L,39556L,39557L,
+39558L,39559L,39560L,39561L,39562L,39563L,39564L,39565L,39566L,39567L,
+39568L,39569L,39570L,39571L,39572L,39573L,39574L,39575L,39576L,39577L,
+39578L,39579L,39580L,39581L,39582L,39583L,39584L,39585L,39586L,39587L,
+39588L,39589L,39590L,39591L,39592L,39593L,39594L,39595L,39596L,39597L,
+39598L,39599L,39600L,39601L,39602L,39603L,39604L,39605L,39606L,39607L,
+39608L,39609L,39610L,39611L,39612L,39613L,39614L,39615L,39616L,39617L,
+39618L,39619L,39620L,39621L,39622L,39623L,39624L,39625L,39626L,39627L,
+39628L,39629L,39630L,39631L,39632L,39633L,39634L,39635L,39636L,39637L,
+39638L,39639L,39640L,39641L,39642L,39643L,39644L,39645L,39646L,39647L,
+39648L,39649L,39650L,39651L,39652L,39653L,39654L,39655L,39656L,39657L,
+39658L,39659L,39660L,39661L,39662L,39663L,39664L,39665L,39666L,39667L,
+39668L,39669L,39670L,39671L,39672L,39673L,39674L,39675L,39676L,39677L,
+39678L,39679L,39680L,39681L,39682L,39683L,39684L,39685L,39686L,39687L,
+39688L,39689L,39690L,39691L,39692L,39693L,39694L,39695L,39696L,39697L,
+39698L,39699L,39700L,39701L,39702L,39703L,39704L,39705L,39706L,39707L,
+39708L,39709L,39710L,39711L,39712L,39713L,39714L,39715L,39716L,39717L,
+39718L,39719L,39720L,39721L,39722L,39723L,39724L,39725L,39726L,39727L,
+39728L,39729L,39730L,39731L,39732L,39733L,39734L,39735L,39736L,39737L,
+39738L,39739L,39740L,39741L,39742L,39743L,39744L,39745L,39746L,39747L,
+39748L,39749L,39750L,39751L,39752L,39753L,39754L,39755L,39756L,39757L,
+39758L,39759L,39760L,39761L,39762L,39763L,39764L,39765L,39766L,39767L,
+39768L,39769L,39770L,39771L,39772L,39773L,39774L,39775L,39776L,39777L,
+39778L,39779L,39780L,39781L,39782L,39783L,39784L,39785L,39786L,39787L,
+39788L,39789L,39790L,39791L,39792L,39793L,39794L,39795L,39796L,39797L,
+39798L,39799L,39800L,39801L,39802L,39803L,39804L,39805L,39806L,39807L,
+39808L,39809L,39810L,39811L,39812L,39813L,39814L,39815L,39816L,39817L,
+39818L,39819L,39820L,39821L,39822L,39823L,39824L,39825L,39826L,39827L,
+39828L,39829L,39830L,39831L,39832L,39833L,39834L,39835L,39836L,39837L,
+39838L,39839L,39840L,39841L,39842L,39843L,39844L,39845L,39846L,39847L,
+39848L,39849L,39850L,39851L,39852L,39853L,39854L,39855L,39856L,39857L,
+39858L,39859L,39860L,39861L,39862L,39863L,39864L,39865L,39866L,39867L,
+39868L,39869L,39870L,39871L,39872L,39873L,39874L,39875L,39876L,39877L,
+39878L,39879L,39880L,39881L,39882L,39883L,39884L,39885L,39886L,39887L,
+39888L,39889L,39890L,39891L,39892L,39893L,39894L,39895L,39896L,39897L,
+39898L,39899L,39900L,39901L,39902L,39903L,39904L,39905L,39906L,39907L,
+39908L,39909L,39910L,39911L,39912L,39913L,39914L,39915L,39916L,39917L,
+39918L,39919L,39920L,39921L,39922L,39923L,39924L,39925L,39926L,39927L,
+39928L,39929L,39930L,39931L,39932L,39933L,39934L,39935L,39936L,39937L,
+39938L,39939L,39940L,39941L,39942L,39943L,39944L,39945L,39946L,39947L,
+39948L,39949L,39950L,39951L,39952L,39953L,39954L,39955L,39956L,39957L,
+39958L,39959L,39960L,39961L,39962L,39963L,39964L,39965L,39966L,39967L,
+39968L,39969L,39970L,39971L,39972L,39973L,39974L,39975L,39976L,39977L,
+39978L,39979L,39980L,39981L,39982L,39983L,39984L,39985L,39986L,39987L,
+39988L,39989L,39990L,39991L,39992L,39993L,39994L,39995L,39996L,39997L,
+39998L,39999L,40000L,40001L,40002L,40003L,40004L,40005L,40006L,40007L,
+40008L,40009L,40010L,40011L,40012L,40013L,40014L,40015L,40016L,40017L,
+40018L,40019L,40020L,40021L,40022L,40023L,40024L,40025L,40026L,40027L,
+40028L,40029L,40030L,40031L,40032L,40033L,40034L,40035L,40036L,40037L,
+40038L,40039L,40040L,40041L,40042L,40043L,40044L,40045L,40046L,40047L,
+40048L,40049L,40050L,40051L,40052L,40053L,40054L,40055L,40056L,40057L,
+40058L,40059L,40060L,40061L,40062L,40063L,40064L,40065L,40066L,40067L,
+40068L,40069L,40070L,40071L,40072L,40073L,40074L,40075L,40076L,40077L,
+40078L,40079L,40080L,40081L,40082L,40083L,40084L,40085L,40086L,40087L,
+40088L,40089L,40090L,40091L,40092L,40093L,40094L,40095L,40096L,40097L,
+40098L,40099L,40100L,40101L,40102L,40103L,40104L,40105L,40106L,40107L,
+40108L,40109L,40110L,40111L,40112L,40113L,40114L,40115L,40116L,40117L,
+40118L,40119L,40120L,40121L,40122L,40123L,40124L,40125L,40126L,40127L,
+40128L,40129L,40130L,40131L,40132L,40133L,40134L,40135L,40136L,40137L,
+40138L,40139L,40140L,40141L,40142L,40143L,40144L,40145L,40146L,40147L,
+40148L,40149L,40150L,40151L,40152L,40153L,40154L,40155L,40156L,40157L,
+40158L,40159L,40160L,40161L,40162L,40163L,40164L,40165L,40166L,40167L,
+40168L,40169L,40170L,40171L,40172L,40173L,40174L,40175L,40176L,40177L,
+40178L,40179L,40180L,40181L,40182L,40183L,40184L,40185L,40186L,40187L,
+40188L,40189L,40190L,40191L,40192L,40193L,40194L,40195L,40196L,40197L,
+40198L,40199L,40200L,40201L,40202L,40203L,40204L,40205L,40206L,40207L,
+40208L,40209L,40210L,40211L,40212L,40213L,40214L,40215L,40216L,40217L,
+40218L,40219L,40220L,40221L,40222L,40223L,40224L,40225L,40226L,40227L,
+40228L,40229L,40230L,40231L,40232L,40233L,40234L,40235L,40236L,40237L,
+40238L,40239L,40240L,40241L,40242L,40243L,40244L,40245L,40246L,40247L,
+40248L,40249L,40250L,40251L,40252L,40253L,40254L,40255L,40256L,40257L,
+40258L,40259L,40260L,40261L,40262L,40263L,40264L,40265L,40266L,40267L,
+40268L,40269L,40270L,40271L,40272L,40273L,40274L,40275L,40276L,40277L,
+40278L,40279L,40280L,40281L,40282L,40283L,40284L,40285L,40286L,40287L,
+40288L,40289L,40290L,40291L,40292L,40293L,40294L,40295L,40296L,40297L,
+40298L,40299L,40300L,40301L,40302L,40303L,40304L,40305L,40306L,40307L,
+40308L,40309L,40310L,40311L,40312L,40313L,40314L,40315L,40316L,40317L,
+40318L,40319L,40320L,40321L,40322L,40323L,40324L,40325L,40326L,40327L,
+40328L,40329L,40330L,40331L,40332L,40333L,40334L,40335L,40336L,40337L,
+40338L,40339L,40340L,40341L,40342L,40343L,40344L,40345L,40346L,40347L,
+40348L,40349L,40350L,40351L,40352L,40353L,40354L,40355L,40356L,40357L,
+40358L,40359L,40360L,40361L,40362L,40363L,40364L,40365L,40366L,40367L,
+40368L,40369L,40370L,40371L,40372L,40373L,40374L,40375L,40376L,40377L,
+40378L,40379L,40380L,40381L,40382L,40383L,40384L,40385L,40386L,40387L,
+40388L,40389L,40390L,40391L,40392L,40393L,40394L,40395L,40396L,40397L,
+40398L,40399L,40400L,40401L,40402L,40403L,40404L,40405L,40406L,40407L,
+40408L,40409L,40410L,40411L,40412L,40413L,40414L,40415L,40416L,40417L,
+40418L,40419L,40420L,40421L,40422L,40423L,40424L,40425L,40426L,40427L,
+40428L,40429L,40430L,40431L,40432L,40433L,40434L,40435L,40436L,40437L,
+40438L,40439L,40440L,40441L,40442L,40443L,40444L,40445L,40446L,40447L,
+40448L,40449L,40450L,40451L,40452L,40453L,40454L,40455L,40456L,40457L,
+40458L,40459L,40460L,40461L,40462L,40463L,40464L,40465L,40466L,40467L,
+40468L,40469L,40470L,40471L,40472L,40473L,40474L,40475L,40476L,40477L,
+40478L,40479L,40480L,40481L,40482L,40483L,40484L,40485L,40486L,40487L,
+40488L,40489L,40490L,40491L,40492L,40493L,40494L,40495L,40496L,40497L,
+40498L,40499L,40500L,40501L,40502L,40503L,40504L,40505L,40506L,40507L,
+40508L,40509L,40510L,40511L,40512L,40513L,40514L,40515L,40516L,40517L,
+40518L,40519L,40520L,40521L,40522L,40523L,40524L,40525L,40526L,40527L,
+40528L,40529L,40530L,40531L,40532L,40533L,40534L,40535L,40536L,40537L,
+40538L,40539L,40540L,40541L,40542L,40543L,40544L,40545L,40546L,40547L,
+40548L,40549L,40550L,40551L,40552L,40553L,40554L,40555L,40556L,40557L,
+40558L,40559L,40560L,40561L,40562L,40563L,40564L,40565L,40566L,40567L,
+40568L,40569L,40570L,40571L,40572L,40573L,40574L,40575L,40576L,40577L,
+40578L,40579L,40580L,40581L,40582L,40583L,40584L,40585L,40586L,40587L,
+40588L,40589L,40590L,40591L,40592L,40593L,40594L,40595L,40596L,40597L,
+40598L,40599L,40600L,40601L,40602L,40603L,40604L,40605L,40606L,40607L,
+40608L,40609L,40610L,40611L,40612L,40613L,40614L,40615L,40616L,40617L,
+40618L,40619L,40620L,40621L,40622L,40623L,40624L,40625L,40626L,40627L,
+40628L,40629L,40630L,40631L,40632L,40633L,40634L,40635L,40636L,40637L,
+40638L,40639L,40640L,40641L,40642L,40643L,40644L,40645L,40646L,40647L,
+40648L,40649L,40650L,40651L,40652L,40653L,40654L,40655L,40656L,40657L,
+40658L,40659L,40660L,40661L,40662L,40663L,40664L,40665L,40666L,40667L,
+40668L,40669L,40670L,40671L,40672L,40673L,40674L,40675L,40676L,40677L,
+40678L,40679L,40680L,40681L,40682L,40683L,40684L,40685L,40686L,40687L,
+40688L,40689L,40690L,40691L,40692L,40693L,40694L,40695L,40696L,40697L,
+40698L,40699L,40700L,40701L,40702L,40703L,40704L,40705L,40706L,40707L,
+40708L,40709L,40710L,40711L,40712L,40713L,40714L,40715L,40716L,40717L,
+40718L,40719L,40720L,40721L,40722L,40723L,40724L,40725L,40726L,40727L,
+40728L,40729L,40730L,40731L,40732L,40733L,40734L,40735L,40736L,40737L,
+40738L,40739L,40740L,40741L,40742L,40743L,40744L,40745L,40746L,40747L,
+40748L,40749L,40750L,40751L,40752L,40753L,40754L,40755L,40756L,40757L,
+40758L,40759L,40760L,40761L,40762L,40763L,40764L,40765L,40766L,40767L,
+40768L,40769L,40770L,40771L,40772L,40773L,40774L,40775L,40776L,40777L,
+40778L,40779L,40780L,40781L,40782L,40783L,40784L,40785L,40786L,40787L,
+40788L,40789L,40790L,40791L,40792L,40793L,40794L,40795L,40796L,40797L,
+40798L,40799L,40800L,40801L,40802L,40803L,40804L,40805L,40806L,40807L,
+40808L,40809L,40810L,40811L,40812L,40813L,40814L,40815L,40816L,40817L,
+40818L,40819L,40820L,40821L,40822L,40823L,40824L,40825L,40826L,40827L,
+40828L,40829L,40830L,40831L,40832L,40833L,40834L,40835L,40836L,40837L,
+40838L,40839L,40840L,40841L,40842L,40843L,40844L,40845L,40846L,40847L,
+40848L,40849L,40850L,40851L,40852L,40853L,40854L,40855L,40856L,40857L,
+40858L,40859L,40860L,40861L,40862L,40863L,40864L,40865L,40866L,40867L,
+40868L,40869L,40870L,40871L,40872L,40873L,40874L,40875L,40876L,40877L,
+40878L,40879L,40880L,40881L,40882L,40883L,40884L,40885L,40886L,40887L,
+40888L,40889L,40890L,40891L,40892L,40893L,40894L,40895L,40896L,40897L,
+40898L,40899L,40900L,40901L,40902L,40903L,40904L,40905L,40906L,40907L,
+40908L,40909L,40910L,40911L,40912L,40913L,40914L,40915L,40916L,40917L,
+40918L,40919L,40920L,40921L,40922L,40923L,40924L,40925L,40926L,40927L,
+40928L,40929L,40930L,40931L,40932L,40933L,40934L,40935L,40936L,40937L,
+40938L,40939L,40940L,40941L,40942L,40943L,40944L,40945L,40946L,40947L,
+40948L,40949L,40950L,40951L,40952L,40953L,40954L,40955L,40956L,40957L,
+40958L,40959L,40960L,40961L,40962L,40963L,40964L,40965L,40966L,40967L,
+40968L,40969L,40970L,40971L,40972L,40973L,40974L,40975L,40976L,40977L,
+40978L,40979L,40980L,40981L,40982L,40983L,40984L,40985L,40986L,40987L,
+40988L,40989L,40990L,40991L,40992L,40993L,40994L,40995L,40996L,40997L,
+40998L,40999L,41000L,41001L,41002L,41003L,41004L,41005L,41006L,41007L,
+41008L,41009L,41010L,41011L,41012L,41013L,41014L,41015L,41016L,41017L,
+41018L,41019L,41020L,41021L,41022L,41023L,41024L,41025L,41026L,41027L,
+41028L,41029L,41030L,41031L,41032L,41033L,41034L,41035L,41036L,41037L,
+41038L,41039L,41040L,41041L,41042L,41043L,41044L,41045L,41046L,41047L,
+41048L,41049L,41050L,41051L,41052L,41053L,41054L,41055L,41056L,41057L,
+41058L,41059L,41060L,41061L,41062L,41063L,41064L,41065L,41066L,41067L,
+41068L,41069L,41070L,41071L,41072L,41073L,41074L,41075L,41076L,41077L,
+41078L,41079L,41080L,41081L,41082L,41083L,41084L,41085L,41086L,41087L,
+41088L,41089L,41090L,41091L,41092L,41093L,41094L,41095L,41096L,41097L,
+41098L,41099L,41100L,41101L,41102L,41103L,41104L,41105L,41106L,41107L,
+41108L,41109L,41110L,41111L,41112L,41113L,41114L,41115L,41116L,41117L,
+41118L,41119L,41120L,41121L,41122L,41123L,41124L,41125L,41126L,41127L,
+41128L,41129L,41130L,41131L,41132L,41133L,41134L,41135L,41136L,41137L,
+41138L,41139L,41140L,41141L,41142L,41143L,41144L,41145L,41146L,41147L,
+41148L,41149L,41150L,41151L,41152L,41153L,41154L,41155L,41156L,41157L,
+41158L,41159L,41160L,41161L,41162L,41163L,41164L,41165L,41166L,41167L,
+41168L,41169L,41170L,41171L,41172L,41173L,41174L,41175L,41176L,41177L,
+41178L,41179L,41180L,41181L,41182L,41183L,41184L,41185L,41186L,41187L,
+41188L,41189L,41190L,41191L,41192L,41193L,41194L,41195L,41196L,41197L,
+41198L,41199L,41200L,41201L,41202L,41203L,41204L,41205L,41206L,41207L,
+41208L,41209L,41210L,41211L,41212L,41213L,41214L,41215L,41216L,41217L,
+41218L,41219L,41220L,41221L,41222L,41223L,41224L,41225L,41226L,41227L,
+41228L,41229L,41230L,41231L,41232L,41233L,41234L,41235L,41236L,41237L,
+41238L,41239L,41240L,41241L,41242L,41243L,41244L,41245L,41246L,41247L,
+41248L,41249L,41250L,41251L,41252L,41253L,41254L,41255L,41256L,41257L,
+41258L,41259L,41260L,41261L,41262L,41263L,41264L,41265L,41266L,41267L,
+41268L,41269L,41270L,41271L,41272L,41273L,41274L,41275L,41276L,41277L,
+41278L,41279L,41280L,41281L,41282L,41283L,41284L,41285L,41286L,41287L,
+41288L,41289L,41290L,41291L,41292L,41293L,41294L,41295L,41296L,41297L,
+41298L,41299L,41300L,41301L,41302L,41303L,41304L,41305L,41306L,41307L,
+41308L,41309L,41310L,41311L,41312L,41313L,41314L,41315L,41316L,41317L,
+41318L,41319L,41320L,41321L,41322L,41323L,41324L,41325L,41326L,41327L,
+41328L,41329L,41330L,41331L,41332L,41333L,41334L,41335L,41336L,41337L,
+41338L,41339L,41340L,41341L,41342L,41343L,41344L,41345L,41346L,41347L,
+41348L,41349L,41350L,41351L,41352L,41353L,41354L,41355L,41356L,41357L,
+41358L,41359L,41360L,41361L,41362L,41363L,41364L,41365L,41366L,41367L,
+41368L,41369L,41370L,41371L,41372L,41373L,41374L,41375L,41376L,41377L,
+41378L,41379L,41380L,41381L,41382L,41383L,41384L,41385L,41386L,41387L,
+41388L,41389L,41390L,41391L,41392L,41393L,41394L,41395L,41396L,41397L,
+41398L,41399L,41400L,41401L,41402L,41403L,41404L,41405L,41406L,41407L,
+41408L,41409L,41410L,41411L,41412L,41413L,41414L,41415L,41416L,41417L,
+41418L,41419L,41420L,41421L,41422L,41423L,41424L,41425L,41426L,41427L,
+41428L,41429L,41430L,41431L,41432L,41433L,41434L,41435L,41436L,41437L,
+41438L,41439L,41440L,41441L,41442L,41443L,41444L,41445L,41446L,41447L,
+41448L,41449L,41450L,41451L,41452L,41453L,41454L,41455L,41456L,41457L,
+41458L,41459L,41460L,41461L,41462L,41463L,41464L,41465L,41466L,41467L,
+41468L,41469L,41470L,41471L,41472L,41473L,41474L,41475L,41476L,41477L,
+41478L,41479L,41480L,41481L,41482L,41483L,41484L,41485L,41486L,41487L,
+41488L,41489L,41490L,41491L,41492L,41493L,41494L,41495L,41496L,41497L,
+41498L,41499L,41500L,41501L,41502L,41503L,41504L,41505L,41506L,41507L,
+41508L,41509L,41510L,41511L,41512L,41513L,41514L,41515L,41516L,41517L,
+41518L,41519L,41520L,41521L,41522L,41523L,41524L,41525L,41526L,41527L,
+41528L,41529L,41530L,41531L,41532L,41533L,41534L,41535L,41536L,41537L,
+41538L,41539L,41540L,41541L,41542L,41543L,41544L,41545L,41546L,41547L,
+41548L,41549L,41550L,41551L,41552L,41553L,41554L,41555L,41556L,41557L,
+41558L,41559L,41560L,41561L,41562L,41563L,41564L,41565L,41566L,41567L,
+41568L,41569L,41570L,41571L,41572L,41573L,41574L,41575L,41576L,41577L,
+41578L,41579L,41580L,41581L,41582L,41583L,41584L,41585L,41586L,41587L,
+41588L,41589L,41590L,41591L,41592L,41593L,41594L,41595L,41596L,41597L,
+41598L,41599L,41600L,41601L,41602L,41603L,41604L,41605L,41606L,41607L,
+41608L,41609L,41610L,41611L,41612L,41613L,41614L,41615L,41616L,41617L,
+41618L,41619L,41620L,41621L,41622L,41623L,41624L,41625L,41626L,41627L,
+41628L,41629L,41630L,41631L,41632L,41633L,41634L,41635L,41636L,41637L,
+41638L,41639L,41640L,41641L,41642L,41643L,41644L,41645L,41646L,41647L,
+41648L,41649L,41650L,41651L,41652L,41653L,41654L,41655L,41656L,41657L,
+41658L,41659L,41660L,41661L,41662L,41663L,41664L,41665L,41666L,41667L,
+41668L,41669L,41670L,41671L,41672L,41673L,41674L,41675L,41676L,41677L,
+41678L,41679L,41680L,41681L,41682L,41683L,41684L,41685L,41686L,41687L,
+41688L,41689L,41690L,41691L,41692L,41693L,41694L,41695L,41696L,41697L,
+41698L,41699L,41700L,41701L,41702L,41703L,41704L,41705L,41706L,41707L,
+41708L,41709L,41710L,41711L,41712L,41713L,41714L,41715L,41716L,41717L,
+41718L,41719L,41720L,41721L,41722L,41723L,41724L,41725L,41726L,41727L,
+41728L,41729L,41730L,41731L,41732L,41733L,41734L,41735L,41736L,41737L,
+41738L,41739L,41740L,41741L,41742L,41743L,41744L,41745L,41746L,41747L,
+41748L,41749L,41750L,41751L,41752L,41753L,41754L,41755L,41756L,41757L,
+41758L,41759L,41760L,41761L,41762L,41763L,41764L,41765L,41766L,41767L,
+41768L,41769L,41770L,41771L,41772L,41773L,41774L,41775L,41776L,41777L,
+41778L,41779L,41780L,41781L,41782L,41783L,41784L,41785L,41786L,41787L,
+41788L,41789L,41790L,41791L,41792L,41793L,41794L,41795L,41796L,41797L,
+41798L,41799L,41800L,41801L,41802L,41803L,41804L,41805L,41806L,41807L,
+41808L,41809L,41810L,41811L,41812L,41813L,41814L,41815L,41816L,41817L,
+41818L,41819L,41820L,41821L,41822L,41823L,41824L,41825L,41826L,41827L,
+41828L,41829L,41830L,41831L,41832L,41833L,41834L,41835L,41836L,41837L,
+41838L,41839L,41840L,41841L,41842L,41843L,41844L,41845L,41846L,41847L,
+41848L,41849L,41850L,41851L,41852L,41853L,41854L,41855L,41856L,41857L,
+41858L,41859L,41860L,41861L,41862L,41863L,41864L,41865L,41866L,41867L,
+41868L,41869L,41870L,41871L,41872L,41873L,41874L,41875L,41876L,41877L,
+41878L,41879L,41880L,41881L,41882L,41883L,41884L,41885L,41886L,41887L,
+41888L,41889L,41890L,41891L,41892L,41893L,41894L,41895L,41896L,41897L,
+41898L,41899L,41900L,41901L,41902L,41903L,41904L,41905L,41906L,41907L,
+41908L,41909L,41910L,41911L,41912L,41913L,41914L,41915L,41916L,41917L,
+41918L,41919L,41920L,41921L,41922L,41923L,41924L,41925L,41926L,41927L,
+41928L,41929L,41930L,41931L,41932L,41933L,41934L,41935L,41936L,41937L,
+41938L,41939L,41940L,41941L,41942L,41943L,41944L,41945L,41946L,41947L,
+41948L,41949L,41950L,41951L,41952L,41953L,41954L,41955L,41956L,41957L,
+41958L,41959L,41960L,41961L,41962L,41963L,41964L,41965L,41966L,41967L,
+41968L,41969L,41970L,41971L,41972L,41973L,41974L,41975L,41976L,41977L,
+41978L,41979L,41980L,41981L,41982L,41983L,41984L,41985L,41986L,41987L,
+41988L,41989L,41990L,41991L,41992L,41993L,41994L,41995L,41996L,41997L,
+41998L,41999L,42000L,42001L,42002L,42003L,42004L,42005L,42006L,42007L,
+42008L,42009L,42010L,42011L,42012L,42013L,42014L,42015L,42016L,42017L,
+42018L,42019L,42020L,42021L,42022L,42023L,42024L,42025L,42026L,42027L,
+42028L,42029L,42030L,42031L,42032L,42033L,42034L,42035L,42036L,42037L,
+42038L,42039L,42040L,42041L,42042L,42043L,42044L,42045L,42046L,42047L,
+42048L,42049L,42050L,42051L,42052L,42053L,42054L,42055L,42056L,42057L,
+42058L,42059L,42060L,42061L,42062L,42063L,42064L,42065L,42066L,42067L,
+42068L,42069L,42070L,42071L,42072L,42073L,42074L,42075L,42076L,42077L,
+42078L,42079L,42080L,42081L,42082L,42083L,42084L,42085L,42086L,42087L,
+42088L,42089L,42090L,42091L,42092L,42093L,42094L,42095L,42096L,42097L,
+42098L,42099L,42100L,42101L,42102L,42103L,42104L,42105L,42106L,42107L,
+42108L,42109L,42110L,42111L,42112L,42113L,42114L,42115L,42116L,42117L,
+42118L,42119L,42120L,42121L,42122L,42123L,42124L,42125L,42126L,42127L,
+42128L,42129L,42130L,42131L,42132L,42133L,42134L,42135L,42136L,42137L,
+42138L,42139L,42140L,42141L,42142L,42143L,42144L,42145L,42146L,42147L,
+42148L,42149L,42150L,42151L,42152L,42153L,42154L,42155L,42156L,42157L,
+42158L,42159L,42160L,42161L,42162L,42163L,42164L,42165L,42166L,42167L,
+42168L,42169L,42170L,42171L,42172L,42173L,42174L,42175L,42176L,42177L,
+42178L,42179L,42180L,42181L,42182L,42183L,42184L,42185L,42186L,42187L,
+42188L,42189L,42190L,42191L,42192L,42193L,42194L,42195L,42196L,42197L,
+42198L,42199L,42200L,42201L,42202L,42203L,42204L,42205L,42206L,42207L,
+42208L,42209L,42210L,42211L,42212L,42213L,42214L,42215L,42216L,42217L,
+42218L,42219L,42220L,42221L,42222L,42223L,42224L,42225L,42226L,42227L,
+42228L,42229L,42230L,42231L,42232L,42233L,42234L,42235L,42236L,42237L,
+42238L,42239L,42240L,42241L,42242L,42243L,42244L,42245L,42246L,42247L,
+42248L,42249L,42250L,42251L,42252L,42253L,42254L,42255L,42256L,42257L,
+42258L,42259L,42260L,42261L,42262L,42263L,42264L,42265L,42266L,42267L,
+42268L,42269L,42270L,42271L,42272L,42273L,42274L,42275L,42276L,42277L,
+42278L,42279L,42280L,42281L,42282L,42283L,42284L,42285L,42286L,42287L,
+42288L,42289L,42290L,42291L,42292L,42293L,42294L,42295L,42296L,42297L,
+42298L,42299L,42300L,42301L,42302L,42303L,42304L,42305L,42306L,42307L,
+42308L,42309L,42310L,42311L,42312L,42313L,42314L,42315L,42316L,42317L,
+42318L,42319L,42320L,42321L,42322L,42323L,42324L,42325L,42326L,42327L,
+42328L,42329L,42330L,42331L,42332L,42333L,42334L,42335L,42336L,42337L,
+42338L,42339L,42340L,42341L,42342L,42343L,42344L,42345L,42346L,42347L,
+42348L,42349L,42350L,42351L,42352L,42353L,42354L,42355L,42356L,42357L,
+42358L,42359L,42360L,42361L,42362L,42363L,42364L,42365L,42366L,42367L,
+42368L,42369L,42370L,42371L,42372L,42373L,42374L,42375L,42376L,42377L,
+42378L,42379L,42380L,42381L,42382L,42383L,42384L,42385L,42386L,42387L,
+42388L,42389L,42390L,42391L,42392L,42393L,42394L,42395L,42396L,42397L,
+42398L,42399L,42400L,42401L,42402L,42403L,42404L,42405L,42406L,42407L,
+42408L,42409L,42410L,42411L,42412L,42413L,42414L,42415L,42416L,42417L,
+42418L,42419L,42420L,42421L,42422L,42423L,42424L,42425L,42426L,42427L,
+42428L,42429L,42430L,42431L,42432L,42433L,42434L,42435L,42436L,42437L,
+42438L,42439L,42440L,42441L,42442L,42443L,42444L,42445L,42446L,42447L,
+42448L,42449L,42450L,42451L,42452L,42453L,42454L,42455L,42456L,42457L,
+42458L,42459L,42460L,42461L,42462L,42463L,42464L,42465L,42466L,42467L,
+42468L,42469L,42470L,42471L,42472L,42473L,42474L,42475L,42476L,42477L,
+42478L,42479L,42480L,42481L,42482L,42483L,42484L,42485L,42486L,42487L,
+42488L,42489L,42490L,42491L,42492L,42493L,42494L,42495L,42496L,42497L,
+42498L,42499L,42500L,42501L,42502L,42503L,42504L,42505L,42506L,42507L,
+42508L,42509L,42510L,42511L,42512L,42513L,42514L,42515L,42516L,42517L,
+42518L,42519L,42520L,42521L,42522L,42523L,42524L,42525L,42526L,42527L,
+42528L,42529L,42530L,42531L,42532L,42533L,42534L,42535L,42536L,42537L,
+42538L,42539L,42540L,42541L,42542L,42543L,42544L,42545L,42546L,42547L,
+42548L,42549L,42550L,42551L,42552L,42553L,42554L,42555L,42556L,42557L,
+42558L,42559L,42560L,42560L,42562L,42562L,42564L,42564L,42566L,42566L,
+42568L,42568L,42570L,42570L,42572L,42572L,42574L,42574L,42576L,42576L,
+42578L,42578L,42580L,42580L,42582L,42582L,42584L,42584L,42586L,42586L,
+42588L,42588L,42590L,42590L,42592L,42592L,42594L,42594L,42596L,42596L,
+42598L,42598L,42600L,42600L,42602L,42602L,42604L,42604L,42606L,42607L,
+42608L,42609L,42610L,42611L,42612L,42613L,42614L,42615L,42616L,42617L,
+42618L,42619L,42620L,42621L,42622L,42623L,42624L,42624L,42626L,42626L,
+42628L,42628L,42630L,42630L,42632L,42632L,42634L,42634L,42636L,42636L,
+42638L,42638L,42640L,42640L,42642L,42642L,42644L,42644L,42646L,42646L,
+42648L,42648L,42650L,42650L,42652L,42653L,42654L,42655L,42656L,42657L,
+42658L,42659L,42660L,42661L,42662L,42663L,42664L,42665L,42666L,42667L,
+42668L,42669L,42670L,42671L,42672L,42673L,42674L,42675L,42676L,42677L,
+42678L,42679L,42680L,42681L,42682L,42683L,42684L,42685L,42686L,42687L,
+42688L,42689L,42690L,42691L,42692L,42693L,42694L,42695L,42696L,42697L,
+42698L,42699L,42700L,42701L,42702L,42703L,42704L,42705L,42706L,42707L,
+42708L,42709L,42710L,42711L,42712L,42713L,42714L,42715L,42716L,42717L,
+42718L,42719L,42720L,42721L,42722L,42723L,42724L,42725L,42726L,42727L,
+42728L,42729L,42730L,42731L,42732L,42733L,42734L,42735L,42736L,42737L,
+42738L,42739L,42740L,42741L,42742L,42743L,42744L,42745L,42746L,42747L,
+42748L,42749L,42750L,42751L,42752L,42753L,42754L,42755L,42756L,42757L,
+42758L,42759L,42760L,42761L,42762L,42763L,42764L,42765L,42766L,42767L,
+42768L,42769L,42770L,42771L,42772L,42773L,42774L,42775L,42776L,42777L,
+42778L,42779L,42780L,42781L,42782L,42783L,42784L,42785L,42786L,42786L,
+42788L,42788L,42790L,42790L,42792L,42792L,42794L,42794L,42796L,42796L,
+42798L,42798L,42800L,42801L,42802L,42802L,42804L,42804L,42806L,42806L,
+42808L,42808L,42810L,42810L,42812L,42812L,42814L,42814L,42816L,42816L,
+42818L,42818L,42820L,42820L,42822L,42822L,42824L,42824L,42826L,42826L,
+42828L,42828L,42830L,42830L,42832L,42832L,42834L,42834L,42836L,42836L,
+42838L,42838L,42840L,42840L,42842L,42842L,42844L,42844L,42846L,42846L,
+42848L,42848L,42850L,42850L,42852L,42852L,42854L,42854L,42856L,42856L,
+42858L,42858L,42860L,42860L,42862L,42862L,42864L,42865L,42866L,42867L,
+42868L,42869L,42870L,42871L,42872L,42873L,42873L,42875L,42875L,42877L,
+42878L,42878L,42880L,42880L,42882L,42882L,42884L,42884L,42886L,42886L,
+42888L,42889L,42890L,42891L,42891L,42893L,42894L,42895L,42896L,42896L,
+42898L,42898L,42948L,42901L,42902L,42902L,42904L,42904L,42906L,42906L,
+42908L,42908L,42910L,42910L,42912L,42912L,42914L,42914L,42916L,42916L,
+42918L,42918L,42920L,42920L,42922L,42923L,42924L,42925L,42926L,42927L,
+42928L,42929L,42930L,42931L,42932L,42932L,42934L,42934L,42936L,42936L,
+42938L,42938L,42940L,42940L,42942L,42942L,42944L,42945L,42946L,42946L,
+42948L,42949L,42950L,42951L,42952L,42953L,42954L,42955L,42956L,42957L,
+42958L,42959L,42960L,42961L,42962L,42963L,42964L,42965L,42966L,42967L,
+42968L,42969L,42970L,42971L,42972L,42973L,42974L,42975L,42976L,42977L,
+42978L,42979L,42980L,42981L,42982L,42983L,42984L,42985L,42986L,42987L,
+42988L,42989L,42990L,42991L,42992L,42993L,42994L,42995L,42996L,42997L,
+42998L,42999L,43000L,43001L,43002L,43003L,43004L,43005L,43006L,43007L,
+43008L,43009L,43010L,43011L,43012L,43013L,43014L,43015L,43016L,43017L,
+43018L,43019L,43020L,43021L,43022L,43023L,43024L,43025L,43026L,43027L,
+43028L,43029L,43030L,43031L,43032L,43033L,43034L,43035L,43036L,43037L,
+43038L,43039L,43040L,43041L,43042L,43043L,43044L,43045L,43046L,43047L,
+43048L,43049L,43050L,43051L,43052L,43053L,43054L,43055L,43056L,43057L,
+43058L,43059L,43060L,43061L,43062L,43063L,43064L,43065L,43066L,43067L,
+43068L,43069L,43070L,43071L,43072L,43073L,43074L,43075L,43076L,43077L,
+43078L,43079L,43080L,43081L,43082L,43083L,43084L,43085L,43086L,43087L,
+43088L,43089L,43090L,43091L,43092L,43093L,43094L,43095L,43096L,43097L,
+43098L,43099L,43100L,43101L,43102L,43103L,43104L,43105L,43106L,43107L,
+43108L,43109L,43110L,43111L,43112L,43113L,43114L,43115L,43116L,43117L,
+43118L,43119L,43120L,43121L,43122L,43123L,43124L,43125L,43126L,43127L,
+43128L,43129L,43130L,43131L,43132L,43133L,43134L,43135L,43136L,43137L,
+43138L,43139L,43140L,43141L,43142L,43143L,43144L,43145L,43146L,43147L,
+43148L,43149L,43150L,43151L,43152L,43153L,43154L,43155L,43156L,43157L,
+43158L,43159L,43160L,43161L,43162L,43163L,43164L,43165L,43166L,43167L,
+43168L,43169L,43170L,43171L,43172L,43173L,43174L,43175L,43176L,43177L,
+43178L,43179L,43180L,43181L,43182L,43183L,43184L,43185L,43186L,43187L,
+43188L,43189L,43190L,43191L,43192L,43193L,43194L,43195L,43196L,43197L,
+43198L,43199L,43200L,43201L,43202L,43203L,43204L,43205L,43206L,43207L,
+43208L,43209L,43210L,43211L,43212L,43213L,43214L,43215L,43216L,43217L,
+43218L,43219L,43220L,43221L,43222L,43223L,43224L,43225L,43226L,43227L,
+43228L,43229L,43230L,43231L,43232L,43233L,43234L,43235L,43236L,43237L,
+43238L,43239L,43240L,43241L,43242L,43243L,43244L,43245L,43246L,43247L,
+43248L,43249L,43250L,43251L,43252L,43253L,43254L,43255L,43256L,43257L,
+43258L,43259L,43260L,43261L,43262L,43263L,43264L,43265L,43266L,43267L,
+43268L,43269L,43270L,43271L,43272L,43273L,43274L,43275L,43276L,43277L,
+43278L,43279L,43280L,43281L,43282L,43283L,43284L,43285L,43286L,43287L,
+43288L,43289L,43290L,43291L,43292L,43293L,43294L,43295L,43296L,43297L,
+43298L,43299L,43300L,43301L,43302L,43303L,43304L,43305L,43306L,43307L,
+43308L,43309L,43310L,43311L,43312L,43313L,43314L,43315L,43316L,43317L,
+43318L,43319L,43320L,43321L,43322L,43323L,43324L,43325L,43326L,43327L,
+43328L,43329L,43330L,43331L,43332L,43333L,43334L,43335L,43336L,43337L,
+43338L,43339L,43340L,43341L,43342L,43343L,43344L,43345L,43346L,43347L,
+43348L,43349L,43350L,43351L,43352L,43353L,43354L,43355L,43356L,43357L,
+43358L,43359L,43360L,43361L,43362L,43363L,43364L,43365L,43366L,43367L,
+43368L,43369L,43370L,43371L,43372L,43373L,43374L,43375L,43376L,43377L,
+43378L,43379L,43380L,43381L,43382L,43383L,43384L,43385L,43386L,43387L,
+43388L,43389L,43390L,43391L,43392L,43393L,43394L,43395L,43396L,43397L,
+43398L,43399L,43400L,43401L,43402L,43403L,43404L,43405L,43406L,43407L,
+43408L,43409L,43410L,43411L,43412L,43413L,43414L,43415L,43416L,43417L,
+43418L,43419L,43420L,43421L,43422L,43423L,43424L,43425L,43426L,43427L,
+43428L,43429L,43430L,43431L,43432L,43433L,43434L,43435L,43436L,43437L,
+43438L,43439L,43440L,43441L,43442L,43443L,43444L,43445L,43446L,43447L,
+43448L,43449L,43450L,43451L,43452L,43453L,43454L,43455L,43456L,43457L,
+43458L,43459L,43460L,43461L,43462L,43463L,43464L,43465L,43466L,43467L,
+43468L,43469L,43470L,43471L,43472L,43473L,43474L,43475L,43476L,43477L,
+43478L,43479L,43480L,43481L,43482L,43483L,43484L,43485L,43486L,43487L,
+43488L,43489L,43490L,43491L,43492L,43493L,43494L,43495L,43496L,43497L,
+43498L,43499L,43500L,43501L,43502L,43503L,43504L,43505L,43506L,43507L,
+43508L,43509L,43510L,43511L,43512L,43513L,43514L,43515L,43516L,43517L,
+43518L,43519L,43520L,43521L,43522L,43523L,43524L,43525L,43526L,43527L,
+43528L,43529L,43530L,43531L,43532L,43533L,43534L,43535L,43536L,43537L,
+43538L,43539L,43540L,43541L,43542L,43543L,43544L,43545L,43546L,43547L,
+43548L,43549L,43550L,43551L,43552L,43553L,43554L,43555L,43556L,43557L,
+43558L,43559L,43560L,43561L,43562L,43563L,43564L,43565L,43566L,43567L,
+43568L,43569L,43570L,43571L,43572L,43573L,43574L,43575L,43576L,43577L,
+43578L,43579L,43580L,43581L,43582L,43583L,43584L,43585L,43586L,43587L,
+43588L,43589L,43590L,43591L,43592L,43593L,43594L,43595L,43596L,43597L,
+43598L,43599L,43600L,43601L,43602L,43603L,43604L,43605L,43606L,43607L,
+43608L,43609L,43610L,43611L,43612L,43613L,43614L,43615L,43616L,43617L,
+43618L,43619L,43620L,43621L,43622L,43623L,43624L,43625L,43626L,43627L,
+43628L,43629L,43630L,43631L,43632L,43633L,43634L,43635L,43636L,43637L,
+43638L,43639L,43640L,43641L,43642L,43643L,43644L,43645L,43646L,43647L,
+43648L,43649L,43650L,43651L,43652L,43653L,43654L,43655L,43656L,43657L,
+43658L,43659L,43660L,43661L,43662L,43663L,43664L,43665L,43666L,43667L,
+43668L,43669L,43670L,43671L,43672L,43673L,43674L,43675L,43676L,43677L,
+43678L,43679L,43680L,43681L,43682L,43683L,43684L,43685L,43686L,43687L,
+43688L,43689L,43690L,43691L,43692L,43693L,43694L,43695L,43696L,43697L,
+43698L,43699L,43700L,43701L,43702L,43703L,43704L,43705L,43706L,43707L,
+43708L,43709L,43710L,43711L,43712L,43713L,43714L,43715L,43716L,43717L,
+43718L,43719L,43720L,43721L,43722L,43723L,43724L,43725L,43726L,43727L,
+43728L,43729L,43730L,43731L,43732L,43733L,43734L,43735L,43736L,43737L,
+43738L,43739L,43740L,43741L,43742L,43743L,43744L,43745L,43746L,43747L,
+43748L,43749L,43750L,43751L,43752L,43753L,43754L,43755L,43756L,43757L,
+43758L,43759L,43760L,43761L,43762L,43763L,43764L,43765L,43766L,43767L,
+43768L,43769L,43770L,43771L,43772L,43773L,43774L,43775L,43776L,43777L,
+43778L,43779L,43780L,43781L,43782L,43783L,43784L,43785L,43786L,43787L,
+43788L,43789L,43790L,43791L,43792L,43793L,43794L,43795L,43796L,43797L,
+43798L,43799L,43800L,43801L,43802L,43803L,43804L,43805L,43806L,43807L,
+43808L,43809L,43810L,43811L,43812L,43813L,43814L,43815L,43816L,43817L,
+43818L,43819L,43820L,43821L,43822L,43823L,43824L,43825L,43826L,43827L,
+43828L,43829L,43830L,43831L,43832L,43833L,43834L,43835L,43836L,43837L,
+43838L,43839L,43840L,43841L,43842L,43843L,43844L,43845L,43846L,43847L,
+43848L,43849L,43850L,43851L,43852L,43853L,43854L,43855L,43856L,43857L,
+43858L,42931L,43860L,43861L,43862L,43863L,43864L,43865L,43866L,43867L,
+43868L,43869L,43870L,43871L,43872L,43873L,43874L,43875L,43876L,43877L,
+43878L,43879L,43880L,43881L,43882L,43883L,43884L,43885L,43886L,43887L,5024,
+5025,5026,5027,5028,5029,5030,5031,5032,5033,5034,5035,5036,5037,5038,5039,
+5040,5041,5042,5043,5044,5045,5046,5047,5048,5049,5050,5051,5052,5053,5054,
+5055,5056,5057,5058,5059,5060,5061,5062,5063,5064,5065,5066,5067,5068,5069,
+5070,5071,5072,5073,5074,5075,5076,5077,5078,5079,5080,5081,5082,5083,5084,
+5085,5086,5087,5088,5089,5090,5091,5092,5093,5094,5095,5096,5097,5098,5099,
+5100,5101,5102,5103,43968L,43969L,43970L,43971L,43972L,43973L,43974L,
+43975L,43976L,43977L,43978L,43979L,43980L,43981L,43982L,43983L,43984L,
+43985L,43986L,43987L,43988L,43989L,43990L,43991L,43992L,43993L,43994L,
+43995L,43996L,43997L,43998L,43999L,44000L,44001L,44002L,44003L,44004L,
+44005L,44006L,44007L,44008L,44009L,44010L,44011L,44012L,44013L,44014L,
+44015L,44016L,44017L,44018L,44019L,44020L,44021L,44022L,44023L,44024L,
+44025L,44026L,44027L,44028L,44029L,44030L,44031L,44032L,44033L,44034L,
+44035L,44036L,44037L,44038L,44039L,44040L,44041L,44042L,44043L,44044L,
+44045L,44046L,44047L,44048L,44049L,44050L,44051L,44052L,44053L,44054L,
+44055L,44056L,44057L,44058L,44059L,44060L,44061L,44062L,44063L,44064L,
+44065L,44066L,44067L,44068L,44069L,44070L,44071L,44072L,44073L,44074L,
+44075L,44076L,44077L,44078L,44079L,44080L,44081L,44082L,44083L,44084L,
+44085L,44086L,44087L,44088L,44089L,44090L,44091L,44092L,44093L,44094L,
+44095L,44096L,44097L,44098L,44099L,44100L,44101L,44102L,44103L,44104L,
+44105L,44106L,44107L,44108L,44109L,44110L,44111L,44112L,44113L,44114L,
+44115L,44116L,44117L,44118L,44119L,44120L,44121L,44122L,44123L,44124L,
+44125L,44126L,44127L,44128L,44129L,44130L,44131L,44132L,44133L,44134L,
+44135L,44136L,44137L,44138L,44139L,44140L,44141L,44142L,44143L,44144L,
+44145L,44146L,44147L,44148L,44149L,44150L,44151L,44152L,44153L,44154L,
+44155L,44156L,44157L,44158L,44159L,44160L,44161L,44162L,44163L,44164L,
+44165L,44166L,44167L,44168L,44169L,44170L,44171L,44172L,44173L,44174L,
+44175L,44176L,44177L,44178L,44179L,44180L,44181L,44182L,44183L,44184L,
+44185L,44186L,44187L,44188L,44189L,44190L,44191L,44192L,44193L,44194L,
+44195L,44196L,44197L,44198L,44199L,44200L,44201L,44202L,44203L,44204L,
+44205L,44206L,44207L,44208L,44209L,44210L,44211L,44212L,44213L,44214L,
+44215L,44216L,44217L,44218L,44219L,44220L,44221L,44222L,44223L,44224L,
+44225L,44226L,44227L,44228L,44229L,44230L,44231L,44232L,44233L,44234L,
+44235L,44236L,44237L,44238L,44239L,44240L,44241L,44242L,44243L,44244L,
+44245L,44246L,44247L,44248L,44249L,44250L,44251L,44252L,44253L,44254L,
+44255L,44256L,44257L,44258L,44259L,44260L,44261L,44262L,44263L,44264L,
+44265L,44266L,44267L,44268L,44269L,44270L,44271L,44272L,44273L,44274L,
+44275L,44276L,44277L,44278L,44279L,44280L,44281L,44282L,44283L,44284L,
+44285L,44286L,44287L,44288L,44289L,44290L,44291L,44292L,44293L,44294L,
+44295L,44296L,44297L,44298L,44299L,44300L,44301L,44302L,44303L,44304L,
+44305L,44306L,44307L,44308L,44309L,44310L,44311L,44312L,44313L,44314L,
+44315L,44316L,44317L,44318L,44319L,44320L,44321L,44322L,44323L,44324L,
+44325L,44326L,44327L,44328L,44329L,44330L,44331L,44332L,44333L,44334L,
+44335L,44336L,44337L,44338L,44339L,44340L,44341L,44342L,44343L,44344L,
+44345L,44346L,44347L,44348L,44349L,44350L,44351L,44352L,44353L,44354L,
+44355L,44356L,44357L,44358L,44359L,44360L,44361L,44362L,44363L,44364L,
+44365L,44366L,44367L,44368L,44369L,44370L,44371L,44372L,44373L,44374L,
+44375L,44376L,44377L,44378L,44379L,44380L,44381L,44382L,44383L,44384L,
+44385L,44386L,44387L,44388L,44389L,44390L,44391L,44392L,44393L,44394L,
+44395L,44396L,44397L,44398L,44399L,44400L,44401L,44402L,44403L,44404L,
+44405L,44406L,44407L,44408L,44409L,44410L,44411L,44412L,44413L,44414L,
+44415L,44416L,44417L,44418L,44419L,44420L,44421L,44422L,44423L,44424L,
+44425L,44426L,44427L,44428L,44429L,44430L,44431L,44432L,44433L,44434L,
+44435L,44436L,44437L,44438L,44439L,44440L,44441L,44442L,44443L,44444L,
+44445L,44446L,44447L,44448L,44449L,44450L,44451L,44452L,44453L,44454L,
+44455L,44456L,44457L,44458L,44459L,44460L,44461L,44462L,44463L,44464L,
+44465L,44466L,44467L,44468L,44469L,44470L,44471L,44472L,44473L,44474L,
+44475L,44476L,44477L,44478L,44479L,44480L,44481L,44482L,44483L,44484L,
+44485L,44486L,44487L,44488L,44489L,44490L,44491L,44492L,44493L,44494L,
+44495L,44496L,44497L,44498L,44499L,44500L,44501L,44502L,44503L,44504L,
+44505L,44506L,44507L,44508L,44509L,44510L,44511L,44512L,44513L,44514L,
+44515L,44516L,44517L,44518L,44519L,44520L,44521L,44522L,44523L,44524L,
+44525L,44526L,44527L,44528L,44529L,44530L,44531L,44532L,44533L,44534L,
+44535L,44536L,44537L,44538L,44539L,44540L,44541L,44542L,44543L,44544L,
+44545L,44546L,44547L,44548L,44549L,44550L,44551L,44552L,44553L,44554L,
+44555L,44556L,44557L,44558L,44559L,44560L,44561L,44562L,44563L,44564L,
+44565L,44566L,44567L,44568L,44569L,44570L,44571L,44572L,44573L,44574L,
+44575L,44576L,44577L,44578L,44579L,44580L,44581L,44582L,44583L,44584L,
+44585L,44586L,44587L,44588L,44589L,44590L,44591L,44592L,44593L,44594L,
+44595L,44596L,44597L,44598L,44599L,44600L,44601L,44602L,44603L,44604L,
+44605L,44606L,44607L,44608L,44609L,44610L,44611L,44612L,44613L,44614L,
+44615L,44616L,44617L,44618L,44619L,44620L,44621L,44622L,44623L,44624L,
+44625L,44626L,44627L,44628L,44629L,44630L,44631L,44632L,44633L,44634L,
+44635L,44636L,44637L,44638L,44639L,44640L,44641L,44642L,44643L,44644L,
+44645L,44646L,44647L,44648L,44649L,44650L,44651L,44652L,44653L,44654L,
+44655L,44656L,44657L,44658L,44659L,44660L,44661L,44662L,44663L,44664L,
+44665L,44666L,44667L,44668L,44669L,44670L,44671L,44672L,44673L,44674L,
+44675L,44676L,44677L,44678L,44679L,44680L,44681L,44682L,44683L,44684L,
+44685L,44686L,44687L,44688L,44689L,44690L,44691L,44692L,44693L,44694L,
+44695L,44696L,44697L,44698L,44699L,44700L,44701L,44702L,44703L,44704L,
+44705L,44706L,44707L,44708L,44709L,44710L,44711L,44712L,44713L,44714L,
+44715L,44716L,44717L,44718L,44719L,44720L,44721L,44722L,44723L,44724L,
+44725L,44726L,44727L,44728L,44729L,44730L,44731L,44732L,44733L,44734L,
+44735L,44736L,44737L,44738L,44739L,44740L,44741L,44742L,44743L,44744L,
+44745L,44746L,44747L,44748L,44749L,44750L,44751L,44752L,44753L,44754L,
+44755L,44756L,44757L,44758L,44759L,44760L,44761L,44762L,44763L,44764L,
+44765L,44766L,44767L,44768L,44769L,44770L,44771L,44772L,44773L,44774L,
+44775L,44776L,44777L,44778L,44779L,44780L,44781L,44782L,44783L,44784L,
+44785L,44786L,44787L,44788L,44789L,44790L,44791L,44792L,44793L,44794L,
+44795L,44796L,44797L,44798L,44799L,44800L,44801L,44802L,44803L,44804L,
+44805L,44806L,44807L,44808L,44809L,44810L,44811L,44812L,44813L,44814L,
+44815L,44816L,44817L,44818L,44819L,44820L,44821L,44822L,44823L,44824L,
+44825L,44826L,44827L,44828L,44829L,44830L,44831L,44832L,44833L,44834L,
+44835L,44836L,44837L,44838L,44839L,44840L,44841L,44842L,44843L,44844L,
+44845L,44846L,44847L,44848L,44849L,44850L,44851L,44852L,44853L,44854L,
+44855L,44856L,44857L,44858L,44859L,44860L,44861L,44862L,44863L,44864L,
+44865L,44866L,44867L,44868L,44869L,44870L,44871L,44872L,44873L,44874L,
+44875L,44876L,44877L,44878L,44879L,44880L,44881L,44882L,44883L,44884L,
+44885L,44886L,44887L,44888L,44889L,44890L,44891L,44892L,44893L,44894L,
+44895L,44896L,44897L,44898L,44899L,44900L,44901L,44902L,44903L,44904L,
+44905L,44906L,44907L,44908L,44909L,44910L,44911L,44912L,44913L,44914L,
+44915L,44916L,44917L,44918L,44919L,44920L,44921L,44922L,44923L,44924L,
+44925L,44926L,44927L,44928L,44929L,44930L,44931L,44932L,44933L,44934L,
+44935L,44936L,44937L,44938L,44939L,44940L,44941L,44942L,44943L,44944L,
+44945L,44946L,44947L,44948L,44949L,44950L,44951L,44952L,44953L,44954L,
+44955L,44956L,44957L,44958L,44959L,44960L,44961L,44962L,44963L,44964L,
+44965L,44966L,44967L,44968L,44969L,44970L,44971L,44972L,44973L,44974L,
+44975L,44976L,44977L,44978L,44979L,44980L,44981L,44982L,44983L,44984L,
+44985L,44986L,44987L,44988L,44989L,44990L,44991L,44992L,44993L,44994L,
+44995L,44996L,44997L,44998L,44999L,45000L,45001L,45002L,45003L,45004L,
+45005L,45006L,45007L,45008L,45009L,45010L,45011L,45012L,45013L,45014L,
+45015L,45016L,45017L,45018L,45019L,45020L,45021L,45022L,45023L,45024L,
+45025L,45026L,45027L,45028L,45029L,45030L,45031L,45032L,45033L,45034L,
+45035L,45036L,45037L,45038L,45039L,45040L,45041L,45042L,45043L,45044L,
+45045L,45046L,45047L,45048L,45049L,45050L,45051L,45052L,45053L,45054L,
+45055L,45056L,45057L,45058L,45059L,45060L,45061L,45062L,45063L,45064L,
+45065L,45066L,45067L,45068L,45069L,45070L,45071L,45072L,45073L,45074L,
+45075L,45076L,45077L,45078L,45079L,45080L,45081L,45082L,45083L,45084L,
+45085L,45086L,45087L,45088L,45089L,45090L,45091L,45092L,45093L,45094L,
+45095L,45096L,45097L,45098L,45099L,45100L,45101L,45102L,45103L,45104L,
+45105L,45106L,45107L,45108L,45109L,45110L,45111L,45112L,45113L,45114L,
+45115L,45116L,45117L,45118L,45119L,45120L,45121L,45122L,45123L,45124L,
+45125L,45126L,45127L,45128L,45129L,45130L,45131L,45132L,45133L,45134L,
+45135L,45136L,45137L,45138L,45139L,45140L,45141L,45142L,45143L,45144L,
+45145L,45146L,45147L,45148L,45149L,45150L,45151L,45152L,45153L,45154L,
+45155L,45156L,45157L,45158L,45159L,45160L,45161L,45162L,45163L,45164L,
+45165L,45166L,45167L,45168L,45169L,45170L,45171L,45172L,45173L,45174L,
+45175L,45176L,45177L,45178L,45179L,45180L,45181L,45182L,45183L,45184L,
+45185L,45186L,45187L,45188L,45189L,45190L,45191L,45192L,45193L,45194L,
+45195L,45196L,45197L,45198L,45199L,45200L,45201L,45202L,45203L,45204L,
+45205L,45206L,45207L,45208L,45209L,45210L,45211L,45212L,45213L,45214L,
+45215L,45216L,45217L,45218L,45219L,45220L,45221L,45222L,45223L,45224L,
+45225L,45226L,45227L,45228L,45229L,45230L,45231L,45232L,45233L,45234L,
+45235L,45236L,45237L,45238L,45239L,45240L,45241L,45242L,45243L,45244L,
+45245L,45246L,45247L,45248L,45249L,45250L,45251L,45252L,45253L,45254L,
+45255L,45256L,45257L,45258L,45259L,45260L,45261L,45262L,45263L,45264L,
+45265L,45266L,45267L,45268L,45269L,45270L,45271L,45272L,45273L,45274L,
+45275L,45276L,45277L,45278L,45279L,45280L,45281L,45282L,45283L,45284L,
+45285L,45286L,45287L,45288L,45289L,45290L,45291L,45292L,45293L,45294L,
+45295L,45296L,45297L,45298L,45299L,45300L,45301L,45302L,45303L,45304L,
+45305L,45306L,45307L,45308L,45309L,45310L,45311L,45312L,45313L,45314L,
+45315L,45316L,45317L,45318L,45319L,45320L,45321L,45322L,45323L,45324L,
+45325L,45326L,45327L,45328L,45329L,45330L,45331L,45332L,45333L,45334L,
+45335L,45336L,45337L,45338L,45339L,45340L,45341L,45342L,45343L,45344L,
+45345L,45346L,45347L,45348L,45349L,45350L,45351L,45352L,45353L,45354L,
+45355L,45356L,45357L,45358L,45359L,45360L,45361L,45362L,45363L,45364L,
+45365L,45366L,45367L,45368L,45369L,45370L,45371L,45372L,45373L,45374L,
+45375L,45376L,45377L,45378L,45379L,45380L,45381L,45382L,45383L,45384L,
+45385L,45386L,45387L,45388L,45389L,45390L,45391L,45392L,45393L,45394L,
+45395L,45396L,45397L,45398L,45399L,45400L,45401L,45402L,45403L,45404L,
+45405L,45406L,45407L,45408L,45409L,45410L,45411L,45412L,45413L,45414L,
+45415L,45416L,45417L,45418L,45419L,45420L,45421L,45422L,45423L,45424L,
+45425L,45426L,45427L,45428L,45429L,45430L,45431L,45432L,45433L,45434L,
+45435L,45436L,45437L,45438L,45439L,45440L,45441L,45442L,45443L,45444L,
+45445L,45446L,45447L,45448L,45449L,45450L,45451L,45452L,45453L,45454L,
+45455L,45456L,45457L,45458L,45459L,45460L,45461L,45462L,45463L,45464L,
+45465L,45466L,45467L,45468L,45469L,45470L,45471L,45472L,45473L,45474L,
+45475L,45476L,45477L,45478L,45479L,45480L,45481L,45482L,45483L,45484L,
+45485L,45486L,45487L,45488L,45489L,45490L,45491L,45492L,45493L,45494L,
+45495L,45496L,45497L,45498L,45499L,45500L,45501L,45502L,45503L,45504L,
+45505L,45506L,45507L,45508L,45509L,45510L,45511L,45512L,45513L,45514L,
+45515L,45516L,45517L,45518L,45519L,45520L,45521L,45522L,45523L,45524L,
+45525L,45526L,45527L,45528L,45529L,45530L,45531L,45532L,45533L,45534L,
+45535L,45536L,45537L,45538L,45539L,45540L,45541L,45542L,45543L,45544L,
+45545L,45546L,45547L,45548L,45549L,45550L,45551L,45552L,45553L,45554L,
+45555L,45556L,45557L,45558L,45559L,45560L,45561L,45562L,45563L,45564L,
+45565L,45566L,45567L,45568L,45569L,45570L,45571L,45572L,45573L,45574L,
+45575L,45576L,45577L,45578L,45579L,45580L,45581L,45582L,45583L,45584L,
+45585L,45586L,45587L,45588L,45589L,45590L,45591L,45592L,45593L,45594L,
+45595L,45596L,45597L,45598L,45599L,45600L,45601L,45602L,45603L,45604L,
+45605L,45606L,45607L,45608L,45609L,45610L,45611L,45612L,45613L,45614L,
+45615L,45616L,45617L,45618L,45619L,45620L,45621L,45622L,45623L,45624L,
+45625L,45626L,45627L,45628L,45629L,45630L,45631L,45632L,45633L,45634L,
+45635L,45636L,45637L,45638L,45639L,45640L,45641L,45642L,45643L,45644L,
+45645L,45646L,45647L,45648L,45649L,45650L,45651L,45652L,45653L,45654L,
+45655L,45656L,45657L,45658L,45659L,45660L,45661L,45662L,45663L,45664L,
+45665L,45666L,45667L,45668L,45669L,45670L,45671L,45672L,45673L,45674L,
+45675L,45676L,45677L,45678L,45679L,45680L,45681L,45682L,45683L,45684L,
+45685L,45686L,45687L,45688L,45689L,45690L,45691L,45692L,45693L,45694L,
+45695L,45696L,45697L,45698L,45699L,45700L,45701L,45702L,45703L,45704L,
+45705L,45706L,45707L,45708L,45709L,45710L,45711L,45712L,45713L,45714L,
+45715L,45716L,45717L,45718L,45719L,45720L,45721L,45722L,45723L,45724L,
+45725L,45726L,45727L,45728L,45729L,45730L,45731L,45732L,45733L,45734L,
+45735L,45736L,45737L,45738L,45739L,45740L,45741L,45742L,45743L,45744L,
+45745L,45746L,45747L,45748L,45749L,45750L,45751L,45752L,45753L,45754L,
+45755L,45756L,45757L,45758L,45759L,45760L,45761L,45762L,45763L,45764L,
+45765L,45766L,45767L,45768L,45769L,45770L,45771L,45772L,45773L,45774L,
+45775L,45776L,45777L,45778L,45779L,45780L,45781L,45782L,45783L,45784L,
+45785L,45786L,45787L,45788L,45789L,45790L,45791L,45792L,45793L,45794L,
+45795L,45796L,45797L,45798L,45799L,45800L,45801L,45802L,45803L,45804L,
+45805L,45806L,45807L,45808L,45809L,45810L,45811L,45812L,45813L,45814L,
+45815L,45816L,45817L,45818L,45819L,45820L,45821L,45822L,45823L,45824L,
+45825L,45826L,45827L,45828L,45829L,45830L,45831L,45832L,45833L,45834L,
+45835L,45836L,45837L,45838L,45839L,45840L,45841L,45842L,45843L,45844L,
+45845L,45846L,45847L,45848L,45849L,45850L,45851L,45852L,45853L,45854L,
+45855L,45856L,45857L,45858L,45859L,45860L,45861L,45862L,45863L,45864L,
+45865L,45866L,45867L,45868L,45869L,45870L,45871L,45872L,45873L,45874L,
+45875L,45876L,45877L,45878L,45879L,45880L,45881L,45882L,45883L,45884L,
+45885L,45886L,45887L,45888L,45889L,45890L,45891L,45892L,45893L,45894L,
+45895L,45896L,45897L,45898L,45899L,45900L,45901L,45902L,45903L,45904L,
+45905L,45906L,45907L,45908L,45909L,45910L,45911L,45912L,45913L,45914L,
+45915L,45916L,45917L,45918L,45919L,45920L,45921L,45922L,45923L,45924L,
+45925L,45926L,45927L,45928L,45929L,45930L,45931L,45932L,45933L,45934L,
+45935L,45936L,45937L,45938L,45939L,45940L,45941L,45942L,45943L,45944L,
+45945L,45946L,45947L,45948L,45949L,45950L,45951L,45952L,45953L,45954L,
+45955L,45956L,45957L,45958L,45959L,45960L,45961L,45962L,45963L,45964L,
+45965L,45966L,45967L,45968L,45969L,45970L,45971L,45972L,45973L,45974L,
+45975L,45976L,45977L,45978L,45979L,45980L,45981L,45982L,45983L,45984L,
+45985L,45986L,45987L,45988L,45989L,45990L,45991L,45992L,45993L,45994L,
+45995L,45996L,45997L,45998L,45999L,46000L,46001L,46002L,46003L,46004L,
+46005L,46006L,46007L,46008L,46009L,46010L,46011L,46012L,46013L,46014L,
+46015L,46016L,46017L,46018L,46019L,46020L,46021L,46022L,46023L,46024L,
+46025L,46026L,46027L,46028L,46029L,46030L,46031L,46032L,46033L,46034L,
+46035L,46036L,46037L,46038L,46039L,46040L,46041L,46042L,46043L,46044L,
+46045L,46046L,46047L,46048L,46049L,46050L,46051L,46052L,46053L,46054L,
+46055L,46056L,46057L,46058L,46059L,46060L,46061L,46062L,46063L,46064L,
+46065L,46066L,46067L,46068L,46069L,46070L,46071L,46072L,46073L,46074L,
+46075L,46076L,46077L,46078L,46079L,46080L,46081L,46082L,46083L,46084L,
+46085L,46086L,46087L,46088L,46089L,46090L,46091L,46092L,46093L,46094L,
+46095L,46096L,46097L,46098L,46099L,46100L,46101L,46102L,46103L,46104L,
+46105L,46106L,46107L,46108L,46109L,46110L,46111L,46112L,46113L,46114L,
+46115L,46116L,46117L,46118L,46119L,46120L,46121L,46122L,46123L,46124L,
+46125L,46126L,46127L,46128L,46129L,46130L,46131L,46132L,46133L,46134L,
+46135L,46136L,46137L,46138L,46139L,46140L,46141L,46142L,46143L,46144L,
+46145L,46146L,46147L,46148L,46149L,46150L,46151L,46152L,46153L,46154L,
+46155L,46156L,46157L,46158L,46159L,46160L,46161L,46162L,46163L,46164L,
+46165L,46166L,46167L,46168L,46169L,46170L,46171L,46172L,46173L,46174L,
+46175L,46176L,46177L,46178L,46179L,46180L,46181L,46182L,46183L,46184L,
+46185L,46186L,46187L,46188L,46189L,46190L,46191L,46192L,46193L,46194L,
+46195L,46196L,46197L,46198L,46199L,46200L,46201L,46202L,46203L,46204L,
+46205L,46206L,46207L,46208L,46209L,46210L,46211L,46212L,46213L,46214L,
+46215L,46216L,46217L,46218L,46219L,46220L,46221L,46222L,46223L,46224L,
+46225L,46226L,46227L,46228L,46229L,46230L,46231L,46232L,46233L,46234L,
+46235L,46236L,46237L,46238L,46239L,46240L,46241L,46242L,46243L,46244L,
+46245L,46246L,46247L,46248L,46249L,46250L,46251L,46252L,46253L,46254L,
+46255L,46256L,46257L,46258L,46259L,46260L,46261L,46262L,46263L,46264L,
+46265L,46266L,46267L,46268L,46269L,46270L,46271L,46272L,46273L,46274L,
+46275L,46276L,46277L,46278L,46279L,46280L,46281L,46282L,46283L,46284L,
+46285L,46286L,46287L,46288L,46289L,46290L,46291L,46292L,46293L,46294L,
+46295L,46296L,46297L,46298L,46299L,46300L,46301L,46302L,46303L,46304L,
+46305L,46306L,46307L,46308L,46309L,46310L,46311L,46312L,46313L,46314L,
+46315L,46316L,46317L,46318L,46319L,46320L,46321L,46322L,46323L,46324L,
+46325L,46326L,46327L,46328L,46329L,46330L,46331L,46332L,46333L,46334L,
+46335L,46336L,46337L,46338L,46339L,46340L,46341L,46342L,46343L,46344L,
+46345L,46346L,46347L,46348L,46349L,46350L,46351L,46352L,46353L,46354L,
+46355L,46356L,46357L,46358L,46359L,46360L,46361L,46362L,46363L,46364L,
+46365L,46366L,46367L,46368L,46369L,46370L,46371L,46372L,46373L,46374L,
+46375L,46376L,46377L,46378L,46379L,46380L,46381L,46382L,46383L,46384L,
+46385L,46386L,46387L,46388L,46389L,46390L,46391L,46392L,46393L,46394L,
+46395L,46396L,46397L,46398L,46399L,46400L,46401L,46402L,46403L,46404L,
+46405L,46406L,46407L,46408L,46409L,46410L,46411L,46412L,46413L,46414L,
+46415L,46416L,46417L,46418L,46419L,46420L,46421L,46422L,46423L,46424L,
+46425L,46426L,46427L,46428L,46429L,46430L,46431L,46432L,46433L,46434L,
+46435L,46436L,46437L,46438L,46439L,46440L,46441L,46442L,46443L,46444L,
+46445L,46446L,46447L,46448L,46449L,46450L,46451L,46452L,46453L,46454L,
+46455L,46456L,46457L,46458L,46459L,46460L,46461L,46462L,46463L,46464L,
+46465L,46466L,46467L,46468L,46469L,46470L,46471L,46472L,46473L,46474L,
+46475L,46476L,46477L,46478L,46479L,46480L,46481L,46482L,46483L,46484L,
+46485L,46486L,46487L,46488L,46489L,46490L,46491L,46492L,46493L,46494L,
+46495L,46496L,46497L,46498L,46499L,46500L,46501L,46502L,46503L,46504L,
+46505L,46506L,46507L,46508L,46509L,46510L,46511L,46512L,46513L,46514L,
+46515L,46516L,46517L,46518L,46519L,46520L,46521L,46522L,46523L,46524L,
+46525L,46526L,46527L,46528L,46529L,46530L,46531L,46532L,46533L,46534L,
+46535L,46536L,46537L,46538L,46539L,46540L,46541L,46542L,46543L,46544L,
+46545L,46546L,46547L,46548L,46549L,46550L,46551L,46552L,46553L,46554L,
+46555L,46556L,46557L,46558L,46559L,46560L,46561L,46562L,46563L,46564L,
+46565L,46566L,46567L,46568L,46569L,46570L,46571L,46572L,46573L,46574L,
+46575L,46576L,46577L,46578L,46579L,46580L,46581L,46582L,46583L,46584L,
+46585L,46586L,46587L,46588L,46589L,46590L,46591L,46592L,46593L,46594L,
+46595L,46596L,46597L,46598L,46599L,46600L,46601L,46602L,46603L,46604L,
+46605L,46606L,46607L,46608L,46609L,46610L,46611L,46612L,46613L,46614L,
+46615L,46616L,46617L,46618L,46619L,46620L,46621L,46622L,46623L,46624L,
+46625L,46626L,46627L,46628L,46629L,46630L,46631L,46632L,46633L,46634L,
+46635L,46636L,46637L,46638L,46639L,46640L,46641L,46642L,46643L,46644L,
+46645L,46646L,46647L,46648L,46649L,46650L,46651L,46652L,46653L,46654L,
+46655L,46656L,46657L,46658L,46659L,46660L,46661L,46662L,46663L,46664L,
+46665L,46666L,46667L,46668L,46669L,46670L,46671L,46672L,46673L,46674L,
+46675L,46676L,46677L,46678L,46679L,46680L,46681L,46682L,46683L,46684L,
+46685L,46686L,46687L,46688L,46689L,46690L,46691L,46692L,46693L,46694L,
+46695L,46696L,46697L,46698L,46699L,46700L,46701L,46702L,46703L,46704L,
+46705L,46706L,46707L,46708L,46709L,46710L,46711L,46712L,46713L,46714L,
+46715L,46716L,46717L,46718L,46719L,46720L,46721L,46722L,46723L,46724L,
+46725L,46726L,46727L,46728L,46729L,46730L,46731L,46732L,46733L,46734L,
+46735L,46736L,46737L,46738L,46739L,46740L,46741L,46742L,46743L,46744L,
+46745L,46746L,46747L,46748L,46749L,46750L,46751L,46752L,46753L,46754L,
+46755L,46756L,46757L,46758L,46759L,46760L,46761L,46762L,46763L,46764L,
+46765L,46766L,46767L,46768L,46769L,46770L,46771L,46772L,46773L,46774L,
+46775L,46776L,46777L,46778L,46779L,46780L,46781L,46782L,46783L,46784L,
+46785L,46786L,46787L,46788L,46789L,46790L,46791L,46792L,46793L,46794L,
+46795L,46796L,46797L,46798L,46799L,46800L,46801L,46802L,46803L,46804L,
+46805L,46806L,46807L,46808L,46809L,46810L,46811L,46812L,46813L,46814L,
+46815L,46816L,46817L,46818L,46819L,46820L,46821L,46822L,46823L,46824L,
+46825L,46826L,46827L,46828L,46829L,46830L,46831L,46832L,46833L,46834L,
+46835L,46836L,46837L,46838L,46839L,46840L,46841L,46842L,46843L,46844L,
+46845L,46846L,46847L,46848L,46849L,46850L,46851L,46852L,46853L,46854L,
+46855L,46856L,46857L,46858L,46859L,46860L,46861L,46862L,46863L,46864L,
+46865L,46866L,46867L,46868L,46869L,46870L,46871L,46872L,46873L,46874L,
+46875L,46876L,46877L,46878L,46879L,46880L,46881L,46882L,46883L,46884L,
+46885L,46886L,46887L,46888L,46889L,46890L,46891L,46892L,46893L,46894L,
+46895L,46896L,46897L,46898L,46899L,46900L,46901L,46902L,46903L,46904L,
+46905L,46906L,46907L,46908L,46909L,46910L,46911L,46912L,46913L,46914L,
+46915L,46916L,46917L,46918L,46919L,46920L,46921L,46922L,46923L,46924L,
+46925L,46926L,46927L,46928L,46929L,46930L,46931L,46932L,46933L,46934L,
+46935L,46936L,46937L,46938L,46939L,46940L,46941L,46942L,46943L,46944L,
+46945L,46946L,46947L,46948L,46949L,46950L,46951L,46952L,46953L,46954L,
+46955L,46956L,46957L,46958L,46959L,46960L,46961L,46962L,46963L,46964L,
+46965L,46966L,46967L,46968L,46969L,46970L,46971L,46972L,46973L,46974L,
+46975L,46976L,46977L,46978L,46979L,46980L,46981L,46982L,46983L,46984L,
+46985L,46986L,46987L,46988L,46989L,46990L,46991L,46992L,46993L,46994L,
+46995L,46996L,46997L,46998L,46999L,47000L,47001L,47002L,47003L,47004L,
+47005L,47006L,47007L,47008L,47009L,47010L,47011L,47012L,47013L,47014L,
+47015L,47016L,47017L,47018L,47019L,47020L,47021L,47022L,47023L,47024L,
+47025L,47026L,47027L,47028L,47029L,47030L,47031L,47032L,47033L,47034L,
+47035L,47036L,47037L,47038L,47039L,47040L,47041L,47042L,47043L,47044L,
+47045L,47046L,47047L,47048L,47049L,47050L,47051L,47052L,47053L,47054L,
+47055L,47056L,47057L,47058L,47059L,47060L,47061L,47062L,47063L,47064L,
+47065L,47066L,47067L,47068L,47069L,47070L,47071L,47072L,47073L,47074L,
+47075L,47076L,47077L,47078L,47079L,47080L,47081L,47082L,47083L,47084L,
+47085L,47086L,47087L,47088L,47089L,47090L,47091L,47092L,47093L,47094L,
+47095L,47096L,47097L,47098L,47099L,47100L,47101L,47102L,47103L,47104L,
+47105L,47106L,47107L,47108L,47109L,47110L,47111L,47112L,47113L,47114L,
+47115L,47116L,47117L,47118L,47119L,47120L,47121L,47122L,47123L,47124L,
+47125L,47126L,47127L,47128L,47129L,47130L,47131L,47132L,47133L,47134L,
+47135L,47136L,47137L,47138L,47139L,47140L,47141L,47142L,47143L,47144L,
+47145L,47146L,47147L,47148L,47149L,47150L,47151L,47152L,47153L,47154L,
+47155L,47156L,47157L,47158L,47159L,47160L,47161L,47162L,47163L,47164L,
+47165L,47166L,47167L,47168L,47169L,47170L,47171L,47172L,47173L,47174L,
+47175L,47176L,47177L,47178L,47179L,47180L,47181L,47182L,47183L,47184L,
+47185L,47186L,47187L,47188L,47189L,47190L,47191L,47192L,47193L,47194L,
+47195L,47196L,47197L,47198L,47199L,47200L,47201L,47202L,47203L,47204L,
+47205L,47206L,47207L,47208L,47209L,47210L,47211L,47212L,47213L,47214L,
+47215L,47216L,47217L,47218L,47219L,47220L,47221L,47222L,47223L,47224L,
+47225L,47226L,47227L,47228L,47229L,47230L,47231L,47232L,47233L,47234L,
+47235L,47236L,47237L,47238L,47239L,47240L,47241L,47242L,47243L,47244L,
+47245L,47246L,47247L,47248L,47249L,47250L,47251L,47252L,47253L,47254L,
+47255L,47256L,47257L,47258L,47259L,47260L,47261L,47262L,47263L,47264L,
+47265L,47266L,47267L,47268L,47269L,47270L,47271L,47272L,47273L,47274L,
+47275L,47276L,47277L,47278L,47279L,47280L,47281L,47282L,47283L,47284L,
+47285L,47286L,47287L,47288L,47289L,47290L,47291L,47292L,47293L,47294L,
+47295L,47296L,47297L,47298L,47299L,47300L,47301L,47302L,47303L,47304L,
+47305L,47306L,47307L,47308L,47309L,47310L,47311L,47312L,47313L,47314L,
+47315L,47316L,47317L,47318L,47319L,47320L,47321L,47322L,47323L,47324L,
+47325L,47326L,47327L,47328L,47329L,47330L,47331L,47332L,47333L,47334L,
+47335L,47336L,47337L,47338L,47339L,47340L,47341L,47342L,47343L,47344L,
+47345L,47346L,47347L,47348L,47349L,47350L,47351L,47352L,47353L,47354L,
+47355L,47356L,47357L,47358L,47359L,47360L,47361L,47362L,47363L,47364L,
+47365L,47366L,47367L,47368L,47369L,47370L,47371L,47372L,47373L,47374L,
+47375L,47376L,47377L,47378L,47379L,47380L,47381L,47382L,47383L,47384L,
+47385L,47386L,47387L,47388L,47389L,47390L,47391L,47392L,47393L,47394L,
+47395L,47396L,47397L,47398L,47399L,47400L,47401L,47402L,47403L,47404L,
+47405L,47406L,47407L,47408L,47409L,47410L,47411L,47412L,47413L,47414L,
+47415L,47416L,47417L,47418L,47419L,47420L,47421L,47422L,47423L,47424L,
+47425L,47426L,47427L,47428L,47429L,47430L,47431L,47432L,47433L,47434L,
+47435L,47436L,47437L,47438L,47439L,47440L,47441L,47442L,47443L,47444L,
+47445L,47446L,47447L,47448L,47449L,47450L,47451L,47452L,47453L,47454L,
+47455L,47456L,47457L,47458L,47459L,47460L,47461L,47462L,47463L,47464L,
+47465L,47466L,47467L,47468L,47469L,47470L,47471L,47472L,47473L,47474L,
+47475L,47476L,47477L,47478L,47479L,47480L,47481L,47482L,47483L,47484L,
+47485L,47486L,47487L,47488L,47489L,47490L,47491L,47492L,47493L,47494L,
+47495L,47496L,47497L,47498L,47499L,47500L,47501L,47502L,47503L,47504L,
+47505L,47506L,47507L,47508L,47509L,47510L,47511L,47512L,47513L,47514L,
+47515L,47516L,47517L,47518L,47519L,47520L,47521L,47522L,47523L,47524L,
+47525L,47526L,47527L,47528L,47529L,47530L,47531L,47532L,47533L,47534L,
+47535L,47536L,47537L,47538L,47539L,47540L,47541L,47542L,47543L,47544L,
+47545L,47546L,47547L,47548L,47549L,47550L,47551L,47552L,47553L,47554L,
+47555L,47556L,47557L,47558L,47559L,47560L,47561L,47562L,47563L,47564L,
+47565L,47566L,47567L,47568L,47569L,47570L,47571L,47572L,47573L,47574L,
+47575L,47576L,47577L,47578L,47579L,47580L,47581L,47582L,47583L,47584L,
+47585L,47586L,47587L,47588L,47589L,47590L,47591L,47592L,47593L,47594L,
+47595L,47596L,47597L,47598L,47599L,47600L,47601L,47602L,47603L,47604L,
+47605L,47606L,47607L,47608L,47609L,47610L,47611L,47612L,47613L,47614L,
+47615L,47616L,47617L,47618L,47619L,47620L,47621L,47622L,47623L,47624L,
+47625L,47626L,47627L,47628L,47629L,47630L,47631L,47632L,47633L,47634L,
+47635L,47636L,47637L,47638L,47639L,47640L,47641L,47642L,47643L,47644L,
+47645L,47646L,47647L,47648L,47649L,47650L,47651L,47652L,47653L,47654L,
+47655L,47656L,47657L,47658L,47659L,47660L,47661L,47662L,47663L,47664L,
+47665L,47666L,47667L,47668L,47669L,47670L,47671L,47672L,47673L,47674L,
+47675L,47676L,47677L,47678L,47679L,47680L,47681L,47682L,47683L,47684L,
+47685L,47686L,47687L,47688L,47689L,47690L,47691L,47692L,47693L,47694L,
+47695L,47696L,47697L,47698L,47699L,47700L,47701L,47702L,47703L,47704L,
+47705L,47706L,47707L,47708L,47709L,47710L,47711L,47712L,47713L,47714L,
+47715L,47716L,47717L,47718L,47719L,47720L,47721L,47722L,47723L,47724L,
+47725L,47726L,47727L,47728L,47729L,47730L,47731L,47732L,47733L,47734L,
+47735L,47736L,47737L,47738L,47739L,47740L,47741L,47742L,47743L,47744L,
+47745L,47746L,47747L,47748L,47749L,47750L,47751L,47752L,47753L,47754L,
+47755L,47756L,47757L,47758L,47759L,47760L,47761L,47762L,47763L,47764L,
+47765L,47766L,47767L,47768L,47769L,47770L,47771L,47772L,47773L,47774L,
+47775L,47776L,47777L,47778L,47779L,47780L,47781L,47782L,47783L,47784L,
+47785L,47786L,47787L,47788L,47789L,47790L,47791L,47792L,47793L,47794L,
+47795L,47796L,47797L,47798L,47799L,47800L,47801L,47802L,47803L,47804L,
+47805L,47806L,47807L,47808L,47809L,47810L,47811L,47812L,47813L,47814L,
+47815L,47816L,47817L,47818L,47819L,47820L,47821L,47822L,47823L,47824L,
+47825L,47826L,47827L,47828L,47829L,47830L,47831L,47832L,47833L,47834L,
+47835L,47836L,47837L,47838L,47839L,47840L,47841L,47842L,47843L,47844L,
+47845L,47846L,47847L,47848L,47849L,47850L,47851L,47852L,47853L,47854L,
+47855L,47856L,47857L,47858L,47859L,47860L,47861L,47862L,47863L,47864L,
+47865L,47866L,47867L,47868L,47869L,47870L,47871L,47872L,47873L,47874L,
+47875L,47876L,47877L,47878L,47879L,47880L,47881L,47882L,47883L,47884L,
+47885L,47886L,47887L,47888L,47889L,47890L,47891L,47892L,47893L,47894L,
+47895L,47896L,47897L,47898L,47899L,47900L,47901L,47902L,47903L,47904L,
+47905L,47906L,47907L,47908L,47909L,47910L,47911L,47912L,47913L,47914L,
+47915L,47916L,47917L,47918L,47919L,47920L,47921L,47922L,47923L,47924L,
+47925L,47926L,47927L,47928L,47929L,47930L,47931L,47932L,47933L,47934L,
+47935L,47936L,47937L,47938L,47939L,47940L,47941L,47942L,47943L,47944L,
+47945L,47946L,47947L,47948L,47949L,47950L,47951L,47952L,47953L,47954L,
+47955L,47956L,47957L,47958L,47959L,47960L,47961L,47962L,47963L,47964L,
+47965L,47966L,47967L,47968L,47969L,47970L,47971L,47972L,47973L,47974L,
+47975L,47976L,47977L,47978L,47979L,47980L,47981L,47982L,47983L,47984L,
+47985L,47986L,47987L,47988L,47989L,47990L,47991L,47992L,47993L,47994L,
+47995L,47996L,47997L,47998L,47999L,48000L,48001L,48002L,48003L,48004L,
+48005L,48006L,48007L,48008L,48009L,48010L,48011L,48012L,48013L,48014L,
+48015L,48016L,48017L,48018L,48019L,48020L,48021L,48022L,48023L,48024L,
+48025L,48026L,48027L,48028L,48029L,48030L,48031L,48032L,48033L,48034L,
+48035L,48036L,48037L,48038L,48039L,48040L,48041L,48042L,48043L,48044L,
+48045L,48046L,48047L,48048L,48049L,48050L,48051L,48052L,48053L,48054L,
+48055L,48056L,48057L,48058L,48059L,48060L,48061L,48062L,48063L,48064L,
+48065L,48066L,48067L,48068L,48069L,48070L,48071L,48072L,48073L,48074L,
+48075L,48076L,48077L,48078L,48079L,48080L,48081L,48082L,48083L,48084L,
+48085L,48086L,48087L,48088L,48089L,48090L,48091L,48092L,48093L,48094L,
+48095L,48096L,48097L,48098L,48099L,48100L,48101L,48102L,48103L,48104L,
+48105L,48106L,48107L,48108L,48109L,48110L,48111L,48112L,48113L,48114L,
+48115L,48116L,48117L,48118L,48119L,48120L,48121L,48122L,48123L,48124L,
+48125L,48126L,48127L,48128L,48129L,48130L,48131L,48132L,48133L,48134L,
+48135L,48136L,48137L,48138L,48139L,48140L,48141L,48142L,48143L,48144L,
+48145L,48146L,48147L,48148L,48149L,48150L,48151L,48152L,48153L,48154L,
+48155L,48156L,48157L,48158L,48159L,48160L,48161L,48162L,48163L,48164L,
+48165L,48166L,48167L,48168L,48169L,48170L,48171L,48172L,48173L,48174L,
+48175L,48176L,48177L,48178L,48179L,48180L,48181L,48182L,48183L,48184L,
+48185L,48186L,48187L,48188L,48189L,48190L,48191L,48192L,48193L,48194L,
+48195L,48196L,48197L,48198L,48199L,48200L,48201L,48202L,48203L,48204L,
+48205L,48206L,48207L,48208L,48209L,48210L,48211L,48212L,48213L,48214L,
+48215L,48216L,48217L,48218L,48219L,48220L,48221L,48222L,48223L,48224L,
+48225L,48226L,48227L,48228L,48229L,48230L,48231L,48232L,48233L,48234L,
+48235L,48236L,48237L,48238L,48239L,48240L,48241L,48242L,48243L,48244L,
+48245L,48246L,48247L,48248L,48249L,48250L,48251L,48252L,48253L,48254L,
+48255L,48256L,48257L,48258L,48259L,48260L,48261L,48262L,48263L,48264L,
+48265L,48266L,48267L,48268L,48269L,48270L,48271L,48272L,48273L,48274L,
+48275L,48276L,48277L,48278L,48279L,48280L,48281L,48282L,48283L,48284L,
+48285L,48286L,48287L,48288L,48289L,48290L,48291L,48292L,48293L,48294L,
+48295L,48296L,48297L,48298L,48299L,48300L,48301L,48302L,48303L,48304L,
+48305L,48306L,48307L,48308L,48309L,48310L,48311L,48312L,48313L,48314L,
+48315L,48316L,48317L,48318L,48319L,48320L,48321L,48322L,48323L,48324L,
+48325L,48326L,48327L,48328L,48329L,48330L,48331L,48332L,48333L,48334L,
+48335L,48336L,48337L,48338L,48339L,48340L,48341L,48342L,48343L,48344L,
+48345L,48346L,48347L,48348L,48349L,48350L,48351L,48352L,48353L,48354L,
+48355L,48356L,48357L,48358L,48359L,48360L,48361L,48362L,48363L,48364L,
+48365L,48366L,48367L,48368L,48369L,48370L,48371L,48372L,48373L,48374L,
+48375L,48376L,48377L,48378L,48379L,48380L,48381L,48382L,48383L,48384L,
+48385L,48386L,48387L,48388L,48389L,48390L,48391L,48392L,48393L,48394L,
+48395L,48396L,48397L,48398L,48399L,48400L,48401L,48402L,48403L,48404L,
+48405L,48406L,48407L,48408L,48409L,48410L,48411L,48412L,48413L,48414L,
+48415L,48416L,48417L,48418L,48419L,48420L,48421L,48422L,48423L,48424L,
+48425L,48426L,48427L,48428L,48429L,48430L,48431L,48432L,48433L,48434L,
+48435L,48436L,48437L,48438L,48439L,48440L,48441L,48442L,48443L,48444L,
+48445L,48446L,48447L,48448L,48449L,48450L,48451L,48452L,48453L,48454L,
+48455L,48456L,48457L,48458L,48459L,48460L,48461L,48462L,48463L,48464L,
+48465L,48466L,48467L,48468L,48469L,48470L,48471L,48472L,48473L,48474L,
+48475L,48476L,48477L,48478L,48479L,48480L,48481L,48482L,48483L,48484L,
+48485L,48486L,48487L,48488L,48489L,48490L,48491L,48492L,48493L,48494L,
+48495L,48496L,48497L,48498L,48499L,48500L,48501L,48502L,48503L,48504L,
+48505L,48506L,48507L,48508L,48509L,48510L,48511L,48512L,48513L,48514L,
+48515L,48516L,48517L,48518L,48519L,48520L,48521L,48522L,48523L,48524L,
+48525L,48526L,48527L,48528L,48529L,48530L,48531L,48532L,48533L,48534L,
+48535L,48536L,48537L,48538L,48539L,48540L,48541L,48542L,48543L,48544L,
+48545L,48546L,48547L,48548L,48549L,48550L,48551L,48552L,48553L,48554L,
+48555L,48556L,48557L,48558L,48559L,48560L,48561L,48562L,48563L,48564L,
+48565L,48566L,48567L,48568L,48569L,48570L,48571L,48572L,48573L,48574L,
+48575L,48576L,48577L,48578L,48579L,48580L,48581L,48582L,48583L,48584L,
+48585L,48586L,48587L,48588L,48589L,48590L,48591L,48592L,48593L,48594L,
+48595L,48596L,48597L,48598L,48599L,48600L,48601L,48602L,48603L,48604L,
+48605L,48606L,48607L,48608L,48609L,48610L,48611L,48612L,48613L,48614L,
+48615L,48616L,48617L,48618L,48619L,48620L,48621L,48622L,48623L,48624L,
+48625L,48626L,48627L,48628L,48629L,48630L,48631L,48632L,48633L,48634L,
+48635L,48636L,48637L,48638L,48639L,48640L,48641L,48642L,48643L,48644L,
+48645L,48646L,48647L,48648L,48649L,48650L,48651L,48652L,48653L,48654L,
+48655L,48656L,48657L,48658L,48659L,48660L,48661L,48662L,48663L,48664L,
+48665L,48666L,48667L,48668L,48669L,48670L,48671L,48672L,48673L,48674L,
+48675L,48676L,48677L,48678L,48679L,48680L,48681L,48682L,48683L,48684L,
+48685L,48686L,48687L,48688L,48689L,48690L,48691L,48692L,48693L,48694L,
+48695L,48696L,48697L,48698L,48699L,48700L,48701L,48702L,48703L,48704L,
+48705L,48706L,48707L,48708L,48709L,48710L,48711L,48712L,48713L,48714L,
+48715L,48716L,48717L,48718L,48719L,48720L,48721L,48722L,48723L,48724L,
+48725L,48726L,48727L,48728L,48729L,48730L,48731L,48732L,48733L,48734L,
+48735L,48736L,48737L,48738L,48739L,48740L,48741L,48742L,48743L,48744L,
+48745L,48746L,48747L,48748L,48749L,48750L,48751L,48752L,48753L,48754L,
+48755L,48756L,48757L,48758L,48759L,48760L,48761L,48762L,48763L,48764L,
+48765L,48766L,48767L,48768L,48769L,48770L,48771L,48772L,48773L,48774L,
+48775L,48776L,48777L,48778L,48779L,48780L,48781L,48782L,48783L,48784L,
+48785L,48786L,48787L,48788L,48789L,48790L,48791L,48792L,48793L,48794L,
+48795L,48796L,48797L,48798L,48799L,48800L,48801L,48802L,48803L,48804L,
+48805L,48806L,48807L,48808L,48809L,48810L,48811L,48812L,48813L,48814L,
+48815L,48816L,48817L,48818L,48819L,48820L,48821L,48822L,48823L,48824L,
+48825L,48826L,48827L,48828L,48829L,48830L,48831L,48832L,48833L,48834L,
+48835L,48836L,48837L,48838L,48839L,48840L,48841L,48842L,48843L,48844L,
+48845L,48846L,48847L,48848L,48849L,48850L,48851L,48852L,48853L,48854L,
+48855L,48856L,48857L,48858L,48859L,48860L,48861L,48862L,48863L,48864L,
+48865L,48866L,48867L,48868L,48869L,48870L,48871L,48872L,48873L,48874L,
+48875L,48876L,48877L,48878L,48879L,48880L,48881L,48882L,48883L,48884L,
+48885L,48886L,48887L,48888L,48889L,48890L,48891L,48892L,48893L,48894L,
+48895L,48896L,48897L,48898L,48899L,48900L,48901L,48902L,48903L,48904L,
+48905L,48906L,48907L,48908L,48909L,48910L,48911L,48912L,48913L,48914L,
+48915L,48916L,48917L,48918L,48919L,48920L,48921L,48922L,48923L,48924L,
+48925L,48926L,48927L,48928L,48929L,48930L,48931L,48932L,48933L,48934L,
+48935L,48936L,48937L,48938L,48939L,48940L,48941L,48942L,48943L,48944L,
+48945L,48946L,48947L,48948L,48949L,48950L,48951L,48952L,48953L,48954L,
+48955L,48956L,48957L,48958L,48959L,48960L,48961L,48962L,48963L,48964L,
+48965L,48966L,48967L,48968L,48969L,48970L,48971L,48972L,48973L,48974L,
+48975L,48976L,48977L,48978L,48979L,48980L,48981L,48982L,48983L,48984L,
+48985L,48986L,48987L,48988L,48989L,48990L,48991L,48992L,48993L,48994L,
+48995L,48996L,48997L,48998L,48999L,49000L,49001L,49002L,49003L,49004L,
+49005L,49006L,49007L,49008L,49009L,49010L,49011L,49012L,49013L,49014L,
+49015L,49016L,49017L,49018L,49019L,49020L,49021L,49022L,49023L,49024L,
+49025L,49026L,49027L,49028L,49029L,49030L,49031L,49032L,49033L,49034L,
+49035L,49036L,49037L,49038L,49039L,49040L,49041L,49042L,49043L,49044L,
+49045L,49046L,49047L,49048L,49049L,49050L,49051L,49052L,49053L,49054L,
+49055L,49056L,49057L,49058L,49059L,49060L,49061L,49062L,49063L,49064L,
+49065L,49066L,49067L,49068L,49069L,49070L,49071L,49072L,49073L,49074L,
+49075L,49076L,49077L,49078L,49079L,49080L,49081L,49082L,49083L,49084L,
+49085L,49086L,49087L,49088L,49089L,49090L,49091L,49092L,49093L,49094L,
+49095L,49096L,49097L,49098L,49099L,49100L,49101L,49102L,49103L,49104L,
+49105L,49106L,49107L,49108L,49109L,49110L,49111L,49112L,49113L,49114L,
+49115L,49116L,49117L,49118L,49119L,49120L,49121L,49122L,49123L,49124L,
+49125L,49126L,49127L,49128L,49129L,49130L,49131L,49132L,49133L,49134L,
+49135L,49136L,49137L,49138L,49139L,49140L,49141L,49142L,49143L,49144L,
+49145L,49146L,49147L,49148L,49149L,49150L,49151L,49152L,49153L,49154L,
+49155L,49156L,49157L,49158L,49159L,49160L,49161L,49162L,49163L,49164L,
+49165L,49166L,49167L,49168L,49169L,49170L,49171L,49172L,49173L,49174L,
+49175L,49176L,49177L,49178L,49179L,49180L,49181L,49182L,49183L,49184L,
+49185L,49186L,49187L,49188L,49189L,49190L,49191L,49192L,49193L,49194L,
+49195L,49196L,49197L,49198L,49199L,49200L,49201L,49202L,49203L,49204L,
+49205L,49206L,49207L,49208L,49209L,49210L,49211L,49212L,49213L,49214L,
+49215L,49216L,49217L,49218L,49219L,49220L,49221L,49222L,49223L,49224L,
+49225L,49226L,49227L,49228L,49229L,49230L,49231L,49232L,49233L,49234L,
+49235L,49236L,49237L,49238L,49239L,49240L,49241L,49242L,49243L,49244L,
+49245L,49246L,49247L,49248L,49249L,49250L,49251L,49252L,49253L,49254L,
+49255L,49256L,49257L,49258L,49259L,49260L,49261L,49262L,49263L,49264L,
+49265L,49266L,49267L,49268L,49269L,49270L,49271L,49272L,49273L,49274L,
+49275L,49276L,49277L,49278L,49279L,49280L,49281L,49282L,49283L,49284L,
+49285L,49286L,49287L,49288L,49289L,49290L,49291L,49292L,49293L,49294L,
+49295L,49296L,49297L,49298L,49299L,49300L,49301L,49302L,49303L,49304L,
+49305L,49306L,49307L,49308L,49309L,49310L,49311L,49312L,49313L,49314L,
+49315L,49316L,49317L,49318L,49319L,49320L,49321L,49322L,49323L,49324L,
+49325L,49326L,49327L,49328L,49329L,49330L,49331L,49332L,49333L,49334L,
+49335L,49336L,49337L,49338L,49339L,49340L,49341L,49342L,49343L,49344L,
+49345L,49346L,49347L,49348L,49349L,49350L,49351L,49352L,49353L,49354L,
+49355L,49356L,49357L,49358L,49359L,49360L,49361L,49362L,49363L,49364L,
+49365L,49366L,49367L,49368L,49369L,49370L,49371L,49372L,49373L,49374L,
+49375L,49376L,49377L,49378L,49379L,49380L,49381L,49382L,49383L,49384L,
+49385L,49386L,49387L,49388L,49389L,49390L,49391L,49392L,49393L,49394L,
+49395L,49396L,49397L,49398L,49399L,49400L,49401L,49402L,49403L,49404L,
+49405L,49406L,49407L,49408L,49409L,49410L,49411L,49412L,49413L,49414L,
+49415L,49416L,49417L,49418L,49419L,49420L,49421L,49422L,49423L,49424L,
+49425L,49426L,49427L,49428L,49429L,49430L,49431L,49432L,49433L,49434L,
+49435L,49436L,49437L,49438L,49439L,49440L,49441L,49442L,49443L,49444L,
+49445L,49446L,49447L,49448L,49449L,49450L,49451L,49452L,49453L,49454L,
+49455L,49456L,49457L,49458L,49459L,49460L,49461L,49462L,49463L,49464L,
+49465L,49466L,49467L,49468L,49469L,49470L,49471L,49472L,49473L,49474L,
+49475L,49476L,49477L,49478L,49479L,49480L,49481L,49482L,49483L,49484L,
+49485L,49486L,49487L,49488L,49489L,49490L,49491L,49492L,49493L,49494L,
+49495L,49496L,49497L,49498L,49499L,49500L,49501L,49502L,49503L,49504L,
+49505L,49506L,49507L,49508L,49509L,49510L,49511L,49512L,49513L,49514L,
+49515L,49516L,49517L,49518L,49519L,49520L,49521L,49522L,49523L,49524L,
+49525L,49526L,49527L,49528L,49529L,49530L,49531L,49532L,49533L,49534L,
+49535L,49536L,49537L,49538L,49539L,49540L,49541L,49542L,49543L,49544L,
+49545L,49546L,49547L,49548L,49549L,49550L,49551L,49552L,49553L,49554L,
+49555L,49556L,49557L,49558L,49559L,49560L,49561L,49562L,49563L,49564L,
+49565L,49566L,49567L,49568L,49569L,49570L,49571L,49572L,49573L,49574L,
+49575L,49576L,49577L,49578L,49579L,49580L,49581L,49582L,49583L,49584L,
+49585L,49586L,49587L,49588L,49589L,49590L,49591L,49592L,49593L,49594L,
+49595L,49596L,49597L,49598L,49599L,49600L,49601L,49602L,49603L,49604L,
+49605L,49606L,49607L,49608L,49609L,49610L,49611L,49612L,49613L,49614L,
+49615L,49616L,49617L,49618L,49619L,49620L,49621L,49622L,49623L,49624L,
+49625L,49626L,49627L,49628L,49629L,49630L,49631L,49632L,49633L,49634L,
+49635L,49636L,49637L,49638L,49639L,49640L,49641L,49642L,49643L,49644L,
+49645L,49646L,49647L,49648L,49649L,49650L,49651L,49652L,49653L,49654L,
+49655L,49656L,49657L,49658L,49659L,49660L,49661L,49662L,49663L,49664L,
+49665L,49666L,49667L,49668L,49669L,49670L,49671L,49672L,49673L,49674L,
+49675L,49676L,49677L,49678L,49679L,49680L,49681L,49682L,49683L,49684L,
+49685L,49686L,49687L,49688L,49689L,49690L,49691L,49692L,49693L,49694L,
+49695L,49696L,49697L,49698L,49699L,49700L,49701L,49702L,49703L,49704L,
+49705L,49706L,49707L,49708L,49709L,49710L,49711L,49712L,49713L,49714L,
+49715L,49716L,49717L,49718L,49719L,49720L,49721L,49722L,49723L,49724L,
+49725L,49726L,49727L,49728L,49729L,49730L,49731L,49732L,49733L,49734L,
+49735L,49736L,49737L,49738L,49739L,49740L,49741L,49742L,49743L,49744L,
+49745L,49746L,49747L,49748L,49749L,49750L,49751L,49752L,49753L,49754L,
+49755L,49756L,49757L,49758L,49759L,49760L,49761L,49762L,49763L,49764L,
+49765L,49766L,49767L,49768L,49769L,49770L,49771L,49772L,49773L,49774L,
+49775L,49776L,49777L,49778L,49779L,49780L,49781L,49782L,49783L,49784L,
+49785L,49786L,49787L,49788L,49789L,49790L,49791L,49792L,49793L,49794L,
+49795L,49796L,49797L,49798L,49799L,49800L,49801L,49802L,49803L,49804L,
+49805L,49806L,49807L,49808L,49809L,49810L,49811L,49812L,49813L,49814L,
+49815L,49816L,49817L,49818L,49819L,49820L,49821L,49822L,49823L,49824L,
+49825L,49826L,49827L,49828L,49829L,49830L,49831L,49832L,49833L,49834L,
+49835L,49836L,49837L,49838L,49839L,49840L,49841L,49842L,49843L,49844L,
+49845L,49846L,49847L,49848L,49849L,49850L,49851L,49852L,49853L,49854L,
+49855L,49856L,49857L,49858L,49859L,49860L,49861L,49862L,49863L,49864L,
+49865L,49866L,49867L,49868L,49869L,49870L,49871L,49872L,49873L,49874L,
+49875L,49876L,49877L,49878L,49879L,49880L,49881L,49882L,49883L,49884L,
+49885L,49886L,49887L,49888L,49889L,49890L,49891L,49892L,49893L,49894L,
+49895L,49896L,49897L,49898L,49899L,49900L,49901L,49902L,49903L,49904L,
+49905L,49906L,49907L,49908L,49909L,49910L,49911L,49912L,49913L,49914L,
+49915L,49916L,49917L,49918L,49919L,49920L,49921L,49922L,49923L,49924L,
+49925L,49926L,49927L,49928L,49929L,49930L,49931L,49932L,49933L,49934L,
+49935L,49936L,49937L,49938L,49939L,49940L,49941L,49942L,49943L,49944L,
+49945L,49946L,49947L,49948L,49949L,49950L,49951L,49952L,49953L,49954L,
+49955L,49956L,49957L,49958L,49959L,49960L,49961L,49962L,49963L,49964L,
+49965L,49966L,49967L,49968L,49969L,49970L,49971L,49972L,49973L,49974L,
+49975L,49976L,49977L,49978L,49979L,49980L,49981L,49982L,49983L,49984L,
+49985L,49986L,49987L,49988L,49989L,49990L,49991L,49992L,49993L,49994L,
+49995L,49996L,49997L,49998L,49999L,50000L,50001L,50002L,50003L,50004L,
+50005L,50006L,50007L,50008L,50009L,50010L,50011L,50012L,50013L,50014L,
+50015L,50016L,50017L,50018L,50019L,50020L,50021L,50022L,50023L,50024L,
+50025L,50026L,50027L,50028L,50029L,50030L,50031L,50032L,50033L,50034L,
+50035L,50036L,50037L,50038L,50039L,50040L,50041L,50042L,50043L,50044L,
+50045L,50046L,50047L,50048L,50049L,50050L,50051L,50052L,50053L,50054L,
+50055L,50056L,50057L,50058L,50059L,50060L,50061L,50062L,50063L,50064L,
+50065L,50066L,50067L,50068L,50069L,50070L,50071L,50072L,50073L,50074L,
+50075L,50076L,50077L,50078L,50079L,50080L,50081L,50082L,50083L,50084L,
+50085L,50086L,50087L,50088L,50089L,50090L,50091L,50092L,50093L,50094L,
+50095L,50096L,50097L,50098L,50099L,50100L,50101L,50102L,50103L,50104L,
+50105L,50106L,50107L,50108L,50109L,50110L,50111L,50112L,50113L,50114L,
+50115L,50116L,50117L,50118L,50119L,50120L,50121L,50122L,50123L,50124L,
+50125L,50126L,50127L,50128L,50129L,50130L,50131L,50132L,50133L,50134L,
+50135L,50136L,50137L,50138L,50139L,50140L,50141L,50142L,50143L,50144L,
+50145L,50146L,50147L,50148L,50149L,50150L,50151L,50152L,50153L,50154L,
+50155L,50156L,50157L,50158L,50159L,50160L,50161L,50162L,50163L,50164L,
+50165L,50166L,50167L,50168L,50169L,50170L,50171L,50172L,50173L,50174L,
+50175L,50176L,50177L,50178L,50179L,50180L,50181L,50182L,50183L,50184L,
+50185L,50186L,50187L,50188L,50189L,50190L,50191L,50192L,50193L,50194L,
+50195L,50196L,50197L,50198L,50199L,50200L,50201L,50202L,50203L,50204L,
+50205L,50206L,50207L,50208L,50209L,50210L,50211L,50212L,50213L,50214L,
+50215L,50216L,50217L,50218L,50219L,50220L,50221L,50222L,50223L,50224L,
+50225L,50226L,50227L,50228L,50229L,50230L,50231L,50232L,50233L,50234L,
+50235L,50236L,50237L,50238L,50239L,50240L,50241L,50242L,50243L,50244L,
+50245L,50246L,50247L,50248L,50249L,50250L,50251L,50252L,50253L,50254L,
+50255L,50256L,50257L,50258L,50259L,50260L,50261L,50262L,50263L,50264L,
+50265L,50266L,50267L,50268L,50269L,50270L,50271L,50272L,50273L,50274L,
+50275L,50276L,50277L,50278L,50279L,50280L,50281L,50282L,50283L,50284L,
+50285L,50286L,50287L,50288L,50289L,50290L,50291L,50292L,50293L,50294L,
+50295L,50296L,50297L,50298L,50299L,50300L,50301L,50302L,50303L,50304L,
+50305L,50306L,50307L,50308L,50309L,50310L,50311L,50312L,50313L,50314L,
+50315L,50316L,50317L,50318L,50319L,50320L,50321L,50322L,50323L,50324L,
+50325L,50326L,50327L,50328L,50329L,50330L,50331L,50332L,50333L,50334L,
+50335L,50336L,50337L,50338L,50339L,50340L,50341L,50342L,50343L,50344L,
+50345L,50346L,50347L,50348L,50349L,50350L,50351L,50352L,50353L,50354L,
+50355L,50356L,50357L,50358L,50359L,50360L,50361L,50362L,50363L,50364L,
+50365L,50366L,50367L,50368L,50369L,50370L,50371L,50372L,50373L,50374L,
+50375L,50376L,50377L,50378L,50379L,50380L,50381L,50382L,50383L,50384L,
+50385L,50386L,50387L,50388L,50389L,50390L,50391L,50392L,50393L,50394L,
+50395L,50396L,50397L,50398L,50399L,50400L,50401L,50402L,50403L,50404L,
+50405L,50406L,50407L,50408L,50409L,50410L,50411L,50412L,50413L,50414L,
+50415L,50416L,50417L,50418L,50419L,50420L,50421L,50422L,50423L,50424L,
+50425L,50426L,50427L,50428L,50429L,50430L,50431L,50432L,50433L,50434L,
+50435L,50436L,50437L,50438L,50439L,50440L,50441L,50442L,50443L,50444L,
+50445L,50446L,50447L,50448L,50449L,50450L,50451L,50452L,50453L,50454L,
+50455L,50456L,50457L,50458L,50459L,50460L,50461L,50462L,50463L,50464L,
+50465L,50466L,50467L,50468L,50469L,50470L,50471L,50472L,50473L,50474L,
+50475L,50476L,50477L,50478L,50479L,50480L,50481L,50482L,50483L,50484L,
+50485L,50486L,50487L,50488L,50489L,50490L,50491L,50492L,50493L,50494L,
+50495L,50496L,50497L,50498L,50499L,50500L,50501L,50502L,50503L,50504L,
+50505L,50506L,50507L,50508L,50509L,50510L,50511L,50512L,50513L,50514L,
+50515L,50516L,50517L,50518L,50519L,50520L,50521L,50522L,50523L,50524L,
+50525L,50526L,50527L,50528L,50529L,50530L,50531L,50532L,50533L,50534L,
+50535L,50536L,50537L,50538L,50539L,50540L,50541L,50542L,50543L,50544L,
+50545L,50546L,50547L,50548L,50549L,50550L,50551L,50552L,50553L,50554L,
+50555L,50556L,50557L,50558L,50559L,50560L,50561L,50562L,50563L,50564L,
+50565L,50566L,50567L,50568L,50569L,50570L,50571L,50572L,50573L,50574L,
+50575L,50576L,50577L,50578L,50579L,50580L,50581L,50582L,50583L,50584L,
+50585L,50586L,50587L,50588L,50589L,50590L,50591L,50592L,50593L,50594L,
+50595L,50596L,50597L,50598L,50599L,50600L,50601L,50602L,50603L,50604L,
+50605L,50606L,50607L,50608L,50609L,50610L,50611L,50612L,50613L,50614L,
+50615L,50616L,50617L,50618L,50619L,50620L,50621L,50622L,50623L,50624L,
+50625L,50626L,50627L,50628L,50629L,50630L,50631L,50632L,50633L,50634L,
+50635L,50636L,50637L,50638L,50639L,50640L,50641L,50642L,50643L,50644L,
+50645L,50646L,50647L,50648L,50649L,50650L,50651L,50652L,50653L,50654L,
+50655L,50656L,50657L,50658L,50659L,50660L,50661L,50662L,50663L,50664L,
+50665L,50666L,50667L,50668L,50669L,50670L,50671L,50672L,50673L,50674L,
+50675L,50676L,50677L,50678L,50679L,50680L,50681L,50682L,50683L,50684L,
+50685L,50686L,50687L,50688L,50689L,50690L,50691L,50692L,50693L,50694L,
+50695L,50696L,50697L,50698L,50699L,50700L,50701L,50702L,50703L,50704L,
+50705L,50706L,50707L,50708L,50709L,50710L,50711L,50712L,50713L,50714L,
+50715L,50716L,50717L,50718L,50719L,50720L,50721L,50722L,50723L,50724L,
+50725L,50726L,50727L,50728L,50729L,50730L,50731L,50732L,50733L,50734L,
+50735L,50736L,50737L,50738L,50739L,50740L,50741L,50742L,50743L,50744L,
+50745L,50746L,50747L,50748L,50749L,50750L,50751L,50752L,50753L,50754L,
+50755L,50756L,50757L,50758L,50759L,50760L,50761L,50762L,50763L,50764L,
+50765L,50766L,50767L,50768L,50769L,50770L,50771L,50772L,50773L,50774L,
+50775L,50776L,50777L,50778L,50779L,50780L,50781L,50782L,50783L,50784L,
+50785L,50786L,50787L,50788L,50789L,50790L,50791L,50792L,50793L,50794L,
+50795L,50796L,50797L,50798L,50799L,50800L,50801L,50802L,50803L,50804L,
+50805L,50806L,50807L,50808L,50809L,50810L,50811L,50812L,50813L,50814L,
+50815L,50816L,50817L,50818L,50819L,50820L,50821L,50822L,50823L,50824L,
+50825L,50826L,50827L,50828L,50829L,50830L,50831L,50832L,50833L,50834L,
+50835L,50836L,50837L,50838L,50839L,50840L,50841L,50842L,50843L,50844L,
+50845L,50846L,50847L,50848L,50849L,50850L,50851L,50852L,50853L,50854L,
+50855L,50856L,50857L,50858L,50859L,50860L,50861L,50862L,50863L,50864L,
+50865L,50866L,50867L,50868L,50869L,50870L,50871L,50872L,50873L,50874L,
+50875L,50876L,50877L,50878L,50879L,50880L,50881L,50882L,50883L,50884L,
+50885L,50886L,50887L,50888L,50889L,50890L,50891L,50892L,50893L,50894L,
+50895L,50896L,50897L,50898L,50899L,50900L,50901L,50902L,50903L,50904L,
+50905L,50906L,50907L,50908L,50909L,50910L,50911L,50912L,50913L,50914L,
+50915L,50916L,50917L,50918L,50919L,50920L,50921L,50922L,50923L,50924L,
+50925L,50926L,50927L,50928L,50929L,50930L,50931L,50932L,50933L,50934L,
+50935L,50936L,50937L,50938L,50939L,50940L,50941L,50942L,50943L,50944L,
+50945L,50946L,50947L,50948L,50949L,50950L,50951L,50952L,50953L,50954L,
+50955L,50956L,50957L,50958L,50959L,50960L,50961L,50962L,50963L,50964L,
+50965L,50966L,50967L,50968L,50969L,50970L,50971L,50972L,50973L,50974L,
+50975L,50976L,50977L,50978L,50979L,50980L,50981L,50982L,50983L,50984L,
+50985L,50986L,50987L,50988L,50989L,50990L,50991L,50992L,50993L,50994L,
+50995L,50996L,50997L,50998L,50999L,51000L,51001L,51002L,51003L,51004L,
+51005L,51006L,51007L,51008L,51009L,51010L,51011L,51012L,51013L,51014L,
+51015L,51016L,51017L,51018L,51019L,51020L,51021L,51022L,51023L,51024L,
+51025L,51026L,51027L,51028L,51029L,51030L,51031L,51032L,51033L,51034L,
+51035L,51036L,51037L,51038L,51039L,51040L,51041L,51042L,51043L,51044L,
+51045L,51046L,51047L,51048L,51049L,51050L,51051L,51052L,51053L,51054L,
+51055L,51056L,51057L,51058L,51059L,51060L,51061L,51062L,51063L,51064L,
+51065L,51066L,51067L,51068L,51069L,51070L,51071L,51072L,51073L,51074L,
+51075L,51076L,51077L,51078L,51079L,51080L,51081L,51082L,51083L,51084L,
+51085L,51086L,51087L,51088L,51089L,51090L,51091L,51092L,51093L,51094L,
+51095L,51096L,51097L,51098L,51099L,51100L,51101L,51102L,51103L,51104L,
+51105L,51106L,51107L,51108L,51109L,51110L,51111L,51112L,51113L,51114L,
+51115L,51116L,51117L,51118L,51119L,51120L,51121L,51122L,51123L,51124L,
+51125L,51126L,51127L,51128L,51129L,51130L,51131L,51132L,51133L,51134L,
+51135L,51136L,51137L,51138L,51139L,51140L,51141L,51142L,51143L,51144L,
+51145L,51146L,51147L,51148L,51149L,51150L,51151L,51152L,51153L,51154L,
+51155L,51156L,51157L,51158L,51159L,51160L,51161L,51162L,51163L,51164L,
+51165L,51166L,51167L,51168L,51169L,51170L,51171L,51172L,51173L,51174L,
+51175L,51176L,51177L,51178L,51179L,51180L,51181L,51182L,51183L,51184L,
+51185L,51186L,51187L,51188L,51189L,51190L,51191L,51192L,51193L,51194L,
+51195L,51196L,51197L,51198L,51199L,51200L,51201L,51202L,51203L,51204L,
+51205L,51206L,51207L,51208L,51209L,51210L,51211L,51212L,51213L,51214L,
+51215L,51216L,51217L,51218L,51219L,51220L,51221L,51222L,51223L,51224L,
+51225L,51226L,51227L,51228L,51229L,51230L,51231L,51232L,51233L,51234L,
+51235L,51236L,51237L,51238L,51239L,51240L,51241L,51242L,51243L,51244L,
+51245L,51246L,51247L,51248L,51249L,51250L,51251L,51252L,51253L,51254L,
+51255L,51256L,51257L,51258L,51259L,51260L,51261L,51262L,51263L,51264L,
+51265L,51266L,51267L,51268L,51269L,51270L,51271L,51272L,51273L,51274L,
+51275L,51276L,51277L,51278L,51279L,51280L,51281L,51282L,51283L,51284L,
+51285L,51286L,51287L,51288L,51289L,51290L,51291L,51292L,51293L,51294L,
+51295L,51296L,51297L,51298L,51299L,51300L,51301L,51302L,51303L,51304L,
+51305L,51306L,51307L,51308L,51309L,51310L,51311L,51312L,51313L,51314L,
+51315L,51316L,51317L,51318L,51319L,51320L,51321L,51322L,51323L,51324L,
+51325L,51326L,51327L,51328L,51329L,51330L,51331L,51332L,51333L,51334L,
+51335L,51336L,51337L,51338L,51339L,51340L,51341L,51342L,51343L,51344L,
+51345L,51346L,51347L,51348L,51349L,51350L,51351L,51352L,51353L,51354L,
+51355L,51356L,51357L,51358L,51359L,51360L,51361L,51362L,51363L,51364L,
+51365L,51366L,51367L,51368L,51369L,51370L,51371L,51372L,51373L,51374L,
+51375L,51376L,51377L,51378L,51379L,51380L,51381L,51382L,51383L,51384L,
+51385L,51386L,51387L,51388L,51389L,51390L,51391L,51392L,51393L,51394L,
+51395L,51396L,51397L,51398L,51399L,51400L,51401L,51402L,51403L,51404L,
+51405L,51406L,51407L,51408L,51409L,51410L,51411L,51412L,51413L,51414L,
+51415L,51416L,51417L,51418L,51419L,51420L,51421L,51422L,51423L,51424L,
+51425L,51426L,51427L,51428L,51429L,51430L,51431L,51432L,51433L,51434L,
+51435L,51436L,51437L,51438L,51439L,51440L,51441L,51442L,51443L,51444L,
+51445L,51446L,51447L,51448L,51449L,51450L,51451L,51452L,51453L,51454L,
+51455L,51456L,51457L,51458L,51459L,51460L,51461L,51462L,51463L,51464L,
+51465L,51466L,51467L,51468L,51469L,51470L,51471L,51472L,51473L,51474L,
+51475L,51476L,51477L,51478L,51479L,51480L,51481L,51482L,51483L,51484L,
+51485L,51486L,51487L,51488L,51489L,51490L,51491L,51492L,51493L,51494L,
+51495L,51496L,51497L,51498L,51499L,51500L,51501L,51502L,51503L,51504L,
+51505L,51506L,51507L,51508L,51509L,51510L,51511L,51512L,51513L,51514L,
+51515L,51516L,51517L,51518L,51519L,51520L,51521L,51522L,51523L,51524L,
+51525L,51526L,51527L,51528L,51529L,51530L,51531L,51532L,51533L,51534L,
+51535L,51536L,51537L,51538L,51539L,51540L,51541L,51542L,51543L,51544L,
+51545L,51546L,51547L,51548L,51549L,51550L,51551L,51552L,51553L,51554L,
+51555L,51556L,51557L,51558L,51559L,51560L,51561L,51562L,51563L,51564L,
+51565L,51566L,51567L,51568L,51569L,51570L,51571L,51572L,51573L,51574L,
+51575L,51576L,51577L,51578L,51579L,51580L,51581L,51582L,51583L,51584L,
+51585L,51586L,51587L,51588L,51589L,51590L,51591L,51592L,51593L,51594L,
+51595L,51596L,51597L,51598L,51599L,51600L,51601L,51602L,51603L,51604L,
+51605L,51606L,51607L,51608L,51609L,51610L,51611L,51612L,51613L,51614L,
+51615L,51616L,51617L,51618L,51619L,51620L,51621L,51622L,51623L,51624L,
+51625L,51626L,51627L,51628L,51629L,51630L,51631L,51632L,51633L,51634L,
+51635L,51636L,51637L,51638L,51639L,51640L,51641L,51642L,51643L,51644L,
+51645L,51646L,51647L,51648L,51649L,51650L,51651L,51652L,51653L,51654L,
+51655L,51656L,51657L,51658L,51659L,51660L,51661L,51662L,51663L,51664L,
+51665L,51666L,51667L,51668L,51669L,51670L,51671L,51672L,51673L,51674L,
+51675L,51676L,51677L,51678L,51679L,51680L,51681L,51682L,51683L,51684L,
+51685L,51686L,51687L,51688L,51689L,51690L,51691L,51692L,51693L,51694L,
+51695L,51696L,51697L,51698L,51699L,51700L,51701L,51702L,51703L,51704L,
+51705L,51706L,51707L,51708L,51709L,51710L,51711L,51712L,51713L,51714L,
+51715L,51716L,51717L,51718L,51719L,51720L,51721L,51722L,51723L,51724L,
+51725L,51726L,51727L,51728L,51729L,51730L,51731L,51732L,51733L,51734L,
+51735L,51736L,51737L,51738L,51739L,51740L,51741L,51742L,51743L,51744L,
+51745L,51746L,51747L,51748L,51749L,51750L,51751L,51752L,51753L,51754L,
+51755L,51756L,51757L,51758L,51759L,51760L,51761L,51762L,51763L,51764L,
+51765L,51766L,51767L,51768L,51769L,51770L,51771L,51772L,51773L,51774L,
+51775L,51776L,51777L,51778L,51779L,51780L,51781L,51782L,51783L,51784L,
+51785L,51786L,51787L,51788L,51789L,51790L,51791L,51792L,51793L,51794L,
+51795L,51796L,51797L,51798L,51799L,51800L,51801L,51802L,51803L,51804L,
+51805L,51806L,51807L,51808L,51809L,51810L,51811L,51812L,51813L,51814L,
+51815L,51816L,51817L,51818L,51819L,51820L,51821L,51822L,51823L,51824L,
+51825L,51826L,51827L,51828L,51829L,51830L,51831L,51832L,51833L,51834L,
+51835L,51836L,51837L,51838L,51839L,51840L,51841L,51842L,51843L,51844L,
+51845L,51846L,51847L,51848L,51849L,51850L,51851L,51852L,51853L,51854L,
+51855L,51856L,51857L,51858L,51859L,51860L,51861L,51862L,51863L,51864L,
+51865L,51866L,51867L,51868L,51869L,51870L,51871L,51872L,51873L,51874L,
+51875L,51876L,51877L,51878L,51879L,51880L,51881L,51882L,51883L,51884L,
+51885L,51886L,51887L,51888L,51889L,51890L,51891L,51892L,51893L,51894L,
+51895L,51896L,51897L,51898L,51899L,51900L,51901L,51902L,51903L,51904L,
+51905L,51906L,51907L,51908L,51909L,51910L,51911L,51912L,51913L,51914L,
+51915L,51916L,51917L,51918L,51919L,51920L,51921L,51922L,51923L,51924L,
+51925L,51926L,51927L,51928L,51929L,51930L,51931L,51932L,51933L,51934L,
+51935L,51936L,51937L,51938L,51939L,51940L,51941L,51942L,51943L,51944L,
+51945L,51946L,51947L,51948L,51949L,51950L,51951L,51952L,51953L,51954L,
+51955L,51956L,51957L,51958L,51959L,51960L,51961L,51962L,51963L,51964L,
+51965L,51966L,51967L,51968L,51969L,51970L,51971L,51972L,51973L,51974L,
+51975L,51976L,51977L,51978L,51979L,51980L,51981L,51982L,51983L,51984L,
+51985L,51986L,51987L,51988L,51989L,51990L,51991L,51992L,51993L,51994L,
+51995L,51996L,51997L,51998L,51999L,52000L,52001L,52002L,52003L,52004L,
+52005L,52006L,52007L,52008L,52009L,52010L,52011L,52012L,52013L,52014L,
+52015L,52016L,52017L,52018L,52019L,52020L,52021L,52022L,52023L,52024L,
+52025L,52026L,52027L,52028L,52029L,52030L,52031L,52032L,52033L,52034L,
+52035L,52036L,52037L,52038L,52039L,52040L,52041L,52042L,52043L,52044L,
+52045L,52046L,52047L,52048L,52049L,52050L,52051L,52052L,52053L,52054L,
+52055L,52056L,52057L,52058L,52059L,52060L,52061L,52062L,52063L,52064L,
+52065L,52066L,52067L,52068L,52069L,52070L,52071L,52072L,52073L,52074L,
+52075L,52076L,52077L,52078L,52079L,52080L,52081L,52082L,52083L,52084L,
+52085L,52086L,52087L,52088L,52089L,52090L,52091L,52092L,52093L,52094L,
+52095L,52096L,52097L,52098L,52099L,52100L,52101L,52102L,52103L,52104L,
+52105L,52106L,52107L,52108L,52109L,52110L,52111L,52112L,52113L,52114L,
+52115L,52116L,52117L,52118L,52119L,52120L,52121L,52122L,52123L,52124L,
+52125L,52126L,52127L,52128L,52129L,52130L,52131L,52132L,52133L,52134L,
+52135L,52136L,52137L,52138L,52139L,52140L,52141L,52142L,52143L,52144L,
+52145L,52146L,52147L,52148L,52149L,52150L,52151L,52152L,52153L,52154L,
+52155L,52156L,52157L,52158L,52159L,52160L,52161L,52162L,52163L,52164L,
+52165L,52166L,52167L,52168L,52169L,52170L,52171L,52172L,52173L,52174L,
+52175L,52176L,52177L,52178L,52179L,52180L,52181L,52182L,52183L,52184L,
+52185L,52186L,52187L,52188L,52189L,52190L,52191L,52192L,52193L,52194L,
+52195L,52196L,52197L,52198L,52199L,52200L,52201L,52202L,52203L,52204L,
+52205L,52206L,52207L,52208L,52209L,52210L,52211L,52212L,52213L,52214L,
+52215L,52216L,52217L,52218L,52219L,52220L,52221L,52222L,52223L,52224L,
+52225L,52226L,52227L,52228L,52229L,52230L,52231L,52232L,52233L,52234L,
+52235L,52236L,52237L,52238L,52239L,52240L,52241L,52242L,52243L,52244L,
+52245L,52246L,52247L,52248L,52249L,52250L,52251L,52252L,52253L,52254L,
+52255L,52256L,52257L,52258L,52259L,52260L,52261L,52262L,52263L,52264L,
+52265L,52266L,52267L,52268L,52269L,52270L,52271L,52272L,52273L,52274L,
+52275L,52276L,52277L,52278L,52279L,52280L,52281L,52282L,52283L,52284L,
+52285L,52286L,52287L,52288L,52289L,52290L,52291L,52292L,52293L,52294L,
+52295L,52296L,52297L,52298L,52299L,52300L,52301L,52302L,52303L,52304L,
+52305L,52306L,52307L,52308L,52309L,52310L,52311L,52312L,52313L,52314L,
+52315L,52316L,52317L,52318L,52319L,52320L,52321L,52322L,52323L,52324L,
+52325L,52326L,52327L,52328L,52329L,52330L,52331L,52332L,52333L,52334L,
+52335L,52336L,52337L,52338L,52339L,52340L,52341L,52342L,52343L,52344L,
+52345L,52346L,52347L,52348L,52349L,52350L,52351L,52352L,52353L,52354L,
+52355L,52356L,52357L,52358L,52359L,52360L,52361L,52362L,52363L,52364L,
+52365L,52366L,52367L,52368L,52369L,52370L,52371L,52372L,52373L,52374L,
+52375L,52376L,52377L,52378L,52379L,52380L,52381L,52382L,52383L,52384L,
+52385L,52386L,52387L,52388L,52389L,52390L,52391L,52392L,52393L,52394L,
+52395L,52396L,52397L,52398L,52399L,52400L,52401L,52402L,52403L,52404L,
+52405L,52406L,52407L,52408L,52409L,52410L,52411L,52412L,52413L,52414L,
+52415L,52416L,52417L,52418L,52419L,52420L,52421L,52422L,52423L,52424L,
+52425L,52426L,52427L,52428L,52429L,52430L,52431L,52432L,52433L,52434L,
+52435L,52436L,52437L,52438L,52439L,52440L,52441L,52442L,52443L,52444L,
+52445L,52446L,52447L,52448L,52449L,52450L,52451L,52452L,52453L,52454L,
+52455L,52456L,52457L,52458L,52459L,52460L,52461L,52462L,52463L,52464L,
+52465L,52466L,52467L,52468L,52469L,52470L,52471L,52472L,52473L,52474L,
+52475L,52476L,52477L,52478L,52479L,52480L,52481L,52482L,52483L,52484L,
+52485L,52486L,52487L,52488L,52489L,52490L,52491L,52492L,52493L,52494L,
+52495L,52496L,52497L,52498L,52499L,52500L,52501L,52502L,52503L,52504L,
+52505L,52506L,52507L,52508L,52509L,52510L,52511L,52512L,52513L,52514L,
+52515L,52516L,52517L,52518L,52519L,52520L,52521L,52522L,52523L,52524L,
+52525L,52526L,52527L,52528L,52529L,52530L,52531L,52532L,52533L,52534L,
+52535L,52536L,52537L,52538L,52539L,52540L,52541L,52542L,52543L,52544L,
+52545L,52546L,52547L,52548L,52549L,52550L,52551L,52552L,52553L,52554L,
+52555L,52556L,52557L,52558L,52559L,52560L,52561L,52562L,52563L,52564L,
+52565L,52566L,52567L,52568L,52569L,52570L,52571L,52572L,52573L,52574L,
+52575L,52576L,52577L,52578L,52579L,52580L,52581L,52582L,52583L,52584L,
+52585L,52586L,52587L,52588L,52589L,52590L,52591L,52592L,52593L,52594L,
+52595L,52596L,52597L,52598L,52599L,52600L,52601L,52602L,52603L,52604L,
+52605L,52606L,52607L,52608L,52609L,52610L,52611L,52612L,52613L,52614L,
+52615L,52616L,52617L,52618L,52619L,52620L,52621L,52622L,52623L,52624L,
+52625L,52626L,52627L,52628L,52629L,52630L,52631L,52632L,52633L,52634L,
+52635L,52636L,52637L,52638L,52639L,52640L,52641L,52642L,52643L,52644L,
+52645L,52646L,52647L,52648L,52649L,52650L,52651L,52652L,52653L,52654L,
+52655L,52656L,52657L,52658L,52659L,52660L,52661L,52662L,52663L,52664L,
+52665L,52666L,52667L,52668L,52669L,52670L,52671L,52672L,52673L,52674L,
+52675L,52676L,52677L,52678L,52679L,52680L,52681L,52682L,52683L,52684L,
+52685L,52686L,52687L,52688L,52689L,52690L,52691L,52692L,52693L,52694L,
+52695L,52696L,52697L,52698L,52699L,52700L,52701L,52702L,52703L,52704L,
+52705L,52706L,52707L,52708L,52709L,52710L,52711L,52712L,52713L,52714L,
+52715L,52716L,52717L,52718L,52719L,52720L,52721L,52722L,52723L,52724L,
+52725L,52726L,52727L,52728L,52729L,52730L,52731L,52732L,52733L,52734L,
+52735L,52736L,52737L,52738L,52739L,52740L,52741L,52742L,52743L,52744L,
+52745L,52746L,52747L,52748L,52749L,52750L,52751L,52752L,52753L,52754L,
+52755L,52756L,52757L,52758L,52759L,52760L,52761L,52762L,52763L,52764L,
+52765L,52766L,52767L,52768L,52769L,52770L,52771L,52772L,52773L,52774L,
+52775L,52776L,52777L,52778L,52779L,52780L,52781L,52782L,52783L,52784L,
+52785L,52786L,52787L,52788L,52789L,52790L,52791L,52792L,52793L,52794L,
+52795L,52796L,52797L,52798L,52799L,52800L,52801L,52802L,52803L,52804L,
+52805L,52806L,52807L,52808L,52809L,52810L,52811L,52812L,52813L,52814L,
+52815L,52816L,52817L,52818L,52819L,52820L,52821L,52822L,52823L,52824L,
+52825L,52826L,52827L,52828L,52829L,52830L,52831L,52832L,52833L,52834L,
+52835L,52836L,52837L,52838L,52839L,52840L,52841L,52842L,52843L,52844L,
+52845L,52846L,52847L,52848L,52849L,52850L,52851L,52852L,52853L,52854L,
+52855L,52856L,52857L,52858L,52859L,52860L,52861L,52862L,52863L,52864L,
+52865L,52866L,52867L,52868L,52869L,52870L,52871L,52872L,52873L,52874L,
+52875L,52876L,52877L,52878L,52879L,52880L,52881L,52882L,52883L,52884L,
+52885L,52886L,52887L,52888L,52889L,52890L,52891L,52892L,52893L,52894L,
+52895L,52896L,52897L,52898L,52899L,52900L,52901L,52902L,52903L,52904L,
+52905L,52906L,52907L,52908L,52909L,52910L,52911L,52912L,52913L,52914L,
+52915L,52916L,52917L,52918L,52919L,52920L,52921L,52922L,52923L,52924L,
+52925L,52926L,52927L,52928L,52929L,52930L,52931L,52932L,52933L,52934L,
+52935L,52936L,52937L,52938L,52939L,52940L,52941L,52942L,52943L,52944L,
+52945L,52946L,52947L,52948L,52949L,52950L,52951L,52952L,52953L,52954L,
+52955L,52956L,52957L,52958L,52959L,52960L,52961L,52962L,52963L,52964L,
+52965L,52966L,52967L,52968L,52969L,52970L,52971L,52972L,52973L,52974L,
+52975L,52976L,52977L,52978L,52979L,52980L,52981L,52982L,52983L,52984L,
+52985L,52986L,52987L,52988L,52989L,52990L,52991L,52992L,52993L,52994L,
+52995L,52996L,52997L,52998L,52999L,53000L,53001L,53002L,53003L,53004L,
+53005L,53006L,53007L,53008L,53009L,53010L,53011L,53012L,53013L,53014L,
+53015L,53016L,53017L,53018L,53019L,53020L,53021L,53022L,53023L,53024L,
+53025L,53026L,53027L,53028L,53029L,53030L,53031L,53032L,53033L,53034L,
+53035L,53036L,53037L,53038L,53039L,53040L,53041L,53042L,53043L,53044L,
+53045L,53046L,53047L,53048L,53049L,53050L,53051L,53052L,53053L,53054L,
+53055L,53056L,53057L,53058L,53059L,53060L,53061L,53062L,53063L,53064L,
+53065L,53066L,53067L,53068L,53069L,53070L,53071L,53072L,53073L,53074L,
+53075L,53076L,53077L,53078L,53079L,53080L,53081L,53082L,53083L,53084L,
+53085L,53086L,53087L,53088L,53089L,53090L,53091L,53092L,53093L,53094L,
+53095L,53096L,53097L,53098L,53099L,53100L,53101L,53102L,53103L,53104L,
+53105L,53106L,53107L,53108L,53109L,53110L,53111L,53112L,53113L,53114L,
+53115L,53116L,53117L,53118L,53119L,53120L,53121L,53122L,53123L,53124L,
+53125L,53126L,53127L,53128L,53129L,53130L,53131L,53132L,53133L,53134L,
+53135L,53136L,53137L,53138L,53139L,53140L,53141L,53142L,53143L,53144L,
+53145L,53146L,53147L,53148L,53149L,53150L,53151L,53152L,53153L,53154L,
+53155L,53156L,53157L,53158L,53159L,53160L,53161L,53162L,53163L,53164L,
+53165L,53166L,53167L,53168L,53169L,53170L,53171L,53172L,53173L,53174L,
+53175L,53176L,53177L,53178L,53179L,53180L,53181L,53182L,53183L,53184L,
+53185L,53186L,53187L,53188L,53189L,53190L,53191L,53192L,53193L,53194L,
+53195L,53196L,53197L,53198L,53199L,53200L,53201L,53202L,53203L,53204L,
+53205L,53206L,53207L,53208L,53209L,53210L,53211L,53212L,53213L,53214L,
+53215L,53216L,53217L,53218L,53219L,53220L,53221L,53222L,53223L,53224L,
+53225L,53226L,53227L,53228L,53229L,53230L,53231L,53232L,53233L,53234L,
+53235L,53236L,53237L,53238L,53239L,53240L,53241L,53242L,53243L,53244L,
+53245L,53246L,53247L,53248L,53249L,53250L,53251L,53252L,53253L,53254L,
+53255L,53256L,53257L,53258L,53259L,53260L,53261L,53262L,53263L,53264L,
+53265L,53266L,53267L,53268L,53269L,53270L,53271L,53272L,53273L,53274L,
+53275L,53276L,53277L,53278L,53279L,53280L,53281L,53282L,53283L,53284L,
+53285L,53286L,53287L,53288L,53289L,53290L,53291L,53292L,53293L,53294L,
+53295L,53296L,53297L,53298L,53299L,53300L,53301L,53302L,53303L,53304L,
+53305L,53306L,53307L,53308L,53309L,53310L,53311L,53312L,53313L,53314L,
+53315L,53316L,53317L,53318L,53319L,53320L,53321L,53322L,53323L,53324L,
+53325L,53326L,53327L,53328L,53329L,53330L,53331L,53332L,53333L,53334L,
+53335L,53336L,53337L,53338L,53339L,53340L,53341L,53342L,53343L,53344L,
+53345L,53346L,53347L,53348L,53349L,53350L,53351L,53352L,53353L,53354L,
+53355L,53356L,53357L,53358L,53359L,53360L,53361L,53362L,53363L,53364L,
+53365L,53366L,53367L,53368L,53369L,53370L,53371L,53372L,53373L,53374L,
+53375L,53376L,53377L,53378L,53379L,53380L,53381L,53382L,53383L,53384L,
+53385L,53386L,53387L,53388L,53389L,53390L,53391L,53392L,53393L,53394L,
+53395L,53396L,53397L,53398L,53399L,53400L,53401L,53402L,53403L,53404L,
+53405L,53406L,53407L,53408L,53409L,53410L,53411L,53412L,53413L,53414L,
+53415L,53416L,53417L,53418L,53419L,53420L,53421L,53422L,53423L,53424L,
+53425L,53426L,53427L,53428L,53429L,53430L,53431L,53432L,53433L,53434L,
+53435L,53436L,53437L,53438L,53439L,53440L,53441L,53442L,53443L,53444L,
+53445L,53446L,53447L,53448L,53449L,53450L,53451L,53452L,53453L,53454L,
+53455L,53456L,53457L,53458L,53459L,53460L,53461L,53462L,53463L,53464L,
+53465L,53466L,53467L,53468L,53469L,53470L,53471L,53472L,53473L,53474L,
+53475L,53476L,53477L,53478L,53479L,53480L,53481L,53482L,53483L,53484L,
+53485L,53486L,53487L,53488L,53489L,53490L,53491L,53492L,53493L,53494L,
+53495L,53496L,53497L,53498L,53499L,53500L,53501L,53502L,53503L,53504L,
+53505L,53506L,53507L,53508L,53509L,53510L,53511L,53512L,53513L,53514L,
+53515L,53516L,53517L,53518L,53519L,53520L,53521L,53522L,53523L,53524L,
+53525L,53526L,53527L,53528L,53529L,53530L,53531L,53532L,53533L,53534L,
+53535L,53536L,53537L,53538L,53539L,53540L,53541L,53542L,53543L,53544L,
+53545L,53546L,53547L,53548L,53549L,53550L,53551L,53552L,53553L,53554L,
+53555L,53556L,53557L,53558L,53559L,53560L,53561L,53562L,53563L,53564L,
+53565L,53566L,53567L,53568L,53569L,53570L,53571L,53572L,53573L,53574L,
+53575L,53576L,53577L,53578L,53579L,53580L,53581L,53582L,53583L,53584L,
+53585L,53586L,53587L,53588L,53589L,53590L,53591L,53592L,53593L,53594L,
+53595L,53596L,53597L,53598L,53599L,53600L,53601L,53602L,53603L,53604L,
+53605L,53606L,53607L,53608L,53609L,53610L,53611L,53612L,53613L,53614L,
+53615L,53616L,53617L,53618L,53619L,53620L,53621L,53622L,53623L,53624L,
+53625L,53626L,53627L,53628L,53629L,53630L,53631L,53632L,53633L,53634L,
+53635L,53636L,53637L,53638L,53639L,53640L,53641L,53642L,53643L,53644L,
+53645L,53646L,53647L,53648L,53649L,53650L,53651L,53652L,53653L,53654L,
+53655L,53656L,53657L,53658L,53659L,53660L,53661L,53662L,53663L,53664L,
+53665L,53666L,53667L,53668L,53669L,53670L,53671L,53672L,53673L,53674L,
+53675L,53676L,53677L,53678L,53679L,53680L,53681L,53682L,53683L,53684L,
+53685L,53686L,53687L,53688L,53689L,53690L,53691L,53692L,53693L,53694L,
+53695L,53696L,53697L,53698L,53699L,53700L,53701L,53702L,53703L,53704L,
+53705L,53706L,53707L,53708L,53709L,53710L,53711L,53712L,53713L,53714L,
+53715L,53716L,53717L,53718L,53719L,53720L,53721L,53722L,53723L,53724L,
+53725L,53726L,53727L,53728L,53729L,53730L,53731L,53732L,53733L,53734L,
+53735L,53736L,53737L,53738L,53739L,53740L,53741L,53742L,53743L,53744L,
+53745L,53746L,53747L,53748L,53749L,53750L,53751L,53752L,53753L,53754L,
+53755L,53756L,53757L,53758L,53759L,53760L,53761L,53762L,53763L,53764L,
+53765L,53766L,53767L,53768L,53769L,53770L,53771L,53772L,53773L,53774L,
+53775L,53776L,53777L,53778L,53779L,53780L,53781L,53782L,53783L,53784L,
+53785L,53786L,53787L,53788L,53789L,53790L,53791L,53792L,53793L,53794L,
+53795L,53796L,53797L,53798L,53799L,53800L,53801L,53802L,53803L,53804L,
+53805L,53806L,53807L,53808L,53809L,53810L,53811L,53812L,53813L,53814L,
+53815L,53816L,53817L,53818L,53819L,53820L,53821L,53822L,53823L,53824L,
+53825L,53826L,53827L,53828L,53829L,53830L,53831L,53832L,53833L,53834L,
+53835L,53836L,53837L,53838L,53839L,53840L,53841L,53842L,53843L,53844L,
+53845L,53846L,53847L,53848L,53849L,53850L,53851L,53852L,53853L,53854L,
+53855L,53856L,53857L,53858L,53859L,53860L,53861L,53862L,53863L,53864L,
+53865L,53866L,53867L,53868L,53869L,53870L,53871L,53872L,53873L,53874L,
+53875L,53876L,53877L,53878L,53879L,53880L,53881L,53882L,53883L,53884L,
+53885L,53886L,53887L,53888L,53889L,53890L,53891L,53892L,53893L,53894L,
+53895L,53896L,53897L,53898L,53899L,53900L,53901L,53902L,53903L,53904L,
+53905L,53906L,53907L,53908L,53909L,53910L,53911L,53912L,53913L,53914L,
+53915L,53916L,53917L,53918L,53919L,53920L,53921L,53922L,53923L,53924L,
+53925L,53926L,53927L,53928L,53929L,53930L,53931L,53932L,53933L,53934L,
+53935L,53936L,53937L,53938L,53939L,53940L,53941L,53942L,53943L,53944L,
+53945L,53946L,53947L,53948L,53949L,53950L,53951L,53952L,53953L,53954L,
+53955L,53956L,53957L,53958L,53959L,53960L,53961L,53962L,53963L,53964L,
+53965L,53966L,53967L,53968L,53969L,53970L,53971L,53972L,53973L,53974L,
+53975L,53976L,53977L,53978L,53979L,53980L,53981L,53982L,53983L,53984L,
+53985L,53986L,53987L,53988L,53989L,53990L,53991L,53992L,53993L,53994L,
+53995L,53996L,53997L,53998L,53999L,54000L,54001L,54002L,54003L,54004L,
+54005L,54006L,54007L,54008L,54009L,54010L,54011L,54012L,54013L,54014L,
+54015L,54016L,54017L,54018L,54019L,54020L,54021L,54022L,54023L,54024L,
+54025L,54026L,54027L,54028L,54029L,54030L,54031L,54032L,54033L,54034L,
+54035L,54036L,54037L,54038L,54039L,54040L,54041L,54042L,54043L,54044L,
+54045L,54046L,54047L,54048L,54049L,54050L,54051L,54052L,54053L,54054L,
+54055L,54056L,54057L,54058L,54059L,54060L,54061L,54062L,54063L,54064L,
+54065L,54066L,54067L,54068L,54069L,54070L,54071L,54072L,54073L,54074L,
+54075L,54076L,54077L,54078L,54079L,54080L,54081L,54082L,54083L,54084L,
+54085L,54086L,54087L,54088L,54089L,54090L,54091L,54092L,54093L,54094L,
+54095L,54096L,54097L,54098L,54099L,54100L,54101L,54102L,54103L,54104L,
+54105L,54106L,54107L,54108L,54109L,54110L,54111L,54112L,54113L,54114L,
+54115L,54116L,54117L,54118L,54119L,54120L,54121L,54122L,54123L,54124L,
+54125L,54126L,54127L,54128L,54129L,54130L,54131L,54132L,54133L,54134L,
+54135L,54136L,54137L,54138L,54139L,54140L,54141L,54142L,54143L,54144L,
+54145L,54146L,54147L,54148L,54149L,54150L,54151L,54152L,54153L,54154L,
+54155L,54156L,54157L,54158L,54159L,54160L,54161L,54162L,54163L,54164L,
+54165L,54166L,54167L,54168L,54169L,54170L,54171L,54172L,54173L,54174L,
+54175L,54176L,54177L,54178L,54179L,54180L,54181L,54182L,54183L,54184L,
+54185L,54186L,54187L,54188L,54189L,54190L,54191L,54192L,54193L,54194L,
+54195L,54196L,54197L,54198L,54199L,54200L,54201L,54202L,54203L,54204L,
+54205L,54206L,54207L,54208L,54209L,54210L,54211L,54212L,54213L,54214L,
+54215L,54216L,54217L,54218L,54219L,54220L,54221L,54222L,54223L,54224L,
+54225L,54226L,54227L,54228L,54229L,54230L,54231L,54232L,54233L,54234L,
+54235L,54236L,54237L,54238L,54239L,54240L,54241L,54242L,54243L,54244L,
+54245L,54246L,54247L,54248L,54249L,54250L,54251L,54252L,54253L,54254L,
+54255L,54256L,54257L,54258L,54259L,54260L,54261L,54262L,54263L,54264L,
+54265L,54266L,54267L,54268L,54269L,54270L,54271L,54272L,54273L,54274L,
+54275L,54276L,54277L,54278L,54279L,54280L,54281L,54282L,54283L,54284L,
+54285L,54286L,54287L,54288L,54289L,54290L,54291L,54292L,54293L,54294L,
+54295L,54296L,54297L,54298L,54299L,54300L,54301L,54302L,54303L,54304L,
+54305L,54306L,54307L,54308L,54309L,54310L,54311L,54312L,54313L,54314L,
+54315L,54316L,54317L,54318L,54319L,54320L,54321L,54322L,54323L,54324L,
+54325L,54326L,54327L,54328L,54329L,54330L,54331L,54332L,54333L,54334L,
+54335L,54336L,54337L,54338L,54339L,54340L,54341L,54342L,54343L,54344L,
+54345L,54346L,54347L,54348L,54349L,54350L,54351L,54352L,54353L,54354L,
+54355L,54356L,54357L,54358L,54359L,54360L,54361L,54362L,54363L,54364L,
+54365L,54366L,54367L,54368L,54369L,54370L,54371L,54372L,54373L,54374L,
+54375L,54376L,54377L,54378L,54379L,54380L,54381L,54382L,54383L,54384L,
+54385L,54386L,54387L,54388L,54389L,54390L,54391L,54392L,54393L,54394L,
+54395L,54396L,54397L,54398L,54399L,54400L,54401L,54402L,54403L,54404L,
+54405L,54406L,54407L,54408L,54409L,54410L,54411L,54412L,54413L,54414L,
+54415L,54416L,54417L,54418L,54419L,54420L,54421L,54422L,54423L,54424L,
+54425L,54426L,54427L,54428L,54429L,54430L,54431L,54432L,54433L,54434L,
+54435L,54436L,54437L,54438L,54439L,54440L,54441L,54442L,54443L,54444L,
+54445L,54446L,54447L,54448L,54449L,54450L,54451L,54452L,54453L,54454L,
+54455L,54456L,54457L,54458L,54459L,54460L,54461L,54462L,54463L,54464L,
+54465L,54466L,54467L,54468L,54469L,54470L,54471L,54472L,54473L,54474L,
+54475L,54476L,54477L,54478L,54479L,54480L,54481L,54482L,54483L,54484L,
+54485L,54486L,54487L,54488L,54489L,54490L,54491L,54492L,54493L,54494L,
+54495L,54496L,54497L,54498L,54499L,54500L,54501L,54502L,54503L,54504L,
+54505L,54506L,54507L,54508L,54509L,54510L,54511L,54512L,54513L,54514L,
+54515L,54516L,54517L,54518L,54519L,54520L,54521L,54522L,54523L,54524L,
+54525L,54526L,54527L,54528L,54529L,54530L,54531L,54532L,54533L,54534L,
+54535L,54536L,54537L,54538L,54539L,54540L,54541L,54542L,54543L,54544L,
+54545L,54546L,54547L,54548L,54549L,54550L,54551L,54552L,54553L,54554L,
+54555L,54556L,54557L,54558L,54559L,54560L,54561L,54562L,54563L,54564L,
+54565L,54566L,54567L,54568L,54569L,54570L,54571L,54572L,54573L,54574L,
+54575L,54576L,54577L,54578L,54579L,54580L,54581L,54582L,54583L,54584L,
+54585L,54586L,54587L,54588L,54589L,54590L,54591L,54592L,54593L,54594L,
+54595L,54596L,54597L,54598L,54599L,54600L,54601L,54602L,54603L,54604L,
+54605L,54606L,54607L,54608L,54609L,54610L,54611L,54612L,54613L,54614L,
+54615L,54616L,54617L,54618L,54619L,54620L,54621L,54622L,54623L,54624L,
+54625L,54626L,54627L,54628L,54629L,54630L,54631L,54632L,54633L,54634L,
+54635L,54636L,54637L,54638L,54639L,54640L,54641L,54642L,54643L,54644L,
+54645L,54646L,54647L,54648L,54649L,54650L,54651L,54652L,54653L,54654L,
+54655L,54656L,54657L,54658L,54659L,54660L,54661L,54662L,54663L,54664L,
+54665L,54666L,54667L,54668L,54669L,54670L,54671L,54672L,54673L,54674L,
+54675L,54676L,54677L,54678L,54679L,54680L,54681L,54682L,54683L,54684L,
+54685L,54686L,54687L,54688L,54689L,54690L,54691L,54692L,54693L,54694L,
+54695L,54696L,54697L,54698L,54699L,54700L,54701L,54702L,54703L,54704L,
+54705L,54706L,54707L,54708L,54709L,54710L,54711L,54712L,54713L,54714L,
+54715L,54716L,54717L,54718L,54719L,54720L,54721L,54722L,54723L,54724L,
+54725L,54726L,54727L,54728L,54729L,54730L,54731L,54732L,54733L,54734L,
+54735L,54736L,54737L,54738L,54739L,54740L,54741L,54742L,54743L,54744L,
+54745L,54746L,54747L,54748L,54749L,54750L,54751L,54752L,54753L,54754L,
+54755L,54756L,54757L,54758L,54759L,54760L,54761L,54762L,54763L,54764L,
+54765L,54766L,54767L,54768L,54769L,54770L,54771L,54772L,54773L,54774L,
+54775L,54776L,54777L,54778L,54779L,54780L,54781L,54782L,54783L,54784L,
+54785L,54786L,54787L,54788L,54789L,54790L,54791L,54792L,54793L,54794L,
+54795L,54796L,54797L,54798L,54799L,54800L,54801L,54802L,54803L,54804L,
+54805L,54806L,54807L,54808L,54809L,54810L,54811L,54812L,54813L,54814L,
+54815L,54816L,54817L,54818L,54819L,54820L,54821L,54822L,54823L,54824L,
+54825L,54826L,54827L,54828L,54829L,54830L,54831L,54832L,54833L,54834L,
+54835L,54836L,54837L,54838L,54839L,54840L,54841L,54842L,54843L,54844L,
+54845L,54846L,54847L,54848L,54849L,54850L,54851L,54852L,54853L,54854L,
+54855L,54856L,54857L,54858L,54859L,54860L,54861L,54862L,54863L,54864L,
+54865L,54866L,54867L,54868L,54869L,54870L,54871L,54872L,54873L,54874L,
+54875L,54876L,54877L,54878L,54879L,54880L,54881L,54882L,54883L,54884L,
+54885L,54886L,54887L,54888L,54889L,54890L,54891L,54892L,54893L,54894L,
+54895L,54896L,54897L,54898L,54899L,54900L,54901L,54902L,54903L,54904L,
+54905L,54906L,54907L,54908L,54909L,54910L,54911L,54912L,54913L,54914L,
+54915L,54916L,54917L,54918L,54919L,54920L,54921L,54922L,54923L,54924L,
+54925L,54926L,54927L,54928L,54929L,54930L,54931L,54932L,54933L,54934L,
+54935L,54936L,54937L,54938L,54939L,54940L,54941L,54942L,54943L,54944L,
+54945L,54946L,54947L,54948L,54949L,54950L,54951L,54952L,54953L,54954L,
+54955L,54956L,54957L,54958L,54959L,54960L,54961L,54962L,54963L,54964L,
+54965L,54966L,54967L,54968L,54969L,54970L,54971L,54972L,54973L,54974L,
+54975L,54976L,54977L,54978L,54979L,54980L,54981L,54982L,54983L,54984L,
+54985L,54986L,54987L,54988L,54989L,54990L,54991L,54992L,54993L,54994L,
+54995L,54996L,54997L,54998L,54999L,55000L,55001L,55002L,55003L,55004L,
+55005L,55006L,55007L,55008L,55009L,55010L,55011L,55012L,55013L,55014L,
+55015L,55016L,55017L,55018L,55019L,55020L,55021L,55022L,55023L,55024L,
+55025L,55026L,55027L,55028L,55029L,55030L,55031L,55032L,55033L,55034L,
+55035L,55036L,55037L,55038L,55039L,55040L,55041L,55042L,55043L,55044L,
+55045L,55046L,55047L,55048L,55049L,55050L,55051L,55052L,55053L,55054L,
+55055L,55056L,55057L,55058L,55059L,55060L,55061L,55062L,55063L,55064L,
+55065L,55066L,55067L,55068L,55069L,55070L,55071L,55072L,55073L,55074L,
+55075L,55076L,55077L,55078L,55079L,55080L,55081L,55082L,55083L,55084L,
+55085L,55086L,55087L,55088L,55089L,55090L,55091L,55092L,55093L,55094L,
+55095L,55096L,55097L,55098L,55099L,55100L,55101L,55102L,55103L,55104L,
+55105L,55106L,55107L,55108L,55109L,55110L,55111L,55112L,55113L,55114L,
+55115L,55116L,55117L,55118L,55119L,55120L,55121L,55122L,55123L,55124L,
+55125L,55126L,55127L,55128L,55129L,55130L,55131L,55132L,55133L,55134L,
+55135L,55136L,55137L,55138L,55139L,55140L,55141L,55142L,55143L,55144L,
+55145L,55146L,55147L,55148L,55149L,55150L,55151L,55152L,55153L,55154L,
+55155L,55156L,55157L,55158L,55159L,55160L,55161L,55162L,55163L,55164L,
+55165L,55166L,55167L,55168L,55169L,55170L,55171L,55172L,55173L,55174L,
+55175L,55176L,55177L,55178L,55179L,55180L,55181L,55182L,55183L,55184L,
+55185L,55186L,55187L,55188L,55189L,55190L,55191L,55192L,55193L,55194L,
+55195L,55196L,55197L,55198L,55199L,55200L,55201L,55202L,55203L,55204L,
+55205L,55206L,55207L,55208L,55209L,55210L,55211L,55212L,55213L,55214L,
+55215L,55216L,55217L,55218L,55219L,55220L,55221L,55222L,55223L,55224L,
+55225L,55226L,55227L,55228L,55229L,55230L,55231L,55232L,55233L,55234L,
+55235L,55236L,55237L,55238L,55239L,55240L,55241L,55242L,55243L,55244L,
+55245L,55246L,55247L,55248L,55249L,55250L,55251L,55252L,55253L,55254L,
+55255L,55256L,55257L,55258L,55259L,55260L,55261L,55262L,55263L,55264L,
+55265L,55266L,55267L,55268L,55269L,55270L,55271L,55272L,55273L,55274L,
+55275L,55276L,55277L,55278L,55279L,55280L,55281L,55282L,55283L,55284L,
+55285L,55286L,55287L,55288L,55289L,55290L,55291L,55292L,55293L,55294L,
+55295L,55296L,55297L,55298L,55299L,55300L,55301L,55302L,55303L,55304L,
+55305L,55306L,55307L,55308L,55309L,55310L,55311L,55312L,55313L,55314L,
+55315L,55316L,55317L,55318L,55319L,55320L,55321L,55322L,55323L,55324L,
+55325L,55326L,55327L,55328L,55329L,55330L,55331L,55332L,55333L,55334L,
+55335L,55336L,55337L,55338L,55339L,55340L,55341L,55342L,55343L,55344L,
+55345L,55346L,55347L,55348L,55349L,55350L,55351L,55352L,55353L,55354L,
+55355L,55356L,55357L,55358L,55359L,55360L,55361L,55362L,55363L,55364L,
+55365L,55366L,55367L,55368L,55369L,55370L,55371L,55372L,55373L,55374L,
+55375L,55376L,55377L,55378L,55379L,55380L,55381L,55382L,55383L,55384L,
+55385L,55386L,55387L,55388L,55389L,55390L,55391L,55392L,55393L,55394L,
+55395L,55396L,55397L,55398L,55399L,55400L,55401L,55402L,55403L,55404L,
+55405L,55406L,55407L,55408L,55409L,55410L,55411L,55412L,55413L,55414L,
+55415L,55416L,55417L,55418L,55419L,55420L,55421L,55422L,55423L,55424L,
+55425L,55426L,55427L,55428L,55429L,55430L,55431L,55432L,55433L,55434L,
+55435L,55436L,55437L,55438L,55439L,55440L,55441L,55442L,55443L,55444L,
+55445L,55446L,55447L,55448L,55449L,55450L,55451L,55452L,55453L,55454L,
+55455L,55456L,55457L,55458L,55459L,55460L,55461L,55462L,55463L,55464L,
+55465L,55466L,55467L,55468L,55469L,55470L,55471L,55472L,55473L,55474L,
+55475L,55476L,55477L,55478L,55479L,55480L,55481L,55482L,55483L,55484L,
+55485L,55486L,55487L,55488L,55489L,55490L,55491L,55492L,55493L,55494L,
+55495L,55496L,55497L,55498L,55499L,55500L,55501L,55502L,55503L,55504L,
+55505L,55506L,55507L,55508L,55509L,55510L,55511L,55512L,55513L,55514L,
+55515L,55516L,55517L,55518L,55519L,55520L,55521L,55522L,55523L,55524L,
+55525L,55526L,55527L,55528L,55529L,55530L,55531L,55532L,55533L,55534L,
+55535L,55536L,55537L,55538L,55539L,55540L,55541L,55542L,55543L,55544L,
+55545L,55546L,55547L,55548L,55549L,55550L,55551L,55552L,55553L,55554L,
+55555L,55556L,55557L,55558L,55559L,55560L,55561L,55562L,55563L,55564L,
+55565L,55566L,55567L,55568L,55569L,55570L,55571L,55572L,55573L,55574L,
+55575L,55576L,55577L,55578L,55579L,55580L,55581L,55582L,55583L,55584L,
+55585L,55586L,55587L,55588L,55589L,55590L,55591L,55592L,55593L,55594L,
+55595L,55596L,55597L,55598L,55599L,55600L,55601L,55602L,55603L,55604L,
+55605L,55606L,55607L,55608L,55609L,55610L,55611L,55612L,55613L,55614L,
+55615L,55616L,55617L,55618L,55619L,55620L,55621L,55622L,55623L,55624L,
+55625L,55626L,55627L,55628L,55629L,55630L,55631L,55632L,55633L,55634L,
+55635L,55636L,55637L,55638L,55639L,55640L,55641L,55642L,55643L,55644L,
+55645L,55646L,55647L,55648L,55649L,55650L,55651L,55652L,55653L,55654L,
+55655L,55656L,55657L,55658L,55659L,55660L,55661L,55662L,55663L,55664L,
+55665L,55666L,55667L,55668L,55669L,55670L,55671L,55672L,55673L,55674L,
+55675L,55676L,55677L,55678L,55679L,55680L,55681L,55682L,55683L,55684L,
+55685L,55686L,55687L,55688L,55689L,55690L,55691L,55692L,55693L,55694L,
+55695L,55696L,55697L,55698L,55699L,55700L,55701L,55702L,55703L,55704L,
+55705L,55706L,55707L,55708L,55709L,55710L,55711L,55712L,55713L,55714L,
+55715L,55716L,55717L,55718L,55719L,55720L,55721L,55722L,55723L,55724L,
+55725L,55726L,55727L,55728L,55729L,55730L,55731L,55732L,55733L,55734L,
+55735L,55736L,55737L,55738L,55739L,55740L,55741L,55742L,55743L,55744L,
+55745L,55746L,55747L,55748L,55749L,55750L,55751L,55752L,55753L,55754L,
+55755L,55756L,55757L,55758L,55759L,55760L,55761L,55762L,55763L,55764L,
+55765L,55766L,55767L,55768L,55769L,55770L,55771L,55772L,55773L,55774L,
+55775L,55776L,55777L,55778L,55779L,55780L,55781L,55782L,55783L,55784L,
+55785L,55786L,55787L,55788L,55789L,55790L,55791L,55792L,55793L,55794L,
+55795L,55796L,55797L,55798L,55799L,55800L,55801L,55802L,55803L,55804L,
+55805L,55806L,55807L,55808L,55809L,55810L,55811L,55812L,55813L,55814L,
+55815L,55816L,55817L,55818L,55819L,55820L,55821L,55822L,55823L,55824L,
+55825L,55826L,55827L,55828L,55829L,55830L,55831L,55832L,55833L,55834L,
+55835L,55836L,55837L,55838L,55839L,55840L,55841L,55842L,55843L,55844L,
+55845L,55846L,55847L,55848L,55849L,55850L,55851L,55852L,55853L,55854L,
+55855L,55856L,55857L,55858L,55859L,55860L,55861L,55862L,55863L,55864L,
+55865L,55866L,55867L,55868L,55869L,55870L,55871L,55872L,55873L,55874L,
+55875L,55876L,55877L,55878L,55879L,55880L,55881L,55882L,55883L,55884L,
+55885L,55886L,55887L,55888L,55889L,55890L,55891L,55892L,55893L,55894L,
+55895L,55896L,55897L,55898L,55899L,55900L,55901L,55902L,55903L,55904L,
+55905L,55906L,55907L,55908L,55909L,55910L,55911L,55912L,55913L,55914L,
+55915L,55916L,55917L,55918L,55919L,55920L,55921L,55922L,55923L,55924L,
+55925L,55926L,55927L,55928L,55929L,55930L,55931L,55932L,55933L,55934L,
+55935L,55936L,55937L,55938L,55939L,55940L,55941L,55942L,55943L,55944L,
+55945L,55946L,55947L,55948L,55949L,55950L,55951L,55952L,55953L,55954L,
+55955L,55956L,55957L,55958L,55959L,55960L,55961L,55962L,55963L,55964L,
+55965L,55966L,55967L,55968L,55969L,55970L,55971L,55972L,55973L,55974L,
+55975L,55976L,55977L,55978L,55979L,55980L,55981L,55982L,55983L,55984L,
+55985L,55986L,55987L,55988L,55989L,55990L,55991L,55992L,55993L,55994L,
+55995L,55996L,55997L,55998L,55999L,56000L,56001L,56002L,56003L,56004L,
+56005L,56006L,56007L,56008L,56009L,56010L,56011L,56012L,56013L,56014L,
+56015L,56016L,56017L,56018L,56019L,56020L,56021L,56022L,56023L,56024L,
+56025L,56026L,56027L,56028L,56029L,56030L,56031L,56032L,56033L,56034L,
+56035L,56036L,56037L,56038L,56039L,56040L,56041L,56042L,56043L,56044L,
+56045L,56046L,56047L,56048L,56049L,56050L,56051L,56052L,56053L,56054L,
+56055L,56056L,56057L,56058L,56059L,56060L,56061L,56062L,56063L,56064L,
+56065L,56066L,56067L,56068L,56069L,56070L,56071L,56072L,56073L,56074L,
+56075L,56076L,56077L,56078L,56079L,56080L,56081L,56082L,56083L,56084L,
+56085L,56086L,56087L,56088L,56089L,56090L,56091L,56092L,56093L,56094L,
+56095L,56096L,56097L,56098L,56099L,56100L,56101L,56102L,56103L,56104L,
+56105L,56106L,56107L,56108L,56109L,56110L,56111L,56112L,56113L,56114L,
+56115L,56116L,56117L,56118L,56119L,56120L,56121L,56122L,56123L,56124L,
+56125L,56126L,56127L,56128L,56129L,56130L,56131L,56132L,56133L,56134L,
+56135L,56136L,56137L,56138L,56139L,56140L,56141L,56142L,56143L,56144L,
+56145L,56146L,56147L,56148L,56149L,56150L,56151L,56152L,56153L,56154L,
+56155L,56156L,56157L,56158L,56159L,56160L,56161L,56162L,56163L,56164L,
+56165L,56166L,56167L,56168L,56169L,56170L,56171L,56172L,56173L,56174L,
+56175L,56176L,56177L,56178L,56179L,56180L,56181L,56182L,56183L,56184L,
+56185L,56186L,56187L,56188L,56189L,56190L,56191L,56192L,56193L,56194L,
+56195L,56196L,56197L,56198L,56199L,56200L,56201L,56202L,56203L,56204L,
+56205L,56206L,56207L,56208L,56209L,56210L,56211L,56212L,56213L,56214L,
+56215L,56216L,56217L,56218L,56219L,56220L,56221L,56222L,56223L,56224L,
+56225L,56226L,56227L,56228L,56229L,56230L,56231L,56232L,56233L,56234L,
+56235L,56236L,56237L,56238L,56239L,56240L,56241L,56242L,56243L,56244L,
+56245L,56246L,56247L,56248L,56249L,56250L,56251L,56252L,56253L,56254L,
+56255L,56256L,56257L,56258L,56259L,56260L,56261L,56262L,56263L,56264L,
+56265L,56266L,56267L,56268L,56269L,56270L,56271L,56272L,56273L,56274L,
+56275L,56276L,56277L,56278L,56279L,56280L,56281L,56282L,56283L,56284L,
+56285L,56286L,56287L,56288L,56289L,56290L,56291L,56292L,56293L,56294L,
+56295L,56296L,56297L,56298L,56299L,56300L,56301L,56302L,56303L,56304L,
+56305L,56306L,56307L,56308L,56309L,56310L,56311L,56312L,56313L,56314L,
+56315L,56316L,56317L,56318L,56319L,56320L,56321L,56322L,56323L,56324L,
+56325L,56326L,56327L,56328L,56329L,56330L,56331L,56332L,56333L,56334L,
+56335L,56336L,56337L,56338L,56339L,56340L,56341L,56342L,56343L,56344L,
+56345L,56346L,56347L,56348L,56349L,56350L,56351L,56352L,56353L,56354L,
+56355L,56356L,56357L,56358L,56359L,56360L,56361L,56362L,56363L,56364L,
+56365L,56366L,56367L,56368L,56369L,56370L,56371L,56372L,56373L,56374L,
+56375L,56376L,56377L,56378L,56379L,56380L,56381L,56382L,56383L,56384L,
+56385L,56386L,56387L,56388L,56389L,56390L,56391L,56392L,56393L,56394L,
+56395L,56396L,56397L,56398L,56399L,56400L,56401L,56402L,56403L,56404L,
+56405L,56406L,56407L,56408L,56409L,56410L,56411L,56412L,56413L,56414L,
+56415L,56416L,56417L,56418L,56419L,56420L,56421L,56422L,56423L,56424L,
+56425L,56426L,56427L,56428L,56429L,56430L,56431L,56432L,56433L,56434L,
+56435L,56436L,56437L,56438L,56439L,56440L,56441L,56442L,56443L,56444L,
+56445L,56446L,56447L,56448L,56449L,56450L,56451L,56452L,56453L,56454L,
+56455L,56456L,56457L,56458L,56459L,56460L,56461L,56462L,56463L,56464L,
+56465L,56466L,56467L,56468L,56469L,56470L,56471L,56472L,56473L,56474L,
+56475L,56476L,56477L,56478L,56479L,56480L,56481L,56482L,56483L,56484L,
+56485L,56486L,56487L,56488L,56489L,56490L,56491L,56492L,56493L,56494L,
+56495L,56496L,56497L,56498L,56499L,56500L,56501L,56502L,56503L,56504L,
+56505L,56506L,56507L,56508L,56509L,56510L,56511L,56512L,56513L,56514L,
+56515L,56516L,56517L,56518L,56519L,56520L,56521L,56522L,56523L,56524L,
+56525L,56526L,56527L,56528L,56529L,56530L,56531L,56532L,56533L,56534L,
+56535L,56536L,56537L,56538L,56539L,56540L,56541L,56542L,56543L,56544L,
+56545L,56546L,56547L,56548L,56549L,56550L,56551L,56552L,56553L,56554L,
+56555L,56556L,56557L,56558L,56559L,56560L,56561L,56562L,56563L,56564L,
+56565L,56566L,56567L,56568L,56569L,56570L,56571L,56572L,56573L,56574L,
+56575L,56576L,56577L,56578L,56579L,56580L,56581L,56582L,56583L,56584L,
+56585L,56586L,56587L,56588L,56589L,56590L,56591L,56592L,56593L,56594L,
+56595L,56596L,56597L,56598L,56599L,56600L,56601L,56602L,56603L,56604L,
+56605L,56606L,56607L,56608L,56609L,56610L,56611L,56612L,56613L,56614L,
+56615L,56616L,56617L,56618L,56619L,56620L,56621L,56622L,56623L,56624L,
+56625L,56626L,56627L,56628L,56629L,56630L,56631L,56632L,56633L,56634L,
+56635L,56636L,56637L,56638L,56639L,56640L,56641L,56642L,56643L,56644L,
+56645L,56646L,56647L,56648L,56649L,56650L,56651L,56652L,56653L,56654L,
+56655L,56656L,56657L,56658L,56659L,56660L,56661L,56662L,56663L,56664L,
+56665L,56666L,56667L,56668L,56669L,56670L,56671L,56672L,56673L,56674L,
+56675L,56676L,56677L,56678L,56679L,56680L,56681L,56682L,56683L,56684L,
+56685L,56686L,56687L,56688L,56689L,56690L,56691L,56692L,56693L,56694L,
+56695L,56696L,56697L,56698L,56699L,56700L,56701L,56702L,56703L,56704L,
+56705L,56706L,56707L,56708L,56709L,56710L,56711L,56712L,56713L,56714L,
+56715L,56716L,56717L,56718L,56719L,56720L,56721L,56722L,56723L,56724L,
+56725L,56726L,56727L,56728L,56729L,56730L,56731L,56732L,56733L,56734L,
+56735L,56736L,56737L,56738L,56739L,56740L,56741L,56742L,56743L,56744L,
+56745L,56746L,56747L,56748L,56749L,56750L,56751L,56752L,56753L,56754L,
+56755L,56756L,56757L,56758L,56759L,56760L,56761L,56762L,56763L,56764L,
+56765L,56766L,56767L,56768L,56769L,56770L,56771L,56772L,56773L,56774L,
+56775L,56776L,56777L,56778L,56779L,56780L,56781L,56782L,56783L,56784L,
+56785L,56786L,56787L,56788L,56789L,56790L,56791L,56792L,56793L,56794L,
+56795L,56796L,56797L,56798L,56799L,56800L,56801L,56802L,56803L,56804L,
+56805L,56806L,56807L,56808L,56809L,56810L,56811L,56812L,56813L,56814L,
+56815L,56816L,56817L,56818L,56819L,56820L,56821L,56822L,56823L,56824L,
+56825L,56826L,56827L,56828L,56829L,56830L,56831L,56832L,56833L,56834L,
+56835L,56836L,56837L,56838L,56839L,56840L,56841L,56842L,56843L,56844L,
+56845L,56846L,56847L,56848L,56849L,56850L,56851L,56852L,56853L,56854L,
+56855L,56856L,56857L,56858L,56859L,56860L,56861L,56862L,56863L,56864L,
+56865L,56866L,56867L,56868L,56869L,56870L,56871L,56872L,56873L,56874L,
+56875L,56876L,56877L,56878L,56879L,56880L,56881L,56882L,56883L,56884L,
+56885L,56886L,56887L,56888L,56889L,56890L,56891L,56892L,56893L,56894L,
+56895L,56896L,56897L,56898L,56899L,56900L,56901L,56902L,56903L,56904L,
+56905L,56906L,56907L,56908L,56909L,56910L,56911L,56912L,56913L,56914L,
+56915L,56916L,56917L,56918L,56919L,56920L,56921L,56922L,56923L,56924L,
+56925L,56926L,56927L,56928L,56929L,56930L,56931L,56932L,56933L,56934L,
+56935L,56936L,56937L,56938L,56939L,56940L,56941L,56942L,56943L,56944L,
+56945L,56946L,56947L,56948L,56949L,56950L,56951L,56952L,56953L,56954L,
+56955L,56956L,56957L,56958L,56959L,56960L,56961L,56962L,56963L,56964L,
+56965L,56966L,56967L,56968L,56969L,56970L,56971L,56972L,56973L,56974L,
+56975L,56976L,56977L,56978L,56979L,56980L,56981L,56982L,56983L,56984L,
+56985L,56986L,56987L,56988L,56989L,56990L,56991L,56992L,56993L,56994L,
+56995L,56996L,56997L,56998L,56999L,57000L,57001L,57002L,57003L,57004L,
+57005L,57006L,57007L,57008L,57009L,57010L,57011L,57012L,57013L,57014L,
+57015L,57016L,57017L,57018L,57019L,57020L,57021L,57022L,57023L,57024L,
+57025L,57026L,57027L,57028L,57029L,57030L,57031L,57032L,57033L,57034L,
+57035L,57036L,57037L,57038L,57039L,57040L,57041L,57042L,57043L,57044L,
+57045L,57046L,57047L,57048L,57049L,57050L,57051L,57052L,57053L,57054L,
+57055L,57056L,57057L,57058L,57059L,57060L,57061L,57062L,57063L,57064L,
+57065L,57066L,57067L,57068L,57069L,57070L,57071L,57072L,57073L,57074L,
+57075L,57076L,57077L,57078L,57079L,57080L,57081L,57082L,57083L,57084L,
+57085L,57086L,57087L,57088L,57089L,57090L,57091L,57092L,57093L,57094L,
+57095L,57096L,57097L,57098L,57099L,57100L,57101L,57102L,57103L,57104L,
+57105L,57106L,57107L,57108L,57109L,57110L,57111L,57112L,57113L,57114L,
+57115L,57116L,57117L,57118L,57119L,57120L,57121L,57122L,57123L,57124L,
+57125L,57126L,57127L,57128L,57129L,57130L,57131L,57132L,57133L,57134L,
+57135L,57136L,57137L,57138L,57139L,57140L,57141L,57142L,57143L,57144L,
+57145L,57146L,57147L,57148L,57149L,57150L,57151L,57152L,57153L,57154L,
+57155L,57156L,57157L,57158L,57159L,57160L,57161L,57162L,57163L,57164L,
+57165L,57166L,57167L,57168L,57169L,57170L,57171L,57172L,57173L,57174L,
+57175L,57176L,57177L,57178L,57179L,57180L,57181L,57182L,57183L,57184L,
+57185L,57186L,57187L,57188L,57189L,57190L,57191L,57192L,57193L,57194L,
+57195L,57196L,57197L,57198L,57199L,57200L,57201L,57202L,57203L,57204L,
+57205L,57206L,57207L,57208L,57209L,57210L,57211L,57212L,57213L,57214L,
+57215L,57216L,57217L,57218L,57219L,57220L,57221L,57222L,57223L,57224L,
+57225L,57226L,57227L,57228L,57229L,57230L,57231L,57232L,57233L,57234L,
+57235L,57236L,57237L,57238L,57239L,57240L,57241L,57242L,57243L,57244L,
+57245L,57246L,57247L,57248L,57249L,57250L,57251L,57252L,57253L,57254L,
+57255L,57256L,57257L,57258L,57259L,57260L,57261L,57262L,57263L,57264L,
+57265L,57266L,57267L,57268L,57269L,57270L,57271L,57272L,57273L,57274L,
+57275L,57276L,57277L,57278L,57279L,57280L,57281L,57282L,57283L,57284L,
+57285L,57286L,57287L,57288L,57289L,57290L,57291L,57292L,57293L,57294L,
+57295L,57296L,57297L,57298L,57299L,57300L,57301L,57302L,57303L,57304L,
+57305L,57306L,57307L,57308L,57309L,57310L,57311L,57312L,57313L,57314L,
+57315L,57316L,57317L,57318L,57319L,57320L,57321L,57322L,57323L,57324L,
+57325L,57326L,57327L,57328L,57329L,57330L,57331L,57332L,57333L,57334L,
+57335L,57336L,57337L,57338L,57339L,57340L,57341L,57342L,57343L,57344L,
+57345L,57346L,57347L,57348L,57349L,57350L,57351L,57352L,57353L,57354L,
+57355L,57356L,57357L,57358L,57359L,57360L,57361L,57362L,57363L,57364L,
+57365L,57366L,57367L,57368L,57369L,57370L,57371L,57372L,57373L,57374L,
+57375L,57376L,57377L,57378L,57379L,57380L,57381L,57382L,57383L,57384L,
+57385L,57386L,57387L,57388L,57389L,57390L,57391L,57392L,57393L,57394L,
+57395L,57396L,57397L,57398L,57399L,57400L,57401L,57402L,57403L,57404L,
+57405L,57406L,57407L,57408L,57409L,57410L,57411L,57412L,57413L,57414L,
+57415L,57416L,57417L,57418L,57419L,57420L,57421L,57422L,57423L,57424L,
+57425L,57426L,57427L,57428L,57429L,57430L,57431L,57432L,57433L,57434L,
+57435L,57436L,57437L,57438L,57439L,57440L,57441L,57442L,57443L,57444L,
+57445L,57446L,57447L,57448L,57449L,57450L,57451L,57452L,57453L,57454L,
+57455L,57456L,57457L,57458L,57459L,57460L,57461L,57462L,57463L,57464L,
+57465L,57466L,57467L,57468L,57469L,57470L,57471L,57472L,57473L,57474L,
+57475L,57476L,57477L,57478L,57479L,57480L,57481L,57482L,57483L,57484L,
+57485L,57486L,57487L,57488L,57489L,57490L,57491L,57492L,57493L,57494L,
+57495L,57496L,57497L,57498L,57499L,57500L,57501L,57502L,57503L,57504L,
+57505L,57506L,57507L,57508L,57509L,57510L,57511L,57512L,57513L,57514L,
+57515L,57516L,57517L,57518L,57519L,57520L,57521L,57522L,57523L,57524L,
+57525L,57526L,57527L,57528L,57529L,57530L,57531L,57532L,57533L,57534L,
+57535L,57536L,57537L,57538L,57539L,57540L,57541L,57542L,57543L,57544L,
+57545L,57546L,57547L,57548L,57549L,57550L,57551L,57552L,57553L,57554L,
+57555L,57556L,57557L,57558L,57559L,57560L,57561L,57562L,57563L,57564L,
+57565L,57566L,57567L,57568L,57569L,57570L,57571L,57572L,57573L,57574L,
+57575L,57576L,57577L,57578L,57579L,57580L,57581L,57582L,57583L,57584L,
+57585L,57586L,57587L,57588L,57589L,57590L,57591L,57592L,57593L,57594L,
+57595L,57596L,57597L,57598L,57599L,57600L,57601L,57602L,57603L,57604L,
+57605L,57606L,57607L,57608L,57609L,57610L,57611L,57612L,57613L,57614L,
+57615L,57616L,57617L,57618L,57619L,57620L,57621L,57622L,57623L,57624L,
+57625L,57626L,57627L,57628L,57629L,57630L,57631L,57632L,57633L,57634L,
+57635L,57636L,57637L,57638L,57639L,57640L,57641L,57642L,57643L,57644L,
+57645L,57646L,57647L,57648L,57649L,57650L,57651L,57652L,57653L,57654L,
+57655L,57656L,57657L,57658L,57659L,57660L,57661L,57662L,57663L,57664L,
+57665L,57666L,57667L,57668L,57669L,57670L,57671L,57672L,57673L,57674L,
+57675L,57676L,57677L,57678L,57679L,57680L,57681L,57682L,57683L,57684L,
+57685L,57686L,57687L,57688L,57689L,57690L,57691L,57692L,57693L,57694L,
+57695L,57696L,57697L,57698L,57699L,57700L,57701L,57702L,57703L,57704L,
+57705L,57706L,57707L,57708L,57709L,57710L,57711L,57712L,57713L,57714L,
+57715L,57716L,57717L,57718L,57719L,57720L,57721L,57722L,57723L,57724L,
+57725L,57726L,57727L,57728L,57729L,57730L,57731L,57732L,57733L,57734L,
+57735L,57736L,57737L,57738L,57739L,57740L,57741L,57742L,57743L,57744L,
+57745L,57746L,57747L,57748L,57749L,57750L,57751L,57752L,57753L,57754L,
+57755L,57756L,57757L,57758L,57759L,57760L,57761L,57762L,57763L,57764L,
+57765L,57766L,57767L,57768L,57769L,57770L,57771L,57772L,57773L,57774L,
+57775L,57776L,57777L,57778L,57779L,57780L,57781L,57782L,57783L,57784L,
+57785L,57786L,57787L,57788L,57789L,57790L,57791L,57792L,57793L,57794L,
+57795L,57796L,57797L,57798L,57799L,57800L,57801L,57802L,57803L,57804L,
+57805L,57806L,57807L,57808L,57809L,57810L,57811L,57812L,57813L,57814L,
+57815L,57816L,57817L,57818L,57819L,57820L,57821L,57822L,57823L,57824L,
+57825L,57826L,57827L,57828L,57829L,57830L,57831L,57832L,57833L,57834L,
+57835L,57836L,57837L,57838L,57839L,57840L,57841L,57842L,57843L,57844L,
+57845L,57846L,57847L,57848L,57849L,57850L,57851L,57852L,57853L,57854L,
+57855L,57856L,57857L,57858L,57859L,57860L,57861L,57862L,57863L,57864L,
+57865L,57866L,57867L,57868L,57869L,57870L,57871L,57872L,57873L,57874L,
+57875L,57876L,57877L,57878L,57879L,57880L,57881L,57882L,57883L,57884L,
+57885L,57886L,57887L,57888L,57889L,57890L,57891L,57892L,57893L,57894L,
+57895L,57896L,57897L,57898L,57899L,57900L,57901L,57902L,57903L,57904L,
+57905L,57906L,57907L,57908L,57909L,57910L,57911L,57912L,57913L,57914L,
+57915L,57916L,57917L,57918L,57919L,57920L,57921L,57922L,57923L,57924L,
+57925L,57926L,57927L,57928L,57929L,57930L,57931L,57932L,57933L,57934L,
+57935L,57936L,57937L,57938L,57939L,57940L,57941L,57942L,57943L,57944L,
+57945L,57946L,57947L,57948L,57949L,57950L,57951L,57952L,57953L,57954L,
+57955L,57956L,57957L,57958L,57959L,57960L,57961L,57962L,57963L,57964L,
+57965L,57966L,57967L,57968L,57969L,57970L,57971L,57972L,57973L,57974L,
+57975L,57976L,57977L,57978L,57979L,57980L,57981L,57982L,57983L,57984L,
+57985L,57986L,57987L,57988L,57989L,57990L,57991L,57992L,57993L,57994L,
+57995L,57996L,57997L,57998L,57999L,58000L,58001L,58002L,58003L,58004L,
+58005L,58006L,58007L,58008L,58009L,58010L,58011L,58012L,58013L,58014L,
+58015L,58016L,58017L,58018L,58019L,58020L,58021L,58022L,58023L,58024L,
+58025L,58026L,58027L,58028L,58029L,58030L,58031L,58032L,58033L,58034L,
+58035L,58036L,58037L,58038L,58039L,58040L,58041L,58042L,58043L,58044L,
+58045L,58046L,58047L,58048L,58049L,58050L,58051L,58052L,58053L,58054L,
+58055L,58056L,58057L,58058L,58059L,58060L,58061L,58062L,58063L,58064L,
+58065L,58066L,58067L,58068L,58069L,58070L,58071L,58072L,58073L,58074L,
+58075L,58076L,58077L,58078L,58079L,58080L,58081L,58082L,58083L,58084L,
+58085L,58086L,58087L,58088L,58089L,58090L,58091L,58092L,58093L,58094L,
+58095L,58096L,58097L,58098L,58099L,58100L,58101L,58102L,58103L,58104L,
+58105L,58106L,58107L,58108L,58109L,58110L,58111L,58112L,58113L,58114L,
+58115L,58116L,58117L,58118L,58119L,58120L,58121L,58122L,58123L,58124L,
+58125L,58126L,58127L,58128L,58129L,58130L,58131L,58132L,58133L,58134L,
+58135L,58136L,58137L,58138L,58139L,58140L,58141L,58142L,58143L,58144L,
+58145L,58146L,58147L,58148L,58149L,58150L,58151L,58152L,58153L,58154L,
+58155L,58156L,58157L,58158L,58159L,58160L,58161L,58162L,58163L,58164L,
+58165L,58166L,58167L,58168L,58169L,58170L,58171L,58172L,58173L,58174L,
+58175L,58176L,58177L,58178L,58179L,58180L,58181L,58182L,58183L,58184L,
+58185L,58186L,58187L,58188L,58189L,58190L,58191L,58192L,58193L,58194L,
+58195L,58196L,58197L,58198L,58199L,58200L,58201L,58202L,58203L,58204L,
+58205L,58206L,58207L,58208L,58209L,58210L,58211L,58212L,58213L,58214L,
+58215L,58216L,58217L,58218L,58219L,58220L,58221L,58222L,58223L,58224L,
+58225L,58226L,58227L,58228L,58229L,58230L,58231L,58232L,58233L,58234L,
+58235L,58236L,58237L,58238L,58239L,58240L,58241L,58242L,58243L,58244L,
+58245L,58246L,58247L,58248L,58249L,58250L,58251L,58252L,58253L,58254L,
+58255L,58256L,58257L,58258L,58259L,58260L,58261L,58262L,58263L,58264L,
+58265L,58266L,58267L,58268L,58269L,58270L,58271L,58272L,58273L,58274L,
+58275L,58276L,58277L,58278L,58279L,58280L,58281L,58282L,58283L,58284L,
+58285L,58286L,58287L,58288L,58289L,58290L,58291L,58292L,58293L,58294L,
+58295L,58296L,58297L,58298L,58299L,58300L,58301L,58302L,58303L,58304L,
+58305L,58306L,58307L,58308L,58309L,58310L,58311L,58312L,58313L,58314L,
+58315L,58316L,58317L,58318L,58319L,58320L,58321L,58322L,58323L,58324L,
+58325L,58326L,58327L,58328L,58329L,58330L,58331L,58332L,58333L,58334L,
+58335L,58336L,58337L,58338L,58339L,58340L,58341L,58342L,58343L,58344L,
+58345L,58346L,58347L,58348L,58349L,58350L,58351L,58352L,58353L,58354L,
+58355L,58356L,58357L,58358L,58359L,58360L,58361L,58362L,58363L,58364L,
+58365L,58366L,58367L,58368L,58369L,58370L,58371L,58372L,58373L,58374L,
+58375L,58376L,58377L,58378L,58379L,58380L,58381L,58382L,58383L,58384L,
+58385L,58386L,58387L,58388L,58389L,58390L,58391L,58392L,58393L,58394L,
+58395L,58396L,58397L,58398L,58399L,58400L,58401L,58402L,58403L,58404L,
+58405L,58406L,58407L,58408L,58409L,58410L,58411L,58412L,58413L,58414L,
+58415L,58416L,58417L,58418L,58419L,58420L,58421L,58422L,58423L,58424L,
+58425L,58426L,58427L,58428L,58429L,58430L,58431L,58432L,58433L,58434L,
+58435L,58436L,58437L,58438L,58439L,58440L,58441L,58442L,58443L,58444L,
+58445L,58446L,58447L,58448L,58449L,58450L,58451L,58452L,58453L,58454L,
+58455L,58456L,58457L,58458L,58459L,58460L,58461L,58462L,58463L,58464L,
+58465L,58466L,58467L,58468L,58469L,58470L,58471L,58472L,58473L,58474L,
+58475L,58476L,58477L,58478L,58479L,58480L,58481L,58482L,58483L,58484L,
+58485L,58486L,58487L,58488L,58489L,58490L,58491L,58492L,58493L,58494L,
+58495L,58496L,58497L,58498L,58499L,58500L,58501L,58502L,58503L,58504L,
+58505L,58506L,58507L,58508L,58509L,58510L,58511L,58512L,58513L,58514L,
+58515L,58516L,58517L,58518L,58519L,58520L,58521L,58522L,58523L,58524L,
+58525L,58526L,58527L,58528L,58529L,58530L,58531L,58532L,58533L,58534L,
+58535L,58536L,58537L,58538L,58539L,58540L,58541L,58542L,58543L,58544L,
+58545L,58546L,58547L,58548L,58549L,58550L,58551L,58552L,58553L,58554L,
+58555L,58556L,58557L,58558L,58559L,58560L,58561L,58562L,58563L,58564L,
+58565L,58566L,58567L,58568L,58569L,58570L,58571L,58572L,58573L,58574L,
+58575L,58576L,58577L,58578L,58579L,58580L,58581L,58582L,58583L,58584L,
+58585L,58586L,58587L,58588L,58589L,58590L,58591L,58592L,58593L,58594L,
+58595L,58596L,58597L,58598L,58599L,58600L,58601L,58602L,58603L,58604L,
+58605L,58606L,58607L,58608L,58609L,58610L,58611L,58612L,58613L,58614L,
+58615L,58616L,58617L,58618L,58619L,58620L,58621L,58622L,58623L,58624L,
+58625L,58626L,58627L,58628L,58629L,58630L,58631L,58632L,58633L,58634L,
+58635L,58636L,58637L,58638L,58639L,58640L,58641L,58642L,58643L,58644L,
+58645L,58646L,58647L,58648L,58649L,58650L,58651L,58652L,58653L,58654L,
+58655L,58656L,58657L,58658L,58659L,58660L,58661L,58662L,58663L,58664L,
+58665L,58666L,58667L,58668L,58669L,58670L,58671L,58672L,58673L,58674L,
+58675L,58676L,58677L,58678L,58679L,58680L,58681L,58682L,58683L,58684L,
+58685L,58686L,58687L,58688L,58689L,58690L,58691L,58692L,58693L,58694L,
+58695L,58696L,58697L,58698L,58699L,58700L,58701L,58702L,58703L,58704L,
+58705L,58706L,58707L,58708L,58709L,58710L,58711L,58712L,58713L,58714L,
+58715L,58716L,58717L,58718L,58719L,58720L,58721L,58722L,58723L,58724L,
+58725L,58726L,58727L,58728L,58729L,58730L,58731L,58732L,58733L,58734L,
+58735L,58736L,58737L,58738L,58739L,58740L,58741L,58742L,58743L,58744L,
+58745L,58746L,58747L,58748L,58749L,58750L,58751L,58752L,58753L,58754L,
+58755L,58756L,58757L,58758L,58759L,58760L,58761L,58762L,58763L,58764L,
+58765L,58766L,58767L,58768L,58769L,58770L,58771L,58772L,58773L,58774L,
+58775L,58776L,58777L,58778L,58779L,58780L,58781L,58782L,58783L,58784L,
+58785L,58786L,58787L,58788L,58789L,58790L,58791L,58792L,58793L,58794L,
+58795L,58796L,58797L,58798L,58799L,58800L,58801L,58802L,58803L,58804L,
+58805L,58806L,58807L,58808L,58809L,58810L,58811L,58812L,58813L,58814L,
+58815L,58816L,58817L,58818L,58819L,58820L,58821L,58822L,58823L,58824L,
+58825L,58826L,58827L,58828L,58829L,58830L,58831L,58832L,58833L,58834L,
+58835L,58836L,58837L,58838L,58839L,58840L,58841L,58842L,58843L,58844L,
+58845L,58846L,58847L,58848L,58849L,58850L,58851L,58852L,58853L,58854L,
+58855L,58856L,58857L,58858L,58859L,58860L,58861L,58862L,58863L,58864L,
+58865L,58866L,58867L,58868L,58869L,58870L,58871L,58872L,58873L,58874L,
+58875L,58876L,58877L,58878L,58879L,58880L,58881L,58882L,58883L,58884L,
+58885L,58886L,58887L,58888L,58889L,58890L,58891L,58892L,58893L,58894L,
+58895L,58896L,58897L,58898L,58899L,58900L,58901L,58902L,58903L,58904L,
+58905L,58906L,58907L,58908L,58909L,58910L,58911L,58912L,58913L,58914L,
+58915L,58916L,58917L,58918L,58919L,58920L,58921L,58922L,58923L,58924L,
+58925L,58926L,58927L,58928L,58929L,58930L,58931L,58932L,58933L,58934L,
+58935L,58936L,58937L,58938L,58939L,58940L,58941L,58942L,58943L,58944L,
+58945L,58946L,58947L,58948L,58949L,58950L,58951L,58952L,58953L,58954L,
+58955L,58956L,58957L,58958L,58959L,58960L,58961L,58962L,58963L,58964L,
+58965L,58966L,58967L,58968L,58969L,58970L,58971L,58972L,58973L,58974L,
+58975L,58976L,58977L,58978L,58979L,58980L,58981L,58982L,58983L,58984L,
+58985L,58986L,58987L,58988L,58989L,58990L,58991L,58992L,58993L,58994L,
+58995L,58996L,58997L,58998L,58999L,59000L,59001L,59002L,59003L,59004L,
+59005L,59006L,59007L,59008L,59009L,59010L,59011L,59012L,59013L,59014L,
+59015L,59016L,59017L,59018L,59019L,59020L,59021L,59022L,59023L,59024L,
+59025L,59026L,59027L,59028L,59029L,59030L,59031L,59032L,59033L,59034L,
+59035L,59036L,59037L,59038L,59039L,59040L,59041L,59042L,59043L,59044L,
+59045L,59046L,59047L,59048L,59049L,59050L,59051L,59052L,59053L,59054L,
+59055L,59056L,59057L,59058L,59059L,59060L,59061L,59062L,59063L,59064L,
+59065L,59066L,59067L,59068L,59069L,59070L,59071L,59072L,59073L,59074L,
+59075L,59076L,59077L,59078L,59079L,59080L,59081L,59082L,59083L,59084L,
+59085L,59086L,59087L,59088L,59089L,59090L,59091L,59092L,59093L,59094L,
+59095L,59096L,59097L,59098L,59099L,59100L,59101L,59102L,59103L,59104L,
+59105L,59106L,59107L,59108L,59109L,59110L,59111L,59112L,59113L,59114L,
+59115L,59116L,59117L,59118L,59119L,59120L,59121L,59122L,59123L,59124L,
+59125L,59126L,59127L,59128L,59129L,59130L,59131L,59132L,59133L,59134L,
+59135L,59136L,59137L,59138L,59139L,59140L,59141L,59142L,59143L,59144L,
+59145L,59146L,59147L,59148L,59149L,59150L,59151L,59152L,59153L,59154L,
+59155L,59156L,59157L,59158L,59159L,59160L,59161L,59162L,59163L,59164L,
+59165L,59166L,59167L,59168L,59169L,59170L,59171L,59172L,59173L,59174L,
+59175L,59176L,59177L,59178L,59179L,59180L,59181L,59182L,59183L,59184L,
+59185L,59186L,59187L,59188L,59189L,59190L,59191L,59192L,59193L,59194L,
+59195L,59196L,59197L,59198L,59199L,59200L,59201L,59202L,59203L,59204L,
+59205L,59206L,59207L,59208L,59209L,59210L,59211L,59212L,59213L,59214L,
+59215L,59216L,59217L,59218L,59219L,59220L,59221L,59222L,59223L,59224L,
+59225L,59226L,59227L,59228L,59229L,59230L,59231L,59232L,59233L,59234L,
+59235L,59236L,59237L,59238L,59239L,59240L,59241L,59242L,59243L,59244L,
+59245L,59246L,59247L,59248L,59249L,59250L,59251L,59252L,59253L,59254L,
+59255L,59256L,59257L,59258L,59259L,59260L,59261L,59262L,59263L,59264L,
+59265L,59266L,59267L,59268L,59269L,59270L,59271L,59272L,59273L,59274L,
+59275L,59276L,59277L,59278L,59279L,59280L,59281L,59282L,59283L,59284L,
+59285L,59286L,59287L,59288L,59289L,59290L,59291L,59292L,59293L,59294L,
+59295L,59296L,59297L,59298L,59299L,59300L,59301L,59302L,59303L,59304L,
+59305L,59306L,59307L,59308L,59309L,59310L,59311L,59312L,59313L,59314L,
+59315L,59316L,59317L,59318L,59319L,59320L,59321L,59322L,59323L,59324L,
+59325L,59326L,59327L,59328L,59329L,59330L,59331L,59332L,59333L,59334L,
+59335L,59336L,59337L,59338L,59339L,59340L,59341L,59342L,59343L,59344L,
+59345L,59346L,59347L,59348L,59349L,59350L,59351L,59352L,59353L,59354L,
+59355L,59356L,59357L,59358L,59359L,59360L,59361L,59362L,59363L,59364L,
+59365L,59366L,59367L,59368L,59369L,59370L,59371L,59372L,59373L,59374L,
+59375L,59376L,59377L,59378L,59379L,59380L,59381L,59382L,59383L,59384L,
+59385L,59386L,59387L,59388L,59389L,59390L,59391L,59392L,59393L,59394L,
+59395L,59396L,59397L,59398L,59399L,59400L,59401L,59402L,59403L,59404L,
+59405L,59406L,59407L,59408L,59409L,59410L,59411L,59412L,59413L,59414L,
+59415L,59416L,59417L,59418L,59419L,59420L,59421L,59422L,59423L,59424L,
+59425L,59426L,59427L,59428L,59429L,59430L,59431L,59432L,59433L,59434L,
+59435L,59436L,59437L,59438L,59439L,59440L,59441L,59442L,59443L,59444L,
+59445L,59446L,59447L,59448L,59449L,59450L,59451L,59452L,59453L,59454L,
+59455L,59456L,59457L,59458L,59459L,59460L,59461L,59462L,59463L,59464L,
+59465L,59466L,59467L,59468L,59469L,59470L,59471L,59472L,59473L,59474L,
+59475L,59476L,59477L,59478L,59479L,59480L,59481L,59482L,59483L,59484L,
+59485L,59486L,59487L,59488L,59489L,59490L,59491L,59492L,59493L,59494L,
+59495L,59496L,59497L,59498L,59499L,59500L,59501L,59502L,59503L,59504L,
+59505L,59506L,59507L,59508L,59509L,59510L,59511L,59512L,59513L,59514L,
+59515L,59516L,59517L,59518L,59519L,59520L,59521L,59522L,59523L,59524L,
+59525L,59526L,59527L,59528L,59529L,59530L,59531L,59532L,59533L,59534L,
+59535L,59536L,59537L,59538L,59539L,59540L,59541L,59542L,59543L,59544L,
+59545L,59546L,59547L,59548L,59549L,59550L,59551L,59552L,59553L,59554L,
+59555L,59556L,59557L,59558L,59559L,59560L,59561L,59562L,59563L,59564L,
+59565L,59566L,59567L,59568L,59569L,59570L,59571L,59572L,59573L,59574L,
+59575L,59576L,59577L,59578L,59579L,59580L,59581L,59582L,59583L,59584L,
+59585L,59586L,59587L,59588L,59589L,59590L,59591L,59592L,59593L,59594L,
+59595L,59596L,59597L,59598L,59599L,59600L,59601L,59602L,59603L,59604L,
+59605L,59606L,59607L,59608L,59609L,59610L,59611L,59612L,59613L,59614L,
+59615L,59616L,59617L,59618L,59619L,59620L,59621L,59622L,59623L,59624L,
+59625L,59626L,59627L,59628L,59629L,59630L,59631L,59632L,59633L,59634L,
+59635L,59636L,59637L,59638L,59639L,59640L,59641L,59642L,59643L,59644L,
+59645L,59646L,59647L,59648L,59649L,59650L,59651L,59652L,59653L,59654L,
+59655L,59656L,59657L,59658L,59659L,59660L,59661L,59662L,59663L,59664L,
+59665L,59666L,59667L,59668L,59669L,59670L,59671L,59672L,59673L,59674L,
+59675L,59676L,59677L,59678L,59679L,59680L,59681L,59682L,59683L,59684L,
+59685L,59686L,59687L,59688L,59689L,59690L,59691L,59692L,59693L,59694L,
+59695L,59696L,59697L,59698L,59699L,59700L,59701L,59702L,59703L,59704L,
+59705L,59706L,59707L,59708L,59709L,59710L,59711L,59712L,59713L,59714L,
+59715L,59716L,59717L,59718L,59719L,59720L,59721L,59722L,59723L,59724L,
+59725L,59726L,59727L,59728L,59729L,59730L,59731L,59732L,59733L,59734L,
+59735L,59736L,59737L,59738L,59739L,59740L,59741L,59742L,59743L,59744L,
+59745L,59746L,59747L,59748L,59749L,59750L,59751L,59752L,59753L,59754L,
+59755L,59756L,59757L,59758L,59759L,59760L,59761L,59762L,59763L,59764L,
+59765L,59766L,59767L,59768L,59769L,59770L,59771L,59772L,59773L,59774L,
+59775L,59776L,59777L,59778L,59779L,59780L,59781L,59782L,59783L,59784L,
+59785L,59786L,59787L,59788L,59789L,59790L,59791L,59792L,59793L,59794L,
+59795L,59796L,59797L,59798L,59799L,59800L,59801L,59802L,59803L,59804L,
+59805L,59806L,59807L,59808L,59809L,59810L,59811L,59812L,59813L,59814L,
+59815L,59816L,59817L,59818L,59819L,59820L,59821L,59822L,59823L,59824L,
+59825L,59826L,59827L,59828L,59829L,59830L,59831L,59832L,59833L,59834L,
+59835L,59836L,59837L,59838L,59839L,59840L,59841L,59842L,59843L,59844L,
+59845L,59846L,59847L,59848L,59849L,59850L,59851L,59852L,59853L,59854L,
+59855L,59856L,59857L,59858L,59859L,59860L,59861L,59862L,59863L,59864L,
+59865L,59866L,59867L,59868L,59869L,59870L,59871L,59872L,59873L,59874L,
+59875L,59876L,59877L,59878L,59879L,59880L,59881L,59882L,59883L,59884L,
+59885L,59886L,59887L,59888L,59889L,59890L,59891L,59892L,59893L,59894L,
+59895L,59896L,59897L,59898L,59899L,59900L,59901L,59902L,59903L,59904L,
+59905L,59906L,59907L,59908L,59909L,59910L,59911L,59912L,59913L,59914L,
+59915L,59916L,59917L,59918L,59919L,59920L,59921L,59922L,59923L,59924L,
+59925L,59926L,59927L,59928L,59929L,59930L,59931L,59932L,59933L,59934L,
+59935L,59936L,59937L,59938L,59939L,59940L,59941L,59942L,59943L,59944L,
+59945L,59946L,59947L,59948L,59949L,59950L,59951L,59952L,59953L,59954L,
+59955L,59956L,59957L,59958L,59959L,59960L,59961L,59962L,59963L,59964L,
+59965L,59966L,59967L,59968L,59969L,59970L,59971L,59972L,59973L,59974L,
+59975L,59976L,59977L,59978L,59979L,59980L,59981L,59982L,59983L,59984L,
+59985L,59986L,59987L,59988L,59989L,59990L,59991L,59992L,59993L,59994L,
+59995L,59996L,59997L,59998L,59999L,60000L,60001L,60002L,60003L,60004L,
+60005L,60006L,60007L,60008L,60009L,60010L,60011L,60012L,60013L,60014L,
+60015L,60016L,60017L,60018L,60019L,60020L,60021L,60022L,60023L,60024L,
+60025L,60026L,60027L,60028L,60029L,60030L,60031L,60032L,60033L,60034L,
+60035L,60036L,60037L,60038L,60039L,60040L,60041L,60042L,60043L,60044L,
+60045L,60046L,60047L,60048L,60049L,60050L,60051L,60052L,60053L,60054L,
+60055L,60056L,60057L,60058L,60059L,60060L,60061L,60062L,60063L,60064L,
+60065L,60066L,60067L,60068L,60069L,60070L,60071L,60072L,60073L,60074L,
+60075L,60076L,60077L,60078L,60079L,60080L,60081L,60082L,60083L,60084L,
+60085L,60086L,60087L,60088L,60089L,60090L,60091L,60092L,60093L,60094L,
+60095L,60096L,60097L,60098L,60099L,60100L,60101L,60102L,60103L,60104L,
+60105L,60106L,60107L,60108L,60109L,60110L,60111L,60112L,60113L,60114L,
+60115L,60116L,60117L,60118L,60119L,60120L,60121L,60122L,60123L,60124L,
+60125L,60126L,60127L,60128L,60129L,60130L,60131L,60132L,60133L,60134L,
+60135L,60136L,60137L,60138L,60139L,60140L,60141L,60142L,60143L,60144L,
+60145L,60146L,60147L,60148L,60149L,60150L,60151L,60152L,60153L,60154L,
+60155L,60156L,60157L,60158L,60159L,60160L,60161L,60162L,60163L,60164L,
+60165L,60166L,60167L,60168L,60169L,60170L,60171L,60172L,60173L,60174L,
+60175L,60176L,60177L,60178L,60179L,60180L,60181L,60182L,60183L,60184L,
+60185L,60186L,60187L,60188L,60189L,60190L,60191L,60192L,60193L,60194L,
+60195L,60196L,60197L,60198L,60199L,60200L,60201L,60202L,60203L,60204L,
+60205L,60206L,60207L,60208L,60209L,60210L,60211L,60212L,60213L,60214L,
+60215L,60216L,60217L,60218L,60219L,60220L,60221L,60222L,60223L,60224L,
+60225L,60226L,60227L,60228L,60229L,60230L,60231L,60232L,60233L,60234L,
+60235L,60236L,60237L,60238L,60239L,60240L,60241L,60242L,60243L,60244L,
+60245L,60246L,60247L,60248L,60249L,60250L,60251L,60252L,60253L,60254L,
+60255L,60256L,60257L,60258L,60259L,60260L,60261L,60262L,60263L,60264L,
+60265L,60266L,60267L,60268L,60269L,60270L,60271L,60272L,60273L,60274L,
+60275L,60276L,60277L,60278L,60279L,60280L,60281L,60282L,60283L,60284L,
+60285L,60286L,60287L,60288L,60289L,60290L,60291L,60292L,60293L,60294L,
+60295L,60296L,60297L,60298L,60299L,60300L,60301L,60302L,60303L,60304L,
+60305L,60306L,60307L,60308L,60309L,60310L,60311L,60312L,60313L,60314L,
+60315L,60316L,60317L,60318L,60319L,60320L,60321L,60322L,60323L,60324L,
+60325L,60326L,60327L,60328L,60329L,60330L,60331L,60332L,60333L,60334L,
+60335L,60336L,60337L,60338L,60339L,60340L,60341L,60342L,60343L,60344L,
+60345L,60346L,60347L,60348L,60349L,60350L,60351L,60352L,60353L,60354L,
+60355L,60356L,60357L,60358L,60359L,60360L,60361L,60362L,60363L,60364L,
+60365L,60366L,60367L,60368L,60369L,60370L,60371L,60372L,60373L,60374L,
+60375L,60376L,60377L,60378L,60379L,60380L,60381L,60382L,60383L,60384L,
+60385L,60386L,60387L,60388L,60389L,60390L,60391L,60392L,60393L,60394L,
+60395L,60396L,60397L,60398L,60399L,60400L,60401L,60402L,60403L,60404L,
+60405L,60406L,60407L,60408L,60409L,60410L,60411L,60412L,60413L,60414L,
+60415L,60416L,60417L,60418L,60419L,60420L,60421L,60422L,60423L,60424L,
+60425L,60426L,60427L,60428L,60429L,60430L,60431L,60432L,60433L,60434L,
+60435L,60436L,60437L,60438L,60439L,60440L,60441L,60442L,60443L,60444L,
+60445L,60446L,60447L,60448L,60449L,60450L,60451L,60452L,60453L,60454L,
+60455L,60456L,60457L,60458L,60459L,60460L,60461L,60462L,60463L,60464L,
+60465L,60466L,60467L,60468L,60469L,60470L,60471L,60472L,60473L,60474L,
+60475L,60476L,60477L,60478L,60479L,60480L,60481L,60482L,60483L,60484L,
+60485L,60486L,60487L,60488L,60489L,60490L,60491L,60492L,60493L,60494L,
+60495L,60496L,60497L,60498L,60499L,60500L,60501L,60502L,60503L,60504L,
+60505L,60506L,60507L,60508L,60509L,60510L,60511L,60512L,60513L,60514L,
+60515L,60516L,60517L,60518L,60519L,60520L,60521L,60522L,60523L,60524L,
+60525L,60526L,60527L,60528L,60529L,60530L,60531L,60532L,60533L,60534L,
+60535L,60536L,60537L,60538L,60539L,60540L,60541L,60542L,60543L,60544L,
+60545L,60546L,60547L,60548L,60549L,60550L,60551L,60552L,60553L,60554L,
+60555L,60556L,60557L,60558L,60559L,60560L,60561L,60562L,60563L,60564L,
+60565L,60566L,60567L,60568L,60569L,60570L,60571L,60572L,60573L,60574L,
+60575L,60576L,60577L,60578L,60579L,60580L,60581L,60582L,60583L,60584L,
+60585L,60586L,60587L,60588L,60589L,60590L,60591L,60592L,60593L,60594L,
+60595L,60596L,60597L,60598L,60599L,60600L,60601L,60602L,60603L,60604L,
+60605L,60606L,60607L,60608L,60609L,60610L,60611L,60612L,60613L,60614L,
+60615L,60616L,60617L,60618L,60619L,60620L,60621L,60622L,60623L,60624L,
+60625L,60626L,60627L,60628L,60629L,60630L,60631L,60632L,60633L,60634L,
+60635L,60636L,60637L,60638L,60639L,60640L,60641L,60642L,60643L,60644L,
+60645L,60646L,60647L,60648L,60649L,60650L,60651L,60652L,60653L,60654L,
+60655L,60656L,60657L,60658L,60659L,60660L,60661L,60662L,60663L,60664L,
+60665L,60666L,60667L,60668L,60669L,60670L,60671L,60672L,60673L,60674L,
+60675L,60676L,60677L,60678L,60679L,60680L,60681L,60682L,60683L,60684L,
+60685L,60686L,60687L,60688L,60689L,60690L,60691L,60692L,60693L,60694L,
+60695L,60696L,60697L,60698L,60699L,60700L,60701L,60702L,60703L,60704L,
+60705L,60706L,60707L,60708L,60709L,60710L,60711L,60712L,60713L,60714L,
+60715L,60716L,60717L,60718L,60719L,60720L,60721L,60722L,60723L,60724L,
+60725L,60726L,60727L,60728L,60729L,60730L,60731L,60732L,60733L,60734L,
+60735L,60736L,60737L,60738L,60739L,60740L,60741L,60742L,60743L,60744L,
+60745L,60746L,60747L,60748L,60749L,60750L,60751L,60752L,60753L,60754L,
+60755L,60756L,60757L,60758L,60759L,60760L,60761L,60762L,60763L,60764L,
+60765L,60766L,60767L,60768L,60769L,60770L,60771L,60772L,60773L,60774L,
+60775L,60776L,60777L,60778L,60779L,60780L,60781L,60782L,60783L,60784L,
+60785L,60786L,60787L,60788L,60789L,60790L,60791L,60792L,60793L,60794L,
+60795L,60796L,60797L,60798L,60799L,60800L,60801L,60802L,60803L,60804L,
+60805L,60806L,60807L,60808L,60809L,60810L,60811L,60812L,60813L,60814L,
+60815L,60816L,60817L,60818L,60819L,60820L,60821L,60822L,60823L,60824L,
+60825L,60826L,60827L,60828L,60829L,60830L,60831L,60832L,60833L,60834L,
+60835L,60836L,60837L,60838L,60839L,60840L,60841L,60842L,60843L,60844L,
+60845L,60846L,60847L,60848L,60849L,60850L,60851L,60852L,60853L,60854L,
+60855L,60856L,60857L,60858L,60859L,60860L,60861L,60862L,60863L,60864L,
+60865L,60866L,60867L,60868L,60869L,60870L,60871L,60872L,60873L,60874L,
+60875L,60876L,60877L,60878L,60879L,60880L,60881L,60882L,60883L,60884L,
+60885L,60886L,60887L,60888L,60889L,60890L,60891L,60892L,60893L,60894L,
+60895L,60896L,60897L,60898L,60899L,60900L,60901L,60902L,60903L,60904L,
+60905L,60906L,60907L,60908L,60909L,60910L,60911L,60912L,60913L,60914L,
+60915L,60916L,60917L,60918L,60919L,60920L,60921L,60922L,60923L,60924L,
+60925L,60926L,60927L,60928L,60929L,60930L,60931L,60932L,60933L,60934L,
+60935L,60936L,60937L,60938L,60939L,60940L,60941L,60942L,60943L,60944L,
+60945L,60946L,60947L,60948L,60949L,60950L,60951L,60952L,60953L,60954L,
+60955L,60956L,60957L,60958L,60959L,60960L,60961L,60962L,60963L,60964L,
+60965L,60966L,60967L,60968L,60969L,60970L,60971L,60972L,60973L,60974L,
+60975L,60976L,60977L,60978L,60979L,60980L,60981L,60982L,60983L,60984L,
+60985L,60986L,60987L,60988L,60989L,60990L,60991L,60992L,60993L,60994L,
+60995L,60996L,60997L,60998L,60999L,61000L,61001L,61002L,61003L,61004L,
+61005L,61006L,61007L,61008L,61009L,61010L,61011L,61012L,61013L,61014L,
+61015L,61016L,61017L,61018L,61019L,61020L,61021L,61022L,61023L,61024L,
+61025L,61026L,61027L,61028L,61029L,61030L,61031L,61032L,61033L,61034L,
+61035L,61036L,61037L,61038L,61039L,61040L,61041L,61042L,61043L,61044L,
+61045L,61046L,61047L,61048L,61049L,61050L,61051L,61052L,61053L,61054L,
+61055L,61056L,61057L,61058L,61059L,61060L,61061L,61062L,61063L,61064L,
+61065L,61066L,61067L,61068L,61069L,61070L,61071L,61072L,61073L,61074L,
+61075L,61076L,61077L,61078L,61079L,61080L,61081L,61082L,61083L,61084L,
+61085L,61086L,61087L,61088L,61089L,61090L,61091L,61092L,61093L,61094L,
+61095L,61096L,61097L,61098L,61099L,61100L,61101L,61102L,61103L,61104L,
+61105L,61106L,61107L,61108L,61109L,61110L,61111L,61112L,61113L,61114L,
+61115L,61116L,61117L,61118L,61119L,61120L,61121L,61122L,61123L,61124L,
+61125L,61126L,61127L,61128L,61129L,61130L,61131L,61132L,61133L,61134L,
+61135L,61136L,61137L,61138L,61139L,61140L,61141L,61142L,61143L,61144L,
+61145L,61146L,61147L,61148L,61149L,61150L,61151L,61152L,61153L,61154L,
+61155L,61156L,61157L,61158L,61159L,61160L,61161L,61162L,61163L,61164L,
+61165L,61166L,61167L,61168L,61169L,61170L,61171L,61172L,61173L,61174L,
+61175L,61176L,61177L,61178L,61179L,61180L,61181L,61182L,61183L,61184L,
+61185L,61186L,61187L,61188L,61189L,61190L,61191L,61192L,61193L,61194L,
+61195L,61196L,61197L,61198L,61199L,61200L,61201L,61202L,61203L,61204L,
+61205L,61206L,61207L,61208L,61209L,61210L,61211L,61212L,61213L,61214L,
+61215L,61216L,61217L,61218L,61219L,61220L,61221L,61222L,61223L,61224L,
+61225L,61226L,61227L,61228L,61229L,61230L,61231L,61232L,61233L,61234L,
+61235L,61236L,61237L,61238L,61239L,61240L,61241L,61242L,61243L,61244L,
+61245L,61246L,61247L,61248L,61249L,61250L,61251L,61252L,61253L,61254L,
+61255L,61256L,61257L,61258L,61259L,61260L,61261L,61262L,61263L,61264L,
+61265L,61266L,61267L,61268L,61269L,61270L,61271L,61272L,61273L,61274L,
+61275L,61276L,61277L,61278L,61279L,61280L,61281L,61282L,61283L,61284L,
+61285L,61286L,61287L,61288L,61289L,61290L,61291L,61292L,61293L,61294L,
+61295L,61296L,61297L,61298L,61299L,61300L,61301L,61302L,61303L,61304L,
+61305L,61306L,61307L,61308L,61309L,61310L,61311L,61312L,61313L,61314L,
+61315L,61316L,61317L,61318L,61319L,61320L,61321L,61322L,61323L,61324L,
+61325L,61326L,61327L,61328L,61329L,61330L,61331L,61332L,61333L,61334L,
+61335L,61336L,61337L,61338L,61339L,61340L,61341L,61342L,61343L,61344L,
+61345L,61346L,61347L,61348L,61349L,61350L,61351L,61352L,61353L,61354L,
+61355L,61356L,61357L,61358L,61359L,61360L,61361L,61362L,61363L,61364L,
+61365L,61366L,61367L,61368L,61369L,61370L,61371L,61372L,61373L,61374L,
+61375L,61376L,61377L,61378L,61379L,61380L,61381L,61382L,61383L,61384L,
+61385L,61386L,61387L,61388L,61389L,61390L,61391L,61392L,61393L,61394L,
+61395L,61396L,61397L,61398L,61399L,61400L,61401L,61402L,61403L,61404L,
+61405L,61406L,61407L,61408L,61409L,61410L,61411L,61412L,61413L,61414L,
+61415L,61416L,61417L,61418L,61419L,61420L,61421L,61422L,61423L,61424L,
+61425L,61426L,61427L,61428L,61429L,61430L,61431L,61432L,61433L,61434L,
+61435L,61436L,61437L,61438L,61439L,61440L,61441L,61442L,61443L,61444L,
+61445L,61446L,61447L,61448L,61449L,61450L,61451L,61452L,61453L,61454L,
+61455L,61456L,61457L,61458L,61459L,61460L,61461L,61462L,61463L,61464L,
+61465L,61466L,61467L,61468L,61469L,61470L,61471L,61472L,61473L,61474L,
+61475L,61476L,61477L,61478L,61479L,61480L,61481L,61482L,61483L,61484L,
+61485L,61486L,61487L,61488L,61489L,61490L,61491L,61492L,61493L,61494L,
+61495L,61496L,61497L,61498L,61499L,61500L,61501L,61502L,61503L,61504L,
+61505L,61506L,61507L,61508L,61509L,61510L,61511L,61512L,61513L,61514L,
+61515L,61516L,61517L,61518L,61519L,61520L,61521L,61522L,61523L,61524L,
+61525L,61526L,61527L,61528L,61529L,61530L,61531L,61532L,61533L,61534L,
+61535L,61536L,61537L,61538L,61539L,61540L,61541L,61542L,61543L,61544L,
+61545L,61546L,61547L,61548L,61549L,61550L,61551L,61552L,61553L,61554L,
+61555L,61556L,61557L,61558L,61559L,61560L,61561L,61562L,61563L,61564L,
+61565L,61566L,61567L,61568L,61569L,61570L,61571L,61572L,61573L,61574L,
+61575L,61576L,61577L,61578L,61579L,61580L,61581L,61582L,61583L,61584L,
+61585L,61586L,61587L,61588L,61589L,61590L,61591L,61592L,61593L,61594L,
+61595L,61596L,61597L,61598L,61599L,61600L,61601L,61602L,61603L,61604L,
+61605L,61606L,61607L,61608L,61609L,61610L,61611L,61612L,61613L,61614L,
+61615L,61616L,61617L,61618L,61619L,61620L,61621L,61622L,61623L,61624L,
+61625L,61626L,61627L,61628L,61629L,61630L,61631L,61632L,61633L,61634L,
+61635L,61636L,61637L,61638L,61639L,61640L,61641L,61642L,61643L,61644L,
+61645L,61646L,61647L,61648L,61649L,61650L,61651L,61652L,61653L,61654L,
+61655L,61656L,61657L,61658L,61659L,61660L,61661L,61662L,61663L,61664L,
+61665L,61666L,61667L,61668L,61669L,61670L,61671L,61672L,61673L,61674L,
+61675L,61676L,61677L,61678L,61679L,61680L,61681L,61682L,61683L,61684L,
+61685L,61686L,61687L,61688L,61689L,61690L,61691L,61692L,61693L,61694L,
+61695L,61696L,61697L,61698L,61699L,61700L,61701L,61702L,61703L,61704L,
+61705L,61706L,61707L,61708L,61709L,61710L,61711L,61712L,61713L,61714L,
+61715L,61716L,61717L,61718L,61719L,61720L,61721L,61722L,61723L,61724L,
+61725L,61726L,61727L,61728L,61729L,61730L,61731L,61732L,61733L,61734L,
+61735L,61736L,61737L,61738L,61739L,61740L,61741L,61742L,61743L,61744L,
+61745L,61746L,61747L,61748L,61749L,61750L,61751L,61752L,61753L,61754L,
+61755L,61756L,61757L,61758L,61759L,61760L,61761L,61762L,61763L,61764L,
+61765L,61766L,61767L,61768L,61769L,61770L,61771L,61772L,61773L,61774L,
+61775L,61776L,61777L,61778L,61779L,61780L,61781L,61782L,61783L,61784L,
+61785L,61786L,61787L,61788L,61789L,61790L,61791L,61792L,61793L,61794L,
+61795L,61796L,61797L,61798L,61799L,61800L,61801L,61802L,61803L,61804L,
+61805L,61806L,61807L,61808L,61809L,61810L,61811L,61812L,61813L,61814L,
+61815L,61816L,61817L,61818L,61819L,61820L,61821L,61822L,61823L,61824L,
+61825L,61826L,61827L,61828L,61829L,61830L,61831L,61832L,61833L,61834L,
+61835L,61836L,61837L,61838L,61839L,61840L,61841L,61842L,61843L,61844L,
+61845L,61846L,61847L,61848L,61849L,61850L,61851L,61852L,61853L,61854L,
+61855L,61856L,61857L,61858L,61859L,61860L,61861L,61862L,61863L,61864L,
+61865L,61866L,61867L,61868L,61869L,61870L,61871L,61872L,61873L,61874L,
+61875L,61876L,61877L,61878L,61879L,61880L,61881L,61882L,61883L,61884L,
+61885L,61886L,61887L,61888L,61889L,61890L,61891L,61892L,61893L,61894L,
+61895L,61896L,61897L,61898L,61899L,61900L,61901L,61902L,61903L,61904L,
+61905L,61906L,61907L,61908L,61909L,61910L,61911L,61912L,61913L,61914L,
+61915L,61916L,61917L,61918L,61919L,61920L,61921L,61922L,61923L,61924L,
+61925L,61926L,61927L,61928L,61929L,61930L,61931L,61932L,61933L,61934L,
+61935L,61936L,61937L,61938L,61939L,61940L,61941L,61942L,61943L,61944L,
+61945L,61946L,61947L,61948L,61949L,61950L,61951L,61952L,61953L,61954L,
+61955L,61956L,61957L,61958L,61959L,61960L,61961L,61962L,61963L,61964L,
+61965L,61966L,61967L,61968L,61969L,61970L,61971L,61972L,61973L,61974L,
+61975L,61976L,61977L,61978L,61979L,61980L,61981L,61982L,61983L,61984L,
+61985L,61986L,61987L,61988L,61989L,61990L,61991L,61992L,61993L,61994L,
+61995L,61996L,61997L,61998L,61999L,62000L,62001L,62002L,62003L,62004L,
+62005L,62006L,62007L,62008L,62009L,62010L,62011L,62012L,62013L,62014L,
+62015L,62016L,62017L,62018L,62019L,62020L,62021L,62022L,62023L,62024L,
+62025L,62026L,62027L,62028L,62029L,62030L,62031L,62032L,62033L,62034L,
+62035L,62036L,62037L,62038L,62039L,62040L,62041L,62042L,62043L,62044L,
+62045L,62046L,62047L,62048L,62049L,62050L,62051L,62052L,62053L,62054L,
+62055L,62056L,62057L,62058L,62059L,62060L,62061L,62062L,62063L,62064L,
+62065L,62066L,62067L,62068L,62069L,62070L,62071L,62072L,62073L,62074L,
+62075L,62076L,62077L,62078L,62079L,62080L,62081L,62082L,62083L,62084L,
+62085L,62086L,62087L,62088L,62089L,62090L,62091L,62092L,62093L,62094L,
+62095L,62096L,62097L,62098L,62099L,62100L,62101L,62102L,62103L,62104L,
+62105L,62106L,62107L,62108L,62109L,62110L,62111L,62112L,62113L,62114L,
+62115L,62116L,62117L,62118L,62119L,62120L,62121L,62122L,62123L,62124L,
+62125L,62126L,62127L,62128L,62129L,62130L,62131L,62132L,62133L,62134L,
+62135L,62136L,62137L,62138L,62139L,62140L,62141L,62142L,62143L,62144L,
+62145L,62146L,62147L,62148L,62149L,62150L,62151L,62152L,62153L,62154L,
+62155L,62156L,62157L,62158L,62159L,62160L,62161L,62162L,62163L,62164L,
+62165L,62166L,62167L,62168L,62169L,62170L,62171L,62172L,62173L,62174L,
+62175L,62176L,62177L,62178L,62179L,62180L,62181L,62182L,62183L,62184L,
+62185L,62186L,62187L,62188L,62189L,62190L,62191L,62192L,62193L,62194L,
+62195L,62196L,62197L,62198L,62199L,62200L,62201L,62202L,62203L,62204L,
+62205L,62206L,62207L,62208L,62209L,62210L,62211L,62212L,62213L,62214L,
+62215L,62216L,62217L,62218L,62219L,62220L,62221L,62222L,62223L,62224L,
+62225L,62226L,62227L,62228L,62229L,62230L,62231L,62232L,62233L,62234L,
+62235L,62236L,62237L,62238L,62239L,62240L,62241L,62242L,62243L,62244L,
+62245L,62246L,62247L,62248L,62249L,62250L,62251L,62252L,62253L,62254L,
+62255L,62256L,62257L,62258L,62259L,62260L,62261L,62262L,62263L,62264L,
+62265L,62266L,62267L,62268L,62269L,62270L,62271L,62272L,62273L,62274L,
+62275L,62276L,62277L,62278L,62279L,62280L,62281L,62282L,62283L,62284L,
+62285L,62286L,62287L,62288L,62289L,62290L,62291L,62292L,62293L,62294L,
+62295L,62296L,62297L,62298L,62299L,62300L,62301L,62302L,62303L,62304L,
+62305L,62306L,62307L,62308L,62309L,62310L,62311L,62312L,62313L,62314L,
+62315L,62316L,62317L,62318L,62319L,62320L,62321L,62322L,62323L,62324L,
+62325L,62326L,62327L,62328L,62329L,62330L,62331L,62332L,62333L,62334L,
+62335L,62336L,62337L,62338L,62339L,62340L,62341L,62342L,62343L,62344L,
+62345L,62346L,62347L,62348L,62349L,62350L,62351L,62352L,62353L,62354L,
+62355L,62356L,62357L,62358L,62359L,62360L,62361L,62362L,62363L,62364L,
+62365L,62366L,62367L,62368L,62369L,62370L,62371L,62372L,62373L,62374L,
+62375L,62376L,62377L,62378L,62379L,62380L,62381L,62382L,62383L,62384L,
+62385L,62386L,62387L,62388L,62389L,62390L,62391L,62392L,62393L,62394L,
+62395L,62396L,62397L,62398L,62399L,62400L,62401L,62402L,62403L,62404L,
+62405L,62406L,62407L,62408L,62409L,62410L,62411L,62412L,62413L,62414L,
+62415L,62416L,62417L,62418L,62419L,62420L,62421L,62422L,62423L,62424L,
+62425L,62426L,62427L,62428L,62429L,62430L,62431L,62432L,62433L,62434L,
+62435L,62436L,62437L,62438L,62439L,62440L,62441L,62442L,62443L,62444L,
+62445L,62446L,62447L,62448L,62449L,62450L,62451L,62452L,62453L,62454L,
+62455L,62456L,62457L,62458L,62459L,62460L,62461L,62462L,62463L,62464L,
+62465L,62466L,62467L,62468L,62469L,62470L,62471L,62472L,62473L,62474L,
+62475L,62476L,62477L,62478L,62479L,62480L,62481L,62482L,62483L,62484L,
+62485L,62486L,62487L,62488L,62489L,62490L,62491L,62492L,62493L,62494L,
+62495L,62496L,62497L,62498L,62499L,62500L,62501L,62502L,62503L,62504L,
+62505L,62506L,62507L,62508L,62509L,62510L,62511L,62512L,62513L,62514L,
+62515L,62516L,62517L,62518L,62519L,62520L,62521L,62522L,62523L,62524L,
+62525L,62526L,62527L,62528L,62529L,62530L,62531L,62532L,62533L,62534L,
+62535L,62536L,62537L,62538L,62539L,62540L,62541L,62542L,62543L,62544L,
+62545L,62546L,62547L,62548L,62549L,62550L,62551L,62552L,62553L,62554L,
+62555L,62556L,62557L,62558L,62559L,62560L,62561L,62562L,62563L,62564L,
+62565L,62566L,62567L,62568L,62569L,62570L,62571L,62572L,62573L,62574L,
+62575L,62576L,62577L,62578L,62579L,62580L,62581L,62582L,62583L,62584L,
+62585L,62586L,62587L,62588L,62589L,62590L,62591L,62592L,62593L,62594L,
+62595L,62596L,62597L,62598L,62599L,62600L,62601L,62602L,62603L,62604L,
+62605L,62606L,62607L,62608L,62609L,62610L,62611L,62612L,62613L,62614L,
+62615L,62616L,62617L,62618L,62619L,62620L,62621L,62622L,62623L,62624L,
+62625L,62626L,62627L,62628L,62629L,62630L,62631L,62632L,62633L,62634L,
+62635L,62636L,62637L,62638L,62639L,62640L,62641L,62642L,62643L,62644L,
+62645L,62646L,62647L,62648L,62649L,62650L,62651L,62652L,62653L,62654L,
+62655L,62656L,62657L,62658L,62659L,62660L,62661L,62662L,62663L,62664L,
+62665L,62666L,62667L,62668L,62669L,62670L,62671L,62672L,62673L,62674L,
+62675L,62676L,62677L,62678L,62679L,62680L,62681L,62682L,62683L,62684L,
+62685L,62686L,62687L,62688L,62689L,62690L,62691L,62692L,62693L,62694L,
+62695L,62696L,62697L,62698L,62699L,62700L,62701L,62702L,62703L,62704L,
+62705L,62706L,62707L,62708L,62709L,62710L,62711L,62712L,62713L,62714L,
+62715L,62716L,62717L,62718L,62719L,62720L,62721L,62722L,62723L,62724L,
+62725L,62726L,62727L,62728L,62729L,62730L,62731L,62732L,62733L,62734L,
+62735L,62736L,62737L,62738L,62739L,62740L,62741L,62742L,62743L,62744L,
+62745L,62746L,62747L,62748L,62749L,62750L,62751L,62752L,62753L,62754L,
+62755L,62756L,62757L,62758L,62759L,62760L,62761L,62762L,62763L,62764L,
+62765L,62766L,62767L,62768L,62769L,62770L,62771L,62772L,62773L,62774L,
+62775L,62776L,62777L,62778L,62779L,62780L,62781L,62782L,62783L,62784L,
+62785L,62786L,62787L,62788L,62789L,62790L,62791L,62792L,62793L,62794L,
+62795L,62796L,62797L,62798L,62799L,62800L,62801L,62802L,62803L,62804L,
+62805L,62806L,62807L,62808L,62809L,62810L,62811L,62812L,62813L,62814L,
+62815L,62816L,62817L,62818L,62819L,62820L,62821L,62822L,62823L,62824L,
+62825L,62826L,62827L,62828L,62829L,62830L,62831L,62832L,62833L,62834L,
+62835L,62836L,62837L,62838L,62839L,62840L,62841L,62842L,62843L,62844L,
+62845L,62846L,62847L,62848L,62849L,62850L,62851L,62852L,62853L,62854L,
+62855L,62856L,62857L,62858L,62859L,62860L,62861L,62862L,62863L,62864L,
+62865L,62866L,62867L,62868L,62869L,62870L,62871L,62872L,62873L,62874L,
+62875L,62876L,62877L,62878L,62879L,62880L,62881L,62882L,62883L,62884L,
+62885L,62886L,62887L,62888L,62889L,62890L,62891L,62892L,62893L,62894L,
+62895L,62896L,62897L,62898L,62899L,62900L,62901L,62902L,62903L,62904L,
+62905L,62906L,62907L,62908L,62909L,62910L,62911L,62912L,62913L,62914L,
+62915L,62916L,62917L,62918L,62919L,62920L,62921L,62922L,62923L,62924L,
+62925L,62926L,62927L,62928L,62929L,62930L,62931L,62932L,62933L,62934L,
+62935L,62936L,62937L,62938L,62939L,62940L,62941L,62942L,62943L,62944L,
+62945L,62946L,62947L,62948L,62949L,62950L,62951L,62952L,62953L,62954L,
+62955L,62956L,62957L,62958L,62959L,62960L,62961L,62962L,62963L,62964L,
+62965L,62966L,62967L,62968L,62969L,62970L,62971L,62972L,62973L,62974L,
+62975L,62976L,62977L,62978L,62979L,62980L,62981L,62982L,62983L,62984L,
+62985L,62986L,62987L,62988L,62989L,62990L,62991L,62992L,62993L,62994L,
+62995L,62996L,62997L,62998L,62999L,63000L,63001L,63002L,63003L,63004L,
+63005L,63006L,63007L,63008L,63009L,63010L,63011L,63012L,63013L,63014L,
+63015L,63016L,63017L,63018L,63019L,63020L,63021L,63022L,63023L,63024L,
+63025L,63026L,63027L,63028L,63029L,63030L,63031L,63032L,63033L,63034L,
+63035L,63036L,63037L,63038L,63039L,63040L,63041L,63042L,63043L,63044L,
+63045L,63046L,63047L,63048L,63049L,63050L,63051L,63052L,63053L,63054L,
+63055L,63056L,63057L,63058L,63059L,63060L,63061L,63062L,63063L,63064L,
+63065L,63066L,63067L,63068L,63069L,63070L,63071L,63072L,63073L,63074L,
+63075L,63076L,63077L,63078L,63079L,63080L,63081L,63082L,63083L,63084L,
+63085L,63086L,63087L,63088L,63089L,63090L,63091L,63092L,63093L,63094L,
+63095L,63096L,63097L,63098L,63099L,63100L,63101L,63102L,63103L,63104L,
+63105L,63106L,63107L,63108L,63109L,63110L,63111L,63112L,63113L,63114L,
+63115L,63116L,63117L,63118L,63119L,63120L,63121L,63122L,63123L,63124L,
+63125L,63126L,63127L,63128L,63129L,63130L,63131L,63132L,63133L,63134L,
+63135L,63136L,63137L,63138L,63139L,63140L,63141L,63142L,63143L,63144L,
+63145L,63146L,63147L,63148L,63149L,63150L,63151L,63152L,63153L,63154L,
+63155L,63156L,63157L,63158L,63159L,63160L,63161L,63162L,63163L,63164L,
+63165L,63166L,63167L,63168L,63169L,63170L,63171L,63172L,63173L,63174L,
+63175L,63176L,63177L,63178L,63179L,63180L,63181L,63182L,63183L,63184L,
+63185L,63186L,63187L,63188L,63189L,63190L,63191L,63192L,63193L,63194L,
+63195L,63196L,63197L,63198L,63199L,63200L,63201L,63202L,63203L,63204L,
+63205L,63206L,63207L,63208L,63209L,63210L,63211L,63212L,63213L,63214L,
+63215L,63216L,63217L,63218L,63219L,63220L,63221L,63222L,63223L,63224L,
+63225L,63226L,63227L,63228L,63229L,63230L,63231L,63232L,63233L,63234L,
+63235L,63236L,63237L,63238L,63239L,63240L,63241L,63242L,63243L,63244L,
+63245L,63246L,63247L,63248L,63249L,63250L,63251L,63252L,63253L,63254L,
+63255L,63256L,63257L,63258L,63259L,63260L,63261L,63262L,63263L,63264L,
+63265L,63266L,63267L,63268L,63269L,63270L,63271L,63272L,63273L,63274L,
+63275L,63276L,63277L,63278L,63279L,63280L,63281L,63282L,63283L,63284L,
+63285L,63286L,63287L,63288L,63289L,63290L,63291L,63292L,63293L,63294L,
+63295L,63296L,63297L,63298L,63299L,63300L,63301L,63302L,63303L,63304L,
+63305L,63306L,63307L,63308L,63309L,63310L,63311L,63312L,63313L,63314L,
+63315L,63316L,63317L,63318L,63319L,63320L,63321L,63322L,63323L,63324L,
+63325L,63326L,63327L,63328L,63329L,63330L,63331L,63332L,63333L,63334L,
+63335L,63336L,63337L,63338L,63339L,63340L,63341L,63342L,63343L,63344L,
+63345L,63346L,63347L,63348L,63349L,63350L,63351L,63352L,63353L,63354L,
+63355L,63356L,63357L,63358L,63359L,63360L,63361L,63362L,63363L,63364L,
+63365L,63366L,63367L,63368L,63369L,63370L,63371L,63372L,63373L,63374L,
+63375L,63376L,63377L,63378L,63379L,63380L,63381L,63382L,63383L,63384L,
+63385L,63386L,63387L,63388L,63389L,63390L,63391L,63392L,63393L,63394L,
+63395L,63396L,63397L,63398L,63399L,63400L,63401L,63402L,63403L,63404L,
+63405L,63406L,63407L,63408L,63409L,63410L,63411L,63412L,63413L,63414L,
+63415L,63416L,63417L,63418L,63419L,63420L,63421L,63422L,63423L,63424L,
+63425L,63426L,63427L,63428L,63429L,63430L,63431L,63432L,63433L,63434L,
+63435L,63436L,63437L,63438L,63439L,63440L,63441L,63442L,63443L,63444L,
+63445L,63446L,63447L,63448L,63449L,63450L,63451L,63452L,63453L,63454L,
+63455L,63456L,63457L,63458L,63459L,63460L,63461L,63462L,63463L,63464L,
+63465L,63466L,63467L,63468L,63469L,63470L,63471L,63472L,63473L,63474L,
+63475L,63476L,63477L,63478L,63479L,63480L,63481L,63482L,63483L,63484L,
+63485L,63486L,63487L,63488L,63489L,63490L,63491L,63492L,63493L,63494L,
+63495L,63496L,63497L,63498L,63499L,63500L,63501L,63502L,63503L,63504L,
+63505L,63506L,63507L,63508L,63509L,63510L,63511L,63512L,63513L,63514L,
+63515L,63516L,63517L,63518L,63519L,63520L,63521L,63522L,63523L,63524L,
+63525L,63526L,63527L,63528L,63529L,63530L,63531L,63532L,63533L,63534L,
+63535L,63536L,63537L,63538L,63539L,63540L,63541L,63542L,63543L,63544L,
+63545L,63546L,63547L,63548L,63549L,63550L,63551L,63552L,63553L,63554L,
+63555L,63556L,63557L,63558L,63559L,63560L,63561L,63562L,63563L,63564L,
+63565L,63566L,63567L,63568L,63569L,63570L,63571L,63572L,63573L,63574L,
+63575L,63576L,63577L,63578L,63579L,63580L,63581L,63582L,63583L,63584L,
+63585L,63586L,63587L,63588L,63589L,63590L,63591L,63592L,63593L,63594L,
+63595L,63596L,63597L,63598L,63599L,63600L,63601L,63602L,63603L,63604L,
+63605L,63606L,63607L,63608L,63609L,63610L,63611L,63612L,63613L,63614L,
+63615L,63616L,63617L,63618L,63619L,63620L,63621L,63622L,63623L,63624L,
+63625L,63626L,63627L,63628L,63629L,63630L,63631L,63632L,63633L,63634L,
+63635L,63636L,63637L,63638L,63639L,63640L,63641L,63642L,63643L,63644L,
+63645L,63646L,63647L,63648L,63649L,63650L,63651L,63652L,63653L,63654L,
+63655L,63656L,63657L,63658L,63659L,63660L,63661L,63662L,63663L,63664L,
+63665L,63666L,63667L,63668L,63669L,63670L,63671L,63672L,63673L,63674L,
+63675L,63676L,63677L,63678L,63679L,63680L,63681L,63682L,63683L,63684L,
+63685L,63686L,63687L,63688L,63689L,63690L,63691L,63692L,63693L,63694L,
+63695L,63696L,63697L,63698L,63699L,63700L,63701L,63702L,63703L,63704L,
+63705L,63706L,63707L,63708L,63709L,63710L,63711L,63712L,63713L,63714L,
+63715L,63716L,63717L,63718L,63719L,63720L,63721L,63722L,63723L,63724L,
+63725L,63726L,63727L,63728L,63729L,63730L,63731L,63732L,63733L,63734L,
+63735L,63736L,63737L,63738L,63739L,63740L,63741L,63742L,63743L,63744L,
+63745L,63746L,63747L,63748L,63749L,63750L,63751L,63752L,63753L,63754L,
+63755L,63756L,63757L,63758L,63759L,63760L,63761L,63762L,63763L,63764L,
+63765L,63766L,63767L,63768L,63769L,63770L,63771L,63772L,63773L,63774L,
+63775L,63776L,63777L,63778L,63779L,63780L,63781L,63782L,63783L,63784L,
+63785L,63786L,63787L,63788L,63789L,63790L,63791L,63792L,63793L,63794L,
+63795L,63796L,63797L,63798L,63799L,63800L,63801L,63802L,63803L,63804L,
+63805L,63806L,63807L,63808L,63809L,63810L,63811L,63812L,63813L,63814L,
+63815L,63816L,63817L,63818L,63819L,63820L,63821L,63822L,63823L,63824L,
+63825L,63826L,63827L,63828L,63829L,63830L,63831L,63832L,63833L,63834L,
+63835L,63836L,63837L,63838L,63839L,63840L,63841L,63842L,63843L,63844L,
+63845L,63846L,63847L,63848L,63849L,63850L,63851L,63852L,63853L,63854L,
+63855L,63856L,63857L,63858L,63859L,63860L,63861L,63862L,63863L,63864L,
+63865L,63866L,63867L,63868L,63869L,63870L,63871L,63872L,63873L,63874L,
+63875L,63876L,63877L,63878L,63879L,63880L,63881L,63882L,63883L,63884L,
+63885L,63886L,63887L,63888L,63889L,63890L,63891L,63892L,63893L,63894L,
+63895L,63896L,63897L,63898L,63899L,63900L,63901L,63902L,63903L,63904L,
+63905L,63906L,63907L,63908L,63909L,63910L,63911L,63912L,63913L,63914L,
+63915L,63916L,63917L,63918L,63919L,63920L,63921L,63922L,63923L,63924L,
+63925L,63926L,63927L,63928L,63929L,63930L,63931L,63932L,63933L,63934L,
+63935L,63936L,63937L,63938L,63939L,63940L,63941L,63942L,63943L,63944L,
+63945L,63946L,63947L,63948L,63949L,63950L,63951L,63952L,63953L,63954L,
+63955L,63956L,63957L,63958L,63959L,63960L,63961L,63962L,63963L,63964L,
+63965L,63966L,63967L,63968L,63969L,63970L,63971L,63972L,63973L,63974L,
+63975L,63976L,63977L,63978L,63979L,63980L,63981L,63982L,63983L,63984L,
+63985L,63986L,63987L,63988L,63989L,63990L,63991L,63992L,63993L,63994L,
+63995L,63996L,63997L,63998L,63999L,64000L,64001L,64002L,64003L,64004L,
+64005L,64006L,64007L,64008L,64009L,64010L,64011L,64012L,64013L,64014L,
+64015L,64016L,64017L,64018L,64019L,64020L,64021L,64022L,64023L,64024L,
+64025L,64026L,64027L,64028L,64029L,64030L,64031L,64032L,64033L,64034L,
+64035L,64036L,64037L,64038L,64039L,64040L,64041L,64042L,64043L,64044L,
+64045L,64046L,64047L,64048L,64049L,64050L,64051L,64052L,64053L,64054L,
+64055L,64056L,64057L,64058L,64059L,64060L,64061L,64062L,64063L,64064L,
+64065L,64066L,64067L,64068L,64069L,64070L,64071L,64072L,64073L,64074L,
+64075L,64076L,64077L,64078L,64079L,64080L,64081L,64082L,64083L,64084L,
+64085L,64086L,64087L,64088L,64089L,64090L,64091L,64092L,64093L,64094L,
+64095L,64096L,64097L,64098L,64099L,64100L,64101L,64102L,64103L,64104L,
+64105L,64106L,64107L,64108L,64109L,64110L,64111L,64112L,64113L,64114L,
+64115L,64116L,64117L,64118L,64119L,64120L,64121L,64122L,64123L,64124L,
+64125L,64126L,64127L,64128L,64129L,64130L,64131L,64132L,64133L,64134L,
+64135L,64136L,64137L,64138L,64139L,64140L,64141L,64142L,64143L,64144L,
+64145L,64146L,64147L,64148L,64149L,64150L,64151L,64152L,64153L,64154L,
+64155L,64156L,64157L,64158L,64159L,64160L,64161L,64162L,64163L,64164L,
+64165L,64166L,64167L,64168L,64169L,64170L,64171L,64172L,64173L,64174L,
+64175L,64176L,64177L,64178L,64179L,64180L,64181L,64182L,64183L,64184L,
+64185L,64186L,64187L,64188L,64189L,64190L,64191L,64192L,64193L,64194L,
+64195L,64196L,64197L,64198L,64199L,64200L,64201L,64202L,64203L,64204L,
+64205L,64206L,64207L,64208L,64209L,64210L,64211L,64212L,64213L,64214L,
+64215L,64216L,64217L,64218L,64219L,64220L,64221L,64222L,64223L,64224L,
+64225L,64226L,64227L,64228L,64229L,64230L,64231L,64232L,64233L,64234L,
+64235L,64236L,64237L,64238L,64239L,64240L,64241L,64242L,64243L,64244L,
+64245L,64246L,64247L,64248L,64249L,64250L,64251L,64252L,64253L,64254L,
+64255L,64256L,64257L,64258L,64259L,64260L,64261L,64262L,64263L,64264L,
+64265L,64266L,64267L,64268L,64269L,64270L,64271L,64272L,64273L,64274L,
+64275L,64276L,64277L,64278L,64279L,64280L,64281L,64282L,64283L,64284L,
+64285L,64286L,64287L,64288L,64289L,64290L,64291L,64292L,64293L,64294L,
+64295L,64296L,64297L,64298L,64299L,64300L,64301L,64302L,64303L,64304L,
+64305L,64306L,64307L,64308L,64309L,64310L,64311L,64312L,64313L,64314L,
+64315L,64316L,64317L,64318L,64319L,64320L,64321L,64322L,64323L,64324L,
+64325L,64326L,64327L,64328L,64329L,64330L,64331L,64332L,64333L,64334L,
+64335L,64336L,64337L,64338L,64339L,64340L,64341L,64342L,64343L,64344L,
+64345L,64346L,64347L,64348L,64349L,64350L,64351L,64352L,64353L,64354L,
+64355L,64356L,64357L,64358L,64359L,64360L,64361L,64362L,64363L,64364L,
+64365L,64366L,64367L,64368L,64369L,64370L,64371L,64372L,64373L,64374L,
+64375L,64376L,64377L,64378L,64379L,64380L,64381L,64382L,64383L,64384L,
+64385L,64386L,64387L,64388L,64389L,64390L,64391L,64392L,64393L,64394L,
+64395L,64396L,64397L,64398L,64399L,64400L,64401L,64402L,64403L,64404L,
+64405L,64406L,64407L,64408L,64409L,64410L,64411L,64412L,64413L,64414L,
+64415L,64416L,64417L,64418L,64419L,64420L,64421L,64422L,64423L,64424L,
+64425L,64426L,64427L,64428L,64429L,64430L,64431L,64432L,64433L,64434L,
+64435L,64436L,64437L,64438L,64439L,64440L,64441L,64442L,64443L,64444L,
+64445L,64446L,64447L,64448L,64449L,64450L,64451L,64452L,64453L,64454L,
+64455L,64456L,64457L,64458L,64459L,64460L,64461L,64462L,64463L,64464L,
+64465L,64466L,64467L,64468L,64469L,64470L,64471L,64472L,64473L,64474L,
+64475L,64476L,64477L,64478L,64479L,64480L,64481L,64482L,64483L,64484L,
+64485L,64486L,64487L,64488L,64489L,64490L,64491L,64492L,64493L,64494L,
+64495L,64496L,64497L,64498L,64499L,64500L,64501L,64502L,64503L,64504L,
+64505L,64506L,64507L,64508L,64509L,64510L,64511L,64512L,64513L,64514L,
+64515L,64516L,64517L,64518L,64519L,64520L,64521L,64522L,64523L,64524L,
+64525L,64526L,64527L,64528L,64529L,64530L,64531L,64532L,64533L,64534L,
+64535L,64536L,64537L,64538L,64539L,64540L,64541L,64542L,64543L,64544L,
+64545L,64546L,64547L,64548L,64549L,64550L,64551L,64552L,64553L,64554L,
+64555L,64556L,64557L,64558L,64559L,64560L,64561L,64562L,64563L,64564L,
+64565L,64566L,64567L,64568L,64569L,64570L,64571L,64572L,64573L,64574L,
+64575L,64576L,64577L,64578L,64579L,64580L,64581L,64582L,64583L,64584L,
+64585L,64586L,64587L,64588L,64589L,64590L,64591L,64592L,64593L,64594L,
+64595L,64596L,64597L,64598L,64599L,64600L,64601L,64602L,64603L,64604L,
+64605L,64606L,64607L,64608L,64609L,64610L,64611L,64612L,64613L,64614L,
+64615L,64616L,64617L,64618L,64619L,64620L,64621L,64622L,64623L,64624L,
+64625L,64626L,64627L,64628L,64629L,64630L,64631L,64632L,64633L,64634L,
+64635L,64636L,64637L,64638L,64639L,64640L,64641L,64642L,64643L,64644L,
+64645L,64646L,64647L,64648L,64649L,64650L,64651L,64652L,64653L,64654L,
+64655L,64656L,64657L,64658L,64659L,64660L,64661L,64662L,64663L,64664L,
+64665L,64666L,64667L,64668L,64669L,64670L,64671L,64672L,64673L,64674L,
+64675L,64676L,64677L,64678L,64679L,64680L,64681L,64682L,64683L,64684L,
+64685L,64686L,64687L,64688L,64689L,64690L,64691L,64692L,64693L,64694L,
+64695L,64696L,64697L,64698L,64699L,64700L,64701L,64702L,64703L,64704L,
+64705L,64706L,64707L,64708L,64709L,64710L,64711L,64712L,64713L,64714L,
+64715L,64716L,64717L,64718L,64719L,64720L,64721L,64722L,64723L,64724L,
+64725L,64726L,64727L,64728L,64729L,64730L,64731L,64732L,64733L,64734L,
+64735L,64736L,64737L,64738L,64739L,64740L,64741L,64742L,64743L,64744L,
+64745L,64746L,64747L,64748L,64749L,64750L,64751L,64752L,64753L,64754L,
+64755L,64756L,64757L,64758L,64759L,64760L,64761L,64762L,64763L,64764L,
+64765L,64766L,64767L,64768L,64769L,64770L,64771L,64772L,64773L,64774L,
+64775L,64776L,64777L,64778L,64779L,64780L,64781L,64782L,64783L,64784L,
+64785L,64786L,64787L,64788L,64789L,64790L,64791L,64792L,64793L,64794L,
+64795L,64796L,64797L,64798L,64799L,64800L,64801L,64802L,64803L,64804L,
+64805L,64806L,64807L,64808L,64809L,64810L,64811L,64812L,64813L,64814L,
+64815L,64816L,64817L,64818L,64819L,64820L,64821L,64822L,64823L,64824L,
+64825L,64826L,64827L,64828L,64829L,64830L,64831L,64832L,64833L,64834L,
+64835L,64836L,64837L,64838L,64839L,64840L,64841L,64842L,64843L,64844L,
+64845L,64846L,64847L,64848L,64849L,64850L,64851L,64852L,64853L,64854L,
+64855L,64856L,64857L,64858L,64859L,64860L,64861L,64862L,64863L,64864L,
+64865L,64866L,64867L,64868L,64869L,64870L,64871L,64872L,64873L,64874L,
+64875L,64876L,64877L,64878L,64879L,64880L,64881L,64882L,64883L,64884L,
+64885L,64886L,64887L,64888L,64889L,64890L,64891L,64892L,64893L,64894L,
+64895L,64896L,64897L,64898L,64899L,64900L,64901L,64902L,64903L,64904L,
+64905L,64906L,64907L,64908L,64909L,64910L,64911L,64912L,64913L,64914L,
+64915L,64916L,64917L,64918L,64919L,64920L,64921L,64922L,64923L,64924L,
+64925L,64926L,64927L,64928L,64929L,64930L,64931L,64932L,64933L,64934L,
+64935L,64936L,64937L,64938L,64939L,64940L,64941L,64942L,64943L,64944L,
+64945L,64946L,64947L,64948L,64949L,64950L,64951L,64952L,64953L,64954L,
+64955L,64956L,64957L,64958L,64959L,64960L,64961L,64962L,64963L,64964L,
+64965L,64966L,64967L,64968L,64969L,64970L,64971L,64972L,64973L,64974L,
+64975L,64976L,64977L,64978L,64979L,64980L,64981L,64982L,64983L,64984L,
+64985L,64986L,64987L,64988L,64989L,64990L,64991L,64992L,64993L,64994L,
+64995L,64996L,64997L,64998L,64999L,65000L,65001L,65002L,65003L,65004L,
+65005L,65006L,65007L,65008L,65009L,65010L,65011L,65012L,65013L,65014L,
+65015L,65016L,65017L,65018L,65019L,65020L,65021L,65022L,65023L,65024L,
+65025L,65026L,65027L,65028L,65029L,65030L,65031L,65032L,65033L,65034L,
+65035L,65036L,65037L,65038L,65039L,65040L,65041L,65042L,65043L,65044L,
+65045L,65046L,65047L,65048L,65049L,65050L,65051L,65052L,65053L,65054L,
+65055L,65056L,65057L,65058L,65059L,65060L,65061L,65062L,65063L,65064L,
+65065L,65066L,65067L,65068L,65069L,65070L,65071L,65072L,65073L,65074L,
+65075L,65076L,65077L,65078L,65079L,65080L,65081L,65082L,65083L,65084L,
+65085L,65086L,65087L,65088L,65089L,65090L,65091L,65092L,65093L,65094L,
+65095L,65096L,65097L,65098L,65099L,65100L,65101L,65102L,65103L,65104L,
+65105L,65106L,65107L,65108L,65109L,65110L,65111L,65112L,65113L,65114L,
+65115L,65116L,65117L,65118L,65119L,65120L,65121L,65122L,65123L,65124L,
+65125L,65126L,65127L,65128L,65129L,65130L,65131L,65132L,65133L,65134L,
+65135L,65136L,65137L,65138L,65139L,65140L,65141L,65142L,65143L,65144L,
+65145L,65146L,65147L,65148L,65149L,65150L,65151L,65152L,65153L,65154L,
+65155L,65156L,65157L,65158L,65159L,65160L,65161L,65162L,65163L,65164L,
+65165L,65166L,65167L,65168L,65169L,65170L,65171L,65172L,65173L,65174L,
+65175L,65176L,65177L,65178L,65179L,65180L,65181L,65182L,65183L,65184L,
+65185L,65186L,65187L,65188L,65189L,65190L,65191L,65192L,65193L,65194L,
+65195L,65196L,65197L,65198L,65199L,65200L,65201L,65202L,65203L,65204L,
+65205L,65206L,65207L,65208L,65209L,65210L,65211L,65212L,65213L,65214L,
+65215L,65216L,65217L,65218L,65219L,65220L,65221L,65222L,65223L,65224L,
+65225L,65226L,65227L,65228L,65229L,65230L,65231L,65232L,65233L,65234L,
+65235L,65236L,65237L,65238L,65239L,65240L,65241L,65242L,65243L,65244L,
+65245L,65246L,65247L,65248L,65249L,65250L,65251L,65252L,65253L,65254L,
+65255L,65256L,65257L,65258L,65259L,65260L,65261L,65262L,65263L,65264L,
+65265L,65266L,65267L,65268L,65269L,65270L,65271L,65272L,65273L,65274L,
+65275L,65276L,65277L,65278L,65279L,65280L,65281L,65282L,65283L,65284L,
+65285L,65286L,65287L,65288L,65289L,65290L,65291L,65292L,65293L,65294L,
+65295L,65296L,65297L,65298L,65299L,65300L,65301L,65302L,65303L,65304L,
+65305L,65306L,65307L,65308L,65309L,65310L,65311L,65312L,65313L,65314L,
+65315L,65316L,65317L,65318L,65319L,65320L,65321L,65322L,65323L,65324L,
+65325L,65326L,65327L,65328L,65329L,65330L,65331L,65332L,65333L,65334L,
+65335L,65336L,65337L,65338L,65339L,65340L,65341L,65342L,65343L,65344L,
+65313L,65314L,65315L,65316L,65317L,65318L,65319L,65320L,65321L,65322L,
+65323L,65324L,65325L,65326L,65327L,65328L,65329L,65330L,65331L,65332L,
+65333L,65334L,65335L,65336L,65337L,65338L,65371L,65372L,65373L,65374L,
+65375L,65376L,65377L,65378L,65379L,65380L,65381L,65382L,65383L,65384L,
+65385L,65386L,65387L,65388L,65389L,65390L,65391L,65392L,65393L,65394L,
+65395L,65396L,65397L,65398L,65399L,65400L,65401L,65402L,65403L,65404L,
+65405L,65406L,65407L,65408L,65409L,65410L,65411L,65412L,65413L,65414L,
+65415L,65416L,65417L,65418L,65419L,65420L,65421L,65422L,65423L,65424L,
+65425L,65426L,65427L,65428L,65429L,65430L,65431L,65432L,65433L,65434L,
+65435L,65436L,65437L,65438L,65439L,65440L,65441L,65442L,65443L,65444L,
+65445L,65446L,65447L,65448L,65449L,65450L,65451L,65452L,65453L,65454L,
+65455L,65456L,65457L,65458L,65459L,65460L,65461L,65462L,65463L,65464L,
+65465L,65466L,65467L,65468L,65469L,65470L,65471L,65472L,65473L,65474L,
+65475L,65476L,65477L,65478L,65479L,65480L,65481L,65482L,65483L,65484L,
+65485L,65486L,65487L,65488L,65489L,65490L,65491L,65492L,65493L,65494L,
+65495L,65496L,65497L,65498L,65499L,65500L,65501L,65502L,65503L,65504L,
+65505L,65506L,65507L,65508L,65509L,65510L,65511L,65512L,65513L,65514L,
+65515L,65516L,65517L,65518L,65519L,65520L,65521L,65522L,65523L,65524L,
+65525L,65526L,65527L,65528L,65529L,65530L,65531L,65532L,65533L,65534L,
+65535L,
 };
 #endif
 
@@ -95450,8 +99952,8 @@ const duk_uint16_t duk_unicode_re_canon_lookup[65536] = {
  */
 
 const duk_uint8_t duk_unicode_re_canon_bitmap[256] = {
-23,0,224,19,1,228,255,255,255,255,255,255,255,255,255,255,255,255,255,127,
-255,255,255,255,255,255,255,255,231,247,0,16,255,227,255,255,63,255,255,
+23,0,224,19,1,228,255,255,255,255,255,255,255,255,255,255,63,254,255,127,
+255,255,255,255,255,255,255,255,231,231,0,16,255,227,255,255,63,255,255,
 255,255,255,255,255,1,252,255,255,255,255,255,255,255,255,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
@@ -95459,7 +99961,7 @@ const duk_uint8_t duk_unicode_re_canon_bitmap[256] = {
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-227,193,255,255,255,147,255,255,255,255,255,255,255,255,255,255,255,255,
+227,129,255,255,255,147,255,255,255,255,255,255,255,255,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
@@ -95511,7 +100013,7 @@ DUK_INTERNAL duk_uint32_t duk_bd_decode(duk_bitdecoder_ctx *ctx, duk_small_int_t
 	shift = ctx->currbits - bits;
 	mask = (((duk_uint32_t) 1U) << bits) - 1U;
 	tmp = (ctx->currval >> shift) & mask;
-	ctx->currbits = shift;  /* remaining */
+	ctx->currbits = shift; /* remaining */
 
 #if 0
 	DUK_DDD(DUK_DDDPRINT("decode_bits: %ld bits -> 0x%08lx (%ld), currbits=%ld, currval=0x%08lx",
@@ -95550,17 +100052,17 @@ DUK_INTERNAL duk_uint32_t duk_bd_decode_varuint(duk_bitdecoder_ctx *ctx) {
 	 */
 	switch (duk_bd_decode(ctx, 2)) {
 	case 0:
-		return 0;  /* [0,0] */
+		return 0; /* [0,0] */
 	case 1:
-		return duk_bd_decode(ctx, 2) + 1;  /* [1,4] */
+		return duk_bd_decode(ctx, 2) + 1; /* [1,4] */
 	case 2:
-		return duk_bd_decode(ctx, 5) + 5;  /* [5,36] */
+		return duk_bd_decode(ctx, 5) + 5; /* [5,36] */
 	default:
 		t = duk_bd_decode(ctx, 7);
 		if (t == 0) {
 			return duk_bd_decode(ctx, 20);
 		}
-		return (t - 1) + 37;  /* [37,163] */
+		return (t - 1) + 37; /* [37,163] */
 	}
 }
 
@@ -95569,20 +100071,18 @@ DUK_INTERNAL duk_uint32_t duk_bd_decode_varuint(duk_bitdecoder_ctx *ctx) {
  * Caller must supply the output buffer whose size is NOT checked!
  */
 
-#define DUK__BITPACK_LETTER_LIMIT  26
-#define DUK__BITPACK_LOOKUP1       26
-#define DUK__BITPACK_LOOKUP2       27
-#define DUK__BITPACK_SWITCH1       28
-#define DUK__BITPACK_SWITCH        29
-#define DUK__BITPACK_UNUSED1       30
-#define DUK__BITPACK_EIGHTBIT      31
+#define DUK__BITPACK_LETTER_LIMIT 26
+#define DUK__BITPACK_LOOKUP1      26
+#define DUK__BITPACK_LOOKUP2      27
+#define DUK__BITPACK_SWITCH1      28
+#define DUK__BITPACK_SWITCH       29
+#define DUK__BITPACK_UNUSED1      30
+#define DUK__BITPACK_EIGHTBIT     31
 
-DUK_LOCAL const duk_uint8_t duk__bitpacked_lookup[16] = {
-	DUK_ASC_0, DUK_ASC_1, DUK_ASC_2, DUK_ASC_3,
-	DUK_ASC_4, DUK_ASC_5, DUK_ASC_6, DUK_ASC_7,
-	DUK_ASC_8, DUK_ASC_9, DUK_ASC_UNDERSCORE, DUK_ASC_SPACE,
-	0x82, 0x80, DUK_ASC_DOUBLEQUOTE, DUK_ASC_LCURLY
-};
+DUK_LOCAL const duk_uint8_t duk__bitpacked_lookup[16] = { DUK_ASC_0, DUK_ASC_1, DUK_ASC_2,           DUK_ASC_3,
+	                                                  DUK_ASC_4, DUK_ASC_5, DUK_ASC_6,           DUK_ASC_7,
+	                                                  DUK_ASC_8, DUK_ASC_9, DUK_ASC_UNDERSCORE,  DUK_ASC_SPACE,
+	                                                  0x82,      0x80,      DUK_ASC_DOUBLEQUOTE, DUK_ASC_LCURLY };
 
 DUK_INTERNAL duk_small_uint_t duk_bd_decode_bitpacked_string(duk_bitdecoder_ctx *bd, duk_uint8_t *out) {
 	duk_small_uint_t len;
@@ -95592,10 +100092,10 @@ DUK_INTERNAL duk_small_uint_t duk_bd_decode_bitpacked_string(duk_bitdecoder_ctx
 
 	len = duk_bd_decode(bd, 5);
 	if (len == 31) {
-		len = duk_bd_decode(bd, 8);  /* Support up to 256 bytes; rare. */
+		len = duk_bd_decode(bd, 8); /* Support up to 256 bytes; rare. */
 	}
 
-	mode = 32;  /* 0 = uppercase, 32 = lowercase (= 'a' - 'A') */
+	mode = 32; /* 0 = uppercase, 32 = lowercase (= 'a' - 'A') */
 	for (i = 0; i < len; i++) {
 		t = duk_bd_decode(bd, 5);
 		if (t < DUK__BITPACK_LETTER_LIMIT) {
@@ -95606,7 +100106,7 @@ DUK_INTERNAL duk_small_uint_t duk_bd_decode_bitpacked_string(duk_bitdecoder_ctx
 			t = duk__bitpacked_lookup[8 + duk_bd_decode(bd, 3)];
 		} else if (t == DUK__BITPACK_SWITCH1) {
 			t = duk_bd_decode(bd, 5);
-			DUK_ASSERT_DISABLE(t >= 0);  /* unsigned */
+			DUK_ASSERT_DISABLE(t >= 0); /* unsigned */
 			DUK_ASSERT(t <= 25);
 			t = t + DUK_ASC_UC_A + (mode ^ 32);
 		} else if (t == DUK__BITPACK_SWITCH) {
@@ -95748,7 +100248,7 @@ DUK_INTERNAL duk_uint8_t *duk_bw_resize(duk_hthread *thr, duk_bufwriter_ctx *bw_
 		DUK_ERROR_RANGE(thr, DUK_STR_BUFFER_TOO_LONG);
 		DUK_WO_NORETURN(return NULL;);
 	}
-#if 0  /* for manual torture testing: tight allocation, useful with valgrind */
+#if 0 /* for manual torture testing: tight allocation, useful with valgrind */
 	new_sz = curr_off + sz;
 #endif
 
@@ -95789,9 +100289,7 @@ DUK_INTERNAL void duk_bw_write_raw_slice(duk_hthread *thr, duk_bufwriter_ctx *bw
 	DUK_UNREF(thr);
 
 	p_base = bw->p_base;
-	duk_memcpy_unsafe((void *) bw->p,
-	                  (const void *) (p_base + src_off),
-	                  (size_t) len);
+	duk_memcpy_unsafe((void *) bw->p, (const void *) (p_base + src_off), (size_t) len);
 	bw->p += len;
 }
 
@@ -95806,7 +100304,11 @@ DUK_INTERNAL void duk_bw_write_ensure_slice(duk_hthread *thr, duk_bufwriter_ctx
 	duk_bw_write_raw_slice(thr, bw, src_off, len);
 }
 
-DUK_INTERNAL void duk_bw_insert_raw_bytes(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t dst_off, const duk_uint8_t *buf, duk_size_t len) {
+DUK_INTERNAL void duk_bw_insert_raw_bytes(duk_hthread *thr,
+                                          duk_bufwriter_ctx *bw,
+                                          duk_size_t dst_off,
+                                          const duk_uint8_t *buf,
+                                          duk_size_t len) {
 	duk_uint8_t *p_base;
 	duk_size_t buf_sz, move_sz;
 
@@ -95817,20 +100319,20 @@ DUK_INTERNAL void duk_bw_insert_raw_bytes(duk_hthread *thr, duk_bufwriter_ctx *b
 	DUK_UNREF(thr);
 
 	p_base = bw->p_base;
-	buf_sz = (duk_size_t) (bw->p - p_base);  /* constrained by maximum buffer size */
+	buf_sz = (duk_size_t) (bw->p - p_base); /* constrained by maximum buffer size */
 	move_sz = buf_sz - dst_off;
 
-	DUK_ASSERT(p_base != NULL);  /* buffer size is >= 1 */
-	duk_memmove_unsafe((void *) (p_base + dst_off + len),
-	                   (const void *) (p_base + dst_off),
-	                   (size_t) move_sz);
-	duk_memcpy_unsafe((void *) (p_base + dst_off),
-	                  (const void *) buf,
-	                  (size_t) len);
+	DUK_ASSERT(p_base != NULL); /* buffer size is >= 1 */
+	duk_memmove_unsafe((void *) (p_base + dst_off + len), (const void *) (p_base + dst_off), (size_t) move_sz);
+	duk_memcpy_unsafe((void *) (p_base + dst_off), (const void *) buf, (size_t) len);
 	bw->p += len;
 }
 
-DUK_INTERNAL void duk_bw_insert_ensure_bytes(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t dst_off, const duk_uint8_t *buf, duk_size_t len) {
+DUK_INTERNAL void duk_bw_insert_ensure_bytes(duk_hthread *thr,
+                                             duk_bufwriter_ctx *bw,
+                                             duk_size_t dst_off,
+                                             const duk_uint8_t *buf,
+                                             duk_size_t len) {
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(bw != NULL);
 	DUK_ASSERT(dst_off <= DUK_BW_GET_SIZE(thr, bw));
@@ -95840,7 +100342,11 @@ DUK_INTERNAL void duk_bw_insert_ensure_bytes(duk_hthread *thr, duk_bufwriter_ctx
 	duk_bw_insert_raw_bytes(thr, bw, dst_off, buf, len);
 }
 
-DUK_INTERNAL void duk_bw_insert_raw_slice(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t dst_off, duk_size_t src_off, duk_size_t len) {
+DUK_INTERNAL void duk_bw_insert_raw_slice(duk_hthread *thr,
+                                          duk_bufwriter_ctx *bw,
+                                          duk_size_t dst_off,
+                                          duk_size_t src_off,
+                                          duk_size_t len) {
 	duk_uint8_t *p_base;
 	duk_size_t buf_sz, move_sz;
 
@@ -95867,17 +100373,17 @@ DUK_INTERNAL void duk_bw_insert_raw_slice(duk_hthread *thr, duk_bufwriter_ctx *b
 	buf_sz = (duk_size_t) (bw->p - p_base);
 	move_sz = buf_sz - dst_off;
 
-	DUK_ASSERT(p_base != NULL);  /* buffer size is >= 1 */
-	duk_memmove_unsafe((void *) (p_base + dst_off + len),
-	                   (const void *) (p_base + dst_off),
-	                   (size_t) move_sz);
-	duk_memcpy_unsafe((void *) (p_base + dst_off),
-	                  (const void *) (p_base + src_off),
-	                  (size_t) len);
+	DUK_ASSERT(p_base != NULL); /* buffer size is >= 1 */
+	duk_memmove_unsafe((void *) (p_base + dst_off + len), (const void *) (p_base + dst_off), (size_t) move_sz);
+	duk_memcpy_unsafe((void *) (p_base + dst_off), (const void *) (p_base + src_off), (size_t) len);
 	bw->p += len;
 }
 
-DUK_INTERNAL void duk_bw_insert_ensure_slice(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t dst_off, duk_size_t src_off, duk_size_t len) {
+DUK_INTERNAL void duk_bw_insert_ensure_slice(duk_hthread *thr,
+                                             duk_bufwriter_ctx *bw,
+                                             duk_size_t dst_off,
+                                             duk_size_t src_off,
+                                             duk_size_t len) {
 	DUK_ASSERT(thr != NULL);
 	DUK_ASSERT(bw != NULL);
 	DUK_ASSERT(dst_off <= DUK_BW_GET_SIZE(thr, bw));
@@ -95907,7 +100413,7 @@ DUK_INTERNAL duk_uint8_t *duk_bw_insert_raw_area(duk_hthread *thr, duk_bufwriter
 	p_dst = p_base + off + len;
 	p_src = p_base + off;
 	duk_memmove_unsafe((void *) p_dst, (const void *) p_src, (size_t) move_sz);
-	return p_src;  /* point to start of 'reserved area' */
+	return p_src; /* point to start of 'reserved area' */
 }
 
 DUK_INTERNAL duk_uint8_t *duk_bw_insert_ensure_area(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t off, duk_size_t len) {
@@ -95937,103 +100443,24 @@ DUK_INTERNAL void duk_bw_remove_raw_slice(duk_hthread *thr, duk_bufwriter_ctx *b
 	p_dst = p_base + off;
 	p_src = p_dst + len;
 	move_sz = (duk_size_t) (bw->p - p_src);
-	duk_memmove_unsafe((void *) p_dst,
-	                   (const void *) p_src,
-	                   (size_t) move_sz);
+	duk_memmove_unsafe((void *) p_dst, (const void *) p_src, (size_t) move_sz);
 	bw->p -= len;
 }
 
 /*
- *  Macro support functions for reading/writing raw data.
- *
- *  These are done using mempcy to ensure they're valid even for unaligned
- *  reads/writes on platforms where alignment counts.  On x86 at least gcc
- *  is able to compile these into a bswap+mov.  "Always inline" is used to
- *  ensure these macros compile to minimal code.
- *
- *  Not really bufwriter related, but currently used together.
+ *  Assertion helpers
  */
 
-DUK_INTERNAL DUK_ALWAYS_INLINE duk_uint16_t duk_raw_read_u16_be(duk_uint8_t **p) {
-	union {
-		duk_uint8_t b[2];
-		duk_uint16_t x;
-	} u;
-
-	duk_memcpy((void *) u.b, (const void *) (*p), (size_t) 2);
-	u.x = DUK_NTOH16(u.x);
-	*p += 2;
-	return u.x;
-}
-
-DUK_INTERNAL DUK_ALWAYS_INLINE duk_uint32_t duk_raw_read_u32_be(duk_uint8_t **p) {
-	union {
-		duk_uint8_t b[4];
-		duk_uint32_t x;
-	} u;
-
-	duk_memcpy((void *) u.b, (const void *) (*p), (size_t) 4);
-	u.x = DUK_NTOH32(u.x);
-	*p += 4;
-	return u.x;
-}
-
-DUK_INTERNAL DUK_ALWAYS_INLINE duk_double_t duk_raw_read_double_be(duk_uint8_t **p) {
-	duk_double_union du;
-	union {
-		duk_uint8_t b[4];
-		duk_uint32_t x;
-	} u;
-
-	duk_memcpy((void *) u.b, (const void *) (*p), (size_t) 4);
-	u.x = DUK_NTOH32(u.x);
-	du.ui[DUK_DBL_IDX_UI0] = u.x;
-	duk_memcpy((void *) u.b, (const void *) (*p + 4), (size_t) 4);
-	u.x = DUK_NTOH32(u.x);
-	du.ui[DUK_DBL_IDX_UI1] = u.x;
-	*p += 8;
-
-	return du.d;
-}
-
-DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_u16_be(duk_uint8_t **p, duk_uint16_t val) {
-	union {
-		duk_uint8_t b[2];
-		duk_uint16_t x;
-	} u;
-
-	u.x = DUK_HTON16(val);
-	duk_memcpy((void *) (*p), (const void *) u.b, (size_t) 2);
-	*p += 2;
-}
-
-DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_u32_be(duk_uint8_t **p, duk_uint32_t val) {
-	union {
-		duk_uint8_t b[4];
-		duk_uint32_t x;
-	} u;
-
-	u.x = DUK_HTON32(val);
-	duk_memcpy((void *) (*p), (const void *) u.b, (size_t) 4);
-	*p += 4;
-}
-
-DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_double_be(duk_uint8_t **p, duk_double_t val) {
-	duk_double_union du;
-	union {
-		duk_uint8_t b[4];
-		duk_uint32_t x;
-	} u;
-
-	du.d = val;
-	u.x = du.ui[DUK_DBL_IDX_UI0];
-	u.x = DUK_HTON32(u.x);
-	duk_memcpy((void *) (*p), (const void *) u.b, (size_t) 4);
-	u.x = du.ui[DUK_DBL_IDX_UI1];
-	u.x = DUK_HTON32(u.x);
-	duk_memcpy((void *) (*p + 4), (const void *) u.b, (size_t) 4);
-	*p += 8;
+#if defined(DUK_USE_ASSERTIONS)
+DUK_INTERNAL void duk_bw_assert_valid(duk_hthread *thr, duk_bufwriter_ctx *bw_ctx) {
+	DUK_UNREF(thr);
+	DUK_ASSERT(bw_ctx != NULL);
+	DUK_ASSERT(bw_ctx->buf != NULL);
+	DUK_ASSERT((DUK_HBUFFER_DYNAMIC_GET_SIZE(bw_ctx->buf) == 0) ||
+	           (bw_ctx->p != NULL && bw_ctx->p_base != NULL && bw_ctx->p_limit != NULL && bw_ctx->p_limit >= bw_ctx->p_base &&
+	            bw_ctx->p >= bw_ctx->p_base && bw_ctx->p <= bw_ctx->p_limit));
 }
+#endif
 /*
  *  Cast helpers.
  *
@@ -96053,7 +100480,8 @@ DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_double_be(duk_uint8_t **p, duk
  * relying on fmin(), fmax(), or other intrinsics.  Out-of-range results are
  * not assumed by caller, but here value is clamped, NaN converts to minval.
  */
-#define DUK__DOUBLE_INT_CAST1(tname,minval,maxval)  do { \
+#define DUK__DOUBLE_INT_CAST1(tname, minval, maxval) \
+	do { \
 		if (DUK_LIKELY(x >= (duk_double_t) (minval))) { \
 			DUK_ASSERT(!DUK_ISNAN(x)); \
 			if (DUK_LIKELY(x <= (duk_double_t) (maxval))) { \
@@ -96074,19 +100502,22 @@ DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_double_be(duk_uint8_t **p, duk
  * argument is a NaN, return the second argument.  This avoids a
  * NaN-to-integer cast which is undefined behavior.
  */
-#define DUK__DOUBLE_INT_CAST2(tname,minval,maxval)  do { \
+#define DUK__DOUBLE_INT_CAST2(tname, minval, maxval) \
+	do { \
 		return (tname) duk_double_fmin(duk_double_fmax(x, (duk_double_t) (minval)), (duk_double_t) (maxval)); \
 	} while (0)
 
 /* Another solution which doesn't need C99+ behavior for fmin() and fmax(). */
-#define DUK__DOUBLE_INT_CAST3(tname,minval,maxval)  do { \
+#define DUK__DOUBLE_INT_CAST3(tname, minval, maxval) \
+	do { \
 		if (DUK_ISNAN(x)) { \
 			/* 0 or any other value is fine. */ \
 			return (tname) 0; \
 		} else \
 			return (tname) DUK_FMIN(DUK_FMAX(x, (duk_double_t) (minval)), (duk_double_t) (maxval)); \
-		} \
-	} while (0)
+	} \
+	} \
+	while (0)
 
 /* C99+ solution: relies on specific fmin() and fmax() behavior in C99: if
  * one argument is NaN but the other isn't, the non-NaN argument is returned.
@@ -96095,7 +100526,8 @@ DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_double_be(duk_uint8_t **p, duk
  * the fmin() and fmax() calls (unless one uses -ffast-math which we don't
  * support).
  */
-#define DUK__DOUBLE_INT_CAST4(tname,minval,maxval)  do { \
+#define DUK__DOUBLE_INT_CAST4(tname, minval, maxval) \
+	do { \
 		return (tname) DUK_FMIN(DUK_FMAX(x, (duk_double_t) (minval)), (duk_double_t) (maxval)); \
 	} while (0)
 
@@ -96139,12 +100571,12 @@ DUK_INTERNAL duk_uint32_t duk_double_to_uint32_t(duk_double_t x) {
  * infinity, at least on x64.  This number is one double unit below that
  * midpoint.  See misc/float_cast.c.
  */
-#define DUK__FLOAT_ROUND_LIMIT      340282356779733623858607532500980858880.0
+#define DUK__FLOAT_ROUND_LIMIT 340282356779733623858607532500980858880.0
 
 /* Maximum IEEE float.  Double-to-float conversion above this would be out of
  * range and thus technically undefined behavior.
  */
-#define DUK__FLOAT_MAX              340282346638528859811704183484516925440.0
+#define DUK__FLOAT_MAX 340282346638528859811704183484516925440.0
 
 DUK_INTERNAL duk_float_t duk_double_to_float_t(duk_double_t x) {
 	/* Even a double-to-float cast is technically undefined behavior if
@@ -96163,8 +100595,7 @@ DUK_INTERNAL duk_float_t duk_double_to_float_t(duk_double_t x) {
 	duk_double_t t;
 
 	t = DUK_FABS(x);
-	DUK_ASSERT((DUK_ISNAN(x) && DUK_ISNAN(t)) ||
-	           (!DUK_ISNAN(x) && !DUK_ISNAN(t)));
+	DUK_ASSERT((DUK_ISNAN(x) && DUK_ISNAN(t)) || (!DUK_ISNAN(x) && !DUK_ISNAN(t)));
 
 	if (DUK_LIKELY(t <= DUK__FLOAT_MAX)) {
 		/* Standard in-range case, try to get here with a minimum
@@ -96312,7 +100743,7 @@ DUK_INTERNAL duk_small_uint_t duk_double_signbit(duk_double_t x) {
 DUK_INTERNAL duk_double_t duk_double_trunc_towards_zero(duk_double_t x) {
 	/* XXX: optimize */
 	duk_small_uint_t s = duk_double_signbit(x);
-	x = DUK_FLOOR(DUK_FABS(x));  /* truncate towards zero */
+	x = DUK_FLOOR(DUK_FABS(x)); /* truncate towards zero */
 	if (s) {
 		x = -x;
 	}
@@ -96354,7 +100785,7 @@ DUK_INTERNAL duk_bool_t duk_double_is_integer(duk_double_t x) {
 	if (duk_double_is_nan_or_inf(x)) {
 		return 0;
 	} else {
-		return duk_js_tointeger_number(x) == x;
+		return duk_double_equals(duk_js_tointeger_number(x), x);
 	}
 }
 
@@ -96374,7 +100805,7 @@ DUK_INTERNAL duk_bool_t duk_is_whole_get_int32_nonegzero(duk_double_t x, duk_int
 	duk_int32_t t;
 
 	t = duk_double_to_int32_t(x);
-	if (!((duk_double_t) t == x)) {
+	if (!duk_double_equals((duk_double_t) t, x)) {
 		return 0;
 	}
 	if (t == 0) {
@@ -96395,7 +100826,7 @@ DUK_INTERNAL duk_bool_t duk_is_whole_get_int32(duk_double_t x, duk_int32_t *ival
 	duk_int32_t t;
 
 	t = duk_double_to_int32_t(x);
-	if (!((duk_double_t) t == x)) {
+	if (!duk_double_equals((duk_double_t) t, x)) {
 		return 0;
 	}
 	*ival = t;
@@ -96408,7 +100839,7 @@ DUK_INTERNAL duk_bool_t duk_is_whole_get_int32(duk_double_t x, duk_int32_t *ival
 
 DUK_INTERNAL DUK_INLINE duk_double_t duk_double_div(duk_double_t x, duk_double_t y) {
 #if !defined(DUK_USE_ALLOW_UNDEFINED_BEHAVIOR)
-	if (DUK_UNLIKELY(y == 0.0)) {
+	if (DUK_UNLIKELY(duk_double_equals(y, 0.0) != 0)) {
 		/* In C99+ division by zero is undefined behavior so
 		 * avoid it entirely.  Hopefully the compiler is
 		 * smart enough to avoid emitting any actual code
@@ -96436,6 +100867,115 @@ DUK_INTERNAL DUK_INLINE duk_double_t duk_double_div(duk_double_t x, duk_double_t
 
 	return x / y;
 }
+
+/* Double and float byteorder changes. */
+
+DUK_INTERNAL DUK_INLINE void duk_dblunion_host_to_little(duk_double_union *u) {
+#if defined(DUK_USE_DOUBLE_LE)
+	/* HGFEDCBA -> HGFEDCBA */
+	DUK_UNREF(u);
+#elif defined(DUK_USE_DOUBLE_ME)
+	duk_uint32_t a, b;
+
+	/* DCBAHGFE -> HGFEDCBA */
+	a = u->ui[0];
+	b = u->ui[1];
+	u->ui[0] = b;
+	u->ui[1] = a;
+#elif defined(DUK_USE_DOUBLE_BE)
+	/* ABCDEFGH -> HGFEDCBA */
+#if defined(DUK_USE_64BIT_OPS)
+	u->ull[0] = DUK_BSWAP64(u->ull[0]);
+#else
+	duk_uint32_t a, b;
+
+	a = u->ui[0];
+	b = u->ui[1];
+	u->ui[0] = DUK_BSWAP32(b);
+	u->ui[1] = DUK_BSWAP32(a);
+#endif
+#else
+#error internal error
+#endif
+}
+
+DUK_INTERNAL DUK_INLINE void duk_dblunion_little_to_host(duk_double_union *u) {
+	duk_dblunion_host_to_little(u);
+}
+
+DUK_INTERNAL DUK_INLINE void duk_dblunion_host_to_big(duk_double_union *u) {
+#if defined(DUK_USE_DOUBLE_LE)
+	/* HGFEDCBA -> ABCDEFGH */
+#if defined(DUK_USE_64BIT_OPS)
+	u->ull[0] = DUK_BSWAP64(u->ull[0]);
+#else
+	duk_uint32_t a, b;
+
+	a = u->ui[0];
+	b = u->ui[1];
+	u->ui[0] = DUK_BSWAP32(b);
+	u->ui[1] = DUK_BSWAP32(a);
+#endif
+#elif defined(DUK_USE_DOUBLE_ME)
+	duk_uint32_t a, b;
+
+	/* DCBAHGFE -> ABCDEFGH */
+	a = u->ui[0];
+	b = u->ui[1];
+	u->ui[0] = DUK_BSWAP32(a);
+	u->ui[1] = DUK_BSWAP32(b);
+#elif defined(DUK_USE_DOUBLE_BE)
+	/* ABCDEFGH -> ABCDEFGH */
+	DUK_UNREF(u);
+#else
+#error internal error
+#endif
+}
+
+DUK_INTERNAL DUK_INLINE void duk_dblunion_big_to_host(duk_double_union *u) {
+	duk_dblunion_host_to_big(u);
+}
+
+DUK_INTERNAL DUK_INLINE void duk_fltunion_host_to_big(duk_float_union *u) {
+#if defined(DUK_USE_DOUBLE_LE) || defined(DUK_USE_DOUBLE_ME)
+	/* DCBA -> ABCD */
+	u->ui[0] = DUK_BSWAP32(u->ui[0]);
+#elif defined(DUK_USE_DOUBLE_BE)
+	/* ABCD -> ABCD */
+	DUK_UNREF(u);
+#else
+#error internal error
+#endif
+}
+
+DUK_INTERNAL DUK_INLINE void duk_fltunion_big_to_host(duk_float_union *u) {
+	duk_fltunion_host_to_big(u);
+}
+
+/* Comparison: ensures comparison operates on exactly correct types, avoiding
+ * some floating point comparison pitfalls (e.g. atan2() assertions failed on
+ * -m32 with direct comparison, even with explicit casts).
+ */
+#if defined(DUK_USE_GCC_PRAGMAS)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#elif defined(DUK_USE_CLANG_PRAGMAS)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wfloat-equal"
+#endif
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_bool_t duk_double_equals(duk_double_t x, duk_double_t y) {
+	return x == y;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_bool_t duk_float_equals(duk_float_t x, duk_float_t y) {
+	return x == y;
+}
+#if defined(DUK_USE_GCC_PRAGMAS)
+#pragma GCC diagnostic pop
+#elif defined(DUK_USE_CLANG_PRAGMAS)
+#pragma clang diagnostic pop
+#endif
 /*
  *  Hash function duk_util_hashbytes().
  *
@@ -96449,8 +100989,8 @@ DUK_INTERNAL DUK_INLINE duk_double_t duk_double_div(duk_double_t x, duk_double_t
 
 #if defined(DUK_USE_STRHASH_DENSE)
 /* 'magic' constants for Murmurhash2 */
-#define DUK__MAGIC_M  ((duk_uint32_t) 0x5bd1e995UL)
-#define DUK__MAGIC_R  24
+#define DUK__MAGIC_M ((duk_uint32_t) 0x5bd1e995UL)
+#define DUK__MAGIC_R 24
 
 DUK_INTERNAL duk_uint32_t duk_util_hashbytes(const duk_uint8_t *data, duk_size_t len, duk_uint32_t seed) {
 	duk_uint32_t h = seed ^ ((duk_uint32_t) len);
@@ -96464,9 +101004,7 @@ DUK_INTERNAL duk_uint32_t duk_util_hashbytes(const duk_uint8_t *data, duk_size_t
 #if defined(DUK_USE_HASHBYTES_UNALIGNED_U32_ACCESS)
 		duk_uint32_t k = *((const duk_uint32_t *) (const void *) data);
 #else
-		duk_uint32_t k = ((duk_uint32_t) data[0]) |
-		                 (((duk_uint32_t) data[1]) << 8) |
-		                 (((duk_uint32_t) data[2]) << 16) |
+		duk_uint32_t k = ((duk_uint32_t) data[0]) | (((duk_uint32_t) data[1]) << 8) | (((duk_uint32_t) data[2]) << 16) |
 		                 (((duk_uint32_t) data[3]) << 24);
 #endif
 
@@ -96480,11 +101018,14 @@ DUK_INTERNAL duk_uint32_t duk_util_hashbytes(const duk_uint8_t *data, duk_size_t
 	}
 
 	switch (len) {
-	case 3: h ^= data[2] << 16;
-	case 2: h ^= data[1] << 8;
-	case 1: h ^= data[0];
-	        h *= DUK__MAGIC_M;
-        }
+	case 3:
+		h ^= data[2] << 16;
+	case 2:
+		h ^= data[1] << 8;
+	case 1:
+		h ^= data[0];
+		h *= DUK__MAGIC_M;
+	}
 
 	h ^= h >> 13;
 	h *= DUK__MAGIC_M;
@@ -96492,7 +101033,7 @@ DUK_INTERNAL duk_uint32_t duk_util_hashbytes(const duk_uint8_t *data, duk_size_t
 
 	return h;
 }
-#endif  /* DUK_USE_STRHASH_DENSE */
+#endif /* DUK_USE_STRHASH_DENSE */
 
 /* automatic undefs */
 #undef DUK__MAGIC_M
@@ -96515,7 +101056,7 @@ DUK_INTERNAL DUK_INLINE duk_small_int_t duk_memcmp(const void *s1, const void *s
 	DUK_ASSERT(s2 != NULL);
 	return DUK_MEMCMP(s1, s2, (size_t) len);
 }
-#else  /* DUK_USE_ALLOW_UNDEFINED_BEHAVIOR */
+#else /* DUK_USE_ALLOW_UNDEFINED_BEHAVIOR */
 DUK_INTERNAL DUK_INLINE duk_small_int_t duk_memcmp_unsafe(const void *s1, const void *s2, duk_size_t len) {
 	DUK_ASSERT(s1 != NULL || len == 0U);
 	DUK_ASSERT(s2 != NULL || len == 0U);
@@ -96532,7 +101073,7 @@ DUK_INTERNAL DUK_INLINE duk_small_int_t duk_memcmp(const void *s1, const void *s
 	DUK_ASSERT(s2 != NULL);
 	return DUK_MEMCMP(s1, s2, (size_t) len);
 }
-#endif  /* DUK_USE_ALLOW_UNDEFINED_BEHAVIOR */
+#endif /* DUK_USE_ALLOW_UNDEFINED_BEHAVIOR */
 /*
  *  A tiny random number generator used for Math.random() and other internals.
  *
@@ -96556,15 +101097,16 @@ DUK_INTERNAL DUK_INLINE duk_small_int_t duk_memcmp(const void *s1, const void *s
 #endif
 
 #if defined(DUK__RANDOM_SHAMIR3OP)
-#define DUK__UPDATE_RND(rnd) do { \
+#define DUK__UPDATE_RND(rnd) \
+	do { \
 		(rnd) += ((rnd) * (rnd)) | 0x05UL; \
-		(rnd) = ((rnd) & 0xffffffffUL);       /* if duk_uint32_t is exactly 32 bits, this is a NOP */ \
+		(rnd) = ((rnd) &0xffffffffUL); /* if duk_uint32_t is exactly 32 bits, this is a NOP */ \
 	} while (0)
 
-#define DUK__RND_BIT(rnd)  ((rnd) >> 31)  /* only use the highest bit */
+#define DUK__RND_BIT(rnd) ((rnd) >> 31) /* only use the highest bit */
 
 DUK_INTERNAL void duk_util_tinyrandom_prepare_seed(duk_hthread *thr) {
-	DUK_UNREF(thr);  /* Nothing now. */
+	DUK_UNREF(thr); /* Nothing now. */
 }
 
 DUK_INTERNAL duk_double_t duk_util_tinyrandom_get_double(duk_hthread *thr) {
@@ -96574,7 +101116,7 @@ DUK_INTERNAL duk_double_t duk_util_tinyrandom_get_double(duk_hthread *thr) {
 
 	rnd = thr->heap->rnd_state;
 
-	n = 53;  /* enough to cover the whole mantissa */
+	n = 53; /* enough to cover the whole mantissa */
 	t = 0.0;
 
 	do {
@@ -96590,7 +101132,7 @@ DUK_INTERNAL duk_double_t duk_util_tinyrandom_get_double(duk_hthread *thr) {
 
 	return t;
 }
-#endif  /* DUK__RANDOM_SHAMIR3OP */
+#endif /* DUK__RANDOM_SHAMIR3OP */
 
 #if defined(DUK__RANDOM_XOROSHIRO128PLUS)
 DUK_LOCAL DUK_ALWAYS_INLINE duk_uint64_t duk__rnd_splitmix64(duk_uint64_t *x) {
@@ -96629,9 +101171,9 @@ DUK_INTERNAL void duk_util_tinyrandom_prepare_seed(duk_hthread *thr) {
 	 * because current seed is Date.now()) result in different xoroshiro128+
 	 * seeds.
 	 */
-	x = thr->heap->rnd_state[0];  /* Only [0] is used as input here. */
+	x = thr->heap->rnd_state[0]; /* Only [0] is used as input here. */
 	for (i = 0; i < 64; i++) {
-		thr->heap->rnd_state[i & 0x01] = duk__rnd_splitmix64(&x);  /* Keep last 2 values. */
+		thr->heap->rnd_state[i & 0x01] = duk__rnd_splitmix64(&x); /* Keep last 2 values. */
 	}
 }
 
@@ -96655,9 +101197,9 @@ DUK_INTERNAL duk_double_t duk_util_tinyrandom_get_double(duk_hthread *thr) {
 #endif
 	return du.d - 1.0;
 }
-#endif  /* DUK__RANDOM_XOROSHIRO128PLUS */
+#endif /* DUK__RANDOM_XOROSHIRO128PLUS */
 
-#endif  /* !DUK_USE_GET_RANDOM_DOUBLE */
+#endif /* !DUK_USE_GET_RANDOM_DOUBLE */
 
 /* automatic undefs */
 #undef DUK__RANDOM_SHAMIR3OP
diff --git a/content/handlers/javascript/duktape/duktape.h b/content/handlers/javascript/duktape/duktape.h
index 43e2966c1..d3cba119e 100644
--- a/content/handlers/javascript/duktape/duktape.h
+++ b/content/handlers/javascript/duktape/duktape.h
@@ -1,5 +1,5 @@
 /*
- *  Duktape public API for Duktape 2.3.0.
+ *  Duktape public API for Duktape 2.7.0.
  *
  *  See the API reference for documentation on call semantics.  The exposed,
  *  supported API is between the "BEGIN PUBLIC API" and "END PUBLIC API"
@@ -21,7 +21,7 @@
  *  
  *  (http://opensource.org/licenses/MIT)
  *  
- *  Copyright (c) 2013-2018 by Duktape authors (see AUTHORS.rst)
+ *  Copyright (c) 2013-present by Duktape authors (see AUTHORS.rst)
  *  
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
@@ -100,6 +100,22 @@
  *  * Michal Kasperek (https://github.com/michalkas)
  *  * Andrew Janke (https://github.com/apjanke)
  *  * Steve Fan (https://github.com/stevefan1999)
+ *  * Edward Betts (https://github.com/edwardbetts)
+ *  * Ozhan Duz (https://github.com/webfolderio)
+ *  * Akos Kiss (https://github.com/akosthekiss)
+ *  * TheBrokenRail (https://github.com/TheBrokenRail)
+ *  * Jesse Doyle (https://github.com/jessedoyle)
+ *  * Gero Kuehn (https://github.com/dc6jgk)
+ *  * James Swift (https://github.com/phraemer)
+ *  * Luis de Bethencourt (https://github.com/luisbg)
+ *  * Ian Whyman (https://github.com/v00d00)
+ *  * Rick Sayre (https://github.com/whorfin)
+ *  * Craig Leres (https://github.com/leres)
+ *  * Maurici Abad (https://github.com/mauriciabad)
+ *  * Nancy Li (https://github.com/NancyLi1013)
+ *  * William Parks (https://github.com/WilliamParks)
+ *  * Sam Hellawell (https://github.com/samhellawell)
+ *  * Vladislavs Sokurenko (https://github.com/sokurenko)
  *  
  *  Other contributions
  *  ===================
@@ -140,6 +156,8 @@
  *  * Neil Kolban (https://github.com/nkolban)
  *  * Wilhelm Wanecek (https://github.com/wanecek)
  *  * Andrew Janke (https://github.com/apjanke)
+ *  * Unamer (https://github.com/unamer)
+ *  * Karl Dahlke (eklhad@gmail.com)
  *  
  *  If you are accidentally missing from this list, send me an e-mail
  *  (``sami.vaarala@iki.fi``) and I'll fix the omission.
@@ -164,7 +182,7 @@
  * development snapshots have 99 for patch level (e.g. 0.10.99 would be a
  * development version after 0.10.0 but before the next official release).
  */
-#define DUK_VERSION                       20300L
+#define DUK_VERSION                       20700L
 
 /* Git commit, describe, and branch for Duktape build.  Useful for
  * non-official snapshot builds so that application code can easily log
@@ -383,30 +401,35 @@ struct duk_time_components {
 #define DUK_DEFPROP_C                     DUK_DEFPROP_CONFIGURABLE
 #define DUK_DEFPROP_WE                    (DUK_DEFPROP_WRITABLE | DUK_DEFPROP_ENUMERABLE)
 #define DUK_DEFPROP_WC                    (DUK_DEFPROP_WRITABLE | DUK_DEFPROP_CONFIGURABLE)
+#define DUK_DEFPROP_EC                    (DUK_DEFPROP_ENUMERABLE | DUK_DEFPROP_CONFIGURABLE)
 #define DUK_DEFPROP_WEC                   (DUK_DEFPROP_WRITABLE | DUK_DEFPROP_ENUMERABLE | DUK_DEFPROP_CONFIGURABLE)
 #define DUK_DEFPROP_HAVE_W                DUK_DEFPROP_HAVE_WRITABLE
 #define DUK_DEFPROP_HAVE_E                DUK_DEFPROP_HAVE_ENUMERABLE
 #define DUK_DEFPROP_HAVE_C                DUK_DEFPROP_HAVE_CONFIGURABLE
 #define DUK_DEFPROP_HAVE_WE               (DUK_DEFPROP_HAVE_WRITABLE | DUK_DEFPROP_HAVE_ENUMERABLE)
 #define DUK_DEFPROP_HAVE_WC               (DUK_DEFPROP_HAVE_WRITABLE | DUK_DEFPROP_HAVE_CONFIGURABLE)
+#define DUK_DEFPROP_HAVE_EC               (DUK_DEFPROP_HAVE_ENUMERABLE | DUK_DEFPROP_HAVE_CONFIGURABLE)
 #define DUK_DEFPROP_HAVE_WEC              (DUK_DEFPROP_HAVE_WRITABLE | DUK_DEFPROP_HAVE_ENUMERABLE | DUK_DEFPROP_HAVE_CONFIGURABLE)
 #define DUK_DEFPROP_SET_W                 DUK_DEFPROP_SET_WRITABLE
 #define DUK_DEFPROP_SET_E                 DUK_DEFPROP_SET_ENUMERABLE
 #define DUK_DEFPROP_SET_C                 DUK_DEFPROP_SET_CONFIGURABLE
 #define DUK_DEFPROP_SET_WE                (DUK_DEFPROP_SET_WRITABLE | DUK_DEFPROP_SET_ENUMERABLE)
 #define DUK_DEFPROP_SET_WC                (DUK_DEFPROP_SET_WRITABLE | DUK_DEFPROP_SET_CONFIGURABLE)
+#define DUK_DEFPROP_SET_EC                (DUK_DEFPROP_SET_ENUMERABLE | DUK_DEFPROP_SET_CONFIGURABLE)
 #define DUK_DEFPROP_SET_WEC               (DUK_DEFPROP_SET_WRITABLE | DUK_DEFPROP_SET_ENUMERABLE | DUK_DEFPROP_SET_CONFIGURABLE)
 #define DUK_DEFPROP_CLEAR_W               DUK_DEFPROP_CLEAR_WRITABLE
 #define DUK_DEFPROP_CLEAR_E               DUK_DEFPROP_CLEAR_ENUMERABLE
 #define DUK_DEFPROP_CLEAR_C               DUK_DEFPROP_CLEAR_CONFIGURABLE
 #define DUK_DEFPROP_CLEAR_WE              (DUK_DEFPROP_CLEAR_WRITABLE | DUK_DEFPROP_CLEAR_ENUMERABLE)
 #define DUK_DEFPROP_CLEAR_WC              (DUK_DEFPROP_CLEAR_WRITABLE | DUK_DEFPROP_CLEAR_CONFIGURABLE)
+#define DUK_DEFPROP_CLEAR_EC              (DUK_DEFPROP_CLEAR_ENUMERABLE | DUK_DEFPROP_CLEAR_CONFIGURABLE)
 #define DUK_DEFPROP_CLEAR_WEC             (DUK_DEFPROP_CLEAR_WRITABLE | DUK_DEFPROP_CLEAR_ENUMERABLE | DUK_DEFPROP_CLEAR_CONFIGURABLE)
 #define DUK_DEFPROP_ATTR_W                (DUK_DEFPROP_HAVE_WEC | DUK_DEFPROP_W)
 #define DUK_DEFPROP_ATTR_E                (DUK_DEFPROP_HAVE_WEC | DUK_DEFPROP_E)
 #define DUK_DEFPROP_ATTR_C                (DUK_DEFPROP_HAVE_WEC | DUK_DEFPROP_C)
 #define DUK_DEFPROP_ATTR_WE               (DUK_DEFPROP_HAVE_WEC | DUK_DEFPROP_WE)
 #define DUK_DEFPROP_ATTR_WC               (DUK_DEFPROP_HAVE_WEC | DUK_DEFPROP_WC)
+#define DUK_DEFPROP_ATTR_EC               (DUK_DEFPROP_HAVE_WEC | DUK_DEFPROP_EC)
 #define DUK_DEFPROP_ATTR_WEC              (DUK_DEFPROP_HAVE_WEC | DUK_DEFPROP_WEC)
 
 /* Flags for duk_push_thread_raw() */
@@ -447,18 +470,24 @@ struct duk_time_components {
  *  Macros to create Symbols as C statically constructed strings.
  *
  *  Call e.g. as DUK_HIDDEN_SYMBOL("myProperty") <=> ("\xFF" "myProperty").
+ *
  *  Local symbols have a unique suffix, caller should take care to avoid
  *  conflicting with the Duktape internal representation by e.g. prepending
  *  a '!' character: DUK_LOCAL_SYMBOL("myLocal", "!123").
  *
  *  Note that these can only be used for string constants, not dynamically
  *  created strings.
+ *
+ *  You shouldn't normally use DUK_INTERNAL_SYMBOL() at all.  It is reserved
+ *  for Duktape internal symbols only.  There are no versioning guarantees
+ *  for internal symbols.
  */
 
 #define DUK_HIDDEN_SYMBOL(x)     ("\xFF" x)
 #define DUK_GLOBAL_SYMBOL(x)     ("\x80" x)
 #define DUK_LOCAL_SYMBOL(x,uniq) ("\x81" x "\xff" uniq)
 #define DUK_WELLKNOWN_SYMBOL(x)  ("\x81" x "\xff")
+#define DUK_INTERNAL_SYMBOL(x)   ("\x82" x)
 
 /*
  *  If no variadic macros, __FILE__ and __LINE__ are passed through globals
@@ -644,6 +673,7 @@ DUK_EXTERNAL_DECL void duk_swap_top(duk_context *ctx, duk_idx_t idx);
 DUK_EXTERNAL_DECL void duk_dup(duk_context *ctx, duk_idx_t from_idx);
 DUK_EXTERNAL_DECL void duk_dup_top(duk_context *ctx);
 DUK_EXTERNAL_DECL void duk_insert(duk_context *ctx, duk_idx_t to_idx);
+DUK_EXTERNAL_DECL void duk_pull(duk_context *ctx, duk_idx_t from_idx);
 DUK_EXTERNAL_DECL void duk_replace(duk_context *ctx, duk_idx_t to_idx);
 DUK_EXTERNAL_DECL void duk_copy(duk_context *ctx, duk_idx_t from_idx, duk_idx_t to_idx);
 DUK_EXTERNAL_DECL void duk_remove(duk_context *ctx, duk_idx_t idx);
@@ -703,6 +733,7 @@ DUK_EXTERNAL_DECL void duk_push_thread_stash(duk_context *ctx, duk_context *targ
 DUK_EXTERNAL_DECL duk_idx_t duk_push_object(duk_context *ctx);
 DUK_EXTERNAL_DECL duk_idx_t duk_push_bare_object(duk_context *ctx);
 DUK_EXTERNAL_DECL duk_idx_t duk_push_array(duk_context *ctx);
+DUK_EXTERNAL_DECL duk_idx_t duk_push_bare_array(duk_context *ctx);
 DUK_EXTERNAL_DECL duk_idx_t duk_push_c_function(duk_context *ctx, duk_c_function func, duk_idx_t nargs);
 DUK_EXTERNAL_DECL duk_idx_t duk_push_c_lightfunc(duk_context *ctx, duk_c_function func, duk_idx_t nargs, duk_idx_t length, duk_int_t magic);
 DUK_EXTERNAL_DECL duk_idx_t duk_push_thread_raw(duk_context *ctx, duk_uint_t flags);
@@ -937,6 +968,8 @@ DUK_EXTERNAL_DECL duk_context *duk_require_context(duk_context *ctx, duk_idx_t i
 DUK_EXTERNAL_DECL void duk_require_function(duk_context *ctx, duk_idx_t idx);
 #define duk_require_callable(ctx,idx) \
 	duk_require_function((ctx), (idx))
+DUK_EXTERNAL_DECL void duk_require_constructor_call(duk_context *ctx);
+DUK_EXTERNAL_DECL void duk_require_constructable(duk_context *ctx, duk_idx_t idx);
 DUK_EXTERNAL_DECL void *duk_require_heapptr(duk_context *ctx, duk_idx_t idx);
 
 /* Symbols are object coercible and covered by DUK_TYPE_MASK_STRING. */
@@ -986,6 +1019,8 @@ DUK_EXTERNAL_DECL void duk_to_primitive(duk_context *ctx, duk_idx_t idx, duk_int
 
 /* safe variants of a few coercion operations */
 DUK_EXTERNAL_DECL const char *duk_safe_to_lstring(duk_context *ctx, duk_idx_t idx, duk_size_t *out_len);
+DUK_EXTERNAL_DECL const char *duk_to_stacktrace(duk_context *ctx, duk_idx_t idx);
+DUK_EXTERNAL_DECL const char *duk_safe_to_stacktrace(duk_context *ctx, duk_idx_t idx);
 #define duk_safe_to_string(ctx,idx) \
 	duk_safe_to_lstring((ctx), (idx), NULL)
 
@@ -1010,6 +1045,8 @@ DUK_EXTERNAL_DECL const char *duk_hex_encode(duk_context *ctx, duk_idx_t idx);
 DUK_EXTERNAL_DECL void duk_hex_decode(duk_context *ctx, duk_idx_t idx);
 DUK_EXTERNAL_DECL const char *duk_json_encode(duk_context *ctx, duk_idx_t idx);
 DUK_EXTERNAL_DECL void duk_json_decode(duk_context *ctx, duk_idx_t idx);
+DUK_EXTERNAL_DECL void duk_cbor_encode(duk_context *ctx, duk_idx_t idx, duk_uint_t encode_flags);
+DUK_EXTERNAL_DECL void duk_cbor_decode(duk_context *ctx, duk_idx_t idx, duk_uint_t decode_flags);
 
 DUK_EXTERNAL_DECL const char *duk_buffer_to_string(duk_context *ctx, duk_idx_t idx);
 
diff --git a/content/handlers/javascript/duktape/generics.js b/content/handlers/javascript/duktape/generics.js
index 6850c9b7d..e6e952a46 100644
--- a/content/handlers/javascript/duktape/generics.js
+++ b/content/handlers/javascript/duktape/generics.js
@@ -27,6 +27,29 @@ var NetSurf = {
 	    },
 	});
     },
+    /* The make-proxy call for nodemap-type objects */
+    makeNodeMapProxy: function(inner) {
+	return new Proxy(inner, {
+	    has: function(target, key) {
+		if (typeof key == 'number') {
+		    return (key >= 0) && (key < target.length);
+		} else {
+		    return target.getNamedItem(key) || (key in target);
+		}
+	    },
+	    get: function(target, key) {
+		if (typeof key == 'number') {
+		    return target.item(key);
+		} else {
+		    var attr = target.getNamedItem(key);
+		    if (attr) {
+			return attr;
+		    }
+		    return target[key];
+		}
+	    },
+	});
+    },
     consoleFormatter: function Formatter() {
 
 	if (arguments.length == 0) {
@@ -44,7 +67,7 @@ var NetSurf = {
 
 	const offset = target.search("%");
 
-	if (offset == -1 || offset >= target.length) {
+	if (offset == -1 || offset >= (target.length - 1)) {
 	    // We've a string, but the % either doesn't exist or is
 	    // at the end of it, so give up
 	    return Array.from(arguments);
diff --git a/content/handlers/javascript/duktape/netsurf.bnd b/content/handlers/javascript/duktape/netsurf.bnd
index 2a56cccb5..483f3471f 100644
--- a/content/handlers/javascript/duktape/netsurf.bnd
+++ b/content/handlers/javascript/duktape/netsurf.bnd
@@ -60,14 +60,19 @@ struct dom_html_br_element;
 #include "Document.bnd"
 #include "Node.bnd"
 #include "NodeList.bnd"
+#include "DOMTokenList.bnd"
+#include "DOMSettableTokenList.bnd"
+#include "NamedNodeMap.bnd"
 #include "Element.bnd"
 #include "HTMLCollection.bnd"
 #include "Location.bnd"
 #include "Navigator.bnd"
+#include "DOMImplementation.bnd"
 
 /* events */
 
 #include "Event.bnd"
+#include "KeyboardEvent.bnd"
 
 init MutationEvent(struct dom_mutation_event *evt::evt);
 init UIEvent(struct dom_ui_event *evt::evt);
@@ -76,7 +81,6 @@ init MutationNameEvent(struct dom_mutation_name_event *evt::evt);
 init MouseWheelEvent(struct dom_mouse_wheel_event *evt::evt);
 init MouseMultiWheelEvent(struct dom_mouse_multi_wheel_event *evt::evt);
 init MouseEvent(struct dom_mouse_event *evt::evt);
-init KeyboardEvent(struct dom_keyboard_event *evt::evt);
 init DocumentEvent(struct dom_document_event *evt::evt);
 init CustomEvent(struct dom_custom_event *evt::evt);
 init CompositionEvent(struct dom_ui_event *evt::evt);
@@ -107,6 +111,7 @@ init TrackEvent(struct dom_event *evt::evt);
 #include "HTMLBodyElement.bnd"
 #include "HTMLButtonElement.bnd"
 #include "HTMLBRElement.bnd"
+#include "HTMLCanvasElement.bnd"
 #include "HTMLDivElement.bnd"
 #include "HTMLFontElement.bnd"
 #include "HTMLFormElement.bnd"
@@ -147,7 +152,6 @@ init TrackEvent(struct dom_event *evt::evt);
 
 init HTMLUnknownElement(struct dom_html_element *html_unknown_element::html_element);
 init HTMLDirectoryElement(struct dom_html_element *html_directory_element::html_element);
-init HTMLCanvasElement(struct dom_html_element *html_canvas_element::html_element);
 init HTMLTemplateElement(struct dom_html_element *html_template_element::html_element);
 init HTMLDialogElement(struct dom_html_element *html_dialog_element::html_element);
 init HTMLMenuItemElement(struct dom_html_element *html_menu_item_element::html_element);
@@ -198,4 +202,12 @@ init HTMLFormControlsCollection(struct dom_html_collection *coll);
 init HTMLOptionsCollection(struct dom_html_collection *coll);
 init HTMLPropertiesCollection(struct dom_html_collection *coll);
 
+/* Stuff to do with canvasses */
 
+#include "CanvasRenderingContext2D.bnd"
+#include "ImageData.bnd"
+
+/* CSS Object model */
+
+#include "CSSRule.bnd"
+#include "CSSStyleSheet.bnd"
diff --git a/content/handlers/javascript/duktape/polyfill.js b/content/handlers/javascript/duktape/polyfill.js
new file mode 100644
index 000000000..6c85ce1a0
--- /dev/null
+++ b/content/handlers/javascript/duktape/polyfill.js
@@ -0,0 +1,103 @@
+/* Polyfiller for Duktape for NetSurf
+ *
+ * This JavaScript will be loaded into heaps before the generics
+ *
+ * We only care for the side-effects of this, be careful.
+ */
+
+// Production steps of ECMA-262, Edition 6, 22.1.2.1
+if (!Array.from) {
+  Array.from = (function () {
+    var toStr = Object.prototype.toString;
+    var isCallable = function (fn) {
+      return typeof fn === 'function' || toStr.call(fn) === '[object Function]';
+    };
+    var toInteger = function (value) {
+      var number = Number(value);
+      if (isNaN(number)) { return 0; }
+      if (number === 0 || !isFinite(number)) { return number; }
+      return (number > 0 ? 1 : -1) * Math.floor(Math.abs(number));
+    };
+    var maxSafeInteger = Math.pow(2, 53) - 1;
+    var toLength = function (value) {
+      var len = toInteger(value);
+      return Math.min(Math.max(len, 0), maxSafeInteger);
+    };
+
+    // The length property of the from method is 1.
+    return function from(arrayLike/*, mapFn, thisArg */) {
+      // 1. Let C be the this value.
+      var C = this;
+
+      // 2. Let items be ToObject(arrayLike).
+      var items = Object(arrayLike);
+
+      // 3. ReturnIfAbrupt(items).
+      if (arrayLike == null) {
+        throw new TypeError('Array.from requires an array-like object - not null or undefined');
+      }
+
+      // 4. If mapfn is undefined, then let mapping be false.
+      var mapFn = arguments.length > 1 ? arguments[1] : void undefined;
+      var T;
+      if (typeof mapFn !== 'undefined') {
+        // 5. else
+        // 5. a If IsCallable(mapfn) is false, throw a TypeError exception.
+        if (!isCallable(mapFn)) {
+          throw new TypeError('Array.from: when provided, the second argument must be a function');
+        }
+
+        // 5. b. If thisArg was supplied, let T be thisArg; else let T be undefined.
+        if (arguments.length > 2) {
+          T = arguments[2];
+        }
+      }
+
+      // 10. Let lenValue be Get(items, "length").
+      // 11. Let len be ToLength(lenValue).
+      var len = toLength(items.length);
+
+      // 13. If IsConstructor(C) is true, then
+      // 13. a. Let A be the result of calling the [[Construct]] internal method 
+      // of C with an argument list containing the single item len.
+      // 14. a. Else, Let A be ArrayCreate(len).
+      var A = isCallable(C) ? Object(new C(len)) : new Array(len);
+
+      // 16. Let k be 0.
+      var k = 0;
+      // 17. Repeat, while k < len… (also steps a - h)
+      var kValue;
+      while (k < len) {
+        kValue = items[k];
+        if (mapFn) {
+          A[k] = typeof T === 'undefined' ? mapFn(kValue, k) : mapFn.call(T, kValue, k);
+        } else {
+          A[k] = kValue;
+        }
+        k += 1;
+      }
+      // 18. Let putStatus be Put(A, "length", len, true).
+      A.length = len;
+      // 20. Return A.
+      return A;
+    };
+  }());
+}
+
+// DOMTokenList formatter, in theory we can remove this if we do the stringifier IDL support
+
+DOMTokenList.prototype.toString = function () {
+  if (this.length == 0) {
+    return "";
+  }
+
+  var ret = this.item(0);
+  for (var index = 1; index < this.length; index++) {
+    ret = ret + " " + this.item(index);
+  }
+
+  return ret;
+}
+
+// Inherit the same toString for settable lists
+DOMSettableTokenList.prototype.toString = DOMTokenList.prototype.toString;
\ No newline at end of file
diff --git a/content/handlers/javascript/js.h b/content/handlers/javascript/js.h
index 31ab8f766..55f8e22ef 100644
--- a/content/handlers/javascript/js.h
+++ b/content/handlers/javascript/js.h
@@ -20,61 +20,121 @@
  * Interface to javascript engine functions.
  */
 
-#ifndef _NETSURF_JAVASCRIPT_JS_H_
-#define _NETSURF_JAVASCRIPT_JS_H_
+#ifndef NETSURF_JAVASCRIPT_JS_H_
+#define NETSURF_JAVASCRIPT_JS_H_
 
 #include "utils/errors.h"
 
-
-typedef struct jscontext jscontext;
-typedef struct jsobject jsobject;
-
-typedef bool(jscallback)(void *ctx);
-
 struct dom_event;
 struct dom_document;
 struct dom_node;
 struct dom_element;
 struct dom_string;
 
-/** Initialise javascript interpreter */
+/**
+ * JavaScript interpreter heap
+ *
+ * In order to try and be moderately performant, we create a heap
+ * per browser window.  This heap is shared by all browsing contexts
+ * we end up creating in that window.
+ */
+typedef struct jsheap jsheap;
+
+/**
+ * JavaScript interpreter thread
+ *
+ * When we create a browsing context itself (window+content) we have
+ * to create a JS thread to attach to the browsing context.
+ *
+ * JS threads are associated with heaps and will be destroyed when
+ * the heap is destroyed.  They can be shut down manually though
+ * and should be for object lifetime safety reasons.
+ */
+typedef struct jsthread jsthread;
+
+/**
+ * Initialise javascript interpreter
+ */
 void js_initialise(void);
 
-/** finalise javascript interpreter */
+/**
+ * finalise javascript interpreter
+ */
 void js_finalise(void);
 
-/** Create a new javascript context.
+/**
+ * Create a new javascript heap.
  *
- * There is usually one context per browser context
+ * There is usually one heap per browser window.
  *
- * \param timeout elapsed wallclock time (in seconds)  before \a callback is called
- * \param cb the callback when the runtime exceeds the timeout
- * \param cbctx The context to pass to the callback
- * \param jsctx Updated to the created JS context
+ * \param timeout elapsed wallclock time (in seconds) before \a callback is called
+ * \param heap Updated to the created JS heap
  * \return NSERROR_OK on success, appropriate error otherwise.
  */
-nserror js_newcontext(int timeout, jscallback *cb, void *cbctx,
-		jscontext **jsctx);
+nserror js_newheap(int timeout, jsheap **heap);
 
-/** Destroy a previously created context */
-void js_destroycontext(jscontext *ctx);
+/**
+ * Destroy a previously created heap.
+ *
+ * \param heap The heap to destroy
+ */
+void js_destroyheap(jsheap *heap);
 
-/** Create a new javascript compartment
+/**
+ * Create a new javascript thread
  *
  * This is called once for a page with javascript script tags on
- * it. It constructs a fresh global window object.
+ * it. It constructs a fresh global window object and prepares the JS
+ * browsing context.  It's important that threads are shut down cleanly
+ * when the browsing context is going to be cleaned up.
+ *
+ * \param heap The heap to create the thread within
+ * \param win_priv The value to give to the Window constructor as the window
+ * \param doc_priv The value to give to the Document constructor as the document
+ * \param thread Updated to the created thread
+ * \return NSERROR_OK on success, appropriate error otherwise
+ */
+nserror js_newthread(jsheap *heap, void *win_priv, void *doc_priv, jsthread **thread);
+
+/**
+ * Close a javascript thread
+ *
+ * This should be called when the HTML content which owns the thread is
+ * being closed.  This is a separate process from destroying the thread
+ * and merely disconnects any callbacks and thus hopefully stops
+ * additional JS things from triggering.  If any code runs and attempts to
+ * register callbacks after closedown, they will fail.
+ *
+ * \param thread The thread to close down
+ * \return NSERROR_OK on success, appropriate error otherwise
  */
-jsobject *js_newcompartment(jscontext *ctx, void *win_priv, void *doc_priv);
+nserror js_closethread(jsthread *thread);
 
-/* execute some javascript in a context */
-bool js_exec(jscontext *ctx, const uint8_t *txt, size_t txtlen, const char *name);
+/**
+ * Destroy a javascript thread
+ *
+ * This should be called when the browsing context is done with the thread.
+ *
+ * This will be called when the HTML content associated with the browsing
+ * context is being destroyed.  The thread should have already been closed
+ * down during the HTML content close.
+ *
+ * \param thread The thread to be destroyed
+ */
+void js_destroythread(jsthread *thread);
 
+/**
+ * execute some javascript in a context
+ */
+bool js_exec(jsthread *thread, const uint8_t *txt, size_t txtlen, const char *name);
 
-/* fire an event at a dom node */
-bool js_fire_event(jscontext *ctx, const char *type, struct dom_document *doc, struct dom_node *target);
+/**
+ * fire an event at a dom node
+ */
+bool js_fire_event(jsthread *thread, const char *type, struct dom_document *doc, struct dom_node *target);
 
 bool
-js_dom_event_add_listener(jscontext *ctx,
+js_dom_event_add_listener(jsthread *thread,
 			  struct dom_document *document,
 			  struct dom_node *node,
 			  struct dom_string *event_type_dom,
@@ -82,21 +142,23 @@ js_dom_event_add_listener(jscontext *ctx,
 
 /*** New Events ***/
 
-/** Handle a new element being created.
+/**
+ * Handle a new element being created.
  *
  * This is called once an element is inserted into the DOM document handled
  * by the context provided.  The JS implementation must then scan the element
  * for on* attributes and register appropriate listeners for those handlers.
  */
-void js_handle_new_element(jscontext *ctx, struct dom_element *node);
+void js_handle_new_element(jsthread *thread, struct dom_element *node);
 
-/** Handle an event propagation finished callback.
+/**
+ * Handle an event propagation finished callback.
  *
  * This is called once an event finishes propagating, no matter how it
  * finishes.  The intent here is that the JS context can perform any cleanups
  * it may need to perform before the DOM finishes and the event may end up
  * freed.
  */
-void js_event_cleanup(jscontext *ctx, struct dom_event *evt);
+void js_event_cleanup(jsthread *thread, struct dom_event *evt);
 
-#endif /* _NETSURF_JAVASCRIPT_JS_H_ */
+#endif /* NETSURF_JAVASCRIPT_JS_H_ */
diff --git a/content/handlers/javascript/none/none.c b/content/handlers/javascript/none/none.c
index 80a9ce49c..12dbc9a02 100644
--- a/content/handlers/javascript/none/none.c
+++ b/content/handlers/javascript/none/none.c
@@ -20,6 +20,7 @@
  * Dummy implementation of javascript engine functions.
  */
 
+#include "utils/errors.h"
 #include "content/content.h"
 #include "utils/nsoption.h"
 
@@ -35,36 +36,45 @@ void js_finalise(void)
 {
 }
 
-nserror js_newcontext(int timeout, jscallback *cb, void *cbctx,
-		jscontext **jsctx)
+nserror js_newheap(int timeout, jsheap **heap)
 {
-	*jsctx = NULL;
+	*heap = NULL;
 	return NSERROR_OK;
 }
 
-void js_destroycontext(jscontext *ctx)
+void js_destroyheap(jsheap *heap)
 {
 }
 
-jsobject *js_newcompartment(jscontext *ctx, void *win_priv, void *doc_priv)
+nserror js_newthread(jsheap *heap, void *win_priv, void *doc_priv, jsthread **thread)
 {
-	return NULL;
+	*thread = NULL;
+	return NSERROR_NOT_IMPLEMENTED;
 }
 
-bool js_exec(jscontext *ctx, const uint8_t *txt, size_t txtlen, const char *name)
+nserror js_closethread(jsthread *thread)
+{
+	return NSERROR_OK;
+}
+
+void js_destroythread(jsthread *thread)
+{
+}
+
+bool js_exec(jsthread *thread, const uint8_t *txt, size_t txtlen, const char *name)
 {
 	return true;
 }
 
-bool js_fire_event(jscontext *ctx, const char *type, struct dom_document *doc, struct dom_node *target)
+bool js_fire_event(jsthread *thread, const char *type, struct dom_document *doc, struct dom_node *target)
 {
 	return true;
 }
 
-void js_handle_new_element(jscontext *ctx, struct dom_element *node)
+void js_handle_new_element(jsthread *thread, struct dom_element *node)
 {
 }
 
-void js_event_cleanup(jscontext *ctx, struct dom_event *evt)
+void js_event_cleanup(jsthread *thread, struct dom_event *evt)
 {
 }
diff --git a/content/handlers/text/textplain.c b/content/handlers/text/textplain.c
index 9e9e3e9e0..cee89a1a5 100644
--- a/content/handlers/text/textplain.c
+++ b/content/handlers/text/textplain.c
@@ -23,36 +23,30 @@
  * plain text content handling implementation.
  */
 
-#include <assert.h>
-#include <errno.h>
-#include <stddef.h>
 #include <string.h>
-#include <strings.h>
-#include <math.h>
-
 #include <parserutils/input/inputstream.h>
-#include <parserutils/charset/utf8.h>
 
+#include "utils/errors.h"
 #include "utils/corestrings.h"
 #include "utils/http.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/utf8.h"
+#include "utils/nsoption.h"
 #include "netsurf/content.h"
 #include "netsurf/keypress.h"
 #include "netsurf/browser_window.h"
 #include "netsurf/plotters.h"
 #include "netsurf/layout.h"
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 #include "content/hlcache.h"
-#include "css/utils.h"
-#include "utils/nsoption.h"
-#include "desktop/search.h"
+#include "content/textsearch.h"
+#include "content/handlers/css/utils.h"
 #include "desktop/selection.h"
 #include "desktop/gui_internal.h"
 
-#include "html/search.h"
 #include "text/textplain.h"
 
 struct textplain_line {
@@ -60,6 +54,9 @@ struct textplain_line {
 	size_t	length;
 };
 
+/**
+ * plain text content
+ */
 typedef struct textplain_content {
 	struct content base;
 
@@ -73,12 +70,8 @@ typedef struct textplain_content {
 	int formatted_width;
 	struct browser_window *bw;
 
-	struct selection sel;	/** Selection state */
+	struct selection *sel; /** Selection state */
 
-	/** Context for free text search, or NULL if none */
-	struct search_context *search;
-	/** Current search string, or NULL if none */
-	char *search_string;
 } textplain_content;
 
 
@@ -176,13 +169,12 @@ textplain_create_internal(textplain_content *c, lwc_string *encoding)
 	c->physical_line_count = 0;
 	c->formatted_width = 0;
 	c->bw = NULL;
-
-	selection_prepare(&c->sel, (struct content *)c, false);
+	c->sel = selection_create((struct content *)c);
 
 	return NSERROR_OK;
 
 no_memory:
-	content_broadcast_errorcode(&c->base, NSERROR_NOMEM);
+	content_broadcast_error(&c->base, NSERROR_NOMEM, NULL);
 
 	return NSERROR_NOMEM;
 }
@@ -194,7 +186,7 @@ no_memory:
 static nserror
 textplain_create(const content_handler *handler,
 		 lwc_string *imime_type,
-		 const http_parameter *params,
+		 const struct http_parameter *params,
 		 llcache_handle *llcache,
 		 const char *fallback_charset,
 		 bool quirks,
@@ -272,7 +264,7 @@ textplain_drain_input(textplain_content *c,
 		      parserutils_inputstream *stream,
 		      parserutils_error terminator)
 {
-	static const uint8_t *u_fffd = (const uint8_t *) "\xef\xbf\xfd";
+	static const uint8_t *u_fffd = (const uint8_t *) "\xef\xbf\xbd";
 	const uint8_t *ch;
 	size_t chlen, offset = 0;
 
@@ -357,7 +349,7 @@ textplain_process_data(struct content *c, const char *data, unsigned int size)
 	return true;
 
 no_memory:
-	content_broadcast_errorcode(c, NSERROR_NOMEM);
+	content_broadcast_error(c, NSERROR_NOMEM, NULL);
 	return false;
 }
 
@@ -546,6 +538,10 @@ static void textplain_destroy(struct content *c)
 	if (text->utf8_data != NULL) {
 		free(text->utf8_data);
 	}
+
+	if (text->sel != NULL) {
+		selection_destroy(text->sel);
+	}
 }
 
 
@@ -603,6 +599,94 @@ static content_type textplain_content_type(void)
 
 
 /**
+ * Return byte offset within UTF8 textplain content.
+ *
+ * given the co-ordinates of a point within a textplain content. 'dir'
+ * specifies the direction in which to search (-1 = above-left, +1 =
+ * below-right) if the co-ordinates are not contained within a line.
+ *
+ * \param[in] c   content of type CONTENT_TEXTPLAIN
+ * \param[in] x   x ordinate of point
+ * \param[in] y   y ordinate of point
+ * \param[in] dir direction of search if not within line
+ * \return byte offset of character containing (or nearest to) point
+ */
+static size_t
+textplain_offset_from_coords(struct content *c, int x, int y, int dir)
+{
+	textplain_content *textc = (textplain_content *) c;
+	float line_height = textplain_line_height();
+	struct textplain_line *line;
+	const char *text;
+	unsigned nlines;
+	size_t length;
+	int idx;
+
+	assert(c != NULL);
+
+	y = (int)((float)(y - MARGIN) / line_height);
+	x -= MARGIN;
+
+	nlines = textc->physical_line_count;
+	if (!nlines)
+		return 0;
+
+	if (y <= 0) y = 0;
+	else if ((unsigned)y >= nlines)
+		y = nlines - 1;
+
+	line = &textc->physical_line[y];
+	text = textc->utf8_data + line->start;
+	length = line->length;
+	idx = 0;
+
+	while (x > 0) {
+		size_t next_offset = 0;
+		int width = INT_MAX;
+
+		while (next_offset < length && text[next_offset] != '\t') {
+			next_offset = utf8_next(text, length, next_offset);
+		}
+
+		if (next_offset < length) {
+			guit->layout->width(&textplain_style,
+					    text,
+					    next_offset,
+					    &width);
+		}
+
+		if (x <= width) {
+			int pixel_offset;
+			size_t char_offset;
+
+			guit->layout->position(&textplain_style,
+					       text, next_offset, x,
+					       &char_offset, &pixel_offset);
+
+			idx += char_offset;
+			break;
+		}
+
+		x -= width;
+		length -= next_offset;
+		text += next_offset;
+		idx += next_offset;
+
+		/* check if it's within the tab */
+		width = textplain_tab_width - (width % textplain_tab_width);
+		if (x <= width) break;
+
+		x -= width;
+		length--;
+		text++;
+		idx++;
+	}
+
+	return line->start + idx;
+}
+
+
+/**
  * Handle mouse clicks and movements in a TEXTPLAIN content window.
  *
  * \param c	  content of type textplain
@@ -611,7 +695,7 @@ static content_type textplain_content_type(void)
  * \param x	  coordinate of mouse
  * \param y	  coordinate of mouse
  */
-static void
+static nserror
 textplain_mouse_action(struct content *c,
 		       struct browser_window *bw,
 		       browser_mouse_state mouse,
@@ -627,9 +711,9 @@ textplain_mouse_action(struct content *c,
 	browser_window_set_drag_type(bw, DRAGGING_NONE, NULL);
 
 	idx = textplain_offset_from_coords(c, x, y, dir);
-	if (selection_click(&text->sel, mouse, idx)) {
+	if (selection_click(text->sel, text->bw, mouse, idx)) {
 
-		if (selection_dragging(&text->sel)) {
+		if (selection_dragging(text->sel)) {
 			browser_window_set_drag_type(bw,
 						     DRAGGING_SELECTION, NULL);
 			status = messages_get("Selecting");
@@ -647,6 +731,8 @@ textplain_mouse_action(struct content *c,
 
 	msg_data.pointer = pointer;
 	content_broadcast(c, CONTENT_MSG_POINTER, &msg_data);
+
+	return NSERROR_OK;
 }
 
 
@@ -659,7 +745,7 @@ textplain_mouse_action(struct content *c,
  * \param  x	  coordinate of mouse
  * \param  y	  coordinate of mouse
  */
-static void
+static nserror
 textplain_mouse_track(struct content *c,
 		      struct browser_window *bw,
 		      browser_mouse_state mouse,
@@ -671,11 +757,11 @@ textplain_mouse_track(struct content *c,
 		int dir = -1;
 		size_t idx;
 
-		if (selection_dragging_start(&text->sel))
+		if (selection_dragging_start(text->sel))
 			dir = 1;
 
 		idx = textplain_offset_from_coords(c, x, y, dir);
-		selection_track(&text->sel, mouse, idx);
+		selection_track(text->sel, mouse, idx);
 
 		browser_window_set_drag_type(bw, DRAGGING_NONE, NULL);
 	}
@@ -686,10 +772,10 @@ textplain_mouse_track(struct content *c,
 		int dir = -1;
 		size_t idx;
 
-		if (selection_dragging_start(&text->sel)) dir = 1;
+		if (selection_dragging_start(text->sel)) dir = 1;
 
 		idx = textplain_offset_from_coords(c, x, y, dir);
-		selection_track(&text->sel, mouse, idx);
+		selection_track(text->sel, mouse, idx);
 	}
 		break;
 
@@ -697,6 +783,8 @@ textplain_mouse_track(struct content *c,
 		textplain_mouse_action(c, bw, mouse, x, y);
 		break;
 	}
+
+	return NSERROR_OK;
 }
 
 
@@ -710,7 +798,7 @@ textplain_mouse_track(struct content *c,
 static bool textplain_keypress(struct content *c, uint32_t key)
 {
 	textplain_content *text = (textplain_content *) c;
-	struct selection *sel = &text->sel;
+	struct selection *sel = text->sel;
 
 	switch (key) {
 	case NS_KEY_COPY_SELECTION:
@@ -726,13 +814,8 @@ static bool textplain_keypress(struct content *c, uint32_t key)
 		return true;
 
 	case NS_KEY_ESCAPE:
-		if (selection_defined(sel)) {
-			selection_clear(sel, true);
-			return true;
-		}
-
 		/* if there's no selection, leave Escape for the caller */
-		return false;
+		return selection_clear(sel, true);
 	}
 
 	return false;
@@ -740,78 +823,6 @@ static bool textplain_keypress(struct content *c, uint32_t key)
 
 
 /**
- * Terminate a search.
- *
- * \param c content of type text
- */
-static void textplain_search_clear(struct content *c)
-{
-	textplain_content *text = (textplain_content *) c;
-
-	assert(c != NULL);
-
-	free(text->search_string);
-	text->search_string = NULL;
-
-	if (text->search != NULL) {
-		search_destroy_context(text->search);
-	}
-	text->search = NULL;
-}
-
-
-/**
- * Handle search.
- *
- * \param c         content of type text
- * \param gui_data  front end private data
- * \param flags     search flags
- * \param string    search string
- */
-static void textplain_search(struct content *c, void *gui_data,
-			     search_flags_t flags, const char *string)
-{
-	textplain_content *text = (textplain_content *) c;
-
-	assert(c != NULL);
-
-	if (string != NULL && text->search_string != NULL &&
-	    strcmp(string, text->search_string) == 0 &&
-	    text->search != NULL) {
-		/* Continue prev. search */
-		search_step(text->search, flags, string);
-
-	} else if (string != NULL) {
-		/* New search */
-		free(text->search_string);
-		text->search_string = strdup(string);
-		if (text->search_string == NULL)
-			return;
-
-		if (text->search != NULL) {
-			search_destroy_context(text->search);
-			text->search = NULL;
-		}
-
-		text->search = search_create_context(c, CONTENT_TEXTPLAIN,
-						     gui_data);
-
-		if (text->search == NULL)
-			return;
-
-		search_step(text->search, flags, string);
-
-	} else {
-		/* Clear search */
-		textplain_search_clear(c);
-
-		free(text->search_string);
-		text->search_string = NULL;
-	}
-}
-
-
-/**
  * Redraw a text string with highlighting
  * (for selection/search)
  *
@@ -840,7 +851,6 @@ text_draw(const char *utf8_text,
 	    float scale,
 	    textplain_content *text,
 	    const struct selection *sel,
-	    struct search_context *search,
 	    const struct redraw_context *ctx)
 {
 	bool highlighted = false;
@@ -858,8 +868,7 @@ text_draw(const char *utf8_text,
 		unsigned end_idx;
 
 		/* first try the browser window's current selection */
-		if (selection_defined(sel) &&
-		    selection_highlighted(sel,
+		if (selection_highlighted(sel,
 					  offset,
 					  offset + len,
 					  &start_idx,
@@ -869,13 +878,12 @@ text_draw(const char *utf8_text,
 
 		/* what about the current search operation, if any? */
 		if (!highlighted &&
-		    (search != NULL) &&
-		    search_term_highlighted((struct content *)text,
-					    offset,
-					    offset + len,
-					    &start_idx,
-					    &end_idx,
-					    search)) {
+		    (text->base.textsearch.context != NULL) &&
+		    content_textsearch_ishighlighted(text->base.textsearch.context,
+						     offset,
+						     offset + len,
+						     &start_idx,
+						     &end_idx)) {
 			highlighted = true;
 		}
 
@@ -1125,8 +1133,7 @@ textplain_redraw(struct content *c,
 				       line_height,
 				       data->scale,
 				       text,
-				       &text->sel,
-				       text->search,
+				       text->sel,
 				       ctx)) {
 				return false;
 			}
@@ -1153,28 +1160,30 @@ textplain_redraw(struct content *c,
 
 			if (bw) {
 				unsigned tab_ofst = line[lineno].start + next_offset;
-				struct selection *sel = &text->sel;
+				struct selection *sel = text->sel;
 				bool highlighted = false;
 
-				if (selection_defined(sel)) {
-					unsigned start_idx, end_idx;
-					if (selection_highlighted(sel,
-								  tab_ofst,
-								  tab_ofst + 1,
-								  &start_idx,
-								  &end_idx))
-						highlighted = true;
+				unsigned start_idx, end_idx;
+				if (selection_highlighted(sel,
+							  tab_ofst,
+							  tab_ofst + 1,
+							  &start_idx,
+							  &end_idx)) {
+					highlighted = true;
 				}
 
-				if (!highlighted && (text->search != NULL)) {
+
+				if (!highlighted &&
+				    (c->textsearch.context != NULL)) {
 					unsigned start_idx, end_idx;
-					if (search_term_highlighted(c,
-								    tab_ofst,
-								    tab_ofst + 1,
-								    &start_idx,
-								    &end_idx,
-								    text->search))
+					if (content_textsearch_ishighlighted(
+						    c->textsearch.context,
+						    tab_ofst,
+						    tab_ofst + 1,
+						    &start_idx,
+						    &end_idx)) {
 						highlighted = true;
+					}
 				}
 
 				if (highlighted) {
@@ -1204,7 +1213,7 @@ textplain_redraw(struct content *c,
 /**
  * Handle a window containing a CONTENT_TEXTPLAIN being opened.
  */
-static void
+static nserror
 textplain_open(struct content *c,
 	       struct browser_window *bw,
 	       struct content *page,
@@ -1215,22 +1224,22 @@ textplain_open(struct content *c,
 	text->bw = bw;
 
 	/* text selection */
-	selection_init(&text->sel, NULL, NULL);
+	selection_init(text->sel);
+
+	return NSERROR_OK;
 }
 
 
 /**
  * Handle a window containing a CONTENT_TEXTPLAIN being closed.
  */
-static void textplain_close(struct content *c)
+static nserror textplain_close(struct content *c)
 {
 	textplain_content *text = (textplain_content *) c;
 
-	if (text->search != NULL) {
-		search_destroy_context(text->search);
-	}
-
 	text->bw = NULL;
+
+	return NSERROR_OK;
 }
 
 
@@ -1241,7 +1250,7 @@ static char *textplain_get_selection(struct content *c)
 {
 	textplain_content *text = (textplain_content *) c;
 
-	return selection_get_copy(&text->sel);
+	return selection_get_copy(text->sel);
 }
 
 
@@ -1290,61 +1299,12 @@ textplain_coord_from_offset(const char *text, size_t offset, size_t length)
 
 
 /**
- * plain text content handler table
+ * Retrieve number of lines in content
+ *
+ * \param[in] c Content to retrieve line count from
+ * \return Number of lines
  */
-static const content_handler textplain_content_handler = {
-	.fini = textplain_fini,
-	.create = textplain_create,
-	.process_data = textplain_process_data,
-	.data_complete = textplain_convert,
-	.reformat = textplain_reformat,
-	.destroy = textplain_destroy,
-	.mouse_track = textplain_mouse_track,
-	.mouse_action = textplain_mouse_action,
-	.keypress = textplain_keypress,
-	.search = textplain_search,
-	.search_clear = textplain_search_clear,
-	.redraw = textplain_redraw,
-	.open = textplain_open,
-	.close = textplain_close,
-	.get_selection = textplain_get_selection,
-	.clone = textplain_clone,
-	.type = textplain_content_type,
-	.no_share = true,
-};
-
-
-/* exported interface documented in html/textplain.h */
-nserror textplain_init(void)
-{
-	lwc_error lerror;
-	nserror error;
-
-	lerror = lwc_intern_string("Windows-1252",
-				   SLEN("Windows-1252"),
-				   &textplain_default_charset);
-	if (lerror != lwc_error_ok) {
-		return NSERROR_NOMEM;
-	}
-
-	error = content_factory_register_handler("text/plain",
-						 &textplain_content_handler);
-	if (error != NSERROR_OK) {
-		lwc_string_unref(textplain_default_charset);
-	}
-
-	error = content_factory_register_handler("application/json",
-						 &textplain_content_handler);
-	if (error != NSERROR_OK) {
-		lwc_string_unref(textplain_default_charset);
-	}
-
-	return error;
-}
-
-
-/* exported interface documented in html/textplain.h */
-unsigned long textplain_line_count(struct content *c)
+static unsigned long textplain_line_count(struct content *c)
 {
 	textplain_content *text = (textplain_content *) c;
 
@@ -1354,94 +1314,150 @@ unsigned long textplain_line_count(struct content *c)
 }
 
 
-/* exported interface documented in html/textplain.h */
-size_t textplain_size(struct content *c)
+/**
+ * Return a pointer to the requested line of text.
+ *
+ * \param[in] c        content of type CONTENT_TEXTPLAIN
+ * \param[in] lineno   line number
+ * \param[out] poffset receives byte offset of line start within text
+ * \param[out] plen    receives length of returned line
+ * \return pointer to text, or NULL if invalid line number
+ */
+static char *
+textplain_get_line(struct content *c,
+		   unsigned lineno,
+		   size_t *poffset,
+		   size_t *plen)
 {
 	textplain_content *text = (textplain_content *) c;
+	struct textplain_line *line;
 
 	assert(c != NULL);
 
-	return text->utf8_data_size;
+	if (lineno >= text->physical_line_count)
+		return NULL;
+	line = &text->physical_line[lineno];
+
+	*poffset = line->start;
+	*plen = line->length;
+	return text->utf8_data + line->start;
 }
 
 
-/* exported interface documented in html/textplain.h */
-size_t textplain_offset_from_coords(struct content *c, int x, int y, int dir)
+/**
+ * Find line number of byte in text
+ *
+ * Given a byte offset within the text, return the line number
+ * of the line containing that offset.
+ *
+ * \param[in] c       content of type CONTENT_TEXTPLAIN
+ * \param[in] offset  byte offset within textual representation
+ * \return line number, or -1 if offset invalid (larger than size)
+ */
+static int textplain_find_line(struct content *c, unsigned offset)
 {
-	textplain_content *textc = (textplain_content *) c;
-	float line_height = textplain_line_height();
+	textplain_content *text = (textplain_content *) c;
 	struct textplain_line *line;
-	const char *text;
-	unsigned nlines;
-	size_t length;
-	int idx;
+	int nlines;
+	int lineno = 0;
 
 	assert(c != NULL);
 
-	y = (int)((float)(y - MARGIN) / line_height);
-	x -= MARGIN;
-
-	nlines = textc->physical_line_count;
-	if (!nlines)
-		return 0;
-
-	if (y <= 0) y = 0;
-	else if ((unsigned)y >= nlines)
-		y = nlines - 1;
-
-	line = &textc->physical_line[y];
-	text = textc->utf8_data + line->start;
-	length = line->length;
-	idx = 0;
+	line = text->physical_line;
+	nlines = text->physical_line_count;
 
-	while (x > 0) {
-		size_t next_offset = 0;
-		int width = INT_MAX;
+	if (offset > text->utf8_data_size) {
+		return -1;
+	}
 
-		while (next_offset < length && text[next_offset] != '\t') {
-			next_offset = utf8_next(text, length, next_offset);
-		}
+/* \todo - implement binary search here */
+	while (lineno < nlines && line[lineno].start < offset) {
+		lineno++;
+	}
+	if (line[lineno].start > offset) {
+		lineno--;
+	}
 
-		if (next_offset < length) {
-			guit->layout->width(&textplain_style,
-					    text,
-					    next_offset,
-					    &width);
-		}
+	return lineno;
+}
 
-		if (x <= width) {
-			int pixel_offset;
-			size_t char_offset;
 
-			guit->layout->position(&textplain_style,
-					       text, next_offset, x,
-					       &char_offset, &pixel_offset);
+/**
+ * Finds all occurrences of a given string in a textplain content
+ *
+ * \param c the content to be searched
+ * \param context The search context to add the entry to.
+ * \param pattern the string pattern to search for
+ * \param p_len pattern length
+ * \param case_sens whether to perform a case sensitive search
+ * \return NSERROR_OK on success else error code on faliure
+ */
+static nserror
+textplain_textsearch_find(struct content *c,
+			  struct textsearch_context *context,
+			  const char *pattern,
+			  int p_len,
+			  bool case_sens)
+{
+	int nlines = textplain_line_count(c);
+	int line;
+	nserror res = NSERROR_OK;
+
+	for(line = 0; line < nlines; line++) {
+		size_t offset, length;
+		const char *text;
+
+		text = textplain_get_line(c, line, &offset, &length);
+		if (text) {
+			while (length > 0) {
+				unsigned match_length;
+				size_t start_idx;
+				const char *new_text;
+				const char *pos;
+
+				pos = content_textsearch_find_pattern(
+						text,
+						length,
+						pattern,
+						p_len,
+						case_sens,
+						&match_length);
+				if (!pos)
+					break;
+
+				/* found string in line => add to list */
+				start_idx = offset + (pos - text);
+				res = content_textsearch_add_match(context,
+						start_idx,
+						start_idx + match_length,
+						NULL,
+						NULL);
+				if (res != NSERROR_OK) {
+					return res;
+				}
 
-			idx += char_offset;
-			break;
+				new_text = pos + match_length;
+				offset += (new_text - text);
+				length -= (new_text - text);
+				text = new_text;
+			}
 		}
-
-		x -= width;
-		length -= next_offset;
-		text += next_offset;
-		idx += next_offset;
-
-		/* check if it's within the tab */
-		width = textplain_tab_width - (width % textplain_tab_width);
-		if (x <= width) break;
-
-		x -= width;
-		length--;
-		text++;
-		idx++;
 	}
 
-	return line->start + idx;
+	return res;
 }
 
 
-/* exported interface documented in html/textplain.h */
-void
+/**
+ * Given a range of byte offsets within a UTF8 textplain content,
+ * return a box that fully encloses the text
+ *
+ * \param[in] c     content of type CONTENT_TEXTPLAIN
+ * \param[in] start byte offset of start of text range
+ * \param[in] end   byte offset of end
+ * \param[out] r    rectangle to be completed
+ */
+static void
 textplain_coords_from_range(struct content *c,
 			    unsigned start,
 			    unsigned end,
@@ -1494,91 +1510,174 @@ textplain_coords_from_range(struct content *c,
 }
 
 
-/* exported interface documented in html/textplain.h */
-char *
-textplain_get_line(struct content *c,
-		   unsigned lineno,
-		   size_t *poffset,
-		   size_t *plen)
+/**
+ * Return a pointer to the raw UTF-8 data, as opposed to the reformatted
+ * text to fit the window width. Thus only hard newlines are preserved
+ * in the saved/copied text of a selection.
+ *
+ * \param[in] c     content of type CONTENT_TEXTPLAIN
+ * \param[in] start starting byte offset within UTF-8 text
+ * \param[in] end   ending byte offset
+ * \param[out] plen receives validated length
+ * \return pointer to text, or NULL if no text
+ */
+static char *
+textplain_get_raw_data(struct content *c,
+		       unsigned start,
+		       unsigned end,
+		       size_t *plen)
 {
 	textplain_content *text = (textplain_content *) c;
-	struct textplain_line *line;
+	size_t utf8_size;
 
 	assert(c != NULL);
 
-	if (lineno >= text->physical_line_count)
-		return NULL;
-	line = &text->physical_line[lineno];
+	utf8_size = text->utf8_data_size;
 
-	*poffset = line->start;
-	*plen = line->length;
-	return text->utf8_data + line->start;
+	/* any text at all? */
+	if (!utf8_size) return NULL;
+
+	/* clamp to valid offset range */
+	if (start >= utf8_size) start = utf8_size;
+	if (end >= utf8_size) end = utf8_size;
+
+	*plen = end - start;
+
+	return text->utf8_data + start;
 }
 
 
-/* exported interface documented in html/textplain.h */
-int textplain_find_line(struct content *c, unsigned offset)
+/**
+ * get bounds of a free text search match
+ */
+static nserror
+textplain_textsearch_bounds(struct content *c,
+			    unsigned start_idx,
+			    unsigned end_idx,
+			    struct box *start_box,
+			    struct box *end_box,
+			    struct rect *bounds)
 {
-	textplain_content *text = (textplain_content *) c;
-	struct textplain_line *line;
-	int nlines;
-	int lineno = 0;
+	textplain_coords_from_range(c, start_idx, end_idx, bounds);
 
-	assert(c != NULL);
+	return NSERROR_OK;
+}
 
-	line = text->physical_line;
-	nlines = text->physical_line_count;
 
-	if (offset > text->utf8_data_size) {
-		return -1;
-	}
+/**
+ * invalidate a region based on offsets into the text cauing a redraw
+ */
+static nserror
+textplain_textselection_redraw(struct content *c,
+			       unsigned start_idx,
+			       unsigned end_idx)
+{
+	struct rect r;
 
-/* \todo - implement binary search here */
-	while (lineno < nlines && line[lineno].start < offset) {
-		lineno++;
-	}
-	if (line[lineno].start > offset) {
-		lineno--;
+	if (end_idx <= start_idx) {
+		return NSERROR_BAD_PARAMETER;
 	}
 
-	return lineno;
-}
+	textplain_coords_from_range(c, start_idx, end_idx, &r);
 
+	content__request_redraw(c, r.x0, r.y0, r.x1 - r.x0, r.y1 - r.y0);
 
-/* exported interface documented in html/textplain.h */
-char *
-textplain_get_raw_data(struct content *c,
-		       unsigned start,
-		       unsigned end,
-		       size_t *plen)
+	return NSERROR_OK;
+}
+
+static nserror
+textplain_textselection_copy(struct content *c,
+			     unsigned start_idx,
+			     unsigned end_idx,
+			     struct selection_string *selstr)
 {
-	textplain_content *text = (textplain_content *) c;
-	size_t utf8_size;
+	const char *text;
+	size_t length;
+	bool res = false;
 
-	assert(c != NULL);
+	text = textplain_get_raw_data(c, start_idx, end_idx, &length);
+	if (text != NULL) {
+		res = selection_string_append(text, length, false, NULL, selstr);
+	}
+	if (res == false) {
+		return NSERROR_NOMEM;
+	}
+	return NSERROR_OK;
+}
 
-	utf8_size = text->utf8_data_size;
 
-	/* any text at all? */
-	if (!utf8_size) return NULL;
+/**
+ * Retrieve the index of the end of the text
+ *
+ * \param[in] c Content to retrieve size of
+ * \return Size, in bytes, of data
+ */
+static nserror
+textplain_textselection_get_end(struct content *c, unsigned *end_idx)
+{
+	textplain_content *text = (textplain_content *)c;
 
-	/* clamp to valid offset range */
-	if (start >= utf8_size) start = utf8_size;
-	if (end >= utf8_size) end = utf8_size;
+	*end_idx = text->utf8_data_size;
+	return NSERROR_OK;
+}
 
-	*plen = end - start;
 
-	return text->utf8_data + start;
-}
+/**
+ * plain text content handler table
+ */
+static const content_handler textplain_content_handler = {
+	.fini = textplain_fini,
+	.create = textplain_create,
+	.process_data = textplain_process_data,
+	.data_complete = textplain_convert,
+	.reformat = textplain_reformat,
+	.destroy = textplain_destroy,
+	.mouse_track = textplain_mouse_track,
+	.mouse_action = textplain_mouse_action,
+	.keypress = textplain_keypress,
+	.redraw = textplain_redraw,
+	.open = textplain_open,
+	.close = textplain_close,
+	.get_selection = textplain_get_selection,
+	.clone = textplain_clone,
+	.type = textplain_content_type,
+	.textsearch_find = textplain_textsearch_find,
+	.textsearch_bounds = textplain_textsearch_bounds,
+	.textselection_redraw = textplain_textselection_redraw,
+	.textselection_copy = textplain_textselection_copy,
+	.textselection_get_end = textplain_textselection_get_end,
+	.no_share = true,
+};
 
 
 /* exported interface documented in html/textplain.h */
-struct browser_window *textplain_get_browser_window(struct content *c)
+nserror textplain_init(void)
 {
-	textplain_content *text = (textplain_content *) c;
+	lwc_error lerror;
+	nserror error;
 
-	assert(c != NULL);
-	assert(c->handler == &textplain_content_handler);
+	lerror = lwc_intern_string("Windows-1252",
+				   SLEN("Windows-1252"),
+				   &textplain_default_charset);
+	if (lerror != lwc_error_ok) {
+		return NSERROR_NOMEM;
+	}
 
-	return text->bw;
+	error = content_factory_register_handler("text/plain",
+						 &textplain_content_handler);
+	if (error != NSERROR_OK) {
+		lwc_string_unref(textplain_default_charset);
+	}
+
+	error = content_factory_register_handler("application/json",
+						 &textplain_content_handler);
+	if (error != NSERROR_OK) {
+		lwc_string_unref(textplain_default_charset);
+	}
+
+	return error;
 }
+
+
+
+
diff --git a/content/handlers/text/textplain.h b/content/handlers/text/textplain.h
index 23917fb6c..6cc2716bc 100644
--- a/content/handlers/text/textplain.h
+++ b/content/handlers/text/textplain.h
@@ -26,14 +26,6 @@
 #ifndef NETSURF_HTML_TEXTPLAIN_H
 #define NETSURF_HTML_TEXTPLAIN_H
 
-#include <stddef.h>
-#include "netsurf/mouse.h"
-
-struct content;
-struct hlcache_handle;
-struct http_parameter;
-struct rect;
-
 /**
  * Initialise the text content handler
  *
@@ -42,98 +34,4 @@ struct rect;
 nserror textplain_init(void);
 
 
-/**
- * Retrieve number of lines in content
- *
- * \param[in] c Content to retrieve line count from
- * \return Number of lines
- */
-unsigned long textplain_line_count(struct content *c);
-
-
-/**
- * Retrieve the size (in bytes) of text data
- *
- * \param[in] c Content to retrieve size of
- * \return Size, in bytes, of data
- */
-size_t textplain_size(struct content *c);
-
-
-/**
- * Return byte offset within UTF8 textplain content.
- *
- * given the co-ordinates of a point within a textplain content. 'dir'
- * specifies the direction in which to search (-1 = above-left, +1 =
- * below-right) if the co-ordinates are not contained within a line.
- *
- * \param[in] c   content of type CONTENT_TEXTPLAIN
- * \param[in] x   x ordinate of point
- * \param[in] y   y ordinate of point
- * \param[in] dir direction of search if not within line
- * \return byte offset of character containing (or nearest to) point
- */
-size_t textplain_offset_from_coords(struct content *c, int x, int y, int dir);
-
-
-/**
- * Given a range of byte offsets within a UTF8 textplain content,
- * return a box that fully encloses the text
- *
- * \param[in] c     content of type CONTENT_TEXTPLAIN
- * \param[in] start byte offset of start of text range
- * \param[in] end   byte offset of end
- * \param[out] r    rectangle to be completed
- */
-void textplain_coords_from_range(struct content *c,
-		unsigned start, unsigned end, struct rect *r);
-
-/**
- * Return a pointer to the requested line of text.
- *
- * \param[in] c        content of type CONTENT_TEXTPLAIN
- * \param[in] lineno   line number
- * \param[out] poffset receives byte offset of line start within text
- * \param[out] plen    receives length of returned line
- * \return pointer to text, or NULL if invalid line number
- */
-char *textplain_get_line(struct content *c, unsigned lineno,
-		size_t *poffset, size_t *plen);
-
-
-/**
- * Find line number of byte in text
- *
- * Given a byte offset within the text, return the line number
- * of the line containing that offset.
- *
- * \param[in] c       content of type CONTENT_TEXTPLAIN
- * \param[in] offset  byte offset within textual representation
- * \return line number, or -1 if offset invalid (larger than size)
- */
-int textplain_find_line(struct content *c, unsigned offset);
-
-
-/**
- * Return a pointer to the raw UTF-8 data, as opposed to the reformatted
- * text to fit the window width. Thus only hard newlines are preserved
- * in the saved/copied text of a selection.
- *
- * \param[in] c     content of type CONTENT_TEXTPLAIN
- * \param[in] start starting byte offset within UTF-8 text
- * \param[in] end   ending byte offset
- * \param[out] plen receives validated length
- * \return pointer to text, or NULL if no text
- */
-char *textplain_get_raw_data(struct content *c, unsigned start, unsigned end, size_t *plen);
-
-
-/**
- * Get the browser window containing a textplain content
- *
- * \param[in] c text/plain content
- * \return the browser window
- */
-struct browser_window *textplain_get_browser_window(struct content *c);
-
 #endif
diff --git a/content/hlcache.c b/content/hlcache.c
index 61cdebe71..5cba88bc6 100644
--- a/content/hlcache.c
+++ b/content/hlcache.c
@@ -30,6 +30,7 @@
 #include "utils/messages.h"
 #include "utils/ring.h"
 #include "utils/utils.h"
+#include "netsurf/inttypes.h"
 #include "netsurf/misc.h"
 #include "netsurf/content.h"
 #include "desktop/gui_internal.h"
@@ -38,6 +39,7 @@
 #include "content/hlcache.h"
 // Note, this is *ONLY* so that we can abort cleanly during shutdown of the cache
 #include "content/content_protected.h"
+#include "content/content_factory.h"
 
 typedef struct hlcache_entry hlcache_entry;
 typedef struct hlcache_retrieval_ctx hlcache_retrieval_ctx;
@@ -361,7 +363,8 @@ static nserror hlcache_migrate_ctx(hlcache_retrieval_ctx *ctx,
 				hlcache_event hlevent;
 
 				hlevent.type = CONTENT_MSG_ERROR;
-				hlevent.data.error = messages_get("MiscError");
+				hlevent.data.errordata.errorcode = NSERROR_UNKNOWN;
+				hlevent.data.errordata.errormsg = messages_get("MiscError");
 
 				ctx->handle->cb(ctx->handle, &hlevent,
 						ctx->handle->pw);
@@ -393,7 +396,8 @@ static nserror hlcache_migrate_ctx(hlcache_retrieval_ctx *ctx,
 			hlcache_event hlevent;
 
 			hlevent.type = CONTENT_MSG_ERROR;
-			hlevent.data.error = messages_get("UnacceptableType");
+			hlevent.data.errordata.errorcode = NSERROR_UNKNOWN;
+			hlevent.data.errordata.errormsg = messages_get("UnacceptableType");
 
 			ctx->handle->cb(ctx->handle, &hlevent,
 					ctx->handle->pw);
@@ -421,8 +425,10 @@ static nserror hlcache_migrate_ctx(hlcache_retrieval_ctx *ctx,
  * \param pw	  Pointer to client-specific data
  * \return NSERROR_OK on success, appropriate error otherwise
  */
-static nserror hlcache_llcache_callback(llcache_handle *handle,
-		const llcache_event *event, void *pw)
+static nserror
+hlcache_llcache_callback(llcache_handle *handle,
+			 const llcache_event *event,
+			 void *pw)
 {
 	hlcache_retrieval_ctx *ctx = pw;
 	lwc_string *effective_type = NULL;
@@ -431,6 +437,17 @@ static nserror hlcache_llcache_callback(llcache_handle *handle,
 	assert(ctx->llcache == handle);
 
 	switch (event->type) {
+	case LLCACHE_EVENT_GOT_CERTS:
+		/* Pass them on upward */
+		if (ctx->handle->cb != NULL) {
+			hlcache_event hlevent;
+
+			hlevent.type = CONTENT_MSG_SSL_CERTS;
+			hlevent.data.chain = event->data.chain;
+
+			ctx->handle->cb(ctx->handle, &hlevent, ctx->handle->pw);
+		}
+		break;
 	case LLCACHE_EVENT_HAD_HEADERS:
 		error = mimesniff_compute_effective_type(llcache_handle_get_header(handle, "Content-Type"), NULL, 0,
 				ctx->flags & HLCACHE_RETRIEVE_SNIFF_TYPE,
@@ -489,8 +506,9 @@ static nserror hlcache_llcache_callback(llcache_handle *handle,
 		if (ctx->handle->cb != NULL) {
 			hlcache_event hlevent;
 
-			hlevent.type = CONTENT_MSG_ERRORCODE;
-			hlevent.data.errorcode = error;
+			hlevent.type = CONTENT_MSG_ERROR;
+			hlevent.data.errordata.errorcode = error;
+			hlevent.data.errordata.errormsg = NULL;
 
 			ctx->handle->cb(ctx->handle, &hlevent, ctx->handle->pw);
 		}
@@ -500,7 +518,8 @@ static nserror hlcache_llcache_callback(llcache_handle *handle,
 			hlcache_event hlevent;
 
 			hlevent.type = CONTENT_MSG_ERROR;
-			hlevent.data.error = event->data.msg;
+			hlevent.data.errordata.errorcode = event->data.error.code;
+			hlevent.data.errordata.errormsg = event->data.error.msg;
 
 			ctx->handle->cb(ctx->handle, &hlevent, ctx->handle->pw);
 		}
@@ -574,7 +593,7 @@ void hlcache_finalise(void)
 		num_contents++;
 	}
 
-	NSLOG(netsurf, INFO, "%d contents remain before cache drain",
+	NSLOG(netsurf, INFO, "%"PRIu32" contents remain before cache drain",
 	      num_contents);
 
 	/* Drain cache */
@@ -589,7 +608,8 @@ void hlcache_finalise(void)
 		}
 	} while (num_contents > 0 && num_contents != prev_contents);
 
-	NSLOG(netsurf, INFO, "%d contents remaining after being polite", num_contents);
+	NSLOG(netsurf, INFO, "%"PRIu32" contents remaining after being polite",
+			num_contents);
 
 	/* Drain cache again, forcing the matter */
 	do {
@@ -603,12 +623,12 @@ void hlcache_finalise(void)
 		}
 	} while (num_contents > 0 && num_contents != prev_contents);
 
-	NSLOG(netsurf, INFO, "%d contents remaining:", num_contents);
+	NSLOG(netsurf, INFO, "%"PRIu32" contents remaining:", num_contents);
 	for (entry = hlcache->content_list; entry != NULL; entry = entry->next) {
 		hlcache_handle entry_handle = { entry, NULL, NULL };
 
 		if (entry->content != NULL) {
-			NSLOG(netsurf, INFO, "	%p : %s (%d users)",
+			NSLOG(netsurf, INFO, "	%p : %s (%"PRIu32" users)",
 			      entry,
 			      nsurl_access(hlcache_handle_get_url(&entry_handle)),
 			      content_count_users(entry->content));
@@ -644,6 +664,9 @@ void hlcache_finalise(void)
 	NSLOG(netsurf, INFO, "hit/miss %d/%d", hlcache->hit_count,
 	      hlcache->miss_count);
 
+	/* De-schedule ourselves */
+	guit->misc->schedule(-1, hlcache_clean, NULL);
+
 	free(hlcache);
 	hlcache = NULL;
 
@@ -652,11 +675,15 @@ void hlcache_finalise(void)
 }
 
 /* See hlcache.h for documentation */
-nserror hlcache_handle_retrieve(nsurl *url, uint32_t flags,
-		nsurl *referer, llcache_post_data *post,
-		hlcache_handle_callback cb, void *pw,
-		hlcache_child_context *child,
-		content_type accepted_types, hlcache_handle **result)
+nserror
+hlcache_handle_retrieve(nsurl *url,
+			uint32_t flags,
+			nsurl *referer,
+			llcache_post_data *post,
+			hlcache_handle_callback cb, void *pw,
+			hlcache_child_context *child,
+			content_type accepted_types,
+			hlcache_handle **result)
 {
 	hlcache_retrieval_ctx *ctx;
 	nserror error;
diff --git a/content/hlcache.h b/content/hlcache.h
index 3d9f41cdb..986bdd3f4 100644
--- a/content/hlcache.h
+++ b/content/hlcache.h
@@ -16,8 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * High-level resource cache (interface)
+/**
+ * \file
+ * High-level resource cache interface
  */
 
 #ifndef NETSURF_CONTENT_HLCACHE_H_
diff --git a/content/llcache.c b/content/llcache.c
index 625e810ff..32c7449d2 100644
--- a/content/llcache.c
+++ b/content/llcache.c
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <strings.h>
 #include <nsutils/time.h>
+#include <nsutils/base64.h>
 
 #include "netsurf/inttypes.h"
 #include "utils/config.h"
@@ -46,6 +47,7 @@
 #include "utils/utils.h"
 #include "utils/time.h"
 #include "utils/http.h"
+#include "utils/nsoption.h"
 #include "netsurf/misc.h"
 #include "desktop/gui_internal.h"
 
@@ -114,9 +116,7 @@ typedef struct {
 
 	bool tried_with_auth;		/**< Whether we've tried with auth */
 
-	bool tried_with_tls_downgrade;	/**< Whether we've tried TLS <= 1.0 */
-
-	bool outstanding_query;		/**< Waiting for a query response */
+	bool tried_with_tls_downgrade;	/**< Whether we've tried TLS 1.2 */
 
 	bool tainted_tls;		/**< Whether the TLS transport is tainted */
 } llcache_fetch_ctx;
@@ -177,6 +177,8 @@ struct llcache_object {
 	size_t source_len;	     /**< Byte length of source data */
 	size_t source_alloc;	     /**< Allocated size of source buffer */
 
+	struct cert_chain *chain;    /**< Certificate chain from the fetch */
+
 	llcache_store_state store_state; /**< where the data for the object is stored */
 
 	llcache_object_user *users;  /**< List of users */
@@ -206,12 +208,6 @@ struct llcache_object {
  * Core llcache control context.
  */
 struct llcache_s {
-	/** Handler for fetch-related queries */
-	llcache_query_callback query_cb;
-
-	/** Data for fetch-related query handler */
-	void *query_cb_pw;
-
 	/** Head of the low-level cached object list */
 	llcache_object *cached_objects;
 
@@ -393,6 +389,7 @@ static nserror llcache_send_event_to_users(llcache_object *object,
 
 	user = object->users;
 	while (user != NULL) {
+		bool was_target = user->iterator_target;
 		user->iterator_target = true;
 
 		error = user->handle->cb(user->handle, event,
@@ -400,9 +397,9 @@ static nserror llcache_send_event_to_users(llcache_object *object,
 
 		next_user = user->next;
 
-		user->iterator_target = false;
+		user->iterator_target = was_target;
 
-		if (user->queued_for_delete) {
+		if (user->queued_for_delete && !was_target) {
 			llcache_object_remove_user(object, user);
 			llcache_object_user_destroy(user);
 		}
@@ -811,6 +808,87 @@ static nserror llcache_fetch_process_header(llcache_object *object,
 }
 
 /**
+ * construct a Referer header appropriate for the request
+ *
+ * \param url The url being navigated to
+ * \param referer The referring url
+ * \param header_out A pointer to receive the header. The buffer must
+ *                    be freed by the caller.
+ * \return NSERROR_OK and \a header_out updated on success else error code
+ */
+static nserror get_referer_header(nsurl *url, nsurl *referer, char **header_out)
+{
+	nserror res = NSERROR_INVALID;
+	lwc_string *ref_scheme;
+	lwc_string *scheme;
+	bool match;
+	bool match1;
+	bool match2;
+	char *header;
+
+	/* Determine whether to send the Referer header */
+	if (!nsoption_bool(send_referer)) {
+		return NSERROR_INVALID;
+	}
+
+	scheme = nsurl_get_component(url, NSURL_SCHEME);
+	if (scheme == NULL) {
+		return NSERROR_BAD_URL;
+	}
+
+	ref_scheme = nsurl_get_component(referer, NSURL_SCHEME);
+	if (ref_scheme == NULL) {
+		/* referer has no scheme so no header */
+		lwc_string_unref(scheme);
+		return NSERROR_INVALID;
+	}
+
+	/* User permits us to send the header
+	 * Only send it if:
+	 *    1) The fetch and referer schemes match
+	 * or 2) The fetch is https and the referer is http
+	 *
+	 * This ensures that referer information is only sent
+	 * across schemes in the special case of an https
+	 * request from a page served over http. The inverse
+	 * (https -> http) should not send the referer (15.1.3)
+	 */
+	if (lwc_string_isequal(scheme, ref_scheme,
+			       &match) != lwc_error_ok) {
+		match = false;
+	}
+	if (lwc_string_isequal(scheme, corestring_lwc_https,
+			       &match1) != lwc_error_ok) {
+		match1 = false;
+	}
+	if (lwc_string_isequal(ref_scheme, corestring_lwc_http,
+			       &match2) != lwc_error_ok) {
+		match2 = false;
+	}
+	if (match == true || (match1 == true && match2 == true)) {
+		const size_t len = SLEN("Referer: ") +
+			nsurl_length(referer) + 1;
+
+		header = malloc(len);
+		if (header == NULL) {
+			res = NSERROR_NOMEM;
+		} else {
+			snprintf(header, len, "Referer: %s",
+				 nsurl_access(referer));
+
+			*header_out = header;
+			res = NSERROR_OK;
+		}
+	}
+
+
+	lwc_string_unref(scheme);
+	lwc_string_unref(ref_scheme);
+
+	return res;
+}
+
+/**
  * (Re)fetch an object
  *
  * Sets up headers and attempts to start an actual fetch from the
@@ -838,12 +916,13 @@ static nserror llcache_object_refetch(llcache_object *object)
 		}
 	}
 
-	/* Generate cache-control headers */
-	headers = malloc(3 * sizeof(char *));
+	/* Generate headers */
+	headers = malloc(4 * sizeof(char *));
 	if (headers == NULL) {
 		return NSERROR_NOMEM;
 	}
 
+	/* cache-control header for etag */
 	if (object->cache.etag != NULL) {
 		const size_t len = SLEN("If-None-Match: ") +
 				strlen(object->cache.etag) + 1;
@@ -860,7 +939,8 @@ static nserror llcache_object_refetch(llcache_object *object)
 		header_idx++;
 	}
 
-	if (object->cache.date != 0) {
+	/* cache-control header for modification time */
+	if (object->cache.last_modified != 0) {
 		/* Maximum length of an RFC 1123 date is 29 bytes */
 		const size_t len = SLEN("If-Modified-Since: ") + 29 + 1;
 
@@ -873,10 +953,19 @@ static nserror llcache_object_refetch(llcache_object *object)
 		}
 
 		snprintf(headers[header_idx], len, "If-Modified-Since: %s",
-				rfc1123_date(object->cache.date));
+				rfc1123_date(object->cache.last_modified));
 
 		header_idx++;
 	}
+
+	/* Referer header */
+	if (object->fetch.referer != NULL) {
+		if (get_referer_header(object->url,
+				       object->fetch.referer,
+				       &headers[header_idx]) == NSERROR_OK) {
+			header_idx++;
+		}
+	}
 	headers[header_idx] = NULL;
 
 	/* Reset cache control data */
@@ -973,6 +1062,8 @@ static nserror llcache_object_destroy(llcache_object *object)
 	NSLOG(llcache, DEBUG, "Destroying object %p, %s", object,
 	      nsurl_access(object->url));
 
+	cert_chain_free(object->chain);
+
 	if (object->source_data != NULL) {
 		if (object->store_state == LLCACHE_STATE_DISC) {
 			guit->llcache->release(object->url, BACKING_STORE_NONE);
@@ -1238,6 +1329,13 @@ llcache_serialise_metadata(llcache_object *object,
 	char *op;
 	unsigned int hloop;
 	int use;
+	size_t cert_chain_depth;
+
+	if (object->chain != NULL) {
+		cert_chain_depth = object->chain->depth;
+	} else {
+		cert_chain_depth = 0;
+	}
 
 	allocsize = 10 + 1; /* object length */
 
@@ -1249,13 +1347,21 @@ llcache_serialise_metadata(llcache_object *object,
 
 	allocsize += 10 + 1; /* space for number of header entries */
 
-	allocsize += nsurl_length(object->url) + 1;
-
 	for (hloop = 0 ; hloop < object->num_headers ; hloop++) {
 		allocsize += strlen(object->headers[hloop].name) + 1;
 		allocsize += strlen(object->headers[hloop].value) + 1;
 	}
 
+	allocsize += nsurl_length(object->url) + 1;
+
+	/* space for number of DER formatted certificates */
+	allocsize += 10 + 1;
+
+	for (hloop = 0; hloop < cert_chain_depth; hloop++) {
+		allocsize += 10 + 1; /* error status */
+		allocsize += 4 * ((object->chain->certs[hloop].der_length + 2) / 3);
+	}
+
 	data = malloc(allocsize);
 	if (data == NULL) {
 		return NSERROR_NOMEM;
@@ -1338,6 +1444,56 @@ llcache_serialise_metadata(llcache_object *object,
 		datasize -= use;
 	}
 
+	/* number of DER formatted ssl certificates */
+	use = snprintf(op, datasize, "%" PRIsizet, cert_chain_depth);
+	if (use < 0) {
+		goto operror;
+	}
+	use++; /* does not count the null */
+	if (use > datasize)
+		goto overflow;
+	op += use;
+	datasize -= use;
+
+	/* SSL certificates */
+	for (hloop = 0; hloop < cert_chain_depth; hloop++) {
+		nsuerror res;
+
+		/* Certificate error code */
+		use = snprintf(op, datasize, "%d",
+			       (int)(object->chain->certs[hloop].err));
+		if (use < 0) {
+			goto operror;
+		}
+		use++; /* does not count the null */
+		if (use > datasize)
+			goto overflow;
+		op += use;
+		datasize -= use;
+
+		/* DER certificate data in base64 encoding */
+		if (object->chain->certs[hloop].der != NULL) {
+			size_t output_length = datasize;
+			res = nsu_base64_encode(
+				object->chain->certs[hloop].der,
+				object->chain->certs[hloop].der_length,
+				(uint8_t *)op,
+				&output_length);
+			if (res != NSUERROR_OK) {
+				goto operror;
+			}
+			use = output_length;
+		} else {
+			use = 0;
+		}
+		use++; /* allow for null */
+		if (use > datasize)
+			goto overflow;
+		op += use;
+		*(op - 1) = 0;
+		datasize -= use;
+	}
+
 	NSLOG(llcache, DEBUG, "Filled buffer with %d spare", datasize);
 
 	*data_out = data;
@@ -1378,6 +1534,7 @@ llcache_process_metadata(llcache_object *object)
 	nserror res;
 	uint8_t *metadata = NULL;
 	size_t metadatalen = 0;
+	size_t remaining = 0;
 	nsurl *metadataurl;
 	unsigned int line;
 	char *ln;
@@ -1389,6 +1546,8 @@ llcache_process_metadata(llcache_object *object)
 	time_t completion_time;
 	size_t num_headers;
 	size_t hloop;
+	size_t ssl_cert_count = 0;
+	struct cert_chain *chain = NULL;
 
 	NSLOG(llcache, INFO, "Retrieving metadata");
 
@@ -1403,10 +1562,20 @@ llcache_process_metadata(llcache_object *object)
 
 	NSLOG(llcache, INFO, "Processing retrieved data");
 
+	/* metadata is stored as a sequence of NULL terminated strings
+	 * which we call 'line's here.
+	 */
+
+	/* We track remaining data because as we extend this data structure
+	 * we need to know if we should continue to parse
+	 */
+	remaining = metadatalen;
+
 	/* metadata line 1 is the url the metadata referrs to */
 	line = 1;
 	ln = (char *)metadata;
 	lnsize = strlen(ln);
+	remaining -= lnsize + 1;
 
 	if (lnsize < 7) {
 		res = NSERROR_INVALID;
@@ -1440,6 +1609,7 @@ llcache_process_metadata(llcache_object *object)
 	line = 2;
 	ln += lnsize + 1;
 	lnsize = strlen(ln);
+	remaining -= lnsize + 1;
 
 	if ((lnsize < 1) || (sscanf(ln, "%" PRIsizet, &source_length) != 1)) {
 		res = NSERROR_INVALID;
@@ -1451,6 +1621,7 @@ llcache_process_metadata(llcache_object *object)
 	line = 3;
 	ln += lnsize + 1;
 	lnsize = strlen(ln);
+	remaining -= lnsize + 1;
 
 	res = nsc_snptimet(ln, lnsize, &request_time);
 	if (res != NSERROR_OK)
@@ -1461,6 +1632,7 @@ llcache_process_metadata(llcache_object *object)
 	line = 4;
 	ln += lnsize + 1;
 	lnsize = strlen(ln);
+	remaining -= lnsize + 1;
 
 	res = nsc_snptimet(ln, lnsize, &response_time);
 	if (res != NSERROR_OK)
@@ -1471,6 +1643,7 @@ llcache_process_metadata(llcache_object *object)
 	line = 5;
 	ln += lnsize + 1;
 	lnsize = strlen(ln);
+	remaining -= lnsize + 1;
 
 	res = nsc_snptimet(ln, lnsize, &completion_time);
 	if (res != NSERROR_OK)
@@ -1481,6 +1654,7 @@ llcache_process_metadata(llcache_object *object)
 	line = 6;
 	ln += lnsize + 1;
 	lnsize = strlen(ln);
+	remaining -= lnsize + 1;
 
 	if ((lnsize < 1) || (sscanf(ln, "%" PRIsizet, &num_headers) != 1)) {
 		res = NSERROR_INVALID;
@@ -1492,6 +1666,7 @@ llcache_process_metadata(llcache_object *object)
 		line++;
 		ln += lnsize + 1;
 		lnsize = strlen(ln);
+		remaining -= lnsize + 1;
 
 		res = llcache_fetch_process_header(object,
 						   (uint8_t *)ln,
@@ -1500,6 +1675,74 @@ llcache_process_metadata(llcache_object *object)
 			goto format_error;
 	}
 
+	if (remaining == 0) {
+		goto skip_ssl_certificates;
+	}
+
+	/* Next line is the number of DER base64 encoded certificates */
+	line++;
+	ln += lnsize + 1;
+	lnsize = strlen(ln);
+	remaining -= lnsize + 1;
+
+	if ((lnsize < 1) || (sscanf(ln, "%" PRIsizet, &ssl_cert_count) != 1)) {
+		res = NSERROR_INVALID;
+		goto format_error;
+	}
+
+	if (ssl_cert_count == 0) {
+		goto skip_ssl_certificates;
+	}
+
+	if (ssl_cert_count > MAX_CERT_DEPTH) {
+		res = NSERROR_INVALID;
+		goto format_error;
+	}
+
+	res = cert_chain_alloc(ssl_cert_count, &chain);
+	if (res != NSERROR_OK) {
+		goto format_error;
+	}
+
+	for (hloop = 0; hloop < ssl_cert_count; hloop++) {
+		int errcode;
+		nsuerror nsures;
+
+		/* Certificate error code */
+		line++;
+		ln += lnsize + 1;
+		lnsize = strlen(ln);
+		remaining -= lnsize + 1;
+		if ((lnsize < 1) || (sscanf(ln, "%d", &errcode) != 1)) {
+			res = NSERROR_INVALID;
+			goto format_error;
+		}
+		if (errcode < SSL_CERT_ERR_OK ||
+		    errcode > SSL_CERT_ERR_MAX_KNOWN) {
+			/* Error with the cert code, assume UNKNOWN */
+			chain->certs[hloop].err = SSL_CERT_ERR_UNKNOWN;
+		} else {
+			chain->certs[hloop].err = (ssl_cert_err)errcode;
+		}
+
+		/* base64 encoded DER certificate data */
+		line++;
+		ln += lnsize + 1;
+		lnsize = strlen(ln);
+		remaining -= lnsize + 1;
+		if (lnsize > 0) {
+			nsures = nsu_base64_decode_alloc((const uint8_t *)ln,
+					lnsize,
+					&chain->certs[hloop].der,
+					&chain->certs[hloop].der_length);
+			if (nsures != NSUERROR_OK) {
+				res = NSERROR_NOMEM;
+				goto format_error;
+			}
+		}
+	}
+
+skip_ssl_certificates:
 	guit->llcache->release(object->url, BACKING_STORE_META);
 
 	/* update object on successful parse of metadata  */
@@ -1512,6 +1755,8 @@ llcache_process_metadata(llcache_object *object)
 	object->cache.res_time = response_time;
 	object->cache.fin_time = completion_time;
 
+	object->chain = chain;
+
 	/* object stored in backing store */
 	object->store_state = LLCACHE_STATE_DISC;
 
@@ -1523,10 +1768,77 @@ format_error:
 	      line, res);
 	guit->llcache->release(object->url, BACKING_STORE_META);
 
+	cert_chain_free(chain);
+
 	return res;
 }
 
 /**
+ * Check whether a scheme is persistable.
+ *
+ * \param url  URL to check.
+ * \return true iff url has a persistable scheme.
+ */
+static inline bool llcache__scheme_is_persistable(const nsurl *url)
+{
+	lwc_string *scheme = nsurl_get_component(url, NSURL_SCHEME);
+	bool persistable = false;
+	bool match;
+
+	/* nsurl ensures lower case schemes, and corestrings are lower
+	 * case, so it's safe to use case-sensitive comparison. */
+	if ((lwc_string_isequal(scheme, corestring_lwc_http,
+			&match) == lwc_error_ok &&
+			(match == true)) ||
+	    (lwc_string_isequal(scheme, corestring_lwc_https,
+			&match) == lwc_error_ok &&
+			(match == true))) {
+		persistable = true;
+	}
+
+	lwc_string_unref(scheme);
+
+	return persistable;
+}
+
+/**
+ * Check whether a scheme is cachable.
+ *
+ * \param url  URL to check.
+ * \return true iff url has a cachable scheme.
+ */
+static inline bool llcache__scheme_is_cachable(const nsurl *url)
+{
+	lwc_string *scheme = nsurl_get_component(url, NSURL_SCHEME);
+	bool cachable = false;
+	bool match;
+
+	/* nsurl ensures lower case schemes, and corestrings are lower
+	 * case, so it's safe to use case-sensitive comparison. */
+	if ((lwc_string_isequal(scheme, corestring_lwc_http,
+			&match) == lwc_error_ok &&
+			(match == true)) ||
+	    (lwc_string_isequal(scheme, corestring_lwc_https,
+			&match) == lwc_error_ok &&
+			(match == true)) ||
+	    (lwc_string_isequal(scheme, corestring_lwc_data,
+			&match) == lwc_error_ok &&
+			(match == true)) ||
+	    (lwc_string_isequal(scheme, corestring_lwc_resource,
+			&match) == lwc_error_ok &&
+			(match == true)) ||
+	    (lwc_string_isequal(scheme, corestring_lwc_file,
+			&match) == lwc_error_ok &&
+			(match == true))) {
+		cachable = true;
+	}
+
+	lwc_string_unref(scheme);
+
+	return cachable;
+}
+
+/**
  * Attempt to retrieve an object from persistent storage.
  *
  * \param object The object to populate from persistent store.
@@ -1548,6 +1860,12 @@ llcache_object_fetch_persistent(llcache_object *object,
 	nsurl *referer_clone = NULL;
 	llcache_post_data *post_clone = NULL;
 
+	if (!llcache__scheme_is_persistable(object->url)) {
+		/* Don't bother looking up non-http(s) stuff; we don't
+		 * persist it. */
+		return NSERROR_NOT_FOUND;
+	}
+
 	object->cache.req_time = time(NULL);
 	object->cache.fin_time = object->cache.req_time;
 
@@ -1605,7 +1923,7 @@ llcache_object_retrieve_from_cache(nsurl *url,
 	llcache_object *obj, *newest = NULL;
 
 	NSLOG(llcache, DEBUG,
-	      "Searching cache for %s flags:%x referer:%s post:%p",
+	      "Searching cache for %s flags:%"PRIx32" referer:%s post:%p",
 	      nsurl_access(url), flags,
 	      referer==NULL?"":nsurl_access(referer),
 	      post);
@@ -1782,7 +2100,7 @@ llcache_object_retrieve(nsurl *url,
 	nsurl *defragmented_url;
 	bool uncachable = false;
 
-	NSLOG(llcache, DEBUG, "Retrieve %s (%x, %s, %p)", nsurl_access(url), flags,
+	NSLOG(llcache, DEBUG, "Retrieve %s (%"PRIx32", %s, %p)", nsurl_access(url), flags,
 		     referer==NULL?"":nsurl_access(referer), post);
 
 
@@ -1799,26 +2117,9 @@ llcache_object_retrieve(nsurl *url,
 		/* POST requests are never cached */
 		uncachable = true;
 	} else {
-		/* only http and https schemes are cached */
-		lwc_string *scheme;
-		bool match;
-
-		scheme = nsurl_get_component(defragmented_url, NSURL_SCHEME);
-
-		if (lwc_string_caseless_isequal(scheme, corestring_lwc_http,
-				&match) == lwc_error_ok &&
-				(match == false)) {
-			if (lwc_string_caseless_isequal(scheme,
-					corestring_lwc_https, &match) ==
-					lwc_error_ok &&
-					(match == false)) {
-				uncachable = true;
-			}
-		}
-		lwc_string_unref(scheme);
+		uncachable = !llcache__scheme_is_cachable(defragmented_url);
 	}
 
-
 	if (uncachable) {
 		/* Create new object */
 		error = llcache_object_new(defragmented_url, &obj);
@@ -1906,10 +2207,17 @@ static nserror llcache_hsts_transform_url(nsurl *url, nsurl **result,
 	scheme = nsurl_get_component(url, NSURL_SCHEME);
 	if (lwc_string_caseless_isequal(scheme, corestring_lwc_http,
 			&match) != lwc_error_ok || match == false) {
-		/* Non-HTTP fetch: ignore */
+		/* Non-HTTP fetch: no transform required */
+		if (lwc_string_caseless_isequal(scheme, corestring_lwc_https,
+				&match) == lwc_error_ok && match) {
+			/* HTTPS: ask urldb if HSTS is enabled */
+			*hsts_in_use = urldb_get_hsts_enabled(url);
+		} else {
+			/* Anything else: no HSTS */
+			*hsts_in_use = false;
+		}
 		lwc_string_unref(scheme);
 		*result = nsurl_ref(url);
-		*hsts_in_use = false;
 		return error;
 	}
 	lwc_string_unref(scheme);
@@ -2009,7 +2317,8 @@ static nserror llcache_fetch_redirect(llcache_object *object,
 		NSLOG(llcache, INFO, "Too many nested redirects");
 
 		event.type = LLCACHE_EVENT_ERROR;
-		event.data.msg = messages_get("BadRedirect");
+		event.data.error.code = NSERROR_BAD_REDIRECT;
+		event.data.error.msg = messages_get("BadRedirect");
 
 		return llcache_send_event_to_users(object, &event);
 	}
@@ -2254,37 +2563,6 @@ llcache_fetch_process_data(llcache_object *object,
 	return NSERROR_OK;
 }
 
-/**
- * Handle a query response
- *
- * \param proceed  Whether to proceed with fetch
- * \param cbpw	   Our context for query
- * \return NSERROR_OK on success, appropriate error otherwise
- */
-static nserror llcache_query_handle_response(bool proceed, void *cbpw)
-{
-	llcache_event event;
-	llcache_object *object = cbpw;
-
-	object->fetch.outstanding_query = false;
-
-	/* Refetch, using existing fetch parameters, if client allows us to */
-	if (proceed)
-		return llcache_object_refetch(object);
-
-	/* Invalidate cache-control data */
-	llcache_invalidate_cache_control_data(object);
-
-	/* Mark it complete */
-	object->fetch.state = LLCACHE_FETCH_COMPLETE;
-
-	/* Inform client(s) that object fetch failed */
-	event.type = LLCACHE_EVENT_ERROR;
-	/** \todo More appropriate error message */
-	event.data.msg = messages_get("FetchFailed");
-
-	return llcache_send_event_to_users(object, &event);
-}
 
 /**
  * Handle an authentication request
@@ -2316,39 +2594,20 @@ static nserror llcache_fetch_auth(llcache_object *object, const char *realm)
 	auth = urldb_get_auth_details(object->url, realm);
 
 	if (auth == NULL || object->fetch.tried_with_auth == true) {
+		llcache_event event;
 		/* No authentication details, or tried what we had, so ask */
 		object->fetch.tried_with_auth = false;
 
-		if (llcache->query_cb != NULL) {
-			llcache_query query;
-
-			/* Emit query for authentication details */
-			query.type = LLCACHE_QUERY_AUTH;
-			query.url = object->url;
-			query.data.auth.realm = realm;
-
-			object->fetch.outstanding_query = true;
-
-			error = llcache->query_cb(&query, llcache->query_cb_pw,
-					llcache_query_handle_response, object);
-			if (error != NSERROR_OK) {
-				/* do not continue if error querying user */
-				error = llcache_query_handle_response(false,
-								      object);
-			}
-		} else {
-			llcache_event event;
-
-			/* Mark object complete */
-			object->fetch.state = LLCACHE_FETCH_COMPLETE;
+		/* Mark object complete */
+		object->fetch.state = LLCACHE_FETCH_COMPLETE;
 
-			/* Inform client(s) that object fetch failed */
-			event.type = LLCACHE_EVENT_ERROR;
-			/** \todo More appropriate error message */
-			event.data.msg = messages_get("FetchFailed");
+		/* Inform client(s) that object fetch failed */
+		event.type = LLCACHE_EVENT_ERROR;
+		/** \todo More appropriate error message */
+		event.data.error.code = NSERROR_BAD_AUTH;
+		event.data.error.msg = realm;
 
-			error = llcache_send_event_to_users(object, &event);
-		}
+		error = llcache_send_event_to_users(object, &event);
 	} else {
 		/* Flag that we've tried to refetch with credentials, so
 		 * that if the fetch fails again, we ask the user again */
@@ -2363,12 +2622,9 @@ static nserror llcache_fetch_auth(llcache_object *object, const char *realm)
  * Handle a TLS certificate verification failure
  *
  * \param object  Object being fetched
- * \param certs	  Certificate chain
- * \param num	  Number of certificates in chain
  * \return NSERROR_OK on success, appropriate error otherwise
  */
-static nserror llcache_fetch_cert_error(llcache_object *object,
-		const struct ssl_cert_info *certs, size_t num)
+static nserror llcache_fetch_cert_error(llcache_object *object)
 {
 	nserror error = NSERROR_OK;
 
@@ -2382,23 +2638,19 @@ static nserror llcache_fetch_cert_error(llcache_object *object,
 	object->fetch.tainted_tls = true;
 
 	/* Only give the user a chance if HSTS isn't in use for this fetch */
-	if (object->fetch.hsts_in_use == false && llcache->query_cb != NULL) {
-		llcache_query query;
+	if (object->fetch.hsts_in_use == false) {
+		llcache_event event;
 
-		/* Emit query for TLS */
-		query.type = LLCACHE_QUERY_SSL;
-		query.url = object->url;
-		query.data.ssl.certs = certs;
-		query.data.ssl.num = num;
+		/* Mark object complete */
+		object->fetch.state = LLCACHE_FETCH_COMPLETE;
 
-		object->fetch.outstanding_query = true;
+		/* Inform client(s) that object fetch failed */
+		event.type = LLCACHE_EVENT_ERROR;
+		/** \todo More appropriate error message */
+		event.data.error.code = NSERROR_BAD_CERTS;
+		event.data.error.msg = messages_get("FetchFailed");
 
-		error = llcache->query_cb(&query, llcache->query_cb_pw,
-				llcache_query_handle_response, object);
-		if (error != NSERROR_OK) {
-			/* do not continue if error querying user */
-			error = llcache_query_handle_response(false, object);
-		}
+		error = llcache_send_event_to_users(object, &event);
 	} else {
 		llcache_event event;
 
@@ -2408,7 +2660,8 @@ static nserror llcache_fetch_cert_error(llcache_object *object,
 		/* Inform client(s) that object fetch failed */
 		event.type = LLCACHE_EVENT_ERROR;
 		/** \todo More appropriate error message */
-		event.data.msg = messages_get("FetchFailed");
+		event.data.error.code = NSERROR_UNKNOWN;
+		event.data.error.msg = messages_get("FetchFailed");
 
 		error = llcache_send_event_to_users(object, &event);
 	}
@@ -2416,6 +2669,7 @@ static nserror llcache_fetch_cert_error(llcache_object *object,
 	return error;
 }
 
+
 /**
  * Handle a TLS connection setup failure
  *
@@ -2438,7 +2692,7 @@ static nserror llcache_fetch_ssl_error(llcache_object *object)
 	/* Make no attempt to downgrade if HSTS is in use
 	 * (i.e. assume server does TLS properly) */
 	if (object->fetch.hsts_in_use ||
-			object->fetch.tried_with_tls_downgrade) {
+	    object->fetch.tried_with_tls_downgrade) {
 		/* Have already tried to downgrade, so give up */
 		llcache_event event;
 
@@ -2448,7 +2702,8 @@ static nserror llcache_fetch_ssl_error(llcache_object *object)
 		/* Inform client(s) that object fetch failed */
 		event.type = LLCACHE_EVENT_ERROR;
 		/** \todo More appropriate error message */
-		event.data.msg = messages_get("FetchFailed");
+		event.data.error.code = NSERROR_UNKNOWN;
+		event.data.error.msg = messages_get("FetchFailed");
 
 		error = llcache_send_event_to_users(object, &event);
 	} else {
@@ -2461,6 +2716,46 @@ static nserror llcache_fetch_ssl_error(llcache_object *object)
 	return error;
 }
 
+
+/**
+ * handle time out while trying to fetch.
+ *
+ * \param object Object being fetched
+ * \return NSERROR_OK on success otherwise error code
+ */
+static nserror llcache_fetch_timeout(llcache_object *object)
+{
+	llcache_event event;
+
+	/* The fetch has already been cleaned up by the fetcher but
+	 * we would like to retry if we can.
+	 */
+	if (object->fetch.retries_remaining > 1) {
+		object->fetch.retries_remaining--;
+		return llcache_object_refetch(object);
+	}
+
+	/* The fetch has has already been cleaned up by the fetcher */
+	object->fetch.state = LLCACHE_FETCH_COMPLETE;
+	object->fetch.fetch = NULL;
+
+	/* Release candidate, if any */
+	if (object->candidate != NULL) {
+		object->candidate->candidate_count--;
+		object->candidate = NULL;
+	}
+
+	/* Invalidate cache control data */
+	llcache_invalidate_cache_control_data(object);
+
+	event.type = LLCACHE_EVENT_ERROR;
+	event.data.error.code = NSERROR_TIMEOUT;
+	event.data.error.msg = NULL;
+
+	return llcache_send_event_to_users(object, &event);
+}
+
+
 /**
  * Construct a sorted list of objects available for writeout operation.
  *
@@ -2494,6 +2789,11 @@ build_candidate_list(struct llcache_object ***lst_out, int *lst_len_out)
 	for (object = llcache->cached_objects; object != NULL; object = next) {
 		next = object->next;
 
+		/* Only consider http(s) for the disc cache. */
+		if (!llcache__scheme_is_persistable(object->url)) {
+			continue;
+		}
+
 		remaining_lifetime = llcache_object_rfc2616_remaining_lifetime(
 				&object->cache);
 
@@ -2503,7 +2803,6 @@ build_candidate_list(struct llcache_object ***lst_out, int *lst_len_out)
 		 */
 		if ((object->candidate_count == 0) &&
 		    (object->fetch.fetch == NULL) &&
-		    (object->fetch.outstanding_query == false) &&
 		    (object->store_state == LLCACHE_STATE_RAM) &&
 		    (remaining_lifetime > llcache->minimum_lifetime)) {
 			lst[lst_len] = object;
@@ -2674,7 +2973,7 @@ static void llcache_persist(void *p)
 		total_bandwidth = (total_written * 1000) / total_elapsed;
 
 		NSLOG(llcache, DEBUG,
-		      "Wrote %"PRIssizet" bytes in %lums bw:%lu %s",
+		      "Wrote %"PRIsizet" bytes in %lums bw:%lu %s",
 		      written, elapsed, (written * 1000) / elapsed,
 		      nsurl_access(lst[idx]->url) );
 
@@ -2742,7 +3041,7 @@ static void llcache_persist(void *p)
 	llcache->total_elapsed += total_elapsed;
 
 	NSLOG(llcache, DEBUG,
-	      "writeout size:%"PRIssizet" time:%lu bandwidth:%lubytes/s",
+	      "writeout size:%"PRIsizet" time:%lu bandwidth:%lubytes/s",
 	      total_written, total_elapsed, total_bandwidth);
 
 	NSLOG(llcache, DEBUG, "Rescheduling writeout in %dms", next);
@@ -2794,6 +3093,7 @@ static void llcache_fetch_callback(const fetch_msg *msg, void *p)
 		error = llcache_fetch_redirect(object,
 				msg->data.redirect, &object);
 		break;
+
 	case FETCH_NOTMODIFIED:
 		/* Conditional request determined that cached object is fresh */
 		error = llcache_fetch_notmodified(object, &object);
@@ -2806,6 +3106,7 @@ static void llcache_fetch_callback(const fetch_msg *msg, void *p)
 				msg->data.header_or_data.buf,
 				msg->data.header_or_data.len);
 		break;
+
 	case FETCH_FINISHED:
 		/* Finished fetching */
 	{
@@ -2837,14 +3138,9 @@ static void llcache_fetch_callback(const fetch_msg *msg, void *p)
 	/* Out-of-band information */
 	case FETCH_TIMEDOUT:
 		/* Timed out while trying to fetch. */
-		/* The fetch has already been cleaned up by the fetcher but
-		 * we would like to retry if we can. */
-		if (object->fetch.retries_remaining > 1) {
-			object->fetch.retries_remaining--;
-			error = llcache_object_refetch(object);
-			break;
-		}
-		/* Fall through */
+		error = llcache_fetch_timeout(object);
+		break;
+
 	case FETCH_ERROR:
 		/* An error occurred while fetching */
 		/* The fetch has has already been cleaned up by the fetcher */
@@ -2863,15 +3159,41 @@ static void llcache_fetch_callback(const fetch_msg *msg, void *p)
 		/** \todo Consider using errorcode for something */
 
 		event.type = LLCACHE_EVENT_ERROR;
-		event.data.msg = msg->data.error;
+		event.data.error.code = NSERROR_UNKNOWN;
+		event.data.error.msg = msg->data.error;
 
 		error = llcache_send_event_to_users(object, &event);
 
 		break;
+
 	case FETCH_PROGRESS:
 		/* Progress update */
 		event.type = LLCACHE_EVENT_PROGRESS;
-		event.data.msg = msg->data.progress;
+		event.data.progress_msg = msg->data.progress;
+
+		error = llcache_send_event_to_users(object, &event);
+
+		break;
+
+	case FETCH_CERTS:
+		/* Certificate information from the fetch */
+
+		if (object->chain != NULL) {
+			cert_chain_free(object->chain);
+			object->chain = NULL;
+		}
+
+		/* Persist the chain onto our object */
+		error = cert_chain_dup(msg->data.chain, &object->chain);
+		if (error != NSERROR_OK) {
+			NSLOG(llcache, ERROR,
+			      "Unable to duplicate cert chain into cache: %s",
+			      messages_get_errorcode(error));
+		}
+
+		/* Now pass on the event */
+		event.type = LLCACHE_EVENT_GOT_CERTS;
+		event.data.chain = msg->data.chain;
 
 		error = llcache_send_event_to_users(object, &event);
 
@@ -2889,6 +3211,7 @@ static void llcache_fetch_callback(const fetch_msg *msg, void *p)
 
 		error = llcache_fetch_auth(object, msg->data.auth.realm);
 		break;
+
 	case FETCH_CERT_ERR:
 		/* Something went wrong when validating TLS certificates */
 
@@ -2898,10 +3221,9 @@ static void llcache_fetch_callback(const fetch_msg *msg, void *p)
 			object->candidate = NULL;
 		}
 
-		error = llcache_fetch_cert_error(object,
-				msg->data.cert_err.certs,
-				msg->data.cert_err.num_certs);
+		error = llcache_fetch_cert_error(object);
 		break;
+
 	case FETCH_SSL_ERR:
 		/* TLS connection setup failed */
 
@@ -3073,6 +3395,39 @@ static nserror llcache_object_notify_users(llcache_object *object)
 		if (handle->state == LLCACHE_FETCH_INIT &&
 				objstate > LLCACHE_FETCH_INIT) {
 			handle->state = LLCACHE_FETCH_HEADERS;
+
+			/* Emit any certificate data we hold */
+			if (object->chain != NULL) {
+				event.type = LLCACHE_EVENT_GOT_CERTS;
+				event.data.chain = object->chain;
+				error = handle->cb(handle, &event, handle->pw);
+			} else {
+				error = NSERROR_OK;
+			}
+
+			if (user->queued_for_delete) {
+				next_user = user->next;
+				llcache_object_remove_user(object, user);
+				llcache_object_user_destroy(user);
+
+				if (error != NSERROR_OK)
+					return error;
+
+				continue;
+			} else if (error == NSERROR_NEED_DATA) {
+				/* User requested replay */
+				handle->state = LLCACHE_FETCH_HEADERS;
+
+				/* Continue with the next user -- we'll
+				 * reemit the event next time round */
+				user->iterator_target = false;
+				next_user = user->next;
+				llcache_users_not_caught_up();
+				continue;
+			} else if (error != NSERROR_OK) {
+				user->iterator_target = false;
+				return error;
+			}
 		}
 
 		/* User: HEADERS, Obj: DATA, COMPLETE => User->DATA */
@@ -3266,6 +3621,14 @@ llcache_object_snapshot(llcache_object *object,	llcache_object **snapshot)
 		}
 	}
 
+	if (object->chain != NULL) {
+		error = cert_chain_dup(object->chain, &newobj->chain);
+		if (error != NSERROR_OK) {
+			llcache_object_destroy(newobj);
+			return error;
+		}
+	}
+
 	newobj->fetch.state = LLCACHE_FETCH_COMPLETE;
 
 	*snapshot = newobj;
@@ -3303,9 +3666,51 @@ total_object_size(llcache_object *object)
 		}
 	}
 
+	tot += cert_chain_size(object->chain);
+
 	return tot;
 }
 
+/**
+ * Catch up the cache users with state changes from fetchers.
+ *
+ * \param ignored We ignore this because all our state comes from llcache.
+ */
+static void llcache_catch_up_all_users(void *ignored)
+{
+	llcache_object *object;
+
+	/* Assume after this we'll be all caught up.  If any user of a handle
+	 * defers then we'll invalidate all_caught_up and reschedule via
+	 * llcache_users_not_caught_up()
+	 */
+	llcache->all_caught_up = true;
+
+	/* Catch new users up with state of objects */
+	for (object = llcache->cached_objects; object != NULL;
+			object = object->next) {
+		llcache_object_notify_users(object);
+	}
+
+	for (object = llcache->uncached_objects; object != NULL;
+			object = object->next) {
+		llcache_object_notify_users(object);
+	}
+}
+
+/**
+ * Ask for ::llcache_catch_up_all_users to be scheduled ASAP to pump the
+ * user state machines.
+ */
+static void llcache_users_not_caught_up(void)
+{
+	if (llcache->all_caught_up) {
+		llcache->all_caught_up = false;
+		guit->misc->schedule(0, llcache_catch_up_all_users, NULL);
+	}
+}
+
+
 /******************************************************************************
  * Public API								      *
  ******************************************************************************/
@@ -3342,8 +3747,7 @@ void llcache_clean(bool purge)
 		/* The candidate count of uncacheable objects is always 0 */
 		if ((object->users == NULL) &&
 		    (object->candidate_count == 0) &&
-		    (object->fetch.fetch == NULL) &&
-		    (object->fetch.outstanding_query == false)) {
+		    (object->fetch.fetch == NULL)) {
 			NSLOG(llcache, DEBUG, "Discarding uncachable object with no users (%p) %s",
 				    object, nsurl_access(object->url));
 
@@ -3368,7 +3772,6 @@ void llcache_clean(bool purge)
 		if ((object->users == NULL) &&
 		    (object->candidate_count == 0) &&
 		    (object->fetch.fetch == NULL) &&
-		    (object->fetch.outstanding_query == false) &&
 		    (remaining_lifetime <= 0)) {
 			/* object is stale */
 			NSLOG(llcache, DEBUG, "discarding stale cacheable object with no "
@@ -3409,7 +3812,6 @@ void llcache_clean(bool purge)
 		if ((object->users == NULL) &&
 		    (object->candidate_count == 0) &&
 		    (object->fetch.fetch == NULL) &&
-		    (object->fetch.outstanding_query == false) &&
 		    (object->store_state == LLCACHE_STATE_DISC)) {
 			guit->llcache->release(object->url, BACKING_STORE_NONE);
 
@@ -3418,7 +3820,7 @@ void llcache_clean(bool purge)
 			llcache_size -=	object->source_len;
 
 			NSLOG(llcache, DEBUG,
-			      "Freeing source data for %p len:%"PRIssizet,
+			      "Freeing source data for %p len:%"PRIsizet,
 			      object, object->source_len);
 		}
 	}
@@ -3434,11 +3836,10 @@ void llcache_clean(bool purge)
 		if ((object->users == NULL) &&
 		    (object->candidate_count == 0) &&
 		    (object->fetch.fetch == NULL) &&
-		    (object->fetch.outstanding_query == false) &&
 		    (object->store_state == LLCACHE_STATE_DISC) &&
 		    (object->source_data == NULL)) {
 			NSLOG(llcache, DEBUG,
-			     "discarding backed object len:%"PRIssizet" age:%ld (%p) %s",
+			     "discarding backed object len:%"PRIsizet" age:%ld (%p) %s",
 			      object->source_len,
 			      (long)(time(NULL) - object->last_used),
 			      object,
@@ -3466,10 +3867,9 @@ void llcache_clean(bool purge)
 		if ((object->users == NULL) &&
 		    (object->candidate_count == 0) &&
 		    (object->fetch.fetch == NULL) &&
-		    (object->fetch.outstanding_query == false) &&
 		    (object->store_state == LLCACHE_STATE_RAM)) {
 			NSLOG(llcache, DEBUG,
-			      "discarding fresh object len:%"PRIssizet" age:%ld (%p) %s",
+			      "discarding fresh object len:%"PRIsizet" age:%ld (%p) %s",
 			      object->source_len,
 			      (long)(time(NULL) - object->last_used),
 			      object,
@@ -3483,7 +3883,7 @@ void llcache_clean(bool purge)
 		}
 	}
 
-	NSLOG(llcache, DEBUG, "Size: %u (limit: %u)", llcache_size, limit);
+	NSLOG(llcache, DEBUG, "Size: %"PRIu32" (limit: %"PRIu32")", llcache_size, limit);
 }
 
 /* Exported interface documented in content/llcache.h */
@@ -3495,8 +3895,6 @@ llcache_initialise(const struct llcache_parameters *prm)
 		return NSERROR_NOMEM;
 	}
 
-	llcache->query_cb = prm->cb;
-	llcache->query_cb_pw = prm->cb_ctx;
 	llcache->limit = prm->limit;
 	llcache->minimum_lifetime = prm->minimum_lifetime;
 	llcache->minimum_bandwidth = prm->minimum_bandwidth;
@@ -3506,7 +3904,7 @@ llcache_initialise(const struct llcache_parameters *prm)
 	llcache->all_caught_up = true;
 
 	NSLOG(llcache, INFO,
-	      "llcache initialising with a limit of %d bytes",
+	      "llcache initialising with a limit of %"PRIu32" bytes",
 	      llcache->limit);
 
 	/* backing store initialisation */
@@ -3520,6 +3918,11 @@ void llcache_finalise(void)
 	llcache_object *object, *next;
 	uint64_t total_bandwidth = 0; /* total bandwidth */
 
+	/* Attempt to persist anything we have left lying around */
+	llcache_persist(NULL);
+	/* Now clear the persistence callback */
+	guit->misc->schedule(-1, llcache_persist, NULL);
+
 	/* Clean uncached objects */
 	for (object = llcache->uncached_objects; object != NULL; object = next) {
 		llcache_object_user *user, *next_user;
@@ -3580,51 +3983,16 @@ void llcache_finalise(void)
 	llcache = NULL;
 }
 
-/**
- * Catch up the cache users with state changes from fetchers.
- *
- * \param ignored We ignore this because all our state comes from llcache.
- */
-static void llcache_catch_up_all_users(void *ignored)
-{
-	llcache_object *object;
-
-	/* Assume after this we'll be all caught up.  If any user of a handle
-	 * defers then we'll invalidate all_caught_up and reschedule via
-	 * llcache_users_not_caught_up()
-	 */
-	llcache->all_caught_up = true;
-
-	/* Catch new users up with state of objects */
-	for (object = llcache->cached_objects; object != NULL;
-			object = object->next) {
-		llcache_object_notify_users(object);
-	}
-
-	for (object = llcache->uncached_objects; object != NULL;
-			object = object->next) {
-		llcache_object_notify_users(object);
-	}
-}
-
-/**
- * Ask for ::llcache_catch_up_all_users to be scheduled ASAP to pump the
- * user state machines.
- */
-static void llcache_users_not_caught_up(void)
-{
-	if (llcache->all_caught_up) {
-		llcache->all_caught_up = false;
-		guit->misc->schedule(0, llcache_catch_up_all_users, NULL);
-	}
-}
 
 
 /* Exported interface documented in content/llcache.h */
-nserror llcache_handle_retrieve(nsurl *url, uint32_t flags,
-		nsurl *referer, const llcache_post_data *post,
-		llcache_handle_callback cb, void *pw,
-		llcache_handle **result)
+nserror
+llcache_handle_retrieve(nsurl *url,
+			uint32_t flags,
+			nsurl *referer,
+			const llcache_post_data *post,
+			llcache_handle_callback cb, void *pw,
+			llcache_handle **result)
 {
 	nserror error;
 	llcache_object_user *user;
diff --git a/content/llcache.h b/content/llcache.h
index 796db66f8..f9a3016c6 100644
--- a/content/llcache.h
+++ b/content/llcache.h
@@ -30,7 +30,7 @@
 #include "utils/errors.h"
 #include "utils/nsurl.h"
 
-struct ssl_cert_info;
+struct cert_chain;
 struct fetch_multipart_data;
 
 /** Handle for low-level cache object */
@@ -48,8 +48,24 @@ typedef struct llcache_post_data {
 	} data;				/**< POST data content */
 } llcache_post_data;
 
+/** Flags for low-level cache object retrieval */
+enum llcache_retrieve_flag {
+	/* Note: We're permitted a maximum of 16 flags which must reside in the
+	 * bottom 16 bits of the flags word. See hlcache.h for further details.
+	 */
+	/** Force a new fetch */
+	LLCACHE_RETRIEVE_FORCE_FETCH    = (1 << 0),
+	/** Requested URL was verified */
+	LLCACHE_RETRIEVE_VERIFIABLE     = (1 << 1),
+	/**< No error pages */
+	LLCACHE_RETRIEVE_NO_ERROR_PAGES = (1 << 2),
+	/**< Stream data (implies that object is not cacheable) */
+	LLCACHE_RETRIEVE_STREAM_DATA    = (1 << 3)
+};
+
 /** Low-level cache event types */
 typedef enum {
+	LLCACHE_EVENT_GOT_CERTS,        /**< SSL certificates arrived */
 	LLCACHE_EVENT_HAD_HEADERS,	/**< Received all headers */
 	LLCACHE_EVENT_HAD_DATA,		/**< Received some data */
 	LLCACHE_EVENT_DONE,		/**< Finished fetching data */
@@ -60,20 +76,30 @@ typedef enum {
 	LLCACHE_EVENT_REDIRECT		/**< Fetch URL redirect occured */
 } llcache_event_type;
 
-/** Low-level cache events */
+/**
+ * Low-level cache events.
+ *
+ * Lifetime of contained information is only for the duration of the event
+ * and must be copied if it is desirable to retain.
+ */
 typedef struct {
-	llcache_event_type type;	/**< Type of event */
+	llcache_event_type type;            /**< Type of event */
 	union {
 		struct {
-			const uint8_t *buf;	/**< Buffer of data */
-			size_t len;	/**< Length of buffer, in bytes */
-		} data;			/**< Received data */
-		const char *msg;	/**< Error or progress message */
+			const uint8_t *buf; /**< Buffer of data */
+			size_t len;	    /**< Byte length of buffer */
+		} data;                     /**< Received data */
 		struct {
-			nsurl *from;	/**< Redirect origin */
-			nsurl *to;	/**< Redirect target */
-		} redirect;		/**< Fetch URL redirect occured */
-	} data;				/**< Event data */
+			nserror code;       /**< The error code */
+			const char *msg;    /**< Error message */
+		} error;
+		const char *progress_msg;   /**< Progress message */
+		struct {
+			nsurl *from;	    /**< Redirect origin */
+			nsurl *to;	    /**< Redirect target */
+		} redirect;                 /**< Fetch URL redirect occured */
+		const struct cert_chain *chain;    /**< Certificate chain */
+	} data;				    /**< Event data */
 } llcache_event;
 
 /**
@@ -87,75 +113,6 @@ typedef struct {
 typedef nserror (*llcache_handle_callback)(llcache_handle *handle,
 		const llcache_event *event, void *pw);
 
-/** Flags for low-level cache object retrieval */
-enum llcache_retrieve_flag {
-	/* Note: We're permitted a maximum of 16 flags which must reside in the
-	 * bottom 16 bits of the flags word. See hlcache.h for further details.
-	 */
-	/** Force a new fetch */
-	LLCACHE_RETRIEVE_FORCE_FETCH    = (1 << 0),
-	/** Requested URL was verified */
-	LLCACHE_RETRIEVE_VERIFIABLE     = (1 << 1),
-	/**< No error pages */
-	LLCACHE_RETRIEVE_NO_ERROR_PAGES = (1 << 2),
-	/**< Stream data (implies that object is not cacheable) */
-	LLCACHE_RETRIEVE_STREAM_DATA    = (1 << 3)
-};
-
-/** Low-level cache query types */
-typedef enum {
-	LLCACHE_QUERY_AUTH,		/**< Need authentication details */
-	LLCACHE_QUERY_REDIRECT,		/**< Need permission to redirect */
-	LLCACHE_QUERY_SSL		/**< SSL chain needs inspection */
-} llcache_query_type;
-
-/** Low-level cache query */
-typedef struct {
-	llcache_query_type type;	/**< Type of query */
-
-	nsurl *url;			/**< URL being fetched */
-
-	union {
-		struct {
-			const char *realm;	/**< Authentication realm */
-		} auth;
-
-		struct {
-			const char *target;	/**< Redirect target */
-		} redirect;
-
-		struct {
-			const struct ssl_cert_info *certs;
-			size_t num;		/**< Number of certs in chain */
-		} ssl;
-	} data;
-} llcache_query;
-
-/**
- * Response handler for fetch-related queries
- *
- * \param proceed  Whether to proceed with the fetch or not
- * \param cbpw     Opaque value provided to llcache_query_callback
- * \return NSERROR_OK on success, appropriate error otherwise
- */
-typedef nserror (*llcache_query_response)(bool proceed, void *cbpw);
-
-/**
- * Callback to handle fetch-related queries
- *
- * \param query  Object containing details of query
- * \param pw     Pointer to callback-specific data
- * \param cb     Callback that client should call once query is satisfied
- * \param cbpw   Opaque value to pass into \a cb
- * \return NSERROR_OK on success, appropriate error otherwise
- *
- * \note This callback should return immediately. Once a suitable answer to
- *       the query has been obtained, the provided response callback should be
- *       called. This is intended to be an entirely asynchronous process.
- */
-typedef nserror (*llcache_query_callback)(const llcache_query *query, void *pw,
-		llcache_query_response cb, void *cbpw);
-
 /**
  * Parameters to configure the low level cache backing store.
  */
@@ -164,67 +121,27 @@ struct llcache_store_parameters {
 
 	size_t limit; /**< The backing store upper bound target size */
 	size_t hysteresis; /**< The hysteresis around the target size */
-
-	/** log2 of the default maximum number of entries the cache
-	 * can track.
-	 *
-	 * If unset this defaults to 16 (65536 entries) The cache
-	 * control file takes precedence so cache data remains
-	 * portable between builds with differing defaults.
-	 */
-	unsigned int entry_size;
-
-	/** log2 of the default number of entries in the mapping between
-	 * the url and cache entries.
-	 *
-	 * @note This is exposing an internal implementation detail of
-	 * the filesystem based default backing store implementation.
-	 * However it is likely any backing store implementation will
-	 * need some way to map url to cache entries so it is a
-	 * generally useful configuration value.
-	 *
-	 * Too small a value will cause unecessary collisions and
-	 * cache misses and larger values cause proportionaly larger
-	 * amounts of memory to be used.
-	 *
-	 * The "birthday paradox" means that the hash will experience
-	 * a collision in every 2^(address_size/2) urls the cache
-	 * stores.
-	 *
-	 * A value of 20 means one object stored in every 1024 will
-	 * cause a collion and a cache miss while using two megabytes
-	 * of storage.
-	 *
-	 * If unset this defaults to 20 (1048576 entries using two
-	 * megabytes) The cache control file takes precedence so cache
-	 * data remains portable between builds with differing
-	 * defaults.
-	 */
-	unsigned int address_size;
 };
 
 /**
  * Parameters to configure the low level cache.
  */
 struct llcache_parameters {
-	llcache_query_callback cb; /**< Query handler for llcache */
-	void *cb_ctx; /**< Pointer to llcache query handler data */
-
 	size_t limit; /**< The target upper bound for the RAM cache size */
 	size_t hysteresis; /**< The hysteresis around the target size */
 
 	/** The minimum lifetime to consider sending objects to backing store.*/
-	int minimum_lifetime; 
+	int minimum_lifetime;
 
 	/** The minimum bandwidth to allow the backing store to
 	 * use in bytes/second
 	 */
-	size_t minimum_bandwidth; 
+	size_t minimum_bandwidth;
 
 	/** The maximum bandwidth to allow the backing store to use in
 	 * bytes/second
 	 */
-	size_t maximum_bandwidth; 
+	size_t maximum_bandwidth;
 
 	/** The time quantum over which to calculate the bandwidth values
 	 */
diff --git a/content/mimesniff.c b/content/mimesniff.c
index 9a11834f9..adc000dd7 100644
--- a/content/mimesniff.c
+++ b/content/mimesniff.c
@@ -260,6 +260,13 @@ static nserror mimesniff__match_unknown_exact(const uint8_t *data, size_t len,
 		SIG(&corestring_lwc_application_x_gzip, "\x1f\x8b\x08", true),
 		SIG(&corestring_lwc_application_postscript, "%!PS-Adobe-",true),
 		SIG(&corestring_lwc_application_pdf, "%PDF-", false),
+		SIG(&corestring_lwc_image_jxl, "\xFF\x0A", true), /* containerless jpeg xl*/
+		{
+			(const uint8_t *)"\x00\x00\x00\x0CJXL \x0D\x0A\x87\x0A",
+			12,
+			true,
+			&corestring_lwc_image_jxl
+		}, /* containered jpeg xl*/
 		{ NULL, 0, false, NULL }
 	};
 #undef SIG
@@ -376,6 +383,12 @@ static nserror mimesniff__compute_image(lwc_string *official_type,
 		SIG(&corestring_lwc_image_jpeg, "\xff\xd8\xff"),
 		SIG(&corestring_lwc_image_bmp, "BM"),
 		SIG(&corestring_lwc_image_vnd_microsoft_icon, "\x00\x00\x01\x00"),
+		SIG(&corestring_lwc_image_jxl, "\xFF\x0A"), /* containerless jpeg xl*/
+		{
+			(const uint8_t *)"\x00\x00\x00\x0CJXL \x0D\x0A\x87\x0A",
+			12,
+			&corestring_lwc_image_jxl
+		}, /* containered jpeg xl*/
 		{ NULL, 0, NULL }
 	};
 #undef SIG
diff --git a/content/textsearch.c b/content/textsearch.c
new file mode 100644
index 000000000..3f97d42ee
--- /dev/null
+++ b/content/textsearch.c
@@ -0,0 +1,740 @@
+/*
+ * Copyright 2004 John M Bell <jmb202@ecs.soton.ac.uk>
+ * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * Free text search
+ */
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "utils/errors.h"
+#include "utils/utils.h"
+#include "utils/ascii.h"
+#include "netsurf/types.h"
+#include "desktop/selection.h"
+
+#include "content/content.h"
+#include "content/content_protected.h"
+#include "content/hlcache.h"
+#include "content/textsearch.h"
+
+/**
+ * search match
+ */
+struct list_entry {
+	/**
+	 * previous match
+	 */
+	struct list_entry *prev;
+
+	/**
+	 * next match
+	 */
+	struct list_entry *next;
+
+	/**
+	 * start position of match
+	 */
+	unsigned start_idx;
+
+	/**
+	 * end of match
+	 */
+	unsigned end_idx;
+
+	/**
+	 * content opaque start pointer
+	 */
+	struct box *start_box;
+
+	/**
+	 * content opaque end pointer
+	 */
+	struct box *end_box;
+
+	/**
+	 * content specific selection object
+	 */
+	struct selection *sel;
+};
+
+/**
+ * The context for a free text search
+ */
+struct textsearch_context {
+
+	/**
+	 * content search was performed upon
+	 */
+	struct content *c;
+
+	/**
+	 * opaque pointer passed to constructor.
+	 */
+	void *gui_p;
+
+	/**
+	 * List of matches
+	 */
+	struct list_entry *found;
+
+	/**
+	 * current selected match
+	 */
+	struct list_entry *current; /* first for select all */
+
+	/**
+	 * query string search results are for
+	 */
+	char *string;
+	bool prev_case_sens;
+	bool newsearch;
+};
+
+
+/**
+ * broadcast textsearch message
+ */
+static inline void
+textsearch_broadcast(struct textsearch_context *textsearch,
+		     int type,
+		     bool state,
+		     const char *string)
+{
+	union content_msg_data msg_data;
+	msg_data.textsearch.type = type;
+	msg_data.textsearch.ctx = textsearch->gui_p;
+	msg_data.textsearch.state = state;
+	msg_data.textsearch.string = string;
+	content_broadcast(textsearch->c, CONTENT_MSG_TEXTSEARCH, &msg_data);
+}
+
+
+/**
+ * Release the memory used by the list of matches,
+ * deleting selection objects too
+ */
+static void free_matches(struct textsearch_context *textsearch)
+{
+	struct list_entry *cur;
+	struct list_entry *nxt;
+
+	cur = textsearch->found->next;
+
+	/*
+	 * empty the list before clearing and deleting the selections
+	 * because the the clearing may update the toolkit immediately,
+	 * causing nested accesses to the list
+	 */
+
+	textsearch->found->prev = NULL;
+	textsearch->found->next = NULL;
+
+	for (; cur; cur = nxt) {
+		nxt = cur->next;
+		if (cur->sel) {
+			selection_destroy(cur->sel);
+		}
+		free(cur);
+	}
+}
+
+
+/**
+ * Specifies whether all matches or just the current match should
+ * be highlighted in the search text.
+ */
+static void search_show_all(bool all, struct textsearch_context *context)
+{
+	struct list_entry *a;
+
+	for (a = context->found->next; a; a = a->next) {
+		bool add = true;
+		if (!all && a != context->current) {
+			add = false;
+			if (a->sel) {
+				selection_destroy(a->sel);
+				a->sel = NULL;
+			}
+		}
+
+		if (add && !a->sel) {
+
+			a->sel = selection_create(context->c);
+			if (a->sel != NULL) {
+				selection_init(a->sel);
+				selection_set_position(a->sel,
+						       a->start_idx,
+						       a->end_idx);
+			}
+		}
+	}
+}
+
+
+/**
+ * Search for a string in a content.
+ *
+ * \param context The search context.
+ * \param string the string to search for
+ * \param string_len length of search string
+ * \param flags flags to control the search.
+ */
+static nserror
+search_text(struct textsearch_context *context,
+	    const char *string,
+	    int string_len,
+	    search_flags_t flags)
+{
+	struct rect bounds;
+	union content_msg_data msg_data;
+	bool case_sensitive, forwards, showall;
+	nserror res = NSERROR_OK;
+
+	case_sensitive = ((flags & SEARCH_FLAG_CASE_SENSITIVE) != 0) ?
+			true : false;
+	forwards = ((flags & SEARCH_FLAG_FORWARDS) != 0) ? true : false;
+	showall = ((flags & SEARCH_FLAG_SHOWALL) != 0) ? true : false;
+
+	if (context->c == NULL) {
+		return res;
+	}
+
+	/* check if we need to start a new search or continue an old one */
+	if ((context->newsearch) ||
+	    (context->prev_case_sens != case_sensitive)) {
+
+		if (context->string != NULL) {
+			free(context->string);
+		}
+
+		context->current = NULL;
+		free_matches(context);
+
+		context->string = malloc(string_len + 1);
+		if (context->string != NULL) {
+			memcpy(context->string, string, string_len);
+			context->string[string_len] = '\0';
+		}
+
+		/* indicate find operation starting */
+		textsearch_broadcast(context, CONTENT_TEXTSEARCH_FIND, true, NULL);
+
+
+		/* call content find handler */
+		res = context->c->handler->textsearch_find(context->c,
+							   context,
+							   string,
+							   string_len,
+							   case_sensitive);
+
+		/* indicate find operation finished */
+		textsearch_broadcast(context, CONTENT_TEXTSEARCH_FIND, false, NULL);
+
+		if (res != NSERROR_OK) {
+			free_matches(context);
+			return res;
+		}
+
+		context->prev_case_sens = case_sensitive;
+
+		/* new search, beginning at the top of the page */
+		context->current = context->found->next;
+		context->newsearch = false;
+
+	} else if (context->current != NULL) {
+		/* continued search in the direction specified */
+		if (forwards) {
+			if (context->current->next)
+				context->current = context->current->next;
+		} else {
+			if (context->current->prev)
+				context->current = context->current->prev;
+		}
+	}
+
+	/* update match state */
+	textsearch_broadcast(context,
+			     CONTENT_TEXTSEARCH_MATCH,
+			     (context->current != NULL),
+			     NULL);
+
+	search_show_all(showall, context);
+
+	/* update back state */
+	textsearch_broadcast(context,
+			     CONTENT_TEXTSEARCH_BACK,
+			     ((context->current != NULL) &&
+			      (context->current->prev != NULL)),
+			     NULL);
+
+	/* update forward state */
+	textsearch_broadcast(context,
+			     CONTENT_TEXTSEARCH_FORWARD,
+			     ((context->current != NULL) &&
+			      (context->current->next != NULL)),
+			     NULL);
+
+
+	if (context->current == NULL) {
+		/* no current match */
+		return res;
+	}
+
+	/* call content match bounds handler */
+	res = context->c->handler->textsearch_bounds(context->c,
+					context->current->start_idx,
+					context->current->end_idx,
+					context->current->start_box,
+					context->current->end_box,
+					&bounds);
+	if (res == NSERROR_OK) {
+		msg_data.scroll.area = true;
+		msg_data.scroll.x0 = bounds.x0;
+		msg_data.scroll.y0 = bounds.y0;
+		msg_data.scroll.x1 = bounds.x1;
+		msg_data.scroll.y1 = bounds.y1;
+		content_broadcast(context->c, CONTENT_MSG_SCROLL, &msg_data);
+	}
+
+	return res;
+}
+
+
+/**
+ * Begins/continues the search process
+ *
+ * \note that this may be called many times for a single search.
+ *
+ * \param context The search context in use.
+ * \param flags   The flags forward/back etc
+ * \param string  The string to match
+ */
+static nserror
+content_textsearch_step(struct textsearch_context *textsearch,
+			search_flags_t flags,
+			const char *string)
+{
+	int string_len;
+	int i = 0;
+	nserror res = NSERROR_OK;
+
+	assert(textsearch != NULL);
+
+	/* broadcast recent query string */
+	textsearch_broadcast(textsearch,
+			     CONTENT_TEXTSEARCH_RECENT,
+			     false,
+			     string);
+
+	string_len = strlen(string);
+	for (i = 0; i < string_len; i++) {
+		if (string[i] != '#' && string[i] != '*')
+			break;
+	}
+
+	if (i < string_len) {
+		res = search_text(textsearch, string, string_len, flags);
+	} else {
+		union content_msg_data msg_data;
+
+		free_matches(textsearch);
+
+		/* update match state */
+		textsearch_broadcast(textsearch,
+				     CONTENT_TEXTSEARCH_MATCH,
+				     true,
+				     NULL);
+
+		/* update back state */
+		textsearch_broadcast(textsearch,
+				     CONTENT_TEXTSEARCH_BACK,
+				     false,
+				     NULL);
+
+		/* update forward state */
+		textsearch_broadcast(textsearch,
+				     CONTENT_TEXTSEARCH_FORWARD,
+				     false,
+				     NULL);
+
+		/* clear scroll */
+		msg_data.scroll.area = false;
+		msg_data.scroll.x0 = 0;
+		msg_data.scroll.y0 = 0;
+		content_broadcast(textsearch->c,
+				  CONTENT_MSG_SCROLL,
+				  &msg_data);
+	}
+
+	return res;
+}
+
+
+/**
+ * Terminate a search.
+ *
+ * \param c content to clear
+ */
+static nserror content_textsearch__clear(struct content *c)
+{
+	free(c->textsearch.string);
+	c->textsearch.string = NULL;
+
+	if (c->textsearch.context != NULL) {
+		content_textsearch_destroy(c->textsearch.context);
+		c->textsearch.context = NULL;
+	}
+	return NSERROR_OK;
+}
+
+
+/**
+ * create a search_context
+ *
+ * \param c The content the search_context is connected to
+ * \param context A context pointer passed to the provider routines.
+ * \param search_out A pointer to recive the new text search context
+ * \return NSERROR_OK on success and \a search_out updated else error code
+ */
+static nserror
+content_textsearch_create(struct content *c,
+			  void *gui_data,
+			  struct textsearch_context **textsearch_out)
+{
+	struct textsearch_context *context;
+	struct list_entry *search_head;
+	content_type type;
+
+	if ((c->handler->textsearch_find == NULL) ||
+	    (c->handler->textsearch_bounds == NULL)) {
+		/*
+		 * content has no free text find handler so searching
+		 *   is unsupported.
+		 */
+		return NSERROR_NOT_IMPLEMENTED;
+	}
+
+	type = c->handler->type();
+
+	context = malloc(sizeof(struct textsearch_context));
+	if (context == NULL) {
+		return NSERROR_NOMEM;
+	}
+
+	search_head = malloc(sizeof(struct list_entry));
+	if (search_head == NULL) {
+		free(context);
+		return NSERROR_NOMEM;
+	}
+
+	search_head->start_idx = 0;
+	search_head->end_idx = 0;
+	search_head->start_box = NULL;
+	search_head->end_box = NULL;
+	search_head->sel = NULL;
+	search_head->prev = NULL;
+	search_head->next = NULL;
+
+	context->found = search_head;
+	context->current = NULL;
+	context->string = NULL;
+	context->prev_case_sens = false;
+	context->newsearch = true;
+	context->c = c;
+	context->gui_p = gui_data;
+
+	*textsearch_out = context;
+
+	return NSERROR_OK;
+}
+
+
+/* exported interface, documented in content/textsearch.h */
+const char *
+content_textsearch_find_pattern(const char *string,
+				int s_len,
+				const char *pattern,
+				int p_len,
+				bool case_sens,
+				unsigned int *m_len)
+{
+	struct { const char *ss, *s, *p; bool first; } context[16];
+	const char *ep = pattern + p_len;
+	const char *es = string  + s_len;
+	const char *p = pattern - 1;  /* a virtual '*' before the pattern */
+	const char *ss = string;
+	const char *s = string;
+	bool first = true;
+	int top = 0;
+
+	while (p < ep) {
+		bool matches;
+		if (p < pattern || *p == '*') {
+			char ch;
+
+			/* skip any further asterisks; one is the same as many
+			*/
+			do p++; while (p < ep && *p == '*');
+
+			/* if we're at the end of the pattern, yes, it matches
+			*/
+			if (p >= ep) break;
+
+			/* anything matches a # so continue matching from
+			   here, and stack a context that will try to match
+			   the wildcard against the next character */
+
+			ch = *p;
+			if (ch != '#') {
+				/* scan forwards until we find a match for
+				   this char */
+				if (!case_sens) ch = ascii_to_upper(ch);
+				while (s < es) {
+					if (case_sens) {
+						if (*s == ch) break;
+					} else if (ascii_to_upper(*s) == ch)
+						break;
+					s++;
+				}
+			}
+
+			if (s < es) {
+				/* remember where we are in case the match
+				   fails; we may then resume */
+				if (top < (int)NOF_ELEMENTS(context)) {
+					context[top].ss = ss;
+					context[top].s  = s + 1;
+					context[top].p  = p - 1;
+					/* ptr to last asterisk */
+					context[top].first = first;
+					top++;
+				}
+
+				if (first) {
+					ss = s;
+					/* remember first non-'*' char */
+					first = false;
+				}
+
+				matches = true;
+			} else {
+				matches = false;
+			}
+
+		} else if (s < es) {
+			char ch = *p;
+			if (ch == '#')
+				matches = true;
+			else {
+				if (case_sens)
+					matches = (*s == ch);
+				else
+					matches = (ascii_to_upper(*s) == ascii_to_upper(ch));
+			}
+			if (matches && first) {
+				ss = s;  /* remember first non-'*' char */
+				first = false;
+			}
+		} else {
+			matches = false;
+		}
+
+		if (matches) {
+			p++; s++;
+		} else {
+			/* doesn't match,
+			 * resume with stacked context if we have one */
+			if (--top < 0)
+				return NULL;  /* no match, give up */
+
+			ss = context[top].ss;
+			s  = context[top].s;
+			p  = context[top].p;
+			first = context[top].first;
+		}
+	}
+
+	/* end of pattern reached */
+	*m_len = max(s - ss, 1);
+	return ss;
+}
+
+
+/* exported interface, documented in content/textsearch.h */
+nserror
+content_textsearch_add_match(struct textsearch_context *context,
+			     unsigned start_idx,
+			     unsigned end_idx,
+			     struct box *start_box,
+			     struct box *end_box)
+{
+	struct list_entry *entry;
+
+	/* found string in box => add to list */
+	entry = calloc(1, sizeof(*entry));
+	if (entry == NULL) {
+		return NSERROR_NOMEM;
+	}
+
+	entry->start_idx = start_idx;
+	entry->end_idx = end_idx;
+	entry->start_box = start_box;
+	entry->end_box = end_box;
+	entry->sel = NULL;
+
+	entry->next = NULL;
+	entry->prev = context->found->prev;
+
+	if (context->found->prev == NULL) {
+		context->found->next = entry;
+	} else {
+		context->found->prev->next = entry;
+	}
+
+	context->found->prev = entry;
+
+	return NSERROR_OK;
+}
+
+
+/* exported interface, documented in content/textsearch.h */
+bool
+content_textsearch_ishighlighted(struct textsearch_context *textsearch,
+				 unsigned start_offset,
+				 unsigned end_offset,
+				 unsigned *start_idx,
+				 unsigned *end_idx)
+{
+	struct list_entry *cur;
+
+	for (cur = textsearch->found->next; cur != NULL; cur = cur->next) {
+		if (cur->sel &&
+		    selection_highlighted(cur->sel,
+					  start_offset,
+					  end_offset,
+					  start_idx,
+					  end_idx)) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+
+/* exported interface, documented in content/textsearch.h */
+nserror content_textsearch_destroy(struct textsearch_context *textsearch)
+{
+	assert(textsearch != NULL);
+
+	if (textsearch->string != NULL) {
+		/* broadcast recent query string */
+		textsearch_broadcast(textsearch,
+				     CONTENT_TEXTSEARCH_RECENT,
+				     false,
+				     textsearch->string);
+
+		free(textsearch->string);
+	}
+
+	/* update back state */
+	textsearch_broadcast(textsearch,
+			     CONTENT_TEXTSEARCH_BACK,
+			     true,
+			     NULL);
+
+	/* update forward state */
+	textsearch_broadcast(textsearch,
+			     CONTENT_TEXTSEARCH_FORWARD,
+			     true,
+			     NULL);
+
+	free_matches(textsearch);
+	free(textsearch);
+
+	return NSERROR_OK;
+}
+
+
+/* exported interface, documented in content/content.h */
+nserror
+content_textsearch(struct hlcache_handle *h,
+		   void *context,
+		   search_flags_t flags,
+		   const char *string)
+{
+	struct content *c = hlcache_handle_get_content(h);
+	nserror res;
+
+	assert(c != NULL);
+
+	if (string != NULL &&
+	    c->textsearch.string != NULL &&
+	    c->textsearch.context != NULL &&
+	    strcmp(string, c->textsearch.string) == 0) {
+		/* Continue prev. search */
+		content_textsearch_step(c->textsearch.context, flags, string);
+
+	} else if (string != NULL) {
+		/* New search */
+		free(c->textsearch.string);
+		c->textsearch.string = strdup(string);
+		if (c->textsearch.string == NULL) {
+			return NSERROR_NOMEM;
+		}
+
+		if (c->textsearch.context != NULL) {
+			content_textsearch_destroy(c->textsearch.context);
+			c->textsearch.context = NULL;
+		}
+
+		res = content_textsearch_create(c,
+						context,
+						&c->textsearch.context);
+		if (res != NSERROR_OK) {
+			return res;
+		}
+
+		content_textsearch_step(c->textsearch.context, flags, string);
+
+	} else {
+		/* Clear search */
+		content_textsearch__clear(c);
+
+		free(c->textsearch.string);
+		c->textsearch.string = NULL;
+	}
+
+	return NSERROR_OK;
+}
+
+
+/* exported interface, documented in content/content.h */
+nserror content_textsearch_clear(struct hlcache_handle *h)
+{
+	struct content *c = hlcache_handle_get_content(h);
+	assert(c != 0);
+
+	return(content_textsearch__clear(c));
+}
diff --git a/content/textsearch.h b/content/textsearch.h
new file mode 100644
index 000000000..c32b17cca
--- /dev/null
+++ b/content/textsearch.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2009 Mark Benjamin <netsurf-browser.org.MarkBenjamin@dfgh.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * Interface to HTML searching.
+ */
+
+#ifndef NETSURF_CONTENT_SEARCH_H
+#define NETSURF_CONTENT_SEARCH_H
+
+#include "desktop/search.h"
+
+struct textsearch_context;
+struct content;
+struct hlcache_handle;
+struct box;
+
+/**
+ * Free text search a content
+ *
+ * \param[in] h Handle to content to search.
+ * \param[in] context The context passed to gui table search handlers
+ * \param[in] flags The flags that control the search
+ * \param[in] The string being searched for.
+ * \retun NSERROR_OK on success else error code on faliure
+ */
+nserror content_textsearch(struct hlcache_handle *h, void *context, search_flags_t flags, const char *string);
+
+/**
+ * Clear a search
+ *
+ * \param[in] h Handle to content to clear search from.
+ */
+nserror content_textsearch_clear(struct hlcache_handle *h);
+
+/**
+ * Ends the search process, invalidating all state freeing the list of
+ * found boxes.
+ */
+nserror content_textsearch_destroy(struct textsearch_context *textsearch);
+
+/**
+ * Determines whether any portion of the given text box should be
+ * selected because it matches the current search string.
+ *
+ * \param textsearch The search context to hilight entries from.
+ * \param c The content to highlight within.
+ * \param start_offset byte offset within text of string to be checked
+ * \param end_offset   byte offset within text
+ * \param start_idx    byte offset within string of highlight start
+ * \param end_idx      byte offset of highlight end
+ * \return true iff part of the box should be highlighted
+ */
+bool content_textsearch_ishighlighted(struct textsearch_context *textsearch,
+				      unsigned start_offset,
+				      unsigned end_offset,
+				      unsigned *start_idx,
+				      unsigned *end_idx);
+
+/**
+ * Find the first occurrence of 'match' in 'string' and return its index
+ *
+ * \param  string     the string to be searched (unterminated)
+ * \param  s_len      length of the string to be searched
+ * \param  pattern    the pattern for which we are searching (unterminated)
+ * \param  p_len      length of pattern
+ * \param  case_sens  true iff case sensitive match required
+ * \param  m_len      accepts length of match in bytes
+ * \return pointer to first match, NULL if none
+ */
+const char *content_textsearch_find_pattern(const char *string, int s_len, const char *pattern, int p_len, bool case_sens, unsigned int *m_len);
+
+/**
+ * Add a new entry to the list of matches
+ *
+ * \param context The search context to add the entry to.
+ * \param start_idx Offset of match start within textual representation
+ * \param end_idx Offset of match end
+ * \param start A pointer for the start
+ * \param end A pointer for the end
+ * \return NSERROR_OK on sucess else error code on faliure
+ */
+nserror content_textsearch_add_match(struct textsearch_context *context, unsigned start_idx, unsigned end_idx, struct box *start_ptr, struct box *end_ptr);
+
+#endif
diff --git a/content/urldb.c b/content/urldb.c
index d93cc5898..881f76f6d 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -111,16 +111,10 @@
 #include "utils/http.h"
 #include "netsurf/bitmap.h"
 #include "desktop/cookie_manager.h"
-#include "desktop/gui_internal.h"
 
 #include "content/content.h"
 #include "content/urldb.h"
 
-#ifdef WITH_AMISSL
-/* AmiSSL needs everything to be using bsdsocket directly to avoid conflicts */
-#include <proto/bsdsocket.h>
-#endif
-
 /**
  * cookie entry.
  *
@@ -1527,7 +1521,10 @@ static void urldb_dump_search(struct search_node *parent, int depth)
 	for (h = parent->data; h; h = h->parent) {
 		if (h->part) {
 			r = snprintf(&s[i], sl - i, "%s", h->part);
-			if ((i + r) > sl) {
+			if (r < 0) {
+				break;
+			}
+			if ((i + r) >= sl) {
 				break;
 			}
 			i += r;