more virtenv refactoring...