Minor dependency refactors.