Better handling of Accept and Content-Type headers.