VOYEUR: Some cleanup related to the onOff and pick masks