Better handling of multi-extension input files.