Deal with virtualenv 1.11.0 in a few more places.