Small refinements to Q/drawers refactor
ing