Up to date with Allen's latest changes, modulo https://bugs.ecmascript.org/show_bug.cgi?id=2605