Index: Doc/Extra/Provider/version.html
==================================================================
--- Doc/Extra/Provider/version.html
+++ Doc/Extra/Provider/version.html
@@ -41,21 +41,18 @@
       </table>
     </div>
     <div id="mainSection">
     <div id="mainBody">
     <h1 class="heading">Version History</h1>
-    <p><b>1.0.98.0 - August 18, 2015</b></p>
+    <p><b>1.0.98.0 - August XX, 2015 <font color="red">(release scheduled)</font></b></p>
     <ul>
       <li>Updated to <a href="https://www.sqlite.org/releaselog/3_8_11_1.html">SQLite 3.8.11.1</a>.</li>
       <li>Add full support for Visual Studio 2015 and the .NET Framework 4.6.</li>
-      <li>Add support for creating custom SQL functions using delegates.</li>
       <li>Implement the Substring method for LINQ using the &quot;substr&quot; core SQL function.&nbsp;<b>** Potentially Incompatible Change **</b></li>
-      <li>Prevent encrypted connections from being used with the connection pool. Pursuant to <a href="https://system.data.sqlite.org/index.html/info/89d3a159f1">[89d3a159f1]</a>.&nbsp;<b>** Potentially Incompatible Change **</b></li>
       <li>Honor the second argument to Math.Round when using LINQ.&nbsp;<b>** Potentially Incompatible Change **</b></li>
       <li>Honor the pre-existing flags for connections during the Open method. Fix for <a href="https://system.data.sqlite.org/index.html/info/964063da16">[964063da16]</a>.&nbsp;<b>** Potentially Incompatible Change **</b></li>
       <li>Remove errant semi-colons from the SQL used by LINQ to INSERT and then SELECT rows with composite primary keys. Fix for <a href="https://system.data.sqlite.org/index.html/info/9d353b0bd8">[9d353b0bd8]</a>.</li>
-      <li>Refactor INSERT/UPDATE handling (in the LINQ assembly) so it can handle composite and non-integer primary keys. Fix for <a href="https://system.data.sqlite.org/index.html/info/41aea496e0">[41aea496e0]</a>.</li>
       <li>Change the base type for the SQLiteConnectionFlags enumeration to long integer.&nbsp;<b>** Potentially Incompatible Change **</b></li>
       <li>Add extended return codes to the SQLiteErrorCode enumeration. Pursuant to <a href="https://system.data.sqlite.org/index.html/info/71bedaca19">[71bedaca19]</a>.&nbsp;<b>** Potentially Incompatible Change **</b></li>
       <li>Improve exception handling in all native callbacks implemented in the SQLiteConnection class.</li>
       <li>Add Progress event and ProgressOps connection string property to enable raising progress events during long-running queries.</li>
       <li>Add &quot;Recursive Triggers&quot; connection string property to enable or disable the recursive trigger capability. Pursuant to <a href="https://system.data.sqlite.org/index.html/info/3a82ee635b">[3a82ee635b]</a>.</li>

Index: Doc/SQLite.NET.chm
==================================================================
--- Doc/SQLite.NET.chm
+++ Doc/SQLite.NET.chm
cannot compute difference between binary files

Index: Externals/Eagle/bin/Eagle.dll
==================================================================
--- Externals/Eagle/bin/Eagle.dll
+++ Externals/Eagle/bin/Eagle.dll
cannot compute difference between binary files

Index: Externals/Eagle/bin/EagleShell.exe
==================================================================
--- Externals/Eagle/bin/EagleShell.exe
+++ Externals/Eagle/bin/EagleShell.exe
cannot compute difference between binary files

Index: Externals/Eagle/bin/EagleShell32.exe
==================================================================
--- Externals/Eagle/bin/EagleShell32.exe
+++ Externals/Eagle/bin/EagleShell32.exe
cannot compute difference between binary files

Index: Externals/Eagle/bin/x64/Spilornis.dll
==================================================================
--- Externals/Eagle/bin/x64/Spilornis.dll
+++ Externals/Eagle/bin/x64/Spilornis.dll
cannot compute difference between binary files

Index: Externals/Eagle/bin/x86/Spilornis.dll
==================================================================
--- Externals/Eagle/bin/x86/Spilornis.dll
+++ Externals/Eagle/bin/x86/Spilornis.dll
cannot compute difference between binary files

Index: Externals/Eagle/lib/Eagle1.0/init.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/init.eagle
+++ Externals/Eagle/lib/Eagle1.0/init.eagle
@@ -2035,11 +2035,11 @@
       }
 
       upvar 1 $a array
 
       if {![array exists array]} {
-        error [appendArgs \" $a "\" isn't an array"]
+        error "\"$a\" isn't an array"
       }
 
       set names [lsort [eval array names array $args]]
       set maxLength 0
 
@@ -2157,155 +2157,18 @@
       }
 
       return [uplevel 1 [list $command $name $description] $args]
     }
 
-    proc isObjectHandle { value } {
-      set pattern [string map [list \\ \\\\ \[ \\\[ \] \\\]] $value]
-      set objects [info objects $pattern]
-
-      if {[llength $objects] == 1 && [lindex $objects 0] eq $value} then {
-        return true
-      }
-
-      return false
-    }
-
-    proc isManagedType { name } {
-      if {[llength [info commands object]] > 0} then {
-        if {![isObjectHandle $name]} then {
-          if {[catch {
-            object members -matchnameonly -nameonly -pattern Equals $name
-          } result] == 0 && $result eq "Equals"} then {
-            return true
-          }
-        }
-      }
-
-      return false
-    }
-
-    proc canGetManagedType { name {varName ""} } {
-      if {[llength [info commands object]] > 0} then {
-        if {![isObjectHandle $name]} then {
-          set cultureInfo [object invoke Interpreter.GetActive CultureInfo]
-          set type null
-
-          set code [object invoke -create -alias -flags +NonPublic \
-              Value GetType "" $name null null None $cultureInfo type]
-
-          if {[$code ToString] eq "Ok"} then {
-            if {[string length $varName] > 0} then {
-              upvar 1 $varName typeName
-            }
-
-            set typeName [$type AssemblyQualifiedName]
-
-            if {[isManagedType $typeName]} then {
-              return true
-            }
-          }
-        }
-      }
-
-      return false
-    }
-
-    proc unknownObjectInvoke { level name args } {
-      #
-      # NOTE: This is an [unknown] procedure that attempts to lookup the
-      #       name as a CLR type and then attempts to use [object invoke]
-      #       with it, merging options and arguments as necessary.
-      #
-      if {[llength [info commands object]] > 0 && \
-          ([isManagedType $name] || [canGetManagedType $name name])} then {
-        #
-        # NOTE: Get possible options for the [object invoke] sub-command.
-        #
-        set options [object invoke Utility GetInvokeOptions Invoke]
-
-        #
-        # NOTE: Create argument list for the artificial [object invoke]
-        #       alias.  This always has two arguments.
-        #
-        set arguments1 [object create ArgumentList object invoke]
-
-        #
-        # NOTE: Create argument list for the entire command being handled.
-        #       There may be options right after the command name itself.
-        #
-        set arguments2 [eval \
-            object create ArgumentList [concat [list $name] $args]]
-
-        #
-        # NOTE: Setup output arguments needed for the MergeArguments method.
-        #
-        set arguments3 null; set error null
-
-        #
-        # NOTE: Attempt to merge the option and non-option arguments into a
-        #       single list of arguments.
-        #
-        set code [object invoke -alias -flags +NonPublic \
-            Interpreter.GetActive MergeArguments $options $arguments1 \
-            $arguments2 2 1 false false arguments3 error]
-
-        #
-        # NOTE: Was the argument merging process successful?
-        #
-        if {$code eq "Ok"} then {
-          #
-          # NOTE: Jump up from our call frame (and optionally that of our
-          #       caller) and attempt to invoke the specified static object
-          #       method with the final list of merged arguments.
-          #
-          return [uplevel [expr {$level + 1}] [$arguments3 ToString]]
-        } else {
-          #
-          # NOTE: Failed to merge the arguments, raise an error.
-          #
-          error [$error ToString]
-        }
-      }
-
-      continue; # NOTE: Not handled.
-    }
-
     proc unknown { name args } {
       #
-      # NOTE: This is an [unknown] procedure that normally produces an
-      #       appropriate error message; however, it can optionally try
-      #       to invoke a static object method.
+      # NOTE: This is a stub unknown procedure that simply produces an
+      #       appropriate error message.
       #
       # TODO: Add support for auto-loading packages here in the future?
       #
-      if {[hasRuntimeOption unknownObjectInvoke] && \
-          [llength [info commands object]] > 0} then {
-        #
-        # NOTE: In the context of the caller, attempt to invoke a static
-        #       object method using the specified arguments (which may
-        #       contain variable names).
-        #
-        if {[catch {
-          eval unknownObjectInvoke 1 [list $name] $args
-        } result] == 0} then {
-          #
-          # NOTE: The static object method was invoked successfully.
-          #       Return its result.
-          #
-          return -code ok $result
-        } elseif {[string length $result] > 0} then {
-          #
-          # NOTE: Attempting to invoke the static object method raised
-          #       an error.  Re-raise it now.  If no error message was
-          #       provided, fallback on the default (below).
-          #
-          return -code error $result
-        }
-      }
-
-      return -code error [appendArgs "invalid command name \"" $name \"]
+      return -code error "invalid command name \"$name\""
     }
 
     namespace eval ::tcl::tm {
       #
       # NOTE: Ideally, this procedure should be created in the "::tcl::tm"
@@ -2333,20 +2196,10 @@
       # NOTE: This should work properly in both Tcl and Eagle.
       #
       catch {puts stderr $string}
     }
 
-    proc makeProcedureFast { name fast } {
-      #
-      # NOTE: This should work properly in Eagle only.
-      #
-      catch {
-        uplevel 1 [list object invoke -flags +NonPublic \
-            Interpreter.GetActive MakeProcedureFast $name $fast]
-      }
-    }
-
     proc makeVariableFast { name fast } {
       #
       # NOTE: This should work properly in Eagle only.
       #
       catch {
@@ -2389,58 +2242,10 @@
 
       foreach dir [split [exec -unicode $::env(ComSpec) /u /c dir \
           /ahd /b [appendArgs \" [file nativename $pattern] \"]] \n] {
         set dir [string trim $dir]
 
-        if {[string length $dir] > 0} then {
-          set dir [getDirResultPath $pattern $dir]
-
-          if {[lsearch -variable -exact -nocase result $dir] == -1} then {
-            lappend result $dir
-          }
-        }
-      }
-
-      return $result
-    }
-
-    proc findDirectoriesRecursive { pattern } {
-      #
-      # NOTE: Block non-Windows platforms since this is Windows specific.
-      #
-      if {![isWindows]} then {
-        error "not supported on this operating system"
-      }
-
-      #
-      # NOTE: This should work properly in Eagle only.
-      #
-      set dir ""; set result [list]
-
-      #
-      # HACK: Optimize the variable access in this procedure to be
-      #       as fast as possible.
-      #
-      makeVariableFast dir true; makeVariableFast result true
-
-      foreach dir [split [exec -unicode $::env(ComSpec) /u /c dir \
-          /ad /s /b [appendArgs \" [file nativename $pattern] \"]] \n] {
-        set dir [string trim $dir]
-
-        if {[string length $dir] > 0} then {
-          set dir [getDirResultPath $pattern $dir]
-
-          if {[lsearch -variable -exact -nocase result $dir] == -1} then {
-            lappend result $dir
-          }
-        }
-      }
-
-      foreach dir [split [exec -unicode $::env(ComSpec) /u /c dir \
-          /ahd /s /b [appendArgs \" [file nativename $pattern] \"]] \n] {
-        set dir [string trim $dir]
-
         if {[string length $dir] > 0} then {
           set dir [getDirResultPath $pattern $dir]
 
           if {[lsearch -variable -exact -nocase result $dir] == -1} then {
             lappend result $dir
@@ -2591,78 +2396,10 @@
           [file normalize $pattern]]
 
       return $result
     }
 
-    proc findDirectoriesRecursive { pattern } {
-      #
-      # NOTE: Block non-Windows platforms since this is Windows specific.
-      #
-      if {![isWindows]} then {
-        error "not supported on this operating system"
-      }
-
-      #
-      # NOTE: This should work properly in Tcl only.
-      #
-      set result [list]
-
-      catch {
-        foreach dir [split [exec $::env(ComSpec) /c dir /ad /s /b \
-            [file nativename $pattern]] \n] {
-          set dir [string trim $dir]
-
-          if {[string length $dir] > 0} then {
-            set dir [getDirResultPath $pattern $dir]
-
-            #
-            # HACK: The -nocase option to [lsearch] is only available
-            #       starting with Tcl 8.5.
-            #
-            if {$::tcl_version >= 8.5} then {
-              if {[lsearch -exact -nocase $result $dir] == -1} then {
-                lappend result $dir
-              }
-            } else {
-              if {[lsearch -exact [string tolower $result] \
-                  [string tolower $dir]] == -1} then {
-                lappend result $dir
-              }
-            }
-          }
-        }
-      }
-
-      catch {
-        foreach dir [split [exec $::env(ComSpec) /c dir /ahd /s /b \
-            [file nativename $pattern]] \n] {
-          set dir [string trim $dir]
-
-          if {[string length $dir] > 0} then {
-            set dir [getDirResultPath $pattern $dir]
-
-            #
-            # HACK: The -nocase option to [lsearch] is only available
-            #       starting with Tcl 8.5.
-            #
-            if {$::tcl_version >= 8.5} then {
-              if {[lsearch -exact -nocase $result $dir] == -1} then {
-                lappend result $dir
-              }
-            } else {
-              if {[lsearch -exact [string tolower $result] \
-                  [string tolower $dir]] == -1} then {
-                lappend result $dir
-              }
-            }
-          }
-        }
-      }
-
-      return $result
-    }
-
     proc findFiles { pattern } {
       #
       # NOTE: This should work properly in Tcl only.
       #
       eval lappend result [glob -nocomplain -types {f} \
@@ -2693,23 +2430,12 @@
           set fileName [string trim $fileName]
 
           if {[string length $fileName] > 0} then {
             set fileName [getDirResultPath $pattern $fileName]
 
-            #
-            # HACK: The -nocase option to [lsearch] is only available
-            #       starting with Tcl 8.5.
-            #
-            if {$::tcl_version >= 8.5} then {
-              if {[lsearch -exact -nocase $result $fileName] == -1} then {
-                lappend result $fileName
-              }
-            } else {
-              if {[lsearch -exact [string tolower $result] \
-                  [string tolower $fileName]] == -1} then {
-                lappend result $fileName
-              }
+            if {[lsearch -exact -nocase $result $fileName] == -1} then {
+              lappend result $fileName
             }
           }
         }
       }
 
@@ -2719,23 +2445,12 @@
           set fileName [string trim $fileName]
 
           if {[string length $fileName] > 0} then {
             set fileName [getDirResultPath $pattern $fileName]
 
-            #
-            # HACK: The -nocase option to [lsearch] is only available
-            #       starting with Tcl 8.5.
-            #
-            if {$::tcl_version >= 8.5} then {
-              if {[lsearch -exact -nocase $result $fileName] == -1} then {
-                lappend result $fileName
-              }
-            } else {
-              if {[lsearch -exact [string tolower $result] \
-                  [string tolower $fileName]] == -1} then {
-                lappend result $fileName
-              }
+            if {[lsearch -exact -nocase $result $fileName] == -1} then {
+              lappend result $fileName
             }
           }
         }
       }
 
@@ -2797,13 +2512,12 @@
         getDictionaryValue getColumnValue getRowColumnValue tqputs tqlog \
         readFile readSharedFile writeFile appendFile appendLogFile \
         appendSharedFile appendSharedLogFile readAsciiFile writeAsciiFile \
         readUnicodeFile writeUnicodeFile getDirResultPath addToPath \
         removeFromPath execShell lshuffle ldifference filter map reduce \
-        getLengthModifier debug findDirectories findDirectoriesRecursive \
-        findFiles findFilesRecursive exportAndImportPackageCommands] false \
-        false
+        getLengthModifier debug findDirectories findFiles findFilesRecursive \
+        exportAndImportPackageCommands] false false
 
     ###########################################################################
     ############################## END Tcl ONLY ###############################
     ###########################################################################
   }

Index: Externals/Eagle/lib/Eagle1.0/shell.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/shell.eagle
+++ Externals/Eagle/lib/Eagle1.0/shell.eagle
@@ -28,116 +28,12 @@
     #
     # NOTE: Commands specific to initializing the Eagle interactive shell
     #       environment should be placed here.
     #
     proc help { args } {
-      host result Break [appendArgs \
-          "\nFor interactive help please use: #help " $args \
-          "\nFor commercial support, please use: #support\n"]
-
-      catch {
-        object invoke Interpreter.GetActive Host.WriteLine \
-            "\nPlease press any key to continue...\n"
-
-        set key null; object invoke Interpreter.GetActive \
-            Host.ReadKey true key
-      }
-
       eval lappend command #help $args; debug icommand $command
-    }
-
-    proc #support {} {
-      # <help>
-      # Shows the requirements for obtaining commercial support and/or
-      # redirects to the appropriate web site using the default browser.
-      # </help>
-
-      if {[catch {
-        package require Licensing.Enterprise
-        set fileName(1) [certificate current]
-
-        if {[string length $fileName(1)] == 0} then {
-          error "No certificate file is available."
-        }
-
-        set certificate [certificate import -alias $fileName(1)]
-
-        if {[string length $certificate] == 0} then {
-          error [appendArgs \
-              "No certificate is available, current file \"" \
-              $fileName(1) "\" could not be imported."]
-        }
-
-        if {[catch {
-          certificate flags -hasflags S -hasall -strict $certificate
-        } error(2)]} then {
-          error [appendArgs \
-              "Support is not enabled for certificate \"" \
-              [$certificate Id] " - " [$certificate EntityName] \
-              "\", the original error message was: \{" $error(2) \
-              \}.]
-        }
-
-        set uri [$certificate -create -alias Support]
-
-        if {[string length $uri] == 0} then {
-          error [appendArgs \
-              "No support information found in certificate \"" \
-              [$certificate Id] " - " [$certificate EntityName] \".]
-        }
-
-        if {[$uri Scheme] ni [list http https]} then {
-          error [appendArgs \
-              "Support URI scheme \"" [$uri Scheme] \
-              "\" in certificate \"" [$certificate Id] " - " \
-              [$certificate EntityName] "\" is not supported, " \
-              "must be \"http\" or \"https\"."]
-        }
-
-        exec -shell [$uri ToString] &
-      } error(1)]} then {
-        set fileName(2) [file tempname]; set fileData ""
-
-        foreach varName [lsort [info vars]] {
-          if {$varName in [list fileData]} then {
-            continue
-          }
-
-          if {$varName eq "certificate" && \
-              [string length $certificate] > 0} then {
-            append fileData [appendArgs \n \
-                [list array set certificate \
-                [$certificate -flags +NonPublic \
-                ToDictionary.KeysAndValuesToString \
-                null false]]]
-
-            continue
-          }
-
-          if {[array exists $varName]} then {
-            append fileData [appendArgs \n \
-                [list array set $varName [array get $varName]]]
-          } else {
-            append fileData [appendArgs \n \
-                [list set $varName [set $varName]]]
-          }
-        }
-
-        append fileData \n; writeFile $fileName(2) $fileData
-        set ::eagle_shell(errorFileName) $fileName(2)
-
-        error [appendArgs \
-            "\n\nIn order to obtain commercial support, at least " \
-            "one of the\nfollowing requirements must be met:\n\n" \
-            "\t1. Valid, non-expired commercial license agreement\n" \
-            "\t   for Eagle Enterprise Edition.\n\n" \
-            "\t2. Valid, non-expired commercial support contract\n" \
-            "\t   for Eagle Standard Edition.\n\n" \
-            "The original error information was saved to the file:\n\n" \
-            [string repeat - 60] \n $fileName(2) \n [string repeat - 60] \
-            "\n\nPlease provide this file when contacting support."]
-      }
+      error "for interactive help please use: #help $args"
     }
 
     ###########################################################################
     ############################# END Eagle ONLY ##############################
     ###########################################################################

Index: Externals/Eagle/lib/Eagle1.0/test.eagle
==================================================================
--- Externals/Eagle/lib/Eagle1.0/test.eagle
+++ Externals/Eagle/lib/Eagle1.0/test.eagle
@@ -235,14 +235,10 @@
 
   proc testArrayGet { varName {integer false} } {
     #
     # NOTE: Returns the results of [array get] in a well-defined order.
     #
-    if {[string length $varName] == 0} then {
-      return [list]
-    }
-
     upvar 1 $varName array
 
     #
     # NOTE: Build the command that will sort the array names into order.
     #
@@ -483,33 +479,25 @@
             "\", it does not exist\n"]
       }
     }
   }
 
-  proc processTestArguments { varName strict args } {
-    #
-    # NOTE: Initially, there are no unknown (i.e. unprocessed) arguments.
-    #
-    set result [list]
-
+  proc processTestArguments { varName args } {
     #
     # NOTE: We are going to place the configured options in the variable
     #       identified by the name provided by the caller.
     #
-    if {[string length $varName] > 0} then {
-      upvar 1 $varName array
-    }
+    upvar 1 $varName array
 
     #
-    # TODO: Add more support for standard "tcltest" options here.
+    # TODO: Add more support for standard tcltest options here.
     #
     set options [list \
-        -breakOnLeak -configuration -constraints -exitOnComplete \
-        -file -logFile -machine -match -no -notFile -platform \
-        -postTest -preTest -postWait -preWait -randomOrder -skip \
-        -startFile -stopFile -stopOnFailure -stopOnLeak -suffix \
-        -suite -tclsh -threshold]
+        -breakOnLeak -configuration -constraints -exitOnComplete -file \
+        -logFile -machine -match -no -notFile -platform -postTest -preTest \
+        -postWait -preWait -randomOrder -skip -startFile -stopFile \
+        -stopOnFailure -stopOnLeak -suffix -suite -tclsh -threshold]
 
     set length [llength $args]
 
     for {set index 0} {$index < $length} {incr index} {
       #
@@ -549,79 +537,32 @@
         #       and value pattern.
         #
         if {$index + 1 < $length} then {
           incr index; set value [lindex $args $index]
 
-          if {!$strict && [lsearch -exact $options $value] != -1} then {
-            incr index -1; # HACK: Resynchronize with valid test option.
-            lappend result [list $name]
-
-            tqputs $::test_channel [appendArgs \
-                "---- no value for unknown test option \"" $name \
-                "\", ignored, backing up one for test option \"" \
-                $value \"...\n]
-          } else {
-            lappend result [list $name $value]
-
-            tqputs $::test_channel [appendArgs \
-                "---- unknown test option \"" $name "\" with value \"" \
-                $value "\", ignored\n"]
-          }
-        } else {
-          lappend result [list $name]
-
-          tqputs $::test_channel [appendArgs \
-              "---- no value for unknown test option \"" $name \
-              "\", ignored\n"]
-        }
-      } else {
-        #
-        # NOTE: Is there another list element available for the value?  If
-        #       not, it does not conform to the standard command line name
-        #       and value pattern.
-        #
-        if {$index + 1 < $length} then {
-          incr index; set value [lindex $args $index]
-
-          if {!$strict && [lsearch -exact $options $value] != -1} then {
-            incr index -1; # HACK: Resynchronize with valid test argument.
-            lappend result [list $name]
-
-            tqputs $::test_channel [appendArgs \
-                "---- no value for unknown argument \"" $name \
-                "\", ignored, backing up one for test option \"" \
-                $value \"...\n]
-          } else {
-            lappend result [list $name $value]
-
-            tqputs $::test_channel [appendArgs \
-                "---- unknown argument \"" $name "\" with value \"" \
-                $value "\", ignored\n"]
-          }
-        } else {
-          #
-          # NOTE: This is not an option of *any* kind that we know about.
-          #       Ignore it and issue a warning.
-          #
-          lappend result [list $name]
-
-          tqputs $::test_channel [appendArgs \
-              "---- unknown argument \"" $name "\", ignored\n"]
-        }
+          tqputs $::test_channel [appendArgs \
+              "---- unknown test option \"" $name "\" with value \"" \
+              $value "\" ignored\n"]
+        } else {
+          tqputs $::test_channel [appendArgs \
+              "---- no value for unknown test option \"" $name \
+              "\" ignored\n"]
+        }
+      } else {
+        #
+        # NOTE: This is not an option of *any* kind that we know about.
+        #       Ignore it and issue a warning.
+        #
+        tqputs $::test_channel [appendArgs \
+            "---- unknown argument \"" $name "\" ignored\n"]
       }
     }
 
     #
     # NOTE: Now, attempt to flush the test log queue, if available.
     #
     tlog ""
-
-    #
-    # NOTE: Return the nested list of unknown arguments, formatted as
-    #       name/value pairs, to the caller.
-    #
-    return $result
   }
 
   proc getTclShellFileName { automatic kits } {
     #
     # NOTE: Start out with an empty list of candiate Tcl shells.
@@ -630,11 +571,11 @@
 
     #
     # NOTE: Check all environment variables we know about that
     #       may contain the path where the Tcl shell is located.
     #
-    foreach name [list Eagle_Tcl_Shell Tcl_Shell EAGLE_TCLSH TCLSH] {
+    foreach name [list Eagle_Tcl_Shell Tcl_Shell] {
       set value [getEnvironmentVariable $name]
 
       #
       # TODO: Possibly add a check if the file actually exists
       #       here.
@@ -1353,12 +1294,12 @@
     }
   }
 
   proc hookPuts {} {
     #
-    # NOTE: This code was stolen from "tcltest" and heavily modified to
-    #       work with Eagle.
+    # NOTE: This code was stolen from tcltest and heavily modified to work
+    #       with Eagle.
     #
     proc [namespace current]::testPuts { args } {
       switch [llength $args] {
         1 {
           #
@@ -2375,259 +2316,11 @@
     #
     return [expr {[info exists ::test_suite_running] && \
         $::test_suite_running}]
   }
 
-  proc getTestChannelOrDefault {} {
-    if {[info exists ::test_channel]} then {
-      return $::test_channel
-    }
-
-    return stdout; # TODO: Good default?
-  }
-
-  proc checkForAndSetTestPath { whatIf {quiet false} } {
-    #
-    # NOTE: Everything in this procedure requires access to the file system;
-    #       therefore, it cannot be used in a stock "safe" interpreter.
-    #
-    if {![interp issafe] && ![info exists ::test_path]} then {
-      #
-      # NOTE: Grab the name of the current script file.  If this is an empty
-      #       string, many test path checks will have to be skipped.
-      #
-      set script [info script]
-
-      #
-      # NOTE: Eagle and native Tcl have different requirements and possible
-      #       locations for the test path; therefore, handle them separately.
-      #
-      if {[isEagle]} then {
-        #
-        # NOTE: Grab the base directory and the library directory.  Without
-        #       these, several test path checks will be skipped.
-        #
-        set library [getTestLibraryDirectory]; set base [info base]
-
-        if {[string length $library] > 0} then {
-          #
-          # NOTE: Try the source release directory structure.  For this
-          #       case, the final test path would be:
-          #
-          #           $library/../../Library/Tests
-          #
-          set ::test_path [file normalize [file join [file dirname [file \
-              dirname $library]] Library Tests]]
-
-          if {!$quiet} then {
-            tqputs [getTestChannelOrDefault] [appendArgs \
-                "---- checking #1 for Eagle test path at \"" \
-                $::test_path \"...\n]
-          }
-        }
-
-        if {[string length $base] > 0 && ($whatIf || \
-            ![info exists ::test_path] || ![file exists $::test_path] || \
-            ![file isdirectory $::test_path])} then {
-          #
-          # NOTE: Try the source release directory structure again; this
-          #       time, assume only the embedded script library was used.
-          #       For this case, the final test path would be:
-          #
-          #           $base/Library/Tests
-          #
-          set ::test_path [file normalize [file join $base Library Tests]]
-
-          if {!$quiet} then {
-            tqputs [getTestChannelOrDefault] [appendArgs \
-                "---- checking #2 for Eagle test path at \"" \
-                $::test_path \"...\n]
-          }
-        }
-
-        if {[string length $script] > 0 && ($whatIf || \
-            ![info exists ::test_path] || ![file exists $::test_path] || \
-            ![file isdirectory $::test_path])} then {
-          #
-          # NOTE: Try for the test package directory.  For this case, the
-          #       final test path would be:
-          #
-          #           $script/../Test1.0
-          #
-          set ::test_path [file normalize [file join [file dirname [file \
-              dirname $script]] [appendArgs Test [info engine Version]]]]
-
-          if {!$quiet} then {
-            tqputs [getTestChannelOrDefault] [appendArgs \
-                "---- checking #3 for Eagle test path at \"" \
-                $::test_path \"...\n]
-          }
-        }
-
-        if {[string length $base] > 0 && ($whatIf || \
-            ![info exists ::test_path] || ![file exists $::test_path] || \
-            ![file isdirectory $::test_path])} then {
-          #
-          # NOTE: Try for the test package directory again; this time, use
-          #       the base path and assume the source release directory
-          #       structure.  For this case, the final test path would be:
-          #
-          #           $base/lib/Test1.0
-          #
-          set ::test_path [file normalize [file join $base lib [appendArgs \
-              Test [info engine Version]]]]
-
-          if {!$quiet} then {
-            tqputs [getTestChannelOrDefault] [appendArgs \
-                "---- checking #4 for Eagle test path at \"" \
-                $::test_path \"...\n]
-          }
-        }
-
-        if {[string length $base] > 0 && ($whatIf || \
-            ![info exists ::test_path] || ![file exists $::test_path] || \
-            ![file isdirectory $::test_path])} then {
-          #
-          # NOTE: Try for the test package directory again; this time, use
-          #       the base path.  For this case, the final test path would
-          #       be:
-          #
-          #           $base/Test1.0
-          #
-          set ::test_path [file normalize [file join $base [appendArgs \
-              Test [info engine Version]]]]
-
-          if {!$quiet} then {
-            tqputs [getTestChannelOrDefault] [appendArgs \
-                "---- checking #5 for Eagle test path at \"" \
-                $::test_path \"...\n]
-          }
-        }
-
-        if {[string length $library] > 0 && ($whatIf || \
-            ![info exists ::test_path] || ![file exists $::test_path] || \
-            ![file isdirectory $::test_path])} then {
-          #
-          # NOTE: This must be a binary release, no "Library" directory
-          #       then.  Also, binary releases have an upper-case "Tests"
-          #       directory name that originates from the "update.bat"
-          #       tool.  This must match the casing used in "update.bat".
-          #       For this case, the final test path would be:
-          #
-          #           $library/../../Tests
-          #
-          set ::test_path [file normalize [file join [file dirname [file \
-              dirname $library]] Tests]]
-
-          if {!$quiet} then {
-            tqputs [getTestChannelOrDefault] [appendArgs \
-                "---- checking #6 for Eagle test path at \"" \
-                $::test_path \"...\n]
-          }
-        }
-
-        if {[string length $base] > 0 && ($whatIf || \
-            ![info exists ::test_path] || ![file exists $::test_path] || \
-            ![file isdirectory $::test_path])} then {
-          #
-          # NOTE: Fallback to using the base directory and checking for a
-          #       "Tests" directory beneath it.  For this case, the final
-          #       test path would be:
-          #
-          #           $base/Tests
-          #
-          set ::test_path [file normalize [file join $base Tests]]
-
-          if {!$quiet} then {
-            tqputs [getTestChannelOrDefault] [appendArgs \
-                "---- checking #7 for Eagle test path at \"" \
-                $::test_path \"...\n]
-          }
-        }
-
-        if {!$quiet} then {
-          tqputs [getTestChannelOrDefault] [appendArgs \
-              "---- final Eagle test path is \"" \
-              [expr {[info exists ::test_path] ? \
-              $::test_path : "<none>"}] \"\n]
-        }
-      } else {
-        if {[string length $script] > 0} then {
-          #
-          # NOTE: Try the source release directory structure.  For this
-          #       case, the final test path would be:
-          #
-          #           $script/../../Library/Tests
-          #
-          set ::test_path [file normalize [file join [file dirname [file \
-              dirname [file dirname $script]]] Library Tests]]
-
-          if {!$quiet} then {
-            tqputs [getTestChannelOrDefault] [appendArgs \
-                "---- checking #1 for Tcl test path at \"" \
-                $::test_path \"...\n]
-          }
-        }
-
-        if {[string length $script] > 0 && ($whatIf || \
-            ![info exists ::test_path] || ![file exists $::test_path] || \
-            ![file isdirectory $::test_path])} then {
-          #
-          # NOTE: Try for the test package directory.  For this case, the
-          #       final test path would be:
-          #
-          #           $script/../Test1.0
-          #
-          set ::test_path [file normalize [file join [file dirname [file \
-              dirname $script]] Test1.0]]
-
-          if {!$quiet} then {
-            tqputs [getTestChannelOrDefault] [appendArgs \
-                "---- checking #2 for Tcl test path at \"" \
-                $::test_path \"...\n]
-          }
-        }
-
-        if {[string length $script] > 0 && ($whatIf || \
-            ![info exists ::test_path] || ![file exists $::test_path] || \
-            ![file isdirectory $::test_path])} then {
-          #
-          # NOTE: This must be a binary release, no "Library" directory
-          #       then.  Also, binary releases have an upper-case "Tests"
-          #       directory name that originates from the "update.bat"
-          #       tool.  This must match the casing used in "update.bat".
-          #       For this case, the final test path would be:
-          #
-          #           $script/../../Tests
-          #
-          set ::test_path [file normalize [file join [file dirname [file \
-              dirname [file dirname $script]]] Tests]]
-
-          if {!$quiet} then {
-            tqputs [getTestChannelOrDefault] [appendArgs \
-                "---- checking #3 for Tcl test path at \"" \
-                $::test_path \"...\n]
-          }
-        }
-
-        if {!$quiet} then {
-          tqputs [getTestChannelOrDefault] [appendArgs \
-              "---- final Tcl test path is \"" \
-              [expr {[info exists ::test_path] ? \
-              $::test_path : "<none>"}] \"\n]
-        }
-      }
-    }
-  }
-
   proc configureTcltest { match skip constraints imports force } {
-    #
-    # NOTE: Eagle and native Tcl have different configuration requirements
-    #       for the "tcltest" package.  For Eagle, the necessary testing
-    #       functionality is built-in.  In native Tcl, the package must be
-    #       loaded now and that cannot be done in a "safe" interpreter.
-    #
     if {[isEagle]} then {
       #
       # HACK: Flag the "test" and "runTest" script library procedures so
       #       that they use the script location of their caller and not
       #       their own.
@@ -2642,26 +2335,26 @@
       #
       namespace eval ::tcltest {}; # HACK: Force namespace creation now.
       setupTestShims true [expr {![isTestSuiteRunning]}]
 
       #
-      # NOTE: Fake having the package as the functionality is built-in.
+      # NOTE: Fake having the tcltest package.
       #
       package provide tcltest 2.2.10; # Tcl 8.4
-    } elseif {![interp issafe]} then {
+    } else {
       #
-      # NOTE: Attempt to detect if the package is already loaded.
+      # NOTE: Attempt to detect if the tcltest package is already loaded.
       #
       set loaded [expr {[catch {package present tcltest}] == 0}]
 
       #
-      # NOTE: Always attempt to load the package.
+      # NOTE: Always attempt to load the tcltest package.
       #
       package require tcltest
 
       #
-      # NOTE: Configure it for our use (only when it was not loaded).
+      # NOTE: Configure tcltest for our use (only when it was not loaded).
       #
       if {!$loaded} then {
         ::tcltest::configure -verbose bpste
       }
 
@@ -2835,10 +2528,18 @@
         if {[info exists test_flags(-constraints)]} then {
             eval lappend eagle_tests(Constraints) $test_flags(-constraints)
         }
       }
     }
+
+    proc getTestChannelOrDefault {} {
+      if {[info exists ::test_channel]} then {
+        return $::test_channel
+      }
+
+      return stdout; # TODO: Good default?
+    }
 
     proc setupTestShims { setup {quiet false} } {
       if {$setup} then {
         #
         # HACK: Compatibility shim(s) for use with various tests in the Tcl
@@ -3389,43 +3090,122 @@
       object unimport -importpattern System.Windows.Forms.VisualStyles
     }
 
     proc getTestLibraryDirectory {} {
       #
-      # NOTE: First, query the location of the script library.  This will
-      #       not work right in a "safe" interpreter.
-      #
-      if {[catch {info library} result] == 0} then {
-        #
-        # NOTE: Next, If the script library is embedded within the core
-        #       library itself (i.e. the script library location refers
-        #       to a file, not a directory), strip off the file name.
-        #
-        if {[file exists $result] && [file isfile $result]} then {
-          set result [file dirname $result]
-        }
-
-        #
-        # NOTE: Finally, return the resulting script library directory.
-        #
-        return $result
-      }
-
-      return ""
-    }
-
-    #
-    # NOTE: Check for the test path in the various well-known locations
-    #       and set the associated variable.
-    #
-    if {![info exists ::no(checkForAndSetTestPath)]} then {
-      checkForAndSetTestPath false [expr {![isTestSuiteRunning]}]
-    }
-
-    #
-    # NOTE: Fake loading and configuring the "tcltest" package unless we
-    #       are prevented.
+      # NOTE: First, query the location of the script library.
+      #
+      set result [info library]
+
+      #
+      # NOTE: Next, If the script library is embedded within the core
+      #       library itself (i.e. the script library location refers
+      #       to a file, not a directory), strip off the file name.
+      #
+      if {[file exists $result] && [file isfile $result]} then {
+        set result [file dirname $result]
+      }
+
+      #
+      # NOTE: Finally, return the resulting script library directory.
+      #
+      return $result
+    }
+
+    #
+    # NOTE: Setup the test path relative to the library path.
+    #
+    if {![interp issafe] && ![info exists ::test_path]} then {
+      #
+      # NOTE: Try the source release directory structure.  For this case,
+      #       the final test path would be:
+      #
+      #           $library/../../Library/Tests
+      #
+      set ::test_path [file join [file normalize [file dirname \
+          [file dirname [getTestLibraryDirectory]]]] Library Tests]
+
+      if {![file exists $::test_path] || \
+          ![file isdirectory $::test_path]} then {
+        #
+        # NOTE: Try the source release directory structure again; this time,
+        #       assume only the embedded script library was used.  For this
+        #       case, the final test path would be:
+        #
+        #           $base/Library/Tests
+        #
+        set ::test_path [file join [info base] Library Tests]
+      }
+
+      if {![file exists $::test_path] || \
+          ![file isdirectory $::test_path]} then {
+        #
+        # NOTE: Try for the test package directory.  For this case, the final
+        #       test path would be:
+        #
+        #           $script/../Test1.0
+        #
+        set ::test_path [file join [file normalize [file dirname \
+            [file dirname [info script]]]] [appendArgs Test \
+            [info engine Version]]]
+      }
+
+      if {![file exists $::test_path] || \
+          ![file isdirectory $::test_path]} then {
+        #
+        # NOTE: Try for the test package directory again; this time, use the
+        #       base path and assume the source release directory structure.
+        #       For this case, the final test path would be:
+        #
+        #           $base/lib/Test1.0
+        #
+        set ::test_path [file join [info base] lib [appendArgs Test \
+            [info engine Version]]]
+      }
+
+      if {![file exists $::test_path] || \
+          ![file isdirectory $::test_path]} then {
+        #
+        # NOTE: Try for the test package directory again; this time, use the
+        #       base path.  For this case, the final test path would be:
+        #
+        #           $base/Test1.0
+        #
+        set ::test_path [file join [info base] [appendArgs Test \
+            [info engine Version]]]
+      }
+
+      if {![file exists $::test_path] || \
+          ![file isdirectory $::test_path]} then {
+        #
+        # NOTE: This must be a binary release, no "Library" directory then.
+        #       Also, binary releases have an upper-case "Tests" directory
+        #       name that originates from the "update.bat" tool.  This must
+        #       match the casing used in "update.bat".  For this case, the
+        #       final test path would be:
+        #
+        #           $library/../../Tests
+        #
+        set ::test_path [file join [file normalize [file dirname \
+            [file dirname [getTestLibraryDirectory]]]] Tests]
+      }
+
+      if {![file exists $::test_path] || \
+          ![file isdirectory $::test_path]} then {
+        #
+        # NOTE: Fallback to using the base directory and checking for a
+        #       "Tests" directory beneath it.  For this case, the final
+        #       test path would be:
+        #
+        #           $base/Tests
+        #
+        set ::test_path [file join [info base] Tests]
+      }
+    }
+
+    #
+    # NOTE: Fake having the tcltest package unless we are prevented.
     #
     if {![info exists ::no(configureTcltest)]} then {
       configureTcltest [list] [list] [list] [list] false
     }
 
@@ -3457,21 +3237,45 @@
 
       return 0; # no tests were run, etc.
     }
 
     #
-    # NOTE: Check for the test path in the various well-known locations
-    #       and set the associated variable.
+    # NOTE: Setup the test path relative to the path of this file.
     #
-    if {![info exists ::no(checkForAndSetTestPath)]} then {
-      checkForAndSetTestPath false [expr {![isTestSuiteRunning]}]
+    if {![interp issafe] && ![info exists ::test_path]} then {
+      #
+      # NOTE: Try the source release directory structure.
+      #
+      set ::test_path [file join [file normalize [file dirname \
+          [file dirname [file dirname [info script]]]]] Library Tests]
+
+      if {![file exists $::test_path] || \
+          ![file isdirectory $::test_path]} then {
+        #
+        # NOTE: Try for the test package directory.
+        #
+        set ::test_path [file join [file normalize [file dirname \
+            [file dirname [info script]]]] Test1.0]
+      }
+
+      if {![file exists $::test_path] || \
+          ![file isdirectory $::test_path]} then {
+        #
+        # NOTE: This must be a binary release, no "Library" directory then.
+        #       Also, binary releases have an upper-case "Tests" directory
+        #       name that originates from the "update.bat" tool.  This must
+        #       match the casing used in "update.bat".
+        #
+        set ::test_path [file join [file normalize [file dirname \
+            [file dirname [file dirname [info script]]]]] Tests]
+      }
     }
 
     #
-    # NOTE: Load and configure the "tcltest" package unless we are prevented.
+    # NOTE: Load and configure the tcltest package unless we are prevented.
     #
-    if {![info exists ::no(configureTcltest)]} then {
+    if {![interp issafe] && ![info exists ::no(configureTcltest)]} then {
       configureTcltest [list] [list] [list] [list test testConstraint] false
     }
 
     #
     # NOTE: We need several of our test related commands in the global
@@ -3490,12 +3294,12 @@
         returnInfoScript runTestPrologue runTestEpilogue hookPuts unhookPuts \
         runTest testDebugBreak testArrayGet testShim tsource \
         recordTestStatistics reportTestStatistics formatList formatListAsDict \
         pathToRegexp inverseLsearchGlob removePathFromFileNames formatDecimal \
         clearTestPercent reportTestPercent runAllTests isTestSuiteRunning \
-        getTestChannelOrDefault checkForAndSetTestPath configureTcltest \
-        machineToPlatform getPassPercentage getSkipPercentage] false false
+        configureTcltest machineToPlatform getPassPercentage \
+        getSkipPercentage] false false
 
     ###########################################################################
     ############################## END Tcl ONLY ###############################
     ###########################################################################
   }

Index: Externals/Eagle/lib/Test1.0/all.eagle
==================================================================
--- Externals/Eagle/lib/Test1.0/all.eagle
+++ Externals/Eagle/lib/Test1.0/all.eagle
@@ -40,32 +40,25 @@
 #       be used at the very end of the corresponding "all.eagle" file instead
 #       of evaluating the "epilogue.eagle" file directly:
 #
 #           runTestEpilogue
 #
-if {![info exists test_all_path]} then {
-  set test_all_path \
-      [file normalize [file dirname [info script]]]
+if {![info exists test_path]} then {
+  set test_path [file normalize [file dirname [info script]]]
 }
 
-if {![info exists test_path]} then {
-  set test_path [file normalize [file join \
-      [file dirname [file dirname $test_all_path]] \
-      Library Tests]]
-}
-
-source [file join $test_all_path prologue.eagle]
+source [file join $test_path prologue.eagle]
 
 set no(prologue.eagle) true
 set no(epilogue.eagle) true
 
 set test_time [time {
   runAllTests $test_channel $test_path \
       [getTestFiles [list $test_path] $test_flags(-file) \
           $test_flags(-notFile)] \
-      [list [file tail [info script]] *.tcl \
-          epilogue.eagle prologue.eagle] \
+      [list [file tail [info script]] *.tcl pkgIndex.eagle \
+          constraints.eagle epilogue.eagle prologue.eagle] \
       $test_flags(-startFile) $test_flags(-stopFile)
 }]
 
 tputs $test_channel [appendArgs "---- all tests completed in " $test_time \n]
 unset test_time
@@ -73,6 +66,6 @@
 unset no(epilogue.eagle)
 unset no(prologue.eagle)
 
 if {[array size no] == 0} then {unset no}
 
-source [file join $test_all_path epilogue.eagle]
+source [file join $test_path epilogue.eagle]

Index: Externals/Eagle/lib/Test1.0/constraints.eagle
==================================================================
--- Externals/Eagle/lib/Test1.0/constraints.eagle
+++ Externals/Eagle/lib/Test1.0/constraints.eagle
@@ -54,12 +54,11 @@
     #       versions of Mono supported by the test suite infrastructure.
     #
     return [list \
         [list 2 0] [list 2 2] [list 2 4] [list 2 6] [list 2 8] [list 2 10] \
         [list 2 11] [list 2 12] [list 3 0] [list 3 1] [list 3 2] [list 3 3] \
-        [list 3 4] [list 3 5] [list 3 6] [list 3 8] [list 3 10] [list 3 12] \
-        [list 4 0]]
+        [list 3 4] [list 3 5] [list 3 6] [list 3 8] [list 3 10] [list 3 12]]
   }
 
   #
   # NOTE: This procedure was adapted from the one listed on the Tcl Wiki page
   #       at "http://wiki.tcl.tk/43".  It is only intended to be used on very
@@ -102,11 +101,11 @@
     # NOTE: If this Eagle version lacks [interp readylimit] -OR- it has
     #       the default value (i.e. it always fully checks readiness),
     #       return true.
     #
     return [expr {
-      [catch {interp readylimit {}} readylimit] || $readylimit == 0
+      [catch {interp readylimit {}} readylimit] != 0 || $readylimit == 0
     }]
   }
 
   #
   # NOTE: This procedure should return non-zero if the "whoami" command may
@@ -314,38 +313,10 @@
         #
         if {[file exists $fileName]} then {
           lappend fileNames $fileName
         }
       }
-
-      #
-      # TODO: If additional test suite files are added within the base
-      #       package path, add them here as well.
-      #
-      foreach fileNameOnly [list \
-          all.eagle constraints.eagle epilogue.eagle pkgIndex.eagle \
-          pkgIndex.tcl prologue.eagle] {
-        #
-        # NOTE: First, check if the file resides in the Eagle-specific
-        #       package sub-directory.  Failing that, fallback to using
-        #       the base package path itself.
-        #
-        set fileName [file join \
-            $::test_package_path Test1.0 $fileNameOnly]
-
-        if {![file exists $fileName]} then {
-          set fileName [file join $::test_package_path $fileNameOnly]
-        }
-
-        #
-        # NOTE: If the test suite file exists, add it to the list of file
-        #       names to process.
-        #
-        if {[file exists $fileName]} then {
-          lappend fileNames $fileName
-        }
-      }
     }
 
     #
     # NOTE: Check if the test package path is available.
     #
@@ -352,11 +323,13 @@
     if {[info exists ::test_path]} then {
       #
       # TODO: If additional test suite files are added within the test
       #       package path, add them here as well.
       #
-      foreach fileNameOnly [list all.eagle epilogue.eagle prologue.eagle] {
+      foreach fileNameOnly [list \
+          all.eagle constraints.eagle epilogue.eagle pkgIndex.eagle \
+          pkgIndex.tcl prologue.eagle] {
         #
         # NOTE: Check if the file resides in the test package directory.
         #
         set fileName [file join $::test_path $fileNameOnly]
 
@@ -1612,26 +1585,10 @@
     } else {
       tputs $channel no\n
     }
   }
 
-  proc checkForFullTest { channel } {
-    tputs $channel "---- checking for full testing... "
-
-    #
-    # NOTE: Are we allowed to do full testing (i.e. to run rarely
-    #       needed tests)?
-    #
-    if {![info exists ::no(fullTest)]} then {
-      addConstraint fullTest
-
-      tputs $channel yes\n
-    } else {
-      tputs $channel no\n
-    }
-  }
-
   proc checkForMemoryIntensive { channel } {
     tputs $channel "---- checking for memory intensive testing... "
 
     #
     # NOTE: Are we allowed to do memory intensive testing?
@@ -1991,88 +1948,10 @@
       } else {
         tputs $channel no\n
       }
     }
 
-    proc checkForStrongNameKey { channel } {
-      tputs $channel "---- checking for strong name key... "
-
-      if {[catch {info engine PublicKeyToken} publicKeyToken] == 0 && \
-          [string length $publicKeyToken] > 0} then {
-        #
-        # NOTE: Add a test constraint for this specific strong name key.
-        #
-        addConstraint [appendArgs strongName. $publicKeyToken]
-
-        #
-        # NOTE: Show the strong name key that we found.
-        #
-        tputs $channel [appendArgs "yes (" $publicKeyToken ")\n"]
-
-        #
-        # BUGBUG: Tcl 8.4 does not seem to like this expression because it
-        #         contains the "ni" operator added in Tcl 8.5 (and Tcl 8.4
-        #         tries to compile it even though it will only be evaluated
-        #         in Eagle).
-        #
-        set expr {$publicKeyToken ni \
-            "29c6297630be05eb 1e22ec67879739a2 358030063a832bc3"}
-
-        if {[expr $expr]} then {
-          #
-          # NOTE: The Eagle core library is strong name signed with a key that
-          #       is not official.  This is also not an error, per se; however,
-          #       it may cause some tests to fail and it should be reported to
-          #       the user and noted in the test suite log file.
-          #
-          addConstraint strongName.unofficial
-
-          #
-          # NOTE: Unless forbidden, issue and log a warning.
-          #
-          if {![info exists no(warningForStrongNameKey)] && \
-              ![haveConstraint quiet]} then {
-            tputs $channel [appendArgs \
-                "==== WARNING: unofficial Eagle strong name signature " \
-                "detected: " $publicKeyToken \n]
-          }
-        } else {
-          #
-          # NOTE: Several tests require one of the official strong name keys to
-          #       be used in order for them to pass.
-          #
-          addConstraint strongName.official
-
-          tputs $channel [appendArgs \
-              "---- official Eagle strong name signature detected: " \
-              $publicKeyToken \n]
-        }
-      } else {
-        #
-        # NOTE: The Eagle core library is not signed with a strong name key.
-        #       This is not an error, per se; however, it may cause selected
-        #       tests to fail and it should be reported to the user and noted
-        #       in the test suite log file.
-        #
-        addConstraint strongName.none
-
-        #
-        # NOTE: Show that we did not find a strong name key.
-        #
-        tputs $channel no\n
-
-        #
-        # NOTE: Unless forbidden, issue and log a warning.
-        #
-        if {![info exists no(warningForStrongNameKey)] && \
-            ![haveConstraint quiet]} then {
-          tputs $channel \
-              "==== WARNING: no Eagle strong name signature detected...\n"
-        }
-      }
-    }
-
     proc checkForCertificate { channel } {
       tputs $channel "---- checking for certificate... "
 
       if {[catch {
         object invoke Interpreter.GetActive GetCertificate
@@ -2086,11 +1965,11 @@
         #
         # NOTE: Attempt to query the subject from the certificate.
         #
         if {[catch {
           object invoke $certificate Subject
-        } subject] || [string length $subject] == 0} then {
+        } subject] != 0 || [string length $subject] == 0} then {
           #
           # TODO: No certificate subject, better handling here?
           #
           set subject unknown
         }
@@ -2188,15 +2067,15 @@
       if {[catch {
         object invoke AppDomain CurrentDomain
       } appDomain] == 0 && [string length $appDomain] > 0} then {
         if {[catch {
           object invoke $appDomain IsDefaultAppDomain
-        } default] || [string length $default] == 0} then {
+        } default] != 0 || [string length $default] == 0} then {
           set default false
         }
 
-        if {[catch {object invoke $appDomain Id} id] || \
+        if {[catch {object invoke $appDomain Id} id] != 0 || \
             [string length $id] == 0} then {
           set id unknown
         }
 
         if {$default} then {
@@ -2496,57 +2375,10 @@
       } else {
         tputs $channel "no, unknown\n"
       }
     }
 
-    proc checkForTestCallStack { channel } {
-      tputs $channel "---- checking for test call stack... "
-
-      #
-      # NOTE: Search for a call frame with associated arguments.
-      #       At this point, there must be at least one such call
-      #       frame (this one).  Therefore, this loop will always
-      #       terminate.
-      #
-      set index 0; set arguments [list]
-      set script {info level [info level]}
-
-      while {1} {
-        set level [appendArgs ## $index]
-
-        if {[catch {uplevel $level $script} arguments] == 0} then {
-          break
-        }
-
-        incr index
-      }
-
-      #
-      # NOTE: Grab the command name from the arguments, if any.
-      #
-      set command [expr {
-        [llength $arguments] > 0 ? [lindex $arguments 0] : ""
-      }]
-
-      #
-      # HACK: Make sure the call stack does not end up confusing
-      #       the tests that rely on absolute call frames.
-      #
-      if {$command in [list checkForTestCallStack]} then {
-        addConstraint testCallStack
-
-        tputs $channel [appendArgs "yes (\"" $command "\")\n"]
-
-        #
-        # NOTE: We are done here, return now.
-        #
-        return
-      }
-
-      tputs $channel [appendArgs "no (\"" $command "\")\n"]
-    }
-
     proc checkForGarudaDll { channel } {
       #
       # NOTE: Skip automatic Tcl shell machine detection if we are not
       #       allowed to execute external commands.
       #
@@ -3388,29 +3220,12 @@
       }
 
       tputs $channel no\n
     }
 
-    proc getFrameworkSetup46Value {} {
-      #
-      # NOTE: Check if we are running on Windows 10 or later.
-      #
-      if {[isWindows] && $::tcl_platform(osVersion) >= 10.0} then {
-        #
-        # NOTE: We are running on Windows 10, return the special value.
-        #
-        return 393295
-      }
-
-      #
-      # NOTE: We are not running on Windows 10, return the normal value.
-      #
-      return 393297
-    }
-
-    proc checkForNetFx4x { channel } {
-      tputs $channel "---- checking for .NET Framework 4.x... "
+    proc checkForNetFx45 { channel } {
+      tputs $channel "---- checking for .NET Framework 4.5... "
 
       #
       # NOTE: Platform must be Windows for this constraint to even be
       #       checked (i.e. we require the registry).
       #
@@ -3447,23 +3262,22 @@
           #       (or 378675 for Windows 8.1), then the .NET Framework 4.5.1
           #       is installed.  However, if the "release" value is also
           #       greater than or equal to 379893, then the .NET Framework
           #       4.5.2 is installed, which is an in-place upgrade to 4.5.1
           #       (and 4.5).  If the "release" value is also greater than or
-          #       equal to 393297 (393295 on Windows 10), then the .NET
-          #       Framework 4.6 is installed, which is an in-place upgrade
-          #       to 4.5.x.
+          #       equal to 393246, then the .NET Framework 4.6 is installed,
+          #       which is an in-place upgrade to 4.5.x.
+          #
+          # TODO: Change the value 393246 when the .NET Framework 4.6 goes
+          #       final.
           #
-          if {$release >= [getFrameworkSetup46Value]} then {
-            addConstraint dotNet451OrHigher
-            addConstraint dotNet452OrHigher
+          if {$release >= 393246} then {
             addConstraint dotNet46
             addConstraint dotNet46OrHigher
 
             set version 4.6
           } elseif {$release >= 379893} then {
-            addConstraint dotNet451OrHigher
             addConstraint dotNet452
             addConstraint dotNet452OrHigher
 
             set version 4.5.2
           } elseif {$release >= 378675} then {
@@ -3708,14 +3522,14 @@
         checkForTestMachine checkForTestPlatform checkForTestConfiguration \
         checkForTestSuffix checkForFile checkForPathFile checkForNativeCode \
         checkForTip127 checkForTip194 checkForTip207 checkForTip241 \
         checkForTip285 checkForTip405 checkForTip426 checkForTip429 \
         checkForTiming checkForPerformance checkForBigLists \
-        checkForTimeIntensive checkForFullTest checkForMemoryIntensive \
-        checkForStackIntensive checkForInteractive checkForInteractiveCommand \
-        checkForUserInteraction checkForNetwork checkForCompileOption \
-        checkForKnownCompileOptions] false false
+        checkForTimeIntensive checkForMemoryIntensive checkForStackIntensive \
+        checkForInteractive checkForInteractiveCommand checkForUserInteraction \
+        checkForNetwork checkForCompileOption checkForKnownCompileOptions] \
+        false false
 
     ###########################################################################
     ############################## END Tcl ONLY ###############################
     ###########################################################################
   }

Index: Externals/Eagle/lib/Test1.0/epilogue.eagle
==================================================================
--- Externals/Eagle/lib/Test1.0/epilogue.eagle
+++ Externals/Eagle/lib/Test1.0/epilogue.eagle
@@ -23,19 +23,21 @@
   # NOTE: Verify that the current call frame is correct and that the
   #       interpreter call stack has not been imbalanced by previous
   #       tests or other errors.  This check only applies to Eagle.
   #
   if {[isEagle] && [llength [info commands object]] > 0} then {
-    #
-    # NOTE: Check the name of the current call frame against the one
-    #       that should be used for evaluating this script file.
-    #
-    if {[object invoke -flags +NonPublic \
-            Interpreter.GetActive.CurrentFrame Name] ne \
-        [list source [file normalize [info script]]]} then {
-      unset -nocomplain test_suite_running
-      error "cannot run epilogue, current frame not for this script"
+    catch {
+      #
+      # NOTE: Check the name of the current call frame against the one
+      #       that should be used for evaluating this script file.
+      #
+      if {[object invoke -flags +NonPublic \
+              Interpreter.GetActive.CurrentFrame Name] ne \
+          [list source [file normalize [info script]]]} then {
+        unset -nocomplain test_suite_running
+        error "cannot run, current frame is not for this script"
+      }
     }
   }
 
   #
   # NOTE: Make sure all the variables used by this epilogue are unset.

Index: Externals/Eagle/lib/Test1.0/prologue.eagle
==================================================================
--- Externals/Eagle/lib/Test1.0/prologue.eagle
+++ Externals/Eagle/lib/Test1.0/prologue.eagle
@@ -21,33 +21,25 @@
 
   #
   # NOTE: Make sure all the variables used by this prologue are unset.
   #
   unset -nocomplain pkg_dir pattern dummy directory name value exec encoding \
-      host memory stack drive server database timeout user password percent \
-      checkout timeStamp loaded
+      host memory stack drive publicKeyToken expr server database timeout \
+      user password percent checkout timeStamp loaded
 
   #
   # NOTE: Indicate that the test suite is currently running.
   #
   if {![info exists test_suite_running] || !$test_suite_running} then {
     set test_suite_running true
   }
 
-  #
-  # NOTE: Set the location of the test suite package, if necessary.
-  #
-  if {![info exists test_all_path]} then {
-    set test_all_path [file normalize [file dirname [info script]]]
-  }
-
   #
   # NOTE: Set the location of the test suite, if necessary.
   #
   if {![info exists test_path]} then {
-    set test_path [file normalize [file join \
-        [file dirname [file dirname $test_all_path]] Library Tests]]
+    set test_path [file normalize [file dirname [info script]]]
   }
 
   #
   # NOTE: Set the location of the test suite data, if necessary.
   #
@@ -187,19 +179,11 @@
   if {[lsearch -exact $auto_path $test_package_path] == -1} then {
     lappend auto_path $test_package_path
   }
 
   #
-  # NOTE: Make sure the test suite package is part of the auto-path.
-  #
-  if {[lsearch -exact $auto_path $test_all_path] == -1} then {
-    lappend auto_path $test_all_path
-  }
-
-  #
-  # NOTE: Make sure the test suite is part of the auto-path.  This is
-  #       now done for legacy compatibility only.
+  # NOTE: Make sure our test package path is part of the auto-path.
   #
   if {[lsearch -exact $auto_path $test_path] == -1} then {
     lappend auto_path $test_path
   }
 
@@ -234,19 +218,21 @@
   #       interpreter call stack has not been imbalanced by previous
   #       tests or other errors.  This check only applies to Eagle.
   #       This block requires the "Eagle.Library" package.
   #
   if {[isEagle] && [llength [info commands object]] > 0} then {
-    #
-    # NOTE: Check the name of the current call frame against the one
-    #       that should be used for evaluating this script file.
-    #
-    if {[object invoke -flags +NonPublic \
-            Interpreter.GetActive.CurrentFrame Name] ne \
-        [list source [file normalize [info script]]]} then {
-      unset -nocomplain test_suite_running
-      error "cannot run prologue, current frame not for this script"
+    catch {
+      #
+      # NOTE: Check the name of the current call frame against the one
+      #       that should be used for evaluating this script file.
+      #
+      if {[object invoke -flags +NonPublic \
+              Interpreter.GetActive.CurrentFrame Name] ne \
+          [list source [file normalize [info script]]]} then {
+        unset -nocomplain test_suite_running
+        error "cannot run, current frame is not for this script"
+      }
     }
   }
 
   #############################################################################
 
@@ -321,18 +307,16 @@
   set test_flags(-preTest) ""; # default to not evaluating anything.
   set test_flags(-postTest) ""; # default to not evaluating anything.
   set test_flags(-preWait) ""; # default to not waiting.
   set test_flags(-postWait) ""; # default to not waiting.
   set test_flags(-tclsh) ""; # Tcl shell, default to empty.
-  set test_flags(-bad) [list]; # these are the unrecognized arguments.
-  set test_flags(-no) [list]; # default to not having any restrictions.
 
   #
   # NOTE: Check for and process any command line arguments.
   #
   if {[info exists argv]} then {
-    set test_flags(-bad) [eval processTestArguments test_flags false $argv]
+    eval processTestArguments test_flags $argv
 
     if {[info exists test_flags(-no)] && \
         [string length $test_flags(-no)] > 0} then {
       #
       # NOTE: Set the test run restrictions based on the provided command line
@@ -747,15 +731,10 @@
 
   tputs $test_channel [appendArgs "---- command line: " \
       [expr {[info exists argv] && [string length $argv] > 0 ? \
           $argv : "<none>"}] \n]
 
-  tputs $test_channel [appendArgs "---- unrecognized arguments: " \
-      [expr {[info exists test_flags(-bad)] && \
-          [string length $test_flags(-bad)] > 0 ? \
-              $test_flags(-bad) : "<none>"}] \n]
-
   tputs $test_channel [appendArgs "---- logging to: " \
       [expr {[info exists test_log] && [string length $test_log] > 0 ? \
           [appendArgs \" $test_log \"] : "<none>"}] \n]
 
   tputs $test_channel [appendArgs "---- pass threshold: " \
@@ -903,10 +882,78 @@
       #       itself.
       #
       checkForQuiet $test_channel false
     }
 
+    #
+    # NOTE: Has strong name key detection been disabled?
+    #
+    if {![info exists no(strongNameKey)]} then {
+      catch {info engine PublicKeyToken} publicKeyToken
+
+      if {[string length $publicKeyToken] == 0} then {
+        #
+        # NOTE: The Eagle core library is not signed with a strong name key.
+        #       This is not an error, per se; however, it may cause selected
+        #       tests to fail and it should be reported to the user and noted
+        #       in the test suite log file.
+        #
+        addConstraint strongName.none
+
+        if {![info exists no(warningForStrongNameKey)] && \
+            ![haveConstraint quiet]} then {
+          tputs $test_channel \
+              "==== WARNING: no Eagle strong name signature detected...\n"
+        }
+      } else {
+        #
+        # NOTE: Add a test constraint for this specific strong name key.
+        #
+        addConstraint [appendArgs strongName. $publicKeyToken]
+
+        #
+        # BUGBUG: Tcl 8.4 does not seem to like this expression because it
+        #         contains the "ni" operator added in Tcl 8.5 (and Tcl 8.4
+        #         tries to compile it even though it will only be evaluated
+        #         in Eagle).
+        #
+        set expr {$publicKeyToken ni \
+            "29c6297630be05eb 1e22ec67879739a2 358030063a832bc3"}
+
+        if {[expr $expr]} then {
+          #
+          # NOTE: The Eagle core library is strong name signed with a key that
+          #       is not official.  This is also not an error, per se; however,
+          #       it may cause some tests to fail and it should be reported to
+          #       the user and noted in the test suite log file.
+          #
+          addConstraint strongName.unofficial
+
+          if {![info exists no(warningForStrongNameKey)] && \
+              ![haveConstraint quiet]} then {
+            tputs $test_channel [appendArgs \
+                "==== WARNING: unofficial Eagle strong name signature " \
+                "detected: " $publicKeyToken \n]
+          }
+        } else {
+          #
+          # NOTE: Several tests require one of the official strong name keys to
+          #       be used in order for them to pass.
+          #
+          addConstraint strongName.official
+
+          tputs $test_channel [appendArgs \
+              "---- official Eagle strong name signature detected: " \
+              $publicKeyToken \n]
+        }
+
+        unset expr
+      }
+
+      unset publicKeyToken
+    }
+
     #
     # NOTE: Has administrator detection support been disabled?  We do
     #       this check [nearly] first as it may [eventually] be used
     #       to help determine if other constraints should be skipped.
     #
@@ -994,17 +1041,10 @@
       checkForMachine $test_channel 32 arm;   # (i.e. arm)
       checkForMachine $test_channel 64 ia64;  # (i.e. itanium)
       checkForMachine $test_channel 64 amd64; # (i.e. x64)
     }
 
-    #
-    # NOTE: Has test suite call stack probing been disabled?
-    #
-    if {![info exists no(testCallStack)]} then {
-      checkForTestCallStack $test_channel
-    }
-
     #
     # NOTE: Has culture detection support been disabled?
     #
     if {![info exists no(culture)]} then {
       checkForCulture $test_channel
@@ -1029,17 +1069,10 @@
     #
     if {![info exists no(strongName)]} then {
       checkForStrongName $test_channel
     }
 
-    #
-    # NOTE: Has strong name key detection been disabled?
-    #
-    if {![info exists no(strongNameKey)]} then {
-      checkForStrongNameKey $test_channel
-    }
-
     #
     # NOTE: Has certificate detection support been disabled?
     #
     if {![info exists no(certificate)]} then {
       checkForCertificate $test_channel
@@ -1582,45 +1615,10 @@
         #
         checkForObjectMember $test_channel Eagle._Tests.Default \
             *TestPermute*
       }
 
-      if {![info exists no(testDynamicCallback)]} then {
-        #
-        # NOTE: For tests "object-8.1??".
-        #
-        checkForObjectMember $test_channel Eagle._Tests.Default \
-            *TestCallDynamicCallback0*
-
-        checkForObjectMember $test_channel Eagle._Tests.Default \
-            *TestCallDynamicCallback1*
-
-        checkForObjectMember $test_channel Eagle._Tests.Default \
-            *TestCallDynamicCallback2*
-
-        checkForObjectMember $test_channel Eagle._Tests.Default \
-            *TestCallDynamicCallback3*
-
-        checkForObjectMember $test_channel Eagle._Tests.Default \
-            *TestGetDynamicCallbacks*
-
-        checkForObjectMember $test_channel Eagle._Tests.Default \
-            *TestCallStaticDynamicCallback0*
-
-        checkForObjectMember $test_channel Eagle._Tests.Default \
-            *TestCallStaticDynamicCallback1*
-
-        checkForObjectMember $test_channel Eagle._Tests.Default \
-            *TestCallStaticDynamicCallback2*
-
-        checkForObjectMember $test_channel Eagle._Tests.Default \
-            *TestCallStaticDynamicCallback3*
-
-        checkForObjectMember $test_channel Eagle._Tests.Default \
-            *TestGetStaticDynamicCallbacks*
-      }
-
       #
       # NOTE: Has DateTime testing support been disabled?
       #
       if {![info exists no(testDateTime)]} then {
         #
@@ -2119,17 +2117,17 @@
       #
       checkForNetFx20ServicePack $test_channel
     }
 
     #
-    # NOTE: Has .NET Framework 4.x testing support been disabled?
+    # NOTE: Has .NET Framework 4.5 testing support been disabled?
     #
-    if {![info exists no(netFx4x)]} then {
+    if {![info exists no(netFx45)]} then {
       #
       # NOTE: For test "object-12.1.*".
       #
-      checkForNetFx4x $test_channel
+      checkForNetFx45 $test_channel
     }
 
     #
     # NOTE: Has target framework testing support been disabled?
     #
@@ -2355,17 +2353,10 @@
     #
     if {![info exists no(benchmark.txt)]} then {
       checkForFile $test_channel [file join $test_data_path benchmark.txt]
     }
 
-    #
-    # NOTE: For test "benchmark-1.42".
-    #
-    if {![info exists no(pngDump.txt)]} then {
-      checkForFile $test_channel [file join $test_data_path pngDump.txt]
-    }
-
     #
     # NOTE: For test "garuda-1.1".
     #
     if {![info exists no(pkgAll.tcl)]} then {
       checkForFile $test_channel [file join $base_path Native Package \
@@ -2377,17 +2368,10 @@
     #
     if {![info exists no(bad_subst.txt)]} then {
       checkForFile $test_channel [file join $test_data_path bad_subst.txt]
     }
 
-    #
-    # NOTE: For test "processIsolation-1.1".
-    #
-    if {![info exists no(isolated.eagle)]} then {
-      checkForFile $test_channel [file join $test_data_path isolated.eagle]
-    }
-
     #
     # NOTE: This is not currently used by any tests.
     #
     if {![info exists no(evaluate.eagle)]} then {
       checkForFile $test_channel [file join $test_data_path evaluate.eagle]
@@ -2638,14 +2622,10 @@
 
   if {![info exists no(checkForTimeIntensive)]} then {
     checkForTimeIntensive $test_channel
   }
 
-  if {![info exists no(checkForFullTest)]} then {
-    checkForFullTest $test_channel
-  }
-
   if {![info exists no(checkForMemoryIntensive)]} then {
     checkForMemoryIntensive $test_channel
   }
 
   if {![info exists no(checkForStackIntensive)]} then {

Index: SQLite.Interop/src/ext/fts5.c
==================================================================
--- SQLite.Interop/src/ext/fts5.c
+++ SQLite.Interop/src/ext/fts5.c
@@ -42,25 +42,19 @@
 ** the sqlite3_module.xFindFunction() method.
 */
 
 typedef struct Fts5ExtensionApi Fts5ExtensionApi;
 typedef struct Fts5Context Fts5Context;
-typedef struct Fts5PhraseIter Fts5PhraseIter;
 
 typedef void (*fts5_extension_function)(
   const Fts5ExtensionApi *pApi,   /* API offered by current FTS version */
   Fts5Context *pFts,              /* First arg to pass to pApi functions */
   sqlite3_context *pCtx,          /* Context for returning result/error */
   int nVal,                       /* Number of values in apVal[] array */
   sqlite3_value **apVal           /* Array of trailing arguments */
 );
 
-struct Fts5PhraseIter {
-  const unsigned char *a;
-  const unsigned char *b;
-};
-
 /*
 ** EXTENSION API FUNCTIONS
 **
 ** xUserData(pFts):
 **   Return a copy of the context pointer the extension function was 
@@ -76,23 +70,15 @@
 **   If parameter iCol is greater than or equal to the number of columns
 **   in the table, SQLITE_RANGE is returned. Or, if an error occurs (e.g.
 **   an OOM condition or IO error), an appropriate SQLite error code is 
 **   returned.
 **
-** xColumnCount(pFts):
-**   Return the number of columns in the table.
-**
-** xColumnSize(pFts, iCol, pnToken):
-**   If parameter iCol is less than zero, set output variable *pnToken
-**   to the total number of tokens in the current row. Or, if iCol is
-**   non-negative but less than the number of columns in the table, set
-**   *pnToken to the number of tokens in column iCol of the current row.
-**
-**   If parameter iCol is greater than or equal to the number of columns
-**   in the table, SQLITE_RANGE is returned. Or, if an error occurs (e.g.
-**   an OOM condition or IO error), an appropriate SQLite error code is 
-**   returned.
+** xColumnCount:
+**   Returns the number of columns in the FTS5 table.
+**
+** xColumnSize:
+**   Reports the size in tokens of a column value from the current row.
 **
 ** xColumnText:
 **   This function attempts to retrieve the text of column iCol of the
 **   current document. If successful, (*pz) is set to point to a buffer
 **   containing the text in utf-8 encoding, (*pn) is set to the size in bytes
@@ -190,34 +176,10 @@
 **
 **   This function is used to retrieve the total number of rows in the table.
 **   In other words, the same value that would be returned by:
 **
 **        SELECT count(*) FROM ftstable;
-**
-** xPhraseFirst()
-**   This function is used, along with type Fts5PhraseIter and the xPhraseNext
-**   method, to iterate through all instances of a single query phrase within
-**   the current row. This is the same information as is accessible via the
-**   xInstCount/xInst APIs. While the xInstCount/xInst APIs are more convenient
-**   to use, this API may be faster under some circumstances. To iterate 
-**   through instances of phrase iPhrase, use the following code:
-**
-**       Fts5PhraseIter iter;
-**       int iCol, iOff;
-**       for(pApi->xPhraseFirst(pFts, iPhrase, &iter, &iCol, &iOff);
-**           iOff>=0;
-**           pApi->xPhraseNext(pFts, &iter, &iCol, &iOff)
-**       ){
-**         // An instance of phrase iPhrase at offset iOff of column iCol
-**       }
-**
-**   The Fts5PhraseIter structure is defined above. Applications should not
-**   modify this structure directly - it should only be used as shown above
-**   with the xPhraseFirst() and xPhraseNext() API methods.
-**
-** xPhraseNext()
-**   See xPhraseFirst above.
 */
 struct Fts5ExtensionApi {
   int iVersion;                   /* Currently always set to 1 */
 
   void *(*xUserData)(Fts5Context*);
@@ -245,13 +207,10 @@
   int (*xQueryPhrase)(Fts5Context*, int iPhrase, void *pUserData,
     int(*)(const Fts5ExtensionApi*,Fts5Context*,void*)
   );
   int (*xSetAuxdata)(Fts5Context*, void *pAux, void(*xDelete)(void*));
   void *(*xGetAuxdata)(Fts5Context*, int bClear);
-
-  void (*xPhraseFirst)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*, int*);
-  void (*xPhraseNext)(Fts5Context*, Fts5PhraseIter*, int *piCol, int *piOff);
 };
 
 /* 
 ** CUSTOM AUXILIARY FUNCTIONS
 *************************************************************************/
@@ -525,11 +484,11 @@
   /* If non-NULL, points to sqlite3_vtab.base.zErrmsg. Often NULL. */
   char **pzErrmsg;
 };
 
 /* Current expected value of %_config table 'version' field */
-#define FTS5_CURRENT_VERSION 3
+#define FTS5_CURRENT_VERSION 2
 
 #define FTS5_CONTENT_NORMAL   0
 #define FTS5_CONTENT_NONE     1
 #define FTS5_CONTENT_EXTERNAL 2
 
@@ -678,11 +637,11 @@
 **   i64 iRowid = sqlite3Fts5IterRowid(pIter);
 ** }
 */
 
 /*
-** Open a new iterator to iterate though all rowids that match the 
+** Open a new iterator to iterate though all docids that match the 
 ** specified token or token prefix.
 */
 static int sqlite3Fts5IndexQuery(
   Fts5Index *p,                   /* FTS index to query */
   const char *pToken, int nToken, /* Token (or prefix) to query for */
@@ -1974,11 +1933,11 @@
 */
 
 
 
 
-#define FTS5_DEFAULT_PAGE_SIZE   4050
+#define FTS5_DEFAULT_PAGE_SIZE   1000
 #define FTS5_DEFAULT_AUTOMERGE      4
 #define FTS5_DEFAULT_CRISISMERGE   16
 
 /* Maximum allowed page size */
 #define FTS5_MAX_PAGE_SIZE (128*1024)
@@ -2853,11 +2812,11 @@
 static void sqlite3Fts5Parser(void*, int, Fts5Token, Fts5Parse*);
 
 struct Fts5Expr {
   Fts5Index *pIndex;
   Fts5ExprNode *pRoot;
-  int bDesc;                      /* Iterate in descending rowid order */
+  int bDesc;                      /* Iterate in descending docid order */
   int nPhrase;                    /* Number of phrases in expression */
   Fts5ExprPhrase **apExprPhrase;  /* Pointers to phrase objects */
 };
 
 /*
@@ -4684,19 +4643,10 @@
   const char *zNearsetCmd = "nearset";
   int nConfig;                    /* Size of azConfig[] */
   Fts5Config *pConfig = 0;
   int iArg = 1;
 
-  if( nArg<1 ){
-    zErr = sqlite3_mprintf("wrong number of arguments to function %s",
-        bTcl ? "fts5_expr_tcl" : "fts5_expr"
-    );
-    sqlite3_result_error(pCtx, zErr, -1);
-    sqlite3_free(zErr);
-    return;
-  }
-
   if( bTcl && nArg>1 ){
     zNearsetCmd = (const char*)sqlite3_value_text(apVal[1]);
     iArg = 2;
   }
 
@@ -4831,11 +4781,11 @@
 
 /*
 ** Return the number of phrases in expression pExpr.
 */
 static int sqlite3Fts5ExprPhraseCount(Fts5Expr *pExpr){
-  return (pExpr ? pExpr->nPhrase : 0);
+  return pExpr->nPhrase;
 }
 
 /*
 ** Return the number of terms in the iPhrase'th phrase in pExpr.
 */
@@ -4996,20 +4946,20 @@
   }
   memset(pHash->aSlot, 0, pHash->nSlot * sizeof(Fts5HashEntry*));
   pHash->nEntry = 0;
 }
 
-static unsigned int fts5HashKey(int nSlot, const u8 *p, int n){
+static unsigned int fts5HashKey(int nSlot, const char *p, int n){
   int i;
   unsigned int h = 13;
   for(i=n-1; i>=0; i--){
     h = (h << 3) ^ h ^ p[i];
   }
   return (h % nSlot);
 }
 
-static unsigned int fts5HashKey2(int nSlot, u8 b, const u8 *p, int n){
+static unsigned int fts5HashKey2(int nSlot, char b, const char *p, int n){
   int i;
   unsigned int h = 13;
   for(i=n-1; i>=0; i--){
     h = (h << 3) ^ h ^ p[i];
   }
@@ -5033,11 +4983,11 @@
   for(i=0; i<pHash->nSlot; i++){
     while( apOld[i] ){
       int iHash;
       Fts5HashEntry *p = apOld[i];
       apOld[i] = p->pHashNext;
-      iHash = fts5HashKey(nNew, (u8*)p->zKey, strlen(p->zKey));
+      iHash = fts5HashKey(nNew, p->zKey, strlen(p->zKey));
       p->pHashNext = apNew[iHash];
       apNew[iHash] = p;
     }
   }
 
@@ -5073,17 +5023,16 @@
   int iCol,                       /* Column token appears in (-ve -> delete) */
   int iPos,                       /* Position of token within column */
   char bByte,                     /* First byte of token */
   const char *pToken, int nToken  /* Token to add or remove to or from index */
 ){
-  unsigned int iHash;
+  unsigned int iHash = fts5HashKey2(pHash->nSlot, bByte, pToken, nToken);
   Fts5HashEntry *p;
   u8 *pPtr;
   int nIncr = 0;                  /* Amount to increment (*pHash->pnByte) by */
 
   /* Attempt to locate an existing hash entry */
-  iHash = fts5HashKey2(pHash->nSlot, (u8)bByte, (const u8*)pToken, nToken);
   for(p=pHash->aSlot[iHash]; p; p=p->pHashNext){
     if( p->zKey[0]==bByte 
      && memcmp(&p->zKey[1], pToken, nToken)==0 
      && p->zKey[nToken+1]==0 
     ){
@@ -5097,20 +5046,20 @@
     if( nByte<128 ) nByte = 128;
 
     if( (pHash->nEntry*2)>=pHash->nSlot ){
       int rc = fts5HashResize(pHash);
       if( rc!=SQLITE_OK ) return rc;
-      iHash = fts5HashKey2(pHash->nSlot, (u8)bByte, (const u8*)pToken, nToken);
+      iHash = fts5HashKey2(pHash->nSlot, bByte, pToken, nToken);
     }
 
     p = (Fts5HashEntry*)sqlite3_malloc(nByte);
     if( !p ) return SQLITE_NOMEM;
     memset(p, 0, FTS5_HASHENTRYSIZE);
     p->nAlloc = nByte;
     p->zKey[0] = bByte;
     memcpy(&p->zKey[1], pToken, nToken);
-    assert( iHash==fts5HashKey(pHash->nSlot, (u8*)p->zKey, nToken+1) );
+    assert( iHash==fts5HashKey(pHash->nSlot, p->zKey, nToken+1) );
     p->zKey[nToken+1] = '\0';
     p->nData = nToken+1 + 1 + FTS5_HASHENTRYSIZE;
     p->nData += sqlite3Fts5PutVarint(&((u8*)p)[p->nData], iRowid);
     p->iSzPoslist = p->nData;
     p->nData += 1;
@@ -5278,11 +5227,11 @@
   Fts5Hash *pHash,                /* Hash table to query */
   const char *pTerm, int nTerm,   /* Query term */
   const u8 **ppDoclist,           /* OUT: Pointer to doclist for pTerm */
   int *pnDoclist                  /* OUT: Size of doclist in bytes */
 ){
-  unsigned int iHash = fts5HashKey(pHash->nSlot, (const u8*)pTerm, nTerm);
+  unsigned int iHash = fts5HashKey(pHash->nSlot, pTerm, nTerm);
   Fts5HashEntry *p;
 
   for(p=pHash->aSlot[iHash]; p; p=p->pHashNext){
     if( memcmp(p->zKey, pTerm, nTerm)==0 && p->zKey[nTerm]==0 ) break;
   }
@@ -5369,11 +5318,11 @@
 **     taken to ensure it is possible to iterate in either direction through 
 **     the entries in a doclist, or to seek to a specific entry within a 
 **     doclist, without loading it into memory.
 **
 **   * large doclists that span many pages have associated "doclist index"
-**     records that contain a copy of the first rowid on each page spanned by
+**     records that contain a copy of the first docid on each page spanned by
 **     the doclist. This is used to speed up seek operations, and merges of
 **     large doclists with very small doclists.
 **
 **   * extra fields in the "structure record" record the state of ongoing
 **     incremental merge operations.
@@ -5546,26 +5495,26 @@
 **     * Flags byte. Bits are:
 **         0x01: Clear if leaf is also the root page, otherwise set.
 **
 **     * Page number of fts index leaf page. As a varint.
 **
-**     * First rowid on page indicated by previous field. As a varint.
+**     * First docid on page indicated by previous field. As a varint.
 **
 **     * A list of varints, one for each subsequent termless page. A 
-**       positive delta if the termless page contains at least one rowid, 
+**       positive delta if the termless page contains at least one docid, 
 **       or an 0x00 byte otherwise.
 **
 **   Internal doclist index nodes are:
 **
 **     * Flags byte. Bits are:
 **         0x01: Clear for root page, otherwise set.
 **
 **     * Page number of first child page. As a varint.
 **
-**     * Copy of first rowid on page indicated by previous field. As a varint.
+**     * Copy of first docid on page indicated by previous field. As a varint.
 **
-**     * A list of delta-encoded varints - the first rowid on each subsequent
+**     * A list of delta-encoded varints - the first docid on each subsequent
 **       child page. 
 **
 */
 
 /*
@@ -5623,12 +5572,13 @@
 ** Each time a blob is read from the %_data table, it is padded with this
 ** many zero bytes. This makes it easier to decode the various record formats
 ** without overreading if the records are corrupt.
 */
 #define FTS5_DATA_ZERO_PADDING 8
-#define FTS5_DATA_PADDING 20
 
+typedef struct Fts5BtreeIter Fts5BtreeIter;
+typedef struct Fts5BtreeIterLevel Fts5BtreeIterLevel;
 typedef struct Fts5Data Fts5Data;
 typedef struct Fts5DlidxIter Fts5DlidxIter;
 typedef struct Fts5DlidxLvl Fts5DlidxLvl;
 typedef struct Fts5DlidxWriter Fts5DlidxWriter;
 typedef struct Fts5NodeIter Fts5NodeIter;
@@ -5668,13 +5618,10 @@
 
   /* State used by the fts5DataXXX() functions. */
   sqlite3_blob *pReader;          /* RO incr-blob open on %_data table */
   sqlite3_stmt *pWriter;          /* "INSERT ... %_data VALUES(?,?)" */
   sqlite3_stmt *pDeleter;         /* "DELETE FROM %_data ... id>=? AND id<=?" */
-  sqlite3_stmt *pIdxWriter;       /* "INSERT ... %_idx VALUES(?,?,?,?)" */
-  sqlite3_stmt *pIdxDeleter;      /* "DELETE FROM %_idx WHERE segid=? */
-  sqlite3_stmt *pIdxSelect;
   int nRead;                      /* Total number of blocks read */
 };
 
 struct Fts5DoclistIter {
   u8 *a;
@@ -5720,34 +5667,31 @@
   Fts5Buffer term;                /* Buffer containing previous term on page */
 };
 struct Fts5DlidxWriter {
   int pgno;                       /* Page number for this page */
   int bPrevValid;                 /* True if iPrev is valid */
-  i64 iPrev;                      /* Previous rowid value written to page */
+  i64 iPrev;                      /* Previous docid value written to page */
   Fts5Buffer buf;                 /* Buffer containing page data */
 };
 struct Fts5SegWriter {
   int iSegid;                     /* Segid to write to */
-  Fts5PageWriter writer;          /* PageWriter object */
-  i64 iPrevRowid;                 /* Previous rowid written to current leaf */
+  int nWriter;                    /* Number of entries in aWriter */
+  Fts5PageWriter *aWriter;        /* Array of PageWriter objects */
+  i64 iPrevRowid;                 /* Previous docid written to current leaf */
   u8 bFirstRowidInDoclist;        /* True if next rowid is first in doclist */
   u8 bFirstRowidInPage;           /* True if next rowid is first in page */
   u8 bFirstTermInPage;            /* True if next term will be first in leaf */
   int nLeafWritten;               /* Number of leaf pages written */
   int nEmpty;                     /* Number of contiguous term-less nodes */
 
   int nDlidx;                     /* Allocated size of aDlidx[] array */
   Fts5DlidxWriter *aDlidx;        /* Array of Fts5DlidxWriter objects */
-
-  /* Values to insert into the %_idx table */
-  Fts5Buffer btterm;              /* Next term to insert into %_idx table */
-  int iBtPage;                    /* Page number corresponding to btterm */
 };
 
 /*
 ** Object for iterating through the merged results of one or more segments,
-** visiting each term/rowid pair in the merged data.
+** visiting each term/docid pair in the merged data.
 **
 ** nSeg is always a power of two greater than or equal to the number of
 ** segments that this object is merging data from. Both the aSeg[] and
 ** aFirst[] arrays are sized at nSeg entries. The aSeg[] array is padded
 ** with zeroed objects - these are handled as if they were iterators opened
@@ -5768,11 +5712,11 @@
   u16 iFirst;                     /* aSeg[] index of firstest iterator */
   u8 bTermEq;                     /* True if the terms are equal */
 };
 
 /*
-** Object for iterating through a single segment, visiting each term/rowid
+** Object for iterating through a single segment, visiting each term/docid
 ** pair in the segment.
 **
 ** pSeg:
 **   The segment to iterate through.
 **
@@ -5800,11 +5744,11 @@
 **     If set, set the iterator to point to EOF after the current doclist 
 **     has been exhausted. Do not proceed to the next term in the segment.
 **
 **   FTS5_SEGITER_REVERSE:
 **     This flag is only ever set if FTS5_SEGITER_ONETERM is also set. If
-**     it is set, iterate through rowid in descending order instead of the
+**     it is set, iterate through docids in descending order instead of the
 **     default ascending order.
 **
 ** iRowidOffset/nRowidOffset/aRowidOffset:
 **     These are used if the FTS5_SEGITER_REVERSE flag is set.
 **
@@ -5910,10 +5854,47 @@
   int iSegid;
   Fts5DlidxLvl aLvl[1];
 };
 
 
+
+/*
+** An Fts5BtreeIter object is used to iterate through all entries in the
+** b-tree hierarchy belonging to a single fts5 segment. In this case the
+** "b-tree hierarchy" is all b-tree nodes except leaves. Each entry in the
+** b-tree hierarchy consists of the following:
+**
+**   iLeaf:  The page number of the leaf page the entry points to.
+**
+**   term:   A split-key that all terms on leaf page $iLeaf must be greater
+**           than or equal to. The "term" associated with the first b-tree
+**           hierarchy entry (the one that points to leaf page 1) is always 
+**           an empty string.
+**
+**   nEmpty: The number of empty (termless) leaf pages that immediately
+**           following iLeaf.
+**
+** The Fts5BtreeIter object is only used as part of the integrity-check code.
+*/
+struct Fts5BtreeIterLevel {
+  Fts5NodeIter s;                 /* Iterator for the current node */
+  Fts5Data *pData;                /* Data for the current node */
+};
+struct Fts5BtreeIter {
+  Fts5Index *p;                   /* FTS5 backend object */
+  Fts5StructureSegment *pSeg;     /* Iterate through this segment's b-tree */
+  int nLvl;                       /* Size of aLvl[] array */
+  Fts5BtreeIterLevel *aLvl;       /* Level for each tier of b-tree */
+
+  /* Output variables */
+  Fts5Buffer term;                /* Current term */
+  int iLeaf;                      /* Leaf containing terms >= current term */
+  int nEmpty;                     /* Number of "empty" leaves following iLeaf */
+  int bEof;                       /* Set to true at EOF */
+  int bDlidx;                     /* True if there exists a dlidx */
+};
+
 
 /*
 ** The first argument passed to this macro is a pointer to an Fts5Buffer
 ** object.
 */
@@ -6052,11 +6033,11 @@
         aOut = pBuf->p;
         if( aOut==0 ){
           rc = SQLITE_NOMEM;
         }
       }else{
-        int nSpace = nByte + FTS5_DATA_PADDING;
+        int nSpace = nByte + FTS5_DATA_ZERO_PADDING;
         pRet = (Fts5Data*)sqlite3_malloc(nSpace+sizeof(Fts5Data));
         if( pRet ){
           pRet->n = nByte;
           aOut = pRet->p = (u8*)&pRet[1];
         }else{
@@ -6108,27 +6089,10 @@
 ** fts5DataRead().
 */
 static void fts5DataRelease(Fts5Data *pData){
   sqlite3_free(pData);
 }
-
-static int fts5IndexPrepareStmt(
-  Fts5Index *p,
-  sqlite3_stmt **ppStmt,
-  char *zSql
-){
-  if( p->rc==SQLITE_OK ){
-    if( zSql ){
-      p->rc = sqlite3_prepare_v2(p->pConfig->db, zSql, -1, ppStmt, 0);
-    }else{
-      p->rc = SQLITE_NOMEM;
-    }
-  }
-  sqlite3_free(zSql);
-  return p->rc;
-}
-
 
 /*
 ** INSERT OR REPLACE a record into the %_data table.
 */
 static void fts5DataWrite(Fts5Index *p, i64 iRowid, const u8 *pData, int nData){
@@ -6135,15 +6099,21 @@
   if( p->rc!=SQLITE_OK ) return;
 
   if( p->pWriter==0 ){
     int rc = SQLITE_OK;
     Fts5Config *pConfig = p->pConfig;
-    fts5IndexPrepareStmt(p, &p->pWriter, sqlite3_mprintf(
-          "REPLACE INTO '%q'.'%q_data'(id, block) VALUES(?,?)", 
-          pConfig->zDb, pConfig->zName
-    ));
-    if( p->rc ) return;
+    char *zSql = sqlite3Fts5Mprintf(&rc,
+        "REPLACE INTO '%q'.%Q(id, block) VALUES(?,?)", pConfig->zDb, p->zDataTbl
+    );
+    if( zSql ){
+      rc = sqlite3_prepare_v2(pConfig->db, zSql, -1, &p->pWriter, 0);
+      sqlite3_free(zSql);
+    }
+    if( rc!=SQLITE_OK ){
+      p->rc = rc;
+      return;
+    }
   }
 
   sqlite3_bind_int64(p->pWriter, 1, iRowid);
   sqlite3_bind_blob(p->pWriter, 2, pData, nData, SQLITE_STATIC);
   sqlite3_step(p->pWriter);
@@ -6160,12 +6130,11 @@
 
   if( p->pDeleter==0 ){
     int rc;
     Fts5Config *pConfig = p->pConfig;
     char *zSql = sqlite3_mprintf(
-        "DELETE FROM '%q'.'%q_data' WHERE id>=? AND id<=?", 
-          pConfig->zDb, pConfig->zName
+        "DELETE FROM '%q'.%Q WHERE id>=? AND id<=?", pConfig->zDb, p->zDataTbl
     );
     if( zSql==0 ){
       rc = SQLITE_NOMEM;
     }else{
       rc = sqlite3_prepare_v2(pConfig->db, zSql, -1, &p->pDeleter, 0);
@@ -6188,22 +6157,10 @@
 */
 static void fts5DataRemoveSegment(Fts5Index *p, int iSegid){
   i64 iFirst = FTS5_SEGMENT_ROWID(iSegid, 0, 0);
   i64 iLast = FTS5_SEGMENT_ROWID(iSegid+1, 0, 0)-1;
   fts5DataDelete(p, iFirst, iLast);
-  if( p->pIdxDeleter==0 ){
-    Fts5Config *pConfig = p->pConfig;
-    fts5IndexPrepareStmt(p, &p->pIdxDeleter, sqlite3_mprintf(
-          "DELETE FROM '%q'.'%q_idx' WHERE segid=?",
-          pConfig->zDb, pConfig->zName
-    ));
-  }
-  if( p->rc==SQLITE_OK ){
-    sqlite3_bind_int(p->pIdxDeleter, 1, iSegid);
-    sqlite3_step(p->pIdxDeleter);
-    p->rc = sqlite3_reset(p->pIdxDeleter);
-  }
 }
 
 /*
 ** Release a reference to an Fts5Structure object returned by an earlier 
 ** call to fts5StructureRead() or fts5StructureDecode().
@@ -7575,11 +7532,11 @@
 
     /* Skip past the doclist. If the end of the page is reached, bail out. */
     while( 1 ){
       int nPos;
 
-      /* Skip past rowid delta */
+      /* Skip past docid delta */
       fts5IndexSkipVarint(a, iOff);
 
       /* Skip past position list */
       fts5IndexGetVarint32(a, iOff, nPos);
       iOff += (nPos >> 1);
@@ -7648,10 +7605,11 @@
   int flags,                      /* Mask of FTS5INDEX_XXX flags */
   Fts5StructureSegment *pSeg,     /* Description of segment */
   Fts5SegIter *pIter              /* Object to populate */
 ){
   int iPg = 1;
+  int h;
   int bGe = (flags & FTS5INDEX_QUERY_SCAN);
   int bDlidx = 0;                 /* True if there is a doclist-index */
 
   static int nCall = 0;
   nCall++;
@@ -7661,27 +7619,16 @@
   memset(pIter, 0, sizeof(*pIter));
   pIter->pSeg = pSeg;
 
   /* This block sets stack variable iPg to the leaf page number that may
   ** contain term (pTerm/nTerm), if it is present in the segment. */
-  if( p->pIdxSelect==0 ){
-    Fts5Config *pConfig = p->pConfig;
-    fts5IndexPrepareStmt(p, &p->pIdxSelect, sqlite3_mprintf(
-          "SELECT pgno FROM '%q'.'%q_idx' WHERE "
-          "segid=? AND term<=? ORDER BY term DESC LIMIT 1",
-          pConfig->zDb, pConfig->zName
-    ));
-  }
-  if( p->rc ) return;
-  sqlite3_bind_int(p->pIdxSelect, 1, pSeg->iSegid);
-  sqlite3_bind_blob(p->pIdxSelect, 2, pTerm, nTerm, SQLITE_STATIC);
-  if( SQLITE_ROW==sqlite3_step(p->pIdxSelect) ){
-    i64 val = sqlite3_column_int(p->pIdxSelect, 0);
-    iPg = (int)(val>>1);
-    bDlidx = (val & 0x0001);
-  }
-  p->rc = sqlite3_reset(p->pIdxSelect);
+  for(h=pSeg->nHeight-1; h>0; h--){
+    i64 iRowid = FTS5_SEGMENT_ROWID(pSeg->iSegid, h, iPg);
+    fts5DataBuffer(p, pBuf, iRowid);
+    if( p->rc ) break;
+    iPg = fts5NodeSeek(pBuf, pTerm, nTerm, &bDlidx);
+  }
 
   if( iPg<pSeg->pgnoFirst ){
     iPg = pSeg->pgnoFirst;
     bDlidx = 0;
   }
@@ -8507,55 +8454,56 @@
   }
   return p->rc;
 }
 
 /*
-** If the current doclist-index accumulating in pWriter->aDlidx[] is large
-** enough, flush it to disk and return 1. Otherwise discard it and return
-** zero.
-*/
-static int fts5WriteFlushDlidx(Fts5Index *p, Fts5SegWriter *pWriter){
-  int bFlag = 0;
-
-  /* If there were FTS5_MIN_DLIDX_SIZE or more empty leaf pages written
-  ** to the database, also write the doclist-index to disk.  */
-  if( pWriter->aDlidx[0].buf.n>0 && pWriter->nEmpty>=FTS5_MIN_DLIDX_SIZE ){
-    bFlag = 1;
-  }
-  fts5WriteDlidxClear(p, pWriter, bFlag);
-  pWriter->nEmpty = 0;
-  return bFlag;
-}
-
-/*
-** This function is called whenever processing of the doclist for the 
-** last term on leaf page (pWriter->iBtPage) is completed. 
-**
-** The doclist-index for that term is currently stored in-memory within the
-** Fts5SegWriter.aDlidx[] array. If it is large enough, this function
-** writes it out to disk. Or, if it is too small to bother with, discards
-** it.
-**
-** Fts5SegWriter.btterm currently contains the first term on page iBtPage.
-*/
-static void fts5WriteFlushBtree(Fts5Index *p, Fts5SegWriter *pWriter){
-  int bFlag;
-
-  assert( pWriter->iBtPage || pWriter->nEmpty==0 );
-  if( pWriter->iBtPage==0 ) return;
-  bFlag = fts5WriteFlushDlidx(p, pWriter);
-
+** If an "nEmpty" record must be written to the b-tree before the next
+** term, write it now. 
+*/
+static void fts5WriteBtreeNEmpty(Fts5Index *p, Fts5SegWriter *pWriter){
+  if( pWriter->nEmpty ){
+    int bFlag = 0;
+    Fts5PageWriter *pPg;
+    pPg = &pWriter->aWriter[1];
+
+    /* If there were FTS5_MIN_DLIDX_SIZE or more empty leaf pages written
+    ** to the database, also write the doclist-index to disk.  */
+    if( pWriter->aDlidx[0].buf.n>0 && pWriter->nEmpty>=FTS5_MIN_DLIDX_SIZE ){
+      bFlag = 1;
+    }
+    fts5WriteDlidxClear(p, pWriter, bFlag);
+    fts5BufferAppendVarint(&p->rc, &pPg->buf, bFlag);
+    fts5BufferAppendVarint(&p->rc, &pPg->buf, pWriter->nEmpty);
+    pWriter->nEmpty = 0;
+  }else{
+    fts5WriteDlidxClear(p, pWriter, 0);
+  }
+
+  assert( pWriter->nDlidx==0 || pWriter->aDlidx[0].buf.n==0 );
+  assert( pWriter->nDlidx==0 || pWriter->aDlidx[0].bPrevValid==0 );
+}
+
+static void fts5WriteBtreeGrow(Fts5Index *p, Fts5SegWriter *pWriter){
   if( p->rc==SQLITE_OK ){
-    const char *z = (pWriter->btterm.n>0?(const char*)pWriter->btterm.p:"");
-    /* The following was already done in fts5WriteInit(): */
-    /* sqlite3_bind_int(p->pIdxWriter, 1, pWriter->iSegid); */
-    sqlite3_bind_blob(p->pIdxWriter, 2, z, pWriter->btterm.n, SQLITE_STATIC);
-    sqlite3_bind_int64(p->pIdxWriter, 3, bFlag + ((i64)pWriter->iBtPage<<1));
-    sqlite3_step(p->pIdxWriter);
-    p->rc = sqlite3_reset(p->pIdxWriter);
-  }
-  pWriter->iBtPage = 0;
+    Fts5PageWriter *aNew;
+    Fts5PageWriter *pNew;
+    int nNew = sizeof(Fts5PageWriter) * (pWriter->nWriter+1);
+
+    aNew = (Fts5PageWriter*)sqlite3_realloc(pWriter->aWriter, nNew);
+    if( aNew==0 ){
+      p->rc = SQLITE_NOMEM;
+      return;
+    }
+
+    pNew = &aNew[pWriter->nWriter];
+    memset(pNew, 0, sizeof(Fts5PageWriter));
+    pNew->pgno = 1;
+    fts5BufferAppendVarint(&p->rc, &pNew->buf, 1);
+
+    pWriter->nWriter++;
+    pWriter->aWriter = aNew;
+  }
 }
 
 /*
 ** This is called once for each leaf page except the first that contains
 ** at least one term. Argument (nTerm/pTerm) is the split-key - a term that
@@ -8568,13 +8516,40 @@
 static void fts5WriteBtreeTerm(
   Fts5Index *p,                   /* FTS5 backend object */
   Fts5SegWriter *pWriter,         /* Writer object */
   int nTerm, const u8 *pTerm      /* First term on new page */
 ){
-  fts5WriteFlushBtree(p, pWriter);
-  fts5BufferSet(&p->rc, &pWriter->btterm, nTerm, pTerm);
-  pWriter->iBtPage = pWriter->writer.pgno;
+  int iHeight;
+  for(iHeight=1; 1; iHeight++){
+    Fts5PageWriter *pPage;
+
+    if( iHeight>=pWriter->nWriter ){
+      fts5WriteBtreeGrow(p, pWriter);
+      if( p->rc ) return;
+    }
+    pPage = &pWriter->aWriter[iHeight];
+
+    fts5WriteBtreeNEmpty(p, pWriter);
+
+    if( pPage->buf.n>=p->pConfig->pgsz ){
+      /* pPage will be written to disk. The term will be written into the
+      ** parent of pPage.  */
+      i64 iRowid = FTS5_SEGMENT_ROWID(pWriter->iSegid, iHeight, pPage->pgno);
+      fts5DataWrite(p, iRowid, pPage->buf.p, pPage->buf.n);
+      fts5BufferZero(&pPage->buf);
+      fts5BufferZero(&pPage->term);
+      fts5BufferAppendVarint(&p->rc, &pPage->buf, pPage[-1].pgno);
+      pPage->pgno++;
+    }else{
+      int nPre = fts5PrefixCompress(pPage->term.n, pPage->term.p, nTerm, pTerm);
+      fts5BufferAppendVarint(&p->rc, &pPage->buf, nPre+2);
+      fts5BufferAppendVarint(&p->rc, &pPage->buf, nTerm-nPre);
+      fts5BufferAppendBlob(&p->rc, &pPage->buf, nTerm-nPre, pTerm+nPre);
+      fts5BufferSet(&p->rc, &pPage->term, nTerm, pTerm);
+      break;
+    }
+  }
 }
 
 /*
 ** This function is called when flushing a leaf page that contains no
 ** terms at all to disk.
@@ -8654,11 +8629,11 @@
     }
 
     if( pDlidx->bPrevValid ){
       iVal = iRowid - pDlidx->iPrev;
     }else{
-      i64 iPgno = (i==0 ? pWriter->writer.pgno : pDlidx[-1].pgno);
+      i64 iPgno = (i==0 ? pWriter->aWriter[0].pgno : pDlidx[-1].pgno);
       assert( pDlidx->buf.n==0 );
       sqlite3Fts5BufferAppendVarint(&p->rc, &pDlidx->buf, !bDone);
       sqlite3Fts5BufferAppendVarint(&p->rc, &pDlidx->buf, iPgno);
       iVal = iRowid;
     }
@@ -8669,11 +8644,11 @@
   }
 }
 
 static void fts5WriteFlushLeaf(Fts5Index *p, Fts5SegWriter *pWriter){
   static const u8 zero[] = { 0x00, 0x00, 0x00, 0x00 };
-  Fts5PageWriter *pPage = &pWriter->writer;
+  Fts5PageWriter *pPage = &pWriter->aWriter[0];
   i64 iRowid;
 
   if( pWriter->bFirstTermInPage ){
     /* No term was written to this page. */
     assert( 0==fts5GetU16(&pPage->buf.p[2]) );
@@ -8708,15 +8683,15 @@
   Fts5Index *p, 
   Fts5SegWriter *pWriter,
   int nTerm, const u8 *pTerm 
 ){
   int nPrefix;                    /* Bytes of prefix compression for term */
-  Fts5PageWriter *pPage = &pWriter->writer;
+  Fts5PageWriter *pPage = &pWriter->aWriter[0];
 
   assert( pPage->buf.n==0 || pPage->buf.n>4 );
   if( pPage->buf.n==0 ){
-    /* Zero the first term and first rowid fields */
+    /* Zero the first term and first docid fields */
     static const u8 zero[] = { 0x00, 0x00, 0x00, 0x00 };
     fts5BufferAppendBlob(&p->rc, &pPage->buf, 4, zero);
     assert( pWriter->bFirstTermInPage );
   }
   if( p->rc ) return;
@@ -8743,11 +8718,11 @@
       int n = nTerm;
       if( pPage->term.n ){
         n = 1 + fts5PrefixCompress(pPage->term.n, pPage->term.p, nTerm, pTerm);
       }
       fts5WriteBtreeTerm(p, pWriter, n, pTerm);
-      pPage = &pWriter->writer;
+      pPage = &pWriter->aWriter[0];
     }
   }else{
     nPrefix = fts5PrefixCompress(pPage->term.n, pPage->term.p, nTerm, pTerm);
     fts5BufferAppendVarint(&p->rc, &pPage->buf, nPrefix);
   }
@@ -8772,30 +8747,30 @@
     fts5WriteFlushLeaf(p, pWriter);
   }
 }
 
 /*
-** Append a rowid and position-list size field to the writers output. 
+** Append a docid and position-list size field to the writers output. 
 */
 static void fts5WriteAppendRowid(
   Fts5Index *p, 
   Fts5SegWriter *pWriter,
   i64 iRowid,
   int nPos
 ){
   if( p->rc==SQLITE_OK ){
-    Fts5PageWriter *pPage = &pWriter->writer;
+    Fts5PageWriter *pPage = &pWriter->aWriter[0];
 
-    /* If this is to be the first rowid written to the page, set the 
-    ** rowid-pointer in the page-header. Also append a value to the dlidx
+    /* If this is to be the first docid written to the page, set the 
+    ** docid-pointer in the page-header. Also append a value to the dlidx
     ** buffer, in case a doclist-index is required.  */
     if( pWriter->bFirstRowidInPage ){
       fts5PutU16(pPage->buf.p, pPage->buf.n);
       fts5WriteDlidxAppend(p, pWriter, iRowid);
     }
 
-    /* Write the rowid. */
+    /* Write the docid. */
     if( pWriter->bFirstRowidInDoclist || pWriter->bFirstRowidInPage ){
       fts5BufferAppendVarint(&p->rc, &pPage->buf, iRowid);
     }else{
       assert( p->rc || iRowid>pWriter->iPrevRowid );
       fts5BufferAppendVarint(&p->rc, &pPage->buf, iRowid - pWriter->iPrevRowid);
@@ -8816,11 +8791,11 @@
   Fts5Index *p, 
   Fts5SegWriter *pWriter, 
   const u8 *aData, 
   int nData
 ){
-  Fts5PageWriter *pPage = &pWriter->writer;
+  Fts5PageWriter *pPage = &pWriter->aWriter[0];
   const u8 *a = aData;
   int n = nData;
   
   assert( p->pConfig->pgsz>0 );
   while( p->rc==SQLITE_OK && (pPage->buf.n + n)>=p->pConfig->pgsz ){
@@ -8839,11 +8814,11 @@
     fts5BufferAppendBlob(&p->rc, &pPage->buf, n, a);
   }
 }
 
 static void fts5WriteAppendZerobyte(Fts5Index *p, Fts5SegWriter *pWriter){
-  fts5BufferAppendVarint(&p->rc, &pWriter->writer.buf, 0);
+  fts5BufferAppendVarint(&p->rc, &pWriter->aWriter[0].buf, 0);
 }
 
 /*
 ** Flush any data cached by the writer object to the database. Free any
 ** allocations associated with the writer.
@@ -8853,28 +8828,43 @@
   Fts5SegWriter *pWriter,         /* Writer object */
   int *pnHeight,                  /* OUT: Height of the b-tree */
   int *pnLeaf                     /* OUT: Number of leaf pages in b-tree */
 ){
   int i;
-  Fts5PageWriter *pLeaf = &pWriter->writer;
   if( p->rc==SQLITE_OK ){
+    Fts5PageWriter *pLeaf = &pWriter->aWriter[0];
     if( pLeaf->pgno==1 && pLeaf->buf.n==0 ){
       *pnLeaf = 0;
       *pnHeight = 0;
     }else{
       if( pLeaf->buf.n>4 ){
         fts5WriteFlushLeaf(p, pWriter);
       }
       *pnLeaf = pLeaf->pgno-1;
+      if( pWriter->nWriter==1 && pWriter->nEmpty>=FTS5_MIN_DLIDX_SIZE ){
+        fts5WriteBtreeGrow(p, pWriter);
+      }
+      if( pWriter->nWriter>1 ){
+        fts5WriteBtreeNEmpty(p, pWriter);
+      }
+      *pnHeight = pWriter->nWriter;
 
-      fts5WriteFlushBtree(p, pWriter);
-      *pnHeight = 0;
+      for(i=1; i<pWriter->nWriter; i++){
+        Fts5PageWriter *pPg = &pWriter->aWriter[i];
+        fts5DataWrite(p, 
+            FTS5_SEGMENT_ROWID(pWriter->iSegid, i, pPg->pgno), 
+            pPg->buf.p, pPg->buf.n
+        );
+      }
     }
   }
-  fts5BufferFree(&pLeaf->term);
-  fts5BufferFree(&pLeaf->buf);
-  fts5BufferFree(&pWriter->btterm);
+  for(i=0; i<pWriter->nWriter; i++){
+    Fts5PageWriter *pPg = &pWriter->aWriter[i];
+    fts5BufferFree(&pPg->term);
+    fts5BufferFree(&pPg->buf);
+  }
+  sqlite3_free(pWriter->aWriter);
 
   for(i=0; i<pWriter->nDlidx; i++){
     sqlite3Fts5BufferFree(&pWriter->aDlidx[i].buf);
   }
   sqlite3_free(pWriter->aDlidx);
@@ -8886,25 +8876,52 @@
   int iSegid
 ){
   memset(pWriter, 0, sizeof(Fts5SegWriter));
   pWriter->iSegid = iSegid;
 
-  fts5WriteDlidxGrow(p, pWriter, 1);
-  pWriter->writer.pgno = 1;
+  pWriter->aWriter = (Fts5PageWriter*)fts5IdxMalloc(p, sizeof(Fts5PageWriter));
+  if( fts5WriteDlidxGrow(p, pWriter, 1) ) return;
+  pWriter->nWriter = 1;
+  pWriter->nDlidx = 1;
+  pWriter->aWriter[0].pgno = 1;
   pWriter->bFirstTermInPage = 1;
-  pWriter->iBtPage = 1;
-
-  if( p->pIdxWriter==0 ){
-    Fts5Config *pConfig = p->pConfig;
-    fts5IndexPrepareStmt(p, &p->pIdxWriter, sqlite3_mprintf(
-          "INSERT INTO '%q'.'%q_idx'(segid,term,pgno) VALUES(?,?,?)", 
-          pConfig->zDb, pConfig->zName
-    ));
-  }
+}
+
+static void fts5WriteInitForAppend(
+  Fts5Index *p,                   /* FTS5 backend object */
+  Fts5SegWriter *pWriter,         /* Writer to initialize */
+  Fts5StructureSegment *pSeg      /* Segment object to append to */
+){
+  int nByte = pSeg->nHeight * sizeof(Fts5PageWriter);
+  memset(pWriter, 0, sizeof(Fts5SegWriter));
+  pWriter->iSegid = pSeg->iSegid;
+  pWriter->aWriter = (Fts5PageWriter*)fts5IdxMalloc(p, nByte);
+  pWriter->aDlidx = (Fts5DlidxWriter*)fts5IdxMalloc(p, sizeof(Fts5DlidxWriter));
 
   if( p->rc==SQLITE_OK ){
-    sqlite3_bind_int(p->pIdxWriter, 1, pWriter->iSegid);
+    int pgno = 1;
+    int i;
+    pWriter->nDlidx = 1;
+    pWriter->nWriter = pSeg->nHeight;
+    pWriter->aWriter[0].pgno = pSeg->pgnoLast+1;
+    for(i=pSeg->nHeight-1; i>0; i--){
+      i64 iRowid = FTS5_SEGMENT_ROWID(pWriter->iSegid, i, pgno);
+      Fts5PageWriter *pPg = &pWriter->aWriter[i];
+      pPg->pgno = pgno;
+      fts5DataBuffer(p, &pPg->buf, iRowid);
+      if( p->rc==SQLITE_OK ){
+        Fts5NodeIter ss;
+        fts5NodeIterInit(pPg->buf.p, pPg->buf.n, &ss);
+        while( ss.aData ) fts5NodeIterNext(&p->rc, &ss);
+        fts5BufferSet(&p->rc, &pPg->term, ss.term.n, ss.term.p);
+        pgno = ss.iChild;
+        fts5NodeIterFree(&ss);
+      }
+    }
+    assert( p->rc!=SQLITE_OK || (pgno+pWriter->nEmpty)==pSeg->pgnoLast );
+    pWriter->bFirstTermInPage = 1;
+    assert( pWriter->aWriter[0].term.n==0 );
   }
 }
 
 /*
 ** Iterator pIter was used to iterate through the input segments of on an
@@ -8940,11 +8957,11 @@
         fts5BufferAppendVarint(&p->rc, &buf, pSeg->term.n);
         fts5BufferAppendBlob(&p->rc, &buf, pSeg->term.n, pSeg->term.p);
         fts5BufferAppendBlob(&p->rc, &buf, pData->n - iOff, &pData->p[iOff]);
         fts5DataRelease(pData);
         pSeg->pSeg->pgnoFirst = pSeg->iTermLeafPgno;
-        fts5DataDelete(p, FTS5_SEGMENT_ROWID(iId, 0, 1), iLeafRowid);
+        fts5DataDelete(p, FTS5_SEGMENT_ROWID(iId, 0, 1),iLeafRowid);
         fts5DataWrite(p, iLeafRowid, buf.p, buf.n);
       }
     }
   }
   fts5BufferFree(&buf);
@@ -8987,15 +9004,12 @@
   memset(&term, 0, sizeof(Fts5Buffer));
   if( pLvl->nMerge ){
     pLvlOut = &pStruct->aLevel[iLvl+1];
     assert( pLvlOut->nSeg>0 );
     nInput = pLvl->nMerge;
+    fts5WriteInitForAppend(p, &writer, &pLvlOut->aSeg[pLvlOut->nSeg-1]);
     pSeg = &pLvlOut->aSeg[pLvlOut->nSeg-1];
-
-    fts5WriteInit(p, &writer, pSeg->iSegid);
-    writer.writer.pgno = pSeg->pgnoLast+1;
-    writer.iBtPage = 0;
   }else{
     int iSegid = fts5AllocateSegid(p, pStruct);
 
     /* Extend the Fts5Structure object as required to ensure the output
     ** segment exists. */
@@ -9082,11 +9096,11 @@
     if( pSeg->pgnoLast==0 ){
       pLvlOut->nSeg--;
       pStruct->nSegment--;
     }
   }else{
-    assert( pSeg->pgnoLast>0 );
+    assert( pSeg->nHeight>0 && pSeg->pgnoLast>0 );
     fts5TrimSegments(p, pIter);
     pLvl->nMerge = nInput;
   }
 
   fts5MultiIterFree(p, pIter);
@@ -9257,11 +9271,11 @@
     fts5WriteInit(p, &writer, iSegid);
 
     /* Pre-allocate the buffer used to assemble leaf pages to the target
     ** page size.  */
     assert( pgsz>0 );
-    pBuf = &writer.writer.buf;
+    pBuf = &writer.aWriter[0].buf;
     fts5BufferGrow(&p->rc, pBuf, pgsz + 20);
 
     /* Begin scanning through hash table entries. This loop runs once for each
     ** term/doclist currently stored within the hash table. */
     if( p->rc==SQLITE_OK ){
@@ -9279,13 +9293,13 @@
       sqlite3Fts5HashScanEntry(pHash, &zTerm, &pDoclist, &nDoclist);
       nTerm = strlen(zTerm);
 
       /* Decide if the term will fit on the current leaf. If it will not, 
       ** flush the leaf to disk here.  */
-      if( pBuf->n>4 && (pBuf->n + nTerm + 2) > pgsz ){
+      if( (pBuf->n + nTerm + 2) > pgsz ){
         fts5WriteFlushLeaf(p, &writer);
-        pBuf = &writer.writer.buf;
+        pBuf = &writer.aWriter[0].buf;
         if( (nTerm + 32) > pBuf->nSpace ){
           fts5BufferGrow(&p->rc, pBuf, nTerm + 32 - pBuf->n);
           if( p->rc ) break;
         }
       }
@@ -9298,14 +9312,14 @@
         pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], nPre);
         nSuffix = nTerm - nPre;
       }else{
         fts5PutU16(&pBuf->p[2], pBuf->n);
         writer.bFirstTermInPage = 0;
-        if( writer.writer.pgno!=1 ){
+        if( writer.aWriter[0].pgno!=1 ){
           int nPre = fts5PrefixCompress(nTerm, zPrev, nTerm, (const u8*)zTerm);
           fts5WriteBtreeTerm(p, &writer, nPre+1, (const u8*)zTerm);
-          pBuf = &writer.writer.buf;
+          pBuf = &writer.aWriter[0].buf;
           assert( nPre<nTerm );
         }
         nSuffix = nTerm;
       }
       pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], nSuffix);
@@ -9313,11 +9327,11 @@
 
       /* We just wrote a term into page writer.aWriter[0].pgno. If a 
       ** doclist-index is to be generated for this doclist, it will be
       ** associated with this page. */
       assert( writer.nDlidx>0 && writer.aDlidx[0].buf.n==0 );
-      writer.aDlidx[0].pgno = writer.writer.pgno;
+      writer.aDlidx[0].pgno = writer.aWriter[0].pgno;
 
       if( pgsz>=(pBuf->n + nDoclist + 1) ){
         /* The entire doclist will fit on the current leaf. */
         fts5BufferSafeAppendBlob(pBuf, pDoclist, nDoclist);
       }else{
@@ -9338,11 +9352,11 @@
           nCopy = fts5GetPoslistSize(&pDoclist[iOff], &nPos, &bDummy);
           nCopy += nPos;
           iRowid += iDelta;
           
           if( writer.bFirstRowidInPage ){
-            fts5PutU16(&pBuf->p[0], pBuf->n);   /* first rowid on page */
+            fts5PutU16(&pBuf->p[0], pBuf->n);   /* first docid on page */
             pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], iRowid);
             writer.bFirstRowidInPage = 0;
             fts5WriteDlidxAppend(p, &writer, iRowid);
           }else{
             pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], iDelta);
@@ -9370,11 +9384,11 @@
               assert( n>0 );
               fts5BufferSafeAppendBlob(pBuf, &pPoslist[iPos], n);
               iPos += n;
               if( pBuf->n>=pgsz ){
                 fts5WriteFlushLeaf(p, &writer);
-                pBuf = &writer.writer.buf;
+                pBuf = &writer.aWriter[0].buf;
               }
               if( iPos>=nCopy ) break;
             }
           }
           iOff += nCopy;
@@ -9403,10 +9417,11 @@
       pSeg->pgnoLast = pgnoLast;
       pStruct->nSegment++;
     }
     fts5StructurePromote(p, 0, pStruct);
   }
+
 
   fts5IndexAutomerge(p, &pStruct, pgnoLast);
   fts5IndexCrisismerge(p, &pStruct);
   fts5StructureWrite(p, pStruct);
   fts5StructureRelease(pStruct);
@@ -9831,16 +9846,10 @@
     p->zDataTbl = sqlite3Fts5Mprintf(&rc, "%s_data", pConfig->zName);
     if( p->zDataTbl && bCreate ){
       rc = sqlite3Fts5CreateTable(
           pConfig, "data", "id INTEGER PRIMARY KEY, block BLOB", 0, pzErr
       );
-      if( rc==SQLITE_OK ){
-        rc = sqlite3Fts5CreateTable(pConfig, "idx", 
-            "segid, term, pgno, PRIMARY KEY(segid, term)", 
-            1, pzErr
-        );
-      }
       if( rc==SQLITE_OK ){
         rc = sqlite3Fts5IndexReinit(p);
       }
     }
   }
@@ -9860,13 +9869,10 @@
   int rc = SQLITE_OK;
   if( p ){
     assert( p->pReader==0 );
     sqlite3_finalize(p->pWriter);
     sqlite3_finalize(p->pDeleter);
-    sqlite3_finalize(p->pIdxWriter);
-    sqlite3_finalize(p->pIdxDeleter);
-    sqlite3_finalize(p->pIdxSelect);
     sqlite3Fts5HashFree(p->pHash);
     sqlite3Fts5BufferFree(&p->scratch);
     sqlite3_free(p->zDataTbl);
     sqlite3_free(p);
   }
@@ -9944,11 +9950,11 @@
 
   return rc;
 }
 
 /*
-** Open a new iterator to iterate though all rowid that match the 
+** Open a new iterator to iterate though all docids that match the 
 ** specified token or token prefix.
 */
 static int sqlite3Fts5IndexQuery(
   Fts5Index *p,                   /* FTS index to query */
   const char *pToken, int nToken, /* Token (or prefix) to query for */
@@ -10211,10 +10217,96 @@
   ret += (ret<<3) + iPos;
   if( iIdx>=0 ) ret += (ret<<3) + (FTS5_MAIN_PREFIX + iIdx);
   for(i=0; i<nTerm; i++) ret += (ret<<3) + pTerm[i];
   return ret;
 }
+
+static void fts5BtreeIterInit(
+  Fts5Index *p, 
+  Fts5StructureSegment *pSeg, 
+  Fts5BtreeIter *pIter
+){
+  int nByte;
+  int i;
+  nByte = sizeof(pIter->aLvl[0]) * (pSeg->nHeight-1);
+  memset(pIter, 0, sizeof(*pIter));
+  if( nByte ){
+    pIter->aLvl = (Fts5BtreeIterLevel*)fts5IdxMalloc(p, nByte);
+  }
+  if( p->rc==SQLITE_OK ){
+    pIter->nLvl = pSeg->nHeight-1;
+    pIter->p = p;
+    pIter->pSeg = pSeg;
+  }
+  for(i=0; p->rc==SQLITE_OK && i<pIter->nLvl; i++){
+    i64 iRowid = FTS5_SEGMENT_ROWID(pSeg->iSegid, i+1, 1);
+    Fts5Data *pData;
+    pIter->aLvl[i].pData = pData = fts5DataRead(p, iRowid);
+    if( pData ){
+      fts5NodeIterInit(pData->p, pData->n, &pIter->aLvl[i].s);
+    }
+  }
+
+  if( pIter->nLvl==0 || p->rc ){
+    pIter->bEof = 1;
+    pIter->iLeaf = pSeg->pgnoLast;
+  }else{
+    pIter->nEmpty = pIter->aLvl[0].s.nEmpty;
+    pIter->iLeaf = pIter->aLvl[0].s.iChild;
+    pIter->bDlidx = pIter->aLvl[0].s.bDlidx;
+  }
+}
+
+static void fts5BtreeIterNext(Fts5BtreeIter *pIter){
+  Fts5Index *p = pIter->p;
+  int i;
+
+  assert( pIter->bEof==0 && pIter->aLvl[0].s.aData );
+  for(i=0; i<pIter->nLvl && p->rc==SQLITE_OK; i++){
+    Fts5BtreeIterLevel *pLvl = &pIter->aLvl[i];
+    fts5NodeIterNext(&p->rc, &pLvl->s);
+    if( pLvl->s.aData ){
+      fts5BufferSet(&p->rc, &pIter->term, pLvl->s.term.n, pLvl->s.term.p);
+      break;
+    }else{
+      fts5NodeIterFree(&pLvl->s);
+      fts5DataRelease(pLvl->pData);
+      pLvl->pData = 0;
+    }
+  }
+  if( i==pIter->nLvl || p->rc ){
+    pIter->bEof = 1;
+  }else{
+    int iSegid = pIter->pSeg->iSegid;
+    for(i--; i>=0; i--){
+      Fts5BtreeIterLevel *pLvl = &pIter->aLvl[i];
+      i64 iRowid = FTS5_SEGMENT_ROWID(iSegid, i+1, pLvl[1].s.iChild);
+      pLvl->pData = fts5DataRead(p, iRowid);
+      if( pLvl->pData ){
+        fts5NodeIterInit(pLvl->pData->p, pLvl->pData->n, &pLvl->s);
+      }
+    }
+  }
+
+  pIter->nEmpty = pIter->aLvl[0].s.nEmpty;
+  pIter->bDlidx = pIter->aLvl[0].s.bDlidx;
+  pIter->iLeaf = pIter->aLvl[0].s.iChild;
+}
+
+static void fts5BtreeIterFree(Fts5BtreeIter *pIter){
+  int i;
+  for(i=0; i<pIter->nLvl; i++){
+    Fts5BtreeIterLevel *pLvl = &pIter->aLvl[i];
+    fts5NodeIterFree(&pLvl->s);
+    if( pLvl->pData ){
+      fts5DataRelease(pLvl->pData);
+      pLvl->pData = 0;
+    }
+  }
+  sqlite3_free(pIter->aLvl);
+  fts5BufferFree(&pIter->term);
+}
 
 #ifdef SQLITE_DEBUG
 /*
 ** This function is purely an internal test. It does not contribute to 
 ** FTS functionality, or even the integrity-check, in any way.
@@ -10359,77 +10451,37 @@
 #else
 # define fts5TestDlidxReverse(x,y,z)
 # define fts5TestTerm(u,v,w,x,y,z)
 #endif
 
-/*
-** Check that:
-**
-**   1) All leaves of pSeg between iFirst and iLast (inclusive) exist and
-**      contain zero terms.
-**   2) All leaves of pSeg between iNoRowid and iLast (inclusive) exist and
-**      contain zero rowids.
-*/
-static void fts5IndexIntegrityCheckEmpty(
-  Fts5Index *p,
-  Fts5StructureSegment *pSeg,     /* Segment to check internal consistency */
-  int iFirst,
-  int iNoRowid,
-  int iLast
-){
-  int i;
-
-  /* Now check that the iter.nEmpty leaves following the current leaf
-  ** (a) exist and (b) contain no terms. */
-  for(i=iFirst; p->rc==SQLITE_OK && i<=iLast; i++){
-    Fts5Data *pLeaf = fts5DataRead(p, FTS5_SEGMENT_ROWID(pSeg->iSegid, 0, i));
-    if( pLeaf ){
-      if( 0!=fts5GetU16(&pLeaf->p[2]) ) p->rc = FTS5_CORRUPT;
-      if( i>=iNoRowid && 0!=fts5GetU16(&pLeaf->p[0]) ) p->rc = FTS5_CORRUPT;
-    }
-    fts5DataRelease(pLeaf);
-    if( p->rc ) break;
-  }
-}
-
 static void fts5IndexIntegrityCheckSegment(
   Fts5Index *p,                   /* FTS5 backend object */
   Fts5StructureSegment *pSeg      /* Segment to check internal consistency */
 ){
-  Fts5Config *pConfig = p->pConfig;
-  sqlite3_stmt *pStmt = 0;
-  int rc2;
-  int iIdxPrevLeaf = pSeg->pgnoFirst-1;
-  int iDlidxPrevLeaf = pSeg->pgnoLast;
+  Fts5BtreeIter iter;             /* Used to iterate through b-tree hierarchy */
 
   if( pSeg->pgnoFirst==0 ) return;
 
-  fts5IndexPrepareStmt(p, &pStmt, sqlite3_mprintf(
-      "SELECT segid, term, (pgno>>1), (pgno & 1) FROM '%q'.'%q_idx' WHERE segid=%d",
-      pConfig->zDb, pConfig->zName, pSeg->iSegid
-  ));
-
   /* Iterate through the b-tree hierarchy.  */
-  while( p->rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pStmt) ){
+  for(fts5BtreeIterInit(p, pSeg, &iter);
+      p->rc==SQLITE_OK && iter.bEof==0;
+      fts5BtreeIterNext(&iter)
+  ){
     i64 iRow;                     /* Rowid for this leaf */
     Fts5Data *pLeaf;              /* Data for this leaf */
     int iOff;                     /* Offset of first term on leaf */
-
-    int nIdxTerm = sqlite3_column_bytes(pStmt, 1);
-    const char *zIdxTerm = (const char*)sqlite3_column_text(pStmt, 1);
-    int iIdxLeaf = sqlite3_column_int(pStmt, 2);
-    int bIdxDlidx = sqlite3_column_int(pStmt, 3);
+    int i;                        /* Used to iterate through empty leaves */
 
     /* If the leaf in question has already been trimmed from the segment, 
     ** ignore this b-tree entry. Otherwise, load it into memory. */
-    if( iIdxLeaf<pSeg->pgnoFirst ) continue;
-    iRow = FTS5_SEGMENT_ROWID(pSeg->iSegid, 0, iIdxLeaf);
+    if( iter.iLeaf<pSeg->pgnoFirst ) continue;
+    iRow = FTS5_SEGMENT_ROWID(pSeg->iSegid, 0, iter.iLeaf);
     pLeaf = fts5DataRead(p, iRow);
     if( pLeaf==0 ) break;
 
     /* Check that the leaf contains at least one term, and that it is equal
-    ** to or larger than the split-key in zIdxTerm.  Also check that if there
+    ** to or larger than the split-key in iter.term.  Also check that if there
     ** is also a rowid pointer within the leaf page header, it points to a
     ** location before the term.  */
     iOff = fts5GetU16(&pLeaf->p[2]);
     if( iOff==0 ){
       p->rc = FTS5_CORRUPT;
@@ -10441,35 +10493,38 @@
       iRowidOff = fts5GetU16(&pLeaf->p[0]);
       if( iRowidOff>=iOff ){
         p->rc = FTS5_CORRUPT;
       }else{
         iOff += fts5GetVarint32(&pLeaf->p[iOff], nTerm);
-        res = memcmp(&pLeaf->p[iOff], zIdxTerm, MIN(nTerm, nIdxTerm));
-        if( res==0 ) res = nTerm - nIdxTerm;
+        res = memcmp(&pLeaf->p[iOff], iter.term.p, MIN(nTerm, iter.term.n));
+        if( res==0 ) res = nTerm - iter.term.n;
         if( res<0 ) p->rc = FTS5_CORRUPT;
       }
     }
     fts5DataRelease(pLeaf);
     if( p->rc ) break;
 
 
     /* Now check that the iter.nEmpty leaves following the current leaf
     ** (a) exist and (b) contain no terms. */
-    fts5IndexIntegrityCheckEmpty(
-        p, pSeg, iIdxPrevLeaf+1, iDlidxPrevLeaf+1, iIdxLeaf-1
-    );
-    if( p->rc ) break;
+    for(i=1; p->rc==SQLITE_OK && i<=iter.nEmpty; i++){
+      pLeaf = fts5DataRead(p, iRow+i);
+      if( pLeaf && 0!=fts5GetU16(&pLeaf->p[2]) ){
+        p->rc = FTS5_CORRUPT;
+      }
+      fts5DataRelease(pLeaf);
+    }
 
     /* If there is a doclist-index, check that it looks right. */
-    if( bIdxDlidx ){
+    if( iter.bDlidx ){
       Fts5DlidxIter *pDlidx = 0;  /* For iterating through doclist index */
-      int iPrevLeaf = iIdxLeaf;
+      int iPrevLeaf = iter.iLeaf;
       int iSegid = pSeg->iSegid;
-      int iPg = 0;
+      int iPg;
       i64 iKey;
 
-      for(pDlidx=fts5DlidxIterInit(p, 0, iSegid, iIdxLeaf);
+      for(pDlidx=fts5DlidxIterInit(p, 0, iSegid, iter.iLeaf);
           fts5DlidxIterEof(p, pDlidx)==0;
           fts5DlidxIterNext(p, pDlidx)
       ){
 
         /* Check any rowid-less pages that occur before the current leaf. */
@@ -10498,30 +10553,30 @@
           }
           fts5DataRelease(pLeaf);
         }
       }
 
-      iDlidxPrevLeaf = iPg;
+      for(iPg=iPrevLeaf+1; iPg<=(iter.iLeaf + iter.nEmpty); iPg++){
+        iKey = FTS5_SEGMENT_ROWID(iSegid, 0, iPg);
+        pLeaf = fts5DataRead(p, iKey);
+        if( pLeaf ){
+          if( fts5GetU16(&pLeaf->p[0])!=0 ) p->rc = FTS5_CORRUPT;
+          fts5DataRelease(pLeaf);
+        }
+      }
+
       fts5DlidxIterFree(pDlidx);
-      fts5TestDlidxReverse(p, iSegid, iIdxLeaf);
-    }else{
-      iDlidxPrevLeaf = pSeg->pgnoLast;
-      /* TODO: Check there is no doclist index */
+      fts5TestDlidxReverse(p, iSegid, iter.iLeaf);
     }
-
-    iIdxPrevLeaf = iIdxLeaf;
   }
 
-  rc2 = sqlite3_finalize(pStmt);
-  if( p->rc==SQLITE_OK ) p->rc = rc2;
-
   /* Page iter.iLeaf must now be the rightmost leaf-page in the segment */
-#if 0
   if( p->rc==SQLITE_OK && iter.iLeaf!=pSeg->pgnoLast ){
     p->rc = FTS5_CORRUPT;
   }
-#endif
+
+  fts5BtreeIterFree(&iter);
 }
 
 
 /*
 ** Run internal checks to ensure that the FTS index (a) is internally 
@@ -10989,10 +11044,11 @@
 int sqlite3_fts5_may_be_corrupt = 1;
 
 
 typedef struct Fts5Table Fts5Table;
 typedef struct Fts5Cursor Fts5Cursor;
+typedef struct Fts5Global Fts5Global;
 typedef struct Fts5Auxiliary Fts5Auxiliary;
 typedef struct Fts5Auxdata Fts5Auxdata;
 
 typedef struct Fts5TokenizerModule Fts5TokenizerModule;
 
@@ -11131,23 +11187,19 @@
 **   is the upper limit (i.e. the "first" rowid visited) and iLastRowid
 **   the lower.
 */
 struct Fts5Cursor {
   sqlite3_vtab_cursor base;       /* Base class used by SQLite core */
-  Fts5Cursor *pNext;              /* Next cursor in Fts5Cursor.pCsr list */
-  int *aColumnSize;               /* Values for xColumnSize() */
-  i64 iCsrId;                     /* Cursor id */
-
-  /* Zero from this point onwards on cursor reset */
   int ePlan;                      /* FTS5_PLAN_XXX value */
   int bDesc;                      /* True for "ORDER BY rowid DESC" queries */
   i64 iFirstRowid;                /* Return no rowids earlier than this */
   i64 iLastRowid;                 /* Return no rowids later than this */
   sqlite3_stmt *pStmt;            /* Statement used to read %_content */
   Fts5Expr *pExpr;                /* Expression for MATCH queries */
   Fts5Sorter *pSorter;            /* Sorter for "ORDER BY rank" queries */
   int csrflags;                   /* Mask of cursor flags (see below) */
+  Fts5Cursor *pNext;              /* Next cursor in Fts5Cursor.pCsr list */
   i64 iSpecial;                   /* Result of special query */
 
   /* "rank" function. Populated on demand from vtab.xColumn(). */
   char *zRank;                    /* Custom rank function */
   char *zRankArgs;                /* Custom rank function args */
@@ -11154,17 +11206,17 @@
   Fts5Auxiliary *pRank;           /* Rank callback (or NULL) */
   int nRankArg;                   /* Number of trailing arguments for rank() */
   sqlite3_value **apRankArg;      /* Array of trailing arguments */
   sqlite3_stmt *pRankArgStmt;     /* Origin of objects in apRankArg[] */
 
-  /* Auxiliary data storage */
+  /* Variables used by auxiliary functions */
+  i64 iCsrId;                     /* Cursor id */
   Fts5Auxiliary *pAux;            /* Currently executing extension function */
   Fts5Auxdata *pAuxdata;          /* First in linked list of saved aux-data */
+  int *aColumnSize;               /* Values for xColumnSize() */
 
   /* Cache used by auxiliary functions xInst() and xInstCount() */
-  Fts5PoslistReader *aInstIter;   /* One for each phrase */
-  int nInstAlloc;                 /* Size of aInst[] array (entries / 3) */
   int nInstCount;                 /* Number of phrase instances */
   int *aInst;                     /* 3 integers per phrase instance */
 };
 
 /*
@@ -11395,16 +11447,16 @@
 }
 
 /*
 ** The different query plans.
 */
-#define FTS5_PLAN_MATCH          1       /* (<tbl> MATCH ?) */
-#define FTS5_PLAN_SOURCE         2       /* A source cursor for SORTED_MATCH */
-#define FTS5_PLAN_SPECIAL        3       /* An internal query */
-#define FTS5_PLAN_SORTED_MATCH   4       /* (<tbl> MATCH ? ORDER BY rank) */
-#define FTS5_PLAN_SCAN           5       /* No usable constraint */
-#define FTS5_PLAN_ROWID          6       /* (rowid = ?) */
+#define FTS5_PLAN_MATCH          0       /* (<tbl> MATCH ?) */
+#define FTS5_PLAN_SOURCE         1       /* A source cursor for SORTED_MATCH */
+#define FTS5_PLAN_SPECIAL        2       /* An internal query */
+#define FTS5_PLAN_SORTED_MATCH   3       /* (<tbl> MATCH ? ORDER BY rank) */
+#define FTS5_PLAN_SCAN           4       /* No usable constraint */
+#define FTS5_PLAN_ROWID          5       /* (rowid = ?) */
 
 /*
 ** Implementation of the xBestIndex method for FTS5 tables. Within the 
 ** WHERE constraint, it searches for the following:
 **
@@ -11575,49 +11627,10 @@
       FTS5CSR_REQUIRE_CONTENT 
     | FTS5CSR_REQUIRE_DOCSIZE 
     | FTS5CSR_REQUIRE_INST 
   );
 }
-
-static void fts5FreeCursorComponents(Fts5Cursor *pCsr){
-  Fts5Table *pTab = (Fts5Table*)(pCsr->base.pVtab);
-  Fts5Auxdata *pData;
-  Fts5Auxdata *pNext;
-
-  sqlite3_free(pCsr->aInstIter);
-  sqlite3_free(pCsr->aInst);
-  if( pCsr->pStmt ){
-    int eStmt = fts5StmtType(pCsr);
-    sqlite3Fts5StorageStmtRelease(pTab->pStorage, eStmt, pCsr->pStmt);
-  }
-  if( pCsr->pSorter ){
-    Fts5Sorter *pSorter = pCsr->pSorter;
-    sqlite3_finalize(pSorter->pStmt);
-    sqlite3_free(pSorter);
-  }
-
-  if( pCsr->ePlan!=FTS5_PLAN_SOURCE ){
-    sqlite3Fts5ExprFree(pCsr->pExpr);
-  }
-
-  for(pData=pCsr->pAuxdata; pData; pData=pNext){
-    pNext = pData->pNext;
-    if( pData->xDelete ) pData->xDelete(pData->pPtr);
-    sqlite3_free(pData);
-  }
-
-  sqlite3_finalize(pCsr->pRankArgStmt);
-  sqlite3_free(pCsr->apRankArg);
-
-  if( CsrFlagTest(pCsr, FTS5CSR_FREE_ZRANK) ){
-    sqlite3_free(pCsr->zRank);
-    sqlite3_free(pCsr->zRankArgs);
-  }
-
-  memset(&pCsr->ePlan, 0, sizeof(Fts5Cursor) - ((u8*)&pCsr->ePlan - (u8*)pCsr));
-}
-
 
 /*
 ** Close the cursor.  For additional information see the documentation
 ** on the xClose method of the virtual table interface.
 */
@@ -11624,16 +11637,45 @@
 static int fts5CloseMethod(sqlite3_vtab_cursor *pCursor){
   if( pCursor ){
     Fts5Table *pTab = (Fts5Table*)(pCursor->pVtab);
     Fts5Cursor *pCsr = (Fts5Cursor*)pCursor;
     Fts5Cursor **pp;
+    Fts5Auxdata *pData;
+    Fts5Auxdata *pNext;
 
-    fts5FreeCursorComponents(pCsr);
+    sqlite3_free(pCsr->aInst);
+    if( pCsr->pStmt ){
+      int eStmt = fts5StmtType(pCsr);
+      sqlite3Fts5StorageStmtRelease(pTab->pStorage, eStmt, pCsr->pStmt);
+    }
+    if( pCsr->pSorter ){
+      Fts5Sorter *pSorter = pCsr->pSorter;
+      sqlite3_finalize(pSorter->pStmt);
+      sqlite3_free(pSorter);
+    }
+
+    if( pCsr->ePlan!=FTS5_PLAN_SOURCE ){
+      sqlite3Fts5ExprFree(pCsr->pExpr);
+    }
+
+    for(pData=pCsr->pAuxdata; pData; pData=pNext){
+      pNext = pData->pNext;
+      if( pData->xDelete ) pData->xDelete(pData->pPtr);
+      sqlite3_free(pData);
+    }
+
     /* Remove the cursor from the Fts5Global.pCsr list */
     for(pp=&pTab->pGlobal->pCsr; (*pp)!=pCsr; pp=&(*pp)->pNext);
     *pp = pCsr->pNext;
 
+    sqlite3_finalize(pCsr->pRankArgStmt);
+    sqlite3_free(pCsr->apRankArg);
+
+    if( CsrFlagTest(pCsr, FTS5CSR_FREE_ZRANK) ){
+      sqlite3_free(pCsr->zRank);
+      sqlite3_free(pCsr->zRankArgs);
+    }
     sqlite3_free(pCsr);
   }
   return SQLITE_OK;
 }
 
@@ -11733,15 +11775,15 @@
 */
 static int fts5NextMethod(sqlite3_vtab_cursor *pCursor){
   Fts5Cursor *pCsr = (Fts5Cursor*)pCursor;
   int rc = SQLITE_OK;
 
-  assert( (pCsr->ePlan<3)==
+  assert( (pCsr->ePlan<2)==
           (pCsr->ePlan==FTS5_PLAN_MATCH || pCsr->ePlan==FTS5_PLAN_SOURCE) 
   );
 
-  if( pCsr->ePlan<3 ){
+  if( pCsr->ePlan<2 ){
     int bSkip = 0;
     if( (rc = fts5CursorReseek(pCsr, &bSkip)) || bSkip ) return rc;
     rc = sqlite3Fts5ExprNext(pCsr->pExpr, pCsr->iLastRowid);
     if( sqlite3Fts5ExprEof(pCsr->pExpr) ){
       CsrFlagSet(pCsr, FTS5CSR_EOF);
@@ -12018,15 +12060,10 @@
   sqlite3_value *pRowidEq = 0;    /* rowid = ? expression (or NULL) */
   sqlite3_value *pRowidLe = 0;    /* rowid <= ? expression (or NULL) */
   sqlite3_value *pRowidGe = 0;    /* rowid >= ? expression (or NULL) */
   char **pzErrmsg = pConfig->pzErrmsg;
 
-  if( pCsr->ePlan ){
-    fts5FreeCursorComponents(pCsr);
-    memset(&pCsr->ePlan, 0, sizeof(Fts5Cursor) - ((u8*)&pCsr->ePlan-(u8*)pCsr));
-  }
-
   assert( pCsr->pStmt==0 );
   assert( pCsr->pExpr==0 );
   assert( pCsr->csrflags==0 );
   assert( pCsr->pRank==0 );
   assert( pCsr->zRank==0 );
@@ -12154,11 +12191,11 @@
 }
 
 /* 
 ** This is the xRowid method. The SQLite core calls this routine to
 ** retrieve the rowid for the current row of the result set. fts5
-** exposes %_content.rowid as the rowid for the virtual table. The
+** exposes %_content.docid as the rowid for the virtual table. The
 ** rowid should be written to *pRowid.
 */
 static int fts5RowidMethod(sqlite3_vtab_cursor *pCursor, sqlite_int64 *pRowid){
   Fts5Cursor *pCsr = (Fts5Cursor*)pCursor;
   int ePlan = pCsr->ePlan;
@@ -12497,75 +12534,66 @@
 ** correctly for the current view. Return SQLITE_OK if successful, or an
 ** SQLite error code otherwise.
 */
 static int fts5CacheInstArray(Fts5Cursor *pCsr){
   int rc = SQLITE_OK;
-  Fts5PoslistReader *aIter;       /* One iterator for each phrase */
-  int nIter;                      /* Number of iterators/phrases */
-  
-  nIter = sqlite3Fts5ExprPhraseCount(pCsr->pExpr);
-  if( pCsr->aInstIter==0 ){
-    int nByte = sizeof(Fts5PoslistReader) * nIter;
-    pCsr->aInstIter = (Fts5PoslistReader*)sqlite3Fts5MallocZero(&rc, nByte);
-  }
-  aIter = pCsr->aInstIter;
-
-  if( aIter ){
-    int nInst = 0;                /* Number instances seen so far */
-    int i;
-
-    /* Initialize all iterators */
-    for(i=0; i<nIter; i++){
-      const u8 *a;
-      int n = fts5CsrPoslist(pCsr, i, &a);
-      sqlite3Fts5PoslistReaderInit(-1, a, n, &aIter[i]);
-    }
-
-    while( 1 ){
-      int *aInst;
-      int iBest = -1;
-      for(i=0; i<nIter; i++){
-        if( (aIter[i].bEof==0) 
-         && (iBest<0 || aIter[i].iPos<aIter[iBest].iPos) 
-        ){
-          iBest = i;
-        }
-      }
-      if( iBest<0 ) break;
-
-      nInst++;
-      if( nInst>=pCsr->nInstAlloc ){
-        pCsr->nInstAlloc = pCsr->nInstAlloc ? pCsr->nInstAlloc*2 : 32;
-        aInst = (int*)sqlite3_realloc(
-            pCsr->aInst, pCsr->nInstAlloc*sizeof(int)*3
-        );
-        if( aInst ){
-          pCsr->aInst = aInst;
-        }else{
-          rc = SQLITE_NOMEM;
-          break;
-        }
-      }
-
-      aInst = &pCsr->aInst[3 * (nInst-1)];
-      aInst[0] = iBest;
-      aInst[1] = FTS5_POS2COLUMN(aIter[iBest].iPos);
-      aInst[2] = FTS5_POS2OFFSET(aIter[iBest].iPos);
-      sqlite3Fts5PoslistReaderNext(&aIter[iBest]);
-    }
-
-    pCsr->nInstCount = nInst;
-    CsrFlagClear(pCsr, FTS5CSR_REQUIRE_INST);
+  if( CsrFlagTest(pCsr, FTS5CSR_REQUIRE_INST) ){
+    Fts5PoslistReader *aIter;     /* One iterator for each phrase */
+    int nIter;                    /* Number of iterators/phrases */
+    int nByte;
+    
+    nIter = sqlite3Fts5ExprPhraseCount(pCsr->pExpr);
+    nByte = sizeof(Fts5PoslistReader) * nIter;
+    aIter = (Fts5PoslistReader*)sqlite3Fts5MallocZero(&rc, nByte);
+    if( aIter ){
+      Fts5Buffer buf = {0, 0, 0}; /* Build up aInst[] here */
+      int nInst = 0;              /* Number instances seen so far */
+      int i;
+
+      /* Initialize all iterators */
+      for(i=0; i<nIter; i++){
+        const u8 *a;
+        int n = fts5CsrPoslist(pCsr, i, &a);
+        sqlite3Fts5PoslistReaderInit(-1, a, n, &aIter[i]);
+      }
+
+      while( 1 ){
+        int *aInst;
+        int iBest = -1;
+        for(i=0; i<nIter; i++){
+          if( (aIter[i].bEof==0) 
+           && (iBest<0 || aIter[i].iPos<aIter[iBest].iPos) 
+          ){
+            iBest = i;
+          }
+        }
+
+        if( iBest<0 ) break;
+        nInst++;
+        if( sqlite3Fts5BufferGrow(&rc, &buf, nInst * sizeof(int) * 3) ) break;
+
+        aInst = &((int*)buf.p)[3 * (nInst-1)];
+        aInst[0] = iBest;
+        aInst[1] = FTS5_POS2COLUMN(aIter[iBest].iPos);
+        aInst[2] = FTS5_POS2OFFSET(aIter[iBest].iPos);
+        sqlite3Fts5PoslistReaderNext(&aIter[iBest]);
+      }
+
+      sqlite3_free(pCsr->aInst);
+      pCsr->aInst = (int*)buf.p;
+      pCsr->nInstCount = nInst;
+      sqlite3_free(aIter);
+      CsrFlagClear(pCsr, FTS5CSR_REQUIRE_INST);
+    }
   }
   return rc;
 }
 
 static int fts5ApiInstCount(Fts5Context *pCtx, int *pnInst){
   Fts5Cursor *pCsr = (Fts5Cursor*)pCtx;
-  int rc = SQLITE_OK;
-  if( CsrFlagTest(pCsr, FTS5CSR_REQUIRE_INST)==0 
-   || SQLITE_OK==(rc = fts5CacheInstArray(pCsr)) ){
+  int rc;
+  if( SQLITE_OK==(rc = fts5CacheInstArray(pCsr)) ){
     *pnInst = pCsr->nInstCount;
   }
   return rc;
 }
 
@@ -12575,14 +12603,12 @@
   int *piPhrase, 
   int *piCol, 
   int *piOff
 ){
   Fts5Cursor *pCsr = (Fts5Cursor*)pCtx;
-  int rc = SQLITE_OK;
-  if( CsrFlagTest(pCsr, FTS5CSR_REQUIRE_INST)==0 
-   || SQLITE_OK==(rc = fts5CacheInstArray(pCsr)) 
-  ){
+  int rc;
+  if( SQLITE_OK==(rc = fts5CacheInstArray(pCsr)) ){
     if( iIdx<0 || iIdx>=pCsr->nInstCount ){
       rc = SQLITE_RANGE;
     }else{
       *piPhrase = pCsr->aInst[iIdx*3];
       *piCol = pCsr->aInst[iIdx*3 + 1];
@@ -12733,51 +12759,16 @@
   }
 
   return pRet;
 }
 
-static void fts5ApiPhraseNext(
-  Fts5Context *pCtx, 
-  Fts5PhraseIter *pIter, 
-  int *piCol, int *piOff
-){
-  if( pIter->a>=pIter->b ){
-    *piCol = -1;
-    *piOff = -1;
-  }else{
-    int iVal;
-    pIter->a += fts5GetVarint32(pIter->a, iVal);
-    if( iVal==1 ){
-      pIter->a += fts5GetVarint32(pIter->a, iVal);
-      *piCol = iVal;
-      *piOff = 0;
-      pIter->a += fts5GetVarint32(pIter->a, iVal);
-    }
-    *piOff += (iVal-2);
-  }
-}
-
-static void fts5ApiPhraseFirst(
-  Fts5Context *pCtx, 
-  int iPhrase, 
-  Fts5PhraseIter *pIter, 
-  int *piCol, int *piOff
-){
-  Fts5Cursor *pCsr = (Fts5Cursor*)pCtx;
-  int n = fts5CsrPoslist(pCsr, iPhrase, &pIter->a);
-  pIter->b = &pIter->a[n];
-  *piCol = 0;
-  *piOff = 0;
-  fts5ApiPhraseNext(pCtx, pIter, piCol, piOff);
-}
-
 static int fts5ApiQueryPhrase(Fts5Context*, int, void*, 
     int(*)(const Fts5ExtensionApi*, Fts5Context*, void*)
 );
 
 static const Fts5ExtensionApi sFts5Api = {
-  2,                            /* iVersion */
+  1,                            /* iVersion */
   fts5ApiUserData,
   fts5ApiColumnCount,
   fts5ApiRowCount,
   fts5ApiColumnTotalSize,
   fts5ApiTokenize,
@@ -12789,12 +12780,10 @@
   fts5ApiColumnText,
   fts5ApiColumnSize,
   fts5ApiQueryPhrase,
   fts5ApiSetAuxdata,
   fts5ApiGetAuxdata,
-  fts5ApiPhraseFirst,
-  fts5ApiPhraseNext,
 };
 
 
 /*
 ** Implementation of API function xQueryPhrase().
@@ -13257,11 +13246,11 @@
   sqlite3_context *pCtx,          /* Function call context */
   int nArg,                       /* Number of args */
   sqlite3_value **apVal           /* Function arguments */
 ){
   assert( nArg==0 );
-  sqlite3_result_text(pCtx, "fts5: 2015-08-18 19:09:28 8599402092537ab3df8926eb900661c12d738d4c", -1, SQLITE_TRANSIENT);
+  sqlite3_result_text(pCtx, "fts5: 2015-07-24 23:28:05 db129149812cb4eadb4cd79ad293d14962d2638d", -1, SQLITE_TRANSIENT);
 }
 
 #ifdef _WIN32
 __declspec(dllexport)
 #endif
@@ -13525,13 +13514,11 @@
 ** code otherwise.
 */
 static int sqlite3Fts5DropAll(Fts5Config *pConfig){
   int rc = fts5ExecPrintf(pConfig->db, 0, 
       "DROP TABLE IF EXISTS %Q.'%q_data';"
-      "DROP TABLE IF EXISTS %Q.'%q_idx';"
       "DROP TABLE IF EXISTS %Q.'%q_config';",
-      pConfig->zDb, pConfig->zName,
       pConfig->zDb, pConfig->zName,
       pConfig->zDb, pConfig->zName
   );
   if( rc==SQLITE_OK && pConfig->bColumnsize ){
     rc = fts5ExecPrintf(pConfig->db, 0, 
@@ -13565,11 +13552,10 @@
 static int sqlite3Fts5StorageRename(Fts5Storage *pStorage, const char *zName){
   Fts5Config *pConfig = pStorage->pConfig;
   int rc = sqlite3Fts5StorageSync(pStorage, 1);
 
   fts5StorageRenameOne(pConfig, &rc, "data", zName);
-  fts5StorageRenameOne(pConfig, &rc, "idx", zName);
   fts5StorageRenameOne(pConfig, &rc, "config", zName);
   if( pConfig->bColumnsize ){
     fts5StorageRenameOne(pConfig, &rc, "docsize", zName);
   }
   if( pConfig->eContent==FTS5_CONTENT_NORMAL ){
@@ -13949,13 +13935,11 @@
   Fts5Config *pConfig = p->pConfig;
   int rc;
 
   /* Delete the contents of the %_data and %_docsize tables. */
   rc = fts5ExecPrintf(pConfig->db, 0,
-      "DELETE FROM %Q.'%q_data';" 
-      "DELETE FROM %Q.'%q_idx';",
-      pConfig->zDb, pConfig->zName,
+      "DELETE FROM %Q.'%q_data';",
       pConfig->zDb, pConfig->zName
   );
   if( rc==SQLITE_OK && pConfig->bColumnsize ){
     rc = fts5ExecPrintf(pConfig->db, 0,
         "DELETE FROM %Q.'%q_docsize';",
@@ -14981,13 +14965,11 @@
     rc = pApi->xFindTokenizer(pApi, zBase, &pUserdata, &pRet->tokenizer);
   }else{
     rc = SQLITE_NOMEM;
   }
   if( rc==SQLITE_OK ){
-    int nArg2 = (nArg>0 ? nArg-1 : 0);
-    const char **azArg2 = (nArg2 ? &azArg[1] : 0);
-    rc = pRet->tokenizer.xCreate(pUserdata, azArg2, nArg2, &pRet->pTokenizer);
+    rc = pRet->tokenizer.xCreate(pUserdata, 0, 0, &pRet->pTokenizer);
   }
 
   if( rc!=SQLITE_OK ){
     fts5PorterDelete((Fts5Tokenizer*)pRet);
     pRet = 0;
@@ -16823,11 +16805,12 @@
   return SQLITE_OK;
 }
 
 /* 
 ** This is the xRowid method. The SQLite core calls this routine to
-** retrieve the rowid for the current row of the result set. The
+** retrieve the rowid for the current row of the result set. fts5
+** exposes %_content.docid as the rowid for the virtual table. The
 ** rowid should be written to *pRowid.
 */
 static int fts5VocabRowidMethod(
   sqlite3_vtab_cursor *pCursor, 
   sqlite_int64 *pRowid

Index: Setup/build.bat
==================================================================
--- Setup/build.bat
+++ Setup/build.bat
@@ -54,11 +54,10 @@
 %_VECHO% Platform = '%PLATFORM%'
 
 SET BASE_CONFIGURATION=%CONFIGURATION%
 SET BASE_CONFIGURATION=%BASE_CONFIGURATION:ManagedOnly=%
 SET BASE_CONFIGURATION=%BASE_CONFIGURATION:NativeOnly=%
-SET BASE_CONFIGURATION=%BASE_CONFIGURATION:Static=%
 
 %_VECHO% BaseConfiguration = '%BASE_CONFIGURATION%'
 
 SET TOOLS=%~dp0
 SET TOOLS=%TOOLS:~0,-1%
@@ -271,17 +270,10 @@
 
 SET PATH=%BUILDTOOLDIR%;%PATH%
 
 %_VECHO% Path = '%PATH%'
 
-IF NOT DEFINED SOLUTION (
-  IF DEFINED COREONLY (
-    %_AECHO% Building core managed project...
-    SET SOLUTION=.\System.Data.SQLite\System.Data.SQLite.%YEAR%.csproj
-  )
-)
-
 IF NOT DEFINED SOLUTION (
   %_AECHO% Building all projects...
   SET SOLUTION=.\SQLite.NET.%YEAR%.MSBuild.sln
 )
 

DELETED Setup/build_mono.bat
Index: Setup/build_mono.bat
==================================================================
--- Setup/build_mono.bat
+++ /dev/null
@@ -1,82 +0,0 @@
-@ECHO OFF
-
-::
-:: build_mono.bat --
-::
-:: Mono Wrapper Tool for MSBuild
-::
-:: Written by Joe Mistachkin.
-:: Released to the public domain, use at your own risk!
-::
-
-SETLOCAL
-
-REM SET __ECHO=ECHO
-REM SET __ECHO3=ECHO
-IF NOT DEFINED _AECHO (SET _AECHO=REM)
-IF NOT DEFINED _CECHO (SET _CECHO=REM)
-IF NOT DEFINED _VECHO (SET _VECHO=REM)
-
-%_AECHO% Running %0 %*
-
-SET DUMMY2=%1
-
-IF DEFINED DUMMY2 (
-  GOTO usage
-)
-
-SET TOOLS=%~dp0
-SET TOOLS=%TOOLS:~0,-1%
-
-%_VECHO% Tools = '%TOOLS%'
-
-SET BUILD_CONFIGURATIONS=DebugManagedOnly ReleaseManagedOnly
-SET PLATFORMS="Any CPU"
-SET YEARS=2008 2013
-SET NOUSER=1
-SET MSBUILD_ARGS=/property:UseInteropDll=false
-SET MSBUILD_ARGS=%MSBUILD_ARGS% /property:UseSqliteStandard=true
-SET MSBUILD_ARGS=%MSBUILD_ARGS% /property:InteropCodec=false
-SET MSBUILD_ARGS=%MSBUILD_ARGS% /property:InteropExtensionFunctions=false
-SET MSBUILD_ARGS=%MSBUILD_ARGS% /property:InteropVirtualTable=false
-SET MSBUILD_ARGS=%MSBUILD_ARGS% /property:InteropTestExtension=false
-
-CALL :fn_ResetErrorLevel
-
-%__ECHO3% CALL "%TOOLS%\build_all.bat"
-
-IF ERRORLEVEL 1 (
-  ECHO Failed to build Mono binaries.
-  GOTO errors
-)
-
-:fn_ResetErrorLevel
-  VERIFY > NUL
-  GOTO :EOF
-
-:fn_SetErrorLevel
-  VERIFY MAYBE 2> NUL
-  GOTO :EOF
-
-:usage
-  ECHO.
-  ECHO Usage: %~nx0
-  ECHO.
-  GOTO errors
-
-:errors
-  CALL :fn_SetErrorLevel
-  ENDLOCAL
-  ECHO.
-  ECHO Build failure, errors were encountered.
-  GOTO end_of_file
-
-:no_errors
-  CALL :fn_ResetErrorLevel
-  ENDLOCAL
-  ECHO.
-  ECHO Build success, no errors were encountered.
-  GOTO end_of_file
-
-:end_of_file
-%__ECHO% EXIT /B %ERRORLEVEL%

Index: Setup/clean.bat
==================================================================
--- Setup/clean.bat
+++ Setup/clean.bat
@@ -40,11 +40,11 @@
   GOTO usage
 )
 
 IF DEFINED CLEANDIRS GOTO skip_cleanDirs
 
-SET CLEANDIRS=.vs bin obj Doc\Output Setup\Output
+SET CLEANDIRS=bin obj Doc\Output Setup\Output
 SET CLEANDIRS=%CLEANDIRS% SQLite.Designer\bin SQLite.Designer\obj
 SET CLEANDIRS=%CLEANDIRS% SQLite.Interop\bin SQLite.Interop\obj
 SET CLEANDIRS=%CLEANDIRS% System.Data.SQLite\bin System.Data.SQLite\obj
 SET CLEANDIRS=%CLEANDIRS% System.Data.SQLite.Linq\bin System.Data.SQLite.Linq\obj
 SET CLEANDIRS=%CLEANDIRS% test\bin test\obj testce\bin testce\obj testlinq\bin

Index: Setup/data/verify.lst
==================================================================
--- Setup/data/verify.lst
+++ Setup/data/verify.lst
@@ -255,11 +255,10 @@
   Setup/bake_all.bat
   Setup/build.bat
   Setup/build_all.bat
   Setup/build_ce_200x.bat
   Setup/build_ce_2013.bat
-  Setup/build_mono.bat
   Setup/build_nuget.bat
   Setup/clean.bat
   Setup/data/
   Setup/data/CheckForNetFx.pas
   Setup/data/InitializeSetup.pas
@@ -775,11 +774,10 @@
   Tests/tkt-3567020edf.eagle
   Tests/tkt-393d954be0.eagle
   Tests/tkt-3aa50d8413.eagle
   Tests/tkt-3c00ec5b52.eagle
   Tests/tkt-3e783eecbe.eagle
-  Tests/tkt-41aea496e0.eagle
   Tests/tkt-448d663d11.eagle
   Tests/tkt-47c6fa04d3.eagle
   Tests/tkt-47f4bac575.eagle
   Tests/tkt-48a6b8e4ca.eagle
   Tests/tkt-4a791e70ab.eagle

Index: Setup/release_ce_200x.bat
==================================================================
--- Setup/release_ce_200x.bat
+++ Setup/release_ce_200x.bat
@@ -39,11 +39,10 @@
 SET BASE_CONFIGURATIONSUFFIX=Compact
 SET PLATFORMS="Pocket PC 2003 (ARMV4)"
 SET YEARS=2008
 SET BASE_PLATFORM=PocketPC
 SET EXTRA_PLATFORM_Pocket_PC_2003_ARMV4=ARM
-SET TYPE=binary
 
 CALL :fn_ResetErrorLevel
 
 %__ECHO3% CALL "%TOOLS%\release_all.bat"
 

Index: Setup/release_ce_2013.bat
==================================================================
--- Setup/release_ce_2013.bat
+++ Setup/release_ce_2013.bat
@@ -41,11 +41,10 @@
 SET PLATFORMS="CEPC DevPlatform" ARMV7
 SET YEARS=2012
 SET BASE_PLATFORM=WinCE
 SET EXTRA_PLATFORM_CEPC_DevPlatform=x86
 SET EXTRA_PLATFORM_ARMV7=ARM
-SET TYPE=binary
 
 CALL :fn_ResetErrorLevel
 
 %__ECHO3% CALL "%TOOLS%\release_all.bat"
 

Index: System.Data.SQLite.Linq/SQL Generation/DmlSqlGenerator.cs
==================================================================
--- System.Data.SQLite.Linq/SQL Generation/DmlSqlGenerator.cs
+++ System.Data.SQLite.Linq/SQL Generation/DmlSqlGenerator.cs
@@ -81,11 +81,11 @@
       commandText.Append("WHERE ");
       tree.Predicate.Accept(translator);
       commandText.AppendLine(";");
 
       // generate returning sql
-      GenerateReturningSql(commandText, tree, translator, tree.Returning, false);
+      GenerateReturningSql(commandText, tree, translator, tree.Returning);
 
       parameters = translator.Parameters;
       return commandText.ToString();
     }
 
@@ -148,11 +148,11 @@
       {
         commandText.AppendLine(" DEFAULT VALUES;");
       }
 
       // generate returning sql
-      GenerateReturningSql(commandText, tree, translator, tree.Returning, true);
+      GenerateReturningSql(commandText, tree, translator, tree.Returning);
 
       parameters = translator.Parameters;
       return commandText.ToString();
     }
 
@@ -162,91 +162,10 @@
     private static string GenerateMemberTSql(EdmMember member)
     {
       return SqlGenerator.QuoteIdentifier(member.Name);
     }
 
-    /// <summary>
-    /// This method attempts to determine if the specified table has an integer
-    /// primary key (i.e. "rowid").  If so, it sets the
-    /// <paramref name="primaryKeyMember" /> parameter to the right
-    /// <see cref="EdmMember" />; otherwise, the
-    /// <paramref name="primaryKeyMember" /> parameter is set to null.
-    /// </summary>
-    /// <param name="table">The table to check.</param>
-    /// <param name="keyMembers">
-    /// The collection of key members.  An attempt is always made to set this
-    /// parameter to a valid value.
-    /// </param>
-    /// <param name="primaryKeyMember">
-    /// The <see cref="EdmMember" /> that represents the integer primary key
-    /// -OR- null if no such <see cref="EdmMember" /> exists.
-    /// </param>
-    /// <returns>
-    /// Non-zero if the specified table has an integer primary key.
-    /// </returns>
-    private static bool IsIntegerPrimaryKey(
-        EntitySetBase table,
-        out ReadOnlyMetadataCollection<EdmMember> keyMembers,
-        out EdmMember primaryKeyMember
-        )
-    {
-        keyMembers = table.ElementType.KeyMembers;
-
-        if (keyMembers.Count == 1) /* NOTE: The "rowid" only? */
-        {
-            EdmMember keyMember = keyMembers[0];
-            PrimitiveTypeKind typeKind;
-
-            if (MetadataHelpers.TryGetPrimitiveTypeKind(
-                    keyMember.TypeUsage, out typeKind) &&
-                (typeKind == PrimitiveTypeKind.Int64))
-            {
-                primaryKeyMember = keyMember;
-                return true;
-            }
-        }
-
-        primaryKeyMember = null;
-        return false;
-    }
-
-    /// <summary>
-    /// This method attempts to determine if all the specified key members have
-    /// values available.
-    /// </summary>
-    /// <param name="translator">
-    /// The <see cref="ExpressionTranslator" /> to use.
-    /// </param>
-    /// <param name="keyMembers">
-    /// The collection of key members to check.
-    /// </param>
-    /// <param name="missingKeyMember">
-    /// The first missing key member that is found.  This is only set to a valid
-    /// value if the method is returning false.
-    /// </param>
-    /// <returns>
-    /// Non-zero if all key members have values; otherwise, zero.
-    /// </returns>
-    private static bool DoAllKeyMembersHaveValues(
-        ExpressionTranslator translator,
-        ReadOnlyMetadataCollection<EdmMember> keyMembers,
-        out EdmMember missingKeyMember
-        )
-    {
-        foreach (EdmMember keyMember in keyMembers)
-        {
-            if (!translator.MemberValues.ContainsKey(keyMember))
-            {
-                missingKeyMember = keyMember;
-                return false;
-            }
-        }
-
-        missingKeyMember = null;
-        return true;
-    }
-
     /// <summary>
     /// Generates SQL fragment returning server-generated values.
     /// Requires: translator knows about member values so that we can figure out
     /// how to construct the key predicate.
     /// <code>
@@ -269,16 +188,12 @@
     /// <param name="tree">Modification command tree</param>
     /// <param name="translator">Translator used to produce DML SQL statement
     /// for the tree</param>
     /// <param name="returning">Returning expression. If null, the method returns
     /// immediately without producing a SELECT statement.</param>
-    /// <param name="wasInsert">
-    /// Non-zero if this method is being called as part of processing an INSERT;
-    /// otherwise (e.g. UPDATE), zero.
-    /// </param>
     private static void GenerateReturningSql(StringBuilder commandText, DbModificationCommandTree tree,
-        ExpressionTranslator translator, DbExpression returning, bool wasInsert)
+        ExpressionTranslator translator, DbExpression returning)
     {
       // Nothing to do if there is no Returning expression
       if (null == returning) { return; }
 
       // select
@@ -295,128 +210,38 @@
 #if USE_INTEROP_DLL && INTEROP_EXTENSION_FUNCTIONS
       commandText.Append("WHERE last_rows_affected() > 0");
 #else
       commandText.Append("WHERE changes() > 0");
 #endif
-
-      EntitySetBase table = ((DbScanExpression)tree.Target.Expression).Target;
-      ReadOnlyMetadataCollection<EdmMember> keyMembers;
-      EdmMember primaryKeyMember;
-      EdmMember missingKeyMember;
-
-      // Model Types can be (at the time of this implementation):
-      //      Binary, Boolean, Byte, DateTime, Decimal, Double, Guid, Int16,
-      //      Int32, Int64,Single, String
-      if (IsIntegerPrimaryKey(table, out keyMembers, out primaryKeyMember))
-      {
-          //
-          // NOTE: This must be an INTEGER PRIMARY KEY (i.e. "rowid") table.
-          //
-          commandText.Append(" AND ");
-          commandText.Append(GenerateMemberTSql(primaryKeyMember));
-          commandText.Append(" = ");
-
-          DbParameter value;
-
-          if (translator.MemberValues.TryGetValue(primaryKeyMember, out value))
-          {
-              //
-              // NOTE: Use the integer primary key value that was specified as
-              //       part the associated INSERT/UPDATE statement.
-              //
-              commandText.Append(value.ParameterName);
-          }
-          else if (wasInsert)
-          {
-              //
-              // NOTE: This was part of an INSERT statement and we know the table
-              //       has an integer primary key.  This should not fail unless
-              //       something (e.g. a trigger) causes the last_insert_rowid()
-              //       function to return an incorrect result.
-              //
-              commandText.AppendLine("last_insert_rowid()");
-          }
-          else /* NOT-REACHED? */
-          {
-              //
-              // NOTE: We cannot simply use the "rowid" at this point because:
-              //
-              //       1. The last_insert_rowid() function is only valid after
-              //          an INSERT and this was an UPDATE.
-              //
-              throw new NotSupportedException(String.Format(
-                  "Missing value for INSERT key member '{0}' in table '{1}'.",
-                   (primaryKeyMember != null) ? primaryKeyMember.Name : "<unknown>",
-                   table.Name));
-          }
-      }
-      else if (DoAllKeyMembersHaveValues(translator, keyMembers, out missingKeyMember))
-      {
-          foreach (EdmMember keyMember in keyMembers)
-          {
-              commandText.Append(" AND ");
-              commandText.Append(GenerateMemberTSql(keyMember));
-              commandText.Append(" = ");
-
-              // Retrieve member value SQL. the translator remembers member values
-              // as it constructs the DML statement (which precedes the "returning"
-              // SQL).
-              DbParameter value;
-
-              if (translator.MemberValues.TryGetValue(keyMember, out value))
-              {
-                  //
-                  // NOTE: Use the primary key value that was specified as part the
-                  //       associated INSERT/UPDATE statement.  This also applies
-                  //       to composite primary keys.
-                  //
-                  commandText.Append(value.ParameterName);
-              }
-              else /* NOT-REACHED? */
-              {
-                  //
-                  // NOTE: We cannot simply use the "rowid" at this point because:
-                  //
-                  //       1. This associated INSERT/UPDATE statement appeared to
-                  //          have all the key members availab;e however, there
-                  //          appears to be an inconsistency.  This is an internal
-                  //          error and should be thrown.
-                  //
-                  throw new NotSupportedException(String.Format(
-                      "Missing value for {0} key member '{1}' in table '{2}' " +
-                      "(internal).", wasInsert ? "INSERT" : "UPDATE",
-                      (keyMember != null) ? keyMember.Name : "<unknown>",
-                      table.Name));
-              }
-          }
-      }
-      else if (wasInsert) /* NOT-REACHED? */
-      {
-          //
-          // NOTE: This was part of an INSERT statement; try using the "rowid"
-          //       column to fetch the most recently inserted row.  This may
-          //       still fail if the table is a WITHOUT ROWID table -OR-
-          //       something (e.g. a trigger) causes the last_insert_rowid()
-          //       function to return an incorrect result.
-          //
-          commandText.Append(" AND ");
-          commandText.Append(SqlGenerator.QuoteIdentifier("rowid"));
-          commandText.Append(" = ");
-          commandText.AppendLine("last_insert_rowid()");
-      }
-      else /* NOT-REACHED? */
-      {
-          //
-          // NOTE: We cannot simply use the "rowid" at this point because:
-          //
-          //       1. The last_insert_rowid() function is only valid after
-          //          an INSERT and this was an UPDATE.
-          //
-          throw new NotSupportedException(String.Format(
-              "Missing value for UPDATE key member '{0}' in table '{1}'.",
-               (missingKeyMember != null) ? missingKeyMember.Name : "<unknown>",
-               table.Name));
+      EntitySetBase table = ((DbScanExpression)tree.Target.Expression).Target;
+      bool identity = false;
+      foreach (EdmMember keyMember in table.ElementType.KeyMembers)
+      {
+        commandText.Append(" AND ");
+        commandText.Append(GenerateMemberTSql(keyMember));
+        commandText.Append(" = ");
+
+        // retrieve member value sql. the translator remembers member values
+        // as it constructs the DML statement (which precedes the "returning"
+        // SQL)
+        DbParameter value;
+        if (translator.MemberValues.TryGetValue(keyMember, out value))
+        {
+          commandText.Append(value.ParameterName);
+        }
+        else
+        {
+          // if no value is registered for the key member, it means it is an identity
+          // which can be retrieved using the scope_identity() function
+          if (identity)
+          {
+            // there can be only one server generated key
+            throw new NotSupportedException(string.Format("Server generated keys are only supported for identity columns. More than one key column is marked as server generated in table '{0}'.", table.Name));
+          }
+          commandText.AppendLine("last_insert_rowid()");
+          identity = true;
+        }
       }
       commandText.AppendLine(";");
     }
 
     /// <summary>

Index: System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs
==================================================================
--- System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs
+++ System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs
@@ -41,11 +41,11 @@
     {
 #if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY
         UnsafeNativeMethods.Initialize();
 #endif
 
-#if USE_INTEROP_DLL && INTEROP_LOG
+#if INTEROP_LOG
         if (UnsafeNativeMethods.sqlite3_config_log_interop() == SQLiteErrorCode.Ok)
         {
             UnsafeNativeMethods.sqlite3_log(
                 SQLiteErrorCode.Ok, SQLiteConvert.ToUTF8("logging initialized."));
         }
@@ -58,11 +58,11 @@
             "4.0.0.0";
 #else
             "3.5.0.0";
 #endif
 
-        _dbProviderServicesType = Type.GetType(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "System.Data.Common.DbProviderServices, System.Data.Entity, Version={0}, Culture=neutral, PublicKeyToken=b77a5c561934e089", version), false);
+        _dbProviderServicesType = Type.GetType(String.Format(CultureInfo.InvariantCulture, "System.Data.Common.DbProviderServices, System.Data.Entity, Version={0}, Culture=neutral, PublicKeyToken=b77a5c561934e089", version), false);
     }
 
     /// <summary>
     /// Will provide a <see cref="IServiceProvider" /> object in .NET 3.5.
     /// </summary>
@@ -88,16 +88,16 @@
 
             Version version = this.GetType().Assembly.GetName().Version;
 
             if (typeName != null)
             {
-                typeName = UnsafeNativeMethods.StringFormat(
+                typeName = String.Format(
                     CultureInfo.InvariantCulture, typeName, version);
             }
             else
             {
-                typeName = UnsafeNativeMethods.StringFormat(
+                typeName = String.Format(
                     CultureInfo.InvariantCulture, DefaultTypeName, version);
             }
 
             Type type = Type.GetType(typeName, false);
 

Index: System.Data.SQLite/SQLite3.cs
==================================================================
--- System.Data.SQLite/SQLite3.cs
+++ System.Data.SQLite/SQLite3.cs
@@ -246,20 +246,20 @@
                   if (unbindFunctions)
                   {
                       if (SQLiteFunction.UnbindAllFunctions(this, _flags, false))
                       {
 #if !NET_COMPACT_20 && TRACE_CONNECTION
-                          Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                          Trace.WriteLine(String.Format(
                               CultureInfo.CurrentCulture,
                               "UnbindFunctions (Pool) Success: {0}",
                               HandleToString()));
 #endif
                       }
                       else
                       {
 #if !NET_COMPACT_20 && TRACE_CONNECTION
-                          Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                          Trace.WriteLine(String.Format(
                               CultureInfo.CurrentCulture,
                               "UnbindFunctions (Pool) Failure: {0}",
                               HandleToString()));
 #endif
                       }
@@ -275,20 +275,20 @@
                       SQLiteConnectionEventType.ClosedToPool, null, null,
                       null, null, _sql, _fileName, new object[] {
                       typeof(SQLite3), canThrow, _fileName, _poolVersion }));
 
 #if !NET_COMPACT_20 && TRACE_CONNECTION
-                  Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                  Trace.WriteLine(String.Format(
                       CultureInfo.CurrentCulture,
                       "Close (Pool) Success: {0}",
                       HandleToString()));
 #endif
               }
 #if !NET_COMPACT_20 && TRACE_CONNECTION
               else
               {
-                  Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                  Trace.WriteLine(String.Format(
                       CultureInfo.CurrentCulture,
                       "Close (Pool) Failure: {0}",
                       HandleToString()));
               }
 #endif
@@ -298,20 +298,20 @@
               if (unbindFunctions)
               {
                   if (SQLiteFunction.UnbindAllFunctions(this, _flags, false))
                   {
 #if !NET_COMPACT_20 && TRACE_CONNECTION
-                      Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                      Trace.WriteLine(String.Format(
                           CultureInfo.CurrentCulture,
                           "UnbindFunctions Success: {0}",
                           HandleToString()));
 #endif
                   }
                   else
                   {
 #if !NET_COMPACT_20 && TRACE_CONNECTION
-                      Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                      Trace.WriteLine(String.Format(
                           CultureInfo.CurrentCulture,
                           "UnbindFunctions Failure: {0}",
                           HandleToString()));
 #endif
                   }
@@ -887,11 +887,11 @@
             null, null, _sql, strFilename, new object[] {
             typeof(SQLite3), strFilename, vfsName, connectionFlags,
             openFlags, maxPoolSize, usePool, _poolVersion }));
 
 #if !NET_COMPACT_20 && TRACE_CONNECTION
-        Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+        Trace.WriteLine(String.Format(
             CultureInfo.CurrentCulture,
             "Open (Pool): {0}", HandleToString()));
 #endif
       }
 
@@ -918,11 +918,11 @@
           {
             n = UnsafeNativeMethods.sqlite3_open_v2(ToUTF8(strFilename), ref db, openFlags, ToUTF8(vfsName));
           }
 
 #if !NET_COMPACT_20 && TRACE_CONNECTION
-          Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+          Trace.WriteLine(String.Format(
               CultureInfo.CurrentCulture,
               "Open: {0}", db));
 #endif
 
           if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, null);
@@ -1243,15 +1243,15 @@
         string baseSchemaName = (cnn != null) ? cnn._baseSchemaName : null;
 
         if (!String.IsNullOrEmpty(baseSchemaName))
         {
           strSql = strSql.Replace(
-              UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture,
+              String.Format(CultureInfo.InvariantCulture,
               "[{0}].", baseSchemaName), String.Empty);
 
           strSql = strSql.Replace(
-              UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture,
+              String.Format(CultureInfo.InvariantCulture,
               "{0}.", baseSchemaName), String.Empty);
         }
       }
 
       SQLiteConnectionFlags flags =
@@ -1264,11 +1264,11 @@
           ((flags & SQLiteConnectionFlags.LogPrepare) == SQLiteConnectionFlags.LogPrepare))
       {
           if ((strSql == null) || (strSql.Length == 0) || (strSql.Trim().Length == 0))
               SQLiteLog.LogMessage("Preparing {<nothing>}...");
           else
-              SQLiteLog.LogMessage(UnsafeNativeMethods.StringFormat(
+              SQLiteLog.LogMessage(String.Format(
                   CultureInfo.CurrentCulture, "Preparing {{{0}}}...", strSql));
       }
 
       IntPtr stmt = IntPtr.Zero;
       IntPtr ptr = IntPtr.Zero;
@@ -1311,11 +1311,11 @@
 #endif
             len = -1;
 #endif
 
 #if !NET_COMPACT_20 && TRACE_STATEMENT
-            Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+            Trace.WriteLine(String.Format(
                 CultureInfo.CurrentCulture,
                 "Prepare ({0}): {1}", n, stmt));
 #endif
 
             if ((n == SQLiteErrorCode.Ok) && (stmt != IntPtr.Zero))
@@ -1447,22 +1447,21 @@
 
     protected static void LogBind(SQLiteStatementHandle handle, int index)
     {
         IntPtr handleIntPtr = handle;
 
-        SQLiteLog.LogMessage(UnsafeNativeMethods.StringFormat(
+        SQLiteLog.LogMessage(String.Format(
             CultureInfo.CurrentCulture,
             "Binding statement {0} paramter #{1} as NULL...",
             handleIntPtr, index));
     }
 
     protected static void LogBind(SQLiteStatementHandle handle, int index, ValueType value)
     {
         IntPtr handleIntPtr = handle;
 
-        SQLiteLog.LogMessage(UnsafeNativeMethods.StringFormat(
-            CultureInfo.CurrentCulture,
+        SQLiteLog.LogMessage(String.Format(
             "Binding statement {0} paramter #{1} as type {2} with value {{{3}}}...",
             handleIntPtr, index, value.GetType(), value));
     }
 
     private static string FormatDateTime(DateTime value)
@@ -1480,22 +1479,20 @@
 
     protected static void LogBind(SQLiteStatementHandle handle, int index, DateTime value)
     {
         IntPtr handleIntPtr = handle;
 
-        SQLiteLog.LogMessage(UnsafeNativeMethods.StringFormat(
-            CultureInfo.CurrentCulture,
+        SQLiteLog.LogMessage(String.Format(
             "Binding statement {0} paramter #{1} as type {2} with value {{{3}}}...",
             handleIntPtr, index, typeof(DateTime), FormatDateTime(value)));
     }
 
     protected static void LogBind(SQLiteStatementHandle handle, int index, string value)
     {
         IntPtr handleIntPtr = handle;
 
-        SQLiteLog.LogMessage(UnsafeNativeMethods.StringFormat(
-            CultureInfo.CurrentCulture,
+        SQLiteLog.LogMessage(String.Format(
             "Binding statement {0} paramter #{1} as type {2} with value {{{3}}}...",
             handleIntPtr, index, typeof(String), (value != null) ? value : "<null>"));
     }
 
     private static string ToHexadecimalString(
@@ -1517,12 +1514,11 @@
 
     protected static void LogBind(SQLiteStatementHandle handle, int index, byte[] value)
     {
         IntPtr handleIntPtr = handle;
 
-        SQLiteLog.LogMessage(UnsafeNativeMethods.StringFormat(
-            CultureInfo.CurrentCulture,
+        SQLiteLog.LogMessage(String.Format(
             "Binding statement {0} paramter #{1} as type {2} with value {{{3}}}...",
             handleIntPtr, index, typeof(Byte[]), (value != null) ? ToHexadecimalString(value) : "<null>"));
     }
 
     internal override void Bind_Double(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, double value)
@@ -1534,17 +1530,16 @@
             LogBind(handle, index, value);
         }
 
 #if !PLATFORM_COMPACTFRAMEWORK
         SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double(handle, index, value);
-        if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
 #elif !SQLITE_STANDARD
         SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double_interop(handle, index, ref value);
-        if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
 #else
         throw new NotImplementedException();
 #endif
+        if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
     }
 
     internal override void Bind_Int32(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, int value)
     {
         SQLiteStatementHandle handle = stmt._sqlite_stmt;
@@ -1599,17 +1594,16 @@
         {
             LogBind(handle, index, value);
         }
 
         SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value);
-        if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
 #elif !SQLITE_STANDARD
         SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value);
-        if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
 #else
         throw new NotImplementedException();
 #endif
+        if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
     }
 
     internal override void Bind_UInt64(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, ulong value)
     {
         SQLiteStatementHandle handle = stmt._sqlite_stmt;
@@ -1619,17 +1613,16 @@
         {
             LogBind(handle, index, value);
         }
 
         SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_uint64(handle, index, value);
-        if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
 #elif !SQLITE_STANDARD
         SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_uint64_interop(handle, index, ref value);
-        if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
 #else
         throw new NotImplementedException();
 #endif
+        if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
     }
 
     internal override void Bind_Text(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, string value)
     {
         SQLiteStatementHandle handle = stmt._sqlite_stmt;
@@ -1689,19 +1682,17 @@
                     {
                         LogBind(handle, index, value);
                     }
 
                     SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value);
-                    if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
-                    break;
 #elif !SQLITE_STANDARD
                     SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value);
-                    if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
-                    break;
 #else
                     throw new NotImplementedException();
 #endif
+                    if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
+                    break;
                 }
             case SQLiteDateFormats.JulianDay:
                 {
                     double value = ToJulianDay(dt);
 
@@ -1710,19 +1701,17 @@
                     {
                         LogBind(handle, index, value);
                     }
 
                     SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double(handle, index, value);
-                    if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
-                    break;
 #elif !SQLITE_STANDARD
                     SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_double_interop(handle, index, ref value);
-                    if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
-                    break;
 #else
                     throw new NotImplementedException();
 #endif
+                    if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
+                    break;
                 }
             case SQLiteDateFormats.UnixEpoch:
                 {
                     long value = Convert.ToInt64(dt.Subtract(UnixEpoch).TotalSeconds);
 
@@ -1731,19 +1720,17 @@
                     {
                         LogBind(handle, index, value);
                     }
 
                     SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64(handle, index, value);
-                    if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
-                    break;
 #elif !SQLITE_STANDARD
                     SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_bind_int64_interop(handle, index, ref value);
-                    if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
-                    break;
 #else
                     throw new NotImplementedException();
 #endif
+                    if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
+                    break;
                 }
             default:
                 {
                     byte[] b = ToUTF8(dt);
 
@@ -1798,11 +1785,11 @@
 
         if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
         {
             IntPtr handleIntPtr = handle;
 
-            SQLiteLog.LogMessage(UnsafeNativeMethods.StringFormat(
+            SQLiteLog.LogMessage(String.Format(
                 CultureInfo.CurrentCulture,
                 "Statement {0} paramter count is {1}.",
                 handleIntPtr, value));
         }
 
@@ -1823,11 +1810,11 @@
 
         if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
         {
             IntPtr handleIntPtr = handle;
 
-            SQLiteLog.LogMessage(UnsafeNativeMethods.StringFormat(
+            SQLiteLog.LogMessage(String.Format(
                 CultureInfo.CurrentCulture,
                 "Statement {0} paramter #{1} name is {{{2}}}.",
                 handleIntPtr, index, name));
         }
 
@@ -1841,11 +1828,11 @@
 
         if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind)
         {
             IntPtr handleIntPtr = handle;
 
-            SQLiteLog.LogMessage(UnsafeNativeMethods.StringFormat(
+            SQLiteLog.LogMessage(String.Format(
                 CultureInfo.CurrentCulture,
                 "Statement {0} paramter index of name {{{1}}} is #{2}.",
                 handleIntPtr, paramName, index));
         }
 
@@ -1989,19 +1976,20 @@
       autoIncrement = (nautoInc == 1);
     }
 
     internal override double GetDouble(SQLiteStatement stmt, int index)
     {
+      double value;
 #if !PLATFORM_COMPACTFRAMEWORK
-      return UnsafeNativeMethods.sqlite3_column_double(stmt._sqlite_stmt, index);
+      value = UnsafeNativeMethods.sqlite3_column_double(stmt._sqlite_stmt, index);
 #elif !SQLITE_STANDARD
-      double value = 0.0;
+      value = 0.0;
       UnsafeNativeMethods.sqlite3_column_double_interop(stmt._sqlite_stmt, index, ref value);
-      return value;
 #else
       throw new NotImplementedException();
 #endif
+      return value;
     }
 
     internal override sbyte GetSByte(SQLiteStatement stmt, int index)
     {
       return unchecked((sbyte)(GetInt32(stmt, index) & byte.MaxValue));
@@ -2032,19 +2020,20 @@
       return unchecked((uint)GetInt32(stmt, index));
     }
 
     internal override long GetInt64(SQLiteStatement stmt, int index)
     {
+      long value;
 #if !PLATFORM_COMPACTFRAMEWORK
-      return UnsafeNativeMethods.sqlite3_column_int64(stmt._sqlite_stmt, index);
+      value = UnsafeNativeMethods.sqlite3_column_int64(stmt._sqlite_stmt, index);
 #elif !SQLITE_STANDARD
-      long value = 0;
+      value = 0;
       UnsafeNativeMethods.sqlite3_column_int64_interop(stmt._sqlite_stmt, index, ref value);
-      return value;
 #else
       throw new NotImplementedException();
 #endif
+      return value;
     }
 
     internal override ulong GetUInt64(SQLiteStatement stmt, int index)
     {
       return unchecked((ulong)GetInt64(stmt, index));
@@ -2262,37 +2251,39 @@
       return nCopied;
     }
 
     internal override double GetParamValueDouble(IntPtr ptr)
     {
+      double value;
 #if !PLATFORM_COMPACTFRAMEWORK
-      return UnsafeNativeMethods.sqlite3_value_double(ptr);
+      value = UnsafeNativeMethods.sqlite3_value_double(ptr);
 #elif !SQLITE_STANDARD
-      double value = 0.0;
+      value = 0.0;
       UnsafeNativeMethods.sqlite3_value_double_interop(ptr, ref value);
-      return value;
 #else
       throw new NotImplementedException();
 #endif
+      return value;
     }
 
     internal override int GetParamValueInt32(IntPtr ptr)
     {
       return UnsafeNativeMethods.sqlite3_value_int(ptr);
     }
 
     internal override long GetParamValueInt64(IntPtr ptr)
     {
+      Int64 value;
 #if !PLATFORM_COMPACTFRAMEWORK
-      return UnsafeNativeMethods.sqlite3_value_int64(ptr);
+      value = UnsafeNativeMethods.sqlite3_value_int64(ptr);
 #elif !SQLITE_STANDARD
-      Int64 value = 0;
+      value = 0;
       UnsafeNativeMethods.sqlite3_value_int64_interop(ptr, ref value);
-      return value;
 #else
       throw new NotImplementedException();
 #endif
+      return value;
     }
 
     internal override string GetParamValueText(IntPtr ptr)
     {
 #if !SQLITE_STANDARD
@@ -2395,11 +2386,11 @@
             if (_usePool)
             {
                 _usePool = false;
 
 #if !NET_COMPACT_20 && TRACE_CONNECTION
-                Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                Trace.WriteLine(String.Format(
                     CultureInfo.CurrentCulture,
                     "CreateModule (Pool) Disabled: {0}",
                     HandleToString()));
 #endif
             }
@@ -2642,18 +2633,16 @@
 #if INTEROP_CODEC || INTEROP_INCLUDE_SEE
     internal override void SetPassword(byte[] passwordBytes)
     {
       SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_key(_sql, passwordBytes, passwordBytes.Length);
       if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
-      _usePool = false;
     }
 
     internal override void ChangePassword(byte[] newPasswordBytes)
     {
       SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_rekey(_sql, newPasswordBytes, (newPasswordBytes == null) ? 0 : newPasswordBytes.Length);
       if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError());
-      _usePool = false;
     }
 #endif
 
     internal override void SetProgressHook(int nOps, SQLiteProgressCallback func)
     {

Index: System.Data.SQLite/SQLite3_UTF16.cs
==================================================================
--- System.Data.SQLite/SQLite3_UTF16.cs
+++ System.Data.SQLite/SQLite3_UTF16.cs
@@ -10,16 +10,15 @@
   using System;
   using System.Collections.Generic;
 
 #if !NET_COMPACT_20 && TRACE_CONNECTION
   using System.Diagnostics;
-#endif
-
   using System.Globalization;
+#endif
+
   using System.IO;
   using System.Runtime.InteropServices;
-
 
   /// <summary>
   /// Alternate SQLite3 object, overriding many text behaviors to support UTF-16 (Unicode)
   /// </summary>
   internal sealed class SQLite3_UTF16 : SQLite3
@@ -161,11 +160,11 @@
             typeof(SQLite3_UTF16), strFilename, vfsName,
             connectionFlags, openFlags, maxPoolSize, usePool,
             _poolVersion }));
 
 #if !NET_COMPACT_20 && TRACE_CONNECTION
-        Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+        Trace.WriteLine(String.Format(
             CultureInfo.CurrentCulture,
             "Open16 (Pool): {0}",
             HandleToString()));
 #endif
       }
@@ -200,20 +199,19 @@
             if (((openFlags & SQLiteOpenFlagsEnum.Create) != SQLiteOpenFlagsEnum.Create) && !File.Exists(strFilename))
               throw new SQLiteException(SQLiteErrorCode.CantOpen, strFilename);
 
             if (vfsName != null)
             {
-              throw new SQLiteException(SQLiteErrorCode.CantOpen, UnsafeNativeMethods.StringFormat(
-                CultureInfo.CurrentCulture,
+              throw new SQLiteException(SQLiteErrorCode.CantOpen, String.Format(
                 "cannot open using UTF-16 and VFS \"{0}\": need interop assembly", vfsName));
             }
 
             n = UnsafeNativeMethods.sqlite3_open16(strFilename, ref db);
           }
 
 #if !NET_COMPACT_20 && TRACE_CONNECTION
-          Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+          Trace.WriteLine(String.Format(
               CultureInfo.CurrentCulture,
               "Open16: {0}", db));
 #endif
 
           if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, null);

Index: System.Data.SQLite/SQLiteBase.cs
==================================================================
--- System.Data.SQLite/SQLiteBase.cs
+++ System.Data.SQLite/SQLiteBase.cs
@@ -949,25 +949,22 @@
       /// Prevent this <see cref="SQLiteConnection" /> object instance from
       /// loading extensions.
       /// </summary>
       NoLoadExtension = 0x200,
 
-#if INTEROP_VIRTUAL_TABLE
       /// <summary>
       /// Prevent this <see cref="SQLiteConnection" /> object instance from
       /// creating virtual table modules.
       /// </summary>
       NoCreateModule = 0x400,
-#endif
 
       /// <summary>
       /// Skip binding any functions provided by other managed assemblies when
       /// opening the connection.
       /// </summary>
       NoBindFunctions = 0x800,
 
-#if INTEROP_VIRTUAL_TABLE
       /// <summary>
       /// Skip setting the logging related properties of the
       /// <see cref="SQLiteModule" /> object instance that was passed to
       /// the <see cref="SQLiteConnection.CreateModule" /> method.
       /// </summary>
@@ -982,11 +979,10 @@
       /// <summary>
       /// Enable logging of certain virtual table module exceptions that cannot
       /// be easily discovered via other means.
       /// </summary>
       LogModuleException = 0x4000,
-#endif
 
       /// <summary>
       /// Enable tracing of potentially important [non-fatal] error conditions
       /// that cannot be easily reported through other means.
       /// </summary>
@@ -1167,27 +1163,18 @@
                                                ConvertAndBindInvariantText,
 
       /// <summary>
       /// Enable all logging.
       /// </summary>
-#if INTEROP_VIRTUAL_TABLE
       LogAll = LogPrepare | LogPreBind | LogBind |
                LogCallbackException | LogBackup | LogModuleError |
                LogModuleException,
-#else
-      LogAll = LogPrepare | LogPreBind | LogBind |
-               LogCallbackException | LogBackup,
-#endif
 
       /// <summary>
       /// The default extra flags for new connections.
       /// </summary>
-#if INTEROP_VIRTUAL_TABLE
       Default = LogCallbackException | LogModuleException,
-#else
-      Default = LogCallbackException,
-#endif
 
       /// <summary>
       /// The default extra flags for new connections with all logging enabled.
       /// </summary>
       DefaultAndLogAll = Default | LogAll

Index: System.Data.SQLite/SQLiteCommandBuilder.cs
==================================================================
--- System.Data.SQLite/SQLiteCommandBuilder.cs
+++ System.Data.SQLite/SQLiteCommandBuilder.cs
@@ -48,16 +48,10 @@
 #endif
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////////
 
-    /// <summary>
-    /// Cleans up resources (native and managed) associated with the current instance.
-    /// </summary>
-    /// <param name="disposing">
-    /// Zero when being disposed via garbage collection; otherwise, non-zero.
-    /// </param>
     protected override void Dispose(bool disposing)
     {
         try
         {
             if (!disposed)
@@ -106,21 +100,21 @@
     /// </summary>
     /// <param name="parameterName">The name of the parameter</param>
     /// <returns>Error</returns>
     protected override string GetParameterName(string parameterName)
     {
-      return UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "@{0}", parameterName);
+      return String.Format(CultureInfo.InvariantCulture, "@{0}", parameterName);
     }
 
     /// <summary>
     /// Returns a named parameter for the given ordinal
     /// </summary>
     /// <param name="parameterOrdinal">The i of the parameter</param>
     /// <returns>Error</returns>
     protected override string GetParameterName(int parameterOrdinal)
     {
-      return UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "@param{0}", parameterOrdinal);
+      return String.Format(CultureInfo.InvariantCulture, "@param{0}", parameterOrdinal);
     }
 
     /// <summary>
     /// Returns a placeholder character for the specified parameter i.
     /// </summary>

Index: System.Data.SQLite/SQLiteConnection.cs
==================================================================
--- System.Data.SQLite/SQLiteConnection.cs
+++ System.Data.SQLite/SQLiteConnection.cs
@@ -296,18 +296,11 @@
   /// <description>N</description>
   /// <description>True</description>
   /// </item>
   /// <item>
   /// <description>Cache Size</description>
-  /// <description>
-  /// If the argument N is positive then the suggested cache size is set to N.
-  /// If the argument N is negative, then the number of cache pages is adjusted
-  /// to use approximately abs(N*1024) bytes of memory. Backwards compatibility
-  /// note: The behavior of cache_size with a negative N was different in SQLite
-  /// versions prior to 3.7.10. In version 3.7.9 and earlier, the number of
-  /// pages in the cache was set to the absolute value of N.
-  /// </description>
+  /// <description>{size in bytes}</description>
   /// <description>N</description>
   /// <description>2000</description>
   /// </item>
   /// <item>
   /// <description>Synchronous</description>
@@ -812,11 +805,10 @@
         : this(connectionString, false)
     {
         // do nothing.
     }
 
-#if INTEROP_VIRTUAL_TABLE
     /// <summary>
     /// Initializes the connection with a pre-existing native connection handle.
     /// This constructor overload is intended to be used only by the private
     /// <see cref="SQLiteModule.CreateOrConnect" /> method.
     /// </summary>
@@ -842,11 +834,10 @@
         _connectionState = (db != IntPtr.Zero) ?
             ConnectionState.Open : ConnectionState.Closed;
 
         _connectionString = null; /* unknown */
     }
-#endif
 
     /// <summary>
     /// Initializes the connection with the specified connection string.
     /// </summary>
     /// <param name="connectionString">
@@ -888,11 +879,11 @@
                   SQLiteConnectionHandle.closeConnection = SQLiteBase.CloseConnectionV2;
           }
       }
 #endif
 
-#if USE_INTEROP_DLL && INTEROP_LOG
+#if INTEROP_LOG
       if (UnsafeNativeMethods.sqlite3_config_log_interop() == SQLiteErrorCode.Ok)
       {
           UnsafeNativeMethods.sqlite3_log(
               SQLiteErrorCode.Ok, SQLiteConvert.ToUTF8("logging initialized."));
       }
@@ -936,11 +927,11 @@
             if (String.Compare(str, "main", StringComparison.OrdinalIgnoreCase) != 0
               && String.Compare(str, "temp", StringComparison.OrdinalIgnoreCase) != 0)
             {
               using (SQLiteCommand cmd = CreateCommand())
               {
-                cmd.CommandText = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "ATTACH DATABASE '{0}' AS [{1}]", row[1], row[0]);
+                cmd.CommandText = String.Format(CultureInfo.InvariantCulture, "ATTACH DATABASE '{0}' AS [{1}]", row[1], row[0]);
                 cmd.ExecuteNonQuery();
               }
             }
           }
         }
@@ -1169,11 +1160,11 @@
         }
         catch (Exception e)
         {
             if ((_flags & SQLiteConnectionFlags.LogBackup) == SQLiteConnectionFlags.LogBackup)
             {
-                SQLiteLog.LogMessage(UnsafeNativeMethods.StringFormat(
+                SQLiteLog.LogMessage(String.Format(
                     CultureInfo.CurrentCulture,
                     "Caught exception while backing up database: {0}", e));
             }
 
             throw;
@@ -1390,15 +1381,15 @@
     /// <summary>
     /// Attempts to bind the specified <see cref="SQLiteFunction" /> object
     /// instance to this connection.
     /// </summary>
     /// <param name="functionAttribute">
-    /// The <see cref="SQLiteFunctionAttribute" /> object instance containing
+    /// The <see cref="SQLiteFunctionAttribute"/> object instance containing
     /// the metadata for the function to be bound.
     /// </param>
     /// <param name="function">
-    /// The <see cref="SQLiteFunction" /> object instance that implements the
+    /// The <see cref="SQLiteFunction"/> object instance that implements the
     /// function to be bound.
     /// </param>
     public void BindFunction(
         SQLiteFunctionAttribute functionAttribute,
         SQLiteFunction function
@@ -1413,56 +1404,16 @@
         _sql.BindFunction(functionAttribute, function, _flags);
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////////
 
-    /// <summary>
-    /// Attempts to bind the specified <see cref="SQLiteFunction" /> object
-    /// instance to this connection.
-    /// </summary>
-    /// <param name="functionAttribute">
-    /// The <see cref="SQLiteFunctionAttribute" /> object instance containing
-    /// the metadata for the function to be bound.
-    /// </param>
-    /// <param name="callback1">
-    /// A <see cref="Delegate" /> object instance that helps implement the
-    /// function to be bound.  For scalar functions, this corresponds to the
-    /// <see cref="SQLiteInvokeDelegate" /> type.  For aggregate functions,
-    /// this corresponds to the <see cref="SQLiteStepDelegate" /> type.  For
-    /// collation functions, this corresponds to the
-    /// <see cref="SQLiteCompareDelegate" /> type.
-    /// </param>
-    /// <param name="callback2">
-    /// A <see cref="Delegate" /> object instance that helps implement the
-    /// function to be bound.  For aggregate functions, this corresponds to the
-    /// <see cref="SQLiteFinalDelegate" /> type.  For other callback types, it
-    /// is not used and must be null.
-    /// </param>
-    public void BindFunction(
-        SQLiteFunctionAttribute functionAttribute,
-        Delegate callback1,
-        Delegate callback2
-        )
-    {
-        CheckDisposed();
-
-        if (_sql == null)
-            throw new InvalidOperationException(
-                "Database connection not valid for binding functions.");
-
-        _sql.BindFunction(functionAttribute,
-            new SQLiteDelegateFunction(callback1, callback2), _flags);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////
-
     /// <summary>
     /// Attempts to unbind the specified <see cref="SQLiteFunction" /> object
     /// instance to this connection.
     /// </summary>
     /// <param name="functionAttribute">
-    /// The <see cref="SQLiteFunctionAttribute" /> object instance containing
+    /// The <see cref="SQLiteFunctionAttribute"/> object instance containing
     /// the metadata for the function to be unbound.
     /// </param>
     /// <returns>Non-zero if the function was unbound.</returns>
     public bool UnbindFunction(
         SQLiteFunctionAttribute functionAttribute
@@ -1635,24 +1586,18 @@
 #endif
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////////
 
-    /// <summary>
-    /// Cleans up resources (native and managed) associated with the current instance.
-    /// </summary>
-    /// <param name="disposing">
-    /// Zero when being disposed via garbage collection; otherwise, non-zero.
-    /// </param>
     protected override void Dispose(bool disposing)
     {
 #if !NET_COMPACT_20 && TRACE_WARNING
         if ((_flags & SQLiteConnectionFlags.TraceWarning) == SQLiteConnectionFlags.TraceWarning)
         {
             if (_noDispose)
             {
-                System.Diagnostics.Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                System.Diagnostics.Trace.WriteLine(String.Format(
                     CultureInfo.CurrentCulture,
                     "WARNING: Disposing of connection \"{0}\" with the no-dispose flag set.",
                     _connectionString));
             }
         }
@@ -2089,12 +2034,11 @@
       else
           arParts = SQLiteConvert.NewSplit(s, ';', true, ref error);
 
       if (arParts == null)
       {
-          throw new ArgumentException(UnsafeNativeMethods.StringFormat(
-              CultureInfo.CurrentCulture,
+          throw new ArgumentException(String.Format(CultureInfo.CurrentCulture,
               "Invalid ConnectionString format, cannot parse: {0}", (error != null) ?
               error : "could not split connection string into properties"));
       }
 
       int x = (arParts != null) ? arParts.Length : 0;
@@ -2114,11 +2058,11 @@
         if (indexOf != -1)
           ls.Add(UnwrapString(arParts[n].Substring(0, indexOf).Trim()), UnwrapString(arParts[n].Substring(indexOf + 1).Trim()));
         else if (allowNameOnly)
           ls.Add(UnwrapString(arParts[n].Trim()), String.Empty);
         else
-          throw new ArgumentException(UnsafeNativeMethods.StringFormat(CultureInfo.CurrentCulture, "Invalid ConnectionString format for part \"{0}\", no equal sign found", arParts[n]));
+          throw new ArgumentException(String.Format(CultureInfo.CurrentCulture, "Invalid ConnectionString format for part \"{0}\", no equal sign found", arParts[n]));
       }
       return ls;
     }
 
     /// <summary>
@@ -2314,11 +2258,11 @@
         )
     {
         CheckDisposed();
 
         if (_sql == null)
-            throw new InvalidOperationException(UnsafeNativeMethods.StringFormat(
+            throw new InvalidOperationException(String.Format(
                 CultureInfo.CurrentCulture,
                 "Database connection not valid for {0} extensions.",
                 enable ? "enabling" : "disabling"));
 
         if ((_flags & SQLiteConnectionFlags.NoLoadExtension) == SQLiteConnectionFlags.NoLoadExtension)
@@ -2437,13 +2381,11 @@
 
         int length = array.Length;
 
         for (int index = 0; index < length; index++)
 #if NET_COMPACT_20
-            result.Append(UnsafeNativeMethods.StringFormat(
-                CultureInfo.InvariantCulture,
-                "{0:x2}", array[index]));
+            result.Append(String.Format("{0:x2}", array[index]));
 #else
             result.AppendFormat("{0:x2}", array[index]);
 #endif
 
         return result.ToString();
@@ -2489,11 +2431,11 @@
             string value = text.Substring(index, 2);
 
             if (!TryParseByte(value,
                     NumberStyles.HexNumber, out result[index / 2]))
             {
-                error = UnsafeNativeMethods.StringFormat(
+                error = String.Format(
                     CultureInfo.CurrentCulture,
                     "string contains \"{0}\", which cannot be converted to a byte value",
                     value);
 
                 return null;
@@ -2645,11 +2587,11 @@
 #endif
       bool fullUri = false;
       string fileName;
 
       if (Convert.ToInt32(FindKey(opts, "Version", DefaultVersion.ToString()), CultureInfo.InvariantCulture) != DefaultVersion)
-        throw new NotSupportedException(UnsafeNativeMethods.StringFormat(CultureInfo.CurrentCulture, "Only SQLite Version {0} is supported at this time", DefaultVersion));
+        throw new NotSupportedException(String.Format(CultureInfo.CurrentCulture, "Only SQLite Version {0} is supported at this time", DefaultVersion));
 
 #if INTEROP_INCLUDE_ZIPVFS
       bool useZipVfs = false;
       string zipVfsVersion = FindKey(opts, "ZipVfsVersion", DefaultZipVfsVersion);
 
@@ -2669,11 +2611,11 @@
               UnsafeNativeMethods.zipvfsInit_v3(0);
               useZipVfs = true;
           }
           else
           {
-              throw new NotSupportedException(UnsafeNativeMethods.StringFormat(
+              throw new NotSupportedException(String.Format(
                   CultureInfo.CurrentCulture, "Only ZipVFS versions {0}, {1}, and {2} are supported at this time",
                   ZipVfs_Automatic, ZipVfs_V2, ZipVfs_V3));
           }
       }
 #endif
@@ -2685,11 +2627,11 @@
         fileName = FindKey(opts, "Uri", DefaultUri);
         if (String.IsNullOrEmpty(fileName))
         {
           fileName = FindKey(opts, "FullUri", DefaultFullUri);
           if (String.IsNullOrEmpty(fileName))
-            throw new ArgumentException(UnsafeNativeMethods.StringFormat(CultureInfo.CurrentCulture, "Data Source cannot be empty.  Use {0} to open an in-memory database", MemoryFileName));
+            throw new ArgumentException(String.Format(CultureInfo.CurrentCulture, "Data Source cannot be empty.  Use {0} to open an in-memory database", MemoryFileName));
           else
             fullUri = true;
         }
         else
         {
@@ -2707,11 +2649,11 @@
       {
           if (!uri && !fullUri && !isMemory && !String.IsNullOrEmpty(fileName) &&
               fileName.StartsWith("\\", StringComparison.OrdinalIgnoreCase) &&
               !fileName.StartsWith("\\\\", StringComparison.OrdinalIgnoreCase))
           {
-              System.Diagnostics.Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+              System.Diagnostics.Trace.WriteLine(String.Format(
                   CultureInfo.CurrentCulture,
                   "WARNING: Detected a possibly malformed UNC database file name \"{0}\" that " +
                   "may have originally started with two backslashes; however, four leading " +
                   "backslashes may be required, e.g.: \"Data Source=\\\\\\{0};\"",
                   fileName));
@@ -2789,11 +2731,11 @@
             string error = null;
             byte[] hexPasswordBytes = FromHexString(hexPassword, ref error);
 
             if (hexPasswordBytes == null)
             {
-                throw new FormatException(UnsafeNativeMethods.StringFormat(
+                throw new FormatException(String.Format(
                     CultureInfo.CurrentCulture,
                     "Cannot parse 'HexPassword' property value into byte values: {0}",
                     error));
             }
 
@@ -2833,11 +2775,11 @@
           {
               using (SQLiteCommand cmd = CreateCommand())
               {
                   if (_busyTimeout != DefaultBusyTimeout)
                   {
-                      cmd.CommandText = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA busy_timeout={0}", _busyTimeout);
+                      cmd.CommandText = String.Format(CultureInfo.InvariantCulture, "PRAGMA busy_timeout={0}", _busyTimeout);
                       cmd.ExecuteNonQuery();
                   }
 
                   int intValue;
 
@@ -2845,44 +2787,44 @@
                   {
                       strValue = FindKey(opts, "Page Size", DefaultPageSize.ToString());
                       intValue = Convert.ToInt32(strValue, CultureInfo.InvariantCulture);
                       if (intValue != DefaultPageSize)
                       {
-                          cmd.CommandText = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA page_size={0}", intValue);
+                          cmd.CommandText = String.Format(CultureInfo.InvariantCulture, "PRAGMA page_size={0}", intValue);
                           cmd.ExecuteNonQuery();
                       }
                   }
 
                   strValue = FindKey(opts, "Max Page Count", DefaultMaxPageCount.ToString());
                   intValue = Convert.ToInt32(strValue, CultureInfo.InvariantCulture);
                   if (intValue != DefaultMaxPageCount)
                   {
-                      cmd.CommandText = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA max_page_count={0}", intValue);
+                      cmd.CommandText = String.Format(CultureInfo.InvariantCulture, "PRAGMA max_page_count={0}", intValue);
                       cmd.ExecuteNonQuery();
                   }
 
                   strValue = FindKey(opts, "Legacy Format", DefaultLegacyFormat.ToString());
                   boolValue = SQLiteConvert.ToBoolean(strValue);
                   if (boolValue != DefaultLegacyFormat)
                   {
-                      cmd.CommandText = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA legacy_file_format={0}", boolValue ? "ON" : "OFF");
+                      cmd.CommandText = String.Format(CultureInfo.InvariantCulture, "PRAGMA legacy_file_format={0}", boolValue ? "ON" : "OFF");
                       cmd.ExecuteNonQuery();
                   }
 
                   strValue = FindKey(opts, "Synchronous", DefaultSynchronous.ToString());
                   enumValue = TryParseEnum(typeof(SQLiteSynchronousEnum), strValue, true);
                   if (!(enumValue is SQLiteSynchronousEnum) || ((SQLiteSynchronousEnum)enumValue != DefaultSynchronous))
                   {
-                      cmd.CommandText = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA synchronous={0}", strValue);
+                      cmd.CommandText = String.Format(CultureInfo.InvariantCulture, "PRAGMA synchronous={0}", strValue);
                       cmd.ExecuteNonQuery();
                   }
 
                   strValue = FindKey(opts, "Cache Size", DefaultCacheSize.ToString());
                   intValue = Convert.ToInt32(strValue, CultureInfo.InvariantCulture);
                   if (intValue != DefaultCacheSize)
                   {
-                      cmd.CommandText = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA cache_size={0}", intValue);
+                      cmd.CommandText = String.Format(CultureInfo.InvariantCulture, "PRAGMA cache_size={0}", intValue);
                       cmd.ExecuteNonQuery();
                   }
 
                   strValue = FindKey(opts, "Journal Mode", DefaultJournalMode.ToString());
                   enumValue = TryParseEnum(typeof(SQLiteJournalModeEnum), strValue, true);
@@ -2893,27 +2835,27 @@
 #if INTEROP_INCLUDE_ZIPVFS
                       if (useZipVfs)
                           pragmaStr = "PRAGMA zipvfs_journal_mode={0}";
 #endif
 
-                      cmd.CommandText = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, pragmaStr, strValue);
+                      cmd.CommandText = String.Format(CultureInfo.InvariantCulture, pragmaStr, strValue);
                       cmd.ExecuteNonQuery();
                   }
 
                   strValue = FindKey(opts, "Foreign Keys", DefaultForeignKeys.ToString());
                   boolValue = SQLiteConvert.ToBoolean(strValue);
                   if (boolValue != DefaultForeignKeys)
                   {
-                      cmd.CommandText = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA foreign_keys={0}", boolValue ? "ON" : "OFF");
+                      cmd.CommandText = String.Format(CultureInfo.InvariantCulture, "PRAGMA foreign_keys={0}", boolValue ? "ON" : "OFF");
                       cmd.ExecuteNonQuery();
                   }
 
                   strValue = FindKey(opts, "Recursive Triggers", DefaultRecursiveTriggers.ToString());
                   boolValue = SQLiteConvert.ToBoolean(strValue);
                   if (boolValue != DefaultRecursiveTriggers)
                   {
-                      cmd.CommandText = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA recursive_triggers={0}", boolValue ? "ON" : "OFF");
+                      cmd.CommandText = String.Format(CultureInfo.InvariantCulture, "PRAGMA recursive_triggers={0}", boolValue ? "ON" : "OFF");
                       cmd.ExecuteNonQuery();
                   }
               }
           }
 
@@ -3292,11 +3234,10 @@
     /// </param>
     /// <returns>
     /// A standard SQLite return code (i.e. zero for success and non-zero
     /// for failure).
     /// </returns>
-    #pragma warning disable 3001
     public static SQLiteErrorCode ReleaseMemory(
         int nBytes,
         bool reset,
         bool compact,
         ref int nFree,
@@ -3305,11 +3246,10 @@
         )
     {
         return SQLite3.StaticReleaseMemory(
             nBytes, reset, compact, ref nFree, ref resetOk, ref nLargest);
     }
-    #pragma warning restore 3001
 
     /// <summary>
     /// Sets the status of the memory usage tracking subsystem in the SQLite core library.  By default, this is enabled.
     /// If this is disabled, memory usage tracking will not be performed.  This is not really a per-connection value, it is
     /// global to the process.
@@ -3446,13 +3386,11 @@
                     sourceId = "0000000000000000000000000000000000000000";
 
                 if (sourceTimeStamp == null)
                     sourceTimeStamp = "0000-00-00 00:00:00 UTC";
 
-                return UnsafeNativeMethods.StringFormat(
-                    CultureInfo.InvariantCulture,
-                    "{0} {1}", sourceId, sourceTimeStamp);
+                return String.Format("{0} {1}", sourceId, sourceTimeStamp);
             }
             else
             {
                 return null;
             }
@@ -3522,11 +3460,11 @@
         _sql.Close(true); /* NOTE: MUST be closed before shutdown. */
         SQLiteErrorCode rc = _sql.Shutdown();
 
 #if !NET_COMPACT_20 && TRACE_CONNECTION
         if (rc != SQLiteErrorCode.Ok)
-            System.Diagnostics.Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+            System.Diagnostics.Trace.WriteLine(String.Format(
                 CultureInfo.CurrentCulture,
                 "Shutdown (Instance) Failed: {0}", rc));
 #endif
 
         return rc;
@@ -3552,11 +3490,11 @@
         SQLiteErrorCode rc = SQLite3.StaticShutdown(directories);
 
         if (rc != SQLiteErrorCode.Ok)
         {
 #if !NET_COMPACT_20 && TRACE_CONNECTION
-            System.Diagnostics.Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+            System.Diagnostics.Trace.WriteLine(String.Format(
                 CultureInfo.CurrentCulture,
                 "Shutdown (Static) Failed: {0}", rc));
 #endif
 
             if (!noThrow)
@@ -4136,20 +4074,20 @@
 
       if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main";
 
       string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb;
 
-      using (SQLiteCommand cmdTables = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'table' OR [type] LIKE 'view'", strCatalog, master), this))
+      using (SQLiteCommand cmdTables = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'table' OR [type] LIKE 'view'", strCatalog, master), this))
       using (SQLiteDataReader rdTables = cmdTables.ExecuteReader())
       {
         while (rdTables.Read())
         {
           if (String.IsNullOrEmpty(strTable) || String.Compare(strTable, rdTables.GetString(2), StringComparison.OrdinalIgnoreCase) == 0)
           {
             try
             {
-              using (SQLiteCommand cmd = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}]", strCatalog, rdTables.GetString(2)), this))
+              using (SQLiteCommand cmd = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}]", strCatalog, rdTables.GetString(2)), this))
               using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader(CommandBehavior.SchemaOnly))
               using (DataTable tblSchema = rd.GetSchemaTable(true, true))
               {
                 foreach (DataRow schemaRow in tblSchema.Rows)
                 {
@@ -4239,11 +4177,11 @@
 
       if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main";
 
       string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb;
 
-      using (SQLiteCommand cmdTables = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'table'", strCatalog, master), this))
+      using (SQLiteCommand cmdTables = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'table'", strCatalog, master), this))
       using (SQLiteDataReader rdTables = cmdTables.ExecuteReader())
       {
         while (rdTables.Read())
         {
           maybeRowId = false;
@@ -4252,11 +4190,11 @@
           {
             // First, look for any rowid indexes -- which sqlite defines are INTEGER PRIMARY KEY columns.
             // Such indexes are not listed in the indexes list but count as indexes just the same.
             try
             {
-              using (SQLiteCommand cmdTable = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA [{0}].table_info([{1}])", strCatalog, rdTables.GetString(2)), this))
+              using (SQLiteCommand cmdTable = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "PRAGMA [{0}].table_info([{1}])", strCatalog, rdTables.GetString(2)), this))
               using (SQLiteDataReader rdTable = cmdTable.ExecuteReader())
               {
                 while (rdTable.Read())
                 {
                   if (rdTable.GetInt32(5) != 0)
@@ -4279,11 +4217,11 @@
 
               row["TABLE_CATALOG"] = strCatalog;
               row["TABLE_NAME"] = rdTables.GetString(2);
               row["INDEX_CATALOG"] = strCatalog;
               row["PRIMARY_KEY"] = true;
-              row["INDEX_NAME"] = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "{1}_PK_{0}", rdTables.GetString(2), master);
+              row["INDEX_NAME"] = String.Format(CultureInfo.InvariantCulture, "{1}_PK_{0}", rdTables.GetString(2), master);
               row["UNIQUE"] = true;
 
               if (String.Compare((string)row["INDEX_NAME"], strIndex, StringComparison.OrdinalIgnoreCase) == 0
               || strIndex == null)
               {
@@ -4294,11 +4232,11 @@
             }
 
             // Now fetch all the rest of the indexes.
             try
             {
-              using (SQLiteCommand cmd = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA [{0}].index_list([{1}])", strCatalog, rdTables.GetString(2)), this))
+              using (SQLiteCommand cmd = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "PRAGMA [{0}].index_list([{1}])", strCatalog, rdTables.GetString(2)), this))
               using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader())
               {
                 while (rd.Read())
                 {
                   if (String.Compare(rd.GetString(1), strIndex, StringComparison.OrdinalIgnoreCase) == 0
@@ -4312,11 +4250,11 @@
                     row["INDEX_NAME"] = rd.GetString(1);
                     row["UNIQUE"] = SQLiteConvert.ToBoolean(rd.GetValue(2), CultureInfo.InvariantCulture, false);
                     row["PRIMARY_KEY"] = false;
 
                     // get the index definition
-                    using (SQLiteCommand cmdIndexes = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{2}] WHERE [type] LIKE 'index' AND [name] LIKE '{1}'", strCatalog, rd.GetString(1).Replace("'", "''"), master), this))
+                    using (SQLiteCommand cmdIndexes = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{2}] WHERE [type] LIKE 'index' AND [name] LIKE '{1}'", strCatalog, rd.GetString(1).Replace("'", "''"), master), this))
                     using (SQLiteDataReader rdIndexes = cmdIndexes.ExecuteReader())
                     {
                       while (rdIndexes.Read())
                       {
                         if (rdIndexes.IsDBNull(4) == false)
@@ -4328,11 +4266,11 @@
                     // Now for the really hard work.  Figure out which index is the primary key index.
                     // The only way to figure it out is to check if the index was an autoindex and if we have a non-rowid
                     // primary key, and all the columns in the given index match the primary key columns
                     if (primaryKeys.Count > 0 && rd.GetString(1).StartsWith("sqlite_autoindex_" + rdTables.GetString(2), StringComparison.InvariantCultureIgnoreCase) == true)
                     {
-                      using (SQLiteCommand cmdDetails = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA [{0}].index_info([{1}])", strCatalog, rd.GetString(1)), this))
+                      using (SQLiteCommand cmdDetails = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "PRAGMA [{0}].index_info([{1}])", strCatalog, rd.GetString(1)), this))
                       using (SQLiteDataReader rdDetails = cmdDetails.ExecuteReader())
                       {
                         int nMatches = 0;
                         while (rdDetails.Read())
                         {
@@ -4385,11 +4323,11 @@
 
       if (String.IsNullOrEmpty(table)) table = null;
       if (String.IsNullOrEmpty(catalog)) catalog = "main";
       string master = (String.Compare(catalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb;
 
-      using (SQLiteCommand cmd = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT [type], [name], [tbl_name], [rootpage], [sql], [rowid] FROM [{0}].[{1}] WHERE [type] LIKE 'trigger'", catalog, master), this))
+      using (SQLiteCommand cmd = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "SELECT [type], [name], [tbl_name], [rootpage], [sql], [rowid] FROM [{0}].[{1}] WHERE [type] LIKE 'trigger'", catalog, master), this))
       using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader())
       {
         while (rd.Read())
         {
           if (String.Compare(rd.GetString(1), triggerName, StringComparison.OrdinalIgnoreCase) == 0
@@ -4440,11 +4378,11 @@
 
       if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main";
 
       string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb;
 
-      using (SQLiteCommand cmd = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT [type], [name], [tbl_name], [rootpage], [sql], [rowid] FROM [{0}].[{1}] WHERE [type] LIKE 'table'", strCatalog, master), this))
+      using (SQLiteCommand cmd = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "SELECT [type], [name], [tbl_name], [rootpage], [sql], [rowid] FROM [{0}].[{1}] WHERE [type] LIKE 'table'", strCatalog, master), this))
       using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader())
       {
         while (rd.Read())
         {
           strItem = rd.GetString(0);
@@ -4506,11 +4444,11 @@
 
       if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main";
 
       string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb;
 
-      using (SQLiteCommand cmd = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'view'", strCatalog, master), this))
+      using (SQLiteCommand cmd = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'view'", strCatalog, master), this))
       using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader())
       {
         while (rd.Read())
         {
           if (String.Compare(rd.GetString(1), strView, StringComparison.OrdinalIgnoreCase) == 0
@@ -4655,11 +4593,11 @@
 
       string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb;
 
       tbl.BeginLoadData();
 
-      using (SQLiteCommand cmdTables = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'table'", strCatalog, master), this))
+      using (SQLiteCommand cmdTables = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'table'", strCatalog, master), this))
       using (SQLiteDataReader rdTables = cmdTables.ExecuteReader())
       {
         while (rdTables.Read())
         {
           maybeRowId = false;
@@ -4666,11 +4604,11 @@
           primaryKeys.Clear();
           if (String.IsNullOrEmpty(strTable) || String.Compare(rdTables.GetString(2), strTable, StringComparison.OrdinalIgnoreCase) == 0)
           {
             try
             {
-              using (SQLiteCommand cmdTable = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA [{0}].table_info([{1}])", strCatalog, rdTables.GetString(2)), this))
+              using (SQLiteCommand cmdTable = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "PRAGMA [{0}].table_info([{1}])", strCatalog, rdTables.GetString(2)), this))
               using (SQLiteDataReader rdTable = cmdTable.ExecuteReader())
               {
                 while (rdTable.Read())
                 {
                   if (rdTable.GetInt32(5) == 1) // is a primary key
@@ -4689,11 +4627,11 @@
             // This is a rowid row
             if (primaryKeys.Count == 1 && maybeRowId == true)
             {
               row = tbl.NewRow();
               row["CONSTRAINT_CATALOG"] = strCatalog;
-              row["CONSTRAINT_NAME"] = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "{1}_PK_{0}", rdTables.GetString(2), master);
+              row["CONSTRAINT_NAME"] = String.Format(CultureInfo.InvariantCulture, "{1}_PK_{0}", rdTables.GetString(2), master);
               row["TABLE_CATALOG"] = strCatalog;
               row["TABLE_NAME"] = rdTables.GetString(2);
               row["COLUMN_NAME"] = primaryKeys[0].Value;
               row["INDEX_NAME"] = row["CONSTRAINT_NAME"];
               row["ORDINAL_POSITION"] = 0; // primaryKeys[0].Key;
@@ -4703,21 +4641,21 @@
 
               if (String.IsNullOrEmpty(strIndex) || String.Compare(strIndex, (string)row["INDEX_NAME"], StringComparison.OrdinalIgnoreCase) == 0)
                 tbl.Rows.Add(row);
             }
 
-            using (SQLiteCommand cmdIndexes = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{2}] WHERE [type] LIKE 'index' AND [tbl_name] LIKE '{1}'", strCatalog, rdTables.GetString(2).Replace("'", "''"), master), this))
+            using (SQLiteCommand cmdIndexes = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{2}] WHERE [type] LIKE 'index' AND [tbl_name] LIKE '{1}'", strCatalog, rdTables.GetString(2).Replace("'", "''"), master), this))
             using (SQLiteDataReader rdIndexes = cmdIndexes.ExecuteReader())
             {
               while (rdIndexes.Read())
               {
                 int ordinal = 0;
                 if (String.IsNullOrEmpty(strIndex) || String.Compare(strIndex, rdIndexes.GetString(1), StringComparison.OrdinalIgnoreCase) == 0)
                 {
                   try
                   {
-                    using (SQLiteCommand cmdIndex = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA [{0}].index_info([{1}])", strCatalog, rdIndexes.GetString(1)), this))
+                    using (SQLiteCommand cmdIndex = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "PRAGMA [{0}].index_info([{1}])", strCatalog, rdIndexes.GetString(1)), this))
                     using (SQLiteDataReader rdIndex = cmdIndex.ExecuteReader())
                     {
                       while (rdIndex.Read())
                       {
                         row = tbl.NewRow();
@@ -4813,18 +4751,18 @@
 
       string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb;
 
       tbl.BeginLoadData();
 
-      using (SQLiteCommand cmdViews = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'view'", strCatalog, master), this))
+      using (SQLiteCommand cmdViews = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'view'", strCatalog, master), this))
       using (SQLiteDataReader rdViews = cmdViews.ExecuteReader())
       {
         while (rdViews.Read())
         {
           if (String.IsNullOrEmpty(strView) || String.Compare(strView, rdViews.GetString(2), StringComparison.OrdinalIgnoreCase) == 0)
           {
-            using (SQLiteCommand cmdViewSelect = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}]", strCatalog, rdViews.GetString(2)), this))
+            using (SQLiteCommand cmdViewSelect = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}]", strCatalog, rdViews.GetString(2)), this))
             {
               strSql = rdViews.GetString(4).Replace('\r', ' ').Replace('\n', ' ').Replace('\t', ' ');
               n = CultureInfo.InvariantCulture.CompareInfo.IndexOf(strSql, " AS ", CompareOptions.IgnoreCase);
               if (n < 0)
                 continue;
@@ -4918,28 +4856,28 @@
 
       string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb;
 
       tbl.BeginLoadData();
 
-      using (SQLiteCommand cmdTables = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'table'", strCatalog, master), this))
+      using (SQLiteCommand cmdTables = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'table'", strCatalog, master), this))
       using (SQLiteDataReader rdTables = cmdTables.ExecuteReader())
       {
         while (rdTables.Read())
         {
           if (String.IsNullOrEmpty(strTable) || String.Compare(strTable, rdTables.GetString(2), StringComparison.OrdinalIgnoreCase) == 0)
           {
             try
             {
               using (SQLiteCommandBuilder builder = new SQLiteCommandBuilder())
-              using (SQLiteCommand cmdKey = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA [{0}].foreign_key_list([{1}])", strCatalog, rdTables.GetString(2)), this))
+              using (SQLiteCommand cmdKey = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "PRAGMA [{0}].foreign_key_list([{1}])", strCatalog, rdTables.GetString(2)), this))
               using (SQLiteDataReader rdKey = cmdKey.ExecuteReader())
               {
                 while (rdKey.Read())
                 {
                   row = tbl.NewRow();
                   row["CONSTRAINT_CATALOG"] = strCatalog;
-                  row["CONSTRAINT_NAME"] = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "FK_{0}_{1}_{2}", rdTables[2], rdKey.GetInt32(0), rdKey.GetInt32(1));
+                  row["CONSTRAINT_NAME"] = String.Format(CultureInfo.InvariantCulture, "FK_{0}_{1}_{2}", rdTables[2], rdKey.GetInt32(0), rdKey.GetInt32(1));
                   row["TABLE_CATALOG"] = strCatalog;
                   row["TABLE_NAME"] = builder.UnquoteIdentifier(rdTables.GetString(2));
                   row["CONSTRAINT_TYPE"] = "FOREIGN KEY";
                   row["IS_DEFERRABLE"] = false;
                   row["INITIALLY_DEFERRED"] = false;
@@ -5089,11 +5027,11 @@
             {
                 if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
                         SQLiteConnectionFlags.LogCallbackException)
                 {
                     SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION,
-                        UnsafeNativeMethods.StringFormat(CultureInfo.CurrentCulture,
+                        String.Format(CultureInfo.CurrentCulture,
                         "Caught exception in \"Progress\" method: {1}",
                         e)); /* throw */
                 }
             }
             catch
@@ -5142,11 +5080,11 @@
             {
                 if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
                         SQLiteConnectionFlags.LogCallbackException)
                 {
                     SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION,
-                        UnsafeNativeMethods.StringFormat(CultureInfo.CurrentCulture,
+                        String.Format(CultureInfo.CurrentCulture,
                         "Caught exception in \"Authorize\" method: {1}",
                         e)); /* throw */
                 }
             }
             catch
@@ -5191,11 +5129,11 @@
             {
                 if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
                         SQLiteConnectionFlags.LogCallbackException)
                 {
                     SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION,
-                        UnsafeNativeMethods.StringFormat(CultureInfo.CurrentCulture,
+                        String.Format(CultureInfo.CurrentCulture,
                         "Caught exception in \"Update\" method: {1}",
                         e)); /* throw */
                 }
             }
             catch
@@ -5282,11 +5220,11 @@
             {
                 if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
                         SQLiteConnectionFlags.LogCallbackException)
                 {
                     SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION,
-                        UnsafeNativeMethods.StringFormat(CultureInfo.CurrentCulture,
+                        String.Format(CultureInfo.CurrentCulture,
                         "Caught exception in \"Trace\" method: {1}",
                         e)); /* throw */
                 }
             }
             catch
@@ -5344,11 +5282,11 @@
             {
                 if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
                         SQLiteConnectionFlags.LogCallbackException)
                 {
                     SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION,
-                        UnsafeNativeMethods.StringFormat(CultureInfo.CurrentCulture,
+                        String.Format(CultureInfo.CurrentCulture,
                         "Caught exception in \"Commit\" method: {1}",
                         e)); /* throw */
                 }
             }
             catch
@@ -5386,11 +5324,11 @@
             {
                 if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
                         SQLiteConnectionFlags.LogCallbackException)
                 {
                     SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION,
-                        UnsafeNativeMethods.StringFormat(CultureInfo.CurrentCulture,
+                        String.Format(CultureInfo.CurrentCulture,
                         "Caught exception in \"Rollback\" method: {1}",
                         e)); /* throw */
                 }
             }
             catch
@@ -5545,13 +5483,10 @@
   );
   #endregion
 
   ///////////////////////////////////////////////////////////////////////////////////////////////
 
-  /// <summary>
-  /// The event data associated with progress reporting events.
-  /// </summary>
   public class ProgressEventArgs : EventArgs
   {
       /// <summary>
       /// The user-defined native data associated with this event.  Currently,
       /// this will always contain the value of <see cref="IntPtr.Zero" />.

Index: System.Data.SQLite/SQLiteConvert.cs
==================================================================
--- System.Data.SQLite/SQLiteConvert.cs
+++ System.Data.SQLite/SQLiteConvert.cs
@@ -1150,11 +1150,11 @@
             case TypeCode.String:
                 return viaFramework ?
                     Convert.ToBoolean(obj, provider) :
                     ToBoolean(ToStringWithProvider(obj, provider));
             default:
-                throw new SQLiteException(UnsafeNativeMethods.StringFormat(
+                throw new SQLiteException(String.Format(
                     CultureInfo.CurrentCulture,
                     "Cannot convert type {0} to boolean",
                     typeCode));
         }
     }
@@ -1441,11 +1441,11 @@
         string typeName
         )
     {
         if ((flags & SQLiteConnectionFlags.TraceWarning) == SQLiteConnectionFlags.TraceWarning)
         {
-            Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+            Trace.WriteLine(String.Format(
                 CultureInfo.CurrentCulture,
                 "WARNING: Type mapping failed, returning default name \"{0}\" for type {1}.",
                 typeName, dbType));
         }
     }
@@ -1470,11 +1470,11 @@
         )
     {
         if (!String.IsNullOrEmpty(typeName) &&
             ((flags & SQLiteConnectionFlags.TraceWarning) == SQLiteConnectionFlags.TraceWarning))
         {
-            Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+            Trace.WriteLine(String.Format(
                 CultureInfo.CurrentCulture,
                 "WARNING: Type mapping failed, returning default type {0} for name \"{1}\".",
                 dbType, typeName));
         }
     }

Index: System.Data.SQLite/SQLiteDataAdapter.cs
==================================================================
--- System.Data.SQLite/SQLiteDataAdapter.cs
+++ System.Data.SQLite/SQLiteDataAdapter.cs
@@ -137,16 +137,10 @@
 #endif
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////////
 
-    /// <summary>
-    /// Cleans up resources (native and managed) associated with the current instance.
-    /// </summary>
-    /// <param name="disposing">
-    /// Zero when being disposed via garbage collection; otherwise, non-zero.
-    /// </param>
     protected override void Dispose(bool disposing)
     {
         try
         {
             if (!disposed)

Index: System.Data.SQLite/SQLiteDataReader.cs
==================================================================
--- System.Data.SQLite/SQLiteDataReader.cs
+++ System.Data.SQLite/SQLiteDataReader.cs
@@ -1078,11 +1078,11 @@
           }
 
           if (wantDefaultValue)
           {
             // Determine the default value for the column, which sucks because we have to query the schema for each column
-            using (SQLiteCommand cmdTable = new SQLiteCommand(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA [{0}].TABLE_INFO([{1}])",
+            using (SQLiteCommand cmdTable = new SQLiteCommand(String.Format(CultureInfo.InvariantCulture, "PRAGMA [{0}].TABLE_INFO([{1}])",
               row[SchemaTableOptionalColumn.BaseCatalogName],
               row[SchemaTableColumn.BaseTableName]
               ), _command.Connection))
             using (DbDataReader rdTable = cmdTable.ExecuteReader())
             {

Index: System.Data.SQLite/SQLiteEnlistment.cs
==================================================================
--- System.Data.SQLite/SQLiteEnlistment.cs
+++ System.Data.SQLite/SQLiteEnlistment.cs
@@ -94,11 +94,11 @@
         //       isolation level specified by the caller.
         //
         if (throwOnUnsupported)
         {
             throw new InvalidOperationException(
-                UnsafeNativeMethods.StringFormat(CultureInfo.CurrentCulture,
+                String.Format(CultureInfo.InvariantCulture,
                 "unsupported isolation level {0}", isolationLevel));
         }
 
         return defaultIsolationLevel;
     }

Index: System.Data.SQLite/SQLiteException.cs
==================================================================
--- System.Data.SQLite/SQLiteException.cs
+++ System.Data.SQLite/SQLiteException.cs
@@ -7,11 +7,10 @@
 
 namespace System.Data.SQLite
 {
   using System;
   using System.Data.Common;
-  using System.Globalization;
 
 #if !PLATFORM_COMPACTFRAMEWORK
   using System.Reflection;
   using System.Runtime.Serialization;
   using System.Security.Permissions;
@@ -181,13 +180,11 @@
     private static string GetStockErrorMessage(
         SQLiteErrorCode errorCode,
         string message
         )
     {
-        return UnsafeNativeMethods.StringFormat(
-            CultureInfo.CurrentCulture,
-            "{0}{1}{2}",
+        return String.Format("{0}{1}{2}",
             GetErrorString(errorCode),
 #if !NET_COMPACT_20
             Environment.NewLine, message).Trim();
 #else
             "\r\n", message).Trim();

Index: System.Data.SQLite/SQLiteFactory.cs
==================================================================
--- System.Data.SQLite/SQLiteFactory.cs
+++ System.Data.SQLite/SQLiteFactory.cs
@@ -28,13 +28,10 @@
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////////
 
     #region IDisposable Members
-    /// <summary>
-    /// Cleans up resources (native and managed) associated with the current instance.
-    /// </summary>
     public void Dispose()
     {
         Dispose(true);
         GC.SuppressFinalize(this);
     }
@@ -75,13 +72,10 @@
     #endregion
 
     ///////////////////////////////////////////////////////////////////////////////////////////////
 
     #region Destructor
-    /// <summary>
-    /// Cleans up resources associated with the current instance.
-    /// </summary>
     ~SQLiteFactory()
     {
         Dispose(false);
     }
     #endregion

Index: System.Data.SQLite/SQLiteFunction.cs
==================================================================
--- System.Data.SQLite/SQLiteFunction.cs
+++ System.Data.SQLite/SQLiteFunction.cs
@@ -65,11 +65,11 @@
     /// <summary>
     /// Holds a reference to the callback function for finalizing an aggregate function
     /// </summary>
     private SQLiteFinalCallback  _FinalFunc;
     /// <summary>
-    /// Holds a reference to the callback function for collating sequences
+    /// Holds a reference to the callback function for collation sequences
     /// </summary>
     private SQLiteCollation _CompareFunc;
 
     private SQLiteCollation _CompareFunc16;
 
@@ -199,13 +199,10 @@
     #endregion
 
     ///////////////////////////////////////////////////////////////////////////////////////////////
 
     #region Destructor
-    /// <summary>
-    /// Cleans up resources associated with the current instance.
-    /// </summary>
     ~SQLiteFunction()
     {
         Dispose(false);
     }
     #endregion
@@ -278,15 +275,15 @@
       CheckDisposed();
       return null;
     }
 
     /// <summary>
-    /// User-defined collating sequences override this method to provide a custom string sorting algorithm.
+    /// User-defined collation sequences override this method to provide a custom string sorting algorithm.
     /// </summary>
-    /// <param name="param1">The first string to compare.</param>
-    /// <param name="param2">The second strnig to compare.</param>
-    /// <returns>1 if param1 is greater than param2, 0 if they are equal, or -1 if param1 is less than param2.</returns>
+    /// <param name="param1">The first string to compare</param>
+    /// <param name="param2">The second strnig to compare</param>
+    /// <returns>1 if param1 is greater than param2, 0 if they are equal, or -1 if param1 is less than param2</returns>
     public virtual int Compare(string param1, string param2)
     {
       CheckDisposed();
       return 0;
     }
@@ -418,11 +415,11 @@
             {
                 if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
                         SQLiteConnectionFlags.LogCallbackException)
                 {
                     SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION,
-                        UnsafeNativeMethods.StringFormat(CultureInfo.CurrentCulture,
+                        String.Format(CultureInfo.CurrentCulture,
                         "Caught exception in \"Invoke\" method: {0}",
                         e)); /* throw */
                 }
             }
             catch
@@ -431,11 +428,11 @@
             }
         }
     }
 
     /// <summary>
-    /// Internal collating sequence function, which wraps up the raw string pointers and executes the Compare() virtual function.
+    /// Internal collation sequence function, which wraps up the raw string pointers and executes the Compare() virtual function.
     /// WARNING: Must not throw exceptions.
     /// </summary>
     /// <param name="ptr">Not used</param>
     /// <param name="len1">Length of the string pv1</param>
     /// <param name="ptr1">Pointer to the first string to compare</param>
@@ -456,11 +453,11 @@
             {
                 if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
                         SQLiteConnectionFlags.LogCallbackException)
                 {
                     SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION,
-                        UnsafeNativeMethods.StringFormat(CultureInfo.CurrentCulture,
+                        String.Format(CultureInfo.CurrentCulture,
                         "Caught exception in \"Compare\" (UTF8) method: {0}",
                         e)); /* throw */
                 }
             }
             catch
@@ -478,11 +475,11 @@
 
         return 0;
     }
 
     /// <summary>
-    /// Internal collating sequence function, which wraps up the raw string pointers and executes the Compare() virtual function.
+    /// Internal collation sequence function, which wraps up the raw string pointers and executes the Compare() virtual function.
     /// WARNING: Must not throw exceptions.
     /// </summary>
     /// <param name="ptr">Not used</param>
     /// <param name="len1">Length of the string pv1</param>
     /// <param name="ptr1">Pointer to the first string to compare</param>
@@ -503,11 +500,11 @@
             {
                 if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
                         SQLiteConnectionFlags.LogCallbackException)
                 {
                     SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION,
-                        UnsafeNativeMethods.StringFormat(CultureInfo.CurrentCulture,
+                        String.Format(CultureInfo.CurrentCulture,
                         "Caught exception in \"Compare\" (UTF16) method: {0}",
                         e)); /* throw */
                 }
             }
             catch
@@ -576,11 +573,11 @@
             {
                 if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
                         SQLiteConnectionFlags.LogCallbackException)
                 {
                     SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION,
-                        UnsafeNativeMethods.StringFormat(CultureInfo.CurrentCulture,
+                        String.Format(CultureInfo.CurrentCulture,
                         "Caught exception in \"Step\" method: {1}",
                         e)); /* throw */
                 }
             }
             catch
@@ -631,11 +628,11 @@
             {
                 if ((_flags & SQLiteConnectionFlags.LogCallbackException) ==
                         SQLiteConnectionFlags.LogCallbackException)
                 {
                     SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION,
-                        UnsafeNativeMethods.StringFormat(CultureInfo.CurrentCulture,
+                        String.Format(CultureInfo.CurrentCulture,
                         "Caught exception in \"Final\" method: {1}",
                         e)); /* throw */
                 }
             }
             catch
@@ -729,121 +726,23 @@
     /// properly, but this is a workaround for the Compact Framework where enumerating assemblies is not currently supported.
     /// </summary>
     /// <param name="typ">The type of the function to register</param>
     public static void RegisterFunction(Type typ)
     {
-        object[] arAtt = typ.GetCustomAttributes(
-            typeof(SQLiteFunctionAttribute), false);
-
-        for (int y = 0; y < arAtt.Length; y++)
-        {
-            SQLiteFunctionAttribute at = arAtt[y] as SQLiteFunctionAttribute;
-
-            if (at == null)
-                continue;
-
-            RegisterFunction(
-                at.Name, at.Arguments, at.FuncType, typ,
-                at.Callback1, at.Callback2);
-        }
-    }
-
-    /// <summary>
-    /// Alternative method of registering a function.  This method
-    /// does not require the specified type to be annotated with
-    /// <see cref="SQLiteFunctionAttribute" />.
-    /// </summary>
-    /// <param name="name">
-    /// The name of the function to register.
-    /// </param>
-    /// <param name="argumentCount">
-    /// The number of arguments accepted by the function.
-    /// </param>
-    /// <param name="functionType">
-    /// The type of SQLite function being resitered (e.g. scalar,
-    /// aggregate, or collating sequence).
-    /// </param>
-    /// <param name="instanceType">
-    /// The <see cref="Type" /> that actually implements the function.
-    /// This will only be used if the <paramref name="callback1" />
-    /// and <paramref name="callback2" /> parameters are null.
-    /// </param>
-    /// <param name="callback1">
-    /// The <see cref="Delegate" /> to be used for all calls into the
-    /// <see cref="SQLiteFunction.Invoke" />,
-    /// <see cref="SQLiteFunction.Step" />,
-    /// and <see cref="SQLiteFunction.Compare" /> virtual methods.
-    /// </param>
-    /// <param name="callback2">
-    /// The <see cref="Delegate" /> to be used for all calls into the
-    /// <see cref="SQLiteFunction.Final" /> virtual method.  This
-    /// parameter is only necessary for aggregate functions.
-    /// </param>
-    public static void RegisterFunction(
-        string name,
-        int argumentCount,
-        FunctionType functionType,
-        Type instanceType,
-        Delegate callback1,
-        Delegate callback2
-        )
-    {
-        SQLiteFunctionAttribute at = new SQLiteFunctionAttribute(
-            name, argumentCount, functionType);
-
-        at.InstanceType = instanceType;
-        at.Callback1 = callback1;
-        at.Callback2 = callback2;
-
-        _registeredFunctions.Add(at, null);
-    }
-
-    /// <summary>
-    /// Creates a <see cref="SQLiteFunction" /> instance based on the specified
-    /// <see cref="SQLiteFunctionAttribute" />.
-    /// </summary>
-    /// <param name="functionAttribute">
-    /// The <see cref="SQLiteFunctionAttribute" /> containing the metadata about
-    /// the function to create.
-    /// </param>
-    /// <param name="function">
-    /// The created function -OR- null if the function could not be created.
-    /// </param>
-    /// <returns>
-    /// Non-zero if the function was created; otherwise, zero.
-    /// </returns>
-    private static bool CreateFunction(
-        SQLiteFunctionAttribute functionAttribute,
-        out SQLiteFunction function
-        )
-    {
-        if (functionAttribute == null)
-        {
-            function = null;
-            return false;
-        }
-        else if ((functionAttribute.Callback1 != null) ||
-                (functionAttribute.Callback2 != null))
-        {
-            function = new SQLiteDelegateFunction(
-                functionAttribute.Callback1,
-                functionAttribute.Callback2);
-
-            return true;
-        }
-        else if (functionAttribute.InstanceType != null)
-        {
-            function = (SQLiteFunction)Activator.CreateInstance(
-                functionAttribute.InstanceType);
-
-            return true;
-        }
-        else
-        {
-            function = null;
-            return false;
-        }
+      object[] arAtt = typ.GetCustomAttributes(typeof(SQLiteFunctionAttribute), false);
+      int u = arAtt.Length;
+      SQLiteFunctionAttribute at;
+
+      for (int y = 0; y < u; y++)
+      {
+        at = arAtt[y] as SQLiteFunctionAttribute;
+        if (at != null)
+        {
+          at.InstanceType = typ;
+          _registeredFunctions.Add(at, null);
+        }
+      }
     }
 
     /// <summary>
     /// Called by the SQLiteBase derived classes, this method binds all registered (known) user-defined functions to a connection.
     /// It is done this way so that all user-defined functions will access the database using the same encoding scheme
@@ -870,21 +769,15 @@
             SQLiteFunctionAttribute pr = pair.Key;
 
             if (pr == null)
                 continue;
 
-            SQLiteFunction f;
-
-            if (CreateFunction(pr, out f))
-            {
-                BindFunction(sqlbase, pr, f, flags);
-                lFunctions[pr] = f;
-            }
-            else
-            {
-                lFunctions[pr] = null;
-            }
+            SQLiteFunction f = (SQLiteFunction)Activator.CreateInstance(
+                pr.InstanceType);
+
+            BindFunction(sqlbase, pr, f, flags);
+            lFunctions[pr] = f;
         }
 
         return lFunctions;
     }
 
@@ -966,11 +859,11 @@
 
         return result;
     }
 
     /// <summary>
-    /// This function binds a user-defined function to a connection.
+    /// This function binds a user-defined functions to a connection.
     /// </summary>
     /// <param name="sqliteBase">
     /// The <see cref="SQLiteBase" /> object instance associated with the
     /// <see cref="SQLiteConnection" /> that the function should be bound to.
     /// </param>
@@ -1092,608 +985,12 @@
                 name, null, null, false) == SQLiteErrorCode.Ok;
         }
     }
   }
 
-  /////////////////////////////////////////////////////////////////////////////
-
-  /// <summary>
-  /// This <see cref="Delegate" /> type is used with the
-  /// <see cref="SQLiteDelegateFunction.Invoke" /> method.
-  /// </summary>
-  /// <param name="param0">
-  /// This is always the string literal "Invoke".
-  /// </param>
-  /// <param name="args">
-  /// The arguments for the scalar function.
-  /// </param>
-  /// <returns>
-  /// The result of the scalar function.
-  /// </returns>
-  public delegate object SQLiteInvokeDelegate(
-    string param0,
-    object[] args
-  );
-
-  /////////////////////////////////////////////////////////////////////////////
-
-  /// <summary>
-  /// This <see cref="Delegate" /> type is used with the
-  /// <see cref="SQLiteDelegateFunction.Step" /> method.
-  /// </summary>
-  /// <param name="param0">
-  /// This is always the string literal "Step".
-  /// </param>
-  /// <param name="args">
-  /// The arguments for the aggregate function.
-  /// </param>
-  /// <param name="stepNumber">
-  /// The step number (one based).  This is incrememted each time the
-  /// <see cref="SQLiteDelegateFunction.Step" /> method is called.
-  /// </param>
-  /// <param name="contextData">
-  /// A placeholder for implementers to store contextual data pertaining
-  /// to the current context.
-  /// </param>
-  public delegate void SQLiteStepDelegate(
-    string param0,
-    object[] args,
-    int stepNumber,
-    ref object contextData
-  );
-
-  /////////////////////////////////////////////////////////////////////////////
-
-  /// <summary>
-  /// This <see cref="Delegate" /> type is used with the
-  /// <see cref="SQLiteDelegateFunction.Final" /> method.
-  /// </summary>
-  /// <param name="param0">
-  /// This is always the string literal "Final".
-  /// </param>
-  /// <param name="contextData">
-  /// A placeholder for implementers to store contextual data pertaining
-  /// to the current context.
-  /// </param>
-  /// <returns>
-  /// The result of the aggregate function.
-  /// </returns>
-  public delegate object SQLiteFinalDelegate(
-    string param0,
-    object contextData
-  );
-
-  /////////////////////////////////////////////////////////////////////////////
-
-  /// <summary>
-  /// This <see cref="Delegate" /> type is used with the
-  /// <see cref="SQLiteDelegateFunction.Compare" /> method.
-  /// </summary>
-  /// <param name="param0">
-  /// This is always the string literal "Compare".
-  /// </param>
-  /// <param name="param1">
-  /// The first string to compare.
-  /// </param>
-  /// <param name="param2">
-  /// The second strnig to compare.
-  /// </param>
-  /// <returns>
-  /// A positive integer if the <paramref name="param1" /> parameter is
-  /// greater than the <paramref name="param2" /> parameter, a negative
-  /// integer if the <paramref name="param1" /> parameter is less than
-  /// the <paramref name="param2" /> parameter, or zero if they are
-  /// equal.
-  /// </returns>
-  public delegate int SQLiteCompareDelegate(
-    string param0,
-    string param1,
-    string param2
-  );
-
-  /////////////////////////////////////////////////////////////////////////////
-
-#if !PLATFORM_COMPACTFRAMEWORK
-  /// <summary>
-  /// This class implements a SQLite function using a <see cref="Delegate" />.
-  /// All the virtual methods of the <see cref="SQLiteFunction" /> class are
-  /// implemented using calls to the <see cref="SQLiteInvokeDelegate" />,
-  /// <see cref="SQLiteStepDelegate" />, <see cref="SQLiteFinalDelegate" />,
-  /// and <see cref="SQLiteCompareDelegate" /> strongly typed delegate types
-  /// or via the <see cref="Delegate.DynamicInvoke" /> method.
-  /// The arguments are presented in the same order they appear in
-  /// the associated <see cref="SQLiteFunction" /> methods with one exception:
-  /// the first argument is the name of the virtual method being implemented.
-  /// </summary>
-#else
-  /// <summary>
-  /// This class implements a SQLite function using a <see cref="Delegate" />.
-  /// All the virtual methods of the <see cref="SQLiteFunction" /> class are
-  /// implemented using calls to the <see cref="SQLiteInvokeDelegate" />,
-  /// <see cref="SQLiteStepDelegate" />, <see cref="SQLiteFinalDelegate" />,
-  /// and <see cref="SQLiteCompareDelegate" /> strongly typed delegate types.
-  /// The arguments are presented in the same order they appear in
-  /// the associated <see cref="SQLiteFunction" /> methods with one exception:
-  /// the first argument is the name of the virtual method being implemented.
-  /// </summary>
-#endif
-  public class SQLiteDelegateFunction : SQLiteFunction
-  {
-      #region Private Constants
-      /// <summary>
-      /// This error message is used by the overridden virtual methods when
-      /// a required <see cref="Delegate" /> property (e.g.
-      /// <see cref="Callback1" /> or <see cref="Callback2" />) has not been
-      /// set.
-      /// </summary>
-      private const string NoCallbackError = "No \"{0}\" callback is set.";
-
-      /////////////////////////////////////////////////////////////////////////
-
-      /// <summary>
-      /// This error message is used by the overridden <see cref="Compare" />
-      /// method when the result does not have a type of <see cref="Int32" />.
-      /// </summary>
-      private const string ResultInt32Error = "\"{0}\" result must be Int32.";
-      #endregion
-
-      /////////////////////////////////////////////////////////////////////////
-
-      #region Public Constructors
-      /// <summary>
-      /// Constructs an empty instance of this class.
-      /// </summary>
-      public SQLiteDelegateFunction()
-          : this(null, null)
-      {
-          // do nothing.
-      }
-
-      /////////////////////////////////////////////////////////////////////////
-
-      /// <summary>
-      /// Constructs an instance of this class using the specified
-      /// <see cref="Delegate" /> as the <see cref="SQLiteFunction" />
-      /// implementation.
-      /// </summary>
-      /// <param name="callback1">
-      /// The <see cref="Delegate" /> to be used for all calls into the
-      /// <see cref="Invoke" />, <see cref="Step" />, and
-      /// <see cref="Compare" /> virtual methods needed by the
-      /// <see cref="SQLiteFunction" /> base class.
-      /// </param>
-      /// <param name="callback2">
-      /// The <see cref="Delegate" /> to be used for all calls into the
-      /// <see cref="Final" /> virtual methods needed by the
-      /// <see cref="SQLiteFunction" /> base class.
-      /// </param>
-      public SQLiteDelegateFunction(
-          Delegate callback1,
-          Delegate callback2
-          )
-      {
-          this.callback1 = callback1;
-          this.callback2 = callback2;
-      }
-      #endregion
-
-      /////////////////////////////////////////////////////////////////////////
-
-      #region Protected Methods
-      /// <summary>
-      /// Returns the list of arguments for the <see cref="Invoke" /> method,
-      /// as an <see cref="Array" /> of <see cref="Object" />.  The first
-      /// argument is always the literal string "Invoke".
-      /// </summary>
-      /// <param name="args">
-      /// The original arguments received by the <see cref="Invoke" /> method.
-      /// </param>
-      /// <param name="earlyBound">
-      /// Non-zero if the returned arguments are going to be used with the
-      /// <see cref="SQLiteInvokeDelegate" /> type; otherwise, zero.
-      /// </param>
-      /// <returns>
-      /// The arguments to pass to the configured <see cref="Delegate" />.
-      /// </returns>
-      protected virtual object[] GetInvokeArgs(
-          object[] args,
-          bool earlyBound
-          )
-      {
-          object[] newArgs = new object[] { "Invoke", args };
-
-          if (!earlyBound)
-              newArgs = new object[] { newArgs }; // WRAP
-
-          return newArgs;
-      }
-
-      /////////////////////////////////////////////////////////////////////////
-
-      /// <summary>
-      /// Returns the list of arguments for the <see cref="Step" /> method,
-      /// as an <see cref="Array" /> of <see cref="Object" />.  The first
-      /// argument is always the literal string "Step".
-      /// </summary>
-      /// <param name="args">
-      /// The original arguments received by the <see cref="Step" /> method.
-      /// </param>
-      /// <param name="stepNumber">
-      /// The step number (one based).  This is incrememted each time the
-      /// <see cref="Step" /> method is called.
-      /// </param>
-      /// <param name="contextData">
-      /// A placeholder for implementers to store contextual data pertaining
-      /// to the current context.
-      /// </param>
-      /// <param name="earlyBound">
-      /// Non-zero if the returned arguments are going to be used with the
-      /// <see cref="SQLiteStepDelegate" /> type; otherwise, zero.
-      /// </param>
-      /// <returns>
-      /// The arguments to pass to the configured <see cref="Delegate" />.
-      /// </returns>
-      protected virtual object[] GetStepArgs(
-          object[] args,
-          int stepNumber,
-          object contextData,
-          bool earlyBound
-          )
-      {
-          object[] newArgs = new object[] {
-              "Step", args, stepNumber, contextData
-          };
-
-          if (!earlyBound)
-              newArgs = new object[] { newArgs }; // WRAP
-
-          return newArgs;
-      }
-
-      /////////////////////////////////////////////////////////////////////////
-
-      /// <summary>
-      /// Updates the output arguments for the <see cref="Step" /> method,
-      /// using an <see cref="Array" /> of <see cref="Object" />.  The first
-      /// argument is always the literal string "Step".  Currently, only the
-      /// <paramref name="contextData" /> parameter is updated.
-      /// </summary>
-      /// <param name="args">
-      /// The original arguments received by the <see cref="Step" /> method.
-      /// </param>
-      /// <param name="contextData">
-      /// A placeholder for implementers to store contextual data pertaining
-      /// to the current context.
-      /// </param>
-      /// <param name="earlyBound">
-      /// Non-zero if the returned arguments are going to be used with the
-      /// <see cref="SQLiteStepDelegate" /> type; otherwise, zero.
-      /// </param>
-      /// <returns>
-      /// The arguments to pass to the configured <see cref="Delegate" />.
-      /// </returns>
-      protected virtual void UpdateStepArgs(
-          object[] args,
-          ref object contextData,
-          bool earlyBound
-          )
-      {
-          object[] newArgs;
-
-          if (earlyBound)
-              newArgs = args;
-          else
-              newArgs = args[0] as object[];
-
-          if (newArgs == null)
-              return;
-
-          contextData = newArgs[newArgs.Length - 1];
-      }
-
-      /////////////////////////////////////////////////////////////////////////
-
-      /// <summary>
-      /// Returns the list of arguments for the <see cref="Final" /> method,
-      /// as an <see cref="Array" /> of <see cref="Object" />.  The first
-      /// argument is always the literal string "Final".
-      /// </summary>
-      /// <param name="contextData">
-      /// A placeholder for implementers to store contextual data pertaining
-      /// to the current context.
-      /// </param>
-      /// <param name="earlyBound">
-      /// Non-zero if the returned arguments are going to be used with the
-      /// <see cref="SQLiteFinalDelegate" /> type; otherwise, zero.
-      /// </param>
-      /// <returns>
-      /// The arguments to pass to the configured <see cref="Delegate" />.
-      /// </returns>
-      protected virtual object[] GetFinalArgs(
-          object contextData,
-          bool earlyBound
-          )
-      {
-          object[] newArgs = new object[] { "Final", contextData };
-
-          if (!earlyBound)
-              newArgs = new object[] { newArgs }; // WRAP
-
-          return newArgs;
-      }
-
-      /////////////////////////////////////////////////////////////////////////
-
-      /// <summary>
-      /// Returns the list of arguments for the <see cref="Compare" /> method,
-      /// as an <see cref="Array" /> of <see cref="Object" />.  The first
-      /// argument is always the literal string "Compare".
-      /// </summary>
-      /// <param name="param1">
-      /// The first string to compare.
-      /// </param>
-      /// <param name="param2">
-      /// The second strnig to compare.
-      /// </param>
-      /// <param name="earlyBound">
-      /// Non-zero if the returned arguments are going to be used with the
-      /// <see cref="SQLiteCompareDelegate" /> type; otherwise, zero.
-      /// </param>
-      /// <returns>
-      /// The arguments to pass to the configured <see cref="Delegate" />.
-      /// </returns>
-      protected virtual object[] GetCompareArgs(
-          string param1,
-          string param2,
-          bool earlyBound
-          )
-      {
-          object[] newArgs = new object[] { "Compare", param1, param2 };
-
-          if (!earlyBound)
-              newArgs = new object[] { newArgs }; // WRAP
-
-          return newArgs;
-      }
-      #endregion
-
-      /////////////////////////////////////////////////////////////////////////
-
-      #region Public Properties
-      private Delegate callback1;
-      /// <summary>
-      /// The <see cref="Delegate" /> to be used for all calls into the
-      /// <see cref="Invoke" />, <see cref="Step" />, and
-      /// <see cref="Compare" /> virtual methods needed by the
-      /// <see cref="SQLiteFunction" /> base class.
-      /// </summary>
-      public virtual Delegate Callback1
-      {
-          get { return callback1; }
-          set { callback1 = value; }
-      }
-
-      /////////////////////////////////////////////////////////////////////////
-
-      private Delegate callback2;
-      /// <summary>
-      /// The <see cref="Delegate" /> to be used for all calls into the
-      /// <see cref="Final" /> virtual methods needed by the
-      /// <see cref="SQLiteFunction" /> base class.
-      /// </summary>
-      public virtual Delegate Callback2
-      {
-          get { return callback2; }
-          set { callback2 = value; }
-      }
-      #endregion
-
-      /////////////////////////////////////////////////////////////////////////
-
-      #region System.Data.SQLite.SQLiteFunction Overrides
-      /// <summary>
-      /// This virtual method is the implementation for scalar functions.
-      /// See the <see cref="SQLiteFunction.Invoke" /> method for more
-      /// details.
-      /// </summary>
-      /// <param name="args">
-      /// The arguments for the scalar function.
-      /// </param>
-      /// <returns>
-      /// The result of the scalar function.
-      /// </returns>
-      public override object Invoke(
-          object[] args /* in */
-          )
-      {
-          if (callback1 == null)
-          {
-              throw new InvalidOperationException(
-                  UnsafeNativeMethods.StringFormat(
-                  CultureInfo.CurrentCulture,
-                  NoCallbackError, "Invoke"));
-          }
-
-          SQLiteInvokeDelegate invokeDelegate =
-              callback1 as SQLiteInvokeDelegate;
-
-          if (invokeDelegate != null)
-          {
-              return invokeDelegate.Invoke("Invoke", args); /* throw */
-          }
-          else
-          {
-#if !PLATFORM_COMPACTFRAMEWORK
-              return callback1.DynamicInvoke(
-                  GetInvokeArgs(args, false)); /* throw */
-#else
-              throw new NotImplementedException();
-#endif
-          }
-      }
-
-      /////////////////////////////////////////////////////////////////////////
-
-      /// <summary>
-      /// This virtual method is part of the implementation for aggregate
-      /// functions.  See the <see cref="SQLiteFunction.Step" /> method
-      /// for more details.
-      /// </summary>
-      /// <param name="args">
-      /// The arguments for the aggregate function.
-      /// </param>
-      /// <param name="stepNumber">
-      /// The step number (one based).  This is incrememted each time the
-      /// <see cref="Step" /> method is called.
-      /// </param>
-      /// <param name="contextData">
-      /// A placeholder for implementers to store contextual data pertaining
-      /// to the current context.
-      /// </param>
-      public override void Step(
-          object[] args,         /* in */
-          int stepNumber,        /* in */
-          ref object contextData /* in, out */
-          )
-      {
-          if (callback1 == null)
-          {
-              throw new InvalidOperationException(
-                  UnsafeNativeMethods.StringFormat(
-                  CultureInfo.CurrentCulture,
-                  NoCallbackError, "Step"));
-          }
-
-          SQLiteStepDelegate stepDelegate = callback1 as SQLiteStepDelegate;
-
-          if (stepDelegate != null)
-          {
-              stepDelegate.Invoke(
-                  "Step", args, stepNumber, ref contextData); /* throw */
-          }
-          else
-          {
-#if !PLATFORM_COMPACTFRAMEWORK
-              object[] newArgs = GetStepArgs(
-                  args, stepNumber, contextData, false);
-
-              /* IGNORED */
-              callback1.DynamicInvoke(newArgs); /* throw */
-
-              UpdateStepArgs(newArgs, ref contextData, false);
-#else
-              throw new NotImplementedException();
-#endif
-          }
-      }
-
-      /////////////////////////////////////////////////////////////////////////
-
-      /// <summary>
-      /// This virtual method is part of the implementation for aggregate
-      /// functions.  See the <see cref="SQLiteFunction.Final" /> method
-      /// for more details.
-      /// </summary>
-      /// <param name="contextData">
-      /// A placeholder for implementers to store contextual data pertaining
-      /// to the current context.
-      /// </param>
-      /// <returns>
-      /// The result of the aggregate function.
-      /// </returns>
-      public override object Final(
-          object contextData /* in */
-          )
-      {
-          if (callback2 == null)
-          {
-              throw new InvalidOperationException(
-                  UnsafeNativeMethods.StringFormat(
-                  CultureInfo.CurrentCulture,
-                  NoCallbackError, "Final"));
-          }
-
-          SQLiteFinalDelegate finalDelegate = callback2 as SQLiteFinalDelegate;
-
-          if (finalDelegate != null)
-          {
-              return finalDelegate.Invoke("Final", contextData); /* throw */
-          }
-          else
-          {
-#if !PLATFORM_COMPACTFRAMEWORK
-              return callback1.DynamicInvoke(GetFinalArgs(
-                  contextData, false)); /* throw */
-#else
-              throw new NotImplementedException();
-#endif
-          }
-      }
-
-      /////////////////////////////////////////////////////////////////////////
-
-      /// <summary>
-      /// This virtual method is part of the implementation for collating
-      /// sequences.  See the <see cref="SQLiteFunction.Compare" /> method
-      /// for more details.
-      /// </summary>
-      /// <param name="param1">
-      /// The first string to compare.
-      /// </param>
-      /// <param name="param2">
-      /// The second strnig to compare.
-      /// </param>
-      /// <returns>
-      /// A positive integer if the <paramref name="param1" /> parameter is
-      /// greater than the <paramref name="param2" /> parameter, a negative
-      /// integer if the <paramref name="param1" /> parameter is less than
-      /// the <paramref name="param2" /> parameter, or zero if they are
-      /// equal.
-      /// </returns>
-      public override int Compare(
-          string param1, /* in */
-          string param2  /* in */
-          )
-      {
-          if (callback1 == null)
-          {
-              throw new InvalidOperationException(
-                  UnsafeNativeMethods.StringFormat(
-                  CultureInfo.CurrentCulture,
-                  NoCallbackError, "Compare"));
-          }
-
-          SQLiteCompareDelegate compareDelegate =
-              callback1 as SQLiteCompareDelegate;
-
-          if (compareDelegate != null)
-          {
-              return compareDelegate.Invoke(
-                  "Compare", param1, param2); /* throw */
-          }
-          else
-          {
-#if !PLATFORM_COMPACTFRAMEWORK
-              object result = callback1.DynamicInvoke(GetCompareArgs(
-                  param1, param2, false)); /* throw */
-
-              if (result is int)
-                  return (int)result;
-
-              throw new InvalidOperationException(
-                  UnsafeNativeMethods.StringFormat(
-                  CultureInfo.CurrentCulture,
-                  ResultInt32Error, "Compare"));
-#else
-              throw new NotImplementedException();
-#endif
-          }
-      }
-      #endregion
-  }
-
-  /////////////////////////////////////////////////////////////////////////////
+
+
 
   /// <summary>
   /// Extends SQLiteFunction and allows an inherited class to obtain the collating sequence associated with a function call.
   /// </summary>
   /// <remarks>
@@ -1722,16 +1019,10 @@
 #endif
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////////
 
-    /// <summary>
-    /// Cleans up resources (native and managed) associated with the current instance.
-    /// </summary>
-    /// <param name="disposing">
-    /// Zero when being disposed via garbage collection; otherwise, non-zero.
-    /// </param>
     protected override void Dispose(bool disposing)
     {
         try
         {
             if (!disposed)
@@ -1774,11 +1065,11 @@
     /// Aggregate functions are designed to accumulate data until the end of a call and then return a result gleaned from the accumulated data.
     /// Examples include SUM(), COUNT(), AVG(), etc.
     /// </summary>
     Aggregate = 1,
     /// <summary>
-    /// Collating sequences are used to sort textual data in a custom manner, and appear in an ORDER BY clause.  Typically text in an ORDER BY is
+    /// Collation sequences are used to sort textual data in a custom manner, and appear in an ORDER BY clause.  Typically text in an ORDER BY is
     /// sorted using a straight case-insensitive comparison function.  Custom collating sequences can be used to alter the behavior of text sorting
     /// in a user-defined manner.
     /// </summary>
     Collation = 2,
   }
@@ -1800,11 +1091,11 @@
 #if !PLATFORM_COMPACTFRAMEWORK
   [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
 #endif
   internal delegate void SQLiteFinalCallback(IntPtr context);
   /// <summary>
-  /// Internal callback delegate for implementing collating sequences
+  /// Internal callback delegate for implementing collation sequences
   /// </summary>
   /// <param name="puser">Not used</param>
   /// <param name="len1">Length of the string pv1</param>
   /// <param name="pv1">Pointer to the first string to compare</param>
   /// <param name="len2">Length of the string pv2</param>

Index: System.Data.SQLite/SQLiteFunctionAttribute.cs
==================================================================
--- System.Data.SQLite/SQLiteFunctionAttribute.cs
+++ System.Data.SQLite/SQLiteFunctionAttribute.cs
@@ -1,66 +1,60 @@
 /********************************************************
  * ADO.NET 2.0 Data Provider for SQLite Version 3.X
  * Written by Robert Simpson (robert@blackcastlesoft.com)
- *
+ * 
  * Released to the public domain, use at your own risk!
  ********************************************************/
 
 namespace System.Data.SQLite
 {
-  using System;
-
+  using System;
+
   /// <summary>
   /// A simple custom attribute to enable us to easily find user-defined functions in
   /// the loaded assemblies and initialize them in SQLite as connections are made.
   /// </summary>
   [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
   public sealed class SQLiteFunctionAttribute : Attribute
   {
-    private string       _name;
+    private string       _name;
     private int          _argumentCount;
     private FunctionType _functionType;
     private Type         _instanceType;
-    private Delegate     _callback1;
-    private Delegate     _callback2;
 
     /// <summary>
     /// Default constructor, initializes the internal variables for the function.
-    /// </summary>
-    public SQLiteFunctionAttribute()
-        : this(null, -1, FunctionType.Scalar)
-    {
-        // do nothing.
-    }
-
-    /// <summary>
-    /// Constructs an instance of this class.  This sets the initial
-    /// <see cref="InstanceType" />, <see cref="Callback1" />, and
-    /// <see cref="Callback2" /> properties to null.
-    /// </summary>
-    /// <param name="name">
-    /// The name of the function, as seen by the SQLite core library.
-    /// </param>
-    /// <param name="argumentCount">
-    /// The number of arguments that the function will accept.
-    /// </param>
-    /// <param name="functionType">
-    /// The type of function being declared.  This will either be Scalar,
-    /// Aggregate, or Collation.
-    /// </param>
-    public SQLiteFunctionAttribute(
-        string name,
-        int argumentCount,
-        FunctionType functionType
-        )
-    {
-        _name = name;
-        _argumentCount = argumentCount;
-        _functionType = functionType;
-        _instanceType = null;
-        _callback1 = null;
-        _callback2 = null;
+    /// </summary>
+    public SQLiteFunctionAttribute()
+        : this(String.Empty, -1, FunctionType.Scalar)
+    {
+        // do nothing.
+    }
+
+    /// <summary>
+    /// Constructs an instance of this class.
+    /// </summary>
+    /// <param name="name">
+    /// The name of the function, as seen by the SQLite core library.
+    /// </param>
+    /// <param name="argumentCount">
+    /// The number of arguments that the function will accept.
+    /// </param>
+    /// <param name="functionType">
+    /// The type of function being declared.  This will either be Scalar,
+    /// Aggregate, or Collation.
+    /// </param>
+    public SQLiteFunctionAttribute(
+        string name,
+        int argumentCount,
+        FunctionType functionType
+        )
+    {
+        _name = name;
+        _argumentCount = argumentCount;
+        _functionType = functionType;
+        _instanceType = null;
     }
 
     /// <summary>
     /// The function's name as it will be used in SQLite command text.
     /// </summary>
@@ -72,12 +66,12 @@
 
     /// <summary>
     /// The number of arguments this function expects.  -1 if the number of arguments is variable.
     /// </summary>
     public int Arguments
-    {
-      get { return _argumentCount; }
+    {
+      get { return _argumentCount; }
       set { _argumentCount = value; }
     }
 
     /// <summary>
     /// The type of function this implementation will be.
@@ -86,40 +80,16 @@
     {
       get { return _functionType; }
       set { _functionType = value; }
     }
 
-    /// <summary>
-    /// The <see cref="System.Type" /> object instance that describes the class
-    /// containing the implementation for the associated function.  The value of
-    /// this property will not be used if either the <see cref="Callback1" /> or
-    /// <see cref="Callback2" /> property values are set to non-null.
+    /// <summary>
+    /// The <see cref="System.Type" /> object instance that describes the class
+    /// containing the implementation for the associated function.
     /// </summary>
     internal Type InstanceType
-    {
-        get { return _instanceType; }
+    {
+        get { return _instanceType; }
         set { _instanceType = value; }
     }
-
-    /// <summary>
-    /// The <see cref="Delegate" /> that refers to the implementation for the
-    /// associated function.  If this property value is set to non-null, it will
-    /// be used instead of the <see cref="InstanceType" /> property value.
-    /// </summary>
-    internal Delegate Callback1
-    {
-        get { return _callback1; }
-        set { _callback1 = value; }
-    }
-
-    /// <summary>
-    /// The <see cref="Delegate" /> that refers to the implementation for the
-    /// associated function.  If this property value is set to non-null, it will
-    /// be used instead of the <see cref="InstanceType" /> property value.
-    /// </summary>
-    internal Delegate Callback2
-    {
-        get { return _callback2; }
-        set { _callback2 = value; }
-    }
   }
 }

Index: System.Data.SQLite/SQLiteKeyReader.cs
==================================================================
--- System.Data.SQLite/SQLiteKeyReader.cs
+++ System.Data.SQLite/SQLiteKeyReader.cs
@@ -40,108 +40,108 @@
       internal int column;
     }
 
     /// <summary>
     /// A single sub-query for a given table/database.
-    /// </summary>
-    private sealed class KeyQuery : IDisposable
-    {
-        private SQLiteCommand _command;
-        internal SQLiteDataReader _reader;
-
-        internal KeyQuery(SQLiteConnection cnn, string database, string table, params string[] columns)
-        {
-            using (SQLiteCommandBuilder builder = new SQLiteCommandBuilder())
-            {
-                _command = cnn.CreateCommand();
-                for (int n = 0; n < columns.Length; n++)
-                {
-                    columns[n] = builder.QuoteIdentifier(columns[n]);
-                }
-            }
-            _command.CommandText = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT {0} FROM [{1}].[{2}] WHERE ROWID = ?", String.Join(",", columns), database, table);
-            _command.Parameters.AddWithValue(null, (long)0);
-        }
-
-        internal bool IsValid
-        {
-            set
-            {
-                if (value != false) throw new ArgumentException();
-                if (_reader != null)
-                {
-                    _reader.Dispose();
-                    _reader = null;
-                }
-            }
-        }
-
-        internal void Sync(long rowid)
-        {
-            IsValid = false;
-            _command.Parameters[0].Value = rowid;
-            _reader = _command.ExecuteReader();
-            _reader.Read();
-        }
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-
-        #region IDisposable Members
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-        #endregion
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-
-        #region IDisposable "Pattern" Members
-        private bool disposed;
-        private void CheckDisposed() /* throw */
-        {
-#if THROW_ON_DISPOSED
-            if (disposed)
-                throw new ObjectDisposedException(typeof(KeyQuery).Name);
-#endif
-        }
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-
-        private void Dispose(bool disposing)
-        {
-            if (!disposed)
-            {
-                if (disposing)
-                {
-                    ////////////////////////////////////
-                    // dispose managed resources here...
-                    ////////////////////////////////////
-
-                    IsValid = false;
-
-                    if (_command != null) _command.Dispose();
-                    _command = null;
-                }
-
-                //////////////////////////////////////
-                // release unmanaged resources here...
-                //////////////////////////////////////
-
-                disposed = true;
-            }
-        }
-        #endregion
-
-        ///////////////////////////////////////////////////////////////////////////////////////////////
-
-        #region Destructor
-        ~KeyQuery()
-        {
-            Dispose(false);
-        }
-        #endregion
+    /// </summary>
+    private sealed class KeyQuery : IDisposable
+    {
+        private SQLiteCommand _command;
+        internal SQLiteDataReader _reader;
+
+        internal KeyQuery(SQLiteConnection cnn, string database, string table, params string[] columns)
+        {
+            using (SQLiteCommandBuilder builder = new SQLiteCommandBuilder())
+            {
+                _command = cnn.CreateCommand();
+                for (int n = 0; n < columns.Length; n++)
+                {
+                    columns[n] = builder.QuoteIdentifier(columns[n]);
+                }
+            }
+            _command.CommandText = String.Format(CultureInfo.InvariantCulture, "SELECT {0} FROM [{1}].[{2}] WHERE ROWID = ?", String.Join(",", columns), database, table);
+            _command.Parameters.AddWithValue(null, (long)0);
+        }
+
+        internal bool IsValid
+        {
+            set
+            {
+                if (value != false) throw new ArgumentException();
+                if (_reader != null)
+                {
+                    _reader.Dispose();
+                    _reader = null;
+                }
+            }
+        }
+
+        internal void Sync(long rowid)
+        {
+            IsValid = false;
+            _command.Parameters[0].Value = rowid;
+            _reader = _command.ExecuteReader();
+            _reader.Read();
+        }
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+
+        #region IDisposable Members
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+        #endregion
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+
+        #region IDisposable "Pattern" Members
+        private bool disposed;
+        private void CheckDisposed() /* throw */
+        {
+#if THROW_ON_DISPOSED
+            if (disposed)
+                throw new ObjectDisposedException(typeof(KeyQuery).Name);
+#endif
+        }
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+
+        private void Dispose(bool disposing)
+        {
+            if (!disposed)
+            {
+                if (disposing)
+                {
+                    ////////////////////////////////////
+                    // dispose managed resources here...
+                    ////////////////////////////////////
+
+                    IsValid = false;
+
+                    if (_command != null) _command.Dispose();
+                    _command = null;
+                }
+
+                //////////////////////////////////////
+                // release unmanaged resources here...
+                //////////////////////////////////////
+
+                disposed = true;
+            }
+        }
+        #endregion
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////
+
+        #region Destructor
+        ~KeyQuery()
+        {
+            Dispose(false);
+        }
+        #endregion
     }
 
     /// <summary>
     /// This function does all the nasty work at determining what keys need to be returned for
     /// a given statement.
@@ -307,75 +307,75 @@
       // CommandBehavior.KeyInfo
       _keyInfo = new KeyInfo[keys.Count];
       keys.CopyTo(_keyInfo);
     }
 
-    ///////////////////////////////////////////////////////////////////////////////////////////////
-
-    #region IDisposable Members
-    public void Dispose()
-    {
-        Dispose(true);
-        GC.SuppressFinalize(this);
-    }
-    #endregion
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////
-
-    #region IDisposable "Pattern" Members
-    private bool disposed;
-    private void CheckDisposed() /* throw */
-    {
-#if THROW_ON_DISPOSED
-        if (disposed)
-            throw new ObjectDisposedException(typeof(SQLiteKeyReader).Name);
-#endif
-    }
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////
-
-    private void Dispose(bool disposing)
-    {
-        if (!disposed)
-        {
-            if (disposing)
-            {
-                ////////////////////////////////////
-                // dispose managed resources here...
-                ////////////////////////////////////
-
-                _stmt = null;
-
-                if (_keyInfo != null)
-                {
-                    for (int n = 0; n < _keyInfo.Length; n++)
-                    {
-                        if (_keyInfo[n].query != null)
-                            _keyInfo[n].query.Dispose();
-                    }
-
-                    _keyInfo = null;
-                }
-            }
-
-            //////////////////////////////////////
-            // release unmanaged resources here...
-            //////////////////////////////////////
-
-            disposed = true;
-        }
-    }
-    #endregion
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////
-
-    #region Destructor
-    ~SQLiteKeyReader()
-    {
-        Dispose(false);
-    }
-    #endregion
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    #region IDisposable Members
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+    #endregion
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    #region IDisposable "Pattern" Members
+    private bool disposed;
+    private void CheckDisposed() /* throw */
+    {
+#if THROW_ON_DISPOSED
+        if (disposed)
+            throw new ObjectDisposedException(typeof(SQLiteKeyReader).Name);
+#endif
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    private void Dispose(bool disposing)
+    {
+        if (!disposed)
+        {
+            if (disposing)
+            {
+                ////////////////////////////////////
+                // dispose managed resources here...
+                ////////////////////////////////////
+
+                _stmt = null;
+
+                if (_keyInfo != null)
+                {
+                    for (int n = 0; n < _keyInfo.Length; n++)
+                    {
+                        if (_keyInfo[n].query != null)
+                            _keyInfo[n].query.Dispose();
+                    }
+
+                    _keyInfo = null;
+                }
+            }
+
+            //////////////////////////////////////
+            // release unmanaged resources here...
+            //////////////////////////////////////
+
+            disposed = true;
+        }
+    }
+    #endregion
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    #region Destructor
+    ~SQLiteKeyReader()
+    {
+        Dispose(false);
+    }
+    #endregion
 
     ///////////////////////////////////////////////////////////////////////////////////////////////
 
     /// <summary>
     /// How many additional columns of keyinfo we're holding

Index: System.Data.SQLite/SQLiteLog.cs
==================================================================
--- System.Data.SQLite/SQLiteLog.cs
+++ System.Data.SQLite/SQLiteLog.cs
@@ -102,11 +102,11 @@
         /// </summary>
         private static SQLiteLogEventHandler _defaultHandler;
 
         ///////////////////////////////////////////////////////////////////////
 
-#if !USE_INTEROP_DLL || !INTEROP_LOG
+#if !INTEROP_LOG
         /// <summary>
         /// The log callback passed to native SQLite engine.  This must live
         /// as long as the SQLite library has a pointer to it.
         /// </summary>
         private static SQLiteLogCallback _callback;
@@ -176,11 +176,11 @@
                     _domainUnload = new EventHandler(DomainUnload);
                     AppDomain.CurrentDomain.DomainUnload += _domainUnload;
                 }
 #endif
 
-#if !USE_INTEROP_DLL || !INTEROP_LOG
+#if !INTEROP_LOG
                 //
                 // NOTE: Create an instance of the SQLite wrapper class.
                 //
                 if (_sql == null)
                 {
@@ -243,11 +243,11 @@
                 // NOTE: Disable logging.  If necessary, it can be re-enabled
                 //       later by the Initialize method.
                 //
                 _enabled = false;
 
-#if !USE_INTEROP_DLL || !INTEROP_LOG
+#if !INTEROP_LOG
                 //
                 // BUGBUG: This will cause serious problems if other AppDomains
                 //         have any open SQLite connections; however, there is
                 //         currently no way around this limitation.
                 //
@@ -557,19 +557,19 @@
             }
 
             if ((errorCode != null) &&
                 !Object.ReferenceEquals(errorCode, String.Empty))
             {
-                Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                Trace.WriteLine(String.Format(
                     CultureInfo.CurrentCulture, "SQLite {0} ({1}): {2}",
                     type, errorCode, message));
             }
             else
             {
-                Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                Trace.WriteLine(String.Format(
                     CultureInfo.CurrentCulture, "SQLite {0}: {1}",
                     type, message));
             }
 #endif
         }
     }
 }

Index: System.Data.SQLite/SQLiteModule.cs
==================================================================
--- System.Data.SQLite/SQLiteModule.cs
+++ System.Data.SQLite/SQLiteModule.cs
@@ -6165,12 +6165,11 @@
                 {
                     if (LogExceptionsNoThrow)
                     {
                         /* throw */
                         SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION,
-                            UnsafeNativeMethods.StringFormat(
-                            CultureInfo.CurrentCulture,
+                            String.Format(CultureInfo.CurrentCulture,
                             "Caught exception in \"{0}\" method: {1}",
                             destroy ? "xDestroy" : "xDisconnect", e));
                     }
                 }
                 catch
@@ -6225,12 +6224,11 @@
             try
             {
                 if (logErrors)
                 {
                     SQLiteLog.LogMessage(SQLiteErrorCode.Error,
-                        UnsafeNativeMethods.StringFormat(
-                        CultureInfo.CurrentCulture,
+                        String.Format(CultureInfo.CurrentCulture,
                         "Virtual table error: {0}", error)); /* throw */
                 }
             }
             catch
             {
@@ -6273,12 +6271,11 @@
                 try
                 {
                     if (logExceptions)
                     {
                         SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION,
-                            UnsafeNativeMethods.StringFormat(
-                            CultureInfo.CurrentCulture,
+                            String.Format(CultureInfo.CurrentCulture,
                             "Caught exception in \"SetTableError\" method: {0}",
                             e)); /* throw */
                     }
                 }
                 catch
@@ -6675,11 +6672,11 @@
                 tables.TryGetValue(pVtab, out table))
             {
                 return table;
             }
 
-            SetTableError(pVtab, UnsafeNativeMethods.StringFormat(
+            SetTableError(pVtab, String.Format(
                 CultureInfo.CurrentCulture,
                 "managed table for {0} not found", pVtab));
 
             return null;
         }
@@ -6769,11 +6766,11 @@
                 cursors.TryGetValue(pCursor, out cursor))
             {
                 return cursor;
             }
 
-            SetTableError(pVtab, UnsafeNativeMethods.StringFormat(
+            SetTableError(pVtab, String.Format(
                 CultureInfo.CurrentCulture,
                 "managed cursor for {0} not found", pCursor));
 
             return null;
         }
@@ -6855,13 +6852,11 @@
             int argumentCount,
             string name,
             SQLiteFunction function
             )
         {
-            return UnsafeNativeMethods.StringFormat(
-                CultureInfo.InvariantCulture,
-                "{0}:{1}", argumentCount, name);
+            return String.Format("{0}:{1}", argumentCount, name);
         }
         #endregion
 
         ///////////////////////////////////////////////////////////////////////
 
@@ -8682,12 +8677,11 @@
                     try
                     {
                         if (LogExceptionsNoThrow)
                         {
                             SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION,
-                                UnsafeNativeMethods.StringFormat(
-                                CultureInfo.CurrentCulture,
+                                String.Format(CultureInfo.CurrentCulture,
                                 "Caught exception in \"Dispose\" method: {0}",
                                 e)); /* throw */
                         }
                     }
                     catch

Index: System.Data.SQLite/SQLiteModuleCommon.cs
==================================================================
--- System.Data.SQLite/SQLiteModuleCommon.cs
+++ System.Data.SQLite/SQLiteModuleCommon.cs
@@ -21,14 +21,13 @@
         #region Private Constants
         /// <summary>
         /// The CREATE TABLE statement used to declare the schema for the
         /// virtual table.
         /// </summary>
-        private static readonly string declareSql =
-            UnsafeNativeMethods.StringFormat(
-                CultureInfo.InvariantCulture, "CREATE TABLE {0}(x);",
-                typeof(SQLiteModuleCommon).Name);
+        private static readonly string declareSql = String.Format(
+            CultureInfo.CurrentCulture, "CREATE TABLE {0}(x);",
+            typeof(SQLiteModuleCommon).Name);
         #endregion
 
         ///////////////////////////////////////////////////////////////////////
 
         #region Private Data
@@ -117,13 +116,12 @@
             Type type
             )
         {
             if (type != null)
             {
-                SetCursorError(cursor, UnsafeNativeMethods.StringFormat(
-                    CultureInfo.CurrentCulture, "not a \"{0}\" cursor",
-                    type));
+                SetCursorError(cursor,
+                    String.Format("not a \"{0}\" cursor", type));
             }
             else
             {
                 SetCursorError(cursor, "cursor type mismatch");
             }

Index: System.Data.SQLite/SQLiteModuleEnumerable.cs
==================================================================
--- System.Data.SQLite/SQLiteModuleEnumerable.cs
+++ System.Data.SQLite/SQLiteModuleEnumerable.cs
@@ -501,12 +501,11 @@
         {
             CheckDisposed();
 
             if (!table.BestIndex(index))
             {
-                SetTableError(table, UnsafeNativeMethods.StringFormat(
-                    CultureInfo.CurrentCulture,
+                SetTableError(table, String.Format(CultureInfo.CurrentCulture,
                     "failed to select best index for virtual table \"{0}\"",
                     table.TableName));
 
                 return SQLiteErrorCode.Error;
             }
@@ -829,12 +828,11 @@
             ref long rowId
             )
         {
             CheckDisposed();
 
-            SetTableError(table, UnsafeNativeMethods.StringFormat(
-                CultureInfo.CurrentCulture,
+            SetTableError(table, String.Format(CultureInfo.CurrentCulture,
                 "virtual table \"{0}\" is read-only", table.TableName));
 
             return SQLiteErrorCode.Error;
         }
 
@@ -859,12 +857,11 @@
         {
             CheckDisposed();
 
             if (!table.Rename(newName))
             {
-                SetTableError(table, UnsafeNativeMethods.StringFormat(
-                    CultureInfo.CurrentCulture,
+                SetTableError(table, String.Format(CultureInfo.CurrentCulture,
                     "failed to rename virtual table from \"{0}\" to \"{1}\"",
                     table.TableName, newName));
 
                 return SQLiteErrorCode.Error;
             }

Index: System.Data.SQLite/SQLiteParameterCollection.cs
==================================================================
--- System.Data.SQLite/SQLiteParameterCollection.cs
+++ System.Data.SQLite/SQLiteParameterCollection.cs
@@ -49,11 +49,11 @@
       _command = cmd;
       _parameterList = new List<SQLiteParameter>();
       _unboundFlag = true;
     }
 
-    /// <summary>
+    /// <summary>
     /// Returns false
     /// </summary>
     public override bool IsSynchronized
     {
       get { return false; }
@@ -425,11 +425,11 @@
       {
         y ++;
         s = p.ParameterName;
         if (s == null)
         {
-          s = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, ";{0}", nUnnamed);
+          s = String.Format(CultureInfo.InvariantCulture, ";{0}", nUnnamed);
           nUnnamed++;
         }
 
         int x;
         bool isMapped = false;
@@ -454,11 +454,11 @@
 
         // If the parameter has a name, but the SQL statement uses unnamed references, this can happen -- attempt to map
         // the parameter by its index in the collection
         if (isMapped == false)
         {
-          s = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, ";{0}", y);
+          s = String.Format(CultureInfo.InvariantCulture, ";{0}", y);
 
           stmt = activeStatement;
           for (n = 0; n < x; n++)
           {
             if (stmt == null) stmt = _command._statementList[n];

Index: System.Data.SQLite/SQLiteStatement.cs
==================================================================
--- System.Data.SQLite/SQLiteStatement.cs
+++ System.Data.SQLite/SQLiteStatement.cs
@@ -1,9 +1,9 @@
 /********************************************************
  * ADO.NET 2.0 Data Provider for SQLite Version 3.X
  * Written by Robert Simpson (robert@blackcastlesoft.com)
- *
+ * 
  * Released to the public domain, use at your own risk!
  ********************************************************/
 
 namespace System.Data.SQLite
 {
@@ -83,11 +83,11 @@
         for (x = 0; x < n; x++)
         {
           s = _sql.Bind_ParamName(this, _flags, x + 1);
           if (String.IsNullOrEmpty(s))
           {
-            s = UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, ";{0}", nCmdStart);
+            s = String.Format(CultureInfo.InvariantCulture, ";{0}", nCmdStart);
             nCmdStart++;
             _unnamedParameters++;
           }
           _paramNames[x] = s;
           _paramValues[x] = null;
@@ -202,11 +202,11 @@
     /// <param name="s">The parameter name to map</param>
     /// <param name="p">The parameter to assign it</param>
     internal bool MapParameter(string s, SQLiteParameter p)
     {
       if (_paramNames == null) return false;
-
+      
       int startAt = 0;
       if (s.Length > 0)
       {
         if (":$@;".IndexOf(s[0]) == -1)
           startAt = 1;
@@ -256,12 +256,11 @@
 
       if ((_flags & SQLiteConnectionFlags.LogPreBind) == SQLiteConnectionFlags.LogPreBind)
       {
           IntPtr handle = _sqlite_stmt;
 
-          SQLiteLog.LogMessage(UnsafeNativeMethods.StringFormat(
-              CultureInfo.CurrentCulture,
+          SQLiteLog.LogMessage(String.Format(
               "Binding statement {0} paramter #{1} with database type {2} and raw value {{{3}}}...",
               handle, index, objType, obj));
       }
 
       if ((obj == null) || Convert.IsDBNull(obj))

Index: System.Data.SQLite/UnsafeNativeMethods.cs
==================================================================
--- System.Data.SQLite/UnsafeNativeMethods.cs
+++ System.Data.SQLite/UnsafeNativeMethods.cs
@@ -121,82 +121,10 @@
       {
           Initialize();
       }
 
       /////////////////////////////////////////////////////////////////////////
-
-      /// <summary>
-      /// This type is only present when running on Mono.
-      /// </summary>
-      private static readonly string MonoRuntimeType = "Mono.Runtime";
-
-      /// <summary>
-      /// Keeps track of whether we are running on Mono.  Initially null, it is
-      /// set by the <see cref="IsMono" /> method on its first call.  Later, it
-      /// is returned verbatim by the <see cref="IsMono" /> method.
-      /// </summary>
-      private static bool? isMono = null;
-
-      /// <summary>
-      /// Determines whether or not this assembly is running on Mono.
-      /// </summary>
-      /// <returns>
-      /// Non-zero if this assembly is running on Mono.
-      /// </returns>
-      private static bool IsMono()
-      {
-          try
-          {
-              lock (staticSyncRoot)
-              {
-                  if (isMono == null)
-                      isMono = (Type.GetType(MonoRuntimeType) != null);
-
-                  return (bool)isMono;
-              }
-          }
-          catch
-          {
-              // do nothing.
-          }
-
-          return false;
-      }
-
-      /////////////////////////////////////////////////////////////////////////
-
-      /// <summary>
-      /// This is a wrapper around the
-      /// <see cref="String.Format(IFormatProvider,String,Object[])" /> method.
-      /// On Mono, it has to call the method overload without the
-      /// <see cref="IFormatProvider" /> parameter, due to a bug in Mono.
-      /// </summary>
-      /// <param name="provider">
-      /// This is used for culture-specific formatting.
-      /// </param>
-      /// <param name="format">
-      /// The format string.
-      /// </param>
-      /// <param name="args">
-      /// An array the objects to format.
-      /// </param>
-      /// <returns>
-      /// The resulting string.
-      /// </returns>
-      internal static string StringFormat(
-          IFormatProvider provider,
-          string format,
-          params object[] args
-          )
-      {
-          if (IsMono())
-              return String.Format(format, args);
-          else
-              return String.Format(provider, format, args);
-      }
-
-      /////////////////////////////////////////////////////////////////////////
       /// <summary>
       /// Attempts to initialize this class by pre-loading the native SQLite
       /// library for the processor architecture of the current process.
       /// </summary>
       internal static void Initialize()
@@ -371,13 +299,12 @@
 
           if (Environment.GetEnvironmentVariable("No_Expand") != null)
           {
               expand = false;
           }
-          else if (Environment.GetEnvironmentVariable(StringFormat(
-                  CultureInfo.InvariantCulture, "No_Expand_{0}",
-                  name)) != null)
+          else if (Environment.GetEnvironmentVariable(String.Format(
+                  "No_Expand_{0}", name)) != null)
           {
               expand = false;
           }
 
           value = Environment.GetEnvironmentVariable(name);
@@ -398,12 +325,11 @@
 
               XmlDocument document = new XmlDocument();
 
               document.Load(fileName);
 
-              XmlElement element = document.SelectSingleNode(StringFormat(
-                  CultureInfo.InvariantCulture,
+              XmlElement element = document.SelectSingleNode(String.Format(
                   "/configuration/appSettings/add[@key='{0}']", name)) as
                   XmlElement;
 
               if (element != null)
               {
@@ -426,11 +352,11 @@
 #endif
           {
 #if !NET_COMPACT_20 && TRACE_SHARED
               try
               {
-                  Trace.WriteLine(StringFormat(
+                  Trace.WriteLine(String.Format(
                       CultureInfo.CurrentCulture,
                       "Native library pre-loader failed to get setting " +
                       "\"{0}\" value: {1}", name, e)); /* throw */
               }
               catch
@@ -542,11 +468,11 @@
               if (File.Exists(xmlConfigFileName))
               {
 #if !NET_COMPACT_20 && TRACE_DETECTION
                   try
                   {
-                      Trace.WriteLine(StringFormat(
+                      Trace.WriteLine(String.Format(
                           CultureInfo.CurrentCulture,
                           "Native library pre-loader found XML configuration file " +
                           "via code base for currently executing assembly: \"{0}\"",
                           xmlConfigFileName)); /* throw */
                   }
@@ -565,11 +491,11 @@
               if (CheckForArchitecturesAndPlatforms(directory, ref matches) > 0)
               {
 #if !NET_COMPACT_20 && TRACE_DETECTION
                   try
                   {
-                      Trace.WriteLine(StringFormat(
+                      Trace.WriteLine(String.Format(
                           CultureInfo.CurrentCulture,
                           "Native library pre-loader found native sub-directories " +
                           "via code base for currently executing assembly: \"{0}\"",
                           ListToString(matches))); /* throw */
                   }
@@ -592,11 +518,11 @@
 #endif
           {
 #if !NET_COMPACT_20 && TRACE_SHARED
               try
               {
-                  Trace.WriteLine(StringFormat(
+                  Trace.WriteLine(String.Format(
                       CultureInfo.CurrentCulture,
                       "Native library pre-loader failed to check code base " +
                       "for currently executing assembly: {0}", e)); /* throw */
               }
               catch
@@ -659,11 +585,11 @@
 #endif
           {
 #if !NET_COMPACT_20 && TRACE_SHARED
               try
               {
-                  Trace.WriteLine(StringFormat(
+                  Trace.WriteLine(String.Format(
                       CultureInfo.CurrentCulture,
                       "Native library pre-loader failed to get directory " +
                       "for currently executing assembly: {0}", e)); /* throw */
               }
               catch
@@ -1029,11 +955,11 @@
               {
                   //
                   // NOTE: Show that we hit a fairly unusual situation (i.e.
                   //       the "wrong" processor architecture was detected).
                   //
-                  Trace.WriteLine(StringFormat(
+                  Trace.WriteLine(String.Format(
                       CultureInfo.CurrentCulture,
                       "Native library pre-loader detected {0}-bit pointer " +
                       "size with processor architecture \"{1}\", using " +
                       "processor architecture \"{2}\" instead...",
                       IntPtr.Size * 8 /* bits */, savedProcessorArchitecture,
@@ -1248,11 +1174,11 @@
               {
                   //
                   // NOTE: Show exactly where we are trying to load the native
                   //       SQLite library from.
                   //
-                  Trace.WriteLine(StringFormat(
+                  Trace.WriteLine(String.Format(
                       CultureInfo.CurrentCulture,
                       "Native library pre-loader is trying to load native " +
                       "SQLite library \"{0}\"...", fileName)); /* throw */
               }
               catch
@@ -1288,11 +1214,11 @@
                   //
                   // NOTE: Show where we failed to load the native SQLite
                   //       library from along with the Win32 error code and
                   //       exception information.
                   //
-                  Trace.WriteLine(StringFormat(
+                  Trace.WriteLine(String.Format(
                       CultureInfo.CurrentCulture,
                       "Native library pre-loader failed to load native " +
                       "SQLite library \"{0}\" (getLastError = {1}): {2}",
                       fileName, lastError, e)); /* throw */
               }
@@ -3028,11 +2954,11 @@
 #endif
 
 #if !NET_COMPACT_20 && TRACE_HANDLE
                 try
                 {
-                    Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                    Trace.WriteLine(String.Format(
                         CultureInfo.CurrentCulture,
                         "CloseConnection: {0}", localHandle)); /* throw */
                 }
                 catch
                 {
@@ -3063,11 +2989,11 @@
 #endif
             {
 #if !NET_COMPACT_20 && TRACE_HANDLE
                 try
                 {
-                    Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                    Trace.WriteLine(String.Format(
                         CultureInfo.CurrentCulture,
                         "CloseConnection: {0}, exception: {1}",
                         handle, e)); /* throw */
                 }
                 catch
@@ -3216,11 +3142,11 @@
                     SQLiteBase.FinalizeStatement(cnn, localHandle);
 
 #if !NET_COMPACT_20 && TRACE_HANDLE
                 try
                 {
-                    Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                    Trace.WriteLine(String.Format(
                         CultureInfo.CurrentCulture,
                         "FinalizeStatement: {0}", localHandle)); /* throw */
                 }
                 catch
                 {
@@ -3251,11 +3177,11 @@
 #endif
             {
 #if !NET_COMPACT_20 && TRACE_HANDLE
                 try
                 {
-                    Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                    Trace.WriteLine(String.Format(
                         CultureInfo.CurrentCulture,
                         "FinalizeStatement: {0}, exception: {1}",
                         handle, e)); /* throw */
                 }
                 catch
@@ -3389,11 +3315,11 @@
                     SQLiteBase.FinishBackup(cnn, localHandle);
 
 #if !NET_COMPACT_20 && TRACE_HANDLE
                 try
                 {
-                    Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                    Trace.WriteLine(String.Format(
                         CultureInfo.CurrentCulture,
                         "FinishBackup: {0}", localHandle)); /* throw */
                 }
                 catch
                 {
@@ -3424,11 +3350,11 @@
 #endif
             {
 #if !NET_COMPACT_20 && TRACE_HANDLE
                 try
                 {
-                    Trace.WriteLine(UnsafeNativeMethods.StringFormat(
+                    Trace.WriteLine(String.Format(
                         CultureInfo.CurrentCulture,
                         "FinishBackup: {0}, exception: {1}",
                         handle, e)); /* throw */
                 }
                 catch

Index: Targets/SQLite.NET.targets
==================================================================
--- Targets/SQLite.NET.targets
+++ Targets/SQLite.NET.targets
@@ -116,11 +116,11 @@
           Condition="Exists('$(TargetPath).config')" />
 
     <Exec Condition="'$(DirForCloneAndMark32BitOnly)' != '' And
                      HasTrailingSlash('$(DirForCloneAndMark32BitOnly)') And
                      Exists('$(DirForCloneAndMark32BitOnly)bin\CorFlags.exe')"
-          Command="&quot;$(DirForCloneAndMark32BitOnly)bin\CorFlags.exe&quot; &quot;$(TargetDir)$(TargetName)32$(TargetExt)&quot; /32BIT+ /Force 1&gt;NUL" />
+          Command="&quot;$(DirForCloneAndMark32BitOnly)bin\CorFlags.exe&quot; &quot;$(TargetDir)$(TargetName)32$(TargetExt)&quot; /32BIT+ /Force" />
 
     <Exec Condition="'$(DirForCloneAndMark32BitOnly)' != '' And
                      HasTrailingSlash('$(DirForCloneAndMark32BitOnly)') And
                      Exists('$(DirForCloneAndMark32BitOnly)bin\sn.exe')"
           Command="&quot;$(DirForCloneAndMark32BitOnly)bin\sn.exe&quot; -Ra &quot;$(TargetDir)$(TargetName)32$(TargetExt)&quot; &quot;$(AssemblyOriginatorKeyFile)&quot;" />
@@ -149,11 +149,11 @@
           Condition="Exists('$(TargetPath).config')" />
 
     <Exec Condition="'$(TargetFrameworkSDKToolsDirectory)' != '' And
                      HasTrailingSlash('$(TargetFrameworkSDKToolsDirectory)') And
                      Exists('$(TargetFrameworkSDKToolsDirectory)CorFlags.exe')"
-          Command="&quot;$(TargetFrameworkSDKToolsDirectory)CorFlags.exe&quot; &quot;$(TargetDir)$(TargetName)32$(TargetExt)&quot; /32BIT+ /Force 1&gt;NUL" />
+          Command="&quot;$(TargetFrameworkSDKToolsDirectory)CorFlags.exe&quot; &quot;$(TargetDir)$(TargetName)32$(TargetExt)&quot; /32BIT+ /Force" />
 
     <Exec Condition="'$(TargetFrameworkSDKToolsDirectory)' != '' And
                      HasTrailingSlash('$(TargetFrameworkSDKToolsDirectory)') And
                      Exists('$(TargetFrameworkSDKToolsDirectory)sn.exe')"
           Command="&quot;$(TargetFrameworkSDKToolsDirectory)sn.exe&quot; -Ra &quot;$(TargetDir)$(TargetName)32$(TargetExt)&quot; &quot;$(AssemblyOriginatorKeyFile)&quot;" />

Index: Tests/authorizer.eagle
==================================================================
--- Tests/authorizer.eagle
+++ Tests/authorizer.eagle
@@ -122,12 +122,11 @@
     set result [lindex [split [string map [list \r\n \n] $result] \n] 0]
     lappend results [list $name $data $code $result]
   }
   lappend results [isTableInDb tDeny]
 
-  string map \
-      [list "SQLiteException (0x80004005):" "SQLiteException:"] $results
+  set results
 } -cleanup {
   catch {object invoke $connection remove_Authorize $callback}
   catch {object removecallback $callback}
 
   cleanupDb $fileName
@@ -160,11 +159,11 @@
 BEGIN {} {} {}} {0 Transaction COMMIT {} {} {}}} 0 -1} {Savepoint {{0 Savepoint\
 BEGIN s1 {} {}} {0 Savepoint RELEASE s1 {} {}}} 0 -1} {Attach {{0 Attach\
 :memory: {} {} {}}} 0 -1} {Detach {{0 Detach d1 {} {} {}}} 0 -1} {CreateVtable\
 {{0 CreateVtable t3 fts4 main {}}} 0 0} {DropVtable {{0 DropVtable t3 fts4 main\
 {}}} 0 0} {CreateTable {{0 CreateTable tDeny {} main {}}} 1\
-{System.Data.SQLite.SQLiteException: authorization denied}} False}}
+{System.Data.SQLite.SQLiteException (0x80004005): authorization denied}} False}}
 
 ###############################################################################
 
 runSQLiteTestEpilogue
 runTestEpilogue

Index: Tests/basic.eagle
==================================================================
--- Tests/basic.eagle
+++ Tests/basic.eagle
@@ -1572,11 +1572,11 @@
   cleanupDb $fileName
 
   freeDbConnection
 
   unset -nocomplain providerServices connection db fileName
-} -constraints {eagle monoToDo command.object SQLite System.Data.SQLite\
+} -constraints {eagle command.object SQLite System.Data.SQLite\
 System.Data.SQLite.Linq} -result {}}
 
 ###############################################################################
 
 runTest {test data-1.30 {EF6 ISQLiteSchemaExtensions.BuildTempSchema} -setup {
@@ -1594,11 +1594,11 @@
   cleanupDb $fileName
 
   freeDbConnection
 
   unset -nocomplain providerServices connection db fileName
-} -constraints {eagle monoToDo command.object SQLite System.Data.SQLite\
+} -constraints {eagle command.object SQLite System.Data.SQLite\
 System.Data.SQLite.EF6} -result {}}
 
 ###############################################################################
 
 runTest {test data-1.31 {VARCHAR / NVARCHAR types with spaces} -body {
@@ -2381,15 +2381,14 @@
   set result
 } -cleanup {
   cleanupDb $fileName
 
   unset -nocomplain output result db fileName
-} -constraints {eagle monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite SQLiteInterop\
-defineConstant.System.Data.SQLite.INTEROP_EXTENSION_FUNCTIONS} -match regexp \
--result {^0 12341234 1 \{System\.Data\.SQLite\.SQLiteException \(0x80004005\):\
-SQL logic error or missing database.*?\} 0 1234123412341234$}}
+} -constraints \
+{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -match \
+regexp -result {^0 12341234 1 \{System\.Data\.SQLite\.SQLiteException\
+\(0x80004005\): SQL logic error or missing database.*?\} 0 1234123412341234$}}
 
 ###############################################################################
 
 runTest {test data-1.50 {column name and index lookup} -setup {
   setupDb [set fileName data-1.50.db]
@@ -2697,11 +2696,11 @@
 
   cleanupDb $fileName
 
   unset -nocomplain db fileName
 } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite SQLiteInterop} -result {1 {} 1.01 {}}}
+System.Data.SQLite} -result {1 {} 1.01 {}}}
 
 ###############################################################################
 
 runTest {test data-1.57 {regexp extension} -setup {
   setupDb [set fileName data-1.57.db]
@@ -2757,12 +2756,12 @@
 
   cleanupDb $fileName
 
   unset -nocomplain db fileName
 } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite SQLiteInterop} -result {0 1 1 {unmatched '('} 0 1 1\
-{unmatched '('} 0 0 1 {unmatched '('} 0 0 1 {unmatched '('}}}
+System.Data.SQLite} -result {0 1 1 {unmatched '('} 0 1 1 {unmatched '('} 0 0 1\
+{unmatched '('} 0 0 1 {unmatched '('}}}
 
 ###############################################################################
 
 reportSQLiteResources $test_channel
 
@@ -2839,11 +2838,11 @@
 
   cleanupDb $fileName
 
   unset -nocomplain db fileName
 } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite SQLiteInterop} -result {0 4 -1 1.75}}
+System.Data.SQLite} -result {0 4 -1 1.75}}
 
 ###############################################################################
 
 runTest {test data-1.60 {per-connection type mappings} -setup {
   setupDb [set fileName data-1.60.db] "" "" "" UseConnectionTypes
@@ -3171,12 +3170,11 @@
 
   freeDbConnection
 
   unset -nocomplain connection db fileName
 } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite} -match regexp -result \
-{^Default Default|LogCallbackException LogCallbackException$}}
+System.Data.SQLite} -result {Default Default}}
 
 ###############################################################################
 
 runTest {test data-1.69 {set env(DefaultFlags_SQLiteConnection)} -setup {
   saveSQLiteConnectionEnvironment
@@ -3280,13 +3278,13 @@
 
   cleanupDb $fileName
 
   unset -nocomplain db fileName
 } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite SQLiteInterop} -match regexp -result \
-{^\{fts5: \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [0-9a-f]{40}\} \{\} \{\} \{\}\
-\{\} \{\} \{rowid 3 x horse rowid 4 x house\}$}}
+System.Data.SQLite} -match regexp -result {^\{fts5: \d{4}-\d{2}-\d{2}\
+\d{2}:\d{2}:\d{2} [0-9a-f]{40}\} \{\} \{\} \{\} \{\} \{\} \{rowid 3 x horse\
+rowid 4 x house\}$}}
 
 ###############################################################################
 
 runTest {test data-1.72 {unbind function from a connection} -setup {
   set fileName data-1.72.db
@@ -3590,277 +3588,14 @@
 \{System\.Reflection\.TargetInvocationException: Exception has been thrown by\
 the target of an invocation\. ---> System\.Data\.SQLite\.SQLiteException: SQL\
 logic error or missing database
 no such function: MyRandom.*\} 0 \{\} 0 (?:-)?\d+ 0 \{\}$}]}
 
-###############################################################################
-
-runTest {test data-1.74 {bind functions using delegate} -setup {
-  proc getMyFuncArgs { argumentCount } {
-    set result [list]
-
-    for {set index 0} {$index < $argumentCount} {incr index} {
-      lappend result [appendArgs 'myFuncArg [expr {$index + 1}] ']
-    }
-
-    return $result
-  }
-
-  proc getHashCode { value } {
-    if {[isObjectHandle $value]} then {
-      if {$value eq "null"} then {
-        return 0
-      } else {
-        return [object invoke $value GetHashCode]
-      }
-    } else {
-      if {[string length $value] == 0} then {
-        return 0
-      } else {
-        set string [object create String $value]
-
-        return [object invoke $string GetHashCode]
-      }
-    }
-  }
-
-  proc hashManagedArray { array } {
-    set data ""
-
-    if {[isObjectHandle $array] && $array ne "null"} then {
-      if {[object invoke $array GetType.IsArray]} then {
-        for {set index 0} {$index < [$array Length]} {incr index} {
-          set element [$array -create -alias GetValue $index]
-
-          if {[string length $element] > 0} then {
-            append data [$element ToString]
-          } else {
-            append data null
-          }
-        }
-      }
-    }
-
-    return [getHashCode [hash normal sha1 $data]]
-  }
-
-  proc myFuncCallback { args } {
-    if {[llength $args] == 0} then {
-      error "no function arguments"
-    }
-
-    set name [lindex $args 0]
-
-    if {[isObjectHandle $name] && $name ne "null"} then {
-      set name [object invoke $name ToString]
-    }
-
-    switch -exact -- $name {
-      Invoke {
-        return [hashManagedArray [lindex $args end]]
-      }
-      Step {
-        set varName [lindex $args end]
-
-        if {[string length $varName] == 0} then {
-          error "invalid aggregate context variable name"
-        }
-
-        upvar 1 $varName ctx
-
-        if {![info exists ctx] || [string length $ctx] == 0} then {
-          set ctx [pid]
-        }
-
-        set hashCtx [getHashCode $ctx]
-        set hashArgs [hashManagedArray [lindex $args end-2]]
-
-        if {[info exists ::aggregateData($hashCtx)]} then {
-          incr ::aggregateData($hashCtx) $hashArgs
-        } else {
-          set ::aggregateData($hashCtx) $hashArgs
-        }
-      }
-      Final {
-        set ctx [lindex $args end]
-
-        if {[string length $ctx] == 0} then {
-          error "invalid aggregate context"
-        }
-
-        set hashCtx [getHashCode $ctx]
-
-        if {[info exists ::aggregateData($hashCtx)]} then {
-          return $::aggregateData($hashCtx)
-        } else {
-          error "missing aggregate context data"
-        }
-      }
-      Compare {
-        lappend ::compareResults [object invoke -create \
-            Int32 Parse [string compare -nocase [lindex \
-            $args 1] [lindex $args 2]]]
-
-        return [lindex $::compareResults end]
-      }
-      default {
-        error [appendArgs "unknown function callback \"" $name \"]
-      }
-    }
-  }
-
-  proc myFuncInvokeCallback { param0 objs } {
-    return [myFuncCallback $param0 $objs]
-  }
-
-  proc myFuncStepCallback { param0 objs stepNumber contextDataVarName } {
-    upvar 1 $contextDataVarName $contextDataVarName
-    return [myFuncCallback $param0 $objs $stepNumber $contextDataVarName]
-  }
-
-  proc myFuncFinalCallback { param0 contextData } {
-    return [myFuncCallback $param0 $contextData ]
-  }
-
-  proc myFuncCompareCallback { param0 param1 param2 } {
-    return [myFuncCallback $param0 $param1 $param2]
-  }
-
-  setupDb [set fileName data-1.74.db]
-} -body {
-  sql execute $db "CREATE TABLE t1(x);"
-  sql execute $db "INSERT INTO t1 (x) VALUES(1);"
-  sql execute $db "INSERT INTO t1 (x) VALUES(2);"
-  sql execute $db "INSERT INTO t1 (x) VALUES(3);"
-  sql execute $db "INSERT INTO t1 (x) VALUES('A');"
-  sql execute $db "INSERT INTO t1 (x) VALUES('a');"
-  sql execute $db "INSERT INTO t1 (x) VALUES('M');"
-  sql execute $db "INSERT INTO t1 (x) VALUES('m');"
-  sql execute $db "INSERT INTO t1 (x) VALUES('Z');"
-  sql execute $db "INSERT INTO t1 (x) VALUES('z');"
-
-  set connection [getDbConnection]
-
-  for {set argumentCount 0} {$argumentCount < 3} {incr argumentCount} {
-    set attribute(1,$argumentCount) [object create \
-        System.Data.SQLite.SQLiteFunctionAttribute [appendArgs \
-        myFunc1_74_1_ $argumentCount] $argumentCount Scalar]
-
-    $connection -marshalflags \
-        {-StrictMatchType +DynamicCallback ForceParameterType} \
-        -parametertypes [list System.Data.SQLite.SQLiteFunctionAttribute \
-            System.Data.SQLite.SQLiteInvokeDelegate Delegate] \
-        BindFunction $attribute(1,$argumentCount) \
-        myFuncInvokeCallback null
-
-    set attribute(2,$argumentCount) [object create \
-        System.Data.SQLite.SQLiteFunctionAttribute [appendArgs \
-        myFunc1_74_2_ $argumentCount] $argumentCount Aggregate]
-
-    $connection -marshalflags \
-        {-StrictMatchType +DynamicCallback ForceParameterType} \
-        -parametertypes [list System.Data.SQLite.SQLiteFunctionAttribute \
-            System.Data.SQLite.SQLiteStepDelegate \
-            System.Data.SQLite.SQLiteFinalDelegate] \
-        BindFunction $attribute(2,$argumentCount) \
-        myFuncStepCallback myFuncFinalCallback
-  }
-
-  set attribute(3,0) [object create \
-      System.Data.SQLite.SQLiteFunctionAttribute myFunc1_74_3 0 \
-      Collation]
-
-  $connection -marshalflags \
-      {-StrictMatchType +DynamicCallback ForceParameterType} \
-      -parametertypes [list System.Data.SQLite.SQLiteFunctionAttribute \
-          System.Data.SQLite.SQLiteCompareDelegate Delegate] \
-      BindFunction $attribute(3,0) \
-      myFuncCompareCallback null
-
-  for {set argumentCount 0} {$argumentCount < 3} {incr argumentCount} {
-    lappend result [catch {
-      sql execute $db [appendArgs \
-          "SELECT " myFunc1_74_1_ $argumentCount ( \
-          [join [getMyFuncArgs $argumentCount] ,] )\;]
-    } error] $error
-
-    lappend result [catch {
-      sql execute $db [appendArgs \
-          "SELECT " myFunc1_74_2_ $argumentCount ( \
-          [join [getMyFuncArgs $argumentCount] ,] )\;]
-    } error] $error
-  }
-
-  lappend result [catch {
-    sql execute -execute reader -format list $db \
-        "SELECT x FROM t1 ORDER BY x COLLATE myFunc1_74_3;"
-  } error] $error
-
-  lappend result [$connection UnbindAllFunctions false]
-
-  for {set argumentCount 0} {$argumentCount < 3} {incr argumentCount} {
-    lappend result [catch {
-      sql execute $db [appendArgs \
-          "SELECT " myFunc1_74_1_ $argumentCount ( \
-          [join [getMyFuncArgs $argumentCount] ,] )\;]
-    } error] [expr {[string first [appendArgs \
-        "no such function: myFunc1_74_1_" $argumentCount] $error] != -1}]
-
-    lappend result [catch {
-      sql execute $db [appendArgs \
-          "SELECT " myFunc1_74_2_ $argumentCount ( \
-          [join [getMyFuncArgs $argumentCount] ,] )\;]
-    } error] [expr {[string first [appendArgs \
-        "no such function: myFunc1_74_2_" $argumentCount] $error] != -1}]
-  }
-
-  lappend result [catch {
-    sql execute -execute reader -format list $db \
-        "SELECT x FROM t1 ORDER BY x COLLATE myFunc1_74_3;"
-  } error] [expr {[string first "no such collation sequence: myFunc1_74_3" \
-      $error] != -1}]
-
-  lappend result [array size aggregateData]
-  lappend result [testArrayGet aggregateData]
-
-  set result
-} -cleanup {
-  cleanupDb $fileName
-
-  freeDbConnection
-
-  catch {object removecallback myFuncCompareCallback}
-  catch {object removecallback myFuncFinalCallback}
-  catch {object removecallback myFuncStepCallback}
-  catch {object removecallback myFuncInvokeCallback}
-
-  catch {
-    foreach compareResult $compareResults {
-      catch {object dispose $compareResult}
-    }
-  }
-
-  unset -nocomplain result error compareResult compareResults \
-      aggregateData argumentCount attribute connection db fileName
-
-  rename myFuncCompareCallback ""
-  rename myFuncFinalCallback ""
-  rename myFuncStepCallback ""
-  rename myFuncInvokeCallback ""
-  rename myFuncCallback ""
-  rename hashManagedArray ""
-  rename getHashCode ""
-  rename getMyFuncArgs ""
-} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
-System.Data.SQLite} -match regexp -result {^0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 \{1\
-2 3 A a M m Z z\} True 1 True 1 True 1 True 1 True 1 True 1 True 1 True 1\
-\{(?:-)?\d+ (?:-)?\d+\}$}}
-
 ###############################################################################
 
 reportSQLiteResources $test_channel
 
 ###############################################################################
 
 runSQLiteTestFilesEpilogue
 runSQLiteTestEpilogue
 runTestEpilogue

Index: Tests/linq.eagle
==================================================================
--- Tests/linq.eagle
+++ Tests/linq.eagle
@@ -89,16 +89,15 @@
   }
 
   set result
 } -cleanup {
   unset -nocomplain code output error result
-} -constraints {eagle System.Data.SQLite.dll_v4.0.30319 monoToDo SQLite\
-file_System.Data.SQLite.dll testExec file_System.Data.SQLite.Linq.dll\
-file_testlinq.exe file_northwindEF.db} -result {0 {{ NewUnitPrice = 21.0 } {\
-NewUnitPrice = 21.1 } { NewUnitPrice = 21.05 } { NewUnitPrice = 23.0 } {\
-NewUnitPrice = 23.3 } { NewUnitPrice = 23.25 } { NewUnitPrice = 21.0 } {\
-NewUnitPrice = 21.4 } { NewUnitPrice = 21.35 }}}}
+} -constraints {eagle monoToDo SQLite file_System.Data.SQLite.dll testExec\
+file_System.Data.SQLite.Linq.dll file_testlinq.exe file_northwindEF.db} \
+-result {0 {{ NewUnitPrice = 21.0 } { NewUnitPrice = 21.1 } { NewUnitPrice =\
+21.05 } { NewUnitPrice = 23.0 } { NewUnitPrice = 23.3 } { NewUnitPrice = 23.25\
+} { NewUnitPrice = 21.0 } { NewUnitPrice = 21.4 } { NewUnitPrice = 21.35 }}}}
 
 ###############################################################################
 
 runSQLiteTestFilesEpilogue
 runSQLiteTestEpilogue

Index: Tests/speed.eagle
==================================================================
--- Tests/speed.eagle
+++ Tests/speed.eagle
@@ -174,11 +174,11 @@
   set result
 } -cleanup {
   cleanupDb $fileName
 
   unset -nocomplain time sql table column result char db fileName
-} -time true -constraints {eagle monoBug40 command.sql compile.DATA SQLite\
+} -time true -constraints {eagle monoBug28 command.sql compile.DATA SQLite\
 System.Data.SQLite} -result {3 3 3 3}}
 
 ###############################################################################
 
 #

Index: Tests/stress.eagle
==================================================================
--- Tests/stress.eagle
+++ Tests/stress.eagle
@@ -1645,11 +1645,11 @@
 
   unset -nocomplain result thread index workload priority noWorkload \
       priorities srcDb db fileName compiled options count times logFileName \
       logListener event timeout connection indicators iterations exitOnFail \
       coTaskMem noTrace failures status workloadNames workloadCallbacks
-} -time true -constraints {eagle command.object monoBug40 command.sql\
+} -time true -constraints {eagle command.object monoBug28 command.sql\
 compile.DATA SQLite System.Data.SQLite compileCSharp} -result {0}}
 
 ###############################################################################
 
 #

DELETED Tests/tkt-41aea496e0.eagle
Index: Tests/tkt-41aea496e0.eagle
==================================================================
--- Tests/tkt-41aea496e0.eagle
+++ /dev/null
@@ -1,65 +0,0 @@
-###############################################################################
-#
-# tkt-41aea496e0.eagle --
-#
-# Written by Joe Mistachkin.
-# Released to the public domain, use at your own risk!
-#
-###############################################################################
-
-package require Eagle
-package require Eagle.Library
-package require Eagle.Test
-
-runTestPrologue
-
-###############################################################################
-
-package require System.Data.SQLite.Test
-runSQLiteTestPrologue
-runSQLiteTestFilesPrologue
-
-###############################################################################
-
-runTest {test tkt-41aea496e0-1.1 {LINQ non-rowid primary key support} -body {
-  #
-  # NOTE: Re-copy the reference database file used for this unit test to the
-  #       build directory in case it has been changed by a previous test run.
-  #
-  file copy -force $northwindEfDbFile \
-      [file join [getBuildDirectory] [file tail $northwindEfDbFile]]
-
-  set result [list]
-  set output ""
-
-  set code [catch {
-    testClrExec $testLinqExeFile [list -eventflags Wait -directory \
-        [file dirname $testLinqExeFile] -nocarriagereturns -stdout output \
-        -success 0] -complexprimarykey
-  } error]
-
-  tlog "---- BEGIN STDOUT OUTPUT\n"
-  tlog $output
-  tlog "\n---- END STDOUT OUTPUT\n"
-
-  lappend result $code
-
-  if {$code == 0} then {
-    lappend result [string trim $output]
-  } else {
-    lappend result [string trim $error]
-  }
-
-  set result
-} -cleanup {
-  unset -nocomplain code output error result
-} -constraints {eagle monoToDo SQLite file_System.Data.SQLite.dll testExec\
-file_System.Data.SQLite.Linq.dll file_testlinq.exe file_northwindEF.db} \
--result {0 {inserted 2
-updated 2}}}
-
-###############################################################################
-
-runSQLiteTestFilesEpilogue
-runSQLiteTestEpilogue
-runTestEpilogue

Index: Tests/tkt-47c6fa04d3.eagle
==================================================================
--- Tests/tkt-47c6fa04d3.eagle
+++ Tests/tkt-47c6fa04d3.eagle
@@ -115,11 +115,11 @@
       } result] : [set result ""]}] $result [getRowsFromDataTable $result]
 } -cleanup {
   cleanupDb $fileName
 
   unset -nocomplain result results errors code sql dataSource id db fileName
-} -constraints {eagle command.object monoBug40 command.sql compile.DATA SQLite\
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
 System.Data.SQLite compileCSharp} -match regexp -result {^Ok\
 System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 System#Data#DataTable#\d+\
 \{\{\{id 2\} \{min 2\} \{max 3\} \{sum 5\}\} \{\{id 2\} \{min 1\} \{max 2\}\
 \{sum 3\}\}\}$}}
 

Index: Tests/tkt-4a791e70ab.eagle
==================================================================
--- Tests/tkt-4a791e70ab.eagle
+++ Tests/tkt-4a791e70ab.eagle
@@ -69,11 +69,11 @@
       } result] : [set result ""]}] $result
 } -cleanup {
   cleanupDb $fileName
 
   unset -nocomplain result results errors code dataSource id db fileName
-} -constraints {eagle command.object monoBug40 command.sql compile.DATA SQLite\
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
 System.Data.SQLite compileCSharp} -match regexp -result {^Ok\
 System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\}$}}
 
 ###############################################################################
 

Index: Tests/tkt-56b42d99c1.eagle
==================================================================
--- Tests/tkt-56b42d99c1.eagle
+++ Tests/tkt-56b42d99c1.eagle
@@ -97,11 +97,11 @@
       } result] : [set result ""]}] $result
 } -cleanup {
   cleanupDb $fileName
 
   unset -nocomplain result results errors code dataSource id db fileName
-} -constraints {eagle command.object monoBug40 command.sql compile.DATA SQLite\
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
 System.Data.SQLite compileCSharp} -match regexp -result {^Ok\
 System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 True$}}
 
 ###############################################################################
 
@@ -174,11 +174,11 @@
       } result] : [set result ""]}] $result
 } -cleanup {
   cleanupDb $fileName
 
   unset -nocomplain result results errors code sql dataSource id db fileName
-} -constraints {eagle command.object monoBug40 command.sql compile.DATA SQLite\
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
 System.Data.SQLite compileCSharp} -match regexp -result {^Ok\
 System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 0$}}
 
 ###############################################################################
 
@@ -405,11 +405,11 @@
       } result] : [set result ""]}] $result
 } -cleanup {
   cleanupDb $fileName
 
   unset -nocomplain result results errors code sql dataSource id db fileName
-} -constraints {eagle command.object monoBug40 command.sql compile.DATA SQLite\
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
 System.Data.SQLite compileCSharp} -match regexp -result {^Ok\
 System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 1$}}
 
 ###############################################################################
 

Index: Tests/tkt-964063da16.eagle
==================================================================
--- Tests/tkt-964063da16.eagle
+++ Tests/tkt-964063da16.eagle
@@ -27,12 +27,12 @@
 
   $connection Open
   $connection Flags
 } -cleanup {
   unset -nocomplain connection
-} -constraints {eagle command.object SQLite System.Data.SQLite} -match regexp \
--result {^Default|LogCallbackException$}}
+} -constraints {eagle command.object SQLite System.Data.SQLite} -result \
+{Default}}
 
 ###############################################################################
 
 runTest {test tkt-964063da16-1.2 {pre-existing connection flags} -body {
   set connection [object create -alias \
@@ -55,13 +55,12 @@
 
   $connection Flags NoExtensionFunctions; $connection Open
   $connection Flags
 } -cleanup {
   unset -nocomplain connection
-} -constraints {eagle command.object SQLite System.Data.SQLite} -match regexp \
--result {^Default, NoExtensionFunctions|NoExtensionFunctions,\
-Default|LogCallbackException, NoExtensionFunctions$}}
+} -constraints {eagle command.object SQLite System.Data.SQLite} -result \
+{NoExtensionFunctions, Default}}
 
 ###############################################################################
 
 runTest {test tkt-964063da16-1.4 {pre-existing connection flags} -body {
   set connection [object create -alias \

Index: Tests/tkt-aba4549801.eagle
==================================================================
--- Tests/tkt-aba4549801.eagle
+++ Tests/tkt-aba4549801.eagle
@@ -64,11 +64,11 @@
 System.Data.SQLite} -match regexp -result \
 {^\{System#Data#SQLite#SQLiteConnection#\d+ Opening \{\} \{\} \{\} \{\}\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ Closing \{\} \{\} \{\} \{\}\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ Closed \{\} \{\} \{\} \{\}\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ ConnectionString \{\} \{\} \{\}\
-\{\}\} \{\{\} NewCriticalHandle \{\} \{\} \{\}\
+\{\}\} \{System#Object#\d+ NewCriticalHandle \{\} \{\} \{\}\
 System#Data#SQLite#SQLiteConnectionHandle#\d+\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ NewCommand \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ \{\} \{\}\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ DisposingCommand \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ \{\} \{\}\}\
@@ -75,11 +75,11 @@
 \{System#Data#SQLite#SQLiteConnection#\d+ Opened \{\} \{\} \{\} \{\}\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ NewCommand \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ \{\} \{\}\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ NewDataReader \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ System#Data#SQLite#SQLiteDataReader#\d+\
-\{\}\} \{\{\} NewCriticalHandle \{\} \{\} \{\}\
+\{\}\} \{System#Object#\d+ NewCriticalHandle \{\} \{\} \{\}\
 System#Data#SQLite#SQLiteStatementHandle#\d+\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ DisposingDataReader \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ System#Data#SQLite#SQLiteDataReader#\d+\
 \{\}\} \{System#Data#SQLite#SQLiteConnection#\d+ ClosingDataReader \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ System#Data#SQLite#SQLiteDataReader#\d+\
@@ -87,11 +87,11 @@
 System#Data#SQLite#SQLiteCommand#\d+ \{\} \{\}\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ NewCommand \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ \{\} \{\}\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ NewDataReader \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ System#Data#SQLite#SQLiteDataReader#\d+\
-\{\}\} \{\{\} NewCriticalHandle \{\} \{\} \{\}\
+\{\}\} \{System#Object#\d+ NewCriticalHandle \{\} \{\} \{\}\
 System#Data#SQLite#SQLiteStatementHandle#\d+\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ DisposingDataReader \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ System#Data#SQLite#SQLiteDataReader#\d+\
 \{\}\} \{System#Data#SQLite#SQLiteConnection#\d+ ClosingDataReader \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ System#Data#SQLite#SQLiteDataReader#\d+\
@@ -99,11 +99,11 @@
 System#Data#SQLite#SQLiteCommand#\d+ \{\} \{\}\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ NewCommand \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ \{\} \{\}\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ NewDataReader \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ System#Data#SQLite#SQLiteDataReader#\d+\
-\{\}\} \{\{\} NewCriticalHandle \{\} \{\} \{\}\
+\{\}\} \{System#Object#\d+ NewCriticalHandle \{\} \{\} \{\}\
 System#Data#SQLite#SQLiteStatementHandle#\d+\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ DisposingDataReader \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ System#Data#SQLite#SQLiteDataReader#\d+\
 \{\}\} \{System#Data#SQLite#SQLiteConnection#\d+ ClosingDataReader \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ System#Data#SQLite#SQLiteDataReader#\d+\
@@ -113,22 +113,22 @@
 System#Data#SQLite#SQLiteTransaction#\d+ \{\} \{\} \{\}\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ NewCommand \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ \{\} \{\}\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ NewDataReader \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ System#Data#SQLite#SQLiteDataReader#\d+\
-\{\}\} \{\{\} NewCriticalHandle \{\} \{\} \{\}\
-System#Data#SQLite#SQLiteStatementHandle#\d+\} \{\{\} NewCriticalHandle \{\}\
-\{\} \{\} System#Data#SQLite#SQLiteStatementHandle#\d+\}\
+\{\}\} \{System#Object#\d+ NewCriticalHandle \{\} \{\} \{\}\
+System#Data#SQLite#SQLiteStatementHandle#\d+\} \{System#Object#\d+\
+NewCriticalHandle \{\} \{\} \{\} System#Data#SQLite#SQLiteStatementHandle#\d+\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ ClosingDataReader \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ System#Data#SQLite#SQLiteDataReader#\d+\
 \{\}\} \{System#Data#SQLite#SQLiteConnection#\d+ DisposingCommand \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ \{\} \{\}\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ NewCommand \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ \{\} \{\}\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ NewDataReader \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ System#Data#SQLite#SQLiteDataReader#\d+\
-\{\}\} \{\{\} NewCriticalHandle \{\} \{\} \{\}\
+\{\}\} \{System#Object#\d+ NewCriticalHandle \{\} \{\} \{\}\
 System#Data#SQLite#SQLiteStatementHandle#\d+\}\
 \{System#Data#SQLite#SQLiteConnection#\d+ DisposingDataReader \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ System#Data#SQLite#SQLiteDataReader#\d+\
 \{\}\} \{System#Data#SQLite#SQLiteConnection#\d+ ClosingDataReader \{\}\
 System#Data#SQLite#SQLiteCommand#\d+ System#Data#SQLite#SQLiteDataReader#\d+\

Index: Tests/tkt-ac47dd230a.eagle
==================================================================
--- Tests/tkt-ac47dd230a.eagle
+++ Tests/tkt-ac47dd230a.eagle
@@ -25,12 +25,11 @@
     set appDomain($i) [object invoke AppDomain CreateDomain \
         [appendArgs tkt-ac47dd230a-1.1. $i]]
 
     set result null
     set interpreterHelper($i) [object invoke -alias InterpreterHelper \
-        Create $appDomain($i) null Default Default Default null null null \
-        result]
+        Create $appDomain($i) null Default Default null null null result]
 
     if {[string length $interpreterHelper($i)] == 0} then {
       error [object invoke $result ToString]
     }
 

Index: Tests/tkt-e06c4caff3.eagle
==================================================================
--- Tests/tkt-e06c4caff3.eagle
+++ Tests/tkt-e06c4caff3.eagle
@@ -29,11 +29,11 @@
       [list param1 Double [set NaN [object invoke Double NaN]]]
 } -cleanup {
   cleanupDb $fileName
 
   unset -nocomplain NaN db fileName
-} -constraints {eagle command.object monoBug40 command.sql compile.DATA SQLite\
+} -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\
 System.Data.SQLite} -returnCodes 1 -match regexp -result [string map [list \n\
 \r\n] {^System\.Data\.SQLite\.SQLiteException \(0x80004005\): constraint failed
 NOT NULL constraint failed: t1\.x
 .*$}]}
 

Index: Tests/tkt-f8dbab8baf.eagle
==================================================================
--- Tests/tkt-f8dbab8baf.eagle
+++ Tests/tkt-f8dbab8baf.eagle
@@ -129,11 +129,11 @@
 } -cleanup {
   cleanupDb $fileName
 
   unset -nocomplain rows db fileName
 } -constraints \
-{eagle monoBug40 command.sql compile.DATA SQLite System.Data.SQLite} \
+{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} \
 -returnCodes 1 -match regexp -result [string map [list \n \r\n] \
 {^System\.Data\.SQLite\.SQLiteException \(0x80004005\): SQL logic error or\
 missing database
 no such table: t1.*$}]}
 

Index: data/exclude_bin.txt
==================================================================
--- data/exclude_bin.txt
+++ data/exclude_bin.txt
@@ -8,6 +8,5 @@
 *32.exe
 *32.exe.config
 *EntityFramework.*
 *EnvDTE.*
 *Microsoft.*
-*stdole.*

Index: lib/System.Data.SQLite/common.eagle
==================================================================
--- lib/System.Data.SQLite/common.eagle
+++ lib/System.Data.SQLite/common.eagle
@@ -511,15 +511,10 @@
       #
       if {$native} then {
         return true
       }
 
-      #
-      # NOTE: What is the architecture for this machine?
-      #
-      set architecture [machineToPlatform $::tcl_platform(machine) true]
-
       #
       # NOTE: What is the platform for this machine?
       #
       set platform [machineToPlatform $::tcl_platform(machine)]
 
@@ -526,17 +521,10 @@
       #
       # NOTE: Build the fully qualified file name for the interop assembly
       #       containing the System.Data.SQLite native components.  If this
       #       file exists, we should have everything we need.
       #
-      set fileName [file nativename [file join $directory \
-          $architecture SQLite.Interop.dll]]
-
-      if {[file exists $fileName]} then {
-        return true
-      }
-
       set fileName [file nativename [file join $directory \
           $platform SQLite.Interop.dll]]
 
       if {[file exists $fileName]} then {
         return true
@@ -552,17 +540,10 @@
       #
       # NOTE: Build the fully qualified file name for the SQLite core
       #       library.  If this file exists, we should have everything we
       #       need.
       #
-      set fileName [file nativename [file join $directory \
-          $architecture sqlite3.dll]]
-
-      if {[file exists $fileName]} then {
-        return true
-      }
-
       set fileName [file nativename [file join $directory \
           $platform sqlite3.dll]]
 
       if {[file exists $fileName]} then {
         return true
@@ -1218,11 +1199,11 @@
       return [expr {
         [haveConstraint System.Data.SQLite] && [haveConstraint SQLite]
       }]
     }
 
-    proc matchPlatform { platform } {
+    proc matchMachine { platform } {
       #
       # NOTE: An empty string for the platform means that the build is not
       #       [primarily] a native build; therefore, it always matches.
       #
       if {[string length $platform] == 0} then {
@@ -1346,11 +1327,11 @@
               #
               # NOTE: When in "select" mode, automatically select the first
               #       available build of System.Data.SQLite and then return
               #       immediately.
               #
-              if {$select && [matchPlatform $platform]} then {
+              if {$select && [matchMachine $platform]} then {
                 #
                 # NOTE: Manually override all the build directory selection
                 #       related test settings in order to force this build
                 #       of System.Data.SQLite to be used.
                 #
@@ -1407,11 +1388,11 @@
         if {[isReleaseAvailable $directory platform]} then {
           if {[string length $platform] == 0} then {
             set platform unknown
           }
 
-          if {$select && [matchPlatform $platform]} then {
+          if {$select && [matchMachine $platform]} then {
             set ::build_directory $directory
 
             tputs $channel [appendArgs "yes, selected (" $platform ")\n"]
 
             return true
@@ -1430,11 +1411,11 @@
               if {[isReleaseAvailable $path platform]} then {
                 if {[string length $platform] == 0} then {
                   set platform unknown
                 }
 
-                if {$select && [matchPlatform $platform]} then {
+                if {$select && [matchMachine $platform]} then {
                   set ::build_directory $path
 
                   tputs $channel [appendArgs "yes, selected (" $platform ")\n"]
 
                   return true
@@ -1540,25 +1521,15 @@
         if {[string length $sourceId] == 0} then {
           set sourceId null
         }
 
         #
-        # NOTE: Before actually adding the test constraint, make sure the
-        #       version is valid (i.e. not just that we could query it).
-        #
-        if {$version ne "null"} then {
-          #
-          # NOTE: Yes, the SQLite interop assembly appears to be available.
-          #
-          addConstraint SQLiteInterop
-
-          set answer yes
-        } else {
-          set answer no
-        }
-
-        tputs $channel [appendArgs $answer " (" $version " " $sourceId ")\n"]
+        # NOTE: Yes, the SQLite interop assembly appears to be available.
+        #
+        addConstraint SQLiteInterop
+
+        tputs $channel [appendArgs "yes (" $version " " $sourceId ")\n"]
       } else {
         tputs $channel no\n
       }
     }
 

Index: readme.htm
==================================================================
--- readme.htm
+++ readme.htm
@@ -3,11 +3,11 @@
 <head>
 <title></title>
 </head>
 <body>
 ADO.NET SQLite Data Provider<br />
-Version 1.0.98.0 - August 18, 2015<br />
+Version 1.0.98.0 - August XX, 2015 <font color="red">(release scheduled)</font><br />
 Using <a href="https://www.sqlite.org/releaselog/3_8_11_1.html">SQLite 3.8.11.1</a><br />
 Originally written by Robert Simpson<br />
 Released to the public domain, use at your own risk!<br />
 Official provider website:&nbsp;<a href="https://system.data.sqlite.org/">https://system.data.sqlite.org/</a><br />
 Legacy versions:&nbsp;<a href="http://sqlite.phxsoftware.com/">http://sqlite.phxsoftware.com/</a><br />
@@ -207,22 +207,19 @@
 </p>
 
 <h2><b>Version History</b></h2>
 
 <p>
-    <b>1.0.98.0 - August 18, 2015</b>
+    <b>1.0.98.0 - August XX, 2015 <font color="red">(release scheduled)</font></b>
 </p>
 <ul>
     <li>Updated to <a href="https://www.sqlite.org/releaselog/3_8_11_1.html">SQLite 3.8.11.1</a>.</li>
     <li>Add full support for Visual Studio 2015 and the .NET Framework 4.6.</li>
-    <li>Add support for creating custom SQL functions using delegates.</li>
     <li>Implement the Substring method for LINQ using the &quot;substr&quot; core SQL function.&nbsp;<b>** Potentially Incompatible Change **</b></li>
-    <li>Prevent encrypted connections from being used with the connection pool. Pursuant to [89d3a159f1].&nbsp;<b>** Potentially Incompatible Change **</b></li>
     <li>Honor the second argument to Math.Round when using LINQ.&nbsp;<b>** Potentially Incompatible Change **</b></li>
     <li>Honor the pre-existing flags for connections during the Open method. Fix for [964063da16].&nbsp;<b>** Potentially Incompatible Change **</b></li>
     <li>Remove errant semi-colons from the SQL used by LINQ to INSERT and then SELECT rows with composite primary keys. Fix for [9d353b0bd8].</li>
-    <li>Refactor INSERT/UPDATE handling (in the LINQ assembly) so it can handle composite and non-integer primary keys. Fix for [41aea496e0].</li>
     <li>Change the base type for the SQLiteConnectionFlags enumeration to long integer.&nbsp;<b>** Potentially Incompatible Change **</b></li>
     <li>Add extended return codes to the SQLiteErrorCode enumeration. Pursuant to [71bedaca19].&nbsp;<b>** Potentially Incompatible Change **</b></li>
     <li>Improve exception handling in all native callbacks implemented in the SQLiteConnection class.</li>
     <li>Add Progress event and ProgressOps connection string property to enable raising progress events during long-running queries.</li>
     <li>Add &quot;Recursive Triggers&quot; connection string property to enable or disable the recursive trigger capability. Pursuant to [3a82ee635b].</li>

Index: test/TestCases.cs
==================================================================
--- test/TestCases.cs
+++ test/TestCases.cs
@@ -21,11 +21,11 @@
     private const int ThreadTimeout = 60000;
 
     private List<string> droptables = new List<string>();
     private List<string> maydroptable = new List<string>();
 
-#if !USE_INTEROP_DLL || !INTEROP_LOG
+#if !INTEROP_LOG
     private long logevents = 0;
 #endif
 
     internal TestCases()
     {
@@ -1638,11 +1638,11 @@
 
         cnn.Close();
       }
     }
 
-#if !USE_INTEROP_DLL || !INTEROP_LOG
+#if !INTEROP_LOG
     //Logging EventHandler
     public void OnLogEvent(object sender, LogEventArgs logEvent)
     {
         object errorCode = logEvent.ErrorCode;
         string err_msg = logEvent.Message;

Index: testce/TestCases.cs
==================================================================
--- testce/TestCases.cs
+++ testce/TestCases.cs
@@ -290,15 +290,13 @@
 
       total++;
       try { Int64Properties(cnn); frm.WriteLine("SUCCESS - Int64Properties"); passed++; }
       catch (Exception) { frm.WriteLine("FAIL - Int64Properties"); failed++; }
 
-#if INTEROP_VIRTUAL_TABLE
       total++;
       try { ManagedVirtualTable(cnn); frm.WriteLine("SUCCESS - ManagedVirtualTable"); passed++; }
       catch (Exception) { frm.WriteLine("FAIL - ManagedVirtualTable"); failed++; }
-#endif
 
       total++;
       try { MultipleThreadStress(cnn); frm.WriteLine("SUCCESS - MultipleThreadStress"); passed++; }
       catch (Exception) { frm.WriteLine("FAIL - MultipleThreadStress"); failed++; }
 
@@ -1039,11 +1037,10 @@
         }
 
         throw new NotSupportedException("not a SQLite connection");
     }
 
-#if INTEROP_VIRTUAL_TABLE
     // Make sure that managed virtual table support works on the .NET Compact Framework.
     internal void ManagedVirtualTable(DbConnection cnn)
     {
         SQLiteConnection cnn2 = cnn as SQLiteConnection;
 
@@ -1100,11 +1097,10 @@
             return;
         }
 
         throw new NotSupportedException("not a SQLite connection");
     }
-#endif
 
     private int nextId = 0;
     private const int MAX_THREADS = 3;
     private const int MAX_ITERATIONS = 100;
     private ManualResetEvent goEvent = new ManualResetEvent(false);

Index: testce/testce.2005.csproj
==================================================================
--- testce/testce.2005.csproj
+++ testce/testce.2005.csproj
@@ -103,11 +103,10 @@
     <ProjectReference Include="..\System.Data.SQLite\System.Data.SQLite.Compact.2005.csproj">
       <Project>{AC139951-261A-4463-B6FA-AEBC25283A66}</Project>
       <Name>System.Data.SQLite.Compact.2005</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(SQLiteNetDir)\System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets" />
   <Import Condition="'$(TargetFrameworkVersion)' == 'v1.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.v1.targets" />
   <Import Condition="'$(TargetFrameworkVersion)' == 'v2.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>

Index: testce/testce.2008.csproj
==================================================================
--- testce/testce.2008.csproj
+++ testce/testce.2008.csproj
@@ -104,11 +104,10 @@
     <ProjectReference Include="..\System.Data.SQLite\System.Data.SQLite.Compact.2008.csproj">
       <Project>{AC139951-261A-4463-B6FA-AEBC25283A66}</Project>
       <Name>System.Data.SQLite.Compact.2008</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(SQLiteNetDir)\System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets" />
   <Import Condition="'$(TargetFrameworkVersion)' == 'v1.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.v1.targets" />
   <Import Condition="'$(TargetFrameworkVersion)' == 'v2.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>

Index: testce/testce.2012.csproj
==================================================================
--- testce/testce.2012.csproj
+++ testce/testce.2012.csproj
@@ -88,11 +88,10 @@
     <ProjectReference Include="..\System.Data.SQLite\System.Data.SQLite.Compact.2012.csproj">
       <Project>{AC139951-261A-4463-B6FA-AEBC25283A66}</Project>
       <Name>System.Data.SQLite.Compact.2012</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(SQLiteNetDir)\System.Data.SQLite\Targets\System.Data.SQLite.Properties.targets" />
   <Import Condition="'$(TargetFrameworkVersion)' == 'v1.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.v1.targets" />
   <Import Condition="'$(TargetFrameworkVersion)' == 'v2.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\v8.0\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
   <ProjectExtensions>

Index: testlinq/Program.cs
==================================================================
--- testlinq/Program.cs
+++ testlinq/Program.cs
@@ -4,12 +4,10 @@
  *
  * Released to the public domain, use at your own risk!
  ********************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Data;
 using System.Data.Common;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -94,16 +92,14 @@
                   }
               case "substring":
                   {
                       return SubStringTest();
                   }
-#if USE_INTEROP_DLL && INTEROP_EXTENSION_FUNCTIONS
               case "unionall":
                   {
                       return UnionAllTest();
                   }
-#endif
               case "endswith":
                   {
                       string value = null;
 
                       if (args.Length > 1)
@@ -198,14 +194,10 @@
               case "round":
                   {
                       return RoundTest();
                   }
 #endif
-              case "complexprimarykey":
-                  {
-                      return ComplexPrimaryKeyTest();
-                  }
               default:
                   {
                       Console.WriteLine("unknown test \"{0}\"", arg);
                       return 1;
                   }
@@ -374,11 +366,10 @@
           }
 
           return 0;
       }
 
-#if USE_INTEROP_DLL && INTEROP_EXTENSION_FUNCTIONS
       //
       // NOTE: Used to test the fix for ticket [0a32885109].
       //
       private static int UnionAllTest()
       {
@@ -445,11 +436,10 @@
               }
           }
 
           return 0;
       }
-#endif
 
       //
       // NOTE: Used to test the fix for ticket [ccfa69fc32].
       //
       private static int EFTransactionTest(bool add)
@@ -567,14 +557,16 @@
       //       the SQL statement after the actual INSERT statement in
       //       the follow-up SELECT statement).
       //
       private static int InsertTest()
       {
+          long[] orderIds = new long[] {
+              0
+          };
+
           using (northwindEFEntities db = new northwindEFEntities())
           {
-              long orderId = 10248;
-              long productId = 1;
               int[] counts = { 0 };
 
               //
               // NOTE: *REQUIRED* This is required so that the
               //       Entity Framework is prevented from opening
@@ -583,34 +575,18 @@
               //       IMMEDIATE transactions, thereby failing [later
               //       on] with locking errors).
               //
               db.Connection.Open();
 
-              KeyValuePair<string, object> orderIdPair =
-                  new KeyValuePair<string, object>("OrderID", orderId);
-
-              KeyValuePair<string, object> productIdPair =
-                  new KeyValuePair<string, object>("ProductID", productId);
-
-              /////////////////////////////////////////////////////////////////
-
               OrderDetails newOrderDetails = new OrderDetails();
 
-              newOrderDetails.OrderID = orderId;
-              newOrderDetails.ProductID = productId;
+              newOrderDetails.OrderID = 10248;
+              newOrderDetails.ProductID = 1;
               newOrderDetails.UnitPrice = (decimal)1.23;
               newOrderDetails.Quantity = 1;
               newOrderDetails.Discount = 0.0f;
 
-              newOrderDetails.OrdersReference.EntityKey = new EntityKey(
-                  "northwindEFEntities.Orders",
-                  new KeyValuePair<string, object>[] { orderIdPair });
-
-              newOrderDetails.ProductsReference.EntityKey = new EntityKey(
-                  "northwindEFEntities.Products",
-                  new KeyValuePair<string, object>[] { productIdPair });
-
               db.AddObject("OrderDetails", newOrderDetails);
 
               try
               {
                   db.SaveChanges();
@@ -773,116 +749,10 @@
 
           return 0;
       }
 #endif
 
-      private static int ComplexPrimaryKeyTest()
-      {
-          using (northwindEFEntities db = new northwindEFEntities())
-          {
-              long orderId = 10248;
-              long productId = 1;
-              int[] counts = { 0, 0 };
-
-              //
-              // NOTE: *REQUIRED* This is required so that the
-              //       Entity Framework is prevented from opening
-              //       multiple connections to the underlying SQLite
-              //       database (i.e. which would result in multiple
-              //       IMMEDIATE transactions, thereby failing [later
-              //       on] with locking errors).
-              //
-              db.Connection.Open();
-
-              KeyValuePair<string, object> orderIdPair =
-                  new KeyValuePair<string, object>("OrderID", orderId);
-
-              KeyValuePair<string, object> productIdPair =
-                  new KeyValuePair<string, object>("ProductID", productId);
-
-              /////////////////////////////////////////////////////////////////
-
-              OrderDetails newOrderDetails = new OrderDetails();
-
-              newOrderDetails.OrderID = orderId;
-              newOrderDetails.ProductID = productId;
-              newOrderDetails.UnitPrice = (decimal)1.23;
-              newOrderDetails.Quantity = 1;
-              newOrderDetails.Discount = 0.0f;
-
-              newOrderDetails.OrdersReference.EntityKey = new EntityKey(
-                  "northwindEFEntities.Orders",
-                  new KeyValuePair<string, object>[] { orderIdPair });
-
-              newOrderDetails.ProductsReference.EntityKey = new EntityKey(
-                  "northwindEFEntities.Products",
-                  new KeyValuePair<string, object>[] { productIdPair });
-
-              db.AddObject("OrderDetails", newOrderDetails);
-
-              try
-              {
-                  db.SaveChanges();
-                  counts[0]++;
-              }
-              catch (Exception e)
-              {
-                  Console.WriteLine(e);
-              }
-              finally
-              {
-                  db.AcceptAllChanges();
-              }
-
-              try
-              {
-                  db.Refresh(RefreshMode.StoreWins, newOrderDetails);
-                  counts[0]++;
-              }
-              catch (Exception e)
-              {
-                  Console.WriteLine(e);
-              }
-
-              Console.WriteLine("inserted {0}", counts[0]);
-
-              /////////////////////////////////////////////////////////////////
-
-              newOrderDetails.UnitPrice = (decimal)2.34;
-              newOrderDetails.Quantity = 2;
-              newOrderDetails.Discount = 0.1f;
-
-              try
-              {
-                  db.SaveChanges();
-                  counts[1]++;
-              }
-              catch (Exception e)
-              {
-                  Console.WriteLine(e);
-              }
-              finally
-              {
-                  db.AcceptAllChanges();
-              }
-
-              try
-              {
-                  db.Refresh(RefreshMode.StoreWins, newOrderDetails);
-                  counts[1]++;
-              }
-              catch (Exception e)
-              {
-                  Console.WriteLine(e);
-              }
-
-              Console.WriteLine("updated {0}", counts[1]);
-          }
-
-          return 0;
-      }
-
       private static int DateTimeTest()
       {
           using (northwindEFEntities db = new northwindEFEntities())
           {
               DateTime dateTime = new DateTime(1997, 1, 1, 0, 0, 0, DateTimeKind.Local);

Index: www/build.wiki
==================================================================
--- www/build.wiki
+++ www/build.wiki
@@ -395,15 +395,27 @@
 
     <li>Open a normal command prompt window with &quot;cmd.exe&quot;.</li>
 
     <li>Change the current directory to &quot;&lt;root&gt;\Setup&quot;.</li>
 
+    <li>
+      Enter the following command to set the environment variable used to pass
+      the necessary extra arguments to MSBuild:
+      <br />
+      <br />
+      <b>SET&nbsp;MSBUILD_ARGS=/property:UseInteropDll=false&nbsp;/property:UseSqliteStandard=true</b>
+      <br />
+      <br />
+    </li>
+
     <li>
       Enter the following command to build the managed-only binaries for Mono:
       <br />
       <br />
-      <b>build_mono.bat</b>
+      <b>SET NOUSER=1</b>
+      <br />
+      <b>build.bat&nbsp;ReleaseManagedOnly</b>
       <br />
       <br />
     </li>
 
     <li>

Index: www/downloads.wiki
==================================================================
--- www/downloads.wiki
+++ www/downloads.wiki
@@ -441,20 +441,20 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx-source"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx-source-1.0.98.0.zip">sqlite-netFx-source-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx-source-1.0.97.0.zip">sqlite-netFx-source-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (5.16 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This ZIP archive contains all current source code for System.Data.SQLite
-        1.0.98.0 (3.8.11.1) combined into a single archive file.
+        1.0.97.0 (3.8.10.2) combined into a single archive file.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: a2b071b74a9b8aa4530340e4654e82d17d4aa681)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -464,19 +464,19 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx20-setup-bundle-x86-2005"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx20-setup-bundle-x86-2005-1.0.98.0.exe">sqlite-netFx20-setup-bundle-x86-2005-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx20-setup-bundle-x86-2005-1.0.97.0.exe">sqlite-netFx20-setup-bundle-x86-2005-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (5.10 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package features the mixed-mode assembly and will install all
         the necessary runtime components and dependencies for the x86 version of
-        the System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2005
+        the System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2005
         SP1 runtime for x86 is included.  The .NET Framework 2.0 SP2 is
         required.
         <br />
         <big><b>This is the only setup package that is capable of installing the
         design-time components for Visual Studio 2005.
@@ -485,30 +485,30 @@
         However, if you do not require the design-time components, please
         consider downloading the associated &quot;Precompiled Binaries&quot;
         instead.</b></big>
         <br />
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: daa0f42621b93769755fb7a6546eddd3d56b8e72)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx20-setup-x86-2005"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx20-setup-x86-2005-1.0.98.0.exe">sqlite-netFx20-setup-x86-2005-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx20-setup-x86-2005-1.0.97.0.exe">sqlite-netFx20-setup-x86-2005-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (5.09 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package will install all the necessary runtime components and
-        dependencies for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2005 SP1 runtime for x86 is included.
+        dependencies for the x86 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2005 SP1 runtime for x86 is included.
         The .NET Framework 2.0 SP2 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 7e9b562ffedefb316fdff45e18a0817fb47f8e84)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -518,42 +518,42 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx20-setup-bundle-x64-2005"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx20-setup-bundle-x64-2005-1.0.98.0.exe">sqlite-netFx20-setup-bundle-x64-2005-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx20-setup-bundle-x64-2005-1.0.97.0.exe">sqlite-netFx20-setup-bundle-x64-2005-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (5.69 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package features the mixed-mode assembly and will install all
         the necessary runtime components and dependencies for the x64 version of
-        the System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2005
+        the System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2005
         SP1 runtime for x64 is included.  The .NET Framework 2.0 SP2 is
         required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: fb3dfb4c0295c9a6939c392cf9381fefbeebfe7b)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx20-setup-x64-2005"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx20-setup-x64-2005-1.0.98.0.exe">sqlite-netFx20-setup-x64-2005-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx20-setup-x64-2005-1.0.97.0.exe">sqlite-netFx20-setup-x64-2005-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (5.69 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package will install all the necessary runtime components and
-        dependencies for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2005 SP1 runtime for x64 is included.
+        dependencies for the x64 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2005 SP1 runtime for x64 is included.
         The .NET Framework 2.0 SP2 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 59195a366b7546c4a37a65475f8fa2d11c7ff517)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -563,19 +563,19 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx35-setup-bundle-x86-2008"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx35-setup-bundle-x86-2008-1.0.98.0.exe">sqlite-netFx35-setup-bundle-x86-2008-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx35-setup-bundle-x86-2008-1.0.97.0.exe">sqlite-netFx35-setup-bundle-x86-2008-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (7.14 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package features the mixed-mode assembly and will install all
         the necessary runtime components and dependencies for the x86 version of
-        the System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2008
+        the System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2008
         SP1 runtime for x86 is included.  The .NET Framework 3.5 SP1 is
         required.
         <br />
         <big><b>This is the only setup package that is capable of installing the
         design-time components for Visual Studio 2008.
@@ -584,30 +584,30 @@
         However, if you do not require the design-time components, please
         consider downloading the associated &quot;Precompiled Binaries&quot;
         instead.</b></big>
         <br />
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 03d86dba982e89dadfd19fc9bce775dcab040632)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx35-setup-x86-2008"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx35-setup-x86-2008-1.0.98.0.exe">sqlite-netFx35-setup-x86-2008-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx35-setup-x86-2008-1.0.97.0.exe">sqlite-netFx35-setup-x86-2008-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (7.13 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package will install all the necessary runtime components and
-        dependencies for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2008 SP1 runtime for x86 is included.
+        dependencies for the x86 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2008 SP1 runtime for x86 is included.
         The .NET Framework 3.5 SP1 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: b2a7403c7cbe50482972a05ec953f7414ae0ceb1)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -617,42 +617,42 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx35-setup-bundle-x64-2008"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx35-setup-bundle-x64-2008-1.0.98.0.exe">sqlite-netFx35-setup-bundle-x64-2008-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx35-setup-bundle-x64-2008-1.0.97.0.exe">sqlite-netFx35-setup-bundle-x64-2008-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (7.88 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package features the mixed-mode assembly and will install all
         the necessary runtime components and dependencies for the x64 version of
-        the System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2008
+        the System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2008
         SP1 runtime for x64 is included.  The .NET Framework 3.5 SP1 is
         required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: a3a72d1368876f23f033968ff382d9907b8ca8f0)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx35-setup-x64-2008"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx35-setup-x64-2008-1.0.98.0.exe">sqlite-netFx35-setup-x64-2008-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx35-setup-x64-2008-1.0.97.0.exe">sqlite-netFx35-setup-x64-2008-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (7.87 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package will install all the necessary runtime components and
-        dependencies for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2008 SP1 runtime for x64 is included.
+        dependencies for the x64 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2008 SP1 runtime for x64 is included.
         The .NET Framework 3.5 SP1 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 041f8018ef021b9515bd7c58b9615f235ffb66cb)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -662,19 +662,19 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx40-setup-bundle-x86-2010"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx40-setup-bundle-x86-2010-1.0.98.0.exe">sqlite-netFx40-setup-bundle-x86-2010-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx40-setup-bundle-x86-2010-1.0.97.0.exe">sqlite-netFx40-setup-bundle-x86-2010-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (12.71 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package features the mixed-mode assembly and will install all
         the necessary runtime components and dependencies for the x86 version of
-        the System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2010
+        the System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2010
         SP1 runtime for x86 is included.  The .NET Framework 4.0 is required.
         <br />
         <big><b>This is the only setup package that is capable of installing the
         design-time components for Visual Studio 2010.
         <br />
@@ -682,30 +682,30 @@
         However, if you do not require the design-time components, please
         consider downloading the associated &quot;Precompiled Binaries&quot;
         instead.</b></big>
         <br />
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 182ae1db5c4747a4d24a8498a0c8ab14dfea3a55)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx40-setup-x86-2010"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx40-setup-x86-2010-1.0.98.0.exe">sqlite-netFx40-setup-x86-2010-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx40-setup-x86-2010-1.0.97.0.exe">sqlite-netFx40-setup-x86-2010-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (12.70 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package will install all the necessary runtime components and
-        dependencies for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2010 SP1 runtime for x86 is included.
+        dependencies for the x86 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2010 SP1 runtime for x86 is included.
         The .NET Framework 4.0 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 74b67854e77baf3d0a83fe48248b1043ecf47730)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -715,41 +715,41 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx40-setup-bundle-x64-2010"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx40-setup-bundle-x64-2010-1.0.98.0.exe">sqlite-netFx40-setup-bundle-x64-2010-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx40-setup-bundle-x64-2010-1.0.97.0.exe">sqlite-netFx40-setup-bundle-x64-2010-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (13.96 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package features the mixed-mode assembly and will install all
         the necessary runtime components and dependencies for the x64 version of
-        the System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2010
+        the System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2010
         SP1 runtime for x64 is included.  The .NET Framework 4.0 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 950ed58e2d57c7cdf91b238270e900cdfded5b56)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx40-setup-x64-2010"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx40-setup-x64-2010-1.0.98.0.exe">sqlite-netFx40-setup-x64-2010-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx40-setup-x64-2010-1.0.97.0.exe">sqlite-netFx40-setup-x64-2010-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (13.95 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package will install all the necessary runtime components and
-        dependencies for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2010 SP1 runtime for x64 is included.
+        dependencies for the x64 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2010 SP1 runtime for x64 is included.
         The .NET Framework 4.0 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 58355a70f6394919420cea4aaed3399d18362741)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -759,19 +759,19 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx45-setup-bundle-x86-2012"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx45-setup-bundle-x86-2012-1.0.98.0.exe">sqlite-netFx45-setup-bundle-x86-2012-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx45-setup-bundle-x86-2012-1.0.97.0.exe">sqlite-netFx45-setup-bundle-x86-2012-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (10.14 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package features the mixed-mode assembly and will install all
         the necessary runtime components and dependencies for the x86 version of
-        the System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2012
+        the System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2012
         Update 4 runtime for x86 is included.  The .NET Framework 4.5 is
         required.
         <br />
         <big><b>This is the only setup package that is capable of installing the
         design-time components for Visual Studio 2012.
@@ -786,30 +786,30 @@
         installing the Visual Studio 2012 &quot;flavor&quot; of the
         <a href="https://www.microsoft.com/en-us/download/details.aspx?id=40762">
         Entity Framework 6 Tools for Visual Studio 2012 &amp; 2013</a>.</b></big>
         <br />
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: ff9df099dce5e3f0d478e33f587a2866cae9c8ab)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx45-setup-x86-2012"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx45-setup-x86-2012-1.0.98.0.exe">sqlite-netFx45-setup-x86-2012-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx45-setup-x86-2012-1.0.97.0.exe">sqlite-netFx45-setup-x86-2012-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (10.17 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package will install all the necessary runtime components and
-        dependencies for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2012 Update 4 runtime for x86 is
+        dependencies for the x86 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2012 Update 4 runtime for x86 is
         included.  The .NET Framework 4.5 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: be380d4cfee55b375730ca83796ec536d8d7b86e)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -819,42 +819,42 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx45-setup-bundle-x64-2012"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx45-setup-bundle-x64-2012-1.0.98.0.exe">sqlite-netFx45-setup-bundle-x64-2012-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx45-setup-bundle-x64-2012-1.0.97.0.exe">sqlite-netFx45-setup-bundle-x64-2012-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (10.79 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package features the mixed-mode assembly and will install all
         the necessary runtime components and dependencies for the x64 version of
-        the System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2012
+        the System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2012
         Update 4 runtime for x64 is included.  The .NET Framework 4.5 is
         required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: e7297d72638d5b4feaefb61ef600b4f40e226402)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx45-setup-x64-2012"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx45-setup-x64-2012-1.0.98.0.exe">sqlite-netFx45-setup-x64-2012-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx45-setup-x64-2012-1.0.97.0.exe">sqlite-netFx45-setup-x64-2012-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (10.84 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package will install all the necessary runtime components and
-        dependencies for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2012 Update 4 runtime for x64 is
+        dependencies for the x64 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2012 Update 4 runtime for x64 is
         included.  The .NET Framework 4.5 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: edc0c92ed77d50b66ec27bdd38570cee9aaac754)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -864,19 +864,19 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx451-setup-bundle-x86-2013"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx451-setup-bundle-x86-2013-1.0.98.0.exe">sqlite-netFx451-setup-bundle-x86-2013-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx451-setup-bundle-x86-2013-1.0.97.0.exe">sqlite-netFx451-setup-bundle-x86-2013-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (10.09 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package features the mixed-mode assembly and will install all
         the necessary runtime components and dependencies for the x86 version of
-        the System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2013
+        the System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2013
         Update 2 runtime for x86 is included.  The .NET Framework 4.5.1 is
         required.
         <br />
         <big><b>This is the only setup package that is capable of installing the
         design-time components for Visual Studio 2013.
@@ -891,30 +891,30 @@
         installing the Visual Studio 2013 &quot;flavor&quot; of the
         <a href="https://www.microsoft.com/en-us/download/details.aspx?id=40762">
         Entity Framework 6 Tools for Visual Studio 2012 &amp; 2013</a>.</b></big>
         <br />
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 15e31d48589c72d17e2269f72110c7e7a32cb6e3)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx451-setup-x86-2013"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx451-setup-x86-2013-1.0.98.0.exe">sqlite-netFx451-setup-x86-2013-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx451-setup-x86-2013-1.0.97.0.exe">sqlite-netFx451-setup-x86-2013-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (10.12 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package will install all the necessary runtime components and
-        dependencies for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2013 Update 2 runtime for x86 is
+        dependencies for the x86 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2013 Update 2 runtime for x86 is
         included.  The .NET Framework 4.5.1 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 3071f6d4b93f52fea67f07409c5e13ea8f8d60ee)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -924,147 +924,42 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx451-setup-bundle-x64-2013"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx451-setup-bundle-x64-2013-1.0.98.0.exe">sqlite-netFx451-setup-bundle-x64-2013-1.0.98.0.exe</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx451-setup-bundle-x64-2013-1.0.97.0.exe">sqlite-netFx451-setup-bundle-x64-2013-1.0.97.0.exe</a>
         <br />
-        (0.00 MiB)
+        (10.78 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This setup package features the mixed-mode assembly and will install all
         the necessary runtime components and dependencies for the x64 version of
-        the System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2013
+        the System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2013
         Update 2 runtime for x64 is included.  The .NET Framework 4.5.1 is
         required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 189a1279186423099603833c974f0c074098283f)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx451-setup-x64-2013"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx451-setup-x64-2013-1.0.98.0.exe">sqlite-netFx451-setup-x64-2013-1.0.98.0.exe</a>
-        <br />
-        (0.00 MiB)
-      </td>
-      <td width="5"></td>
-      <td valign="top">
-        This setup package will install all the necessary runtime components and
-        dependencies for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2013 Update 2 runtime for x64 is
-        included.  The .NET Framework 4.5.1 is required.
-        <br />
-        (sha1: 0000000000000000000000000000000000000000)
-      </td>
-    </tr>
-
-    <tr>
-      <td colspan="4">
-        <b>Setups for 32-bit Windows (.NET Framework 4.6)</b>
-      </td>
-    </tr>
-
-    <tr>
-      <td width="10">&nbsp;</td>
-      <td width="30%" valign="top" align="right">
-        <a name="sqlite-netFx46-setup-bundle-x86-2015"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx46-setup-bundle-x86-2015-1.0.98.0.exe">sqlite-netFx46-setup-bundle-x86-2015-1.0.98.0.exe</a>
-        <br />
-        (0.00 MiB)
-      </td>
-      <td width="5"></td>
-      <td valign="top">
-        This setup package features the mixed-mode assembly and will install all
-        the necessary runtime components and dependencies for the x86 version of
-        the System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2015
-        RTM runtime for x86 is included.  The .NET Framework 4.6 is
-        required.
-        <br />
-        <big><b>This is the only setup package that is capable of installing the
-        design-time components for Visual Studio 2015.
-        <br />
-        <br />
-        However, if you do not require the design-time components, please
-        consider downloading the associated &quot;Precompiled Binaries&quot;
-        instead.</b></big>
-        <br />
-        <br />
-        <big><b>Using Entity Framework 6 design-time support may require
-        installing the Visual Studio 2015 &quot;flavor&quot; of the
-        <a href="https://www.microsoft.com/en-us/download/details.aspx?id=40762">
-        Entity Framework 6 Tools for Visual Studio 2012 &amp; 2015</a>.</b></big>
-        <br />
-        <br />
-        (sha1: 0000000000000000000000000000000000000000)
-      </td>
-    </tr>
-
-    <tr>
-      <td width="10">&nbsp;</td>
-      <td width="30%" valign="top" align="right">
-        <a name="sqlite-netFx46-setup-x86-2015"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx46-setup-x86-2015-1.0.98.0.exe">sqlite-netFx46-setup-x86-2015-1.0.98.0.exe</a>
-        <br />
-        (0.00 MiB)
-      </td>
-      <td width="5"></td>
-      <td valign="top">
-        This setup package will install all the necessary runtime components and
-        dependencies for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2015 RTM runtime for x86 is
-        included.  The .NET Framework 4.6 is required.
-        <br />
-        (sha1: 0000000000000000000000000000000000000000)
-      </td>
-    </tr>
-
-    <tr>
-      <td colspan="4">
-        <b>Setups for 64-bit Windows (.NET Framework 4.6)</b>
-      </td>
-    </tr>
-
-    <tr>
-      <td width="10">&nbsp;</td>
-      <td width="30%" valign="top" align="right">
-        <a name="sqlite-netFx46-setup-bundle-x64-2015"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx46-setup-bundle-x64-2015-1.0.98.0.exe">sqlite-netFx46-setup-bundle-x64-2015-1.0.98.0.exe</a>
-        <br />
-        (0.00 MiB)
-      </td>
-      <td width="5"></td>
-      <td valign="top">
-        This setup package features the mixed-mode assembly and will install all
-        the necessary runtime components and dependencies for the x64 version of
-        the System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2015
-        RTM runtime for x64 is included.  The .NET Framework 4.6 is
-        required.
-        <br />
-        (sha1: 0000000000000000000000000000000000000000)
-      </td>
-    </tr>
-
-    <tr>
-      <td width="10">&nbsp;</td>
-      <td width="30%" valign="top" align="right">
-        <a name="sqlite-netFx46-setup-x64-2015"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx46-setup-x64-2015-1.0.98.0.exe">sqlite-netFx46-setup-x64-2015-1.0.98.0.exe</a>
-        <br />
-        (0.00 MiB)
-      </td>
-      <td width="5"></td>
-      <td valign="top">
-        This setup package will install all the necessary runtime components and
-        dependencies for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2015 RTM runtime for x64 is
-        included.  The .NET Framework 4.6 is required.
-        <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        <a href="/downloads/1.0.97.0/sqlite-netFx451-setup-x64-2013-1.0.97.0.exe">sqlite-netFx451-setup-x64-2013-1.0.97.0.exe</a>
+        <br />
+        (10.83 MiB)
+      </td>
+      <td width="5"></td>
+      <td valign="top">
+        This setup package will install all the necessary runtime components and
+        dependencies for the x64 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2013 Update 2 runtime for x64 is
+        included.  The .NET Framework 4.5.1 is required.
+        <br />
+        (sha1: ac38374fe3abaac5487081aa7c120a8a04dc84de)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1074,40 +969,40 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx20-binary-bundle-Win32-2005"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx20-binary-bundle-Win32-2005-1.0.98.0.zip">sqlite-netFx20-binary-bundle-Win32-2005-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx20-binary-bundle-Win32-2005-1.0.97.0.zip">sqlite-netFx20-binary-bundle-Win32-2005-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (1.50 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2005 SP1 runtime for x86 and the .NET
+        the binaries for the x86 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2005 SP1 runtime for x86 and the .NET
         Framework 2.0 SP2 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: cc734b0a7054a9a982667faaf6faf86c94f37b6f)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx20-binary-Win32-2005"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx20-binary-Win32-2005-1.0.98.0.zip">sqlite-netFx20-binary-Win32-2005-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx20-binary-Win32-2005-1.0.97.0.zip">sqlite-netFx20-binary-Win32-2005-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (1.49 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x86 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2005 SP1
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2005 SP1
         runtime for x86 and the .NET Framework 2.0 SP2 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 72574347632bf2aada0703142ccaac197135c1cc)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1117,40 +1012,40 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx20-binary-bundle-x64-2005"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx20-binary-bundle-x64-2005-1.0.98.0.zip">sqlite-netFx20-binary-bundle-x64-2005-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx20-binary-bundle-x64-2005-1.0.97.0.zip">sqlite-netFx20-binary-bundle-x64-2005-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (1.71 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2005 SP1 runtime for x64 and the .NET
+        the binaries for the x64 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2005 SP1 runtime for x64 and the .NET
         Framework 2.0 SP2 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 3214c23872b129b3d1d955708f5e755b73635cc8)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx20-binary-x64-2005"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx20-binary-x64-2005-1.0.98.0.zip">sqlite-netFx20-binary-x64-2005-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx20-binary-x64-2005-1.0.97.0.zip">sqlite-netFx20-binary-x64-2005-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (1.70 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x64 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2005 SP1
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2005 SP1
         runtime for x64 and the .NET Framework 2.0 SP2 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 3c56ff6cc15dd0c0f2883fade40a0a352c205c87)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1160,40 +1055,40 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx35-binary-bundle-Win32-2008"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx35-binary-bundle-Win32-2008-1.0.98.0.zip">sqlite-netFx35-binary-bundle-Win32-2008-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx35-binary-bundle-Win32-2008-1.0.97.0.zip">sqlite-netFx35-binary-bundle-Win32-2008-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (1.95 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2008 SP1 runtime for x86 and the .NET
+        the binaries for the x86 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2008 SP1 runtime for x86 and the .NET
         Framework 3.5 SP1 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 68557106ccf5966c1b273e5d52e44203d0704d6e)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx35-binary-Win32-2008"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx35-binary-Win32-2008-1.0.98.0.zip">sqlite-netFx35-binary-Win32-2008-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx35-binary-Win32-2008-1.0.97.0.zip">sqlite-netFx35-binary-Win32-2008-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (1.94 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x86 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2008 SP1
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2008 SP1
         runtime for x86 and the .NET Framework 3.5 SP1 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 3b8e7799d1463458fa0dcf8ca35b28b57d30da9e)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1203,40 +1098,40 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx35-binary-bundle-x64-2008"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx35-binary-bundle-x64-2008-1.0.98.0.zip">sqlite-netFx35-binary-bundle-x64-2008-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx35-binary-bundle-x64-2008-1.0.97.0.zip">sqlite-netFx35-binary-bundle-x64-2008-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.03 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2008 SP1 runtime for x64 and the .NET
+        the binaries for the x64 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2008 SP1 runtime for x64 and the .NET
         Framework 3.5 SP1 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 8b3197f83606afe6cc288da72a69310d5f797362)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx35-binary-x64-2008"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx35-binary-x64-2008-1.0.98.0.zip">sqlite-netFx35-binary-x64-2008-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx35-binary-x64-2008-1.0.97.0.zip">sqlite-netFx35-binary-x64-2008-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.02 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x64 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2008 SP1
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2008 SP1
         runtime for x64 and the .NET Framework 3.5 SP1 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: e30e32261f5003ca588eaaea789a0a49e0b20a08)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1246,40 +1141,40 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx40-binary-bundle-Win32-2010"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx40-binary-bundle-Win32-2010-1.0.98.0.zip">sqlite-netFx40-binary-bundle-Win32-2010-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx40-binary-bundle-Win32-2010-1.0.97.0.zip">sqlite-netFx40-binary-bundle-Win32-2010-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.17 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2010 SP1 runtime for x86 and the .NET
+        the binaries for the x86 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2010 SP1 runtime for x86 and the .NET
         Framework 4.0 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: a6c4403b321b8bf64e4f6c629e1734564fc68646)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx40-binary-Win32-2010"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx40-binary-Win32-2010-1.0.98.0.zip">sqlite-netFx40-binary-Win32-2010-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx40-binary-Win32-2010-1.0.97.0.zip">sqlite-netFx40-binary-Win32-2010-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.16 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x86 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2010 SP1
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2010 SP1
         runtime for x86 and the .NET Framework 4.0 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: b1cd74abb20dd6f724cb25d34fab302c981fc46a)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1289,40 +1184,40 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx40-binary-bundle-x64-2010"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx40-binary-bundle-x64-2010-1.0.98.0.zip">sqlite-netFx40-binary-bundle-x64-2010-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx40-binary-bundle-x64-2010-1.0.97.0.zip">sqlite-netFx40-binary-bundle-x64-2010-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.19 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2010 SP1 runtime for x64 and the .NET
+        the binaries for the x64 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2010 SP1 runtime for x64 and the .NET
         Framework 4.0 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 65d4f10bcdf5ce4bf6831de50740c174f879cb64)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx40-binary-x64-2010"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx40-binary-x64-2010-1.0.98.0.zip">sqlite-netFx40-binary-x64-2010-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx40-binary-x64-2010-1.0.97.0.zip">sqlite-netFx40-binary-x64-2010-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.18 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x64 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2010 SP1
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2010 SP1
         runtime for x64 and the .NET Framework 4.0 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: d3de79ff9101c370def18a69f2cd0902ccbcaef3)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1332,40 +1227,40 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx45-binary-bundle-Win32-2012"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx45-binary-bundle-Win32-2012-1.0.98.0.zip">sqlite-netFx45-binary-bundle-Win32-2012-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx45-binary-bundle-Win32-2012-1.0.97.0.zip">sqlite-netFx45-binary-bundle-Win32-2012-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.08 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2012 Update 4 runtime for x86 and
+        the binaries for the x86 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2012 Update 4 runtime for x86 and
         the .NET Framework 4.5 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 1adff0b8f1c8c855f047972ca7be1a6ea99eee5c)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx45-binary-Win32-2012"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx45-binary-Win32-2012-1.0.98.0.zip">sqlite-netFx45-binary-Win32-2012-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx45-binary-Win32-2012-1.0.97.0.zip">sqlite-netFx45-binary-Win32-2012-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.13 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x86 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2012
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2012
         Update 4 runtime for x86 and the .NET Framework 4.5 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 7702faa724ec29a627ddea3cae5a69bd915320e2)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1375,40 +1270,40 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx45-binary-bundle-x64-2012"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx45-binary-bundle-x64-2012-1.0.98.0.zip">sqlite-netFx45-binary-bundle-x64-2012-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx45-binary-bundle-x64-2012-1.0.97.0.zip">sqlite-netFx45-binary-bundle-x64-2012-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.11 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2012 Update 4 runtime for x64 and
+        the binaries for the x64 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2012 Update 4 runtime for x64 and
         the .NET Framework 4.5 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: e3d1c61f1d960b8535577fc62ebad8651cf39cc6)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx45-binary-x64-2012"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx45-binary-x64-2012-1.0.98.0.zip">sqlite-netFx45-binary-x64-2012-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx45-binary-x64-2012-1.0.97.0.zip">sqlite-netFx45-binary-x64-2012-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.19 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x64 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2012
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2012
         Update 4 runtime for x64 and the .NET Framework 4.5 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: a4959439e8caec0a886c7a2758c336f3927df9a2)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1418,40 +1313,40 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx451-binary-bundle-Win32-2013"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx451-binary-bundle-Win32-2013-1.0.98.0.zip">sqlite-netFx451-binary-bundle-Win32-2013-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx451-binary-bundle-Win32-2013-1.0.97.0.zip">sqlite-netFx451-binary-bundle-Win32-2013-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.09 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2013 Update 2 runtime for x86 and the
+        the binaries for the x86 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2013 Update 2 runtime for x86 and the
         .NET Framework 4.5.1 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 1969fdc760e2b35633b9c5f33df17a7d9a37c656)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx451-binary-Win32-2013"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx451-binary-Win32-2013-1.0.98.0.zip">sqlite-netFx451-binary-Win32-2013-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx451-binary-Win32-2013-1.0.97.0.zip">sqlite-netFx451-binary-Win32-2013-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.14 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x86 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2013
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2013
         Update 2 runtime for x86 and the .NET Framework 4.5.1 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: cc50caf9a77fe4559d58823849d953d8178603e9)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1461,126 +1356,40 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx451-binary-bundle-x64-2013"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx451-binary-bundle-x64-2013-1.0.98.0.zip">sqlite-netFx451-binary-bundle-x64-2013-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx451-binary-bundle-x64-2013-1.0.97.0.zip">sqlite-netFx451-binary-bundle-x64-2013-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.12 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2013 Update 2 runtime for x64 and the
+        the binaries for the x64 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2013 Update 2 runtime for x64 and the
         .NET Framework 4.5.1 are required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: c945cd9013326d90dcb1b7473088b2d3b4a95d47)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx451-binary-x64-2013"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx451-binary-x64-2013-1.0.98.0.zip">sqlite-netFx451-binary-x64-2013-1.0.98.0.zip</a>
-        <br />
-        (0.00 MiB)
-      </td>
-      <td width="5"></td>
-      <td valign="top">
-        This binary package contains all the binaries for the x64 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2013
-        Update 2 runtime for x64 and the .NET Framework 4.5.1 are required.
-        <br />
-        (sha1: 0000000000000000000000000000000000000000)
-      </td>
-    </tr>
-
-    <tr>
-      <td colspan="4">
-        <b>Precompiled Binaries for 32-bit Windows (.NET Framework 4.6)</b>
-      </td>
-    </tr>
-
-    <tr>
-      <td width="10">&nbsp;</td>
-      <td width="30%" valign="top" align="right">
-        <a name="sqlite-netFx46-binary-bundle-Win32-2015"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx46-binary-bundle-Win32-2015-1.0.98.0.zip">sqlite-netFx46-binary-bundle-Win32-2015-1.0.98.0.zip</a>
-        <br />
-        (0.00 MiB)
-      </td>
-      <td width="5"></td>
-      <td valign="top">
-        This binary package features the mixed-mode assembly and contains all
-        the binaries for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2015 RTM runtime for x86 and the
-        .NET Framework 4.6 are required.
-        <br />
-        (sha1: 0000000000000000000000000000000000000000)
-      </td>
-    </tr>
-
-    <tr>
-      <td width="10">&nbsp;</td>
-      <td width="30%" valign="top" align="right">
-        <a name="sqlite-netFx46-binary-Win32-2015"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx46-binary-Win32-2015-1.0.98.0.zip">sqlite-netFx46-binary-Win32-2015-1.0.98.0.zip</a>
-        <br />
-        (0.00 MiB)
-      </td>
-      <td width="5"></td>
-      <td valign="top">
-        This binary package contains all the binaries for the x86 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2015
-        RTM runtime for x86 and the .NET Framework 4.6 are required.
-        <br />
-        (sha1: 0000000000000000000000000000000000000000)
-      </td>
-    </tr>
-
-    <tr>
-      <td colspan="4">
-        <b>Precompiled Binaries for 64-bit Windows (.NET Framework 4.6)</b>
-      </td>
-    </tr>
-
-    <tr>
-      <td width="10">&nbsp;</td>
-      <td width="30%" valign="top" align="right">
-        <a name="sqlite-netFx46-binary-bundle-x64-2015"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx46-binary-bundle-x64-2015-1.0.98.0.zip">sqlite-netFx46-binary-bundle-x64-2015-1.0.98.0.zip</a>
-        <br />
-        (0.00 MiB)
-      </td>
-      <td width="5"></td>
-      <td valign="top">
-        This binary package features the mixed-mode assembly and contains all
-        the binaries for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2015 RTM runtime for x64 and the
-        .NET Framework 4.6 are required.
-        <br />
-        (sha1: 0000000000000000000000000000000000000000)
-      </td>
-    </tr>
-
-    <tr>
-      <td width="10">&nbsp;</td>
-      <td width="30%" valign="top" align="right">
-        <a name="sqlite-netFx46-binary-x64-2015"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx46-binary-x64-2015-1.0.98.0.zip">sqlite-netFx46-binary-x64-2015-1.0.98.0.zip</a>
-        <br />
-        (0.00 MiB)
-      </td>
-      <td width="5"></td>
-      <td valign="top">
-        This binary package contains all the binaries for the x64 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2015
-        RTM runtime for x64 and the .NET Framework 4.6 are required.
-        <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        <a href="/downloads/1.0.97.0/sqlite-netFx451-binary-x64-2013-1.0.97.0.zip">sqlite-netFx451-binary-x64-2013-1.0.97.0.zip</a>
+        <br />
+        (2.19 MiB)
+      </td>
+      <td width="5"></td>
+      <td valign="top">
+        This binary package contains all the binaries for the x64 version of the
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2013
+        Update 2 runtime for x64 and the .NET Framework 4.5.1 are required.
+        <br />
+        (sha1: 6faf09655f805ba76ab0909ad0d4acf2b1a23712)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1590,41 +1399,41 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx20-static-binary-bundle-Win32-2005"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx20-static-binary-bundle-Win32-2005-1.0.98.0.zip">sqlite-netFx20-static-binary-bundle-Win32-2005-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx20-static-binary-bundle-Win32-2005-1.0.97.0.zip">sqlite-netFx20-static-binary-bundle-Win32-2005-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (1.71 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2005 SP1 runtime for x86 is statically
+        the binaries for the x86 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2005 SP1 runtime for x86 is statically
         linked.  The .NET Framework 2.0 SP2 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 25577f16a03b9cebdf87de65590c8dcb10ec39c8)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx20-static-binary-Win32-2005"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx20-static-binary-Win32-2005-1.0.98.0.zip">sqlite-netFx20-static-binary-Win32-2005-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx20-static-binary-Win32-2005-1.0.97.0.zip">sqlite-netFx20-static-binary-Win32-2005-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (1.70 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x86 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2005 SP1
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2005 SP1
         runtime for x86 is statically linked.  The .NET Framework 2.0 SP2 is
         required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 6a53f04340d0f577c0902087f9ae14c953331272)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1634,41 +1443,41 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx20-static-binary-bundle-x64-2005"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx20-static-binary-bundle-x64-2005-1.0.98.0.zip">sqlite-netFx20-static-binary-bundle-x64-2005-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx20-static-binary-bundle-x64-2005-1.0.97.0.zip">sqlite-netFx20-static-binary-bundle-x64-2005-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (1.87 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2005 SP1 runtime for x64 is statically
+        the binaries for the x64 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2005 SP1 runtime for x64 is statically
         linked.  The .NET Framework 2.0 SP2 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 1f15cd9479633f7698213f33280353a508674087)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx20-static-binary-x64-2005"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx20-static-binary-x64-2005-1.0.98.0.zip">sqlite-netFx20-static-binary-x64-2005-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx20-static-binary-x64-2005-1.0.97.0.zip">sqlite-netFx20-static-binary-x64-2005-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (1.86 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x64 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2005 SP1
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2005 SP1
         runtime for x64 is statically linked.  The .NET Framework 2.0 SP2 is
         required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 712ae5e5d34b3eddd17b20d25ebe0764ea710272)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1678,41 +1487,41 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx35-static-binary-bundle-Win32-2008"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx35-static-binary-bundle-Win32-2008-1.0.98.0.zip">sqlite-netFx35-static-binary-bundle-Win32-2008-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx35-static-binary-bundle-Win32-2008-1.0.97.0.zip">sqlite-netFx35-static-binary-bundle-Win32-2008-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.16 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2008 SP1 runtime for x86 is statically
+        the binaries for the x86 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2008 SP1 runtime for x86 is statically
         linked.  The .NET Framework 3.5 SP1 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: b307177dde284527d6daf8d7625376ee3db35d76)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx35-static-binary-Win32-2008"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx35-static-binary-Win32-2008-1.0.98.0.zip">sqlite-netFx35-static-binary-Win32-2008-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx35-static-binary-Win32-2008-1.0.97.0.zip">sqlite-netFx35-static-binary-Win32-2008-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.16 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x86 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2008 SP1
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2008 SP1
         runtime for x86 is statically linked.  The .NET Framework 3.5 SP1 is
         required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: b5a820573ede8ee2d39e7539349e972d973eb32f)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1722,41 +1531,41 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx35-static-binary-bundle-x64-2008"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx35-static-binary-bundle-x64-2008-1.0.98.0.zip">sqlite-netFx35-static-binary-bundle-x64-2008-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx35-static-binary-bundle-x64-2008-1.0.97.0.zip">sqlite-netFx35-static-binary-bundle-x64-2008-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.20 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2008 SP1 runtime for x64 is statically
+        the binaries for the x64 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2008 SP1 runtime for x64 is statically
         linked.  The .NET Framework 3.5 SP1 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: bbad7b401adc4ca39d11ddb994272fa4fa34d563)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx35-static-binary-x64-2008"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx35-static-binary-x64-2008-1.0.98.0.zip">sqlite-netFx35-static-binary-x64-2008-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx35-static-binary-x64-2008-1.0.97.0.zip">sqlite-netFx35-static-binary-x64-2008-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.20 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x64 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2008 SP1
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2008 SP1
         runtime for x64 is statically linked.  The .NET Framework 3.5 SP1 is
         required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 1f1ad2fedbcb24a31ccd786282e2cec738e03064)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1766,41 +1575,41 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx40-static-binary-bundle-Win32-2010"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx40-static-binary-bundle-Win32-2010-1.0.98.0.zip">sqlite-netFx40-static-binary-bundle-Win32-2010-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx40-static-binary-bundle-Win32-2010-1.0.97.0.zip">sqlite-netFx40-static-binary-bundle-Win32-2010-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.38 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2010 SP1 runtime for x86 is statically
+        the binaries for the x86 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2010 SP1 runtime for x86 is statically
         linked.  The .NET Framework 4.0 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: ddd78662fef2e9e9718bfcbd54c3a50b6668f5b7)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx40-static-binary-Win32-2010"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx40-static-binary-Win32-2010-1.0.98.0.zip">sqlite-netFx40-static-binary-Win32-2010-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx40-static-binary-Win32-2010-1.0.97.0.zip">sqlite-netFx40-static-binary-Win32-2010-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.38 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x86 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2010 SP1
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2010 SP1
         runtime for x86 is statically linked.  The .NET Framework 4.0 is
         required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 4bc249674a5fa43372e7a4dfcf025eafee1436a4)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1810,41 +1619,41 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx40-static-binary-bundle-x64-2010"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx40-static-binary-bundle-x64-2010-1.0.98.0.zip">sqlite-netFx40-static-binary-bundle-x64-2010-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx40-static-binary-bundle-x64-2010-1.0.97.0.zip">sqlite-netFx40-static-binary-bundle-x64-2010-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.38 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2010 SP1 runtime for x64 is statically
+        the binaries for the x64 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2010 SP1 runtime for x64 is statically
         linked.  The .NET Framework 4.0 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 5dc31fa8bb58e25196654407d877c26ef841c468)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx40-static-binary-x64-2010"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx40-static-binary-x64-2010-1.0.98.0.zip">sqlite-netFx40-static-binary-x64-2010-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx40-static-binary-x64-2010-1.0.97.0.zip">sqlite-netFx40-static-binary-x64-2010-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.38 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x64 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2010 SP1
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2010 SP1
         runtime for x64 is statically linked.  The .NET Framework 4.0 is
         required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 7b07e8e6015a4d455cb8fd832b19c453972092c4)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1854,41 +1663,41 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx45-static-binary-bundle-Win32-2012"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx45-static-binary-bundle-Win32-2012-1.0.98.0.zip">sqlite-netFx45-static-binary-bundle-Win32-2012-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx45-static-binary-bundle-Win32-2012-1.0.97.0.zip">sqlite-netFx45-static-binary-bundle-Win32-2012-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.41 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2012 Update 4 runtime for x86 is
+        the binaries for the x86 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2012 Update 4 runtime for x86 is
         statically linked.  The .NET Framework 4.5 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 241f027ddb2f5496f98ffea9d9abb6158b6dd97b)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx45-static-binary-Win32-2012"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx45-static-binary-Win32-2012-1.0.98.0.zip">sqlite-netFx45-static-binary-Win32-2012-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx45-static-binary-Win32-2012-1.0.97.0.zip">sqlite-netFx45-static-binary-Win32-2012-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.46 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x86 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2012
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2012
         Update 4 runtime for x86 is statically linked.  The .NET Framework 4.5
         is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: a0474dde94bcea51de93f1d944df44a728326f40)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1898,41 +1707,41 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx45-static-binary-bundle-x64-2012"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx45-static-binary-bundle-x64-2012-1.0.98.0.zip">sqlite-netFx45-static-binary-bundle-x64-2012-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx45-static-binary-bundle-x64-2012-1.0.97.0.zip">sqlite-netFx45-static-binary-bundle-x64-2012-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.37 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2012 Update 4 runtime for x64 is
+        the binaries for the x64 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2012 Update 4 runtime for x64 is
         statically linked.  The .NET Framework 4.5 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 8c2a819f4cb4ec30a8aa7559a4ec4fe86960f9ff)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx45-static-binary-x64-2012"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx45-static-binary-x64-2012-1.0.98.0.zip">sqlite-netFx45-static-binary-x64-2012-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx45-static-binary-x64-2012-1.0.97.0.zip">sqlite-netFx45-static-binary-x64-2012-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.45 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x64 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2012
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2012
         Update 4 runtime for x64 is statically linked.  The .NET Framework 4.5
         is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 8e1505424513e9d3721172c582e3a8e900d88aab)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1942,41 +1751,41 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx451-static-binary-bundle-Win32-2013"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx451-static-binary-bundle-Win32-2013-1.0.98.0.zip">sqlite-netFx451-static-binary-bundle-Win32-2013-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx451-static-binary-bundle-Win32-2013-1.0.97.0.zip">sqlite-netFx451-static-binary-bundle-Win32-2013-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.44 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2013 Update 2 runtime for x86 is
+        the binaries for the x86 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2013 Update 2 runtime for x86 is
         statically linked.  The .NET Framework 4.5.1 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: c71a13e48be86edd5679fcda601991d97ddbf5d7)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx451-static-binary-Win32-2013"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx451-static-binary-Win32-2013-1.0.98.0.zip">sqlite-netFx451-static-binary-Win32-2013-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx451-static-binary-Win32-2013-1.0.97.0.zip">sqlite-netFx451-static-binary-Win32-2013-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.49 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the x86 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2013
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2013
         Update 2 runtime for x86 is statically linked.  The .NET Framework 4.5.1
         is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 62bad2092267770842b0da94e56d54bb21e14371)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -1986,129 +1795,41 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx451-static-binary-bundle-x64-2013"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx451-static-binary-bundle-x64-2013-1.0.98.0.zip">sqlite-netFx451-static-binary-bundle-x64-2013-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx451-static-binary-bundle-x64-2013-1.0.97.0.zip">sqlite-netFx451-static-binary-bundle-x64-2013-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (2.42 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package features the mixed-mode assembly and contains all
-        the binaries for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2013 Update 2 runtime for x64 is
+        the binaries for the x64 version of the System.Data.SQLite 1.0.97.0
+        (3.8.10.2) package.  The Visual C++ 2013 Update 2 runtime for x64 is
         statically linked.  The .NET Framework 4.5.1 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 7884b038ffe7c913f31104cdca418c2b96eedfde)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx451-static-binary-x64-2013"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx451-static-binary-x64-2013-1.0.98.0.zip">sqlite-netFx451-static-binary-x64-2013-1.0.98.0.zip</a>
-        <br />
-        (0.00 MiB)
-      </td>
-      <td width="5"></td>
-      <td valign="top">
-        This binary package contains all the binaries for the x64 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2013
-        Update 2 runtime for x64 is statically linked.  The .NET Framework 4.5.1
-        is required.
-        <br />
-        (sha1: 0000000000000000000000000000000000000000)
-      </td>
-    </tr>
-
-    <tr>
-      <td colspan="4">
-        <b>Precompiled Statically-Linked Binaries for 32-bit Windows (.NET Framework 4.6)</b>
-      </td>
-    </tr>
-
-    <tr>
-      <td width="10">&nbsp;</td>
-      <td width="30%" valign="top" align="right">
-        <a name="sqlite-netFx46-static-binary-bundle-Win32-2015"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx46-static-binary-bundle-Win32-2015-1.0.98.0.zip">sqlite-netFx46-static-binary-bundle-Win32-2015-1.0.98.0.zip</a>
-        <br />
-        (0.00 MiB)
-      </td>
-      <td width="5"></td>
-      <td valign="top">
-        This binary package features the mixed-mode assembly and contains all
-        the binaries for the x86 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2015 RTM runtime for x86 is
-        statically linked.  The .NET Framework 4.6 is required.
-        <br />
-        (sha1: 0000000000000000000000000000000000000000)
-      </td>
-    </tr>
-
-    <tr>
-      <td width="10">&nbsp;</td>
-      <td width="30%" valign="top" align="right">
-        <a name="sqlite-netFx46-static-binary-Win32-2015"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx46-static-binary-Win32-2015-1.0.98.0.zip">sqlite-netFx46-static-binary-Win32-2015-1.0.98.0.zip</a>
-        <br />
-        (0.00 MiB)
-      </td>
-      <td width="5"></td>
-      <td valign="top">
-        This binary package contains all the binaries for the x86 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2015
-        RTM runtime for x86 is statically linked.  The .NET Framework 4.6
-        is required.
-        <br />
-        (sha1: 0000000000000000000000000000000000000000)
-      </td>
-    </tr>
-
-    <tr>
-      <td colspan="4">
-        <b>Precompiled Statically-Linked Binaries for 64-bit Windows (.NET Framework 4.6)</b>
-      </td>
-    </tr>
-
-    <tr>
-      <td width="10">&nbsp;</td>
-      <td width="30%" valign="top" align="right">
-        <a name="sqlite-netFx46-static-binary-bundle-x64-2015"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx46-static-binary-bundle-x64-2015-1.0.98.0.zip">sqlite-netFx46-static-binary-bundle-x64-2015-1.0.98.0.zip</a>
-        <br />
-        (0.00 MiB)
-      </td>
-      <td width="5"></td>
-      <td valign="top">
-        This binary package features the mixed-mode assembly and contains all
-        the binaries for the x64 version of the System.Data.SQLite 1.0.98.0
-        (3.8.11.1) package.  The Visual C++ 2015 RTM runtime for x64 is
-        statically linked.  The .NET Framework 4.6 is required.
-        <br />
-        (sha1: 0000000000000000000000000000000000000000)
-      </td>
-    </tr>
-
-    <tr>
-      <td width="10">&nbsp;</td>
-      <td width="30%" valign="top" align="right">
-        <a name="sqlite-netFx46-static-binary-x64-2015"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx46-static-binary-x64-2015-1.0.98.0.zip">sqlite-netFx46-static-binary-x64-2015-1.0.98.0.zip</a>
-        <br />
-        (0.00 MiB)
-      </td>
-      <td width="5"></td>
-      <td valign="top">
-        This binary package contains all the binaries for the x64 version of the
-        System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The Visual C++ 2015
-        RTM runtime for x64 is statically linked.  The .NET Framework 4.6
-        is required.
-        <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        <a href="/downloads/1.0.97.0/sqlite-netFx451-static-binary-x64-2013-1.0.97.0.zip">sqlite-netFx451-static-binary-x64-2013-1.0.97.0.zip</a>
+        <br />
+        (2.49 MiB)
+      </td>
+      <td width="5"></td>
+      <td valign="top">
+        This binary package contains all the binaries for the x64 version of the
+        System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The Visual C++ 2013
+        Update 2 runtime for x64 is statically linked.  The .NET Framework 4.5.1
+        is required.
+        <br />
+        (sha1: 0640bb7f4013b5276b5c78a34c90dee82ca9af1d)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -2118,59 +1839,59 @@
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx35-binary-PocketPC-ARM-2008"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx35-binary-PocketPC-ARM-2008-1.0.98.0.zip">sqlite-netFx35-binary-PocketPC-ARM-2008-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx35-binary-PocketPC-ARM-2008-1.0.97.0.zip">sqlite-netFx35-binary-PocketPC-ARM-2008-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (1.10 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the PocketPC version
-        of the System.Data.SQLite 1.0.98.0 (3.8.11.1) package.  The included native
+        of the System.Data.SQLite 1.0.97.0 (3.8.10.2) package.  The included native
         binaries should work on all supported ARM versions of Windows CE prior
         to Windows Embedded Compact 2013.  The .NET Compact Framework 3.5 is
         required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 9e51df082ed93ee0379b0ba656d8d3a0698690bc)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx39-binary-WinCE-ARM-2012"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx39-binary-WinCE-ARM-2012-1.0.98.0.zip">sqlite-netFx39-binary-WinCE-ARM-2012-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx39-binary-WinCE-ARM-2012-1.0.97.0.zip">sqlite-netFx39-binary-WinCE-ARM-2012-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (1.22 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the Windows Embedded
-        Compact 2013 (ARM) version of the System.Data.SQLite 1.0.98.0 (3.8.11.1)
+        Compact 2013 (ARM) version of the System.Data.SQLite 1.0.97.0 (3.8.10.2)
         package.  The .NET Compact Framework 3.9 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: f5f0c1480a39eee937b6aaab72e527275dd7c70b)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
         <a name="sqlite-netFx39-binary-WinCE-x86-2012"></a>
-        <a href="/downloads/1.0.98.0/sqlite-netFx39-binary-WinCE-x86-2012-1.0.98.0.zip">sqlite-netFx39-binary-WinCE-x86-2012-1.0.98.0.zip</a>
+        <a href="/downloads/1.0.97.0/sqlite-netFx39-binary-WinCE-x86-2012-1.0.97.0.zip">sqlite-netFx39-binary-WinCE-x86-2012-1.0.97.0.zip</a>
         <br />
-        (0.00 MiB)
+        (1.26 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This binary package contains all the binaries for the Windows Embedded
-        Compact 2013 (x86) version of the System.Data.SQLite 1.0.98.0 (3.8.11.1)
+        Compact 2013 (x86) version of the System.Data.SQLite 1.0.97.0 (3.8.10.2)
         package.  The .NET Compact Framework 3.9 is required.
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 32c32545e144cbab0ee159559bf63c4641c378e8)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -2191,21 +1912,21 @@
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
-        <a href="/downloads/1.0.98.0/System.Data.SQLite.1.0.98.0.nupkg">System.Data.SQLite.1.0.98.0.nupkg</a>
+        <a href="/downloads/1.0.97.0/System.Data.SQLite.1.0.97.0.nupkg">System.Data.SQLite.1.0.97.0.nupkg</a>
         <br />
         (0.00 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This NuGet package includes all the binaries for both the x86 and x64
-        versions of System.Data.SQLite 1.0.98.0 (3.8.11.1).  The .NET Framework
-        3.5 SP1, 4.0, 4.5, 4.5.1, 4.5.2, or 4.6 is required.  For the included
-        native binaries, the version of the Visual C++ runtime corresponding to
-        the .NET Framework used by the associated managed assembly is statically
+        versions of System.Data.SQLite 1.0.97.0 (3.8.10.2).  The .NET Framework
+        3.5 SP1, 4.0, 4.5, or 4.5.1 is required.  For the included native
+        binaries, the version of the Visual C++ runtime corresponding to the
+        .NET Framework used by the associated managed assembly is statically
         linked.
         <br />
         <big><b>This package depends on the &quot;EntityFramework&quot;
         package.</b></big>
         <br />
@@ -2215,49 +1936,48 @@
         depend on the &quot;System.Data.SQLite.Core&quot;,
         &quot;System.Data.SQLite.Linq&quot;, and
         &quot;System.Data.SQLite.EF6&quot; packages.</i></b></big>
         <br />
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: e7399030d60d82c3f49ce891cc0015225709fd9e)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
-        <a href="/downloads/1.0.98.0/System.Data.SQLite.Core.1.0.98.0.nupkg">System.Data.SQLite.Core.1.0.98.0.nupkg</a>
+        <a href="/downloads/1.0.97.0/System.Data.SQLite.Core.1.0.97.0.nupkg">System.Data.SQLite.Core.1.0.97.0.nupkg</a>
         <br />
-        (0.00 MiB)
+        (5.07 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This NuGet package contains all the binaries for both the x86 and x64
-        versions of System.Data.SQLite 1.0.98.0 (3.8.11.1), <big><b>except those
+        versions of System.Data.SQLite 1.0.97.0 (3.8.10.2), <big><b>except those
         needed to support LINQ and Entity Framework 6</b></big>.  The .NET
-        Framework 3.5 SP1, 4.0, 4.5, 4.5.1, 4.5.2, or 4.6 is required.  For the
-        included native binaries, the version of the Visual C++ runtime
-        corresponding to the .NET Framework used by the associated managed
-        assembly is statically linked.
+        Framework 3.5 SP1, 4.0, 4.5, or 4.5.1 is required.  For the included
+        native binaries, the version of the Visual C++ runtime corresponding to
+        the .NET Framework used by the associated managed assembly is statically
+        linked.
         <br />
         <big><b>This package does not depend on any other package.</b></big>
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 1f6b891b926d10dc9644dbca1e03d7b65a156ff8)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
-        <a href="/downloads/1.0.98.0/System.Data.SQLite.Core.MSIL.1.0.98.0.nupkg">System.Data.SQLite.Core.MSIL.1.0.98.0.nupkg</a>
+        <a href="/downloads/1.0.97.0/System.Data.SQLite.Core.MSIL.1.0.97.0.nupkg">System.Data.SQLite.Core.MSIL.1.0.97.0.nupkg</a>
         <br />
-        (0.00 MiB)
+        (0.70 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This NuGet package contains the managed binaries for System.Data.SQLite
-        1.0.98.0.  The .NET Framework 3.5 SP1, 4.0, 4.5, 4.5.1, 4.5.2, or 4.6 is
-        required.
+        1.0.97.0.  The .NET Framework 3.5 SP1, 4.0, 4.5, or 4.5.1 is required.
         <br />
         <big><b>This package does not depend on any other package.</b></big>
         <br />
         <br />
         <big><b><i>This NuGet package does not include any code from the native
@@ -2265,65 +1985,64 @@
         assembly &quot;SQLite.Interop.dll&quot; compiled for the processor
         architecture of the host process being present in a directory in the
         native library search path.</i></b></big>
         <br />
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 8d34b6d6966b00e9c0f9d7ab5f431db58fe0bc09)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
-        <a href="/downloads/1.0.98.0/System.Data.SQLite.EF6.1.0.98.0.nupkg">System.Data.SQLite.EF6.1.0.98.0.nupkg</a>
+        <a href="/downloads/1.0.97.0/System.Data.SQLite.EF6.1.0.97.0.nupkg">System.Data.SQLite.EF6.1.0.97.0.nupkg</a>
         <br />
-        (0.00 MiB)
+        (0.14 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This NuGet package contains just the binaries to support Entity
-        Framework 6 using System.Data.SQLite 1.0.98.0 (3.8.11.1).  The .NET
-        Framework 4.0, 4.5, 4.5.1, 4.5.2, or 4.6 is required.
+        Framework 6 using System.Data.SQLite 1.0.97.0 (3.8.10.2).  The .NET
+        Framework 4.0, 4.5, or 4.5.1 is required.
         <br />
         <big><b>This package depends on the &quot;EntityFramework&quot;
         package.</b></big>
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 3af8ed2aa3826aa2bbd00ad1fb84cf09447e6300)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
-        <a href="/downloads/1.0.98.0/System.Data.SQLite.Linq.1.0.98.0.nupkg">System.Data.SQLite.Linq.1.0.98.0.nupkg</a>
+        <a href="/downloads/1.0.97.0/System.Data.SQLite.Linq.1.0.97.0.nupkg">System.Data.SQLite.Linq.1.0.97.0.nupkg</a>
         <br />
-        (0.00 MiB)
+        (0.18 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This NuGet package contains just the binaries to support LINQ using
-        System.Data.SQLite 1.0.98.0 (3.8.11.1).  The .NET Framework 3.5 SP1, 4.0,
-        4.5, 4.5.1, 4.5.2, or 4.6 is required.
+        System.Data.SQLite 1.0.97.0 (3.8.10.2).  The .NET Framework 3.5 SP1, 4.0,
+        4.5, or 4.5.1 is required.
         <br />
         <big><b>This package does not depend on any other package.</b></big>
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 5e2ebc5a5a6dc28e8ef41a4583ecd2ad55a39463)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
-        <a href="/downloads/1.0.98.0/System.Data.SQLite.MSIL.1.0.98.0.nupkg">System.Data.SQLite.MSIL.1.0.98.0.nupkg</a>
+        <a href="/downloads/1.0.97.0/System.Data.SQLite.MSIL.1.0.97.0.nupkg">System.Data.SQLite.MSIL.1.0.97.0.nupkg</a>
         <br />
         (0.00 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This NuGet package contains the managed binaries for System.Data.SQLite
-        1.0.98.0.  The .NET Framework 3.5 SP1, 4.0, 4.5, 4.5.1, 4.5.2, or 4.6 is
-        required.
+        1.0.97.0.  The .NET Framework 3.5 SP1, 4.0, 4.5, or 4.5.1 is required.
         <br />
         <big><b>This is a legacy package; if possible, please use either the
         &quot;System.Data.SQLite&quot; or &quot;System.Data.SQLite.Core&quot;
         package instead.</b></big>
         <br />
@@ -2340,59 +2059,57 @@
         depend on the &quot;System.Data.SQLite.Core.MSIL&quot;,
         &quot;System.Data.SQLite.Linq&quot;, and
         &quot;System.Data.SQLite.EF6&quot; packages.</i></b></big>
         <br />
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: eed15134efd238186fd1be88dde7f19892fceb04)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
-        <a href="/downloads/1.0.98.0/System.Data.SQLite.x86.1.0.98.0.nupkg">System.Data.SQLite.x86.1.0.98.0.nupkg</a>
+        <a href="/downloads/1.0.97.0/System.Data.SQLite.x86.1.0.97.0.nupkg">System.Data.SQLite.x86.1.0.97.0.nupkg</a>
         <br />
-        (0.00 MiB)
+        (2.61 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This NuGet package contains all the binaries for the x86 version of
-        System.Data.SQLite 1.0.98.0 (3.8.11.1).  The .NET Framework 3.5 SP1,
-        4.0, 4.5, 4.5.1, 4.5.2, or 4.6 is required.  For the included native
-        binaries, the version of the Visual C++ runtime corresponding to the
-        .NET Framework used by the associated managed assembly is statically
-        linked.
+        System.Data.SQLite 1.0.97.0 (3.8.10.2).  The .NET Framework 3.5 SP1,
+        4.0, 4.5, or 4.5.1 is required.  For the included native binaries, the
+        version of the Visual C++ runtime corresponding to the .NET Framework
+        used by the associated managed assembly is statically linked.
         <br />
         <big><b>This is a legacy package; if possible, please use either the
         &quot;System.Data.SQLite&quot; or &quot;System.Data.SQLite.Core&quot;
         package instead.</b></big>
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 9924cf29aeb6fbfbe7a4b085295d55fc19817d76)
       </td>
     </tr>
 
     <tr>
       <td width="10">&nbsp;</td>
       <td width="30%" valign="top" align="right">
-        <a href="/downloads/1.0.98.0/System.Data.SQLite.x64.1.0.98.0.nupkg">System.Data.SQLite.x64.1.0.98.0.nupkg</a>
+        <a href="/downloads/1.0.97.0/System.Data.SQLite.x64.1.0.97.0.nupkg">System.Data.SQLite.x64.1.0.97.0.nupkg</a>
         <br />
-        (0.00 MiB)
+        (2.90 MiB)
       </td>
       <td width="5"></td>
       <td valign="top">
         This NuGet package contains all the binaries for the x64 version of
-        System.Data.SQLite 1.0.98.0 (3.8.11.1).  The .NET Framework 3.5 SP1,
-        4.0, 4.5, 4.5.1, 4.5.2, or 4.6 is required.  For the included native
-        binaries, the version of the Visual C++ runtime corresponding to the
-        .NET Framework used by the associated managed assembly is statically
-        linked.
+        System.Data.SQLite 1.0.97.0 (3.8.10.2).  The .NET Framework 3.5 SP1,
+        4.0, 4.5, or 4.5.1 is required.  For the included native binaries, the
+        version of the Visual C++ runtime corresponding to the .NET Framework
+        used by the associated managed assembly is statically linked.
         <br />
         <big><b>This is a legacy package; if possible, please use either the
         &quot;System.Data.SQLite&quot; or &quot;System.Data.SQLite.Core&quot;
         package instead.</b></big>
         <br />
-        (sha1: 0000000000000000000000000000000000000000)
+        (sha1: 104d28413d2798d670c2d450db8d2016171dcad3)
       </td>
     </tr>
 
     <tr>
       <td colspan="4">
@@ -2453,11 +2170,11 @@
     Templates (10) and (11) are used for the official NuGet packages.
   </p>
 
   <p>
     The <b>framework</b> in templates (3), (4), (5), (6), (7), and (8) will be
-    one of netFx20, netFx35, netFx40, netFx45, netFx451, netFx46.
+    one of netFx20, netFx35, netFx40, netFx45, netFx451.
   </p>
 
   <p>
     The <b>cpu</b> in templates (3) and (4) will be one of x86, x64, arm, ia64.
   </p>
@@ -2467,11 +2184,11 @@
     Win32, x64, PocketPC, PocketPC-ARM, PocketPC-x86, WinCE-ARM, WinCE-x86.
   </p>
 
   <p>
     The <b>year</b> in templates (3), (4), (5), (6), (7), and (8) will be one of
-    2005, 2008, 2010, 2012, 2013, 2015.
+    2005, 2008, 2010, 2012, 2013.
   </p>
 
   <p>
     The <b>version</b> in templates (1), (2), (3), (4), (5), (6), (7), and (8)
     is the dot-delimited version number of the primary System.Data.SQLite

Index: www/news.wiki
==================================================================
--- www/news.wiki
+++ www/news.wiki
@@ -1,22 +1,19 @@
 <title>News</title>
 
 <b>Version History</b>
 
 <p>
-    <b>1.0.98.0 - August 18, 2015</b>
+    <b>1.0.98.0 - August XX, 2015 <font color="red">(release scheduled)</font></b>
 </p>
 <ul>
     <li>Updated to [https://www.sqlite.org/releaselog/3_8_11_1.html|SQLite 3.8.11.1].</li>
     <li>Add full support for Visual Studio 2015 and the .NET Framework 4.6.</li>
-    <li>Add support for creating custom SQL functions using delegates.</li>
     <li>Implement the Substring method for LINQ using the &quot;substr&quot; core SQL function.&nbsp;<b>** Potentially Incompatible Change **</b></li>
-    <li>Prevent encrypted connections from being used with the connection pool. Pursuant to [89d3a159f1].&nbsp;<b>** Potentially Incompatible Change **</b></li>
     <li>Honor the second argument to Math.Round when using LINQ.&nbsp;<b>** Potentially Incompatible Change **</b></li>
     <li>Honor the pre-existing flags for connections during the Open method. Fix for [964063da16].&nbsp;<b>** Potentially Incompatible Change **</b></li>
     <li>Remove errant semi-colons from the SQL used by LINQ to INSERT and then SELECT rows with composite primary keys. Fix for [9d353b0bd8].</li>
-    <li>Refactor INSERT/UPDATE handling (in the LINQ assembly) so it can handle composite and non-integer primary keys. Fix for [41aea496e0].</li>
     <li>Change the base type for the SQLiteConnectionFlags enumeration to long integer.&nbsp;<b>** Potentially Incompatible Change **</b></li>
     <li>Add extended return codes to the SQLiteErrorCode enumeration. Pursuant to [71bedaca19].&nbsp;<b>** Potentially Incompatible Change **</b></li>
     <li>Improve exception handling in all native callbacks implemented in the SQLiteConnection class.</li>
     <li>Add Progress event and ProgressOps connection string property to enable raising progress events during long-running queries.</li>
     <li>Add &quot;Recursive Triggers&quot; connection string property to enable or disable the recursive trigger capability. Pursuant to [3a82ee635b].</li>