Refactoring VWI dependencies.