(image-jpeg-p): Don't fail if the arg cannot be converted to unibyte. Just assume it is not a JPEG. Use `string-match-p'. (image-type-from-data, image-type-from-file-name): Use `string-match-p'. (image-type-from-buffer): Use `looking-at-p'.