Fix macro; experiment with calling dependencies task