nit: If you move this into the if block above, you can get rid of the not virtualenv or not marionette env pieces