Minor refactoring to the DependencyGrabber.