Reimplementation of functionality removed by prior commit

This commit implements the base path-to-source functionality and adds an
(adapted) version of Matt's code on top of it.