Some mild refactoring to clarify torrent fetching.