Better filename cleanup.
More on new downloader.