Refactoring work-in-progress on the package downloader client.