Would you consider changing the names as follows:
  * `data.data` -> `data`
  * `data.mask` -> `mask`

This would align the `data` attribute name to be the same across masked and non-masked data. The exception now being that masked data just adds the `mask` attribute.

Thoughts?