depends() was broken all this time :D
Some more rearrangements