Reformats dependency listing.
Reverts some unit-related changes.