Fixed up callbacks in the raw queue. Renamed the old string-based queue.