diff --git a/api_loader.e b/api_loader.e
index 310f2e85..eb9dd0bf 100644
--- a/api_loader.e
+++ b/api_loader.e
@@ -1,4 +1,4 @@
-indexing
+note
 	description: "[
 						Dynamic load a external API which exists in a dll or so.
 						Benefit is we can still use our executables even without the dll/so files.
@@ -13,7 +13,7 @@ class
 
 feature -- Query
 
-	safe_load_api (a_module_name: STRING; a_api_name: STRING): POINTER is
+	safe_load_api (a_module_name: STRING; a_api_name: STRING): POINTER
 			-- Safe loading `a_api_name' in `a_module_name' if possible.
 			-- `a_module_name' is case sensitive.
 		require
@@ -28,7 +28,7 @@ feature -- Query
 			end
 		end
 
-	module_pointer (a_name: STRING): POINTER is
+	module_pointer (a_name: STRING): POINTER
 			-- Find module hanle with `a_name'
 			-- Result is void if not exists
 		require
@@ -44,7 +44,7 @@ feature -- Query
 			end
 		end
 
-	api_pointer (a_module: POINTER; a_name: STRING): POINTER is
+	api_pointer (a_module: POINTER; a_name: STRING): POINTER
 			-- Find API pointer which name is `a_name' in `a_module'
 			-- Result is void if not exists.
 		require
@@ -63,24 +63,24 @@ feature -- Query
 
 feature {NONE} -- Implementation
 
-	loaded_modules: HASH_TABLE [POINTER, STRING] is
+	loaded_modules: HASH_TABLE [POINTER, STRING]
 			-- Loaded modules
 		once
 			create Result.make (1)
 		end
 
-	loaded_apis: HASH_TABLE [POINTER, STRING] is
+	loaded_apis: HASH_TABLE [POINTER, STRING]
 			-- Loaded apis.
 		once
 			create Result.make (10)
 		end
 
-	implementation: API_LOADER_IMP is
+	implementation: API_LOADER_IMP
 			-- Native loader
 		once
 			create Result
 		end
-indexing
+note
 	copyright: "Copyright (c) 1984-2007, Eiffel Software"
 	license:   "GPL version 2 (see http://www.eiffel.com/licensing/gpl.txt)"
 	licensing_options: "http://www.eiffel.com/licensing"
diff --git a/cURL.ecf b/cURL.ecf
index c063ebdc..062cd010 100644
--- a/cURL.ecf
+++ b/cURL.ecf
@@ -10,7 +10,7 @@
 			<exclude>/EIFGEN.{0,1}$</exclude>
 			<exclude>/temp$</exclude>
 		</file_rule>
-		<option warning="true" namespace="EiffelSoftware.Library">
+		<option warning="true" namespace="EiffelSoftware.Library" syntax_level="1">
 		</option>
 		<setting name="dotnet_naming_convention" value="true"/>
 		<external_include location="$(ISE_LIBRARY)\library\cURL\spec\include">
diff --git a/curl_codes.e b/curl_codes.e
index 52c3982c..e3627cbc 100644
--- a/curl_codes.e
+++ b/curl_codes.e
@@ -1,4 +1,4 @@
-indexing
+note
 	description: "[
 						All possible error codes from all sorts of curl functions.
 						Future versions	may return other values, stay prepared.
@@ -13,310 +13,310 @@ class
 
 feature -- Constants
 
-	curle_ok: INTEGER is 0
+	curle_ok: INTEGER = 0
 			-- Declared as CURLE_OK
 
-	curle_unsupported_protocol: INTEGER is 1
+	curle_unsupported_protocol: INTEGER = 1
 			-- Declared as CURLE_UNSUPPORTED_PROTOCOL
 
-	curle_failed_init: INTEGER is 2
+	curle_failed_init: INTEGER = 2
 			-- Declared as CURLE_FAILED_INIT
 
-  	curle_url_malformat: INTEGER is 3
+  	curle_url_malformat: INTEGER = 3
   			-- Declared as CURLE_URL_MALFORMAT
 
- 	curle_obsolete4: INTEGER is 4
+ 	curle_obsolete4: INTEGER = 4
  	 		-- Declared as CURLE_OBSOLETE4
  	 		-- NOT USED
 
- 	curle_couldnt_resolve_proxy: INTEGER is 5
+ 	curle_couldnt_resolve_proxy: INTEGER = 5
  			-- Declared as CURLE_COULDNT_RESOLVE_PROXY
 
-  	curle_couldnt_resolve_host: INTEGER is 6
+  	curle_couldnt_resolve_host: INTEGER = 6
   			-- Declared as CURLE_COULDNT_RESOLVE_HOST
 
-  	curle_couldnt_connect: INTEGER is 7
+  	curle_couldnt_connect: INTEGER = 7
   			-- Declared as CURLE_COULDNT_CONNECT
 
-  	curle_ftp_weird_server_reply: INTEGER is 8
+  	curle_ftp_weird_server_reply: INTEGER = 8
   			-- Declared as CURLE_FTP_WEIRD_SERVER_REPLY
 
-	curle_remote_access_denied: INTEGER is 9
+	curle_remote_access_denied: INTEGER = 9
 			-- Declared as CURLE_REMOTE_ACCESS_DENIED
 			-- A service was denied by the server due to lack of access
 			-- when login fails this is not returned.
 
-	curle_obsolete10: INTEGER is 10
+	curle_obsolete10: INTEGER = 10
 			-- Declared as CURLE_OBSOLETE10 NOT USED
 
-	curle_ftp_weird_pass_reply: INTEGER is 11
+	curle_ftp_weird_pass_reply: INTEGER = 11
 			-- Declared as CURLE_FTP_WEIRD_PASS_REPLY
 
-  	curle_obsolete12: INTEGER is 12
+  	curle_obsolete12: INTEGER = 12
   			-- Declared as CURLE_OBSOLETE12 NOT USED
 
-	curle_ftp_weird_pasv_reply: INTEGER is 13
+	curle_ftp_weird_pasv_reply: INTEGER = 13
 			-- Declared as CURLE_FTP_WEIRD_PASV_REPLY
 
-  	curle_ftp_weird_227_format: INTEGER is 14
+  	curle_ftp_weird_227_format: INTEGER = 14
   			-- Declared as CURLE_FTP_WEIRD_227_FORMAT
 
-	curle_ftp_cant_get_host: INTEGER is 15
+	curle_ftp_cant_get_host: INTEGER = 15
 			-- Declared as CURLE_FTP_CANT_GET_HOST
 
-  	curle_obsolete16: INTEGER is 16
+  	curle_obsolete16: INTEGER = 16
   			-- Declared as CURLE_OBSOLETE16
   			-- NOT USED
 
-	curle_ftp_couldnt_set_type: INTEGER is 17
+	curle_ftp_couldnt_set_type: INTEGER = 17
 			-- Declared as CURLE_FTP_COULDNT_SET_TYPE
 
-	curle_partial_file: INTEGER is 18
+	curle_partial_file: INTEGER = 18
 			-- Declared as CURLE_PARTIAL_FILE
 
-  	curle_ftp_couldnt_retr_file: INTEGER is 19
+  	curle_ftp_couldnt_retr_file: INTEGER = 19
   			-- Declared as CURLE_FTP_COULDNT_RETR_FILE
 
-  	curle_obsolete20: INTEGER is 20
+  	curle_obsolete20: INTEGER = 20
   			-- Declared as CURLE_OBSOLETE20
   			-- NOT USED
 
-  	curle_quote_error: INTEGER is 21
+  	curle_quote_error: INTEGER = 21
   			-- Declared as CURLE_QUOTE_ERROR
   			-- quote command failure
 
