File and FileSaver: some clean-up