diff --git a/src/lib-sieve-tool/sieve-tool.c b/src/lib-sieve-tool/sieve-tool.c
index 74e40ab6086d67e906973c86b95ecf011d44596b..6957ed78262edb506827ff057e17526c2dc83c5d 100644
--- a/src/lib-sieve-tool/sieve-tool.c
+++ b/src/lib-sieve-tool/sieve-tool.c
@@ -578,9 +578,10 @@ struct ostream *sieve_tool_open_output_stream(const char *filename)
  */
 
 struct sieve_binary *
-sieve_tool_script_compile(struct sieve_instance *svinst,
-			  const char *filename, const char *name)
+sieve_tool_script_compile(struct sieve_tool *tool, const char *filename,
+			  const char *name)
 {
+	struct sieve_instance *svinst = tool->svinst;
 	struct sieve_error_handler *ehandler;
 	struct sieve_binary *sbin;
 
@@ -597,8 +598,9 @@ sieve_tool_script_compile(struct sieve_instance *svinst,
 }
 
 struct sieve_binary *
-sieve_tool_script_open(struct sieve_instance *svinst, const char *filename)
+sieve_tool_script_open(struct sieve_tool *tool, const char *filename)
 {
+	struct sieve_instance *svinst = tool->svinst;
 	struct sieve_error_handler *ehandler;
 	struct sieve_binary *sbin;
 
diff --git a/src/lib-sieve-tool/sieve-tool.h b/src/lib-sieve-tool/sieve-tool.h
index bf2f9655781e2948efc826367fe0a4718ba9c1a0..e7457cb1833eb9e73cb4cff046c782a6447cb3da 100644
--- a/src/lib-sieve-tool/sieve-tool.h
+++ b/src/lib-sieve-tool/sieve-tool.h
@@ -85,10 +85,10 @@ struct ostream *sieve_tool_open_output_stream(const char *filename);
  */
 
 struct sieve_binary *
-sieve_tool_script_compile(struct sieve_instance *svinst,
-			  const char *filename, const char *name);
+sieve_tool_script_compile(struct sieve_tool *tool, const char *filename,
+			  const char *name);
 struct sieve_binary *
-sieve_tool_script_open(struct sieve_instance *svinst, const char *filename);
+sieve_tool_script_open(struct sieve_tool *tool, const char *filename);
 void sieve_tool_dump_binary_to(struct sieve_binary *sbin,
 			       const char *filename, bool hexdump);
 
diff --git a/src/sieve-tools/sieve-filter.c b/src/sieve-tools/sieve-filter.c
index 8b4a78ac9358dc5453cb553fe27d17483aba53f8..df5f200cfd16d3b98899831a93ebe1c03743e058 100644
--- a/src/sieve-tools/sieve-filter.c
+++ b/src/sieve-tools/sieve-filter.c
@@ -525,11 +525,11 @@ int main(int argc, char **argv)
 
 	/* Compile main sieve script */
 	if (force_compile) {
-		main_sbin = sieve_tool_script_compile(svinst, scriptfile, NULL);
+		main_sbin = sieve_tool_script_compile(sieve_tool, scriptfile, NULL);
 		if (main_sbin != NULL)
 			(void)sieve_save(main_sbin, TRUE, NULL);
 	} else {
-		main_sbin = sieve_tool_script_open(svinst, scriptfile);
+		main_sbin = sieve_tool_script_open(sieve_tool, scriptfile);
 	}
 
 	/* Initialize mail user */
diff --git a/src/sieve-tools/sieve-test.c b/src/sieve-tools/sieve-test.c
index 023b7acdee97bf8406f47c28dd7c62b6ce863930..19ed53b3e766805343a0b973f7b4b4ea3c2bd318 100644
--- a/src/sieve-tools/sieve-test.c
+++ b/src/sieve-tools/sieve-test.c
@@ -296,11 +296,11 @@ int main(int argc, char **argv)
 
 	/* Compile main sieve script */
 	if (force_compile) {
-		main_sbin = sieve_tool_script_compile(svinst, scriptfile, NULL);
+		main_sbin = sieve_tool_script_compile(sieve_tool, scriptfile, NULL);
 		if (main_sbin != NULL)
 			(void)sieve_save(main_sbin, TRUE, NULL);
 	} else {
-		main_sbin = sieve_tool_script_open(svinst, scriptfile);
+		main_sbin = sieve_tool_script_open(sieve_tool, scriptfile);
 	}
 
 	if (main_sbin == NULL) {
@@ -415,11 +415,12 @@ int main(int argc, char **argv)
 				/* Compile sieve script */
 				if (force_compile) {
 					sbin = sieve_tool_script_compile(
-						svinst, sfiles[i], sfiles[i]);
+						sieve_tool, sfiles[i], sfiles[i]);
 					if (sbin != NULL)
 						(void)sieve_save(sbin, FALSE, NULL);
 				} else {
-					sbin = sieve_tool_script_open(svinst, sfiles[i]);
+					sbin = sieve_tool_script_open(
+						sieve_tool, sfiles[i]);
 				}
 
 				if (sbin == NULL) {
diff --git a/src/sieve-tools/sievec.c b/src/sieve-tools/sievec.c
index b22a94a90eaf4563d3726b86223c2ef6d7c2ae3e..91d2ecc2fa4657e1d545217a7978b12e3c204ff8 100644
--- a/src/sieve-tools/sievec.c
+++ b/src/sieve-tools/sievec.c
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
 				else
 					file = t_strconcat(scriptfile, "/", dp->d_name, NULL);
 
-				sbin = sieve_tool_script_compile(svinst, file, NULL);
+				sbin = sieve_tool_script_compile(sieve_tool, file, NULL);
 
 				if (sbin != NULL) {
 					sieve_save(sbin, TRUE, NULL);
@@ -139,7 +139,7 @@ int main(int argc, char **argv)
 
 		   NOTE: For consistency, stat errors are handled here as well
 		 */
-		sbin = sieve_tool_script_compile(svinst, scriptfile, NULL);
+		sbin = sieve_tool_script_compile(sieve_tool, scriptfile, NULL);
 		if (sbin != NULL) {
 			if (dump)
 				sieve_tool_dump_binary_to(sbin, outfile, FALSE);