Small enhancement for content type checking