Use file-truename for all buffer-file-name calls