Wrapped Feeder return values in TaskData, with retryCount exposed

Also extracted `token` from the map and corrected a few typos in comments.