diff --git a/src/generator.h b/src/generator.h
index 72f7d53..517bdb5 100644
--- a/src/generator.h
+++ b/src/generator.h
@@ -315,10 +315,10 @@ private:
 
 	void CallObject(BaseObj<StreamType> & base_obj, int method_index, FunInfo<StreamType> & info);
 
-	void PrintDate(pt::Date * date, std::vector<Var> parameters, StreamType & out_stream);
-	bool PrintDatePart(pt::Date * date, const std::wstring & field, std::vector<Var> parameters, StreamType & out_stream);
+	void PrintDate(pt::Date * date, std::vector<Var> & parameters, StreamType & out_stream);
+	bool PrintDatePart(pt::Date * date, const std::wstring & field, std::vector<Var> & parameters, StreamType & out_stream);
 
-	bool CallDate(FindHelper & find_helper, std::vector<std::wstring> & fields, std::vector<Var> parameters, StreamType & out_stream);
+	bool CallDate(FindHelper & find_helper, std::vector<std::wstring> & fields, std::vector<Var> & parameters, StreamType & out_stream);
 
 	void PrintLastSpaceField(pt::Space * space, std::vector<Var> & parameters, StreamType & out_stream);
 	void CallSpaceObjectForLastField(std::vector<Var> & parameters, StreamType & out_stream, pt::Space * space);
@@ -333,10 +333,10 @@ private:
 	bool CallSpace(FindHelper & find_helper, std::vector<std::wstring> & fields, std::vector<Var> & parameters, StreamType & out_stream);
 
 #ifdef EZC_HAS_MORM_LIBRARY
-	bool CallModelField(morm::Model & model, const std::wstring & field, std::vector<Var> parameters, StreamType & out_stream, const StreamType & in_stream);
-	bool CallModel(morm::Model & model, FindHelper & find_helper, std::vector<std::wstring> & fields, std::vector<Var> parameters, StreamType & out_stream, const StreamType & in_stream);
+	bool CallModelField(morm::Model & model, const std::wstring & field, std::vector<Var> & parameters, StreamType & out_stream, const StreamType & in_stream);
+	bool CallModel(morm::Model & model, FindHelper & find_helper, std::vector<std::wstring> & fields, std::vector<Var> & parameters, StreamType & out_stream, const StreamType & in_stream);
 	void FindLastModelWrapper(FindHelper & find_helper, std::vector<std::wstring> & fields);
-	bool CallWrapper(FindHelper & find_helper, std::vector<std::wstring> & fields, std::vector<Var> parameters, StreamType & out_stream, const StreamType & in_stream);
+	bool CallWrapper(FindHelper & find_helper, std::vector<std::wstring> & fields, std::vector<Var> & parameters, StreamType & out_stream, const StreamType & in_stream);
 #endif
 
 	void CallObject(BaseObj<StreamType> & base_obj,
@@ -1305,7 +1305,7 @@ void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::DumpModel
 
 
 template<class StreamType, bool is_pikotools_stream, bool is_autoescape_stream>
-void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::PrintDate(pt::Date * date, std::vector<Var> parameters, StreamType & out_stream)
+void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::PrintDate(pt::Date * date, std::vector<Var> & parameters, StreamType & out_stream)
 {
 	bool is_roman = HasParam(parameters, L"roman");
 	bool is_no_sec = HasParam(parameters, L"no_sec");
@@ -1332,7 +1332,7 @@ void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::PrintDate
 
 
 template<class StreamType, bool is_pikotools_stream, bool is_autoescape_stream>
-bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::PrintDatePart(pt::Date * date, const std::wstring & field, std::vector<Var> parameters, StreamType & out_stream)
+bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::PrintDatePart(pt::Date * date, const std::wstring & field, std::vector<Var> & parameters, StreamType & out_stream)
 {
 	bool is_test = IsTestingFunctionExistence();
 
@@ -1388,7 +1388,7 @@ bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::PrintDate
 
 
 template<class StreamType, bool is_pikotools_stream, bool is_autoescape_stream>
-bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallDate(FindHelper & find_helper, std::vector<std::wstring> & fields, std::vector<Var> parameters, StreamType & out_stream)
+bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallDate(FindHelper & find_helper, std::vector<std::wstring> & fields, std::vector<Var> & parameters, StreamType & out_stream)
 {
 	bool found = true;
 	bool all_fields_known = (find_helper.field_index == fields.size());
@@ -1622,7 +1622,8 @@ bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallSpace
 #ifdef EZC_HAS_MORM_LIBRARY
 
 template<class StreamType, bool is_pikotools_stream, bool is_autoescape_stream>
-bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallModelField(morm::Model & model, const std::wstring & field, std::vector<Var> parameters, StreamType & out_stream, const StreamType & in_stream)
+bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallModelField(
+			morm::Model & model, const std::wstring & field, std::vector<Var> & parameters, StreamType & out_stream, const StreamType & in_stream)
 {
 	/*
 	 * if 'field' is a POD type then 'str' will be used in get_raw_value()
@@ -1658,7 +1659,7 @@ bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallModel
 
 template<class StreamType, bool is_pikotools_stream, bool is_autoescape_stream>
 bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallModel(morm::Model & model, FindHelper & find_helper, std::vector<std::wstring> & fields,
-									  std::vector<Var> parameters, StreamType & out_stream, const StreamType & in_stream)
+									  std::vector<Var> & parameters, StreamType & out_stream, const StreamType & in_stream)
 {
 	bool found = true;
 
@@ -1743,7 +1744,7 @@ void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::FindLastM
 
 template<class StreamType, bool is_pikotools_stream, bool is_autoescape_stream>
 bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallWrapper(FindHelper & find_helper, std::vector<std::wstring> & fields,
-										   std::vector<Var> parameters, StreamType & out_stream, const StreamType & in_stream)
+										   std::vector<Var> & parameters, StreamType & out_stream, const StreamType & in_stream)
 {
 	bool found = true;
 	last_res = false;