As noted in #417 (comment), we should probably create a safe, respawn-safe wrapper around addAction as we now heavily use addAction in a few places than need to be Respawn-safe. These components are currently handling this themselves internally, but abstracting the logic would be good.