- More work on de-Vagrantifying.