Update code to try to handle symbolic links in a better way.