-  	curle_http_returned_error: INTEGER is 22
+  	curle_http_returned_error: INTEGER = 22
   			-- Declared as CURLE_HTTP_RETURNED_ERROR
 
-  	curle_write_error: INTEGER is 23
+  	curle_write_error: INTEGER = 23
   			-- Declared as CURLE_WRITE_ERROR
 
-  	curle_obsolete24: INTEGER is 24
+  	curle_obsolete24: INTEGER = 24
   			-- Declared as CURLE_OBSOLETE24 NOT USED
 
-	curle_upload_failed: INTEGER is 25
+	curle_upload_failed: INTEGER = 25
   			-- Declared as CURLE_UPLOAD_FAILED
   			-- failed upload "command"
 
-	curle_read_error: INTEGER is 26
+	curle_read_error: INTEGER = 26
   			-- Declared as CURLE_READ_ERROR
   			-- couldn't open/read from file
 
-	curle_out_of_memory: INTEGER is 27
+	curle_out_of_memory: INTEGER = 27
   			-- Declared as CURLE_OUT_OF_MEMORY
   			-- Note: CURLE_OUT_OF_MEMORY may sometimes indicate a conversion error
   			-- instead of a memory allocation error if CURL_DOES_CONVERSIONS
   			-- is defined
 
-	curle_operation_timedout: INTEGER is 28
+	curle_operation_timedout: INTEGER = 28
   			-- Declared as CURLE_OPERATION_TIMEDOUT
   			-- the timeout time was reached
 
-	curle_obsolete29: INTEGER is 29
+	curle_obsolete29: INTEGER = 29
 			-- Declared as CURLE_OBSOLETE29
 			-- NOT USED
 
-	curle_ftp_port_failed: INTEGER is 30
+	curle_ftp_port_failed: INTEGER = 30
 			-- Declared as CURLE_FTP_PORT_FAILED
 			-- FTP PORT operation failed
 
-	curle_ftp_couldnt_use_rest: INTEGER is 31
+	curle_ftp_couldnt_use_rest: INTEGER = 31
 			-- Declared as CURLE_FTP_COULDNT_USE_REST
 			-- the REST command failed
 
-	curle_obsolete32: INTEGER is 32
+	curle_obsolete32: INTEGER = 32
 			-- Declared as CURLE_OBSOLETE32
 			-- NOT USED
 
-	curle_range_error: INTEGER is 33
+	curle_range_error: INTEGER = 33
 			-- Declared as CURLE_RANGE_ERROR
 			-- RANGE "command" didn't work
 
-	curle_http_post_error: INTEGER is 34
+	curle_http_post_error: INTEGER = 34
 			-- Declared as CURLE_HTTP_POST_ERROR
 
-	curle_ssl_connect_error: INTEGER is 35
+	curle_ssl_connect_error: INTEGER = 35
 			-- Declared CURLE_SSL_CONNECT_ERROR
 			-- wrong when connecting with SSL
 
-	curle_bad_download_resume: INTEGER is 36
+	curle_bad_download_resume: INTEGER = 36
 			-- Declared as CURLE_BAD_DOWNLOAD_RESUME
 			-- couldn't resume download
 
-	curle_file_couldnt_read_file: INTEGER is 37
+	curle_file_couldnt_read_file: INTEGER = 37
 			-- Declared as CURLE_FILE_COULDNT_READ_FILE
 
-	curle_ldap_cannot_bind: INTEGER is 38
+	curle_ldap_cannot_bind: INTEGER = 38
 			-- Declared as CURLE_LDAP_CANNOT_BIND
 
-	curle_ldap_search_failed: INTEGER is 39
+	curle_ldap_search_failed: INTEGER = 39
 			-- Declared as CURLE_LDAP_SEARCH_FAILED
 
-	curle_obsolete40: INTEGER is 40
+	curle_obsolete40: INTEGER = 40
 			-- Declared as CURLE_OBSOLETE40
 			-- NOT USED
 
-	curle_function_not_found: INTEGER is 41
+	curle_function_not_found: INTEGER = 41
 			-- Declared as CURLE_FUNCTION_NOT_FOUND
 
-	curle_aborted_by_callback: INTEGER is 42
+	curle_aborted_by_callback: INTEGER = 42
 			-- Declared as CURLE_ABORTED_BY_CALLBACK
 
-	curle_bad_function_argument: INTEGER is 43
+	curle_bad_function_argument: INTEGER = 43
 			-- Declared as CURLE_BAD_FUNCTION_ARGUMENT
 
-	curle_obsolete44: INTEGER is 44
+	curle_obsolete44: INTEGER = 44
 			-- Declared as CURLE_OBSOLETE44
 			-- NOT USED
 
-	curle_interface_failed: INTEGER is 45
+	curle_interface_failed: INTEGER = 45
 			-- Declared as CURLE_INTERFACE_FAILED
 			-- CURLOPT_INTERFACE failed
 
-	curle_obsolete46: INTEGER is 46
+	curle_obsolete46: INTEGER = 46
 			-- Declared as CURLE_OBSOLETE46
 			-- NOT USED
 
-	curle_too_many_redirects: INTEGER is 47
+	curle_too_many_redirects: INTEGER = 47
 			-- Declared as CURLE_TOO_MANY_REDIRECTS
 			-- catch endless re-direct loops
 
-	curle_unknown_telnet_option: INTEGER is 48
+	curle_unknown_telnet_option: INTEGER = 48
 			-- Declared as CURLE_UNKNOWN_TELNET_OPTION
 			-- User specified an unknown option
 
-	curle_telnet_option_syntax: INTEGER is 49
+	curle_telnet_option_syntax: INTEGER = 49
 			-- Declared as CURLE_TELNET_OPTION_SYNTAX
 			-- Malformed telnet option
 
-	curle_obsolete50: INTEGER is 50
+	curle_obsolete50: INTEGER = 50
 			-- Declared as CURLE_OBSOLETE50
 			-- NOT USED
 
-	curle_ssl_peer_certificate: INTEGER is 51
+	curle_ssl_peer_certificate: INTEGER = 51
 			-- Declared as CURLE_SSL_PEER_CERTIFICATE
 			-- peer's certificate wasn't ok
 
-	curle_got_nothing: INTEGER is 52
+	curle_got_nothing: INTEGER = 52
 			-- Declared as CURLE_GOT_NOTHING
 			-- when this is a specific error
 
-	curle_ssl_engine_notfound: INTEGER is 53
+	curle_ssl_engine_notfound: INTEGER = 53
 			-- Declared as CURLE_SSL_ENGINE_NOTFOUND
 			-- SSL crypto engine not found */
 
-	curle_ssl_engine_setfailed: INTEGER is 54
+	curle_ssl_engine_setfailed: INTEGER = 54
 			-- Declared as CURLE_SSL_ENGINE_SETFAILED
 			-- can not set SSL crypto engine as default
 
-	curle_send_error: INTEGER is 55
+	curle_send_error: INTEGER = 55
 			-- Declared as CURLE_SEND_ERROR
 			-- failed sending network data
 
-	curle_recv_error: INTEGER is 56
+	curle_recv_error: INTEGER = 56
 			-- Declared as CURLE_RECV_ERROR
 			-- failure in receiving network data
 
-	curle_obsolete57: INTEGER is 57
+	curle_obsolete57: INTEGER = 57
 			-- Declared as CURLE_OBSOLETE57
 			-- NOT IN USE
 
-	curle_ssl_certproblem: INTEGER is 58
+	curle_ssl_certproblem: INTEGER = 58
 			-- Declared as CURLE_SSL_CERTPROBLEM
 			-- problem with the local certificate
 
