You're right, TaskQueue would be the way to go here.  I've updated the comment.