Expanded ability to deal with weird file names.