Changed some of the dependency string checking code due to some fears I had of people doing weird things.