Fix up file/dir interpolation.

Fixes GH-155