Tweaking the downloader / defs to match.