diff --git a/ext/fts1/fts1.c b/ext/fts1/fts1.c
index e0e2560ee5..735b69952e 100644
--- a/ext/fts1/fts1.c
+++ b/ext/fts1/fts1.c
@@ -1699,8 +1699,7 @@ static void tokenListToIdList(char **azIn){
 ** the result.
 */
 static char *firstToken(char *zIn, char **pzTail){
-  int i, n, ttype;
-  i = 0;
+  int n, ttype;
   while(1){
     n = getToken(zIn, &ttype);
     if( ttype==TOKEN_SPACE ){
@@ -1769,7 +1768,7 @@ static void clearTableSpec(TableSpec *p) {
  */
 static int parseSpec(TableSpec *pSpec, int argc, const char *const*argv,
                      char**pzErr){
-  int i, j, n;
+  int i, n;
   char *z, *zDummy;
   char **azArg;
   const char *zTokenizer = 0;    /* argv[] entry describing the tokenizer */
@@ -1809,7 +1808,7 @@ static int parseSpec(TableSpec *pSpec, int argc, const char *const*argv,
   pSpec->nColumn = 0;
   pSpec->azColumn = azArg;
   zTokenizer = "tokenize simple";
-  for(i=3, j=0; i<argc; ++i){
+  for(i=3; i<argc; ++i){
     if( startsWith(azArg[i],"tokenize") ){
       zTokenizer = azArg[i];
     }else{
diff --git a/ext/fts2/fts2.c b/ext/fts2/fts2.c
index 070089bdaa..b1ca720028 100644
--- a/ext/fts2/fts2.c
+++ b/ext/fts2/fts2.c
@@ -2291,8 +2291,7 @@ static void tokenListToIdList(char **azIn){
 ** the result.
 */
 static char *firstToken(char *zIn, char **pzTail){
-  int i, n, ttype;
-  i = 0;
+  int n, ttype;
   while(1){
     n = getToken(zIn, &ttype);
     if( ttype==TOKEN_SPACE ){
@@ -2361,7 +2360,7 @@ static void clearTableSpec(TableSpec *p) {
  */
 static int parseSpec(TableSpec *pSpec, int argc, const char *const*argv,
                      char**pzErr){
-  int i, j, n;
+  int i, n;
   char *z, *zDummy;
   char **azArg;
   const char *zTokenizer = 0;    /* argv[] entry describing the tokenizer */
@@ -2401,7 +2400,7 @@ static int parseSpec(TableSpec *pSpec, int argc, const char *const*argv,
   pSpec->nColumn = 0;
   pSpec->azColumn = azArg;
   zTokenizer = "tokenize simple";
-  for(i=3, j=0; i<argc; ++i){
+  for(i=3; i<argc; ++i){
     if( startsWith(azArg[i],"tokenize") ){
       zTokenizer = azArg[i];
     }else{
diff --git a/manifest b/manifest
index e0c0ed8366..019cccaa6a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Test\sthat\sterms\slonger\sthan\sinterior\snodes\swork\scorrectly.\s\sA\sbug\nprior\sto\sfts2.c\sr1.10\smeant\sthat\ssuch\slarge\sterms\scaused\san\seventual\nstack\soverflow.\s(CVS\s3523)
-D 2006-11-29T21:03:01
+C Drop\sa\scouple\svariables\swhich\sare\sno\slonger\sused\sanywhere.\s(CVS\s3524)
+D 2006-11-29T23:41:10
 F Makefile.in 8e14898d41a53033ecb687d93c9cd5d109fb9ae3
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -21,7 +21,7 @@ F ext/README.txt 913a7bd3f4837ab14d7e063304181787658b14e1
 F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e
 F ext/fts1/ft_hash.c 3927bd880e65329bdc6f506555b228b28924921b
 F ext/fts1/ft_hash.h 1a35e654a235c2c662d3ca0dfc3138ad60b8b7d5
-F ext/fts1/fts1.c a6b6a7b5ebc3f2fd8b1a8d65e8e7334c03b522d4
+F ext/fts1/fts1.c 18906d1ea54ad1a3cdda186da96aa6e6bdeb04f4
 F ext/fts1/fts1.h 6060b8f62c1d925ea8356cb1a6598073eb9159a6
 F ext/fts1/fts1_hash.c 3196cee866edbebb1c0521e21672e6d599965114
 F ext/fts1/fts1_hash.h 957d378355ed29f672cd5add012ce8b088a5e089
@@ -33,7 +33,7 @@ F ext/fts1/fulltext.h 08525a47852d1d62a0be81d3fc3fe2d23b094efd
 F ext/fts1/simple_tokenizer.c 1844d72f7194c3fd3d7e4173053911bf0661b70d
 F ext/fts1/tokenizer.h 0c53421b832366d20d720d21ea3e1f6e66a36ef9
 F ext/fts2/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts2/fts2.c 94b438480762ba2a2cb5e5d66b80290e93c50960
+F ext/fts2/fts2.c 5424f41fbc894c14eb87169de003c476827efaf3
 F ext/fts2/fts2.h bbdab26d34f91974d5b9ade8b7836c140a7c4ce1
 F ext/fts2/fts2_hash.c b3f22116d4ef0bc8f2da6e3fdc435c86d0951a9b
 F ext/fts2/fts2_hash.h e283308156018329f042816eb09334df714e105e
@@ -423,7 +423,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 30355dfbd920f3b6a78110aaf370371f620324b7
-R 54e92d25d9c8044ff80933a9c6310e49
+P 66581162daa188d23078c9d21fd5b2563d4d238a
+R 24e9cf4bda164b962ecedefa0aacdf28
 U shess
-Z f1a89a15a1180a5b8ccca04f66d7e8a3
+Z fccd23fa2d9883e016dfec61a0317df4
diff --git a/manifest.uuid b/manifest.uuid
index a4debc8d2e..c107bb6d38 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-66581162daa188d23078c9d21fd5b2563d4d238a
\ No newline at end of file
+08c2cc0e0782cfaca89947a01b7ea4474dbe71aa
\ No newline at end of file