diff --git a/.travis.yml b/.travis.yml
index 8a5b62f..d2dcf47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,18 +12,8 @@ env:
   matrix:
     - GOTAGS=
     - GOTAGS=libsqlite3
-    - GOTAGS=sqlite_allow_uri_authority
-    - GOTAGS=sqlite_app_armor
-    - GOTAGS=sqlite_foreign_keys
-    - GOTAGS=sqlite_fts5
-    - GOTAGS=sqlite_icu
-    - GOTAGS=sqlite_introspect
-    - GOTAGS=sqlite_json
-    - GOTAGS=sqlite_secure_delete
-    - GOTAGS=sqlite_see
-    - GOTAGS=sqlite_stat4
+    - GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth"
     - GOTAGS=sqlite_trace
-    - GOTAGS=sqlite_userauth
     - GOTAGS=sqlite_vacuum_full
     - GOTAGS=sqlite_vacuum_incr
     - GOTAGS=sqlite_vtable
@@ -56,76 +46,16 @@ matrix:
       env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.7.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=386
+      env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=386
     - os: linux
       go: 1.7.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=amd64
+      env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.7.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
     - os: linux
       go: 1.7.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.7.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.7.x
       env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
@@ -158,76 +88,16 @@ matrix:
       env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.8.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=386
+      env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=386
     - os: linux
       go: 1.8.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=amd64
+      env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.8.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
     - os: linux
       go: 1.8.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.8.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.8.x
       env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
@@ -260,76 +130,16 @@ matrix:
       env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.9.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=386
+      env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=386
     - os: linux
       go: 1.9.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=amd64
+      env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.9.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
     - os: linux
       go: 1.9.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.9.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.9.x
       env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386
@@ -362,76 +172,16 @@ matrix:
       env: GOTAGS=libsqlite3 GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.10.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=386
+      env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=386
     - os: linux
       go: 1.10.x
-      env: GOTAGS=sqlite_allow_uri_authority GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_app_armor GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_foreign_keys GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_fts5 GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_icu GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_introspect GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_json GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_secure_delete GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_see GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_stat4 GOOS=windows GOARCH=amd64
+      env: GOTAGS="sqlite_allow_uri_authority sqlite_app_armor sqlite_foreign_keys sqlite_fts5 sqlite_icu sqlite_introspect sqlite_json sqlite_secure_delete sqlite_see sqlite_stat4 sqlite_userauth" GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.10.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=386
     - os: linux
       go: 1.10.x
       env: GOTAGS=sqlite_trace GOOS=windows GOARCH=amd64
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=386
-    - os: linux
-      go: 1.10.x
-      env: GOTAGS=sqlite_userauth GOOS=windows GOARCH=amd64
     - os: linux
       go: 1.10.x
       env: GOTAGS=sqlite_vacuum_full GOOS=windows GOARCH=386