--- a/pkg/imports/bn.go	Thu Dec 13 13:41:27 2018 +0100
+++ b/pkg/imports/bn.go	Thu Dec 13 14:06:48 2018 +0100
@@ -163,16 +163,22 @@
 	}
 	defer tx.Rollback()
 
-	hasStmt, err := tx.PrepareContext(ctx, hasBottleneckSQL)
-	if err != nil {
-		return nil, err
+	var hasStmt, insertStmt, trackStmt *sql.Stmt
+
+	for _, x := range []struct {
+		sql  string
+		stmt **sql.Stmt
+	}{
+		{hasBottleneckSQL, &hasStmt},
+		{insertSQL, &insertStmt},
+		{trackImportSQL, &trackStmt},
+	} {
+		var err error
+		if *x.stmt, err = tx.PrepareContext(ctx, x.sql); err != nil {
+			return nil, err
+		}
+		defer (*x.stmt).Close()
 	}
-	defer hasStmt.Close()
-	insertStmt, err := tx.PrepareContext(ctx, insertSQL)
-	if err != nil {
-		return nil, err
-	}
-	defer insertStmt.Close()
 
 	var nids []int64
 
@@ -189,6 +195,7 @@
 		case err != nil:
 			return nil, err
 		case found:
+			// TODO: Deep comparison database vs. SOAP.
 			continue nextBN
 		}
 
@@ -225,10 +232,13 @@
 			return nil, err
 		}
 		nids = append(nids, nid)
-		feedback.Info("Inserted '%s'into database", bn.OBJNAM)
-		if err := track(ctx, tx, importID, "waterway.bottlenecks", nid); err != nil {
+		if _, err := trackStmt.ExecContext(
+			ctx,
+			tx, importID, "waterway.bottlenecks", nid,
+		); err != nil {
 			return nil, err
 		}
+		feedback.Info("Inserted '%s'into database", bn.OBJNAM)
 	}
 	if len(nids) == 0 {
 		feedback.Error("No new bottlenecks found")