Take defaults out of the `bundle_dotvar` function and precompile them
Moving dependency injection to the top-level file.

Improving DI overall.

Unit tests don't use file system any more.