Prep for HUP by consolidating some code in the Queue rather than QueueMgr