Renamed HTTP.expand_options to normalize_options.
Renamed HTTP.expand_url to options_from.
URI() in 1.9.x can accept URIs or Strings.