Replace more 'Image' imports with Pillow-compatible blocks

For Issue #697