More QUO Cleanup Code

Hi Bob,

Can you please pull these changes into your mainline.

I'll start working on the shared-memory code ASAP.

Thanks!