Do a better job with download filenames. I think.