-	curle_ssl_cipher: INTEGER is 59
+	curle_ssl_cipher: INTEGER = 59
 			-- Declared as CURLE_SSL_CIPHER
 			-- couldn't use specified cipher
 
-	curle_ssl_cacert: INTEGER is 60
+	curle_ssl_cacert: INTEGER = 60
 			-- Declared as CURLE_SSL_CACERT
 			-- problem with the CA cert (path?)
 
-	curle_bad_content_encoding: INTEGER is 61
+	curle_bad_content_encoding: INTEGER = 61
 			-- Declared as CURLE_BAD_CONTENT_ENCODING
 			-- Unrecognized transfer encoding
 
-	curle_ldap_invalid_url: INTEGER is 62
+	curle_ldap_invalid_url: INTEGER = 62
 			-- Declared as CURLE_LDAP_INVALID_URL
 			-- Invalid LDAP URL
 
-	curle_filesize_exceeded: INTEGER is 63
+	curle_filesize_exceeded: INTEGER = 63
 			-- Declared as CURLE_FILESIZE_EXCEEDED
 			-- Maximum file size exceeded
 
-	curle_use_ssl_failed: INTEGER is 64
+	curle_use_ssl_failed: INTEGER = 64
 			-- Declared as CURLE_USE_SSL_FAILED
 			-- Requested FTP SSL level failed
 
-	curle_send_fail_rewind: INTEGER is 65
+	curle_send_fail_rewind: INTEGER = 65
 			-- Declared as CURLE_SEND_FAIL_REWIND
 			-- Sending the data requires a rewind that failed
 
-	curle_ssl_engine_initfailed: INTEGER is 66
+	curle_ssl_engine_initfailed: INTEGER = 66
 			-- Declared as CURLE_SSL_ENGINE_INITFAILED
 			-- failed to initialise ENGINE
 
-	curle_login_denied: INTEGER is 67
+	curle_login_denied: INTEGER = 67
 			-- Declared as CURLE_LOGIN_DENIED
 			-- user, password or similar was not accepted and we failed to login
 
-	curle_tftp_notfound: INTEGER is 68
+	curle_tftp_notfound: INTEGER = 68
 			-- Declared as CURLE_TFTP_NOTFOUND
 			-- file not found on server
 
-	curle_tftp_perm: INTEGER is 69
+	curle_tftp_perm: INTEGER = 69
 			-- Declared as CURLE_TFTP_PERM
 			-- permission problem on server
 
-	curle_remote_disk_full: INTEGER is 70
+	curle_remote_disk_full: INTEGER = 70
 			-- Declared as CURLE_REMOTE_DISK_FULL
 			-- out of disk space on server
 
-	curle_tftp_illegal: INTEGER is 71
+	curle_tftp_illegal: INTEGER = 71
 			-- Declared as CURLE_TFTP_ILLEGAL
 			-- Illegal TFTP operation
 
-	curle_tftp_unknownid: INTEGER is 72
+	curle_tftp_unknownid: INTEGER = 72
 			-- Declared as CURLE_TFTP_UNKNOWNID
 			-- Unknown transfer ID
 
-	curle_remote_file_exists: INTEGER is 73
+	curle_remote_file_exists: INTEGER = 73
 			-- Declared as CURLE_REMOTE_FILE_EXISTS
 			-- File already exists
 
-	curle_tftp_nosuchuser: INTEGER is 74
+	curle_tftp_nosuchuser: INTEGER = 74
 			-- Declared as CURLE_TFTP_NOSUCHUSER
 			-- No such user
 
-	curle_conv_failed: INTEGER is 75
+	curle_conv_failed: INTEGER = 75
 			-- Declared as CURLE_CONV_FAILED
 			-- conversion failed
 
-	curle_conv_reqd: INTEGER is 76
+	curle_conv_reqd: INTEGER = 76
 			-- Declared as CURLE_CONV_REQD
 			-- caller must register conversion callbacks using curl_easy_setopt options
             -- CURLOPT_CONV_FROM_NETWORK_FUNCTION, CURLOPT_CONV_TO_NETWORK_FUNCTION, and
             -- CURLOPT_CONV_FROM_UTF8_FUNCTION
 
-	curle_ssl_cacert_badfile: INTEGER is 77
+	curle_ssl_cacert_badfile: INTEGER = 77
 			-- Declared as CURLE_SSL_CACERT_BADFILE
 			-- could not load CACERT file, missing or wrong format
 
-	curle_remote_file_not_found: INTEGER is 78
+	curle_remote_file_not_found: INTEGER = 78
 			-- Declared as CURLE_REMOTE_FILE_NOT_FOUND
 			-- remote file not found
 
-	curle_ssh: INTEGER is 79
+	curle_ssh: INTEGER = 79
 			-- Declared as CURLE_SSH
 			-- error from the SSH layer, somewhat generic so the error message will be of
             -- interest when this has happened
 
-	curle_ssl_shutdown_failed: INTEGER is 80;
+	curle_ssl_shutdown_failed: INTEGER = 80;
 			-- Declared as CURLE_SSL_SHUTDOWN_FAILED
 			-- Failed to shut down the SSL connection
 	
-indexing
+note
 	library:   "cURL: Library of reusable components for Eiffel."
 	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
 	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/curl_default_function.e b/curl_default_function.e
index f6248443..5b755885 100644
--- a/curl_default_function.e
+++ b/curl_default_function.e
@@ -1,4 +1,4 @@
-indexing
+note
 	description: "[
 					Default implementation of CURL_FUNCTION.
 																				]"
@@ -18,7 +18,7 @@ create
 
 feature {NONE} -- Initialization
 
-	make is
+	make
 			-- Creation method
 		do
 			set_object_and_function_address
@@ -26,12 +26,12 @@ feature {NONE} -- Initialization
 
 feature -- Command
 
-	progress_function (a_object_id: POINTER; a_download_total, a_download_now, a_upload_total, a_upload_now: REAL_64): INTEGER is
+	progress_function (a_object_id: POINTER; a_download_total, a_download_now, a_upload_total, a_upload_now: REAL_64): INTEGER
 			-- Redefine
 		do
 		end
 
-	write_function (a_data_pointer: POINTER; a_size, a_nmemb: INTEGER; a_object_id: POINTER): INTEGER is
+	write_function (a_data_pointer: POINTER; a_size, a_nmemb: INTEGER; a_object_id: POINTER): INTEGER
 			-- Redefine
 		local
 			l_c_string: C_STRING
@@ -47,7 +47,7 @@ feature -- Command
 			l_string.append (l_c_string.string)
 		end
 
-	debug_function (a_curl_handle: POINTER; a_curl_infotype: INTEGER; a_char_pointer: POINTER; a_size: INTEGER; a_object_id: POINTER): INTEGER is
+	debug_function (a_curl_handle: POINTER; a_curl_infotype: INTEGER; a_char_pointer: POINTER; a_size: INTEGER; a_object_id: POINTER): INTEGER
 			-- Redefine
 		local
 			l_c_string: C_STRING
@@ -76,7 +76,7 @@ feature -- Command
 
 feature {NONE} -- Implementation
 
-	dump (a_text: STRING; a_char_pointer: POINTER; a_size: INTEGER) is
+	dump (a_text: STRING; a_char_pointer: POINTER; a_size: INTEGER)
 			-- Dump debug information
 		require
 			not_void: a_text /= Void
@@ -89,7 +89,7 @@ feature {NONE} -- Implementation
 			print ("%N" + a_text + "%N" + l_c_string.string)
 		end
 
-indexing
+note
 	library:   "cURL: Library of reusable components for Eiffel."
 	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
 	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/curl_easy_externals.e b/curl_easy_externals.e
index e48efd09..cfe97b38 100644
--- a/curl_easy_externals.e
+++ b/curl_easy_externals.e
@@ -1,4 +1,4 @@
-indexing
+note
 	description: "[
 					cURL easy externals.
 					For more informaton see:
