Better handling of the HTTP spec.