Better content-type parsing