The commands/dcommands library is involved in several deep cycles due to a handful of stateful commands. Split those commands out into separate libraries.