diff --git a/manifest b/manifest
index 06e42be717..448d34a0ee 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reduce\sthe\ssize\sof\sExprList\sto\s24-bytes\sper\sentry,\sdown\sfrom\s32-bytes\sper\nentry.\s\sThis\shelps\skeep\slookaside\sallocations\sin\sthe\smini-size.
-D 2019-12-13T01:12:21.115
+C Merge\sfixes\sfrom\strunk.
+D 2019-12-13T12:14:23.880
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -525,14 +525,14 @@ F src/pragma.h ec3b31eac9b1df040f1cc8cb3d89bc06605c3b4cb3d76f833de8d6d6c3f77f04
 F src/prepare.c 6049beb71385f017af6fc320d2c75a4e50b75e280c54232442b785fbb83df057
 F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c 347c0624f83451803530668055665f770afa851a35a09cb429a7a4749c61706f
+F src/resolve.c da68e9e68e60aa786a4a7b67c6e3ca2b8186df1ed1830ba230c94889aa8ac15f
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 3590f0641817f0d3af4211315ff91abd197f7c03ba8d20129388af8dcdb707f3
 F src/shell.c.in 4a3a9e1c11847b1904f2b01d087af1c052f660902755abab457cab1756817ded
 F src/sqlite.h.in 2a23e8161775253d9cf383c2c6aa559005dc787d350dcb0be67a6c4cc3bd1d19
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 72af51aa4e912e14cd495fb6e7fac65f0940db80ed950d90911aff292cc47ce2
-F src/sqliteInt.h 344e090acc6491b86c4e4368dbac3b679ecf169be0675f567c6e72e71895cadf
+F src/sqliteInt.h a036ca4ee94ac0dea82c90b2c902dc84bce187adf75e68284e890bc0c4cd3d95
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c 0fe55b92810509eac821ded2e177e1da944a78cdcdfec7813ad1d6b36d6d667e
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -1852,7 +1852,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e392e7f22861ce4b66e4bf84b59c8fd38568fc241a699e001f47fd82011f4d28 59d0f3afe5249a2a6453fe7bc810c2c7beb896d3800174c7c90f9304c0b1ad88
-R e3ff512e1397b6f86c243712e8e279ca
+P bda92d92bf69a73bc6dd498f92578ad6e81111a3f97bc8724d1720e7283a83b6 c1014e80b26131200a115beb86929a8f0ded2dd65b075e47373346c0f170576a
+R b2be5daabe2de4420861c8338271e7de
 U drh
-Z 3ffe0d20b28fddd879606871dbd0d175
+Z 5e37344191b5a16624379099587382f5
diff --git a/manifest.uuid b/manifest.uuid
index 1f4e273627..69d04cf3ef 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bda92d92bf69a73bc6dd498f92578ad6e81111a3f97bc8724d1720e7283a83b6
\ No newline at end of file
+9c471195f6d3e4b00e2d0f909b306a4036352082dca5f016a8eece226e82163d
\ No newline at end of file
diff --git a/src/resolve.c b/src/resolve.c
index 572e0a9f3c..92a937d45c 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -973,7 +973,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
           Select *pSel = pNC->pWinSelect;
           assert( pWin==pExpr->y.pWin );
           if( IN_RENAME_OBJECT==0 ){
-            sqlite3WindowUpdate(pParse, pSel->pWinDefn, pWin, pDef);
+            sqlite3WindowUpdate(pParse, pSel ? pSel->pWinDefn : 0, pWin, pDef);
           }
           sqlite3WalkExprList(pWalker, pWin->pPartition);
           sqlite3WalkExprList(pWalker, pWin->pOrderBy);
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index d022436d38..da9a7ff811 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1775,12 +1775,6 @@ struct FuncDestructor {
 #define LIKEFUNC(zName, nArg, arg, flags) \
   {nArg, SQLITE_FUNC_CONSTANT|SQLITE_UTF8|flags, \
    (void *)arg, 0, likeFunc, 0, 0, 0, #zName, {0} }
-#define AGGREGATE(zName, nArg, arg, nc, xStep, xFinal, xValue) \
-  {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL), \
-   SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,xValue,0,#zName, {0}}
-#define AGGREGATE2(zName, nArg, arg, nc, xStep, xFinal, extraFlags) \
-  {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL)|extraFlags, \
-   SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,xFinal,0,#zName, {0}}
 #define WAGGREGATE(zName, nArg, arg, nc, xStep, xFinal, xValue, xInverse, f) \
   {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL)|f, \
    SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,xValue,xInverse,#zName, {0}}