diff --git a/library/server/wsf/extension/wsf_debug_information.e b/library/server/wsf/extension/wsf_debug_information.e
index afa41f41..bdd770d9 100644
--- a/library/server/wsf/extension/wsf_debug_information.e
+++ b/library/server/wsf/extension/wsf_debug_information.e
@@ -410,11 +410,7 @@ feature {NONE} -- Implementation
 		local
 			utf: UTF_CONVERTER
 		do
-			--if s.is_valid_as_string_8 then
-				--a_output.append (s.as_string_8)
-			--else
-				a_output.append (utf.utf_32_string_to_utf_8_string_8 (s))
-			--end
+			a_output.append (utf.utf_32_string_to_utf_8_string_8 (s))
 		end
 
 feature -- Constants
diff --git a/library/server/wsf/src/support/wsf_value_utilities.e b/library/server/wsf/src/support/wsf_value_utilities.e
index 60b2bdf3..d10baa60 100644
--- a/library/server/wsf/src/support/wsf_value_utilities.e
+++ b/library/server/wsf/src/support/wsf_value_utilities.e
@@ -21,6 +21,7 @@ inherit
 feature -- Smart parameter identification
 
 	add_utf_8_string_value_to_table (a_utf_8_name: READABLE_STRING_8; a_utf_8_value: READABLE_STRING_8; a_table: HASH_TABLE [WSF_VALUE, READABLE_STRING_GENERAL])
+			-- Add a utf-8 string value `a_utf_8_value' associated with name `a_utf_8_name' to `a_table'.
 		local
 			utf: UTF_CONVERTER
 			n,v: READABLE_STRING_32
@@ -31,6 +32,7 @@ feature -- Smart parameter identification
 		end
 
 	add_percent_encoded_string_value_to_table (a_encoded_name: READABLE_STRING_8; a_encoded_value: READABLE_STRING_8; a_table: HASH_TABLE [WSF_VALUE, READABLE_STRING_GENERAL])
+			-- Add a percent-encoded string value `a_encoded_value' associated with name `a_encoded_name' to `a_table'.
 		local
 			v: WSF_STRING
 		do
@@ -39,6 +41,7 @@ feature -- Smart parameter identification
 		end
 
 	add_value_to_table (a_name: READABLE_STRING_GENERAL; a_value: WSF_VALUE; a_table: HASH_TABLE [WSF_VALUE, READABLE_STRING_GENERAL])
+			-- Add value `a_value' associated with unicode name `a_name' to `a_table'.
 		local
 			l_decoded_name: STRING_32
 			l_encoded_name: READABLE_STRING_8