@@ -14,7 +14,7 @@ class
 
 feature -- Command
 
-	init: POINTER is
+	init: POINTER
 			-- Declared as curl_easy_init().
 		require
 			dynamic_library_exists: is_dynamic_library_exists
@@ -29,7 +29,7 @@ feature -- Command
 			exists: Result /= default_pointer
 		end
 
-	setopt_string (a_curl_handle: POINTER; a_opt: INTEGER; a_string: STRING_GENERAL) is
+	setopt_string (a_curl_handle: POINTER; a_opt: INTEGER; a_string: STRING_GENERAL)
 			-- Declared as curl_easy_setopt().
 		require
 			exists: a_curl_handle /= default_pointer
@@ -46,7 +46,7 @@ feature -- Command
 			end
 		end
 
-	setopt_form (a_curl_handle: POINTER; a_opt: INTEGER; a_form: CURL_FORM) is
+	setopt_form (a_curl_handle: POINTER; a_opt: INTEGER; a_form: CURL_FORM)
 			-- Declared as curl_easy_setopt().
 		require
 			exists: a_curl_handle /= default_pointer
@@ -56,7 +56,7 @@ feature -- Command
 			setopt_void_star (a_curl_handle, a_opt, a_form.item)
 		end
 
-	setopt_slist (a_curl_handle: POINTER; a_opt: INTEGER; a_curl_slist: POINTER) is
+	setopt_slist (a_curl_handle: POINTER; a_opt: INTEGER; a_curl_slist: POINTER)
 			-- Declared as curl_easy_setopt().
 		require
 			exists: a_curl_handle /= default_pointer
@@ -66,7 +66,7 @@ feature -- Command
 			setopt_void_star (a_curl_handle, a_opt, a_curl_slist)
 		end
 
-	setopt_curl_string (a_curl_handle: POINTER; a_opt: INTEGER; a_curl_string: CURL_STRING) is
+	setopt_curl_string (a_curl_handle: POINTER; a_opt: INTEGER; a_curl_string: CURL_STRING)
 			-- Declared as curl_easy_setopt().
 		require
 			exists: a_curl_handle /= default_pointer
@@ -81,7 +81,7 @@ feature -- Command
 			end
 		end
 
-	setopt_integer (a_curl_handle: POINTER; a_opt: INTEGER; a_integer: INTEGER) is
+	setopt_integer (a_curl_handle: POINTER; a_opt: INTEGER; a_integer: INTEGER)
 			-- Declared as curl_easy_setopt().
 		require
 			exists: a_curl_handle /= default_pointer
@@ -95,7 +95,7 @@ feature -- Command
 			end
 		end
 
-	perform (a_curl_handle: POINTER): INTEGER is
+	perform (a_curl_handle: POINTER): INTEGER
 			-- Declared as curl_easy_perform().
 			-- Result is one value from {CURL_CODES}
 		require
@@ -111,7 +111,7 @@ feature -- Command
 			valid:
 		end
 
-	cleanup (a_curl_handle: POINTER) is
+	cleanup (a_curl_handle: POINTER)
 			-- Declared as curl_easy_cleanup().
 		require
 			exists: a_curl_handle /= default_pointer
@@ -126,7 +126,7 @@ feature -- Command
 
 feature -- Query
 
-	is_dynamic_library_exists: BOOLEAN is
+	is_dynamic_library_exists: BOOLEAN
 			-- If dll/so files exist?
 		do
 			Result := (api_loader.module_pointer (module_name) /= default_pointer)
@@ -134,7 +134,7 @@ feature -- Query
 		
 feature -- Special setting
 
-	set_curl_function (a_curl_function: CURL_FUNCTION) is
+	set_curl_function (a_curl_function: CURL_FUNCTION)
 			-- Set `curl_function' with `a_curl_function'
 		do
 			internal_curl_function := a_curl_function
@@ -142,7 +142,7 @@ feature -- Special setting
 			set: a_curl_function /= Void implies curl_function = a_curl_function
 		end
 
-	curl_function: CURL_FUNCTION is
+	curl_function: CURL_FUNCTION
 			-- cURL functions in curl_easy_setopt.
 		do
 			Result := internal_curl_function
@@ -154,7 +154,7 @@ feature -- Special setting
 			not_void: Result /= Void
 		end
 
-	set_write_function (a_curl_handle: POINTER) is
+	set_write_function (a_curl_handle: POINTER)
 				-- Set cURL write function
 				-- Set cURL write function with Eiffel default write function.
 				-- So we can use CURL_STRING as parameter in {CURL_EASY_EXTERNALS}.setopt_curl_string when the option is {CURL_OPT_CONSTANTS}.curlopt_writedata
@@ -169,7 +169,7 @@ feature -- Special setting
 			end
 		end
 
-	set_progress_function (a_curl_handle: POINTER) is
+	set_progress_function (a_curl_handle: POINTER)
 				-- Set cURL progress function for upload/download progress.
 		require
 			exists: a_curl_handle /= default_pointer
@@ -182,7 +182,7 @@ feature -- Special setting
 			end
 		end
 
-	set_debug_function (a_curl_handle: POINTER) is
+	set_debug_function (a_curl_handle: POINTER)
 				-- Set cURL debug function
 		require
 			exists: a_curl_handle /= default_pointer
@@ -200,7 +200,7 @@ feature {NONE} -- Implementation
 	internal_curl_function: CURL_FUNCTION
 			-- cURL functions.
 
-	api_loader: API_LOADER is
+	api_loader: API_LOADER
 			-- API dynamic loader
 		once
 			create Result
@@ -208,7 +208,7 @@ feature {NONE} -- Implementation
 			not_void: Result /= Void
 		end
 
-	module_name: STRING is
+	module_name: STRING
 			-- Module name.
 		local
 			l_utility: CURL_UTILITY
@@ -217,7 +217,7 @@ feature {NONE} -- Implementation
 			Result := l_utility.module_name
 		end
 
-	setopt_void_star (a_curl_handle: POINTER; a_opt: INTEGER; a_data:POINTER) is
+	setopt_void_star (a_curl_handle: POINTER; a_opt: INTEGER; a_data:POINTER)
 			-- Declared as curl_easy_setopt().
 		require
 			exists: a_curl_handle /= default_pointer
@@ -233,7 +233,7 @@ feature {NONE} -- Implementation
 
 feature {NONE} -- C externals
 
-	c_init (a_api: POINTER): POINTER is
+	c_init (a_api: POINTER): POINTER
 			-- Declared curl_easy_init ().
 		require
 			exists: a_api /= default_pointer
@@ -245,7 +245,7 @@ feature {NONE} -- C externals
 			]"
 		end
 
-	c_cleanup (a_api: POINTER; a_curl_handle: POINTER) is
+	c_cleanup (a_api: POINTER; a_curl_handle: POINTER)
 			-- Decalred as curl_easy_cleanup ().
 		require
 			exists: a_api /= default_pointer
@@ -258,7 +258,7 @@ feature {NONE} -- C externals
 			]"
 		end
 
-	c_perform (a_api: POINTER; a_curl_handle: POINTER): INTEGER is
+	c_perform (a_api: POINTER; a_curl_handle: POINTER): INTEGER
 			-- Declared as curl_easy_perform().
 		require
 			exists: a_api /= default_pointer
@@ -272,7 +272,7 @@ feature {NONE} -- C externals
 			]"
 		end
 
-	c_setopt_int (a_api: POINTER; a_curl_handle: POINTER; a_opt: INTEGER; a_data: INTEGER) is
+	c_setopt_int (a_api: POINTER; a_curl_handle: POINTER; a_opt: INTEGER; a_data: INTEGER)
 			-- Same as `c_setopt' except we can pass `a_data' as integer.
 		require
 			exists: a_api /= default_pointer
