Move masking out of Canica.