diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index 67591a3..3e9322a 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -3452,7 +3452,7 @@ PUGI__NS_BEGIN
 		writer.write('-', '-', '>');
 	}
 
-	PUGI__FN void node_output_attributes(xml_buffered_writer& writer, const xml_node node, unsigned int flags)
+	PUGI__FN void node_output_attributes(xml_buffered_writer& writer, const xml_node& node, unsigned int flags)
 	{
 		const char_t* default_name = PUGIXML_TEXT(":anonymous");
 
@@ -3468,7 +3468,7 @@ PUGI__NS_BEGIN
 		}
 	}
 
-	PUGI__FN bool node_output_start(xml_buffered_writer& writer, const xml_node node, unsigned int flags)
+	PUGI__FN bool node_output_start(xml_buffered_writer& writer, const xml_node& node, unsigned int flags)
 	{
 		const char_t* default_name = PUGIXML_TEXT(":anonymous");
 		const char_t* name = node.name()[0] ? node.name() : default_name;
@@ -3520,7 +3520,7 @@ PUGI__NS_BEGIN
 		return false;
 	}
 
-	PUGI__FN void node_output_end(xml_buffered_writer& writer, const xml_node node, unsigned int flags)
+	PUGI__FN void node_output_end(xml_buffered_writer& writer, const xml_node& node, unsigned int flags)
 	{
 		const char_t* default_name = PUGIXML_TEXT(":anonymous");
 		const char_t* name = node.name()[0] ? node.name() : default_name;
@@ -3534,7 +3534,7 @@ PUGI__NS_BEGIN
 			writer.write('>', '\n');
 	}
 
-	PUGI__FN void node_output_simple(xml_buffered_writer& writer, const xml_node node, unsigned int flags)
+	PUGI__FN void node_output_simple(xml_buffered_writer& writer, const xml_node& node, unsigned int flags)
 	{
 		const char_t* default_name = PUGIXML_TEXT(":anonymous");
 
@@ -3657,7 +3657,7 @@ PUGI__NS_BEGIN
 		while (node != root);
 	}
 
-	PUGI__FN bool has_declaration(const xml_node node)
+	PUGI__FN bool has_declaration(const xml_node& node)
 	{
 		for (xml_node child = node.first_child(); child; child = child.next_sibling())
 		{
@@ -3688,7 +3688,7 @@ PUGI__NS_BEGIN
 		return true;
 	}
 
-	PUGI__FN bool allow_move(const xml_node parent, const xml_node child)
+	PUGI__FN bool allow_move(const xml_node& parent, const xml_node& child)
 	{
 		// check that child can be a child of parent
 		if (!allow_insert_child(parent.type(), child.type()))
@@ -7330,7 +7330,7 @@ PUGI__NS_BEGIN
 		}
 	};
 
-	PUGI__FN const char_t* namespace_uri(const xml_node node)
+	PUGI__FN const char_t* namespace_uri(const xml_node& node)
 	{
 		namespace_uri_predicate pred = node.name();
 		
@@ -7348,7 +7348,7 @@ PUGI__NS_BEGIN
 		return PUGIXML_TEXT("");
 	}
 
-	PUGI__FN const char_t* namespace_uri(const xml_attribute attr, const xml_node parent)
+	PUGI__FN const char_t* namespace_uri(const xml_attribute& attr, const xml_node& parent)
 	{
 		namespace_uri_predicate pred = attr.name();