More sensible way to handle content type checking.