@@ -291,7 +291,7 @@ feature {NONE} -- C externals
 			]"
 		end
 
-	c_setopt (a_api: POINTER; a_curl_handle: POINTER; a_opt: INTEGER; a_data: POINTER) is
+	c_setopt (a_api: POINTER; a_curl_handle: POINTER; a_opt: INTEGER; a_data: POINTER)
 			-- C implementation of `setopt_void_star'.
 			-- Declared as curl_easy_setopt ().
 		require
@@ -311,7 +311,7 @@ feature {NONE} -- C externals
 			]"
 		end
 
-indexing
+note
 	library:   "cURL: Library of reusable components for Eiffel."
 	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
 	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/curl_externals.e b/curl_externals.e
index 36637d3d..2dd05cef 100644
--- a/curl_externals.e
+++ b/curl_externals.e
@@ -1,4 +1,4 @@
-indexing
+note
 	description: "[
 					cURL externals.
 					For more information, see:
@@ -14,7 +14,7 @@ class
 
 feature -- Command
 
-	global_init is
+	global_init
 			-- Declared as curl_global_init().
 		require
 			dynamic_library_exists: is_dynamic_library_exists
@@ -27,7 +27,7 @@ feature -- Command
 			end
 		end
 
-	global_cleanup is
+	global_cleanup
 			-- Declared as curl_global_cleanup().
 		local
 			l_ptr: POINTER
@@ -38,7 +38,7 @@ feature -- Command
 			end
 		end
 
-	formadd_string_string (a_form: CURL_FORM; a_last_pointer: CURL_FORM; a_arg_1: INTEGER; a_arg_1_value: STRING_GENERAL; a_arg_2: INTEGER; a_arg_2_value: STRING_GENERAL; a_arg_3: INTEGER) is
+	formadd_string_string (a_form: CURL_FORM; a_last_pointer: CURL_FORM; a_arg_1: INTEGER; a_arg_1_value: STRING_GENERAL; a_arg_2: INTEGER; a_arg_2_value: STRING_GENERAL; a_arg_3: INTEGER)
 			-- Declared as curl_formadd ().
 		require
 			not_void: a_form /= Void
@@ -65,7 +65,7 @@ feature -- Command
 			end
 		end
 
-	slist_append (a_list: POINTER; a_string: STRING_GENERAL): POINTER is
+	slist_append (a_list: POINTER; a_string: STRING_GENERAL): POINTER
 			-- Declared as curl_slist_append ().
 		require
 			exists: a_list /= default_pointer
@@ -83,7 +83,7 @@ feature -- Command
 
 feature -- Query
 
-	is_dynamic_library_exists: BOOLEAN is
+	is_dynamic_library_exists: BOOLEAN
 			-- If dll/so files exist?
 		do
 			Result := (api_loader.module_pointer (module_name) /= default_pointer)
@@ -91,7 +91,7 @@ feature -- Query
 
 feature {CURL_FORM} -- Internal command
 
-	formfree (a_curl_form: POINTER) is
+	formfree (a_curl_form: POINTER)
 			-- Declared as curl_formfree ().
 			-- See: http://curl.askapache.com/libcurl/c/curl_formfree.html
 			-- curl_formfree() is used to clean up data previously built/appended with curl_formadd(3).
@@ -109,7 +109,7 @@ feature {CURL_FORM} -- Internal command
 
 feature {NONE} -- Implementation
 
-	api_loader: API_LOADER is
+	api_loader: API_LOADER
 			-- API dynamic loader
 		once
 			create Result
@@ -117,7 +117,7 @@ feature {NONE} -- Implementation
 			not_void: Result /= Void
 		end
 
-	module_name: STRING is
+	module_name: STRING
 			-- Module name.
 		local
 			l_utility: CURL_UTILITY
@@ -126,7 +126,7 @@ feature {NONE} -- Implementation
 			Result := l_utility.module_name
 		end
 
-	internal_formadd_string_string (a_form: TYPED_POINTER [POINTER]; a_last_pointer: TYPED_POINTER [POINTER]; a_arg_1: INTEGER; a_arg_1_value: STRING_GENERAL; a_arg_2: INTEGER; a_arg_2_value: STRING_GENERAL; a_arg_3: INTEGER) is
+	internal_formadd_string_string (a_form: TYPED_POINTER [POINTER]; a_last_pointer: TYPED_POINTER [POINTER]; a_arg_1: INTEGER; a_arg_1_value: STRING_GENERAL; a_arg_2: INTEGER; a_arg_2_value: STRING_GENERAL; a_arg_3: INTEGER)
 			-- Declared as curl_formadd ().
 		local
 			l_c_string_1, l_c_string_2: C_STRING
@@ -142,7 +142,7 @@ feature {NONE} -- Implementation
 
 feature {NONE} -- C externals
 
-	c_formadd_string_string (a_api: POINTER; a_form: TYPED_POINTER [POINTER]; a_last_pointer: TYPED_POINTER [POINTER]; a_arg_1: INTEGER; a_arg_1_value: POINTER; a_arg_2: INTEGER; a_arg_2_value: POINTER; a_arg_3: INTEGER) is
+	c_formadd_string_string (a_api: POINTER; a_form: TYPED_POINTER [POINTER]; a_last_pointer: TYPED_POINTER [POINTER]; a_arg_1: INTEGER; a_arg_1_value: POINTER; a_arg_2: INTEGER; a_arg_2_value: POINTER; a_arg_3: INTEGER)
 			-- C implementation of formadd_string_string ().
 		require
 			exists: a_api /= default_pointer
@@ -163,7 +163,7 @@ feature {NONE} -- C externals
 			]"
 		end
 
-	c_formfree (a_api: POINTER; a_curl_form: POINTER) is
+	c_formfree (a_api: POINTER; a_curl_form: POINTER)
 			-- Declared as curl_formfree ().
 		require
 			exists: a_api /= default_pointer
@@ -177,7 +177,7 @@ feature {NONE} -- C externals
 			]"
 		end
 
-	c_curl_global_init (a_api: POINTER; a_opt: NATURAL_64) is
+	c_curl_global_init (a_api: POINTER; a_opt: NATURAL_64)
 			-- `a_api' point to API curl_global_init ()
 			-- `a_opt' is intialization option.
 		require
@@ -190,7 +190,7 @@ feature {NONE} -- C externals
 			]"
 		end
 
-	c_curl_global_cleanup (a_api: POINTER) is
+	c_curl_global_cleanup (a_api: POINTER)
 			-- `a_api' point to API curl_global_cleanup()
 		require
 			exists: a_api /= default_pointer
@@ -202,7 +202,7 @@ feature {NONE} -- C externals
 			]"
 		end
 
-	c_slist_append (a_api: POINTER; a_list_pointer: POINTER; a_string: POINTER): POINTER is
+	c_slist_append (a_api: POINTER; a_list_pointer: POINTER; a_string: POINTER): POINTER
 			-- Declared as curl_slist_append ().
 		require
 			exists: a_api /= default_pointer
@@ -218,7 +218,7 @@ feature {NONE} -- C externals
 			]"
 		end
 
-indexing
+note
 	library:   "cURL: Library of reusable components for Eiffel."
 	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
 	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/curl_form.e b/curl_form.e
index 6d26c2e6..05ff7f69 100644
--- a/curl_form.e
+++ b/curl_form.e
@@ -1,4 +1,4 @@
-indexing
+note
 	description: "[
 					cURL form.
 					For more informaton see:
@@ -21,12 +21,12 @@ create
 
 feature {NONE} -- Initialization
 
