Trying to improve automatic dependency handling again.