Make plugin dir logic a little cleaner so it passes tailor tests.