Refactor for better handling of torrent intents.