Rejiggering dependencies