Better content-type handling for inbound data