Updates macros for better handling of queue releases for a time when queues did not belong to the objects' world