Use file-relative-name where appropriate