Minor code simplifications.

FossilOrigin-Name: c3b38efd50c3c07b6dee5dea4c1f95b37d1c0994

diff --cc manifest
index db22aa6dddf310d0d697c8b74301ebba0826415d,6622249d0b5f33ccdbc6c75ca8f336528803487c..d0def9f3e1193742bb7cc5ad2a505e56a1412650
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Make\sthe\sapplication-defined\sSQL\sfunction\slogic\smore\scompact\sand\sfaster,\nespecially\sfaster\sfor\sthe\scase\swhere\san\sapplication\sdefines\sthousands\sof\nnew\sSQL\sfunctions.
- D 2016-02-15T17:56:35.428
 -C Minor\ssimplifications\sdeferred\sto\sthe\snext\srelease.
 -D 2016-02-11T13:30:36.283
++C Minor\scode\ssimplifications.
++D 2016-02-15T18:02:13.822
  F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 463edfba5c6fccebc61d8c094ccd463a6a55becb
 +F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -294,18 -294,18 +294,18 @@@ F src/btmutex.c bc87dd3b062cc26edfe7991
  F src/btree.c 4c8caaeed7878aafdb607c3d2bcbc365bb0d19a1
  F src/btree.h 368ceeb4bd9312dc8df2ffd64b4b7dbcf4db5f8e
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c 54866fbafa09d494269bdefc79995eb7207003a6
+ F src/build.c 7bc84362e4073841df1a24273e5bf87ddf46199f
 -F src/callback.c ed6c2a4a712eb7287ff64e20e3c23265dfb8a7ce
 +F src/callback.c 0643b8fb06c95a8977beb201b268210d4b131a22
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
 -F src/date.c ca17321bc17cca8f40e0843edea4fafff974998e
 +F src/date.c 0b73e681c11fca867fec554750c07fe0d4e417c1
  F src/dbstat.c b2ec6793eef97aebb4d171d490a4ffdfa9f2475c
  F src/delete.c 48802aa3ee6339f576d074336d3ae1b5f40e240f
 -F src/expr.c fbf0706199aea23c54efe36b6932d8307c4eb872
 +F src/expr.c 9adb58153f6e943b703d43e9a1f67f77b5a75721
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 08edad1fce30f761f14b3997e89bad58f9f7f4e0
 -F src/func.c 86e55fee35b9577e485f47d9dd5c1d34cd513288
 -F src/global.c bd5a0af3f30b0c01be6db756c626cd3c33a3d260
 +F src/func.c 552d300265aed09eea21f68ac742a440550c0062
 +F src/global.c ded7b97efd16efda5062b65e857198e46c40e652
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
@@@ -1425,10 -1425,12 +1425,9 @@@ F tool/varint.c 5d94cb5003db9dbbcbcc5df
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
  F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 -F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 +F tool/warnings.sh ef6ebc6fd8d2dc35db3b622015c16a023d4fef4f
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 3d862f207e3adc00f78066799ac5a8c282430a5f 3201fbcc5105d23132e6b8b7ac825e66af4f8a39
- R 7e8cad0755c139fc1648de63f4495d22
- T +closed 3201fbcc5105d23132e6b8b7ac825e66af4f8a39
 -P e9e6000bd2f7e0ef85178db2b5b8f20e4cf0093c
 -R d9f96f88af7f04e58e3b08ec636650be
 -T *branch * simplify
 -T *sym-simplify *
 -T -sym-trunk *
++P 7d49ed32a7262ec95d72ce520ab75402633386a1 a863729ccb75a56330460d3b7d558e639ad733d1
++R 93e8a74312f81836d6df6da0bc830b92
  U drh
- Z 0b09335c433bd37297af9a012fee6be6
 -Z 8d2d1255ad136ffbf4de853d8fcb27f6
++Z 4954abce0b42594f953ecc9e37768bc0

diff --cc manifest.uuid
index 0351f36384dcc11787258f7b064801d5689cba79,e353a95e47873f447d4b82aaf5a2fb5b0ed98c36..5d33c32cbb699f220aae1972182a823a60c47117
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7d49ed32a7262ec95d72ce520ab75402633386a1
 -a863729ccb75a56330460d3b7d558e639ad733d1
++c3b38efd50c3c07b6dee5dea4c1f95b37d1c0994