depends: revert to functional style