Clean up import dependencies to avoid implicit dependencies.

Main intent here is to allow for piecemeal importing of features (aka the unit tests).