Fix plugin regressions

[The recent changes](https://github.com/mitchellh/vagrant/compare/df540e4...d354cdda4a) seemed to introduce some regressions. This seems to fix at least the ones I hit.