Revert b408543 and fix #310

I didn't realize `trigger.args` existed, so this commit removes `trigger.raw` and now `retry_join()` uses `trigger.args`.