SteveH: rearrange creation of work queue components somewhat