More work getting automatic dependencies working. Should
be okay now.