Make pillow an explicit dependency since wheel distributions can't have optional dependencies, and clean up uses of it.