Fixup dependency structure.