Shuffling some dependencies around.