Finish cleaning up and simplifying the path template scanning implementation