Re: remove a few uses of ->queuedata