Rearrange dependencies to be more pleasant.