Consolidate Masks

[slominskir]

There are currently different types of masks based on whom performed the masking action. This is generally unhelpful and adds to confusion. Just have a single masked type.