-	make is
+	make
 			-- Creation method.
 		do
 		end
 
-	share_with_pointer (a_pointer: POINTER) is
+	share_with_pointer (a_pointer: POINTER)
 			-- Creation method.
 			-- `item' share with `a_pointer'.
 		require
@@ -50,7 +50,7 @@ feature -- Query
 
 feature -- Command
 
-	dispose is
+	dispose
 			-- Free memory if possible.
 		local
 			l_curl: CURL_EXTERNALS
@@ -62,7 +62,7 @@ feature -- Command
 			end
 		end
 
-	release_item is
+	release_item
 			-- Release item
 			-- NOT free memory! This is useful if Current generated by {CURL_EXTERNALS}.formadd_string_string.
 		do
@@ -71,7 +71,7 @@ feature -- Command
 
 feature {CURL_EXTERNALS} -- Internal command	
 
-	set_item (a_item: POINTER) is
+	set_item (a_item: POINTER)
 			-- Set `item' with `a_item'
 		do
 			item := a_item
@@ -79,7 +79,7 @@ feature {CURL_EXTERNALS} -- Internal command
 			set: item = a_item
 		end
 
-indexing
+note
 	library:   "cURL: Library of reusable components for Eiffel."
 	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
 	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/curl_form_constants.e b/curl_form_constants.e
index 414d99b0..260d5761 100644
--- a/curl_form_constants.e
+++ b/curl_form_constants.e
@@ -1,4 +1,4 @@
-indexing
+note
 	description: "[
 					cURL form constants.
 					For more informaton see:
@@ -14,7 +14,7 @@ class
 
 feature -- Query
 
-	curlform_copyname: INTEGER is
+	curlform_copyname: INTEGER
 			-- Declared as CURLFORM_COPYNAME
 		external
 			"C inline use <curl/curl.h>"
@@ -24,7 +24,7 @@ feature -- Query
 			]"
 		end
 
-	curlform_copycontents: INTEGER is
+	curlform_copycontents: INTEGER
 			-- Declared as CURLFORM_COPYCONTENTS
 		external
 			"C inline use <curl/curl.h>"
@@ -34,7 +34,7 @@ feature -- Query
 			]"
 		end
 
-	curlform_end: INTEGER is
+	curlform_end: INTEGER
 			-- Declared as CURLFORM_END
 		external
 			"C inline use <curl/curl.h>"
@@ -44,7 +44,7 @@ feature -- Query
 			]"
 		end
 
-	curlform_file: INTEGER is
+	curlform_file: INTEGER
 			-- Declared as CURLFORM_FILE
 		external
 			"C inline use <curl/curl.h>"
@@ -54,7 +54,7 @@ feature -- Query
 			]"
 		end
 
-	is_valid (a_integer: INTEGER): BOOLEAN is
+	is_valid (a_integer: INTEGER): BOOLEAN
 			-- If `a_integer' valid?
 		do
 			Result := 	a_integer = curlform_copycontents or
@@ -63,7 +63,7 @@ feature -- Query
 						a_integer = curlform_file
 		end
 
-indexing
+note
 	library:   "cURL: Library of reusable components for Eiffel."
 	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
 	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/curl_function.e b/curl_function.e
index 80f21b84..28f2e78a 100644
--- a/curl_function.e
+++ b/curl_function.e
@@ -1,4 +1,4 @@
-indexing
+note
 	description: "[
 						cURL curl_easy_setopt callback functions' Eiffel wrappers.
 						We need this class since cURL need a c function pointer as value but
@@ -18,7 +18,7 @@ inherit
 
 feature -- Interactive with C
 
-	set_object_and_function_address is
+	set_object_and_function_address
 			-- Set object and function addresses.
 			-- Call this feature before call `c_set_progress_function', `c_set_debug_function' and `c_set_write_function'.
 		do
@@ -28,7 +28,7 @@ feature -- Interactive with C
 			c_set_debug_function_address ($debug_function)
 		end
 
-	c_set_progress_function (a_setopt_api: POINTER; a_curl_handle: POINTER) is
+	c_set_progress_function (a_setopt_api: POINTER; a_curl_handle: POINTER)
 				-- Setting CURLOPT_PROGRESSFUNCTION option of `a_curl_handle'.
 				-- We need this function since cURL need a c function pointer as value.
 		require
@@ -46,7 +46,7 @@ feature -- Interactive with C
 			]"
 		end
 
-	c_set_debug_function (a_setopt_api: POINTER; a_curl_handle: POINTER) is
+	c_set_debug_function (a_setopt_api: POINTER; a_curl_handle: POINTER)
 				-- Setting CURLOPT_DEBUGFUNCTION option of `a_curl_handle'.
 				-- We need this function since cURL need a c function pointer as value.
 		require
@@ -65,7 +65,7 @@ feature -- Interactive with C
 			]"
 		end
 
-	c_set_write_function (a_setopt_api: POINTER; a_curl_handle: POINTER) is
+	c_set_write_function (a_setopt_api: POINTER; a_curl_handle: POINTER)
 				-- Setting CURLOPT_WRITEFUNCTION option of `a_curl_handle'.
 				-- We need this function since cURL need a c function pointer as value.
 		require
@@ -85,21 +85,21 @@ feature -- Interactive with C
 
 feature -- cURL curl_easy_setopt functions
 
-	progress_function (a_object_id: POINTER; a_download_total, a_download_now, a_upload_total, a_upload_now: REAL_64): INTEGER is
+	progress_function (a_object_id: POINTER; a_download_total, a_download_now, a_upload_total, a_upload_now: REAL_64): INTEGER
 			-- Function correspond to {CURL_OPT_CONSTANTS}.curlopt_progressfunction
 			-- Note, pass a {IDENTIFIED}.object_id as `a_object_id' value is helpful since we can't directly pass an Eiffel Object address which
 			-- may changed during GC.
 		deferred
 		end
 
-	write_function (a_data_pointer: POINTER; a_size, a_nmemb: INTEGER; a_object_id: POINTER): INTEGER is
+	write_function (a_data_pointer: POINTER; a_size, a_nmemb: INTEGER; a_object_id: POINTER): INTEGER
 			-- Function correspond to {CURL_OPT_CONSTANTS}.curlopt_writefunction
 			-- Note, pass a {IDENTIFIED}.object_id as `a_object_id' value is helpful since we can't directly pass an Eiffel Object address which
 			-- may changed during GC.
 		deferred
 		end
 
-	debug_function (a_curl_handle: POINTER; a_curl_infotype: INTEGER; a_char_pointer: POINTER; a_size: INTEGER; a_object_id: POINTER): INTEGER is
+	debug_function (a_curl_handle: POINTER; a_curl_infotype: INTEGER; a_char_pointer: POINTER; a_size: INTEGER; a_object_id: POINTER): INTEGER
 			-- Function correspond to {CURL_OPT_CONSTANTS}.curlopt_debugfunction
 			-- Note, pass a {IDENTIFIED}.object_id as `a_object_id' value is helpful since we can't directly pass an Eiffel Object address which
 			-- may changed during GC.			
@@ -110,31 +110,31 @@ feature -- cURL curl_easy_setopt functions
 
 feature {NONE} -- Externals
 
-	c_set_object (a_object: POINTER) is
+	c_set_object (a_object: POINTER)
 			-- Set Current object address.
 		external
 			"C signature (EIF_REFERENCE) use %"eiffel_curl.h%""
 		end
 
-	c_release_object is
+	c_release_object
 			-- Release Current pointer in C
 		external
 			"C use %"eiffel_curl.h%""
 		end
 
-	c_set_progress_function_address (a_address: POINTER) is
+	c_set_progress_function_address (a_address: POINTER)
 			-- Set progress function address.
 		external
 			"C use %"eiffel_curl.h%""
 		end
 
-	c_set_write_function_address (a_address: POINTER) is
+	c_set_write_function_address (a_address: POINTER)
 			-- Set write function address.
 		external
 			"C use %"eiffel_curl.h%""
 		end
 
-	c_set_debug_function_address (a_address: POINTER) is
+	c_set_debug_function_address (a_address: POINTER)
 			-- Set write function address.
 		external
 			"C use %"eiffel_curl.h%""
@@ -142,14 +142,14 @@ feature {NONE} -- Externals
 
 feature {NONE} -- Implementation
 
-	dispose is
+	dispose
 			-- Wean `Current'
 		do
 			c_release_object
 			c_set_object (default_pointer)
 		end
 
