WIP: trying to normalize into just a single "vagrant" use and also leaving requiretty alone.