Handle both images uniformly in convert_image
Dedupe preprocessing code