I'm a tiny bit perturbed that there are now two bits of code for extracting deps from source files