Improve usefulness of file-relative-name in cycle code