-indexing
+note
 	library:   "cURL: Library of reusable components for Eiffel."
 	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
 	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/curl_global_constants.e b/curl_global_constants.e
index da466828..90d4c29a 100644
--- a/curl_global_constants.e
+++ b/curl_global_constants.e
@@ -1,4 +1,4 @@
-indexing
+note
 	description: "[
 					cURL library constants used by curl_global_init () 
 																				]"
@@ -12,7 +12,7 @@ class
 
 feature -- Query
 
-	curl_global_ssl: NATURAL_64 is
+	curl_global_ssl: NATURAL_64
 			-- Delcared as CURL_GLOBAL_SSL
 		external
 			"C inline use <curl/curl.h>"
@@ -22,7 +22,7 @@ feature -- Query
 			]"
 		end
 
-	curl_global_win32: NATURAL_64 is
+	curl_global_win32: NATURAL_64
 			-- Delcared as CURL_GLOBAL_WIN32
 		external
 			"C inline use <curl/curl.h>"
@@ -32,7 +32,7 @@ feature -- Query
 			]"
 		end
 
-	curl_global_all: NATURAL_64 is
+	curl_global_all: NATURAL_64
 			-- Delcared as CURL_GLOBAL_ALL
 		external
 			"C inline use <curl/curl.h>"
@@ -42,7 +42,7 @@ feature -- Query
 			]"
 		end
 
-	curl_global_nothing: NATURAL_64 is
+	curl_global_nothing: NATURAL_64
 			-- Delcared as CURL_GLOBAL_NOTHING
 		external
 			"C inline use <curl/curl.h>"
@@ -52,7 +52,7 @@ feature -- Query
 			]"
 		end
 
-	curl_global_default: NATURAL_64 is
+	curl_global_default: NATURAL_64
 			-- Delcared as CURL_GLOBAL_DEFAULT
 		external
 			"C inline use <curl/curl.h>"
@@ -62,7 +62,7 @@ feature -- Query
 			]"
 		end
 		
-indexing
+note
 	library:   "cURL: Library of reusable components for Eiffel."
 	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
 	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/curl_info_type.e b/curl_info_type.e
index 5300bc29..a3c9cb39 100644
--- a/curl_info_type.e
+++ b/curl_info_type.e
@@ -1,4 +1,4 @@
-indexing
+note
 	description: "[
 						cURL library info type constants.
 																			]"
@@ -12,30 +12,30 @@ class
 
 feature -- Enumeration
 
-	curlinfo_text: INTEGER is 0
+	curlinfo_text: INTEGER = 0
 			-- Declared as CURLINFO_TEXT
 
-	curlinfo_header_in: INTEGER is 1
+	curlinfo_header_in: INTEGER = 1
 			-- Declared as CURLINFO_HEADER_IN
 
-	curlinfo_header_out: INTEGER is 2
+	curlinfo_header_out: INTEGER = 2
 			-- Declared as CURLINFO_HEADER_OUT
 
-	curlinfo_data_in: INTEGER is 3
+	curlinfo_data_in: INTEGER = 3
 			-- Declared as CURLINFO_DATA_IN
 
-	curlinfo_data_out: INTEGER is 4
+	curlinfo_data_out: INTEGER = 4
 			-- Declared as CURLINFO_DATA_OUT
 
-	curlinfo_ssl_data_in: INTEGER is 5
+	curlinfo_ssl_data_in: INTEGER = 5
 	 		-- Declared as CURLINFO_SSL_DATA_IN
 
-	curlinfo_ssl_data_out: INTEGER is 6
+	curlinfo_ssl_data_out: INTEGER = 6
 			-- Declared as CURLINFO_SSL_DATA_OUT
 
 feature -- Contract support
 
-	is_valid (a_type: INTEGER): BOOLEAN is
+	is_valid (a_type: INTEGER): BOOLEAN
 			-- If `a_type' valid?
 		do
 			Result := 	a_type = curlinfo_data_in or
@@ -47,7 +47,7 @@ feature -- Contract support
 						a_type = curlinfo_text
 		end
 
-indexing
+note
 	library:   "cURL: Library of reusable components for Eiffel."
 	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
 	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/curl_opt_constants.e b/curl_opt_constants.e
index 9958c24a..b2a611ea 100644
--- a/curl_opt_constants.e
+++ b/curl_opt_constants.e
@@ -1,4 +1,4 @@
-indexing
+note
 	description: "[
 					libcurl library opt constants
 					For more informaton see:
@@ -14,7 +14,7 @@ class
 
 feature -- Enumerations.
 
-	curlopt_httpheader: INTEGER is
+	curlopt_httpheader: INTEGER
 			-- Declared as CURLOPT_HTTPHEADER.
 		external
 			"C inline use <curl/curl.h>"
@@ -24,7 +24,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_writedata: INTEGER is
+	curlopt_writedata: INTEGER
 			-- Declared as CURLOPT_WRITEDATA.
 		external
 			"C inline use <curl/curl.h>"
@@ -34,7 +34,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_writeheader: INTEGER is
+	curlopt_writeheader: INTEGER
 			-- Declared as CURLOPT_WRITEHEADER.
 		external
 			"C inline use <curl/curl.h>"
@@ -44,7 +44,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_debugfunction: INTEGER is
+	curlopt_debugfunction: INTEGER
 			-- Declared as CURLOPT_DEBUGFUNCTION.
 		external
 			"C inline use <curl/curl.h>"
@@ -54,7 +54,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_followlocation: INTEGER is
+	curlopt_followlocation: INTEGER
 			-- Declared as CURLOPT_FOLLOWLOCATION
 		external
 			"C inline use <curl/curl.h>"
@@ -64,7 +64,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_verbose: INTEGER is
+	curlopt_verbose: INTEGER
 			-- Declared as CURLOPT_VERBOSE.
 		external
 			"C inline use <curl/curl.h>"
@@ -74,7 +74,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_useragent: INTEGER is
+	curlopt_useragent: INTEGER
 			-- Declared as CURLOPT_USERAGENT.
 		external
 			"C inline use <curl/curl.h>"
@@ -84,7 +84,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_url: INTEGER is
+	curlopt_url: INTEGER
 			-- Declared as CURLOPT_URL.
 		external
 			"C inline use <curl/curl.h>"
@@ -94,7 +94,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_cookiefile: INTEGER is
+	curlopt_cookiefile: INTEGER
 			-- Declared as CURLOPT_COOKIEFILE.
 		external
 			"C inline use <curl/curl.h>"
@@ -104,7 +104,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_ssl_verifypeer: INTEGER is
+	curlopt_ssl_verifypeer: INTEGER
 			-- Declared as CURLOPT_SSL_VERIFYPEER.
 		external
 			"C inline use <curl/curl.h>"
@@ -114,7 +114,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_cookie: INTEGER is
+	curlopt_cookie: INTEGER
 			-- Declared as CURLOPT_COOKIE.
 		external
 			"C inline use <curl/curl.h>"
@@ -124,7 +124,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_post: INTEGER is
+	curlopt_post: INTEGER
 			-- Declared as CURLOPT_POST.
 		external
 			"C inline use <curl/curl.h>"
@@ -134,7 +134,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_postfields: INTEGER is
+	curlopt_postfields: INTEGER
 			-- Declared as CURLOPT_POSTFIELDS.
 		external
 			"C inline use <curl/curl.h>"
@@ -144,7 +144,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_httppost: INTEGER is
+	curlopt_httppost: INTEGER
 			-- Declared as CURLOPT_HTTPPOST.
 		external
 			"C inline use <curl/curl.h>"
@@ -154,7 +154,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_writefunction: INTEGER is
+	curlopt_writefunction: INTEGER
 			-- Declared as CURLOPT_WRITEFUNCTION.
 		external
 			"C inline use <curl/curl.h>"
@@ -164,7 +164,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_progressfunction: INTEGER is
+	curlopt_progressfunction: INTEGER
 			-- Declared as CURLOPT_PROGRESSFUNCTION
 		external
 			"C inline use <curl/curl.h>"
@@ -174,7 +174,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_noprogress: INTEGER is
+	curlopt_noprogress: INTEGER
 			-- Declared as CURLOPT_NOPROGRESS
 		external
 			"C inline use <curl/curl.h>"
@@ -184,7 +184,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_progressdata: INTEGER is
+	curlopt_progressdata: INTEGER
 			-- Declared as CURLOPT_PROGRESSDATA
 		external
 			"C inline use <curl/curl.h>"
@@ -194,7 +194,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_referer: INTEGER is
+	curlopt_referer: INTEGER
 			-- Declared as CURLOPT_REFERER
 		external
 			"C inline use <curl/curl.h>"
@@ -204,7 +204,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	curlopt_httpget: INTEGER is
+	curlopt_httpget: INTEGER
 			-- Declared as CURLOPT_HTTPGET
 			-- Pass a long. If the long is non-zero, this forces the HTTP request to get back to GET. usable if a POST, HEAD, PUT or a custom request have been used previously using the same curl handle.
 			-- When setting CURLOPT_HTTPGET to a non-zero value, it will automatically set CURLOPT_NOBODY to 0 (since 7.14.1).
@@ -216,7 +216,7 @@ feature -- Enumerations.
 			]"
 		end
 
-	is_valid (a_integer: INTEGER): BOOLEAN is
+	is_valid (a_integer: INTEGER): BOOLEAN
 			-- If `a_integer' value vaild?
 		do
 			Result := 	a_integer = curlopt_cookie or
