diff -Nru nqp-2016.11+dfsg/Configure.pl nqp-2016.12+dfsg/Configure.pl
--- nqp-2016.11+dfsg/Configure.pl	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/Configure.pl	2016-12-17 14:45:43.000000000 +0000
@@ -7,6 +7,7 @@
 use Text::ParseWords;
 use Getopt::Long;
 use Cwd qw/abs_path cwd/;
+use File::Spec;
 use lib "tools/lib";
 use NQP::Configure qw(cmp_rev gen_moar
                       fill_template_file fill_template_text
@@ -28,7 +29,7 @@
     my $exe = $NQP::Configure::exe;
 
     my %options;
-    GetOptions(\%options, 'help!', 'prefix=s',
+    GetOptions(\%options, 'help!', 'prefix=s', 'libdir=s',
                'sysroot=s', 'sdkroot=s',
                'backends=s',
                'no-clean',
@@ -126,9 +127,10 @@
                     : ($options{sysroot}
 		      ? '/usr'
 		      : File::Spec->catdir(cwd, 'install'));
-    $config{prefix} = $prefix;
-    $config{sysroot} = $options{sysroot};
-    $config{sdkroot} = $options{sdkroot};
+    $config{prefix}    = $prefix;
+    $config{nqplibdir} = $options{libdir} ? "$options{libdir}/nqp" : '$(NQP_LANG_DIR)/lib';
+    $config{sysroot}   = $options{sysroot};
+    $config{sdkroot}   = $options{sdkroot};
 
     # Save options in config.status
     unlink('config.status');
@@ -177,6 +179,7 @@
         $config{'make'} = `$moar_path --libpath="src/vm/moar/stage0" "src/vm/moar/stage0/nqp.moarvm" -e "print(nqp::backendconfig()<make>)"`
                         || 'make';
         $config{moar} = $moar_path;
+        $config{moar_prefix} = File::Spec->catpath((File::Spec->splitpath($moar_path))[0, 1], File::Spec->updir);
         fill_template_file(
             'tools/build/Makefile-Moar.in',
             $MAKEFILE,
@@ -296,6 +299,8 @@
     --gen-moar         Download, build, and install a copy of MoarVM to use before writing the Makefile
     --moar-option='--option=value'
                        Options to pass to MoarVM configuration for --gen-moar
+    --with-moar='/path/to/moar'
+                       Provide path to already installed moar binary
     --with-asm='/path/to/jar'
     --with-asm-tree='/path/to/jar'
     --with-jline='/path/to/jar'
diff -Nru nqp-2016.11+dfsg/debian/changelog nqp-2016.12+dfsg/debian/changelog
--- nqp-2016.11+dfsg/debian/changelog	2016-11-28 12:40:55.000000000 +0000
+++ nqp-2016.12+dfsg/debian/changelog	2016-12-19 13:01:13.000000000 +0000
@@ -1,3 +1,11 @@
+nqp (2016.12+dfsg-1) unstable; urgency=medium
+
+  * New upstream version 2016.12+dfsg
+  * refreshed patches
+  * control: update moarvm-dev dep versions
+
+ -- Dominique Dumont <dod@debian.org>  Mon, 19 Dec 2016 14:01:13 +0100
+
 nqp (2016.11+dfsg-1) unstable; urgency=medium
 
   * New upstream version 2016.11+dfsg
diff -Nru nqp-2016.11+dfsg/debian/control nqp-2016.12+dfsg/debian/control
--- nqp-2016.11+dfsg/debian/control	2016-11-28 12:40:55.000000000 +0000
+++ nqp-2016.12+dfsg/debian/control	2016-12-19 13:01:13.000000000 +0000
@@ -9,7 +9,7 @@
                libjs-jquery,
                libreadline-dev,
                libtommath-dev (>= 0.42.0-1.2),
-               moarvm-dev (>= 2016.11),
+               moarvm-dev (>= 2016.12),
                perl
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-rakudo/nqp.git
diff -Nru nqp-2016.11+dfsg/debian/patches/Ensure-MANIFEST-doesn-t-get-deleted-by-realclean.patch nqp-2016.12+dfsg/debian/patches/Ensure-MANIFEST-doesn-t-get-deleted-by-realclean.patch
--- nqp-2016.11+dfsg/debian/patches/Ensure-MANIFEST-doesn-t-get-deleted-by-realclean.patch	2016-11-28 12:40:55.000000000 +0000
+++ nqp-2016.12+dfsg/debian/patches/Ensure-MANIFEST-doesn-t-get-deleted-by-realclean.patch	2016-12-19 13:01:13.000000000 +0000
@@ -6,11 +6,9 @@
  tools/build/Makefile-Moar.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/tools/build/Makefile-Moar.in b/tools/build/Makefile-Moar.in
-index 7e5a5ce..24a9cde 100644
 --- a/tools/build/Makefile-Moar.in
 +++ b/tools/build/Makefile-Moar.in
-@@ -67,7 +67,7 @@ release: manifest
+@@ -68,7 +68,7 @@
  distclean: realclean
  
  realclean: clean
diff -Nru nqp-2016.11+dfsg/debian/patches/use-packaged-angularjs nqp-2016.12+dfsg/debian/patches/use-packaged-angularjs
--- nqp-2016.11+dfsg/debian/patches/use-packaged-angularjs	2016-11-28 12:40:55.000000000 +0000
+++ nqp-2016.12+dfsg/debian/patches/use-packaged-angularjs	2016-12-19 13:01:13.000000000 +0000
@@ -5,16 +5,14 @@
  src/vm/moar/profiler/template.html | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/vm/moar/profiler/template.html b/src/vm/moar/profiler/template.html
-index 0d6018a..fce655c 100644
 --- a/src/vm/moar/profiler/template.html
 +++ b/src/vm/moar/profiler/template.html
 @@ -702,7 +702,7 @@
        </div>
      </div>
  
--    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.2/angular.min.js"></script>
+-    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular.min.js"></script>
 +    <script src="/usr/share/javascript/angular.js/angular.min.js"></script>
-     <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.13.4/ui-bootstrap-tpls.js"></script>
+     <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/2.2.0/ui-bootstrap-tpls.js"></script>
      <script>
      var rawData = JSON.parse('{{{PROFILER_OUTPUT}}}');
diff -Nru nqp-2016.11+dfsg/debian/patches/use-packaged-bootstrap nqp-2016.12+dfsg/debian/patches/use-packaged-bootstrap
--- nqp-2016.11+dfsg/debian/patches/use-packaged-bootstrap	2016-11-28 12:40:55.000000000 +0000
+++ nqp-2016.12+dfsg/debian/patches/use-packaged-bootstrap	2016-12-19 13:01:13.000000000 +0000
@@ -5,16 +5,14 @@
  src/vm/moar/profiler/template.html | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/vm/moar/profiler/template.html b/src/vm/moar/profiler/template.html
-index edc7966..0d6018a 100644
 --- a/src/vm/moar/profiler/template.html
 +++ b/src/vm/moar/profiler/template.html
 @@ -5,8 +5,8 @@
      <meta http-equiv="X-UA-Compatible" content="IE=edge">
      <meta name="viewport" content="width=device-width, initial-scale=1">
      <title>MoarVM Profiler Results</title>
--    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
--    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
+-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css">
 +    <link rel="stylesheet" href="/usr/share/javascript/bootstrap/css/bootstrap.min.css">
 +    <link rel="stylesheet" href="/usr/share/javascript/bootstrap/css/bootstrap-theme.min.css">
      <style>
diff -Nru nqp-2016.11+dfsg/debian/patches/Use-VERSION-file-to-determine-nqp-version.patch nqp-2016.12+dfsg/debian/patches/Use-VERSION-file-to-determine-nqp-version.patch
--- nqp-2016.11+dfsg/debian/patches/Use-VERSION-file-to-determine-nqp-version.patch	2016-11-28 12:40:55.000000000 +0000
+++ nqp-2016.12+dfsg/debian/patches/Use-VERSION-file-to-determine-nqp-version.patch	2016-12-19 13:01:13.000000000 +0000
@@ -10,11 +10,9 @@
  tools/build/gen-version.pl | 6 ------
  1 file changed, 6 deletions(-)
 
-diff --git a/tools/build/gen-version.pl b/tools/build/gen-version.pl
-index 5d18113..db1d0fe 100644
 --- a/tools/build/gen-version.pl
 +++ b/tools/build/gen-version.pl
-@@ -12,12 +12,6 @@ open(my $fh, '<', 'VERSION') or die $!;
+@@ -15,12 +15,6 @@
  my $VERSION = <$fh>;
  close($fh);
  
diff -Nru nqp-2016.11+dfsg/docs/ops.markdown nqp-2016.12+dfsg/docs/ops.markdown
--- nqp-2016.11+dfsg/docs/ops.markdown	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/docs/ops.markdown	2016-12-17 14:45:43.000000000 +0000
@@ -46,7 +46,7 @@
     - [islt](#islt)
     - [isle](#isle)
     - [isne](#isne)
-    - [not](#not)
+    - [not_i](#not_i)
 - [Array Opcodes](#-array-opcodes)
     - [atpos](#atpos)
     - [bindpos](#bindpos)
@@ -634,7 +634,7 @@
 
 Return non-zero if the two parameters are not equal.
 
-## not
+## not_i
 * `not_i(int $val)`
 
 Return 1 if `$val` is 0, 0 otherwise.
diff -Nru nqp-2016.11+dfsg/.gitignore nqp-2016.12+dfsg/.gitignore
--- nqp-2016.11+dfsg/.gitignore	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/.gitignore	2016-12-17 14:45:43.000000000 +0000
@@ -28,6 +28,7 @@
 src/gen/*.setting
 src/stage1
 src/stage2
+tools/build/install-jvm-runner.pl
 config.status
 config.default
 3rdparty/dyncall/ConfigVars
@@ -46,5 +47,5 @@
 *.moarvm
 MoarVM
 MANIFEST
-
-/nqp.bat
+/bin
+/nqp.bat
diff -Nru nqp-2016.11+dfsg/MANIFEST nqp-2016.12+dfsg/MANIFEST
--- nqp-2016.11+dfsg/MANIFEST	2016-11-19 16:35:08.000000000 +0000
+++ nqp-2016.12+dfsg/MANIFEST	2016-12-17 14:55:48.000000000 +0000
@@ -4,617 +4,6 @@
 3rdparty/asm/LICENSE.txt
 3rdparty/asm/asm-4.1.jar
 3rdparty/asm/asm-tree-4.1.jar
-3rdparty/dyncall/.gitignore
-3rdparty/dyncall/AUTHORS
-3rdparty/dyncall/BUGS
-3rdparty/dyncall/CMakeLists.txt
-3rdparty/dyncall/ChangeLog
-3rdparty/dyncall/LICENSE
-3rdparty/dyncall/Makefile.M
-3rdparty/dyncall/Makefile.embedded
-3rdparty/dyncall/Makefile.generic
-3rdparty/dyncall/Nmakefile
-3rdparty/dyncall/README
-3rdparty/dyncall/ToDo
-3rdparty/dyncall/autovar/LICENSE.txt
-3rdparty/dyncall/autovar/README.txt
-3rdparty/dyncall/autovar/autovar_ABI.h
-3rdparty/dyncall/autovar/autovar_ARCH.h
-3rdparty/dyncall/autovar/autovar_CC.h
-3rdparty/dyncall/autovar/autovar_OS.h
-3rdparty/dyncall/autovar/autovar_OSFAMILY.h
-3rdparty/dyncall/buildsys/cmake/Modules/FindDynCall.cmake
-3rdparty/dyncall/buildsys/cmake/Modules/FindDynCallback.cmake
-3rdparty/dyncall/buildsys/cmake/Modules/FindDynLoad.cmake
-3rdparty/dyncall/buildsys/cmake/Modules/UseLATEX.cmake
-3rdparty/dyncall/buildsys/dynmake/Makefile.base.M
-3rdparty/dyncall/buildsys/dynmake/dynmake.bat
-3rdparty/dyncall/buildsys/dynmake/dynmake.sh
-3rdparty/dyncall/buildsys/lua/README.txt
-3rdparty/dyncall/buildsys/lua/bootstrap.sh
-3rdparty/dyncall/buildsys/lua/cleanup.sh
-3rdparty/dyncall/buildsys/lua/mkfile
-3rdparty/dyncall/buildsys/lua/setenv.sh
-3rdparty/dyncall/buildsys/mk/app.mk
-3rdparty/dyncall/buildsys/mk/dirs.mk
-3rdparty/dyncall/buildsys/mk/epilog.mk
-3rdparty/dyncall/buildsys/mk/lib.mk
-3rdparty/dyncall/buildsys/mk/pcc.mk
-3rdparty/dyncall/buildsys/mk/prolog.mk
-3rdparty/dyncall/buildsys/nmake/common.nmake
-3rdparty/dyncall/buildsys/nmake/epilog.nmake
-3rdparty/dyncall/buildsys/nmake/prolog.nmake
-3rdparty/dyncall/buildsys/nmake/tool_gcc.nmake
-3rdparty/dyncall/buildsys/nmake/tool_msvc.nmake
-3rdparty/dyncall/buildsys/scripts/batch-build-linux.sh
-3rdparty/dyncall/buildsys/scripts/batch-build-minix.sh
-3rdparty/dyncall/buildsys/scripts/batch-build-psp.sh
-3rdparty/dyncall/buildsys/scripts/conf-nds.bat
-3rdparty/dyncall/buildsys/scripts/setenv-cross-ios.sh
-3rdparty/dyncall/buildsys/scripts/setenv-sdk-ios.sh
-3rdparty/dyncall/buildsys/vs2005/dyncall/dyncall.vcproj
-3rdparty/dyncall/buildsys/vs2005/test_plain/test_plain.vcproj
-3rdparty/dyncall/buildsys/vs2005/vs2005.sln
-3rdparty/dyncall/configure
-3rdparty/dyncall/configure.bat
-3rdparty/dyncall/doc/Description.txt
-3rdparty/dyncall/doc/License.txt
-3rdparty/dyncall/doc/Makefile.generic
-3rdparty/dyncall/doc/README-Cross.txt
-3rdparty/dyncall/doc/README.CMake
-3rdparty/dyncall/doc/README.Generic
-3rdparty/dyncall/doc/README.MacOSX
-3rdparty/dyncall/doc/README.Minix
-3rdparty/dyncall/doc/README.NDS
-3rdparty/dyncall/doc/README.PSP
-3rdparty/dyncall/doc/README.SunOS
-3rdparty/dyncall/doc/README.Windows
-3rdparty/dyncall/doc/README.embedded
-3rdparty/dyncall/doc/README.iOS
-3rdparty/dyncall/doc/manual/CMakeLists.txt
-3rdparty/dyncall/doc/manual/Makefile.generic
-3rdparty/dyncall/doc/manual/Nmakefile
-3rdparty/dyncall/doc/manual/callconvs/callconv_arm32.tex
-3rdparty/dyncall/doc/manual/callconvs/callconv_mips.tex
-3rdparty/dyncall/doc/manual/callconvs/callconv_mips64.tex
-3rdparty/dyncall/doc/manual/callconvs/callconv_ppc32.tex
-3rdparty/dyncall/doc/manual/callconvs/callconv_ppc64.tex
-3rdparty/dyncall/doc/manual/callconvs/callconv_sparc.tex
-3rdparty/dyncall/doc/manual/callconvs/callconv_sparc64.tex
-3rdparty/dyncall/doc/manual/callconvs/callconv_x64.tex
-3rdparty/dyncall/doc/manual/callconvs/callconv_x86.tex
-3rdparty/dyncall/doc/manual/dyncall_logo.eps
-3rdparty/dyncall/doc/manual/dyncall_logo.pdf
-3rdparty/dyncall/doc/manual/dyncall_logo.svg
-3rdparty/dyncall/doc/manual/dyncall_watermark.eps
-3rdparty/dyncall/doc/manual/dyncall_watermark.pdf
-3rdparty/dyncall/doc/manual/dyncall_watermark.svg
-3rdparty/dyncall/doc/manual/manual.tex
-3rdparty/dyncall/doc/manual/manual_bindings.tex
-3rdparty/dyncall/doc/manual/manual_build.tex
-3rdparty/dyncall/doc/manual/manual_cc.tex
-3rdparty/dyncall/doc/manual/manual_design.tex
-3rdparty/dyncall/doc/manual/manual_devel.tex
-3rdparty/dyncall/doc/manual/manual_dyncall_api.tex
-3rdparty/dyncall/doc/manual/manual_dyncallback_api.tex
-3rdparty/dyncall/doc/manual/manual_dynload_api.tex
-3rdparty/dyncall/doc/manual/manual_epilog.tex
-3rdparty/dyncall/doc/manual/manual_literature.tex
-3rdparty/dyncall/doc/manual/manual_motivation.tex
-3rdparty/dyncall/doc/manual/manual_overview.tex
-3rdparty/dyncall/doc/manual/manual_title.tex
-3rdparty/dyncall/dynMakefile
-3rdparty/dyncall/dyncall/CMakeLists.txt
-3rdparty/dyncall/dyncall/DynCallConfig.cmake
-3rdparty/dyncall/dyncall/Makefile.M
-3rdparty/dyncall/dyncall/Makefile.embedded
-3rdparty/dyncall/dyncall/Makefile.generic
-3rdparty/dyncall/dyncall/Nmakefile
-3rdparty/dyncall/dyncall/README-Developer.txt
-3rdparty/dyncall/dyncall/README.txt
-3rdparty/dyncall/dyncall/TODO
-3rdparty/dyncall/dyncall/dynMakefile
-3rdparty/dyncall/dyncall/dyncall.3
-3rdparty/dyncall/dyncall/dyncall.h
-3rdparty/dyncall/dyncall/dyncall_alloc.h
-3rdparty/dyncall/dyncall/dyncall_api.c
-3rdparty/dyncall/dyncall/dyncall_call.S
-3rdparty/dyncall/dyncall/dyncall_call_arm32_arm.S
-3rdparty/dyncall/dyncall/dyncall_call_arm32_arm.h
-3rdparty/dyncall/dyncall/dyncall_call_arm32_arm_armhf.S
-3rdparty/dyncall/dyncall/dyncall_call_arm32_arm_armhf.h
-3rdparty/dyncall/dyncall/dyncall_call_arm32_thumb.h
-3rdparty/dyncall/dyncall/dyncall_call_arm32_thumb_apple.s
-3rdparty/dyncall/dyncall/dyncall_call_arm32_thumb_armhf.S
-3rdparty/dyncall/dyncall/dyncall_call_arm32_thumb_gas.s
-3rdparty/dyncall/dyncall/dyncall_call_mips.h
-3rdparty/dyncall/dyncall/dyncall_call_mips_eabi.h
-3rdparty/dyncall/dyncall/dyncall_call_mips_eabi_gas.s
-3rdparty/dyncall/dyncall/dyncall_call_mips_gas.S
-3rdparty/dyncall/dyncall/dyncall_call_mips_n32.h
-3rdparty/dyncall/dyncall/dyncall_call_mips_n32_gas.s
-3rdparty/dyncall/dyncall/dyncall_call_mips_n64.h
-3rdparty/dyncall/dyncall/dyncall_call_mips_n64_gas.s
-3rdparty/dyncall/dyncall/dyncall_call_mips_o32.h
-3rdparty/dyncall/dyncall/dyncall_call_mips_o32_gas.s
-3rdparty/dyncall/dyncall/dyncall_call_ppc32.S
-3rdparty/dyncall/dyncall/dyncall_call_ppc32.h
-3rdparty/dyncall/dyncall/dyncall_call_sparc.S
-3rdparty/dyncall/dyncall/dyncall_call_sparc.h
-3rdparty/dyncall/dyncall/dyncall_call_sparc64.S
-3rdparty/dyncall/dyncall/dyncall_call_sparc64.h
-3rdparty/dyncall/dyncall/dyncall_call_sparc_v9.S
-3rdparty/dyncall/dyncall/dyncall_call_sparc_v9.h
-3rdparty/dyncall/dyncall/dyncall_call_x64-att.S
-3rdparty/dyncall/dyncall/dyncall_call_x64.S
-3rdparty/dyncall/dyncall/dyncall_call_x64.h
-3rdparty/dyncall/dyncall/dyncall_call_x64_generic_masm.asm
-3rdparty/dyncall/dyncall/dyncall_call_x86.S
-3rdparty/dyncall/dyncall/dyncall_call_x86.h
-3rdparty/dyncall/dyncall/dyncall_call_x86_8a.s
-3rdparty/dyncall/dyncall/dyncall_call_x86_generic_masm.asm
-3rdparty/dyncall/dyncall/dyncall_call_x86_nasm.asm
-3rdparty/dyncall/dyncall/dyncall_callf.c
-3rdparty/dyncall/dyncall/dyncall_callf.h
-3rdparty/dyncall/dyncall/dyncall_callvm.c
-3rdparty/dyncall/dyncall/dyncall_callvm.h
-3rdparty/dyncall/dyncall/dyncall_callvm_arm32_arm.c
-3rdparty/dyncall/dyncall/dyncall_callvm_arm32_arm.h
-3rdparty/dyncall/dyncall/dyncall_callvm_arm32_arm_armhf.c
-3rdparty/dyncall/dyncall/dyncall_callvm_arm32_arm_armhf.h
-3rdparty/dyncall/dyncall/dyncall_callvm_arm32_thumb.c
-3rdparty/dyncall/dyncall/dyncall_callvm_arm32_thumb.h
-3rdparty/dyncall/dyncall/dyncall_callvm_base.c
-3rdparty/dyncall/dyncall/dyncall_callvm_mips.c
-3rdparty/dyncall/dyncall/dyncall_callvm_mips.h
-3rdparty/dyncall/dyncall/dyncall_callvm_mips_eabi.c
-3rdparty/dyncall/dyncall/dyncall_callvm_mips_eabi.h
-3rdparty/dyncall/dyncall/dyncall_callvm_mips_n32.c
-3rdparty/dyncall/dyncall/dyncall_callvm_mips_n64.c
-3rdparty/dyncall/dyncall/dyncall_callvm_mips_n64.h
-3rdparty/dyncall/dyncall/dyncall_callvm_mips_o32.c
-3rdparty/dyncall/dyncall/dyncall_callvm_mips_o32.h
-3rdparty/dyncall/dyncall/dyncall_callvm_ppc32.c
-3rdparty/dyncall/dyncall/dyncall_callvm_ppc32.h
-3rdparty/dyncall/dyncall/dyncall_callvm_sparc.c
-3rdparty/dyncall/dyncall/dyncall_callvm_sparc.h
-3rdparty/dyncall/dyncall/dyncall_callvm_sparc64.c
-3rdparty/dyncall/dyncall/dyncall_callvm_sparc64.h
-3rdparty/dyncall/dyncall/dyncall_callvm_sparc_v9.c
-3rdparty/dyncall/dyncall/dyncall_callvm_sparc_v9.h
-3rdparty/dyncall/dyncall/dyncall_callvm_x64.c
-3rdparty/dyncall/dyncall/dyncall_callvm_x64.h
-3rdparty/dyncall/dyncall/dyncall_callvm_x86.c
-3rdparty/dyncall/dyncall/dyncall_callvm_x86.h
-3rdparty/dyncall/dyncall/dyncall_config.h
-3rdparty/dyncall/dyncall/dyncall_macros.h
-3rdparty/dyncall/dyncall/dyncall_signature.h
-3rdparty/dyncall/dyncall/dyncall_struct.c
-3rdparty/dyncall/dyncall/dyncall_struct.h
-3rdparty/dyncall/dyncall/dyncall_types.h
-3rdparty/dyncall/dyncall/dyncall_utils.h
-3rdparty/dyncall/dyncall/dyncall_value.h
-3rdparty/dyncall/dyncall/dyncall_vector.c
-3rdparty/dyncall/dyncall/dyncall_vector.h
-3rdparty/dyncall/dyncall/gen-masm.sh
-3rdparty/dyncall/dyncall/mkfile
-3rdparty/dyncall/dyncallback/CMakeLists.txt
-3rdparty/dyncall/dyncallback/DynCallbackConfig.cmake
-3rdparty/dyncall/dyncallback/Makefile.M
-3rdparty/dyncall/dyncallback/Makefile.embedded
-3rdparty/dyncall/dyncallback/Makefile.generic
-3rdparty/dyncall/dyncallback/Nmakefile
-3rdparty/dyncall/dyncallback/README.txt
-3rdparty/dyncall/dyncallback/TODO
-3rdparty/dyncall/dyncallback/dynMakefile
-3rdparty/dyncall/dyncallback/dyncall_alloc_wx.c
-3rdparty/dyncall/dyncallback/dyncall_alloc_wx.h
-3rdparty/dyncall/dyncallback/dyncall_alloc_wx_malloc.c
-3rdparty/dyncall/dyncallback/dyncall_alloc_wx_mmap.c
-3rdparty/dyncall/dyncallback/dyncall_alloc_wx_win32.c
-3rdparty/dyncall/dyncallback/dyncall_args.c
-3rdparty/dyncall/dyncallback/dyncall_args.h
-3rdparty/dyncall/dyncallback/dyncall_args_arm32_arm.c
-3rdparty/dyncall/dyncallback/dyncall_args_arm32_arm.h
-3rdparty/dyncall/dyncallback/dyncall_args_arm32_thumb.c
-3rdparty/dyncall/dyncallback/dyncall_args_arm32_thumb.h
-3rdparty/dyncall/dyncallback/dyncall_args_mips.c
-3rdparty/dyncall/dyncallback/dyncall_args_mips.h
-3rdparty/dyncall/dyncallback/dyncall_args_ppc32.c
-3rdparty/dyncall/dyncallback/dyncall_args_ppc32.h
-3rdparty/dyncall/dyncallback/dyncall_args_sparc32.c
-3rdparty/dyncall/dyncallback/dyncall_args_sparc32.h
-3rdparty/dyncall/dyncallback/dyncall_args_sparc64.c
-3rdparty/dyncall/dyncallback/dyncall_args_sparc64.h
-3rdparty/dyncall/dyncallback/dyncall_args_x64.c
-3rdparty/dyncall/dyncallback/dyncall_args_x64.h
-3rdparty/dyncall/dyncallback/dyncall_args_x86.c
-3rdparty/dyncall/dyncallback/dyncall_args_x86.h
-3rdparty/dyncall/dyncallback/dyncall_callback.c
-3rdparty/dyncall/dyncallback/dyncall_callback.h
-3rdparty/dyncall/dyncallback/dyncall_callback_arch.S
-3rdparty/dyncall/dyncallback/dyncall_callback_arm32_arm.c
-3rdparty/dyncall/dyncallback/dyncall_callback_arm32_arm.h
-3rdparty/dyncall/dyncallback/dyncall_callback_arm32_arm_apple.s
-3rdparty/dyncall/dyncallback/dyncall_callback_arm32_arm_gas.s
-3rdparty/dyncall/dyncallback/dyncall_callback_arm32_thumb.c
-3rdparty/dyncall/dyncallback/dyncall_callback_arm32_thumb.h
-3rdparty/dyncall/dyncallback/dyncall_callback_arm32_thumb_apple.s
-3rdparty/dyncall/dyncallback/dyncall_callback_arm32_thumb_gas.s
-3rdparty/dyncall/dyncallback/dyncall_callback_mips.c
-3rdparty/dyncall/dyncallback/dyncall_callback_mips.h
-3rdparty/dyncall/dyncallback/dyncall_callback_ppc32.S
-3rdparty/dyncall/dyncallback/dyncall_callback_ppc32.c
-3rdparty/dyncall/dyncallback/dyncall_callback_ppc32.h
-3rdparty/dyncall/dyncallback/dyncall_callback_ppc32_apple.s
-3rdparty/dyncall/dyncallback/dyncall_callback_sparc32.c
-3rdparty/dyncall/dyncallback/dyncall_callback_sparc32.h
-3rdparty/dyncall/dyncallback/dyncall_callback_sparc32.s
-3rdparty/dyncall/dyncallback/dyncall_callback_sparc64.c
-3rdparty/dyncall/dyncallback/dyncall_callback_sparc64.s
-3rdparty/dyncall/dyncallback/dyncall_callback_x64.S
-3rdparty/dyncall/dyncallback/dyncall_callback_x64.c
-3rdparty/dyncall/dyncallback/dyncall_callback_x64.h
-3rdparty/dyncall/dyncallback/dyncall_callback_x64_apple.s
-3rdparty/dyncall/dyncallback/dyncall_callback_x64_gas.s
-3rdparty/dyncall/dyncallback/dyncall_callback_x64_gas_w64.s
-3rdparty/dyncall/dyncallback/dyncall_callback_x64_masm.asm
-3rdparty/dyncall/dyncallback/dyncall_callback_x86.S
-3rdparty/dyncall/dyncallback/dyncall_callback_x86.c
-3rdparty/dyncall/dyncallback/dyncall_callback_x86.h
-3rdparty/dyncall/dyncallback/dyncall_callback_x86_8a.s
-3rdparty/dyncall/dyncallback/dyncall_callback_x86_masm.asm
-3rdparty/dyncall/dyncallback/dyncall_thunk.c
-3rdparty/dyncall/dyncallback/dyncall_thunk.h
-3rdparty/dyncall/dyncallback/dyncall_thunk_arm32_arm.c
-3rdparty/dyncall/dyncallback/dyncall_thunk_arm32_arm.h
-3rdparty/dyncall/dyncallback/dyncall_thunk_arm32_thumb.c
-3rdparty/dyncall/dyncallback/dyncall_thunk_arm32_thumb.h
-3rdparty/dyncall/dyncallback/dyncall_thunk_mips.c
-3rdparty/dyncall/dyncallback/dyncall_thunk_mips.h
-3rdparty/dyncall/dyncallback/dyncall_thunk_ppc32.c
-3rdparty/dyncall/dyncallback/dyncall_thunk_ppc32.h
-3rdparty/dyncall/dyncallback/dyncall_thunk_sparc32.c
-3rdparty/dyncall/dyncallback/dyncall_thunk_sparc32.h
-3rdparty/dyncall/dyncallback/dyncall_thunk_sparc64.c
-3rdparty/dyncall/dyncallback/dyncall_thunk_sparc64.h
-3rdparty/dyncall/dyncallback/dyncall_thunk_x64.c
-3rdparty/dyncall/dyncallback/dyncall_thunk_x64.h
-3rdparty/dyncall/dyncallback/dyncall_thunk_x86.c
-3rdparty/dyncall/dyncallback/dyncall_thunk_x86.h
-3rdparty/dyncall/dyncallback/dyncallback.3
-3rdparty/dyncall/dyncallback/gen-masm.sh
-3rdparty/dyncall/dyncallback/mkfile
-3rdparty/dyncall/dynload/CMakeLists.txt
-3rdparty/dyncall/dynload/DynLoadConfig.cmake
-3rdparty/dyncall/dynload/Makefile.M
-3rdparty/dyncall/dynload/Makefile.embedded
-3rdparty/dyncall/dynload/Makefile.generic
-3rdparty/dyncall/dynload/Nmakefile
-3rdparty/dyncall/dynload/README.txt
-3rdparty/dyncall/dynload/TODO
-3rdparty/dyncall/dynload/dynMakefile
-3rdparty/dyncall/dynload/dynload.3
-3rdparty/dyncall/dynload/dynload.c
-3rdparty/dyncall/dynload/dynload.h
-3rdparty/dyncall/dynload/dynload_alloc.h
-3rdparty/dyncall/dynload/dynload_darwin.c
-3rdparty/dyncall/dynload/dynload_syms.c
-3rdparty/dyncall/dynload/dynload_syms_elf.c
-3rdparty/dyncall/dynload/dynload_syms_mach-o.c
-3rdparty/dyncall/dynload/dynload_syms_pe.c
-3rdparty/dyncall/dynload/dynload_unix.c
-3rdparty/dyncall/dynload/dynload_windows.c
-3rdparty/dyncall/mkfile
-3rdparty/dyncall/portasm/README.txt
-3rdparty/dyncall/portasm/gen-masm.sh
-3rdparty/dyncall/portasm/portasm-arm.S
-3rdparty/dyncall/portasm/portasm-ppc.S
-3rdparty/dyncall/portasm/portasm-x64-att.S
-3rdparty/dyncall/portasm/portasm-x86.S
-3rdparty/dyncall/test/CMakeLists.txt
-3rdparty/dyncall/test/Makefile.M
-3rdparty/dyncall/test/Makefile.embedded
-3rdparty/dyncall/test/Makefile.generic
-3rdparty/dyncall/test/Nmakefile
-3rdparty/dyncall/test/arm-thumb-interwork/Makefile-default.config
-3rdparty/dyncall/test/arm-thumb-interwork/Makefile-thumb.config
-3rdparty/dyncall/test/arm-thumb-interwork/README.txt
-3rdparty/dyncall/test/arm-thumb-interwork/build.sh
-3rdparty/dyncall/test/call_suite/Makefile.M
-3rdparty/dyncall/test/call_suite/Makefile.embedded
-3rdparty/dyncall/test/call_suite/Makefile.generic
-3rdparty/dyncall/test/call_suite/Nmakefile
-3rdparty/dyncall/test/call_suite/README.txt
-3rdparty/dyncall/test/call_suite/cases.c
-3rdparty/dyncall/test/call_suite/cases.h
-3rdparty/dyncall/test/call_suite/cases.txt
-3rdparty/dyncall/test/call_suite/config.lua
-3rdparty/dyncall/test/call_suite/design.txt
-3rdparty/dyncall/test/call_suite/dynMakefile
-3rdparty/dyncall/test/call_suite/globals.c
-3rdparty/dyncall/test/call_suite/globals.h
-3rdparty/dyncall/test/call_suite/invoke.c
-3rdparty/dyncall/test/call_suite/main.c
-3rdparty/dyncall/test/call_suite/mk-cases.lua
-3rdparty/dyncall/test/call_suite/mkfile
-3rdparty/dyncall/test/call_suite/rand-sig.lua
-3rdparty/dyncall/test/callback_plain/CMakeLists.txt
-3rdparty/dyncall/test/callback_plain/Makefile.M
-3rdparty/dyncall/test/callback_plain/Makefile.embedded
-3rdparty/dyncall/test/callback_plain/Makefile.generic
-3rdparty/dyncall/test/callback_plain/Nmakefile
-3rdparty/dyncall/test/callback_plain/callback_plain.c
-3rdparty/dyncall/test/callback_plain/dynMakefile
-3rdparty/dyncall/test/callback_plain/mkfile
-3rdparty/dyncall/test/callback_suite/CMakeLists.txt
-3rdparty/dyncall/test/callback_suite/Makefile.M
-3rdparty/dyncall/test/callback_suite/Makefile.embedded
-3rdparty/dyncall/test/callback_suite/Makefile.generic
-3rdparty/dyncall/test/callback_suite/Nmakefile
-3rdparty/dyncall/test/callback_suite/README.txt
-3rdparty/dyncall/test/callback_suite/_auto_config.h
-3rdparty/dyncall/test/callback_suite/_auto_invoke_macros.h
-3rdparty/dyncall/test/callback_suite/_auto_invoke_table.h
-3rdparty/dyncall/test/callback_suite/_auto_invokers.h
-3rdparty/dyncall/test/callback_suite/_auto_signatures.txt
-3rdparty/dyncall/test/callback_suite/_auto_sigstrings.h
-3rdparty/dyncall/test/callback_suite/config-random.lua
-3rdparty/dyncall/test/callback_suite/config-stress1.lua
-3rdparty/dyncall/test/callback_suite/config.lua
-3rdparty/dyncall/test/callback_suite/do_test.c
-3rdparty/dyncall/test/callback_suite/dynMakefile
-3rdparty/dyncall/test/callback_suite/dyncall_value_set.h
-3rdparty/dyncall/test/callback_suite/env.c
-3rdparty/dyncall/test/callback_suite/env.h
-3rdparty/dyncall/test/callback_suite/handler.c
-3rdparty/dyncall/test/callback_suite/invokers.c
-3rdparty/dyncall/test/callback_suite/invokers.h
-3rdparty/dyncall/test/callback_suite/main.c
-3rdparty/dyncall/test/callback_suite/make-config.lua
-3rdparty/dyncall/test/callback_suite/make-cstrings.lua
-3rdparty/dyncall/test/callback_suite/make-invoke-macros.lua
-3rdparty/dyncall/test/callback_suite/make-invoke-table.lua
-3rdparty/dyncall/test/callback_suite/make-invokers.lua
-3rdparty/dyncall/test/callback_suite/make-signatures.lua
-3rdparty/dyncall/test/callback_suite/mkfile
-3rdparty/dyncall/test/callback_suite/print.c
-3rdparty/dyncall/test/callback_suite/print.h
-3rdparty/dyncall/test/callback_suite/signature_utils.c
-3rdparty/dyncall/test/callback_suite/signature_utils.h
-3rdparty/dyncall/test/callback_suite/sigstrings.c
-3rdparty/dyncall/test/callback_suite/sigstrings.h
-3rdparty/dyncall/test/callback_suite/stress1.cfg
-3rdparty/dyncall/test/callf/CMakeLists.txt
-3rdparty/dyncall/test/callf/Makefile.M
-3rdparty/dyncall/test/callf/Makefile.embedded
-3rdparty/dyncall/test/callf/Makefile.generic
-3rdparty/dyncall/test/callf/Nmakefile
-3rdparty/dyncall/test/callf/dynMakefile
-3rdparty/dyncall/test/callf/main.c
-3rdparty/dyncall/test/callf/mkfile
-3rdparty/dyncall/test/common/platformInit.h
-3rdparty/dyncall/test/dynMakefile
-3rdparty/dyncall/test/ellipsis/CMakeLists.txt
-3rdparty/dyncall/test/ellipsis/Makefile.M
-3rdparty/dyncall/test/ellipsis/Makefile.embedded
-3rdparty/dyncall/test/ellipsis/Makefile.generic
-3rdparty/dyncall/test/ellipsis/Nmakefile
-3rdparty/dyncall/test/ellipsis/README.txt
-3rdparty/dyncall/test/ellipsis/case.h
-3rdparty/dyncall/test/ellipsis/config.h
-3rdparty/dyncall/test/ellipsis/dynMakefile
-3rdparty/dyncall/test/ellipsis/ellipsis.cc
-3rdparty/dyncall/test/ellipsis/main.cc
-3rdparty/dyncall/test/ellipsis/mkcase.py
-3rdparty/dyncall/test/gen-masm/call_x64.S
-3rdparty/dyncall/test/gen-masm/call_x64.masm
-3rdparty/dyncall/test/gen-masm/call_x86.S
-3rdparty/dyncall/test/gen-masm/call_x86.masm
-3rdparty/dyncall/test/gen-masm/dyncall_macros.h
-3rdparty/dyncall/test/gen-masm/gen_masm.sh
-3rdparty/dyncall/test/hacking-arm-thumb-interwork/Makefile.darwin
-3rdparty/dyncall/test/hacking-arm-thumb-interwork/Makefile.linux
-3rdparty/dyncall/test/hacking-arm-thumb-interwork/README.txt
-3rdparty/dyncall/test/hacking-arm-thumb-interwork/arm.c
-3rdparty/dyncall/test/hacking-arm-thumb-interwork/diff-gcc-defs/diff-generic.sh
-3rdparty/dyncall/test/hacking-arm-thumb-interwork/diff-gcc-defs/empty.S
-3rdparty/dyncall/test/hacking-arm-thumb-interwork/diff-gcc-defs/empty.c
-3rdparty/dyncall/test/hacking-arm-thumb-interwork/test.c
-3rdparty/dyncall/test/hacking-arm-thumb-interwork/thumb.c
-3rdparty/dyncall/test/hacking-mips/README.txt
-3rdparty/dyncall/test/hacking-mips/call.c
-3rdparty/dyncall/test/hacking-mips/calls.c
-3rdparty/dyncall/test/hacking-mips/common.h
-3rdparty/dyncall/test/hacking-mips/dispatch.c
-3rdparty/dyncall/test/hacking-mips/f.c
-3rdparty/dyncall/test/hacking-mips/f0.c
-3rdparty/dyncall/test/hacking-mips/funs.c
-3rdparty/dyncall/test/hacking-mips/main.c
-3rdparty/dyncall/test/hacking-mips/node.c
-3rdparty/dyncall/test/hacking-mips/prolog.c
-3rdparty/dyncall/test/hacking-mips/retn.c
-3rdparty/dyncall/test/makepkg.sh
-3rdparty/dyncall/test/malloc_wx/CMakeLists.txt
-3rdparty/dyncall/test/malloc_wx/Makefile.M
-3rdparty/dyncall/test/malloc_wx/Makefile.embedded
-3rdparty/dyncall/test/malloc_wx/Makefile.generic
-3rdparty/dyncall/test/malloc_wx/Nmakefile
-3rdparty/dyncall/test/malloc_wx/dynMakefile
-3rdparty/dyncall/test/malloc_wx/mkfile
-3rdparty/dyncall/test/malloc_wx/test_wx.c
-3rdparty/dyncall/test/mkfile
-3rdparty/dyncall/test/nm/CMakeLists.txt
-3rdparty/dyncall/test/nm/Makefile.M
-3rdparty/dyncall/test/nm/Makefile.embedded
-3rdparty/dyncall/test/nm/Makefile.generic
-3rdparty/dyncall/test/nm/Nmakefile
-3rdparty/dyncall/test/nm/dynMakefile
-3rdparty/dyncall/test/nm/nm.c
-3rdparty/dyncall/test/plain/CMakeLists.txt
-3rdparty/dyncall/test/plain/Makefile.M
-3rdparty/dyncall/test/plain/Makefile.embedded
-3rdparty/dyncall/test/plain/Makefile.generic
-3rdparty/dyncall/test/plain/Nmakefile
-3rdparty/dyncall/test/plain/dynMakefile
-3rdparty/dyncall/test/plain/mkfile
-3rdparty/dyncall/test/plain/test_framework.h
-3rdparty/dyncall/test/plain/test_main.c
-3rdparty/dyncall/test/plain/test_structs.c
-3rdparty/dyncall/test/plain_c++/CMakeLists.txt
-3rdparty/dyncall/test/plain_c++/Makefile.M
-3rdparty/dyncall/test/plain_c++/Makefile.embedded
-3rdparty/dyncall/test/plain_c++/Makefile.generic
-3rdparty/dyncall/test/plain_c++/Nmakefile
-3rdparty/dyncall/test/plain_c++/dynMakefile
-3rdparty/dyncall/test/plain_c++/mkfile
-3rdparty/dyncall/test/plain_c++/test_framework.h
-3rdparty/dyncall/test/plain_c++/test_main.cc
-3rdparty/dyncall/test/resolve_self/Makefile.M
-3rdparty/dyncall/test/resolve_self/Makefile.embedded
-3rdparty/dyncall/test/resolve_self/Makefile.generic
-3rdparty/dyncall/test/resolve_self/Nmakefile
-3rdparty/dyncall/test/resolve_self/README.txt
-3rdparty/dyncall/test/resolve_self/dynMakefile
-3rdparty/dyncall/test/resolve_self/main.c
-3rdparty/dyncall/test/runalltests.bat
-3rdparty/dyncall/test/runalltests.sh
-3rdparty/dyncall/test/samples/calls/d16.c
-3rdparty/dyncall/test/samples/calls/d20.c
-3rdparty/dyncall/test/samples/calls/d40.c
-3rdparty/dyncall/test/samples/calls/f16.c
-3rdparty/dyncall/test/samples/calls/f20.c
-3rdparty/dyncall/test/samples/calls/f40.c
-3rdparty/dyncall/test/samples/calls/fd40.c
-3rdparty/dyncall/test/samples/calls/i3.c
-3rdparty/dyncall/test/samples/calls/i7.c
-3rdparty/dyncall/test/samples/calls/id40.c
-3rdparty/dyncall/test/samples/calls/l16.c
-3rdparty/dyncall/test/samples/calls/many.c
-3rdparty/dyncall/test/samples/composite/args.asm
-3rdparty/dyncall/test/samples/composite/args.c
-3rdparty/dyncall/test/samples/composite/args.s
-3rdparty/dyncall/test/samples/composite/build.bat
-3rdparty/dyncall/test/samples/composite/makefile
-3rdparty/dyncall/test/sharedlib/CMakeLists.txt
-3rdparty/dyncall/test/sharedlib/Makefile.embedded
-3rdparty/dyncall/test/sharedlib/sharedlib.c
-3rdparty/dyncall/test/sign/sign.c
-3rdparty/dyncall/test/suite/CMakeLists.txt
-3rdparty/dyncall/test/suite/Makefile.M
-3rdparty/dyncall/test/suite/Makefile.embedded
-3rdparty/dyncall/test/suite/Makefile.generic
-3rdparty/dyncall/test/suite/Nmakefile
-3rdparty/dyncall/test/suite/README.txt
-3rdparty/dyncall/test/suite/case.c
-3rdparty/dyncall/test/suite/case.h
-3rdparty/dyncall/test/suite/config.h
-3rdparty/dyncall/test/suite/dynMakefile
-3rdparty/dyncall/test/suite/main.c
-3rdparty/dyncall/test/suite/mkcase.py
-3rdparty/dyncall/test/suite/mkfile
-3rdparty/dyncall/test/suite2/CMakeLists.txt
-3rdparty/dyncall/test/suite2/Makefile.M
-3rdparty/dyncall/test/suite2/Makefile.embedded
-3rdparty/dyncall/test/suite2/Makefile.generic
-3rdparty/dyncall/test/suite2/Nmakefile
-3rdparty/dyncall/test/suite2/case.cc
-3rdparty/dyncall/test/suite2/case.h
-3rdparty/dyncall/test/suite2/config.h
-3rdparty/dyncall/test/suite2/design.cfg
-3rdparty/dyncall/test/suite2/dynMakefile
-3rdparty/dyncall/test/suite2/funcinfo.h
-3rdparty/dyncall/test/suite2/ints.cfg
-3rdparty/dyncall/test/suite2/main.cc
-3rdparty/dyncall/test/suite2/mkcase.py
-3rdparty/dyncall/test/suite2/rand.py
-3rdparty/dyncall/test/suite2/stress1.cfg
-3rdparty/dyncall/test/suite2_x86win32fast/CMakeLists.txt
-3rdparty/dyncall/test/suite2_x86win32fast/Makefile.M
-3rdparty/dyncall/test/suite2_x86win32fast/Makefile.generic
-3rdparty/dyncall/test/suite2_x86win32fast/Nmakefile
-3rdparty/dyncall/test/suite2_x86win32fast/case.cc
-3rdparty/dyncall/test/suite2_x86win32fast/case.h
-3rdparty/dyncall/test/suite2_x86win32fast/config.h
-3rdparty/dyncall/test/suite2_x86win32fast/design.cfg
-3rdparty/dyncall/test/suite2_x86win32fast/dynMakefile
-3rdparty/dyncall/test/suite2_x86win32fast/funcinfo.h
-3rdparty/dyncall/test/suite2_x86win32fast/main.cc
-3rdparty/dyncall/test/suite2_x86win32fast/mkcase.py
-3rdparty/dyncall/test/suite2_x86win32fast/rand.py
-3rdparty/dyncall/test/suite2_x86win32std/CMakeLists.txt
-3rdparty/dyncall/test/suite2_x86win32std/Makefile.M
-3rdparty/dyncall/test/suite2_x86win32std/Makefile.generic
-3rdparty/dyncall/test/suite2_x86win32std/Nmakefile
-3rdparty/dyncall/test/suite2_x86win32std/case.cc
-3rdparty/dyncall/test/suite2_x86win32std/case.h
-3rdparty/dyncall/test/suite2_x86win32std/config.h
-3rdparty/dyncall/test/suite2_x86win32std/design.cfg
-3rdparty/dyncall/test/suite2_x86win32std/dynMakefile
-3rdparty/dyncall/test/suite2_x86win32std/funcinfo.h
-3rdparty/dyncall/test/suite2_x86win32std/main.cc
-3rdparty/dyncall/test/suite2_x86win32std/mkcase.py
-3rdparty/dyncall/test/suite2_x86win32std/rand.py
-3rdparty/dyncall/test/suite3/CMakeLists.txt
-3rdparty/dyncall/test/suite3/Makefile.M
-3rdparty/dyncall/test/suite3/Makefile.embedded
-3rdparty/dyncall/test/suite3/Makefile.generic
-3rdparty/dyncall/test/suite3/Nmakefile
-3rdparty/dyncall/test/suite3/README.txt
-3rdparty/dyncall/test/suite3/case.cc
-3rdparty/dyncall/test/suite3/case.h
-3rdparty/dyncall/test/suite3/config.h
-3rdparty/dyncall/test/suite3/dynMakefile
-3rdparty/dyncall/test/suite3/main.cc
-3rdparty/dyncall/test/suite3/mkcase.py
-3rdparty/dyncall/test/suite_floats/CMakeLists.txt
-3rdparty/dyncall/test/suite_floats/Makefile.M
-3rdparty/dyncall/test/suite_floats/Makefile.embedded
-3rdparty/dyncall/test/suite_floats/Makefile.generic
-3rdparty/dyncall/test/suite_floats/Nmakefile
-3rdparty/dyncall/test/suite_floats/README.txt
-3rdparty/dyncall/test/suite_floats/case.cc
-3rdparty/dyncall/test/suite_floats/case.h
-3rdparty/dyncall/test/suite_floats/config.h
-3rdparty/dyncall/test/suite_floats/dynMakefile
-3rdparty/dyncall/test/suite_floats/main.cc
-3rdparty/dyncall/test/suite_floats/mkcase.py
-3rdparty/dyncall/test/suite_x86win32fast/CMakeLists.txt
-3rdparty/dyncall/test/suite_x86win32fast/Makefile.M
-3rdparty/dyncall/test/suite_x86win32fast/Makefile.generic
-3rdparty/dyncall/test/suite_x86win32fast/Nmakefile
-3rdparty/dyncall/test/suite_x86win32fast/README.txt
-3rdparty/dyncall/test/suite_x86win32fast/case.cc
-3rdparty/dyncall/test/suite_x86win32fast/case.h
-3rdparty/dyncall/test/suite_x86win32fast/config.h
-3rdparty/dyncall/test/suite_x86win32fast/dynMakefile
-3rdparty/dyncall/test/suite_x86win32fast/main.cc
-3rdparty/dyncall/test/suite_x86win32fast/mkcase.py
-3rdparty/dyncall/test/suite_x86win32std/CMakeLists.txt
-3rdparty/dyncall/test/suite_x86win32std/Makefile.M
-3rdparty/dyncall/test/suite_x86win32std/Makefile.generic
-3rdparty/dyncall/test/suite_x86win32std/Nmakefile
-3rdparty/dyncall/test/suite_x86win32std/README.txt
-3rdparty/dyncall/test/suite_x86win32std/case.cc
-3rdparty/dyncall/test/suite_x86win32std/case.h
-3rdparty/dyncall/test/suite_x86win32std/config.h
-3rdparty/dyncall/test/suite_x86win32std/dynMakefile
-3rdparty/dyncall/test/suite_x86win32std/main.cc
-3rdparty/dyncall/test/suite_x86win32std/mkcase.py
-3rdparty/dyncall/test/syscall/CMakeLists.txt
-3rdparty/dyncall/test/syscall/Makefile.M
-3rdparty/dyncall/test/syscall/Makefile.embedded
-3rdparty/dyncall/test/syscall/Makefile.generic
-3rdparty/dyncall/test/syscall/dynMakefile
-3rdparty/dyncall/test/syscall/syscall.c
-3rdparty/dyncall/test/thunk/CMakeLists.txt
-3rdparty/dyncall/test/thunk/Makefile.M
-3rdparty/dyncall/test/thunk/Makefile.embedded
-3rdparty/dyncall/test/thunk/Makefile.generic
-3rdparty/dyncall/test/thunk/Nmakefile
-3rdparty/dyncall/test/thunk/dynMakefile
-3rdparty/dyncall/test/thunk/mkfile
-3rdparty/dyncall/test/thunk/test_thunk.c
 3rdparty/jline/LICENSE.txt
 3rdparty/jline/jline-1.0.jar
 3rdparty/jna/ASL2.0
@@ -894,8 +283,9 @@
 src/vm/js/const_map.nqp
 src/vm/js/nqp-loader/main.js
 src/vm/js/nqp-loader/package.json
-src/vm/js/nqp-runtime/array.js
+src/vm/js/nqp-runtime/BOOT.js
 src/vm/js/nqp-runtime/bignum.js
+src/vm/js/nqp-runtime/boot-types.js
 src/vm/js/nqp-runtime/bootstrap.js
 src/vm/js/nqp-runtime/cclass.js
 src/vm/js/nqp-runtime/code-ref.js
@@ -906,6 +296,7 @@
 src/vm/js/nqp-runtime/ctx.js
 src/vm/js/nqp-runtime/curlexpad.js
 src/vm/js/nqp-runtime/deserialization.js
+src/vm/js/nqp-runtime/exceptions-stack.js
 src/vm/js/nqp-runtime/hash.js
 src/vm/js/nqp-runtime/hll.js
 src/vm/js/nqp-runtime/io.js
@@ -919,6 +310,7 @@
 src/vm/js/nqp-runtime/null.js
 src/vm/js/nqp-runtime/null_s.js
 src/vm/js/nqp-runtime/package.json
+src/vm/js/nqp-runtime/repossession.js
 src/vm/js/nqp-runtime/reprs.js
 src/vm/js/nqp-runtime/runtime.js
 src/vm/js/nqp-runtime/serialization-context.js
@@ -1280,6 +672,7 @@
 t/nqp/101-lexpad-stuff.t
 t/nqp/102-multidim.t
 t/nqp/103-typecache.t
+t/nqp/104-method-cache.t
 t/nqp/19-readline.txt
 t/nqp/19-setinputlinesep.txt
 t/p5regex/01-p5regex.t
@@ -1307,6 +700,7 @@
 t/serialization/01-basic.t
 t/serialization/02-types.t
 t/serialization/03-closures.t
+t/serialization/04-repossession.t
 tools/analyze-parse
 tools/build/MOAR_REVISION
 tools/build/Makefile-JS.in
diff -Nru nqp-2016.11+dfsg/src/HLL/Compiler.nqp nqp-2016.12+dfsg/src/HLL/Compiler.nqp
--- nqp-2016.11+dfsg/src/HLL/Compiler.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/HLL/Compiler.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -23,7 +23,7 @@
         @!stages     := nqp::split(' ', 'start parse ast ' ~ $!backend.stages());
         
         # Command options and usage.
-        @!cmdoptions := nqp::split(' ', 'e=s help|h target=s trace|t=s encoding=s output|o=s source-name=s combine version|v show-config verbose-config|V stagestats=s? ll-exception rxtrace nqpevent=s profile=s? profile-compile=s? profile-filename=s');
+        @!cmdoptions := nqp::split(' ', 'e=s help|h target=s trace|t=s encoding=s output|o=s source-name=s combine version|v show-config verbose-config|V stagestats=s? ll-exception rxtrace nqpevent=s profile=s? profile-compile=s? profile-filename=s profile-stage=s');
         %!config     := nqp::hash();
     }
     
@@ -426,15 +426,23 @@
             }
             nqp::printfh($stderr, nqp::sprintf("Stage %-11s: ", [$_])) if nqp::defined($stagestats);
             my $timestamp := nqp::time_n();
-            if nqp::can(self, $_) {
-                $result := self."$_"($result, |%adverbs);
-            }
-            elsif nqp::can($!backend, $_) {
-                $result := $!backend."$_"($result, |%adverbs);
-            }
-            else {
-                nqp::die("Unknown compilation stage '$_'");
+
+            my sub run() {
+                if nqp::can(self, $_) {
+                    self."$_"($result, |%adverbs);
+                }
+                elsif nqp::can($!backend, $_) {
+                    $!backend."$_"($result, |%adverbs);
+                }
+                else {
+                    nqp::die("Unknown compilation stage '$_'");
+                }
             }
+
+            $result := %adverbs<profile-stage> eq $_
+                ?? $!backend.run_profiled(&run, '', %adverbs<profile-filename>)
+                !! run();
+
             my $diff := nqp::time_n() - $timestamp;
             if nqp::defined($stagestats) {
                 nqp::printfh($stderr, nqp::sprintf("%7.3f", [$diff]));
diff -Nru nqp-2016.11+dfsg/src/HLL/Grammar.nqp nqp-2016.12+dfsg/src/HLL/Grammar.nqp
--- nqp-2016.11+dfsg/src/HLL/Grammar.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/HLL/Grammar.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -1,7 +1,48 @@
 use QRegex;
 
 grammar HLL::Grammar {
-    my $brackets := "<>[]()\{}\x[0028]\x[0029]\x[003C]\x[003E]\x[005B]\x[005D]\x[007B]\x[007D]\x[00AB]\x[00BB]\x[0F3A]\x[0F3B]\x[0F3C]\x[0F3D]\x[169B]\x[169C]\x[2018]\x[2019]\x[201A]\x[2019]\x[201B]\x[2019]\x[201C]\x[201D]\x[201E]\x[201D]\x[201F]\x[201D]\x[2039]\x[203A]\x[2045]\x[2046]\x[207D]\x[207E]\x[208D]\x[208E]\x[2208]\x[220B]\x[2209]\x[220C]\x[220A]\x[220D]\x[2215]\x[29F5]\x[223C]\x[223D]\x[2243]\x[22CD]\x[2252]\x[2253]\x[2254]\x[2255]\x[2264]\x[2265]\x[2266]\x[2267]\x[2268]\x[2269]\x[226A]\x[226B]\x[226E]\x[226F]\x[2270]\x[2271]\x[2272]\x[2273]\x[2274]\x[2275]\x[2276]\x[2277]\x[2278]\x[2279]\x[227A]\x[227B]\x[227C]\x[227D]\x[227E]\x[227F]\x[2280]\x[2281]\x[2282]\x[2283]\x[2284]\x[2285]\x[2286]\x[2287]\x[2288]\x[2289]\x[228A]\x[228B]\x[228F]\x[2290]\x[2291]\x[2292]\x[2298]\x[29B8]\x[22A2]\x[22A3]\x[22A6]\x[2ADE]\x[22A8]\x[2AE4]\x[22A9]\x[2AE3]\x[22AB]\x[2AE5]\x[22B0]\x[22B1]\x[22B2]\x[22B3]\x[22B4]\x[22B5]\x[22B6]\x[22B7]\x[22C9]\x[22CA]\x[22CB]\x[22CC]\x[22D0]\x[22D1]\x[22D6]\x[22D7]\x[22D8]\x[22D9]\x[22DA]\x[22DB]\x[22DC]\x[22DD]\x[22DE]\x[22DF]\x[22E0]\x[22E1]\x[22E2]\x[22E3]\x[22E4]\x[22E5]\x[22E6]\x[22E7]\x[22E8]\x[22E9]\x[22EA]\x[22EB]\x[22EC]\x[22ED]\x[22F0]\x[22F1]\x[22F2]\x[22FA]\x[22F3]\x[22FB]\x[22F4]\x[22FC]\x[22F6]\x[22FD]\x[22F7]\x[22FE]\x[2308]\x[2309]\x[230A]\x[230B]\x[2329]\x[232A]\x[23B4]\x[23B5]\x[2768]\x[2769]\x[276A]\x[276B]\x[276C]\x[276D]\x[276E]\x[276F]\x[2770]\x[2771]\x[2772]\x[2773]\x[2774]\x[2775]\x[27C3]\x[27C4]\x[27C5]\x[27C6]\x[27D5]\x[27D6]\x[27DD]\x[27DE]\x[27E2]\x[27E3]\x[27E4]\x[27E5]\x[27E6]\x[27E7]\x[27E8]\x[27E9]\x[27EA]\x[27EB]\x[2983]\x[2984]\x[2985]\x[2986]\x[2987]\x[2988]\x[2989]\x[298A]\x[298B]\x[298C]\x[298D]\x[298E]\x[298F]\x[2990]\x[2991]\x[2992]\x[2993]\x[2994]\x[2995]\x[2996]\x[2997]\x[2998]\x[29C0]\x[29C1]\x[29C4]\x[29C5]\x[29CF]\x[29D0]\x[29D1]\x[29D2]\x[29D4]\x[29D5]\x[29D8]\x[29D9]\x[29DA]\x[29DB]\x[29F8]\x[29F9]\x[29FC]\x[29FD]\x[2A2B]\x[2A2C]\x[2A2D]\x[2A2E]\x[2A34]\x[2A35]\x[2A3C]\x[2A3D]\x[2A64]\x[2A65]\x[2A79]\x[2A7A]\x[2A7D]\x[2A7E]\x[2A7F]\x[2A80]\x[2A81]\x[2A82]\x[2A83]\x[2A84]\x[2A8B]\x[2A8C]\x[2A91]\x[2A92]\x[2A93]\x[2A94]\x[2A95]\x[2A96]\x[2A97]\x[2A98]\x[2A99]\x[2A9A]\x[2A9B]\x[2A9C]\x[2AA1]\x[2AA2]\x[2AA6]\x[2AA7]\x[2AA8]\x[2AA9]\x[2AAA]\x[2AAB]\x[2AAC]\x[2AAD]\x[2AAF]\x[2AB0]\x[2AB3]\x[2AB4]\x[2ABB]\x[2ABC]\x[2ABD]\x[2ABE]\x[2ABF]\x[2AC0]\x[2AC1]\x[2AC2]\x[2AC3]\x[2AC4]\x[2AC5]\x[2AC6]\x[2ACD]\x[2ACE]\x[2ACF]\x[2AD0]\x[2AD1]\x[2AD2]\x[2AD3]\x[2AD4]\x[2AD5]\x[2AD6]\x[2AEC]\x[2AED]\x[2AF7]\x[2AF8]\x[2AF9]\x[2AFA]\x[2E02]\x[2E03]\x[2E04]\x[2E05]\x[2E09]\x[2E0A]\x[2E0C]\x[2E0D]\x[2E1C]\x[2E1D]\x[2E20]\x[2E21]\x[2E28]\x[2E29]\x[3008]\x[3009]\x[300A]\x[300B]\x[300C]\x[300D]\x[300E]\x[300F]\x[3010]\x[3011]\x[3014]\x[3015]\x[3016]\x[3017]\x[3018]\x[3019]\x[301A]\x[301B]\x[301D]\x[301E]\x[FD3E]\x[FD3F]\x[FE17]\x[FE18]\x[FE35]\x[FE36]\x[FE37]\x[FE38]\x[FE39]\x[FE3A]\x[FE3B]\x[FE3C]\x[FE3D]\x[FE3E]\x[FE3F]\x[FE40]\x[FE41]\x[FE42]\x[FE43]\x[FE44]\x[FE47]\x[FE48]\x[FE59]\x[FE5A]\x[FE5B]\x[FE5C]\x[FE5D]\x[FE5E]\x[FF08]\x[FF09]\x[FF1C]\x[FF1E]\x[FF3B]\x[FF3D]\x[FF5B]\x[FF5D]\x[FF5F]\x[FF60]\x[FF62]\x[FF63]";
+    my $brackets := '<>[](){}'   ~  "\x[0028]\x[0029]\x[003C]\x[003E]\x[005B]\x[005D]" ~
+    "\x[007B]\x[007D]\x[00AB]\x[00BB]\x[0F3A]\x[0F3B]\x[0F3C]\x[0F3D]\x[169B]\x[169C]" ~
+    "\x[2018]\x[2019]\x[201A]\x[2019]\x[201B]\x[2019]\x[201C]\x[201D]\x[201E]\x[201D]" ~
+    "\x[201F]\x[201D]\x[2039]\x[203A]\x[2045]\x[2046]\x[207D]\x[207E]\x[208D]\x[208E]" ~
+    "\x[2208]\x[220B]\x[2209]\x[220C]\x[220A]\x[220D]\x[2215]\x[29F5]\x[223C]\x[223D]" ~
+    "\x[2243]\x[22CD]\x[2252]\x[2253]\x[2254]\x[2255]\x[2264]\x[2265]\x[2266]\x[2267]" ~
+    "\x[2268]\x[2269]\x[226A]\x[226B]\x[226E]\x[226F]\x[2270]\x[2271]\x[2272]\x[2273]" ~
+    "\x[2274]\x[2275]\x[2276]\x[2277]\x[2278]\x[2279]\x[227A]\x[227B]\x[227C]\x[227D]" ~
+    "\x[227E]\x[227F]\x[2280]\x[2281]\x[2282]\x[2283]\x[2284]\x[2285]\x[2286]\x[2287]" ~
+    "\x[2288]\x[2289]\x[228A]\x[228B]\x[228F]\x[2290]\x[2291]\x[2292]\x[2298]\x[29B8]" ~
+    "\x[22A2]\x[22A3]\x[22A6]\x[2ADE]\x[22A8]\x[2AE4]\x[22A9]\x[2AE3]\x[22AB]\x[2AE5]" ~
+    "\x[22B0]\x[22B1]\x[22B2]\x[22B3]\x[22B4]\x[22B5]\x[22B6]\x[22B7]\x[22C9]\x[22CA]" ~
+    "\x[22CB]\x[22CC]\x[22D0]\x[22D1]\x[22D6]\x[22D7]\x[22D8]\x[22D9]\x[22DA]\x[22DB]" ~
+    "\x[22DC]\x[22DD]\x[22DE]\x[22DF]\x[22E0]\x[22E1]\x[22E2]\x[22E3]\x[22E4]\x[22E5]" ~
+    "\x[22E6]\x[22E7]\x[22E8]\x[22E9]\x[22EA]\x[22EB]\x[22EC]\x[22ED]\x[22F0]\x[22F1]" ~
+    "\x[22F2]\x[22FA]\x[22F3]\x[22FB]\x[22F4]\x[22FC]\x[22F6]\x[22FD]\x[22F7]\x[22FE]" ~
+    "\x[2308]\x[2309]\x[230A]\x[230B]\x[2329]\x[232A]\x[23B4]\x[23B5]\x[2768]\x[2769]" ~
+    "\x[276A]\x[276B]\x[276C]\x[276D]\x[276E]\x[276F]\x[2770]\x[2771]\x[2772]\x[2773]" ~
+    "\x[2774]\x[2775]\x[27C3]\x[27C4]\x[27C5]\x[27C6]\x[27D5]\x[27D6]\x[27DD]\x[27DE]" ~
+    "\x[27E2]\x[27E3]\x[27E4]\x[27E5]\x[27E6]\x[27E7]\x[27E8]\x[27E9]\x[27EA]\x[27EB]" ~
+    "\x[2983]\x[2984]\x[2985]\x[2986]\x[2987]\x[2988]\x[2989]\x[298A]\x[298B]\x[298C]" ~
+    "\x[298D]\x[298E]\x[298F]\x[2990]\x[2991]\x[2992]\x[2993]\x[2994]\x[2995]\x[2996]" ~
+    "\x[2997]\x[2998]\x[29C0]\x[29C1]\x[29C4]\x[29C5]\x[29CF]\x[29D0]\x[29D1]\x[29D2]" ~
+    "\x[29D4]\x[29D5]\x[29D8]\x[29D9]\x[29DA]\x[29DB]\x[29F8]\x[29F9]\x[29FC]\x[29FD]" ~
+    "\x[2A2B]\x[2A2C]\x[2A2D]\x[2A2E]\x[2A34]\x[2A35]\x[2A3C]\x[2A3D]\x[2A64]\x[2A65]" ~
+    "\x[2A79]\x[2A7A]\x[2A7D]\x[2A7E]\x[2A7F]\x[2A80]\x[2A81]\x[2A82]\x[2A83]\x[2A84]" ~
+    "\x[2A8B]\x[2A8C]\x[2A91]\x[2A92]\x[2A93]\x[2A94]\x[2A95]\x[2A96]\x[2A97]\x[2A98]" ~
+    "\x[2A99]\x[2A9A]\x[2A9B]\x[2A9C]\x[2AA1]\x[2AA2]\x[2AA6]\x[2AA7]\x[2AA8]\x[2AA9]" ~
+    "\x[2AAA]\x[2AAB]\x[2AAC]\x[2AAD]\x[2AAF]\x[2AB0]\x[2AB3]\x[2AB4]\x[2ABB]\x[2ABC]" ~
+    "\x[2ABD]\x[2ABE]\x[2ABF]\x[2AC0]\x[2AC1]\x[2AC2]\x[2AC3]\x[2AC4]\x[2AC5]\x[2AC6]" ~
+    "\x[2ACD]\x[2ACE]\x[2ACF]\x[2AD0]\x[2AD1]\x[2AD2]\x[2AD3]\x[2AD4]\x[2AD5]\x[2AD6]" ~
+    "\x[2AEC]\x[2AED]\x[2AF7]\x[2AF8]\x[2AF9]\x[2AFA]\x[2E02]\x[2E03]\x[2E04]\x[2E05]" ~
+    "\x[2E09]\x[2E0A]\x[2E0C]\x[2E0D]\x[2E1C]\x[2E1D]\x[2E20]\x[2E21]\x[2E28]\x[2E29]" ~
+    "\x[3008]\x[3009]\x[300A]\x[300B]\x[300C]\x[300D]\x[300E]\x[300F]\x[3010]\x[3011]" ~
+    "\x[3014]\x[3015]\x[3016]\x[3017]\x[3018]\x[3019]\x[301A]\x[301B]\x[301D]\x[301E]" ~
+    "\x[FE17]\x[FE18]\x[FE35]\x[FE36]\x[FE37]\x[FE38]\x[FE39]\x[FE3A]\x[FE3B]\x[FE3C]" ~
+    "\x[FE3D]\x[FE3E]\x[FE3F]\x[FE40]\x[FE41]\x[FE42]\x[FE43]\x[FE44]\x[FE47]\x[FE48]" ~
+    "\x[FE59]\x[FE5A]\x[FE5B]\x[FE5C]\x[FE5D]\x[FE5E]\x[FF08]\x[FF09]\x[FF1C]\x[FF1E]" ~
+    "\x[FF3B]\x[FF3D]\x[FF5B]\x[FF5D]\x[FF5F]\x[FF60]\x[FF62]\x[FF63]\x[27EE]\x[27EF]" ~
+    "\x[2E24]\x[2E25]\x[27EC]\x[27ED]\x[2E22]\x[2E23]\x[2E26]\x[2E27]" ~
+    "\x[FD3E]\x[FD3F]"; # All brackets have matching Ps/Pe or Pi/Pf except \x[FD3E]\x[FD3F]
+                        # (ORNATE PARENTHESIS), which are allowed since they are RTL Text characters
 
     method perl() { self.HOW.name(self) ~ '.new() #`[' ~ nqp::where(self) ~ ']' }
 
@@ -120,7 +161,7 @@
     token charnames { [<.ws><charname><.ws>]+ % ',' }
     token charspec {
         [
-        | '[' <charnames> ']' 
+        | '[' <charnames> ']'
         | \d+ [ _ \d+]*
         | <control=[ ?..Z ]>
         | <.panic: 'Unrecognized \\c character'>
@@ -131,7 +172,7 @@
         ^^ '#' \s* 'line' \s+ $<line>=(\d+) [ \s+ $<filename>=(\S+) ]? $$
     }
 
-=begin 
+=begin
 
 =item O(*%spec)
 
@@ -183,7 +224,7 @@
         @args.push('"');
         nqp::die(join('', @args))
     }
-    
+
     method FAILGOAL($goal, $dba?) {
         unless $dba {
             $dba := nqp::getcodename(nqp::callercode());
@@ -204,7 +245,7 @@
     method peek_delimiters(str $target, int $pos) {
         # peek at the next character
         my str $start := nqp::substr($target, $pos, 1);
-    
+
         # colon, word and whitespace characters aren't valid delimiters
         if $start eq ':' {
             self.panic('Colons may not be used to delimit quoting constructs');
@@ -340,7 +381,7 @@
         my str $inassoc;
         my int $more_infix;
         my int $term_done;
-        
+
         while 1 {
             nqp::bindattr_i($here, NQPCursor, '$!pos', $pos);
             $termcur := $here."$termishrx"();
@@ -352,14 +393,14 @@
             }
 
             $termish := $termcur.MATCH();
-            
+
             # Interleave any prefix/postfix we might have found.
             %termOPER := $termish;
             %termOPER := nqp::atkey(%termOPER, 'OPER')
                 while nqp::existskey(%termOPER, 'OPER');
             @prefixish  := nqp::atkey(%termOPER, 'prefixish');
             @postfixish := nqp::atkey(%termOPER, 'postfixish');
- 
+
             unless nqp::isnull(@prefixish) || nqp::isnull(@postfixish) {
                 while @prefixish && @postfixish {
                     my %preO     := @prefixish[0]<OPER><O>.made;
@@ -386,10 +427,10 @@
                 nqp::push(@opstack, nqp::shift(@prefixish)) while @prefixish;
                 nqp::push(@opstack, nqp::pop(@postfixish)) while @postfixish;
             }
-            nqp::deletekey($termish, 'prefixish');            
+            nqp::deletekey($termish, 'prefixish');
             nqp::deletekey($termish, 'postfixish');
             nqp::push(@termstack, nqp::atkey($termish, 'term'));
-        
+
             last if $noinfix;
 
             $more_infix := 1;
@@ -404,7 +445,7 @@
                     $term_done := 1;
                     last;
                 }
-        
+
                 # Next, try the infix itself.
                 nqp::bindattr_i($here, NQPCursor, '$!pos', $pos);
                 $infixcur := $here.infixish();
@@ -414,7 +455,7 @@
                     last;
                 }
                 $infix := $infixcur.MATCH();
-    
+
                 # We got an infix.
                 %inO := $infix<OPER><O>.made;
                 $termishrx := nqp::ifnull(nqp::atkey(%inO, 'nextterm'), 'termish');
@@ -443,7 +484,7 @@
                 }
             }
             last if $term_done;
-        
+
             # if equal precedence, use associativity to decide
             if $opprec eq $inprec {
                 $inassoc := nqp::atkey(%inO, 'assoc');
@@ -462,7 +503,7 @@
                     self.EXPR_nonlistassoc($infixcur, $op1, $op2) if $op1 ne $op2 && $op1 ne ':';
                 }
             }
-            
+
             nqp::push(@opstack, $infix); # The Shift
             nqp::bindattr_i($here, NQPCursor, '$!pos', $pos);
             $wscur := $here.ws();
@@ -470,7 +511,7 @@
             nqp::bindattr_i($here, NQPCursor, '$!pos', $pos);
             return $here if $pos < 0;
         }
-        
+
         self.EXPR_reduce(@termstack, @opstack) while @opstack;
         $pos := nqp::getattr_i($here, NQPCursor, '$!pos');
         $here := self.'!cursor_start_cur'();
@@ -481,9 +522,9 @@
         $here;
     }
 
-    method EXPR_reduce(@termstack, @opstack) { 
+    method EXPR_reduce(@termstack, @opstack) {
         my $op := nqp::pop(@opstack);
-        
+
         # Give it a fresh capture list, since we'll have assumed it has
         # no positional captures and not taken them.
         nqp::bindattr($op, NQPCapture, '@!array', nqp::list());
@@ -503,7 +544,7 @@
         elsif $opassoc eq 'list' {
             $sym := nqp::ifnull(nqp::atkey(%opOPER, 'sym'), '');
             nqp::unshift($op, nqp::pop(@termstack));
-            while @opstack {    
+            while @opstack {
                 last if $sym ne nqp::ifnull(
                     nqp::atkey(nqp::atkey(nqp::atpos(@opstack,
                         nqp::elems(@opstack) - 1), 'OPER'), 'sym'), '');
@@ -523,7 +564,7 @@
         self.'!reduce_with_match'('EXPR', $key, $op);
         nqp::push(@termstack, $op);
     }
-    
+
     method EXPR_nonassoc($cur, $op1, $op2) {
         $cur.panic('"' ~ $op1 ~ '" and "' ~ $op2 ~ '" are non-associative and require parens');
     }
@@ -553,7 +594,7 @@
             $cur
         }
     }
-    
+
     method MARKED(str $markname) {
         my %markhash := nqp::getattr(
             nqp::getattr(self, NQPCursor, '$!shared'),
diff -Nru nqp-2016.11+dfsg/src/HLL/sprintf.nqp nqp-2016.12+dfsg/src/HLL/sprintf.nqp
--- nqp-2016.11+dfsg/src/HLL/sprintf.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/HLL/sprintf.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -7,14 +7,14 @@
             :my $*ARGS_USED := 0;
             ^ <statement>* $
         }
-        
-        method panic($message, $payload) { 
+
+        method panic($message, $payload) {
             my $ex := nqp::newexception();
             nqp::setmessage($ex, $message);
             nqp::setpayload($ex, $payload);
             nqp::throw($ex);
         }
-        
+
         token statement {
             [
             | <?[%]> [ [ <directive> | <escape> ]
@@ -37,13 +37,13 @@
 
         proto token escape { <...> }
         token escape:sym<%> { '%' <flags>* <size>? <sym> }
-        
+
         token literal { <-[%]>+ }
-        
+
         token idx {
             $<param_index>=[\d+] '$'
         }
-        
+
         token flags {
             | $<space> = ' '
             | $<plus>  = '+'
@@ -51,7 +51,7 @@
             | $<zero>  = '0'
             | $<hash>  = '#'
         }
-        
+
         token size {
             \d* | $<star>='*'
         }
@@ -71,7 +71,7 @@
                     ~ (+@*ARGS_HAVE < 1      ?? "no argument was"
                         !! +@*ARGS_HAVE == 1 ?? "1 argument was"
                                              !! +@*ARGS_HAVE ~ " arguments were")
-                    ~ " supplied", nqp::hash('DIRECTIVES_COUNT', 
+                    ~ " supplied", nqp::hash('DIRECTIVES_COUNT',
                             nqp::hash('ARGS_HAVE', +@*ARGS_HAVE, 'ARGS_USED', $*ARGS_USED)))
             }
             make nqp::join('', @statements);
@@ -86,11 +86,11 @@
 
         sub bad-type-for-directive($type, $directive) {
             my $message := "Directive $directive not applicable for type " ~ $type.HOW.name($type);
-            my $payload := nqp::hash('BAD_TYPE_FOR_DIRECTIVE', 
+            my $payload := nqp::hash('BAD_TYPE_FOR_DIRECTIVE',
                 nqp::hash('TYPE', $type.HOW.name($type), 'DIRECTIVE', $directive));
             panic($message, $payload);
         }
-        
+
         sub infix_x($s, $n) {
             my @strings;
             my int $i := 0;
@@ -198,8 +198,8 @@
             my $int := intify($next);
             my $pad := padding_char($/);
             my $sign := nqp::islt_I($int, $zero) ?? '-'
-                     !! has_flag($/, 'plus') ?? '+' 
-                     !! has_flag($/, 'space') ?? ' ' 
+                     !! has_flag($/, 'plus') ?? '+'
+                     !! has_flag($/, 'space') ?? ' '
                      !! '';
             $int := nqp::tostr_I(nqp::abs_I($int, $knowhow));
             $int := nqp::substr($int, 0, $<precision>.made) if nqp::chars($<precision>);
@@ -264,12 +264,12 @@
 
             my $e := nqp::fromnum_I($d > $precision ?? $d - $precision !! 0, $knowhow);
             my $pot := nqp::pow_I(nqp::fromnum_I(10, $knowhow), $e, $knowhow, $knowhow);   # power of ten
-            my $rounder := nqp::mul_I(nqp::fromnum_I(5, $knowhow), $pot, $knowhow);          
+            my $rounder := nqp::mul_I(nqp::fromnum_I(5, $knowhow), $pot, $knowhow);
 
             $rhs_I := nqp::add_I($rhs_I, $rounder, $knowhow);
             $rhs_s := nqp::tostr_I($rhs_I);
 
-            $lhs_I := nqp::add_I($lhs_I, nqp::fromnum_I(1,$knowhow), $knowhow) 
+            $lhs_I := nqp::add_I($lhs_I, nqp::fromnum_I(1,$knowhow), $knowhow)
                 if nqp::substr($rhs_s,0,1) ne '1';          # we had a carry
 
             $lhs_s := nqp::tostr_I($lhs_I);
@@ -295,18 +295,24 @@
 #?endif
         }
         sub fixed-point($float, $precision, $size, $pad, $/) {
-            my $sign := $float < 0 ?? '-' 
-                     !! has_flag($/, 'plus') ?? '+' 
-                     !! has_flag($/, 'space') ?? ' ' 
+            # if we have zero; handle its sign: 1/0e0 == +Inf, 1/-0e0 == -Inf
+            my $sign := $float < 0
+                || ( $float == 0 && nqp::islt_n(nqp::div_n(1e0,$float), 0e0) )
+                ?? '-'
+                     !! has_flag($/, 'plus') ?? '+'
+                     !! has_flag($/, 'space') ?? ' '
                      !! '';
             $float := nqp::abs_n($float);
             $float := stringify-to-precision($float, $precision) unless nqp::isnanorinf($float);
             pad-with-sign($sign, $float, $size, $pad);
         }
         sub scientific($float, $e, $precision, $size, $pad, $/) {
-            my $sign := $float < 0 ?? '-' 
-                     !! has_flag($/, 'plus') ?? '+' 
-                     !! has_flag($/, 'space') ?? ' ' 
+            # if we have zero; handle its sign: 1/0e0 == +Inf, 1/-0e0 == -Inf
+            my $sign := $float < 0
+                || ( $float == 0 && nqp::islt_n(nqp::div_n(1e0,$float), 0e0) )
+                ?? '-'
+                     !! has_flag($/, 'plus') ?? '+'
+                     !! has_flag($/, 'space') ?? ' '
                      !! '';
             $float := nqp::abs_n($float);
             unless nqp::isnanorinf($float) {
@@ -323,9 +329,12 @@
             pad-with-sign($sign, $float, $size, $pad);
         }
         sub shortest($float, $e, $precision, $size, $pad, $/) {
-            my $sign := $float < 0 ?? '-' 
-                     !! has_flag($/, 'plus') ?? '+' 
-                     !! has_flag($/, 'space') ?? ' ' 
+            # if we have zero; handle its sign: 1/0e0 == +Inf, 1/-0e0 == -Inf
+            my $sign := $float < 0
+                || ( $float == 0 && nqp::islt_n(nqp::div_n(1e0,$float), 0e0) )
+                ?? '-'
+                     !! has_flag($/, 'plus') ?? '+'
+                     !! has_flag($/, 'space') ?? ' '
                      !! '';
             $float := nqp::abs_n($float);
 
@@ -347,7 +356,7 @@
                 } else {
                     $sci := $float ~ $e ~ '+' ~ ($exp < 10 ?? '0' !! '') ~ $exp;
                 }
-                
+
                 pad-with-sign($sign, $sci, $size, $pad);
             }
         }
@@ -424,7 +433,7 @@
             my $int := intify($next);
             if nqp::islt_I($int, $zero) {
                     my $err := nqp::getstderr();
-                    nqp::printfh($err, "negative value '" 
+                    nqp::printfh($err, "negative value '"
                                     ~ $int
                                     ~ "' for %u in sprintf");
                     $int := 0;
@@ -491,9 +500,9 @@
             make $<directive> && !$<directive><idx> ?? 1 !! 0
         }
     }
-    
+
     my $directives := Directives.new();
-    
+
     sub sprintfdirectives($format) {
         return Syntax.parse( $format, :actions($directives) ).made;
     }
diff -Nru nqp-2016.11+dfsg/src/NQP/Actions.nqp nqp-2016.12+dfsg/src/NQP/Actions.nqp
--- nqp-2016.11+dfsg/src/NQP/Actions.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/NQP/Actions.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -1405,6 +1405,14 @@
     method term:sym<nqp::op>($/) {
         my $op    := ~$<op>;
         my @args  := $<args> ?? $<args>[0].ast.list !! [];
+        if $op eq 'handle' || $op eq 'handlepayload' {
+            my int $i := 1;
+            my int $n := nqp::elems(@args);
+            while $i < $n {
+                @args[$i] := @args[$i].value;
+                $i := $i + 2;
+            }
+        }
         my $ast  := QAST::Op.new( :op($op), |@args, :node($/) );
         make $ast;
         $/.prune;
diff -Nru nqp-2016.11+dfsg/src/NQP/Compiler.nqp nqp-2016.12+dfsg/src/NQP/Compiler.nqp
--- nqp-2016.11+dfsg/src/NQP/Compiler.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/NQP/Compiler.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -44,6 +44,7 @@
 @clo.push('cps=s');
 @clo.push('nyi=s');
 @clo.push('shebang');
+@clo.push('snapshot=s');
 #?endif
 
 #?if moar
diff -Nru nqp-2016.11+dfsg/src/QAST/Block.nqp nqp-2016.12+dfsg/src/QAST/Block.nqp
--- nqp-2016.11+dfsg/src/QAST/Block.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/QAST/Block.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -91,6 +91,6 @@
     }
 
     method dump_extra_node_info() {
-        nqp::chars(self.blocktype) ?? ":decl($!blocktype)" !! "";
+        nqp::chars(self.blocktype) ?? ":blocktype($!blocktype)" !! "";
     }
 }
diff -Nru nqp-2016.11+dfsg/src/QRegex/Cursor.nqp nqp-2016.12+dfsg/src/QRegex/Cursor.nqp
--- nqp-2016.11+dfsg/src/QRegex/Cursor.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/QRegex/Cursor.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -36,10 +36,10 @@
     has $!regexsub;
     has $!restart;
 
-    method orig() { nqp::getattr($!shared, ParseShared, '$!orig') }
+    method orig()   { nqp::getattr($!shared, ParseShared, '$!orig') }
     method target() { nqp::getattr_s($!shared, ParseShared, '$!target') }
-    method from() { $!from }
-    method pos() { $!pos }
+    method from()   { $!from }
+    method pos()    { $!pos }
 
     method prune() {
         $!match    := NQPMu;
@@ -84,9 +84,9 @@
             $cs      := $!cstack;
             $cselems := nqp::elems($cs);
             while $csi < $cselems {
-                $subcur := nqp::atpos($cs, $csi);
+                $subcur   := nqp::atpos($cs, $csi);
                 $submatch := $subcur.MATCH;
-                $name := nqp::getattr($subcur, $?CLASS, '$!name');
+                $name     := nqp::getattr($subcur, $?CLASS, '$!name');
                 if !nqp::isnull($name) && nqp::defined($name) {
                     if nqp::index($name, '=') < 0 {
                         %caplist{$name} >= 2
@@ -142,7 +142,7 @@
     # Starts a new Cursor, returning all information relating to it in an array.
     # The array is valid until the next call to !cursor_start_all.
     my $NO_RESTART := 0;
-    my $RESTART := 1;
+    my $RESTART    := 1;
     method !cursor_start_all() {
         my @start_result;
         my $new := nqp::create(self);
@@ -240,41 +240,41 @@
     }
     
     method !cursor_push_cstack($capture) {
-	if !nqp::defined($!cstack) { $!cstack := [$capture] }
-	elsif nqp::elems($!cstack) == 0 {
-	    nqp::push($!cstack, $capture);
-	}
-	elsif !nqp::isnull($capture) {
-	    my $name := nqp::getattr($capture, $?CLASS, '$!name');
-	    if !nqp::isnull($name) && nqp::defined($name) {
-		nqp::push($!cstack, $capture);
-	    }
-	    else {  # is top capture anonymous enough to be reused?
-		my $top := nqp::atpos($!cstack,-1);
-		my $topname := nqp::getattr($top, $?CLASS, '$!name');
-		if !nqp::isnull($topname) && nqp::defined($topname) {
-		    nqp::push($!cstack, $capture);
-		}
-		else {
-		    # $top anon capture just used for pos advancement, so update it in place.
-		    # We replace the whole capture because jvm can't seem to copy only the pos,
-		    # and because the chances are that both captures are in the nursury anyway.
-		    nqp::bindpos($!cstack,-1,$capture);
-		}
-	    }
-	}
+        if !nqp::defined($!cstack) {
+            $!cstack := [$capture]
+        }
+        elsif nqp::elems($!cstack) == 0 {
+            nqp::push($!cstack, $capture);
+        }
+        elsif !nqp::isnull($capture) {
+            my $name := nqp::getattr($capture, $?CLASS, '$!name');
+            if !nqp::isnull($name) && nqp::defined($name) {
+                nqp::push($!cstack, $capture);
+            }
+            else {  # is top capture anonymous enough to be reused?
+                my $top     := nqp::atpos($!cstack,-1);
+                my $topname := nqp::getattr($top, $?CLASS, '$!name');
+                if !nqp::isnull($topname) && nqp::defined($topname) {
+                    nqp::push($!cstack, $capture);
+                }
+                else {
+                    # $top anon capture just used for pos advancement, so update it in place.
+                    # We replace the whole capture because jvm can't seem to copy only the pos,
+                    # and because the chances are that both captures are in the nursury anyway.
+                    nqp::bindpos($!cstack, -1, $capture);
+                }
+            }
+        }
         $!cstack;
     }
 
     my $pass_mark := 1; # NQP has no constant table yet
     method !cursor_pass(int $pos, str $name = '', :$backtrack) {
-        $!match := $pass_mark;
-        $!pos := $pos;
-        $!restart := $!regexsub
-            if $backtrack;
-        $!bstack := nqp::null()
-            unless $backtrack;
-        self.'!reduce'($name) if $name;
+        $!match   := $pass_mark;
+        $!pos     := $pos;
+        $!restart := $!regexsub  if $backtrack;
+        $!bstack  := nqp::null() unless $backtrack;
+        self.'!reduce'($name)    if $name;
         self
     }
 
@@ -283,7 +283,7 @@
         $!bstack   := nqp::null();
         $!cstack   := nqp::null();
         $!regexsub := nqp::null();
-        $!pos    := -3;
+        $!pos      := -3;
     }
     
     method !cursor_pos(int $pos) {
@@ -350,18 +350,18 @@
         while @fates {
             $rxname := nqp::atpos(@rxfate, nqp::pop_i(@fates));
             # nqp::printfh(nqp::getstderr(), "invoking $rxname\n");
-            $cur := self."$rxname"();
-            @fates := @EMPTY if nqp::getattr_i($cur, $?CLASS, '$!pos') >= 0;
+            $cur    := self."$rxname"();
+            @fates  := @EMPTY if nqp::getattr_i($cur, $?CLASS, '$!pos') >= 0;
         }
         $cur // nqp::getattr($shared, ParseShared, '$!fail_cursor');
     }
 
     method !protoregex_nfa($name) {
-        my %protorx := self.HOW.cache(self, "!protoregex_table", { self."!protoregex_table"() });
-        my $nfa := QRegex::NFA.new;
-        my @fates := $nfa.states[0];
+        my %protorx   := self.HOW.cache(self, "!protoregex_table", { self."!protoregex_table"() });
+        my $nfa       := QRegex::NFA.new;
+        my @fates     := $nfa.states[0];
         my int $start := 1;
-        my int $fate := 0;
+        my int $fate  := 0;
         if nqp::existskey(%protorx, $name) {
             for %protorx{$name} -> $rxname {
                 $fate := $fate + 1;
@@ -379,7 +379,7 @@
             my str $methname := $meth.name();
             my int $sympos   := nqp::index($methname, ':');
             if $sympos > 0 {
-                my str $prefix := nqp::substr($methname, 0, $sympos);
+                my str $prefix    := nqp::substr($methname, 0, $sympos);
                 %protorx{$prefix} := [] unless nqp::existskey(%protorx, $prefix);
                 nqp::push(%protorx{$prefix}, $methname);
             }
@@ -389,7 +389,7 @@
 
     method !alt(int $pos, str $name, @labels = []) {
         # Update highwater mark.
-        my $shared := $!shared;
+        my $shared        := $!shared;
         my int $highwater := nqp::getattr_i($shared, ParseShared, '$!highwater');
         if $pos > $highwater {
             nqp::bindattr_i($shared, ParseShared, '$!highwater', $pos);
@@ -405,9 +405,9 @@
     }
 
     method !alt_nfa($regex, str $name) {
-        my $nfa := QRegex::NFA.new;
+        my $nfa       := QRegex::NFA.new;
         my int $start := 1;
-        my int $fate := 0;
+        my int $fate  := 0;
         for $regex.ALT_NFA($name) {
             $nfa.mergesubstates($start, 0, $fate, $_, self);
             $fate++;
@@ -442,7 +442,7 @@
     }
     
     method !dba(int $pos, str $dba) {
-        my $shared := $!shared;
+        my $shared        := $!shared;
         my int $highwater := nqp::getattr_i($shared, ParseShared, '$!highwater');
         my $highexpect;
         if $pos >= $highwater {
@@ -516,7 +516,7 @@
         $n-- while $n >= 0 && (nqp::isnull(nqp::getattr($!cstack[$n], $?CLASS, '$!name')) ||
                                nqp::getattr($!cstack[$n], $?CLASS, '$!name') ne $name);
         if $n >= 0 {
-            my $subcur := $!cstack[$n];
+            my $subcur     := $!cstack[$n];
             my int $litlen := $subcur.pos - $subcur.from;
             my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
             $cur."!cursor_pass"($!pos + $litlen, '')
@@ -528,7 +528,7 @@
 
     method !LITERAL($strish, int $i = 0) {
         if nqp::isconcrete($strish) {
-            my str $str := $strish;
+            my str $str    := $strish;
             my int $litlen := nqp::chars($str);
             my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
             if $litlen < 1 ||
@@ -580,11 +580,11 @@
     }
 
     method before($regex, $off = 0) {
-	my $*SUPPOSING := 1;
+        my $*SUPPOSING         := 1;
         my int $orig_highwater := nqp::getattr_i($!shared, ParseShared, '$!highwater');
-        my $orig_highexpect := nqp::getattr($!shared, ParseShared, '@!highexpect');
+        my $orig_highexpect    := nqp::getattr($!shared, ParseShared, '@!highexpect');
         nqp::bindattr($!shared, ParseShared, '@!highexpect', nqp::list_s());
-        my $cur := self."!cursor_start_cur"();
+        my $cur                := self."!cursor_start_cur"();
         nqp::bindattr_i($cur, $?CLASS, '$!pos', $!pos - $off);
         $!pos >= $off && nqp::getattr_i($regex($cur), $?CLASS, '$!pos') >= 0 ??
             $cur."!cursor_pass"($!pos, 'before') !!
@@ -597,11 +597,11 @@
     # Expects to get a regex whose syntax tree was flipped during the
     # compile.
     method after($regex) {
-	my $*SUPPOSING := 1;
+        my $*SUPPOSING         := 1;
         my int $orig_highwater := nqp::getattr_i($!shared, ParseShared, '$!highwater');
-        my $orig_highexpect := nqp::getattr($!shared, ParseShared, '@!highexpect');
+        my $orig_highexpect    := nqp::getattr($!shared, ParseShared, '@!highexpect');
         nqp::bindattr($!shared, ParseShared, '@!highexpect', nqp::list_s());
-        my $cur := self."!cursor_start_cur"();
+        my $cur                := self."!cursor_start_cur"();
         my str $target_flipped := nqp::getattr_s($!shared, ParseShared, '$!target_flipped');
         if nqp::isnull_s($target_flipped) {
             $target_flipped := nqp::flip(nqp::getattr_s($!shared, ParseShared, '$!target'));
@@ -623,7 +623,7 @@
     method ws() {
         # skip over any whitespace, fail if between two word chars
         my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
-        my $cur := self."!cursor_start_cur"();
+        my $cur        := self."!cursor_start_cur"();
         $!pos >= nqp::chars($target)
           ?? $cur."!cursor_pass"($!pos, 'ws')
           !! ($!pos < 1
@@ -652,14 +652,14 @@
     }
 
     method wb() {
-        my $cur := self."!cursor_start_cur"();
+        my $cur        := self."!cursor_start_cur"();
         my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
         $cur."!cursor_pass"($!pos, "wb")
             if ($!pos == 0 && nqp::iscclass(nqp::const::CCLASS_WORD, $target, $!pos))
                || ($!pos == nqp::chars($target)
                    && nqp::iscclass(nqp::const::CCLASS_WORD, $target, $!pos-1))
                || nqp::iscclass(nqp::const::CCLASS_WORD, $target, $!pos-1)
-                  != nqp::iscclass(nqp::const::CCLASS_WORD, $target, $!pos);
+                   != nqp::iscclass(nqp::const::CCLASS_WORD, $target, $!pos);
         $cur;
     }
 
@@ -682,7 +682,7 @@
     }
 
     method alpha() {
-        my $cur := self."!cursor_start_cur"();
+        my $cur        := self."!cursor_start_cur"();
         my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
         $cur."!cursor_pass"($!pos+1, 'alpha')
           if $!pos < nqp::chars($target)
@@ -692,7 +692,7 @@
     }
 
     method alnum() {
-        my $cur := self."!cursor_start_cur"();
+        my $cur        := self."!cursor_start_cur"();
         my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
         $cur."!cursor_pass"($!pos+1, 'alnum')
           if $!pos < nqp::chars($target)
@@ -702,7 +702,7 @@
     }
 
     method upper() {
-        my $cur := self."!cursor_start_cur"();
+        my $cur        := self."!cursor_start_cur"();
         my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
         $cur."!cursor_pass"($!pos+1, 'upper')
           if $!pos < nqp::chars($target)
@@ -711,7 +711,7 @@
     }
 
     method lower() {
-        my $cur := self."!cursor_start_cur"();
+        my $cur        := self."!cursor_start_cur"();
         my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
         $cur."!cursor_pass"($!pos+1, 'lower')
           if $!pos < nqp::chars($target)
@@ -720,7 +720,7 @@
     }
 
     method digit() {
-        my $cur := self."!cursor_start_cur"();
+        my $cur        := self."!cursor_start_cur"();
         my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
         $cur."!cursor_pass"($!pos+1, 'digit')
           if $!pos < nqp::chars($target)
@@ -729,7 +729,7 @@
     }
 
     method xdigit() {
-        my $cur := self."!cursor_start_cur"();
+        my $cur        := self."!cursor_start_cur"();
         my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
         $cur."!cursor_pass"($!pos+1, 'xdigit')
           if $!pos < nqp::chars($target)
@@ -738,7 +738,7 @@
     }
 
     method space() {
-        my $cur := self."!cursor_start_cur"();
+        my $cur        := self."!cursor_start_cur"();
         my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
         $cur."!cursor_pass"($!pos+1, 'space')
           if $!pos < nqp::chars($target)
@@ -747,7 +747,7 @@
     }
 
     method blank() {
-        my $cur := self."!cursor_start_cur"();
+        my $cur        := self."!cursor_start_cur"();
         my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
         $cur."!cursor_pass"($!pos+1, 'blank')
           if $!pos < nqp::chars($target)
@@ -756,7 +756,7 @@
     }
 
     method print() {
-        my $cur := self."!cursor_start_cur"();
+        my $cur        := self."!cursor_start_cur"();
         my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
         $cur."!cursor_pass"($!pos+1, 'print')
           if $!pos < nqp::chars($target)
@@ -765,7 +765,7 @@
     }
 
     method cntrl() {
-        my $cur := self."!cursor_start_cur"();
+        my $cur        := self."!cursor_start_cur"();
         my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
         $cur."!cursor_pass"($!pos+1, 'cntrl')
           if $!pos < nqp::chars($target)
@@ -774,7 +774,7 @@
     }
 
     method punct() {
-        my $cur := self."!cursor_start_cur"();
+        my $cur        := self."!cursor_start_cur"();
         my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
         $cur."!cursor_pass"($!pos+1, 'punct')
           if $!pos < nqp::chars($target)
@@ -783,7 +783,7 @@
     }
 
     method graph() {
-        my $cur := self."!cursor_start_cur"();
+        my $cur        := self."!cursor_start_cur"();
         my str $target := nqp::getattr_s($!shared, ParseShared, '$!target');
         $cur."!cursor_pass"($!pos+1, 'graph')
           if $!pos < nqp::chars($target)
@@ -805,16 +805,16 @@
     has $!made;
     has $!cursor;
 
-    method from() { $!from }
-    method orig() { $!orig }
-    method to()   { $!to }
-    method CURSOR() { $!cursor }
-    method PRECURSOR() { $!cursor."!cursor_init"($!orig,:p($!from)) }
-    method Str() { nqp::substr($!orig, $!from, $!to-$!from) }
-    method Int() { +self.Str() }
-    method Num() { +self.Str() }
-    method Bool() { $!to >= $!from }
-    method chars() { $!to >= $!from ?? $!to - $!from !! 0 }
+    method from()      { $!from }
+    method orig()      { $!orig }
+    method to()        { $!to }
+    method CURSOR()    { $!cursor }
+    method PRECURSOR() { $!cursor."!cursor_init"($!orig, :p($!from)) }
+    method Str()       { nqp::substr($!orig, $!from, $!to - $!from) }
+    method Int()       { +self.Str() }
+    method Num()       { +self.Str() }
+    method Bool()      { $!to >= $!from }
+    method chars()     { $!to >= $!from ?? $!to - $!from !! 0 }
 
     method prune() {
         self.capture_prune();
@@ -822,9 +822,9 @@
     }
     
     method !make($made) { $!made := $made } # remove after rebootstrap
-    method make($made) { $!made := $made }
-    method made()      { $!made }
-    method ast()       { $!made }  # for historical reasons
+    method make($made)  { $!made := $made }
+    method made()       { $!made }
+    method ast()        { $!made }  # for historical reasons
     
     method dump($indent?) {
         unless nqp::defined($indent) {
@@ -896,16 +896,24 @@
                 $str := $str ~ $item."!dump_str"($key)
             }
             elsif nqp::islist($item) {
-                $str := $str ~ "$key: list\n";
+                $str      := $str ~ "$key: list\n";
                 my int $n := 0;
-                for $item { $str := $str ~ dump_array($key ~ "[$n]", $_); $n++ }
+                for $item {
+                    $str := $str ~ dump_array($key ~ "[$n]", $_);
+                    $n++
+                }
             }
             $str;
         }
-        my $str := $key ~ ': ' ~ nqp::escape(self.Str) ~ ' @ ' ~ self.from ~ "\n";
+        my $str   := $key ~ ': ' ~ nqp::escape(self.Str) ~ ' @ ' ~ self.from ~ "\n";
         my int $n := 0;
-        for self.list { $str := $str ~ dump_array($key ~ '[' ~ $n ~ ']', $_); $n++ }
-        for self.hash { $str := $str ~ dump_array($key ~ '<' ~ $_.key ~ '>', $_.value); }
+        for self.list {
+            $str := $str ~ dump_array($key ~ '[' ~ $n ~ ']', $_);
+            $n++
+        }
+        for self.hash {
+            $str := $str ~ dump_array($key ~ '<' ~ $_.key ~ '>', $_.value);
+        }
         $str;
     }
 }
@@ -927,21 +935,21 @@
             nqp::bindattr_i($match, NQPMatch, '$!to', nqp::getattr_i(self, NQPCursor, '$!pos'));
 
             # For captures with lists, initialize the lists.
-            my %caplist := $NO_CAPS;
-            my $rxsub   := nqp::getattr(self, NQPCursor, '$!regexsub');
-	    my $onlyname := '';
-	    my int $namecount := 0;
+            my %caplist       := $NO_CAPS;
+            my $rxsub         := nqp::getattr(self, NQPCursor, '$!regexsub');
+            my str $onlyname  := '';
+            my int $namecount := 0;
             if !nqp::isnull($rxsub) && nqp::defined($rxsub) {
                 %caplist := nqp::can($rxsub, 'CAPS') ?? $rxsub.CAPS() !! nqp::null();
                 if !nqp::isnull(%caplist) && nqp::istrue(%caplist) {
                     my $iter := nqp::iterator(%caplist);
                     while $iter {
-                        my $curcap := nqp::shift($iter);
-			my str $name := nqp::iterkey_s($curcap);
-			$namecount++;
+                        my $curcap   := nqp::shift($iter);
+                        my str $name := nqp::iterkey_s($curcap);
+                        $namecount++;
                         if nqp::iterval($curcap) >= 2 {
-			    $onlyname := $name if $namecount == 1;
-			    nqp::ord($name) < 58
+                            $onlyname := $name if $namecount == 1;
+                            nqp::ord($name) < 58
                                 ?? nqp::bindpos(
                                         nqp::defor($list, $list := nqp::list()),
                                         $name, nqp::list())
@@ -953,43 +961,43 @@
 
             # Walk the Cursor stack and populate the Cursor.
             my $cs := nqp::getattr(self, NQPCursor, '$!cstack');
-	    if nqp::isnull($cs) || !nqp::istrue($cs) {}
-	    elsif $namecount == 1 && $onlyname ne '' && !nqp::eqat($onlyname,'$!',0) {
-		# If there's only one destination, avoid repeated hash lookups
-		my int $cselems := nqp::elems($cs);
-		my int $csi;
-		my $dest;
-		if nqp::ord($onlyname) < 58 {
-		    $dest := nqp::atpos($list, $onlyname);
-		}
-		else {
-		    $dest := nqp::atkey($hash, $onlyname);
-		}
-		while $csi < $cselems {
-		    my $subcur := nqp::atpos($cs, $csi);
-		    my $name := nqp::getattr($subcur, $?CLASS, '$!name');
-		    if !nqp::isnull($name) && nqp::defined($name) {
-			my $submatch := $subcur.MATCH();
-			nqp::push($dest, $submatch);
-		    }
+            if nqp::isnull($cs) || !nqp::istrue($cs) {}
+            elsif $namecount == 1 && $onlyname ne '' && !nqp::eqat($onlyname, '$!', 0) {
+                # If there's only one destination, avoid repeated hash lookups
+                my int $cselems := nqp::elems($cs);
+                my int $csi;
+                my $dest;
+                if nqp::ord($onlyname) < 58 {
+                    $dest := nqp::atpos($list, $onlyname);
+                }
+                else {
+                    $dest := nqp::atkey($hash, $onlyname);
+                }
+                while $csi < $cselems {
+                    my $subcur := nqp::atpos($cs, $csi);
+                    my $name   := nqp::getattr($subcur, $?CLASS, '$!name');
+                    if !nqp::isnull($name) && nqp::defined($name) {
+                        my $submatch := $subcur.MATCH();
+                        nqp::push($dest, $submatch);
+                    }
                     $csi++;
-		}
-	    }
+                }
+            }
             elsif !nqp::isnull(%caplist) && %caplist  {
                 my int $cselems := nqp::elems($cs);
                 my int $csi;
-#		note($cselems);
+#                note($cselems);
                 while $csi < $cselems {
-                    my $subcur   := nqp::atpos($cs, $csi);
-                    my $name := nqp::getattr($subcur, $?CLASS, '$!name');
+                    my $subcur := nqp::atpos($cs, $csi);
+                    my $name   := nqp::getattr($subcur, $?CLASS, '$!name');
                     if !nqp::isnull($name) && nqp::defined($name) && $name ne '' {
                         my $submatch := $subcur.MATCH();
-                        if nqp::ordat($name, 0) == 36 && ($name eq '$!from' || $name eq '$!to') {
+                        if nqp::ord($name) == 36 && ($name eq '$!from' || $name eq '$!to') {
                             nqp::bindattr_i($match, NQPMatch, $name, $submatch.from);
                         }
                         elsif nqp::index($name, '=') < 0 {
                             my int $needs_list := %caplist{$name} >= 2;
-			    if nqp::ord($name) < 58 {
+                            if nqp::ord($name) < 58 {
                                 $list := nqp::list() unless nqp::isconcrete($list);
                                 $needs_list
                                     ?? nqp::push(nqp::atpos($list, $name), $submatch)
@@ -1004,7 +1012,7 @@
                         else {
                             for nqp::split('=', $name) -> $name {
                                 my int $needs_list := %caplist{$name} >= 2;
-				if nqp::ord($name) < 58 {
+                                if nqp::ord($name) < 58 {
                                     $list := nqp::list() unless nqp::isconcrete($list);
                                     $needs_list
                                         ?? nqp::push(nqp::atpos($list, $name), $submatch)
@@ -1065,7 +1073,7 @@
 
     method parse($target, :$rule = 'TOP', :$actions, *%options) {
         my $*ACTIONS := $actions;
-        my $cur := self.'!cursor_init'($target, |%options);
+        my $cur      := self.'!cursor_init'($target, |%options);
         nqp::isinvokable($rule) ??
             $rule($cur).MATCH() !!
             nqp::findmethod($cur, $rule)($cur).MATCH()
@@ -1074,22 +1082,22 @@
     method !INTERPOLATE($var, $s = 0) {
         if nqp::islist($var) {
             my int $maxlen := -1;
-            my $cur := self.'!cursor_start_cur'();
-            my int $pos := nqp::getattr_i($cur, $?CLASS, '$!from');
-            my str $tgt := $cur.target;
-            my int $eos := nqp::chars($tgt);
+            my $cur        := self.'!cursor_start_cur'();
+            my int $pos    := nqp::getattr_i($cur, $?CLASS, '$!from');
+            my str $tgt    := $cur.target;
+            my int $eos    := nqp::chars($tgt);
             for $var {
                 if nqp::isinvokable($_) {
                     my $res := $_(self);
                     if $res {
                         my int $adv := nqp::getattr_i($res, $?CLASS, '$!pos');
-                        $adv := $adv - $pos;
-                        $maxlen := $adv if $adv > $maxlen;
+                        $adv        := $adv - $pos;
+                        $maxlen     := $adv if $adv > $maxlen;
                     }
                 }
                 else {
                     my int $len := nqp::chars($_);
-                    $maxlen := $len if $len > $maxlen && $pos + $len <= $eos
+                    $maxlen     := $len if $len > $maxlen && $pos + $len <= $eos
                         && nqp::substr($tgt, $pos, $len) eq $_;
                 }
                 last if $s && $maxlen > -1;
@@ -1099,7 +1107,7 @@
         }
         else {
             return $var(self) if nqp::isinvokable($var);
-            my $cur := self.'!cursor_start_cur'();
+            my $cur     := self.'!cursor_start_cur'();
             my int $pos := nqp::getattr_i($cur, $?CLASS, '$!from');
             my str $tgt := $cur.target;
             my int $len := nqp::chars($var);
@@ -1118,7 +1126,7 @@
                 my $res := [];
                 for $var {
                     my $elem := $_;
-                    $elem := $rxcompiler.compile($elem) unless nqp::isinvokable($elem);
+                    $elem    := $rxcompiler.compile($elem) unless nqp::isinvokable($elem);
                     nqp::push($res, $elem);
                 }
                 $var := $res;
diff -Nru nqp-2016.11+dfsg/src/QRegex/NFA.nqp nqp-2016.12+dfsg/src/QRegex/NFA.nqp
--- nqp-2016.11+dfsg/src/QRegex/NFA.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/QRegex/NFA.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -333,7 +333,8 @@
         my $indent := dentin();
         my $subtype := $node.subtype;
         note("$indent subrule $from -> $to {$node.name}") if $nfadeb;
-        if $node.name eq 'before' && !$node.negate {
+        if $node.name eq 'before' && !$node.negate &&
+                nqp::istype((try $node[0][1].ann('orig_qast')), QAST::Regex) {
             my int $end := self.addstate();
             self.regex_nfa($node[0][1].ann('orig_qast'), $from, $end);
             dentout(self.fate($node, $end, $to));
diff -Nru nqp-2016.11+dfsg/src/QRegex/P6Regex/Actions.nqp nqp-2016.12+dfsg/src/QRegex/P6Regex/Actions.nqp
--- nqp-2016.11+dfsg/src/QRegex/P6Regex/Actions.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/QRegex/P6Regex/Actions.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -71,7 +71,7 @@
                 }
                 else {
                     $qast.push($_.ast);
-                    $lastlit := $ast.rxtype eq 'literal' 
+                    $lastlit := $ast.rxtype eq 'literal'
                                 && !QAST::Node.ACCEPTS($ast[0])
                                   ?? $ast !! 0;
                 }
@@ -118,7 +118,7 @@
         }
         make $qast;
     }
-    
+
     method separator($/) {
         make $<quantified_atom>.ast;
     }
@@ -300,7 +300,7 @@
                 $qast := QAST::Regex.new( :rxtype<quant>, :min(1), :max(1), $qast) if $<wantarray>;
             }
             else {
-                $qast := QAST::Regex.new( $qast, :name($name), 
+                $qast := QAST::Regex.new( $qast, :name($name),
                                           :rxtype<subcapture>, :node($/) );
             }
         }
@@ -326,7 +326,7 @@
                     QAST::SVal.new( :value(~$<GOAL>) ),
                     |@dba) ) );
     }
-    
+
     method metachar:sym<mod>($/) { make $<mod_internal>.ast; }
 
     method backslash:sym<s>($/) {
@@ -334,12 +334,6 @@
                              :negate($<sym> le 'Z'), :node($/));
     }
 
-    method backslash:sym<b>($/) {
-        my $qast := QAST::Regex.new( "\b", :rxtype('enumcharlist'),
-                        :negate($<sym> eq 'B'), :node($/) );
-        make $qast;
-    }
-
     method backslash:sym<e>($/) {
         my $qast := QAST::Regex.new( "\c[27]", :rxtype('enumcharlist'),
                         :negate($<sym> eq 'E'), :node($/) );
@@ -558,7 +552,7 @@
                 self.subrule_alias($qast, $name);
             }
             else {
-                $qast := QAST::Regex.new( $qast, :name($name), 
+                $qast := QAST::Regex.new( $qast, :name($name),
                                           :rxtype<subcapture>, :node($/) );
             }
         }
@@ -616,10 +610,10 @@
         if $qast.negate && $qast.rxtype eq 'subrule' {
             $qast.subtype('zerowidth');
             $qast := QAST::Regex.new(:rxtype<concat>, :node($/),
-                                     $qast, 
+                                     $qast,
                                      QAST::Regex.new( :rxtype<cclass>, :name<.> ));
         }
-        
+
         my int $i := 1;
         my int $n := nqp::elems($clist);
         while $i < $n {
@@ -632,7 +626,7 @@
             if $ast.negate || $ast.rxtype eq 'cclass' && ~$ast.node le 'Z' {
                 $ast.subtype('zerowidth');
                 $qast := QAST::Regex.new( :rxtype<concat>, :node($/), :subtype<zerowidth>, :negate(1),
-                        QAST::Regex.new( :rxtype<conj>, :subtype<zerowidth>, $ast ), 
+                        QAST::Regex.new( :rxtype<conj>, :subtype<zerowidth>, $ast ),
                         $qast );
             }
             else {
@@ -642,7 +636,7 @@
         }
         make $qast;
     }
-    
+
     method arg($/) {
         make $<quote_EXPR>
             ?? $<quote_EXPR>.ast
@@ -844,7 +838,7 @@
                                        QAST::Var.new(
                                            :name(nqp::substr(%*RX<name>, 12)),
                                            :scope('lexical')
-                                       ) 
+                                       )
                                    )
                               )));
         if %*RX<r> {
@@ -853,7 +847,7 @@
         $block.push($qast);
 
         self.set_cursor_type($qast);
-        
+
         $block;
     }
 
@@ -869,7 +863,7 @@
                 my %x := capnames($_, $count);
                 for %x { %capnames{$_.key} := +%capnames{$_.key} + $_.value; }
                 $count := %x{''};
-            } 
+            }
         }
         elsif $rxtype eq 'altseq' || $rxtype eq 'alt' {
             my $max := $count;
@@ -928,7 +922,7 @@
         %capnames{''} := $count;  # will be deleted in SET_CAPS
         %capnames;
     }
-    
+
     method alt_nfas($code_obj, $block, $ast) {
         my $rxtype := $ast.rxtype;
         if $rxtype eq 'alt' {
@@ -976,7 +970,7 @@
         }
         return -1;
     }
- 
+
     method flip_ast($qast) {
         return $qast unless nqp::istype($qast, QAST::Regex);
         if $qast.rxtype eq 'literal' {
@@ -992,23 +986,23 @@
         }
         $qast
     }
-    
+
     # This is overridden by a compiler that wants to create code objects
     # for regexes. We just use the standard NQP one in standalone mode.
     method create_regex_code_object($block) {
         $*W.create_code($block, $block.name);
     }
-    
+
     # Stores the captures info for a regex.
     method store_regex_caps($code_obj, $block, %caps) {
         $code_obj.SET_CAPS(%caps);
     }
-    
+
     # Stores the NFA for the regex overall.
     method store_regex_nfa($code_obj, $block, $nfa) {
         $code_obj.SET_NFA($nfa.save);
     }
-    
+
     # Stores the NFA for a regex alternation.
     method store_regex_alt_nfa($code_obj, $block, $key, @alternatives) {
         my @saved;
diff -Nru nqp-2016.11+dfsg/src/QRegex/P6Regex/Grammar.nqp nqp-2016.12+dfsg/src/QRegex/P6Regex/Grammar.nqp
--- nqp-2016.11+dfsg/src/QRegex/P6Regex/Grammar.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/QRegex/P6Regex/Grammar.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -353,7 +353,6 @@
 
     proto token backslash { <...> }
     token backslash:sym<s> { $<sym>=[<[dDnNsSwW]>] }
-    token backslash:sym<b> { $<sym>=[<[bB]>] }
     token backslash:sym<e> { $<sym>=[<[eE]>] }
     token backslash:sym<f> { $<sym>=[<[fF]>] }
     token backslash:sym<h> { $<sym>=[<[hH]>] }
@@ -364,6 +363,18 @@
     token backslash:sym<x> { $<sym>=[<[xX]>] [ <hexint> | '[' <hexints> ']' ] }
     token backslash:sym<c> { $<sym>=[<[cC]>] <charspec> }
     token backslash:sym<0> { $<sym>=['0'] }
+    token backslash:sym<B> { 'B' <.obs:
+        '\\B', '<!|w> for negated word boundary. If you meant a negated'
+        ~ ' backspace character, use it in a negated character class (<-[\b]>).'
+    >}
+    token backslash:sym<b> { 'b' <.obs:
+        '\\b', '<|w> for word boundary (or « and » for left/right boundaries).'
+        ~ ' If you meant the backspace character, quote it ("\b") or use it as'
+        ~ ' inside a character class (<[\b]>)'
+    >}
+    token backslash:sym<K> { 'K' <.obs:
+        '\\K', '<( for discarding text before the capture marker or )> for discarding text after.'
+    >}
     token backslash:sym<A> { 'A' <.obs: '\\A as beginning-of-string matcher', '^'> }
     token backslash:sym<z> { 'z' <.obs: '\\z as end-of-string matcher', '$'> }
     token backslash:sym<Z> { 'Z' <.obs: '\\Z as end-of-string matcher', '\\n?$'> }
diff -Nru nqp-2016.11+dfsg/src/vm/js/Chunk.nqp nqp-2016.12+dfsg/src/vm/js/Chunk.nqp
--- nqp-2016.11+dfsg/src/vm/js/Chunk.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/Chunk.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -22,11 +22,11 @@
     has int $!type; # the js type of $!expr
     has str $!expr; # a javascript expression without side effects
     has $!node; # a QAST::Node that contains info for source maps
-    has @!setup; # stuff that needs to be executed before the value of $!expr can be used, this contains strings and Chunks.
+    has $!setup; # stuff that needs to be executed before the value of $!expr can be used, this contains strings and Chunks.
 
-    method new($type, $expr, @setup, :$node) {
+    method new($type, $expr, $setup = nqp::null(), :$node) {
         my $obj := nqp::create(self);
-        $obj.BUILD($type, $expr, @setup, :$node);
+        $obj.BUILD($type, $expr, $setup, :$node);
         $obj
     }
 
@@ -37,29 +37,43 @@
     method BUILD($type, $expr, @setup, :$node) {
         $!type := $type;
         $!expr := $expr;
-        @!setup := @setup;
+        $!setup := @setup;
         $!node := $node if nqp::defined($node);
     }
 
     method collect(@strs, :$escape) {
-        for @!setup -> $part {
-            if nqp::isstr($part) {
-                nqp::push_s(@strs, $escape ?? nqp::escape($part) !! $part);
-            }
-            else {
-                $part.collect(@strs, :$escape);
+        if nqp::isnull($!setup) {
+        }
+        elsif nqp::istype($!setup, Chunk) {
+            $!setup.collect(@strs, :$escape);
+        }
+        else {
+            for $!setup -> $part {
+                if nqp::isstr($part) {
+                    nqp::push_s(@strs, $escape ?? nqp::escape($part) !! $part);
+                }
+                else {
+                    $part.collect(@strs, :$escape);
+                }
             }
         }
     }
     
     method with_source_map_info() {
         my @parts;
-        for @!setup -> $part {
-            if nqp::isstr($part) {
-                nqp::push(@parts,quote_string($part, :json));
-            }
-            else {
-                nqp::push(@parts,$part.with_source_map_info);
+        if nqp::isnull($!setup) {
+        }
+        elsif nqp::istype($!setup, Chunk) {
+            nqp::push(@parts, $!setup.with_source_map_info);
+        }
+        else {
+            for $!setup -> $part {
+                if nqp::isstr($part) {
+                    nqp::push(@parts,quote_string($part, :json));
+                }
+                else {
+                    nqp::push(@parts,$part.with_source_map_info);
+                }
             }
         }
         my $parts := '[' ~ nqp::join(',', @parts) ~ ']';
@@ -75,13 +89,20 @@
 
     method source_map_debug() {
         my $js := ''; 
-        for @!setup -> $part {
-           if nqp::isstr($part) {
-              $js := $js ~ $part;
-           }
-           else {
-              $js := $js ~ $part.source_map_debug;
-           }
+        if nqp::isnull($!setup) {
+        }
+        elsif nqp::istype($!setup, Chunk) {
+            $js := $js ~ $!setup.source_map_debug;
+        }
+        else {
+            for $!setup -> $part {
+               if nqp::isstr($part) {
+                  $js := $js ~ $part;
+               }
+               else {
+                  $js := $js ~ $part.source_map_debug;
+               }
+            }
         }
 
         if nqp::defined($!node) && $!node.node {
@@ -104,7 +125,7 @@
     }
 
     method setup() {
-        @!setup;
+        $!setup;
     }
 
     method node() {
@@ -134,37 +155,3 @@
         $!cont;
     }
 }
-
-class ChunkEscaped does Joinable {
-    has @!setup;
-
-    method new(@setup) {
-        my $obj := nqp::create(self);
-        $obj.BUILD(@setup);
-        $obj
-    }
-
-    method BUILD(@setup) {
-        @!setup := @setup;
-    }
-
-    method with_source_map_info() {
-        self.join;
-    }
-
-    method collect(@strs, :$escape) {
-        if $escape {
-            nqp::die("Double escaping NIY");
-        }
-        nqp::push_s(@strs, '"');
-        for @!setup -> $part {
-            if nqp::isstr($part) {
-                nqp::push_s(@strs, nqp::escape($part));
-            }
-            else {
-                $part.collect(@strs, :escape(1));
-            }
-        }
-        nqp::push_s(@strs, '"');
-    }
-}
diff -Nru nqp-2016.11+dfsg/src/vm/js/Compiler.nqp nqp-2016.12+dfsg/src/vm/js/Compiler.nqp
--- nqp-2016.11+dfsg/src/vm/js/Compiler.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/Compiler.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -3,10 +3,10 @@
 
     has $!cps; # If it's set to "off" we don't support continuations
 
-    my sub literal_subst($source, $pattern, $replacement) {
-        my $where := 0;
-        my $result := $source;
-        while (my $found := nqp::index($result, $pattern, $where)) != -1 {
+    my sub literal_subst(str $source, str $pattern, str $replacement) {
+        my int $where := 0;
+        my str $result := $source;
+        while (my int $found := nqp::index($result, $pattern, $where)) != -1 {
             $where := $found + nqp::chars($replacement);
             $result := nqp::replace($result, $found, nqp::chars($pattern), $replacement);
         };
@@ -29,8 +29,8 @@
         has $!qast;             # The QAST::Block
         has $!outer;            # Outer block's BlockInfo
         has @!js_lexicals;      # javascript variables we need to declare for the block
-        has $!tmp;              # We use a bunch of TMP{$n} to store intermediate javascript results
-        has $!ctx;              # The object we keep dynamic variables and exception handlers in
+        has int $!tmp;              # We use a bunch of TMP{$n} to store intermediate javascript results
+        has str $!ctx;              # The object we keep dynamic variables and exception handlers in
         has @!params;           # the parameters the block takes
         has @!variables;        # the variables declared in this block
         has %!variables;        # the variables declared in this block
@@ -51,7 +51,7 @@
 
         has %!statevars;
 
-        has $!pass_on_exceptions;
+        has int $!pass_on_exceptions;
 
         method new($qast, $outer) {
             my $obj := nqp::create(self);
@@ -140,8 +140,8 @@
         }
 
         method clone_inner($block, :$cps = 1, :$direct = 1) {
-            my $cuid    := $block.cuid;
-            my $already := %!cloned_inners{$cuid};
+            my int $cuid    := $block.cuid;
+            my str $already := %!cloned_inners{$cuid};
 
             %!need_cps{$cuid} := $cps || %!need_cps{$cuid};
             %!need_direct{$cuid} := $direct || %!need_direct{$cuid};
@@ -150,7 +150,7 @@
                 $already
             }
             else {
-                my $reg := self.add_tmp;
+                my str $reg := self.add_tmp;
                 %!cloned_inners{$cuid} := $reg;
                 $reg
             }
@@ -159,13 +159,13 @@
         method cloned_inners() { %!cloned_inners }
 
         method capture_inner($block) {
-            my $cuid    := $block.cuid;
-            my $already := %!captured_inners{$cuid};
+            my int $cuid    := $block.cuid;
+            my str $already := %!captured_inners{$cuid};
             if $already {
                 $already
             }
             else {
-                my $reg := self.add_tmp;
+                my str $reg := self.add_tmp;
                 %!captured_inners{$cuid} := $reg;
                 $reg
             }
@@ -215,14 +215,14 @@
         }
 
         method add_statevar($value) {
-            my $js_var := QAST::Node.unique('statevar');
+            my str $js_var := QAST::Node.unique('statevar');
             %!statevars{$js_var} := $value;
             $js_var;
         }
 
         method tmps() {
             my @tmps;
-            my $i := 1;
+            my int $i := 1;
             while $i <= $!tmp {
                 @tmps.push('TMP'~$i);
                 $i := $i+1;
@@ -244,7 +244,7 @@
         method params() { @!params }
         method variables() { @!variables }
 
-        has $!first_time_marker;
+        has str $!first_time_marker;
         method first_time_marker() {
             if !$!first_time_marker {
                 $!first_time_marker :=  QAST::Node.unique('first_time');
@@ -271,7 +271,7 @@
     method is_dynamic_var(BlockInfo $info, QAST::Var $var) {
         # HACK due to a nqp misdesign we need to check the name for the * twigil
         # TODO Make nqp mark dynamic variables explicitly
-        my $name := $var.name;
+        my str $name := $var.name;
         if nqp::chars($name) > 2 {
             my str $sigil := nqp::substr($name, 0, 1);
             my str $twigil := nqp::substr($name, 1, 1);
@@ -319,7 +319,7 @@
 
         my @groups := [[]];
         
-        my $cps := nqp::istrue($cont);
+        my int $cps := nqp::istrue($cont);
 
         for $args -> $arg {
             if nqp::istype($arg,QAST::SpecialArg) {
@@ -416,13 +416,12 @@
                 @setup.push("{$*CTX}[{quote_string($var.name)}] = $value;\n");
             }
             else {
-                my $mangled := $*BLOCK.mangle_var($var);
+                my str $mangled := $*BLOCK.mangle_var($var);
                 $*BLOCK.add_js_lexical($mangled);
                 @setup.push("$mangled = $value;\n");
             }
         }
 
-        my $bind_named := '';
         for @params -> $param {
             if $param.slurpy {
                 if $param.named {
@@ -433,9 +432,9 @@
                 }
             }
             elsif $param.named {
-                my $quoted := quote_string($param.named);
+                my str $quoted := quote_string($param.named);
                 @*KNOWN_NAMED.push($quoted);
-                my $value := "_NAMED[$quoted]";
+                my str $value := "_NAMED[$quoted]";
                 if $param.default {
                     # TODO types
 
@@ -452,9 +451,9 @@
                 set_variable($param, $value);
             }
             elsif self.is_dynamic_var($*BLOCK, $param) {
-                my $set := "{$*CTX}[{quote_string($param.name)}] = ";
+                my str $set := "{$*CTX}[{quote_string($param.name)}] = ";
 
-                my $tmp := self.unique_var('param');
+                my str $tmp := self.unique_var('param');
                 @sig.push($tmp);
                 if $param.default {
                     my $default_value := self.as_js($param.default, :want($T_OBJ), :$cps);
@@ -469,12 +468,11 @@
                 }
             }
             else {
-                my $default := '';
-                my $name := $*BLOCK.mangle_var($param);
+                my str $name := $*BLOCK.mangle_var($param);
 
                 if $param.default {
                     # Overwriting a parameter makes the v8 optimizer bail out so to avoid that we introduce a new variable
-                    my $tmp := self.unique_var($name~'_');
+                    my str $tmp := self.unique_var($name~'_');
 
                     $*BLOCK.add_js_lexical($name);
                     @sig.push($tmp);
@@ -497,7 +495,7 @@
         }
 
         if $slurpy {
-            set_variable($slurpy, "new nqp.NQPArray(Array.prototype.slice.call(arguments,{+@sig}))");
+            set_variable($slurpy, "nqp.slurpyArray({quote_string($*HLL)}, Array.prototype.slice.call(arguments,{+@sig}))");
         }
         if $slurpy_named {
             set_variable($slurpy_named, "nqp.slurpyNamed(_NAMED, {known_named(@*KNOWN_NAMED)})");
@@ -514,7 +512,7 @@
     }
 
     multi method coerce(Chunk $chunk, $desired) {
-        my $got := $chunk.type;
+        my int $got := $chunk.type;
         if $got != $desired {
             if $desired == $T_VOID {
                 return Chunk.new($T_VOID, "", $chunk.setup);
@@ -523,57 +521,57 @@
             if $desired == $T_NUM {
                 if $got == $T_INT {
                     # we store both as a javascript number, and 32bit integers fit into doubles
-                    return Chunk.new($T_NUM, $chunk.expr, [$chunk]);
+                    return Chunk.new($T_NUM, $chunk.expr, $chunk);
                 }
                 if $got == $T_BOOL {
-                    return Chunk.new($T_NUM, "({$chunk.expr} ? 1 : 0)", [$chunk]);
+                    return Chunk.new($T_NUM, "({$chunk.expr} ? 1 : 0)", $chunk);
                 }
                 if $got == $T_STR {
-                    my $tmp := $*BLOCK.add_tmp();
+                    my str $tmp := $*BLOCK.add_tmp();
                     return Chunk.new($T_NUM, "(isNaN($tmp) ? 0 : $tmp)", [$chunk,"$tmp = parseFloat({$chunk.expr});\n"]);
                 }
             }
 
             if $desired == $T_INT {
                 if $got == $T_STR {
-                    return Chunk.new($T_INT, "parseInt({$chunk.expr})", [$chunk]);
+                    return Chunk.new($T_INT, "parseInt({$chunk.expr})", $chunk);
                 }
                 if $got == $T_NUM {
-                    return Chunk.new($T_INT, "({$chunk.expr}|0)", [$chunk]);
+                    return Chunk.new($T_INT, "({$chunk.expr}|0)", $chunk);
                 }
                 if $got == $T_BOOL {
-                    return Chunk.new($T_INT, "({$chunk.expr} ? 1 : 0)", [$chunk]);
+                    return Chunk.new($T_INT, "({$chunk.expr} ? 1 : 0)", $chunk);
                 }
             }
 
             if $got == $T_OBJ {
                 if $desired == $T_BOOL {
-                    return Chunk.new($desired, "{$chunk.expr}.\$\$decont($*CTX).\$\$toBool($*CTX)", [$chunk]);
+                    return Chunk.new($desired, "{$chunk.expr}.\$\$decont($*CTX).\$\$toBool($*CTX)", $chunk);
                 }
                 my %convert;
                 %convert{$T_STR} := 'toStr';
                 %convert{$T_NUM} := 'toNum';
                 %convert{$T_INT} := 'toInt';
-                return Chunk.new($desired, 'nqp.' ~ %convert{$desired} ~ '(' ~ $chunk.expr ~ ", {$*CTX})", [$chunk]);
+                return Chunk.new($desired, 'nqp.' ~ %convert{$desired} ~ '(' ~ $chunk.expr ~ ", {$*CTX})", $chunk);
             }
 
             if $desired == $T_STR {
                 if $got == $T_INT || $got == $T_NUM {
-                    return Chunk.new($T_STR, $chunk.expr ~ '.toString()', [$chunk]);
+                    return Chunk.new($T_STR, $chunk.expr ~ '.toString()', $chunk);
                 }
                 if $got == $T_BOOL {
-                    return Chunk.new($T_STR, "({$chunk.expr} ? '1' : '0')", [$chunk]);
+                    return Chunk.new($T_STR, "({$chunk.expr} ? '1' : '0')", $chunk);
                 }
             }
 
             if $desired == $T_OBJ {
                 if $got == $T_BOOL {
-                    $chunk := Chunk.new($T_INT, "({$chunk.expr} ? 1 : 0)", [$chunk]);
+                    $chunk := Chunk.new($T_INT, "({$chunk.expr} ? 1 : 0)", $chunk);
                     $got := $T_INT;
                 }
                 elsif $got == $T_VOID {
                     # TODO think what's the correct thing here
-                    return Chunk.new($T_OBJ, "nqp.Null", [$chunk]);
+                    return Chunk.new($T_OBJ, "nqp.Null", $chunk);
                 }
 
                 if $*HLL eq 'nqp' {
@@ -581,7 +579,7 @@
                         return $chunk;
                     }
                     elsif $got == $T_INT {
-                        return Chunk.new($T_OBJ, "new nqp.NQPInt({$chunk.expr})", [$chunk]);
+                        return Chunk.new($T_OBJ, "new nqp.NQPInt({$chunk.expr})", $chunk);
                     }
                 }
                 else {
@@ -589,20 +587,20 @@
                     %convert{$T_INT} := 'intToObj';
                     %convert{$T_NUM} := 'numToObj';
                     %convert{$T_STR} := 'strToObj';
-                    return Chunk.new($T_OBJ, "nqp.{%convert{$got}}({quote_string($*HLL)}, {$chunk.expr})", [$chunk]);
+                    return Chunk.new($T_OBJ, "nqp.{%convert{$got}}({quote_string($*HLL)}, {$chunk.expr})", $chunk);
                 }
             }
 
             if $desired == $T_BOOL {
                 if $got == $T_INT || $got == $T_NUM {
-                    return Chunk.new($T_BOOL, $chunk.expr, [$chunk]);
+                    return Chunk.new($T_BOOL, $chunk.expr, $chunk);
                 } elsif $got == $T_STR {
-                    return Chunk.new($T_BOOL, "({$chunk.expr} && {$chunk.expr} !== nqp.null_s)", [$chunk]);
+                    return Chunk.new($T_BOOL, "({$chunk.expr} && {$chunk.expr} !== nqp.null_s)", $chunk);
                 }
             }
 
 
-            return Chunk.new($desired, "nqp.coercion($got, $desired, {$chunk.expr})", []) #TODO
+            return Chunk.new($desired, "nqp.coercion($got, $desired, {$chunk.expr})") #TODO
         }
         $chunk;
     }
@@ -610,7 +608,7 @@
     method handle_control($loop, $body) {
         if nqp::elems($loop.handled) > 0 {
             my $setup_label := "";
-            my $check_label := "e.label === null";
+            my str $check_label := "e.label === null";
 
             if $loop.label {
                 $setup_label := self.as_js($loop.label, :want($T_OBJ));
@@ -676,7 +674,7 @@
     method mark_children_serializable(QAST::Children $node) {
         my int $serializable := 0;
         for $node.list -> $child {
-            my $is_child_serializable := self.is_ctxsave($node) || self.mark_serializable($child);
+            my int $is_child_serializable := self.is_ctxsave($node) || self.mark_serializable($child);
             $serializable := $serializable || $is_child_serializable;
         }
         $serializable;
@@ -744,9 +742,9 @@
 
         my int $n := nqp::elems(@chunks);
 
-        my $result_var;
+        my str $result_var;
 
-        my $result;
+        my str $result;
 
         if nqp::defined($expr) {
             $result := $expr;
@@ -765,7 +763,7 @@
                 return self.NYI("CPS currently is broken");
             }
             elsif nqp::istype($chunk, Chunk) || nqp::isstr($chunk) {
-                my $chunk_expr := nqp::isstr($chunk) ?? $chunk !! $chunk.expr;
+                my str $chunk_expr := nqp::isstr($chunk) ?? $chunk !! $chunk.expr;
 
                 nqp::push(@setup, $chunk);
 
@@ -796,7 +794,7 @@
             $result_child := +$node.list - 1;
         }
 
-        my $i := 0;
+        my int $i := 0;
         for @stmts -> $stmt {
             my $chunk := self.as_js(@stmts[$i], :want($i == $result_child ?? $want !! $T_VOID), :$cps);
             @chunks.push($chunk);
@@ -805,12 +803,15 @@
         self.chunk_sequence($want, @chunks, :$result_child, :$node);
     }
 
-    proto method cpsify_chunk($chunk) { * }
-    multi method cpsify_chunk(ChunkCPS $chunk) { $chunk }
-    multi method cpsify_chunk(Chunk $chunk) {
-        my $ret := self.chunk_sequence($chunk.type, $chunk.setup, :expr($chunk.expr), :node($chunk.node));
-        $ret;
-    }
+#    proto method cpsify_chunk($chunk) { * }
+#    multi method cpsify_chunk(ChunkCPS $chunk) { $chunk }
+#    multi method cpsify_chunk(Chunk $chunk) {
+#        my $ret := self.chunk_sequence($chunk.type, $chunk.setup, :expr($chunk.expr), :node($chunk.node));
+#        $ret;
+#    }
+
+    method cpsify_chunk($chunk) { $chunk }
+    # TODO restore CPS
 
     multi method as_js(QAST::Block $node, :$want, :$cps) {
         my $outer     := try $*BLOCK;
@@ -836,7 +837,7 @@
     my %code_ref_attr;
     method code_ref_attr($cuid) {
         if !nqp::existskey(%code_ref_attr, $cuid) {
-            %code_ref_attr{$cuid} := '$codeRef$' ~ $cuid ~ '_' ~ literal_subst(nqp::time_n(), '.', '_');
+            %code_ref_attr{$cuid} := '$codeRef$' ~ $cuid ~ '_' ~ literal_subst(~nqp::time_n(), '.', '_');
         }
         %code_ref_attr{$cuid};
     }
@@ -845,7 +846,7 @@
         my @declared;
         my @vars;
         for %!cuids {
-            my $var := self.mangled_cuid($_.key);
+            my str $var := self.mangled_cuid($_.key);
             @vars.push($var);
             @declared.push("$var = new nqp.CodeRef({quote_string($_.value.name)},{quote_string($_.key)}).setCodeRefAttr({quote_string(self.code_ref_attr($_.key))})");
         }
@@ -854,7 +855,7 @@
     }
 
     method set_code_objects() {
-        my $set := "";
+        my str $set := "";
         for %!cuids {
             my $code_obj := $_.value.code_object;
             if nqp::isconcrete($code_obj) {
@@ -869,7 +870,7 @@
             Chunk.void($chunk, $chunk.expr~";\n", :node($chunk.node));
         }
         else {
-            my $tmp := $*BLOCK.add_tmp();
+            my str $tmp := $*BLOCK.add_tmp();
             Chunk.new($chunk.type, $tmp, [$chunk, "$tmp = {$chunk.expr};\n"], :node($chunk.node));
         }
     }
@@ -900,7 +901,7 @@
     }
     
     method wrap_static_block($expected_outer, @output, $block) {
-        my $missing_outer := $expected_outer.cuid ne $*BLOCK.cuid && $expected_outer.ctx ne 'null';
+        my int $missing_outer := $expected_outer.cuid ne $*BLOCK.cuid && $expected_outer.ctx ne 'null';
         if $missing_outer {
             @output.push("//Static wrapping\n");
             @output.push("(function() \{\n");
@@ -917,23 +918,36 @@
     method clone_inners($block) {
         my @clone_inners;
         for $block.cloned_inners -> $kv {
-            my $reg   := $kv.value;
-            my $cuid := self.mangled_cuid($kv.key);
+            my str $reg   := $kv.value;
+            my str $cuid := self.mangled_cuid($kv.key);
 
             if nqp::existskey(%*BLOCKS_STATEVARS, $kv.key) {
                 @clone_inners.push(%*BLOCKS_STATEVARS{$kv.key});
             }
 
+            if nqp::existskey(%*BLOCKS_STATEVARS, $kv.key) && nqp::existskey($block.captured_inners, $kv.key){
+                @clone_inners.push(%*BLOCKS_STATEVARS{$kv.key});
+            }
+
             self.wrap_static_block(%*BLOCKS_INFO{$kv.key}.outer, @clone_inners, -> {
                 if !$block.need_direct{$kv.key} {
                     # we know the block won't be ever called in direct mode
                     @clone_inners.push("$reg = $cuid");
                 }
                 elsif %*BLOCKS_DONE{$kv.key} {
-                    @clone_inners.push("$reg = $cuid.closure");
-                    @clone_inners.push(%*BLOCKS_DONE{$kv.key});
-                    if self.is_serializable($kv.key) {
-                        @clone_inners.push(".setOuter(" ~ %*BLOCKS_INFO{$kv.key}.outer.ctx ~ ")");
+                    # Avoid emitting duplicated code with both .capture and .closure
+                    if nqp::existskey($block.captured_inners, $kv.key) {
+                        my $outer := self.is_serializable($kv.key) ?? %*BLOCKS_INFO{$kv.key}.outer.ctx !! 'null';
+                        @clone_inners.push("$reg = $cuid.captureAndClosure($outer, ");
+                        @clone_inners.push(%*BLOCKS_DONE{$kv.key});
+                        @clone_inners.push(")");
+                    }
+                    else {
+                        @clone_inners.push("$reg = $cuid.closure");
+                        @clone_inners.push(%*BLOCKS_DONE{$kv.key});
+                        if self.is_serializable($kv.key) {
+                            @clone_inners.push(".setOuter(" ~ %*BLOCKS_INFO{$kv.key}.outer.ctx ~ ")");
+                        }
                     }
                 }
                 elsif %*BLOCKS_DONE_CPS{$kv.key} {
@@ -965,25 +979,29 @@
     method capture_inners($block) {
         my @capture_inners;
         for $block.captured_inners -> $kv {
-            my $cuid := self.mangled_cuid($kv.key);
-            my $reg   := $kv.value;
-
-            if nqp::existskey(%*BLOCKS_STATEVARS, $kv.key) {
-                @capture_inners.push(%*BLOCKS_STATEVARS{$kv.key});
+            if nqp::existskey($block.cloned_inners, $kv.key) && %*BLOCKS_DONE{$kv.key} {
+                # We emit captureAndClosure in clone_inners
             }
+            else {
+                my str $cuid := self.mangled_cuid($kv.key);
+                my str $reg   := $kv.value;
 
-            self.wrap_static_block(%*BLOCKS_INFO{$kv.key}.outer, @capture_inners, -> {
-                @capture_inners.push("$reg = $cuid.capture");
+                if nqp::existskey(%*BLOCKS_STATEVARS, $kv.key) {
+                    @capture_inners.push(%*BLOCKS_STATEVARS{$kv.key});
+                }
 
-                @capture_inners.push(%*BLOCKS_DONE{$kv.key});
+                self.wrap_static_block(%*BLOCKS_INFO{$kv.key}.outer, @capture_inners, -> {
+                    @capture_inners.push("$reg = $cuid.capture");
 
-                if 1 { # TODO check if we need to have this closure serializable
-                    @capture_inners.push(".setOuter(" ~ %*BLOCKS_INFO{$kv.key}.outer.ctx ~ ")");
-                }
+                    @capture_inners.push(%*BLOCKS_DONE{$kv.key});
 
-                @capture_inners.push(";\n");
-            });
+                    if 1 { # TODO check if we need to have this closure serializable
+                        @capture_inners.push(".setOuter(" ~ %*BLOCKS_INFO{$kv.key}.outer.ctx ~ ")");
+                    }
 
+                    @capture_inners.push(";\n");
+                });
+            }
 
         }
         Chunk.void(|@capture_inners);
@@ -1003,7 +1021,7 @@
 
     method compile_block(QAST::Block $node, $outer, $outer_loop, :$want, :@extra_args=[], :$cps) {
 
-        my $outer_ctx := try $*CTX // "null";
+        my str $outer_ctx := try $*CTX // "null";
 
         if self.is_known_cuid($node) {
         }
@@ -1021,22 +1039,22 @@
 
             %*BLOCKS_INFO{$node.cuid} := $*BLOCK;
 
-            my $body_want := $node.blocktype eq 'immediate' ?? $want !! $T_OBJ;
+            my int $body_want := $node.blocktype eq 'immediate' ?? $want !! $T_OBJ;
 
             my $stmts := self.compile_all_the_statements($node, $body_want);
 
-            my $code_ref_attr := self.code_ref_attr($node.cuid);
+            my str $code_ref_attr := self.code_ref_attr($node.cuid);
 
-            my $create_ctx := self.create_ctx($*CTX, :code_ref('this'), :code_ref_attr(quote_string($code_ref_attr)));
+            my str $create_ctx := self.create_ctx($*CTX, :code_ref('this'), :code_ref_attr(quote_string($code_ref_attr)));
             if nqp::istype($stmts, ChunkCPS) {
             }
             else {
                 my $sig := self.compile_sig($*BLOCK.params);
 
-                my $first_time_marker := $*BLOCK.maybe_first_time_marker;
+                my str $first_time_marker := $*BLOCK.maybe_first_time_marker;
 
-                my $pass_exceptions_start := '';
-                my $pass_exceptions_end := '';
+                my str $pass_exceptions_start := '';
+                my str $pass_exceptions_end := '';
 
                 if $*BLOCK.pass_on_exceptions {
                     $pass_exceptions_start := "try \{\n";
@@ -1084,7 +1102,7 @@
                     if nqp::defined($*BLOCK.outer) && $*BLOCK.outer.cuid {
                         $outer_cuid := self.mangled_cuid($*BLOCK.outer.cuid);
                     }
-                    my $lexicals_type_info := self.type_info_for_lexicals($*BLOCK);
+                    my str $lexicals_type_info := self.type_info_for_lexicals($*BLOCK);
                     my $closure_template;
                     if $node.blocktype ne 'immediate' {
                         my @closure_template := nqp::clone(@function);
@@ -1161,8 +1179,8 @@
             my $cloned_block := $outer.clone_inner($node, :cps($cps), :direct(!$cps));
 
             if $cps {
-                my $cont := self.unique_var('cont');
-                my $result := self.unique_var('result');
+                my str $cont := self.unique_var('cont');
+                my str $result := self.unique_var('result');
 
                 my @args := [$outer_ctx, 'null'];
 
@@ -1193,7 +1211,7 @@
             }
             else {
                 my $cloned_block := $outer.clone_inner($node);
-                Chunk.new($T_OBJ, $cloned_block, []);
+                Chunk.new($T_OBJ, $cloned_block);
             }
         }
         elsif $node.blocktype eq 'declaration_static' {
@@ -1203,7 +1221,7 @@
             }
             else {
                 my $cloned_block := $outer.clone_inner($node);
-                Chunk.new($T_OBJ, $cloned_block, []);
+                Chunk.new($T_OBJ, $cloned_block);
             }
         }
         else {
@@ -1228,19 +1246,19 @@
     }
 
     multi method as_js(QAST::IVal $node, :$want, :$cps) {
-        Chunk.new($T_INT,'('~$node.value()~')',[],:$node);
+        Chunk.new($T_INT,'('~$node.value()~')', :$node);
     }
 
     multi method as_js(QAST::NVal $node, :$want, :$cps) {
-        Chunk.new($T_NUM,'('~$node.value()~')',[],:$node);
+        Chunk.new($T_NUM,'('~$node.value()~')', :$node);
     }
 
     multi method as_js(QAST::SVal $node, :$want, :$cps) {
-        Chunk.new($T_STR,quote_string($node.value()),[],:$node);
+        Chunk.new($T_STR,quote_string($node.value()), :$node);
     }
 
     multi method as_js(QAST::BVal $node, :$want, :$cps) {
-        Chunk.new($T_OBJ, self.mangled_cuid($node.value.cuid), [], :$node);
+        Chunk.new($T_OBJ, self.mangled_cuid($node.value.cuid), :$node);
     }
 
     # Helps with register allocation on other backends
@@ -1318,7 +1336,7 @@
             }
          }
 
-        "var code_refs = new nqp.NQPArray([{nqp::join(',',@blocks)}]);\n" # TODO
+        "var code_refs = nqp.createArray([{nqp::join(',',@blocks)}]);\n" # TODO
     }
 
 
@@ -1333,23 +1351,23 @@
         }
 
         my $sc_tuple := self.serialize_sc($sc);
-        my $sc_data := $sc_tuple[0];
+        my str $sc_data := $sc_tuple[0];
         my $sc_sh := $sc_tuple[1];
 
 
-        my $i := 0;
+        my int $i := 0;
         while $i < nqp::elems($sc_sh) {
             my $s := nqp::atpos_s($sc_sh,$i);
-            my $got := nqp::isnull_s($s) ?? 'nqp.null_s' !! quote_string($s);
+            my str $got := nqp::isnull_s($s) ?? 'nqp.null_s' !! quote_string($s);
             @sh.push($got);
             $i := $i + 1;
         }
 
-        my $quoted_data := nqp::isnull_s($sc_data) ?? 'null' !! quote_string($sc_data);
+        my str $quoted_data := nqp::isnull_s($sc_data) ?? 'null' !! quote_string($sc_data);
 
 
         Chunk.void(
-            "var sh= new nqp.NQPArray([{nqp::join(',',@sh)}]);\n"
+            "var sh = nqp.createArray([{nqp::join(',',@sh)}]);\n"
             ~ "var sc = nqp.op.createsc({quote_string(nqp::scgethandle($sc))});\n"
             ~ self.emit_code_refs_list($ast)
             , "nqp.op.deserialize($quoted_data,sc,sh,code_refs,null);\n"
@@ -1373,7 +1391,7 @@
     }
 
     method throw_control_exception($type, $loop, $label) {
-        my $direct := 1;
+        my int $direct := 1;
         while nqp::defined($loop) {
             if nqp::istype($loop, LoopInfo) {
                 if $label {
@@ -1418,7 +1436,7 @@
 
     my sub loadable($name) {
         # workaround for webpack
-        my $path := literal_subst($name, '::', '/');
+        my str $path := literal_subst($name, '::', '/');
         quote_string($name) ~ ", function() \{return require({quote_string($path)})\}";
     }
 
@@ -1460,6 +1478,7 @@
 
         my @pre;
         {
+            my $*IN_PRE_SERIALIZE := 1;
             # We create this context so that dependencies are loaded relative to this file
             my $*CTX := 'ctxWithPath';
             @pre.push(
@@ -1504,14 +1523,14 @@
 
         # TODO nested compunits, we need to handle is_nested the same as the moar backend
 
-        my $comp_mode := $node.compilation_mode;
+        my int $comp_mode := $node.compilation_mode;
 
-        my $set_hll := $*HLL ?? "nqp.setCodeRefHLL(cuids, {quote_string($*HLL)});\n" !! '';
+        my str $set_hll := $*HLL ?? "nqp.setCodeRefHLL(cuids, {quote_string($*HLL)});\n" !! '';
 
         my $set_code_objects := self.set_code_objects;
         my @setup := [$pre , $comp_mode ?? self.create_sc($node) !! '', self.setup_wvals, $set_code_objects,  self.declare_js_vars($*BLOCK.tmps), self.capture_inners($*BLOCK), self.clone_inners($*BLOCK), $set_hll, self.set_static_vars, $post, $body];
         if !$instant {
-            @setup.push("new nqp.EvalResult({$body.expr}, new nqp.NQPArray(cuids))");
+            @setup.push("new nqp.EvalResult({$body.expr}, nqp.createArray(cuids))");
         }
         Chunk.new($T_VOID, "", @setup);
     }
@@ -1531,7 +1550,7 @@
         # TODO vars more complex the non-dynamic lexicals
 
         if $node.decl eq 'var' && ($node.scope eq 'local' || $node.scope eq 'lexical') {
-            my $type := self.type_from_typeobj($node.returns);
+            my int $type := self.type_from_typeobj($node.returns);
             $*BLOCK.register_var_type($node, $type);
         }
 
@@ -1546,7 +1565,7 @@
             $*BLOCK.add_variable($node);
 
             if !self.is_dynamic_var($*BLOCK, $node) {
-                my $mangled_name := $*BLOCK.add_mangled_var($node);
+                my str $mangled_name := $*BLOCK.add_mangled_var($node);
                 if $node.decl eq 'contvar' {
                     $*BLOCK.add_js_lexical_with_value($mangled_name, "nqp.op.clone({self.value_as_js($node.value)})");
                 }
@@ -1593,7 +1612,7 @@
         }
         else {
             my $fallback := self.as_js($node.fallback, :want($T_OBJ));
-            my $tmp := $*BLOCK.add_tmp();
+            my str $tmp := $*BLOCK.add_tmp();
             Chunk.new($T_OBJ, $tmp, [
                 $compiled,
                 "if ({$compiled.expr} === nqp.Null) \{\n"
@@ -1616,7 +1635,12 @@
         my str $handle := nqp::scgethandle($sc);
         my int $idx    := nqp::scgetobjidx($sc, $value);
 
-        my $key := $handle ~ "@" ~ $idx;
+        if $*IN_PRE_SERIALIZE {
+            # We can't setup all the wvals yet
+            return "nqp.wval({quote_string($handle)},$idx)";
+        }
+
+        my str $key := $handle ~ "@" ~ $idx;
 
         if !nqp::existskey(%!wval, $key) {
           %!wval{$key} := "nqp.wval({quote_string($handle)},$idx)";
@@ -1626,7 +1650,7 @@
     }
 
     method setup_wvals() {
-       my $setup;
+       my str $setup := '';
        for %!wval_mangling -> $kv {
            $setup := $setup ~ $kv.value ~ ' = ' ~ %!wval{$kv.key} ~ "\n";
        }
@@ -1642,7 +1666,7 @@
     }
 
     multi method as_js(QAST::WVal $node, :$want, :$cps) {
-        Chunk.new($T_OBJ, self.value_as_js($node.value), []);
+        Chunk.new($T_OBJ, self.value_as_js($node.value));
     }
     
     method var_is_lexicalish(QAST::Var $var) {
@@ -1701,7 +1725,7 @@
             self.cpsify_chunk(Chunk.new($type, $bindval.expr, [$bindval, self.set_var($var, $bindval.expr)]));
         }
         else {
-            self.cpsify_chunk(Chunk.new($type, self.get_var($var), [], :node($var)));
+            self.cpsify_chunk(Chunk.new($type, self.get_var($var), :node($var)));
         }
     }
 
@@ -1710,21 +1734,21 @@
         if $*BINDVAL {
             my $bindval := self.as_js_clear_bindval($*BINDVAL, :want($type), :$cps);
             if $var.decl eq 'var' {
-                self.stored_result(Chunk.new($type, "({$*CTX}[{quote_string($var.name)}] = {$bindval.expr})",  [$bindval]), :$want);
+                self.stored_result(Chunk.new($type, "({$*CTX}[{quote_string($var.name)}] = {$bindval.expr})",  $bindval), :$want);
             }
             else {
                 if $*BLOCK.ctx_for_var($var) -> $ctx {
-                    self.stored_result(Chunk.new($type, "({$ctx}[{quote_string($var.name)}] = {$bindval.expr})",  [$bindval]), :$want);
+                    self.stored_result(Chunk.new($type, "({$ctx}[{quote_string($var.name)}] = {$bindval.expr})",  $bindval), :$want);
                 } 
                 else {
                     # nqp::die("we can't find ctx for {$var.name}");
-                    self.stored_result(Chunk.new($type, "{$*CTX}.bind({quote_string($var.name)}, {$bindval.expr})",  [$bindval]), :$want);
+                    self.stored_result(Chunk.new($type, "{$*CTX}.bind({quote_string($var.name)}, {$bindval.expr})",  $bindval), :$want);
                 }
             }
         }
         else {
             if $var.decl && $var.decl ne 'param' {
-                my $initial_value;
+                my str $initial_value;
                 if $var.decl eq 'var' {
                     my %default_value := nqp::hash($T_OBJ, 'null', $T_INT, '0', $T_NUM, '0', $T_STR, '""');
                     $initial_value := %default_value{$type};
@@ -1744,15 +1768,15 @@
 
                 $*BLOCK.add_var_setup("{$*CTX}[{quote_string($var.name)}] = $initial_value;\n");
 
-                Chunk.new($type, "$*CTX[{quote_string($var.name)}]", [], :node($var));
+                Chunk.new($type, "$*CTX[{quote_string($var.name)}]", :node($var));
             }
             else {
                 if $*BLOCK.ctx_for_var($var) -> $ctx {
-                    Chunk.new($type, "$ctx[{quote_string($var.name)}]", [], :node($var));
+                    Chunk.new($type, "$ctx[{quote_string($var.name)}]", :node($var));
                 }
                 else {
                     # nqp::die("we can't find ctx for {$var.name}");
-                    Chunk.new($type, "{$*CTX}.lookup({quote_string($var.name)})", [], :node($var));
+                    Chunk.new($type, "{$*CTX}.lookup({quote_string($var.name)})", :node($var));
                 }
             }
         }
@@ -1768,7 +1792,7 @@
             }
         }
         else {
-            my $mangled := $*BLOCK.mangle_var($var);
+            my str $mangled := $*BLOCK.mangle_var($var);
             '('~$mangled~' = ('~ $js_expr ~ "));\n"
         }
     }
@@ -1799,7 +1823,7 @@
                     self.cpsify_chunk(Chunk.new($T_OBJ, $bindval.expr, [$bindval, self.set_var($var, $bindval.expr)]));
                 }
                 else {
-                    self.cpsify_chunk(Chunk.new($T_OBJ, self.get_var($var), [], :node($var)));
+                    self.cpsify_chunk(Chunk.new($T_OBJ, self.get_var($var), :node($var)));
                 }
             }
             else {
@@ -1817,7 +1841,7 @@
                     my $suffix := self.suffix_from_type($type);
                     my $get := self.get_var($var);
                     my $set := self.set_var($var, 'value');
-                    Chunk.new($T_OBJ, "nqp.op.getlexref{$suffix}({quote_string($*HLL)}, function() \{return $get\}, function(value) \{$set\})", [], :node($var));
+                    Chunk.new($T_OBJ, "nqp.op.getlexref{$suffix}({quote_string($*HLL)}, function() \{return $get\}, function(value) \{$set\})", :node($var));
                 }
             }
         }
@@ -1830,7 +1854,7 @@
                     }
                     else {
                         my $suffix := self.suffix_from_type($ref_type);
-                        return Chunk.new($ref_type, self.get_var($var) ~ ".\$\$decont{$suffix}()", [], :node($var));
+                        return Chunk.new($ref_type, self.get_var($var) ~ ".\$\$decont{$suffix}()", :node($var));
                     }
                 }
             }
@@ -1867,8 +1891,8 @@
 
 
             my @setup;
-            my $get;
-            my $set;
+            my str $get;
+            my str $set;
 
             my $self := self.as_js_clear_bindval($var[0], :want($T_OBJ), :$cps);
 
@@ -1891,7 +1915,7 @@
             }
 
 
-            Chunk.new($T_OBJ, "nqp.op.getattrref{$suffix}({quote_string($*HLL)}, function() \{return $get\}, function(value) \{$set\})", [], :node($var));
+            Chunk.new($T_OBJ, "nqp.op.getattrref{$suffix}({quote_string($*HLL)}, function() \{return $get\}, function(value) \{$set\})", :node($var));
         }
         elsif $var.scope eq 'attribute' {
             my @types := [$T_OBJ, $T_INT, $T_NUM, $T_STR];
@@ -1925,17 +1949,17 @@
                         Chunk.new($T_OBJ, $bindval.expr, [$self, $bindval, "{$self.expr}.\$\$bindattr\${$hint}({$bindval.expr});\n"]);
                     }
                     else {
-                        Chunk.new($T_OBJ, "{$self.expr}.\$\$getattr\${$hint}()", [$self]);
+                        Chunk.new($T_OBJ, "{$self.expr}.\$\$getattr\${$hint}()", $self);
                     }
                 }
                 else {
-                    my $attr := $self.expr ~ '.attr$' ~ $hint;
+                    my str $attr := $self.expr ~ '.attr$' ~ $hint;
                     if $*BINDVAL {
                         my $bindval := self.as_js_clear_bindval($*BINDVAL, :want($type), :$cps);
-                        Chunk.new($type, $bindval.expr, [$self, $bindval, "$attr = {$bindval.expr};\n"]);
+                        Chunk.new($type, $bindval.expr, [$self, $bindval, "$attr = {$bindval.expr};\n", "if (!{$self.expr}._SC !== null) {$self.expr}.\$\$scwb();\n"]);
                     }
                     else {
-                        Chunk.new($type, $attr, [$self]);
+                        Chunk.new($type, $attr, $self);
                     }
                 }
             }
@@ -1943,10 +1967,10 @@
         elsif $var.scope eq 'contextual' {
             if $*BINDVAL {
                 my $bindval := self.as_js_clear_bindval($*BINDVAL, :want($T_OBJ), :$cps);
-                self.stored_result(Chunk.new($T_OBJ, "{$*CTX}.bindDynamic({quote_string($var.name)},{$bindval.expr})", [$bindval]), :$want);
+                self.stored_result(Chunk.new($T_OBJ, "{$*CTX}.bindDynamic({quote_string($var.name)},{$bindval.expr})", $bindval), :$want);
             }
             else {
-                Chunk.new($T_OBJ, "{$*CTX}.lookupDynamic({quote_string($var.name)})", []);
+                Chunk.new($T_OBJ, "{$*CTX}.lookupDynamic({quote_string($var.name)})");
             }
         }
         else {
@@ -1965,12 +1989,15 @@
 
         my $chunk := $code();
 
-        Chunk.new($chunk.type, $chunk.expr, [self.declare_js_vars($*BLOCK.tmps), self.capture_inners($*BLOCK), self.clone_inners($*BLOCK), $chunk]);
+        Chunk.new($chunk.type, $chunk.expr, [self.setup_wvals, self.declare_js_vars($*BLOCK.tmps), self.capture_inners($*BLOCK), self.clone_inners($*BLOCK), $chunk]);
     }
 
     method as_js_with_prelude($ast, :$instant, :$shebang) {
         my $*INSTANT := $instant;
 
+        # We handle wval in the pre-serialization code specially.
+        my $*IN_PRE_SERIALIZE := 0;
+
         # Blocks we've seen while compiling.
         my %*BLOCKS_DONE;
         my %*BLOCKS_INFO;
@@ -1994,12 +2021,14 @@
         );
     }
 
-    method emit($ast, :$instant, :$substagestats, :$shebang) {
+    method emit($ast, :$instant, :$substagestats, :$shebang, :$snapshot) {
 
-        my $timestamp := nqp::time_n();
+        my num $timestamp := nqp::time_n();
         my $chunk := self.as_js_with_prelude($ast, :$instant, :$shebang);
         nqp::printfh(nqp::getstderr(), nqp::sprintf("[as_js %.3f] ", [nqp::time_n() - $timestamp])) if $substagestats;
 
+        $snapshot() if $snapshot;
+
         $timestamp := nqp::time_n();
         my $source := $chunk.join();
         nqp::printfh(nqp::getstderr(), nqp::sprintf("[join %.3f] ", [nqp::time_n() - $timestamp])) if $substagestats;
diff -Nru nqp-2016.11+dfsg/src/vm/js/HLL/Backend.nqp nqp-2016.12+dfsg/src/vm/js/HLL/Backend.nqp
--- nqp-2016.11+dfsg/src/vm/js/HLL/Backend.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/HLL/Backend.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -29,11 +29,8 @@
         nqp::sayfh(nqp::getstderr(), "Writing profiling data to $filename");
         $filename;
     }
-    
-    method run_profiled($what, $kind, $filename?) {
-
-        my $comp := nqp::getcomp('JavaScript');
 
+    method v8-profiler($comp) {
         my $v8-profiler := $comp.eval('
             var v8profiler = null;
             try {
@@ -52,6 +49,30 @@
             say("Cannot find module 'v8-profiler'. Install it from npm to enable profiling.");
             nqp::exit(1);
         }
+        $v8-profiler;
+    }
+
+    method snapshot_memory($file) {
+        my $comp := nqp::getcomp('JavaScript');
+
+        my $v8-profiler := self.v8-profiler($comp);
+
+        my &snapshot := $comp.eval('(function(profiler, filename) {
+            var snapshot = profiler.takeSnapshot();
+            var fs = require("fs");
+            snapshot.export(function(error, result) {
+                fs.writeFileSync(filename, result);
+                snapshot.delete();
+            });
+        })');
+
+        snapshot($v8-profiler, $file);
+    }
+
+    method run_profiled($what, $kind, $filename?) {
+        my $comp := nqp::getcomp('JavaScript');
+
+        my $v8-profiler := self.v8-profiler($comp);
 
         my &start := $comp.eval('(function(profiler, name) {profiler.startProfiling(name)})');
         my &write := $comp.eval('(function(profiler, name, filename) {
@@ -107,12 +128,18 @@
 
         my $shebang := nqp::defined(%adverbs<shebang>);
 
+        if %adverbs<snapshot> {
+            self.snapshot_memory(%adverbs<snapshot> ~ '-have-qast.heapsnapshot');
+        }
+
         if %adverbs<source-map-debug> {
             $backend.emit_with_source_map_debug($qast, :$instant, :$shebang);
         } elsif %adverbs<source-map> {
             $backend.emit_with_source_map($qast, :$instant, :$shebang);
         } else {
-            my $code := $backend.emit($qast, :$instant, :$substagestats, :$shebang);
+            my $code := $backend.emit($qast, :$instant, :$substagestats, :$shebang, :snapshot(sub () {
+                self.snapshot_memory(%adverbs<snapshot> ~ '-have-chunks.heapsnapshot') if %adverbs<snapshot>;
+            }));
             $code := self.beautify($code) if %adverbs<beautify>;
             $code;
         }
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/array.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/array.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/array.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/array.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,178 +0,0 @@
-'use strict';
-var NQPException = require('./nqp-exception.js');
-var Iter = require('./iter.js');
-var null_s = require('./null_s.js');
-var NQPObject = require('./nqp-object.js');
-var Null = require('./null.js');
-
-
-class NQPArray extends NQPObject {
-  constructor(array) {
-    super();
-    this.array = array;
-  }
-
-  push(ctx, _NAMED, self, element) {
-    this.array.push(element);
-    return element;
-  }
-
-  unshift(ctx, _NAMED, self, element) {
-    this.array.unshift(element);
-    return element;
-  }
-
-  shift(ctx, _NAMED, self) {
-    var value = this.array.shift();
-    if (value === undefined) return Null;
-    return value;
-  }
-
-  pop(ctx, _NAMED, self) {
-    var value = this.array.pop();
-    if (value === undefined) return Null;
-    return value;
-  }
-
-  $$atpos(index) {
-    var value = this.array[index < 0 ? this.array.length + index : index];
-    if (value === undefined) return Null;
-    return value;
-  }
-
-  $$atpos_s(index) {
-    var value = this.array[index < 0 ? this.array.length + index : index];
-    if (value === undefined) return null_s;
-    return value;
-  }
-
-  $$atpos_n(index) {
-    var value = this.array[index < 0 ? this.array.length + index : index];
-    if (value === undefined) return 0.0;
-    return value;
-  }
-
-  $$atpos_i(index) {
-    var value = this.array[index < 0 ? this.array.length + index : index];
-    if (value === undefined) return 0;
-    return value;
-  }
-
-  $$bindpos(index, value) {
-    return this.array[index < 0 ? this.array.length + index : index] = value;
-  }
-
-  $$join(delim) {
-    return this.array.join(delim);
-  }
-
-  $$push(value) {
-    this.array.push(value);
-    return value;
-  }
-
-  $$pop() {
-    var value = this.array.pop();
-    if (value === undefined) return Null;
-    return value;
-  }
-
-  $$shift() {
-    var value = this.array.shift();
-    if (value === undefined) return Null;
-    return value;
-  }
-
-  $$unshift(value) {
-    this.array.unshift(value);
-    return value;
-  }
-
-  $$toBool(ctx) {
-    return this.array.length == 0 ? 0 : 1;
-  }
-
-  $$elems() {
-    return this.array.length;
-  }
-
-  $$existspos(index) {
-    if (index < 0) index += this.array.length;
-    return this.array.hasOwnProperty(index) ? 1 : 0;
-  }
-
-  Num() {
-    return this.array.length;
-  }
-
-  $$splice(source, offset, length) {
-    // TODO source which is not NQPArrray
-    var args = [offset, length];
-    for (var i = 0; i < source.array.length; i++) {
-      args.push(source.array[i]);
-    }
-    this.array.splice.apply(this.array, args);
-    return this;
-  }
-
-  $$setelems(elems) {
-    this.array.length = elems;
-  }
-
-  $$numdimensions() {
-    return 1;
-  }
-
-  $$dimensions() {
-    return new NQPArray([this.array.length]);
-  }
-
-  $$setdimensions(dimensions) {
-    if (dimensions.array.length != 1) {
-      throw new NQPException('A dynamic array can only have a single dimension');
-    } else {
-      this.array.length = dimensions.array[0];
-    }
-  }
-
-  $$clone() {
-    return new NQPArray(this.array.slice());
-  }
-
-  $$atposnd(idx) {
-    if (idx.array.length != 1) {
-      throw new NQPException('A dynamic array can only be indexed with a single dimension');
-    }
-    var index = idx.array[0];
-    var value = this.array[index < 0 ? this.array.length + index : index];
-    if (value === undefined) return Null;
-    return value;
-  }
-
-  $$iterator() {
-    return new Iter(this.array);
-  }
-
-  $$bindposnd(idx, value) {
-    if (idx.array.length != 1) {
-      throw new NQPException('A dynamic array can only be indexed with a single dimension');
-    }
-    var index = idx.array[0];
-    return (this.array[index] = value);
-  }
-
-  $$toArray() {
-    return this.array;
-  }
-};
-
-NQPArray.prototype.$$atposnd_i = NQPArray.prototype.$$atposnd;
-NQPArray.prototype.$$atposnd_n = NQPArray.prototype.$$atposnd;
-NQPArray.prototype.$$atposnd_s = NQPArray.prototype.$$atposnd;
-
-
-NQPArray.prototype.$$bindposnd_i = NQPArray.prototype.$$bindposnd;
-NQPArray.prototype.$$bindposnd_n = NQPArray.prototype.$$bindposnd;
-NQPArray.prototype.$$bindposnd_s = NQPArray.prototype.$$bindposnd;
-
-module.exports = NQPArray;
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/bignum.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/bignum.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/bignum.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/bignum.js	2016-12-17 14:45:43.000000000 +0000
@@ -5,8 +5,6 @@
 
 var core = require('./core.js');
 
-var NQPArray = require('./array.js');
-
 var hll = require('./hll.js');
 
 var op = {};
@@ -28,6 +26,12 @@
   return b ? 1 : 0;
 }
 
+function makeNum(type, num) {
+  var instance = type._STable.REPR.allocate(type._STable);
+  instance.$$setNum(num);
+  return instance;
+}
+
 function makeBI(type, num) {
   var instance = type._STable.REPR.allocate(type._STable);
   instance.$$setBignum(num);
@@ -95,8 +99,22 @@
   return makeBI(type, getBI(a).div(getBI(b)));
 };
 
-op.pow_I = function(a, b, type) {
-  return makeBI(type, getBI(a).pow(getBI(b)));
+op.pow_I = function(a, b, numType, biType) {
+  var base = getBI(a);
+  var exponent = getBI(b);
+  if (exponent.lt(0)) {
+    return makeNum(numType, Math.pow(base.toNumber(), exponent.toNumber()));
+  } else {
+    if (exponent.gt(4294967296) && !base.eq(1) && !base.eq(0)) {
+      if (base.eq(-1)) {
+        // workaround a bug in bignum
+        return makeBI(biType, bignum(exponent.mod(2).eq(0) ? 1 : -1));
+      } else {
+        return makeNum(numType, base.lt(0) && exponent.mod(2).eq(1) ? Number.NEGATIVE_INFINITY : Number.POSITIVE_INFINITY);
+      }
+    }
+    return makeBI(biType, base.pow(exponent));
+  }
 };
 
 op.mod_I = function(n, m, type) {
@@ -224,12 +242,12 @@
 op.radix_I = function(hllName, radix, str, zpos, flags, type) {
   var extracted = core.radixHelper(radix, str, zpos, flags);
   if (extracted == null) {
-    return hll.slurpyArray3(hllName, makeBI(type, bignum(0)), makeBI(type, bignum(1)), -1);
+    return hll.slurpyArray(hllName, [makeBI(type, bignum(0)), makeBI(type, bignum(1)), -1]);
   }
 
   if (radix == 10 || radix == 16) {
     var pow = bignum(radix).pow(extracted.power);
-    return hll.slurpyArray3(hllName, makeBI(type, bignum(extracted.number, radix)), makeBI(type, pow), extracted.offset);
+    return hll.slurpyArray(hllName, [makeBI(type, bignum(extracted.number, radix)), makeBI(type, pow), extracted.offset]);
   } else {
     var n = extracted.number;
     var base = bignum(1);
@@ -249,6 +267,6 @@
 
     if (n[0] == '-') result = result.neg();
 
-    return hll.slurpyArray3(hllName, makeBI(type, result), makeBI(type, base), extracted.offset);
+    return hll.slurpyArray(hllName, [makeBI(type, result), makeBI(type, base), extracted.offset]);
   }
 };
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/BOOT.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/BOOT.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/BOOT.js	1970-01-01 00:00:00.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/BOOT.js	2016-12-17 14:45:43.000000000 +0000
@@ -0,0 +1,5 @@
+/* exports.Array is actually set in bootstrap.js */
+
+module.exports.createArray = function(array) {
+  return exports.Array._STable.REPR.allocateFromArray(exports.Array._STable, array);
+};
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/bootstrap.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/bootstrap.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/bootstrap.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/bootstrap.js	2016-12-17 14:45:43.000000000 +0000
@@ -5,20 +5,22 @@
 var Hash = require('./hash.js');
 var STable = require('./sixmodel.js').STable;
 
-var NQPArray = require('./array.js');
-
 var repr = new reprs.KnowHOWREPR();
 
 var CodeRef = require('./code-ref.js');
 
 var constants = require('./constants.js');
 
+var BOOT = require('./BOOT.js');
+
+var Null = require('./null.js');
+
 var core = new SerializationContext('__6MODEL_CORE__');
 core.description = 'core SC';
 
 function addToScWithSt(obj) {
   core.rootObjects.push(obj);
-  core.rootStables.push(obj._STable);
+  core.rootSTables.push(obj._STable);
   obj._SC = core;
   obj._STable._SC = core;
 }
@@ -103,7 +105,7 @@
 });
 
 addKnowhowHowMethod('attributes', function(ctx, _NAMED, self) {
-  return self.__attributes;
+  return BOOT.createArray(self.__attributes);
 });
 
 addKnowhowHowMethod('methods', function(ctx, _NAMED, self) {
@@ -136,7 +138,7 @@
 });
 
 addKnowhowHowMethod('add_attribute', function(ctx, _NAMED, self, type, attr) {
-  self.__attributes.$$push(attr);
+  self.__attributes.push(attr);
 });
 
 addKnowhowHowMethod('add_method', function(ctx, _NAMED, self, type, name, code) {
@@ -158,19 +160,19 @@
 
   /* ...which contains an array per MRO entry... */
   var typeInfo = [];
-  reprInfo.push(new NQPArray(typeInfo));
+  reprInfo.push(BOOT.createArray(typeInfo));
 
   /* ...which in turn contains this type... */
   typeInfo.push(typeObject);
 
   /* ...then an array of hashes per attribute... */
   var attrInfoList = [];
-  typeInfo.push(new NQPArray(attrInfoList));
+  typeInfo.push(BOOT.createArray(attrInfoList));
 
   /* ...then an array of hashes per attribute... */
-  for (var i = 0; i < self.__attributes.array.length; i++) {
+  for (var i = 0; i < self.__attributes.length; i++) {
     var attrInfo = new Hash();
-    var attr = self.__attributes.array[i];
+    var attr = self.__attributes[i];
     attrInfo.content.set('name', attr.__name);
     attrInfo.content.set('type', attr.__type);
     if (attr.__boxTarget) {
@@ -181,11 +183,11 @@
 
   /* ...followed by a list of parents (none). */
   var parentInfo = [];
-  typeInfo.push(new NQPArray(parentInfo));
+  typeInfo.push(BOOT.createArray(parentInfo));
 
   /* All of this goes in a hash. */
   var reprInfoHash = new Hash();
-  reprInfoHash.content.set('attribute', new NQPArray(reprInfo));
+  reprInfoHash.content.set('attribute', BOOT.createArray(reprInfo));
 
 
   /* Compose the representation using it. */
@@ -238,3 +240,6 @@
 module.exports.bootType = bootType;
 
 module.exports.core = core;
+
+BOOT.Array = bootType('BOOTArray', 'VMArray');
+BOOT.Array._STable.setboolspec(8, Null);
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/boot-types.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/boot-types.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/boot-types.js	1970-01-01 00:00:00.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/boot-types.js	2016-12-17 14:45:43.000000000 +0000
@@ -0,0 +1 @@
+
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/code-ref.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/code-ref.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/code-ref.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/code-ref.js	2016-12-17 14:45:43.000000000 +0000
@@ -132,6 +132,16 @@
     return closure;
   }
 
+  captureAndClosure(outer, block) {
+    this.capture(block);
+    var closure = this.closure(block);
+    if (outer !== null) {
+      this.outerCtx = outer;
+      closure.outerCtx = outer;
+    }
+    return closure;
+  }
+
   CPS(block) {
     this.$$callCPS = block;
     return this;
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/container-specs.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/container-specs.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/container-specs.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/container-specs.js	2016-12-17 14:45:43.000000000 +0000
@@ -18,23 +18,25 @@
     var fetch = this.fetch;
     var store = this.store;
 
-    this.STable.addInternalMethod('$$assignunchecked', function(ctx, value) {
-      store.$$call(ctx, {}, this, value);
-      return value;
-    });
+    this.STable.addInternalMethods(class {
+      $$assignunchecked(ctx, value) {
+        store.$$call(ctx, {}, this, value);
+        return value;
+      }
 
-    this.STable.addInternalMethod('$$assign', function(ctx, value) {
-      store.$$call(ctx, {}, this, value);
-      return value;
-    });
+      $$assign(ctx, value) {
+        store.$$call(ctx, {}, this, value);
+        return value;
+      }
 
-    this.STable.addInternalMethod('$$iscont', function() {
-      return 1;
-    });
+      $$iscont() {
+        return 1;
+      }
 
 
-    this.STable.addInternalMethod('$$decont', function(ctx) {
-      return fetch.$$call(ctx, {}, this);
+      $$decont(ctx) {
+        return fetch.$$call(ctx, {}, this);
+      }
     });
   }
 
@@ -76,129 +78,156 @@
     /* TODO - take the hll in account when converting to object */
 
     if (primitiveType == 1) { // int
-      this.STable.addInternalMethod('$$getInt', function(ctx, value) {
-        return this.get();
-      });
+      this.STable.addInternalMethods(class {
+        $getInt(ctx, value) {
+          return this.get();
+        }
 
-      this.STable.addInternalMethod('$$getNum', function(ctx, value) {
-        return this.get();
-      });
+        $$getNum() {
+          return this.get();
+        }
 
-      this.STable.addInternalMethod('$$getStr', function(ctx, value) {
-        return this.get().toString();
-      });
+        $$getStr() {
+          return this.get().toString();
+        }
 
-      this.STable.addInternalMethod('$$iscont_i', function(ctx, value) {
-        return 1;
-      });
+        $$iscont_i() {
+          return 1;
+        }
 
-      this.STable.addInternalMethod('$$assign_i', function(ctx, value) {
-        this.set(value);
-        return value;
-      });
-      this.STable.addInternalMethod('$$decont_i', function(ctx, value) {
-        return this.get();
-      });
-      this.STable.addInternalMethod('$$decont', function(ctx, value) {
-        var hll = STable.hllOwner;
-        if (hll === undefined) {
-          hll = ctx.codeRef().staticCode.hll;
+        $$iscont() {
+          return 1;
+        }
+
+        $$assign_i(ctx, value) {
+          this.set(value);
+          return value;
+        }
+
+        $$decont_i(ctx, value) {
+          return this.get();
         }
 
-        var type = hll.get('int_box');
-        if (!type) {
-          // HACK - nqp still uses NQPInt instead of the thing in the hll config
-          return new NQPInt(this.get());
-        } else {
-          var repr = type._STable.REPR;
-          var obj = repr.allocate(type._STable);
-          obj.$$setInt(this.get());
-          return obj;
+        $$decont(ctx, value) {
+          var hll = STable.hllOwner;
+          if (hll === undefined) {
+            hll = ctx.codeRef().staticCode.hll;
+          }
+
+          var type = hll.get('int_box');
+          if (!type) {
+            // HACK - nqp still uses NQPInt instead of the thing in the hll config
+            return new NQPInt(this.get());
+          } else {
+            var repr = type._STable.REPR;
+            var obj = repr.allocate(type._STable);
+            obj.$$setInt(this.get());
+            return obj;
+          }
         }
       });
     } else if (primitiveType == 2) { // num
-      this.STable.addInternalMethod('$$getInt', function(ctx, value) {
-        return this.get() | 0;
-      });
+      this.STable.addInternalMethods(class {
+        $$getInt(ctx, value) {
+          return this.get() | 0;
+        }
 
-      this.STable.addInternalMethod('$$getNum', function(ctx, value) {
-        return this.get();
-      });
+        $$getNum(ctx, value) {
+          return this.get();
+        }
 
-      this.STable.addInternalMethod('$$getStr', function(ctx, value) {
-        return this.get().toString();
-      });
+        $$getStr(ctx, value) {
+          return this.get().toString();
+        }
 
-      this.STable.addInternalMethod('$$iscont_n', function(ctx, value) {
-        return 1;
-      });
-      this.STable.addInternalMethod('$$assign_n', function(ctx, value) {
-        this.set(value);
-        return value;
-      });
-      this.STable.addInternalMethod('$$decont_n', function(ctx, value) {
-        return this.get();
-      });
-      this.STable.addInternalMethod('$$decont', function(ctx, value) {
-        var hll = STable.hllOwner;
-        if (hll === undefined) {
-          hll = ctx.codeRef().staticCode.hll;
+        $$iscont_n() {
+          return 1;
         }
 
-        var type = hll.get('num_box');
-        if (!type) {
-          // HACK - nqp still uses raw javascript numbers instead of the thing in the hll config
-          return this.get();
-        } else {
-          var repr = type._STable.REPR;
-          var obj = repr.allocate(type._STable);
-          obj.$$setNum(this.get());
-          return obj;
+        $$iscont() {
+          return 1;
+        }
+
+        $$assign_n(ctx, value) {
+          this.set(value);
+          return value;
+        }
+
+        $$decont_n(ctx, value) {
+          return this.get();
+        }
+
+        $$decont(ctx, value) {
+          var hll = STable.hllOwner;
+          if (hll === undefined) {
+            hll = ctx.codeRef().staticCode.hll;
+          }
+
+          var type = hll.get('num_box');
+          if (!type) {
+            // HACK - nqp still uses raw javascript numbers instead of the thing in the hll config
+            return this.get();
+          } else {
+            var repr = type._STable.REPR;
+            var obj = repr.allocate(type._STable);
+            obj.$$setNum(this.get());
+            return obj;
+          }
         }
       });
     } else if (primitiveType == 3) { // str
-      this.STable.addInternalMethod('$$getInt', function(ctx, value) {
-        var ret = parseFloat(this.get());
-        return isNaN(ret) ? 0 : ret | 0;
-      });
+      this.STable.addInternalMethods(class {
+        $$getInt(ctx, value) {
+          var ret = parseFloat(this.get());
+          return isNaN(ret) ? 0 : ret | 0;
+        }
 
-      this.STable.addInternalMethod('$$getNum', function(ctx, value) {
-        var ret = parseFloat(this.get());
-        return isNaN(ret) ? 0 : ret;
-      });
+        $$getNum(ctx, value) {
+          var ret = parseFloat(this.get());
+          return isNaN(ret) ? 0 : ret;
+        }
 
-      this.STable.addInternalMethod('$$getStr', function(ctx, value) {
-        return this.get().toString();
-      });
+        $$getStr(ctx, value) {
+          return this.get().toString();
+        }
 
-      this.STable.addInternalMethod('$$iscont_s', function(ctx, value) {
-        return 1;
-      });
-      this.STable.addInternalMethod('$$assign_s', function(ctx, value) {
-        this.set(value);
-        return value;
-      });
-      this.STable.addInternalMethod('$$decont_s', function(ctx, value) {
-        return this.get();
-      });
-      this.STable.addInternalMethod('$$getStr', function(ctx, value) {
-        return this.get();
-      });
-      this.STable.addInternalMethod('$$decont', function(ctx, value) {
-        var hll = STable.hllOwner;
-        if (hll === undefined) {
-          hll = ctx.codeRef().staticCode.hll;
+        $$iscont_s() {
+          return 1;
+        }
+
+        $$iscont() {
+          return 1;
+        }
+
+        $$assign_s(ctx, value) {
+          this.set(value);
+          return value;
+        }
+
+        $$decont_s(ctx, value) {
+          return this.get();
+        }
+
+        $$getStr(ctx, value) {
+          return this.get();
         }
 
-        var type = hll.get('str_box');
-        if (!type) {
-          // HACK - nqp still uses raw javascript strings instead of the thing in the hll config
-          return this.get();
-        } else {
-          var repr = type._STable.REPR;
-          var obj = repr.allocate(type._STable);
-          obj.$$setStr(this.get());
-          return obj;
+        $$decont(ctx, value) {
+          var hll = STable.hllOwner;
+          if (hll === undefined) {
+            hll = ctx.codeRef().staticCode.hll;
+          }
+
+          var type = hll.get('str_box');
+          if (!type) {
+            // HACK - nqp still uses raw javascript strings instead of the thing in the hll config
+            return this.get();
+          } else {
+            var repr = type._STable.REPR;
+            var obj = repr.allocate(type._STable);
+            obj.$$setStr(this.get());
+            return obj;
+          }
         }
       });
     } else {
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/core.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/core.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/core.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/core.js	2016-12-17 14:45:43.000000000 +0000
@@ -14,8 +14,6 @@
 
 var hll = require('./hll.js');
 
-var NQPArray = require('./array.js');
-
 var NQPObject = require('./nqp-object.js');
 
 var bootstrap = require('./bootstrap.js');
@@ -28,6 +26,12 @@
 
 var Null = require('./null.js');
 
+var BOOT = require('./BOOT.js');
+
+var exceptionsStack = require('./exceptions-stack.js');
+
+var repossession = require('./repossession.js');
+
 exports.CodeRef = CodeRef;
 
 op.isinvokable = function(obj) {
@@ -74,10 +78,10 @@
 op.radix = function(hllName, radix, str, zpos, flags) {
   var extracted = radixHelper(radix, str, zpos, flags);
   if (extracted == null) {
-    return hll.slurpyArray3(hllName, 0, 1, -1);
+    return hll.slurpyArray(hllName, [0, 1, -1]);
   }
   var pow = Math.pow(radix, extracted.power);
-  return hll.slurpyArray3(hllName, parseInt(extracted.number, radix), pow, extracted.offset);
+  return hll.slurpyArray(hllName, [parseInt(extracted.number, radix), pow, extracted.offset]);
 };
 
 op.setdebugtypename = function(type, debugName) {
@@ -129,12 +133,8 @@
   return obj._STable.REPR.allocate(obj._STable);
 };
 
-// HACK - till the array refactor we hack this
-
-op.bootarray = function(obj) {
-  return {_STable: {REPR: {allocate: function(STable) {
-    return new NQPArray([]);
-  }}}};
+op.bootarray = function() {
+  return BOOT.Array;
 };
 
 op.defined = function(obj) {
@@ -216,15 +216,6 @@
     return 0;
   }
 
-  // HACK
-  if (obj instanceof NQPArray) {
-    if (hll.hllConfigs.nqp && type == hll.hllConfigs.nqp.get('list')) {
-      return 1;
-    } else {
-      return 0;
-    }
-  }
-
   var cache = obj._STable.typeCheckCache;
   if (cache) {
     for (var i = 0; i < cache.length; i++) {
@@ -256,6 +247,7 @@
 
 op.settypecache = function(obj, cache) {
   obj._STable.typeCheckCache = cache.array;
+  if (obj._STable._SC !== null) obj._STable.scwb();
   return obj;
 };
 
@@ -271,6 +263,7 @@
     console.log('we expect a hash here');
   }
   obj._STable.setMethodCache(cache.$$toObject());
+  if (obj._STable._SC !== null) obj._STable.scwb();
   return obj;
 };
 
@@ -280,6 +273,7 @@
   } else {
     obj._STable.modeFlags &= ~constants.METHOD_CACHE_AUTHORITATIVE;
   }
+  if (obj._STable._SC !== null) obj._STable.scwb();
   return obj;
 };
 
@@ -319,12 +313,17 @@
       return Null;
     }
   }
-  return obj._STable.HOW.find_method(ctx, null, obj._STable.HOW, obj, name);
+
+  if (obj._STable.HOW.find_method) {
+    return obj._STable.HOW.find_method(ctx, null, obj._STable.HOW, obj, name);
+  } else {
+    return Null;
+  }
 }
 
 op.can = function(ctx, obj, name) {
   /* HACK those things should have an STable rather then be special cased */
-  if (typeof obj !== 'object' || obj instanceof NQPInt || obj instanceof CodeRef || obj instanceof Hash || obj instanceof NQPArray) return 0;
+  if (typeof obj !== 'object' || obj instanceof NQPInt || obj instanceof CodeRef || obj instanceof Hash) return 0;
 
   return find_method(ctx, obj, name) === Null ? 0 : 1;
 };
@@ -348,6 +347,7 @@
 
 op.rebless = function(obj, newType) {
   obj._STable.REPR.changeType(obj, newType);
+  if (obj._SC !== null) obj.$$scwb();
   return obj;
 };
 
@@ -474,15 +474,21 @@
   return fresh;
 };
 
-/* TODO - make serialization take this into account */
-var compilingSCs = [];
 op.pushcompsc = function(sc) {
-  compilingSCs.push(sc);
+  repossession.compilingSCs.push(sc);
   return sc;
 };
 
 op.popcompsc = function(sc) {
-  return compilingSCs.pop();
+  return repossession.compilingSCs.pop();
+};
+
+op.scwbenable = function() {
+  return --repossession.scwbDisableDepth;
+};
+
+op.scwbdisable = function() {
+  return ++repossession.scwbDisableDepth;
 };
 
 var compilerRegistry = new Map();
@@ -592,7 +598,7 @@
 };
 
 op.getpayload = function(exception) {
-  return exception.hasOwnProperty('payload') ? exception.payload : Null;
+  return Object.prototype.hasOwnProperty.call(exception, 'payload') ? exception.payload : Null;
 };
 
 op.setpayload = function(exception, payload) {
@@ -927,19 +933,19 @@
   };
 
   op['atpos2d' + type] = function(array, x, y) {
-    return op['atposnd' + type](array, new NQPArray([x, y]));
+    return op['atposnd' + type](array, BOOT.createArray([x, y]));
   };
 
   op['atpos3d' + type] = function(array, x, y, z) {
-    return op['atposnd' + type](array, new NQPArray([x, y, z]));
+    return op['atposnd' + type](array, BOOT.createArray([x, y, z]));
   };
 
   op['bindpos2d' + type] = function(array, x, y, value) {
-    return op['bindposnd' + type](array, new NQPArray([x, y]), value);
+    return op['bindposnd' + type](array, BOOT.createArray([x, y]), value);
   };
 
   op['bindpos3d' + type] = function(array, x, y, z, value) {
-    return op['bindposnd' + type](array, new NQPArray([x, y, z]), value);
+    return op['bindposnd' + type](array, BOOT.createArray([x, y, z]), value);
   };
 });
 
@@ -973,8 +979,8 @@
   return codeRef.staticCode;
 };
 
-op.backtracestrings = function(exception) {
-  return new NQPArray(['backtrace NYI']);
+op.backtracestrings = function(hllName, exception) {
+  return hll.list(hllName, [exception.stack.replace(/^Error: .*\n/, '')]);
 };
 
 op.hintfor = function(classHandle, attrName) {
@@ -1081,16 +1087,13 @@
 };
 
 op.islist = function(list) {
-  return (list instanceof NQPArray || list._STable && list._STable.REPR instanceof reprs.VMArray) ? 1 : 0;
+  return (list._STable && list._STable.REPR instanceof reprs.VMArray) ? 1 : 0;
 };
 
 op.split = function(hllName, separator, string) {
-  var array = hll.slurpyArray(hllName);
-  if (string !== '') {
-    var parts = string.split(separator);
-    for (var i = 0; i < parts.length; i++) {
-      array.$$push(parts[i]);
-    }
-  }
-  return array;
+  return hll.slurpyArray(hllName, string !== '' ? string.split(separator) : []);
+};
+
+op.exception = function() {
+  return exceptionsStack[exceptionsStack.length - 1];
 };
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/ctx.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/ctx.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/ctx.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/ctx.js	2016-12-17 14:45:43.000000000 +0000
@@ -4,6 +4,7 @@
 var Iter = require('./iter.js');
 var NQPObject = require('./nqp-object.js');
 var Null = require('./null.js');
+var exceptionsStack = require('./exceptions-stack.js');
 
 class Ctx extends NQPObject {
   constructor(callerCtx, outerCtx, callThis, codeRefAttr) {
@@ -25,7 +26,14 @@
         exception.caught = ctx;
         exception.resume = false;
         ctx.exception = exception;
-        ctx.unwind.ret = ctx.$$CATCH();
+
+        exceptionsStack.push(exception);
+        try {
+          ctx.unwind.ret = ctx.$$CATCH();
+        } finally {
+          exceptionsStack.pop();
+        }
+
         if (exception.resume) {
           return;
         } else {
@@ -34,12 +42,17 @@
       }
       ctx = ctx.$$caller;
     }
-    throw exception.message;
+    throw exception;
   }
 
   catchException(exception) {
     this.exception = exception;
-    this.$$CATCH();
+    exceptionsStack.push(exception);
+    try {
+      return this.$$CATCH();
+    } finally {
+      exceptionsStack.pop();
+    }
   }
 
   rethrow(exception) {
@@ -84,8 +97,8 @@
        nqp code usually fallbacks to looking up of global */
   }
 
-  lookupFromSomeCaller(name) {
-    var currentCallerCtx = this.$$caller;
+  lookupWithCallers(name) {
+    var currentCallerCtx = this;
     while (currentCallerCtx) {
       var currentCtx = currentCallerCtx;
       while (currentCtx) {
@@ -112,7 +125,6 @@
   }
 
   lookupFromOuter(name) {
-    console.log('looking up from outer', name);
     return this.$$outer.lookup(name);
   }
 
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/deserialization.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/deserialization.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/deserialization.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/deserialization.js	2016-12-17 14:45:43.000000000 +0000
@@ -10,7 +10,6 @@
 var Int64 = require('node-int64');
 var CodeRef = require('./code-ref.js');
 var constants = require('./constants.js');
-var NQPArray = require('./array.js');
 
 var Null = require('./null.js');
 
@@ -20,6 +19,8 @@
 
 var hll = require('./hll.js');
 
+var BOOT = require('./BOOT.js');
+
 
 /** All the loaded serialization contexts using their unique IDs as keys */
 var serializationContexts = SerializationContext.contexts;
@@ -132,7 +133,12 @@
     for (var i = 0; i < elems; i++) {
       array.push(readElem(this));
     }
-    return new NQPArray(array);
+    var bootArray = BOOT.createArray(array);
+    if (this.sc.currentObject) {
+        bootArray._SC = this.sc;
+        this.sc.ownedObjects.set(bootArray, this.sc.currentObject);
+    }
+    return bootArray;
   }
 
 
@@ -211,6 +217,12 @@
       var str = this.str();
       hash.content.set(str, this.variant());
     }
+
+    if (this.sc.currentObject) {
+        hash._SC = this.sc;
+        this.sc.ownedObjects.set(hash, this.sc.currentObject);
+    }
+
     return hash;
   }
 
@@ -388,7 +400,7 @@
         ptable.parameterizerCache = [];
       }
 
-      STable.parameters = new NQPArray(params);
+      STable.parameters = BOOT.createArray(params);
 
       ptable.parameterizerCache.push({type: STable.WHAT, params: params});
     }
@@ -528,33 +540,20 @@
     });
 
 
+    var reposTable = this.at(4 * 14).I32();
+    var numRepos = this.at(4 * 15).I32();
 
-    /* Stub STables */
-    for (var i = 0; i < STables.length; i++) {
-      var repr = STables[i][0];
-      if (!reprs[repr]) {
-        throw 'Unknown REPR: ' + repr;
-      }
-      var REPR = new reprs[repr]();
-      REPR.name = repr;
-      var HOW = null; /* We will fill that in later once objects are stubbed */
-      sc.rootStables[i] = new sixmodel.STable(REPR, HOW);
-      sc.rootStables[i]._SC = sc;
-    }
+    var repossessed = this.at(reposTable).times(numRepos, function(cursor) {
+      return {type: cursor.I32(), index: cursor.I32(), origSC: cursor.I32(), origIndex: cursor.I32()};
+    });
 
-    /* Stub objects */
-    for (var i = 0; i < objects.length; i++) {
-      var STableForObj =
-          deps[objects[i].STable[0]].rootStables[objects[i].STable[1]];
-      if (!STableForObj) {
-        console.log('Missing stable', objects[i].STable[0], objects[i].STable[1], deps[objects[i].STable[0]].rootStables);
-      }
+    this.repossessSTables(repossessed);
 
-      sc.rootObjects[i] = objects[i].isConcrete ?
-          new (STableForObj.objConstructor)() :
-          STableForObj.createTypeObject();
-      sc.rootObjects[i]._SC = sc;
-    }
+    this.stubSTables(STables);
+
+    this.repossessObjects(objects, repossessed);
+
+    this.stubObjects(objects);
 
 
     var closuresOffset = this.I32();
@@ -574,19 +573,9 @@
       sc.rootCodes.push(closures[i]);
     }
 
-    for (var i = 0; i < STables.length; i++) {
-      STables[i][1].STable(sc.rootStables[i]);
-    }
+    this.deserializeSTables(STables);
 
-    /* Finish up objects */
-    for (var i = 0; i < objects.length; i++) {
-      if (objects[i].isConcrete) {
-        var repr = sc.rootObjects[i]._STable.REPR;
-        if (repr.deserializeFinish) {
-          repr.deserializeFinish(sc.rootObjects[i], objects[i].data);
-        }
-      }
-    }
+    this.deserializeObjects(objects);
 
     var contextsOffset = this.I32();
     var contextsNumber = this.I32();
@@ -628,8 +617,11 @@
     }
 
 
-    var reposTable = this.I32();
-    var numRepos = this.I32();
+    // reposTable
+    this.I32();
+    //numRepos
+    this.I32();
+
     var paramInternsData = this.I32();
     var numParamInterns = this.I32();
 
@@ -640,12 +632,96 @@
 
     /* We set the method caches after everything else is ready */
     for (var i = 0; i < STables.length; i++) {
-      var STable = sc.rootStables[i];
+      var STable = sc.rootSTables[i];
       if (STable._methodCache instanceof Hash) {
         STable.setMethodCache(STable._methodCache.$$toObject());
       }
     }
   }
+
+  stubSTables(STables) {
+    for (var i = 0; i < STables.length; i++) {
+      // May already have it, due to repossession.
+      if (!this.sc.rootSTables[i]) {
+        var repr = STables[i][0];
+        if (!reprs[repr]) {
+          throw 'Unknown REPR: ' + repr;
+        }
+        var REPR = new reprs[repr]();
+        REPR.name = repr;
+        var HOW = null; /* We will fill that in later once objects are stubbed */
+        this.sc.rootSTables[i] = new sixmodel.STable(REPR, HOW);
+        this.sc.rootSTables[i]._SC = this.sc;
+      }
+    }
+  }
+
+  deserializeSTables(STables) {
+    for (var i = 0; i < STables.length; i++) {
+      STables[i][1].STable(this.sc.rootSTables[i]);
+    }
+  }
+
+  stubObjects(objects) {
+    for (var i = 0; i < objects.length; i++) {
+      if (!this.sc.rootObjects[i]) {
+        var STableForObj =
+            this.sc.deps[objects[i].STable[0]].rootSTables[objects[i].STable[1]];
+        if (!STableForObj) {
+          console.log('Missing stable', objects[i].STable[0], objects[i].STable[1], deps[objects[i].STable[0]].rootSTables);
+        }
+
+        this.sc.rootObjects[i] = objects[i].isConcrete ?
+            new (STableForObj.objConstructor)() :
+            STableForObj.createTypeObject();
+        this.sc.rootObjects[i]._SC = this.sc;
+      }
+    }
+  }
+
+  deserializeObjects(objects) {
+    for (var i = 0; i < objects.length; i++) {
+      if (objects[i].isConcrete) {
+        var repr = this.sc.rootObjects[i]._STable.REPR;
+        if (repr.deserializeFinish) {
+          this.sc.currentObject = this.sc.rootObjects[i];
+          repr.deserializeFinish(this.sc.rootObjects[i], objects[i].data);
+          this.sc.currentObject = undefined;
+        }
+      }
+    }
+  }
+
+  repossessSTables(repossessed) {
+    for (let entry of repossessed) {
+      if (entry.type === 1) {
+        let origSTable = this.sc.deps[entry.origSC].rootSTables[entry.origIndex];
+        this.sc.rootSTables[entry.index] = origSTable;
+        origSTable._SC = this.sc;
+      }
+    }
+  }
+
+  repossessObjects(objects, repossessed) {
+    for (let entry of repossessed) {
+      if (entry.type === 0) {
+        let origObj = this.sc.deps[entry.origSC].rootObjects[entry.origIndex];
+        this.sc.rootObjects[entry.index] = origObj;
+        origObj._SC = this.sc;
+
+        var STableForObj =
+            this.sc.deps[objects[entry.index].STable[0]].rootSTables[objects[entry.index].STable[1]];
+
+        /* The object's STable may have changed as a result of the
+         * repossession (perhaps due to mixing in to it), so put the
+         * STable it should now have in place. */
+
+        if (STableForObj !== origObj._STable) {
+          Object.setPrototypeOf(origObj, STableForObj.objConstructor.prototype);
+        }
+      }
+    }
+  }
 
   deserializeCtx(context, outers) {
     var outerCtx = outers.length != 0 ? outers[outers.length - 1] : null;
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/exceptions-stack.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/exceptions-stack.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/exceptions-stack.js	1970-01-01 00:00:00.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/exceptions-stack.js	2016-12-17 14:45:43.000000000 +0000
@@ -0,0 +1 @@
+module.exports = [];
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/hash.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/hash.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/hash.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/hash.js	2016-12-17 14:45:43.000000000 +0000
@@ -85,7 +85,7 @@
     return this.content.size;
   }
 
-  Num() {
+  $$numify() {
     return this.$$elems();
   }
 
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/hll.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/hll.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/hll.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/hll.js	2016-12-17 14:45:43.000000000 +0000
@@ -1,9 +1,9 @@
 'use strict';
 var Hash = require('./hash.js');
 var CodeRef = require('./code-ref.js');
-var NQPArray = require('./array.js');
 var NQPInt = require('./nqp-int.js');
 var Null = require('./null.js');
+var BOOT = require('./BOOT.js');
 
 var op = {};
 exports.op = op;
@@ -43,7 +43,7 @@
     var foreignTransformHash = config.get('foreign_transform_hash');
     if (foreignTransformHash === undefined) return obj;
     return foreignTransformHash.$$call(ctx, {}, obj);
-  } else if (obj instanceof NQPArray || role == 4) {
+  } else if (role == 4) {
     var foreignTransformArray = config.get('foreign_transform_array');
     if (foreignTransformArray === undefined) return obj;
     return foreignTransformArray.$$call(ctx, {}, obj);
@@ -115,15 +115,16 @@
   return type;
 };
 
-exports.slurpyArray = function(hllName) {
-  var slurpyArray = hllConfigs[hllName].get('slurpy_array');
-  return slurpyArray._STable.REPR.allocate(slurpyArray._STable);
+exports.slurpyArray = function(hllName, array) {
+  var slurpyArray;
+  if (hllConfigs[hllName]) slurpyArray = hllConfigs[hllName].get('slurpy_array');
+  if (slurpyArray === undefined) slurpyArray = BOOT.Array;
+  return slurpyArray._STable.REPR.allocateFromArray(slurpyArray._STable, array);
 };
 
-exports.slurpyArray3 = function(hllName, a, b, c) {
-  var array = exports.slurpyArray(hllName);
-  array.$$push(a);
-  array.$$push(b);
-  array.$$push(c);
-  return array;
+exports.list = function(hllName, array) {
+  var list;
+  if (hllConfigs[hllName]) list = hllConfigs[hllName].get('list');
+  if (list === undefined) list = BOOT.Array;
+  return list._STable.REPR.allocateFromArray(list._STable, array);
 };
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/io.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/io.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/io.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/io.js	2016-12-17 14:45:43.000000000 +0000
@@ -99,6 +99,9 @@
   }
 }
 
+op.fileislink = function(file) {
+  return boolish(fs.lstatSync(file).isSymbolicLink());
+};
 
 op.stat = function(file, code) {
   return stat(file, code, false) | 0;
@@ -378,7 +381,7 @@
 }
 
 op.spawn = function(command, dir, env, input, output, error, flags) {
-  nqpIo.spawn(command.array, dir, env.$$toObject(), convertNull(input), convertNull(output), convertNull(error), flags);
+  return nqpIo.spawn(command.array, dir, env.$$toObject(), convertNull(input), convertNull(output), convertNull(error), flags);
 };
 
 
@@ -387,7 +390,7 @@
 };
 
 op.shell = function(command, dir, env, input, output, error, flags) {
-  nqpIo.shell(command, dir, env.$$toObject(), convertNull(input), convertNull(output), convertNull(error), flags);
+  return nqpIo.shell(command, dir, env.$$toObject(), convertNull(input), convertNull(output), convertNull(error), flags);
 };
 
 op.cwd = function() {
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/nfa.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/nfa.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/nfa.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/nfa.js	2016-12-17 14:45:43.000000000 +0000
@@ -5,7 +5,8 @@
 var iscclass = require('./cclass.js').op.iscclass;
 var nqp = require('nqp-runtime');
 
-var NQPArray = require('./array.js');
+var Null = require('./null.js');
+var BOOT = require('./BOOT.js');
 
 const EDGE_FATE = 0, EDGE_EPSILON = 1, EDGE_CODEPOINT = 2, EDGE_CODEPOINT_NEG = 3, EDGE_CHARCLASS = 4, EDGE_CHARCLASS_NEG = 5;
 const EDGE_CHARLIST = 6, EDGE_CHARLIST_NEG = 7, EDGE_SUBRULE = 8, EDGE_CODEPOINT_I = 9, EDGE_CODEPOINT_I_NEG = 10;
@@ -250,17 +251,21 @@
     }
   }
 
-  return new NQPArray(fates);
+  return BOOT.createArray(fates);
 }
 
 op.nfarunproto = function(nfa, target, pos) {
   return runNFA(nfa, target, pos);
 };
 
-op.nfarunalt = function(nfa, target, pos, bstack, cstack, marks) {
-  cstack = cstack instanceof NQPArray ? cstack.array : cstack;
-  bstack = bstack instanceof NQPArray ? bstack.array : bstack;
-  marks = marks instanceof NQPArray ? marks.array : marks;
+op.nfarunalt = function(nfa, target, pos, bstackWrapped, cstackWrapped, marksWrapped) {
+  var cstack;
+
+  if (cstackWrapped !== Null && !cstackWrapped.typeObject_) {
+    cstack = cstackWrapped.$$toArray();
+  }
+  var bstack = bstackWrapped.$$toArray();
+  var marks = marksWrapped.$$toArray();
 
   /* Run the NFA. */
   var fates = runNFA(nfa, target, pos).array;
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/nqp-exception.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/nqp-exception.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/nqp-exception.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/nqp-exception.js	2016-12-17 14:45:43.000000000 +0000
@@ -1,21 +1,19 @@
-function NQPException(message) {
-  this.name = 'NQPException';
-  this.message = message;
-}
+class NQPException extends Error {
+  constructor(message) {
+    super(message);
+  }
 
-NQPException.prototype = Object.create(Error.prototype);
-NQPException.prototype.constructor = NQPException;
+  Str(ctx, _NAMED, self) {
+    return this.message;
+  }
 
-NQPException.prototype.Str = function(ctx, _NAMED, self) {
-  return this.message;
-};
-
-NQPException.prototype.$$toBool = function(ctx) {
-  return 1;
-};
+  $$toBool(ctx) {
+    return 1;
+  }
 
-NQPException.prototype.$$decont = function(ctx) {
-  return this;
+  $$decont(ctx) {
+    return this;
+  }
 };
 
 module.exports = NQPException;
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/nqp-int.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/nqp-int.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/nqp-int.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/nqp-int.js	2016-12-17 14:45:43.000000000 +0000
@@ -8,21 +8,17 @@
     this.value = value | 0;
   }
 
-  Int(ctx) {
-    return this.value;
-  }
-
   Str(ctx, _NAMED, self) {
     return this.value.toString();
   }
 
-  Num(ctx) {
-    return this.value;
-  }
-
   $$toBool(ctx) {
     return (this.value ? 1 : 0);
   }
+
+  $$numify() {
+    return this.value;
+  }
 };
 
 module.exports = NQPInt;
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/repossession.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/repossession.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/repossession.js	1970-01-01 00:00:00.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/repossession.js	2016-12-17 14:45:43.000000000 +0000
@@ -0,0 +1,3 @@
+exports.compilingSCs = [];
+exports.scwbDisableDepth = 0;
+exports.neverRepossess = new Map();
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/reprs.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/reprs.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/reprs.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/reprs.js	2016-12-17 14:45:43.000000000 +0000
@@ -3,9 +3,15 @@
 var Hash = require('./hash.js');
 var NQPInt = require('./nqp-int.js');
 var NQPException = require('./nqp-exception.js');
-var NQPArray = require('./array.js');
 var Null = require('./null.js');
+var null_s = require('./null_s.js');
 var Iter = require('./iter.js');
+var BOOT = require('./BOOT.js');
+
+var bignum = require('bignum');
+var ZERO = bignum(0);
+
+var constants = require('./constants.js');
 
 var reprs = {};
 var reprById = [];
@@ -30,7 +36,37 @@
 
 function basicConstructor(STable) {
   var objConstructor = function() {};
+  var handler = {};
+  handler.get = function(target, name) {
+    if (STable.modeFlags & constants.METHOD_CACHE_AUTHORITATIVE) {
+      return undefined;
+    }
+
+    /* are we trying to access an internal property? */
+    if (name.substr(0, 2) === '$$') {
+      return undefined;
+    }
+
+    return function() {
+      let how = this._STable.HOW;
+
+      var method = how.find_method(null, null, how, this, name);
+
+      var args = [];
+      for (var i = 0; i < arguments.length; i++) {
+        args.push(arguments[i]);
+      }
+      return method.$$apply(args);
+    };
+  };
+
+
+  objConstructor.prototype = Object.create(new Proxy({}, handler));
   objConstructor.prototype._STable = STable;
+
+  objConstructor.prototype._SC = undefined;
+  objConstructor.prototype._WHERE = undefined;
+
   return objConstructor;
 }
 
@@ -55,10 +91,10 @@
   deserializeReprData(cursor, STable) {
     this.deserialized = 1;
     var numAttributes = cursor.varint();
-    this.flattenedStables = [];
+    this.flattenedSTables = [];
     for (var i = 0; i < numAttributes; i++) {
       var notNull = cursor.varint();
-      this.flattenedStables.push(notNull != 0 ? cursor.locateThing('rootStables') : null);
+      this.flattenedSTables.push(notNull != 0 ? cursor.locateThing('rootSTables') : null);
     }
     this.mi = cursor.varint();
     var hasAutoVivValues = cursor.varint();
@@ -124,7 +160,7 @@
     if (this.unboxSlots) {
       for (var i = 0; i < this.unboxSlots.length; i++) {
         var slot = this.unboxSlots[i].slot;
-        (new reprById[this.unboxSlots[i].reprId]).generateBoxingMethods(STable, slotToAttr(slot), this.flattenedStables[slot]);
+        (new reprById[this.unboxSlots[i].reprId]).generateBoxingMethods(STable, slotToAttr(slot), this.flattenedSTables[slot]);
       }
     }
 
@@ -161,16 +197,16 @@
   }
 
   serializeReprData(st, cursor) {
-    var numAttrs = st.REPR.flattenedStables.length;
+    var numAttrs = st.REPR.flattenedSTables.length;
     cursor.varint(numAttrs);
 
     for (var i = 0; i < numAttrs; i++) {
-      if (st.REPR.flattenedStables[i] == null) {
+      if (st.REPR.flattenedSTables[i] == null) {
         cursor.varint(0);
       }
       else {
         cursor.varint(1);
-        cursor.STableRef(st.REPR.flattenedStables[i]);
+        cursor.STableRef(st.REPR.flattenedSTables[i]);
       }
     }
 
@@ -228,9 +264,9 @@
   deserializeFinish(obj, data) {
     var attrs = [];
 
-    for (var i = 0; i < this.flattenedStables.length; i++) {
-      if (this.flattenedStables[i]) {
-        attrs.push(this.flattenedStables[i].REPR.deserializeInline(data));
+    for (var i = 0; i < this.flattenedSTables.length; i++) {
+      if (this.flattenedSTables[i]) {
+        attrs.push(this.flattenedSTables[i].REPR.deserializeInline(data));
       } else {
         attrs.push(data.variant());
       }
@@ -244,7 +280,7 @@
   }
 
   serialize(cursor, obj) {
-    var flattened = obj._STable.REPR.flattenedStables;
+    var flattened = obj._STable.REPR.flattenedSTables;
     var nqp = require('nqp-runtime');
     if (!flattened) {
       throw 'Representation must be composed before it can be serialized';
@@ -263,6 +299,22 @@
 
   changeType(obj, newType) {
     // TODO some sanity checks for the new mro being a subset and newType being also a P6opaque
+
+    let newREPR = newType._STable.REPR;
+
+    for (var i = 0; i < newREPR.nameToIndexMapping.length; i++) {
+      for (var j = 0; j < newREPR.nameToIndexMapping[i].slots.length; j++) {
+        let slot = newREPR.nameToIndexMapping[i].slots[j];
+        let defaultValue = newREPR.flattenedSTables[slot] ?
+            newREPR.flattenedSTables[slot].REPR.flattenedDefaultObj :
+            undefined;
+        let attr = slotToAttr(slot);
+        if (!Object.prototype.hasOwnProperty.call(obj, attr)) {
+          obj[attr] = defaultValue;
+        }
+      }
+    }
+
     Object.setPrototypeOf(obj, newType._STable.objConstructor.prototype);
   }
 
@@ -285,7 +337,7 @@
 
     var curAttr = 0;
     this.nameToIndexMapping = [];
-    this.flattenedStables = [];
+    this.flattenedSTables = [];
     var mi = false;
 
     this.autoVivValues = [];
@@ -319,9 +371,9 @@
           names.push(attr.get('name'));
 
           if (attrType !== undefined && attrType !== Null && attrType._STable.REPR.flattenSTable) {
-            this.flattenedStables.push(attrType._STable);
+            this.flattenedSTables.push(attrType._STable);
           } else {
-            this.flattenedStables.push(null);
+            this.flattenedSTables.push(null);
           }
 
           if (attr.get('positional_delegate')) {
@@ -392,12 +444,11 @@
   generateDefaults(STable) {
     var code = '';
 
-    var defaults = {};
     for (var i = 0; i < this.nameToIndexMapping.length; i++) {
       for (var j = 0; j < this.nameToIndexMapping[i].slots.length; j++) {
         let slot = this.nameToIndexMapping[i].slots[j];
-        let defaultValue = this.flattenedStables[slot] ?
-            this.flattenedStables[slot].REPR.flattenedDefault :
+        let defaultValue = this.flattenedSTables[slot] ?
+            this.flattenedSTables[slot].REPR.flattenedDefault :
             'undefined';
         code += 'this.' + slotToAttr(slot) + ' = ' + defaultValue + ';\n';
       }
@@ -454,8 +505,8 @@
     for (var i = 0; i < this.nameToIndexMapping.length; i++) {
       for (var j = 0; j < this.nameToIndexMapping[i].slots.length; j++) {
         let slot = this.nameToIndexMapping[i].slots[j];
-        if (this.flattenedStables[slot]) {
-          this.flattenedStables[slot].REPR.generateFlattenedAccessors(STable, this.flattenedStables[slot], slot);
+        if (this.flattenedSTables[slot]) {
+          this.flattenedSTables[slot].REPR.generateFlattenedAccessors(STable, this.flattenedSTables[slot], slot);
         } else {
           this.generateNormalAccessors(STable, slot);
         }
@@ -471,9 +522,11 @@
 
   setupSTable(STable) {
     var repr = this;
-    STable.addInternalMethod('$$attrinited', function(classHandle, attrName) {
-      var attr = slotToAttr(repr.getHint(classHandle, attrName));
-      return (this[attr] == undefined) ? 0 : 1;
+    STable.addInternalMethods(class {
+      $$attrinited(classHandle, attrName) {
+        var attr = slotToAttr(repr.getHint(classHandle, attrName));
+        return (this[attr] == undefined) ? 0 : 1;
+      }
     });
 
   }
@@ -488,20 +541,20 @@
 class KnowHOWREPR {
   deserializeFinish(obj, data) {
     obj.__name = data.str();
-    obj.__attributes = data.variant();
+    obj.__attributes = data.variant().array;
     obj.__methods = data.variant();
   }
 
   serialize(data, obj) {
     data.str(obj.__name);
-    data.ref(obj.__attributes);
+    data.ref(BOOT.createArray(obj.__attributes));
     data.ref(obj.__methods);
   }
 
   allocate(STable) {
     var obj = new STable.objConstructor();
     obj.__methods = new Hash();
-    obj.__attributes = new NQPArray([]);
+    obj.__attributes = [];
     obj.__name = '<anon>';
     return obj;
   }
@@ -539,11 +592,13 @@
 
 class P6int extends REPR {
   setupSTable(STable) {
-    STable.addInternalMethod('$$setInt', function(value) {
-      this.value = value;
-    });
-    STable.addInternalMethod('$$getInt', function() {
-      return this.value;
+    STable.addInternalMethods(class {
+      $$setInt(value) {
+        this.value = value;
+      }
+      $$getInt(value) {
+        return this.value;
+      }
     });
   }
 
@@ -579,12 +634,14 @@
   }
 
   generateBoxingMethods(STable, name) {
-    STable.addInternalMethod('$$setInt', function(value) {
-      this[name] = value;
-    });
+    STable.addInternalMethods(class {
+      $$setInt(value) {
+        this[name] = value;
+      }
 
-    STable.addInternalMethod('$$getInt', function() {
-      return this[name];
+      $$getInt() {
+        return this[name];
+      }
     });
   }
 
@@ -608,11 +665,14 @@
 // TODO:  handle float/bits stuff in compose
 class P6num extends REPR {
   setupSTable(STable) {
-    STable.addInternalMethod('$$setNum', function(value) {
-      this.value = value;
-    });
-    STable.addInternalMethod('$$getNum', function() {
-      return this.value;
+    STable.addInternalMethods(class {
+      $$setNum(value) {
+        this.value = value;
+      }
+
+      $$getNum() {
+        return this.value;
+      }
     });
   }
 
@@ -633,12 +693,14 @@
   }
 
   generateBoxingMethods(STable, name) {
-    STable.addInternalMethod('$$setNum', function(value) {
-      this[name] = value;
-    });
+    STable.addInternalMethods(class {
+      $$setNum(value) {
+        this[name] = value;
+      }
 
-    STable.addInternalMethod('$$getNum', function() {
-      return this[name];
+      $$getNum() {
+        return this[name];
+      }
     });
   }
 
@@ -661,11 +723,14 @@
 
 class P6str extends REPR {
   setupSTable(STable) {
-    STable.addInternalMethod('$$setStr', function(value) {
-      this.value = value;
-    });
-    STable.addInternalMethod('$$getStr', function() {
-      return this.value;
+    STable.addInternalMethods(class {
+      $$setStr(value) {
+        this.value = value;
+      }
+
+      $$getStr() {
+        return this.value;
+      }
     });
   }
 
@@ -686,13 +751,16 @@
   }
 
   generateBoxingMethods(STable, name) {
-    STable.addInternalMethod('$$setStr', function(value) {
-      this[name] = value;
-    });
+    STable.addInternalMethods(class {
+      $$setStr(value) {
+        this[name] = value;
+      }
 
-    STable.addInternalMethod('$$getStr', function() {
-      return this[name];
+      $$getStr() {
+        return this[name];
+      }
     });
+
   }
 
   generateFlattenedAccessors(ownerSTable, attrContentSTable, slot) {
@@ -727,115 +795,158 @@
     return obj;
   }
 
+  allocateFromArray(STable, array) {
+    var obj = new STable.objConstructor();
+    obj.array = array;
+    return obj;
+  }
+
   setupSTable(STable) {
-    STable.addInternalMethod('$$push', function(value) {
-      this.array.push(value);
-      return value;
-    });
+    STable.addInternalMethods(class {
+      $$push(value) {
+        this.array.push(value);
+        return value;
+      }
 
-    STable.addInternalMethod('$$push', function(value) {
-      this.array.push(value);
-      return value;
-    });
+      $$push(value) {
+        this.array.push(value);
+        return value;
+      }
 
-    STable.addInternalMethod('$$atpos', function(index) {
-      var value = this.array[index < 0 ? this.array.length + index : index];
-      if (value === undefined) return Null;
-      return value;
-    });
+      $$atpos(index) {
+        var value = this.array[index < 0 ? this.array.length + index : index];
+        if (value === undefined) return Null;
+        return value;
+      }
 
-    /* TODO test how things should be converted */
+      /* TODO test how things should be converted */
 
-    STable.addInternalMethod('$$atpos_s', function(index) {
-      var value = this.array[index < 0 ? this.array.length + index : index];
-      if (value === undefined) return null_s;
-      return value;
-    });
+      $$atpos_s(index) {
+        var value = this.array[index < 0 ? this.array.length + index : index];
+        if (value === undefined) return null_s;
+        return value;
+      }
 
-    STable.addInternalMethod('$$atpos_n', function(index) {
-      var value = this.array[index < 0 ? this.array.length + index : index];
-      if (value === undefined) return 0.0;
-      return value;
-    });
+      $$atpos_n(index) {
+        var value = this.array[index < 0 ? this.array.length + index : index];
+        if (value === undefined) return 0.0;
+        return value;
+      }
 
-    STable.addInternalMethod('$$atpos_i', function(index) {
-      var value = this.array[index < 0 ? this.array.length + index : index];
-      if (value === undefined) return 0;
-      return value;
-    });
+      $$atpos_i(index) {
+        var value = this.array[index < 0 ? this.array.length + index : index];
+        if (value === undefined) return 0;
+        return value;
+      }
 
-    STable.addInternalMethod('$$bindpos', function(index, value) {
-      return this.array[index < 0 ? this.array.length + index : index] = value;
-    });
+      $$bindpos(index, value) {
+        return this.array[index < 0 ? this.array.length + index : index] = value;
+      }
 
-    STable.addInternalMethod('$$join', function(delim) {
-      return this.array.join(delim);
-    });
+      $$join(delim) {
+        return this.array.join(delim);
+      }
 
 
-    STable.addInternalMethod('$$pop', function() {
-      var value = this.array.pop();
-      if (value === undefined) return Null;
-      return value;
-    });
+      $$pop() {
+        var value = this.array.pop();
+        if (value === undefined) return Null;
+        return value;
+      }
 
-    STable.addInternalMethod('$$shift', function() {
-      var value = this.array.shift();
-      if (value === undefined) return Null;
-      return value;
-    });
+      $$shift() {
+        var value = this.array.shift();
+        if (value === undefined) return Null;
+        return value;
+      }
 
-    STable.addInternalMethod('$$unshift', function(value) {
-      this.array.unshift(value);
-      return value;
-    });
+      $$unshift(value) {
+        this.array.unshift(value);
+        return value;
+      }
 
-    STable.addInternalMethod('$$elems', function() {
-      return this.array.length;
-    });
+      $$elems() {
+        return this.array.length;
+      }
 
-    STable.addInternalMethod('$$existspos', function(index) {
-      if (index < 0) index += this.array.length;
-      return this.array.hasOwnProperty(index) ? 1 : 0;
-    });
+      $$existspos(index) {
+        if (index < 0) index += this.array.length;
+        return this.array.hasOwnProperty(index) ? 1 : 0;
+      }
 
-    STable.addInternalMethod('$$setelems', function(elems) {
-      this.array.length = elems;
-    });
+      $$setelems(elems) {
+        this.array.length = elems;
+      }
 
-    STable.addInternalMethod('$$numdimensions', function() {
-      return 1;
-    });
+      $$numdimensions() {
+        return 1;
+      }
 
-    STable.addInternalMethod('$$setdimensions', function(dimensions) {
-      if (dimensions.array.length != 1) {
-        throw new NQPException('A dynamic array can only have a single dimension');
-      } else {
-        this.array.length = dimensions.array[0];
+      $$setdimensions(dimensions) {
+        if (dimensions.array.length != 1) {
+          throw new NQPException('A dynamic array can only have a single dimension');
+        } else {
+          this.array.length = dimensions.array[0];
+        }
       }
-    });
 
-    STable.addInternalMethod('$$toArray', function() {
-      return this.array;
-    });
+      $$dimensions(dimensions) {
+        return BOOT.createArray([this.array.length]);
+      }
 
-    STable.addInternalMethod('$$iterator', function() {
-      return new Iter(this.array);
-    });
+      $$toArray() {
+        return this.array;
+      }
 
-    STable.addInternalMethod('Num', function() {
-      return this.array.length;
-    });
+      $$iterator() {
+        return new Iter(this.array);
+      }
+
+      $$numify() {
+        return this.array.length;
+      }
+
+      $$splice(source, offset, length) {
+        // TODO think about the case when the source is not VMArray
+        var args = [offset, length];
+        for (var i = 0; i < source.array.length; i++) {
+          args.push(source.array[i]);
+        }
+        this.array.splice.apply(this.array, args);
+        return this;
+      }
 
-    STable.addInternalMethod('$$splice', function(source, offset, length) {
-      // TODO think about the case when the source is not NQPArrray or VMArray
-      var args = [offset, length];
-      for (var i = 0; i < source.array.length; i++) {
-        args.push(source.array[i]);
+      $$clone() {
+        var cloned = new STable.objConstructor();
+        cloned.array = this.array.slice();
+        return cloned;
       }
-      this.array.splice.apply(this.array, args);
-      return this;
     });
+
+
+    var $$atposnd = function(idx) {
+      if (idx.array.length != 1) {
+        throw new NQPException('A dynamic array can only be indexed with a single dimension');
+      }
+      var index = idx.array[0];
+      var value = this.array[index < 0 ? this.array.length + index : index];
+      if (value === undefined) return Null;
+      return value;
+    };
+
+    var $$bindposnd = function(idx, value) {
+      if (idx.array.length != 1) {
+        throw new NQPException('A dynamic array can only be indexed with a single dimension');
+      }
+      var index = idx.array[0];
+      return (this.array[index] = value);
+    };
+
+    var suffixes = ['', '_s', '_i', '_n'];
+    for (let suffix of suffixes) {
+      STable.addInternalMethod('$$atposnd' + suffix, $$atposnd);
+      STable.addInternalMethod('$$bindposnd' + suffix, $$bindposnd);
+    }
   }
 
   deserializeFinish(obj, data) {
@@ -858,7 +969,7 @@
 
     cursor.varint(obj.array.length);
     for (var i = 0; i < obj.array.length; i++) {
-      cursor.ref(obj.array[i]);
+      cursor.ref(obj.array[i] === undefined ? Null : obj.array[i]);
     }
   }
 
@@ -903,7 +1014,6 @@
 VMIter.prototype.typeObjectFor = basicTypeObjectFor;
 reprs.VMIter = VMIter;
 
-var bignum = require('bignum');
 
 function makeBI(STable, num) {
   var instance = STable.REPR.allocate(STable);
@@ -917,20 +1027,22 @@
 
 class P6bigint extends REPR {
   setupSTable(STable) {
-    STable.addInternalMethod('$$setInt', function(value) {
-      this.value = bignum(value);
-    });
+    STable.addInternalMethods(class {
+      $$setInt(value) {
+        this.value = bignum(value);
+      }
 
-    STable.addInternalMethod('$$getInt', function() {
-      return this.value.toNumber() | 0;
-    });
+      $$getInt() {
+        return this.value.toNumber() | 0;
+      }
 
-    STable.addInternalMethod('$$setBignum', function(value) {
-      this.value = value;
-    });
+      $$setBignum(value) {
+        this.value = value;
+      }
 
-    STable.addInternalMethod('$$getBignum', function() {
-      return this.value;
+      $$getBignum() {
+        return this.value;
+      }
     });
   }
 
@@ -987,27 +1099,28 @@
   }
 
   generateBoxingMethods(STable, name) {
-    STable.addInternalMethod('$$setInt', function(value) {
-      this[name] = bignum(value);
-    });
+    STable.addInternalMethods(class {
+      $$setInt(value) {
+        this[name] = bignum(value);
+      }
 
-    STable.addInternalMethod('$$getInt', function() {
-      return this[name].toNumber();
-    });
+      $$getInt() {
+        return this[name].toNumber();
+      }
 
-    STable.addInternalMethod('$$getBignum', function() {
-      return this[name];
-    });
+      $$getBignum() {
+        return this[name];
+      }
 
-    STable.addInternalMethod('$$setBignum', function(num) {
-      this[name] = num;
+      $$setBignum(num) {
+        this[name] = num;
+      }
     });
   }
 };
 
 P6bigint.prototype.flattenSTable = true;
-P6bigint.prototype.ZERO = bignum(0);
-P6bigint.prototype.flattenedDefault = 'STable.REPR.ZERO';
+P6bigint.prototype.flattenedDefault = 'ZERO';
 
 
 reprs.P6bigint = P6bigint;
@@ -1046,6 +1159,12 @@
 reprs.Decoder = Decoder;
 
 class MultiDimArray extends REPR {
+  allocate(STable) {
+    var obj = new STable.objConstructor();
+    obj.dimensions = undefined;
+    return obj;
+  }
+
   compose(STable, reprInfoHash) {
     var array = reprInfoHash.content.get('array');
     var dimensions = array.content.get('dimensions');
@@ -1077,130 +1196,132 @@
 
 
   setupSTable(STable) {
-    STable.addInternalMethod('$$numdimensions', function(value) {
-      if (this.typeObject_) {
-        throw new NQPException('Cannot get number of dimensions of a type object');
+    STable.addInternalMethods(class {
+      $$numdimensions(value) {
+        if (this.typeObject_) {
+          throw new NQPException('Cannot get number of dimensions of a type object');
+        }
+        return STable.dimensions;
       }
-      return STable.dimensions;
-    });
-
-    STable.addInternalMethod('$$clone', function() {
-      var clone = new this._STable.objConstructor();
-      clone.storage = this.storage.slice();
-      clone.dimensions = this.dimensions;
-      return clone;
-    });
 
-    STable.addInternalMethod('$$dimensions', function() {
-      if (this.typeObject_) {
-        throw new NQPException('Cannot get dimensions of a type object');
+      $$clone() {
+        var clone = new this._STable.objConstructor();
+        clone.storage = this.storage.slice();
+        clone.dimensions = this.dimensions;
+        return clone;
       }
-      return new NQPArray(this.dimensions);
-    });
 
-    STable.addInternalMethod('$$setdimensions', function(value) {
-      if (value.array.length != STable.dimensions) {
-        throw new NQPException('Array type of ' + STable.dimensions + ' dimensions cannot be intialized with ' + value.length + ' dimensions');
-      } else if (this.dimensions) {
-        throw new NQPException('Can only set dimensions once');
+      $$dimensions() {
+        if (this.typeObject_) {
+          throw new NQPException('Cannot get dimensions of a type object');
+        }
+        return BOOT.createArray(this.dimensions);
       }
-      this.storage = [];
-      return (this.dimensions = value.array);
-    });
 
-    STable.addInternalMethod('$$pop', function() {
-      throw new NQPException('Cannot pop a fixed dimension array');
-    });
+      $$setdimensions(value) {
+        if (value.array.length != STable.dimensions) {
+          throw new NQPException('Array type of ' + STable.dimensions + ' dimensions cannot be intialized with ' + value.length + ' dimensions');
+        } else if (this.dimensions) {
+          throw new NQPException('Can only set dimensions once');
+        }
+        this.storage = [];
+        return (this.dimensions = value.array);
+      }
 
-    STable.addInternalMethod('$$shift', function() {
-      throw new NQPException('Cannot shift a fixed dimension array');
-    });
+      $$pop() {
+        throw new NQPException('Cannot pop a fixed dimension array');
+      }
 
-    STable.addInternalMethod('$$unshift', function(value) {
-      throw new NQPException('Cannot unshift a fixed dimension array');
-    });
+      $$shift() {
+        throw new NQPException('Cannot shift a fixed dimension array');
+      }
 
-    STable.addInternalMethod('$$push', function(value) {
-      throw new NQPException('Cannot push a fixed dimension array');
-    });
+      $$unshift(value) {
+        throw new NQPException('Cannot unshift a fixed dimension array');
+      }
 
-    STable.addInternalMethod('$$splice', function(value) {
-      throw new NQPException('Cannot splice a fixed dimension array');
-    });
+      $$push(value) {
+        throw new NQPException('Cannot push a fixed dimension array');
+      }
 
-    STable.addInternalMethod('$$calculateIndex', function(idx, value) {
-      idx = idx.array;
-      if (idx.length != STable.dimensions) {
-        throw new NQPException('Cannot access ' + STable.dimensions + ' dimension array with ' + idx.length + ' indices');
+      $$splice(value) {
+        throw new NQPException('Cannot splice a fixed dimension array');
       }
 
-      for (var i = 0; i < idx.length; i++) {
-        if (idx[i] < 0 || idx[i] >= this.dimensions[i]) {
-          throw new NQPException('Index ' + idx[i] + ' for dimension ' + (i + 1) + ' out of range (must be 0..' + this.dimensions[i] + ')');
+      $$calculateIndex(idx, value) {
+        idx = idx.array;
+        if (idx.length != STable.dimensions) {
+          throw new NQPException('Cannot access ' + STable.dimensions + ' dimension array with ' + idx.length + ' indices');
         }
+
+        for (var i = 0; i < idx.length; i++) {
+          if (idx[i] < 0 || idx[i] >= this.dimensions[i]) {
+            throw new NQPException('Index ' + idx[i] + ' for dimension ' + (i + 1) + ' out of range (must be 0..' + this.dimensions[i] + ')');
+          }
+        }
+        var calculatedIdx = 0;
+        for (var i = 0; i < idx.length; i++) {
+          calculatedIdx = calculatedIdx * this.dimensions[i] + idx[i];
+        }
+        return calculatedIdx;
       }
-      var calculatedIdx = 0;
-      for (var i = 0; i < idx.length; i++) {
-        calculatedIdx = calculatedIdx * this.dimensions[i] + idx[i];
-      }
-      return calculatedIdx;
-    });
 
-    STable.addInternalMethod('$$atposnd', function(idx) {
-      if (STable.primType != 0) throw new NQPException('wrong type');
-      return this.storage[this.$$calculateIndex(idx)];
-    });
+      $$atposnd(idx) {
+        if (STable.primType != 0) throw new NQPException('wrong type');
+        return this.storage[this.$$calculateIndex(idx)];
+      }
 
-    STable.addInternalMethod('$$bindposnd', function(idx, value) {
-      if (STable.primType != 0) throw new NQPException('wrong type: ' + STable.primType);
-      return (this.storage[this.$$calculateIndex(idx)] = value);
-    });
+      $$bindposnd(idx, value) {
+        if (STable.primType != 0) throw new NQPException('wrong type: ' + STable.primType);
+        return (this.storage[this.$$calculateIndex(idx)] = value);
+      }
 
-    STable.addInternalMethod('$$atposnd_i', function(idx) {
-      if (STable.primType != 1) throw new NQPException('wrong type: ' + STable.primType);
-      return this.storage[this.$$calculateIndex(idx)];
-    });
+      $$atposnd_i(idx) {
+        if (STable.primType != 1) throw new NQPException('wrong type: ' + STable.primType);
+        return this.storage[this.$$calculateIndex(idx)];
+      }
 
-    STable.addInternalMethod('$$bindposnd_i', function(idx, value) {
-      if (STable.primType != 1) throw new NQPException('wrong type' + STable.primType);
-      return (this.storage[this.$$calculateIndex(idx)] = value);
-    });
+      $$bindposnd_i(idx, value) {
+        if (STable.primType != 1) throw new NQPException('wrong type' + STable.primType);
+        return (this.storage[this.$$calculateIndex(idx)] = value);
+      }
 
-    STable.addInternalMethod('$$atposnd_n', function(idx) {
-      if (STable.primType != 2) throw new NQPException('wrong type');
-      return this.storage[this.$$calculateIndex(idx)];
-    });
+      $$atposnd_n(idx) {
+        if (STable.primType != 2) throw new NQPException('wrong type');
+        return this.storage[this.$$calculateIndex(idx)];
+      }
 
-    STable.addInternalMethod('$$bindposnd_n', function(idx, value) {
-      if (STable.primType != 2) throw new NQPException('wrong type');
-      return (this.storage[this.$$calculateIndex(idx)] = value);
-    });
+      $$bindposnd_n(idx, value) {
+        if (STable.primType != 2) throw new NQPException('wrong type');
+        return (this.storage[this.$$calculateIndex(idx)] = value);
+      }
 
-    STable.addInternalMethod('$$atposnd_s', function(idx) {
-      if (STable.primType != 3) throw new NQPException('wrong type');
-      return this.storage[this.$$calculateIndex(idx)];
-    });
+      $$atposnd_s(idx) {
+        if (STable.primType != 3) throw new NQPException('wrong type');
+        return this.storage[this.$$calculateIndex(idx)];
+      }
 
-    STable.addInternalMethod('$$bindposnd_s', function(idx, value) {
-      if (STable.primType != 3) throw new NQPException('wrong type');
-      return (this.storage[this.$$calculateIndex(idx)] = value);
-    });
+      $$bindposnd_s(idx, value) {
+        if (STable.primType != 3) throw new NQPException('wrong type');
+        return (this.storage[this.$$calculateIndex(idx)] = value);
+      }
 
-    // TODO optimize access
-    STable.addInternalMethod('$$bindpos', function(index, value) {
-      return this.$$bindposnd(new NQPArray([index]), value);
-    });
+      // TODO optimize and avoid creating a temporary array
+      $$bindpos(index, value) {
+        return this.$$bindposnd(BOOT.createArray([index]), value);
+      }
 
-    STable.addInternalMethod('$$setelems', function(elems) {
-      this.$$setdimensions(new NQPArray([elems]));
-    });
+      $$setelems(elems) {
+        this.$$setdimensions(BOOT.createArray([elems]));
+      }
 
-    STable.addInternalMethod('$$elems', function(elems) {
-      return this.dimensions[0];
-    });
+      $$elems(elems) {
+        return this.dimensions[0];
+      }
 
-    STable.addInternalMethod('$$atpos', function(index) {
-      return this.$$atposnd(new NQPArray([index]));
+      $$atpos(index) {
+        return this.$$atposnd(BOOT.createArray([index]));
+      }
     });
   }
 
@@ -1284,8 +1405,11 @@
 
 class VMException extends REPR {
   setupSTable(STable) {
-    STable.addInternalMethod('$$getStr', function() {
-      return this.message;
+
+    STable.addInternalMethods(class {
+      $$getStr() {
+        return this.message;
+      }
     });
   }
 };
@@ -1319,5 +1443,8 @@
   module.exports[name] = reprs[name];
   reprs[name].prototype.ID = ID;
   reprById[ID] = reprs[name];
+  if (reprs[name].prototype.flattenedDefault) {
+    reprs[name].prototype.flattenedDefaultObj = eval(reprs[name].prototype.flattenedDefault);
+  }
   ID++;
 }
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/runtime.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/runtime.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/runtime.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/runtime.js	2016-12-17 14:45:43.000000000 +0000
@@ -70,8 +70,6 @@
 module.exports.knowhowattr = bootstrap.knowhowattr;
 module.exports.knowhow = bootstrap.knowhow;
 
-module.exports.NQPArray = require('./array.js');
-
 exports.loaderCtx = null;
 
 op.loadbytecode = function(ctx, file) {
@@ -161,15 +159,26 @@
   } else if (typeof arg == 'string') {
     var ret = parseFloat(arg);
     return isNaN(ret) ? 0 : ret;
+  } else if (arg._STable && arg._STable.methodCache && arg._STable.methodCache.Num) {
+    var result = arg.Num(ctx, null, arg);
+    if (result.$$getNum) {
+      return result.$$getNum();
+    } else if (result.$$numify) {
+      return result.$$numify();
+    } else if (typeof result == 'number') {
+      return result;
+    } else {
+      console.trace("we can't numify result of toNum");
+      process.exit();
+    }
   } else if (arg.typeObject_) {
-    // TODO - is that a correct way to do that?
     return 0;
-  } else if (arg.Num) {
-    return arg.Num(ctx, null, arg);
   } else if (arg.$$getNum) {
     return arg.$$getNum();
   } else if (arg.$$getInt) {
     return arg.$$getInt();
+  } else if (arg.$$numify) {
+    return arg.$$numify();
   } else {
     console.log(arg);
     throw "Can't convert to num";
@@ -177,22 +186,7 @@
 };
 
 exports.toInt = function(arg, ctx) {
-  if (typeof arg == 'number') {
-    return arg | 0;
-  } else if (arg === Null) {
-    return 0;
-  } else if (arg.$$getInt) {
-    return arg.$$getInt();
-  } else if (arg.Int) {
-    return arg.Int(ctx);
-  } else if (typeof arg == 'string') {
-    var ret = parseInt(arg);
-    return isNaN(ret) ? 0 : ret;
-  } else if (arg.typeObject_) {
-    return 0;
-  } else {
-    throw "Can't convert to int";
-  }
+  return (exports.toNum(arg, ctx) | 0);
 };
 
 exports.intToObj = function(hllName, i) {
@@ -347,8 +341,6 @@
 exports.NQPException = NQPException;
 
 exports.wrapException = function(e) {
-  console.log(e);
-  console.log(e.stack);
   return new NQPException(e.message);
 };
 
@@ -395,3 +387,8 @@
 
 exports.null_s = null_s;
 exports.Null = Null;
+
+exports.list = hll.list;
+
+exports.slurpyArray = hll.slurpyArray;
+exports.createArray = require('./BOOT').createArray;
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/serialization-context.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/serialization-context.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/serialization-context.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/serialization-context.js	2016-12-17 14:45:43.000000000 +0000
@@ -12,7 +12,7 @@
  * @public handle The handle of this SC.
  * @public description Description (probably the file name) if any.
  * @public rootObjects The root set of objects that live in this SC.
- * @public rootStables The root set of STables that live in this SC.
+ * @public rootSTables The root set of STables that live in this SC.
  * @public rootCodes The root set of code refs that live in this SC.
  * @public repIndexes Repossession info. The following lists have matching indexes, each
  * representing the integer of an object in our root set along with the SC
@@ -27,22 +27,23 @@
     this.handle = handle;
     SerializationContext.contexts[handle] = this;
     this.rootObjects = [];
-    this.rootStables = [];
+    this.rootSTables = [];
     this.rootCodes = [];
     this.repIndexes = [];
     this.repScs = [];
-    /* Some things we deserialize are not directly in an SC, root set, but
+    /* Some things we deserialize (BOOTArray, BOOTHash) are not directly in an SC, root set, but
      * rather are owned by others. This is mostly thanks to Parrot legacy,
      * where not everything was a 6model object. This maps such owned
      * objects to their owner. It is used to determine what object should
      * be repossessed in the case a write barrier is hit. */
-    //  this.owned_objects = new HashMap<SixModelObject, SixModelObject>();
+
+    this.ownedObjects = new Map();
   }
 
   setObj(idx, obj) {
     this.rootObjects[idx] = obj;
     if (!obj._STable._SC) {
-      this.rootStables.push(obj._STable);
+      this.rootSTables.push(obj._STable);
       obj._STable._SC = this;
     }
   }
@@ -50,6 +51,26 @@
   getCodeIndex(codeRef) {
     return this.rootCodes.indexOf(codeRef);
   }
+
+  repossessSTable(STable) {
+    var newSlot = this.rootSTables.length;
+    this.rootSTables.push(STable);
+
+    this.repIndexes.push((newSlot << 1) | 1);
+    this.repScs.push(STable._SC);
+
+    STable._SC = this;
+  }
+
+  repossessObject(obj) {
+    var newSlot = this.rootObjects.length;
+    this.rootObjects.push(obj);
+
+    this.repIndexes.push((newSlot << 1));
+    this.repScs.push(obj._SC);
+
+    obj._SC = this;
+  }
 };
 
 SerializationContext.contexts = {};
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/serialization.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/serialization.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/serialization.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/serialization.js	2016-12-17 14:45:43.000000000 +0000
@@ -3,12 +3,15 @@
 var CodeRef = require('./code-ref.js');
 var NQPInt = require('./nqp-int.js');
 var Int64 = require('node-int64');
-var NQPArray = require('./array.js');
 var null_s = require('./null_s.js');
 var Null = require('./null.js');
 var MultiCache = require('./multicache.js').MultiCache;
 var FileHandle = require('./io.js').FileHandle;
 
+var repossession = require('./repossession.js');
+
+var BOOT = require('./BOOT.js');
+
 var constants = require('./constants.js');
 
 var op = {};
@@ -373,7 +376,7 @@
     else if (typeof ref == 'string') {
       discrim = REFVAR_VM_STR;
     }
-    else if (ref instanceof NQPArray) {
+    else if (ref._STable === BOOT.Array._STable) {
       discrim = REFVAR_VM_ARR_VAR;
     }
   //  else if (ref.st.WHAT == tc.gc.BOOTIntArray) {
@@ -481,6 +484,7 @@
     this.closures = new BinaryWriteCursor(this);
     this.contextsHeaders = new BinaryWriteCursor(this);
     this.contextsData = new BinaryWriteCursor(this);
+    this.repossessionsData = new BinaryWriteCursor(this);
   }
 
   serializeObject(obj) {
@@ -840,7 +844,7 @@
     var contextsListPos = 0;
     while (workTodo) {
       /* Current work list sizes. */
-      var sTablesTodo = this.sc.rootStables.length;
+      var sTablesTodo = this.sc.rootSTables.length;
       var objectsTodo = this.sc.rootObjects.length;
       var contextsTodo = this.contexts.length;
 
@@ -850,7 +854,7 @@
 
       /* Serialize any STables on the todo list. */
       while (sTablesListPos < sTablesTodo) {
-        this.serializeSTable(this.sc.rootStables[sTablesListPos]);
+        this.serializeSTable(this.sc.rootSTables[sTablesListPos]);
         sTablesListPos++;
         workTodo = true;
       }
@@ -877,7 +881,29 @@
 
 
   serializeRepossessions() {
-    /* TODO */
+    /* Make entries. */
+    for (let i = 0; i < this.sc.repIndexes.length; i++) {
+      let objIdx = this.sc.repIndexes[i] >> 1;
+      let isST = this.sc.repIndexes[i] & 1;
+
+      let origSC = this.sc.repScs[i];
+
+      /* Work out original object's SC location. */
+      let origSCIdx = this.getSCId(origSC);
+      let origIdx = isST != 0 ?
+          origSC.rootSTables.indexOf(this.sc.rootSTables[objIdx]) :
+          origSC.rootObjects.indexOf(this.sc.rootObjects[objIdx]);
+
+      if (origIdx < 0)
+        throw 'Could not find object when writing repossessions; ' +
+            (isST != 0 ? 'STable' : 'REPR = ' + this.sc.rootObjects[objIdx]._STable.REPR.name);
+
+      /* Write table row. */
+      this.repossessionsData.I32(isST);
+      this.repossessionsData.I32(objIdx);
+      this.repossessionsData.I32(origSCIdx);
+      this.repossessionsData.I32(origIdx);
+    }
   }
 
 
@@ -932,10 +958,10 @@
     /* Add to this SC if needed. */
     if (!st._SC) {
       st._SC = this.sc;
-      this.sc.rootStables.push(st);
+      this.sc.rootSTables.push(st);
     }
 
-    return [this.getSCId(st._SC), st._SC.rootStables.indexOf(st)];
+    return [this.getSCId(st._SC), st._SC.rootSTables.indexOf(st)];
   }
 
 
@@ -955,6 +981,7 @@
     outputSize += this.closures.offset;
     outputSize += this.contextsData.offset;
     outputSize += this.contextsHeaders.offset;
+    outputSize += this.repossessionsData.offset;
 
     this.buffer = new Buffer(outputSize);
 
@@ -970,7 +997,7 @@
 
     /* Put STables table in place, and set location/rows in header. */
     this.header_I32(this.offset);
-    this.header_I32(this.sc.rootStables.length);
+    this.header_I32(this.sc.rootSTables.length);
 
     this.writeChunk(this.stables);
 
@@ -1012,6 +1039,8 @@
     this.header_I32(this.offset);
     this.header_I32(this.sc.repScs.length);
 
+    this.writeChunk(this.repossessionsData);
+
 
     //  /* Sanity check. */
     if (this.offset != outputSize)
@@ -1063,6 +1092,7 @@
 };
 
 op.neverrepossess = function(obj) {
+  repossession.neverRepossess.set(obj, true);
   return obj;
 };
 
diff -Nru nqp-2016.11+dfsg/src/vm/js/nqp-runtime/sixmodel.js nqp-2016.12+dfsg/src/vm/js/nqp-runtime/sixmodel.js
--- nqp-2016.11+dfsg/src/vm/js/nqp-runtime/sixmodel.js	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/nqp-runtime/sixmodel.js	2016-12-17 14:45:43.000000000 +0000
@@ -4,6 +4,13 @@
 var null_s = require('./null_s.js'); /* Used when evaling runtime compiled methods */
 var Null = require('./null.js');
 
+var repossession = require('./repossession.js');
+var compilingSCs = repossession.compilingSCs;
+
+/* Needed for setting defaults values of attrs for objects */
+var bignum = require('bignum');
+var ZERO = bignum(0);
+
 
 class STable {
   constructor(REPR, HOW) {
@@ -12,6 +19,8 @@
 
     this.modeFlags = 0;
 
+    this._SC = null;
+
     this.objConstructor = REPR.createObjConstructor(this);
 
     /* HACK - it's a bit hackish - think how correct it is */
@@ -39,6 +48,17 @@
     this.objConstructor.prototype.$$call = undefined;
     this.objConstructor.prototype.$$injectMethod = undefined;
 
+    this.objConstructor.prototype.$$scwb = function() {
+
+      if (compilingSCs.length == 0 || repossession.scwbDisableDepth || repossession.neverRepossess.get(this)) {
+        return;
+      }
+
+      if (compilingSCs[compilingSCs.length - 1] !== this._SC) {
+        compilingSCs[compilingSCs.length - 1].repossessObject(this);
+      }
+    };
+
     if (this.REPR.setupSTable) {
       this.REPR.setupSTable(this);
     }
@@ -228,6 +248,12 @@
     this.objConstructor.prototype[name] = func;
   }
 
+  addInternalMethods(klass) {
+    for (let methodName of Object.getOwnPropertyNames(klass.prototype)) {
+      this.addInternalMethod(methodName, klass.prototype[methodName]);
+    }
+  }
+
   compileAccessor(accessor, code, setup) {
     this.code = this.code || '';
     this.setup = this.setup || '';
@@ -242,6 +268,13 @@
       this.code = '';
     }
   }
+
+  scwb() {
+    if (compilingSCs.length == 0 || repossession.scwbDisableDepth) return;
+    if (compilingSCs[compilingSCs.length - 1] !== this._SC) {
+      compilingSCs[compilingSCs.length - 1].repossessSTable(this);
+    }
+  }
 };
 
 module.exports.STable = STable;
diff -Nru nqp-2016.11+dfsg/src/vm/js/Operations.nqp nqp-2016.12+dfsg/src/vm/js/Operations.nqp
--- nqp-2016.11+dfsg/src/vm/js/Operations.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/Operations.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -28,7 +28,7 @@
             nqp::die("{+$node.list} arguments for {$node.op}, the maximum is {+@argument_types}");
         } 
 
-        my $i := 0;
+        my int $i := 0;
         for $node.list -> $arg {
             my $chunk := $comp.as_js($arg, :want(@argument_types[$i]));
             @exprs.push(@decont[$i] ?? "{$chunk.expr}.\$\$decont($*CTX)" !! $chunk.expr);
@@ -53,8 +53,8 @@
         }
 
         if $cps {
-            my $cont := $comp.unique_var('cont');
-            my $result := $comp.unique_var('result');
+            my str $cont := $comp.unique_var('cont');
+            my str $result := $comp.unique_var('result');
             @exprs.push($cont);
             @setup.push('return ' ~ $cb(|@exprs, :$cps) ~ ";\n");
             ChunkCPS.new($return_type, $result, @setup, $cont, :$node);
@@ -127,7 +127,7 @@
 
     # Sets returns on an op node if we it has a native result type.
     method attach_result_type($hll, $node) {
-        my $op := $node.op;
+        my str $op := $node.op;
         if nqp::existskey(%result_type, $op) {
             $node.returns(%result_type{$op});
         }
@@ -233,7 +233,7 @@
     add_simple_op('lcm_i', $T_INT, [$T_INT, $T_INT]);
 
     add_op('chain', sub ($comp, $node, :$want, :$cps) {
-        my $ret := $*BLOCK.add_tmp;
+        my str $ret := $*BLOCK.add_tmp;
 
         my sub is_chain($part) {
             $part ~~ QAST::Op && $part.op eq 'chain';
@@ -279,9 +279,9 @@
         sub ($comp, $node, :$want, :$cps) {
             my $obj := $comp.as_js(:want($T_OBJ), $node[0]);
             my $value := $comp.as_js(:want($type), $node[3]);
-            my $suffix := $comp.suffix_from_type($type);
+            my str $suffix := $comp.suffix_from_type($type);
             my @setup;
-            my $action;
+            my str $action;
             if static_hint($node) -> $hint {
                 @setup := [$obj, $value];
                 $action := $type == $T_OBJ
@@ -316,10 +316,10 @@
             my $obj := $comp.as_js(:want($T_OBJ), $node[0]);
             if static_hint($node) -> $hint {
                 if $type == $T_OBJ {
-                    Chunk.new($T_OBJ, "{$obj.expr}\.\$\$getattr\${$hint}()", [$obj]);
+                    Chunk.new($T_OBJ, "{$obj.expr}\.\$\$getattr\${$hint}()", $obj);
                 }
                 else {
-                    Chunk.new($type, "{$obj.expr}\.attr\${$hint}", [$obj]);
+                    Chunk.new($type, "{$obj.expr}\.attr\${$hint}", $obj);
                 }
             }
             else {
@@ -358,7 +358,7 @@
 
     for <preinc predec> -> $op {
         add_op($op, sub ($comp, $node, :$want, :$cps) {
-            my $action := $op eq 'preinc' ?? 'add_i' !! 'sub_i';
+            my str $action := $op eq 'preinc' ?? 'add_i' !! 'sub_i';
             $comp.as_js(
                 QAST::Op.new(
                     :op('bind'),
@@ -374,9 +374,9 @@
     for <postinc postdec> -> $op {
         add_op($op, sub ($comp, $node, :$want, :$cps) {
             # TODO CPS
-            my $tmp := $*BLOCK.add_tmp();
+            my str $tmp := $*BLOCK.add_tmp();
             my $var := $comp.as_js($node[0], :want($T_INT));
-            my $action := $op eq 'postinc' ?? 'add_i' !! 'sub_i';
+            my str $action := $op eq 'postinc' ?? 'add_i' !! 'sub_i';
             my $do_action := $comp.as_js(
                 QAST::Op.new(
                     :op('bind'),
@@ -389,7 +389,7 @@
        });
     }
 
-    add_simple_op('isstr', $T_BOOL, [$T_OBJ], sub ($obj) {"(typeof $obj == 'string')"}, :decont(0));
+    add_simple_op('isstr', $T_BOOL, [$T_OBJ], sub ($obj) {"(typeof $obj == 'string' || $obj === nqp.null_s)"}, :decont(0));
     add_simple_op('isint', $T_INT, [$T_OBJ], :decont(0));
     add_simple_op('isnum', $T_INT, [$T_OBJ], :decont(0));
 
@@ -497,10 +497,10 @@
     add_simple_op('getenvhash', $T_OBJ, [], :side_effects);
     add_simple_op('cwd', $T_STR, [], :side_effects);
 
-    add_simple_op('shell', $T_VOID, [$T_STR, $T_STR, $T_OBJ, $T_OBJ, $T_OBJ, $T_OBJ, $T_INT], :side_effects);
+    add_simple_op('shell', $T_INT, [$T_STR, $T_STR, $T_OBJ, $T_OBJ, $T_OBJ, $T_OBJ, $T_INT], :side_effects);
     add_simple_op('syncpipe', $T_OBJ, [], :side_effects);
 
-    add_simple_op('spawn', $T_VOID, [$T_OBJ, $T_STR, $T_OBJ, $T_OBJ, $T_OBJ, $T_OBJ, $T_INT], :side_effects);
+    add_simple_op('spawn', $T_INT, [$T_OBJ, $T_STR, $T_OBJ, $T_OBJ, $T_OBJ, $T_OBJ, $T_INT], :side_effects);
 
 
     add_simple_op('sha1', $T_STR, [$T_STR]);
@@ -560,7 +560,7 @@
            my @setup;
            my @exprs;
 
-           my $list := $*BLOCK.add_tmp();
+           my str $list := $*BLOCK.add_tmp();
 
            for $node.list -> $elem {
                my $chunk := $comp.as_js($elem, :want($type));
@@ -568,7 +568,7 @@
                @exprs.push($chunk.expr);
            }
 
-           @setup.push("$list = new nqp.NQPArray([" ~ nqp::join(',', @exprs) ~ "]);\n");
+           @setup.push("$list = nqp.list({quote_string($*HLL)}, [" ~ nqp::join(',', @exprs) ~ "]);\n");
 
            $comp.cpsify_chunk(Chunk.new($T_OBJ, $list , @setup, :$node));
         });
@@ -600,7 +600,7 @@
 
     add_op('hash', sub ($comp, $node, :$want, :$cps) {
         # TODO CPS
-        my $hash := $*BLOCK.add_tmp();
+        my str $hash := $*BLOCK.add_tmp();
         my @setup;
         @setup.push("$hash = nqp.hash();\n");
         for $node.list -> $key, $val {
@@ -622,17 +622,14 @@
             ?? $comp.as_js(QAST::Var.new(:name($node.name),:scope('lexical')), :want($T_OBJ))
             !! $comp.as_js(nqp::shift($args), :want($T_OBJ));
 
-
-        my $call;
-
-
         if $cps {
-            my $cont := $comp.unique_var('cont');
-            my $result := $comp.unique_var('result');
+            my str $cont := $comp.unique_var('cont');
+            my str $result := $comp.unique_var('result');
 
             my $compiled_args := $comp.args($args, :$cont);
 
-            my @setup := nqp::clone($compiled_args.setup);
+            ### setup_as_array NYI
+            my @setup := nqp::clone($compiled_args.setup_as_array);
             @setup.unshift($callee);
 
             my $call := $compiled_args.is_args_array ?? '.$$applyCPS(' !! '.$$callCPS(';
@@ -645,7 +642,7 @@
         else {
             my $compiled_args := $comp.args($args);
 
-            my $call := $compiled_args.is_args_array ?? '.$$apply(' !! '.$$call(';
+            my str $call := $compiled_args.is_args_array ?? '.$$apply(' !! '.$$call(';
 
             $comp.stored_result(
                 Chunk.new($T_OBJ, $callee.expr ~ ".\$\$decont($*CTX)" ~ $call ~ $compiled_args.expr ~ ')' , [$callee, $compiled_args], :$node), :$want);
@@ -702,7 +699,7 @@
 
         my @setup := [$invocant];
 
-        my $method;
+        my str $method;
         if $node.name {
             if $comp.is_valid_js_identifier($node.name) {
                 $method := '.' ~ $node.name;
@@ -719,7 +716,7 @@
 
         my $compiled_args := $comp.args(@args, :invocant($invocant.expr));
 
-        my $call := $compiled_args.is_args_array ?? ".apply({$invocant.expr}," !! '(';
+        my str $call := $compiled_args.is_args_array ?? ".apply({$invocant.expr}," !! '(';
 
         @setup.push($compiled_args);
 
@@ -746,12 +743,12 @@
         }
         
 
-        my $outer_ctx := $*CTX;
+        my str $outer_ctx := $*CTX;
         {
-            my $*HANDLER_CTX := $comp.unique_var('ctx');
+            my $handler_ctx := $comp.unique_var('ctx');
             my $unwind_marker := $*BLOCK.add_tmp;
 
-            my $try_ret := '';
+            my str $try_ret := '';
             my $set_try_ret := '';
 
             my $handle := '';
@@ -760,11 +757,11 @@
                     my $catch_body := $comp.as_js($handler, :want($T_OBJ));
                     $handle := Chunk.void(
                         "$unwind_marker = \{\};\n",
-                        "$*HANDLER_CTX.\$\$CATCH = function() \{\n",
+                        "$handler_ctx.\$\$CATCH = function() \{\n",
                         $catch_body,
                         "return {$catch_body.expr};\n",
                         "\};\n",
-                        "$*HANDLER_CTX.unwind = $unwind_marker;\n" 
+                        "$handler_ctx.unwind = $unwind_marker;\n"
                     );
                 }
                 elsif $type eq 'CONTROL' {
@@ -776,17 +773,32 @@
             }
 
             {
-                my $*CTX := $*HANDLER_CTX;
+                my $*CTX := $handler_ctx;
                 my $body := $comp.as_js($protected, :$want);
 
+                my str $catch_wrapped_exception := "$handler_ctx.catchException(nqp.wrapException(e))";
+                my str $catch_exception := "$handler_ctx.catchException(e)";
+
                 if $want != $T_VOID {
                     $try_ret := $*BLOCK.add_tmp;
-                    my $coerced_ret := $comp.coerce(Chunk.new($T_OBJ, "$unwind_marker.ret", []), $want);
+                    my $coerced_ret := $comp.coerce(Chunk.new($T_OBJ, "$unwind_marker.ret"), $want);
                     $set_try_ret := Chunk.new($T_VOID, '', [$coerced_ret, "$try_ret = {$coerced_ret.expr};\n"]);
+
+                    my %convert;
+                    %convert{$T_STR} := 'toStr';
+                    %convert{$T_NUM} := 'toNum';
+                    %convert{$T_INT} := 'toInt';
+                    if nqp::existskey(%convert, $want) {
+                        $catch_exception := 'nqp.' ~ %convert{$want} ~ '(' ~ $catch_exception ~ ')';
+                        $catch_wrapped_exception := 'nqp.' ~ %convert{$want} ~ '(' ~ $catch_wrapped_exception ~ ')';
+                    }
+
+                    $catch_exception := "$try_ret = $catch_exception";
+                    $catch_wrapped_exception := "$try_ret = $catch_wrapped_exception";
                 }
 
                 return Chunk.new($want, $try_ret, [
-                    "var $*CTX = new nqp.Ctx($outer_ctx, $outer_ctx, $outer_ctx.\$\$callThis, $outer_ctx.\$\$codeRefAttr);\n",
+                    "var $handler_ctx = new nqp.Ctx($outer_ctx, $outer_ctx, $outer_ctx.\$\$callThis, $outer_ctx.\$\$codeRefAttr);\n",
                     $handle,
                     "try \{",
                     $body,
@@ -795,10 +807,10 @@
                     "\} catch (e) \{if (e === $unwind_marker) \{",
                     $set_try_ret,
                     "\} else if (e instanceof nqp.NQPException) \{\n",
-                    "$*CTX.catchException(e);\n",
+                    "$catch_exception\n",
                     # HACK - we should catch more exceptions
                     "\} else if (e instanceof TypeError) \{\n",
-                    "$*CTX.catchException(nqp.wrapException(e));\n",
+                    "$catch_wrapped_exception;\n",
                     "\} else \{\n",
                     "throw e;\n",
                     "\}\n",
@@ -809,7 +821,7 @@
     });
 
 
-    add_simple_op('exception', $T_OBJ, [], sub () {"$*HANDLER_CTX.exception"});
+    add_simple_op('exception', $T_OBJ, []);
     add_simple_op('rethrow', $T_VOID, [$T_OBJ], sub ($exception) {"$*CTX.rethrow($exception)"}, :side_effects);
     add_simple_op('resume', $T_VOID, [$T_OBJ], sub ($exception) {"$*CTX.resume($exception)"}, :side_effects);
     add_simple_op('throw', $T_VOID, [$T_OBJ], :side_effects, sub ($exception) {"{$*CTX}.throw($exception)"});
@@ -822,7 +834,7 @@
 
     add_simple_op('newexception', $T_OBJ, [], :side_effects);
 
-    add_simple_op('backtracestrings', $T_OBJ, [$T_OBJ]);
+    add_simple_op('backtracestrings', $T_OBJ, [$T_OBJ], :hll);
 
     add_simple_op('findmethod', $T_OBJ, [$T_OBJ, $T_STR], :side_effects, :decont(0), :ctx);
     add_simple_op('can', $T_INT, [$T_OBJ, $T_STR], :side_effects, :decont(0), :ctx);
@@ -853,7 +865,7 @@
             my @set;
 
             for $*BLOCK.variables -> $var {
-                my $storage := $comp.is_dynamic_var($*BLOCK, $var)
+                my str $storage := $comp.is_dynamic_var($*BLOCK, $var)
                     ?? "{$*CTX}[{quote_string($var.name)}]"
                     !! $*BLOCK.mangle_var($var);
 
@@ -866,14 +878,14 @@
                    ~ 'return ' ~ $storage ~ ''
                    ~ '}');
             }
-            Chunk.new($T_OBJ, "new nqp.CurLexpad(\{{nqp::join(',', @get)}\}, \{{nqp::join(',', @set)}\})", [], :$node);
+            Chunk.new($T_OBJ, "new nqp.CurLexpad(\{{nqp::join(',', @get)}\}, \{{nqp::join(',', @set)}\})", :$node);
     });
 
     add_op('getlexouter', :!inlinable, sub ($comp, $node, :$want, :$cps) {
         unless nqp::istype($node[0], QAST::SVal) {
             $comp.NYI("getlexouter with an argument that isn't a string literal");
         }
-        my $var_name := $node[0].value;
+        my str $var_name := $node[0].value;
         my $block := $*BLOCK.outer;
         while $block {
             last if $block.has_own_variable($var_name);
@@ -883,13 +895,13 @@
         # TODO type 
 
         if !$block {
-            Chunk.new($T_OBJ, "{$*BLOCK.ctx}.lookupFromOuter({quote_string($var_name)})", [], :$node);
+            Chunk.new($T_OBJ, "{$*BLOCK.ctx}.lookupFromOuter({quote_string($var_name)})", :$node);
         }
         elsif $comp.is_dynamic_var($block, QAST::Var.new(:name($var_name), :scope<lexical>)) {
-            Chunk.new($T_OBJ, $block.ctx ~ "[" ~ quote_string($var_name) ~ "]", [], :$node);
+            Chunk.new($T_OBJ, $block.ctx ~ "[" ~ quote_string($var_name) ~ "]", :$node);
         }
         else {
-            Chunk.new($T_OBJ, $*BLOCK.outer.mangle_lexical($var_name) , [], :$node);
+            Chunk.new($T_OBJ, $*BLOCK.outer.mangle_lexical($var_name) , :$node);
         }
     });
 
@@ -927,18 +939,20 @@
 
     add_simple_op('radix', $T_OBJ, [$T_INT, $T_STR, $T_INT, $T_INT], :hll);
 
-    add_simple_op('stat', $T_INT, [$T_STR, $T_INT]);
-    add_simple_op('stat_time', $T_NUM, [$T_STR, $T_INT]);
+    add_simple_op('stat', $T_INT, [$T_STR, $T_INT], :side_effects);
+    add_simple_op('stat_time', $T_NUM, [$T_STR, $T_INT], :side_effects);
 
-    add_simple_op('lstat', $T_INT, [$T_STR, $T_INT]);
-    add_simple_op('lstat_time', $T_NUM, [$T_STR, $T_INT]);
+    add_simple_op('lstat', $T_INT, [$T_STR, $T_INT], :side_effects);
+    add_simple_op('lstat_time', $T_NUM, [$T_STR, $T_INT], :side_effects);
+
+    add_simple_op('fileislink', $T_INT, [$T_STR], :side_effects);
 
     add_simple_op('defined', $T_INT, [$T_OBJ], :decont(0));
     %ops<isconcrete> := %ops<defined>;
 
-    # TODO - those are stubs until we have repossession support
-    add_simple_op('scwbenable', $T_VOID, [], -> {''});
-    add_simple_op('scwbdisable', $T_VOID, [], -> {''});
+    add_simple_op('scwbenable', $T_INT, [], :side_effects);
+    add_simple_op('scwbdisable', $T_INT, [], :side_effects);
+
     add_simple_op('neverrepossess', $T_OBJ, [$T_OBJ]);
 
     add_simple_op('settypehllrole', $T_OBJ, [$T_OBJ, $T_INT], :side_effects);
@@ -977,7 +991,7 @@
         if +$node.list != 2 {
             nqp::die("Operation 'defor' needs 2 operands");
         }
-        my $tmp := $node.unique('defined');
+        my str $tmp := $node.unique('defined');
         $comp.as_js(QAST::Stmts.new(
             QAST::Op.new(
                 :op('bind'),
@@ -1001,7 +1015,7 @@
             nqp::die("Operation 'ifnull' needs 2 operands");
         }
 
-        my $result := $*BLOCK.add_tmp();
+        my str $result := $*BLOCK.add_tmp();
         my $expr := $comp.as_js($node[0], :want($T_OBJ));
         my $then := $comp.as_js($node[1], :want($T_OBJ));
         Chunk.new($T_OBJ, $result, [
@@ -1013,25 +1027,27 @@
             "\}\n"], :node($node));
     });
 
+    my sub needs_cond_passed($n) {
+        nqp::istype($n, QAST::Block) && $n.arity > 0 &&
+            ($n.blocktype eq 'immediate' || $n.blocktype eq 'immediate_static')
+    }
 
-    for <if unless> -> $op_name {
+    for <if unless with without> -> $op_name {
         add_op($op_name, sub ($comp, $node, :$want, :$cps) {
             #TODO CPS
             unless nqp::defined($want) {
                 nqp::die("Unknown want");
             }
 
+            my $is_withy := $op_name eq 'with' || $op_name eq 'without';
+
             my $operands := +$node.list;
             nqp::die("Operation '"~$node.op~"' needs either 2 or 3 operands")
                 if $operands < 2 || $operands > 3;
 
-            my sub needs_cond_passed($n) {
-                nqp::istype($n, QAST::Block) && $n.arity > 0 &&
-                    ($n.blocktype eq 'immediate' || $n.blocktype eq 'immediate_static')
-            }
 
 
-            my $cond_type := (needs_cond_passed($node[1]) || needs_cond_passed($node[2]))
+            my int $cond_type := (needs_cond_passed($node[1]) || needs_cond_passed($node[2]) || $is_withy)
                 ?? $T_OBJ
                 !! (($operands == 3 || $want == $T_VOID) ?? $T_BOOL !! $want);
 
@@ -1040,15 +1056,17 @@
             my $then;
             my $else;
 
-            my $result;
+            my str $result;
 
             if $want != $T_VOID {
                 $result := $*BLOCK.add_tmp();
             }
 
-            my $boolifed_cond := $comp.coerce($cond, $T_BOOL);
+            my $check_cond := $is_withy
+                ?? Chunk.new($T_INT, "{$cond.expr}.defined($*CTX, null, {$cond.expr}).\$\$toBool($*CTX)", $cond)
+                !! $comp.coerce($cond, $T_BOOL);
 
-            my $cond_without_sideeffects := Chunk.new($cond.type, $cond.expr, []);
+            my $cond_without_sideeffects := Chunk.new($cond.type, $cond.expr);
 
 
             my sub compile_block($node) {
@@ -1062,7 +1080,7 @@
                 }
             }
 
-            if $node.op eq 'if' {
+            if $node.op eq 'if' || $node.op eq 'with' {
                 $then := compile_block($node[1]);
 
                 if $operands == 3 {
@@ -1083,9 +1101,10 @@
             }
 
 
-            # TODO ->
 
             if nqp::istype($cond, ChunkCPS) || nqp::istype($then, ChunkCPS) || nqp::istype($else, ChunkCPS) {
+                # TODO ->
+
                 if needs_cond_passed($then) || needs_cond_passed($else) {
                     return $comp.NYI("if ... -> \{...\} in CPS mode");
                 }
@@ -1094,11 +1113,12 @@
                     return $comp.NYI("if in CPS mode with CPSish condition");
                 }
                 else {
-                    my $cont := $comp.unique_var('cont');
-                    my $result := $comp.unique_var('result');
+                    my str $cont := $comp.unique_var('cont');
+                    my str $result := $comp.unique_var('result');
+                    # TODO make with and without work in CPS mode
                     return ChunkCPS.new($want, $result, [
-                        $boolifed_cond,
-                        "if ({$boolifed_cond.expr}) \{\n",
+                        $check_cond,
+                        "if ({$check_cond.expr}) \{\n",
                         nqp::istype($then, ChunkCPS) ?? $*BLOCK.set_cont($then, $cont) !! "",
                         $then,
                         nqp::istype($then, ChunkCPS) ?? "" !! "return $cont({$then.expr});\n",
@@ -1112,8 +1132,8 @@
             }
 
             Chunk.new($want, $result, [
-                $boolifed_cond,
-                "if ({$boolifed_cond.expr}) \{\n",
+                $check_cond,
+                "if ({$check_cond.expr}) \{\n",
                 $then,
                 $want != $T_VOID ?? "$result = {$then.expr};\n" !! '',
                 "\} else \{\n",
@@ -1124,11 +1144,61 @@
         });
     }
 
+    add_op('xor', sub ($comp, $node, :$want, :$cps) {
+        my @childlist;
+        my $f_ast;
+        for $node.list {
+            if $_.named eq 'false' {
+                $f_ast := $_;
+            }
+            else {
+                nqp::push(@childlist, $comp.as_js(:want($T_OBJ), $_));
+            }
+        }
+
+        my $ret := $*BLOCK.add_tmp;
+        my $true_count := $*BLOCK.add_tmp;
+
+        my @setup;
+
+        @setup.push("$true_count = 0;\n");
+
+        for @childlist -> $chunk {
+            @setup.push("if ($true_count < 2) \{");
+            @setup.push($chunk);
+            @setup.push(
+                "if ({$chunk.expr}.\$\$toBool($*CTX)) \{\n"
+                ~ "$true_count++;\n"
+                ~ "$ret = {$chunk.expr};\n"
+                ~ "\}\n"
+            );
+
+            @setup.push("\}\n");
+        }
+
+        @setup.push("if ($true_count == 2) \{\n");
+        if $f_ast {
+            my $chunk := $comp.as_js(:want($T_OBJ), $f_ast);
+            @setup.push($chunk);
+            @setup.push("$ret = {$chunk.expr};\n");
+        }
+        else {
+            @setup.push("$ret = nqp.Null;\n");
+        }
+        @setup.push(
+            "\} else if ($true_count == 0) \{\n"
+            ~ "$ret = {@childlist[@childlist-1].expr};\n"
+            ~ "\}"
+        );
+
+        Chunk.new($T_OBJ, $ret, @setup);
+    });
+
     add_op('for', sub ($comp, $node, :$want, :$cps) {
         #TODO CPS
         # TODO redo etc.
 
-        my $handler := 1;
+        my int $handler := 1;
         my @operands;
         my $label;
         for $node.list {
@@ -1148,7 +1218,7 @@
             nqp::die("Operation 'for' expects the block to have blocktype to be immediate, is: {@operands[1].blocktype}");
         }
 
-        my $iterator := $*BLOCK.add_tmp();
+        my str $iterator := $*BLOCK.add_tmp();
 
         my $list := $comp.as_js(@operands[0], :want($T_OBJ), :$cps);
 
@@ -1161,7 +1231,7 @@
         my @body_args;
         my $arity := @operands[1].arity || 1;
         while $arity > 0 {
-            my $iterval := $*BLOCK.add_tmp();
+            my str $iterval := $*BLOCK.add_tmp();
             @body_args.push(Chunk.new($T_OBJ, $iterval, ["$iterval = $iterator.\$\$shift();\n"]));
             $arity := $arity - 1;
         }
@@ -1176,9 +1246,9 @@
 
         if nqp::istype($body, ChunkCPS) {
             # TODO handle_control
-            my $cont := $comp.unique_var('cont');
-            my $result := $comp.unique_var('result');
-            my $loop := $comp.unique_var('cont');
+            my str $cont := $comp.unique_var('cont');
+            my str $result := $comp.unique_var('result');
+            my str $loop := $comp.unique_var('cont');
 
             ChunkCPS.new($T_OBJ, $result, [
                 $list,
@@ -1210,7 +1280,7 @@
         add_op($op, sub ($comp, $node, :$want, :$cps) {
             #TODO CPS
             my $label;
-            my $handler := 1;
+            my int $handler := 1;
             my @operands;
             for $node.list {
                 if $_.named eq 'nohandler' { $handler := 0; }
@@ -1218,34 +1288,53 @@
                 else { @operands.push($_) }
             }
 
-            return $comp.NYI("3 argument $op") if +@operands == 3;
-            # TODO - return value
-            # TODO while ... -> $cond {} 
+            return $comp.NYI("3 argument $op") if +@operands == 3 && $op ne 'while';
 
             my $loop := LoopInfo.new($*LOOP, :$label);
 
-            my $cond;
+
+            my int $cond_type := needs_cond_passed($node[1]) ?? $T_OBJ !! $T_BOOL;
+
+
+            my $check_cond;
             my $body;
             {
                 my $*LOOP := $loop;
-                $cond := $comp.as_js(@operands[0], :want($T_BOOL));
-                $body := $comp.as_js(@operands[1], :want($T_VOID));
+                my $cond := $comp.as_js(@operands[0], :want($T_BOOL));
+                $check_cond := $comp.coerce($cond, $T_BOOL);
+                my $cond_without_sideeffects := Chunk.new($cond.type, $cond.expr);
+
+                if needs_cond_passed(@operands[1]) {
+                    my $block := try $*BLOCK;
+                    my $loop := try $*LOOP;
+                    $body := $comp.compile_block(@operands[1], $block, $loop, :want($T_VOID), :extra_args([$cond_without_sideeffects]));
+                }
+                else {
+                    $body := $comp.as_js(@operands[1], :want($T_VOID), :$cps);
+                }
+            }
+
+
+            my $post := '';
+
+            if +@operands == 3 {
+                $post := Chunk.void('(function() {', $comp.as_js(@operands[2], :want($T_VOID)), '})()');
             }
 
             if $op eq 'while' || $op eq 'until' {
-                my $neg := $op eq 'while' ?? '!' !! '';
+                my str $neg := $op eq 'while' ?? '!' !! '';
 
                 # handle_control can set redo so we call it here
                 my $handled := $comp.handle_control($loop, $body);
                 Chunk.void(
-                    "for (;;) \{\n",
+                    "for (;;", $post, ") \{\n",
                     ($loop.has_redo
                         ?? "if ({$loop.redo}) \{;\n"
                             ~ "{$loop.redo} = false;\n"
                             ~  "\} else \{\n"
                         !! ''), 
-                    $cond,
-                    "if ($neg {$cond.expr}) \{break;\}\n",
+                    $check_cond,
+                    "if ($neg {$check_cond.expr}) \{break;\}\n",
                     ($loop.has_redo ?? "\}\n" !! ''),
                     $handled,
                     "\}"
@@ -1253,12 +1342,12 @@
             }
             else {
                 # TODO redo
-                my $neg := $op eq 'repeat_while' ?? '' !! '!';
+                my str $neg := $op eq 'repeat_while' ?? '' !! '!';
                 Chunk.void(
                     "do \{\n",
                     $body,
-                    $cond,
-                    "\} while ($neg {$cond.expr});"
+                    $check_cond,
+                    "\} while ($neg {$check_cond.expr});"
                 );
             }
         });
@@ -1288,7 +1377,7 @@
         my str $type := $node[1];
 
 
-        my $result := $*BLOCK.add_tmp;
+        my str $result := $*BLOCK.add_tmp;
         if $type ne 'RETURN' {
             $comp.NYI("handlepayload with type '$type'");
         }
@@ -1424,7 +1513,9 @@
     %ops<usecapture> := %ops<savecapture>;
 
     add_simple_op('getlexdyn', $T_OBJ, [$T_STR], sub ($name) {"{$*CTX}.lookupDynamicFromCaller($name)"});
-    add_simple_op('getlexcaller', $T_OBJ, [$T_STR], sub ($name) {"{$*CTX}.lookupFromSomeCaller($name)"});
+    add_simple_op('getlexreldyn', $T_OBJ, [$T_OBJ, $T_STR], sub ($ctx, $name) {"$ctx.lookupDynamic($name)"});
+    add_simple_op('getlexcaller', $T_OBJ, [$T_STR], sub ($name) {"{$*CTX}.\$\$caller.lookupWithCallers($name)"});
+    add_simple_op('getlexrelcaller', $T_OBJ, [$T_OBJ, $T_STR], sub ($ctx, $name) {"$ctx.lookupWithCallers($name)"});
     add_simple_op('getlexrel', $T_OBJ, [$T_OBJ, $T_STR]);
 
     add_simple_op('captureexistsnamed', $T_INT, [$T_OBJ, $T_STR]);
@@ -1554,7 +1645,7 @@
         if +@($node) != 1 || !nqp::istype($node[0], QAST::SVal) {
             nqp::die('takedispatcher requires one string literal operand');
         }
-        my $var := $node[0].value;
+        my str $var := $node[0].value;
 
         my $set_var := $comp.is_dynamic_var($*BLOCK, QAST::Var.new(:name($var), :scope<lexical>))
             ?? "{$*CTX}.bind({quote_string($var)}, nqp.currentDispatcher);\n" 
@@ -1571,6 +1662,7 @@
     add_simple_op('setdispatcher', $T_VOID, [$T_OBJ], sub ($value) {"nqp.currentDispatcher = $value"}, :side_effects);
     add_simple_op('ctxcaller', $T_OBJ, [$T_OBJ], :!inlinable);
     add_simple_op('ctx', $T_OBJ, [], :!inlinable, sub () {$*CTX});
+    add_simple_op('ctxcode', $T_OBJ, [$T_OBJ], :!inlinable, sub ($ctx) {"$ctx.codeRef()"});
 
     add_simple_op('lock', $T_OBJ, [$T_OBJ], sub ($lock) {$lock});
     add_simple_op('unlock', $T_OBJ, [$T_OBJ], sub ($lock) {$lock});
@@ -1583,7 +1675,7 @@
             my @possibles := nqp::clone($node.list);
             my $best := @possibles.shift;
             return $best unless %want_char{$type};
-            my $char := %want_char{$type};
+            my str $char := %want_char{$type};
             for @possibles -> $sel, $ast {
                 if nqp::index($sel, $char) >= 0 {
                     $best := $ast;
diff -Nru nqp-2016.11+dfsg/src/vm/js/RegexCompiler.nqp nqp-2016.12+dfsg/src/vm/js/RegexCompiler.nqp
--- nqp-2016.11+dfsg/src/vm/js/RegexCompiler.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/js/RegexCompiler.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -1,27 +1,27 @@
 class RegexCompiler {
     has $!compiler; # a QAST::CompilerJS instance
 
-    has $!label; # the label we will jump to on the next while loop iteration
+    has str $!label; # the label we will jump to on the next while loop iteration
 
-    has $!js_loop_label; # we need this call break to stop the while loop 
+    has str $!js_loop_label; # we need this call break to stop the while loop 
 
-    has $!unique_label; # we need a supply of unique labels
+    has int $!unique_label; # we need a supply of unique labels
 
-    has $!fail_label; # when we fail and need to backtrack
-    has $!done_label; # when we can't backtrack no more
-    has $!initial_label; # when we can't backtrack no more
+    has str $!fail_label; # when we fail and need to backtrack
+    has str $!done_label; # when we can't backtrack no more
+    has str $!initial_label; # when we can't backtrack no more
 
-    has $!cursor;
-    has $!target; # the string we are matching against
-    has $!pos; # the position in $!target we are currently at
+    has str $!cursor;
+    has str $!target; # the string we are matching against
+    has str $!pos; # the position in $!target we are currently at
     has $!cursor_type_runtime; # the register with class of the object in $!cursor
-    has $!bstack;
-    has $!restart;
-    has $!cstack;
-    has $!subcur;
-    has $!rep;
+    has str $!bstack;
+    has str $!restart;
+    has str $!cstack;
+    has str $!subcur;
+    has str $!rep;
 
-    has $!has_cursor_type; # do we know the class of the object in $!cursor at compile time
+    has int $!has_cursor_type; # do we know the class of the object in $!cursor at compile time
     has $!cursor_type; # the class of the object in $!cursor - if we know it at compile time
 
     method set_cursor_var() {
@@ -36,12 +36,12 @@
 
         # TODO better name for $start
         # we need to unpack the array we !cursor_start_all into a bunch of variables 
-        my $start := $*BLOCK.add_tmp();
+        my str $start := $*BLOCK.add_tmp();
 
-        my $jump := $*BLOCK.add_tmp();
-        my $cstack_top := $*BLOCK.add_tmp();
+        my str $jump := $*BLOCK.add_tmp();
+        my str $cstack_top := $*BLOCK.add_tmp();
 
-        my $restart_label := self.new_label;
+        my str $restart_label := self.new_label;
 
         $!has_cursor_type := $node.has_cursor_type();
         if $!has_cursor_type {
@@ -67,8 +67,8 @@
             self.case($!initial_label),
             self.compile_rx($node),
             self.case($restart_label),
-            "$!cstack = $!cursor[\"\$!cstack\"];",
-            "if ($!cstack instanceof nqp.NQPArray) $!cstack = $!cstack.array;\n",
+            "$!cstack = {self.get_cursor_attr($!cursor, '$!cstack')};",
+            "if ($!cstack && $!cstack.\$\$toArray) $!cstack = $!cstack.\$\$toArray;\n",
             self.case($!fail_label),
             "if ($!bstack.length == 0) \{{self.goto($!done_label)}\}\n",
             "$cstack_top = $!bstack.pop();\n",
@@ -123,11 +123,11 @@
     }
 
     method literal($node) {
-        my $const := $node.subtype eq 'ignorecase' ?? nqp::lc($node[0]) !! $node[0];
-        my $qconst := quote_string($const);
-        my $constlen := nqp::chars($const);
-        my $cmpop := $node.negate ?? '==' !! '!=';
-        my $str := "{$!target}.substr({$!pos},$constlen)";
+        my str $const := $node.subtype eq 'ignorecase' ?? nqp::lc($node[0]) !! $node[0];
+        my str $qconst := quote_string($const);
+        my int $constlen := nqp::chars($const);
+        my str $cmpop := $node.negate ?? '==' !! '!=';
+        my str $str := "{$!target}.substr({$!pos},$constlen)";
         if $node.subtype eq 'ignorecase' {
             $str := "$str.toLowerCase()";
         }
@@ -136,9 +136,9 @@
     }
 
     method scan($node) {
-        my $loop := self.new_label;
-        my $scan := self.new_label;
-        my $done := self.new_label;
+        my str $loop := self.new_label;
+        my str $scan := self.new_label;
+        my str $done := self.new_label;
 
         "if ({self.get_cursor_attr($*BLOCK.mangle_local('self'), '$!from')} != -1) \{{self.goto($done)}\}\n"
         ~ self.goto($scan)
@@ -156,10 +156,10 @@
     }
 
     method enumcharlist($node) {
-        my $charlist := quote_string($node[0]);
-        my $testop := $node.negate ?? '!=' !! '==';
+        my str $charlist := quote_string($node[0]);
+        my str $testop := $node.negate ?? '!=' !! '==';
 
-        my $end_of_string := ($node.negate && $node.subtype eq 'zerowidth') ?? "$!pos < $!target.length &&" !! "$!pos >= $!target.length ||";
+        my str $end_of_string := ($node.negate && $node.subtype eq 'zerowidth') ?? "$!pos < $!target.length &&" !! "$!pos >= $!target.length ||";
 
         "if ($end_of_string $charlist.indexOf($!target.substr($!pos,1)) $testop -1) \{{self.fail()}\}"
         ~ ($node.subtype eq 'zerowidth' ?? '' !! "$!pos++;\n")
@@ -202,7 +202,7 @@
             ~ self.cclass_check('CCLASS_WORD', :pos("$!pos-1"));
         }
         elsif $node.subtype eq 'bol' {
-            my $done_label := self.new_label;
+            my str $done_label := self.new_label;
 
             "if ($!pos == 0) \{{self.goto($done_label)}\}\n"
             ~ "if ($!pos >= $!target.length) \{{self.fail}\}\n"
@@ -210,7 +210,7 @@
             ~ self.case($done_label);
         }
         elsif $node.subtype eq 'eol' {
-            my $done_label := self.new_label;
+            my str $done_label := self.new_label;
 
             "if (nqp.op.iscclass({%const_map<CCLASS_NEWLINE>},$!target,$!pos)) \{{self.goto($done_label)}\}\n"
             ~ "if ($!pos != $!target.length) \{{self.fail}\}\n"
@@ -231,8 +231,6 @@
 
 
     method pass($node) {
-        my $name;
-
         my @setup;
         
         @setup.push(
@@ -244,7 +242,7 @@
             @setup.push("," ~ quote_string($node.name));
         } 
         elsif +@($node) == 1 {
-            $name := $!compiler.as_js($node[0], :want($T_STR));
+            my $name := $!compiler.as_js($node[0], :want($T_STR));
             @setup.unshift($name);
             @setup.push(',');
             @setup.push($name.expr);
@@ -264,7 +262,7 @@
         %cclass_code<w>  := %const_map<CCLASS_WORD>;
         %cclass_code<n>  := %const_map<CCLASS_NEWLINE>;
 
-        my $cclass := %cclass_code{ $node.name };
+        my int $cclass := %cclass_code{ $node.name };
         my $code := "if ($!pos >= $!target.length) \{{self.fail()}\}\n";
 
         if $node.name ne '.' {
@@ -321,44 +319,42 @@
     }
 
     method subrule($node) {
-        my $captured := 0;
+        my int $captured := 0;
 
 
         my $call;
 
         if nqp::istype($node[0][0], QAST::SVal) {
             my @args := nqp::clone($node[0].list);
-            my $method := @args.shift.value;
+            my str $method := @args.shift.value;
             my $compiled_args := $!compiler.args(@args, :invocant($!cursor));
 
-            my $invocation := $compiled_args.is_args_array ?? ".apply({$!cursor}," !! '(';
+            my str $invocation := $compiled_args.is_args_array ?? ".apply({$!cursor}," !! '(';
 
             $call := Chunk.new($T_OBJ,
                 $!cursor ~ '[' ~ quote_string($method) ~ "]" ~ $invocation ~ $compiled_args.expr ~ ')',
-                [$compiled_args]);
+                $compiled_args);
         }
         else {
             #TODO think if arguments are possible, etc.
             my $block := $!compiler.as_js($node[0][0], :want($T_OBJ));
-            $call := Chunk.new($T_OBJ, $block.expr ~ ".\$\$call({$*CTX}, null, $!cursor)", [$block]);
+            $call := Chunk.new($T_OBJ, $block.expr ~ ".\$\$call({$*CTX}, null, $!cursor)", $block);
         }
 
-        my $testop := $node.negate ?? '>=' !! '<';
+        my str $testop := $node.negate ?? '>=' !! '<';
 
 
-        my $capture_code := '';
+        my str $capture_code := '';
 
         if $node.subtype ne 'zerowidth' {
-            my $pass_label := self.new_label();
+            my str $pass_label := self.new_label();
             if $node.backtrack eq 'r' {
                 unless $node.subtype eq 'method' {
                     $capture_code := self.mark($pass_label,-1,0) ~ self.case($pass_label);
                 }
             }
             else {
-
-
-                my $back_label := self.new_label();
+                my str $back_label := self.new_label();
 
                 $capture_code := $capture_code
                     ~ self.goto($pass_label)
@@ -402,10 +398,10 @@
 
 
     method subcapture($node) {
-        my $done_label := self.new_label; 
-        my $fail_label := self.new_label; 
+        my str $done_label := self.new_label; 
+        my str $fail_label := self.new_label; 
 
-        my $subcapture_from := $*BLOCK.add_tmp;
+        my str $subcapture_from := $*BLOCK.add_tmp;
 
         Chunk.void(
             self.mark($fail_label,$!pos,0),
@@ -436,15 +432,15 @@
     }
 
     method quant($node) {
-        my $min       := $node.min;
-        my $max       := $node.max;
-        my $needrep   := $min > 1 || $max > 1;
-        my $needmark  := $needrep || $node.backtrack eq 'r';
+        my int $min       := $node.min;
+        my int $max       := $node.max;
+        my int $needrep   := $min > 1 || $max > 1;
+        my int $needmark  := $needrep || $node.backtrack eq 'r';
         my $sep       := $node[1];
-        my $loop := self.new_label;
-        my $done := self.new_label;
+        my str $loop := self.new_label;
+        my str $done := self.new_label;
 
-        my $rep := $*BLOCK.add_tmp();
+        my str $rep := $*BLOCK.add_tmp();
 
         # TODO - think about removing irep
 
@@ -453,8 +449,8 @@
             "";
         }
         elsif $node.backtrack eq 'f' {
-            my $irep := $*BLOCK.add_tmp();
-            my $seplabel := self.new_label;
+            my str $irep := $*BLOCK.add_tmp();
+            my str $seplabel := self.new_label;
 
             Chunk.void(
                 "$rep = 0;\n",
@@ -508,8 +504,8 @@
         my @code;
 
         my $iter     := nqp::iterator($node.list);
-        my $endlabel := self.new_label;
-        my $altlabel := self.new_label;
+        my str $endlabel := self.new_label;
+        my str $altlabel := self.new_label;
         my $acode    := self.compile_rx(nqp::shift($iter));
 
         while $iter {
@@ -538,7 +534,7 @@
         # Calculate all the branches to try, which populates the bstack
         # with the options. Then immediately fail to start iterating it.
 
-        my $end_label := self.new_label;
+        my str $end_label := self.new_label;
 
 
         my @alt_code;
@@ -559,7 +555,9 @@
         Chunk.void(
             "$!subcur = [{nqp::join(',',@alt_labels)}];\n",
              self.mark($end_label, -1, 0),
-             call($!cursor, '!alt', $!pos, quote_string($node.name), "new nqp.NQPArray($!subcur)") ~ ";\n",
+             # use a special array of ints
+             # TODO: use a single persistent one instead of allocating a fresh one
+             call($!cursor, '!alt', $!pos, quote_string($node.name), "nqp.createArray($!subcur)") ~ ";\n",
              self.fail,
              Chunk.void(|@alt_code),
              self.case($end_label),
@@ -569,14 +567,14 @@
 
     method conjseq($node) {
 
-        my $conj_label := self.new_label;
-        my $first_label := self.new_label;
+        my str $conj_label := self.new_label;
+        my str $first_label := self.new_label;
 
         my $iter := nqp::iterator($node.list);
         # make a mark that holds our starting position in the pos slot
 
-        my $start_pos := $*BLOCK.add_tmp;
-        my $end_pos := $*BLOCK.add_tmp;
+        my str $start_pos := $*BLOCK.add_tmp;
+        my str $end_pos := $*BLOCK.add_tmp;
 
         my @code;
 
@@ -651,7 +649,7 @@
     }
 
     method peek($mark, *@regs) {
-        my $code := "var peek = nqp.regexPeek($!bstack, $mark);\n";
+        my str $code := "var peek = nqp.regexPeek($!bstack, $mark);\n";
         for @regs {
             $code := $code ~ "peek++;\n";
             $code := $code ~ "$_ = $!bstack[peek]\n;" if $_ ne '*';
diff -Nru nqp-2016.11+dfsg/src/vm/jvm/QAST/Compiler.nqp nqp-2016.12+dfsg/src/vm/jvm/QAST/Compiler.nqp
--- nqp-2016.11+dfsg/src/vm/jvm/QAST/Compiler.nqp	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/jvm/QAST/Compiler.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -1899,8 +1899,7 @@
     }
 });
 
-# Default ways to box/unbox (for no particular HLL).
-QAST::OperationsJAST.add_hll_box('', $RT_INT, -> $qastcomp {
+QAST::OperationsJAST.add_hll_box('nqp', $RT_INT, -> $qastcomp {
     my $il := JAST::InstructionList.new();
     $il.append($ALOAD_1);
     $il.append(JAST::Instruction.new( :op('invokestatic'), $TYPE_OPS,
@@ -1910,7 +1909,7 @@
         'box_i', $TYPE_SMO, 'Long', $TYPE_SMO, $TYPE_TC ));
     $il
 });
-QAST::OperationsJAST.add_hll_box('', $RT_NUM, -> $qastcomp {
+QAST::OperationsJAST.add_hll_box('nqp', $RT_NUM, -> $qastcomp {
     my $il := JAST::InstructionList.new();
     $il.append($ALOAD_1);
     $il.append(JAST::Instruction.new( :op('invokestatic'), $TYPE_OPS,
@@ -1920,7 +1919,7 @@
         'box_n', $TYPE_SMO, 'Double', $TYPE_SMO, $TYPE_TC ));
     $il
 });
-QAST::OperationsJAST.add_hll_box('', $RT_STR, -> $qastcomp {
+QAST::OperationsJAST.add_hll_box('nqp', $RT_STR, -> $qastcomp {
     my $il := JAST::InstructionList.new();
     $il.append($ALOAD_1);
     $il.append(JAST::Instruction.new( :op('invokestatic'), $TYPE_OPS,
@@ -1930,6 +1929,30 @@
         'box_s', $TYPE_SMO, $TYPE_STR, $TYPE_SMO, $TYPE_TC ));
     $il
 });
+
+# Default ways to box/unbox (for no particular HLL).
+# Boxing and unboxing configuration.
+QAST::OperationsJAST.add_hll_box('', $RT_INT, -> $qastcomp {
+    my $il := JAST::InstructionList.new();
+    $il.append($ALOAD_1);
+    $il.append(JAST::Instruction.new( :op('invokestatic'), $TYPE_OPS,
+        'hllboxtype_i', $TYPE_SMO, 'Long', $TYPE_TC ));
+    $il
+});
+QAST::OperationsJAST.add_hll_box('', $RT_NUM, -> $qastcomp {
+    my $il := JAST::InstructionList.new();
+    $il.append($ALOAD_1);
+    $il.append(JAST::Instruction.new( :op('invokestatic'), $TYPE_OPS,
+        'hllboxtype_n', $TYPE_SMO, 'Double', $TYPE_TC ));
+    $il
+});
+QAST::OperationsJAST.add_hll_box('', $RT_STR, -> $qastcomp {
+    my $il := JAST::InstructionList.new();
+    $il.append($ALOAD_1);
+    $il.append(JAST::Instruction.new( :op('invokestatic'), $TYPE_OPS,
+        'hllboxtype_s', $TYPE_SMO, $TYPE_STR, $TYPE_TC ));
+    $il
+});
 QAST::OperationsJAST.add_hll_unbox('', $RT_INT, -> $qastcomp {
     my $il := JAST::InstructionList.new();
     $il.append($ALOAD_1);
diff -Nru nqp-2016.11+dfsg/src/vm/jvm/runtime/org/perl6/nqp/io/FileHandle.java nqp-2016.12+dfsg/src/vm/jvm/runtime/org/perl6/nqp/io/FileHandle.java
--- nqp-2016.11+dfsg/src/vm/jvm/runtime/org/perl6/nqp/io/FileHandle.java	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/jvm/runtime/org/perl6/nqp/io/FileHandle.java	2016-12-17 14:45:43.000000000 +0000
@@ -91,6 +91,8 @@
         } catch (IllegalArgumentException e) {
             throw ExceptionHandling.dieInternal(tc, e);
         }
+        /* Reset readBuffer since content is out of sync after fc.position. */
+        readBuffer = null;
     }
     
     public long tell(ThreadContext tc) {
diff -Nru nqp-2016.11+dfsg/src/vm/jvm/runtime/org/perl6/nqp/io/SyncHandle.java nqp-2016.12+dfsg/src/vm/jvm/runtime/org/perl6/nqp/io/SyncHandle.java
--- nqp-2016.11+dfsg/src/vm/jvm/runtime/org/perl6/nqp/io/SyncHandle.java	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/jvm/runtime/org/perl6/nqp/io/SyncHandle.java	2016-12-17 14:45:43.000000000 +0000
@@ -227,12 +227,13 @@
 
     public synchronized String getc(ThreadContext tc) {
         try {
+            dec.reset();
             int maxBytes = (int)enc.maxBytesPerChar();
             ByteBuffer toDecode = ByteBuffer.allocate(maxBytes);
             CharBuffer decoded = CharBuffer.allocate(1);
             for (int i = 0; i < maxBytes; i++) {
-                /* Ensure we have a read buffer available. */
-                if (readBuffer == null) {
+                /* Ensure we have a (non empty) read buffer available. */
+                if ( readBuffer == null || readBuffer.remaining() == 0 ) {
                     readBuffer = ByteBuffer.allocate(32768);
                     if (chan.read(readBuffer) == -1) {
                         /* End of file. */
diff -Nru nqp-2016.11+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/ExceptionHandling.java nqp-2016.12+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/ExceptionHandling.java
--- nqp-2016.11+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/ExceptionHandling.java	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/ExceptionHandling.java	2016-12-17 14:45:43.000000000 +0000
@@ -309,11 +309,11 @@
             String kls = info.compUnit.getClass().getName();
             String method = info.methodName;
 
-            while (jcursor < ex.nativeTrace.length && !kls.equals(ex.nativeTrace[jcursor].getClassName()) &&
+            while (ex.nativeTrace != null && jcursor < ex.nativeTrace.length && !kls.equals(ex.nativeTrace[jcursor].getClassName()) &&
                         (method == null || !method.equals(ex.nativeTrace[jcursor].getMethodName())))
                 jcursor++;
 
-            StackTraceElement el = jcursor < ex.nativeTrace.length ? ex.nativeTrace[jcursor++] : null;
+            StackTraceElement el = ex.nativeTrace != null && jcursor < ex.nativeTrace.length ? ex.nativeTrace[jcursor++] : null;
 
             result.add(new TraceElement(ncursor, el != null ? el.getFileName() : null, el != null ? el.getLineNumber() : -1));
             ncursor = ncursor.caller;
diff -Nru nqp-2016.11+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/IndyBootstrap.java nqp-2016.12+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/IndyBootstrap.java
--- nqp-2016.11+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/IndyBootstrap.java	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/IndyBootstrap.java	2016-12-17 14:45:43.000000000 +0000
@@ -508,9 +508,6 @@
         /* Try to resolve method to a coderef. */
         SixModelObject invocant = (SixModelObject)args[0];
         SixModelObject invokee = Ops.findmethod(invocant, name, tc);
-        if (invokee == null)
-            throw ExceptionHandling.dieInternal(tc,
-                "Method '" + name + "' not found for invocant of class '" + Ops.typeName(invocant, tc) + "'");
         CodeRef cr;
         if (invokee instanceof CodeRef) {
             cr = (CodeRef)invokee;
@@ -573,9 +570,6 @@
         }
         else {
             SixModelObject invokee = Ops.findmethod(invocant, name, tc);
-            if (invokee == null)
-                throw ExceptionHandling.dieInternal(tc,
-                    "Method '" + name + "' not found for invocant of class '" + Ops.typeName(invocant, tc) + "'");
 
             if (invokee instanceof CodeRef) {
                 cr = (CodeRef)invokee;
@@ -640,9 +634,6 @@
         /* Try to resolve method to a coderef. */
         SixModelObject invocant = (SixModelObject)args[0];
         SixModelObject invokee = Ops.findmethod(invocant, name, tc);
-        if (invokee == null)
-            throw ExceptionHandling.dieInternal(tc,
-                "Method '" + name + "' not found for invocant of class '" + Ops.typeName(invocant, tc) + "'");
         CodeRef cr;
         if (invokee instanceof CodeRef) {
             cr = (CodeRef)invokee;
diff -Nru nqp-2016.11+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/NativeCallOps.java nqp-2016.12+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/NativeCallOps.java
--- nqp-2016.11+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/NativeCallOps.java	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/NativeCallOps.java	2016-12-17 14:45:43.000000000 +0000
@@ -497,7 +497,7 @@
             /* TODO: Handle encodings. */
             o = Ops.decont(o, tc);
             if (Ops.isconcrete(o, tc) == 0) return null;
-            SixModelObject meth = Ops.findmethod(o, "cstr", tc);
+            SixModelObject meth = Ops.findmethodNonFatal(o, "cstr", tc);
             if (meth != null) {
                 Ops.invokeDirect(tc, meth, new CallSiteDescriptor(new byte[] { ARG_OBJ }, null), new Object[] { o });
                 CStrInstance cstr = (CStrInstance) Ops.decont(Ops.result_o(tc.resultFrame()), tc);
diff -Nru nqp-2016.11+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java nqp-2016.12+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java
--- nqp-2016.11+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java	2016-12-17 14:45:43.000000000 +0000
@@ -2509,7 +2509,7 @@
     public static SixModelObject hllhash(ThreadContext tc) {
         return tc.curFrame.codeRef.staticInfo.compUnit.hllConfig.hashType;
     }
-    public static SixModelObject findmethod(ThreadContext tc, SixModelObject invocant, String name) {
+    public static SixModelObject findmethodInCache(ThreadContext tc, SixModelObject invocant, String name) {
         if (invocant == null)
             throw ExceptionHandling.dieInternal(tc, "Cannot call method '" + name + "' on a null object");
         invocant = decont(invocant, tc);
@@ -2521,6 +2521,13 @@
         return meth;
     }
     public static SixModelObject findmethod(SixModelObject invocant, String name, ThreadContext tc) {
+        SixModelObject method = findmethodNonFatal(invocant, name, tc);
+        if (method == null)
+                throw ExceptionHandling.dieInternal(tc,
+                    "Method '" + name + "' not found for invocant of class '" + typeName(invocant, tc) + "'");
+        return method;
+    }
+    public static SixModelObject findmethodNonFatal(SixModelObject invocant, String name, ThreadContext tc) {
         if (invocant == null)
             throw ExceptionHandling.dieInternal(tc, "Cannot call method '" + name + "' on a null object");
         invocant = decont(invocant, tc);
@@ -2546,12 +2553,12 @@
     public static String typeName(SixModelObject invocant, ThreadContext tc) {
         invocant = decont(invocant, tc);
         SixModelObject how = invocant.st.HOW;
-        SixModelObject nameMeth = findmethod(tc, how, "name");
+        SixModelObject nameMeth = findmethodInCache(tc, how, "name");
         invokeDirect(tc, nameMeth, howObjCallSite, new Object[] { how, invocant });
         return result_s(tc.curFrame);
     }
     public static long can(SixModelObject invocant, String name, ThreadContext tc) {
-        return findmethod(invocant, name, tc) == null ? 0 : 1;
+        return findmethodNonFatal(invocant, name, tc) == null ? 0 : 1;
     }
     public static long eqaddr(SixModelObject a, SixModelObject b) {
         return a == b ? 1 : 0;
@@ -2656,7 +2663,7 @@
         /* If we get here, need to call .^type_check on the value we're
          * checking. */
         if (cache == null || (typeCheckMode & STable.TYPE_CHECK_CACHE_THEN_METHOD) != 0) {
-            SixModelObject tcMeth = findmethod(obj.st.HOW, "type_check", tc);
+            SixModelObject tcMeth = findmethodNonFatal(obj.st.HOW, "type_check", tc);
             if (tcMeth == null)
                 return 0;
                 /* TODO: Review why the following busts stuff. */
@@ -2675,7 +2682,7 @@
 
         /* If the flag to call .accepts_type on the target value is set, do so. */
         if ((typeCheckMode & STable.TYPE_CHECK_NEEDS_ACCEPTS) != 0) {
-            SixModelObject atMeth = findmethod(type.st.HOW, "accepts_type", tc);
+            SixModelObject atMeth = findmethodNonFatal(type.st.HOW, "accepts_type", tc);
             if (atMeth == null)
                 throw ExceptionHandling.dieInternal(tc,
                     "Expected accepts_type method, but none found in meta-object");
@@ -2722,6 +2729,26 @@
         return decont(obj, tc).st.REPR.getClass().equals(P6str.class) ? 1 : 0;
     }
 
+    /* HLL aware boxing operations */
+    public static SixModelObject hllboxtype_i(long value, ThreadContext tc) {
+        SixModelObject type = tc.curFrame.codeRef.staticInfo.compUnit.hllConfig.intBoxType;
+        SixModelObject res = type.st.REPR.allocate(tc, type.st);
+        res.set_int(tc, value);
+        return res;
+    }
+    public static SixModelObject hllboxtype_n(double value, ThreadContext tc) {
+        SixModelObject type = tc.curFrame.codeRef.staticInfo.compUnit.hllConfig.numBoxType;
+        SixModelObject res = type.st.REPR.allocate(tc, type.st);
+        res.set_num(tc, value);
+        return res;
+    }
+    public static SixModelObject hllboxtype_s(String value, ThreadContext tc) {
+        SixModelObject type = tc.curFrame.codeRef.staticInfo.compUnit.hllConfig.strBoxType;
+        SixModelObject res = type.st.REPR.allocate(tc, type.st);
+        res.set_str(tc, value);
+        return res;
+    }
+
     /* Attribute operations. */
     public static SixModelObject getattr(SixModelObject obj, SixModelObject ch, String name, ThreadContext tc) {
         try {
@@ -3713,7 +3740,7 @@
         case BoolificationSpec.MODE_UNBOX_NUM:
             return obj instanceof TypeObject || obj.get_num(tc) == 0.0 ? 0 : 1;
         case BoolificationSpec.MODE_UNBOX_STR_NOT_EMPTY:
-            return obj instanceof TypeObject || obj.get_str(tc).equals("") ? 0 : 1;
+            return obj instanceof TypeObject || obj.get_str(tc) == null || obj.get_str(tc).equals("") ? 0 : 1;
         case BoolificationSpec.MODE_UNBOX_STR_NOT_EMPTY_OR_ZERO:
             if (obj instanceof TypeObject)
                 return 0;
@@ -3748,6 +3775,10 @@
     public static String smart_stringify(SixModelObject obj, ThreadContext tc) {
         obj = decont(obj, tc);
 
+        // If it's null, it's "", 'cause that way we at least don't NPE.
+        if (obj == null)
+            return "";
+
         // If it can unbox to a string, that wins right off.
         StorageSpec ss = obj.st.REPR.get_storage_spec(tc, obj.st);
         if ((ss.can_box & StorageSpec.CAN_BOX_STR) != 0 && !(obj instanceof TypeObject))
@@ -3784,6 +3815,10 @@
     public static double smart_numify(SixModelObject obj, ThreadContext tc) {
         obj = decont(obj, tc);
 
+        // If it's null, it's 0.0
+        if (obj == null)
+            return 0.0;
+
         // If it can unbox as an int or a num, that wins right off.
         StorageSpec ss = obj.st.REPR.get_storage_spec(tc, obj.st);
         if ((ss.can_box & StorageSpec.CAN_BOX_INT) != 0)
@@ -6528,7 +6563,7 @@
                 } else {
                     /* Otherwise, do floating point infinity of the right sign. */
                     SixModelObject result = nType.st.REPR.allocate(tc, nType.st);
-                    result.set_num(tc, exponent.mod(BigInteger.valueOf(2)) == BigInteger.ZERO
+                    result.set_num(tc, cmp > 0 || exponent.mod(BigInteger.valueOf(2)) == BigInteger.ZERO
                                         ? Double.POSITIVE_INFINITY
                                         : Double.NEGATIVE_INFINITY);
                     return result;
diff -Nru nqp-2016.11+dfsg/src/vm/jvm/runtime/org/perl6/nqp/sixmodel/reprs/CArray.java nqp-2016.12+dfsg/src/vm/jvm/runtime/org/perl6/nqp/sixmodel/reprs/CArray.java
--- nqp-2016.11+dfsg/src/vm/jvm/runtime/org/perl6/nqp/sixmodel/reprs/CArray.java	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/jvm/runtime/org/perl6/nqp/sixmodel/reprs/CArray.java	2016-12-17 14:45:43.000000000 +0000
@@ -41,7 +41,7 @@
     private void fillREPRData(ThreadContext tc, STable st) {
         CArrayREPRData data = new CArrayREPRData();
 
-        SixModelObject meth = Ops.findmethod(st.WHAT, "of", tc);
+        SixModelObject meth = Ops.findmethodNonFatal(st.WHAT, "of", tc);
         if (meth == null)
             ExceptionHandling.dieInternal(tc, "CArray representation expects an 'of' method, specifying the element type");
 
diff -Nru nqp-2016.11+dfsg/src/vm/moar/HLL/Backend.nqp nqp-2016.12+dfsg/src/vm/moar/HLL/Backend.nqp
--- nqp-2016.11+dfsg/src/vm/moar/HLL/Backend.nqp	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/moar/HLL/Backend.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -86,6 +86,7 @@
         nqp::sayfh(nqp::getstderr(), "Writing profiler output to $filename");
         my $profile_fh := open($filename, :w);
         my $want_json  := nqp::substr($filename, -5) eq '.json';
+        my $want_sql   := nqp::substr($filename, -4) eq '.sql';
 
         my $escaped_backslash;
         my $escaped_dquote;
@@ -162,32 +163,57 @@
             }
         }
 
+        sub sift_down(@a, int $start, int $end) {
+            my int $root := $start;
+
+            while 2*$root + 1 <= $end {
+                my $child := 2*$root + 1;
+                my $swap := $root;
+
+                if @a[$swap] gt @a[$child] {
+                    $swap := $child;
+                }
+                if $child + 1 <= $end && @a[$swap] ge @a[$child + 1] {
+                    $swap := $child + 1;
+                }
+                if $swap == $root {
+                    return;
+                } else {
+                    my str $tmp := @a[$root];
+                    @a[$root] := @a[$swap];
+                    @a[$swap] := $tmp;
+                    $root := $swap;
+                }
+            }
+        }
+
+        # Usually only a small number of keys are seen,
+		# so a bubble sort would be fine. However, the
+		# number can get much larger (e.g., when profiling
+		# a build of the Rakudo settings), so use a heapsort
+		# instead.
         sub sorted_keys($hash) {
             my @keys;
             for $hash {
                 nqp::push(@keys, $_.key);
             }
-            if +@keys == 0 {
-                return @keys;
+
+            my int $count := +@keys;
+            my int $start := $count / 2 - 1;
+            while $start >= 0 {
+                sift_down(@keys, $start, $count - 1);
+                $start := $start - 1;
             }
 
-            # we expect on the order of 6 or 7 keys here, so bubble sort is fine.
-            my int $start := 0;
-            my int $numkeys := +@keys;
-            my str $swap;
-            my int $current;
-            while $start < $numkeys - 1 {
-                $current := 0;
-                while $current < $numkeys - 1 {
-                    if @keys[$current] lt @keys[$current + 1] {
-                        $swap := @keys[$current];
-                        @keys[$current] := @keys[$current + 1];
-                        @keys[$current + 1] := $swap;
-                    }
-                    $current++;
-                }
-                $start++;
+            my int $end := +@keys - 1;
+            while $end > 0 {
+                my str $swap := @keys[$end];
+                @keys[$end] := @keys[0];
+                @keys[0] := $swap;
+                $end := $end - 1;
+                sift_down(@keys, 0, $end);
             }
+
             return @keys;
         }
 
@@ -252,6 +278,68 @@
             }
         }
 
+        sub to_sql($obj) {
+            my @profile;
+            for $obj[0] -> $k {
+                my $v := $obj[0]{$k};
+                if nqp::ishash($v) {
+                    nqp::sayfh($profile_fh, "INSERT INTO routines VALUES ('" ~ nqp::join("','", nqp::list(nqp::iterkey_s($k), literal_subst(~$v<name>, "'", "''"), ~$v<line>, ~$v<file>)) ~ "');");
+                }
+                else {
+                    nqp::sayfh($profile_fh, "INSERT INTO allocators VALUES ('" ~ nqp::join("','", nqp::list(nqp::iterkey_s($k), literal_subst(~$v, "'", "''"))) ~ "');");
+                }
+            }
+            for $obj[1] -> $k {
+                my $v := $obj[1]{$k};
+                if $k eq 'total_time' {
+                    @profile[0] := ~$v;
+                }
+                elsif $k eq 'spesh_time' {
+                    @profile[1] := ~$v;
+                }
+                elsif $k eq 'gcs' {
+                    for $v -> $gc {
+                        my @g;
+                        for <time retained_bytes promoted_bytes gen2_roots full cleared_bytes> -> $f {
+                            nqp::push(@g, ~($gc{$f} // 'NULL'));
+                        }
+                        nqp::sayfh($profile_fh, 'INSERT INTO gcs VALUES (' ~ nqp::join(',', @g) ~ ');');
+                    }
+                }
+                elsif $k eq 'call_graph' {
+                    my %callee_rec_depth;
+                    sub collect_callees($caller, %call_graph) {
+                        my @callee := [~$caller];
+                        for <id osr spesh_entries jit_entries inlined_entries inclusive_time exclusive_time entries deopt_one> -> $f {
+                            nqp::push(@callee, ~(%call_graph{$f} // 'NULL'));
+                        }
+                        my str $id := ~%call_graph<id>;
+                        %callee_rec_depth{$id} := 0 unless %callee_rec_depth{$id};
+                        nqp::push(@callee, ~%callee_rec_depth{$id});
+                        nqp::sayfh($profile_fh, 'INSERT INTO callees VALUES (' ~ nqp::join(',', @callee) ~ ');');
+                        if %call_graph<allocations> {
+                            for %call_graph<allocations> -> $a {
+                                my @a;
+                                for <id spesh jit count> -> $f {
+                                    nqp::push(@a, ~($a{$f} // 'NULL'));
+                                }
+                                nqp::sayfh($profile_fh, 'INSERT INTO allocations VALUES (' ~ nqp::join(',', @a) ~ ');');
+                            }
+                        }
+                        if %call_graph<callees> {
+                            %callee_rec_depth{$id}++;
+                            for %call_graph<callees> -> $c {
+                                collect_callees($id, $c);
+                            }
+                            %callee_rec_depth{$id}--;
+                        }
+                    }
+                    collect_callees(-1, $v);
+                }
+            }
+            nqp::sayfh($profile_fh, 'INSERT INTO profile VALUES (' ~ nqp::join(',', @profile) ~ ');');
+        }
+
         # Post-process the call data, turning objects into flat data.
         for $data {
             post_process_call_graph_node($_<call_graph>);
@@ -263,6 +351,17 @@
             to_json($data);
             nqp::printfh($profile_fh, nqp::join('', @pieces));
         }
+        elsif $want_sql {
+            nqp::sayfh($profile_fh, 'BEGIN;');
+            nqp::sayfh($profile_fh, 'CREATE TABLE allocators(id INTEGER PRIMARY KEY ASC, name TEXT);');
+            nqp::sayfh($profile_fh, 'CREATE TABLE routines(id INTEGER PRIMARY KEY ASC, name TEXT, line INT, file TEXT);');
+            nqp::sayfh($profile_fh, 'CREATE TABLE profile(total_time INT, spesh_time INT);');
+            nqp::sayfh($profile_fh, 'CREATE TABLE gcs(time INT, retained_bytes INT, promoted_bytes INT, gen2_roots INT, full INT, cleared_bytes INT);');
+            nqp::sayfh($profile_fh, 'CREATE TABLE callees(caller_id INT, id INT, osr INT, spesh_entries INT, jit_entries INT, inlined_entries INT, inclusive_time INT, exclusive_time INT, entries INT, deopt_one INT, rec_depth INT);');
+            nqp::sayfh($profile_fh, 'CREATE TABLE allocations(id INT, spesh INT, jit INT, count INT);');
+            to_sql($data);
+            nqp::sayfh($profile_fh, 'END;');
+        }
         else {
             # Get profiler template, split it in half, and write those either
             # side of the JSON itself.
diff -Nru nqp-2016.11+dfsg/src/vm/moar/profiler/template.html nqp-2016.12+dfsg/src/vm/moar/profiler/template.html
--- nqp-2016.11+dfsg/src/vm/moar/profiler/template.html	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/moar/profiler/template.html	2016-12-17 14:45:43.000000000 +0000
@@ -5,8 +5,8 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>MoarVM Profiler Results</title>
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css">
     <style>
     body {
       min-height: 500px;
@@ -702,8 +702,8 @@
       </div>
     </div>
 
-    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.2/angular.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.13.4/ui-bootstrap-tpls.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/2.2.0/ui-bootstrap-tpls.js"></script>
     <script>
     var rawData = JSON.parse('{{{PROFILER_OUTPUT}}}');
 
diff -Nru nqp-2016.11+dfsg/src/vm/moar/QAST/QASTOperationsMAST.nqp nqp-2016.12+dfsg/src/vm/moar/QAST/QASTOperationsMAST.nqp
--- nqp-2016.11+dfsg/src/vm/moar/QAST/QASTOperationsMAST.nqp	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/src/vm/moar/QAST/QASTOperationsMAST.nqp	2016-12-17 14:45:43.000000000 +0000
@@ -2773,6 +2773,7 @@
 QAST::MASTOperations.add_core_moarop_mapping('markcodestub', 'markcodestub');
 QAST::MASTOperations.add_core_moarop_mapping('getstaticcode', 'getstaticcode');
 QAST::MASTOperations.add_core_moarop_mapping('getcodecuid', 'getcodecuid');
+QAST::MASTOperations.add_core_moarop_mapping('captureinnerlex', 'captureinnerlex', 0);
 
 # language/compiler ops
 QAST::MASTOperations.add_core_moarop_mapping('getcomp', 'getcomp');
diff -Nru nqp-2016.11+dfsg/t/hll/06-sprintf.t nqp-2016.12+dfsg/t/hll/06-sprintf.t
--- nqp-2016.11+dfsg/t/hll/06-sprintf.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/hll/06-sprintf.t	2016-12-17 14:45:43.000000000 +0000
@@ -24,7 +24,7 @@
     }
 }
 
-plan(265);
+plan(271);
 
 is(nqp::sprintf('Walter Bishop', []), 'Walter Bishop', 'no directives' );
 
@@ -59,7 +59,7 @@
 my $large-positive-int := nqp::pow_I(nqp::box_i(33, $knowhow), nqp::box_i(21, $knowhow), $knowhow, $knowhow);
 # my $large-negative-int := fromnum_I(-nqp::pow_n(2.42, 42), $knowhow);
 
-    
+
 is(nqp::sprintf('<%6s>', [12]), '<    12>', 'right-justified %s with space padding');
 is(nqp::sprintf('<%6%>', []), '<     %>', 'right-justified %% with space padding');
 is(nqp::sprintf('<%06s>', ['hi']), '<0000hi>', 'right-justified %s with 0-padding');
@@ -299,7 +299,7 @@
 is(nqp::sprintf('%17.3e', [2.718281828459e+12]), '        2.718e+12', '%17.3e 2.718281828459e+12');
 is(nqp::sprintf('%17.3f', [2.718281828459e+12]), '2718281828459.000', '%17.3f 2.718281828459e+12');
 is(nqp::sprintf('%17.3g', [2.718281828459e+12]), '         2.72e+12', '%17.3g 2.718281828459e+12');
-                                                  
+
 is(nqp::sprintf('%17.3g', [3.000000000000e-12]), '            3e-12', '%17.3g 3.000000000000e-12');
 is(nqp::sprintf('%17.3g', [3.000000000000e-11]), '            3e-11', '%17.3g 3.000000000000e-11');
 is(nqp::sprintf('%17.3g', [3.000000000000e-10]), '            3e-10', '%17.3g 3.000000000000e-10');
@@ -328,3 +328,13 @@
 
 is(nqp::sprintf('%2$d %1$d',    [12, 34]),  '34 12', 'parameter index');
 is(nqp::sprintf('%3$d %d %1$d', [1, 2, 3]), '3 1 1', 'parameter index');
+
+# RT#128821: https://rt.perl.org/Ticket/Display.html?id=128821
+{ # negative/positive zero differentiation
+    is(nqp::sprintf('%f', [-0e0]), '-0.000000',     '%f, -0e0');
+    is(nqp::sprintf('%f', [ 0e0]),  '0.000000',     '%f, +0e0');
+    is(nqp::sprintf('%e', [-0e0]), '-0.000000e+00', '%e, -0e0');
+    is(nqp::sprintf('%e', [ 0e0]),  '0.000000e+00', '%e, +0e0');
+    is(nqp::sprintf('%g', [-0e0]), '-0',            '%g, -0e0');
+    is(nqp::sprintf('%g', [ 0e0]),  '0',            '%g, +0e0');
+}
diff -Nru nqp-2016.11+dfsg/t/moar/02-qast-references.t nqp-2016.12+dfsg/t/moar/02-qast-references.t
--- nqp-2016.11+dfsg/t/moar/02-qast-references.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/moar/02-qast-references.t	2016-12-17 14:45:43.000000000 +0000
@@ -418,9 +418,9 @@
         ok(nqp::iseq_i(nqp::atpos($r, 1), 3), 'can use num lexicalref as int');
         ok(nqp::iseq_i(nqp::atpos($r, 2), 6), 'can use str lexicalref as int');
 
-        ok(nqp::atpos($r, 0) == 7, 'can use num lexicalref as num');
+        ok(nqp::atpos($r, 0) == 7, 'can use int lexicalref as num');
         ok(nqp::atpos($r, 1) == 3.14, 'can use num lexicalref as num');
-        ok(nqp::atpos($r, 2) == 6, 'can use num lexicalref as num');
+        ok(nqp::atpos($r, 2) == 6, 'can use str lexicalref as num');
 
         ok(nqp::atpos($r, 0) eq '7', 'can use int lexicalref as str');
         ok(nqp::atpos($r, 1) eq '3.14', 'can use num lexicalref as str');
diff -Nru nqp-2016.11+dfsg/t/nqp/012-logical.t nqp-2016.12+dfsg/t/nqp/012-logical.t
--- nqp-2016.11+dfsg/t/nqp/012-logical.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/nqp/012-logical.t	2016-12-17 14:45:43.000000000 +0000
@@ -2,7 +2,7 @@
 
 # check '||', '&&', and '//'
 
-plan(7);
+plan(15);
 
 my $or_no_branch := 1;
 $or_no_branch || ( $or_no_branch := 0 );
@@ -31,3 +31,15 @@
 my $err_branch;
 $err_branch // ( $err_branch := 1 );
 ok($err_branch == 1, "logical // takes branch on undef");
+
+is(nqp::xor("100", ""), "100", "nqp::xor returns the true argument - first");
+is(nqp::xor("", "100"), "100", "nqp::xor returns the true argument - second");
+is(nqp::xor(0, 0.0, nqp::list(), "", "100", "", nqp::null()), "100", "nqp::xor returns the true argument - one of many");
+ok(nqp::isnull(nqp::xor("100", "200")), "nqp::xor with 2 true arguments returns null");
+ok(nqp::isnull(nqp::xor("100", "200", "300")), "nqp::xor with 3 true arguments returns null");
+
+is(nqp::xor("100", "", "200", :false("300"), "300"), "300", ":false is used when there are multiple true ones");
+
+ok(nqp::islist(nqp::xor(0, 0.0, :false("150"), nqp::list())), "when all the arguments to xor are false return the last one");
+
+is(nqp::xor('', 'hi', :false("150")), 'hi', 'xor returns the only true argument even if there is a :false pased');
diff -Nru nqp-2016.11+dfsg/t/nqp/014-while.t nqp-2016.12+dfsg/t/nqp/014-while.t
--- nqp-2016.11+dfsg/t/nqp/014-while.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/nqp/014-while.t	2016-12-17 14:45:43.000000000 +0000
@@ -1,6 +1,6 @@
 # while, until statements
 
-plan(14);
+plan(15);
 
 my $a; my $sum;
 
@@ -92,4 +92,11 @@
 };
 ok($sum == 99, 'repeat_until always executes at least once');
 
+my $i := 4;
+my $log := '';
+while $i*10 -> $cond {
+    $i := $i - 1;
+    $log := $log ~ $cond ~ ';';
+}
+is($log, '40;30;20;10;', 'while ... -> $param {...}');
 
diff -Nru nqp-2016.11+dfsg/t/nqp/018-associative.t nqp-2016.12+dfsg/t/nqp/018-associative.t
--- nqp-2016.11+dfsg/t/nqp/018-associative.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/nqp/018-associative.t	2016-12-17 14:45:43.000000000 +0000
@@ -1,6 +1,6 @@
 # check hash access methods
 
-plan(17);
+plan(18);
 
 my %h;
 
@@ -38,5 +38,7 @@
 
 ok(nqp::elems($h) == 2, 'nqp::elems on a hash');
 
+ok($h == 2, 'hash can be converted to number');
+
 ok(nqp::istrue(nqp::hash('foo', 1, 'bar', 2)) == 1, 'a hash with 2 elements is true');
 ok(nqp::istrue(nqp::hash()) == 0, 'a hash with 0 elements is false');
diff -Nru nqp-2016.11+dfsg/t/nqp/019-file-ops.t nqp-2016.12+dfsg/t/nqp/019-file-ops.t
--- nqp-2016.11+dfsg/t/nqp/019-file-ops.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/nqp/019-file-ops.t	2016-12-17 14:45:43.000000000 +0000
@@ -2,7 +2,7 @@
 
 # Test nqp::op file operations.
 
-plan(97);
+plan(100);
 
 ok( nqp::stat('CREDITS', nqp::const::STAT_EXISTS) == 1, 'nqp::stat exists');
 ok( nqp::stat('AARDVARKS', nqp::const::STAT_EXISTS) == 0, 'nqp::stat not exists');
@@ -294,10 +294,13 @@
     nqp::printfh($fh, 'Hello');
     nqp::closefh($fh);
     nqp::symlink($test-file, $test-file ~ '-symlink');
+    ok(!nqp::fileislink($test-file), 'nqp::fileislink on a file that is not a symbolic link');
+    ok(nqp::fileislink($test-file ~ '-symlink'), 'nqp::fileislink on a symbolic link');
     is(nqp::readlink($test-file ~ '-symlink'), $test-file, 'nqp::readlink');
     ok(nqp::stat($test-file ~ '-symlink', nqp::const::STAT_EXISTS), 'the symbolic link should exist');
     ok(nqp::lstat($test-file ~ '-symlink', nqp::const::STAT_EXISTS), 'the symbolic link should exist');
     ok(nqp::stat($test-file ~ '-symlink', nqp::const::STAT_ISLNK), 'the symbolic link should actually *be* a symbolic link');
+    ok(!nqp::stat($test-file, nqp::const::STAT_ISLNK), 'the normal test file should not *be* a symbolic link');
     nqp::unlink($test-file);
     nqp::unlink($test-file ~ '-symlink');
 
diff -Nru nqp-2016.11+dfsg/t/nqp/021-contextual.t nqp-2016.12+dfsg/t/nqp/021-contextual.t
--- nqp-2016.11+dfsg/t/nqp/021-contextual.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/nqp/021-contextual.t	2016-12-17 14:45:43.000000000 +0000
@@ -2,7 +2,7 @@
 
 # Tests for contextual variables
 
-plan(17);
+plan(31);
 
 sub foo() { $*VAR }
 
@@ -108,3 +108,46 @@
     layer1();
 }
 
+{
+    my $*var := 'outermost var';
+    my $*var3 := 'outermost var 3';
+    my $*var4 := 'outermost var 4';
+    my sub top() {
+        my $*var := 'top var';
+        my $*var2 := 'top var 2';
+        my $*var3 := 'top var 3';
+        middle(nqp::ctx());
+    }
+    my &middle;
+    {
+        my $*var3 := 'in outer scope of middle';
+        my $*var4 := 'in outer scope of middle';
+        &middle := sub ($top) {
+            my $*var := 'middle var';
+            my $*var2 := 'middle var 2';
+            bottom($top, nqp::ctx());
+        }
+    }
+    my sub bottom($top, $middle) {
+        my $*var := 'bottom var';
+        my $*var3 := 'bottom var 3';
+
+        is(nqp::getlexreldyn(nqp::ctx(), '$*var'), 'bottom var', 'nqp::getlexreldyn - current context');
+        is(nqp::getlexreldyn($middle, '$*var'), 'middle var', 'nqp::getlexreldyn - caller contex');
+        is(nqp::getlexreldyn($top, '$*var'), 'top var', 'nqp::getlexreldyn - caller of caller ctx');
+        is(nqp::getlexreldyn($top, '$*var2'), 'top var 2', 'nqp::getlexreldyn - checking with different variable name');
+        is(nqp::getlexreldyn($middle, '$*var3'), 'top var 3', 'nqp::getlexreldyn - walks contexts');
+        ok(nqp::isnull(nqp::getlexreldyn($middle, '$*no_such_var')), "nqp::getlexreldyn - null when it can't find var");
+        is(nqp::getlexreldyn(nqp::ctx(), '$*var4'), 'outermost var 4', 'nqp::getlexreldyn - walks contexts');
+
+        is(nqp::getlexrelcaller(nqp::ctx(), '$*var'), 'bottom var', 'nqp::getlexrelcaller - current context');
+        is(nqp::getlexrelcaller($middle, '$*var'), 'middle var', 'nqp::getlexrelcaller - caller contex');
+        is(nqp::getlexrelcaller($top, '$*var'), 'top var', 'nqp::getlexrelcaller - caller of caller ctx');
+        is(nqp::getlexrelcaller($top, '$*var2'), 'top var 2', 'nqp::getlexrelcaller - checking with different variable name');
+        is(nqp::getlexrelcaller($middle, '$*var3'), 'in outer scope of middle', 'nqp::getlexrelcaller - outer of caller');
+        ok(nqp::isnull(nqp::getlexrelcaller($middle, '$*no_such_var')), "nqp::getlexrelcaller - null when it can't find var");
+        is(nqp::getlexrelcaller(nqp::ctx(), '$*var4'), 'outermost var 4', 'nqp::getlexrelcaller - directt outer before outer of caller');
+    }
+
+    top();
+}
diff -Nru nqp-2016.11+dfsg/t/nqp/044-try-catch.t nqp-2016.12+dfsg/t/nqp/044-try-catch.t
--- nqp-2016.11+dfsg/t/nqp/044-try-catch.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/nqp/044-try-catch.t	2016-12-17 14:45:43.000000000 +0000
@@ -2,7 +2,7 @@
 
 # Tests for try and catch
 
-plan(26);
+plan(32);
 
 sub oops($msg = "oops!") { # throw an exception
     nqp::die($msg);
@@ -203,3 +203,41 @@
     200;
 };
 ok($str_try_result eq "", "can get a native str result of a try block that catches an exception");
+
+my $result := try {
+    my $foo;
+    $foo.bar;
+}
+ok(nqp::istype($result, NQPMu), "we get correct return value from a try that catches a missing method");
+
+my int $result_int := try {
+    my $foo;
+    $foo.bar;
+}
+ok($result_int + 0 == 0, "we get correct return value from a try that catches a missing method used as int");
+
+my num $result_num := try {
+    my $foo;
+    $foo.bar;
+}
+ok($result_num + 0 == 0, "we get correct return value from a try that catches a missing method used as num");
+
+my str $result_str := try {
+    my $foo;
+    $foo.bar;
+}
+ok($result_str ~ '' eq '', "we get correct return value from a try that catches a missing method used as str");
+
+{
+    my sub block() {
+        my $exception := nqp::newexception();
+        nqp::setmessage($exception, "a cute exception");
+        nqp::setpayload($exception, "cute payload");
+        nqp::throw($exception);
+    }
+    my sub catch() {
+       is(nqp::getmessage(nqp::exception()), "a cute exception", "nqp::setmessage/nqp::getmessage with calling nqp::handle directly");
+       is(nqp::getpayload(nqp::exception()), "cute payload", "nqp::setpayload/nqp::getpayload with calling nqp::handle directly");
+    }
+    nqp::handle(block(), 'CATCH', catch());
+}
diff -Nru nqp-2016.11+dfsg/t/nqp/047-loop-control.t nqp-2016.12+dfsg/t/nqp/047-loop-control.t
--- nqp-2016.11+dfsg/t/nqp/047-loop-control.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/nqp/047-loop-control.t	2016-12-17 14:45:43.000000000 +0000
@@ -1,6 +1,6 @@
 #! nqp
 
-plan(4);
+plan(5);
 
 my $runs := 0;
 
@@ -42,3 +42,15 @@
     $sum := $_ + $sum;
 }
 ok($runs == 4 && $sum == 321, "last works in for");
+
+{
+    my int $i := 10;
+    my $log := '';
+    nqp::while($i >= 0, nqp::stmts(
+        $log := $log ~ "$i",
+        $i := $i-1,
+        nqp::if($i % 2 == 0, next),
+        $log := $log ~ ":even",
+    ), $log := $log ~ '|');
+    is($log,'10:even|9|8:even|7|6:even|5|4:even|3|2:even|1|0:even|', 'next works correctly with 3 argument while');
+}
diff -Nru nqp-2016.11+dfsg/t/nqp/059-nqpop.t nqp-2016.12+dfsg/t/nqp/059-nqpop.t
--- nqp-2016.11+dfsg/t/nqp/059-nqpop.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/nqp/059-nqpop.t	2016-12-17 14:45:43.000000000 +0000
@@ -2,7 +2,7 @@
 
 # Test nqp::op pseudo-functions.
 
-plan(281);
+plan(286);
 
 ok( nqp::add_i(5,2) == 7, 'nqp::add_i');
 ok( nqp::sub_i(5,2) == 3, 'nqp::sub_i');
@@ -446,12 +446,29 @@
 is(nqp::indexingoptimized("foobar"), "foobar", "nqp::indexingoptimized result is equal to it's argument");
 ok(nqp::isstr(nqp::indexingoptimized(123)), "nqp::indexingoptimized returns a string");
 
-ok(!nqp::isnull(nqp::null_s()));
-skip('JVM failure; fudge for release', 3);
-#ok(!nqp::isnull_s(nqp::null()));
-#ok(nqp::null() eq '');
+ok(!nqp::isnull(nqp::null_s()), "null_s isn't null");
+ok(!nqp::isnull_s(nqp::null()), "null isn't null_s");
+ok(nqp::isstr(nqp::null_s()), "null_s is still a str");
+ok(nqp::null() eq '', "null_s is and empty str");
 {
     my $var := nqp::null_s();
-    ok(nqp::isnull_s($var));
+    ok(nqp::isnull_s($var), "null_s can be stuck into a var and stays null_s");
+}
+ok(nqp::istrue(nqp::null_s()) == 0, "null_s isn't true");
+
+
+if nqp::getcomp('nqp').backend.name eq 'jvm' {
+    skip("with/without are broken on the jvm", 4);
+} else {
+    my class Defined {
+        method defined() { 1 }
+    }
+    my class NotDefined {
+        method defined() { 0 }
+    }
+    is(nqp::with(Defined.new, "good", "bad"), "good");
+    is(nqp::with(NotDefined.new, "good", "bad"), "bad");
+
+    is(nqp::without(Defined.new, "good", "bad"), "bad");
+    is(nqp::without(NotDefined.new, "good", "bad"), "good");
 }
-#ok(nqp::istrue(nqp::null_s()) == 0);
diff -Nru nqp-2016.11+dfsg/t/nqp/060-bigint.t nqp-2016.12+dfsg/t/nqp/060-bigint.t
--- nqp-2016.11+dfsg/t/nqp/060-bigint.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/nqp/060-bigint.t	2016-12-17 14:45:43.000000000 +0000
@@ -1,11 +1,15 @@
 #! nqp
 use nqpmo;
 
-plan(89);
+plan(97);
 
 my $knowhow := nqp::knowhow();
 my $bi_type := $knowhow.new_type(:name('TestBigInt'), :repr('P6bigint'));
 $bi_type.HOW.compose($bi_type);
+
+my $n_type := nqp::knowhow().new_type(:name('TestNum'), :repr('P6num'));
+$n_type.HOW.compose($n_type);
+
 sub str($x) { nqp::tostr_I($x) };
 sub iseq($x, $y) { nqp::iseq_I($x, nqp::box_i($y, $bi_type)) }
 sub box($x) { nqp::box_i($x, $bi_type) }
@@ -64,13 +68,8 @@
 ok(iseq(nqp::mod_I(box(12), box(-5), $bi_type), -3), "mod_I - positive and negative");
 ok(iseq(nqp::mod_I(box(12), box(-4), $bi_type), 0), "mod_I - positive and negative");
 
-if nqp::getcomp('nqp').backend.name eq 'js' {
-    ok(1, "skipping bitand on negative numbers untill the bignum library supports them");
-}
-else {
-    ok(iseq(nqp::bitand_I(nqp::fromstr_I('-1073741825', $one), $one, $one), 1),
-        'Bit ops (RT 109740)');
-}
+ok(iseq(nqp::bitand_I(nqp::fromstr_I('-1073741825', $one), $one, $one), 1),
+    'Bit ops (RT 109740)');
 
 # Now we'll create a type that boxes a P6bigint.
 my $bi_boxer := NQPClassHOW.new_type(:name('TestPerl6Int'), :repr('P6opaque'));
@@ -92,20 +91,47 @@
 ok(nqp::unbox_i(nqp::getattr($box_val_3, $bi_boxer, '$!value')) == 7, "you can extract it and then unbox it");
 
 
-# Note that the last argument to pow_I should be capable of boxing a num,
-# so $bi_type is wrong here. But so far we only test the integer case,
-# so we can get away with it.
-my $big := nqp::pow_I($c, box(42), $bi_type, $bi_type);
+my $big := nqp::pow_I($c, box(42), $n_type, $bi_type);
 is(str($big), '5970554685064519004265641008828923248442340700473500698131071806779372733915289638628729', 'pow (int, positive)');
-ok(iseq(nqp::pow_I(box(0), $big, $bi_type, $bi_type), 0), 'pow 0 ** large_number');
-ok(iseq(nqp::pow_I($one, $big, $bi_type, $bi_type), 1), 'pow 1 ** large_number');
+ok(iseq(nqp::pow_I(box(0), $big, $n_type, $bi_type), 0), 'pow 0 ** large_number');
+
+my $big_even := nqp::fromstr_I('597055468506451900426564100882892324844234070047350069813107180677937273391528963862870004', $bi_boxer);
+my $big_odd := nqp::fromstr_I('597055468506451900426564100882892324844234070047350069813107180677937273391528963862870003', $bi_boxer);
+
+is(str(nqp::pow_I(box(1), $big_even, $n_type, $bi_type)), 1, 'pow 1 ** large_even_number');
+is(str(nqp::pow_I(box(1), $big_odd, $n_type, $bi_type)),  1, 'pow 1 ** large_odd_number');
+
+is(str(nqp::pow_I(box(-1), $big_even, $n_type, $bi_type)), 1, 'pow -1 ** large_even_number');
+is(str(nqp::pow_I(box(-1), $big_odd, $n_type, $bi_type)), -1, 'pow -1 ** large_odd_number');
+
+{
+    my $r := nqp::pow_I(box(-2), $big_even, $n_type, $bi_type);
+    ok($r == nqp::inf() && nqp::istype($r, $n_type), 'pow -2 ** large_even_number');
+}
+{
+    my $r := nqp::pow_I(box(-2), $big_odd, $n_type, $bi_type);
+    ok($r == nqp::neginf() && nqp::istype($r, $n_type), 'pow -2 ** large_odd_number');
+}
+{
+    my $r := nqp::pow_I(box(2), $big_odd, $n_type, $bi_type);
+    ok($r == nqp::inf() && nqp::istype($r, $n_type), 'pow 2 ** large_even_number');
+}
+{
+    my $r := nqp::pow_I(box(2), $big_even, $n_type, $bi_type);
+    ok($r == nqp::inf() && nqp::istype($r, $n_type), 'pow 2 ** large_odd_number');
+}
+
+{
+    my $r := nqp::pow_I(box(2), box(-3), $n_type, $bi_type);
+    ok($r == 0.125 && nqp::istype($r, $n_type), 'pow 2 ** -3');
+}
 
 # test conversion to float
 # try it with 2 ** 100, because that's big enough not to fit into a single
 # int, but can be represented exactly in a double
-$big := nqp::pow_I(box(2), box(100), $bi_type, $bi_type);
+$big := nqp::pow_I(box(2), box(100), $n_type, $bi_type);
 ok(nqp::iseq_n(nqp::tonum_I($big), nqp::pow_n(2, 100)), '2**100 to float');
-$big := nqp::pow_I(box(-2), box(101), $bi_type, $bi_type);
+$big := nqp::pow_I(box(-2), box(101), $n_type, $bi_type);
 ok(nqp::iseq_n(nqp::tonum_I($big), nqp::pow_n(-2, 101)), '(-2)**101 to float');
 # the mantissa can hold much information accurately, so test that too
 my $factor := 123456789;
@@ -148,8 +174,8 @@
 
 ok(nqp::div_In(box(1234500), box(100)) == 12345, 'div_In santiy');
 my $n := nqp::div_In(
-    nqp::pow_I(box(203), box(200), $bi_type, $bi_type),
-    nqp::pow_I(box(200), box(200), $bi_type, $bi_type),
+    nqp::pow_I(box(203), box(200), $n_type, $bi_type),
+    nqp::pow_I(box(200), box(200), $n_type, $bi_type),
 );
 ok(nqp::abs_n($n - 19.6430286394751) < 1e-10, 'div_In with big numbers');
 
diff -Nru nqp-2016.11+dfsg/t/nqp/078-shell.t nqp-2016.12+dfsg/t/nqp/078-shell.t
--- nqp-2016.11+dfsg/t/nqp/078-shell.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/nqp/078-shell.t	2016-12-17 14:45:43.000000000 +0000
@@ -1,4 +1,4 @@
-plan(5);
+plan(6);
 
 my $a := nqp::getenvhash();
 $a<foo> := 123;
@@ -30,3 +30,7 @@
   ok($output ~~ /^123foo/,"passing env variables to child processes works on windows");
 }
 nqp::unlink($tmp-file);
+
+my $ret := nqp::shell("exit 42",nqp::cwd(),nqp::getenvhash(), nqp::null(), nqp::null(), nqp::null(),
+    nqp::const::PIPE_INHERIT_IN + nqp::const::PIPE_INHERIT_OUT + nqp::const::PIPE_INHERIT_ERR);
+is(nqp::bitshiftr_i($ret,8), 42, 'correct return code from shell');
diff -Nru nqp-2016.11+dfsg/t/nqp/079-callercode.t nqp-2016.12+dfsg/t/nqp/079-callercode.t
--- nqp-2016.11+dfsg/t/nqp/079-callercode.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/nqp/079-callercode.t	2016-12-17 14:45:43.000000000 +0000
@@ -1,4 +1,4 @@
-plan(5);
+plan(8);
 
 sub foo_inner() {
   my $caller := nqp::callercode();
@@ -48,3 +48,21 @@
 }
 my $foo := Foo.new();
 $foo.a(1);
+
+sub bottom($mode) {
+    return 'this is bottom' if $mode == 1;
+    nqp::ctx();
+}
+sub middle($mode) {
+    return 'this is middle' if $mode == 1;
+    my $bottom_ctx := bottom(0);
+    is(nqp::ctxcode($bottom_ctx)(1), "this is bottom", 'ctxcode on a ctx from a sub we called');
+    is(nqp::ctxcode(nqp::ctxcaller(nqp::ctx()))(1), 'this is toplevel', 'ctxcode on a caller ctx');
+    is(nqp::ctxcode(nqp::ctx())(1), 'this is middle', 'ctxcode on current ctx');
+}
+sub toplevel($mode) {
+    return 'this is toplevel' if $mode == 1;
+    middle(0);
+}
+
+toplevel(0);
diff -Nru nqp-2016.11+dfsg/t/nqp/093-oo-ops.t nqp-2016.12+dfsg/t/nqp/093-oo-ops.t
--- nqp-2016.11+dfsg/t/nqp/093-oo-ops.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/nqp/093-oo-ops.t	2016-12-17 14:45:43.000000000 +0000
@@ -1,4 +1,4 @@
-plan(16);
+plan(19);
 class Foo {
     method foo() {
         'bar';
@@ -46,3 +46,21 @@
 ok(nqp::objprimspec(num) == 2, 'nqp::objprimspec on num');
 ok(nqp::objprimspec(Foo) == 0, 'nqp::objprimspec on Foo');
 ok(nqp::objprimspec(nqp::null()) == 0, 'nqp::objprimspec on a null');
+
+class Base {
+}
+
+class Extended is Base {
+    has int $!int_attr;
+    has str $!str_attr;
+    has num $!num_attr;
+    method attrs_ok() {
+        ok(nqp::isint($!int_attr), 'test that an new int attr is added');
+        ok(nqp::isstr($!str_attr), 'test that an new str attr is added');
+        ok(nqp::isnum($!num_attr), 'test that an new num attr is added');
+    }
+}
+
+my $obj := Base.new;
+nqp::rebless($obj, Extended);
+$obj.attrs_ok;
diff -Nru nqp-2016.11+dfsg/t/nqp/104-method-cache.t nqp-2016.12+dfsg/t/nqp/104-method-cache.t
--- nqp-2016.11+dfsg/t/nqp/104-method-cache.t	1970-01-01 00:00:00.000000000 +0000
+++ nqp-2016.12+dfsg/t/nqp/104-method-cache.t	2016-12-17 14:45:43.000000000 +0000
@@ -0,0 +1,93 @@
+plan(16);
+
+class TestHOW {
+    has int $!find_method_called;
+    method new_type() {
+        nqp::newtype(self, 'P6opaque');
+    }
+
+    method find_method($obj, $name, :$no_fallback = 0, :$no_trace = 0) {
+        $!find_method_called := $!find_method_called + 1;
+        if $name eq 'find_this' {
+            method () {
+                "found"
+            }
+        } elsif $name eq 'find_with_args' {
+            method (*@args) {
+                is(nqp::join(',', @args), "100,200", "...passing arguments correctly");
+                @args[0] + @args[1];
+            }
+        } else {
+            nqp::null();
+        }
+    }
+
+    method find_method_called() {
+        $!find_method_called;
+    }
+}
+
+my $obj1 := TestHOW.new.new_type;
+
+nqp::setmethcache($obj1, nqp::hash(
+    'foo', sub ($self) {
+        "foo!"
+    }));
+
+nqp::setmethcacheauth($obj1, 1);
+
+is($obj1.foo, "foo!", 'calling a method found in cache');
+ok(nqp::can($obj1, 'foo'), 'nqp::can on a method found in cache');
+ok(!nqp::can($obj1, 'find_this'), 'nqp::can on a method not in cache');
+is($obj1.HOW.find_method_called, 0, '...find_method is not called when the cache is authoritative');
+
+my $exception_thrown_with_auth_cache := 0;
+try {
+    nqp::findmethod($obj1, 'find_this');
+    CATCH {
+        $exception_thrown_with_auth_cache := 1;
+    }
+}
+ok($exception_thrown_with_auth_cache, "can't findmethod that's not in the cache when it's authoritative");
+
+$exception_thrown_with_auth_cache := 0;
+try {
+    $obj1.find_this;
+    CATCH {
+        $exception_thrown_with_auth_cache := 1;
+    }
+}
+ok($exception_thrown_with_auth_cache, "can't call method that's not in the cache when it's authoritative");
+
+my $obj2 := TestHOW.new.new_type;
+nqp::setmethcache($obj2, nqp::hash(
+    'bar', sub ($self) {
+        "bar!"
+    }));
+nqp::setmethcacheauth($obj2, 0);
+
+ok(nqp::can($obj2, 'bar'), 'nqp::can with method found in cache');
+ok(nqp::can($obj2, 'find_this'), 'nqp::can with method found by find_method');
+ok(!nqp::can($obj2, 'baz'), 'nqp::can with method not in cache or found by find_method');
+
+
+ok(nqp::findmethod($obj2, 'find_this')($obj2) eq 'found', 'nqp::findmethod with a method returned by find_method');
+ok(nqp::findmethod($obj2, 'bar')($obj2) eq 'bar!', 'nqp::findmethod with a method from the cache');
+
+my $exception_thrown := 0;
+try {
+    nqp::findmethod($obj2, 'no_such');
+    CATCH {
+        $exception_thrown := 1;
+    }
+}
+
+ok($exception_thrown, 'nqp::findmethod with missing method throws exception');
+
+
+is($obj2.find_this, "found", 'calling a method from find_method directly');
+
+is($obj2.find_with_args('100', '200'), 300, "...got correct return value");
+
+is($obj2.HOW.find_method_called, 6, 'find_method is called the correct amount of times');
+
diff -Nru nqp-2016.11+dfsg/t/qast/01-qast.t nqp-2016.12+dfsg/t/qast/01-qast.t
--- nqp-2016.11+dfsg/t/qast/01-qast.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/qast/01-qast.t	2016-12-17 14:45:43.000000000 +0000
@@ -1,6 +1,6 @@
 use QAST;
 
-plan(100);
+plan(106);
 
 # Following a test infrastructure.
 sub compile_qast($qast) {
@@ -11,15 +11,15 @@
 sub is_qast($qast, $value, $desc) {
     try {
         my $code := compile_qast($qast);
-        ok($code() eq $value, $desc);
+        is($code(), $value, $desc);
         CATCH { ok(0, $desc) }
     }
 }
 sub is_qast_args($qast, @args, $value, $desc) {
     try {
         my $code := compile_qast($qast);
-        ok($code(|@args) eq $value, $desc);
-        CATCH { ok(0, $desc) }
+        is($code(|@args), $value, $desc);
+        CATCH { ok(0, 'Exception in is_qast_arg: ' ~ $! ~ ", test: $desc") }
     }
 }
 sub test_qast_result($qast, $tester) {
@@ -1235,6 +1235,71 @@
 );
 
 if nqp::getcomp('nqp').backend.name eq 'jvm' {
+    skip("with/without are broken on the jvm", 4);
+} else {
+    my class IsDefined {
+        has int $!defined;
+        has $!left;
+        has $!right;
+        method new($defined, $left, $right) {
+            my $obj := nqp::create(self);
+            $obj.BUILD($defined, $left, $right);
+            $obj;
+        }
+        method BUILD($defined, $left, $right) {
+            $!defined := $defined;
+            $!left := $left;
+            $!right := $right;
+        }
+        method defined() {
+            $!defined;
+        }
+        method left() {
+            $!left;
+        }
+        method right() {
+            $!right;
+        }
+    }
+
+    my sub with_arity($arity, $block) {
+        $block.arity($arity);
+        $block;
+    }
+
+    my $test := -> $op {
+        QAST::Block.new(
+            QAST::Var.new( :name<arg>, :scope<local>, :decl<param>),
+            QAST::Op.new(
+                :op($op),
+                QAST::Var.new(:name<arg>, :scope<local>),
+                with_arity(1, QAST::Block.new(
+                    :blocktype<immediate>,
+                    QAST::Op.new(
+                        :op<callmethod>,
+                        :name<left>,
+                        QAST::Var.new(:name<b>, :scope<local>, :decl<param>)
+                    )
+                )),
+                with_arity(1, QAST::Block.new(
+                    :blocktype<immediate>,
+                    QAST::Op.new(
+                        :op<callmethod>,
+                        :name<right>,
+                        QAST::Var.new(:name<b>, :scope<local>, :decl<param>)
+                    )
+                ))
+             )
+        );
+    };
+
+    is_qast_args($test('with'), [IsDefined.new(1, 'good', 'bad')], 'good', 'with op - defined');
+    is_qast_args($test('with'), [IsDefined.new(0, 'good', 'bad')], 'bad', 'with op - not defined');
+    is_qast_args($test('without'), [IsDefined.new(1, 'bad', 'good')], 'good', 'without op - defined');
+    is_qast_args($test('without'), [IsDefined.new(0, 'bad', 'good')], 'bad', 'without op - not defined');
+}
+
+if nqp::getcomp('nqp').backend.name eq 'jvm' {
     skip('children of a QAST::Var with a "param" decl are not implemented', 4);
 }
 else {
@@ -1471,9 +1536,11 @@
     test_qast_result(
         QAST::Block.new(
             QAST::Block.new(
-                QAST::Block.new(
-                    QAST::Var.new( :name('counter'), :scope('lexical') , :decl('statevar'), :value($counter)),
-                    QAST::Var.new( :name('counter'), :scope('lexical'))
+                QAST::Op.new(:op<takeclosure>, # needed for JVM
+                    QAST::Block.new(
+                        QAST::Var.new( :name('counter'), :scope('lexical') , :decl('statevar'), :value($counter)),
+                        QAST::Var.new( :name('counter'), :scope('lexical'))
+                    )
                 )
            )
         ),
@@ -1484,11 +1551,10 @@
             $closure1().inc;
             $closure1().inc;
             is($closure1().get, '103', "statevar is shared between calls to a closures");
-            skip('JVM failure; fudge for release', 3);
-            # is($closure2().get, '100', "a new closure gets it's own copy of the statevar");
+            is($closure2().get, '100', "a new closure gets it's own copy of the statevar");
             $closure2().inc;
-            # is($closure2().get, '101', "...that get preserved across calls");
-            # is($closure1().get, '103', "...and is independent from the first closure");
+            is($closure2().get, '101', "...that get preserved across calls");
+            is($closure1().get, '103', "...and is independent from the first closure");
         }
     );
 
@@ -1571,14 +1637,11 @@
             )
         ),
         -> $r {
-            skip('JVM failure; fudge for release', 2); # ok(nqp::istype($r, $int_boxer), 'an automatically boxed int is of the correct type');
-            # ok($r.twice eq '246', '...and it has the correct value');
+            ok(nqp::istype($r, $int_boxer), 'an automatically boxed int is of the correct type');
+            ok($r.twice eq '246', '...and it has the correct value');
         }
     );
 
-skip('JVM failure; fudge for release', 4);
-exit;
-
     test_qast_result(
         QAST::CompUnit.new(
             :hll<foo>,
@@ -1592,8 +1655,8 @@
             )
         ),
         -> $r {
-#            ok(nqp::istype($r, $num_boxer), 'an automatically boxed num is of the correct type');
-#            ok($r.twice eq '245', '...and it has the correct value');
+            ok(nqp::istype($r, $num_boxer), 'an automatically boxed num is of the correct type');
+            ok($r.twice eq '245', '...and it has the correct value');
         }
     );
 
@@ -1610,8 +1673,24 @@
             )
         ),
         -> $r {
-#            ok(nqp::istype($r, $str_boxer), 'an automatically boxed str is of the correct type');
- #           ok($r.twice eq '244', '...and it has the correct value');
+            ok(nqp::istype($r, $str_boxer), 'an automatically boxed str is of the correct type');
+            ok($r.twice eq '244', '...and it has the correct value');
         }
     );
 }
+
+test_qast_result(
+    QAST::CompUnit.new(
+        :hll<foo>,
+        QAST::Block.new(
+            QAST::Op.new(:op<split>,
+                QAST::SVal.new(value => ':'),
+                QAST::SVal.new(value => 'abc:def')
+            )
+        )
+    ),
+    -> $r {
+        ok(nqp::islist($r), "split returns a list when the hll doesn't define slurpyArray");
+        ok(nqp::atpos($r, 0) eq 'abc' && nqp::atpos($r, 1) eq 'def', "...and it contains the right elements");
+    }
+);
diff -Nru nqp-2016.11+dfsg/t/qregex/rx_syntax nqp-2016.12+dfsg/t/qregex/rx_syntax
--- nqp-2016.11+dfsg/t/qregex/rx_syntax	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/qregex/rx_syntax	2016-12-17 14:45:43.000000000 +0000
@@ -39,3 +39,6 @@
   =abc		abcdef		/LHS of alias must be lvalue/	bare : after ws
 [ =a]		abcdef		/LHS of alias must be lvalue/	bare : after [+sp
 [a| =a]		abcdef		/LHS of alias must be lvalue/	bare : after |+sp
+
+\b          abcdef      /Unsupported/                   bare \b
+\B          abcdef      /Unsupported/                   bare \B
diff -Nru nqp-2016.11+dfsg/t/serialization/01-basic.t nqp-2016.12+dfsg/t/serialization/01-basic.t
--- nqp-2016.11+dfsg/t/serialization/01-basic.t	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/t/serialization/01-basic.t	2016-12-17 14:45:43.000000000 +0000
@@ -1,6 +1,6 @@
 #! nqp
 
-plan(1494);
+plan(1495);
 
 {
     my $sc := nqp::createsc('exampleHandle');
@@ -449,9 +449,13 @@
 
     ok(nqp::scobjcount($dsc) == 1, 'deserialized SC has a single object');
     ok(nqp::istype(nqp::scgetobj($dsc, 0), T8), 'deserialized object has correct type');
-skip('JVM failures; fudge for release', 2);
-    #ok(nqp::isnull(nqp::scgetobj($dsc, 0).cache), 'Multi cache ends up null');
-#    ok(nqp::isnull(nqp::scgetobj($dsc, 0).fh), 'File handle ends up null');
+    if nqp::getcomp('nqp').backend.name eq 'jvm' {
+        skip("accessing a attribute containing a null is broken on the jvm", 2);
+    }
+    else {
+        ok(nqp::isnull(nqp::scgetobj($dsc, 0).cache), 'Multi cache ends up null');
+        ok(nqp::isnull(nqp::scgetobj($dsc, 0).fh), 'File handle ends up null');
+    }
 }
 
 # Serializing an SC with a VMArray
@@ -465,6 +469,7 @@
     my $v := VMArrayClass.new();
     nqp::push($v, 123);
     nqp::push($v, 456);
+    $v[3] := 789;
     add_to_sc($sc, 0, $v);
 
     my $serialized := nqp::serialize($sc, $sh);
@@ -474,18 +479,21 @@
 
     ok(nqp::scobjcount($dsc) == 1, 'deserialized SC has a single object');
     ok(nqp::istype(nqp::scgetobj($dsc, 0), VMArrayClass), 'deserialized array has correct type');
-    is(nqp::elems(nqp::scgetobj($dsc, 0)), 2, 'deserialize array has correct number of elements');
+    is(nqp::elems(nqp::scgetobj($dsc, 0)), 4, 'deserialize array has correct number of elements');
     is(nqp::scgetobj($dsc, 0)[0], 123, '0th element of array is correct');
     is(nqp::scgetobj($dsc, 0)[1], 456, '1st element of array is correct');
+    is(nqp::scgetobj($dsc, 0)[3], 789, '3st element of array is correct');
 }
 
 # integers
-sub round_trip_int_array($seq, $desc, @a) {
-    $seq := 'TEST_SC_' ~ $seq;
+my $seq := 1;
+sub round_trip_int_array($desc, @a) {
+    my $name := 'ROUND_TRIP_SC_' ~ $seq;
+    $seq := $seq + 1;
     $desc := 'for ' ~ $desc ~ ', ';
     my $elems := nqp::elems(@a);
 
-    my $sc := nqp::createsc($seq ~ '_IN');
+    my $sc := nqp::createsc($name ~ '_IN');
     my $sh := nqp::list_s();
 
     class T12 {
@@ -499,7 +507,7 @@
 
     my $serialized := nqp::serialize($sc, $sh);
 
-    my $dsc := nqp::createsc($seq ~ '_OUT');
+    my $dsc := nqp::createsc($name ~ '_OUT');
     nqp::deserialize($serialized, $dsc, $sh, nqp::list(), nqp::null());
 
     ok(nqp::istype(nqp::scgetobj($dsc, 0), T12), $desc ~ 'deserialized object has correct type');
@@ -520,8 +528,7 @@
         nqp::push(@a, $i);
         $i := $i + 1;
     }
-    skip('JVM failures; fudge for release', 519);
-  #  round_trip_int_array(14, 'small integers', @a);
+    round_trip_int_array('small integers', @a);
 }
 
 {
@@ -551,7 +558,7 @@
             nqp::push(@a, nqp::neg_i(nqp::add_i($b, $j)));
             $j := nqp::add_i($j, 1);
         }
-        round_trip_int_array($i + 7, 'integers around 2 ** ' ~ $i, @a);
+        round_trip_int_array('integers around 2 ** ' ~ $i, @a);
         ++$i;
         $b := nqp::add_i($b, $b);
     }
@@ -582,7 +589,7 @@
         nqp::push(@a, nqp::unbox_i($bi));
     }
 
-    round_trip_int_array(70, 'special case integers', @a);
+    round_trip_int_array('special case integers', @a);
 }
 
 {
@@ -593,5 +600,5 @@
         ++$i;
     }
 
-    round_trip_int_array(71, 'integers with one zero bit', @a);
+    round_trip_int_array('integers with one zero bit', @a);
 }
diff -Nru nqp-2016.11+dfsg/t/serialization/04-repossession.t nqp-2016.12+dfsg/t/serialization/04-repossession.t
--- nqp-2016.11+dfsg/t/serialization/04-repossession.t	1970-01-01 00:00:00.000000000 +0000
+++ nqp-2016.12+dfsg/t/serialization/04-repossession.t	2016-12-17 14:45:43.000000000 +0000
@@ -0,0 +1,338 @@
+use nqpmo;
+
+my $plan := 23;
+plan($plan);
+
+if nqp::getcomp('nqp').backend.name eq 'jvm' {
+    skip("This test doesn't work on the jvm", $plan);
+    nqp::exit(0);
+}
+
+sub add_to_sc($sc, $idx, $obj) {
+    nqp::scsetobj($sc, $idx, $obj);
+    nqp::setobjsc($obj, $sc);
+}
+
+
+my $seq := 0;
+sub fresh_sc_name() {
+    $seq := $seq + 1;
+    'TEST_SC_' ~ $seq;
+}
+
+{
+    my $sc1 := fresh_sc_name();
+    my $sc2 := fresh_sc_name();
+
+    my $old_sc := nqp::createsc($sc1);
+    my $old_sh := nqp::list_s();
+
+    my $type := NQPClassHOW.new_type(:name('stable reposses test'), :repr('P6opaque'));
+    $type.HOW.add_parent($type, NQPMu);
+    $type.HOW.compose($type);
+
+    my $m1 := method () { "method cache from the old sc" };
+    nqp::scsetcode($old_sc, 0, $m1);
+    nqp::markcodestatic($m1);
+
+    nqp::setmethcache($type, nqp::hash('foo', $m1));
+
+    add_to_sc($old_sc, 0, $type);
+
+
+    my $old_serialized := nqp::serialize($old_sc, $old_sh);
+
+    my $new_sc := nqp::createsc($sc2);
+    my $new_sh := nqp::list_s();
+
+    my $m2 := method () { "method cache from the new sc" };
+    nqp::scsetcode($new_sc, 0, $m2);
+    nqp::markcodestatic($m2);
+
+    nqp::pushcompsc($new_sc);
+
+    nqp::setmethcache($type, nqp::hash('foo', $m2));
+
+    nqp::popcompsc();
+
+
+    my $new_serialized := nqp::serialize($new_sc, $new_sh);
+
+
+    my $old_dsc := nqp::createsc($sc1);
+
+    nqp::deserialize($old_serialized, $old_dsc, $old_sh, nqp::list($m1), nqp::null());
+
+
+    my $new_obj := nqp::scgetobj($old_dsc, 0);
+
+    is($new_obj.foo, 'method cache from the old sc',
+        'STable from the older context is used before the new one gets loaded');
+
+    my $new_dsc := nqp::createsc($sc2);
+
+    my $conflicts := nqp::list();
+    nqp::deserialize($new_serialized, $new_dsc, $new_sh, nqp::list($m2), $conflicts);
+
+    is($new_obj.foo, 'method cache from the new sc',
+        'STable from the newer context is used when it gets loaded');
+
+    is(nqp::elems($conflicts), 0, "we don't have any conflicts");
+}; # add ; because of a NQP bug
+
+{
+   my class Foo {
+        has int $!int;
+        method set($value) {
+            $!int := $value;
+        }
+        method get() {
+            $!int;
+        }
+    }
+
+    my $sc1 := fresh_sc_name();
+    my $sc2 := fresh_sc_name();
+
+    my $old_sc := nqp::createsc($sc1);
+    my $old_sh := nqp::list_s();
+
+    my $obj := Foo.new;
+
+    $obj.set(123);
+
+    add_to_sc($old_sc, 0, $obj);
+
+
+    my $old_serialized := nqp::serialize($old_sc, $old_sh);
+
+    my $new_sc := nqp::createsc($sc2);
+    my $new_sh := nqp::list_s();
+
+    nqp::pushcompsc($new_sc);
+
+    $obj.set(246);
+
+    nqp::popcompsc();
+
+
+    my $new_serialized := nqp::serialize($new_sc, $new_sh);
+
+
+    my $old_dsc := nqp::createsc($sc1);
+    nqp::deserialize($old_serialized, $old_dsc, $old_sh, nqp::list(), nqp::null());
+
+
+    my $new_obj := nqp::scgetobj($old_dsc, 0);
+    is($new_obj.get, 123, 'the object deserializes and has the value from before the repossesion');
+
+    my $new_dsc := nqp::createsc($sc2);
+
+    my $conflicts := nqp::list();
+    nqp::deserialize($new_serialized, $new_dsc, $new_sh, nqp::list(), $conflicts);
+
+    is($new_obj.get, 246, "the reposses object has a correct value");
+
+    is(nqp::elems($conflicts), 0, "we don't have any conflicts");
+}
+
+{
+   my class Foo {
+        has int $!int;
+        method set($value) {
+            $!int := $value;
+        }
+        method get() {
+            $!int;
+        }
+    }
+
+    my $sc1 := fresh_sc_name();
+    my $sc2 := fresh_sc_name();
+
+    my $old_sc := nqp::createsc($sc1);
+    my $old_sh := nqp::list_s();
+
+    my $obj := Foo.new;
+
+    $obj.set(123);
+
+    ok(nqp::eqaddr(nqp::neverrepossess($obj), $obj), 'nqp::neverrepossess has the correct return value');
+
+    add_to_sc($old_sc, 0, $obj);
+
+
+    my $old_serialized := nqp::serialize($old_sc, $old_sh);
+
+    my $new_sc := nqp::createsc($sc2);
+    my $new_sh := nqp::list_s();
+
+    nqp::pushcompsc($new_sc);
+
+    $obj.set(246);
+
+    nqp::popcompsc();
+
+
+    my $new_serialized := nqp::serialize($new_sc, $new_sh);
+
+
+    my $old_dsc := nqp::createsc($sc1);
+    nqp::deserialize($old_serialized, $old_dsc, $old_sh, nqp::list(), nqp::null());
+
+
+    my $new_obj := nqp::scgetobj($old_dsc, 0);
+    is($new_obj.get, 123, 'the object deserializes and has the value from before the attempted repossesion');
+
+    my $new_dsc := nqp::createsc($sc2);
+
+    my $conflicts := nqp::list();
+    nqp::deserialize($new_serialized, $new_dsc, $new_sh, nqp::list(), $conflicts);
+
+    is($new_obj.get, 123, "neverrepossess prevents the object from being repossessed");
+
+    is(nqp::elems($conflicts), 0, "we don't have any conflicts");
+}
+
+{
+   my class Foo {
+        has int $!int;
+        method set($value) {
+            $!int := $value;
+        }
+        method get() {
+            $!int;
+        }
+    }
+
+    my $sc1 := fresh_sc_name();
+    my $sc2 := fresh_sc_name();
+
+    my $old_sc := nqp::createsc($sc1);
+    my $old_sh := nqp::list_s();
+
+    my $obj := Foo.new;
+    my $obj2 := Foo.new;
+
+    $obj.set(123);
+    $obj2.set(1230);
+
+
+    add_to_sc($old_sc, 0, $obj);
+    add_to_sc($old_sc, 1, $obj2);
+
+
+    my $old_serialized := nqp::serialize($old_sc, $old_sh);
+
+    my $new_sc := nqp::createsc($sc2);
+    my $new_sh := nqp::list_s();
+
+    nqp::pushcompsc($new_sc);
+
+    nqp::scwbdisable();
+
+    $obj.set(246);
+
+    nqp::scwbenable();
+
+    $obj2.set(2460);
+
+
+    nqp::popcompsc();
+
+
+    my $new_serialized := nqp::serialize($new_sc, $new_sh);
+
+
+    my $old_dsc := nqp::createsc($sc1);
+    nqp::deserialize($old_serialized, $old_dsc, $old_sh, nqp::list(), nqp::null());
+
+
+    my $new_obj := nqp::scgetobj($old_dsc, 0);
+    my $new_obj2 := nqp::scgetobj($old_dsc, 1);
+
+    is($new_obj.get, 123, 'the object deserializes and has the value from before the attempted repossesion');
+    is($new_obj2.get, 1230, 'the object deserializes and has the value from before the attempted repossesion');
+
+    my $new_dsc := nqp::createsc($sc2);
+
+    my $conflicts := nqp::list();
+    nqp::deserialize($new_serialized, $new_dsc, $new_sh, nqp::list(), $conflicts);
+
+    is($new_obj.get, 123, "nqp::scwbdisable turns off object repossession");
+    is($new_obj2.get, 2460, "nqp::scwbenable turns on object repossession");
+
+    is(nqp::elems($conflicts), 0, "we don't have any conflicts");
+}
+
+{
+    my class Foo {
+        has int $!int;
+        method set($value) {
+            $!int := $value;
+        }
+        method get() {
+            $!int;
+        }
+    }
+    my class Bar is Foo {
+        has num $!num;
+        method set_num($value) {
+            $!num := $value;
+        }
+        method get_num() {
+            $!num;
+        }
+    }
+
+    my $sc1 := fresh_sc_name();
+    my $sc2 := fresh_sc_name();
+
+    my $old_sc := nqp::createsc($sc1);
+    my $old_sh := nqp::list_s();
+
+    my $obj := Foo.new;
+
+    $obj.set(123);
+
+    add_to_sc($old_sc, 0, $obj);
+
+
+    my $old_serialized := nqp::serialize($old_sc, $old_sh);
+
+    my $new_sc := nqp::createsc($sc2);
+    my $new_sh := nqp::list_s();
+
+    nqp::pushcompsc($new_sc);
+
+    nqp::rebless($obj, Bar);
+    nqp::popcompsc();
+
+    $obj.set_num(246);
+
+
+    my $new_serialized := nqp::serialize($new_sc, $new_sh);
+
+
+    my $old_dsc := nqp::createsc($sc1);
+    nqp::deserialize($old_serialized, $old_dsc, $old_sh, nqp::list(), nqp::null());
+
+
+    my $new_obj := nqp::scgetobj($old_dsc, 0);
+    is($new_obj.get, 123, 'the object deserializes and has the value from before the repossesion');
+    ok(nqp::istype($new_obj, Foo), 'object has the base type before repossession');
+    ok(!nqp::istype($new_obj, Bar), "object doesn't have the subclass type before repossession");
+
+    my $new_dsc := nqp::createsc($sc2);
+
+    my $conflicts := nqp::list();
+    nqp::deserialize($new_serialized, $new_dsc, $new_sh, nqp::list(), $conflicts);
+
+    ok(nqp::istype($new_obj, Foo), 'object has the base type after repossession');
+    ok(nqp::istype($new_obj, Bar), 'object has the subclass type after repossesion');
+
+    is($new_obj.get, 123, "the object has the correct value in an original attribute");
+    is($new_obj.get_num, 246, "the object has the correct value in an added attribute");
+
+    is(nqp::elems($conflicts), 0, "we don't have any conflicts");
+}
diff -Nru nqp-2016.11+dfsg/tools/build/gen-version.pl nqp-2016.12+dfsg/tools/build/gen-version.pl
--- nqp-2016.11+dfsg/tools/build/gen-version.pl	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/tools/build/gen-version.pl	2016-12-17 14:45:43.000000000 +0000
@@ -8,6 +8,9 @@
 
 use POSIX 'strftime';
 
+my $prefix = shift;
+my $libdir = shift;
+
 open(my $fh, '<', 'VERSION') or die $!;
 my $VERSION = <$fh>;
 close($fh);
@@ -26,6 +29,8 @@
 sub hll-config(\$config) {
     \$config<version>    := '$VERSION';
     \$config<build-date> := '$builddate';
+    \$config<prefix>     := '$prefix';
+    \$config<libdir>     := '$libdir';
 }
 END_VERSION
 
diff -Nru nqp-2016.11+dfsg/tools/build/install-moar-runner.pl nqp-2016.12+dfsg/tools/build/install-moar-runner.pl
--- nqp-2016.11+dfsg/tools/build/install-moar-runner.pl	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/tools/build/install-moar-runner.pl	2016-12-17 14:45:43.000000000 +0000
@@ -6,19 +6,17 @@
 use 5.008;
 use File::Spec;
 
-my ($destdir, $prefix) = @ARGV;
+my ($destdir, $prefix, $lib_dir, $moar) = @ARGV;
 my $realpath = $destdir.$prefix;
 
 unless (File::Spec->file_name_is_absolute($prefix)) {
     $prefix = File::Spec->rel2abs($prefix);
 }
 
-my $lib_dir = File::Spec->catfile($prefix, 'share', 'nqp', 'lib');
-my $nqp_mvm = File::Spec->catfile($prefix, 'share', 'nqp', 'lib', 'nqp.moarvm');
+my $nqp_mvm = File::Spec->catfile($lib_dir, 'nqp.moarvm');
 
 if ($^O eq 'MSWin32') {
     my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-m.bat');
-    my $moar       = File::Spec->catfile($prefix, 'bin', 'moar.exe');
     open my $fh, ">", $install_to
         or die "Could not open $install_to: $!";
     print $fh '@ "' . $moar . '" --libpath="' . $lib_dir . '" "' . $nqp_mvm . '" %*' . "\n";
@@ -27,7 +25,6 @@
 }
 else {
     my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-m');
-    my $moar       = File::Spec->catfile($prefix, 'bin', 'moar');
     open my $fh, ">", $install_to
         or die "Could not open $install_to: $!";
     print $fh "#!/bin/sh\n";
diff -Nru nqp-2016.11+dfsg/tools/build/Makefile-common.in nqp-2016.12+dfsg/tools/build/Makefile-common.in
--- nqp-2016.11+dfsg/tools/build/Makefile-common.in	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/tools/build/Makefile-common.in	2016-12-17 14:45:43.000000000 +0000
@@ -104,7 +104,7 @@
 PREFIX          = @prefix@
 BIN_DIR         = $(PREFIX)/bin
 NQP_LANG_DIR    = $(PREFIX)/share/nqp
-NQP_LIB_DIR     = $(NQP_LANG_DIR)/lib
+NQP_LIB_DIR     = @nqplibdir@
 PROVE           = prove
 
 # nqp::makefile <-- tells NQP::Configure to treat this file as a makefile,
diff -Nru nqp-2016.11+dfsg/tools/build/Makefile-JVM.in nqp-2016.12+dfsg/tools/build/Makefile-JVM.in
--- nqp-2016.11+dfsg/tools/build/Makefile-JVM.in	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/tools/build/Makefile-JVM.in	2016-12-17 14:45:43.000000000 +0000
@@ -170,7 +170,7 @@
 
 $(J_STAGE1)/$(NQP_JAR): $(J_STAGE0) $(J_NQP_SOURCES) $(J_STAGE1)/$(P6QREGEX_JAR)
 	$(MKPATH) $(J_STAGE1)
-	$(PERL) tools/build/gen-version.pl > $(J_STAGE1)/nqp-config.nqp
+	$(PERL) tools/build/gen-version.pl $(PREFIX) $(NQP_LIB_DIR) > $(J_STAGE1)/nqp-config.nqp
 	$(PERL) tools/build/gen-cat.pl jvm $(J_NQP_SOURCES) $(J_STAGE1)/nqp-config.nqp > $(J_STAGE1)/$(NQP_COMBINED)
 	$(J_STAGE0_NQP) --module-path=$(J_STAGE1) --setting-path=$(J_STAGE1) \
          --setting=NQPCORE --target=jar --no-regex-lib --javaclass=nqp \
@@ -238,7 +238,7 @@
 
 $(J_STAGE2)/$(NQP_JAR): $(J_STAGE1) $(J_NQP_SOURCES) $(J_STAGE2)/$(P6QREGEX_JAR)
 	$(MKPATH) $(J_STAGE2)
-	$(PERL) tools/build/gen-version.pl > $(J_STAGE2)/nqp-config.nqp
+	$(PERL) tools/build/gen-version.pl $(PREFIX) $(NQP_LIB_DIR) > $(J_STAGE2)/nqp-config.nqp
 	$(PERL) tools/build/gen-cat.pl jvm $(J_NQP_SOURCES) $(J_STAGE2)/nqp-config.nqp > $(J_STAGE2)/$(NQP_COMBINED)
 	$(J_STAGE1_NQP) --module-path=$(J_STAGE2) --setting-path=$(J_STAGE2) \
          --setting=NQPCORE --target=jar --no-regex-lib --javaclass=nqp \
diff -Nru nqp-2016.11+dfsg/tools/build/Makefile-Moar.in nqp-2016.12+dfsg/tools/build/Makefile-Moar.in
--- nqp-2016.11+dfsg/tools/build/Makefile-Moar.in	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/tools/build/Makefile-Moar.in	2016-12-17 14:45:43.000000000 +0000
@@ -1,5 +1,6 @@
 BAT          = @bat@
-MOAR         = $(BIN_DIR)/moar
+MOAR         = @moar@
+MOAR_PREFIX  = @moar_prefix@
 M_RUNNER     = nqp-m$(BAT)
 
 M_STAGE0 = src/vm/moar/stage0
@@ -90,7 +91,7 @@
 	$(CP) $(NQP_MOAR) $(DESTDIR)$(NQP_LIB_DIR)
 	$(CP) $(P5QREGEX_MOAR) $(DESTDIR)$(NQP_LIB_DIR)
 	$(CP) src/vm/moar/profiler/template.html $(DESTDIR)$(NQP_LIB_DIR)/profiler/template.html
-	$(PERL) tools/build/install-moar-runner.pl "$(DESTDIR)" $(PREFIX)
+	$(PERL) tools/build/install-moar-runner.pl "$(DESTDIR)" $(PREFIX) $(NQP_LIB_DIR) $(MOAR)
 
 # FIXME:
 M_CLEANUPS = *.moarvm  gen/moar/* $(M_RUNNER)
@@ -137,15 +138,15 @@
 	    --setting=NQPCORE --no-regex-lib --target=mbc \
 	    --output=$(M_STAGE1)/$(HLL_MOAR) $(M_STAGE1)/$(HLL_COMBINED)
 
-$(M_STAGE1)/$(MASTOPS_MOAR): $(M_STAGE0) $(M_STAGE1)/$(CORE_SETTING_MOAR) @prefix@/share/nqp/lib/MAST/Ops.nqp
+$(M_STAGE1)/$(MASTOPS_MOAR): $(M_STAGE0) $(M_STAGE1)/$(CORE_SETTING_MOAR) @moar_prefix@/share/nqp/lib/MAST/Ops.nqp
 	$(M_STAGE0_NQP) --module-path=$(M_STAGE1) --setting-path=$(M_STAGE1) \
 	    --setting=NQPCORE --no-regex-lib --target=mbc \
-	    --output=$(M_STAGE1)/$(MASTOPS_MOAR) @prefix@/share/nqp/lib/MAST/Ops.nqp
+	    --output=$(M_STAGE1)/$(MASTOPS_MOAR) @moar_prefix@/share/nqp/lib/MAST/Ops.nqp
 
-$(M_STAGE1)/$(MASTNODES_MOAR): $(M_STAGE0) $(M_STAGE1)/$(MASTOPS_MOAR) @prefix@/share/nqp/lib/MAST/Nodes.nqp
+$(M_STAGE1)/$(MASTNODES_MOAR): $(M_STAGE0) $(M_STAGE1)/$(MASTOPS_MOAR) @moar_prefix@/share/nqp/lib/MAST/Nodes.nqp
 	$(M_STAGE0_NQP) --module-path=$(M_STAGE1) --setting-path=$(M_STAGE1) \
 	    --setting=NQPCORE --no-regex-lib --target=mbc \
-	    --output=$(M_STAGE1)/$(MASTNODES_MOAR) @prefix@/share/nqp/lib/MAST/Nodes.nqp
+	    --output=$(M_STAGE1)/$(MASTNODES_MOAR) @moar_prefix@/share/nqp/lib/MAST/Nodes.nqp
 
 $(M_STAGE1)/$(QAST_MOAR): $(M_STAGE0) $(M_QAST_SOURCES) $(M_STAGE1)/$(HLL_MOAR) $(M_STAGE1)/$(MASTNODES_MOAR)
 	$(MKPATH) $(M_STAGE1)/gen
@@ -163,7 +164,7 @@
 
 $(M_STAGE1)/$(NQP_MOAR): $(M_STAGE0) $(M_NQP_SOURCES) $(M_STAGE1)/$(P6QREGEX_MOAR)
 	$(MKPATH) $(M_STAGE1)/gen
-	$(PERL) tools/build/gen-version.pl > $(M_STAGE1)/nqp-config.nqp
+	$(PERL) tools/build/gen-version.pl $(PREFIX) $(NQP_LIB_DIR) > $(M_STAGE1)/nqp-config.nqp
 	$(PERL) tools/build/gen-cat.pl moar $(M_NQP_SOURCES) $(M_STAGE1)/nqp-config.nqp > $(M_STAGE1)/$(NQP_COMBINED)
 	$(M_STAGE0_NQP) --module-path=$(M_STAGE1) --setting-path=$(M_STAGE1) \
 	    --setting=NQPCORE --target=mbc --no-regex-lib \
@@ -208,15 +209,15 @@
 	    --setting=NQPCORE --no-regex-lib --target=mbc \
 	    --output=$(M_STAGE2)/$(HLL_MOAR) $(M_STAGE2)/$(HLL_COMBINED)
 
-$(M_STAGE2)/$(MASTOPS_MOAR): $(M_STAGE1) $(M_STAGE2)/$(CORE_SETTING_MOAR) @prefix@/share/nqp/lib/MAST/Ops.nqp
+$(M_STAGE2)/$(MASTOPS_MOAR): $(M_STAGE1) $(M_STAGE2)/$(CORE_SETTING_MOAR) @moar_prefix@/share/nqp/lib/MAST/Ops.nqp
 	$(M_STAGE1_NQP) --module-path=$(M_STAGE2) --setting-path=$(M_STAGE2) \
 	    --setting=NQPCORE --no-regex-lib --target=mbc \
-	    --output=$(M_STAGE2)/$(MASTOPS_MOAR) @prefix@/share/nqp/lib/MAST/Ops.nqp
+	    --output=$(M_STAGE2)/$(MASTOPS_MOAR) @moar_prefix@/share/nqp/lib/MAST/Ops.nqp
 
-$(M_STAGE2)/$(MASTNODES_MOAR): $(M_STAGE1) $(M_STAGE2)/$(MASTOPS_MOAR) @prefix@/share/nqp/lib/MAST/Nodes.nqp
+$(M_STAGE2)/$(MASTNODES_MOAR): $(M_STAGE1) $(M_STAGE2)/$(MASTOPS_MOAR) @moar_prefix@/share/nqp/lib/MAST/Nodes.nqp
 	$(M_STAGE1_NQP) --module-path=$(M_STAGE2) --setting-path=$(M_STAGE2) \
 	    --setting=NQPCORE --no-regex-lib --target=mbc \
-	    --output=$(M_STAGE2)/$(MASTNODES_MOAR) @prefix@/share/nqp/lib/MAST/Nodes.nqp
+	    --output=$(M_STAGE2)/$(MASTNODES_MOAR) @moar_prefix@/share/nqp/lib/MAST/Nodes.nqp
 
 $(M_STAGE2)/$(QAST_MOAR): $(M_STAGE1) $(M_QAST_SOURCES) $(M_STAGE2)/$(HLL_MOAR) $(M_STAGE2)/$(MASTNODES_MOAR)
 	$(MKPATH) $(M_STAGE2)/gen
@@ -234,7 +235,7 @@
 
 $(M_STAGE2)/$(NQP_MOAR): $(M_STAGE1) $(M_NQP_SOURCES) $(M_STAGE2)/$(P6QREGEX_MOAR)
 	$(MKPATH) $(M_STAGE2)/gen
-	$(PERL) tools/build/gen-version.pl > $(M_STAGE2)/nqp-config.nqp
+	$(PERL) tools/build/gen-version.pl $(PREFIX) $(NQP_LIB_DIR) > $(M_STAGE2)/nqp-config.nqp
 	$(PERL) tools/build/gen-cat.pl moar $(M_NQP_SOURCES) $(M_STAGE2)/nqp-config.nqp > $(M_STAGE2)/$(NQP_COMBINED)
 	$(M_STAGE1_NQP) --module-path=$(M_STAGE2) --setting-path=$(M_STAGE2) \
 	    --setting=NQPCORE --target=mbc --no-regex-lib \
diff -Nru nqp-2016.11+dfsg/tools/build/MOAR_REVISION nqp-2016.12+dfsg/tools/build/MOAR_REVISION
--- nqp-2016.11+dfsg/tools/build/MOAR_REVISION	2016-11-19 16:26:25.000000000 +0000
+++ nqp-2016.12+dfsg/tools/build/MOAR_REVISION	2016-12-17 14:45:43.000000000 +0000
@@ -1 +1 @@
-2016.11
+2016.12
diff -Nru nqp-2016.11+dfsg/VERSION nqp-2016.12+dfsg/VERSION
--- nqp-2016.11+dfsg/VERSION	2016-11-19 16:26:24.000000000 +0000
+++ nqp-2016.12+dfsg/VERSION	2016-12-17 14:45:43.000000000 +0000
@@ -1 +1 @@
-2016.11
+2016.12