Do you think it'd be better to cut'n'paste the _find_by_path function here instead?