489: Allow more robust content-types to be handled effectively.

489: Allow more robust content-types to be handled effectively. #81