diff --git a/src/lib-managesieve/managesieve-arg.c b/src/lib-managesieve/managesieve-arg.c
index 8ce8be72ad5555bec59f2239678d401c8b3c52ea..04600ed812075f0004bda93e2d37879f38c60194 100644
--- a/src/lib-managesieve/managesieve-arg.c
+++ b/src/lib-managesieve/managesieve-arg.c
@@ -4,8 +4,8 @@
 #include "lib.h"
 #include "managesieve-arg.h"
 
-bool managesieve_arg_get_atom
-(const struct managesieve_arg *arg, const char **str_r)
+bool managesieve_arg_get_atom(const struct managesieve_arg *arg,
+			      const char **str_r)
 {
 	if (arg->type != MANAGESIEVE_ARG_ATOM)
 		return FALSE;
@@ -14,25 +14,25 @@ bool managesieve_arg_get_atom
 	return TRUE;
 }
 
-bool managesieve_arg_get_number
-(const struct managesieve_arg *arg, uoff_t *number_r)
+bool managesieve_arg_get_number(const struct managesieve_arg *arg,
+				uoff_t *number_r)
 {
 	const char *data;
 	uoff_t num = 0;
 	size_t i;
 
-	if ( arg->type != MANAGESIEVE_ARG_ATOM )
+	if (arg->type != MANAGESIEVE_ARG_ATOM)
 		return FALSE;
 
 	data = arg->_data.str;
-	for ( i = 0; i < arg->str_len; i++ ) {
+	for (i = 0; i < arg->str_len; i++) {
 		uoff_t newnum;
 
 		if (data[i] < '0' || data[i] > '9')
 			return FALSE;
 
 		newnum = num*10 + (data[i] -'0');
-		if ( newnum < num )
+		if (newnum < num)
 			return FALSE;
 
 		num = newnum;
@@ -42,8 +42,8 @@ bool managesieve_arg_get_number
 	return TRUE;
 }
 
-bool managesieve_arg_get_quoted
-(const struct managesieve_arg *arg, const char **str_r)
+bool managesieve_arg_get_quoted(const struct managesieve_arg *arg,
+				const char **str_r)
 {
 	if (arg->type != MANAGESIEVE_ARG_STRING)
 		return FALSE;
@@ -52,38 +52,38 @@ bool managesieve_arg_get_quoted
 	return TRUE;
 }
 
-bool managesieve_arg_get_string
-(const struct managesieve_arg *arg, const char **str_r)
+bool managesieve_arg_get_string(const struct managesieve_arg *arg,
+				const char **str_r)
 {
-	if (arg->type != MANAGESIEVE_ARG_STRING
-		&& arg->type != MANAGESIEVE_ARG_LITERAL)
+	if (arg->type != MANAGESIEVE_ARG_STRING &&
+	    arg->type != MANAGESIEVE_ARG_LITERAL)
 		return FALSE;
 
 	*str_r = arg->_data.str;
 	return TRUE;
 }
 
-bool managesieve_arg_get_string_stream
-(const struct managesieve_arg *arg, struct istream **stream_r)
+bool managesieve_arg_get_string_stream(const struct managesieve_arg *arg,
+				       struct istream **stream_r)
 {
-	if ( arg->type != MANAGESIEVE_ARG_STRING_STREAM )
+	if (arg->type != MANAGESIEVE_ARG_STRING_STREAM)
 		return FALSE;
 
 	*stream_r = arg->_data.str_stream;
 	return TRUE;
 }
 
-bool managesieve_arg_get_list
-(const struct managesieve_arg *arg, const struct managesieve_arg **list_r)
+bool managesieve_arg_get_list(const struct managesieve_arg *arg,
+			      const struct managesieve_arg **list_r)
 {
 	unsigned int count;
 
 	return managesieve_arg_get_list_full(arg, list_r, &count);
 }
 
-bool managesieve_arg_get_list_full
-(const struct managesieve_arg *arg, const struct managesieve_arg **list_r,
-	unsigned int *list_count_r)
+bool managesieve_arg_get_list_full(const struct managesieve_arg *arg,
+				   const struct managesieve_arg **list_r,
+				   unsigned int *list_count_r)
 {
 	unsigned int count;
 
@@ -98,8 +98,8 @@ bool managesieve_arg_get_list_full
 	return TRUE;
 }
 
-struct istream *managesieve_arg_as_string_stream
-(const struct managesieve_arg *arg)
+struct istream *
+managesieve_arg_as_string_stream(const struct managesieve_arg *arg)
 {
 	struct istream *stream;
 
@@ -118,8 +118,8 @@ managesieve_arg_as_list(const struct managesieve_arg *arg)
 	return ret;
 }
 
-bool managesieve_arg_atom_equals
-(const struct managesieve_arg *arg, const char *str)
+bool managesieve_arg_atom_equals(const struct managesieve_arg *arg,
+				 const char *str)
 {
 	const char *value;