More pip-related changes.