Reapply "various: expand paths for all file/directory related options"

This reverts commit 43fda5442f557d6b58eb77db33aab007611b8cc4.