New macros for queue, doc changes.