@@ -241,7 +241,7 @@ feature -- Enumerations.
 						a_integer = curlopt_httpget
 		end
 
-indexing
+note
 	library:   "cURL: Library of reusable components for Eiffel."
 	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
 	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/curl_string.e b/curl_string.e
index ce055282..5f38934c 100644
--- a/curl_string.e
+++ b/curl_string.e
@@ -1,4 +1,4 @@
-indexing
+note
 	description: "[
 					String used by cURL wrapper library.
 					Only added features from IDENTIFIED.
@@ -34,7 +34,7 @@ create
 	make_from_c,
 	make_from_cil
 
-indexing
+note
 	library:   "cURL: Library of reusable components for Eiffel."
 	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
 	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/curl_utility.e b/curl_utility.e
index b272be3b..d00db8ad 100644
--- a/curl_utility.e
+++ b/curl_utility.e
@@ -1,4 +1,4 @@
-indexing
+note
 	description: "[
 					Utilities for Eiffel cURL wrapper library.
 																		]"
@@ -12,7 +12,7 @@ class
 
 feature -- Query
 
-	module_name: STRING is
+	module_name: STRING
 			-- Module name.
 		once
 			if {PLATFORM}.is_windows then
@@ -26,7 +26,7 @@ feature -- Query
 			not_void: Result /= Void
 		end
 
-indexing
+note
 	library:   "cURL: Library of reusable components for Eiffel."
 	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
 	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/implementation/gtk/api_loader_imp.e b/implementation/gtk/api_loader_imp.e
index 339fa4ae..766a3529 100644
--- a/implementation/gtk/api_loader_imp.e
+++ b/implementation/gtk/api_loader_imp.e
@@ -1,4 +1,4 @@
-indexing
+note
 	description: "[
 					Interactive with native system APIs for dynamic loading.
 					GTK verson.
@@ -13,7 +13,7 @@ class
 
 feature -- Command
 
-	load_module (a_name: STRING): POINTER is
+	load_module (a_name: STRING): POINTER
 			-- Load module with `a_name'.
 			-- `a_name' is LPCTSTR, we should use WEL_STRING here.
 		require
@@ -25,7 +25,7 @@ feature -- Command
 			Result := {EV_GTK_EXTERNALS}.g_module_open (l_c_string.item, 0)
 		end
 
-	loal_api (a_module: POINTER; a_name: STRING): POINTER is
+	loal_api (a_module: POINTER; a_name: STRING): POINTER
 			-- Load api which name is `a_name' in `a_module'
 		require
 			exists: a_module /= default_pointer
@@ -44,7 +44,7 @@ feature -- Command
 			end
 		end
 
-indexing
+note
 	copyright: "Copyright (c) 1984-2007, Eiffel Software"
 	license:   "GPL version 2 (see http://www.eiffel.com/licensing/gpl.txt)"
 	licensing_options: "http://www.eiffel.com/licensing"
diff --git a/implementation/mswin/api_loader_imp.e b/implementation/mswin/api_loader_imp.e
index d53934a8..adedd01a 100644
--- a/implementation/mswin/api_loader_imp.e
+++ b/implementation/mswin/api_loader_imp.e
@@ -1,4 +1,4 @@
-indexing
+note
 	description: "[
 					Interactive with native system APIs for dynamic loading.
 					Windows verson.
@@ -13,7 +13,7 @@ class
 
 feature -- Command
 
-	load_module (a_name: STRING): POINTER is
+	load_module (a_name: STRING): POINTER
 			-- Load module with `a_name'.
 			-- `a_name' is LPCTSTR, we should use WEL_STRING here.
 		require
@@ -25,7 +25,7 @@ feature -- Command
 			Result := c_load_module (l_wel_string.item)
 		end
 
-	loal_api (a_module: POINTER; a_name: STRING): POINTER is
+	loal_api (a_module: POINTER; a_name: STRING): POINTER
 			-- Load api which name is `a_name' in `a_module'
 		require
 			exists: a_module /= default_pointer
@@ -39,7 +39,7 @@ feature -- Command
 
 feature {NONE} -- Implementation
 
-	c_load_module (a_name: POINTER): POINTER is
+	c_load_module (a_name: POINTER): POINTER
 			-- Load module with `a_name'.
 			-- `a_name' is LPCTSTR, we should use WEL_STRING here.
 		require
@@ -50,7 +50,7 @@ feature {NONE} -- Implementation
 			"return (EIF_POINTER) LoadLibrary ($a_name);"
 		end
 
-	c_loal_api (a_module: POINTER; a_name: POINTER): POINTER is
+	c_loal_api (a_module: POINTER; a_name: POINTER): POINTER
 			-- Load api which name is `a_name' in `a_module'
 		require
 			exists: a_module /= default_pointer
@@ -61,7 +61,7 @@ feature {NONE} -- Implementation
 			"return GetProcAddress ((HMODULE) $a_module, $a_name);"
 		end
 
-indexing
+note
 	copyright: "Copyright (c) 1984-2007, Eiffel Software"
 	license:   "GPL version 2 (see http://www.eiffel.com/licensing/gpl.txt)"
 	licensing_options: "http://www.eiffel.com/licensing"