I'll look at #5119 presently. As for loose file deps - that'd unfortunately be new feature.