Bugfixes; made expressions handle deps as well.