Removed usage of remote anchor types.

library/network/protocol/http/src/http_header.e

@@ -285,23 +285,22 @@ feature -- Access
 		require
 			has_header: has_header_named (a_name)
 		local
-			c: like headers.new_cursor
 			n: INTEGER
 			l_line: READABLE_STRING_8
 		do
-			from
+			n := a_name.count
-				n := a_name.count
+
-				c := headers.new_cursor
+			across
+				headers as ic
 			until
-				c.after or Result /= Void
+				Result /= Void
 			loop
-				l_line := c.item
+				l_line := ic.item
 				if has_same_header_name (l_line, a_name) then
 					Result := l_line.substring (n + 2, l_line.count)
 					Result.left_adjust
 					Result.right_adjust
 				end
-				c.forth
 			end
 		end
 
@@ -917,7 +916,7 @@ feature {NONE} -- Constants
 		end
 
 note
-	copyright: "2011-2013, Jocelyn Fiat, Eiffel Software and others"
+	copyright: "2011-2014, Jocelyn Fiat, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software

library/server/ewsgi/connectors/nino/src/nino_service.e

@@ -28,13 +28,13 @@ feature {NONE} -- Implementation
 			create connector.make_with_base (a_service, a_base_url)
 		end
 
-	make_with_callback (a_callback: like {WGI_AGENT_SERVICE}.callback)
+	make_with_callback (a_callback: PROCEDURE [ANY, TUPLE [req: WGI_REQUEST; res: WGI_RESPONSE]])
 			-- Initialize `Current'.
 		do
 			make_custom_with_callback (a_callback, Void)
 		end
 
-	make_custom_with_callback (a_callback: like {WGI_AGENT_SERVICE}.callback; a_base_url: detachable STRING)
+	make_custom_with_callback (a_callback: PROCEDURE [ANY, TUPLE [req: WGI_REQUEST; res: WGI_RESPONSE]]; a_base_url: detachable STRING)
 			-- Initialize `Current'.
 		require
 			base_url_starts_with_slash: (a_base_url /= Void and then not a_base_url.is_empty) implies a_base_url.starts_with ("/")
@@ -104,7 +104,7 @@ feature -- Server
 		end
 
 note
-	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software

library/server/wsf/extension/handler/wsf_handler_routes_recorder.e

@@ -25,14 +25,14 @@ feature {WSF_ROUTER} -- Routes change
 		do
 			l_routes := available_routes
 			if l_routes = Void then
-				create {ARRAYED_LIST [like available_routes.item]} l_routes.make (3)
+				create {ARRAYED_LIST [TUPLE [resource: READABLE_STRING_8; rqst_methods: detachable ARRAY [READABLE_STRING_8]]]} l_routes.make (3)
 				available_routes := l_routes
 			end
 			l_routes.force ([a_resource, a_rqst_methods])
 		end
 
 note
-	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software

library/server/wsf/policy_driven/wsf_method_helper.e

@@ -169,10 +169,10 @@ feature -- Content negotiation
 		local
 			l_conneg: SERVER_CONTENT_NEGOTIATION
 			h: HTTP_HEADER
-			l_media: like {SERVER_CONTENT_NEGOTIATION}.media_type_preference
+			l_media: HTTP_ACCEPT_MEDIA_TYPE_VARIANTS
-			l_lang: like {SERVER_CONTENT_NEGOTIATION}.language_preference
+			l_lang: HTTP_ACCEPT_LANGUAGE_VARIANTS
-			l_charset: like {SERVER_CONTENT_NEGOTIATION}.charset_preference
+			l_charset: HTTP_ACCEPT_CHARSET_VARIANTS
-			l_encoding: like {SERVER_CONTENT_NEGOTIATION}.encoding_preference
+			l_encoding: HTTP_ACCEPT_ENCODING_VARIANTS
 			l_mime_types, l_langs, l_charsets, l_encodings: LIST [STRING]
 			l_vary_star: BOOLEAN
 		do
@@ -586,7 +586,7 @@ feature -- Error reporting
 		end
 
 note
-	copyright: "2011-2013, Colin Adams, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2014, Colin Adams, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software

library/server/wsf/session/wsf_fs_session_manager.e

@@ -30,7 +30,7 @@ feature {NONE} -- Initialization
 
 feature -- Access
 
-	session_exists (a_session_uuid: like {WSF_SESSION}.uuid): BOOLEAN
+	session_exists (a_session_uuid: READABLE_STRING_8): BOOLEAN
 		local
 			f: RAW_FILE
 		do
@@ -38,7 +38,7 @@ feature -- Access
 			Result := f.exists and then f.is_readable
 		end
 
-	session_data (a_session_uuid: like {WSF_SESSION}.uuid): detachable like {WSF_SESSION}.data
+	session_data (a_session_uuid: READABLE_STRING_8): detachable WSF_SESSION_DATA
 		local
 			f: RAW_FILE
 		do
@@ -147,13 +147,13 @@ feature {NONE} -- Implementation
 			Result := d.exists and then d.is_writable
 		end
 
-	file_name (a_uuid: like {WSF_SESSION}.uuid): PATH
+	file_name (a_uuid: READABLE_STRING_GENERAL): PATH
 		do
-			Result := sessions_folder_name.extended (a_uuid.out).appended_with_extension ("session")
+			Result := sessions_folder_name.extended (a_uuid).appended_with_extension ("session")
 		end
 
 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software

library/server/wsf/session/wsf_session_manager.e

@@ -9,11 +9,11 @@ deferred class
 
 feature -- Access
 
