--- ../original/src/lib-settings/settings-parser.c	2015-09-23 13:59:40.000000000 +0100
+++ src/lib-settings/settings-parser.c	2015-09-23 15:24:12.715857666 +0100
@@ -1296,7 +1296,7 @@
 			 void *set, pool_t pool,
 			 const struct var_expand_table *table)
 {
-	return settings_var_expand_with_funcs(info, set, pool, table, NULL, NULL);
+	settings_var_expand_with_funcs(info, set, pool, table, NULL, NULL);
 }
 
 void settings_var_expand_with_funcs(const struct setting_parser_info *info,
--- ../original/src/lib-dict/dict.c	2015-09-02 15:34:00.000000000 +0100
+++ src/lib-dict/dict.c	2015-09-23 15:25:08.746448489 +0100
@@ -133,7 +133,7 @@
 		callback(&result, context);
 		return;
 	}
-	return dict->v.lookup_async(dict, key, callback, context);
+	dict->v.lookup_async(dict, key, callback, context);
 }
 
 struct dict_iterate_context *