Switch some file usages to paths.
Merge pull request #23 from csmith/master

Switch some file usages to paths.