Minor cleanup.
ImageData code now sets the 'type' field.