Mask: Cleanup of previous changes. This is a no-op except we now
keep a pointer to the actual original mask in case we'd need it
for debugging.