tweak expand-file-name to make it more idiomatic