More improvements to content negotiation.