-	session_exists (a_uuid: like {WSF_SESSION}.uuid): BOOLEAN
+	session_exists (a_uuid: READABLE_STRING_8): BOOLEAN
 		deferred
 		end
 
-	session_data (a_uuid: like {WSF_SESSION}.uuid): detachable like {WSF_SESSION}.data
+	session_data (a_uuid: READABLE_STRING_8): detachable WSF_SESSION_DATA
 		deferred
 		end
 
@@ -28,7 +28,7 @@ feature -- Persistence
 		end
 
 note
-	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software

library/server/wsf/src/service/wsf_service_launcher.e

@@ -56,12 +56,12 @@ feature {NONE} -- Initialization
 			launch
 		end
 
-	frozen make_callback (a_callback: like {WSF_CALLBACK_SERVICE}.callback; a_options: like options)
+	frozen make_callback (a_callback:  PROCEDURE [ANY, TUPLE [req: WSF_REQUEST; res: WSF_RESPONSE]]; a_options: like options)
 		do
 			make (create {WSF_CALLBACK_SERVICE}.make (a_callback), a_options)
 		end
 
-	frozen make_callback_and_launch (a_callback: like {WSF_CALLBACK_SERVICE}.callback; a_options: like options)
+	frozen make_callback_and_launch (a_callback:  PROCEDURE [ANY, TUPLE [req: WSF_REQUEST; res: WSF_RESPONSE]]; a_options: like options)
 		do
 			make (create {WSF_CALLBACK_SERVICE}.make (a_callback), a_options)
 		end
@@ -120,7 +120,7 @@ invariant
 	connector_attached: connector /= Void
 
 note
-	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software

library/server/wsf_html/widget/wsf_widget_table.e

@@ -28,8 +28,6 @@ feature {NONE} -- Initialization
 		end
 
 	make_from_table (tb: WSF_WIDGET_AGENT_TABLE [detachable ANY])
-		local
-			fct: like {WSF_WIDGET_AGENT_TABLE [detachable ANY]}.compute_item_function
 		do
 			make
 			set_column_count (tb.column_count)
@@ -53,8 +51,7 @@ feature {NONE} -- Initialization
 			end
 
 				-- rows
-			fct := tb.compute_item_function
+			if attached tb.compute_item_function as fct then
-			if fct /= Void then
 				if attached tb.head_data as lst then
 					across lst as d loop
 						add_head_row (fct.item ([d.item]))

library/text/parser/uri_template/src/uri_template.e

@@ -373,7 +373,7 @@ feature {NONE} -- Implementation
 				tpl := template
 
 					--| Extract expansion parts  "\\{([^\\}]*)\\}"
-				create {ARRAYED_LIST [like expressions.item]} l_expressions.make (tpl.occurrences ('{'))
+				create {ARRAYED_LIST [URI_TEMPLATE_EXPRESSION]} l_expressions.make (tpl.occurrences ('{'))
 				from
 					i := 1
 					n := tpl.count
@@ -515,7 +515,7 @@ feature {NONE} -- Implementation
 		end
 
 note
-	copyright: "2011-2012, Jocelyn Fiat, Eiffel Software and others"
+	copyright: "2011-2014, Jocelyn Fiat, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software

library/text/parser/uri_template/src/uri_template_expression.e

@@ -96,7 +96,7 @@ feature -- Processing
 
 					lst := s.split (',')
 					from
-						create {ARRAYED_LIST [like variables.item]} vars.make (lst.count)
+						create {ARRAYED_LIST [URI_TEMPLATE_EXPRESSION_VARIABLE]} vars.make (lst.count)
 						lst.start
 					until
 						lst.after
@@ -210,7 +210,7 @@ feature {NONE} -- Implementation
 	append_custom_variables_to_string (a_ht: HASH_TABLE [detachable ANY, STRING]; vars: like variables; prefix_char, delimiter_char: CHARACTER; a_include_name: BOOLEAN; a_buffer: STRING)
 			-- If `first_char' is '%U' do not print any first character
 		local
-			vi: like variables.item
+			vi: URI_TEMPLATE_EXPRESSION_VARIABLE
 			l_is_first: BOOLEAN
 			vdata: detachable ANY
 			vstr: detachable STRING
@@ -273,7 +273,7 @@ feature -- Status report
 		end
 
 ;note
-	copyright: "2011-2012, Jocelyn Fiat, Eiffel Software and others"
+	copyright: "2011-2014, Jocelyn Fiat, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software

library/utility/general/error/src/error_handler.e

@@ -21,7 +21,7 @@ feature {NONE} -- Initialization
 	make
 			-- Initialize `Current'.
 		do
-			create {ARRAYED_LIST [like errors.item]} errors.make (3)
+			create {ARRAYED_LIST [ERROR]} errors.make (3)
 			create error_added_actions
 		end
 
@@ -34,7 +34,7 @@ feature -- Access
 		do
 			Result := errors.first.code
 		end
-			
+
 feature -- Status
 
 	has_error: BOOLEAN
@@ -82,7 +82,7 @@ feature -- Synchronization
 		do
 			lst := synchronized_handlers
 			if lst = Void then
-				create {ARRAYED_LIST [like synchronized_handlers.item]} lst.make (0)
+				create {ARRAYED_LIST [ERROR_HANDLER]} lst.make (0)
 				lst.compare_references
 				synchronized_handlers := lst
 			end
@@ -312,7 +312,7 @@ feature -- Element changes
 		end
 
 note
-	copyright: "2011-2012, Eiffel Software and others"
+	copyright: "2011-2014, Jocelyn Fiat, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software